diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f677cde6b4aa1..cf91960278f5f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,37 +7,47 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+## Describe the bug
 (Describe the problem clearly and concisely.)
 
-**Expected behavior**
+### Expected behavior
 (Describe the expected behavior clearly and concisely.)
 
-**Actual behavior**
+### Actual behavior
 (Describe the actual behavior clearly and concisely.)
 
 
-**To Reproduce**
+## To Reproduce
+
+Link to a small reproducer (preferably a Maven project if the issue is not Gradle-specific).
+
+Or attach an archive containing the reproducer to the issue.
+
 Steps to reproduce the behavior:
 1. 
 2. 
 3. 
 
-**Configuration**
+### Configuration
 ```properties
 # Add your application.properties here, if applicable.
 
 ```
 
-**Screenshots**
+### Screenshots
 (If applicable, add screenshots to help explain your problem.)
 
-**Environment (please complete the following information):**
- - Output of `uname -a` or `ver`: 
- - Output of `java -version`: 
- - GraalVM version (if different from Java): 
- - Quarkus version or git rev: 
- - Build tool (ie. output of `mvnw --version` or `gradlew --version`): 
+## Environment (please complete the following information):
+
+### Output of `uname -a` or `ver`
+
+### Output of `java -version`
+
+### GraalVM version (if different from Java)
+
+### Quarkus version or git rev
+
+### Build tool (ie. output of `mvnw --version` or `gradlew --version`)
 
-**Additional context**
+## Additional context
 (Add any other context about the problem here.)
diff --git a/.github/ISSUE_TEMPLATE/ecosystem-ci-participant-issue.md b/.github/ISSUE_TEMPLATE/ecosystem-ci-participant-issue.md
index b0696ffae84a7..db8a31693ed67 100644
--- a/.github/ISSUE_TEMPLATE/ecosystem-ci-participant-issue.md
+++ b/.github/ISSUE_TEMPLATE/ecosystem-ci-participant-issue.md
@@ -7,6 +7,6 @@ assignees: ''
 
 ---
 
-This issue will be open and closed dependent on the state of <particpant repo url> building against Quarkus master snapshot.
+This issue will be open and closed dependent on the state of <participant repo url> building against Quarkus main snapshot.
 
 If you have interest in being notified of this subscribe to the issue.
diff --git a/.github/ISSUE_TEMPLATE/extension_proposal.md b/.github/ISSUE_TEMPLATE/extension_proposal.md
index 2c464154e2940..4882211ae6870 100644
--- a/.github/ISSUE_TEMPLATE/extension_proposal.md
+++ b/.github/ISSUE_TEMPLATE/extension_proposal.md
@@ -7,16 +7,16 @@ assignees: ''
 
 ---
 
-**Describe the extension**
+## Describe the extension
 (Describe the extension clearly and concisely.)
 
 Interested in this extension, please +1 via the emoji/reaction feature of GitHub (top right).
 
-**Configuration suggestion**
+## Configuration suggestion
 ```properties
 # Add your application.properties here, if applicable.
 
 ```
 
-**Additional context**
+## Additional context
 (Add any other context about the proposal here.)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 37573d1a87ab4..702491740993c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,8 +7,10 @@ assignees: ''
 
 ---
 
-**Description**
+## Description
+
 (Describe the feature here.)
 
-**Implementation ideas**
-(If you have any implementation ideas, they can go here, however please note that all design change proposals should be posted to [the Quarkus developer mailing list](mailto:quarkus-dev@googlegroups.com) (or [the corresponding Google Group](https://groups.google.com/group/quarkus-dev); see [the decisions process document](https://github.com/quarkusio/quarkus/blob/master/DECISIONS.adoc) for more information).
+## Implementation ideas
+
+(If you have any implementation ideas, they can go here, however please note that all design change proposals should be posted to [the Quarkus developer mailing list](mailto:quarkus-dev@googlegroups.com) (or [the corresponding Google Group](https://groups.google.com/group/quarkus-dev); see [the decisions process document](https://github.com/quarkusio/quarkus/blob/main/DECISIONS.adoc) for more information).
diff --git a/.github/ISSUE_TEMPLATE/housekeeping.md b/.github/ISSUE_TEMPLATE/housekeeping.md
index 88487e4539ef6..3c72c9fd972d4 100644
--- a/.github/ISSUE_TEMPLATE/housekeeping.md
+++ b/.github/ISSUE_TEMPLATE/housekeeping.md
@@ -7,8 +7,8 @@ assignees: ''
 
 ---
 
-**Description**
+## Description
 (Describe the task here.)
 
-**Implementation ideas**
+## Implementation ideas
 (If you have any implementation ideas, they can go here.)
diff --git a/.github/NativeBuildReport.java b/.github/NativeBuildReport.java
index 6f0e6743d23e1..56006a77bad87 100644
--- a/.github/NativeBuildReport.java
+++ b/.github/NativeBuildReport.java
@@ -3,7 +3,12 @@
 //DEPS org.kohsuke:github-api:1.101
 //DEPS info.picocli:picocli:4.2.0
 
-import org.kohsuke.github.*;
+import org.kohsuke.github.GitHub;
+import org.kohsuke.github.GitHubBuilder;
+import org.kohsuke.github.GHRepository;
+import org.kohsuke.github.GHIssue;
+import org.kohsuke.github.GHIssueComment;
+import org.kohsuke.github.GHIssueState;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -87,9 +92,9 @@ public void run() {
 	private static boolean isOpen(GHIssue issue) {
 		return (issue.getState() == GHIssueState.OPEN);
 	}
-	
+
 	public static void main(String... args) {
 		int exitCode = new CommandLine(new Report()).execute(args);
 		System.exit(exitCode);
 	}
-}
+}
\ No newline at end of file
diff --git a/.github/autoissuelabeler.yml b/.github/autoissuelabeler.yml
deleted file mode 100644
index e3b1ef08dbd53..0000000000000
--- a/.github/autoissuelabeler.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-## docs: https://github.com/maxandersen/jbang-issuelabeler
-- labels: [area/amazon-lambda]
-  title: "(?i).*lambda.*"
-  description: "(?i).*lambda.*"
-  notify: [patriot1burke]
-- labels: [area/persistence]
-  title: "(?i).*DB2.*"
-  description: "(?si).*DB2.*"
-  notify: [aguibert]
-- labels: [area/funqy]
-  title: "(?i).*funqy.*"
-  description: "(?i).*funqy.*"
-  notify: [patriot1burke]
-- labels: [area/devmode]
-  title: "(?i).*dev mode.*"
-  description: "(?i).*dev mode.*"
-- labels: [area/gradle]
-  title: "(?i).*gradle.*"
-  notify: [quarkusio/devtools]
-- labels: [area/maven]
-  title: "(?i).*maven.*"
-  notify: [quarkusio/devtools]
-- labels: [area/hibernate-reactive, area/persistence]
-  title: "(?i).*hibernate reactive.*"
-  description: "(?i).*hibernate reactive.*"
-  notify: [aguibert,gavinking,Sanne]
-- labels: [area/hibernate-orm, area/persistence]
-  expression: |
-              title_description.matches("(?is).*hibernate.*") 
-              and
-              !title_description.matches("(?is).*validator.*") 
-  notify: [gsmet,Sanne]
-- labels: [area/hibernate-search]
-  expression: title_description.matches("(?is).*hibernate search.*") 
-  notify: [gsmet,yrodiere]
-- labels: [area/elasticsearch]
-  expression: title_description.matches("(?is).*elasticsearch.*") 
-  notify: [gsmet,yrodiere,loicmathieu]
-- labels: [area/hibernate-validator]
-  title: "(?i).*hibernate validator.*"
-  description: "(?i).*hibernate validator.*"
-  notify: [gsmet]
-- labels: [area/jaeger]
-  title: "(?i).*jaeger.*"
-  description: "(?i).*jaeger.*"
-  notify: [kenfinnigan,pavolloffay]
-- labels: [area/kotlin]
-  title: "(?i).*kotlin.*"
-  description: "(?i).*kotlin.*"
-- labels: [area/mongodb]
-  title: "(?i).*mongo.*"
-  description: "(?i).*mongo.*"
-  notify: [loicmathieu]
-- labels: [area/openapi, area/smallrye]
-  title: "(?i).*openapi.*"
-  description: "(?i).*openapi.*"
-  notify: [EricWittmann,MikeEdgar,phillip-kruger]
-- labels: [area/graphql, area/smallrye]
-  title: "(?i).*graphql.*"
-  description: "(?i).*graphql.*"
-  notify: [phillip-kruger,jmartisk]
-- labels: [area/tracing, area/smallrye]
-  title: "(?i).*(trace|tracing|telemetry).*"
-  description: "(?i).*(trace|tracing|telemetry).*"
-  notify: [kenfinnigan,Ladicek]
-- labels: [area/security, area/smallrye]
-  title: "(?i).*jwt.*"
-  description: "(?i).*jwt.*"
-  notify: [radcortez]
-- labels: [area/metrics, area/smallrye]
-  title: "(?i).*metrics.*"
-  description: "(?i).*metrics.*"
-  notify: [jmartisk]
-- labels: [area/health, area/smallrye]
-  title: "(?i).*health.*"
-  description: "(?i).*health.*"
-  notify: [jmartisk,xstefank]
-- labels: [area/fault-tolerance, area/smallrye]
-  title: "(?i).*fault.tolerance.*"
-  description: "(?i).*fault.tolerance.*"
-  notify: [Ladicek]
-- labels: [area/mutiny, area/smallrye]
-  title: "(?i).*mutiny.*"
-  description: "(?i).*mutiny.*"
-  notify: [cescoffier]
-- labels: [area/panache]
-  title: "(?i).*panache.*"
-  description: "(?i).*panache.*"
-  notify: [FroMage,loicmathieu]
-- labels: [area/qute]
-  title: "(?i).*qute.*"
-  description: "(?i).*qute.*"
-  notify: [mkouba]
-- labels: [area/reactive-messaging,area/smallrye]
-  title: "(?i).*reactive.messaging.*"
-  description: "(?i).*reactive.messaging.*"
-  notify: [cescoffier,kenfinnigan,phillip-kruger]
-- labels: [area/rest-client]
-  title: "(?i).*rest.client.*"
-  description: "(?i).*rest.client.*"
-  notify: [phillip-kruger]
-- labels: [area/smallrye]
-  title: "(?i).*smallrye.*"
-  description: "(?i).*smallrye.*"
-  notify: [kenfinnigan,phillip-kruger,jmartisk,radcortez,Ladicek]
-- labels: [area/spring]
-  title: "(?i).*spring.*"
-  description: "(?i).*spring.*"
-  notify: [geoand]
-- labels: [env/windows]
-  title: "(?i).*windows.*"
-  description: "(?i).*windows.*"
-- labels: [area/kubernetes]
-  title: "(?i).*kubernetes.*"
-  description: "(?i).*kubernetes.*"
-  notify: [geoand]
-- labels: [area/kubernetes]
-  title: "(?i).*minikube.*"
-  description: "(?i).*minikube.*"
-  notify: [geoand]
-- labels: [area/kubernetes]
-  title: "(?i).*openshift.*"
-  description: "(?i).*openshift.*"
-  notify: [geoand]
-- labels: [area/container-image]
-  title: "(?i).*jib.*"
-  description: "(?i).*jib.*"
-  notify: [geoand]
-- labels: [area/kafka-streams]
-  title: "(?i).*k(afka)?(\\s|-)?stream.*"
-  description: "(?i).*k(afka)?(\\s|-)?stream.*"
-  notify: [gunnarmorling]
-- labels: [area/infinispan]
-  title: "(?i).*infinispan.*"
-  description: "(?i).*infinispan.*"
-  notify: [karesti,wburns]
-- labels: [area/grpc]
-  title: "(?i).*grpc.*"
-  description: "(?i).*grpc.*"
-  notify: [michalszynkiewicz,cescoffier]
-- labels: [area/scheduler]
-  title: "(?i).*schedule(r)?.*"
-  description: "(?i).*schedule(r)?.*"
-  notify: [mkouba]
-- labels: [area/scheduler]
-  title: "(?i).*quartz.*"
-  description: "(?i).*quartz.*"
-  notify: [mkouba,machi1990]
-- labels: [area/redis]
-  title: "(?i).*redis.*"
-  description: "(?i).*redis.*"
-  notify: [machi1990, gsmet, cescoffier]
diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
deleted file mode 100644
index 6b7056427a74c..0000000000000
--- a/.github/boring-cyborg.yml
+++ /dev/null
@@ -1,290 +0,0 @@
-### labeler.yaml
-### This is a best naive guess on auto labeling
-### with this script: https://repl.it/@maxandersen/labels
-### should be verified/tuned by changing the script and once
-### committed updates would be done manually.
-
-### you can test this script by running the following in quarkus folder:
-### jbang https://git.io/JvJox .github/labeler.yml <optional path>
-
-### Non-covered dirs....
-### - extensions
-### - extensions/agroal
-### - extensions/amazon-services
-### - extensions/azure-functions-http
-### - extensions/caffeine
-### - extensions/flyway
-### - extensions/jackson
-### - extensions/jdbc
-### - extensions/jgit
-### - extensions/jsch
-### - extensions/jsonb
-### - extensions/jsonp
-### - extensions/keycloak-authorization
-### - extensions/mailer
-### - extensions/netty
-### - extensions/pom.xml
-### - integration-tests
-### - integration-tests/.project
-### - integration-tests/.settings
-### - integration-tests/amazon-services
-### - integration-tests/class-transformer
-### - integration-tests/flyway
-### - integration-tests/jackson
-### - integration-tests/jgit
-### - integration-tests/jsch
-### - integration-tests/jsonb
-### - integration-tests/keycloak
-### - integration-tests/keycloak-authorization
-### - integration-tests/main
-### - integration-tests/pom.xml
-### - integration-tests/shared-library
-### - integration-tests/test-extension
-### - integration-tests/virtual-http
-
-### Non-covered area/
-### area/bootstrap-maven
-### area/build
-### area/camel
-### area/core
-### area/dev-mode
-### area/housekeeping
-### area/infra
-### area/new-http
-### area/oidc-interoperability
-### area/openapi
-### area/platform
-### area/reactive-messaging
-### area/security-consolidation
-### area/user experience
-### area/amazon-lambda:
-labelPRBasedOnFilePath:
-    area/amazon-lambda:
-        - extensions/amazon-lambda/**/*
-        - extensions/amazon-lambda-http/**/*
-        - integration-tests/amazon-lambda/**/*
-        - integration-tests/amazon-lambda-http/**/*
-        - integration-tests/amazon-lambda-http-it/**/*
-        - integration-tests/amazon-lambda-http-resteasy/**/*
-    area/arc:
-        - extensions/arc/**/*
-        - independent-projects/arc/**/*
-    area/artemis:
-        - extensions/artemis-core/**/*
-        - extensions/artemis-jms/**/*
-        - integration-tests/artemis-core/**/*
-        - integration-tests/artemis-jms/**/*
-    area/cache:
-        - extensions/cache/**/*
-        - integration-tests/cache/**/*
-    area/config:
-        - extensions/config-yaml/**/*
-        - core/deployment/src/main/java/io/quarkus/deployment/configuration/**/*
-        - core/runtime/src/main/java/io/quarkus/runtime/configuration/**/*
-    area/core:
-        - core/**/*
-    area/dependencies:
-        - .github/dependabot.yml
-        - bom/**/*
-        - build-parent/**/*
-    area/devtools:
-        - devtools/**/*
-        - independent-projects/bootstrap/**/*
-        - independent-projects/tools/**/*
-    area/documentation:
-        - docs/**/*
-    area/funqy:
-        - extensions/funqy/**/*
-    area/gradle:
-        - devtools/gradle/**/*
-        - integration-tests/gradle/**/*
-    area/hibernate-orm:
-        - extensions/hibernate-orm/**/*
-        - extensions/spring-data-jpa/**/*
-        - integration-tests/common-jpa-entities/**/*
-        - integration-tests/hibernate-orm-panache/**/*
-        - integration-tests/infinispan-cache-jpa/**/*
-        - integration-tests/jpa-derby/**/*
-        - integration-tests/jpa-h2/**/*
-        - integration-tests/jpa-mariadb/**/*
-        - integration-tests/jpa-mssql/**/*
-        - integration-tests/jpa-mysql/**/*
-        - integration-tests/jpa-postgresql/**/*
-        - integration-tests/jpa-without-entity/**/*
-        - integration-tests/jpa/**/*
-        - integration-tests/spring-data-jpa/**/*
-
-    area/hibernate-search:
-        - extensions/hibernate-search-elasticsearch/**/*
-        - integration-tests/hibernate-search-elasticsearch/**/*
-        - extensions/elasticsearch-rest-client/**/*
-
-    area/hibernate-validator:
-        - extensions/hibernate-validator/**/*
-        - integration-tests/hibernate-validator/**/*
-    area/infinispan:
-        - extensions/infinispan-client/**/*
-        - integration-tests/infinispan-cache-jpa/**/*
-        - integration-tests/infinispan-client/**/*
-    area/infra-automation:
-        - .github/**/*
-    area/jaeger:
-        - extensions/jaeger/**/*
-    area/jaxb:
-        - extensions/jaxb/**/*
-    area/kafka:
-        - extensions/kafka-client/**/*
-        - integration-tests/kafka/**/*
-    area/kafka-streams:
-        - extensions/kafka-streams/**/*
-        - integration-tests/kafka-streams/**/*
-    area/kotlin:
-        - extensions/kotlin/**/*
-        - integration-tests/kotlin/**/*
-    area/kubernetes:
-        - extensions/kubernetes/**/*
-        - extensions/kubernetes-client/**/*
-        - integration-tests/kubernetes/**/*
-        - integration-tests/kubernetes-client/**/*
-    area/logging:
-        - extensions/logging-gelf/**/*
-        - extensions/logging-json/**/*
-        - extensions/logging-sentry/**/*
-        - integration-tests/logging-gelf/**/*
-        - core/runtime/src/main/java/io/quarkus/runtime/logging/**/*
-        - core/deployment/src/main/java/io/quarkus/logging/**/*
-    area/maven:
-        - integration-tests/maven/**/*
-        - independent-projects/bootstrap/maven-plugin/**/*
-        - integration-tests/maven/**/*
-        - test-framework/maven/**/*
-        - devtools/maven/**/*
-    area/mongodb:
-        - extensions/mongodb-client/**/*
-        - integration-tests/mongodb-client/**/*
-        - integration-tests/mongodb-panache/**/*
-        - extensions/panache/mongodb-panache/**/*
-    area/narayana:
-        - extensions/narayana-jta/**/*
-        - extensions/narayana-stm/**/*
-        - integration-tests/narayana-jta/**/*
-        - integration-tests/narayana-stm/**/*
-    area/neo4j:
-        - extensions/neo4j/**/*
-        - integration-tests/neo4j/**/*
-    area/oidc:
-        - extensions/oidc/**/*
-        - integration-tests/oidc/**/*
-        - integration-tests/oidc-code-flow/**/*
-    area/panache:
-        - extensions/panache/**/*
-    area/persistence:
-        - integration-tests/jpa/**/*
-        - integration-tests/jpa-derby/**/*
-        - integration-tests/jpa-h2/**/*
-        - integration-tests/jpa-mariadb/**/*
-        - integration-tests/jpa-mssql/**/*
-        - integration-tests/jpa-mysql/**/*
-        - integration-tests/jpa-postgresql/**/*
-        - integration-tests/jpa-without-entity/**/*
-        - integration-tests/common-jpa-entities/**/*
-    area/platform:
-        - independent-projects/tools/**/*
-    area/qute:
-        - extensions/qute/**/*
-    area/reactive:
-        - extensions/reactive-mysql-client/**/*
-        - extensions/reactive-pg-client/**/*
-        - extensions/reactive-streams-operators/**/*
-        - integration-tests/reactive-mysql-client/**/*
-        - integration-tests/reactive-pg-client/**/*
-    area/reactive-messaging:
-        - extensions/smallrye-reactive-messaging-amqp
-        - extensions/smallrye-reactive-messaging
-        - extensions/smallrye-reactive-messaging-mqtt
-        - extensions/smallrye-reactive-messaging-kafka
-    area/rest-client:
-        - extensions/rest-client/**/*
-    area/resteasy:
-        - extensions/resteasy/**/*
-        - extensions/resteasy-common/**/*
-        - extensions/resteasy-jackson/**/*
-        - extensions/resteasy-jaxb/**/*
-        - extensions/resteasy-jsonb/**/*
-        - extensions/resteasy-qute/**/*
-        - extensions/resteasy-server-common/**/*
-        - integration-tests/resteasy-jackson/**/*
-        - integration-tests/elytron-resteasy/**/*
-        - integration-tests/virtual-http-resteasy/**/*
-    area/scala:
-        - extensions/scala/**/*
-        - integration-tests/scala/**/*
-    area/scheduler:
-        - extensions/scheduler/**/*
-        - extensions/quartz/**/*
-        - integration-tests/quartz/**/*
-    area/security:
-        - extensions/security/**/*
-        - extensions/elytron-security/**/*
-        - extensions/elytron-security-common/**/*
-        - extensions/elytron-security-jdbc/**/*
-        - extensions/elytron-security-oauth2/**/*
-        - extensions/elytron-security-properties-file/**/*
-        - extensions/vertx-keycloak/**/*
-        - integration-tests/elytron-security/**/*
-        - integration-tests/elytron-security-jdbc/**/*
-        - integration-tests/elytron-security-oauth2/**/*
-        
-    area/smallrye:
-        - extensions/smallrye-context-propagation/**/*
-        - extensions/smallrye-fault-tolerance/**/*
-        - extensions/smallrye-health/**/*
-        - extensions/smallrye-jwt/**/*
-        - extensions/smallrye-metrics/**/*
-        - extensions/smallrye-openapi/**/*
-        - extensions/smallrye-openapi-common/**/*
-        - extensions/smallrye-opentracing/**/*
-        - extensions/smallrye-reactive-messaging/**/*
-        - extensions/smallrye-reactive-messaging-amqp/**/*
-        - extensions/smallrye-reactive-messaging-kafka/**/*
-        - extensions/smallrye-reactive-messaging-mqtt/**/*
-    area/spring:
-        - extensions/spring-cloud-config-client/**/*
-        - extensions/spring-data-jpa/**/*
-        - extensions/spring-di/**/*
-        - extensions/spring-security/**/*
-        - extensions/spring-web/**/*
-        - integration-tests/spring-cloud-config-client/**/*
-        - integration-tests/spring-data-jpa/**/*
-        - integration-tests/spring-di/**/*
-        - integration-tests/spring-web/**/*
-    area/swagger-ui:
-        - extensions/swagger-ui/**/*
-    area/testing:
-        - test-framework/**/*
-    area/tika:
-        - extensions/tika/**/*
-        - integration-tests/tika/**/*
-    area/undertow:
-        - extensions/undertow/**/*
-        - integration-tests/elytron-undertow/**/*
-    area/undertow-websockets:
-        - extensions/undertow-websockets/**/*
-    area/vault:
-        - extensions/vault/**/*
-        - integration-tests/vault/**/*
-        - integration-tests/vault-agroal/**/*
-        - integration-tests/vault-app/**/*
-    area/vertx:
-        - extensions/vertx/**/*
-        - extensions/vertx-core/**/*
-        - extensions/vertx-graphql/**/*
-        - extensions/vertx-http/**/*
-        - extensions/vertx-keycloak/**/*
-        - extensions/vertx-web/**/*
-        - integration-tests/vertx/**/*
-        - integration-tests/vertx-graphql/**/*
-        - integration-tests/vertx-http/**/*
-    area/redis:
-        - extensions/redis-client/**/*
-        - integration-tests/redis-client/**/*
\ No newline at end of file
diff --git a/.github/ci-prerequisites.sh b/.github/ci-prerequisites.sh
index 247ac0803d807..0e9237f523ef9 100755
--- a/.github/ci-prerequisites.sh
+++ b/.github/ci-prerequisites.sh
@@ -1,7 +1,7 @@
 # Reclaim disk space, otherwise we only have 13 GB free at the start of a job
 
-docker rmi node:10 node:12 mcr.microsoft.com/azure-pipelines/node8-typescript:latest
+time docker rmi node:10 node:12 mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 # That is 18 GB
-sudo rm -rf /usr/share/dotnet
+time sudo rm -rf /usr/share/dotnet
 # That is 1.2 GB
-sudo rm -rf /usr/share/swift
+time sudo rm -rf /usr/share/swift
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5fef3552ad559..7e705b628da6a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,36 +4,31 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-      time: "21:00"
+      time: "23:00"
       timezone: Europe/Paris
     open-pull-requests-limit: 3
     labels:
       - area/dependencies
     allow:
-      - dependency-name: org.apache.activemq:artemis-core-client
-      - dependency-name: org.apache.activemq:artemis-jms-client
-      - dependency-name: org.apache.activemq:artemis-server
-      - dependency-name: org.apache.activemq:artemis-commons
+      - dependency-name: org.jboss:jboss-parent
+      - dependency-name: org.apache.activemq:*
       - dependency-name: org.flywaydb:flyway-core
       - dependency-name: org.liquibase:liquibase-core
       - dependency-name: org.freemarker:freemarker
-      - dependency-name: org.eclipse.jgit:org.eclipse.jgit
-      - dependency-name: org.eclipse.jgit:org.eclipse.jgit.http.server
+      - dependency-name: org.eclipse.jgit:*
       - dependency-name: io.fabric8:kubernetes-client-bom
-      - dependency-name: org.apache.httpcomponents:httpclient
-      - dependency-name: org.apache.httpcomponents:httpasyncclient
-      - dependency-name: org.apache.httpcomponents:httpcore
+      - dependency-name: org.apache.httpcomponents:*
       - dependency-name: org.quartz-scheduler:quartz
       - dependency-name: com.cronutils:cron-utils
       - dependency-name: org.eclipse:yasson
       - dependency-name: org.yaml:snakeyaml
+      - dependency-name: com.google.guava:guava
+      - dependency-name: com.vackosar.gitflowincrementalbuilder:gitflow-incremental-builder
       # Quarkus
       - dependency-name: io.quarkus.gizmo:gizmo
-      - dependency-name: io.quarkus.http:quarkus-http-vertx-backend
-      - dependency-name: io.quarkus.http:quarkus-http-core
-      - dependency-name: io.quarkus.http:quarkus-http-servlet
-      - dependency-name: io.quarkus.http:quarkus-http-websockets-jsr
+      - dependency-name: io.quarkus.http:*
       # Elytron
+      - dependency-name: org.wildfly.security:wildfly-elytron
       - dependency-name: org.wildfly.security:wildfly-elytron-*
       # JDBC Drivers
       - dependency-name: org.postgresql:postgresql
@@ -41,16 +36,12 @@ updates:
       - dependency-name: mysql:mysql-connector-java
       - dependency-name: org.apache.derby:derbyclient
       # Kafka
-      - dependency-name: org.apache.kafka:kafka-clients
-      - dependency-name: org.apache.kafka:kafka-streams
-      - dependency-name: org.apache.kafka:kafka_2.12
+      - dependency-name: org.apache.kafka:*
       - dependency-name: org.apache.zookeeper:zookeeper
       # Debezium
       - dependency-name: io.debezium:debezium-core
       # Scala
-      - dependency-name: org.scala-lang:scala-reflect
-      - dependency-name: org.scala-lang:scala-library
-      - dependency-name: org.scala-lang:scala-compiler
+      - dependency-name: org.scala-lang:*
       - dependency-name: net.alchim31.maven:scala-maven-plugin
       # SmallRye
       - dependency-name: io.smallrye:smallrye-jwt
@@ -60,8 +51,7 @@ updates:
       - dependency-name: io.smallrye:smallrye-opentracing
       - dependency-name: io.smallrye:smallrye-fault-tolerance
       - dependency-name: io.smallrye:smallrye-context-propagation
-      - dependency-name: io.smallrye.common:smallrye-common-annotation
-      - dependency-name: io.smallrye.common:smallrye-common-io
+      - dependency-name: io.smallrye.common:smallrye-common-bom
       - dependency-name: io.smallrye.config:smallrye-config
       - dependency-name: io.smallrye.reactive:mutiny
       - dependency-name: io.smallrye.reactive:smallrye-reactive-messaging
@@ -72,16 +62,15 @@ updates:
       # RX Java 2
       - dependency-name: io.reactivex.rxjava2:rxjava
       # Test dependencies
-      - dependency-name: io.rest-assured:rest-assured
-      - dependency-name: io.rest-assured:json-schema-validator
+      - dependency-name: io.rest-assured:*
       - dependency-name: org.junit:junit-bom
+      - dependency-name: org.junit.jupiter:*
       - dependency-name: org.assertj:assertj-core
-      - dependency-name: org.testcontainers:testcontainers-bom
-      - dependency-name: org.testcontainers:testcontainers
-      - dependency-name: org.testcontainers:postgresql
-      - dependency-name: org.mockito:mockito-core
-      - dependency-name: org.mockito:mockito-junit-jupiter
+      - dependency-name: org.testcontainers:*
+      - dependency-name: org.mockito:*
       - dependency-name: org.awaitility:awaitility
+      - dependency-name: com.thoughtworks.xstream:xstream
+      - dependency-name: org.jacoco:*
       # Maven plugins
       - dependency-name: net.revelc.code.formatter:formatter-maven-plugin
       - dependency-name: net.revelc.code:impsort-maven-plugin
@@ -90,9 +79,7 @@ updates:
       - dependency-name: org.jboss.narayana.jts:narayana-jts-integration
       - dependency-name: org.jboss.narayana.stm:stm
       # Agroal
-      - dependency-name: io.agroal:agroal-api
-      - dependency-name: io.agroal:agroal-pool
-      - dependency-name: io.agroal:agroal-narayana
+      - dependency-name: io.agroal:*
       #Jandex
       - dependency-name: org.jboss:jandex
       - dependency-name: org.jboss.jandex:jandex-maven-plugin
@@ -102,17 +89,25 @@ updates:
       - dependency-name: com.github.tomakehurst:wiremock-jre8
       - dependency-name: uk.co.automatictester:wiremock-maven-plugin
       #Picocli
-      - dependency-name: info.picocli:picocli
-      - dependency-name: info.picocli:picocli-codegen
+      - dependency-name: info.picocli:*
       # Caffeine
       - dependency-name: com.github.ben-manes.caffeine:caffeine
       # Jackson
       - dependency-name: com.fasterxml.jackson:jackson-bom
       # AWS
-      - dependency-name: software.amazon.awssdk:bom
-      - dependency-name: software.amazon.awssdk:apache-client
-      - dependency-name: com.amazon.alexa:ask-sdk
-      - dependency-name: com.amazon.alexa:ask-sdk-apache-client
+      - dependency-name: software.amazon.awssdk:*
+      - dependency-name: com.amazon.alexa:*
+      - dependency-name: com.amazonaws:*
+      # Apache Commons
+      - dependency-name: commons-io:commons-io
+      - dependency-name: org.apache.commons:commons-lang3
+      # Micrometer
+      - dependency-name: io.micrometer:micrometer-bom
+      # BouncyCastle
+      - dependency-name: org.bouncycastle:*
+      # Logstash
+      - dependency-name: biz.paluch.logging:logstash-gelf
+      - dependency-name: io.sentry:*
     rebase-strategy: disabled
   - package-ecosystem: gradle
     directory: "/integration-tests/gradle"
diff --git a/.github/docker-prune.bat b/.github/docker-prune.bat
new file mode 100644
index 0000000000000..0b37a66977cfc
--- /dev/null
+++ b/.github/docker-prune.bat
@@ -0,0 +1,9 @@
+@echo off
+
+rem See remarks in docker-prune.sh
+if "%GITHUB_ACTIONS%"== "true" (
+  docker container prune -f || exit /b
+  docker image prune -f || exit /b
+  docker network prune -f || exit /b
+  docker volume prune -f || exit /b
+)
diff --git a/.github/mvn-settings.xml b/.github/mvn-settings.xml
index f416bf826c6d0..80f8b1887affd 100644
--- a/.github/mvn-settings.xml
+++ b/.github/mvn-settings.xml
@@ -1,39 +1,46 @@
-<settings>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <!-- Quarkus-->
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${env.SERVER_USERNAME}</username>
+      <password>${env.SERVER_PASSWORD}</password>
+    </server>
+    <!-- END OF Quarkus-->
+  </servers>
   <profiles>
     <profile>
-      <id>google-mirror-jboss-proxy</id>
+      <id>google-mirror</id>
       <repositories>
         <repository>
           <id>google-maven-central</id>
           <name>GCS Maven Central mirror EU</name>
-          <url>https://maven-central-eu.storage-download.googleapis.com/repos/central/data/</url>
-        </repository>
-        <repository>
-          <id>jboss-maven-central-proxy</id>
-          <name>JBoss Maven Central proxy</name>
-          <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
-        </repository>
-        <repository>
-            <id>gradle-official-repository</id>
-            <name>Gradle Official Repository</name>
-            <url>https://repo.gradle.org/gradle/libs-releases-local/</url>
+          <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
         </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>
           <id>google-maven-central</id>
           <name>GCS Maven Central mirror EU</name>
-          <url>https://maven-central-eu.storage-download.googleapis.com/repos/central/data/</url>
-        </pluginRepository>
-        <pluginRepository>
-          <id>jboss-maven-central-proxy</id>
-          <name>JBoss Maven Central proxy</name>
-          <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
+          <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
         </pluginRepository>
       </pluginRepositories>
     </profile>
   </profiles>
   <activeProfiles>
-    <activeProfile>google-mirror-jboss-proxy</activeProfile>
+    <activeProfile>google-mirror</activeProfile>
   </activeProfiles>
 </settings>
diff --git a/.github/native-tests.json b/.github/native-tests.json
new file mode 100644
index 0000000000000..542c5acc3e5a3
--- /dev/null
+++ b/.github/native-tests.json
@@ -0,0 +1,126 @@
+{
+    "category": [
+        "Main",
+        "Data1",
+        "Data2",
+        "Data3",
+        "Data4",
+        "Data5",
+        "Data6",
+        "Security1",
+        "Security2",
+        "Security3",
+        "Amazon",
+        "Messaging",
+        "Cache",
+        "HTTP",
+        "Misc1",
+        "Misc2",
+        "Misc3",
+        "Misc4",
+        "Spring",
+        "gRPC"
+    ],
+    "include": [
+        {
+            "category": "Main",
+            "timeout": 40,
+            "test-modules": "main"
+        },
+        {
+            "category": "Data1",
+            "timeout": 65,
+            "test-modules": "jpa-h2 jpa-mariadb jpa-mssql jpa-derby jpa-without-entity hibernate-tenancy"
+        },
+        {
+            "category": "Data2",
+            "timeout": 65,
+            "test-modules": "jpa jpa-mysql jpa-db2 reactive-mysql-client reactive-db2-client hibernate-reactive-db2 hibernate-reactive-mysql"
+        },
+        {
+            "category": "Data3",
+            "timeout": 70,
+            "test-modules": "flyway hibernate-orm-panache hibernate-orm-panache-kotlin hibernate-orm-envers liquibase"
+        },
+        {
+            "category": "Data4",
+            "timeout": 55,
+            "test-modules": "mongodb-client mongodb-panache mongodb-rest-data-panache mongodb-panache-kotlin redis-client neo4j hibernate-orm-rest-data-panache"
+        },
+        {
+            "category": "Data5",
+            "timeout": 65,
+            "test-modules": "jpa-postgresql narayana-stm narayana-jta reactive-pg-client hibernate-reactive-postgresql"
+        },
+        {
+            "category": "Data6",
+            "timeout": 50,
+            "test-modules": "elasticsearch-rest-client elasticsearch-rest-high-level-client hibernate-search-orm-elasticsearch hibernate-reactive-panache"
+        },
+        {
+            "category": "Amazon",
+            "timeout": 45,
+            "test-modules": "amazon-services amazon-lambda amazon-lambda-http"
+        },
+        {
+            "category": "Messaging",
+            "timeout": 120,
+            "test-modules": "artemis-core artemis-jms kafka kafka-avro kafka-snappy kafka-streams reactive-messaging-amqp reactive-messaging-kafka reactive-messaging-http"
+        },
+        {
+            "category": "Security1",
+            "timeout": 50,
+            "test-modules": "elytron-security-oauth2 elytron-security elytron-security-jdbc elytron-undertow elytron-security-ldap bouncycastle bouncycastle-jsse bouncycastle-fips"
+        },
+        {
+            "category": "Security2",
+            "timeout": 70,
+            "test-modules": "oidc oidc-code-flow oidc-tenancy keycloak-authorization oidc-client oidc-token-propagation smallrye-jwt-token-propagation oidc-wiremock oidc-client-wiremock"
+        },
+        {
+            "category": "Security3",
+            "timeout": 50,
+            "test-modules": "vault vault-app vault-agroal"
+        },
+        {
+            "category": "Cache",
+            "timeout": 55,
+            "test-modules": "infinispan-cache-jpa infinispan-client cache"
+        },
+        {
+            "category": "HTTP",
+            "timeout": 65,
+            "test-modules": "elytron-resteasy resteasy-jackson resteasy-mutiny vertx vertx-http vertx-web vertx-graphql virtual-http rest-client"
+        },
+        {
+            "category": "Misc1",
+            "timeout": 65,
+            "test-modules": "maven jackson jsonb jsch jgit quartz qute consul-config logging-min-level-unset logging-min-level-set"
+        },
+        {
+            "category": "Misc2",
+            "timeout": 65,
+            "test-modules": "tika hibernate-validator test-extension logging-gelf bootstrap-config mailer native-config-profile"
+        },
+        {
+            "category": "Misc3",
+            "timeout": 65,
+            "test-modules": "kubernetes-client openshift-client"
+        },
+        {
+            "category": "Misc4",
+            "timeout": 65,
+            "test-modules": "smallrye-config smallrye-graphql picocli-native gradle micrometer-mp-metrics micrometer-prometheus smallrye-metrics logging-json jaxp"
+        },
+        {
+            "category": "Spring",
+            "timeout": 55,
+            "test-modules": "spring-di spring-web spring-data-jpa spring-boot-properties spring-cloud-config-client spring-data-rest"
+        },
+        {
+            "category": "gRPC",
+            "timeout": 65,
+            "test-modules": "grpc-health grpc-interceptors grpc-mutual-auth grpc-plain-text-gzip grpc-plain-text-mutiny grpc-proto-v2 grpc-streaming grpc-tls"
+        }
+    ]
+}
diff --git a/.github/quarkus-bot.yml b/.github/quarkus-bot.yml
new file mode 100644
index 0000000000000..2eda1651cb9be
--- /dev/null
+++ b/.github/quarkus-bot.yml
@@ -0,0 +1,439 @@
+---
+# The format of this file is documented here:
+# https://github.com/quarkusio/quarkus-bot#triage-issues
+triage:
+  rules:
+    - labels: [area/amazon-lambda]
+      title: "lambda"
+      notify: [patriot1burke, matejvasek]
+      directories:
+        - extensions/amazon-lambda
+        - integration-tests/amazon-lambda
+    - labels: [area/persistence]
+      title: "db2"
+      notify: [mswatosh]
+      directories:
+        - extensions/reactive-db2-client/
+        - extensions/jdbc/jdbc-db2/
+    - labels: [area/funqy]
+      titleBody: "funqy"
+      notify: [patriot1burke, matejvasek]
+      directories:
+        - extensions/funqy/
+    - labels: [area/devmode]
+      title: "dev mode"
+    - labels: [area/gradle]
+      title: "gradle"
+      notify: [quarkusio/devtools, glefloch]
+      directories:
+        - devtools/gradle/
+        - integration-tests/gradle/
+    - labels: [area/maven]
+      title: "maven"
+      notify: [quarkusio/devtools]
+      directories:
+        - devtools/maven/
+        - integration-tests/maven/
+        - independent-projects/bootstrap/maven-plugin/
+        - integration-tests/maven/
+        - test-framework/maven/
+    - labels: [area/jbang]
+      titleBody: "jbang"
+      notify: [quarkusio/devtools, maxandersen]
+      directories:
+        - "**/*JBang*"
+        - "**/*jbang*"
+    - labels: [area/codestarts]
+      title: "codestart"
+      notify: [quarkusio/devtools, ia3andy]
+      directories:
+        - independent-projects/tools/codestarts/
+        - devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/
+        - devtools/platform-descriptor-json/src/main/resources/codestarts/
+        - devtools/platform-descriptor-json/src/main/resources/templates/
+    - labels: [area/hibernate-reactive, area/persistence]
+      title: "hibernate.reactive"
+      notify: [DavideD, gavinking, Sanne]
+      directories:
+        - extensions/hibernate-reactive
+    - labels: [area/hibernate-orm, area/persistence]
+      expression: |
+              matches("hibernate", title)
+              && !matches("hibernate.validator", title)
+              && !matches("hibernate.search", title)
+              && !matches("hibernate.reactive", title)
+      notify: [gsmet, Sanne, yrodiere]
+      directories:
+        - extensions/hibernate-orm/
+        - integration-tests/common-jpa-entities/
+        - integration-tests/jpa-derby/
+        - integration-tests/jpa-h2/
+        - integration-tests/jpa-mariadb/
+        - integration-tests/jpa-mssql/
+        - integration-tests/jpa-mysql/
+        - integration-tests/jpa-postgresql/
+        - integration-tests/jpa-without-entity/
+        - integration-tests/jpa/
+        - integration-tests/infinispan-cache-jpa/
+    - labels: [area/hibernate-search]
+      title: "hibernate.search"
+      notify: [gsmet, yrodiere]
+      directories:
+        - extensions/hibernate-search-orm-elasticsearch/
+        - integration-tests/hibernate-search-orm-elasticsearch/
+        - extensions/elasticsearch-rest-client/
+        - extensions/elasticsearch-rest-client-common/
+    - labels: [area/elasticsearch]
+      title: "elasticsearch"
+      notify: [gsmet, yrodiere, loicmathieu]
+      directories:
+        - extensions/elasticsearch
+        - integration-tests/elasticsearch
+    - labels: [area/hibernate-validator]
+      title: "hibernate.validator"
+      notify: [gsmet, yrodiere]
+      directories:
+        - extensions/hibernate-validator/
+        - integration-tests/hibernate-validator/
+    - labels: [area/jaeger]
+      title: "jaeger"
+      notify: [kenfinnigan]
+      directories:
+        - extensions/jaeger/
+    - labels: [area/kotlin]
+      titleBody: "kotlin"
+      notify: [evanchooly]
+      directories:
+        - extensions/kotlin/
+        - integration-tests/kotlin/
+    - labels: [area/mongodb]
+      title: "mongo"
+      notify: [loicmathieu, evanchooly]
+      directories:
+        - extensions/mongodb-client/
+        - integration-tests/mongodb-client/
+        - integration-tests/mongodb-panache/
+        - extensions/panache/mongodb-panache/
+    - labels: [area/openapi, area/smallrye]
+      title: "openapi"
+      notify: [EricWittmann, MikeEdgar, phillip-kruger]
+      directories:
+        - extensions/smallrye-openapi
+    - labels: [area/graphql, area/smallrye]
+      title: "graphql"
+      notify: [phillip-kruger, jmartisk]
+      directories:
+        - extensions/smallrye-graphql/
+        - extensions/vertx-graphql/
+        - integration-tests/vertx-graphql/
+    - labels: [area/tracing, area/smallrye]
+      title: "(trace|tracing|telemetry)"
+      notify: [kenfinnigan, Ladicek]
+      directories:
+        - extensions/smallrye-opentracing/
+    - labels: [area/security, area/smallrye]
+      title: "jwt"
+      notify: [sberyozkin]
+    - labels: [area/security]
+      title: "security"
+      notify: [sberyozkin]
+    - labels: [area/metrics, area/smallrye]
+      title: "metrics"
+      notify: [jmartisk]
+      directories:
+        - extensions/smallrye-metrics
+    - labels: [area/metrics]
+      title: "micrometer"
+      notify: [ebullient]
+      directories:
+        - extensions/micrometer
+    - labels: [area/health, area/smallrye]
+      title: "health"
+      notify: [jmartisk, xstefank]
+      directories:
+        - extensions/smallrye-health/
+    - labels: [area/fault-tolerance, area/smallrye]
+      title: "fault.tolerance"
+      notify: [Ladicek]
+      directories:
+        - extensions/smallrye-fault-tolerance/
+    - labels: [area/mutiny, area/smallrye]
+      title: "mutiny"
+      notify: [cescoffier, jponge]
+      directories:
+        - extensions/mutiny/
+        - extensions/rest-client-mutiny/
+        - extensions/resteasy-mutiny-common/
+        - extensions/resteasy-mutiny/
+    - labels: [area/panache]
+      title: "panache"
+      notify: [FroMage, loicmathieu]
+      directories:
+        - extensions/panache/
+        - integration-tests/hibernate-orm-panache/
+    - labels: [area/qute]
+      title: "qute"
+      notify: [mkouba]
+      directories:
+        - extensions/qute/
+        - extensions/resteasy-qute/
+    - labels: [area/reactive-messaging, area/smallrye]
+      title: "reactive.messaging"
+      notify: [cescoffier, kenfinnigan, phillip-kruger]
+      directories:
+        - extensions/smallrye-reactive-messaging
+    - labels: [area/rest-client]
+      title: "rest.client"
+      notify: [phillip-kruger]
+      directories:
+        - extensions/rest-client/
+    - labels: [area/smallrye]
+      title: "smallrye"
+      notify: [phillip-kruger, jmartisk, radcortez, Ladicek]
+      directories:
+        - extensions/smallrye-
+    - labels: [area/spring]
+      title: "spring"
+      notify: [geoand]
+      directories:
+        - extensions/spring-
+        - integration-tests/spring-
+    - labels: [env/windows]
+      titleBody: "windows"
+    - labels: [area/kubernetes]
+      titleBody: "kubernetes"
+      notify: [geoand]
+      directories:
+        - extensions/kubernetes/
+        - extensions/kubernetes-client/
+        - integration-tests/kubernetes/
+        - integration-tests/kubernetes-client/
+    - labels: [area/kubernetes]
+      titleBody: "minikube"
+      notify: [geoand]
+    - labels: [area/kubernetes]
+      titleBody: "openshift"
+      notify: [geoand]
+    - labels: [area/kubernetes]
+      titleBody: "knative"
+      notify: [geoand]
+    - labels: [area/container-image]
+      titleBody: "jib"
+      notify: [geoand]
+    - labels: [area/kafka]
+      notify: [cescoffier]
+      title: "kafka"
+      directories:
+        - extensions/kafka-client/
+        - integration-tests/kafka/
+    - labels: [area/kafka-streams]
+      title: "k(afka)?(\\s|-)?stream"
+      notify: [gunnarmorling, rquinio]
+      directories:
+        - extensions/kafka-streams
+        - integration-tests/kafka-streams/
+    - labels: [area/infinispan]
+      title: "infinispan"
+      notify: [karesti, wburns]
+      directories:
+        - extensions/infinispan-client/
+        - integration-tests/infinispan-cache-jpa/
+        - integration-tests/infinispan-client/
+    - labels: [area/grpc]
+      title: "grpc"
+      notify: [michalszynkiewicz, cescoffier]
+      directories:
+        - extensions/grpc-common
+        - extensions/grpc
+    - labels: [area/scheduler]
+      title: "schedule(r)?"
+      notify: [mkouba]
+      directories:
+        - extensions/scheduler/
+    - labels: [area/scheduler]
+      title: "quartz"
+      notify: [mkouba, machi1990]
+      directories:
+        - extensions/quartz/
+        - integration-tests/quartz/
+    - labels: [area/redis]
+      title: "redis"
+      notify: [machi1990, gsmet, cescoffier]
+      directories:
+        - extensions/redis-client/
+        - integration-tests/redis-client/
+    - labels: [area/arc]
+      title: "\\b(arc|cdi|injection)\\b"
+      notify: [mkouba, manovotn]
+      directories:
+        - extensions/arc/
+        - independent-projects/arc/
+    - labels: [area/google-cloud-functions]
+      title: "google.cloud"
+      notify: [loicmathieu]
+      directories:
+        - extensions/google-cloud-functions
+        - integration-tests/google-cloud-functions
+    - labels: [area/mandrel]
+      titleBody: "mandrel"
+      notify: [galderz, zakkak]
+    - labels: [area/artemis]
+      directories:
+        - extensions/artemis-core/
+        - extensions/artemis-jms/
+        - integration-tests/artemis-core/
+        - integration-tests/artemis-jms/
+    - labels: [area/cache]
+      title: "cache"
+      notify: [gwenneg]
+      directories:
+        - extensions/cache/
+        - integration-tests/cache/
+    - labels: [area/cli]
+      directories:
+        - devtools/cli/
+    - labels: [area/config]
+      directories:
+        - extensions/config-yaml/
+        - core/deployment/src/main/java/io/quarkus/deployment/configuration/
+        - core/runtime/src/main/java/io/quarkus/runtime/configuration/
+    - labels: [area/core]
+      directories:
+        - core/
+    - labels: [area/dependencies]
+      directories:
+        - .github/dependabot.yml
+        - bom/
+        - build-parent/
+    - labels: [area/devtools]
+      directories:
+        - devtools/
+        - independent-projects/bootstrap/
+        - independent-projects/tools/
+    - labels: [area/documentation]
+      directories:
+        - docs/
+    - labels: [area/infra-automation]
+      directories:
+        - .github/
+    - labels: [area/jaxb]
+      title: "jaxb"
+      notify: [gsmet]
+      directories:
+        - extensions/jaxb/
+    - labels: [area/logging]
+      directories:
+        - extensions/logging-gelf/
+        - extensions/logging-json/
+        - extensions/logging-sentry/
+        - integration-tests/logging-gelf/
+        - core/runtime/src/main/java/io/quarkus/runtime/logging/
+        - core/deployment/src/main/java/io/quarkus/logging/
+    - labels: [area/narayana]
+      directories:
+        - extensions/narayana-jta/
+        - extensions/narayana-stm/
+        - integration-tests/narayana-jta/
+        - integration-tests/narayana-stm/
+    - labels: [area/neo4j]
+      title: "neo4j"
+      notify: [michael-simons]
+      directories:
+        - extensions/neo4j/
+        - integration-tests/neo4j/
+    - labels: [area/oidc]
+      title: "oidc"
+      notify: [sberyozkin, pedroigor]
+      directories:
+        - extensions/oidc/
+        - integration-tests/oidc/
+        - integration-tests/oidc-code-flow/
+    - labels: [area/platform]
+      directories:
+        - independent-projects/tools/
+    - labels: [area/reactive]
+      directories:
+        - extensions/reactive-mysql-client/
+        - extensions/reactive-pg-client/
+        - extensions/reactive-streams-operators/
+        - integration-tests/reactive-mysql-client/
+        - integration-tests/reactive-pg-client/
+    - labels: [area/resteasy]
+      directories:
+        - extensions/resteasy/
+        - extensions/resteasy-common/
+        - extensions/resteasy-jackson/
+        - extensions/resteasy-jsonb/
+        - extensions/resteasy-jaxb/
+        - extensions/resteasy-multipart/
+        - extensions/resteasy-server-common/
+        - integration-tests/resteasy-jackson/
+        - integration-tests/elytron-resteasy/
+        - integration-tests/virtual-http-resteasy/
+    - labels: [area/resteasy-reactive]
+      title: resteasy.reactive
+      notify: [geoand, FroMage, stuartwdouglas]
+      directories:
+        - extensions/resteasy-reactive/
+    - labels: [area/scala]
+      directories:
+        - extensions/scala/
+        - integration-tests/scala/
+    - labels: [area/vault]
+      title: vault
+      notify: [vsevel]
+      directories:
+        - extensions/vault/
+        - integration-tests/vault
+    - labels: [area/vertx]
+      directories:
+        - extensions/vertx
+        - integration-tests/vertx
+    - labels: [area/tika]
+      title: tika
+      notify: [sberyozkin]
+      directories:
+        - extensions/tika/
+        - integration-tests/tika/
+    - labels: [area/testing]
+      directories:
+        - test-framework/
+    - labels: [area/undertow]
+      directories:
+        - extensions/undertow/
+        - integration-tests/elytron-undertow/
+    - labels: [area/websockets]
+      directories:
+        - extensions/websockets/
+    - labels: [area/swagger-ui]
+      title: "swagger"
+      notify: [phillip-kruger]
+      directories:
+        - extensions/swagger-ui/
+    - labels: [area/security]
+      directories:
+        - extensions/security/
+        - extensions/elytron
+        - extensions/vertx-keycloak/
+        - integration-tests/elytron
+    - labels: [area/flyway]
+      title: "flyway"
+      notify: [cristhiank, geoand, gastaldi, gsmet]
+      directories:
+        - extensions/flyway/
+        - integration-tests/flyway/
+    - labels: [area/liquibase]
+      title: "liquibase"
+      notify: [andrejpetras, geoand, gsmet]
+      directories:
+        - extensions/liquibase/
+        - integration-tests/liquibase/
+    - labels: [area/kogito]
+      title: "kogito"
+      notify: [evacchi, mariofusco]
+    - labels: [area/optaplanner]
+      title: "optaplanner"
+      notify: [ge0ffrey, rsynek, Christopher-Chianelli]
+    - labels: [kind/extension-proposal]
+      title: quarkiverse
+      notify: [gastaldi, gsmet, aloubyansky]
diff --git a/.github/quarkusbuilditemdoc.java b/.github/quarkusbuilditemdoc.java
new file mode 100755
index 0000000000000..7b947446ad03e
--- /dev/null
+++ b/.github/quarkusbuilditemdoc.java
@@ -0,0 +1,228 @@
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS info.picocli:picocli:4.5.0
+//DEPS org.jboss.forge.roaster:roaster-jdt:2.22.2.Final
+//DEPS org.eclipse.collections:eclipse-collections:10.4.0
+//DEPS org.yaml:snakeyaml:1.27
+//DEPS io.fabric8:maven-model-helper:16
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.Callable;
+
+import io.fabric8.maven.Maven;
+import org.eclipse.collections.api.multimap.Multimap;
+import org.eclipse.collections.api.multimap.MutableMultimap;
+import org.eclipse.collections.api.tuple.Pair;
+import org.eclipse.collections.impl.factory.Multimaps;
+import org.eclipse.collections.impl.tuple.Tuples;
+import org.jboss.forge.roaster.Roaster;
+import org.jboss.forge.roaster.model.JavaDocCapable;
+import org.jboss.forge.roaster.model.source.FieldSource;
+import org.jboss.forge.roaster.model.source.JavaClassSource;
+import org.yaml.snakeyaml.Yaml;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+@Command(name = "builditemdoc", mixinStandardHelpOptions = true, version = "builditemdoc 0.1",
+        description = "builditemdoc made with jbang")
+class quarkusbuilditemdoc implements Callable<Integer> {
+
+    @CommandLine.Option(names = {"--outputFile"})
+    public Path outputFile;
+
+    @CommandLine.Option(names = {"--dirs"}, required = true, arity = "1..*")
+    public List<Path> paths;
+
+    private PrintStream out = System.out;
+
+    public static void main(String... args) {
+        int exitCode = new CommandLine(new quarkusbuilditemdoc()).execute(args);
+        System.exit(exitCode);
+    }
+
+    // jbang .github/quarkusbuilditemdoc.java --outputFile target/asciidoc/generated/config/quarkus-all-build-items.adoc --dirs core/deployment core/test-extension extensions
+    @Override
+    public Integer call() throws Exception {
+        if (outputFile != null) {
+            Files.createDirectories(outputFile.getParent());
+            out = new PrintStream(Files.newOutputStream(outputFile));
+        }
+        final Multimap<String, Pair<Path, JavaClassSource>> multimap = collect();
+        Map<String, String> names = extractNames(Paths.get("."), multimap.keySet());
+        // Print Core first
+        {
+            printTableHeader(names.remove("Core"));
+            for (Pair<Path, JavaClassSource> source : multimap.get("Core")) {
+                printTableRow(source);
+            }
+            printTableFooter();
+        }
+        names.forEach((key, name) -> {
+            printTableHeader(name);
+            for (Pair<Path, JavaClassSource> source : multimap.get(key)) {
+                printTableRow(source);
+            }
+            printTableFooter();
+        });
+        return 0;
+    }
+
+    private String getJavaDoc(JavaDocCapable<?> source) {
+        if (!source.hasJavaDoc()) {
+            return "<i>No Javadoc found</i>";
+        }
+        return source.getJavaDoc().getText();
+    }
+
+    private Multimap<String, Pair<Path, JavaClassSource>> collect() throws IOException {
+        MutableMultimap<String, Pair<Path, JavaClassSource>> multimap = Multimaps.mutable.sortedSet
+                .with(Comparator.comparing(o -> o.getTwo().getName()));
+        String line;
+        for (Path path : paths) {
+            Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    if (file.toString().endsWith("BuildItem.java")) {
+                        process(multimap, file);
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        }
+        return multimap;
+    }
+
+    private void process(MutableMultimap<String, Pair<Path, JavaClassSource>> multimap, Path path) throws IOException {
+        JavaClassSource source = Roaster.parse(JavaClassSource.class, path.toFile());
+        // Ignore deprecated annotations and non-public classes
+        if (!source.hasAnnotation(Deprecated.class) && source.isPublic()) {
+            String name;
+            Path pom = findPom(path);
+            if (pom != null) {
+                name = Maven.readModel(pom).getName();
+            } else {
+                String pathString = path.toString();
+                int spiIdx = pathString.indexOf("/spi/src");
+                int runtimeIdx = pathString.indexOf("/runtime/src");
+                int deploymentIdx = pathString.indexOf("/deployment/src");
+                int idx = Math.max(Math.max(spiIdx, runtimeIdx), deploymentIdx);
+                int extensionsIdx = pathString.indexOf("extensions/");
+                int startIdx = 0;
+                if (extensionsIdx != -1) {
+                    startIdx = extensionsIdx + 11;
+                }
+                if (idx == -1) {
+                    name = pathString.substring(startIdx, pathString.indexOf("/", startIdx + 1));
+                } else {
+                    name = pathString.substring(startIdx, idx);
+                }
+            }
+            // sanitize name
+            name = name.replace("Quarkus - ", "")
+                    .replace(" - Deployment", "");
+            Pair<Path, JavaClassSource> pair = Tuples.pair(path, source);
+            multimap.put(name, pair);
+        }
+    }
+
+    private Path findPom(Path path) {
+        Path pom = null;
+        Path parent = path;
+        while (pom == null && (parent = parent.getParent()) != null) {
+            Path resolve = parent.resolve("pom.xml");
+            if (Files.exists(resolve)) {
+                pom = resolve;
+            }
+        }
+        return pom;
+    }
+
+
+    private Map<String, String> extractNames(Path root, Iterable<String> extensionDirs) throws IOException {
+        Map<String, String> names = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        Yaml yaml = new Yaml();
+        for (String extension : extensionDirs) {
+            Path yamlPath = root.resolve("extensions/" + extension + "/runtime/src/main/resources/META-INF/quarkus-extension.yaml");
+            if (Files.exists(yamlPath)) {
+                try (InputStream is = Files.newInputStream(yamlPath)) {
+                    Map<String, String> map = yaml.load(is);
+                    names.put(extension, map.get("name"));
+                }
+            } else {
+                names.put(extension, extension);
+            }
+        }
+        return names;
+    }
+
+    private void printTableHeader(String title) {
+        out.println("== " + title);
+        out.println("[%header,cols=2*]");
+        out.println("|===");
+        out.println("|Class Name |Attributes ");
+    }
+
+    private void printTableRow(Pair<Path, JavaClassSource> pair) {
+        //TODO: Use tagged version?
+        Path root = Paths.get(".").toAbsolutePath().normalize();
+        String link = "https://github.com/quarkusio/quarkus/blob/main/" + root.relativize(pair.getOne().normalize());
+        JavaClassSource source = pair.getTwo();
+        String className = source.getQualifiedName();
+        String attributes = buildAttributes(source);
+        String description = getJavaDoc(source);
+
+        out.println("a| " + link + "[`" + className + "`, window=\"_blank\"] :: +++" +
+                            javadocToHTML(description) + "+++");
+        out.println("a| " + attributes);
+    }
+
+    private String buildAttributes(JavaClassSource source) {
+        StringBuilder sb = new StringBuilder();
+        for (FieldSource<JavaClassSource> field : source.getFields()) {
+            if (field.isStatic()) {
+                continue;
+            }
+            sb.append("`" + field.getType().getName() + " " + field.getName() + "` :: ");
+            sb.append("+++" + javadocToHTML(getJavaDoc(field)) + "+++");
+            sb.append("\n");
+        }
+        return sb.length() == 0 ? "None" : sb.toString();
+    }
+
+    private void printTableFooter() {
+        out.println("|===");
+    }
+
+    private String javadocToHTML(String content) {
+        return content
+                .replaceAll("\\{?@see ", "<pre>")
+                .replaceAll("\\{?@code ", "<pre>")
+                .replaceAll("\\{?@link ", "<pre>")
+                .replaceAll(" ?}", "</pre>");
+    }
+
+    private String javadocToAsciidoc(String content) {
+        return content
+                .replaceAll("<p>", "\n")
+                .replaceAll("</p>", "\n")
+                .replaceAll("\\{?@see ", "```")
+                .replaceAll("\\{?@code ", "```")
+                .replaceAll("\\{?@link ", "```")
+                .replaceAll("<pre>", "```\n")
+                .replaceAll("</pre>", "\n```")
+                .replaceAll(" ?}", "```");
+    }
+
+
+}
diff --git a/.github/workflows/autolabel.yml b/.github/workflows/autolabel.yml
deleted file mode 100644
index 85c2ed5e518f6..0000000000000
--- a/.github/workflows/autolabel.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: "Auto label new issues"
-on:
-    issues:
-      types: [opened]
-
-jobs:
-    autolabel:
-      runs-on: ubuntu-latest
-      name: auto label
-      steps:
-#      - name: Debug Action
-#        uses: hmarr/debug-action@v1.0.0
-      - name: issuelabeler
-        continue-on-error: true
-        uses: docker://maxandersen/jbang-issuelabeler
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
-          CONFIG: https://raw.githubusercontent.com/quarkusio/quarkus/master/.github/autoissuelabeler.yml
-          
diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
new file mode 100644
index 0000000000000..0387d4ea9ad8b
--- /dev/null
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -0,0 +1,717 @@
+name: Quarkus CI
+
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    # paths-ignore in ci-fork-mvn-cache.yml should match
+    paths-ignore:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - 'docs/src/main/asciidoc/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+      - '.github/*.conf'
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths-ignore:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - 'docs/src/main/asciidoc/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+      - '.github/*.conf'
+
+env:
+  # Workaround testsuite locale issue
+  LANG: en_US.UTF-8
+  NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dquarkus.native.container-build=true -Dtest-containers -Dstart-containers -Dnative-image.xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
+  WINDOWS_NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dtest-containers -Dstart-containers -Dnative-image.xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
+  JVM_TEST_MAVEN_OPTS: "-e -B --settings .github/mvn-settings.xml -Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs"
+  DB_USER: hibernate_orm_test
+  DB_PASSWORD: hibernate_orm_test
+  DB_NAME: hibernate_orm_test
+jobs:
+  ci-sanity-check:
+    name: "CI Sanity Check"
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    steps:
+      - name: Build
+        run: sleep 30
+  build-jdk11:
+    name: "Initial JDK 11 Build"
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    # Skip draft PRs and those with WIP in the subject, rerun as soon as its removed
+    if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')) && ( \
+           github.event_name != 'pull_request' || ( \
+             github.event.pull_request.draft == false && \
+             github.event.pull_request.state != 'closed' && \
+             contains(github.event.pull_request.title, 'wip ') == false && \
+             contains(github.event.pull_request.title, '[wip]') == false && \
+             (
+               github.event.action != 'edited' || \
+               contains(github.event.changes.title.from, 'wip ') || \
+               contains(github.event.changes.title.from, '[wip]') \
+             ) \
+           ) \
+         )"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: n1hility/cancel-previous-runs@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Get Date
+        id: get-date
+        run: |
+          echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
+        shell: bash
+      - name: Cache Maven Repository
+        id: cache-maven
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          # refresh cache every month to avoid unlimited growth
+          key: q2maven-${{ steps.get-date.outputs.date }}
+      - name: Build
+        # note: '-Pincremental -Dgib.disable' shall only trigger the download of gitflow-incremental-builder, not activate it
+        #       since -Dincremental deactivates dependencies in bom-descriptor-json (which we do need here), -P is used instead
+        run: |
+          mvn -T1C -e -B -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks -Pincremental -Dgib.disable --settings .github/mvn-settings.xml clean install
+      - name: Verify extension dependencies
+        shell: bash
+        run: |
+          ./update-extension-dependencies.sh -B --settings .github/mvn-settings.xml
+          if [ `git status -s -u no '*pom.xml' | wc -l` -ne 0 ]
+          then
+            echo -e '\033[0;31mError:\033[0m Dependencies to extension artifacts are outdated!' 1>&2
+            echo -e '\033[0;31mError:\033[0m Run ./update-extension-dependencies.sh and add the modified pom.xml files to your commit.' 1>&2
+            exit 1
+          fi
+      - name: Tar Maven Repo
+        shell: bash
+        run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
+      - name: Persist Maven Repo
+        uses: actions/upload-artifact@v1
+        with:
+          name: maven-repo
+          path: maven-repo.tgz
+      - name: Delete Local Artifacts From Cache
+        shell: bash
+        run: rm -r ~/.m2/repository/io/quarkus
+      - name: Get GIB arguments
+        id: get-gib-args
+        env:
+          PULL_REQUEST_BASE: ${{ github.event.pull_request.base.ref }}
+        run: |
+          # See also: https://github.com/gitflow-incremental-builder/gitflow-incremental-builder#configuration (GIB)
+          # Common GIB_ARGS for all CI cases (hint: see also root pom.xml):
+          # - disableSelectedProjectsHandling: required to detect changes in jobs that use -pl
+          # - untracked: to ignore files created by jobs (and uncommitted to be consistent)
+          GIB_ARGS="-Dincremental -Dgib.disableSelectedProjectsHandling -Dgib.untracked=false -Dgib.uncommitted=false"
+          if [ -n "$PULL_REQUEST_BASE" ]
+          then
+              # The PR defines a clear merge target so just use that branch for reference, *unless*:
+              # - the current branch is a backport branch
+              GIB_ARGS+=" -Dgib.referenceBranch=origin/$PULL_REQUEST_BASE -Dgib.disableIfBranchMatches='.*backport.*'"
+          else
+              # No PR means the merge target is uncertain so fetch & use main of quarkusio/quarkus, *unless*:
+              # - the current branch is main or some released branch like 1.10
+              # - the current branch is a backport branch targeting some released branch like 1.10 (merge target is not main)
+              GIB_ARGS+=" -Dgib.referenceBranch=refs/remotes/quarkusio/main -Dgib.fetchReferenceBranch -Dgib.disableIfBranchMatches='main|\d+\.\d+|.*backport.*'"
+          fi
+          echo "GIB_ARGS: $GIB_ARGS"
+          echo "::set-output name=gib_args::${GIB_ARGS}"
+    outputs:
+      gib_args: ${{ steps.get-gib-args.outputs.gib_args }}
+
+  linux-jvm-tests:
+    name: JVM Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 240
+    env:
+      MAVEN_OPTS: -Xmx2048m -XX:MaxMetaspaceSize=1000m
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+          - {
+            name: "8",
+            java-version: 8,
+            maven_args: "-pl !integration-tests/kubernetes/quarkus-standard-way"
+          }
+          - {
+            name: "11",
+            java-version: 11,
+            maven_args: ""
+          }
+          - {
+            name: "15",
+            java-version: 15,
+            maven_args: "-pl !integration-tests/kubernetes/quarkus-standard-way"
+          }
+
+    steps:
+      - name: Stop mysql
+        shell: bash
+        run: |
+          ss -ln
+          sudo service mysql stop || true
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+
+      - name: apt clean
+        shell: bash
+        run: sudo apt-get clean
+
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+          release: ${{ matrix.java.release }}
+
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        shell: bash
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args }} ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-linux-jvm${{matrix.java.name}}
+          path: 'test-reports.tgz'
+
+  windows-jdk11-jvm-tests:
+    name: JVM Tests - JDK 11 Windows
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 180
+    env:
+      MAVEN_OPTS: -Xmx1408m  -XX:MaxMetaspaceSize=1000m
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        shell: bash
+        run: mvn -B --settings .github/mvn-settings.xml -DskipDocs -Dformat.skip -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: |
+          # Disambiguate windows find from cygwin find
+          /usr/bin/find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-windows-jdk11-jvm
+          path: 'test-reports.tgz'
+
+  linux-jvm-maven-tests:
+    name: Maven Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+          - {
+            name: "11",
+            java-version: 11
+          }
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+      - name: Run Maven integration tests
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-linux-maven-java${{matrix.java.name}}
+          path: 'test-reports.tgz'
+
+  windows-jdk11-jvm-maven-tests:
+    name: Maven Tests - JDK 11 Windows
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Run Maven integration tests
+        shell: bash
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-windows-maven-java11
+          path: 'test-reports.tgz'
+
+  gradle-tests-jdk11-jvm:
+    name: Gradle Tests - JDK 11 ${{matrix.os.family}}
+    runs-on: ${{matrix.os.name}}
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 80
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - {
+            name: "ubuntu-latest",
+            family: "Linux"
+          }
+          - {
+            name: "windows-latest",
+            family: "Windows"
+          }
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Verify dependencies
+        # runs on Windows as well but would require newline conversion, not worth it
+        if: matrix.os.family == 'Linux'
+        shell: bash
+        run: |
+          ./update-dependencies.sh -B --settings ../../.github/mvn-settings.xml
+          if [ `git status -s -u no '*pom.xml' | wc -l` -ne 0 ]
+          then
+            echo -e '\033[0;31mError:\033[0m Dependencies in integration-tests/gradle/pom.xml are outdated!' 1>&2
+            echo -e '\033[0;31mError:\033[0m Run update-dependencies.sh in integration-tests/gradle and add the modified pom.xml file to your commit.' 1>&2
+            exit 1
+          fi
+        working-directory: integration-tests/gradle
+      - name: Build with Gradle via Maven
+        shell: bash
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl integration-tests/gradle ${{ needs.build-jdk11.outputs.gib_args }}
+
+  linux-jvm-devtools-tests:
+    name: Devtools Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+          - {
+            name: "11",
+            java-version: 11
+          }
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+      - name: Run Devtools integration tests
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-linux-devtools-java${{matrix.java.name}}
+          path: 'test-reports.tgz'
+
+  windows-jdk11-jvm-devtools-tests:
+    name: Devtools Tests - JDK 11 Windows
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Run Devtools integration tests
+        shell: bash
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-windows-devtools-java11
+          path: 'test-reports.tgz'
+
+  tcks-test:
+    name: MicroProfile TCKs Tests
+    needs: build-jdk11
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    runs-on: ubuntu-latest
+    timeout-minutes: 150
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          path: tcks
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+        working-directory: ./tcks
+      - name: Download RESTEasy Reactive Testsuite
+        uses: actions/checkout@v2
+        with:
+          repository: quarkusio/resteasy-reactive-testsuite
+          path: resteasy-reactive-testsuite
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+        working-directory: ./tcks
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Run RESTEasy Reactive TCK
+        # Note: No gib_args here because resteasy-reactive-testsuite is a different repo
+        run: mvn -B --settings ../tcks/.github/mvn-settings.xml install
+        working-directory: ./resteasy-reactive-testsuite
+      - name: Verify with Maven
+        run: mvn -B --settings .github/mvn-settings.xml -Dtcks -pl tcks -amd install ${{ needs.build-jdk11.outputs.gib_args }}
+        working-directory: ./tcks
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-tcks
+          path: 'test-reports.tgz'
+
+  native-tests-read-json-matrix:
+    name: Native Tests - Read JSON matrix
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    outputs:
+      matrix: ${{ steps.read.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: read
+        run: |
+          json=$(tr -d '\n' < .github/native-tests.json )
+          echo $json
+          echo "::set-output name=matrix::${json}"
+
+  native-tests:
+    name: Native Tests - ${{matrix.category}}
+    needs: [build-jdk11, native-tests-read-json-matrix]
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    # Ignore the following YAML Schema error
+    timeout-minutes: ${{matrix.timeout}}
+    strategy:
+      max-parallel: 8
+      fail-fast: false
+      matrix: ${{ fromJson(needs.native-tests-read-json-matrix.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      # We do this so we can get better analytics for the downloaded version of the build images
+      - name: Update Docker Client User Agent
+        shell: bash
+        run: |
+          cat <<< $(jq '.HttpHeaders += {"User-Agent": "Quarkus-CI-Docker-Client"}' ~/.docker/config.json) > ~/.docker/config.json
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        env:
+          TEST_MODULES: ${{matrix.test-modules}}
+          CATEGORY: ${{matrix.category}}
+        run: |
+          for i in $TEST_MODULES
+          do modules+="integration-tests/$i,"; done
+          mvn -pl "${modules}" $NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }}
+          # add the 'simple with spaces' project to the run of 'Misc1' by executing it explicitly
+          # done because there is no good way to pass strings with empty values to the previous command
+          # so this hack is as good as any
+          if [ "$CATEGORY" == "Misc1" ]; then
+            mvn -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -pl 'integration-tests/simple with space/' verify ${{ needs.build-jdk11.outputs.gib_args }}
+          fi
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -type d -name '*-reports' -o -wholename '*/build/reports/tests/functionalTest' -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-native-${{matrix.category}}
+          path: 'test-reports.tgz'
+  native-tests-windows:
+    name: Native Tests - Windows - ${{matrix.category}}
+    needs: [build-jdk11, native-tests-read-json-matrix]
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    # Ignore the following YAML Schema error
+    timeout-minutes: ${{matrix.timeout}}
+    strategy:
+      max-parallel: 8
+      fail-fast: false
+      # we only run a native build on Windows for Hibernate Validator just to be sure
+      # that we can build native executables on Windows
+      # matrix: ${{ fromJson(needs.native-tests-read-json-matrix.outputs.matrix) }}
+      matrix:
+        category: [hibernate-validator]
+        include:
+          - category: hibernate-validator
+            timeout: 20
+            test-modules: hibernate-validator
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Add quarkusio remote
+        shell: bash
+        run: git remote add quarkusio https://github.com/quarkusio/quarkus.git
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Install cl.exe
+        uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup GraalVM
+        id: setup-graalvm
+        uses: DeLaGuardo/setup-graalvm@master
+        with:
+          graalvm-version: '21.0.0.java11'
+      - name: Install native-image component
+        run: |
+          gu.cmd install native-image
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      # We do this so we can get better analytics for the downloaded version of the build images
+      - name: Update Docker Client User Agent
+        shell: bash
+        run: |
+          cat <<< $(jq '.HttpHeaders += {"User-Agent": "Quarkus-CI-Docker-Client"}' ~/.docker/config.json) > ~/.docker/config.json
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        shell: bash
+        env:
+          TEST_MODULES: ${{matrix.test-modules}}
+          CATEGORY: ${{matrix.category}}
+        run: |
+          for i in $TEST_MODULES
+          do modules+="integration-tests/$i,"; done
+          mvn -pl "${modules}" $WINDOWS_NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -type d -name '*-reports' -o -wholename '*/build/reports/tests/functionalTest' -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-native-windows-${{matrix.category}}
+          path: 'test-reports.tgz'
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
deleted file mode 100644
index f2c9136e6497c..0000000000000
--- a/.github/workflows/ci-actions.yml
+++ /dev/null
@@ -1,673 +0,0 @@
-name: Quarkus CI
-
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths-ignore:
-      - 'docs/src/main/asciidoc/**'
-      - 'README.md'
-      - 'CONTRIBUTING.md'
-      - 'ADOPTERS.md'
-      - 'TROUBLESHOOTING.md'
-      - 'SECURITY.md'
-      - 'MAINTAINERS.adoc'
-      - 'DECISIONS.adoc'
-      - 'LICENSE.txt'
-      - 'dco.txt'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.github/autoissuelabeler.yml'
-      - '.github/boring-cyborg.yml'
-      - '.github/NativeBuildReport.java'
-      - '.github/dependabot.yml'
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    paths-ignore:
-      - 'docs/src/main/asciidoc/**'
-      - 'README.md'
-      - 'CONTRIBUTING.md'
-      - 'ADOPTERS.md'
-      - 'TROUBLESHOOTING.md'
-      - 'SECURITY.md'
-      - 'DECISIONS.adoc'
-      - 'MAINTAINERS.adoc'
-      - 'LICENSE.txt'
-      - 'dco.txt'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.github/autoissuelabeler.yml'
-      - '.github/boring-cyborg.yml'
-      - '.github/NativeBuildReport.java'
-      - '.github/dependabot.yml'
-
-env:
-  # Workaround testsuite locale issue
-  LANG: en_US.UTF-8
-  NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dquarkus.native.container-build=true -Dtest-postgresql -Dtest-elasticsearch -Dtest-keycloak -Dtest-amazon-services -Dtest-db2 -Dtest-mysql -Dtest-mariadb -Dmariadb.base_url='jdbc:mariadb://localhost:3308' -Dmariadb.url='jdbc:mariadb://localhost:3308/hibernate_orm_test'  -Dtest-mssql -Dtest-vault -Dtest-neo4j -Dtest-kafka -Dtest-redis -Dnative-image.xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install"
-  JVM_TEST_MAVEN_OPTS: "-e -B --settings .github/mvn-settings.xml -Dtest-postgresql -Dtest-elasticsearch -Dtest-db2 -Dtest-mysql -Dtest-mariadb -Dmariadb.base_url='jdbc:mariadb://localhost:3308' -Dmariadb.url='jdbc:mariadb://localhost:3308/hibernate_orm_test'  -Dtest-mssql -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dtest-kafka -Dtest-keycloak -Dtest-redis -Dformat.skip"
-  DB_USER: hibernate_orm_test
-  DB_PASSWORD: hibernate_orm_test
-  DB_NAME: hibernate_orm_test
-jobs:
-  build-jdk11:
-    name: "JDK 11 Build"
-    runs-on: ubuntu-latest
-    # Skip draft PRs and those with WIP in the subject, rerun as soon as its removed
-    if: "github.event_name != 'pull_request' || ( \
-           github.event.pull_request.draft == false && \
-           github.event.pull_request.state != 'closed' && \
-           contains(github.event.pull_request.title, 'wip ') == false && \
-           contains(github.event.pull_request.title, '[wip]') == false && \
-           (
-             github.event.action != 'edited' || \
-             contains(github.event.changes.title.from, 'wip ') || \
-             contains(github.event.changes.title.from, '[wip]') \
-           ) \
-         )"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: n1hility/cancel-previous-runs@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Reclaim Disk Space
-        run: .github/ci-prerequisites.sh
-      - name: Set up JDK 11
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        with:
-          java-version: 11
-      - name: Compute cache restore key
-        # Always recompute on a push so that the maven repo doesnt grow indefinitely with old versions
-        run: |
-          if ${{ github.event_name == 'pull_request' }}; then echo "::set-env name=COMPUTED_RESTORE_KEY::q2maven-"; fi
-      - name: Cache Maven Repository
-        id: cache-maven
-        uses: n1hility/cache@v2
-        with:
-          path: ~/.m2/repository
-          # Improves the reusability of the cache to limit key changes
-          key: q2maven-${{ hashFiles('bom/runtime/pom.xml') }}
-          restore-keys: ${{ env.COMPUTED_RESTORE_KEY }}
-          restore-only: ${{ github.event_name == 'pull_request' }}
-      - name: Build
-        run: |
-          mvn -e -B -DskipTests -DskipITs -Dno-format -Ddocumentation-pdf clean install
-      - name: Tar Maven Repo
-        shell: bash
-        run: tar -czf maven-repo.tgz -C ~ .m2/repository
-      - name: Persist Maven Repo
-        uses: actions/upload-artifact@v1
-        with:
-          name: maven-repo
-          path: maven-repo.tgz
-
-  linux-jvm-tests:
-    name: JDK ${{matrix.java.name}} JVM Tests
-    runs-on: ubuntu-latest
-    needs: build-jdk11
-    timeout-minutes: 180
-    env:
-      MAVEN_OPTS: -Xmx2048m
-    strategy:
-      fail-fast: false
-      matrix:
-        java :
-          - { name: Java8,
-              java-version: 8,
-              maven_args: "-pl !integration-tests/vault-app,!integration-tests/vault-agroal,!integration-tests/vault,!integration-tests/google-cloud-functions-http,!integration-tests/gradle,!integration-tests/google-cloud-functions,!integration-tests/funqy-google-cloud-functions"
-          }
-          - {
-            name: "Java 8 - 242",
-            java-version: 8,
-            release: "jdk8u242-b08",
-            maven_args: "-pl !integration-tests/google-cloud-functions-http,!integration-tests/gradle,!integration-tests/google-cloud-functions,!integration-tests/funqy-google-cloud-functions"
-          }
-          - {
-            name: Java 11,
-            java-version: 11,
-            maven_args: "-pl !integration-tests/gradle"
-          }
-          - {
-            name: Java 14,
-            java-version: 14,
-            maven_args: "-pl !integration-tests/gradle"
-          }
-
-    services:
-      keycloak:
-        image: quay.io/keycloak/keycloak:11.0.0
-        env:
-          KEYCLOAK_USER: admin
-          KEYCLOAK_PASSWORD: admin
-          JAVA_OPTS: "-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dkeycloak.profile.feature.upload_scripts=enabled"
-        ports:
-          - 127.0.0.1:8180:8080
-          - 127.0.0.1:8543:8443
-      postgres:
-        image: postgres:10.5
-        env:
-          POSTGRES_USER: hibernate_orm_test
-          POSTGRES_PASSWORD: hibernate_orm_test
-          POSTGRES_DB: hibernate_orm_test
-        ports:
-          - 127.0.0.1:5432:5432
-      mariadb:
-        image: mariadb:10.4
-        env:
-          MYSQL_USER: hibernate_orm_test
-          MYSQL_PASSWORD: hibernate_orm_test
-          MYSQL_DATABASE: hibernate_orm_test
-          MYSQL_ROOT_PASSWORD: secret
-        ports:
-          - 127.0.0.1:3308:3306
-      mssql:
-        image: microsoft/mssql-server-linux:2017-CU13
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: ActuallyRequired11Complexity
-        ports:
-          - 127.0.0.1:1433:1433
-      neo4j:
-        image: neo4j/neo4j-experimental:4.0.0-rc01
-        env:
-          NEO4J_AUTH: neo4j/secret
-          NEO4J_dbms_memory_pagecache_size: 10M
-          NEO4J_dbms_memory_heap_initial__size: 10M
-        ports:
-          - 127.0.0.1:7687:7687
-      amazonServices:
-        image: localstack/localstack:0.11.1
-        env:
-          SERVICES: s3,dynamodb,sns,sqs,kms,ses
-          START_WEB: 0
-        ports:
-          - 127.0.0.1:8000:4569
-          - 127.0.0.1:8008:4572
-          - 127.0.0.1:8009:4575
-          - 127.0.0.1:8010:4576
-          - 127.0.0.1:8011:4599
-          - 127.0.0.1:8012:4566
-      redis:
-        image: redis:5.0.8-alpine
-        ports:
-          - 127.0.0.1:6379:6379
-    steps:
-      - name: Start mysql
-        shell: bash
-        run: |
-          netstat -ln
-          sudo service mysql stop || true
-          docker run --rm --publish 127.0.0.1:3306:3306 --name build-mysql -e MYSQL_USER=$DB_USER -e MYSQL_PASSWORD=$DB_PASSWORD -e MYSQL_DATABASE=$DB_NAME -e MYSQL_RANDOM_ROOT_PASSWORD=true -e MYSQL_DATABASE=hibernate_orm_test -d mysql:5 --skip-ssl
-      - name: Start DB2
-        # Cannot run as a service becuase the service schema does not support --privileged mode
-        shell: bash
-        run: |
-          docker run --rm --publish 50000:50000 --name build-db2 --privileged=true \
-            -e DB2INSTANCE=hreact -e DB2INST1_PASSWORD=hreact -e DBNAME=hreact -e LICENSE=accept -e AUTOCONFIG=false -e ARCHIVE_LOGS=false \
-            -d ibmcom/db2:11.5.0.0a
-
-      - uses: actions/checkout@v2
-
-      - name: apt clean
-        shell: bash
-        run: sudo apt-get clean
-
-      - name: Reclaim Disk Space
-        run: .github/ci-prerequisites.sh
-
-      - name: Set up JDK ${{ matrix.java.name }}
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        with:
-          java-version: ${{ matrix.java.java-version }}
-          release: ${{ matrix.java.release }}
-
-      - name: Download Maven Repo
-        uses: actions/download-artifact@v1
-        with:
-          name: maven-repo
-          path: .
-      - name: Extract Maven Repo
-        shell: bash
-        run: tar -xzf maven-repo.tgz -C ~
-      - name: Build with Maven
-        run: eval mvn $JVM_TEST_MAVEN_OPTS install ${{ matrix.java.maven_args}}
-      - name: Prepare failure archive (if maven failed)
-        if: failure()
-        shell: bash
-        run: find . -name '*-reports' -type d | tar -czf test-reports.tgz -T -
-      - name: Upload failure Archive (if maven failed)
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: test-reports-linux-jvm${{matrix.java.name}}
-          path: 'test-reports.tgz'
-
-  linux-jvm-gradle-tests:
-    name: JDK ${{matrix.java.name}} JVM Gradle Tests
-    runs-on: ubuntu-latest
-    needs: build-jdk11
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        java:
-          - { name: Java8,
-              java-version: 8
-          }
-          - {
-            name: "Java 8 - 242",
-            java-version: 8,
-            release: "jdk8u242-b08"
-          }
-          - {
-            name: Java 11,
-            java-version: 11
-          }
-          - {
-            name: Java 14,
-            java-version: 14
-          }
-    steps:
-      - uses: actions/checkout@v2
-      - name: Download Maven Repo
-        uses: actions/download-artifact@v1
-        with:
-          name: maven-repo
-          path: .
-      - name: Extract Maven Repo
-        shell: bash
-        run: tar -xzf maven-repo.tgz -C ~
-      - name: Build with Gradle
-        uses: eskatos/gradle-command-action@v1
-        env:
-          GRADLE_OPTS: -Xmx1408m
-        with:
-          gradle-version: wrapper
-          wrapper-directory: integration-tests/gradle
-          build-root-directory: integration-tests/gradle
-          arguments: clean test -i -S --stacktrace --no-daemon
-
-  windows-jdk11-jvm-tests:
-    name: Windows JDK 11 JVM Tests
-    needs: build-jdk11
-    runs-on: windows-latest
-    timeout-minutes: 180
-    env:
-      MAVEN_OPTS: -Xmx1408m
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        with:
-          java-version: 11
-      - name: Download Maven Repo
-        uses: actions/download-artifact@v1
-        with:
-          name: maven-repo
-          path: .
-      - name: Extract Maven Repo
-        shell: bash
-        run: tar -xzf maven-repo.tgz -C ~
-      - name: Build with Maven
-        shell: bash
-        run: mvn -B --settings .github/mvn-settings.xml -Dno-native -Dformat.skip -pl !integration-tests/gradle install
-      - name: Prepare failure archive (if maven failed)
-        if: failure()
-        shell: bash
-        run: |
-          # Disambiguate windows find from cygwin find
-          /usr/bin/find . -name '*-reports' -type d | tar -czf test-reports.tgz -T -
-      - name: Upload failure Archive (if maven failed)
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: test-reports-windows-jdk11-jvm
-          path: 'test-reports.tgz'
-
-  windows-jdk11-jvm-gradle-tests:
-    name: Windows JDK 11 JVM Gradle Tests
-    needs: build-jdk11
-    runs-on: windows-latest
-    timeout-minutes: 80
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        with:
-          java-version: 11
-      - name: Download Maven Repo
-        uses: actions/download-artifact@v1
-        with:
-          name: maven-repo
-          path: .
-      - name: Extract Maven Repo
-        shell: bash
-        run: tar -xzf maven-repo.tgz -C ~
-      - name: Build with Gradle
-        uses: eskatos/gradle-command-action@v1
-        timeout-minutes: 60
-        env:
-          GRADLE_OPTS: -Xmx1408m
-        with:
-          gradle-version: wrapper
-          wrapper-directory: integration-tests/gradle
-          build-root-directory: integration-tests/gradle
-          arguments: clean test -i -S --stacktrace --no-daemon
-
-  tcks-test:
-    name: TCKS Test
-    needs: build-jdk11
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Reclaim Disk Space
-        run: .github/ci-prerequisites.sh
-      - name: Set up JDK 11
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        with:
-          java-version: 11
-      - name: Download Maven Repo
-        uses: actions/download-artifact@v1
-        with:
-          name: maven-repo
-          path: .
-      - name: Extract Maven Repo
-        shell: bash
-        run: tar -xzf maven-repo.tgz -C ~
-      - name: Build with Maven
-        run: mvn -B --settings .github/mvn-settings.xml -Dno-native -Dno-format -DskipTests -Dtcks install
-      - name: Verify with Maven
-        run: mvn -B --settings .github/mvn-settings.xml -f tcks/pom.xml verify
-      - name: Prepare failure archive (if maven failed)
-        if: failure()
-        shell: bash
-        run: find . -name '*-reports' -type d | tar -czf test-reports.tgz -T -
-      - name: Upload failure Archive (if maven failed)
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: test-reports-tcks
-          path: 'test-reports.tgz'
-
-  native-tests:
-    name: Native Tests - ${{matrix.category}}
-    needs: build-jdk11
-    runs-on: ubuntu-latest
-    # Ignore the following YAML Schema error
-    timeout-minutes: ${{matrix.timeout}}
-    strategy:
-      max-parallel: 8
-      fail-fast: false
-      matrix:
-        category: [Main, Data1, Data2, Data3, Data4, Data5, Data6, Security1, Security2, Security3, Amazon, Messaging, Cache, HTTP, Misc1, Misc2, Misc3, Misc4, Spring, gRPC]
-        include:
-          - category: Main
-            postgres: "true"
-            timeout: 40
-            test-modules: main
-          - category: Data1
-            mariadb: "true"
-            mssql: "true"
-            timeout: 65
-            test-modules: >
-              jpa-h2
-              jpa-mariadb
-              jpa-mssql
-              jpa-derby
-              jpa-without-entity
-              hibernate-tenancy
-          - category: Data2
-            db2: "true"
-            mysql: "true"
-            mariadb: "true"
-            timeout: 65
-            test-modules: >
-              jpa
-              jpa-mysql
-              jpa-db2
-              reactive-mysql-client
-              reactive-db2-client
-              hibernate-reactive-db2
-              hibernate-reactive-mysql
-          - category: Data3
-            postgres: "true"
-            timeout: 70
-            test-modules: >
-              flyway
-              hibernate-orm-panache
-              hibernate-orm-panache-kotlin
-              hibernate-orm-envers
-              liquibase
-          - category: Data4
-            neo4j: "true"
-            redis: "true"
-            timeout: 55
-            test-modules: >
-              mongodb-client
-              mongodb-panache
-              redis-client
-              neo4j
-              hibernate-orm-rest-data-panache
-          - category: Data5
-            postgres: "true"
-            timeout: 65
-            test-modules: >
-              jpa-postgresql
-              narayana-stm
-              narayana-jta
-              reactive-pg-client
-              hibernate-reactive-postgresql
-          - category: Data6
-            postgres: "true"
-            timeout: 40
-            test-modules: >
-              elasticsearch-rest-client
-              elasticsearch-rest-high-level-client
-              hibernate-search-elasticsearch
-          - category: Amazon
-            amazonServices: "true"
-            timeout: 45
-            test-modules: >
-              amazon-services
-              amazon-lambda
-              amazon-lambda-http
-          - category: Messaging
-            timeout: 75
-            test-modules: >
-              artemis-core
-              artemis-jms
-              kafka
-              kafka-streams
-              reactive-messaging-amqp
-          - category: Security1
-            timeout: 50
-            keycloak: "true"
-            test-modules: >
-              elytron-security-oauth2
-              elytron-security
-              elytron-security-jdbc
-              elytron-undertow
-              elytron-security-ldap
-          - category: Security2
-            timeout: 70
-            keycloak: "true"
-            test-modules: >
-              elytron-resteasy
-              oidc
-              oidc-code-flow
-              oidc-tenancy
-              keycloak-authorization
-          - category: Security3
-            timeout: 50
-            test-modules: >
-              vault
-              vault-app
-              vault-agroal
-          - category: Cache
-            timeout: 55
-            test-modules: >
-              infinispan-cache-jpa
-              infinispan-client
-              cache
-          - category: HTTP
-            timeout: 60
-            test-modules: >
-              resteasy-jackson
-              resteasy-mutiny
-              vertx
-              vertx-http
-              vertx-web
-              vertx-graphql
-              virtual-http
-              rest-client
-          - category: Misc1
-            timeout: 60
-            test-modules: >
-              maven
-              jackson
-              jsonb
-              jsch
-              jgit
-              quartz
-              qute
-              consul-config
-          - category: Misc2
-            timeout: 55
-            test-modules: >
-              tika
-              hibernate-validator
-              test-extension
-              logging-gelf
-              bootstrap-config
-          # kubernetes-client alone takes 30mn+
-          - category: Misc3
-            timeout: 60
-            test-modules: >
-              kubernetes-client
-          - category: Misc4
-            timeout: 30
-            test-modules: >
-              smallrye-graphql
-              picocli-native
-              gradle
-          - category: Spring
-            timeout: 50
-            test-modules: >
-              spring-di
-              spring-web
-              spring-data-jpa
-              spring-boot-properties
-              spring-cloud-config-client
-          - category: gRPC
-            timeout: 65
-            test-modules: >
-              grpc-health
-              grpc-interceptors
-              grpc-mutual-auth
-              grpc-plain-text
-              grpc-proto-v2
-              grpc-streaming
-              grpc-tls
-    steps:
-      # These should be services, but services do not (yet) allow conditional execution
-      - name: Postgres Service
-        run: |
-          docker run --rm --publish 5432:5432 --name build-postgres \
-          -e POSTGRES_USER=$DB_USER -e POSTGRES_PASSWORD=$DB_PASSWORD -e POSTGRES_DB=$DB_NAME \
-          -d postgres:10.5
-        if: matrix.postgres
-      - name: MySQL Service
-        run: |
-          sudo service mysql stop || true
-          docker run --rm --publish 3306:3306 --name build-mysql  \
-            -e MYSQL_USER=$DB_USER -e MYSQL_PASSWORD=$DB_PASSWORD -e MYSQL_DATABASE=$DB_NAME -e MYSQL_RANDOM_ROOT_PASSWORD=true \
-            -d mysql:5 --skip-ssl
-        if: matrix.mysql
-      - name: DB2 Service
-        run: |
-          docker run --rm --publish 50000:50000 --name build-db2 --privileged=true \
-            -e DB2INSTANCE=hreact -e DB2INST1_PASSWORD=hreact -e DBNAME=hreact -e LICENSE=accept -e AUTOCONFIG=false -e ARCHIVE_LOGS=false \
-            -d ibmcom/db2:11.5.0.0a
-        if: matrix.db2
-      - name: Maria DB Service
-        run: |
-          docker run --rm --publish 3308:3306 --name build-mariadb \
-            -e MYSQL_USER=$DB_USER -e MYSQL_PASSWORD=$DB_PASSWORD -e MYSQL_DATABASE=$DB_NAME -e MYSQL_ROOT_PASSWORD=secret \
-            -d mariadb:10.4
-        if: matrix.mariadb
-      - name: MS-SQL Service
-        run: |
-          docker run --rm --publish 1433:1433 --name build-mssql \
-            -e ACCEPT_EULA=Y -e SA_PASSWORD=ActuallyRequired11Complexity \
-            -d microsoft/mssql-server-linux:2017-CU13
-        if: matrix.mssql
-      - name: Amazon Services
-        run: |
-          docker run --rm --publish 8000:4569 --publish 8008:4572 --publish 8009:4575 --publish 8010:4576 --publish 8011:4599 --publish 8012:4566 --name build-amazon-service-clients -e SERVICES=s3,dynamodb,sns,sqs,kms,ses -e START_WEB=0 \
-            -d localstack/localstack:0.11.1
-        if: matrix.amazonServices
-      - name: Neo4j Service
-        run: |
-          docker run --rm --publish 7687:7687 --name build-neo4j \
-            -e NEO4J_AUTH=neo4j/secret -e NEO4J_dbms_memory_pagecache_size=10M -e NEO4J_dbms_memory_heap_initial__size=10M \
-            -d neo4j/neo4j-experimental:4.0.0-rc01
-        if: matrix.neo4j
-      - name: Redis Service
-        run: docker run --rm --publish 6379:6379 --name build-redis -d redis:5.0.8-alpine
-        if: matrix.redis
-      - name: Keycloak Service
-        run: |
-          docker run --rm --publish 8180:8080 --publish 8543:8443 --name build-keycloak \
-            -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e JAVA_OPTS=" \
-              -server -Xms64m -Xmx512m -XX:MetaspaceSize=96M \
-              -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true \
-              -Dkeycloak.profile.feature.upload_scripts=enabled" \
-            -d quay.io/keycloak/keycloak:11.0.0
-        if: matrix.keycloak
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        with:
-          java-version: 11
-      - name: Reclaim Disk Space
-        run: .github/ci-prerequisites.sh
-      - name: Download Maven Repo
-        uses: actions/download-artifact@v1
-        with:
-          name: maven-repo
-          path: .
-      - name: Extract Maven Repo
-        shell: bash
-        run: tar -xzf maven-repo.tgz -C ~
-      - name: Build with Maven
-        env:
-          TEST_MODULES: ${{matrix.test-modules}}
-          CATEGORY: ${{matrix.category}}
-        run: |
-          for i in $TEST_MODULES
-          do modules+=("integration-tests/$i"); done
-          IFS=,
-          eval mvn -pl "${modules[*]}" $NATIVE_TEST_MAVEN_OPTS
-          # add the 'simple with spaces' project to the run of 'Misc1' by executing it explicitly
-          # done because there is no good way to pass strings with empty values to the previous command
-          # so this hack is as good as any
-          if [ "$CATEGORY" == "Misc1" ]; then
-            mvn -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -f 'integration-tests/simple with space/' verify
-          fi
-      - name: Prepare failure archive (if maven failed)
-        if: failure()
-        shell: bash
-        run: find . -type d -name '*-reports' -o -wholename '*/build/reports/tests/functionalTest' | tar -czf test-reports.tgz -T -
-      - name: Upload failure Archive (if maven failed)
-        uses: actions/upload-artifact@v1
-        if: failure()
-        with:
-          name: test-reports-native-${{matrix.category}}
-          path: 'test-reports.tgz'
diff --git a/.github/workflows/ci-actions.yml.disabled b/.github/workflows/ci-actions.yml.disabled
new file mode 100644
index 0000000000000..3b13eb5faa54d
--- /dev/null
+++ b/.github/workflows/ci-actions.yml.disabled
@@ -0,0 +1,587 @@
+name: Quarkus CI
+
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    # paths-ignore in ci-fork-mvn-cache.yml should match
+    paths-ignore:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - 'docs/src/main/asciidoc/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+      - '.github/*.conf'
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths-ignore:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - 'docs/src/main/asciidoc/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+      - '.github/*.conf'
+
+env:
+  # Workaround testsuite locale issue
+  LANG: en_US.UTF-8
+  NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dquarkus.native.container-build=true -Dtest-containers -Dstart-containers -Dnative-image.xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs"
+  JVM_TEST_MAVEN_OPTS: "-e -B --settings .github/mvn-settings.xml -Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs"
+  DB_USER: hibernate_orm_test
+  DB_PASSWORD: hibernate_orm_test
+  DB_NAME: hibernate_orm_test
+jobs:
+  ci-sanity-check:
+    name: "CI Sanity Check"
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    steps:
+      - name: Build
+        run: sleep 30
+  build-jdk11:
+    name: "Initial JDK 11 Build"
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    # Skip draft PRs and those with WIP in the subject, rerun as soon as its removed
+    if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')) && ( \
+           github.event_name != 'pull_request' || ( \
+             github.event.pull_request.draft == false && \
+             github.event.pull_request.state != 'closed' && \
+             contains(github.event.pull_request.title, 'wip ') == false && \
+             contains(github.event.pull_request.title, '[wip]') == false && \
+             (
+               github.event.action != 'edited' || \
+               contains(github.event.changes.title.from, 'wip ') || \
+               contains(github.event.changes.title.from, '[wip]') \
+             ) \
+           ) \
+         )"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: n1hility/cancel-previous-runs@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Get Date
+        id: get-date
+        run: |
+          echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
+        shell: bash
+      - name: Cache Maven Repository
+        id: cache-maven
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          # refresh cache every month to avoid unlimited growth
+          key: q2maven-${{ steps.get-date.outputs.date }}
+      - name: Build
+        run: |
+          mvn -T1C -e -B -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks --settings .github/mvn-settings.xml clean install
+      - name: Verify extension dependencies
+        shell: bash
+        run: |
+          ./update-extension-dependencies.sh -B --settings .github/mvn-settings.xml
+          if [ `git status -s -u no '*pom.xml' | wc -l` -ne 0 ]
+          then
+            echo -e '\033[0;31mError:\033[0m Dependencies to extension artifacts are outdated! Run ./update-extension-dependencies.sh and add the modified pom.xml files to your commit.' 1>&2
+            exit 1
+          fi
+      - name: Tar Maven Repo
+        shell: bash
+        run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
+      - name: Persist Maven Repo
+        uses: actions/upload-artifact@v1
+        with:
+          name: maven-repo
+          path: maven-repo.tgz
+      - name: Delete Local Artifacts From Cache
+        shell: bash
+        run: rm -r ~/.m2/repository/io/quarkus
+
+  linux-jvm-tests:
+    name: JVM Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 240
+    env:
+      MAVEN_OPTS: -Xmx2048m -XX:MaxMetaspaceSize=1000m
+    strategy:
+      fail-fast: false
+      matrix:
+        java :
+          - { name: "8",
+              java-version: 8,
+              maven_args: "-pl !integration-tests/kubernetes/quarkus-standard-way"
+          }
+          - {
+            name: "11",
+            java-version: 11,
+            maven_args: ""
+          }
+          - {
+            name: "15",
+            java-version: 15,
+            maven_args: "-pl !integration-tests/kubernetes/quarkus-standard-way"
+          }
+
+    steps:
+      - name: Stop mysql
+        shell: bash
+        run: |
+          ss -ln
+          sudo service mysql stop || true
+
+      - uses: actions/checkout@v2
+
+      - name: apt clean
+        shell: bash
+        run: sudo apt-get clean
+
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+          release: ${{ matrix.java.release }}
+
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        run: eval mvn $JVM_TEST_MAVEN_OPTS install -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args}}
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-linux-jvm${{matrix.java.name}}
+          path: 'test-reports.tgz'
+
+  windows-jdk11-jvm-tests:
+    name: JVM Tests - JDK 11 Windows
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 180
+    env:
+      MAVEN_OPTS: -Xmx1408m  -XX:MaxMetaspaceSize=1000m
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        shell: bash
+        run: mvn -B --settings .github/mvn-settings.xml -DskipDocs -Dformat.skip -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: |
+          # Disambiguate windows find from cygwin find
+          /usr/bin/find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-windows-jdk11-jvm
+          path: 'test-reports.tgz'
+
+  linux-jvm-maven-tests:
+    name: Maven Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+          - {
+            name: "11",
+            java-version: 11
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+      - name: Run Maven integration tests
+        run: eval mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-linux-maven-java${{matrix.java.name}}
+          path: 'test-reports.tgz'
+
+  windows-jdk11-jvm-maven-tests:
+    name: Maven Tests - JDK 11 Windows
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Run Maven integration tests
+        shell: bash
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven'
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-windows-maven-java11
+          path: 'test-reports.tgz'
+
+  linux-jvm-gradle-tests:
+    name: Gradle Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+         - {
+            name: "11",
+            java-version: 11
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+      - name: Build with Gradle
+        uses: eskatos/gradle-command-action@v1
+        env:
+          GRADLE_OPTS: -Xmx1408m
+        with:
+          gradle-version: wrapper
+          wrapper-directory: integration-tests/gradle
+          build-root-directory: integration-tests/gradle
+          arguments: clean test -i -S --stacktrace --no-daemon
+
+  windows-jdk11-jvm-gradle-tests:
+    name: Gradle Tests - JDK 11 Windows
+    needs: build-jdk11
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    runs-on: windows-latest
+    timeout-minutes: 80
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Gradle
+        uses: eskatos/gradle-command-action@v1
+        timeout-minutes: 60
+        env:
+          GRADLE_OPTS: -Xmx1408m
+        with:
+          gradle-version: wrapper
+          wrapper-directory: integration-tests/gradle
+          build-root-directory: integration-tests/gradle
+          arguments: clean test -i -S --stacktrace --no-daemon
+
+  linux-jvm-devtools-tests:
+    name: Devtools Tests - JDK ${{matrix.java.name}}
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        java:
+          - {
+            name: "11",
+            java-version: 11
+          }
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK ${{ matrix.java.name }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: ${{ matrix.java.java-version }}
+      - name: Run Devtools integration tests
+        run: eval mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-linux-devtools-java${{matrix.java.name}}
+          path: 'test-reports.tgz'
+
+  windows-jdk11-jvm-devtools-tests:
+    name: Devtools Tests - JDK 11 Windows
+    runs-on: windows-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    needs: build-jdk11
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Run Devtools integration tests
+        shell: bash
+        run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools'
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-windows-devtools-java11
+          path: 'test-reports.tgz'
+
+  tcks-test:
+    name: MicroProfile TCKs Tests
+    needs: build-jdk11
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    runs-on: ubuntu-latest
+    timeout-minutes: 150
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          path: tcks
+      - name: Download RESTEasy Reactive Testsuite
+        uses: actions/checkout@v2
+        with:
+          repository: quarkusio/resteasy-reactive-testsuite
+          path: resteasy-reactive-testsuite
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+        working-directory: ./tcks
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Run RESTEasy Reactive TCK
+        run: mvn -B --settings ../tcks/.github/mvn-settings.xml install
+        working-directory: ./resteasy-reactive-testsuite
+      - name: Verify with Maven
+        run: mvn -B --settings .github/mvn-settings.xml -f tcks/pom.xml install
+        working-directory: ./tcks
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -name '*-reports' -type d -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-tcks
+          path: 'test-reports.tgz'
+
+  native-tests-read-json-matrix:
+    name: Native Tests - Read JSON matrix
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    outputs:
+      matrix: ${{ steps.read.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: read
+        run: |
+          json=$(tr -d '\n' < .github/native-tests.json )
+          echo $json
+          echo "::set-output name=matrix::${json}"
+
+  native-tests:
+    name: Native Tests - ${{matrix.category}}
+    needs: [build-jdk11, native-tests-read-json-matrix]
+    runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
+    # Ignore the following YAML Schema error
+    timeout-minutes: ${{matrix.timeout}}
+    strategy:
+      max-parallel: 8
+      fail-fast: false
+      matrix: ${{ fromJson(needs.native-tests-read-json-matrix.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      # We do this so we can get better analytics for the downloaded version of the build images
+      - name: Update Docker Client User Agent
+        shell: bash
+        run: |
+          cat <<< $(jq '.HttpHeaders += {"User-Agent": "Quarkus-CI-Docker-Client"}' ~/.docker/config.json) > ~/.docker/config.json
+      - name: Download Maven Repo
+        uses: actions/download-artifact@v1
+        with:
+          name: maven-repo
+          path: .
+      - name: Extract Maven Repo
+        shell: bash
+        run: tar -xzf maven-repo.tgz -C ~
+      - name: Build with Maven
+        env:
+          TEST_MODULES: ${{matrix.test-modules}}
+          CATEGORY: ${{matrix.category}}
+        run: |
+          for i in $TEST_MODULES
+          do modules+=("integration-tests/$i"); done
+          IFS=,
+          eval mvn -pl "${modules[*]}" $NATIVE_TEST_MAVEN_OPTS
+          # add the 'simple with spaces' project to the run of 'Misc1' by executing it explicitly
+          # done because there is no good way to pass strings with empty values to the previous command
+          # so this hack is as good as any
+          if [ "$CATEGORY" == "Misc1" ]; then
+            mvn -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -f 'integration-tests/simple with space/' verify
+          fi
+      - name: Prepare failure archive (if maven failed)
+        if: failure()
+        shell: bash
+        run: find . -type d -name '*-reports' -o -wholename '*/build/reports/tests/functionalTest' -o -name '*.log' | tar -czf test-reports.tgz -T -
+      - name: Upload failure Archive (if maven failed)
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: test-reports-native-${{matrix.category}}
+          path: 'test-reports.tgz'
diff --git a/.github/workflows/ci-fork-mvn-cache.yml b/.github/workflows/ci-fork-mvn-cache.yml
new file mode 100644
index 0000000000000..4ea53d6482213
--- /dev/null
+++ b/.github/workflows/ci-fork-mvn-cache.yml
@@ -0,0 +1,61 @@
+name: Quarkus CI Fork Maven Cache
+
+on:
+  push:
+    branches:
+      - 'main'
+    # paths-ignore should match ci-actions.yml
+    paths-ignore:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - 'docs/src/main/asciidoc/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+      - '.github/*.conf'
+  schedule:
+    # first day of month at 12:10am
+    - cron: '10 0 1 * *'
+
+env:
+  LANG: en_US.UTF-8
+jobs:
+  build-jdk11:
+    name: "Quick JDK 11 Build"
+    runs-on: ubuntu-latest
+    # Skip in main repo
+    if: github.repository != 'quarkusio/quarkus'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: n1hility/cancel-previous-runs@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          workflow: ci-fork-mvn-cache.yml
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      - name: Set up JDK 11
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 11
+      - name: Get Date
+        id: get-date
+        run: |
+          echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
+        shell: bash
+      - name: Cache Maven Repository
+        id: cache-maven
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          # refresh cache every month to avoid unlimited growth
+          key: q2maven-${{ steps.get-date.outputs.date }}
+      - name: Build
+        run: |
+          mvn -T1C -e -B --settings .github/mvn-settings.xml -Dquickly-ci -Dtcks clean install
+      - name: Delete Local Artifacts From Cache
+        shell: bash
+        run: rm -r ~/.m2/repository/io/quarkus
diff --git a/.github/workflows/ci-sanity-check.yml b/.github/workflows/ci-sanity-check.yml
new file mode 100644
index 0000000000000..b5670a797133c
--- /dev/null
+++ b/.github/workflows/ci-sanity-check.yml
@@ -0,0 +1,33 @@
+# Create the CI Sanity Check entry even when we only have ignored files
+name: Quarkus CI Sanity Check
+
+on:
+  push:
+    paths:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+  pull_request:
+    paths:
+      - '.gitignore'
+      - '.dockerignore'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/*.yml'
+      - '.github/*.java'
+
+jobs:
+  ci-sanity-check:
+    name: "CI Sanity Check"
+    runs-on: ubuntu-latest
+    if: github.repository == 'quarkusio/quarkus'
+    steps:
+      - name: Build
+        run: sleep 1
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000000..2f95a12fa9821
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,57 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL Security Scan"
+
+on:
+
+  schedule:
+    - cron: '0 3 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    if: github.repository == 'quarkusio/quarkus'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['java']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+          fetch-depth: 1
+          ref: main
+    - name: Setup Java JDK
+      uses: actions/setup-java@v1
+      with:
+            java-version: 11
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+
+    - if: matrix.language == 'java' 
+      name: Build Java
+      run: mvn -B --settings .github/mvn-settings.xml -Dquickly-ci install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/deploy-snapshots.yml b/.github/workflows/deploy-snapshots.yml
new file mode 100644
index 0000000000000..211226573c11a
--- /dev/null
+++ b/.github/workflows/deploy-snapshots.yml
@@ -0,0 +1,66 @@
+name: Quarkus Deploy Snapshots
+
+on:
+  schedule:
+    - cron: '0 2 * * *'
+
+env:
+  LANG: en_US.UTF-8
+jobs:
+  build-and-deploy:
+    name: "Build and deploy"
+    runs-on: ubuntu-latest
+    if: github.repository == 'quarkusio/quarkus'
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: main
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      - name: Set up JDK 8
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 8
+      - name: Get Date
+        id: get-date
+        run: |
+          echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
+        shell: bash
+      - name: Cache Maven Repository
+        id: cache-maven
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          # refresh cache every month to avoid unlimited growth
+          key: q2maven-${{ steps.get-date.outputs.date }}
+      - name: Build and Deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
+          SERVER_USERNAME: ${{ secrets.SERVER_USERNAME }}
+          SERVER_PASSWORD: ${{ secrets.SERVER_PASSWORD }}
+        run: |
+          mvn -e -B --settings .github/mvn-settings.xml \
+            -DskipITs -Dno-format -Dinvoker.skip=true \
+            -DretryFailedDeploymentCount=10 \
+            clean deploy
+      - name: Delete Local Artifacts From Cache
+        shell: bash
+        run: rm -r ~/.m2/repository/io/quarkus
+
+      - name: Report
+        if: always()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
+          STATUS: ${{ job.status }}
+          ISSUE_NUMBER: "12111"
+        run: |
+          echo "The report step got status: ${STATUS}"
+          sudo apt-get update -o Dir::Etc::sourcelist="sources.list" \
+            -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+          sudo apt-get install -y gnupg2 gnupg-agent
+          echo Installing SDKMAN
+          curl -s "https://get.sdkman.io" | bash
+          source ~/.sdkman/bin/sdkman-init.sh && \
+          sdk install jbang 0.36.1
+          jbang .github/NativeBuildReport.java token="${GITHUB_TOKEN}" status="${STATUS}" issueRepo="${GITHUB_REPOSITORY}" issueNumber="${ISSUE_NUMBER}" thisRepo="${GITHUB_REPOSITORY}" runId="${GITHUB_RUN_ID}"
diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
index cf501673c5e2c..4e0705179af53 100644
--- a/.github/workflows/doc-build.yml
+++ b/.github/workflows/doc-build.yml
@@ -4,15 +4,25 @@ on:
   push:
     paths:
       - 'docs/src/main/asciidoc/**'
+      - '.github/workflows/doc-build.yml'
   pull_request:
     paths:
       - 'docs/src/main/asciidoc/**'
+      - '.github/workflows/doc-build.yml'
 
 
 jobs:
+  ci-sanity-check:
+    name: "CI Sanity Check"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build
+        run: sleep 30
   build-doc:
     name: "Documentation Build"
     runs-on: ubuntu-latest
+    # Skip main in forks
+    if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
     steps:
       - uses: actions/checkout@v2
       - uses: n1hility/cancel-previous-runs@v2
@@ -20,25 +30,23 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up JDK 11
         # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
         with:
           java-version: 11
-      - name: Compute cache restore key
-        # Always recompute on a push so that the maven repo doesnt grow indefinitely with old versions
+      - name: Get Date
+        id: get-date
         run: |
-          if ${{ github.event_name == 'pull_request' }}; then echo "::set-env name=COMPUTED_RESTORE_KEY::q2maven-"; fi
+          echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
       - name: Cache Maven Repository
         id: cache-maven
-        uses: n1hility/cache@v2
+        uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          # Improves the reusability of the cache to limit key changes
-          key: q2maven-${{ hashFiles('bom/runtime/pom.xml') }}
-          restore-keys: ${{ env.COMPUTED_RESTORE_KEY }}
-          restore-only: ${{ github.event_name == 'pull_request' }}
+          # refresh cache every month to avoid unlimited growth
+          key: q2maven-doc-${{ steps.get-date.outputs.date }}
       - name: Build
         run: |
-          mvn -Dquickly
+          mvn -Dquickly-ci -B --settings .github/mvn-settings.xml install
       - name: Build Docs
         run: |
-          mvn -e -B clean org.asciidoctor:asciidoctor-maven-plugin:process-asciidoc -pl docs -Ddocumentation-pdf
\ No newline at end of file
+          mvn -e -B --settings .github/mvn-settings.xml clean org.asciidoctor:asciidoctor-maven-plugin:process-asciidoc -pl docs -Ddocumentation-pdf
diff --git a/.github/workflows/native-cron-build.yml b/.github/workflows/native-cron-build.yml
deleted file mode 100644
index aa414f8d2b99a..0000000000000
--- a/.github/workflows/native-cron-build.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: "Quarkus CI - JDK 8 Native Build"
-on:
-  schedule:
-    - cron: '0 2 * * *'
-  repository_dispatch:
-
-
-jobs:
-  build:
-    if: github.repository == 'quarkusio/quarkus'
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        java: [ 8 ]
-    name: build-and-testing
-    steps:
-
-      - name: Stop MySQL
-        run: sudo systemctl stop mysql
-
-      - name: Pull docker image
-        run: docker pull quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java${{ matrix.java }}
-
-      - name: Set up JDK ${{ matrix.java }}
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        if: matrix.java != '8'
-        with:
-          java-version: ${{ matrix.java }}
-
-      - name: Set up JDK ${{ matrix.java }}
-        # Uses sha for added security since tags can be updated
-        uses: joschi/setup-jdk@b9cc6eabf7e7e3889766b5cee486f874c9e1bd2d
-        if: matrix.java == '8'
-        with:
-          java-version: ${{ matrix.java }}
-          # stay on a version before 252 for now because it breaks ALPN handling
-          release: jdk8u242-b08
-
-      - name: Checkout Quarkus
-        uses: actions/checkout@v2
-        with:
-          repository: quarkusio/quarkus
-          ref: master
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-native-cron-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-native-cron-
-
-      - name: Build Quarkus
-        run: mvn -B install -DskipTests -DskipITs -Dformat.skip
-
-      - name: Run integration tests in native
-        run: mvn -B --settings .github/mvn-settings.xml verify -f integration-tests/pom.xml --fail-at-end -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-db2 -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-kafka -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test" -pl '!io.quarkus:quarkus-integration-test-google-cloud-functions-http,!io.quarkus:quarkus-integration-test-google-cloud-functions,!io.quarkus:quarkus-integration-test-funqy-google-cloud-functions'
-
-      - name: Report
-        if: always()
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
-          STATUS: ${{ job.status }}
-          JAVA_VERSION: ${{ matrix.java }}
-        run: |
-          echo "The report step got status: ${STATUS}"
-          sudo apt-get update -o Dir::Etc::sourcelist="sources.list" \
-            -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
-          sudo apt-get install -y gnupg2 gnupg-agent
-          echo Installing SDKMAN
-          curl -s "https://get.sdkman.io" | bash
-          source ~/.sdkman/bin/sdkman-init.sh && \
-          sdk install jbang 0.21.0
-          [[ ${JAVA_VERSION} = 8 ]] && ISSUE_NUMBER="6717" || ISSUE_NUMBER="6723"
-          jbang .github/NativeBuildReport.java token="${GITHUB_TOKEN}" status="${STATUS}" issueRepo="${GITHUB_REPOSITORY}" issueNumber="${ISSUE_NUMBER}" thisRepo="${GITHUB_REPOSITORY}" runId="${GITHUB_RUN_ID}"
diff --git a/.github/workflows/native-cron-build.yml.disabled b/.github/workflows/native-cron-build.yml.disabled
new file mode 100644
index 0000000000000..fc0f0e64187b8
--- /dev/null
+++ b/.github/workflows/native-cron-build.yml.disabled
@@ -0,0 +1,76 @@
+# Disabled because we mostly don't care about Java 8 native image
+name: "Quarkus CI - JDK 8 Native Build"
+on:
+  schedule:
+    - cron: '0 2 * * *'
+  repository_dispatch:
+
+
+jobs:
+  build:
+    if: github.repository == 'quarkusio/quarkus'
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        java: [ 8 ]
+    name: build-and-testing
+    steps:
+
+      - name: Stop MySQL
+        run: sudo systemctl stop mysql
+
+      - name: Pull docker image
+        run: docker pull quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java${{ matrix.java }}
+
+      - name: Set up JDK ${{ matrix.java }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        if: matrix.java != '8'
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Set up JDK ${{ matrix.java }}
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        if: matrix.java == '8'
+        with:
+          java-version: ${{ matrix.java }}
+          # stay on a version before 252 for now because it breaks ALPN handling
+          release: jdk8u242-b08
+
+      - name: Checkout Quarkus
+        uses: actions/checkout@v2
+        with:
+          repository: quarkusio/quarkus
+          ref: main
+
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-native-cron-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-native-cron-
+
+      - name: Build Quarkus
+        run: mvn -B install -DskipTests -DskipITs -Dformat.skip
+
+      - name: Run integration tests in native
+        run: mvn -B --settings .github/mvn-settings.xml verify -f integration-tests/pom.xml --fail-at-end -Dno-format -Dtest-containers -Dstart-containers -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java${{ matrix.java }} -pl '!io.quarkus:quarkus-integration-test-google-cloud-functions-http,!io.quarkus:quarkus-integration-test-google-cloud-functions,!io.quarkus:quarkus-integration-test-funqy-google-cloud-functions'
+
+      - name: Report
+        if: always()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
+          STATUS: ${{ job.status }}
+          JAVA_VERSION: ${{ matrix.java }}
+        run: |
+          echo "The report step got status: ${STATUS}"
+          sudo apt-get update -o Dir::Etc::sourcelist="sources.list" \
+            -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+          sudo apt-get install -y gnupg2 gnupg-agent
+          echo Installing SDKMAN
+          curl -s "https://get.sdkman.io" | bash
+          source ~/.sdkman/bin/sdkman-init.sh && \
+          sdk install jbang 0.21.0
+          [[ ${JAVA_VERSION} = 8 ]] && ISSUE_NUMBER="6717" || ISSUE_NUMBER="6723"
+          jbang .github/NativeBuildReport.java token="${GITHUB_TOKEN}" status="${STATUS}" issueRepo="${GITHUB_REPOSITORY}" issueNumber="${ISSUE_NUMBER}" thisRepo="${GITHUB_REPOSITORY}" runId="${GITHUB_RUN_ID}"
diff --git a/.github/workflows/quarkus-bot-lint.yml b/.github/workflows/quarkus-bot-lint.yml
new file mode 100644
index 0000000000000..83689a18f5dbe
--- /dev/null
+++ b/.github/workflows/quarkus-bot-lint.yml
@@ -0,0 +1,22 @@
+name: quarkus-bot.yml lint
+
+on:
+  push:
+    paths:
+      - '.github/quarkus-bot.yml'
+  pull_request:
+    paths:
+      - '.github/quarkus-bot.yml'
+
+jobs:
+  lint:
+    name: "quarkus-bot.yml validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: install yamllint
+        shell: bash
+        run: sudo apt-get install -y yamllint
+      - name: run yamllint for bot
+        shell: bash
+        run: yamllint -c .github/yamllint.conf .github/quarkus-bot.yml
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
new file mode 100644
index 0000000000000..78c1857f597e4
--- /dev/null
+++ b/.github/workflows/release-build.yml
@@ -0,0 +1,48 @@
+name: Quarkus Release Test Build
+
+on:
+  schedule:
+    - cron: '0 3 * * *'
+env:
+  LANG: en_US.UTF-8
+jobs:
+  build:
+    name: "Prepare release"
+    runs-on: ubuntu-latest
+    if: github.repository == 'quarkusio/quarkus'
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: main
+      - name: Reclaim Disk Space
+        run: .github/ci-prerequisites.sh
+      - name: Set up JDK 8
+        # Uses sha for added security since tags can be updated
+        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        with:
+          java-version: 8
+      - name: Create maven repo
+        run: mkdir -p $HOME/release/repository
+      - name: Build and Test
+        run: |
+          mvn --settings .github/mvn-settings.xml \
+            -B \
+            -DskipITs -Dinvoker.skip=true \
+            -Dmaven.repo.local=$HOME/release/repository \
+            clean install
+      - name: Report
+        if: always()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
+          STATUS: ${{ job.status }}
+          ISSUE_NUMBER: "13058"
+        run: |
+          echo "The report step got status: ${STATUS}"
+          sudo apt-get update -o Dir::Etc::sourcelist="sources.list" \
+            -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+          sudo apt-get install -y gnupg2 gnupg-agent
+          echo Installing SDKMAN
+          curl -s "https://get.sdkman.io" | bash
+          source ~/.sdkman/bin/sdkman-init.sh && \
+          sdk install jbang 0.52.1
+          jbang .github/NativeBuildReport.java token="${GITHUB_TOKEN}" status="${STATUS}" issueRepo="${GITHUB_REPOSITORY}" issueNumber="${ISSUE_NUMBER}" thisRepo="${GITHUB_REPOSITORY}" runId="${GITHUB_RUN_ID}"
diff --git a/.github/workflows/sonarcloud.yml.disabled b/.github/workflows/sonarcloud.yml.disabled
new file mode 100644
index 0000000000000..aa0856ef4097d
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml.disabled
@@ -0,0 +1,39 @@
+name: Sonarcloud Analysis
+#on:
+#  push:
+#    branches:
+#      - main
+#  pull_request:
+#    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Get Date
+        id: get-date
+        run: |
+          echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
+        shell: bash
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar-${{ steps.get-date.outputs.date }}
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ steps.get-date.outputs.date }}
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./mvnw -B -Dquickly-ci install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
diff --git a/.github/yamllint.conf b/.github/yamllint.conf
new file mode 100644
index 0000000000000..1b6be046eb9a1
--- /dev/null
+++ b/.github/yamllint.conf
@@ -0,0 +1,5 @@
+extends: default
+
+rules:
+  line-length: disable
+  commas: disable
diff --git a/.gitignore b/.gitignore
index 595df374f0f03..d5e7198cd98ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ graph-output.dot
 *.swo
 ObjectStore
 .gradle
-build
 docker/distroless/bazel-*
 /.apt_generated_tests/
 quarkus.log
@@ -35,3 +34,5 @@ replay_*.logß
 nbactions.xml
 nb-configuration.xml
 .cache
+/lsp/
+.jbang
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000000000..4230c24172f9b
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,3 @@
+-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+-Dmaven.wagon.http.retryHandler.requestSentEnabled=true
+-Dmaven.wagon.http.retryHandler.count=10
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index b901097f2db6e..e76d1f3241d38 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -5,7 +5,7 @@
  * 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
+ *      https://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,
diff --git a/ADOPTERS.md b/ADOPTERS.md
index ec1a7fc248f11..b25f054f1ef51 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -13,6 +13,9 @@ If any organization would like get added or removed please make a pull request b
 | Organization          | Reference                                                                        |
 |-----------------------|----------------------------------------------------------------------------------|
 |Artes                  | https://horvie.github.io/adopt-quarkus/                                          |
+|B<>com                 | https://5g.labs.b-com.com/                                                       |
+|Carrefour              | https://horizons.carrefour.com/efficient-java-in-the-cloud-with-quarkus          |
+|Cytech                 | https://quarkus.io/blog/cytech-customer-story/                                   |
 |Ennovative Solutions   | https://quarkus.io/blog/ennovativesolutions-uses-quarkus-with-aws-lambda/        |
 |GoWithFlow             | https://quarkus.io/blog/gowithflow-chooses-quarkus-to-deliver-fast-to-production/|
 |Lufthansa Technik      | https://quarkus.io/blog/aviatar-experiences-significant-savings/                 |
@@ -20,4 +23,6 @@ If any organization would like get added or removed please make a pull request b
 |Sedona                 | https://quarkus.io/blog/sedona-rewrites-insurance-premium/                       |
 |Suomen Asiakastieto Oy | https://quarkus.io/blog/asiakastieto-chooses-quarkus-for-microservices/          |
 |Talkdesk               | https://quarkus.io/blog/talkdesk-chooses-quarkus-for-fast-innovation/            |
+|UTN Faculty Córdoba    | https://www.frc.utn.edu.ar/computos/tech/                                        |
 |Vodafone Greece        | https://quarkus.io/blog/vodafone-greece-replaces-spring-boot/                    |
+|Wipro                  | https://quarkus.io/blog/wipro-customer-story/                                    |
diff --git a/COMMITTERS.adoc b/COMMITTERS.adoc
new file mode 100644
index 0000000000000..bfd6edef4d9b1
--- /dev/null
+++ b/COMMITTERS.adoc
@@ -0,0 +1,245 @@
+= Information for Quarkus Committers
+
+This document contains useful information for Quarkus committers.
+
+[NOTE]
+====
+It is a work in progress, so if you think information is missing/unclear/inadequate,
+please reach out to us on the `quarkus-dev` mailing-list.
+====
+
+This document has a lot of information.
+It is not a set of strict rules, it is here to guide you.
+If you forget to do something, miss something, don't worry, it happens.
+
+Do your best and that will already be a lot :).
+
+== Merging Pull Requests
+
+The first thing is that, while being a committer,
+you can't really commit directly to the main repository:
+you need at least one review by your peers.
+
+Thus the need for a pull request.
+
+So you are more like a merger than a committer
+and you might merge more PRs from others than your own work.
+
+While not absolute, here is some advice:
+
+* If you really want a review by a specific person, make it a named reviewer via GitHub's "Reviewers" UI
+* If someone asked for a specific reviewer, better give some time for this person to review the PR.
+  If not reviewed in a reasonable amount of time, better ping them again to have some information
+  or ask the original author if we should go ahead.
+* If in doubt (on a specific part or because you're not comfortable reviewing documentation or any other reason),
+  ask for help.
+* Except if it's a total no-brainer (typically a typo fix), let the PR bake a few hours so some other people can have a
+  look if interested.
+  If the PR is very large or is a new extension, better let it
+  bake for a few days.
+* We do merge commits so please ask the author to properly squash the commits before merging.
+  The idea is to have proper semantic commits.
+  If the author is not familiar with Git or not available, you can also (carefully)
+  https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/committing-changes-to-a-pull-request-branch-created-from-a-fork[do it for them]
+  as long as you both agreed on it.
+* Make sure the commit comments are meaningful.
+* As a new committer, you can start by giving your approval and not merging and see how things evolve.
+  This should give you some hints of important things to check in the future.
+* Only merge pull requests that target main.
+  **Dealing with old branches is a separate process.**
+* If you are sure a PR should go in and is just waiting for CI,
+  just use the `triage/waiting-for-ci` label.
+  It is a good hint for other committers.
+* If you think a pull request is an essential part of a given milestone (and can realistically be a part of it),
+  you should affect this milestone to it so that we can be sure it stays on the radar.
+* If you think a pull request is worth mentioning in the release notes and/or
+  the announcement blog post, add the `release/noteworthy-feature` label.
+* Do NOT affect a PR to an old branch, see the <<backporting-process,backporting process>> for more details.
+
+Obviously, each situation is different so use your own judgement,
+and if in doubt, just ask for advice, the other committers are here to help.
+
+[[release-schedule]]
+== Release Schedule
+
+The release schedule is posted here: https://github.com/quarkusio/quarkus/wiki/Release-Planning .
+
+There are a few things you can do to help us be on schedule:
+
+* Anything that goes in a release should have been **merged** the day before the release.
+  That means:
++
+  ** Your PR needs to be created, obviously.
+  ** It should be reviewed by someone familiar with this area.
+  ** You have to take this feedback into account.
+  ** And once approved, the PR can be merged.
+  ** Also, keep in mind that we have a 3 hours CI cycle and CI needs to be green before any inclusion.
++
+In short, posting a large PR the day before the release won't work.
+
+* In the case of a significant change, the release considered for inclusion shouldn't be
+  the `.Final` but the `.CR1.`.
+  Thus, your PR has to be merged the day before the release of `.CR1`.
+
+* If, for some reason, a PR really needs to be part of a given release, better coordinate with
+  the release manager and the potential reviewers so that everyone is aware something big is coming.
+  Potential reviewers might also have their own agenda and work to be included in the release,
+  thus not always having the cycles to review last minute.
+
+== Dependency Upgrades
+
+Quarkus depends on a lot of third party dependencies that we try to keep up to date.
+
+We partially rely on Dependabot for https://github.com/quarkusio/quarkus/blob/main/.github/dependabot.yml[a curated list of dependencies].
+
+Some dependencies are critical for Quarkus and quite complex.
+Good examples would be Vert.x or Hibernate ORM.
+
+It is good practice to update these core dependencies at the beginning of a given
+release cycle to let them time to bake in the main branch before being released.
+
+== Backward Compatibility
+
+Quarkus evolves very fast and we decided we could break backward compatibility as long as:
+
+* It is worth it.
+* We try to support the previous behavior for a while - if it doesn't have a prohibitive cost,
+  be it in terms of development time or added complexity.
+
+Usually, it is a good idea to have the opinion of people involved in the development of this area.
+And for widely used extensions or core changes, sending an email on the `quarkus-dev` mailing list
+should be considered.
+
+Breaking changes should be marked with the `release/breaking-change` label and,
+if they need to be included in the release notes and/or announcement blog post,
+they should also be labelled with `release/noteworthy-feature`.
+
+They must be documented in the migration guide of the appropriate version:
+https://github.com/quarkusio/quarkus/wiki/Migration-Guides.
+
+== Pull Request Title
+
+The title should be in English, should not contain an issue number.
+It should also not contain ellipsis.
+
+If your commit message was too long and GitHub automatically cut
+the title, it is helpful if you can take the time to move the cut
+part where it belongs to have a full title.
+
+Titles are included in the Release notes so they are important.
+
+A good title would look like: `Fix off by one issue in Quartz extension` or
+`Introduce Hibernate Reactive extension`.
+
+A bad title would look like: `fix(#444)`.
+
+== Issues Fixed
+
+When a PR fixes some issues, it's good practice to add it in the description (and not in the title!).
+
+One issue per line with something like:
+
+[source,asciidoc]
+----
+* Fix #444
+* Fix #555
+----
+
+Given GitHub automatically extracts the commit information to fill in the PR fields,
+just make your commit comment look like:
+
+[source]
+----
+Fix off by one issue in Quartz extension
+
+* Fix #444
+* Fix #555
+----
+
+[TIP]
+====
+GitHub supports a variety of keywords here: `fix`, `fixes`, `fixed`,
+`resolve`, `resolves`, `resolved`, `close`, `closes`, `closed`
+all do the same thing.
+====
+
+[WARNING]
+====
+GitHub won't detect issues properly if you do something like
+`Fix #444 #555`.
+====
+
+== Affecting Labels and Milestones
+
+Affecting labels and milestones is very important in our process.
+
+Before each release, we check that we don't have any
+closed issues that don't have either a milestone affected or
+some of the "excluding" labels.
+
+Thus:
+
+* If you close a pull request because the committers have decided to not merge it,
+  please add the appropriate `triage/` label: `triage/invalid`, `triage/out-of-date`,
+  `triage/wontfix` are usually in order.
+* If you close an issue because it has been fixed, either add the milestone
+  if you can find it easily or use the `triage/out-of-date` if you can't.
+* If you close an issue for any other reason, one of the aforementioned `triage/` labels
+  is probably adequate.
+* Some issues are created as `kind/bug` but are more support questions:
+  in this case, remove the `kind/bug` label and add the `kind/question` label.
+
+[[backporting-process]]
+== Backporting Process
+
+When we release a new version of Quarkus, we usually do a bugfix
+release a couple of weeks after.
+
+Every time we do a major release (e.g. `1.7.0.Final`), we create a release branch (e.g. `1.7`) to host
+the commits for these bugfix releases.
+
+All the pull requests are merged in the `main` branch so they are applied to the new feature 
+release of Quarkus.
+They won't be integrated in the previous version branch.
+
+Some pull requests however may qualify for being backported to this
+bugfix branch.
+
+Good examples of that might be:
+
+* bugfixes
+* documentation fixes
+* usability fixes
+
+Obviously, the barrier is higher for large pull requests as
+they might be more risky to backport.
+But sometimes, we just have to backport them anyway.
+
+If you think your pull request or the pull request you are reviewing, might be a good backport candidate,
+please add the `triage/backport?` label.
+
+The question mark is important:
+it is not automatic and we carefully review each pull request before backporting.
+
+Thus, if not entirely clear, don't hesitate to add a comment to the pull request
+when adding the label.
+
+And don't be surprised if we come to you with some questions about it
+when we prepare the next bugfix release.
+
+== Good First Issues
+
+We need to find the right balance between fixing the issue right away
+and trying to onboard new contributors.
+
+It's not always easy to find one, but if you think the issue is appropriate,
+affecting it the `good first issue` label for some time might be a good thing.
+
+Obviously, critical bugs are not good candidates :).
+
+== I Did Something Wrong, What Should I Do?
+
+Take a deep breath and don't worry, it happens.
+
+Just ping `@quarkusio/committerhelp` on GitHub or `@committerhelp` on Zulip
+and we will find a solution.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 742c86f6bae01..5b74c54ae1dcd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,6 +5,42 @@ We try to make it easy, and all contributions, even the smaller ones, are more t
 This includes bug reports, fixes, documentation, examples... 
 But first, read this page (including the small print at the end).
 
+* [Legal](#legal)
+* [Reporting an issue](#reporting-an-issue)
+* [Checking an issue is fixed in main](#checking-an-issue-is-fixed-in-main)
+  + [Using snapshots](#using-snapshots)
+  + [Building main](#building-main)
+  + [Updating the version](#updating-the-version)
+* [Before you contribute](#before-you-contribute)
+  + [Code reviews](#code-reviews)
+  + [Coding Guidelines](#coding-guidelines)
+  + [Continuous Integration](#continuous-integration)
+  + [Tests and documentation are not optional](#tests-and-documentation-are-not-optional)
+* [Setup](#setup)
+  + [IDE Config and Code Style](#ide-config-and-code-style)
+    - [Eclipse Setup](#eclipse-setup)
+    - [IDEA Setup](#idea-setup)
+* [Build](#build)
+  + [Workflow tips](#workflow-tips)
+    - [Building all modules of an extension](#building-all-modules-of-an-extension)
+    - [Building a single module of an extension](#building-a-single-module-of-an-extension)
+    - [Running a single test](#running-a-single-test)
+    - [Automatic incremental build](#automatic-incremental-build)
+      * [Special case `bom-descriptor-json`](#special-case--bom-descriptor-json-)
+      * [Usage by CI](#usage-by-ci)
+* [Usage](#usage)
+    - [With Maven](#with-maven)
+    - [With Gradle](#with-gradle)
+  + [MicroProfile TCK's](#microprofile-tck-s)
+  + [Test Coverage](#test-coverage)
+* [Extensions](#extensions)
+  + [Descriptions](#descriptions)
+  + [Update dependencies to extensions](#update-dependencies-to-extensions)
+* [The small print](#the-small-print)
+* [Frequently Asked Questions](#frequently-asked-questions)
+
+<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
+
 ## Legal
 
 All original contributions to Quarkus are licensed under the
@@ -22,15 +58,15 @@ This project uses GitHub issues to manage the issues. Open an issue directly in
 If you believe you found a bug, and it's likely possible, please indicate a way to reproduce it, what you are seeing and what you would expect to see.
 Don't forget to indicate your Quarkus, Java, Maven/Gradle and GraalVM version. 
 
-## Checking an issue is fixed in master
+## Checking an issue is fixed in main
 
-Sometimes a bug has been fixed in the `master` branch of Quarkus and you want to confirm it is fixed for your own application.
-Testing the `master` branch is easy and you have two options:
+Sometimes a bug has been fixed in the `main` branch of Quarkus and you want to confirm it is fixed for your own application.
+Testing the `main` branch is easy and you have two options:
 
 * either use the snapshots we publish daily on https://oss.sonatype.org/content/repositories/snapshots/
 * or build Quarkus all by yourself
 
-This is a quick summary to get you to quickly test master.
+This is a quick summary to get you to quickly test main.
 If you are interested in having more details, refer to the [Build section](#build) and the [Usage section](#usage).
 
 ### Using snapshots
@@ -41,7 +77,7 @@ Then just add https://oss.sonatype.org/content/repositories/snapshots/ as a Mave
 
 You can check the last publication date here: https://oss.sonatype.org/content/repositories/snapshots/io/quarkus/ .
 
-### Building master
+### Building main
 
 Just do the following:
 
@@ -56,7 +92,7 @@ Wait for a bit and you're done.
 
 ### Updating the version
 
-Be careful, when using the `master` branch, you need to use the `quarkus-bom` instead of the `quarkus-universe-bom`.
+Be careful, when using the `main` branch, you need to use the `quarkus-bom` instead of the `quarkus-universe-bom`.
 
 Update both the versions of the `quarkus-bom` and the Quarkus Maven plugin to `999-SNAPSHOT`.
 
@@ -66,6 +102,17 @@ You can now test your application.
 
 To contribute, use GitHub Pull Requests, from your **own** fork.
 
+Also, make sure you have set up your Git authorship correctly:
+
+```
+git config --global user.name "Your Full Name"
+git config --global user.email your.email@example.com
+```
+
+If you use different computers to contribute, please make sure the name is the same on all your computers.
+
+We use this information to acknowledge your contributions in release announcements.
+
 ### Code reviews
 
 All submissions, including submissions by project members, need to be reviewed before being merged.
@@ -82,6 +129,8 @@ Because we are all humans, and to ensure Quarkus is stable for everyone, all cha
 
 The process requires only one additional step to enable Actions on your fork (clicking the green button in the actions tab). [See the full video walkthrough](https://youtu.be/egqbx-Q-Cbg) for more details on how to do this.
 
+To keep the caching of non-Quarkus artifacts efficient (speeding up CI), you should occasionally sync the `main` branch of your fork with `main` of this repo (e.g. monthly).
+
 ### Tests and documentation are not optional
 
 Don't forget to include tests in your pull requests. 
@@ -97,7 +146,7 @@ Be sure to test your pull request in:
 If you have not done so on this machine, you need to:
  
 * Install Git and configure your GitHub access
-* Install Java SDK (OpenJDK recommended)
+* Install Java SDK 8 or 11+ (OpenJDK recommended)
 * Install [GraalVM](https://quarkus.io/guides/building-native-image)
 * Install platform C developer tools:
     * Linux
@@ -132,7 +181,34 @@ Next navigate to _Java_ -> _Code Style_ -> _Organize Imports_. Click _Import_ an
 
 #### IDEA Setup
 
-Open the _Preferences_ window (or _Settings_ depending on your edition) , navigate to _Plugins_ and install the [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter) from the Marketplace.
+##### How to work
+
+Quarkus is a large project and IDEA will have a hard time compiling the whole of it.
+Before you start coding, make sure to build the project using Maven from the commandline
+with `./mvnw -Dquickly`.
+
+##### `OutOfMemoryError` while importing
+
+After creating an IDEA project, the first import will most likely fail with an `OutOfMemoryError`.
+
+To fix that, open the _Preferences_ window (or _Settings_ depending on your edition),
+then navigate to _Build, Execution, Deployment_ > _Build Tools_ > _Maven_ > _Importing_.
+In _VM options for importer_, raise the heap to at least 2 GB, e.g. `-Xmx2g -Xms2g`.
+
+##### `package sun.misc does not exist` while building
+
+You may get an error like this during the build:
+
+```
+Error:(46, 56) java: package sun.misc does not exist
+```
+
+To fix this go to _Settings_ > _Build, Execution, Deployment_ > _Compiler_ > _Java Compiler_
+and disable _Use '--release' option for cross compilation (java 9 and later)_.
+
+##### Formatting
+
+Open the _Preferences_ window (or _Settings_ depending on your edition), navigate to _Plugins_ and install the [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter) from the Marketplace.
 
 Restart your IDE, open the *Preferences* (or *Settings*) window again and navigate to _Other Settings_ -> _Eclipse Code Formatter_.
 
@@ -140,6 +216,10 @@ Select _Use the Eclipse Code Formatter_, then change the _Eclipse Java Formatter
 `eclipse-format.xml` file in the `independent-projects/ide-config` directory. Make sure the _Optimize Imports_ box is ticked, and
 select the `eclipse.importorder` file as the import order config file.
 
+Next, disable wildcard imports:
+navigate to _Editor_ -> _Code Style_ -> _Java_ -> _Imports_
+and set _Class count to use import with '\*'_ to `999`.
+Do the same with _Names count to use static import with '\*'_.
 
 ## Build
 
@@ -202,13 +282,50 @@ In this command we use the groupId and artifactId of the module to identify it.
 
 #### Running a single test
 
-Often you need to run a single test from some Maven module. Say for example you want to run the `GreetingResourceTest` of the `resteasy-jackson` Quarkus integration test (which can be found [here](https://github.com/quarkusio/quarkus/blob/master/integration-tests/resteasy-jackson)).
+Often you need to run a single test from some Maven module. Say for example you want to run the `GreetingResourceTest` of the `resteasy-jackson` Quarkus integration test (which can be found [here](https://github.com/quarkusio/quarkus/blob/main/integration-tests/resteasy-jackson)).
 One way to accomplish this is by executing the following command:
 
 ```
 ./mvnw test -f integration-tests/resteasy-jackson/ -Dtest=GreetingResourceTest
 ```
 
+#### Automatic incremental build
+
+:information_source: This feature is currently in testing mode. You're invited to give it a go and please reach out via [Zulip](https://quarkusio.zulipchat.com/#narrow/stream/187038-dev) or GitHub in case something doesn't work as expected or you have ideas to improve things.
+
+Instead of _manually_ specifying the modules to build as in the previous examples, you can tell [gitflow-incremental-builder (GIB)](https://github.com/gitflow-incremental-builder/gitflow-incremental-builder) to only build the modules that have been changed or depend on modules that have been changed (downstream).
+E.g.:
+```
+./mvnw install -Dincremental
+```
+This will build all modules (and their downstream modules) that have been changed compared to your _local_ `main`, including untracked and uncommitted changes.
+
+If you just want to build the changes since the last commit on the current branch, you can switch off the branch comparison via `-Dgib.disableBranchComparison` (or short: `-Dgib.dbc`).
+
+There are many more configuration options in GIB you can use to customize its behaviour: https://github.com/gitflow-incremental-builder/gitflow-incremental-builder#configuration
+
+Parallel builds (`-T...`) should work without problems but parallel test execution is not yet supported (in general, not a GIB limitation).
+
+##### Special case `bom-descriptor-json`
+
+Without going too much into details (`devtools/bom-descriptor-json/pom.xml` has more info), you should build this module _without_ `-Dincremental` _if you changed any extension "metadata"_:
+
+* Addition/renaming/removal of an extension
+* Any other changes to any `quarkus-extension.yaml`
+
+##### Usage by CI
+
+The GitHub Actions based Quarkus CI is using GIB to reduce the average build time of pull request builds and builds of branches in your fork.
+
+CI is using a slighty different GIB config than locally:
+
+* [Special handling of "Explicitly selected projects"](https://github.com/gitflow-incremental-builder/gitflow-incremental-builder#explicitly-selected-projects) is deactivated
+* Untracked/uncommitted changes are not considered
+* Branch comparison is more complex due to distributed GitHub forks
+* Certain "critical" branches like `main` are not built incrementally
+
+For more details see the `Get GIB arguments` step in `.github/workflows/ci-actions-incremental.yml`.
+
 ## Usage
 
 After the build was successful, the artifacts are available in your local Maven repository.
@@ -248,7 +365,6 @@ quarkusPlatformGroupId=io.quarkus
 pluginManagement {
     repositories {
         mavenLocal() // add mavenLocal() to first position
-        jcenter()
         mavenCentral()
         gradlePluginPortal()
     }
@@ -263,7 +379,6 @@ pluginManagement {
 ```
 repositories {
     mavenLocal() // add mavenLocal() to first position
-    jcenter()
     mavenCentral()
 }
 ```
@@ -292,6 +407,8 @@ then change into the `coverage-report` directory and run `mvn package`. The code
 This currently does not work on Windows as it uses a shell script to copy all the classes and files into the code coverage
 module.
 
+If you just need a report for a single module, run `mvn install jacoco:report -Ptest-coverage` in that module (or with `-f ...`).
+
 ## Extensions
 
 ### Descriptions
@@ -317,6 +434,14 @@ Bad examples and the corresponding good example:
 - "PostgreSQL database connector" (use "Connect to the PostgreSQL database via JDBC")
 - "Asynchronous messaging for Reactive Streams" (use "Produce and consume messages and implement event driven and data streaming applications")
 
+### Update dependencies to extensions
+
+When adding a new extension you should run `update-extension-dependencies.sh` so that special modules like `devtools/bom-descriptor-json`
+that are consuming this extension are built *after* the respective extension. Simply add to your commit the files that were changed by the script.
+
+When removing an extension make sure to also remove all dependencies to it from all `pom.xml`.
+It's easy to miss this as long as the extension artifact is still present in your local Maven repository.
+
 ## The small print
 
 This project is an open source project, please act responsibly, be nice, polite and enjoy!
@@ -325,29 +450,43 @@ This project is an open source project, please act responsibly, be nice, polite
 
 * The Maven build fails with `OutOfMemoryException`
 
-Set Maven options to use 1.5GB of heap: `export MAVEN_OPTS="-Xmx1563m"`.
+  Set Maven options to use 1.5GB of heap: `export MAVEN_OPTS="-Xmx1563m"`.
 
 * IntelliJ fails to import Quarkus Maven project with `java.lang.OutOfMemoryError: GC overhead limit exceeded` 
 
-In IntelliJ IDEA (version older than `2019.2`) if you see problems in the Maven view claiming `java.lang.OutOfMemoryError: GC overhead limit exceeded` that means the project import failed.
-  
-To fix the issue, you need to update the Maven importing settings:  
-`Build, Execution, Deployment` > `Build Tools`> `Maven` > `Importing` > `VM options for importer`
-To import Quarkus you need to define the JVM Max Heap Size (E.g. `-Xmx1g`)
+  In IntelliJ IDEA (version older than `2019.2`) if you see problems in the Maven view claiming `java.lang.OutOfMemoryError: GC overhead limit exceeded` that means the project import failed.
 
-**Note** As for now, we can't provide a unique Max Heap Size value. We have been reported to require from 768M to more than 3G to import Quarkus properly.
+  To fix the issue, you need to update the Maven importing settings:
+  `Build, Execution, Deployment` > `Build Tools`> `Maven` > `Importing` > `VM options for importer`
+  To import Quarkus you need to define the JVM Max Heap Size (E.g. `-Xmx1g`)
 
-* Build hangs with DevMojoIT running infinitely 
-```
-./mvnw clean install
-# Wait...
-[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.192 s - in io.quarkus.maven.it.GenerateConfigIT
-[INFO] Running io.quarkus.maven.it.DevMojoIT
+  **Note** As for now, we can't provide a unique Max Heap Size value. We have been reported to require from 768M to more than 3G to import Quarkus properly.
 
-```
-DevMojoIT require a few minutes to run but anything more than that is not expected. Make sure that nothing is running on 8080.
+* Build hangs with DevMojoIT running infinitely
+  ```
+  ./mvnw clean install
+  # Wait...
+  [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.192 s - in io.quarkus.maven.it.GenerateConfigIT
+  [INFO] Running io.quarkus.maven.it.DevMojoIT
+  ```
+  DevMojoIT require a few minutes to run but anything more than that is not expected. Make sure that nothing is running on 8080.
 
 * The native integration test for my extension didn't run in the CI
 
-In the interest of speeding up CI, the native build stage `run_native_tests_stage` have been split into multiple steps. 
-This means that each new extension needs to be configured explicitly in `azure-pipelines.yml` to have it's integration tests run in native mode
+  In the interest of speeding up CI, the native build job `native-tests` have been split into multiple categories which are run in parallel.
+  This means that each new extension needs to be configured explicitly in [`native-tests.json`](.github/native-tests.json) to have its integration tests run in native mode.
+
+* Build aborts complaining about missing (or superfluous) `minimal *-deployment dependencies` or `illegal runtime dependencies`
+
+  To ensure a consistent build order, even when building in parallel (`./mvnw -T...`) or building incrementally/partially (`./mvnw -pl...`), the build enforces the presence of certain dependencies.
+  If those dependencies are not present, your local build will most likely use possibly outdated artifacts from you local repo and CI build might even fail not finding certain artifacts.
+
+  Just do what the failing enforcer rule is telling you and you should be fine.
+
+* Build fails with multiple `This project has been banned from the build due to previous failures` messages
+
+  Just scroll up, there should be an error or warning somewhere. Failing enforcer rules are known to cause such effects and in this case there'll be something like:
+  ```
+  [WARNING] Rule 0: ... failed with message:
+  ...
+  ```
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695673349..ff9ad4530f571 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -193,7 +193,7 @@
    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
+       https://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,
diff --git a/MAINTAINERS.adoc b/MAINTAINERS.adoc
index f042e53803a99..44bc321e665b0 100644
--- a/MAINTAINERS.adoc
+++ b/MAINTAINERS.adoc
@@ -14,7 +14,7 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/oztimpower[Timothy Power]
 
 |Amazon Lambda
-|https://github.com/patriot1burke[Bill Burke], https://github.com/evanchooly[Justin Lee]
+|https://github.com/patriot1burke[Bill Burke]
 
 |Amazon Services - KMS
 |https://github.com/marcinczeczko[Marcin Czeczko]
@@ -52,6 +52,9 @@ If you think some information is outdated, either provide a pull request or send
 |Caffeine
 |https://github.com/galderz[Galder Zamarreño], https://github.com/wburns[William Burns]
 
+|https://github.com/apache/camel-quarkus[Camel]
+|https://github.com/jamesnetherton[James Netherton], https://github.com/ppalaga[Peter Palaga]
+
 |Cassandra-Quarkus
 |https://github.com/adutra[Alexandre Dutra], https://github.com/tomekl007[Tomasz Lelek], https://github.com/absurdfarce[Bret McGuire], https://github.com/emerkle826[Erik Merkle], https://github.com/olim7t[Olivier Michallat]
 
@@ -86,11 +89,14 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/stuartwdouglas[Stuart Douglas]
 
 |Flyway
-|https://github.com/gastaldi[George Gastaldi], https://github.com/geoand[Georgios Andrianakis]
+|https://github.com/cristhiank[Cristhian Lopez], https://github.com/gastaldi[George Gastaldi], https://github.com/geoand[Georgios Andrianakis]
 
 |Funqy
 |https://github.com/patriot1burke[Bill Burke]
 
+|Google Cloud Functions
+|https://github.com/loicmathieu[Loïc Mathieu]
+
 |gRPC
 |https://github.com/cescoffier[Clément Escoffier], https://github.com/michalszynkiewicz[Michal Szynkiewicz]
 
@@ -100,6 +106,9 @@ If you think some information is outdated, either provide a pull request or send
 |Hibernate ORM with Panache
 |https://github.com/FroMage[Stéphane Épardaud]
 
+|Hibernate ORM with Panache for Kotlin
+|https://github.com/evanchooly[Justin Lee]
+
 |Hibernate Search
 |https://github.com/gsmet[Guillaume Smet]
 
@@ -155,7 +164,7 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/mariofusco[Mario Fusco], https://github.com/cristianonicolai[Cristiano Nicolai]
 
 |Kotlin
-|https://github.com/geoand[Georgios Andrianakis]
+|https://github.com/geoand[Georgios Andrianakis], https://github.com/evanchooly[Justin Lee]
 
 |Kubernetes
 |https://github.com/geoand[Georgios Andrianakis], https://github.com/iocanel[Ioannis Canellos]
@@ -176,7 +185,7 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/cescoffier[Clément Escoffier]
 
 |MongoDB with Panache
-|https://github.com/loicmathieu[Loïc Mathieu]
+|https://github.com/loicmathieu[Loïc Mathieu], https://github.com/evanchooly[Justin Lee]
 
 |Narayana JTA
 |https://github.com/mmusgrov[Michael Musgrove], https://github.com/gsmet[Guillaume Smet]
@@ -241,6 +250,9 @@ If you think some information is outdated, either provide a pull request or send
 |Scheduler
 |https://github.com/mkouba[Martin Kouba]
 
+|SmallRye Config
+|https://github.com/radcortez[Roberto Cortez]
+
 |SmallRye Context Propagation
 |https://github.com/FroMage[Stéphane Épardaud], https://github.com/manovotn[Matěj Novotný]
 
@@ -299,7 +311,7 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/geoand[Georgios Andrianakis]
 
 |Swagger UI
-|https://github.com/stuartwdouglas[Stuart Douglas]
+|https://github.com/phillip-kruger[Phillip Kruger]
 
 |Tika
 |https://github.com/sberyozkin[Sergey Beryozkin]
diff --git a/README.md b/README.md
index 8ca122af24220..8d23a5df892c6 100644
--- a/README.md
+++ b/README.md
@@ -4,24 +4,24 @@
 [![GitHub Actions Status](<https://img.shields.io/github/workflow/status/QuarkusIO/quarkus/Quarkus CI?logo=GitHub&style=for-the-badge>)](https://github.com/quarkusio/quarkus/actions?query=workflow%3A%22Quarkus+CI%22)
 [![License](https://img.shields.io/github/license/quarkusio/quarkus?style=for-the-badge&logo=apache)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Project Chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg?style=for-the-badge&logo=zulip)](https://quarkusio.zulipchat.com/)
-[![Supported JVM Versions](https://img.shields.io/badge/JVM-8--11--14-brightgreen.svg?style=for-the-badge&logo=Java)](https://github.com/quarkusio/quarkus/actions/runs/113853915/)
+[![Supported JVM Versions](https://img.shields.io/badge/JVM-8--11--15-brightgreen.svg?style=for-the-badge&logo=Java)](https://github.com/quarkusio/quarkus/actions/runs/113853915/)
 
 # Quarkus - Supersonic Subatomic Java
 
 Quarkus is a Cloud Native, (Linux) Container First framework for writing Java applications.
 
 * **Container First**: 
-Minimal footprint Java applications optimal for running in containers
+Minimal footprint Java applications optimal for running in containers.
 * **Cloud Native**:
 Embraces [12 factor architecture](https://12factor.net) in environments like Kubernetes.
 * **Unify imperative and reactive**:
-Brings under one programming model non blocking and imperative styles of development.
+Brings under one programming model non-blocking and imperative styles of development.
 * **Standards-based**:
-Based on the standards and frameworks you love and use (RESTEasy and JAX-RS, Hibernate ORM and JPA, Netty, Eclipse Vert.x, Eclipse MicroProfile, Apache Camel...)
+Based on the standards and frameworks you love and use (RESTEasy and JAX-RS, Hibernate ORM and JPA, Netty, Eclipse Vert.x, Eclipse MicroProfile, Apache Camel...).
 * **Microservice First**:
-Brings lightning fast startup time and code turn around to Java apps
+Brings lightning fast startup time and code turn around to Java apps.
 * **Developer Joy**:
-Development centric experience without compromise to bring your amazing apps to life in no time
+Development centric experience without compromise to bring your amazing apps to life in no time.
 
 _All under ONE framework._
 
@@ -30,9 +30,13 @@ _All under ONE framework._
 * [Documentation](https://quarkus.io)
 * [Wiki](https://github.com/quarkusio/quarkus/wiki)
 
+## Migration Guides
+
+We collect all the migration notes in our [migration guides](https://github.com/quarkusio/quarkus/wiki/Migration-Guides).
+
 ## Release Planning
 
-Interested on when the next release is coming? Check our [release planning](https://github.com/quarkusio/quarkus/wiki/Release-Planning) document for details
+Interested in when the next release is coming? Check our [release planning](https://github.com/quarkusio/quarkus/wiki/Release-Planning) document for details.
 
 ## How to build Quarkus
 
diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md
index 982908f1b17cc..22c4fc7660118 100644
--- a/TROUBLESHOOTING.md
+++ b/TROUBLESHOOTING.md
@@ -144,7 +144,7 @@ It can be used in the same way as for the production application with the except
 
 ```shell script
 # profile CPU startup
-mvn quarkus:dev -Djvm.args="agentpath:/path/to/async-profiler/build/libasyncProfiler.so=start,event=cpu,file=startup-cpu-profile.svg,interval=1000000,width=1600,simple"
+mvn quarkus:dev -Djvm.args="-agentpath:/path/to/async-profiler/build/libasyncProfiler.so=start,event=cpu,file=startup-cpu-profile.svg,interval=1000000,width=1600,simple"
 
 # profile allocation startup
 mvn quarkus:dev -Djvm.args="-agentpath:/path/to/async-profiler/build/libasyncProfiler.so=start,event=alloc,file=/tmp/startup-alloc-profile.svg,interval=1000000,width=1600,simple"
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 2c4cca497b423..b235b2d40ebb0 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -14,38 +14,44 @@
     <packaging>pom</packaging>
 
     <properties>
-        <aesh.version>2.5</aesh.version>
-        <jandex.version>2.2.1.Final</jandex.version>
-        <resteasy.version>4.5.6.Final</resteasy.version>
+        <bouncycastle.version>1.68</bouncycastle.version>
+        <bouncycastle.fips.version>1.0.2</bouncycastle.fips.version>
+        <bouncycastle.tls.fips.version>1.0.11</bouncycastle.tls.fips.version>
+        <jandex.version>2.2.3.Final</jandex.version>
+        <resteasy.version>4.5.9.Final</resteasy.version>
         <opentracing.version>0.31.0</opentracing.version>
         <opentracing-jaxrs.version>0.4.1</opentracing-jaxrs.version>
         <opentracing-web-servlet-filter.version>0.2.3</opentracing-web-servlet-filter.version>
         <opentracing-tracerresolver.version>0.1.8</opentracing-tracerresolver.version>
         <opentracing-concurrent.version>0.2.0</opentracing-concurrent.version>
         <opentracing-jdbc.version>0.0.12</opentracing-jdbc.version>
+        <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
         <jaeger.version>0.34.3</jaeger.version>
-        <quarkus-http.version>3.0.12.Final</quarkus-http.version>
+        <quarkus-http.version>3.1.0.Beta2</quarkus-http.version>
         <jboss-servlet-api_4.0_spec.version>1.0.0.Final</jboss-servlet-api_4.0_spec.version>
+        <threetenbp.version>1.4.3</threetenbp.version>
+        <micrometer.version>1.6.5</micrometer.version> <!-- when updating, verify if com.google.auth should not be updated too -->
+        <google-auth.version>0.22.0</google-auth.version>
         <microprofile-config-api.version>1.4</microprofile-config-api.version>
         <microprofile-metrics-api.version>2.3</microprofile-metrics-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
         <microprofile-opentracing-api.version>1.3.3</microprofile-opentracing-api.version>
         <microprofile-reactive-streams-operators.version>1.0.1</microprofile-reactive-streams-operators.version>
         <microprofile-rest-client.version>1.4.1</microprofile-rest-client.version>
-        <smallrye-common.version>1.1.0</smallrye-common.version>
-        <smallrye-config.version>1.8.4</smallrye-config.version>
-        <smallrye-health.version>2.2.3</smallrye-health.version>
-        <smallrye-metrics.version>2.4.2</smallrye-metrics.version>
-        <smallrye-open-api.version>2.0.5</smallrye-open-api.version>
-        <smallrye-graphql.version>1.0.5</smallrye-graphql.version>
-        <smallrye-opentracing.version>1.3.4</smallrye-opentracing.version>
-        <smallrye-fault-tolerance.version>4.3.0</smallrye-fault-tolerance.version>
-        <smallrye-jwt.version>2.2.0</smallrye-jwt.version>
-        <smallrye-context-propagation.version>1.0.13</smallrye-context-propagation.version>
+        <microprofile-jwt.version>1.1.1</microprofile-jwt.version>
+        <smallrye-common.version>1.5.0</smallrye-common.version>
+        <smallrye-config.version>1.11.1</smallrye-config.version>
+        <smallrye-health.version>2.2.6</smallrye-health.version>
+        <smallrye-metrics.version>2.4.6</smallrye-metrics.version>
+        <smallrye-open-api.version>2.0.26</smallrye-open-api.version>
+        <smallrye-graphql.version>1.0.22</smallrye-graphql.version>
+        <smallrye-opentracing.version>1.3.5</smallrye-opentracing.version>
+        <smallrye-fault-tolerance.version>4.3.2</smallrye-fault-tolerance.version>
+        <smallrye-jwt.version>2.4.4</smallrye-jwt.version>
+        <smallrye-context-propagation.version>1.1.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
-        <smallrye-converter-api.version>1.1.0</smallrye-converter-api.version>
-        <smallrye-reactive-messaging.version>2.2.1</smallrye-reactive-messaging.version>
-        <swagger-ui.version>3.30.0</swagger-ui.version>
+        <smallrye-converter-api.version>1.4.0</smallrye-converter-api.version>
+        <smallrye-reactive-messaging.version>2.9.0</smallrye-reactive-messaging.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
         <jakarta.el-impl.version>3.0.3</jakarta.el-impl.version>
@@ -61,142 +67,139 @@
         <jakarta.transaction-api.version>1.3.3</jakarta.transaction-api.version>
         <jakarta.validation-api.version>2.0.2</jakarta.validation-api.version>
         <jakarta.websocket-api.version>1.1.2</jakarta.websocket-api.version>
+        <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
         <jaxb-runtime.version>2.3.3-b02</jaxb-runtime.version>
         <!-- just for test dependency convergence -->
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
         <jboss-jaxb-api_2.3_spec.version>2.0.0.Final</jboss-jaxb-api_2.3_spec.version>
-        <asm.version>8.0.1</asm.version>
-        <commons-io.version>2.6</commons-io.version>
+        <asm.version>9.1</asm.version>
+        <commons-io.version>2.8.0</commons-io.version>
         <jboss-metadata-web.version>11.0.0.Final</jboss-metadata-web.version>
         <maven-core.version>3.6.3</maven-core.version>
         <maven-resolver.version>1.4.1</maven-resolver.version>
         <maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
-        <guava.version>27.0.1-jre</guava.version>
+        <guava.version>30.1-jre</guava.version>
         <plexus-utils.version>3.2.1</plexus-utils.version>
         <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
         <plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
         <!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
-        <graal-sdk.version>20.1.0</graal-sdk.version>
-        <gizmo.version>1.0.4.Final</gizmo.version>
-        <jackson.version>2.11.1</jackson.version>
+        <graal-sdk.version>21.0.0</graal-sdk.version>
+        <gizmo.version>1.0.7.Final</gizmo.version>
+        <jackson.version>2.12.1</jackson.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-codec.version>1.14</commons-codec.version>
         <classmate.version>1.3.4</classmate.version>
-        <hibernate-orm.version>5.4.19.Final</hibernate-orm.version>
-        <hibernate-reactive.version>1.0.0.Alpha8</hibernate-reactive.version>
-        <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
-        <hibernate-search.version>6.0.0.Beta8</hibernate-search.version>
-        <narayana.version>5.10.5.Final</narayana.version>
+        <hibernate-orm.version>5.4.29.Final</hibernate-orm.version>
+        <hibernate-reactive.version>1.0.0.CR1</hibernate-reactive.version>
+        <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
+        <hibernate-search.version>6.0.2.Final</hibernate-search.version>
+        <narayana.version>5.10.6.Final</narayana.version>
         <jboss-transaction-api_1.2_spec.version>1.1.1.Final</jboss-transaction-api_1.2_spec.version>
-        <agroal.version>1.8</agroal.version>
+        <agroal.version>1.9</agroal.version>
         <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-rest-client.version>7.7.0</elasticsearch-rest-client.version>
+        <elasticsearch-rest-client.version>7.10.0</elasticsearch-rest-client.version>
         <rxjava1.version>1.3.8</rxjava1.version>
-        <rxjava.version>2.2.19</rxjava.version>
+        <rxjava.version>2.2.21</rxjava.version>
         <wildfly.openssl.version>1.0.6.Final</wildfly.openssl.version>
-        <jboss-logging-annotations.version>2.1.0.Final</jboss-logging-annotations.version>
+        <jboss-logging-annotations.version>2.2.0.Final</jboss-logging-annotations.version>
         <slf4j.version>1.7.30</slf4j.version>
-        <slf4j-jboss-logging.version>1.2.0.Final</slf4j-jboss-logging.version>
+        <slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
         <wildfly-common.version>1.5.4.Final-format-001</wildfly-common.version>
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
-        <wildfly-elytron.version>1.12.1.Final</wildfly-elytron.version>
+        <wildfly-elytron.version>1.15.1.Final</wildfly-elytron.version>
         <jboss-modules.version>1.8.7.Final</jboss-modules.version>
-        <jboss-threads.version>3.1.1.Final</jboss-threads.version>
-        <vertx.version>3.9.2</vertx.version>
-        <httpclient.version>4.5.12</httpclient.version>
-        <httpcore.version>4.4.13</httpcore.version>
+        <jboss-threads.version>3.2.0.Final</jboss-threads.version>
+        <vertx.version>3.9.5</vertx.version>
+        <httpclient.version>4.5.13</httpclient.version>
+        <httpcore.version>4.4.14</httpcore.version>
         <httpasync.version>4.1.4</httpasync.version>
-        <cronutils.version>9.1.0</cronutils.version>
+        <cronutils.version>9.1.3</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
         <h2.version>1.4.197</h2.version>  <!-- keep 1.4.197 as newer versions have severe regressions -->
-        <postgresql-jdbc.version>42.2.14</postgresql-jdbc.version>
-        <mariadb-jdbc.version>2.6.2</mariadb-jdbc.version>
-        <mysql-jdbc.version>8.0.21</mysql-jdbc.version>
+        <postgresql-jdbc.version>42.2.19</postgresql-jdbc.version>
+        <mariadb-jdbc.version>2.7.2</mariadb-jdbc.version>
+        <mysql-jdbc.version>8.0.23</mysql-jdbc.version>
         <mssql-jdbc.version>7.2.2.jre8</mssql-jdbc.version>
         <derby-jdbc.version>10.14.2.0</derby-jdbc.version>
         <db2-jdbc.version>11.5.4.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
-        <rest-assured.version>4.3.0</rest-assured.version>
-        <junit.jupiter.version>5.6.2</junit.jupiter.version>
+        <rest-assured.version>4.3.3</rest-assured.version>
+        <junit.jupiter.version>5.7.1</junit.jupiter.version>
         <testng.version>6.14.2</testng.version>
-        <assertj.version>3.16.1</assertj.version>
+        <assertj.version>3.19.0</assertj.version>
         <json-smart.version>2.3</json-smart.version>
-        <infinispan.version>10.1.5.Final</infinispan.version>
-        <infinispan.protostream.version>4.3.2.Final</infinispan.protostream.version>
-        <caffeine.version>2.8.5</caffeine.version>
+        <infinispan.version>12.0.1.Final</infinispan.version>
+        <infinispan.protostream.version>4.4.0.Alpha4</infinispan.protostream.version>
+        <caffeine.version>2.9.0</caffeine.version>
         <netty.version>4.1.49.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
-        <jboss-logging.version>3.3.2.Final</jboss-logging.version>
-        <mutiny.version>0.7.0</mutiny.version>
-        <axle-client.version>1.1.0</axle-client.version>
-        <mutiny-client.version>1.1.0</mutiny-client.version>
-        <kafka2.version>2.5.0</kafka2.version>
+        <jboss-logging.version>3.4.1.Final</jboss-logging.version>
+        <mutiny.version>0.14.0</mutiny.version>
+        <mutiny-vertx.version>1.5.0</mutiny-vertx.version>
+        <kafka2.version>2.7.0</kafka2.version>
         <zookeeper.version>3.5.7</zookeeper.version>
         <!-- Scala is used by Kafka so we need to choose a compatible version -->
-        <scala.version>2.12.9</scala.version>
-        <tika.version>1.22</tika.version>
+        <scala.version>2.13.5</scala.version>
+        <tika.version>1.24.1</tika.version>
         <ooxml-schemas.version>1.4</ooxml-schemas.version>
         <aws-lambda-java.version>1.2.1</aws-lambda-java.version>
-        <aws-lambda-java-events.version>3.1.0</aws-lambda-java-events.version>
+        <aws-lambda-java-events.version>3.7.0</aws-lambda-java-events.version>
         <aws-lambda-serverless-java-container.version>1.3.1</aws-lambda-serverless-java-container.version>
-        <aws-xray.version>2.4.0</aws-xray.version>
-        <awssdk.version>2.13.62</awssdk.version>
-        <aws-alexa-sdk.version>2.31.0</aws-alexa-sdk.version>
-        <azure-functions-java-library.version>1.3.0</azure-functions-java-library.version>
-        <kotlin.version>1.3.72</kotlin.version>
-        <dekorate.version>0.12.6</dekorate.version>
+        <aws-xray.version>2.8.0</aws-xray.version>
+        <awssdk.version>2.16.19</awssdk.version>
+        <aws-alexa-sdk.version>2.37.1</aws-alexa-sdk.version>
+        <azure-functions-java-library.version>1.4.0</azure-functions-java-library.version>
+        <kotlin.version>1.4.31</kotlin.version>
+        <dekorate.version>0.14.2</dekorate.version>
         <maven-artifact-transfer.version>0.10.0</maven-artifact-transfer.version>
-        <jline.version>2.14.6</jline.version>
         <maven-invoker.version>3.0.1</maven-invoker.version>
         <awaitility.version>4.0.3</awaitility.version>
         <jprocesses.version>1.6.5</jprocesses.version>
-        <jboss-logmanager.version>1.0.4</jboss-logmanager.version>
-        <jgit.version>5.8.0.202006091008-r</jgit.version>
-        <flyway.version>6.5.2</flyway.version>
-        <yasson.version>1.0.7</yasson.version>
-        <liquibase.version>3.10.1</liquibase.version>
-        <snakeyaml.version>1.26</snakeyaml.version>
+        <jboss-logmanager.version>1.0.6</jboss-logmanager.version>
+        <jgit.version>5.11.0.202103091610-r</jgit.version>
+        <flyway.version>7.7.0</flyway.version>
+        <yasson.version>1.0.8</yasson.version>
+        <liquibase.version>4.3.1</liquibase.version>
+        <snakeyaml.version>1.28</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
-        <neo4j-java-driver.version>4.1.1</neo4j-java-driver.version>
-        <mongo-client.version>4.0.3</mongo-client.version>
+        <neo4j-java-driver.version>4.2.3</neo4j-java-driver.version>
+        <mongo-client.version>4.1.0</mongo-client.version>
         <mongo-crypt.version>1.0.1</mongo-crypt.version>
-        <artemis.version>2.11.0</artemis.version>
-        <proton-j.version>0.33.6</proton-j.version>
-        <okhttp.version>3.14.6</okhttp.version>
-        <sentry.version>1.7.30</sentry.version>
-        <!-- Used for integration tests, to make sure webjars work-->
-        <bootstrap.version>3.1.0</bootstrap.version>
+        <artemis.version>2.17.0</artemis.version>
+        <proton-j.version>0.33.8</proton-j.version>
+        <okhttp.version>3.14.9</okhttp.version>
+        <sentry.version>4.3.0</sentry.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <hibernate-quarkus-local-cache.version>0.1.0</hibernate-quarkus-local-cache.version>
-        <kubernetes-client.version>4.10.3</kubernetes-client.version>
+        <kubernetes-client.version>5.2.1</kubernetes-client.version>
         <flapdoodle.mongo.version>2.2.0</flapdoodle.mongo.version>
         <quarkus-spring-api.version>5.2.SP4</quarkus-spring-api.version>
-        <quarkus-spring-data-api.version>2.1.SP1</quarkus-spring-data-api.version>
+        <quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
         <quarkus-spring-security-api.version>5.2.Final</quarkus-spring-security-api.version>
         <quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
         <htmlunit.version>2.40.0</htmlunit.version>
-        <mockito.version>3.4.4</mockito.version>
+        <mockito.version>3.8.0</mockito.version>
         <jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.8</antlr.version>
-        <quarkus-security.version>1.1.2.Final</quarkus-security.version>
-        <keycloak.version>11.0.0</keycloak.version>
-        <logstash-gelf.version>1.14.0</logstash-gelf.version>
+        <quarkus-security.version>1.1.4.Final</quarkus-security.version>
+        <keycloak.version>12.0.3</keycloak.version>
+        <logstash-gelf.version>1.14.1</logstash-gelf.version>
         <jsch.version>0.1.55</jsch.version>
         <jzlib.version>1.1.1</jzlib.version>
         <checker-qual.version>2.5.2</checker-qual.version>
         <error-prone-annotations.version>2.2.0</error-prone-annotations.version>
-        <jib-core.version>0.15.0</jib-core.version>
-        <google-http-client.version>1.34.0</google-http-client.version>
+        <jib-core.version>0.17.0</jib-core.version>
+        <google-http-client.version>1.38.0</google-http-client.version>
         <scram-client.version>2.1</scram-client.version>
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
-        <grpc.version>1.30.2</grpc.version>
+        <grpc.version>1.34.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
         <grpc-jprotoc.version>1.0.1</grpc-jprotoc.version>
-        <protobuf-java.version>3.12.2</protobuf-java.version>
-        <protoc.version>3.12.3</protoc.version>
+        <protobuf-java.version>3.14.0</protobuf-java.version>
+        <protoc.version>3.13.0</protoc.version>
 
-        <picocli.version>4.4.0</picocli.version>
+        <picocli.version>4.6.1</picocli.version>
         <org.eclipse.sisu.inject.version>0.3.4</org.eclipse.sisu.inject.version>
         <google-cloud-functions.version>1.0.1</google-cloud-functions.version>
         <commons-compress.version>1.20</commons-compress.version>
@@ -205,10 +208,28 @@
         <log4j2-jboss-logmanager.version>1.0.0.Beta1</log4j2-jboss-logmanager.version>
         <log4j-jboss-logmanager.version>1.2.0.Final</log4j-jboss-logmanager.version>
         <avro.version>1.10.0</avro.version>
+        <jacoco.version>0.8.6</jacoco.version>
+        <testcontainers.version>1.15.2</testcontainers.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <!-- Quarkus platform descriptor -->
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
+                <classifier>${project.version}</classifier>
+                <type>json</type>
+                <version>${project.version}</version>
+            </dependency>
+            <!-- Quarkus platform properties -->
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom-quarkus-platform-properties</artifactId>
+                <version>${project.version}</version>
+                <type>properties</type>
+            </dependency>
+
             <!-- External BOMs -->
 
             <!-- Netty dependencies, imported as a BOM -->
@@ -260,7 +281,7 @@
             <!-- Vert.x dependencies, imported as a BOM -->
             <dependency>
                 <groupId>io.vertx</groupId>
-                <artifactId>vertx-stack-depchain</artifactId>
+                <artifactId>vertx-dependencies</artifactId>
                 <version>${vertx.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
@@ -284,6 +305,32 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Smallrye Common dependencies, imported as a BOM -->
+            <dependency>
+                <groupId>io.smallrye.common</groupId>
+                <artifactId>smallrye-common-bom</artifactId>
+                <version>${smallrye-common.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <!-- Micrometer Core and Registries, imported as BOM -->
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-bom</artifactId>
+                <version>${micrometer.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- Testcontainers, imported as BOM -->
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- Quarkus core -->
 
             <dependency>
@@ -301,6 +348,11 @@
                 <artifactId>quarkus-development-mode-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-class-change-agent</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-ide-launcher</artifactId>
@@ -336,6 +388,16 @@
                 <artifactId>quarkus-caffeine-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-jacoco</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-jacoco-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-jaxb</artifactId>
@@ -346,6 +408,16 @@
                 <artifactId>quarkus-jaxb-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-jaxp</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-jaxp-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-jackson</artifactId>
@@ -454,6 +526,11 @@
                 <artifactId>quarkus-datasource-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-datasource-deployment-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-datasource</artifactId>
@@ -464,6 +541,41 @@
                 <artifactId>quarkus-datasource-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-postgresql</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-h2</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-mysql</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-mariadb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-derby</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-db2</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devservices-mssql</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-elasticsearch-rest-client-common</artifactId>
@@ -559,6 +671,46 @@
                 <artifactId>quarkus-oidc-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-client-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-client-filter</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-client-filter-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-token-propagation</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-oidc-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-keycloak-authorization</artifactId>
@@ -639,6 +791,21 @@
                 <artifactId>quarkus-panache-common-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-mongodb-panache-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-panache-hibernate-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-panache-hibernate-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-panache-mock</artifactId>
@@ -659,6 +826,16 @@
                 <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-reactive-panache</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-reactive-panache-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-hibernate-orm-panache-kotlin</artifactId>
@@ -679,6 +856,16 @@
                 <artifactId>quarkus-hibernate-orm-panache-common-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-reactive-panache-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-reactive-panache-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-rest-data-panache</artifactId>
@@ -699,6 +886,16 @@
                 <artifactId>quarkus-hibernate-orm-rest-data-panache-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-mongodb-rest-data-panache</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-mongodb-rest-data-panache-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-mongodb-panache</artifactId>
@@ -711,12 +908,22 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
+                <artifactId>quarkus-mongodb-panache-kotlin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-mongodb-panache-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-search-elasticsearch-deployment</artifactId>
+                <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -729,6 +936,11 @@
                 <artifactId>quarkus-hibernate-validator-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-hibernate-validator-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-infinispan-client</artifactId>
@@ -859,6 +1071,16 @@
                 <artifactId>quarkus-smallrye-jwt-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-smallrye-jwt-build</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-smallrye-context-propagation</artifactId>
@@ -961,6 +1183,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-smallrye-openapi-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-smallrye-graphql</artifactId>
@@ -1021,6 +1248,16 @@
                 <artifactId>quarkus-rest-client-jsonb-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-rest-client-mutiny</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-rest-client-mutiny-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-resteasy-common</artifactId>
@@ -1071,6 +1308,16 @@
                 <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-multipart</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-multipart-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-resteasy-server-common</artifactId>
@@ -1153,22 +1400,27 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-http-deployment</artifactId>
+                <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-web</artifactId>
+                <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-web-deployment</artifactId>
+                <artifactId>quarkus-vertx-http-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-reactive-datasource</artifactId>
+                <artifactId>quarkus-vertx-web</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-vertx-web-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -1225,6 +1477,17 @@
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-grpc</artifactId>
                 <version>${project.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.android</groupId>
+                        <artifactId>annotations</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+            <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-grpc-common</artifactId>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
@@ -1241,6 +1504,11 @@
                 <artifactId>quarkus-grpc-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-grpc-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-grpc-protoc-plugin</artifactId>
@@ -1254,7 +1522,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-undertow-websockets-deployment</artifactId>
+                <artifactId>quarkus-websockets</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-websockets-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -1332,6 +1605,16 @@
                 <artifactId>quarkus-spring-data-jpa-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-data-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-data-rest-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-spring-boot-properties</artifactId>
@@ -1467,6 +1750,16 @@
                 <artifactId>quarkus-amazon-lambda-http-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-amazon-lambda-rest</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-amazon-lambda-rest-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-amazon-common</artifactId>
@@ -1537,6 +1830,16 @@
                 <artifactId>quarkus-amazon-kms-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-amazon-iam</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-amazon-iam-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-amazon-alexa</artifactId>
@@ -1547,6 +1850,103 @@
                 <artifactId>quarkus-amazon-alexa-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+                <version>${project.version}</version>
+                <scope>test</scope>
+                <type>test-jar</type>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-servlet-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-servlet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-jaxrs-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-rest-client-reactive</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-rest-client-reactive-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-qute</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-qute-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-reactive-datasource</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-azure-functions-http</artifactId>
@@ -1587,11 +1987,26 @@
                 <artifactId>quarkus-container-image-s2i-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-container-image-openshift</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-container-image-openshift-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-container-image-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-container-image</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-container-image-spi</artifactId>
@@ -1672,6 +2087,26 @@
                 <artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-kubernetes-service-binding</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-kubernetes-service-binding-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-openshift-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-openshift-client-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-consul-config</artifactId>
@@ -1772,6 +2207,11 @@
                 <artifactId>quarkus-vault</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-vault-model</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-vault-deployment</artifactId>
@@ -1852,6 +2292,26 @@
                 <artifactId>quarkus-google-cloud-functions-http-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-micrometer-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-micrometer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Quarkus test dependencies -->
             <dependency>
@@ -1904,6 +2364,11 @@
                 <artifactId>quarkus-test-kubernetes-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-test-openshift-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-test-amazon-lambda</artifactId>
@@ -1952,6 +2417,32 @@
 
             <!-- External dependencies -->
 
+            <!-- Bouncy Castle -->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bctls-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bc-fips</artifactId>
+                <version>${bouncycastle.fips.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bctls-fips</artifactId>
+                <version>${bouncycastle.tls.fips.version}</version>
+            </dependency>
             <!-- dekorate -->
             <dependency>
                 <groupId>io.dekorate</groupId>
@@ -2004,11 +2495,25 @@
                 <groupId>org.jboss.logmanager</groupId>
                 <artifactId>log4j2-jboss-logmanager</artifactId>
                 <version>${log4j2-jboss-logmanager.version}</version>
+                <exclusions>
+                    <!-- we use the embedded version -->
+                    <exclusion>
+                        <groupId>org.jboss.logmanager</groupId>
+                        <artifactId>jboss-logmanager</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.jboss.logmanager</groupId>
                 <artifactId>log4j-jboss-logmanager</artifactId>
                 <version>${log4j-jboss-logmanager.version}</version>
+                <exclusions>
+                    <!-- we use the embedded version -->
+                    <exclusion>
+                        <groupId>org.jboss.logmanager</groupId>
+                        <artifactId>jboss-logmanager</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -2119,7 +2624,7 @@
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
-                <artifactId>mutiny-context-propagation</artifactId>
+                <artifactId>mutiny-smallrye-context-propagation</artifactId>
                 <version>${mutiny.version}</version>
             </dependency>
             <dependency>
@@ -2132,6 +2637,16 @@
                 <artifactId>mutiny-reactor</artifactId>
                 <version>${mutiny.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye.reactive</groupId>
+                <artifactId>mutiny-kotlin</artifactId>
+                <version>${mutiny.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.smallrye.reactive</groupId>
+                <artifactId>mutiny-test-utils</artifactId>
+                <version>${mutiny.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-mutiny</artifactId>
@@ -2152,6 +2667,16 @@
                 <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-mutiny-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-resteasy-mutiny-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-resteasy-server-common-spi</artifactId>
@@ -2223,6 +2748,11 @@
                 <artifactId>opentracing-jdbc</artifactId>
                 <version>${opentracing-jdbc.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.opentracing.contrib</groupId>
+                <artifactId>opentracing-kafka-client</artifactId>
+                <version>${opentracing-kafka.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.rest-assured</groupId>
                 <artifactId>rest-assured</artifactId>
@@ -2335,6 +2865,10 @@
                         <groupId>org.apache.cxf</groupId>
                         <artifactId>cxf-rt-rs-client</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
                 </exclusions>
                 <version>${tika.version}</version>
             </dependency>
@@ -2372,7 +2906,7 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus.http</groupId>
-                <artifactId>quarkus-http-websockets-jsr</artifactId>
+                <artifactId>quarkus-http-websocket-vertx</artifactId>
                 <version>${quarkus-http.version}</version>
                 <exclusions>
                     <exclusion>
@@ -2385,6 +2919,16 @@
                 <groupId>io.quarkus.security</groupId>
                 <artifactId>quarkus-security</artifactId>
                 <version>${quarkus-security.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.inject</groupId>
+                        <artifactId>javax.inject</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.enterprise</groupId>
+                        <artifactId>cdi-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
@@ -2405,11 +2949,6 @@
                 <!-- This is intentionally hard-coded -->
                 <version>1.5.0</version>
             </dependency>
-            <dependency>
-                <groupId>io.smallrye.common</groupId>
-                <artifactId>smallrye-common-annotation</artifactId>
-                <version>${smallrye-common.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.smallrye.config</groupId>
                 <artifactId>smallrye-config</artifactId>
@@ -2419,6 +2958,10 @@
                         <groupId>org.osgi</groupId>
                         <artifactId>org.osgi.annotation.versioning</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.ow2.asm</groupId>
+                        <artifactId>asm</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -2461,6 +3004,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-metrics-api</artifactId>
+                <version>${smallrye-metrics.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-open-api-core</artifactId>
@@ -2505,6 +3053,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-open-api-ui</artifactId>
+                <version>${smallrye-open-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>smallrye-graphql-cdi</artifactId>
@@ -2602,8 +3155,21 @@
                         <groupId>javax</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.annotation</groupId>
+                        <artifactId>javax.annotation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.smallrye</groupId>
+                        <artifactId>smallrye-jwt-build</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-jwt-build</artifactId>
+                <version>${smallrye-jwt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>jakarta.activation</groupId>
                 <artifactId>jakarta.activation-api</artifactId>
@@ -2645,7 +3211,7 @@
                 <version>${jakarta.interceptor-api.version}</version>
                 <exclusions>
                     <!-- There is a bug in 1.2.5 -->
-                    <!-- The dependency is removed in master: https://github.com/eclipse-ee4j/interceptor-api/commit/017aeb56849bbb448319aaf36df45a07ec54f451 -->
+                    <!-- The dependency is removed in main: https://github.com/eclipse-ee4j/interceptor-api/commit/017aeb56849bbb448319aaf36df45a07ec54f451 -->
                     <exclusion>
                         <groupId>jakarta.ejb</groupId>
                         <artifactId>jakarta.ejb-api</artifactId>
@@ -2671,11 +3237,39 @@
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-core-client</artifactId>
                 <version>${artemis.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-json_1.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.johnzon</groupId>
+                        <artifactId>johnzon-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-jms-client</artifactId>
                 <version>${artemis.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-json_1.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.johnzon</groupId>
+                        <artifactId>johnzon-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
@@ -2686,6 +3280,12 @@
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-server</artifactId>
                 <version>${artemis.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
@@ -2707,6 +3307,11 @@
                 <artifactId>httpclient-cache</artifactId>
                 <version>${httpclient.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpmime</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpasyncclient</artifactId>
@@ -2804,9 +3409,14 @@
                 <artifactId>okhttp</artifactId>
                 <version>${okhttp.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>logging-interceptor</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.sentry</groupId>
-                <artifactId>sentry</artifactId>
+                <artifactId>sentry-jul</artifactId>
                 <version>${sentry.version}</version>
             </dependency>
             <dependency>
@@ -2980,6 +3590,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.microprofile.jwt</groupId>
+                <artifactId>microprofile-jwt-auth-api</artifactId>
+                <version>${microprofile-jwt.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.annotation.versioning</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>jakarta.el</artifactId>
@@ -3000,6 +3621,11 @@
                 <artifactId>jaxb-runtime</artifactId>
                 <version>${jaxb-runtime.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.xml.bind-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>jakarta.security.jacc</groupId>
                 <artifactId>jakarta.security.jacc-api</artifactId>
@@ -3025,16 +3651,12 @@
                 <artifactId>jandex</artifactId>
                 <version>${jandex.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.aesh</groupId>
-                <artifactId>aesh</artifactId>
-                <version>${aesh.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.graalvm.nativeimage</groupId>
                 <artifactId>svm</artifactId>
                 <version>${graal-sdk.version}</version>
+                <!-- TODO: declaring a provided or test scope in BoM is not necessarily a good practice. We should think of removing it -->
                 <scope>provided</scope>
                 <!-- We only want the included annotations -->
                 <exclusions>
@@ -3227,6 +3849,41 @@
                 <artifactId>arc</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-processor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-vertx</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-common-processor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-client-processor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.common</groupId>
                 <artifactId>wildfly-common</artifactId>
@@ -3249,6 +3906,11 @@
                 <artifactId>wildfly-client-config</artifactId>
                 <version>${wildfly-client-config.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron</artifactId>
+                <version>${wildfly-elytron.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron-auth-server</artifactId>
@@ -3319,12 +3981,37 @@
                 <artifactId>wildfly-elytron-credential</artifactId>
                 <version>${wildfly-elytron.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-sasl-gs2</artifactId>
+                <version>${wildfly-elytron.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-asn1</artifactId>
+                <version>${wildfly-elytron.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-sasl-gssapi</artifactId>
+                <version>${wildfly-elytron.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-security-manager-action</artifactId>
+                <version>${wildfly-elytron.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
                 <version>${asm.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-tree</artifactId>
@@ -3347,8 +4034,8 @@
             </dependency>
             <dependency>
                 <groupId>org.jboss.slf4j</groupId>
-                <artifactId>slf4j-jboss-logging</artifactId>
-                <version>${slf4j-jboss-logging.version}</version>
+                <artifactId>slf4j-jboss-logmanager</artifactId>
+                <version>${slf4j-jboss-logmanager.version}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.enterprise</groupId>
@@ -3416,6 +4103,12 @@
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>
                 <version>${postgresql-jdbc.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
@@ -3495,6 +4188,27 @@
                 <artifactId>mockito-junit-jupiter</artifactId>
                 <version>${mockito.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jacoco</groupId>
+                <artifactId>org.jacoco.core</artifactId>
+                <version>${jacoco.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jacoco</groupId>
+                <artifactId>org.jacoco.report</artifactId>
+                <version>${jacoco.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jacoco</groupId>
+                <artifactId>org.jacoco.agent</artifactId>
+                <version>${jacoco.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jacoco</groupId>
+                <artifactId>org.jacoco.agent</artifactId>
+                <version>${jacoco.version}</version>
+                <classifier>runtime</classifier>
+            </dependency>
             <dependency>
                 <groupId>net.sourceforge.htmlunit</groupId>
                 <artifactId>htmlunit</artifactId>
@@ -3510,45 +4224,10 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-generator</artifactId>
-                <version>${axle-client.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-amqp-client</artifactId>
-                <version>${axle-client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-core</artifactId>
-                <version>${axle-client.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-core</artifactId>
-                <version>${mutiny-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.fasterxml.jackson.core</groupId>
@@ -3560,50 +4239,30 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-web-client</artifactId>
-                <version>${axle-client.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
-                <version>${mutiny-client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-sql-client</artifactId>
-                <version>${axle-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-sql-client</artifactId>
-                <version>${mutiny-client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-mysql-client</artifactId>
-                <version>${axle-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-db2-client</artifactId>
-                <version>${mutiny-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-mysql-client</artifactId>
-                <version>${mutiny-client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-pg-client</artifactId>
-                <version>${axle-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-pg-client</artifactId>
-                <version>${mutiny-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <!-- Used by the Reactive PG Client -->
@@ -3611,35 +4270,15 @@
                 <artifactId>client</artifactId>
                 <version>${scram-client.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.smallrye.reactive</groupId>
-                <artifactId>smallrye-axle-mail-client</artifactId>
-                <version>${axle-client.version}</version>
-            </dependency>
-            <dependency>
+           <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-mail-client</artifactId>
-                <version>${mutiny-client.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-redis-client</artifactId>
-                <version>${mutiny-client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.vertx</groupId>
-                <artifactId>vertx-rx-java2</artifactId>
-                <version>${vertx.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-core</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.vertx</groupId>
@@ -3755,6 +4394,21 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye.reactive</groupId>
+                <artifactId>smallrye-connector-attribute-processor</artifactId>
+                <version>${smallrye-reactive-messaging.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-reactive-messaging-http</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-reactive-messaging-http-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.infinispan</groupId>
@@ -4055,11 +4709,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>jline</groupId>
-                <artifactId>jline</artifactId>
-                <version>${jline.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.maven.shared</groupId>
                 <artifactId>maven-invoker</artifactId>
@@ -4080,11 +4729,6 @@
                 <artifactId>jProcesses</artifactId>
                 <version>${jprocesses.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.webjars</groupId>
-                <artifactId>swagger-ui</artifactId>
-                <version>${swagger-ui.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.flywaydb</groupId>
@@ -4111,17 +4755,6 @@
                 <artifactId>snakeyaml</artifactId>
                 <version>${snakeyaml.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${osgi.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.webjars</groupId>
-                <artifactId>bootstrap</artifactId>
-                <version>${bootstrap.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.webjars</groupId>
@@ -4138,6 +4771,12 @@
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_annotations</artifactId>
                 <version>${error-prone-annotations.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>animal-sniffer-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- Spring -->
@@ -4171,6 +4810,11 @@
                 <artifactId>quarkus-spring-data-commons-api</artifactId>
                 <version>${quarkus-spring-data-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-spring-data-rest-api</artifactId>
+                <version>${quarkus-spring-data-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-spring-web-api</artifactId>
@@ -4429,6 +5073,11 @@
                 <artifactId>quarkus-builder</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devtools-registry-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index 4192266f99787..d9316eb2e4c1c 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -16,8 +16,8 @@
     <description>Dependency management for integration tests. Importable by third party extension developers.</description>
 
     <properties>
-        <debezium.version>1.2.1.Final</debezium.version>
-        <testcontainers.version>1.14.3</testcontainers.version>
+        <debezium.version>1.4.2.Final</debezium.version>
+        <testcontainers.version>1.15.2</testcontainers.version>
     </properties>
 
     <dependencyManagement>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index c350deab24d1d..ae17f52c26580 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -15,32 +15,38 @@
     <packaging>pom</packaging>
 
     <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+
         <!-- Maven plugin versions -->
-        <elasticsearch-maven-plugin.version>6.15</elasticsearch-maven-plugin.version>
-        <elasticsearch-server.version>7.7.0</elasticsearch-server.version>
-        <scala-maven-plugin.version>4.1.1</scala-maven-plugin.version>
 
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
-        <!-- Quarkus uses jboss-parent and it comes with 3.8.0-jboss-2, we don't want that in the templates -->
+        <!-- Quarkus uses jboss-parent and it comes with 3.8.1-jboss-1, we don't want that in the templates -->
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
-        <kotlin.version>1.3.72</kotlin.version>
-        <scala.version>2.12.8</scala.version>
-        <scala-plugin.version>4.1.1</scala-plugin.version>
+        <kotlin.version>1.4.31</kotlin.version>
+        <scala.version>2.12.13</scala.version>
+        <scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
+        <!-- not pretty but this is used in the codestarts and we don't want to break compatibility -->
+        <scala-plugin.version>${scala-maven-plugin.version}</scala-plugin.version>
 
+        <!-- version.* properties are defined in jboss-parent and are overridden/updated here: -->
+        <version.enforcer.plugin>3.0.0-M3</version.enforcer.plugin>
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.exec.plugin>3.0.0</version.exec.plugin>
         <failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>
 
         <!-- These properties are needed in order for them to be resolvable by the documentation -->
         <!-- The Graal version we suggest using in documentation - as that's
            what we work with by self downloading it: -->
-        <graal-sdk.version-for-documentation>20.1.0</graal-sdk.version-for-documentation>
-        <rest-assured.version>4.1.1</rest-assured.version>
-        <axle-client.version>1.1.0</axle-client.version>
+        <graal-sdk.version-for-documentation>21.0.0</graal-sdk.version-for-documentation>
+        <mandrel.version-for-documentation>21.0</mandrel.version-for-documentation>
+        <rest-assured.version>4.3.2</rest-assured.version>
         <mutiny-client.version>1.1.0</mutiny-client.version>
         <vertx.version>3.9.2</vertx.version>
 
         <!-- Dev tools -->
-        <freemarker.version>2.3.30</freemarker.version>
+        <freemarker.version>2.3.31</freemarker.version>
 
         <!-- Arquillian BOM -->
         <arquillian.version>1.5.0.Final</arquillian.version>
@@ -56,7 +62,7 @@
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
         <proposed-maven-version>3.6.3</proposed-maven-version>
         <maven-wrapper.version>0.7.7</maven-wrapper.version>
-        <gradle-wrapper.version>6.5.1</gradle-wrapper.version>
+        <gradle-wrapper.version>6.8.3</gradle-wrapper.version>
 
         <!-- MicroProfile TCK versions -->
         <microprofile-health-api.version>2.2</microprofile-health-api.version>
@@ -65,34 +71,78 @@
         <microprofile-fault-tolerance-api.version>2.1.1</microprofile-fault-tolerance-api.version>
         <microprofile-reactive-messaging-api.version>1.0</microprofile-reactive-messaging-api.version>
         <microprofile-rest-client-api.version>1.4.1</microprofile-rest-client-api.version>
-        <microprofile-open-api.version>1.1.2</microprofile-open-api.version>
+        <microprofile-open-api.version>1.1.3-RC1</microprofile-open-api.version>
         <microprofile-opentracing-api.version>1.3.3</microprofile-opentracing-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
         <microprofile-jwt-api.version>1.1.1</microprofile-jwt-api.version>
-        <microprofile-graphql-api.version>1.0.2</microprofile-graphql-api.version>
+        <microprofile-graphql-api.version>1.0.3</microprofile-graphql-api.version>
 
         <!-- Antlr is used by the PanacheQL parser-->
         <antlr.version>4.7.2</antlr.version>
 
+        <!-- Defaults for integration tests -->
+        <elasticsearch-server.version>7.10.0</elasticsearch-server.version>
+        <elasticsearch.image>docker.elastic.co/elasticsearch/elasticsearch-oss:${elasticsearch-server.version}</elasticsearch.image>
+        <elasticsearch.protocol>http</elasticsearch.protocol>
+
         <!-- Align various dependencies that are not really part of the bom-->
         <findbugs.version>3.0.2</findbugs.version>
         <jsoup.version>1.11.3</jsoup.version>
         <wagon-provider-api.version>3.3.3</wagon-provider-api.version>
 
         <!-- The image to use for tests that run Keycloak -->
-        <!-- IMPORTANT: If this is changed you must also update .github/workflows/ci-actions.yml to match the version -->
-        <keycloak.docker.image>quay.io/keycloak/keycloak:11.0.0</keycloak.docker.image>
+        <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml to match the version -->
+        <keycloak.docker.image>quay.io/keycloak/keycloak:12.0.3</keycloak.docker.image>
 
         <unboundid-ldap.version>4.0.13</unboundid-ldap.version>
 
-        <wiremock-jre8.version>2.26.3</wiremock-jre8.version>
-        <wiremock-maven-plugin.version>6.0.0</wiremock-maven-plugin.version>
+        <wiremock-jre8.version>2.27.2</wiremock-jre8.version>
+        <wiremock-maven-plugin.version>7.0.0</wiremock-maven-plugin.version>
 
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>
-        <jacoco.version>0.8.5</jacoco.version>
+        <!-- Note: this version is also set in quarkus-bom but BOMs don't contribute to pluginManagement or properties -->
+        <jacoco.version>0.8.6</jacoco.version>
 
         <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+
+        <!--TODO: remove when switched back to quarkus-maven-plugin for grpc stubs-->
+        <protoc.version>3.12.3</protoc.version> <!--keep in sync with the BOM-->
+        <grpc.version>1.30.2</grpc.version> <!--keep in sync with the BOM -->
+
+        <boring-ssl.version>2.0.30.Final</boring-ssl.version>
+
+        <!-- Webjars -->
+        <webjar.bootstrap.version>4.6.0</webjar.bootstrap.version>
+        <webjar.font-awesome.version>5.15.2</webjar.font-awesome.version>
+        <webjar.jquery.version>3.5.1</webjar.jquery.version>
+
+        <!-- revapi API check -->
+        <revapi-maven-plugin.version>0.12.1</revapi-maven-plugin.version>
+        <revapi-java-plugin.version>0.22.0</revapi-java-plugin.version>
+        <build-helper-plugin.version>1.9.1</build-helper-plugin.version>
+        <revapi-reporter-text.version>0.12.1</revapi-reporter-text.version>
+        <revapi-reporter-json.version>0.2.1</revapi-reporter-json.version>
+         <!-- Latest release to be used by api-compatibility-check to check backwards compatibility of the Quarkus API. -->
+        <revapi.oldVersion>1.6.0.Final</revapi.oldVersion>
+        <revapi.newVersion>${project.version}</revapi.newVersion>
+        <!-- severity Possible values: equivalent, nonBreaking, potentiallyBreaking, breaking -->
+        <revapi.reportSeverity>nonBreaking</revapi.reportSeverity>
+        <!-- Skip the API checks by default. Let the modules opt in. -->
+        <revapi.skip>true</revapi.skip>
+        <!-- By default don't check dependencies -->
+        <revapi.checkdeps>false</revapi.checkdeps>
+
+        <!-- Forbidden API checks -->
+        <forbiddenapis-maven-plugin.version>3.1</forbiddenapis-maven-plugin.version>
+
+        <!-- platform properties -->
+        <platform.quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11</platform.quarkus.native.builder-image>
+
+        <script.extension>sh</script.extension>
+        <docker-prune.location>${maven.multiModuleProjectDirectory}/.github/docker-prune.${script.extension}</docker-prune.location>
+
+        <enforce-test-deps-scope.skip>${enforcer.skip}</enforce-test-deps-scope.skip>
     </properties>
 
     <dependencyManagement>
@@ -108,30 +158,24 @@
             </dependency>
 
             <!-- Dev tools -->
-
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devmode-test-utils</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devtools-utilities</artifactId>
+                <artifactId>quarkus-test-devtools</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devtools-common</artifactId>
+                <artifactId>quarkus-devmode-test-utils</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-platform-descriptor-api</artifactId>
+                <artifactId>quarkus-devtools-utilities</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
+                <artifactId>quarkus-devtools-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -200,10 +244,19 @@
                     <exclusion>
                         <groupId>com.google.code.findbugs</groupId>
                         <artifactId>jsr305</artifactId>
-                   </exclusion>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
-
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-tcnative-boringssl-static</artifactId>
+                <scope>test</scope>
+                <version>${boring-ssl.version}</version>
+            </dependency>            
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-core</artifactId>
@@ -232,6 +285,23 @@
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
+            
+            <!-- Webjars for UI related -->
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>bootstrap</artifactId>
+                <version>${webjar.bootstrap.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>font-awesome</artifactId>
+                <version>${webjar.font-awesome.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery</artifactId>
+                <version>${webjar.jquery.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -245,8 +315,13 @@
                         <systemPropertyVariables>
                             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                             <maven.home>${maven.home}</maven.home>
+                            <maven.repo.local>${settings.localRepository}</maven.repo.local>
+                            <maven.settings>${session.request.userSettingsFile.path}</maven.settings>
+                            <project.version>${project.version}</project.version> <!-- some dev tools tests need this -->
                         </systemPropertyVariables>
-                        <argLine>${jacoco.agent.argLine}</argLine>
+                        <argLine>${jacoco.agent.argLine} -Xmx1500m</argLine> <!-- limit the amount of memory surefire can use, 1500m should be plenty-->
+                        <!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
+                        <trimStackTrace>false</trimStackTrace>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -256,7 +331,12 @@
                         <systemPropertyVariables>
                             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                             <maven.home>${maven.home}</maven.home>
+                            <maven.repo.local>${settings.localRepository}</maven.repo.local>
+                            <maven.settings>${session.request.userSettingsFile.path}</maven.settings>
+                            <project.version>${project.version}</project.version> <!-- some dev tools tests need this -->
                         </systemPropertyVariables>
+                        <!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
+                        <trimStackTrace>false</trimStackTrace>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -340,6 +420,7 @@
                                             <exclude>javax.ws.rs:javax.ws.rs-api</exclude>
                                             <!-- use our jboss-logmanager -->
                                             <exclude>org.jboss.logging:jboss-logmanager</exclude>
+                                            <exclude>org.jboss.logging:jboss-logging-jdk</exclude>
                                             <!-- We don't want all the API's in one jar-->
                                             <exclude>javax:javaee-api</exclude>
                                             <!-- Prevent incompatible config from coming in -->
@@ -350,6 +431,8 @@
                                             <exclude>jakarta.json:jakarta.json-api</exclude>
                                             <!-- Ensure none of the deps use netty-all. This forces deps to use more fine grained netty artifacts -->
                                             <exclude>io.netty:netty-all</exclude>
+                                            <!-- Ban jboss-logmanager, we use jboss-logmanager-embedded -->
+                                            <exclude>org.jboss.logmanager:jboss-logmanager</exclude>
                                             <!-- Ban Log4J (use org.jboss.logmanager:log4j-jboss-logmanager instead) -->
                                             <exclude>log4j:log4j</exclude>
                                             <exclude>org.apache.logging.log4j:log4j-core</exclude>
@@ -359,7 +442,8 @@
                                             <exclude>commons-logging:commons-logging-api</exclude>
                                             <exclude>org.springframework:spring-jcl</exclude>
                                             <exclude>org.slf4j:jcl-over-slf4j</exclude>
-                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logging instead) -->
+                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logmanager instead) -->
+                                            <exclude>org.jboss.slf4j:slf4j-jboss-logging</exclude>
                                             <exclude>org.slf4j:slf4j-simple</exclude>
                                             <exclude>org.slf4j:slf4j-nop</exclude>
                                             <exclude>org.slf4j:slf4j-jdk14</exclude>
@@ -380,6 +464,8 @@
                                             <exclude>org.checkerframework:checker-qual</exclude>
                                             <!-- We use our own impl here, including this one causes problems-->
                                             <exclude>org.jboss.resteasy:resteasy-context-propagation</exclude>
+                                            <exclude>com.google.android:annotations</exclude>
+                                            <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
                                         </excludes>
                                         <includes>
                                             <!-- this is for REST Assured -->
@@ -392,6 +478,32 @@
                                 <goal>enforce</goal>
                             </goals>
                         </execution>
+                        <execution>
+                            <id>enforce-test-deps-scope</id>
+                            <configuration>
+                                <rules>
+                                    <bannedDependencies>
+                                        <excludes>
+                                            <exclude>io.quarkus:quarkus-test-*</exclude>
+                                            <exclude>io.rest-assured:*</exclude>
+                                            <exclude>org.assertj:*</exclude>
+                                            <exclude>org.junit.jupiter:*</exclude>
+                                        </excludes>
+                                        <includes>
+                                            <include>io.quarkus:quarkus-test-*:*:*:test</include>
+                                            <include>io.rest-assured:*:*:*:test</include>
+                                            <include>org.assertj:*:*:*:test</include>
+                                            <include>org.junit.jupiter:*:*:*:test</include>
+                                        </includes>
+                                        <message>Found test dependencies with wrong scope:</message>
+                                    </bannedDependencies>
+                                </rules>
+                                <skip>${enforce-test-deps-scope.skip}</skip>
+                            </configuration>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                        </execution>
                     </executions>
                 </plugin>
                 <plugin>
@@ -415,7 +527,7 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.12.1</version>
+                    <version>2.14.0</version>
                     <dependencies>
                         <dependency>
                             <artifactId>quarkus-ide-config</artifactId>
@@ -432,7 +544,7 @@
                 <plugin>
                     <groupId>net.revelc.code</groupId>
                     <artifactId>impsort-maven-plugin</artifactId>
-                    <version>1.4.1</version>
+                    <version>1.6.0</version>
                     <configuration>
                         <groups>java.,javax.,org.,com.</groups>
                         <staticGroups>*</staticGroups>
@@ -449,20 +561,6 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <parameters>true</parameters>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.alexcojocaru</groupId>
-                    <artifactId>elasticsearch-maven-plugin</artifactId>
-                    <version>${elasticsearch-maven-plugin.version}</version>
-                    <configuration>
-                        <version>${elasticsearch-server.version}</version>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr4-maven-plugin</artifactId>
@@ -482,6 +580,16 @@
                         </dependency>
                     </dependencies>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${build-helper-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.revapi</groupId>
+                    <artifactId>revapi-maven-plugin</artifactId>
+                    <version>${revapi-maven-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -493,17 +601,9 @@
                 <!-- activate this on any JDK from 9 onwards -->
                 <jdk>[9,)</jdk>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <release>8</release>
-                            <parameters>true</parameters>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
         </profile>
 
         <profile>
@@ -597,7 +697,7 @@
                         <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
@@ -805,5 +905,129 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>api-check</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>parse-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                                <phase>validate</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.revapi</groupId>
+                        <artifactId>revapi-maven-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>io.quarkus</groupId>
+                                <artifactId>quarkus-revapi-config</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.revapi</groupId>
+                                <artifactId>revapi-java</artifactId>
+                                <version>${revapi-java-plugin.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.revapi</groupId>
+                                <artifactId>revapi-reporter-json</artifactId>
+                                <version>${revapi-reporter-json.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.revapi</groupId>
+                                <artifactId>revapi-reporter-text</artifactId>
+                                <version>${revapi-reporter-text.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <oldArtifacts>
+                                <artifact>${project.groupId}:${project.artifactId}:${revapi.oldVersion}</artifact>
+                            </oldArtifacts>
+                            <newArtifacts>
+                                <artifact>${project.groupId}:${project.artifactId}:${revapi.newVersion}</artifact>
+                            </newArtifacts>
+                            <!-- don't fail is false making it possible to have 
+                                revapi checks without requiring config files -->
+                            <failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
+                            <!-- Consider changes from the latest .Final version, 
+                                not from the latest non-snapshot. -->
+                            <versionFormat>\d+\.\d+\.\d+\.Final</versionFormat>
+                            <!-- By default revapi will check the oldArtifact 
+                                against the currently executed build -->
+                            <!-- <checkDependencies>false</checkDependencies> -->
+                            <analysisConfigurationFiles>
+                                <configurationFile>
+                                    <resource>revapi/revapi-configuration.xml</resource>
+                                </configurationFile>
+                                <configurationFile>
+                                    <path>api-changes.xml</path>
+                                    <roots>
+                                        <root>versions/v${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</root>
+                                    </roots>
+                                </configurationFile>
+                            </analysisConfigurationFiles>
+                            <!-- By default, revapi will only fail the build 
+                                 if there are potentially breaking or breaking changes. However, in the report 
+                                 we want even non breaking changes to be present. -->
+                            <reportSeverity>nonBreaking</reportSeverity>
+                            <failSeverity>potentiallyBreaking</failSeverity>
+                            <failBuildOnProblemsFound>true</failBuildOnProblemsFound>
+                            <checkDependencies>${revapi.checkdeps}</checkDependencies>
+                            <ignoreSuggestionsFormat>xml</ignoreSuggestionsFormat>
+                            <ignoreSuggestionsFile>${project.build.directory}/api-changes-suggestions.xml</ignoreSuggestionsFile>
+                            <expandProperties>true</expandProperties>
+                        </configuration>
+                        <!-- Running two executions is a workaround to make sure 
+                             we get a HTML report in case revapi finds some incompatible changes. The 
+                             "check" goal will simply fail the whole build before it could get to the 
+                             report. To make sure we always get a HTML report, the "report" goal needs 
+                             to be executed before the "check" goal. Once https://github.com/revapi/revapi/issues/11 
+                             is fixed it should be possible to use single execution. -->
+                        <executions>
+                            <execution>
+                                <id>api-check</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <phase>verify</phase>
+                            </execution>
+                            <execution>
+                                <!-- report can be found in ${build.directory}/site/revapi-report.html -->
+                                <id>api-report</id>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>Windows</id>
+            <activation>
+                <os>
+                    <family>Windows</family>
+                </os>
+            </activation>
+            <properties>
+                <script.extension>bat</script.extension>
+            </properties>
+        </profile>
+
     </profiles>
 </project>
diff --git a/core/builder/pom.xml b/core/builder/pom.xml
index 491c8718cb601..b2160369dbd27 100644
--- a/core/builder/pom.xml
+++ b/core/builder/pom.xml
@@ -66,7 +66,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <threadCount>1</threadCount>
-                    <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/core/builder/src/main/java/io/quarkus/builder/BuildChainBuilder.java b/core/builder/src/main/java/io/quarkus/builder/BuildChainBuilder.java
index 704bb995249e3..59cf7a669f250 100644
--- a/core/builder/src/main/java/io/quarkus/builder/BuildChainBuilder.java
+++ b/core/builder/src/main/java/io/quarkus/builder/BuildChainBuilder.java
@@ -155,7 +155,7 @@ public BuildChain build() throws ChainBuildException {
         int initialSingleCount = 0;
         int initialMultiCount = 0;
         final Map<BuildStepBuilder, StackTraceElement[]> steps = this.steps;
-        // compile master produce/consume maps
+        // compile main produce/consume maps
         final Map<ItemId, List<Consume>> allConsumes = new HashMap<>();
         final Map<ItemId, List<Produce>> allProduces = new HashMap<>();
         final Set<ItemId> initialIds = this.initialIds;
diff --git a/core/builder/src/main/java/io/quarkus/builder/Execution.java b/core/builder/src/main/java/io/quarkus/builder/Execution.java
index 136015674b388..e89393b444963 100644
--- a/core/builder/src/main/java/io/quarkus/builder/Execution.java
+++ b/core/builder/src/main/java/io/quarkus/builder/Execution.java
@@ -52,6 +52,7 @@ final class Execution {
         this.multis = new ConcurrentHashMap<>(builder.getInitialMulti());
         this.finalIds = finalIds;
         final EnhancedQueueExecutor.Builder executorBuilder = new EnhancedQueueExecutor.Builder();
+        executorBuilder.setRegisterMBean(false);
         executorBuilder.setCorePoolSize(8).setMaximumPoolSize(1024);
         executorBuilder.setExceptionHandler(JBossExecutors.loggingExceptionHandler());
         executorBuilder.setThreadFactory(new JBossThreadFactory(new ThreadGroup("build group"), Boolean.FALSE, null, "build-%t",
diff --git a/core/builder/src/test/java/io/quarkus/builder/BasicTests.java b/core/builder/src/test/java/io/quarkus/builder/BasicTests.java
index f8dabe7f37059..f9efe4c9a36ca 100644
--- a/core/builder/src/test/java/io/quarkus/builder/BasicTests.java
+++ b/core/builder/src/test/java/io/quarkus/builder/BasicTests.java
@@ -46,7 +46,6 @@ public void execute(final BuildContext context) {
     @Test
     public void testFailure() throws ChainBuildException, BuildException {
         final BuildChainBuilder builder = BuildChain.builder();
-        final AtomicBoolean ran = new AtomicBoolean();
         BuildStepBuilder stepBuilder = builder.addBuildStep(new BuildStep() {
             @Override
             public void execute(final BuildContext context) {
diff --git a/core/class-change-agent/pom.xml b/core/class-change-agent/pom.xml
new file mode 100644
index 0000000000000..5b57062f854b3
--- /dev/null
+++ b/core/class-change-agent/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-class-change-agent</artifactId>
+    <name>Quarkus - Core - Class Change Agent</name>
+    <description>
+        A Java Agent that exposes the instrumentation API. This allows for super fast
+        hot reloads if there have been no changes to the structure of the class files.
+
+        This agent is not required for hot reload, it just provides an optimisation in
+        some circumstances.
+    </description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Premain-Class>io.quarkus.changeagent.ClassChangeAgent</Premain-Class>
+                            <Can-Redefine-Classes>true</Can-Redefine-Classes>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/core/class-change-agent/src/main/java/io/quarkus/changeagent/ClassChangeAgent.java b/core/class-change-agent/src/main/java/io/quarkus/changeagent/ClassChangeAgent.java
new file mode 100644
index 0000000000000..4b92caf6824da
--- /dev/null
+++ b/core/class-change-agent/src/main/java/io/quarkus/changeagent/ClassChangeAgent.java
@@ -0,0 +1,18 @@
+package io.quarkus.changeagent;
+
+import java.lang.instrument.Instrumentation;
+
+public class ClassChangeAgent {
+
+    private static volatile Instrumentation instrumentation;
+
+    public static Instrumentation getInstrumentation() {
+        return instrumentation;
+    }
+
+    public static void premain(java.lang.String s, Instrumentation i) {
+        instrumentation = i;
+
+    }
+
+}
diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
index 2c860be4991f7..8a4d6727b2947 100644
--- a/core/deployment/pom.xml
+++ b/core/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-core-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-core-deployment</artifactId>
@@ -35,6 +34,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-development-mode-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-class-change-agent</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-core</artifactId>
@@ -90,6 +93,19 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-bom-quarkus-platform-properties</artifactId>
+            <type>pom</type>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capabilities.java b/core/deployment/src/main/java/io/quarkus/deployment/Capabilities.java
index 4324ca0f26135..9fddfbe72ae85 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/Capabilities.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/Capabilities.java
@@ -12,66 +12,6 @@
  */
 public final class Capabilities extends SimpleBuildItem {
 
-    // The following constants will be removed at some point post Quarkus 1.6
-    @Deprecated
-    public static final String AGROAL = Capability.AGROAL.getName();
-    @Deprecated
-    public static final String CDI_ARC = Capability.CDI.getName();
-    @Deprecated
-    public static final String SERVLET = Capability.SERVLET.getName();
-    @Deprecated
-    public static final String TRANSACTIONS = Capability.TRANSACTIONS.getName();
-    @Deprecated
-    public static final String JACKSON = Capability.JACKSON.getName();
-    @Deprecated
-    public static final String JSONB = Capability.JSONB.getName();
-    @Deprecated
-    public static final String REST_JACKSON = Capability.REST_JACKSON.getName();
-    @Deprecated
-    public static final String REST_JSONB = Capability.REST_JSONB.getName();
-    @Deprecated
-    public static final String RESTEASY_JSON_EXTENSION = Capability.RESTEASY_JSON.getName();
-    @Deprecated
-    public static final String RESTEASY = Capability.RESTEASY.getName();
-    @Deprecated
-    public static final String JWT = Capability.JWT.getName();
-    @Deprecated
-    public static final String TIKA = Capability.TIKA.getName();
-    @Deprecated
-    public static final String MONGODB_PANACHE = Capability.MONGODB_PANACHE.getName();
-    @Deprecated
-    public static final String FLYWAY = Capability.FLYWAY.getName();
-    @Deprecated
-    public static final String LIQUIBASE = Capability.LIQUIBASE.getName();
-    @Deprecated
-    public static final String SECURITY = Capability.SECURITY.getName();
-    @Deprecated
-    public static final String SECURITY_ELYTRON_OAUTH2 = Capability.SECURITY_ELYTRON_OAUTH2.getName();
-    @Deprecated
-    public static final String SECURITY_ELYTRON_JDBC = Capability.SECURITY_ELYTRON_JDBC.getName();
-    @Deprecated
-    public static final String SECURITY_ELYTRON_LDAP = Capability.SECURITY_ELYTRON_LDAP.getName();
-    @Deprecated
-    public static final String SECURITY_JPA = Capability.SECURITY_JPA.getName();
-    @Deprecated
-    public static final String QUARTZ = Capability.QUARTZ.getName();
-    @Deprecated
-    public static final String METRICS = Capability.METRICS.getName();
-    @Deprecated
-    public static final String RESTEASY_MUTINY_EXTENSION = Capability.RESTEASY_MUTINY.getName();
-    @Deprecated
-    public static final String CONTAINER_IMAGE_JIB = Capability.CONTAINER_IMAGE_JIB.getName();
-    @Deprecated
-    public static final String CONTAINER_IMAGE_DOCKER = Capability.CONTAINER_IMAGE_DOCKER.getName();
-    @Deprecated
-    public static final String CONTAINER_IMAGE_S2I = Capability.CONTAINER_IMAGE_S2I.getName();
-    @Deprecated
-    public static final String HIBERNATE_ORM = Capability.HIBERNATE_ORM.getName();
-    @Deprecated
-    public static final String SMALLRYE_OPENTRACING = Capability.SMALLRYE_OPENTRACING.getName();
-    @Deprecated
-    public static final String SPRING_WEB = Capability.SPRING_WEB.getName();
-
     private final Set<String> capabilities;
 
     public Capabilities(Set<String> capabilities) {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
index 3824f527ae542..c127fe43503a1 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
@@ -13,6 +13,7 @@ public enum Capability {
      * JSR 365 compatible contexts and dependency injection
      */
     CDI,
+    CONFIG_YAML,
     /**
      * Java Servlet API
      */
@@ -28,9 +29,13 @@ public enum Capability {
     RESTEASY,
     RESTEASY_JSON,
     RESTEASY_MUTINY,
+    RESTEASY_REACTIVE,
+    RESTEASY_JACKSON,
+    RESTEASY_JSONB,
     JWT,
     TIKA,
     MONGODB_PANACHE,
+    MONGODB_PANACHE_KOTLIN,
     FLYWAY,
     LIQUIBASE,
     SECURITY,
@@ -39,17 +44,34 @@ public enum Capability {
     SECURITY_ELYTRON_LDAP,
     SECURITY_JPA,
     QUARTZ,
+    KUBERNETES_SERVICE_BINDING,
+    /**
+     * @deprecated
+     * @see io.quarkus.deployment.metrics.MetricsCapabilityBuildItem
+     */
     METRICS,
     CONTAINER_IMAGE_JIB,
     CONTAINER_IMAGE_DOCKER,
     CONTAINER_IMAGE_S2I,
+    CONTAINER_IMAGE_OPENSHIFT,
     HIBERNATE_ORM,
+    HIBERNATE_ENVERS,
     HIBERNATE_REACTIVE,
+    HIBERNATE_VALIDATOR,
+    /**
+     * Presence of an io.opentracing tracer (for example, Jaeger).
+     */
+    OPENTRACING,
+    /**
+     * Presence of SmallRye OpenTracing.
+     */
     SMALLRYE_OPENTRACING,
-    SPRING_WEB;
+    SPRING_WEB,
+    SMALLRYE_OPENAPI,
+    OPENSHIFT_CLIENT;
 
     /**
-     * 
+     *
      * @return the name
      */
     public String getName() {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/CodeGenContext.java b/core/deployment/src/main/java/io/quarkus/deployment/CodeGenContext.java
index 8fcb203ef7538..a0c5dfb669c3e 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/CodeGenContext.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/CodeGenContext.java
@@ -1,6 +1,7 @@
 package io.quarkus.deployment;
 
 import java.nio.file.Path;
+import java.util.Map;
 
 import io.quarkus.bootstrap.model.AppModel;
 
@@ -9,12 +10,17 @@ public class CodeGenContext {
     private final Path outDir;
     private final Path workDir;
     private final Path inputDir;
+    private final boolean redirectIO;
+    private final Map<String, String> properties;
 
-    public CodeGenContext(AppModel model, Path outDir, Path workDir, Path inputDir) {
+    public CodeGenContext(AppModel model, Path outDir, Path workDir, Path inputDir, boolean redirectIO,
+            Map<String, String> properties) {
         this.model = model;
         this.outDir = outDir;
         this.workDir = workDir;
         this.inputDir = inputDir;
+        this.redirectIO = redirectIO;
+        this.properties = properties;
     }
 
     public AppModel appModel() {
@@ -32,4 +38,12 @@ public Path workDir() {
     public Path inputDir() {
         return inputDir;
     }
+
+    public boolean shouldRedirectIO() {
+        return redirectIO;
+    }
+
+    public Map<String, String> properties() {
+        return properties;
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java b/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java
index 5b7ce4af881fb..25c2550b7bd20 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/CodeGenerator.java
@@ -5,6 +5,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -23,10 +24,11 @@ public class CodeGenerator {
     public static void initAndRun(ClassLoader classLoader,
             Set<Path> sourceParentDirs, Path generatedSourcesDir, Path buildDir,
             Consumer<Path> sourceRegistrar,
-            AppModel appModel) throws CodeGenException {
+            AppModel appModel, Map<String, String> properties) throws CodeGenException {
         List<CodeGenData> generators = init(classLoader, sourceParentDirs, generatedSourcesDir, buildDir, sourceRegistrar);
         for (CodeGenData generator : generators) {
-            trigger(classLoader, generator, appModel);
+            generator.setRedirectIO(true);
+            trigger(classLoader, generator, appModel, properties);
         }
     }
 
@@ -45,7 +47,7 @@ public static List<CodeGenData> init(ClassLoader deploymentClassLoader,
             } catch (ClassNotFoundException e) {
                 throw new CodeGenException("Failde to load CodeGenProvider class from deployment classloader", e);
             }
-            for (CodeGenProvider provider : ServiceLoader.load(codeGenProviderClass)) {
+            for (CodeGenProvider provider : ServiceLoader.load(codeGenProviderClass, deploymentClassLoader)) {
                 Path outputDir = codeGenOutDir(generatedSourcesDir, provider, sourceRegistrar);
                 for (Path sourceParentDir : sourceParentDirs) {
                     result.add(
@@ -74,19 +76,21 @@ private static <T> T callWithClassloader(ClassLoader deploymentClassLoader, Code
      * @param deploymentClassLoader deployment classloader
      * @param data code gen
      * @param appModel app model
+     * @param properties custom code generation properties
      * @return true if sources have been created
      * @throws CodeGenException on failure
      */
     public static boolean trigger(ClassLoader deploymentClassLoader,
             CodeGenData data,
-            AppModel appModel) throws CodeGenException {
+            AppModel appModel,
+            Map<String, String> properties) throws CodeGenException {
         return callWithClassloader(deploymentClassLoader, () -> {
-            Thread.currentThread().setContextClassLoader(deploymentClassLoader);
-
             CodeGenProvider provider = data.provider;
 
             return Files.isDirectory(data.sourceDir)
-                    && provider.trigger(new CodeGenContext(appModel, data.outPath, data.buildDir, data.sourceDir));
+                    && provider.trigger(
+                            new CodeGenContext(appModel, data.outPath, data.buildDir, data.sourceDir, data.redirectIO,
+                                    properties));
         });
     }
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java b/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java
index 2f1c3145eb830..14b9990b3f0bd 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java
@@ -10,6 +10,7 @@
 import static io.quarkus.deployment.util.ReflectUtil.rawTypeIs;
 import static io.quarkus.deployment.util.ReflectUtil.rawTypeOf;
 import static io.quarkus.deployment.util.ReflectUtil.rawTypeOfParameter;
+import static java.util.Arrays.asList;
 
 import java.io.IOException;
 import java.lang.reflect.AnnotatedElement;
@@ -79,6 +80,7 @@
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.deployment.util.ReflectUtil;
 import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.ResultHandle;
@@ -88,6 +90,9 @@
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.quarkus.runtime.configuration.QuarkusConfigFactory;
+import io.smallrye.config.KeyMap;
+import io.smallrye.config.KeyMapBackedConfigSource;
+import io.smallrye.config.NameIterator;
 import io.smallrye.config.PropertiesConfigSource;
 import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.config.SmallRyeConfigBuilder;
@@ -99,6 +104,7 @@ public final class ExtensionLoader {
     private ExtensionLoader() {
     }
 
+    private static final Logger loadLog = Logger.getLogger("io.quarkus.deployment");
     private static final Logger cfgLog = Logger.getLogger("io.quarkus.configuration");
     private static final String CONFIG_ROOTS_LIST = "META-INF/quarkus-config-roots.list";
 
@@ -107,61 +113,22 @@ private static boolean isRecorder(AnnotatedElement element) {
         return element.isAnnotationPresent(Recorder.class);
     }
 
-    /**
-     * Load all the build steps from the given class loader.
-     *
-     * @param classLoader the class loader
-     * @return a consumer which adds the steps to the given chain builder
-     * @throws IOException if the class loader could not load a resource
-     * @throws ClassNotFoundException if a build step class is not found
-     */
-    public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader)
-            throws IOException, ClassNotFoundException {
-        return loadStepsFrom(classLoader, new Properties());
-    }
-
-    /**
-     * Load all the build steps from the given class loader.
-     *
-     * @param classLoader the class loader
-     * @param launchMode the launch mode
-     * @return a consumer which adds the steps to the given chain builder
-     * @throws IOException if the class loader could not load a resource
-     * @throws ClassNotFoundException if a build step class is not found
-     */
-    public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader, LaunchMode launchMode,
-            Consumer<ConfigBuilder> configCustomizer)
-            throws IOException, ClassNotFoundException {
-        return loadStepsFrom(classLoader, new Properties(), launchMode, configCustomizer);
-    }
-
-    /**
-     * Load all the build steps from the given class loader.
-     *
-     * @param classLoader the class loader
-     * @param buildSystemProps the build system properties to use
-     * @return a consumer which adds the steps to the given chain builder
-     * @throws IOException if the class loader could not load a resource
-     * @throws ClassNotFoundException if a build step class is not found
-     */
-    public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader, Properties buildSystemProps)
-            throws IOException, ClassNotFoundException {
-        return loadStepsFrom(classLoader, buildSystemProps, LaunchMode.NORMAL, null);
-    }
-
     /**
      * Load all the build steps from the given class loader.
      *
      * @param classLoader the class loader
      * @param buildSystemProps the build system properties to use
+     * @param platformProperties Quarkus platform properties
+     * @param launchMode launch mode
+     * @param configCustomizer configuration customizer
      * @return a consumer which adds the steps to the given chain builder
      * @throws IOException if the class loader could not load a resource
      * @throws ClassNotFoundException if a build step class is not found
      */
     public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader, Properties buildSystemProps,
-            LaunchMode launchMode, Consumer<ConfigBuilder> configCustomizer)
+            Map<String, String> platformProperties, LaunchMode launchMode, DevModeType devModeType,
+            Consumer<ConfigBuilder> configCustomizer)
             throws IOException, ClassNotFoundException {
-
         // populate with all known types
         List<Class<?>> roots = new ArrayList<>();
         for (Class<?> clazz : ServiceUtil.classesNamedIn(classLoader, CONFIG_ROOTS_LIST)) {
@@ -183,8 +150,19 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader,
         final DefaultValuesConfigurationSource ds2 = new DefaultValuesConfigurationSource(
                 reader.getBuildTimeRunTimePatternMap());
         final PropertiesConfigSource pcs = new PropertiesConfigSource(buildSystemProps, "Build system");
-
-        builder.withSources(ds1, ds2, pcs);
+        if (platformProperties.isEmpty()) {
+            builder.withSources(ds1, ds2, pcs);
+        } else {
+            final KeyMap<String> props = new KeyMap<>(platformProperties.size());
+            for (Map.Entry<String, String> prop : platformProperties.entrySet()) {
+                props.findOrAdd(new NameIterator(prop.getKey())).putRootValue(prop.getValue());
+            }
+            final KeyMapBackedConfigSource platformConfigSource = new KeyMapBackedConfigSource("Quarkus platform",
+                    // Our default value configuration source is using an ordinal of Integer.MIN_VALUE
+                    // (see io.quarkus.deployment.configuration.DefaultValuesConfigurationSource)
+                    Integer.MIN_VALUE + 1000, props);
+            builder.withSources(ds1, ds2, platformConfigSource, pcs);
+        }
 
         if (configCustomizer != null) {
             configCustomizer.accept(builder);
@@ -208,7 +186,7 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader,
         for (Class<?> clazz : ServiceUtil.classesNamedIn(classLoader, "META-INF/quarkus-build-steps.list")) {
             try {
                 result = result.andThen(
-                        ExtensionLoader.loadStepsFrom(clazz, readResult, proxies, launchMode));
+                        ExtensionLoader.loadStepsFromClass(clazz, readResult, proxies, launchMode, devModeType));
             } catch (Throwable e) {
                 throw new RuntimeException("Failed to load steps from " + clazz, e);
             }
@@ -248,11 +226,15 @@ public boolean canHandleObject(final Object obj, final boolean staticInit) {
      * @param launchMode the launch mode
      * @return a consumer which adds the steps to the given chain builder
      */
-    public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTimeConfigurationReader.ReadResult readResult,
-            Map<Class<?>, Object> runTimeProxies, final LaunchMode launchMode) {
+    private static Consumer<BuildChainBuilder> loadStepsFromClass(Class<?> clazz,
+            BuildTimeConfigurationReader.ReadResult readResult,
+            Map<Class<?>, Object> runTimeProxies, final LaunchMode launchMode, DevModeType devModeType) {
         final Constructor<?>[] constructors = clazz.getDeclaredConstructors();
         // this is the chain configuration that will contain all steps on this class and be returned
         Consumer<BuildChainBuilder> chainConfig = Functions.discardingConsumer();
+        if (Modifier.isAbstract(clazz.getModifiers())) {
+            return chainConfig;
+        }
         // this is the step configuration that applies to all steps on this class
         Consumer<BuildStepBuilder> stepConfig = Functions.discardingConsumer();
         // this is the build step instance setup that applies to all steps on this class
@@ -290,6 +272,7 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTim
                     stepConfig = stepConfig.andThen(bsb -> bsb.consumes(buildItemClass));
                     ctorParamFns.add(bc -> bc.consumeMulti(buildItemClass));
                 } else if (isConsumerOf(parameterType, BuildItem.class)) {
+                    deprecatedProducer(parameter);
                     final Class<? extends BuildItem> buildItemClass = rawTypeOfParameter(parameterType, 0)
                             .asSubclass(BuildItem.class);
                     if (overridable) {
@@ -308,6 +291,7 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTim
                     }
                     ctorParamFns.add(bc -> (Consumer<? extends BuildItem>) bc::produce);
                 } else if (isBuildProducerOf(parameterType, BuildItem.class)) {
+                    deprecatedProducer(parameter);
                     final Class<? extends BuildItem> buildItemClass = rawTypeOfParameter(parameterType, 0)
                             .asSubclass(BuildItem.class);
                     if (overridable) {
@@ -399,6 +383,7 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTim
                 stepInstanceSetup = stepInstanceSetup
                         .andThen((bc, o) -> ReflectUtil.setFieldVal(field, o, bc.consumeMulti(buildItemClass)));
             } else if (isConsumerOf(fieldType, BuildItem.class)) {
+                deprecatedProducer(field);
                 final Class<? extends BuildItem> buildItemClass = rawTypeOfParameter(fieldType, 0).asSubclass(BuildItem.class);
                 if (overridable) {
                     if (weak) {
@@ -417,6 +402,7 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTim
                 stepInstanceSetup = stepInstanceSetup
                         .andThen((bc, o) -> ReflectUtil.setFieldVal(field, o, (Consumer<? extends BuildItem>) bc::produce));
             } else if (isBuildProducerOf(fieldType, BuildItem.class)) {
+                deprecatedProducer(field);
                 final Class<? extends BuildItem> buildItemClass = rawTypeOfParameter(fieldType, 0).asSubclass(BuildItem.class);
                 if (overridable) {
                     if (weak) {
@@ -482,7 +468,7 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTim
         }
 
         // now iterate the methods
-        final Method[] methods = clazz.getDeclaredMethods();
+        final List<Method> methods = getMethods(clazz);
         for (Method method : methods) {
             final int mods = method.getModifiers();
             if (Modifier.isStatic(mods)) {
@@ -535,6 +521,8 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(Class<?> clazz, BuildTim
                             final Class<?> parameterClass = parameter.getType();
                             if (parameterClass == LaunchMode.class) {
                                 paramSuppList.add(() -> launchMode);
+                            } else if (parameterClass == DevModeType.class) {
+                                paramSuppList.add(() -> devModeType);
                             } else if (parameterClass.isAnnotationPresent(ConfigRoot.class)) {
                                 final ConfigRoot annotation = parameterClass.getAnnotation(ConfigRoot.class);
                                 final ConfigPhase phase = annotation.phase();
@@ -963,6 +951,21 @@ public String toString() {
         return chainConfig;
     }
 
+    private static void deprecatedProducer(final Object element) {
+        loadLog.warnf(
+                "Producing values from constructors and fields is no longer supported and will be removed in a future release: %s",
+                element);
+    }
+
+    protected static List<Method> getMethods(Class<?> clazz) {
+        List<Method> declaredMethods = new ArrayList<>();
+        if (!clazz.getName().equals(Object.class.getName())) {
+            declaredMethods.addAll(getMethods(clazz.getSuperclass()));
+            declaredMethods.addAll(asList(clazz.getDeclaredMethods()));
+        }
+        return declaredMethods;
+    }
+
     private static BooleanSupplier and(BooleanSupplier a, BooleanSupplier b) {
         return () -> a.getAsBoolean() && b.getAsBoolean();
     }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
index 56bab5e6a90d5..b953e83109000 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
@@ -12,6 +12,7 @@ public enum Feature {
     AGROAL,
     AMAZON_DYNAMODB,
     AMAZON_LAMBDA,
+    AMAZON_IAM,
     AMAZON_S3,
     AMAZON_SNS,
     AMAZON_SQS,
@@ -35,6 +36,7 @@ public enum Feature {
     HIBERNATE_ORM_PANACHE_KOTLIN,
     HIBERNATE_ORM_REST_DATA_PANACHE,
     HIBERNATE_REACTIVE,
+    HIBERNATE_REACTIVE_PANACHE,
     HIBERNATE_SEARCH_ELASTICSEARCH,
     HIBERNATE_VALIDATOR,
     INFINISPAN_CLIENT,
@@ -57,29 +59,44 @@ public enum Feature {
     LIQUIBASE,
     LOGGING_GELF,
     MAILER,
+    MICROMETER,
     MONGODB_CLIENT,
     MONGODB_PANACHE,
+    MONGODB_PANACHE_KOTLIN,
+    MONGODB_REST_DATA_PANACHE,
     MUTINY,
     NARAYANA_JTA,
     NARAYANA_STM,
-    REACTIVE_PG_CLIENT,
-    REACTIVE_MYSQL_CLIENT,
-    REACTIVE_DB2_CLIENT,
     NEO4J,
     OIDC,
+    OIDC_CLIENT,
+    OIDC_CLIENT_FILTER,
+    OIDC_TOKEN_PROPAGATION,
+    OPENSHIFT_CLIENT,
     PICOCLI,
+    QUARTZ,
     QUTE,
+    REACTIVE_PG_CLIENT,
+    REACTIVE_MYSQL_CLIENT,
+    REACTIVE_DB2_CLIENT,
     REDIS_CLIENT,
     RESTEASY,
     RESTEASY_JACKSON,
     RESTEASY_JAXB,
     RESTEASY_JSONB,
+    RESTEASY_MULTIPART,
     RESTEASY_MUTINY,
     RESTEASY_QUTE,
+    RESTEASY_REACTIVE,
+    RESTEASY_REACTIVE_QUTE,
+    RESTEASY_REACTIVE_JAXRS_CLIENT,
+    RESTEASY_REACTIVE_JSONB,
+    RESTEASY_REACTIVE_JACKSON,
     REST_CLIENT,
     REST_CLIENT_JACKSON,
     REST_CLIENT_JAXB,
     REST_CLIENT_JSONB,
+    REST_CLIENT_MUTINY,
     SCALA,
     SCHEDULER,
     SECURITY,
@@ -106,6 +123,7 @@ public enum Feature {
     SPRING_DI,
     SPRING_WEB,
     SPRING_DATA_JPA,
+    SPRING_DATA_REST,
     SPRING_SECURITY,
     SPRING_BOOT_PROPERTIES,
     SPRING_CACHE,
@@ -113,7 +131,7 @@ public enum Feature {
     SPRING_SCHEDULED,
     SWAGGER_UI,
     TIKA,
-    UNDERTOW_WEBSOCKETS,
+    WEBSOCKETS,
     VAULT,
     VERTX,
     VERTX_WEB,
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/IsNormalNotRemoteDev.java b/core/deployment/src/main/java/io/quarkus/deployment/IsNormalNotRemoteDev.java
new file mode 100644
index 0000000000000..516ec900776d0
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/IsNormalNotRemoteDev.java
@@ -0,0 +1,27 @@
+package io.quarkus.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.dev.spi.DevModeType;
+import io.quarkus.runtime.LaunchMode;
+
+/**
+ * boolean supplier that returns true if the application is running in normal
+ * mode, but is not a remote dev client. Intended for use with {@link BuildStep#onlyIf()}
+ */
+public class IsNormalNotRemoteDev implements BooleanSupplier {
+
+    private final LaunchMode launchMode;
+    private final DevModeType devModeType;
+
+    public IsNormalNotRemoteDev(LaunchMode launchMode, DevModeType devModeType) {
+        this.launchMode = launchMode;
+        this.devModeType = devModeType;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return launchMode == LaunchMode.NORMAL && devModeType == null;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/IsRemoteDevClient.java b/core/deployment/src/main/java/io/quarkus/deployment/IsRemoteDevClient.java
new file mode 100644
index 0000000000000..0e7ef32fb100a
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/IsRemoteDevClient.java
@@ -0,0 +1,24 @@
+package io.quarkus.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.dev.spi.DevModeType;
+
+/**
+ * boolean supplier that returns true if the application is the local side
+ * of remote dev mode. Intended for use with {@link BuildStep#onlyIf()}
+ */
+public class IsRemoteDevClient implements BooleanSupplier {
+
+    private final DevModeType devModeType;
+
+    public IsRemoteDevClient(DevModeType devModeType) {
+        this.devModeType = devModeType;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return devModeType == DevModeType.REMOTE_LOCAL_SIDE;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java
index 2546e96ad42d8..09882de1382ad 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -35,8 +36,9 @@
 import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.pkg.builditem.DeploymentResultBuildItem;
-import io.quarkus.deployment.util.JavaVersionUtil;
+import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.util.JavaVersionUtil;
 
 public class QuarkusAugmentor {
 
@@ -48,6 +50,7 @@ public class QuarkusAugmentor {
     private final Set<Class<? extends BuildItem>> finalResults;
     private final List<Consumer<BuildChainBuilder>> buildChainCustomizers;
     private final LaunchMode launchMode;
+    private final DevModeType devModeType;
     private final List<PathsCollection> additionalApplicationArchives;
     private final Collection<Path> excludedFromIndexing;
     private final LiveReloadBuildItem liveReloadBuildItem;
@@ -74,6 +77,7 @@ public class QuarkusAugmentor {
         this.configCustomizer = builder.configCustomizer;
         this.deploymentClassLoader = builder.deploymentClassLoader;
         this.rebuild = builder.rebuild;
+        this.devModeType = builder.devModeType;
     }
 
     public BuildResult run() throws Exception {
@@ -94,12 +98,11 @@ public BuildResult run() throws Exception {
             //TODO: we load everything from the deployment class loader
             //this allows the deployment config (application.properties) to be loaded, but in theory could result
             //in additional stuff from the deployment leaking in, this is unlikely but has a bit of a smell.
-            if (buildSystemProperties != null) {
-                ExtensionLoader.loadStepsFrom(deploymentClassLoader, buildSystemProperties, launchMode, configCustomizer)
-                        .accept(chainBuilder);
-            } else {
-                ExtensionLoader.loadStepsFrom(deploymentClassLoader, launchMode, configCustomizer).accept(chainBuilder);
-            }
+            ExtensionLoader.loadStepsFrom(deploymentClassLoader,
+                    buildSystemProperties == null ? new Properties() : buildSystemProperties,
+                    effectiveModel.getPlatformProperties(), launchMode, devModeType, configCustomizer)
+                    .accept(chainBuilder);
+
             Thread.currentThread().setContextClassLoader(classLoader);
             chainBuilder.loadProviders(classLoader);
 
@@ -138,7 +141,8 @@ public BuildResult run() throws Exception {
                     .produce(rootBuilder.build(buildCloseables))
                     .produce(new ShutdownContextBuildItem())
                     .produce(new RawCommandLineArgumentsBuildItem())
-                    .produce(new LaunchModeBuildItem(launchMode))
+                    .produce(new LaunchModeBuildItem(launchMode,
+                            devModeType == null ? Optional.empty() : Optional.of(devModeType)))
                     .produce(new BuildSystemTargetBuildItem(targetDir, baseName, rebuild,
                             buildSystemProperties == null ? new Properties() : buildSystemProperties))
                     .produce(new DeploymentClassLoaderBuildItem(deploymentClassLoader))
@@ -192,6 +196,7 @@ public static final class Builder {
         String baseName = "quarkus-application";
         Consumer<ConfigBuilder> configCustomizer;
         ClassLoader deploymentClassLoader;
+        DevModeType devModeType;
 
         public Builder addBuildChainCustomizer(Consumer<BuildChainBuilder> customizer) {
             this.buildChainCustomizers.add(customizer);
@@ -221,6 +226,15 @@ public Builder setLaunchMode(LaunchMode launchMode) {
             return this;
         }
 
+        public DevModeType getDevModeType() {
+            return devModeType;
+        }
+
+        public Builder setDevModeType(DevModeType devModeType) {
+            this.devModeType = devModeType;
+            return this;
+        }
+
         public ClassLoader getClassLoader() {
             return classLoader;
         }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/SslProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/SslProcessor.java
index 4448a9223e7b6..0ccc9fa0812bd 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/SslProcessor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/SslProcessor.java
@@ -39,7 +39,7 @@ void runtime(BuildProducer<RuntimeReinitializedClassBuildItem> reinitialized) {
 
     private void registerIfExists(BuildProducer<RuntimeReinitializedClassBuildItem> reinitialized, String className) {
         try {
-            Class.forName(className);
+            Class.forName(className, false, Thread.currentThread().getContextClassLoader());
             reinitialized.produce(new RuntimeReinitializedClassBuildItem(className));
         } catch (ClassNotFoundException ignored) {
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/TestConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/TestConfig.java
index 63a9b3955392f..b619578c833a3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/TestConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/TestConfig.java
@@ -1,7 +1,10 @@
 package io.quarkus.deployment;
 
 import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
@@ -27,8 +30,27 @@ public class TestConfig {
     String nativeImageProfile;
 
     /**
-     * The profile to use when testing using @QuarkusTest
+     * Profile related test settings
      */
-    @ConfigItem(defaultValue = "test")
-    String profile;
+    @ConfigItem
+    Profile profile;
+
+    @ConfigGroup
+    public static class Profile {
+
+        /**
+         * The profile (dev, test or prod) to use when testing using @QuarkusTest
+         */
+        @ConfigItem(name = ConfigItem.PARENT, defaultValue = "test")
+        String profile;
+
+        /**
+         * The tags this profile is associated with.
+         * When the {@code quarkus.test.profile.tags} System property is set (its value is a comma separated list of strings)
+         * then Quarkus will only execute tests that are annotated with a {@code @TestProfile} that has at least one of the
+         * supplied (via the aforementioned system property) tags.
+         */
+        @ConfigItem(defaultValue = "")
+        Optional<List<String>> tags;
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/AdditionalClassLoaderResourcesBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/AdditionalClassLoaderResourcesBuildItem.java
new file mode 100644
index 0000000000000..7a5ee94f3b42c
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/AdditionalClassLoaderResourcesBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.deployment.builditem;
+
+import java.util.Map;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class AdditionalClassLoaderResourcesBuildItem extends MultiBuildItem {
+
+    final Map<String, byte[]> resources;
+
+    public AdditionalClassLoaderResourcesBuildItem(Map<String, byte[]> resources) {
+        this.resources = resources;
+    }
+
+    public Map<String, byte[]> getResources() {
+        return resources;
+    }
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/BytecodeTransformerBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/BytecodeTransformerBuildItem.java
index 390548ecf653c..966114f1b8609 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/BytecodeTransformerBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/BytecodeTransformerBuildItem.java
@@ -1,5 +1,6 @@
 package io.quarkus.deployment.builditem;
 
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiFunction;
 
@@ -12,24 +13,33 @@ public final class BytecodeTransformerBuildItem extends MultiBuildItem {
     /**
      * If this is true it means the class should be loaded eagerly by a thread pool in dev mode
      * on multi threaded systems.
-     *
+     * <p>
      * Transformation is expensive, so doing it this way can speed up boot time.
      */
     final boolean eager;
     final String classToTransform;
     final BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction;
 
+    /**
+     * Function that can be applied to the inout bytes before it is passed into ASM. This should only be used
+     * in very specific circumstances. At the moment the only known valid use case is jacoco, which needs
+     * access to the unmodified class file bytes.
+     */
+    final BiFunction<String, byte[], byte[]> inputTransformer;
+
     /**
      * A set of class names that need to be present in the const pool for the transformation to happen. These
      * need to be in JVM internal format.
-     *
+     * <p>
      * The transformation is only applied if at least one of the entries in the const pool is present
-     *
+     * <p>
      * Note that this is an optimisation, and if another transformer is transforming the class anyway then
      * this transformer will always be applied.
      */
     final Set<String> requireConstPoolEntry;
 
+    final boolean cacheable;
+
     public BytecodeTransformerBuildItem(String classToTransform,
             BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction) {
         this(classToTransform, visitorFunction, null);
@@ -45,12 +55,38 @@ public BytecodeTransformerBuildItem(boolean eager, String classToTransform,
         this(eager, classToTransform, visitorFunction, null);
     }
 
+    public BytecodeTransformerBuildItem(boolean eager, String classToTransform,
+            BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction, boolean cacheable) {
+        this(eager, classToTransform, visitorFunction, null, cacheable);
+    }
+
     public BytecodeTransformerBuildItem(boolean eager, String classToTransform,
             BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction, Set<String> requireConstPoolEntry) {
+        this(eager, classToTransform, visitorFunction, requireConstPoolEntry, false);
+    }
+
+    public BytecodeTransformerBuildItem(boolean eager, String classToTransform,
+            BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction, Set<String> requireConstPoolEntry,
+            boolean cacheable) {
+        Objects.requireNonNull(visitorFunction, "visitorFunction");
         this.eager = eager;
         this.classToTransform = classToTransform;
         this.visitorFunction = visitorFunction;
         this.requireConstPoolEntry = requireConstPoolEntry;
+        this.cacheable = cacheable;
+        this.inputTransformer = null;
+    }
+
+    public BytecodeTransformerBuildItem(Builder builder) {
+        this.eager = builder.eager;
+        this.classToTransform = builder.classToTransform;
+        this.visitorFunction = builder.visitorFunction;
+        this.requireConstPoolEntry = builder.requireConstPoolEntry;
+        this.cacheable = builder.cacheable;
+        this.inputTransformer = builder.inputTransformer;
+        if (visitorFunction == null && inputTransformer == null) {
+            throw new IllegalArgumentException("One of either visitorFunction or inputTransformer must be set");
+        }
     }
 
     public String getClassToTransform() {
@@ -68,4 +104,56 @@ public Set<String> getRequireConstPoolEntry() {
     public boolean isEager() {
         return eager;
     }
+
+    public boolean isCacheable() {
+        return cacheable;
+    }
+
+    public BiFunction<String, byte[], byte[]> getInputTransformer() {
+        return inputTransformer;
+    }
+
+    public static class Builder {
+        public BiFunction<String, byte[], byte[]> inputTransformer;
+        private String classToTransform;
+        private BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction;
+        private Set<String> requireConstPoolEntry = null;
+        private boolean eager = false;
+        private boolean cacheable = false;
+
+        public Builder setInputTransformer(BiFunction<String, byte[], byte[]> inputTransformer) {
+            this.inputTransformer = inputTransformer;
+            return this;
+        }
+
+        public Builder setClassToTransform(String classToTransform) {
+            this.classToTransform = classToTransform;
+            return this;
+        }
+
+        public Builder setVisitorFunction(BiFunction<String, ClassVisitor, ClassVisitor> visitorFunction) {
+            this.visitorFunction = visitorFunction;
+            return this;
+        }
+
+        public Builder setRequireConstPoolEntry(Set<String> requireConstPoolEntry) {
+            this.requireConstPoolEntry = requireConstPoolEntry;
+            return this;
+        }
+
+        public Builder setEager(boolean eager) {
+            this.eager = eager;
+            return this;
+        }
+
+        public Builder setCacheable(boolean cacheable) {
+            this.cacheable = cacheable;
+            return this;
+        }
+
+        public BytecodeTransformerBuildItem build() {
+            return new BytecodeTransformerBuildItem(this);
+        }
+    }
+
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ChangedClassesBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ChangedClassesBuildItem.java
new file mode 100644
index 0000000000000..1d1bf11f8614e
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ChangedClassesBuildItem.java
@@ -0,0 +1,54 @@
+package io.quarkus.deployment.builditem;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Represents the differences between classes in a dev mode restart.
+ *
+ * This can be used to avoid repeating work on restart, e.g. re-using
+ * old proxy definitions if nothing has changed for a given class.
+ *
+ * This will not always be present, it must be injected as an
+ * optional dependency.
+ *
+ * This will never be generated if the previous restart was a failure
+ * to avoid issues with inconsistent application state.
+ */
+public class ChangedClassesBuildItem extends SimpleBuildItem {
+
+    private final Map<DotName, ClassInfo> changedClassesNewVersion;
+    private final Map<DotName, ClassInfo> changedClassesOldVersion;
+    private final Map<DotName, ClassInfo> deletedClasses;
+    private final Map<DotName, ClassInfo> addedClasses;
+
+    public ChangedClassesBuildItem(Map<DotName, ClassInfo> changedClassesNewVersion,
+            Map<DotName, ClassInfo> changedClassesOldVersion, Map<DotName, ClassInfo> deletedClasses,
+            Map<DotName, ClassInfo> addedClasses) {
+        this.changedClassesNewVersion = changedClassesNewVersion;
+        this.changedClassesOldVersion = changedClassesOldVersion;
+        this.deletedClasses = deletedClasses;
+        this.addedClasses = addedClasses;
+    }
+
+    public Map<DotName, ClassInfo> getChangedClassesNewVersion() {
+        return Collections.unmodifiableMap(changedClassesNewVersion);
+    }
+
+    public Map<DotName, ClassInfo> getChangedClassesOldVersion() {
+        return Collections.unmodifiableMap(changedClassesOldVersion);
+    }
+
+    public Map<DotName, ClassInfo> getDeletedClasses() {
+        return Collections.unmodifiableMap(deletedClasses);
+    }
+
+    public Map<DotName, ClassInfo> getAddedClasses() {
+        return Collections.unmodifiableMap(addedClasses);
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/CombinedIndexBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/CombinedIndexBuildItem.java
index ebfe7c3d8a822..fc47bce41240e 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/CombinedIndexBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/CombinedIndexBuildItem.java
@@ -1,5 +1,6 @@
 package io.quarkus.deployment.builditem;
 
+import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 
 import io.quarkus.builder.item.SimpleBuildItem;
@@ -13,6 +14,10 @@
  * Compared to {@code BeanArchiveIndexBuildItem}, this index doesn't contain all CDI-related information.
  * On the other hand, it can contain classes from archives/dependencies that had no CDI component declared within them.
  *
+ * The computing index can also be used to index classes on demand. This when {@link IndexView#getClassByName(DotName)}
+ * is called. Note that this is a mutable index as this will add additional information, so in general this Index
+ * should only be used if you actually need it.
+ *
  * @see AdditionalApplicationArchiveMarkerBuildItem
  * @see IndexDependencyBuildItem
  */
@@ -20,11 +25,18 @@ public final class CombinedIndexBuildItem extends SimpleBuildItem {
 
     private final IndexView index;
 
-    public CombinedIndexBuildItem(IndexView index) {
+    private final IndexView computingIndex;
+
+    public CombinedIndexBuildItem(IndexView index, IndexView computingIndex) {
         this.index = index;
+        this.computingIndex = computingIndex;
     }
 
     public IndexView getIndex() {
         return index;
     }
+
+    public IndexView getComputingIndex() {
+        return computingIndex;
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/GeneratedClassBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/GeneratedClassBuildItem.java
index 0d6a49142b71f..00fb49e11a23b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/GeneratedClassBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/GeneratedClassBuildItem.java
@@ -14,6 +14,9 @@ public GeneratedClassBuildItem(boolean applicationClass, String name, byte[] cla
     }
 
     public GeneratedClassBuildItem(boolean applicationClass, String name, byte[] classData, String source) {
+        if (name.startsWith("/")) {
+            throw new IllegalArgumentException("Name cannot start with '/':" + name);
+        }
         this.applicationClass = applicationClass;
         this.name = name;
         this.classData = classData;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java
index 309c36d0185ac..5fbcd30b00e54 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/LaunchModeBuildItem.java
@@ -1,6 +1,9 @@
 package io.quarkus.deployment.builditem;
 
+import java.util.Optional;
+
 import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.runtime.LaunchMode;
 
 /**
@@ -10,11 +13,24 @@ public final class LaunchModeBuildItem extends SimpleBuildItem {
 
     private final LaunchMode launchMode;
 
-    public LaunchModeBuildItem(LaunchMode launchMode) {
+    private final Optional<DevModeType> devModeType;
+
+    public LaunchModeBuildItem(LaunchMode launchMode, Optional<DevModeType> devModeType) {
         this.launchMode = launchMode;
+        this.devModeType = devModeType;
     }
 
     public LaunchMode getLaunchMode() {
         return launchMode;
     }
+
+    /**
+     * The development mode type.
+     *
+     * Note that even for NORMAL launch modes this could be generating an application for the local side of remote
+     * dev mode, so this may be set even for launch mode normal.
+     */
+    public Optional<DevModeType> getDevModeType() {
+        return devModeType;
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/LiveReloadBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/LiveReloadBuildItem.java
index 6949e615f827b..1d71b04646d94 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/LiveReloadBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/LiveReloadBuildItem.java
@@ -5,6 +5,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.quarkus.bootstrap.app.ClassChangeInformation;
 import io.quarkus.builder.item.SimpleBuildItem;
 
 /**
@@ -18,6 +19,7 @@ public final class LiveReloadBuildItem extends SimpleBuildItem {
     private final boolean liveReload;
     private final Set<String> changedResources;
     private final Map<Class<?>, Object> reloadContext;
+    private final ClassChangeInformation changeInformation;
 
     /**
      * This constructor should only be used if live reload is not possible
@@ -26,12 +28,15 @@ public LiveReloadBuildItem() {
         liveReload = false;
         changedResources = Collections.emptySet();
         this.reloadContext = new ConcurrentHashMap<>();
+        this.changeInformation = null;
     }
 
-    public LiveReloadBuildItem(boolean liveReload, Set<String> changedResources, Map<Class<?>, Object> reloadContext) {
+    public LiveReloadBuildItem(boolean liveReload, Set<String> changedResources, Map<Class<?>, Object> reloadContext,
+            ClassChangeInformation changeInformation) {
         this.liveReload = liveReload;
         this.changedResources = changedResources;
         this.reloadContext = reloadContext;
+        this.changeInformation = changeInformation;
     }
 
     /**
@@ -71,4 +76,15 @@ public <T> T getContextObject(Class<T> type) {
     public <T> void setContextObject(Class<T> type, T val) {
         reloadContext.put(type, val);
     }
+
+    /**
+     * Returns the change information from the last successful restart.
+     *
+     * Will be null if Quarkus has not previously successfully started, or if the
+     * previous attempt to start was a failure.
+     *
+     */
+    public ClassChangeInformation getChangeInformation() {
+        return changeInformation;
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/NativeImageEnableAllTimeZonesBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/NativeImageEnableAllTimeZonesBuildItem.java
index 4223eceba4d21..2a624e3ad8efa 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/NativeImageEnableAllTimeZonesBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/NativeImageEnableAllTimeZonesBuildItem.java
@@ -2,6 +2,15 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 
+/**
+ * All timezones are now included in native executables by default so this build item does not change the build behavior
+ * anymore.
+ * <p>
+ * Keeping it around for now as it marks the extension requiring all the timezones
+ * and better wait for the situation to fully settle on the GraalVM side
+ * before removing it entirely.
+ */
+@Deprecated
 public final class NativeImageEnableAllTimeZonesBuildItem extends MultiBuildItem {
 
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ObjectSubstitutionBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ObjectSubstitutionBuildItem.java
index ef465c6f3a84a..92d3b8602d1d2 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ObjectSubstitutionBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ObjectSubstitutionBuildItem.java
@@ -30,8 +30,9 @@ public Holder(Class<F> from, Class<T> to, Class<ObjectSubstitution<F, T>> substi
 
     public final Holder<?, ?> holder;
 
-    public <F, T> ObjectSubstitutionBuildItem(Class<F> from, Class<T> to, Class<ObjectSubstitution<F, T>> substitution) {
-        holder = new Holder<>(from, to, substitution);
+    public <F, T> ObjectSubstitutionBuildItem(Class<F> from, Class<T> to,
+            Class<? extends ObjectSubstitution<F, T>> substitution) {
+        holder = new Holder(from, to, substitution);
     }
 
     public ObjectSubstitutionBuildItem(Holder<?, ?> holder) {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/TransformedClassesBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/TransformedClassesBuildItem.java
index edad767ad912a..3f0aa90194fca 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/TransformedClassesBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/TransformedClassesBuildItem.java
@@ -36,12 +36,16 @@ public Map<Path, Set<String>> getTransformedFilesByJar() {
 
     public static class TransformedClass {
 
+        private final String className;
         private final byte[] data;
         private final String fileName;
+        private final boolean eager;
 
-        public TransformedClass(byte[] data, String fileName) {
+        public TransformedClass(String className, byte[] data, String fileName, boolean eager) {
+            this.className = className;
             this.data = data;
             this.fileName = fileName;
+            this.eager = eager;
         }
 
         public byte[] getData() {
@@ -52,6 +56,14 @@ public String getFileName() {
             return fileName;
         }
 
+        public String getClassName() {
+            return className;
+        }
+
+        public boolean isEager() {
+            return eager;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o)
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceBuildItem.java
index d2f8346418087..56ecff462a4d0 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceBuildItem.java
@@ -8,6 +8,12 @@
 
 /**
  * A build item that indicates that a static resource should be included in the native image
+ * <p>
+ * Related build items:
+ * <ul>
+ * <li>Use {@link NativeImageResourceDirectoryBuildItem} if you need to add a directory of resources
+ * <li>Use {@link NativeImageResourcePatternsBuildItem} to select resource paths by regular expressions or globs
+ * </ul>
  */
 public final class NativeImageResourceBuildItem extends MultiBuildItem {
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceDirectoryBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceDirectoryBuildItem.java
index 60847c404ac56..875e9ecd12745 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceDirectoryBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceDirectoryBuildItem.java
@@ -4,6 +4,12 @@
 
 /**
  * A build item that indicates that directory resources should be included in the native image
+ * <p>
+ * Related build items:
+ * <ul>
+ * <li>Use {@link NativeImageResourceBuildItem} if you need to add a single resource
+ * <li>Use {@link NativeImageResourcePatternsBuildItem} to select resource paths by regular expressions or globs
+ * </ul>
  */
 public final class NativeImageResourceDirectoryBuildItem extends MultiBuildItem {
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourcePatternsBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourcePatternsBuildItem.java
new file mode 100644
index 0000000000000..2b062767950af
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourcePatternsBuildItem.java
@@ -0,0 +1,236 @@
+package io.quarkus.deployment.builditem.nativeimage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.deployment.pkg.NativeConfig;
+import io.quarkus.deployment.util.GlobUtil;
+
+/**
+ * A build item that indicates that a set of resource paths defined by regular expression patterns or globs should be
+ * included in the native image.
+ * <p>
+ * Globs passed to the {@code includeGlob*()} methods of the {@link Builder} are transformed to regular expressions
+ * internally. See {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+ * <p>
+ * The patterns are passed to the native image builder using the {@code com.oracle.svm.hosted.ResourcesFeature} API.
+ * The same mechanism (and regular expression syntax) is used by {@code native-image}'s
+ * {@code -H:ResourceConfigurationFiles}, {@code -H:IncludeResources} and {@code -H:ExcludeResources} (since
+ * GraalVM 20.3.0) command line options.
+ * <p>
+ * Related build items:
+ * <ul>
+ * <li>Use {@link NativeImageResourceBuildItem} if you need to add a single resource
+ * <li>Use {@link NativeImageResourceDirectoryBuildItem} if you need to add a directory of resources
+ * </ul>
+ */
+public final class NativeImageResourcePatternsBuildItem extends MultiBuildItem {
+
+    private final List<String> excludePatterns;
+
+    private final List<String> includePatterns;
+
+    private NativeImageResourcePatternsBuildItem(List<String> includePatterns, List<String> excludePatterns) {
+        this.includePatterns = includePatterns;
+        this.excludePatterns = excludePatterns;
+    }
+
+    public List<String> getExcludePatterns() {
+        return excludePatterns;
+    }
+
+    public List<String> getIncludePatterns() {
+        return includePatterns;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private List<String> excludePatterns = new ArrayList<>();
+        private List<String> includePatterns = new ArrayList<>();
+
+        public NativeImageResourcePatternsBuildItem build() {
+            final List<String> incl = includePatterns;
+            includePatterns = null;
+            final List<String> excl = excludePatterns;
+            excludePatterns = null;
+            return new NativeImageResourcePatternsBuildItem(Collections.unmodifiableList(incl),
+                    Collections.unmodifiableList(excl));
+        }
+
+        /**
+         * Add a glob pattern for matching resource paths that should <strong>not</strong> be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash. See
+         * {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+         *
+         * @param glob the glob pattern to add to the list of patterns to exclude
+         * @return this {@link Builder}
+         */
+        public Builder excludeGlob(String glob) {
+            excludePatterns.add(GlobUtil.toRegexPattern(glob));
+            return this;
+        }
+
+        /**
+         * Add a collection of glob patterns for matching resource paths that should <strong>not</strong> be added to the
+         * native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash. See
+         * {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+         *
+         * @param globs the glob patterns to add to the list of patterns to exclude
+         * @return this {@link Builder}
+         */
+        public Builder excludeGlobs(Collection<String> globs) {
+            globs.stream().map(GlobUtil::toRegexPattern).forEach(excludePatterns::add);
+            return this;
+        }
+
+        /**
+         * Add an array of glob patterns for matching resource paths that should <strong>not</strong> be added to the
+         * native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash. See
+         * {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+         *
+         * @param globs the glob patterns to add to the list of patterns to exclude
+         * @return this {@link Builder}
+         */
+        public Builder excludeGlobs(String... globs) {
+            Stream.of(globs).map(GlobUtil::toRegexPattern).forEach(excludePatterns::add);
+            return this;
+        }
+
+        /**
+         * Add a regular expression for matching resource paths that should <strong>not</strong> be added to the native
+         * image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. The pattern must not start with slash.
+         *
+         * @param pattern the regular expression to add to the list of patterns to exclude
+         * @return this {@link Builder}
+         */
+        public Builder excludePattern(String pattern) {
+            excludePatterns.add(pattern);
+            return this;
+        }
+
+        /**
+         * Add a collection of regular expressions for matching resource paths that should <strong>not</strong> be added
+         * to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. The pattern must not start with slash.
+         *
+         * @param patterns the regular expressions to add to the list of patterns to exclude
+         * @return this {@link Builder}
+         */
+        public Builder excludePatterns(Collection<String> patterns) {
+            excludePatterns.addAll(patterns);
+            return this;
+        }
+
+        /**
+         * Add an array of regular expressions for matching resource paths that should <strong>not</strong> be added
+         * to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. The pattern must not start with slash.
+         *
+         * @param patterns the regular expressions to add to the list of patterns to exclude
+         * @return this {@link Builder}
+         */
+        public Builder excludePatterns(String... patterns) {
+            Stream.of(patterns).forEach(excludePatterns::add);
+            return this;
+        }
+
+        /**
+         * Add a glob pattern for matching resource paths that should be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash. See
+         * {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+         *
+         * @param glob the glob pattern to add
+         * @return this {@link Builder}
+         */
+        public Builder includeGlob(String glob) {
+            includePatterns.add(GlobUtil.toRegexPattern(glob));
+            return this;
+        }
+
+        /**
+         * Add a collection of glob patterns for matching resource paths that should be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash. See
+         * {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+         *
+         * @param globs the glob patterns to add
+         * @return this {@link Builder}
+         */
+        public Builder includeGlobs(Collection<String> globs) {
+            globs.stream().map(GlobUtil::toRegexPattern).forEach(includePatterns::add);
+            return this;
+        }
+
+        /**
+         * Add an array of glob patterns for matching resource paths that should be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash. See
+         * {@link NativeConfig.ResourcesConfig#includes} for the supported glob syntax.
+         *
+         * @param globs the glob patterns to add
+         * @return this {@link Builder}
+         */
+        public Builder includeGlobs(String... patterns) {
+            Stream.of(patterns).map(GlobUtil::toRegexPattern).forEach(includePatterns::add);
+            return this;
+        }
+
+        /**
+         * Add a regular expression for matching resource paths that should be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. The pattern must not start with slash.
+         *
+         * @param pattern the regular expression to add
+         * @return this {@link Builder}
+         */
+        public Builder includePattern(String pattern) {
+            includePatterns.add(pattern);
+            return this;
+        }
+
+        /**
+         * Add a collection of regular expressions for matching resource paths that should be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. The patterns must not start with slash.
+         *
+         * @param patterns the regular expressions to add
+         * @return this {@link Builder}
+         */
+        public Builder includePatterns(Collection<String> patterns) {
+            includePatterns.addAll(patterns);
+            return this;
+        }
+
+        /**
+         * Add an array of regular expressions for matching resource paths that should be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. The patterns must not start with slash.
+         *
+         * @param patterns the regular expressions to add
+         * @return this {@link Builder}
+         */
+        public Builder includePatterns(String... patterns) {
+            Stream.of(patterns).forEach(includePatterns::add);
+            return this;
+        }
+
+    }
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java
index 3fd15dfa0be17..fa5740182743a 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java
@@ -7,7 +7,9 @@
 import java.util.function.Predicate;
 
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 
 import io.quarkus.builder.item.MultiBuildItem;
@@ -31,43 +33,87 @@
  */
 public final class ReflectiveHierarchyBuildItem extends MultiBuildItem {
 
+    private static final String UNKNOWN_SOURCE = "<unknown>";
+
     private final Type type;
     private final IndexView index;
-    private final Predicate<DotName> ignorePredicate;
+    private final Predicate<DotName> ignoreTypePredicate;
+    private final Predicate<FieldInfo> ignoreFieldPredicate;
+    private final Predicate<MethodInfo> ignoreMethodPredicate;
     private final String source;
 
+    /**
+     * @deprecated Use the Builder instead.
+     */
+    @Deprecated
     public ReflectiveHierarchyBuildItem(Type type) {
-        this(type, DefaultIgnorePredicate.INSTANCE);
+        this(type, DefaultIgnoreTypePredicate.INSTANCE);
     }
 
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
     public ReflectiveHierarchyBuildItem(Type type, IndexView index) {
-        this(type, index, DefaultIgnorePredicate.INSTANCE);
+        this(type, index, DefaultIgnoreTypePredicate.INSTANCE);
     }
 
-    public ReflectiveHierarchyBuildItem(Type type, Predicate<DotName> ignorePredicate) {
-        this(type, ignorePredicate, null);
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
+    public ReflectiveHierarchyBuildItem(Type type, Predicate<DotName> ignoreTypePredicate) {
+        this(type, ignoreTypePredicate, UNKNOWN_SOURCE);
     }
 
-    public ReflectiveHierarchyBuildItem(Type type, IndexView index, Predicate<DotName> ignorePredicate) {
-        this(type, index, ignorePredicate, null);
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
+    public ReflectiveHierarchyBuildItem(Type type, IndexView index, Predicate<DotName> ignoreTypePredicate) {
+        this(type, index, ignoreTypePredicate, UNKNOWN_SOURCE);
     }
 
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
     public ReflectiveHierarchyBuildItem(Type type, String source) {
-        this(type, DefaultIgnorePredicate.INSTANCE, source);
+        this(type, DefaultIgnoreTypePredicate.INSTANCE, source);
     }
 
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
     public ReflectiveHierarchyBuildItem(Type type, IndexView index, String source) {
-        this(type, index, DefaultIgnorePredicate.INSTANCE, source);
+        this(type, index, DefaultIgnoreTypePredicate.INSTANCE, source);
+    }
+
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
+    public ReflectiveHierarchyBuildItem(Type type, Predicate<DotName> ignoreTypePredicate, String source) {
+        this(type, null, ignoreTypePredicate, source);
     }
 
-    public ReflectiveHierarchyBuildItem(Type type, Predicate<DotName> ignorePredicate, String source) {
-        this(type, null, ignorePredicate, source);
+    /**
+     * @deprecated Use the Builder instead and provide a source for easy debugging.
+     */
+    @Deprecated
+    public ReflectiveHierarchyBuildItem(Type type, IndexView index, Predicate<DotName> ignoreTypePredicate, String source) {
+        this(type, index, ignoreTypePredicate, DefaultIgnoreFieldPredicate.INSTANCE, DefaultIgnoreMethodPredicate.INSTANCE,
+                source);
     }
 
-    public ReflectiveHierarchyBuildItem(Type type, IndexView index, Predicate<DotName> ignorePredicate, String source) {
+    private ReflectiveHierarchyBuildItem(Type type, IndexView index, Predicate<DotName> ignoreTypePredicate,
+            Predicate<FieldInfo> ignoreFieldPredicate, Predicate<MethodInfo> ignoreMethodPredicate, String source) {
         this.type = type;
         this.index = index;
-        this.ignorePredicate = ignorePredicate;
+        this.ignoreTypePredicate = ignoreTypePredicate;
+        this.ignoreFieldPredicate = ignoreFieldPredicate;
+        this.ignoreMethodPredicate = ignoreMethodPredicate;
         this.source = source;
     }
 
@@ -79,8 +125,16 @@ public IndexView getIndex() {
         return index;
     }
 
-    public Predicate<DotName> getIgnorePredicate() {
-        return ignorePredicate;
+    public Predicate<DotName> getIgnoreTypePredicate() {
+        return ignoreTypePredicate;
+    }
+
+    public Predicate<FieldInfo> getIgnoreFieldPredicate() {
+        return ignoreFieldPredicate;
+    }
+
+    public Predicate<MethodInfo> getIgnoreMethodPredicate() {
+        return ignoreMethodPredicate;
     }
 
     public boolean hasSource() {
@@ -91,12 +145,58 @@ public String getSource() {
         return source;
     }
 
-    public static class DefaultIgnorePredicate implements Predicate<DotName> {
+    public static class Builder {
+
+        private Type type;
+        private IndexView index;
+        private Predicate<DotName> ignoreTypePredicate = DefaultIgnoreTypePredicate.INSTANCE;
+        private Predicate<FieldInfo> ignoreFieldPredicate = DefaultIgnoreFieldPredicate.INSTANCE;
+        private Predicate<MethodInfo> ignoreMethodPredicate = DefaultIgnoreMethodPredicate.INSTANCE;
+        private String source = UNKNOWN_SOURCE;
+
+        public Builder type(Type type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder index(IndexView index) {
+            this.index = index;
+            return this;
+        }
+
+        public Builder ignoreTypePredicate(Predicate<DotName> ignoreTypePredicate) {
+            this.ignoreTypePredicate = ignoreTypePredicate;
+            return this;
+        }
+
+        public Builder ignoreFieldPredicate(Predicate<FieldInfo> ignoreFieldPredicate) {
+            this.ignoreFieldPredicate = ignoreFieldPredicate;
+            return this;
+        }
+
+        public Builder ignoreMethodPredicate(Predicate<MethodInfo> ignoreMethodPredicate) {
+            this.ignoreMethodPredicate = ignoreMethodPredicate;
+            return this;
+        }
+
+        public Builder source(String source) {
+            this.source = source;
+            return this;
+        }
+
+        public ReflectiveHierarchyBuildItem build() {
+            return new ReflectiveHierarchyBuildItem(type, index, ignoreTypePredicate, ignoreFieldPredicate,
+                    ignoreMethodPredicate, source);
+        }
+    }
+
+    public static class DefaultIgnoreTypePredicate implements Predicate<DotName> {
 
-        public static final DefaultIgnorePredicate INSTANCE = new DefaultIgnorePredicate();
+        public static final DefaultIgnoreTypePredicate INSTANCE = new DefaultIgnoreTypePredicate();
 
         private static final List<String> DEFAULT_IGNORED_PACKAGES = Arrays.asList("java.", "io.reactivex.",
-                "org.reactivestreams.", "org.slf4j.");
+                "org.reactivestreams.", "org.slf4j.", "javax.json.", "com.fasterxml.jackson.databind.",
+                "io.vertx.core.json.");
         // if this gets more complicated we will need to move to some tree like structure
         static final Set<String> WHITELISTED_FROM_IGNORED_PACKAGES = new HashSet<>(
                 Arrays.asList("java.math.BigDecimal", "java.math.BigInteger"));
@@ -126,7 +226,27 @@ public static class IgnoreWhiteListedPredicate implements Predicate<DotName> {
 
         @Override
         public boolean test(DotName dotName) {
-            return DefaultIgnorePredicate.WHITELISTED_FROM_IGNORED_PACKAGES.contains(dotName.toString());
+            return DefaultIgnoreTypePredicate.WHITELISTED_FROM_IGNORED_PACKAGES.contains(dotName.toString());
+        }
+    }
+
+    public static class DefaultIgnoreFieldPredicate implements Predicate<FieldInfo> {
+
+        public static DefaultIgnoreFieldPredicate INSTANCE = new DefaultIgnoreFieldPredicate();
+
+        @Override
+        public boolean test(FieldInfo fieldInfo) {
+            return false;
+        }
+    }
+
+    public static class DefaultIgnoreMethodPredicate implements Predicate<MethodInfo> {
+
+        public static DefaultIgnoreMethodPredicate INSTANCE = new DefaultIgnoreMethodPredicate();
+
+        @Override
+        public boolean test(MethodInfo methodInfo) {
+            return false;
         }
     }
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedClassBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedClassBuildItem.java
index 61ba6bfeb7f70..484dec11f422c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedClassBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedClassBuildItem.java
@@ -2,6 +2,9 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 
+/**
+ * A class that will be initialized at runtime in native mode.
+ */
 public final class RuntimeInitializedClassBuildItem extends MultiBuildItem {
 
     private final String className;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedPackageBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedPackageBuildItem.java
new file mode 100644
index 0000000000000..25e9ccdcf7fb6
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeInitializedPackageBuildItem.java
@@ -0,0 +1,24 @@
+package io.quarkus.deployment.builditem.nativeimage;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A package that will be initialized at runtime in native mode.
+ * <p>
+ * WARNING: this build item should not be used in Quarkus itself and is only provided
+ * to simplify the early stages of external extensions development.
+ * <p>
+ * For Quarkus development, please take the time to surgically mark individual classes as runtime initialized.
+ */
+public final class RuntimeInitializedPackageBuildItem extends MultiBuildItem {
+
+    private final String packageName;
+
+    public RuntimeInitializedPackageBuildItem(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ServiceProviderBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ServiceProviderBuildItem.java
index ae16002b04d96..47737daf0c42c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ServiceProviderBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ServiceProviderBuildItem.java
@@ -6,18 +6,20 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
 import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.deployment.util.ServiceUtil;
 
 /**
  * Represents a Service Provider registration.
- * When processed, it embeds the service interface descriptor (META-INF/services/...) and allow reflection (instantiation only)
- * on a set of provider
- * classes.
+ * When processed, it embeds the service interface descriptor (META-INF/services/...) in the native image
+ * and registers the classes returned by {@link #providers()} for reflection (instantiation only).
  */
 public final class ServiceProviderBuildItem extends MultiBuildItem {
 
@@ -57,7 +59,36 @@ public static ServiceProviderBuildItem allProviders(final String serviceInterfac
                 classNames.add(line);
             }
         }
-        return new ServiceProviderBuildItem(serviceInterfaceClassName, new ArrayList<>(classNames));
+        return new ServiceProviderBuildItem(serviceInterfaceClassName,
+                Collections.unmodifiableList(new ArrayList<>(classNames)), false);
+    }
+
+    /**
+     * Creates and returns a new {@link ServiceProviderBuildItem} for the given {@code serviceInterfaceClassName} by
+     * including all the providers that are listed in service interface descriptor files
+     * {@code "META-INF/services/" + serviceInterfaceClassName} findable in the Context Class Loader of the current
+     * thread.
+     *
+     * @param serviceInterfaceClassName the interface whose service interface descriptor file we want to embed
+     * @return a new {@link ServiceProviderBuildItem}
+     * @throws RuntimeException wrapping any {@link IOException}s thrown when accessing class path resources
+     */
+    public static ServiceProviderBuildItem allProvidersFromClassPath(final String serviceInterfaceClassName) {
+        if (serviceInterfaceClassName == null || serviceInterfaceClassName.trim().isEmpty()) {
+            throw new IllegalArgumentException("service interface name cannot be null or blank");
+        }
+        final String resourcePath = SPI_ROOT + serviceInterfaceClassName;
+        try {
+            Set<String> implementations = ServiceUtil.classNamesNamedIn(
+                    Thread.currentThread().getContextClassLoader(),
+                    resourcePath);
+            return new ServiceProviderBuildItem(
+                    serviceInterfaceClassName,
+                    Collections.unmodifiableList(new ArrayList<>(implementations)),
+                    false);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not read class path resources having path '" + resourcePath + "'", e);
+        }
     }
 
     /**
@@ -69,7 +100,19 @@ public static ServiceProviderBuildItem allProviders(final String serviceInterfac
      * @param providerClassNames the list of provider class names that must already be mentioned in the file
      */
     public ServiceProviderBuildItem(String serviceInterfaceClassName, String... providerClassNames) {
-        this(serviceInterfaceClassName, Arrays.asList(providerClassNames));
+        this(serviceInterfaceClassName, Collections.unmodifiableList(Arrays.asList(providerClassNames)), false);
+    }
+
+    /**
+     * Registers the specified service interface descriptor to be embedded and allow reflection (instantiation only)
+     * of the specified provider classes. Note that the service interface descriptor file has to exist and match the
+     * list of specified provider class names.
+     *
+     * @param serviceInterfaceClassName the interface whose service interface descriptor file we want to embed
+     * @param providers a collection of provider class names that must already be mentioned in the file
+     */
+    public ServiceProviderBuildItem(String serviceInterfaceClassName, Collection<String> providers) {
+        this(serviceInterfaceClassName, Collections.unmodifiableList(new ArrayList<>(providers)), false);
     }
 
     /**
@@ -81,6 +124,18 @@ public ServiceProviderBuildItem(String serviceInterfaceClassName, String... prov
      * @param providers the list of provider class names that must already be mentioned in the file
      */
     public ServiceProviderBuildItem(String serviceInterfaceClassName, List<String> providers) {
+        this(serviceInterfaceClassName, Collections.unmodifiableList(new ArrayList<>(providers)), false);
+    }
+
+    /**
+     * An internal overload that must be called with an immutable {@link List} of {@code providers}
+     *
+     * @param serviceInterfaceClassName the interface whose service interface descriptor file we want to embed
+     * @param providers the list of provider class names that must already be mentioned in the file
+     * @param marker just a way to differentiate this constructor from {@link #ServiceProviderBuildItem(String, List)};
+     *        the value is ignored
+     */
+    private ServiceProviderBuildItem(String serviceInterfaceClassName, List<String> providers, boolean marker) {
         this.serviceInterface = Objects.requireNonNull(serviceInterfaceClassName, "The service interface must not be `null`");
         this.providers = providers;
 
@@ -96,10 +151,16 @@ public ServiceProviderBuildItem(String serviceInterfaceClassName, List<String> p
         });
     }
 
+    /**
+     * @return a immutable {@link List} of provider class names
+     */
     public List<String> providers() {
         return providers;
     }
 
+    /**
+     * @return the resource path for the service descriptor file
+     */
     public String serviceDescriptorFile() {
         return SPI_ROOT + serviceInterface;
     }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/codegen/CodeGenData.java b/core/deployment/src/main/java/io/quarkus/deployment/codegen/CodeGenData.java
index 1da291b8d2454..32f19b984e52d 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/codegen/CodeGenData.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/codegen/CodeGenData.java
@@ -9,11 +9,21 @@ public class CodeGenData {
     public final Path outPath;
     public final Path sourceDir;
     public final Path buildDir;
+    public boolean redirectIO;
 
     public CodeGenData(CodeGenProvider provider, Path outPath, Path sourceDir, Path buildDir) {
+        this(provider, outPath, sourceDir, buildDir, true);
+    }
+
+    public CodeGenData(CodeGenProvider provider, Path outPath, Path sourceDir, Path buildDir, boolean redirectIO) {
         this.provider = provider;
         this.outPath = outPath;
         this.sourceDir = sourceDir;
-        this.buildDir = buildDir;
+        this.buildDir = buildDir.normalize();
+        this.redirectIO = redirectIO;
+    }
+
+    public void setRedirectIO(boolean redirectIO) {
+        this.redirectIO = redirectIO;
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
index 6f86ea9b02e55..48572a88c31c7 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -24,6 +24,7 @@
 import java.util.TreeMap;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.Converter;
 import org.jboss.logging.Logger;
 import org.wildfly.common.Assert;
@@ -133,6 +134,11 @@ public BuildTimeConfigurationReader(final List<Class<?>> configRoots) {
     private static void processClass(ClassDefinition.Builder builder, Class<?> clazz,
             final Map<Class<?>, GroupDefinition> groups) {
         builder.setConfigurationClass(clazz);
+        processClassFields(builder, clazz, groups);
+    }
+
+    private static void processClassFields(final ClassDefinition.Builder builder, final Class<?> clazz,
+            final Map<Class<?>, GroupDefinition> groups) {
         for (Field field : clazz.getDeclaredFields()) {
             int mods = field.getModifiers();
             if (Modifier.isStatic(mods)) {
@@ -149,6 +155,10 @@ private static void processClass(ClassDefinition.Builder builder, Class<?> clazz
             }
             builder.addMember(processValue(field, field.getGenericType(), groups));
         }
+        Class<?> superclass = clazz.getSuperclass();
+        if (superclass != null) {
+            processClassFields(builder, superclass, groups);
+        }
     }
 
     private static ClassDefinition.ClassMember.Specification processValue(Field field, Type valueType,
@@ -286,7 +296,11 @@ ReadResult run() {
                 nameBuilder.setLength(len);
             }
             // sweep-up
-            for (String propertyName : config.getPropertyNames()) {
+            for (String propertyName : getAllProperties()) {
+                if (propertyName.equals(ConfigSource.CONFIG_ORDINAL)) {
+                    continue;
+                }
+
                 NameIterator ni = new NameIterator(propertyName);
                 if (ni.hasNext() && ni.nextSegmentEquals("quarkus")) {
                     ni.next();
@@ -704,6 +718,19 @@ private Converter<?> getConverter(SmallRyeConfig config, Field field, ConverterT
             convByType.put(valueType, converter);
             return converter;
         }
+
+        /**
+         * We collect all properties from ConfigSources, because Config#getPropertyNames exclude the active profiled
+         * properties, meaning that the property is written in the default config source unprofiled. This may cause
+         * issues if we run with a different profile and fallback to defaults.
+         */
+        private Set<String> getAllProperties() {
+            Set<String> properties = new HashSet<>();
+            for (ConfigSource configSource : config.getConfigSources()) {
+                properties.addAll(configSource.getPropertyNames());
+            }
+            return properties;
+        }
     }
 
     public static final class ReadResult {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ClassLoadingConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ClassLoadingConfig.java
new file mode 100644
index 0000000000000..e2fc6200f68d1
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ClassLoadingConfig.java
@@ -0,0 +1,48 @@
+package io.quarkus.deployment.configuration;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * WARNING: This is not normal quarkus config, this is only read from application.properties.
+ * <p>
+ * This is because it is needed before any of the config infrastructure is setup.
+ */
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+public class ClassLoadingConfig {
+
+    /**
+     * Artifacts that are loaded in a parent first manner. This can be used to work around issues where a given
+     * class needs to be loaded by the system ClassLoader. Note that if you
+     * make a library parent first all its dependencies should generally also be parent first.
+     * <p>
+     * Artifacts should be configured as a comma separated list of artifact ids, with the group, artifact-id and optional
+     * classifier separated by a colon.
+     * <p>
+     * WARNING: This config property can only be set in application.properties
+     */
+    @ConfigItem(defaultValue = "")
+    public Optional<String> parentFirstArtifacts;
+
+    /**
+     * Artifacts that are loaded in the runtime ClassLoader in dev mode, so they will be dropped
+     * and recreated on change.
+     * <p>
+     * This is an advanced option, it should only be used if you have a problem with
+     * libraries holding stale state between reloads. Note that if you use this any library that depends on the listed libraries
+     * will also need to be reloadable.
+     * <p>
+     * This setting has no impact on production builds.
+     * <p>
+     * Artifacts should be configured as a comma separated list of artifact ids, with the group, artifact-id and optional
+     * classifier separated by a colon.
+     * <p>
+     * WARNING: This config property can only be set in application.properties
+     */
+    @ConfigItem(defaultValue = "")
+    public Optional<String> reloadableArtifacts;
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java
index 078137859c1d2..9136c61a379c7 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java
@@ -453,11 +453,19 @@ public void run() {
             final ConfigPatternMap<Container> runTimeIgnored = ConfigPatternMap
                     .merge(ConfigPatternMap.merge(buildTimePatternMap,
                             buildTimeRunTimePatternMap, combinator), bootstrapPatternMap, combinator);
+            final ConfigPatternMap<Container> bootstrapIgnored = ConfigPatternMap
+                    .merge(ConfigPatternMap.merge(buildTimePatternMap,
+                            buildTimeRunTimePatternMap, combinator), runTimePatternMap, combinator);
 
             final MethodDescriptor siParserBody = generateParserBody(buildTimeRunTimePatternMap, buildTimeRunTimeIgnored,
-                    new StringBuilder("siParseKey"), false, false);
+                    new StringBuilder("siParseKey"), false, Type.BUILD_TIME);
             final MethodDescriptor rtParserBody = generateParserBody(runTimePatternMap, runTimeIgnored,
-                    new StringBuilder("rtParseKey"), false, true);
+                    new StringBuilder("rtParseKey"), false, Type.RUNTIME);
+            MethodDescriptor bsParserBody = null;
+            if (bootstrapConfigSetupNeeded()) {
+                bsParserBody = generateParserBody(bootstrapPatternMap, bootstrapIgnored,
+                        new StringBuilder("bsParseKey"), false, Type.BOOTSTRAP);
+            }
 
             // create the bootstrap config if necessary
             ResultHandle bootstrapBuilder = null;
@@ -716,6 +724,11 @@ public void run() {
             // generate sweep for run time
             configSweepLoop(rtParserBody, readConfig, runTimeConfig);
 
+            if (bootstrapConfigSetupNeeded()) {
+                // generate sweep for bootstrap config
+                configSweepLoop(bsParserBody, readBootstrapConfig, bootstrapConfig);
+            }
+
             // generate ensure-initialized method
             // the point of this method is simply to initialize the Config class
             // thus initializing the config infrastructure before anything requests it
@@ -743,7 +756,7 @@ public void run() {
             // throw the proper exception
             final ResultHandle finalErrorMessageBuilder = isError.newInstance(SB_NEW);
             isError.invokeVirtualMethod(SB_APPEND_STRING, finalErrorMessageBuilder, isError
-                    .load("One or more configuration errors has prevented the application from starting. The errors are:\n"));
+                    .load("One or more configuration errors have prevented the application from starting. The errors are:\n"));
             isError.invokeVirtualMethod(SB_APPEND_STRING, finalErrorMessageBuilder, niceErrorMessage);
             final ResultHandle finalErrorMessage = isError.invokeVirtualMethod(OBJ_TO_STRING, finalErrorMessageBuilder);
             final ResultHandle configurationException = isError
@@ -1073,7 +1086,7 @@ private void generateEmptyParsers(ClassCreator cc) {
 
         private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> keyMap,
                 final ConfigPatternMap<?> ignoredMap, final StringBuilder methodName, final boolean dynamic,
-                final boolean isRunTime) {
+                final Type type) {
             final Container matched = keyMap == null ? null : keyMap.getMatched();
             final Object ignoreMatched = ignoredMap == null ? null : ignoredMap.getMatched();
 
@@ -1096,7 +1109,7 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                         }
                     }
                     if (!needsCode) {
-                        return isRunTime ? RT_EMPTY_PARSER : EMPTY_PARSER;
+                        return (type == Type.BUILD_TIME) ? EMPTY_PARSER : RT_EMPTY_PARSER;
                     }
                 }
             }
@@ -1123,7 +1136,7 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                                     matchedBody.invokeVirtualMethod(NI_PREVIOUS, keyIter);
                                 }
                                 // we have to get or create all containing (and contained) groups of this member
-                                matchedBody.invokeStaticMethod(generateGetEnclosing(fieldContainer, isRunTime), keyIter,
+                                matchedBody.invokeStaticMethod(generateGetEnclosing(fieldContainer, type), keyIter,
                                         config);
                             }
                             // else ignore (already populated eagerly)
@@ -1134,7 +1147,7 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                             final ResultHandle lastSeg = matchedBody.invokeVirtualMethod(NI_GET_PREVIOUS_SEGMENT, keyIter);
                             matchedBody.invokeVirtualMethod(NI_PREVIOUS, keyIter);
                             final ResultHandle mapHandle = matchedBody
-                                    .invokeStaticMethod(generateGetEnclosing(mapContainer, isRunTime), keyIter, config);
+                                    .invokeStaticMethod(generateGetEnclosing(mapContainer, type), keyIter, config);
                             // populate the map
                             final Field field = mapContainer.findField();
                             final FieldDescriptor fd = getOrCreateConverterInstance(field);
@@ -1145,7 +1158,7 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                         }
                     } else if (ignoreMatched == null) {
                         // name is unknown
-                        matchedBody.invokeStaticMethod(isRunTime ? CD_UNKNOWN_RT : CD_UNKNOWN, keyIter);
+                        matchedBody.invokeStaticMethod(type == Type.BUILD_TIME ? CD_UNKNOWN : CD_UNKNOWN_RT, keyIter);
                     }
                     // return;
                     matchedBody.returnValue(null);
@@ -1172,7 +1185,7 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                                 nameMatched.invokeStaticMethod(
                                         generateParserBody(keyMap.getChild(name),
                                                 ignoredMap == null ? null : ignoredMap.getChild(name), methodName, dynamic,
-                                                isRunTime),
+                                                type),
                                         config, keyIter);
                                 methodName.setLength(length);
                                 // return;
@@ -1205,7 +1218,7 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                                 final int length = methodName.length();
                                 methodName.append(':').append(name);
                                 nameMatched.invokeStaticMethod(
-                                        generateParserBody(null, ignoredMap.getChild(name), methodName, false, isRunTime),
+                                        generateParserBody(null, ignoredMap.getChild(name), methodName, false, type),
                                         config, keyIter);
                                 methodName.setLength(length);
                                 // return;
@@ -1229,27 +1242,27 @@ private MethodDescriptor generateParserBody(final ConfigPatternMap<Container> ke
                                 generateParserBody(keyMap == null ? null : keyMap.getChild(ConfigPatternMap.WILD_CARD),
                                         ignoredMap == null ? null : ignoredMap.getChild(ConfigPatternMap.WILD_CARD),
                                         methodName,
-                                        true, isRunTime),
+                                        true, type),
                                 config, keyIter);
                         methodName.setLength(length);
                         // return;
                         matchedBody.returnValue(null);
                     }
                 }
-                body.invokeStaticMethod(isRunTime ? CD_UNKNOWN_RT : CD_UNKNOWN, keyIter);
+                body.invokeStaticMethod(type == Type.BUILD_TIME ? CD_UNKNOWN : CD_UNKNOWN_RT, keyIter);
                 body.returnValue(null);
                 return body.getMethodDescriptor();
             }
         }
 
-        private MethodDescriptor generateGetEnclosing(final FieldContainer matchNode, final boolean isRunTime) {
+        private MethodDescriptor generateGetEnclosing(final FieldContainer matchNode, final Type type) {
             // name iterator cursor is placed BEFORE the field name on entry
             MethodDescriptor md = enclosingMemberMethods.get(matchNode);
             if (md != null) {
                 return md;
             }
             md = MethodDescriptor.ofMethod(CONFIG_CLASS_NAME,
-                    (isRunTime ? "rt" : "si") + "GetEnclosing:" + matchNode.getCombinedName(), Object.class,
+                    type.methodPrefix + "GetEnclosing:" + matchNode.getCombinedName(), Object.class,
                     NameIterator.class, SmallRyeConfig.class);
             try (MethodCreator mc = cc.getMethodCreator(md)) {
                 mc.setModifiers(Opcodes.ACC_STATIC);
@@ -1271,7 +1284,7 @@ private MethodDescriptor generateGetEnclosing(final FieldContainer matchNode, fi
                         // consume segment
                         mc.invokeVirtualMethod(NI_PREVIOUS, keyIter);
                     }
-                    final ResultHandle enclosing = mc.invokeStaticMethod(generateGetEnclosing(fieldContainer, isRunTime),
+                    final ResultHandle enclosing = mc.invokeStaticMethod(generateGetEnclosing(fieldContainer, type),
                             keyIter, config);
 
                     final ResultHandle fieldVal;
@@ -1330,7 +1343,7 @@ private MethodDescriptor generateGetEnclosing(final FieldContainer matchNode, fi
                     final ResultHandle key = mc.invokeVirtualMethod(NI_GET_PREVIOUS_SEGMENT, keyIter);
                     // consume segment
                     mc.invokeVirtualMethod(NI_PREVIOUS, keyIter);
-                    final ResultHandle map = mc.invokeStaticMethod(generateGetEnclosing(mapContainer, isRunTime), keyIter,
+                    final ResultHandle map = mc.invokeStaticMethod(generateGetEnclosing(mapContainer, type), keyIter,
                             config);
                     // restore
                     mc.invokeVirtualMethod(NI_NEXT, keyIter);
@@ -1359,14 +1372,14 @@ private MethodDescriptor generateGetEnclosing(final FieldContainer matchNode, fi
             return md;
         }
 
-        private MethodDescriptor generateGetEnclosing(final MapContainer matchNode, final boolean isRunTime) {
+        private MethodDescriptor generateGetEnclosing(final MapContainer matchNode, final Type type) {
             // name iterator cursor is placed BEFORE the map key on entry
             MethodDescriptor md = enclosingMemberMethods.get(matchNode);
             if (md != null) {
                 return md;
             }
             md = MethodDescriptor.ofMethod(CONFIG_CLASS_NAME,
-                    (isRunTime ? "rt" : "si") + "GetEnclosing:" + matchNode.getCombinedName(), Object.class,
+                    type.methodPrefix + "GetEnclosing:" + matchNode.getCombinedName(), Object.class,
                     NameIterator.class, SmallRyeConfig.class);
             try (MethodCreator mc = cc.getMethodCreator(md)) {
                 mc.setModifiers(Opcodes.ACC_STATIC);
@@ -1380,7 +1393,7 @@ private MethodDescriptor generateGetEnclosing(final MapContainer matchNode, fina
                         // consume segment
                         mc.invokeVirtualMethod(NI_PREVIOUS, keyIter);
                     }
-                    final ResultHandle enclosing = mc.invokeStaticMethod(generateGetEnclosing(fieldContainer, isRunTime),
+                    final ResultHandle enclosing = mc.invokeStaticMethod(generateGetEnclosing(fieldContainer, type),
                             keyIter, config);
                     if (!fieldContainer.getClassMember().getPropertyName().isEmpty()) {
                         // restore
@@ -1403,7 +1416,7 @@ private MethodDescriptor generateGetEnclosing(final MapContainer matchNode, fina
                     final ResultHandle key = mc.invokeVirtualMethod(NI_GET_PREVIOUS_SEGMENT, keyIter);
                     // consume enclosing map key
                     mc.invokeVirtualMethod(NI_PREVIOUS, keyIter);
-                    final ResultHandle map = mc.invokeStaticMethod(generateGetEnclosing(mapContainer, isRunTime), keyIter,
+                    final ResultHandle map = mc.invokeStaticMethod(generateGetEnclosing(mapContainer, type), keyIter,
                             config);
                     // restore
                     mc.invokeVirtualMethod(NI_NEXT, keyIter);
@@ -1630,4 +1643,16 @@ private static boolean isFieldEligibleForDirectAccess(ClassDefinition.ClassMembe
                 && Modifier.isPublic(classMember.getEnclosingDefinition().getConfigurationClass().getModifiers())
                 && Modifier.isPublic(classMember.getField().getType().getModifiers());
     }
+
+    private enum Type {
+        BUILD_TIME("si"),
+        BOOTSTRAP("bs"),
+        RUNTIME("rt");
+
+        final String methodPrefix;
+
+        Type(String methodPrefix) {
+            this.methodPrefix = methodPrefix;
+        }
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/TestConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/TestConfig.java
new file mode 100644
index 0000000000000..de0fee867fb46
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/TestConfig.java
@@ -0,0 +1,21 @@
+package io.quarkus.deployment.configuration;
+
+import java.time.Duration;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot
+public class TestConfig {
+
+    /**
+     * Configures the hang detection in @QuarkusTest. If no activity happens (i.e. no test callbacks are called) over
+     * this period then QuarkusTest will dump all threads stack traces, to help diagnose a potential hang.
+     *
+     * Note that the initial timeout (before Quarkus has started) will only apply if provided by a system property, as
+     * it is not possible to read all config sources until Quarkus has booted.
+     */
+    @ConfigItem(defaultValue = "10m")
+    Duration hangDetectionTimeout;
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/ClassDefinition.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/ClassDefinition.java
index 3049c764e71a4..33d1713e78f6a 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/ClassDefinition.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/ClassDefinition.java
@@ -90,7 +90,7 @@ static abstract class LeafMember extends ClassMember {
             this.field = Assert.checkNotNullParam("field", field);
             final Class<?> declaringClass = field.getDeclaringClass();
             final Class<?> configurationClass = classDefinition.configurationClass;
-            if (declaringClass != configurationClass) {
+            if (!declaringClass.isAssignableFrom(configurationClass)) {
                 throw new IllegalArgumentException(
                         "Member declaring " + declaringClass + " does not match configuration " + configurationClass);
             }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/RootDefinition.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/RootDefinition.java
index 8d39d9c48558b..f8b8f9956488f 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/RootDefinition.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/definition/RootDefinition.java
@@ -73,7 +73,7 @@ public final class RootDefinition extends ClassDefinition {
             rootName = String.join("-", (Iterable<String>) () -> lowerCase(trimmedSegments.iterator()));
         }
         this.rootName = rootName;
-        this.descriptor = FieldDescriptor.of(CONFIG_CLASS_NAME, String.join("", segments), Object.class);
+        this.descriptor = FieldDescriptor.of(CONFIG_CLASS_NAME, String.join("", segments), configClass);
     }
 
     public ConfigPhase getConfigPhase() {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/AlwaysFalsePredicate.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/AlwaysFalsePredicate.java
new file mode 100644
index 0000000000000..387b48a7764c2
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/AlwaysFalsePredicate.java
@@ -0,0 +1,11 @@
+package io.quarkus.deployment.dev;
+
+import java.util.function.Predicate;
+
+public class AlwaysFalsePredicate<T> implements Predicate<T> {
+
+    @Override
+    public boolean test(Object o) {
+        return false;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java
new file mode 100644
index 0000000000000..afb543f8dc541
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java
@@ -0,0 +1,172 @@
+package io.quarkus.deployment.dev;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+public class ClassComparisonUtil {
+    static boolean isSameStructure(ClassInfo clazz, ClassInfo old) {
+        if (clazz.flags() != old.flags()) {
+            return false;
+        }
+        if (!clazz.typeParameters().equals(old.typeParameters())) {
+            return false;
+        }
+        if (!clazz.interfaceNames().equals(old.interfaceNames())) {
+            return false;
+        }
+        if (!compareAnnotations(clazz.classAnnotations(), old.classAnnotations())) {
+            return false;
+        }
+        if (old.fields().size() != clazz.fields().size()) {
+            return false;
+        }
+        Map<String, FieldInfo> oldFields = old.fields().stream()
+                .collect(Collectors.toMap(FieldInfo::name, Function.identity()));
+        for (FieldInfo field : clazz.fields()) {
+            FieldInfo of = oldFields.get(field.name());
+            if (of == null) {
+                return false;
+            }
+            if (of.flags() != field.flags()) {
+                return false;
+            }
+            if (!of.type().equals(field.type())) {
+                return false;
+            }
+            if (!compareAnnotations(of.annotations(), field.annotations())) {
+                return false;
+            }
+        }
+        for (MethodInfo method : clazz.methods()) {
+            MethodInfo om = null;
+            for (MethodInfo i : old.methods()) {
+                if (!i.name().equals(method.name())) {
+                    continue;
+                }
+                if (!i.returnType().equals(method.returnType())) {
+                    continue;
+                }
+                if (i.parameters().size() != method.parameters().size()) {
+                    continue;
+                }
+                if (i.flags() != method.flags()) {
+                    continue;
+                }
+                if (!Objects.equals(i.defaultValue(), method.defaultValue())) {
+                    continue;
+                }
+                boolean paramEqual = true;
+                for (int j = 0; j < method.parameters().size(); ++j) {
+                    Type a = method.parameters().get(j);
+                    Type b = i.parameters().get(j);
+                    if (!a.equals(b)) {
+                        paramEqual = false;
+                        break;
+                    }
+                }
+                if (!paramEqual) {
+                    continue;
+                }
+                if (!compareMethodAnnotations(i.annotations(), method.annotations())) {
+                    continue;
+                }
+                om = i;
+            }
+            //no further checks needed, we fully matched in the loop
+            if (om == null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    static boolean compareAnnotations(Collection<AnnotationInstance> a, Collection<AnnotationInstance> b) {
+        if (a.size() != b.size()) {
+            return false;
+        }
+        Map<DotName, AnnotationInstance> lookup = b.stream()
+                .collect(Collectors.toMap(AnnotationInstance::name, Function.identity()));
+
+        for (AnnotationInstance i1 : a) {
+            AnnotationInstance i2 = lookup.get(i1.name());
+            if (i2 == null) {
+                return false;
+            }
+            if (!compareAnnotation(i1, i2)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    static boolean compareMethodAnnotations(Collection<AnnotationInstance> a, Collection<AnnotationInstance> b) {
+        if (a.size() != b.size()) {
+            return false;
+        }
+        List<AnnotationInstance> method1 = new ArrayList<>();
+        Map<Integer, List<AnnotationInstance>> params1 = new HashMap<>();
+        methodMap(a, method1, params1);
+        List<AnnotationInstance> method2 = new ArrayList<>();
+        Map<Integer, List<AnnotationInstance>> params2 = new HashMap<>();
+        methodMap(b, method2, params2);
+        if (!compareAnnotations(method1, method2)) {
+            return false;
+        }
+        if (!params1.keySet().equals(params2.keySet())) {
+            return false;
+        }
+        for (Map.Entry<Integer, List<AnnotationInstance>> entry : params1.entrySet()) {
+            List<AnnotationInstance> other = params2.get(entry.getKey());
+            if (!compareAnnotations(other, entry.getValue())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static void methodMap(Collection<AnnotationInstance> b, List<AnnotationInstance> method2,
+            Map<Integer, List<AnnotationInstance>> params2) {
+        for (AnnotationInstance i : b) {
+            if (i.target().kind() == AnnotationTarget.Kind.METHOD) {
+                method2.add(i);
+            } else {
+                int index = i.target().asMethodParameter().position();
+                List<AnnotationInstance> instances = params2.get(index);
+                if (instances == null) {
+                    params2.put(index, instances = new ArrayList<>());
+                }
+                instances.add(i);
+            }
+        }
+    }
+
+    private static boolean compareAnnotation(AnnotationInstance a, AnnotationInstance b) {
+        List<AnnotationValue> valuesA = a.values();
+        List<AnnotationValue> valuesB = b.values();
+        if (valuesA.size() != valuesB.size()) {
+            return false;
+        }
+        for (AnnotationValue valueA : valuesA) {
+            AnnotationValue valueB = b.value(valueA.name());
+            if (!valueA.equals(valueB)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassLoaderCompiler.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassLoaderCompiler.java
index 7195bf7c3d8fb..6d0467009f4ea 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassLoaderCompiler.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassLoaderCompiler.java
@@ -146,7 +146,7 @@ public ClassLoaderCompiler(ClassLoader classLoader,
                             new CompilationProvider.Context(
                                     i.getName(),
                                     classPathElements,
-                                    new File(i.getProjectDirectory()),
+                                    i.getProjectDirectory() == null ? null : new File(i.getProjectDirectory()),
                                     new File(sourcePath),
                                     new File(i.getClassesPath()),
                                     context.getSourceEncoding(),
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassScanResult.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassScanResult.java
new file mode 100644
index 0000000000000..efd46c589c567
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassScanResult.java
@@ -0,0 +1,39 @@
+package io.quarkus.deployment.dev;
+
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ClassScanResult {
+    final Set<Path> changedClasses = new HashSet<>();
+    final Set<Path> deletedClasses = new HashSet<>();
+    final Set<Path> addedClasses = new HashSet<>();
+    final Set<String> changedClassNames = new HashSet<>();
+    final Set<String> deletedClassNames = new HashSet<>();
+    final Set<String> addedClassNames = new HashSet<>();
+
+    public boolean isChanged() {
+        return !changedClasses.isEmpty() || !deletedClasses.isEmpty() || !addedClasses.isEmpty();
+    }
+
+    public void addDeletedClass(Path moduleClassesPath, Path classFilePath) {
+        deletedClasses.add(classFilePath);
+        deletedClassNames.add(toName(moduleClassesPath, classFilePath));
+    }
+
+    public void addChangedClass(Path moduleClassesPath, Path classFilePath) {
+        changedClasses.add(classFilePath);
+        changedClassNames.add(toName(moduleClassesPath, classFilePath));
+    }
+
+    public void addAddedClass(Path moduleClassesPath, Path classFilePath) {
+        addedClasses.add(classFilePath);
+        addedClassNames.add(toName(moduleClassesPath, classFilePath));
+    }
+
+    private String toName(Path moduleClassesPath, Path classFilePath) {
+        String cf = moduleClassesPath.relativize(classFilePath).toString()
+                .replace(moduleClassesPath.getFileSystem().getSeparator(), ".");
+        return cf.substring(0, cf.length() - ".class".length());
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/ConfigureDisableInstrumentationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/ConfigureDisableInstrumentationBuildStep.java
new file mode 100644
index 0000000000000..1c39b6806437a
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/ConfigureDisableInstrumentationBuildStep.java
@@ -0,0 +1,39 @@
+package io.quarkus.deployment.dev;
+
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ServiceStartBuildItem;
+
+public class ConfigureDisableInstrumentationBuildStep {
+
+    @BuildStep
+    ServiceStartBuildItem configure(List<DisableInstrumentationForIndexPredicateBuildItem> forIndexItems,
+            List<DisableInstrumentationForClassPredicateBuildItem> forClassItems) {
+        if (forClassItems.isEmpty() && forIndexItems.isEmpty()) {
+            return null;
+        }
+
+        RuntimeUpdatesProcessor processor = RuntimeUpdatesProcessor.INSTANCE;
+        if (processor != null) {
+            processor.setDisableInstrumentationForIndexPredicate(determineEffectivePredicate(forIndexItems))
+                    .setDisableInstrumentationForClassPredicate(determineEffectivePredicate(forClassItems));
+        }
+        return null;
+    }
+
+    private <T> Predicate<T> determineEffectivePredicate(List<? extends Supplier<Predicate<T>>> suppliers) {
+        if (suppliers.isEmpty()) {
+            return new AlwaysFalsePredicate<>();
+        } else {
+            if (suppliers.size() == 1) {
+                return suppliers.get(0).get();
+            } else {
+                return suppliers.stream().map(Supplier::get)
+                        .reduce((c) -> false, Predicate::or);
+            }
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/DisableInstrumentationForClassPredicateBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/DisableInstrumentationForClassPredicateBuildItem.java
new file mode 100644
index 0000000000000..af4ba383cdfc5
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/DisableInstrumentationForClassPredicateBuildItem.java
@@ -0,0 +1,30 @@
+package io.quarkus.deployment.dev;
+
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import org.jboss.jandex.ClassInfo;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Allows disabling of instrumentation based reload if the changed class matches certain criteria
+ */
+public final class DisableInstrumentationForClassPredicateBuildItem extends MultiBuildItem
+        implements Supplier<Predicate<ClassInfo>> {
+
+    private final Predicate<ClassInfo> predicate;
+
+    public DisableInstrumentationForClassPredicateBuildItem(Predicate<ClassInfo> predicate) {
+        this.predicate = predicate;
+    }
+
+    public Predicate<ClassInfo> getPredicate() {
+        return predicate;
+    }
+
+    @Override
+    public Predicate<ClassInfo> get() {
+        return getPredicate();
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/DisableInstrumentationForIndexPredicateBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/DisableInstrumentationForIndexPredicateBuildItem.java
new file mode 100644
index 0000000000000..c73132516e83c
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/DisableInstrumentationForIndexPredicateBuildItem.java
@@ -0,0 +1,30 @@
+package io.quarkus.deployment.dev;
+
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import org.jboss.jandex.Index;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Allows disabling of instrumentation based reload if the index of changed classes matches certain criteria
+ */
+public final class DisableInstrumentationForIndexPredicateBuildItem extends MultiBuildItem
+        implements Supplier<Predicate<Index>> {
+
+    private final Predicate<Index> predicate;
+
+    public DisableInstrumentationForIndexPredicateBuildItem(Predicate<Index> predicate) {
+        this.predicate = predicate;
+    }
+
+    public Predicate<Index> getPredicate() {
+        return predicate;
+    }
+
+    @Override
+    public Predicate<Index> get() {
+        return getPredicate();
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/HotDeploymentConfigFileBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/HotDeploymentConfigFileBuildStep.java
index e227702fecd71..203333a07f9b3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/HotDeploymentConfigFileBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/HotDeploymentConfigFileBuildStep.java
@@ -13,11 +13,12 @@ public class HotDeploymentConfigFileBuildStep {
     @BuildStep
     ServiceStartBuildItem setupConfigFileHotDeployment(List<HotDeploymentWatchedFileBuildItem> files) {
         // TODO: this should really be an output of the RuntimeRunner
-        RuntimeUpdatesProcessor processor = IsolatedDevModeMain.runtimeUpdatesProcessor;
+        RuntimeUpdatesProcessor processor = RuntimeUpdatesProcessor.INSTANCE;
         if (processor != null) {
             Map<String, Boolean> watchedFilePaths = files.stream()
                     .collect(Collectors.toMap(HotDeploymentWatchedFileBuildItem::getLocation,
-                            HotDeploymentWatchedFileBuildItem::isRestartNeeded));
+                            HotDeploymentWatchedFileBuildItem::isRestartNeeded,
+                            (isRestartNeeded1, isRestartNeeded2) -> isRestartNeeded1 || isRestartNeeded2));
             processor.setWatchedFilePaths(watchedFilePaths);
         }
         return null;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java
index 154e76d3cf1bb..6281bee827090 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java
@@ -1,5 +1,6 @@
 package io.quarkus.deployment.dev;
 
+import java.io.Closeable;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -14,17 +15,19 @@
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.bootstrap.resolver.AppModelResolverException;
-import io.quarkus.bootstrap.resolver.QuarkusGradleModelFactory;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
 import io.quarkus.bootstrap.resolver.model.QuarkusModel;
 import io.quarkus.bootstrap.resolver.model.WorkspaceModule;
 import io.quarkus.bootstrap.util.QuarkusModelHelper;
 import io.quarkus.bootstrap.utils.BuildToolHelper;
 
-@SuppressWarnings("unused")
-public class IDEDevModeMain implements BiConsumer<CuratedApplication, Map<String, Object>> {
+public class IDEDevModeMain implements BiConsumer<CuratedApplication, Map<String, Object>>, Closeable {
 
     private static final Logger log = Logger.getLogger(IDEDevModeMain.class.getName());
+    private static final String APP_PROJECT = "app-project";
+
+    private IsolatedDevModeMain delegate;
 
     @Override
     public void accept(CuratedApplication curatedApplication, Map<String, Object> stringObjectMap) {
@@ -33,38 +36,61 @@ public void accept(CuratedApplication curatedApplication, Map<String, Object> st
         devModeContext.setArgs((String[]) stringObjectMap.get("args"));
         try {
             if (BuildToolHelper.isMavenProject(appClasses)) {
-                LocalProject project = LocalProject.loadWorkspace(appClasses);
+                LocalProject project = (LocalProject) stringObjectMap.get(APP_PROJECT);
+                if (project == null) {
+                    project = LocalProject.loadWorkspace(appClasses);
+                }
+
                 DevModeContext.ModuleInfo root = toModule(project);
                 devModeContext.setApplicationRoot(root);
-                for (Map.Entry<AppArtifactKey, LocalProject> module : project.getWorkspace().getProjects().entrySet()) {
-                    if (module.getKey().equals(project.getKey())) {
+
+                final LocalWorkspace workspace = project.getWorkspace();
+                for (AppArtifactKey localKey : curatedApplication.getAppModel().getLocalProjectArtifacts()) {
+                    final LocalProject depProject = workspace.getProject(localKey.getGroupId(), localKey.getArtifactId());
+                    if (project == depProject) {
                         continue;
                     }
-                    devModeContext.getAdditionalModules().add(toModule(module.getValue()));
+                    if (depProject == null) {
+                        throw new IllegalStateException(
+                                "Failed to locate project dependency " + localKey + " in the workspace");
+                    }
+                    devModeContext.getAdditionalModules().add(toModule(depProject));
+                    devModeContext.getLocalArtifacts().add(localKey);
                 }
             } else {
-                // TODO find a way to reuse the previously model instead of building a new one.
-                QuarkusModel quarkusModel = QuarkusGradleModelFactory.createForTasks(
-                        BuildToolHelper.getBuildFile(appClasses, BuildToolHelper.BuildTool.GRADLE).toFile(),
-                        QuarkusModelHelper.DEVMODE_REQUIRED_TASKS);
-                final WorkspaceModule launchingModule = quarkusModel.getWorkspace().getMainModule();
-                DevModeContext.ModuleInfo root = toModule(quarkusModel.getWorkspace().getMainModule());
+                final QuarkusModel model = QuarkusModelHelper
+                        .deserializeQuarkusModel((Path) stringObjectMap.get(QuarkusModelHelper.SERIALIZED_QUARKUS_MODEL));
+                final WorkspaceModule launchingModule = model.getWorkspace().getMainModule();
+                DevModeContext.ModuleInfo root = toModule(launchingModule);
                 devModeContext.setApplicationRoot(root);
-                for (WorkspaceModule additionalModule : quarkusModel.getWorkspace().getAllModules()) {
+                for (WorkspaceModule additionalModule : model.getWorkspace().getAllModules()) {
                     if (!additionalModule.getArtifactCoords().equals(launchingModule.getArtifactCoords())) {
                         devModeContext.getAdditionalModules().add(toModule(additionalModule));
                     }
                 }
-            }
 
+            }
         } catch (AppModelResolverException e) {
             log.error("Failed to load workspace, hot reload will not be available", e);
         }
 
-        new IsolatedDevModeMain().accept(curatedApplication,
+        terminateIfRunning();
+        delegate = new IsolatedDevModeMain();
+        delegate.accept(curatedApplication,
                 Collections.singletonMap(DevModeContext.class.getName(), devModeContext));
     }
 
+    @Override
+    public void close() {
+        terminateIfRunning();
+    }
+
+    private void terminateIfRunning() {
+        if (delegate != null) {
+            delegate.close();
+        }
+    }
+
     private DevModeContext.ModuleInfo toModule(WorkspaceModule module) throws BootstrapGradleException {
         AppArtifactKey key = new AppArtifactKey(module.getArtifactCoords().getGroupId(),
                 module.getArtifactCoords().getArtifactId(), module.getArtifactCoords().getClassifier());
@@ -75,14 +101,17 @@ private DevModeContext.ModuleInfo toModule(WorkspaceModule module) throws Bootst
             sourceDirectories.add(srcDir.getPath());
             sourceParents.add(srcDir.getParent());
         }
-
+        String resourceDirectory = null;
+        if (module.getSourceSet().getResourceDirectory() != null) {
+            resourceDirectory = module.getSourceSet().getResourceDirectory().getPath();
+        }
         return new DevModeContext.ModuleInfo(key,
                 module.getArtifactCoords().getArtifactId(),
                 module.getProjectRoot().getPath(),
                 sourceDirectories,
                 QuarkusModelHelper.getClassPath(module).toAbsolutePath().toString(),
                 module.getSourceSourceSet().getResourceDirectory().toString(),
-                module.getSourceSet().getResourceDirectory().getPath(),
+                resourceDirectory,
                 sourceParents,
                 module.getBuildDir().toPath().resolve("generated-sources").toAbsolutePath().toString(),
                 module.getBuildDir().toString());
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java
index 08fc3d718e0d7..6dc5207d5fa9d 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedDevModeMain.java
@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.net.BindException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -19,6 +20,7 @@
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -27,6 +29,7 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.app.AugmentAction;
+import io.quarkus.bootstrap.app.ClassChangeInformation;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.RunningQuarkusApplication;
 import io.quarkus.bootstrap.app.StartupAction;
@@ -40,7 +43,9 @@
 import io.quarkus.deployment.CodeGenerator;
 import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
 import io.quarkus.deployment.codegen.CodeGenData;
+import io.quarkus.deployment.steps.ClassTransformingBuildStep;
 import io.quarkus.deployment.util.FSWatchUtil;
+import io.quarkus.dev.console.DevConsoleManager;
 import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.dev.spi.HotReplacementSetup;
 import io.quarkus.runner.bootstrap.AugmentActionImpl;
@@ -58,7 +63,6 @@ public class IsolatedDevModeMain implements BiConsumer<CuratedApplication, Map<S
     private final List<HotReplacementSetup> hotReplacementSetups = new ArrayList<>();
     private static volatile RunningQuarkusApplication runner;
     static volatile Throwable deploymentProblem;
-    static volatile RuntimeUpdatesProcessor runtimeUpdatesProcessor;
     private static volatile CuratedApplication curatedApplication;
     private static volatile AugmentAction augmentAction;
     private static volatile boolean restarting;
@@ -69,6 +73,7 @@ private synchronized void firstStart(QuarkusClassLoader deploymentClassLoader, L
         ClassLoader old = Thread.currentThread().getContextClassLoader();
         try {
 
+            boolean augmentDone = false;
             //ok, we have resolved all the deps
             try {
                 StartupAction start = augmentAction.createInitialRuntimeApplication();
@@ -94,54 +99,61 @@ public void accept(Integer integer) {
                                         System.in.read();
                                     }
                                     System.out.println("Restarting...");
-                                    runtimeUpdatesProcessor.checkForChangedClasses();
-                                    restartApp(runtimeUpdatesProcessor.checkForFileChange());
+                                    RuntimeUpdatesProcessor.INSTANCE.checkForChangedClasses();
+                                    restartApp(RuntimeUpdatesProcessor.INSTANCE.checkForFileChange(), null);
                                 } catch (Exception e) {
                                     log.error("Failed to restart", e);
                                 }
                             }
                         });
 
-                startCodeGenWatcher(deploymentClassLoader, codeGens);
-
+                startCodeGenWatcher(deploymentClassLoader, codeGens, context.getBuildSystemProperties());
+                augmentDone = true;
                 runner = start.runMainClass(context.getArgs());
                 firstStartCompleted = true;
             } catch (Throwable t) {
-                deploymentProblem = t;
-                if (context.isAbortOnFailedStart()) {
-                    log.error("Failed to start quarkus", t);
-                } else {
-                    //we need to set this here, while we still have the correct TCCL
-                    //this is so the config is still valid, and we can read HTTP config from application.properties
-                    log.info("Attempting to start hot replacement endpoint to recover from previous Quarkus startup failure");
-                    if (runtimeUpdatesProcessor != null) {
-                        Thread.currentThread().setContextClassLoader(curatedApplication.getBaseRuntimeClassLoader());
-
-                        try {
-                            if (!InitialConfigurator.DELAYED_HANDLER.isActivated()) {
-                                Class<?> cl = Thread.currentThread().getContextClassLoader()
-                                        .loadClass(LoggingSetupRecorder.class.getName());
-                                cl.getMethod("handleFailedStart").invoke(null);
+                Throwable rootCause = t;
+                while (rootCause.getCause() != null) {
+                    rootCause = rootCause.getCause();
+                }
+                if (!(rootCause instanceof BindException)) {
+                    deploymentProblem = t;
+                    if (!augmentDone) {
+                        log.error("Failed to start quarkus", t);
+                    }
+                    if (!context.isAbortOnFailedStart()) {
+                        //we need to set this here, while we still have the correct TCCL
+                        //this is so the config is still valid, and we can read HTTP config from application.properties
+                        log.info(
+                                "Attempting to start hot replacement endpoint to recover from previous Quarkus startup failure");
+                        if (RuntimeUpdatesProcessor.INSTANCE != null) {
+                            Thread.currentThread().setContextClassLoader(curatedApplication.getBaseRuntimeClassLoader());
+                            try {
+                                if (!InitialConfigurator.DELAYED_HANDLER.isActivated()) {
+                                    Class<?> cl = Thread.currentThread().getContextClassLoader()
+                                            .loadClass(LoggingSetupRecorder.class.getName());
+                                    cl.getMethod("handleFailedStart").invoke(null);
+                                }
+                                RuntimeUpdatesProcessor.INSTANCE.startupFailed();
+                            } catch (Exception e) {
+                                close();
+                                log.error("Failed to recover after failed start", e);
+                                //this is the end of the road, we just exit
+                                //generally we only hit this if something is already listening on the HTTP port
+                                //or the system config is so broken we can't start HTTP
+                                System.exit(1);
                             }
-                            runtimeUpdatesProcessor.startupFailed();
-                        } catch (Exception e) {
-                            close();
-                            log.error("Failed to recover after failed start", e);
-                            //this is the end of the road, we just exit
-                            //generally we only hit this if something is already listening on the HTTP port
-                            //or the system config is so broken we can't start HTTP
-                            System.exit(1);
                         }
                     }
                 }
-
             }
         } finally {
             Thread.currentThread().setContextClassLoader(old);
         }
     }
 
-    private void startCodeGenWatcher(QuarkusClassLoader classLoader, List<CodeGenData> codeGens) {
+    private void startCodeGenWatcher(QuarkusClassLoader classLoader, List<CodeGenData> codeGens,
+            Map<String, String> properties) {
 
         Collection<FSWatchUtil.Watcher> watchers = new ArrayList<>();
         for (CodeGenData codeGen : codeGens) {
@@ -150,7 +162,7 @@ private void startCodeGenWatcher(QuarkusClassLoader classLoader, List<CodeGenDat
                         try {
                             CodeGenerator.trigger(classLoader,
                                     codeGen,
-                                    curatedApplication.getAppModel());
+                                    curatedApplication.getAppModel(), properties);
                         } catch (Exception any) {
                             log.warn("Code generation failed", any);
                         }
@@ -159,7 +171,12 @@ private void startCodeGenWatcher(QuarkusClassLoader classLoader, List<CodeGenDat
         FSWatchUtil.observe(watchers, 500);
     }
 
-    public synchronized void restartApp(Set<String> changedResources) {
+    public void restartCallback(Set<String> changedResources, ClassScanResult result) {
+        restartApp(changedResources,
+                new ClassChangeInformation(result.changedClassNames, result.deletedClassNames, result.addedClassNames));
+    }
+
+    public synchronized void restartApp(Set<String> changedResources, ClassChangeInformation classChangeInformation) {
         restarting = true;
         stop();
         Timing.restart(curatedApplication.getAugmentClassLoader());
@@ -169,14 +186,21 @@ public synchronized void restartApp(Set<String> changedResources) {
 
             //ok, we have resolved all the deps
             try {
-                StartupAction start = augmentAction.reloadExistingApplication(firstStartCompleted, changedResources);
+                StartupAction start = augmentAction.reloadExistingApplication(firstStartCompleted, changedResources,
+                        classChangeInformation);
                 runner = start.runMainClass(context.getArgs());
                 firstStartCompleted = true;
             } catch (Throwable t) {
                 deploymentProblem = t;
-                log.error("Failed to start quarkus", t);
-                Thread.currentThread().setContextClassLoader(curatedApplication.getAugmentClassLoader());
-                LoggingSetupRecorder.handleFailedStart();
+                Throwable rootCause = t;
+                while (rootCause.getCause() != null) {
+                    rootCause = rootCause.getCause();
+                }
+                if (!(rootCause instanceof BindException)) {
+                    log.error("Failed to start quarkus", t);
+                    Thread.currentThread().setContextClassLoader(curatedApplication.getAugmentClassLoader());
+                    LoggingSetupRecorder.handleFailedStart();
+                }
             }
         } finally {
             restarting = false;
@@ -202,7 +226,12 @@ private RuntimeUpdatesProcessor setupRuntimeCompilation(DevModeContext context,
                 return null;
             }
             RuntimeUpdatesProcessor processor = new RuntimeUpdatesProcessor(appRoot, context, compiler,
-                    devModeType, this::restartApp, null);
+                    devModeType, this::restartCallback, null, new BiFunction<String, byte[], byte[]>() {
+                        @Override
+                        public byte[] apply(String s, byte[] bytes) {
+                            return ClassTransformingBuildStep.transform(s, bytes);
+                        }
+                    });
 
             for (HotReplacementSetup service : ServiceLoader.load(HotReplacementSetup.class,
                     curatedApplication.getBaseRuntimeClassLoader())) {
@@ -210,6 +239,8 @@ private RuntimeUpdatesProcessor setupRuntimeCompilation(DevModeContext context,
                 service.setupHotDeployment(processor);
                 processor.addHotReplacementSetup(service);
             }
+            DevConsoleManager.setQuarkusBootstrap(curatedApplication.getQuarkusBootstrap());
+            DevConsoleManager.setHotReplacementContext(processor);
             return processor;
         }
         return null;
@@ -250,7 +281,7 @@ public void close() {
         } finally {
             try {
                 try {
-                    runtimeUpdatesProcessor.close();
+                    RuntimeUpdatesProcessor.INSTANCE.close();
                 } catch (IOException e) {
                     log.error("Failed to close compiler", e);
                 }
@@ -322,7 +353,8 @@ public boolean test(String s) {
                                 }
                             }).produces(ApplicationClassPredicateBuildItem.class).build();
                         }
-                    }));
+                    }),
+                    Collections.emptyList());
             List<CodeGenData> codeGens = new ArrayList<>();
             QuarkusClassLoader deploymentClassLoader = curatedApplication.createDeploymentClassLoader();
 
@@ -337,19 +369,20 @@ public boolean test(String s) {
                                     sourcePath -> module.addSourcePaths(singleton(sourcePath.toAbsolutePath().toString()))));
                 }
             }
-            runtimeUpdatesProcessor = setupRuntimeCompilation(context, (Path) params.get(APP_ROOT),
+            RuntimeUpdatesProcessor.INSTANCE = setupRuntimeCompilation(context, (Path) params.get(APP_ROOT),
                     (DevModeType) params.get(DevModeType.class.getName()));
-            if (runtimeUpdatesProcessor != null) {
-                runtimeUpdatesProcessor.checkForFileChange();
-                runtimeUpdatesProcessor.checkForChangedClasses();
+            if (RuntimeUpdatesProcessor.INSTANCE != null) {
+                RuntimeUpdatesProcessor.INSTANCE.checkForFileChange();
+                RuntimeUpdatesProcessor.INSTANCE.checkForChangedClasses();
             }
             firstStart(deploymentClassLoader, codeGens);
 
             //        doStart(false, Collections.emptySet());
-            if (deploymentProblem != null || runtimeUpdatesProcessor.getCompileProblem() != null) {
+            if (deploymentProblem != null || RuntimeUpdatesProcessor.INSTANCE.getCompileProblem() != null) {
                 if (context.isAbortOnFailedStart()) {
                     throw new RuntimeException(
-                            deploymentProblem == null ? runtimeUpdatesProcessor.getCompileProblem() : deploymentProblem);
+                            deploymentProblem == null ? RuntimeUpdatesProcessor.INSTANCE.getCompileProblem()
+                                    : deploymentProblem);
                 }
             }
             Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedRemoteDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedRemoteDevModeMain.java
index 630ffb6dc0314..e80b0411662f2 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedRemoteDevModeMain.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/IsolatedRemoteDevModeMain.java
@@ -22,6 +22,7 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -38,6 +39,7 @@
 import io.quarkus.deployment.mutability.DevModeTask;
 import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.deployment.pkg.steps.JarResultBuildStep;
+import io.quarkus.deployment.steps.ClassTransformingBuildStep;
 import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.dev.spi.HotReplacementSetup;
 import io.quarkus.dev.spi.RemoteDevState;
@@ -56,7 +58,6 @@ public class IsolatedRemoteDevModeMain implements BiConsumer<CuratedApplication,
 
     private final List<HotReplacementSetup> hotReplacementSetups = new ArrayList<>();
     static volatile Throwable deploymentProblem;
-    static volatile RuntimeUpdatesProcessor runtimeUpdatesProcessor;
     static volatile RemoteDevClient remoteDevClient;
     static volatile Closeable remoteDevClientSession;
     private static volatile CuratedApplication curatedApplication;
@@ -130,6 +131,11 @@ private RuntimeUpdatesProcessor setupRuntimeCompilation(DevModeContext context,
                         public void accept(DevModeContext.ModuleInfo moduleInfo, String s) {
                             copiedStaticResources.computeIfAbsent(moduleInfo, ss -> new HashSet<>()).add(s);
                         }
+                    }, new BiFunction<String, byte[], byte[]>() {
+                        @Override
+                        public byte[] apply(String s, byte[] bytes) {
+                            return ClassTransformingBuildStep.transform(s, bytes);
+                        }
                     });
 
             for (HotReplacementSetup service : ServiceLoader.load(HotReplacementSetup.class,
@@ -143,14 +149,14 @@ public void accept(DevModeContext.ModuleInfo moduleInfo, String s) {
         return null;
     }
 
-    void regenerateApplication(Set<String> ignore) {
+    void regenerateApplication(Set<String> ignore, ClassScanResult ignore2) {
         generateApplication();
     }
 
     public void close() {
         try {
             try {
-                runtimeUpdatesProcessor.close();
+                RuntimeUpdatesProcessor.INSTANCE.close();
             } catch (IOException e) {
                 log.error("Failed to close compiler", e);
             }
@@ -190,11 +196,11 @@ public void accept(CuratedApplication o, Map<String, Object> o2) {
             }
 
             augmentAction = new AugmentActionImpl(curatedApplication);
-            runtimeUpdatesProcessor = setupRuntimeCompilation(context, appRoot);
+            RuntimeUpdatesProcessor.INSTANCE = setupRuntimeCompilation(context, appRoot);
 
-            if (runtimeUpdatesProcessor != null) {
-                runtimeUpdatesProcessor.checkForFileChange();
-                runtimeUpdatesProcessor.checkForChangedClasses();
+            if (RuntimeUpdatesProcessor.INSTANCE != null) {
+                RuntimeUpdatesProcessor.INSTANCE.checkForFileChange();
+                RuntimeUpdatesProcessor.INSTANCE.checkForChangedClasses();
             }
 
             JarResult result = generateApplication();
@@ -254,10 +260,10 @@ private RemoteDevClient.SyncResult runSync() {
         Set<String> removed = new HashSet<>();
         Map<String, byte[]> changed = new HashMap<>();
         try {
-            boolean scanResult = runtimeUpdatesProcessor.doScan(true);
+            boolean scanResult = RuntimeUpdatesProcessor.INSTANCE.doScan(true);
             if (!scanResult && !copiedStaticResources.isEmpty()) {
                 scanResult = true;
-                regenerateApplication(Collections.emptySet());
+                regenerateApplication(Collections.emptySet(), new ClassScanResult());
             }
             copiedStaticResources.clear();
             if (scanResult) {
@@ -291,7 +297,7 @@ public Set<String> getRemovedFiles() {
 
             @Override
             public Throwable getProblem() {
-                return runtimeUpdatesProcessor.getDeploymentProblem();
+                return RuntimeUpdatesProcessor.INSTANCE.getDeploymentProblem();
             }
 
         };
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/JavaCompilationProvider.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/JavaCompilationProvider.java
index 149e86a37b4ba..47decbc6dbc70 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/JavaCompilationProvider.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/JavaCompilationProvider.java
@@ -19,6 +19,7 @@
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
 
+import org.jboss.logging.Logger;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 
@@ -26,6 +27,8 @@
 
 public class JavaCompilationProvider implements CompilationProvider {
 
+    private static final Logger log = Logger.getLogger(JavaCompilationProvider.class);
+
     // -g is used to make the java compiler generate all debugging info
     // -parameters is used to generate metadata for reflection on method parameters
     // this is useful when people using debuggers against their hot-reloaded app
@@ -71,12 +74,14 @@ public void compile(Set<File> filesToCompile, Context context) {
             }
 
             for (Diagnostic<? extends JavaFileObject> diagnostic : diagnostics.getDiagnostics()) {
-                System.out.format("%s, line %d in %s", diagnostic.getMessage(null), diagnostic.getLineNumber(),
+                log.logf(diagnostic.getKind() == Diagnostic.Kind.ERROR ? Logger.Level.ERROR : Logger.Level.WARN,
+                        "%s, line %d in %s", diagnostic.getMessage(null), diagnostic.getLineNumber(),
                         diagnostic.getSource() == null ? "[unknown source]" : diagnostic.getSource().getName());
             }
             if (!fileManagerDiagnostics.getDiagnostics().isEmpty()) {
                 for (Diagnostic<? extends JavaFileObject> diagnostic : fileManagerDiagnostics.getDiagnostics()) {
-                    System.out.format("%s, line %d in %s", diagnostic.getMessage(null), diagnostic.getLineNumber(),
+                    log.logf(diagnostic.getKind() == Diagnostic.Kind.ERROR ? Logger.Level.ERROR : Logger.Level.WARN,
+                            "%s, line %d in %s", diagnostic.getMessage(null), diagnostic.getLineNumber(),
                             diagnostic.getSource() == null ? "[unknown source]" : diagnostic.getSource().getName());
                 }
                 fileManager.close();
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java
new file mode 100644
index 0000000000000..b30ac9fac979a
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/QuarkusDevModeLauncher.java
@@ -0,0 +1,462 @@
+package io.quarkus.deployment.dev;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.maven.shared.utils.cli.CommandLineUtils;
+
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.deployment.dev.DevModeContext.ModuleInfo;
+import io.quarkus.runtime.util.JavaVersionUtil;
+import io.quarkus.utilities.JavaBinFinder;
+
+public abstract class QuarkusDevModeLauncher {
+
+    public class Builder<R extends QuarkusDevModeLauncher, B extends Builder<R, B>> {
+
+        protected Builder(String java) {
+            args = new ArrayList<>();
+            final String javaTool = java == null ? JavaBinFinder.findBin() : java;
+            QuarkusDevModeLauncher.this.debug("Using javaTool: %s", javaTool);
+            args.add(javaTool);
+
+        }
+
+        @SuppressWarnings("unchecked")
+        public B preventnoverify(boolean preventnoverify) {
+            if (!preventnoverify) {
+                // in Java 13 and up, preventing verification is deprecated - see https://bugs.openjdk.java.net/browse/JDK-8218003
+                // this test isn't absolutely correct in the sense that depending on the user setup, the actual Java binary
+                // that is used might be different that the one running Maven, but given how small of an impact this has
+                // it's probably better than running an extra command on 'javaTool' just to figure out the version
+                if (!JavaVersionUtil.isJava13OrHigher()) {
+                    args.add("-Xverify:none");
+                }
+            }
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B jvmArgs(String jvmArgs) {
+            args.add(jvmArgs);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B jvmArgs(List<String> jvmArgs) {
+            args.addAll(jvmArgs);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B debug(String debug) {
+            QuarkusDevModeLauncher.this.debug = debug;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B debugPortOk(Boolean debugPortOk) {
+            QuarkusDevModeLauncher.this.debugPortOk = debugPortOk;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B suspend(String suspend) {
+            QuarkusDevModeLauncher.this.suspend = suspend;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B projectDir(File projectDir) {
+            QuarkusDevModeLauncher.this.projectDir = projectDir;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B buildDir(File buildDir) {
+            QuarkusDevModeLauncher.this.buildDir = buildDir;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B outputDir(File outputDir) {
+            QuarkusDevModeLauncher.this.outputDir = outputDir;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B buildSystemProperties(Map<String, String> buildSystemProperties) {
+            QuarkusDevModeLauncher.this.buildSystemProperties = buildSystemProperties;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B buildSystemProperty(String name, String value) {
+            QuarkusDevModeLauncher.this.buildSystemProperties.put(name, value);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B applicationName(String appName) {
+            QuarkusDevModeLauncher.this.applicationName = appName;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B applicationVersion(String appVersion) {
+            QuarkusDevModeLauncher.this.applicationVersion = appVersion;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B applicationArgs(String appArgs) {
+            QuarkusDevModeLauncher.this.applicationArgs = appArgs;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B sourceEncoding(String srcEncoding) {
+            QuarkusDevModeLauncher.this.sourceEncoding = srcEncoding;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B compilerOption(String option) {
+            compilerOptions.add(option);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B compilerOptions(List<String> options) {
+            compilerOptions.addAll(options);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B compilerPluginArtifacts(List<String> artifacts) {
+            compilerPluginArtifacts = artifacts;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B compilerPluginOptions(List<String> options) {
+            compilerPluginOptions = options;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B sourceJavaVersion(String sourceJavaVersion) {
+            QuarkusDevModeLauncher.this.sourceJavaVersion = sourceJavaVersion;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B targetJavaVersion(String targetJavaVersion) {
+            QuarkusDevModeLauncher.this.targetJavaVersion = targetJavaVersion;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B watchedBuildFile(Path buildFile) {
+            QuarkusDevModeLauncher.this.buildFiles.add(buildFile);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B deleteDevJar(boolean deleteDevJar) {
+            QuarkusDevModeLauncher.this.deleteDevJar = deleteDevJar;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B baseName(String baseName) {
+            QuarkusDevModeLauncher.this.baseName = baseName;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B remoteDev(boolean remoteDev) {
+            QuarkusDevModeLauncher.this.remoteDev = remoteDev;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B localArtifact(AppArtifactKey localArtifact) {
+            localArtifacts.add(localArtifact);
+            return (B) this;
+        }
+
+        public boolean isLocal(AppArtifactKey artifact) {
+            return localArtifacts.contains(artifact);
+        }
+
+        @SuppressWarnings("unchecked")
+        public B mainModule(ModuleInfo mainModule) {
+            main = mainModule;
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B dependency(ModuleInfo module) {
+            dependencies.add(module);
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public B classpathEntry(File f) {
+            classpath.add(f);
+            return (B) this;
+        }
+
+        public B debugHost(String host) {
+            if ((null != host) && !host.isEmpty()) {
+                debugHost = host;
+            }
+            return (B) this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public R build() throws Exception {
+            prepare();
+            return (R) QuarkusDevModeLauncher.this;
+        }
+    }
+
+    private List<String> args = new ArrayList<>(0);
+    private String debug;
+    private Boolean debugPortOk;
+    private String suspend;
+    private String debugHost = "localhost";
+    private File projectDir;
+    private File buildDir;
+    private File outputDir;
+    private Map<String, String> buildSystemProperties = new HashMap<>(0);
+    private String applicationName;
+    private String applicationVersion;
+    private String sourceEncoding;
+    private List<String> compilerOptions = new ArrayList<>(0);
+    private List<String> compilerPluginArtifacts;
+    private List<String> compilerPluginOptions;
+    private String sourceJavaVersion;
+    private String targetJavaVersion;
+    private Set<Path> buildFiles = new HashSet<>(0);
+    private boolean deleteDevJar = true;
+    private String baseName;
+    private boolean remoteDev;
+    private String applicationArgs;
+    private Set<AppArtifactKey> localArtifacts = new HashSet<>();
+    private ModuleInfo main;
+    private List<ModuleInfo> dependencies = new ArrayList<>(0);
+    private List<File> classpath = new ArrayList<>(0);
+
+    protected QuarkusDevModeLauncher() {
+    }
+
+    /**
+     * Attempts to prepare the dev mode runner.
+     */
+    protected void prepare() throws Exception {
+
+        // the following flags reduce startup time and are acceptable only for dev purposes
+        args.add("-XX:TieredStopAtLevel=1");
+
+        if (suspend != null) {
+            switch (suspend.toLowerCase(Locale.ENGLISH)) {
+                case "n":
+                case "false": {
+                    suspend = "n";
+                    break;
+                }
+                case "y":
+                case "true": {
+                    suspend = "y";
+                    break;
+                }
+                default: {
+                    warn("Ignoring invalid value \"" + suspend + "\" for \"suspend\" param and defaulting to \"n\"");
+                    suspend = "n";
+                    break;
+                }
+            }
+        } else {
+            suspend = "n";
+        }
+
+        if (debug == null) {
+            // debug mode not specified
+            // make sure 5005 is not used, we don't want to just fail if something else is using it
+            // we don't check this on restarts, as the previous process is still running
+            if (debugPortOk == null) {
+                try (Socket socket = new Socket(InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }), 5005)) {
+                    error("Port 5005 in use, not starting in debug mode");
+                    debugPortOk = false;
+                } catch (IOException e) {
+                    debugPortOk = true;
+                }
+            }
+            if (debugPortOk) {
+                args.add("-Xdebug");
+                args.add("-Xrunjdwp:transport=dt_socket,address=" + debugHost + ":5005,server=y,suspend=" + suspend);
+            }
+        } else if (debug.toLowerCase().equals("client")) {
+            args.add("-Xdebug");
+            args.add("-Xrunjdwp:transport=dt_socket,address=" + debugHost + ":5005,server=n,suspend=" + suspend);
+        } else if (debug.toLowerCase().equals("true")) {
+            args.add("-Xdebug");
+            args.add("-Xrunjdwp:transport=dt_socket,address=" + debugHost + ":5005,server=y,suspend=" + suspend);
+        } else if (!debug.toLowerCase().equals("false")) {
+            try {
+                int port = Integer.parseInt(debug);
+                if (port <= 0) {
+                    throw new Exception("The specified debug port must be greater than 0");
+                }
+                args.add("-Xdebug");
+                args.add("-Xrunjdwp:transport=dt_socket,address=" + debugHost + ":" + port + ",server=y,suspend=" + suspend);
+            } catch (NumberFormatException e) {
+                throw new Exception(
+                        "Invalid value for debug parameter: " + debug + " must be true|false|client|{port}");
+            }
+        }
+
+        //build a class-path string for the base platform
+        //this stuff does not change
+        // Do not include URIs in the manifest, because some JVMs do not like that
+        StringBuilder classPathManifest = new StringBuilder();
+        final DevModeContext devModeContext = new DevModeContext();
+        for (Map.Entry<Object, Object> e : System.getProperties().entrySet()) {
+            devModeContext.getSystemProperties().put(e.getKey().toString(), (String) e.getValue());
+        }
+        devModeContext.setProjectDir(projectDir);
+        devModeContext.getBuildSystemProperties().putAll(buildSystemProperties);
+
+        //  this is a minor hack to allow ApplicationConfig to be populated with defaults
+        devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.application.name", applicationName);
+        devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.application.version", applicationVersion);
+
+        devModeContext.setSourceEncoding(sourceEncoding);
+        devModeContext.setCompilerOptions(compilerOptions);
+
+        if (compilerPluginArtifacts != null) {
+            devModeContext.setCompilerPluginArtifacts(compilerPluginArtifacts);
+        }
+        if (compilerPluginOptions != null) {
+            devModeContext.setCompilerPluginsOptions(compilerPluginOptions);
+        }
+
+        devModeContext.setSourceJavaVersion(sourceJavaVersion);
+        devModeContext.setTargetJvmVersion(targetJavaVersion);
+
+        devModeContext.getLocalArtifacts().addAll(localArtifacts);
+        devModeContext.setApplicationRoot(main);
+        devModeContext.getAdditionalModules().addAll(dependencies);
+
+        args.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
+
+        File tempFile = new File(buildDir, applicationName + "-dev.jar");
+        tempFile.delete();
+        // Only delete the -dev.jar on exit if requested
+        if (deleteDevJar) {
+            tempFile.deleteOnExit();
+        }
+        debug("Executable jar: %s", tempFile.getAbsolutePath());
+
+        devModeContext.setBaseName(baseName);
+        devModeContext.setCacheDir(new File(buildDir, "transformer-cache").getAbsoluteFile());
+
+        // this is the jar file we will use to launch the dev mode main class
+        devModeContext.setDevModeRunnerJarFile(tempFile);
+
+        if (remoteDev) {
+            devModeContext.setMode(QuarkusBootstrap.Mode.REMOTE_DEV_CLIENT);
+            devModeContext.setAlternateEntryPoint(IsolatedRemoteDevModeMain.class.getName());
+        }
+
+        try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tempFile))) {
+            out.putNextEntry(new ZipEntry("META-INF/"));
+            Manifest manifest = new Manifest();
+            manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+
+            if (!classpath.isEmpty()) {
+                classpath.forEach(file -> {
+                    final URI uri = file.toPath().toAbsolutePath().toUri();
+                    classPathManifest.append(uri).append(" ");
+                });
+            }
+            manifest.getMainAttributes().put(Attributes.Name.CLASS_PATH, classPathManifest.toString());
+            manifest.getMainAttributes().put(Attributes.Name.MAIN_CLASS, DevModeMain.class.getName());
+            out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
+            manifest.write(out);
+
+            out.putNextEntry(new ZipEntry(DevModeMain.DEV_MODE_CONTEXT));
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            ObjectOutputStream obj = new ObjectOutputStream(new DataOutputStream(bytes));
+            obj.writeObject(devModeContext);
+            obj.close();
+            out.write(bytes.toByteArray());
+        }
+
+        outputDir.mkdirs();
+        // if the --enable-preview flag was set, then we need to enable it when launching dev mode as well
+        if (devModeContext.isEnablePreview()) {
+            args.add(DevModeContext.ENABLE_PREVIEW_FLAG);
+        }
+
+        args.add("-jar");
+        args.add(tempFile.getAbsolutePath());
+        if (applicationArgs != null) {
+            args.addAll(Arrays.asList(CommandLineUtils.translateCommandline(applicationArgs)));
+        }
+    }
+
+    public Collection<Path> watchedBuildFiles() {
+        return buildFiles;
+    }
+
+    public List<String> args() {
+        return args;
+    }
+
+    protected abstract boolean isDebugEnabled();
+
+    protected void debug(Object msg, Object... args) {
+        if (!isDebugEnabled()) {
+            return;
+        }
+        if (msg == null) {
+            return;
+        }
+        if (args.length == 0) {
+            debug(msg);
+            return;
+        }
+        debug(String.format(msg.toString(), args));
+    }
+
+    protected abstract void debug(Object msg);
+
+    protected abstract void error(Object msg);
+
+    protected abstract void warn(Object msg);
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
index ff9c291504eee..6643cf3963bc3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
@@ -3,11 +3,13 @@
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
 
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.lang.instrument.ClassDefinition;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -25,13 +27,21 @@
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.runner.Timing;
+import io.quarkus.changeagent.ClassChangeAgent;
 import io.quarkus.deployment.util.FSWatchUtil;
 import io.quarkus.deployment.util.FileUtil;
 import io.quarkus.dev.spi.DevModeType;
@@ -44,6 +54,8 @@ public class RuntimeUpdatesProcessor implements HotReplacementContext, Closeable
 
     private static final String CLASS_EXTENSION = ".class";
 
+    static volatile RuntimeUpdatesProcessor INSTANCE;
+
     private final Path applicationRoot;
     private final DevModeContext context;
     private final ClassLoaderCompiler compiler;
@@ -53,6 +65,9 @@ public class RuntimeUpdatesProcessor implements HotReplacementContext, Closeable
     // file path -> isRestartNeeded
     private volatile Map<String, Boolean> watchedFilePaths = Collections.emptyMap();
 
+    private volatile Predicate<ClassInfo> disableInstrumentationForClassPredicate = new AlwaysFalsePredicate<>();
+    private volatile Predicate<Index> disableInstrumentationForIndexPredicate = new AlwaysFalsePredicate<>();
+
     /**
      * A first scan is considered done when we have visited all modules at least once.
      * This is useful in two ways.
@@ -76,25 +91,34 @@ public class RuntimeUpdatesProcessor implements HotReplacementContext, Closeable
     private final List<Runnable> preScanSteps = new CopyOnWriteArrayList<>();
     private final List<Consumer<Set<String>>> noRestartChangesConsumers = new CopyOnWriteArrayList<>();
     private final List<HotReplacementSetup> hotReplacementSetup = new ArrayList<>();
-    private final Consumer<Set<String>> restartCallback;
+    private final BiConsumer<Set<String>, ClassScanResult> restartCallback;
     private final BiConsumer<DevModeContext.ModuleInfo, String> copyResourceNotification;
+    private final BiFunction<String, byte[], byte[]> classTransformers;
+
+    /**
+     * The index for the last successful start. Used to determine if the class has changed its structure
+     * and determine if it is eligible for an instrumentation based reload.
+     */
+    private static volatile IndexView lastStartIndex;
 
     public RuntimeUpdatesProcessor(Path applicationRoot, DevModeContext context, ClassLoaderCompiler compiler,
-            DevModeType devModeType, Consumer<Set<String>> restartCallback,
-            BiConsumer<DevModeContext.ModuleInfo, String> copyResourceNotification) {
+            DevModeType devModeType, BiConsumer<Set<String>, ClassScanResult> restartCallback,
+            BiConsumer<DevModeContext.ModuleInfo, String> copyResourceNotification,
+            BiFunction<String, byte[], byte[]> classTransformers) {
         this.applicationRoot = applicationRoot;
         this.context = context;
         this.compiler = compiler;
         this.devModeType = devModeType;
         this.restartCallback = restartCallback;
         this.copyResourceNotification = copyResourceNotification;
+        this.classTransformers = classTransformers;
     }
 
     @Override
     public Path getClassesDir() {
         //TODO: fix all these
         for (DevModeContext.ModuleInfo i : context.getAllModules()) {
-            return Paths.get(i.getResourcePath());
+            return Paths.get(i.getClassesPath());
         }
         return null;
     }
@@ -158,6 +182,7 @@ public DevModeType getDevModeType() {
 
     @Override
     public boolean doScan(boolean userInitiated) throws IOException {
+
         final long startNanoseconds = System.nanoTime();
         for (Runnable step : preScanSteps) {
             try {
@@ -167,20 +192,66 @@ public boolean doScan(boolean userInitiated) throws IOException {
             }
         }
 
-        boolean classChanged = checkForChangedClasses();
+        ClassScanResult changedClassResults = checkForChangedClasses();
         Set<String> filesChanged = checkForFileChange();
 
+        boolean configFileRestartNeeded = filesChanged.stream().map(watchedFilePaths::get).anyMatch(Boolean.TRUE::equals);
+
+        boolean instrumentationChange = false;
+        if (ClassChangeAgent.getInstrumentation() != null && lastStartIndex != null && !configFileRestartNeeded
+                && devModeType != DevModeType.REMOTE_LOCAL_SIDE) {
+            //attempt to do an instrumentation based reload
+            //if only code has changed and not the class structure, then we can do a reload
+            //using the JDK instrumentation API (assuming we were started with the javaagent)
+            if (changedClassResults.deletedClasses.isEmpty()
+                    && changedClassResults.addedClasses.isEmpty()
+                    && !changedClassResults.changedClasses.isEmpty()) {
+                try {
+                    Indexer indexer = new Indexer();
+                    //attempt to use the instrumentation API
+                    ClassDefinition[] defs = new ClassDefinition[changedClassResults.changedClasses.size()];
+                    int index = 0;
+                    for (Path i : changedClassResults.changedClasses) {
+                        byte[] bytes = Files.readAllBytes(i);
+                        String name = indexer.index(new ByteArrayInputStream(bytes)).name().toString();
+                        defs[index++] = new ClassDefinition(Thread.currentThread().getContextClassLoader().loadClass(name),
+                                classTransformers.apply(name, bytes));
+                    }
+                    Index current = indexer.complete();
+                    boolean ok = instrumentationEnabled()
+                            && !disableInstrumentationForIndexPredicate.test(current);
+                    if (ok) {
+                        for (ClassInfo clazz : current.getKnownClasses()) {
+                            ClassInfo old = lastStartIndex.getClassByName(clazz.name());
+                            if (!ClassComparisonUtil.isSameStructure(clazz, old)
+                                    || disableInstrumentationForClassPredicate.test(clazz)) {
+                                ok = false;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (ok) {
+                        log.info("Application restart not required, replacing classes via instrumentation");
+                        ClassChangeAgent.getInstrumentation().redefineClasses(defs);
+                        instrumentationChange = true;
+                    }
+                } catch (Exception e) {
+                    log.error("Failed to replace classes via instrumentation", e);
+                    instrumentationChange = false;
+                }
+            }
+        }
+
         //if there is a deployment problem we always restart on scan
         //this is because we can't setup the config file watches
         //in an ideal world we would just check every resource file for changes, however as everything is already
         //all broken we just assume the reason that they have refreshed is because they have fixed something
         //trying to watch all resource files is complex and this is likely a good enough solution for what is already an edge case
-        boolean restartNeeded = classChanged || (IsolatedDevModeMain.deploymentProblem != null && userInitiated);
-        if (!restartNeeded && !filesChanged.isEmpty()) {
-            restartNeeded = filesChanged.stream().map(watchedFilePaths::get).anyMatch(Boolean.TRUE::equals);
-        }
+        boolean restartNeeded = !instrumentationChange && (changedClassResults.isChanged()
+                || (IsolatedDevModeMain.deploymentProblem != null && userInitiated) || configFileRestartNeeded);
         if (restartNeeded) {
-            restartCallback.accept(filesChanged);
+            restartCallback.accept(filesChanged, changedClassResults);
             log.infof("Hot replace total time: %ss ", Timing.convertToBigDecimalSeconds(System.nanoTime() - startNanoseconds));
             return true;
         } else if (!filesChanged.isEmpty()) {
@@ -193,10 +264,24 @@ public boolean doScan(boolean userInitiated) throws IOException {
             }
             log.infof("Files changed but restart not needed - notified extensions in: %ss ",
                     Timing.convertToBigDecimalSeconds(System.nanoTime() - startNanoseconds));
+        } else if (instrumentationChange) {
+            log.infof("Hot replace performed via instrumentation, no restart needed, total time: %ss ",
+                    Timing.convertToBigDecimalSeconds(System.nanoTime() - startNanoseconds));
         }
         return false;
     }
 
+    private Boolean instrumentationEnabled() {
+        ClassLoader old = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+            return ConfigProvider.getConfig()
+                    .getOptionalValue("quarkus.live-reload.instrumentation", boolean.class).orElse(true);
+        } finally {
+            Thread.currentThread().setContextClassLoader(old);
+        }
+    }
+
     @Override
     public void addPreScanStep(Runnable runnable) {
         preScanSteps.add(runnable);
@@ -237,8 +322,8 @@ public Set<String> syncState(Map<String, String> fileHashes) {
         }
     }
 
-    boolean checkForChangedClasses() throws IOException {
-        boolean hasChanges = false;
+    ClassScanResult checkForChangedClasses() throws IOException {
+        ClassScanResult classScanResult = new ClassScanResult();
         boolean ignoreFirstScanChanges = !firstScanDone;
 
         for (DevModeContext.ModuleInfo module : context.getAllModules()) {
@@ -271,31 +356,27 @@ && sourceFileWasRecentModified(p, ignoreFirstScanChanges))
                         compileProblem = null;
                     } catch (Exception e) {
                         compileProblem = e;
-                        return false;
+                        return new ClassScanResult();
                     }
                 }
 
             }
 
-            if (checkForClassFilesChangesInModule(module, moduleChangedSourceFilePaths, ignoreFirstScanChanges)) {
-                hasChanges = true;
-            }
+            checkForClassFilesChangesInModule(module, moduleChangedSourceFilePaths, ignoreFirstScanChanges, classScanResult);
         }
 
         this.firstScanDone = true;
-        return hasChanges;
+        return classScanResult;
     }
 
     public Throwable getCompileProblem() {
         return compileProblem;
     }
 
-    private boolean checkForClassFilesChangesInModule(DevModeContext.ModuleInfo module, List<Path> moduleChangedSourceFiles,
-            boolean isInitialRun) {
-        boolean hasChanges = !moduleChangedSourceFiles.isEmpty();
-
+    private void checkForClassFilesChangesInModule(DevModeContext.ModuleInfo module, List<Path> moduleChangedSourceFiles,
+            boolean isInitialRun, ClassScanResult classScanResult) {
         if (module.getClassesPath() == null) {
-            return hasChanges;
+            return;
         }
 
         try {
@@ -319,21 +400,26 @@ private boolean checkForClassFilesChangesInModule(DevModeContext.ModuleInfo modu
                                 // Source file has been deleted. Delete class and restart
                                 cleanUpClassFile(classFilePath);
                                 sourceFileTimestamps.remove(sourceFilePath);
-                                hasChanges = true;
+                                classScanResult.addDeletedClass(moduleClassesPath, classFilePath);
                             } else {
                                 classFilePathToSourceFilePath.put(classFilePath, sourceFilePath);
-                                if (classFileWasRecentModified(classFilePath, isInitialRun)) {
+                                if (classFileWasAdded(classFilePath, isInitialRun)) {
+                                    // At least one class was recently modified. Restart.
+                                    classScanResult.addAddedClass(moduleClassesPath, classFilePath);
+                                } else if (classFileWasRecentModified(classFilePath, isInitialRun)) {
                                     // At least one class was recently modified. Restart.
-                                    hasChanges = true;
+                                    classScanResult.addChangedClass(moduleClassesPath, classFilePath);
                                 } else if (moduleChangedSourceFiles.contains(sourceFilePath)) {
-                                    // Source file has been modified, we delete the .class files as they are going to
-                                    // be recompiled anyway, this allows for simple cleanup of inner classes
+                                    // Source file has been modified, but not the class file
+                                    // must be a removed inner class
                                     cleanUpClassFile(classFilePath);
-                                    hasChanges = true;
+                                    classScanResult.addDeletedClass(moduleClassesPath, classFilePath);
                                 }
                             }
+                        } else if (classFileWasAdded(classFilePath, isInitialRun)) {
+                            classScanResult.addAddedClass(moduleClassesPath, classFilePath);
                         } else if (classFileWasRecentModified(classFilePath, isInitialRun)) {
-                            hasChanges = true;
+                            classScanResult.addChangedClass(moduleClassesPath, classFilePath);
                         }
                     }
                 }
@@ -341,8 +427,6 @@ private boolean checkForClassFilesChangesInModule(DevModeContext.ModuleInfo modu
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-
-        return hasChanges;
     }
 
     private Path retrieveSourceFilePathForClassFile(Path classFilePath, List<Path> moduleChangedSourceFiles,
@@ -386,7 +470,7 @@ Set<String> checkForFileChange() {
                 outputPath = rootPath;
                 doCopy = false;
             }
-            if (rootPath == null) {
+            if (rootPath == null || outputPath == null) {
                 continue;
             }
             Path root = Paths.get(rootPath);
@@ -484,6 +568,18 @@ private boolean classFileWasRecentModified(final Path classFilePath, boolean ign
         return checkIfFileModified(classFilePath, classFileChangeTimeStamps, ignoreFirstScanChanges);
     }
 
+    private boolean classFileWasAdded(final Path classFilePath, boolean ignoreFirstScanChanges) {
+        final Long lastRecordedChange = classFileChangeTimeStamps.get(classFilePath);
+        if (lastRecordedChange == null) {
+            try {
+                classFileChangeTimeStamps.put(classFilePath, Files.getLastModifiedTime(classFilePath).toMillis());
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+        return lastRecordedChange == null && !ignoreFirstScanChanges;
+    }
+
     private boolean checkIfFileModified(Path path, Map<Path, Long> pathModificationTimes, boolean ignoreFirstScanChanges) {
         try {
             final long lastModificationTime = Files.getLastModifiedTime(path).toMillis();
@@ -505,6 +601,18 @@ private boolean checkIfFileModified(Path path, Map<Path, Long> pathModificationT
         }
     }
 
+    public RuntimeUpdatesProcessor setDisableInstrumentationForClassPredicate(
+            Predicate<ClassInfo> disableInstrumentationForClassPredicate) {
+        this.disableInstrumentationForClassPredicate = disableInstrumentationForClassPredicate;
+        return this;
+    }
+
+    public RuntimeUpdatesProcessor setDisableInstrumentationForIndexPredicate(
+            Predicate<Index> disableInstrumentationForIndexPredicate) {
+        this.disableInstrumentationForIndexPredicate = disableInstrumentationForIndexPredicate;
+        return this;
+    }
+
     public RuntimeUpdatesProcessor setWatchedFilePaths(Map<String, Boolean> watchedFilePaths) {
         this.watchedFilePaths = watchedFilePaths;
         watchedFileTimestamps.clear();
@@ -544,6 +652,12 @@ public void startupFailed() {
         for (HotReplacementSetup i : hotReplacementSetup) {
             i.handleFailedInitialStart();
         }
+        //if startup failed we always do a class loader based restart
+        lastStartIndex = null;
+    }
+
+    public static void setLastStartIndex(IndexView lastStartIndex) {
+        RuntimeUpdatesProcessor.lastStartIndex = lastStartIndex;
     }
 
     @Override
@@ -551,4 +665,5 @@ public void close() throws IOException {
         compiler.close();
         FSWatchUtil.shutdown();
     }
+
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/EffectiveIdeBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/EffectiveIdeBuildItem.java
new file mode 100644
index 0000000000000..d156b5222ed82
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/EffectiveIdeBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.deployment.ide;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Contains the IDE to be opened when a request to open a class is made
+ */
+public final class EffectiveIdeBuildItem extends SimpleBuildItem {
+
+    private final Ide ide;
+
+    public EffectiveIdeBuildItem(Ide ide) {
+        this.ide = ide;
+    }
+
+    public Ide getIde() {
+        return ide;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java
new file mode 100644
index 0000000000000..e64c591d39da8
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java
@@ -0,0 +1,23 @@
+package io.quarkus.deployment.ide;
+
+public enum Ide {
+
+    IDEA("idea"),
+    ECLIPSE("eclipse"),
+    VSCODE("code"),
+    NETBEANS("netbeans");
+
+    private String executable;
+
+    private Ide(String executable) {
+        this.executable = executable;
+    }
+
+    public String getExecutable() {
+        return executable;
+    }
+
+    public void setExecutable(String executable) {
+        this.executable = executable;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeConfig.java
new file mode 100644
index 0000000000000..4bbc0aa105d52
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeConfig.java
@@ -0,0 +1,23 @@
+package io.quarkus.deployment.ide;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot
+public class IdeConfig {
+
+    /**
+     * The Ide to use to open files from the DevUI.
+     * {@code auto} means that Quarkus will attempt to determine the Ide being used.
+     */
+    @ConfigItem(defaultValue = "auto")
+    public Target target;
+
+    enum Target {
+        auto,
+        idea,
+        vscode,
+        eclipse,
+        netbeans
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeFileBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeFileBuildItem.java
new file mode 100644
index 0000000000000..ad2a226d1a9c2
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeFileBuildItem.java
@@ -0,0 +1,22 @@
+package io.quarkus.deployment.ide;
+
+import java.util.Set;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Contains the set of IDEs that could be potentially linked to project based
+ * on the files present in the project
+ */
+final class IdeFileBuildItem extends SimpleBuildItem {
+
+    private final Set<Ide> detectedIDEs;
+
+    IdeFileBuildItem(Set<Ide> detectedIDEs) {
+        this.detectedIDEs = detectedIDEs;
+    }
+
+    Set<Ide> getDetectedIDEs() {
+        return detectedIDEs;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeProcessor.java
new file mode 100644
index 0000000000000..aedf997e0e3c7
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeProcessor.java
@@ -0,0 +1,249 @@
+package io.quarkus.deployment.ide;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
+import io.quarkus.dev.spi.DevModeType;
+import io.quarkus.runtime.util.JavaVersionUtil;
+
+public class IdeProcessor {
+
+    private static Map<String, List<Ide>> IDE_MARKER_FILES = new HashMap<>();
+    private static Map<Predicate<ProcessInfo>, Ide> IDE_PROCESSES = new HashMap<>();
+    private static Map<Ide, Function<ProcessInfo, String>> IDE_ARGUMENTS_EXEC_INDICATOR = new HashMap<>();
+
+    static {
+        IDE_MARKER_FILES.put(".idea", Collections.singletonList(Ide.IDEA));
+        IDE_MARKER_FILES.put(".project", Arrays.asList(Ide.VSCODE, Ide.ECLIPSE));
+        IDE_MARKER_FILES.put("nbactions.xml", Collections.singletonList(Ide.NETBEANS));
+        IDE_MARKER_FILES.put("nb-configuration.xml", Collections.singletonList(Ide.NETBEANS));
+
+        IDE_MARKER_FILES = Collections.unmodifiableMap(IDE_MARKER_FILES);
+
+        IDE_PROCESSES.put((processInfo -> processInfo.containInCommand("idea")), Ide.IDEA);
+        IDE_PROCESSES.put((processInfo -> processInfo.containInCommand("code")), Ide.VSCODE);
+        IDE_PROCESSES.put((processInfo -> processInfo.containInCommand("eclipse")), Ide.ECLIPSE);
+        IDE_PROCESSES.put(
+                (processInfo -> processInfo.containInCommandWithArgument("java", "netbeans")),
+                Ide.NETBEANS);
+
+        IDE_ARGUMENTS_EXEC_INDICATOR.put(Ide.NETBEANS, (ProcessInfo processInfo) -> {
+            String platform = processInfo.getArgumentValue("-Dnetbeans.home");
+            if (platform != null && !platform.isEmpty()) {
+                String os = System.getProperty("os.name");
+                if (os.startsWith("Windows") || os.startsWith("windows")) {
+                    platform = platform.replace("platform", "bin/netbeans.exe");
+                } else {
+                    platform = platform.replace("platform", "bin/netbeans");
+                }
+                return platform;
+            }
+            return null;
+        });
+
+        IDE_PROCESSES = Collections.unmodifiableMap(IDE_PROCESSES);
+    }
+
+    @BuildStep
+    public EffectiveIdeBuildItem effectiveIde(LaunchModeBuildItem launchModeBuildItem, IdeConfig ideConfig,
+            IdeFileBuildItem ideFile,
+            IdeRunningProcessBuildItem ideRunningProcess) {
+        if (launchModeBuildItem.getDevModeType().orElse(null) != DevModeType.LOCAL) {
+            return null;
+        }
+        Ide result = null;
+        if (ideConfig.target == IdeConfig.Target.auto) {
+
+            // the idea here is to auto-detect the special files that IDEs create
+            // and also the running IDE process if need be
+
+            if (ideFile.getDetectedIDEs().size() == 1) {
+                result = ideFile.getDetectedIDEs().iterator().next();
+            } else {
+                Set<Ide> runningIdes = ideRunningProcess.getDetectedIDEs();
+                if (runningIdes.size() == 1) {
+                    result = runningIdes.iterator().next();
+                } else {
+                    List<Ide> matches = new ArrayList<>();
+                    for (Ide file : ideFile.getDetectedIDEs()) {
+                        for (Ide process : runningIdes) {
+                            if (file == process) {
+                                matches.add(file);
+                            }
+                        }
+                    }
+                    if (matches.size() == 1) {
+                        result = matches.get(0);
+                    }
+                }
+            }
+        } else {
+            if (ideConfig.target == IdeConfig.Target.idea) {
+                result = Ide.IDEA;
+            } else if (ideConfig.target == IdeConfig.Target.eclipse) {
+                result = Ide.ECLIPSE;
+            } else if (ideConfig.target == IdeConfig.Target.vscode) {
+                result = Ide.VSCODE;
+            } else if (ideConfig.target == IdeConfig.Target.netbeans) {
+                result = Ide.NETBEANS;
+            }
+        }
+
+        if (result == null) {
+            return null;
+        }
+
+        return new EffectiveIdeBuildItem(result);
+    }
+
+    @BuildStep
+    public IdeFileBuildItem detectIdeFiles(LaunchModeBuildItem launchModeBuildItem,
+            BuildSystemTargetBuildItem buildSystemTarget) {
+        if (launchModeBuildItem.getDevModeType().orElse(null) != DevModeType.LOCAL) {
+            return null;
+        }
+        Set<Ide> result = new HashSet<>(2);
+        Path projectRoot = buildSystemTarget.getOutputDirectory().getParent();
+        IDE_MARKER_FILES.forEach((file, ides) -> {
+            if (Files.exists(projectRoot.resolve(file))) {
+                result.addAll(ides);
+            }
+        });
+        return new IdeFileBuildItem(result);
+    }
+
+    @BuildStep
+    public IdeRunningProcessBuildItem detectRunningIdeProcesses(LaunchModeBuildItem launchModeBuildItem) {
+        if (launchModeBuildItem.getDevModeType().orElse(null) != DevModeType.LOCAL) {
+            return null;
+        }
+        Set<Ide> result = new HashSet<>(4);
+        List<ProcessInfo> processInfos = ProcessUtil.runningProcesses();
+        for (ProcessInfo processInfo : processInfos) {
+            for (Map.Entry<Predicate<ProcessInfo>, Ide> entry : IDE_PROCESSES.entrySet()) {
+                if (entry.getKey().test(processInfo)) {
+                    Ide ide = entry.getValue();
+
+                    if (IDE_ARGUMENTS_EXEC_INDICATOR.containsKey(ide)) {
+                        Function<ProcessInfo, String> execIndicator = IDE_ARGUMENTS_EXEC_INDICATOR.get(ide);
+                        String executeLine = execIndicator.apply(processInfo);
+                        if (executeLine != null) {
+                            ide.setExecutable(executeLine);
+                        }
+                    }
+                    result.add(ide);
+                    break;
+                }
+            }
+        }
+        return new IdeRunningProcessBuildItem(result);
+    }
+
+    // TODO: remove when we move to Java 11 and just call the methods of 'java.lang.ProcessHandle'
+    private static class ProcessUtil {
+
+        /**
+         * Returns a list of running processes
+         * Only works for Java 11+
+         */
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        public static List<ProcessInfo> runningProcesses() {
+            if (!JavaVersionUtil.isJava11OrHigher()) {
+                return Collections.emptyList();
+            }
+            // we can't use ProcessHandle directly as it is Java 9+, so we need to do reflection to the get the info we need
+            try {
+                Class processHandlerClass = Class.forName("java.lang.ProcessHandle");
+                Method allProcessesMethod = processHandlerClass.getMethod("allProcesses");
+                Method processHandleInfoMethod = processHandlerClass.getMethod("info");
+                Class processHandleInfoClass = Class.forName("java.lang.ProcessHandle$Info");
+                Method processHandleInfoCommandMethod = processHandleInfoClass.getMethod("command");
+                Method processHandleInfoArgumentsMethod = processHandleInfoClass.getMethod("arguments");
+                Stream<Object> allProcessesResult = (Stream<Object>) allProcessesMethod.invoke(null);
+                List<ProcessInfo> result = new ArrayList<>();
+                allProcessesResult.forEach(o -> {
+                    try {
+                        Object processHandleInfo = processHandleInfoMethod.invoke(o);
+                        Optional<String> command = (Optional<String>) processHandleInfoCommandMethod.invoke(processHandleInfo);
+                        if (command.isPresent()) {
+                            Optional<String[]> arguments = (Optional<String[]>) processHandleInfoArgumentsMethod
+                                    .invoke(processHandleInfo);
+                            result.add(new ProcessInfo(command.get(), arguments.orElse(null)));
+                        }
+                    } catch (IllegalAccessException | InvocationTargetException e) {
+                        throw new RuntimeException(e);
+                    }
+                });
+                return result;
+            } catch (Exception e) {
+                throw new RuntimeException("Unable to determine running processes", e);
+            }
+        }
+    }
+
+    private static class ProcessInfo {
+        // the executable pathname of the process.
+        private final String command;
+        private final String[] arguments;
+
+        public ProcessInfo(String command, String[] arguments) {
+            this.command = command;
+            this.arguments = arguments;
+        }
+
+        public String getCommand() {
+            return command;
+        }
+
+        public String[] getArguments() {
+            return arguments;
+        }
+
+        public boolean containInCommandWithArgument(String command, String argument) {
+            return containInCommand(command) && containInArguments(argument);
+        }
+
+        public boolean containInCommand(String value) {
+            return this.command.contains(value);
+        }
+
+        public boolean containInArguments(String value) {
+            if (arguments != null) {
+                for (String argument : arguments) {
+                    if (argument.contains(value)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        public String getArgumentValue(String argumentKey) {
+            if (arguments != null) {
+                for (String argument : arguments) {
+                    if (argument.startsWith(argumentKey) && argument.contains("=")) {
+                        return argument.substring(argument.indexOf("=") + 1);
+                    }
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeRunningProcessBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeRunningProcessBuildItem.java
new file mode 100644
index 0000000000000..83f74169d54e9
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeRunningProcessBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.deployment.ide;
+
+import java.util.Set;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Contains the set of IDEs that are running as processes
+ */
+final class IdeRunningProcessBuildItem extends SimpleBuildItem {
+
+    private final Set<Ide> detectedIDEs;
+
+    IdeRunningProcessBuildItem(Set<Ide> detectedIDEs) {
+        this.detectedIDEs = detectedIDEs;
+    }
+
+    Set<Ide> getDetectedIDEs() {
+        return detectedIDEs;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java
index c92197804a9e8..4154dd75786cf 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/index/ApplicationArchiveBuildStep.java
@@ -2,28 +2,22 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.ProviderNotFoundException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 import java.util.stream.Stream;
-import java.util.zip.ZipEntry;
 
 import org.jboss.jandex.CompositeIndex;
 import org.jboss.jandex.Index;
-import org.jboss.jandex.IndexReader;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
 import org.jboss.logging.Logger;
@@ -45,6 +39,8 @@
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.QuarkusBuildCloseablesBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -53,20 +49,18 @@ public class ApplicationArchiveBuildStep {
 
     private static final Logger LOGGER = Logger.getLogger(ApplicationArchiveBuildStep.class);
 
-    private static final String JANDEX_INDEX = "META-INF/jandex.idx";
-
-    // At least Jandex 2.1 is needed
-    private static final int REQUIRED_INDEX_VERSION = 8;
-
     IndexDependencyConfiguration config;
 
     @ConfigRoot(phase = ConfigPhase.BUILD_TIME)
     static final class IndexDependencyConfiguration {
         /**
-         * Artifacts on the class path that should also be indexed, which will allow classes in the index to be
-         * processed by Quarkus processors
+         * Artifacts on the classpath that should also be indexed.
+         * <p>
+         * Their classes will be in the index and processed by Quarkus processors.
          */
         @ConfigItem(name = ConfigItem.PARENT)
+        @ConfigDocSection
+        @ConfigDocMapKey("dependency-name")
         Map<String, IndexDependencyConfig> indexDependency;
     }
 
@@ -120,7 +114,7 @@ private List<ApplicationArchive> scanForOtherIndexes(QuarkusBuildCloseablesBuild
 
         //get paths that are included via marker files
         Set<String> markers = new HashSet<>(applicationArchiveFiles);
-        markers.add(JANDEX_INDEX);
+        markers.add(IndexingUtil.JANDEX_INDEX);
         addMarkerFilePaths(markers, root, curateOutcomeBuildItem, indexedPaths, appArchives, buildCloseables, classLoader,
                 indexCache);
 
@@ -247,18 +241,6 @@ private static boolean containsMarker(Path dir, Set<String> applicationArchiveFi
     }
 
     private static Index handleFilePath(Path path) throws IOException {
-        Path existing = path.resolve(JANDEX_INDEX);
-        if (Files.exists(existing)) {
-            try (FileInputStream in = new FileInputStream(existing.toFile())) {
-                IndexReader reader = new IndexReader(in);
-                if (reader.getIndexVersion() < REQUIRED_INDEX_VERSION) {
-                    LOGGER.warnf("Re-indexing %s - at least Jandex 2.1 must be used to index an application dependency", path);
-                    return indexFilePath(path);
-                } else {
-                    return reader.read();
-                }
-            }
-        }
         return indexFilePath(path);
     }
 
@@ -278,26 +260,12 @@ private static Index indexFilePath(Path path) throws IOException {
         return indexer.complete();
     }
 
-    private static Index handleJarPath(Path path, IndexCache indexCache) throws IOException {
+    private static Index handleJarPath(Path path, IndexCache indexCache) {
         return indexCache.cache.computeIfAbsent(path, new Function<Path, Index>() {
             @Override
             public Index apply(Path path) {
-                try (JarFile file = new JarFile(path.toFile())) {
-                    ZipEntry existing = file.getEntry(JANDEX_INDEX);
-                    if (existing != null) {
-                        try (InputStream in = file.getInputStream(existing)) {
-                            IndexReader reader = new IndexReader(in);
-                            if (reader.getIndexVersion() < REQUIRED_INDEX_VERSION) {
-                                LOGGER.warnf(
-                                        "Re-indexing %s - at least Jandex 2.1 must be used to index an application dependency",
-                                        path);
-                                return indexJar(file);
-                            } else {
-                                return reader.read();
-                            }
-                        }
-                    }
-                    return indexJar(file);
+                try {
+                    return IndexingUtil.indexJar(path);
                 } catch (IOException e) {
                     throw new RuntimeException("Failed to process " + path, e);
                 }
@@ -305,20 +273,6 @@ public Index apply(Path path) {
         });
     }
 
-    private static Index indexJar(JarFile file) throws IOException {
-        Indexer indexer = new Indexer();
-        Enumeration<JarEntry> e = file.entries();
-        while (e.hasMoreElements()) {
-            JarEntry entry = e.nextElement();
-            if (entry.getName().endsWith(".class")) {
-                try (InputStream inputStream = file.getInputStream(entry)) {
-                    indexer.index(inputStream);
-                }
-            }
-        }
-        return indexer.complete();
-    }
-
     /**
      * When running in hot deployment mode we know that java archives will never change, there is no need
      * to re-index them each time. We cache them here to reduce the hot reload time.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexDependencyConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexDependencyConfig.java
index 6b00626499354..bc9de09855d18 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexDependencyConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexDependencyConfig.java
@@ -9,19 +9,19 @@
 public class IndexDependencyConfig {
 
     /**
-     * The maven groupId of the artifact to index
+     * The maven groupId of the artifact.
      */
     @ConfigItem
     public String groupId;
 
     /**
-     * The maven artifactId of the artifact to index
+     * The maven artifactId of the artifact.
      */
     @ConfigItem
     public String artifactId;
 
     /**
-     * The maven classifier of the artifact to index
+     * The maven classifier of the artifact.
      */
     @ConfigItem
     public Optional<String> classifier;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java
new file mode 100644
index 0000000000000..05a7ca734d7bb
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java
@@ -0,0 +1,216 @@
+package io.quarkus.deployment.index;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
+import org.jboss.jandex.Type;
+import org.jboss.logging.Logger;
+
+import io.quarkus.deployment.steps.CombinedIndexBuildStep;
+
+/**
+ * This wrapper is used to index JDK classes on demand.
+ */
+public class IndexWrapper implements IndexView {
+
+    private static final Logger LOGGER = Logger.getLogger(CombinedIndexBuildStep.class);
+
+    private final IndexView index;
+    private final ClassLoader deploymentClassLoader;
+    final Map<DotName, Optional<ClassInfo>> additionalClasses;
+
+    public IndexWrapper(IndexView index, ClassLoader deploymentClassLoader, PersistentClassIndex persistentClassIndex) {
+        this.index = index;
+        this.deploymentClassLoader = deploymentClassLoader;
+        this.additionalClasses = persistentClassIndex.additionalClasses;
+    }
+
+    @Override
+    public Collection<ClassInfo> getKnownClasses() {
+        if (additionalClasses.isEmpty()) {
+            return index.getKnownClasses();
+        }
+        Collection<ClassInfo> known = index.getKnownClasses();
+        Collection<ClassInfo> additional = additionalClasses.values().stream().filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(Collectors.toList());
+        List<ClassInfo> all = new ArrayList<>(known.size() + additional.size());
+        all.addAll(known);
+        all.addAll(additional);
+        return all;
+    }
+
+    @Override
+    public ClassInfo getClassByName(DotName className) {
+        ClassInfo classInfo = index.getClassByName(className);
+        if (classInfo == null) {
+            classInfo = additionalClasses.computeIfAbsent(className, this::computeAdditional).orElse(null);
+        }
+        return classInfo;
+    }
+
+    @Override
+    public Collection<ClassInfo> getKnownDirectSubclasses(DotName className) {
+        if (additionalClasses.isEmpty()) {
+            return index.getKnownDirectSubclasses(className);
+        }
+        Set<ClassInfo> directSubclasses = new HashSet<ClassInfo>(index.getKnownDirectSubclasses(className));
+        for (Optional<ClassInfo> additional : additionalClasses.values()) {
+            if (additional.isPresent() && className.equals(additional.get().superName())) {
+                directSubclasses.add(additional.get());
+            }
+        }
+        return directSubclasses;
+    }
+
+    @Override
+    public Collection<ClassInfo> getAllKnownSubclasses(DotName className) {
+        if (additionalClasses.isEmpty()) {
+            return index.getAllKnownSubclasses(className);
+        }
+        final Set<ClassInfo> allKnown = new HashSet<ClassInfo>();
+        final Set<DotName> processedClasses = new HashSet<DotName>();
+        getAllKnownSubClasses(className, allKnown, processedClasses);
+        return allKnown;
+    }
+
+    @Override
+    public Collection<ClassInfo> getKnownDirectImplementors(DotName className) {
+        if (additionalClasses.isEmpty()) {
+            return index.getKnownDirectImplementors(className);
+        }
+        Set<ClassInfo> directImplementors = new HashSet<ClassInfo>(index.getKnownDirectImplementors(className));
+        for (Optional<ClassInfo> additional : additionalClasses.values()) {
+            if (!additional.isPresent()) {
+                continue;
+            }
+            for (Type interfaceType : additional.get().interfaceTypes()) {
+                if (className.equals(interfaceType.name())) {
+                    directImplementors.add(additional.get());
+                    break;
+                }
+            }
+        }
+        return directImplementors;
+    }
+
+    @Override
+    public Collection<ClassInfo> getAllKnownImplementors(DotName interfaceName) {
+        if (additionalClasses.isEmpty()) {
+            return index.getAllKnownImplementors(interfaceName);
+        }
+        final Set<ClassInfo> allKnown = new HashSet<ClassInfo>();
+        final Set<DotName> subInterfacesToProcess = new HashSet<DotName>();
+        final Set<DotName> processedClasses = new HashSet<DotName>();
+        subInterfacesToProcess.add(interfaceName);
+        while (!subInterfacesToProcess.isEmpty()) {
+            final Iterator<DotName> toProcess = subInterfacesToProcess.iterator();
+            DotName name = toProcess.next();
+            toProcess.remove();
+            processedClasses.add(name);
+            getKnownImplementors(name, allKnown, subInterfacesToProcess, processedClasses);
+        }
+        return allKnown;
+    }
+
+    @Override
+    public Collection<AnnotationInstance> getAnnotations(DotName annotationName) {
+        return index.getAnnotations(annotationName);
+    }
+
+    @Override
+    public Collection<AnnotationInstance> getAnnotationsWithRepeatable(DotName annotationName, IndexView index) {
+        return this.index.getAnnotationsWithRepeatable(annotationName, index);
+    }
+
+    private void getAllKnownSubClasses(DotName className, Set<ClassInfo> allKnown, Set<DotName> processedClasses) {
+        final Set<DotName> subClassesToProcess = new HashSet<DotName>();
+        subClassesToProcess.add(className);
+        while (!subClassesToProcess.isEmpty()) {
+            final Iterator<DotName> toProcess = subClassesToProcess.iterator();
+            DotName name = toProcess.next();
+            toProcess.remove();
+            processedClasses.add(name);
+            getAllKnownSubClasses(name, allKnown, subClassesToProcess, processedClasses);
+        }
+    }
+
+    private void getAllKnownSubClasses(DotName name, Set<ClassInfo> allKnown, Set<DotName> subClassesToProcess,
+            Set<DotName> processedClasses) {
+        final Collection<ClassInfo> directSubclasses = getKnownDirectSubclasses(name);
+        if (directSubclasses != null) {
+            for (final ClassInfo clazz : directSubclasses) {
+                final DotName className = clazz.name();
+                if (!processedClasses.contains(className)) {
+                    allKnown.add(clazz);
+                    subClassesToProcess.add(className);
+                }
+            }
+        }
+    }
+
+    private void getKnownImplementors(DotName name, Set<ClassInfo> allKnown, Set<DotName> subInterfacesToProcess,
+            Set<DotName> processedClasses) {
+        final Collection<ClassInfo> list = getKnownDirectImplementors(name);
+        if (list != null) {
+            for (final ClassInfo clazz : list) {
+                final DotName className = clazz.name();
+                if (!processedClasses.contains(className)) {
+                    if (Modifier.isInterface(clazz.flags())) {
+                        subInterfacesToProcess.add(className);
+                    } else {
+                        if (!allKnown.contains(clazz)) {
+                            allKnown.add(clazz);
+                            processedClasses.add(className);
+                            getAllKnownSubClasses(className, allKnown, processedClasses);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private Optional<ClassInfo> computeAdditional(DotName className) {
+        LOGGER.debugf("Index: %s", className);
+        Indexer indexer = new Indexer();
+        if (index(indexer, className.toString(), deploymentClassLoader)) {
+            Index index = indexer.complete();
+            return Optional.of(index.getClassByName(className));
+        } else {
+            // Note that ConcurrentHashMap does not allow null to be used as a value
+            return Optional.empty();
+        }
+    }
+
+    static boolean index(Indexer indexer, String className, ClassLoader classLoader) {
+        boolean result = false;
+        try (InputStream stream = classLoader
+                .getResourceAsStream(className.replace('.', '/') + ".class")) {
+            if (stream != null) {
+                indexer.index(stream);
+                result = true;
+            } else {
+                LOGGER.warnf("Failed to index %s: Class does not exist in ClassLoader %s", className, classLoader);
+            }
+        } catch (IOException e) {
+            LOGGER.warnf(e, "Failed to index %s: %s", className, e.getMessage());
+        }
+        return result;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java
index 832382496ef45..c092032e2ff7d 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java
@@ -1,12 +1,20 @@
 package io.quarkus.deployment.index;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.Enumeration;
 import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
 
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.IndexReader;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
 import org.jboss.logging.Logger;
@@ -19,6 +27,49 @@ public class IndexingUtil {
 
     public static final DotName OBJECT = DotName.createSimple(Object.class.getName());
 
+    public static final String JANDEX_INDEX = "META-INF/jandex.idx";
+
+    // At least Jandex 2.1 is needed
+    private static final int REQUIRED_INDEX_VERSION = 8;
+
+    public static Index indexJar(Path path) throws IOException {
+        return indexJar(path.toFile());
+    }
+
+    public static Index indexJar(File file) throws IOException {
+        try (JarFile jarFile = new JarFile(file)) {
+            ZipEntry existing = jarFile.getEntry(JANDEX_INDEX);
+            if (existing != null) {
+                try (InputStream in = jarFile.getInputStream(existing)) {
+                    IndexReader reader = new IndexReader(in);
+                    if (reader.getIndexVersion() < REQUIRED_INDEX_VERSION) {
+                        log.warnf(
+                                "Re-indexing %s - at least Jandex 2.1 must be used to index an application dependency",
+                                file);
+                        return indexJar(jarFile);
+                    } else {
+                        return reader.read();
+                    }
+                }
+            }
+            return indexJar(jarFile);
+        }
+    }
+
+    private static Index indexJar(JarFile file) throws IOException {
+        Indexer indexer = new Indexer();
+        Enumeration<JarEntry> e = file.entries();
+        while (e.hasMoreElements()) {
+            JarEntry entry = e.nextElement();
+            if (entry.getName().endsWith(".class")) {
+                try (InputStream inputStream = file.getInputStream(entry)) {
+                    indexer.index(inputStream);
+                }
+            }
+        }
+        return indexer.complete();
+    }
+
     public static void indexClass(String beanClass, Indexer indexer, IndexView quarkusIndex,
             Set<DotName> additionalIndex, ClassLoader classLoader) {
         DotName beanClassName = DotName.createSimple(beanClass);
@@ -31,7 +82,7 @@ public static void indexClass(String beanClass, Indexer indexer, IndexView quark
             try (InputStream stream = IoUtil.readClass(classLoader, beanClass)) {
                 beanInfo = indexer.index(stream);
                 additionalIndex.add(beanInfo.name());
-            } catch (IOException e) {
+            } catch (Exception e) {
                 throw new IllegalStateException("Failed to index: " + beanClass, e);
             }
         } else {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/index/PersistentClassIndex.java b/core/deployment/src/main/java/io/quarkus/deployment/index/PersistentClassIndex.java
new file mode 100644
index 0000000000000..d7097699a9222
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/index/PersistentClassIndex.java
@@ -0,0 +1,17 @@
+package io.quarkus.deployment.index;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+public class PersistentClassIndex {
+
+    final Map<DotName, Optional<ClassInfo>> additionalClasses = new ConcurrentHashMap<>();
+
+    public Map<DotName, Optional<ClassInfo>> getAdditionalClasses() {
+        return additionalClasses;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java
new file mode 100644
index 0000000000000..5f3632e14a8d6
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java
@@ -0,0 +1,161 @@
+package io.quarkus.deployment.jbang;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+import io.quarkus.bootstrap.BootstrapGradleException;
+import io.quarkus.bootstrap.app.AdditionalDependency;
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.bootstrap.resolver.model.WorkspaceModule;
+import io.quarkus.bootstrap.util.QuarkusModelHelper;
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildResult;
+import io.quarkus.builder.BuildStepBuilder;
+import io.quarkus.deployment.QuarkusAugmentor;
+import io.quarkus.deployment.builditem.ApplicationClassNameBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
+import io.quarkus.deployment.builditem.LiveReloadBuildItem;
+import io.quarkus.deployment.builditem.MainClassBuildItem;
+import io.quarkus.deployment.builditem.TransformedClassesBuildItem;
+import io.quarkus.deployment.dev.DevModeContext;
+import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
+import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabled;
+import io.quarkus.runtime.LaunchMode;
+
+public class JBangAugmentorImpl implements BiConsumer<CuratedApplication, Map<String, Object>> {
+
+    @Override
+    public void accept(CuratedApplication curatedApplication, Map<String, Object> resultMap) {
+
+        QuarkusClassLoader classLoader = curatedApplication.getAugmentClassLoader();
+
+        QuarkusBootstrap quarkusBootstrap = curatedApplication.getQuarkusBootstrap();
+        QuarkusAugmentor.Builder builder = QuarkusAugmentor.builder()
+                .setRoot(quarkusBootstrap.getApplicationRoot())
+                .setClassLoader(classLoader)
+                .addFinal(ApplicationClassNameBuildItem.class)
+                .setTargetDir(quarkusBootstrap.getTargetDirectory())
+                .setDeploymentClassLoader(curatedApplication.createDeploymentClassLoader())
+                .setBuildSystemProperties(quarkusBootstrap.getBuildSystemProperties())
+                .setEffectiveModel(curatedApplication.getAppModel());
+        if (quarkusBootstrap.getBaseName() != null) {
+            builder.setBaseName(quarkusBootstrap.getBaseName());
+        }
+
+        builder.setLaunchMode(LaunchMode.NORMAL);
+        builder.setRebuild(quarkusBootstrap.isRebuild());
+        builder.setLiveReloadState(
+                new LiveReloadBuildItem(false, Collections.emptySet(), new HashMap<>(), null));
+        for (AdditionalDependency i : quarkusBootstrap.getAdditionalApplicationArchives()) {
+            //this gets added to the class path either way
+            //but we only need to add it to the additional app archives
+            //if it is forced as an app archive
+            if (i.isForceApplicationArchive()) {
+                builder.addAdditionalApplicationArchive(i.getArchivePath());
+            }
+        }
+        builder.addBuildChainCustomizer(new Consumer<BuildChainBuilder>() {
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                final BuildStepBuilder stepBuilder = builder.addBuildStep((ctx) -> {
+                    ctx.produce(new ProcessInheritIODisabled());
+                });
+                stepBuilder.produces(ProcessInheritIODisabled.class).build();
+            }
+        });
+        builder.excludeFromIndexing(quarkusBootstrap.getExcludeFromClassPath());
+        builder.addFinal(GeneratedClassBuildItem.class);
+        builder.addFinal(MainClassBuildItem.class);
+        builder.addFinal(GeneratedResourceBuildItem.class);
+        builder.addFinal(TransformedClassesBuildItem.class);
+        boolean nativeRequested = "native".equals(System.getProperty("quarkus.package.type"));
+        boolean containerBuildRequested = Boolean.getBoolean("quarkus.container-image.build");
+        if (nativeRequested) {
+            builder.addFinal(NativeImageBuildItem.class);
+        }
+        if (containerBuildRequested) {
+            //TODO: this is a bit ugly
+            //we don't nessesarily need these artifacts
+            //but if we include them it does mean that you can auto create docker images
+            //and deploy to kube etc
+            //for an ordinary build with no native and no docker this is a waste
+            builder.addFinal(ArtifactResultBuildItem.class);
+        }
+
+        try {
+            BuildResult buildResult = builder.build().run();
+            Map<String, byte[]> result = new HashMap<>();
+            for (GeneratedClassBuildItem i : buildResult.consumeMulti(GeneratedClassBuildItem.class)) {
+                result.put(i.getName().replace(".", "/") + ".class", i.getClassData());
+            }
+            for (GeneratedResourceBuildItem i : buildResult.consumeMulti(GeneratedResourceBuildItem.class)) {
+                result.put(i.getName(), i.getClassData());
+            }
+            for (Map.Entry<Path, Set<TransformedClassesBuildItem.TransformedClass>> entry : buildResult
+                    .consume(TransformedClassesBuildItem.class).getTransformedClassesByJar().entrySet()) {
+                for (TransformedClassesBuildItem.TransformedClass transformed : entry.getValue()) {
+                    result.put(transformed.getFileName(), transformed.getData());
+                }
+            }
+            resultMap.put("files", result);
+            List javaargs = new ArrayList<String>();
+            javaargs.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
+            resultMap.put("java-args", javaargs);
+            resultMap.put("main-class", buildResult.consume(MainClassBuildItem.class).getClassName());
+            if (nativeRequested) {
+                resultMap.put("native-image", buildResult.consume(NativeImageBuildItem.class).getPath());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private DevModeContext.ModuleInfo toModule(WorkspaceModule module) throws BootstrapGradleException {
+        AppArtifactKey key = new AppArtifactKey(module.getArtifactCoords().getGroupId(),
+                module.getArtifactCoords().getArtifactId(), module.getArtifactCoords().getClassifier());
+
+        Set<String> sourceDirectories = new HashSet<>();
+        Set<String> sourceParents = new HashSet<>();
+        for (File srcDir : module.getSourceSourceSet().getSourceDirectories()) {
+            sourceDirectories.add(srcDir.getPath());
+            sourceParents.add(srcDir.getParent());
+        }
+
+        return new DevModeContext.ModuleInfo(key,
+                module.getArtifactCoords().getArtifactId(),
+                module.getProjectRoot().getPath(),
+                sourceDirectories,
+                QuarkusModelHelper.getClassPath(module).toAbsolutePath().toString(),
+                module.getSourceSourceSet().getResourceDirectory().toString(),
+                module.getSourceSet().getResourceDirectory().getPath(),
+                sourceParents,
+                module.getBuildDir().toPath().resolve("generated-sources").toAbsolutePath().toString(),
+                module.getBuildDir().toString());
+    }
+
+    private DevModeContext.ModuleInfo toModule(LocalProject project) {
+        return new DevModeContext.ModuleInfo(project.getKey(), project.getArtifactId(),
+                project.getDir().toAbsolutePath().toString(),
+                Collections.singleton(project.getSourcesSourcesDir().toAbsolutePath().toString()),
+                project.getClassesDir().toAbsolutePath().toString(),
+                project.getResourcesSourcesDir().toAbsolutePath().toString(),
+                project.getSourcesDir().toString(),
+                project.getCodeGenOutputDir().toString(),
+                project.getOutputDir().toString());
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
index fed4d7e04b1b0..9e7a1c55553dc 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java
@@ -2,20 +2,28 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.logging.Handler;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 import org.jboss.logmanager.EmbeddedConfigurator;
+import org.objectweb.asm.Opcodes;
 
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ConsoleFormatterBannerBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LogCategoryBuildItem;
 import io.quarkus.deployment.builditem.LogConsoleFormatBuildItem;
 import io.quarkus.deployment.builditem.LogHandlerBuildItem;
@@ -25,12 +33,42 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
+import io.quarkus.gizmo.AnnotationCreator;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.configuration.ConfigInstantiator;
+import io.quarkus.runtime.logging.CategoryBuildTimeConfig;
+import io.quarkus.runtime.logging.CleanupFilterConfig;
+import io.quarkus.runtime.logging.InheritableLevel;
+import io.quarkus.runtime.logging.LogBuildTimeConfig;
+import io.quarkus.runtime.logging.LogCleanupFilterElement;
 import io.quarkus.runtime.logging.LogConfig;
+import io.quarkus.runtime.logging.LogMetricsHandlerRecorder;
 import io.quarkus.runtime.logging.LoggingSetupRecorder;
 
 public final class LoggingResourceProcessor {
 
+    private static final String LOGMANAGER_LOGGER_CLASS_NAME = "io.quarkus.runtime.generated.Target_org_jboss_logmanager_Logger";
+    private static final String LOGGING_LOGGER_CLASS_NAME = "io.quarkus.runtime.generated.Target_org_jboss_logging_Logger";
+    private static final String LOGGER_NODE_CLASS_NAME = "io.quarkus.runtime.generated.Target_org_jboss_logmanager_LoggerNode";
+
+    private static final String MIN_LEVEL_COMPUTE_CLASS_NAME = "io.quarkus.runtime.generated.MinLevelCompute";
+    private static final MethodDescriptor IS_MIN_LEVEL_ENABLED = MethodDescriptor.ofMethod(MIN_LEVEL_COMPUTE_CLASS_NAME,
+            "isMinLevelEnabled",
+            boolean.class, int.class, String.class);
+
     @BuildStep
     void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
         filters.produce(new LogCleanupFilterBuildItem("org.jboss.threads", "JBoss Threads version"));
@@ -89,10 +127,12 @@ void miscSetup(
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    LoggingSetupBuildItem setupLoggingRuntimeInit(LoggingSetupRecorder recorder, LogConfig log,
+    LoggingSetupBuildItem setupLoggingRuntimeInit(LoggingSetupRecorder recorder, LogConfig log, LogBuildTimeConfig buildLog,
             List<LogHandlerBuildItem> handlerBuildItems,
             List<NamedLogHandlersBuildItem> namedHandlerBuildItems, List<LogConsoleFormatBuildItem> consoleFormatItems,
-            Optional<ConsoleFormatterBannerBuildItem> possibleBannerBuildItem) {
+            Optional<ConsoleFormatterBannerBuildItem> possibleBannerBuildItem,
+            LaunchModeBuildItem launchModeBuildItem,
+            List<LogCleanupFilterBuildItem> logCleanupFilters) {
         final List<RuntimeValue<Optional<Handler>>> handlers = handlerBuildItems.stream()
                 .map(LogHandlerBuildItem::getHandlerValue)
                 .collect(Collectors.toList());
@@ -107,9 +147,29 @@ LoggingSetupBuildItem setupLoggingRuntimeInit(LoggingSetupRecorder recorder, Log
         if (bannerBuildItem != null) {
             possibleSupplier = bannerBuildItem.getBannerSupplier();
         }
-        recorder.initializeLogging(log, handlers, namedHandlers,
+        recorder.initializeLogging(log, buildLog, handlers, namedHandlers,
                 consoleFormatItems.stream().map(LogConsoleFormatBuildItem::getFormatterValue).collect(Collectors.toList()),
                 possibleSupplier);
+        if (launchModeBuildItem.getLaunchMode() != LaunchMode.NORMAL) {
+            LogConfig logConfig = new LogConfig();
+            ConfigInstantiator.handleObject(logConfig);
+            for (LogCleanupFilterBuildItem i : logCleanupFilters) {
+                CleanupFilterConfig value = new CleanupFilterConfig();
+                LogCleanupFilterElement filterElement = i.getFilterElement();
+                value.ifStartsWith = filterElement.getMessageStarts();
+                value.targetLevel = filterElement.getTargetLevel() == null ? org.jboss.logmanager.Level.DEBUG
+                        : filterElement.getTargetLevel();
+                logConfig.filters.put(filterElement.getLoggerName(), value);
+            }
+            LoggingSetupRecorder.initializeBuildTimeLogging(logConfig, buildLog);
+            ((QuarkusClassLoader) Thread.currentThread().getContextClassLoader()).addCloseTask(new Runnable() {
+                @Override
+                public void run() {
+                    InitialConfigurator.DELAYED_HANDLER.buildTimeComplete();
+                }
+            });
+        }
+
         return new LoggingSetupBuildItem();
     }
 
@@ -124,4 +184,219 @@ void setupLoggingStaticInit(LoggingSetupRecorder recorder) {
     void setUpDarkeningDefault(Consumer<RunTimeConfigurationDefaultBuildItem> rtcConsumer) {
         rtcConsumer.accept(new RunTimeConfigurationDefaultBuildItem("quarkus.log.console.darken", "0"));
     }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void registerMetrics(LogMetricsHandlerRecorder recorder, LogBuildTimeConfig log,
+            BuildProducer<MetricsFactoryConsumerBuildItem> metrics,
+            BuildProducer<LogHandlerBuildItem> logHandler, Optional<MetricsCapabilityBuildItem> metricsCapability) {
+        if (metricsCapability.isPresent() && log.metricsEnabled) {
+            recorder.initCounters();
+            metrics.produce(new MetricsFactoryConsumerBuildItem(recorder.registerMetrics()));
+            logHandler.produce(new LogHandlerBuildItem(recorder.getLogHandler()));
+        }
+    }
+
+    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
+    void setUpMinLevelLogging(LogBuildTimeConfig log,
+            final BuildProducer<GeneratedClassBuildItem> generatedTraceLogger) {
+        ClassOutput output = new GeneratedClassGizmoAdaptor(generatedTraceLogger, false);
+        if (log.categories.isEmpty() || allMinLevelInfoOrHigher(log.minLevel.intValue(), log.categories)) {
+            generateDefaultLoggers(log.minLevel, output);
+        } else {
+            generateCategoryMinLevelLoggers(log.categories, log.minLevel, output);
+        }
+    }
+
+    private static boolean allMinLevelInfoOrHigher(int minLogLevel, Map<String, CategoryBuildTimeConfig> categories) {
+        return categories.values().stream()
+                .allMatch(categoryConfig -> categoryConfig.minLevel.getLevel().intValue() >= minLogLevel);
+    }
+
+    private static void generateDefaultLoggers(Level minLevel, ClassOutput output) {
+        generateDefaultLoggingLogger(minLevel, output);
+        generateDefaultLoggerNode(output);
+        generateLogManagerLogger(output, LoggingResourceProcessor.generateMinLevelDefault(minLevel.getName()));
+    }
+
+    private static void generateCategoryMinLevelLoggers(Map<String, CategoryBuildTimeConfig> categories, Level rootMinLevel,
+            ClassOutput output) {
+        generateMinLevelCompute(categories, rootMinLevel, output);
+        generateDefaultLoggerNode(output);
+        generateLogManagerLogger(output, LoggingResourceProcessor::generateMinLevelCheckCategory);
+    }
+
+    private static BranchResult generateMinLevelCheckCategory(MethodCreator method, FieldDescriptor nameAliasDescriptor) {
+        final ResultHandle levelIntValue = getParamLevelIntValue(method);
+        final ResultHandle nameAlias = method.readInstanceField(nameAliasDescriptor, method.getThis());
+        return method.ifTrue(method.invokeStaticMethod(IS_MIN_LEVEL_ENABLED, levelIntValue, nameAlias));
+    }
+
+    private static void generateMinLevelCompute(Map<String, CategoryBuildTimeConfig> categories, Level rootMinLevel,
+            ClassOutput output) {
+        try (ClassCreator cc = ClassCreator.builder().setFinal(true)
+                .className(MIN_LEVEL_COMPUTE_CLASS_NAME)
+                .classOutput(output).build()) {
+
+            try (MethodCreator mc = cc.getMethodCreator(IS_MIN_LEVEL_ENABLED)) {
+                mc.setModifiers(Opcodes.ACC_STATIC);
+
+                final ResultHandle level = mc.getMethodParam(0);
+                final ResultHandle name = mc.getMethodParam(1);
+
+                BytecodeCreator current = mc;
+                for (Map.Entry<String, CategoryBuildTimeConfig> entry : categories.entrySet()) {
+                    final String category = entry.getKey();
+                    final int categoryLevelIntValue = getLogMinLevel(entry.getKey(), entry.getValue(), categories, rootMinLevel)
+                            .intValue();
+
+                    ResultHandle equalsResult = current.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(Object.class, "equals", boolean.class, Object.class),
+                            name, current.load(category));
+
+                    BranchResult equalsBranch = current.ifTrue(equalsResult);
+                    try (BytecodeCreator false1 = equalsBranch.falseBranch()) {
+                        ResultHandle startsWithResult = false1.invokeVirtualMethod(
+                                MethodDescriptor.ofMethod(String.class, "startsWith", boolean.class, String.class),
+                                name, false1.load(category + "."));
+
+                        BranchResult startsWithBranch = false1.ifTrue(startsWithResult);
+
+                        final BytecodeCreator startsWithTrue = startsWithBranch.trueBranch();
+                        final BranchResult levelCompareBranch = startsWithTrue.ifIntegerGreaterEqual(level,
+                                startsWithTrue.load(categoryLevelIntValue));
+                        levelCompareBranch.trueBranch().returnValue(levelCompareBranch.trueBranch().load(true));
+                        levelCompareBranch.falseBranch().returnValue(levelCompareBranch.falseBranch().load(false));
+
+                        current = startsWithBranch.falseBranch();
+                    }
+
+                    equalsBranch.trueBranch().returnValue(equalsBranch.trueBranch().load(true));
+                }
+
+                final ResultHandle infoLevelIntValue = getLogManagerLevelIntValue(rootMinLevel.toString(), current);
+                final BranchResult isInfoOrHigherBranch = current.ifIntegerGreaterEqual(level, infoLevelIntValue);
+                isInfoOrHigherBranch.trueBranch().returnValue(isInfoOrHigherBranch.trueBranch().load(true));
+                isInfoOrHigherBranch.falseBranch().returnValue(isInfoOrHigherBranch.falseBranch().load(false));
+            }
+        }
+    }
+
+    private static Level getLogMinLevel(String categoryName, CategoryBuildTimeConfig categoryConfig,
+            Map<String, CategoryBuildTimeConfig> categories,
+            Level rootMinLevel) {
+        if (Objects.isNull(categoryConfig))
+            return rootMinLevel;
+
+        final InheritableLevel inheritableLevel = categoryConfig.minLevel;
+        if (!inheritableLevel.isInherited())
+            return inheritableLevel.getLevel();
+
+        int lastDotIndex = categoryName.lastIndexOf('.');
+        if (lastDotIndex == -1)
+            return rootMinLevel;
+
+        String parent = categoryName.substring(0, lastDotIndex);
+        return getLogMinLevel(parent, categories.get(parent), categories, rootMinLevel);
+    }
+
+    private static void generateDefaultLoggerNode(ClassOutput output) {
+        try (ClassCreator cc = ClassCreator.builder().setFinal(true)
+                .className(LOGGER_NODE_CLASS_NAME)
+                .classOutput(output).build()) {
+
+            AnnotationCreator targetClass = cc.addAnnotation("com.oracle.svm.core.annotate.TargetClass");
+            targetClass.addValue("className", "org.jboss.logmanager.LoggerNode");
+
+            final MethodCreator isLoggableLevelMethod = cc.getMethodCreator("isLoggableLevel", boolean.class, int.class);
+            isLoggableLevelMethod.addAnnotation("com.oracle.svm.core.annotate.Alias");
+            isLoggableLevelMethod.returnValue(isLoggableLevelMethod.load(false));
+        }
+    }
+
+    private static void generateLogManagerLogger(ClassOutput output,
+            BiFunction<MethodCreator, FieldDescriptor, BranchResult> isMinLevelEnabledFunction) {
+        try (ClassCreator cc = ClassCreator.builder().setFinal(true)
+                .className(LOGMANAGER_LOGGER_CLASS_NAME)
+                .classOutput(output).build()) {
+
+            AnnotationCreator targetClass = cc.addAnnotation("com.oracle.svm.core.annotate.TargetClass");
+            targetClass.addValue("className", "org.jboss.logmanager.Logger");
+
+            FieldCreator nameAlias = cc.getFieldCreator("name", String.class);
+            nameAlias.addAnnotation("com.oracle.svm.core.annotate.Alias");
+
+            FieldCreator loggerNodeAlias = cc.getFieldCreator("loggerNode", LOGGER_NODE_CLASS_NAME);
+            loggerNodeAlias.addAnnotation("com.oracle.svm.core.annotate.Alias");
+
+            final MethodCreator isLoggableMethod = cc.getMethodCreator("isLoggable", boolean.class,
+                    java.util.logging.Level.class);
+            isLoggableMethod.addAnnotation("com.oracle.svm.core.annotate.Substitute");
+
+            final ResultHandle levelIntValue = getParamLevelIntValue(isLoggableMethod);
+
+            final BranchResult levelBranch = isMinLevelEnabledFunction.apply(isLoggableMethod, nameAlias.getFieldDescriptor());
+
+            final BytecodeCreator levelTrue = levelBranch.trueBranch();
+            levelTrue.returnValue(
+                    levelTrue.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(LOGGER_NODE_CLASS_NAME, "isLoggableLevel", boolean.class, int.class),
+                            levelTrue.readInstanceField(loggerNodeAlias.getFieldDescriptor(), levelTrue.getThis()),
+                            levelIntValue));
+
+            final BytecodeCreator levelFalse = levelBranch.falseBranch();
+            levelFalse.returnValue(levelFalse.load(false));
+        }
+    }
+
+    private static ResultHandle getParamLevelIntValue(MethodCreator method) {
+        final ResultHandle level = method.getMethodParam(0);
+        return method
+                .invokeVirtualMethod(MethodDescriptor.ofMethod(Level.class, "intValue", int.class), level);
+    }
+
+    private static BiFunction<MethodCreator, FieldDescriptor, BranchResult> generateMinLevelDefault(
+            String defaultMinLevelName) {
+        return (method, nameAliasDescriptor) -> {
+            final ResultHandle levelIntValue = getParamLevelIntValue(method);
+            final ResultHandle infoLevelIntValue = getLogManagerLevelIntValue(defaultMinLevelName, method);
+            return method.ifIntegerGreaterEqual(levelIntValue, infoLevelIntValue);
+        };
+    }
+
+    private static ResultHandle getLogManagerLevelIntValue(String levelName, BytecodeCreator method) {
+        final ResultHandle infoLevel = method.readStaticField(
+                FieldDescriptor.of(org.jboss.logmanager.Level.class, levelName, org.jboss.logmanager.Level.class));
+        return method
+                .invokeVirtualMethod(MethodDescriptor.ofMethod(Level.class, "intValue", int.class), infoLevel);
+    }
+
+    private static void generateDefaultLoggingLogger(Level minLevel, ClassOutput output) {
+        try (ClassCreator cc = ClassCreator.builder().setFinal(true)
+                .className(LOGGING_LOGGER_CLASS_NAME)
+                .classOutput(output).build()) {
+
+            AnnotationCreator targetClass = cc.addAnnotation("com.oracle.svm.core.annotate.TargetClass");
+            targetClass.addValue("className", "org.jboss.logging.Logger");
+
+            if (minLevel.intValue() >= org.jboss.logmanager.Level.INFO.intValue()) {
+                // Constant fold these methods to return false,
+                // since the build time log level is above this level.
+                generateFalseFoldMethod("isTraceEnabled", cc);
+                generateFalseFoldMethod("isDebugEnabled", cc);
+            } else if (minLevel.intValue() == org.jboss.logmanager.Level.DEBUG.intValue()) {
+                generateFalseFoldMethod("isTraceEnabled", cc);
+            }
+        }
+    }
+
+    /**
+     * Generates a method that is constant-folded to always return false.
+     */
+    private static void generateFalseFoldMethod(String name, ClassCreator cc) {
+        MethodCreator method = cc.getMethodCreator(name, boolean.class);
+        method.addAnnotation("com.oracle.svm.core.annotate.Substitute");
+        method.addAnnotation("org.graalvm.compiler.api.replacements.Fold");
+        method.returnValue(method.load(false));
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/metrics/MetricsCapabilityBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/metrics/MetricsCapabilityBuildItem.java
new file mode 100644
index 0000000000000..c4f9fd9a183ae
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/metrics/MetricsCapabilityBuildItem.java
@@ -0,0 +1,43 @@
+package io.quarkus.deployment.metrics;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class MetricsCapabilityBuildItem extends SimpleBuildItem {
+    @FunctionalInterface
+    public interface MetricsCapability<String> {
+        boolean isSupported(String value);
+    }
+
+    final String path;
+    final MetricsCapability<String> metricsCapability;
+
+    public MetricsCapabilityBuildItem(MetricsCapability<String> metricsCapability) {
+        this(metricsCapability, null);
+    }
+
+    public MetricsCapabilityBuildItem(MetricsCapability<String> metricsCapability, String path) {
+        this.metricsCapability = metricsCapability;
+        this.path = path;
+    }
+
+    /**
+     * Test for a known metrics system to allow selective initialization of metrics
+     * based using a known API. Avoid using deployment module artifacts. Ensure that
+     * metrics API dependencies remain optional / compile-time only.
+     *
+     * @return true if this factory supports the named metrics system. Arbitrary
+     *         strings are allowed. Constants are present for a few.
+     * @see io.quarkus.runtime.metrics.MetricsFactory#MICROMETER
+     * @see io.quarkus.runtime.metrics.MetricsFactory#MP_METRICS
+     */
+    public boolean metricsSupported(String name) {
+        return metricsCapability.isSupported(name);
+    }
+
+    /**
+     * @return the configured Metrics Endpoint (if an endpoint is enabled) or null
+     */
+    public String metricsEndpoint() {
+        return path;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/metrics/MetricsFactoryConsumerBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/metrics/MetricsFactoryConsumerBuildItem.java
new file mode 100644
index 0000000000000..cc6bc1efb17bd
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/metrics/MetricsFactoryConsumerBuildItem.java
@@ -0,0 +1,34 @@
+package io.quarkus.deployment.metrics;
+
+import java.util.function.Consumer;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+/**
+ * A metrics provider will iterate over all MetricsFactory consumers,
+ * allowing them to register metrics via bytecode recording
+ */
+public final class MetricsFactoryConsumerBuildItem extends MultiBuildItem {
+    private final Consumer<MetricsFactory> factoryConsumer;
+    private final ExecutionTime executionTime;
+
+    public MetricsFactoryConsumerBuildItem(Consumer<MetricsFactory> factoryConsumer) {
+        this.factoryConsumer = factoryConsumer;
+        this.executionTime = ExecutionTime.RUNTIME_INIT;
+    }
+
+    public MetricsFactoryConsumerBuildItem(Consumer<MetricsFactory> factoryConsumer, ExecutionTime executionTime) {
+        this.factoryConsumer = factoryConsumer;
+        this.executionTime = executionTime;
+    }
+
+    public Consumer<MetricsFactory> getConsumer() {
+        return factoryConsumer;
+    }
+
+    public ExecutionTime executionTime() {
+        return executionTime;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java b/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java
index 5dbdd223da32e..ee28f31a587bb 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java
@@ -56,7 +56,7 @@ public static Closeable main(Path appRoot) throws Exception {
                     .setAppArtifact(existingModel.getAppArtifact())
                     .setExistingModel(existingModel)
                     .setIsolateDeployment(true)
-                    .setMode(QuarkusBootstrap.Mode.DEV)
+                    .setMode(QuarkusBootstrap.Mode.REMOTE_DEV_SERVER)
                     .setBuildSystemProperties(buildSystemProperties)
                     .setBaseName(appModel.getBaseName())
                     .setApplicationRoot(existingModel.getAppArtifact().getPath())
@@ -129,8 +129,7 @@ public static void extractDevModeClasses(Path appRoot, AppModel appModel, PostEx
                 //not all local projects are dependencies
                 continue;
             }
-            IoUtils.recursiveDelete(moduleClasses);
-            Files.createDirectories(moduleClasses);
+            IoUtils.createOrEmptyDir(moduleClasses);
             for (Path p : dep.getPaths()) {
                 if (Files.isDirectory(p)) {
                     Path moduleTarget = moduleClasses;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
index d185bb3d26df7..548483363da16 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -8,6 +8,8 @@
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.runtime.annotations.ConvertWith;
+import io.quarkus.runtime.configuration.TrimmedStringConverter;
 
 @ConfigRoot(phase = ConfigPhase.BUILD_TIME)
 public class NativeConfig {
@@ -44,16 +46,40 @@ public class NativeConfig {
     public boolean enableJni;
 
     /**
-     * If all character sets should be added to the native image. This increases image size
+     * Defines the user language used for building the native executable.
+     * <p>
+     * Defaults to the system one.
      */
-    @ConfigItem
-    public boolean addAllCharsets;
+    @ConfigItem(defaultValue = "${user.language:}")
+    @ConvertWith(TrimmedStringConverter.class)
+    public Optional<String> userLanguage;
+
+    /**
+     * Defines the user country used for building the native executable.
+     * <p>
+     * Defaults to the system one.
+     */
+    @ConfigItem(defaultValue = "${user.country:}")
+    @ConvertWith(TrimmedStringConverter.class)
+    public Optional<String> userCountry;
+
+    /**
+     * Defines the file encoding as in -Dfile.encoding=...
+     *
+     * Native image runtime uses the host's (i.e. build time) value of file.encoding
+     * system property. We intentionally default this to UTF-8 to avoid platform specific
+     * defaults to be picked up which can then result in inconsistent behavior in the
+     * generated native executable.
+     */
+    @ConfigItem(defaultValue = "UTF-8")
+    @ConvertWith(TrimmedStringConverter.class)
+    public String fileEncoding;
 
     /**
-     * If all time zones should be added to the native image. This increases image size
+     * If all character sets should be added to the native image. This increases image size
      */
     @ConfigItem
-    public boolean includeAllTimeZones;
+    public boolean addAllCharsets;
 
     /**
      * The location of the Graal distribution
@@ -131,10 +157,16 @@ public class NativeConfig {
     @ConfigItem
     public boolean containerBuild;
 
+    /**
+     * If this build is done using a remote docker daemon.
+     */
+    @ConfigItem
+    public boolean remoteContainerBuild;
+
     /**
      * The docker image to use to do the image build
      */
-    @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java11")
+    @ConfigItem(defaultValue = "${platform.quarkus.native.builder-image}")
     public String builderImage;
 
     /**
@@ -142,7 +174,7 @@ public class NativeConfig {
      * a container build is always done.
      */
     @ConfigItem
-    public Optional<String> containerRuntime;
+    public Optional<ContainerRuntime> containerRuntime;
 
     /**
      * Options to pass to the container runtime
@@ -269,6 +301,29 @@ public static class ResourcesConfig {
         @ConfigItem
         public Optional<List<String>> includes;
 
+        /**
+         * A comma separated list of globs to match resource paths that should <b>not</b> be added to the native image.
+         * <p>
+         * Use slash ({@code /}) as a path separator on all platforms. Globs must not start with slash.
+         * <p>
+         * Please refer to {@link #includes} for details about the glob syntax.
+         * <p>
+         * By default, no resources are excluded.
+         * <p>
+         * Example: Given that you have {@code src/main/resources/red.png}
+         * and {@code src/main/resources/foo/green.png} in your source tree and one of your dependency JARs contains
+         * {@code bar/blue.png} file, with the following configuration
+         *
+         * <pre>
+         * quarkus.native.resources.includes = **&#47;*.png
+         * quarkus.native.resources.excludes = foo/**,**&#47;green.png
+         * </pre>
+         *
+         * the resource {@code red.png} will be available in the native image while the resources {@code foo/green.png}
+         * and {@code bar/blue.png} will not be available in the native image.
+         */
+        @ConfigItem
+        public Optional<List<String>> excludes;
     }
 
     /**
@@ -286,4 +341,22 @@ public static class Debug {
         @ConfigItem
         public boolean enabled;
     }
+
+    /**
+     * Generate the report files for GraalVM Dashboard.
+     */
+    @ConfigItem
+    public boolean enableDashboardDump;
+
+    /**
+     * Supported Container runtimes
+     */
+    public static enum ContainerRuntime {
+        DOCKER,
+        PODMAN;
+
+        public String getExecutableName() {
+            return this.name().toLowerCase();
+        }
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java
index ce29c80900b3b..205c0be2ab3bf 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
@@ -11,33 +12,27 @@ public class PackageConfig {
 
     public static final String JAR = "jar";
     public static final String UBER_JAR = "uber-jar";
-    /**
-     * This is the new packaging format, it is intended to become the default soonish, so it will just
-     * be referred to as 'jar'.
-     */
     public static final String FAST_JAR = "fast-jar";
     public static final String MUTABLE_JAR = "mutable-jar";
+    /**
+     * @deprecated use 'legacy-jar' instead
+     */
+    @Deprecated
     public static final String LEGACY = "legacy";
+    public static final String LEGACY_JAR = "legacy-jar";
     public static final String NATIVE = "native";
+    // does everything 'native' but stops short of actually executing the 'native-image' command
+    public static final String NATIVE_SOURCES = "native-sources";
 
     /**
      * The requested output type.
-     *
-     * The default built in types are 'jar', 'fast-jar' (a prototype more performant version of the default 'jar' type),
-     * 'uber-jar' and 'native'.
+     * <p>
+     * The default built in types are 'jar' (which will use 'fast-jar'), 'legacy-jar' for the pre-1.12 default jar
+     * packaging, 'uber-jar', 'native' and 'native-sources'.
      */
     @ConfigItem(defaultValue = JAR)
     public String type;
 
-    /**
-     * If the java runner should be packed as an uberjar
-     *
-     * This is deprecated, you should use quarkus.package.type=uber-jar instead
-     */
-    @Deprecated
-    @ConfigItem(defaultValue = "false")
-    public boolean uberJar;
-
     /**
      * Manifest configuration of the runner jar.
      */
@@ -47,7 +42,7 @@ public class PackageConfig {
     /**
      * The entry point of the application. This can either be a a fully qualified name of a standard Java
      * class with a main method, or {@link io.quarkus.runtime.QuarkusApplication}.
-     *
+     * <p>
      * If your application has main classes annotated with {@link io.quarkus.runtime.annotations.QuarkusMain}
      * then this can also reference the name given in the annotation, to avoid the need to specify fully qualified
      * names in the config.
@@ -89,34 +84,86 @@ public class PackageConfig {
     @ConfigItem
     public boolean createAppcds;
 
+    /**
+     * When AppCDS generation is enabled, if this property is set, then the JVM used to generate the AppCDS file
+     * will be the JVM present in the container image. The builder image is expected to have have the 'java' binary
+     * on its PATH.
+     * This flag is useful when the JVM to be used at runtime is not the same exact JVM version as the one used to build
+     * the jar.
+     * Note that this property is consulted only when {@code quarkus.package.create-appcds=true} and it requires having
+     * docker available during the build.
+     */
+    @ConfigItem
+    public Optional<String> appcdsBuilderImage;
+
     /**
      * This is an advanced option that only takes effect for the mutable-jar format.
-     *
+     * <p>
      * If this is specified a directory of this name will be created in the jar distribution. Users can place
      * jar files in this directory, and when re-augmentation is performed these will be processed and added to the
      * class-path.
-     *
+     * <p>
      * Note that before reaugmentation has been performed these jars will be ignored, and if they are updated the app
      * should be reaugmented again.
      */
     @ConfigItem
     public Optional<String> userProvidersDirectory;
 
+    /**
+     * This option only applies when using fast-jar or mutable-jar. If this option is true
+     * then a list of all the coordinates of the artifacts that made up this image will be included
+     * in the quarkus-app directory. This list can be used by vulnerability scanners to determine
+     * if your application has any vulnerable dependencies.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean includeDependencyList;
+
+    /**
+     * Fernflower Decompiler configuration
+     */
+    @ConfigItem
+    public FernflowerConfig fernflower;
+
     public boolean isAnyJarType() {
-        return (type.equalsIgnoreCase(PackageConfig.LEGACY) ||
-                type.equalsIgnoreCase(PackageConfig.JAR) ||
+        return (type.equalsIgnoreCase(PackageConfig.JAR) ||
                 type.equalsIgnoreCase(PackageConfig.FAST_JAR) ||
                 type.equalsIgnoreCase(PackageConfig.UBER_JAR)) ||
+                type.equalsIgnoreCase(PackageConfig.LEGACY_JAR) ||
+                type.equalsIgnoreCase(PackageConfig.LEGACY) ||
                 type.equalsIgnoreCase(PackageConfig.MUTABLE_JAR);
     }
 
     public boolean isFastJar() {
-        return type.equalsIgnoreCase(PackageConfig.FAST_JAR) ||
+        return type.equalsIgnoreCase(PackageConfig.JAR) ||
+                type.equalsIgnoreCase(PackageConfig.FAST_JAR) ||
                 type.equalsIgnoreCase(PackageConfig.MUTABLE_JAR);
     }
 
     public boolean isLegacyJar() {
-        return (type.equalsIgnoreCase(PackageConfig.LEGACY) ||
-                type.equalsIgnoreCase(PackageConfig.JAR));
+        return (type.equalsIgnoreCase(PackageConfig.LEGACY_JAR) ||
+                type.equalsIgnoreCase(PackageConfig.LEGACY));
+    }
+
+    @ConfigGroup
+    public static class FernflowerConfig {
+
+        /**
+         * An advanced option that will decompile generated and transformed bytecode into the 'decompiled' directory.
+         * This is only taken into account when fast-jar is used.
+         */
+        @ConfigItem(defaultValue = "false")
+        public boolean enabled;
+
+        /**
+         * The git hash to use to download the fernflower tool from https://jitpack.io/com/github/fesh0r/fernflower/
+         */
+        @ConfigItem(defaultValue = "dbf407a655")
+        public String hash;
+
+        /**
+         * The directory into which to save the fernflower tool if it doesn't exist
+         */
+        @ConfigItem(defaultValue = "${user.home}/.quarkus")
+        public String jarDirectory;
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/AppCDSContainerImageBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/AppCDSContainerImageBuildItem.java
new file mode 100644
index 0000000000000..45f5e6aff633b
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/AppCDSContainerImageBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.deployment.pkg.builditem;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Indicates that a specific container image should be used to generate the AppCDS file
+ */
+public final class AppCDSContainerImageBuildItem extends SimpleBuildItem {
+
+    private final String containerImage;
+
+    public AppCDSContainerImageBuildItem(String containerImage) {
+        this.containerImage = containerImage;
+    }
+
+    public String getContainerImage() {
+        return containerImage;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/ArtifactResultBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/ArtifactResultBuildItem.java
index 7b23a39582d65..031abef44544b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/ArtifactResultBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/ArtifactResultBuildItem.java
@@ -16,12 +16,12 @@ public final class ArtifactResultBuildItem extends MultiBuildItem {
 
     private final Path path;
     private final String type;
-    private final Map<String, Path> additionalPaths;
+    private final Map<String, Object> metadata;
 
-    public ArtifactResultBuildItem(Path path, String type, Map<String, Path> additionalPaths) {
+    public ArtifactResultBuildItem(Path path, String type, Map<String, Object> metadata) {
         this.path = path;
         this.type = type;
-        this.additionalPaths = additionalPaths;
+        this.metadata = metadata;
     }
 
     public Path getPath() {
@@ -32,7 +32,7 @@ public String getType() {
         return type;
     }
 
-    public Map<String, Path> getAdditionalPaths() {
-        return additionalPaths;
+    public Map<String, Object> getMetadata() {
+        return metadata;
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/JarBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/JarBuildItem.java
index 2a27f9d42c075..5db2a885bee75 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/JarBuildItem.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/JarBuildItem.java
@@ -11,12 +11,14 @@ public final class JarBuildItem extends SimpleBuildItem {
     private final Path originalArtifact;
     private final Path libraryDir;
     private final String type;
+    private final String classifier;
 
-    public JarBuildItem(Path path, Path originalArtifact, Path libraryDir, String type) {
+    public JarBuildItem(Path path, Path originalArtifact, Path libraryDir, String type, String classifier) {
         this.path = path;
         this.originalArtifact = originalArtifact;
         this.libraryDir = libraryDir;
         this.type = type;
+        this.classifier = classifier;
     }
 
     public boolean isUberJar() {
@@ -39,7 +41,11 @@ public String getType() {
         return type;
     }
 
+    public String getClassifier() {
+        return classifier;
+    }
+
     public JarResult toJarResult() {
-        return new JarResult(path, originalArtifact, libraryDir, type);
+        return new JarResult(path, originalArtifact, libraryDir, type, classifier);
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/LegacyJarRequiredBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/LegacyJarRequiredBuildItem.java
new file mode 100644
index 0000000000000..7a337c2e7194b
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/builditem/LegacyJarRequiredBuildItem.java
@@ -0,0 +1,9 @@
+package io.quarkus.deployment.pkg.builditem;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * marker build item that extensions can use to force legacy jar creation
+ */
+public final class LegacyJarRequiredBuildItem extends MultiBuildItem {
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java
index 1198ea1da1592..05daa7f5fdb25 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java
@@ -1,10 +1,11 @@
 package io.quarkus.deployment.pkg.steps;
 
+import static io.quarkus.deployment.pkg.steps.LinuxIDUtil.getLinuxID;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -18,105 +19,137 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.AppCDSContainerImageBuildItem;
 import io.quarkus.deployment.pkg.builditem.AppCDSRequestedBuildItem;
 import io.quarkus.deployment.pkg.builditem.AppCDSResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.steps.MainClassBuildStep;
-import io.quarkus.deployment.util.JavaVersionUtil;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.util.JavaVersionUtil;
 import io.quarkus.utilities.JavaBinFinder;
 
 public class AppCDSBuildStep {
 
     private static final Logger log = Logger.getLogger(AppCDSBuildStep.class);
-    public static final String JDK_CLASSLIST_FILE = "classlist";
+
     public static final String CLASSES_LIST_FILE_NAME = "classes.lst";
+    private static final String CONTAINER_IMAGE_BASE_BUILD_DIR = "/tmp/quarkus";
+    private static final String CONTAINER_IMAGE_APPCDS_DIR = CONTAINER_IMAGE_BASE_BUILD_DIR + "/appcds";
 
     @BuildStep(onlyIf = AppCDSRequired.class)
     public void requested(OutputTargetBuildItem outputTarget, BuildProducer<AppCDSRequestedBuildItem> producer)
             throws IOException {
         Path appCDSDir = outputTarget.getOutputDirectory().resolve("appcds");
-        IoUtils.recursiveDelete(appCDSDir);
-        Files.createDirectories(appCDSDir);
+        IoUtils.createOrEmptyDir(appCDSDir);
 
         producer.produce(new AppCDSRequestedBuildItem(outputTarget.getOutputDirectory().resolve("appcds")));
     }
 
     @BuildStep
     public void build(Optional<AppCDSRequestedBuildItem> appCDsRequested,
-            JarBuildItem jarResult, PackageConfig packageConfig,
+            JarBuildItem jarResult, OutputTargetBuildItem outputTarget, PackageConfig packageConfig,
+            Optional<AppCDSContainerImageBuildItem> appCDSContainerImage,
             BuildProducer<AppCDSResultBuildItem> appCDS,
             BuildProducer<ArtifactResultBuildItem> artifactResult) throws Exception {
         if (!appCDsRequested.isPresent()) {
             return;
         }
 
-        Path appCDSDir = appCDsRequested.get().getAppCDSDir();
-        String javaHomeStr = System.getProperty("java.home");
-        Path javaHomeDir = Paths.get(javaHomeStr);
-        Path jdkClassList = javaHomeDir.resolve("lib").resolve(JDK_CLASSLIST_FILE);
-        if (!jdkClassList.toFile().exists()) {
-            log.warnf(
-                    "In order to create AppCDS the JDK used to build the Quarkus application must contain a file named '%s' in the its 'lib' directory.",
-                    JDK_CLASSLIST_FILE);
-            return;
-        }
-        String javaExecutableStr = JavaBinFinder.simpleBinaryName();
-        String javaBinStr = javaHomeStr + File.separator + "bin" + File.separator + javaExecutableStr;
-        if (!new File(javaBinStr).canExecute()) {
-            log.warnf(
-                    "In order to create AppCDS the JDK used to build the Quarkus application must contain an executable named '%s' in its 'bin' directory.",
-                    javaBinStr);
-            return;
+        // to actually execute the commands needed to generate the AppCDS file, either the JVM in the container image will be used
+        // (if specified), or the JVM running the build
+        String containerImage = determineContainerImage(packageConfig, appCDSContainerImage);
+        String javaBinPath = null;
+        if (containerImage == null) {
+            javaBinPath = System.getProperty("java.home") + File.separator + "bin" + File.separator
+                    + JavaBinFinder.simpleBinaryName();
+            if (!new File(javaBinPath).canExecute()) {
+                log.warnf(
+                        "In order to create AppCDS the JDK used to build the Quarkus application must contain an executable named '%s' in its 'bin' directory.",
+                        javaBinPath);
+                return;
+            }
         }
 
-        Path classesLstPath = createClassesLst(packageConfig, jarResult, javaBinStr, appCDSDir);
+        Path classesLstPath = createClassesLst(jarResult, outputTarget, javaBinPath, containerImage,
+                appCDsRequested.get().getAppCDSDir(), packageConfig.isFastJar());
         if (classesLstPath == null) {
-            log.warnf("Unable to create AppCDS because '%s' was not created.", CLASSES_LIST_FILE_NAME);
             return;
         }
 
         log.debugf("'%s' successfully created.", CLASSES_LIST_FILE_NAME);
 
         log.info("Launching AppCDS creation process.");
-        Path appCDSPath = createAppCDS(jarResult, javaBinStr, classesLstPath, packageConfig.isFastJar());
+        Path appCDSPath = createAppCDS(jarResult, outputTarget, javaBinPath, containerImage, classesLstPath,
+                packageConfig.isFastJar());
         if (appCDSPath == null) {
             log.warn("Unable to create AppCDS.");
             return;
         }
 
-        log.infof(
-                "AppCDS successfully created at: '%s'.\nTo ensure they are loaded properly, " +
-                        "run the application jar from its directory and also add the '-XX:SharedArchiveFile=app-cds.jsa' " +
-                        "JVM flag.\nMoreover, make sure to use the exact same Java version (%s) to run the application as was used to build it.",
-                appCDSPath.toAbsolutePath().toString(), System.getProperty("java.version"));
+        log.infof("AppCDS successfully created at: '%s'.", appCDSPath.toAbsolutePath().toString());
+        if (containerImage == null) {
+            log.infof(
+                    "To ensure they are loaded properly, " +
+                            "run the application jar from its directory and also add the '-XX:SharedArchiveFile=app-cds.jsa' " +
+                            "JVM flag.\nMoreover, make sure to use the exact same Java version (%s) to run the application as was used to build it.",
+                    System.getProperty("java.version"));
+        }
 
         appCDS.produce(new AppCDSResultBuildItem(appCDSPath));
         artifactResult.produce(new ArtifactResultBuildItem(appCDSPath, "appCDS", Collections.emptyMap()));
     }
 
+    private String determineContainerImage(PackageConfig packageConfig,
+            Optional<AppCDSContainerImageBuildItem> appCDSContainerImage) {
+        if (packageConfig.appcdsBuilderImage.isPresent()) {
+            return packageConfig.appcdsBuilderImage.get();
+        } else if (appCDSContainerImage.isPresent()) {
+            return appCDSContainerImage.get().getContainerImage();
+        }
+        return null;
+    }
+
     /**
      * @return The path of the created classes.lst file or null if the file was not created
      */
-    private Path createClassesLst(PackageConfig packageConfig, JarBuildItem jarResult,
-            String javaBin, Path appCDSDir) {
-
-        List<String> command = new ArrayList<>(5);
-        command.add(javaBin);
-        command.add("-XX:DumpLoadedClassList=" + CLASSES_LIST_FILE_NAME);
-        command.add(String.format("-D%s=true", MainClassBuildStep.GENERATE_APP_CDS_SYSTEM_PROPERTY));
-        command.add("-jar");
-        if (packageConfig.isFastJar()) {
-            command.add(jarResult.getLibraryDir().getParent().resolve(JarResultBuildStep.QUARKUS_RUN_JAR).toAbsolutePath()
-                    .toString());
+    private Path createClassesLst(JarBuildItem jarResult,
+            OutputTargetBuildItem outputTarget, String javaBinPath, String containerImage, Path appCDSDir, boolean isFastJar) {
+
+        List<String> commonJavaArgs = new ArrayList<>(3);
+        commonJavaArgs.add("-XX:DumpLoadedClassList=" + CLASSES_LIST_FILE_NAME);
+        commonJavaArgs.add(String.format("-D%s=true", MainClassBuildStep.GENERATE_APP_CDS_SYSTEM_PROPERTY));
+        commonJavaArgs.add("-jar");
+
+        List<String> command;
+        if (containerImage != null) {
+            List<String> dockerRunCommand = dockerRunCommands(outputTarget, containerImage, CONTAINER_IMAGE_APPCDS_DIR);
+            command = new ArrayList<>(dockerRunCommand.size() + 1 + commonJavaArgs.size());
+            command.addAll(dockerRunCommand);
+            command.add("java");
+            command.addAll(commonJavaArgs);
+            if (isFastJar) {
+                command.add(CONTAINER_IMAGE_BASE_BUILD_DIR + "/" + JarResultBuildStep.DEFAULT_FAST_JAR_DIRECTORY_NAME + "/"
+                        + JarResultBuildStep.QUARKUS_RUN_JAR);
+            } else {
+                command.add(CONTAINER_IMAGE_BASE_BUILD_DIR + "/" + jarResult.getPath().getFileName().toString());
+            }
         } else {
-            command.add(jarResult.getPath().toAbsolutePath().toString());
+            command = new ArrayList<>(2 + commonJavaArgs.size());
+            command.add(javaBinPath);
+            command.addAll(commonJavaArgs);
+            if (isFastJar) {
+                command
+                        .add(jarResult.getLibraryDir().getParent().resolve(JarResultBuildStep.QUARKUS_RUN_JAR).toAbsolutePath()
+                                .toString());
+            } else {
+                command.add(jarResult.getPath().toAbsolutePath().toString());
+            }
         }
 
         if (log.isDebugEnabled()) {
-            log.debugf("Launching command: '%s' to create '" + CLASSES_LIST_FILE_NAME + "' AppCDS.", String.join(" ", command));
+            log.debugf("Launching command: '%s' to create '" + CLASSES_LIST_FILE_NAME + "' file.", String.join(" ", command));
         }
 
         int exitCode;
@@ -140,16 +173,47 @@ private Path createClassesLst(PackageConfig packageConfig, JarBuildItem jarResul
             return null;
         }
 
-        return appCDSDir.resolve(CLASSES_LIST_FILE_NAME);
+        Path result = appCDSDir.resolve(CLASSES_LIST_FILE_NAME);
+        if (!Files.exists(result)) {
+            log.warnf("Unable to create AppCDS because '%s' was not created. Check the logs for details",
+                    CLASSES_LIST_FILE_NAME);
+            return null;
+        }
+        return result;
+    }
+
+    // the idea here is to use 'docker run -v ... java ...' in order to utilize the JVM of the builder image to
+    // generate the classes file on the host
+    private List<String> dockerRunCommands(OutputTargetBuildItem outputTarget, String containerImage,
+            String containerWorkingDir) {
+        List<String> command = new ArrayList<>(10);
+        command.add("docker");
+        command.add("run");
+        command.add("-v");
+        command.add(outputTarget.getOutputDirectory().toAbsolutePath().toString() + ":" + CONTAINER_IMAGE_BASE_BUILD_DIR
+                + ":z");
+        if (SystemUtils.IS_OS_LINUX) {
+            String uid = getLinuxID("-ur");
+            String gid = getLinuxID("-gr");
+            if (uid != null && gid != null && !uid.isEmpty() && !gid.isEmpty()) {
+                command.add("--user");
+                command.add(uid + ":" + gid);
+            }
+        }
+        command.add("-w");
+        command.add(containerWorkingDir);
+        command.add("--rm");
+        command.add(containerImage);
+        return command;
     }
 
     /**
      * @return The path of the created app-cds.jsa file or null if the file was not created
      */
-    private Path createAppCDS(JarBuildItem jarResult, String javaBin,
-            Path classesLstPath, boolean isFastFar) {
+    private Path createAppCDS(JarBuildItem jarResult, OutputTargetBuildItem outputTarget, String javaBinPath,
+            String containerImage, Path classesLstPath, boolean isFastFar) {
 
-        Path workingDirectory = isFastFar ? jarResult.getPath().getParent().getParent() : jarResult.getPath().getParent();
+        Path workingDirectory = jarResult.getPath().getParent();
         Path appCDSPath = workingDirectory.resolve("app-cds.jsa");
         if (appCDSPath.toFile().exists()) {
             try {
@@ -159,20 +223,35 @@ private Path createAppCDS(JarBuildItem jarResult, String javaBin,
             }
         }
 
-        List<String> command = new ArrayList<>(6);
-        command.add(javaBin);
-        command.add("-Xshare:dump");
-        command.add("-XX:SharedClassListFile=" + classesLstPath.toAbsolutePath().toString());
+        List<String> javaArgs = new ArrayList<>(5);
+        javaArgs.add("-Xshare:dump");
+        javaArgs.add("-XX:SharedClassListFile="
+                + ((containerImage != null) ? CONTAINER_IMAGE_APPCDS_DIR + "/" + classesLstPath.getFileName().toString()
+                        : classesLstPath.toAbsolutePath().toString()));
         // We use the relative paths because at runtime 'java -XX:SharedArchiveFile=... -jar ...' expects the AppCDS and jar files
         // to match exactly what was used at build time.
         // For that reason we also run the creation process from inside the output directory,
         // The end result is that users can simply use 'java -XX:SharedArchiveFile=app-cds.jsa -jar app.jar'
-        command.add("-XX:SharedArchiveFile=" + appCDSPath.getFileName().toString());
-        command.add("--class-path");
+        javaArgs.add("-XX:SharedArchiveFile=" + appCDSPath.getFileName().toString());
+        javaArgs.add("--class-path");
         if (isFastFar) {
-            command.add(JarResultBuildStep.QUARKUS_RUN_JAR);
+            javaArgs.add(JarResultBuildStep.QUARKUS_RUN_JAR);
+        } else {
+            javaArgs.add(jarResult.getPath().getFileName().toString());
+        }
+
+        List<String> command;
+        if (containerImage != null) {
+            List<String> dockerRunCommand = dockerRunCommands(outputTarget, containerImage,
+                    CONTAINER_IMAGE_BASE_BUILD_DIR + "/" + JarResultBuildStep.DEFAULT_FAST_JAR_DIRECTORY_NAME);
+            command = new ArrayList<>(dockerRunCommand.size() + 1 + javaArgs.size());
+            command.addAll(dockerRunCommand);
+            command.add("java");
+            command.addAll(javaArgs);
         } else {
-            command.add(jarResult.getPath().getFileName().toString());
+            command = new ArrayList<>(1 + javaArgs.size());
+            command.add(javaBinPath);
+            command.addAll(javaArgs);
         }
 
         if (log.isDebugEnabled()) {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
index f1dfdc84ce467..f9475b4f36def 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
@@ -5,19 +5,23 @@
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
 import static java.nio.file.StandardOpenOption.WRITE;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
+import java.net.URL;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileVisitOption;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
@@ -26,6 +30,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -74,9 +79,11 @@
 import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
+import io.quarkus.deployment.pkg.builditem.LegacyJarRequiredBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageSourceJarBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.UberJarRequiredBuildItem;
+import io.quarkus.deployment.util.FileUtil;
 
 /**
  * This build step builds both the thin jars and uber jars.
@@ -119,6 +126,8 @@ public class JarResultBuildStep {
             "META-INF/quarkus-extension.yaml",
             "META-INF/quarkus-deployment-dependency.graph",
             "META-INF/jandex.idx",
+            "META-INF/panache-archive.marker",
+            "META-INF/build.metadata", // present in the Red Hat Build of Quarkus
             "LICENSE");
 
     private static final Logger log = Logger.getLogger(JarResultBuildStep.class);
@@ -131,6 +140,7 @@ public class JarResultBuildStep {
     public static final String DEPLOYMENT_LIB = "deployment";
     public static final String APPMODEL_DAT = "appmodel.dat";
     public static final String QUARKUS_RUN_JAR = "quarkus-run.jar";
+    public static final String QUARKUS_APP_DEPS = "quarkus-app-dependencies.txt";
     public static final String BOOT_LIB = "boot";
     public static final String LIB = "lib";
     public static final String MAIN = "main";
@@ -139,7 +149,7 @@ public class JarResultBuildStep {
     public static final String APP = "app";
     public static final String QUARKUS = "quarkus";
     public static final String DEFAULT_FAST_JAR_DIRECTORY_NAME = "quarkus-app";
-    public static final String RENAMED_JAR_EXTENSION = ".jar.original";
+    public static final String MP_CONFIG_FILE = "META-INF/microprofile-config.properties";
 
     @BuildStep
     OutputTargetBuildItem outputTarget(BuildSystemTargetBuildItem bst, PackageConfig packageConfig) {
@@ -169,6 +179,7 @@ public JarBuildItem buildRunnerJar(CurateOutcomeBuildItem curateOutcomeBuildItem
             List<GeneratedClassBuildItem> generatedClasses,
             List<GeneratedResourceBuildItem> generatedResources,
             List<UberJarRequiredBuildItem> uberJarRequired,
+            List<LegacyJarRequiredBuildItem> legacyJarRequired,
             QuarkusBuildCloseablesBuildItem closeablesBuildItem,
             List<AdditionalApplicationArchiveBuildItem> additionalApplicationArchiveBuildItems,
             MainClassBuildItem mainClassBuildItem, Optional<AppCDSRequestedBuildItem> appCDS) throws Exception {
@@ -176,19 +187,19 @@ public JarBuildItem buildRunnerJar(CurateOutcomeBuildItem curateOutcomeBuildItem
         if (appCDS.isPresent()) {
             handleAppCDSSupportFileGeneration(transformedClasses, generatedClasses, appCDS.get());
         }
-        if (!(packageConfig.type.equalsIgnoreCase(PackageConfig.JAR) ||
-                packageConfig.type.equalsIgnoreCase(PackageConfig.UBER_JAR))
-                && packageConfig.uberJar) {
+
+        if (!uberJarRequired.isEmpty() && !legacyJarRequired.isEmpty()) {
             throw new RuntimeException(
-                    "Cannot set quarkus.package.uber-jar=true and quarkus.package.type, if you want an uber-jar set quarkus.package.type=uber-jar.");
+                    "Extensions with conflicting package types. One extension requires uber-jar another requires legacy format");
         }
 
-        if (!uberJarRequired.isEmpty() || packageConfig.uberJar
-                || packageConfig.type.equalsIgnoreCase(PackageConfig.UBER_JAR)) {
+        if (legacyJarRequired.isEmpty() && (!uberJarRequired.isEmpty()
+                || packageConfig.type.equalsIgnoreCase(PackageConfig.UBER_JAR))) {
             return buildUberJar(curateOutcomeBuildItem, outputTargetBuildItem, transformedClasses, applicationArchivesBuildItem,
                     packageConfig, applicationInfo, generatedClasses, generatedResources, closeablesBuildItem,
                     mainClassBuildItem);
-        } else if (packageConfig.isLegacyJar()) {
+        } else if (!legacyJarRequired.isEmpty() || packageConfig.isLegacyJar()
+                || packageConfig.type.equalsIgnoreCase(PackageConfig.LEGACY)) {
             return buildLegacyThinJar(curateOutcomeBuildItem, outputTargetBuildItem, transformedClasses,
                     applicationArchivesBuildItem,
                     packageConfig, applicationInfo, generatedClasses, generatedResources, mainClassBuildItem);
@@ -255,15 +266,14 @@ private JarBuildItem buildUberJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
         final Path standardJar = outputTargetBuildItem.getOutputDirectory()
                 .resolve(outputTargetBuildItem.getBaseName() + ".jar");
 
-        final Path originalJar;
-        if (Files.exists(standardJar)) {
-            originalJar = outputTargetBuildItem.getOutputDirectory()
-                    .resolve(outputTargetBuildItem.getBaseName() + RENAMED_JAR_EXTENSION);
-        } else {
-            originalJar = null;
-        }
+        final Path originalJar = Files.exists(standardJar) ? standardJar : null;
+
+        return new JarBuildItem(runnerJar, originalJar, null, PackageConfig.UBER_JAR,
+                suffixToClassifier(packageConfig.runnerSuffix));
+    }
 
-        return new JarBuildItem(runnerJar, originalJar, null, PackageConfig.UBER_JAR);
+    private String suffixToClassifier(String suffix) {
+        return suffix.startsWith("-") ? suffix.substring(1) : suffix;
     }
 
     private void buildUberJar0(CurateOutcomeBuildItem curateOutcomeBuildItem,
@@ -409,8 +419,7 @@ private JarBuildItem buildLegacyThinJar(CurateOutcomeBuildItem curateOutcomeBuil
                 .resolve(outputTargetBuildItem.getBaseName() + packageConfig.runnerSuffix + ".jar");
         Path libDir = outputTargetBuildItem.getOutputDirectory().resolve("lib");
         Files.deleteIfExists(runnerJar);
-        IoUtils.recursiveDelete(libDir);
-        Files.createDirectories(libDir);
+        IoUtils.createOrEmptyDir(libDir);
 
         try (FileSystem runnerZipFs = ZipUtils.newZip(runnerJar)) {
 
@@ -421,7 +430,8 @@ private JarBuildItem buildLegacyThinJar(CurateOutcomeBuildItem curateOutcomeBuil
         }
         runnerJar.toFile().setReadable(true, false);
 
-        return new JarBuildItem(runnerJar, null, libDir, PackageConfig.LEGACY);
+        return new JarBuildItem(runnerJar, null, libDir, PackageConfig.LEGACY_JAR,
+                suffixToClassifier(packageConfig.runnerSuffix));
     }
 
     private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
@@ -459,8 +469,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
             userProviders = buildDir.resolve(packageConfig.userProvidersDirectory.get());
         }
         if (!rebuild) {
-            IoUtils.recursiveDelete(buildDir);
-            Files.createDirectories(buildDir);
+            IoUtils.createOrEmptyDir(buildDir);
             Files.createDirectories(mainLib);
             Files.createDirectories(baseLib);
             Files.createDirectories(appDir);
@@ -472,11 +481,30 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                 Files.createFile(userProviders.resolve(".keep"));
             }
         } else {
-            IoUtils.recursiveDelete(quarkus);
-            Files.createDirectories(quarkus);
+            IoUtils.createOrEmptyDir(quarkus);
         }
         Map<AppArtifactKey, List<Path>> copiedArtifacts = new HashMap<>();
 
+        Path fernflowerJar = null;
+        Path decompiledOutputDir = null;
+        boolean wasDecompiledSuccessfully = true;
+        if (packageConfig.fernflower.enabled) {
+            Path jarDirectory = Paths.get(packageConfig.fernflower.jarDirectory);
+            if (!Files.exists(jarDirectory)) {
+                Files.createDirectory(jarDirectory);
+            }
+            fernflowerJar = jarDirectory.resolve(String.format("fernflower-%s.jar", packageConfig.fernflower.hash));
+            if (!Files.exists(fernflowerJar)) {
+                boolean downloadComplete = downloadFernflowerJar(packageConfig, fernflowerJar);
+                if (!downloadComplete) {
+                    fernflowerJar = null; // will ensure that no decompilation takes place
+                }
+            }
+            decompiledOutputDir = buildDir.getParent().resolve("decompiled");
+            FileUtil.deleteDirectory(decompiledOutputDir);
+            Files.createDirectory(decompiledOutputDir);
+        }
+
         List<Path> jars = new ArrayList<>();
         List<Path> bootJars = new ArrayList<>();
         //we process in order of priority
@@ -496,6 +524,9 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                     }
                 }
             }
+            if (fernflowerJar != null) {
+                wasDecompiledSuccessfully &= decompile(fernflowerJar, decompiledOutputDir, transformedZip);
+            }
         }
         //now generated classes and resources
         Path generatedZip = quarkus.resolve(GENERATED_BYTECODE_JAR);
@@ -518,6 +549,14 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                 Files.write(target, i.getClassData());
             }
         }
+        if (fernflowerJar != null) {
+            wasDecompiledSuccessfully &= decompile(fernflowerJar, decompiledOutputDir, generatedZip);
+        }
+
+        if (wasDecompiledSuccessfully && (decompiledOutputDir != null)) {
+            log.info("The decompiled output can be found at: " + decompiledOutputDir.toAbsolutePath().toString());
+        }
+
         //now the application classes
         Path runnerJar = appDir
                 .resolve(outputTargetBuildItem.getBaseName() + ".jar");
@@ -540,7 +579,7 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
             } else {
                 copyDependency(curateOutcomeBuildItem, copiedArtifacts, mainLib, baseLib, jars, true, classPath, appDep);
             }
-            if (curateOutcomeBuildItem.getEffectiveModel().getParentFirstArtifacts()
+            if (curateOutcomeBuildItem.getEffectiveModel().getRunnerParentFirstArtifacts()
                     .contains(appDep.getArtifact().getKey())) {
                 bootJars.addAll(appDep.getArtifact().getPaths().toList());
             }
@@ -555,9 +594,26 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                 jars.add(path);
             }
         }
+
+        /*
+         * There are some files like META-INF/microprofile-config.properties that usually don't exist in application
+         * and yet are always looked up (spec compliance...) and due to the location in the jar,
+         * the RunnerClassLoader needs to look into every jar to determine whether they exist or not.
+         * In keeping true to the original design of the RunnerClassLoader which indexes the directory structure,
+         * we just add a fail-fast path for files we know don't exist.
+         *
+         * TODO: if this gets more complex, we'll probably want a build item to carry this information instead of hard
+         * coding it here
+         */
+        List<String> nonExistentResources = new ArrayList<>(1);
+        Enumeration<URL> mpConfigURLs = Thread.currentThread().getContextClassLoader().getResources(MP_CONFIG_FILE);
+        if (!mpConfigURLs.hasMoreElements()) {
+            nonExistentResources.add(MP_CONFIG_FILE);
+        }
+
         Path appInfo = buildDir.resolve(QuarkusEntryPoint.QUARKUS_APPLICATION_DAT);
         try (OutputStream out = Files.newOutputStream(appInfo)) {
-            SerializedApplication.write(out, mainClassBuildItem.getClassName(), buildDir, jars, bootJars);
+            SerializedApplication.write(out, mainClassBuildItem.getClassName(), buildDir, jars, bootJars, nonExistentResources);
         }
 
         runnerJar.toFile().setReadable(true, false);
@@ -583,7 +639,8 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                 Map<AppArtifactKey, List<String>> relativePaths = new HashMap<>();
                 for (Map.Entry<AppArtifactKey, List<Path>> e : copiedArtifacts.entrySet()) {
                     relativePaths.put(e.getKey(),
-                            e.getValue().stream().map(s -> buildDir.relativize(s).toString()).collect(Collectors.toList()));
+                            e.getValue().stream().map(s -> buildDir.relativize(s).toString().replace("\\", "/"))
+                                    .collect(Collectors.toList()));
                 }
 
                 //now we serialize the data needed to build up the reaugmentation class path
@@ -606,7 +663,11 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                     ObjectOutputStream obj = new ObjectOutputStream(out);
                     List<String> paths = new ArrayList<>();
                     for (AppDependency i : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
-                        paths.addAll(relativePaths.get(i.getArtifact().getKey()));
+                        final List<String> list = relativePaths.get(i.getArtifact().getKey());
+                        // some of the dependencies may have been filtered out
+                        if (list != null) {
+                            paths.addAll(list);
+                        }
                     }
                     obj.writeObject(paths);
                     obj.close();
@@ -616,6 +677,16 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
                     outputTargetBuildItem.getBuildSystemProperties().store(out, "The original build properties");
                 }
             }
+
+            if (packageConfig.includeDependencyList) {
+                Path deplist = buildDir.resolve(QUARKUS_APP_DEPS);
+                List<String> lines = new ArrayList<>();
+                for (AppDependency i : curateOutcomeBuildItem.getEffectiveModel().getUserDependencies()) {
+                    lines.add(i.getArtifact().toString());
+                }
+                lines.sort(Comparator.naturalOrder());
+                Files.write(deplist, lines);
+            }
         } else {
             //if it is a rebuild we might have classes
 
@@ -628,7 +699,59 @@ public void accept(Path path) {
                 }
             });
         }
-        return new JarBuildItem(initJar, null, libDir, packageConfig.type);
+        return new JarBuildItem(initJar, null, libDir, packageConfig.type, null);
+    }
+
+    private boolean downloadFernflowerJar(PackageConfig packageConfig, Path fernflowerJar) {
+        String downloadURL = String.format("https://jitpack.io/com/github/fesh0r/fernflower/%s/fernflower-%s.jar",
+                packageConfig.fernflower.hash, packageConfig.fernflower.hash);
+        try (BufferedInputStream in = new BufferedInputStream(new URL(downloadURL).openStream());
+                FileOutputStream fileOutputStream = new FileOutputStream(fernflowerJar.toFile())) {
+            byte[] dataBuffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) {
+                fileOutputStream.write(dataBuffer, 0, bytesRead);
+            }
+            return true;
+        } catch (IOException e) {
+            log.error("Unable to download Fernflower from " + downloadURL, e);
+            return false;
+        }
+    }
+
+    private boolean decompile(Path fernflowerJar, Path decompiledOutputDir, Path jarToDecompile) {
+        int exitCode;
+        try {
+            ProcessBuilder processBuilder = new ProcessBuilder(
+                    Arrays.asList("java", "-jar", fernflowerJar.toAbsolutePath().toString(),
+                            jarToDecompile.toAbsolutePath().toString(), decompiledOutputDir.toAbsolutePath().toString()));
+            if (log.isDebugEnabled()) {
+                processBuilder.inheritIO();
+            } else {
+                processBuilder.redirectError(NULL_FILE);
+                processBuilder.redirectOutput(NULL_FILE);
+            }
+            exitCode = processBuilder.start().waitFor();
+        } catch (Exception e) {
+            log.error("Failed to launch Fernflower decompiler.", e);
+            return false;
+        }
+
+        if (exitCode != 0) {
+            log.errorf("Fernflower decompiler exited with error code: %d.", exitCode);
+            return false;
+        }
+
+        String jarFileName = jarToDecompile.getFileName().toString();
+        Path decompiledJar = decompiledOutputDir.resolve(jarFileName);
+        try {
+            ZipUtils.unzip(decompiledJar, decompiledOutputDir.resolve(jarFileName.replace(".jar", "")));
+            Files.deleteIfExists(decompiledJar);
+        } catch (IOException ignored) {
+            // it doesn't really matter if we can't unzip the jar as we do it merely for user convenience
+        }
+
+        return true;
     }
 
     private void copyDependency(CurateOutcomeBuildItem curateOutcomeBuildItem, Map<AppArtifactKey, List<Path>> runtimeArtifacts,
@@ -644,51 +767,49 @@ private void copyDependency(CurateOutcomeBuildItem curateOutcomeBuildItem, Map<A
             return;
         }
         for (Path resolvedDep : depArtifact.getPaths()) {
-            if (!Files.isDirectory(resolvedDep)) {
-                if (allowParentFirst && curateOutcomeBuildItem.getEffectiveModel().getParentFirstArtifacts()
-                        .contains(depArtifact.getKey())) {
-                    final String fileName = depArtifact.getGroupId() + "." + resolvedDep.getFileName();
-                    final Path targetPath = baseLib.resolve(fileName);
-                    Files.copy(resolvedDep, targetPath, StandardCopyOption.REPLACE_EXISTING);
-                    classPath.append(" ").append(LIB).append("/").append(BOOT_LIB).append("/").append(fileName);
-                    runtimeArtifacts.computeIfAbsent(depArtifact.getKey(), (s) -> new ArrayList<>()).add(targetPath);
-                } else {
-                    final String fileName = depArtifact.getGroupId() + "." + resolvedDep.getFileName();
-                    final Path targetPath = libDir.resolve(fileName);
-                    Files.copy(resolvedDep, targetPath, StandardCopyOption.REPLACE_EXISTING);
-                    jars.add(targetPath);
-                    runtimeArtifacts.computeIfAbsent(depArtifact.getKey(), (s) -> new ArrayList<>()).add(targetPath);
-                }
+            final String fileName = depArtifact.getGroupId() + "." + resolvedDep.getFileName();
+            final Path targetPath;
+
+            if (allowParentFirst && curateOutcomeBuildItem.getEffectiveModel().getRunnerParentFirstArtifacts()
+                    .contains(depArtifact.getKey())) {
+                targetPath = baseLib.resolve(fileName);
+                classPath.append(" ").append(LIB).append("/").append(BOOT_LIB).append("/").append(fileName);
             } else {
+                targetPath = libDir.resolve(fileName);
+                jars.add(targetPath);
+            }
+            runtimeArtifacts.computeIfAbsent(depArtifact.getKey(), (s) -> new ArrayList<>(1)).add(targetPath);
+
+            if (Files.isDirectory(resolvedDep)) {
                 // This case can happen when we are building a jar from inside the Quarkus repository
                 // and Quarkus Bootstrap's localProjectDiscovery has been set to true. In such a case
                 // the non-jar dependencies are the Quarkus dependencies picked up on the file system
-                // these should never be parent first
-
-                final String fileName = depArtifact.getGroupId() + "." + resolvedDep.getFileName();
-                final Path targetPath = libDir.resolve(fileName);
-                runtimeArtifacts.computeIfAbsent(depArtifact.getKey(), (s) -> new ArrayList<>()).add(targetPath);
-                jars.add(targetPath);
-                try (FileSystem runnerZipFs = ZipUtils.newZip(targetPath)) {
-                    Files.walkFileTree(resolvedDep, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE,
-                            new SimpleFileVisitor<Path>() {
-                                @Override
-                                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
-                                        throws IOException {
-                                    final Path relativePath = resolvedDep.relativize(file);
-                                    final Path targetPath = runnerZipFs.getPath(relativePath.toString());
-                                    if (targetPath.getParent() != null) {
-                                        Files.createDirectories(targetPath.getParent());
-                                    }
-                                    Files.copy(file, targetPath, StandardCopyOption.REPLACE_EXISTING); //replace only needed for testing
-                                    return FileVisitResult.CONTINUE;
-                                }
-                            });
-                }
+                packageClasses(resolvedDep, targetPath);
+            } else {
+                Files.copy(resolvedDep, targetPath, StandardCopyOption.REPLACE_EXISTING);
             }
         }
     }
 
+    private void packageClasses(Path resolvedDep, final Path targetPath) throws IOException {
+        try (FileSystem runnerZipFs = ZipUtils.newZip(targetPath)) {
+            Files.walkFileTree(resolvedDep, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE,
+                    new SimpleFileVisitor<Path>() {
+                        @Override
+                        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                                throws IOException {
+                            final Path relativePath = resolvedDep.relativize(file);
+                            final Path targetPath = runnerZipFs.getPath(relativePath.toString());
+                            if (targetPath.getParent() != null) {
+                                Files.createDirectories(targetPath.getParent());
+                            }
+                            Files.copy(file, targetPath, StandardCopyOption.REPLACE_EXISTING); //replace only needed for testing
+                            return FileVisitResult.CONTINUE;
+                        }
+                    });
+        }
+    }
+
     /**
      * Native images are built from a specially created jar file. This allows for changes in how the jar file is generated.
      *
@@ -707,8 +828,7 @@ public NativeImageSourceJarBuildItem buildNativeImageJar(CurateOutcomeBuildItem
             List<UberJarRequiredBuildItem> uberJarRequired) throws Exception {
         Path targetDirectory = outputTargetBuildItem.getOutputDirectory()
                 .resolve(outputTargetBuildItem.getBaseName() + "-native-image-source-jar");
-        IoUtils.recursiveDelete(targetDirectory);
-        Files.createDirectories(targetDirectory);
+        IoUtils.createOrEmptyDir(targetDirectory);
 
         List<GeneratedClassBuildItem> allClasses = new ArrayList<>(generatedClasses);
         allClasses.addAll(nativeImageResources.stream()
@@ -721,9 +841,14 @@ public NativeImageSourceJarBuildItem buildNativeImageJar(CurateOutcomeBuildItem
                     "maximum command length (see https://github.com/oracle/graal/issues/2387).");
             // Native image source jar generation with the uber jar strategy is provided as a workaround for Windows and
             // will be removed once https://github.com/oracle/graal/issues/2387 is fixed.
-            return buildNativeImageUberJar(curateOutcomeBuildItem, outputTargetBuildItem, transformedClasses,
+            final NativeImageSourceJarBuildItem nativeImageSourceJarBuildItem = buildNativeImageUberJar(curateOutcomeBuildItem,
+                    outputTargetBuildItem, transformedClasses,
                     applicationArchivesBuildItem,
                     packageConfig, applicationInfo, allClasses, generatedResources, mainClassBuildItem, targetDirectory);
+            // additionally copy any json config files to a location accessible by native-image tool during
+            // native-image generation
+            copyJsonConfigFiles(applicationArchivesBuildItem, targetDirectory);
+            return nativeImageSourceJarBuildItem;
         } else {
             return buildNativeImageThinJar(curateOutcomeBuildItem, outputTargetBuildItem, transformedClasses,
                     applicationArchivesBuildItem,
@@ -1188,4 +1313,9 @@ public boolean test(Path path, BasicFileAttributes basicFileAttributes) {
             return basicFileAttributes.isRegularFile() && path.toString().endsWith(".json");
         }
     }
+
+    // copied from Java 9
+    // TODO remove when we move to Java 11
+
+    private static final File NULL_FILE = new File(SystemUtils.IS_OS_WINDOWS ? "NUL" : "/dev/null");
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/LinuxIDUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/LinuxIDUtil.java
new file mode 100644
index 0000000000000..73130bcda97b8
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/LinuxIDUtil.java
@@ -0,0 +1,61 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+final class LinuxIDUtil {
+
+    private LinuxIDUtil() {
+    }
+
+    static String getLinuxID(String option) {
+        Process process;
+
+        try {
+            StringBuilder responseBuilder = new StringBuilder();
+            String line;
+
+            ProcessBuilder idPB = new ProcessBuilder().command("id", option);
+            idPB.redirectError(new File("/dev/null"));
+            idPB.redirectInput(new File("/dev/null"));
+
+            process = idPB.start();
+            try (InputStream inputStream = process.getInputStream()) {
+                try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+                    while ((line = reader.readLine()) != null) {
+                        responseBuilder.append(line);
+                    }
+                    safeWaitFor(process);
+                    return responseBuilder.toString();
+                }
+            } catch (Throwable t) {
+                safeWaitFor(process);
+                throw t;
+            }
+        } catch (IOException e) { //from process.start()
+            //swallow and return null id
+            return null;
+        }
+    }
+
+    private static void safeWaitFor(Process process) {
+        boolean intr = false;
+        try {
+            for (;;)
+                try {
+                    process.waitFor();
+                    return;
+                } catch (InterruptedException ex) {
+                    intr = true;
+                }
+        } finally {
+            if (intr) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java
new file mode 100644
index 0000000000000..6aa30b51ea184
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildContainerRunner.java
@@ -0,0 +1,137 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.deployment.pkg.NativeConfig;
+import io.quarkus.deployment.util.FileUtil;
+import io.quarkus.deployment.util.ProcessUtil;
+
+public abstract class NativeImageBuildContainerRunner extends NativeImageBuildRunner {
+
+    private static final Logger log = Logger.getLogger(NativeImageBuildContainerRunner.class);
+
+    final NativeConfig nativeConfig;
+    protected final NativeConfig.ContainerRuntime containerRuntime;
+    private final String[] baseContainerRuntimeArgs;
+    protected final String outputPath;
+
+    public NativeImageBuildContainerRunner(NativeConfig nativeConfig, Path outputDir) {
+        this.nativeConfig = nativeConfig;
+        containerRuntime = nativeConfig.containerRuntime.orElseGet(NativeImageBuildContainerRunner::detectContainerRuntime);
+        log.infof("Using %s to run the native image builder", containerRuntime.getExecutableName());
+
+        this.baseContainerRuntimeArgs = new String[] { "--env", "LANG=C" };
+
+        outputPath = outputDir == null ? null : outputDir.toAbsolutePath().toString();
+
+    }
+
+    @Override
+    public void setup(boolean processInheritIODisabled) {
+        if (containerRuntime == NativeConfig.ContainerRuntime.DOCKER
+                || containerRuntime == NativeConfig.ContainerRuntime.PODMAN) {
+            // we pull the docker image in order to give users an indication of which step the process is at
+            // it's not strictly necessary we do this, however if we don't the subsequent version command
+            // will appear to block and no output will be shown
+            log.info("Checking image status " + nativeConfig.builderImage);
+            Process pullProcess = null;
+            try {
+                final ProcessBuilder pb = new ProcessBuilder(
+                        Arrays.asList(containerRuntime.getExecutableName(), "pull", nativeConfig.builderImage));
+                pullProcess = ProcessUtil.launchProcess(pb, processInheritIODisabled);
+                pullProcess.waitFor();
+            } catch (IOException | InterruptedException e) {
+                throw new RuntimeException("Failed to pull builder image " + nativeConfig.builderImage, e);
+            } finally {
+                if (pullProcess != null) {
+                    pullProcess.destroy();
+                }
+            }
+        }
+    }
+
+    @Override
+    protected String[] getGraalVMVersionCommand(List<String> args) {
+        return buildCommand("run", Collections.singletonList("--rm"), args);
+    }
+
+    @Override
+    protected String[] getBuildCommand(List<String> args) {
+        return buildCommand("run", getContainerRuntimeBuildArgs(), args);
+    }
+
+    protected List<String> getContainerRuntimeBuildArgs() {
+        List<String> containerRuntimeArgs = new ArrayList<>();
+        nativeConfig.containerRuntimeOptions.ifPresent(containerRuntimeArgs::addAll);
+        if (nativeConfig.debugBuildProcess && nativeConfig.publishDebugBuildProcessPort) {
+            // publish the debug port onto the host if asked for
+            containerRuntimeArgs.add("--publish=" + NativeImageBuildStep.DEBUG_BUILD_PROCESS_PORT + ":"
+                    + NativeImageBuildStep.DEBUG_BUILD_PROCESS_PORT);
+        }
+        return containerRuntimeArgs;
+    }
+
+    protected String[] buildCommand(String dockerCmd, List<String> containerRuntimeArgs, List<String> command) {
+        return Stream
+                .of(Stream.of(containerRuntime.getExecutableName()), Stream.of(dockerCmd), Stream.of(baseContainerRuntimeArgs),
+                        containerRuntimeArgs.stream(), Stream.of(nativeConfig.builderImage), command.stream())
+                .flatMap(Function.identity()).toArray(String[]::new);
+    }
+
+    /**
+     * @return {@link NativeConfig.ContainerRuntime#DOCKER} if it's available, or {@link NativeConfig.ContainerRuntime#PODMAN}
+     *         if the podman
+     *         executable exists in the environment or if the docker executable is an alias to podman
+     * @throws IllegalStateException if no container runtime was found to build the image
+     */
+    private static NativeConfig.ContainerRuntime detectContainerRuntime() {
+        // Docker version 19.03.14, build 5eb3275d40
+        String dockerVersionOutput = getVersionOutputFor(NativeConfig.ContainerRuntime.DOCKER);
+        boolean dockerAvailable = dockerVersionOutput.contains("Docker version");
+        // Check if Podman is installed
+        // podman version 2.1.1
+        String podmanVersionOutput = getVersionOutputFor(NativeConfig.ContainerRuntime.PODMAN);
+        boolean podmanAvailable = podmanVersionOutput.startsWith("podman version");
+        if (dockerAvailable) {
+            // Check if "docker" is an alias to "podman"
+            if (dockerVersionOutput.equals(podmanVersionOutput)) {
+                return NativeConfig.ContainerRuntime.PODMAN;
+            }
+            return NativeConfig.ContainerRuntime.DOCKER;
+        } else if (podmanAvailable) {
+            return NativeConfig.ContainerRuntime.PODMAN;
+        } else {
+            throw new IllegalStateException("No container runtime was found to run the native image builder");
+        }
+    }
+
+    private static String getVersionOutputFor(NativeConfig.ContainerRuntime containerRuntime) {
+        Process versionProcess = null;
+        try {
+            ProcessBuilder pb = new ProcessBuilder(containerRuntime.getExecutableName(), "--version")
+                    .redirectErrorStream(true);
+            versionProcess = pb.start();
+            versionProcess.waitFor();
+            return new String(FileUtil.readFileContents(versionProcess.getInputStream()), StandardCharsets.UTF_8);
+        } catch (IOException | InterruptedException e) {
+            // If an exception is thrown in the process, just return an empty String
+            log.debugf(e, "Failure to read version output from %s", containerRuntime.getExecutableName());
+            return "";
+        } finally {
+            if (versionProcess != null) {
+                versionProcess.destroy();
+            }
+        }
+    }
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java
new file mode 100644
index 0000000000000..ec8e6ee6cb4e2
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalContainerRunner.java
@@ -0,0 +1,42 @@
+package io.quarkus.deployment.pkg.steps;
+
+import static io.quarkus.deployment.pkg.steps.LinuxIDUtil.getLinuxID;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang3.SystemUtils;
+
+import io.quarkus.deployment.pkg.NativeConfig;
+import io.quarkus.deployment.util.FileUtil;
+
+public class NativeImageBuildLocalContainerRunner extends NativeImageBuildContainerRunner {
+
+    public NativeImageBuildLocalContainerRunner(NativeConfig nativeConfig, Path outputDir) {
+        super(nativeConfig, outputDir);
+    }
+
+    @Override
+    protected List<String> getContainerRuntimeBuildArgs() {
+        List<String> containerRuntimeArgs = super.getContainerRuntimeBuildArgs();
+        String volumeOutputPath = outputPath;
+        if (SystemUtils.IS_OS_WINDOWS) {
+            volumeOutputPath = FileUtil.translateToVolumePath(volumeOutputPath);
+        } else if (SystemUtils.IS_OS_LINUX) {
+            String uid = getLinuxID("-ur");
+            String gid = getLinuxID("-gr");
+            if (uid != null && gid != null && !uid.isEmpty() && !gid.isEmpty()) {
+                Collections.addAll(containerRuntimeArgs, "--user", uid + ":" + gid);
+                if (containerRuntime == NativeConfig.ContainerRuntime.PODMAN) {
+                    // Needed to avoid AccessDeniedExceptions
+                    containerRuntimeArgs.add("--userns=keep-id");
+                }
+            }
+        }
+
+        Collections.addAll(containerRuntimeArgs, "--rm", "-v",
+                volumeOutputPath + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH + ":z");
+        return containerRuntimeArgs;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalRunner.java
new file mode 100644
index 0000000000000..bbea0c4099a9e
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalRunner.java
@@ -0,0 +1,36 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class NativeImageBuildLocalRunner extends NativeImageBuildRunner {
+
+    private final String nativeImageExecutable;
+
+    public NativeImageBuildLocalRunner(String nativeImageExecutable) {
+        this.nativeImageExecutable = nativeImageExecutable;
+    }
+
+    @Override
+    public void cleanupServer(File outputDir) throws InterruptedException, IOException {
+        final String[] cleanupCommand = { nativeImageExecutable, "--server-shutdown" };
+        runCommand(cleanupCommand, null, outputDir);
+    }
+
+    @Override
+    protected String[] getGraalVMVersionCommand(List<String> args) {
+        return buildCommand(args);
+    }
+
+    @Override
+    protected String[] getBuildCommand(List<String> args) {
+        return buildCommand(args);
+    }
+
+    private String[] buildCommand(List<String> args) {
+        return Stream.concat(Stream.of(nativeImageExecutable), args.stream()).toArray(String[]::new);
+    }
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java
new file mode 100644
index 0000000000000..34c20b4b2a31f
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java
@@ -0,0 +1,64 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.deployment.pkg.NativeConfig;
+
+public class NativeImageBuildRemoteContainerRunner extends NativeImageBuildContainerRunner {
+
+    private static final Logger log = Logger.getLogger(NativeImageBuildRemoteContainerRunner.class);
+
+    private final String resultingExecutableName;
+    private String containerId;
+
+    public NativeImageBuildRemoteContainerRunner(NativeConfig nativeConfig, Path outputDir, String resultingExecutableName) {
+        super(nativeConfig, outputDir);
+        this.resultingExecutableName = resultingExecutableName;
+    }
+
+    @Override
+    protected void preBuild(List<String> buildArgs) throws InterruptedException, IOException {
+        List<String> containerRuntimeArgs = getContainerRuntimeBuildArgs();
+        String[] createContainerCommand = buildCommand("create", containerRuntimeArgs, buildArgs);
+        log.info(String.join(" ", createContainerCommand).replace("$", "\\$"));
+        Process createContainerProcess = new ProcessBuilder(createContainerCommand).start();
+        if (createContainerProcess.waitFor() != 0) {
+            throw new RuntimeException("Failed to create builder container.");
+        }
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(createContainerProcess.getInputStream()))) {
+            containerId = reader.readLine();
+        }
+        String[] copyCommand = new String[] { containerRuntime.getExecutableName(), "cp", outputPath + "/.",
+                containerId + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH };
+        runCommand(copyCommand, "Failed to copy source-jar and libs from host to builder container", null);
+        super.preBuild(buildArgs);
+    }
+
+    @Override
+    protected String[] getBuildCommand(List<String> args) {
+        return new String[] { containerRuntime.getExecutableName(), "start", "--attach", containerId };
+    }
+
+    @Override
+    protected void postBuild() throws InterruptedException, IOException {
+        copyFromBuilder(resultingExecutableName, "Failed to copy native executable from container back to the host.");
+        if (nativeConfig.debug.enabled) {
+            copyFromBuilder("sources", "Failed to copy sources from container back to the host.");
+        }
+        String[] removeCommand = new String[] { containerRuntime.getExecutableName(), "container", "rm", "--volumes",
+                containerId };
+        runCommand(removeCommand, "Failed to remove container: " + containerId, null);
+    }
+
+    private void copyFromBuilder(String path, String errorMsg) throws IOException, InterruptedException {
+        String[] copyCommand = new String[] { containerRuntime.getExecutableName(), "cp",
+                containerId + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH + "/" + path, outputPath };
+        runCommand(copyCommand, errorMsg, null);
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java
new file mode 100644
index 0000000000000..d3adaf2d0d220
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java
@@ -0,0 +1,117 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM;
+import io.quarkus.deployment.util.ProcessUtil;
+
+public abstract class NativeImageBuildRunner {
+
+    private static final Logger log = Logger.getLogger(NativeImageBuildRunner.class);
+
+    public GraalVM.Version getGraalVMVersion() {
+        final GraalVM.Version graalVMVersion;
+        try {
+            String[] versionCommand = getGraalVMVersionCommand(Collections.singletonList("--version"));
+            log.debugf(String.join(" ", versionCommand).replace("$", "\\$"));
+            Process versionProcess = new ProcessBuilder(versionCommand)
+                    .redirectErrorStream(true)
+                    .start();
+            versionProcess.waitFor();
+            try (BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(versionProcess.getInputStream(), StandardCharsets.UTF_8))) {
+                graalVMVersion = GraalVM.Version.of(reader.lines());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to get GraalVM version", e);
+        }
+        return graalVMVersion;
+    }
+
+    public void setup(boolean processInheritIODisabled) {
+    }
+
+    public void cleanupServer(File outputDir) throws InterruptedException, IOException {
+    }
+
+    public int build(List<String> args, Path outputDir, boolean processInheritIODisabled)
+            throws InterruptedException, IOException {
+        preBuild(args);
+        try {
+            CountDownLatch errorReportLatch = new CountDownLatch(1);
+            final String[] buildCommand = getBuildCommand(args);
+            final ProcessBuilder processBuilder = new ProcessBuilder(buildCommand)
+                    .directory(outputDir.toFile());
+            log.info(String.join(" ", buildCommand).replace("$", "\\$"));
+            final Process process = ProcessUtil.launchProcessStreamStdOut(processBuilder, processInheritIODisabled);
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(new ErrorReplacingProcessReader(process.getErrorStream(), outputDir.resolve("reports").toFile(),
+                    errorReportLatch));
+            executor.shutdown();
+            errorReportLatch.await();
+            return process.waitFor();
+        } finally {
+            postBuild();
+        }
+    }
+
+    protected abstract String[] getGraalVMVersionCommand(List<String> args);
+
+    protected abstract String[] getBuildCommand(List<String> args);
+
+    protected void preBuild(List<String> buildArgs) throws IOException, InterruptedException {
+    }
+
+    protected void postBuild() throws InterruptedException, IOException {
+    }
+
+    /**
+     * Run {@code command} in {@code workingDirectory} and log error if {@code errorMsg} is not null.
+     *
+     * @param command The command to run
+     * @param errorMsg The error message to be printed in case of failure.
+     *        If {@code null} the failure is ignored, but logged.
+     * @param workingDirectory The directory in which to run the command
+     */
+    void runCommand(String[] command, String errorMsg, File workingDirectory) {
+        log.info(String.join(" ", command).replace("$", "\\$"));
+        Process process = null;
+        try {
+            final ProcessBuilder processBuilder = new ProcessBuilder(command);
+            if (workingDirectory != null) {
+                processBuilder.directory(workingDirectory);
+            }
+            process = processBuilder.start();
+            final int exitCode = process.waitFor();
+            if (exitCode != 0) {
+                if (errorMsg != null) {
+                    log.error(errorMsg);
+                } else {
+                    log.debugf("Command: " + String.join(" ", command) + " failed with exit code " + exitCode);
+                }
+            }
+        } catch (IOException | InterruptedException e) {
+            if (errorMsg != null) {
+                log.error(errorMsg);
+            } else {
+                log.debugf(e, "Command: " + String.join(" ", command) + " failed.");
+            }
+        } finally {
+            if (process != null) {
+                process.destroy();
+            }
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
index aaf9e5d89bdc9..b8f59c561217b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -1,48 +1,47 @@
 package io.quarkus.deployment.pkg.steps;
 
-import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.jboss.logging.Logger;
 
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
 import io.quarkus.bootstrap.util.IoUtils;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.pkg.NativeConfig;
 import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageSourceJarBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabled;
-import io.quarkus.deployment.util.FileUtil;
-import io.quarkus.deployment.util.GlobUtil;
-import io.quarkus.deployment.util.ProcessUtil;
 
 public class NativeImageBuildStep {
 
     private static final Logger log = Logger.getLogger(NativeImageBuildStep.class);
-    private static final String DEBUG_BUILD_PROCESS_PORT = "5005";
-    private static final String GRAALVM_HOME = "GRAALVM_HOME";
+    public static final String DEBUG_BUILD_PROCESS_PORT = "5005";
 
     /**
      * Name of the <em>system</em> property to retrieve JAVA_HOME
@@ -61,351 +60,281 @@ public class NativeImageBuildStep {
 
     private static final int OOM_ERROR_VALUE = 137;
     private static final String QUARKUS_XMX_PROPERTY = "quarkus.native.native-image-xmx";
-    private static final String CONTAINER_BUILD_VOLUME_PATH = "/project";
+    public static final String CONTAINER_BUILD_VOLUME_PATH = "/project";
     private static final String TRUST_STORE_SYSTEM_PROPERTY_MARKER = "-Djavax.net.ssl.trustStore=";
     private static final String MOVED_TRUST_STORE_NAME = "trustStore";
+    public static final String APP_SOURCES = "app-sources";
 
     @BuildStep(onlyIf = NativeBuild.class)
     ArtifactResultBuildItem result(NativeImageBuildItem image) {
         return new ArtifactResultBuildItem(image.getPath(), PackageConfig.NATIVE, Collections.emptyMap());
     }
 
+    @BuildStep(onlyIf = NativeSourcesBuild.class)
+    ArtifactResultBuildItem nativeSourcesResult(NativeConfig nativeConfig,
+            BuildSystemTargetBuildItem buildSystemTargetBuildItem,
+            NativeImageSourceJarBuildItem nativeImageSourceJarBuildItem,
+            OutputTargetBuildItem outputTargetBuildItem,
+            PackageConfig packageConfig,
+            List<NativeImageSystemPropertyBuildItem> nativeImageProperties) {
+
+        Path outputDir;
+        try {
+            outputDir = buildSystemTargetBuildItem.getOutputDirectory().resolve("native-sources");
+            IoUtils.createOrEmptyDir(outputDir);
+            IoUtils.copy(nativeImageSourceJarBuildItem.getPath().getParent(), outputDir);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to create native-sources output directory", e);
+        }
+
+        Path runnerJar = outputDir.resolve(nativeImageSourceJarBuildItem.getPath().getFileName());
+
+        String nativeImageName = getNativeImageName(outputTargetBuildItem, packageConfig);
+
+        NativeImageInvokerInfo nativeImageArgs = new NativeImageInvokerInfo.Builder()
+                .setNativeConfig(nativeConfig)
+                .setOutputTargetBuildItem(outputTargetBuildItem)
+                .setNativeImageProperties(nativeImageProperties)
+                .setOutputDir(outputDir)
+                .setRunnerJarName(runnerJar.getFileName().toString())
+                // the path to native-image is not known now, it is only known at the time the native-sources will be consumed
+                .setNativeImageName(nativeImageName)
+                .setContainerBuild(nativeConfig.containerRuntime.isPresent() || nativeConfig.containerBuild)
+                .build();
+        List<String> command = nativeImageArgs.getArgs();
+        try (FileOutputStream commandFOS = new FileOutputStream(outputDir.resolve("native-image.args").toFile())) {
+            String commandStr = String.join(" ", command);
+            commandFOS.write(commandStr.getBytes(StandardCharsets.UTF_8));
+
+            log.info("The sources for a subsequent native-image run along with the necessary arguments can be found in "
+                    + outputDir);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to build native image sources", e);
+        }
+
+        // drop the original output to avoid confusion
+        IoUtils.recursiveDelete(nativeImageSourceJarBuildItem.getPath().getParent());
+
+        return new ArtifactResultBuildItem(nativeImageSourceJarBuildItem.getPath(), PackageConfig.NATIVE_SOURCES,
+                Collections.emptyMap());
+    }
+
     @BuildStep
     public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJarBuildItem nativeImageSourceJarBuildItem,
             OutputTargetBuildItem outputTargetBuildItem,
             PackageConfig packageConfig,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
             List<NativeImageSystemPropertyBuildItem> nativeImageProperties,
-            final Optional<ProcessInheritIODisabled> processInheritIODisabled) {
+            Optional<ProcessInheritIODisabled> processInheritIODisabled) {
+        if (nativeConfig.debug.enabled) {
+            copyJarSourcesToLib(outputTargetBuildItem, curateOutcomeBuildItem);
+            copySourcesToSourceCache(outputTargetBuildItem);
+        }
+
         Path runnerJar = nativeImageSourceJarBuildItem.getPath();
         log.info("Building native image from " + runnerJar);
         Path outputDir = nativeImageSourceJarBuildItem.getPath().getParent();
 
         final String runnerJarName = runnerJar.getFileName().toString();
 
-        HashMap<String, String> env = new HashMap<>(System.getenv());
-        List<String> nativeImage;
-
         String noPIE = "";
 
-        boolean isContainerBuild = nativeConfig.containerRuntime.isPresent() || nativeConfig.containerBuild;
-        if (isContainerBuild) {
-            String containerRuntime = nativeConfig.containerRuntime.orElse("docker");
-            // E.g. "/usr/bin/docker run -v {{PROJECT_DIR}}:/project --rm quarkus/graalvm-native-image"
-            nativeImage = new ArrayList<>();
-
-            String outputPath = outputDir.toAbsolutePath().toString();
-            if (SystemUtils.IS_OS_WINDOWS) {
-                outputPath = FileUtil.translateToVolumePath(outputPath);
-            }
-            Collections.addAll(nativeImage, containerRuntime, "run", "-v",
-                    outputPath + ":" + CONTAINER_BUILD_VOLUME_PATH + ":z", "--env", "LANG=C");
-
-            if (SystemUtils.IS_OS_LINUX) {
-                if ("docker".equals(containerRuntime)) {
-                    String uid = getLinuxID("-ur");
-                    String gid = getLinuxID("-gr");
-                    if (uid != null && gid != null && !"".equals(uid) && !"".equals(gid)) {
-                        Collections.addAll(nativeImage, "--user", uid + ":" + gid);
-                    }
-                } else if ("podman".equals(containerRuntime)) {
-                    // Needed to avoid AccessDeniedExceptions
-                    nativeImage.add("--userns=keep-id");
-                }
-            }
-            nativeConfig.containerRuntimeOptions.ifPresent(nativeImage::addAll);
-            if (nativeConfig.debugBuildProcess && nativeConfig.publishDebugBuildProcessPort) {
-                // publish the debug port onto the host if asked for
-                nativeImage.add("--publish=" + DEBUG_BUILD_PROCESS_PORT + ":" + DEBUG_BUILD_PROCESS_PORT);
-            }
-            Collections.addAll(nativeImage, "--rm", nativeConfig.builderImage);
-
-            if ("docker".equals(containerRuntime) || "podman".equals(containerRuntime)) {
-                // we pull the docker image in order to give users an indication of which step the process is at
-                // it's not strictly necessary we do this, however if we don't the subsequent version command
-                // will appear to block and no output will be shown
-                log.info("Checking image status " + nativeConfig.builderImage);
-                Process pullProcess = null;
-                try {
-                    final ProcessBuilder pb = new ProcessBuilder(
-                            Arrays.asList(containerRuntime, "pull", nativeConfig.builderImage));
-                    pullProcess = ProcessUtil.launchProcess(pb, processInheritIODisabled);
-                    pullProcess.waitFor();
-                } catch (IOException | InterruptedException e) {
-                    throw new RuntimeException("Failed to pull builder image " + nativeConfig.builderImage, e);
-                } finally {
-                    if (pullProcess != null) {
-                        pullProcess.destroy();
-                    }
-                }
-            }
-
-        } else {
-            if (SystemUtils.IS_OS_LINUX) {
-                noPIE = detectNoPIE();
-            }
-
-            Optional<String> graal = nativeConfig.graalvmHome;
-            File java = nativeConfig.javaHome;
-            if (graal.isPresent()) {
-                env.put(GRAALVM_HOME, graal.get());
-            }
-            if (java == null) {
-                // try system property first - it will be the JAVA_HOME used by the current JVM
-                String home = System.getProperty(JAVA_HOME_SYS);
-                if (home == null) {
-                    // No luck, somewhat a odd JVM not enforcing this property
-                    // try with the JAVA_HOME environment variable
-                    home = env.get(JAVA_HOME_ENV);
-                }
-
-                if (home != null) {
-                    java = new File(home);
-                }
-            }
-            nativeImage = Collections.singletonList(getNativeImageExecutable(graal, java, env).getAbsolutePath());
+        boolean isContainerBuild = isContainerBuild(nativeConfig);
+        if (!isContainerBuild && SystemUtils.IS_OS_LINUX) {
+            noPIE = detectNoPIE();
         }
 
-        final Optional<String> graalVMVersion;
-
-        try {
-            List<String> versionCommand = new ArrayList<>(nativeImage);
-            versionCommand.add("--version");
+        String nativeImageName = getNativeImageName(outputTargetBuildItem, packageConfig);
+        String resultingExecutableName = getResultingExecutableName(nativeImageName, isContainerBuild);
 
-            Process versionProcess = new ProcessBuilder(versionCommand.toArray(new String[0]))
-                    .redirectErrorStream(true)
-                    .start();
-            versionProcess.waitFor();
-            try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(versionProcess.getInputStream(), StandardCharsets.UTF_8))) {
-                graalVMVersion = reader.lines().filter((l) -> l.startsWith("GraalVM Version")).findFirst();
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to get GraalVM version", e);
-        }
+        NativeImageBuildRunner buildRunner = getNativeImageBuildRunner(nativeConfig, outputDir, resultingExecutableName);
+        buildRunner.setup(processInheritIODisabled.isPresent());
+        final GraalVM.Version graalVMVersion = buildRunner.getGraalVMVersion();
 
-        if (graalVMVersion.isPresent()) {
-            checkGraalVMVersion(graalVMVersion.get());
+        if (graalVMVersion.isDetected()) {
+            checkGraalVMVersion(graalVMVersion);
         } else {
             log.error("Unable to get GraalVM version from the native-image binary.");
         }
 
         try {
-            List<String> command = new ArrayList<>(nativeImage);
-            if (nativeConfig.cleanupServer) {
-                List<String> cleanup = new ArrayList<>(nativeImage);
-                cleanup.add("--server-shutdown");
-                final ProcessBuilder pb = new ProcessBuilder(cleanup.toArray(new String[0]));
-                pb.directory(outputDir.toFile());
-                final Process process = ProcessUtil.launchProcess(pb, processInheritIODisabled);
-                process.waitFor();
-            }
-            Boolean enableSslNative = false;
-            for (NativeImageSystemPropertyBuildItem prop : nativeImageProperties) {
-                //todo: this should be specific build items
-                if (prop.getKey().equals("quarkus.ssl.native") && prop.getValue() != null) {
-                    enableSslNative = Boolean.parseBoolean(prop.getValue());
-                } else if (prop.getKey().equals("quarkus.jni.enable") && prop.getValue().equals("false")) {
-                    log.warn("Your application is setting the deprecated 'quarkus.jni.enable' configuration key to false."
-                            + " Please consider removing this configuration key as it is ignored (JNI is always enabled) and it"
-                            + " will be removed in a future Quarkus version.");
-                } else if (prop.getKey().equals("quarkus.native.enable-all-security-services") && prop.getValue() != null) {
-                    nativeConfig.enableAllSecurityServices |= Boolean.parseBoolean(prop.getValue());
-                } else if (prop.getKey().equals("quarkus.native.enable-all-charsets") && prop.getValue() != null) {
-                    nativeConfig.addAllCharsets |= Boolean.parseBoolean(prop.getValue());
-                } else if (prop.getKey().equals("quarkus.native.enable-all-timezones") && prop.getValue() != null) {
-                    nativeConfig.includeAllTimeZones |= Boolean.parseBoolean(prop.getValue());
-                } else {
-                    // todo maybe just -D is better than -J-D in this case
-                    if (prop.getValue() == null) {
-                        command.add("-J-D" + prop.getKey());
-                    } else {
-                        command.add("-J-D" + prop.getKey() + "=" + prop.getValue());
-                    }
-                }
+            if (nativeConfig.cleanupServer && !graalVMVersion.isMandrel()) {
+                buildRunner.cleanupServer(outputDir.toFile());
             }
-            command.add("-J-Duser.language=" + System.getProperty("user.language"));
-            // Native image runtime uses the host's (i.e. build time) value of file.encoding
-            // system property. We intentionally default this to UTF-8 to avoid platform specific
-            // defaults to be picked up which can then result in inconsistent behaviour in the
-            // generated native application
-            command.add("-J-Dfile.encoding=UTF-8");
 
-            if (enableSslNative) {
-                nativeConfig.enableHttpsUrlHandler = true;
-                nativeConfig.enableAllSecurityServices = true;
-            }
-
-            handleAdditionalProperties(nativeConfig, command, isContainerBuild, outputDir);
-            nativeConfig.resources.includes.ifPresent(l -> l.stream()
-                    .map(GlobUtil::toRegexPattern)
-                    .map(re -> "-H:IncludeResources=" + re.trim())
-                    .forEach(command::add));
-            command.add("--initialize-at-build-time=");
-            command.add("-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time
-            command.add("-H:+JNI");
-            command.add("-jar");
-            command.add(runnerJarName);
+            NativeImageInvokerInfo commandAndExecutable = new NativeImageInvokerInfo.Builder()
+                    .setNativeConfig(nativeConfig)
+                    .setOutputTargetBuildItem(outputTargetBuildItem)
+                    .setNativeImageProperties(nativeImageProperties)
+                    .setOutputDir(outputDir)
+                    .setRunnerJarName(runnerJarName)
+                    .setNativeImageName(nativeImageName)
+                    .setNoPIE(noPIE)
+                    .setContainerBuild(isContainerBuild)
+                    .setGraalVMVersion(graalVMVersion)
+                    .build();
 
-            if (nativeConfig.enableFallbackImages) {
-                command.add("-H:FallbackThreshold=5");
-            } else {
-                //Default: be strict as those fallback images aren't very useful
-                //and tend to cover up real problems.
-                command.add("-H:FallbackThreshold=0");
-            }
-
-            if (nativeConfig.reportErrorsAtRuntime) {
-                command.add("-H:+ReportUnsupportedElementsAtRuntime");
-            }
-            if (nativeConfig.reportExceptionStackTraces) {
-                command.add("-H:+ReportExceptionStackTraces");
-            }
-            if (nativeConfig.debug.enabled) {
-                command.add("-H:GenerateDebugInfo=1");
-            }
-            if (nativeConfig.debugBuildProcess) {
-                command.add("-J-Xrunjdwp:transport=dt_socket,address=" + DEBUG_BUILD_PROCESS_PORT + ",server=y,suspend=y");
-            }
-            if (nativeConfig.enableReports) {
-                command.add("-H:+PrintAnalysisCallTree");
-            }
-            if (nativeConfig.dumpProxies) {
-                command.add("-Dsun.misc.ProxyGenerator.saveGeneratedFiles=true");
-                if (nativeConfig.enableServer) {
-                    log.warn(
-                            "Options dumpProxies and enableServer are both enabled: this will get the proxies dumped in an unknown external working directory");
-                }
-            }
-            if (nativeConfig.nativeImageXmx.isPresent()) {
-                command.add("-J-Xmx" + nativeConfig.nativeImageXmx.get());
-            }
-            List<String> protocols = new ArrayList<>(2);
-            if (nativeConfig.enableHttpUrlHandler) {
-                protocols.add("http");
-            }
-            if (nativeConfig.enableHttpsUrlHandler) {
-                protocols.add("https");
-            }
-            if (nativeConfig.addAllCharsets) {
-                command.add("-H:+AddAllCharsets");
-            } else {
-                command.add("-H:-AddAllCharsets");
-            }
-            //if 'includeAllTimeZones' is set, don't request it explicitly as native-image will log a warning about this being now the default.
-            //(But still disable it when necessary)
-            if (!nativeConfig.includeAllTimeZones) {
-                command.add("-H:-IncludeAllTimeZones");
-            }
-            if (!protocols.isEmpty()) {
-                command.add("-H:EnableURLProtocols=" + String.join(",", protocols));
-            }
-            if (nativeConfig.enableAllSecurityServices) {
-                command.add("--enable-all-security-services");
-            }
-            if (!noPIE.isEmpty()) {
-                command.add("-H:NativeLinkerOption=" + noPIE);
-            }
+            List<String> nativeImageArgs = commandAndExecutable.args;
 
-            if (!nativeConfig.enableIsolates) {
-                command.add("-H:-SpawnIsolates");
-            }
-            if (!nativeConfig.enableJni) {
-                log.warn("Your application is setting the deprecated 'quarkus.native.enable-jni' configuration key to false."
-                        + " Please consider removing this configuration key as it is ignored (JNI is always enabled) and it"
-                        + " will be removed in a future Quarkus version.");
-            }
-            if (!nativeConfig.enableServer && !SystemUtils.IS_OS_WINDOWS) {
-                command.add("--no-server");
-            }
-            if (nativeConfig.enableVmInspection) {
-                command.add("-H:+AllowVMInspection");
-            }
-            if (nativeConfig.autoServiceLoaderRegistration) {
-                command.add("-H:+UseServiceLoaderFeature");
-                //When enabling, at least print what exactly is being added:
-                command.add("-H:+TraceServiceLoaderFeature");
-            } else {
-                command.add("-H:-UseServiceLoaderFeature");
-            }
-            if (nativeConfig.fullStackTraces) {
-                command.add("-H:+StackTrace");
-            } else {
-                command.add("-H:-StackTrace");
-            }
-            String executableName = outputTargetBuildItem.getBaseName() + packageConfig.runnerSuffix;
-            command.add(executableName);
-
-            log.info(String.join(" ", command));
-            CountDownLatch errorReportLatch = new CountDownLatch(1);
-            final ProcessBuilder processBuilder = new ProcessBuilder(command).directory(outputDir.toFile());
-            final Process process = ProcessUtil.launchProcessStreamStdOut(processBuilder, processInheritIODisabled);
-            ExecutorService executor = Executors.newSingleThreadExecutor();
-            executor.submit(new ErrorReplacingProcessReader(process.getErrorStream(), outputDir.resolve("reports").toFile(),
-                    errorReportLatch));
-            executor.shutdown();
-            errorReportLatch.await();
-            int exitCode = process.waitFor();
+            int exitCode = buildRunner.build(nativeImageArgs, outputDir, processInheritIODisabled.isPresent());
             if (exitCode != 0) {
-                throw imageGenerationFailed(exitCode, command);
+                throw imageGenerationFailed(exitCode, nativeImageArgs);
             }
-            if (SystemUtils.IS_OS_WINDOWS && !(isContainerBuild)) {
-                //once image is generated it gets added .exe on Windows
-                executableName = executableName + ".exe";
+            Path generatedExecutablePath = outputDir.resolve(resultingExecutableName);
+            Path finalExecutablePath = outputTargetBuildItem.getOutputDirectory().resolve(resultingExecutableName);
+            IoUtils.copy(generatedExecutablePath, finalExecutablePath);
+            Files.delete(generatedExecutablePath);
+            if (nativeConfig.debug.enabled) {
+                final String sources = "sources";
+                final Path generatedSources = outputDir.resolve(sources);
+                final Path finalSources = outputTargetBuildItem.getOutputDirectory().resolve(sources);
+                IoUtils.copy(generatedSources, finalSources);
+                IoUtils.recursiveDelete(generatedSources);
             }
-            Path generatedImage = outputDir.resolve(executableName);
-            Path finalPath = outputTargetBuildItem.getOutputDirectory().resolve(executableName);
-            IoUtils.copy(generatedImage, finalPath);
-            Files.delete(generatedImage);
-            System.setProperty("native.image.path", finalPath.toAbsolutePath().toString());
+            System.setProperty("native.image.path", finalExecutablePath.toAbsolutePath().toString());
 
-            if (objcopyExists(env)) {
+            if (objcopyExists()) {
                 if (nativeConfig.debug.enabled) {
-                    splitDebugSymbols(finalPath);
+                    splitDebugSymbols(finalExecutablePath);
                 }
                 // Strip debug symbols regardless, because the underlying JDK might contain them
-                objcopy("--strip-debug", finalPath.toString());
+                objcopy("--strip-debug", finalExecutablePath.toString());
+            } else {
+                log.warn("objcopy executable not found in PATH. Debug symbols will not be separated from executable.");
+                log.warn("That will result in a larger native image with debug symbols embedded in it.");
             }
 
-            return new NativeImageBuildItem(finalPath);
+            return new NativeImageBuildItem(finalExecutablePath);
         } catch (Exception e) {
             throw new RuntimeException("Failed to build native image", e);
+        } finally {
+            if (nativeConfig.debug.enabled) {
+                removeJarSourcesFromLib(outputTargetBuildItem);
+                IoUtils.recursiveDelete(outputDir.resolve(Paths.get(APP_SOURCES)));
+            }
         }
     }
 
-    private void handleAdditionalProperties(NativeConfig nativeConfig, List<String> command, boolean isContainerBuild,
-            Path outputDir) {
-        if (nativeConfig.additionalBuildArgs.isPresent()) {
-            List<String> strings = nativeConfig.additionalBuildArgs.get();
-            for (String buildArg : strings) {
-                String trimmedBuildArg = buildArg.trim();
-                if (trimmedBuildArg.contains(TRUST_STORE_SYSTEM_PROPERTY_MARKER) && isContainerBuild) {
-                    /*
-                     * When the native binary is being built with a docker container, because a volume is created,
-                     * we need to copy the trustStore file into the output directory (which is the root of volume)
-                     * and change the value of 'javax.net.ssl.trustStore' property to point to this value
-                     *
-                     * TODO: we might want to introduce a dedicated property in order to overcome this ugliness
-                     */
-                    int index = trimmedBuildArg.indexOf(TRUST_STORE_SYSTEM_PROPERTY_MARKER);
-                    if (trimmedBuildArg.length() > index + 2) {
-                        String configuredTrustStorePath = trimmedBuildArg
-                                .substring(index + TRUST_STORE_SYSTEM_PROPERTY_MARKER.length());
-                        try {
-                            IoUtils.copy(Paths.get(configuredTrustStorePath), outputDir.resolve(MOVED_TRUST_STORE_NAME));
-                            command.add(trimmedBuildArg.substring(0, index) + TRUST_STORE_SYSTEM_PROPERTY_MARKER
-                                    + CONTAINER_BUILD_VOLUME_PATH + "/" + MOVED_TRUST_STORE_NAME);
-                        } catch (IOException e) {
-                            throw new UncheckedIOException("Unable to copy trustStore file '" + configuredTrustStorePath
-                                    + "' to volume root directory '" + outputDir.toAbsolutePath().toString() + "'", e);
+    private String getNativeImageName(OutputTargetBuildItem outputTargetBuildItem, PackageConfig packageConfig) {
+        return outputTargetBuildItem.getBaseName() + packageConfig.runnerSuffix;
+    }
+
+    private String getResultingExecutableName(String nativeImageName, boolean isContainerBuild) {
+        String resultingExecutableName = nativeImageName;
+        if (SystemUtils.IS_OS_WINDOWS && !isContainerBuild) {
+            //once image is generated it gets added .exe on Windows
+            resultingExecutableName = resultingExecutableName + ".exe";
+        }
+        return resultingExecutableName;
+    }
+
+    public static boolean isContainerBuild(NativeConfig nativeConfig) {
+        return nativeConfig.containerRuntime.isPresent() || nativeConfig.containerBuild || nativeConfig.remoteContainerBuild;
+    }
+
+    private static NativeImageBuildRunner getNativeImageBuildRunner(NativeConfig nativeConfig, Path outputDir,
+            String resultingExecutableName) {
+        if (!isContainerBuild(nativeConfig)) {
+            NativeImageBuildLocalRunner localRunner = getNativeImageBuildLocalRunner(nativeConfig);
+            if (localRunner != null) {
+                return localRunner;
+            }
+            String executableName = getNativeImageExecutableName();
+            String errorMessage = "Cannot find the `" + executableName
+                    + "` in the GRAALVM_HOME, JAVA_HOME and System PATH. Install it using `gu install native-image`";
+            if (!SystemUtils.IS_OS_LINUX) {
+                throw new RuntimeException(errorMessage);
+            }
+            log.warn(errorMessage + " Attempting to fall back to container build.");
+        }
+        if (nativeConfig.remoteContainerBuild) {
+            return new NativeImageBuildRemoteContainerRunner(nativeConfig, outputDir, resultingExecutableName);
+        }
+        return new NativeImageBuildLocalContainerRunner(nativeConfig, outputDir);
+    }
+
+    private void copyJarSourcesToLib(OutputTargetBuildItem outputTargetBuildItem,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        Path targetDirectory = outputTargetBuildItem.getOutputDirectory()
+                .resolve(outputTargetBuildItem.getBaseName() + "-native-image-source-jar");
+        Path libDir = targetDirectory.resolve(JarResultBuildStep.LIB);
+        File libDirFile = libDir.toFile();
+        if (!libDirFile.exists()) {
+            libDirFile.mkdirs();
+        }
+
+        final List<AppDependency> appDeps = curateOutcomeBuildItem.getEffectiveModel().getUserDependencies();
+        for (AppDependency appDep : appDeps) {
+            final AppArtifact depArtifact = appDep.getArtifact();
+            if (depArtifact.getType().equals("jar")) {
+                for (Path resolvedDep : depArtifact.getPaths()) {
+                    if (!Files.isDirectory(resolvedDep)) {
+                        // Do we need to handle transformed classes?
+                        // Their bytecode might have been modified but is there source for such modification?
+                        final Path jarSourceDep = toJarSource(resolvedDep);
+                        if (jarSourceDep.toFile().exists()) {
+                            final String fileName = depArtifact.getGroupId() + "." + jarSourceDep.getFileName();
+                            final Path targetPath = libDir.resolve(fileName);
+                            try {
+                                Files.copy(jarSourceDep, targetPath, StandardCopyOption.REPLACE_EXISTING);
+                            } catch (IOException e) {
+                                throw new RuntimeException("Unable to copy from " + jarSourceDep + " to " + targetPath, e);
+                            }
                         }
                     }
-                } else {
-                    command.add(trimmedBuildArg);
                 }
             }
         }
     }
 
+    private static Path toJarSource(Path path) {
+        final Path parent = path.getParent();
+        final String fileName = path.getFileName().toString();
+        final int extensionIndex = fileName.lastIndexOf('.');
+        final String sourcesFileName = String.format("%s-sources.jar", fileName.substring(0, extensionIndex));
+        return parent.resolve(sourcesFileName);
+    }
+
+    private void removeJarSourcesFromLib(OutputTargetBuildItem outputTargetBuildItem) {
+        Path targetDirectory = outputTargetBuildItem.getOutputDirectory()
+                .resolve(outputTargetBuildItem.getBaseName() + "-native-image-source-jar");
+        Path libDir = targetDirectory.resolve(JarResultBuildStep.LIB);
+
+        final File[] jarSources = libDir.toFile()
+                .listFiles((file, name) -> name.endsWith("-sources.jar"));
+        Stream.of(Objects.requireNonNull(jarSources)).forEach(File::delete);
+    }
+
+    private static void copySourcesToSourceCache(OutputTargetBuildItem outputTargetBuildItem) {
+        Path targetDirectory = outputTargetBuildItem.getOutputDirectory()
+                .resolve(outputTargetBuildItem.getBaseName() + "-native-image-source-jar");
+
+        final Path targetSrc = targetDirectory.resolve(Paths.get(APP_SOURCES));
+        final File targetSrcFile = targetSrc.toFile();
+        if (!targetSrcFile.exists()) {
+            targetSrcFile.mkdirs();
+        }
+
+        final Path javaSourcesPath = outputTargetBuildItem.getOutputDirectory().resolve(
+                Paths.get("..", "src", "main", "java"));
+
+        if (Files.exists(javaSourcesPath)) {
+            try (Stream<Path> paths = Files.walk(javaSourcesPath)) {
+                paths.forEach(path -> {
+                    Path targetPath = Paths.get(targetSrc.toString(),
+                            path.toString().substring(javaSourcesPath.toString().length()));
+                    try {
+                        Files.copy(path, targetPath, StandardCopyOption.REPLACE_EXISTING);
+                    } catch (IOException e) {
+                        throw new UncheckedIOException("Unable to copy from " + path + " to " + targetPath, e);
+                    }
+                });
+            } catch (IOException e) {
+                throw new UncheckedIOException("Unable to walk path " + javaSourcesPath, e);
+            }
+        }
+    }
+
     private RuntimeException imageGenerationFailed(int exitValue, List<String> command) {
         if (exitValue == OOM_ERROR_VALUE) {
             if (command.contains("docker") && !SystemUtils.IS_OS_LINUX) {
@@ -422,96 +351,67 @@ private RuntimeException imageGenerationFailed(int exitValue, List<String> comma
         }
     }
 
-    private void checkGraalVMVersion(String version) {
-        log.info("Running Quarkus native-image plugin on " + version);
-        final List<String> obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2.", "19.3.", "20.0.");
-        final boolean vmVersionIsObsolete = obsoleteGraalVmVersions.stream().anyMatch(v -> version.contains(" " + v));
-        if (vmVersionIsObsolete) {
-            throw new IllegalStateException("Out of date version of GraalVM detected: " + version + "."
-                    + " Quarkus currently supports 20.1.0. Please upgrade GraalVM to this version.");
+    private void checkGraalVMVersion(GraalVM.Version version) {
+        log.info("Running Quarkus native-image plugin on " + version.getFullVersion());
+        if (version.isObsolete()) {
+            final int major = GraalVM.Version.CURRENT.major;
+            final int minor = GraalVM.Version.CURRENT.minor;
+            throw new IllegalStateException("Out of date version of GraalVM detected: " + version.getFullVersion() + "."
+                    + " Quarkus currently supports " + major + "." + minor + ". Please upgrade GraalVM to this version.");
         }
     }
 
-    private static File getNativeImageExecutable(Optional<String> graalVmHome, File javaHome, Map<String, String> env) {
-        String imageName = SystemUtils.IS_OS_WINDOWS ? "native-image.cmd" : "native-image";
-        if (graalVmHome.isPresent()) {
-            File file = Paths.get(graalVmHome.get(), "bin", imageName).toFile();
+    private static NativeImageBuildLocalRunner getNativeImageBuildLocalRunner(NativeConfig nativeConfig) {
+        String executableName = getNativeImageExecutableName();
+        if (nativeConfig.graalvmHome.isPresent()) {
+            File file = Paths.get(nativeConfig.graalvmHome.get(), "bin", executableName).toFile();
             if (file.exists()) {
-                return file;
+                return new NativeImageBuildLocalRunner(file.getAbsolutePath());
+            }
+        }
+
+        File javaHome = nativeConfig.javaHome;
+        if (javaHome == null) {
+            // try system property first - it will be the JAVA_HOME used by the current JVM
+            String home = System.getProperty(JAVA_HOME_SYS);
+            if (home == null) {
+                // No luck, somewhat a odd JVM not enforcing this property
+                // try with the JAVA_HOME environment variable
+                home = System.getenv(JAVA_HOME_ENV);
+            }
+
+            if (home != null) {
+                javaHome = new File(home);
             }
         }
 
         if (javaHome != null) {
-            File file = new File(javaHome, "bin/" + imageName);
+            File file = new File(javaHome, "bin/" + executableName);
             if (file.exists()) {
-                return file;
+                return new NativeImageBuildLocalRunner(file.getAbsolutePath());
             }
         }
 
         // System path
-        String systemPath = env.get(PATH);
+        String systemPath = System.getenv(PATH);
         if (systemPath != null) {
             String[] pathDirs = systemPath.split(File.pathSeparator);
             for (String pathDir : pathDirs) {
                 File dir = new File(pathDir);
                 if (dir.isDirectory()) {
-                    File file = new File(dir, imageName);
+                    File file = new File(dir, executableName);
                     if (file.exists()) {
-                        return file;
+                        return new NativeImageBuildLocalRunner(file.getAbsolutePath());
                     }
                 }
             }
         }
 
-        throw new RuntimeException("Cannot find the `" + imageName + "` in the GRAALVM_HOME, JAVA_HOME and System " +
-                "PATH. Install it using `gu install native-image`");
-
-    }
-
-    private static String getLinuxID(String option) {
-        Process process;
-
-        try {
-            StringBuilder responseBuilder = new StringBuilder();
-            String line;
-
-            ProcessBuilder idPB = new ProcessBuilder().command("id", option);
-            idPB.redirectError(new File("/dev/null"));
-            idPB.redirectInput(new File("/dev/null"));
-
-            process = idPB.start();
-            try (InputStream inputStream = process.getInputStream()) {
-                try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
-                    while ((line = reader.readLine()) != null) {
-                        responseBuilder.append(line);
-                    }
-                    safeWaitFor(process);
-                    return responseBuilder.toString();
-                }
-            } catch (Throwable t) {
-                safeWaitFor(process);
-                throw t;
-            }
-        } catch (IOException e) { //from process.start()
-            //swallow and return null id
-            return null;
-        }
+        return null;
     }
 
-    static void safeWaitFor(Process process) {
-        boolean intr = false;
-        try {
-            for (;;)
-                try {
-                    process.waitFor();
-                    return;
-                } catch (InterruptedException ex) {
-                    intr = true;
-                }
-        } finally {
-            if (intr)
-                Thread.currentThread().interrupt();
-        }
+    private static String getNativeImageExecutableName() {
+        return SystemUtils.IS_OS_WINDOWS ? "native-image.cmd" : "native-image";
     }
 
     private static String detectNoPIE() {
@@ -535,9 +435,9 @@ private static String testGCCArgument(String argument) {
         return "";
     }
 
-    private boolean objcopyExists(Map<String, String> env) {
+    private boolean objcopyExists() {
         // System path
-        String systemPath = env.get(PATH);
+        String systemPath = System.getenv(PATH);
         if (systemPath != null) {
             String[] pathDirs = systemPath.split(File.pathSeparator);
             for (String pathDir : pathDirs) {
@@ -551,7 +451,6 @@ private boolean objcopyExists(Map<String, String> env) {
             }
         }
 
-        log.debug("Cannot find executable (objcopy) to separate symbols from executable.");
         return false;
     }
 
@@ -565,7 +464,9 @@ private static void objcopy(String... args) {
         final List<String> command = new ArrayList<>(args.length + 1);
         command.add("objcopy");
         command.addAll(Arrays.asList(args));
-        log.infof("Execute %s", command);
+        if (log.isDebugEnabled()) {
+            log.debugf("Execute %s", String.join(" ", command));
+        }
         Process process = null;
         try {
             process = new ProcessBuilder(command).start();
@@ -578,4 +479,367 @@ private static void objcopy(String... args) {
             }
         }
     }
+
+    protected static final class GraalVM {
+        static final class Version implements Comparable<Version> {
+            private static final Pattern PATTERN = Pattern.compile(
+                    "GraalVM Version (([1-9][0-9]*)\\.([0-9]+)\\.[0-9]+|\\p{XDigit}*)[^(\n$]*(\\(Mandrel Distribution\\))?\\s*");
+
+            static final Version UNVERSIONED = new Version("Undefined", -1, -1, Distribution.ORACLE);
+            static final Version SNAPSHOT_ORACLE = new Version("Snapshot", Integer.MAX_VALUE, Integer.MAX_VALUE,
+                    Distribution.ORACLE);
+            static final Version SNAPSHOT_MANDREL = new Version("Snapshot", Integer.MAX_VALUE, Integer.MAX_VALUE,
+                    Distribution.MANDREL);
+
+            static final Version VERSION_20_3 = new Version("GraalVM 20.3", 20, 3, Distribution.ORACLE);
+            static final Version VERSION_21_0 = new Version("GraalVM 21.0", 21, 0, Distribution.ORACLE);
+
+            static final Version MINIMUM = VERSION_20_3;
+            static final Version CURRENT = VERSION_21_0;
+
+            final String fullVersion;
+            final int major;
+            final int minor;
+            final Distribution distribution;
+
+            Version(String fullVersion, int major, int minor, Distribution distro) {
+                this.fullVersion = fullVersion;
+                this.major = major;
+                this.minor = minor;
+                this.distribution = distro;
+            }
+
+            String getFullVersion() {
+                return fullVersion;
+            }
+
+            boolean isDetected() {
+                return this != UNVERSIONED;
+            }
+
+            boolean isObsolete() {
+                return this.compareTo(MINIMUM) < 0;
+            }
+
+            boolean isMandrel() {
+                return distribution == Distribution.MANDREL;
+            }
+
+            boolean isSnapshot() {
+                return this == SNAPSHOT_ORACLE || this == SNAPSHOT_MANDREL;
+            }
+
+            boolean isNewerThan(Version version) {
+                return this.compareTo(version) > 0;
+            }
+
+            @Override
+            public int compareTo(Version o) {
+                if (major > o.major) {
+                    return 1;
+                }
+
+                if (major == o.major) {
+                    if (minor > o.minor) {
+                        return 1;
+                    } else if (minor == o.minor) {
+                        return 0;
+                    }
+                }
+
+                return -1;
+            }
+
+            static Version of(Stream<String> lines) {
+                final Iterator<String> it = lines.iterator();
+                while (it.hasNext()) {
+                    final String line = it.next();
+                    final Matcher matcher = PATTERN.matcher(line);
+                    if (matcher.find() && matcher.groupCount() >= 3) {
+                        final String distro = matcher.group(4);
+                        if (isSnapshot(matcher.group(2))) {
+                            return isMandrel(distro) ? SNAPSHOT_MANDREL : SNAPSHOT_ORACLE;
+                        } else {
+                            return new Version(
+                                    line,
+                                    Integer.parseInt(matcher.group(2)), Integer.parseInt(matcher.group(3)),
+                                    isMandrel(distro) ? Distribution.MANDREL : Distribution.ORACLE);
+                        }
+                    }
+                }
+
+                return UNVERSIONED;
+            }
+
+            private static boolean isSnapshot(String s) {
+                return s == null;
+            }
+
+            private static boolean isMandrel(String s) {
+                return "(Mandrel Distribution)".equals(s);
+            }
+
+            @Override
+            public String toString() {
+                return "Version{" +
+                        "major=" + major +
+                        ", minor=" + minor +
+                        ", distribution=" + distribution +
+                        '}';
+            }
+        }
+
+        enum Distribution {
+            ORACLE,
+            MANDREL;
+        }
+    }
+
+    private static class NativeImageInvokerInfo {
+        private final List<String> args;
+
+        private NativeImageInvokerInfo(List<String> args) {
+            this.args = args;
+        }
+
+        List<String> getArgs() {
+            return args;
+        }
+
+        static class Builder {
+            private NativeConfig nativeConfig;
+            private OutputTargetBuildItem outputTargetBuildItem;
+            private List<NativeImageSystemPropertyBuildItem> nativeImageProperties;
+            private Path outputDir;
+            private String runnerJarName;
+            private String noPIE = "";
+            private boolean isContainerBuild = false;
+            private GraalVM.Version graalVMVersion = GraalVM.Version.UNVERSIONED;
+            private String nativeImageName;
+
+            public Builder setNativeConfig(NativeConfig nativeConfig) {
+                this.nativeConfig = nativeConfig;
+                return this;
+            }
+
+            public Builder setOutputTargetBuildItem(OutputTargetBuildItem outputTargetBuildItem) {
+                this.outputTargetBuildItem = outputTargetBuildItem;
+                return this;
+            }
+
+            public Builder setNativeImageProperties(List<NativeImageSystemPropertyBuildItem> nativeImageProperties) {
+                this.nativeImageProperties = nativeImageProperties;
+                return this;
+            }
+
+            public Builder setOutputDir(Path outputDir) {
+                this.outputDir = outputDir;
+                return this;
+            }
+
+            public Builder setRunnerJarName(String runnerJarName) {
+                this.runnerJarName = runnerJarName;
+                return this;
+            }
+
+            public Builder setNoPIE(String noPIE) {
+                this.noPIE = noPIE;
+                return this;
+            }
+
+            public Builder setContainerBuild(boolean containerBuild) {
+                isContainerBuild = containerBuild;
+                return this;
+            }
+
+            public Builder setGraalVMVersion(GraalVM.Version graalVMVersion) {
+                this.graalVMVersion = graalVMVersion;
+                return this;
+            }
+
+            public Builder setNativeImageName(String nativeImageName) {
+                this.nativeImageName = nativeImageName;
+                return this;
+            }
+
+            public NativeImageInvokerInfo build() {
+                List<String> nativeImageArgs = new ArrayList<>();
+                boolean enableSslNative = false;
+                boolean enableAllSecurityServices = nativeConfig.enableAllSecurityServices;
+                boolean addAllCharsets = nativeConfig.addAllCharsets;
+                boolean enableHttpsUrlHandler = nativeConfig.enableHttpsUrlHandler;
+                for (NativeImageSystemPropertyBuildItem prop : nativeImageProperties) {
+                    //todo: this should be specific build items
+                    if (prop.getKey().equals("quarkus.ssl.native") && prop.getValue() != null) {
+                        enableSslNative = Boolean.parseBoolean(prop.getValue());
+                    } else if (prop.getKey().equals("quarkus.jni.enable") && prop.getValue().equals("false")) {
+                        log.warn("Your application is setting the deprecated 'quarkus.jni.enable' configuration key to false."
+                                + " Please consider removing this configuration key as it is ignored (JNI is always enabled) and it"
+                                + " will be removed in a future Quarkus version.");
+                    } else if (prop.getKey().equals("quarkus.native.enable-all-security-services") && prop.getValue() != null) {
+                        enableAllSecurityServices |= Boolean.parseBoolean(prop.getValue());
+                    } else if (prop.getKey().equals("quarkus.native.enable-all-charsets") && prop.getValue() != null) {
+                        addAllCharsets |= Boolean.parseBoolean(prop.getValue());
+                    } else {
+                        // todo maybe just -D is better than -J-D in this case
+                        if (prop.getValue() == null) {
+                            nativeImageArgs.add("-J-D" + prop.getKey());
+                        } else {
+                            nativeImageArgs.add("-J-D" + prop.getKey() + "=" + prop.getValue());
+                        }
+                    }
+                }
+                if (nativeConfig.userLanguage.isPresent()) {
+                    nativeImageArgs.add("-J-Duser.language=" + nativeConfig.userLanguage.get());
+                }
+                if (nativeConfig.userCountry.isPresent()) {
+                    nativeImageArgs.add("-J-Duser.country=" + nativeConfig.userCountry.get());
+                }
+                nativeImageArgs.add("-J-Dfile.encoding=" + nativeConfig.fileEncoding);
+
+                if (enableSslNative) {
+                    enableHttpsUrlHandler = true;
+                    enableAllSecurityServices = true;
+                }
+
+                handleAdditionalProperties(nativeConfig, nativeImageArgs, isContainerBuild, outputDir);
+                nativeImageArgs.add("--initialize-at-build-time=");
+                nativeImageArgs.add(
+                        "-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time
+                nativeImageArgs.add("-H:+JNI");
+                nativeImageArgs.add("-H:+AllowFoldMethods");
+                nativeImageArgs.add("-jar");
+                nativeImageArgs.add(runnerJarName);
+
+                if (nativeConfig.enableFallbackImages) {
+                    nativeImageArgs.add("-H:FallbackThreshold=5");
+                } else {
+                    //Default: be strict as those fallback images aren't very useful
+                    //and tend to cover up real problems.
+                    nativeImageArgs.add("-H:FallbackThreshold=0");
+                }
+
+                if (nativeConfig.reportErrorsAtRuntime) {
+                    nativeImageArgs.add("-H:+ReportUnsupportedElementsAtRuntime");
+                }
+                if (nativeConfig.reportExceptionStackTraces) {
+                    nativeImageArgs.add("-H:+ReportExceptionStackTraces");
+                }
+                if (nativeConfig.debug.enabled) {
+                    nativeImageArgs.add("-g");
+                    nativeImageArgs.add("-H:DebugInfoSourceSearchPath=" + APP_SOURCES);
+                }
+                if (nativeConfig.debugBuildProcess) {
+                    nativeImageArgs
+                            .add("-J-Xrunjdwp:transport=dt_socket,address=" + DEBUG_BUILD_PROCESS_PORT + ",server=y,suspend=y");
+                }
+                if (nativeConfig.enableReports) {
+                    nativeImageArgs.add("-H:+PrintAnalysisCallTree");
+                }
+                if (nativeConfig.dumpProxies) {
+                    nativeImageArgs.add("-Dsun.misc.ProxyGenerator.saveGeneratedFiles=true");
+                    if (nativeConfig.enableServer) {
+                        log.warn(
+                                "Options dumpProxies and enableServer are both enabled: this will get the proxies dumped in an unknown external working directory");
+                    }
+                }
+                if (nativeConfig.nativeImageXmx.isPresent()) {
+                    nativeImageArgs.add("-J-Xmx" + nativeConfig.nativeImageXmx.get());
+                }
+                List<String> protocols = new ArrayList<>(2);
+                if (nativeConfig.enableHttpUrlHandler) {
+                    protocols.add("http");
+                }
+                if (enableHttpsUrlHandler) {
+                    protocols.add("https");
+                }
+                if (addAllCharsets) {
+                    nativeImageArgs.add("-H:+AddAllCharsets");
+                } else {
+                    nativeImageArgs.add("-H:-AddAllCharsets");
+                }
+                if (!protocols.isEmpty()) {
+                    nativeImageArgs.add("-H:EnableURLProtocols=" + String.join(",", protocols));
+                }
+                if (enableAllSecurityServices) {
+                    nativeImageArgs.add("--enable-all-security-services");
+                }
+                if (!noPIE.isEmpty()) {
+                    nativeImageArgs.add("-H:NativeLinkerOption=" + noPIE);
+                }
+
+                if (!nativeConfig.enableIsolates) {
+                    nativeImageArgs.add("-H:-SpawnIsolates");
+                }
+                if (!nativeConfig.enableJni) {
+                    log.warn(
+                            "Your application is setting the deprecated 'quarkus.native.enable-jni' configuration key to false."
+                                    + " Please consider removing this configuration key as it is ignored (JNI is always enabled) and it"
+                                    + " will be removed in a future Quarkus version.");
+                }
+                if (!nativeConfig.enableServer && !SystemUtils.IS_OS_WINDOWS && !graalVMVersion.isMandrel()) {
+                    nativeImageArgs.add("--no-server");
+                }
+                if (nativeConfig.enableVmInspection) {
+                    nativeImageArgs.add("-H:+AllowVMInspection");
+                }
+                if (nativeConfig.autoServiceLoaderRegistration) {
+                    nativeImageArgs.add("-H:+UseServiceLoaderFeature");
+                    //When enabling, at least print what exactly is being added:
+                    nativeImageArgs.add("-H:+TraceServiceLoaderFeature");
+                } else {
+                    nativeImageArgs.add("-H:-UseServiceLoaderFeature");
+                }
+                if (nativeConfig.fullStackTraces) {
+                    nativeImageArgs.add("-H:+StackTrace");
+                } else {
+                    nativeImageArgs.add("-H:-StackTrace");
+                }
+
+                if (nativeConfig.enableDashboardDump) {
+                    nativeImageArgs.add("-H:DashboardDump=" + outputTargetBuildItem.getBaseName() + "_dashboard.dump");
+                    nativeImageArgs.add("-H:+DashboardAll");
+                }
+
+                nativeImageArgs.add(nativeImageName);
+
+                return new NativeImageInvokerInfo(nativeImageArgs);
+            }
+
+            private void handleAdditionalProperties(NativeConfig nativeConfig, List<String> command, boolean isContainerBuild,
+                    Path outputDir) {
+                if (nativeConfig.additionalBuildArgs.isPresent()) {
+                    List<String> strings = nativeConfig.additionalBuildArgs.get();
+                    for (String buildArg : strings) {
+                        String trimmedBuildArg = buildArg.trim();
+                        if (trimmedBuildArg.contains(TRUST_STORE_SYSTEM_PROPERTY_MARKER) && isContainerBuild) {
+                            /*
+                             * When the native binary is being built with a docker container, because a volume is created,
+                             * we need to copy the trustStore file into the output directory (which is the root of volume)
+                             * and change the value of 'javax.net.ssl.trustStore' property to point to this value
+                             *
+                             * TODO: we might want to introduce a dedicated property in order to overcome this ugliness
+                             */
+                            int index = trimmedBuildArg.indexOf(TRUST_STORE_SYSTEM_PROPERTY_MARKER);
+                            if (trimmedBuildArg.length() > index + 2) {
+                                String configuredTrustStorePath = trimmedBuildArg
+                                        .substring(index + TRUST_STORE_SYSTEM_PROPERTY_MARKER.length());
+                                try {
+                                    IoUtils.copy(Paths.get(configuredTrustStorePath),
+                                            outputDir.resolve(MOVED_TRUST_STORE_NAME));
+                                    command.add(trimmedBuildArg.substring(0, index) + TRUST_STORE_SYSTEM_PROPERTY_MARKER
+                                            + CONTAINER_BUILD_VOLUME_PATH + "/" + MOVED_TRUST_STORE_NAME);
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException("Unable to copy trustStore file '" + configuredTrustStorePath
+                                            + "' to volume root directory '" + outputDir.toAbsolutePath().toString() + "'", e);
+                                }
+                            }
+                        } else {
+                            command.add(trimmedBuildArg);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeOrNativeSourcesBuild.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeOrNativeSourcesBuild.java
new file mode 100644
index 0000000000000..dfd4a191a531c
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeOrNativeSourcesBuild.java
@@ -0,0 +1,24 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.pkg.PackageConfig;
+
+/**
+ * Supplier that can be used to only run build steps in the
+ * native or native sources builds.
+ */
+public class NativeOrNativeSourcesBuild implements BooleanSupplier {
+
+    private final PackageConfig packageConfig;
+
+    NativeOrNativeSourcesBuild(PackageConfig packageConfig) {
+        this.packageConfig = packageConfig;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return packageConfig.type.equalsIgnoreCase(PackageConfig.NATIVE)
+                || packageConfig.type.equalsIgnoreCase(PackageConfig.NATIVE_SOURCES);
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeSourcesBuild.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeSourcesBuild.java
new file mode 100644
index 0000000000000..ecac3a5fb9f22
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeSourcesBuild.java
@@ -0,0 +1,23 @@
+package io.quarkus.deployment.pkg.steps;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.pkg.PackageConfig;
+
+/**
+ * Supplier that can be used to only run build steps in the
+ * native sources build.
+ */
+public class NativeSourcesBuild implements BooleanSupplier {
+
+    private final PackageConfig packageConfig;
+
+    NativeSourcesBuild(PackageConfig packageConfig) {
+        this.packageConfig = packageConfig;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return packageConfig.type.equalsIgnoreCase(PackageConfig.NATIVE_SOURCES);
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/PackageTypeVerificationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/PackageTypeVerificationBuildStep.java
index d37ef4c42d026..d1df71dfe5814 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/PackageTypeVerificationBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/PackageTypeVerificationBuildStep.java
@@ -11,15 +11,17 @@
 import io.quarkus.deployment.pkg.builditem.PackageTypeBuildItem;
 
 /**
- * verifies that the requested package type can actually be produced
+ * Verifies that the requested package type can actually be produced
  */
 public class PackageTypeVerificationBuildStep {
 
     @BuildStep
     List<PackageTypeBuildItem> builtins() {
-        return Arrays.asList(new PackageTypeBuildItem(PackageConfig.NATIVE), new PackageTypeBuildItem(PackageConfig.JAR),
-                new PackageTypeBuildItem(PackageConfig.LEGACY), new PackageTypeBuildItem(PackageConfig.UBER_JAR),
-                new PackageTypeBuildItem(PackageConfig.FAST_JAR),
+        return Arrays.asList(new PackageTypeBuildItem(PackageConfig.NATIVE),
+                new PackageTypeBuildItem(PackageConfig.NATIVE_SOURCES),
+                new PackageTypeBuildItem(PackageConfig.JAR), new PackageTypeBuildItem(PackageConfig.FAST_JAR),
+                new PackageTypeBuildItem(PackageConfig.LEGACY_JAR),
+                new PackageTypeBuildItem(PackageConfig.UBER_JAR),
                 new PackageTypeBuildItem(PackageConfig.MUTABLE_JAR));
     }
 
@@ -27,7 +29,7 @@ List<PackageTypeBuildItem> builtins() {
     ServiceStartBuildItem verify(List<PackageTypeBuildItem> items, PackageConfig config) {
         Set<String> registered = items.stream().map(PackageTypeBuildItem::getType).collect(Collectors.toSet());
         if (!registered.contains(config.type)) {
-            throw new IllegalStateException("Unknown packaging type " + config.type + " known types are " + registered);
+            throw new IllegalStateException("Unknown packaging type '" + config.type + "' known types are " + registered);
         }
         return null;
     }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
index 5bb3925af80f1..aea47243a02fc 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
@@ -13,6 +13,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -62,7 +63,9 @@
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.StartupContext;
 import io.quarkus.runtime.StartupTask;
+import io.quarkus.runtime.annotations.IgnoreProperty;
 import io.quarkus.runtime.annotations.RecordableConstructor;
+import io.quarkus.runtime.annotations.RelaxedValidation;
 
 /**
  * A class that can be used to record invocations to bytecode so they can be replayed later. This is done through the
@@ -114,15 +117,15 @@ public class BytecodeRecorderImpl implements RecorderContext {
     private final Map<Class<?>, NonDefaultConstructorHolder> nonDefaultConstructors = new HashMap<>();
     private final String className;
 
-    private final String buildStepName;
-    private final String methodName;
+    private final Function<ClassOutput, ClassCreator> classCreatorFunction;
+    private final Function<ClassCreator, MethodCreator> methodCreatorFunction;
 
     private final List<ObjectLoader> loaders = new ArrayList<>();
 
     /**
      * the maximum number of instruction groups that can be added to a method. This is to limit the size of the method
      * so that the 65k limit is not reached.
-     *
+     * <p>
      * This is fairly arbitrary, as there is no fixed size for the instruction groups, but in practice this limit
      * seems to be fairly reasonable
      */
@@ -132,22 +135,57 @@ public class BytecodeRecorderImpl implements RecorderContext {
     private boolean loadComplete;
 
     public BytecodeRecorderImpl(boolean staticInit, String buildStepName, String methodName, String uniqueHash) {
-        this(Thread.currentThread().getContextClassLoader(), staticInit,
-                BASE_PACKAGE + buildStepName + "$" + methodName + uniqueHash, buildStepName, methodName);
+        this(
+                Thread.currentThread().getContextClassLoader(),
+                staticInit,
+                toClassName(buildStepName, methodName, uniqueHash),
+                classOutput -> {
+                    return startupTaskClassCreator(classOutput, toClassName(buildStepName, methodName, uniqueHash));
+                },
+                classCreator -> {
+                    return startupMethodCreator(buildStepName, methodName, classCreator);
+                });
+    }
+
+    private static MethodCreator startupMethodCreator(String buildStepName, String methodName, ClassCreator classCreator) {
+        MethodCreator mainMethod = classCreator.getMethodCreator("deploy", void.class, StartupContext.class);
+
+        // record the build step name
+        if ((buildStepName != null) && (methodName != null)) {
+            mainMethod.invokeVirtualMethod(ofMethod(StartupContext.class, "setCurrentBuildStepName", void.class, String.class),
+                    mainMethod.getMethodParam(0), mainMethod.load(buildStepName + "." + methodName));
+        }
+        return mainMethod;
+    }
+
+    private static ClassCreator startupTaskClassCreator(ClassOutput classOutput, String className) {
+        return ClassCreator.builder().classOutput(classOutput).className(className).superClass(Object.class)
+                .interfaces(StartupTask.class).build();
+    }
+
+    private static String toClassName(String buildStepName, String methodName, String uniqueHash) {
+        return BASE_PACKAGE + buildStepName + "$" + methodName + uniqueHash;
     }
 
     // visible for testing
     BytecodeRecorderImpl(ClassLoader classLoader, boolean staticInit, String className) {
-        this(classLoader, staticInit, className, null, null);
+        this(classLoader, staticInit, className,
+                classOutput -> {
+                    return startupTaskClassCreator(classOutput, className);
+                },
+                classCreator -> {
+                    return startupMethodCreator(null, null, classCreator);
+                });
     }
 
-    private BytecodeRecorderImpl(ClassLoader classLoader, boolean staticInit, String className, String buildStepName,
-            String methodName) {
+    public BytecodeRecorderImpl(ClassLoader classLoader, boolean staticInit, String className,
+            Function<ClassOutput, ClassCreator> classCreatorFunction,
+            Function<ClassCreator, MethodCreator> methodCreatorFunction) {
         this.classLoader = classLoader;
         this.staticInit = staticInit;
         this.className = className;
-        this.buildStepName = buildStepName;
-        this.methodName = methodName;
+        this.classCreatorFunction = classCreatorFunction;
+        this.methodCreatorFunction = methodCreatorFunction;
     }
 
     public boolean isEmpty() {
@@ -344,23 +382,23 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                                 + "() directly on an object returned from the bytecode recorder, you can only pass it back into the recorder as a parameter");
             }
         });
-        ProxyInstance instance = new ProxyInstance(proxyInstance, key);
-        return instance;
+        return new ProxyInstance(proxyInstance, key);
     }
 
     public String getClassName() {
         return className;
     }
 
-    public void writeBytecode(ClassOutput classOutput) {
-        ClassCreator file = ClassCreator.builder().classOutput(classOutput)
-                .className(className)
-                .superClass(Object.class).interfaces(StartupTask.class).build();
-        MethodCreator mainMethod = file.getMethodCreator("deploy", void.class, StartupContext.class);
+    private Map.Entry<ClassCreator, MethodCreator> prepareBytecodeWriting(ClassOutput classOutput) {
+        ClassCreator file = classCreatorFunction.apply(classOutput);
+        MethodCreator mainMethod = methodCreatorFunction.apply(file);
+        return new AbstractMap.SimpleEntry<>(file, mainMethod);
+    }
 
-        // record the build step name
-        mainMethod.invokeVirtualMethod(ofMethod(StartupContext.class, "setCurrentBuildStepName", void.class, String.class),
-                mainMethod.getMethodParam(0), mainMethod.load(buildStepName + "." + methodName));
+    public void writeBytecode(ClassOutput classOutput) {
+        Map.Entry<ClassCreator, MethodCreator> entry = prepareBytecodeWriting(classOutput);
+        ClassCreator file = entry.getKey();
+        MethodCreator mainMethod = entry.getValue();
 
         //now create instances of all the classes we invoke on and store them in variables as well
         Map<Class, DeferredArrayStoreParameter> classInstanceVariables = new HashMap<>();
@@ -407,7 +445,8 @@ ResultHandle createValue(MethodContext context, MethodCreator method, ResultHand
                     //even if the code for an invocation is split over several methods
                     for (int i = 0; i < call.parameters.length; ++i) {
                         call.deferredParameters[i] = loadObjectInstance(call.parameters[i], parameterMap,
-                                call.method.getParameterTypes()[i]);
+                                call.method.getParameterTypes()[i], Arrays.stream(call.method.getParameterAnnotations()[i])
+                                        .anyMatch(s -> s.annotationType() == RelaxedValidation.class));
                     }
                 } catch (Exception e) {
                     throw new RuntimeException("Failed to record call to method " + call.method, e);
@@ -498,14 +537,15 @@ public void write(MethodContext context, MethodCreator method, ResultHandle arra
     /**
      * Returns a representation of a serialized parameter.
      */
-    private DeferredParameter loadObjectInstance(Object param, Map<Object, DeferredParameter> existing, Class<?> expectedType) {
+    private DeferredParameter loadObjectInstance(Object param, Map<Object, DeferredParameter> existing, Class<?> expectedType,
+            boolean relaxedValidation) {
         if (loadComplete) {
             throw new RuntimeException("All parameters have already been loaded, it is too late to call loadObjectInstance");
         }
         if (existing.containsKey(param)) {
             return existing.get(param);
         }
-        DeferredParameter ret = loadObjectInstanceImpl(param, existing, expectedType);
+        DeferredParameter ret = loadObjectInstanceImpl(param, existing, expectedType, relaxedValidation);
         existing.put(param, ret);
         return ret;
     }
@@ -514,7 +554,7 @@ private DeferredParameter loadObjectInstance(Object param, Map<Object, DeferredP
      * Returns a representation of a serialized parameter.
      */
     private DeferredParameter loadObjectInstanceImpl(Object param, Map<Object, DeferredParameter> existing,
-            Class<?> expectedType) {
+            Class<?> expectedType, boolean relaxedValidation) {
         //null is easy
         if (param == null) {
             return new DeferredParameter() {
@@ -531,7 +571,7 @@ ResultHandle doLoad(MethodContext creator, MethodCreator method, ResultHandle ar
         }
 
         //Handle empty collections as returned by the Collections object
-        loadedObject = handleCollectionsObjects(param, existing);
+        loadedObject = handleCollectionsObjects(param, existing, relaxedValidation);
         if (loadedObject != null) {
             return loadedObject;
         }
@@ -547,7 +587,7 @@ ResultHandle doLoad(MethodContext creator, MethodCreator method, ResultHandle ar
             try {
                 ObjectSubstitution substitution = holder.sub.newInstance();
                 Object res = substitution.serialize(param);
-                DeferredParameter serialized = loadObjectInstance(res, existing, holder.to);
+                DeferredParameter serialized = loadObjectInstance(res, existing, holder.to, relaxedValidation);
                 SubstitutionHolder finalHolder = holder;
                 return new DeferredArrayStoreParameter() {
 
@@ -573,7 +613,7 @@ ResultHandle createValue(MethodContext creator, MethodCreator method, ResultHand
         } else if (param instanceof Optional) {
             Optional val = (Optional) param;
             if (val.isPresent()) {
-                DeferredParameter res = loadObjectInstance(val.get(), existing, Object.class);
+                DeferredParameter res = loadObjectInstance(val.get(), existing, Object.class, relaxedValidation);
                 return new DeferredArrayStoreParameter() {
 
                     @Override
@@ -584,7 +624,10 @@ void doPrepare(MethodContext context) {
 
                     @Override
                     ResultHandle createValue(MethodContext context, MethodCreator method, ResultHandle array) {
-                        return method.invokeStaticMethod(ofMethod(Optional.class, "of", Optional.class, Object.class),
+                        // If the value is a proxy, it may be non-null at build time but become null
+                        // when we actually create the value during initialization;
+                        // so we need to use 'ofNullable' and not 'of' here.
+                        return method.invokeStaticMethod(ofMethod(Optional.class, "ofNullable", Optional.class, Object.class),
                                 context.loadDeferred(res));
                     }
                 };
@@ -830,7 +873,7 @@ ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle ar
 
             for (int i = 0; i < length; ++i) {
                 DeferredParameter component = loadObjectInstance(Array.get(param, i), existing,
-                        expectedType.getComponentType());
+                        expectedType.getComponentType(), relaxedValidation);
                 components[i] = component;
             }
             return new DeferredArrayStoreParameter() {
@@ -868,7 +911,7 @@ ResultHandle createValue(MethodContext context, MethodCreator method, ResultHand
                 Object explicitValue = annotationProxy.getValues().get(valueMethod.name());
                 if (explicitValue != null) {
                     constructorParamsHandles[iterator.previousIndex()] = loadObjectInstance(explicitValue, existing,
-                            explicitValue.getClass());
+                            explicitValue.getClass(), relaxedValidation);
                 } else {
                     AnnotationValue value = annotationValues.get(valueMethod.name());
                     if (value == null) {
@@ -877,7 +920,7 @@ ResultHandle createValue(MethodContext context, MethodCreator method, ResultHand
                         Object defaultValue = annotationProxy.getDefaultValues().get(valueMethod.name());
                         if (defaultValue != null) {
                             constructorParamsHandles[iterator.previousIndex()] = loadObjectInstance(defaultValue, existing,
-                                    defaultValue.getClass());
+                                    defaultValue.getClass(), relaxedValidation);
                             continue;
                         }
                         if (value == null) {
@@ -910,7 +953,7 @@ ResultHandle createValue(MethodContext context, MethodCreator method, ResultHand
             };
 
         } else {
-            return loadComplexObject(param, existing, expectedType);
+            return loadComplexObject(param, existing, expectedType, relaxedValidation);
         }
     }
 
@@ -920,9 +963,11 @@ ResultHandle createValue(MethodContext context, MethodCreator method, ResultHand
      *
      * @param param The object to load
      * @param existing
+     * @param relaxedValidation
      * @return
      */
-    private DeferredParameter handleCollectionsObjects(Object param, Map<Object, DeferredParameter> existing) {
+    private DeferredParameter handleCollectionsObjects(Object param, Map<Object, DeferredParameter> existing,
+            boolean relaxedValidation) {
         if (param instanceof Collection) {
             if (param.getClass().equals(Collections.emptyList().getClass())) {
                 return new DeferredParameter() {
@@ -955,7 +1000,8 @@ ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle ar
                     }
                 };
             } else if (param.getClass().equals(SINGLETON_LIST_CLASS)) {
-                DeferredParameter deferred = loadObjectInstance(((List) param).get(0), existing, Object.class);
+                DeferredParameter deferred = loadObjectInstance(((List) param).get(0), existing, Object.class,
+                        relaxedValidation);
                 return new DeferredParameter() {
                     @Override
                     void doPrepare(MethodContext context) {
@@ -971,7 +1017,8 @@ ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle ar
                     }
                 };
             } else if (param.getClass().equals(SINGLETON_SET_CLASS)) {
-                DeferredParameter deferred = loadObjectInstance(((Set) param).iterator().next(), existing, Object.class);
+                DeferredParameter deferred = loadObjectInstance(((Set) param).iterator().next(), existing, Object.class,
+                        relaxedValidation);
                 return new DeferredParameter() {
                     @Override
                     void doPrepare(MethodContext context) {
@@ -1014,8 +1061,8 @@ ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle ar
             } else if (param.getClass().equals(SINGLETON_MAP_CLASS)) {
                 Map.Entry<?, ?> entry = ((Map<?, ?>) param).entrySet().iterator().next();
 
-                DeferredParameter key = loadObjectInstance(entry.getKey(), existing, Object.class);
-                DeferredParameter value = loadObjectInstance(entry.getValue(), existing, Object.class);
+                DeferredParameter key = loadObjectInstance(entry.getKey(), existing, Object.class, relaxedValidation);
+                DeferredParameter value = loadObjectInstance(entry.getValue(), existing, Object.class, relaxedValidation);
                 return new DeferredParameter() {
                     @Override
                     void doPrepare(MethodContext context) {
@@ -1042,26 +1089,30 @@ ResultHandle doLoad(MethodContext context, MethodCreator method, ResultHandle ar
 
     /**
      * Created a {@link DeferredParameter} to load a complex object, such as a javabean or collection. This is basically
-     * just an extension of {@link #loadObjectInstanceImpl(Object, Map, Class)} but it removes some of the more complex
+     * just an extension of {@link #loadObjectInstanceImpl(Object, Map, Class, boolean)} but it removes some of the more complex
      * code from that method.
      *
      * @param param The object to load
      * @param existing The existing object map
      * @param expectedType The expected type of the object
+     * @param relaxedValidation
      * @return
      */
     private DeferredParameter loadComplexObject(Object param, Map<Object, DeferredParameter> existing,
-            Class<?> expectedType) {
+            Class<?> expectedType, boolean relaxedValidation) {
         //a list of steps that are performed on the object after it has been created
         //we need to create all these first, to ensure the required objects have already
         //been deserialized
         List<SerialzationStep> setupSteps = new ArrayList<>();
         List<SerialzationStep> ctorSetupSteps = new ArrayList<>();
 
+        boolean relaxedOk = false;
         if (param instanceof Collection) {
             //if this is a collection we want to serialize every element
             for (Object i : (Collection) param) {
-                DeferredParameter val = loadObjectInstance(i, existing, i.getClass());
+                DeferredParameter val = i != null
+                        ? loadObjectInstance(i, existing, i.getClass(), relaxedValidation)
+                        : loadObjectInstance(null, existing, Object.class, relaxedValidation);
                 setupSteps.add(new SerialzationStep() {
                     @Override
                     public void handle(MethodContext context, MethodCreator method, DeferredArrayStoreParameter out) {
@@ -1076,14 +1127,15 @@ public void prepare(MethodContext context) {
                     }
                 });
             }
+            relaxedOk = true;
         }
         if (param instanceof Map) {
             //map works the same as collection
             for (Map.Entry<?, ?> i : ((Map<?, ?>) param).entrySet()) {
-                DeferredParameter key = loadObjectInstance(i.getKey(), existing, i.getKey().getClass());
+                DeferredParameter key = loadObjectInstance(i.getKey(), existing, i.getKey().getClass(), relaxedValidation);
                 DeferredParameter val = i.getValue() != null
-                        ? loadObjectInstance(i.getValue(), existing, i.getValue().getClass())
-                        : loadObjectInstance(null, existing, Object.class);
+                        ? loadObjectInstance(i.getValue(), existing, i.getValue().getClass(), relaxedValidation)
+                        : loadObjectInstance(null, existing, Object.class, relaxedValidation);
                 setupSteps.add(new SerialzationStep() {
                     @Override
                     public void handle(MethodContext context, MethodCreator method, DeferredArrayStoreParameter out) {
@@ -1098,6 +1150,7 @@ public void prepare(MethodContext context) {
                     }
                 });
             }
+            relaxedOk = true;
         }
 
         //check how the object is constructed
@@ -1119,7 +1172,7 @@ public void prepare(MethodContext context) {
             for (int i = 0; i < params.size(); i++) {
                 Object obj = params.get(i);
                 nonDefaultConstructorHandles[i] = loadObjectInstance(obj, existing,
-                        nonDefaultConstructorHolder.constructor.getParameterTypes()[count++]);
+                        nonDefaultConstructorHolder.constructor.getParameterTypes()[count++], relaxedValidation);
             }
         } else {
             for (Constructor<?> ctor : param.getClass().getConstructors()) {
@@ -1138,6 +1191,18 @@ public void prepare(MethodContext context) {
         Set<String> handledProperties = new HashSet<>();
         Property[] desc = PropertyUtils.getPropertyDescriptors(param);
         for (Property i : desc) {
+            // check if the getter is ignored
+            if ((i.getReadMethod() != null) && (i.getReadMethod().getAnnotation(IgnoreProperty.class) != null)) {
+                continue;
+            }
+            // check if the matching field is ignored
+            try {
+                if (param.getClass().getDeclaredField(i.getName()).getAnnotation(IgnoreProperty.class) != null) {
+                    continue;
+                }
+            } catch (NoSuchFieldException ignored) {
+
+            }
             Integer ctorParamIndex = constructorParamNameMap.remove(i.name);
             if (i.getReadMethod() != null && i.getWriteMethod() == null && ctorParamIndex == null) {
                 try {
@@ -1152,7 +1217,7 @@ public void prepare(MethodContext context) {
 
                             List<DeferredParameter> params = new ArrayList<>();
                             for (Object c : propertyValue) {
-                                DeferredParameter toAdd = loadObjectInstance(c, existing, Object.class);
+                                DeferredParameter toAdd = loadObjectInstance(c, existing, Object.class, relaxedValidation);
                                 params.add(toAdd);
 
                             }
@@ -1191,8 +1256,9 @@ public void prepare(MethodContext context) {
                             Map<DeferredParameter, DeferredParameter> def = new LinkedHashMap<>();
                             for (Map.Entry<Object, Object> entry : propertyValue.entrySet()) {
                                 DeferredParameter key = loadObjectInstance(entry.getKey(), existing,
-                                        Object.class);
-                                DeferredParameter val = loadObjectInstance(entry.getValue(), existing, Object.class);
+                                        Object.class, relaxedValidation);
+                                DeferredParameter val = loadObjectInstance(entry.getValue(), existing, Object.class,
+                                        relaxedValidation);
                                 def.put(key, val);
                             }
                             setupSteps.add(new SerialzationStep() {
@@ -1218,6 +1284,17 @@ public void prepare(MethodContext context) {
                                 }
                             });
                         }
+                    } else if (!relaxedValidation && !i.getName().equals("class") && !relaxedOk
+                            && nonDefaultConstructorHolder == null) {
+                        //check if there is actually a field with the name
+                        try {
+                            i.getReadMethod().getDeclaringClass().getDeclaredField(i.getName());
+                            throw new RuntimeException("Cannot serialise field '" + i.getName() + "' on object '" + param
+                                    + "' as the property is read only");
+                        } catch (NoSuchFieldException e) {
+                            //if there is no underlying field then we ignore the property
+                        }
+
                     }
 
                 } catch (Exception e) {
@@ -1236,23 +1313,28 @@ public void prepare(MethodContext context) {
                     Class propertyType = i.getPropertyType();
                     if (ctorParamIndex == null
                             && i.getReadMethod().getReturnType() != i.getWriteMethod().getParameterTypes()[0]) {
-                        //this is a weird situation where the reader and writer are different types
-                        //we iterate and try and find a valid setter method for the type we have
-                        //OpenAPI does some weird stuff like this
-
-                        for (Method m : param.getClass().getMethods()) {
-                            if (m.getName().equals(i.getWriteMethod().getName())) {
-                                if (m.getParameterTypes().length > 0
-                                        && m.getParameterTypes()[0].isAssignableFrom(param.getClass())) {
-                                    propertyType = m.getParameterTypes()[0];
-                                    break;
+                        if (relaxedValidation) {
+                            //this is a weird situation where the reader and writer are different types
+                            //we iterate and try and find a valid setter method for the type we have
+                            //OpenAPI does some weird stuff like this
+
+                            for (Method m : param.getClass().getMethods()) {
+                                if (m.getName().equals(i.getWriteMethod().getName())) {
+                                    if (m.getParameterTypes().length > 0
+                                            && m.getParameterTypes()[0].isAssignableFrom(param.getClass())) {
+                                        propertyType = m.getParameterTypes()[0];
+                                        break;
+                                    }
                                 }
-                            }
 
+                            }
+                        } else {
+                            throw new RuntimeException("Cannot serialise field " + i.getName() + " on object " + param
+                                    + " as setter and getters were different types");
                         }
                     }
                     DeferredParameter val = loadObjectInstance(propertyValue, existing,
-                            i.getPropertyType());
+                            i.getPropertyType(), relaxedValidation);
                     if (ctorParamIndex != null) {
                         nonDefaultConstructorHandles[ctorParamIndex] = val;
                         ctorSetupSteps.add(new SerialzationStep() {
@@ -1293,13 +1375,18 @@ public void prepare(MethodContext context) {
 
         //now handle accessible fields
         for (Field field : param.getClass().getFields()) {
+            // check if the field is ignored
+            if (field.getAnnotation(IgnoreProperty.class) != null) {
+                continue;
+            }
             if (!handledProperties.contains(field.getName())) {
                 Integer ctorParamIndex = constructorParamNameMap.remove(field.getName());
                 if ((ctorParamIndex != null || !Modifier.isFinal(field.getModifiers())) &&
                         !Modifier.isStatic(field.getModifiers())) {
 
                     try {
-                        DeferredParameter val = loadObjectInstance(field.get(param), existing, field.getType());
+                        DeferredParameter val = loadObjectInstance(field.get(param), existing, field.getType(),
+                                relaxedValidation);
                         if (ctorParamIndex != null) {
                             nonDefaultConstructorHandles[ctorParamIndex] = val;
                             ctorSetupSteps.add(new SerialzationStep() {
@@ -1633,7 +1720,7 @@ static String componentType(MethodInfo method) {
     /**
      * A bytecode serialized value. This is an abstraction over ResultHandle, as ResultHandle
      * cannot span methods.
-     *
+     * <p>
      * Instances of DeferredParameter can be used in different methods
      */
     abstract class DeferredParameter {
@@ -1643,7 +1730,7 @@ abstract class DeferredParameter {
         /**
          * The function that is called to read the value for use. This may be by reading the value from the Object[]
          * array, or is may be a direct ldc instruction in the case of primitives.
-         *
+         * <p>
          * Code in this method is run in a single instruction group, so large objects should be serialized in the
          * {@link #doPrepare(MethodContext)} method instead
          * <p>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/substitutions/AdditionalSubstitutionsBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/substitutions/AdditionalSubstitutionsBuildStep.java
new file mode 100644
index 0000000000000..c4182eac9a96d
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/substitutions/AdditionalSubstitutionsBuildStep.java
@@ -0,0 +1,34 @@
+package io.quarkus.deployment.recording.substitutions;
+
+import java.time.ZoneId;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ObjectSubstitutionBuildItem;
+import io.quarkus.runtime.recording.substitutions.ZoneIdSubstitution;
+
+public class AdditionalSubstitutionsBuildStep {
+
+    @BuildStep
+    public void additionalSubstitutions(BuildProducer<ObjectSubstitutionBuildItem> producer) {
+        zoneIdSubstitutions(producer);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void zoneIdSubstitutions(BuildProducer<ObjectSubstitutionBuildItem> producer) {
+        try {
+            /*
+             * We can't refer to these classes as they are package private but we need a handle on need
+             * because the bytecode recorder needs to have the actual class registered and not a super class
+             */
+
+            Class<ZoneId> zoneRegionClass = (Class<ZoneId>) Class.forName("java.time.ZoneRegion");
+            producer.produce(new ObjectSubstitutionBuildItem(zoneRegionClass, String.class, ZoneIdSubstitution.class));
+
+            Class<ZoneId> zoneOffsetClass = (Class<ZoneId>) Class.forName("java.time.ZoneOffset");
+            producer.produce(new ObjectSubstitutionBuildItem(zoneOffsetClass, String.class, ZoneIdSubstitution.class));
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException("Improper registration of ZoneId substitution", e);
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java
new file mode 100644
index 0000000000000..9f07f98382cc5
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/AdditionalClassLoaderResourcesBuildStep.java
@@ -0,0 +1,45 @@
+package io.quarkus.deployment.steps;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.AdditionalClassLoaderResourcesBuildItem;
+import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
+
+public class AdditionalClassLoaderResourcesBuildStep {
+
+    @BuildStep
+    void appendAdditionalClassloaderResources(BuildProducer<AdditionalIndexedClassesBuildItem> producer,
+            List<AdditionalClassLoaderResourcesBuildItem> additionalResources) {
+
+        if (!additionalResources.isEmpty()) {
+            QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+
+            Map<String, byte[]> collected = new LinkedHashMap<String, byte[]>();
+            List<String> additionalClassesToIndex = new ArrayList<String>();
+            for (AdditionalClassLoaderResourcesBuildItem item : additionalResources) {
+
+                for (Entry<String, byte[]> entry : item.getResources().entrySet()) {
+                    additionalClassesToIndex.add(entry.getKey());
+
+                    collected.put(entry.getKey(), entry.getValue());
+                    // add it also as resources to allow index to work properly
+                    collected.put(entry.getKey().replace('.', '/') + ".class", entry.getValue());
+
+                }
+            }
+
+            cl.reset(collected, Collections.emptyMap());
+            // produce the AdditionalIndexedClassesBuildItem so this build step
+            // is actually invoked and allow to directly index all the classes
+            producer.produce(new AdditionalIndexedClassesBuildItem(additionalClassesToIndex.stream().toArray(String[]::new)));
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ChangedClassesBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ChangedClassesBuildStep.java
new file mode 100644
index 0000000000000..a7c955e8ccb42
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ChangedClassesBuildStep.java
@@ -0,0 +1,70 @@
+package io.quarkus.deployment.steps;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ChangedClassesBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.LiveReloadBuildItem;
+
+public class ChangedClassesBuildStep {
+
+    private static volatile IndexView oldIndex;
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    ChangedClassesBuildItem changedClassesBuildItem(CombinedIndexBuildItem combinedIndexBuildItem,
+            LiveReloadBuildItem liveReloadBuildItem) {
+        IndexView currentIndex = combinedIndexBuildItem.getIndex();
+        if (liveReloadBuildItem.getChangeInformation() == null) {
+            oldIndex = currentIndex;
+            return null;
+        }
+        Map<DotName, ClassInfo> changedClassesNewVersion = new HashMap<>();
+        Map<DotName, ClassInfo> changedClassesOldVersion = new HashMap<>();
+        Map<DotName, ClassInfo> deletedClasses = new HashMap<>();
+        Map<DotName, ClassInfo> addedClasses = new HashMap<>();
+        for (String added : liveReloadBuildItem.getChangeInformation().getAddedClasses()) {
+            DotName name = DotName.createSimple(added);
+            ClassInfo clazz = currentIndex.getClassByName(name);
+            if (clazz == null) {
+                //should never happen, but we bail out to be paranoid
+                return null;
+            }
+            addedClasses.put(name, clazz);
+        }
+        for (String deleted : liveReloadBuildItem.getChangeInformation().getDeletedClasses()) {
+            DotName name = DotName.createSimple(deleted);
+            ClassInfo clazz = oldIndex.getClassByName(name);
+            if (clazz == null) {
+                //should never happen, but we bail out to be paranoid
+                return null;
+            }
+            addedClasses.put(name, clazz);
+        }
+        for (String mod : liveReloadBuildItem.getChangeInformation().getChangedClasses()) {
+            DotName name = DotName.createSimple(mod);
+            ClassInfo clazz = oldIndex.getClassByName(name);
+            if (clazz == null) {
+                //should never happen, but we bail out to be paranoid
+                return null;
+            }
+            changedClassesOldVersion.put(name, clazz);
+            clazz = currentIndex.getClassByName(name);
+            if (clazz == null) {
+                //should never happen, but we bail out to be paranoid
+                return null;
+            }
+            changedClassesNewVersion.put(name, clazz);
+        }
+
+        oldIndex = currentIndex;
+        return new ChangedClassesBuildItem(changedClassesNewVersion, changedClassesOldVersion, deletedClasses, addedClasses);
+    }
+
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java
index cdbeb0c057285..f924e1e2fc357 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ClassTransformingBuildStep.java
@@ -1,5 +1,7 @@
 package io.quarkus.deployment.steps;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,6 +9,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
@@ -16,44 +19,73 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.function.BiFunction;
+import java.util.stream.Collectors;
 
 import org.jboss.logging.Logger;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 
+import io.quarkus.bootstrap.BootstrapDebug;
 import io.quarkus.bootstrap.classloading.ClassPathElement;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.QuarkusClassWriter;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.TransformedClassesBuildItem;
 import io.quarkus.deployment.index.ConstPoolScanner;
+import io.quarkus.runtime.LaunchMode;
 
 public class ClassTransformingBuildStep {
 
     private static final Logger log = Logger.getLogger(ClassTransformingBuildStep.class);
 
+    /**
+     * Cache used for dev mode to save the result for classes that have not changed.
+     */
+    private static final Map<String, TransformedClassesBuildItem.TransformedClass> transformedClassesCache = new ConcurrentHashMap<>();
+    private static volatile BiFunction<String, byte[], byte[]> lastTransformers;
+
+    public static byte[] transform(String className, byte[] classData) {
+        if (lastTransformers == null) {
+            return classData;
+        }
+
+        return lastTransformers.apply(className, classData);
+    }
+
     @BuildStep
     TransformedClassesBuildItem handleClassTransformation(List<BytecodeTransformerBuildItem> bytecodeTransformerBuildItems,
-            ApplicationArchivesBuildItem appArchives) throws ExecutionException, InterruptedException {
+            ApplicationArchivesBuildItem appArchives, LiveReloadBuildItem liveReloadBuildItem,
+            LaunchModeBuildItem launchModeBuildItem)
+            throws ExecutionException, InterruptedException {
         if (bytecodeTransformerBuildItems.isEmpty()) {
             return new TransformedClassesBuildItem(Collections.emptyMap());
         }
-        final Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers = new HashMap<>(
+        final Map<String, List<BytecodeTransformerBuildItem>> bytecodeTransformers = new HashMap<>(
                 bytecodeTransformerBuildItems.size());
         Set<String> noConstScanning = new HashSet<>();
         Map<String, Set<String>> constScanning = new HashMap<>();
+        Set<String> eager = new HashSet<>();
+        Set<String> nonCacheable = new HashSet<>();
         for (BytecodeTransformerBuildItem i : bytecodeTransformerBuildItems) {
             bytecodeTransformers.computeIfAbsent(i.getClassToTransform(), (h) -> new ArrayList<>())
-                    .add(i.getVisitorFunction());
+                    .add(i);
             if (i.getRequireConstPoolEntry() == null || i.getRequireConstPoolEntry().isEmpty()) {
                 noConstScanning.add(i.getClassToTransform());
             } else {
                 constScanning.computeIfAbsent(i.getClassToTransform(), (s) -> new HashSet<>())
                         .addAll(i.getRequireConstPoolEntry());
             }
+            if (i.isEager()) {
+                eager.add(i.getClassToTransform());
+            }
+            if (!i.isCacheable()) {
+                nonCacheable.add(i.getClassToTransform());
+            }
         }
         QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
         Map<String, Path> transformedToArchive = new ConcurrentHashMap<>();
@@ -62,22 +94,81 @@ TransformedClassesBuildItem handleClassTransformation(List<BytecodeTransformerBu
         // when we copy these archives we will remove the problematic classes
         final ExecutorService executorPool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
         final ConcurrentLinkedDeque<Future<TransformedClassesBuildItem.TransformedClass>> transformed = new ConcurrentLinkedDeque<>();
+        final Map<Path, Set<TransformedClassesBuildItem.TransformedClass>> transformedClassesByJar = new HashMap<>();
+        ClassLoader transformCl = Thread.currentThread().getContextClassLoader();
+        lastTransformers = new BiFunction<String, byte[], byte[]>() {
+            @Override
+            public byte[] apply(String className, byte[] originalBytes) {
+
+                List<BytecodeTransformerBuildItem> classTransformers = bytecodeTransformers.get(className);
+                if (classTransformers == null) {
+                    return originalBytes;
+                }
+                List<BiFunction<String, ClassVisitor, ClassVisitor>> visitors = classTransformers.stream()
+                        .map(BytecodeTransformerBuildItem::getVisitorFunction).filter(Objects::nonNull)
+                        .collect(Collectors.toList());
+                List<BiFunction<String, byte[], byte[]>> preVisitFunctions = classTransformers.stream()
+                        .map(BytecodeTransformerBuildItem::getInputTransformer).filter(Objects::nonNull)
+                        .collect(Collectors.toList());
+                ClassLoader old = Thread.currentThread().getContextClassLoader();
+                try {
+                    Thread.currentThread().setContextClassLoader(transformCl);
+                    String classFileName = className.replace(".", "/") + ".class";
+                    List<ClassPathElement> archives = cl.getElementsWithResource(classFileName);
+                    if (!archives.isEmpty()) {
+                        ClassPathElement classPathElement = archives.get(0);
+                        Path jar = classPathElement.getRoot();
+                        byte[] classData = classPathElement.getResource(classFileName).getData();
+                        Set<String> constValues = constScanning.get(className);
+                        if (constValues != null && !noConstScanning.contains(className)) {
+                            if (!ConstPoolScanner.constPoolEntryPresent(classData, constValues)) {
+                                return originalBytes;
+                            }
+                        }
+                        byte[] data = transformClass(className, visitors, classData, preVisitFunctions);
+                        TransformedClassesBuildItem.TransformedClass transformedClass = new TransformedClassesBuildItem.TransformedClass(
+                                className, data,
+                                classFileName, eager.contains(className));
+                        return transformedClass.getData();
+                    } else {
+                        return originalBytes;
+                    }
+                } finally {
+                    Thread.currentThread().setContextClassLoader(old);
+                }
+            }
+        };
         try {
-            ClassLoader transformCl = Thread.currentThread().getContextClassLoader();
-            for (Map.Entry<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> entry : bytecodeTransformers
+            for (Map.Entry<String, List<BytecodeTransformerBuildItem>> entry : bytecodeTransformers
                     .entrySet()) {
                 String className = entry.getKey();
+                boolean cacheable = !nonCacheable.contains(className);
+                if (cacheable && transformedClassesCache.containsKey(className)) {
+                    if (liveReloadBuildItem.getChangeInformation() != null) {
+                        if (!liveReloadBuildItem.getChangeInformation().getChangedClasses().contains(className)) {
+                            //we can use the cached transformation
+                            handleTransformedClass(transformedToArchive, transformedClassesByJar,
+                                    transformedClassesCache.get(className));
+                            continue;
+                        }
+                    }
+                }
                 String classFileName = className.replace(".", "/") + ".class";
                 List<ClassPathElement> archives = cl.getElementsWithResource(classFileName);
                 if (!archives.isEmpty()) {
                     ClassPathElement classPathElement = archives.get(0);
                     Path jar = classPathElement.getRoot();
                     if (jar == null) {
-                        log.warnf("Cannot transform %s as it's containing application archive could not be found.",
+                        log.warnf("Cannot transform %s as its containing application archive could not be found.",
                                 entry.getKey());
                         continue;
                     }
-                    List<BiFunction<String, ClassVisitor, ClassVisitor>> visitors = entry.getValue();
+                    List<BiFunction<String, ClassVisitor, ClassVisitor>> visitors = entry.getValue().stream()
+                            .map(BytecodeTransformerBuildItem::getVisitorFunction).filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+                    List<BiFunction<String, byte[], byte[]>> preVisitFunctions = entry.getValue().stream()
+                            .map(BytecodeTransformerBuildItem::getInputTransformer).filter(Objects::nonNull)
+                            .collect(Collectors.toList());
                     transformedToArchive.put(classFileName, jar);
                     transformed.add(executorPool.submit(new Callable<TransformedClassesBuildItem.TransformedClass>() {
                         @Override
@@ -85,30 +176,28 @@ public TransformedClassesBuildItem.TransformedClass call() throws Exception {
                             ClassLoader old = Thread.currentThread().getContextClassLoader();
                             try {
                                 Thread.currentThread().setContextClassLoader(transformCl);
-                                byte[] classData = classPathElement.getResource(classFileName).getData();
                                 Set<String> constValues = constScanning.get(className);
+                                byte[] classData = classPathElement.getResource(classFileName).getData();
                                 if (constValues != null && !noConstScanning.contains(className)) {
                                     if (!ConstPoolScanner.constPoolEntryPresent(classData, constValues)) {
                                         return null;
                                     }
                                 }
-                                ClassReader cr = new ClassReader(classData);
-                                ClassWriter writer = new QuarkusClassWriter(cr,
-                                        ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-                                ClassVisitor visitor = writer;
-                                for (BiFunction<String, ClassVisitor, ClassVisitor> i : visitors) {
-                                    visitor = i.apply(className, visitor);
+                                byte[] data = transformClass(className, visitors, classData, preVisitFunctions);
+                                TransformedClassesBuildItem.TransformedClass transformedClass = new TransformedClassesBuildItem.TransformedClass(
+                                        className, data,
+                                        classFileName, eager.contains(className));
+                                if (cacheable && launchModeBuildItem.getLaunchMode() == LaunchMode.DEVELOPMENT) {
+                                    transformedClassesCache.put(className, transformedClass);
                                 }
-                                cr.accept(visitor, 0);
-                                return new TransformedClassesBuildItem.TransformedClass(writer.toByteArray(),
-                                        classFileName);
+                                return transformedClass;
                             } finally {
                                 Thread.currentThread().setContextClassLoader(old);
                             }
                         }
                     }));
                 } else {
-                    log.warnf("Cannot transform %s as it's containing application archive could not be found.",
+                    log.warnf("Cannot transform %s as its containing application archive could not be found.",
                             entry.getKey());
                 }
             }
@@ -116,17 +205,58 @@ public TransformedClassesBuildItem.TransformedClass call() throws Exception {
         } finally {
             executorPool.shutdown();
         }
-        Map<Path, Set<TransformedClassesBuildItem.TransformedClass>> transformedClassesByJar = new HashMap<>();
         if (!transformed.isEmpty()) {
             for (Future<TransformedClassesBuildItem.TransformedClass> i : transformed) {
                 final TransformedClassesBuildItem.TransformedClass res = i.get();
                 if (res != null) {
-                    transformedClassesByJar.computeIfAbsent(transformedToArchive.get(res.getFileName()), (a) -> new HashSet<>())
-                            .add(res);
+                    handleTransformedClass(transformedToArchive, transformedClassesByJar, res);
                 }
             }
         }
         return new TransformedClassesBuildItem(transformedClassesByJar);
     }
 
+    private byte[] transformClass(String className, List<BiFunction<String, ClassVisitor, ClassVisitor>> visitors,
+            byte[] classData, List<BiFunction<String, byte[], byte[]>> preVisitFunctions) {
+        for (BiFunction<String, byte[], byte[]> i : preVisitFunctions) {
+            classData = i.apply(className, classData);
+        }
+        byte[] data;
+        if (!visitors.isEmpty()) {
+            ClassReader cr = new ClassReader(classData);
+            ClassWriter writer = new QuarkusClassWriter(cr,
+                    ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+            ClassVisitor visitor = writer;
+            for (BiFunction<String, ClassVisitor, ClassVisitor> i : visitors) {
+                visitor = i.apply(className, visitor);
+            }
+            cr.accept(visitor, 0);
+            data = writer.toByteArray();
+        } else {
+            data = classData;
+        }
+        if (BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR != null) {
+            File debugPath = new File(BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR);
+            if (!debugPath.exists()) {
+                debugPath.mkdir();
+            }
+            File classFile = new File(debugPath, className.replace(".", "/") + ".class");
+            classFile.getParentFile().mkdirs();
+            try (FileOutputStream classWriter = new FileOutputStream(classFile)) {
+                classWriter.write(data);
+            } catch (Exception e) {
+                log.errorf(e, "Failed to write transformed class %s", className);
+            }
+            log.infof("Wrote transformed class to %s", classFile.getAbsolutePath());
+        }
+        return data;
+    }
+
+    private void handleTransformedClass(Map<String, Path> transformedToArchive,
+            Map<Path, Set<TransformedClassesBuildItem.TransformedClass>> transformedClassesByJar,
+            TransformedClassesBuildItem.TransformedClass res) {
+        transformedClassesByJar.computeIfAbsent(transformedToArchive.get(res.getFileName()), (a) -> new HashSet<>())
+                .add(res);
+    }
+
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/CombinedIndexBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/CombinedIndexBuildStep.java
index 2c6730c3257d7..922b36d759ff4 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/CombinedIndexBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/CombinedIndexBuildStep.java
@@ -15,13 +15,18 @@
 import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.LiveReloadBuildItem;
+import io.quarkus.deployment.dev.RuntimeUpdatesProcessor;
+import io.quarkus.deployment.index.IndexWrapper;
 import io.quarkus.deployment.index.IndexingUtil;
+import io.quarkus.deployment.index.PersistentClassIndex;
 
 public class CombinedIndexBuildStep {
 
     @BuildStep
     CombinedIndexBuildItem build(ApplicationArchivesBuildItem archives,
-            List<AdditionalIndexedClassesBuildItem> additionalIndexedClassesItems) {
+            List<AdditionalIndexedClassesBuildItem> additionalIndexedClassesItems,
+            LiveReloadBuildItem liveReloadBuildItem) {
         List<IndexView> archiveIndexes = new ArrayList<>();
 
         for (ApplicationArchive i : archives.getAllApplicationArchives()) {
@@ -40,7 +45,16 @@ CombinedIndexBuildItem build(ApplicationArchivesBuildItem archives,
             }
         }
 
-        return new CombinedIndexBuildItem(CompositeIndex.create(archivesIndex, indexer.complete()));
+        PersistentClassIndex index = liveReloadBuildItem.getContextObject(PersistentClassIndex.class);
+        if (index == null) {
+            index = new PersistentClassIndex();
+            liveReloadBuildItem.setContextObject(PersistentClassIndex.class, index);
+        }
+
+        CompositeIndex compositeIndex = CompositeIndex.create(archivesIndex, indexer.complete());
+        RuntimeUpdatesProcessor.setLastStartIndex(compositeIndex);
+        return new CombinedIndexBuildItem(compositeIndex,
+                new IndexWrapper(compositeIndex, Thread.currentThread().getContextClassLoader(), index));
     }
 
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigBuildSteps.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigBuildSteps.java
index 84747381902a9..0699b8d2d6d95 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigBuildSteps.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigBuildSteps.java
@@ -27,6 +27,9 @@
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.graal.InetRunTime;
+import io.smallrye.config.ConfigSourceFactory;
+import io.smallrye.config.ConfigSourceInterceptor;
+import io.smallrye.config.ConfigSourceInterceptorFactory;
 import io.smallrye.config.SmallRyeConfigProviderResolver;
 
 class ConfigBuildSteps {
@@ -82,7 +85,10 @@ void nativeServiceProviders(
         for (Class<?> serviceClass : Arrays.asList(
                 ConfigSource.class,
                 ConfigSourceProvider.class,
-                Converter.class)) {
+                Converter.class,
+                ConfigSourceInterceptor.class,
+                ConfigSourceInterceptorFactory.class,
+                ConfigSourceFactory.class)) {
             final String serviceName = serviceClass.getName();
             final Set<String> names = ServiceUtil.classNamesNamedIn(classLoader, SERVICES_PREFIX + serviceName);
             final List<String> list = names.stream()
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java
index 4441a6def5f56..4a17e455e53e5 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java
@@ -29,9 +29,10 @@
 import io.quarkus.deployment.configuration.definition.RootDefinition;
 import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.gizmo.ClassOutput;
-import io.quarkus.runtime.ConfigChangeRecorder;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.configuration.ConfigChangeRecorder;
+import io.quarkus.runtime.configuration.ConfigurationRuntimeConfig;
 
 public class ConfigGenerationBuildStep {
 
@@ -82,7 +83,8 @@ private List<String> getAdditionalBootstrapConfigSourceProviders(
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     public void checkForBuildTimeConfigChange(
-            ConfigChangeRecorder recorder, ConfigurationBuildItem configItem, LoggingSetupBuildItem loggingSetupBuildItem) {
+            ConfigChangeRecorder recorder, ConfigurationBuildItem configItem, LoggingSetupBuildItem loggingSetupBuildItem,
+            ConfigurationRuntimeConfig configurationConfig) {
         BuildTimeConfigurationReader.ReadResult readResult = configItem.getReadResult();
         Config config = ConfigProvider.getConfig();
 
@@ -96,7 +98,7 @@ public void checkForBuildTimeConfigChange(
             }
         }
         values.remove("quarkus.profile");
-        recorder.handleConfigChange(values);
+        recorder.handleConfigChange(configurationConfig, values);
     }
 
     private void handleMembers(Config config, Map<String, String> values, Iterable<ClassDefinition.ClassMember> members,
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
index 9d639e89f81a7..433b625a7071e 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
@@ -25,9 +25,9 @@
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
-import org.jboss.logmanager.handlers.DelayedHandler;
 
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
 import io.quarkus.bootstrap.runner.Timing;
 import io.quarkus.builder.Version;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
@@ -94,7 +94,6 @@ public class MainClassBuildStep {
             JAVAX_NET_SSL_TRUST_STORE_PASSWORD));
 
     public static final String GENERATE_APP_CDS_SYSTEM_PROPERTY = "quarkus.appcds.generate";
-    public static final String PRINT_STARTUP_TIMES_PROPERTY = "quarkus.debug.print-startup-times";
 
     private static final FieldDescriptor STARTUP_CONTEXT_FIELD = FieldDescriptor.of(Application.APP_CLASS_NAME, STARTUP_CONTEXT,
             StartupContext.class);
@@ -286,19 +285,17 @@ void build(List<StaticBytecodeRecorderBuildItem> staticInitTasks,
                 activeProfile,
                 tryBlock.load(LaunchMode.DEVELOPMENT.equals(launchMode.getLaunchMode())));
         cb = tryBlock.addCatch(Throwable.class);
-        cb.invokeVirtualMethod(ofMethod(Logger.class, "errorv", void.class, Throwable.class, String.class, Object.class),
-                cb.readStaticField(logField.getFieldDescriptor()), cb.getCaughtException(),
-                cb.load("Failed to start application (with profile {0})"), activeProfile);
 
         // an exception was thrown before logging was actually setup, we simply dump everything to the console
         ResultHandle delayedHandler = cb
-                .readStaticField(FieldDescriptor.of(InitialConfigurator.class, "DELAYED_HANDLER", DelayedHandler.class));
-        ResultHandle isActivated = cb.invokeVirtualMethod(ofMethod(DelayedHandler.class, "isActivated", boolean.class),
+                .readStaticField(FieldDescriptor.of(InitialConfigurator.class, "DELAYED_HANDLER", QuarkusDelayedHandler.class));
+        ResultHandle isActivated = cb.invokeVirtualMethod(ofMethod(QuarkusDelayedHandler.class, "isActivated", boolean.class),
                 delayedHandler);
         BytecodeCreator isActivatedFalse = cb.ifNonZero(isActivated).falseBranch();
         ResultHandle handlersArray = isActivatedFalse.newArray(Handler.class, 1);
         isActivatedFalse.writeArrayValue(handlersArray, 0, isActivatedFalse.newInstance(ofConstructor(ConsoleHandler.class)));
-        isActivatedFalse.invokeVirtualMethod(ofMethod(DelayedHandler.class, "setHandlers", Handler[].class, Handler[].class),
+        isActivatedFalse.invokeVirtualMethod(
+                ofMethod(QuarkusDelayedHandler.class, "setHandlers", Handler[].class, Handler[].class),
                 delayedHandler, handlersArray);
         isActivatedFalse.breakScope();
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java
index c3a0aedb5922b..3cb12a9ffb3f4 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java
@@ -2,26 +2,17 @@
 
 import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
-import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
@@ -35,11 +26,12 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourcePatternsBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveFieldBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedPackageBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.UnsafeAccessedFieldBuildItem;
@@ -57,49 +49,33 @@ public class NativeImageAutoFeatureStep {
     private static final String GRAAL_AUTOFEATURE = "io/quarkus/runner/AutoFeature";
     private static final MethodDescriptor IMAGE_SINGLETONS_LOOKUP = ofMethod(ImageSingletons.class, "lookup", Object.class,
             Class.class);
-    private static final MethodDescriptor INITIALIZE_AT_RUN_TIME = ofMethod(RuntimeClassInitialization.class,
+    private static final MethodDescriptor INITIALIZE_CLASSES_AT_RUN_TIME = ofMethod(RuntimeClassInitialization.class,
             "initializeAtRunTime", void.class, Class[].class);
+    private static final MethodDescriptor INITIALIZE_PACKAGES_AT_RUN_TIME = ofMethod(RuntimeClassInitialization.class,
+            "initializeAtRunTime", void.class, String[].class);
     private static final MethodDescriptor RERUN_INITIALIZATION = ofMethod(
             "org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport",
             "rerunInitialization", void.class, Class.class, String.class);
+    private static final MethodDescriptor RESOURCES_REGISTRY_ADD_RESOURCES = ofMethod(
+            "com.oracle.svm.core.configure.ResourcesRegistry",
+            "addResources", void.class, String.class);
+    private static final MethodDescriptor RESOURCES_REGISTRY_IGNORE_RESOURCES = ofMethod(
+            "com.oracle.svm.core.configure.ResourcesRegistry",
+            "ignoreResources", void.class, String.class);
     static final String RUNTIME_REFLECTION = RuntimeReflection.class.getName();
     static final String JNI_RUNTIME_ACCESS = "com.oracle.svm.core.jni.JNIRuntimeAccess";
     static final String BEFORE_ANALYSIS_ACCESS = Feature.BeforeAnalysisAccess.class.getName();
     static final String DYNAMIC_PROXY_REGISTRY = "com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry";
     static final String LOCALIZATION_FEATURE = "com.oracle.svm.core.jdk.LocalizationFeature";
 
-    @BuildStep
-    List<NativeImageResourceBuildItem> registerPackageResources(
-            List<NativeImageResourceDirectoryBuildItem> nativeImageResourceDirectories)
-            throws IOException, URISyntaxException {
-        List<NativeImageResourceBuildItem> resources = new ArrayList<>();
-
-        for (NativeImageResourceDirectoryBuildItem nativeImageResourceDirectory : nativeImageResourceDirectories) {
-            String path = Thread.currentThread().getContextClassLoader().getResource(nativeImageResourceDirectory.getPath())
-                    .getPath();
-            File resourceFile = Paths.get(new URL(path.substring(0, path.indexOf("!"))).toURI()).toFile();
-            try (JarFile jarFile = new JarFile(resourceFile)) {
-                Enumeration<JarEntry> entries = jarFile.entries();
-                while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    String resourceName = entry.getName();
-                    if (!entry.isDirectory() && resourceName.startsWith(nativeImageResourceDirectory.getPath())
-                            && !resourceName.endsWith(".class")) {
-                        resources.add(new NativeImageResourceBuildItem(resourceName));
-                    }
-                }
-            }
-        }
-
-        return resources;
-    }
-
     @BuildStep
     void generateFeature(BuildProducer<GeneratedNativeImageClassBuildItem> nativeImageClass,
             List<RuntimeInitializedClassBuildItem> runtimeInitializedClassBuildItems,
+            List<RuntimeInitializedPackageBuildItem> runtimeInitializedPackageBuildItems,
             List<RuntimeReinitializedClassBuildItem> runtimeReinitializedClassBuildItems,
             List<NativeImageProxyDefinitionBuildItem> proxies,
             List<NativeImageResourceBuildItem> resources,
+            List<NativeImageResourcePatternsBuildItem> resourcePatterns,
             List<NativeImageResourceBundleBuildItem> resourceBundles,
             List<ReflectiveMethodBuildItem> reflectiveMethods,
             List<ReflectiveFieldBuildItem> reflectiveFields,
@@ -152,7 +128,20 @@ public void write(String s, byte[] bytes) {
                 CatchBlockCreator cc = tc.addCatch(Throwable.class);
                 cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
             }
-            overallCatch.invokeStaticMethod(INITIALIZE_AT_RUN_TIME, classes);
+            overallCatch.invokeStaticMethod(INITIALIZE_CLASSES_AT_RUN_TIME, classes);
+        }
+
+        if (!runtimeInitializedPackageBuildItems.isEmpty()) {
+            ResultHandle packages = overallCatch.newArray(String.class,
+                    overallCatch.load(runtimeInitializedPackageBuildItems.size()));
+            for (int i = 0; i < runtimeInitializedPackageBuildItems.size(); i++) {
+                TryBlock tc = overallCatch.tryBlock();
+                ResultHandle pkg = tc.load(runtimeInitializedPackageBuildItems.get(i).getPackageName());
+                tc.writeArrayValue(packages, i, pkg);
+                CatchBlockCreator cc = tc.addCatch(Throwable.class);
+                cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
+            }
+            overallCatch.invokeStaticMethod(INITIALIZE_PACKAGES_AT_RUN_TIME, packages);
         }
 
         // hack in reinitialization of process info classes
@@ -201,6 +190,27 @@ public void write(String s, byte[] bytes) {
             }
         }
 
+        /* Resource includes and excludes */
+        if (!resourcePatterns.isEmpty()) {
+            ResultHandle resourcesRegistrySingleton = overallCatch.invokeStaticMethod(IMAGE_SINGLETONS_LOOKUP,
+                    overallCatch.loadClass("com.oracle.svm.core.configure.ResourcesRegistry"));
+            TryBlock tc = overallCatch.tryBlock();
+            for (NativeImageResourcePatternsBuildItem resourcePatternsItem : resourcePatterns) {
+                for (String pattern : resourcePatternsItem.getExcludePatterns()) {
+                    tc.invokeInterfaceMethod(RESOURCES_REGISTRY_IGNORE_RESOURCES, resourcesRegistrySingleton,
+                            overallCatch.load(pattern));
+                }
+                for (String pattern : resourcePatternsItem.getIncludePatterns()) {
+                    tc.invokeInterfaceMethod(
+                            RESOURCES_REGISTRY_ADD_RESOURCES,
+                            resourcesRegistrySingleton,
+                            tc.load(pattern));
+                }
+            }
+            CatchBlockCreator cc = tc.addCatch(Throwable.class);
+            cc.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cc.getCaughtException());
+        }
+
         for (ServiceProviderBuildItem i : serviceProviderBuildItems) {
             overallCatch.invokeStaticMethod(ofMethod(ResourceHelper.class, "registerResources", void.class, String.class),
                     overallCatch.load(i.serviceDescriptorFile()));
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java
index 74bd913c1eb8c..f7ab42243b0d3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java
@@ -15,7 +15,6 @@
 import io.quarkus.deployment.builditem.JavaLibraryPathAdditionalPathBuildItem;
 import io.quarkus.deployment.builditem.JniBuildItem;
 import io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem;
-import io.quarkus.deployment.builditem.NativeImageEnableAllTimeZonesBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
@@ -24,6 +23,7 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 import io.quarkus.runtime.ssl.SslContextConfigurationRecorder;
 
 //TODO: this should go away, once we decide on which one of the API's we want
@@ -38,7 +38,6 @@ void build(SslContextConfigurationRecorder sslContextConfigurationRecorder,
             SslNativeConfigBuildItem sslNativeConfig,
             List<JniBuildItem> jniBuildItems,
             List<NativeImageEnableAllCharsetsBuildItem> nativeImageEnableAllCharsetsBuildItems,
-            List<NativeImageEnableAllTimeZonesBuildItem> nativeImageEnableAllTimeZonesBuildItems,
             List<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport,
             List<EnableAllSecurityServicesBuildItem> enableAllSecurityServicesBuildItems,
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxy,
@@ -88,10 +87,15 @@ void build(SslContextConfigurationRecorder sslContextConfigurationRecorder,
         if (!nativeImageEnableAllCharsetsBuildItems.isEmpty()) {
             nativeImage.produce(new NativeImageSystemPropertyBuildItem("quarkus.native.enable-all-charsets", "true"));
         }
+    }
 
-        if (!nativeImageEnableAllTimeZonesBuildItems.isEmpty()) {
-            nativeImage.produce(new NativeImageSystemPropertyBuildItem("quarkus.native.enable-all-timezones", "true"));
-        }
+    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
+    void reinitHostNameUtil(BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReInitClass) {
+        // certain libraries like JBoss logging internally use this class to determine the hostname
+        // of the system. This HostName class computes and stores the hostname as a static field in a class,
+        // so we reinitialize this to re-compute the field (and other related fields) during native application's
+        // runtime
+        runtimeReInitClass.produce(new RuntimeReinitializedClassBuildItem("org.wildfly.common.net.HostName"));
     }
 
     private Boolean isSslNativeEnabled(SslNativeConfigBuildItem sslNativeConfig,
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageResourcesStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageResourcesStep.java
new file mode 100644
index 0000000000000..c04a653016728
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageResourcesStep.java
@@ -0,0 +1,65 @@
+package io.quarkus.deployment.steps;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Optional;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourcePatternsBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourcePatternsBuildItem.Builder;
+import io.quarkus.deployment.pkg.NativeConfig;
+
+public class NativeImageResourcesStep {
+
+    @BuildStep
+    List<NativeImageResourceBuildItem> registerPackageResources(
+            List<NativeImageResourceDirectoryBuildItem> nativeImageResourceDirectories)
+            throws IOException, URISyntaxException {
+        List<NativeImageResourceBuildItem> resources = new ArrayList<>();
+
+        for (NativeImageResourceDirectoryBuildItem nativeImageResourceDirectory : nativeImageResourceDirectories) {
+            String path = Thread.currentThread().getContextClassLoader().getResource(nativeImageResourceDirectory.getPath())
+                    .getPath();
+            File resourceFile = Paths.get(new URL(path.substring(0, path.indexOf("!"))).toURI()).toFile();
+            try (JarFile jarFile = new JarFile(resourceFile)) {
+                Enumeration<JarEntry> entries = jarFile.entries();
+                while (entries.hasMoreElements()) {
+                    JarEntry entry = entries.nextElement();
+                    String resourceName = entry.getName();
+                    if (!entry.isDirectory() && resourceName.startsWith(nativeImageResourceDirectory.getPath())
+                            && !resourceName.endsWith(".class")) {
+                        resources.add(new NativeImageResourceBuildItem(resourceName));
+                    }
+                }
+            }
+        }
+
+        return resources;
+    }
+
+    @BuildStep
+    void forwardResourcePatternConfigToBuildItem(
+            NativeConfig nativeConfig,
+            BuildProducer<NativeImageResourcePatternsBuildItem> nativeImageResourcePatterns) {
+
+        final Optional<List<String>> includes = nativeConfig.resources.includes;
+        final Optional<List<String>> excludes = nativeConfig.resources.excludes;
+        if (includes.isPresent() || excludes.isPresent()) {
+            final Builder builder = NativeImageResourcePatternsBuildItem.builder();
+            includes.ifPresent(builder::includeGlobs);
+            excludes.ifPresent(builder::excludeGlobs);
+            nativeImageResourcePatterns.produce(builder.build());
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java
index 720f4c788b530..0ddd07023e62f 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java
@@ -31,6 +31,7 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassFinalFieldsWritablePredicateBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
 
 public class ReflectiveHierarchyStep {
 
@@ -89,7 +90,7 @@ public void build(CombinedIndexBuildItem combinedIndexBuildItem,
             log.warnf(
                     "Unable to properly register the hierarchy of the following classes for reflection as they are not in the Jandex index:%n%s"
                             + "%nConsider adding them to the index either by creating a Jandex index "
-                            + "for your dependency via the Maven plugin, an empty META-INF/beans.xml or quarkus.index-dependency properties.\");.",
+                            + "for your dependency via the Maven plugin, an empty META-INF/beans.xml or quarkus.index-dependency properties.",
                     unindexedClassesWarn.toString());
         }
     }
@@ -119,21 +120,23 @@ private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildIte
                 type instanceof UnresolvedTypeVariable) {
             return;
         } else if (type instanceof ClassType) {
-            if (reflectiveHierarchyBuildItem.getIgnorePredicate().test(type.name())) {
+            if (reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(type.name())) {
                 return;
             }
 
-            addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, type.name(),
+            addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, type.name(), type.name(),
                     processedReflectiveHierarchies, unindexedClasses,
                     finalFieldsWritable, reflectiveClass);
 
             for (ClassInfo subclass : combinedIndexBuildItem.getIndex().getAllKnownSubclasses(type.name())) {
                 addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, subclass.name(),
+                        subclass.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, finalFieldsWritable, reflectiveClass);
             }
             for (ClassInfo subclass : combinedIndexBuildItem.getIndex().getAllKnownImplementors(type.name())) {
                 addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, subclass.name(),
+                        subclass.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, finalFieldsWritable, reflectiveClass);
             }
@@ -144,8 +147,9 @@ private void addReflectiveHierarchy(CombinedIndexBuildItem combinedIndexBuildIte
                     unindexedClasses, finalFieldsWritable, reflectiveClass);
         } else if (type instanceof ParameterizedType) {
             ParameterizedType parameterizedType = (ParameterizedType) type;
-            if (!reflectiveHierarchyBuildItem.getIgnorePredicate().test(parameterizedType.name())) {
+            if (!reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(parameterizedType.name())) {
                 addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, parameterizedType.name(),
+                        parameterizedType.name(),
                         processedReflectiveHierarchies,
                         unindexedClasses, finalFieldsWritable, reflectiveClass);
             }
@@ -161,11 +165,15 @@ private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem
             ReflectiveHierarchyBuildItem reflectiveHierarchyBuildItem,
             String source,
             DotName name,
+            DotName initialName,
             Set<DotName> processedReflectiveHierarchies,
             Map<DotName, Set<String>> unindexedClasses,
             Predicate<ClassInfo> finalFieldsWritable,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
-        if (reflectiveHierarchyBuildItem.getIgnorePredicate().test(name)) {
+        if (name == null) {
+            return;
+        }
+        if (reflectiveHierarchyBuildItem.getIgnoreTypePredicate().test(name)) {
             return;
         }
 
@@ -195,20 +203,43 @@ private void addClassTypeHierarchy(CombinedIndexBuildItem combinedIndexBuildItem
             return;
         }
 
-        addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, info.superName(),
+        addClassTypeHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, info.superName(), initialName,
                 processedReflectiveHierarchies,
                 unindexedClasses, finalFieldsWritable, reflectiveClass);
         for (FieldInfo field : info.fields()) {
+            if (reflectiveHierarchyBuildItem.getIgnoreFieldPredicate().test(field)) {
+                continue;
+            }
             if (Modifier.isStatic(field.flags()) || field.name().startsWith("this$") || field.name().startsWith("val$")) {
                 // skip the static fields (especially loggers)
                 // also skip the outer class elements (unfortunately, we don't have a way to test for synthetic fields in Jandex)
                 continue;
             }
-            addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, field.type(),
+            Type fieldType = field.type();
+            if ((field.type().kind() == Kind.TYPE_VARIABLE) && (info.typeParameters().size() == 1)) {
+                // handle the common case where the super type has a generic type in the class signature which
+                // is completely resolved by the sub type
+                // this could be made to handle more complex cases, but it is unlikely we will have to do so
+                if (field.type().asTypeVariable().identifier().equals(info.typeParameters().get(0).identifier())) {
+                    try {
+                        List<Type> types = JandexUtil.resolveTypeParameters(initialName, info.name(),
+                                combinedIndexBuildItem.getIndex());
+                        if (types.size() == 1) {
+                            fieldType = types.get(0);
+                        }
+                    } catch (IllegalArgumentException ignored) {
+
+                    }
+                }
+            }
+            addReflectiveHierarchy(combinedIndexBuildItem, reflectiveHierarchyBuildItem, source, fieldType,
                     processedReflectiveHierarchies,
                     unindexedClasses, finalFieldsWritable, reflectiveClass);
         }
         for (MethodInfo method : info.methods()) {
+            if (reflectiveHierarchyBuildItem.getIgnoreMethodPredicate().test(method)) {
+                continue;
+            }
             if (method.parameters().size() > 0 || Modifier.isStatic(method.flags())
                     || method.returnType().kind() == Kind.VOID) {
                 // we will only consider potential getters
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java
index d22ce75cabae0..891e6f4d1b5de 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/RegisterForReflectionBuildStep.java
@@ -19,14 +19,11 @@ public class RegisterForReflectionBuildStep {
 
     private static final Logger log = Logger.getLogger(RegisterForReflectionBuildStep.class);
 
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-
     @Inject
     CombinedIndexBuildItem combinedIndexBuildItem;
 
     @BuildStep
-    public void build() {
+    public void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         for (AnnotationInstance i : combinedIndexBuildItem.getIndex()
                 .getAnnotations(DotName.createSimple(RegisterForReflection.class.getName()))) {
 
@@ -40,21 +37,21 @@ public void build() {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             if (targetsValue == null && classNamesValue == null) {
                 ClassInfo classInfo = i.target().asClass();
-                registerClass(classLoader, classInfo.name().toString(), methods, fields, ignoreNested);
+                registerClass(classLoader, classInfo.name().toString(), methods, fields, ignoreNested, reflectiveClass);
                 continue;
             }
 
             if (targetsValue != null) {
                 Type[] targets = targetsValue.asClassArray();
                 for (Type type : targets) {
-                    registerClass(classLoader, type.name().toString(), methods, fields, ignoreNested);
+                    registerClass(classLoader, type.name().toString(), methods, fields, ignoreNested, reflectiveClass);
                 }
             }
 
             if (classNamesValue != null) {
                 String[] classNames = classNamesValue.asStringArray();
                 for (String className : classNames) {
-                    registerClass(classLoader, className, methods, fields, ignoreNested);
+                    registerClass(classLoader, className, methods, fields, ignoreNested, reflectiveClass);
                 }
             }
         }
@@ -64,7 +61,7 @@ public void build() {
      * BFS Recursive Method to register a class and it's inner classes for Reflection.
      */
     private void registerClass(ClassLoader classLoader, String className, boolean methods, boolean fields,
-            boolean ignoreNested) {
+            boolean ignoreNested, final BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         reflectiveClass.produce(new ReflectiveClassBuildItem(methods, fields, className));
 
         if (ignoreNested) {
@@ -74,7 +71,7 @@ private void registerClass(ClassLoader classLoader, String className, boolean me
         try {
             Class<?>[] declaredClasses = classLoader.loadClass(className).getDeclaredClasses();
             for (Class<?> clazz : declaredClasses) {
-                registerClass(classLoader, clazz.getName(), methods, fields, false);
+                registerClass(classLoader, clazz.getName(), methods, fields, false, reflectiveClass);
             }
         } catch (ClassNotFoundException e) {
             log.warnf(e, "Failed to load Class %s", className);
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/test/TestResourceProvider.java b/core/deployment/src/main/java/io/quarkus/deployment/test/TestResourceProvider.java
deleted file mode 100644
index 606f910e9251c..0000000000000
--- a/core/deployment/src/main/java/io/quarkus/deployment/test/TestResourceProvider.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.quarkus.deployment.test;
-
-public interface TestResourceProvider {
-
-    void inject(Object test);
-
-}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/ArtifactInfoUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/ArtifactInfoUtil.java
new file mode 100644
index 0000000000000..4fc1c5974687f
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/util/ArtifactInfoUtil.java
@@ -0,0 +1,110 @@
+package io.quarkus.deployment.util;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Properties;
+
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+
+public final class ArtifactInfoUtil {
+
+    public static final String DEPLOYMENT = "-deployment";
+
+    /**
+     * Returns a Map.Entry containing the groupId and the artifactId of the module the contains the BuildItem
+     * <p>
+     * The way this works is by depending on the pom.properties file that should be present in the deployment jar
+     *
+     * @return the result, or throws
+     */
+    public static Map.Entry<String, String> groupIdAndArtifactId(Class<?> clazz) {
+        return groupIdAndArtifactId(clazz, null);
+    }
+
+    /**
+     * Returns a Map.Entry containing the groupId and the artifactId of the module the contains the BuildItem
+     * <p>
+     * The way this works is by depending on the pom.properties file that should be present in the deployment jar
+     *
+     * @return the result, or throws
+     */
+    public static Map.Entry<String, String> groupIdAndArtifactId(Class<?> clazz,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        try {
+            URL jarLocation = clazz.getProtectionDomain().getCodeSource().getLocation();
+            if (jarLocation.toString().endsWith(".jar")) {
+                try (FileSystem fs = FileSystems.newFileSystem(Paths.get(jarLocation.toURI()),
+                        Thread.currentThread().getContextClassLoader())) {
+                    Entry<String, String> ret = groupIdAndArtifactId(fs);
+                    if (ret == null) {
+                        throw new RuntimeException("Unable to determine groupId and artifactId of the jar that contains "
+                                + clazz.getName() + " because the jar doesn't contain the necessary metadata");
+                    }
+                    return ret;
+                }
+            } else if (curateOutcomeBuildItem != null) {
+                // this is needed only for QuarkusDevModeTest inside Quarkus where the class is read from the corresponding directory
+                Path path = Paths.get(jarLocation.toURI());
+                for (AppDependency i : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
+                    for (Path p : i.getArtifact().getPaths()) {
+                        if (path.equals(p)) {
+
+                            String artifactId = i.getArtifact().getArtifactId();
+                            if (artifactId.endsWith(DEPLOYMENT)) {
+                                artifactId = artifactId.substring(0, artifactId.length() - DEPLOYMENT.length());
+                            }
+                            return new AbstractMap.SimpleEntry<>(i.getArtifact().getGroupId(), artifactId);
+                        }
+                    }
+                }
+                return new AbstractMap.SimpleEntry<>("unspecified", "unspecified");
+            } else {
+                return new AbstractMap.SimpleEntry<>("unspecified", "unspecified");
+            }
+        } catch (IOException | URISyntaxException e) {
+            throw new RuntimeException("Unable to determine groupId and artifactId of the jar that contains " + clazz.getName(),
+                    e);
+        }
+    }
+
+    /**
+     * Returns a Map.Entry containing the groupId and the artifactId of the module the contains the BuildItem
+     * <p>
+     * The way this works is by depending on the pom.properties file that should be present in the deployment jar
+     *
+     * @return the result, or null if no maven metadata were found
+     */
+    public static Map.Entry<String, String> groupIdAndArtifactId(FileSystem fs) throws IOException {
+        Path metaInfPath = fs.getPath("/META-INF");
+        return doGroupIdAndArtifactId(metaInfPath);
+    }
+
+    private static AbstractMap.SimpleEntry<String, String> doGroupIdAndArtifactId(Path metaInfPath) throws IOException {
+        Optional<Path> pomProperties = Files.walk(metaInfPath)
+                .filter(Files::isRegularFile)
+                .filter(p -> p.toString().endsWith("pom.properties"))
+                .findFirst();
+        if (pomProperties.isPresent()) {
+            Properties props = new Properties();
+            props.load(Files.newInputStream(pomProperties.get()));
+            String artifactId = props.getProperty("artifactId");
+            if (artifactId.endsWith(DEPLOYMENT)) {
+                artifactId = artifactId.substring(0, artifactId.length() - DEPLOYMENT.length());
+            }
+            return new AbstractMap.SimpleEntry<>(props.getProperty("groupId"), artifactId);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java
index b1d43433b0780..e02454a4ca58b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/util/AsmUtil.java
@@ -1,7 +1,21 @@
 package io.quarkus.deployment.util;
 
+import static java.util.Arrays.asList;
+import static org.objectweb.asm.Type.BOOLEAN_TYPE;
+import static org.objectweb.asm.Type.BYTE_TYPE;
+import static org.objectweb.asm.Type.CHAR_TYPE;
+import static org.objectweb.asm.Type.DOUBLE_TYPE;
+import static org.objectweb.asm.Type.FLOAT_TYPE;
+import static org.objectweb.asm.Type.INT_TYPE;
+import static org.objectweb.asm.Type.LONG_TYPE;
+import static org.objectweb.asm.Type.SHORT_TYPE;
+import static org.objectweb.asm.Type.VOID_TYPE;
+import static org.objectweb.asm.Type.getType;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
 import org.jboss.jandex.ArrayType;
@@ -17,9 +31,43 @@
 
 /**
  * A collection of ASM and Jandex utilities.
+ * NOTE: this has a copy in AsmUtilCopy in arc-processor with some extra methods for knowing if we need a
+ * signature and getting the signature of a class.
  */
 public class AsmUtil {
 
+    public static final List<org.objectweb.asm.Type> PRIMITIVES = asList(
+            VOID_TYPE,
+            BOOLEAN_TYPE,
+            CHAR_TYPE,
+            BYTE_TYPE,
+            SHORT_TYPE,
+            INT_TYPE,
+            FLOAT_TYPE,
+            LONG_TYPE,
+            DOUBLE_TYPE);
+    public static final List<org.objectweb.asm.Type> WRAPPERS = asList(
+            getType(Void.class),
+            getType(Boolean.class),
+            getType(Character.class),
+            getType(Byte.class),
+            getType(Short.class),
+            getType(Integer.class),
+            getType(Float.class),
+            getType(Long.class),
+            getType(Double.class));
+    public static final Map<org.objectweb.asm.Type, org.objectweb.asm.Type> WRAPPER_TO_PRIMITIVE = new HashMap<>();
+
+    static {
+        for (int i = 0; i < AsmUtil.PRIMITIVES.size(); i++) {
+            AsmUtil.WRAPPER_TO_PRIMITIVE.put(AsmUtil.WRAPPERS.get(i), AsmUtil.PRIMITIVES.get(i));
+        }
+    }
+
+    public static org.objectweb.asm.Type autobox(org.objectweb.asm.Type primitive) {
+        return WRAPPERS.get(primitive.getSort());
+    }
+
     /**
      * Returns the Java bytecode signature of a given Jandex MethodInfo using the given type argument mappings.
      * For example, given this method:
@@ -109,6 +157,21 @@ public static String getDescriptor(Type type, Function<String, String> typeArgMa
         return sb.toString();
     }
 
+    /**
+     * Returns the Java bytecode signature of a given Jandex Type using the given type argument mappings.
+     * For example, given this type: <tt>List&lt;T></tt>, this will return <tt>Ljava/util/List&lt;Ljava/lang/Integer;>;</tt> if
+     * your {@code typeArgMapper} contains {@code T=Ljava/lang/Integer;}.
+     * 
+     * @param type the type you want the signature for.
+     * @param typeArgMapper a mapping between type argument names and their bytecode descriptor.
+     * @return a bytecode signature for that type.
+     */
+    public static String getSignature(Type type, Function<String, String> typeArgMapper) {
+        StringBuilder sb = new StringBuilder();
+        toSignature(sb, type, typeArgMapper, false);
+        return sb.toString();
+    }
+
     private static void toSignature(StringBuilder sb, Type type, Function<String, String> typeArgMapper, boolean erased) {
         switch (type.kind()) {
             case ARRAY:
@@ -228,7 +291,7 @@ public static int getReturnInstruction(String typeDescriptor) {
      * specialised return instructions <tt>IRETURN, LRETURN, FRETURN, DRETURN, RETURN</tt> for primitives/void,
      * and <tt>ARETURN</tt> otherwise;
      * 
-     * @param typeDescriptor the return Jandex Type.
+     * @param jandexType the return Jandex Type.
      * @return the correct bytecode return instruction for that return type descriptor.
      */
     public static int getReturnInstruction(Type jandexType) {
@@ -431,6 +494,43 @@ public static void unboxIfRequired(MethodVisitor mv, Type jandexType) {
         }
     }
 
+    /**
+     * Calls the right unboxing method for the given Jandex Type if it is a primitive.
+     *
+     * @param mv The MethodVisitor on which to visit the unboxing instructions
+     * @param type The Jandex Type to unbox if it is a primitive.
+     */
+    public static void unboxIfRequired(MethodVisitor mv, org.objectweb.asm.Type type) {
+        if (type.getSort() <= org.objectweb.asm.Type.DOUBLE) {
+            switch (type.getSort()) {
+                case org.objectweb.asm.Type.BOOLEAN:
+                    unbox(mv, "java/lang/Boolean", "booleanValue", "Z");
+                    break;
+                case org.objectweb.asm.Type.BYTE:
+                    unbox(mv, "java/lang/Byte", "byteValue", "B");
+                    break;
+                case org.objectweb.asm.Type.CHAR:
+                    unbox(mv, "java/lang/Character", "charValue", "C");
+                    break;
+                case org.objectweb.asm.Type.DOUBLE:
+                    unbox(mv, "java/lang/Double", "doubleValue", "D");
+                    break;
+                case org.objectweb.asm.Type.FLOAT:
+                    unbox(mv, "java/lang/Float", "floatValue", "F");
+                    break;
+                case org.objectweb.asm.Type.INT:
+                    unbox(mv, "java/lang/Integer", "intValue", "I");
+                    break;
+                case org.objectweb.asm.Type.LONG:
+                    unbox(mv, "java/lang/Long", "longValue", "J");
+                    break;
+                case org.objectweb.asm.Type.SHORT:
+                    unbox(mv, "java/lang/Short", "shortValue", "S");
+                    break;
+            }
+        }
+    }
+
     private static void unbox(MethodVisitor mv, String owner, String methodName, String returnTypeSignature) {
         mv.visitTypeInsn(Opcodes.CHECKCAST, owner);
         mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, owner, methodName, "()" + returnTypeSignature, false);
@@ -555,4 +655,22 @@ public static void printValueOnStderr(MethodVisitor mv, Runnable valuePusher) {
         mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
                 "(Ljava/lang/Object;)V", false);
     }
+
+    /**
+     * Copy the parameter names to the given MethodVisitor, unless we don't have parameter name info
+     * 
+     * @param mv the visitor to copy to
+     * @param method the method to copy from
+     */
+    public static void copyParameterNames(MethodVisitor mv, MethodInfo method) {
+        int parameterSize = method.parameters().size();
+        if (parameterSize > 0) {
+            // perhaps we don't have parameter names
+            if (method.parameterName(0) == null)
+                return;
+            for (int i = 0; i < parameterSize; i++) {
+                mv.visitParameter(method.parameterName(i), 0 /* modifiers */);
+            }
+        }
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/ExecUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/ExecUtil.java
index 910ca80dddb9a..88d7c9b52d8da 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/util/ExecUtil.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/util/ExecUtil.java
@@ -15,20 +15,20 @@ public class ExecUtil {
     private static final Logger LOG = Logger.getLogger(ExecUtil.class);
 
     private static final Function<InputStream, Runnable> PRINT_OUTPUT = i -> new HandleOutput(i);
-    private static final Function<InputStream, Runnable> SILENT = i -> new HandleOutput(i, false);
+    private static final Function<InputStream, Runnable> SILENT = i -> new HandleOutput(i, Logger.Level.DEBUG);
 
     private static class HandleOutput implements Runnable {
 
         private final InputStream is;
-        private final Boolean logEnabled;
+        private final Logger.Level logLevel;
 
         HandleOutput(InputStream is) {
-            this(is, true);
+            this(is, Logger.Level.INFO);
         }
 
-        HandleOutput(InputStream is, Boolean logEnabled) {
+        HandleOutput(InputStream is, Logger.Level logLevel) {
             this.is = is;
-            this.logEnabled = logEnabled;
+            this.logLevel = LOG.isEnabled(logLevel) ? logLevel : null;
         }
 
         @Override
@@ -37,18 +37,21 @@ public void run() {
                     BufferedReader reader = new BufferedReader(isr)) {
 
                 for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-                    if (logEnabled) {
-                        LOG.info(line);
+                    if (logLevel != null) {
+                        LOG.log(logLevel, line);
                     }
                 }
             } catch (IOException e) {
+                if (logLevel != null) {
+                    LOG.log(logLevel, "Failed to handle output", e);
+                }
             }
         }
     }
 
     /**
      * Execute the specified command from within the current directory.
-     * 
+     *
      * @param command The command
      * @param args The command arguments
      * @return true if commands where executed successfully
@@ -59,7 +62,7 @@ public static boolean exec(String command, String... args) {
 
     /**
      * Execute the specified command from within the current directory and hide the output.
-     * 
+     *
      * @param command The command
      * @param args The command arguments
      * @return true if commands where executed successfully
@@ -70,7 +73,7 @@ public static boolean execSilent(String command, String... args) {
 
     /**
      * Execute the specified command from within the specified directory.
-     * 
+     *
      * @param directory The directory
      * @param command The command
      * @param args The command arguments
@@ -82,7 +85,7 @@ public static boolean exec(File directory, String command, String... args) {
 
     /**
      * Execute the specified command from within the specified directory and hide the output.
-     * 
+     *
      * @param directory The directory
      * @param command The command
      * @param args The command arguments
@@ -95,7 +98,7 @@ public static boolean execSilent(File directory, String command, String... args)
     /**
      * Execute the specified command from within the specified directory.
      * The method allows specifying an output filter that processes the command output.
-     * 
+     *
      * @param directory The directory
      * @param outputFilterFunction A {@link Function} that gets an {@link InputStream} and returns an outputFilter.
      * @param command The command
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/JavaVersionUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/JavaVersionUtil.java
deleted file mode 100644
index d7cac86ddc062..0000000000000
--- a/core/deployment/src/main/java/io/quarkus/deployment/util/JavaVersionUtil.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.deployment.util;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class JavaVersionUtil {
-
-    private static final Pattern PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
-
-    private static boolean IS_JAVA_11_OR_NEWER;
-
-    static {
-        Matcher matcher = PATTERN.matcher(System.getProperty("java.version", ""));
-        IS_JAVA_11_OR_NEWER = !matcher.matches() || Integer.parseInt(matcher.group(1)) >= 11;
-
-    }
-
-    public static boolean isJava11OrHigher() {
-        return IS_JAVA_11_OR_NEWER;
-    }
-}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/ProcessUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/ProcessUtil.java
index 2f18f890adc18..c41acb8967f1c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/util/ProcessUtil.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/util/ProcessUtil.java
@@ -6,12 +6,9 @@
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Optional;
 
 import org.jboss.logging.Logger;
 
-import io.quarkus.deployment.pkg.builditem.ProcessInheritIODisabled;
-
 /**
  * Utility for {@link Process} related operations
  */
@@ -21,19 +18,19 @@ public class ProcessUtil {
 
     /**
      * Launches and returns a {@link Process} built from the {@link ProcessBuilder builder}.
-     * Before launching the process, this method checks if {@link ProcessInheritIODisabled inherit IO is disabled}
-     * and if so, streams both the {@code STDOUT} and {@code STDERR} of the launched process using
+     * Before launching the process, this method checks if inherit IO is disabled and if so,
+     * streams both the {@code STDOUT} and {@code STDERR} of the launched process using
      * {@link #streamToSysOutSysErr(Process)}. Else, it launches the process with {@link ProcessBuilder#inheritIO()}
      *
      * @param builder The process builder
-     * @param processInheritIODisabled Whether or not {@link java.lang.ProcessBuilder.Redirect#INHERIT} can be used for
+     * @param shouldRedirectIO Whether or not {@link java.lang.ProcessBuilder.Redirect#INHERIT} can be used for
      *        launching the process
      * @return Returns the newly launched process
      * @throws IOException
      */
     public static Process launchProcess(final ProcessBuilder builder,
-            final Optional<ProcessInheritIODisabled> processInheritIODisabled) throws IOException {
-        if (!processInheritIODisabled.isPresent()) {
+            final boolean shouldRedirectIO) throws IOException {
+        if (!shouldRedirectIO) {
             return builder.inheritIO().start();
         }
         final Process process = builder.redirectOutput(ProcessBuilder.Redirect.PIPE)
@@ -46,19 +43,19 @@ public static Process launchProcess(final ProcessBuilder builder,
 
     /**
      * Launches and returns a {@link Process} built from the {@link ProcessBuilder builder}.
-     * Before launching the process, this method checks if {@link ProcessInheritIODisabled inherit IO is disabled}
+     * Before launching the process, this method checks if inheritIO is disabled
      * and if so, streams (only) the {@code STDOUT} of the launched process using {@link #streamOutputToSysOut(Process)}
      * (Process)}. Else, it launches the process with {@link ProcessBuilder#inheritIO()}
      *
      * @param builder The process builder
-     * @param processInheritIODisabled Whether or not {@link java.lang.ProcessBuilder.Redirect#INHERIT} can be used for
+     * @param shouldRedirectIO Whether or not {@link java.lang.ProcessBuilder.Redirect#INHERIT} can be used for
      *        launching the process
      * @return Returns the newly launched process
      * @throws IOException
      */
     public static Process launchProcessStreamStdOut(final ProcessBuilder builder,
-            final Optional<ProcessInheritIODisabled> processInheritIODisabled) throws IOException {
-        if (!processInheritIODisabled.isPresent()) {
+            boolean shouldRedirectIO) throws IOException {
+        if (!shouldRedirectIO) {
             return builder.inheritIO().start();
         }
         final Process process = builder.redirectOutput(ProcessBuilder.Redirect.PIPE)
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/UriNormalizationUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/UriNormalizationUtil.java
new file mode 100644
index 0000000000000..3a629bf968b16
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/util/UriNormalizationUtil.java
@@ -0,0 +1,115 @@
+package io.quarkus.deployment.util;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * Common URI path resolution
+ */
+public class UriNormalizationUtil {
+    private UriNormalizationUtil() {
+    }
+
+    /**
+     * Create a URI path from a string. The specified path can not contain
+     * relative {@literal ..} segments or {@literal %} characters.
+     * <p>
+     * Examples:
+     * <ul>
+     * <li>{@code toUri("/", true)} will return a URI with path {@literal /}</li>
+     * <li>{@code toUri("/", false)} will return a URI with an empty path {@literal /}</li>
+     * <li>{@code toUri("./", true)} will return a URI with path {@literal /}</li>
+     * <li>{@code toUri("./", false)} will return a URI with an empty path {@literal /}</li>
+     * <li>{@code toUri("foo/", true)} will return a URI with path {@literal foo/}</li>
+     * <li>{@code toUri("foo/", false)} will return a URI with an empty path {@literal foo}</li>
+     * </ul>
+     *
+     *
+     * @param path String to convert into a URI
+     * @param trailingSlash true if resulting URI must end with a '/'
+     * @throws IllegalArgumentException if the path contains invalid characters or path segments.
+     */
+    public static URI toURI(String path, boolean trailingSlash) {
+        try {
+            // replace inbound // with /
+            path = path.replaceAll("//", "/");
+            // remove trailing slash if result shouldn't have one
+            if (!trailingSlash && path.endsWith("/")) {
+                path = path.substring(0, path.length() - 1);
+            }
+
+            if (path.contains("..") || path.contains("%")) {
+                throw new IllegalArgumentException("Specified path can not contain '..' or '%'. Path was " + path);
+            }
+            URI uri = new URI(path).normalize();
+            if (uri.getPath().equals("")) {
+                return trailingSlash ? new URI("/") : new URI("");
+            } else if (trailingSlash && !path.endsWith("/")) {
+                uri = new URI(uri.getPath() + "/");
+            }
+            return uri;
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Specified path is an invalid URI. Path was " + path, e);
+        }
+    }
+
+    /**
+     * Resolve a string path against a URI base. The specified path can not contain
+     * relative {@literal ..} segments or {@literal %} characters.
+     *
+     * Relative paths will be resolved against the specified base URI.
+     * Absolute paths will be normalized and returned.
+     * <p>
+     * Examples:
+     * <ul>
+     * <li>{@code normalizeWithBase(new URI("/"), "example", true)}
+     * will return a URI with path {@literal /example/}</li>
+     * <li>{@code normalizeWithBase(new URI("/"), "example", false)}
+     * will return a URI with an empty path {@literal /example}</li>
+     * <li>{@code normalizeWithBase(new URI("/"), "/example", true)}
+     * will return a URI with path {@literal /example/}</li>
+     * <li>{@code normalizeWithBase(new URI("/"), "/example", false)}
+     * will return a URI with an empty {@literal /example</li>
+     *
+     * <li>{@code normalizeWithBase(new URI("/prefix/"), "example", true)}
+     * will return a URI with path {@literal /prefix/example/}</li>
+     * <li>{@code normalizeWithBase(new URI("/prefix/"), "example", false)}
+     * will return a URI with an empty path {@literal /prefix/example}</li>
+     * <li>{@code normalizeWithBase(new URI("/prefix/"), "/example", true)}
+     * will return a URI with path {@literal /example/}</li>
+     * <li>{@code normalizeWithBase(new URI("/prefix/"), "/example", false)}
+     * will return a URI with an empty path {@literal /example}</li>
+     *
+     * <li>{@code normalizeWithBase(new URI("foo/"), "example", true)}
+     * will return a URI with path {@literal foo/example/}</li>
+     * <li>{@code normalizeWithBase(new URI("foo/"), "example", false)}
+     * will return a URI with an empty path {@literal foo/example}</li>
+     * <li>{@code normalizeWithBase(new URI("foo/"), "/example", true)}
+     * will return a URI with path {@literal /example/}</li>
+     * <li>{@code normalizeWithBase(new URI("foo/"), "/example", false)}
+     * will return a URI with an empty path {@literal /example}</li>
+     * </ul>
+     *
+     * @param base URI to resolve relative paths. Use {@link #toURI(String, boolean)} to construct this parameter.
+     * 
+     * @param segment Relative or absolute path
+     * @param trailingSlash true if resulting URI must end with a '/'
+     * @throws IllegalArgumentException if the path contains invalid characters or path segments.
+     */
+    public static URI normalizeWithBase(URI base, String segment, boolean trailingSlash) {
+        if (segment == null || segment.trim().isEmpty()) {
+            return base;
+        }
+        URI segmentUri = toURI(segment, trailingSlash);
+        URI resolvedUri = base.resolve(segmentUri);
+        return resolvedUri;
+    }
+
+    public static String relativize(String rootPath, String leafPath) {
+        if (leafPath.startsWith(rootPath)) {
+            return leafPath.substring(rootPath.length());
+        }
+
+        return null;
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/util/WebJarUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/util/WebJarUtil.java
new file mode 100644
index 0000000000000..18a29e5ef0e54
--- /dev/null
+++ b/core/deployment/src/main/java/io/quarkus/deployment/util/WebJarUtil.java
@@ -0,0 +1,481 @@
+package io.quarkus.deployment.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.model.PathsCollection;
+import io.quarkus.bootstrap.util.IoUtils;
+import io.quarkus.builder.Version;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.runtime.LaunchMode;
+import io.smallrye.common.io.jar.JarFiles;
+
+/**
+ * Utility for Web resource related operations
+ */
+public class WebJarUtil {
+
+    private static final Logger LOG = Logger.getLogger(WebJarUtil.class);
+
+    private static final String TMP_DIR = System.getProperty("java.io.tmpdir");
+    private static final String CUSTOM_MEDIA_FOLDER = "META-INF/branding/";
+    private static final List<String> IGNORE_LIST = Arrays.asList("logo.png", "favicon.ico", "style.css");
+    private static final String CSS = ".css";
+    private static final String SNAPSHOT_VERSION = "-SNAPSHOT";
+
+    private WebJarUtil() {
+    }
+
+    public static void hotReloadBrandingChanges(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            LaunchModeBuildItem launchMode,
+            AppArtifact resourcesArtifact,
+            Set<String> hotReloadChanges) throws IOException {
+
+        hotReloadBrandingChanges(curateOutcomeBuildItem, launchMode, resourcesArtifact, hotReloadChanges, true);
+    }
+
+    public static void hotReloadBrandingChanges(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            LaunchModeBuildItem launchMode,
+            AppArtifact resourcesArtifact,
+            Set<String> hotReloadChanges,
+            boolean useDefaultQuarkusBranding) throws IOException {
+
+        if (launchMode.getLaunchMode().equals(LaunchMode.DEVELOPMENT) && hotReloadChanges != null
+                && !hotReloadChanges.isEmpty()) {
+            for (String changedResource : hotReloadChanges) {
+                if (changedResource.startsWith(CUSTOM_MEDIA_FOLDER)) {
+                    ClassLoader classLoader = WebJarUtil.class.getClassLoader();
+                    AppArtifact userApplication = curateOutcomeBuildItem.getEffectiveModel().getAppArtifact();
+                    String fileName = changedResource.replace(CUSTOM_MEDIA_FOLDER, "");
+                    // a branding file has changed !
+                    String modulename = getModuleOverrideName(resourcesArtifact, fileName);
+                    if (IGNORE_LIST.contains(fileName)
+                            && isOverride(userApplication.getPaths(), classLoader, fileName, modulename)) {
+                        Path deploymentPath = createResourcesDirectory(userApplication, resourcesArtifact);
+                        Path filePath = deploymentPath.resolve(fileName);
+                        try (InputStream override = insertVariables(userApplication,
+                                getOverride(userApplication.getPaths(), classLoader,
+                                        fileName, modulename, useDefaultQuarkusBranding),
+                                fileName)) {
+                            if (override != null) {
+                                createFile(override, filePath);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static Path copyResourcesForDevOrTest(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            LaunchModeBuildItem launchMode,
+            AppArtifact resourcesArtifact,
+            String rootFolderInJar)
+            throws IOException {
+        return copyResourcesForDevOrTest(curateOutcomeBuildItem, launchMode, resourcesArtifact, rootFolderInJar, true);
+    }
+
+    public static Path copyResourcesForDevOrTest(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            LaunchModeBuildItem launchMode,
+            AppArtifact resourcesArtifact,
+            String rootFolderInJar,
+            boolean useDefaultQuarkusBranding)
+            throws IOException {
+
+        rootFolderInJar = normalizeRootFolderInJar(rootFolderInJar);
+        AppArtifact userApplication = curateOutcomeBuildItem.getEffectiveModel().getAppArtifact();
+
+        Path deploymentPath = createResourcesDirectory(userApplication, resourcesArtifact);
+
+        // Clean if not in dev mode or if the resources jar is a snapshot version
+        if (!launchMode.getLaunchMode().equals(LaunchMode.DEVELOPMENT)
+                || resourcesArtifact.getVersion().contains(SNAPSHOT_VERSION)) {
+            IoUtils.createOrEmptyDir(deploymentPath);
+        }
+
+        if (isEmpty(deploymentPath)) {
+            ClassLoader classLoader = WebJarUtil.class.getClassLoader();
+            for (Path p : resourcesArtifact.getPaths()) {
+                File artifactFile = p.toFile();
+                if (artifactFile.isFile()) {
+                    // case of a jar file
+                    try (JarFile jarFile = JarFiles.create(artifactFile)) {
+                        Enumeration<JarEntry> entries = jarFile.entries();
+                        while (entries.hasMoreElements()) {
+                            JarEntry entry = entries.nextElement();
+                            if (entry.getName().startsWith(rootFolderInJar)) {
+                                String fileName = entry.getName().replace(rootFolderInJar, "");
+                                Path filePath = deploymentPath.resolve(fileName);
+                                if (entry.isDirectory()) {
+                                    Files.createDirectories(filePath);
+                                } else {
+                                    try (InputStream inputStream = insertVariables(userApplication,
+                                            jarFile.getInputStream(entry), fileName)) {
+                                        String modulename = getModuleOverrideName(resourcesArtifact, fileName);
+                                        if (IGNORE_LIST.contains(fileName)
+                                                && isOverride(userApplication.getPaths(), classLoader, fileName, modulename)) {
+                                            try (InputStream override = insertVariables(userApplication,
+                                                    getOverride(userApplication.getPaths(), classLoader,
+                                                            fileName, modulename, useDefaultQuarkusBranding),
+                                                    fileName)) {
+                                                if (override == null) {
+                                                    createFile(inputStream, filePath);
+                                                } else {
+                                                    createFile(override, filePath); // Override (either developer supplied or Quarkus)
+                                                }
+                                            }
+                                        } else {
+                                            createFile(inputStream, filePath);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    // case of a directory
+                    Path rootFolderToCopy = p.resolve(rootFolderInJar);
+                    if (!Files.isDirectory(rootFolderToCopy)) {
+                        continue;
+                    }
+
+                    Files.walkFileTree(rootFolderToCopy, new SimpleFileVisitor<Path>() {
+                        @Override
+                        public FileVisitResult preVisitDirectory(final Path dir,
+                                final BasicFileAttributes attrs) throws IOException {
+                            Files.createDirectories(deploymentPath.resolve(rootFolderToCopy.relativize(dir)));
+                            return FileVisitResult.CONTINUE;
+                        }
+
+                        @Override
+                        public FileVisitResult visitFile(final Path file,
+                                final BasicFileAttributes attrs) throws IOException {
+                            String fileName = rootFolderToCopy.relativize(file).toString();
+                            Path targetFilePath = deploymentPath.resolve(rootFolderToCopy.relativize(file));
+
+                            String modulename = getModuleOverrideName(resourcesArtifact, fileName);
+                            if (IGNORE_LIST.contains(fileName)
+                                    && isOverride(userApplication.getPaths(), classLoader, fileName, modulename)) {
+                                try (InputStream override = insertVariables(userApplication,
+                                        getOverride(userApplication.getPaths(), classLoader,
+                                                fileName, modulename, useDefaultQuarkusBranding),
+                                        fileName)) {
+                                    if (override == null) {
+                                        copyFile(userApplication, file, fileName, targetFilePath);
+                                    } else {
+                                        createFile(override, targetFilePath); // Override (either developer supplied or Quarkus)
+                                    }
+                                }
+                            } else {
+                                copyFile(userApplication, file, fileName, targetFilePath);
+                            }
+
+                            return FileVisitResult.CONTINUE;
+                        }
+                    });
+                }
+            }
+        }
+        return deploymentPath;
+    }
+
+    public static Map<String, byte[]> copyResourcesForProduction(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            AppArtifact artifact,
+            String rootFolderInJar) throws IOException {
+        return copyResourcesForProduction(curateOutcomeBuildItem, artifact, rootFolderInJar, true);
+    }
+
+    public static Map<String, byte[]> copyResourcesForProduction(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            AppArtifact artifact,
+            String rootFolderInJar,
+            boolean useDefaultQuarkusBranding) throws IOException {
+        rootFolderInJar = normalizeRootFolderInJar(rootFolderInJar);
+        AppArtifact userApplication = curateOutcomeBuildItem.getEffectiveModel().getAppArtifact();
+
+        Map<String, byte[]> map = new HashMap<>();
+        //we are including in a production artifact
+        //just stick the files in the generated output
+        //we could do this for dev mode as well but then we need to extract them every time
+
+        ClassLoader classLoader = WebJarUtil.class.getClassLoader();
+        for (Path p : artifact.getPaths()) {
+            File artifactFile = p.toFile();
+            try (JarFile jarFile = JarFiles.create(artifactFile)) {
+                Enumeration<JarEntry> entries = jarFile.entries();
+                while (entries.hasMoreElements()) {
+                    JarEntry entry = entries.nextElement();
+                    if (entry.getName().startsWith(rootFolderInJar) && !entry.isDirectory()) {
+                        String filename = entry.getName().replace(rootFolderInJar, "");
+                        try (InputStream inputStream = insertVariables(userApplication, jarFile.getInputStream(entry),
+                                filename)) {
+                            byte[] content = null;
+                            String modulename = getModuleOverrideName(artifact, filename);
+                            if (IGNORE_LIST.contains(filename)
+                                    && isOverride(userApplication.getPaths(), classLoader, filename, modulename)) {
+                                try (InputStream resourceAsStream = insertVariables(userApplication,
+                                        getOverride(userApplication.getPaths(), classLoader,
+                                                filename, modulename, useDefaultQuarkusBranding),
+                                        filename)) {
+                                    if (resourceAsStream != null) {
+                                        content = IoUtil.readBytes(resourceAsStream); // Override (either developer supplied or Quarkus)
+                                    }
+                                }
+                            }
+                            if (content == null) {
+                                content = FileUtil.readFileContents(inputStream);
+                            }
+
+                            map.put(filename, content);
+                        }
+                    }
+                }
+            }
+        }
+        return map;
+    }
+
+    public static void updateFile(Path original, byte[] newContent) throws IOException {
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(newContent)) {
+            createFile(bais, original);
+        }
+    }
+
+    public static void updateUrl(Path original, String path, String lineStartsWith, String format) throws IOException {
+        String content = new String(Files.readAllBytes(original), StandardCharsets.UTF_8);
+        String result = updateUrl(content, path, lineStartsWith, format);
+        if (result != null && !result.equals(content)) {
+            Files.write(original, result.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+    public static String updateUrl(String original, String path, String lineStartsWith, String format) {
+        try (Scanner scanner = new Scanner(original)) {
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                if (line.trim().startsWith(lineStartsWith)) {
+                    String newLine = String.format(format, path);
+                    return original.replace(line.trim(), newLine);
+                }
+            }
+        }
+
+        return original;
+    }
+
+    public static AppArtifact getAppArtifact(CurateOutcomeBuildItem curateOutcomeBuildItem, String groupId, String artifactId) {
+        for (AppDependency dep : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
+            if (dep.getArtifact().getArtifactId().equals(artifactId)
+                    && dep.getArtifact().getGroupId().equals(groupId)) {
+                return dep.getArtifact();
+            }
+        }
+        throw new RuntimeException("Could not find artifact " + groupId + ":" + artifactId
+                + " among the application dependencies");
+    }
+
+    private static void copyFile(AppArtifact appArtifact, Path file, String fileName, Path targetFilePath) throws IOException {
+        InputStream providedContent = pathToStream(file).orElse(null);
+        if (providedContent != null) {
+            Files.copy(insertVariables(appArtifact, providedContent, fileName), targetFilePath);
+        }
+    }
+
+    private static String getModuleOverrideName(AppArtifact artifact, String filename) {
+        String type = filename.substring(filename.lastIndexOf("."));
+        return artifact.getArtifactId() + type;
+    }
+
+    private static InputStream getOverride(PathsCollection paths, ClassLoader classLoader, String filename, String modulename,
+            boolean useDefaultQuarkusBranding)
+            throws IOException {
+
+        // First check if the developer supplied the files
+        InputStream overrideStream = getCustomOverride(paths, filename, modulename);
+        if (overrideStream == null && useDefaultQuarkusBranding) {
+            // Else check if Quarkus has a default branding
+            overrideStream = getQuarkusOverride(classLoader, filename, modulename);
+        }
+        return overrideStream;
+    }
+
+    private static InputStream insertVariables(AppArtifact appArtifact, InputStream is, String filename) throws IOException {
+        // Allow replacement of certain values in css
+        if (filename.endsWith(CSS)) {
+            Config c = ConfigProvider.getConfig();
+            String contents = new String(IoUtil.readBytes(is));
+            contents = contents.replace("{applicationName}",
+                    c.getOptionalValue("quarkus.application.name", String.class)
+                            .orElse(appArtifact.getArtifactId()));
+
+            contents = contents.replace("{applicationVersion}",
+                    c.getOptionalValue("quarkus.application.version", String.class)
+                            .orElse(appArtifact.getVersion()));
+
+            contents = contents.replace("{quarkusVersion}", Version.getVersion());
+            is = new ByteArrayInputStream(contents.getBytes());
+        }
+        return is;
+    }
+
+    private static InputStream getCustomOverride(PathsCollection paths, String filename, String modulename) {
+        // Check if the developer supplied the files
+        Path customOverridePath = getCustomOverridePath(paths, filename, modulename);
+        if (customOverridePath != null) {
+            return pathToStream(customOverridePath).orElse(null);
+        }
+        return null;
+    }
+
+    private static Path getCustomOverridePath(PathsCollection paths, String filename, String modulename) {
+
+        // First check if the developer supplied the files
+        Iterator<Path> iterator = paths.iterator();
+        while (iterator.hasNext()) {
+            Path root = iterator.next();
+            Path customModuleOverride = root.resolve(CUSTOM_MEDIA_FOLDER + modulename);
+            if (Files.exists(customModuleOverride)) {
+                return customModuleOverride;
+            }
+            Path customOverride = root.resolve(CUSTOM_MEDIA_FOLDER + filename);
+            if (Files.exists(customOverride)) {
+                return customOverride;
+            }
+        }
+        return null;
+    }
+
+    private static InputStream getQuarkusOverride(ClassLoader classLoader, String filename, String modulename) {
+        // Allow quarkus per module override
+        boolean quarkusModuleOverride = fileExistInClasspath(classLoader, CUSTOM_MEDIA_FOLDER + modulename);
+        if (quarkusModuleOverride) {
+            return classLoader.getResourceAsStream(CUSTOM_MEDIA_FOLDER + modulename);
+        }
+        boolean quarkusOverride = fileExistInClasspath(classLoader, CUSTOM_MEDIA_FOLDER + filename);
+        if (quarkusOverride) {
+            return classLoader.getResourceAsStream(CUSTOM_MEDIA_FOLDER + filename);
+        }
+        return null;
+    }
+
+    private static boolean isOverride(PathsCollection paths, ClassLoader classLoader, String filename, String modulename) {
+        // Check if quarkus override this.
+        return isQuarkusOverride(classLoader, filename, modulename) || isCustomOverride(paths, filename, modulename);
+    }
+
+    private static boolean isQuarkusOverride(ClassLoader classLoader, String filename, String modulename) {
+        // Check if quarkus override this.
+        return fileExistInClasspath(classLoader, CUSTOM_MEDIA_FOLDER + modulename)
+                || fileExistInClasspath(classLoader, CUSTOM_MEDIA_FOLDER + filename);
+    }
+
+    private static boolean isCustomOverride(PathsCollection paths, String filename, String modulename) {
+        Iterator<Path> iterator = paths.iterator();
+        while (iterator.hasNext()) {
+            Path root = iterator.next();
+            Path customModuleOverride = root.resolve(CUSTOM_MEDIA_FOLDER + modulename);
+            if (Files.exists(customModuleOverride)) {
+                return true;
+            }
+            Path customOverride = root.resolve(CUSTOM_MEDIA_FOLDER + filename);
+            return Files.exists(customOverride);
+        }
+
+        return false;
+    }
+
+    private static boolean fileExistInClasspath(ClassLoader classLoader, String filename) {
+        URL u = classLoader.getResource(filename);
+        return u != null;
+    }
+
+    private static Optional<InputStream> pathToStream(Path path) {
+        if (Files.exists(path)) {
+            try {
+                return Optional.of(Files.newInputStream(path));
+            } catch (IOException ex) {
+                LOG.warn("Could not read override file [" + path + "] - " + ex.getMessage());
+            }
+        }
+        return Optional.empty();
+    }
+
+    private static void createFile(InputStream source, Path targetFile) throws IOException {
+        FileLock lock = null;
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(targetFile.toString());
+            FileChannel channel = fos.getChannel();
+            lock = channel.tryLock();
+            if (lock != null) {
+                IoUtils.copy(fos, source);
+            }
+        } finally {
+            if (lock != null) {
+                lock.release();
+            }
+            if (fos != null) {
+                fos.close();
+            }
+        }
+    }
+
+    public static Path createResourcesDirectory(AppArtifact userApplication, AppArtifact resourcesArtifact) {
+        try {
+            Path path = Paths.get(TMP_DIR, "quarkus", userApplication.getGroupId(), userApplication.getArtifactId(),
+                    resourcesArtifact.getGroupId(), resourcesArtifact.getArtifactId(), resourcesArtifact.getVersion());
+
+            if (!Files.exists(path)) {
+                Files.createDirectories(path);
+            }
+            return path;
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static boolean isEmpty(final Path directory) throws IOException {
+        try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(directory)) {
+            return !dirStream.iterator().hasNext();
+        }
+    }
+
+    private static String normalizeRootFolderInJar(String rootFolderInJar) {
+        if (rootFolderInJar.endsWith("/")) {
+            return rootFolderInJar;
+        }
+
+        return rootFolderInJar + "/";
+    }
+}
diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java
index 7679468d0b543..5b41d3c89cf6c 100644
--- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java
+++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java
@@ -1,16 +1,24 @@
 package io.quarkus.runner.bootstrap;
 
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
@@ -21,8 +29,10 @@
 import io.quarkus.bootstrap.app.ArtifactResult;
 import io.quarkus.bootstrap.app.AugmentAction;
 import io.quarkus.bootstrap.app.AugmentResult;
+import io.quarkus.bootstrap.app.ClassChangeInformation;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.classloading.ClassLoaderEventListener;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.builder.BuildChain;
 import io.quarkus.builder.BuildChainBuilder;
@@ -32,7 +42,6 @@
 import io.quarkus.deployment.ExtensionLoader;
 import io.quarkus.deployment.QuarkusAugmentor;
 import io.quarkus.deployment.builditem.ApplicationClassNameBuildItem;
-import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.ConfigDescriptionBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.GeneratedFileSystemResourceHandledBuildItem;
@@ -42,9 +51,12 @@
 import io.quarkus.deployment.builditem.MainClassBuildItem;
 import io.quarkus.deployment.builditem.RawCommandLineArgumentsBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.builditem.TransformedClassesBuildItem;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
+import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ProfileManager;
 
@@ -56,13 +68,16 @@ public class AugmentActionImpl implements AugmentAction {
     private static final Logger log = Logger.getLogger(AugmentActionImpl.class);
 
     private static final Class[] NON_NORMAL_MODE_OUTPUTS = { GeneratedClassBuildItem.class,
-            GeneratedResourceBuildItem.class, BytecodeTransformerBuildItem.class, ApplicationClassNameBuildItem.class,
-            MainClassBuildItem.class, GeneratedFileSystemResourceHandledBuildItem.class };
+            GeneratedResourceBuildItem.class, ApplicationClassNameBuildItem.class,
+            MainClassBuildItem.class, GeneratedFileSystemResourceHandledBuildItem.class,
+            TransformedClassesBuildItem.class };
 
     private final QuarkusBootstrap quarkusBootstrap;
     private final CuratedApplication curatedApplication;
     private final LaunchMode launchMode;
+    private final DevModeType devModeType;
     private final List<Consumer<BuildChainBuilder>> chainCustomizers;
+    private final List<ClassLoaderEventListener> classLoadListeners;
 
     /**
      * A map that is shared between all re-runs of the same augment instance. This is
@@ -72,15 +87,105 @@ public class AugmentActionImpl implements AugmentAction {
     private final Map<Class<?>, Object> reloadContext = new ConcurrentHashMap<>();
 
     public AugmentActionImpl(CuratedApplication curatedApplication) {
-        this(curatedApplication, Collections.emptyList());
+        this(curatedApplication, Collections.emptyList(), Collections.emptyList());
     }
 
+    /**
+     * Leaving this here for backwards compatibility, even though this is only internal.
+     * 
+     * @Deprecated use one of the other constructors
+     */
+    @Deprecated
     public AugmentActionImpl(CuratedApplication curatedApplication, List<Consumer<BuildChainBuilder>> chainCustomizers) {
+        this(curatedApplication, chainCustomizers, Collections.emptyList());
+    }
+
+    public AugmentActionImpl(CuratedApplication curatedApplication, List<Consumer<BuildChainBuilder>> chainCustomizers,
+            List<ClassLoaderEventListener> classLoadListeners) {
         this.quarkusBootstrap = curatedApplication.getQuarkusBootstrap();
         this.curatedApplication = curatedApplication;
         this.chainCustomizers = chainCustomizers;
-        this.launchMode = quarkusBootstrap.getMode() == QuarkusBootstrap.Mode.PROD ? LaunchMode.NORMAL
-                : quarkusBootstrap.getMode() == QuarkusBootstrap.Mode.TEST ? LaunchMode.TEST : LaunchMode.DEVELOPMENT;
+        this.classLoadListeners = classLoadListeners;
+        LaunchMode launchMode;
+        DevModeType devModeType;
+        switch (quarkusBootstrap.getMode()) {
+            case DEV:
+                launchMode = LaunchMode.DEVELOPMENT;
+                devModeType = DevModeType.LOCAL;
+                break;
+            case PROD:
+                launchMode = LaunchMode.NORMAL;
+                devModeType = null;
+                break;
+            case TEST:
+                launchMode = LaunchMode.TEST;
+                devModeType = null;
+                break;
+            case REMOTE_DEV_CLIENT:
+                //this seems a bit counter intuitive, but the remote dev client just keeps a production
+                //app up to date and ships it to the remote side, this allows the remote side to be fully up
+                //to date even if the process is restarted
+                launchMode = LaunchMode.NORMAL;
+                devModeType = DevModeType.REMOTE_LOCAL_SIDE;
+                break;
+            case REMOTE_DEV_SERVER:
+                launchMode = LaunchMode.DEVELOPMENT;
+                devModeType = DevModeType.REMOTE_SERVER_SIDE;
+                break;
+            default:
+                throw new RuntimeException("Unknown launch mode " + quarkusBootstrap.getMode());
+        }
+        this.launchMode = launchMode;
+        this.devModeType = devModeType;
+    }
+
+    @Override
+    public void performCustomBuild(String resultHandler, Object context, String... finalOutputs) {
+        ClassLoader classLoader = curatedApplication.createDeploymentClassLoader();
+        Class<? extends BuildItem>[] targets = Arrays.stream(finalOutputs)
+                .map(new Function<String, Class<? extends BuildItem>>() {
+                    @Override
+                    public Class<? extends BuildItem> apply(String s) {
+                        try {
+                            return (Class<? extends BuildItem>) Class.forName(s, false, classLoader);
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }).toArray(Class[]::new);
+        BuildResult result = runAugment(true, Collections.emptySet(), null, classLoader, targets);
+
+        String debugSourcesDir = BootstrapDebug.DEBUG_SOURCES_DIR;
+        if (debugSourcesDir != null) {
+            for (GeneratedClassBuildItem i : result.consumeMulti(GeneratedClassBuildItem.class)) {
+                try {
+                    if (i.getSource() != null) {
+                        File debugPath = new File(debugSourcesDir);
+                        if (!debugPath.exists()) {
+                            debugPath.mkdir();
+                        }
+                        File sourceFile = new File(debugPath, i.getName() + ".zig");
+                        sourceFile.getParentFile().mkdirs();
+                        Files.write(sourceFile.toPath(), i.getSource().getBytes(StandardCharsets.UTF_8),
+                                StandardOpenOption.CREATE);
+                        log.infof("Wrote source: %s", sourceFile.getAbsolutePath());
+                    } else {
+                        log.infof("Source not available: %s", i.getName());
+                    }
+                } catch (Exception t) {
+                    log.errorf(t, "Failed to write debug source file: %s", i.getName());
+                }
+            }
+        }
+        try {
+            BiConsumer<Object, BuildResult> consumer = (BiConsumer<Object, BuildResult>) Class
+                    .forName(resultHandler, false, classLoader)
+                    .getConstructor().newInstance();
+            consumer.accept(context, result);
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | ClassNotFoundException
+                | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
@@ -89,7 +194,7 @@ public AugmentResult createProductionApplication() {
             throw new IllegalStateException("Can only create a production application when using NORMAL launch mode");
         }
         ClassLoader classLoader = curatedApplication.createDeploymentClassLoader();
-        BuildResult result = runAugment(true, Collections.emptySet(), classLoader, ArtifactResultBuildItem.class);
+        BuildResult result = runAugment(true, Collections.emptySet(), null, classLoader, ArtifactResultBuildItem.class);
 
         String debugSourcesDir = BootstrapDebug.DEBUG_SOURCES_DIR;
         if (debugSourcesDir != null) {
@@ -116,37 +221,68 @@ public AugmentResult createProductionApplication() {
 
         JarBuildItem jarBuildItem = result.consumeOptional(JarBuildItem.class);
         NativeImageBuildItem nativeImageBuildItem = result.consumeOptional(NativeImageBuildItem.class);
-        return new AugmentResult(result.consumeMulti(ArtifactResultBuildItem.class).stream()
-                .map(a -> new ArtifactResult(a.getPath(), a.getType(), a.getAdditionalPaths()))
+        List<ArtifactResultBuildItem> artifactResultBuildItems = result.consumeMulti(ArtifactResultBuildItem.class);
+        BuildSystemTargetBuildItem buildSystemTargetBuildItem = result.consume(BuildSystemTargetBuildItem.class);
+
+        // this depends on the fact that the order in which we can obtain MultiBuildItems is the same as they are produced
+        // we want to write result of the final artifact created
+        ArtifactResultBuildItem lastResult = artifactResultBuildItems.get(artifactResultBuildItems.size() - 1);
+        writeArtifactResultMetadataFile(buildSystemTargetBuildItem, lastResult);
+
+        return new AugmentResult(artifactResultBuildItems.stream()
+                .map(a -> new ArtifactResult(a.getPath(), a.getType(), a.getMetadata()))
                 .collect(Collectors.toList()),
                 jarBuildItem != null ? jarBuildItem.toJarResult() : null,
                 nativeImageBuildItem != null ? nativeImageBuildItem.getPath() : null);
     }
 
+    private void writeArtifactResultMetadataFile(BuildSystemTargetBuildItem outputTargetBuildItem,
+            ArtifactResultBuildItem lastResult) {
+        Path quarkusArtifactMetadataPath = outputTargetBuildItem.getOutputDirectory().resolve("quarkus-artifact.properties");
+        Properties properties = new Properties();
+        properties.put("type", lastResult.getType());
+        if (lastResult.getPath() != null) {
+            properties.put("path", outputTargetBuildItem.getOutputDirectory().relativize(lastResult.getPath()).toString());
+        }
+        Map<String, Object> metadata = lastResult.getMetadata();
+        if (metadata != null) {
+            for (Map.Entry<String, Object> entry : metadata.entrySet()) {
+                if (entry.getValue() instanceof String) {
+                    properties.put("metadata." + entry.getKey(), entry.getValue());
+                }
+            }
+        }
+        try (FileOutputStream fos = new FileOutputStream(quarkusArtifactMetadataPath.toFile())) {
+            properties.store(fos, "Generated by Quarkus - Do not edit manually");
+        } catch (IOException e) {
+            log.debug("Unable to write artifact result metadata file", e);
+        }
+    }
+
     @Override
     public StartupActionImpl createInitialRuntimeApplication() {
         if (launchMode == LaunchMode.NORMAL) {
             throw new IllegalStateException("Cannot launch a runtime application with NORMAL launch mode");
         }
         ClassLoader classLoader = curatedApplication.createDeploymentClassLoader();
-
         @SuppressWarnings("unchecked")
-        BuildResult result = runAugment(true, Collections.emptySet(), classLoader, NON_NORMAL_MODE_OUTPUTS);
-
-        return new StartupActionImpl(curatedApplication, result, classLoader);
+        BuildResult result = runAugment(true, Collections.emptySet(), null, classLoader, NON_NORMAL_MODE_OUTPUTS);
+        return new StartupActionImpl(curatedApplication, result);
     }
 
     @Override
-    public StartupActionImpl reloadExistingApplication(boolean hasStartedSuccessfully, Set<String> changedResources) {
+    public StartupActionImpl reloadExistingApplication(boolean hasStartedSuccessfully, Set<String> changedResources,
+            ClassChangeInformation classChangeInformation) {
         if (launchMode != LaunchMode.DEVELOPMENT) {
             throw new IllegalStateException("Only application with launch mode DEVELOPMENT can restart");
         }
         ClassLoader classLoader = curatedApplication.createDeploymentClassLoader();
 
         @SuppressWarnings("unchecked")
-        BuildResult result = runAugment(!hasStartedSuccessfully, changedResources, classLoader, NON_NORMAL_MODE_OUTPUTS);
+        BuildResult result = runAugment(!hasStartedSuccessfully, changedResources, classChangeInformation, classLoader,
+                NON_NORMAL_MODE_OUTPUTS);
 
-        return new StartupActionImpl(curatedApplication, result, classLoader);
+        return new StartupActionImpl(curatedApplication, result);
     }
 
     /**
@@ -167,7 +303,9 @@ public BuildResult runCustomAction(Consumer<BuildChainBuilder> chainBuild, Consu
             final BuildChainBuilder chainBuilder = BuildChain.builder();
             chainBuilder.setClassLoader(classLoader);
 
-            ExtensionLoader.loadStepsFrom(classLoader).accept(chainBuilder);
+            ExtensionLoader.loadStepsFrom(classLoader, new Properties(),
+                    curatedApplication.getAppModel().getPlatformProperties(), launchMode, devModeType, null)
+                    .accept(chainBuilder);
             chainBuilder.loadProviders(classLoader);
 
             for (Consumer<BuildChainBuilder> c : chainCustomizers) {
@@ -184,7 +322,8 @@ public BuildResult runCustomAction(Consumer<BuildChainBuilder> chainBuild, Consu
             BuildChain chain = chainBuilder
                     .build();
             BuildExecutionBuilder execBuilder = chain.createExecutionBuilder("main")
-                    .produce(new LaunchModeBuildItem(launchMode))
+                    .produce(new LaunchModeBuildItem(launchMode,
+                            devModeType == null ? Optional.empty() : Optional.of(devModeType)))
                     .produce(new ShutdownContextBuildItem())
                     .produce(new RawCommandLineArgumentsBuildItem())
                     .produce(new LiveReloadBuildItem());
@@ -203,7 +342,8 @@ public BuildResult runCustomAction(Consumer<BuildChainBuilder> chainBuild, Consu
         }
     }
 
-    private BuildResult runAugment(boolean firstRun, Set<String> changedResources, ClassLoader deploymentClassLoader,
+    private BuildResult runAugment(boolean firstRun, Set<String> changedResources,
+            ClassChangeInformation classChangeInformation, ClassLoader deploymentClassLoader,
             Class<? extends BuildItem>... finalOutputs) {
         ClassLoader old = Thread.currentThread().getContextClassLoader();
         try {
@@ -225,11 +365,14 @@ private BuildResult runAugment(boolean firstRun, Set<String> changedResources, C
             }
 
             builder.setLaunchMode(launchMode);
+            builder.setDevModeType(devModeType);
             builder.setRebuild(quarkusBootstrap.isRebuild());
             if (firstRun) {
-                builder.setLiveReloadState(new LiveReloadBuildItem(false, Collections.emptySet(), reloadContext));
+                builder.setLiveReloadState(
+                        new LiveReloadBuildItem(false, Collections.emptySet(), reloadContext, classChangeInformation));
             } else {
-                builder.setLiveReloadState(new LiveReloadBuildItem(true, changedResources, reloadContext));
+                builder.setLiveReloadState(
+                        new LiveReloadBuildItem(true, changedResources, reloadContext, classChangeInformation));
             }
             for (AdditionalDependency i : quarkusBootstrap.getAdditionalApplicationArchives()) {
                 //this gets added to the class path either way
diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/GenerateConfigTask.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/GenerateConfigTask.java
index acace794fcb34..84a4e1e512277 100644
--- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/GenerateConfigTask.java
+++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/GenerateConfigTask.java
@@ -41,7 +41,7 @@ public void accept(CuratedApplication application, Map<String, Object> stringObj
         try {
             Path temp = Files.createTempDirectory("empty");
             try {
-                AugmentActionImpl augmentAction = new AugmentActionImpl(application, Collections.emptyList());
+                AugmentActionImpl augmentAction = new AugmentActionImpl(application);
                 BuildResult buildResult = augmentAction.runCustomAction(new Consumer<BuildChainBuilder>() {
                     @Override
                     public void accept(BuildChainBuilder chainBuilder) {
diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java
index 948d896301652..609c043335650 100644
--- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java
+++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/RunningQuarkusApplicationImpl.java
@@ -14,6 +14,8 @@ public class RunningQuarkusApplicationImpl implements RunningQuarkusApplication
     private final Closeable closeTask;
     private final ClassLoader classLoader;
 
+    private boolean closing;
+
     public RunningQuarkusApplicationImpl(Closeable closeTask, ClassLoader classLoader) {
         this.closeTask = closeTask;
         this.classLoader = classLoader;
@@ -26,7 +28,10 @@ public ClassLoader getClassLoader() {
 
     @Override
     public void close() throws Exception {
-        closeTask.close();
+        if (!closing) {
+            closing = true;
+            closeTask.close();
+        }
     }
 
     @Override
diff --git a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java
index 6fed3f94104a7..b2ca68c4ab709 100644
--- a/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java
+++ b/core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java
@@ -9,20 +9,15 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.jboss.logging.Logger;
-import org.objectweb.asm.ClassVisitor;
 
 import io.quarkus.bootstrap.BootstrapDebug;
 import io.quarkus.bootstrap.app.CuratedApplication;
@@ -32,12 +27,11 @@
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.builder.BuildResult;
 import io.quarkus.deployment.builditem.ApplicationClassNameBuildItem;
-import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
 import io.quarkus.deployment.builditem.MainClassBuildItem;
+import io.quarkus.deployment.builditem.TransformedClassesBuildItem;
 import io.quarkus.deployment.configuration.RunTimeConfigurationGenerator;
-import io.quarkus.deployment.index.ConstPoolScanner;
 import io.quarkus.dev.appstate.ApplicationStateNotification;
 import io.quarkus.runtime.Quarkus;
 
@@ -49,35 +43,30 @@ public class StartupActionImpl implements StartupAction {
     private final BuildResult buildResult;
     private final QuarkusClassLoader runtimeClassLoader;
 
-    public StartupActionImpl(CuratedApplication curatedApplication, BuildResult buildResult,
-            ClassLoader deploymentClassLoader) {
+    public StartupActionImpl(CuratedApplication curatedApplication, BuildResult buildResult) {
         this.curatedApplication = curatedApplication;
         this.buildResult = buildResult;
         Set<String> eagerClasses = new HashSet<>();
-        Map<String, Predicate<byte[]>> transformerPredicates = new HashMap<>();
-        Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers = extractTransformers(
-                eagerClasses, transformerPredicates);
+        Map<String, byte[]> transformedClasses = extractTransformers(eagerClasses);
         QuarkusClassLoader baseClassLoader = curatedApplication.getBaseRuntimeClassLoader();
         QuarkusClassLoader runtimeClassLoader;
 
         //so we have some differences between dev and test mode here.
         //test mode only has a single class loader, while dev uses a disposable runtime class loader
         //that is discarded between restarts
-        if (curatedApplication.getQuarkusBootstrap().getMode() == QuarkusBootstrap.Mode.DEV) {
-            baseClassLoader.reset(extractGeneratedResources(false), bytecodeTransformers, transformerPredicates,
-                    deploymentClassLoader);
-            runtimeClassLoader = curatedApplication.createRuntimeClassLoader(baseClassLoader,
-                    bytecodeTransformers, transformerPredicates,
-                    deploymentClassLoader, extractGeneratedResources(true));
-        } else {
-            Map<String, byte[]> resources = new HashMap<>();
+        Map<String, byte[]> resources = new HashMap<>();
+        resources.putAll(extractGeneratedResources(true));
+        if (curatedApplication.getQuarkusBootstrap().getMode() == QuarkusBootstrap.Mode.TEST) {
             resources.putAll(extractGeneratedResources(false));
-            resources.putAll(extractGeneratedResources(true));
-            baseClassLoader.reset(resources, bytecodeTransformers, transformerPredicates, deploymentClassLoader);
+            baseClassLoader.reset(resources, transformedClasses);
             runtimeClassLoader = baseClassLoader;
+        } else {
+            baseClassLoader.reset(extractGeneratedResources(false),
+                    transformedClasses);
+            runtimeClassLoader = curatedApplication.createRuntimeClassLoader(baseClassLoader,
+                    resources, transformedClasses);
         }
         this.runtimeClassLoader = runtimeClassLoader;
-        handleEagerClasses(runtimeClassLoader, eagerClasses);
     }
 
     private void handleEagerClasses(QuarkusClassLoader runtimeClassLoader, Set<String> eagerClasses) {
@@ -117,7 +106,7 @@ public void run() {
     /**
      * Runs the application by running the main method of the main class. As this is a blocking method a new
      * thread is created to run this task.
-     *
+     * <p>
      * Before this method is called an appropriate exit handler will likely need to
      * be set in {@link io.quarkus.runtime.ApplicationLifecycleManager#setDefaultExitCodeHandler(Consumer)}
      * of the JVM will exit when the app stops.
@@ -262,40 +251,18 @@ public ClassLoader getClassLoader() {
         return runtimeClassLoader;
     }
 
-    private Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> extractTransformers(Set<String> eagerClasses,
-            Map<String, Predicate<byte[]>> transformerPredicates) {
-        Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers = new HashMap<>();
-        Set<String> noConstScanning = new HashSet<>();
-        Map<String, Set<String>> constScanning = new HashMap<>();
-        List<BytecodeTransformerBuildItem> transformers = buildResult.consumeMulti(BytecodeTransformerBuildItem.class);
-        for (BytecodeTransformerBuildItem i : transformers) {
-            List<BiFunction<String, ClassVisitor, ClassVisitor>> list = bytecodeTransformers.get(i.getClassToTransform());
-            if (list == null) {
-                bytecodeTransformers.put(i.getClassToTransform(), list = new ArrayList<>());
-            }
-            list.add(i.getVisitorFunction());
-            if (i.isEager()) {
-                eagerClasses.add(i.getClassToTransform());
-            }
-            if (i.getRequireConstPoolEntry() == null || i.getRequireConstPoolEntry().isEmpty()) {
-                noConstScanning.add(i.getClassToTransform());
-            } else {
-                constScanning.computeIfAbsent(i.getClassToTransform(), (s) -> new HashSet<>())
-                        .addAll(i.getRequireConstPoolEntry());
-            }
-        }
-        for (String i : noConstScanning) {
-            constScanning.remove(i);
-        }
-        for (Map.Entry<String, Set<String>> entry : constScanning.entrySet()) {
-            transformerPredicates.put(entry.getKey(), new Predicate<byte[]>() {
-                @Override
-                public boolean test(byte[] bytes) {
-                    return ConstPoolScanner.constPoolEntryPresent(bytes, entry.getValue());
+    private Map<String, byte[]> extractTransformers(Set<String> eagerClasses) {
+        Map<String, byte[]> ret = new HashMap<>();
+        TransformedClassesBuildItem transformers = buildResult.consume(TransformedClassesBuildItem.class);
+        for (Set<TransformedClassesBuildItem.TransformedClass> i : transformers.getTransformedClassesByJar().values()) {
+            for (TransformedClassesBuildItem.TransformedClass clazz : i) {
+                ret.put(clazz.getFileName(), clazz.getData());
+                if (clazz.isEager()) {
+                    eagerClasses.add(clazz.getClassName());
                 }
-            });
+            }
         }
-        return bytecodeTransformers;
+        return ret;
     }
 
     private Map<String, byte[]> extractGeneratedResources(boolean applicationClasses) {
diff --git a/extensions/smallrye-graphql/deployment/src/main/resources/META-INF/resources/favicon.ico b/core/deployment/src/main/resources/META-INF/branding/favicon.ico
similarity index 100%
rename from extensions/smallrye-graphql/deployment/src/main/resources/META-INF/resources/favicon.ico
rename to core/deployment/src/main/resources/META-INF/branding/favicon.ico
diff --git a/core/deployment/src/main/resources/META-INF/branding/logo.png b/core/deployment/src/main/resources/META-INF/branding/logo.png
new file mode 100644
index 0000000000000..34608dbc02754
Binary files /dev/null and b/core/deployment/src/main/resources/META-INF/branding/logo.png differ
diff --git a/core/deployment/src/main/resources/META-INF/branding/smallrye-graphql-ui-graphiql.css b/core/deployment/src/main/resources/META-INF/branding/smallrye-graphql-ui-graphiql.css
new file mode 100644
index 0000000000000..7f2d9aa345b01
--- /dev/null
+++ b/core/deployment/src/main/resources/META-INF/branding/smallrye-graphql-ui-graphiql.css
@@ -0,0 +1,72 @@
+body {
+    height: 100%;
+    margin: 0 !important;
+    width: 100%;
+    overflow: hidden;
+    box-sizing: border-box;    
+}
+
+#graphiql {
+    height: 100vh;
+}
+
+#graphiql .topBar{
+    background:#343a40;
+}
+
+#graphiql .execute-button {
+    box-shadow:unset;
+    background: #4695eb;
+}
+
+#graphiql .toolbar-button {
+    padding-top: 12px !important;
+    box-shadow:unset;
+    background: transparent;
+    color: #9a9da0;
+}
+
+#graphiql .topBar::after {
+    content: "{applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion})";
+    position: absolute;
+    padding-top: 6px;
+    right: 100px;
+    color: #9a9da0;
+}
+
+#graphiql .docExplorerShow {
+    background: #4695eb;
+    color: white;
+}
+
+#graphiql .docExplorerWrap {
+    color: black;
+}
+#graphiql .docExplorerHide{
+    color: black;
+}
+
+#graphiql .topBar {
+    padding-bottom: 12px !important;
+    padding-top: 12px !important;   
+}
+
+#graphiql .title a::after {
+  content: "GraphQL UI";
+}
+
+#graphiql .title a {
+    display: flex;
+    align-items:center;
+    color: white;
+    text-decoration: unset;
+    font-size: 1.25rem;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+}
+
+#graphiql .title img {
+    border-right: 1px solid darkgrey;
+    padding-right: 10px;
+    margin-right: 10px;
+    height: 30px;
+}
\ No newline at end of file
diff --git a/core/deployment/src/main/resources/META-INF/branding/smallrye-health-ui.css b/core/deployment/src/main/resources/META-INF/branding/smallrye-health-ui.css
new file mode 100644
index 0000000000000..258a41795895f
--- /dev/null
+++ b/core/deployment/src/main/resources/META-INF/branding/smallrye-health-ui.css
@@ -0,0 +1,36 @@
+.navbar {
+    padding: unset;
+    justify-content: left;
+}
+
+.mr-auto, .mx-auto {
+    margin-right: unset !important;
+    padding-right: 15px;   
+}
+
+.navbar-brand img {
+    border-right: 1px solid darkgrey;
+    padding-left: 12px;
+    padding-right: 10px;
+    margin-right: 5px;
+    height: 30px;
+}
+
+#state {
+    padding-right: 10px;
+    font-weight: normal;
+}
+
+.nav-item h3 span {
+    font-size: 12px
+}
+
+.navbar::after {
+    content: "{applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion})";
+    font-size: 0.9em;
+    padding-right: 10px; 
+    padding-left: 10px; 
+    position: absolute;
+    right: 0px;
+    color: #9a9da0;
+}
\ No newline at end of file
diff --git a/core/deployment/src/main/resources/META-INF/branding/smallrye-open-api-ui.css b/core/deployment/src/main/resources/META-INF/branding/smallrye-open-api-ui.css
new file mode 100644
index 0000000000000..f46c8e86c4d45
--- /dev/null
+++ b/core/deployment/src/main/resources/META-INF/branding/smallrye-open-api-ui.css
@@ -0,0 +1,82 @@
+html{
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+#swagger-ui .topbar {
+    padding-top: 5px !important;
+    padding-left: 14px !important;
+    padding-bottom: 5px !important;
+}
+
+#swagger-ui .swagger-ui .topbar a{
+    max-width: 230px;
+}
+
+#swagger-ui .topbar-wrapper .link a::after {
+    content: "Swagger UI";
+    font-size: 1.25rem;
+    font-weight: normal;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+}
+
+#swagger-ui .topbar-wrapper .download-url-wrapper::after {
+    content: "{applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion})";
+    color: #9a9da0;
+    padding-top: 12px;
+    position: absolute;
+    right: 15px;
+    font-size: 0.83em;
+}
+
+#swagger-ui .topbar .wrapper {
+    max-width: unset !important;
+    padding: unset;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+#swagger-ui .download-url-wrapper {
+    justify-content: left;
+}
+
+#swagger-ui .download-url-input {
+    width: 30%;
+    
+}
+
+#swagger-ui .topbar .wrapper img {
+    border-right: 1px solid darkgrey;
+    padding-right: 10px;
+    margin-right: 10px;
+    height: 30px;
+}
+
+#swagger-ui .download-url-button {
+    background-color: #4695eb;
+    color: white;
+}
+
+*,
+*:before,
+*:after
+{
+    box-sizing: inherit;
+}
+
+body{
+    margin:0;
+    background: #fafafa;
+}
+
+.swagger-ui .topbar {
+   background-color: #343a40;
+}
+
+#footer {
+    font-family:sans-serif;
+    color:#3b4151;
+    font-size:70%;
+    text-align: center;
+}
\ No newline at end of file
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStepTest.java b/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStepTest.java
new file mode 100644
index 0000000000000..4f4ce17d781a9
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStepTest.java
@@ -0,0 +1,105 @@
+package io.quarkus.deployment.pkg.steps;
+
+import static io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM.Distribution.MANDREL;
+import static io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM.Distribution.ORACLE;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM.Distribution;
+import io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM.Version;
+
+public class NativeImageBuildStepTest {
+
+    @Test
+    public void testGraalVMVersionDetected() {
+        assertVersion(1, 0, ORACLE, Version.of(Stream.of("GraalVM Version 1.0.0")));
+        assertVersion(19, 3, ORACLE, Version.of(Stream.of("GraalVM Version 19.3.0")));
+        assertVersion(19, 3, ORACLE, Version.of(Stream.of("GraalVM Version 19.3.3")));
+        assertVersion(20, 0, ORACLE, Version.of(Stream.of("GraalVM Version 20.0.0")));
+        assertVersion(20, 1, ORACLE, Version.of(Stream.of("GraalVM Version 20.1.0 (Java Version 11.0.7)")));
+        assertVersion(20, 1, MANDREL, Version
+                .of(Stream.of("GraalVM Version 20.1.0.1.Alpha2 56d4ee1b28 (Mandrel Distribution) (Java Version 11.0.8)")));
+        assertVersion(20, 1, MANDREL, Version
+                .of(Stream.of("GraalVM Version 20.1.0.1-Final 56d4ee1b28 (Mandrel Distribution) (Java Version 11.0.8)")));
+        assertVersion(21, 0, MANDREL, Version
+                .of(Stream.of("GraalVM Version 21.0.0.0-0b3 (Mandrel Distribution) (Java Version 11.0.8)")));
+        assertVersion(20, 3, MANDREL, Version
+                .of(Stream.of("GraalVM Version 20.3.1.2-dev (Mandrel Distribution) (Java Version 11.0.8)")));
+    }
+
+    static void assertVersion(int major, int minor, Distribution distro, Version version) {
+        assertThat(version.major).isEqualTo(major);
+        assertThat(version.minor).isEqualTo(minor);
+
+        assertThat(version.distribution).isEqualTo(distro);
+        if (distro == MANDREL)
+            assertThat(version.isMandrel()).isTrue();
+
+        assertThat(version.isDetected()).isEqualTo(true);
+    }
+
+    @Test
+    public void testGraalVMVersionUndetected() {
+        assertThat(Version.of(Stream.of("foo bar")).isDetected()).isFalse();
+    }
+
+    @Test
+    public void testGraalVMVersionSnapshot() {
+        assertSnapshot(MANDREL,
+                Version.of(Stream.of("GraalVM Version beb2fd6 (Mandrel Distribution) (Java Version 11.0.9-internal)")));
+    }
+
+    static void assertSnapshot(Distribution distro, Version version) {
+        assertThat(version.distribution).isEqualTo(distro);
+        assertThat(version.isDetected()).isEqualTo(true);
+        assertThat(version.isSnapshot()).isEqualTo(true);
+    }
+
+    @Test
+    public void testGraalVMVersionsOlderThan() {
+        assertOlderThan("GraalVM Version 1.0.0", "GraalVM Version 19.3.0");
+        assertOlderThan("GraalVM Version 20.0.0", "GraalVM Version 20.1.0");
+    }
+
+    /**
+     * Asserts that version is older than other.
+     */
+    static void assertOlderThan(String version, String other) {
+        assertThat(Version.of(Stream.of(version)).compareTo(Version.of(Stream.of(other)))).isLessThan(0);
+    }
+
+    @Test
+    public void testGraalVMVersionsCompareEqualTo() {
+        assertCompareEqualTo("GraalVM Version 20.1.0", "GraalVM Version 20.1.0");
+        // Distributions don't impact newer/older/same comparisons
+        assertCompareEqualTo("GraalVM Version 20.1.0",
+                "GraalVM Version 20.1.0.1.Alpha2 56d4ee1b28 (Mandrel Distribution) (Java Version 11.0.8)");
+        // Micro versions ignored, hence two micros are considered the same right now
+        assertCompareEqualTo("GraalVM Version 19.3.0", "GraalVM Version 19.3.3");
+    }
+
+    /**
+     * Asserts that version is equals to other when compared.
+     */
+    static void assertCompareEqualTo(String version, String other) {
+        assertThat(Version.of(Stream.of(version)).compareTo(Version.of(Stream.of(other)))).isEqualTo(0);
+    }
+
+    @Test
+    public void testGraalVMVersionsNewerThan() {
+        assertNewerThan("GraalVM Version 20.0.0", "GraalVM Version 19.3.0");
+        assertNewerThan("GraalVM Version 20.1.0.1.Alpha2 56d4ee1b28 (Mandrel Distribution) (Java Version 11.0.8)",
+                "GraalVM Version 20.0.0");
+    }
+
+    /**
+     * Asserts that version is newer than other.
+     */
+    static void assertNewerThan(String version, String other) {
+        assertThat(Version.of(Stream.of(version)).isNewerThan(Version.of(Stream.of(other)))).isTrue();
+    }
+
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleClass.java b/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleClass.java
index 2237ad2a2dad9..9b0ae262321fe 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleClass.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleClass.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleInvocationHandler.java b/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleInvocationHandler.java
index a063a852eb188..906db4d57cc32 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleInvocationHandler.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/proxy/SimpleInvocationHandler.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java
index c2a30db76293a..16fce39416240 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java
@@ -22,6 +22,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.deployment.TestClassLoader;
@@ -136,6 +137,39 @@ public void testJavaBean() throws Exception {
         }, new TestJavaBeanSubclass("A string", 99, "PUT"));
     }
 
+    @Test
+    public void testValidationFails() throws Exception {
+        Assertions.assertThrows(RuntimeException.class, () -> {
+            runTest(generator -> {
+                TestRecorder recorder = generator.getRecordingProxy(TestRecorder.class);
+                ValidationFails validationFails = new ValidationFails();
+                validationFails.setName("Stuart Douglas");
+                recorder.object(validationFails);
+            });
+        });
+    }
+
+    @Test
+    public void testRelaxedValidationSucceeds() throws Exception {
+        runTest(generator -> {
+            TestRecorder recorder = generator.getRecordingProxy(TestRecorder.class);
+            ValidationFails validationFails = new ValidationFails();
+            validationFails.setName("Stuart Douglas");
+            recorder.relaxedObject(validationFails);
+        }, new ValidationFails("Stuart Douglas"));
+    }
+
+    @Test
+    public void testIgnoredProperties() throws Exception {
+        runTest(generator -> {
+            TestRecorder recorder = generator.getRecordingProxy(TestRecorder.class);
+            IgnoredProperties ignoredProperties = new IgnoredProperties();
+            ignoredProperties.setNotIgnored("Shows up");
+            ignoredProperties.setIgnoredField("Does not show up");
+            recorder.ignoredProperties(ignoredProperties);
+        }, new IgnoredProperties("Shows up", null));
+    }
+
     @Test
     public void testJavaBeanWithEmbeddedReturnValue() throws Exception {
         runTest(generator -> {
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/IgnoredProperties.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/IgnoredProperties.java
new file mode 100644
index 0000000000000..286ca1ebba4c0
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/IgnoredProperties.java
@@ -0,0 +1,65 @@
+package io.quarkus.deployment.recording;
+
+import java.util.Objects;
+
+import io.quarkus.runtime.annotations.IgnoreProperty;
+
+public class IgnoredProperties {
+
+    private String notIgnored;
+    @IgnoreProperty
+    private String ignoredField;
+
+    public IgnoredProperties() {
+    }
+
+    public IgnoredProperties(String notIgnored, String ignoredField) {
+        this.notIgnored = notIgnored;
+        this.ignoredField = ignoredField;
+    }
+
+    public String getNotIgnored() {
+        return notIgnored;
+    }
+
+    public void setNotIgnored(String notIgnored) {
+        this.notIgnored = notIgnored;
+    }
+
+    public String getIgnoredField() {
+        return ignoredField;
+    }
+
+    public void setIgnoredField(String ignoredField) {
+        this.ignoredField = ignoredField;
+    }
+
+    @IgnoreProperty
+    public String getSomethingElse() {
+        throw new IllegalStateException("This should not have been called");
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        IgnoredProperties that = (IgnoredProperties) o;
+        return Objects.equals(notIgnored, that.notIgnored) &&
+                Objects.equals(ignoredField, that.ignoredField);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(notIgnored, ignoredField);
+    }
+
+    @Override
+    public String toString() {
+        return "IgnoredProperties{" +
+                "notIgnored='" + notIgnored + '\'' +
+                ", ignoredField='" + ignoredField + '\'' +
+                '}';
+    }
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorder.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorder.java
index 7ff855e393a42..2fb594c4628d9 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorder.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/TestRecorder.java
@@ -7,6 +7,7 @@
 import java.util.function.Supplier;
 
 import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.RelaxedValidation;
 
 public class TestRecorder {
 
@@ -90,4 +91,12 @@ public String get() {
             }
         };
     }
+
+    public void relaxedObject(@RelaxedValidation ValidationFails validationFails) {
+        RESULT.add(validationFails);
+    }
+
+    public void ignoredProperties(IgnoredProperties ignoredProperties) {
+        RESULT.add(ignoredProperties);
+    }
 }
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/ValidationFails.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/ValidationFails.java
new file mode 100644
index 0000000000000..b94ad2ff29125
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/ValidationFails.java
@@ -0,0 +1,47 @@
+package io.quarkus.deployment.recording;
+
+import java.util.Objects;
+
+public class ValidationFails {
+
+    private String name;
+    private boolean nameValid;
+
+    public ValidationFails() {
+    }
+
+    public ValidationFails(String name) {
+        setName(name);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ValidationFails setName(String name) {
+        this.name = name;
+        this.nameValid = name.contains(" ");
+        return this;
+    }
+
+    public boolean isNameValid() {
+        return nameValid;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        ValidationFails that = (ValidationFails) o;
+        return nameValid == that.nameValid &&
+                Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, nameValid);
+    }
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BasicExecutableOutputOutcomeTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BasicExecutableOutputOutcomeTest.java
index 3d8b50773050a..194cd875253eb 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BasicExecutableOutputOutcomeTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BasicExecutableOutputOutcomeTest.java
@@ -37,6 +37,8 @@ protected TsArtifact modelApp() {
         addToExpectedLib(directRtDep);
 
         final TsArtifact appJar = TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
                 .addDependency(ext1)
                 .addDependency(ext2)
                 .addDependency(compileDep)
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyAddedInProfileTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyAddedInProfileTest.java
index 95e385c2865c0..45f08f86d2ce9 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyAddedInProfileTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyAddedInProfileTest.java
@@ -22,6 +22,8 @@ protected TsArtifact modelApp() {
         addToExpectedLib(extB_100_rt);
 
         final TsArtifact appJar = TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
                 .addDependency(extA_100);
 
         final Profile profile = new Profile();
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyVersionOverridesManagedVersionTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyVersionOverridesManagedVersionTest.java
index 5203b7e258c55..d207c2669ff5a 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyVersionOverridesManagedVersionTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DependencyVersionOverridesManagedVersionTest.java
@@ -18,6 +18,8 @@ protected TsArtifact modelApp() {
         addToExpectedLib(extB_100_rt);
 
         final TsArtifact bom = new TsArtifact("test.quarkus", "test-bom", null, "pom", "1.0.0");
+        bom.addManagedDependency(platformDescriptor());
+        bom.addManagedDependency(platformProperties());
         bom.addManagedDependency(new TsDependency(extA_100.getRuntime()));
         bom.addManagedDependency(new TsDependency(extB_100_rt));
         install(bom);
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DirectUserDepsOverrideTransitiveExtDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DirectUserDepsOverrideTransitiveExtDepsTest.java
index 1fb848e9c38ec..9c22716339009 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DirectUserDepsOverrideTransitiveExtDepsTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/DirectUserDepsOverrideTransitiveExtDepsTest.java
@@ -24,6 +24,8 @@ protected TsArtifact modelApp() {
         addToExpectedLib(common3);
 
         final TsArtifact appJar = TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
                 .addDependency(ext1)
                 .addDependency(common3)
                 .addDependency(ext2);
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExcludeExtensionDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExcludeExtensionDepsTest.java
new file mode 100644
index 0000000000000..980bf49c1282d
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExcludeExtensionDepsTest.java
@@ -0,0 +1,88 @@
+package io.quarkus.deployment.runnerjar;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.model.AppModel;
+import io.quarkus.bootstrap.resolver.TsArtifact;
+import io.quarkus.bootstrap.resolver.TsDependency;
+import io.quarkus.bootstrap.resolver.TsQuarkusExt;
+
+/**
+ * The test allowing to make sure that if we exclude an extension from another extension, the
+ * exclusion will be also applied to the deployment dependencies.
+ */
+public class ExcludeExtensionDepsTest extends ExecutableOutputOutcomeTestBase {
+
+    @Override
+    protected TsArtifact modelApp() {
+
+        final TsArtifact extADep1 = TsArtifact.jar("ext-a-dep-1");
+        final TsArtifact extADep2 = TsArtifact.jar("ext-a-dep-2");
+        final TsArtifact extBDep1 = TsArtifact.jar("ext-b-dep-1");
+        addToExpectedLib(extBDep1);
+        final TsArtifact extBDep2 = TsArtifact.jar("ext-b-dep-2");
+        addToExpectedLib(extBDep2);
+        final TsArtifact extBDepTrans1 = TsArtifact.jar("ext-b-dep-trans-1");
+        addToExpectedLib(extBDepTrans1);
+        final TsArtifact extBDepTrans2 = TsArtifact.jar("ext-b-dep-trans-2");
+        addToExpectedLib(extBDepTrans2);
+        final TsArtifact depToExclude1 = TsArtifact.jar("ext-dep-exclude-1");
+        final TsArtifact depToExclude2 = TsArtifact.jar("ext-dep-exclude-2");
+        final TsArtifact depToExclude3 = TsArtifact.jar("ext-dep-exclude-3");
+        final TsArtifact depToExclude4 = TsArtifact.jar("ext-dep-exclude-4");
+        final TsArtifact depToExclude5 = TsArtifact.jar("ext-dep-exclude-5");
+        final TsArtifact depToExclude6 = TsArtifact.jar("ext-dep-exclude-6");
+        extBDepTrans2.addDependency(new TsDependency(extBDep2));
+        extBDepTrans2.addDependency(new TsDependency(depToExclude6));
+        extBDepTrans1.addDependency(new TsDependency(extBDepTrans2));
+        extBDepTrans1.addDependency(new TsDependency(depToExclude2));
+        extBDepTrans1.addDependency(new TsDependency(depToExclude5));
+        extBDep1.addDependency(extBDepTrans1, depToExclude5);
+        extBDep1.addDependency(new TsDependency(depToExclude1));
+
+        final TsQuarkusExt extA = new TsQuarkusExt("ext-a");
+        extA.getRuntime()
+                .addDependency(extADep1);
+        extA.getDeployment()
+                .addDependency(extADep2);
+        final TsQuarkusExt extB = new TsQuarkusExt("ext-b");
+        addToExpectedLib(extB.getRuntime());
+        extB.getRuntime()
+                .addDependency(extBDep1, depToExclude6)
+                .addDependency(extA)
+                .addDependency(depToExclude4);
+        extB.getDeployment()
+                .addDependency(depToExclude3);
+
+        return TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
+                .addDependency(extB, extA.getRuntime(), depToExclude1, depToExclude2, depToExclude3, depToExclude4);
+    }
+
+    @Override
+    protected void assertAppModel(AppModel appModel) throws Exception {
+        final Set<AppDependency> expectedDeployDeps = new HashSet<>();
+        expectedDeployDeps
+                .add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-deployment", "1"), "compile"));
+        assertEquals(expectedDeployDeps, new HashSet<>(appModel.getDeploymentDependencies()));
+        final Set<AppDependency> expectedRuntimeDeps = new HashSet<>();
+        expectedRuntimeDeps.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b", "1"), "compile"));
+        expectedRuntimeDeps.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-dep-1", "1"), "compile"));
+        expectedRuntimeDeps.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-dep-2", "1"), "compile"));
+        expectedRuntimeDeps
+                .add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-dep-trans-1", "1"), "compile"));
+        expectedRuntimeDeps
+                .add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-dep-trans-2", "1"), "compile"));
+        assertEquals(expectedRuntimeDeps, new HashSet<>(appModel.getUserDependencies()));
+        final Set<AppDependency> expectedFullDeps = new HashSet<>();
+        expectedFullDeps.addAll(expectedDeployDeps);
+        expectedFullDeps.addAll(expectedRuntimeDeps);
+        assertEquals(expectedFullDeps, new HashSet<>(appModel.getFullDeploymentDeps()));
+    }
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExcludeLibDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExcludeLibDepsTest.java
new file mode 100644
index 0000000000000..a660f1951ecfd
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExcludeLibDepsTest.java
@@ -0,0 +1,80 @@
+package io.quarkus.deployment.runnerjar;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.model.AppModel;
+import io.quarkus.bootstrap.resolver.TsArtifact;
+import io.quarkus.bootstrap.resolver.TsDependency;
+import io.quarkus.bootstrap.resolver.TsQuarkusExt;
+
+/**
+ * The test allowing to make sure that if we exclude a library from an extension, the
+ * exclusion will be also applied to the deployment dependencies.
+ */
+public class ExcludeLibDepsTest extends ExecutableOutputOutcomeTestBase {
+
+    @Override
+    protected TsArtifact modelApp() {
+
+        final TsArtifact extADep1 = TsArtifact.jar("ext-a-dep-1");
+        addToExpectedLib(extADep1);
+        final TsArtifact extADep2 = TsArtifact.jar("ext-a-dep-2");
+        addToExpectedLib(extADep2);
+        final TsArtifact extADepTrans1 = TsArtifact.jar("ext-a-dep-trans-1");
+        addToExpectedLib(extADepTrans1);
+        final TsArtifact extADepTrans2 = TsArtifact.jar("ext-a-dep-trans-2");
+        addToExpectedLib(extADepTrans2);
+        final TsArtifact depToExclude1 = TsArtifact.jar("ext-dep-exclude-1");
+        final TsArtifact depToExclude2 = TsArtifact.jar("ext-dep-exclude-2");
+        final TsArtifact depToExclude3 = TsArtifact.jar("ext-dep-exclude-3");
+        final TsArtifact depToExclude4 = TsArtifact.jar("ext-dep-exclude-4");
+        final TsArtifact depToExclude5 = TsArtifact.jar("ext-dep-exclude-5");
+        final TsArtifact depToExclude6 = TsArtifact.jar("ext-dep-exclude-6");
+        extADepTrans2.addDependency(new TsDependency(extADep2));
+        extADepTrans2.addDependency(new TsDependency(depToExclude6));
+        extADepTrans1.addDependency(new TsDependency(extADepTrans2));
+        extADepTrans1.addDependency(new TsDependency(depToExclude2));
+        extADepTrans1.addDependency(new TsDependency(depToExclude5));
+        extADep1.addDependency(extADepTrans1, depToExclude5);
+        extADep1.addDependency(new TsDependency(depToExclude1));
+
+        final TsQuarkusExt extA = new TsQuarkusExt("ext-a");
+        addToExpectedLib(extA.getRuntime());
+        extA.getRuntime()
+                .addDependency(extADep1, depToExclude6)
+                .addDependency(depToExclude3);
+        extA.getDeployment()
+                .addDependency(depToExclude4);
+
+        return TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
+                .addDependency(extA, depToExclude1, depToExclude2, depToExclude3, depToExclude4);
+    }
+
+    @Override
+    protected void assertAppModel(AppModel appModel) throws Exception {
+        final Set<AppDependency> expectedDeployDeps = new HashSet<>();
+        expectedDeployDeps
+                .add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-deployment", "1"), "compile"));
+        assertEquals(expectedDeployDeps, new HashSet<>(appModel.getDeploymentDependencies()));
+        final Set<AppDependency> expectedRuntimeDeps = new HashSet<>();
+        expectedRuntimeDeps.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a", "1"), "compile"));
+        expectedRuntimeDeps.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-dep-1", "1"), "compile"));
+        expectedRuntimeDeps.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-dep-2", "1"), "compile"));
+        expectedRuntimeDeps
+                .add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-dep-trans-1", "1"), "compile"));
+        expectedRuntimeDeps
+                .add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-dep-trans-2", "1"), "compile"));
+        assertEquals(expectedRuntimeDeps, new HashSet<>(appModel.getUserDependencies()));
+        final Set<AppDependency> expectedFullDeps = new HashSet<>();
+        expectedFullDeps.addAll(expectedDeployDeps);
+        expectedFullDeps.addAll(expectedRuntimeDeps);
+        assertEquals(expectedFullDeps, new HashSet<>(appModel.getFullDeploymentDeps()));
+    }
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExecutableOutputOutcomeTestBase.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExecutableOutputOutcomeTestBase.java
index 1bc418dffad99..c6cf3c650c7b3 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExecutableOutputOutcomeTestBase.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ExecutableOutputOutcomeTestBase.java
@@ -5,6 +5,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -13,16 +16,21 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.stream.Stream;
 
+import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.bootstrap.app.AugmentAction;
 import io.quarkus.bootstrap.app.AugmentResult;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.AppModel;
 import io.quarkus.bootstrap.resolver.TsArtifact;
+import io.quarkus.bootstrap.resolver.TsArtifact.ContentProvider;
+import io.quarkus.bootstrap.resolver.TsDependency;
 import io.quarkus.bootstrap.resolver.update.CreatorOutcomeTestBase;
 
 public abstract class ExecutableOutputOutcomeTestBase extends CreatorOutcomeTestBase {
@@ -31,16 +39,74 @@ public abstract class ExecutableOutputOutcomeTestBase extends CreatorOutcomeTest
     private static final String MAIN_CLS = "io.quarkus.runner.GeneratedMain";
 
     protected List<String> expectedLib = new ArrayList<>();
+    protected TsDependency platformDescriptor;
+    protected TsDependency platformPropsDep;
 
     protected void addToExpectedLib(TsArtifact entry) {
         expectedLib.add(entry.getGroupId() + '.' + entry.getArtifactId() + '-' + entry.getVersion() + '.' + entry.getType());
     }
 
+    protected void assertAppModel(AppModel appModel) throws Exception {
+    }
+
+    protected TsDependency platformDescriptor() {
+        if (platformDescriptor == null) {
+            TsArtifact platformDescr = new TsArtifact("org.acme",
+                    "acme" + BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX, "1.0", "json",
+                    "1.0");
+            platformDescr.setContent(new ContentProvider() {
+                Path platformJson;
+
+                @Override
+                public Path getPath(Path workDir) throws IOException {
+                    if (platformJson == null) {
+                        platformJson = workDir.resolve("platform-descriptor.json");
+                        try (BufferedWriter writer = Files.newBufferedWriter(platformJson)) {
+                            writer.write("platform descriptor");
+                        }
+                    }
+                    return platformJson;
+                }
+            });
+            platformDescr.install(repo);
+            platformDescriptor = new TsDependency(platformDescr);
+        }
+        return platformDescriptor;
+    }
+
+    protected TsDependency platformProperties() {
+        if (platformPropsDep == null) {
+            TsArtifact platformProps = new TsArtifact("org.acme",
+                    "acme" + BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX, null, "properties",
+                    "1.0");
+            platformProps.setContent(new ContentProvider() {
+                Path propsFile;
+
+                @Override
+                public Path getPath(Path workDir) throws IOException {
+                    if (propsFile == null) {
+                        Properties props = new Properties();
+                        props.setProperty("platform.quarkus.native.builder-image", "builder-image-url");
+                        propsFile = workDir.resolve("platform-properties.properties");
+                        try (OutputStream os = Files.newOutputStream(propsFile)) {
+                            props.store(os, "Test Quarkus platform properties");
+                        }
+                    }
+                    return propsFile;
+                }
+            });
+            platformProps.install(repo);
+            platformPropsDep = new TsDependency(platformProps);
+        }
+        return platformPropsDep;
+    }
+
     @Override
     protected void testCreator(QuarkusBootstrap creator) throws Exception {
-        System.setProperty("quarkus.package.type", "legacy");
+        System.setProperty("quarkus.package.type", "legacy-jar");
         try {
             CuratedApplication curated = creator.bootstrap();
+            assertAppModel(curated.getAppModel());
             AugmentAction action = curated.createAugmentor();
             AugmentResult outcome = action.createProductionApplication();
 
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/FirstTransitiveDepVersionIsTheEffectiveOneTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/FirstTransitiveDepVersionIsTheEffectiveOneTest.java
index 7e99bb00a5699..cb3b0ea933964 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/FirstTransitiveDepVersionIsTheEffectiveOneTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/FirstTransitiveDepVersionIsTheEffectiveOneTest.java
@@ -27,6 +27,8 @@ protected TsArtifact modelApp() {
         addToExpectedLib(directAppDep);
 
         final TsArtifact appJar = TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
                 .addDependency(ext1)
                 .addDependency(directAppDep)
                 .addDependency(ext2);
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/OptionalDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/OptionalDepsTest.java
new file mode 100644
index 0000000000000..091a0118a0e17
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/OptionalDepsTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.deployment.runnerjar;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.model.AppModel;
+import io.quarkus.bootstrap.resolver.TsArtifact;
+import io.quarkus.bootstrap.resolver.TsDependency;
+import io.quarkus.bootstrap.resolver.TsQuarkusExt;
+
+public class OptionalDepsTest extends ExecutableOutputOutcomeTestBase {
+
+    @Override
+    protected TsArtifact modelApp() {
+
+        final TsArtifact extADep = TsArtifact.jar("ext-a-dep");
+        addToExpectedLib(extADep);
+
+        final TsArtifact extAOptionalDep = TsArtifact.jar("ext-a-optional-dep");
+        final TsArtifact extAOptionalDeploymentDep = TsArtifact.jar("ext-a-optional-deployment-dep");
+
+        final TsQuarkusExt extA = new TsQuarkusExt("ext-a");
+        addToExpectedLib(extA.getRuntime());
+        extA.getRuntime()
+                .addDependency(extADep)
+                .addDependency(new TsDependency(extAOptionalDep, true));
+        extA.getDeployment()
+                .addDependency(new TsDependency(extAOptionalDeploymentDep, true));
+
+        final TsArtifact extBOptionalDep = TsArtifact.jar("ext-b-optional-dep");
+        final TsArtifact extBDeploymentDep = TsArtifact.jar("ext-b-deployment-dep");
+        install(extBDeploymentDep);
+        final TsArtifact extBOptionalDeploymentDep = TsArtifact.jar("ext-b-optional-deployment-dep");
+        install(extBOptionalDeploymentDep);
+
+        final TsQuarkusExt extB = new TsQuarkusExt("ext-b");
+        extB.getRuntime().addDependency(new TsDependency(extBOptionalDep, true));
+        addToExpectedLib(extB.getRuntime());
+        extB.getDeployment().addDependency(new TsDependency(extBOptionalDeploymentDep, true));
+        extB.getDeployment().addDependency(new TsDependency(extBDeploymentDep, false));
+        install(extB);
+
+        final TsArtifact appOptionalDep = TsArtifact.jar("app-optional-dep")
+                .addDependency(extB.getRuntime());
+        addToExpectedLib(appOptionalDep);
+
+        final TsQuarkusExt extC = new TsQuarkusExt("ext-c");
+        install(extC);
+
+        final TsQuarkusExt extD = new TsQuarkusExt("ext-d");
+        extD.getRuntime().addDependency(new TsDependency(extC.getRuntime(), true));
+        extD.getDeployment().addDependency(new TsDependency(extC.getDeployment(), true));
+        install(extD);
+        addToExpectedLib(extD.getRuntime());
+
+        return TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
+                .addDependency(extA, true)
+                .addDependency(new TsDependency(appOptionalDep, true))
+                .addDependency(extD.getRuntime());
+    }
+
+    @Override
+    protected void assertAppModel(AppModel appModel) throws Exception {
+        final Set<AppDependency> expected = new HashSet<>();
+        expected.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-deployment", "1"), "compile", true));
+        expected.add(
+                new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-deployment-dep", "1"), "compile", true));
+        expected.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-b-deployment", "1"), "compile", true));
+        expected.add(
+                new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-d-deployment", "1"), "compile", false));
+        assertEquals(expected, new HashSet<>(appModel.getDeploymentDependencies()));
+    }
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ProvidedExtensionDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ProvidedExtensionDepsTest.java
new file mode 100644
index 0000000000000..fd05600da9303
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/ProvidedExtensionDepsTest.java
@@ -0,0 +1,50 @@
+package io.quarkus.deployment.runnerjar;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.model.AppModel;
+import io.quarkus.bootstrap.resolver.TsArtifact;
+import io.quarkus.bootstrap.resolver.TsDependency;
+import io.quarkus.bootstrap.resolver.TsQuarkusExt;
+
+public class ProvidedExtensionDepsTest extends ExecutableOutputOutcomeTestBase {
+
+    @Override
+    protected TsArtifact modelApp() {
+
+        final TsArtifact extADep = TsArtifact.jar("ext-a-dep");
+        addToExpectedLib(extADep);
+
+        final TsArtifact extAProvidedDep = TsArtifact.jar("ext-a-provided-dep");
+
+        final TsArtifact extADeploymentDep = TsArtifact.jar("ext-a-deployment-dep");
+        final TsArtifact extAOptionalDeploymentDep = TsArtifact.jar("ext-a-provided-deployment-dep");
+
+        final TsQuarkusExt extA = new TsQuarkusExt("ext-a");
+        addToExpectedLib(extA.getRuntime());
+        extA.getRuntime()
+                .addDependency(new TsDependency(extADep))
+                .addDependency(new TsDependency(extAProvidedDep, "provided"));
+        extA.getDeployment()
+                .addDependency(new TsDependency(extADeploymentDep))
+                .addDependency(new TsDependency(extAOptionalDeploymentDep, "provided"));
+
+        return TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
+                .addDependency(extA);
+    }
+
+    @Override
+    protected void assertAppModel(AppModel appModel) throws Exception {
+        final Set<AppDependency> expected = new HashSet<>();
+        expected.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-deployment", "1"), "compile"));
+        expected.add(new AppDependency(new AppArtifact("io.quarkus.bootstrap.test", "ext-a-deployment-dep", "1"), "compile"));
+        assertEquals(expected, new HashSet<>(appModel.getDeploymentDependencies()));
+    }
+}
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java
index 78cae93c9f75f..4cea5413c8c21 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java
@@ -49,6 +49,8 @@ protected TsArtifact modelApp() {
         addToExpectedLib(appDirectDep);
 
         final TsArtifact appJar = TsArtifact.jar("app")
+                .addManagedDependency(platformDescriptor())
+                .addManagedDependency(platformProperties())
                 .addDependency(ext1)
                 .addDependency(ext2)
                 .addDependency(appDirectDep);
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java b/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java
index a892c2c7c0e20..d7dd632f46ed7 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/util/JandexUtilTest.java
@@ -305,23 +305,23 @@ private static Index index(Class<?>... classes) {
     private void checkRepoArg(Index index, Class<?> baseClass, Class<?> soughtClass, Class<?> expectedArg) {
         List<Type> args = JandexUtil.resolveTypeParameters(name(baseClass), name(soughtClass),
                 index);
-        assertThat(args).extracting("name").containsOnly(name(expectedArg));
+        assertThat(args).extracting(Type::name).containsOnly(name(expectedArg));
     }
 
     private void checkRepoArg(Index index, Class<?> baseClass, Class<?> soughtClass, Class<?>... expectedArgs) {
         List<Type> args = JandexUtil.resolveTypeParameters(name(baseClass), name(soughtClass),
                 index);
-        Object[] expectedArgNames = new Object[expectedArgs.length];
+        DotName[] expectedArgNames = new DotName[expectedArgs.length];
         for (int i = 0; i < expectedArgs.length; i++) {
             expectedArgNames[i] = name(expectedArgs[i]);
         }
-        assertThat(args).extracting("name").containsOnly(expectedArgNames);
+        assertThat(args).extracting(Type::name).containsOnly(expectedArgNames);
     }
 
     private void checkRepoArg(Index index, Class<?> baseClass, Class<?> soughtClass, String expectedArg) {
         List<Type> args = JandexUtil.resolveTypeParameters(name(baseClass), name(soughtClass),
                 index);
-        assertThat(args).hasOnlyOneElementSatisfying(t -> {
+        assertThat(args).singleElement().satisfies(t -> {
             assertThat(t.toString()).isEqualTo(expectedArg);
         });
     }
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/util/UriNormalizationTest.java b/core/deployment/src/test/java/io/quarkus/deployment/util/UriNormalizationTest.java
new file mode 100644
index 0000000000000..6cc52d80e2c4e
--- /dev/null
+++ b/core/deployment/src/test/java/io/quarkus/deployment/util/UriNormalizationTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.deployment.util;
+
+import java.net.URI;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class UriNormalizationTest {
+    @Test
+    void testToUri() {
+        Assertions.assertEquals("/", UriNormalizationUtil.toURI("/", true).getPath());
+        Assertions.assertEquals("", UriNormalizationUtil.toURI("/", false).getPath());
+
+        Assertions.assertEquals("/", UriNormalizationUtil.toURI("./", true).getPath());
+        Assertions.assertEquals("", UriNormalizationUtil.toURI("./", false).getPath());
+
+        Assertions.assertEquals("bob/", UriNormalizationUtil.toURI("bob/", true).getPath());
+        Assertions.assertEquals("bob", UriNormalizationUtil.toURI("bob/", false).getPath());
+    }
+
+    @Test
+    void testExamples() {
+        URI root = UriNormalizationUtil.toURI("/", true);
+        URI prefix = UriNormalizationUtil.toURI("/prefix", true);
+        URI foo = UriNormalizationUtil.toURI("foo", true);
+
+        Assertions.assertEquals("/example/", UriNormalizationUtil.normalizeWithBase(root, "example", true).getPath());
+        Assertions.assertEquals("/example", UriNormalizationUtil.normalizeWithBase(root, "example", false).getPath());
+        Assertions.assertEquals("/example/", UriNormalizationUtil.normalizeWithBase(root, "/example", true).getPath());
+        Assertions.assertEquals("/example", UriNormalizationUtil.normalizeWithBase(root, "/example", false).getPath());
+
+        Assertions.assertEquals("/prefix/example/", UriNormalizationUtil.normalizeWithBase(prefix, "example", true).getPath());
+        Assertions.assertEquals("/prefix/example", UriNormalizationUtil.normalizeWithBase(prefix, "example", false).getPath());
+        Assertions.assertEquals("/example/", UriNormalizationUtil.normalizeWithBase(prefix, "/example", true).getPath());
+        Assertions.assertEquals("/example", UriNormalizationUtil.normalizeWithBase(prefix, "/example", false).getPath());
+
+        Assertions.assertEquals("foo/example/", UriNormalizationUtil.normalizeWithBase(foo, "example", true).getPath());
+        Assertions.assertEquals("foo/example", UriNormalizationUtil.normalizeWithBase(foo, "example", false).getPath());
+        Assertions.assertEquals("/example/", UriNormalizationUtil.normalizeWithBase(foo, "/example", true).getPath());
+        Assertions.assertEquals("/example", UriNormalizationUtil.normalizeWithBase(foo, "/example", false).getPath());
+    }
+
+    @Test
+    void testDubiousUriPaths() {
+        URI root = UriNormalizationUtil.toURI("/", true);
+
+        Assertions.assertEquals("/", UriNormalizationUtil.normalizeWithBase(root, "#example", false).getPath());
+        Assertions.assertEquals("/", UriNormalizationUtil.normalizeWithBase(root, "?example", false).getPath());
+
+        Assertions.assertEquals("/example", UriNormalizationUtil.normalizeWithBase(root, "./example", false).getPath());
+        Assertions.assertEquals("/example", UriNormalizationUtil.normalizeWithBase(root, "//example", false).getPath());
+
+        Assertions.assertThrows(IllegalArgumentException.class,
+                () -> UriNormalizationUtil.normalizeWithBase(root, "/%2fexample", false));
+        Assertions.assertThrows(IllegalArgumentException.class,
+                () -> UriNormalizationUtil.normalizeWithBase(root, "junk/../example", false));
+        Assertions.assertThrows(IllegalArgumentException.class,
+                () -> UriNormalizationUtil.normalizeWithBase(root, "junk/../../example", false));
+        Assertions.assertThrows(IllegalArgumentException.class,
+                () -> UriNormalizationUtil.normalizeWithBase(root, "../example", false));
+    }
+}
diff --git a/core/deployment/src/test/resources/META-INF/services/test.javax.servlet.ServletContainerInitializer b/core/deployment/src/test/resources/META-INF/services/test.javax.servlet.ServletContainerInitializer
index aa489494e591f..653bff528651c 100644
--- a/core/deployment/src/test/resources/META-INF/services/test.javax.servlet.ServletContainerInitializer
+++ b/core/deployment/src/test/resources/META-INF/services/test.javax.servlet.ServletContainerInitializer
@@ -13,7 +13,7 @@ org.apache.logging.log4j.core.Appender
 # (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
+#      https://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,
diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/ErrorPageGenerators.java b/core/devmode-spi/src/main/java/io/quarkus/dev/ErrorPageGenerators.java
new file mode 100644
index 0000000000000..cce84323bee02
--- /dev/null
+++ b/core/devmode-spi/src/main/java/io/quarkus/dev/ErrorPageGenerators.java
@@ -0,0 +1,39 @@
+package io.quarkus.dev;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+/**
+ * The generators can be used to generate a custom HTML page for a specific deployment exception that occurs during the
+ * development mode.
+ * <p>
+ * In order to avoid classloading issues the generators should not access the root cause directly but use reflection instead
+ * (the exception class could be loaded by a different class loader).
+ */
+public class ErrorPageGenerators {
+
+    private static final Map<String, Function<Throwable, String>> generators = new ConcurrentHashMap<>();
+
+    /**
+     * Register a function that will be used to generate the error page for the given root cause.
+     * 
+     * @param rootCauseClassName
+     * @param function
+     */
+    public static void register(String rootCauseClassName, Function<Throwable, String> function) {
+        if (generators.putIfAbsent(rootCauseClassName, function) != null) {
+            throw new IllegalStateException("Template builder already specified for: " + rootCauseClassName);
+        }
+    }
+
+    public static Function<Throwable, String> get(String rootCauseClassName) {
+        return generators.get(rootCauseClassName);
+    }
+
+    // This method is called by a relevant service provider during HotReplacementSetup#close()
+    public static void clear() {
+        generators.clear();
+    }
+
+}
diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleManager.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleManager.java
new file mode 100644
index 0000000000000..8495572d37f15
--- /dev/null
+++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleManager.java
@@ -0,0 +1,82 @@
+package io.quarkus.dev.console;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+
+import io.quarkus.dev.spi.HotReplacementContext;
+
+public class DevConsoleManager {
+
+    private static volatile Consumer<DevConsoleRequest> handler;
+    private static volatile Map<String, Map<String, Object>> templateInfo;
+    private static volatile HotReplacementContext hotReplacementContext;
+    private static volatile Object quarkusBootstrap;
+    /**
+     * Global map that can be used to share data betweeen the runtime and deployment side
+     * to enable communication.
+     * <p>
+     * Key names should be namespaced.
+     * <p>
+     * As the class loaders are different these objects will generally need to implement some kind of common interface
+     */
+    private static Map<String, Object> globals = new ConcurrentHashMap<>();
+
+    public static void registerHandler(Consumer<DevConsoleRequest> requestHandler) {
+        handler = requestHandler;
+    }
+
+    public static void sentRequest(DevConsoleRequest request) {
+        Consumer<DevConsoleRequest> handler = DevConsoleManager.handler;
+        if (handler == null) {
+            request.getResponse().complete(new DevConsoleResponse(503, Collections.emptyMap(), new byte[0])); //service unavailable
+        } else {
+            handler.accept(request);
+        }
+    }
+
+    public static Map<String, Map<String, Object>> getTemplateInfo() {
+        return templateInfo;
+    }
+
+    public static void setTemplateInfo(Map<String, Map<String, Object>> templateInfo) {
+        DevConsoleManager.templateInfo = templateInfo;
+    }
+
+    public static HotReplacementContext getHotReplacementContext() {
+        return hotReplacementContext;
+    }
+
+    public static void setHotReplacementContext(HotReplacementContext hotReplacementContext) {
+        DevConsoleManager.hotReplacementContext = hotReplacementContext;
+    }
+
+    public static void setQuarkusBootstrap(Object qb) {
+        quarkusBootstrap = qb;
+    }
+
+    public static Object getQuarkusBootstrap() {
+        return quarkusBootstrap;
+    }
+
+    /**
+     * Sets a global that is shared between both the runtime and deployment parts
+     *
+     * @param name A namespaced key
+     * @param value A value
+     */
+    public static void setGlobal(String name, Object value) {
+        globals.put(name, value);
+    }
+
+    /**
+     * Gets a shared global
+     *
+     * @param name The key
+     * @return The value
+     */
+    public static <T> T getGlobal(String name) {
+        return (T) globals.get(name);
+    }
+}
diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleRequest.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleRequest.java
new file mode 100644
index 0000000000000..c16d791c5884a
--- /dev/null
+++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleRequest.java
@@ -0,0 +1,42 @@
+package io.quarkus.dev.console;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+public class DevConsoleRequest {
+
+    private final String method;
+    private final String uri;
+    private final Map<String, List<String>> headers;
+    private final byte[] body;
+    private final CompletableFuture<DevConsoleResponse> response = new CompletableFuture<>();
+
+    public DevConsoleRequest(String method, String uri, Map<String, List<String>> headers, byte[] body) {
+        this.method = method;
+        this.uri = uri;
+        this.headers = headers;
+        this.body = body;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    public byte[] getBody() {
+        return body;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public CompletableFuture<DevConsoleResponse> getResponse() {
+        return response;
+    }
+
+}
diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleResponse.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleResponse.java
new file mode 100644
index 0000000000000..17fa07a8499f9
--- /dev/null
+++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/DevConsoleResponse.java
@@ -0,0 +1,51 @@
+package io.quarkus.dev.console;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DevConsoleResponse {
+
+    private int status;
+    private Map<String, List<String>> headers = new HashMap<>();
+    private byte[] body;
+
+    public DevConsoleResponse(int status, Map<String, List<String>> headers, byte[] body) {
+        this.status = status;
+        this.headers = headers;
+        this.body = body;
+    }
+
+    public DevConsoleResponse() {
+        this.status = 200;
+        this.headers = new HashMap<>();
+        this.body = new byte[0];
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    public byte[] getBody() {
+        return body;
+    }
+
+    public DevConsoleResponse setStatus(int status) {
+        this.status = status;
+        return this;
+    }
+
+    public DevConsoleResponse setHeaders(Map<String, List<String>> headers) {
+        this.headers = headers;
+        return this;
+    }
+
+    public DevConsoleResponse setBody(byte[] body) {
+        this.body = body;
+        return this;
+    }
+}
diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/console/TempSystemProperties.java b/core/devmode-spi/src/main/java/io/quarkus/dev/console/TempSystemProperties.java
new file mode 100644
index 0000000000000..0c31a909ca390
--- /dev/null
+++ b/core/devmode-spi/src/main/java/io/quarkus/dev/console/TempSystemProperties.java
@@ -0,0 +1,27 @@
+package io.quarkus.dev.console;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * TODO: this is a hack, we should be able to pass config overrides into the bootstrap
+ */
+public class TempSystemProperties implements AutoCloseable {
+    final Map<String, String> old = new HashMap<>();
+
+    public void set(String key, String value) {
+        old.put(key, System.getProperty(key));
+        System.setProperty(key, value);
+    }
+
+    @Override
+    public void close() {
+        for (Map.Entry<String, String> e : old.entrySet()) {
+            if (e.getValue() == null) {
+                System.clearProperty(e.getKey());
+            } else {
+                System.setProperty(e.getKey(), e.getValue());
+            }
+        }
+    }
+}
diff --git a/core/launcher/pom.xml b/core/launcher/pom.xml
index 2d7267d384642..1c518816d2a6b 100644
--- a/core/launcher/pom.xml
+++ b/core/launcher/pom.xml
@@ -22,6 +22,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/core/launcher/src/main/java/io/quarkus/launcher/JBangDevModeLauncher.java b/core/launcher/src/main/java/io/quarkus/launcher/JBangDevModeLauncher.java
new file mode 100644
index 0000000000000..b9159c941d24c
--- /dev/null
+++ b/core/launcher/src/main/java/io/quarkus/launcher/JBangDevModeLauncher.java
@@ -0,0 +1,40 @@
+package io.quarkus.launcher;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+
+/**
+ * JBang dev mode entry point. Utilises the same shaded info as the IDE launcher, but JBang has a different
+ * launch path.
+ *
+ * Unlike the IDE launch use case in this case we have been able to store some info from the build phase,
+ * so we don't need as many tricks.
+ *
+ * The launcher module has all its dependencies shaded, so it is effectively self contained. This allows deployment time
+ * code to not leak into runtime code, as the launcher artifact is explicitly excluded from the production build via a
+ * hard coded exclusion.
+ */
+public class JBangDevModeLauncher {
+
+    public static void main(String... args) {
+        System.clearProperty("quarkus.dev"); //avoid unknown config key warnings
+        final ClassLoader originalCl = Thread.currentThread().getContextClassLoader();
+        try {
+
+            Map<String, Object> context = new HashMap<>();
+            context.put("args", args);
+            RuntimeLaunchClassLoader loader = new RuntimeLaunchClassLoader(JBangDevModeLauncher.class.getClassLoader());
+            Thread.currentThread().setContextClassLoader(loader);
+
+            Class<?> launcher = loader.loadClass("io.quarkus.bootstrap.jbang.JBangDevModeLauncherImpl");
+            launcher.getDeclaredMethod("main", String[].class).invoke(null, (Object) args);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            System.clearProperty(BootstrapConstants.SERIALIZED_APP_MODEL);
+            Thread.currentThread().setContextClassLoader(originalCl);
+        }
+    }
+}
diff --git a/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java b/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java
new file mode 100644
index 0000000000000..9d548efe5e74f
--- /dev/null
+++ b/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java
@@ -0,0 +1,135 @@
+package io.quarkus.launcher;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+
+public class JBangIntegration {
+
+    public static final String CONFIG = "//Q:CONFIG";
+
+    public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<Map.Entry<String, String>> repositories,
+            List<Map.Entry<String, Path>> originalDeps,
+            List<String> comments, boolean nativeImage) throws IOException {
+        //dev mode takes a very different path
+        if (Boolean.getBoolean("quarkus.dev")) {
+            System.clearProperty("quarkus.dev"); //avoid unknown config key warnings
+            HashMap<String, byte[]> files = new HashMap<>();
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            DataOutputStream dataOutputStream = new DataOutputStream(outputStream);
+            //pom file contents
+            String pomContents = String.join("\n", Files.readAllLines(pomFile));
+            dataOutputStream.writeUTF(pomContents);
+            //Source file locations
+            dataOutputStream.writeUTF(appClasses.toAbsolutePath().toString());
+            dataOutputStream.writeUTF(System.getProperty("jbang.source"));
+            dataOutputStream.writeInt(originalDeps.size());
+            for (Map.Entry<String, Path> i : originalDeps) {
+                dataOutputStream.writeUTF(i.getKey());
+                dataOutputStream.writeUTF(i.getValue().toAbsolutePath().toString());
+            }
+            dataOutputStream.close();
+            files.put("jbang-dev.dat", outputStream.toByteArray());
+            HashMap<String, Object> ret = new HashMap<>();
+            ret.put("files", files);
+            ret.put("main-class", "io.quarkus.launcher.JBangDevModeLauncher");
+            return ret;
+        }
+
+        for (String comment : comments) {
+            //we allow config to be provided via //Q:CONFIG name=value
+            if (comment.startsWith(CONFIG)) {
+                String conf = comment.substring(CONFIG.length()).trim();
+                int equals = conf.indexOf("=");
+                if (equals == -1) {
+                    throw new RuntimeException("invalid config  " + comment);
+                }
+                System.setProperty(conf.substring(0, equals), conf.substring(equals + 1));
+            }
+        }
+
+        //huge hack
+        //jbang does not consider the pom when resolving dependencies
+        //so can get the wrong version of asm
+        //we remove it from the deps list so we can use the correct one
+        List<Map.Entry<String, Path>> dependencies = new ArrayList<>();
+        for (Map.Entry<String, Path> i : originalDeps) {
+            if (!i.getKey().startsWith("org.ow2.asm:asm:")) {
+                dependencies.add(i);
+            }
+        }
+
+        ClassLoader old = Thread.currentThread().getContextClassLoader();
+        try {
+            RuntimeLaunchClassLoader loader = new RuntimeLaunchClassLoader(
+                    new ClassLoader(JBangIntegration.class.getClassLoader()) {
+                        @Override
+                        public Class<?> loadClass(String name) throws ClassNotFoundException {
+                            return loadClass(name, false);
+                        }
+
+                        @Override
+                        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                            if (name.startsWith("org.") && !(name.startsWith("org.xml.") || name.startsWith("org.w3c.")
+                                    || name.startsWith("org.jboss."))) {
+                                //jbang has some but not all of the maven resolver classes we need on its
+                                //class path. These all start with org. so we filter them out to make sure
+                                //we get a complete class path
+                                throw new ClassNotFoundException();
+                            }
+                            return super.loadClass(name, resolve);
+                        }
+
+                        @Override
+                        public URL getResource(String name) {
+                            if (name.startsWith("org/") && !(name.startsWith("org/xml/") || name.startsWith("org/w3c/")
+                                    || name.startsWith("org/jboss/"))) {
+                                //jbang has some but not all of the maven resolver classes we need on its
+                                //class path. These all start with org. so we filter them out to make sure
+                                //we get a complete class path
+                                return null;
+                            }
+                            return super.getResource(name);
+                        }
+
+                        @Override
+                        public Enumeration<URL> getResources(String name) throws IOException {
+                            if (name.startsWith("org/") && !(name.startsWith("org/xml/") || name.startsWith("org/w3c/")
+                                    || name.startsWith("org/jboss/"))) {
+                                //jbang has some but not all of the maven resolver classes we need on its
+                                //class path. These all start with org. so we filter them out to make sure
+                                //we get a complete class path
+                                return Collections.emptyEnumeration();
+                            }
+                            return super.getResources(name);
+                        }
+                    });
+            Thread.currentThread().setContextClassLoader(loader);
+            Class<?> launcher = loader.loadClass("io.quarkus.bootstrap.jbang.JBangBuilderImpl");
+            return (Map<String, Object>) launcher
+                    .getDeclaredMethod("postBuild", Path.class, Path.class, List.class, List.class, boolean.class).invoke(
+                            null,
+                            appClasses,
+                            pomFile,
+                            repositories,
+                            dependencies,
+                            nativeImage);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            System.clearProperty(BootstrapConstants.SERIALIZED_APP_MODEL);
+            Thread.currentThread().setContextClassLoader(old);
+        }
+    }
+}
diff --git a/core/launcher/src/main/java/io/quarkus/launcher/QuarkusLauncher.java b/core/launcher/src/main/java/io/quarkus/launcher/QuarkusLauncher.java
index d62c8154b75c8..7393aedcbfabf 100644
--- a/core/launcher/src/main/java/io/quarkus/launcher/QuarkusLauncher.java
+++ b/core/launcher/src/main/java/io/quarkus/launcher/QuarkusLauncher.java
@@ -1,15 +1,13 @@
 package io.quarkus.launcher;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.Closeable;
+import java.net.JarURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Consumer;
 
 import io.quarkus.bootstrap.BootstrapConstants;
 
@@ -25,7 +23,8 @@
  */
 public class QuarkusLauncher {
 
-    public static void launch(String callingClass, String quarkusApplication, Consumer<Integer> exitHandler, String... args) {
+    public static Closeable launch(String callingClass, String quarkusApplication, String... args) {
+        final ClassLoader originalCl = Thread.currentThread().getContextClassLoader();
         try {
             String classResource = callingClass.replace(".", "/") + ".class";
             URL resource = Thread.currentThread().getContextClassLoader().getResource(classResource);
@@ -33,7 +32,15 @@ public static void launch(String callingClass, String quarkusApplication, Consum
             path = path.substring(0, path.length() - classResource.length());
             URL newResource = new URL(resource.getProtocol(), resource.getHost(), resource.getPort(), path);
 
-            Path appClasses = Paths.get(newResource.toURI());
+            URI uri = newResource.toURI();
+            Path appClasses;
+            if ("jar".equals(uri.getScheme())) {
+                JarURLConnection connection = (JarURLConnection) uri.toURL().openConnection();
+                connection.setDefaultUseCaches(false);
+                appClasses = Paths.get(connection.getJarFileURL().toURI());
+            } else {
+                appClasses = Paths.get(uri);
+            }
             if (quarkusApplication != null) {
                 System.setProperty("quarkus.package.main-class", quarkusApplication);
             }
@@ -42,103 +49,16 @@ public static void launch(String callingClass, String quarkusApplication, Consum
             context.put("app-classes", appClasses);
             context.put("args", args);
 
-            IDEClassLoader loader = new IDEClassLoader(QuarkusLauncher.class.getClassLoader());
+            RuntimeLaunchClassLoader loader = new RuntimeLaunchClassLoader(QuarkusLauncher.class.getClassLoader());
             Thread.currentThread().setContextClassLoader(loader);
 
             Class<?> launcher = loader.loadClass("io.quarkus.bootstrap.IDELauncherImpl");
-            launcher.getDeclaredMethod("launch", Path.class, Map.class).invoke(null, appClasses, context);
-
+            return (Closeable) launcher.getDeclaredMethod("launch", Path.class, Map.class).invoke(null, appClasses, context);
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
             System.clearProperty(BootstrapConstants.SERIALIZED_APP_MODEL);
-        }
-    }
-
-    public static class IDEClassLoader extends ClassLoader {
-
-        static {
-            registerAsParallelCapable();
-        }
-
-        public IDEClassLoader(ClassLoader parent) {
-            super(parent);
-        }
-
-        @Override
-        protected Class<?> findClass(String name) throws ClassNotFoundException {
-            String resourceName = name.replace(".", "/") + ".class";
-            try {
-                try (InputStream is = getResourceAsStream(resourceName)) {
-                    if (is == null) {
-                        throw new ClassNotFoundException(name);
-                    }
-                    definePackage(name);
-                    byte[] buf = new byte[1024];
-                    int r;
-                    ByteArrayOutputStream out = new ByteArrayOutputStream();
-                    while ((r = is.read(buf)) > 0) {
-                        out.write(buf, 0, r);
-                    }
-                    byte[] bytes = out.toByteArray();
-
-                    return defineClass(name, bytes, 0, bytes.length);
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-
-        }
-
-        private void definePackage(String name) {
-            final String pkgName = getPackageNameFromClassName(name);
-            if ((pkgName != null) && getPackage(pkgName) == null) {
-                synchronized (getClassLoadingLock(pkgName)) {
-                    if (getPackage(pkgName) == null) {
-                        // this could certainly be improved to use the actual manifest
-                        definePackage(pkgName, null, null, null, null, null, null, null);
-                    }
-                }
-            }
-        }
-
-        private String getPackageNameFromClassName(String className) {
-            final int index = className.lastIndexOf('.');
-            if (index == -1) {
-                // we return null here since in this case no package is defined
-                // this is same behavior as Package.getPackage(clazz) exhibits
-                // when the class is in the default package
-                return null;
-            }
-            return className.substring(0, index);
-        }
-
-        protected Class<?> findClass(String moduleName, String name) {
-            try {
-                return findClass(name);
-            } catch (ClassNotFoundException e) {
-                return null;
-            }
-        }
-
-        protected URL findResource(String moduleName, String name) throws IOException {
-            return findResource(name);
-        }
-
-        @Override
-        protected URL findResource(String name) {
-            if (!name.startsWith("/")) {
-                name = "/" + name;
-            }
-            return getParent().getResource("META-INF/ide-deps" + name + ".ide-launcher-res");
-        }
-
-        @Override
-        protected Enumeration<URL> findResources(String name) throws IOException {
-            if (!name.startsWith("/")) {
-                name = "/" + name;
-            }
-            return getParent().getResources("META-INF/ide-deps" + name + ".ide-launcher-res");
+            Thread.currentThread().setContextClassLoader(originalCl);
         }
     }
 }
diff --git a/core/launcher/src/main/java/io/quarkus/launcher/RuntimeLaunchClassLoader.java b/core/launcher/src/main/java/io/quarkus/launcher/RuntimeLaunchClassLoader.java
new file mode 100644
index 0000000000000..691afcc0f3c7b
--- /dev/null
+++ b/core/launcher/src/main/java/io/quarkus/launcher/RuntimeLaunchClassLoader.java
@@ -0,0 +1,94 @@
+package io.quarkus.launcher;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+public class RuntimeLaunchClassLoader extends ClassLoader {
+
+    static {
+        registerAsParallelCapable();
+    }
+
+    public RuntimeLaunchClassLoader(ClassLoader parent) {
+        super(parent);
+    }
+
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        String resourceName = name.replace(".", "/") + ".class";
+        try {
+            try (InputStream is = getResourceAsStream(resourceName)) {
+                if (is == null) {
+                    throw new ClassNotFoundException(name);
+                }
+                definePackage(name);
+                byte[] buf = new byte[1024];
+                int r;
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                while ((r = is.read(buf)) > 0) {
+                    out.write(buf, 0, r);
+                }
+                byte[] bytes = out.toByteArray();
+
+                return defineClass(name, bytes, 0, bytes.length);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    private void definePackage(String name) {
+        final String pkgName = getPackageNameFromClassName(name);
+        if ((pkgName != null) && getPackage(pkgName) == null) {
+            synchronized (getClassLoadingLock(pkgName)) {
+                if (getPackage(pkgName) == null) {
+                    // this could certainly be improved to use the actual manifest
+                    definePackage(pkgName, null, null, null, null, null, null, null);
+                }
+            }
+        }
+    }
+
+    private String getPackageNameFromClassName(String className) {
+        final int index = className.lastIndexOf('.');
+        if (index == -1) {
+            // we return null here since in this case no package is defined
+            // this is same behavior as Package.getPackage(clazz) exhibits
+            // when the class is in the default package
+            return null;
+        }
+        return className.substring(0, index);
+    }
+
+    protected Class<?> findClass(String moduleName, String name) {
+        try {
+            return findClass(name);
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+    }
+
+    protected URL findResource(String moduleName, String name) throws IOException {
+        return findResource(name);
+    }
+
+    @Override
+    protected URL findResource(String name) {
+        if (!name.startsWith("/")) {
+            name = "/" + name;
+        }
+        return getParent().getResource("META-INF/ide-deps" + name + ".ide-launcher-res");
+    }
+
+    @Override
+    protected Enumeration<URL> findResources(String name) throws IOException {
+        if (!name.startsWith("/")) {
+            name = "/" + name;
+        }
+        return getParent().getResources("META-INF/ide-deps" + name + ".ide-launcher-res");
+    }
+}
diff --git a/core/launcher/src/main/resources/META-INF/jbang-integration.list b/core/launcher/src/main/resources/META-INF/jbang-integration.list
new file mode 100644
index 0000000000000..8138163fea18c
--- /dev/null
+++ b/core/launcher/src/main/resources/META-INF/jbang-integration.list
@@ -0,0 +1,3 @@
+#This integration allows JBang to run Quarkus
+
+io.quarkus.launcher.JBangIntegration #the integration class
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 0106a397747e4..8bff7ca665180 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,16 +21,6 @@
         <module>test-extension</module>
         <module>devmode-spi</module>
         <module>launcher</module>
+        <module>class-change-agent</module>
     </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <parameters>true</parameters>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/core/processor/pom.xml b/core/processor/pom.xml
index 91ee51d8339c6..244d5c178727a 100644
--- a/core/processor/pom.xml
+++ b/core/processor/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-core-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-extension-processor</artifactId>
@@ -56,6 +55,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/Constants.java b/core/processor/src/main/java/io/quarkus/annotation/processor/Constants.java
index 198a9c20b1670..534ad8ac3a09d 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/Constants.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/Constants.java
@@ -38,9 +38,10 @@ final public class Constants {
     public static final String COMMON = "common";
     public static final String RUNTIME = "runtime";
     public static final String DEPLOYMENT = "deployment";
+    public static final String CONFIG = "config";
 
     public static final Pattern CLASS_NAME_PATTERN = Pattern.compile("^.+[\\.$](\\w+)$");
-    public static final Pattern PKG_PATTERN = Pattern.compile("^io\\.quarkus\\.(\\w+)\\.?(\\w+)?\\.?(\\w+)?");
+    public static final Pattern PKG_PATTERN = Pattern.compile("^io\\.quarkus\\.(\\w+)\\.?(\\w+)?\\.?(\\w+)?\\.?(\\w+)?");
 
     public static final String INSTANCE_SYM = "__instance";
     public static final String QUARKUS = "quarkus";
@@ -80,7 +81,7 @@ final public class Constants {
             "%n%s Configuration property fixed at build time - All other configuration properties are overridable at runtime",
             CONFIG_PHASE_BUILD_TIME_ILLUSTRATION);
 
-    public static final String DURATION_FORMAT_NOTE = "\n[NOTE]" +
+    public static final String DURATION_FORMAT_NOTE = "\nifndef::no-duration-note[]\n[NOTE]" +
             "\n[[" + DURATION_NOTE_ANCHOR + "]]\n" +
             ".About the Duration format\n" +
             "====\n" +
@@ -91,7 +92,8 @@ final public class Constants {
             "You can also provide duration values starting with a number.\n" +
             "In this case, if the value consists only of a number, the converter treats the value as seconds.\n" +
             "Otherwise, `PT` is implicitly prepended to the value to obtain a standard `java.time.Duration` format.\n" +
-            "====\n";
+            "====\n" +
+            "endif::no-duration-note[]\n";
 
     public static final String MEMORY_SIZE_FORMAT_NOTE = "\n[NOTE]" +
             "\n[[" + MEMORY_SIZE_NOTE_ANCHOR + "]]\n" +
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/ExtensionAnnotationProcessor.java b/core/processor/src/main/java/io/quarkus/annotation/processor/ExtensionAnnotationProcessor.java
index e2e63846ac68b..cc7c803eed793 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/ExtensionAnnotationProcessor.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/ExtensionAnnotationProcessor.java
@@ -78,7 +78,7 @@ public class ExtensionAnnotationProcessor extends AbstractProcessor {
     private final ConfigDocItemScanner configDocItemScanner = new ConfigDocItemScanner();
     private final Set<String> generatedAccessors = new ConcurrentHashMap<String, Boolean>().keySet(Boolean.TRUE);
     private final Set<String> generatedJavaDocs = new ConcurrentHashMap<String, Boolean>().keySet(Boolean.TRUE);
-    private final boolean generateDocs = !Boolean.getBoolean("skipDocs");
+    private final boolean generateDocs = !(Boolean.getBoolean("skipDocs") || Boolean.getBoolean("quickly"));
 
     public ExtensionAnnotationProcessor() {
     }
@@ -100,11 +100,15 @@ public SourceVersion getSupportedSourceVersion() {
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        doProcess(annotations, roundEnv);
-        if (roundEnv.processingOver()) {
-            doFinish();
+        try {
+            doProcess(annotations, roundEnv);
+            if (roundEnv.processingOver()) {
+                doFinish();
+            }
+            return true;
+        } finally {
+            JDeparser.dropCaches();
         }
-        return true;
     }
 
     @Override
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDoItemFinder.java b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDoItemFinder.java
index e437ec25b21c8..97133943a7890 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDoItemFinder.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDoItemFinder.java
@@ -19,7 +19,7 @@
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.stringifyType;
 
 import java.io.IOException;
-import java.nio.file.Path;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -62,14 +62,16 @@ class ConfigDoItemFinder {
     private final Properties javaDocProperties;
     private final Map<String, TypeElement> configGroupQualifiedNameToTypeElementMap;
     private final FsMap allConfigurationGroups;
+    private final FsMap allConfigurationRoots;
 
     public ConfigDoItemFinder(Set<ConfigRootInfo> configRoots,
             Map<String, TypeElement> configGroupQualifiedNameToTypeElementMap,
-            Properties javaDocProperties, Path allConfigurationGroupsDir) {
+            Properties javaDocProperties, FsMap allConfigurationGroups, FsMap allConfigurationRoots) {
         this.configRoots = configRoots;
         this.configGroupQualifiedNameToTypeElementMap = configGroupQualifiedNameToTypeElementMap;
         this.javaDocProperties = javaDocProperties;
-        this.allConfigurationGroups = new FsMap(allConfigurationGroupsDir);
+        this.allConfigurationGroups = allConfigurationGroups;
+        this.allConfigurationRoots = allConfigurationRoots;
     }
 
     /**
@@ -77,7 +79,6 @@ public ConfigDoItemFinder(Set<ConfigRootInfo> configRoots,
      * Scan configuration group first and record them in a properties file as they can be shared across
      * different modules.
      *
-     * @param allConfigurationGroups
      */
     ScannedConfigDocsItemHolder findInMemoryConfigurationItems() throws IOException {
 
@@ -97,6 +98,7 @@ ScannedConfigDocsItemHolder findInMemoryConfigurationItems() throws IOException
             final List<ConfigDocItem> configDocItems = recursivelyFindConfigItems(element, rootName, rootName, configPhase,
                     false, sectionLevel, true);
             holder.addConfigRootItems(configRootInfo, configDocItems);
+            allConfigurationRoots.put(configRootInfo.getClazz().toString(), OBJECT_MAPPER.writeValueAsString(configDocItems));
         }
 
         return holder;
@@ -109,6 +111,27 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
             ConfigPhase configPhase, boolean withinAMap, int sectionLevel, boolean generateSeparateConfigGroupDocsFiles)
             throws JsonProcessingException {
         List<ConfigDocItem> configDocItems = new ArrayList<>();
+        TypeElement asTypeElement = (TypeElement) element;
+        TypeMirror superType = asTypeElement.getSuperclass();
+        if (superType.getKind() != TypeKind.NONE) {
+            String key = superType.toString();
+            String rawConfigItems = allConfigurationGroups.get(key);
+            if (rawConfigItems == null) {
+                rawConfigItems = allConfigurationRoots.get(key);
+            }
+            final List<ConfigDocItem> superTypeConfigItems;
+            if (rawConfigItems == null) { // element not yet scanned
+                Element superElement = ((DeclaredType) superType).asElement();
+                superTypeConfigItems = recursivelyFindConfigItems(superElement, rootName, parentName,
+                        configPhase, withinAMap, sectionLevel, generateSeparateConfigGroupDocsFiles);
+            } else {
+                superTypeConfigItems = OBJECT_MAPPER.readValue(rawConfigItems, LIST_OF_CONFIG_ITEMS_TYPE_REF);
+            }
+
+            configDocItems.addAll(superTypeConfigItems);
+
+        }
+
         for (Element enclosedElement : element.getEnclosedElements()) {
             if (!enclosedElement.getKind().isField()) {
                 continue;
@@ -207,7 +230,7 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
             if (isConfigGroup(type)) {
                 List<ConfigDocItem> groupConfigItems = readConfigGroupItems(configPhase, rootName, name, type,
                         configSection, withinAMap, generateSeparateConfigGroupDocsFiles);
-                configDocItems.addAll(groupConfigItems);
+                DocGeneratorUtil.appendConfigItemsIntoExistingOnes(configDocItems, groupConfigItems);
             } else {
                 final ConfigDocKey configDocKey = new ConfigDocKey();
                 configDocKey.setWithinAMap(withinAMap);
@@ -217,7 +240,8 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
                     DeclaredType declaredType = (DeclaredType) typeMirror;
                     TypeElement typeElement = (TypeElement) declaredType.asElement();
                     Name qualifiedName = typeElement.getQualifiedName();
-                    optional = qualifiedName.toString().startsWith(Optional.class.getName());
+                    optional = qualifiedName.toString().startsWith(Optional.class.getName())
+                            || qualifiedName.contentEquals(Map.class.getName());
                     list = qualifiedName.contentEquals(List.class.getName())
                             || qualifiedName.contentEquals(Set.class.getName());
 
@@ -230,7 +254,7 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
                                 name += String.format(NAMED_MAP_CONFIG_ITEM_FORMAT, configDocMapKey);
                                 List<ConfigDocItem> groupConfigItems = readConfigGroupItems(configPhase, rootName, name, type,
                                         configSection, true, generateSeparateConfigGroupDocsFiles);
-                                configDocItems.addAll(groupConfigItems);
+                                DocGeneratorUtil.appendConfigItemsIntoExistingOnes(configDocItems, groupConfigItems);
                                 continue;
                             } else {
                                 type = BACK_TICK + stringifyType(declaredType) + BACK_TICK;
@@ -256,7 +280,7 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
                                     configSection.setOptional(true);
                                     List<ConfigDocItem> groupConfigItems = readConfigGroupItems(configPhase, rootName, name,
                                             typeInString, configSection, withinAMap, generateSeparateConfigGroupDocsFiles);
-                                    configDocItems.addAll(groupConfigItems);
+                                    DocGeneratorUtil.appendConfigItemsIntoExistingOnes(configDocItems, groupConfigItems);
                                     continue;
                                 } else if ((typeInString.startsWith(List.class.getName())
                                         || typeInString.startsWith(Set.class.getName())
@@ -287,6 +311,8 @@ private List<ConfigDocItem> recursivelyFindConfigItems(Element element, String r
                                 defaultValue = hyphenateEnumValue(defaultValue);
                             }
                             acceptedValues = extractEnumValues(declaredType, useHyphenateEnumValue);
+                        } else if (isDurationType(declaredType) && !defaultValue.isEmpty()) {
+                            defaultValue = DocGeneratorUtil.normalizeDurationValue(defaultValue);
                         }
                     }
                 }
@@ -361,6 +387,10 @@ private boolean isEnumType(TypeMirror realTypeMirror) {
                 && ((DeclaredType) realTypeMirror).asElement().getKind() == ElementKind.ENUM;
     }
 
+    private boolean isDurationType(TypeMirror realTypeMirror) {
+        return realTypeMirror.toString().equals(Duration.class.getName());
+    }
+
     /**
      * Scan or parse configuration items of a given configuration group.
      * <p>
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDocItemScanner.java b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDocItemScanner.java
index 1e1a43e130293..f0cf97b161be1 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDocItemScanner.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/ConfigDocItemScanner.java
@@ -5,7 +5,6 @@
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.deriveConfigRootName;
 
 import java.io.IOException;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,15 +31,17 @@ final public class ConfigDocItemScanner {
     private final Map<String, TypeElement> configGroupsToTypeElement = new HashMap<>();
 
     private final FsMap allExtensionGeneratedDocs;
-    private final Path allConfigurationGroupsDir = Constants.GENERATED_DOCS_PATH
-            .resolve("all-configuration-groups-generated-doc");
+    private final FsMap allConfigGroupGeneratedDocs;
     private final FsMultiMap configurationRootsParExtensionFileName;
 
     public ConfigDocItemScanner() {
         this.allExtensionGeneratedDocs = new FsMap(Constants.GENERATED_DOCS_PATH
                 .resolve("all-configuration-roots-generated-doc"));
+        this.allConfigGroupGeneratedDocs = new FsMap(Constants.GENERATED_DOCS_PATH
+                .resolve("all-configuration-groups-generated-doc"));
         this.configurationRootsParExtensionFileName = new FsMultiMap(Constants.GENERATED_DOCS_PATH
                 .resolve("extensions-configuration-roots-list"));
+
     }
 
     /**
@@ -108,7 +109,7 @@ public Set<ConfigDocGeneratedOutput> scanExtensionsConfigurationItems(Properties
 
         Set<ConfigDocGeneratedOutput> configDocGeneratedOutputs = new HashSet<>();
         final ConfigDoItemFinder configDoItemFinder = new ConfigDoItemFinder(configRoots, configGroupsToTypeElement,
-                javaDocProperties, allConfigurationGroupsDir);
+                javaDocProperties, allConfigGroupGeneratedDocs, allExtensionGeneratedDocs);
         final ScannedConfigDocsItemHolder inMemoryScannedItemsHolder = configDoItemFinder.findInMemoryConfigurationItems();
 
         if (!inMemoryScannedItemsHolder.isEmpty()) {
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtil.java b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtil.java
index d52d4f9ba9006..e18488139ceba 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtil.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtil.java
@@ -257,6 +257,17 @@ static String hyphenateEnumValue(String orig) {
         return target.toString();
     }
 
+    static String normalizeDurationValue(String value) {
+        if (!value.isEmpty() && Character.isDigit(value.charAt(value.length() - 1))) {
+            try {
+                value = Integer.parseInt(value) + "S";
+            } catch (NumberFormatException ignore) {
+            }
+        }
+        value = value.toUpperCase(Locale.ROOT);
+        return value;
+    }
+
     static String joinAcceptedValues(List<String> acceptedValues) {
         if (acceptedValues == null || acceptedValues.isEmpty()) {
             return "";
@@ -293,28 +304,29 @@ public static String computeExtensionDocFileName(String configRoot) {
             extensionNameBuilder.append(configRoot);
         } else {
             String extensionName = matcher.group(1);
-            final String subgroup = matcher.group(2);
             extensionNameBuilder.append(Constants.QUARKUS);
             extensionNameBuilder.append(Constants.DASH);
 
             if (Constants.DEPLOYMENT.equals(extensionName) || Constants.RUNTIME.equals(extensionName)) {
                 extensionNameBuilder.append(CORE);
-            } else if (subgroup != null && !Constants.DEPLOYMENT.equals(subgroup)
-                    && !Constants.RUNTIME.equals(subgroup) && !Constants.COMMON.equals(subgroup)
-                    && subgroup.matches(Constants.DIGIT_OR_LOWERCASE)) {
+            } else {
                 extensionNameBuilder.append(extensionName);
-                extensionNameBuilder.append(Constants.DASH);
-                extensionNameBuilder.append(subgroup);
-
-                final String qualifier = matcher.group(3);
-                if (qualifier != null && !Constants.DEPLOYMENT.equals(qualifier)
-                        && !Constants.RUNTIME.equals(qualifier) && !Constants.COMMON.equals(qualifier)
-                        && qualifier.matches(Constants.DIGIT_OR_LOWERCASE)) {
+                for (int i = 2; i <= matcher.groupCount(); i++) {
+                    String subgroup = matcher.group(i);
+                    if (Constants.DEPLOYMENT.equals(subgroup)
+                            || Constants.RUNTIME.equals(subgroup)
+                            || Constants.COMMON.equals(subgroup)
+                            || !subgroup.matches(Constants.DIGIT_OR_LOWERCASE)) {
+                        break;
+                    }
+                    if (i > 3 && Constants.CONFIG.equals(subgroup)) {
+                        // this is a bit dark magic but we have config packages as valid extension names
+                        // and config packages where the configuration is stored
+                        break;
+                    }
                     extensionNameBuilder.append(Constants.DASH);
-                    extensionNameBuilder.append(qualifier);
+                    extensionNameBuilder.append(matcher.group(i));
                 }
-            } else {
-                extensionNameBuilder.append(extensionName);
             }
         }
 
@@ -441,7 +453,7 @@ private static boolean mergeSectionIntoPreviousExistingConfigItems(ConfigDocSect
 
             ConfigDocSection configDocSection = configDocItem.getConfigDocSection();
             if (configDocSection.equals(section)) {
-                configDocSection.addConfigDocItems(section.getConfigDocItems());
+                appendConfigItemsIntoExistingOnes(configDocSection.getConfigDocItems(), section.getConfigDocItems());
                 return true;
             } else {
                 boolean configSectionMerged = mergeSectionIntoPreviousExistingConfigItems(section,
diff --git a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/SummaryTableDocFormatter.java b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/SummaryTableDocFormatter.java
index 105ef8a76ead5..ac6e2260cc2fe 100644
--- a/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/SummaryTableDocFormatter.java
+++ b/core/processor/src/main/java/io/quarkus/annotation/processor/generate_doc/SummaryTableDocFormatter.java
@@ -91,7 +91,8 @@ public void format(Writer writer, ConfigDocKey configDocKey) throws IOException
     @Override
     public void format(Writer writer, ConfigDocSection configDocSection) throws IOException {
         if (configDocSection.isShowSection()) {
-            String anchor = anchorPrefix + getAnchor(configDocSection.getName());
+            String anchor = anchorPrefix
+                    + getAnchor(configDocSection.getName() + Constants.DASH + configDocSection.getSectionDetailsTitle());
             String sectionTitle = String.format(SECTION_TITLE, anchor, anchor, configDocSection.getSectionDetailsTitle());
             final String sectionRow = String.format(TABLE_SECTION_ROW_FORMAT, sectionTitle,
                     configDocSection.isOptional() ? "This configuration section is optional" : Constants.EMPTY);
diff --git a/core/processor/src/test/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtilTest.java b/core/processor/src/test/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtilTest.java
index d27fb8fefc25e..5266429f28734 100644
--- a/core/processor/src/test/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtilTest.java
+++ b/core/processor/src/test/java/io/quarkus/annotation/processor/generate_doc/DocGeneratorUtilTest.java
@@ -9,6 +9,7 @@
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.computeExtensionDocFileName;
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.deriveConfigRootName;
 import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.getJavaDocSiteLink;
+import static io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil.normalizeDurationValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigInteger;
@@ -354,4 +355,16 @@ public void derivingConfigRootNameTestCase() {
         actual = deriveConfigRootName(simpleClassName, ConfigPhase.BUILD_TIME);
         assertEquals("quarkus.root-name", actual);
     }
+
+    @Test
+    public void normalizeDurationValueTest() {
+        assertEquals("", normalizeDurationValue(""));
+        assertEquals("1S", normalizeDurationValue("1"));
+        assertEquals("1S", normalizeDurationValue("1S"));
+        assertEquals("1S", normalizeDurationValue("1s"));
+
+        // values are not validated here
+        assertEquals("1_000", normalizeDurationValue("1_000"));
+        assertEquals("FOO", normalizeDurationValue("foo"));
+    }
 }
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 6a2c968baaafb..1979550e4b4fc 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-core-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-core</artifactId>
@@ -72,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
         </dependency>
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
@@ -81,6 +80,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wildfly.common</groupId>
@@ -118,18 +118,22 @@
                 <configuration>
                     <parentFirstArtifacts>
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-runner</parentFirstArtifact>
+                        <parentFirstArtifact>io.smallrye.common:smallrye-common-io</parentFirstArtifact>
                         <parentFirstArtifact>org.wildfly.common:wildfly-common</parentFirstArtifact>
                         <parentFirstArtifact>org.graalvm.sdk:graal-sdk</parentFirstArtifact>
                         <parentFirstArtifact>org.graalvm.nativeimage:svm</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-core</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-development-mode-spi</parentFirstArtifact>
                         <parentFirstArtifact>io.quarkus:quarkus-bootstrap-app-model</parentFirstArtifact>
+                        <parentFirstArtifact>io.quarkus:quarkus-bootstrap-maven-resolver</parentFirstArtifact>
+                        <parentFirstArtifact>org.slf4j:slf4j-api</parentFirstArtifact>
+                        <parentFirstArtifact>org.jboss.slf4j:slf4j-jboss-logmanager</parentFirstArtifact>
                         <parentFirstArtifact>org.jboss.logmanager:jboss-logmanager-embedded</parentFirstArtifact>
                         <parentFirstArtifact>org.jboss.logging:jboss-logging</parentFirstArtifact>
-                        <parentFirstArtifact>org.ow2.asm:asm</parentFirstArtifact>
-                        <parentFirstArtifact>org.ow2.asm:asm-commons</parentFirstArtifact>
                         <parentFirstArtifact>org.apache.maven:maven-model</parentFirstArtifact>
+                        <parentFirstArtifact>org.apache.maven.resolver:maven-resolver-api</parentFirstArtifact>
                         <parentFirstArtifact>org.codehaus.plexus:plexus-utils</parentFirstArtifact>
+                        <parentFirstArtifact>xml-apis:xml-apis</parentFirstArtifact>
                         <!--
                         This is a temporary fix, we need a better way to be able to
                         add these exclusions outside the quarkus-extension.properties file.
@@ -144,7 +148,25 @@
                         <parentFirstArtifact>org.junit.jupiter:junit-jupiter-params</parentFirstArtifact>
                         <parentFirstArtifact>org.junit.platform:junit-platform-commons</parentFirstArtifact>
                         <parentFirstArtifact>org.junit.platform:junit-platform-engine</parentFirstArtifact>
+                        <parentFirstArtifact>io.quarkus:quarkus-class-change-agent</parentFirstArtifact>
+                        <parentFirstArtifact>org.jacoco:org.jacoco.agent:runtime</parentFirstArtifact>
+                        <parentFirstArtifact>io.quarkus:quarkus-bootstrap-gradle-resolver</parentFirstArtifact>
                     </parentFirstArtifacts>
+                    <runnerParentFirstArtifacts>
+                        <runnerParentFirstArtifact>org.graalvm.sdk:graal-sdk</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>io.quarkus:quarkus-bootstrap-runner</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>io.quarkus:quarkus-development-mode-spi</runnerParentFirstArtifact>
+                        <!-- logging dependencies always need to be loaded by the JDK ClassLoader -->
+                        <runnerParentFirstArtifact>org.jboss.logging:jboss-logging</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>org.jboss.logmanager:jboss-logmanager-embedded</runnerParentFirstArtifact>
+                        <!-- This is needed as it's a dependency of the JBoss Logging so it too needs to be loaded by the JDK ClassLoader -->
+                        <runnerParentFirstArtifact>org.wildfly.common:wildfly-common</runnerParentFirstArtifact>
+                        <!-- This is needed because it contains some jar handling classes -->
+                        <runnerParentFirstArtifact>io.smallrye.common:smallrye-common-io</runnerParentFirstArtifact>
+                        <!-- RestAssured uses groovy, which seems to do some things with soft references that
+                        prevent the ClassLoader from being GC'ed, see https://github.com/quarkusio/quarkus/issues/12498 -->
+                        <runnerParentFirstArtifact>org.codehaus.groovy:groovy</runnerParentFirstArtifact>
+                    </runnerParentFirstArtifacts>
                     <excludedArtifacts>
                         <excludedArtifact>io.smallrye:smallrye-config</excludedArtifact>
                         <excludedArtifact>javax.enterprise:cdi-api</excludedArtifact>
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/Application.java b/core/runtime/src/main/java/io/quarkus/runtime/Application.java
index 709b391261e0a..ac632628c9636 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/Application.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/Application.java
@@ -228,16 +228,15 @@ public void awaitShutdown() {
         stateLock.lock();
         try {
             for (;;) {
-                switch (state) {
-                    case ST_STOPPED:
-                        return; // all good
-                    default:
-                        try {
-                            stateCond.await();
-                        } catch (InterruptedException e) {
-                            Thread.currentThread().interrupt();
-                            throw interruptedOnAwaitStop();
-                        }
+                if (state == ST_STOPPED) {
+                    return; // all good
+                } else {
+                    try {
+                        stateCond.await();
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        throw interruptedOnAwaitStop();
+                    }
                 }
             }
         } finally {
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java
index 2316305db6432..41e1e4643481c 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/ApplicationLifecycleManager.java
@@ -1,9 +1,12 @@
 package io.quarkus.runtime;
 
+import java.net.BindException;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import javax.enterprise.context.spi.CreationalContext;
@@ -12,12 +15,14 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.CDI;
 
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.graalvm.nativeimage.ImageInfo;
 import org.jboss.logging.Logger;
 import org.wildfly.common.lock.Locks;
 
-import com.oracle.svm.core.OS;
-
+import io.quarkus.bootstrap.runner.RunnerClassLoader;
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.runtime.graal.DiagnosticPrinter;
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
@@ -29,7 +34,7 @@
  * but nothing else. This class can be used to run both persistent applications that will run
  * till they receive a signal, and command mode applications that will run until the main method
  * returns. This class registers a shutdown hook to properly shut down the application, and handles
- * exiting with the supplied exit code.
+ * exiting with the supplied exit code as well as any exception thrown when starting the application.
  *
  * This class should be used to run production and dev mode applications, while test use cases will
  * likely want to just use {@link Application} directly.
@@ -39,9 +44,9 @@
  */
 public class ApplicationLifecycleManager {
 
-    private static volatile Consumer<Integer> defaultExitCodeHandler = new Consumer<Integer>() {
+    private static volatile BiConsumer<Integer, Throwable> defaultExitCodeHandler = new BiConsumer<Integer, Throwable>() {
         @Override
-        public void accept(Integer integer) {
+        public void accept(Integer integer, Throwable cause) {
             System.exit(integer);
         }
     };
@@ -63,18 +68,21 @@ private ApplicationLifecycleManager() {
     private static boolean hooksRegistered;
     private static boolean vmShuttingDown;
 
+    private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows");
+    private static final boolean IS_MAC = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("mac");
+
     public static void run(Application application, String... args) {
         run(application, null, null, args);
     }
 
     public static void run(Application application, Class<? extends QuarkusApplication> quarkusApplication,
-            Consumer<Integer> exitCodeHandler, String... args) {
+            BiConsumer<Integer, Throwable> exitCodeHandler, String... args) {
         stateLock.lock();
         //in tests we might pass this method an already started application
         //in this case we don't shut it down at the end
         boolean alreadyStarted = application.isStarted();
         if (!hooksRegistered) {
-            registerHooks();
+            registerHooks(exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler);
             hooksRegistered = true;
         }
         if (currentApplication != null && !shutdownRequested) {
@@ -87,8 +95,10 @@ public static void run(Application application, Class<? extends QuarkusApplicati
         } finally {
             stateLock.unlock();
         }
+        boolean appStarted = false;
         try {
             application.start(args);
+            appStarted = true;
             //now we are started, we either run the main application or just wait to exit
             if (quarkusApplication != null) {
                 BeanManager beanManager = CDI.current().getBeanManager();
@@ -102,7 +112,7 @@ public static void run(Application application, Class<? extends QuarkusApplicati
                 }
                 QuarkusApplication instance;
                 if (bean == null) {
-                    instance = quarkusApplication.newInstance();
+                    instance = quarkusApplication.getDeclaredConstructor().newInstance();
                 } else {
                     CreationalContext<?> ctx = beanManager.createCreationalContext(bean);
                     instance = (QuarkusApplication) beanManager.getReference(bean, quarkusApplication, ctx);
@@ -124,6 +134,7 @@ public static void run(Application application, Class<? extends QuarkusApplicati
                     }
                 }
             } else {
+                longLivedPostBootCleanup();
                 stateLock.lock();
                 try {
                     while (!shutdownRequested) {
@@ -135,7 +146,36 @@ public static void run(Application application, Class<? extends QuarkusApplicati
                 }
             }
         } catch (Exception e) {
-            Logger.getLogger(Application.class).error("Error running Quarkus application", e);
+            if (exitCodeHandler == null) {
+                Throwable rootCause = e;
+                while (rootCause.getCause() != null) {
+                    rootCause = rootCause.getCause();
+                }
+                Logger applicationLogger = Logger.getLogger(Application.class);
+                if (rootCause instanceof BindException) {
+                    int port = ConfigProviderResolver.instance().getConfig()
+                            .getOptionalValue("quarkus.http.port", Integer.class).orElse(8080);
+                    applicationLogger.error("Port " + port + " seems to be in use by another process. " +
+                            "Quarkus may already be running or the port is used by another application.");
+                    if (IS_WINDOWS) {
+                        applicationLogger.info("Use 'netstat -a -b -n -o' to identify the process occupying the port.");
+                        applicationLogger.info("You can try to kill it with 'taskkill /PID <pid>' or via the Task Manager.");
+                    } else if (IS_MAC) {
+                        applicationLogger
+                                .info("Use 'netstat -anv | grep " + port + "' to identify the process occupying the port.");
+                        applicationLogger.info("You can try to kill it with 'kill -9 <pid>'.");
+                    } else {
+                        applicationLogger
+                                .info("Use 'netstat -anop | grep " + port + "' to identify the process occupying the port.");
+                        applicationLogger.info("You can try to kill it with 'kill -9 <pid>'.");
+                    }
+                } else if (rootCause instanceof ConfigurationException) {
+                    System.err.println(rootCause.getMessage());
+                } else {
+                    applicationLogger.errorv(rootCause, "Failed to start application (with profile {0})",
+                            ProfileManager.getActiveProfile());
+                }
+            }
             stateLock.lock();
             try {
                 shutdownRequested = true;
@@ -144,45 +184,57 @@ public static void run(Application application, Class<? extends QuarkusApplicati
                 stateLock.unlock();
             }
             application.stop();
-            (exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler).accept(1);
+            (exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler).accept(1, e);
             return;
         }
         if (!alreadyStarted) {
             application.stop(); //this could have already been called
         }
-        (exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler).accept(getExitCode()); //this may not be called if shutdown was initiated by a signal
+        (exitCodeHandler == null ? defaultExitCodeHandler : exitCodeHandler).accept(getExitCode(), null); //this may not be called if shutdown was initiated by a signal
     }
 
-    private static void registerHooks() {
+    /**
+     * Run some background cleanup once after the application has booted.
+     * This will not be invoked for command mode, as it's not worth it for a short lived process.
+     */
+    private static void longLivedPostBootCleanup() {
+        final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        if (cl instanceof RunnerClassLoader) {
+            RunnerClassLoader rcl = (RunnerClassLoader) cl;
+            rcl.resetInternalCaches();
+        }
+    }
+
+    private static void registerHooks(final BiConsumer<Integer, Throwable> exitCodeHandler) {
         if (ImageInfo.inImageRuntimeCode() && System.getenv(DISABLE_SIGNAL_HANDLERS) == null) {
-            registerSignalHandlers();
+            registerSignalHandlers(exitCodeHandler);
         }
         final ShutdownHookThread shutdownHookThread = new ShutdownHookThread();
         Runtime.getRuntime().addShutdownHook(shutdownHookThread);
     }
 
-    private static void registerSignalHandlers() {
-        final SignalHandler handler = new SignalHandler() {
+    private static void registerSignalHandlers(final BiConsumer<Integer, Throwable> exitCodeHandler) {
+        final SignalHandler exitHandler = new SignalHandler() {
             @Override
             public void handle(Signal signal) {
-                System.exit(signal.getNumber() + 0x80);
+                exitCodeHandler.accept(signal.getNumber() + 0x80, null);
             }
         };
-        final SignalHandler quitHandler = new SignalHandler() {
+        final SignalHandler diagnosticsHandler = new SignalHandler() {
             @Override
             public void handle(Signal signal) {
                 DiagnosticPrinter.printDiagnostics(System.out);
             }
         };
-        handleSignal("INT", handler);
-        handleSignal("TERM", handler);
+        handleSignal("INT", exitHandler);
+        handleSignal("TERM", exitHandler);
         // the HUP and QUIT signals are not defined for the Windows OpenJDK implementation:
         // https://hg.openjdk.java.net/jdk8u/jdk8u-dev/hotspot/file/7d5c800dae75/src/os/windows/vm/jvm_windows.cpp
-        if (OS.getCurrent() == OS.WINDOWS) {
-            handleSignal("BREAK", quitHandler);
+        if (IS_WINDOWS) {
+            handleSignal("BREAK", diagnosticsHandler);
         } else {
-            handleSignal("HUP", handler);
-            handleSignal("QUIT", quitHandler);
+            handleSignal("HUP", exitHandler);
+            handleSignal("QUIT", diagnosticsHandler);
         }
     }
 
@@ -204,7 +256,7 @@ public static void exit() {
         exit(-1);
     }
 
-    public static Consumer<Integer> getDefaultExitCodeHandler() {
+    public static BiConsumer<Integer, Throwable> getDefaultExitCodeHandler() {
         return defaultExitCodeHandler;
     }
 
@@ -217,7 +269,7 @@ public static boolean isVmShuttingDown() {
     }
 
     /**
-     * Sets the default exit code handler for application run through the run method
+     * Sets the default exit code and exception handler for application run through the run method
      * that does not take an exit handler.
      *
      * By default this will just call System.exit, however this is not always
@@ -225,11 +277,24 @@ public static boolean isVmShuttingDown() {
      *
      * @param defaultExitCodeHandler the new default exit handler
      */
-    public static void setDefaultExitCodeHandler(Consumer<Integer> defaultExitCodeHandler) {
+    public static void setDefaultExitCodeHandler(BiConsumer<Integer, Throwable> defaultExitCodeHandler) {
         Objects.requireNonNull(defaultExitCodeHandler);
         ApplicationLifecycleManager.defaultExitCodeHandler = defaultExitCodeHandler;
     }
 
+    /**
+     * Sets the default exit code handler for application run through the run method
+     * that does not take an exit handler.
+     *
+     * By default this will just call System.exit, however this is not always
+     * what is wanted.
+     *
+     * @param defaultExitCodeHandler the new default exit handler
+     */
+    public static void setDefaultExitCodeHandler(Consumer<Integer> defaultExitCodeHandler) {
+        setDefaultExitCodeHandler((exitCode, cause) -> defaultExitCodeHandler.accept(exitCode));
+    }
+
     /**
      * Signals that the application should exit with the given code.
      *
@@ -288,6 +353,12 @@ public void run() {
             } finally {
                 stateLock.unlock();
             }
+            if (currentApplication.isStarted()) {
+                // On CLI apps, SIGINT won't call io.quarkus.runtime.Application#stop(),
+                // making the awaitShutdown() below block the application termination process
+                // It should be a noop if called twice anyway
+                currentApplication.stop();
+            }
             currentApplication.awaitShutdown();
             System.out.flush();
             System.err.flush();
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ConfigChangeRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/ConfigChangeRecorder.java
deleted file mode 100644
index b2027bc20181e..0000000000000
--- a/core/runtime/src/main/java/io/quarkus/runtime/ConfigChangeRecorder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.quarkus.runtime;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.logging.Logger;
-
-import io.quarkus.runtime.annotations.Recorder;
-
-@Recorder
-public class ConfigChangeRecorder {
-
-    private static final Logger log = Logger.getLogger(ConfigChangeRecorder.class);
-
-    public void handleConfigChange(Map<String, String> buildTimeConfig) {
-        Config configProvider = ConfigProvider.getConfig();
-        for (Map.Entry<String, String> entry : buildTimeConfig.entrySet()) {
-            Optional<String> val = configProvider.getOptionalValue(entry.getKey(), String.class);
-            if (val.isPresent()) {
-                if (!val.get().equals(entry.getValue())) {
-                    log.warn("Build time property cannot be changed at runtime. " + entry.getKey() + " was "
-                            + entry.getValue() + " at build time and is now " + val.get());
-                }
-            }
-        }
-    }
-}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java
new file mode 100644
index 0000000000000..0687eecab1f0e
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java
@@ -0,0 +1,30 @@
+package io.quarkus.runtime;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * We don't really use this, because these are configurations for the config itself, so it causes a chicken / egg
+ * problem, but we have it so the configurations can be properly documented.
+ *
+ * Relocation of the Config configurations to the Quarkus namespace is done in ConfigUtils#configBuilder.
+ */
+@ConfigRoot(name = ConfigItem.PARENT, phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class ConfigConfig {
+    /**
+     * Additional config locations to be loaded with the Config. The configuration support multiple locations
+     * separated by a comma and each must represent a valid {@link java.net.URI}.
+     */
+    @ConfigItem(name = "config.locations")
+    public Optional<String> locations;
+
+    /**
+     * Accepts a single configuration profile name. If a configuration property cannot be found in the current active
+     * profile, the config performs the same lookup in the profile set by this configuration.
+     */
+    @ConfigItem(name = "config.profile.parent")
+    public Optional<String> profileParent;
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java
index d5b0f1618c0be..372b4a0adbc93 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java
@@ -54,7 +54,7 @@ public void run() {
             executor = devModeExecutor;
             Runtime.getRuntime().addShutdownHook(new Thread(shutdownTask, "Executor shutdown thread"));
         } else {
-            shutdownContext.addShutdownTask(shutdownTask);
+            shutdownContext.addLastShutdownTask(shutdownTask);
             executor = underlying;
         }
         if (threadPoolConfig.prefill) {
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java b/core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java
index 008270167c6f5..2ad440b3641ad 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java
@@ -22,6 +22,13 @@ public boolean isDevOrTest() {
         return this != NORMAL;
     }
 
+    /**
+     * Returns true if the current launch is the server side of remote dev.
+     */
+    public static boolean isRemoteDev() {
+        return (current() == DEVELOPMENT) && "true".equals(System.getenv("QUARKUS_LAUNCH_DEVMODE"));
+    }
+
     private final String defaultProfile;
 
     LaunchMode(String defaultProfile) {
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/LiveReloadConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/LiveReloadConfig.java
index 5eb3f93780a34..19b32bd5ece1d 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/LiveReloadConfig.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/LiveReloadConfig.java
@@ -1,5 +1,6 @@
 package io.quarkus.runtime;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 
@@ -10,6 +11,15 @@
 @ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
 public class LiveReloadConfig {
 
+    /**
+     * Whether or not Quarkus should disable it's ability to not do a full restart
+     * when changes to classes are compatible with JVM instrumentation.
+     *
+     * If this is set to false, Quarkus will always restart on changes and never perform class redefinition.
+     */
+    @ConfigItem(defaultValue = "true")
+    boolean instrumentation;
+
     /**
      * The names of additional resource files to watch for changes, triggering a reload on change. Directories are <em>not</em>
      * supported.
@@ -28,4 +38,10 @@ public class LiveReloadConfig {
      */
     @ConfigItem
     public Optional<String> url;
+
+    /**
+     * The amount of time to wait for a remote dev connect or reconnect
+     */
+    @ConfigItem(defaultValue = "30s")
+    public Duration connectTimeout;
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/Quarkus.java b/core/runtime/src/main/java/io/quarkus/runtime/Quarkus.java
index 904778df2e217..e6ecf8b5f4d11 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/Quarkus.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/Quarkus.java
@@ -1,6 +1,8 @@
 package io.quarkus.runtime;
 
-import java.util.function.Consumer;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.function.BiConsumer;
 
 import org.jboss.logging.Logger;
 import org.jboss.logmanager.LogManager;
@@ -24,6 +26,8 @@ public class Quarkus {
     //WARNING: this is too early to inject a logger
     //private static final Logger log = Logger.getLogger(Quarkus.class);
 
+    private static Closeable LAUNCHED_FROM_IDE;
+
     /**
      * Runs a quarkus application, that will run until the provided {@link QuarkusApplication} has completed.
      *
@@ -46,10 +50,11 @@ public static void run(Class<? extends QuarkusApplication> quarkusApplication, S
      * go into the QuarkusApplication.
      *
      * @param quarkusApplication The application to run, or null
-     * @param exitHandler The handler that is called with the exit code when the application has finished
+     * @param exitHandler The handler that is called with the exit code and any exception (if any) thrown when the application
+     *        has finished
      * @param args The command line parameters
      */
-    public static void run(Class<? extends QuarkusApplication> quarkusApplication, Consumer<Integer> exitHandler,
+    public static void run(Class<? extends QuarkusApplication> quarkusApplication, BiConsumer<Integer, Throwable> exitHandler,
             String... args) {
         try {
             System.setProperty("java.util.logging.manager", LogManager.class.getName());
@@ -63,12 +68,11 @@ public static void run(Class<? extends QuarkusApplication> quarkusApplication, C
         } catch (ClassNotFoundException e) {
             //ignore, this happens when running in dev mode
         } catch (Exception e) {
-            //TODO: exception mappers
-            Logger.getLogger(Quarkus.class).error("Error running Quarkus", e);
             if (exitHandler != null) {
-                exitHandler.accept(1);
+                exitHandler.accept(1, e);
             } else {
-                ApplicationLifecycleManager.getDefaultExitCodeHandler().accept(1);
+                Logger.getLogger(Quarkus.class).error("Error running Quarkus", e);
+                ApplicationLifecycleManager.getDefaultExitCodeHandler().accept(1, e);
             }
             return;
         }
@@ -76,12 +80,11 @@ public static void run(Class<? extends QuarkusApplication> quarkusApplication, C
         //dev mode path, i.e. launching from the IDE
         //this is not the quarkus:dev path as it will augment before
         //calling this method
-        launchFromIDE(quarkusApplication, exitHandler, args);
+        launchFromIDE(quarkusApplication, args);
 
     }
 
-    private static void launchFromIDE(Class<? extends QuarkusApplication> quarkusApplication, Consumer<Integer> exitHandler,
-            String... args) {
+    private static void launchFromIDE(Class<? extends QuarkusApplication> quarkusApplication, String... args) {
         //some trickery, get the class that has invoked us, and use this to figure out the
         //classes root
         StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
@@ -90,8 +93,18 @@ private static void launchFromIDE(Class<? extends QuarkusApplication> quarkusApp
             pos++;
         }
         String callingClass = stackTrace[pos].getClassName();
-        QuarkusLauncher.launch(callingClass, quarkusApplication == null ? null : quarkusApplication.getName(), exitHandler,
-                args);
+        LAUNCHED_FROM_IDE = QuarkusLauncher.launch(callingClass,
+                quarkusApplication == null ? null : quarkusApplication.getName(), args);
+    }
+
+    private static void terminateForIDE() {
+        if (LAUNCHED_FROM_IDE != null) {
+            try {
+                LAUNCHED_FROM_IDE.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     /**
@@ -122,6 +135,7 @@ public static void run(String... args) {
      * @param code The exit code. This may be overridden if an exception occurs on shutdown
      */
     public static void asyncExit(int code) {
+        terminateForIDE();
         ApplicationLifecycleManager.exit(code);
     }
 
@@ -138,6 +152,7 @@ public static void asyncExit(int code) {
      *
      */
     public static void asyncExit() {
+        terminateForIDE();
         ApplicationLifecycleManager.exit(-1);
     }
 
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ShutdownContext.java b/core/runtime/src/main/java/io/quarkus/runtime/ShutdownContext.java
index 54995c59efba7..126ddad2bad19 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/ShutdownContext.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/ShutdownContext.java
@@ -1,5 +1,10 @@
 package io.quarkus.runtime;
 
+import java.io.Closeable;
+import java.io.IOException;
+
+import org.jboss.logging.Logger;
+
 /**
  * A context that can be passed into runtime recorders that allows for shutdown tasks to be added.
  *
@@ -11,4 +16,26 @@ public interface ShutdownContext {
 
     // these are executed after all the ones add via addShutdownTask in the reverse order from which they were added
     void addLastShutdownTask(Runnable runnable);
+
+    class CloseRunnable implements Runnable {
+
+        static final Logger log = Logger.getLogger(ShutdownContext.class);
+
+        private final Closeable closeable;
+
+        public CloseRunnable(Closeable closeable) {
+            this.closeable = closeable;
+        }
+
+        @Override
+        public void run() {
+            try {
+                if (closeable != null) {
+                    closeable.close();
+                }
+            } catch (IOException e) {
+                log.error("Failed to close " + closeable, e);
+            }
+        }
+    }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java b/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java
index 3062422ca8843..f7ea8a14a058a 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java
@@ -58,6 +58,8 @@ public class TemplateHtmlBuilder {
 
     private static final String ANCHOR_TEMPLATE = "<a href=\"/%1$s\">/%2$s</a>";
 
+    private static final String DESCRIPTION_TEMPLATE = "%1$s — %2$s";
+
     private static final String RESOURCE_TEMPLATE = "<h3>%1$s</h3>\n";
 
     private static final String LIST_START = "<ul>\n";
@@ -67,6 +69,8 @@ public class TemplateHtmlBuilder {
 
     private static final String METHOD_IO = "<li>%1$s: %2$s</li>\n";
 
+    private static final String LIST_ITEM = "<li>%s</li>\n";
+
     private static final String METHOD_END = "    </ul>\n"
             + "</li>";
 
@@ -213,24 +217,34 @@ public TemplateHtmlBuilder noResourcesFound() {
     }
 
     public TemplateHtmlBuilder resourcePath(String title) {
-        return resourcePath(title, true, false);
+        return resourcePath(title, true, false, null);
     }
 
     public TemplateHtmlBuilder staticResourcePath(String title) {
-        return resourcePath(title, false, true);
+        return staticResourcePath(title, null);
+    }
+
+    public TemplateHtmlBuilder staticResourcePath(String title, String description) {
+        return resourcePath(title, false, true, description);
     }
 
     public TemplateHtmlBuilder servletMapping(String title) {
-        return resourcePath(title, false, false);
+        return resourcePath(title, false, false, null);
     }
 
-    private TemplateHtmlBuilder resourcePath(String title, boolean withListStart, boolean withAnchor) {
+    private TemplateHtmlBuilder resourcePath(String title, boolean withListStart, boolean withAnchor, String description) {
         String content;
         if (withAnchor) {
+            if (title.startsWith("/")) {
+                title = title.substring(1);
+            }
             content = String.format(ANCHOR_TEMPLATE, title, escapeHtml(title));
         } else {
             content = escapeHtml(title);
         }
+        if (description != null && !description.isEmpty()) {
+            content = String.format(DESCRIPTION_TEMPLATE, content, description);
+        }
         result.append(String.format(RESOURCE_TEMPLATE, content));
         if (withListStart) {
             result.append(LIST_START);
@@ -253,6 +267,11 @@ public TemplateHtmlBuilder produces(String produces) {
         return this;
     }
 
+    public TemplateHtmlBuilder listItem(String content) {
+        result.append(String.format(LIST_ITEM, escapeHtml(content)));
+        return this;
+    }
+
     public TemplateHtmlBuilder methodEnd() {
         result.append(METHOD_END);
         return this;
@@ -268,6 +287,11 @@ public TemplateHtmlBuilder resourceEnd() {
         return this;
     }
 
+    public TemplateHtmlBuilder append(String html) {
+        result.append(html);
+        return this;
+    }
+
     @Override
     public String toString() {
         return result.append(HTML_TEMPLATE_END).toString();
@@ -284,12 +308,25 @@ private static String escapeHtml(final String bodyText) {
                 .replace(">", "&gt;");
     }
 
-    private static String extractFirstLine(final String message) {
-        if (null == message) {
-            return "";
-        }
+    public static String adjustRoot(String httpRoot, String basePath) {
+        //httpRoot can optionally end with a slash
+        //also some templates want the returned path to start with a / and some don't
+        //to make this work we check if the basePath starts with a / or not, and make sure we
+        //the return value follows the same pattern
 
-        String[] lines = message.split("\\r?\\n");
-        return lines[0].trim();
+        if (httpRoot.equals("/")) {
+            //leave it alone
+            return basePath;
+        }
+        if (basePath.startsWith("/")) {
+            if (!httpRoot.endsWith("/")) {
+                return httpRoot + basePath;
+            }
+            return httpRoot.substring(0, httpRoot.length() - 1) + basePath;
+        }
+        if (httpRoot.endsWith("/")) {
+            return httpRoot.substring(1) + basePath;
+        }
+        return httpRoot.substring(1) + "/" + basePath;
     }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/TlsConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/TlsConfig.java
new file mode 100644
index 0000000000000..eb75cfa60af9d
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/TlsConfig.java
@@ -0,0 +1,25 @@
+package io.quarkus.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * Configuration class allowing to globally set TLS properties.
+ */
+@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class TlsConfig {
+
+    /**
+     * Enable trusting all certificates. Disable by default.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean trustAll;
+
+    @Override
+    public String toString() {
+        return "TlsConfig{" +
+                "trustAll=" + trustAll +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/annotations/IgnoreProperty.java b/core/runtime/src/main/java/io/quarkus/runtime/annotations/IgnoreProperty.java
new file mode 100644
index 0000000000000..2adb486fc20e0
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/annotations/IgnoreProperty.java
@@ -0,0 +1,16 @@
+package io.quarkus.runtime.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a field or method should not be considered when attempting to construct a recorded object.
+ * The annotation is meant to be used on a field or a getter method.
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.FIELD })
+public @interface IgnoreProperty {
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/annotations/RecordableConstructor.java b/core/runtime/src/main/java/io/quarkus/runtime/annotations/RecordableConstructor.java
index 925848610e2b7..8a649b648910b 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/annotations/RecordableConstructor.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/annotations/RecordableConstructor.java
@@ -11,6 +11,8 @@
  * The constructor parameters will be read from the fields of the object, and matched
  * to the constructor parameter names.
  *
+ * TODO: move this out of Quarkus core and into a tiny annotation-only module
+ * that could then be used outside of Quarkus (for example in RESTEasy Reactive)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.CONSTRUCTOR)
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/annotations/RelaxedValidation.java b/core/runtime/src/main/java/io/quarkus/runtime/annotations/RelaxedValidation.java
new file mode 100644
index 0000000000000..13c01e642eee3
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/annotations/RelaxedValidation.java
@@ -0,0 +1,17 @@
+package io.quarkus.runtime.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a given recorded parameter should have relaxed validation.
+ * 
+ * Normally if a field cannot be serialized to bytecode an exception will be thrown,
+ * if this annotation is present the field is simply ignored.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface RelaxedValidation {
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSource.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSource.java
deleted file mode 100644
index d8415f850e0bd..0000000000000
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSource.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package io.quarkus.runtime.configuration;
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.FileNotFoundException;
-import java.io.IOError;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Properties;
-
-import io.smallrye.config.PropertiesConfigSource;
-
-/**
- * A configuration source for {@code application.properties}.
- */
-public abstract class ApplicationPropertiesConfigSource extends PropertiesConfigSource {
-    private static final long serialVersionUID = -4694780118527396798L;
-
-    static final String APPLICATION_PROPERTIES = "application.properties";
-    static final String MP_PROPERTIES = "META-INF/microprofile-config.properties";
-
-    ApplicationPropertiesConfigSource(InputStream is, int ordinal) {
-        super(readProperties(is), APPLICATION_PROPERTIES, ordinal);
-    }
-
-    ApplicationPropertiesConfigSource(InputStream is, String nm, int ordinal) {
-        super(readProperties(is), nm, ordinal);
-    }
-
-    private static Map<String, String> readProperties(final InputStream is) {
-        if (is == null) {
-            return Collections.emptyMap();
-        }
-        try (Closeable ignored = is) {
-            try (InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-                try (BufferedReader br = new BufferedReader(isr)) {
-                    final Properties properties = new Properties();
-                    properties.load(br);
-                    return (Map<String, String>) (Map) properties;
-                }
-            }
-        } catch (IOException e) {
-            throw new IOError(e);
-        }
-    }
-
-    public static final class InJar extends ApplicationPropertiesConfigSource {
-        public InJar() {
-            super(openStream(), 250);
-        }
-
-        private static InputStream openStream() {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            if (cl == null) {
-                cl = ApplicationPropertiesConfigSource.class.getClassLoader();
-            }
-            InputStream is;
-            if (cl == null) {
-                is = ClassLoader.getSystemResourceAsStream(APPLICATION_PROPERTIES);
-            } else {
-                is = cl.getResourceAsStream(APPLICATION_PROPERTIES);
-            }
-            return is;
-        }
-    }
-
-    /**
-     * Config that makes sure that the MP config in the application takes precedence over any other on the class path
-     */
-    public static final class MpConfigInJar extends ApplicationPropertiesConfigSource {
-        public MpConfigInJar() {
-            super(openStream(), MP_PROPERTIES, 240);
-        }
-
-        private static InputStream openStream() {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            if (cl == null) {
-                cl = ApplicationPropertiesConfigSource.class.getClassLoader();
-            }
-            InputStream is;
-            if (cl == null) {
-                is = ClassLoader.getSystemResourceAsStream(MP_PROPERTIES);
-            } else {
-                is = cl.getResourceAsStream(MP_PROPERTIES);
-            }
-            return is;
-        }
-    }
-
-    public static final class InFileSystem extends ApplicationPropertiesConfigSource {
-        public InFileSystem() {
-            super(openStream(), 260);
-        }
-
-        private static InputStream openStream() {
-            final Path path = Paths.get("config", APPLICATION_PROPERTIES);
-            if (Files.exists(path)) {
-                try {
-                    return Files.newInputStream(path);
-                } catch (NoSuchFileException | FileNotFoundException e) {
-                    return null;
-                } catch (IOException e) {
-                    throw new IOError(e);
-                }
-            } else {
-                return null;
-            }
-        }
-    }
-}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java
new file mode 100644
index 0000000000000..f5ac2de74bf0a
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java
@@ -0,0 +1,59 @@
+package io.quarkus.runtime.configuration;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+
+import io.smallrye.config.AbstractLocationConfigSourceLoader;
+import io.smallrye.config.PropertiesConfigSource;
+
+public class ApplicationPropertiesConfigSourceLoader extends AbstractLocationConfigSourceLoader {
+    @Override
+    protected String[] getFileExtensions() {
+        return new String[] { "properties" };
+    }
+
+    @Override
+    protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+        return new PropertiesConfigSource(url, ordinal);
+    }
+
+    public static class InClassPath extends ApplicationPropertiesConfigSourceLoader implements ConfigSourceProvider {
+        @Override
+        protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+            return super.loadConfigSource(url, 250);
+        }
+
+        @Override
+        public List<ConfigSource> getConfigSources(final ClassLoader classLoader) {
+            return loadConfigSources("application.properties", classLoader);
+        }
+
+        @Override
+        protected List<ConfigSource> tryFileSystem(final URI uri) {
+            return new ArrayList<>();
+        }
+    }
+
+    public static class InFileSystem extends ApplicationPropertiesConfigSourceLoader implements ConfigSourceProvider {
+        @Override
+        protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+            return super.loadConfigSource(url, 260);
+        }
+
+        @Override
+        public List<ConfigSource> getConfigSources(final ClassLoader classLoader) {
+            return loadConfigSources("config/application.properties", classLoader);
+        }
+
+        @Override
+        protected List<ConfigSource> tryClassPath(final URI uri, final ClassLoader classLoader) {
+            return new ArrayList<>();
+        }
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigChangeRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigChangeRecorder.java
new file mode 100644
index 0000000000000..eb7a8e09bb58f
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigChangeRecorder.java
@@ -0,0 +1,53 @@
+package io.quarkus.runtime.configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
+
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.configuration.ConfigurationRuntimeConfig.BuildTimeMismatchAtRuntime;
+
+@Recorder
+public class ConfigChangeRecorder {
+
+    private static final Logger log = Logger.getLogger(ConfigChangeRecorder.class);
+
+    public void handleConfigChange(ConfigurationRuntimeConfig configurationConfig, Map<String, String> buildTimeConfig) {
+        Config configProvider = ConfigProvider.getConfig();
+        List<String> mismatches = null;
+        for (Map.Entry<String, String> entry : buildTimeConfig.entrySet()) {
+            Optional<String> val = configProvider.getOptionalValue(entry.getKey(), String.class);
+            if (val.isPresent()) {
+                if (!val.get().equals(entry.getValue())) {
+                    if (mismatches == null) {
+                        mismatches = new ArrayList<>();
+                    }
+                    mismatches.add(
+                            " - " + entry.getKey() + " was '" + entry.getValue() + "' at build time and is now '" + val.get()
+                                    + "'");
+                }
+            }
+        }
+        if (mismatches != null && !mismatches.isEmpty()) {
+            final String msg = "Build time property cannot be changed at runtime:\n"
+                    + mismatches.stream().collect(Collectors.joining("\n"));
+            switch (configurationConfig.buildTimeMismatchAtRuntime) {
+                case fail:
+                    throw new IllegalStateException(msg);
+                case warn:
+                    log.warn(msg);
+                    break;
+                default:
+                    throw new IllegalStateException("Unexpected " + BuildTimeMismatchAtRuntime.class.getName() + ": "
+                            + configurationConfig.buildTimeMismatchAtRuntime);
+            }
+
+        }
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java
index 808b71eb41548..5be6e70fbcb82 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java
@@ -23,18 +23,15 @@ private ConfigDiagnostic() {
 
     public static void invalidValue(String name, IllegalArgumentException ex) {
         final String message = ex.getMessage();
-        final String loggedMessage = String.format("An invalid value was given for configuration key \"%s\": %s", name,
-                message == null ? ex.toString() : message);
-        log.error(loggedMessage);
+        final String loggedMessage = message != null ? message
+                : String.format("An invalid value was given for configuration key \"%s\"", name);
         errorsMessages.add(loggedMessage);
     }
 
     public static void missingValue(String name, NoSuchElementException ex) {
         final String message = ex.getMessage();
-        final String loggedMessage = String.format("Configuration key \"%s\" is required, but its value is empty/missing: %s",
-                name,
-                message == null ? ex.toString() : message);
-        log.error(loggedMessage);
+        final String loggedMessage = message != null ? message
+                : String.format("Configuration key \"%s\" is required, but its value is empty/missing", name);
         errorsMessages.add(loggedMessage);
     }
 
@@ -49,7 +46,7 @@ public static void deprecated(String name) {
 
     public static void unknown(String name) {
         log.warnf(
-                "Unrecognized configuration key \"%s\" was provided; it will be ignored; verify that the dependency extension for this configuration is set or you did not make a typo",
+                "Unrecognized configuration key \"%s\" was provided; it will be ignored; verify that the dependency extension for this configuration is set or that you did not make a typo",
                 name);
     }
 
@@ -87,6 +84,12 @@ public static void resetError() {
     }
 
     public static String getNiceErrorMessage() {
-        return String.join("\n", errorsMessages);
+        StringBuilder b = new StringBuilder();
+        for (String errorsMessage : errorsMessages) {
+            b.append("  - ");
+            b.append(errorsMessage);
+            b.append(System.lineSeparator());
+        }
+        return b.toString();
     }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java
index 96b763be8d38c..495d9df9074c1 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java
@@ -65,7 +65,7 @@ private static void handleObject(String prefix, Object o, SmallRyeConfig config)
                 return;
             }
             for (Field field : cls.getDeclaredFields()) {
-                if (Modifier.isFinal(field.getModifiers())) {
+                if (field.isSynthetic() || Modifier.isFinal(field.getModifiers())) {
                     continue;
                 }
                 field.setAccessible(true);
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java
index 273525ababad2..c8628317f3ee7 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java
@@ -1,37 +1,43 @@
 package io.quarkus.runtime.configuration;
 
-import java.io.FileNotFoundException;
+import static io.smallrye.config.AbstractLocationConfigSourceFactory.SMALLRYE_LOCATIONS;
+import static io.smallrye.config.DotEnvConfigSourceProvider.dotEnvSources;
+import static io.smallrye.config.ProfileConfigSourceInterceptor.SMALLRYE_PROFILE;
+import static io.smallrye.config.ProfileConfigSourceInterceptor.SMALLRYE_PROFILE_PARENT;
+import static io.smallrye.config.PropertiesConfigSourceProvider.classPathSources;
+import static io.smallrye.config.SmallRyeConfigBuilder.META_INF_MICROPROFILE_CONFIG_PROPERTIES;
+import static io.smallrye.config.SmallRyeConfigBuilder.WEB_INF_MICROPROFILE_CONFIG_PROPERTIES;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Properties;
+import java.util.OptionalInt;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.IntFunction;
-import java.util.regex.Pattern;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
 import org.jboss.logging.Logger;
 
+import io.smallrye.config.ConfigSourceInterceptor;
+import io.smallrye.config.ConfigSourceInterceptorContext;
+import io.smallrye.config.ConfigSourceInterceptorFactory;
+import io.smallrye.config.DotEnvConfigSourceProvider;
+import io.smallrye.config.EnvConfigSource;
+import io.smallrye.config.Priorities;
+import io.smallrye.config.RelocateConfigSourceInterceptor;
 import io.smallrye.config.SmallRyeConfigBuilder;
+import io.smallrye.config.SysPropConfigSource;
+import io.smallrye.config.common.utils.ConfigSourceUtil;
 
 /**
  *
@@ -67,26 +73,38 @@ public static SmallRyeConfigBuilder configBuilder(final boolean runTime) {
      */
     public static SmallRyeConfigBuilder configBuilder(final boolean runTime, final boolean addDiscovered) {
         final SmallRyeConfigBuilder builder = new SmallRyeConfigBuilder();
-        final ApplicationPropertiesConfigSource.InFileSystem inFileSystem = new ApplicationPropertiesConfigSource.InFileSystem();
-        final ApplicationPropertiesConfigSource.InJar inJar = new ApplicationPropertiesConfigSource.InJar();
-        final ApplicationPropertiesConfigSource.MpConfigInJar mpConfig = new ApplicationPropertiesConfigSource.MpConfigInJar();
-        builder.withSources(inFileSystem, inJar, mpConfig, new DotEnvConfigSource());
-        builder.withProfile(ProfileManager.getActiveProfile());
-        builder.addDefaultInterceptors();
+        builder.withDefaultValue(SMALLRYE_PROFILE, ProfileManager.getActiveProfile());
+
+        final Map<String, String> relocations = new HashMap<>();
+        relocations.put(SMALLRYE_LOCATIONS, "quarkus.config.locations");
+        relocations.put(SMALLRYE_PROFILE_PARENT, "quarkus.config.profile.parent");
+        // Override the priority, because of the ProfileConfigSourceInterceptor and profile.parent.
+        builder.withInterceptorFactories(new ConfigSourceInterceptorFactory() {
+            @Override
+            public ConfigSourceInterceptor getInterceptor(final ConfigSourceInterceptorContext context) {
+                return new RelocateConfigSourceInterceptor(relocations);
+            }
+
+            @Override
+            public OptionalInt getPriority() {
+                return OptionalInt.of(Priorities.LIBRARY + 600 - 5);
+            }
+        });
+
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        builder.withSources(new ApplicationPropertiesConfigSourceLoader.InFileSystem().getConfigSources(classLoader));
+        builder.withSources(new ApplicationPropertiesConfigSourceLoader.InClassPath().getConfigSources(classLoader));
+        builder.addDefaultInterceptors();
         if (runTime) {
             builder.addDefaultSources();
+            builder.withSources(dotEnvSources(classLoader));
         } else {
             final List<ConfigSource> sources = new ArrayList<>();
-            sources.addAll(
-                    new QuarkusPropertiesConfigSourceProvider("META-INF/microprofile-config.properties", true, classLoader)
-                            .getConfigSources(classLoader));
-            // required by spec...
-            sources.addAll(
-                    new QuarkusPropertiesConfigSourceProvider("WEB-INF/classes/META-INF/microprofile-config.properties", true,
-                            classLoader).getConfigSources(classLoader));
-            sources.add(new EnvConfigSource());
-            sources.add(new SysPropConfigSource());
+            sources.addAll(classPathSources(META_INF_MICROPROFILE_CONFIG_PROPERTIES, classLoader));
+            sources.addAll(classPathSources(WEB_INF_MICROPROFILE_CONFIG_PROPERTIES, classLoader));
+            sources.addAll(new BuildTimeDotEnvConfigSourceProvider().getConfigSources(classLoader));
+            sources.add(new BuildTimeEnvConfigSource());
+            sources.add(new BuildTimeSysPropConfigSource());
             builder.withSources(sources);
         }
         if (addDiscovered) {
@@ -122,86 +140,57 @@ public static void addSourceProviders(SmallRyeConfigBuilder builder, Collection<
         }
     }
 
-    static class EnvConfigSource implements ConfigSource, Serializable {
-        private static final String NULL_SENTINEL = new String(""); //must be a new string, used for == comparison
-        private static final long serialVersionUID = 8786096039970882529L;
-
-        static final Pattern REP_PATTERN = Pattern.compile("[^a-zA-Z0-9_]");
-        private final Map<String, String> cache = new ConcurrentHashMap<>(); //the regex match is expensive
-
-        EnvConfigSource() {
-        }
-
-        public int getOrdinal() {
-            return 300;
-        }
-
-        public Map<String, String> getProperties() {
-            return Collections.emptyMap();
+    /**
+     * We override the EnvConfigSource, because we don't want the nothing back from getPropertiesNames at build time.
+     * The mapping is one way and there is no way to map them back.
+     */
+    static class BuildTimeEnvConfigSource extends EnvConfigSource {
+        BuildTimeEnvConfigSource() {
+            super();
         }
 
-        public String getValue(final String propertyName) {
-            String val = cache.get(propertyName);
-            if (val != null) {
-                if (val == NULL_SENTINEL) {
-                    return null;
-                }
-                return val;
-            }
-            val = getRawValue(REP_PATTERN.matcher(propertyName.toUpperCase(Locale.ROOT)).replaceAll("_"));
-            cache.put(propertyName, val == null ? NULL_SENTINEL : val);
-            return val;
+        BuildTimeEnvConfigSource(final Map<String, String> propertyMap, final int ordinal) {
+            super(propertyMap, ordinal);
         }
 
-        String getRawValue(final String name) {
-            return System.getenv(name);
+        @Override
+        public Set<String> getPropertyNames() {
+            return new HashSet<>();
         }
 
+        @Override
         public String getName() {
             return "System environment";
         }
     }
 
-    static class DotEnvConfigSource extends EnvConfigSource {
-        private static final long serialVersionUID = -6718168105190376482L;
-
-        private final Map<String, String> values;
-
-        DotEnvConfigSource() {
-            this(Paths.get(System.getProperty("user.dir", "."), ".env"));
-        }
-
-        DotEnvConfigSource(Path path) {
-            Map<String, String> values = new HashMap<>();
-            try (InputStream is = Files.newInputStream(path)) {
-                try (InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-                    final Properties properties = new Properties();
-                    properties.load(isr);
-                    for (String name : properties.stringPropertyNames()) {
-                        values.put(name, properties.getProperty(name));
-                    }
-                }
-            } catch (FileNotFoundException | NoSuchFileException ignored) {
-            } catch (IOException e) {
-                log.debug("Failed to load `.env` file", e);
-            }
-            this.values = values;
-        }
-
-        public int getOrdinal() {
-            return 295;
+    /**
+     * Same as BuildTimeEnvConfigSource.
+     */
+    static class BuildTimeDotEnvConfigSourceProvider extends DotEnvConfigSourceProvider {
+        public BuildTimeDotEnvConfigSourceProvider() {
+            super();
         }
 
-        String getRawValue(final String name) {
-            return values.get(name);
+        public BuildTimeDotEnvConfigSourceProvider(final String location) {
+            super(location);
         }
 
-        public String getName() {
-            return ".env";
+        @Override
+        protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+            return new BuildTimeEnvConfigSource(ConfigSourceUtil.urlToMap(url), ordinal) {
+                @Override
+                public String getName() {
+                    return super.getName() + "[source=" + url + "]";
+                }
+            };
         }
     }
 
-    static final class SysPropConfigSource implements ConfigSource {
+    /**
+     * We only want to include properties in the quarkus namespace.
+     */
+    static class BuildTimeSysPropConfigSource extends SysPropConfigSource {
         public Map<String, String> getProperties() {
             Map<String, String> output = new TreeMap<>();
             for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
@@ -213,16 +202,8 @@ public Map<String, String> getProperties() {
             return output;
         }
 
-        public String getValue(final String propertyName) {
-            return System.getProperty(propertyName);
-        }
-
         public String getName() {
             return "System properties";
         }
-
-        public int getOrdinal() {
-            return 400;
-        }
     }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigurationRuntimeConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigurationRuntimeConfig.java
new file mode 100644
index 0000000000000..6f31791effa8c
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigurationRuntimeConfig.java
@@ -0,0 +1,29 @@
+package io.quarkus.runtime.configuration;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "configuration", phase = ConfigPhase.RUN_TIME)
+public class ConfigurationRuntimeConfig {
+
+    /**
+     * What should happen if the application is started with a different build time configuration than it was compiled
+     * against. This may be useful to prevent misconfiguration.
+     * <p>
+     * If this is set to {@code warn} the application will warn at start up.
+     * <p>
+     * If this is set to {@code fail} the application will fail at start up.
+     * <p>
+     * Native tests leveraging<code>@io.quarkus.test.junit.TestProfile</code> are always run with
+     * {@code quarkus.configuration.build-time-mismatch-at-runtime = fail}.
+     */
+    @ConfigItem(defaultValue = "warn")
+    public BuildTimeMismatchAtRuntime buildTimeMismatchAtRuntime;
+
+    public enum BuildTimeMismatchAtRuntime {
+        warn,
+        fail
+    }
+
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
index 8c04d55c5e4aa..08ea4b6b8553a 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/DurationConverter.java
@@ -29,11 +29,23 @@ public DurationConverter() {
      * If the value consists only of a number, it implicitly treats the value as seconds.
      * Otherwise, tries to convert the value assuming that it is in the accepted ISO-8601 duration format.
      *
-     * @param value
+     * @param value duration as String
      * @return {@link Duration}
      */
     @Override
     public Duration convert(String value) {
+        return parseDuration(value);
+    }
+
+    /**
+     * Converts a value which start with a number by implicitly appending `PT` to it.
+     * If the value consists only of a number, it implicitly treats the value as seconds.
+     * Otherwise, tries to convert the value assuming that it is in the accepted ISO-8601 duration format.
+     *
+     * @param value duration as String
+     * @return {@link Duration}
+     */
+    public static Duration parseDuration(String value) {
         value = value.trim();
         if (value.isEmpty()) {
             return null;
@@ -51,6 +63,5 @@ public Duration convert(String value) {
         } catch (DateTimeParseException e) {
             throw new IllegalArgumentException(e);
         }
-
     }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java
index 304668aa737d2..cab0ff13948ff 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/LocaleConverter.java
@@ -30,7 +30,7 @@ public Locale convert(final String value) {
         }
 
         Locale locale = Locale.forLanguageTag(NORMALIZE_LOCALE_PATTERN.matcher(localeValue).replaceAll("-"));
-        if (locale.getLanguage() == null || locale.getLanguage().isEmpty()) {
+        if (locale != Locale.ROOT && (locale.getLanguage() == null || locale.getLanguage().isEmpty())) {
             throw new IllegalArgumentException("Unable to resolve locale: " + value);
         }
 
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ProfileManager.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ProfileManager.java
index ef365615603d7..f96509ee0088e 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ProfileManager.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ProfileManager.java
@@ -37,6 +37,7 @@ public static void setRuntimeDefaultProfile(final String profile) {
         runtimeDefaultProfile = profile;
     }
 
+    //NOTE: changes made here must be replicated in BootstrapProfileManager
     public static String getActiveProfile() {
         if (launchMode == LaunchMode.TEST) {
             String profile = System.getProperty(QUARKUS_TEST_PROFILE_PROP);
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigFactory.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigFactory.java
index 539c1a4bbf373..0ea4c1503e66a 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigFactory.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/QuarkusConfigFactory.java
@@ -28,8 +28,11 @@ public SmallRyeConfig getConfigFor(final SmallRyeConfigProviderResolver configPr
             //the HTTP port or logging info
             return configProviderResolver.getBuilder().forClassLoader(classLoader)
                     .addDefaultSources()
+                    .addDefaultInterceptors()
                     .addDiscoveredSources()
                     .addDiscoveredConverters()
+                    .addDiscoveredInterceptors()
+                    .withProfile(ProfileManager.getActiveProfile())
                     .build();
         }
         return config;
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/Substitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/Substitutions.java
index 8754453787476..3a35bda308015 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/Substitutions.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/Substitutions.java
@@ -12,6 +12,8 @@
 import com.oracle.svm.core.threadlocal.FastThreadLocalFactory;
 import com.oracle.svm.core.threadlocal.FastThreadLocalInt;
 
+import io.smallrye.common.constraint.Assert;
+import io.smallrye.config.ConfigMappingMetadata;
 import io.smallrye.config.Expressions;
 
 /**
@@ -52,4 +54,44 @@ public static <T> T withoutExpansion(Supplier<T> supplier) {
             }
         }
     }
+
+    @TargetClass(className = "io.smallrye.config.ConfigMappingLoader")
+    static final class Target_ConfigMappingLoader {
+        @Substitute
+        static Class<?> loadClass(final Class<?> parent, final ConfigMappingMetadata configMappingMetadata) {
+            try {
+                return parent.getClassLoader().loadClass(configMappingMetadata.getClassName());
+            } catch (ClassNotFoundException e) {
+                return null;
+            }
+        }
+
+        @Substitute
+        private static Class<?> defineClass(final Class<?> parent, final String className, final byte[] classBytes) {
+            return null;
+        }
+    }
+
+    @TargetClass(className = "io.smallrye.config.ConfigMappingInterface")
+    static final class Target_ConfigMappingInterface {
+        @Alias
+        static ClassValue<Target_ConfigMappingInterface> cv = null;
+
+        // ClassValue is substituted by a regular ConcurrentHashMap - java.lang.ClassValue.get(JavaLangSubstitutions.java:514)
+        @Substitute
+        public static Target_ConfigMappingInterface getConfigurationInterface(Class<?> interfaceType) {
+            Assert.checkNotNullParam("interfaceType", interfaceType);
+            try {
+                return cv.get(interfaceType);
+            } catch (NullPointerException e) {
+                return null;
+            }
+        }
+
+        // This should not be called, but we substitute it anyway to make sure we remove any references to ASM classes.
+        @Substitute
+        public byte[] getClassBytes() {
+            return null;
+        }
+    }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java
new file mode 100644
index 0000000000000..4588db6b50e8f
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.runtime.configuration;
+
+import org.eclipse.microprofile.config.spi.Converter;
+
+public class TrimmedStringConverter implements Converter<String> {
+
+    public TrimmedStringConverter() {
+    }
+
+    @Override
+    public String convert(String s) {
+        if (s == null) {
+            return s;
+        }
+        return s.trim();
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java
new file mode 100644
index 0000000000000..9303eefb66409
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ZoneIdConverter.java
@@ -0,0 +1,24 @@
+package io.quarkus.runtime.configuration;
+
+import static io.quarkus.runtime.configuration.ConverterSupport.DEFAULT_QUARKUS_CONVERTER_PRIORITY;
+
+import java.io.Serializable;
+import java.time.ZoneId;
+
+import javax.annotation.Priority;
+
+import org.eclipse.microprofile.config.spi.Converter;
+
+/**
+ * A converter to support ZoneId.
+ */
+@Priority(DEFAULT_QUARKUS_CONVERTER_PRIORITY)
+public class ZoneIdConverter implements Converter<ZoneId>, Serializable {
+
+    private static final long serialVersionUID = -439010527617997936L;
+
+    @Override
+    public ZoneId convert(final String value) {
+        return ZoneId.of(value);
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/ClassDefinerSubstitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/ClassDefinerSubstitutions.java
new file mode 100644
index 0000000000000..3760352943b86
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/ClassDefinerSubstitutions.java
@@ -0,0 +1,18 @@
+package io.quarkus.runtime.graal;
+
+import java.lang.invoke.MethodHandles;
+
+import com.oracle.svm.core.annotate.Delete;
+import com.oracle.svm.core.annotate.TargetClass;
+
+import io.smallrye.common.classloader.ClassDefiner;
+
+final class ClassDefinerSubstitutions {
+    @TargetClass(ClassDefiner.class)
+    static final class Target_io_smallrye_common_classloader_ClassDefiner {
+        @Delete
+        public static Class<?> defineClass(MethodHandles.Lookup lookup, Class<?> parent, String className, byte[] classBytes) {
+            return null;
+        }
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/JavaIOSubstitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/JavaIOSubstitutions.java
index 1b7e66746f6e4..fa6629ebf663e 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/graal/JavaIOSubstitutions.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/JavaIOSubstitutions.java
@@ -1,11 +1,16 @@
 package io.quarkus.runtime.graal;
 
 import java.io.ObjectStreamClass;
+import java.util.function.BooleanSupplier;
+
+import org.graalvm.home.Version;
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
-@TargetClass(java.io.ObjectStreamClass.class)
+import io.quarkus.runtime.graal.Target_java_io_ObjectStreamClass.GraalVM20OrEarlier;
+
+@TargetClass(value = java.io.ObjectStreamClass.class, onlyWith = GraalVM20OrEarlier.class)
 @SuppressWarnings({ "unused" })
 final class Target_java_io_ObjectStreamClass {
 
@@ -22,4 +27,11 @@ private Target_java_io_ObjectStreamClass() {
         throw new UnsupportedOperationException("Not supported");
     }
 
+    static class GraalVM20OrEarlier implements BooleanSupplier {
+
+        @Override
+        public boolean getAsBoolean() {
+            return Version.getCurrent().compareTo(21) < 0;
+        }
+    }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/LoggingSubstitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/LoggingSubstitutions.java
index e97cbce756a57..2b1967c2b7a69 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/graal/LoggingSubstitutions.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/LoggingSubstitutions.java
@@ -3,7 +3,6 @@
 import java.util.logging.Handler;
 
 import org.jboss.logmanager.LogContext;
-import org.jboss.logmanager.handlers.DelayedHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,6 +12,7 @@
 import com.oracle.svm.core.annotate.TargetClass;
 
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
 
 /**
  */
@@ -38,7 +38,7 @@ public static Logger getLogger(Class<?> clazz) {
 final class Target_io_quarkus_runtime_logging_InitialConfigurator {
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
     @Alias
-    public static DelayedHandler DELAYED_HANDLER = new DelayedHandler();
+    public static QuarkusDelayedHandler DELAYED_HANDLER = new QuarkusDelayedHandler();
 }
 
 @TargetClass(java.util.logging.Logger.class)
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/QuarkusSubstitution.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/QuarkusSubstitution.java
index 1cf9e6b8e1062..4663176e2367a 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/graal/QuarkusSubstitution.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/QuarkusSubstitution.java
@@ -1,7 +1,5 @@
 package io.quarkus.runtime.graal;
 
-import java.util.function.Consumer;
-
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
@@ -12,8 +10,7 @@
 final class QuarkusSubstitution {
 
     @Substitute
-    private static void launchFromIDE(Class<? extends QuarkusApplication> quarkusApplication, Consumer<Integer> exitHandler,
-            String... args) {
+    private static void launchFromIDE(Class<? extends QuarkusApplication> quarkusApplication, String... args) {
         throw new RuntimeException("Should never be hit");
     }
 
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryBuildTimeConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryBuildTimeConfig.java
new file mode 100644
index 0000000000000..f6345be593c4b
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryBuildTimeConfig.java
@@ -0,0 +1,20 @@
+package io.quarkus.runtime.logging;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class CategoryBuildTimeConfig {
+    /**
+     * The minimum log level for this category.
+     * By default all categories are configured with <code>DEBUG</code> minimum level.
+     *
+     * To get runtime logging below <code>DEBUG</code>, e.g. <code>TRACE</code>,
+     * the minimum level has to be adjusted at build time, the right log level needs to be provided at runtime.
+     *
+     * As an example, to get <code>TRACE</code> logging,
+     * minimum level needs to be at <code>TRACE</code> and the runtime log level needs to match that.
+     */
+    @ConfigItem(defaultValue = "inherit")
+    public InheritableLevel minLevel;
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryConfig.java
index 9d5115d1c32bc..cb25fa55b14dc 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryConfig.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/CategoryConfig.java
@@ -10,7 +10,10 @@
 public class CategoryConfig {
 
     /**
-     * The log level level for this category
+     * The log level for this category.
+     *
+     * Note that to get log levels below <code>INFO</code>,
+     * the minimum level build time configuration option needs to be adjusted as well.
      */
     @ConfigItem(defaultValue = "inherit")
     InheritableLevel level;
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/CleanupFilterConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/CleanupFilterConfig.java
index afb95ee8a4018..ad56bdf5320a6 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/CleanupFilterConfig.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/CleanupFilterConfig.java
@@ -12,11 +12,11 @@ public class CleanupFilterConfig {
      * The message starts to match
      */
     @ConfigItem(defaultValue = "inherit")
-    List<String> ifStartsWith;
+    public List<String> ifStartsWith;
 
     /**
      * The new log level for the filtered message, defaults to DEBUG
      */
     @ConfigItem(defaultValue = "DEBUG")
-    Level targetLevel;
+    public Level targetLevel;
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java
index 8669ff5e50a86..153b810a169e4 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LevelConverter.java
@@ -3,6 +3,7 @@
 import static io.quarkus.runtime.configuration.ConverterSupport.DEFAULT_QUARKUS_CONVERTER_PRIORITY;
 
 import java.io.Serializable;
+import java.util.Locale;
 import java.util.logging.Level;
 
 import javax.annotation.Priority;
@@ -22,6 +23,6 @@ public Level convert(final String value) {
         if (value == null || value.isEmpty()) {
             return null;
         }
-        return LogContext.getLogContext().getLevelForName(value);
+        return LogContext.getLogContext().getLevelForName(value.toUpperCase(Locale.ROOT));
     }
 }
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LogBuildTimeConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogBuildTimeConfig.java
new file mode 100644
index 0000000000000..3fe8d6f0516d0
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogBuildTimeConfig.java
@@ -0,0 +1,36 @@
+package io.quarkus.runtime.logging;
+
+import java.util.Map;
+import java.util.logging.Level;
+
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "log", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class LogBuildTimeConfig {
+
+    /**
+     * Whether or not logging metrics are published in case a metrics extension is present.
+     */
+    @ConfigItem(name = "metrics.enabled", defaultValue = "false")
+    public boolean metricsEnabled;
+
+    /**
+     * The default minimum log level.
+     */
+    @ConfigItem(defaultValue = "DEBUG")
+    public Level minLevel;
+
+    /**
+     * Minimum logging categories.
+     * <p>
+     * Logging is done on a per-category basis. Each category can be independently configured.
+     * A configuration which applies to a category will also apply to all sub-categories of that category,
+     * unless there is a more specific matching sub-category configuration.
+     */
+    @ConfigItem(name = "category")
+    @ConfigDocSection
+    public Map<String, CategoryBuildTimeConfig> categories;
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LogConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogConfig.java
index a32aa18da40c4..a03c7eacb375f 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LogConfig.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogConfig.java
@@ -33,15 +33,6 @@ public final class LogConfig {
     @ConfigItem(defaultValue = "INFO")
     public Level level;
 
-    /**
-     * The default minimum log level
-     * 
-     * @deprecated this functionality was never implemented, it may be deleted or implemented in a future release.
-     */
-    @ConfigItem(defaultValue = "INFO")
-    @Deprecated
-    public Level minLevel;
-
     /**
      * Console logging.
      * <p>
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LogMetricsHandler.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogMetricsHandler.java
new file mode 100644
index 0000000000000..f2cec8f96c236
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogMetricsHandler.java
@@ -0,0 +1,47 @@
+package io.quarkus.runtime.logging;
+
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
+import org.jboss.logmanager.Level;
+
+/**
+ * Measures the number of log messages based on logger configurations quarkus.log.level and quarkus.log.category.*.level
+ * <p>
+ * It should reflect the values of the handler that logs the most, since best practice is to align its level with the root
+ * level.
+ * <p>
+ * Non-standard levels are counted with the lower standard level.
+ */
+public class LogMetricsHandler extends Handler {
+
+    final NavigableMap<Integer, LongAdder> logCounters;
+
+    public LogMetricsHandler(NavigableMap<Integer, LongAdder> logCounters) {
+        this.logCounters = logCounters;
+    }
+
+    @Override
+    public void publish(LogRecord record) {
+        if (isLoggable(record)) {
+            Entry<Integer, LongAdder> counter = logCounters.floorEntry(record.getLevel().intValue());
+            if (counter != null) {
+                counter.getValue().increment();
+            } else {
+                // Default to TRACE for anything lower
+                logCounters.get(Level.TRACE.intValue()).increment();
+            }
+        }
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() throws SecurityException {
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LogMetricsHandlerRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogMetricsHandlerRecorder.java
new file mode 100644
index 0000000000000..b605e9fcd6fe7
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LogMetricsHandlerRecorder.java
@@ -0,0 +1,53 @@
+package io.quarkus.runtime.logging;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.NavigableMap;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Consumer;
+import java.util.logging.Handler;
+
+import org.jboss.logmanager.Level;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+@Recorder
+public class LogMetricsHandlerRecorder {
+
+    static final String METRIC_NAME = "log.total";
+
+    static final String METRIC_DESCRIPTION = "Number of log events, per log level. Non-standard levels are counted with the lower standard level.";
+
+    static final List<Level> STANDARD_LEVELS = Arrays.asList(Level.FATAL, Level.ERROR, Level.WARN, Level.INFO, Level.DEBUG,
+            Level.TRACE);
+
+    static final NavigableMap<Integer, LongAdder> COUNTERS = new TreeMap<>();
+
+    public void initCounters() {
+        for (Level level : STANDARD_LEVELS) {
+            LongAdder counter = new LongAdder();
+            // Use integer value to match any non-standard equivalent level
+            COUNTERS.put(level.intValue(), counter);
+        }
+    }
+
+    public Consumer<MetricsFactory> registerMetrics() {
+        return new Consumer<MetricsFactory>() {
+            @Override
+            public void accept(MetricsFactory metricsFactory) {
+                for (Level level : STANDARD_LEVELS) {
+                    metricsFactory.builder(METRIC_NAME).description(METRIC_DESCRIPTION).tag("level", level.getName())
+                            .buildCounter(COUNTERS.get(level.intValue())::sum);
+                }
+            }
+        };
+    }
+
+    public RuntimeValue<Optional<Handler>> getLogHandler() {
+        return new RuntimeValue(Optional.of(new LogMetricsHandler(COUNTERS)));
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
index 31c8ad6175bf8..9715b77d878af 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
@@ -12,6 +12,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.logging.ErrorManager;
@@ -46,7 +47,9 @@
 @Recorder
 public class LoggingSetupRecorder {
 
-    private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("win");
+    private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LoggingSetupRecorder.class);
+
+    private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows");
 
     /**
      * <a href="https://conemu.github.io">ConEmu</a> ANSI X3.64 support enabled,
@@ -75,11 +78,14 @@ public LoggingSetupRecorder() {
     public static void handleFailedStart() {
         LogConfig config = new LogConfig();
         ConfigInstantiator.handleObject(config);
-        new LoggingSetupRecorder().initializeLogging(config, Collections.emptyList(), Collections.emptyList(),
+        LogBuildTimeConfig buildConfig = new LogBuildTimeConfig();
+        ConfigInstantiator.handleObject(buildConfig);
+        new LoggingSetupRecorder().initializeLogging(config, buildConfig, Collections.emptyList(), Collections.emptyList(),
                 Collections.emptyList(), null);
     }
 
-    public void initializeLogging(LogConfig config, final List<RuntimeValue<Optional<Handler>>> additionalHandlers,
+    public void initializeLogging(LogConfig config, LogBuildTimeConfig buildConfig,
+            final List<RuntimeValue<Optional<Handler>>> additionalHandlers,
             final List<RuntimeValue<Map<String, Handler>>> additionalNamedHandlers,
             final List<RuntimeValue<Optional<Formatter>>> possibleFormatters,
             final RuntimeValue<Optional<Supplier<String>>> possibleBannerSupplier) {
@@ -130,6 +136,21 @@ public void initializeLogging(LogConfig config, final List<RuntimeValue<Optional
         }
         namedHandlers.putAll(additionalNamedHandlersMap);
 
+        for (Map.Entry<String, CategoryConfig> entry : categories.entrySet()) {
+            final CategoryBuildTimeConfig buildCategory = isSubsetOf(entry.getKey(), buildConfig.categories);
+            final Level logLevel = getLogLevel(entry.getKey(), entry.getValue(), categories, buildConfig.minLevel);
+            final Level minLogLevel = buildCategory == null
+                    ? buildConfig.minLevel
+                    : buildCategory.minLevel.getLevel();
+
+            if (logLevel.intValue() < minLogLevel.intValue()) {
+                log.warnf("Log level %s for category '%s' set below minimum logging level %s, promoting it to %s", logLevel,
+                        entry.getKey(), minLogLevel, minLogLevel);
+
+                entry.getValue().level = InheritableLevel.of(minLogLevel.toString());
+            }
+        }
+
         for (Map.Entry<String, CategoryConfig> entry : categories.entrySet()) {
             final String name = entry.getKey();
             final Logger categoryLogger = logContext.getLogger(name);
@@ -157,6 +178,89 @@ public void initializeLogging(LogConfig config, final List<RuntimeValue<Optional
         InitialConfigurator.DELAYED_HANDLER.setHandlers(handlers.toArray(EmbeddedConfigurator.NO_HANDLERS));
     }
 
+    public static void initializeBuildTimeLogging(LogConfig config, LogBuildTimeConfig buildConfig) {
+
+        final Map<String, CategoryConfig> categories = config.categories;
+        final LogContext logContext = LogContext.getLogContext();
+        final Logger rootLogger = logContext.getLogger("");
+
+        rootLogger.setLevel(config.level);
+
+        ErrorManager errorManager = new OnlyOnceErrorManager();
+        final Map<String, CleanupFilterConfig> filters = config.filters;
+        List<LogCleanupFilterElement> filterElements = new ArrayList<>(filters.size());
+        for (Entry<String, CleanupFilterConfig> entry : filters.entrySet()) {
+            filterElements.add(
+                    new LogCleanupFilterElement(entry.getKey(), entry.getValue().targetLevel, entry.getValue().ifStartsWith));
+        }
+
+        final ArrayList<Handler> handlers = new ArrayList<>(3);
+
+        if (config.console.enable) {
+            final Handler consoleHandler = configureConsoleHandler(config.console, errorManager, filterElements,
+                    Collections.emptyList(), new RuntimeValue<>(Optional.empty()));
+            errorManager = consoleHandler.getErrorManager();
+            handlers.add(consoleHandler);
+        }
+
+        Map<String, Handler> namedHandlers = createNamedHandlers(config, Collections.emptyList(), errorManager, filterElements);
+
+        for (Map.Entry<String, CategoryConfig> entry : categories.entrySet()) {
+            final CategoryBuildTimeConfig buildCategory = isSubsetOf(entry.getKey(), buildConfig.categories);
+            final Level logLevel = getLogLevel(entry.getKey(), entry.getValue(), categories, buildConfig.minLevel);
+            final Level minLogLevel = buildCategory == null
+                    ? buildConfig.minLevel
+                    : buildCategory.minLevel.getLevel();
+
+            if (logLevel.intValue() < minLogLevel.intValue()) {
+                log.warnf("Log level %s for category '%s' set below minimum logging level %s, promoting it to %s", logLevel,
+                        entry.getKey(), minLogLevel, minLogLevel);
+
+                entry.getValue().level = InheritableLevel.of(minLogLevel.toString());
+            }
+        }
+
+        for (Map.Entry<String, CategoryConfig> entry : categories.entrySet()) {
+            final String name = entry.getKey();
+            final Logger categoryLogger = logContext.getLogger(name);
+            final CategoryConfig categoryConfig = entry.getValue();
+            if (!categoryConfig.level.isInherited()) {
+                categoryLogger.setLevel(categoryConfig.level.getLevel());
+            }
+            categoryLogger.setUseParentHandlers(categoryConfig.useParentHandlers);
+            if (categoryConfig.handlers.isPresent()) {
+                addNamedHandlersToCategory(categoryConfig, namedHandlers, categoryLogger, errorManager);
+            }
+        }
+        InitialConfigurator.DELAYED_HANDLER.setAutoFlush(false);
+        InitialConfigurator.DELAYED_HANDLER.setBuildTimeHandlers(handlers.toArray(EmbeddedConfigurator.NO_HANDLERS));
+    }
+
+    private static Level getLogLevel(String categoryName, CategoryConfig categoryConfig, Map<String, CategoryConfig> categories,
+            Level rootMinLevel) {
+        if (Objects.isNull(categoryConfig))
+            return rootMinLevel;
+
+        final InheritableLevel inheritableLevel = categoryConfig.level;
+        if (!inheritableLevel.isInherited())
+            return inheritableLevel.getLevel();
+
+        int lastDotIndex = categoryName.lastIndexOf('.');
+        if (lastDotIndex == -1)
+            return rootMinLevel;
+
+        String parent = categoryName.substring(0, lastDotIndex);
+        return getLogLevel(parent, categories.get(parent), categories, rootMinLevel);
+    }
+
+    private static CategoryBuildTimeConfig isSubsetOf(String categoryName, Map<String, CategoryBuildTimeConfig> categories) {
+        return categories.entrySet().stream()
+                .filter(buildCategoryEntry -> categoryName.startsWith(buildCategoryEntry.getKey()))
+                .map(Entry::getValue)
+                .findFirst()
+                .orElse(null);
+    }
+
     private static Map<String, Handler> createNamedHandlers(LogConfig config,
             List<RuntimeValue<Optional<Formatter>>> possibleFormatters, ErrorManager errorManager,
             List<LogCleanupFilterElement> filterElements) {
@@ -185,14 +289,27 @@ private static void addToNamedHandlers(Map<String, Handler> namedHandlers, Handl
                     handlerName));
         }
         namedHandlers.put(handlerName, handler);
+        InitialConfigurator.DELAYED_HANDLER.addLoggingCloseTask(new Runnable() {
+            @Override
+            public void run() {
+                handler.close();
+            }
+        });
     }
 
-    private void addNamedHandlersToCategory(CategoryConfig categoryConfig, Map<String, Handler> namedHandlers,
+    private static void addNamedHandlersToCategory(CategoryConfig categoryConfig, Map<String, Handler> namedHandlers,
             Logger categoryLogger,
             ErrorManager errorManager) {
         for (String categoryNamedHandler : categoryConfig.handlers.get()) {
-            if (namedHandlers.get(categoryNamedHandler) != null) {
-                categoryLogger.addHandler(namedHandlers.get(categoryNamedHandler));
+            Handler handler = namedHandlers.get(categoryNamedHandler);
+            if (handler != null) {
+                categoryLogger.addHandler(handler);
+                InitialConfigurator.DELAYED_HANDLER.addLoggingCloseTask(new Runnable() {
+                    @Override
+                    public void run() {
+                        categoryLogger.removeHandler(handler);
+                    }
+                });
             } else {
                 errorManager.error(String.format("Handler with name '%s' is linked to a category but not configured.",
                         categoryNamedHandler), null, ErrorManager.GENERIC_FAILURE);
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/metrics/MetricsFactory.java b/core/runtime/src/main/java/io/quarkus/runtime/metrics/MetricsFactory.java
new file mode 100644
index 0000000000000..7a7d601472f1a
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/metrics/MetricsFactory.java
@@ -0,0 +1,161 @@
+package io.quarkus.runtime.metrics;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * Extensions can create or register metrics using this factory
+ * independent of the enabled metrics provider
+ */
+public interface MetricsFactory {
+
+    /** A well-known string for MicroProfile metrics provided by the SmallRye Metrics quarkus extension */
+    final String MP_METRICS = "smallrye-metrics";
+
+    /** A well-known string for Micrometer metrics provided by the Micrometer Metrics quarkus extension */
+    final String MICROMETER = "micrometer";
+
+    /** Registry type or scope. This may not be used by all metrics extensions. */
+    public static enum Type {
+        APPLICATION,
+        BASE,
+        VENDOR;
+    }
+
+    /**
+     * @return true if this factory supports the named metrics system. Arbitrary
+     *         strings are allowed. Constants are present for a few.
+     * @see #MICROMETER
+     * @see #MP_METRICS
+     */
+    boolean metricsSystemSupported(String name);
+
+    /**
+     * @param name The name of the metric (required)
+     * @return a fluid builder for registering metrics (default VENDOR type).
+     * @see Type
+     */
+    default MetricBuilder builder(String name) {
+        return builder(name, Type.VENDOR);
+    };
+
+    /**
+     * @param name The name of the metric (required)
+     * @param type The scope or type of the metric (optional, may not be used)
+     * @return a fluid builder for registering metrics.
+     * @see Type
+     */
+    MetricBuilder builder(String name, Type type);
+
+    interface MetricBuilder {
+        /**
+         * @param description Description text of the eventual metric (optional).
+         * @return The builder with added description.
+         */
+        MetricBuilder description(String description);
+
+        /**
+         * @param key The tag key.
+         * @param value The tag value.
+         * @return The builder with added tag.
+         */
+        MetricBuilder tag(String key, String value);
+
+        /**
+         * Specify the metric unit (optional)
+         * 
+         * @param unit Base unit of the eventual metric
+         * @return The builder with added base unit.
+         */
+        MetricBuilder unit(String unit);
+
+        /**
+         * Register a counter that retrieves its value from a supplier function
+         * 
+         * @param countFunction Function supplying a monotonically increasing number value
+         */
+        void buildCounter(Supplier<Number> countFunction);
+
+        /**
+         * Register a counter that retrieves its value by the applying a function
+         * to an object
+         * 
+         * @param obj Object instance to observe
+         * @param countFunction Function returning a monotonically increasing value
+         */
+        <T, R extends Number> void buildCounter(T obj, Function<T, R> countFunction);
+
+        /**
+         * Register a gauge that retrieves its value from a supplier function
+         * 
+         * @param gaugeFunction Function supplying number value
+         */
+        void buildGauge(Supplier<Number> gaugeFunction);
+
+        /**
+         * Register a gauge that retrieves its value by applying a function
+         * to an object
+         * 
+         * @param obj Object instance to observe
+         * @param gaugeFunction Function returning a number value
+         */
+        <T, R extends Number> void buildGauge(T obj, Function<T, R> gaugeFunction);
+
+        /**
+         * @return TimeRecorder to measure passage of time using
+         *         incremental updates.
+         */
+        TimeRecorder buildTimer();
+
+        /**
+         * Wrap a {@link Runnable} so that it is timed when invoked.
+         *
+         * @param f The Runnable to time when it is invoked.
+         * @return The wrapped Runnable.
+         */
+        Runnable buildTimer(Runnable f);
+
+        /**
+         * Wrap a {@link Callable} so that it is timed when invoked.
+         *
+         * @param f The Callable to time when it is invoked.
+         * @param <T> The return type of the callable.
+         * @return The wrapped callable.
+         */
+        <T> Callable<T> buildTimer(Callable<T> f);
+
+        /**
+         * Wrap a {@link Supplier} so that it is timed when invoked.
+         *
+         * @param f The {@code Supplier} to time when it is invoked.
+         * @param <T> The return type of the {@code Supplier} result.
+         * @return The wrapped supplier.
+         */
+        <T> Supplier<T> buildTimer(Supplier<T> f);
+    }
+
+    /**
+     * A time recorder that tracks elapsed time using incremental updates
+     * using a duration with a specified time unit.
+     */
+    interface TimeRecorder {
+        /**
+         * @param amount Duration of a single event being measured by this timer. If the amount is less than 0
+         *        the value will be dropped.
+         * @param unit Time unit for the amount being recorded.
+         */
+        void update(long amount, TimeUnit unit);
+
+        /**
+         * Updates the statistics kept by the recorder with the specified amount.
+         *
+         * @param duration Duration of a single event being measured by this timer.
+         */
+        default void update(Duration duration) {
+            update(duration.toNanos(), TimeUnit.NANOSECONDS);
+        }
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/recording/substitutions/ZoneIdSubstitution.java b/core/runtime/src/main/java/io/quarkus/runtime/recording/substitutions/ZoneIdSubstitution.java
new file mode 100644
index 0000000000000..9e9f28cfe2875
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/recording/substitutions/ZoneIdSubstitution.java
@@ -0,0 +1,18 @@
+package io.quarkus.runtime.recording.substitutions;
+
+import java.time.ZoneId;
+
+import io.quarkus.runtime.ObjectSubstitution;
+
+public class ZoneIdSubstitution implements ObjectSubstitution<ZoneId, String> {
+
+    @Override
+    public String serialize(ZoneId obj) {
+        return obj.getId();
+    }
+
+    @Override
+    public ZoneId deserialize(String str) {
+        return ZoneId.of(str);
+    }
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/test/TestApplicationClassPredicate.java b/core/runtime/src/main/java/io/quarkus/runtime/test/TestApplicationClassPredicate.java
new file mode 100644
index 0000000000000..26be06a319006
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/test/TestApplicationClassPredicate.java
@@ -0,0 +1,10 @@
+package io.quarkus.runtime.test;
+
+import java.util.function.Predicate;
+
+/**
+ * This predicate can be used to distinguish application classes in the test mode.
+ */
+public interface TestApplicationClassPredicate extends Predicate<String> {
+
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/test/TestHttpEndpointProvider.java b/core/runtime/src/main/java/io/quarkus/runtime/test/TestHttpEndpointProvider.java
new file mode 100644
index 0000000000000..e6c1bd6d07be9
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/test/TestHttpEndpointProvider.java
@@ -0,0 +1,24 @@
+package io.quarkus.runtime.test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.function.Function;
+
+/**
+ * Interface that can be used to integrate with the TestHTTPEndpoint infrastructure
+ */
+public interface TestHttpEndpointProvider {
+
+    Function<Class<?>, String> endpointProvider();
+
+    static List<Function<Class<?>, String>> load() {
+        List<Function<Class<?>, String>> ret = new ArrayList<>();
+        for (TestHttpEndpointProvider i : ServiceLoader.load(TestHttpEndpointProvider.class,
+                Thread.currentThread().getContextClassLoader())) {
+            ret.add(i.endpointProvider());
+        }
+        return ret;
+    }
+
+}
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/ExceptionUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/ExceptionUtil.java
index 9850d434e3ad6..75185dcf478fb 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/util/ExceptionUtil.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/util/ExceptionUtil.java
@@ -76,6 +76,16 @@ public static String rootCauseFirstStackTrace(final Throwable exception) {
         return generateStackTrace(modifiedRoot).replace("Caused by:", "Resulted in:");
     }
 
+    public static Throwable getRootCause(Throwable exception) {
+        final List<Throwable> chain = new ArrayList<>();
+        Throwable curr = exception;
+        while (curr != null && !chain.contains(curr)) {
+            chain.add(curr);
+            curr = curr.getCause();
+        }
+        return chain.isEmpty() ? null : chain.get(chain.size() - 1);
+    }
+
     /**
      * Creates and returns a new {@link Throwable} which has the following characteristics:
      * <ul>
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java
new file mode 100644
index 0000000000000..74d7d0c31ea06
--- /dev/null
+++ b/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java
@@ -0,0 +1,37 @@
+package io.quarkus.runtime.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class JavaVersionUtil {
+
+    private static final Pattern PATTERN = Pattern.compile("(?:1\\.)?(\\d+)");
+
+    private static boolean IS_JAVA_11_OR_NEWER;
+    private static boolean IS_JAVA_13_OR_NEWER;
+
+    static {
+        performChecks();
+    }
+
+    // visible for testing
+    static void performChecks() {
+        Matcher matcher = PATTERN.matcher(System.getProperty("java.specification.version", ""));
+        if (matcher.matches()) {
+            int first = Integer.parseInt(matcher.group(1));
+            IS_JAVA_11_OR_NEWER = (first >= 11);
+            IS_JAVA_13_OR_NEWER = (first >= 13);
+        } else {
+            IS_JAVA_11_OR_NEWER = false;
+            IS_JAVA_13_OR_NEWER = false;
+        }
+    }
+
+    public static boolean isJava11OrHigher() {
+        return IS_JAVA_11_OR_NEWER;
+    }
+
+    public static boolean isJava13OrHigher() {
+        return IS_JAVA_13_OR_NEWER;
+    }
+}
diff --git a/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 6e2b8f0a6e461..e3d0c8f1f88be 100644
--- a/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,3 +1,4 @@
 ---
 name: "Quarkus - Core"
-metadata: {}
+metadata:
+  unlisted: true
diff --git a/core/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter b/core/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter
index 9c6a04c4ca0b8..7a9cef122ded4 100644
--- a/core/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter
+++ b/core/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter
@@ -7,4 +7,5 @@ io.quarkus.runtime.configuration.PathConverter
 io.quarkus.runtime.configuration.DurationConverter
 io.quarkus.runtime.configuration.MemorySizeConverter
 io.quarkus.runtime.configuration.LocaleConverter
+io.quarkus.runtime.configuration.ZoneIdConverter
 io.quarkus.runtime.logging.LevelConverter
diff --git a/core/runtime/src/test/java/io/quarkus/runtime/configuration/DotEnvTestCase.java b/core/runtime/src/test/java/io/quarkus/runtime/configuration/DotEnvTestCase.java
index 7a95ee46003ce..e641f71699fb7 100644
--- a/core/runtime/src/test/java/io/quarkus/runtime/configuration/DotEnvTestCase.java
+++ b/core/runtime/src/test/java/io/quarkus/runtime/configuration/DotEnvTestCase.java
@@ -2,7 +2,7 @@
 
 import static java.util.Collections.singletonMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -61,7 +61,8 @@ private SmallRyeConfig buildConfig(Map<String, String> configMap) throws IOExcep
                 }
             }
         }
-        builder.withSources(new ConfigUtils.DotEnvConfigSource(dotEnv));
+        builder.withSources(
+                new ConfigUtils.BuildTimeDotEnvConfigSourceProvider(dotEnv.toUri().toString()).getConfigSources(classLoader));
         final SmallRyeConfig config = builder.build();
         Files.delete(dotEnv);
         cpr.registerConfig(config, classLoader);
@@ -83,7 +84,7 @@ public void testProperties() throws IOException {
                 singletonMap("FOO_BAR", "foo.bar"),
                 singletonMap("foo.baz", "nothing")));
         assertEquals("foo.bar", config.getValue("foo.bar", String.class));
-        assertFalse(config.getOptionalValue("foo.baz", String.class).isPresent());
+        assertTrue(config.getOptionalValue("foo.baz", String.class).isPresent());
     }
 
 }
diff --git a/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java b/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java
index 0c924c9d78117..87d61ffe46c17 100644
--- a/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java
+++ b/core/runtime/src/test/java/io/quarkus/runtime/configuration/LocaleConverterTest.java
@@ -1,6 +1,8 @@
 package io.quarkus.runtime.configuration;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.Locale;
 
@@ -19,8 +21,23 @@ public void testStandardLocale() {
     @Test
     public void testUnderscoreLocale() {
         LocaleConverter localeConverter = new LocaleConverter();
-        Locale locale = localeConverter.convert("fr-FR");
+        Locale locale = localeConverter.convert("fr_FR");
         assertEquals("fr", locale.getLanguage());
         assertEquals("FR", locale.getCountry());
     }
+
+    @Test
+    public void testCLocale() {
+        LocaleConverter localeConverter = new LocaleConverter();
+        Locale locale = localeConverter.convert("c.u-US");
+        assertSame(Locale.ROOT, locale);
+    }
+
+    @Test
+    public void testEmptyLocale() {
+        LocaleConverter localeConverter = new LocaleConverter();
+        Locale locale = localeConverter.convert("");
+        assertNull(locale);
+    }
+
 }
diff --git a/core/runtime/src/test/java/io/quarkus/runtime/logging/LogMetricsHandlerTest.java b/core/runtime/src/test/java/io/quarkus/runtime/logging/LogMetricsHandlerTest.java
new file mode 100644
index 0000000000000..72022c189aac2
--- /dev/null
+++ b/core/runtime/src/test/java/io/quarkus/runtime/logging/LogMetricsHandlerTest.java
@@ -0,0 +1,65 @@
+package io.quarkus.runtime.logging;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.logging.LogRecord;
+
+import org.jboss.logmanager.Level;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class LogMetricsHandlerTest {
+
+    LogMetricsHandler handler;
+
+    NavigableMap<Integer, LongAdder> counters;
+
+    @BeforeEach
+    public void setUp() {
+        counters = new TreeMap<>();
+        counters.put(Level.TRACE.intValue(), new LongAdder());
+        counters.put(Level.DEBUG.intValue(), new LongAdder());
+        counters.put(Level.WARN.intValue(), new LongAdder());
+        handler = new LogMetricsHandler(counters);
+    }
+
+    @Test
+    public void equivalentLevelsShouldBeMerged() {
+        handler.publish(new LogRecord(Level.DEBUG, "test"));
+        handler.publish(new LogRecord(Level.FINE, "test"));
+
+        assertEquals(2, counters.get(Level.DEBUG.intValue()).sum());
+    }
+
+    @Test
+    public void shouldFilterRecords() {
+        handler.setLevel(Level.INFO);
+
+        handler.publish(new LogRecord(Level.DEBUG, "test"));
+
+        assertEquals(0, counters.get(Level.DEBUG.intValue()).sum());
+    }
+
+    @Test
+    public void nonStandardLevelShouldBeCountedWithLowerStandardLevel() {
+        handler.publish(new LogRecord(new CustomLevel("IMPORTANT", 950), "test"));
+
+        assertEquals(1, counters.get(Level.WARN.intValue()).sum());
+    }
+
+    @Test
+    public void anythingBelowTraceShouldBeCountedAsTrace() {
+        handler.publish(new LogRecord(Level.FINEST, "test"));
+
+        assertEquals(1, counters.get(Level.TRACE.intValue()).sum());
+    }
+
+    static class CustomLevel extends java.util.logging.Level {
+        CustomLevel(final String name, final int value) {
+            super(name, value);
+        }
+    }
+}
diff --git a/core/runtime/src/test/java/io/quarkus/runtime/util/ExceptionUtilTest.java b/core/runtime/src/test/java/io/quarkus/runtime/util/ExceptionUtilTest.java
index f77c661e259c5..c85696e57a8f0 100644
--- a/core/runtime/src/test/java/io/quarkus/runtime/util/ExceptionUtilTest.java
+++ b/core/runtime/src/test/java/io/quarkus/runtime/util/ExceptionUtilTest.java
@@ -1,7 +1,9 @@
 package io.quarkus.runtime.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOError;
@@ -48,6 +50,15 @@ public void testReversed() throws Exception {
         assertTrue(expectedResultedIns.isEmpty(), "Reversed stacktrace is missing certain elements");
     }
 
+    @Test
+    public void testGetRootCause() {
+        Throwable e = generateException();
+        Throwable rootCause = ExceptionUtil.getRootCause(e);
+        assertEquals(NumberFormatException.class, rootCause.getClass());
+        assertNull(ExceptionUtil.getRootCause(null));
+        assertEquals(NullPointerException.class, ExceptionUtil.getRootCause(new NullPointerException()).getClass());
+    }
+
     private Throwable generateException() {
         try {
             try {
diff --git a/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java b/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java
new file mode 100644
index 0000000000000..d2300aa148369
--- /dev/null
+++ b/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java
@@ -0,0 +1,65 @@
+package io.quarkus.runtime.util;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class JavaVersionUtilTest {
+
+    private static final String JAVA_SPECIFICATION_VERSION = "java.specification.version";
+
+    @Test
+    void testJava8() {
+        testWithVersion("1.8", () -> {
+            assertFalse(JavaVersionUtil.isJava11OrHigher());
+            assertFalse(JavaVersionUtil.isJava13OrHigher());
+        });
+    }
+
+    @Test
+    void testJava11() {
+        testWithVersion("11", () -> {
+            assertTrue(JavaVersionUtil.isJava11OrHigher());
+            assertFalse(JavaVersionUtil.isJava13OrHigher());
+        });
+    }
+
+    @Test
+    void testJava14() {
+        testWithVersion("14", () -> {
+            assertTrue(JavaVersionUtil.isJava11OrHigher());
+            assertTrue(JavaVersionUtil.isJava13OrHigher());
+        });
+    }
+
+    @Test
+    void testJava17() {
+        testWithVersion("17", () -> {
+            assertTrue(JavaVersionUtil.isJava11OrHigher());
+            assertTrue(JavaVersionUtil.isJava13OrHigher());
+        });
+    }
+
+    @Test
+    void testJava21() {
+        testWithVersion("21", () -> {
+            assertTrue(JavaVersionUtil.isJava11OrHigher());
+            assertTrue(JavaVersionUtil.isJava13OrHigher());
+        });
+    }
+
+    private void testWithVersion(String javaSpecificationVersion, Runnable test) {
+        String previous = System.getProperty(JAVA_SPECIFICATION_VERSION);
+        System.setProperty(JAVA_SPECIFICATION_VERSION, javaSpecificationVersion);
+        JavaVersionUtil.performChecks();
+        try {
+            test.run();
+        } finally {
+            System.setProperty(JAVA_SPECIFICATION_VERSION, previous);
+            JavaVersionUtil.performChecks();
+        }
+
+    }
+
+}
diff --git a/core/test-extension/deployment/pom.xml b/core/test-extension/deployment/pom.xml
index 01366b995a67e..eb4318b63fe34 100644
--- a/core/test-extension/deployment/pom.xml
+++ b/core/test-extension/deployment/pom.xml
@@ -25,10 +25,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-test-extension</artifactId>
diff --git a/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java b/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java
index 442a52bd7d13b..e93eea246e5ff 100644
--- a/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java
+++ b/core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java
@@ -25,7 +25,6 @@
 import java.util.function.BooleanSupplier;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
@@ -52,6 +51,7 @@
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedPackageBuildItem;
 import io.quarkus.extest.runtime.FinalFieldReflectionObject;
 import io.quarkus.extest.runtime.IConfigConsumer;
 import io.quarkus.extest.runtime.RuntimeXmlConfigService;
@@ -68,6 +68,7 @@
 import io.quarkus.extest.runtime.config.TestRunTimeConfig;
 import io.quarkus.extest.runtime.config.XmlConfig;
 import io.quarkus.extest.runtime.logging.AdditionalLogHandlerValueFactory;
+import io.quarkus.extest.runtime.runtimeinitializedpackage.RuntimeInitializedClass;
 import io.quarkus.extest.runtime.subst.DSAPublicKeyObjectSubstitution;
 import io.quarkus.extest.runtime.subst.KeyProxy;
 import io.quarkus.runtime.RuntimeValue;
@@ -81,9 +82,6 @@ public final class TestProcessor {
     static DotName TEST_ANNOTATION = DotName.createSimple(TestAnnotation.class.getName());
     static DotName TEST_ANNOTATION_SCOPE = DotName.createSimple(ApplicationScoped.class.getName());
 
-    @Inject
-    BuildProducer<NativeImageResourceBuildItem> resource;
-
     TestConfigRoot configRoot;
     TestBuildTimeConfig buildTimeConfig;
     TestBuildAndRunTimeConfig buildAndRunTimeConfig;
@@ -125,7 +123,7 @@ LogHandlerBuildItem registerAdditionalLogHandler(final AdditionalLogHandlerValue
     }
 
     @BuildStep
-    void registerNativeImageResources() {
+    void registerNativeImageResources(BuildProducer<NativeImageResourceBuildItem> resource) {
         resource.produce(new NativeImageResourceBuildItem("/DSAPublicKey.encoded"));
     }
 
@@ -275,14 +273,14 @@ void checkConfig() {
                     + buildTimeConfig.btStringOptWithDefault);
         }
         if (!buildTimeConfig.allValues.oov.equals(new ObjectOfValue("configPart1", "configPart2"))) {
-            throw new IllegalStateException("buildTimeConfig.oov != configPart1+onfigPart2; " + buildTimeConfig.allValues.oov);
+            throw new IllegalStateException("buildTimeConfig.oov != configPart1+configPart2; " + buildTimeConfig.allValues.oov);
         }
         if (!buildTimeConfig.allValues.oovWithDefault.equals(new ObjectOfValue("defaultPart1", "defaultPart2"))) {
             throw new IllegalStateException(
                     "buildTimeConfig.oovWithDefault != defaultPart1+defaultPart2; " + buildTimeConfig.allValues.oovWithDefault);
         }
         if (!buildTimeConfig.allValues.ovo.equals(new ObjectValueOf("configPart1", "configPart2"))) {
-            throw new IllegalStateException("buildTimeConfig.oov != configPart1+onfigPart2; " + buildTimeConfig.allValues.oov);
+            throw new IllegalStateException("buildTimeConfig.oov != configPart1+configPart2; " + buildTimeConfig.allValues.oov);
         }
         if (!buildTimeConfig.allValues.ovoWithDefault.equals(new ObjectValueOf("defaultPart1", "defaultPart2"))) {
             throw new IllegalStateException(
@@ -472,6 +470,11 @@ void checkMapMap(TestBuildAndRunTimeConfig btrt, TestBuildTimeConfig bt, BuildPr
         }
     }
 
+    @BuildStep
+    RuntimeInitializedPackageBuildItem runtimeInitializedPackage() {
+        return new RuntimeInitializedPackageBuildItem(RuntimeInitializedClass.class.getPackage().getName());
+    }
+
     @BuildStep(onlyIf = Never.class)
     void neverRunThisOne() {
         throw new IllegalStateException("Not supposed to run!");
diff --git a/core/test-extension/deployment/src/main/resources/application.properties b/core/test-extension/deployment/src/main/resources/application.properties
index 29b6228b320f8..ed6fa0d588e09 100644
--- a/core/test-extension/deployment/src/main/resources/application.properties
+++ b/core/test-extension/deployment/src/main/resources/application.properties
@@ -1,5 +1,6 @@
 # Log settings
-quarkus.log.level=INFO
+# log level in lower case for testing
+quarkus.log.level=info
 quarkus.log.file.enable=true
 quarkus.log.file.level=INFO
 quarkus.log.file.format=%d{HH:mm:ss} %-5p [%c{2.}]] (%t) %s%e%n
diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java
new file mode 100644
index 0000000000000..0c0e2e9d4cf44
--- /dev/null
+++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java
@@ -0,0 +1,29 @@
+package io.quarkus.commandmode;
+
+import org.assertj.core.api.Assertions;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class ExceptionHandlingCommandModeTestCase {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsManifestResource("application.properties", "microprofile-config.properties")
+                    .addClasses(ThrowExceptionApplicationMain.class, ThrowExceptionApplication.class))
+            .setApplicationName("exception-handling")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .setExpectExit(true)
+            .setRun(true);
+
+    @Test
+    public void testRun() {
+        Assertions.assertThat(config.getStartupConsoleOutput())
+                .contains("exception-handling").contains("Exception and exit code [1] handled by application");
+        Assertions.assertThat(config.getExitCode()).isEqualTo(10);
+    }
+}
diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java
index 3e223671654b4..5dcdf4d41d2c3 100644
--- a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java
+++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java
@@ -2,7 +2,7 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
+import java.util.function.BiConsumer;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -25,12 +25,13 @@ public class ExitCodeTestCase {
     @Test
     public void testReturnedExitCode() throws ExecutionException, InterruptedException {
         CompletableFuture<Integer> future = new CompletableFuture<>();
-        ApplicationLifecycleManager.run(Application.currentApplication(), ExitCodeApplication.class, new Consumer<Integer>() {
-            @Override
-            public void accept(Integer integer) {
-                future.complete(integer);
-            }
-        }, "5");
+        ApplicationLifecycleManager.run(Application.currentApplication(), ExitCodeApplication.class,
+                new BiConsumer<Integer, Throwable>() {
+                    @Override
+                    public void accept(Integer integer, Throwable cause) {
+                        future.complete(integer);
+                    }
+                }, "5");
         Assertions.assertEquals(5, future.get());
     }
 
@@ -41,9 +42,9 @@ public void testWaitToExitWithCode() throws ExecutionException, InterruptedExcep
             @Override
             public void run() {
                 ApplicationLifecycleManager.run(Application.currentApplication(), WaitToExitApplication.class,
-                        new Consumer<Integer>() {
+                        new BiConsumer<Integer, Throwable>() {
                             @Override
-                            public void accept(Integer integer) {
+                            public void accept(Integer integer, Throwable cause) {
                                 future.complete(integer);
                             }
                         });
@@ -62,9 +63,9 @@ public void testWaitToExitWithNoCode() throws ExecutionException, InterruptedExc
             @Override
             public void run() {
                 ApplicationLifecycleManager.run(Application.currentApplication(), WaitToExitApplication.class,
-                        new Consumer<Integer>() {
+                        new BiConsumer<Integer, Throwable>() {
                             @Override
-                            public void accept(Integer integer) {
+                            public void accept(Integer integer, Throwable cause) {
                                 future.complete(integer);
                             }
                         });
diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ThrowExceptionApplication.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ThrowExceptionApplication.java
new file mode 100644
index 0000000000000..fd5cb36e1e6b1
--- /dev/null
+++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ThrowExceptionApplication.java
@@ -0,0 +1,11 @@
+package io.quarkus.commandmode;
+
+import io.quarkus.runtime.QuarkusApplication;
+
+public class ThrowExceptionApplication implements QuarkusApplication {
+
+    @Override
+    public int run(String... args) throws Exception {
+        throw new RuntimeException("Exception thrown from application");
+    }
+}
diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ThrowExceptionApplicationMain.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ThrowExceptionApplicationMain.java
new file mode 100644
index 0000000000000..743aa04fd2352
--- /dev/null
+++ b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ThrowExceptionApplicationMain.java
@@ -0,0 +1,20 @@
+package io.quarkus.commandmode;
+
+import java.util.function.BiConsumer;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class ThrowExceptionApplicationMain {
+
+    public static void main(String... args) {
+        Quarkus.run(ThrowExceptionApplication.class, new BiConsumer<Integer, Throwable>() {
+            @Override
+            public void accept(Integer exitCode, Throwable cause) {
+                System.out.println("Exception and exit code [" + exitCode + "] handled by application");
+                System.exit(10);
+            }
+        });
+    }
+}
diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java
index b5937e805cb10..5ccd126e0e435 100644
--- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java
+++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/CategoryConfiguredHandlerTest.java
@@ -7,7 +7,6 @@
 
 import org.jboss.logmanager.formatters.PatternFormatter;
 import org.jboss.logmanager.handlers.ConsoleHandler;
-import org.jboss.logmanager.handlers.DelayedHandler;
 import org.jboss.logmanager.handlers.FileHandler;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -15,6 +14,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class CategoryConfiguredHandlerTest {
@@ -30,7 +30,7 @@ public void consoleOutputTest() {
         LogManager logManager = LogManager.getLogManager();
         assertThat(logManager).isInstanceOf(org.jboss.logmanager.LogManager.class);
 
-        DelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
+        QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
         assertThat(Logger.getLogger("").getHandlers()).contains(delayedHandler);
 
         Handler handler = Arrays.stream(delayedHandler.getHandlers()).filter(h -> (h instanceof ConsoleHandler))
diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/LoggingTestsHelper.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/LoggingTestsHelper.java
index b103f2dd1652d..d684669240cea 100644
--- a/core/test-extension/deployment/src/test/java/io/quarkus/logging/LoggingTestsHelper.java
+++ b/core/test-extension/deployment/src/test/java/io/quarkus/logging/LoggingTestsHelper.java
@@ -9,10 +9,10 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import org.jboss.logmanager.handlers.DelayedHandler;
 import org.junit.jupiter.api.Assertions;
 
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
 
 public class LoggingTestsHelper {
 
@@ -20,7 +20,7 @@ public static Handler getHandler(Class clazz) {
         LogManager logManager = LogManager.getLogManager();
         assertThat(logManager).isInstanceOf(org.jboss.logmanager.LogManager.class);
 
-        DelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
+        QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
         assertThat(Logger.getLogger("").getHandlers()).contains(delayedHandler);
         assertThat(delayedHandler.getLevel()).isEqualTo(Level.ALL);
 
diff --git a/core/test-extension/pom.xml b/core/test-extension/pom.xml
index 35d0c0601bd7d..f6bd01cb36e0a 100644
--- a/core/test-extension/pom.xml
+++ b/core/test-extension/pom.xml
@@ -6,7 +6,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-core-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,6 +15,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <enforce-test-deps-scope.skip>true</enforce-test-deps-scope.skip>
     </properties>
 
     <modules>
@@ -25,12 +25,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <parameters>true</parameters>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
diff --git a/core/test-extension/runtime/pom.xml b/core/test-extension/runtime/pom.xml
index f4c4f8b3e899f..5766ccc7da55b 100644
--- a/core/test-extension/runtime/pom.xml
+++ b/core/test-extension/runtime/pom.xml
@@ -30,9 +30,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus.http</groupId>
diff --git a/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestConfigRoot.java b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestConfigRoot.java
index f184f34abe72c..70b2a6b7c2386 100644
--- a/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestConfigRoot.java
+++ b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestConfigRoot.java
@@ -1,7 +1,6 @@
 package io.quarkus.extest.runtime.config;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
+import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
@@ -10,12 +9,12 @@ public class TestConfigRoot {
     /**
      * resource location of the DSAPublicKey encoded bytes
      */
-    @ConfigProperty
+    @ConfigItem
     public String dsaKeyLocation;
 
     /**
      * Should the TestProcessor#checkConfig method validate the buildTimeConfig
      */
-    @ConfigProperty(defaultValue = "false")
+    @ConfigItem(defaultValue = "false")
     public boolean validateBuildConfig;
 }
diff --git a/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/named/TestBuildAndRunTimeConfig.java b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/named/TestBuildAndRunTimeConfig.java
new file mode 100644
index 0000000000000..b2c1f7b169eb4
--- /dev/null
+++ b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/named/TestBuildAndRunTimeConfig.java
@@ -0,0 +1,9 @@
+package io.quarkus.extest.runtime.config.named;
+
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/* Causes a CCE: https://github.com/quarkusio/quarkus/issues/13966 */
+@ConfigRoot(name = "same-simple-name-different-root", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class TestBuildAndRunTimeConfig {
+}
diff --git a/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/runtimeinitializedpackage/RuntimeInitializedClass.java b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/runtimeinitializedpackage/RuntimeInitializedClass.java
new file mode 100644
index 0000000000000..5425cca0aa0e8
--- /dev/null
+++ b/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/runtimeinitializedpackage/RuntimeInitializedClass.java
@@ -0,0 +1,5 @@
+package io.quarkus.extest.runtime.runtimeinitializedpackage;
+
+public class RuntimeInitializedClass {
+
+}
diff --git a/devtools/aesh/pom.xml b/devtools/aesh/pom.xml
deleted file mode 100644
index 5aa72fc640fec..0000000000000
--- a/devtools/aesh/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-build-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-      	<relativePath>../../build-parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-cli</artifactId>
-    <name>Quarkus - Dev tools - CLI Native Tool</name>
-
-    <properties>
-        <test.level>INFO</test.level>
-        <!-- maven-compiler-plugin -->
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-    </properties>
-
-    <!-- not used atm
-    <repositories>
-        <repository>
-            <id>gradle-repo</id>
-            <url>https://repo.gradle.org/gradle/libs-releases-local/</url>
-        </repository>
-    </repositories>
-    -->
-    <dependencies>
-        <!-- Compile -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devtools-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-development-mode-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-json</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-        </dependency>
-        -->
-        <!-- Gradle, not used atm
-        <dependency>
-            <groupId>org.gradle</groupId>
-            <artifactId>gradle-tooling-api</artifactId>
-            <version>6.3</version>
-        </dependency> -->
-
-        <dependency>
-            <groupId>org.aesh</groupId>
-            <artifactId>aesh</artifactId>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-invoker</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-          <resource>
-            <directory>${project.basedir}/../bom-descriptor-json/target</directory>
-            <targetPath>quarkus-bom-descriptor</targetPath>
-            <filtering>false</filtering>
-            <includes>
-              <include>extensions.json</include>
-            </includes>
-          </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <threadCount>1</threadCount>
-                    <trimStackTrace>false</trimStackTrace>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>io.quarkus.cli.QuarkusCli</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- fails for the bom-descriptor-json -->
-           
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
-                <configuration>
-                  <transformers>
-                    <!-- add Main-Class to manifest file -->
-                    <transformer
-                      implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                      <mainClass>io.quarkus.cli.QuarkusCli</mainClass>
-                    </transformer>
-                  </transformers>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>io.quarkus:quarkus-bom-descriptor-json</exclude>
-                                    <exclude>org.fusesource.jansi:jansi</exclude>
-                                    <exclude>org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain</exclude>
-                                    <exclude>junit:junit</exclude>
-                                </excludes>
-                            </artifactSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native-cli</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <version>3.1.1</version>
-                        <executions>
-                            <execution>
-                                <id>copy</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>copy-dependencies</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <silent>true</silent>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.6.0</version>
-                        <executions>
-                            <execution>
-                                <id>copy</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <executable>${env.GRAALVM_HOME}/bin/native-image</executable>
-                            <workingDirectory>target</workingDirectory>
-                            <arguments>
-                                <argument>--verbose</argument>
-                                <argument>-H:+ReportUnsupportedElementsAtRuntime</argument>
-                                <argument>-H:ReflectionConfigurationFiles=../reflectconfigs/quarkuscli.json</argument>
-                                <argument>-jar</argument>
-                                <argument>${project.build.finalName}.jar</argument>
-                            </arguments>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/devtools/aesh/reflectconfigs/quarkuscli.json b/devtools/aesh/reflectconfigs/quarkuscli.json
deleted file mode 100644
index d6776a45129eb..0000000000000
--- a/devtools/aesh/reflectconfigs/quarkuscli.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-  {
-    "name" : "io.quarkus.cli.commands.AddExtensionCommand",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true,
-    "fields" : [
-        { "name" : "extensions" },
-        { "name" : "path" }
-    ]
-  },
-  {
-    "name" : "io.quarkus.cli.commands.CreateProjectCommand",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true,
-    "fields" : [
-        { "name" : "artifactId" },
-        { "name" : "groupId" },
-        { "name" : "version" },
-        { "name" : "className" },
-        { "name" : "resourcePath" },
-        { "name" : "buildTool" },
-        { "name" : "extensions" },
-        { "name" : "path" }
-    ]
-  },
-  {
-    "name" : "io.quarkus.cli.commands.ListExtensionsCommand",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true,
-    "fields" : [
-        { "name" : "all" },
-        { "name" : "format" },
-        { "name" : "searchPattern" },
-        { "name" : "path" }
-    ]
-  },
-  {
-    "name" : "io.quarkus.cli.commands.QuarkusBaseCommand",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true,
-    "fields" : [
-        { "name" : "interactive" }
-    ]
-   },
-  {
-    "name" : "org.aesh.command.impl.completer.BooleanOptionCompleter",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true
-  },
-  {
-    "name" : "org.aesh.command.impl.completer.FileOptionCompleter",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true
-  },  {
-    "name" : "org.aesh.command.impl.parser.AeshOptionParser",
-    "allDeclaredConstructors" : true,
-    "allPublicConstructors" : true,
-    "allDeclaredMethods" : true,
-    "allPublicMethods" : true
-  }
-
-]
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java b/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java
deleted file mode 100644
index 1df2f522983de..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/QuarkusCli.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.quarkus.cli;
-
-import org.aesh.AeshRuntimeRunner;
-
-import io.quarkus.cli.commands.QuarkusBaseCommand;
-
-public class QuarkusCli {
-
-    public static void main(String[] args) {
-        AeshRuntimeRunner.builder()
-                .command(QuarkusBaseCommand.class)
-                .args(args)
-                .interactive(true)
-                .execute();
-    }
-
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionsCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionsCommand.java
deleted file mode 100644
index 578e390028855..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/AddExtensionsCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.aesh.command.Command;
-import org.aesh.command.CommandDefinition;
-import org.aesh.command.CommandException;
-import org.aesh.command.CommandResult;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Arguments;
-import org.aesh.command.option.Option;
-import org.aesh.io.Resource;
-import org.aesh.selector.MultiSelect;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.commands.AddExtensions;
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-
-@CommandDefinition(name = "add", description = "Install extensions to a project")
-public class AddExtensionsCommand implements Command<CommandInvocation> {
-
-    @Option(shortName = 'p', description = "Path to the project, if not set it will use the current working directory")
-    private Resource path;
-
-    @Arguments(completer = ExtensionCompleter.class, description = "Name of the extension that will be added to the project")
-    private Set<String> extensions;
-
-    @Override
-    public CommandResult execute(CommandInvocation invocation) throws CommandException, InterruptedException {
-
-        try {
-            Path projectDirectory = path != null ? Paths.get(path.getAbsolutePath())
-                    : Paths.get(System.getProperty("user.dir"));
-
-            QuarkusProject quarkusProject = QuarkusProject.resolveExistingProject(projectDirectory,
-                    QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor());
-
-            AddExtensions project = new AddExtensions(quarkusProject);
-            //if extensions is not set, create a selector
-            if (extensions == null || extensions.isEmpty()) {
-                MultiSelect selector = new MultiSelect(invocation.getShell(),
-                        getAllExtensions(quarkusProject).stream().map(Extension::getSimplifiedArtifactId)
-                                .collect(Collectors.toList()),
-                        "Select the extensions that will be added to your project");
-
-                extensions = new HashSet<>(selector.doSelect());
-            }
-            project.extensions(extensions);
-
-            QuarkusCommandOutcome result = project.execute();
-            if (result.isSuccess()) {
-                invocation.println("Added " + extensions + " to the project.");
-            } else {
-                invocation.println("Unable to add an extension matching " + extensions);
-            }
-        } catch (QuarkusCommandException | IOException e) {
-            invocation.println("Unable to add an extension matching " + extensions + ": " + e.getMessage());
-        } catch (IllegalStateException e) {
-            invocation.println("No build file in " + path + " found. Will not attempt to add any extensions.");
-        }
-
-        return CommandResult.SUCCESS;
-    }
-
-    private List<Extension> getAllExtensions(QuarkusProject quarkusProject) throws IOException {
-        return quarkusProject.getPlatformDescriptor().getExtensions();
-    }
-
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/BuildToolConverter.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/BuildToolConverter.java
deleted file mode 100644
index 3927cfd191007..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/BuildToolConverter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.quarkus.cli.commands;
-
-import org.aesh.command.converter.Converter;
-import org.aesh.command.converter.ConverterInvocation;
-import org.aesh.command.validator.OptionValidatorException;
-
-import io.quarkus.devtools.project.BuildTool;
-
-public class BuildToolConverter implements Converter<BuildTool, ConverterInvocation> {
-    @Override
-    public BuildTool convert(ConverterInvocation invocation) throws OptionValidatorException {
-        if (invocation.getInput() != null && invocation.getInput().length() > 0)
-            return BuildTool.findTool(invocation.getInput());
-        else
-            throw new OptionValidatorException(invocation.getInput() + " was not recognized as a supported build tool");
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/CompileProjectCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/CompileProjectCommand.java
deleted file mode 100644
index 2f45ebd6a6d79..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/CompileProjectCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.io.File;
-
-import org.aesh.command.Command;
-import org.aesh.command.CommandDefinition;
-import org.aesh.command.CommandException;
-import org.aesh.command.CommandResult;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Argument;
-import org.aesh.command.option.Option;
-import org.aesh.io.Resource;
-
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.QuarkusProject;
-
-@CommandDefinition(name = "build", description = "Compiles the targeted project")
-public class CompileProjectCommand implements Command<CommandInvocation> {
-    @Option(name = "clean", hasValue = false, shortName = 'c', description = "Clean the project before compiling")
-    private boolean clean;
-
-    @Argument(description = "Path to the project, if not set it will use the current working directory")
-    private Resource path;
-
-    @Override
-    public CommandResult execute(CommandInvocation invocation) throws CommandException, InterruptedException {
-
-        File projectPath = path != null ? new File(path.getAbsolutePath()) : new File(System.getProperty("user.dir"));
-
-        BuildTool buildTool = QuarkusProject.resolveExistingProjectBuildTool(projectPath.toPath());
-
-        if (buildTool.getBuildFiles() != null && buildTool.getBuildFiles().length > 0) {
-            File buildFile = new File(buildTool.getBuildFiles()[0]);
-
-            if (!buildFile.isFile()) {
-                invocation.println("Was not able to find a build file in: " + projectPath);
-                return CommandResult.FAILURE;
-            }
-
-            try {
-                if (buildTool.equals(BuildTool.MAVEN)) {
-                    File wrapper = ExecuteUtil.getMavenWrapper(projectPath.getAbsolutePath());
-                    if (wrapper != null) {
-                        ExecuteUtil.executeWrapper(invocation, wrapper, "package");
-                    } else {
-                        ExecuteUtil.executeMaven(projectPath, invocation, "package");
-                    }
-
-                }
-                //do gradle
-                else {
-                    File wrapper = ExecuteUtil.getGradleWrapper(projectPath.getAbsolutePath());
-                    if (wrapper != null) {
-                        ExecuteUtil.executeWrapper(invocation, wrapper, "build");
-                    } else {
-                        ExecuteUtil.executeGradle(projectPath, invocation, "build");
-                    }
-                }
-            } catch (InterruptedException i) {
-                invocation.println("Build was interrupted.");
-                return CommandResult.FAILURE;
-            }
-
-            return CommandResult.SUCCESS;
-        } else {
-            invocation.println("Was not able to find a build file in: " + projectPath);
-            return CommandResult.FAILURE;
-        }
-    }
-
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java
deleted file mode 100644
index 3c88453e72304..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/CreateProjectCommand.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.aesh.command.Command;
-import org.aesh.command.CommandDefinition;
-import org.aesh.command.CommandResult;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Argument;
-import org.aesh.command.option.Option;
-import org.aesh.command.option.OptionList;
-import org.aesh.command.shell.Shell;
-import org.aesh.io.Resource;
-import org.aesh.readline.action.KeyAction;
-import org.aesh.readline.terminal.Key;
-import org.aesh.selector.MultiSelect;
-import org.aesh.selector.SelectorType;
-import org.aesh.terminal.utils.Config;
-import org.apache.commons.lang3.StringUtils;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.commands.AddExtensions;
-import io.quarkus.devtools.commands.CreateProject;
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-
-@CommandDefinition(name = "create", generateHelp = true, description = "Creates a base Quarkus project")
-public class CreateProjectCommand implements Command<CommandInvocation> {
-
-    @Option(name = "groupid", shortName = 'g', defaultValue = "org.acme.quarkus.sample", askIfNotSet = true, description = "The groupId of the project")
-    private String groupId;
-
-    @Option(name = "artifactid", shortName = 'a', defaultValue = "my-quarkus-project", askIfNotSet = true, description = "The artifactId of the project (also often the name of the project")
-    private String artifactId;
-
-    @Option(shortName = 'v', defaultValue = "1.0.0-SNAPSHOT", askIfNotSet = true, description = "Project version number")
-    private String version;
-
-    @Option(shortName = 'c', name = "classname", description = "Rest resource name, by default set to: groupId+artifactId+HelloResource")
-    private String className;
-
-    @Option(shortName = 'p', name = "resourcepath", description = "Rest resource path, by default set to /hello")
-    private String resourcePath;
-
-    @Option(shortName = 'b', selector = SelectorType.SELECT, completer = ProjectTypeCompleter.class, converter = BuildToolConverter.class, description = "Build tool type for the project")
-    private BuildTool buildTool;
-
-    @OptionList(shortName = 'e', completer = ExtensionCompleter.class, description = "Extensions that will be added to the build file")
-    private Set<String> extensions;
-
-    @Argument(description = "Path to the new project, if not set it will use the current working directory")
-    private Resource path;
-
-    public CommandResult execute(CommandInvocation invocation) {
-        try {
-            Path projectDirectory = path != null ? Paths.get(path.getAbsolutePath())
-                    : Paths.get(System.getProperty("user.dir"));
-
-            if (className == null) {
-                invocation.print("Do you want to create a REST resource? (y/n) ");
-                KeyAction input = invocation.input();
-                invocation.print(Config.getLineSeparator());
-                if (input == Key.y)
-                    processClassName(invocation.getShell());
-            }
-
-            Files.createDirectories(projectDirectory);
-
-            final Map<String, Object> context = new HashMap<>();
-            context.put("path", resourcePath);
-            boolean status = new CreateProject(projectDirectory,
-                    QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor())
-                            .groupId(groupId)
-                            .artifactId(artifactId)
-                            .version(version)
-                            .buildTool(buildTool)
-                            .className(className)
-                            .doCreateProject(context);
-
-            if ((extensions == null || extensions.isEmpty()) && status) {
-                //ask if the user want to add any extensions
-                try {
-                    invocation.print("Do you want to add any extensions in addition to rest? (y/n) ");
-                    if (invocation.input() == Key.y) {
-                        QuarkusProject quarkusProject = QuarkusProject.resolveExistingProject(projectDirectory,
-                                QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor());
-
-                        MultiSelect selector = new MultiSelect(invocation.getShell(),
-                                getAllExtensions(quarkusProject).stream().map(Extension::getSimplifiedArtifactId)
-                                        .collect(Collectors.toList()),
-                                "Select the extensions that will be added to your project");
-
-                        extensions = new HashSet<>(selector.doSelect());
-
-                        status = new AddExtensions(QuarkusProject.resolveExistingProject(projectDirectory,
-                                QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor()))
-                                        .extensions(extensions).execute()
-                                        .isSuccess();
-                    }
-                    invocation.print(Config.getLineSeparator());
-                } catch (InterruptedException ie) {
-                    //ignored
-                }
-            }
-
-            if (status) {
-                invocation.println("Project " + artifactId +
-                        " created successfully at " + projectDirectory.toString() + ".");
-            } else {
-                invocation.println("Failed to create project");
-            }
-        } catch (InterruptedException e) {
-            invocation.println("Project creation was aborted, " + e.getMessage());
-            return CommandResult.FAILURE;
-        } catch (IOException | QuarkusCommandException e) {
-            invocation.println("Project creation failed, " + e.getMessage());
-            invocation.println("Is the given path an empty folder?");
-            return CommandResult.FAILURE;
-        }
-
-        return CommandResult.SUCCESS;
-    }
-
-    private void processClassName(Shell shell) throws InterruptedException {
-        String defaultResourceName = groupId.replace("-", ".").replace("_", ".");
-        className = shell.readLine("Set the resource class name, ( HelloResource ): ");
-        if (className == null || className.length() == 0)
-            className = defaultResourceName + ".HelloResource";
-        else {
-            className = defaultResourceName + "." + className;
-        }
-
-        if (resourcePath == null || resourcePath.length() == 0) {
-            resourcePath = shell.readLine("Set the resource path (" + getDerivedPath(className) + "): ");
-            if (resourcePath == null || resourcePath.length() == 0)
-                resourcePath = getDerivedPath(className);
-            if (!resourcePath.startsWith("/"))
-                resourcePath = "/" + resourcePath;
-        }
-
-    }
-
-    private static String getDerivedPath(String className) {
-        String[] resourceClassName = StringUtils.splitByCharacterTypeCamelCase(
-                className.substring(className.lastIndexOf(".") + 1));
-        return "/" + resourceClassName[0].toLowerCase();
-    }
-
-    private List<Extension> getAllExtensions(QuarkusProject quarkusProject) throws IOException {
-        return quarkusProject.getPlatformDescriptor().getExtensions();
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeCommand.java
deleted file mode 100644
index c84beaaadb17e..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeCommand.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.aesh.command.Command;
-import org.aesh.command.CommandDefinition;
-import org.aesh.command.CommandException;
-import org.aesh.command.CommandNotFoundException;
-import org.aesh.command.CommandResult;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Argument;
-import org.aesh.command.option.Option;
-import org.aesh.command.option.OptionList;
-import org.aesh.command.parser.CommandLineParserException;
-import org.aesh.command.validator.CommandValidatorException;
-import org.aesh.command.validator.OptionValidatorException;
-
-import io.quarkus.devtools.project.BuildTool;
-
-@CommandDefinition(name = "dev", description = "Starts up a development mode process for a Quarkus project.")
-public class DevModeCommand implements Command<CommandInvocation> {
-
-    @Option(shortName = 'd', completer = DevModeDebugCompleter.class, defaultValue = {
-            "true" }, validator = DevModeDebugValidator.class, description = "If this server should be started in debug mode. "
-                    +
-                    "The default is to start in debug mode without suspending and listen on port 5005." +
-                    " It supports the following options:\n" +
-                    " \"false\" - The JVM is not started in debug mode\n" +
-                    " \"true\" - The JVM is started in debug mode and suspends until a debugger is attached to port 5005\n" +
-                    " \"client\" - The JVM is started in client mode, and attempts to connect to localhost:5005\n" +
-                    "\"{port}\" - The JVM is started in debug mode and suspends until a debugger is attached to {port}")
-    private String debug;
-
-    @Option(shortName = 'u', hasValue = false, name = "suspend", description = "Whether or not the JVM launch, in debug mode, should be suspended."
-            + "This parameter is only relevant when the JVM is launched in debug mode.")
-    private boolean suspend;
-
-    @Option(shortName = 'b', name = "build", description = "Build folder, if not set the default folder for the used build tool will be used")
-    private File buildDir;
-
-    @Option(shortName = 's', name = "source", description = "Source folder, if not set the default folder for the used build tool will be used")
-    private File sourceDir;
-
-    @Option(name = "jvm-args", shortName = 'j', description = "JVM arguments to the dev mode process")
-    private String jvmArgs;
-
-    @Option(name = "delete-dev-jar", shortName = 'e', hasValue = false, defaultValue = {
-            "true" }, description = "Delete the dev jar after it finishes")
-    private boolean deleteDevJar;
-
-    @Option(name = "prevent-no-verify", shortName = 'p', defaultValue = {
-            "false" }, hasValue = false, description = "This value is intended to be set to true when some generated bytecode is eroneous causing "
-                    + " the JVM to crash when the verify:non option is set (which is on by default).")
-    private boolean preventNoVerify;
-
-    @Option(name = "no-deps", shortName = 'n', hasValue = false, defaultValue = {
-            "false" }, description = "Whether changes in the projects that appear to be dependencies of the project containing the "
-                    + " application to be launched should trigger hot-reload. By default they do.")
-
-    @OptionList(name = "compiler-args", shortName = 'c', description = "Additional parameters to pass to javac when recompiling changed source files.")
-    private List<String> compilerArgs;
-
-    @Argument(description = "Path to the project, if not set it will use the current working directory")
-    private File projectPath;
-
-    private BuildTool buildTool;
-    private File buildFile;
-
-    @Override
-    public CommandResult execute(CommandInvocation invocation) throws CommandException, InterruptedException {
-
-        if (!verifyProjectStatus(invocation))
-            return CommandResult.FAILURE;
-
-        try {
-            devMode(invocation);
-        } catch (InterruptedException i) {
-            invocation.println("Stopping dev-mode");
-        }
-
-        return CommandResult.SUCCESS;
-    }
-
-    private void devMode(CommandInvocation invocation) throws InterruptedException {
-        if (buildTool.equals(BuildTool.MAVEN)) {
-            File wrapper = ExecuteUtil.getMavenWrapper(projectPath.getAbsolutePath());
-            if (wrapper != null) {
-                ExecuteUtil.executeWrapper(invocation, wrapper, "quarkus:dev");
-            } else {
-                ExecuteUtil.executeMaven(projectPath, invocation, "quarkus:dev");
-            }
-
-        }
-        //do gradle
-        else {
-            File wrapper = ExecuteUtil.getGradleWrapper(projectPath.getAbsolutePath());
-            if (wrapper != null) {
-                ExecuteUtil.executeWrapper(invocation, wrapper, "quarkusDev");
-            } else {
-                ExecuteUtil.executeGradle(projectPath, invocation, "quarkusDev");
-            }
-        }
-    }
-
-    private boolean verifyProjectStatus(CommandInvocation invocation) {
-
-        if (projectPath == null)
-            projectPath = new File(System.getProperty("user.dir"));
-
-        buildTool = BuildTool.resolveExistingProject(projectPath.toPath());
-
-        if (buildTool.getBuildFiles().length > 0)
-            buildFile = new File(buildTool.getBuildFiles()[0]);
-
-        if (buildFile == null || !buildFile.isFile()) {
-            invocation.println("Was not able to find a build file in: " + projectPath);
-            return false;
-        }
-
-        if (buildDir == null)
-            buildDir = new File(buildTool.getBuildDirectory());
-
-        if (sourceDir == null)
-            sourceDir = resolveSourceDir();
-
-        if (!sourceDir.isDirectory()) {
-            invocation.println("ERROR: The project's sources directory does not exists (" + sourceDir);
-            return false;
-        }
-
-        if (!buildDir.isDirectory() || !new File(buildDir, "classes").isDirectory()) {
-            invocation.println("Build directory (" + buildDir + " wasn't found. Compiling...");
-            //if we run interactive, the name is 'compile-project', otherwise it's 'quarkus compile-project'
-            try {
-                invocation.executeCommand("compile-project");
-            } catch (CommandNotFoundException e) {
-                try {
-                    invocation.executeCommand("quarkus compile-project");
-                } catch (CommandNotFoundException | CommandLineParserException | OptionValidatorException
-                        | CommandValidatorException | CommandException | InterruptedException | IOException e2) {
-                    invocation.println("Failure during compile, aborting: " + e2.getMessage());
-                    return false;
-                }
-            } catch (CommandLineParserException | OptionValidatorException
-                    | CommandValidatorException | CommandException | InterruptedException | IOException e) {
-                invocation.println("Failure during compile, aborting: " + e.getMessage());
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private File resolveSourceDir() {
-        return new File(projectPath.getAbsolutePath() + File.separatorChar + "src"
-                + File.separatorChar + "main" + File.separatorChar + "java");
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeDebugCompleter.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeDebugCompleter.java
deleted file mode 100644
index b3bb9d03bee55..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeDebugCompleter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.quarkus.cli.commands;
-
-import org.aesh.command.completer.CompleterInvocation;
-import org.aesh.command.completer.OptionCompleter;
-
-public class DevModeDebugCompleter implements OptionCompleter<CompleterInvocation> {
-    @Override
-    public void complete(CompleterInvocation invocation) {
-        if (invocation.getGivenCompleteValue() == null || invocation.getGivenCompleteValue().length() == 0) {
-            invocation.addCompleterValue("false");
-            invocation.addCompleterValue("true");
-            invocation.addCompleterValue("client");
-            invocation.addCompleterValue("{port}");
-        } else {
-            if ("false".startsWith(invocation.getGivenCompleteValue()))
-                invocation.addCompleterValue("false");
-            else if ("true".startsWith(invocation.getGivenCompleteValue()))
-                invocation.addCompleterValue("true");
-            else if ("client".startsWith(invocation.getGivenCompleteValue()))
-                invocation.addCompleterValue("client");
-        }
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeDebugValidator.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeDebugValidator.java
deleted file mode 100644
index 69af1e0d5e63d..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/DevModeDebugValidator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.quarkus.cli.commands;
-
-import org.aesh.command.validator.OptionValidator;
-import org.aesh.command.validator.OptionValidatorException;
-import org.aesh.command.validator.ValidatorInvocation;
-
-public class DevModeDebugValidator implements OptionValidator<ValidatorInvocation<String, DevModeCommand>> {
-    @Override
-    public void validate(ValidatorInvocation<String, DevModeCommand> invocation) throws OptionValidatorException {
-        if (!invocation.getValue().equals("true") ||
-                !invocation.getValue().equals("false") ||
-                !invocation.getValue().equals("client")) {
-            //finally check if the value is a number
-            try {
-                Integer.parseInt(invocation.getValue());
-            } catch (NumberFormatException nfe) {
-                throw new OptionValidatorException("The debug option need to be either: true, false, client or a port number");
-            }
-        }
-
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExecuteUtil.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExecuteUtil.java
deleted file mode 100644
index 4a616f41f191d..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExecuteUtil.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-import org.aesh.command.invocation.CommandInvocation;
-import org.apache.maven.shared.invoker.DefaultInvocationRequest;
-import org.apache.maven.shared.invoker.DefaultInvoker;
-import org.apache.maven.shared.invoker.InvocationRequest;
-import org.apache.maven.shared.invoker.InvocationResult;
-import org.apache.maven.shared.invoker.Invoker;
-import org.apache.maven.shared.invoker.MavenInvocationException;
-
-public class ExecuteUtil {
-
-    public static void executeGradle(File projectDirectory, CommandInvocation invocation, String buildTarget)
-            throws InterruptedException {
-        String gradleExecutable = findExecutable("gradle");
-        if (gradleExecutable == null) {
-            invocation.println("unable to find the gradle executable, is it in your path?");
-        } else {
-            gradleExecutable += File.separator + "bin" + File.separator + "gradle";
-
-            try {
-                Process process = new ProcessBuilder()
-                        .command(gradleExecutable, buildTarget)
-                        .directory(projectDirectory)
-                        .start();
-
-                BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    invocation.println(line);
-                }
-
-                int exit = process.waitFor();
-                if (exit != 0)
-                    invocation.println("Build failed.");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static void executeMaven(File projectDirectory, CommandInvocation invocation, String buildTarget) {
-        String mvnPath = findExecutable("mvn");
-        System.setProperty("maven.home", mvnPath);
-
-        InvocationRequest request = new DefaultInvocationRequest();
-        request.setPomFile(new File(projectDirectory.getAbsolutePath() + File.separatorChar + "pom.xml"));
-        request.setGoals(Collections.singletonList(buildTarget));
-
-        Invoker invoker = new DefaultInvoker();
-
-        InvocationResult result = null;
-        try {
-            result = invoker.execute(request);
-        } catch (MavenInvocationException e) {
-            invocation.println("Failed during invocation: " + e.getMessage());
-        }
-
-        if (result.getExitCode() != 0) {
-            invocation.println("Build failed.");
-        }
-    }
-
-    public static String findExecutable(String exec) {
-        Optional<Path> mvnPath = Stream.of(System.getenv("PATH").split(Pattern.quote(File.pathSeparator)))
-                .map(Paths::get)
-                .filter(path -> Files.exists(path.resolve(exec))).findFirst();
-
-        return mvnPath.map(value -> value.getParent().toString()).orElse(null);
-    }
-
-    public static void executeWrapper(CommandInvocation invocation, File wrapper, String target) throws InterruptedException {
-        try {
-            Process process = new ProcessBuilder()
-                    .command("./" + wrapper.getName(), target)
-                    .directory(wrapper.getParentFile())
-                    .start();
-
-            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-
-            String line;
-            while ((line = reader.readLine()) != null) {
-                invocation.println(line);
-            }
-
-            int exit = process.waitFor();
-            if (exit != 0)
-                invocation.println("Build failed.");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static File getGradleWrapper(String projectPath) {
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            File wrapper = new File(projectPath + File.separator + "gradlew.bat");
-            if (wrapper.isFile())
-                return wrapper;
-        } else {
-            File wrapper = new File(projectPath + File.separator + "gradlew");
-            if (wrapper.isFile())
-                return wrapper;
-        }
-
-        return null;
-    }
-
-    public static File getMavenWrapper(String projectPath) {
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            File wrapper = new File(projectPath + File.separator + "mvnw.bat");
-            if (wrapper.isFile())
-                return wrapper;
-        } else {
-            File wrapper = new File(projectPath + File.separator + "mvnw");
-            if (wrapper.isFile())
-                return wrapper;
-        }
-
-        return null;
-    }
-
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExtensionCompleter.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExtensionCompleter.java
deleted file mode 100644
index a067f551114b3..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExtensionCompleter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.aesh.command.completer.CompleterInvocation;
-import org.aesh.command.completer.OptionCompleter;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-
-public class ExtensionCompleter implements OptionCompleter<CompleterInvocation> {
-
-    @Override
-    public void complete(CompleterInvocation invocation) {
-        if (invocation.getGivenCompleteValue().length() == 0) {
-            invocation.addAllCompleterValues(
-                    getAllExtensions().stream().map(Extension::getSimplifiedArtifactId).collect(Collectors.toList()));
-        } else {
-            for (Extension loadExtension : getAllExtensions()) {
-                if (loadExtension.getSimplifiedArtifactId().startsWith(invocation.getGivenCompleteValue()))
-                    invocation.addCompleterValue(loadExtension.getSimplifiedArtifactId());
-            }
-        }
-    }
-
-    private List<Extension> getAllExtensions() {
-        return QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor().getExtensions();
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExtensionFormat.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExtensionFormat.java
deleted file mode 100644
index dd7527701775b..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ExtensionFormat.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.cli.commands;
-
-public enum ExtensionFormat {
-    CONCISE("concise"),
-    NAME("name"),
-    FULL("full");
-
-    private final String format;
-
-    ExtensionFormat(String format) {
-        this.format = format;
-    }
-
-    public String formatValue() {
-        return format;
-    }
-
-    public static ExtensionFormat findFormat(String format) {
-        if (format.equalsIgnoreCase(FULL.format))
-            return FULL;
-        else if (format.equalsIgnoreCase(NAME.format))
-            return NAME;
-        else
-            return CONCISE;
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/FormatCompleter.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/FormatCompleter.java
deleted file mode 100644
index 75d2f1de4e5b5..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/FormatCompleter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.cli.commands;
-
-import org.aesh.command.completer.CompleterInvocation;
-import org.aesh.command.completer.OptionCompleter;
-
-public class FormatCompleter implements OptionCompleter<CompleterInvocation> {
-
-    @Override
-    public void complete(CompleterInvocation invocation) {
-        if (invocation.getGivenCompleteValue().length() == 0) {
-            for (ExtensionFormat format : ExtensionFormat.values())
-                invocation.addCompleterValue(format.formatValue());
-        } else {
-            for (ExtensionFormat format : ExtensionFormat.values()) {
-                if (format.formatValue().startsWith(invocation.getGivenCompleteValue()))
-                    invocation.addCompleterValue(format.formatValue());
-            }
-        }
-
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/FormatConverter.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/FormatConverter.java
deleted file mode 100644
index 017c806df2910..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/FormatConverter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.quarkus.cli.commands;
-
-import org.aesh.command.converter.Converter;
-import org.aesh.command.converter.ConverterInvocation;
-import org.aesh.command.validator.OptionValidatorException;
-
-public class FormatConverter implements Converter<ExtensionFormat, ConverterInvocation> {
-    @Override
-    public ExtensionFormat convert(ConverterInvocation converterInvocation) throws OptionValidatorException {
-        if (converterInvocation.getInput() != null && converterInvocation.getInput().length() > 0)
-            return ExtensionFormat.findFormat(converterInvocation.getInput());
-
-        return ExtensionFormat.CONCISE;
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java
deleted file mode 100644
index 168da6237b02f..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ListExtensionsCommand.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.aesh.command.Command;
-import org.aesh.command.CommandDefinition;
-import org.aesh.command.CommandException;
-import org.aesh.command.CommandResult;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Option;
-import org.aesh.io.Resource;
-import org.aesh.selector.SelectorType;
-
-import io.quarkus.devtools.commands.ListExtensions;
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-
-@CommandDefinition(name = "list", generateHelp = true, description = "List extensions for a project")
-public class ListExtensionsCommand implements Command<CommandInvocation> {
-
-    @Option(shortName = 'a', hasValue = false, description = "Display all or just the installable extensions.")
-    private boolean all = false;
-
-    @Option(shortName = 'f', selector = SelectorType.SELECT, completer = FormatCompleter.class, converter = FormatConverter.class, description = "Select the output format among:\n"
-            +
-            "'name' - display the name only\n" +
-            "'concise' - (display name and description\n" +
-            "'full' - (concise format and version related columns.\n")
-    private ExtensionFormat format;
-
-    @Option(shortName = 's', hasValue = true, defaultValue = {
-            "*" }, description = "Search filter on extension list. The format is based on Java Pattern.")
-    private String searchPattern;
-
-    @Option(shortName = 'p', description = "Path to the project, if not set it will use the current working directory")
-    private Resource path;
-
-    public CommandResult execute(CommandInvocation commandInvocation) throws CommandException, InterruptedException {
-        try {
-            Path projectDirectory = path != null ? Paths.get(path.getAbsolutePath())
-                    : Paths.get(System.getProperty("user.dir"));
-
-            new ListExtensions(QuarkusProject.resolveExistingProject(projectDirectory,
-                    QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor()))
-                            .all(all)
-                            .format(format.formatValue())
-                            .search(searchPattern)
-                            .execute();
-        } catch (QuarkusCommandException e) {
-            e.printStackTrace();
-        }
-        return CommandResult.SUCCESS;
-    }
-
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ProjectTypeCompleter.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/ProjectTypeCompleter.java
deleted file mode 100644
index 61f348e08bf38..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/ProjectTypeCompleter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import org.aesh.command.completer.CompleterInvocation;
-import org.aesh.command.completer.OptionCompleter;
-
-import io.quarkus.devtools.project.BuildTool;
-
-public class ProjectTypeCompleter implements OptionCompleter<CompleterInvocation> {
-
-    @Override
-    public void complete(CompleterInvocation invocation) {
-        if (invocation.getGivenCompleteValue().length() == 0)
-            invocation.addAllCompleterValues(
-                    Arrays.stream(BuildTool.values()).map(BuildTool::name).collect(Collectors.toList()));
-        else {
-            for (BuildTool tool : BuildTool.values()) {
-                if (tool.name().startsWith(invocation.getGivenCompleteValue()))
-                    invocation.addCompleterValue(tool.name());
-                else if (tool.name().toLowerCase().startsWith(invocation.getGivenCompleteValue()))
-                    invocation.addCompleterValue(tool.name().toLowerCase());
-            }
-        }
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusBaseCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusBaseCommand.java
deleted file mode 100644
index 6cf383de0df86..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/QuarkusBaseCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.quarkus.cli.commands;
-
-import org.aesh.AeshConsoleRunner;
-import org.aesh.command.Command;
-import org.aesh.command.CommandResult;
-import org.aesh.command.GroupCommandDefinition;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Option;
-import org.aesh.terminal.utils.Config;
-
-@GroupCommandDefinition(name = QuarkusBaseCommand.COMMAND_NAME, generateHelp = true, groupCommands = {
-        ListExtensionsCommand.class,
-        AddExtensionsCommand.class,
-        CreateProjectCommand.class,
-        DevModeCommand.class,
-        CompileProjectCommand.class }, description = "<command> [<args>] \n\nThese are the common quarkus commands used in various situations")
-public class QuarkusBaseCommand implements Command<CommandInvocation> {
-    public static final String COMMAND_NAME = "quarkus";
-
-    @Option(shortName = 'i', hasValue = false, description = "Starts an interactive Quarkus Shell")
-    private boolean interactive;
-
-    public CommandResult execute(CommandInvocation commandInvocation) {
-        if (interactive) {
-            commandInvocation.println("Starting interactive CLI....");
-            //we need to stop first since the QuarkusCli starts the runner with interactive = true
-            commandInvocation.stop();
-            startInteractive();
-        }
-
-        return CommandResult.SUCCESS;
-    }
-
-    private void startInteractive() {
-        //we start the CLI in a new thread since the caller has a TerminalConnection open
-        Runnable runnable = () -> {
-            AeshConsoleRunner.builder()
-                    .command(CreateProjectCommand.class)
-                    .command(AddExtensionsCommand.class)
-                    .command(ListExtensionsCommand.class)
-                    .command(DevModeCommand.class)
-                    .command(CompileProjectCommand.class)
-                    .prompt("[quarkus@" + Config.getUserDir() + "]$ ")
-                    .addExitCommand()
-                    .start();
-        };
-        new Thread(runnable).start();
-    }
-}
diff --git a/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java b/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java
deleted file mode 100644
index 45a40b8f81a69..0000000000000
--- a/devtools/aesh/src/main/java/io/quarkus/cli/commands/RemoveExtensionCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.quarkus.cli.commands;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-
-import org.aesh.command.Command;
-import org.aesh.command.CommandDefinition;
-import org.aesh.command.CommandException;
-import org.aesh.command.CommandResult;
-import org.aesh.command.invocation.CommandInvocation;
-import org.aesh.command.option.Argument;
-import org.aesh.command.option.Option;
-import org.aesh.io.Resource;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.commands.RemoveExtensions;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-
-@CommandDefinition(name = "remove-extension", description = "Remove extension from a project")
-public class RemoveExtensionCommand implements Command<CommandInvocation> {
-
-    @Option(shortName = 'h', hasValue = false, overrideRequired = true)
-    private boolean help;
-
-    @Option(shortName = 'e', required = true, description = "Name of the extension that will be removed from the project")
-    private String extension;
-
-    @Argument(description = "path to the project", required = true)
-    private Resource path;
-
-    @Override
-    public CommandResult execute(CommandInvocation commandInvocation) throws CommandException, InterruptedException {
-        if (help) {
-            commandInvocation.println(commandInvocation.getHelpInfo("quarkus remove-extension"));
-            return CommandResult.SUCCESS;
-        } else {
-
-            final QuarkusPlatformDescriptor platformDescr = QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor();
-            if (!findExtension(extension, platformDescr.getExtensions())) {
-                commandInvocation.println("Can not find any extension named: " + extension);
-                return CommandResult.SUCCESS;
-            }
-            try {
-                final Path projectPath = Paths.get(path.getAbsolutePath());
-                RemoveExtensions project = new RemoveExtensions(QuarkusProject.resolveExistingProject(projectPath,
-                        platformDescr)).extensions(Collections.singleton(extension));
-                QuarkusCommandOutcome result = project.execute();
-                if (!result.isSuccess()) {
-                    throw new CommandException("Unable to remove an extension matching " + extension);
-                }
-            } catch (Exception e) {
-                throw new CommandException("Unable to remove an extension matching " + extension, e);
-            }
-        }
-
-        return CommandResult.SUCCESS;
-    }
-
-    private boolean findExtension(String name, List<Extension> extensions) {
-        for (Extension ext : extensions) {
-            if (ext.getName().equalsIgnoreCase(name)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
index 74b59fdc1bff4..348d3c8d8f245 100644
--- a/devtools/bom-descriptor-json/pom.xml
+++ b/devtools/bom-descriptor-json/pom.xml
@@ -6,31 +6,58 @@
         <artifactId>quarkus-devtools-all</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-bom-descriptor-json</artifactId>
+    <artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
     <packaging>pom</packaging>
     <name>Quarkus - BOM - Descriptor JSON</name>
 
-    <dependencies>
-    </dependencies>
+    <properties>
+        <pluginPhase>process-resources</pluginPhase>
+    </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-platform-descriptor-json-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
-                        <phase>process-resources</phase>
+                        <phase>${pluginPhase}</phase>
                         <goals>
-                            <goal>generate-extensions-json</goal>
+                            <!-- goal>generate-extensions-json</goal -->
+                            <goal>generate-platform-descriptor-json</goal>
                         </goals>
                         <configuration>
+                            <ignoredGroupIds>
+                                <ignoredGroupId>software.amazon.awssdk</ignoredGroupId>
+                            </ignoredGroupIds>
                             <bomArtifactId>quarkus-bom</bomArtifactId>
+                            <resolveDependencyManagement>true</resolveDependencyManagement>
+                            <overridesFile>${basedir}/target/resources/catalog-overrides.json</overridesFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -38,5 +65,2435 @@
         </plugins>
     </build>
 
+    <!-- This module is a bit special in that it needs to depend on all extensions to ensure a proper build order.
+         On the other hand for incremental builds, since all integration-tests depend on this module,
+         a change to a single extension would trigger all IT modules which is a huge drop of efficiency.
+         Therefore for incremental builds, via profiles, this module does not have any extension dependencies
+         and will also not generate/install the descriptor (the module is "hollowed out").
+         It is assumed that the descriptor has been installed before in a consistent state (CI guarantees this)
+         and so all the IT modules will pick up that previously installed descriptor from the local repo.
+         Just skipping this module entirely in an incremental build is not an option since somthing in this module,
+         in quarkus-platform-descriptor-json-plugin or further upstream might have been changed, requiring all IT
+         modules to be built! -->
+
+    <profiles>
+        <profile>
+            <id>bom-descriptor-json-hollow</id>
+            <activation>
+                <property>
+                    <name>incremental</name>
+                </property>
+            </activation>
+            <properties>
+                <pluginPhase>none</pluginPhase>
+                <maven.install.skip>true</maven.install.skip>
+            </properties>
+        </profile>
+        <profile>
+            <id>bom-descriptor-json-deps</id>
+            <activation>
+                <property>
+                    <name>!incremental</name>
+                </property>
+            </activation>
+            <dependencies>
+                <!-- Minimal test dependencies for consistent build order -->
+                <!-- START update-extension-dependencies.sh -->
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-agroal</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-alexa</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-dynamodb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-iam</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-kms</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-lambda</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-lambda-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-lambda-http</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-lambda-rest</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-lambda-xray</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-s3</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-ses</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-sns</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-amazon-sqs</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-arc</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-artemis-core</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-artemis-jms</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-avro</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-azure-functions-http</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-cache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-caffeine</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-config-yaml</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-consul-config</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-container-image</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-container-image-docker</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-container-image-jib</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-container-image-openshift</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-container-image-s2i</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-core</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-datasource</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elasticsearch-rest-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elasticsearch-rest-client-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elasticsearch-rest-high-level-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elytron-security</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elytron-security-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elytron-security-jdbc</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elytron-security-ldap</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elytron-security-oauth2</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-elytron-security-properties-file</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-flyway</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-funqy-amazon-lambda</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-funqy-google-cloud-functions</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-funqy-http</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-funqy-knative-events</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-funqy-server-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-google-cloud-functions</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-google-cloud-functions-http</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-grpc</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-grpc-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-envers</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-orm</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-orm-panache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-orm-panache-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-orm-panache-kotlin</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-orm-rest-data-panache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-reactive</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-reactive-panache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-reactive-panache-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-validator</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-infinispan-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jackson</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jacoco</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jaeger</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jaxb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jaxp</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jaxrs-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-db2</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-derby</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-h2</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-mariadb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-mssql</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-mysql</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-postgresql</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jgit</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jsch</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jsonb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jsonp</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kafka-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kafka-streams</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-keycloak-admin-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-keycloak-authorization</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kotlin</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kubernetes</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kubernetes-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kubernetes-config</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-kubernetes-service-binding</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-liquibase</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-logging-gelf</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-logging-json</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-logging-sentry</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mailer</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-micrometer</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-minikube</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mongodb-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mongodb-panache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mongodb-panache-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mongodb-panache-kotlin</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mongodb-rest-data-panache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mutiny</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-mutiny-reactive-streams-operators</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-narayana-jta</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-narayana-stm</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-neo4j</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-netty</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-oidc</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-oidc-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-oidc-client-filter</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-oidc-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-oidc-token-propagation</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-openshift</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-openshift-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-picocli</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-quartz</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-qute</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-reactive-datasource</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-reactive-db2-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-reactive-messaging-http</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-reactive-mysql-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-reactive-pg-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-redis-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-rest-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-rest-client-jackson</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-rest-client-jaxb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-rest-client-jsonb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-rest-client-mutiny</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-rest-client-reactive</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-jackson</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-jaxb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-jsonb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-multipart</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-mutiny</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-mutiny-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-qute</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-reactive</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-reactive-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-reactive-qute</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-reactive-servlet</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-resteasy-server-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-scala</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-scheduler</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-security</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-security-jpa</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-context-propagation</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-fault-tolerance</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-graphql</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-health</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-jwt</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-jwt-build</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-metrics</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-openapi</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-opentracing</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-reactive-messaging</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-reactive-messaging-amqp</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-reactive-messaging-mqtt</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-reactive-streams-operators</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-smallrye-reactive-type-converters</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-boot-properties</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-cache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-cloud-config-client</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-data-jpa</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-data-rest</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-di</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-scheduled</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-security</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-spring-web</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-swagger-ui</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-tika</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-undertow</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-vault</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-vertx</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-vertx-core</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-vertx-graphql</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-vertx-http</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-vertx-web</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-webjars-locator</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-websockets</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <!-- END update-extension-dependencies.sh -->
+            </dependencies>
+        </profile>
+    </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json b/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
new file mode 100644
index 0000000000000..7005885428673
--- /dev/null
+++ b/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
@@ -0,0 +1,144 @@
+{
+  "categories": [
+    {
+      "name": "Web",
+      "id": "web",
+      "description": "Everything you need for REST endpoints, HTTP and web formats like JSON",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-resteasy",
+          "io.quarkus:quarkus-resteasy-jackson",
+          "io.quarkus:quarkus-resteasy-jsonb"
+        ]
+      }
+    },
+    {
+      "name": "Data",
+      "id": "data",
+      "description": "Accessing and managing your data (RDBMS, NoSQL, caching, transaction management, etc)",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-hibernate-orm",
+          "io.quarkus:quarkus-hibernate-orm-panache",
+          "io.quarkus:quarkus-jdbc-postgresql",
+          "io.quarkus:quarkus-jdbc-mariadb",
+          "io.quarkus:quarkus-jdbc-mysql",
+          "io.quarkus:quarkus-jdbc-mssql",
+          "io.quarkus:quarkus-jdbc-db2",
+          "io.quarkus:quarkus-jdbc-h2",
+          "io.quarkus:quarkus-jdbc-derby"
+        ]
+      }
+    },
+    {
+      "name": "Messaging",
+      "id": "messaging",
+      "description": "Send and receives message to various messaging systems (AMQP, KAfka etc)",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-smallrye-reactive-messaging",
+          "io.quarkus:quarkus-smallrye-reactive-messaging-amqp",
+          "io.quarkus:quarkus-smallrye-reactive-messaging-kafka",
+          "io.quarkus:quarkus-smallrye-reactive-messaging-mqtt"
+        ]
+      }
+    },
+    {
+      "name": "Core",
+      "id": "core",
+      "description": "Core Quarkus components: engine, logging, etc.",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-config-yaml",
+          "io.quarkus:quarkus-logging-json"
+        ]
+      }
+    },
+    {
+      "name": "Reactive",
+      "id": "reactive",
+      "description": "Non blocking stack and connectors",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-vertx",
+          "io.quarkus:quarkus-mutiny"
+        ]
+      }
+    },
+    {
+      "name": "Cloud",
+      "id": "cloud",
+      "description": "Useful for Cloud Native deployments platforms like Kubernetes and cloud providers",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-kubernetes",
+          "io.quarkus:quarkus-openshift",
+          "io.quarkus:quarkus-smallrye-health",
+          "io.quarkus:quarkus-smallrye-fault-tolerance"
+        ]
+      }
+    },
+    {
+      "name": "Observability",
+      "id": "observability",
+      "description": "Metrics, tracing, etc"
+    },
+    {
+      "name": "Security",
+      "id": "security",
+      "description": "Everything you need to secure your application",
+      "metadata": {
+        "pinned": [
+          "io.quarkus:quarkus-oidc",
+          "io.quarkus:quarkus-smallrye-jwt"
+        ]
+      }
+    },
+    {
+      "name": "Serialization",
+      "id": "serialization",
+      "description": "Serializing and deserializing various formats"
+    },
+    {
+      "name": "Miscellaneous",
+      "id": "miscellaneous",
+      "description": "Mixed bag of good stuff"
+    },
+    {
+      "name": "Compatibility",
+      "id": "compatibility",
+      "description": "Support for alternative programming models on Quarkus"
+    },
+    {
+      "name": "Alternative languages",
+      "id": "alt-languages",
+      "description": "Support for other JVM based languages"
+    }
+  ],
+  "metadata":{
+    "project": {
+      "properties": {
+        "doc-root": "https://quarkus.io",
+        "rest-assured-version": "${rest-assured.version}",
+        "compiler-plugin-version": "${compiler-plugin.version}",
+        "surefire-plugin-version": "${version.surefire.plugin}",
+        "kotlin-version": "${kotlin.version}",
+        "scala-version": "${scala.version}",
+        "scala-plugin-version": "${scala-plugin.version}",
+        "quarkus-core-version": "${project.version}",
+        "maven-plugin-groupId": "${project.groupId}",
+        "maven-plugin-artifactId": "quarkus-maven-plugin",
+        "maven-plugin-version": "${project.version}",
+        "gradle-plugin-id": "io.quarkus",
+        "gradle-plugin-version": "${project.version}",
+        "supported-maven-versions": "${supported-maven-versions}",
+        "proposed-maven-version": "${proposed-maven-version}",
+        "maven-wrapper-version": "${maven-wrapper.version}",
+        "gradle-wrapper-version": "${gradle-wrapper.version}"
+      }
+    },
+    "codestarts-artifacts": [
+      "${project.groupId}:quarkus-platform-descriptor-json::jar:${project.version}"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/devtools/bom-descriptor-json/src/main/resources/extensions-overrides.json b/devtools/bom-descriptor-json/src/main/resources/extensions-overrides.json
deleted file mode 100644
index 53c32b86548ac..0000000000000
--- a/devtools/bom-descriptor-json/src/main/resources/extensions-overrides.json
+++ /dev/null
@@ -1,411 +0,0 @@
-{
-  "categories": [
-    {
-      "name": "Core",
-      "id": "core",
-      "description": "Essential Quarkus components. Provided automatically"
-    },
-    {
-      "name": "Web",
-      "id": "web",
-      "description": "Everything you need for REST endpoints, HTTP and web formats like JSON",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-resteasy",
-          "io.quarkus:quarkus-resteasy-jsonb",
-          "io.quarkus:quarkus-resteasy-jackson"
-        ]
-      }
-    },
-    {
-      "name": "Data",
-      "id": "data",
-      "description": "Accessing and managing your data (RDBMS, NoSQL, caching, transaction management, etc)",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-hibernate-orm",
-          "io.quarkus:quarkus-hibernate-orm-panache",
-          "io.quarkus:quarkus-jdbc-postgresql",
-          "io.quarkus:quarkus-jdbc-mariadb",
-          "io.quarkus:quarkus-jdbc-mysql",
-          "io.quarkus:quarkus-jdbc-mssql",
-          "io.quarkus:quarkus-jdbc-h2",
-          "io.quarkus:quarkus-jdbc-derby"
-        ]
-      }
-    },
-    {
-      "name": "Messaging",
-      "id": "messaging",
-      "description": "Send and receives message to various messaging ssytems (AMQP, KAfka etc)",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-smallrye-reactive-messaging",
-          "io.quarkus:quarkus-smallrye-reactive-messaging-amqp",
-          "io.quarkus:quarkus-smallrye-reactive-messaging-kafka",
-          "io.quarkus:quarkus-smallrye-reactive-messaging-mqtt"
-        ]
-      }
-    },
-    {
-      "name": "Reactive",
-      "id": "reactive",
-      "description": "Non blocking stack and connectors",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-vertx"
-        ]
-      }
-    },
-    {
-      "name": "Cloud",
-      "id": "cloud",
-      "description": "Useful for Cloud Native deployments platforms like Kubernetes and cloud providers",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-kubernetes",
-          "io.quarkus:quarkus-smallrye-health",
-          "io.quarkus:quarkus-smallrye-fault-tolerance"
-        ]
-      }
-    },
-    {
-      "name": "Observability",
-      "id": "observability",
-      "description": "Metrics, tracing, etc"
-    },
-    {
-      "name": "Security",
-      "id": "security",
-      "description": "Everything you need to secure your application",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-oidc",
-          "io.quarkus:quarkus-smallrye-jwt"
-        ]
-      }
-    },
-    {
-      "name": "Integration",
-      "id": "integration",
-      "description": "Connectors to read to write from a skew of systems (file, S#, Twitter, etc)",
-      "metadata": {
-        "pinned": [
-          "org.apache.camel.quarkus:camel-quarkus-core",
-          "org.apache.camel.quarkus:camel-quarkus-core-xml"
-        ]
-      }
-    },
-    {
-      "name": "gRPC",
-      "id": "grpc",
-      "description": "gRPC integration",
-      "metadata": {
-        "pinned": [
-          "io.quarkus:quarkus-grpc"
-        ]
-      }
-    },
-    {
-      "name": "Business Automation",
-      "id": "business-automation",
-      "description": "Rules engine, BPM, etc"
-    },
-    {
-      "name": "Serialization",
-      "id": "serialization",
-      "description": "Serializing and deserializing various formats"
-    },
-    {
-      "name": "Miscellaneous",
-      "id": "miscellaneous",
-      "description": "Mixed bag of good stuff"
-    },
-    {
-      "name": "Compatibility",
-      "id": "compatibility",
-      "description": "Support for alternative programming models on Quarkus"
-    },
-    {
-      "name": "Alternative languages",
-      "id": "alt-languages",
-      "description": "Support for other JVM based languages"
-    }
-  ],
-  "extensions": [
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-support-common",
-      "version": "0.3.1",
-      "description": "Camel Quarkus Support Common",
-      "metadata": {
-        "unlisted": true
-      }
-    },
-    {
-      "metadata": {
-        "unlisted": true
-      },
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-support-jetty",
-      "version": "0.3.1",
-      "description": "Camel Quarkus Support Jetty"
-    },
-    {
-      "metadata": {
-        "unlisted": true
-      },
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-support-xstream",
-      "version": "0.3.1",
-      "description": "Camel Quarkus Support XStream"
-    },
-    {
-      "metadata": {
-        "unlisted": true
-      },
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-support-xml",
-      "version": "0.3.1",
-      "description": "Camel Quarkus Support XML"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-core",
-      "version": "0.3.1",
-      "description": "The Camel Quarkus core module"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-core-cloud",
-      "version": "0.3.1",
-      "description": "The Camel Quarkus core cloud module"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-core-xml",
-      "version": "0.3.1",
-      "description": "Camel Quarkus core XML module"
-    },
-    {
-      "metadata": {
-        "unlisted": true
-      },
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-http-common",
-      "version": "0.3.1",
-      "description": "Camel Quarkus HTTP Common"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-aws-eks",
-      "version": "0.3.1",
-      "description": "A Camel Amazon EKS Web Service Component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-aws-s3",
-      "version": "0.3.1",
-      "description": "A Camel Amazon S3 Web Service Component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-aws-sqs",
-      "version": "0.3.1",
-      "description": "A Camel Amazon SQS Web Service Component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-aws-sns",
-      "version": "0.3.1",
-      "description": "A Camel Amazon SNS Web Service Component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-bean",
-      "version": "0.3.1",
-      "description": "Camel Bean component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-csv",
-      "version": "0.3.1",
-      "description": "Camel CSV data format support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-direct",
-      "version": "0.3.1",
-      "description": "Camel Direct component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-fhir",
-      "version": "0.3.1",
-      "description": "Camel FHIR HL7 support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-infinispan",
-      "version": "0.3.1",
-      "description": "Camel Infinispan support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-jackson",
-      "version": "0.3.1",
-      "description": "Camel Jackson support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-jdbc",
-      "version": "0.3.1",
-      "description": "Camel JDBC suppors"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-log",
-      "version": "0.3.1",
-      "description": "Camel Log component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-microprofile-health",
-      "version": "0.3.1",
-      "description": "Integration with the Quarkus MicroProfile Health extension"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-microprofile-metrics",
-      "version": "0.3.1",
-      "description": "Integration with the Quarkus MicroProfile Metrics extension"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-mail",
-      "version": "0.3.1",
-      "description": "Camel Mail support"
-    },
-    {
-      "name": "Camel Quarkus Netty HTTP",
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-netty-http",
-      "version": "0.3.1",
-      "description": "Camel Netty HTTP support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-opentracing",
-      "version": "0.3.1",
-      "description": "Distributed tracing using OpenTracing"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-paho",
-      "version": "0.3.1",
-      "description": "Camel Eclipse Paho support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-platform-http",
-      "version": "0.3.1",
-      "description": "HTTP platform component is used for integrating Camel HTTP with Quarkus HTTP layer"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-reactive-executor",
-      "version": "0.3.1",
-      "description": "Integrates Quarkus reactive executor with Camel"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-rest",
-      "version": "0.3.1",
-      "description": "Camel REST component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-salesforce",
-      "version": "0.3.1",
-      "description": "Camel Salesforce support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-servlet",
-      "version": "0.3.1",
-      "description": "Camel servlet transport support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-slack",
-      "version": "0.3.1",
-      "description": "Camel Slack Support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-tarfile",
-      "version": "0.3.1",
-      "description": "Camel Tar file support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-timer",
-      "version": "0.3.1",
-      "description": "Camel Timer component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-twitter",
-      "version": "0.3.1",
-      "description": "Camel Twitter support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-vm",
-      "version": "0.3.1",
-      "description": "Camel VM component"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-zipfile",
-      "version": "0.3.1",
-      "description": "Camel Zip file support"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-attachments",
-      "version": "0.3.1",
-      "description": "Java Attachments support for Camel Message"
-    },
-    {
-      "group-id": "org.apache.camel.quarkus",
-      "artifact-id": "camel-quarkus-pdf",
-      "version": "0.3.1",
-      "description": "Camel PDF support"
-    },
-    {
-      "group-id": "org.kie.kogito",
-      "artifact-id": "kogito-quarkus",
-      "version": "0.8.0",
-      "description": "Kogito extension"
-    },
-    {
-      "group-id": "org.optaplanner",
-      "artifact-id": "optaplanner-quarkus",
-      "version": "7.39.0.CR1",
-      "description": "OptaPlanner extension"
-    },
-    {
-      "group-id": "org.optaplanner",
-      "artifact-id": "optaplanner-quarkus-jackson",
-      "version": "7.39.0.CR1",
-      "description": "OptaPlanner Jackson extension"
-    },
-    {
-      "group-id": "org.optaplanner",
-      "artifact-id": "optaplanner-quarkus-jsonb",
-      "version": "7.39.0.CR1",
-      "description": "OptaPlanner JSON-B extension"
-    }
-  ]
-}
diff --git a/devtools/cli/pom.xml b/devtools/cli/pom.xml
new file mode 100644
index 0000000000000..582a33a4e773b
--- /dev/null
+++ b/devtools/cli/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-cli</artifactId>
+    <name>Quarkus - Command Line Interface</name>
+    <description>Quarkus command line utility</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-picocli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-platform-descriptor-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-devtools</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- This dependency is here to make sure the build order is correct-->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-picocli-deployment</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
+                        </goals>
+                        <configuration>
+                            <skipOriginalJarRename>true</skipOriginalJarRename>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>
+                                            ${project.build.directory}/${project.build.finalName}-runner
+                                        </native.image.path>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Add.java b/devtools/cli/src/main/java/io/quarkus/cli/Add.java
new file mode 100644
index 0000000000000..8d811879d2256
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Add.java
@@ -0,0 +1,66 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.commands.AddExtensions;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "add", usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Add extension(s) to current project.")
+public class Add extends BaseSubCommand implements BuildsystemCommand {
+
+    @CommandLine.Parameters(arity = "1", paramLabel = "EXTENSION", description = "extensions to add to project")
+    Set<String> extensions;
+
+    @Override
+    public boolean aggregate(BuildTool buildtool) {
+        return buildtool != BuildTool.MAVEN;
+    }
+
+    @Override
+    public int execute(Path projectDir, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN) {
+            return addMaven(projectDir);
+        } else {
+            throw new IllegalStateException("Should be unreachable");
+        }
+    }
+
+    @Override
+    public List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN)
+            throw new IllegalStateException("Should be unreachable");
+        ArrayList<String> args = new ArrayList<>();
+        args.add("addExtension");
+        String param = "--extensions=" + String.join(",", extensions);
+        args.add(param);
+        return args;
+    }
+
+    private Integer addMaven(Path projectDirectory) {
+        try {
+            QuarkusProject quarkusProject = QuarkusProjectHelper.getProject(projectDirectory, QuarkusCliVersion.version());
+
+            AddExtensions project = new AddExtensions(quarkusProject);
+            project.extensions(extensions);
+
+            QuarkusCommandOutcome result = project.execute();
+            return result.isSuccess() ? CommandLine.ExitCode.OK : CommandLine.ExitCode.SOFTWARE;
+        } catch (Exception e) {
+            if (parent.showErrors)
+                e.printStackTrace(err());
+            err().println("Unable to add extension" + (extensions.size() > 1 ? "s" : "") + ": " + e.getMessage());
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Build.java b/devtools/cli/src/main/java/io/quarkus/cli/Build.java
new file mode 100644
index 0000000000000..2adf92062563a
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Build.java
@@ -0,0 +1,57 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.devtools.project.BuildTool;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "build", usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Build your quarkus project")
+public class Build extends BaseSubCommand implements BuildsystemCommand {
+
+    @CommandLine.Option(names = { "-n",
+            "--native" }, order = 4, description = "Build native executable.")
+    boolean isNative = false;
+
+    @CommandLine.Option(names = { "-s",
+            "--skip-tests" }, order = 5, description = "Skip tests.")
+    boolean skipTests = false;
+
+    @CommandLine.Option(names = { "--offline" }, order = 6, description = "Work offline.")
+    boolean offline = false;
+
+    @Override
+    public boolean aggregate(BuildTool buildtool) {
+        return true;
+    }
+
+    @Override
+    public List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        LinkedList<String> args = new LinkedList<>();
+        if (buildtool == BuildTool.MAVEN) {
+            args.add("install");
+            if (isNative)
+                args.add("-Dnative");
+            if (skipTests) {
+                args.add("-DskipTests");
+                args.add("-Dmaven.test.skip=true");
+            }
+            if (offline)
+                args.add("--offline");
+        } else {
+            args.add("build");
+            if (isNative)
+                args.add("-Dquarkus.package.type=native");
+            if (skipTests) {
+                args.add("-x");
+                args.add("test");
+            }
+            if (offline)
+                args.add("--offline");
+        }
+        return args;
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Clean.java b/devtools/cli/src/main/java/io/quarkus/cli/Clean.java
new file mode 100644
index 0000000000000..3a6e8c96d7e81
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Clean.java
@@ -0,0 +1,28 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.devtools.project.BuildTool;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "clean", usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Clean current project")
+public class Clean extends BaseSubCommand implements BuildsystemCommand {
+
+    @Override
+    public boolean aggregate(BuildTool buildtool) {
+        return true;
+    }
+
+    @Override
+    public List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN) {
+            return Collections.singletonList("clean");
+        } else {
+            return Collections.singletonList("clean");
+        }
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Create.java b/devtools/cli/src/main/java/io/quarkus/cli/Create.java
new file mode 100644
index 0000000000000..587b571642c6f
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Create.java
@@ -0,0 +1,145 @@
+package io.quarkus.cli;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.commands.CreateProject;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.project.codegen.SourceType;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "create", sortOptions = false, usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Create a new quarkus project.")
+public class Create extends BaseSubCommand implements Callable<Integer> {
+
+    @CommandLine.Option(names = { "-g",
+            "--group-id" }, order = 1, paramLabel = "GROUP-ID", description = "The groupId for project")
+    String groupId = "org.acme";
+
+    @CommandLine.Option(names = { "-a",
+            "--artifact-id" }, order = 2, paramLabel = "ARTIFACT-ID", description = "The artifactId for project")
+    String artifactId = "code-with-quarkus";
+
+    @CommandLine.Option(names = { "-v",
+            "--version" }, order = 3, paramLabel = "VERSION", description = "The version for project")
+    String version = "1.0.0-SNAPSHOT";
+
+    @CommandLine.Option(names = { "-0",
+            "--no-examples" }, order = 4, description = "Generate without example code.")
+    boolean noExamples = false;
+
+    @CommandLine.Option(names = { "-e",
+            "--examples" }, order = 4, description = "Choose which example(s) you want in the generated Quarkus application.")
+    Set<String> examples;
+
+    @CommandLine.ArgGroup()
+    TargetBuildTool targetBuildTool = new TargetBuildTool();
+
+    static class TargetBuildTool {
+        @CommandLine.Option(names = { "--maven" }, order = 5, description = "Create a Maven project. (default)")
+        boolean maven = false;
+
+        @CommandLine.Option(names = { "--gradle" }, order = 6, description = "Create a Gradle project.")
+        boolean gradle = false;
+
+        @CommandLine.Option(names = {
+                "--grade-kotlin-dsl" }, order = 7, description = "Create a Gradle Kotlin DSL project.")
+        boolean gradleKotlinDsl = false;
+    }
+
+    @CommandLine.ArgGroup()
+    TargetLanguage language = new TargetLanguage();
+
+    static class TargetLanguage {
+        @CommandLine.Option(names = {
+                "--java" }, order = 8, description = "Generate Java examples. (default)")
+        boolean java = false;
+
+        @CommandLine.Option(names = {
+                "--kotlin" }, order = 9, description = "Generate Kotlin examples.")
+        boolean kotlin = false;
+
+        @CommandLine.Option(names = {
+                "--scala" }, order = 10, description = "Generate Scala examples.")
+        boolean scala = false;
+    }
+
+    @CommandLine.Parameters(arity = "0..1", paramLabel = "EXTENSION", description = "extension to add to project")
+    Set<String> extensions;
+
+    @Override
+    public Integer call() throws Exception {
+        try {
+            File projectDirectory = new File(System.getProperty("user.dir"));
+
+            File projectRoot = new File(projectDirectory.getAbsoluteFile(), artifactId);
+            if (projectRoot.exists()) {
+                err().println("Unable to create the project, " +
+                        "the directory " + projectRoot.getAbsolutePath() + " already exists");
+                return CommandLine.ExitCode.SOFTWARE;
+            }
+
+            SourceType sourceType = SourceType.JAVA;
+            if (targetBuildTool.gradleKotlinDsl) {
+                sourceType = SourceType.KOTLIN;
+                if (extensions == null)
+                    extensions = new HashSet<>();
+                if (!extensions.contains("kotlin"))
+                    extensions.add("quarkus-kotlin");
+            } else if (language.scala) {
+                sourceType = SourceType.SCALA;
+                if (extensions == null)
+                    extensions = new HashSet<>();
+                if (!extensions.contains("scala"))
+                    extensions.add("quarkus-scala");
+            } else if (language.kotlin) {
+                sourceType = SourceType.KOTLIN;
+                if (extensions == null)
+                    extensions = new HashSet<>();
+                if (!extensions.contains("kotlin"))
+                    extensions.add("quarkus-kotlin");
+            } else if (extensions != null && !extensions.isEmpty()) {
+                sourceType = CreateProject.determineSourceType(extensions);
+            }
+
+            BuildTool buildTool = BuildTool.MAVEN;
+            if (targetBuildTool.gradle)
+                buildTool = BuildTool.GRADLE;
+            else if (targetBuildTool.gradleKotlinDsl)
+                buildTool = BuildTool.GRADLE_KOTLIN_DSL;
+
+            final QuarkusProject project = QuarkusProjectHelper.getProject(projectRoot.getAbsoluteFile().toPath(), buildTool,
+                    QuarkusCliVersion.version());
+            boolean status = new CreateProject(project)
+                    .groupId(groupId)
+                    .artifactId(artifactId)
+                    .version(version)
+                    .sourceType(sourceType)
+                    .overrideExamples(examples)
+                    .extensions(extensions)
+                    .noExamples(noExamples)
+                    .execute().isSuccess();
+
+            if (status) {
+                out().println("Project " + artifactId +
+                        " created.");
+                parent.setProjectDirectory(projectRoot.toPath().toAbsolutePath());
+            } else {
+                err().println("Failed to create project");
+                return CommandLine.ExitCode.SOFTWARE;
+            }
+        } catch (Exception e) {
+            err().println("Project creation failed, " + e.getMessage());
+            if (parent.showErrors)
+                e.printStackTrace(err());
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+
+        return CommandLine.ExitCode.OK;
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/CreateExtension.java b/devtools/cli/src/main/java/io/quarkus/cli/CreateExtension.java
new file mode 100644
index 0000000000000..61a1d76635565
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/CreateExtension.java
@@ -0,0 +1,170 @@
+package io.quarkus.cli;
+
+import static io.quarkus.devtools.commands.CreateExtension.extractQuarkiverseExtensionId;
+import static io.quarkus.devtools.commands.CreateExtension.isQuarkiverseGroupId;
+import static io.quarkus.devtools.commands.CreateExtension.resolveModel;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.Callable;
+
+import org.apache.maven.model.Model;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.utils.Prompter;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "create-extension", sortOptions = false, usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Creates the base of a Quarkus extension in different layout depending of the options and environment.")
+public class CreateExtension extends BaseSubCommand implements Callable<Integer> {
+
+    @CommandLine.Option(names = { "-g",
+            "--group-id" }, order = 1, paramLabel = "GROUP-ID", description = "The groupId for project.")
+    String groupId;
+
+    @CommandLine.Option(names = { "-i",
+            "--extension-id" }, order = 0, paramLabel = "EXTENSION-ID", description = "The extension id.")
+    String extensionId;
+
+    @CommandLine.Option(names = { "-v",
+            "--version" }, order = 3, paramLabel = "VERSION", description = "The version for the extension.")
+    String version = "1.0.0-SNAPSHOT";
+
+    @CommandLine.Option(names = { "-q",
+            "--quarkus-version" }, order = 4, paramLabel = "QUARKUS-VERSION", description = "The quarkus version for the extension.")
+    String quarkusVersion;
+
+    @CommandLine.Option(names = { "-N",
+            "--namespace-id" }, order = 5, paramLabel = "NAMESPACE-ID", description = "A prefix common to all extension modules artifactIds.")
+    String namespaceId;
+
+    @CommandLine.Option(names = { "-p",
+            "--package-name" }, order = 6, paramLabel = "PACKAGE-NAME", description = "Base package under which classes should be created in Runtime and Deployment modules.. When specified, use a custom package name instead of auto generating it from other parameters.")
+    String packageName;
+
+    @CommandLine.Option(names = {
+            "--extension-name" }, order = 7, paramLabel = "EXTENSION-NAME", description = "When specified, use a custom extension name instead of generating it from the extension id.")
+    String extensionName;
+
+    @CommandLine.Option(names = {
+            "--namespace-name" }, order = 8, paramLabel = "NAMESPACE-NAME", description = "A prefix common to all extension modules names. When specified, use a custom namespace name instead of generating it from the namespace id.")
+    String namespaceName;
+
+    @CommandLine.Option(names = {
+            "--bom-group-id" }, order = 9, paramLabel = "BOM-GROUP-ID", description = "The group id of the Quarkus platform BOM.")
+    String quarkusBomGroupId;
+
+    @CommandLine.Option(names = {
+            "--bom-artifact-id" }, order = 10, paramLabel = "BOM-ARTIFACT-ID", description = "The artifact id of the Quarkus platform BOM.")
+    String quarkusBomArtifactId;
+
+    @CommandLine.Option(names = {
+            "--bom-version" }, order = 11, paramLabel = "BOM-VERSION", description = "The version id of the Quarkus platform BOM.")
+    String quarkusBomVersion;
+
+    @CommandLine.Option(names = {
+            "--without-unit-test" }, order = 12, description = "Indicates whether to generate a unit test class for the extension.")
+    boolean withoutUnitTest;
+
+    @CommandLine.Option(names = {
+            "--without-it-tests" }, order = 13, description = "Indicates whether to generate a integration tests for the extension.")
+    boolean withoutIntegrationTests;
+
+    @CommandLine.Option(names = {
+            "--without-devmode-test" }, order = 14, description = "Indicates whether to generate a dev mode test class for the extension.")
+    boolean withoutDevModeTest;
+
+    @CommandLine.Option(names = {
+            "--without-tests" }, order = 15, description = "Indicates whether to generate any test for the extension.")
+    boolean withoutTests;
+
+    @CommandLine.Spec
+    CommandLine.Model.CommandSpec spec; //
+
+    @Override
+    public Integer call() throws Exception {
+        try {
+            Path dir = Paths.get(System.getProperty("user.dir"));
+
+            promptValues(dir);
+            autoComputeQuarkiverseExtensionId();
+
+            final io.quarkus.devtools.commands.CreateExtension createExtension = new io.quarkus.devtools.commands.CreateExtension(
+                    dir)
+                            .extensionId(extensionId)
+                            .extensionName(extensionName)
+                            .groupId(groupId)
+                            .version(version)
+                            .packageName(packageName)
+                            .namespaceId(namespaceId)
+                            .namespaceName(namespaceName)
+                            .quarkusVersion(quarkusVersion)
+                            .quarkusBomGroupId(quarkusBomGroupId)
+                            .quarkusBomArtifactId(quarkusBomArtifactId)
+                            .quarkusBomGroupId(quarkusBomVersion)
+                            .withoutUnitTest(withoutTests || withoutUnitTest)
+                            .withoutDevModeTest(withoutTests || withoutDevModeTest)
+                            .withoutIntegrationTests(withoutTests || withoutIntegrationTests);
+
+            try {
+                boolean success = createExtension.execute().isSuccess();
+                if (!success) {
+                    err().println("Failed to generate Extension");
+                    return CommandLine.ExitCode.SOFTWARE;
+                }
+            } catch (QuarkusCommandException e) {
+                err().println("Failed to generate Extension, " + e.getMessage());
+                if (parent.showErrors) {
+                    e.printStackTrace(err());
+                }
+                return CommandLine.ExitCode.SOFTWARE;
+            }
+
+        } catch (Exception e) {
+            err().println("Failed to generate Extension, " + e.getMessage());
+            if (parent.showErrors) {
+                e.printStackTrace(err());
+            }
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+
+        return CommandLine.ExitCode.OK;
+    }
+
+    private void autoComputeQuarkiverseExtensionId() {
+        if (isQuarkiverseGroupId(groupId) && isEmpty(extensionId)) {
+            extensionId = extractQuarkiverseExtensionId(groupId);
+        }
+    }
+
+    private void promptValues(Path dir) throws QuarkusCommandException {
+        if (batchMode) {
+            if (isBlank(extensionId)) {
+                throw new CommandLine.MissingParameterException(spec.commandLine(), spec.optionsMap().get("-id"),
+                        "Missing required option: '--extension-id=EXTENSION-ID'");
+            }
+            return;
+        }
+        try {
+            final Prompter prompter = new Prompter();
+            final Model model = resolveModel(dir);
+            if (model == null || !model.getArtifactId().endsWith("quarkus-parent")) {
+                if (isBlank(quarkusVersion)) {
+                    quarkusVersion = prompter.prompt("Set the Quarkus version");
+                }
+                if (isBlank(groupId)) {
+                    groupId = prompter.promptWithDefaultValue("Set the extension groupId", "org.acme");
+                }
+            }
+            autoComputeQuarkiverseExtensionId();
+            if (isBlank(extensionId)) {
+                extensionId = prompter.prompt("Set the extension id");
+            }
+        } catch (IOException e) {
+            throw new QuarkusCommandException("Unable to get user input", e);
+        }
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/CreateJBang.java b/devtools/cli/src/main/java/io/quarkus/cli/CreateJBang.java
new file mode 100644
index 0000000000000..fd523a6a72a0a
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/CreateJBang.java
@@ -0,0 +1,60 @@
+package io.quarkus.cli;
+
+import java.io.File;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.commands.CreateJBangProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "create-jbang", sortOptions = false, usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Create a new quarkus jbang project.")
+public class CreateJBang extends BaseSubCommand implements Callable<Integer> {
+
+    @CommandLine.Option(names = { "-n",
+            "--no-wrapper" }, order = 1, description = "Generate without JBang wrapper.")
+    boolean noJBangWrapper = false;
+
+    @CommandLine.Option(names = { "-o",
+            "--output-folder" }, order = 2, paramLabel = "OUTPUT-FOLDER", description = "The output folder for project")
+    String outputFolder = "jbang-with-quarkus";
+
+    @CommandLine.Parameters(arity = "0..1", paramLabel = "EXTENSION", description = "Extensions to add to project")
+    Set<String> extensions;
+
+    @Override
+    public Integer call() throws Exception {
+        try {
+            File projectDirectory = new File(System.getProperty("user.dir"));
+
+            File projectRoot = new File(projectDirectory.getAbsoluteFile(), outputFolder);
+            if (projectRoot.exists()) {
+                err().println("Unable to create the project, " +
+                        "the directory " + projectRoot.getAbsolutePath() + " already exists");
+                return CommandLine.ExitCode.SOFTWARE;
+            }
+
+            boolean status = new CreateJBangProject(
+                    QuarkusProjectHelper.getProject(projectRoot.getAbsoluteFile().toPath(), QuarkusCliVersion.version()))
+                            .extensions(extensions)
+                            .setValue("noJBangWrapper", noJBangWrapper)
+                            .execute()
+                            .isSuccess();
+            if (status) {
+                out().println("JBang project created.");
+                parent.setProjectDirectory(projectRoot.toPath().toAbsolutePath());
+            } else {
+                err().println("Failed to create JBang project");
+                return CommandLine.ExitCode.SOFTWARE;
+            }
+        } catch (Exception e) {
+            err().println("JBang project creation failed, " + e.getMessage());
+            if (parent.showErrors)
+                e.printStackTrace(err());
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+        return CommandLine.ExitCode.OK;
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Dev.java b/devtools/cli/src/main/java/io/quarkus/cli/Dev.java
new file mode 100644
index 0000000000000..76f8c9a248ecd
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Dev.java
@@ -0,0 +1,28 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.devtools.project.BuildTool;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "dev", usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Execute project in live coding dev mode")
+public class Dev extends BaseSubCommand implements BuildsystemCommand {
+
+    @Override
+    public boolean aggregate(BuildTool buildtool) {
+        return true;
+    }
+
+    @Override
+    public List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN) {
+            return Collections.singletonList("quarkus:dev");
+        } else {
+            return Collections.singletonList("quarkusDev");
+        }
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/List.java b/devtools/cli/src/main/java/io/quarkus/cli/List.java
new file mode 100644
index 0000000000000..40e7f09187c6d
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/List.java
@@ -0,0 +1,111 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.commands.ListExtensions;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "list", usageHelpAutoWidth = true, sortOptions = false, mixinStandardHelpOptions = false, description = "List installed (default) or installable extensions.")
+public class List extends BaseSubCommand implements BuildsystemCommand {
+
+    @CommandLine.Option(names = { "-i",
+            "--installable" }, defaultValue = "false", order = 2, description = "Display installable extensions.")
+    boolean installable = false;
+
+    @CommandLine.Option(names = { "-s",
+            "--search" }, defaultValue = "*", paramLabel = "PATTERN", order = 3, description = "Search filter on extension list. The format is based on Java Pattern.")
+    String searchPattern;
+
+    @CommandLine.ArgGroup()
+    ExtensionFormat format = new ExtensionFormat();
+
+    static class ExtensionFormat {
+        @CommandLine.Option(names = { "--name" }, order = 4, description = "Display extension name only. (default)")
+        boolean name = false;
+
+        @CommandLine.Option(names = { "--concise" }, order = 5, description = "Display extension name and description.")
+        boolean concise = false;
+
+        @CommandLine.Option(names = {
+                "--full" }, order = 6, description = "Display concise format and version related columns.")
+        boolean full = false;
+
+        @CommandLine.Option(names = {
+                "--origins" }, order = 7, description = "Display extensions including their platform origins.")
+        boolean origins = false;
+
+    }
+
+    @Override
+    public boolean aggregate(BuildTool buildtool) {
+        return buildtool != BuildTool.MAVEN;
+    }
+
+    @Override
+    public int execute(Path projectDirectory, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN) {
+            return listExtensionsMaven(projectDirectory);
+        } else {
+            throw new IllegalStateException("Should be unreachable");
+        }
+    }
+
+    private String getFormatString() {
+        String formatString = "name";
+        if (format.concise)
+            formatString = "concise";
+        else if (format.full)
+            formatString = "full";
+        else if (format.origins)
+            formatString = "origins";
+        return formatString;
+    }
+
+    @Override
+    public java.util.List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN)
+            throw new IllegalStateException("Should be unreachable");
+        ArrayList<String> args = new ArrayList<>();
+        args.add("listExtensions");
+        args.add("--fromCli");
+        args.add("--format=" + getFormatString());
+        if (!installable)
+            args.add("--installed");
+        if (searchPattern != null)
+            args.add("--searchPattern=" + searchPattern);
+
+        return args;
+    }
+
+    private Integer listExtensionsMaven(Path projectDirectory) {
+        // we do not have to spawn process for maven
+        try {
+
+            new ListExtensions(QuarkusProjectHelper.getProject(projectDirectory, QuarkusCliVersion.version()))
+                    .fromCli(true)
+                    .all(false)
+                    .installed(!installable)
+                    .format(getFormatString())
+                    .search(searchPattern)
+                    .execute();
+        } catch (QuarkusCommandException e) {
+            if (parent.showErrors)
+                e.printStackTrace(err());
+            return CommandLine.ExitCode.SOFTWARE;
+        } catch (IllegalStateException e) {
+            if (parent.showErrors)
+                e.printStackTrace(err());
+            err().println("No project exists to list extensions from.");
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+        return CommandLine.ExitCode.OK;
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Platforms.java b/devtools/cli/src/main/java/io/quarkus/cli/Platforms.java
new file mode 100644
index 0000000000000..26d056ab48bfb
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Platforms.java
@@ -0,0 +1,32 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.commands.ListPlatforms;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "platforms", usageHelpAutoWidth = true, sortOptions = false, mixinStandardHelpOptions = false, description = "List imported (default) or all available Quarkus platforms.")
+public class Platforms extends BaseSubCommand implements BuildsystemCommand {
+
+    @Override
+    public int execute(Path projectDirectory, BuildTool buildTool) {
+        try {
+            new ListPlatforms(
+                    QuarkusProjectHelper.getProject(projectDirectory, buildTool == null ? BuildTool.MAVEN : buildTool,
+                            QuarkusCliVersion.version()))
+                                    .execute();
+        } catch (Exception e) {
+            if (parent.showErrors) {
+                e.printStackTrace(err());
+            }
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+        return CommandLine.ExitCode.OK;
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java b/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java
new file mode 100644
index 0000000000000..83338f6773402
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/QuarkusCli.java
@@ -0,0 +1,184 @@
+package io.quarkus.cli;
+
+import java.io.PrintWriter;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.LinkedList;
+import java.util.concurrent.Callable;
+
+import javax.inject.Inject;
+
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.cli.core.ExecuteUtil;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+import picocli.CommandLine;
+
+@QuarkusMain
+@CommandLine.Command(name = "quarkus", aliases = {
+        "qs" }, versionProvider = QuarkusCliVersion.class, usageHelpAutoWidth = true, subcommandsRepeatable = true, mixinStandardHelpOptions = true, subcommands = {
+                Build.class,
+                Clean.class, Create.class, CreateJBang.class, List.class, Platforms.class, Add.class, Remove.class, Dev.class,
+                CreateExtension.class })
+public class QuarkusCli implements QuarkusApplication {
+
+    public void usage() {
+        CommandLine.usage(this, System.out);
+
+    }
+
+    @CommandLine.Option(names = { "-e", "--errors" }, description = "Produce execution error messages.")
+    boolean showErrors;
+
+    @CommandLine.Option(names = { "--verbose" }, description = "Verbose mode.")
+    boolean verbose;
+
+    @CommandLine.Option(names = { "--manual-output" }, hidden = true, description = "For unit test purposes.")
+    boolean manualOutput;
+
+    @CommandLine.Spec
+    protected CommandLine.Model.CommandSpec spec;
+
+    public PrintWriter out() {
+        return spec.commandLine().getOut();
+    }
+
+    public PrintWriter err() {
+        return spec.commandLine().getErr();
+    }
+
+    public boolean isVerbose() {
+        return verbose;
+    }
+
+    public boolean isShowErrors() {
+        return showErrors;
+    }
+
+    public boolean isManualOutput() {
+        return manualOutput;
+    }
+
+    @Inject
+    CommandLine.IFactory factory;
+
+    private Path projectDirectory;
+
+    public Path getProjectDirectory() {
+        if (projectDirectory == null) {
+            projectDirectory = Paths.get(System.getProperty("user.dir")).toAbsolutePath();
+        }
+        return projectDirectory;
+    }
+
+    public void setProjectDirectory(Path projectDirectory) {
+        this.projectDirectory = projectDirectory;
+    }
+
+    @Override
+    public int run(String... args) throws Exception {
+        CommandLine cmd = factory == null ? new CommandLine(this) : new CommandLine(this, factory);
+        return cmd.setExecutionStrategy(new ExecutionStrategy())
+                .setUsageHelpLongOptionsMaxWidth(30)
+                .execute(args);
+    }
+
+    public BuildTool resolveBuildTool(Path projectDirectory) {
+        return QuarkusProject.resolveExistingProjectBuildTool(projectDirectory.toAbsolutePath());
+    }
+
+    public int executeBuildsystem(BuildTool buildtool, java.util.List<String> args) throws Exception {
+        String[] newArgs = args.toArray(new String[args.size()]);
+        if (buildtool == BuildTool.MAVEN) {
+            return ExecuteUtil.executeMavenTarget(getProjectDirectory().toFile(), this, newArgs);
+        } else {
+            return ExecuteUtil.executeGradleTarget(getProjectDirectory().toFile(), this, newArgs);
+        }
+    }
+
+    class ExecutionStrategy implements CommandLine.IExecutionStrategy {
+        @Override
+        public int execute(CommandLine.ParseResult parseResult)
+                throws CommandLine.ExecutionException, CommandLine.ParameterException {
+            try {
+                // Aggregate any maven/gradle commands into one build process
+                // if BuildsystemCommand.aggregate() returns true
+                LinkedList<String> buildsystemArguments = new LinkedList<>();
+                BuildTool buildtool = null;
+                if (parseResult.hasSubcommand()) {
+                    for (CommandLine.ParseResult pr : parseResult.subcommands()) {
+                        if (CommandLine.printHelpIfRequested(pr)) {
+                            return CommandLine.ExitCode.USAGE;
+                        }
+                        // TODO: More recursion will be needed if any subcommand has sub-sub commands
+                        for (CommandLine cl : pr.asCommandLineList()) {
+                            try {
+                                Object cmd = cl.getCommand();
+                                if (cmd instanceof BuildsystemCommand) {
+                                    if (buildtool == null)
+                                        buildtool = resolveBuildTool(getProjectDirectory());
+                                    BuildsystemCommand build = (BuildsystemCommand) cmd;
+                                    if (build.aggregate(buildtool)) {
+                                        buildsystemArguments.addAll(build.getArguments(getProjectDirectory(), buildtool));
+                                    } else {
+                                        if (buildsystemArguments.size() > 0) {
+                                            int exitCode = executeBuildsystem(buildtool, buildsystemArguments);
+                                            if (exitCode != CommandLine.ExitCode.OK)
+                                                return exitCode;
+                                            buildsystemArguments.clear();
+                                        }
+
+                                        int exitCode = build.execute(getProjectDirectory(), buildtool);
+                                        if (exitCode != CommandLine.ExitCode.OK)
+                                            return exitCode;
+                                    }
+                                } else if (cmd instanceof Callable) {
+                                    int exitCode = ((Callable<Integer>) cmd).call();
+                                    if (exitCode != CommandLine.ExitCode.OK)
+                                        return exitCode;
+                                } else {
+                                    err().println("Unknown execution type for : " + cl.getCommandName());
+                                    return CommandLine.ExitCode.SOFTWARE;
+                                }
+                            } catch (Exception e) {
+                                if (showErrors)
+                                    e.printStackTrace(err());
+                                err().println("Failure executing command : " + cl.getCommandName());
+                                return CommandLine.ExitCode.SOFTWARE;
+                            }
+                        }
+                    }
+                    if (buildsystemArguments.size() > 0) {
+                        try {
+                            return executeBuildsystem(buildtool, buildsystemArguments);
+                        } catch (Exception e) {
+                            if (showErrors)
+                                e.printStackTrace(err());
+                            err().print("Failure executing build command : ");
+                            ExecuteUtil.outputBuildCommand(err(), buildtool, buildsystemArguments);
+                            err().println();
+                            return CommandLine.ExitCode.SOFTWARE;
+                        }
+                    }
+                } else {
+                    if (parseResult.isVersionHelpRequested()) {
+                        parseResult.asCommandLineList().iterator().next().printVersionHelp(out());
+                    } else {
+                        // no subcommands executed
+                        usage();
+                    }
+                }
+                return CommandLine.ExitCode.OK;
+            } catch (Exception e) {
+                if (showErrors)
+                    e.printStackTrace(err());
+                return CommandLine.ExitCode.SOFTWARE;
+            }
+        }
+
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/Remove.java b/devtools/cli/src/main/java/io/quarkus/cli/Remove.java
new file mode 100644
index 0000000000000..b8f1527fddef0
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/Remove.java
@@ -0,0 +1,64 @@
+package io.quarkus.cli;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import io.quarkus.cli.core.BaseSubCommand;
+import io.quarkus.cli.core.BuildsystemCommand;
+import io.quarkus.cli.core.QuarkusCliVersion;
+import io.quarkus.devtools.commands.RemoveExtensions;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "remove", aliases = "rm", usageHelpAutoWidth = true, mixinStandardHelpOptions = false, description = "Remove an extension from this project.")
+public class Remove extends BaseSubCommand implements BuildsystemCommand {
+
+    @CommandLine.Parameters(arity = "1", paramLabel = "EXTENSION", description = "extensions to remove")
+    Set<String> extensions;
+
+    @Override
+    public boolean aggregate(BuildTool buildtool) {
+        return buildtool != BuildTool.MAVEN;
+    }
+
+    @Override
+    public List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        if (buildtool == BuildTool.MAVEN)
+            throw new IllegalStateException("Should be unreachable");
+
+        ArrayList<String> args = new ArrayList<>();
+        args.add("removeExtension");
+        String param = "--extensions=" + String.join(",", extensions);
+        args.add(param);
+        return args;
+    }
+
+    @Override
+    public int execute(Path projectDir, BuildTool buildtool) throws Exception {
+        if (buildtool == BuildTool.MAVEN) {
+            return removeMaven(projectDir);
+        } else {
+            throw new IllegalStateException("Should be unreachable");
+        }
+    }
+
+    private Integer removeMaven(Path projectDirectory) {
+        try {
+            RemoveExtensions project = new RemoveExtensions(
+                    QuarkusProjectHelper.getProject(projectDirectory, QuarkusCliVersion.version()))
+                            .extensions(extensions);
+            QuarkusCommandOutcome result = project.execute();
+            return result.isSuccess() ? CommandLine.ExitCode.OK : CommandLine.ExitCode.SOFTWARE;
+        } catch (Exception e) {
+            if (parent.showErrors)
+                e.printStackTrace(err());
+            err().println("Unable to remove extension matching:" + e.getMessage());
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/core/BaseSubCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/core/BaseSubCommand.java
new file mode 100644
index 0000000000000..cacc884cb8852
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/core/BaseSubCommand.java
@@ -0,0 +1,30 @@
+package io.quarkus.cli.core;
+
+import java.io.PrintWriter;
+
+import io.quarkus.cli.QuarkusCli;
+import picocli.CommandLine;
+
+public abstract class BaseSubCommand {
+
+    @CommandLine.Option(names = { "-B", "--batch-mode" }, order = 100, description = "run command in batch mode")
+    protected boolean batchMode;
+
+    @CommandLine.Option(names = { "-h", "--help" }, order = 101, usageHelp = true, description = "display this help message")
+    protected boolean help;
+
+    @CommandLine.ParentCommand
+    protected QuarkusCli parent;
+
+    @CommandLine.Spec
+    protected CommandLine.Model.CommandSpec spec;
+
+    public PrintWriter out() {
+        return spec.commandLine().getOut();
+    }
+
+    public PrintWriter err() {
+        return spec.commandLine().getErr();
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/core/BuildsystemCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/core/BuildsystemCommand.java
new file mode 100644
index 0000000000000..3f553449b9d96
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/core/BuildsystemCommand.java
@@ -0,0 +1,43 @@
+package io.quarkus.cli.core;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import io.quarkus.devtools.project.BuildTool;
+
+/**
+ * A buildsystem command that can only be run solo
+ */
+public interface BuildsystemCommand {
+    /**
+     * Should this buildsystem command be run within one build process?
+     *
+     * @param buildtool
+     * @return
+     */
+    default boolean aggregate(BuildTool buildtool) {
+        return false;
+    }
+
+    /**
+     * If aggregate() then this method should be called.
+     *
+     * @param projectDir
+     * @param buildtool
+     * @return list of arguments to pass to build process
+     */
+    default List<String> getArguments(Path projectDir, BuildTool buildtool) {
+        throw new IllegalStateException("Command implemented incorrectly");
+    }
+
+    /**
+     * This command is responsible for executing buildsystem if aggregate() is false
+     *
+     * @param projectDir
+     * @param buildtool
+     * @return
+     */
+    default int execute(Path projectDir, BuildTool buildtool) throws Exception {
+        throw new IllegalStateException("Command implemented incorrectly");
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/core/ExecuteUtil.java b/devtools/cli/src/main/java/io/quarkus/cli/core/ExecuteUtil.java
new file mode 100644
index 0000000000000..eb1f618b9b413
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/core/ExecuteUtil.java
@@ -0,0 +1,224 @@
+package io.quarkus.cli.core;
+
+import static picocli.CommandLine.ExitCode.OK;
+import static picocli.CommandLine.ExitCode.SOFTWARE;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import io.quarkus.cli.QuarkusCli;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.registry.config.RegistriesConfigLocator;
+import io.quarkus.utilities.OS;
+import picocli.CommandLine;
+
+public class ExecuteUtil {
+
+    private static int executeGradle(File projectDirectory, QuarkusCli cli, String... args)
+            throws Exception {
+        File gradle = findExecutableFile("gradle");
+
+        if (gradle == null) {
+            cli.err().println("Unable to find the gradle executable, is it in your path?");
+            return SOFTWARE;
+        } else {
+            String[] newArgs = prependArray(gradle.getAbsolutePath(), args);
+            return executeProcess(cli, newArgs, projectDirectory);
+        }
+    }
+
+    public static String[] prependArray(String prepend, String[] args) {
+        String[] newArgs = new String[1 + args.length];
+        newArgs[0] = prepend;
+        for (int i = 1; i < newArgs.length; i++)
+            newArgs[i] = args[i - 1];
+        return newArgs;
+    }
+
+    public static File findExecutableFile(String base) {
+        String path = null;
+        String executable = base;
+
+        if (OS.determineOS() == OS.WINDOWS) {
+            executable = base + ".cmd";
+            ;
+            path = findExecutable(executable);
+            if (path == null) {
+                executable = base + ".bat";
+                path = findExecutable(executable);
+            }
+        } else {
+            executable = base;
+            path = findExecutable(executable);
+        }
+        if (path == null)
+            return null;
+        return new File(path, executable);
+    }
+
+    private static int executeMaven(File projectDirectory, QuarkusCli cli, String... args) throws Exception {
+        File mvn = findExecutableFile("mvn");
+        if (mvn == null) {
+            cli.err().println("Unable to find the maven executable, is it in your path?");
+            return CommandLine.ExitCode.SOFTWARE;
+        }
+
+        String[] newArgs = prependArray(mvn.getAbsolutePath(), args);
+        return executeProcess(cli, newArgs, projectDirectory);
+    }
+
+    private static String findExecutable(String exec) {
+        Optional<Path> mvnPath = Stream.of(System.getenv("PATH").split(Pattern.quote(File.pathSeparator)))
+                .map(Paths::get)
+                .filter(path -> Files.exists(path.resolve(exec))).findFirst();
+
+        return mvnPath.map(value -> value.getParent().toString()).orElse(null);
+    }
+
+    private static int executeWrapper(File wrapper, QuarkusCli cli, String... args) throws Exception {
+        String[] newArgs = prependArray(wrapper.getAbsolutePath(), args);
+
+        File parentDir = wrapper.getParentFile();
+        return executeProcess(cli, newArgs, parentDir);
+    }
+
+    public static int executeProcess(QuarkusCli cli, String[] args, File parentDir) throws IOException, InterruptedException {
+        if (cli.isVerbose()) {
+            cli.out().println(String.join(" ", args));
+            cli.out().println();
+        }
+
+        int exit = SOFTWARE;
+        if (cli.isManualOutput()) {
+            // manual output is for unit testing the cli
+            Process process = new ProcessBuilder()
+                    .command(args)
+                    .redirectErrorStream(true)
+                    .directory(parentDir)
+                    .start();
+            InputStream stdIn = process.getInputStream();
+            InputStreamReader isr = new InputStreamReader(stdIn);
+            BufferedReader br = new BufferedReader(isr);
+
+            String line = null;
+
+            while ((line = br.readLine()) != null)
+                cli.out().println(line);
+
+            exit = process.waitFor();
+
+        } else {
+            Process process = new ProcessBuilder()
+                    .command(args)
+                    .inheritIO()
+                    .directory(parentDir)
+                    .start();
+
+            exit = process.waitFor();
+        }
+        if (exit != 0) {
+            return SOFTWARE;
+        } else {
+            return OK;
+        }
+    }
+
+    private static File getGradleWrapper(String projectPath) {
+        if (OS.determineOS() == OS.WINDOWS) {
+            File wrapper = new File(projectPath + File.separator + "gradlew.cmd");
+            if (wrapper.isFile())
+                return wrapper;
+            wrapper = new File(projectPath + File.separator + "gradlew.bat");
+            if (wrapper.isFile())
+                return wrapper;
+        } else {
+            File wrapper = new File(projectPath + File.separator + "gradlew");
+            if (wrapper.isFile())
+                return wrapper;
+        }
+
+        return null;
+    }
+
+    private static File getMavenWrapper(String projectPath) {
+        if (OS.determineOS() == OS.WINDOWS) {
+            File wrapper = new File(projectPath + File.separator + "mvnw.cmd");
+            if (wrapper.isFile())
+                return wrapper;
+            wrapper = new File(projectPath + File.separator + "mvnw.bat");
+            if (wrapper.isFile())
+                return wrapper;
+        } else {
+            File wrapper = new File(projectPath + File.separator + "mvnw");
+            if (wrapper.isFile())
+                return wrapper;
+        }
+
+        return null;
+    }
+
+    public static int executeGradleTarget(File projectPath, QuarkusCli cli, String... args) throws Exception {
+        File buildFile = projectPath.toPath().resolve("build.gradle").toFile();
+        if (!buildFile.isFile()) {
+            cli.err().println("Was not able to find a build file in: " + projectPath);
+            return SOFTWARE;
+        }
+        String[] newArgs = args;
+        newArgs = propagatePropertyIfSet("maven.repo.local", newArgs);
+        newArgs = propagatePropertyIfSet(RegistriesConfigLocator.CONFIG_FILE_PATH_PROPERTY, newArgs);
+        newArgs = propagatePropertyIfSet("io.quarkus.maven.secondary-local-repo", newArgs);
+        if (cli.isShowErrors()) {
+            newArgs = prependArray("--full-stacktrace", newArgs);
+        }
+        if (CommandLine.Help.Ansi.AUTO.enabled())
+            newArgs = prependArray("--console=rich", newArgs);
+        File wrapper = getGradleWrapper(projectPath.getAbsolutePath());
+        if (wrapper != null) {
+            return executeWrapper(wrapper, cli, newArgs);
+        } else {
+            return executeGradle(projectPath, cli, args);
+        }
+    }
+
+    private static String[] propagatePropertyIfSet(String name, String[] newArgs) {
+        final String value = System.getProperty(name);
+        return value == null ? newArgs : prependArray("-D" + name + "=" + value, newArgs);
+    }
+
+    public static int executeMavenTarget(File projectPath, QuarkusCli cli, String... args) throws Exception {
+        File buildFile = projectPath.toPath().resolve("pom.xml").toFile();
+        if (!buildFile.isFile()) {
+            cli.err().println("Was not able to find a build file in: " + projectPath);
+            return SOFTWARE;
+        }
+        File wrapper = getMavenWrapper(projectPath.getAbsolutePath());
+        String[] newArgs = args;
+        if (cli.isShowErrors()) {
+            newArgs = prependArray("-e", newArgs);
+        }
+        if (CommandLine.Help.Ansi.AUTO.enabled())
+            newArgs = prependArray("-Dstyle.color=always", newArgs);
+        if (wrapper != null) {
+            executeWrapper(wrapper, cli, newArgs);
+        } else {
+            return executeMaven(projectPath, cli, newArgs);
+        }
+        return CommandLine.ExitCode.OK;
+    }
+
+    public static void outputBuildCommand(PrintWriter writer, BuildTool buildtool, java.util.List<String> args) {
+        writer.print(buildtool == BuildTool.MAVEN ? "mvn" : "gradle");
+        for (String arg : args)
+            writer.print(" " + arg);
+    }
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/core/QuarkusCliVersion.java b/devtools/cli/src/main/java/io/quarkus/cli/core/QuarkusCliVersion.java
new file mode 100644
index 0000000000000..60ad015fa716c
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/core/QuarkusCliVersion.java
@@ -0,0 +1,44 @@
+package io.quarkus.cli.core;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.Properties;
+
+import io.smallrye.common.classloader.ClassPathUtils;
+import picocli.CommandLine;
+
+public class QuarkusCliVersion implements CommandLine.IVersionProvider {
+
+    private static String version;
+
+    public static String version() {
+        if (version != null) {
+            return version;
+        }
+        final URL quarkusPropsUrl = Thread.currentThread().getContextClassLoader().getResource("quarkus.properties");
+        if (quarkusPropsUrl == null) {
+            throw new RuntimeException("Failed to locate quarkus.properties on the classpath");
+        }
+        final Properties props = new Properties();
+        ClassPathUtils.consumeAsPath(quarkusPropsUrl, p -> {
+            try (BufferedReader reader = Files.newBufferedReader(p)) {
+                props.load(reader);
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to load quarkus.properties", e);
+            }
+        });
+        version = props.getProperty("quarkus-core-version");
+        if (version == null) {
+            throw new RuntimeException("Failed to locate quarkus-core-version property in the bundled quarkus.properties");
+        }
+        return version;
+    }
+
+    @Override
+    public String[] getVersion() throws Exception {
+        return new String[] { version() };
+    }
+
+}
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/core/QuarkusVersion.java b/devtools/cli/src/main/java/io/quarkus/cli/core/QuarkusVersion.java
new file mode 100644
index 0000000000000..e3ebfbc3c6dfb
--- /dev/null
+++ b/devtools/cli/src/main/java/io/quarkus/cli/core/QuarkusVersion.java
@@ -0,0 +1,15 @@
+package io.quarkus.cli.core;
+
+import java.nio.file.Paths;
+
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import picocli.CommandLine;
+
+public class QuarkusVersion implements CommandLine.IVersionProvider {
+
+    @Override
+    public String[] getVersion() throws Exception {
+        return new String[] { QuarkusProjectHelper.getProject(Paths.get("").normalize().toAbsolutePath()).getExtensionsCatalog()
+                .getQuarkusCoreVersion() };
+    }
+}
diff --git a/devtools/cli/src/main/resources/application.properties b/devtools/cli/src/main/resources/application.properties
new file mode 100644
index 0000000000000..da09c4ff8e2c2
--- /dev/null
+++ b/devtools/cli/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+quarkus.log.level=WARN
+quarkus.banner.enabled=false
+quarkus.package.type=uber-jar
+quarkus.native.additional-build-args=--allow-incomplete-classpath
+#quarkus.native.auto-service-loader-registration=true
+#quarkus.native.resources.includes=quarkus.properties,bundled-codestarts/**,codestarts/**
+#quarkus.native.native-image-xmx=6g
\ No newline at end of file
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliTest.java
new file mode 100644
index 0000000000000..7cd48eaa1fee4
--- /dev/null
+++ b/devtools/cli/src/test/java/io/quarkus/cli/CliTest.java
@@ -0,0 +1,376 @@
+package io.quarkus.cli;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Comparator;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.cli.core.ExecuteUtil;
+import io.quarkus.devtools.test.RegistryClientTestHelper;
+import picocli.CommandLine;
+
+public class CliTest {
+
+    private String screen;
+    private int exitCode;
+
+    private String cwd;
+    private Path workspace;
+
+    @BeforeAll
+    public static void globalSetup() {
+        RegistryClientTestHelper.enableRegistryClientTestConfig();
+    }
+
+    @AfterAll
+    public static void globalReset() {
+        RegistryClientTestHelper.disableRegistryClientTestConfig();
+    }
+
+    @BeforeEach
+    public void setupTestDirectories() throws Exception {
+        cwd = System.getProperty("user.dir");
+        workspace = Paths.get(cwd).toAbsolutePath().resolve("target/cli-workspace");
+        deleteDir(workspace);
+        Assertions.assertFalse(workspace.toFile().exists());
+        Files.createDirectories(workspace);
+        System.setProperty("user.dir", workspace.toFile().getAbsolutePath());
+    }
+
+    @AfterEach
+    public void revertCWD() {
+        System.setProperty("user.dir", cwd);
+    }
+
+    @Test
+    public void testCreateMavenDefaults() throws Exception {
+        Path project = workspace.resolve("code-with-quarkus");
+
+        execute("create");
+
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("Project code-with-quarkus created"));
+
+        Assertions.assertTrue(project.resolve("pom.xml").toFile().exists());
+        String pom = readString(project.resolve("pom.xml"));
+        Assertions.assertTrue(pom.contains("<groupId>org.acme</groupId>"));
+        Assertions.assertTrue(pom.contains("<artifactId>code-with-quarkus</artifactId>"));
+        Assertions.assertTrue(pom.contains("<version>1.0.0-SNAPSHOT</version>"));
+    }
+
+    @Test
+    public void testAddListRemove() throws Exception {
+        Path project = workspace.resolve("code-with-quarkus");
+        testCreateMavenDefaults();
+
+        execute("add");
+        Assertions.assertEquals(CommandLine.ExitCode.USAGE, exitCode);
+
+        // test not project dir
+        execute("add", "qute");
+        Assertions.assertEquals(CommandLine.ExitCode.SOFTWARE, exitCode);
+
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.SOFTWARE, exitCode);
+
+        System.out.println("Change user.dir to: " + project.toFile().getAbsolutePath());
+        System.setProperty("user.dir", project.toFile().getAbsolutePath());
+
+        // test empty list
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertEquals("quarkus-resteasy", screen.trim());
+
+        // test add
+        execute("add", "qute");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        // test list
+
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("quarkus-resteasy"));
+        Assertions.assertTrue(screen.contains("quarkus-qute"));
+
+        // test add multiple
+        execute("add", "amazon-lambda-http", "jackson");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        // test list
+
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("quarkus-resteasy"));
+        Assertions.assertTrue(screen.contains("quarkus-qute"));
+        Assertions.assertTrue(screen.contains("quarkus-amazon-lambda-http"));
+        Assertions.assertTrue(screen.contains("quarkus-jackson"));
+
+        // test list installable
+        execute("list", "--installable");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertFalse(screen.contains("quarkus-jackson"));
+        Assertions.assertTrue(screen.contains("quarkus-azure-functions-http"));
+
+        // test list search installable
+        execute("list", "--installable", "--search=picocli");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertEquals("quarkus-picocli", screen.trim());
+
+        // test list search
+        execute("list", "--search=amazon");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertEquals("quarkus-amazon-lambda-http", screen.trim());
+
+        // test remove bad
+        execute("remove", "badbadbad");
+        Assertions.assertEquals(CommandLine.ExitCode.SOFTWARE, exitCode);
+
+        // test remove
+        execute("remove", "qute");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertFalse(screen.contains("quarkus-qute"));
+        Assertions.assertTrue(screen.contains("quarkus-amazon-lambda-http"));
+        Assertions.assertTrue(screen.contains("quarkus-jackson"));
+
+        // test remove many
+        execute("rm", "amazon-lambda-http", "jackson", "resteasy");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertEquals("", screen.trim());
+
+    }
+
+    @Test
+    public void testGradleAddListRemove() throws Exception {
+        // Gradle list command cannot be screen captured with the current implementation
+        // so I will just test good return values
+        //
+        Path project = workspace.resolve("code-with-quarkus");
+        testCreateGradleDefaults();
+
+        execute("add");
+        Assertions.assertEquals(CommandLine.ExitCode.USAGE, exitCode);
+
+        // test not project dir
+        execute("add", "resteasy");
+        Assertions.assertEquals(CommandLine.ExitCode.SOFTWARE, exitCode);
+
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.SOFTWARE, exitCode);
+
+        System.out.println("Change user.dir to: " + project.toFile().getAbsolutePath());
+        System.setProperty("user.dir", project.toFile().getAbsolutePath());
+
+        // test empty list
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        // test add
+        execute("add", "resteasy");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        // test list
+
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("quarkus-resteasy"));
+        Assertions.assertFalse(screen.contains("quarkus-amazon-lambda-http"));
+
+        // test add multiple
+        execute("add", "amazon-lambda-http", "jackson");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        // test list
+
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("quarkus-resteasy"));
+        Assertions.assertTrue(screen.contains("quarkus-amazon-lambda-http"));
+        Assertions.assertTrue(screen.contains("quarkus-jackson"));
+
+        // test list installable
+        execute("list", "--installable");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertFalse(screen.contains("quarkus-jackson"));
+        Assertions.assertTrue(screen.contains("quarkus-azure-functions-http"));
+
+        // test list search installable
+        execute("list", "--installable", "--search=picocli");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("quarkus-picocli"));
+        Assertions.assertFalse(screen.contains("quarkus-amazon-lambda-http"));
+
+        // test list search
+        execute("list", "--search=amazon");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertFalse(screen.contains("quarkus-picocli"));
+        Assertions.assertTrue(screen.contains("quarkus-amazon-lambda-http"));
+
+        // test remove
+        execute("remove", "resteasy");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertFalse(screen.contains("quarkus-resteasy"));
+        Assertions.assertTrue(screen.contains("quarkus-amazon-lambda-http"));
+        Assertions.assertTrue(screen.contains("quarkus-jackson"));
+
+        // test remove many
+        execute("rm", "amazon-lambda-http", "jackson");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        execute("list");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertFalse(screen.contains("quarkus-resteasy"));
+        Assertions.assertFalse(screen.contains("quarkus-amazon-lambda-http"));
+        Assertions.assertFalse(screen.contains("quarkus-jackson"));
+
+    }
+
+    @Test
+    public void testCreateMaven() throws Exception {
+        Path project = workspace.resolve("my-rest-project");
+
+        execute("create",
+                "--group-id=com.acme",
+                "--artifact-id=my-rest-project",
+                "--version=4.2",
+                "--maven",
+                "resteasy");
+
+        Assertions.assertEquals(0, exitCode);
+        Assertions.assertTrue(screen.contains("Project my-rest-project created"));
+
+        Assertions.assertTrue(project.resolve("pom.xml").toFile().exists());
+        String pom = readString(project.resolve("pom.xml"));
+        Assertions.assertTrue(pom.contains("<groupId>com.acme</groupId>"));
+        Assertions.assertTrue(pom.contains("<artifactId>my-rest-project</artifactId>"));
+        Assertions.assertTrue(pom.contains("<version>4.2</version>"));
+        Assertions.assertTrue(pom.contains("<artifactId>quarkus-resteasy</artifactId>"));
+    }
+
+    @Test
+    public void testCreateGradleDefaults() throws Exception {
+        Path project = workspace.resolve("code-with-quarkus");
+
+        execute("create", "--gradle");
+
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+        Assertions.assertTrue(screen.contains("Project code-with-quarkus created"));
+
+        Assertions.assertTrue(project.resolve("build.gradle").toFile().exists());
+        String pom = readString(project.resolve("build.gradle"));
+        Assertions.assertTrue(pom.contains("group 'org.acme'"));
+        Assertions.assertTrue(pom.contains("version '1.0.0-SNAPSHOT'"));
+        Assertions.assertTrue(project.resolve("settings.gradle").toFile().exists());
+        String settings = readString(project.resolve("settings.gradle"));
+        Assertions.assertTrue(settings.contains("code-with-quarkus"));
+
+    }
+
+    @Test
+    public void testGradleBuild() throws Exception {
+
+        execute("create", "--gradle", "resteasy");
+
+        Path project = workspace.resolve("code-with-quarkus");
+        System.setProperty("user.dir", project.toFile().getAbsolutePath());
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        execute("build");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        execute("clean");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+    }
+
+    @Test
+    public void testMavenBuild() throws Exception {
+
+        execute("create", "resteasy");
+
+        Path project = workspace.resolve("code-with-quarkus");
+        System.setProperty("user.dir", project.toFile().getAbsolutePath());
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        execute("build");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+        execute("clean");
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+
+    }
+
+    @Test
+    public void testCreateJBangRestEasy() throws Exception {
+
+        execute("create-jbang", "--output-folder=my-jbang-project", "resteasy-jsonb");
+
+        Path project = workspace.resolve("my-jbang-project");
+        System.setProperty("user.dir", project.toFile().getAbsolutePath());
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+    }
+
+    @Test
+    public void testCreateJBangPicocli() throws Exception {
+
+        execute("create-jbang", "--output-folder=my-jbang-project", "quarkus-picocli");
+
+        Path project = workspace.resolve("my-jbang-project");
+        System.setProperty("user.dir", project.toFile().getAbsolutePath());
+        Assertions.assertEquals(CommandLine.ExitCode.OK, exitCode);
+    }
+
+    private void deleteDir(Path path) throws Exception {
+        if (!path.toFile().exists())
+            return;
+        Files.walk(path)
+                .sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                .forEach(File::delete);
+    }
+
+    private void execute(String... args) throws Exception {
+        System.out.print("$ quarkus");
+        args = ExecuteUtil.prependArray("-e", args);
+        args = ExecuteUtil.prependArray("--verbose", args);
+        args = ExecuteUtil.prependArray("--manual-output", args);
+        for (String arg : args)
+            System.out.print(" " + arg);
+        System.out.println();
+        PrintStream stdout = System.out;
+        PrintStream stderr = System.err;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PrintStream ps = new PrintStream(baos);
+        System.setOut(ps);
+        System.setErr(ps);
+
+        QuarkusCli cli = new QuarkusCli();
+        try {
+            exitCode = cli.run(args);
+            ps.flush();
+        } finally {
+            System.setOut(stdout);
+            System.setErr(stderr);
+        }
+        screen = baos.toString();
+        System.out.println(screen);
+    }
+
+    private String readString(Path path) throws Exception {
+        return new String(Files.readAllBytes(path));
+    }
+}
diff --git a/devtools/gradle/.gitignore b/devtools/gradle/.gitignore
new file mode 100644
index 0000000000000..b74cd93b4902c
--- /dev/null
+++ b/devtools/gradle/.gitignore
@@ -0,0 +1,20 @@
+# Created by https://www.toptal.com/developers/gitignore/api/gradle
+# Edit at https://www.toptal.com/developers/gitignore?templates=gradle
+
+### Gradle ###
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.toptal.com/developers/gitignore/api/gradle
diff --git a/devtools/gradle/build.gradle b/devtools/gradle/build.gradle
index 277ac086a64de..e55bfd1ad8d18 100644
--- a/devtools/gradle/build.gradle
+++ b/devtools/gradle/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradle.plugin-publish' version '0.12.0'
+    id 'com.gradle.plugin-publish' version '0.13.0'
     id 'java-gradle-plugin'
 }
 if (JavaVersion.current().isJava9Compatible()) {
@@ -16,33 +16,38 @@ compileTestJava {
 }
 
 repositories {
-    mavenLocal()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
     mavenCentral()
 }
 
-configurations.all {
-    exclude group: 'io.quarkus', module: 'quarkus-bootstrap-maven-resolver'
-}
-
 dependencies {
     api gradleApi()
 
     implementation "io.quarkus:quarkus-bootstrap-core:${version}"
     implementation "io.quarkus:quarkus-devtools-common:${version}"
     implementation "io.quarkus:quarkus-platform-descriptor-json:${version}"
-    implementation "io.quarkus:quarkus-platform-descriptor-resolver-json:${version}"
     implementation "io.quarkus:quarkus-core-deployment:${version}"
 
-    testImplementation 'org.mockito:mockito-core:3.4.4'
-    testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
+    testImplementation 'org.mockito:mockito-core:3.8.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
     testImplementation 'org.awaitility:awaitility:4.0.3'
-    testImplementation 'org.jprocesses:jProcesses:1.6.5'
     testImplementation "io.quarkus:quarkus-devmode-test-utils:${version}"
     testImplementation gradleTestKit()
 }
 
 test {
+    // propagate the custom local maven repo, in case it's configured
+    if (System.properties.containsKey('maven.repo.local')) {
+        systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
+    }
     testLogging {
         events "passed", "skipped", "failed"
     }
@@ -54,9 +59,9 @@ javadoc {
 }
 
 pluginBundle {
-    website = 'https://quarkus.io/' 
-    vcsUrl = 'https://github.com/quarkusio/quarkus' 
-    tags = ['quarkus', 'quarkusio', 'graalvm'] 
+    website = 'https://quarkus.io/'
+    vcsUrl = 'https://github.com/quarkusio/quarkus'
+    tags = ['quarkus', 'quarkusio', 'graalvm']
 }
 
 gradlePlugin {
diff --git a/devtools/gradle/gradle/wrapper/gradle-wrapper.jar b/devtools/gradle/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b9..e708b1c023ec8 100644
Binary files a/devtools/gradle/gradle/wrapper/gradle-wrapper.jar and b/devtools/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/devtools/gradle/gradle/wrapper/gradle-wrapper.properties b/devtools/gradle/gradle/wrapper/gradle-wrapper.properties
index ac33e9944a65e..8cf6eb5ad222e 100644
--- a/devtools/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/devtools/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/devtools/gradle/gradlew b/devtools/gradle/gradlew
index fbd7c515832da..4f906e0c811fc 100755
--- a/devtools/gradle/gradlew
+++ b/devtools/gradle/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/devtools/gradle/gradlew.bat b/devtools/gradle/gradlew.bat
index a9f778a7a964b..ac1b06f93825d 100644
--- a/devtools/gradle/gradlew.bat
+++ b/devtools/gradle/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/devtools/gradle/pom.xml b/devtools/gradle/pom.xml
index 42c2118864d55..cfc5f3bf44de1 100644
--- a/devtools/gradle/pom.xml
+++ b/devtools/gradle/pom.xml
@@ -45,10 +45,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-platform-descriptor-json</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
@@ -80,11 +76,13 @@
                                 <argument>clean</argument>
                                 <argument>${gradle.task}</argument>
                                 <argument>-Pdescription=${project.description}</argument>
+                                <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
                                 <argument>-S</argument>
                                 <argument>--stacktrace</argument>
+                                <argument>--no-daemon</argument>
                             </arguments>
                             <environmentVariables>
-                                <MAVEN_LOCAL_REPO>${settings.localRepository}</MAVEN_LOCAL_REPO>
+                                <MAVEN_REPO_LOCAL>${settings.localRepository}</MAVEN_REPO_LOCAL>
                                 <GRADLE_OPTS>${env.MAVEN_OPTS}</GRADLE_OPTS>
                             </environmentVariables>
                             <skip>${skip.gradle.build}</skip>
@@ -196,5 +194,17 @@
                 <gradle.task>assemble</gradle.task>
             </properties>
         </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <gradle.task>assemble</gradle.task>
+            </properties>
+        </profile>
     </profiles>
 </project>
diff --git a/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleGroovyProjectBuildFile.java b/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleGroovyProjectBuildFile.java
new file mode 100644
index 0000000000000..66a9f7449076d
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleGroovyProjectBuildFile.java
@@ -0,0 +1,42 @@
+package io.quarkus.devtools.project.buildfile;
+
+import org.gradle.api.Project;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class GradleGroovyProjectBuildFile extends GradleProjectBuildFile {
+
+    static final String BUILD_GRADLE_PATH = "build.gradle";
+    static final String SETTINGS_GRADLE_PATH = "settings.gradle";
+
+    public GradleGroovyProjectBuildFile(Project project, ExtensionCatalog catalog) {
+        super(project, catalog);
+    }
+
+    @Override
+    String getSettingsGradlePath() {
+        return SETTINGS_GRADLE_PATH;
+    }
+
+    @Override
+    String getBuildGradlePath() {
+        return BUILD_GRADLE_PATH;
+    }
+
+    @Override
+    protected boolean addDependency(AppArtifactCoords coords, boolean managed) {
+        return addDependencyInModel(getModel(), coords, managed);
+    }
+
+    @Override
+    public BuildTool getBuildTool() {
+        return BuildTool.GRADLE;
+    }
+
+    static boolean addDependencyInModel(Model model, AppArtifactCoords coords, boolean managed) {
+        return addDependencyInModel(model,
+                String.format("    implementation %s%n", createDependencyCoordinatesString(coords, managed, '\'')));
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleKotlinProjectBuildFile.java b/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleKotlinProjectBuildFile.java
new file mode 100644
index 0000000000000..4ca9db743ea10
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleKotlinProjectBuildFile.java
@@ -0,0 +1,42 @@
+package io.quarkus.devtools.project.buildfile;
+
+import org.gradle.api.Project;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class GradleKotlinProjectBuildFile extends GradleProjectBuildFile {
+
+    static final String BUILD_GRADLE_PATH = "build.gradle.kts";
+    static final String SETTINGS_GRADLE_PATH = "settings.gradle.kts";
+
+    public GradleKotlinProjectBuildFile(Project project, ExtensionCatalog catalog) {
+        super(project, catalog);
+    }
+
+    @Override
+    String getSettingsGradlePath() {
+        return SETTINGS_GRADLE_PATH;
+    }
+
+    @Override
+    String getBuildGradlePath() {
+        return BUILD_GRADLE_PATH;
+    }
+
+    @Override
+    protected boolean addDependency(AppArtifactCoords coords, boolean managed) {
+        return addDependencyInModel(getModel(), coords, managed);
+    }
+
+    @Override
+    public BuildTool getBuildTool() {
+        return BuildTool.GRADLE_KOTLIN_DSL;
+    }
+
+    static boolean addDependencyInModel(Model model, AppArtifactCoords coords, boolean managed) {
+        return addDependencyInModel(model,
+                String.format("    implementation(%s)%n", createDependencyCoordinatesString(coords, managed, '"')));
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleProjectBuildFile.java b/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleProjectBuildFile.java
new file mode 100644
index 0000000000000..2ae31c87f2d61
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/devtools/project/buildfile/GradleProjectBuildFile.java
@@ -0,0 +1,63 @@
+package io.quarkus.devtools.project.buildfile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.ModuleDependency;
+import org.gradle.api.artifacts.ResolvedArtifact;
+import org.gradle.api.attributes.Category;
+import org.gradle.api.plugins.JavaPlugin;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public abstract class GradleProjectBuildFile extends AbstractGradleBuildFile {
+
+    private final Project project;
+
+    public GradleProjectBuildFile(Project project, ExtensionCatalog catalog) {
+        super(project.getProjectDir().toPath(), catalog,
+                project.getParent() != null ? project.getRootProject().getProjectDir().toPath()
+                        : project.getProjectDir().toPath());
+        this.project = project;
+    }
+
+    @Override
+    protected List<AppArtifactCoords> getDependencies() throws IOException {
+
+        final Set<Dependency> boms = new HashSet<>();
+        // collect enforced platforms
+        final Configuration impl = project.getConfigurations()
+                .getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME);
+        for (Dependency d : impl.getAllDependencies()) {
+            if (!(d instanceof ModuleDependency)) {
+                continue;
+            }
+            final ModuleDependency module = (ModuleDependency) d;
+            final Category category = module.getAttributes().getAttribute(Category.CATEGORY_ATTRIBUTE);
+            if (category != null && (Category.ENFORCED_PLATFORM.equals(category.getName())
+                    || Category.REGULAR_PLATFORM.equals(category.getName()))) {
+                boms.add(d);
+            }
+        }
+
+        final Set<ResolvedArtifact> resolvedArtifacts = project.getConfigurations()
+                .getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME).getResolvedConfiguration()
+                .getResolvedArtifacts();
+        final List<AppArtifactCoords> coords = new ArrayList<>(boms.size() + resolvedArtifacts.size());
+        boms.forEach(d -> {
+            coords.add(new AppArtifactCoords(d.getGroup(), d.getName(), null, "pom", d.getVersion()));
+        });
+        resolvedArtifacts.forEach(a -> {
+            coords.add(new AppArtifactCoords(a.getModuleVersion().getId().getGroup(), a.getName(),
+                    a.getClassifier(), a.getExtension(), a.getModuleVersion().getId().getVersion()));
+        });
+        return coords;
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/AppModelGradleResolver.java b/devtools/gradle/src/main/java/io/quarkus/gradle/AppModelGradleResolver.java
index 501932d1fd348..4760563d618ae 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/AppModelGradleResolver.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/AppModelGradleResolver.java
@@ -7,6 +7,7 @@
 
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ResolveException;
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.artifacts.ResolvedConfiguration;
 import org.gradle.api.internal.artifacts.dependencies.DefaultDependencyArtifact;
@@ -35,12 +36,23 @@ public AppModelGradleResolver(Project project, QuarkusModel model) {
     @Override
     public String getLatestVersion(AppArtifact appArtifact, String upToVersion, boolean inclusive)
             throws AppModelResolverException {
-        throw new UnsupportedOperationException();
+        try {
+            return resolveArtifact(new AppArtifact(appArtifact.getGroupId(), appArtifact.getArtifactId(),
+                    appArtifact.getClassifier(), appArtifact.getType(),
+                    "[" + appArtifact.getVersion() + "," + upToVersion + (inclusive ? "]" : ")"))).getVersion();
+        } catch (AppModelResolverException e) {
+            return null;
+        }
     }
 
     @Override
     public String getLatestVersionFromRange(AppArtifact appArtifact, String range) throws AppModelResolverException {
-        throw new UnsupportedOperationException();
+        try {
+            return resolveArtifact(new AppArtifact(appArtifact.getGroupId(), appArtifact.getArtifactId(),
+                    appArtifact.getClassifier(), appArtifact.getType(), range)).getVersion();
+        } catch (AppModelResolverException e) {
+            return null;
+        }
     }
 
     @Override
@@ -63,39 +75,52 @@ public void relink(AppArtifact appArtifact, Path localPath) throws AppModelResol
 
     @Override
     public Path resolve(AppArtifact appArtifact) throws AppModelResolverException {
-        if (!appArtifact.isResolved()) {
-            final DefaultDependencyArtifact dep = new DefaultDependencyArtifact();
-            dep.setExtension(appArtifact.getType());
-            dep.setType(appArtifact.getType());
-            dep.setName(appArtifact.getArtifactId());
-            if (appArtifact.getClassifier() != null) {
-                dep.setClassifier(appArtifact.getClassifier());
-            }
+        return resolveArtifact(appArtifact).getPaths().getSinglePath();
+    }
 
-            final DefaultExternalModuleDependency gradleDep = new DefaultExternalModuleDependency(appArtifact.getGroupId(),
-                    appArtifact.getArtifactId(), appArtifact.getVersion(), null);
-            gradleDep.addArtifact(dep);
-
-            final Configuration detachedConfig = project.getConfigurations().detachedConfiguration(gradleDep);
-
-            final ResolvedConfiguration rc = detachedConfig.getResolvedConfiguration();
-            Set<ResolvedArtifact> resolvedArtifacts = rc.getResolvedArtifacts();
-            for (ResolvedArtifact a : resolvedArtifacts) {
-                if (appArtifact.getArtifactId().equals(a.getName())
-                        && appArtifact.getType().equals(a.getType())
-                        && (a.getClassifier() == null ? appArtifact.getClassifier() == null
-                                : a.getClassifier().equals(appArtifact.getClassifier()))
-                        && appArtifact.getGroupId().equals(a.getModuleVersion().getId().getGroup())) {
-                    appArtifact.setPath(a.getFile().toPath());
-                }
-            }
+    private AppArtifact resolveArtifact(AppArtifact appArtifact) throws AppModelResolverException {
+        if (appArtifact.isResolved()) {
+            return appArtifact;
+        }
+        final DefaultDependencyArtifact dep = new DefaultDependencyArtifact();
+        dep.setExtension(appArtifact.getType());
+        dep.setType(appArtifact.getType());
+        dep.setName(appArtifact.getArtifactId());
+        if (appArtifact.getClassifier() != null) {
+            dep.setClassifier(appArtifact.getClassifier());
+        }
+
+        final DefaultExternalModuleDependency gradleDep = new DefaultExternalModuleDependency(appArtifact.getGroupId(),
+                appArtifact.getArtifactId(), appArtifact.getVersion(), null);
+        gradleDep.addArtifact(dep);
 
-            if (!appArtifact.isResolved()) {
-                throw new AppModelResolverException("Failed to resolve " + appArtifact);
+        final Configuration detachedConfig = project.getConfigurations().detachedConfiguration(gradleDep);
+
+        final ResolvedConfiguration rc = detachedConfig.getResolvedConfiguration();
+        Set<ResolvedArtifact> resolvedArtifacts;
+        try {
+            resolvedArtifacts = rc.getResolvedArtifacts();
+        } catch (ResolveException e) {
+            throw new AppModelResolverException("Failed to resolve " + appArtifact, e);
+        }
+        for (ResolvedArtifact a : resolvedArtifacts) {
+            if (appArtifact.getArtifactId().equals(a.getName()) && appArtifact.getType().equals(a.getType())
+                    && (a.getClassifier() == null ? appArtifact.getClassifier() == null
+                            : a.getClassifier().equals(appArtifact.getClassifier()))
+                    && appArtifact.getGroupId().equals(a.getModuleVersion().getId().getGroup())) {
+                if (!appArtifact.getVersion().equals(a.getModuleVersion().getId().getVersion())) {
+                    appArtifact = new AppArtifact(appArtifact.getGroupId(), appArtifact.getArtifactId(),
+                            appArtifact.getClassifier(), appArtifact.getType(), a.getModuleVersion().getId().getVersion());
+                }
+                appArtifact.setPath(a.getFile().toPath());
+                break;
             }
+        }
 
+        if (!appArtifact.isResolved()) {
+            throw new AppModelResolverException("Failed to resolve " + appArtifact);
         }
-        return appArtifact.getPath();
+        return appArtifact;
     }
 
     @Override
@@ -128,5 +153,4 @@ public AppModel resolveManagedModel(AppArtifact appArtifact, List<AppDependency>
             throws AppModelResolverException {
         return resolveModel(appArtifact);
     }
-
 }
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java b/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java
deleted file mode 100644
index 4b3e864bdbbe6..0000000000000
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/GradleBuildFileFromConnector.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package io.quarkus.gradle;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.apache.maven.model.Dependency;
-import org.gradle.tooling.BuildException;
-import org.gradle.tooling.GradleConnector;
-import org.gradle.tooling.ProjectConnection;
-import org.gradle.tooling.model.eclipse.EclipseExternalDependency;
-import org.gradle.tooling.model.eclipse.EclipseProject;
-
-import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-
-public class GradleBuildFileFromConnector extends AbstractGradleBuildFile {
-
-    private List<Dependency> dependencies = null;
-
-    public GradleBuildFileFromConnector(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor) {
-        super(projectDirPath, platformDescriptor);
-    }
-
-    public GradleBuildFileFromConnector(Path projectDirPath, QuarkusPlatformDescriptor platformDescriptor,
-            Path rootProjectPath) {
-        super(projectDirPath, platformDescriptor, rootProjectPath);
-    }
-
-    @Override
-    public List<Dependency> getDependencies() throws IOException {
-        if (dependencies == null) {
-            EclipseProject eclipseProject = null;
-            if (getBuildContent() != null) {
-                try {
-                    ProjectConnection connection = GradleConnector.newConnector()
-                            .forProjectDirectory(getProjectDirPath().toFile())
-                            .connect();
-                    eclipseProject = connection.getModel(EclipseProject.class);
-                } catch (BuildException e) {
-                    // ignore this error.
-                    e.printStackTrace();
-                }
-            }
-            if (eclipseProject != null) {
-                dependencies = eclipseProject.getClasspath().stream().map(this::gradleModuleVersionToDependency)
-                        .filter(Objects::nonNull)
-                        .collect(Collectors.toList());
-            } else {
-                dependencies = Collections.emptyList();
-            }
-            dependencies = Collections.unmodifiableList(dependencies);
-        }
-        return dependencies;
-    }
-
-    private Dependency gradleModuleVersionToDependency(EclipseExternalDependency eed) {
-        Dependency dependency = new Dependency();
-        if (eed == null || eed.getGradleModuleVersion() == null) {
-            // local dependencies are ignored
-            System.err.println("Found null dependency:" + eed);
-            return null;
-        }
-        dependency.setGroupId(eed.getGradleModuleVersion().getGroup());
-        dependency.setArtifactId(eed.getGradleModuleVersion().getName());
-        dependency.setVersion(eed.getGradleModuleVersion().getVersion());
-        return dependency;
-    }
-
-}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
index c4568f8c394df..1db077756ba4b 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java
@@ -16,7 +16,6 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
-import org.gradle.api.UnknownTaskException;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.ProjectDependency;
@@ -32,12 +31,15 @@
 import org.gradle.util.GradleVersion;
 
 import io.quarkus.gradle.builder.QuarkusModelBuilder;
+import io.quarkus.gradle.extension.QuarkusPluginExtension;
+import io.quarkus.gradle.extension.SourceSetExtension;
 import io.quarkus.gradle.tasks.QuarkusAddExtension;
 import io.quarkus.gradle.tasks.QuarkusBuild;
 import io.quarkus.gradle.tasks.QuarkusDev;
+import io.quarkus.gradle.tasks.QuarkusGenerateCode;
 import io.quarkus.gradle.tasks.QuarkusGenerateConfig;
 import io.quarkus.gradle.tasks.QuarkusListExtensions;
-import io.quarkus.gradle.tasks.QuarkusPrepare;
+import io.quarkus.gradle.tasks.QuarkusListPlatforms;
 import io.quarkus.gradle.tasks.QuarkusRemoteDev;
 import io.quarkus.gradle.tasks.QuarkusRemoveExtension;
 import io.quarkus.gradle.tasks.QuarkusTestConfig;
@@ -50,14 +52,16 @@ public class QuarkusPlugin implements Plugin<Project> {
 
     public static final String EXTENSION_NAME = "quarkus";
     public static final String LIST_EXTENSIONS_TASK_NAME = "listExtensions";
+    public static final String LIST_PLATFORMS_TASK_NAME = "listPlatforms";
     public static final String ADD_EXTENSION_TASK_NAME = "addExtension";
     public static final String REMOVE_EXTENSION_TASK_NAME = "removeExtension";
-    public static final String QUARKUS_PREPARE_TASK_NAME = "quarkusPrepare";
-    public static final String QUARKUS_PREPARE_TESTS_TASK_NAME = "quarkusPrepareTests";
+    public static final String QUARKUS_GENERATE_CODE_TASK_NAME = "quarkusGenerateCode";
+    public static final String QUARKUS_GENERATE_CODE_TESTS_TASK_NAME = "quarkusGenerateCodeTests";
     public static final String QUARKUS_BUILD_TASK_NAME = "quarkusBuild";
     public static final String GENERATE_CONFIG_TASK_NAME = "generateConfig";
     public static final String QUARKUS_DEV_TASK_NAME = "quarkusDev";
     public static final String QUARKUS_REMOTE_DEV_TASK_NAME = "quarkusRemoteDev";
+    public static final String DEV_MODE_CONFIGURATION_NAME = "quarkusDev";
 
     @Deprecated
     public static final String BUILD_NATIVE_TASK_NAME = "buildNative";
@@ -88,20 +92,21 @@ public void apply(Project project) {
         registerTasks(project, quarkusExt);
     }
 
-    @SuppressWarnings("Convert2Lambda")
     private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
         TaskContainer tasks = project.getTasks();
         tasks.create(LIST_EXTENSIONS_TASK_NAME, QuarkusListExtensions.class);
+        tasks.create(LIST_PLATFORMS_TASK_NAME, QuarkusListPlatforms.class);
         tasks.create(ADD_EXTENSION_TASK_NAME, QuarkusAddExtension.class);
         tasks.create(REMOVE_EXTENSION_TASK_NAME, QuarkusRemoveExtension.class);
         tasks.create(GENERATE_CONFIG_TASK_NAME, QuarkusGenerateConfig.class);
 
-        QuarkusPrepare quarkusPrepare = tasks.create(QUARKUS_PREPARE_TASK_NAME, QuarkusPrepare.class);
-        QuarkusPrepare quarkusPrepareTests = tasks.create(QUARKUS_PREPARE_TESTS_TASK_NAME, QuarkusPrepare.class);
-        quarkusPrepareTests.setTest(true);
+        QuarkusGenerateCode quarkusGenerateCode = tasks.create(QUARKUS_GENERATE_CODE_TASK_NAME, QuarkusGenerateCode.class);
+        QuarkusGenerateCode quarkusGenerateCodeTests = tasks.create(QUARKUS_GENERATE_CODE_TESTS_TASK_NAME,
+                QuarkusGenerateCode.class);
+        quarkusGenerateCodeTests.setTest(true);
 
         Task quarkusBuild = tasks.create(QUARKUS_BUILD_TASK_NAME, QuarkusBuild.class);
-        quarkusBuild.dependsOn(quarkusPrepare);
+        quarkusBuild.dependsOn(quarkusGenerateCode);
         Task quarkusDev = tasks.create(QUARKUS_DEV_TASK_NAME, QuarkusDev.class);
         Task quarkusRemoteDev = tasks.create(QUARKUS_REMOTE_DEV_TASK_NAME, QuarkusRemoteDev.class);
         tasks.create(QUARKUS_TEST_CONFIG_TASK_NAME, QuarkusTestConfig.class);
@@ -135,22 +140,24 @@ public void execute(Task test) {
                 JavaPlugin.class,
                 javaPlugin -> {
                     project.afterEvaluate(this::afterEvaluate);
+                    ConfigurationContainer configurations = project.getConfigurations();
                     JavaCompile compileJavaTask = (JavaCompile) tasks.getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
-                    compileJavaTask.mustRunAfter(quarkusPrepare);
-                    quarkusPrepare.setSourceRegistrar(compileJavaTask::source);
-
-                    try {
-                        // TODO: support kotlin
-                        tasks.getByName("compileTestKotlin");
-                    } catch (UnknownTaskException noKotlin) {
-                        JavaCompile compileTestJavaTask = (JavaCompile) tasks.getByName(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME);
-                        compileTestJavaTask.dependsOn(quarkusPrepareTests);
-                        quarkusPrepareTests.setSourceRegistrar(compileTestJavaTask::source);
-                    }
+
+                    // By default, gradle looks for annotation processors in the annotationProcessor configuration.
+                    // This configure the compile task to look for annotation processors in the compileClasspath.
+                    compileJavaTask.getOptions().setAnnotationProcessorPath(
+                            configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME));
+
+                    compileJavaTask.dependsOn(quarkusGenerateCode);
+                    quarkusGenerateCode.setSourceRegistrar(compileJavaTask::source);
+
+                    JavaCompile compileTestJavaTask = (JavaCompile) tasks.getByName(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME);
+                    compileTestJavaTask.dependsOn(quarkusGenerateCodeTests);
+                    quarkusGenerateCodeTests.setSourceRegistrar(compileTestJavaTask::source);
 
                     Task classesTask = tasks.getByName(JavaPlugin.CLASSES_TASK_NAME);
                     Task resourcesTask = tasks.getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME);
-                    quarkusDev.dependsOn(classesTask, resourcesTask, quarkusPrepare);
+                    quarkusDev.dependsOn(classesTask, resourcesTask, quarkusGenerateCode);
                     quarkusRemoteDev.dependsOn(classesTask, resourcesTask);
                     quarkusBuild.dependsOn(classesTask, resourcesTask, tasks.getByName(JavaPlugin.JAR_TASK_NAME));
 
@@ -160,8 +167,8 @@ public void execute(Task test) {
                     SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
                     SourceSet testSourceSet = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME);
 
-                    quarkusPrepare.setSourcesDirectories(getSourcesParents(mainSourceSet));
-                    quarkusPrepareTests.setSourcesDirectories(getSourcesParents(testSourceSet));
+                    quarkusGenerateCode.setSourcesDirectories(getSourcesParents(mainSourceSet));
+                    quarkusGenerateCodeTests.setSourcesDirectories(getSourcesParents(testSourceSet));
 
                     nativeTestSourceSet.setCompileClasspath(
                             nativeTestSourceSet.getCompileClasspath()
@@ -173,8 +180,12 @@ public void execute(Task test) {
                                     .plus(mainSourceSet.getOutput())
                                     .plus(testSourceSet.getOutput()));
 
+                    // create a custom configuration for devmode
+                    configurations.create(DEV_MODE_CONFIGURATION_NAME).extendsFrom(
+                            configurations.getByName(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME),
+                            configurations.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
+
                     // create a custom configuration to be used for the dependencies of the testNative task
-                    ConfigurationContainer configurations = project.getConfigurations();
                     configurations.maybeCreate(NATIVE_TEST_IMPLEMENTATION_CONFIGURATION_NAME)
                             .extendsFrom(configurations.findByName(JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME));
                     configurations.maybeCreate(NATIVE_TEST_RUNTIME_ONLY_CONFIGURATION_NAME)
@@ -186,7 +197,29 @@ public void execute(Task test) {
 
                     tasks.withType(Test.class).forEach(configureTestTask);
                     tasks.withType(Test.class).whenTaskAdded(configureTestTask::accept);
+
+                    sourceSets.create(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES).getOutput()
+                            .dir(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES);
+                    sourceSets.create(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES).getOutput()
+                            .dir(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES);
                 });
+
+        project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> {
+            tasks.getByName("compileKotlin").dependsOn(quarkusGenerateCode);
+            tasks.getByName("compileTestKotlin").dependsOn(quarkusGenerateCodeTests);
+
+            // Register the quarkus-generated-code
+            SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
+                    .getSourceSets();
+            SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+            SourceSet testSourceSet = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME);
+            SourceSet generatedSourceSet = sourceSets.getByName(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES);
+            SourceSet generatedTestSourceSet = sourceSets.getByName(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES);
+            for (String provider : QuarkusGenerateCode.CODE_GENERATION_PROVIDER) {
+                mainSourceSet.getJava().srcDir(new File(generatedSourceSet.getJava().getOutputDir(), provider));
+                testSourceSet.getJava().srcDir(new File(generatedTestSourceSet.getJava().getOutputDir(), provider));
+            }
+        });
     }
 
     private Set<Path> getSourcesParents(SourceSet mainSourceSet) {
@@ -220,13 +253,37 @@ private void configureBuildNativeTask(Project project) {
 
     private void afterEvaluate(Project project) {
         final HashSet<String> visited = new HashSet<>();
-        project.getConfigurations().getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
+        ConfigurationContainer configurations = project.getConfigurations();
+        configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)
                 .getIncoming().getDependencies()
                 .forEach(d -> {
                     if (d instanceof ProjectDependency) {
                         visitProjectDep(project, ((ProjectDependency) d).getDependencyProject(), visited);
                     }
                 });
+
+        SourceSetExtension sourceSetExtension = project.getExtensions().getByType(QuarkusPluginExtension.class)
+                .sourceSetExtension();
+
+        if (sourceSetExtension.extraNativeTest() != null) {
+
+            SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
+                    .getSourceSets();
+            SourceSet nativeTestSourceSets = sourceSets.getByName(NATIVE_TEST_SOURCE_SET_NAME);
+            nativeTestSourceSets.setCompileClasspath(
+                    nativeTestSourceSets.getCompileClasspath().plus(sourceSetExtension.extraNativeTest().getOutput()));
+            nativeTestSourceSets.setRuntimeClasspath(
+                    nativeTestSourceSets.getRuntimeClasspath().plus(sourceSetExtension.extraNativeTest().getOutput()));
+
+            configurations.findByName(NATIVE_TEST_IMPLEMENTATION_CONFIGURATION_NAME).extendsFrom(
+                    configurations.findByName(sourceSetExtension.extraNativeTest().getImplementationConfigurationName()));
+            configurations.findByName(NATIVE_TEST_RUNTIME_ONLY_CONFIGURATION_NAME).extendsFrom(
+                    configurations.findByName(sourceSetExtension.extraNativeTest().getRuntimeOnlyConfigurationName()));
+
+            QuarkusTestNative nativeTest = (QuarkusTestNative) project.getTasks().getByName(TEST_NATIVE_TASK_NAME);
+            nativeTest.setTestClassesDirs(nativeTestSourceSets.getOutput().getClassesDirs());
+            nativeTest.setClasspath(nativeTestSourceSets.getRuntimeClasspath());
+        }
     }
 
     private void visitProjectDep(Project project, Project dep, Set<String> visited) {
@@ -249,8 +306,8 @@ private void setupQuarkusBuildTaskDeps(Project project, Project dep, Set<String>
         if (quarkusBuild != null) {
             final Task jarTask = dep.getTasks().findByName(JavaPlugin.JAR_TASK_NAME);
             if (jarTask != null) {
-                final Task quarkusPrepare = project.getTasks().findByName(QUARKUS_PREPARE_TASK_NAME);
-                final Task quarkusPrepareTests = project.getTasks().findByName(QUARKUS_PREPARE_TESTS_TASK_NAME);
+                final Task quarkusPrepare = project.getTasks().findByName(QUARKUS_GENERATE_CODE_TASK_NAME);
+                final Task quarkusPrepareTests = project.getTasks().findByName(QUARKUS_GENERATE_CODE_TESTS_TASK_NAME);
                 quarkusBuild.dependsOn(jarTask);
                 if (quarkusPrepare != null) {
                     quarkusPrepare.dependsOn(jarTask);
@@ -267,6 +324,11 @@ private void setupQuarkusBuildTaskDeps(Project project, Project dep, Set<String>
             if (resourcesTask != null) {
                 quarkusDev.dependsOn(resourcesTask);
             }
+            final Task resourcesTaskJandex = dep.getTasks().findByName("jandex");
+            if (resourcesTaskJandex != null) {
+                quarkusDev.dependsOn(resourcesTaskJandex);
+            }
+
         }
 
         final Configuration compileConfig = dep.getConfigurations().findByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME);
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java
deleted file mode 100644
index 900a2bffe3395..0000000000000
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPluginExtension.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package io.quarkus.gradle;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-import java.util.Set;
-
-import org.gradle.api.Project;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.RegularFile;
-import org.gradle.api.plugins.Convention;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.testing.Test;
-import org.gradle.jvm.tasks.Jar;
-
-import io.quarkus.bootstrap.BootstrapConstants;
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.model.AppModel;
-import io.quarkus.bootstrap.resolver.AppModelResolver;
-import io.quarkus.bootstrap.resolver.model.ModelParameter;
-import io.quarkus.bootstrap.resolver.model.QuarkusModel;
-import io.quarkus.bootstrap.resolver.model.impl.ModelParameterImpl;
-import io.quarkus.gradle.builder.QuarkusModelBuilder;
-import io.quarkus.gradle.tasks.QuarkusGradleUtils;
-import io.quarkus.runtime.LaunchMode;
-
-public class QuarkusPluginExtension {
-
-    private final Project project;
-
-    private File outputDirectory;
-
-    private String finalName;
-
-    private File sourceDir;
-
-    private File workingDir;
-
-    private File outputConfigDirectory;
-
-    public QuarkusPluginExtension(Project project) {
-        this.project = project;
-    }
-
-    void beforeTest(Test task) {
-        try {
-            final Map<String, Object> props = task.getSystemProperties();
-
-            final AppModel appModel = getAppModelResolver(LaunchMode.TEST)
-                    .resolveModel(getAppArtifact());
-            final Path serializedModel = QuarkusGradleUtils.serializeAppModel(appModel, task);
-            props.put(BootstrapConstants.SERIALIZED_APP_MODEL, serializedModel.toString());
-
-            final String nativeRunner = task.getProject().getBuildDir().toPath().resolve(finalName() + "-runner")
-                    .toAbsolutePath()
-                    .toString();
-            props.put("native.image.path", nativeRunner);
-        } catch (Exception e) {
-            throw new IllegalStateException("Failed to resolve deployment classpath", e);
-        }
-    }
-
-    public Path appJarOrClasses() {
-        final Jar jarTask = (Jar) project.getTasks().findByName(JavaPlugin.JAR_TASK_NAME);
-        if (jarTask == null) {
-            throw new RuntimeException("Failed to locate task 'jar' in the project.");
-        }
-        final Provider<RegularFile> jarProvider = jarTask.getArchiveFile();
-        Path classesDir = null;
-        if (jarProvider.isPresent()) {
-            final File f = jarProvider.get().getAsFile();
-            if (f.exists()) {
-                classesDir = f.toPath();
-            }
-        }
-        if (classesDir == null) {
-            final Convention convention = project.getConvention();
-            JavaPluginConvention javaConvention = convention.findPlugin(JavaPluginConvention.class);
-            if (javaConvention != null) {
-                final SourceSet mainSourceSet = javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-                final String classesPath = QuarkusGradleUtils.getClassesDir(mainSourceSet, jarTask.getTemporaryDir());
-                if (classesPath != null) {
-                    classesDir = Paths.get(classesPath);
-                }
-            }
-        }
-        if (classesDir == null) {
-            throw new RuntimeException("Failed to locate project's classes directory");
-        }
-        return classesDir;
-    }
-
-    public File outputDirectory() {
-        if (outputDirectory == null) {
-            outputDirectory = getLastFile(project.getConvention().getPlugin(JavaPluginConvention.class)
-                    .getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput().getClassesDirs());
-        }
-        return outputDirectory;
-    }
-
-    public void setOutputDirectory(String outputDirectory) {
-        this.outputDirectory = new File(outputDirectory);
-    }
-
-    public File outputConfigDirectory() {
-        if (outputConfigDirectory == null) {
-            outputConfigDirectory = project.getConvention().getPlugin(JavaPluginConvention.class)
-                    .getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput().getResourcesDir();
-        }
-        return outputConfigDirectory;
-    }
-
-    public void setOutputConfigDirectory(String outputConfigDirectory) {
-        this.outputConfigDirectory = new File(outputConfigDirectory);
-    }
-
-    public File sourceDir() {
-        if (sourceDir == null) {
-            sourceDir = getLastFile(project.getConvention().getPlugin(JavaPluginConvention.class)
-                    .getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getAllJava().getSourceDirectories());
-        }
-        return sourceDir;
-    }
-
-    public void setSourceDir(String sourceDir) {
-        this.sourceDir = new File(sourceDir);
-    }
-
-    public File workingDir() {
-        if (workingDir == null) {
-            workingDir = outputDirectory();
-        }
-        return workingDir;
-    }
-
-    public void setWorkingDir(String workingDir) {
-        this.workingDir = new File(workingDir);
-    }
-
-    public String finalName() {
-        if (finalName == null || finalName.length() == 0) {
-            this.finalName = String.format("%s-%s", project.getName(), project.getVersion());
-        }
-        return finalName;
-    }
-
-    public void setFinalName(String finalName) {
-        this.finalName = finalName;
-    }
-
-    public Set<File> resourcesDir() {
-        return project.getConvention().getPlugin(JavaPluginConvention.class)
-                .getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getResources().getSrcDirs();
-    }
-
-    public AppArtifact getAppArtifact() {
-        return new AppArtifact(project.getGroup().toString(), project.getName(),
-                project.getVersion().toString());
-    }
-
-    public AppModelResolver getAppModelResolver() {
-        return getAppModelResolver(LaunchMode.NORMAL);
-    }
-
-    public AppModelResolver getAppModelResolver(LaunchMode mode) {
-        return new AppModelGradleResolver(project, getQuarkusModel(mode));
-    }
-
-    public QuarkusModel getQuarkusModel() {
-        return getQuarkusModel(LaunchMode.NORMAL);
-    }
-
-    public QuarkusModel getQuarkusModel(LaunchMode mode) {
-        return create(project, mode);
-    }
-
-    private QuarkusModel create(Project project, LaunchMode mode) {
-        QuarkusModelBuilder builder = new QuarkusModelBuilder();
-        ModelParameter params = new ModelParameterImpl();
-        params.setMode(mode.toString());
-        return (QuarkusModel) builder.buildAll(QuarkusModel.class.getName(), params, project);
-    }
-
-    /**
-     * Returns the last file from the specified {@link FileCollection}.
-     * Needed for the Scala plugin.
-     */
-    private File getLastFile(FileCollection fileCollection) {
-        File result = null;
-        for (File f : fileCollection) {
-            if (result == null || f.exists()) {
-                result = f;
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java b/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java
index 60f202b688aec..8a1115b1a96f5 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/builder/QuarkusModelBuilder.java
@@ -1,29 +1,43 @@
 package io.quarkus.gradle.builder;
 
+import static io.quarkus.bootstrap.resolver.model.impl.ArtifactCoordsImpl.TYPE_JAR;
+
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.UnknownDomainObjectException;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ModuleDependency;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.artifacts.ResolvedConfiguration;
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
 import org.gradle.api.attributes.Category;
+import org.gradle.api.initialization.IncludedBuild;
+import org.gradle.api.internal.artifacts.dependencies.DefaultDependencyArtifact;
 import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency;
 import org.gradle.api.plugins.Convention;
 import org.gradle.api.plugins.JavaPlugin;
@@ -32,6 +46,7 @@
 import org.gradle.tooling.provider.model.ParameterizedToolingModelBuilder;
 
 import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.bootstrap.resolver.model.ArtifactCoords;
 import io.quarkus.bootstrap.resolver.model.Dependency;
 import io.quarkus.bootstrap.resolver.model.ModelParameter;
@@ -45,12 +60,25 @@
 import io.quarkus.bootstrap.resolver.model.impl.WorkspaceImpl;
 import io.quarkus.bootstrap.resolver.model.impl.WorkspaceModuleImpl;
 import io.quarkus.bootstrap.util.QuarkusModelHelper;
+import io.quarkus.gradle.QuarkusPlugin;
 import io.quarkus.gradle.tasks.QuarkusGradleUtils;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.util.HashUtil;
+
+public class QuarkusModelBuilder implements ParameterizedToolingModelBuilder<ModelParameter> {
 
-public class QuarkusModelBuilder implements ParameterizedToolingModelBuilder {
+    private static final String MAIN_RESOURCES_OUTPUT = "build/resources/main";
+    private static final String CLASSES_OUTPUT = "build/classes";
 
-    private static final List<String> scannedConfigurations = new LinkedList();
+    private static Configuration classpathConfig(Project project, LaunchMode mode) {
+        if (LaunchMode.TEST.equals(mode)) {
+            return project.getConfigurations().getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME);
+        }
+        if (LaunchMode.DEVELOPMENT.equals(mode)) {
+            return project.getConfigurations().getByName(QuarkusPlugin.DEV_MODE_CONFIGURATION_NAME);
+        }
+        return project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
+    }
 
     @Override
     public boolean canBuild(String modelName) {
@@ -58,7 +86,7 @@ public boolean canBuild(String modelName) {
     }
 
     @Override
-    public Class getParameterType() {
+    public Class<ModelParameter> getParameterType() {
         return ModelParameter.class;
     }
 
@@ -70,109 +98,187 @@ public Object buildAll(String modelName, Project project) {
     }
 
     @Override
-    public Object buildAll(String modelName, Object parameter, Project project) {
-        LaunchMode mode = LaunchMode.valueOf(((ModelParameter) parameter).getMode());
+    public Object buildAll(String modelName, ModelParameter parameter, Project project) {
+        LaunchMode mode = LaunchMode.valueOf(parameter.getMode());
 
-        if (LaunchMode.TEST.equals(mode)) {
-            scannedConfigurations.add(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME);
-        } else {
-            scannedConfigurations.add(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
-        }
+        final List<org.gradle.api.artifacts.Dependency> deploymentDeps = getEnforcedPlatforms(project);
 
-        if (LaunchMode.DEVELOPMENT.equals(mode)) {
-            scannedConfigurations.add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME);
-        }
+        final Map<String, String> platformProperties = resolvePlatformProperties(project, deploymentDeps);
 
-        final Collection<org.gradle.api.artifacts.Dependency> directExtensionDependencies = getEnforcedPlatforms(project);
+        final Map<ArtifactCoords, Dependency> appDependencies = new LinkedHashMap<>();
+        final Set<ArtifactCoords> visitedDeps = new HashSet<>();
 
-        final Map<ArtifactCoords, Dependency> appDependencies = new HashMap<>();
-        for (String configurationName : scannedConfigurations) {
-            final ResolvedConfiguration configuration = project.getConfigurations().getByName(configurationName)
-                    .getResolvedConfiguration();
-            appDependencies.putAll(collectDependencies(configuration, configurationName, mode, project));
-            directExtensionDependencies
-                    .addAll(getDirectExtensionDependencies(configuration.getFirstLevelModuleDependencies(), appDependencies,
-                            new HashSet<>()));
-        }
+        final ResolvedConfiguration resolvedConfiguration = classpathConfig(project, mode).getResolvedConfiguration();
+        collectDependencies(resolvedConfiguration, mode, project, appDependencies);
+        collectFirstMetDeploymentDeps(resolvedConfiguration.getFirstLevelModuleDependencies(), appDependencies,
+                deploymentDeps, visitedDeps);
 
-        final Set<Dependency> extensionDependencies = collectExtensionDependencies(project, directExtensionDependencies);
+        final List<Dependency> extensionDependencies = collectExtensionDependencies(project, deploymentDeps);
 
         ArtifactCoords appArtifactCoords = new ArtifactCoordsImpl(project.getGroup().toString(), project.getName(),
                 project.getVersion().toString());
 
-        return new QuarkusModelImpl(new WorkspaceImpl(appArtifactCoords, getWorkspace(project.getRootProject())),
-                new HashSet<>(appDependencies.values()),
-                extensionDependencies);
+        return new QuarkusModelImpl(
+                new WorkspaceImpl(appArtifactCoords, getWorkspace(project.getRootProject(), mode, appArtifactCoords)),
+                new LinkedList<>(appDependencies.values()),
+                extensionDependencies,
+                deploymentDeps.stream().map(QuarkusModelBuilder::toEnforcedPlatformDependency)
+                        .filter(Objects::nonNull).collect(Collectors.toList()),
+                platformProperties);
     }
 
-    public Set<WorkspaceModule> getWorkspace(Project project) {
+    private Map<String, String> resolvePlatformProperties(Project project,
+            List<org.gradle.api.artifacts.Dependency> deploymentDeps) {
+        final Configuration boms = project.getConfigurations()
+                .detachedConfiguration(deploymentDeps.toArray(new org.gradle.api.artifacts.Dependency[0]));
+        final Map<String, String> platformProps = new HashMap<>();
+        final Set<AppArtifactKey> descriptorKeys = new HashSet<>(4);
+        final Set<AppArtifactKey> propertyKeys = new HashSet<>(2);
+        boms.getResolutionStrategy().eachDependency(d -> {
+            final String group = d.getTarget().getGroup();
+            final String name = d.getTarget().getName();
+            if (name.endsWith(BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)) {
+                descriptorKeys.add(new AppArtifactKey(group,
+                        name.substring(0, name.length() - BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX.length()),
+                        d.getTarget().getVersion()));
+            } else if (name.endsWith(BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX)) {
+                final DefaultDependencyArtifact dep = new DefaultDependencyArtifact();
+                dep.setExtension("properties");
+                dep.setType("properties");
+                dep.setName(name);
+
+                final DefaultExternalModuleDependency gradleDep = new DefaultExternalModuleDependency(
+                        group, name, d.getTarget().getVersion(), null);
+                gradleDep.addArtifact(dep);
+
+                for (ResolvedArtifact a : project.getConfigurations().detachedConfiguration(gradleDep)
+                        .getResolvedConfiguration().getResolvedArtifacts()) {
+                    if (a.getName().equals(name)) {
+                        final Properties props = new Properties();
+                        try (InputStream is = new FileInputStream(a.getFile())) {
+                            props.load(is);
+                        } catch (IOException e) {
+                            throw new GradleException("Failed to read properties from " + a.getFile(), e);
+                        }
+                        for (Map.Entry<?, ?> prop : props.entrySet()) {
+                            final String propName = String.valueOf(prop.getKey());
+                            if (propName.startsWith(BootstrapConstants.PLATFORM_PROPERTY_PREFIX)) {
+                                platformProps.put(propName, String.valueOf(prop.getValue()));
+                            }
+                        }
+                        break;
+                    }
+                }
+                propertyKeys.add(new AppArtifactKey(group,
+                        name.substring(0, name.length() - BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX.length()),
+                        d.getTarget().getVersion()));
+            }
+
+        });
+        boms.getResolvedConfiguration();
+        if (!descriptorKeys.containsAll(propertyKeys)) {
+            final StringBuilder buf = new StringBuilder();
+            buf.append(
+                    "The Quarkus platform properties applied to the project are missing the corresponding Quarkus platform BOM imports:");
+            final int l = buf.length();
+            for (AppArtifactKey key : propertyKeys) {
+                if (!descriptorKeys.contains(key)) {
+                    if (l - buf.length() < 0) {
+                        buf.append(',');
+                    }
+                    buf.append(' ').append(key);
+                }
+            }
+            throw new GradleException(buf.toString());
+        }
+        return platformProps;
+    }
+
+    public Set<WorkspaceModule> getWorkspace(Project project, LaunchMode mode, ArtifactCoords mainModuleCoord) {
         Set<WorkspaceModule> modules = new HashSet<>();
         for (Project subproject : project.getAllprojects()) {
             final Convention convention = subproject.getConvention();
             JavaPluginConvention javaConvention = convention.findPlugin(JavaPluginConvention.class);
-            if (javaConvention == null) {
+            if (javaConvention == null || !javaConvention.getSourceSets().getNames().contains(SourceSet.MAIN_SOURCE_SET_NAME)) {
                 continue;
             }
-            modules.add(getWorkspaceModule(subproject));
+            if (subproject.getName().equals(mainModuleCoord.getArtifactId())
+                    && subproject.getGroup().equals(mainModuleCoord.getGroupId())) {
+                modules.add(getWorkspaceModule(subproject, mode, true));
+            } else {
+                modules.add(getWorkspaceModule(subproject, mode, false));
+            }
+
         }
         return modules;
     }
 
-    private WorkspaceModule getWorkspaceModule(Project project) {
+    private WorkspaceModule getWorkspaceModule(Project project, LaunchMode mode, boolean isMainModule) {
         ArtifactCoords appArtifactCoords = new ArtifactCoordsImpl(project.getGroup().toString(), project.getName(),
                 project.getVersion().toString());
         final SourceSet mainSourceSet = QuarkusGradleUtils.getSourceSet(project, SourceSet.MAIN_SOURCE_SET_NAME);
-
-        return new WorkspaceModuleImpl(appArtifactCoords, project.getProjectDir().getAbsoluteFile(),
-                project.getBuildDir().getAbsoluteFile(), getSourceSourceSet(mainSourceSet), convert(mainSourceSet));
+        final SourceSetImpl modelSourceSet = convert(mainSourceSet);
+        WorkspaceModuleImpl workspaceModule = new WorkspaceModuleImpl(appArtifactCoords,
+                project.getProjectDir().getAbsoluteFile(),
+                project.getBuildDir().getAbsoluteFile(), getSourceSourceSet(mainSourceSet), modelSourceSet);
+        if (isMainModule && mode == LaunchMode.TEST) {
+            final SourceSet testSourceSet = QuarkusGradleUtils.getSourceSet(project, SourceSet.TEST_SOURCE_SET_NAME);
+            workspaceModule.getSourceSet().getSourceDirectories().addAll(testSourceSet.getOutput().getClassesDirs().getFiles());
+        }
+        return workspaceModule;
     }
 
-    private Set<org.gradle.api.artifacts.Dependency> getEnforcedPlatforms(Project project) {
-        final Set<org.gradle.api.artifacts.Dependency> directExtension = new HashSet<>();
+    private List<org.gradle.api.artifacts.Dependency> getEnforcedPlatforms(Project project) {
+        final List<org.gradle.api.artifacts.Dependency> directExtension = new ArrayList<>();
         // collect enforced platforms
         final Configuration impl = project.getConfigurations()
                 .getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME);
+
         for (org.gradle.api.artifacts.Dependency d : impl.getAllDependencies()) {
             if (!(d instanceof ModuleDependency)) {
                 continue;
             }
             final ModuleDependency module = (ModuleDependency) d;
             final Category category = module.getAttributes().getAttribute(Category.CATEGORY_ATTRIBUTE);
-            if (category != null && Category.ENFORCED_PLATFORM.equals(category.getName())) {
+            if (category != null && (Category.ENFORCED_PLATFORM.equals(category.getName())
+                    || Category.REGULAR_PLATFORM.equals(category.getName()))) {
                 directExtension.add(d);
             }
         }
         return directExtension;
     }
 
-    private Set<org.gradle.api.artifacts.Dependency> getDirectExtensionDependencies(Set<ResolvedDependency> dependencies,
-            Map<ArtifactCoords, Dependency> appDependencies, Set<ArtifactCoords> visited) {
-        Set<org.gradle.api.artifacts.Dependency> extensions = new HashSet<>();
+    private void collectFirstMetDeploymentDeps(Set<ResolvedDependency> dependencies,
+            Map<ArtifactCoords, Dependency> appDependencies, List<org.gradle.api.artifacts.Dependency> extensionDeps,
+            Set<ArtifactCoords> visited) {
         for (ResolvedDependency d : dependencies) {
-            ArtifactCoords key = new ArtifactCoordsImpl(d.getModuleGroup(), d.getModuleName(), "");
-            if (!visited.add(key)) {
-                continue;
-            }
+            boolean addChildExtension = true;
+            boolean wasDependencyVisited = false;
+            for (ResolvedArtifact artifact : d.getModuleArtifacts()) {
+                ModuleVersionIdentifier moduleIdentifier = artifact.getModuleVersion().getId();
+                ArtifactCoords key = toAppDependenciesKey(moduleIdentifier.getGroup(), moduleIdentifier.getName(),
+                        artifact.getClassifier());
+                if (!visited.add(key)) {
+                    continue;
+                }
 
-            Dependency appDep = appDependencies.get(key);
-            if (appDep == null) {
-                continue;
-            }
-            final org.gradle.api.artifacts.Dependency deploymentArtifact = getDeploymentArtifact(appDep);
+                Dependency appDep = appDependencies.get(key);
+                if (appDep == null) {
+                    continue;
+                }
 
-            boolean addChildExtension = true;
-            if (deploymentArtifact != null && addChildExtension) {
-                extensions.add(deploymentArtifact);
-                addChildExtension = false;
+                wasDependencyVisited = true;
+                final org.gradle.api.artifacts.Dependency deploymentArtifact = getDeploymentArtifact(appDep);
+                if (deploymentArtifact != null) {
+                    extensionDeps.add(deploymentArtifact);
+                    addChildExtension = false;
+                }
             }
-
             final Set<ResolvedDependency> resolvedChildren = d.getChildren();
-            if (addChildExtension && !resolvedChildren.isEmpty()) {
-                extensions
-                        .addAll(getDirectExtensionDependencies(resolvedChildren, appDependencies, visited));
+            if (wasDependencyVisited && addChildExtension && !resolvedChildren.isEmpty()) {
+                collectFirstMetDeploymentDeps(resolvedChildren, appDependencies, extensionDeps, visited);
             }
         }
-        return extensions;
     }
 
     private org.gradle.api.artifacts.Dependency getDeploymentArtifact(Dependency dependency) {
@@ -208,9 +314,9 @@ private org.gradle.api.artifacts.Dependency getDeploymentArtifact(Dependency dep
         return null;
     }
 
-    private Set<Dependency> collectExtensionDependencies(Project project,
+    private List<Dependency> collectExtensionDependencies(Project project,
             Collection<org.gradle.api.artifacts.Dependency> extensions) {
-        final Set<Dependency> platformDependencies = new HashSet<>();
+        final List<Dependency> platformDependencies = new LinkedList<>();
 
         final Configuration deploymentConfig = project.getConfigurations()
                 .detachedConfiguration(extensions.toArray(new org.gradle.api.artifacts.Dependency[0]));
@@ -220,41 +326,145 @@ private Set<Dependency> collectExtensionDependencies(Project project,
                 continue;
             }
 
-            final Dependency dependency = toDependency(a, deploymentConfig.getName());
+            final Dependency dependency = toDependency(a);
             platformDependencies.add(dependency);
         }
 
         return platformDependencies;
     }
 
-    private Map<ArtifactCoords, Dependency> collectDependencies(ResolvedConfiguration configuration, String configurationName,
-            LaunchMode mode, Project project) {
-        Map<ArtifactCoords, Dependency> modelDependencies = new HashMap<>();
-        for (ResolvedArtifact a : configuration.getResolvedArtifacts()) {
+    private void collectDependencies(ResolvedConfiguration configuration,
+            LaunchMode mode, Project project, Map<ArtifactCoords, Dependency> appDependencies) {
+
+        final Set<ResolvedArtifact> artifacts = configuration.getResolvedArtifacts();
+        Set<File> artifactFiles = null;
+
+        // if the number of artifacts is less than the number of files then probably
+        // the project includes direct file dependencies
+        if (artifacts.size() < configuration.getFiles().size()) {
+            artifactFiles = new HashSet<>(artifacts.size());
+        }
+        for (ResolvedArtifact a : artifacts) {
             if (!isDependency(a)) {
                 continue;
             }
-            Dependency dep;
+            final DependencyImpl dep = initDependency(a);
             if (LaunchMode.DEVELOPMENT.equals(mode) &&
                     a.getId().getComponentIdentifier() instanceof ProjectComponentIdentifier) {
-                Project projectDep = project.getRootProject()
-                        .findProject(((ProjectComponentIdentifier) a.getId().getComponentIdentifier()).getProjectPath());
-
-                dep = toDependency(a, configurationName, projectDep);
+                IncludedBuild includedBuild = includedBuild(project, a.getName());
+                if (includedBuild != null) {
+                    addSubstitutedProject(dep, includedBuild.getProjectDir());
+                } else {
+                    Project projectDep = project.getRootProject()
+                            .findProject(((ProjectComponentIdentifier) a.getId().getComponentIdentifier()).getProjectPath());
+                    addDevModePaths(dep, a, projectDep);
+                }
             } else {
-                dep = toDependency(a, configurationName);
+                dep.addPath(a.getFile());
+            }
+            appDependencies.put(toAppDependenciesKey(dep.getGroupId(), dep.getName(), dep.getClassifier()), dep);
+            if (artifactFiles != null) {
+                artifactFiles.add(a.getFile());
             }
-            ArtifactCoords gaKey = new ArtifactCoordsImpl(dep.getGroupId(), dep.getName(), "");
-            modelDependencies.put(gaKey, dep);
         }
 
-        return modelDependencies;
+        if (artifactFiles != null) {
+            // detect FS paths that aren't provided by the resolved artifacts
+            for (File f : configuration.getFiles()) {
+                if (artifactFiles.contains(f)) {
+                    continue;
+                }
+                // here we are trying to represent a direct FS path dependency
+                // as an artifact dependency
+                // SHA1 hash is used to avoid long file names in the lib dir
+                final String parentPath = f.getParent();
+                final String group = HashUtil.sha1(parentPath == null ? f.getName() : parentPath);
+                String name = f.getName();
+                String type = "jar";
+                if (!f.isDirectory()) {
+                    final int dot = f.getName().lastIndexOf('.');
+                    if (dot > 0) {
+                        name = f.getName().substring(0, dot);
+                        type = f.getName().substring(dot + 1);
+                    }
+                }
+                // hash could be a better way to represent the version
+                final String version = String.valueOf(f.lastModified());
+                final ArtifactCoords key = toAppDependenciesKey(group, name, "");
+                final DependencyImpl dep = new DependencyImpl(name, group, version, "compile", type, null);
+                dep.addPath(f);
+                appDependencies.put(key, dep);
+            }
+        }
+    }
+
+    private void addDevModePaths(final DependencyImpl dep, ResolvedArtifact a, Project project) {
+        final JavaPluginConvention javaConvention = project.getConvention().findPlugin(JavaPluginConvention.class);
+        if (javaConvention == null) {
+            dep.addPath(a.getFile());
+            return;
+        }
+        final SourceSet mainSourceSet = javaConvention.getSourceSets().findByName(SourceSet.MAIN_SOURCE_SET_NAME);
+        if (mainSourceSet == null) {
+            dep.addPath(a.getFile());
+            return;
+        }
+
+        final File classesDir = new File(QuarkusGradleUtils.getClassesDir(mainSourceSet, project.getBuildDir(), false));
+        if (classesDir.exists()) {
+            dep.addPath(classesDir);
+        }
+        for (File resourcesDir : mainSourceSet.getResources().getSourceDirectories()) {
+            if (resourcesDir.exists()) {
+                dep.addPath(resourcesDir);
+            }
+        }
+        final Task resourcesTask = project.getTasks().findByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME);
+        for (File outputDir : resourcesTask.getOutputs().getFiles()) {
+            if (outputDir.exists()) {
+                dep.addPath(outputDir);
+            }
+        }
+    }
+
+    private void addSubstitutedProject(final DependencyImpl dep, File projectFile) {
+        File mainResourceDirectory = new File(projectFile, MAIN_RESOURCES_OUTPUT);
+        if (mainResourceDirectory.exists()) {
+            dep.addPath(mainResourceDirectory);
+        }
+        File classesOutput = new File(projectFile, CLASSES_OUTPUT);
+        File[] languageDirectories = classesOutput.listFiles();
+        if (languageDirectories == null) {
+            throw new GradleException(
+                    "The project does not contain a class output directory. " + classesOutput.getPath() + " must exist.");
+        }
+        for (File languageDirectory : languageDirectories) {
+            if (languageDirectory.isDirectory()) {
+                for (File sourceSet : languageDirectory.listFiles()) {
+                    if (sourceSet.isDirectory() && sourceSet.getName().equals(SourceSet.MAIN_SOURCE_SET_NAME)) {
+                        dep.addPath(sourceSet);
+                    }
+                }
+            }
+        }
+    }
+
+    private IncludedBuild includedBuild(final Project project, final String projectName) {
+        try {
+            return project.getGradle().includedBuild(projectName);
+        } catch (UnknownDomainObjectException ignore) {
+            return null;
+        }
     }
 
     private SourceSetImpl convert(SourceSet sourceSet) {
+        if (sourceSet.getOutput().getResourcesDir().exists()) {
+            return new SourceSetImpl(
+                    sourceSet.getOutput().getClassesDirs().getFiles(),
+                    sourceSet.getOutput().getResourcesDir());
+        }
         return new SourceSetImpl(
-                sourceSet.getOutput().getClassesDirs().getFiles(),
-                sourceSet.getOutput().getResourcesDir());
+                sourceSet.getOutput().getClassesDirs().getFiles());
     }
 
     private io.quarkus.bootstrap.resolver.model.SourceSet getSourceSourceSet(SourceSet sourceSet) {
@@ -267,33 +477,39 @@ private static boolean isDependency(ResolvedArtifact a) {
                 a.getFile().isDirectory();
     }
 
-    private DependencyImpl toDependency(ResolvedArtifact a, String configuration, Project project) {
-        final String[] split = a.getModuleVersion().toString().split(":");
-        final DependencyImpl dependency = new DependencyImpl(split[1], split[0], split.length > 2 ? split[2] : null,
-                configuration, a.getType(), a.getClassifier());
-        final JavaPluginConvention javaConvention = project.getConvention().findPlugin(JavaPluginConvention.class);
-        if (javaConvention != null) {
-            SourceSet mainSourceSet = javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-            final File classesDir = new File(QuarkusGradleUtils.getClassesDir(mainSourceSet, project.getBuildDir(), false));
-            if (classesDir.exists()) {
-                dependency.addPath(classesDir);
-            }
-            for (File resourcesDir : mainSourceSet.getResources().getSourceDirectories()) {
-                if (resourcesDir.exists()) {
-                    dependency.addPath(resourcesDir);
-                }
+    /**
+     * Creates an instance of Dependency and associates it with the ResolvedArtifact's path
+     */
+    static Dependency toDependency(ResolvedArtifact a) {
+        final DependencyImpl dependency = initDependency(a);
+        dependency.addPath(a.getFile());
+        return dependency;
+    }
+
+    static Dependency toEnforcedPlatformDependency(org.gradle.api.artifacts.Dependency dependency) {
+        if (dependency instanceof ExternalModuleDependency) {
+            ExternalModuleDependency emd = (ExternalModuleDependency) dependency;
+            Category category = emd.getAttributes().getAttribute(Category.CATEGORY_ATTRIBUTE);
+            if (category != null && Category.ENFORCED_PLATFORM.equals(category.getName())) {
+                return new DependencyImpl(emd.getName(), emd.getGroup(), emd.getVersion(),
+                        "compile", "pom", null);
             }
         }
-        return dependency;
+        return null;
     }
 
-    static DependencyImpl toDependency(ResolvedArtifact a, String configuration) {
+    /**
+     * Creates an instance of DependencyImpl but does not associates it with a path
+     */
+    private static DependencyImpl initDependency(ResolvedArtifact a) {
         final String[] split = a.getModuleVersion().toString().split(":");
-
-        final DependencyImpl dependency = new DependencyImpl(split[1], split[0], split.length > 2 ? split[2] : null,
-                configuration, a.getType(), a.getClassifier());
-        dependency.addPath(a.getFile());
-        return dependency;
+        return new DependencyImpl(split[1], split[0], split.length > 2 ? split[2] : null,
+                "compile", a.getType(), a.getClassifier());
     }
 
+    private static ArtifactCoords toAppDependenciesKey(String groupId, String artifactId, String classifier) {
+        // Default classifier is empty string and not null value, lets keep it that way
+        classifier = classifier == null ? "" : classifier;
+        return new ArtifactCoordsImpl(groupId, artifactId, classifier, "", TYPE_JAR);
+    }
 }
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java
new file mode 100644
index 0000000000000..e350e49532903
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java
@@ -0,0 +1,255 @@
+package io.quarkus.gradle.extension;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
+
+import org.gradle.api.Action;
+import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.plugins.Convention;
+import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.testing.Test;
+import org.gradle.jvm.tasks.Jar;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppModel;
+import io.quarkus.bootstrap.resolver.AppModelResolver;
+import io.quarkus.bootstrap.resolver.model.ModelParameter;
+import io.quarkus.bootstrap.resolver.model.QuarkusModel;
+import io.quarkus.bootstrap.resolver.model.impl.ModelParameterImpl;
+import io.quarkus.gradle.AppModelGradleResolver;
+import io.quarkus.gradle.builder.QuarkusModelBuilder;
+import io.quarkus.gradle.tasks.QuarkusGradleUtils;
+import io.quarkus.runtime.LaunchMode;
+
+public class QuarkusPluginExtension {
+
+    private final Project project;
+
+    private File outputDirectory;
+
+    private String finalName;
+
+    private File sourceDir;
+
+    private File workingDir;
+
+    private File outputConfigDirectory;
+
+    private final SourceSetExtension sourceSetExtension;
+
+    public QuarkusPluginExtension(Project project) {
+        this.project = project;
+        this.sourceSetExtension = new SourceSetExtension();
+    }
+
+    public void beforeTest(Test task) {
+        try {
+            final Map<String, Object> props = task.getSystemProperties();
+
+            final AppModel appModel = getAppModelResolver(LaunchMode.TEST)
+                    .resolveModel(getAppArtifact());
+            final Path serializedModel = QuarkusGradleUtils.serializeAppModel(appModel, task);
+            props.put(BootstrapConstants.SERIALIZED_APP_MODEL, serializedModel.toString());
+
+            StringJoiner outputSourcesDir = new StringJoiner(",");
+            for (File outputSourceDir : combinedOutputSourceDirs()) {
+                outputSourcesDir.add(outputSourceDir.getAbsolutePath());
+            }
+            props.put(BootstrapConstants.OUTPUT_SOURCES_DIR, outputSourcesDir.toString());
+
+            // Identify the folder containing the sources associated with this test task
+            String fileList = getSourceSets().stream()
+                    .filter(sourceSet -> Objects.equals(
+                            task.getTestClassesDirs().getAsPath(),
+                            sourceSet.getOutput().getClassesDirs().getAsPath()))
+                    .flatMap(sourceSet -> sourceSet.getOutput().getClassesDirs().getFiles().stream())
+                    .filter(File::exists)
+                    .distinct()
+                    .map(testSrcDir -> String.format("%s:%s",
+                            project.relativePath(testSrcDir),
+                            project.relativePath(outputDirectory())))
+                    .collect(Collectors.joining(","));
+            task.environment(BootstrapConstants.TEST_TO_MAIN_MAPPINGS, fileList);
+
+            final String nativeRunner = task.getProject().getBuildDir().toPath().resolve(finalName() + "-runner")
+                    .toAbsolutePath()
+                    .toString();
+            props.put("native.image.path", nativeRunner);
+        } catch (Exception e) {
+            throw new IllegalStateException("Failed to resolve deployment classpath", e);
+        }
+    }
+
+    public Path appJarOrClasses() {
+        final Jar jarTask = (Jar) project.getTasks().findByName(JavaPlugin.JAR_TASK_NAME);
+        if (jarTask == null) {
+            throw new RuntimeException("Failed to locate task 'jar' in the project.");
+        }
+        final Provider<RegularFile> jarProvider = jarTask.getArchiveFile();
+        Path classesDir = null;
+        if (jarProvider.isPresent()) {
+            final File f = jarProvider.get().getAsFile();
+            if (f.exists()) {
+                classesDir = f.toPath();
+            }
+        }
+        if (classesDir == null) {
+            final Convention convention = project.getConvention();
+            JavaPluginConvention javaConvention = convention.findPlugin(JavaPluginConvention.class);
+            if (javaConvention != null) {
+                final SourceSet mainSourceSet = javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+                final String classesPath = QuarkusGradleUtils.getClassesDir(mainSourceSet, jarTask.getTemporaryDir());
+                if (classesPath != null) {
+                    classesDir = Paths.get(classesPath);
+                }
+            }
+        }
+        if (classesDir == null) {
+            throw new RuntimeException("Failed to locate project's classes directory");
+        }
+        return classesDir;
+    }
+
+    public File outputDirectory() {
+        if (outputDirectory == null) {
+            outputDirectory = getLastFile(getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput()
+                    .getClassesDirs());
+        }
+        return outputDirectory;
+    }
+
+    public void setOutputDirectory(String outputDirectory) {
+        this.outputDirectory = new File(outputDirectory);
+    }
+
+    public File outputConfigDirectory() {
+        if (outputConfigDirectory == null) {
+            outputConfigDirectory = getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput()
+                    .getResourcesDir();
+        }
+        return outputConfigDirectory;
+    }
+
+    public void setOutputConfigDirectory(String outputConfigDirectory) {
+        this.outputConfigDirectory = new File(outputConfigDirectory);
+    }
+
+    public File sourceDir() {
+        if (sourceDir == null) {
+            sourceDir = getLastFile(getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getAllJava()
+                    .getSourceDirectories());
+        }
+        return sourceDir;
+    }
+
+    public void setSourceDir(String sourceDir) {
+        this.sourceDir = new File(sourceDir);
+    }
+
+    public File workingDir() {
+        if (workingDir == null) {
+            workingDir = outputDirectory();
+        }
+        return workingDir;
+    }
+
+    public void setWorkingDir(String workingDir) {
+        this.workingDir = new File(workingDir);
+    }
+
+    public String finalName() {
+        if (finalName == null || finalName.length() == 0) {
+            this.finalName = String.format("%s-%s", project.getName(), project.getVersion());
+        }
+        return finalName;
+    }
+
+    public void setFinalName(String finalName) {
+        this.finalName = finalName;
+    }
+
+    public void sourceSets(Action<? super SourceSetExtension> action) {
+        action.execute(this.sourceSetExtension);
+    }
+
+    public SourceSetExtension sourceSetExtension() {
+        return sourceSetExtension;
+    }
+
+    public Set<File> resourcesDir() {
+        return getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getResources().getSrcDirs();
+    }
+
+    public Set<File> combinedOutputSourceDirs() {
+        Set<File> sourcesDirs = new LinkedHashSet<>();
+        sourcesDirs.addAll(getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput().getClassesDirs().getFiles());
+        sourcesDirs.addAll(getSourceSets().getByName(SourceSet.TEST_SOURCE_SET_NAME).getOutput().getClassesDirs().getFiles());
+        return sourcesDirs;
+    }
+
+    public AppArtifact getAppArtifact() {
+        return new AppArtifact(project.getGroup().toString(), project.getName(),
+                project.getVersion().toString());
+    }
+
+    public AppModelResolver getAppModelResolver() {
+        return getAppModelResolver(LaunchMode.NORMAL);
+    }
+
+    public AppModelResolver getAppModelResolver(LaunchMode mode) {
+        return new AppModelGradleResolver(project, getQuarkusModel(mode));
+    }
+
+    public QuarkusModel getQuarkusModel() {
+        return getQuarkusModel(LaunchMode.NORMAL);
+    }
+
+    public QuarkusModel getQuarkusModel(LaunchMode mode) {
+        return create(project, mode);
+    }
+
+    private QuarkusModel create(Project project, LaunchMode mode) {
+        QuarkusModelBuilder builder = new QuarkusModelBuilder();
+        ModelParameter params = new ModelParameterImpl();
+        params.setMode(mode.toString());
+        return (QuarkusModel) builder.buildAll(QuarkusModel.class.getName(), params, project);
+    }
+
+    /**
+     * Returns the last file from the specified {@link FileCollection}.
+     * Needed for the Scala plugin.
+     */
+    private File getLastFile(FileCollection fileCollection) {
+        File result = null;
+        for (File f : fileCollection) {
+            if (result == null || f.exists()) {
+                result = f;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Convenience method to get the source sets associated with the current project.
+     *
+     * @return the source sets associated with the current project.
+     */
+    private SourceSetContainer getSourceSets() {
+        return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
+    }
+
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/extension/SourceSetExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/extension/SourceSetExtension.java
new file mode 100644
index 0000000000000..7685ddb1c4eaa
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/extension/SourceSetExtension.java
@@ -0,0 +1,16 @@
+package io.quarkus.gradle.extension;
+
+import org.gradle.api.tasks.SourceSet;
+
+public class SourceSetExtension {
+
+    private SourceSet extraNativeTestSourceSet;
+
+    public SourceSet extraNativeTest() {
+        return extraNativeTestSourceSet;
+    }
+
+    public void setExtraNativeTest(SourceSet extraNativeTestSourceSet) {
+        this.extraNativeTestSourceSet = extraNativeTestSourceSet;
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleDevModeLauncher.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleDevModeLauncher.java
new file mode 100644
index 0000000000000..b93d03da8cd1a
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleDevModeLauncher.java
@@ -0,0 +1,51 @@
+package io.quarkus.gradle.tasks;
+
+import org.gradle.api.logging.Logger;
+
+import io.quarkus.deployment.dev.QuarkusDevModeLauncher;
+
+public class GradleDevModeLauncher extends QuarkusDevModeLauncher {
+
+    /**
+     * Initializes the launcher builder
+     *
+     * @param logger the logger
+     * @return launcher builder
+     */
+    public static Builder builder(Logger logger) {
+        return new GradleDevModeLauncher(logger).new Builder();
+    }
+
+    public class Builder extends QuarkusDevModeLauncher.Builder<GradleDevModeLauncher, Builder> {
+
+        private Builder() {
+            super(null);
+        }
+    }
+
+    private final Logger logger;
+
+    private GradleDevModeLauncher(Logger logger) {
+        this.logger = logger;
+    }
+
+    @Override
+    protected boolean isDebugEnabled() {
+        return logger.isDebugEnabled();
+    }
+
+    @Override
+    protected void debug(Object msg) {
+        logger.warn(msg == null ? "null" : msg.toString());
+    }
+
+    @Override
+    protected void error(Object msg) {
+        logger.error(msg == null ? "null" : msg.toString());
+    }
+
+    @Override
+    protected void warn(Object msg) {
+        logger.warn(msg == null ? "null" : msg.toString());
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleMessageWriter.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleMessageWriter.java
index 00deba251f42e..50b090a93350a 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleMessageWriter.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/GradleMessageWriter.java
@@ -2,7 +2,7 @@
 
 import org.gradle.api.logging.Logger;
 
-import io.quarkus.platform.tools.MessageWriter;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 
 public class GradleMessageWriter implements MessageWriter {
 
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java
index cab182f13f01e..2639c3cdfbbc2 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusAddExtension.java
@@ -1,21 +1,17 @@
 package io.quarkus.gradle.tasks;
 
 import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
-import java.net.URL;
 import java.util.List;
 import java.util.Set;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.options.Option;
 
 import io.quarkus.devtools.commands.AddExtensions;
-import io.quarkus.registry.DefaultExtensionRegistry;
 
 public class QuarkusAddExtension extends QuarkusPlatformTask {
 
@@ -24,7 +20,6 @@ public QuarkusAddExtension() {
     }
 
     private List<String> extensionsToAdd;
-    private List<String> registries;
 
     @Option(option = "extensions", description = "Configures the extensions to be added.")
     public void setExtensionsToAdd(List<String> extensionsToAdd) {
@@ -36,17 +31,6 @@ public List<String> getExtensionsToAdd() {
         return extensionsToAdd;
     }
 
-    @Optional
-    @Input
-    public List<String> getRegistries() {
-        return registries;
-    }
-
-    @Option(description = "The extension registry URLs to be used", option = "registry")
-    public void setRegistries(List<String> registry) {
-        this.registries = registry;
-    }
-
     @TaskAction
     public void addExtension() {
         Set<String> extensionsSet = getExtensionsToAdd()
@@ -56,14 +40,8 @@ public void addExtension() {
                 .collect(toSet());
 
         try {
-            AddExtensions addExtensions = new AddExtensions(getQuarkusProject())
+            AddExtensions addExtensions = new AddExtensions(getQuarkusProject(false))
                     .extensions(extensionsSet);
-            if (registries != null && !registries.isEmpty()) {
-                List<URL> urls = registries.stream()
-                        .map(QuarkusAddExtension::toURL)
-                        .collect(toList());
-                addExtensions.extensionRegistry(DefaultExtensionRegistry.fromURLs(urls));
-            }
             addExtensions.execute();
         } catch (Exception e) {
             throw new GradleException("Failed to add extensions " + getExtensionsToAdd(), e);
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java
index 47318d44ce740..76e7231fab909 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusBuild.java
@@ -1,6 +1,7 @@
 package io.quarkus.gradle.tasks;
 
 import java.io.File;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -14,6 +15,7 @@
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Optional;
+import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskAction;
@@ -30,8 +32,6 @@ public class QuarkusBuild extends QuarkusTask {
 
     private static final String NATIVE_PROPERTY_NAMESPACE = "quarkus.native";
 
-    private boolean uberJar;
-
     private List<String> ignoredEntries = new ArrayList<>();
 
     public QuarkusBuild() {
@@ -47,16 +47,6 @@ public QuarkusBuild nativeArgs(Action<Map<String, ?>> action) {
         return this;
     }
 
-    @Input
-    public boolean isUberJar() {
-        return uberJar;
-    }
-
-    @Option(description = "Set to true if the build task should build an uberjar", option = "uber-jar")
-    public void setUberJar(boolean uberJar) {
-        this.uberJar = uberJar;
-    }
-
     @Optional
     @Input
     public List<String> getIgnoredEntries() {
@@ -77,14 +67,47 @@ public FileCollection getClasspath() {
                 .plus(mainSourceSet.getResources());
     }
 
+    @Input
+    public Map<Object, Object> getQuarkusBuildSystemProperties() {
+        Map<Object, Object> quarkusSystemProperties = new HashMap<>();
+        for (Map.Entry<Object, Object> systemProperty : System.getProperties().entrySet()) {
+            if (systemProperty.getKey().toString().startsWith("quarkus.") &&
+                    systemProperty.getValue() instanceof Serializable) {
+                quarkusSystemProperties.put(systemProperty.getKey(), systemProperty.getValue());
+            }
+        }
+        return quarkusSystemProperties;
+    }
+
+    @Input
+    public Map<String, String> getQuarkusBuildEnvProperties() {
+        Map<String, String> quarkusEnvProperties = new HashMap<>();
+        for (Map.Entry<String, String> systemProperty : System.getenv().entrySet()) {
+            if (systemProperty.getKey() != null && systemProperty.getKey().startsWith("QUARKUS_")) {
+                quarkusEnvProperties.put(systemProperty.getKey(), systemProperty.getValue());
+            }
+        }
+        return quarkusEnvProperties;
+    }
+
     @OutputFile
-    public File getOutputDir() {
+    public File getRunnerJar() {
         return new File(getProject().getBuildDir(), extension().finalName() + "-runner.jar");
     }
 
+    @OutputFile
+    public File getNativeRunner() {
+        return new File(getProject().getBuildDir(), extension().finalName() + "-runner");
+    }
+
+    @OutputDirectory
+    public File getFastJar() {
+        return new File(getProject().getBuildDir(), "quarkus-app");
+    }
+
     @TaskAction
     public void buildQuarkus() {
-        getLogger().lifecycle("building quarkus runner");
+        getLogger().lifecycle("building quarkus jar");
 
         final AppArtifact appArtifact = extension().getAppArtifact();
         appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(getProject()));
@@ -95,11 +118,6 @@ public void buildQuarkus() {
             String joinedEntries = String.join(",", ignoredEntries);
             effectiveProperties.setProperty("quarkus.package.user-configured-ignored-entries", joinedEntries);
         }
-        boolean clear = false;
-        if (uberJar && System.getProperty("quarkus.package.uber-jar") == null) {
-            System.setProperty("quarkus.package.uber-jar", "true");
-            clear = true;
-        }
         try (CuratedApplication appCreationContext = QuarkusBootstrap.builder()
                 .setBaseClassLoader(getClass().getClassLoader())
                 .setAppModelResolver(modelResolver)
@@ -122,10 +140,6 @@ public void buildQuarkus() {
 
         } catch (BootstrapException e) {
             throw new GradleException("Failed to build a runnable JAR", e);
-        } finally {
-            if (clear) {
-                System.clearProperty("quarkus.package.uber-jar");
-            }
         }
     }
 
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
index a878eb3d76519..d8c94a0a74494 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
@@ -1,31 +1,18 @@
 package io.quarkus.gradle.tasks;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectOutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 import javax.inject.Inject;
 
@@ -55,10 +42,8 @@
 import io.quarkus.bootstrap.resolver.AppModelResolver;
 import io.quarkus.bootstrap.resolver.AppModelResolverException;
 import io.quarkus.deployment.dev.DevModeContext;
-import io.quarkus.deployment.dev.DevModeMain;
-import io.quarkus.gradle.QuarkusPluginExtension;
+import io.quarkus.deployment.dev.QuarkusDevModeLauncher;
 import io.quarkus.runtime.LaunchMode;
-import io.quarkus.utilities.JavaBinFinder;
 
 public class QuarkusDev extends QuarkusTask {
 
@@ -181,9 +166,6 @@ public void setCompilerArgs(List<String> compilerArgs) {
 
     @TaskAction
     public void startDev() {
-        Project project = getProject();
-        QuarkusPluginExtension extension = (QuarkusPluginExtension) project.getExtensions().findByName("quarkus");
-
         if (!getSourceDir().isDirectory()) {
             throw new GradleException("The `src/main/java` directory is required, please create it.");
         }
@@ -194,205 +176,114 @@ public void startDev() {
                     "Does the project have any source files?");
         }
 
-        DevModeContext context = new DevModeContext();
-        context.setProjectDir(project.getProjectDir());
-        for (Map.Entry<Object, Object> e : System.getProperties().entrySet()) {
-            context.getSystemProperties().put(e.getKey().toString(), (String) e.getValue());
+        try {
+            QuarkusDevModeLauncher runner = newLauncher();
+            getProject().exec(action -> {
+                action.commandLine(runner.args()).workingDir(getWorkingDir());
+                action.setStandardInput(System.in)
+                        .setErrorOutput(System.out)
+                        .setStandardOutput(System.out);
+            });
+
+        } catch (Exception e) {
+            throw new GradleException("Failed to run", e);
+        }
+    }
+
+    private QuarkusDevModeLauncher newLauncher() throws Exception {
+        final Project project = getProject();
+        GradleDevModeLauncher.Builder builder = GradleDevModeLauncher.builder(getLogger())
+                .preventnoverify(isPreventnoverify())
+                .projectDir(project.getProjectDir())
+                .buildDir(getBuildDir())
+                .outputDir(getBuildDir())
+                .debug(System.getProperty("debug"))
+                .debugHost(System.getProperty("debugHost", "localhost"))
+                .suspend(System.getProperty("suspend"));
+
+        if (getJvmArgs() != null) {
+            builder.jvmArgs(getJvmArgs());
         }
+
         for (Map.Entry<String, ?> e : project.getProperties().entrySet()) {
             if (e.getValue() instanceof String) {
-                context.getBuildSystemProperties().put(e.getKey(), e.getValue().toString());
+                builder.buildSystemProperty(e.getKey(), e.getValue().toString());
             }
         }
 
         //  this is a minor hack to allow ApplicationConfig to be populated with defaults
-        context.getBuildSystemProperties().putIfAbsent("quarkus.application.name", project.getName());
+        builder.applicationName(project.getName());
         if (project.getVersion() != null) {
-            context.getBuildSystemProperties().putIfAbsent("quarkus.application.version", project.getVersion().toString());
-        }
+            builder.applicationVersion(project.getVersion().toString());
 
-        context.setSourceEncoding(getSourceEncoding());
-        try {
-            List<String> args = new ArrayList<>();
-            args.add(JavaBinFinder.findBin());
-            final String debug = System.getProperty("debug");
-            final String suspend = System.getProperty("suspend");
-            String debugSuspend = "n";
-            if (suspend != null) {
-                switch (suspend.toLowerCase(Locale.ENGLISH)) {
-                    case "n":
-                    case "false": {
-                        debugSuspend = "n";
-                        break;
-                    }
-                    case "":
-                    case "y":
-                    case "true": {
-                        debugSuspend = "y";
-                        break;
-                    }
-                    default: {
-                        System.err.println(
-                                "Ignoring invalid value \"" + suspend + "\" for \"suspend\" param and defaulting to \"n\"");
-                        break;
-                    }
-                }
-            }
-            if (debug == null) {
-                // debug mode not specified
-                // make sure 5005 is not used, we don't want to just fail if something else is using it
-                try (Socket socket = new Socket(InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }), 5005)) {
-                    System.err.println("Port 5005 in use, not starting in debug mode");
-                } catch (IOException e) {
-                    args.add("-Xdebug");
-                    args.add("-Xrunjdwp:transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=" + debugSuspend);
-                }
-            } else if (debug.toLowerCase().equals("client")) {
-                args.add("-Xdebug");
-                args.add("-Xrunjdwp:transport=dt_socket,address=localhost:5005,server=n,suspend=" + debugSuspend);
-            } else if (debug.toLowerCase().equals("true") || debug.isEmpty()) {
-                args.add("-Xdebug");
-                args.add("-Xrunjdwp:transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=" + debugSuspend);
-            } else if (!debug.toLowerCase().equals("false")) {
-                try {
-                    int port = Integer.parseInt(debug);
-                    if (port <= 0) {
-                        throw new GradleException("The specified debug port must be greater than 0");
-                    }
-                    args.add("-Xdebug");
-                    args.add("-Xrunjdwp:transport=dt_socket,address=0.0.0.0:" + port + ",server=y,suspend=" + debugSuspend);
-                } catch (NumberFormatException e) {
-                    throw new GradleException(
-                            "Invalid value for debug parameter: " + debug + " must be true|false|client|{port}");
-                }
-            }
-            if (getJvmArgs() != null) {
-                args.addAll(getJvmArgs());
-            }
-
-            // the following flags reduce startup time and are acceptable only for dev purposes
-            args.add("-XX:TieredStopAtLevel=1");
-            if (!isPreventnoverify()) {
-                args.add("-Xverify:none");
-            }
-
-            //build a class-path string for the base platform
-            //this stuff does not change
-            // Do not include URIs in the manifest, because some JVMs do not like that
-            StringBuilder classPathManifest = new StringBuilder();
-
-            final AppModel appModel;
-            final AppModelResolver modelResolver = extension().getAppModelResolver(LaunchMode.DEVELOPMENT);
-            try {
-                final AppArtifact appArtifact = extension.getAppArtifact();
-                appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(project));
-                appModel = modelResolver.resolveModel(appArtifact);
-            } catch (AppModelResolverException e) {
-                throw new GradleException("Failed to resolve application model " + extension.getAppArtifact() + " dependencies",
-                        e);
-            }
-
-            args.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
-
-            final Set<AppArtifactKey> projectDependencies = new HashSet<>();
-            addSelfWithLocalDeps(project, context, new HashSet<>(), projectDependencies, true);
-
-            for (AppDependency appDependency : appModel.getFullDeploymentDeps()) {
-                final AppArtifact appArtifact = appDependency.getArtifact();
-                if (!projectDependencies.contains(new AppArtifactKey(appArtifact.getGroupId(), appArtifact.getArtifactId()))) {
-                    appArtifact.getPaths().forEach(p -> {
-                        if (Files.exists(p)) {
-                            addToClassPaths(classPathManifest, p.toFile());
-                        }
-                    });
-                }
-            }
+        }
 
-            //we also want to add the maven plugin jar to the class path
-            //this allows us to just directly use classes, without messing around copying them
-            //to the runner jar
-            addGradlePluginDeps(classPathManifest, context);
+        builder.sourceEncoding(getSourceEncoding());
 
-            context.setCacheDir(new File(getBuildDir(), "transformer-cache").getAbsoluteFile());
+        final AppModel appModel;
+        final AppModelResolver modelResolver = extension().getAppModelResolver(LaunchMode.DEVELOPMENT);
+        try {
+            final AppArtifact appArtifact = extension().getAppArtifact();
+            appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(project));
+            appModel = modelResolver.resolveModel(appArtifact);
+        } catch (AppModelResolverException e) {
+            throw new GradleException("Failed to resolve application model " + extension().getAppArtifact() + " dependencies",
+                    e);
+        }
 
-            JavaPluginConvention javaPluginConvention = project.getConvention().findPlugin(JavaPluginConvention.class);
-            if (javaPluginConvention != null) {
-                context.setSourceJavaVersion(javaPluginConvention.getSourceCompatibility().toString());
-                context.setTargetJvmVersion(javaPluginConvention.getTargetCompatibility().toString());
-            }
+        final Set<AppArtifactKey> projectDependencies = new HashSet<>();
+        addSelfWithLocalDeps(project, builder, new HashSet<>(), projectDependencies, true);
 
-            if (getCompilerArgs().isEmpty()) {
-                getJavaCompileTask()
-                        .map(compileTask -> compileTask.getOptions().getCompilerArgs())
-                        .ifPresent(context::setCompilerOptions);
-            } else {
-                context.setCompilerOptions(getCompilerArgs());
+        for (AppDependency appDependency : appModel.getFullDeploymentDeps()) {
+            final AppArtifact appArtifact = appDependency.getArtifact();
+            if (!projectDependencies.contains(new AppArtifactKey(appArtifact.getGroupId(), appArtifact.getArtifactId()))) {
+                appArtifact.getPaths().forEach(p -> {
+                    if (Files.exists(p)) {
+                        addToClassPaths(builder, p.toFile());
+                    }
+                });
             }
+        }
 
-            // this is the jar file we will use to launch the dev mode main class
-            final File tempFile = new File(getBuildDir(), extension.finalName() + "-dev.jar");
-            tempFile.delete();
-            tempFile.deleteOnExit();
-
-            context.setDevModeRunnerJarFile(tempFile);
-            modifyDevModeContext(context);
-            try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tempFile))) {
-                out.putNextEntry(new ZipEntry("META-INF/"));
-                Manifest manifest = new Manifest();
-                manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
-                manifest.getMainAttributes().put(Attributes.Name.CLASS_PATH, classPathManifest.toString());
-                manifest.getMainAttributes().put(Attributes.Name.MAIN_CLASS, DevModeMain.class.getName());
-                out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
-                manifest.write(out);
-
-                out.putNextEntry(new ZipEntry(DevModeMain.DEV_MODE_CONTEXT));
-                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                try (ObjectOutputStream obj = new ObjectOutputStream(new DataOutputStream(bytes))) {
-                    obj.writeObject(context);
-                }
-                out.write(bytes.toByteArray());
+        //we also want to add the Gradle plugin to the class path
+        //this allows us to just directly use classes, without messing around copying them
+        //to the runner jar
+        addGradlePluginDeps(builder);
 
-                out.putNextEntry(new ZipEntry(BootstrapConstants.SERIALIZED_APP_MODEL));
-                bytes = new ByteArrayOutputStream();
-                try (ObjectOutputStream obj = new ObjectOutputStream(new DataOutputStream(bytes))) {
-                    obj.writeObject(appModel);
-                }
-                out.write(bytes.toByteArray());
-            }
+        JavaPluginConvention javaPluginConvention = project.getConvention().findPlugin(JavaPluginConvention.class);
+        if (javaPluginConvention != null) {
+            builder.sourceJavaVersion(javaPluginConvention.getSourceCompatibility().toString());
+            builder.targetJavaVersion(javaPluginConvention.getTargetCompatibility().toString());
+        }
 
-            final Path serializedModel = QuarkusGradleUtils.serializeAppModel(appModel, this);
-            serializedModel.toFile().deleteOnExit();
-            args.add("-D" + BootstrapConstants.SERIALIZED_APP_MODEL + "=" + serializedModel.toAbsolutePath());
+        if (getCompilerArgs().isEmpty()) {
+            getJavaCompileTask()
+                    .map(compileTask -> compileTask.getOptions().getCompilerArgs())
+                    .ifPresent(builder::compilerOptions);
+        } else {
+            builder.compilerOptions(getCompilerArgs());
+        }
 
-            extension.outputDirectory().mkdirs();
+        modifyDevModeContext(builder);
 
-            if (context.isEnablePreview()) {
-                args.add(DevModeContext.ENABLE_PREVIEW_FLAG);
-            }
+        final Path serializedModel = QuarkusGradleUtils.serializeAppModel(appModel, this);
+        serializedModel.toFile().deleteOnExit();
+        builder.jvmArgs("-D" + BootstrapConstants.SERIALIZED_APP_MODEL + "=" + serializedModel.toAbsolutePath());
 
-            args.add("-jar");
-            args.add(tempFile.getAbsolutePath());
-            args.addAll(this.getArgs());
-            if (getLogger().isDebugEnabled()) {
-                getLogger().debug("Launching JVM with command line: {}", String.join(" ", args));
-            }
+        extension().outputDirectory().mkdirs();
 
-            project.exec(action -> {
-                action.commandLine(args).workingDir(getWorkingDir());
-                action.setStandardInput(System.in)
-                        .setErrorOutput(System.out)
-                        .setStandardOutput(System.out);
-            });
-        } catch (Exception e) {
-            throw new GradleException("Failed to run", e);
+        if (!args.isEmpty()) {
+            builder.applicationArgs(String.join(" ", args));
         }
+
+        return builder.build();
     }
 
-    protected void modifyDevModeContext(DevModeContext devModeContext) {
+    protected void modifyDevModeContext(GradleDevModeLauncher.Builder builder) {
 
     }
 
-    private void addSelfWithLocalDeps(Project project, DevModeContext context, Set<String> visited,
+    private void addSelfWithLocalDeps(Project project, GradleDevModeLauncher.Builder builder, Set<String> visited,
             Set<AppArtifactKey> addedDeps, boolean root) {
         if (!visited.add(project.getPath())) {
             return;
@@ -401,15 +292,16 @@ private void addSelfWithLocalDeps(Project project, DevModeContext context, Set<S
         if (compileCp != null) {
             compileCp.getIncoming().getDependencies().forEach(d -> {
                 if (d instanceof ProjectDependency) {
-                    addSelfWithLocalDeps(((ProjectDependency) d).getDependencyProject(), context, visited, addedDeps, false);
+                    addSelfWithLocalDeps(((ProjectDependency) d).getDependencyProject(), builder, visited, addedDeps, false);
                 }
             });
         }
 
-        addLocalProject(project, context, addedDeps, root);
+        addLocalProject(project, builder, addedDeps, root);
     }
 
-    private void addLocalProject(Project project, DevModeContext context, Set<AppArtifactKey> addeDeps, boolean root) {
+    private void addLocalProject(Project project, GradleDevModeLauncher.Builder builder, Set<AppArtifactKey> addeDeps,
+            boolean root) {
         final AppArtifactKey key = new AppArtifactKey(project.getGroup().toString(), project.getName());
         if (addeDeps.contains(key)) {
             return;
@@ -420,7 +312,10 @@ private void addLocalProject(Project project, DevModeContext context, Set<AppArt
         }
 
         SourceSetContainer sourceSets = javaConvention.getSourceSets();
-        SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+        SourceSet mainSourceSet = sourceSets.findByName(SourceSet.MAIN_SOURCE_SET_NAME);
+        if (mainSourceSet == null) {
+            return;
+        }
         Set<String> sourcePaths = new HashSet<>();
         Set<String> sourceParentPaths = new HashSet<>();
 
@@ -432,16 +327,18 @@ private void addLocalProject(Project project, DevModeContext context, Set<AppArt
         }
         //TODO: multiple resource directories
         final File resourcesSrcDir = mainSourceSet.getResources().getSourceDirectories().getSingleFile();
+        // resourcesSrcDir may exist but if it's empty the resources output dir won't be created
+        final File resourcesOutputDir = mainSourceSet.getOutput().getResourcesDir();
 
-        if (sourcePaths.isEmpty() && !resourcesSrcDir.exists()) {
+        if (sourcePaths.isEmpty() && !resourcesOutputDir.exists()) {
             return;
         }
 
         String classesDir = QuarkusGradleUtils.getClassesDir(mainSourceSet, project.getBuildDir());
 
         final String resourcesOutputPath;
-        if (resourcesSrcDir.exists()) {
-            resourcesOutputPath = mainSourceSet.getOutput().getResourcesDir().getAbsolutePath();
+        if (resourcesOutputDir.exists()) {
+            resourcesOutputPath = resourcesOutputDir.getAbsolutePath();
             if (!Files.exists(Paths.get(classesDir))) {
                 // currently classesDir can't be null and is expected to exist
                 classesDir = resourcesOutputPath;
@@ -463,9 +360,9 @@ private void addLocalProject(Project project, DevModeContext context, Set<AppArt
                 project.getBuildDir().toString());
 
         if (root) {
-            context.setApplicationRoot(wsModuleInfo);
+            builder.mainModule(wsModuleInfo);
         } else {
-            context.getAdditionalModules().add(wsModuleInfo);
+            builder.dependency(wsModuleInfo);
         }
         addeDeps.add(key);
     }
@@ -481,7 +378,24 @@ private java.util.Optional<JavaCompile> getJavaCompileTask() {
                 .ofNullable((JavaCompile) getProject().getTasks().getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME));
     }
 
-    private void addGradlePluginDeps(StringBuilder classPathManifest, DevModeContext context) {
+    private ResolvedDependency findQuarkusPluginDependency(Set<ResolvedDependency> dependencies) {
+        for (ResolvedDependency rd : dependencies) {
+            if ("io.quarkus.gradle.plugin".equals(rd.getModuleName())) {
+                return rd;
+            } else {
+                Set<ResolvedDependency> children = rd.getChildren();
+                if (children != null) {
+                    ResolvedDependency quarkusPluginDependency = findQuarkusPluginDependency(children);
+                    if (quarkusPluginDependency != null) {
+                        return quarkusPluginDependency;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private void addGradlePluginDeps(GradleDevModeLauncher.Builder builder) {
         boolean foundQuarkusPlugin = false;
         Project prj = getProject();
         while (prj != null && !foundQuarkusPlugin) {
@@ -491,14 +405,15 @@ private void addGradlePluginDeps(StringBuilder classPathManifest, DevModeContext
             if (firstLevelDeps.isEmpty()) {
                 // TODO this looks weird
             } else {
-                for (ResolvedDependency rd : firstLevelDeps) {
-                    if ("io.quarkus.gradle.plugin".equals(rd.getModuleName())) {
-                        rd.getAllModuleArtifacts().stream()
-                                .map(ResolvedArtifact::getFile)
-                                .forEach(f -> addToClassPaths(classPathManifest, f));
-                        foundQuarkusPlugin = true;
-                        break;
-                    }
+                ResolvedDependency quarkusPluginDependency = findQuarkusPluginDependency(firstLevelDeps);
+                if (quarkusPluginDependency != null) {
+                    quarkusPluginDependency.getAllModuleArtifacts().stream()
+                            .map(ResolvedArtifact::getFile)
+                            .forEach(f -> addToClassPaths(builder, f));
+
+                    foundQuarkusPlugin = true;
+
+                    break;
                 }
             }
             prj = prj.getParent();
@@ -521,7 +436,7 @@ private void addGradlePluginDeps(StringBuilder classPathManifest, DevModeContext
                     for (String cpElement : classpath.split(File.pathSeparator)) {
                         final File f = new File(cpElement);
                         if (f.exists()) {
-                            addToClassPaths(classPathManifest, f);
+                            addToClassPaths(builder, f);
                         }
                     }
                 }
@@ -531,12 +446,10 @@ private void addGradlePluginDeps(StringBuilder classPathManifest, DevModeContext
         }
     }
 
-    private void addToClassPaths(StringBuilder classPathManifest, File file) {
+    private void addToClassPaths(GradleDevModeLauncher.Builder classPathManifest, File file) {
         if (filesIncludedInClasspath.add(file)) {
             getProject().getLogger().debug("Adding dependency {}", file);
-
-            final URI uri = file.toPath().toAbsolutePath().toUri();
-            classPathManifest.append(uri).append(" ");
+            classPathManifest.classpathEntry(file);
         }
     }
 }
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java
new file mode 100644
index 0000000000000..17d2b72ea677d
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java
@@ -0,0 +1,128 @@
+package io.quarkus.gradle.tasks;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.gradle.api.GradleException;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.plugins.Convention;
+import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.tasks.CompileClasspath;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.TaskAction;
+
+import io.quarkus.bootstrap.BootstrapException;
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.resolver.AppModelResolver;
+import io.quarkus.deployment.CodeGenerator;
+
+public class QuarkusGenerateCode extends QuarkusTask {
+
+    public static final String QUARKUS_GENERATED_SOURCES = "quarkus-generated-sources";
+    public static final String QUARKUS_TEST_GENERATED_SOURCES = "quarkus-test-generated-sources";
+    // TODO dynamically load generation provider, or make them write code directly in quarkus-generated-sources
+    public static final String[] CODE_GENERATION_PROVIDER = new String[] { "grpc" };
+
+    public static final String INIT_AND_RUN = "initAndRun";
+    private Set<Path> sourcesDirectories;
+    private Consumer<Path> sourceRegistrar;
+    private boolean test = false;
+
+    public QuarkusGenerateCode() {
+        super("Performs Quarkus pre-build preparations, such as sources generation");
+    }
+
+    /**
+     * Create a dependency on classpath resolution. This makes sure included build are build this task runs.
+     *
+     * @return resolved compile classpath
+     */
+    @CompileClasspath
+    public FileCollection getClasspath() {
+        return QuarkusGradleUtils.getSourceSet(getProject(), SourceSet.MAIN_SOURCE_SET_NAME).getCompileClasspath();
+    }
+
+    @TaskAction
+    public void prepareQuarkus() {
+        getLogger().lifecycle("preparing quarkus application");
+
+        final AppArtifact appArtifact = extension().getAppArtifact();
+        appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(getProject()));
+
+        final AppModelResolver modelResolver = extension().getAppModelResolver();
+        final Properties realProperties = getBuildSystemProperties(appArtifact);
+
+        Path buildDir = getProject().getBuildDir().toPath();
+        try (CuratedApplication appCreationContext = QuarkusBootstrap.builder()
+                .setBaseClassLoader(getClass().getClassLoader())
+                .setAppModelResolver(modelResolver)
+                .setTargetDirectory(buildDir)
+                .setBaseName(extension().finalName())
+                .setBuildSystemProperties(realProperties)
+                .setAppArtifact(appArtifact)
+                .setLocalProjectDiscovery(false)
+                .setIsolateDeployment(true)
+                .build().bootstrap()) {
+
+            final Convention convention = getProject().getConvention();
+            JavaPluginConvention javaConvention = convention.findPlugin(JavaPluginConvention.class);
+            if (javaConvention != null) {
+                final String generateSourcesDir = test ? QUARKUS_TEST_GENERATED_SOURCES : QUARKUS_GENERATED_SOURCES;
+                final SourceSet generatedSources = javaConvention.getSourceSets().findByName(generateSourcesDir);
+                List<Path> paths = new ArrayList<>();
+                generatedSources.getOutput()
+                        .filter(f -> f.getName().equals(generateSourcesDir))
+                        .forEach(f -> paths.add(f.toPath()));
+                if (paths.isEmpty()) {
+                    throw new GradleException("Failed to create quarkus-generated-sources");
+                }
+
+                getLogger().debug("Will trigger preparing sources for source directory: {} buildDir: {}",
+                        sourcesDirectories, getProject().getBuildDir().getAbsolutePath());
+
+                QuarkusClassLoader deploymentClassLoader = appCreationContext.createDeploymentClassLoader();
+                Class<?> codeGenerator = deploymentClassLoader.loadClass(CodeGenerator.class.getName());
+
+                Optional<Method> initAndRun = Arrays.stream(codeGenerator.getMethods())
+                        .filter(m -> m.getName().equals(INIT_AND_RUN))
+                        .findAny();
+                if (!initAndRun.isPresent()) {
+                    throw new GradleException("Failed to find " + INIT_AND_RUN + " method in " + CodeGenerator.class.getName());
+                }
+                initAndRun.get().invoke(null, deploymentClassLoader,
+                        sourcesDirectories,
+                        paths.iterator().next(),
+                        buildDir,
+                        sourceRegistrar,
+                        appCreationContext.getAppModel(),
+                        realProperties);
+
+            }
+        } catch (BootstrapException | IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {
+            throw new GradleException("Failed to generate sources in the QuarkusPrepare task", e);
+        }
+    }
+
+    public void setSourcesDirectories(Set<Path> sourcesDirectories) {
+        this.sourcesDirectories = sourcesDirectories;
+    }
+
+    public void setSourceRegistrar(Consumer<Path> sourceRegistrar) {
+        this.sourceRegistrar = sourceRegistrar;
+    }
+
+    public void setTest(boolean test) {
+        this.test = test;
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java
index 2c9407c9dde80..428f0f4d932ae 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListExtensions.java
@@ -1,10 +1,5 @@
 package io.quarkus.gradle.tasks;
 
-import static java.util.stream.Collectors.toList;
-
-import java.net.URL;
-import java.util.List;
-
 import org.gradle.api.GradleException;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Optional;
@@ -12,18 +7,18 @@
 import org.gradle.api.tasks.options.Option;
 
 import io.quarkus.devtools.commands.ListExtensions;
-import io.quarkus.registry.DefaultExtensionRegistry;
+import io.quarkus.devtools.project.QuarkusProject;
 
 public class QuarkusListExtensions extends QuarkusPlatformTask {
 
     private boolean all = true;
+    private boolean installed = false;
+    private boolean fromCli = false;
 
     private String format = "concise";
 
     private String searchPattern;
 
-    private List<String> registries;
-
     @Input
     public boolean isAll() {
         return all;
@@ -34,6 +29,26 @@ public void setAll(boolean all) {
         this.all = all;
     }
 
+    @Input
+    public boolean isFromCli() {
+        return fromCli;
+    }
+
+    @Option(description = "List only installed extensions.", option = "fromCli")
+    public void setFromCli(boolean fromCli) {
+        this.fromCli = fromCli;
+    }
+
+    @Input
+    public boolean isInstalled() {
+        return installed;
+    }
+
+    @Option(description = "List only installed extensions.", option = "installed")
+    public void setInstalled(boolean installed) {
+        this.installed = installed;
+    }
+
     @Optional
     @Input
     public String getFormat() {
@@ -56,17 +71,6 @@ public void setSearchPattern(String searchPattern) {
         this.searchPattern = searchPattern;
     }
 
-    @Optional
-    @Input
-    public List<String> getRegistries() {
-        return registries;
-    }
-
-    @Option(description = "The extension registry URLs to be used", option = "registry")
-    public void setRegistries(List<String> registry) {
-        this.registries = registry;
-    }
-
     public QuarkusListExtensions() {
         super("Lists the available quarkus extensions");
     }
@@ -74,16 +78,13 @@ public QuarkusListExtensions() {
     @TaskAction
     public void listExtensions() {
         try {
-            ListExtensions listExtensions = new ListExtensions(getQuarkusProject())
-                    .all(isAll())
+            final QuarkusProject quarkusProject = getQuarkusProject(installed);
+            ListExtensions listExtensions = new ListExtensions(quarkusProject)
+                    .all(isFromCli() ? false : isAll())
+                    .fromCli(isFromCli())
                     .format(getFormat())
+                    .installed(isInstalled())
                     .search(getSearchPattern());
-            if (registries != null && !registries.isEmpty()) {
-                List<URL> urls = registries.stream()
-                        .map(QuarkusListExtensions::toURL)
-                        .collect(toList());
-                listExtensions.extensionRegistry(DefaultExtensionRegistry.fromURLs(urls));
-            }
             listExtensions.execute();
         } catch (Exception e) {
             throw new GradleException("Unable to list extensions", e);
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListPlatforms.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListPlatforms.java
new file mode 100644
index 0000000000000..ae671f78c16c9
--- /dev/null
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusListPlatforms.java
@@ -0,0 +1,52 @@
+package io.quarkus.gradle.tasks;
+
+import org.gradle.api.GradleException;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.options.Option;
+
+import io.quarkus.devtools.commands.ListPlatforms;
+import io.quarkus.registry.Constants;
+
+public class QuarkusListPlatforms extends QuarkusPlatformTask {
+
+    private boolean installed = false;
+
+    public QuarkusListPlatforms() {
+        super("Lists the available quarkus platforms");
+    }
+
+    @Input
+    public boolean isInstalled() {
+        return installed;
+    }
+
+    @Option(description = "List only installed platforms.", option = "installed")
+    public void setInstalled(boolean installed) {
+        this.installed = installed;
+    }
+
+    @TaskAction
+    public void listExtensions() {
+        getProject().getLogger().info("");
+        if (installed) {
+            getProject().getLogger().info("Imported Quarkus platforms:");
+            importedPlatforms().forEach(coords -> {
+                final StringBuilder buf = new StringBuilder();
+                buf.append(coords.getGroupId()).append(":")
+                        .append(coords.getArtifactId().substring(0,
+                                coords.getArtifactId().length() - Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX.length()))
+                        .append("::pom:").append(coords.getVersion());
+                messageWriter().info(buf.toString());
+            });
+        } else {
+            getProject().getLogger().info("Available Quarkus platforms:");
+            try {
+                new ListPlatforms(getQuarkusProject(installed)).execute();
+            } catch (Exception e) {
+                throw new GradleException("Unable to list platforms", e);
+            }
+        }
+        getProject().getLogger().info("");
+    }
+}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java
index f85ac2ebe0efd..9401798248ea2 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPlatformTask.java
@@ -2,38 +2,115 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.attributes.Category;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.tasks.Internal;
 
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.buildfile.BuildFile;
-import io.quarkus.gradle.GradleBuildFileFromConnector;
-import io.quarkus.platform.descriptor.CombinedQuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
+import io.quarkus.devtools.project.buildfile.GradleGroovyProjectBuildFile;
+import io.quarkus.devtools.project.buildfile.GradleKotlinProjectBuildFile;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.registry.ExtensionCatalogResolver;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 
 public abstract class QuarkusPlatformTask extends QuarkusTask {
 
+    private static boolean isEnableRegistryClient() {
+        final String value = System.getProperty("enableRegistryClient");
+        return value == null ? System.getProperties().containsKey("enableRegistryClient") : Boolean.parseBoolean(value);
+    }
+
     QuarkusPlatformTask(String description) {
         super(description);
     }
 
-    protected QuarkusPlatformDescriptor platformDescriptor() {
+    private ExtensionCatalog extensionsCatalog(boolean limitExtensionsToImportedPlatforms, MessageWriter log) {
+        final List<ArtifactCoords> platforms = importedPlatforms();
+        final ExtensionCatalogResolver catalogResolver = isEnableRegistryClient() ? QuarkusProjectHelper.getCatalogResolver(log)
+                : ExtensionCatalogResolver.empty();
+        if (catalogResolver.hasRegistries()) {
+            try {
+                return limitExtensionsToImportedPlatforms ? catalogResolver.resolveExtensionCatalog(platforms)
+                        : catalogResolver.resolveExtensionCatalog(quarkusCoreVersion());
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to resolve extensions catalog", e);
+            }
+        }
+        return ToolsUtils.mergePlatforms(platforms, extension().getAppModelResolver());
+    }
+
+    protected List<ArtifactCoords> importedPlatforms() {
+        final List<Dependency> bomDeps = boms();
+        if (bomDeps.isEmpty()) {
+            throw new GradleException("No platforms detected in the project");
+        }
+
+        final Configuration boms = getProject().getConfigurations()
+                .detachedConfiguration(bomDeps.toArray(new org.gradle.api.artifacts.Dependency[0]));
+        final Set<AppArtifactKey> processedKeys = new HashSet<>(1);
+
+        List<ArtifactCoords> platforms = new ArrayList<>();
+        boms.getResolutionStrategy().eachDependency(d -> {
+            if (!d.getTarget().getName().endsWith(BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)
+                    || !processedKeys.add(new AppArtifactKey(d.getTarget().getGroup(), d.getTarget().getName()))) {
+                return;
+            }
+            final ArtifactCoords platform = new ArtifactCoords(d.getTarget().getGroup(), d.getTarget().getName(),
+                    d.getTarget().getVersion(), "json", d.getTarget().getVersion());
+            platforms.add(platform);
+        });
+        boms.getResolvedConfiguration();
+
+        if (platforms.isEmpty()) {
+            throw new RuntimeException("No Quarkus platforms found in the project");
+        }
+        return platforms;
+    }
+
+    protected String quarkusCoreVersion() {
+        final List<Dependency> bomDeps = boms();
+        if (bomDeps.isEmpty()) {
+            throw new GradleException("No platforms detected in the project");
+        }
 
-        final QuarkusJsonPlatformDescriptorResolver platformResolver = QuarkusJsonPlatformDescriptorResolver.newInstance()
-                .setArtifactResolver(extension().getAppModelResolver())
-                .setMessageWriter(new GradleMessageWriter(getProject().getLogger()));
+        final Configuration boms = getProject().getConfigurations()
+                .detachedConfiguration(bomDeps.toArray(new org.gradle.api.artifacts.Dependency[0]));
 
-        List<QuarkusPlatformDescriptor> platforms = new ArrayList<>(2);
+        final AtomicReference<String> quarkusVersionRef = new AtomicReference<>();
+        boms.getResolutionStrategy().eachDependency(d -> {
+            if (quarkusVersionRef.get() == null && d.getTarget().getName().equals("quarkus-core")
+                    && d.getTarget().getGroup().equals("io.quarkus")) {
+                quarkusVersionRef.set(d.getTarget().getVersion());
+            }
+        });
+        boms.getResolvedConfiguration();
+        final String quarkusCoreVersion = quarkusVersionRef.get();
+        if (quarkusCoreVersion == null) {
+            throw new IllegalStateException("Failed to determine the Quarkus core version for the project");
+        }
+        return quarkusCoreVersion;
+    }
+
+    private List<Dependency> boms() {
         final Configuration impl = getProject().getConfigurations().getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME);
+        List<Dependency> boms = new ArrayList<>();
         impl.getIncoming().getDependencies()
                 .forEach(d -> {
                     if (!(d instanceof ModuleDependency)) {
@@ -41,44 +118,39 @@ protected QuarkusPlatformDescriptor platformDescriptor() {
                     }
                     final ModuleDependency module = (ModuleDependency) d;
                     final Category category = module.getAttributes().getAttribute(Category.CATEGORY_ATTRIBUTE);
-                    if (category == null || !Category.ENFORCED_PLATFORM.equals(category.getName())) {
-                        return;
-                    }
-                    try {
-                        platforms
-                                .add(platformResolver.resolveFromBom(module.getGroup(), module.getName(), module.getVersion()));
-                    } catch (Exception e) {
-                        // not a platform
+                    if (category != null
+                            && (Category.ENFORCED_PLATFORM.equals(category.getName())
+                                    || Category.REGULAR_PLATFORM.equals(category.getName()))) {
+                        boms.add(d);
                     }
                 });
+        return boms;
+    }
 
-        if (platforms.isEmpty()) {
-            throw new GradleException("Failed to determine Quarkus platform for the project");
-        }
-
-        if (platforms.size() == 1) {
-            return platforms.get(0);
-        }
+    protected QuarkusProject getQuarkusProject(boolean limitExtensionsToImportedPlatforms) {
 
-        final CombinedQuarkusPlatformDescriptor.Builder builder = CombinedQuarkusPlatformDescriptor.builder();
-        for (QuarkusPlatformDescriptor platform : platforms) {
-            builder.addPlatform(platform);
-        }
-        return builder.build();
-    }
+        final GradleMessageWriter log = messageWriter();
+        final ExtensionCatalog catalog = extensionsCatalog(limitExtensionsToImportedPlatforms, log);
 
-    @Internal
-    protected BuildFile getGradleBuildFile() {
         final Path projectDirPath = getProject().getProjectDir().toPath();
         final Path rootProjectPath = getProject().getParent() != null ? getProject().getRootProject().getProjectDir().toPath()
-                : null;
-        return new GradleBuildFileFromConnector(projectDirPath, platformDescriptor(),
-                rootProjectPath);
+                : projectDirPath;
+        final BuildFile buildFile;
+        if (Files.exists(rootProjectPath.resolve("settings.gradle.kts"))
+                && Files.exists(projectDirPath.resolve("build.gradle.kts"))) {
+            buildFile = new GradleKotlinProjectBuildFile(getProject(), catalog);
+        } else if (Files.exists(rootProjectPath.resolve("settings.gradle"))
+                && Files.exists(projectDirPath.resolve("build.gradle"))) {
+            buildFile = new GradleGroovyProjectBuildFile(getProject(), catalog);
+        } else {
+            throw new GradleException(
+                    "Mixed DSL is not supported. Both build and settings file need to use either Kotlin or Groovy DSL");
+        }
+        return QuarkusProjectHelper.getProject(getProject().getProjectDir().toPath(), catalog, buildFile, log);
     }
 
-    @Internal
-    protected QuarkusProject getQuarkusProject() {
-        return QuarkusProject.of(getProject().getProjectDir().toPath(), platformDescriptor(), getGradleBuildFile());
+    protected GradleMessageWriter messageWriter() {
+        return new GradleMessageWriter(getProject().getLogger());
     }
 
     protected static URL toURL(String url) {
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java
deleted file mode 100644
index 69b7d55be7149..0000000000000
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusPrepare.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package io.quarkus.gradle.tasks;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import org.gradle.api.GradleException;
-import org.gradle.api.plugins.Convention;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.TaskAction;
-
-import io.quarkus.bootstrap.BootstrapException;
-import io.quarkus.bootstrap.app.CuratedApplication;
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
-import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.resolver.AppModelResolver;
-import io.quarkus.deployment.CodeGenerator;
-
-public class QuarkusPrepare extends QuarkusTask {
-
-    public static final String INIT_AND_RUN = "initAndRun";
-    private Set<Path> sourcesDirectories;
-    private Consumer<Path> sourceRegistrar;
-    private boolean test = false;
-
-    public QuarkusPrepare() {
-        super("Performs Quarkus pre-build preparations, such as sources generation");
-    }
-
-    @TaskAction
-    public void prepareQuarkus() {
-        getLogger().lifecycle("preparing quarkus application");
-
-        final AppArtifact appArtifact = extension().getAppArtifact();
-        appArtifact.setPaths(QuarkusGradleUtils.getOutputPaths(getProject()));
-
-        final AppModelResolver modelResolver = extension().getAppModelResolver();
-        final Properties realProperties = getBuildSystemProperties(appArtifact);
-
-        Path buildDir = getProject().getBuildDir().toPath();
-        try (CuratedApplication appCreationContext = QuarkusBootstrap.builder()
-                .setBaseClassLoader(getClass().getClassLoader())
-                .setAppModelResolver(modelResolver)
-                .setTargetDirectory(buildDir)
-                .setBaseName(extension().finalName())
-                .setBuildSystemProperties(realProperties)
-                .setAppArtifact(appArtifact)
-                .setLocalProjectDiscovery(false)
-                .setIsolateDeployment(true)
-                .build().bootstrap()) {
-
-            final Convention convention = getProject().getConvention();
-            JavaPluginConvention javaConvention = convention.findPlugin(JavaPluginConvention.class);
-            if (javaConvention != null) {
-                String generateSourcesDir = test ? "quarkus-test-generated-sources" : "quarkus-generated-sources";
-                final SourceSet generatedSources = javaConvention.getSourceSets().create(generateSourcesDir);
-                generatedSources.getOutput().dir(generateSourcesDir);
-                List<Path> paths = new ArrayList<>();
-                generatedSources.getOutput()
-                        .filter(f -> f.getName().equals(generateSourcesDir))
-                        .forEach(f -> paths.add(f.toPath()));
-                if (paths.isEmpty()) {
-                    throw new GradleException("Failed to create quarkus-generated-sources");
-                }
-
-                getLogger().debug("Will trigger preparing sources for source directory: {} buildDir: {}",
-                        sourcesDirectories, getProject().getBuildDir().getAbsolutePath());
-
-                QuarkusClassLoader deploymentClassLoader = appCreationContext.createDeploymentClassLoader();
-                Class<?> codeGenerator = deploymentClassLoader.loadClass(CodeGenerator.class.getName());
-
-                Optional<Method> initAndRun = Arrays.stream(codeGenerator.getMethods())
-                        .filter(m -> m.getName().equals(INIT_AND_RUN))
-                        .findAny();
-                if (!initAndRun.isPresent()) {
-                    throw new GradleException("Failed to find " + INIT_AND_RUN + " method in " + CodeGenerator.class.getName());
-                }
-                initAndRun.get().invoke(null, deploymentClassLoader,
-                        sourcesDirectories,
-                        paths.iterator().next(),
-                        buildDir,
-                        sourceRegistrar,
-                        appCreationContext.getAppModel());
-
-            }
-        } catch (BootstrapException | IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {
-            throw new GradleException("Failed to generate sources in the QuarkusPrepare task", e);
-        }
-    }
-
-    public void setSourcesDirectories(Set<Path> sourcesDirectories) {
-        this.sourcesDirectories = sourcesDirectories;
-    }
-
-    public void setSourceRegistrar(Consumer<Path> sourceRegistrar) {
-        this.sourceRegistrar = sourceRegistrar;
-    }
-
-    public void setTest(boolean test) {
-        this.test = test;
-    }
-}
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoteDev.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoteDev.java
index bbd135e97ce15..57843b79e0ff3 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoteDev.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoteDev.java
@@ -1,17 +1,12 @@
 package io.quarkus.gradle.tasks;
 
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
-import io.quarkus.deployment.dev.DevModeContext;
-import io.quarkus.deployment.dev.IsolatedRemoteDevModeMain;
-
 public class QuarkusRemoteDev extends QuarkusDev {
 
     public QuarkusRemoteDev() {
         super("Remote development mode: enables hot deployment on remote JVM with background compilation");
     }
 
-    protected void modifyDevModeContext(DevModeContext devModeContext) {
-        devModeContext.setMode(QuarkusBootstrap.Mode.PROD);
-        devModeContext.setAlternateEntryPoint(IsolatedRemoteDevModeMain.class.getName());
+    protected void modifyDevModeContext(GradleDevModeLauncher.Builder builder) {
+        builder.remoteDev(true);
     }
 }
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java
index 1adf369f5c415..0d11fa2f81c67 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusRemoveExtension.java
@@ -39,7 +39,7 @@ public void removeExtension() {
                 .map(String::trim)
                 .collect(toSet());
         try {
-            new RemoveExtensions(getQuarkusProject())
+            new RemoveExtensions(getQuarkusProject(true))
                     .extensions(extensionsSet)
                     .execute();
         } catch (Exception e) {
diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java
index d040a63ec5216..257ce171183a4 100644
--- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java
+++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java
@@ -6,7 +6,7 @@
 import org.gradle.api.DefaultTask;
 
 import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.gradle.QuarkusPluginExtension;
+import io.quarkus.gradle.extension.QuarkusPluginExtension;
 
 public abstract class QuarkusTask extends DefaultTask {
 
diff --git a/devtools/gradle/src/test/java/io/quarkus/gradle/GradleBuildFileTest.java b/devtools/gradle/src/test/java/io/quarkus/gradle/GradleBuildFileTest.java
deleted file mode 100644
index ea7457f191337..0000000000000
--- a/devtools/gradle/src/test/java/io/quarkus/gradle/GradleBuildFileTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.quarkus.gradle;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.model.Dependency;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-
-class GradleBuildFileTest {
-
-    private static GradleBuildFileFromConnector buildFile;
-
-    @BeforeAll
-    public static void beforeAll() throws URISyntaxException {
-        URL url = GradleBuildFileTest.class.getClassLoader().getResource("gradle-project");
-        URI uri = url.toURI();
-        Path gradleProjectPath = Paths.get(uri);
-        final QuarkusPlatformDescriptor descriptor = Mockito.mock(QuarkusPlatformDescriptor.class);
-        buildFile = new GradleBuildFileFromConnector(gradleProjectPath, descriptor);
-    }
-
-    @Test
-    void testGetDependencies() throws IOException {
-        List<Dependency> dependencies = buildFile.getDependencies();
-        assertThat(dependencies).isNotEmpty();
-        List<String> depsString = new ArrayList<>();
-        for (Iterator<Dependency> depIter = dependencies.iterator(); depIter.hasNext();) {
-            Dependency dependency = depIter.next();
-            String managementKey = dependency.getManagementKey();
-            if (dependency.getVersion() != null && !dependency.getVersion().isEmpty()) {
-                managementKey += ':' + dependency.getVersion();
-            }
-            depsString.add(managementKey);
-        }
-        assertThat(depsString).contains("io.quarkus:quarkus-jsonp:jar:0.23.2",
-                "io.quarkus:quarkus-jsonb:jar:0.23.2", "io.quarkus:quarkus-resteasy:jar:0.23.2");
-    }
-
-    @Test
-    void testGetProperty() throws IOException {
-        assertNull(buildFile.getProperty("toto"));
-        assertEquals("0.23.2", buildFile.getProperty("quarkusVersion"));
-    }
-
-    @Test
-    void testGetTestClosure() throws IOException {
-        assertNull(buildFile.getProperty("test"));
-    }
-
-}
diff --git a/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java b/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java
index 337df0ded4573..6c6800cb411e8 100644
--- a/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java
+++ b/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java
@@ -4,6 +4,9 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.File;
+import java.util.Set;
+
 import org.gradle.api.Project;
 import org.gradle.api.plugins.BasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
@@ -11,6 +14,8 @@
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.gradle.extension.QuarkusPluginExtension;
+
 public class QuarkusPluginTest {
 
     @Test
@@ -53,4 +58,22 @@ public void shouldMakeQuarkusDevAndQuarkusBuildDependOnClassesTask() {
         assertThat(tasks.getByName(QuarkusPlugin.QUARKUS_DEV_TASK_NAME).getDependsOn())
                 .contains(tasks.getByName(JavaPlugin.CLASSES_TASK_NAME));
     }
+
+    @Test
+    public void shouldReturnMutlipleOutputSourceDirectories() {
+        Project project = ProjectBuilder.builder().build();
+        project.getPluginManager().apply(QuarkusPlugin.ID);
+        project.getPluginManager().apply("java");
+        project.getPluginManager().apply("scala");
+
+        final QuarkusPluginExtension extension = project.getExtensions().getByType(QuarkusPluginExtension.class);
+
+        final Set<File> outputSourceDirs = extension.combinedOutputSourceDirs();
+        assertThat(outputSourceDirs).hasSize(4);
+        assertThat(outputSourceDirs).contains(new File(project.getBuildDir(), "classes/java/main"),
+                new File(project.getBuildDir(), "classes/java/test"),
+                new File(project.getBuildDir(), "classes/scala/main"),
+                new File(project.getBuildDir(), "classes/scala/test"));
+
+    }
 }
diff --git a/devtools/gradle/src/test/resources/gradle-project/build.gradle b/devtools/gradle/src/test/resources/gradle-project/build.gradle
deleted file mode 100644
index 2e6db65bd7396..0000000000000
--- a/devtools/gradle/src/test/resources/gradle-project/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'io.quarkus:quarkus-jsonp'
-    implementation 'io.quarkus:quarkus-jsonb'
-    constraints {
-        implementation("io.quarkus:quarkus-jsonb:0.10.0") {
-            because("to test constraints")
-        }
-    }
-    implementation enforcedPlatform("io.quarkus:quarkus-bom:${quarkusVersion}")
-    implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
-}
-
-test {
-    dependsOn 'cleanTest'
-    useJUnitPlatform()
-
-    // @NativeImageTest and JVM mode tests can't be mixed in the same run
-    forkEvery 1
-}
diff --git a/devtools/gradle/src/test/resources/gradle-project/gradle.properties b/devtools/gradle/src/test/resources/gradle-project/gradle.properties
deleted file mode 100644
index cc038fb4df04c..0000000000000
--- a/devtools/gradle/src/test/resources/gradle-project/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-quarkusVersion = 0.23.2
\ No newline at end of file
diff --git a/devtools/gradle/src/test/resources/multi-module-project/build.gradle b/devtools/gradle/src/test/resources/multi-module-project/build.gradle
deleted file mode 100644
index c154c33071814..0000000000000
--- a/devtools/gradle/src/test/resources/multi-module-project/build.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-
-subprojects {
-    apply plugin: 'java'
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-
-    dependencies {
-        implementation enforcedPlatform("io.quarkus:quarkus-bom:999-SNAPSHOT")
-        implementation 'io.quarkus:quarkus-resteasy'
-        testImplementation 'io.quarkus:quarkus-junit5'
-    }
-
-}
-
-group 'org.acme'
-version '1.0-SNAPSHOT'
diff --git a/devtools/gradle/src/test/resources/multi-module-project/settings.gradle b/devtools/gradle/src/test/resources/multi-module-project/settings.gradle
deleted file mode 100644
index 60c19d80c56b0..0000000000000
--- a/devtools/gradle/src/test/resources/multi-module-project/settings.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    plugins {
-        id 'io.quarkus' version "${quarkusPluginVersion}"
-    }
-}
-rootProject.name='mutli-module-project'
-
-include 'common', 'application'
\ No newline at end of file
diff --git a/devtools/gradle/src/test/resources/simple-module-project/build.gradle b/devtools/gradle/src/test/resources/simple-module-project/build.gradle
deleted file mode 100644
index 3aed0a675a9b6..0000000000000
--- a/devtools/gradle/src/test/resources/simple-module-project/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-plugins {
-    id 'java'
-    id 'io.quarkus'
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    implementation enforcedPlatform("io.quarkus:quarkus-bom:999-SNAPSHOT")
-    implementation 'io.quarkus:quarkus-resteasy'
-}
-
-group 'org.acme'
-version '1.0-SNAPSHOT'
-
-
-compileTestJava {
-    options.encoding = 'UTF-8'
-}
diff --git a/devtools/gradle/src/test/resources/simple-module-project/settings.gradle b/devtools/gradle/src/test/resources/simple-module-project/settings.gradle
deleted file mode 100644
index 775892b4374e6..0000000000000
--- a/devtools/gradle/src/test/resources/simple-module-project/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    plugins {
-        id 'io.quarkus' version "${quarkusPluginVersion}"
-    }
-}
-rootProject.name='simple-module-project'
\ No newline at end of file
diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml
index 6b20bff6c6dcf..cc5d536ed0996 100644
--- a/devtools/maven/pom.xml
+++ b/devtools/maven/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
+            <artifactId>quarkus-devtools-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -116,12 +116,6 @@
             </exclusions>
         </dependency>
 
-        <!-- user prompt -->
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
@@ -142,18 +136,12 @@
         <dependency>
             <groupId>org.twdata.maven</groupId>
             <artifactId>mojo-executor</artifactId>
-            <version>2.3.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>2.3.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
         </dependency>
 
         <!-- test -->
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java
index 49cf36a28e9f6..1983653ef206d 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/AddExtensionMojo.java
@@ -2,10 +2,8 @@
 
 import static java.util.stream.Collectors.toSet;
 
-import java.net.URL;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
@@ -15,9 +13,8 @@
 
 import io.quarkus.devtools.commands.AddExtensions;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.tools.MessageWriter;
-import io.quarkus.registry.DefaultExtensionRegistry;
 
 /**
  * Allow adding an extension to an existing pom.xml file.
@@ -40,12 +37,6 @@ public class AddExtensionMojo extends QuarkusProjectMojoBase {
     @Parameter(property = "extension")
     String extension;
 
-    /**
-     * The URL where the registry is.
-     */
-    @Parameter(property = "registry", alias = "quarkus.extension.registry")
-    List<URL> registries;
-
     @Override
     protected void validateParameters() throws MojoExecutionException {
         if ((StringUtils.isBlank(extension) && (extensions == null || extensions.isEmpty())) // None are set
@@ -69,9 +60,6 @@ public void doExecute(final QuarkusProject quarkusProject, final MessageWriter l
         try {
             AddExtensions addExtensions = new AddExtensions(quarkusProject)
                     .extensions(ext.stream().map(String::trim).collect(toSet()));
-            if (registries != null && !registries.isEmpty()) {
-                addExtensions.extensionRegistry(DefaultExtensionRegistry.fromURLs(registries));
-            }
             final QuarkusCommandOutcome outcome = addExtensions.execute();
             if (!outcome.isSuccess()) {
                 throw new MojoExecutionException("Unable to add extensions");
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java
index 6d00bd0193e19..2d0411859a406 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/BuildMojo.java
@@ -6,12 +6,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Properties;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -19,214 +19,110 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
 
 import io.quarkus.bootstrap.app.AugmentAction;
 import io.quarkus.bootstrap.app.AugmentResult;
 import io.quarkus.bootstrap.app.CuratedApplication;
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.bootstrap.model.PathsCollection;
-import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.util.IoUtils;
+import io.quarkus.runtime.configuration.ProfileManager;
 
 /**
- * Build the application.
- * <p>
- * You can build a native application runner with {@code native-image}
- *
- * @author Alexey Loubyansky
+ * Builds the Quarkus application.
  */
 @Mojo(name = "build", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
-public class BuildMojo extends AbstractMojo {
+public class BuildMojo extends QuarkusBootstrapMojo {
 
-    protected static final String QUARKUS_PACKAGE_UBER_JAR = "quarkus.package.uber-jar";
-    /**
-     * The entry point to Aether, i.e. the component doing all the work.
-     *
-     * @component
-     */
-    @Component
-    private RepositorySystem repoSystem;
+    private static final String PACKAGE_TYPE_PROP = "quarkus.package.type";
+    private static final String NATIVE_PROFILE_NAME = "native";
+    private static final String NATIVE_PACKAGE_TYPE = "native";
 
     @Component
     private MavenProjectHelper projectHelper;
 
-    /**
-     * The current repository/network configuration of Maven.
-     *
-     * @parameter default-value="${repositorySystemSession}"
-     * @readonly
-     */
-    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
-    private RepositorySystemSession repoSession;
-
-    /**
-     * The project's remote repositories to use for the resolution of artifacts and their dependencies.
-     *
-     * @parameter default-value="${project.remoteProjectRepositories}"
-     * @readonly
-     */
-    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
-    private List<RemoteRepository> repos;
-
     /**
      * The project's remote repositories to use for the resolution of plugins and their dependencies.
-     *
-     * @parameter default-value="${project.remotePluginRepositories}"
-     * @readonly
      */
     @Parameter(defaultValue = "${project.remotePluginRepositories}", readonly = true, required = true)
     private List<RemoteRepository> pluginRepos;
 
-    /**
-     * The directory for compiled classes.
-     */
-    @Parameter(readonly = true, required = true, defaultValue = "${project.build.outputDirectory}")
-    @Deprecated
-    private File outputDirectory;
-
-    @Parameter(defaultValue = "${project}", readonly = true, required = true)
-    protected MavenProject project;
-
     /**
      * The directory for generated source files.
      */
     @Parameter(defaultValue = "${project.build.directory}/generated-sources")
     private File generatedSourcesDirectory;
 
-    @Parameter(defaultValue = "${project.build.directory}")
-    private File buildDir;
-
-    @Parameter(defaultValue = "${project.build.finalName}")
-    private String finalName;
-
-    @Parameter(property = "uberJar", defaultValue = "false")
-    private boolean uberJar;
-
     /**
-     * When using the uberJar option, this array specifies entries that should
-     * be excluded from the final jar. The entries are relative to the root of
-     * the file. An example of this configuration could be:
-     * <code><pre>
-     * &#x3C;configuration&#x3E;
-     *   &#x3C;uberJar&#x3E;true&#x3C;/uberJar&#x3E;
-     *   &#x3C;ignoredEntries&#x3E;
-     *     &#x3C;ignoredEntry&#x3E;META-INF/BC2048KE.SF&#x3C;/ignoredEntry&#x3E;
-     *     &#x3C;ignoredEntry&#x3E;META-INF/BC2048KE.DSA&#x3C;/ignoredEntry&#x3E;
-     *     &#x3C;ignoredEntry&#x3E;META-INF/BC1024KE.SF&#x3C;/ignoredEntry&#x3E;
-     *     &#x3C;ignoredEntry&#x3E;META-INF/BC1024KE.DSA&#x3C;/ignoredEntry&#x3E;
-     *   &#x3C;/ignoredEntries&#x3E;
-     * &#x3C;/configuration&#x3E;
-     * </pre></code>
+     * Skips the execution of this mojo
      */
-    @Parameter(property = "ignoredEntries")
-    private String[] ignoredEntries;
-
-    /** Skip the execution of this mojo */
     @Parameter(defaultValue = "false", property = "quarkus.build.skip")
     private boolean skip = false;
 
-    public BuildMojo() {
-        MojoLogger.logSupplier = this::getLog;
-    }
+    @Deprecated
+    @Parameter(property = "skipOriginalJarRename")
+    boolean skipOriginalJarRename;
 
     @Override
-    public void execute() throws MojoExecutionException {
-
+    protected boolean beforeExecute() throws MojoExecutionException {
         if (skip) {
             getLog().info("Skipping Quarkus build");
-            return;
+            return false;
         }
-        if (project.getPackaging().equals("pom")) {
+        if (mavenProject().getPackaging().equals("pom")) {
             getLog().info("Type of the artifact is POM, skipping build goal");
-            return;
+            return false;
         }
-        if (!project.getArtifact().getArtifactHandler().getExtension().equals("jar")) {
+        if (!mavenProject().getArtifact().getArtifactHandler().getExtension().equals("jar")) {
             throw new MojoExecutionException(
-                    "The project artifact's extension is '" + project.getArtifact().getArtifactHandler().getExtension()
+                    "The project artifact's extension is '" + mavenProject().getArtifact().getArtifactHandler().getExtension()
                             + "' while this goal expects it be 'jar'");
         }
+        return true;
+    }
 
-        boolean clear = false;
-        try {
-
-            final Properties projectProperties = project.getProperties();
-            final Properties effectiveProperties = new Properties();
-            // quarkus. properties > ignoredEntries in pom.xml
-            if (ignoredEntries != null && ignoredEntries.length > 0) {
-                String joinedEntries = String.join(",", ignoredEntries);
-                effectiveProperties.setProperty("quarkus.package.user-configured-ignored-entries", joinedEntries);
-            }
-            for (String name : projectProperties.stringPropertyNames()) {
-                if (name.startsWith("quarkus.")) {
-                    effectiveProperties.setProperty(name, projectProperties.getProperty(name));
-                }
-            }
-            if (uberJar && System.getProperty(QUARKUS_PACKAGE_UBER_JAR) == null) {
-                System.setProperty(QUARKUS_PACKAGE_UBER_JAR, "true");
-                clear = true;
-            }
-            effectiveProperties.putIfAbsent("quarkus.application.name", project.getArtifactId());
-            effectiveProperties.putIfAbsent("quarkus.application.version", project.getVersion());
-
-            MavenArtifactResolver resolver = MavenArtifactResolver.builder()
-                    .setWorkspaceDiscovery(false)
-                    .setRepositorySystem(repoSystem)
-                    .setRepositorySystemSession(repoSession)
-                    .setRemoteRepositories(repos)
-                    .build();
-
-            final Artifact projectArtifact = project.getArtifact();
-            final AppArtifact appArtifact = new AppArtifact(projectArtifact.getGroupId(), projectArtifact.getArtifactId(),
-                    projectArtifact.getClassifier(), projectArtifact.getArtifactHandler().getExtension(),
-                    projectArtifact.getVersion());
+    @Override
+    protected void doExecute() throws MojoExecutionException {
 
-            File projectFile = projectArtifact.getFile();
-            if (projectFile == null) {
-                projectFile = new File(project.getBuild().getOutputDirectory());
-                if (!projectFile.exists()) {
-                    if (hasSources(project)) {
-                        throw new MojoExecutionException("Project " + project.getArtifact() + " has not been compiled yet");
-                    }
-                    if (!projectFile.mkdirs()) {
-                        throw new MojoExecutionException("Failed to create the output dir " + projectFile);
-                    }
+        try {
+            boolean clearPackageTypeSysProp = false;
+            // Essentially what this does is to enable the native package type even if a different package type is set
+            // in application properties. This is done to preserve what users expect to happen when
+            // they execute "mvn package -Dnative" even if quarkus.package.type has been set in application.properties
+            if (!System.getProperties().containsKey(PACKAGE_TYPE_PROP)
+                    && isNativeProfileEnabled(mavenProject())) {
+                Object packageTypeProp = mavenProject().getProperties().get(PACKAGE_TYPE_PROP);
+                String packageType = NATIVE_PACKAGE_TYPE;
+                if (packageTypeProp != null) {
+                    packageType = packageTypeProp.toString();
                 }
+                System.setProperty(PACKAGE_TYPE_PROP, packageType);
+                clearPackageTypeSysProp = true;
             }
-            appArtifact.setPaths(PathsCollection.of(projectFile.toPath()));
-
-            QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder()
-                    .setAppArtifact(appArtifact)
-                    .setMavenArtifactResolver(resolver)
-                    .setBaseClassLoader(BuildMojo.class.getClassLoader())
-                    .setBuildSystemProperties(effectiveProperties)
-                    .setLocalProjectDiscovery(false)
-                    .setProjectRoot(project.getBasedir().toPath())
-                    .setBaseName(finalName)
-                    .setTargetDirectory(buildDir.toPath());
-
-            for (MavenProject project : project.getCollectedProjects()) {
-                builder.addLocalArtifact(new AppArtifactKey(project.getGroupId(), project.getArtifactId(), null,
-                        project.getArtifact().getArtifactHandler().getExtension()));
+            // Set the build profile based on the value of the project property ProfileManager.QUARKUS_PROFILE_PROP
+            // if and only if it has not already been set using the corresponding system property
+            // or environment variable.
+            final Object profile = mavenProject().getProperties().get(ProfileManager.QUARKUS_PROFILE_PROP);
+            if (profile != null && System.getProperty(ProfileManager.QUARKUS_PROFILE_PROP) == null
+                    && System.getenv(ProfileManager.QUARKUS_PROFILE_ENV) == null) {
+                System.setProperty(ProfileManager.QUARKUS_PROFILE_PROP, profile.toString());
             }
-
-            try (CuratedApplication curatedApplication = builder
-                    .build().bootstrap()) {
+            try (CuratedApplication curatedApplication = bootstrapApplication()) {
 
                 AugmentAction action = curatedApplication.createAugmentor();
                 AugmentResult result = action.createProductionApplication();
 
-                Artifact original = project.getArtifact();
+                Artifact original = mavenProject().getArtifact();
                 if (result.getJar() != null) {
-                    if (result.getJar().isUberJar() && result.getJar().getOriginalArtifact() != null) {
-                        final Path standardJar = curatedApplication.getAppModel().getAppArtifact().getPaths().getSinglePath();
+
+                    if (!skipOriginalJarRename && result.getJar().isUberJar()
+                            && result.getJar().getOriginalArtifact() != null) {
+                        final Path standardJar = result.getJar().getOriginalArtifact();
                         if (Files.exists(standardJar)) {
+                            final Path renamedOriginal = standardJar.getParent().toAbsolutePath()
+                                    .resolve(standardJar.getFileName() + ".original");
                             try {
-                                Files.deleteIfExists(result.getJar().getOriginalArtifact());
-                                Files.move(standardJar, result.getJar().getOriginalArtifact());
+                                IoUtils.recursiveDelete(renamedOriginal);
+                                Files.move(standardJar, renamedOriginal);
                             } catch (IOException e) {
                                 throw new UncheckedIOException(e);
                             }
@@ -234,28 +130,35 @@ public void execute() throws MojoExecutionException {
                         }
                     }
                     if (result.getJar().isUberJar()) {
-                        projectHelper.attachArtifact(project, result.getJar().getPath().toFile(), "runner");
+                        projectHelper.attachArtifact(mavenProject(), result.getJar().getPath().toFile(),
+                                result.getJar().getClassifier());
                     }
                 }
+            } finally {
+                if (clearPackageTypeSysProp) {
+                    System.clearProperty(PACKAGE_TYPE_PROP);
+                }
             }
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to build quarkus application", e);
-        } finally {
-            if (clear) {
-                System.clearProperty(QUARKUS_PACKAGE_UBER_JAR);
-            }
         }
     }
 
-    private static boolean hasSources(MavenProject project) {
-        if (new File(project.getBuild().getSourceDirectory()).exists()) {
+    private boolean isNativeProfileEnabled(MavenProject mavenProject) {
+        // gotcha: mavenProject.getActiveProfiles() does not always contain all active profiles (sic!),
+        //         but getInjectedProfileIds() does (which has to be "flattened" first)
+        Stream<String> activeProfileIds = mavenProject.getInjectedProfileIds().values().stream().flatMap(List<String>::stream);
+        if (activeProfileIds.anyMatch(NATIVE_PROFILE_NAME::equalsIgnoreCase)) {
             return true;
         }
-        for (Resource r : project.getBuild().getResources()) {
-            if (new File(r.getDirectory()).exists()) {
-                return true;
-            }
-        }
-        return false;
+        // recurse into parent (if available)
+        return Optional.ofNullable(mavenProject.getParent()).map(this::isNativeProfileEnabled).orElse(false);
     }
+
+    @Override
+    public void setLog(Log log) {
+        super.setLog(log);
+        MojoLogger.delegate = log;
+    }
+
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java
deleted file mode 100644
index dc812e5b6131e..0000000000000
--- a/devtools/maven/src/main/java/io/quarkus/maven/CodeGenMojo.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package io.quarkus.maven;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-import java.util.function.Consumer;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.RemoteRepository;
-
-import io.quarkus.bootstrap.app.CuratedApplication;
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
-import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.prebuild.CodeGenFailureException;
-import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import io.quarkus.deployment.CodeGenerator;
-import io.quarkus.deployment.codegen.CodeGenData;
-
-@Mojo(name = "prepare", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
-public class CodeGenMojo extends AbstractMojo {
-
-    @Parameter(defaultValue = "${project.build.directory}")
-    private File buildDir;
-
-    @Parameter(defaultValue = "${project}", readonly = true, required = true)
-    protected MavenProject project;
-
-    @Component
-    private RepositorySystem repoSystem;
-
-    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
-    private RepositorySystemSession repoSession;
-
-    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
-    private List<RemoteRepository> repos;
-
-    /** Skip the execution of this mojo */
-    @Parameter(defaultValue = "false", property = "quarkus.prepare.skip")
-    private boolean skipSourceGeneration = false;
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        String projectDir = project.getBasedir().getAbsolutePath();
-        Path sourcesDir = Paths.get(projectDir, "src", "main");
-        doExecute(sourcesDir, path -> project.addCompileSourceRoot(path.toString()), false);
-    }
-
-    void doExecute(Path sourcesDir,
-            Consumer<Path> sourceRegistrar,
-            boolean test) throws MojoFailureException, MojoExecutionException {
-        if (project.getPackaging().equals("pom")) {
-            getLog().info("Type of the artifact is POM, skipping build goal");
-            return;
-        }
-        if (skipSourceGeneration) {
-            getLog().info("Skipping quarkus:" + (test ? "prepare-tests" : "prepare") + " (Quarkus code generation)");
-            return;
-        }
-
-        try {
-
-            final Properties projectProperties = project.getProperties();
-            final Properties realProperties = new Properties();
-            for (String name : projectProperties.stringPropertyNames()) {
-                if (name.startsWith("quarkus.")) {
-                    realProperties.setProperty(name, projectProperties.getProperty(name));
-                }
-            }
-
-            MavenArtifactResolver resolver = MavenArtifactResolver.builder()
-                    .setRepositorySystem(repoSystem)
-                    .setRepositorySystemSession(repoSession)
-                    .setRemoteRepositories(repos)
-                    .build();
-
-            final AppArtifact appArtifact = getAppArtifact();
-
-            CuratedApplication curatedApplication = QuarkusBootstrap.builder()
-                    .setAppArtifact(appArtifact)
-                    .setProjectRoot(project.getBasedir().toPath())
-                    .setMavenArtifactResolver(resolver)
-                    .setBaseClassLoader(BuildMojo.class.getClassLoader())
-                    .setBuildSystemProperties(realProperties)
-                    .setLocalProjectDiscovery(false)
-                    .setTargetDirectory(buildDir.toPath())
-                    .build().bootstrap();
-
-            Path generatedSourcesDir = test
-                    ? buildDir.toPath().resolve("generated-test-sources")
-                    : buildDir.toPath().resolve("generated-sources");
-
-            sourceRegistrar.accept(generatedSourcesDir);
-
-            QuarkusClassLoader deploymentClassLoader = curatedApplication.createDeploymentClassLoader();
-            List<CodeGenData> codeGens = CodeGenerator.init(deploymentClassLoader,
-                    Collections.singleton(sourcesDir),
-                    generatedSourcesDir,
-                    buildDir.toPath(),
-                    sourceRegistrar);
-
-            for (CodeGenData codeGen : codeGens) {
-                CodeGenerator.trigger(
-                        deploymentClassLoader,
-                        codeGen,
-                        curatedApplication.getAppModel());
-            }
-        } catch (CodeGenFailureException any) {
-            throw new MojoFailureException("Prepare phase of the quarkus-maven-plugin failed: " + any.getMessage(), any);
-        } catch (Exception any) {
-            throw new MojoExecutionException("Prepare phase of the quarkus-maven-plugin threw an error: " + any.getMessage(),
-                    any);
-        }
-    }
-
-    private AppArtifact getAppArtifact() throws MojoExecutionException {
-        final Path classesDir = Paths.get(project.getBuild().getOutputDirectory());
-        if (!Files.exists(classesDir)) {
-            if (getLog().isDebugEnabled()) {
-                getLog().debug("Creating empty " + classesDir + " just to be able to resolve the project's artifact");
-            }
-            try {
-                Files.createDirectories(classesDir);
-            } catch (IOException e) {
-                throw new MojoExecutionException("Failed to create " + classesDir);
-            }
-        }
-
-        final Artifact projectArtifact = project.getArtifact();
-        final AppArtifact appArtifact = new AppArtifact(projectArtifact.getGroupId(), projectArtifact.getArtifactId(),
-                projectArtifact.getClassifier(), projectArtifact.getArtifactHandler().getExtension(),
-                projectArtifact.getVersion());
-        appArtifact.setPath(classesDir);
-        return appArtifact;
-    }
-}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CodeGenTestMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CodeGenTestMojo.java
deleted file mode 100644
index ee8faddec0a49..0000000000000
--- a/devtools/maven/src/main/java/io/quarkus/maven/CodeGenTestMojo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.quarkus.maven;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-
-@Mojo(name = "prepare-tests", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
-public class CodeGenTestMojo extends CodeGenMojo {
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        String projectDir = project.getBasedir().getAbsolutePath();
-        Path testSources = Paths.get(projectDir, "src", "test");
-        doExecute(testSources, path -> project.addTestCompileSourceRoot(path.toString()), true);
-    }
-}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionLegacyMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionLegacyMojo.java
new file mode 100644
index 0000000000000..f2279d13faa52
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionLegacyMojo.java
@@ -0,0 +1,1289 @@
+package io.quarkus.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import javax.lang.model.SourceVersion;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactDescriptorResult;
+import org.jboss.logging.Logger;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.TemplateLoader;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import freemarker.template.TemplateExceptionHandler;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.maven.utilities.MojoUtils;
+import io.quarkus.maven.utilities.PomTransformer;
+import io.quarkus.maven.utilities.PomTransformer.Gavtcs;
+import io.quarkus.maven.utilities.PomTransformer.Transformation;
+
+/**
+ * LEGACY COMMAND
+ *
+ * Creates a triple of stub Maven modules (Parent, Runtime and Deployment) to implement a new
+ * <a href="https://quarkus.io/guides/writing-extensions">Quarkus Extension</a>.
+ *
+ * <h2>Adding into an established source tree</h2>
+ * <p>
+ * If this Mojo is executed in a directory that contains a {@code pom.xml} file with packaging {@code pom} the newly
+ * created Parent module is added as a child module to the existing {@code pom.xml} file.
+ *
+ * <h2>Creating a source tree from scratch</h2>
+ * <p>
+ * Executing this Mojo in an empty directory is not supported yet.
+ */
+@Mojo(name = "create-extension-legacy", requiresProject = false)
+public class CreateExtensionLegacyMojo extends AbstractMojo {
+
+    private static final String QUOTED_DOLLAR = Matcher.quoteReplacement("$");
+
+    private static final Logger log = Logger.getLogger(CreateExtensionLegacyMojo.class);
+
+    private static final Pattern BRACKETS_PATTERN = Pattern.compile("[()]+");
+    private static final String CLASSPATH_PREFIX = "classpath:";
+    private static final String FILE_PREFIX = "file:";
+
+    private static final String QUARKUS_VERSION_PROP = "quarkus.version";
+
+    static final String DEFAULT_ENCODING = "utf-8";
+    static final String DEFAULT_QUARKUS_VERSION = "@{" + QUARKUS_VERSION_PROP + "}";
+    static final String QUARKUS_VERSION_POM_EXPR = "${" + QUARKUS_VERSION_PROP + "}";
+    static final String DEFAULT_BOM_ENTRY_VERSION = "@{project.version}";
+    static final String DEFAULT_TEMPLATES_URI_BASE = "classpath:/create-extension-templates";
+    static final String DEFAULT_NAME_SEGMENT_DELIMITER = " - ";
+    static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("@\\{([^\\}]+)\\}");
+
+    static final String PLATFORM_DEFAULT_GROUP_ID = "io.quarkus";
+    static final String PLATFORM_DEFAULT_ARTIFACT_ID = "quarkus-bom";
+
+    static final String COMPILER_PLUGIN_VERSION_PROP = "compiler-plugin.version";
+    static final String COMPILER_PLUGIN_VERSION_POM_EXPR = "${" + COMPILER_PLUGIN_VERSION_PROP + "}";
+    static final String COMPILER_PLUGIN_DEFAULT_VERSION = "3.8.1";
+    private static final String COMPILER_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
+    private static final String COMPILER_PLUGIN_ARTIFACT_ID = "maven-compiler-plugin";
+    private static final String COMPILER_PLUGIN_KEY = COMPILER_PLUGIN_GROUP_ID + ":"
+            + COMPILER_PLUGIN_ARTIFACT_ID;
+
+    /**
+     * Directory where the changes should be performed. Default is the current directory of the current Java process.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.basedir")
+    File basedir;
+
+    /**
+     * The {@code groupId} of the Quarkus platform BOM.
+     */
+    @Parameter(property = "platformGroupId", defaultValue = PLATFORM_DEFAULT_GROUP_ID)
+    String platformGroupId;
+
+    /**
+     * The {@code artifactId} of the Quarkus platform BOM.
+     */
+    @Parameter(property = "platformArtifactId", defaultValue = PLATFORM_DEFAULT_ARTIFACT_ID)
+    String platformArtifactId;
+
+    /**
+     * The {@code groupId} for the newly created Maven modules. If {@code groupId} is left unset, the {@code groupId}
+     * from the {@code pom.xml} in the current directory will be used. Otherwise, an exception is thrown.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "groupId")
+    String groupId;
+
+    /**
+     * This parameter was introduced to change the property of {@code groupId} parameter from {@code quarkus.groupId} to
+     * {@code groupId}
+     *
+     * @since 1.3.0
+     */
+    @Deprecated
+    @Parameter(property = "quarkus.groupId")
+    String deprecatedGroupId;
+
+    /**
+     * {@code artifactId} of the runtime module. The {@code artifactId}s of the extension parent
+     * (<code>${artifactId}-parent</code>) and deployment (<code>${artifactId}-deployment</code>) modules will be based
+     * on this {@code artifactId} too.
+     * <p>
+     * Optionally, this value can contain the {@link #artifactIdBase} enclosed in round brackets, e.g.
+     * {@code my-project-(cool-extension)}, where {@code cool-extension} is an {@link #artifactIdBase} and
+     * {@code my-project-} is {@link #artifactIdPrefix}. This is a way to avoid defining of {@link #artifactIdPrefix}
+     * and {@link #artifactIdBase} separately. If no round brackets are present in {@link #artifactId},
+     * {@link #artifactIdBase} will be equal to {@link #artifactId} and {@link #artifactIdPrefix} will be an empty
+     * string.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "artifactId")
+    String artifactId;
+
+    /**
+     * This parameter was introduced to change the property of {@code artifactId} parameter from {@code quarkus.artifactId} to
+     * {@code artifactId}
+     *
+     * @since 1.3.0
+     */
+    @Deprecated
+    @Parameter(property = "quarkus.artifactId")
+    String deprecatedArtifactId;
+
+    /**
+     * A prefix common to all extension artifactIds in the current source tree. If you set {@link #artifactIdPrefix},
+     * set also {@link #artifactIdBase}, but do not set {@link #artifactId}.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.artifactIdPrefix", defaultValue = "")
+    String artifactIdPrefix;
+
+    /**
+     * The unique part of the {@link #artifactId}. If you set {@link #artifactIdBase}, {@link #artifactIdPrefix}
+     * may also be set, but not {@link #artifactId}.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.artifactIdBase")
+    String artifactIdBase;
+
+    /**
+     * The {@code version} for the newly created Maven modules. If {@code version} is left unset, the {@code version}
+     * from the {@code pom.xml} in the current directory will be used. Otherwise, an exception is thrown.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "version")
+    String version;
+
+    /**
+     * This parameter was introduced to change the property of {@code version} parameter from {@code quarkus.artifactVersion} to
+     * {@code version}
+     *
+     * @since 1.3.0
+     */
+    @Deprecated
+    @Parameter(property = "quarkus.artifactVersion")
+    String deprecatedVersion;
+
+    /**
+     * The {@code name} of the runtime module. The {@code name}s of the extension parent and deployment modules will be
+     * based on this {@code name} too.
+     * <p>
+     * Optionally, this value can contain the {@link #nameBase} enclosed in round brackets, e.g.
+     * {@code My Project - (Cool Extension)}, where {@code Cool Extension} is a {@link #nameBase} and
+     * {@code My Project - } is {@link #namePrefix}. This is a way to avoid defining of {@link #namePrefix} and
+     * {@link #nameBase} separately. If no round brackets are present in {@link #name}, the {@link #nameBase} will be
+     * equal to {@link #name} and {@link #namePrefix} will be an empty string.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.name")
+    String name;
+
+    /**
+     * A prefix common to all extension names in the current source tree. If you set {@link #namePrefix}, set also
+     * {@link #nameBase}, but do not set {@link #name}.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.namePrefix")
+    String namePrefix;
+
+    /**
+     * The unique part of the {@link #name}. If you set {@link #nameBase}, set also {@link #namePrefix}, but do not set
+     * {@link #name}.
+     * <p>
+     * If neither {@link #name} nor @{link #nameBase} is set, @{link #nameBase} will be derived from
+     * {@link #artifactIdBase}.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.nameBase")
+    String nameBase;
+
+    /**
+     * A string that will delimit {@link #name} from {@code Parent}, {@code Runtime} and {@code Deployment} tokens in
+     * the respective modules.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.nameSegmentDelimiter", defaultValue = DEFAULT_NAME_SEGMENT_DELIMITER)
+    String nameSegmentDelimiter;
+
+    /**
+     * Base Java package under which Java classes should be created in Runtime and Deployment modules. If not set, the
+     * Java package will be auto-generated out of {@link #groupId}, {@link #javaPackageInfix} and {@link #artifactId}
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.javaPackageBase")
+    String javaPackageBase;
+
+    /**
+     * If {@link #javaPackageBase} is not set explicitly, this infix will be put between package segments taken from
+     * {@link #groupId} and {@link #artifactId}.
+     * <p>
+     * Example: Given
+     * <ul>
+     * <li>{@link #groupId} is {@code org.example.quarkus.extensions}</li>
+     * <li>{@link #javaPackageInfix} is {@code foo.bar}</li>
+     * <li>{@link #artifactId} is {@code cool-extension}</li>
+     * </ul>
+     * Then the auto-generated {@link #javaPackageBase} will be
+     * {@code org.example.quarkus.extensions.foo.bar.cool.extension}
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.javaPackageInfix")
+    String javaPackageInfix;
+
+    /**
+     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
+     * Parent module. If {@code grandParentArtifactId} is left unset, the {@code artifactId} from the {@code pom.xml} in
+     * the current directory will be used. Otherwise, an exception is thrown.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.grandParentArtifactId")
+    @Deprecated
+    String grandParentArtifactId;
+
+    /**
+     * This mojo creates a Maven project consisting of the root POM and two modules: the runtime and the deployment one.
+     * This parameter configures the {@code artifactId} of the root POM's parent POM.
+     * If {@code parentArtifactId} is left unset, then if the current directory already includes a {@code pom.xml}
+     * its {@code artifactId} will be used as the parent's {@code artifactId} and if the current directory does not contain
+     * any {@code pom.xml} then the generated root {@code pom.xml} won't have any parent.
+     */
+    @Parameter(property = "parentArtifactId")
+    String parentArtifactId;
+
+    /**
+     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
+     * Parent module. If {@code grandParentGroupId} is left unset, the {@code groupId} from the {@code pom.xml} in the
+     * current directory will be used. Otherwise, an exception is thrown.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.grandParentGroupId")
+    @Deprecated
+    String grandParentGroupId;
+
+    /**
+     * This mojo creates a Maven project consisting of the root POM and two modules: the runtime and the deployment one.
+     * This parameter configures the {@code groupId} of the root POM's parent POM.
+     * If {@code parentGroupId} is left unset, then if the current directory already includes a {@code pom.xml}
+     * its {@code groupId} will be used as the parent's {@code groupId} and if the current directory does not contain
+     * any {@code pom.xml} then the generated root {@code pom.xml} won't have any parent.
+     */
+    @Parameter(property = "parentGroupId")
+    String parentGroupId;
+
+    /**
+     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
+     * Parent module. If {@code grandParentRelativePath} is left unset, the default {@code relativePath}
+     * {@code "../pom.xml"} is used.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.grandParentRelativePath")
+    @Deprecated
+    String grandParentRelativePath;
+
+    /**
+     * This mojo creates a Maven project consisting of the root POM and two modules: the runtime and the deployment one.
+     * This parameter configures the {@code relativePath} of the root POM's parent POM.
+     * If {@code grandParentRelativePath} is left unset, the default {@code relativePath} is used.
+     */
+    @Parameter(property = "parentRelativePath")
+    String parentRelativePath;
+
+    /**
+     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
+     * Parent module. If {@code grandParentVersion} is left unset, the {@code version} from the {@code pom.xml} in the
+     * current directory will be used. Otherwise, an exception is thrown.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.grandParentVersion")
+    @Deprecated
+    String grandParentVersion;
+
+    /**
+     * This mojo creates a Maven project consisting of the root POM and two modules: the runtime and the deployment one.
+     * This parameter configures the {@code version} of the root POM's parent POM.
+     * If {@code parentVersion} is left unset, then if the current directory already includes a {@code pom.xml}
+     * its {@code version} will be used as the parent's {@code version} and if the current directory does not contain
+     * any {@code pom.xml} then the generated root {@code pom.xml} won't have any parent.
+     */
+    @Parameter(property = "parentVersion")
+    String parentVersion;
+
+    /**
+     * Quarkus version the newly created extension should depend on. If you want to pass a property placeholder, use
+     * {@code @} instead if {@code $} so that the property is not evaluated by the current mojo - e.g.
+     * <code>@{quarkus.version}</code>
+     *
+     * @since 0.20.0
+     */
+    @Parameter(defaultValue = DEFAULT_QUARKUS_VERSION, required = true, property = "quarkus.version")
+    String quarkusVersion;
+
+    /**
+     * This parameter was introduced to change the property of {@code artifactId} parameter from {@code quarkus.artifactId} to
+     * {@code artifactId}
+     *
+     * @since 1.3.0
+     */
+    @Deprecated
+    @Parameter(property = "quarkus.quarkusVersion")
+    String deprecatedQuarkusVersion;
+
+    /**
+     * If {@code true} the Maven dependencies in Runtime and Deployment modules will not have their versions set and the
+     * {@code quarkus-bootstrap-maven-plugin} in the Runtime module will not have its version set and it will have no
+     * executions configured. If {@code false} the version set in {@link #quarkusVersion} will be used where applicable
+     * and {@code quarkus-bootstrap-maven-plugin} in the Runtime module will be configured explicitly. If the value is
+     * {@code null} the parameter will be treated as it was initialized to {@code false}.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(property = "quarkus.assumeManaged")
+    Boolean assumeManaged;
+
+    /**
+     * URI prefix to use when looking up FreeMarker templates when generating various source files. You need to touch
+     * this only if you want to provide your own custom templates.
+     * <p>
+     * The following URI schemes are supported:
+     * <ul>
+     * <li>{@code classpath:}</li>
+     * <li>{@code file:} (relative to {@link #basedir})</li>
+     * </ul>
+     * These are the template files you may want to provide under your custom {@link #templatesUriBase}:
+     * <ul>
+     * <li>{@code deployment-pom.xml}</li>
+     * <li>{@code integration-test-application.properties}</li>
+     * <li>{@code integration-test-pom.xml}</li>
+     * <li>{@code IT.java}</li>
+     * <li>{@code parent-pom.xml}</li>
+     * <li>{@code Processor.java}</li>
+     * <li>{@code runtime-pom.xml}</li>
+     * <li>{@code Test.java}</li>
+     * <li>{@code TestResource.java}</li>
+     * </ul>
+     * Note that you do not need to provide all of them. Files not available in your custom {@link #templatesUriBase}
+     * will be looked up in the default URI base {@value #DEFAULT_TEMPLATES_URI_BASE}. The default templates are
+     * maintained <a href=
+     * "https://github.com/quarkusio/quarkus/tree/main/devtools/maven/src/main/resources/create-extension-templates">here</a>.
+     *
+     * @since 0.20.0
+     */
+    @Parameter(defaultValue = DEFAULT_TEMPLATES_URI_BASE, required = true, property = "quarkus.templatesUriBase")
+    String templatesUriBase;
+
+    /**
+     * Encoding to read and write files in the current source tree
+     *
+     * @since 0.20.0
+     */
+    @Parameter(defaultValue = DEFAULT_ENCODING, required = true, property = "quarkus.encoding")
+    String encoding;
+
+    /**
+     * Path relative to {@link #basedir} pointing at a {@code pom.xml} file containing the platform BOM (Bill of Materials) that
+     * manages extension artifacts. If set, the newly created runtime and deployment modules will be added to
+     * {@code <dependencyManagement>} section of this bom; otherwise the newly created modules will not be added
+     * to any BOM.
+     *
+     * @since 1.7.0.Final
+     */
+    @Parameter(property = "bomPath")
+    Path bomPath;
+
+    /**
+     * A version for the entries added to the platform BOM (see {@link #bomPath}).
+     * If you want to pass a property placeholder, use {@code @} instead if {@code $} so
+     * that the property is not evaluated by the current mojo - e.g. <code>@{my-project.version}</code>
+     *
+     * @since 0.25.0
+     */
+    @Parameter(property = "quarkus.bomEntryVersion", defaultValue = DEFAULT_BOM_ENTRY_VERSION)
+    String bomEntryVersion;
+
+    /**
+     * A list of strings of the form {@code groupId:artifactId:version[:type[:classifier[:scope]]]} representing the
+     * dependencies that should be added to the generated runtime module and to the platform BOM if it is specified via
+     * {@link #bomPath}.
+     * <p>
+     * In case the built-in Maven <code>${placeholder}</code> expansion does not work well for you (because you e.g.
+     * pass {@link #additionalRuntimeDependencies}) via CLI, the Mojo supports a custom <code>@{placeholder}</code>
+     * expansion:
+     * <ul>
+     * <li><code>@{$}</code> will be expanded to {@code $} - handy for escaping standard placeholders. E.g. to insert
+     * <code>${quarkus.version}</code> to the platform BOM, you need to pass <code>@{$}{quarkus.version}</code></li>
+     * <li><code>@{quarkus.field}</code> will be expanded to whatever value the given {@code field} of this mojo has at
+     * runtime.</li>
+     * <li>Any other <code>@{placeholder}</code> will be resolved using the current project's properties</li>
+     * </ul>
+     *
+     * @since 0.22.0
+     */
+    @Parameter(property = "quarkus.additionalRuntimeDependencies")
+    List<String> additionalRuntimeDependencies;
+
+    /**
+     * An absolute path or a path relative to {@link #basedir} pointing at a {@code pom.xml} file that should serve as
+     * a parent for the integration test Maven module this mojo generates. If {@link #itestParentPath} is not set,
+     * the integration test module will not be generated.
+     *
+     * @since 0.22.0
+     */
+    @Parameter(property = "quarkus.itestParentPath")
+    Path itestParentPath;
+
+    @Parameter(defaultValue = "${project}", readonly = true)
+    MavenProject project;
+
+    /**
+     * The entry point to Aether, i.e. the component doing all the work.
+     *
+     * @component
+     */
+    @Component
+    private RepositorySystem repoSystem;
+
+    /**
+     * The current repository/network configuration of Maven.
+     *
+     * @parameter default-value="${repositorySystemSession}"
+     * @readonly
+     */
+    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+    private RepositorySystemSession repoSession;
+
+    /**
+     * The project's remote repositories to use for the resolution of artifacts and their dependencies.
+     *
+     * @parameter default-value="${project.remoteProjectRepositories}"
+     * @readonly
+     */
+    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
+    private List<RemoteRepository> repos;
+
+    /**
+     * The version of {@code org.apache.maven.plugins:maven-compiler-plugin} that should be used for
+     * the extension project.
+     */
+    @Parameter(defaultValue = COMPILER_PLUGIN_DEFAULT_VERSION, required = true, property = "quarkus.mavenCompilerPluginVersion")
+    String compilerPluginVersion;
+
+    /**
+     * Indicates whether to generate a unit test class for the extension
+     *
+     * @since 1.10.0
+     */
+    @Parameter(property = "quarkus.generateUnitTest", defaultValue = "true")
+    boolean generateUnitTest;
+
+    /**
+     * Indicates whether to generate a dev mode unit test class for the extension
+     *
+     * @since 1.10.0
+     */
+    @Parameter(property = "quarkus.generateDevModeTest", defaultValue = "true")
+    boolean generateDevModeTest;
+
+    /**
+     * Indicates whether to generate the extension under the current directory or under a directory based on the
+     * artifactId
+     *
+     */
+    @Parameter(property = "quarkus.useCurrentDirectory", defaultValue = "false")
+    boolean useCurrentDirectory;
+
+    boolean currentProjectIsBaseDir;
+
+    Charset charset;
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+
+        if (this.basedir == null) {
+            currentProjectIsBaseDir = true;
+            this.basedir = new File(".").getAbsoluteFile();
+        }
+
+        if (deprecatedGroupId != null) {
+            if (groupId != null) {
+                throw new MojoExecutionException("Either groupId or deprecatedGroupId can be set at a time but got groupId="
+                        + groupId + " and deprecatedGroupId=" + deprecatedGroupId);
+            }
+            groupId = deprecatedGroupId;
+        }
+        if (deprecatedArtifactId != null) {
+            if (artifactId != null) {
+                throw new MojoExecutionException(
+                        "Either artifactId or deprecatedArtifactId can be set at a time but got artifactId=" + artifactId
+                                + " and deprecatedArtifactId=" + deprecatedArtifactId);
+            }
+            artifactId = deprecatedArtifactId;
+        }
+        if (deprecatedVersion != null) {
+            if (version != null) {
+                throw new MojoExecutionException("Either version or deprecatedVersion can be set at a time but got version="
+                        + version + " and deprecatedVersion=" + deprecatedVersion);
+            }
+            version = deprecatedVersion;
+        }
+        if (deprecatedQuarkusVersion != null) {
+            if (quarkusVersion != null && !DEFAULT_QUARKUS_VERSION.equals(quarkusVersion)) {
+                throw new MojoExecutionException(
+                        "Either quarkusVersion or deprecatedQuarkusVersion can be set at a time but got quarkusVersion="
+                                + quarkusVersion + " and deprecatedQuarkusVersion=" + deprecatedQuarkusVersion);
+            }
+            quarkusVersion = deprecatedQuarkusVersion;
+        }
+
+        if (artifactId != null) {
+            artifactIdBase = artifactIdBase(artifactId);
+            artifactIdPrefix = artifactId.substring(0, artifactId.length() - artifactIdBase.length());
+            artifactId = BRACKETS_PATTERN.matcher(artifactId).replaceAll("");
+        } else if (artifactIdBase != null) {
+            artifactId = artifactIdPrefix == null || artifactIdPrefix.isEmpty() ? artifactIdBase
+                    : artifactIdPrefix + artifactIdBase;
+        } else {
+            throw new MojoFailureException(String.format(
+                    "Either artifactId or both artifactIdPrefix and artifactIdBase must be specified; found: artifactId=[%s], artifactIdPrefix=[%s], artifactIdBase[%s]",
+                    artifactId, artifactIdPrefix, artifactIdBase));
+        }
+
+        if (name != null) {
+            final int pos = name.lastIndexOf(nameSegmentDelimiter);
+            if (pos >= 0) {
+                nameBase = name.substring(pos + nameSegmentDelimiter.length());
+            } else {
+                nameBase = name;
+            }
+            namePrefix = name.substring(0, name.length() - nameBase.length());
+        } else {
+            if (nameBase == null) {
+                nameBase = toCapWords(artifactIdBase);
+            }
+            if (namePrefix == null) {
+                namePrefix = "";
+            }
+            if (nameBase != null && namePrefix != null) {
+                name = namePrefix + nameBase;
+            } else {
+                throw new MojoFailureException("Either name or both namePrefix and nameBase must be specified");
+            }
+        }
+
+        if (bomPath != null) {
+            bomPath = basedir.toPath().resolve(bomPath);
+            if (!Files.exists(bomPath)) {
+                throw new MojoFailureException("bomPath does not exist: " + bomPath);
+            }
+        }
+
+        charset = Charset.forName(encoding);
+
+        try {
+            File rootPom = null;
+            Model rootModel = null;
+            boolean importDeploymentBom = true;
+            boolean setCompilerPluginVersion = true;
+            boolean setQuarkusVersionProp = true;
+            if (isCurrentProjectExists()) {
+                rootPom = getCurrentProjectPom();
+                if (rootPom != null && useCurrentDirectory) {
+                    throw new MojoFailureException(
+                            "Cannot add extension under this directory. Pom file was found.");
+                }
+                rootModel = MojoUtils.readPom(rootPom);
+                if (!"pom".equals(rootModel.getPackaging())) {
+                    throw new MojoFailureException(
+                            "Can add extension modules only under a project with packaging 'pom'; found: "
+                                    + rootModel.getPackaging() + "");
+                }
+
+                if (rootPom.equals(project.getFile())) {
+                    importDeploymentBom = !hasQuarkusDeploymentBom();
+                    setCompilerPluginVersion = !project.getPluginManagement().getPluginsAsMap()
+                            .containsKey(COMPILER_PLUGIN_KEY);
+                    setQuarkusVersionProp = !project.getProperties().containsKey(QUARKUS_VERSION_PROP);
+                } else {
+                    // aloubyansky: not sure we should support this case and not sure it ever worked properly
+                    // this is about creating an extension project not in the context of the current project from the Maven's plugin perspective
+                    // kind of a pathological use-case from the Maven's perspective, imo
+                    final DefaultArtifact rootArtifact = new DefaultArtifact(getGroupId(rootModel),
+                            rootModel.getArtifactId(), null, rootModel.getPackaging(), getVersion(rootModel));
+                    try {
+                        final MavenArtifactResolver mvn = MavenArtifactResolver.builder()
+                                .setRepositorySystem(repoSystem)
+                                .setRepositorySystemSession(repoSession)
+                                .setRemoteRepositories(repos)
+                                .setCurrentProject(LocalProject.loadWorkspace(rootPom.getParentFile().toPath()))
+                                .build();
+                        final ArtifactDescriptorResult rootDescr = mvn.resolveDescriptor(rootArtifact);
+                        importDeploymentBom = !hasQuarkusDeploymentBom(rootDescr.getManagedDependencies());
+                        // TODO determine whether the compiler plugin is configured for the project
+                        setQuarkusVersionProp = !rootDescr.getProperties().containsKey(QUARKUS_VERSION_PROP);
+                    } catch (Exception e) {
+                        throw new MojoExecutionException("Failed to resolve " + rootArtifact + " descriptor", e);
+                    }
+                }
+            } else if (parentRelativePath() != null) {
+                // aloubyansky: not sure we should support this case, same as above
+                final File gpPom = getExtensionProjectBaseDir().resolve(parentRelativePath()).normalize()
+                        .toAbsolutePath().toFile();
+                if (gpPom.exists()) {
+                    rootPom = gpPom;
+                    rootModel = MojoUtils.readPom(gpPom);
+                    final DefaultArtifact rootArtifact = new DefaultArtifact(getGroupId(rootModel),
+                            rootModel.getArtifactId(), null, rootModel.getPackaging(), getVersion(rootModel));
+                    try {
+                        final MavenArtifactResolver mvn = MavenArtifactResolver.builder()
+                                .setRepositorySystem(repoSystem)
+                                .setRepositorySystemSession(repoSession)
+                                .setRemoteRepositories(repos)
+                                .setCurrentProject(LocalProject.loadWorkspace(rootPom.getParentFile().toPath()))
+                                .build();
+                        final ArtifactDescriptorResult rootDescr = mvn.resolveDescriptor(rootArtifact);
+                        importDeploymentBom = !hasQuarkusDeploymentBom(rootDescr.getManagedDependencies());
+                        // TODO determine whether the compiler plugin is configured for the project
+                        setQuarkusVersionProp = !rootDescr.getProperties().containsKey(QUARKUS_VERSION_PROP);
+                    } catch (Exception e) {
+                        throw new MojoExecutionException("Failed to resolve " + rootArtifact + " descriptor", e);
+                    }
+                }
+            }
+
+            final TemplateParams templateParams = getTemplateParams(rootModel);
+            final Configuration cfg = getTemplateConfig();
+
+            generateExtensionProjects(cfg, templateParams);
+            if (setQuarkusVersionProp) {
+                setQuarkusVersionProp(getExtensionProjectBaseDir().resolve("pom.xml").toFile());
+            }
+            if (importDeploymentBom) {
+                addQuarkusDeploymentBom(getExtensionProjectBaseDir().resolve("pom.xml").toFile());
+            }
+            if (setCompilerPluginVersion) {
+                setCompilerPluginVersion(getExtensionProjectBaseDir().resolve("pom.xml").toFile());
+            }
+            if (rootModel != null) {
+                addModules(rootPom.toPath(), templateParams, rootModel);
+            }
+
+            if (bomPath != null) {
+                getLog().info(
+                        String.format("Adding [%s] to dependencyManagement in [%s]", templateParams.artifactId,
+                                bomPath));
+                List<PomTransformer.Transformation> transformations = new ArrayList<PomTransformer.Transformation>();
+                transformations
+                        .add(Transformation.addManagedDependency(templateParams.groupId, templateParams.artifactId,
+                                templateParams.bomEntryVersion));
+                for (Gavtcs gavtcs : templateParams.additionalRuntimeDependencies) {
+                    getLog().info(String.format("Adding [%s] to dependencyManagement in [%s]", gavtcs, bomPath));
+                    transformations.add(Transformation.addManagedDependency(gavtcs));
+                }
+                final String aId = templateParams.artifactId + "-deployment";
+                getLog().info(String.format("Adding [%s] to dependencyManagement in [%s]", aId, bomPath));
+                transformations.add(Transformation.addManagedDependency(templateParams.groupId, aId,
+                        templateParams.bomEntryVersion));
+
+                pomTransformer(bomPath).transform(transformations);
+            }
+            if (itestParentPath != null) {
+                generateItest(cfg, templateParams);
+            }
+        } catch (IOException e) {
+            throw new MojoExecutionException(String.format("Could not read %s", project.getFile()), e);
+        } catch (TemplateException e) {
+            throw new MojoExecutionException(String.format("Could not process a FreeMarker template"), e);
+        }
+    }
+
+    private void setQuarkusVersionProp(File pom) throws IOException, MojoExecutionException {
+        pomTransformer(pom.toPath()).transform(Transformation.addProperty(QUARKUS_VERSION_PROP,
+                quarkusVersion.equals(DEFAULT_QUARKUS_VERSION) ? getPluginVersion() : quarkusVersion));
+    }
+
+    private void setCompilerPluginVersion(File pom) throws IOException {
+        pomTransformer(pom.toPath()).transform(Transformation.addProperty(COMPILER_PLUGIN_VERSION_PROP, compilerPluginVersion));
+        pomTransformer(pom.toPath())
+                .transform(Transformation.addManagedPlugin(
+                        MojoUtils.plugin(COMPILER_PLUGIN_GROUP_ID, COMPILER_PLUGIN_ARTIFACT_ID,
+                                COMPILER_PLUGIN_VERSION_POM_EXPR)));
+    }
+
+    private void addQuarkusDeploymentBom(File pom) throws IOException, MojoExecutionException {
+        addQuarkusDeploymentBom(MojoUtils.readPom(pom), pom);
+    }
+
+    private void addQuarkusDeploymentBom(Model model, File file) throws IOException, MojoExecutionException {
+        pomTransformer(file.toPath())
+                .transform(Transformation.addManagedDependency(
+                        new Gavtcs(platformGroupId, platformArtifactId, QUARKUS_VERSION_POM_EXPR, "pom", null, "import")));
+    }
+
+    private String getPluginVersion() throws MojoExecutionException {
+        return CreateUtils.resolvePluginInfo(CreateExtensionLegacyMojo.class).getVersion();
+    }
+
+    private boolean hasQuarkusDeploymentBom() {
+        if (project.getDependencyManagement() == null) {
+            return false;
+        }
+        for (org.apache.maven.model.Dependency dep : project.getDependencyManagement().getDependencies()) {
+            if (dep.getArtifactId().equals("quarkus-core-deployment")
+                    && dep.getGroupId().equals("io.quarkus")) {
+                // this is not a 100% accurate check but practically valid
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean hasQuarkusDeploymentBom(List<Dependency> deps) {
+        if (deps == null) {
+            return false;
+        }
+        for (Dependency dep : deps) {
+            if (dep.getArtifact().getArtifactId().equals("quarkus-core-deployment")
+                    && dep.getArtifact().getGroupId().equals("io.quarkus")) {
+                // this is not a 100% accurate check but practically valid
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return true if the goal is executed in an existing project
+     */
+    private boolean isCurrentProjectExists() {
+        return currentProjectIsBaseDir ? project.getFile() != null
+                : Files.exists(basedir.toPath().resolve("pom.xml"));
+    }
+
+    private File getCurrentProjectPom() {
+        if (currentProjectIsBaseDir) {
+            return project.getFile() == null ? new File(project.getBasedir(), "pom.xml") : project.getFile();
+        }
+        return new File(basedir, "pom.xml");
+    }
+
+    private Path getExtensionProjectBaseDir() {
+        if (currentProjectIsBaseDir) {
+            if (useCurrentDirectory) {
+                return project.getBasedir() == null ? basedir.toPath()
+                        : project.getBasedir().toPath();
+            }
+            return project.getBasedir() == null ? basedir.toPath().resolve(artifactIdBase)
+                    : project.getBasedir().toPath().resolve(artifactIdBase);
+        }
+        return useCurrentDirectory ? basedir.toPath()
+                : new File(basedir, artifactIdBase).toPath();
+    }
+
+    private Path getExtensionRuntimeBaseDir() {
+        return getExtensionProjectBaseDir().resolve("runtime");
+    }
+
+    private Path getExtensionDeploymentBaseDir() {
+        return getExtensionProjectBaseDir().resolve("deployment");
+    }
+
+    void addModules(Path basePomXml, TemplateParams templateParams, Model basePom)
+            throws IOException, TemplateException, MojoFailureException, MojoExecutionException {
+        if (!basePom.getModules().contains(templateParams.artifactIdBase)) {
+            getLog().info(String.format("Adding module [%s] to [%s]", templateParams.artifactIdBase, basePomXml));
+            pomTransformer(basePomXml).transform(Transformation.addModule(templateParams.artifactIdBase));
+        }
+    }
+
+    private void generateExtensionProjects(Configuration cfg, TemplateParams templateParams)
+            throws IOException, TemplateException, MojoExecutionException {
+        evalTemplate(cfg, "parent-pom.xml", getExtensionProjectBaseDir().resolve("pom.xml"), templateParams);
+
+        Files.createDirectories(
+                getExtensionRuntimeBaseDir().resolve("src/main/java")
+                        .resolve(templateParams.javaPackageBase.replace('.', '/')));
+        evalTemplate(cfg, "runtime-pom.xml", getExtensionRuntimeBaseDir().resolve("pom.xml"),
+                templateParams);
+
+        evalTemplate(cfg, "deployment-pom.xml", getExtensionDeploymentBaseDir().resolve("pom.xml"),
+                templateParams);
+        final Path processorPath = getExtensionDeploymentBaseDir()
+                .resolve("src/main/java")
+                .resolve(templateParams.javaPackageBase.replace('.', '/'))
+                .resolve("deployment")
+                .resolve(templateParams.artifactIdBaseCamelCase + "Processor.java");
+        evalTemplate(cfg, "Processor.java", processorPath, templateParams);
+
+        if (generateUnitTest) {
+            generateUnitTestClass(cfg, templateParams);
+        }
+
+        if (generateDevModeTest) {
+            generateDevModeTestClass(cfg, templateParams);
+        }
+    }
+
+    private PomTransformer pomTransformer(Path basePomXml) {
+        return new PomTransformer(basePomXml, charset);
+    }
+
+    private TemplateParams getTemplateParams(Model basePom) throws MojoExecutionException {
+        final TemplateParams templateParams = new TemplateParams();
+
+        templateParams.artifactId = artifactId;
+        templateParams.artifactIdPrefix = artifactIdPrefix;
+        templateParams.artifactIdBase = artifactIdBase;
+        templateParams.artifactIdBaseCamelCase = toCapCamelCase(templateParams.artifactIdBase);
+
+        if (groupId == null) {
+            if (basePom == null) {
+                throw new MojoExecutionException(
+                        "Please provide the desired groupId for the project by setting groupId parameter");
+            }
+            templateParams.groupId = getGroupId(basePom);
+        } else {
+            templateParams.groupId = groupId;
+        }
+
+        if (version == null) {
+            if (basePom == null) {
+                throw new MojoExecutionException(
+                        "Please provide the desired version for the project by setting version parameter");
+            }
+            templateParams.version = getVersion(basePom);
+        } else {
+            templateParams.version = version;
+        }
+
+        templateParams.namePrefix = namePrefix;
+        templateParams.nameBase = nameBase;
+        templateParams.nameSegmentDelimiter = nameSegmentDelimiter;
+        templateParams.assumeManaged = detectAssumeManaged();
+        templateParams.quarkusVersion = QUARKUS_VERSION_POM_EXPR;
+        templateParams.bomEntryVersion = bomEntryVersion.replace('@', '$');
+
+        templateParams.grandParentGroupId = parentGroupId() != null ? parentGroupId() : getGroupId(basePom);
+        templateParams.grandParentArtifactId = parentArtifactId() != null ? parentArtifactId()
+                : basePom == null ? null : basePom.getArtifactId();
+        templateParams.grandParentVersion = parentVersion() != null ? parentVersion() : getVersion(basePom);
+        templateParams.grandParentRelativePath = parentRelativePath();
+
+        templateParams.javaPackageBase = javaPackageBase != null ? javaPackageBase
+                : getJavaPackage(templateParams.groupId, javaPackageInfix, artifactId);
+        templateParams.additionalRuntimeDependencies = getAdditionalRuntimeDependencies();
+        templateParams.bomPathSet = bomPath != null;
+        return templateParams;
+    }
+
+    private String parentArtifactId() {
+        return parentArtifactId == null ? grandParentArtifactId : parentArtifactId;
+    }
+
+    private String parentGroupId() {
+        return parentGroupId == null ? grandParentGroupId : parentGroupId;
+    }
+
+    private String parentVersion() {
+        return parentVersion == null ? grandParentVersion : parentVersion;
+    }
+
+    private String parentRelativePath() {
+        return parentRelativePath == null ? grandParentRelativePath : parentRelativePath;
+    }
+
+    private Configuration getTemplateConfig() throws IOException {
+        final Configuration templateCfg = new Configuration(Configuration.VERSION_2_3_28);
+        templateCfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+        templateCfg.setTemplateLoader(createTemplateLoader(basedir, templatesUriBase));
+        templateCfg.setDefaultEncoding(encoding);
+        templateCfg.setInterpolationSyntax(Configuration.SQUARE_BRACKET_INTERPOLATION_SYNTAX);
+        templateCfg.setTagSyntax(Configuration.SQUARE_BRACKET_TAG_SYNTAX);
+        return templateCfg;
+    }
+
+    private void generateUnitTestClass(Configuration cfg, TemplateParams model) throws IOException, TemplateException {
+        final Path unitTest = basedir.toPath()
+                .resolve(getExtensionTestPath(model.artifactIdBase) + model.javaPackageBase.replace('.', '/')
+                        + "/test/" + model.artifactIdBaseCamelCase + "Test.java");
+
+        evalTemplate(cfg, "UnitTest.java", unitTest, model);
+    }
+
+    private void generateDevModeTestClass(Configuration cfg, TemplateParams model) throws IOException, TemplateException {
+        final Path devModeTest = basedir
+                .toPath()
+                .resolve(getExtensionTestPath(model.artifactIdBase) + model.javaPackageBase.replace('.', '/')
+                        + "/test/" + model.artifactIdBaseCamelCase + "DevModeTest.java");
+
+        evalTemplate(cfg, "DevModeTest.java", devModeTest, model);
+
+    }
+
+    void generateItest(Configuration cfg, TemplateParams model)
+            throws MojoFailureException, MojoExecutionException, TemplateException, IOException {
+        final Path itestParentAbsPath = basedir.toPath().resolve(itestParentPath);
+        try (Reader r = Files.newBufferedReader(itestParentAbsPath, charset)) {
+            final Model itestParent = new MavenXpp3Reader().read(r);
+            if (!"pom".equals(itestParent.getPackaging())) {
+                throw new MojoFailureException(
+                        "Can add an extension integration test only under a project with packagin 'pom'; found: "
+                                + itestParent.getPackaging() + " in " + itestParentAbsPath);
+            }
+            model.itestParentGroupId = getGroupId(itestParent);
+            model.itestParentArtifactId = itestParent.getArtifactId();
+            model.itestParentVersion = getVersion(itestParent);
+            model.itestParentRelativePath = "../pom.xml";
+
+            final Path itestDir = itestParentAbsPath.getParent().resolve(model.artifactIdBase);
+            evalTemplate(cfg, "integration-test-pom.xml", itestDir.resolve("pom.xml"), model);
+            evalTemplate(cfg, "integration-test-application.properties",
+                    itestDir.resolve("src/main/resources/application.properties"), model);
+
+            final Path testResourcePath = itestDir.resolve("src/main/java/" + model.javaPackageBase.replace('.', '/')
+                    + "/it/" + model.artifactIdBaseCamelCase + "Resource.java");
+            evalTemplate(cfg, "TestResource.java", testResourcePath, model);
+            final Path testClassDir = itestDir
+                    .resolve("src/test/java/" + model.javaPackageBase.replace('.', '/') + "/it");
+            evalTemplate(cfg, "Test.java", testClassDir.resolve(model.artifactIdBaseCamelCase + "Test.java"),
+                    model);
+            evalTemplate(cfg, "IT.java", testClassDir.resolve(model.artifactIdBaseCamelCase + "IT.java"),
+                    model);
+
+            getLog().info(String.format("Adding module [%s] to [%s]", model.artifactIdBase, itestParentAbsPath));
+            pomTransformer(itestParentAbsPath).transform(Transformation.addModule(model.artifactIdBase));
+
+        } catch (IOException e) {
+            throw new MojoExecutionException(String.format("Could not read %s", itestParentAbsPath), e);
+        } catch (XmlPullParserException e) {
+            throw new MojoExecutionException(String.format("Could not parse %s", itestParentAbsPath), e);
+        }
+    }
+
+    private List<Gavtcs> getAdditionalRuntimeDependencies() {
+        final List<Gavtcs> result = new ArrayList<>();
+        if (additionalRuntimeDependencies != null && !additionalRuntimeDependencies.isEmpty()) {
+            for (String rawGavtc : additionalRuntimeDependencies) {
+                rawGavtc = replacePlaceholders(rawGavtc);
+                result.add(Gavtcs.of(rawGavtc));
+            }
+        }
+        return result;
+    }
+
+    private String replacePlaceholders(String gavtc) {
+        final StringBuffer transformedGavtc = new StringBuffer();
+        final Matcher m = PLACEHOLDER_PATTERN.matcher(gavtc);
+        while (m.find()) {
+            final String key = m.group(1);
+            if ("$".equals(key)) {
+                m.appendReplacement(transformedGavtc, QUOTED_DOLLAR);
+            } else if (key.startsWith("quarkus.")) {
+                final String fieldName = key.substring("quarkus.".length());
+                try {
+                    final Field field = this.getClass().getDeclaredField(fieldName);
+                    Object val = field.get(this);
+                    if (val != null) {
+                        m.appendReplacement(transformedGavtc, String.valueOf(val));
+                    }
+                } catch (NoSuchFieldException | SecurityException | IllegalArgumentException
+                        | IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                final Object val = project.getProperties().get(key);
+                if (val != null) {
+                    m.appendReplacement(transformedGavtc, String.valueOf(val));
+                }
+            }
+        }
+        m.appendTail(transformedGavtc);
+        return transformedGavtc.toString();
+    }
+
+    boolean detectAssumeManaged() {
+        return assumeManaged == null ? false : assumeManaged;
+    }
+
+    static String getGroupId(Model basePom) {
+        if (basePom == null) {
+            return null;
+        }
+        return basePom.getGroupId() != null ? basePom.getGroupId()
+                : basePom.getParent() != null && basePom.getParent().getGroupId() != null
+                        ? basePom.getParent().getGroupId()
+                        : null;
+    }
+
+    static String getVersion(Model basePom) {
+        if (basePom == null) {
+            return null;
+        }
+        return basePom.getVersion() != null ? basePom.getVersion()
+                : basePom.getParent() != null && basePom.getParent().getVersion() != null
+                        ? basePom.getParent().getVersion()
+                        : null;
+    }
+
+    static String toCapCamelCase(String artifactIdBase) {
+        final StringBuilder sb = new StringBuilder(artifactIdBase.length());
+        for (String segment : artifactIdBase.split("[.\\-]+")) {
+            sb.append(Character.toUpperCase(segment.charAt(0)));
+            if (segment.length() > 1) {
+                sb.append(segment.substring(1));
+            }
+        }
+        return sb.toString();
+    }
+
+    static String toCapWords(String artifactIdBase) {
+        final StringBuilder sb = new StringBuilder(artifactIdBase.length());
+        for (String segment : artifactIdBase.split("[.\\-]+")) {
+            if (sb.length() > 0) {
+                sb.append(' ');
+            }
+            sb.append(Character.toUpperCase(segment.charAt(0)));
+            if (segment.length() > 1) {
+                sb.append(segment.substring(1));
+            }
+        }
+        return sb.toString();
+    }
+
+    static String getJavaPackage(String groupId, String javaPackageInfix, String artifactId) {
+        final Stack<String> segments = new Stack<>();
+        for (String segment : groupId.split("[.\\-]+")) {
+            if (segments.isEmpty() || !segments.peek().equals(segment)) {
+                segments.add(segment);
+            }
+        }
+        if (javaPackageInfix != null) {
+            for (String segment : javaPackageInfix.split("[.\\-]+")) {
+                segments.add(segment);
+            }
+        }
+        for (String segment : artifactId.split("[.\\-]+")) {
+            if (!segments.contains(segment)) {
+                segments.add(segment);
+            }
+        }
+        return segments.stream() //
+                .map(s -> s.toLowerCase(Locale.ROOT)) //
+                .map(s -> SourceVersion.isKeyword(s) ? s + "_" : s) //
+                .collect(Collectors.joining("."));
+    }
+
+    static TemplateLoader createTemplateLoader(File basedir, String templatesUriBase) throws IOException {
+        final TemplateLoader defaultLoader = new ClassTemplateLoader(CreateExtensionLegacyMojo.class,
+                DEFAULT_TEMPLATES_URI_BASE.substring(CLASSPATH_PREFIX.length()));
+        if (DEFAULT_TEMPLATES_URI_BASE.equals(templatesUriBase)) {
+            return defaultLoader;
+        } else if (templatesUriBase.startsWith(CLASSPATH_PREFIX)) {
+            return new MultiTemplateLoader( //
+                    new TemplateLoader[] { //
+                            new ClassTemplateLoader(CreateExtensionLegacyMojo.class,
+                                    templatesUriBase.substring(CLASSPATH_PREFIX.length())), //
+                            defaultLoader //
+                    });
+        } else if (templatesUriBase.startsWith(FILE_PREFIX)) {
+            final Path resolvedTemplatesDir = basedir.toPath().resolve(templatesUriBase.substring(FILE_PREFIX.length()));
+            return new MultiTemplateLoader( //
+                    new TemplateLoader[] { //
+                            new FileTemplateLoader(resolvedTemplatesDir.toFile()),
+                            defaultLoader //
+                    });
+        } else {
+            throw new IllegalStateException(String.format(
+                    "Cannot handle templatesUriBase '%s'; only value starting with '%s' or '%s' are supported",
+                    templatesUriBase, CLASSPATH_PREFIX, FILE_PREFIX));
+        }
+    }
+
+    static void evalTemplate(Configuration cfg, String templateUri, Path dest, TemplateParams model)
+            throws IOException, TemplateException {
+        log.infof("Adding '%s'", dest);
+        final Template template = cfg.getTemplate(templateUri);
+        Files.createDirectories(dest.getParent());
+        try (Writer out = Files.newBufferedWriter(dest)) {
+            template.process(model, out);
+        }
+    }
+
+    static String artifactIdBase(String artifactId) {
+        final int lBPos = artifactId.indexOf('(');
+        final int rBPos = artifactId.indexOf(')');
+        if (lBPos >= 0 && rBPos >= 0) {
+            return artifactId.substring(lBPos + 1, rBPos);
+        } else {
+            return artifactId;
+        }
+    }
+
+    private String getExtensionTestPath(String artifactIdBase) {
+        return useCurrentDirectory ? "deployment/src/test/java/" : artifactIdBase + "/deployment/src/test/java/";
+    }
+
+    public void setItestParentPath(String itestParentPath) {
+        this.itestParentPath = Paths.get(itestParentPath);
+    }
+
+    public static class TemplateParams {
+        String grandParentRelativePath;
+        String grandParentVersion;
+        String grandParentArtifactId;
+        String grandParentGroupId;
+        String itestParentRelativePath;
+        String itestParentVersion;
+        String itestParentArtifactId;
+        String itestParentGroupId;
+        String groupId;
+        String artifactId;
+        String artifactIdPrefix;
+        String artifactIdBase;
+        String artifactIdBaseCamelCase;
+        String version;
+        String namePrefix;
+        String nameBase;
+        String nameSegmentDelimiter;
+        String javaPackageBase;
+        boolean assumeManaged;
+        String quarkusVersion;
+        List<Gavtcs> additionalRuntimeDependencies;
+        boolean bomPathSet;
+        String bomEntryVersion;
+
+        public String getJavaPackageBase() {
+            return javaPackageBase;
+        }
+
+        public boolean isAssumeManaged() {
+            return assumeManaged;
+        }
+
+        public String getArtifactIdPrefix() {
+            return artifactIdPrefix;
+        }
+
+        public String getArtifactIdBase() {
+            return artifactIdBase;
+        }
+
+        public String getNamePrefix() {
+            return namePrefix;
+        }
+
+        public String getNameBase() {
+            return nameBase;
+        }
+
+        public String getNameSegmentDelimiter() {
+            return nameSegmentDelimiter;
+        }
+
+        public String getArtifactIdBaseCamelCase() {
+            return artifactIdBaseCamelCase;
+        }
+
+        public String getQuarkusVersion() {
+            return quarkusVersion;
+        }
+
+        public String getGrandParentRelativePath() {
+            return grandParentRelativePath;
+        }
+
+        public String getGrandParentVersion() {
+            return grandParentVersion;
+        }
+
+        public String getGrandParentArtifactId() {
+            return grandParentArtifactId;
+        }
+
+        public String getGrandParentGroupId() {
+            return grandParentGroupId;
+        }
+
+        public String getGroupId() {
+            return groupId;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public String getArtifactId() {
+            return artifactId;
+        }
+
+        public List<Gavtcs> getAdditionalRuntimeDependencies() {
+            return additionalRuntimeDependencies;
+        }
+
+        public boolean isBomPathSet() {
+            return bomPathSet;
+        }
+
+        public String getItestParentRelativePath() {
+            return itestParentRelativePath;
+        }
+
+        public String getItestParentVersion() {
+            return itestParentVersion;
+        }
+
+        public String getItestParentArtifactId() {
+            return itestParentArtifactId;
+        }
+
+        public String getItestParentGroupId() {
+            return itestParentGroupId;
+        }
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java
index 34f230dc0a491..337156b17c661 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java
@@ -1,1162 +1,287 @@
 package io.quarkus.maven;
 
+import static io.quarkus.devtools.commands.CreateExtension.extractQuarkiverseExtensionId;
+import static io.quarkus.devtools.commands.CreateExtension.isQuarkiverseGroupId;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.fusesource.jansi.Ansi.ansi;
+
 import java.io.File;
 import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.lang.reflect.Field;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Stack;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.lang.model.SourceVersion;
 
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
 import org.jboss.logging.Logger;
 
-import freemarker.cache.ClassTemplateLoader;
-import freemarker.cache.FileTemplateLoader;
-import freemarker.cache.MultiTemplateLoader;
-import freemarker.cache.TemplateLoader;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import freemarker.template.TemplateExceptionHandler;
-import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
-import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.maven.utilities.PomTransformer;
-import io.quarkus.maven.utilities.PomTransformer.Gavtcs;
-import io.quarkus.maven.utilities.PomTransformer.Transformation;
+import io.quarkus.devtools.commands.CreateExtension;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.maven.components.Prompter;
 
 /**
- * Creates a triple of stub Maven modules (Parent, Runtime and Deployment) to implement a new
- * <a href="https://quarkus.io/guides/extension-authors-guide">Quarkus Extension</a>.
- *
- * <h2>Adding into an established source tree</h2>
- * <p>
- * If this Mojo is executed in a directory that contains a {@code pom.xml} file with packaging {@code pom} the newly
- * created Parent module is added as a child module to the existing {@code pom.xml} file.
- *
- * <h2>Creating a source tree from scratch</h2>
- * <p>
- * Executing this Mojo in an empty directory is not supported yet.
+ * Creates the base of a
+ * <a href="https://quarkus.io/guides/writing-extensions">Quarkus Extension</a> in different layout depending of the options and
+ * environment.
+ * <br />
+ * <br />
+ * <h2>Create in the quarkus-parent project directory (or the extensions parent dir)</h2>
+ * <br />
+ * It will:
+ * <ul>
+ * <li>generate the new Quarkus extension in the extensions parent as a module (parent, runtime and deployment), with unit test
+ * and devmode test on option.</li>
+ * <li>On option, generate the new integration test in the integration tests parent as a module.</li>
+ * <li>add the dependencies to the bom/application/pom.xml.</li>
+ * </ul>
+ * <br />
+ * <h2>Creating a Quarkiverse extension</h2>
+ * <br />
+ * When using <code>-DgroupId=io.quarkiverse.[featureId]</code>, the new extension will use the Quarkiverse layout.
+ * <br />
+ * <br />
+ * <h2>Creating a standalone extension</h2>
+ * <br />
+ * <ul>
+ * <li>generate the new Quarkus extension in the current directory (parent, runtime and deployment), with unit test and devmode
+ * test on option.</li>
+ * <li>On option, generate the new integration test module in the current directory.</li>
+ * </ul>
  */
 @Mojo(name = "create-extension", requiresProject = false)
 public class CreateExtensionMojo extends AbstractMojo {
 
-    private static final String QUOTED_DOLLAR = Matcher.quoteReplacement("$");
-
     private static final Logger log = Logger.getLogger(CreateExtensionMojo.class);
 
-    private static final Pattern BRACKETS_PATTERN = Pattern.compile("[()]+");
-    private static final String CLASSPATH_PREFIX = "classpath:";
-    private static final String FILE_PREFIX = "file:";
-
-    private static final String QUARKUS_VERSION_PROP = "quarkus.version";
-
-    static final String DEFAULT_ENCODING = "utf-8";
-    static final String DEFAULT_QUARKUS_VERSION = "@{" + QUARKUS_VERSION_PROP + "}";
-    static final String QUARKUS_VERSION_POM_EXPR = "${" + QUARKUS_VERSION_PROP + "}";
-    static final String DEFAULT_BOM_ENTRY_VERSION = "@{project.version}";
-    static final String DEFAULT_TEMPLATES_URI_BASE = "classpath:/create-extension-templates";
-    static final String DEFAULT_NAME_SEGMENT_DELIMITER = " - ";
-    static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("@\\{([^\\}]+)\\}");
-
-    static final String PLATFORM_DEFAULT_GROUP_ID = "io.quarkus";
-    static final String PLATFORM_DEFAULT_ARTIFACT_ID = "quarkus-bom";
-
-    static final String COMPILER_PLUGIN_VERSION_PROP = "compiler-plugin.version";
-    static final String COMPILER_PLUGIN_VERSION_POM_EXPR = "${" + COMPILER_PLUGIN_VERSION_PROP + "}";
-    static final String COMPILER_PLUGIN_DEFAULT_VERSION = "3.8.1";
-    private static final String COMPILER_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
-    private static final String COMPILER_PLUGIN_ARTIFACT_ID = "maven-compiler-plugin";
-    private static final String COMPILER_PLUGIN_KEY = COMPILER_PLUGIN_GROUP_ID + ":"
-            + COMPILER_PLUGIN_ARTIFACT_ID;
-
     /**
-     * Directory where the changes should be performed. Default is the current directory of the current Java process.
-     *
-     * @since 0.20.0
+     * Directory where the changes should be performed.
+     * <br />
+     * <br />
+     * Default: the current directory of the current Java process.
      */
-    @Parameter(property = "quarkus.basedir")
+    @Parameter(property = "basedir")
     File basedir;
 
     /**
-     * The {@code groupId} of the Quarkus platform BOM.
-     */
-    @Parameter(property = "platformGroupId", defaultValue = PLATFORM_DEFAULT_GROUP_ID)
-    String platformGroupId;
-
-    /**
-     * The {@code artifactId} of the Quarkus platform BOM.
+     * {@code extensionId} of this extension (REQUIRED).
+     * <br />
+     * <br />
+     * It will be used to generate the different extension modules artifactIds
+     * (<code>[namespaceId][extensionId]-parent</code>), runtime (<code>[namespaceId][extensionId]</code>) and deployment
+     * (<code>[namespaceId][extensionId]-deployment</code>).
      */
-    @Parameter(property = "platformArtifactId", defaultValue = PLATFORM_DEFAULT_ARTIFACT_ID)
-    String platformArtifactId;
+    @Parameter(property = "extensionId")
+    String extensionId;
 
     /**
-     * The {@code groupId} for the newly created Maven modules. If {@code groupId} is left unset, the {@code groupId}
-     * from the {@code pom.xml} in the current directory will be used. Otherwise, an exception is thrown.
-     *
-     * @since 0.20.0
+     * The {@code groupId} for the newly created Maven modules (REQUIRED - INHERITED IN QUARKUS-CORE).
      */
     @Parameter(property = "groupId")
     String groupId;
 
     /**
-     * This parameter was introduced to change the property of {@code groupId} parameter from {@code quarkus.groupId} to
-     * {@code groupId}
-     *
-     * @since 1.3.0
-     */
-    @Deprecated
-    @Parameter(property = "quarkus.groupId")
-    String deprecatedGroupId;
-
-    /**
-     * {@code artifactId} of the runtime module. The {@code artifactId}s of the extension parent
-     * (<code>${artifactId}-parent</code>) and deployment (<code>${artifactId}-deployment</code>) modules will be based
-     * on this {@code artifactId} too.
-     * <p>
-     * Optionally, this value can contain the {@link #artifactIdBase} enclosed in round brackets, e.g.
-     * {@code my-project-(cool-extension)}, where {@code cool-extension} is an {@link #artifactIdBase} and
-     * {@code my-project-} is {@link #artifactIdPrefix}. This is a way to avoid defining of {@link #artifactIdPrefix}
-     * and {@link #artifactIdBase} separately. If no round brackets are present in {@link #artifactId},
-     * {@link #artifactIdBase} will be equal to {@link #artifactId} and {@link #artifactIdPrefix} will be an empty
-     * string.
-     *
-     * @since 0.20.0
+     * Quarkus version the newly created extension should depend on (REQUIRED - INHERITED IN QUARKUS-CORE).
      */
-    @Parameter(property = "artifactId")
-    String artifactId;
-
-    /**
-     * This parameter was introduced to change the property of {@code artifactId} parameter from {@code quarkus.artifactId} to
-     * {@code artifactId}
-     *
-     * @since 1.3.0
-     */
-    @Deprecated
-    @Parameter(property = "quarkus.artifactId")
-    String deprecatedArtifactId;
-
-    /**
-     * A prefix common to all extension artifactIds in the current source tree. If you set {@link #artifactIdPrefix},
-     * set also {@link #artifactIdBase}, but do not set {@link #artifactId}.
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.artifactIdPrefix", defaultValue = "")
-    String artifactIdPrefix;
+    @Parameter(property = "quarkusVersion")
+    String quarkusVersion;
 
     /**
-     * The unique part of the {@link #artifactId}. If you set {@link #artifactIdBase}, {@link #artifactIdPrefix}
-     * may also be set, but not {@link #artifactId}.
-     *
-     * @since 0.20.0
+     * A prefix common to all extension artifactIds in the current source tree.
+     * <br />
+     * <br />
+     * Default: "quarkus-" in quarkus Quarkus Core and Quarkiverse else ""
      */
-    @Parameter(property = "quarkus.artifactIdBase")
-    String artifactIdBase;
+    @Parameter(property = "namespaceId")
+    String namespaceId;
 
     /**
-     * The {@code version} for the newly created Maven modules. If {@code version} is left unset, the {@code version}
-     * from the {@code pom.xml} in the current directory will be used. Otherwise, an exception is thrown.
-     *
-     * @since 0.20.0
+     * The {@code version} for the newly created Maven modules.
+     * <br />
+     * <br />
+     * Default: automatic in Quarkus Core else {@link CreateExtension#DEFAULT_VERSION}
      */
     @Parameter(property = "version")
     String version;
 
     /**
-     * This parameter was introduced to change the property of {@code version} parameter from {@code quarkus.artifactVersion} to
-     * {@code version}
-     *
-     * @since 1.3.0
-     */
-    @Deprecated
-    @Parameter(property = "quarkus.artifactVersion")
-    String deprecatedVersion;
-
-    /**
-     * The {@code name} of the runtime module. The {@code name}s of the extension parent and deployment modules will be
+     * The {@code extensionName} of the runtime module. The {@code extensionName}s of the extension parent and deployment
+     * modules will be
      * based on this {@code name} too.
-     * <p>
-     * Optionally, this value can contain the {@link #nameBase} enclosed in round brackets, e.g.
-     * {@code My Project - (Cool Extension)}, where {@code Cool Extension} is a {@link #nameBase} and
-     * {@code My Project - } is {@link #namePrefix}. This is a way to avoid defining of {@link #namePrefix} and
-     * {@link #nameBase} separately. If no round brackets are present in {@link #name}, the {@link #nameBase} will be
-     * equal to {@link #name} and {@link #namePrefix} will be an empty string.
-     *
-     * @since 0.20.0
+     * <br />
+     * <br />
+     * Default: the formatted {@code extensionId}
      */
-    @Parameter(property = "quarkus.name")
-    String name;
+    @Parameter(property = "extensionName")
+    String extensionName;
 
     /**
-     * A prefix common to all extension names in the current source tree. If you set {@link #namePrefix}, set also
-     * {@link #nameBase}, but do not set {@link #name}.
-     *
-     * @since 0.20.0
+     * A prefix common to all extension names in the current source tree.
+     * <br />
+     * <br />
+     * Default: "quarkus-" in quarkus Quarkus Core and Quarkiverse else ""
      */
-    @Parameter(property = "quarkus.namePrefix")
-    String namePrefix;
+    @Parameter(property = "namespaceName")
+    String namespaceName;
 
     /**
-     * The unique part of the {@link #name}. If you set {@link #nameBase}, set also {@link #namePrefix}, but do not set
-     * {@link #name}.
-     * <p>
-     * If neither {@link #name} nor @{link #nameBase} is set, @{link #nameBase} will be derived from
-     * {@link #artifactIdBase}.
-     *
-     * @since 0.20.0
+     * Base package under which classes should be created in Runtime and Deployment modules.
+     * <br />
+     * <br />
+     * Default: auto-generated out of {@link #groupId}, {@link #namespaceId} and {@link #extensionId}
      */
-    @Parameter(property = "quarkus.nameBase")
-    String nameBase;
+    @Parameter(property = "packageName")
+    String packageName;
 
     /**
-     * A string that will delimit {@link #name} from {@code Parent}, {@code Runtime} and {@code Deployment} tokens in
-     * the respective modules.
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.nameSegmentDelimiter", defaultValue = DEFAULT_NAME_SEGMENT_DELIMITER)
-    String nameSegmentDelimiter;
-
-    /**
-     * Base Java package under which Java classes should be created in Runtime and Deployment modules. If not set, the
-     * Java package will be auto-generated out of {@link #groupId}, {@link #javaPackageInfix} and {@link #artifactId}
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.javaPackageBase")
-    String javaPackageBase;
-
-    /**
-     * If {@link #javaPackageBase} is not set explicitly, this infix will be put between package segments taken from
-     * {@link #groupId} and {@link #artifactId}.
-     * <p>
-     * Example: Given
-     * <ul>
-     * <li>{@link #groupId} is {@code org.example.quarkus.extensions}</li>
-     * <li>{@link #javaPackageInfix} is {@code foo.bar}</li>
-     * <li>{@link #artifactId} is {@code cool-extension}</li>
-     * </ul>
-     * Then the auto-generated {@link #javaPackageBase} will be
-     * {@code org.example.quarkus.extensions.foo.bar.cool.extension}
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.javaPackageInfix")
-    String javaPackageInfix;
-
-    /**
-     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
-     * Parent module. If {@code grandParentArtifactId} is left unset, the {@code artifactId} from the {@code pom.xml} in
-     * the current directory will be used. Otherwise, an exception is thrown.
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.grandParentArtifactId")
-    String grandParentArtifactId;
-
-    /**
-     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
-     * Parent module. If {@code grandParentGroupId} is left unset, the {@code groupId} from the {@code pom.xml} in the
-     * current directory will be used. Otherwise, an exception is thrown.
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.grandParentGroupId")
-    String grandParentGroupId;
-
-    /**
-     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
-     * Parent module. If {@code grandParentRelativePath} is left unset, the default {@code relativePath}
-     * {@code "../pom.xml"} is used.
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.grandParentRelativePath")
-    String grandParentRelativePath;
-
-    /**
-     * This mojo creates a triple of Maven modules (Parent, Runtime and Deployment). "Grand parent" is the parent of the
-     * Parent module. If {@code grandParentVersion} is left unset, the {@code version} from the {@code pom.xml} in the
-     * current directory will be used. Otherwise, an exception is thrown.
-     *
-     * @since 0.20.0
-     */
-    @Parameter(property = "quarkus.grandParentVersion")
-    String grandParentVersion;
-
-    /**
-     * Quarkus version the newly created extension should depend on. If you want to pass a property placeholder, use
-     * {@code @} instead if {@code $} so that the property is not evaluated by the current mojo - e.g.
-     * <code>@{quarkus.version}</code>
-     *
-     * @since 0.20.0
-     */
-    @Parameter(defaultValue = DEFAULT_QUARKUS_VERSION, required = true, property = "quarkus.version")
-    String quarkusVersion;
-
-    /**
-     * This parameter was introduced to change the property of {@code artifactId} parameter from {@code quarkus.artifactId} to
-     * {@code artifactId}
-     *
-     * @since 1.3.0
+     * The {@code groupId} of the Quarkus platform BOM.
+     * <br />
+     * <br />
+     * Default: {@link CreateExtension#DEFAULT_BOM_GROUP_ID}
      */
-    @Deprecated
-    @Parameter(property = "quarkus.quarkusVersion")
-    String deprecatedQuarkusVersion;
+    @Parameter(property = "quarkusBomGroupId")
+    String quarkusBomGroupId;
 
     /**
-     * If {@code true} the Maven dependencies in Runtime and Deployment modules will not have their versions set and the
-     * {@code quarkus-bootstrap-maven-plugin} in the Runtime module will not have its version set and it will have no
-     * executions configured. If {@code false} the version set in {@link #quarkusVersion} will be used where applicable
-     * and {@code quarkus-bootstrap-maven-plugin} in the Runtime module will be configured explicitly. If the value is
-     * {@code null} the parameter will be treated as it was initialized to {@code false}.
-     *
-     * @since 0.20.0
+     * The {@code artifactId} of the Quarkus platform BOM.
+     * <br />
+     * <br />
+     * Default: {@link CreateExtension#DEFAULT_BOM_ARTIFACT_ID}
      */
-    @Parameter(property = "quarkus.assumeManaged")
-    Boolean assumeManaged;
+    @Parameter(property = "quarkusBomArtifactId")
+    String quarkusBomArtifactId;
 
     /**
-     * URI prefix to use when looking up FreeMarker templates when generating various source files. You need to touch
-     * this only if you want to provide your own custom templates.
-     * <p>
-     * The following URI schemes are supported:
-     * <ul>
-     * <li>{@code classpath:}</li>
-     * <li>{@code file:} (relative to {@link #basedir})</li>
-     * </ul>
-     * These are the template files you may want to provide under your custom {@link #templatesUriBase}:
-     * <ul>
-     * <li>{@code deployment-pom.xml}</li>
-     * <li>{@code integration-test-application.properties}</li>
-     * <li>{@code integration-test-pom.xml}</li>
-     * <li>{@code IT.java}</li>
-     * <li>{@code parent-pom.xml}</li>
-     * <li>{@code Processor.java}</li>
-     * <li>{@code runtime-pom.xml}</li>
-     * <li>{@code Test.java}</li>
-     * <li>{@code TestResource.java}</li>
-     * </ul>
-     * Note that you do not need to provide all of them. Files not available in your custom {@link #templatesUriBase}
-     * will be looked up in the default URI base {@value #DEFAULT_TEMPLATES_URI_BASE}. The default templates are
-     * maintained <a href=
-     * "https://github.com/quarkusio/quarkus/tree/master/devtools/maven/src/main/resources/create-extension-templates">here</a>.
-     *
-     * @since 0.20.0
+     * The {@code version} of the Quarkus platform BOM.
+     * <br />
+     * <br />
+     * Default: {@link CreateExtension#DEFAULT_BOM_VERSION}
      */
-    @Parameter(defaultValue = DEFAULT_TEMPLATES_URI_BASE, required = true, property = "quarkus.templatesUriBase")
-    String templatesUriBase;
+    @Parameter(property = "quarkusBomVersion")
+    String quarkusBomVersion;
 
     /**
-     * Encoding to read and write files in the current source tree
-     *
-     * @since 0.20.0
+     * Indicates whether to generate a unit test class for the extension
      */
-    @Parameter(defaultValue = DEFAULT_ENCODING, required = true, property = "quarkus.encoding")
-    String encoding;
+    @Parameter(property = "withoutUnitTest")
+    boolean withoutUnitTest;
 
     /**
-     * Path relative to {@link #basedir} pointing at a {@code pom.xml} file containing the BOM (Bill of Materials) that
-     * manages extension artifacts. If set, the newly created runtime and deployment modules will be added to
-     * {@code <dependencyManagement>} section of this bom; otherwise the newly created modules will not be added
-     * to any BOM.
-     *
-     * @since 1.7.0.Final
+     * Indicates whether to generate an integration tests for the extension
      */
-    @Parameter(property = "bomPath")
-    Path bomPath;
+    @Parameter(property = "withoutIntegrationTests")
+    boolean withoutIntegrationTests;
 
     /**
-     * A version for the entries added to the runtime BOM (see {@link #runtimeBomPath}) and to the deployment BOM (see
-     * {@link #deploymentBomPath}). If you want to pass a property placeholder, use {@code @} instead if {@code $} so
-     * that the property is not evaluated by the current mojo - e.g. <code>@{my-project.version}</code>
-     *
-     * @since 0.25.0
+     * Indicates whether to generate a devmode test for the extension
      */
-    @Parameter(property = "quarkus.bomEntryVersion", defaultValue = DEFAULT_BOM_ENTRY_VERSION)
-    String bomEntryVersion;
+    @Parameter(property = "withoutDevModeTest")
+    boolean withoutDevModeTest;
 
     /**
-     * A list of strings of the form {@code groupId:artifactId:version[:type[:classifier[:scope]]]} representing the
-     * dependencies that should be added to the generated runtime module and to the runtime BOM if it is specified via
-     * {@link #runtimeBomPath}.
-     * <p>
-     * In case the built-in Maven <code>${placeholder}</code> expansion does not work well for you (because you e.g.
-     * pass {@link #additionalRuntimeDependencies}) via CLI, the Mojo supports a custom <code>@{placeholder}</code>
-     * expansion:
-     * <ul>
-     * <li><code>@{$}</code> will be expanded to {@code $} - handy for escaping standard placeholders. E.g. to insert
-     * <code>${quarkus.version}</code> to the BOM, you need to pass <code>@{$}{quarkus.version}</code></li>
-     * <li><code>@{quarkus.field}</code> will be expanded to whatever value the given {@code field} of this mojo has at
-     * runtime.</li>
-     * <li>Any other <code>@{placeholder}</code> will be resolved using the current project's properties</li>
-     * </ul>
-     *
-     * @since 0.22.0
+     * Indicates whether to generate any tests for the extension (same as
+     * <code>-DwithoutUnitTest -DwithoutIntegrationTest -DwithoutDevModeTest</code>)
      */
-    @Parameter(property = "quarkus.additionalRuntimeDependencies")
-    List<String> additionalRuntimeDependencies;
+    @Parameter(property = "withoutTests")
+    boolean withoutTests;
 
     /**
-     * An absolute path or a path relative to {@link #basedir} pointing at a {@code pom.xml} file that should serve as
-     * a parent for the integration test Maven module this mojo generates. If {@link #itestParentPath} is not set,
-     * the integration test module will not be generated.
-     *
-     * @since 0.22.0
+     * Used to detect legacy command usage and display an error
      */
-    @Parameter(property = "quarkus.itestParentPath")
-    Path itestParentPath;
-
-    @Parameter(defaultValue = "${project}", readonly = true)
-    MavenProject project;
+    @Parameter(property = "artifactId")
+    String artifactId;
 
-    /**
-     * The entry point to Aether, i.e. the component doing all the work.
-     *
-     * @component
-     */
     @Component
-    private RepositorySystem repoSystem;
+    private Prompter prompter;
 
-    /**
-     * The current repository/network configuration of Maven.
-     *
-     * @parameter default-value="${repositorySystemSession}"
-     * @readonly
-     */
-    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
-    private RepositorySystemSession repoSession;
+    @Parameter(defaultValue = "${project}")
+    protected MavenProject project;
 
-    /**
-     * The project's remote repositories to use for the resolution of artifacts and their dependencies.
-     *
-     * @parameter default-value="${project.remoteProjectRepositories}"
-     * @readonly
-     */
-    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
-    private List<RemoteRepository> repos;
-
-    /**
-     * The version of {@code org.apache.maven.plugins:maven-compiler-plugin} that should be used for
-     * the extension project.
-     */
-    @Parameter(defaultValue = COMPILER_PLUGIN_DEFAULT_VERSION, required = true, property = "quarkus.mavenCompilerPluginVersion")
-    String compilerPluginVersion;
-
-    boolean currentProjectIsBaseDir;
-
-    Charset charset;
+    @Parameter(defaultValue = "${session}")
+    private MavenSession session;
 
     @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-
-        if (this.basedir == null) {
-            currentProjectIsBaseDir = true;
-            this.basedir = new File(".").getAbsoluteFile();
-        }
-
-        if (deprecatedGroupId != null) {
-            if (groupId != null) {
-                throw new MojoExecutionException("Either groupId or deprecatedGroupId can be set at a time but got groupId="
-                        + groupId + " and deprecatedGroupId=" + deprecatedGroupId);
-            }
-            groupId = deprecatedGroupId;
-        }
-        if (deprecatedArtifactId != null) {
-            if (artifactId != null) {
-                throw new MojoExecutionException(
-                        "Either artifactId or deprecatedArtifactId can be set at a time but got artifactId=" + artifactId
-                                + " and deprecatedArtifactId=" + deprecatedArtifactId);
-            }
-            artifactId = deprecatedArtifactId;
-        }
-        if (deprecatedVersion != null) {
-            if (version != null) {
-                throw new MojoExecutionException("Either version or deprecatedVersion can be set at a time but got version="
-                        + version + " and deprecatedVersion=" + deprecatedVersion);
-            }
-            version = deprecatedVersion;
-        }
-        if (deprecatedQuarkusVersion != null) {
-            if (quarkusVersion != null && !DEFAULT_QUARKUS_VERSION.equals(quarkusVersion)) {
-                throw new MojoExecutionException(
-                        "Either quarkusVersion or deprecatedQuarkusVersion can be set at a time but got quarkusVersion="
-                                + quarkusVersion + " and deprecatedQuarkusVersion=" + deprecatedQuarkusVersion);
-            }
-            quarkusVersion = deprecatedQuarkusVersion;
-        }
-
-        if (artifactId != null) {
-            artifactIdBase = artifactIdBase(artifactId);
-            artifactIdPrefix = artifactId.substring(0, artifactId.length() - artifactIdBase.length());
-            artifactId = BRACKETS_PATTERN.matcher(artifactId).replaceAll("");
-        } else if (artifactIdBase != null) {
-            artifactId = artifactIdPrefix == null || artifactIdPrefix.isEmpty() ? artifactIdBase
-                    : artifactIdPrefix + artifactIdBase;
-        } else {
-            throw new MojoFailureException(String.format(
-                    "Either artifactId or both artifactIdPrefix and artifactIdBase must be specified; found: artifactId=[%s], artifactIdPrefix=[%s], artifactIdBase[%s]",
-                    artifactId, artifactIdPrefix, artifactIdBase));
-        }
-
-        if (name != null) {
-            final int pos = name.lastIndexOf(nameSegmentDelimiter);
-            if (pos >= 0) {
-                nameBase = name.substring(pos + nameSegmentDelimiter.length());
-            } else {
-                nameBase = name;
-            }
-            namePrefix = name.substring(0, name.length() - nameBase.length());
-        } else {
-            if (nameBase == null) {
-                nameBase = toCapWords(artifactIdBase);
-            }
-            if (namePrefix == null) {
-                namePrefix = "";
-            }
-            if (nameBase != null && namePrefix != null) {
-                name = namePrefix + nameBase;
-            } else {
-                throw new MojoFailureException("Either name or both namePrefix and nameBase must be specified");
-            }
-        }
-
-        if (bomPath != null) {
-            bomPath = basedir.toPath().resolve(bomPath);
-            if (!Files.exists(bomPath)) {
-                throw new MojoFailureException("runtimeBomPath does not exist: " + bomPath);
-            }
-        }
-
-        charset = Charset.forName(encoding);
-
-        try {
-            File rootPom = null;
-            Model rootModel = null;
-            boolean importDeploymentBom = true;
-            boolean setCompilerPluginVersion = true;
-            boolean setQuarkusVersionProp = true;
-            if (isCurrentProjectExists()) {
-                rootPom = getCurrentProjectPom();
-                rootModel = MojoUtils.readPom(rootPom);
-                if (!"pom".equals(rootModel.getPackaging())) {
-                    throw new MojoFailureException(
-                            "Can add extension modules only under a project with packaging 'pom'; found: "
-                                    + rootModel.getPackaging() + "");
-                }
-
-                if (rootPom.equals(project.getFile())) {
-                    importDeploymentBom = !hasQuarkusDeploymentBom();
-                    setCompilerPluginVersion = !project.getPluginManagement().getPluginsAsMap()
-                            .containsKey(COMPILER_PLUGIN_KEY);
-                    setQuarkusVersionProp = !project.getProperties().containsKey(QUARKUS_VERSION_PROP);
+    public void execute() throws MojoExecutionException {
+
+        if (!isBlank(artifactId)) {
+            if (isBlank(extensionId)) {
+                getLog().warn(ansi().a(
+                        "the given 'artifactId' has been automatically converted to 'extensionId' for backward compatibility.")
+                        .toString());
+                if (artifactId.startsWith("quarkus-")) {
+                    namespaceId = "quarkus-";
+                    extensionId = artifactId.replace("quarkus-", "");
                 } else {
-                    // aloubyansky: not sure we should support this case and not sure it ever worked properly
-                    // this is about creating an extension project not in the context of the current project from the Maven's plugin perspective
-                    // kind of a pathological use-case from the Maven's perspective, imo
-                    final DefaultArtifact rootArtifact = new DefaultArtifact(getGroupId(rootModel),
-                            rootModel.getArtifactId(), null, rootModel.getPackaging(), getVersion(rootModel));
-                    try {
-                        final MavenArtifactResolver mvn = MavenArtifactResolver.builder()
-                                .setRepositorySystem(repoSystem)
-                                .setRepositorySystemSession(repoSession)
-                                .setRemoteRepositories(repos)
-                                .setCurrentProject(LocalProject.loadWorkspace(rootPom.getParentFile().toPath()))
-                                .build();
-                        final ArtifactDescriptorResult rootDescr = mvn.resolveDescriptor(rootArtifact);
-                        importDeploymentBom = !hasQuarkusDeploymentBom(rootDescr.getManagedDependencies());
-                        // TODO determine whether the compiler plugin is configured for the project
-                        setQuarkusVersionProp = !rootDescr.getProperties().containsKey(QUARKUS_VERSION_PROP);
-                    } catch (Exception e) {
-                        throw new MojoExecutionException("Failed to resolve " + rootArtifact + " descriptor", e);
-                    }
-                }
-            } else if (this.grandParentRelativePath != null) {
-                // aloubyansky: not sure we should support this case, same as above
-                final File gpPom = getExtensionProjectBaseDir().resolve(this.grandParentRelativePath).normalize()
-                        .toAbsolutePath().toFile();
-                if (gpPom.exists()) {
-                    rootPom = gpPom;
-                    rootModel = MojoUtils.readPom(gpPom);
-                    final DefaultArtifact rootArtifact = new DefaultArtifact(getGroupId(rootModel),
-                            rootModel.getArtifactId(), null, rootModel.getPackaging(), getVersion(rootModel));
-                    try {
-                        final MavenArtifactResolver mvn = MavenArtifactResolver.builder()
-                                .setRepositorySystem(repoSystem)
-                                .setRepositorySystemSession(repoSession)
-                                .setRemoteRepositories(repos)
-                                .setCurrentProject(LocalProject.loadWorkspace(rootPom.getParentFile().toPath()))
-                                .build();
-                        final ArtifactDescriptorResult rootDescr = mvn.resolveDescriptor(rootArtifact);
-                        importDeploymentBom = !hasQuarkusDeploymentBom(rootDescr.getManagedDependencies());
-                        // TODO determine whether the compiler plugin is configured for the project
-                        setQuarkusVersionProp = !rootDescr.getProperties().containsKey(QUARKUS_VERSION_PROP);
-                    } catch (Exception e) {
-                        throw new MojoExecutionException("Failed to resolve " + rootArtifact + " descriptor", e);
-                    }
-                }
-            }
-
-            final TemplateParams templateParams = getTemplateParams(rootModel);
-            final Configuration cfg = getTemplateConfig();
-
-            generateExtensionProjects(cfg, templateParams);
-            if (setQuarkusVersionProp) {
-                setQuarkusVersionProp(getExtensionProjectBaseDir().resolve("pom.xml").toFile());
-            }
-            if (importDeploymentBom) {
-                addQuarkusDeploymentBom(getExtensionProjectBaseDir().resolve("pom.xml").toFile());
-            }
-            if (setCompilerPluginVersion) {
-                setCompilerPluginVersion(getExtensionProjectBaseDir().resolve("pom.xml").toFile());
-            }
-            if (rootModel != null) {
-                addModules(rootPom.toPath(), templateParams, rootModel);
-            }
-
-            if (bomPath != null) {
-                getLog().info(
-                        String.format("Adding [%s] to dependencyManagement in [%s]", templateParams.artifactId,
-                                bomPath));
-                List<PomTransformer.Transformation> transformations = new ArrayList<PomTransformer.Transformation>();
-                transformations
-                        .add(Transformation.addManagedDependency(templateParams.groupId, templateParams.artifactId,
-                                templateParams.bomEntryVersion));
-                for (Gavtcs gavtcs : templateParams.additionalRuntimeDependencies) {
-                    getLog().info(String.format("Adding [%s] to dependencyManagement in [%s]", gavtcs, bomPath));
-                    transformations.add(Transformation.addManagedDependency(gavtcs));
+                    extensionId = artifactId;
                 }
-                final String aId = templateParams.artifactId + "-deployment";
-                getLog().info(String.format("Adding [%s] to dependencyManagement in [%s]", aId, bomPath));
-                transformations.add(Transformation.addManagedDependency(templateParams.groupId, aId,
-                        templateParams.bomEntryVersion));
-
-                pomTransformer(bomPath).transform(transformations);
-            }
-            if (itestParentPath != null) {
-                generateItest(cfg, templateParams);
             }
-        } catch (IOException e) {
-            throw new MojoExecutionException(String.format("Could not read %s", project.getFile()), e);
-        } catch (TemplateException e) {
-            throw new MojoExecutionException(String.format("Could not process a FreeMarker template"), e);
         }
-    }
 
-    private void setQuarkusVersionProp(File pom) throws IOException, MojoExecutionException {
-        pomTransformer(pom.toPath()).transform(Transformation.addProperty(QUARKUS_VERSION_PROP,
-                quarkusVersion.equals(DEFAULT_QUARKUS_VERSION) ? getPluginVersion() : quarkusVersion));
-    }
-
-    private void setCompilerPluginVersion(File pom) throws IOException {
-        pomTransformer(pom.toPath()).transform(Transformation.addProperty(COMPILER_PLUGIN_VERSION_PROP, compilerPluginVersion));
-        pomTransformer(pom.toPath())
-                .transform(Transformation.addManagedPlugin(
-                        MojoUtils.plugin(COMPILER_PLUGIN_GROUP_ID, COMPILER_PLUGIN_ARTIFACT_ID,
-                                COMPILER_PLUGIN_VERSION_POM_EXPR)));
-    }
+        promptValues();
 
-    private void addQuarkusDeploymentBom(File pom) throws IOException, MojoExecutionException {
-        addQuarkusDeploymentBom(MojoUtils.readPom(pom), pom);
-    }
+        autoComputeQuarkiverseExtensionId();
 
-    private void addQuarkusDeploymentBom(Model model, File file) throws IOException, MojoExecutionException {
-        pomTransformer(file.toPath())
-                .transform(Transformation.addManagedDependency(
-                        new Gavtcs(platformGroupId, platformArtifactId, QUARKUS_VERSION_POM_EXPR, "pom", null, "import")));
-    }
+        final CreateExtension createExtension = new CreateExtension(basedir.toPath())
+                .extensionId(extensionId)
+                .extensionName(extensionName)
+                .groupId(groupId)
+                .version(version)
+                .packageName(packageName)
+                .namespaceId(namespaceId)
+                .namespaceName(namespaceName)
+                .quarkusVersion(quarkusVersion)
+                .quarkusBomGroupId(quarkusBomGroupId)
+                .quarkusBomArtifactId(quarkusBomArtifactId)
+                .quarkusBomGroupId(quarkusBomVersion)
+                .withoutUnitTest(withoutTests || withoutUnitTest)
+                .withoutDevModeTest(withoutTests || withoutDevModeTest)
+                .withoutIntegrationTests(withoutTests || withoutIntegrationTests);
 
-    private String getPluginVersion() throws MojoExecutionException {
-        return CreateUtils.resolvePluginInfo(CreateExtensionMojo.class).getVersion();
-    }
+        boolean success;
 
-    private boolean hasQuarkusDeploymentBom() {
-        if (project.getDependencyManagement() == null) {
-            return false;
-        }
-        for (org.apache.maven.model.Dependency dep : project.getDependencyManagement().getDependencies()) {
-            if (dep.getArtifactId().equals("quarkus-core-deployment")
-                    && dep.getGroupId().equals("io.quarkus")) {
-                // this is not a 100% accurate check but practically valid
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean hasQuarkusDeploymentBom(List<Dependency> deps) {
-        if (deps == null) {
-            return false;
-        }
-        for (Dependency dep : deps) {
-            if (dep.getArtifact().getArtifactId().equals("quarkus-core-deployment")
-                    && dep.getArtifact().getGroupId().equals("io.quarkus")) {
-                // this is not a 100% accurate check but practically valid
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return true if the goal is executed in an existing project
-     */
-    private boolean isCurrentProjectExists() {
-        return currentProjectIsBaseDir ? project.getFile() != null
-                : Files.exists(basedir.toPath().resolve("pom.xml"));
-    }
-
-    private File getCurrentProjectPom() {
-        if (currentProjectIsBaseDir) {
-            return project.getFile() == null ? new File(project.getBasedir(), "pom.xml") : project.getFile();
+        try {
+            success = createExtension.execute().isSuccess();
+        } catch (QuarkusCommandException e) {
+            throw new MojoExecutionException("Failed to generate Extension", e);
         }
-        return new File(basedir, "pom.xml");
-    }
 
-    private Path getExtensionProjectBaseDir() {
-        if (currentProjectIsBaseDir) {
-            return project.getBasedir() == null ? basedir.toPath().resolve(artifactIdBase)
-                    : project.getBasedir().toPath().resolve(artifactIdBase);
+        if (!success) {
+            throw new MojoExecutionException("Failed to generate Extension");
         }
-        return new File(basedir, artifactIdBase).toPath();
     }
 
-    private Path getExtensionRuntimeBaseDir() {
-        return getExtensionProjectBaseDir().resolve("runtime");
-    }
-
-    private Path getExtensionDeploymentBaseDir() {
-        return getExtensionProjectBaseDir().resolve("deployment");
-    }
-
-    void addModules(Path basePomXml, TemplateParams templateParams, Model basePom)
-            throws IOException, TemplateException, MojoFailureException, MojoExecutionException {
-        if (!basePom.getModules().contains(templateParams.artifactIdBase)) {
-            getLog().info(String.format("Adding module [%s] to [%s]", templateParams.artifactIdBase, basePomXml));
-            pomTransformer(basePomXml).transform(Transformation.addModule(templateParams.artifactIdBase));
+    private void autoComputeQuarkiverseExtensionId() {
+        if (isQuarkiverseGroupId(groupId) && isEmpty(extensionId)) {
+            extensionId = extractQuarkiverseExtensionId(groupId);
         }
     }
 
-    private void generateExtensionProjects(Configuration cfg, TemplateParams templateParams)
-            throws IOException, TemplateException, MojoExecutionException {
-        evalTemplate(cfg, "parent-pom.xml", getExtensionProjectBaseDir().resolve("pom.xml"), templateParams);
-
-        Files.createDirectories(
-                getExtensionRuntimeBaseDir().resolve("src/main/java")
-                        .resolve(templateParams.javaPackageBase.replace('.', '/')));
-        evalTemplate(cfg, "runtime-pom.xml", getExtensionRuntimeBaseDir().resolve("pom.xml"),
-                templateParams);
-
-        evalTemplate(cfg, "deployment-pom.xml", getExtensionDeploymentBaseDir().resolve("pom.xml"),
-                templateParams);
-        final Path processorPath = getExtensionDeploymentBaseDir()
-                .resolve("src/main/java")
-                .resolve(templateParams.javaPackageBase.replace('.', '/'))
-                .resolve("deployment")
-                .resolve(templateParams.artifactIdBaseCamelCase + "Processor.java");
-        evalTemplate(cfg, "Processor.java", processorPath, templateParams);
-    }
-
-    private PomTransformer pomTransformer(Path basePomXml) {
-        return new PomTransformer(basePomXml, charset);
-    }
-
-    private TemplateParams getTemplateParams(Model basePom) throws MojoExecutionException {
-        final TemplateParams templateParams = new TemplateParams();
-
-        templateParams.artifactId = artifactId;
-        templateParams.artifactIdPrefix = artifactIdPrefix;
-        templateParams.artifactIdBase = artifactIdBase;
-        templateParams.artifactIdBaseCamelCase = toCapCamelCase(templateParams.artifactIdBase);
-
-        if (groupId == null) {
-            if (basePom == null) {
-                throw new MojoExecutionException(
-                        "Please provide the desired groupId for the project by setting groupId parameter");
-            }
-            templateParams.groupId = getGroupId(basePom);
-        } else {
-            templateParams.groupId = groupId;
-        }
-
-        if (version == null) {
-            if (basePom == null) {
-                throw new MojoExecutionException(
-                        "Please provide the desired version for the project by setting version parameter");
-            }
-            templateParams.version = getVersion(basePom);
-        } else {
-            templateParams.version = version;
-        }
-
-        templateParams.namePrefix = namePrefix;
-        templateParams.nameBase = nameBase;
-        templateParams.nameSegmentDelimiter = nameSegmentDelimiter;
-        templateParams.assumeManaged = detectAssumeManaged();
-        templateParams.quarkusVersion = QUARKUS_VERSION_POM_EXPR;
-        templateParams.bomEntryVersion = bomEntryVersion.replace('@', '$');
-
-        if (basePom != null) {
-            templateParams.grandParentGroupId = grandParentGroupId != null ? grandParentGroupId : getGroupId(basePom);
-            templateParams.grandParentArtifactId = grandParentArtifactId != null ? grandParentArtifactId
-                    : basePom.getArtifactId();
-            templateParams.grandParentVersion = grandParentVersion != null ? grandParentVersion : getVersion(basePom);
-            templateParams.grandParentRelativePath = grandParentRelativePath != null ? grandParentRelativePath : "../pom.xml";
-        }
-
-        templateParams.javaPackageBase = javaPackageBase != null ? javaPackageBase
-                : getJavaPackage(templateParams.groupId, javaPackageInfix, artifactId);
-        templateParams.additionalRuntimeDependencies = getAdditionalRuntimeDependencies();
-        templateParams.runtimeBomPathSet = bomPath != null;
-        return templateParams;
-    }
-
-    private Configuration getTemplateConfig() throws IOException {
-        final Configuration templateCfg = new Configuration(Configuration.VERSION_2_3_28);
-        templateCfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-        templateCfg.setTemplateLoader(createTemplateLoader(basedir, templatesUriBase));
-        templateCfg.setDefaultEncoding(encoding);
-        templateCfg.setInterpolationSyntax(Configuration.SQUARE_BRACKET_INTERPOLATION_SYNTAX);
-        templateCfg.setTagSyntax(Configuration.SQUARE_BRACKET_TAG_SYNTAX);
-        return templateCfg;
-    }
-
-    void generateItest(Configuration cfg, TemplateParams model)
-            throws MojoFailureException, MojoExecutionException, TemplateException, IOException {
-        final Path itestParentAbsPath = basedir.toPath().resolve(itestParentPath);
-        try (Reader r = Files.newBufferedReader(itestParentAbsPath, charset)) {
-            final Model itestParent = new MavenXpp3Reader().read(r);
-            if (!"pom".equals(itestParent.getPackaging())) {
-                throw new MojoFailureException(
-                        "Can add an extension integration test only under a project with packagin 'pom'; found: "
-                                + itestParent.getPackaging() + " in " + itestParentAbsPath);
-            }
-            model.itestParentGroupId = getGroupId(itestParent);
-            model.itestParentArtifactId = itestParent.getArtifactId();
-            model.itestParentVersion = getVersion(itestParent);
-            model.itestParentRelativePath = "../pom.xml";
-
-            final Path itestDir = itestParentAbsPath.getParent().resolve(model.artifactIdBase);
-            evalTemplate(cfg, "integration-test-pom.xml", itestDir.resolve("pom.xml"), model);
-            evalTemplate(cfg, "integration-test-application.properties",
-                    itestDir.resolve("src/main/resources/application.properties"), model);
-
-            final Path testResourcePath = itestDir.resolve("src/main/java/" + model.javaPackageBase.replace('.', '/')
-                    + "/it/" + model.artifactIdBaseCamelCase + "Resource.java");
-            evalTemplate(cfg, "TestResource.java", testResourcePath, model);
-            final Path testClassDir = itestDir
-                    .resolve("src/test/java/" + model.javaPackageBase.replace('.', '/') + "/it");
-            evalTemplate(cfg, "Test.java", testClassDir.resolve(model.artifactIdBaseCamelCase + "Test.java"),
-                    model);
-            evalTemplate(cfg, "IT.java", testClassDir.resolve(model.artifactIdBaseCamelCase + "IT.java"),
-                    model);
-
-            getLog().info(String.format("Adding module [%s] to [%s]", model.artifactIdBase, itestParentAbsPath));
-            pomTransformer(itestParentAbsPath).transform(Transformation.addModule(model.artifactIdBase));
-
-        } catch (IOException e) {
-            throw new MojoExecutionException(String.format("Could not read %s", itestParentAbsPath), e);
-        } catch (XmlPullParserException e) {
-            throw new MojoExecutionException(String.format("Could not parse %s", itestParentAbsPath), e);
-        }
+    private String getPluginVersion() throws MojoExecutionException {
+        return CreateUtils.resolvePluginInfo(CreateExtensionLegacyMojo.class).getVersion();
     }
 
-    private List<Gavtcs> getAdditionalRuntimeDependencies() {
-        final List<Gavtcs> result = new ArrayList<>();
-        if (additionalRuntimeDependencies != null && !additionalRuntimeDependencies.isEmpty()) {
-            for (String rawGavtc : additionalRuntimeDependencies) {
-                rawGavtc = replacePlaceholders(rawGavtc);
-                result.add(Gavtcs.of(rawGavtc));
-            }
+    private void promptValues() throws MojoExecutionException {
+        if (!session.getRequest().isInteractiveMode()) {
+            return;
         }
-        return result;
-    }
+        try {
 
-    private String replacePlaceholders(String gavtc) {
-        final StringBuffer transformedGavtc = new StringBuffer();
-        final Matcher m = PLACEHOLDER_PATTERN.matcher(gavtc);
-        while (m.find()) {
-            final String key = m.group(1);
-            if ("$".equals(key)) {
-                m.appendReplacement(transformedGavtc, QUOTED_DOLLAR);
-            } else if (key.startsWith("quarkus.")) {
-                final String fieldName = key.substring("quarkus.".length());
-                try {
-                    final Field field = this.getClass().getDeclaredField(fieldName);
-                    Object val = field.get(this);
-                    if (val != null) {
-                        m.appendReplacement(transformedGavtc, String.valueOf(val));
-                    }
-                } catch (NoSuchFieldException | SecurityException | IllegalArgumentException
-                        | IllegalAccessException e) {
-                    throw new RuntimeException(e);
+            if (project == null || !project.getArtifactId().endsWith("quarkus-parent")) {
+                if (isBlank(quarkusVersion)) {
+                    quarkusVersion = getPluginVersion();
                 }
-            } else {
-                final Object val = project.getProperties().get(key);
-                if (val != null) {
-                    m.appendReplacement(transformedGavtc, String.valueOf(val));
+                if (isBlank(groupId)) {
+                    groupId = prompter.promptWithDefaultValue("Set the extension groupId", "org.acme");
                 }
             }
-        }
-        m.appendTail(transformedGavtc);
-        return transformedGavtc.toString();
-    }
-
-    boolean detectAssumeManaged() {
-        return assumeManaged == null ? false : assumeManaged;
-    }
-
-    static String getGroupId(Model basePom) {
-        return basePom.getGroupId() != null ? basePom.getGroupId()
-                : basePom.getParent() != null && basePom.getParent().getGroupId() != null
-                        ? basePom.getParent().getGroupId()
-                        : null;
-    }
-
-    static String getVersion(Model basePom) {
-        return basePom.getVersion() != null ? basePom.getVersion()
-                : basePom.getParent() != null && basePom.getParent().getVersion() != null
-                        ? basePom.getParent().getVersion()
-                        : null;
-    }
-
-    static String toCapCamelCase(String artifactIdBase) {
-        final StringBuilder sb = new StringBuilder(artifactIdBase.length());
-        for (String segment : artifactIdBase.split("[.\\-]+")) {
-            sb.append(Character.toUpperCase(segment.charAt(0)));
-            if (segment.length() > 1) {
-                sb.append(segment.substring(1));
-            }
-        }
-        return sb.toString();
-    }
-
-    static String toCapWords(String artifactIdBase) {
-        final StringBuilder sb = new StringBuilder(artifactIdBase.length());
-        for (String segment : artifactIdBase.split("[.\\-]+")) {
-            if (sb.length() > 0) {
-                sb.append(' ');
-            }
-            sb.append(Character.toUpperCase(segment.charAt(0)));
-            if (segment.length() > 1) {
-                sb.append(segment.substring(1));
-            }
-        }
-        return sb.toString();
-    }
-
-    static String getJavaPackage(String groupId, String javaPackageInfix, String artifactId) {
-        final Stack<String> segments = new Stack<>();
-        for (String segment : groupId.split("[.\\-]+")) {
-            if (segments.isEmpty() || !segments.peek().equals(segment)) {
-                segments.add(segment);
-            }
-        }
-        if (javaPackageInfix != null) {
-            for (String segment : javaPackageInfix.split("[.\\-]+")) {
-                segments.add(segment);
-            }
-        }
-        for (String segment : artifactId.split("[.\\-]+")) {
-            if (!segments.contains(segment)) {
-                segments.add(segment);
+            autoComputeQuarkiverseExtensionId();
+            if (isBlank(extensionId)) {
+                extensionId = prompter.prompt("Set the extension id");
             }
-        }
-        return segments.stream() //
-                .map(s -> s.toLowerCase(Locale.ROOT)) //
-                .map(s -> SourceVersion.isKeyword(s) ? s + "_" : s) //
-                .collect(Collectors.joining("."));
-    }
-
-    static TemplateLoader createTemplateLoader(File basedir, String templatesUriBase) throws IOException {
-        final TemplateLoader defaultLoader = new ClassTemplateLoader(CreateExtensionMojo.class,
-                DEFAULT_TEMPLATES_URI_BASE.substring(CLASSPATH_PREFIX.length()));
-        if (DEFAULT_TEMPLATES_URI_BASE.equals(templatesUriBase)) {
-            return defaultLoader;
-        } else if (templatesUriBase.startsWith(CLASSPATH_PREFIX)) {
-            return new MultiTemplateLoader( //
-                    new TemplateLoader[] { //
-                            new ClassTemplateLoader(CreateExtensionMojo.class,
-                                    templatesUriBase.substring(CLASSPATH_PREFIX.length())), //
-                            defaultLoader //
-                    });
-        } else if (templatesUriBase.startsWith(FILE_PREFIX)) {
-            final Path resolvedTemplatesDir = basedir.toPath().resolve(templatesUriBase.substring(FILE_PREFIX.length()));
-            return new MultiTemplateLoader( //
-                    new TemplateLoader[] { //
-                            new FileTemplateLoader(resolvedTemplatesDir.toFile()),
-                            defaultLoader //
-                    });
-        } else {
-            throw new IllegalStateException(String.format(
-                    "Cannot handle templatesUriBase '%s'; only value starting with '%s' or '%s' are supported",
-                    templatesUriBase, CLASSPATH_PREFIX, FILE_PREFIX));
-        }
-    }
-
-    static void evalTemplate(Configuration cfg, String templateUri, Path dest, TemplateParams model)
-            throws IOException, TemplateException {
-        log.infof("Adding '%s'", dest);
-        final Template template = cfg.getTemplate(templateUri);
-        Files.createDirectories(dest.getParent());
-        try (Writer out = Files.newBufferedWriter(dest)) {
-            template.process(model, out);
-        }
-    }
-
-    static String artifactIdBase(String artifactId) {
-        final int lBPos = artifactId.indexOf('(');
-        final int rBPos = artifactId.indexOf(')');
-        if (lBPos >= 0 && rBPos >= 0) {
-            return artifactId.substring(lBPos + 1, rBPos);
-        } else {
-            return artifactId;
-        }
-    }
-
-    public void setItestParentPath(String itestParentPath) {
-        this.itestParentPath = Paths.get(itestParentPath);
-    }
-
-    public static class TemplateParams {
-        String grandParentRelativePath;
-        String grandParentVersion;
-        String grandParentArtifactId;
-        String grandParentGroupId;
-        String itestParentRelativePath;
-        String itestParentVersion;
-        String itestParentArtifactId;
-        String itestParentGroupId;
-        String groupId;
-        String artifactId;
-        String artifactIdPrefix;
-        String artifactIdBase;
-        String artifactIdBaseCamelCase;
-        String version;
-        String namePrefix;
-        String nameBase;
-        String nameSegmentDelimiter;
-        String javaPackageBase;
-        boolean assumeManaged;
-        String quarkusVersion;
-        List<Gavtcs> additionalRuntimeDependencies;
-        boolean runtimeBomPathSet;
-        String bomEntryVersion;
-
-        public String getJavaPackageBase() {
-            return javaPackageBase;
-        }
-
-        public boolean isAssumeManaged() {
-            return assumeManaged;
-        }
-
-        public String getArtifactIdPrefix() {
-            return artifactIdPrefix;
-        }
-
-        public String getArtifactIdBase() {
-            return artifactIdBase;
-        }
-
-        public String getNamePrefix() {
-            return namePrefix;
-        }
-
-        public String getNameBase() {
-            return nameBase;
-        }
-
-        public String getNameSegmentDelimiter() {
-            return nameSegmentDelimiter;
-        }
-
-        public String getArtifactIdBaseCamelCase() {
-            return artifactIdBaseCamelCase;
-        }
-
-        public String getQuarkusVersion() {
-            return quarkusVersion;
-        }
-
-        public String getGrandParentRelativePath() {
-            return grandParentRelativePath;
-        }
-
-        public String getGrandParentVersion() {
-            return grandParentVersion;
-        }
-
-        public String getGrandParentArtifactId() {
-            return grandParentArtifactId;
-        }
-
-        public String getGrandParentGroupId() {
-            return grandParentGroupId;
-        }
-
-        public String getGroupId() {
-            return groupId;
-        }
-
-        public String getVersion() {
-            return version;
-        }
-
-        public String getArtifactId() {
-            return artifactId;
-        }
-
-        public List<Gavtcs> getAdditionalRuntimeDependencies() {
-            return additionalRuntimeDependencies;
-        }
-
-        public boolean isRuntimeBomPathSet() {
-            return runtimeBomPathSet;
-        }
-
-        public String getItestParentRelativePath() {
-            return itestParentRelativePath;
-        }
-
-        public String getItestParentVersion() {
-            return itestParentVersion;
-        }
-
-        public String getItestParentArtifactId() {
-            return itestParentArtifactId;
-        }
-
-        public String getItestParentGroupId() {
-            return itestParentGroupId;
+        } catch (IOException e) {
+            throw new MojoExecutionException("Unable to get user input", e);
         }
     }
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateJBangMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateJBangMojo.java
new file mode 100644
index 0000000000000..347346062a455
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateJBangMojo.java
@@ -0,0 +1,129 @@
+package io.quarkus.maven;
+
+import static org.fusesource.jansi.Ansi.ansi;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.commands.CreateJBangProject;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.platform.tools.maven.MojoMessageWriter;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+@Mojo(name = "create-jbang", requiresProject = false)
+public class CreateJBangMojo extends AbstractMojo {
+
+    @Parameter(property = "noJBangWrapper", defaultValue = "false")
+    private boolean noJBangWrapper;
+
+    /**
+     * Group ID of the target platform BOM
+     */
+    @Parameter(property = "platformGroupId", required = false)
+    private String bomGroupId;
+
+    /**
+     * Artifact ID of the target platform BOM
+     */
+    @Parameter(property = "platformArtifactId", required = false)
+    private String bomArtifactId;
+
+    /**
+     * Version of the target platform BOM
+     */
+    @Parameter(property = "platformVersion", required = false)
+    private String bomVersion;
+
+    @Parameter(property = "extensions")
+    private Set<String> extensions;
+
+    @Parameter(property = "outputDirectory", defaultValue = "${basedir}/jbang-with-quarkus")
+    private File outputDirectory;
+
+    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
+    private List<RemoteRepository> repos;
+
+    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+    private RepositorySystemSession repoSession;
+
+    @Component
+    private RepositorySystem repoSystem;
+
+    @Component
+    RemoteRepositoryManager remoteRepoManager;
+
+    @Override
+    public void execute() throws MojoExecutionException {
+        try {
+            Files.createDirectories(outputDirectory.toPath());
+        } catch (IOException e) {
+            throw new MojoExecutionException("Could not create directory " + outputDirectory, e);
+        }
+
+        File projectRoot = outputDirectory;
+        final Path projectDirPath = projectRoot.toPath();
+
+        final MavenArtifactResolver mvn;
+        try {
+            mvn = MavenArtifactResolver.builder()
+                    .setRepositorySystem(repoSystem)
+                    .setRepositorySystemSession(repoSession)
+                    .setRemoteRepositories(repos)
+                    .setRemoteRepositoryManager(remoteRepoManager)
+                    .build();
+        } catch (Exception e) {
+            throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e);
+        }
+
+        final MessageWriter log = new MojoMessageWriter(getLog());
+        final ExtensionCatalog catalog = CreateProjectMojo.resolveExtensionsCatalog(
+                StringUtils.defaultIfBlank(bomGroupId, null),
+                StringUtils.defaultIfBlank(bomArtifactId, null),
+                StringUtils.defaultIfBlank(bomVersion, null),
+                QuarkusProjectHelper.getCatalogResolver(mvn, log), mvn, log);
+
+        final CreateJBangProject createJBangProject = new CreateJBangProject(QuarkusProject.of(projectDirPath, catalog,
+                QuarkusProjectHelper.getResourceLoader(catalog, mvn), log, BuildTool.MAVEN))
+                        .extensions(extensions)
+                        .setValue("noJBangWrapper", noJBangWrapper);
+
+        boolean success;
+
+        try {
+            success = createJBangProject.execute().isSuccess();
+        } catch (QuarkusCommandException e) {
+            throw new MojoExecutionException("Failed to generate JBang Quarkus project", e);
+        }
+
+        if (success) {
+            getLog().info("");
+            getLog().info("========================================================================");
+            getLog().warn(ansi().a("Quarkus JBang project is an experimental feature.").toString());
+            getLog().info("========================================================================");
+            getLog().info("");
+        } else {
+            throw new MojoExecutionException(
+                    "Failed to generate JBang Quarkus project");
+        }
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
index c8f45861476c0..0b77f4d46c119 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
@@ -1,56 +1,55 @@
 package io.quarkus.maven;
 
 import static org.fusesource.jansi.Ansi.ansi;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.element;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.name;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.Objects;
-import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.settings.Proxy;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.fusesource.jansi.Ansi;
 
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.devtools.commands.CreateProject;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.codegen.SourceType;
 import io.quarkus.maven.components.MavenVersionEnforcer;
 import io.quarkus.maven.components.Prompter;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.maven.utilities.MojoUtils;
 import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.platform.tools.maven.MojoMessageWriter;
+import io.quarkus.registry.ExtensionCatalogResolver;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
 
 /**
  * This goal helps in setting up Quarkus Maven project with quarkus-maven-plugin, with sensible defaults
@@ -58,9 +57,10 @@
 @Mojo(name = "create", requiresProject = false)
 public class CreateProjectMojo extends AbstractMojo {
 
-    final private static boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows");
-
-    private static final String DEFAULT_GROUP_ID = "org.acme.quarkus.sample";
+    private static final String DEFAULT_GROUP_ID = "org.acme";
+    private static final String DEFAULT_ARTIFACT_ID = "code-with-quarkus";
+    private static final String DEFAULT_VERSION = "1.0.0-SNAPSHOT";
+    private static final String DEFAULT_EXTENSIONS = "resteasy";
 
     @Parameter(defaultValue = "${project}")
     protected MavenProject project;
@@ -74,6 +74,18 @@ public class CreateProjectMojo extends AbstractMojo {
     @Parameter(property = "projectVersion")
     private String projectVersion;
 
+    /**
+     * When true, do not include any example code in the generated Quarkus project.
+     */
+    @Parameter(property = "noExamples", defaultValue = "false")
+    private boolean noExamples;
+
+    /**
+     * Choose which example(s) you want in the generated Quarkus application.
+     */
+    @Parameter(property = "examples")
+    private Set<String> examples;
+
     /**
      * Group ID of the target platform BOM
      */
@@ -92,12 +104,51 @@ public class CreateProjectMojo extends AbstractMojo {
     @Parameter(property = "platformVersion", required = false)
     private String bomVersion;
 
+    /**
+     * The {@link #path} will define the REST path of the generated code when picking only one of those extensions resteasy,
+     * resteasy-reactive and spring-web.
+     * <br />
+     * If more than one of those extensions are picked, this parameter will be ignored.
+     * <br />
+     * This is @Deprecated because using a generic path parameters with multiple example does not make sense and lead to
+     * confusion.
+     * More info: https://github.com/quarkusio/quarkus/issues/14437
+     * <br />
+     * {@code className}
+     */
     @Parameter(property = "path")
+    @Deprecated
     private String path;
 
+    /**
+     * The {@link #className} will define the generated class names when picking only one of those extensions resteasy,
+     * resteasy-reactive and spring-web.
+     * <br />
+     * If more than one of those extensions are picked, then only the package name part will be used as {@link #packageName}
+     * <br />
+     * This is @Deprecated because using a generic className parameters with multiple example does not make sense and lead to
+     * confusion.
+     * More info: https://github.com/quarkusio/quarkus/issues/14437
+     * <br />
+     * By default, the {@link #projectGroupId} is used as package for generated classes (you can also use {@link #packageName}
+     * to have them different).
+     * <br />
+     * {@code className}
+     */
     @Parameter(property = "className")
+    @Deprecated
     private String className;
 
+    /**
+     * Set the package name of the generated classes.
+     * <br />
+     * If not set, {@link #projectGroupId} will be used as {@link #packageName}
+     *
+     * {@code packageName}
+     */
+    @Parameter(property = "packageName")
+    private String packageName;
+
     @Parameter(property = "buildTool", defaultValue = "MAVEN")
     private String buildTool;
 
@@ -131,21 +182,15 @@ public class CreateProjectMojo extends AbstractMojo {
     @Component
     private RepositorySystem repoSystem;
 
+    @Component
+    RemoteRepositoryManager remoteRepoManager;
+
+    @Parameter(property = "enableRegistryClient")
+    private boolean enableRegistryClient;
+
     @Override
     public void execute() throws MojoExecutionException {
 
-        final MavenArtifactResolver mvn;
-        try {
-            mvn = MavenArtifactResolver.builder()
-                    .setRepositorySystem(repoSystem)
-                    .setRepositorySystemSession(repoSession)
-                    .setRemoteRepositories(repos).build();
-        } catch (Exception e1) {
-            throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e1);
-        }
-        final QuarkusPlatformDescriptor platform = CreateUtils.resolvePlatformDescriptor(bomGroupId, bomArtifactId, bomVersion,
-                mvn, getLog());
-
         // We detect the Maven version during the project generation to indicate the user immediately that the installed
         // version may not be supported.
         mavenVersionEnforcer.ensureMavenVersion(getLog(), session);
@@ -154,18 +199,74 @@ public void execute() throws MojoExecutionException {
         } catch (IOException e) {
             throw new MojoExecutionException("Could not create directory " + outputDirectory, e);
         }
+
+        final MavenArtifactResolver mvn;
+        try {
+            mvn = MavenArtifactResolver.builder()
+                    .setRepositorySystem(repoSystem)
+                    .setRepositorySystemSession(repoSession)
+                    .setRemoteRepositories(repos)
+                    .setRemoteRepositoryManager(remoteRepoManager)
+                    .build();
+        } catch (Exception e) {
+            throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e);
+        }
+        final MojoMessageWriter log = new MojoMessageWriter(getLog());
+        final ExtensionCatalogResolver catalogResolver = enableRegistryClient
+                ? QuarkusProjectHelper.getCatalogResolver(mvn, log)
+                : ExtensionCatalogResolver.empty();
+
+        final ExtensionCatalog catalog = resolveExtensionsCatalog(
+                StringUtils.defaultIfBlank(bomGroupId, null),
+                StringUtils.defaultIfBlank(bomArtifactId, null),
+                StringUtils.defaultIfBlank(bomVersion, null),
+                catalogResolver, mvn, log);
+
         File projectRoot = outputDirectory;
-        File pom = new File(projectRoot, "pom.xml");
+        File pom = project != null ? project.getFile() : null;
+        Model parentPomModel = null;
 
-        if (pom.isFile()) {
-            throw new MojoExecutionException("Unable to generate the project in a directory that already contains a pom.xml");
-        } else {
-            askTheUserForMissingValues();
-            projectRoot = new File(outputDirectory, projectArtifactId);
-            if (projectRoot.exists()) {
-                throw new MojoExecutionException("Unable to create the project, " +
-                        "the directory " + projectRoot.getAbsolutePath() + " already exists");
+        boolean containsAtLeastOneGradleFile = false;
+        for (String gradleFile : Arrays.asList("build.gradle", "settings.gradle", "build.gradle.kts", "settings.gradle.kts")) {
+            containsAtLeastOneGradleFile |= new File(projectRoot, gradleFile).isFile();
+        }
+
+        BuildTool buildToolEnum = BuildTool.findTool(buildTool);
+        if (buildToolEnum == null) {
+            String validBuildTools = String.join(",",
+                    Arrays.asList(BuildTool.values()).stream().map(BuildTool::toString).collect(Collectors.toList()));
+            throw new IllegalArgumentException("Choose a valid build tool. Accepted values are: " + validBuildTools);
+        }
+        if (BuildTool.MAVEN.equals(buildToolEnum)) {
+            if (pom != null && pom.isFile()) {
+                try {
+                    parentPomModel = MojoUtils.readPom(pom);
+                    if (!"pom".equals(parentPomModel.getPackaging())) {
+                        throw new MojoExecutionException(
+                                "The parent project must have a packaging type of POM. Current packaging: "
+                                        + parentPomModel.getPackaging());
+                    }
+                } catch (IOException e) {
+                    throw new MojoExecutionException("Could not access parent pom.", e);
+                }
+            } else if (containsAtLeastOneGradleFile) {
+                throw new MojoExecutionException(
+                        "You are trying to create maven project in a directory that contains only gradle build files.");
             }
+        } else if (BuildTool.GRADLE.equals(buildToolEnum) || BuildTool.GRADLE_KOTLIN_DSL.equals(buildToolEnum)) {
+            if (containsAtLeastOneGradleFile) {
+                throw new MojoExecutionException("Adding subprojects to gradle projects is not implemented.");
+            } else if (pom != null && pom.isFile()) {
+                throw new MojoExecutionException(
+                        "You are trying to create gradle project in a directory that contains only maven build files.");
+            }
+        }
+
+        askTheUserForMissingValues();
+        projectRoot = new File(outputDirectory, projectArtifactId);
+        if (projectRoot.exists()) {
+            throw new MojoExecutionException("Unable to create the project, " +
+                    "the directory " + projectRoot.getAbsolutePath() + " already exists");
         }
 
         boolean success;
@@ -175,33 +276,37 @@ public void execute() throws MojoExecutionException {
             final SourceType sourceType = CreateProject.determineSourceType(extensions);
             sanitizeOptions(sourceType);
 
-            BuildTool buildToolEnum;
-            try {
-                buildToolEnum = BuildTool.valueOf(buildTool.toUpperCase());
-            } catch (IllegalArgumentException e) {
-                String validBuildTools = String.join(",",
-                        Arrays.asList(BuildTool.values()).stream().map(BuildTool::toString).collect(Collectors.toList()));
-                throw new IllegalArgumentException("Choose a valid build tool. Accepted values are: " + validBuildTools);
-            }
-            final CreateProject createProject = new CreateProject(projectDirPath, platform)
-                    .buildTool(buildToolEnum)
+            QuarkusProject newProject = QuarkusProject.of(projectDirPath, catalog,
+                    QuarkusProjectHelper.getResourceLoader(catalog, mvn), log, buildToolEnum);
+            final CreateProject createProject = new CreateProject(newProject)
                     .groupId(projectGroupId)
                     .artifactId(projectArtifactId)
                     .version(projectVersion)
                     .sourceType(sourceType)
                     .className(className)
-                    .extensions(extensions);
+                    .packageName(packageName)
+                    .extensions(extensions)
+                    .overrideExamples(examples)
+                    .noExamples(noExamples);
             if (path != null) {
                 createProject.setValue("path", path);
             }
 
             success = createProject.execute().isSuccess();
-
-            File createdDependenciesBuildFile = new File(projectRoot, buildToolEnum.getDependenciesFile());
-            if (BuildTool.MAVEN.equals(buildToolEnum)) {
-                createMavenWrapper(createdDependenciesBuildFile, ToolsUtils.readQuarkusProperties(platform));
-            } else if (BuildTool.GRADLE.equals(buildToolEnum)) {
-                createGradleWrapper(platform, projectDirPath);
+            if (success && parentPomModel != null && BuildTool.MAVEN.equals(buildToolEnum)) {
+                // Write to parent pom and submodule pom if project creation is successful
+                if (!parentPomModel.getModules().contains(this.projectArtifactId)) {
+                    parentPomModel.addModule(this.projectArtifactId);
+                }
+                File subModulePomFile = new File(projectRoot, buildToolEnum.getDependenciesFile());
+                Model subModulePomModel = MojoUtils.readPom(subModulePomFile);
+                Parent parent = new Parent();
+                parent.setGroupId(parentPomModel.getGroupId());
+                parent.setArtifactId(parentPomModel.getArtifactId());
+                parent.setVersion(parentPomModel.getVersion());
+                subModulePomModel.setParent(parent);
+                MojoUtils.write(parentPomModel, pom);
+                MojoUtils.write(subModulePomModel, subModulePomFile);
             }
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to generate Quarkus project", e);
@@ -214,80 +319,70 @@ public void execute() throws MojoExecutionException {
         }
     }
 
-    private void createGradleWrapper(QuarkusPlatformDescriptor platform, Path projectDirPath) {
-        try {
-            Files.createDirectories(projectDirPath.resolve("gradle/wrapper"));
-
-            for (String filename : CreateUtils.GRADLE_WRAPPER_FILES) {
-                byte[] fileContent = platform.loadResource(CreateUtils.GRADLE_WRAPPER_PATH + '/' + filename,
-                        is -> {
-                            byte[] buffer = new byte[is.available()];
-                            is.read(buffer);
-                            return buffer;
-                        });
-                final Path destination = projectDirPath.resolve(filename);
-                Files.write(destination, fileContent);
-            }
-
-            projectDirPath.resolve("gradlew").toFile().setExecutable(true);
-            projectDirPath.resolve("gradlew.bat").toFile().setExecutable(true);
-        } catch (IOException e) {
-            getLog().error("Unable to copy Gradle wrapper from platform descriptor", e);
+    static ExtensionCatalog resolveExtensionsCatalog(String groupId, String artifactId, String version,
+            ExtensionCatalogResolver catalogResolver, MavenArtifactResolver artifactResolver, MessageWriter log)
+            throws MojoExecutionException {
+
+        if (!catalogResolver.hasRegistries()) {
+            // TODO: this should normally result in an error, however for the time being
+            // until we get the registry service up and running this will allow
+            // a fall back to the legacy way of resolving the default platform catalog directly
+            return ToolsUtils.resolvePlatformDescriptorDirectly(groupId, artifactId,
+                    version == null ? CreateUtils.resolvePluginInfo(CreateUtils.class).getVersion() : version, artifactResolver,
+                    log);
         }
-    }
 
-    private void createMavenWrapper(File createdPomFile, Properties props) {
         try {
-            // we need to modify the maven environment used by the wrapper plugin since the project could have been
-            // created in a directory other than the current
-            MavenProject newProject = projectBuilder.build(
-                    createdPomFile, new DefaultProjectBuildingRequest(session.getProjectBuildingRequest())).getProject();
-
-            MavenExecutionRequest newExecutionRequest = DefaultMavenExecutionRequest.copy(session.getRequest());
-            newExecutionRequest.setBaseDirectory(createdPomFile.getParentFile());
-
-            MavenSession newSession = new MavenSession(session.getContainer(), session.getRepositorySession(),
-                    newExecutionRequest, session.getResult());
-            newSession.setCurrentProject(newProject);
-
-            setProxySystemPropertiesFromSession();
-
-            executeMojo(
-                    plugin(
-                            groupId("io.takari"),
-                            artifactId("maven"),
-                            version(ToolsUtils.getMavenWrapperVersion(props))),
-                    goal("wrapper"),
-                    configuration(
-                            element(name("maven"), ToolsUtils.getProposedMavenVersion(props))),
-                    executionEnvironment(
-                            newProject,
-                            newSession,
-                            pluginManager));
-        } catch (Exception e) {
-            // no reason to fail if the wrapper could not be created
-            getLog().error("Unable to install the Maven wrapper (./mvnw) in the project", e);
-        }
-    }
-
-    private void setProxySystemPropertiesFromSession() {
-        List<Proxy> proxiesFromSession = session.getRequest().getProxies();
-        // - takari maven uses https to download the maven wrapper
-        // - don't do anything if proxy system property is already set
-        if (!proxiesFromSession.isEmpty() && System.getProperty("https.proxyHost") == null) {
-
-            // use the first active proxy for setting the system properties
-            proxiesFromSession.stream()
-                    .filter(Proxy::isActive)
-                    .findFirst()
-                    .ifPresent(proxy -> {
-                        // note: a http proxy _is_ usable as https.proxyHost
-                        System.setProperty("https.proxyHost", proxy.getHost());
-                        System.setProperty("https.proxyPort", String.valueOf(proxy.getPort()));
-                        if (proxy.getNonProxyHosts() != null) {
-                            System.setProperty("http.nonProxyHosts", proxy.getNonProxyHosts());
-                        }
-                    });
+            if (groupId == null && artifactId == null && version == null) {
+                return catalogResolver.resolveExtensionCatalog();
+            }
+            final PlatformCatalog platformsCatalog = catalogResolver.resolvePlatformCatalog();
+            if (platformsCatalog == null) {
+                throw new MojoExecutionException(
+                        "No platforms are available. Please make sure your .quarkus/config.yaml configuration includes proper extensions registry configuration");
+            }
+            ArtifactCoords matchedBom = null;
+            List<ArtifactCoords> matchedBoms = null;
+            for (Platform p : platformsCatalog.getPlatforms()) {
+                final ArtifactCoords bom = p.getBom();
+                if (version != null && !bom.getVersion().equals(version)) {
+                    continue;
+                }
+                if (artifactId != null && !bom.getArtifactId().equals(artifactId)) {
+                    continue;
+                }
+                if (groupId != null && !bom.getGroupId().equals(groupId)) {
+                    continue;
+                }
+                if (matchedBom != null) {
+                    if (matchedBoms == null) {
+                        matchedBoms = new ArrayList<>();
+                        matchedBoms.add(matchedBom);
+                    }
+                    matchedBoms.add(bom);
+                } else {
+                    matchedBom = bom;
+                }
+            }
+            if (matchedBoms != null) {
+                StringWriter buf = new StringWriter();
+                buf.append("Multiple platforms were matching the requested platform BOM coordinates ");
+                buf.append(groupId == null ? "*" : groupId).append(':');
+                buf.append(artifactId == null ? "*" : artifactId).append(':');
+                buf.append(version == null ? "*" : version).append(": ");
+                try (BufferedWriter writer = new BufferedWriter(buf)) {
+                    for (ArtifactCoords bom : matchedBoms) {
+                        writer.newLine();
+                        writer.append("- ").append(bom.toString());
+                    }
+                } catch (IOException e) {
+                    //
+                }
+                throw new MojoExecutionException(buf.toString());
+            }
+            return catalogResolver.resolveExtensionCatalog(Arrays.asList(matchedBom));
+        } catch (RegistryResolutionException e) {
+            throw new MojoExecutionException("Failed to resolve the extensions catalog", e);
         }
     }
 
@@ -296,15 +391,15 @@ private void askTheUserForMissingValues() throws MojoExecutionException {
         // If the user has disabled the interactive mode or if the user has specified the artifactId, disable the
         // user interactions.
         if (!session.getRequest().isInteractiveMode() || shouldUseDefaults()) {
-            // Inject default values in all non-set parameters
+            if (StringUtils.isBlank(projectArtifactId)) {
+                // we need to set it for the project directory
+                projectArtifactId = DEFAULT_ARTIFACT_ID;
+            }
             if (StringUtils.isBlank(projectGroupId)) {
                 projectGroupId = DEFAULT_GROUP_ID;
             }
-            if (StringUtils.isBlank(projectArtifactId)) {
-                projectArtifactId = "my-quarkus-project";
-            }
             if (StringUtils.isBlank(projectVersion)) {
-                projectVersion = "1.0-SNAPSHOT";
+                projectVersion = DEFAULT_VERSION;
             }
             return;
         }
@@ -317,30 +412,27 @@ private void askTheUserForMissingValues() throws MojoExecutionException {
 
             if (StringUtils.isBlank(projectArtifactId)) {
                 projectArtifactId = prompter.promptWithDefaultValue("Set the project artifactId",
-                        "my-quarkus-project");
+                        DEFAULT_ARTIFACT_ID);
             }
 
             if (StringUtils.isBlank(projectVersion)) {
                 projectVersion = prompter.promptWithDefaultValue("Set the project version",
-                        "1.0-SNAPSHOT");
+                        DEFAULT_VERSION);
             }
 
-            if (StringUtils.isBlank(className)) {
-                // Ask the user if he want to create a resource
-                String answer = prompter.promptWithDefaultValue("Do you want to create a REST resource? (y/n)", "no");
-                if (isTrueOrYes(answer)) {
-                    String defaultResourceName = projectGroupId.replace("-", ".")
-                            .replace("_", ".") + ".HelloResource";
-                    className = prompter.promptWithDefaultValue("Set the resource classname", defaultResourceName);
-                    if (StringUtils.isBlank(path)) {
-                        path = prompter.promptWithDefaultValue("Set the resource path ", CreateUtils.getDerivedPath(className));
-                    }
-                } else {
-                    className = null;
-                    path = null;
+            if (examples.isEmpty()) {
+                if (extensions.isEmpty()) {
+                    extensions = Arrays
+                            .stream(prompter
+                                    .promptWithDefaultValue("What extensions do you wish to add (comma separated list)",
+                                            DEFAULT_EXTENSIONS)
+                                    .split(","))
+                            .map(String::trim).filter(StringUtils::isNotEmpty).collect(Collectors.toSet());
                 }
+                String answer = prompter.promptWithDefaultValue(
+                        "Do you want example code to get started (yes), or just an empty project (no)", "yes");
+                noExamples = answer.startsWith("n");
             }
-
         } catch (IOException e) {
             throw new MojoExecutionException("Unable to get user input", e);
         }
@@ -352,22 +444,17 @@ private boolean shouldUseDefaults() {
 
     }
 
-    private boolean isTrueOrYes(String answer) {
-        if (answer == null) {
-            return false;
-        }
-        String content = answer.trim().toLowerCase();
-        return "true".equalsIgnoreCase(content) || "yes".equalsIgnoreCase(content) || "y".equalsIgnoreCase(content);
-    }
-
     private void sanitizeOptions(SourceType sourceType) {
-        // If className is null, we won't create the REST resource,
         if (className != null) {
             className = sourceType.stripExtensionFrom(className);
 
-            if (!className.contains(".")) {
-                // No package name, inject one
-                className = projectGroupId.replace("-", ".").replace("_", ".") + "." + className;
+            int idx = className.lastIndexOf('.');
+            if (idx >= 0 && StringUtils.isBlank(packageName)) {
+                // if it's a full qualified class name, we use the package name part (only if the packageName wasn't already defined)
+                packageName = className.substring(0, idx);
+
+                // And we strip it from the className
+                className = className.substring(idx + 1);
             }
 
             if (StringUtils.isBlank(path)) {
@@ -376,6 +463,7 @@ private void sanitizeOptions(SourceType sourceType) {
                 path = "/" + path;
             }
         }
+        // if package name is empty, the groupId will be used as part of the CreateProject logic
     }
 
     private void sanitizeExtensions() {
@@ -399,5 +487,4 @@ private void printUserInstructions(File root) {
         getLog().info("========================================================================================");
         getLog().info("");
     }
-
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java
index f55f3639dced5..1b5b8896cc3d2 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/CreateUtils.java
@@ -11,25 +11,18 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
-import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.bootstrap.util.ZipUtils;
 import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-import io.quarkus.platform.tools.maven.MojoMessageWriter;
 
 public final class CreateUtils {
 
     public static final String DEFAULT_PLATFORM_BOM_GROUP_ID = "io.quarkus";
     public static final String QUARKUS_CORE_BOM_ARTIFACT_ID = "quarkus-bom";
-    public static final String DEFAULT_PLATFORM_BOM_ARTIFACT_ID = QUARKUS_CORE_BOM_ARTIFACT_ID;
+    public static final String DEFAULT_PLATFORM_BOM_ARTIFACT_ID = "quarkus-universe-bom";
 
     public static final String GRADLE_WRAPPER_PATH = "gradle-wrapper";
     public static final String[] GRADLE_WRAPPER_FILES = new String[] {
@@ -43,59 +36,6 @@ private CreateUtils() {
         //Not to be constructed
     }
 
-    private static boolean isVersionRange(String versionStr) {
-        if (versionStr == null || versionStr.isEmpty()) {
-            return false;
-        }
-        char c = versionStr.charAt(0);
-        if (c == '[' || c == '(') {
-            return true;
-        }
-        c = versionStr.charAt(versionStr.length() - 1);
-        if (c == ']' || c == ')') {
-            return true;
-        }
-        return versionStr.indexOf(',') >= 0;
-    }
-
-    static QuarkusPlatformDescriptor setGlobalPlatformDescriptor(final String bomGroupId, final String bomArtifactId,
-            final String bomVersion,
-            MavenArtifactResolver mvn, Log log) throws MojoExecutionException {
-        final QuarkusPlatformDescriptor platform = resolvePlatformDescriptor(bomGroupId, bomArtifactId, bomVersion, mvn, log);
-        QuarkusPlatformConfig.defaultConfigBuilder().setPlatformDescriptor(platform).build();
-        return platform;
-    }
-
-    static QuarkusPlatformDescriptor resolvePlatformDescriptor(final String bomGroupId, final String bomArtifactId,
-            final String bomVersion, MavenArtifactResolver mvn, Log log) throws MojoExecutionException {
-        final QuarkusJsonPlatformDescriptorResolver platformResolver = QuarkusJsonPlatformDescriptorResolver.newInstance()
-                .setMessageWriter(new MojoMessageWriter(log))
-                .setArtifactResolver(new BootstrapAppModelResolver(mvn));
-
-        String groupId = StringUtils.defaultIfBlank(bomGroupId, null);
-        String artifactId = StringUtils.defaultIfBlank(bomArtifactId, null);
-        String version = StringUtils.defaultIfBlank(bomVersion, null);
-
-        if (CreateUtils.QUARKUS_CORE_BOM_ARTIFACT_ID.equals(artifactId)
-                && version == null) {
-            version = resolvePluginInfo(CreateUtils.class).getVersion();
-        }
-
-        final QuarkusPlatformDescriptor platform;
-        if (version == null) {
-            if (artifactId == null && groupId == null) {
-                platform = platformResolver.resolve();
-            } else {
-                platform = platformResolver.resolveLatestFromBom(groupId, artifactId, null);
-            }
-        } else if (isVersionRange(version)) {
-            platform = platformResolver.resolveLatestFromBom(groupId, artifactId, version);
-        } else {
-            platform = platformResolver.resolveFromBom(groupId, artifactId, version);
-        }
-        return platform;
-    }
-
     public static String getDerivedPath(String className) {
         String[] resourceClassName = StringUtils.splitByCharacterTypeCamelCase(
                 className.substring(className.lastIndexOf(".") + 1));
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
index ae198823337e5..0978339a70477 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -1,45 +1,47 @@
 package io.quarkus.maven;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
+
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectOutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
+import java.util.zip.ZipFile;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -47,14 +49,13 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.utils.cli.CommandLineUtils;
+import org.apache.maven.toolchain.Toolchain;
+import org.apache.maven.toolchain.ToolchainManager;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.graph.DependencyVisitor;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.resolution.ArtifactRequest;
@@ -64,17 +65,18 @@
 import org.eclipse.aether.resolution.DependencyResolutionException;
 import org.eclipse.aether.resolution.DependencyResult;
 import org.eclipse.aether.util.artifact.JavaScopes;
-import org.twdata.maven.mojoexecutor.MojoExecutor;
 
+import io.quarkus.bootstrap.devmode.DependenciesFilter;
 import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.model.AppModel;
 import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
-import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
 import io.quarkus.deployment.dev.DevModeContext;
 import io.quarkus.deployment.dev.DevModeMain;
+import io.quarkus.deployment.dev.QuarkusDevModeLauncher;
+import io.quarkus.maven.MavenDevModeLauncher.Builder;
 import io.quarkus.maven.components.MavenVersionEnforcer;
 import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.utilities.JavaBinFinder;
 
 /**
  * The dev mojo, that runs a quarkus app in a forked process. A background compilation process is launched and any changes are
@@ -85,6 +87,10 @@
 @Mojo(name = "dev", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public class DevMojo extends AbstractMojo {
 
+    private static final String EXT_PROPERTIES_PATH = "META-INF/quarkus-extension.properties";
+
+    private static final String KOTLIN_MAVEN_PLUGIN_GA = "org.jetbrains.kotlin:kotlin-maven-plugin";
+
     /**
      * running any one of these phases means the compile phase will have been run, if these have
      * not been run we manually run compile
@@ -110,11 +116,12 @@ public class DevMojo extends AbstractMojo {
 
     private static final String QUARKUS_PLUGIN_GROUPID = "io.quarkus";
     private static final String QUARKUS_PLUGIN_ARTIFACTID = "quarkus-maven-plugin";
-    private static final String QUARKUS_PREPARE_GOAL = "prepare";
+    private static final String QUARKUS_GENERATE_CODE_GOAL = "generate-code";
 
     private static final String ORG_APACHE_MAVEN_PLUGINS = "org.apache.maven.plugins";
     private static final String MAVEN_COMPILER_PLUGIN = "maven-compiler-plugin";
     private static final String MAVEN_RESOURCES_PLUGIN = "maven-resources-plugin";
+    private static final String MAVEN_TOOLCHAINS_PLUGIN = "maven-toolchains-plugin";
 
     private static final String ORG_JETBRAINS_KOTLIN = "org.jetbrains.kotlin";
     private static final String KOTLIN_MAVEN_PLUGIN = "kotlin-maven-plugin";
@@ -180,6 +187,9 @@ public class DevMojo extends AbstractMojo {
     @Parameter(defaultValue = "${suspend}")
     private String suspend;
 
+    @Parameter(defaultValue = "${debugHost}")
+    private String debugHost;
+
     @Parameter(defaultValue = "${project.build.directory}")
     private File buildDir;
 
@@ -195,6 +205,12 @@ public class DevMojo extends AbstractMojo {
     @Parameter(defaultValue = "${quarkus.args}")
     private String argsString;
 
+    @Parameter
+    private Map<String, String> environmentVariables = Collections.emptyMap();
+
+    @Parameter
+    private Map<String, String> systemProperties = Collections.emptyMap();
+
     @Parameter(defaultValue = "${session}")
     private MavenSession session;
 
@@ -263,11 +279,22 @@ public class DevMojo extends AbstractMojo {
 
     private Boolean debugPortOk;
 
+    @Component
+    private ToolchainManager toolchainManager;
+
+    @Override
+    public void setLog(Log log) {
+        super.setLog(log);
+        MojoLogger.delegate = log;
+    }
+
     @Override
     public void execute() throws MojoFailureException, MojoExecutionException {
 
         mavenVersionEnforcer.ensureMavenVersion(getLog(), session);
 
+        initToolchain();
+
         //we always want to compile if needed, so if it is run from the parent it will compile dependent projects
         handleAutoCompile();
 
@@ -282,52 +309,9 @@ public void execute() throws MojoFailureException, MojoExecutionException {
             }
         }
 
-        // don't warn if running in a module of a multi-module project
-        if (!sourceDir.isDirectory() && (project.getParentFile() == null || !project.getParentFile().exists())) {
-            getLog().warn("The project's sources directory does not exist " + sourceDir);
-        }
-
         try {
-            List<String> args = new ArrayList<>();
-            String javaTool = JavaBinFinder.findBin();
-            getLog().debug("Using javaTool: " + javaTool);
-            args.add(javaTool);
-            if (this.suspend != null) {
-                switch (this.suspend.toLowerCase(Locale.ENGLISH)) {
-                    case "n":
-                    case "false": {
-                        suspend = "n";
-                        break;
-                    }
-                    case "y":
-                    case "true": {
-                        suspend = "y";
-                        break;
-                    }
-                    default: {
-                        getLog().warn(
-                                "Ignoring invalid value \"" + suspend + "\" for \"suspend\" param and defaulting to \"n\"");
-                        suspend = "n";
-                        break;
-                    }
-                }
-            } else {
-                suspend = "n";
-            }
 
-            if (jvmArgs != null) {
-                args.addAll(Arrays.asList(CommandLineUtils.translateCommandline(jvmArgs)));
-            }
-
-            // the following flags reduce startup time and are acceptable only for dev purposes
-            args.add("-XX:TieredStopAtLevel=1");
-            if (!preventnoverify) {
-                args.add("-Xverify:none");
-            }
-
-            DevModeRunner runner = new DevModeRunner(args);
-
-            runner.prepare(false);
+            DevModeRunner runner = new DevModeRunner();
             Map<Path, Long> pomFiles = readPomFileTimestamps(runner);
             runner.run();
             long nextCheck = System.currentTimeMillis() + 100;
@@ -338,8 +322,8 @@ public void execute() throws MojoFailureException, MojoExecutionException {
                 Thread.sleep(sleep);
                 if (System.currentTimeMillis() > nextCheck) {
                     nextCheck = System.currentTimeMillis() + 100;
-                    if (!runner.process.isAlive()) {
-                        if (runner.process.exitValue() != 0) {
+                    if (!runner.alive()) {
+                        if (runner.exitValue() != 0) {
                             throw new MojoExecutionException("Dev mode process did not complete successfully");
                         }
                         return;
@@ -354,9 +338,10 @@ public void execute() throws MojoFailureException, MojoExecutionException {
                     }
                     if (!changed.isEmpty()) {
                         getLog().info("Changes detected to " + changed + ", restarting dev mode");
-                        DevModeRunner newRunner = new DevModeRunner(args);
+                        final DevModeRunner newRunner;
                         try {
-                            newRunner.prepare(true);
+                            triggerCompile();
+                            newRunner = new DevModeRunner();
                         } catch (Exception e) {
                             getLog().info("Could not load changed pom.xml file, changes not applied", e);
                             continue;
@@ -401,34 +386,22 @@ private void handleAutoCompile() throws MojoExecutionException {
         }
     }
 
+    private void initToolchain() throws MojoExecutionException {
+        executeIfConfigured(ORG_APACHE_MAVEN_PLUGINS, MAVEN_TOOLCHAINS_PLUGIN, "toolchain");
+    }
+
     private void triggerPrepare() throws MojoExecutionException {
-        Plugin quarkusPlugin = project.getPlugin(QUARKUS_PLUGIN_GROUPID + ":" + QUARKUS_PLUGIN_ARTIFACTID);
-        MojoExecutor.executeMojo(
-                quarkusPlugin,
-                MojoExecutor.goal(QUARKUS_PREPARE_GOAL),
-                MojoExecutor.configuration(),
-                MojoExecutor.executionEnvironment(
-                        project,
-                        session,
-                        pluginManager));
+        executeIfConfigured(QUARKUS_PLUGIN_GROUPID, QUARKUS_PLUGIN_ARTIFACTID, QUARKUS_GENERATE_CODE_GOAL);
     }
 
     private void triggerCompile() throws MojoExecutionException {
         handleResources();
 
         // compile the Kotlin sources if needed
-        final String kotlinMavenPluginKey = ORG_JETBRAINS_KOTLIN + ":" + KOTLIN_MAVEN_PLUGIN;
-        final Plugin kotlinMavenPlugin = project.getPlugin(kotlinMavenPluginKey);
-        if (kotlinMavenPlugin != null) {
-            executeCompileGoal(kotlinMavenPlugin, ORG_JETBRAINS_KOTLIN, KOTLIN_MAVEN_PLUGIN);
-        }
+        executeIfConfigured(ORG_JETBRAINS_KOTLIN, KOTLIN_MAVEN_PLUGIN, "compile");
 
         // Compile the Java sources if needed
-        final String compilerPluginKey = ORG_APACHE_MAVEN_PLUGINS + ":" + MAVEN_COMPILER_PLUGIN;
-        final Plugin compilerPlugin = project.getPlugin(compilerPluginKey);
-        if (compilerPlugin != null) {
-            executeCompileGoal(compilerPlugin, ORG_APACHE_MAVEN_PLUGINS, MAVEN_COMPILER_PLUGIN);
-        }
+        executeIfConfigured(ORG_APACHE_MAVEN_PLUGINS, MAVEN_COMPILER_PLUGIN, "compile");
     }
 
     /**
@@ -439,56 +412,76 @@ private void handleResources() throws MojoExecutionException {
         if (resources.isEmpty()) {
             return;
         }
-        Plugin resourcesPlugin = project.getPlugin(ORG_APACHE_MAVEN_PLUGINS + ":" + MAVEN_RESOURCES_PLUGIN);
-        if (resourcesPlugin == null) {
-            return;
-        }
-        MojoExecutor.executeMojo(
-                MojoExecutor.plugin(
-                        MojoExecutor.groupId(ORG_APACHE_MAVEN_PLUGINS),
-                        MojoExecutor.artifactId(MAVEN_RESOURCES_PLUGIN),
-                        MojoExecutor.version(resourcesPlugin.getVersion()),
-                        resourcesPlugin.getDependencies()),
-                MojoExecutor.goal("resources"),
-                getPluginConfig(resourcesPlugin),
-                MojoExecutor.executionEnvironment(
-                        project,
-                        session,
-                        pluginManager));
+        executeIfConfigured(ORG_APACHE_MAVEN_PLUGINS, MAVEN_RESOURCES_PLUGIN, "resources");
     }
 
-    private void executeCompileGoal(Plugin plugin, String groupId, String artifactId) throws MojoExecutionException {
-        MojoExecutor.executeMojo(
-                MojoExecutor.plugin(
-                        MojoExecutor.groupId(groupId),
-                        MojoExecutor.artifactId(artifactId),
-                        MojoExecutor.version(plugin.getVersion()),
+    private void executeIfConfigured(String pluginGroupId, String pluginArtifactId, String goal) throws MojoExecutionException {
+        final Plugin plugin = project.getPlugin(pluginGroupId + ":" + pluginArtifactId);
+        if (plugin == null || plugin.getExecutions().stream().noneMatch(exec -> exec.getGoals().contains(goal))) {
+            return;
+        }
+        executeMojo(
+                plugin(
+                        groupId(pluginGroupId),
+                        artifactId(pluginArtifactId),
+                        version(plugin.getVersion()),
                         plugin.getDependencies()),
-                MojoExecutor.goal("compile"),
-                getPluginConfig(plugin),
-                MojoExecutor.executionEnvironment(
+                goal(goal),
+                getPluginConfig(plugin, goal),
+                executionEnvironment(
                         project,
                         session,
                         pluginManager));
     }
 
-    private Xpp3Dom getPluginConfig(Plugin plugin) {
-        Xpp3Dom configuration = MojoExecutor.configuration();
-        Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
-        if (pluginConfiguration != null) {
-            //Filter out `test*` configurations
-            for (Xpp3Dom child : pluginConfiguration.getChildren()) {
-                if (!child.getName().startsWith("test")) {
+    private Xpp3Dom getPluginConfig(Plugin plugin, String goal) throws MojoExecutionException {
+        Xpp3Dom mergedConfig = null;
+        if (!plugin.getExecutions().isEmpty()) {
+            for (PluginExecution exec : plugin.getExecutions()) {
+                if (exec.getConfiguration() != null && exec.getGoals().contains(goal)) {
+                    mergedConfig = mergedConfig == null ? (Xpp3Dom) exec.getConfiguration()
+                            : Xpp3Dom.mergeXpp3Dom(mergedConfig, (Xpp3Dom) exec.getConfiguration(), true);
+                }
+            }
+        }
+
+        if ((Xpp3Dom) plugin.getConfiguration() != null) {
+            mergedConfig = mergedConfig == null ? (Xpp3Dom) plugin.getConfiguration()
+                    : Xpp3Dom.mergeXpp3Dom(mergedConfig, (Xpp3Dom) plugin.getConfiguration(), true);
+        }
+
+        final Xpp3Dom configuration = configuration();
+        if (mergedConfig != null) {
+            Set<String> supportedParams = null;
+            // Filter out `test*` configurations
+            for (Xpp3Dom child : mergedConfig.getChildren()) {
+                if (child.getName().startsWith("test")) {
+                    continue;
+                }
+                if (supportedParams == null) {
+                    supportedParams = getMojoDescriptor(plugin, goal).getParameterMap().keySet();
+                }
+                if (supportedParams.contains(child.getName())) {
                     configuration.addChild(child);
                 }
             }
         }
+
         return configuration;
     }
 
+    private MojoDescriptor getMojoDescriptor(Plugin plugin, String goal) throws MojoExecutionException {
+        try {
+            return pluginManager.getMojoDescriptor(plugin, goal, repos, repoSession);
+        } catch (Exception e) {
+            throw new MojoExecutionException(
+                    "Failed to obtain descriptor for Maven plugin " + plugin.getId() + " goal " + goal, e);
+        }
+    }
+
     private Map<Path, Long> readPomFileTimestamps(DevModeRunner runner) throws IOException {
         Map<Path, Long> ret = new HashMap<>();
-        for (Path i : runner.getPomFiles()) {
+        for (Path i : runner.pomFiles()) {
             ret.put(i, Files.getLastModifiedTime(i).toMillis());
         }
         return ret;
@@ -502,7 +495,7 @@ private String getSourceEncoding() {
         return null;
     }
 
-    private void addProject(DevModeContext devModeContext, LocalProject localProject, boolean root) {
+    private void addProject(MavenDevModeLauncher.Builder builder, LocalProject localProject, boolean root) throws Exception {
 
         String projectDirectory = null;
         Set<String> sourcePaths = null;
@@ -539,6 +532,11 @@ private void addProject(DevModeContext devModeContext, LocalProject localProject
             resourcePath = resourcesSourcesDir.toAbsolutePath().toString();
         }
 
+        if (classesPath == null && (!sourcePaths.isEmpty() || resourcePath != null)) {
+            throw new MojoExecutionException("Hot reloadable dependency " + localProject.getAppArtifact()
+                    + " has not been compiled yet (the classes directory " + classesDir + " does not exist)");
+        }
+
         Path targetDir = Paths.get(project.getBuild().getDirectory());
 
         DevModeContext.ModuleInfo moduleInfo = new DevModeContext.ModuleInfo(localProject.getKey(),
@@ -551,437 +549,336 @@ private void addProject(DevModeContext devModeContext, LocalProject localProject
                 targetDir.resolve("generated-sources").toAbsolutePath().toString(),
                 targetDir.toAbsolutePath().toString());
         if (root) {
-            devModeContext.setApplicationRoot(moduleInfo);
+            builder.mainModule(moduleInfo);
         } else {
-            devModeContext.getAdditionalModules().add(moduleInfo);
+            builder.dependency(moduleInfo);
         }
     }
 
-    private void addToClassPaths(StringBuilder classPathManifest, File file) {
-        final URI uri = file.toPath().toAbsolutePath().toUri();
-        classPathManifest.append(uri).append(" ");
-    }
-
-    class DevModeRunner {
+    private class DevModeRunner {
 
-        private static final String KOTLIN_MAVEN_PLUGIN_GA = "org.jetbrains.kotlin:kotlin-maven-plugin";
-        private final List<String> args;
+        final QuarkusDevModeLauncher launcher;
         private Process process;
-        private Set<Path> pomFiles = new HashSet<>();
 
-        DevModeRunner(List<String> args) {
-            this.args = new ArrayList<>(args);
+        private DevModeRunner() throws Exception {
+            launcher = newLauncher();
         }
 
-        /**
-         * Attempts to prepare the dev mode runner.
-         */
-        void prepare(final boolean triggerCompile) throws Exception {
-            if (triggerCompile) {
-                triggerCompile();
-            }
-            if (debug == null) {
-                // debug mode not specified
-                // make sure 5005 is not used, we don't want to just fail if something else is using it
-                // we don't check this on restarts, as the previous process is still running
-                if (debugPortOk == null) {
-                    try (Socket socket = new Socket(InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }), 5005)) {
-                        getLog().error("Port 5005 in use, not starting in debug mode");
-                        debugPortOk = false;
-                    } catch (IOException e) {
-                        debugPortOk = true;
-                    }
-                }
-                if (debugPortOk) {
-                    args.add("-Xdebug");
-                    args.add("-Xrunjdwp:transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=" + suspend);
-                }
-            } else if (debug.toLowerCase().equals("client")) {
-                args.add("-Xdebug");
-                args.add("-Xrunjdwp:transport=dt_socket,address=localhost:5005,server=n,suspend=" + suspend);
-            } else if (debug.toLowerCase().equals("true")) {
-                args.add("-Xdebug");
-                args.add("-Xrunjdwp:transport=dt_socket,address=0.0.0.0:5005,server=y,suspend=" + suspend);
-            } else if (!debug.toLowerCase().equals("false")) {
-                try {
-                    int port = Integer.parseInt(debug);
-                    if (port <= 0) {
-                        throw new MojoFailureException("The specified debug port must be greater than 0");
-                    }
-                    args.add("-Xdebug");
-                    args.add("-Xrunjdwp:transport=dt_socket,address=0.0.0.0:" + port + ",server=y,suspend=" + suspend);
-                } catch (NumberFormatException e) {
-                    throw new MojoFailureException(
-                            "Invalid value for debug parameter: " + debug + " must be true|false|client|{port}");
-                }
-            }
-            //build a class-path string for the base platform
-            //this stuff does not change
-            // Do not include URIs in the manifest, because some JVMs do not like that
-            StringBuilder classPathManifest = new StringBuilder();
-            final DevModeContext devModeContext = new DevModeContext();
-            for (Map.Entry<Object, Object> e : System.getProperties().entrySet()) {
-                devModeContext.getSystemProperties().put(e.getKey().toString(), (String) e.getValue());
-            }
-            devModeContext.setProjectDir(project.getFile().getParentFile());
-            devModeContext.getBuildSystemProperties().putAll((Map) project.getProperties());
-
-            //  this is a minor hack to allow ApplicationConfig to be populated with defaults
-            devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.application.name", project.getArtifactId());
-            devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.application.version", project.getVersion());
-
-            devModeContext.setSourceEncoding(getSourceEncoding());
-
-            // Set compilation flags.  Try the explicitly given configuration first.  Otherwise,
-            // refer to the configuration of the Maven Compiler Plugin.
-            final Optional<Xpp3Dom> compilerPluginConfiguration = findCompilerPluginConfiguration();
-            if (compilerArgs != null) {
-                devModeContext.setCompilerOptions(compilerArgs);
-            } else if (compilerPluginConfiguration.isPresent()) {
-                final Xpp3Dom compilerPluginArgsConfiguration = compilerPluginConfiguration.get().getChild("compilerArgs");
-                if (compilerPluginArgsConfiguration != null) {
-                    List<String> compilerPluginArgs = new ArrayList<>();
-                    for (Xpp3Dom argConfiguration : compilerPluginArgsConfiguration.getChildren()) {
-                        compilerPluginArgs.add(argConfiguration.getValue());
-                    }
-                    // compilerArgs can also take a value without using arg
-                    if (compilerPluginArgsConfiguration.getValue() != null
-                            && !compilerPluginArgsConfiguration.getValue().isEmpty()) {
-                        compilerPluginArgs.add(compilerPluginArgsConfiguration.getValue().trim());
-                    }
-                    devModeContext.setCompilerOptions(compilerPluginArgs);
-                }
-            }
-            if (source != null) {
-                devModeContext.setSourceJavaVersion(source);
-            } else if (compilerPluginConfiguration.isPresent()) {
-                final Xpp3Dom javacSourceVersion = compilerPluginConfiguration.get().getChild("source");
-                if (javacSourceVersion != null && javacSourceVersion.getValue() != null
-                        && !javacSourceVersion.getValue().trim().isEmpty()) {
-                    devModeContext.setSourceJavaVersion(javacSourceVersion.getValue().trim());
-                }
-            }
-            if (target != null) {
-                devModeContext.setTargetJvmVersion(target);
-            } else if (compilerPluginConfiguration.isPresent()) {
-                final Xpp3Dom javacTargetVersion = compilerPluginConfiguration.get().getChild("target");
-                if (javacTargetVersion != null && javacTargetVersion.getValue() != null
-                        && !javacTargetVersion.getValue().trim().isEmpty()) {
-                    devModeContext.setTargetJvmVersion(javacTargetVersion.getValue().trim());
-                }
-            }
-
-            setKotlinSpecificFlags(devModeContext);
-            if (noDeps) {
-                final LocalProject localProject = LocalProject.load(project.getModel().getPomFile().toPath());
-                addProject(devModeContext, localProject, true);
-                pomFiles.add(localProject.getRawModel().getPomFile().toPath());
-                devModeContext.getLocalArtifacts()
-                        .add(new AppArtifactKey(localProject.getGroupId(), localProject.getArtifactId(), null, "jar"));
-            } else {
-                final LocalProject localProject = LocalProject.loadWorkspace(project.getModel().getPomFile().toPath());
-                for (LocalProject project : filterExtensionDependencies(localProject)) {
-                    addProject(devModeContext, project, project == localProject);
-                    pomFiles.add(project.getRawModel().getPomFile().toPath());
-                    devModeContext.getLocalArtifacts()
-                            .add(new AppArtifactKey(project.getGroupId(), project.getArtifactId(), null, "jar"));
-                }
-            }
-
-            addQuarkusDevModeDeps(classPathManifest);
-
-            args.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
+        Collection<Path> pomFiles() {
+            return launcher.watchedBuildFiles();
+        }
 
-            //in most cases these are not used, however they need to be present for some
-            //parent-first cases such as logging
-            for (Artifact appDep : project.getArtifacts()) {
-                // only add the artifact if it's present in the dev mode context
-                // we need this to avoid having jars on the classpath multiple times
-                if (!devModeContext.getLocalArtifacts().contains(new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(),
-                        appDep.getClassifier(), appDep.getArtifactHandler().getExtension()))) {
-                    addToClassPaths(classPathManifest, appDep.getFile());
-                }
-            }
+        boolean alive() {
+            return process == null ? false : process.isAlive();
+        }
 
-            //now we need to build a temporary jar to actually run
+        int exitValue() {
+            return process == null ? -1 : process.exitValue();
+        }
 
-            File tempFile = new File(buildDir, project.getArtifactId() + "-dev.jar");
-            tempFile.delete();
-            // Only delete the -dev.jar on exit if requested
-            if (deleteDevJar) {
-                tempFile.deleteOnExit();
+        void run() throws Exception {
+            // Display the launch command line in dev mode
+            if (getLog().isDebugEnabled()) {
+                getLog().debug("Launching JVM with command line: " + String.join(" ", launcher.args()));
             }
-            getLog().debug("Executable jar: " + tempFile.getAbsolutePath());
-
-            devModeContext.setBaseName(project.getBuild().getFinalName());
-            devModeContext.setCacheDir(new File(buildDir, "transformer-cache").getAbsoluteFile());
-
-            // this is the jar file we will use to launch the dev mode main class
-            devModeContext.setDevModeRunnerJarFile(tempFile);
-
-            modifyDevModeContext(devModeContext);
-
-            try (ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tempFile))) {
-                out.putNextEntry(new ZipEntry("META-INF/"));
-                Manifest manifest = new Manifest();
-                manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
-                manifest.getMainAttributes().put(Attributes.Name.CLASS_PATH, classPathManifest.toString());
-                manifest.getMainAttributes().put(Attributes.Name.MAIN_CLASS, DevModeMain.class.getName());
-                out.putNextEntry(new ZipEntry("META-INF/MANIFEST.MF"));
-                manifest.write(out);
-
-                out.putNextEntry(new ZipEntry(DevModeMain.DEV_MODE_CONTEXT));
-                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                ObjectOutputStream obj = new ObjectOutputStream(new DataOutputStream(bytes));
-                obj.writeObject(devModeContext);
-                obj.close();
-                out.write(bytes.toByteArray());
+            final ProcessBuilder processBuilder = new ProcessBuilder(launcher.args())
+                    .redirectErrorStream(true)
+                    .inheritIO()
+                    .directory(workingDir == null ? buildDir : workingDir);
+            if (!environmentVariables.isEmpty()) {
+                processBuilder.environment().putAll(environmentVariables);
             }
+            process = processBuilder.start();
 
-            outputDirectory.mkdirs();
-            // if the --enable-preview flag was set, then we need to enable it when launching dev mode as well
-            if (devModeContext.isEnablePreview()) {
-                args.add(DevModeContext.ENABLE_PREVIEW_FLAG);
-            }
+            //https://github.com/quarkusio/quarkus/issues/232
+            Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    process.destroy();
+                    try {
+                        process.waitFor();
+                    } catch (InterruptedException ignored) {
+                        getLog().warn("Unable to properly wait for dev-mode end", ignored);
+                    }
+                }
+            }, "Development Mode Shutdown Hook"));
+        }
 
-            propagateUserProperties();
+        void stop() throws InterruptedException {
+            process.destroy();
+            process.waitFor();
+        }
+    }
 
-            args.add("-jar");
-            args.add(tempFile.getAbsolutePath());
-            if (argsString != null) {
-                args.addAll(Arrays.asList(CommandLineUtils.translateCommandline(argsString)));
+    private QuarkusDevModeLauncher newLauncher() throws Exception {
+        String java = null;
+        // See if a toolchain is configured
+        if (toolchainManager != null) {
+            Toolchain toolchain = toolchainManager.getToolchainFromBuildContext("jdk", session);
+            if (toolchain != null) {
+                java = toolchain.findTool("java");
+                getLog().info("JVM from toolchain: " + java);
             }
         }
 
-        private void propagateUserProperties() {
-            final String mavenCmdLine = BootstrapMavenOptions.getMavenCmdLine();
-            if (mavenCmdLine == null || mavenCmdLine.isEmpty()) {
-                return;
-            }
-            int i = mavenCmdLine.indexOf("-D");
-            if (i < 0) {
-                return;
-            }
-            final StringBuilder buf = new StringBuilder();
-            buf.append("-D");
-            i += 2;
-            while (i < mavenCmdLine.length()) {
-                final char ch = mavenCmdLine.charAt(i++);
-                if (!Character.isWhitespace(ch)) {
-                    buf.append(ch);
-                } else if (buf.length() > 2) {
-                    args.add(buf.toString());
-                    buf.setLength(2);
-                    i = mavenCmdLine.indexOf("-D", i);
-                    if (i < 0) {
-                        break;
-                    }
-                    i += 2;
+        final MavenDevModeLauncher.Builder builder = MavenDevModeLauncher.builder(java, getLog())
+                .preventnoverify(preventnoverify)
+                .buildDir(buildDir)
+                .outputDir(outputDirectory)
+                .suspend(suspend)
+                .debug(debug)
+                .debugHost(debugHost)
+                .debugPortOk(debugPortOk)
+                .deleteDevJar(deleteDevJar);
+
+        setJvmArgs(builder);
+
+        builder.projectDir(project.getFile().getParentFile());
+        builder.buildSystemProperties((Map) project.getProperties());
+
+        builder.applicationName(project.getArtifactId());
+        builder.applicationVersion(project.getVersion());
+
+        builder.sourceEncoding(getSourceEncoding());
+
+        // Set compilation flags.  Try the explicitly given configuration first.  Otherwise,
+        // refer to the configuration of the Maven Compiler Plugin.
+        final Optional<Xpp3Dom> compilerPluginConfiguration = findCompilerPluginConfiguration();
+        if (compilerArgs != null) {
+            builder.compilerOptions(compilerArgs);
+        } else if (compilerPluginConfiguration.isPresent()) {
+            final Xpp3Dom compilerPluginArgsConfiguration = compilerPluginConfiguration.get().getChild("compilerArgs");
+            if (compilerPluginArgsConfiguration != null) {
+                List<String> compilerPluginArgs = new ArrayList<>();
+                for (Xpp3Dom argConfiguration : compilerPluginArgsConfiguration.getChildren()) {
+                    compilerPluginArgs.add(argConfiguration.getValue());
                 }
-            }
-            if (buf.length() > 2) {
-                args.add(buf.toString());
+                // compilerArgs can also take a value without using arg
+                if (compilerPluginArgsConfiguration.getValue() != null
+                        && !compilerPluginArgsConfiguration.getValue().isEmpty()) {
+                    compilerPluginArgs.add(compilerPluginArgsConfiguration.getValue().trim());
+                }
+                builder.compilerOptions(compilerPluginArgs);
             }
         }
-
-        private void addQuarkusDevModeDeps(StringBuilder classPathManifest)
-                throws MojoExecutionException, DependencyResolutionException {
-            final String pomPropsPath = "META-INF/maven/io.quarkus/quarkus-core-deployment/pom.properties";
-            final InputStream devModePomPropsIs = DevModeMain.class.getClassLoader().getResourceAsStream(pomPropsPath);
-            if (devModePomPropsIs == null) {
-                throw new MojoExecutionException("Failed to locate " + pomPropsPath + " on the classpath");
-            }
-            final Properties devModeProps = new Properties();
-            try (InputStream is = devModePomPropsIs) {
-                devModeProps.load(is);
-            } catch (IOException e) {
-                throw new MojoExecutionException("Failed to load " + pomPropsPath + " from the classpath", e);
-            }
-            final String devModeGroupId = devModeProps.getProperty("groupId");
-            if (devModeGroupId == null) {
-                throw new MojoExecutionException("Classpath resource " + pomPropsPath + " is missing groupId");
-            }
-            final String devModeArtifactId = devModeProps.getProperty("artifactId");
-            if (devModeArtifactId == null) {
-                throw new MojoExecutionException("Classpath resource " + pomPropsPath + " is missing artifactId");
-            }
-            final String devModeVersion = devModeProps.getProperty("version");
-            if (devModeVersion == null) {
-                throw new MojoExecutionException("Classpath resource " + pomPropsPath + " is missing version");
-            }
-
-            final DefaultArtifact devModeJar = new DefaultArtifact(devModeGroupId, devModeArtifactId, "jar", devModeVersion);
-            final DependencyResult cpRes = repoSystem.resolveDependencies(repoSession,
-                    new DependencyRequest()
-                            .setCollectRequest(
-                                    new CollectRequest()
-                                            .setRoot(new org.eclipse.aether.graph.Dependency(devModeJar, JavaScopes.RUNTIME))
-                                            .setRepositories(repos)));
-
-            for (ArtifactResult appDep : cpRes.getArtifactResults()) {
-                //we only use the launcher for launching from the IDE, we need to exclude it
-                if (!(appDep.getArtifact().getGroupId().equals("io.quarkus")
-                        && appDep.getArtifact().getArtifactId().equals("quarkus-ide-launcher"))) {
-                    addToClassPaths(classPathManifest, appDep.getArtifact().getFile());
-                }
+        if (source != null) {
+            builder.sourceJavaVersion(source);
+        } else if (compilerPluginConfiguration.isPresent()) {
+            final Xpp3Dom javacSourceVersion = compilerPluginConfiguration.get().getChild("source");
+            if (javacSourceVersion != null && javacSourceVersion.getValue() != null
+                    && !javacSourceVersion.getValue().trim().isEmpty()) {
+                builder.sourceJavaVersion(javacSourceVersion.getValue().trim());
             }
         }
-
-        private void setKotlinSpecificFlags(DevModeContext devModeContext) {
-            Plugin kotlinMavenPlugin = null;
-            for (Plugin plugin : project.getBuildPlugins()) {
-                if (plugin.getKey().equals(KOTLIN_MAVEN_PLUGIN_GA)) {
-                    kotlinMavenPlugin = plugin;
-                    break;
-                }
+        if (target != null) {
+            builder.targetJavaVersion(target);
+        } else if (compilerPluginConfiguration.isPresent()) {
+            final Xpp3Dom javacTargetVersion = compilerPluginConfiguration.get().getChild("target");
+            if (javacTargetVersion != null && javacTargetVersion.getValue() != null
+                    && !javacTargetVersion.getValue().trim().isEmpty()) {
+                builder.targetJavaVersion(javacTargetVersion.getValue().trim());
             }
+        }
 
-            if (kotlinMavenPlugin == null) {
-                return;
+        setKotlinSpecificFlags(builder);
+        if (noDeps) {
+            final LocalProject localProject = LocalProject.load(project.getModel().getPomFile().toPath());
+            addProject(builder, localProject, true);
+            builder.watchedBuildFile(localProject.getRawModel().getPomFile().toPath());
+            builder.localArtifact(new AppArtifactKey(localProject.getGroupId(), localProject.getArtifactId(), null, "jar"));
+        } else {
+            final LocalProject localProject = LocalProject.loadWorkspace(project.getModel().getPomFile().toPath());
+            for (LocalProject project : DependenciesFilter.filterNotReloadableDependencies(localProject,
+                    this.project.getArtifacts(), repoSystem, repoSession, repos)) {
+                addProject(builder, project, project == localProject);
+                builder.watchedBuildFile(project.getRawModel().getPomFile().toPath());
+                builder.localArtifact(new AppArtifactKey(project.getGroupId(), project.getArtifactId(), null, "jar"));
             }
+        }
 
-            getLog().debug("Kotlin Maven plugin detected");
-
-            List<String> compilerPluginArtifacts = new ArrayList<>();
-            List<Dependency> dependencies = kotlinMavenPlugin.getDependencies();
-            for (Dependency dependency : dependencies) {
-                try {
-                    ArtifactResult resolvedArtifact = repoSystem.resolveArtifact(repoSession,
-                            new ArtifactRequest()
-                                    .setArtifact(new DefaultArtifact(dependency.getGroupId(), dependency.getArtifactId(),
-                                            dependency.getClassifier(), dependency.getType(), dependency.getVersion()))
-                                    .setRepositories(repos));
-
-                    compilerPluginArtifacts.add(resolvedArtifact.getArtifact().getFile().toPath().toAbsolutePath().toString());
-                } catch (ArtifactResolutionException e) {
-                    getLog().warn("Unable to properly setup dev-mode for Kotlin", e);
-                    return;
-                }
-            }
-            devModeContext.setCompilerPluginArtifacts(compilerPluginArtifacts);
+        addQuarkusDevModeDeps(builder);
+
+        //in most cases these are not used, however they need to be present for some
+        //parent-first cases such as logging
+        //first we go through and get all the parent first artifacts
+        Set<AppArtifactKey> parentFirstArtifacts = new HashSet<>();
+        for (Artifact appDep : project.getArtifacts()) {
+            if (appDep.getArtifactHandler().getExtension().equals("jar") && appDep.getFile().isFile()) {
+                try (ZipFile file = new ZipFile(appDep.getFile())) {
+                    ZipEntry entry = file.getEntry(EXT_PROPERTIES_PATH);
+                    if (entry != null) {
+                        Properties p = new Properties();
+                        try (InputStream inputStream = file.getInputStream(entry)) {
+                            p.load(inputStream);
+                            String parentFirst = p.getProperty(AppModel.PARENT_FIRST_ARTIFACTS);
+                            if (parentFirst != null) {
+                                String[] artifacts = parentFirst.split(",");
+                                for (String artifact : artifacts) {
+                                    parentFirstArtifacts.add(new AppArtifactKey(artifact.split(":")));
+                                }
+                            }
+                        }
 
-            List<String> options = new ArrayList<>();
-            Xpp3Dom compilerPluginConfiguration = (Xpp3Dom) kotlinMavenPlugin.getConfiguration();
-            if (compilerPluginConfiguration != null) {
-                Xpp3Dom compilerPluginArgsConfiguration = compilerPluginConfiguration.getChild("pluginOptions");
-                if (compilerPluginArgsConfiguration != null) {
-                    for (Xpp3Dom argConfiguration : compilerPluginArgsConfiguration.getChildren()) {
-                        options.add(argConfiguration.getValue());
                     }
                 }
             }
-            devModeContext.setCompilerPluginsOptions(options);
         }
-
-        public Set<Path> getPomFiles() {
-            return pomFiles;
-        }
-
-        public void run() throws Exception {
-            // Display the launch command line in dev mode
-            if (getLog().isDebugEnabled()) {
-                getLog().debug("Launching JVM with command line: " + String.join(" ", args));
+        for (Artifact appDep : project.getArtifacts()) {
+            // only add the artifact if it's present in the dev mode context
+            // we need this to avoid having jars on the classpath multiple times
+            AppArtifactKey key = new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(),
+                    appDep.getClassifier(), appDep.getArtifactHandler().getExtension());
+            if (!builder.isLocal(key) && parentFirstArtifacts.contains(key)) {
+                builder.classpathEntry(appDep.getFile());
             }
-            process = new ProcessBuilder(args)
-                    .inheritIO()
-                    .directory(workingDir)
-                    .start();
-            //https://github.com/quarkusio/quarkus/issues/232
-            Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    process.destroy();
-                }
-            }, "Development Mode Shutdown Hook"));
         }
 
-        public void stop() throws InterruptedException {
-            process.destroy();
-            process.waitFor();
+        builder.baseName(project.getBuild().getFinalName());
+
+        modifyDevModeContext(builder);
+
+        if (argsString != null) {
+            builder.applicationArgs(argsString);
         }
+        propagateUserProperties(builder);
 
+        return builder.build();
     }
 
-    protected void modifyDevModeContext(DevModeContext devModeContext) {
+    private void setJvmArgs(Builder builder) throws Exception {
+        String jvmArgs = this.jvmArgs;
+        if (!systemProperties.isEmpty()) {
+            final StringBuilder buf = new StringBuilder();
+            if (jvmArgs != null) {
+                buf.append(jvmArgs);
+            }
+            for (Map.Entry<String, String> prop : systemProperties.entrySet()) {
+                buf.append(" -D").append(prop.getKey()).append("=\"").append(prop.getValue()).append("\"");
+            }
+            jvmArgs = buf.toString();
+        }
+        if (jvmArgs != null) {
+            builder.jvmArgs(Arrays.asList(CommandLineUtils.translateCommandline(jvmArgs)));
+        }
 
     }
 
-    private List<LocalProject> filterExtensionDependencies(LocalProject localProject) {
-        final LocalWorkspace workspace = localProject.getWorkspace();
-        if (workspace == null) {
-            return Collections.singletonList(localProject);
+    private void propagateUserProperties(MavenDevModeLauncher.Builder builder) {
+        Properties userProps = BootstrapMavenOptions.newInstance().getSystemProperties();
+        if (userProps == null) {
+            return;
+        }
+        final StringBuilder buf = new StringBuilder();
+        buf.append("-D");
+        for (Object o : userProps.keySet()) {
+            String name = o.toString();
+            final String value = userProps.getProperty(name);
+            buf.setLength(2);
+            buf.append(name);
+            if (value != null && !value.isEmpty()) {
+                buf.append('=');
+                buf.append(value);
+            }
+            builder.jvmArgs(buf.toString());
         }
+    }
 
-        List<LocalProject> ret = new ArrayList<>();
-        Set<AppArtifactKey> extensionsAndDeps = new HashSet<>();
+    private void addQuarkusDevModeDeps(MavenDevModeLauncher.Builder builder)
+            throws MojoExecutionException, DependencyResolutionException {
+        final String pomPropsPath = "META-INF/maven/io.quarkus/quarkus-core-deployment/pom.properties";
+        final InputStream devModePomPropsIs = DevModeMain.class.getClassLoader().getResourceAsStream(pomPropsPath);
+        if (devModePomPropsIs == null) {
+            throw new MojoExecutionException("Failed to locate " + pomPropsPath + " on the classpath");
+        }
+        final Properties devModeProps = new Properties();
+        try (InputStream is = devModePomPropsIs) {
+            devModeProps.load(is);
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to load " + pomPropsPath + " from the classpath", e);
+        }
+        final String devModeGroupId = devModeProps.getProperty("groupId");
+        if (devModeGroupId == null) {
+            throw new MojoExecutionException("Classpath resource " + pomPropsPath + " is missing groupId");
+        }
+        final String devModeArtifactId = devModeProps.getProperty("artifactId");
+        if (devModeArtifactId == null) {
+            throw new MojoExecutionException("Classpath resource " + pomPropsPath + " is missing artifactId");
+        }
+        final String devModeVersion = devModeProps.getProperty("version");
+        if (devModeVersion == null) {
+            throw new MojoExecutionException("Classpath resource " + pomPropsPath + " is missing version");
+        }
 
-        ret.add(localProject);
-        for (Artifact a : project.getArtifacts()) {
-            final AppArtifactKey depKey = new AppArtifactKey(a.getGroupId(), a.getArtifactId());
-            final LocalProject project = workspace.getProject(depKey);
-            if (project == null) {
-                continue;
-            }
-            if (!project.getVersion().equals(a.getVersion())) {
-                getLog().warn(depKey + " is excluded from live coding since the application depends on version "
-                        + a.getVersion() + " while the version present in the workspace is " + project.getVersion());
-                continue;
+        final DefaultArtifact devModeJar = new DefaultArtifact(devModeGroupId, devModeArtifactId, "jar", devModeVersion);
+        final DependencyResult cpRes = repoSystem.resolveDependencies(repoSession,
+                new DependencyRequest()
+                        .setCollectRequest(
+                                new CollectRequest()
+                                        .setRoot(new org.eclipse.aether.graph.Dependency(devModeJar, JavaScopes.RUNTIME))
+                                        .setRepositories(repos)));
+
+        for (ArtifactResult appDep : cpRes.getArtifactResults()) {
+            //we only use the launcher for launching from the IDE, we need to exclude it
+            if (!(appDep.getArtifact().getGroupId().equals("io.quarkus")
+                    && appDep.getArtifact().getArtifactId().equals("quarkus-ide-launcher"))) {
+                if (appDep.getArtifact().getGroupId().equals("io.quarkus")
+                        && appDep.getArtifact().getArtifactId().equals("quarkus-class-change-agent")) {
+                    builder.jvmArgs("-javaagent:" + appDep.getArtifact().getFile().getAbsolutePath());
+                } else {
+                    builder.classpathEntry(appDep.getArtifact().getFile());
+                }
             }
-            if (project.getClassesDir() != null &&
-            //if this project also contains Quarkus extensions we do no want to include these in the discovery
-            //a bit of an edge case, but if you try and include a sample project with your extension you will
-            //run into problems without this
-                    (Files.exists(project.getClassesDir().resolve("META-INF/quarkus-extension.properties")) ||
-                            Files.exists(project.getClassesDir().resolve("META-INF/quarkus-build-steps.list")))) {
-                // TODO add the deployment deps
-                extensionDepWarning(depKey);
-                try {
-                    final DependencyNode depRoot = repoSystem.collectDependencies(repoSession, new CollectRequest()
-                            .setRoot(new org.eclipse.aether.graph.Dependency(
-                                    new DefaultArtifact(a.getGroupId(), a.getArtifactId(),
-                                            a.getClassifier(), a.getArtifactHandler().getExtension(), a.getVersion()),
-                                    JavaScopes.RUNTIME))
-                            .setRepositories(repos)).getRoot();
-                    depRoot.accept(new DependencyVisitor() {
-                        @Override
-                        public boolean visitEnter(DependencyNode node) {
-                            final org.eclipse.aether.artifact.Artifact artifact = node.getArtifact();
-                            if ("jar".equals(artifact.getExtension())) {
-                                extensionsAndDeps.add(new AppArtifactKey(artifact.getGroupId(), artifact.getArtifactId()));
-                            }
-                            return true;
-                        }
+        }
+    }
 
-                        @Override
-                        public boolean visitLeave(DependencyNode node) {
-                            return true;
-                        }
-                    });
-                } catch (DependencyCollectionException e) {
-                    throw new RuntimeException("Failed to collect dependencies for " + a, e);
-                }
-            } else {
-                ret.add(project);
+    private void setKotlinSpecificFlags(MavenDevModeLauncher.Builder builder) {
+        Plugin kotlinMavenPlugin = null;
+        for (Plugin plugin : project.getBuildPlugins()) {
+            if (plugin.getKey().equals(KOTLIN_MAVEN_PLUGIN_GA)) {
+                kotlinMavenPlugin = plugin;
+                break;
             }
         }
 
-        if (extensionsAndDeps.isEmpty()) {
-            return ret;
+        if (kotlinMavenPlugin == null) {
+            return;
         }
 
-        Iterator<LocalProject> iterator = ret.iterator();
-        while (iterator.hasNext()) {
-            final LocalProject localDep = iterator.next();
-            if (extensionsAndDeps.contains(localDep.getKey())) {
-                extensionDepWarning(localDep.getKey());
-                iterator.remove();
+        getLog().debug("Kotlin Maven plugin detected");
+
+        List<String> compilerPluginArtifacts = new ArrayList<>();
+        List<Dependency> dependencies = kotlinMavenPlugin.getDependencies();
+        for (Dependency dependency : dependencies) {
+            try {
+                ArtifactResult resolvedArtifact = repoSystem.resolveArtifact(repoSession,
+                        new ArtifactRequest()
+                                .setArtifact(new DefaultArtifact(dependency.getGroupId(), dependency.getArtifactId(),
+                                        dependency.getClassifier(), dependency.getType(), dependency.getVersion()))
+                                .setRepositories(repos));
+
+                compilerPluginArtifacts.add(resolvedArtifact.getArtifact().getFile().toPath().toAbsolutePath().toString());
+            } catch (ArtifactResolutionException e) {
+                getLog().warn("Unable to properly setup dev-mode for Kotlin", e);
+                return;
             }
         }
-        return ret;
+        builder.compilerPluginArtifacts(compilerPluginArtifacts);
+
+        List<String> options = new ArrayList<>();
+        Xpp3Dom compilerPluginConfiguration = (Xpp3Dom) kotlinMavenPlugin.getConfiguration();
+        if (compilerPluginConfiguration != null) {
+            Xpp3Dom compilerPluginArgsConfiguration = compilerPluginConfiguration.getChild("pluginOptions");
+            if (compilerPluginArgsConfiguration != null) {
+                for (Xpp3Dom argConfiguration : compilerPluginArgsConfiguration.getChildren()) {
+                    options.add(argConfiguration.getValue());
+                }
+            }
+        }
+        builder.compilerPluginOptions(options);
     }
 
-    private void extensionDepWarning(AppArtifactKey key) {
-        getLog().warn("Local Quarkus extension dependency " + key + " will not be hot-reloadable");
+    protected void modifyDevModeContext(MavenDevModeLauncher.Builder builder) {
+
     }
 
     private Optional<Xpp3Dom> findCompilerPluginConfiguration() {
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/GenerateCodeMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/GenerateCodeMojo.java
new file mode 100644
index 0000000000000..cb7bd5159d0da
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/GenerateCodeMojo.java
@@ -0,0 +1,84 @@
+package io.quarkus.maven;
+
+import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.bootstrap.model.AppModel;
+
+@Mojo(name = "generate-code", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
+public class GenerateCodeMojo extends QuarkusBootstrapMojo {
+
+    /**
+     * Skip the execution of this mojo
+     */
+    @Parameter(defaultValue = "false", property = "quarkus.generate-code.skip", alias = "quarkus.prepare.skip")
+    private boolean skipSourceGeneration = false;
+
+    @Override
+    protected boolean beforeExecute() throws MojoExecutionException, MojoFailureException {
+        if (mavenProject().getPackaging().equals("pom")) {
+            getLog().info("Type of the artifact is POM, skipping build goal");
+            return false;
+        }
+        if (skipSourceGeneration) {
+            getLog().info("Skipping Quarkus code generation");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    protected void doExecute() throws MojoExecutionException, MojoFailureException {
+        String projectDir = mavenProject().getBasedir().getAbsolutePath();
+        Path sourcesDir = Paths.get(projectDir, "src", "main");
+        generateCode(sourcesDir, path -> mavenProject().addCompileSourceRoot(path.toString()), false);
+    }
+
+    void generateCode(Path sourcesDir,
+            Consumer<Path> sourceRegistrar,
+            boolean test) throws MojoFailureException, MojoExecutionException {
+
+        ClassLoader originalTccl = Thread.currentThread().getContextClassLoader();
+        try {
+
+            final CuratedApplication curatedApplication = bootstrapApplication();
+
+            QuarkusClassLoader deploymentClassLoader = curatedApplication.createDeploymentClassLoader();
+            Thread.currentThread().setContextClassLoader(deploymentClassLoader);
+
+            final Class<?> codeGenerator = deploymentClassLoader.loadClass("io.quarkus.deployment.CodeGenerator");
+            final Method initAndRun = codeGenerator.getMethod("initAndRun", ClassLoader.class, Set.class, Path.class,
+                    Path.class,
+                    Consumer.class, AppModel.class, Map.class);
+            initAndRun.invoke(null, deploymentClassLoader,
+                    Collections.singleton(sourcesDir),
+                    generatedSourcesDir(test),
+                    buildDir().toPath(),
+                    sourceRegistrar,
+                    curatedApplication.getAppModel(),
+                    mavenProject().getProperties());
+        } catch (Exception any) {
+            throw new MojoExecutionException("Quarkus code generation phase has failed", any);
+        } finally {
+            Thread.currentThread().setContextClassLoader(originalTccl);
+        }
+    }
+
+    private Path generatedSourcesDir(boolean test) {
+        return test ? buildDir().toPath().resolve("generated-test-sources") : buildDir().toPath().resolve("generated-sources");
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/GenerateCodeTestsMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/GenerateCodeTestsMojo.java
new file mode 100644
index 0000000000000..348e9299f2e20
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/GenerateCodeTestsMojo.java
@@ -0,0 +1,20 @@
+package io.quarkus.maven;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Mojo(name = "generate-code-tests", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
+public class GenerateCodeTestsMojo extends GenerateCodeMojo {
+    @Override
+    protected void doExecute() throws MojoExecutionException, MojoFailureException {
+        String projectDir = mavenProject().getBasedir().getAbsolutePath();
+        Path testSources = Paths.get(projectDir, "src", "test");
+        generateCode(testSources, path -> mavenProject().addTestCompileSourceRoot(path.toString()), true);
+    }
+}
\ No newline at end of file
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/GenerateConfigMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/GenerateConfigMojo.java
index 376b11989d4c1..cadf0c0b1e755 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/GenerateConfigMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/GenerateConfigMojo.java
@@ -12,6 +12,7 @@
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -21,6 +22,7 @@
 import org.apache.maven.project.MavenProjectHelper;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 
 import io.quarkus.bootstrap.app.CuratedApplication;
@@ -30,7 +32,7 @@
 import io.quarkus.runner.bootstrap.GenerateConfigTask;
 
 /**
- * Generates an example application-config.properties, with all properties commented out
+ * Generates an example application.properties, with all properties commented out.
  *
  * If this is already present then it will be appended too, although only properties that were not already present
  *
@@ -47,6 +49,9 @@ public class GenerateConfigMojo extends AbstractMojo {
     @Component
     private RepositorySystem repoSystem;
 
+    @Component
+    private RemoteRepositoryManager remoteRepoManager;
+
     @Component
     private MavenProjectHelper projectHelper;
 
@@ -86,10 +91,6 @@ public class GenerateConfigMojo extends AbstractMojo {
     @Parameter(defaultValue = "${file}")
     private String file;
 
-    public GenerateConfigMojo() {
-        MojoLogger.logSupplier = this::getLog;
-    }
-
     @Override
     public void execute() throws MojoExecutionException {
 
@@ -120,6 +121,7 @@ public void execute() throws MojoExecutionException {
                     .setRepositorySystem(repoSystem)
                     .setRepositorySystemSession(repoSession)
                     .setRemoteRepositories(repos)
+                    .setRemoteRepositoryManager(remoteRepoManager)
                     .build();
 
             final Artifact projectArtifact = project.getArtifact();
@@ -152,4 +154,10 @@ public void execute() throws MojoExecutionException {
             throw new MojoExecutionException("Failed to generate config file", e);
         }
     }
+
+    @Override
+    public void setLog(Log log) {
+        super.setLog(log);
+        MojoLogger.delegate = log;
+    }
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java
index d129f98302cc8..8ab5df047dc3c 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/ListExtensionsMojo.java
@@ -1,16 +1,12 @@
 package io.quarkus.maven;
 
-import java.net.URL;
-import java.util.List;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
 import io.quarkus.devtools.commands.ListExtensions;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.tools.MessageWriter;
-import io.quarkus.registry.DefaultExtensionRegistry;
 
 /**
  * List the available extensions.
@@ -41,10 +37,10 @@ public class ListExtensionsMojo extends QuarkusProjectMojoBase {
     protected String searchPattern;
 
     /**
-     * The extension registry URLs
+     * List the already installed extensions
      */
-    @Parameter(property = "registry", alias = "quarkus.extension.registry")
-    List<URL> registries;
+    @Parameter(property = "installed", defaultValue = "false")
+    protected boolean installed;
 
     @Override
     public void doExecute(final QuarkusProject quarkusProject, final MessageWriter log) throws MojoExecutionException {
@@ -52,10 +48,8 @@ public void doExecute(final QuarkusProject quarkusProject, final MessageWriter l
             ListExtensions listExtensions = new ListExtensions(quarkusProject)
                     .all(all)
                     .format(format)
-                    .search(searchPattern);
-            if (registries != null && !registries.isEmpty()) {
-                listExtensions.extensionRegistry(DefaultExtensionRegistry.fromURLs(registries));
-            }
+                    .search(searchPattern)
+                    .installed(installed);
             listExtensions.execute();
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to list extensions", e);
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/ListPlatformsMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/ListPlatformsMojo.java
new file mode 100644
index 0000000000000..8a75f1bcc1a75
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/ListPlatformsMojo.java
@@ -0,0 +1,43 @@
+package io.quarkus.maven;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+import io.quarkus.devtools.commands.ListPlatforms;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.registry.Constants;
+
+/**
+ * List imported and optionally other platforms available for the project.
+ */
+@Mojo(name = "list-platforms", requiresProject = false)
+public class ListPlatformsMojo extends QuarkusProjectMojoBase {
+
+    /**
+     * List the already installed extensions
+     */
+    @Parameter(property = "installed", defaultValue = "false")
+    protected boolean installed;
+
+    @Override
+    public void doExecute(final QuarkusProject quarkusProject, final MessageWriter log) throws MojoExecutionException {
+        if (installed) {
+            getImportedPlatforms().forEach(coords -> {
+                final StringBuilder buf = new StringBuilder();
+                buf.append(coords.getGroupId()).append(":")
+                        .append(coords.getArtifactId().substring(0,
+                                coords.getArtifactId().length() - Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX.length()))
+                        .append("::pom:").append(coords.getVersion());
+                log.info(buf.toString());
+            });
+            return;
+        }
+        try {
+            new ListPlatforms(quarkusProject).execute();
+        } catch (Exception e) {
+            throw new MojoExecutionException("Failed to list platforms", e);
+        }
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/ListUpdatesMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/ListUpdatesMojo.java
new file mode 100644
index 0000000000000..eee1e9f479c49
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/ListUpdatesMojo.java
@@ -0,0 +1,93 @@
+package io.quarkus.maven;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.registry.Constants;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
+
+/**
+ * List updates available for the project
+ */
+@Mojo(name = "list-updates", requiresProject = false)
+public class ListUpdatesMojo extends QuarkusProjectMojoBase {
+
+    /**
+     * List the already installed extensions
+     */
+    @Parameter(property = "installed", defaultValue = "false")
+    protected boolean installed;
+
+    @Override
+    public void doExecute(final QuarkusProject quarkusProject, final MessageWriter log) throws MojoExecutionException {
+
+        final PlatformCatalog catalog;
+        try {
+            catalog = getExtensionCatalogResolver().resolvePlatformCatalog();
+        } catch (RegistryResolutionException e) {
+            throw new MojoExecutionException("Failed to resolve the Quarkus platform catalog", e);
+        }
+        final List<Platform> platforms = catalog == null ? Collections.emptyList() : catalog.getPlatforms();
+        if (platforms.isEmpty()) {
+            return;
+        }
+        List<ArtifactCoords> latestList = new ArrayList<>(platforms.size());
+        for (Platform p : platforms) {
+            final ArtifactCoords bom = p.getBom();
+            latestList.add(bom);
+        }
+
+        final List<ArtifactCoords> platformJsons = getImportedPlatforms();
+        final List<ArtifactCoords> importedPlatformBoms = new ArrayList<>(platformJsons.size());
+        for (ArtifactCoords descriptor : platformJsons) {
+            final ArtifactCoords importedBom = new ArtifactCoords(descriptor.getGroupId(),
+                    descriptor.getArtifactId().substring(0,
+                            descriptor.getArtifactId().length() - Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX.length()),
+                    null, "pom", descriptor.getVersion());
+            if (!latestList.remove(importedBom)) {
+                importedPlatformBoms.add(importedBom);
+            }
+        }
+
+        final Map<ArtifactKey, String> latest = new HashMap<>(platforms.size());
+        for (ArtifactCoords latestBom : latestList) {
+            latest.put(latestBom.getKey(), latestBom.getVersion());
+        }
+
+        log.info("Available Quarkus platform updates:");
+        final StringBuilder buf = new StringBuilder(0);
+        for (ArtifactCoords importedBom : importedPlatformBoms) {
+            final ArtifactKey key = importedBom.getKey();
+            final String update = latest.get(key);
+            if (update == null || importedBom.getVersion().equals(update)) {
+                continue;
+            }
+            buf.setLength(0);
+            buf.append(key.getGroupId()).append(':').append(key.getArtifactId());
+            for (int i = buf.length(); i < 45; ++i) {
+                buf.append(' ');
+            }
+            buf.append(importedBom.getVersion());
+            for (int i = buf.length(); i < 60; ++i) {
+                buf.append(' ');
+            }
+            buf.append(" -> ").append(update);
+            log.info(buf.toString());
+        }
+
+        if (buf.length() == 0) {
+            log.info("No updates yet, ping @gsmet");
+        }
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/MavenDevModeLauncher.java b/devtools/maven/src/main/java/io/quarkus/maven/MavenDevModeLauncher.java
new file mode 100644
index 0000000000000..d50eb108099b8
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/MavenDevModeLauncher.java
@@ -0,0 +1,52 @@
+package io.quarkus.maven;
+
+import org.apache.maven.plugin.logging.Log;
+
+import io.quarkus.deployment.dev.QuarkusDevModeLauncher;
+
+public class MavenDevModeLauncher extends QuarkusDevModeLauncher {
+
+    /**
+     * Initializes the launcher builder
+     *
+     * @param java path to the java, may be null
+     * @param log the logger
+     * @return launcher builder
+     */
+    public static Builder builder(String java, Log log) {
+        return new MavenDevModeLauncher(log).new Builder(java);
+    }
+
+    public class Builder extends QuarkusDevModeLauncher.Builder<MavenDevModeLauncher, Builder> {
+
+        private Builder(String java) {
+            super(java);
+        }
+    }
+
+    private final Log log;
+
+    private MavenDevModeLauncher(Log log) {
+        this.log = log;
+    }
+
+    @Override
+    protected boolean isDebugEnabled() {
+        return log.isDebugEnabled();
+    }
+
+    @Override
+    protected void debug(Object msg) {
+        log.error(msg == null ? "null" : msg.toString());
+    }
+
+    @Override
+    protected void error(Object msg) {
+        log.error(msg == null ? "null" : msg.toString());
+    }
+
+    @Override
+    protected void warn(Object msg) {
+        log.warn(msg == null ? "null" : msg.toString());
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/MavenProjectBuildFile.java b/devtools/maven/src/main/java/io/quarkus/maven/MavenProjectBuildFile.java
new file mode 100644
index 0000000000000..baa4d52148c5d
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/MavenProjectBuildFile.java
@@ -0,0 +1,198 @@
+package io.quarkus.maven;
+
+import static io.quarkus.devtools.project.extensions.Extensions.toKey;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Model;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.buildfile.BuildFile;
+import io.quarkus.maven.utilities.MojoUtils;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class MavenProjectBuildFile extends BuildFile {
+
+    private static final Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{(.+)}");
+
+    private Supplier<Model> modelSupplier;
+    private Supplier<List<org.eclipse.aether.graph.Dependency>> projectDepsSupplier;
+    private Supplier<List<org.eclipse.aether.graph.Dependency>> projectManagedDepsSupplier;
+    private Properties projectProps;
+    protected List<AppArtifactCoords> dependencies;
+    protected List<AppArtifactCoords> managedDependencies;
+    protected Model model;
+
+    public MavenProjectBuildFile(Path projectDirPath, ExtensionCatalog extensionsCatalog, Supplier<Model> model,
+            Supplier<List<org.eclipse.aether.graph.Dependency>> projectDeps,
+            Supplier<List<org.eclipse.aether.graph.Dependency>> projectManagedDeps,
+            Properties projectProps) {
+        super(projectDirPath, extensionsCatalog);
+        this.modelSupplier = model;
+        this.projectDepsSupplier = projectDeps;
+        this.projectManagedDepsSupplier = projectManagedDeps;
+        this.projectProps = projectProps;
+    }
+
+    @Override
+    public BuildTool getBuildTool() {
+        return BuildTool.MAVEN;
+    }
+
+    @Override
+    protected boolean addDependency(AppArtifactCoords coords, boolean managed) {
+        final Dependency d = new Dependency();
+        d.setGroupId(coords.getGroupId());
+        d.setArtifactId(coords.getArtifactId());
+        if (!managed) {
+            d.setVersion(coords.getVersion());
+        }
+        // When classifier is empty, you get  <classifier></classifier> in the pom.xml
+        if (coords.getClassifier() != null && !coords.getClassifier().isEmpty()) {
+            d.setClassifier(coords.getClassifier());
+        }
+        d.setType(coords.getType());
+        if ("pom".equalsIgnoreCase(coords.getType())) {
+            d.setScope("import");
+            DependencyManagement dependencyManagement = model().getDependencyManagement();
+            if (dependencyManagement == null) {
+                dependencyManagement = new DependencyManagement();
+                model().setDependencyManagement(dependencyManagement);
+            }
+            if (dependencyManagement.getDependencies()
+                    .stream()
+                    .noneMatch(thisDep -> d.getManagementKey().equals(resolveKey(thisDep)))) {
+                dependencyManagement.addDependency(d);
+                // the effective managed dependencies set may already include it
+                if (!getManagedDependencies().contains(coords)) {
+                    getManagedDependencies().add(coords);
+                }
+                return true;
+            }
+        } else if (model().getDependencies()
+                .stream()
+                .noneMatch(thisDep -> d.getManagementKey().equals(thisDep.getManagementKey()))) {
+            model().addDependency(d);
+            // it could still be a transitive dependency or inherited from the parent
+            if (!getDependencies().contains(coords)) {
+                getDependencies().add(coords);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void removeDependency(AppArtifactKey key) throws IOException {
+        if (model() != null) {
+            final Iterator<AppArtifactCoords> i = getDependencies().iterator();
+            while (i.hasNext()) {
+                final AppArtifactCoords a = i.next();
+                if (a.getKey().equals(key)) {
+                    i.remove();
+                    break;
+                }
+                model().getDependencies().removeIf(d -> Objects.equals(toKey(d), key));
+            }
+        }
+    }
+
+    @Override
+    protected List<AppArtifactCoords> getDependencies() {
+        if (dependencies == null) {
+            final List<org.eclipse.aether.graph.Dependency> projectDeps = projectDepsSupplier.get();
+            projectDepsSupplier = null;
+            dependencies = new ArrayList<>(projectDeps.size());
+            for (org.eclipse.aether.graph.Dependency dep : projectDeps) {
+                org.eclipse.aether.artifact.Artifact a = dep.getArtifact();
+                dependencies.add(new AppArtifactCoords(a.getGroupId(), a.getArtifactId(), a.getClassifier(),
+                        a.getExtension(), a.getVersion()));
+            }
+        }
+        return dependencies;
+    }
+
+    protected List<AppArtifactCoords> getManagedDependencies() {
+        if (managedDependencies == null) {
+            final List<org.eclipse.aether.graph.Dependency> managedDeps = projectManagedDepsSupplier.get();
+            projectManagedDepsSupplier = null;
+            managedDependencies = new ArrayList<>(managedDeps.size());
+            for (org.eclipse.aether.graph.Dependency dep : managedDeps) {
+                org.eclipse.aether.artifact.Artifact a = dep.getArtifact();
+                managedDependencies.add(new AppArtifactCoords(a.getGroupId(), a.getArtifactId(), a.getClassifier(),
+                        a.getExtension(), a.getVersion()));
+            }
+        }
+        return dependencies;
+    }
+
+    @Override
+    protected void writeToDisk() throws IOException {
+        if (model == null) {
+            return;
+        }
+        try (ByteArrayOutputStream pomOutputStream = new ByteArrayOutputStream()) {
+            MojoUtils.write(model(), pomOutputStream);
+            writeToProjectFile(BuildTool.MAVEN.getDependenciesFile(), pomOutputStream.toByteArray());
+        }
+    }
+
+    @Override
+    protected String getProperty(String propertyName) {
+        return projectProps.getProperty(propertyName);
+    }
+
+    @Override
+    protected void refreshData() {
+    }
+
+    private Model model() {
+        if (model == null) {
+            model = modelSupplier.get().clone();
+            modelSupplier = null;
+        }
+        return model;
+    }
+
+    /**
+     * Resolves dependencies containing property references in the GAV
+     */
+    private String resolveKey(Dependency dependency) {
+        String resolvedGroupId = toResolvedProperty(dependency.getGroupId());
+        String resolvedArtifactId = toResolvedProperty(dependency.getArtifactId());
+        String resolvedVersion = toResolvedProperty(dependency.getVersion());
+        if (!resolvedGroupId.equals(dependency.getGroupId())
+                || !resolvedArtifactId.equals(dependency.getArtifactId())
+                || !resolvedVersion.equals(dependency.getVersion())) {
+            return resolvedGroupId + ":" + resolvedArtifactId + ":" + dependency.getType()
+                    + (dependency.getClassifier() != null ? ":" + dependency.getClassifier() : "");
+        }
+        return dependency.getManagementKey();
+    }
+
+    /**
+     * Resolves properties as ${quarkus.platform.version}
+     */
+    private String toResolvedProperty(String value) {
+        Matcher matcher = PROPERTY_PATTERN.matcher(value);
+        if (matcher.matches()) {
+            String property = getProperty(matcher.group(1));
+            return property == null ? value : property;
+        }
+        return value;
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/MojoLogger.java b/devtools/maven/src/main/java/io/quarkus/maven/MojoLogger.java
index a903de275476f..dd03ff059714c 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/MojoLogger.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/MojoLogger.java
@@ -3,7 +3,6 @@
 import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.Map;
-import java.util.function.Supplier;
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.utils.logging.MessageBuilder;
@@ -17,7 +16,7 @@
 public class MojoLogger implements LoggerProvider {
     static final Object[] NO_PARAMS = new Object[0];
 
-    public static volatile Supplier<Log> logSupplier;
+    public static volatile Log delegate;
 
     @Override
     public Logger getLogger(final String name) {
@@ -25,9 +24,8 @@ public Logger getLogger(final String name) {
             @Override
             protected void doLog(final Level level, final String loggerClassName, final Object message,
                     final Object[] parameters, final Throwable thrown) {
-                final Supplier<Log> logSupplier = MojoLogger.logSupplier;
-                if (logSupplier != null) {
-                    Log log = logSupplier.get();
+                final Log log = delegate;
+                if (log != null) {
                     String text;
                     if (parameters == null || parameters.length == 0) {
                         text = String.valueOf(message);
@@ -47,9 +45,8 @@ protected void doLog(final Level level, final String loggerClassName, final Obje
             @Override
             protected void doLogf(final Level level, final String loggerClassName, final String format,
                     final Object[] parameters, final Throwable thrown) {
-                final Supplier<Log> logSupplier = MojoLogger.logSupplier;
-                if (logSupplier != null) {
-                    Log log = logSupplier.get();
+                final Log log = delegate;
+                if (log != null) {
                     String text;
                     if (parameters == null) {
                         try {
@@ -73,10 +70,9 @@ protected void doLogf(final Level level, final String loggerClassName, final Str
 
             @Override
             public boolean isEnabled(final Level level) {
-                final Supplier<Log> logSupplier = MojoLogger.logSupplier;
-                if (logSupplier == null)
+                final Log log = delegate;
+                if (log == null)
                     return false;
-                Log log = logSupplier.get();
                 switch (level) {
                     case FATAL:
                     case ERROR:
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java
deleted file mode 100644
index c3203c09cab6b..0000000000000
--- a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package io.quarkus.maven;
-
-import static java.util.stream.Collectors.joining;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.repository.RemoteRepository;
-
-import io.quarkus.bootstrap.app.AugmentAction;
-import io.quarkus.bootstrap.app.AugmentResult;
-import io.quarkus.bootstrap.app.CuratedApplication;
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-
-/**
- * Legacy mojo for backwards compatibility reasons. This should not be used in new projects
- *
- * This has been replaced by setting quarkus.package.type=native in the configuration.
- *
- * @deprecated
- */
-@Mojo(name = "native-image", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.RUNTIME)
-@Deprecated
-public class NativeImageMojo extends AbstractMojo {
-
-    protected static final String QUARKUS_PACKAGE_TYPE = "quarkus.package.type";
-    @Parameter(defaultValue = "${project}", readonly = true, required = true)
-    protected MavenProject project;
-
-    @Parameter
-    public File javaHome;
-
-    @Parameter(defaultValue = "${project.build.directory}")
-    private File buildDir;
-
-    /**
-     * The directory for compiled classes.
-     */
-    @Parameter(readonly = true, required = true, defaultValue = "${project.build.outputDirectory}")
-    private File outputDirectory;
-
-    @Parameter
-    private Boolean reportErrorsAtRuntime;
-
-    @Parameter(defaultValue = "false")
-    private Boolean debugSymbols;
-
-    @Parameter(defaultValue = "${native-image.debug-build-process}")
-    private Boolean debugBuildProcess;
-
-    @Parameter(defaultValue = "true")
-    private boolean publishDebugBuildProcessPort;
-
-    @Parameter(readonly = true, required = true, defaultValue = "${project.build.finalName}")
-    private String finalName;
-
-    @Parameter(defaultValue = "${native-image.new-server}")
-    private Boolean cleanupServer;
-
-    @Parameter
-    private Boolean enableHttpUrlHandler;
-
-    @Parameter
-    private Boolean enableHttpsUrlHandler;
-
-    @Parameter
-    private Boolean enableAllSecurityServices;
-
-    @Parameter
-    private Boolean enableIsolates;
-
-    @Parameter(defaultValue = "${env.GRAALVM_HOME}")
-    private String graalvmHome;
-
-    @Parameter(defaultValue = "false")
-    private Boolean enableServer;
-
-    /**
-     * @deprecated JNI is always enabled starting from GraalVM 19.3.1.
-     */
-    @Deprecated
-    @Parameter(defaultValue = "true")
-    private Boolean enableJni;
-
-    @Parameter(defaultValue = "false")
-    private Boolean autoServiceLoaderRegistration;
-
-    @Parameter(defaultValue = "false")
-    private Boolean dumpProxies;
-
-    @Parameter(defaultValue = "${native-image.xmx}")
-    private String nativeImageXmx;
-
-    @Parameter(defaultValue = "${native-image.docker-build}")
-    private String dockerBuild;
-
-    @Parameter(defaultValue = "${native-image.container-runtime}")
-    private String containerRuntime;
-
-    @Parameter(defaultValue = "${native-image.container-runtime-options}")
-    private String containerRuntimeOptions;
-
-    @Parameter(defaultValue = "false")
-    private Boolean enableVMInspection;
-
-    @Parameter(defaultValue = "true")
-    private Boolean fullStackTraces;
-
-    @Deprecated
-    @Parameter(defaultValue = "${native-image.disable-reports}")
-    private Boolean disableReports;
-
-    @Parameter(defaultValue = "${native-image.enable-reports}")
-    private Boolean enableReports;
-
-    @Parameter
-    private List<String> additionalBuildArgs;
-
-    @Parameter
-    private Boolean addAllCharsets;
-
-    @Parameter
-    private Boolean enableFallbackImages;
-
-    @Parameter
-    private Boolean reportExceptionStackTraces;
-
-    /**
-     * Coordinates of the Maven artifact containing the original Java application to build the native image for.
-     * If not provided, the current project is assumed to be the original Java application.
-     * <p>
-     * The coordinates are expected to be expressed in the following format:
-     * <p>
-     * groupId:artifactId:classifier:type:version
-     * <p>
-     * With the classifier, type and version being optional.
-     * <p>
-     * If the type is missing, the artifact is assumed to be of type JAR.
-     * <p>
-     * If the version is missing, the artifact is going to be looked up among the project dependencies using the provided
-     * coordinates.
-     *
-     * <p>
-     * However, if the expression consists of only three parts, it is assumed to be groupId:artifactId:version.
-     *
-     * <p>
-     * If the expression consists of only four parts, it is assumed to be groupId:artifactId:classifier:type.
-     */
-    @Parameter(required = false, property = "quarkus.appArtifact")
-    private String appArtifact;
-
-    @Component
-    private RepositorySystem repoSystem;
-
-    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
-    private RepositorySystemSession repoSession;
-
-    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
-    private List<RemoteRepository> repos;
-
-    public NativeImageMojo() {
-        MojoLogger.logSupplier = this::getLog;
-    }
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
-
-        if (project.getPackaging().equals("pom") && appArtifact == null) {
-            getLog().info("Type of the artifact is POM and appArtifact parameter has not been set, skipping native-image goal");
-            return;
-        }
-
-        // The runner JAR has not been built yet, so we are going to build it
-        final AppArtifact appCoords;
-        AppArtifact managingProject = null;
-        DefaultArtifact appMvnArtifact = null;
-        if (appArtifact == null) {
-            appMvnArtifact = new DefaultArtifact(project.getArtifact().getGroupId(),
-                    project.getArtifact().getArtifactId(),
-                    project.getArtifact().getClassifier(),
-                    project.getArtifact().getArtifactHandler().getExtension(),
-                    project.getArtifact().getVersion());
-            appCoords = new AppArtifact(appMvnArtifact.getGroupId(), appMvnArtifact.getArtifactId(),
-                    appMvnArtifact.getClassifier(), appMvnArtifact.getExtension(),
-                    appMvnArtifact.getVersion());
-        } else {
-            final String[] coordsArr = appArtifact.split(":");
-            if (coordsArr.length < 2 || coordsArr.length > 5) {
-                throw new MojoExecutionException(
-                        "appArtifact expression " + appArtifact
-                                + " does not follow format groupId:artifactId:classifier:type:version");
-            }
-            final String groupId = coordsArr[0];
-            final String artifactId = coordsArr[1];
-            String classifier = "";
-            String type = "jar";
-            String version = null;
-            if (coordsArr.length == 3) {
-                version = coordsArr[2];
-            } else if (coordsArr.length > 3) {
-                classifier = coordsArr[2] == null ? "" : coordsArr[2];
-                type = coordsArr[3] == null ? "jar" : coordsArr[3];
-                if (coordsArr.length > 4) {
-                    version = coordsArr[4];
-                }
-            }
-            if (version == null) {
-                for (Artifact dep : project.getArtifacts()) {
-                    if (dep.getArtifactId().equals(artifactId)
-                            && dep.getGroupId().equals(groupId)
-                            && dep.getClassifier().equals(classifier)
-                            && dep.getType().equals(type)) {
-                        appMvnArtifact = new DefaultArtifact(dep.getGroupId(),
-                                dep.getArtifactId(),
-                                dep.getClassifier(),
-                                dep.getArtifactHandler().getExtension(),
-                                dep.getVersion());
-                        break;
-                    }
-                }
-                if (appMvnArtifact == null) {
-                    throw new MojoExecutionException(
-                            "Failed to locate " + appArtifact + " among the project dependencies");
-                }
-                appCoords = new AppArtifact(appMvnArtifact.getGroupId(), appMvnArtifact.getArtifactId(),
-                        appMvnArtifact.getClassifier(), appMvnArtifact.getExtension(),
-                        appMvnArtifact.getVersion());
-            } else {
-                appCoords = new AppArtifact(groupId, artifactId, classifier, type, version);
-                appMvnArtifact = new DefaultArtifact(groupId, artifactId, classifier, type, version);
-            }
-            managingProject = new AppArtifact(project.getArtifact().getGroupId(),
-                    project.getArtifact().getArtifactId(),
-                    project.getArtifact().getClassifier(),
-                    project.getArtifact().getArtifactHandler().getExtension(),
-                    project.getArtifact().getVersion());
-        }
-        try {
-
-            final Properties projectProperties = project.getProperties();
-            final Properties realProperties = new Properties();
-            for (String name : projectProperties.stringPropertyNames()) {
-                if (name.startsWith("quarkus.")) {
-                    realProperties.setProperty(name, projectProperties.getProperty(name));
-                }
-            }
-            realProperties.putIfAbsent("quarkus.application.name", project.getArtifactId());
-            realProperties.putIfAbsent("quarkus.application.version", project.getVersion());
-
-            Map<String, String> config = createCustomConfig();
-            Map<String, String> old = new HashMap<>();
-            for (Map.Entry<String, String> e : config.entrySet()) {
-                old.put(e.getKey(), System.getProperty(e.getKey()));
-                System.setProperty(e.getKey(), e.getValue());
-            }
-
-            MavenArtifactResolver resolver = MavenArtifactResolver.builder()
-                    .setRepositorySystem(repoSystem)
-                    .setRepositorySystemSession(repoSession)
-                    .setRemoteRepositories(repos)
-                    .build();
-            appCoords.setPath(resolver.resolve(appMvnArtifact).getArtifact().getFile().toPath());
-
-            try (CuratedApplication curatedApplication = QuarkusBootstrap.builder()
-                    .setBuildSystemProperties(realProperties)
-                    .setAppArtifact(appCoords)
-                    .setBaseName(finalName)
-                    .setManagingProject(managingProject)
-                    .setMavenArtifactResolver(resolver)
-                    .setLocalProjectDiscovery(false)
-                    .setBaseClassLoader(BuildMojo.class.getClassLoader())
-                    .setTargetDirectory(buildDir.toPath())
-                    .build().bootstrap()) {
-
-                AugmentAction action = curatedApplication.createAugmentor();
-                AugmentResult result = action.createProductionApplication();
-            } finally {
-
-                for (Map.Entry<String, String> e : old.entrySet()) {
-                    if (e.getValue() == null) {
-                        System.clearProperty(e.getKey());
-                    } else {
-                        System.setProperty(e.getKey(), e.getValue());
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            throw new MojoExecutionException("Failed to generate native image", e);
-        }
-
-    }
-
-    private Map<String, String> createCustomConfig() {
-        Map<String, String> configs = new HashMap<>();
-        configs.put(QUARKUS_PACKAGE_TYPE, "native");
-        if (addAllCharsets != null) {
-            configs.put("quarkus.native.add-all-charsets", addAllCharsets.toString());
-        }
-        if (additionalBuildArgs != null && !additionalBuildArgs.isEmpty()) {
-            configs.put("quarkus.native.additional-build-args",
-                    additionalBuildArgs.stream()
-                            .map(val -> val.replace("\\", "\\\\"))
-                            .map(val -> val.replace(",", "\\,"))
-                            .collect(joining(",")));
-        }
-        if (autoServiceLoaderRegistration != null) {
-            configs.put("quarkus.native.auto-service-loader-registration", autoServiceLoaderRegistration.toString());
-        }
-        if (cleanupServer != null) {
-            configs.put("quarkus.native.cleanup-server", cleanupServer.toString());
-        }
-        if (debugBuildProcess != null) {
-            configs.put("quarkus.native.debug-build-process", debugBuildProcess.toString());
-        }
-        if (debugSymbols != null) {
-            configs.put("quarkus.native.debug-symbols", debugSymbols.toString());
-        }
-        if (disableReports != null) {
-            configs.put("quarkus.native.enable-reports", Boolean.toString(!disableReports));
-        }
-        if (enableReports != null) {
-            configs.put("quarkus.native.enable-reports", enableReports.toString());
-        }
-        if (containerRuntime != null && !containerRuntime.trim().isEmpty()) {
-            configs.put("quarkus.native.container-runtime", containerRuntime);
-        } else if (dockerBuild != null && !dockerBuild.trim().isEmpty()) {
-            if (!dockerBuild.toLowerCase().equals("false")) {
-                if (dockerBuild.toLowerCase().equals("true")) {
-                    configs.put("quarkus.native.container-runtime", "docker");
-                } else {
-                    configs.put("quarkus.native.container-runtime", dockerBuild);
-                }
-            }
-        }
-        if (containerRuntimeOptions != null && !containerRuntimeOptions.trim().isEmpty()) {
-            configs.put("quarkus.native.container-runtime-options", containerRuntimeOptions);
-        }
-        if (dumpProxies != null) {
-            configs.put("quarkus.native.dump-proxies", dumpProxies.toString());
-        }
-        if (enableAllSecurityServices != null) {
-            configs.put("quarkus.native.enable-all-security-services", enableAllSecurityServices.toString());
-        }
-        if (enableFallbackImages != null) {
-            configs.put("quarkus.native.enable-fallback-images", enableFallbackImages.toString());
-        }
-        if (enableHttpsUrlHandler != null) {
-            configs.put("quarkus.native.enable-https-url-handler", enableHttpsUrlHandler.toString());
-        }
-        if (enableHttpUrlHandler != null) {
-            configs.put("quarkus.native.enable-http-url-handler", enableHttpUrlHandler.toString());
-        }
-        if (enableIsolates != null) {
-            configs.put("quarkus.native.enable-isolates", enableIsolates.toString());
-        }
-        if (Boolean.FALSE.equals(enableJni)) {
-            getLog().warn("Your application is setting the deprecated 'enableJni' Maven option to false. Please"
-                    + " consider removing this option as it is ignored (JNI is always enabled) and it will be removed"
-                    + " in a future Quarkus version.");
-        }
-
-        if (enableServer != null) {
-            configs.put("quarkus.native.enable-server", enableServer.toString());
-        }
-
-        if (enableVMInspection != null) {
-            configs.put("quarkus.native.enable-vm-inspection", enableVMInspection.toString());
-        }
-        if (fullStackTraces != null) {
-            configs.put("quarkus.native.full-stack-traces", fullStackTraces.toString());
-        }
-        if (graalvmHome != null && !graalvmHome.trim().isEmpty()) {
-            configs.put("quarkus.native.graalvm-home", graalvmHome);
-        }
-        if (javaHome != null && !javaHome.toString().isEmpty()) {
-            configs.put("quarkus.native.java-home", javaHome.toString());
-        }
-        if (nativeImageXmx != null && !nativeImageXmx.trim().isEmpty()) {
-            configs.put("quarkus.native.native-image-xmx", nativeImageXmx);
-        }
-        if (reportErrorsAtRuntime != null) {
-            configs.put("quarkus.native.report-errors-at-runtime", reportErrorsAtRuntime.toString());
-        }
-        if (reportExceptionStackTraces != null) {
-            configs.put("quarkus.native.report-exception-stack-traces", reportExceptionStackTraces.toString());
-        }
-        if (publishDebugBuildProcessPort) {
-            configs.put("quarkus.native.publish-debug-build-process-port",
-                    Boolean.toString(publishDebugBuildProcessPort));
-        }
-        return configs;
-
-    }
-
-}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/PrepareMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/PrepareMojo.java
new file mode 100644
index 0000000000000..eedcc050d60ea
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/PrepareMojo.java
@@ -0,0 +1,17 @@
+package io.quarkus.maven;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Deprecated
+@Mojo(name = "prepare", defaultPhase = LifecyclePhase.GENERATE_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
+public class PrepareMojo extends GenerateCodeMojo {
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        getLog().warn("'prepare' goal is deprecated. Please use 'generate-code' instead");
+        super.execute();
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/PrepareTestsMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/PrepareTestsMojo.java
new file mode 100644
index 0000000000000..7c2f0d21fc8cf
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/PrepareTestsMojo.java
@@ -0,0 +1,17 @@
+package io.quarkus.maven;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Deprecated
+@Mojo(name = "prepare-tests", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
+public class PrepareTestsMojo extends GenerateCodeTestsMojo {
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        getLog().warn("'prepare-tests' goal is deprecated. Please use 'generate-code-tests' instead");
+        super.execute();
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java
new file mode 100644
index 0000000000000..1af17c8a29623
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapMojo.java
@@ -0,0 +1,163 @@
+package io.quarkus.maven;
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+
+public abstract class QuarkusBootstrapMojo extends AbstractMojo {
+
+    @Component
+    protected QuarkusBootstrapProvider bootstrapProvider;
+
+    /**
+     * The current repository/network configuration of Maven.
+     *
+     * @parameter default-value="${repositorySystemSession}"
+     * @readonly
+     */
+    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+    private RepositorySystemSession repoSession;
+
+    /**
+     * The project's remote repositories to use for the resolution of artifacts and their dependencies.
+     *
+     * @parameter default-value="${project.remoteProjectRepositories}"
+     * @readonly
+     */
+    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
+    private List<RemoteRepository> repos;
+
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
+    private MavenProject project;
+
+    @Parameter(defaultValue = "${project.build.directory}")
+    private File buildDir;
+
+    @Parameter(defaultValue = "${project.build.finalName}")
+    private String finalName;
+
+    /**
+     * When building an uber-jar, this array specifies entries that should
+     * be excluded from the final jar. The entries are relative to the root of
+     * the file. An example of this configuration could be:
+     * <code><pre>
+     * &#x3C;configuration&#x3E;
+     *   &#x3C;uberJar&#x3E;true&#x3C;/uberJar&#x3E;
+     *   &#x3C;ignoredEntries&#x3E;
+     *     &#x3C;ignoredEntry&#x3E;META-INF/BC2048KE.SF&#x3C;/ignoredEntry&#x3E;
+     *     &#x3C;ignoredEntry&#x3E;META-INF/BC2048KE.DSA&#x3C;/ignoredEntry&#x3E;
+     *     &#x3C;ignoredEntry&#x3E;META-INF/BC1024KE.SF&#x3C;/ignoredEntry&#x3E;
+     *     &#x3C;ignoredEntry&#x3E;META-INF/BC1024KE.DSA&#x3C;/ignoredEntry&#x3E;
+     *   &#x3C;/ignoredEntries&#x3E;
+     * &#x3C;/configuration&#x3E;
+     * </pre></code>
+     */
+    @Parameter(property = "ignoredEntries")
+    private String[] ignoredEntries;
+
+    private AppArtifactKey projectId;
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if (!beforeExecute()) {
+            return;
+        }
+        doExecute();
+    }
+
+    @Override
+    public void setLog(Log log) {
+        super.setLog(log);
+        MojoLogger.delegate = log;
+    }
+
+    /**
+     * This callback allows to evaluate whether this mojo should be executed, skipped or fail.
+     *
+     * @return false if the execution of the mojo should be skipped, true if the mojo should be executed
+     * @throws MojoExecutionException in case of a failure
+     * @throws MojoFailureException in case of a failure
+     */
+    protected abstract boolean beforeExecute() throws MojoExecutionException, MojoFailureException;
+
+    /**
+     * Main mojo execution code
+     *
+     * @throws MojoExecutionException in case of a failure
+     * @throws MojoFailureException in case of a failure
+     */
+    protected abstract void doExecute() throws MojoExecutionException, MojoFailureException;
+
+    protected RepositorySystem repositorySystem() {
+        return bootstrapProvider.repositorySystem();
+    }
+
+    protected RemoteRepositoryManager remoteRepositoryManager() {
+        return bootstrapProvider.remoteRepositoryManager();
+    }
+
+    protected RepositorySystemSession repositorySystemSession() {
+        return repoSession;
+    }
+
+    protected List<RemoteRepository> remoteRepositories() {
+        return repos;
+    }
+
+    protected MavenProject mavenProject() {
+        return project;
+    }
+
+    protected File buildDir() {
+        return buildDir;
+    }
+
+    protected File baseDir() {
+        return project.getBasedir();
+    }
+
+    protected String finalName() {
+        return finalName;
+    }
+
+    protected String[] ignoredEntries() {
+        return ignoredEntries;
+    }
+
+    protected AppArtifactKey projectId() {
+        return projectId == null ? projectId = new AppArtifactKey(project.getGroupId(), project.getArtifactId()) : projectId;
+    }
+
+    protected AppArtifact projectArtifact() throws MojoExecutionException {
+        return bootstrapProvider.projectArtifact(this);
+    }
+
+    protected MavenArtifactResolver artifactResolver() throws MojoExecutionException {
+        return bootstrapProvider.artifactResolver(this);
+    }
+
+    protected QuarkusBootstrap bootstrapQuarkus() throws MojoExecutionException {
+        return bootstrapProvider.bootstrapQuarkus(this);
+    }
+
+    protected CuratedApplication bootstrapApplication() throws MojoExecutionException {
+        return bootstrapProvider.bootstrapApplication(this);
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java
new file mode 100644
index 0000000000000..c827cd3f450b3
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java
@@ -0,0 +1,222 @@
+package io.quarkus.maven;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+
+import io.quarkus.bootstrap.BootstrapException;
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.model.PathsCollection;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+
+@Component(role = QuarkusBootstrapProvider.class, instantiationStrategy = "singleton")
+public class QuarkusBootstrapProvider implements Closeable {
+
+    @Requirement(role = RepositorySystem.class, optional = false)
+    protected RepositorySystem repoSystem;
+
+    @Requirement(role = RemoteRepositoryManager.class, optional = false)
+    protected RemoteRepositoryManager remoteRepoManager;
+
+    private final Cache<AppArtifactKey, QuarkusAppBootstrapProvider> appBootstrapProviders = CacheBuilder.newBuilder()
+            .concurrencyLevel(4).softValues().initialCapacity(10).build();
+
+    public RepositorySystem repositorySystem() {
+        return repoSystem;
+    }
+
+    public RemoteRepositoryManager remoteRepositoryManager() {
+        return remoteRepoManager;
+    }
+
+    private QuarkusAppBootstrapProvider provider(AppArtifactKey projectId) {
+        try {
+            return appBootstrapProviders.get(projectId, () -> new QuarkusAppBootstrapProvider());
+        } catch (ExecutionException e) {
+            throw new IllegalStateException("Failed to cache a new instance of " + QuarkusAppBootstrapProvider.class.getName(),
+                    e);
+        }
+    }
+
+    public MavenArtifactResolver artifactResolver(QuarkusBootstrapMojo mojo)
+            throws MojoExecutionException {
+        return provider(mojo.projectId()).artifactResolver(mojo);
+    }
+
+    public AppArtifact projectArtifact(QuarkusBootstrapMojo mojo)
+            throws MojoExecutionException {
+        return provider(mojo.projectId()).projectArtifact(mojo);
+    }
+
+    public QuarkusBootstrap bootstrapQuarkus(QuarkusBootstrapMojo mojo)
+            throws MojoExecutionException {
+        return provider(mojo.projectId()).bootstrapQuarkus(mojo);
+    }
+
+    public CuratedApplication bootstrapApplication(QuarkusBootstrapMojo mojo)
+            throws MojoExecutionException {
+        return provider(mojo.projectId()).curateApplication(mojo);
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (appBootstrapProviders.size() == 0) {
+            return;
+        }
+        for (QuarkusAppBootstrapProvider p : appBootstrapProviders.asMap().values()) {
+            try {
+                p.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private class QuarkusAppBootstrapProvider implements Closeable {
+
+        private AppArtifact projectArtifact;
+        private MavenArtifactResolver artifactResolver;
+        private QuarkusBootstrap quarkusBootstrap;
+        private CuratedApplication curatedApp;
+
+        private MavenArtifactResolver artifactResolver(QuarkusBootstrapMojo mojo)
+                throws MojoExecutionException {
+            if (artifactResolver != null) {
+                return artifactResolver;
+            }
+            try {
+                return artifactResolver = MavenArtifactResolver.builder()
+                        .setWorkspaceDiscovery(false)
+                        .setRepositorySystem(repoSystem)
+                        .setRepositorySystemSession(mojo.repositorySystemSession())
+                        .setRemoteRepositories(mojo.remoteRepositories())
+                        .setRemoteRepositoryManager(remoteRepoManager)
+                        .build();
+            } catch (BootstrapMavenException e) {
+                throw new MojoExecutionException("Failed to initialize Quarkus bootstrap Maven artifact resolver", e);
+            }
+        }
+
+        private AppArtifact projectArtifact(QuarkusBootstrapMojo mojo) throws MojoExecutionException {
+            if (projectArtifact != null) {
+                return projectArtifact;
+            }
+            final Artifact projectArtifact = mojo.mavenProject().getArtifact();
+            final AppArtifact appArtifact = new AppArtifact(projectArtifact.getGroupId(), projectArtifact.getArtifactId(),
+                    projectArtifact.getClassifier(), projectArtifact.getArtifactHandler().getExtension(),
+                    projectArtifact.getVersion());
+
+            File projectFile = projectArtifact.getFile();
+            if (projectFile == null) {
+                projectFile = new File(mojo.mavenProject().getBuild().getOutputDirectory());
+                if (!projectFile.exists()) {
+                    /*
+                     * TODO GenerateCodeMojo would fail
+                     * if (hasSources(project)) {
+                     * throw new MojoExecutionException("Project " + project.getArtifact() + " has not been compiled yet");
+                     * }
+                     */
+                    if (!projectFile.mkdirs()) {
+                        throw new MojoExecutionException("Failed to create the output dir " + projectFile);
+                    }
+                }
+            }
+            appArtifact.setPaths(PathsCollection.of(projectFile.toPath()));
+            return appArtifact;
+        }
+
+        protected QuarkusBootstrap bootstrapQuarkus(QuarkusBootstrapMojo mojo) throws MojoExecutionException {
+            if (quarkusBootstrap != null) {
+                return quarkusBootstrap;
+            }
+
+            final Properties projectProperties = mojo.mavenProject().getProperties();
+            final Properties effectiveProperties = new Properties();
+            // quarkus. properties > ignoredEntries in pom.xml
+            if (mojo.ignoredEntries() != null && mojo.ignoredEntries().length > 0) {
+                String joinedEntries = String.join(",", mojo.ignoredEntries());
+                effectiveProperties.setProperty("quarkus.package.user-configured-ignored-entries", joinedEntries);
+            }
+            for (String name : projectProperties.stringPropertyNames()) {
+                if (name.startsWith("quarkus.")) {
+                    effectiveProperties.setProperty(name, projectProperties.getProperty(name));
+                }
+            }
+
+            effectiveProperties.putIfAbsent("quarkus.application.name", mojo.mavenProject().getArtifactId());
+            effectiveProperties.putIfAbsent("quarkus.application.version", mojo.mavenProject().getVersion());
+
+            QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder()
+                    .setAppArtifact(projectArtifact(mojo))
+                    .setMavenArtifactResolver(artifactResolver(mojo))
+                    .setIsolateDeployment(true)
+                    .setBaseClassLoader(getClass().getClassLoader())
+                    .setBuildSystemProperties(effectiveProperties)
+                    .setLocalProjectDiscovery(false)
+                    .setProjectRoot(mojo.baseDir().toPath())
+                    .setBaseName(mojo.finalName())
+                    .setTargetDirectory(mojo.buildDir().toPath());
+
+            for (MavenProject project : mojo.mavenProject().getCollectedProjects()) {
+                builder.addLocalArtifact(new AppArtifactKey(project.getGroupId(), project.getArtifactId(), null,
+                        project.getArtifact().getArtifactHandler().getExtension()));
+            }
+
+            return quarkusBootstrap = builder.build();
+        }
+
+        protected CuratedApplication curateApplication(QuarkusBootstrapMojo mojo) throws MojoExecutionException {
+            if (curatedApp != null) {
+                return curatedApp;
+            }
+            try {
+                return curatedApp = bootstrapQuarkus(mojo).bootstrap();
+            } catch (MojoExecutionException e) {
+                throw e;
+            } catch (BootstrapException e) {
+                throw new MojoExecutionException("Failed to bootstrap the application", e);
+            }
+        }
+
+        @Override
+        public void close() throws IOException {
+            if (curatedApp != null) {
+                curatedApp.close();
+                curatedApp = null;
+            }
+            this.artifactResolver = null;
+            this.quarkusBootstrap = null;
+        }
+    }
+
+    /*
+     * private static boolean hasSources(MavenProject project) {
+     * if (new File(project.getBuild().getSourceDirectory()).exists()) {
+     * return true;
+     * }
+     * for (Resource r : project.getBuild().getResources()) {
+     * if (new File(r.getDirectory()).exists()) {
+     * return true;
+     * }
+     * }
+     * return false;
+     * }
+     */
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java
index 2b3d192471a93..6b8e374e3e640 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java
@@ -1,14 +1,15 @@
 package io.quarkus.maven;
 
+import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
@@ -18,21 +19,27 @@
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.DependencyVisitor;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.resolution.ArtifactDescriptorResult;
 
-import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
+import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.descriptor.CombinedQuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
-import io.quarkus.platform.tools.MessageWriter;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.platform.descriptor.loader.json.ClassPathResourceLoader;
 import io.quarkus.platform.tools.ToolsConstants;
+import io.quarkus.platform.tools.ToolsUtils;
 import io.quarkus.platform.tools.maven.MojoMessageWriter;
+import io.quarkus.registry.ExtensionCatalogResolver;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.Platform;
 
 public abstract class QuarkusProjectMojoBase extends AbstractMojo {
 
@@ -48,7 +55,7 @@ public abstract class QuarkusProjectMojoBase extends AbstractMojo {
     @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
     protected List<RemoteRepository> repos;
 
-    @Parameter(property = "bomGroupId", defaultValue = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID)
+    @Parameter(property = "bomGroupId", required = false)
     private String bomGroupId;
 
     @Parameter(property = "bomArtifactId", required = false)
@@ -57,95 +64,210 @@ public abstract class QuarkusProjectMojoBase extends AbstractMojo {
     @Parameter(property = "bomVersion", required = false)
     private String bomVersion;
 
+    @Component
+    RemoteRepositoryManager remoteRepositoryManager;
+
+    @Parameter(property = "enableRegistryClient")
+    private boolean enableRegistryClient;
+
+    private List<ArtifactCoords> importedPlatforms;
+
+    private Artifact projectArtifact;
+    private ArtifactDescriptorResult projectDescr;
+    private MavenArtifactResolver artifactResolver;
+    private ExtensionCatalogResolver catalogResolver;
+    private MessageWriter log;
+
     @Override
     public void execute() throws MojoExecutionException {
 
         // Validate Mojo parameters
         validateParameters();
 
-        final MessageWriter log = new MojoMessageWriter(getLog());
-        final Path projectDirPath = project.getBasedir().toPath();
-        final BuildTool buildTool = QuarkusProject.resolveExistingProjectBuildTool(projectDirPath);
-        final QuarkusPlatformDescriptor platformDescriptor = resolvePlatformDescriptor(log);
+        final Path projectDirPath = baseDir();
+        BuildTool buildTool = QuarkusProject.resolveExistingProjectBuildTool(projectDirPath);
+        if (buildTool == null) {
+            // it's not Gradle and the pom.xml not found, so we assume there is not project at all
+            buildTool = BuildTool.MAVEN;
+        }
+
+        final ExtensionCatalog catalog = resolveExtensionsCatalog();
+        final ClassPathResourceLoader codestartsResourceLoader = QuarkusProjectHelper.getResourceLoader(catalog,
+                artifactResolver());
+        final QuarkusProject quarkusProject;
+        if (BuildTool.MAVEN.equals(buildTool) && project.getFile() != null) {
+            quarkusProject = QuarkusProject.of(baseDir(), catalog, codestartsResourceLoader, getMessageWriter(),
+                    new MavenProjectBuildFile(baseDir(), catalog, () -> project.getOriginalModel(),
+                            () -> {
+                                try {
+                                    return projectDependencies();
+                                } catch (MojoExecutionException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            },
+                            () -> {
+                                try {
+                                    return projectDescriptor().getManagedDependencies();
+                                } catch (MojoExecutionException e) {
+                                    throw new RuntimeException(e);
+                                }
+                            },
+                            project.getModel().getProperties()));
+        } else {
+            quarkusProject = QuarkusProject.of(baseDir(), catalog, codestartsResourceLoader, log, buildTool);
+        }
 
-        doExecute(QuarkusProject.of(project.getBasedir().toPath(), platformDescriptor, buildTool), log);
+        doExecute(quarkusProject, getMessageWriter());
     }
 
-    private QuarkusPlatformDescriptor resolvePlatformDescriptor(final MessageWriter log) throws MojoExecutionException {
-        // Resolve and setup the platform descriptor
-        try {
-            final MavenArtifactResolver mvn = MavenArtifactResolver.builder().setRepositorySystem(repoSystem)
-                    .setRepositorySystemSession(repoSession)
-                    .setRemoteRepositories(repos).build();
-            if (project.getFile() != null) {
-                final List<Artifact> descrArtifactList = new ArrayList<>(2);
-                for (Dependency dep : getManagedDependencies(mvn)) {
-                    if ((dep.getScope() == null || !dep.getScope().equals("import"))
-                            && (dep.getType() == null || !dep.getType().equals("pom"))) {
-                        continue;
-                    }
-                    // We don't know which BOM is the platform one, so we are trying every BOM here
-                    final String bomVersion = resolveValue(dep.getVersion());
-                    final String bomGroupId = resolveValue(dep.getGroupId());
-                    final String bomArtifactId = resolveValue(dep.getArtifactId());
-                    if (bomVersion == null || bomGroupId == null || bomArtifactId == null) {
-                        continue;
-                    }
+    protected MessageWriter getMessageWriter() {
+        return log == null ? log = new MojoMessageWriter(getLog()) : log;
+    }
+
+    private ArtifactDescriptorResult projectDescriptor() throws MojoExecutionException {
+        if (this.projectDescr == null) {
+            try {
+                projectDescr = artifactResolver.resolveDescriptor(projectArtifact());
+            } catch (Exception e) {
+                throw new MojoExecutionException("Failed to read the artifact desriptor for the project", e);
+            }
+        }
+        return projectDescr;
+    }
+
+    protected Path baseDir() {
+        return project == null || project.getBasedir() == null ? Paths.get("").normalize().toAbsolutePath()
+                : project.getBasedir().toPath();
+    }
 
-                    final Artifact jsonArtifact = resolveJsonOrNull(mvn, bomGroupId, bomArtifactId, bomVersion);
-                    if (jsonArtifact != null) {
-                        descrArtifactList.add(jsonArtifact);
+    protected boolean isLimitExtensionsToImportedPlatforms() {
+        return false;
+    }
+
+    private ExtensionCatalog resolveExtensionsCatalog() throws MojoExecutionException {
+        final ExtensionCatalogResolver catalogResolver = enableRegistryClient ? getExtensionCatalogResolver()
+                : ExtensionCatalogResolver.empty();
+        if (catalogResolver.hasRegistries()) {
+            try {
+                return isLimitExtensionsToImportedPlatforms()
+                        ? catalogResolver.resolveExtensionCatalog(getImportedPlatforms())
+                        : catalogResolver.resolveExtensionCatalog(getQuarkusCoreVersion());
+            } catch (Exception e) {
+                throw new MojoExecutionException("Failed to resolve the Quarkus extensions catalog", e);
+            }
+        }
+        return ToolsUtils.mergePlatforms(collectImportedPlatforms(), artifactResolver());
+    }
+
+    protected ExtensionCatalogResolver getExtensionCatalogResolver() throws MojoExecutionException {
+        return catalogResolver == null
+                ? catalogResolver = QuarkusProjectHelper.getCatalogResolver(artifactResolver(), getMessageWriter())
+                : catalogResolver;
+    }
+
+    protected List<ArtifactCoords> getImportedPlatforms() throws MojoExecutionException {
+        if (importedPlatforms == null) {
+            if (project.getFile() == null) {
+                if (bomGroupId == null && bomArtifactId == null && bomVersion == null) {
+                    return Collections.emptyList();
+                }
+                if (bomGroupId == null) {
+                    bomGroupId = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID;
+                }
+                final ExtensionCatalogResolver catalogResolver = getExtensionCatalogResolver();
+                ArtifactCoords platformBom = null;
+                List<ArtifactCoords> matches = null;
+                try {
+                    for (Platform p : catalogResolver.resolvePlatformCatalog().getPlatforms()) {
+                        final ArtifactCoords bom = p.getBom();
+                        if (bomGroupId != null && !bom.getGroupId().equals(bomGroupId)) {
+                            continue;
+                        }
+                        if (bomArtifactId != null && !bom.getArtifactId().equals(bomArtifactId)) {
+                            continue;
+                        }
+                        if (bomVersion != null && !bom.getVersion().equals(bomVersion)) {
+                            continue;
+                        }
+                        if (platformBom == null) {
+                            platformBom = bom;
+                        } else {
+                            if (matches == null) {
+                                matches = new ArrayList<>();
+                                matches.add(platformBom);
+                            }
+                            matches.add(bom);
+                        }
                     }
+                } catch (RegistryResolutionException e) {
+                    throw new MojoExecutionException("Failed to resolve the catalog of Quarkus platforms", e);
                 }
-                if (!descrArtifactList.isEmpty()) {
-                    if (descrArtifactList.size() == 1) {
-                        return loadPlatformDescriptor(mvn, log, descrArtifactList.get(0));
-                    } else {
-                        final CombinedQuarkusPlatformDescriptor.Builder builder = CombinedQuarkusPlatformDescriptor.builder();
-                        for (Artifact descrArtifact : descrArtifactList) {
-                            builder.addPlatform(loadPlatformDescriptor(mvn, log, descrArtifact));
+                if (matches != null) {
+                    final StringWriter buf = new StringWriter();
+                    buf.append("Found multiple platforms matching the provided arguments: ");
+                    try (BufferedWriter writer = new BufferedWriter(buf)) {
+                        for (ArtifactCoords coords : matches) {
+                            writer.newLine();
+                            writer.append("- ").append(coords.toString());
                         }
-                        return builder.build();
+                    } catch (IOException e) {
+                        buf.append(matches.toString());
                     }
+                    throw new MojoExecutionException(buf.toString());
                 }
+                return importedPlatforms = Collections.singletonList(platformBom);
             }
-            return CreateUtils.resolvePlatformDescriptor(bomGroupId, bomArtifactId, bomVersion, mvn, getLog());
-        } catch (Exception e) {
-            throw new MojoExecutionException("Failed to initialize maven artifact resolver", e);
+            importedPlatforms = collectImportedPlatforms();
         }
+        return importedPlatforms;
     }
 
-    private QuarkusPlatformDescriptor loadPlatformDescriptor(final MavenArtifactResolver mvn, final MessageWriter log,
-            Artifact descrArtifact) {
-        return QuarkusJsonPlatformDescriptorResolver.newInstance()
-                .setArtifactResolver(new BootstrapAppModelResolver(mvn))
-                .setMessageWriter(log)
-                .resolveFromJson(descrArtifact.getFile().toPath());
+    private MavenArtifactResolver artifactResolver() throws MojoExecutionException {
+        if (artifactResolver == null) {
+            try {
+                artifactResolver = MavenArtifactResolver.builder()
+                        .setRepositorySystem(repoSystem)
+                        .setRepositorySystemSession(repoSession)
+                        .setRemoteRepositories(repos)
+                        .setRemoteRepositoryManager(remoteRepositoryManager)
+                        .build();
+            } catch (BootstrapMavenException e) {
+                throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e);
+            }
+        }
+        return artifactResolver;
     }
 
-    private Artifact resolveJsonOrNull(MavenArtifactResolver mvn, String bomGroupId, String bomArtifactId, String bomVersion) {
-        Artifact jsonArtifact = new DefaultArtifact(bomGroupId, bomArtifactId, null, "json", bomVersion);
-        try {
-            jsonArtifact = mvn.resolve(jsonArtifact).getArtifact();
-        } catch (Exception e) {
-            if (getLog().isDebugEnabled()) {
-                getLog().debug("Failed to resolve JSON descriptor as " + jsonArtifact);
-            }
-            jsonArtifact = new DefaultArtifact(bomGroupId, bomArtifactId + "-descriptor-json", null, "json",
-                    bomVersion);
-            try {
-                jsonArtifact = mvn.resolve(jsonArtifact).getArtifact();
-            } catch (Exception e1) {
-                if (getLog().isDebugEnabled()) {
-                    getLog().debug("Failed to resolve JSON descriptor as " + jsonArtifact);
+    private List<ArtifactCoords> collectImportedPlatforms()
+            throws MojoExecutionException {
+        final List<ArtifactCoords> descriptors = new ArrayList<>(4);
+        final List<Dependency> constraints = project.getDependencyManagement() == null ? Collections.emptyList()
+                : project.getDependencyManagement().getDependencies();
+        if (!constraints.isEmpty()) {
+            final MessageWriter log = getMessageWriter();
+            for (Dependency d : constraints) {
+                if (!("json".equals(d.getType())
+                        && d.getArtifactId().endsWith(BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX))) {
+                    continue;
                 }
-                return null;
+                final ArtifactCoords a = new ArtifactCoords(d.getGroupId(), d.getArtifactId(), d.getClassifier(),
+                        d.getType(), d.getVersion());
+                descriptors.add(a);
+                log.debug("Found platform descriptor %s", a);
             }
         }
-        if (getLog().isDebugEnabled()) {
-            getLog().debug("Resolve JSON descriptor " + jsonArtifact);
+        return descriptors;
+    }
+
+    private String getQuarkusCoreVersion() {
+        final List<Dependency> constraints = project.getDependencyManagement() == null ? Collections.emptyList()
+                : project.getDependencyManagement().getDependencies();
+        for (Dependency d : constraints) {
+            if (d.getArtifactId().endsWith("quarkus-core") && d.getGroupId().equals("io.quarkus")) {
+                return d.getVersion();
+            }
         }
-        return jsonArtifact;
+        return null;
     }
 
     protected void validateParameters() throws MojoExecutionException {
@@ -154,50 +276,34 @@ protected void validateParameters() throws MojoExecutionException {
     protected abstract void doExecute(QuarkusProject quarkusProject, MessageWriter log)
             throws MojoExecutionException;
 
-    private String resolveValue(String expr) throws IOException {
-        if (expr.startsWith("${") && expr.endsWith("}")) {
-            final String name = expr.substring(2, expr.length() - 1);
-            final String v = project.getModel().getProperties().getProperty(name);
-            if (v == null) {
-                if (getLog().isDebugEnabled()) {
-                    getLog().debug("Failed to resolve property " + name);
-                }
-            }
-            return v;
+    private List<org.eclipse.aether.graph.Dependency> projectDependencies() throws MojoExecutionException {
+        final List<org.eclipse.aether.graph.Dependency> deps = new ArrayList<>();
+        try {
+            artifactResolver().collectDependencies(projectArtifact(), Collections.emptyList())
+                    .getRoot().accept(new DependencyVisitor() {
+                        @Override
+                        public boolean visitEnter(DependencyNode node) {
+                            if (node.getDependency() != null) {
+                                deps.add(node.getDependency());
+                            }
+                            return true;
+                        }
+
+                        @Override
+                        public boolean visitLeave(DependencyNode node) {
+                            return true;
+                        }
+                    });
+        } catch (Exception e) {
+            throw new MojoExecutionException("Failed to collect dependencies for the project", e);
         }
-        return expr;
+        return deps;
     }
 
-    private List<Dependency> getManagedDependencies(MavenArtifactResolver resolver) throws IOException {
-        List<Dependency> managedDependencies = new ArrayList<>();
-        Model model = project.getOriginalModel();
-        DependencyManagement managed = model.getDependencyManagement();
-        if (managed != null) {
-            managedDependencies.addAll(managed.getDependencies());
-        }
-        Parent parent;
-        while ((parent = model.getParent()) != null) {
-            try {
-                ArtifactResult result = resolver.resolve(new DefaultArtifact(
-                        parent.getGroupId(),
-                        parent.getArtifactId(),
-                        "pom",
-                        ModelUtils.resolveVersion(parent.getVersion(), model)));
-                model = ModelUtils.readModel(result.getArtifact().getFile().toPath());
-                managed = model.getDependencyManagement();
-                if (managed != null) {
-                    // Alexey Loubyansky: In Maven whatever is imported first has a priority
-                    // So to match the maven way, we should be reading the root parent first
-                    managedDependencies.addAll(0, managed.getDependencies());
-                }
-            } catch (BootstrapMavenException e) {
-                // ignore
-                if (getLog().isDebugEnabled()) {
-                    getLog().debug("Error while resolving descriptor", e);
-                }
-                break;
-            }
-        }
-        return managedDependencies;
+    private Artifact projectArtifact() {
+        return projectArtifact == null
+                ? projectArtifact = new DefaultArtifact(project.getGroupId(), project.getArtifactId(), null, "pom",
+                        project.getVersion())
+                : projectArtifact;
     }
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/RemoteDevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/RemoteDevMojo.java
index 14b0b1505c986..a2828b3bc2755 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/RemoteDevMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/RemoteDevMojo.java
@@ -4,20 +4,13 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
-import io.quarkus.deployment.dev.DevModeContext;
-import io.quarkus.deployment.dev.IsolatedRemoteDevModeMain;
-
 /**
  * The dev mojo, that connects to a remote host.
  */
 @Mojo(name = "remote-dev", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public class RemoteDevMojo extends DevMojo {
     @Override
-    protected void modifyDevModeContext(DevModeContext devModeContext) {
-        //we use prod mode here as we are going to generate a production
-        //application to sync to the server
-        devModeContext.setMode(QuarkusBootstrap.Mode.PROD);
-        devModeContext.setAlternateEntryPoint(IsolatedRemoteDevModeMain.class.getName());
+    protected void modifyDevModeContext(MavenDevModeLauncher.Builder builder) {
+        builder.remoteDev(true);
     }
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java
index 165c951bc4cd6..6680d4152ec0c 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/RemoveExtensionMojo.java
@@ -12,8 +12,8 @@
 
 import io.quarkus.devtools.commands.RemoveExtensions;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.tools.MessageWriter;
 
 /**
  * Allow removing an extension from an existing pom.xml file.
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/components/BootstrapSessionListener.java b/devtools/maven/src/main/java/io/quarkus/maven/components/BootstrapSessionListener.java
new file mode 100644
index 0000000000000..167d069100176
--- /dev/null
+++ b/devtools/maven/src/main/java/io/quarkus/maven/components/BootstrapSessionListener.java
@@ -0,0 +1,27 @@
+package io.quarkus.maven.components;
+
+import java.io.IOException;
+
+import org.apache.maven.AbstractMavenLifecycleParticipant;
+import org.apache.maven.MavenExecutionException;
+import org.apache.maven.execution.MavenSession;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+
+import io.quarkus.maven.QuarkusBootstrapProvider;
+
+@Component(role = AbstractMavenLifecycleParticipant.class, hint = "quarkus-bootstrap")
+public class BootstrapSessionListener extends AbstractMavenLifecycleParticipant {
+
+    @Requirement(optional = false)
+    protected QuarkusBootstrapProvider bootstrapProvider;
+
+    @Override
+    public void afterSessionEnd(MavenSession session) throws MavenExecutionException {
+        try {
+            bootstrapProvider.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/components/Prompter.java b/devtools/maven/src/main/java/io/quarkus/maven/components/Prompter.java
index 017f8ecfc5fec..f83db7c27609e 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/components/Prompter.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/components/Prompter.java
@@ -3,65 +3,21 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.component.annotations.Component;
 
-import jline.console.ConsoleReader;
-
 /**
  * Prompt implementation.
  *
  * @author <a href="http://escoffier.me">Clement Escoffier</a>
  */
 @Component(role = Prompter.class, instantiationStrategy = "per-lookup")
-public class Prompter {
-
-    private final ConsoleReader console;
-
+public class Prompter extends io.quarkus.devtools.utils.Prompter {
     public Prompter() throws IOException {
-        this.console = new ConsoleReader();
-        console.setHistoryEnabled(false);
-        console.setExpandEvents(false);
+        super();
     }
 
     public Prompter(InputStream in, OutputStream out) throws IOException {
-        this.console = new ConsoleReader(in, out);
-        console.setHistoryEnabled(false);
-        console.setExpandEvents(false);
-    }
-
-    public ConsoleReader getConsole() {
-        return console;
-    }
-
-    public String prompt(final String message, final Character mask) throws IOException {
-        Objects.requireNonNull(message);
-
-        final String prompt = String.format("%s: ", message);
-        String value;
-        do {
-            value = console.readLine(prompt, mask);
-        } while (StringUtils.isBlank(value));
-        return value;
-    }
-
-    public String prompt(final String message) throws IOException {
-        Objects.requireNonNull(message);
-        return prompt(message, null);
+        super(in, out);
     }
-
-    public String promptWithDefaultValue(final String message, final String defaultValue) throws IOException {
-        Objects.requireNonNull(message);
-        Objects.requireNonNull(defaultValue);
-
-        final String prompt = String.format("%s [%s]: ", message, defaultValue);
-        String value = console.readLine(prompt);
-        if (StringUtils.isBlank(value)) {
-            return defaultValue;
-        }
-        return value;
-    }
-
 }
diff --git a/devtools/maven/src/main/java/io/quarkus/platform/tools/maven/MojoMessageWriter.java b/devtools/maven/src/main/java/io/quarkus/platform/tools/maven/MojoMessageWriter.java
index 175c5d313afd6..2c3de55fd295c 100644
--- a/devtools/maven/src/main/java/io/quarkus/platform/tools/maven/MojoMessageWriter.java
+++ b/devtools/maven/src/main/java/io/quarkus/platform/tools/maven/MojoMessageWriter.java
@@ -2,7 +2,7 @@
 
 import org.apache.maven.plugin.logging.Log;
 
-import io.quarkus.platform.tools.MessageWriter;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 
 public class MojoMessageWriter implements MessageWriter {
 
diff --git a/devtools/maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/devtools/maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
new file mode 100644
index 0000000000000..d174ca348de41
--- /dev/null
+++ b/devtools/maven/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
@@ -0,0 +1,18 @@
+<lifecycleMappingMetadata>
+    <pluginExecutions>
+        <pluginExecution>
+            <pluginExecutionFilter>
+                <goals>
+                    <goal>generate-code</goal>
+                    <goal>generate-code-tests</goal>
+                </goals>
+            </pluginExecutionFilter>
+            <action>
+                <execute>
+                    <runOnIncremental>false</runOnIncremental>
+                    <runOnConfiguration>true</runOnConfiguration>
+                </execute>
+            </action>
+        </pluginExecution>
+    </pluginExecutions>
+</lifecycleMappingMetadata>
\ No newline at end of file
diff --git a/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java b/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java
new file mode 100644
index 0000000000000..bea249e22f50b
--- /dev/null
+++ b/devtools/maven/src/main/resources/create-extension-templates/DevModeTest.java
@@ -0,0 +1,22 @@
+package [=javaPackageBase].test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class [=artifactIdBaseCamelCase]DevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/devtools/maven/src/main/resources/create-extension-templates/TestResource.java b/devtools/maven/src/main/resources/create-extension-templates/TestResource.java
index f8b8d430654c0..5924cb6974287 100644
--- a/devtools/maven/src/main/resources/create-extension-templates/TestResource.java
+++ b/devtools/maven/src/main/resources/create-extension-templates/TestResource.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java b/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java
new file mode 100644
index 0000000000000..67c7dc6d47196
--- /dev/null
+++ b/devtools/maven/src/main/resources/create-extension-templates/UnitTest.java
@@ -0,0 +1,23 @@
+package [=javaPackageBase].test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class [=artifactIdBaseCamelCase]Test {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml
index b98ab19f868ab..0750743c84ba9 100644
--- a/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml
+++ b/devtools/maven/src/main/resources/create-extension-templates/deployment-pom.xml
@@ -25,6 +25,11 @@
 [#if !assumeManaged ]            <version>[=r"$"]{project.version}</version>
 [/#if]
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml
index d3d7f28fb129b..97b4311c56b2d 100644
--- a/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml
+++ b/devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml
@@ -70,6 +70,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -98,28 +101,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                    <enableReports>false</enableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml
index 4dd531f8457e8..cfc99377dfd3b 100644
--- a/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml
+++ b/devtools/maven/src/main/resources/create-extension-templates/parent-pom.xml
@@ -7,11 +7,13 @@
         <groupId>[=grandParentGroupId]</groupId>
         <artifactId>[=grandParentArtifactId]</artifactId>
         <version>[=grandParentVersion]</version>
-        <relativePath>[=grandParentRelativePath]</relativePath>
+[#if grandParentRelativePath?? ]        <relativePath>[=grandParentRelativePath]</relativePath>
+[/#if]
     </parent>
 [/#if]
 
-[#if grandParentGroupId?? ][#if groupId != grandParentGroupId ]    <groupId>[=groupId]</groupId>[/#if][#else ]    <groupId>[=groupId]</groupId>
+[#if grandParentGroupId?? ][#if groupId != grandParentGroupId ]    <groupId>[=groupId]</groupId>
+[/#if][#else ]    <groupId>[=groupId]</groupId>
 [/#if]
     <artifactId>[=artifactId]-parent</artifactId>
 [#if groupId?? && (!grandParentGroupId?? || groupId != grandParentGroupId) && version?? && (!grandParentVersion?? || version != grandParentVersion) ]    <version>[=version]</version>
diff --git a/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml b/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml
index 91cbc7ee11ba7..18819ba59b719 100644
--- a/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml
+++ b/devtools/maven/src/main/resources/create-extension-templates/runtime-pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>[=dep.groupId]</groupId>
             <artifactId>[=dep.artifactId]</artifactId>
-[#if !runtimeBomPathSet ]            <version>[=dep.version]</version>
+[#if !bomPathSet ]            <version>[=dep.version]</version>
 [/#if]
 [#if dep.type?? ]            <type>[=dep.type]</type>
 [/#if]
diff --git a/devtools/platform-descriptor-json-plugin/pom.xml b/devtools/platform-descriptor-json-plugin/pom.xml
index e6482dffd3783..3959a47c3c77c 100644
--- a/devtools/platform-descriptor-json-plugin/pom.xml
+++ b/devtools/platform-descriptor-json-plugin/pom.xml
@@ -36,11 +36,6 @@
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
@@ -65,7 +60,7 @@
      
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
         </dependency>
 
     </dependencies>
diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java
index 5188ff543ba11..3764f2d7dd899 100644
--- a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java
+++ b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GenerateExtensionsJsonMojo.java
@@ -12,8 +12,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.json.Json;
 import javax.json.JsonArray;
@@ -27,6 +29,7 @@
 import javax.json.JsonWriterFactory;
 import javax.json.stream.JsonGenerator;
 
+import org.apache.maven.model.Model;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -47,27 +50,37 @@
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
 
-import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
 import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
+import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils;
+import io.quarkus.bootstrap.util.IoUtils;
 import io.quarkus.bootstrap.util.ZipUtils;
-import io.quarkus.dependencies.Extension;
 import io.quarkus.platform.tools.ToolsConstants;
 
 /**
  * This goal generates a list of extensions for a given BOM
  * and stores it in a JSON format file that is later used by the tools
  * as the catalog of available extensions.
+ * 
+ * @deprecated in favor of {@link GeneratePlatformDescriptorJsonMojo}
  */
+@Deprecated
 @Mojo(name = "generate-extensions-json")
 public class GenerateExtensionsJsonMojo extends AbstractMojo {
 
+    private static final String GROUP_ID = "group-id";
+    private static final String ARTIFACT_ID = "artifact-id";
+    private static final String VERSION = "version";
+
     @Parameter(property = "bomGroupId", defaultValue = "${project.groupId}")
     private String bomGroupId;
 
@@ -81,7 +94,7 @@ public class GenerateExtensionsJsonMojo extends AbstractMojo {
     @Parameter(property = "overridesFile", defaultValue = "${project.basedir}/src/main/resources/extensions-overrides.json")
     private String overridesFile;
 
-    @Parameter(property = "outputFile", defaultValue = "${project.build.directory}/extensions.json")
+    @Parameter(property = "outputFile", defaultValue = "${project.build.directory}/${project.artifactId}-${project.version}-${project.version}.json")
     private File outputFile;
 
     @Component
@@ -98,33 +111,65 @@ public class GenerateExtensionsJsonMojo extends AbstractMojo {
     @Component
     private MavenProjectHelper projectHelper;
 
-    public GenerateExtensionsJsonMojo() {
-        MojoLogger.logSupplier = this::getLog;
-    }
+    /**
+     * Group ID's that we know don't contain extensions. This can speed up the process
+     * by preventing the download of artifacts that are not required.
+     */
+    @Parameter
+    private Set<String> ignoredGroupIds = new HashSet<>(0);
+
+    @Parameter
+    private boolean skipArtifactIdCheck;
+
+    @Parameter(property = "skipBomCheck")
+    private boolean skipBomCheck;
+
+    @Parameter(property = "resolveDependencyManagement")
+    boolean resolveDependencyManagement;
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
 
+        final Artifact jsonArtifact = new DefaultArtifact(project.getGroupId(), project.getArtifactId(), project.getVersion(),
+                "json", project.getVersion());
+        if (!skipArtifactIdCheck) {
+            final String expectedArtifactId = bomArtifactId + BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX;
+            if (!jsonArtifact.getArtifactId().equals(expectedArtifactId)) {
+                throw new MojoExecutionException(
+                        "The project's artifactId " + project.getArtifactId() + " is expected to be " + expectedArtifactId);
+            }
+            if (!jsonArtifact.getGroupId().equals(bomGroupId)) {
+                throw new MojoExecutionException("The project's groupId " + project.getGroupId()
+                        + " is expected to match the groupId of the BOM which is " + bomGroupId);
+            }
+            if (!jsonArtifact.getVersion().equals(bomVersion)) {
+                throw new MojoExecutionException("The project's version " + project.getVersion()
+                        + " is expected to match the version of the BOM which is " + bomVersion);
+            }
+        }
+
         // Get the BOM artifact
         final DefaultArtifact bomArtifact = new DefaultArtifact(bomGroupId, bomArtifactId, "", "pom", bomVersion);
         info("Generating catalog of extensions for %s", bomArtifact);
 
-        // And get all its dependencies (which are extensions)
-        final List<Dependency> deps;
-        try {
-            deps = repoSystem
-                    .readArtifactDescriptor(repoSession,
-                            new ArtifactDescriptorRequest().setRepositories(repos).setArtifact(bomArtifact))
-                    .getManagedDependencies();
-        } catch (ArtifactDescriptorException e) {
-            throw new MojoExecutionException("Failed to read descriptor of " + bomArtifact, e);
+        // if the BOM is generated and has replaced the original one, to pick up the generated content
+        // we should read the dependencyManagement from the generated pom.xml
+        List<Dependency> deps;
+        if (resolveDependencyManagement) {
+            getLog().debug("Resolving dependencyManagement from the artifact descriptor");
+            deps = dependencyManagementFromDescriptor(bomArtifact);
+        } else {
+            deps = dependencyManagementFromProject();
+            if (deps == null) {
+                deps = dependencyManagementFromResolvedPom(bomArtifact);
+            }
         }
         if (deps.isEmpty()) {
             getLog().warn("BOM " + bomArtifact + " does not include any dependency");
             return;
         }
 
-        List<OverrideInfo> allOverrides = new ArrayList();
+        List<OverrideInfo> allOverrides = new ArrayList<>();
         for (String path : overridesFile.split(",")) {
             OverrideInfo overrideInfo = getOverrideInfo(new File(path.trim()));
             if (overrideInfo != null) {
@@ -135,14 +180,26 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         // Create a JSON array of extension descriptors
         final JsonArrayBuilder extListJson = Json.createArrayBuilder();
         String quarkusCoreVersion = null;
+        boolean jsonFoundInBom = false;
         for (Dependency dep : deps) {
             final Artifact artifact = dep.getArtifact();
-            if (!artifact.getExtension().equals("jar")
+
+            if (!skipBomCheck && !jsonFoundInBom) {
+                jsonFoundInBom = artifact.getArtifactId().equals(jsonArtifact.getArtifactId())
+                        && artifact.getGroupId().equals(jsonArtifact.getGroupId())
+                        && artifact.getExtension().equals(jsonArtifact.getExtension())
+                        && artifact.getClassifier().equals(jsonArtifact.getClassifier())
+                        && artifact.getVersion().equals(jsonArtifact.getVersion());
+            }
+
+            if (ignoredGroupIds.contains(artifact.getGroupId())
+                    || !artifact.getExtension().equals("jar")
                     || "javadoc".equals(artifact.getClassifier())
                     || "tests".equals(artifact.getClassifier())
                     || "sources".equals(artifact.getClassifier())) {
                 continue;
             }
+
             if (artifact.getArtifactId().equals(ToolsConstants.QUARKUS_CORE_ARTIFACT_ID)
                     && artifact.getGroupId().equals(ToolsConstants.QUARKUS_CORE_GROUP_ID)) {
                 quarkusCoreVersion = artifact.getVersion();
@@ -170,6 +227,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
         }
 
+        if (!skipBomCheck && !jsonFoundInBom) {
+            throw new MojoExecutionException(
+                    "Failed to locate " + jsonArtifact + " in the dependencyManagement section of " + bomArtifact);
+        }
         if (quarkusCoreVersion == null) {
             throw new MojoExecutionException("Failed to determine the Quarkus Core version for " + bomArtifact);
         }
@@ -178,9 +239,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         final JsonObjectBuilder platformJson = Json.createObjectBuilder();
         // Add information about the BOM to it
         final JsonObjectBuilder bomJson = Json.createObjectBuilder();
-        bomJson.add(Extension.GROUP_ID, bomGroupId);
-        bomJson.add(Extension.ARTIFACT_ID, bomArtifactId);
-        bomJson.add(Extension.VERSION, bomVersion);
+        bomJson.add(GROUP_ID, bomGroupId);
+        bomJson.add(ARTIFACT_ID, bomArtifactId);
+        bomJson.add(VERSION, bomVersion);
         platformJson.add("bom", bomJson.build());
         // Add Quarkus version
         platformJson.add("quarkus-core-version", quarkusCoreVersion);
@@ -218,7 +279,86 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
         info("Extensions file written to %s", outputFile);
 
-        projectHelper.attachArtifact(project, "json", null, outputFile);
+        // this is necessary to sometimes be able to resolve the artifacts from the workspace
+        final File published = new File(project.getBuild().getDirectory(), LocalWorkspace.getFileName(jsonArtifact));
+        if (!outputDir.equals(published)) {
+            try {
+                IoUtils.copy(outputFile.toPath(), published.toPath());
+            } catch (IOException e) {
+                throw new MojoExecutionException("Failed to copy " + outputFile + " to " + published);
+            }
+        }
+        projectHelper.attachArtifact(project, jsonArtifact.getExtension(), jsonArtifact.getClassifier(), published);
+    }
+
+    private List<Dependency> dependencyManagementFromDescriptor(Artifact bomArtifact) throws MojoExecutionException {
+        try {
+            return repoSystem
+                    .readArtifactDescriptor(repoSession,
+                            new ArtifactDescriptorRequest().setRepositories(repos).setArtifact(bomArtifact))
+                    .getManagedDependencies();
+        } catch (ArtifactDescriptorException e) {
+            throw new MojoExecutionException("Failed to read descriptor of " + bomArtifact, e);
+        }
+    }
+
+    private List<Dependency> dependencyManagementFromResolvedPom(Artifact bomArtifact) throws MojoExecutionException {
+        final Path pomXml;
+        try {
+            pomXml = repoSystem
+                    .resolveArtifact(repoSession, new ArtifactRequest().setArtifact(bomArtifact).setRepositories(repos))
+                    .getArtifact().getFile().toPath();
+        } catch (ArtifactResolutionException e) {
+            throw new MojoExecutionException("Failed to resolve " + bomArtifact, e);
+        }
+        return readDependencyManagement(pomXml);
+    }
+
+    private List<Dependency> dependencyManagementFromProject() throws MojoExecutionException {
+        // if the configured BOM coordinates are not matching the current project
+        // the current project's POM isn't the right source
+        if (!project.getArtifact().getArtifactId().equals(bomArtifactId)
+                || !project.getArtifact().getVersion().equals(bomVersion)
+                || !project.getArtifact().getGroupId().equals(bomGroupId)
+                || !project.getFile().exists()) {
+            return null;
+        }
+        return readDependencyManagement(project.getFile().toPath());
+    }
+
+    private List<Dependency> readDependencyManagement(Path pomXml) throws MojoExecutionException {
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Reading dependencyManagement from " + pomXml);
+        }
+        final Model bomModel;
+        try {
+            bomModel = ModelUtils.readModel(pomXml);
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to parse " + project.getFile(), e);
+        }
+
+        // if the POM has a parent then we better resolve the descriptor
+        if (bomModel.getParent() != null) {
+            throw new MojoExecutionException(pomXml
+                    + " has a parent, in which case it is recommended to set 'resolveDependencyManagement' parameter to true");
+        }
+
+        if (bomModel.getDependencyManagement() == null) {
+            return Collections.emptyList();
+        }
+        final List<org.apache.maven.model.Dependency> modelDeps = bomModel.getDependencyManagement().getDependencies();
+        if (modelDeps.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        final List<Dependency> deps = new ArrayList<>(modelDeps.size());
+        for (org.apache.maven.model.Dependency modelDep : modelDeps) {
+            final Artifact artifact = new DefaultArtifact(modelDep.getGroupId(), modelDep.getArtifactId(),
+                    modelDep.getClassifier(), modelDep.getType(), modelDep.getVersion());
+            // exclusions aren't relevant in this context
+            deps.add(new Dependency(artifact, modelDep.getScope(), modelDep.isOptional(), Collections.emptyList()));
+        }
+        return deps;
     }
 
     private JsonObject processDependency(Artifact artifact) throws IOException {
@@ -275,8 +415,8 @@ private JsonNode processMetaInfDir(Artifact artifact, Path metaInfDir)
                 final Path props = metaInfDir.resolve(BootstrapConstants.DESCRIPTOR_FILE_NAME);
                 if (Files.exists(props)) {
                     return mapper.createObjectNode()
-                            .put(Extension.ARTIFACT_ID, artifact.getArtifactId())
-                            .put(Extension.GROUP_ID, artifact.getGroupId())
+                            .put(ARTIFACT_ID, artifact.getArtifactId())
+                            .put(GROUP_ID, artifact.getGroupId())
                             .put("version", artifact.getVersion())
                             .put("name", artifact.getArtifactId());
                 } else {
@@ -294,7 +434,7 @@ private JsonNode processPlatformArtifact(Artifact artifact, Path descriptor, Obj
         try (InputStream is = Files.newInputStream(descriptor)) {
             ObjectNode object = mapper.readValue(is, ObjectNode.class);
             transformLegacyToNew(object, mapper);
-            debug("Adding Quarkus extension %s:%s", object.get(Extension.GROUP_ID), object.get(Extension.ARTIFACT_ID));
+            debug("Adding Quarkus extension %s:%s", object.get(GROUP_ID), object.get(ARTIFACT_ID));
             return object;
         } catch (IOException io) {
             throw new IOException("Failed to parse " + descriptor, io);
@@ -306,24 +446,27 @@ private ObjectMapper getMapper(boolean yaml) {
         if (yaml) {
             YAMLFactory yf = new YAMLFactory();
             return new ObjectMapper(yf)
-                    .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+                    .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE);
         } else {
-            return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT)
-                    .enable(JsonParser.Feature.ALLOW_COMMENTS).enable(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS)
-                    .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+            return JsonMapper.builder()
+                    .enable(SerializationFeature.INDENT_OUTPUT)
+                    .enable(JsonReadFeature.ALLOW_JAVA_COMMENTS)
+                    .enable(JsonReadFeature.ALLOW_LEADING_ZEROS_FOR_NUMBERS)
+                    .propertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE)
+                    .build();
         }
     }
 
     private String extensionId(JsonObject extObject) {
-        String artId = extObject.getString(Extension.ARTIFACT_ID, "");
+        String artId = extObject.getString(ARTIFACT_ID, "");
         if (artId.isEmpty()) {
             getLog().warn("Missing artifactId in extension overrides in " + extObject.toString());
         }
-        String groupId = extObject.getString(Extension.GROUP_ID, "");
+        String groupId = extObject.getString(GROUP_ID, "");
         if (groupId.isEmpty()) {
             return artId;
         } else {
-            return extObject.getString(Extension.GROUP_ID, "") + ":" + artId;
+            return extObject.getString(GROUP_ID, "") + ":" + artId;
         }
     }
 
@@ -376,12 +519,12 @@ private void transformLegacyToNew(ObjectNode extObject, ObjectMapper mapper) {
         // just putting it
         // here for completenes
         if (extObject.get("groupId") != null) {
-            extObject.set(Extension.GROUP_ID, extObject.get("groupId"));
+            extObject.set(GROUP_ID, extObject.get("groupId"));
             extObject.remove("groupId");
         }
 
         if (extObject.get("artifactId") != null) {
-            extObject.set(Extension.ARTIFACT_ID, extObject.get("artifactId"));
+            extObject.set(ARTIFACT_ID, extObject.get("artifactId"));
             extObject.remove("artifactId");
         }
 
@@ -413,34 +556,34 @@ private void transformLegacyToNew(ObjectNode extObject, ObjectMapper mapper) {
 
     public OverrideInfo getOverrideInfo(File overridesFile) throws MojoExecutionException {
         // Read the overrides file for the extensions (if it exists)
-        HashMap extOverrides = new HashMap<>();
+        HashMap<String, JsonObject> extOverrides = new HashMap<>();
         JsonObject theRest = null;
         if (overridesFile.isFile()) {
             info("Found overrides file %s", overridesFile);
-            try (JsonReader jsonReader = Json.createReader(new FileInputStream(overridesFile))) {
-                JsonObject overridesObject = jsonReader.readObject();
-                JsonArray extOverrideObjects = overridesObject.getJsonArray("extensions");
-                if (extOverrideObjects != null) {
-                    // Put the extension overrides into a map keyed to their GAV
-                    for (JsonValue val : extOverrideObjects) {
-                        JsonObject extOverrideObject = val.asJsonObject();
-                        String key = extensionId(extOverrideObject);
-                        extOverrides.put(key, extOverrideObject);
+            try (FileInputStream fileInputStream = new FileInputStream(overridesFile)) {
+                try (JsonReader jsonReader = Json.createReader(fileInputStream)) {
+                    JsonObject overridesObject = jsonReader.readObject();
+                    JsonArray extOverrideObjects = overridesObject.getJsonArray("extensions");
+                    if (extOverrideObjects != null) {
+                        // Put the extension overrides into a map keyed to their GAV
+                        for (JsonValue val : extOverrideObjects) {
+                            JsonObject extOverrideObject = val.asJsonObject();
+                            String key = extensionId(extOverrideObject);
+                            extOverrides.put(key, extOverrideObject);
+                        }
                     }
-                }
 
-                theRest = overridesObject;
+                    theRest = overridesObject;
+                }
             } catch (IOException e) {
                 throw new MojoExecutionException("Failed to read " + overridesFile, e);
             }
             return new OverrideInfo(extOverrides, theRest);
-
-        } else {
-            throw new MojoExecutionException(overridesFile + " not found.");
         }
+        return null;
     }
 
-    private class OverrideInfo {
+    private static class OverrideInfo {
         private Map<String, JsonObject> extOverrides;
         private JsonObject theRest;
 
diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GeneratePlatformDescriptorJsonMojo.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GeneratePlatformDescriptorJsonMojo.java
new file mode 100644
index 0000000000000..b90c02ece37fb
--- /dev/null
+++ b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/GeneratePlatformDescriptorJsonMojo.java
@@ -0,0 +1,669 @@
+package io.quarkus.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactDescriptorException;
+import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
+import org.eclipse.aether.resolution.ArtifactRequest;
+import org.eclipse.aether.resolution.ArtifactResolutionException;
+import org.eclipse.aether.resolution.ArtifactResult;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.resolver.AppModelResolverException;
+import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
+import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils;
+import io.quarkus.bootstrap.util.IoUtils;
+import io.quarkus.bootstrap.util.ZipUtils;
+import io.quarkus.platform.descriptor.ProjectPlatformDescriptorJsonUtil;
+import io.quarkus.platform.tools.ToolsConstants;
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonCategory;
+import io.quarkus.registry.catalog.json.JsonExtension;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
+
+/**
+ * This goal generates a platform JSON descriptor for a given platform BOM.
+ */
+@Mojo(name = "generate-platform-descriptor-json")
+public class GeneratePlatformDescriptorJsonMojo extends AbstractMojo {
+
+    @Parameter(property = "quarkusCoreGroupId", defaultValue = ToolsConstants.QUARKUS_CORE_GROUP_ID)
+    private String quarkusCoreGroupId;
+
+    @Parameter(property = "quarkusCoreArtifactId", defaultValue = ToolsConstants.QUARKUS_CORE_ARTIFACT_ID)
+    private String quarkusCoreArtifactId;
+
+    @Parameter(property = "bomGroupId", defaultValue = "${project.groupId}")
+    private String bomGroupId;
+
+    @Parameter(property = "bomArtifactId", defaultValue = "${project.artifactId}")
+    private String bomArtifactId;
+
+    @Parameter(property = "bomVersion", defaultValue = "${project.version}")
+    private String bomVersion;
+
+    /** file used for overrides - overridesFiles takes precedence over this file. **/
+    @Parameter(property = "overridesFile", defaultValue = "${project.basedir}/src/main/resources/extensions-overrides.json")
+    private String overridesFile;
+
+    @Parameter(property = "outputFile", defaultValue = "${project.build.directory}/${project.artifactId}-${project.version}-${project.version}.json")
+    private File outputFile;
+
+    @Component
+    private RepositorySystem repoSystem;
+
+    @Component
+    RemoteRepositoryManager remoteRepoManager;
+
+    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+    private RepositorySystemSession repoSession;
+
+    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
+    private List<RemoteRepository> repos;
+
+    @Component
+    private MavenProject project;
+    @Component
+    private MavenProjectHelper projectHelper;
+
+    /**
+     * Group ID's that we know don't contain extensions. This can speed up the process
+     * by preventing the download of artifacts that are not required.
+     */
+    @Parameter
+    private Set<String> ignoredGroupIds = new HashSet<>(0);
+
+    /**
+     * Skips the check for the descriptor's artifactId naming convention
+     */
+    @Parameter
+    private boolean skipArtifactIdCheck;
+
+    /**
+     * Skips the check for the BOM to contain the generated platform JSON descriptor
+     */
+    @Parameter(property = "skipBomCheck")
+    private boolean skipBomCheck;
+
+    /**
+     * Skips the check for categories referenced from the extensions to be listed in the generated descriptor
+     */
+    @Parameter(property = "skipCategoryCheck")
+    boolean skipCategoryCheck;
+
+    @Parameter(property = "resolveDependencyManagement")
+    boolean resolveDependencyManagement;
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+
+        final Artifact jsonArtifact = new DefaultArtifact(project.getGroupId(), project.getArtifactId(), project.getVersion(),
+                "json", project.getVersion());
+        if (!skipArtifactIdCheck) {
+            final String expectedArtifactId = bomArtifactId + BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX;
+            if (!jsonArtifact.getArtifactId().equals(expectedArtifactId)) {
+                throw new MojoExecutionException(
+                        "The project's artifactId " + project.getArtifactId() + " is expected to be " + expectedArtifactId);
+            }
+            if (!jsonArtifact.getGroupId().equals(bomGroupId)) {
+                throw new MojoExecutionException("The project's groupId " + project.getGroupId()
+                        + " is expected to match the groupId of the BOM which is " + bomGroupId);
+            }
+            if (!jsonArtifact.getVersion().equals(bomVersion)) {
+                throw new MojoExecutionException("The project's version " + project.getVersion()
+                        + " is expected to match the version of the BOM which is " + bomVersion);
+            }
+        }
+
+        // Get the BOM artifact
+        final DefaultArtifact bomArtifact = new DefaultArtifact(bomGroupId, bomArtifactId, "", "pom", bomVersion);
+        info("Generating catalog of extensions for %s", bomArtifact);
+
+        // if the BOM is generated and has replaced the original one, to pick up the generated content
+        // we should read the dependencyManagement from the generated pom.xml
+        List<Dependency> deps;
+        if (resolveDependencyManagement) {
+            getLog().debug("Resolving dependencyManagement from the artifact descriptor");
+            deps = dependencyManagementFromDescriptor(bomArtifact);
+        } else {
+            deps = dependencyManagementFromProject();
+            if (deps == null) {
+                deps = dependencyManagementFromResolvedPom(bomArtifact);
+            }
+        }
+        if (deps.isEmpty()) {
+            getLog().warn("BOM " + bomArtifact + " does not include any dependency");
+            return;
+        }
+
+        List<OverrideInfo> allOverrides = new ArrayList<>();
+        for (String path : overridesFile.split(",")) {
+            OverrideInfo overrideInfo = getOverrideInfo(new File(path.trim()));
+            if (overrideInfo != null) {
+                allOverrides.add(overrideInfo);
+            }
+        }
+
+        final JsonExtensionCatalog platformJson = new JsonExtensionCatalog();
+        final String platformId = jsonArtifact.getGroupId() + ":" + jsonArtifact.getArtifactId() + ":"
+                + jsonArtifact.getClassifier()
+                + ":" + jsonArtifact.getExtension() + ":" + jsonArtifact.getVersion();
+        platformJson.setId(platformId);
+        platformJson.setBom(ArtifactCoords.pom(bomGroupId, bomArtifactId, bomVersion));
+        platformJson.setPlatform(true);
+
+        final List<AppArtifact> importedDescriptors = deps.stream().filter(
+                d -> d.getArtifact().getArtifactId().endsWith(BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)
+                        && d.getArtifact().getExtension().equals("json")
+                        && !(d.getArtifact().getArtifactId().equals(jsonArtifact.getArtifactId())
+                                && d.getArtifact().getGroupId().equals(jsonArtifact.getGroupId())))
+                .map(d -> new AppArtifact(d.getArtifact().getGroupId(), d.getArtifact().getArtifactId(),
+                        d.getArtifact().getClassifier(), d.getArtifact().getExtension(), d.getArtifact().getVersion()))
+                .collect(Collectors.toList());
+
+        Map<ArtifactKey, Extension> inheritedExtensions = Collections.emptyMap();
+        if (!importedDescriptors.isEmpty()) {
+            final MavenArtifactResolver mvnResolver;
+            try {
+                mvnResolver = MavenArtifactResolver.builder()
+                        .setRepositorySystem(repoSystem)
+                        .setRemoteRepositoryManager(remoteRepoManager)
+                        .setRepositorySystemSession(repoSession)
+                        .setRemoteRepositories(repos)
+                        .setWorkspaceDiscovery(false)
+                        .build();
+            } catch (BootstrapMavenException e) {
+                throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e);
+            }
+            final JsonExtensionCatalog baseCatalog;
+            try {
+                baseCatalog = ProjectPlatformDescriptorJsonUtil
+                        .resolveCatalog(new BootstrapAppModelResolver(mvnResolver), importedDescriptors);
+            } catch (AppModelResolverException e) {
+                throw new MojoExecutionException("Failed to resolver inherited platform descriptor", e);
+            }
+            platformJson.setDerivedFrom(baseCatalog.getDerivedFrom());
+            platformJson.setCategories(baseCatalog.getCategories());
+
+            final List<Extension> extensions = baseCatalog.getExtensions();
+            if (!extensions.isEmpty()) {
+                inheritedExtensions = new HashMap<>(extensions.size());
+                for (Extension e : extensions) {
+                    inheritedExtensions.put(e.getArtifact().getKey(), e);
+                }
+            }
+
+            platformJson.setMetadata(baseCatalog.getMetadata());
+        }
+
+        // Create a JSON array of extension descriptors
+        final Set<String> referencedCategories = new HashSet<>();
+        final List<io.quarkus.registry.catalog.Extension> extListJson = new ArrayList<>();
+        platformJson.setExtensions(extListJson);
+        String quarkusCoreVersion = null;
+        boolean jsonFoundInBom = false;
+        for (Dependency dep : deps) {
+            final Artifact artifact = dep.getArtifact();
+
+            if (!skipBomCheck && !jsonFoundInBom) {
+                jsonFoundInBom = artifact.getArtifactId().equals(jsonArtifact.getArtifactId())
+                        && artifact.getGroupId().equals(jsonArtifact.getGroupId())
+                        && artifact.getExtension().equals(jsonArtifact.getExtension())
+                        && artifact.getClassifier().equals(jsonArtifact.getClassifier())
+                        && artifact.getVersion().equals(jsonArtifact.getVersion());
+            }
+
+            if (ignoredGroupIds.contains(artifact.getGroupId())
+                    || !artifact.getExtension().equals("jar")
+                    || "javadoc".equals(artifact.getClassifier())
+                    || "tests".equals(artifact.getClassifier())
+                    || "sources".equals(artifact.getClassifier())) {
+                continue;
+            }
+
+            if (artifact.getArtifactId().equals(quarkusCoreArtifactId)
+                    && artifact.getGroupId().equals(quarkusCoreGroupId)) {
+                quarkusCoreVersion = artifact.getVersion();
+            }
+            ArtifactResult resolved = null;
+            JsonExtension extension = null;
+            try {
+                resolved = repoSystem.resolveArtifact(repoSession,
+                        new ArtifactRequest().setRepositories(repos).setArtifact(artifact));
+                extension = processDependency(resolved.getArtifact());
+            } catch (ArtifactResolutionException e) {
+                // there are some parent poms that appear as jars for some reason
+                debug("Failed to resolve dependency %s defined in %s", artifact, bomArtifact);
+            } catch (IOException e) {
+                throw new MojoExecutionException("Failed to process dependency " + artifact, e);
+            }
+
+            if (extension == null) {
+                continue;
+            }
+
+            Extension inherited = inheritedExtensions.get(extension.getArtifact().getKey());
+            final List<ExtensionOrigin> origins;
+            if (inherited != null) {
+                origins = new ArrayList<>(inherited.getOrigins().size() + 1);
+                origins.addAll(inherited.getOrigins());
+                origins.add(platformJson);
+            } else {
+                origins = Arrays.asList(platformJson);
+            }
+            extension.setOrigins(origins);
+            String key = extensionId(extension);
+            for (OverrideInfo info : allOverrides) {
+                io.quarkus.registry.catalog.Extension extOverride = info.getExtOverrides().get(key);
+                if (extOverride != null) {
+                    extension = mergeObject(extension, extOverride);
+                }
+            }
+            extListJson.add(extension);
+
+            if (!skipCategoryCheck) {
+                try {
+                    @SuppressWarnings("unchecked")
+                    final Collection<String> extCategories = (Collection<String>) extension.getMetadata()
+                            .get("categories");
+                    if (extCategories != null) {
+                        referencedCategories.addAll(extCategories);
+                    }
+                } catch (ClassCastException e) {
+                    getLog().warn("Failed to cast the extension categories list to java.util.Collection<String>", e);
+                }
+            }
+        }
+
+        if (!skipBomCheck && !jsonFoundInBom) {
+            throw new MojoExecutionException(
+                    "Failed to locate " + jsonArtifact + " in the dependencyManagement section of " + bomArtifact);
+        }
+        if (quarkusCoreVersion == null) {
+            throw new MojoExecutionException("Failed to determine the Quarkus Core version for " + bomArtifact);
+        }
+        platformJson.setQuarkusCoreVersion(quarkusCoreVersion);
+
+        for (OverrideInfo info : allOverrides) {
+            if (info.getTheRest() != null) {
+                if (!info.getTheRest().getCategories().isEmpty()) {
+                    if (platformJson.getCategories().isEmpty()) {
+                        platformJson.setCategories(info.getTheRest().getCategories());
+                    } else {
+                        info.getTheRest().getCategories().stream().forEach(c -> {
+                            boolean found = false;
+                            for (Category platformC : platformJson.getCategories()) {
+                                if (platformC.getId().equals(c.getId())) {
+                                    found = true;
+                                    JsonCategory jsonC = (JsonCategory) platformC;
+                                    if (c.getDescription() != null) {
+                                        jsonC.setDescription(c.getDescription());
+                                    }
+                                    if (!c.getMetadata().isEmpty()) {
+                                        if (jsonC.getMetadata().isEmpty()) {
+                                            jsonC.setMetadata(c.getMetadata());
+                                        } else {
+                                            jsonC.getMetadata().putAll(c.getMetadata());
+                                        }
+                                    }
+                                    if (c.getName() != null) {
+                                        jsonC.setName(c.getName());
+                                    }
+                                }
+                                break;
+                            }
+                            if (!found) {
+                                platformJson.getCategories().add(c);
+                            }
+                        });
+                    }
+                }
+            }
+            if (!info.getTheRest().getMetadata().isEmpty()) {
+                if (platformJson.getMetadata().isEmpty()) {
+                    platformJson.setMetadata(info.getTheRest().getMetadata());
+                } else {
+                    platformJson.getMetadata().putAll(info.getTheRest().getMetadata());
+                }
+            }
+        }
+
+        // make sure all the categories referenced by extensions are actually present in
+        // the platform descriptor
+        if (!skipCategoryCheck) {
+            final Set<String> catalogCategories = platformJson.getCategories().stream().map(c -> c.getId())
+                    .collect(Collectors.toSet());
+            if (!catalogCategories.containsAll(referencedCategories)) {
+                final List<String> missing = referencedCategories.stream().filter(c -> !catalogCategories.contains(c))
+                        .collect(Collectors.toList());
+                final StringBuilder buf = new StringBuilder();
+                buf.append(
+                        "The following categories referenced from extensions are missing from the generated catalog: ");
+                buf.append(missing.get(0));
+                for (int i = 1; i < missing.size(); ++i) {
+                    buf.append(", ").append(missing.get(i));
+                }
+                throw new MojoExecutionException(buf.toString());
+            }
+        }
+
+        // Write the JSON to the output file
+        final File outputDir = outputFile.getParentFile();
+        if (outputFile.exists()) {
+            outputFile.delete();
+        } else if (!outputDir.exists()) {
+            if (!outputDir.mkdirs()) {
+                throw new MojoExecutionException("Failed to create output directory " + outputDir);
+            }
+        }
+        try {
+            JsonCatalogMapperHelper.serialize(platformJson, outputFile.toPath().getParent().resolve(outputFile.getName()));
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to persist the platform descriptor", e);
+        }
+        info("Extensions file written to %s", outputFile);
+
+        // this is necessary to sometimes be able to resolve the artifacts from the workspace
+        final File published = new File(project.getBuild().getDirectory(), LocalWorkspace.getFileName(jsonArtifact));
+        if (!outputDir.equals(published)) {
+            try {
+                IoUtils.copy(outputFile.toPath(), published.toPath());
+            } catch (IOException e) {
+                throw new MojoExecutionException("Failed to copy " + outputFile + " to " + published);
+            }
+        }
+        projectHelper.attachArtifact(project, jsonArtifact.getExtension(), jsonArtifact.getClassifier(), published);
+    }
+
+    private List<Dependency> dependencyManagementFromDescriptor(Artifact bomArtifact) throws MojoExecutionException {
+        try {
+            return repoSystem
+                    .readArtifactDescriptor(repoSession,
+                            new ArtifactDescriptorRequest().setRepositories(repos).setArtifact(bomArtifact))
+                    .getManagedDependencies();
+        } catch (ArtifactDescriptorException e) {
+            throw new MojoExecutionException("Failed to read descriptor of " + bomArtifact, e);
+        }
+    }
+
+    private List<Dependency> dependencyManagementFromResolvedPom(Artifact bomArtifact) throws MojoExecutionException {
+        final Path pomXml;
+        try {
+            pomXml = repoSystem
+                    .resolveArtifact(repoSession, new ArtifactRequest().setArtifact(bomArtifact).setRepositories(repos))
+                    .getArtifact().getFile().toPath();
+        } catch (ArtifactResolutionException e) {
+            throw new MojoExecutionException("Failed to resolve " + bomArtifact, e);
+        }
+        return readDependencyManagement(pomXml);
+    }
+
+    private List<Dependency> dependencyManagementFromProject() throws MojoExecutionException {
+        // if the configured BOM coordinates are not matching the current project
+        // the current project's POM isn't the right source
+        if (!project.getArtifact().getArtifactId().equals(bomArtifactId)
+                || !project.getArtifact().getVersion().equals(bomVersion)
+                || !project.getArtifact().getGroupId().equals(bomGroupId)
+                || !project.getFile().exists()) {
+            return null;
+        }
+        return readDependencyManagement(project.getFile().toPath());
+    }
+
+    private List<Dependency> readDependencyManagement(Path pomXml) throws MojoExecutionException {
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Reading dependencyManagement from " + pomXml);
+        }
+        final Model bomModel;
+        try {
+            bomModel = ModelUtils.readModel(pomXml);
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to parse " + project.getFile(), e);
+        }
+
+        // if the POM has a parent then we better resolve the descriptor
+        if (bomModel.getParent() != null) {
+            throw new MojoExecutionException(pomXml
+                    + " has a parent, in which case it is recommended to set 'resolveDependencyManagement' parameter to true");
+        }
+
+        if (bomModel.getDependencyManagement() == null) {
+            return Collections.emptyList();
+        }
+        final List<org.apache.maven.model.Dependency> modelDeps = bomModel.getDependencyManagement().getDependencies();
+        if (modelDeps.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        final List<Dependency> deps = new ArrayList<>(modelDeps.size());
+        for (org.apache.maven.model.Dependency modelDep : modelDeps) {
+            final Artifact artifact = new DefaultArtifact(modelDep.getGroupId(), modelDep.getArtifactId(),
+                    modelDep.getClassifier(), modelDep.getType(), modelDep.getVersion());
+            // exclusions aren't relevant in this context
+            deps.add(new Dependency(artifact, modelDep.getScope(), modelDep.isOptional(), Collections.emptyList()));
+        }
+        return deps;
+    }
+
+    private JsonExtension processDependency(Artifact artifact) throws IOException {
+        return processDependencyToObjectNode(artifact);
+    }
+
+    private JsonExtension processDependencyToObjectNode(Artifact artifact) throws IOException {
+        final Path path = artifact.getFile().toPath();
+        if (Files.isDirectory(path)) {
+            return processMetaInfDir(artifact, path.resolve(BootstrapConstants.META_INF));
+        } else {
+            try (FileSystem artifactFs = ZipUtils.newFileSystem(path)) {
+                return processMetaInfDir(artifact, artifactFs.getPath(BootstrapConstants.META_INF));
+            }
+        }
+    }
+
+    /**
+     * Load and return javax.jsonObject based on yaml, json or properties file.
+     *
+     * @param artifact
+     * @param metaInfDir
+     * @return
+     * @throws IOException
+     */
+    private JsonExtension processMetaInfDir(Artifact artifact, Path metaInfDir)
+            throws IOException {
+
+        ObjectMapper mapper = null;
+
+        if (!Files.exists(metaInfDir)) {
+            return null;
+        }
+        Path jsonOrYaml = null;
+
+        Path yaml = metaInfDir.resolve(BootstrapConstants.QUARKUS_EXTENSION_FILE_NAME);
+        if (Files.exists(yaml)) {
+            mapper = getMapper(true);
+            jsonOrYaml = yaml;
+        } else {
+            mapper = getMapper(false);
+            Path json = metaInfDir.resolve(BootstrapConstants.EXTENSION_PROPS_JSON_FILE_NAME);
+            if (!Files.exists(json)) {
+                final Path props = metaInfDir.resolve(BootstrapConstants.DESCRIPTOR_FILE_NAME);
+                if (Files.exists(props)) {
+                    final JsonExtension e = new JsonExtension();
+                    e.setArtifact(new ArtifactCoords(artifact.getGroupId(), artifact.getArtifactId(), artifact.getClassifier(),
+                            artifact.getExtension(), artifact.getVersion()));
+                    e.setName(artifact.getArtifactId());
+                    return e;
+                }
+                return null;
+            } else {
+                jsonOrYaml = json;
+            }
+        }
+        return processPlatformArtifact(artifact, jsonOrYaml, mapper);
+    }
+
+    private JsonExtension processPlatformArtifact(Artifact artifact, Path descriptor, ObjectMapper mapper)
+            throws IOException {
+        try (InputStream is = Files.newInputStream(descriptor)) {
+            JsonExtension legacy = mapper.readValue(is, JsonExtension.class);
+            JsonExtension object = transformLegacyToNew(legacy);
+            debug("Adding Quarkus extension %s", object.getArtifact());
+            return object;
+        } catch (IOException io) {
+            throw new IOException("Failed to parse " + descriptor, io);
+        }
+    }
+
+    private ObjectMapper getMapper(boolean yaml) {
+
+        if (yaml) {
+            YAMLFactory yf = new YAMLFactory();
+            return JsonCatalogMapperHelper.initMapper(new ObjectMapper(yf));
+        } else {
+            return JsonCatalogMapperHelper.mapper();
+        }
+    }
+
+    private String extensionId(io.quarkus.registry.catalog.Extension extObject) {
+        return extObject.getArtifact().getGroupId() + ":" + extObject.getArtifact().getArtifactId();
+    }
+
+    private JsonExtension mergeObject(JsonExtension extObject, io.quarkus.registry.catalog.Extension extOverride) {
+        if (extOverride.getArtifact() != null) {
+            extObject.setArtifact(extOverride.getArtifact());
+        }
+        if (!extOverride.getMetadata().isEmpty()) {
+            if (extObject.getMetadata().isEmpty()) {
+                extObject.setMetadata(extOverride.getMetadata());
+            } else {
+                extObject.getMetadata().putAll(extOverride.getMetadata());
+            }
+        }
+        if (extOverride.getName() != null) {
+            extObject.setName(extOverride.getName());
+        }
+        if (!extOverride.getOrigins().isEmpty()) {
+            extObject.setOrigins(extOverride.getOrigins());
+        }
+        return extObject;
+    }
+
+    private void info(String msg, Object... args) {
+        if (!getLog().isInfoEnabled()) {
+            return;
+        }
+        if (args.length == 0) {
+            getLog().info(msg);
+            return;
+        }
+        getLog().info(String.format(msg, args));
+    }
+
+    private void debug(String msg, Object... args) {
+        if (!getLog().isDebugEnabled()) {
+            return;
+        }
+        if (args.length == 0) {
+            getLog().debug(msg);
+            return;
+        }
+        getLog().debug(String.format(msg, args));
+    }
+
+    private JsonExtension transformLegacyToNew(JsonExtension extObject) {
+        final Map<String, Object> metadata = extObject.getMetadata();
+        final Object labels = metadata.get("labels");
+        if (labels != null) {
+            metadata.put("keywords", labels);
+            metadata.remove("labels");
+        }
+        return extObject;
+    }
+
+    public OverrideInfo getOverrideInfo(File overridesFile) throws MojoExecutionException {
+        // Read the overrides file for the extensions (if it exists)
+        HashMap<String, io.quarkus.registry.catalog.Extension> extOverrides = new HashMap<>();
+        JsonExtensionCatalog theRest = null;
+        if (overridesFile.isFile()) {
+            info("Found overrides file %s", overridesFile);
+            try {
+                JsonExtensionCatalog overridesObject = JsonCatalogMapperHelper.deserialize(overridesFile.toPath(),
+                        JsonExtensionCatalog.class);
+                List<io.quarkus.registry.catalog.Extension> extensionsOverrides = overridesObject.getExtensions();
+                if (!extensionsOverrides.isEmpty()) {
+                    // Put the extension overrides into a map keyed to their GAV
+                    for (io.quarkus.registry.catalog.Extension extOverride : extensionsOverrides) {
+                        String key = extensionId(extOverride);
+                        extOverrides.put(key, extOverride);
+                    }
+                }
+
+                theRest = overridesObject;
+            } catch (IOException e) {
+                throw new MojoExecutionException("Failed to read " + overridesFile, e);
+            }
+            return new OverrideInfo(extOverrides, theRest);
+        }
+        return null;
+    }
+
+    private static class OverrideInfo {
+        private Map<String, io.quarkus.registry.catalog.Extension> extOverrides;
+        private JsonExtensionCatalog theRest;
+
+        public OverrideInfo(Map<String, io.quarkus.registry.catalog.Extension> extOverrides,
+                JsonExtensionCatalog theRest) {
+            this.extOverrides = extOverrides;
+            this.theRest = theRest;
+        }
+
+        public Map<String, io.quarkus.registry.catalog.Extension> getExtOverrides() {
+            return extOverrides;
+        }
+
+        public JsonExtensionCatalog getTheRest() {
+            return theRest;
+        }
+    }
+}
diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/MojoLogger.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/MojoLogger.java
deleted file mode 100644
index a903de275476f..0000000000000
--- a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/MojoLogger.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package io.quarkus.maven;
-
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.Map;
-import java.util.function.Supplier;
-
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.shared.utils.logging.MessageBuilder;
-import org.apache.maven.shared.utils.logging.MessageUtils;
-import org.jboss.logging.Logger;
-import org.jboss.logging.LoggerProvider;
-import org.wildfly.common.Assert;
-
-/**
- */
-public class MojoLogger implements LoggerProvider {
-    static final Object[] NO_PARAMS = new Object[0];
-
-    public static volatile Supplier<Log> logSupplier;
-
-    @Override
-    public Logger getLogger(final String name) {
-        return new Logger(name) {
-            @Override
-            protected void doLog(final Level level, final String loggerClassName, final Object message,
-                    final Object[] parameters, final Throwable thrown) {
-                final Supplier<Log> logSupplier = MojoLogger.logSupplier;
-                if (logSupplier != null) {
-                    Log log = logSupplier.get();
-                    String text;
-                    if (parameters == null || parameters.length == 0) {
-                        text = String.valueOf(message);
-                    } else {
-                        try {
-                            text = MessageFormat.format(String.valueOf(message), parameters);
-                        } catch (Exception e) {
-                            text = invalidFormat(String.valueOf(message), parameters);
-                        }
-                    }
-                    synchronized (MojoLogger.class) {
-                        doActualLog(log, level, text, thrown);
-                    }
-                }
-            }
-
-            @Override
-            protected void doLogf(final Level level, final String loggerClassName, final String format,
-                    final Object[] parameters, final Throwable thrown) {
-                final Supplier<Log> logSupplier = MojoLogger.logSupplier;
-                if (logSupplier != null) {
-                    Log log = logSupplier.get();
-                    String text;
-                    if (parameters == null) {
-                        try {
-                            //noinspection RedundantStringFormatCall
-                            text = String.format(format);
-                        } catch (Exception e) {
-                            text = invalidFormat(format, NO_PARAMS);
-                        }
-                    } else {
-                        try {
-                            text = String.format(format, (Object[]) parameters);
-                        } catch (Exception e) {
-                            text = invalidFormat(format, parameters);
-                        }
-                    }
-                    synchronized (MojoLogger.class) {
-                        doActualLog(log, level, text, thrown);
-                    }
-                }
-            }
-
-            @Override
-            public boolean isEnabled(final Level level) {
-                final Supplier<Log> logSupplier = MojoLogger.logSupplier;
-                if (logSupplier == null)
-                    return false;
-                Log log = logSupplier.get();
-                switch (level) {
-                    case FATAL:
-                    case ERROR:
-                        return log.isErrorEnabled();
-                    case WARN:
-                        return log.isWarnEnabled();
-                    case INFO:
-                        return log.isInfoEnabled();
-                    default:
-                        return log.isDebugEnabled();
-                }
-            }
-
-            void doActualLog(final Log log, final Level level, final String message, final Throwable thrown) {
-                final MessageBuilder buffer = MessageUtils.buffer();
-                // style options are limited unless we crack into jansi ourselves
-                buffer.strong("[").project(name).strong("]").a(" ").a(message);
-                if (thrown != null) {
-                    switch (level) {
-                        case FATAL:
-                        case ERROR:
-                            log.error(buffer.toString(), thrown);
-                            break;
-                        case WARN:
-                            log.warn(buffer.toString(), thrown);
-                            break;
-                        case INFO:
-                            log.info(buffer.toString(), thrown);
-                            break;
-                        default:
-                            log.debug(buffer.toString(), thrown);
-                            break;
-                    }
-                } else {
-                    switch (level) {
-                        case FATAL:
-                        case ERROR:
-                            log.error(buffer.toString());
-                            break;
-                        case WARN:
-                            log.warn(buffer.toString());
-                            break;
-                        case INFO:
-                            log.info(buffer.toString());
-                            break;
-                        default:
-                            log.debug(buffer.toString());
-                            break;
-                    }
-                }
-            }
-        };
-    }
-
-    String invalidFormat(final String format, final Object[] parameters) {
-        final StringBuilder b = new StringBuilder("** invalid format \'" + format + "\'");
-        if (parameters != null && parameters.length > 0) {
-            b.append(" [").append(parameters[0]);
-            for (int i = 1; i < parameters.length; i++) {
-                b.append(',').append(parameters[i]);
-            }
-            b.append("]");
-        }
-        return b.toString();
-    }
-
-    @Override
-    public void clearMdc() {
-    }
-
-    @Override
-    public Object putMdc(final String key, final Object value) {
-        //throw Assert.unsupported();
-        return null;
-    }
-
-    @Override
-    public Object getMdc(final String key) {
-        return null;
-    }
-
-    @Override
-    public void removeMdc(final String key) {
-    }
-
-    @Override
-    public Map<String, Object> getMdcMap() {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void clearNdc() {
-    }
-
-    @Override
-    public String getNdc() {
-        return "";
-    }
-
-    @Override
-    public int getNdcDepth() {
-        return 0;
-    }
-
-    @Override
-    public String popNdc() {
-        return "";
-    }
-
-    @Override
-    public String peekNdc() {
-        return "";
-    }
-
-    @Override
-    public void pushNdc(final String message) {
-        throw Assert.unsupported();
-    }
-
-    @Override
-    public void setNdcMaxDepth(final int maxDepth) {
-    }
-}
diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/PlatformPropertiesMojo.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/PlatformPropertiesMojo.java
new file mode 100644
index 0000000000000..1404e655e3a9b
--- /dev/null
+++ b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/PlatformPropertiesMojo.java
@@ -0,0 +1,118 @@
+package io.quarkus.maven;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.util.IoUtils;
+
+@Mojo(name = "platform-properties", threadSafe = true)
+public class PlatformPropertiesMojo extends AbstractMojo {
+
+    @Component
+    private MavenProjectHelper projectHelper;
+
+    @Parameter(defaultValue = "${project}", readonly = true, required = true)
+    private MavenProject project;
+
+    /**
+     * Skip the execution of this mojo
+     */
+    @Parameter(defaultValue = "true", property = "platformPropertiesInBom")
+    private boolean platformPropertiesInBom = true;
+
+    @Parameter(defaultValue = "platform-properties.properties", property = "platformPropertiesFileName")
+    private String propertiesFileName = "platform-properties.properties";
+
+    @Parameter(property = "skipPlatformPrefixCheck")
+    boolean skipPlatformPrefixCheck;
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+
+        if (!project.getArtifactId().endsWith(BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX)) {
+            throw new MojoExecutionException("Project's artifactId " + project.getArtifactId() + " does not end with "
+                    + BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX);
+        }
+
+        final File propsFile = new File(project.getBuild().getOutputDirectory(), propertiesFileName);
+        if (!propsFile.exists()) {
+            throw new MojoExecutionException("Failed to locate " + propsFile);
+        }
+
+        if (!skipPlatformPrefixCheck) {
+            final Properties props = new Properties();
+            try (InputStream is = new FileInputStream(propsFile)) {
+                props.load(is);
+            } catch (IOException e) {
+                throw new MojoExecutionException("Failed to read properties " + propsFile, e);
+            }
+            StringBuilder buf = null;
+            for (Object name : props.keySet()) {
+                if (!String.valueOf(name).startsWith(BootstrapConstants.PLATFORM_PROPERTY_PREFIX)) {
+                    if (buf == null) {
+                        buf = new StringBuilder()
+                                .append("The following platform properties are missing the '")
+                                .append(BootstrapConstants.PLATFORM_PROPERTY_PREFIX)
+                                .append("' prefix: ");
+                    } else {
+                        buf.append(", ");
+                    }
+                    buf.append(name);
+                }
+            }
+            if (buf != null) {
+                throw new MojoExecutionException(buf.toString());
+            }
+        }
+
+        if (platformPropertiesInBom) {
+            assertPlatformPropertiesInBom();
+        }
+
+        // this is necessary to sometimes be able to resolve the artifacts from the workspace
+        final File published = new File(project.getBuild().getDirectory(),
+                project.getArtifactId() + "-" + project.getVersion() + ".properties");
+        try {
+            IoUtils.copy(propsFile.toPath(), published.toPath());
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to copy " + propsFile + " to " + published, e);
+        }
+
+        projectHelper.attachArtifact(project, "properties", published);
+    }
+
+    private void assertPlatformPropertiesInBom() throws MojoExecutionException {
+        boolean platformPropsManaged = false;
+        for (Dependency dep : dependencyManagement()) {
+            if (dep.getArtifactId().equals(project.getArtifactId())
+                    && dep.getGroupId().equals(project.getGroupId())
+                    && dep.getVersion().equals(project.getVersion())) {
+                platformPropsManaged = true;
+                break;
+            }
+        }
+        if (!platformPropsManaged) {
+            throw new MojoExecutionException("The project's dependencyManagement does not appear to include "
+                    + project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion());
+        }
+    }
+
+    private List<Dependency> dependencyManagement() {
+        return project.getDependencyManagement() == null ? null : project.getDependencyManagement().getDependencies();
+    }
+}
diff --git a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java
index c7e0df7f7d33a..88cb63cc48abf 100644
--- a/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java
+++ b/devtools/platform-descriptor-json-plugin/src/main/java/io/quarkus/maven/ValidateExtensionsJsonMojo.java
@@ -9,8 +9,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -23,14 +25,15 @@
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 
 import io.quarkus.bootstrap.BootstrapConstants;
-import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
 
 /**
  * This goal validates a given JSON descriptor.
@@ -63,12 +66,22 @@ public class ValidateExtensionsJsonMojo extends AbstractMojo {
     @Component
     private RepositorySystem repoSystem;
 
+    @Component
+    private RemoteRepositoryManager remoteRepoManager;
+
     @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
     private RepositorySystemSession repoSession;
 
     @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
     private List<RemoteRepository> repos;
 
+    /**
+     * Group ID's that we know don't contain extensions. This can speed up the process
+     * by preventing the download of artifacts that are not required.
+     */
+    @Parameter
+    private Set<String> ignoredGroupIds = new HashSet<>(0);
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
         if (skip) {
@@ -82,22 +95,35 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     .setRepositorySystem(repoSystem)
                     .setRepositorySystemSession(repoSession)
                     .setRemoteRepositories(repos)
+                    .setRemoteRepositoryManager(remoteRepoManager)
                     .build();
         } catch (Exception e) {
             throw new MojoExecutionException("Failed to initialize maven artifact resolver", e);
         }
 
-        final QuarkusPlatformDescriptor descriptor = QuarkusJsonPlatformDescriptorResolver.newInstance()
-                .setArtifactResolver(new BootstrapAppModelResolver(mvn))
-                .resolveFromJson(jsonGroupId, jsonArtifactId, jsonVersion);
+        final Artifact artifact = new DefaultArtifact(jsonGroupId, jsonArtifactId, jsonVersion, "json", jsonVersion);
+        final Path jsonPath;
+        try {
+            jsonPath = mvn.resolve(artifact).getArtifact().getFile().toPath();
+        } catch (BootstrapMavenException e) {
+            throw new MojoExecutionException("Failed to resolve platform descriptor " + artifact, e);
+        }
+
+        JsonExtensionCatalog catalog;
+        try {
+            catalog = JsonCatalogMapperHelper.deserialize(jsonPath, JsonExtensionCatalog.class);
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to deserialize extension catalog " + jsonPath, e);
+        }
+        final ArtifactCoords bomCoords = catalog.getBom();
 
-        final DefaultArtifact bomArtifact = new DefaultArtifact(descriptor.getBomGroupId(),
-                descriptor.getBomArtifactId(), null, "pom", descriptor.getBomVersion());
+        final DefaultArtifact bomArtifact = new DefaultArtifact(bomCoords.getGroupId(),
+                bomCoords.getArtifactId(), bomCoords.getClassifier(), bomCoords.getType(), bomCoords.getVersion());
         final Map<String, Artifact> bomExtensions = collectBomExtensions(mvn, bomArtifact);
 
         List<Extension> missingFromBom = Collections.emptyList();
-        for (Extension ext : descriptor.getExtensions()) {
-            if (bomExtensions.remove(ext.getGroupId() + ":" + ext.getArtifactId()) == null) {
+        for (Extension ext : catalog.getExtensions()) {
+            if (bomExtensions.remove(ext.getArtifact().getGroupId() + ":" + ext.getArtifact().getArtifactId()) == null) {
                 if (missingFromBom.isEmpty()) {
                     missingFromBom = new ArrayList<>();
                 }
@@ -120,8 +146,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             getLog().error("Extensions from " + jsonGroupId + ":" + jsonArtifactId + ":" + jsonVersion + " missing from "
                     + bomArtifact);
             for (Extension e : missingFromBom) {
-                getLog().error("- " + e.getGroupId() + ":" + e.getArtifactId() + ":" + e.getClassifier() + ":" + e.getType()
-                        + ":" + e.getVersion());
+                getLog().error("- " + e.getArtifact());
             }
         }
         throw new MojoExecutionException("Extensions referenced in " + bomArtifact + " and included in " + jsonGroupId + ":"
@@ -142,7 +167,8 @@ private Map<String, Artifact> collectBomExtensions(MavenArtifactResolver mvn, fi
 
         for (Dependency dep : bomDeps) {
             final Artifact artifact = dep.getArtifact();
-            if (!artifact.getExtension().equals("jar")
+            if (ignoredGroupIds.contains(artifact.getGroupId())
+                    || !artifact.getExtension().equals("jar")
                     || "javadoc".equals(artifact.getClassifier())
                     || "tests".equals(artifact.getClassifier())
                     || "sources".equals(artifact.getClassifier())) {
diff --git a/devtools/platform-descriptor-json/pom.xml b/devtools/platform-descriptor-json/pom.xml
index 23d85256d3f0e..269ae990b3ab7 100644
--- a/devtools/platform-descriptor-json/pom.xml
+++ b/devtools/platform-descriptor-json/pom.xml
@@ -59,9 +59,10 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>io.quarkus</groupId>
-                                    <artifactId>quarkus-bom-descriptor-json</artifactId>
+                                    <artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
                                     <version>${project.version}</version>
                                     <type>json</type>
+                                    <classifier>${project.version}</classifier>
                                     <outputDirectory>${project.build.outputDirectory}/quarkus-bom-descriptor</outputDirectory>
                                     <destFileName>extensions.json</destFileName>
                                 </artifactItem>
@@ -106,23 +107,10 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devtools-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bom-descriptor-json</artifactId>
+            <artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
             <version>${project.version}</version>
             <type>json</type>
-        </dependency>
-        <!-- extensions reader -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
+            <classifier>${project.version}</classifier>
         </dependency>
     </dependencies>
 
diff --git a/devtools/platform-descriptor-json/src/main/filtered/quarkus.properties b/devtools/platform-descriptor-json/src/main/filtered/quarkus.properties
index 75b90715a75f6..2c025575f5827 100644
--- a/devtools/platform-descriptor-json/src/main/filtered/quarkus.properties
+++ b/devtools/platform-descriptor-json/src/main/filtered/quarkus.properties
@@ -8,10 +8,16 @@ kotlin-version=${kotlin.version}
 scala-version=${scala.version}
 scala-plugin-version=${scala-plugin.version}
 
-# Plugin metadata
-plugin-groupId=${project.groupId}
-plugin-artifactId=quarkus-maven-plugin
-plugin-version=${project.version}
+quarkus-core-version=${project.version}
+
+# Maven plugin metadata
+maven-plugin-groupId=${project.groupId}
+maven-plugin-artifactId=quarkus-maven-plugin
+maven-plugin-version=${project.version}
+
+# Gradle plugin metadata
+gradle-plugin-id=io.quarkus
+gradle-plugin-version=${project.version}
 
 supported-maven-versions=${supported-maven-versions}
 # the proposed version must be in the range of the supported versions
diff --git a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformBom.java b/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformBom.java
deleted file mode 100644
index 691a672027932..0000000000000
--- a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformBom.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json.impl;
-
-public class QuarkusJsonPlatformBom {
-
-    public String groupId;
-    public String artifactId;
-    public String version;
-}
diff --git a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java b/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java
deleted file mode 100644
index d346fd6fd0759..0000000000000
--- a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptor.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json.impl;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.apache.maven.model.Dependency;
-
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
-import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
-import io.quarkus.platform.tools.DefaultMessageWriter;
-import io.quarkus.platform.tools.MessageWriter;
-
-public class QuarkusJsonPlatformDescriptor implements QuarkusPlatformDescriptor, Serializable {
-
-    private String bomGroupId;
-    private String bomArtifactId;
-    private String bomVersion;
-    private String quarkusVersion;
-
-    private List<Extension> extensions = Collections.emptyList();
-    private List<Dependency> managedDeps = Collections.emptyList();
-    private List<Category> categories = Collections.emptyList();
-    private transient ResourceLoader resourceLoader;
-    private transient MessageWriter log;
-
-    public QuarkusJsonPlatformDescriptor() {
-    }
-
-    public void setBom(QuarkusJsonPlatformBom bom) {
-        bomGroupId = bom.groupId;
-        bomArtifactId = bom.artifactId;
-        bomVersion = bom.version;
-    }
-
-    public void setQuarkusCoreVersion(String quarkusVersion) {
-        this.quarkusVersion = quarkusVersion;
-    }
-
-    public void setExtensions(List<Extension> extensions) {
-        this.extensions = extensions;
-    }
-
-    void setManagedDependencies(List<Dependency> managedDeps) {
-        this.managedDeps = managedDeps;
-    }
-
-    void setResourceLoader(ResourceLoader resourceLoader) {
-        this.resourceLoader = resourceLoader;
-    }
-
-    void setMessageWriter(MessageWriter log) {
-        this.log = log;
-    }
-
-    void setQuarkusVersion(String quarkusVersion) {
-        this.quarkusVersion = quarkusVersion;
-    }
-
-    private MessageWriter getLog() {
-        return log == null ? log = new DefaultMessageWriter() : log;
-    }
-
-    @Override
-    public String getBomGroupId() {
-        return bomGroupId;
-    }
-
-    @Override
-    public String getBomArtifactId() {
-        return bomArtifactId;
-    }
-
-    @Override
-    public String getBomVersion() {
-        return bomVersion;
-    }
-
-    @Override
-    public String getQuarkusVersion() {
-        return quarkusVersion;
-    }
-
-    @Override
-    public List<Dependency> getManagedDependencies() {
-        return managedDeps;
-    }
-
-    @Override
-    public List<Extension> getExtensions() {
-        return extensions;
-    }
-
-    @Override
-    public String getTemplate(String name) {
-        getLog().debug("Loading Quarkus project template %s", name);
-        if (resourceLoader == null) {
-            throw new IllegalStateException("Resource loader has not been provided");
-        }
-        try {
-            return resourceLoader.loadResource(name, is -> {
-                try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-                    return reader.lines().collect(Collectors.joining("\n"));
-                }
-            });
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to load " + name, e);
-        }
-    }
-
-    @Override
-    public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-        getLog().debug("Loading Quarkus platform resource %s", name);
-        if (resourceLoader == null) {
-            throw new IllegalStateException("Resource loader has not been provided");
-        }
-        return resourceLoader.loadResource(name, consumer);
-    }
-
-    @Override
-    public List<Category> getCategories() {
-        return categories;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        QuarkusJsonPlatformDescriptor that = (QuarkusJsonPlatformDescriptor) o;
-        return bomGroupId.equals(that.bomGroupId) &&
-                bomArtifactId.equals(that.bomArtifactId) &&
-                bomVersion.equals(that.bomVersion);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(bomGroupId, bomArtifactId, bomVersion);
-    }
-}
diff --git a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptorLoaderBootstrap.java b/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptorLoaderBootstrap.java
deleted file mode 100644
index 1cb07ab2a4d51..0000000000000
--- a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptorLoaderBootstrap.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Properties;
-import java.util.function.Function;
-
-import org.apache.maven.model.Dependency;
-
-import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoaderContext;
-import io.quarkus.platform.descriptor.loader.json.ArtifactResolver;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoaderContext;
-
-/**
- * This class is used to bootstrap the Quarkus platform descriptor from the classpath only.
- */
-public class QuarkusJsonPlatformDescriptorLoaderBootstrap
-        implements QuarkusPlatformDescriptorLoader<QuarkusPlatformDescriptor, QuarkusPlatformDescriptorLoaderContext> {
-
-    private static InputStream getResourceStream(String relativePath) {
-        final InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(relativePath);
-        if (is == null) {
-            throw new IllegalStateException("Failed to locate " + relativePath + " on the classpath");
-        }
-        return is;
-    }
-
-    @Override
-    public QuarkusPlatformDescriptor load(QuarkusPlatformDescriptorLoaderContext context) {
-
-        context.getMessageWriter().debug("Loading the default Quarkus Platform descriptor from the classpath");
-
-        final Properties props = new Properties();
-        final InputStream quarkusProps = getResourceStream("quarkus.properties");
-        try {
-            props.load(quarkusProps);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to load properties quarkus.properties", e);
-        }
-
-        final Path resourceRoot;
-        try {
-            resourceRoot = MojoUtils.getClassOrigin(QuarkusJsonPlatformDescriptorLoaderBootstrap.class);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to determine the resource root for " + getClass().getName(), e);
-        }
-
-        final ArtifactResolver resolver = new ArtifactResolver() {
-            @Override
-            public <T> T process(String groupId, String artifactId, String classifier, String type, String version,
-                    Function<Path, T> processor) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public List<Dependency> getManagedDependencies(String groupId, String artifactId, String classifier, String type,
-                    String version) {
-                if (Files.isDirectory(resourceRoot)) {
-                    return readManagedDeps(resourceRoot.resolve("quarkus-bom/pom.xml"));
-                }
-                try (FileSystem fs = FileSystems.newFileSystem(resourceRoot, null)) {
-                    return readManagedDeps(fs.getPath("/quarkus-bom/pom.xml"));
-                } catch (Exception e) {
-                    throw new IllegalStateException("Failed to open " + resourceRoot, e);
-                }
-            }
-        };
-
-        return new QuarkusJsonPlatformDescriptorLoaderImpl()
-                .load(new QuarkusJsonPlatformDescriptorLoaderContext(resolver, context.getMessageWriter()) {
-                    @Override
-                    public <T> T parseJson(Function<InputStream, T> parser) {
-                        if (Files.isDirectory(resourceRoot)) {
-                            return doParse(resourceRoot.resolve("quarkus-bom-descriptor/extensions.json"), parser);
-                        }
-                        try (FileSystem fs = FileSystems.newFileSystem(resourceRoot, null)) {
-                            return doParse(fs.getPath("/quarkus-bom-descriptor/extensions.json"), parser);
-                        } catch (IOException e) {
-                            throw new IllegalStateException("Failed to open " + resourceRoot, e);
-                        }
-                    }
-                });
-    }
-
-    private static List<Dependency> readManagedDeps(Path pom) {
-        if (!Files.exists(pom)) {
-            throw new IllegalStateException("Failed to locate " + pom);
-        }
-        try (InputStream is = Files.newInputStream(pom)) {
-            return MojoUtils.readPom(is).getDependencyManagement().getDependencies();
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to read model of " + pom, e);
-        }
-    }
-
-    private static <T> T doParse(Path p, Function<InputStream, T> parser) {
-        if (!Files.exists(p)) {
-            throw new IllegalStateException("Path does not exist: " + p);
-        }
-        try (InputStream is = Files.newInputStream(p)) {
-            return parser.apply(is);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to read " + p, e);
-        }
-    }
-}
diff --git a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptorLoaderImpl.java b/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptorLoaderImpl.java
deleted file mode 100644
index 50fbac1d4a7e5..0000000000000
--- a/devtools/platform-descriptor-json/src/main/java/io/quarkus/platform/descriptor/loader/json/impl/QuarkusJsonPlatformDescriptorLoaderImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json.impl;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoaderContext;
-
-public class QuarkusJsonPlatformDescriptorLoaderImpl
-        implements QuarkusJsonPlatformDescriptorLoader<QuarkusJsonPlatformDescriptor> {
-
-    @Override
-    public QuarkusJsonPlatformDescriptor load(final QuarkusJsonPlatformDescriptorLoaderContext context) {
-
-        final QuarkusJsonPlatformDescriptor platform = context
-                .parseJson(is -> {
-                    try {
-                        ObjectMapper mapper = new ObjectMapper()
-                                .enable(JsonParser.Feature.ALLOW_COMMENTS)
-                                .enable(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS)
-                                .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
-                        return mapper.readValue(is, QuarkusJsonPlatformDescriptor.class);
-                    } catch (IOException e) {
-                        throw new RuntimeException("Failed to parse JSON stream", e);
-                    }
-                });
-
-        if (context.getArtifactResolver() != null) {
-            platform.setManagedDependencies(context.getArtifactResolver().getManagedDependencies(platform.getBomGroupId(),
-                    platform.getBomArtifactId(), null, "pom", platform.getBomVersion()));
-        }
-        platform.setResourceLoader(context.getResourceLoader());
-        platform.setMessageWriter(context.getMessageWriter());
-
-        return platform;
-    }
-}
diff --git a/devtools/platform-descriptor-json/src/main/resources/META-INF/services/io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader b/devtools/platform-descriptor-json/src/main/resources/META-INF/services/io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader
deleted file mode 100644
index 54b44251eaa4f..0000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/META-INF/services/io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader
+++ /dev/null
@@ -1 +0,0 @@
-io.quarkus.platform.descriptor.loader.json.impl.QuarkusJsonPlatformDescriptorLoaderBootstrap
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/META-INF/services/io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader b/devtools/platform-descriptor-json/src/main/resources/META-INF/services/io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader
deleted file mode 100644
index 067557f6396e3..0000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/META-INF/services/io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader
+++ /dev/null
@@ -1 +0,0 @@
-io.quarkus.platform.descriptor.loader.json.impl.QuarkusJsonPlatformDescriptorLoaderImpl
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..10b5fa998714a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/base/README.tpl.qute.md
@@ -0,0 +1,11 @@
+## Greet the world!
+
+```shell script
+./jbang src/GreetingCommand.java hello
+```
+
+## Show help
+
+```shell script
+./jbang src/GreetingCommand.java -h
+```
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/codestart.yml
new file mode 100644
index 0000000000000..56accde672505
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/codestart.yml
@@ -0,0 +1,19 @@
+name: jbang-picocli-code
+ref: picocli
+type: code
+language:
+  base:
+    data:
+      command:
+        class-name: GreetingCommand
+        subcommands: "{HelloCommand.class, GoodByeCommand.class}"
+        hello:
+          name: "hello"
+          description: "Greet World!"
+          message: "Hello World!"
+        goodbye:
+          name: "goodbye"
+          description: "Say goodbye to World!"
+          message: "Goodbye World!"
+    dependencies:
+      - io.quarkus:quarkus-picocli
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/java/src/{command.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/java/src/{command.class-name}.tpl.qute.java
new file mode 100644
index 0000000000000..a61da811b5e39
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-picocli-code/java/src/{command.class-name}.tpl.qute.java
@@ -0,0 +1,33 @@
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS {quarkus.bom.group-id}:{quarkus.bom.artifact-id}:{quarkus.bom.version}@pom
+{#for dep in dependencies}
+//DEPS {dep}
+{/for}
+
+//JAVAC_OPTIONS -parameters
+//
+import io.quarkus.picocli.runtime.annotations.TopCommand;
+import picocli.CommandLine;
+
+@TopCommand
+@CommandLine.Command(mixinStandardHelpOptions = true, subcommands = {command.subcommands})
+public class {command.class-name} {
+}
+
+@CommandLine.Command(name = "{command.hello.name}", description = "{command.hello.description}")
+class HelloCommand implements Runnable {
+
+    @Override
+    public void run() {
+        System.out.println("{command.hello.message}");
+    }
+}
+
+@CommandLine.Command(name = "{command.goodbye.name}", description = "{command.goodbye.description}")
+class GoodByeCommand implements Runnable {
+
+    @Override
+    public void run() {
+        System.out.println("{command.goodbye.message}");
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..bb72b9b43ac54
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/base/README.tpl.qute.md
@@ -0,0 +1,3 @@
+```shell script
+./jbang src/GreetingResource.java
+```
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml
new file mode 100644
index 0000000000000..dd495fc6e7c3d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/codestart.yml
@@ -0,0 +1,13 @@
+name: jbang-resteasy-code
+ref: resteasy
+type: code
+language:
+  base:
+    data:
+      resource:
+        class-name: GreetingResource
+        path: "/hello-resteasy"
+        response: "Hello RESTEasy"
+    dependencies:
+      - io.quarkus:quarkus-resteasy
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java
new file mode 100644
index 0000000000000..cbba81c0b33bf
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/code/jbang-resteasy-code/java/src/{resource.class-name}.tpl.qute.java
@@ -0,0 +1,26 @@
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS {quarkus.bom.group-id}:{quarkus.bom.artifact-id}:{quarkus.bom.version}@pom
+{#for dep in dependencies}
+//DEPS {dep}
+{/for}
+
+//JAVAC_OPTIONS -parameters
+
+import io.quarkus.runtime.Quarkus;
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("{resource.path}")
+@ApplicationScoped
+public class {resource.class-name} {
+
+    @GET
+    public String sayHello() {
+        return "{resource.response}";
+    }
+
+    public static void main(String[] args) {
+        Quarkus.run(args);
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/language/java/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/language/java/codestart.yml
new file mode 100644
index 0000000000000..4f1da5b0e1a88
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/language/java/codestart.yml
@@ -0,0 +1,3 @@
+name: java
+type: language
+fallback: true
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/base/..gitignore b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/base/..gitignore
new file mode 100644
index 0000000000000..3cf482a1da8dc
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/base/..gitignore
@@ -0,0 +1,32 @@
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Local environment
+.env
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..05efca97c0ebd
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/base/README.tpl.qute.md
@@ -0,0 +1,2 @@
+# JBang Quarkus Project
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/codestart.yml
new file mode 100644
index 0000000000000..9b7e1aee929a2
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/project/quarkus-jbang/codestart.yml
@@ -0,0 +1,12 @@
+name: quarkus-jbang
+type: project
+fallback: true
+output-strategy:
+  "README.md": append
+  "readme.md": forbidden
+  "README.adoc": forbidden
+  "readme.adoc": forbidden
+  ".gitignore": append
+  "*": fail-on-duplicate
+
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang
new file mode 100755
index 0000000000000..adf596c88e062
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang
@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+
+#
+# To run this script remotely type this in your shell
+# (where <args>... are the arguments you want to pass to Jbang):
+#   curl -Ls https://sh.jbang.dev | bash -s - <args>...
+#
+
+# The Java version to install when it's not installed on the system yet
+javaVersion=${JBANG_DEFAULT_JAVA_VERSION:-11}
+
+absolute_path() {
+  # if the given path to the jbang launcher is absolute (i.e. it is either starting with / or a
+  # 'letter:/' when using gitbash on windows) it is returned unchanged, otherwise we construct an absolute path
+  [[ $1 = /* ]] || [[ $1 =~ ^[A-z]:/ ]] && echo "$1" || echo "$PWD/${1#./}"
+}
+
+resolve_symlink() {
+  if [[ $OSTYPE != darwin* ]]; then minusFarg="-f"; fi
+  sym_resolved=$(readlink ${minusFarg} $1)
+
+  if [[ -n $sym_resolved ]]; then
+    echo $sym_resolved
+  else
+    echo $1
+  fi
+}
+
+download() {
+  if [ -x "$(command -v curl)" ]; then
+    curl -sLf -H "Accept: application/gzip, application/octet-stream" -o "$2" $1
+    retval=$?
+  elif [ -x "$(command -v wget)" ]; then
+    wget -q --header="Accept: application/gzip, application/octet-stream" -O "$2" $1
+    retval=$?
+  else
+    echo "Error: curl or wget not found, please make sure one of them is installed" 1>&2
+    exit 1
+  fi
+}
+
+abs_jbang_path=$(resolve_symlink $(absolute_path $0))
+
+case "$(uname -s)" in
+  Linux*)
+    os=linux;;
+  Darwin*)
+    os=mac;;
+  CYGWIN*|MINGW*|MSYS*)
+    os=windows;;
+  *)        echo "Unsupported Operating System: $(uname -s)" 1>&2; exit 1;;
+esac
+
+case "$(uname -m)" in
+  i?86)
+    arch=x32;;
+  x86_64|amd64)
+    arch=x64;;
+  aarch64)
+    arch=aarch64;;
+  armv7l)
+    arch=arm;;
+  *)
+    echo "Unsupported Architecture: $(uname -m)" 1>&2; exit 1;;
+esac
+
+## when mingw/git bash or cygwin fall out to just running the bat file.
+if [[ $os == windows ]]; then
+  $(dirname $abs_jbang_path)/jbang.cmd $*
+  exit $?
+fi
+
+if [[ -z "$JBANG_DIR" ]]; then JBDIR="$HOME/.jbang"; else JBDIR="$JBANG_DIR"; fi
+if [[ -z "$JBANG_CACHE_DIR" ]]; then TDIR="$JBDIR/cache"; else TDIR="$JBANG_CACHE_DIR"; fi
+
+## resolve application jar path from script location
+if [ -f "$(dirname $abs_jbang_path)/jbang.jar" ]; then
+  jarPath=$(dirname $abs_jbang_path)/jbang.jar
+elif [ -f "$(dirname $abs_jbang_path)/.jbang/jbang.jar" ]; then
+  jarPath=$(dirname $abs_jbang_path)/.jbang/jbang.jar
+else
+  if [ ! -f "$JBDIR/bin/jbang.jar" ]; then
+    echo "Downloading JBang..." 1>&2
+    mkdir -p "$TDIR/urls"
+    jburl="https://github.com/jbangdev/jbang/releases/latest/download/jbang.tar"
+    download $jburl "$TDIR/urls/jbang.tar"
+    if [ $retval -ne 0 ]; then echo "Error downloading JBang" 1>&2; exit $retval; fi
+    echo "Installing JBang..." 1>&2
+    rm -rf "$TDIR/urls/jbang"
+    tar xf "$TDIR/urls/jbang.tar" -C "$TDIR/urls"
+    if [ $retval -ne 0 ]; then echo "Error installing JBang" 1>&2; exit $retval; fi
+    mkdir -p "$JBDIR/bin"
+    rm -f "$JBDIR/bin/jbang" "$JBDIR/bin"/jbang.*
+    cp -f "$TDIR/urls/jbang/bin"/* "$JBDIR/bin"
+  fi
+  eval "exec $JBDIR/bin/jbang $*"
+fi
+
+# Find/get a JDK
+unset JAVA_EXEC
+if [[ -n "$JAVA_HOME" ]]; then
+  # Determine if a (working) JDK is available in JAVA_HOME
+  if [ -x "$(command -v $JAVA_HOME/bin/javac)" ]; then
+    JAVA_EXEC="$JAVA_HOME/bin/java";
+  else
+    echo "JAVA_HOME is set but does not seem to point to a valid Java JDK" 1>&2
+  fi
+fi
+if [[ -z "$JAVA_EXEC" ]]; then
+  # Determine if a (working) JDK is available on the PATH
+  if [ -x "$(command -v javac)" ]; then
+    JAVA_EXEC="java";
+  elif [ -x "$JBDIR/currentjdk/bin/javac" ]; then
+    export JAVA_HOME="$JBDIR/currentjdk"
+    JAVA_EXEC="$JBDIR/currentjdk/bin/java";
+  else
+    export JAVA_HOME="$TDIR/jdks/$javaVersion"
+    JAVA_EXEC="$JAVA_HOME/bin/java"
+    # Check if we installed a JDK before
+    if [ ! -d "$TDIR/jdks/$javaVersion" ]; then
+      # If not, download and install it
+      mkdir -p "$TDIR/jdks"
+      echo "Downloading JDK $javaVersion. Be patient, this can take several minutes..." 1>&2
+      jdkurl="https://api.adoptopenjdk.net/v3/binary/latest/$javaVersion/ga/$os/$arch/jdk/hotspot/normal/adoptopenjdk"
+      download $jdkurl "$TDIR/bootstrap-jdk.tgz"
+      if [ $retval -ne 0 ]; then echo "Error downloading JDK" 1>&2; exit $retval; fi
+      echo "Installing JDK $javaVersion..." 1>&2
+      rm -rf "$TDIR/jdks/$javaVersion.tmp/"
+      mkdir -p "$TDIR/jdks/$javaVersion.tmp"
+      tar xf "$TDIR/bootstrap-jdk.tgz" -C "$TDIR/jdks/$javaVersion.tmp" --strip-components=1
+      retval=$?
+      if [[ $os == mac && $retval -eq 0 ]]; then
+        mv "$TDIR/jdks/$javaVersion.tmp/Contents/Home/"* "$TDIR/jdks/$javaVersion.tmp/"
+        retval=$?
+      fi
+      if [ $retval -ne 0 ]; then
+        # Check if the JDK was installed properly
+        javac -version > /dev/null 2>&1
+        retval=$?
+      fi
+      if [ $retval -ne 0 ]; then echo "Error installing JDK" 1>&2; exit $retval; fi
+      # Activate the downloaded JDK giving it its proper name
+      mv "$TDIR/jdks/$javaVersion.tmp" "$TDIR/jdks/$javaVersion"
+      # Set the current JDK
+      ${JAVA_EXEC} -classpath ${jarPath} dev.jbang.Main jdk default $javaVersion
+    fi
+  fi
+fi
+
+## https://stackoverflow.com/questions/1668649/how-to-keep-quotes-in-bash-arguments
+## attempt to ensure each argument keeps its original quoting
+
+## run it using command substitution to have just the user process once jbang is done
+output=$(CLICOLOR_FORCE=1 ${JAVA_EXEC} ${JBANG_JAVA_OPTIONS} -classpath ${jarPath} dev.jbang.Main "$@")
+err=$?
+if [ $err -eq 255 ]; then
+  eval "exec $output"
+elif [ ! -z "$output" ]; then
+  echo "$output"
+  exit $err
+else
+  exit $err
+fi
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang.cmd b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang.cmd
new file mode 100644
index 0000000000000..a1e5a74337a18
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/base/jbang.cmd
@@ -0,0 +1,111 @@
+@echo off
+SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+
+
+rem The Java version to install when it's not installed on the system yet
+if "%JBANG_DEFAULT_JAVA_VERSION%"=="" (set javaVersion=11) else (set javaVersion=%JBANG_DEFAULT_JAVA_VERSION%)
+
+set os=windows
+set arch=x64
+
+set jburl="https://github.com/jbangdev/jbang/releases/latest/download/jbang.zip"
+set jdkurl="https://api.adoptopenjdk.net/v3/binary/latest/%javaVersion%/ga/%os%/%arch%/jdk/hotspot/normal/adoptopenjdk"
+
+if "%JBANG_DIR%"=="" (set JBDIR=%userprofile%\.jbang) else (set JBDIR=%JBANG_DIR%)
+if "%JBANG_CACHE_DIR%"=="" (set TDIR=%JBDIR%\cache) else (set TDIR=%JBANG_CACHE_DIR%)
+
+rem resolve application jar path from script location and convert to windows path when using cygwin
+if exist "%~dp0jbang.jar" (
+  set jarPath=%~dp0jbang.jar
+) else if exist "%~dp0.jbang\jbang.jar" (
+  set jarPath=%~dp0.jbang\jbang.jar
+) else (
+  if not exist "%JBDIR%\bin\jbang.jar" (
+    echo Downloading JBang... 1>&2
+    if not exist "%TDIR%\urls" ( mkdir "%TDIR%\urls" )
+    powershell -NoProfile -ExecutionPolicy Bypass -NonInteractive -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest %jburl% -OutFile %TDIR%\urls\jbang.zip"
+    if !ERRORLEVEL! NEQ 0 ( echo Error downloading JBang 1>&2 & exit /b %ERRORLEVEL% )
+    echo Installing JBang... 1>&2
+    if exist "%TDIR%\urls\jbang" ( rd /s /q "%TDIR%\urls\jbang" > nul 2>&1 )
+    powershell -NoProfile -ExecutionPolicy Bypass -NonInteractive -Command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path %TDIR%\urls\jbang.zip -DestinationPath %TDIR%\urls"
+    if !ERRORLEVEL! NEQ 0 ( echo Error installing JBang 1>&2 & exit /b %ERRORLEVEL% )
+    if not exist "%JBDIR%\bin" ( mkdir "%JBDIR%\bin" )
+    del /f /q "%JBDIR%\bin\jbang" "%JBDIR%\bin\jbang.*"
+    copy /y "%TDIR%\urls\jbang\bin\*" "%JBDIR%\bin" > nul 2>&1
+  )
+  call "%JBDIR%\bin\jbang.cmd" %*
+  exit /b %ERRORLEVEL%
+)
+
+rem Find/get a JDK
+set JAVA_EXEC=
+if not "%JAVA_HOME%"=="" (
+  rem Determine if a (working) JDK is available in JAVA_HOME
+  if exist "%JAVA_HOME%\bin\javac.exe" (
+    set JAVA_EXEC="%JAVA_HOME%\bin\java.exe"
+  ) else (
+    echo JAVA_HOME is set but does not seem to point to a valid Java JDK 1>&2
+  )
+)
+if "!JAVA_EXEC!"=="" (
+  rem Determine if a (working) JDK is available on the PATH
+  where javac > nul 2>&1
+  if !errorlevel! equ 0 (
+    set JAVA_EXEC=java.exe
+  ) else if exist "%JBDIR%\currentjdk\bin\javac" (
+    set JAVA_HOME=%JBDIR%\currentjdk
+    set JAVA_EXEC=%JBDIR%\currentjdk\bin\java
+  ) else (
+    set JAVA_HOME=%TDIR%\jdks\%javaVersion%
+    set JAVA_EXEC=!JAVA_HOME!\bin\java.exe
+    rem Check if we installed a JDK before
+    if not exist "%TDIR%\jdks\%javaVersion%" (
+      rem If not, download and install it
+      if not exist "%TDIR%\jdks" ( mkdir "%TDIR%\jdks" )
+      echo Downloading JDK %javaVersion%. Be patient, this can take several minutes... 1>&2
+      powershell -NoProfile -ExecutionPolicy Bypass -NonInteractive -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest %jdkurl% -OutFile %TDIR%\bootstrap-jdk.zip"
+      if !ERRORLEVEL! NEQ 0 ( echo Error downloading JDK 1>&2 & exit /b %ERRORLEVEL% )
+      echo Installing JDK %javaVersion%... 1>&2
+      if exist "%TDIR%\jdks\%javaVersion%.tmp" ( rd /s /q "%TDIR%\jdks\%javaVersion%.tmp" > nul 2>&1 )
+      powershell -NoProfile -ExecutionPolicy Bypass -NonInteractive -Command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path %TDIR%\bootstrap-jdk.zip -DestinationPath %TDIR%\jdks\%javaVersion%.tmp"
+      if !ERRORLEVEL! NEQ 0 ( echo Error installing JDK 1>&2 & exit /b %ERRORLEVEL% )
+      for /d %%d in (%TDIR%\jdks\%javaVersion%.tmp\*) do (
+        powershell -NoProfile -ExecutionPolicy Bypass -NonInteractive -Command "Move-Item %%d\* !TDIR!\jdks\%javaVersion%.tmp"
+        if !ERRORLEVEL! NEQ 0 ( echo Error installing JDK 1>&2 & exit /b %ERRORLEVEL% )
+      )
+      rem Check if the JDK was installed properly
+      %TDIR%\jdks\%javaVersion%.tmp\bin\javac -version > nul 2>&1
+      if !ERRORLEVEL! NEQ 0 ( echo "Error installing JDK" 1>&2; exit /b %ERRORLEVEL% )
+      rem Activate the downloaded JDK giving it its proper name
+      ren "%TDIR%\jdks\%javaVersion%.tmp" "%javaVersion%"
+    )
+    # Set the current JDK
+    !JAVA_EXEC! -classpath "%jarPath%" dev.jbang.Main jdk default "%javaVersion%"
+  )
+)
+
+if not exist "%TDIR%" ( mkdir "%TDIR%" )
+set tmpfile=%TDIR%\%RANDOM%.jbang.tmp
+rem execute jbang and pipe to temporary random file
+set JBANG_USES_POWERSHELL=
+set "CMD=!JAVA_EXEC!"
+SETLOCAL DISABLEDELAYEDEXPANSION
+%CMD% > "%tmpfile%" %JBANG_JAVA_OPTIONS% -classpath "%jarPath%" dev.jbang.Main %*
+set ERROR=%ERRORLEVEL%
+rem catch errorlevel straight after; rem or FOR /F swallow would have swallowed the errorlevel
+
+if %ERROR% EQU 255 (
+  rem read generated java command by jang, delete temporary file and execute.
+  for %%A in ("%tmpfile%") do for /f "usebackq delims=" %%B in (%%A) do (
+    set "OUTPUT=%%B"
+    goto :break
+  )
+:break
+  del /f /q "%tmpfile%"
+  %OUTPUT%
+  exit /b %ERRORLEVEL%
+) else (
+  type "%tmpfile%"
+  del /f /q "%tmpfile%"
+  exit /b %ERROR%
+)
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/codestart.yml
new file mode 100644
index 0000000000000..f74c6c6c37ef8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus-jbang/tooling/jbang-wrapper/codestart.yml
@@ -0,0 +1,5 @@
+name: jbang-wrapper
+type: tooling
+output-strategy:
+  "jbang": "executable"
+  "jbang.cmd": "executable"
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/..gitignore b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/..gitignore
new file mode 100644
index 0000000000000..f318f00be30d3
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/..gitignore
@@ -0,0 +1,3 @@
+# Gradle
+.gradle/
+build/
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
new file mode 100644
index 0000000000000..8fcd7516eba57
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/build-layout.include.qute
@@ -0,0 +1,51 @@
+{#insert plugins}
+plugins {
+    id("{quarkus.plugin.id}")
+}
+{/}
+
+{#insert repositories}
+repositories {
+    mavenLocal()
+    mavenCentral()
+{#if gradle.repositories}
+{#for rep in gradle.repositories}
+    maven { url = uri("{rep.url}") }
+{/for}
+{/if}
+}
+{/}
+
+{#insert dependencies}
+val quarkusPlatformGroupId: String by project
+val quarkusPlatformArtifactId: String by project
+val quarkusPlatformVersion: String by project
+
+dependencies {
+    implementation(enforcedPlatform("$\{quarkusPlatformGroupId}:$\{quarkusPlatformArtifactId}:$\{quarkusPlatformVersion}"))
+{#for dep in dependencies}
+    implementation("{dep}")
+{/for}
+    testImplementation("io.quarkus:quarkus-junit5")
+{#for dep in test-dependencies}
+    testImplementation("{dep}")
+{/for}
+}
+{/}
+
+{#insert project}
+group = "{project.group-id}"
+version = "{project.version}"
+{/}
+
+{#insert java}
+java {
+    {#if java.version == "11"}
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    {#else}
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    {/if}
+}
+{/}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/gradle.tpl.qute.properties b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/gradle.tpl.qute.properties
new file mode 100644
index 0000000000000..d3160667382c5
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/gradle.tpl.qute.properties
@@ -0,0 +1,6 @@
+#Gradle properties
+quarkusPluginId={quarkus.gradle-plugin.id}
+quarkusPluginVersion={quarkus.gradle-plugin.version}
+quarkusPlatformGroupId={quarkus.platform.group-id}
+quarkusPlatformArtifactId={quarkus.platform.artifact-id}
+quarkusPlatformVersion={quarkus.platform.version}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/settings.tpl.qute.gradle.kts b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/settings.tpl.qute.gradle.kts
new file mode 100644
index 0000000000000..67eb7e52a3b19
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/base/settings.tpl.qute.gradle.kts
@@ -0,0 +1,18 @@
+pluginManagement {
+    val quarkusPluginVersion: String by settings
+    val quarkusPluginId: String by settings
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+{#if gradle.plugin-repositories}
+{#for rep in gradle.plugin-repositories}
+        maven { url = uri("{rep.url}") }
+{/for}
+{/if}
+    }
+    plugins {
+        id(quarkusPluginId) version quarkusPluginVersion
+    }
+}
+rootProject.name="{project.artifact-id}"
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/codestart.yml
new file mode 100644
index 0000000000000..6a922b02e7cf1
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/codestart.yml
@@ -0,0 +1,27 @@
+name: gradle-kotlin-dsl
+type: buildtool
+language:
+  base:
+    shared-data:
+      quarkus:
+        gradle-plugin:
+          id: io.quarkus
+      buildtool:
+        build-dir: build
+        cli: gradle
+        guide: https://quarkus.io/guides/gradle-tooling
+        guide-native: https://quarkus.io/guides/gradle-tooling#building-a-native-executable
+        cmd:
+          dev: quarkusDev
+          package: build
+          package-uber-jar: build -Dquarkus.package.type=uber-jar
+          package-legacy-jar: build -Dquarkus.package.type=legacy-jar
+          package-native: build -Dquarkus.package.type=native
+          package-native-container: build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
+          build-ci: build
+  kotlin:
+    dependencies:
+      - org.jetbrains.kotlin:kotlin-stdlib-jdk8
+  scala:
+    dependencies:
+      - org.scala-lang:scala-library:2.12.13
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/java/build.tpl.qute.gradle.kts b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/java/build.tpl.qute.gradle.kts
new file mode 100644
index 0000000000000..07df0d995bd6d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/java/build.tpl.qute.gradle.kts
@@ -0,0 +1,13 @@
+{#include build-layout}
+{#plugins}
+plugins {
+    java
+    id("{quarkus.gradle-plugin.id}")
+}
+{/plugins}
+{/include}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+    options.compilerArgs.add("-parameters")
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts
new file mode 100644
index 0000000000000..a90e0705a1086
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts
@@ -0,0 +1,24 @@
+{#include build-layout}
+{#plugins}
+plugins {
+    kotlin("jvm") version "{kotlin.version}"
+    kotlin("plugin.allopen") version "{kotlin.version}"
+    id("{quarkus.gradle-plugin.id}")
+}
+{/plugins}
+{/include}
+
+allOpen {
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    annotation("io.quarkus.test.junit.QuarkusTest")
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    {#if java.version == "11"}
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
+    {#else}
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    {/if}
+    kotlinOptions.javaParameters = true
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts
new file mode 100644
index 0000000000000..a6c4baa92a1a3
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/scala/build.tpl.qute.gradle.kts
@@ -0,0 +1,19 @@
+{#include build-layout}
+{#plugins}
+plugins {
+    scala
+    id("{quarkus.gradle-plugin.id}")
+}
+{/plugins}
+{/include}
+
+tasks.withType<ScalaCompile> {
+    scalaCompileOptions.encoding = "UTF-8"
+    {#if java.version == "11"}
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
+    {#else}
+    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    {/if}
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/..gitignore b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/..gitignore
new file mode 100644
index 0000000000000..f318f00be30d3
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/..gitignore
@@ -0,0 +1,3 @@
+# Gradle
+.gradle/
+build/
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/build-layout.include.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/build-layout.include.qute
new file mode 100644
index 0000000000000..2331838993019
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/build-layout.include.qute
@@ -0,0 +1,47 @@
+{#insert plugins}
+plugins {
+    id '{quarkus.gradle-plugin.id}'
+}
+{/}
+
+{#insert repositories}
+repositories {
+    mavenLocal()
+    mavenCentral()
+{#if gradle.repositories}
+{#for rep in gradle.repositories}
+    maven { url "{rep.url}" }
+{/for}
+{/if}
+}
+{/}
+
+{#insert dependencies}
+dependencies {
+    implementation enforcedPlatform("$\{quarkusPlatformGroupId}:$\{quarkusPlatformArtifactId}:$\{quarkusPlatformVersion}")
+{#for dep in dependencies}
+    implementation '{dep}'
+{/for}
+    testImplementation 'io.quarkus:quarkus-junit5'
+{#for dep in test-dependencies}
+    testImplementation '{dep}'
+{/for}
+}
+{/}
+
+{#insert project}
+group '{project.group-id}'
+version '{project.version}'
+{/}
+
+{#insert java}
+java {
+    {#if java.version == "11"}
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    {#else}
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    {/if}
+}
+{/}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/gradle.tpl.qute.properties b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/gradle.tpl.qute.properties
new file mode 100644
index 0000000000000..5d57e047ec255
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/gradle.tpl.qute.properties
@@ -0,0 +1,8 @@
+#Gradle properties
+quarkusPluginId={quarkus.gradle-plugin.id}
+quarkusPluginVersion={quarkus.gradle-plugin.version}
+quarkusPlatformGroupId={quarkus.platform.group-id}
+quarkusPlatformArtifactId={quarkus.platform.artifact-id}
+quarkusPlatformVersion={quarkus.platform.version}
+
+org.gradle.logging.level=INFO
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/settings.tpl.qute.gradle b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/settings.tpl.qute.gradle
new file mode 100644
index 0000000000000..74e5936fa0038
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/base/settings.tpl.qute.gradle
@@ -0,0 +1,16 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+{#if gradle.plugin-repositories}
+{#for rep in gradle.plugin-repositories}
+        maven { url "{rep.url}" }
+{/for}
+{/if}
+    }
+    plugins {
+        id "$\{quarkusPluginId}" version "$\{quarkusPluginVersion}"
+    }
+}
+rootProject.name='{project.artifact-id}'
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/codestart.yml
new file mode 100644
index 0000000000000..a0959b85c4253
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/codestart.yml
@@ -0,0 +1,27 @@
+name: gradle
+type: buildtool
+language:
+  base:
+    shared-data:
+      quarkus:
+        gradle-plugin:
+          id: io.quarkus
+      buildtool:
+        build-dir: build
+        cli: gradle
+        guide: https://quarkus.io/guides/gradle-tooling
+        guide-native: https://quarkus.io/guides/gradle-tooling#building-a-native-executable
+        cmd:
+          dev: quarkusDev
+          package: build
+          package-uber-jar: build -Dquarkus.package.type=uber-jar
+          package-legacy-jar: build -Dquarkus.package.type=legacy-jar
+          package-native: build -Dquarkus.package.type=native
+          package-native-container: build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
+          build-ci: build
+  kotlin:
+    dependencies:
+      - org.jetbrains.kotlin:kotlin-stdlib-jdk8
+  scala:
+    dependencies:
+      - org.scala-lang:scala-library:2.12.13
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/java/build.tpl.qute.gradle b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/java/build.tpl.qute.gradle
new file mode 100644
index 0000000000000..2933d71345aa9
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/java/build.tpl.qute.gradle
@@ -0,0 +1,17 @@
+{#include build-layout}
+{#plugins}
+plugins {
+    id 'java'
+    id '{quarkus.gradle-plugin.id}'
+}
+{/plugins}
+{/include}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle
new file mode 100644
index 0000000000000..687990707f197
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle
@@ -0,0 +1,32 @@
+{#include build-layout}
+{#plugins}
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version "{kotlin.version}"
+    id "org.jetbrains.kotlin.plugin.allopen" version "{kotlin.version}"
+    id '{quarkus.gradle-plugin.id}'
+}
+{/plugins}
+{/include}
+
+allOpen {
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    annotation("io.quarkus.test.junit.QuarkusTest")
+}
+
+compileKotlin {
+    {#if java.version == "11"}
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_11
+    {#else}
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
+    {/if}
+    kotlinOptions.javaParameters = true
+}
+
+compileTestKotlin {
+    {#if java.version == "11"}
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_11
+    {#else}
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
+    {/if}
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/scala/build.tpl.qute.gradle b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/scala/build.tpl.qute.gradle
new file mode 100644
index 0000000000000..6119eea5168af
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/scala/build.tpl.qute.gradle
@@ -0,0 +1,19 @@
+{#include build-layout}
+{#plugins}
+plugins {
+    id 'scala'
+    id '{quarkus.gradle-plugin.id}'
+}
+{/plugins}
+{/include}
+
+compileScala {
+    scalaCompileOptions.encoding = 'UTF-8'
+    {#if java.version == "11"}
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+    {#else}
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    {/if}
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/..gitignore b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/..gitignore
new file mode 100644
index 0000000000000..1e4ecfdc2a7f0
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/..gitignore
@@ -0,0 +1,6 @@
+#Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..45b8902c61187
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/base/pom.tpl.qute.xml
@@ -0,0 +1,175 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{project.group-id}</groupId>
+    <artifactId>{project.artifact-id}</artifactId>
+    <version>{project.version}</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>{java.version}</maven.compiler.source>
+        <maven.compiler.target>{java.version}</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+
+        <quarkus.platform.group-id>{quarkus.platform.group-id}</quarkus.platform.group-id>
+        <quarkus.platform.artifact-id>{quarkus.platform.artifact-id}</quarkus.platform.artifact-id>
+        <quarkus.platform.version>{quarkus.platform.version}</quarkus.platform.version>
+        <quarkus-plugin.version>{quarkus.maven-plugin.version}</quarkus-plugin.version>
+        <compiler-plugin.version>{maven-compiler-plugin.version}</compiler-plugin.version>
+        <surefire-plugin.version>{maven-surefire-plugin.version}</surefire-plugin.version>
+        {#if uberjar}
+        <quarkus.package.type>uber-jar</quarkus.package.type>
+        {/if}
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>$\{quarkus.platform.group-id}</groupId>
+                <artifactId>$\{quarkus.platform.artifact-id}</artifactId>
+                <version>$\{quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    {#if maven.repositories}
+
+    <repositories>
+        {#for rep in maven.repositories}
+        <repository>
+            <id>{rep.id}</id>
+            <url>{rep.url}</url>
+            <releases>
+                <enabled>{rep.releases-enabled ?: true}</enabled>
+            </releases>
+            <snapshots>
+                <enabled>{rep.snapshots-enabled ?: true}</enabled>
+            </snapshots>
+        </repository>
+        {/for}
+    </repositories>
+    {/if}
+    {#if maven.plugin-repositories}
+    <pluginRepositories>
+        {#for rep in maven.plugin-repositories}
+        <pluginRepository>
+            <id>{rep.id}</id>
+            <url>{rep.url}</url>
+            <releases>
+                <enabled>{rep.releases-enabled ?: true}</enabled>
+            </releases>
+            <snapshots>
+                <enabled>{rep.snapshots-enabled ?: true}</enabled>
+            </snapshots>
+        </pluginRepository>
+        {/for}
+    </pluginRepositories>
+    {/if}
+
+    <dependencies>
+        {#each dependencies}
+        <dependency>
+            <groupId>{it.groupId}</groupId>
+            <artifactId>{it.artifactId}</artifactId>
+            {#if it.version}
+            <version>{it.version}</version>
+            {/if}
+        </dependency>
+        {/each}
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        {#each test-dependencies}
+        <dependency>
+            <groupId>{it.groupId}</groupId>
+            <artifactId>{it.artifactId}</artifactId>
+            {#if it.version}
+            <version>{it.version}</version>
+            {/if}
+            <scope>test</scope>
+        </dependency>
+        {/each}
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Quarkus build plugin - also provides the quarkus:dev live-reload feature -->
+            <plugin>
+                <groupId>{quarkus.maven-plugin.group-id}</groupId>
+                <artifactId>{quarkus.maven-plugin.artifact-id}</artifactId>
+                <version>$\{quarkus-plugin.version}</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>$\{compiler-plugin.version}</version>
+            </plugin>
+            <!-- Run the tests in JVM mode -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>$\{surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <maven.home>$\{maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <!-- Use this profile to build a native executable using GraalVM -->
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <!-- Run the tests with the native executable -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>$\{surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>$\{project.build.directory}/$\{project.build.finalName}-runner</native.image.path>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                        <maven.home>$\{maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/codestart.yml
new file mode 100644
index 0000000000000..6078db1331f83
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/codestart.yml
@@ -0,0 +1,19 @@
+name: maven
+type: buildtool
+fallback: true
+language:
+  base:
+    shared-data:
+      buildtool:
+        build-dir: target
+        cli: mvn
+        guide: https://quarkus.io/guides/maven-tooling.html
+        guide-native: https://quarkus.io/guides/building-native-image
+        cmd:
+          dev: compile quarkus:dev
+          package: package
+          package-uber-jar: package -Dquarkus.package.type=uber-jar
+          package-legacy-jar: package -Dquarkus.package.type=legacy-jar
+          package-native: package -Pnative
+          package-native-container: package -Pnative -Dquarkus.native.container-build=true
+          build-ci: verify -B
diff --git a/devtools/aesh/README.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/java/.gitkeep
similarity index 100%
rename from devtools/aesh/README.md
rename to devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/java/.gitkeep
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/kotlin/pom.tpl.qute.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/kotlin/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..034755124e4b7
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/kotlin/pom.tpl.qute.xml
@@ -0,0 +1,67 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <properties>
+        <kotlin.version>{kotlin.version}</kotlin.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>kotlin-extensions</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+        <plugins>
+            <!-- Kotlin plugin -->
+            <plugin>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <version>$\{kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <javaParameters>true</javaParameters>
+                    <jvmTarget>1.8</jvmTarget>
+                    <!-- Soon to be replaced by plugin that will pre-configure all necessary annotations -->
+                    <compilerPlugins>
+                        <plugin>all-open</plugin>
+                    </compilerPlugins>
+
+                    <pluginOptions>
+                        <!-- Each annotation is placed on its own line -->
+                        <option>all-open:annotation=javax.ws.rs.Path</option>
+                        <option>all-open:annotation=javax.enterprise.context.ApplicationScoped</option>
+                        <option>all-open:annotation=io.quarkus.test.junit.QuarkusTest</option>
+                    </pluginOptions>
+                </configuration>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>$\{kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/scala/pom.tpl.qute.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/scala/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..a491ce465d382
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/maven/scala/pom.tpl.qute.xml
@@ -0,0 +1,62 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <properties>
+        <scala-maven-plugin.version>{scala-maven-plugin.version}</scala-maven-plugin.version>
+        <scala.version>{scala.version}</scala.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-scala</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>$\{scala.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-reflect</artifactId>
+            <version>$\{scala.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <sourceDirectory>src/main/scala</sourceDirectory>
+        <testSourceDirectory>src/test/scala</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <version>$\{scala-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>scala-compile-first</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>scala-test-compile</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scalaVersion>$\{scala.version}</scalaVersion>
+                    <args>
+                        <arg>-deprecation</arg>
+                        <arg>-feature</arg>
+                        <arg>-explaintypes</arg>
+                        <arg>-target:jvm-1.8</arg>
+                        <arg>-Ypartial-unification</arg>
+                    </args>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/config/properties/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/config/properties/codestart.yml
new file mode 100644
index 0000000000000..0da257dbb35ea
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/config/properties/codestart.yml
@@ -0,0 +1,9 @@
+name: config-properties
+type: config
+fallback: true
+language:
+  base:
+    shared-data:
+      config:
+        guide: https://quarkus.io/guides/config
+        file-name: application.properties
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/config/yaml/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/config/yaml/codestart.yml
new file mode 100644
index 0000000000000..cbdd9c9db0eb2
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/config/yaml/codestart.yml
@@ -0,0 +1,10 @@
+name: config-yaml
+type: config
+language:
+  base:
+    shared-data:
+      config:
+        guide: https://quarkus.io/guides/config#yaml
+        file-name: application.yml
+    dependencies:
+      - io.quarkus:quarkus-config-yaml
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/codestart.yml
new file mode 100644
index 0000000000000..9b0c1ece311d1
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/codestart.yml
@@ -0,0 +1,18 @@
+name: commandmode-example
+ref: commandmode
+type: code
+tags: example
+metadata:
+  title: Command Mode example
+  description: Go go commando with this command mode main class.
+language:
+  base:
+    data:
+      main:
+        class-name: HelloCommando
+      package-name: org.acme
+      greeting:
+        message: "Hello"
+        default-name: "Commando"
+    dependencies:
+      - io.quarkus:quarkus-arc
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/java/src/main/java/org/acme/{main.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/java/src/main/java/org/acme/{main.class-name}.tpl.qute.java
new file mode 100644
index 0000000000000..dfc21d94a5acc
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/java/src/main/java/org/acme/{main.class-name}.tpl.qute.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class {main.class-name} implements QuarkusApplication {
+
+    @Override
+    public int run(String... args) throws Exception {
+        final String name = args.length > 0 ? String.join(" ", args) : "{greeting.default-name}";
+        System.out.println("{greeting.message} " + name);
+        return 0;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/kotlin/src/main/kotlin/org/acme/{main.class-name}.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/kotlin/src/main/kotlin/org/acme/{main.class-name}.tpl.qute.kt
new file mode 100644
index 0000000000000..8b326610e49ed
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/commandmode-example/kotlin/src/main/kotlin/org/acme/{main.class-name}.tpl.qute.kt
@@ -0,0 +1,17 @@
+package org.acme
+
+import javax.inject.Inject
+
+import io.quarkus.runtime.QuarkusApplication
+import io.quarkus.runtime.annotations.QuarkusMain
+
+@QuarkusMain
+class {main.class-name}: QuarkusApplication {
+
+    override fun run(vararg args: String?): Int {
+        val name =  if (args.isNotEmpty()) args.joinToString(",") else "{greeting.default-name}"
+        println(name)
+        return 0
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..c06aeeb1b4634
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry path=resource.path/}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/codestart.yml
new file mode 100644
index 0000000000000..585b0f88623f5
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/codestart.yml
@@ -0,0 +1,19 @@
+name: resteasy-example
+ref: resteasy
+type: code
+tags: example
+metadata:
+  title: RESTEasy JAX-RS example
+  description: REST is easy peasy with this Hello World RESTEasy resource.
+  related-guide-section: https://quarkus.io/guides/getting-started#the-jax-rs-resources
+language:
+  base:
+    data:
+      resource:
+        class-name: GreetingResource
+        path: "/hello-resteasy"
+        response: "Hello RESTEasy"
+    dependencies:
+      - io.quarkus:quarkus-resteasy
+    test-dependencies:
+      - io.rest-assured:rest-assured
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java
new file mode 100644
index 0000000000000..769ac7eccf80a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("{resource.path}")
+public class {resource.class-name} {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "{resource.response}";
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
new file mode 100644
index 0000000000000..9462e8558f054
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class Native{resource.class-name}IT extends {resource.class-name}Test {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java
new file mode 100644
index 0000000000000..aca41d9528af0
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class {resource.class-name}Test {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(is("{resource.response}"));
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt
new file mode 100644
index 0000000000000..6cf3f82e70791
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt
@@ -0,0 +1,14 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("{resource.path}")
+class {resource.class-name} {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "{resource.response}"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
new file mode 100644
index 0000000000000..49b2a833857a5
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT : {resource.class-name}Test()
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt
new file mode 100644
index 0000000000000..1e11d2c0caa30
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class {resource.class-name}Test {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(`is`("{resource.response}"))
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala
new file mode 100644
index 0000000000000..9c1d477333e38
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala
@@ -0,0 +1,12 @@
+package org.acme
+
+import javax.ws.rs.\{GET, Path, Produces}
+import javax.ws.rs.core.MediaType
+
+@Path("{resource.path}")
+class {resource.class-name} {
+
+    @GET
+    @Produces(Array[String](MediaType.TEXT_PLAIN))
+    def hello() = "{resource.response}"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
new file mode 100644
index 0000000000000..cdcb18d028a16
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT extends {resource.class-name}Test
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala
new file mode 100644
index 0000000000000..07681f8df9c8b
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class {resource.class-name}Test {
+
+    @Test
+    def testHelloEndpoint() = {
+        given()
+          .`when`().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(`is`("{resource.response}"))
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..c06aeeb1b4634
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry path=resource.path/}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/codestart.yml
new file mode 100644
index 0000000000000..163a7d1048b9c
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/codestart.yml
@@ -0,0 +1,19 @@
+name: resteasy-reactive-example
+ref: resteasy-reactive
+type: code
+tags: example
+metadata:
+  title: RESTEasy Reactive example
+  description: Rest is easy peasy & reactive with this Hello World RESTEasy Reactive resource.
+  related-guide-section: https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources
+language:
+  base:
+    data:
+      resource:
+        class-name: ReactiveGreetingResource
+        path: "/hello-resteasy-reactive"
+        response: "Hello RESTEasy Reactive"
+    dependencies:
+      - io.quarkus:quarkus-resteasy-reactive
+    test-dependencies:
+      - io.rest-assured:rest-assured
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java
new file mode 100644
index 0000000000000..769ac7eccf80a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("{resource.path}")
+public class {resource.class-name} {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "{resource.response}";
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
new file mode 100644
index 0000000000000..9462e8558f054
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class Native{resource.class-name}IT extends {resource.class-name}Test {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java
new file mode 100644
index 0000000000000..aca41d9528af0
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class {resource.class-name}Test {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(is("{resource.response}"));
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt
new file mode 100644
index 0000000000000..6cf3f82e70791
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt
@@ -0,0 +1,14 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("{resource.path}")
+class {resource.class-name} {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "{resource.response}"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
new file mode 100644
index 0000000000000..49b2a833857a5
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT : {resource.class-name}Test()
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt
new file mode 100644
index 0000000000000..1e11d2c0caa30
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class {resource.class-name}Test {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(`is`("{resource.response}"))
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala
new file mode 100644
index 0000000000000..9c1d477333e38
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala
@@ -0,0 +1,12 @@
+package org.acme
+
+import javax.ws.rs.\{GET, Path, Produces}
+import javax.ws.rs.core.MediaType
+
+@Path("{resource.path}")
+class {resource.class-name} {
+
+    @GET
+    @Produces(Array[String](MediaType.TEXT_PLAIN))
+    def hello() = "{resource.response}"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
new file mode 100644
index 0000000000000..cdcb18d028a16
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT extends {resource.class-name}Test
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala
new file mode 100644
index 0000000000000..07681f8df9c8b
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/resteasy-reactive-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class {resource.class-name}Test {
+
+    @Test
+    def testHelloEndpoint() = {
+        given()
+          .`when`().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(`is`("{resource.response}"))
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..c06aeeb1b4634
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry path=resource.path/}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/codestart.yml
new file mode 100644
index 0000000000000..a4c51fa3e6ba8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/codestart.yml
@@ -0,0 +1,20 @@
+name: spring-web-example
+ref: spring-web
+type: code
+tags: example
+metadata:
+  title: Spring Web example
+  description: Spring, the Quarkus way! A Hello World Spring Web Controller.
+  related-guide-section: https://quarkus.io/guides/spring-web#greetingcontroller
+language:
+  base:
+    data:
+      resource:
+        class-name: SpringGreetingController
+        path: "/hello-spring"
+        response: "Hello Spring"
+      package-name: org.acme
+    dependencies:
+      - io.quarkus:quarkus-spring-web
+    test-dependencies:
+      - io.rest-assured:rest-assured
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java
new file mode 100644
index 0000000000000..7af3fc242b976
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java
@@ -0,0 +1,15 @@
+package org.acme;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("{resource.path}")
+public class {resource.class-name} {
+
+    @GetMapping
+    public String hello() {
+        return "{resource.response}";
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
new file mode 100644
index 0000000000000..9462e8558f054
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/native-test/java/org/acme/Native{resource.class-name}IT.tpl.qute.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class Native{resource.class-name}IT extends {resource.class-name}Test {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java
new file mode 100644
index 0000000000000..aca41d9528af0
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class {resource.class-name}Test {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(is("{resource.response}"));
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt
new file mode 100644
index 0000000000000..20ca8ba781287
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt
@@ -0,0 +1,14 @@
+package org.acme
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("{resource.path}")
+class {resource.class-name} {
+
+    @GetMapping
+    fun hello() = "{resource.response}"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
new file mode 100644
index 0000000000000..49b2a833857a5
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/native-test/kotlin/org/acme/Native{resource.class-name}IT.tpl.qute.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT : {resource.class-name}Test()
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt
new file mode 100644
index 0000000000000..1e11d2c0caa30
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class {resource.class-name}Test {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(`is`("{resource.response}"))
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala
new file mode 100644
index 0000000000000..b72ae46ba7e5d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala
@@ -0,0 +1,12 @@
+package org.acme;
+
+import org.springframework.web.bind.annotation.\{GetMapping, RequestMapping, RestController}
+
+
+@RestController
+@RequestMapping(Array[String]("{resource.path}"))
+class {resource.class-name} {
+
+    @GetMapping
+    def hello() = "{resource.response}"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
new file mode 100644
index 0000000000000..cdcb18d028a16
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/native-test/scala/org/acme/Native{resource.class-name}IT.tpl.qute.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class Native{resource.class-name}IT extends {resource.class-name}Test
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala
new file mode 100644
index 0000000000000..07681f8df9c8b
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/examples/spring-web-example/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class {resource.class-name}Test {
+
+    @Test
+    def testHelloEndpoint() = {
+        given()
+          .`when`().get("{resource.path}")
+          .then()
+             .statusCode(200)
+             .body(`is`("{resource.response}"))
+    }
+
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/java/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/java/codestart.yml
new file mode 100644
index 0000000000000..2846850c7f356
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/java/codestart.yml
@@ -0,0 +1,9 @@
+name: java
+type: language
+fallback: true
+language:
+  base:
+    shared-data:
+      language:
+        dir:
+          code: src/main/java
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/kotlin/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/kotlin/codestart.yml
new file mode 100644
index 0000000000000..fa9d59b1dde5c
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/kotlin/codestart.yml
@@ -0,0 +1,10 @@
+name: kotlin
+type: language
+language:
+  base:
+    shared-data:
+      language:
+        dir:
+          code: src/main/kotlin
+    dependencies:
+      io.quarkus:quarkus-kotlin
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/scala/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/scala/codestart.yml
new file mode 100644
index 0000000000000..86cd415f7d5d8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/language/scala/codestart.yml
@@ -0,0 +1,10 @@
+name: scala
+type: language
+language:
+  base:
+    shared-data:
+      language:
+        dir:
+          code: src/main/scala
+    dependencies:
+      io.quarkus:quarkus-scala
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/..gitignore b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/..gitignore
new file mode 100644
index 0000000000000..3cf482a1da8dc
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/..gitignore
@@ -0,0 +1,32 @@
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Local environment
+.env
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..202524bba241a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/README.tpl.qute.md
@@ -0,0 +1,61 @@
+# {project.artifact-id} project
+
+This project uses Quarkus, the Supersonic Subatomic Java Framework.
+
+If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ .
+
+## Running the application in dev mode
+
+You can run your application in dev mode that enables live coding using:
+```shell script
+{buildtool.cli} {buildtool.cmd.dev}
+```
+
+> **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
+
+## Packaging and running the application
+
+The application can be packaged using:
+```shell script
+{buildtool.cli} {buildtool.cmd.package}
+```
+It produces the `quarkus-run.jar` file in the `{buildtool.build-dir}/quarkus-app/` directory.
+Be aware that it’s not an _über-jar_ as the dependencies are copied into the `{buildtool.build-dir}/quarkus-app/lib/` directory.
+
+If you want to build an _über-jar_, execute the following command:
+```shell script
+{buildtool.cli} {buildtool.cmd.package-uber-jar}
+```
+
+The application is now runnable using `java -jar {buildtool.build-dir}/quarkus-app/quarkus-run.jar`.
+
+## Creating a native executable
+
+You can create a native executable using: 
+```shell script
+{buildtool.cli} {buildtool.cmd.package-native}
+```
+
+Or, if you don't have GraalVM installed, you can run the native executable build in a container using: 
+```shell script
+{buildtool.cli} {buildtool.cmd.package-native-container}
+```
+
+You can then execute your native executable with: `./{buildtool.build-dir}/{project.artifact-id}-{project.version}-runner`
+
+If you want to learn more about building native executables, please consult {buildtool.guide}.
+
+{#if input.selected-extensions}
+## Related guides
+
+{#for ext in input.selected-extensions}
+{#if ext.guide}
+- {ext.name} ([guide]({ext.guide})): {ext.description}
+{/if}
+{/for}
+
+{/if}
+{#if input.selected-examples}
+## Provided examples
+{/if}
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/index-entry.include.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/index-entry.include.qute
new file mode 100644
index 0000000000000..c11ee97da52d2
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/index-entry.include.qute
@@ -0,0 +1,7 @@
+        <div class="example-code">
+            <h3>{title}</h3>
+            <p>{description}</p>
+            {#if path}<p><code>@Path: <a href="{path}" class="path-link" target="_blank">{path}</a></code></p>{/if}
+            {#if related-guide-section}<p><a href="{related-guide-section}" class="guide-link" target="_blank">Related guide section...</a></p>{/if}
+            {#insert body}{/}
+        </div>
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/readme-header.include.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/readme-header.include.qute
new file mode 100644
index 0000000000000..0b0f1d29bdb7d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/readme-header.include.qute
@@ -0,0 +1,7 @@
+### {title}
+
+{description}
+{#if related-guide-section}
+
+[Related guide section...]({related-guide-section})
+{/if}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html
new file mode 100644
index 0000000000000..7106cecab53f6
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html
@@ -0,0 +1,176 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{project.artifact-id} - {project.version}</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #0d1c2c;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #71aeef;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+        .example-code {
+            border-left: 0.3rem solid #71aeef;
+            padding-left: 10px;
+        }
+
+        .example-code h3 {
+            font-weight: 200;
+        }
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus cloud application.</p>
+
+        <h2>What is this page?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What are your next steps?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>{buildtool.cli} {buildtool.cmd.dev}</code>.
+        </p>
+        <ul>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/{config.file-name}</code>.</li>
+            <li>Quarkus now ships with a <a href="/q/dev/">Dev UI</a> (available in dev mode only)</li>
+            <li>Play with the getting started example code located in <code>{language.dir.code}</code>:</li>
+        </ul>
+        {merged-content}
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: <code>{project.group-id}</code></li>
+                <li>ArtifactId: <code>{project.artifact-id}</code></li>
+                <li>Version: <code>{project.version}</code></li>
+                <li>Quarkus Version: <code>{quarkus.version}</code></li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Do you like Quarkus?</h3>
+            <ul>
+                <li>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</li>
+            </ul>
+        </div>
+        {#if input.selected-extensions}
+        <div class="right-section">
+            <h3>Selected extensions guides</h3>
+            <ul>
+                {#for ext in input.selected-extensions}
+                {#if ext.guide}
+                <li title="{ext.description}"><a href="{ext.guide}" target="_blank">{ext.name} guide</a></li>
+                {/if}
+                {/for}
+            </ul>
+        </div>
+        {/if}
+        <div class="right-section">
+            <h3>More reading</h3>
+            <ul>
+                <li><a href="{buildtool.guide}" target="_blank">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
+                <li><a href="https://quarkus.io/guides/" target="_blank">All guides</a></li>
+                <li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/devtools/gradle/src/test/resources/gradle-project/settings.gradle b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/src/main/resources/application.yml
similarity index 100%
rename from devtools/gradle/src/test/resources/gradle-project/settings.gradle
rename to devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/base/src/main/resources/application.yml
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/codestart.yml
new file mode 100644
index 0000000000000..43f1b95f233c4
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/codestart.yml
@@ -0,0 +1,28 @@
+name: quarkus
+type: project
+fallback: true
+output-strategy:
+  "pom.xml": smart-pom-merge
+  "README.md": append
+  "readme.md": forbidden
+  "README.adoc": forbidden
+  "readme.adoc": forbidden
+  ".gitignore": append
+  "src/main/resources/META-INF/resources/index.html": content-merge
+  "src/main/resources/application.yml": smart-config-merge
+  "src/main/resources/application.properties": forbidden
+  "src/test/resources/application.yml": smart-config-merge
+  "src/test/resources/application.properties": forbidden
+  "*.java": smart-package
+  "*.kt": smart-package
+  "*.scala": smart-package
+  "*": fail-on-duplicate
+language:
+  base:
+    shared-data:
+      project:
+        group-id: org.acme
+        artifact-id: quarkus-project
+        version: 1.0.0-SNAPSHOT
+    dependencies:
+      - io.quarkus:quarkus-arc
diff --git a/extensions/vault/runtime/src/main/resources/META-INF/beans.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/java/src/main/java/.gitkeep
similarity index 100%
rename from extensions/vault/runtime/src/main/resources/META-INF/beans.xml
rename to devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/java/src/main/java/.gitkeep
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/resources/META-INF/beans.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/kotlin/src/main/kotlin/.gitkeep
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/main/resources/META-INF/beans.xml
rename to devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/kotlin/src/main/kotlin/.gitkeep
diff --git a/integration-tests/jpa-postgresql/src/main/resources/META-INF/beans.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/scala/src/main/scala/.gitkeep
similarity index 100%
rename from integration-tests/jpa-postgresql/src/main/resources/META-INF/beans.xml
rename to devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/project/quarkus/scala/src/main/scala/.gitkeep
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/.dockerignore.tpl.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/.dockerignore.tpl.qute
new file mode 100644
index 0000000000000..cbc0ab2aa6fa6
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/.dockerignore.tpl.qute
@@ -0,0 +1,5 @@
+*
+!{buildtool.build-dir}/*-runner
+!{buildtool.build-dir}/*-runner.jar
+!{buildtool.build-dir}/lib/*
+!{buildtool.build-dir}/quarkus-app/*
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/Dockerfile-layout.include.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/Dockerfile-layout.include.qute
new file mode 100644
index 0000000000000..9cd67f2754a56
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/Dockerfile-layout.include.qute
@@ -0,0 +1,48 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the container image run:
+#
+# {#insert quarkusbuild /}
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.{type} -t quarkus/{project.artifact-id}-{type} .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}-{type}
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-{type}
+#
+###
+FROM {#insert image /}
+{#insert args /}
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+# Install java and the run-java script
+# Also set up permissions for user `1001`
+RUN microdnf install curl ca-certificates $\{JAVA_PACKAGE} \
+    && microdnf update \
+    && microdnf clean all \
+    && mkdir /deployments \
+    && chown 1001 /deployments \
+    && chmod "g+rwX" /deployments \
+    && chown 1001:root /deployments \
+    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/$\{RUN_JAVA_VERSION}/run-java-sh-$\{RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
+    && chown 1001 /deployments/run-java.sh \
+    && chmod 540 /deployments/run-java.sh \
+    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
+
+# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
+ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+{#insert copy /}
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm
new file mode 100644
index 0000000000000..7dd930589ab34
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm
@@ -0,0 +1,16 @@
+{#include Dockerfile-layout type='jvm'}
+    {#quarkusbuild}{buildtool.cli} {buildtool.cmd.package}{/quarkusbuild}
+    {#image}{dockerfile.jvm.from} {/image}
+    {#args}
+ARG JAVA_PACKAGE={dockerfile.jvm.java-package}
+ARG RUN_JAVA_VERSION={dockerfile.jvm.run-java-version}
+    {/args}
+    {#copy}
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=1001 {buildtool.build-dir}/quarkus-app/lib/ /deployments/lib/
+COPY --chown=1001 {buildtool.build-dir}/quarkus-app/*.jar /deployments/
+COPY --chown=1001 {buildtool.build-dir}/quarkus-app/app/ /deployments/app/
+COPY --chown=1001 {buildtool.build-dir}/quarkus-app/quarkus/ /deployments/quarkus/
+    {/copy}
+{/include}
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar
new file mode 100644
index 0000000000000..4f30fe8d7fa14
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar
@@ -0,0 +1,12 @@
+{#include Dockerfile-layout type='legacy-jar'}
+    {#quarkusbuild}{buildtool.cli} {buildtool.cmd.package-legacy-jar}{/quarkusbuild}
+    {#image}{dockerfile.legacy-jar.from} {/image}
+    {#args}
+ARG JAVA_PACKAGE={dockerfile.legacy-jar.java-package}
+ARG RUN_JAVA_VERSION={dockerfile.legacy-jar.run-java-version}
+    {/args}
+    {#copy}
+COPY {buildtool.build-dir}/lib/* /deployments/lib/
+COPY {buildtool.build-dir}/*-runner.jar /deployments/app.jar
+    {/copy}
+{/include}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native
new file mode 100644
index 0000000000000..7e2697acbb008
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native
@@ -0,0 +1,27 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode
+#
+# Before building the container image run:
+#
+# {buildtool.cli} {buildtool.cmd.package-native}
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native -t quarkus/{project.artifact-id} .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}
+#
+###
+FROM {dockerfile.native.from}
+WORKDIR /work/
+RUN chown 1001 /work \
+    && chmod "g+rwX" /work \
+    && chown 1001:root /work
+COPY --chown=1001:root {buildtool.build-dir}/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native-distroless b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native-distroless
new file mode 100644
index 0000000000000..768451a3c7809
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.native-distroless
@@ -0,0 +1,23 @@
+####
+# This Dockerfile is used in order to build a distroless container that runs the Quarkus application in native (no JVM) mode
+#
+# Before building the container image run:
+#
+# {buildtool.cli} {buildtool.cmd.package-native}
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native-distroless -t quarkus/{project.artifact-id} .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}
+#
+###
+FROM {dockerfile.native-distroless.from}
+COPY {buildtool.build-dir}/*-runner /application
+
+EXPOSE 8080
+USER nonroot
+
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml
new file mode 100644
index 0000000000000..3a3d6f97845a4
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml
@@ -0,0 +1,18 @@
+name: dockerfiles
+type: tooling
+language:
+  base:
+    data:
+      dockerfile:
+        jvm:
+          from: registry.access.redhat.com/ubi8/ubi-minimal:8.3
+          java-package: java-11-openjdk-headless
+          run-java-version: 1.3.8
+        legacy-jar:
+          from: registry.access.redhat.com/ubi8/ubi-minimal:8.3
+          java-package: java-11-openjdk-headless
+          run-java-version: 1.3.8
+        native:
+          from: registry.access.redhat.com/ubi8/ubi-minimal:8.3
+        native-distroless:
+          from: quay.io/quarkus/quarkus-distroless-image:1.0
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/github-action/base/.github/workflows/ci.tpl.qute.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/github-action/base/.github/workflows/ci.tpl.qute.yml
new file mode 100644
index 0000000000000..59956fe437203
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/github-action/base/.github/workflows/ci.tpl.qute.yml
@@ -0,0 +1,27 @@
+## This is basic continuous integration build for your Quarkus application.
+
+name: Quarkus Codestart CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK {java.version}
+        uses: actions/setup-java@v1
+        with:
+          java-version: {java.version}
+      - name: Build
+        {#if buildtool.cli == 'gradle'}
+          uses: eskatos/gradle-command-action@v1
+          with:
+            arguments: {buildtool.cmd.build-ci}
+        {#else}
+        run: {buildtool.cli} {buildtool.cmd.build-ci}
+        {/if}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/github-action/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/github-action/codestart.yml
new file mode 100644
index 0000000000000..e933401728f61
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/github-action/codestart.yml
@@ -0,0 +1,2 @@
+name: github-action
+type: tooling
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradle/wrapper/gradle-wrapper.jar b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000..62d4c053550b9
Binary files /dev/null and b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradle/wrapper/gradle-wrapper.tpl.qute.properties b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradle/wrapper/gradle-wrapper.tpl.qute.properties
new file mode 100644
index 0000000000000..41f6d9639814a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradle/wrapper/gradle-wrapper.tpl.qute.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-{gradle.version}-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradlew b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradlew
new file mode 100644
index 0000000000000..fbd7c515832da
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradlew.bat b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradlew.bat
new file mode 100755
index 0000000000000..a9f778a7a964b
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/base/gradlew.bat
@@ -0,0 +1,104 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/codestart.yml
new file mode 100644
index 0000000000000..2caf1d448717d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/gradle-wrapper/codestart.yml
@@ -0,0 +1,13 @@
+name: gradle-wrapper
+type: tooling
+output-strategy:
+  "gradlew": "executable"
+  "gradlew.bat": "executable"
+language:
+  base:
+    data:
+      gradle:
+        version: 6.8.3
+    shared-data:
+      buildtool:
+        cli: ./gradlew
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/.mvn/wrapper/MavenWrapperDownloader.tpl.qute.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/.mvn/wrapper/MavenWrapperDownloader.tpl.qute.java
new file mode 100644
index 0000000000000..2e3f96e7dcdaf
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/.mvn/wrapper/MavenWrapperDownloader.tpl.qute.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * 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
+ *
+ *      https://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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "{maven.wrapper-version}";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/.mvn/wrapper/maven-wrapper.tpl.qute.properties b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/.mvn/wrapper/maven-wrapper.tpl.qute.properties
new file mode 100644
index 0000000000000..bb5fb3b4e3ead
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/.mvn/wrapper/maven-wrapper.tpl.qute.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/{maven.version}/apache-maven-{maven.version}-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/{maven.wrapper-version}/maven-wrapper-{maven.wrapper-version}.jar
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/mvnw.tpl.qute b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/mvnw.tpl.qute
new file mode 100755
index 0000000000000..8f133b17bbeb7
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/mvnw.tpl.qute
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#    https://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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "$\{wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "$\{basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/{maven.wrapper-version}/maven-wrapper-{maven.wrapper-version}.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/{maven.wrapper-version}/maven-wrapper-{maven.wrapper-version}.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=$\{MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=$\{M2_HOME}" "-Dmaven.multiModuleProjectDirectory=$\{MAVEN_PROJECTBASEDIR}" \
+  $\{WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/mvnw.tpl.qute.cmd b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/mvnw.tpl.qute.cmd
new file mode 100644
index 0000000000000..c351488bf453e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/base/mvnw.tpl.qute.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/{maven.wrapper-version}/maven-wrapper-{maven.wrapper-version}.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/{maven.wrapper-version}/maven-wrapper-{maven.wrapper-version}.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/codestart.yml
new file mode 100644
index 0000000000000..5146e94641432
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/maven-wrapper/codestart.yml
@@ -0,0 +1,14 @@
+name: maven-wrapper
+type: tooling
+output-strategy:
+  "mvnw": "executable"
+  "mvnw.cmd": "executable"
+language:
+  base:
+    data:
+      maven:
+        version: 3.6.3
+        wrapper-version: 0.5.6
+    shared-data:
+      buildtool:
+        cli: ./mvnw
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..4d1a05ebb5d47
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/README.tpl.qute.md
@@ -0,0 +1,3 @@
+{#include readme-header /}
+
+The Quarkus configuration location is `src/main/resources/{config.file-name}`.
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/src/main/resources/application.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/src/main/resources/application.yml
new file mode 100755
index 0000000000000..57ebddd227388
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/base/src/main/resources/application.yml
@@ -0,0 +1,5 @@
+display:
+  mach: 3
+  unit:
+    name: mph
+    factor: 2.23694
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/codestart.yml
new file mode 100644
index 0000000000000..a9ac14deb627b
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/codestart.yml
@@ -0,0 +1,13 @@
+name: config-example
+ref: config-yaml
+type: code
+tags: example
+metadata:
+  title: YAML Config example
+  description: This Supersonic example displays mach speed in your favourite unit, depending on the specified Quarkus configuration.
+  path: /config/supersonic
+  related-guide-section: https://quarkus.io/guides/config-reference#configuration-examples
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-resteasy
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/java/src/main/java/org/acme/config/ConfigResource.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/java/src/main/java/org/acme/config/ConfigResource.java
new file mode 100755
index 0000000000000..60925f5da57ad
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/java/src/main/java/org/acme/config/ConfigResource.java
@@ -0,0 +1,41 @@
+package org.acme.config;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.math.BigDecimal;
+import java.util.Optional;
+
+@Path("/config")
+public class ConfigResource {
+
+    @ConfigProperty(name = "constant.speed-of-sound-in-meter-per-second", defaultValue = "343")
+    int speedOfSound;
+
+    @ConfigProperty(name = "display.mach")
+    Optional<Integer> displayMach;
+
+    @ConfigProperty(name = "display.unit.name")
+    String displayUnitName;
+
+    @ConfigProperty(name = "display.unit.factor")
+    BigDecimal displayUnitFactor;
+
+    @GET
+    @Path("supersonic")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String supersonic() {
+        final int mach = displayMach.orElse(1);
+        final BigDecimal speed = BigDecimal.valueOf(speedOfSound)
+            .multiply(displayUnitFactor)
+            .multiply(BigDecimal.valueOf(mach));
+        return String.format("Mach %d is %.3f %s",
+            mach,
+            speed,
+            displayUnitName
+        );
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/kotlin/src/main/kotlin/org/acme/config/ConfigResource.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/kotlin/src/main/kotlin/org/acme/config/ConfigResource.kt
new file mode 100755
index 0000000000000..9e4062a8dc020
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/config-example/kotlin/src/main/kotlin/org/acme/config/ConfigResource.kt
@@ -0,0 +1,39 @@
+package org.acme.config
+
+import org.eclipse.microprofile.config.inject.ConfigProperty
+import java.math.BigDecimal
+import java.util.*
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/config")
+class ConfigResource {
+    @ConfigProperty(name = "constant.speed-of-sound-in-meter-per-second", defaultValue = "343")
+    var speedOfSound = 0
+
+    @ConfigProperty(name = "display.mach")
+    lateinit var displayMach: Optional<Int>
+
+    @ConfigProperty(name = "display.unit.name")
+    lateinit var displayUnitName: String
+
+    @ConfigProperty(name = "display.unit.factor")
+    lateinit var displayUnitFactor: BigDecimal
+
+    @GET
+    @Path("supersonic")
+    @Produces(MediaType.TEXT_PLAIN)
+    fun supersonic(): String {
+        val mach = displayMach.orElse(1)
+        val speed = BigDecimal.valueOf(speedOfSound.toLong())
+                .multiply(displayUnitFactor)
+                .multiply(BigDecimal.valueOf(mach.toLong()))
+        return String.format("Mach %d is %.3f %s",
+                mach,
+                speed,
+                displayUnitName
+        )
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..ccb61df404b1e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/codestart.yml
new file mode 100644
index 0000000000000..c07bf5bbabf23
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/codestart.yml
@@ -0,0 +1,15 @@
+name: funqy-http-example
+ref: funqy-http
+type: code
+tags: example
+metadata:
+  title: Funqy HTTP example
+  description: Quark is a type of elementary particle and a fundamental constituent of matter, Charm is a Quark flavor. Try to guess the Charm Quark symbol with this Funqy function by changing the <code>?value=<character></code> query param. Go Subatomic!
+  path: /charm?value=s
+  related-guide-section: https://quarkus.io/guides/funqy-http#get-query-parameter-mapping
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-funqy-http
+    test-dependencies:
+      - io.rest-assured:rest-assured
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/main/java/org/acme/funqy/Funqy.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/main/java/org/acme/funqy/Funqy.java
new file mode 100644
index 0000000000000..1459171f0a48a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/main/java/org/acme/funqy/Funqy.java
@@ -0,0 +1,19 @@
+package org.acme.funqy;
+
+import io.quarkus.funqy.Funq;
+
+import java.util.Random;
+
+public class Funqy {
+
+    private static final String CHARM_QUARK_SYMBOL = "c";
+
+    @Funq
+    public String charm(Answer answer) {
+        return CHARM_QUARK_SYMBOL.equalsIgnoreCase(answer.value) ? "You Quark!" : "👻 Wrong answer";
+    }
+
+    public static class Answer {
+        public String value;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java
new file mode 100644
index 0000000000000..cce22690603da
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java
@@ -0,0 +1,10 @@
+package org.acme.funqy;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class FunqyIT extends FunqyTest {
+
+    // Run the same tests
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/test/java/org/acme/funqy/FunqyTest.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/test/java/org/acme/funqy/FunqyTest.java
new file mode 100644
index 0000000000000..54e2f89371594
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/funqy-http-example/java/src/test/java/org/acme/funqy/FunqyTest.java
@@ -0,0 +1,23 @@
+package org.acme.funqy;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+@QuarkusTest
+public class FunqyTest {
+
+    @Test
+    public void testCharm() {
+        given()
+                .contentType("application/json")
+                .body("{\"value\": \"c\"}")
+                .post("/charm")
+                .then()
+                .statusCode(200)
+                .body(containsString("You Quark!"));
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/src/main/resources/application.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/src/main/resources/application.yml
new file mode 100644
index 0000000000000..595acd4bf3c00
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/base/src/main/resources/application.yml
@@ -0,0 +1,7 @@
+quarkus:
+  log:
+    console:
+      json:
+        pretty-print: true
+        date-format: YYYY-MM-dd HH:mm:ss
+        exception-output-type: detailed-and-formatted
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/codestart.yml
new file mode 100644
index 0000000000000..6837a7ec36c57
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/codestart.yml
@@ -0,0 +1,14 @@
+name: logging-json-example
+ref: logging-json
+type: code
+tags: example
+metadata:
+  title: Logging JSON example
+  description: This example let you go faster with your jet aircraft, your speed is logged when you send a new request.<br/> When you reach the speed of sound, a "Sonic Boom" error is going to be thrown and logged. Boom!
+  path: /logging-json/faster
+  related-guide-section: https://quarkus.io/guides/logging#configuration
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-resteasy
+      - io.quarkus:quarkus-logging-json
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/java/src/main/java/org/acme/logging/json/LoggingJsonResource.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/java/src/main/java/org/acme/logging/json/LoggingJsonResource.java
new file mode 100644
index 0000000000000..5f6e996669b2e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/java/src/main/java/org/acme/logging/json/LoggingJsonResource.java
@@ -0,0 +1,35 @@
+package org.acme.logging.json;
+
+import org.jboss.logging.Logger;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.ServerErrorException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Path("/logging-json")
+public class LoggingJsonResource {
+
+    private static final Logger LOG = Logger.getLogger(LoggingJsonResource.class);
+    private static final int SPEED_OF_SOUND_IN_METER_PER_SECOND = 343;
+
+    private final AtomicInteger speed = new AtomicInteger(0);
+    private final Random random = new Random();
+
+    @GET
+    @Path("faster")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String faster() {
+        final int s = speed.addAndGet(random.nextInt(200));
+        if (s > SPEED_OF_SOUND_IN_METER_PER_SECOND) {
+            throw new ServerErrorException("💥 SONIC BOOOOOM!!!", Response.Status.SERVICE_UNAVAILABLE);
+        }
+        String message = String.format("Your jet aircraft speed is %s m/s.", s);
+        LOG.info(message);
+        return message + " Watch the logs...";
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/kotlin/src/main/kotlin/org/acme/logging/json/LoggingJsonResource.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/kotlin/src/main/kotlin/org/acme/logging/json/LoggingJsonResource.kt
new file mode 100644
index 0000000000000..3972de99a5c3a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/logging-json/kotlin/src/main/kotlin/org/acme/logging/json/LoggingJsonResource.kt
@@ -0,0 +1,35 @@
+package org.acme.logging.json
+
+import org.jboss.logging.Logger
+import java.util.*
+import java.util.concurrent.atomic.AtomicInteger
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.ServerErrorException
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/logging-json")
+class LoggingJsonResource {
+    private val speed = AtomicInteger(0)
+    private val random = Random()
+
+    @GET
+    @Path("faster")
+    @Produces(MediaType.TEXT_PLAIN)
+    fun faster(): String {
+        val s = speed.addAndGet(random.nextInt(200))
+        if (s > SPEED_OF_SOUND_IN_METER_PER_SECOND) {
+            throw ServerErrorException("💥 SONIC BOOOOOM!!!", Response.Status.SERVICE_UNAVAILABLE)
+        }
+        val message = "Your jet aircraft speed is $s m/s."
+        LOG.info(message)
+        return "$message Watch the logs..."
+    }
+
+    companion object {
+        private val LOG = Logger.getLogger(LoggingJsonResource::class.java)
+        private const val SPEED_OF_SOUND_IN_METER_PER_SECOND = 343
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..eb1ae983ef01e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/base/README.tpl.qute.md
@@ -0,0 +1,8 @@
+{#include readme-header /}
+
+Also for picocli applications the dev mode is supported. When running dev mode, the picocli application is executed and on press of the Enter key, is restarted.
+
+As picocli applications will often require arguments to be passed on the commandline, this is also possible in dev mode via:
+```shell script
+{buildtool.cli} {buildtool.cmd.dev} {#if input.base-codestart.buildtool == 'gradle' || input.base-codestart.buildtool == 'gradle-kotlin-dsl'}--quarkus-args{#else}-Dquarkus.args{/if}='hello --first-name=Quarky'
+```
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/codestart.yml
new file mode 100644
index 0000000000000..84a8140dd0b23
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/codestart.yml
@@ -0,0 +1,12 @@
+name: picocli-example
+ref: picocli
+type: code
+tags: example
+metadata:
+  title: Picocli Example
+  description: Hello and goodbye are civilization fundamentals. Let's not forget it with this example picocli application by changing the <code>command</code> and <code>parameters</code>.
+  related-guide-section: https://quarkus.io/guides/picocli#command-line-application-with-multiple-commands
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-picocli
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/EntryCommand.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/EntryCommand.java
new file mode 100755
index 0000000000000..4447b7610861e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/EntryCommand.java
@@ -0,0 +1,9 @@
+package org.acme.picocli;
+
+import io.quarkus.picocli.runtime.annotations.TopCommand;
+import picocli.CommandLine;
+
+@TopCommand
+@CommandLine.Command(mixinStandardHelpOptions = true, subcommands = { HelloCommand.class, GoodbyeCommand.class })
+public class EntryCommand {
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/GoodbyeCommand.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/GoodbyeCommand.java
new file mode 100644
index 0000000000000..653ba227a5540
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/GoodbyeCommand.java
@@ -0,0 +1,21 @@
+package org.acme.picocli;
+
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+@Command(name = "goodbye")
+public class GoodbyeCommand implements Runnable {
+
+    @Option(names = {"--name"}, description = "Guest name")
+    String name;
+
+    @Option(names = {"--times", "-t"}, defaultValue = "1", description = "How many time should we say goodbye")
+    int times;
+
+    @Override
+    public void run() {
+        for (int i = 0;i<times;i++) {
+            System.out.printf("Goodbye %s!\n", name);
+        }
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/GreetingService.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/GreetingService.java
new file mode 100644
index 0000000000000..4bf7abeb7aaa4
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/GreetingService.java
@@ -0,0 +1,11 @@
+package org.acme.picocli;
+
+import javax.enterprise.context.Dependent;
+
+@Dependent
+public class GreetingService {
+
+    public void sayHello(String name){
+        System.out.printf("Hello dear %s!\n", name);
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/HelloCommand.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/HelloCommand.java
new file mode 100644
index 0000000000000..79bca01d31dcf
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/java/src/main/java/org/acme/picocli/HelloCommand.java
@@ -0,0 +1,39 @@
+package org.acme.picocli;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.io.File;
+import java.net.URL;
+
+@Command(name = "hello")
+public class HelloCommand implements Runnable{
+
+    @CommandLine.ArgGroup(exclusive = true, multiplicity = "1")
+    Name name;
+
+    static class Name {
+
+        @CommandLine.Option(names = {"--first-name"}, description = "The guest first name")
+        String firstName;
+
+        @CommandLine.Option(names = {"--nick-name"}, description = "The guest nickname")
+        String nickname;
+
+        String value(){
+            return firstName != null ? firstName : nickname;
+        }
+
+    }
+
+    private final GreetingService greetingService;
+
+    public HelloCommand(GreetingService greetingService) {
+        this.greetingService = greetingService;
+    }
+
+    @Override
+    public void run() {
+        greetingService.sayHello(name.value());
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/EntryCommand.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/EntryCommand.kt
new file mode 100755
index 0000000000000..47a14786f6376
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/EntryCommand.kt
@@ -0,0 +1,8 @@
+package org.acme.picocli
+
+import io.quarkus.picocli.runtime.annotations.TopCommand
+import picocli.CommandLine
+
+@TopCommand
+@CommandLine.Command(mixinStandardHelpOptions = true, subcommands = [HelloCommand::class, GoodbyeCommand::class])
+class EntryCommand 
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/GoodbyeCommand.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/GoodbyeCommand.kt
new file mode 100644
index 0000000000000..5319a8ebb8141
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/GoodbyeCommand.kt
@@ -0,0 +1,17 @@
+package org.acme.picocli
+
+import picocli.CommandLine
+
+@CommandLine.Command(name = "goodbye")
+class GoodbyeCommand : Runnable {
+    @CommandLine.Option(names = ["--name"], description = ["Guest name"])
+    var name: String? = null
+
+    @CommandLine.Option(names = ["--times", "-t"], defaultValue = "1", description = ["How many time should we say goodbye"])
+    var times = 0
+    override fun run() {
+        for (i in 0 until times) {
+            System.out.printf("Goodbye %s!\n", name)
+        }
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/GreetingService.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/GreetingService.kt
new file mode 100644
index 0000000000000..67fb9830532db
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/GreetingService.kt
@@ -0,0 +1,10 @@
+package org.acme.picocli
+
+import javax.enterprise.context.Dependent
+
+@Dependent
+class GreetingService {
+    fun sayHello(name: String?) {
+        System.out.printf("Hello dear %s!\n", name)
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/HelloCommand.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/HelloCommand.kt
new file mode 100644
index 0000000000000..d285c7982e191
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/picocli-example/kotlin/src/main/kotlin/org/acme/picocli/HelloCommand.kt
@@ -0,0 +1,27 @@
+package org.acme.picocli
+
+import picocli.CommandLine
+import picocli.CommandLine.ArgGroup
+
+@CommandLine.Command(name = "hello")
+class HelloCommand(private val greetingService: GreetingService) : Runnable {
+
+    @ArgGroup(exclusive = true, multiplicity = "1")
+    var name: Name? = null
+
+    class Name {
+        @CommandLine.Option(names = ["--first-name"], description = ["The guest first name"])
+        var firstName: String? = null
+
+        @CommandLine.Option(names = ["--nick-name"], description = ["The guest nickname"])
+        var nickname: String? = null
+
+        fun value(): String {
+            return if (firstName != null) firstName!! else nickname!!
+        }
+    }
+
+    override fun run() {
+        greetingService.sayHello(name!!.value())
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/codestart.yml
new file mode 100644
index 0000000000000..34aea734f26f1
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/codestart.yml
@@ -0,0 +1,14 @@
+name: resteasy-jackson-example
+ref: resteasy-jackson
+type: code
+tags: example
+metadata:
+  title: RESTEasy JSON serialisation using Jackson
+  description: This example demonstrate RESTEasy JSON serialisation by letting you list, add and remove quark types from a list. Quarked!
+  path: /resteasy-jackson/quarks/
+  related-guide-section: https://quarkus.io/guides/rest-json#creating-your-first-json-rest-service
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-resteasy
+      - io.quarkus:quarkus-resteasy-jackson
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/java/src/main/java/org/acme/resteasyjackson/JacksonResource.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/java/src/main/java/org/acme/resteasyjackson/JacksonResource.java
new file mode 100644
index 0000000000000..dbc1a3292c8b8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/java/src/main/java/org/acme/resteasyjackson/JacksonResource.java
@@ -0,0 +1,52 @@
+package org.acme.resteasyjackson;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Set;
+
+@Path("/resteasy-jackson/quarks")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class JacksonResource {
+
+    private final Set<Quark> quarks = Collections.newSetFromMap(Collections.synchronizedMap(new LinkedHashMap<>()));
+
+    public JacksonResource() {
+        quarks.add(new Quark("Up", "The up quark or u quark (symbol: u) is the lightest of all quarks, a type of elementary particle, and a major constituent of matter."));
+        quarks.add(new Quark("Strange", "The strange quark or s quark (from its symbol, s) is the third lightest of all quarks, a type of elementary particle."));
+        quarks.add(new Quark("Charm", "The charm quark, charmed quark or c quark (from its symbol, c) is the third most massive of all quarks, a type of elementary particle."));
+        quarks.add(new Quark("???", null));
+    }
+
+    @GET
+    public Set<Quark> list() {
+        return quarks;
+    }
+
+    @POST
+    public Set<Quark> add(Quark quark) {
+        quarks.add(quark);
+        return quarks;
+    }
+
+    @DELETE
+    public Set<Quark> delete(Quark quark) {
+        quarks.removeIf(existingQuark -> existingQuark.name.contentEquals(quark.name));
+        return quarks;
+    }
+
+    public static class Quark {
+        public String name;
+        public String description;
+
+        public Quark() {
+        }
+
+        public Quark(String name, String description) {
+            this.name = name;
+            this.description = description;
+        }
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/java/src/main/java/org/acme/resteasyjackson/MyObjectMapperCustomizer.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/java/src/main/java/org/acme/resteasyjackson/MyObjectMapperCustomizer.java
new file mode 100644
index 0000000000000..9aab532b25d51
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/java/src/main/java/org/acme/resteasyjackson/MyObjectMapperCustomizer.java
@@ -0,0 +1,17 @@
+package org.acme.resteasyjackson;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.quarkus.jackson.ObjectMapperCustomizer;
+
+import javax.inject.Singleton;
+
+@Singleton
+public class MyObjectMapperCustomizer implements ObjectMapperCustomizer {
+
+    @Override
+    public void customize(ObjectMapper objectMapper) {
+        // To suppress serializing properties with null values
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/kotlin/src/main/kotlin/org/acme/resteasyjackson/JacksonResource.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/kotlin/src/main/kotlin/org/acme/resteasyjackson/JacksonResource.kt
new file mode 100644
index 0000000000000..05b638be16534
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/kotlin/src/main/kotlin/org/acme/resteasyjackson/JacksonResource.kt
@@ -0,0 +1,48 @@
+package org.acme.resteasyjackson
+
+import java.util.*
+import javax.ws.rs.*
+import javax.ws.rs.core.MediaType
+
+@Path("/resteasy-jackson/quarks")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+class JacksonResource {
+
+    private val quarks = Collections.newSetFromMap(Collections.synchronizedMap(LinkedHashMap<Quark, Boolean>()))
+
+    init {
+        quarks.add(Quark("Up", "The up quark or u quark (symbol: u) is the lightest of all quarks, a type of elementary particle, and a major constituent of matter."))
+        quarks.add(Quark("Strange", "The strange quark or s quark (from its symbol, s) is the third lightest of all quarks, a type of elementary particle."))
+        quarks.add(Quark("Charm", "The charm quark, charmed quark or c quark (from its symbol, c) is the third most massive of all quarks, a type of elementary particle."))
+        quarks.add(Quark("???", null))
+    }
+
+    @GET
+    fun list(): Set<Quark> {
+        return quarks
+    }
+
+    @POST
+    fun add(quark: Quark): Set<Quark> {
+        quarks.add(quark)
+        return quarks
+    }
+
+    @DELETE
+    fun delete(quark: Quark): Set<Quark> {
+        quarks.removeIf { existingQuark: Quark -> existingQuark.name!!.contentEquals(quark.name!!) }
+        return quarks
+    }
+
+    class Quark {
+        var name: String? = null
+        var description: String? = null
+
+        constructor() {}
+        constructor(name: String?, description: String?) {
+            this.name = name
+            this.description = description
+        }
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/kotlin/src/main/kotlin/org/acme/resteasyjackson/MyObjectMapperCustomizer.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/kotlin/src/main/kotlin/org/acme/resteasyjackson/MyObjectMapperCustomizer.kt
new file mode 100644
index 0000000000000..fd5b34937dd2c
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-jackson-example/kotlin/src/main/kotlin/org/acme/resteasyjackson/MyObjectMapperCustomizer.kt
@@ -0,0 +1,14 @@
+package org.acme.resteasyjackson
+
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.quarkus.jackson.ObjectMapperCustomizer
+import javax.inject.Singleton
+
+@Singleton
+class MyObjectMapperCustomizer : ObjectMapperCustomizer {
+    override fun customize(objectMapper: ObjectMapper) {
+        // To suppress serializing properties with null values
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/src/main/resources/templates/page.qute.tpl.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/src/main/resources/templates/page.qute.tpl.qute.html
new file mode 100644
index 0000000000000..14982d0f5b581
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/base/src/main/resources/templates/page.qute.tpl.qute.html
@@ -0,0 +1,47 @@
+\{! This parameter declarations makes it possible to validate expressions in the template !}
+\{@java.util.List<{project.package-name ?: 'org.acme'}.resteasyqute.Quark> quarks}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Qute & Quarks</title>
+    <style>
+        .quarks {
+            position: relative;
+            height: 500px;
+            width: 100%;
+        }
+
+        .quark {
+            position: absolute;
+            margin: 5px;
+            display: inline-block;
+            border-radius: 50%;
+            text-align: center;
+            vertical-align: middle;
+            font-weight: bold;
+            color: white;
+            line-height: 75px;
+            font-size: 12px;
+        }
+
+    </style>
+</head>
+<body>
+<h1>Qute & Quarks</h1>
+
+<p>Welcome to our Qute subatomic-particles generator.</p>
+
+<p>
+    <a href="/qute/quarks" onClick="fetch('/qute/quarks/add', { method: 'POST' });">Generate a new quark</a>
+</p>
+
+<div class="quarks">
+    \{#for quark in quarks}
+    <div class="quark" style="width: 75px; height: 75px; top: \{quark.position}%; left: \{quark.position}%; background-color: \{quark.color.hex}">
+        <span>\{quark.flavor.toString.toLowerCase}</span>
+    </div>
+    \{/for}
+</div>
+</body>
+</html>
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/codestart.yml
new file mode 100644
index 0000000000000..be9b0f4a246ca
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/codestart.yml
@@ -0,0 +1,13 @@
+name: resteasy-qute-example
+ref: resteasy-qute
+type: code
+tags: example
+metadata:
+  title: RESTEasy Qute example
+  description: This example uses a RESTEasy & Qute template to render a subatomic-particle generator web page. So Qute!
+  path: /qute/quarks
+  related-guide-section: https://quarkus.io/guides/qute#type-safe-templates
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-resteasy-qute
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/java/src/main/java/org/acme/resteasyqute/Quark.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/java/src/main/java/org/acme/resteasyqute/Quark.java
new file mode 100644
index 0000000000000..7c54bb8ad80fe
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/java/src/main/java/org/acme/resteasyqute/Quark.java
@@ -0,0 +1,25 @@
+package org.acme.resteasyqute;
+
+public class Quark {
+    public enum Flavor { DOWN, UP, STRANGE, CHARM, BOTTOM, TOP }
+
+    public enum Color {
+        RED("#ff6961"),
+        GREEN("#77dd77"),
+        BLUE("#aec6cf");
+
+        public final String hex;
+
+        Color(String hex) {
+            this.hex = hex;
+        }
+    }
+
+    public final Flavor flavor;
+    public final Color color;
+
+    public Quark(Flavor flavor, Color color) {
+        this.flavor = flavor;
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/java/src/main/java/org/acme/resteasyqute/QuteResource.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/java/src/main/java/org/acme/resteasyqute/QuteResource.java
new file mode 100644
index 0000000000000..91dec46ab26b6
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/java/src/main/java/org/acme/resteasyqute/QuteResource.java
@@ -0,0 +1,55 @@
+package org.acme.resteasyqute;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.TemplateInstance;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+@Path("/qute/quarks")
+public class QuteResource {
+
+    private final List<Quark> quarks = Collections.synchronizedList(new ArrayList<>());
+
+    @Inject
+    Template page;
+
+    public QuteResource() {
+        for (int i = 0; i < 3; i++) {
+            this.addQuark();
+        }
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get() {
+        return page.data("quarks", new ArrayList<>(quarks));
+    }
+
+    @POST
+    @Path("add")
+    public void addQuark() {
+        final Random random = new Random();
+        final Quark.Flavor flavor = Quark.Flavor.values()[random.nextInt(Quark.Flavor.values().length)];
+        final Quark.Color color = Quark.Color.values()[random.nextInt(Quark.Color.values().length)];
+        quarks.add(new Quark(flavor, color));
+    }
+
+    /**
+     * This template extension method implements the "position" computed property.
+     */
+    @TemplateExtension
+    static int position(Quark quark) {
+        return new Random().nextInt(100);
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/kotlin/src/main/kotlin/org/acme/resteasyqute/Quark.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/kotlin/src/main/kotlin/org/acme/resteasyqute/Quark.kt
new file mode 100644
index 0000000000000..18b7a813d3361
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/kotlin/src/main/kotlin/org/acme/resteasyqute/Quark.kt
@@ -0,0 +1,11 @@
+package org.acme.resteasyqute
+
+class Quark(val flavor: Flavor, val color: Color) {
+    enum class Flavor {
+        DOWN, UP, STRANGE, CHARM, BOTTOM, TOP
+    }
+
+    enum class Color(val hex: String) {
+        RED("#ff6961"), GREEN("#77dd77"), BLUE("#aec6cf");
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/kotlin/src/main/kotlin/org/acme/resteasyqute/QuteResource.kt b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/kotlin/src/main/kotlin/org/acme/resteasyqute/QuteResource.kt
new file mode 100644
index 0000000000000..cf292f66726be
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/resteasy-qute-example/kotlin/src/main/kotlin/org/acme/resteasyqute/QuteResource.kt
@@ -0,0 +1,54 @@
+package org.acme.resteasyqute
+
+import io.quarkus.qute.Template
+import io.quarkus.qute.TemplateExtension
+import io.quarkus.qute.TemplateInstance
+import java.util.*
+import javax.inject.Inject
+import javax.ws.rs.GET
+import javax.ws.rs.POST
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/qute/quarks")
+class QuteResource {
+    private val quarks = Collections.synchronizedList(ArrayList<Quark>())
+
+    init {
+        for (i in 0..2) {
+            addQuark()
+        }
+    }
+
+    @Inject
+    lateinit var page: Template
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    fun get(): TemplateInstance {
+        return page.data("quarks", ArrayList(quarks))
+    }
+
+    @POST
+    @Path("add")
+    fun addQuark() {
+        val random = Random()
+        val flavor = Quark.Flavor.values()[random.nextInt(Quark.Flavor.values().size)]
+        val color = Quark.Color.values()[random.nextInt(Quark.Color.values().size)]
+        quarks.add(Quark(flavor, color))
+    }
+
+    @TemplateExtension
+    class QuarkExtension {
+        companion object {
+            /**
+             * This template extension method implements the "position" computed property.
+             */
+            @JvmStatic
+            fun position(quark: Quark): Int {
+                return Random().nextInt(100)
+            }
+        }
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..405280158877d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/base/README.tpl.qute.md
@@ -0,0 +1 @@
+{#include readme-header /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/codestart.yml
new file mode 100644
index 0000000000000..953e14ba8dd21
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/codestart.yml
@@ -0,0 +1,13 @@
+name: undertow-websockets-example
+ref: undertow-websockets
+type: code
+tags: example
+metadata:
+  title: WebSockets example using Undertow
+  description: Discover WebSockets using Undertow with this cool supersonic chat example. Open multiple tabs to simulate different users.
+  path: /supersonic-chat.html
+  related-guide-section: https://quarkus.io/guides/websockets
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-undertow-websockets
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/main/java/org/acme/undertowwebsockets/SupersonicChatSocket.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/main/java/org/acme/undertowwebsockets/SupersonicChatSocket.java
new file mode 100644
index 0000000000000..f918cb2635dd8
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/main/java/org/acme/undertowwebsockets/SupersonicChatSocket.java
@@ -0,0 +1,62 @@
+package org.acme.undertowwebsockets;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+
+import org.jboss.logging.Logger;
+
+@ServerEndpoint("/chat/{username}")
+@ApplicationScoped
+public class SupersonicChatSocket {
+
+    private static final Logger LOG = Logger.getLogger(SupersonicChatSocket.class);
+
+    Map<String, Session> sessions = new ConcurrentHashMap<>();
+
+    @OnOpen
+    public void onOpen(Session session, @PathParam("username") String username) {
+        sessions.put(username, session);
+    }
+
+    @OnClose
+    public void onClose(Session session, @PathParam("username") String username) {
+        sessions.remove(username);
+        broadcast("User " + username + " left");
+    }
+
+    @OnError
+    public void onError(Session session, @PathParam("username") String username, Throwable throwable) {
+        sessions.remove(username);
+        LOG.error("onError", throwable);
+        broadcast("User " + username + " left on error: " + throwable);
+    }
+
+    @OnMessage
+    public void onMessage(String message, @PathParam("username") String username) {
+        if (message.equalsIgnoreCase("_ready_")) {
+            broadcast("User " + username + " joined");
+        } else {
+            broadcast(">> " + username + ": " + message);
+        }
+    }
+
+    private void broadcast(String message) {
+        sessions.values().forEach(s -> {
+            s.getAsyncRemote().sendObject(message, result -> {
+                if (result.getException() != null) {
+                    System.out.println("Unable to send message: " + result.getException());
+                }
+            });
+        });
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/main/resources/META-INF/resources/supersonic-chat.html b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/main/resources/META-INF/resources/supersonic-chat.html
new file mode 100644
index 0000000000000..9083febafa014
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/main/resources/META-INF/resources/supersonic-chat.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>Quarkus Supersonic Chat!</title>
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.24.0/css/patternfly.min.css">
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.24.0/css/patternfly-additions.min.css">
+
+    <style>
+        #chat {
+          resize: none;
+          overflow: hidden;
+          min-height: 300px;
+          max-height: 300px;
+      }
+    </style>
+</head>
+
+<body>
+        <nav class="navbar navbar-default navbar-pf" role="navigation">
+                <div class="navbar-header">                  
+                  <a class="navbar-brand" href="/">
+                   <p><strong>>> Quarkus Supersonic Chat!</strong></p>
+                  </a>
+                </div>
+        </nav>
+    <div class="container">
+      <br/>
+      <div class="row">
+          <input id="name" class="col-md-4" type="text" placeholder="your name">
+          <button id="connect" class="col-md-1 btn btn-primary" type="button">connect</button>
+          <br/>
+          <br/>
+      </div>
+      <div class="row">
+          <textarea class="col-md-8" id="chat">
+            </textarea>
+      </div>
+      <div class="row">
+          <input class="col-md-6" id="msg" type="text" placeholder="enter your message">
+          <button class="col-md-1 btn btn-primary" id="send" type="button" disabled>send</button>
+      </div>
+      
+      </div>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.24.0/js/patternfly.min.js"></script>
+
+    <script type="text/javascript">
+      var connected = false;
+      var socket;
+
+      $( document ).ready(function() {
+          $("#connect").click(connect);
+          $("#send").click(sendMessage);
+
+          $("#name").keypress(function(event){
+              if(event.keyCode == 13 || event.which == 13) {
+                  connect();
+              }
+          });
+
+          $("#msg").keypress(function(event) {
+              if(event.keyCode == 13 || event.which == 13) {
+                  sendMessage();
+              }
+          });
+
+        $("#chat").change(function() {
+            scrollToBottom();
+          });
+
+          $("#name").focus();
+      });
+
+      var connect = function() {
+          if (! connected) {
+              var name = $("#name").val();
+              console.log("Val: " + name);
+              socket = new WebSocket("ws://" + location.host + "/chat/" + name);
+              socket.onopen = function() {
+                  connected = true;
+                  console.log("Connected to the web socket");
+                  $("#send").attr("disabled", false);
+                  $("#connect").attr("disabled", true);
+                  $("#name").attr("disabled", true);
+                  $("#msg").focus();
+              };
+              socket.onmessage =function(m) {
+                  console.log("Got message: " + m.data);
+                  $("#chat").append(m.data + "\n");
+                  scrollToBottom();
+              };
+          }
+      };
+
+      var sendMessage = function() {
+          if (connected) {
+              var value = $("#msg").val();
+              console.log("Sending " + value);
+              socket.send(value);
+              $("#msg").val("");
+          }
+      };
+
+      var scrollToBottom = function () {
+        $('#chat').scrollTop($('#chat')[0].scrollHeight);
+      };
+
+    </script>
+</body>
+
+</html>
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/test/java/org/acme/undertowwebsockets/SupersonicChatSocketTest.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/test/java/org/acme/undertowwebsockets/SupersonicChatSocketTest.java
new file mode 100644
index 0000000000000..99f521e51df9e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples/undertow-websockets-example/java/src/test/java/org/acme/undertowwebsockets/SupersonicChatSocketTest.java
@@ -0,0 +1,55 @@
+package org.acme.undertowwebsockets;
+
+import java.net.URI;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.ContainerProvider;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class SupersonicChatSocketTest {
+
+    private static final LinkedBlockingDeque<String> MESSAGES = new LinkedBlockingDeque<>();
+
+    @TestHTTPResource("/chat/stu")
+    URI uri;
+
+    @Test
+    public void testWebsocketChat() throws Exception {
+        try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(Client.class, uri)) {
+            Assertions.assertEquals("CONNECT", MESSAGES.poll(10, TimeUnit.SECONDS));
+            Assertions.assertEquals("User stu joined", MESSAGES.poll(10, TimeUnit.SECONDS));
+            session.getAsyncRemote().sendText("hello world");
+            Assertions.assertEquals(">> stu: hello world", MESSAGES.poll(10, TimeUnit.SECONDS));
+        }
+    }
+
+    @ClientEndpoint
+    public static class Client {
+
+        @OnOpen
+        public void open(Session session) {
+            MESSAGES.add("CONNECT");
+            // Send a message to indicate that we are ready,
+            // as the message handler may not be registered immediately after this callback.
+            session.getAsyncRemote().sendText("_ready_");
+        }
+
+        @OnMessage
+        void message(String msg) {
+            MESSAGES.add(msg);
+        }
+
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..d0ee60125a88b
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/base/README.tpl.qute.md
@@ -0,0 +1,4 @@
+{#include readme-header /}
+
+> :warning: **INCOMPATIBLE WITH DEV MODE**: Amazon Lambda Binding is not compatible with dev mode yet!
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/codestart.yml
new file mode 100644
index 0000000000000..8afe7ecbb7afb
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/codestart.yml
@@ -0,0 +1,16 @@
+name: amazon-lambda-example
+ref: amazon-lambda
+type: code
+tags:
+  - example
+  - singleton-example
+metadata:
+  title: Amazon Lambda Integration example
+  description: This example contains a Quarkus Greeting Lambda ready for Amazon.
+  related-guide-section: https://quarkus.io/guides/amazon-lambda
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-amazon-lambda
+    test-dependencies:
+      - io.quarkus:quarkus-test-amazon-lambda
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/payload.json b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/payload.json
new file mode 100644
index 0000000000000..decf49104ca4a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/payload.json
@@ -0,0 +1,3 @@
+{
+  "name": "Bill"
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/main/java/org/acme/lambda/GreetingLambda.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/main/java/org/acme/lambda/GreetingLambda.java
new file mode 100644
index 0000000000000..54397ca107a8a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/main/java/org/acme/lambda/GreetingLambda.java
@@ -0,0 +1,12 @@
+package org.acme.lambda;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+public class GreetingLambda implements RequestHandler<Person, String> {
+
+    @Override
+    public String handleRequest(Person input, Context context) {
+        return "Hello " + input.getName();
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/main/java/org/acme/lambda/Person.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/main/java/org/acme/lambda/Person.java
new file mode 100644
index 0000000000000..6052788936db0
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/main/java/org/acme/lambda/Person.java
@@ -0,0 +1,15 @@
+package org.acme.lambda;
+
+public class Person {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public Person setName(String name) {
+        this.name = name;
+        return this;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/native-test/java/org/acme/lambda/LambdaHandlerTestIT.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/native-test/java/org/acme/lambda/LambdaHandlerTestIT.java
new file mode 100644
index 0000000000000..477313b413ebd
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/native-test/java/org/acme/lambda/LambdaHandlerTestIT.java
@@ -0,0 +1,9 @@
+package org.acme.lambda;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class LambdaHandlerTestIT extends LambdaHandlerTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java
new file mode 100644
index 0000000000000..3ba4687dd2d6f
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/test/java/org/acme/lambda/LambdaHandlerTest.java
@@ -0,0 +1,20 @@
+package org.acme.lambda;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.amazon.lambda.test.LambdaClient;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class LambdaHandlerTest {
+
+    @Test
+    public void testSimpleLambdaSuccess() throws Exception {
+        Person in = new Person();
+        in.setName("Stu");
+        String out = LambdaClient.invoke(String.class, in);
+        Assertions.assertEquals("Hello Stu", out);
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/test/resources/application.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/test/resources/application.yml
new file mode 100644
index 0000000000000..6f64d4a18d957
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/amazon-lambda-example/java/src/test/resources/application.yml
@@ -0,0 +1,3 @@
+quarkus.lambda.enable-polling-jvm-mode: true
+
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..26809cc0bf4ec
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/README.tpl.qute.md
@@ -0,0 +1,3 @@
+{#include readme-header /}
+
+> :warning: **INCOMPATIBLE WITH NATIVE**: Azure Functions Integration is not compatible with native yet!
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/function.tpl.qute.json b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/function.tpl.qute.json
new file mode 100644
index 0000000000000..ee7d430606236
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/function.tpl.qute.json
@@ -0,0 +1,17 @@
+{
+  "scriptFile" : "../{project.artifact-id}-{project.version}.jar",
+  "entryPoint" : "io.quarkus.azure.functions.resteasy.runtime.Function.run",
+  "bindings" : [ {
+    "type" : "httpTrigger",
+    "direction" : "in",
+    "name" : "req",
+    "route" : "{*path}",
+    "methods" : [ "GET", "POST", "HEAD", "PUT", "OPTIONS", "DELETE" ],
+    "dataType" : "binary",
+    "authLevel" : "ANONYMOUS"
+  }, {
+    "type" : "http",
+    "direction" : "out",
+    "name" : "$return"
+  } ]
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/host.json b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/host.json
new file mode 100644
index 0000000000000..a8fe8c4c8e513
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/host.json
@@ -0,0 +1,3 @@
+{
+  "version": "2.0"
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/local.settings.json b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/local.settings.json
new file mode 100644
index 0000000000000..8804ca029cf22
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/azure-config/local.settings.json
@@ -0,0 +1,7 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "AzureWebJobsStorage": "",
+    "FUNCTIONS_WORKER_RUNTIME": "java"
+  }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/pom.tpl.qute.xml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..7416813782e0d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/pom.tpl.qute.xml
@@ -0,0 +1,135 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <properties>
+    <azure.functions.maven.plugin.version>1.9.1</azure.functions.maven.plugin.version>
+    <resources-plugin.version>3.1.0</resources-plugin.version>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <functionAppName>$\{artifactId}-{gen-info.time}</functionAppName>
+    <functionAppRegion>{app-region}</functionAppRegion>
+    <functionResourceGroup>{resource-group}</functionResourceGroup>
+    <function>{function}</function>
+    <stagingDirectory>$\{project.build.directory}/azure-functions/$\{functionAppName}</stagingDirectory>
+  </properties>
+  <build>
+    <plugins>
+      <!-- we only use azure plugin to deploy to Azure.
+           The directory structure is set up through various plugins in this pom -->
+      <plugin>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-functions-maven-plugin</artifactId>
+        <version>$\{azure.functions.maven.plugin.version}</version>
+        <configuration>
+          <resourceGroup>$\{functionResourceGroup}</resourceGroup>
+          <appName>$\{functionAppName}</appName>
+          <region>$\{functionAppRegion}</region>
+          <runtime>
+            <!-- runtime os, could be windows, linux or docker-->
+            <os>windows</os>
+            <javaVersion>11</javaVersion>
+            <!-- for docker function, please set the following parameters -->
+            <!-- <image>[hub-user/]repo-name[:tag]</image> -->
+            <!-- <serverId></serverId> -->
+            <!-- <registryUrl></registryUrl>  -->
+          </runtime>
+          <appSettings>
+            <!-- Run Azure Function from package file by default -->
+            <property>
+              <name>FUNCTIONS_EXTENSION_VERSION</name>
+              <value>~3</value>
+            </property>
+           </appSettings>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>$\{resources-plugin.version}</version>
+        <executions>
+          <!-- add azure required json files
+               to Azure staging directory -->
+          <execution>
+            <id>copy-base-azure-config</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>$\{stagingDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>$\{project.basedir}/azure-config</directory>
+                  <includes>
+                    <include>host.json</include>
+                    <include>local.settings.json</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <!-- copy unpacked function.json into Azure staging directory -->
+          <execution>
+            <id>copy-function-json</id>
+            <phase>install</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>$\{stagingDirectory}/$\{function}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>$\{project.basedir}/azure-config</directory>
+                  <filtering>true</filtering>
+                  <includes>
+                    <include>function.json</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <!-- copy the uber-jar into Azure staging directory -->
+          <execution>
+            <id>copy-uberjar</id>
+            <phase>install</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>$\{stagingDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>$\{project.build.directory}</directory>
+                  <includes>
+                    <include>$\{project.artifactId}-$\{project.version}-runner.jar</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- azure plugin wants a specific name for the jar so need to copy runner jar and rename it -->
+      <plugin>
+        <groupId>com.coderplus.maven.plugins</groupId>
+        <artifactId>copy-rename-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <id>rename-file</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <sourceFile>$\{project.build.directory}/$\{project.artifactId}-$\{project.version}-runner.jar</sourceFile>
+              <destinationFile>$\{stagingDirectory}/$\{project.artifactId}-$\{project.version}.jar</destinationFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/src/main/resources/application.tpl.qute.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/src/main/resources/application.tpl.qute.yml
new file mode 100644
index 0000000000000..0d3141362fddb
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/base/src/main/resources/application.tpl.qute.yml
@@ -0,0 +1,5 @@
+quarkus:
+  http:
+    root-path: {root-context-path}
+  package:
+    type: uber-jar
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/codestart.yml
new file mode 100644
index 0000000000000..bffb79cd5a7dc
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/azure-functions-http-example/codestart.yml
@@ -0,0 +1,24 @@
+name: azure-functions-http-example
+ref: azure-functions-http
+type: code
+tags:
+  - example
+  - singleton-example
+  - maven-only
+metadata:
+  title: Azure Functions HTTP Integration example
+  description: This example contains a HTTP function ready for Azure.
+  related-guide-section: https://quarkus.io/guides/azure-functions-http
+language:
+  base:
+    data:
+      # /api is the default root context azure functions will prepend
+      root-context-path: "/api"
+      app-region:
+        westus
+      resource-group:
+        java-functions-group
+      function:
+        greeting
+    dependencies:
+      - io.quarkus:quarkus-azure-functions-http
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..60f66233bb227
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/base/README.tpl.qute.md
@@ -0,0 +1,3 @@
+{#include readme-header /}
+
+> :warning: **INCOMPATIBLE WITH DEV MODE**: Funqy Amazon Lambda Binding is not compatible with dev mode yet!
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/codestart.yml
new file mode 100644
index 0000000000000..08ff591491429
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/codestart.yml
@@ -0,0 +1,19 @@
+name: funqy-amazon-lambda-example
+ref: funqy-amazon-lambda
+type: code
+tags:
+  - example
+  - singleton-example
+metadata:
+  title: Funqy Amazon Lambda Binding example
+  description: This example contains a Quarkus Funqy Greeting Function ready for Amazon Lambda.
+  related-guide-section: https://quarkus.io/guides/funqy-amazon-lambda-http
+language:
+  base:
+    shared-data:
+      supports:
+        dev-mode: false
+    dependencies:
+      - io.quarkus:quarkus-funqy-amazon-lambda
+    test-dependencies:
+      - io.quarkus:quarkus-test-amazon-lambda
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/payload.json b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/payload.json
new file mode 100644
index 0000000000000..af392298f6be0
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/payload.json
@@ -0,0 +1 @@
+{ "name" :  "Bill" }
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/main/java/org/acme/funqy/GreetingFunction.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/main/java/org/acme/funqy/GreetingFunction.java
new file mode 100644
index 0000000000000..e1d8a7f3a7bd4
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/main/java/org/acme/funqy/GreetingFunction.java
@@ -0,0 +1,11 @@
+package org.acme.funqy;
+
+import io.quarkus.funqy.Funq;
+
+public class GreetingFunction {
+
+    @Funq
+    public String myFunqyGreeting(Person friend) {
+        return "Hello " + friend.getName();
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/main/java/org/acme/funqy/Person.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/main/java/org/acme/funqy/Person.java
new file mode 100644
index 0000000000000..8c62c19a5c61a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/main/java/org/acme/funqy/Person.java
@@ -0,0 +1,19 @@
+package org.acme.funqy;
+
+public class Person {
+    private String name;
+
+    public Person() {}
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java
new file mode 100644
index 0000000000000..cce22690603da
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/native-test/java/org/acme/funqy/FunqyIT.java
@@ -0,0 +1,10 @@
+package org.acme.funqy;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class FunqyIT extends FunqyTest {
+
+    // Run the same tests
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/native-test/java/resources/application.properties b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/native-test/java/resources/application.properties
new file mode 100644
index 0000000000000..7d1a703249226
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/native-test/java/resources/application.properties
@@ -0,0 +1,3 @@
+quarkus.lambda.enable-polling-jvm-mode=true
+
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java
new file mode 100644
index 0000000000000..c689c8c74689a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/test/java/org/acme/funqy/FunqyTest.java
@@ -0,0 +1,16 @@
+package org.acme.funqy;
+
+import io.quarkus.amazon.lambda.test.LambdaClient;
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class FunqyTest {
+    @Test
+    public void testSimpleLambdaSuccess() throws Exception {
+        Person friend = new Person("Bill");
+        String out = LambdaClient.invoke(String.class, friend);
+        Assertions.assertEquals("Hello Bill", out);
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml
new file mode 100644
index 0000000000000..6f64d4a18d957
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-amazon-lambda-example/java/src/test/resources/application.yml
@@ -0,0 +1,3 @@
+quarkus.lambda.enable-polling-jvm-mode: true
+
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..d28b319d305bc
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/base/README.tpl.qute.md
@@ -0,0 +1,8 @@
+{#include readme-header /}
+
+> :warning: **INCOMPATIBLE WITH DEV MODE**: Funqy Google Cloud Functions is not compatible with dev mode yet!
+
+Two examples have been generated under `src/main/java/org/acme/funqygooglecloudfunctions`, you must remove them before deploying to 
+Google Cloud Functions or setup multi-functions support, see https://quarkus.io/guides/funqy-gcp-functions#choose.
+
+
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/codestart.yml
new file mode 100644
index 0000000000000..ec961f8eab675
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/codestart.yml
@@ -0,0 +1,14 @@
+name: funqy-google-cloud-functions-example
+ref: funqy-google-cloud-functions
+type: code
+tags:
+  - example
+  - singleton-example
+metadata:
+  title: Funqy Google Cloud Functions Integration examples
+  description: Examples of Background Functions with Funqy for Quarkus.
+  related-guide-section: https://quarkus.io/guides/funqy-gcp-functions#choose
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-funqy-google-cloud-functions
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java
new file mode 100644
index 0000000000000..45f2d91086c94
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingFunctions.java
@@ -0,0 +1,26 @@
+package org.acme.funqygooglecloudfunctions;
+
+import javax.inject.Inject;
+
+import io.quarkus.funqy.Funq;
+import io.quarkus.funqy.gcp.functions.event.PubsubMessage;
+import io.quarkus.funqy.gcp.functions.event.StorageEvent;
+
+public class GreetingFunctions {
+
+    @Inject
+    GreetingService service;
+
+    @Funq
+    public void helloPubSubWorld(PubsubMessage pubSubEvent) {
+        String message = service.hello("world");
+        System.out.println(pubSubEvent.messageId + " - " + message);
+    }
+
+    @Funq
+    public void helloGCSWorld(StorageEvent storageEvent) {
+        String message = service.hello("world");
+        System.out.println(storageEvent.name + " - " + message);
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java
new file mode 100644
index 0000000000000..61ee2f8b2e4af
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-google-cloud-functions-example/java/src/main/java/org/acme/funqygooglecloudfunctions/GreetingService.java
@@ -0,0 +1,21 @@
+package org.acme.funqygooglecloudfunctions;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class GreetingService {
+    private String greeting = "Hello";
+    private String punctuation = "!";
+
+    public void setGreeting(String greet) {
+        greeting = greet;
+    }
+
+    public void setPunctuation(String punctuation) {
+        this.punctuation = punctuation;
+    }
+
+    public String hello(String val) {
+        return greeting + " " + val + punctuation;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..6f2f738ed594e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/base/README.tpl.qute.md
@@ -0,0 +1,6 @@
+{#include readme-header /}
+
+You'll need to read the guide to learn how to deploy and run this example within a full Knative Kubernetes or OpenShift
+environment.
+
+This example is incomplete until you specify your docker.io account name within `src/main/k8s/funqy-service.yaml`.
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/codestart.yml
new file mode 100644
index 0000000000000..9357d42994e22
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/codestart.yml
@@ -0,0 +1,19 @@
+name: funqy-knative-events-example
+ref: funqy-knative-events
+type: code
+tags:
+  - example
+  - singleton-example
+metadata:
+  title: Funqy Knative Events Binding example
+  description: This example contains a Quarkus Knative Funqy Function ready for Kubernetes or Openshift.
+  related-guide-section: https://quarkus.io/guides/funqy-knative-events
+language:
+  base:
+    data:
+      k8s-service-name: funqy-knative-events-codestart
+      docker-io-account: yourAccountName
+    dependencies:
+      - io.quarkus:quarkus-funqy-knative-events
+    test-dependencies:
+      - io.rest-assured:rest-assured
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/java/org/acme/funqy/cloudevent/CloudEventGreeting.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/java/org/acme/funqy/cloudevent/CloudEventGreeting.java
new file mode 100644
index 0000000000000..7756cf108ad74
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/java/org/acme/funqy/cloudevent/CloudEventGreeting.java
@@ -0,0 +1,13 @@
+package org.acme.funqy.cloudevent;
+
+import io.quarkus.funqy.Funq;
+import org.jboss.logging.Logger;
+
+public class CloudEventGreeting {
+    private static final Logger log = Logger.getLogger(CloudEventGreeting.class);
+
+    @Funq
+    public void myCloudEventGreeting(Person input) {
+        log.info("Hello " + input.getName());
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/java/org/acme/funqy/cloudevent/Person.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/java/org/acme/funqy/cloudevent/Person.java
new file mode 100644
index 0000000000000..bab8889318cff
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/java/org/acme/funqy/cloudevent/Person.java
@@ -0,0 +1,19 @@
+package org.acme.funqy.cloudevent;
+
+public class Person {
+    private String name;
+
+    public Person() {}
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/k8s/funqy-service.tpl.qute.yaml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/k8s/funqy-service.tpl.qute.yaml
new file mode 100644
index 0000000000000..e8aab28354388
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/k8s/funqy-service.tpl.qute.yaml
@@ -0,0 +1,13 @@
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  name: {k8s-service-name}
+spec:
+  template:
+    metadata:
+      name: {k8s-service-name}-v1
+      annotations:
+        autoscaling.knative.dev/target: "1"
+    spec:
+      containers:
+        - image: docker.io/{docker-io-account}/{k8s-service-name}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/k8s/funqy-trigger.tpl.qute.yaml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/k8s/funqy-trigger.tpl.qute.yaml
new file mode 100644
index 0000000000000..ec88843f0718e
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/main/k8s/funqy-trigger.tpl.qute.yaml
@@ -0,0 +1,13 @@
+apiVersion: eventing.knative.dev/v1alpha1
+kind: Trigger
+metadata:
+  name: myCloudEventGreeting
+spec:
+  filter:
+    attributes:
+      type: myCloudEventGreeting
+  subscriber:
+    ref:
+      apiVersion: serving.knative.dev/v1
+      kind: Service
+      name: {k8s-service-name}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/native-test/java/org/acme/funqy/cloudevent/FunqyIT.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/native-test/java/org/acme/funqy/cloudevent/FunqyIT.java
new file mode 100644
index 0000000000000..b80ffdb2372f7
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/native-test/java/org/acme/funqy/cloudevent/FunqyIT.java
@@ -0,0 +1,10 @@
+package org.acme.funqy.cloudevent;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class FunqyIT extends FunqyTest {
+
+    // Run the same tests
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/test/java/org/acme/funqy/cloudevent/FunqyTest.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/test/java/org/acme/funqy/cloudevent/FunqyTest.java
new file mode 100644
index 0000000000000..38b42eacc8236
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/funqy-knative-events-example/java/src/test/java/org/acme/funqy/cloudevent/FunqyTest.java
@@ -0,0 +1,28 @@
+package org.acme.funqy.cloudevent;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+@QuarkusTest
+public class FunqyTest {
+
+    @Test
+    public void testCloudEvent() {
+        RestAssured.given().contentType("application/json")
+                .header("ce-specversion", "1.0")
+                .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-type", "myCloudEventGreeting")
+                .header("ce-source", "test")
+                .body("{ \"name\": \"Bill\" }")
+                .post("/")
+                .then().statusCode(204);
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/base/README.tpl.qute.md
new file mode 100755
index 0000000000000..339d3818fc9d3
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/base/README.tpl.qute.md
@@ -0,0 +1,6 @@
+{#include readme-header /}
+
+Two examples have been generated under `src/main/java/org/acme/googlecloudfunctions`, you must remove them before deploying to 
+Google Cloud Functions or setup multi-functions support, see https://quarkus.io/guides/gcp-functions#choose-your-function.
+
+> :warning: **INCOMPATIBLE WITH DEV MODE**: Google Cloud Functions is not compatible with dev mode yet!
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/codestart.yml
new file mode 100755
index 0000000000000..9d433d9bbe576
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/codestart.yml
@@ -0,0 +1,14 @@
+name: google-cloud-functions-example
+ref: google-cloud-functions
+type: code
+tags:
+  - example
+  - singleton-example
+metadata:
+  title: Google Cloud Functions Integration examples
+  description: Examples of Google Cloud HTTP and Background Functions for Quarkus.
+  related-guide-section: https://quarkus.io/guides/gcp-functions#choose-your-function
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-google-cloud-functions
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java
new file mode 100755
index 0000000000000..5ab97f59ce029
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldBackgroundFunction.java
@@ -0,0 +1,19 @@
+package org.acme.googlecloudfunctions;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import com.google.cloud.functions.BackgroundFunction;
+import com.google.cloud.functions.Context;
+
+@ApplicationScoped
+public class HelloWorldBackgroundFunction implements BackgroundFunction<HelloWorldBackgroundFunction.StorageEvent> {
+
+    @Override
+    public void accept(StorageEvent event, Context context) throws Exception {
+        System.out.println("Receive event on file: " + event.name);
+    }
+
+    public static class StorageEvent {
+        public String name;
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java
new file mode 100755
index 0000000000000..d1ada420e428d
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-example/java/src/main/java/org/acme/googlecloudfunctions/HelloWorldHttpFunction.java
@@ -0,0 +1,19 @@
+package org.acme.googlecloudfunctions;
+
+import java.io.Writer;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+
+@ApplicationScoped
+public class HelloWorldHttpFunction implements HttpFunction {
+
+    @Override
+    public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws Exception {
+        Writer writer = httpResponse.getWriter();
+        writer.write("Hello World");
+    }
+}
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/base/README.tpl.qute.md b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..db3cfce61dc98
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/base/README.tpl.qute.md
@@ -0,0 +1,13 @@
+{#include readme-header /}
+
+Inside the `src/main/java/org/acme/googlecloudfunctionshttp` directory, you will find examples for:
+
+- JAX-RS (via RESTEasy): `GreetingResource.java`
+- Vert.x reactive routes: `GreetingRoutes.java`
+- Funqy HTTP: `GreetingFunqy`
+- Servlet (via Undertow): `GreetingServlet.java`
+
+Each of these example uses a different extension.
+If you don't plan to use all those extensions, you should remove them from the `pom.xml`.
+
+> :warning: **INCOMPATIBLE WITH DEV MODE**: Google Cloud Functions HTTP is not compatible with dev mode yet!
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/codestart.yml
new file mode 100644
index 0000000000000..0e452283e55af
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/codestart.yml
@@ -0,0 +1,18 @@
+name: google-cloud-functions-http-example
+ref: google-cloud-functions-http
+type: code
+tags:
+  - example
+  - singleton-example
+metadata:
+  title: Google Cloud Functions HTTP Integration examples
+  description: Examples of Google Cloud HTTP functions for Quarkus written with RESTEasy (JAX-RS), Undertow (Servlet), Vert.x Web, or Funqy HTTP.
+  related-guide-section: https://quarkus.io/guides/gcp-functions-http#creating-the-endpoints
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-google-cloud-functions-http
+      - io.quarkus:quarkus-resteasy
+      - io.quarkus:quarkus-vertx-web
+      - io.quarkus:quarkus-funqy-http
+      - io.quarkus:quarkus-undertow
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingFunqy.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingFunqy.java
new file mode 100644
index 0000000000000..5b000b889fa0a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingFunqy.java
@@ -0,0 +1,17 @@
+package org.acme.googlecloudfunctionshttp;
+
+import io.quarkus.funqy.Funq;
+import io.smallrye.mutiny.Uni;
+
+public class GreetingFunqy {
+
+    @Funq
+    public String funqy() {
+        return "Make it funqy";
+    }
+
+    @Funq
+    public Uni<String> funqyAsync() {
+        return Uni.createFrom().item(() -> "Make it funqy asynchronously");
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java
new file mode 100644
index 0000000000000..8c58b0385fd55
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingResource.java
@@ -0,0 +1,49 @@
+package org.acme.googlecloudfunctionshttp;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+    @POST
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public String hello(String name) {
+        return "hello " + name;
+    }
+
+    @POST
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    public byte[] hello(byte[] bytes) {
+        if (bytes[0] != 0 || bytes[1] != 1 || bytes[2] != 2 || bytes[3] != 3) {
+            throw new RuntimeException("bad input");
+        }
+        byte[] rtn = { 4, 5, 6 };
+        return rtn;
+    }
+
+    @POST
+    @Path("empty")
+    public void empty() {
+
+    }
+
+    @GET
+    @Path("error")
+    public void error() {
+        throw new RuntimeException("Oups!");
+    }
+
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingRoutes.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingRoutes.java
new file mode 100644
index 0000000000000..1de2bf1cee85f
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingRoutes.java
@@ -0,0 +1,20 @@
+package org.acme.googlecloudfunctionshttp;
+
+import static io.vertx.core.http.HttpMethod.GET;
+
+import io.quarkus.vertx.web.Route;
+import io.vertx.ext.web.RoutingContext;
+
+public class GreetingRoutes {
+    @Route(path = "/vertx/hello", methods = GET)
+    void hello(RoutingContext context) {
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(200).end("hello");
+    }
+
+    @Route(path = "/vertx/error", methods = GET)
+    void error(RoutingContext context) {
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(500).end("Oups!");
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java
new file mode 100644
index 0000000000000..31f9254c4a44f
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples/google-cloud-functions-http-example/java/src/main/java/org/acme/googlecloudfunctions/GreetingServlet.java
@@ -0,0 +1,27 @@
+package org.acme.googlecloudfunctionshttp;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello")
+public class GreetingServlet extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.setStatus(200);
+        resp.addHeader("Content-Type", "text/plain");
+        resp.getWriter().write("hello");
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        String name = req.getReader().readLine();
+        resp.setStatus(200);
+        resp.addHeader("Content-Type", "text/plain");
+        resp.getWriter().write("hello " + name);
+    }
+}
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/gradle.properties-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/gradle.properties-template.ftl
index ae1d466f986bb..c89e173e9ad97 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/gradle.properties-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/gradle.properties-template.ftl
@@ -1,5 +1,5 @@
 quarkusPlatformGroupId = ${bom_groupId}
 quarkusPlatformArtifactId = ${bom_artifactId}
 quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
+quarkusPluginVersion = ${gradle_plugin_version}
 org.gradle.logging.level=INFO
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl
index 064317fd23a62..6920a67e4132e 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl
@@ -15,7 +15,7 @@
         <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
         <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
+        <quarkus-plugin.version>${maven_plugin_version}</quarkus-plugin.version>
         <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
         <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
     </properties>
@@ -55,12 +55,15 @@
         <plugins>
             <!-- Quarkus build plugin - also provides the quarkus:dev live-reload feature -->
             <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
+                <groupId>${maven_plugin_groupId}</groupId>
+                <artifactId>${maven_plugin_artifactId}</artifactId>
                 <version>${quarkus-plugin.version}</version>
+                <extensions>true</extensions>
                 <executions>
                     <execution>
                         <goals>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/settings.gradle-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/settings.gradle-template.ftl
index 6687873c9483b..61fd4debce633 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/settings.gradle-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/settings.gradle-template.ftl
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        mavenLocal()${maven_plugin_repositories}
+        mavenLocal()
         mavenCentral()
-        gradlePluginPortal()
+        gradlePluginPortal()${maven_plugin_repositories}
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl
index ae1d466f986bb..c89e173e9ad97 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl
@@ -1,5 +1,5 @@
 quarkusPlatformGroupId = ${bom_groupId}
 quarkusPlatformArtifactId = ${bom_artifactId}
 quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
+quarkusPluginVersion = ${gradle_plugin_version}
 org.gradle.logging.level=INFO
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
index 1e9816b38147e..8132da629b747 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
@@ -15,7 +15,7 @@
         <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
         <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
+        <quarkus-plugin.version>${maven_plugin_version}</quarkus-plugin.version>
         <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
         <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
         <kotlin.version>${kotlin_version}</kotlin.version>
@@ -62,12 +62,14 @@
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
+                <groupId>${maven_plugin_groupId}</groupId>
+                <artifactId>${maven_plugin_artifactId}</artifactId>
                 <version>${quarkus-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl
index 6687873c9483b..61fd4debce633 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        mavenLocal()${maven_plugin_repositories}
+        mavenLocal()
         mavenCentral()
-        gradlePluginPortal()
+        gradlePluginPortal()${maven_plugin_repositories}
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/gradle.properties-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/gradle.properties-template.ftl
index ae1d466f986bb..c89e173e9ad97 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/gradle.properties-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/gradle.properties-template.ftl
@@ -1,5 +1,5 @@
 quarkusPlatformGroupId = ${bom_groupId}
 quarkusPlatformArtifactId = ${bom_artifactId}
 quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
+quarkusPluginVersion = ${gradle_plugin_version}
 org.gradle.logging.level=INFO
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl
index 26faada923b7e..d0fa54ab61adf 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl
@@ -15,7 +15,7 @@
         <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
         <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
+        <quarkus-plugin.version>${maven_plugin_version}</quarkus-plugin.version>
         <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
         <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
         <scala.version>${scala_version}</scala.version>
@@ -68,12 +68,14 @@
         <testSourceDirectory>src/test/scala</testSourceDirectory>
         <plugins>
             <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
+                <groupId>${maven_plugin_groupId}</groupId>
+                <artifactId>${maven_plugin_artifactId}</artifactId>
                 <version>${quarkus-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
+                            <goal>generate-code</goal>
+                            <goal>generate-code-tests</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/settings.gradle-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/settings.gradle-template.ftl
index 6687873c9483b..61fd4debce633 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/settings.gradle-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/settings.gradle-template.ftl
@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        mavenLocal()${maven_plugin_repositories}
+        mavenLocal()
         mavenCentral()
-        gradlePluginPortal()
+        gradlePluginPortal()${maven_plugin_repositories}
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/test-resource-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/test-resource-template.ftl
index 11246ffe8584d..eaceeebedaeff 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/test-resource-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/test-resource-template.ftl
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test
 class ${class_name}Test {
 
     @Test
-    def testHelloEndpoint() = {
+    def testHelloEndpoint(): Unit = {
         given()
           .`when`().get("${path}")
           .then()
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl
deleted file mode 100644
index 832bc8b626197..0000000000000
--- a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl
+++ /dev/null
@@ -1,57 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the docker image run:
-#
-# mvn package
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/${project_artifactId}-jvm .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}-jvm
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
-# 
-# Then run the container using : 
-#
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-jvm
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
-
-ARG JAVA_PACKAGE=java-11-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-
-# Install java and the run-java script
-# Also set up permissions for user `1001`
-RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
-    && microdnf update \
-    && microdnf clean all \
-    && mkdir /deployments \
-    && chown 1001 /deployments \
-    && chmod "g+rwX" /deployments \
-    && chown 1001:root /deployments \
-    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
-    && chown 1001 /deployments/run-java.sh \
-    && chmod 540 /deployments/run-java.sh \
-    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
-
-# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --chown=1001 ${build_dir}/quarkus-app/lib/ /deployments/lib/
-COPY --chown=1001 ${build_dir}/quarkus-app/*.jar /deployments/
-COPY --chown=1001 ${build_dir}/quarkus-app/app/ /deployments/app/
-COPY --chown=1001 ${build_dir}/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl
index c74c433819b05..39a3e02582e03 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl
@@ -1,27 +1,27 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
 #
-# Before building the docker image run:
+# Before building the container image run:
 #
-# mvn package
+# mvn package -Dquarkus.package.type=fast-jar 
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/${project_artifactId}-jvm .
+# docker build -f src/main/docker/Dockerfile.fast-jar -t quarkus/${project_artifactId}-fast-jar .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}-jvm
+# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}-fast-jar
 #
 # If you want to include the debug port into your docker image
 # you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
 # 
 # Then run the container using : 
 #
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-jvm
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-fast-jar
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
 
 ARG JAVA_PACKAGE=java-11-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
@@ -45,8 +45,11 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
 # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 
-COPY ${build_dir}/lib/* /deployments/lib/
-COPY ${build_dir}/*-runner.jar /deployments/app.jar
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=1001 ${build_dir}/quarkus-app/lib/ /deployments/lib/
+COPY --chown=1001 ${build_dir}/quarkus-app/*.jar /deployments/
+COPY --chown=1001 ${build_dir}/quarkus-app/app/ /deployments/app/
+COPY --chown=1001 ${build_dir}/quarkus-app/quarkus/ /deployments/quarkus/
 
 EXPOSE 8080
 USER 1001
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-legacy-jar.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-legacy-jar.ftl
new file mode 100644
index 0000000000000..704c5073d52cb
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-legacy-jar.ftl
@@ -0,0 +1,54 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the container image run:
+#
+# mvn package
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/${project_artifactId}-jvm .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}-jvm
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
+# 
+# Then run the container using : 
+#
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-jvm
+#
+###
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+
+ARG JAVA_PACKAGE=java-11-openjdk-headless
+ARG RUN_JAVA_VERSION=1.3.8
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+
+# Install java and the run-java script
+# Also set up permissions for user `1001`
+RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
+    && microdnf update \
+    && microdnf clean all \
+    && mkdir /deployments \
+    && chown 1001 /deployments \
+    && chmod "g+rwX" /deployments \
+    && chown 1001:root /deployments \
+    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
+    && chown 1001 /deployments/run-java.sh \
+    && chmod 540 /deployments/run-java.sh \
+    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
+
+# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
+ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+
+COPY ${build_dir}/lib/* /deployments/lib/
+COPY ${build_dir}/*-runner.jar /deployments/app.jar
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native-distroless.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native-distroless.ftl
new file mode 100644
index 0000000000000..4ba08903ff84a
--- /dev/null
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native-distroless.ftl
@@ -0,0 +1,23 @@
+####
+# This Dockerfile is used in order to build a distroless container that runs the Quarkus application in native (no JVM) mode
+#
+# Before building the container image run:
+#
+# mvn package -Pnative -Dquarkus.native.container-build=true
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.native-distroless -t quarkus/${project_artifactId} .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}
+#
+###
+FROM quay.io/quarkus/quarkus-distroless-image:1.0
+COPY ${build-dir}/*-runner /application
+
+EXPOSE 8080
+USER nonroot
+
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
\ No newline at end of file
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl
index 4e3a77944bd67..a9fe968e96d48 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl
@@ -1,7 +1,7 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode
 #
-# Before building the docker image run:
+# Before building the container image run:
 #
 # mvn package -Pnative -Dquarkus.native.container-build=true
 #
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/gitignore.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/gitignore.ftl
index 667fae3d7021e..38db6efa816ad 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/gitignore.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/gitignore.ftl
@@ -27,4 +27,8 @@ nb-configuration.xml
 # patch
 *.orig
 *.rej
+
+# Local environment
+.env
+
 ${additional_gitignore_entries}
diff --git a/devtools/platform-descriptor-json/src/test/java/io/quarkus/platform/descriptor/tests/PlatformDescriptorLoaderTest.java b/devtools/platform-descriptor-json/src/test/java/io/quarkus/platform/descriptor/tests/PlatformDescriptorLoaderTest.java
deleted file mode 100644
index d3cab409c8266..0000000000000
--- a/devtools/platform-descriptor-json/src/test/java/io/quarkus/platform/descriptor/tests/PlatformDescriptorLoaderTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.quarkus.platform.descriptor.tests;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-
-import org.apache.maven.model.Dependency;
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.platform.descriptor.loader.json.ArtifactResolver;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoaderContext;
-import io.quarkus.platform.descriptor.loader.json.impl.QuarkusJsonPlatformDescriptor;
-import io.quarkus.platform.descriptor.loader.json.impl.QuarkusJsonPlatformDescriptorLoaderImpl;
-
-class PlatformDescriptorLoaderTest {
-
-    @Test
-    void test() {
-
-        QuarkusJsonPlatformDescriptorLoader<QuarkusJsonPlatformDescriptor> qpd = new QuarkusJsonPlatformDescriptorLoaderImpl();
-
-        final ArtifactResolver artifactResolver = new ArtifactResolver() {
-
-            @Override
-            public <T> T process(String groupId, String artifactId, String classifier, String type, String version,
-                    Function<Path, T> processor) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public List<Dependency> getManagedDependencies(String groupId, String artifactId, String classifier,
-                    String type, String version) {
-                return Collections.emptyList();
-            }
-        };
-
-        QuarkusJsonPlatformDescriptorLoaderContext context = new QuarkusJsonPlatformDescriptorLoaderContext(artifactResolver) {
-            @Override
-            public <T> T parseJson(Function<InputStream, T> parser) {
-                String resourceName = "fakeextensions.json";
-
-                final InputStream is = getClass().getClassLoader().getResourceAsStream(resourceName);
-                if (is == null) {
-                    throw new IllegalStateException("Failed to locate " + resourceName + " on the classpath");
-                }
-
-                try {
-                    return parser.apply(is);
-                } finally {
-                    try {
-                        is.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
-
-        };
-
-        QuarkusJsonPlatformDescriptor load = qpd.load(context);
-
-        assertNotNull(load);
-
-        assertEquals(85, load.getExtensions().size());
-
-        assertEquals(1, load.getCategories().size());
-
-    }
-
-}
diff --git a/devtools/platform-descriptor-json/src/test/resources/fakeextensions.json b/devtools/platform-descriptor-json/src/test/resources/fakeextensions.json
deleted file mode 100644
index 9db862bcad79a..0000000000000
--- a/devtools/platform-descriptor-json/src/test/resources/fakeextensions.json
+++ /dev/null
@@ -1,1217 +0,0 @@
-
-{
-    "bom": {
-        "group-id": "io.quarkus",
-        "artifact-id": "quarkus-bom",
-        "version": "999-SNAPSHOT"
-    },
-    
-    "categories": [
-    	{
-    	"name" : "Web",
-    	"id" : "web",
-    	"description": "web is webby",
-    	"metadata": {
-    		"pinned": [
-    			"x.y.z",
-    			"1.2.3"
-    		]
-    	}	
-    	}
-    ],
-    
-    "extensions": [
-        {
-            "name": "Quarkus - Core",
-            "metadata": {
-                "keywords": [
-                ]
-            },
-            "short-name": "wonka",
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-core",
-            "version": "999-SNAPSHOT",
-            "description": "Build parent to bring in required dependencies"
-        },
-        {
-            "name": "ArC",
-            "short-name": "CDI",
-            "guide": "https://quarkus.io/guides/cdi-reference",
-            "metadata": {
-                "keywords": [
-                    "arc",
-                    "cdi",
-                    "dependency-injection",
-                    "di"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-arc",
-            "version": "999-SNAPSHOT",
-            "description": "Build time CDI dependency injection"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-caffeine",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - Caffeine - Runtime",
-            "description": "A high performance caching library for Java 8+"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jaxb",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - JAXB - Runtime",
-            "description": "XML serialization support"
-        },
-        {
-            "name": "Jackson",
-            "metadata": {
-                "keywords": [
-                    "jackson",
-                    "json"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jackson",
-            "version": "999-SNAPSHOT",
-            "description": "Jackson Databind support"
-        },
-        {
-            "name": "JSON-B",
-            "guide": "https://quarkus.io/guides/rest-json",
-            "metadata": {
-                "keywords": [
-                    "jsonb",
-                    "json-b",
-                    "json"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jsonb",
-            "version": "999-SNAPSHOT",
-            "description": "JSON Binding support"
-        },
-        {
-            "name": "JSON-P",
-            "metadata": {
-                "keywords": [
-                    "jsonp",
-                    "json-p",
-                    "json"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jsonp",
-            "version": "999-SNAPSHOT",
-            "description": "JSON Processing support"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-netty",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - Netty - Runtime",
-            "description": "Netty is a non-blocking I/O client-server framework. Used by Quarkus as foundation layer."
-        },
-        {
-            "name": "Agroal - Database connection pool",
-            "metadata": {
-                "keywords": [
-                    "agroal",
-                    "database-connection-pool"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-agroal",
-            "version": "999-SNAPSHOT",
-            "description": "Pool your database connections (included in Hibernate ORM)"
-        },
-        {
-            "name": "Artemis Core",
-            "metadata": {
-                "keywords": [
-                    "artemis-core",
-                    "artemis"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-artemis-core",
-            "version": "999-SNAPSHOT",
-            "description": "Use ActiveMQ Artemis as message broker"
-        },
-        {
-            "name": "Artemis JMS",
-            "metadata": {
-                "keywords": [
-                    "artemis-jms",
-                    "artemis"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-artemis-jms",
-            "version": "999-SNAPSHOT",
-            "description": "Use ActiveMQ Artemis as a JMS implementation"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-elasticsearch-rest-client",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - Elasticsearch REST client - Runtime",
-            "description": "Elasticsearch REST client"
-        },
-        {
-            "name": "Jaeger",
-            "metadata": {
-                "keywords": [
-                    "jaeger"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-security",
-            "version": "999-SNAPSHOT",
-            "description": "Security"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-elytron-security",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - Elytron Security - Runtime",
-            "description": "Secure your services"
-        },
-        {
-            "name": "Properties File based Security",
-            "guide": "https://quarkus.io/guides/security-properties",
-            "metadata": {
-                "keywords": [
-                    "security"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-elytron-security-properties-file",
-            "version": "999-SNAPSHOT",
-            "description": "Secure your applications using properties files"
-        },
-        {
-            "name": "Elytron Security OAuth 2.0",
-            "metadata": {
-                "keywords": [
-                    "security",
-                    "oauth2"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-elytron-security-oauth2",
-            "version": "999-SNAPSHOT",
-            "description": "Secure your applications with OAuth2 opaque tokens"
-        },
-        {
-            "name": "OpenID Connect",
-            "guide": "https://quarkus.io/guides/security-openid-connect",
-            "metadata": {
-                "keywords": [
-                    "oauth2",
-                    "openid-connect"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-oidc",
-            "version": "999-SNAPSHOT",
-            "description": "Secure your applications with OpenID Connect and Keycloak"
-        },
-        {
-            "name": "Flyway",
-            "guide": "https://quarkus.io/guides/flyway",
-            "metadata": {
-                "keywords": [
-                    "flyway",
-                    "database",
-                    "data"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-flyway",
-            "version": "999-SNAPSHOT",
-            "description": "Handle your database schema migrations"
-        },
-        {
-            "name": "Hibernate ORM",
-            "short-name": "JPA",
-            "guide": "https://quarkus.io/guides/hibernate-orm",
-            "metadata": {
-                "keywords": [
-                    "hibernate-orm",
-                    "jpa",
-                    "hibernate"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-hibernate-orm",
-            "version": "999-SNAPSHOT",
-            "description": "Define your persistent model with Hibernate ORM and JPA"
-        },
-        {
-            "name": "Hibernate ORM with Panache",
-            "guide": "https://quarkus.io/guides/hibernate-orm-panache",
-            "metadata": {
-                "keywords": [
-                    "hibernate-orm-panache",
-                    "panache",
-                    "hibernate",
-                    "jpa"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-hibernate-orm-panache",
-            "version": "999-SNAPSHOT",
-            "description": "Define your persistent model in Hibernate ORM with Panache"
-        },
-        {
-            "name": "MongoDB with Panache",
-            "metadata": {
-                "keywords": [
-                    "mongo",
-                    "mongodb",
-                    "nosql",
-                    "datastore",
-                    "panache"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-mongodb-panache",
-            "version": "999-SNAPSHOT",
-            "description": "Use an active record or repository pattern with MongoDB"
-        },
-        {
-            "name": "Hibernate Search + Elasticsearch",
-            "guide": "https://quarkus.io/guides/hibernate-search-elasticsearch",
-            "metadata": {
-                "keywords": [
-                    "hibernate-search-elasticsearch",
-                    "search",
-                    "full-text",
-                    "hibernate",
-                    "elasticsearch"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-hibernate-search-elasticsearch",
-            "version": "999-SNAPSHOT",
-            "description": "Automatically index your Hibernate entities in Elasticsearch"
-        },
-        {
-            "name": "Hibernate Validator",
-            "short-name": "bean validation",
-            "guide": "https://quarkus.io/guides/validation",
-            "metadata": {
-                "keywords": [
-                    "hibernate-validator",
-                    "bean-validation",
-                    "validation"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-hibernate-validator",
-            "version": "999-SNAPSHOT",
-            "description": "Validate data coming to your REST endpoints"
-        },
-        {
-            "name": "Infinispan Client",
-            "guide": "https://quarkus.io/guides/infinispan-client",
-            "metadata": {
-                "keywords": [
-                    "infinispan-client",
-                    "data-grid-client",
-                    "infinispan"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-infinispan-client",
-            "version": "999-SNAPSHOT",
-            "description": "Connect to the Infinispan data grid for distributed caching"
-        },
-        {
-            "name": "Infinispan Embedded",
-            "metadata": {
-                "keywords": [
-                    "infinispan"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-infinispan-embedded",
-            "version": "999-SNAPSHOT",
-            "description": "Run an embedded Infinispan data grid server for distributed caching"
-        },
-        {
-            "name": "Security",
-            "metadata": {
-                "keywords": [
-                    "security"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jaeger",
-            "version": "999-SNAPSHOT",
-            "description": "Trace your services with Jaeger"
-        },
-        {
-            "name": "JDBC Driver - PostgreSQL",
-            "metadata": {
-                "keywords": [
-                    "jdbc-postgresql",
-                    "jdbc",
-                    "postgresql"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jdbc-postgresql",
-            "version": "999-SNAPSHOT",
-            "description": "PostgreSQL database connector"
-        },
-        {
-            "name": "JDBC Driver - H2",
-            "metadata": {
-                "keywords": [
-                    "jdbc-h2",
-                    "jdbc",
-                    "h2"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jdbc-h2",
-            "version": "999-SNAPSHOT",
-            "description": "H2 database connector"
-        },
-        {
-            "name": "JDBC Driver - MariaDB",
-            "metadata": {
-                "keywords": [
-                    "jdbc-mariadb",
-                    "jdbc",
-                    "mariadb"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jdbc-mariadb",
-            "version": "999-SNAPSHOT",
-            "description": "MariaDB database connector"
-        },
-        {
-            "name": "JDBC Driver - Microsoft SQL Server",
-            "metadata": {
-                "keywords": [
-                    "jdbc-mssql",
-                    "jdbc",
-                    "mssql",
-                    "sql-server"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jdbc-mssql",
-            "version": "999-SNAPSHOT",
-            "description": "Microsoft SQL Server database connector"
-        },
-        {
-            "name": "JDBC Driver - MySQL",
-            "metadata": {
-                "keywords": [
-                    "jdbc-mysql",
-                    "jdbc",
-                    "mysql"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jdbc-mysql",
-            "version": "999-SNAPSHOT",
-            "description": "MySQL database connector"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jdbc-derby",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - JDBC - Derby - Runtime",
-            "description": "Derby database connector"
-        },
-        {
-            "name": "Apache Kafka Client",
-            "metadata": {
-                "keywords": [
-                    "kafka"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-kafka-client",
-            "version": "999-SNAPSHOT",
-            "description": "A client for Apache Kafka"
-        },
-        {
-            "name": "Apache Kafka Streams",
-            "metadata": {
-                "keywords": [
-                    "kafka",
-                    "kafka-streams"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-kafka-streams",
-            "version": "999-SNAPSHOT",
-            "description": "Implement stream processing applications based on Apache Kafka"
-        },
-        {
-            "name": "SmallRye Health",
-            "short-name": "health",
-            "guide": "https://quarkus.io/guides/microprofile-health",
-            "metadata": {
-                "keywords": [
-                    "smallrye-health",
-                    "health-check",
-                    "health",
-                    "microprofile-health",
-                    "microprofile-health-check"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-health",
-            "version": "999-SNAPSHOT",
-            "description": "Monitor service health"
-        },
-        {
-            "name": "SmallRye JWT",
-            "guide": "https://quarkus.io/guides/security-jwt",
-            "metadata": {
-                "keywords": [
-                    "smallrye-jwt",
-                    "jwt",
-                    "json-web-token",
-                    "rbac"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-jwt",
-            "version": "999-SNAPSHOT",
-            "description": "Secure your applications with JSON Web Token"
-        },
-        {
-            "name": "SmallRye Context Propagation",
-            "short-name": "context propagation",
-            "metadata": {
-                "keywords": [
-                    "smallrye-context-propagation",
-                    "microprofile-context-propagation",
-                    "context-propagation",
-                    "context",
-                    "reactive"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-context-propagation",
-            "version": "999-SNAPSHOT",
-            "description": "SmallRye Context Propagation"
-        },
-        {
-            "name": "SmallRye Reactive Streams Operators",
-            "short-name": "reactive streams",
-            "metadata": {
-                "keywords": [
-                    "smallrye-reactive-streams-operators",
-                    "smallrye-reactive-streams",
-                    "reactive-streams-operators",
-                    "reactive-streams",
-                    "microprofile-reactive-streams",
-                    "reactive"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-reactive-streams-operators",
-            "version": "999-SNAPSHOT",
-            "description": "Operators for Reactive Streams programming"
-        },
-        {
-            "name": "SmallRye Reactive Type Converters",
-            "metadata": {
-                "keywords": [
-                    "smallrye-reactive-type-converters",
-                    "reactive-type-converters",
-                    "reactive-streams-operators",
-                    "reactive-streams",
-                    "microprofile-reactive-streams",
-                    "reactive"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-reactive-type-converters",
-            "version": "999-SNAPSHOT",
-            "description": "Converters for reactive types from various reactive programming libraries"
-        },
-        {
-            "name": "SmallRye Reactive Messaging",
-            "guide": "https://quarkus.io/guides/reactive-messaging",
-            "metadata": {
-                "keywords": [
-                    "smallrye-reactive-messaging",
-                    "reactive-messaging",
-                    "reactive"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-reactive-messaging",
-            "version": "999-SNAPSHOT",
-            "description": "Asynchronous messaging for Reactive Streams"
-        },
-        {
-            "name": "SmallRye Reactive Messaging - Kafka Connector",
-            "short-name": "kafka",
-            "guide": "https://quarkus.io/guides/kafka",
-            "metadata": {
-                "keywords": [
-                    "kafka",
-                    "reactive-kafka"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-reactive-messaging-kafka",
-            "version": "999-SNAPSHOT",
-            "description": "Kafka reactive messaging connector"
-        },
-        {
-            "name": "SmallRye Reactive Messaging - AMQP Connector",
-            "guide": "https://quarkus.io/guides/amqp",
-            "metadata": {
-                "keywords": [
-                    "amqp",
-                    "reactive-amqp"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-reactive-messaging-amqp",
-            "version": "999-SNAPSHOT",
-            "description": "AMQP reactive messaging connector"
-        },
-        {
-            "name": "SmallRye Reactive Messaging - MQTT Connector",
-            "metadata": {
-                "keywords": [
-                    "mqtt",
-                    "reactive-mqtt"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-reactive-messaging-mqtt",
-            "version": "999-SNAPSHOT",
-            "description": "MQTT reactive messaging connector"
-        },
-        {
-            "name": "SmallRye Metrics",
-            "short-name": "metrics",
-            "guide": "https://quarkus.io/guides/microprofile-metrics",
-            "metadata": {
-                "keywords": [
-                    "smallrye-metrics",
-                    "metrics",
-                    "metric",
-                    "prometheus",
-                    "monitoring"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-metrics",
-            "version": "999-SNAPSHOT",
-            "description": "Extract metrics out of your services"
-        },
-        {
-            "name": "SmallRye OpenAPI",
-            "guide": "https://quarkus.io/guides/openapi-swaggerui",
-            "metadata": {
-                "keywords": [
-                    "smallrye-openapi",
-                    "openapi",
-                    "open-api"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-openapi",
-            "version": "999-SNAPSHOT",
-            "description": "Document your REST APIs with OpenAPI - comes with Swagger UI"
-        },
-        {
-            "name": "SmallRye OpenTracing",
-            "guide": "https://quarkus.io/guides/opentracing",
-            "metadata": {
-                "keywords": [
-                    "smallrye-opentracing",
-                    "opentracing",
-                    "tracing",
-                    "distributed-tracing",
-                    "jaeger"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-opentracing",
-            "version": "999-SNAPSHOT",
-            "description": "Trace your services with Jaeger"
-        },
-        {
-            "name": "REST Client",
-            "guide": "https://quarkus.io/guides/rest-client",
-            "metadata": {
-                "keywords": [
-                    "rest-client",
-                    "web-client",
-                    "microprofile-rest-client"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-rest-client",
-            "version": "999-SNAPSHOT",
-            "description": "Call REST services"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-resteasy-common",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - RESTEasy - Common - Runtime",
-            "description": "REST framework implementing JAX-RS and more"
-        },
-        {
-            "name": "RESTEasy JAX-RS",
-            "short-name": "jax-rs",
-            "guide": "https://quarkus.io/guides/rest-json",
-            "metadata": {
-                "keywords": [
-                    "resteasy",
-                    "jaxrs",
-                    "web",
-                    "rest"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-resteasy",
-            "version": "999-SNAPSHOT",
-            "description": "REST framework implementing JAX-RS and more"
-        },
-        {
-            "name": "RESTEasy Jackson",
-            "metadata": {
-                "keywords": [
-                    "resteasy-jackson",
-                    "jaxrs-json",
-                    "resteasy-json",
-                    "resteasy",
-                    "jaxrs",
-                    "json",
-                    "jackson"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-resteasy-jackson",
-            "version": "999-SNAPSHOT",
-            "description": "Jackson serialization support for RESTEasy"
-        },
-        {
-            "name": "RESTEasy JSON-B",
-            "guide": "https://quarkus.io/guides/rest-json",
-            "metadata": {
-                "keywords": [
-                    "resteasy-jsonb",
-                    "jaxrs-json",
-                    "resteasy-json",
-                    "resteasy",
-                    "jaxrs",
-                    "json",
-                    "jsonb"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-resteasy-jsonb",
-            "version": "999-SNAPSHOT",
-            "description": "JSON-B serialization support for RESTEasy"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-resteasy-jaxb",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - RESTEasy - JAXB - Runtime",
-            "description": "XML serialization support for RESTEasy"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-resteasy-server-common",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - RESTEasy - Server common - Runtime",
-            "description": "RESTEasy Server common"
-        },
-        {
-            "name": "Narayana JTA - Transaction manager",
-            "guide": "https://quarkus.io/guides/transaction",
-            "metadata": {
-                "keywords": [
-                    "narayana-jta",
-                    "narayana",
-                    "jta",
-                    "transactions",
-                    "transaction",
-                    "tx",
-                    "txs"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-narayana-jta",
-            "version": "999-SNAPSHOT",
-            "description": "JTA transaction support (included in Hibernate ORM)"
-        },
-        {
-            "name": "Undertow Servlet",
-            "short-name": "servlet",
-            "metadata": {
-                "keywords": [
-                    "undertow",
-                    "servlet"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-undertow",
-            "version": "999-SNAPSHOT",
-            "description": "Support for servlets"
-        },
-        {
-            "name": "SmallRye Fault Tolerance",
-            "metadata": {
-                "keywords": [
-                    "smallrye-fault-tolerance",
-                    "fault-tolerance",
-                    "microprofile-fault-tolerance",
-                    "circuit-breaker",
-                    "bulkhead"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-smallrye-fault-tolerance",
-            "version": "999-SNAPSHOT",
-            "description": "Define fault-tolerant services"
-        },
-        {
-            "name": "Eclipse Vert.x - Core",
-            "metadata": {
-                "keywords": [
-                    "eclipse-vert.x",
-                    "vertx",
-                    "vert.x",
-                    "reactive"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-vertx-core",
-            "version": "999-SNAPSHOT",
-            "description": "Vert.x Core"
-        },
-        {
-            "name": "Eclipse Vert.x",
-            "guide": "https://quarkus.io/guides/vertx",
-            "metadata": {
-                "keywords": [
-                    "eclipse-vert.x",
-                    "vertx",
-                    "vert.x",
-                    "reactive"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-vertx",
-            "version": "999-SNAPSHOT",
-            "description": "Reactive application toolkit"
-        },
-        {
-            "name": "Eclipse Vert.x - HTTP",
-            "metadata": {
-                "keywords": [
-                    "eclipse-vert.x",
-                    "vertx",
-                    "vert.x",
-                    "reactive",
-                    "vertx-http"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-vertx-http",
-            "version": "999-SNAPSHOT",
-            "description": "Vert.x HTTP"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-vertx-web",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - Vert.x Web - Runtime",
-            "description": "Vert.x Web"
-        },
-        {
-            "name": "Reactive PostgreSQL client",
-            "metadata": {
-                "keywords": [
-                    "eclipse-vert.x",
-                    "vertx",
-                    "vert.x",
-                    "reactive",
-                    "database",
-                    "data",
-                    "postgresql"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-reactive-pg-client",
-            "version": "999-SNAPSHOT",
-            "description": "A reactive client for the PostgreSQL database"
-        },
-        {
-            "name": "Reactive MySQL client",
-            "metadata": {
-                "keywords": [
-                    "eclipse-vert.x",
-                    "vertx",
-                    "vert.x",
-                    "reactive",
-                    "database",
-                    "data",
-                    "mysql"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-reactive-mysql-client",
-            "version": "999-SNAPSHOT",
-            "description": "A reactive client for the MySQL database"
-        },
-        {
-            "name": "Mailer",
-            "guide": "https://quarkus.io/guides/mailer",
-            "metadata": {
-                "keywords": [
-                    "mail",
-                    "mailer"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-mailer",
-            "version": "999-SNAPSHOT",
-            "description": "Send emails"
-        },
-        {
-            "name": "MongoDB client",
-            "metadata": {
-                "keywords": [
-                    "mongo",
-                    "mongodb",
-                    "nosql",
-                    "datastore"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-mongodb-client",
-            "version": "999-SNAPSHOT",
-            "description": "An imperative and reactive client for MongoDB"
-        },
-        {
-            "name": "Undertow WebSockets",
-            "short-name": "websockets",
-            "guide": "https://quarkus.io/guides/websockets",
-            "metadata": {
-                "keywords": [
-                    "undertow-websockets",
-                    "undertow-websocket",
-                    "websocket",
-                    "websockets",
-                    "web-socket",
-                    "web-sockets"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-undertow-websockets",
-            "version": "999-SNAPSHOT",
-            "description": "WebSocket support"
-        },
-        {
-            "name": "Scheduler - tasks",
-            "guide": "https://quarkus.io/guides/scheduler",
-            "metadata": {
-                "keywords": [
-                    "scheduler",
-                    "tasks",
-                    "periodic-tasks"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-scheduler",
-            "version": "999-SNAPSHOT",
-            "description": "Schedule jobs and tasks"
-        },
-        {
-            "name": "Quarkus Extension for Spring DI API",
-            "guide": "https://quarkus.io/guides/spring-di",
-            "metadata": {
-                "keywords": [
-                    "spring-di"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-spring-di",
-            "version": "999-SNAPSHOT",
-            "description": "Define your dependency injection with Spring DI"
-        },
-        {
-            "name": "Quarkus Extension for Spring Web API",
-            "guide": "https://quarkus.io/guides/spring-web",
-            "metadata": {
-                "keywords": [
-                    "spring-web"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-spring-web",
-            "version": "999-SNAPSHOT",
-            "description": "Use Spring Web annotations to create your REST services"
-        },
-        {
-            "name": "Quarkus Extension for Spring Data JPA API",
-            "guide": "https://quarkus.io/guides/spring-data-jpa",
-            "metadata": {
-                "keywords": [
-                    "spring-data"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-spring-data-jpa",
-            "version": "999-SNAPSHOT",
-            "description": "Use Spring Data JPA annotations to create your data access layer"
-        },
-        {
-            "name": "Swagger UI",
-            "guide": "https://quarkus.io/guides/openapi-swaggerui",
-            "metadata": {
-                "keywords": [
-                    "swagger-ui"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-swagger-ui",
-            "version": "999-SNAPSHOT",
-            "description": "Swagger UI"
-        },
-        {
-            "name": "Kotlin",
-            "guide": "https://quarkus.io/guides/kotlin",
-            "metadata": {
-                "keywords": [
-                    "kotlin"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-kotlin",
-            "version": "999-SNAPSHOT",
-            "description": "Write your services in Kotlin"
-        },
-        {
-            "name": "AWS Lambda",
-            "metadata": {
-                "keywords": [
-                    "lambda",
-                    "aws",
-                    "amazon"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-amazon-lambda",
-            "version": "999-SNAPSHOT",
-            "description": "AWS Lambda support"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-amazon-lambda-http",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - Amazon Lambda HTTP - Runtime",
-            "description": "Allows Java applications written for a servlet container to run in AWS Lambda"
-        },
-        {
-            "name": "Amazon DynamoDB client",
-            "metadata": {
-                "keywords": [
-                    "dynamodb",
-                    "dynamo",
-                    "aws",
-                    "amazon"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-amazon-dynamodb",
-            "version": "999-SNAPSHOT",
-            "description": "A client for the Amazon DynamoDB datastore"
-        },
-        {
-            "metadata": {
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-azure-functions-http",
-            "version": "999-SNAPSHOT",
-            "name": "Quarkus - HTTP Azure Functions - Runtime",
-            "description": "This package contains all Java interfaces and annotations to interact with Microsoft Azure functions runtime."
-        },
-        {
-            "name": "Kubernetes",
-            "guide": "https://quarkus.io/guides/kubernetes",
-            "metadata": {
-                "keywords": [
-                    "kubernetes"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-kubernetes",
-            "version": "999-SNAPSHOT",
-            "description": "Generate Kubernetes resources from annotations"
-        },
-        {
-            "name": "Kubernetes Client",
-            "metadata": {
-                "keywords": [
-                    "kubernetes-client"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-kubernetes-client",
-            "version": "999-SNAPSHOT",
-            "description": "Interact with Kubernetes and develop Kubernetes Operators"
-        },
-        {
-            "name": "Kogito",
-            "guide": "https://quarkus.io/guides/kogito",
-            "metadata": {
-                "keywords": [
-                    "kogito",
-                    "drools",
-                    "jbpm"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-kogito",
-            "version": "999-SNAPSHOT",
-            "description": "Add business automation capabilities with Kogito"
-        },
-        {
-            "name": "Apache Tika",
-            "metadata": {
-                "keywords": [
-                    "tika",
-                    "parser"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-tika",
-            "version": "999-SNAPSHOT",
-            "description": "Extract data from your documents with Apache Tika"
-        },
-        {
-            "name": "Neo4j client",
-            "metadata": {
-                "keywords": [
-                    "neo4j",
-                    "graph",
-                    "nosql",
-                    "datastore"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-neo4j",
-            "version": "999-SNAPSHOT",
-            "description": "A client for the Neo4j graph datastore"
-        },
-        {
-            "name": "Scala",
-            "metadata": {
-                "keywords": [
-                    "scala"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-scala",
-            "version": "999-SNAPSHOT",
-            "description": "Write your services in Scala"
-        },
-        {
-            "name": "JGit",
-            "metadata": {
-                "keywords": [
-                    "git"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-jgit",
-            "version": "999-SNAPSHOT",
-            "description": "Access your Git repositories"
-        },
-        {
-            "name": "Narayana STM - Software Transactional Memory",
-            "guide": "https://quarkus.io/guides/software-transactional-memory",
-            "metadata": {
-                "keywords": [
-                    "narayana-stm",
-                    "narayana",
-                    "stm",
-                    "transactions",
-                    "transaction",
-                    "software-transactional-memory",
-                    "tx",
-                    "txs"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-narayana-stm",
-            "version": "999-SNAPSHOT",
-            "description": "Software Transactional Memory (stm) support"
-        },
-        {
-            "name": "Elytron Security JDBC Realm",
-            "guide": "https://quarkus.io/guides/security-jdbc",
-            "metadata": {
-                "keywords": [
-                    "security",
-                    "jdbc"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-elytron-security-jdbc",
-            "version": "999-SNAPSHOT",
-            "description": "Secure your applications with username/password stored in a database"
-        },
-        {
-            "name": "Vault",
-            "guide": "https://quarkus.io/guides/vault",
-            "metadata": {
-                "keywords": [
-                    "vault",
-                    "security"
-                ]
-            },
-            "group-id": "io.quarkus",
-            "artifact-id": "quarkus-vault",
-            "version": "999-SNAPSHOT",
-            "description": "Store your credentials securely in HashiCorp Vault"
-        }
-    ]
-}
diff --git a/devtools/platform-properties/pom.xml b/devtools/platform-properties/pom.xml
new file mode 100644
index 0000000000000..22e6f06e3b14c
--- /dev/null
+++ b/devtools/platform-properties/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devtools-all</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-bom-quarkus-platform-properties</artifactId>
+    <packaging>pom</packaging>
+    <name>Quarkus - Platform Properties</name>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <!-- version>3.2.0</version -->
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-platform-descriptor-json-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>platform-properties</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/devtools/platform-properties/src/main/resources/platform-properties.properties b/devtools/platform-properties/src/main/resources/platform-properties.properties
new file mode 100644
index 0000000000000..ad52b8fbb7599
--- /dev/null
+++ b/devtools/platform-properties/src/main/resources/platform-properties.properties
@@ -0,0 +1 @@
+platform.quarkus.native.builder-image=${platform.quarkus.native.builder-image}
\ No newline at end of file
diff --git a/devtools/pom.xml b/devtools/pom.xml
index a86b4ffbc56f1..ec3cd0a47327e 100644
--- a/devtools/pom.xml
+++ b/devtools/pom.xml
@@ -21,11 +21,12 @@
 
     <modules>
         <module>platform-descriptor-json-plugin</module>
+        <module>platform-properties</module>
         <module>bom-descriptor-json</module>
         <module>platform-descriptor-json</module>
         <module>maven</module>
         <module>gradle</module>
-        <module>aesh</module>
+        <module>cli</module>
         <module>reflection-agent</module>
     </modules>
 </project>
diff --git a/docs/pom.xml b/docs/pom.xml
index 31ca10cb3411f..fabc2a5f77a64 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -38,8 +38,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
+            <artifactId>quarkus-devtools-registry-client</artifactId>
             <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-bootstrap-core</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -51,10 +55,2428 @@
                 </exclusion>
             </exclusions>
         </dependency>
-    </dependencies>
 
-    <build>
-        <plugins>
+        <!-- Minimal test dependencies for consistent build order -->
+        <!-- START update-extension-dependencies.sh -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-alexa-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-dynamodb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-iam-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-kms-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-rest-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-xray-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-s3-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-ses-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-sns-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-sqs-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-artemis-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-artemis-jms-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-avro-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-azure-functions-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-cache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-caffeine-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-config-yaml-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-consul-config-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-docker-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-jib-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-openshift-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-s2i-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-client-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-jdbc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-ldap-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-oauth2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-flyway-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-amazon-lambda-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-google-cloud-functions-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-knative-events-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-server-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-google-cloud-functions-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-google-cloud-functions-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-envers-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-kotlin-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-rest-data-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-infinispan-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jacoco-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaeger-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-db2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-derby-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mariadb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mssql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mysql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jgit-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsch-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-streams-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-keycloak-admin-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-keycloak-authorization-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-config-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-liquibase-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-gelf-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-json-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-sentry-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mailer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-minikube-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-kotlin-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-rest-data-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-reactive-streams-operators-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-narayana-jta-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-narayana-stm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-neo4j-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-picocli-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-quartz-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-qute-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-datasource-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-db2-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-messaging-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-mysql-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-redis-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-multipart-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-qute-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-qute-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-servlet-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-server-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-scala-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-scheduler-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-jpa-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-graphql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-opentracing-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-amqp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-kafka-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-mqtt-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-streams-operators-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-type-converters-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-boot-properties-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-cache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-cloud-config-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-jpa-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-rest-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-di-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-scheduled-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-swagger-ui-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-tika-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vault-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-graphql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-webjars-locator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- END update-extension-dependencies.sh -->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>dev.jbang</groupId>
+                <artifactId>jbang-maven-plugin</artifactId>
+                <version>0.0.6</version>
+                <executions>
+                    <execution>
+                        <id>generate-build-item-doc</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <jbangVersion>0.56.0</jbangVersion>
+                            <script>${project.basedir}/../.github/quarkusbuilditemdoc.java</script>
+                            <args>
+                                <arg>--outputFile ${project.basedir}/../target/asciidoc/generated/config/quarkus-all-build-items.adoc</arg>
+                                <arg>--dirs ${project.basedir}/../core/deployment ${project.basedir}/../core/test-extension ${project.basedir}/../extensions</arg>
+                            </args>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -71,7 +2493,7 @@
                     <mainClass>io.quarkus.docs.generation.AllConfigGenerator</mainClass>
                     <arguments>
                         <argument>${project.version}</argument>
-                        <argument>${project.basedir}/../devtools/bom-descriptor-json/target/extensions.json</argument>
+                        <argument>${project.basedir}/../devtools/platform-descriptor-json/target/classes/quarkus-bom-descriptor/extensions.json</argument>
                     </arguments>
                     <environmentVariables>
                         <MAVEN_CMD_LINE_ARGS>${env.MAVEN_CMD_LINE_ARGS}</MAVEN_CMD_LINE_ARGS>
@@ -108,6 +2530,8 @@
                         <surefire-version>${version.surefire.plugin}</surefire-version>
                         <graalvm-version>${graal-sdk.version-for-documentation}</graalvm-version>
                         <graalvm-flavor>${graal-sdk.version-for-documentation}-java11</graalvm-flavor>
+                        <mandrel-version>${mandrel.version-for-documentation}</mandrel-version>
+                        <mandrel-flavor>${mandrel.version-for-documentation}-java11</mandrel-flavor>
                         <restassured-version>${rest-assured.version}</restassured-version>
                         <maven-version>${proposed-maven-version}</maven-version>
                         <gradle-version>${gradle-wrapper.version}</gradle-version>
@@ -138,12 +2562,12 @@
                         <quarkus-base-url>${quarkus-base-url}</quarkus-base-url>
                         <!-- Quarkus repository URL to clone -->
                         <quarkus-clone-url>${quarkus-base-url}.git</quarkus-clone-url>
-                        <!-- Quarkus URL to master source archive -->
-                        <quarkus-archive-url>${quarkus-base-url}/archive/master.zip</quarkus-archive-url>
-                        <!-- Quarkus URL to master blob source tree; used for referencing source files -->
-                        <quarkus-blob-url>${quarkus-base-url}/blob/master</quarkus-blob-url>
-                        <!-- Quarkus URL to master source tree root; used for referencing directories -->
-                        <quarkus-tree-url>${quarkus-base-url}/tree/master</quarkus-tree-url>
+                        <!-- Quarkus URL to main source archive -->
+                        <quarkus-archive-url>${quarkus-base-url}/archive/main.zip</quarkus-archive-url>
+                        <!-- Quarkus URL to main blob source tree; used for referencing source files -->
+                        <quarkus-blob-url>${quarkus-base-url}/blob/main</quarkus-blob-url>
+                        <!-- Quarkus URL to main source tree root; used for referencing directories -->
+                        <quarkus-tree-url>${quarkus-base-url}/tree/main</quarkus-tree-url>
                         <!-- Quarkus URL to issues -->
                         <quarkus-issues-url>${quarkus-base-url}/issues</quarkus-issues-url>
                         <quarkus-images-url>https://github.com/quarkusio/quarkus-images/tree</quarkus-images-url>
@@ -153,12 +2577,12 @@
                         <quickstarts-base-url>${quickstarts-base-url}</quickstarts-base-url>
                         <!-- Quickstart repository URL to clone -->
                         <quickstarts-clone-url>${quickstarts-base-url}.git</quickstarts-clone-url>
-                        <!-- Quickstart URL to master source archive -->
-                        <quickstarts-archive-url>${quickstarts-base-url}/archive/master.zip</quickstarts-archive-url>
-                        <!-- Quickstart URL to master blob source tree; used for referencing source files -->
-                        <quickstarts-blob-url>${quickstarts-base-url}/blob/master</quickstarts-blob-url>
-                        <!-- Quickstart URL to master source tree root; used for referencing directories -->
-                        <quickstarts-tree-url>${quickstarts-base-url}/tree/master</quickstarts-tree-url>
+                        <!-- Quickstart URL to main source archive -->
+                        <quickstarts-archive-url>${quickstarts-base-url}/archive/main.zip</quickstarts-archive-url>
+                        <!-- Quickstart URL to main blob source tree; used for referencing source files -->
+                        <quickstarts-blob-url>${quickstarts-base-url}/blob/main</quickstarts-blob-url>
+                        <!-- Quickstart URL to main source tree root; used for referencing directories -->
+                        <quickstarts-tree-url>${quickstarts-base-url}/tree/main</quickstarts-tree-url>
                     </attributes>
                 </configuration>
                 <executions>
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index 5fcc914ac1923..9410e5aa8f6a2 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -28,9 +28,9 @@ complete list of externalized variables for use is given in the following table:
 |\{quarkus-org-url}|{quarkus-org-url}| The location of the project github organization.
 |\{quarkus-base-url}|{quarkus-base-url}| Quarkus GitHub URL common base prefix.
 |\{quarkus-clone-url}|{quarkus-clone-url}| Quarkus URL for git clone referenced by the documentation.
-|\{quarkus-archive-url}|{quarkus-archive-url}| Quarkus URL to master source archive.
-|\{quarkus-blob-url}|{quarkus-blob-url}| Quarkus URL to master blob source tree; used for referencing source files.
-|\{quarkus-tree-url}|{quarkus-tree-url}| Quarkus URL to master source tree root; used for referencing directories.
+|\{quarkus-archive-url}|{quarkus-archive-url}| Quarkus URL to main source archive.
+|\{quarkus-blob-url}|{quarkus-blob-url}| Quarkus URL to main blob source tree; used for referencing source files.
+|\{quarkus-tree-url}|{quarkus-tree-url}| Quarkus URL to main source tree root; used for referencing directories.
 |\{quarkus-issues-url}|{quarkus-issues-url}| Quarkus URL to the issues page.
 |\{quarkus-images-url}|{quarkus-images-url}| Quarkus URL to set of container images delivered for Quarkus.
 
@@ -40,10 +40,10 @@ complete list of externalized variables for use is given in the following table:
 
 |\{quickstarts-base-url}|{quickstarts-base-url}| Quickstarts URL common base prefix.
 |\{quickstarts-clone-url}|{quickstarts-clone-url}| Quickstarts URL for git clone referenced by the documentation.
-|\{quickstarts-archive-url}|{quickstarts-archive-url}| Quickstarts URL to master source archive.
-|\{quickstarts-blob-url}|{quickstarts-blob-url}| Quickstarts URL to master blob source tree; used for referencing source files.
-|\{quickstarts-tree-url}|{quickstarts-tree-url}| Quickstarts URL to master source tree root; used for referencing directories.
+|\{quickstarts-archive-url}|{quickstarts-archive-url}| Quickstarts URL to main source archive.
+|\{quickstarts-blob-url}|{quickstarts-blob-url}| Quickstarts URL to main blob source tree; used for referencing source files.
+|\{quickstarts-tree-url}|{quickstarts-tree-url}| Quickstarts URL to main source tree root; used for referencing directories.
 
 |\{graalvm-version}|{graalvm-version}| Recommended GraalVM version to use.
-|\{graalvm-flavor}|{graalvm-flavor}| The full flavor of GraaVM to use e.g. `19.3.1-java11`.
+|\{graalvm-flavor}|{graalvm-flavor}| The full flavor of GraaVM to use e.g. `19.3.1-java11`. Make sure to use a `java11` version.
 |===
diff --git a/docs/src/main/asciidoc/all-builditems.adoc b/docs/src/main/asciidoc/all-builditems.adoc
new file mode 100644
index 0000000000000..4522902f6585b
--- /dev/null
+++ b/docs/src/main/asciidoc/all-builditems.adoc
@@ -0,0 +1,15 @@
+---
+layout: guides-configuration-reference
+---
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+include::./attributes.adoc[]
+
+= Quarkus - Build Items
+
+Here you can find a list of Build Items and the extension that provides them:
+
+include::{generated-dir}/config/quarkus-all-build-items.adoc[opts=optional]
diff --git a/docs/src/main/asciidoc/all-config.adoc b/docs/src/main/asciidoc/all-config.adoc
index 39a3868d1e9b4..97750a0a177fd 100644
--- a/docs/src/main/asciidoc/all-config.adoc
+++ b/docs/src/main/asciidoc/all-config.adoc
@@ -4,7 +4,7 @@ layout: guides-configuration-reference
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - All configuration options
 
diff --git a/docs/src/main/asciidoc/amazon-dynamodb.adoc b/docs/src/main/asciidoc/amazon-dynamodb.adoc
index 275bb4742fc0a..236d9504d433a 100644
--- a/docs/src/main/asciidoc/amazon-dynamodb.adoc
+++ b/docs/src/main/asciidoc/amazon-dynamodb.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon DynamoDB Client
 :extension-status: preview
@@ -40,7 +40,7 @@ To complete this guide, you need:
 
 The easiest way to start working with DynamoDB is to run a local instance as a container.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 docker run --publish 8000:8000 amazon/dynamodb-local:1.11.477 -jar DynamoDBLocal.jar -inMemory -sharedDb
 ----
@@ -76,7 +76,7 @@ For more information, see https://docs.aws.amazon.com/amazondynamodb/latest/deve
 
 We recommend to use the AWS CLI to provision the table:
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 aws dynamodb create-table --table-name QuarkusFruits \
                           --attribute-definitions AttributeName=fruitName,AttributeType=S \
@@ -98,14 +98,14 @@ The solution is located in the `amazon-dynamodb-quickstart` {quickstarts-tree-ur
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amazon-dynamodb-quickstart \
     -DclassName="org.acme.dynamodb.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jsonb,amazon-dynamodb,resteasy-mutiny"
+    -Dextensions="resteasy,resteasy-jackson,amazon-dynamodb,resteasy-mutiny"
 cd amazon-dynamodb-quickstart
 ----
 
@@ -281,17 +281,13 @@ package org.acme.dynamodb;
 import java.util.List;
 
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
     @Inject
@@ -321,7 +317,7 @@ The implementation is pretty straightforward and you just need to define your en
 == Configuring DynamoDB clients
 
 Both DynamoDB clients (sync and async) are configurable via the `application.properties` file that can be provided in the `src/main/resources` directory.
-Additionally, you need to added to the classpath a proper implementation of the sync client. By default the extension uses URL connection HTTP client, so
+Additionally, you need to add to the classpath a proper implementation of the sync client. By default the extension uses the `java.net.URLConnection` HTTP client, so
 you need to add a URL connection client dependency to the `pom.xml` file:
 
 [source,xml]
@@ -332,7 +328,7 @@ you need to add a URL connection client dependency to the `pom.xml` file:
 </dependency>
 ----
 
-If you want to use Apache HTTP client instead, configure it as follows:
+If you want to use the Apache HTTP client instead, configure it as follows:
 [source,properties]
 ----
 quarkus.dynamodb.sync-client.type=apache
@@ -380,7 +376,7 @@ include::./amazon-credentials.adoc[]
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -jar target/amazon-dynamodb-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
diff --git a/docs/src/main/asciidoc/amazon-iam.adoc b/docs/src/main/asciidoc/amazon-iam.adoc
new file mode 100644
index 0000000000000..2e22751b228ee
--- /dev/null
+++ b/docs/src/main/asciidoc/amazon-iam.adoc
@@ -0,0 +1,25 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Amazon IAM Client
+:extension-status: preview
+
+include::./attributes.adoc[]
+
+Amazon Identity and Access Management (IAM) enables users to manage access to AWS services and resources securely.
+
+You can find more information about IAM at https://aws.amazon.com/iam/[the Amazon IAM website].
+
+NOTE: The IAM extension is based on https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/welcome.html[AWS Java SDK 2.x].
+It's a major rewrite of the 1.x code base that offers two programming models (Blocking & Async).
+
+include::./status-include.adoc[]
+
+The Quarkus extension supports two programming models:
+
+* Blocking access using URL Connection HTTP client (by default) or the Apache HTTP Client
+* https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/basics-async.html[Asynchronous programming] based on JDK's `CompletableFuture` objects and the Netty HTTP client.
+
+include::{generated-dir}/config/quarkus-amazon-iam.adoc[opts=optional, leveloffset=+1]
diff --git a/docs/src/main/asciidoc/amazon-kms.adoc b/docs/src/main/asciidoc/amazon-kms.adoc
index 4cff8c7673b6a..1cb3f0a8f37ae 100644
--- a/docs/src/main/asciidoc/amazon-kms.adoc
+++ b/docs/src/main/asciidoc/amazon-kms.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon KMS Client
 :extension-status: preview
@@ -39,9 +39,9 @@ To complete this guide, you need:
 
 The easiest way to start working with KMS is to run a local instance as a container.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
-docker run --rm --name local-kms 8011:4599 -e SERVICES=kms -e START_WEB=0 -d localstack/localstack:0.11.1
+docker run --rm --name local-kms --publish 8011:4599 -e SERVICES=kms -e START_WEB=0 -d localstack/localstack:0.11.1
 ----
 This starts a KMS instance that is accessible on port `8011`.
 
@@ -59,18 +59,18 @@ Default output format [None]:
 
 Create a KMS master key queue using AWS CLI and store in `MASTER_KEY_ARN` environment variable.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 MASTER_KEY_ARN=`aws kms create-key --profile localstack --endpoint-url=http://localhost:8011 | cut -f3`
 ----
 Generate a key data as 256-bit symmetric key (AES 256)
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 aws kms generate-data-key --key-id $MASTER_KEY_ARN --key-spec AES_256 --profile localstack --endpoint-url=http://localhost:8011
 ----
 
 Or, if you want to use your AWS account create a key using your default profile
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 MASTER_KEY_ARN=`aws kms create-key | cut -f3`
 aws kms generate-data-key --key-id $MASTER_KEY_ARN --key-spec AES_256
@@ -90,14 +90,14 @@ The solution is located in the `amazon-kms-quickstart` {quickstarts-tree-url}/am
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amazon-kms-quickstart \
     -DclassName="org.acme.kms.QuarkusKmsSyncResource" \
     -Dpath="/sync" \
-    -Dextensions="resteasy-jsonb,amazon-kms,resteasy-mutiny"
+    -Dextensions="resteasy,resteasy-jackson,amazon-kms,resteasy-mutiny"
 cd amazon-kms-quickstart
 ----
 
@@ -216,7 +216,7 @@ And the region from your AWS CLI profile will be used.
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -Dkey.arn=$MASTER_KEY_ARN -jar target/amazon-kms-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -Dkey.arn=$MASTER_KEY_ARN -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
diff --git a/docs/src/main/asciidoc/amazon-lambda-http.adoc b/docs/src/main/asciidoc/amazon-lambda-http.adoc
index b21896dc2b461..8fcf6ec8e4f9a 100644
--- a/docs/src/main/asciidoc/amazon-lambda-http.adoc
+++ b/docs/src/main/asciidoc/amazon-lambda-http.adoc
@@ -1,19 +1,24 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
-= Quarkus - Amazon Lambda with RESTEasy, Undertow, or Vert.x Web 
+= Quarkus - Amazon Lambda with RESTEasy, Undertow, or Vert.x Web
 :extension-status: preview
 
 include::./attributes.adoc[]
 
-The `quarkus-amazon-lambda-http` extension allows you to write microservices with RESTEasy (JAX-RS),
-Undertow (servlet), Vert.x Web, or link:funqy-http[Funqy HTTP] and make these microservices deployable as an Amazon Lambda
-using https://aws.amazon.com/api-gateway/[Amazon's API Gateway] and https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html[Amazon's SAM framework].
+With Quarkus you can deploy your favorite Java HTTP frameworks as Amazon Lambda's using either the https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api.html[AWS Gateway HTTP API]
+or https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-rest-api.html[AWS Gateway REST API].  This means that you can deploy your microservices written with RESTEasy (JAX-RS),
+Undertow (servlet), Vert.x Web, link:funqy-http[Funqy HTTP] or any other Quarkus HTTP framework as an AWS Lambda.
 
 You can deploy your Lambda as a pure Java jar, or you can compile your project to a native image and deploy that for a smaller
-memory footprint and startup time.
+memory footprint and startup time.  Our integration also generates SAM deployment files that can be consumed by https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html[Amazon's SAM framework].
+
+Quarkus has a different extension for each Gateway API.  The HTTP Gateway API is implemented within the `quarkus-amazon-lambda-http` extension.
+The REST Gateway API is implemented within the `quarkus-amazon-lambda-rest` extension.  If you are confused on which Gateway product to use,
+Amazon has a https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html[great guide] to help you navigate this decision.
+
 
 include::./status-include.adoc[]
 
@@ -41,8 +46,8 @@ for installing AWS SAM CLI.
 
 Create the Quarkus AWS Lambda maven project using our Maven Archetype.
 
-
-[source, subs=attributes+]
+If you want to use the AWS Gateway HTTP API, generate your project with this script:
+[source,bash,subs=attributes+]
 ----
 mvn archetype:generate \
        -DarchetypeGroupId=io.quarkus \
@@ -50,11 +55,21 @@ mvn archetype:generate \
        -DarchetypeVersion={quarkus-version}
 ----
 
+If you want to use the AWS Gateway REST API, generate your project with this script:
+[source,bash,subs=attributes+]
+----
+mvn archetype:generate \
+       -DarchetypeGroupId=io.quarkus \
+       -DarchetypeArtifactId=quarkus-amazon-lambda-rest-archetype \
+       -DarchetypeVersion={quarkus-version}
+----
+
+
 == Build and Deploy
 
 Build the project using maven.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean install
 ----
@@ -66,7 +81,7 @@ available with this extension.
 If you want to build for native too, make sure you have GraalVM installed correctly and just add a `native` property
 to the build
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean install -Dnative
 ----
@@ -75,14 +90,14 @@ NOTE: If you are building on a non-Linux system, you will need to also pass in a
 Lambda requires linux binaries.  You can do this by passing this property to your Maven build:
 `-Dnative-image.docker-build=true`, or for Gradle: `--docker-build=true`.  This requires you to have docker installed locally, however.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean install -Dnative -Dnative-image.docker-build=true
 ----
 
 == Extra Build Generated Files
 
-After you run the build, there are a few extra files generated by the `quarkus-amazon-lambda` extension.  These files
+After you run the build, there are a few extra files generated by the quarkus lambda extension you are using.  These files
 are in the the build directory:  `target/` for maven, `build/` for gradle.
 
 * `function.zip` - lambda deployment file
@@ -94,7 +109,7 @@ are in the the build directory:  `target/` for maven, `build/` for gradle.
 The AWS SAM CLI allows you to run your lambda's locally on your laptop in a simulated Lambda environment.  This requires docker to be installed (see their install docs).
 After you have built your maven project, execute this command
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sam local start-api --template target/sam.jvm.yaml
 ----
@@ -107,126 +122,94 @@ http://127.0.0.1:3000/hello
 In the console you'll see startup messages from the lambda.  This particular deployment starts a JVM and loads your
 lambda as pure Java.
 
-If you want to deploy a native executable of your lambda, use a different yaml template that is provided in your
-generated project:
-
-[source, subs=attributes+]
-----
-sam local start-api --template target/sam.native.yaml
-----
 
 == Deploy to AWS
 
-There are a few steps to get your lambda running on AWS.
-
-=== Package your deployment.
-
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-sam package --template-file target/sam.jvm.yaml --output-template-file packaged.yaml --s3-bucket <YOUR_S3_BUCKET>
+sam deploy -t target/sam.jvm.yaml -g
 ----
 
-Type the simple name of your S3 bucket you created during.  If you've built a native executable, replace
-`sam.jvm.yaml` with `sam.native.yaml`.
+Answer all the questions and your lambda will be deployed and the necessary hooks to the API Gateway will be set up. If
+everything deploys successfully, the root URL of your microservice will be output to the console.  Something like this:
 
-=== Deploy your package
-
-[source, subs=attributes+]
 ----
-sam deploy --template-file packaged.yaml --capabilities CAPABILITY_IAM --stack-name <YOUR_STACK_NAME>
+Key                 LambdaHttpApi
+Description         URL for application
+Value               https://234asdf234as.execute-api.us-east-1.amazonaws.com/
 ----
 
-The stack name can be anything you want.
-
-=== Debugging AWS Deployment Problems
+The `Value` attribute is the root URL for your lambda. Copy it to your browser and add `hello` at the end.
 
-If `sam deploy`, run the `describe-stack-events` command
-to get information about your deployment and what happened.
+[NOTE]
+Responses for binary types will be automatically encoded with base64.  This is different than the behavior using
+`quarkus:dev` which will return the raw bytes.  Amazon's API has additional restrictions requiring the base64 encoding.
+In general, client code will automatically handle this encoding but in certain custom situations, you should be aware
+you may need to manually manage that encoding.
 
-[source, subs=attributes+]
-----
-aws cloudformation describe-stack-events --stack-name <YOUR_STACK_NAME>
-----
+== Deploying a native executable
 
-One common issue that you may run across is that your S3 bucket has to be in the same region as Amazon Lambda.
-Look for this error from `describe-stack-events` output:
+To deploy a native executable, you must build it with Graal.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-Error occurred while GetObject. S3 Error Code: AuthorizationHeaderMalformed. S3 Error Message:
-The authorization header is malformed; the region 'us-east-1' is wrong; expecting 'us-east-2'
-(Service: AWSLambdaInternal; Status Code: 400; Error Code: InvalidParameterValueException;
-Request ID: aefcf978-ad2a-4b53-9ffe-cea3fcd0f868)
+./mvnw clean install -Dnative
 ----
 
-The above error is stating that my S3 bucket should be in `us-east-2`, not `us-east-1`.
-To fix this error you'll need to create an S3 bucket in that region and redo steps 1 and 2 from above.
-
-Another annoying this is that if there is an error in deployment, you also have to completely delete
-it before trying to deploy again:
+You can then test the executable locally with sam local
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-aws cloudformation delete-stack --stack-name <YOUR_STACK_NAME>
+sam local start-api --template target/sam.native.yaml
 ----
 
-== Execute your REST Lambda on AWS
-
-To get the root URL for your service, type the following command and see the following output:
-
-[source, subs=attributes+]
+To deploy to AWS Lambda:
+[source,bash,subs=attributes+]
 ----
-aws cloudformation describe-stacks --stack-name <YOUR_STACK_NAME>
+sam deploy -t target/sam.native.yaml -g
 ----
 
-It should give you something like the following output:
-[source, subs=attributes+]
-----
-{
-    "Stacks": [
-        {
-            "StackId": "arn:aws:cloudformation:us-east-1:502833056128:stack/QuarkusNativeRestExample2/b35b0200-f685-11e9-aaa0-0e8cd4caae34",
-            "DriftInformation": {
-                "StackDriftStatus": "NOT_CHECKED"
-            },
-            "Description": "AWS Serverless Quarkus HTTP - io.demo::rest-example",
-            "Tags": [],
-            "Outputs": [
-                {
-                    "Description": "URL for application",
-                    "ExportName": "RestExampleNativeApi",
-                    "OutputKey": "RestExampleNativeApi",
-                    "OutputValue": "https://234234234.execute-api.us-east-1.amazonaws.com/Prod/"
-                }
-            ],
-----
-
-The `OutputValue` attribute is the root URL for your lambda. Copy it to your browser and add `hello` at the end.
-
-[NOTE]
-Responses for binary types will be automatically encoded with base64.  This is different than the behavior using
-`quarkus:dev` which will return the raw bytes.  Amazon's API has additional restrictions requiring the base64 encoding.
-In general, client code will automatically handle this encoding but in certain custom situations, you should be aware
-you may need to manually manage that encoding.
-
 == Examine the POM
 
 There is nothing special about the POM other than the inclusion of the `quarkus-amazon-lambda-http` extension
-as a dependencies.  The extension automatically generates everything you might need for your lambda deployment.
-
-NOTE: In previous versions of this extension you had to set up your pom or gradle
-to zip up your executable for native deployments, but this is not the case anymore.
+(if you are deploying an AWS Gateway HTTP API) or the `quarkus-amazon-lambda-rest` extension (if you are deploy an AWS Gateway REST API).
+These extensions automatically generate everything you might need for your lambda deployment.
 
-Also, at least in the generated maven archetype `pom.xml`, the `quarkus-resteasy`, `quarkus-vertx-web`, and `quarkus-underdow`
+Also, at least in the generated maven archetype `pom.xml`, the `quarkus-resteasy`, `quarkus-vertx-web`, and `quarkus-undertow`
 dependencies are all optional.  Pick which http framework(s) you want to use (JAX-RS, Vertx Web, and/or Servlet) and
 remove the other dependencies to shrink your deployment.
 
 === Examine sam.yaml
 
-The `sam.yaml` syntax is beyond the scope of this document.  There's a couple of things to note though that are particular
-to the `quarkus-amazon-lambda-http` extension.
+The `sam.yaml` syntax is beyond the scope of this document.  There's a couple of things that must be highlighted just in case you are
+going to craft your own custom `sam.yaml` deployment files.
+
+The first thing to note is that for pure Java lambda deployments require a specific handler class.
+Do not change the Lambda handler name.
+
+[source, subs=attributes+]
+----
+     Properties:
+        Handler: io.quarkus.amazon.lambda.runtime.QuarkusStreamHandler::handleRequest
+        Runtime: java11
+----
+
+This handler is a bridge between the lambda runtime and the Quarkus HTTP framework you are using (JAX-RS, Servlet, etc.)
+
+If you want to go native, there's an environment variable that must be set for native GraalVM deployments.  If you look at `sam.native.yaml`
+you'll see this:
+
+[source, subs=attributes+]
+----
+        Environment:
+          Variables:
+            DISABLE_SIGNAL_HANDLERS: true
+----
+
+This environment variable resolves some incompatibilities between Quarkus and the Amazon Lambda Custom Runtime environment.
 
-Amazon's API Gateway assumes that HTTP response bodies are text unless you explicitly tell it which media types are
+Finally, there is one specific thing for AWS Gateway REST API deployments.
+That API assumes that HTTP response bodies are text unless you explicitly tell it which media types are
 binary through configuration.  To make things easier, the Quarkus extension forces a binary (base 64) encoding of all
 HTTP response messages and the `sam.yaml` file must configure the API Gateway to assume all media types are binary:
 
@@ -239,29 +222,54 @@ HTTP response messages and the `sam.yaml` file must configure the API Gateway to
         - "*/*"
 ----
 
-Another thing to note is that for pure Java lambda deployments, do not change the Lambda handler name.
+== Injectable AWS Context Variables
 
-[source, subs=attributes+]
-----
-     Properties:
-        Handler: io.quarkus.amazon.lambda.runtime.QuarkusStreamHandler::handleRequest
-        Runtime: java8
+If you are using Resteasy and JAX-RS, you can inject various AWS Context variables into your JAX-RS resource classes
+using the JAX-RS `@Context` annotation.
+
+For the AWS HTTP API you can inject the AWS variables `com.amazonaws.services.lambda.runtime.Context` and
+`com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent`.  Here is an example:
+
+[source, java]
 ----
+import javax.ws.rs.core.Context;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
 
-This particular handler handles all the intricacies of integrating with the Quarkus runtime.  So you must use that
-handler.
 
-Finally, there's an environment variable that must be set for native GraalVM deployments.  If you look at `sam.native.yaml`
-you'll see this:
+@Path("/myresource")
+public class MyResource {
+    @GET
+    public String ctx(@Context com.amazonaws.services.lambda.runtime.Context ctx) { }
 
-[source, subs=attributes+]
+    @GET
+    public String event(@Context APIGatewayV2HTTPEvent event) { }
+
+    @GET
+    public String requestContext(@Context APIGatewayV2HTTPEvent.RequestContext req) { }
+
+
+}
 ----
-        Environment:
-          Variables:
-            DISABLE_SIGNAL_HANDLERS: true
+
+For the AWS REST API you can inject the AWS variables `com.amazonaws.services.lambda.runtime.Context` and
+`io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext`.  Here is an example:
+
+[source, java]
 ----
+import javax.ws.rs.core.Context;
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext;
 
-This environment variable resolves some incompatibilities between Quarkus and the Amazon Lambda Custom Runtime environment.
+
+@Path("/myresource")
+public class MyResource {
+    @GET
+    public String ctx(@Context com.amazonaws.services.lambda.runtime.Context ctx) { }
+
+    @GET
+    public String req(@Context AwsProxyRequestContext req) { }
+
+}
+----
 
 == Tracing with AWS XRay and GraalVM
 
diff --git a/docs/src/main/asciidoc/amazon-lambda.adoc b/docs/src/main/asciidoc/amazon-lambda.adoc
index e7559206ba9e7..aad26db36ed2e 100644
--- a/docs/src/main/asciidoc/amazon-lambda.adoc
+++ b/docs/src/main/asciidoc/amazon-lambda.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon Lambda
 :extension-status: preview
@@ -43,7 +43,7 @@ for installing AWS CLI.
 Create the Quarkus AWS Lambda maven project using our Maven Archetype.
 
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn archetype:generate \
        -DarchetypeGroupId=io.quarkus \
@@ -79,7 +79,7 @@ project and use configuration or an environment variable to pick the handler you
 The generated project has three lambdas within it.  Two that implement the `RequestHandler<?, ?>` interface, and one that implements the `RequestStreamHandler` interface. One that is used and two that are unused.  If you open up
 `src/main/resources/application.properties` you'll see this:
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 quarkus.lambda.handler=test
 ----
@@ -89,7 +89,7 @@ with an environment variable too.
 
 If you look at the three generated handler classes in the project, you'll see that they are `@Named` differently.
 
-[source, subs=attributes+]
+[source,java,subs=attributes+]
 ----
 @Named("test")
 public class TestLambda implements RequestHandler<InputObject, OutputObject> {
@@ -116,7 +116,7 @@ create, update, delete, and invoke your lambdas for pure Java and native deploym
 
 Build the project using maven.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package
 ----
@@ -135,7 +135,7 @@ a lambda with AWS CLI.  Specifically, make sure you have created an `Execution R
 a `LAMBDA_ROLE_ARN` environment variable in your profile or console window,  Alternatively, you can edit
 the `manage.sh` script that is generated by the build and put the role value directly there:
 
-[source]
+[source,bash]
 ----
 LAMBDA_ROLE_ARN="arn:aws:iam::1234567890:role/lambda-role"
 ----
@@ -146,7 +146,7 @@ After you run the build, there are a few extra files generated by the `quarkus-a
 are in the the build directory:  `target/` for maven, `build/` for gradle.
 
 * `function.zip` - lambda deployment file
-* `manage.sh` - wrapper around aws lamba cli calls
+* `manage.sh` - wrapper around aws lambda cli calls
 * `bootstrap-example.sh` - example bootstrap script for native deployments
 * `sam.jvm.yaml` - (optional) for use with sam cli and local testing
 * `sam.native.yaml` - (optional) for use with sam cli and native local testing
@@ -166,21 +166,21 @@ A usage statement will be printed to guide you accordingly.
 NOTE: If using Gradle, the path to the binaries in the `manage.sh` must be changed from `target` to `build`
 
 To see the `usage` statement, and validate AWS configuration:
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh
 ----
 
 You can `create` your function using the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh create
 ----
 
 or if you do not have `LAMBDA_ROLE_ARN` already defined in this shell:
 
-[source]
+[source,bash]
 ----
 LAMBDA_ROLE_ARN="arn:aws:iam::1234567890:role/lambda-role" sh target/manage.sh create
 ----
@@ -191,13 +191,13 @@ handler bootstraps Quarkus and wraps your actual handler so that injection can b
 If there are any problems creating the function, you must delete it with the `delete` function before re-running
 the `create` command.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh delete
 ----
 
 Commands may also be stacked:
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh delete create
 ----
@@ -206,7 +206,7 @@ sh target/manage.sh delete create
 
 Use the `invoke` command to invoke your function.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh invoke
 ----
@@ -216,14 +216,14 @@ in the root directory of the project.
 
 The lambda can also be invoked locally with the SAM CLI like this:
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.jvm.yaml --event payload.json
 ----
 
 If you are working with your native image build, simply replace the template name with the native version:
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.native.yaml --event payload.json
 ----
@@ -233,7 +233,7 @@ sam local invoke --template target/sam.native.yaml --event payload.json
 You can update the Java code as you see fit.  Once you've rebuilt, you can redeploy your lambda by executing the
 `update` command.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh update
 ----
@@ -245,13 +245,13 @@ code to a native executable.  Just make sure to rebuild your project with the `-
 
 For Linux hosts execute:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn package -Pnative
 ----
 
 or, if using Gradle:
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./gradlew build -Dquarkus.package.type=native
 ----
@@ -260,13 +260,13 @@ NOTE: If you are building on a non-Linux system, you will need to also pass in a
 Lambda requires linux binaries.  You can do this by passing this property to your Maven build:
 `-Dnative-image.docker-build=true`, or for Gradle: `--docker-build=true`.  This requires you to have docker installed locally, however.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean install -Pnative -Dnative-image.docker-build=true
 ----
 
 or, if using Gradle:
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
 ----
@@ -278,7 +278,7 @@ Custom (Provided) Runtime.
 The instructions here are exactly as above with one change:  you'll need to add `native` as the first parameter to the
 `manage.sh` script:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh native create
 ----
@@ -293,7 +293,7 @@ to create, delete, and update your lambdas.
 One thing to note about the create command for native is that the `aws lambda create-function`
 call must set a specific environment variable:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 --environment 'Variables={DISABLE_SIGNAL_HANDLERS=true}'
 ----
@@ -315,7 +315,7 @@ for your lambda deployment.
 
 Example Gradle dependencies:
 
-[source, groovy]
+[source,groovy]
 ----
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
@@ -340,7 +340,7 @@ The test replicates the execution environment, for the function that is selected
 
 To use the integration tests in your project there is a required property, in `src/test/resources/application.properties`. If not included, the integration tests will be in a constant loop.
 
-[source,shell]
+[source,properties]
 ----
 quarkus.lambda.enable-polling-jvm-mode=true
 ----
@@ -433,14 +433,14 @@ The `event` parameter takes any JSON file, in this case the sample `payload.json
 
 NOTE: If using Gradle, the path to the binaries in the YAML templates must be changed from `target` to `build`
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.jvm.yaml --event payload.json
 ----
 
 The native image can also be locally tested using the `sam.native.yaml` template:
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.native.yaml --event payload.json
 ----
@@ -471,7 +471,7 @@ you will need to include `quarkus-amazon-lambda-xray` as a dependency in your po
 library is not fully compatible with GraalVM so we had to do some integration work to make this work.
 
 In addition, remember to enable the AWS X-Ray tracing parameter in `manage.sh`, in the `cmd_create()` function.  This can also be set in the AWS Management Console.
-[source]
+[source,bash]
 ----
     --tracing-config Mode=Active
 ----
@@ -494,7 +494,7 @@ For further information, please consult the link:native-and-ssl[Quarkus SSL guid
 
 Open src/main/resources/application.properties and add the following line to enable SSL in your native image.
 
-[source]
+[source,properties]
 ----
 quarkus.ssl.native=true
 ----
@@ -605,7 +605,7 @@ The native executable requires some additional steps to enable client ssl that S
 To do this, first create a directory `src/main/zip.native/` with your build.  Next create a shell script file called `bootstrap`
 within `src/main/zip.native/`, like below. An example is create automatically in your build folder (target or build), called `bootstrap-example.sh`
 
-[source, shell]
+[source,bash]
 ----
 #!/usr/bin/env bash
 
@@ -618,7 +618,7 @@ Next you must copy some files from your GraalVM distribution into `src/main/zip.
 
 NOTE: GraalVM versions can have different paths for these files, and whether you using the Java 8 or 11 version. Adjust accordingly.
 
-[source, shell]
+[source,bash]
 ----
 cp $GRAALVM_HOME/lib/libsunec.so $PROJECT_DIR/src/main/zip.native/
 cp $GRAALVM_HOME/lib/security/cacerts $PROJECT_DIR/src/main/zip.native/
@@ -631,7 +631,7 @@ NOTE: If you are using a Docker image to build, then you must extract these file
 To extract the required ssl, you must start up a Docker container in the background, and attach to that container to copy the artifacts.
 
 First, let's start the GraalVM container, noting the container id output.
-[source, shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 docker run -it -d --entrypoint bash quay.io/quarkus/ubi-quarkus-native-image:{graalvm-flavor}
 
@@ -641,19 +641,19 @@ docker run -it -d --entrypoint bash quay.io/quarkus/ubi-quarkus-native-image:{gr
 
 First, libsunec.so, the C library used for the SSL implementation:
 
-[source]
+[source,bash]
 ----
-docker cp {container-id-from-above}:/opt/graalvm/jre/lib/amd64/libsunec.so src/main/zip.native/
+docker cp {container-id-from-above}:/opt/graalvm/lib/libsunec.so src/main/zip.native/
 ----
 
 Second, cacerts, the certificate store.  You may need to periodically obtain an updated copy, also.
-[source]
+[source,bash]
 ----
-docker cp {container-id-from-above}:/opt/graalvm/jre/lib/security/cacerts src/main/zip.native/
+docker cp {container-id-from-above}:/opt/graalvm/lib/security/cacerts src/main/zip.native/
 ----
 
 Your final archive will look like this:
-[source, shell]
+[source,bash]
 ----
 jar tvf target/function.zip
 
@@ -667,7 +667,7 @@ jar tvf target/function.zip
 
 To use Alexa with Quarkus native, please add the following extension.
 
-[source, xml]
+[source,xml]
 ----
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/docs/src/main/asciidoc/amazon-s3.adoc b/docs/src/main/asciidoc/amazon-s3.adoc
index 7356ec055f850..c7f313dd637ad 100644
--- a/docs/src/main/asciidoc/amazon-s3.adoc
+++ b/docs/src/main/asciidoc/amazon-s3.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon S3 Client
 
@@ -37,12 +37,15 @@ To complete this guide, you need:
 
 The easiest way to start working with S3 is to run a local instance as a container.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
-docker run -it --publish 8008:4572 -e SERVICES=s3 -e START_WEB=0 localstack/localstack
+docker run -it --publish 8008:4566 -e SERVICES=s3 -e START_WEB=0 localstack/localstack:0.11.5
 ----
 This starts a S3 instance that is accessible on port `8008`.
 
+
+NOTE: Versions of localstack newer than v0.11.5 require port `4566` instead of port `4572`. See this https://github.com/localstack/localstack/issues/2983[GitHub issue] for details on this change.
+
 Create an AWS profile for your local instance using AWS CLI:
 [source,shell,subs="verbatim,attributes"]
 ----
@@ -57,7 +60,7 @@ Default output format [None]:
 
 Create a S3 bucket using AWS CLI
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 aws s3 mb s3://quarkus.s3.quickstart --profile localstack --endpoint-url=http://localhost:8008
 ----
@@ -77,14 +80,14 @@ The solution is located in the `amazon-s3-quickstart` {quickstarts-tree-url}/ama
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amazon-s3-quickstart \
     -DclassName="org.acme.s3.S3SyncClientResource" \
     -Dpath="/s3" \
-    -Dextensions="resteasy-jsonb,amazon-s3"
+    -Dextensions="resteasy,resteasy-jackson,amazon-s3"
 cd amazon-s3-quickstart
 ----
 
@@ -96,11 +99,13 @@ Then, we'll add the following dependency to support `multipart/form-data` reques
 [source,xml]
 ----
 <dependency>
-    <groupId>org.jboss.resteasy</groupId>
-    <artifactId>resteasy-multipart-provider</artifactId>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-resteasy-multipart</artifactId>
 </dependency>
 ----
 
+NOTE: The default setting for `quarkus.http.limits.max-body-size` is 10240K. This may limit your ability to upload multipart files larger than the default. If you want to upload larger files, you will need to set this limit explicitly.
+
 == Setting up the model
 
 In this example, we will create an application to manage a list of files. The example application will demonstrate the two programming models supported by the extension.
@@ -329,7 +334,6 @@ public class S3SyncClientResource extends CommonResource {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public List<FileObject> listFiles() {
         ListObjectsRequest listRequest = ListObjectsRequest.builder().bucket(bucketName).build();
 
@@ -424,7 +428,7 @@ You can now interact with your REST service:
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -jar target/amazon-s3-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
@@ -509,7 +513,6 @@ public class S3AsyncClientResource extends CommonResource {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<List<FileObject>> listFiles() {
         ListObjectsRequest listRequest = ListObjectsRequest.builder()
                 .bucket(bucketName)
diff --git a/docs/src/main/asciidoc/amazon-ses.adoc b/docs/src/main/asciidoc/amazon-ses.adoc
index d3a62a6064f2c..3d99ed022ef45 100644
--- a/docs/src/main/asciidoc/amazon-ses.adoc
+++ b/docs/src/main/asciidoc/amazon-ses.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon SES Client
 :extension-status: preview
@@ -38,7 +38,7 @@ To complete this guide, you need:
 The easiest way to start working with SES is to run a local instance as a container.
 However, local instance of SES is only mocks the SES APIs without the actual email sending capabilities. You can still use it for this guide to verify an API communication or integration test purposes.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 docker run --rm --name local-ses -p 8012:4579 -e SERVICES=ses -e START_WEB=0 -d localstack/localstack:0.11.1
 ----
@@ -69,7 +69,7 @@ Going production, you'd need to get your account of the sandbox following the ht
 We assume you are going to use AWS SES sandbox for the sake of this guide. But before sending any email, you must verify sender and recipient email addresses using AWS CLI.
 You can use your personal email or any temporary email service available if you wish.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 aws ses verify-email-identity --email-address <sender@email.address>
 aws ses verify-email-identity --email-address <recipient@email.address>
@@ -79,7 +79,7 @@ Now, you need to open a mailboxes of those email addresses in order to follow co
 If you are using local SES you still need to verify email addresses, otherwise your send email in order to let local SES accepting your request.
 However, no emails to be send as it only mocks the service APIs.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 aws ses verify-email-identity --email-address <sender@email.address> --profile localstack --endpoint-url=http://localhost:8012
 aws ses verify-email-identity --email-address <recipient@email.address> --profile localstack --endpoint-url=http://localhost:8012
@@ -99,14 +99,14 @@ The solution is located in the `amazon-ses-quickstart` {quickstarts-tree-url}/am
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amazon-ses-quickstart \
     -DclassName="org.acme.ses.QuarkusSesSyncResource" \
     -Dpath="/sync" \
-    -Dextensions="resteasy-jsonb,amazon-ses,resteasy-mutiny"
+    -Dextensions="resteasy,resteasy-jackson,amazon-ses,resteasy-mutiny"
 cd amazon-ses-quickstart
 ----
 
@@ -208,7 +208,7 @@ And the region from your AWS CLI profile will be used.
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -jar target/amazon-ses-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
diff --git a/docs/src/main/asciidoc/amazon-sns.adoc b/docs/src/main/asciidoc/amazon-sns.adoc
index 5f1e9e03bf37b..c4bfbd6931c7a 100644
--- a/docs/src/main/asciidoc/amazon-sns.adoc
+++ b/docs/src/main/asciidoc/amazon-sns.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon SNS Client
 :extension-status: preview
@@ -41,7 +41,7 @@ To complete this guide, you need:
 
 The easiest way to start working with SNS is to run a local instance as a container.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 docker run -it --publish 8009:4575 -e SERVICES=sns -e START_WEB=0 localstack/localstack:0.11.1
 ----
@@ -61,13 +61,13 @@ Default output format [None]:
 
 Create a SNS topic using AWS CLI and store in `TOPIC_ARN` environment variable
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 TOPIC_ARN=`aws sns create-topic --name=QuarksCollider --profile localstack --endpoint-url=http://localhost:8009`
 ----
 
 If you want to run the demo using SNS on your AWS account, you can create a topic using AWS default profile
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 TOPIC_ARN=`aws sns create-topic --name=QuarksCollider`
 ----
@@ -87,14 +87,14 @@ The solution is located in the `amazon-sns-quickstart` {quickstarts-tree-url}/am
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amazon-sns-quickstart \
     -DclassName="org.acme.sns.QuarksCannonSyncResource" \
     -Dpath="/sync-cannon" \
-    -Dextensions="resteasy-jsonb,amazon-sns,resteasy-mutiny"
+    -Dextensions="resteasy,resteasy-jackson,amazon-sns,resteasy-mutiny"
 cd amazon-sns-quickstart
 ----
 
@@ -646,7 +646,7 @@ include::./amazon-credentials.adoc[]
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -Dtopic.arn=$TOPIC_ARN -jar target/amazon-sns-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -Dtopic.arn=$TOPIC_ARN -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
diff --git a/docs/src/main/asciidoc/amazon-sqs.adoc b/docs/src/main/asciidoc/amazon-sqs.adoc
index 3c2c8f295f2c0..2be94580abc44 100644
--- a/docs/src/main/asciidoc/amazon-sqs.adoc
+++ b/docs/src/main/asciidoc/amazon-sqs.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Amazon SQS Client
 :extension-status: preview
@@ -14,7 +14,7 @@ services to be available.
 SQS offers two types of message queues. Standard queues offer maximum throughput, best-effort ordering and at-least-once delivery.
 SQS FIFO queues are designed to guarantee that messages are processes exactly once, on the exact order that they were sent.
 
-You can find more information about SQS at https://aws.amazon.com/sws/[the Amazon SQS website].
+You can find more information about SQS at https://aws.amazon.com/sqs/[the Amazon SQS website].
 
 NOTE: The SQS extension is based on https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/welcome.html[AWS Java SDK 2.x].
 It's a major rewrite of the 1.x code base that offers two programming models (Blocking & Async).
@@ -42,7 +42,7 @@ To complete this guide, you need:
 
 The easiest way to start working with SQS is to run a local instance as a container.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 docker run --rm --name local-sqs -p 8010:4576 -e SERVICES=sqs -e START_WEB=0 -d localstack/localstack:0.11.1
 ----
@@ -62,13 +62,13 @@ Default output format [None]:
 
 Create a SQS queue using AWS CLI and store in `QUEUE_URL` environment variable.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 QUEUE_URL=`aws sqs create-queue --queue-name=ColliderQueue --profile localstack --endpoint-url=http://localhost:8010`
 ----
 
 Or, if you want to use your SQS queue on your AWS account create a queue using your default profile
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 QUEUE_URL=`aws sqs create-queue --queue-name=ColliderQueue`
 ----
@@ -88,14 +88,14 @@ The solution is located in the `amazon-sqs-quickstart` {quickstarts-tree-url}/am
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amazon-sqs-quickstart \
     -DclassName="org.acme.sqs.QuarksCannonSyncResource" \
     -Dpath="/sync-cannon" \
-    -Dextensions="resteasy-jsonb,amazon-sqs,resteasy-mutiny"
+    -Dextensions="resteasy,resteasy-jackson,amazon-sqs,resteasy-mutiny"
 cd amazon-sqs-quickstart
 ----
 
@@ -242,8 +242,6 @@ public class QuarksShieldSyncResource {
     static ObjectReader QUARK_READER = new ObjectMapper().readerFor(Quark.class);
 
     @GET
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     public List<Quark> receive() {
         List<Message> messages = sqs.receiveMessage(m -> m.maxNumberOfMessages(10).queueUrl(queueUrl)).messages();
 
@@ -325,7 +323,7 @@ And the region from your AWS CLI profile will be used.
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -Dqueue.url=$QUEUE_URL -jar target/amazon-sqs-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -Dqueue.url=$QUEUE_URL -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
@@ -423,8 +421,6 @@ public class QuarksShieldAsyncResource {
     static ObjectReader QUARK_READER = new ObjectMapper().readerFor(Quark.class);
 
     @GET
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<List<Quark>> receive() {
         return Uni.createFrom()
             .completionStage(sqs.receiveMessage(m -> m.maxNumberOfMessages(10).queueUrl(queueUrl)))
diff --git a/docs/src/main/asciidoc/amqp.adoc b/docs/src/main/asciidoc/amqp.adoc
index c234a5802699a..804ae4b19a49c 100644
--- a/docs/src/main/asciidoc/amqp.adoc
+++ b/docs/src/main/asciidoc/amqp.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using AMQP with Reactive Messaging
 :extension-status: preview
@@ -46,12 +46,13 @@ The solution is located in the `amqp-quickstart` {quickstarts-tree-url}/amqp-qui
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=amqp-quickstart \
-    -Dextensions="amqp"
+    -Dextensions="amqp" \
+    -DnoExamples
 cd amqp-quickstart
 ----
 
@@ -93,17 +94,17 @@ Create the `src/main/java/org/acme/amqp/PriceGenerator.java` file, with the foll
 ----
 package org.acme.amqp;
 
-import io.reactivex.Flowable;
-import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import java.time.Duration;
+import java.util.Random;
 
 import javax.enterprise.context.ApplicationScoped;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
+
+import io.smallrye.mutiny.Multi;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
 
 /**
  * A bean producing random prices every 5 seconds.
- * The prices are written to an AMQP queue (prices). The AMQP configuration is specified in the
- * application configuration.
+ * The prices are written to a AMQP queue (prices). The AMQP configuration is specified in the application configuration.
  */
 @ApplicationScoped
 public class PriceGenerator {
@@ -111,15 +112,17 @@ public class PriceGenerator {
     private Random random = new Random();
 
     @Outgoing("generated-price")                        // <1>
-    public Flowable<Integer> generate() {               // <2>
-        return Flowable.interval(5, TimeUnit.SECONDS)
+    public Multi<Integer> generate() {                  // <2>
+        return Multi.createFrom().ticks().every(Duration.ofSeconds(5))
+                .onOverflow().drop()
                 .map(tick -> random.nextInt(100));
     }
 
 }
+
 ----
 <1> Instruct Reactive Messaging to dispatch the items from returned stream to `generated-price`.
-<2> The method returns a RX Java 2 _stream_ (`Flowable`) emitting a random _price_ every 5 seconds.
+<2> The method returns a Mutiny _stream_ (`Multi`) emitting a random _price_ every 5 seconds.
 
 The method returns a _Reactive Stream_. The generated items are sent to the stream named `generated-price`.
 This stream is mapped to an AMQP queue using the `application.properties` file that we will create soon.
@@ -198,7 +201,6 @@ public class PriceResource {
         return "hello";
     }
 
-
     @GET
     @Path("/stream")
     @Produces(MediaType.SERVER_SENT_EVENTS)                     // <2>
@@ -222,7 +224,7 @@ The `channel-name` segment must match the value set in the `@Incoming` and `@Out
 * `generated-price` -> sink in which we write the prices
 * `prices` -> source in which we read the prices
 
-[source]
+[source,properties]
 ----
 # Configures the AMQP broker credentials.
 amqp-username=quarkus
@@ -286,7 +288,7 @@ Nothing spectacular here. On each received price, it updates the page.
 If you followed the instructions, you should have the AMQP broker running.
 Then, you just need to run the application using:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw quarkus:dev
 ----
@@ -299,7 +301,7 @@ NOTE: If you started the AMQP broker with docker compose, stop it using `CTRL+C`
 
 You can build the native executable with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative
 ----
diff --git a/docs/src/main/asciidoc/azure-functions-http.adoc b/docs/src/main/asciidoc/azure-functions-http.adoc
index 300fd138649f5..d5f3b3be77a6e 100644
--- a/docs/src/main/asciidoc/azure-functions-http.adoc
+++ b/docs/src/main/asciidoc/azure-functions-http.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Azure Functions (Serverless) with RESTEasy, Undertow, or Vert.x Web
 :extension-status: preview
@@ -15,6 +15,8 @@ One azure function deployment can represent any number of JAX-RS, servlet, Vert.
 
 include::./status-include.adoc[]
 
+NOTE: Only text based media types are supported at the moment as Azure Functions HTTP Trigger for Java does not support a binary format
+
 == Prerequisites
 
 To complete this guide, you need:
@@ -36,7 +38,7 @@ to Azure.
 Create the azure maven project for your Quarkus application using our Maven Archetype.
 
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn archetype:generate \
     -DarchetypeGroupId=io.quarkus \
@@ -61,7 +63,7 @@ The values above are defined as properties in the generated `pom.xml` file.
 
 If you don't login to Azure you won't be able to deploy.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 az login
 ----
@@ -72,7 +74,7 @@ The `pom.xml` you generated in the previous step pulls in the `azure-functions-m
 generates config files and a staging directory required by the `azure-functions-maven-plugin`.  Here's
 how to execute it.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean install azure-functions:deploy
 ----
diff --git a/docs/src/main/asciidoc/blaze-persistence.adoc b/docs/src/main/asciidoc/blaze-persistence.adoc
index 16473ca8d5846..f77327baf4e1c 100644
--- a/docs/src/main/asciidoc/blaze-persistence.adoc
+++ b/docs/src/main/asciidoc/blaze-persistence.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Blaze-Persistence
 
@@ -22,7 +22,7 @@ include::./platform-include.adoc[]
 
 The extension comes with default producers for `CriteriaBuilderFactory` and `EntityViewManager` that work out of the
 box given a working Hibernate ORM configuration. For customization, overriding of the default producers is possible via the
-standard mechanism as documented in the link:{quarkus-home-url}/guides/cdi-reference#default_beans[Quarkus CDI reference].
+standard mechanism as documented in the link:cdi-reference#default_beans[Quarkus CDI reference].
 This is needed if you need to set custom link:https://persistence.blazebit.com/documentation/entity-view/manual/en_US/index.html#anchor-configuration-properties[Blaze-Persistence properties].
 
 In Quarkus, you just need to:
@@ -47,6 +47,11 @@ Add the following dependencies to your project:
         <groupId>com.blazebit</groupId>
         <artifactId>blaze-persistence-integration-quarkus</artifactId>
     </dependency>
+    <dependency>
+        <groupId>com.blazebit</groupId>
+        <artifactId>blaze-persistence-integration-hibernate-5.4</artifactId>
+        <scope>runtime</scope>
+    </dependency>
 </dependencies>
 ----
 
@@ -68,7 +73,7 @@ The use in native images requires a dependency on the entity view annotation pro
 </profiles>
 ----
 
-A `CriteriaBuilderFactory` and an `EntityViewManager` will be created based on the configured `EntityManagerFactory` as provided by the link:{quarkus-home-url}/guides/hibernate-orm[Hibernate-ORM extension].
+A `CriteriaBuilderFactory` and an `EntityViewManager` will be created based on the configured `EntityManagerFactory` as provided by the link:hibernate-orm[Hibernate-ORM extension].
 
 You can then access these beans via injection:
 
@@ -87,7 +92,7 @@ public class SantaClausService {
     @Transactional <4>
     public List<GiftView> findAllGifts() {
         CriteriaBuilder<Gift> cb = cbf.create(em, Gift.class);
-        return emv.applySetting(EntityViewSetting.create(GiftView.class), cb).getResultList();
+        return evm.applySetting(EntityViewSetting.create(GiftView.class), cb).getResultList();
     }
 }
 ----
@@ -172,8 +177,6 @@ public class GiftResource {
     SantaClausService santaClausService;
 
     @POST
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     @Transactional
     public Response createGift(GiftUpdateView view) {
         entityViewManager.save(entityManager, view);
@@ -188,8 +191,6 @@ public class GiftResource {
 
     @PUT
     @Path("{id}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     @Transactional
     public GiftView updateGift(@EntityViewId("id") GiftUpdateView view) {
         evm.save(em, view);
diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc
index 404778a5438cf..680145a323e4b 100644
--- a/docs/src/main/asciidoc/building-my-first-extension.adoc
+++ b/docs/src/main/asciidoc/building-my-first-extension.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Building my first extension
 
@@ -18,7 +18,7 @@ The extension will expose a customizable HTTP endpoint which simply greets the v
 [NOTE]
 .Disclaimer
 To be sure it's extra clear you don't need an extension to add a Servlet to your application.
-This guide is a simplified example to explain the concepts of extensions development.
+This guide is a simplified example to explain the concepts of extensions development, see the link:writing-extensions[full documentation] if you need more information.
 Keep in mind it's not representative of the power of moving things to build time or simplifying the build of native images.
 
 == Prerequisites
@@ -30,15 +30,6 @@ To complete this guide, you need:
 * JDK 1.8+ installed with `JAVA_HOME` configured appropriately
 * Apache Maven {maven-version}
 
-== Solution
-
-We recommend that you follow the instructions in the next sections and create the extension step by step.
-However, you can go right to the completed example.
-
-Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
-
-The solution is located in the `getting-started-extension` {quickstarts-tree-url}/getting-started-extension[directory].
-
 == Basic Concepts
 
 First things first, we will need to start with some basic concepts.
@@ -51,7 +42,7 @@ The operation of compiling Java bytecode into a native system-specific machine c
 
 * build time vs runtime in classic Java frameworks
   ** The build time corresponds to all the actions you apply to your Java source files to convert them into something runnable (class files, jar/war, native images).
-  Usually this stage is composed by the compilation, annotation processing, bytecode generation, etc. At this point, everything is under developer's scope and control.
+  Usually this stage is composed by the compilation, annotation processing, bytecode generation, etc. At this point, everything is under the developer's scope and control.
   ** The runtime is all the actions that happen when you execute your application.
   It's obviously focused on starting your business-oriented actions but it relies on a lot of technical actions like loading libraries and configuration files, scanning the application's classpath, configuring the dependency injection, setting up your Object-Relational Mapping, instantiating your REST controllers, etc.
 
@@ -100,132 +91,174 @@ Now that everything is explained, we can start coding!
 
 Quarkus provides `create-extension` Maven Mojo to initialize your extension project.
 
-[source, shell]
+It will try to auto-detect its options:
+
+* from `quarkus` (Quarkus Core) or `quarkus/extensions` directory, it will use the 'Quarkus Core' extension layout and defaults.
+* with `-DgroupId=io.quarkiverse.[extensionId]`, it will use the 'Quarkiverse' extension layout and defaults.
+* in other cases it will use the 'Standalone' extension layout and defaults.
+* we may introduce other layout types in the future.
+
+TIP: You may call it without any parameter to use the interactive mode: `mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create-extension -N`
+
+[source,shell,subs=attributes+]
 ----
 $ mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create-extension -N \
     -DgroupId=org.acme \ #<1>
-    -DartifactId=quarkus-greeting \  #<2>
-    -Dversion=1.0-SNAPSHOT \ #<3>
-    -Dquarkus.nameBase="Greeting Extension" #<4>
-[INFO] Scanning for projects...
-[INFO] 
-[INFO] ------------------< org.apache.maven:standalone-pom >-------------------
-[INFO] Building Maven Stub Project (No POM) 1
-[INFO] --------------------------------[ pom ]---------------------------------
-[INFO] 
+    -DextensionId=greeting-extension \  #<2>
+    -DwithoutTests #<3>
+
 [INFO] --- quarkus-maven-plugin:{quarkus-version}:create-extension (default-cli) @ standalone-pom ---
+
+Detected layout type is 'standalone' #<4>
+Generated runtime artifactId is 'greeting-extension' #<5>
+
+
+applying codestarts...
+🔠 java
+🧰 maven
+🗃 quarkus-extension
+🐒 extension-base
+
+-----------
+👍 extension has been successfully generated in:
+--> /Users/ia3andy/workspace/redhat/quarkus/demo/greeting-extension
+-----------
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-[INFO] Total time:  1.233 s
-[INFO] Finished at: 2020-04-22T23:28:15+02:00
+[INFO] Total time:  1.659 s
+[INFO] Finished at: 2021-01-25T16:17:16+01:00
 [INFO] ------------------------------------------------------------------------
+
 ----
 
-<1> Project's groupId
-<2> artifactId for the runtime artifact of the extension (the deployment artifactId will be derived from the runtime artifactId by appending `-deployment`)
-<3> Project's version
-<4> Prefix for the `<name>` element values in the generated POMs
+<1> The extension groupId
+<2> The extension id (not namespaced).
+<3> Indicate that we don't want to generate any test
+<4> From a directory with no pom.xml and without any further options, the generator will automatically pick the 'standalone' extension layout
+<5> With the 'standalone' layout, the `namespaceId` is empty by default, so the computed runtime module artifactId is the `extensionId`
 
-Maven has generated a `quarkus-greeting` directory containing the extension project which consists of the parent `pom.xml`, the `runtime` and the `deployment` modules.
+Maven has generated a `greeting-extension` directory containing the extension project which consists of the parent `pom.xml`, the `runtime` and the `deployment` modules.
 
 === The parent pom.xml
 
-Your extension is a multi-module project. So let's start by checking out the parent POM at `./quarkus-greeting/pom.xml`.
+Your extension is a multi-module project. So let's start by checking out the parent POM at `./greeting-extension/pom.xml`.
 
-[source, xml]
+[source, xml, subs=attributes+]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.acme</groupId>
-    <artifactId>quarkus-greeting-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>Greeting Extension - Parent</name>
-
-    <packaging>pom</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-        <quarkus.version>{quarkus-version}</quarkus.version>
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    </properties>
-    <modules> #<1>
-        <module>deployment</module>
-        <module>runtime</module>
-    </modules>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bom-deployment</artifactId> #<2>
-                <version>${quarkus.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler-plugin.version}</version> #<3>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>greeting-extension-parent</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Greeting Extension - Parent</name>
+  <modules><!--1-->
+    <module>deployment</module>
+    <module>runtime</module>
+  </modules>
+  <properties>
+    <compiler-plugin.version>3.8.1</compiler-plugin.version><!--2-->
+    <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <quarkus.version>{quarkus-version}</quarkus.version>
+    <surefire-plugin.version>2.22.2</surefire-plugin.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency><!--3-->
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${quarkus.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin><!--4-->
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire-plugin.version}</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+              <maven.home>${maven.home}</maven.home>
+              <maven.repo>${settings.localRepository}</maven.repo>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin><!--4-->
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${failsafe-plugin.version}</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+              <maven.home>${maven.home}</maven.home>
+              <maven.repo>${settings.localRepository}</maven.repo>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler-plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
 ----
 
 <1> Your extension declares 2 sub-modules `deployment` and `runtime`.
-<2> The `quarkus-bom-deployment` aligns your dependencies with those used by Quarkus during the augmentation phase.
-<3> Quarkus requires a recent version of the Maven compiler plugin supporting the annotationProcessorPaths configuration.
+<2> Quarkus requires a recent version of the Maven compiler plugin supporting the annotationProcessorPaths configuration.
+<3> The `quarkus-bom` aligns your dependencies with those used by Quarkus during the augmentation phase.
+<4> Quarkus requires these configs to run tests properly
 
 === The Deployment module
 
-Let's have a look at the deployment's `./quarkus-greeting/deployment/pom.xml`.
+Let's have a look at the deployment's `./greeting-extension/deployment/pom.xml`.
 [source, xml]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.acme</groupId>
-        <artifactId>quarkus-greeting-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>greeting-extension-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-greeting-deployment</artifactId> <!--1-->
+    <artifactId>greeting-extension-deployment</artifactId> <!--1-->
     <name>Greeting Extension - Deployment</name>
 
     <dependencies>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId> <!--2-->
-            <version>${quarkus.version}</version>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-arc-deployment</artifactId> <!--2-->
         </dependency>
         <dependency>
             <groupId>org.acme</groupId>
-            <artifactId>quarkus-greeting</artifactId> <!--3-->
+            <artifactId>greeting-extension</artifactId> <!--3-->
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-junit5-internal</artifactId>
+          <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <annotationProcessorPaths>
@@ -245,24 +278,24 @@ Let's have a look at the deployment's `./quarkus-greeting/deployment/pom.xml`.
 
 The key points are:
 
-<1> By convention, the deployment module has the `-deployment` suffix (`greeting-deployment`).
-<2> The deployment module depends on the `quarkus-core-deployment` artifact.
+<1> By convention, the deployment module has the `-deployment` suffix (`greeting-extension-deployment`).
+<2> The deployment module depends on the `quarkus-arc-deployment` artifact.
 We will see later which dependencies are convenient to add.
 <3> The deployment module also *must* depend on the runtime module.
 <4> We add  the `quarkus-extension-processor` to the compiler annotation processors.
 
-In addition to the `pom.xml` `create-extension` also generated the `org.acme.quarkus.greeting.deployment.GreetingProcessor` class.
+In addition to the `pom.xml` `create-extension` also generated the `org.acme.greeting.extension.deployment.GreetingExtensionProcessor` class.
 
 [source, java]
 ----
-package org.acme.quarkus.greeting.deployment;
+package org.acme.greeting.extension.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 
-class GreetingProcessor {
+class GreetingExtensionProcessor {
 
-    private static final String FEATURE = "greeting";
+    private static final String FEATURE = "greeting-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
@@ -272,7 +305,7 @@ class GreetingProcessor {
 }
 ----
 
-NOTE: `FeatureBuildItem` represents a functionality provided by an extension. 
+NOTE: `FeatureBuildItem` represents a functionality provided by an extension.
 The name of the feature gets displayed in the log during application bootstrap.
 An extension should provide at most one feature.
 
@@ -282,36 +315,39 @@ In other words, you are augmenting your application to use the `greeting` extens
 
 === The Runtime module
 
-Finally `./quarkus-greeting/runtime/pom.xml`.
+Finally `./greeting-extension/runtime/pom.xml`.
 
 [source, xml]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemalocation="http://maven.apache.org/pom/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/pom/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/xmlschema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.acme</groupId>
-        <artifactId>quarkus-greeting-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>greeting-extension-parent</artifactId>
+        <version>0.0.1-snapshot</version>
     </parent>
 
-    <artifactId>quarkus-greeting</artifactId>  <!--1-->
+    <artifactId>greeting-extension</artifactId>  <!--1-->
     <name>Greeting Extension - Runtime</name>
 
     <dependencies>
+        <dependency>
+          <groupid>io.quarkus</groupid>
+          <artifactid>quarkus-arc</artifactid> <!--2-->
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>  <!--2-->
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>  <!--3-->
                 <version>${quarkus.version}</version>
                 <executions>
                     <execution>
+                        <phase>compile</phase>
                         <goals>
                             <goal>extension-descriptor</goal>
                         </goals>
@@ -330,7 +366,7 @@ Finally `./quarkus-greeting/runtime/pom.xml`.
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-extension-processor</artifactId> <!--3-->
+                            <artifactId>quarkus-extension-processor</artifactId> <!--4-->
                             <version>${quarkus.version}</version>
                         </path>
                     </annotationProcessorPaths>
@@ -343,9 +379,10 @@ Finally `./quarkus-greeting/runtime/pom.xml`.
 
 The key points are:
 
-<1> By convention, the runtime module has no suffix (`greeting`) as it is the artifact exposed to the end user.
-<2> We add  the `quarkus-bootstrap-maven-plugin` to generate the Quarkus extension descriptor included into the runtime artifact which links it with the corresponding deployment artifact.
-<3> We add  the `quarkus-extension-processor` to the compiler annotation processors.
+<1> By convention, the runtime module has no suffix (`greeting-extension`) as it is the artifact exposed to the end user.
+<2> The runtime module depends on the `quarkus-arc` artifact.
+<3> We add  the `quarkus-bootstrap-maven-plugin` to generate the Quarkus extension descriptor included into the runtime artifact which links it with the corresponding deployment artifact.
+<4> We add  the `quarkus-extension-processor` to the compiler annotation processors.
 
 == Basic version of the Sample Greeting extension
 
@@ -356,23 +393,30 @@ To do so, our extension will deploy, in the user application, a Servlet exposing
 The `runtime` module is where you develop the feature you want to propose to your users, so it's time to create our Web Servlet.
 
 To use Servlets in your applications you need to have a Servlet Container such as http://undertow.io[Undertow].
-Luckily, `quarkus-bom-deployment` imported by our parent `pom.xml` already includes the Undertow Quarkus extension.
-All we need to do is add
+Luckily, `quarkus-bom` imported by our parent `pom.xml` already includes the Undertow Quarkus extension.
+
+All we need to do is add `quarkus-undertow` as dependency to our `./greeting-extension/runtime/pom.xml`:
 [source, xml]
 ----
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-        </dependency>
-    </dependencies>
+    <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-undertow</artifactId>
+    </dependency>
+----
+
+NOTE: The dependency on `quarkus-arc` generated by the `create-extension` mojo can now be removed since
+`quarkus-undertow` already depends on it.
+
+Now we can create our Servlet `org.acme.greeting.extension.GreetingExtensionServlet` in the `runtime` module.
+
+[source,bash]
+----
+mkdir -p ./greeting-extension/runtime/src/main/java/org/acme/greeting/extension
 ----
-to our `./quarkus-greeting/runtime/pom.xml`.
 
-Now we can create our Servlet `org.acme.quarkus.greeting.GreetingServlet` in the `runtime` module.
 [source, java]
 ----
-package org.acme.quarkus.greeting;
+package org.acme.greeting.extension;
 
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -381,7 +425,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @WebServlet
-public class GreetingServlet extends HttpServlet { // <1>
+public class GreetingExtensionServlet extends HttpServlet { // <1>
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { // <2>
@@ -401,18 +445,21 @@ Thanks to basic concepts, you will describe the items to produce/consume and the
 
 The `io.quarkus.builder.item.BuildItem` concept represents object instances you will produce or consume (and at some point convert into bytecode) thanks to methods annotated with `@io.quarkus.deployment.annotations.BuildStep` which describe your extension's deployment tasks.
 
-Go back to the generated `org.acme.quarkus.greeting.deployment.GreetingProcessor` class.
+NOTE:: See link:all-builditems[the complete list of BuildItem implementations in core] for more information
+
+
+Go back to the generated `org.acme.greeting.extension.deployment.GreetingExtensionProcessor` class.
 
 [source, java]
 ----
-package org.acme.quarkus.greeting.deployment;
+package org.acme.greeting.extension.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 
-class GreetingProcessor {
+class GreetingExtensionProcessor {
 
-    private static final String FEATURE = "greeting";
+    private static final String FEATURE = "greeting-extension";
 
     @BuildStep // <1>
     FeatureBuildItem feature() {
@@ -444,39 +491,31 @@ To create your `BuildItem` you can extend:
 It's now time to declare our HTTP endpoint. To do so, we need to produce a `ServletBuildItem`.
 At this point, we are sure you understood that if the `quarkus-undertow` dependency proposes Servlet support for our `runtime` module, we will need the `quarkus-undertow-deployment` dependency in our `deployment` module to have access to the `io.quarkus.undertow.deployment.ServletBuildItem`.
 
-Update the `./quarkus-greeting/deployment/pom.xml` as follows:
-
+Let's add `quarkus-undertow-deployment` as dependency to our `./greeting-extension/deployment/pom.xml`:
 [source, xml]
 ----
-    <dependencies>
-        <dependency>
-            <groupId>org.acme</groupId>
-            <artifactId>quarkus-greeting</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-deployment</artifactId>
-        </dependency>
-    </dependencies>
+    <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-undertow-deployment</artifactId>
+    </dependency>
 ----
-NOTE: The dependency on `quarkus-core-deployment` generated by the `create-extension` mojo can now be removed since
+NOTE: The dependency on `quarkus-arc-deployment` generated by the `create-extension` mojo can now be removed since
 `quarkus-undertow-deployment` already depends on it.
 
-We can now update `org.acme.quarkus.greeting.deployment.GreetingProcessor`:
+We can now update `org.acme.greeting.extension.deployment.GreetingExtensionProcessor`:
 
 [source, java]
 ----
-package org.acme.quarkus.greeting.deployment;
+package org.acme.greeting.extension.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.acme.quarkus.greeting.GreetingServlet;
+import org.acme.greeting.extension.GreetingExtensionServlet;
 import io.quarkus.undertow.deployment.ServletBuildItem;
 
-class GreetingProcessor {
+class GreetingExtensionProcessor {
 
-    private static final String FEATURE = "greeting";
+    private static final String FEATURE = "greeting-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
@@ -485,7 +524,7 @@ class GreetingProcessor {
 
     @BuildStep
     ServletBuildItem createServlet() { // <1>
-      ServletBuildItem servletBuildItem = ServletBuildItem.builder("greeting", GreetingServlet.class.getName())
+      ServletBuildItem servletBuildItem = ServletBuildItem.builder("greeting-extension", GreetingExtensionServlet.class.getName())
         .addMapping("/greeting")
         .build(); // <2>
       return servletBuildItem;
@@ -497,106 +536,40 @@ class GreetingProcessor {
 <1> We add a `createServlet` method which returns a `ServletBuildItem` and annotate it with `@BuildStep`.
 Now, Quarkus will process this new task which will result in the bytecode generation of the Servlet registration at build time.
 
-<2> `ServletBuildItem` proposes a fluent API to instantiate a Servlet named `greeting` of type `GreetingServlet` (it's our class provided by our extension `runtime` module), and map it the `/greeting` path.
+<2> `ServletBuildItem` proposes a fluent API to instantiate a Servlet named `greeting-extension` of type `GreetingExtensionServlet` (it's our class provided by our extension `runtime` module), and map it the `/greeting` path.
 
-=== Testing the Greeting feature
+=== Testing the Greeting Extension feature
 
 When developing a Quarkus extension, you mainly want to test your feature is properly deployed in an application and works as expected.
 That's why the tests will be hosted in the `deployment` module.
 
-Let's add the testing dependencies into the  `./quarkus-greeting/deployment/pom.xml` and `maven-surefire` configuration
+Quarkus proposes facilities to test extensions via the `quarkus-junit5-internal` artifact (which should already be in the deployment pom.xml), in particular the `io.quarkus.test.QuarkusUnitTest` runner which starts an application with your extension.
+
+We will use http://rest-assured.io[RestAssured] (massively used in Quarkus) to test our HTTP endpoint.
+Let's add the `rest-assured` dependency into the  `./greeting-extension/deployment/pom.xml`.
 
 [source, xml]
 ----
-    <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.acme</groupId>
-        <artifactId>quarkus-greeting-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>quarkus-greeting-deployment</artifactId>
-    <name>Greeting Extension - Deployment</name>
-
-    <properties>
-        <maven.surefire.version>3.0.0-M4</maven.surefire.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.acme</groupId>
-            <artifactId>quarkus-greeting</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId> <!--1-->
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId> <!--2-->
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId> <!--3-->
-                <version>${maven.surefire.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
-
+    ...
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId> <!--2-->
+      <scope>test</scope>
+    </dependency>
 ----
 
-<1> Quarkus proposes facilities to test extensions via the `quarkus-junit5-internal` artifact, in particular the `io.quarkus.test.QuarkusUnitTest` runner which starts an application with your extension.
-<2> We will use http://rest-assured.io[RestAssured] (massively used in Quarkus) to test our HTTP endpoint.
-<3> In order to not fallback to JUnit 4 legacy mode you need to define a recent version of `maven-surefire` plugin.
+The `create-extension` Maven Mojo can create the test and integration-test structure (drop the `-DwithoutTests`). Here, we'll create it ourselves:
 
-Currently, the `create-extension` Maven Mojo does not create the test structure. We'll create it ourselves:
-
-[source, shell]
+[source,bash]
 ----
-mkdir -p ./quarkus-greeting/deployment/src/test/java/org/acme/quarkus/greeting/deployment
+mkdir -p ./greeting-extension/deployment/src/test/java/org/acme/greeting/extension/deployment
 ----
 
-To start testing your extension, create the following `org.acme.quarkus.greeting.deployment.GreetingTest` test class:
+To start testing your extension, create the following `org.acme.greeting.extension.deployment.GreetingExtensionTest` test class:
 
 [source, java]
 ----
-package org.acme.quarkus.greeting.deployment;
+package org.acme.greeting.extension.deployment;
 
 import io.quarkus.test.QuarkusUnitTest;
 import io.restassured.RestAssured;
@@ -607,7 +580,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.hamcrest.Matchers.containsString;
 
-public class GreetingTest {
+public class GreetingExtensionTest {
 
   @RegisterExtension
   static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -624,11 +597,11 @@ public class GreetingTest {
 <1> We register a Junit Extension which will start a Quarkus application with the Greeting extension.
 <2> We verify the application has a `greeting` endpoint responding to a HTTP GET request with a OK status (200) and a plain text body containing `Hello`
 
-Time to test!
+Time to test and install to our local maven repository!
 
-[source, shell]
+[source,shell,subs=attributes+]
 ----
-$ mvn clean test
+$ mvn clean install
 [INFO] Scanning for projects...
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Build Order:
@@ -637,35 +610,41 @@ $ mvn clean test
 [INFO] Greeting Extension - Runtime                                       [jar]
 [INFO] Greeting Extension - Deployment                                    [jar]
 [INFO]
+[INFO] -----------------< org.acme:greeting-extension-parent >-----------------
+[INFO] Building Greeting Extension - Parent 1.0.0-SNAPSHOT                [1/3]
+[INFO] --------------------------------[ pom ]---------------------------------
 ...
-[INFO] --- maven-surefire-plugin:3.0.0-M4:test (default-test) @ quarkus-greeting-deployment ---
-[INFO] 
 [INFO] -------------------------------------------------------
 [INFO]  T E S T S
 [INFO] -------------------------------------------------------
-[INFO] Running org.acme.quarkus.greeting.deployment.GreetingTest
-2020-04-23 13:55:44,612 INFO  [io.quarkus] (main) Quarkus {quarkus-version} started in 0.395s. Listening on: http://0.0.0.0:8081
-2020-04-23 13:55:44,614 INFO  [io.quarkus] (main) Profile test activated. 
-2020-04-23 13:55:44,614 INFO  [io.quarkus] (main) Installed features: [cdi, quarkus-greeting, servlet]
-2020-04-23 13:55:45,876 INFO  [io.quarkus] (main) Quarkus stopped in 0.025s
-[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.609 s - in org.acme.quarkus.greeting.deployment.GreetingTest
-[INFO] 
+[INFO] Running org.acme.greeting.extension.deployment.GreetingExtensionTest
+2021-01-27 10:24:42,506 INFO  [io.quarkus] (main) Quarkus {quarkus-version} on JVM started in 0.470s. Listening on: http://localhost:8081
+2021-01-27 10:24:42,508 INFO  [io.quarkus] (main) Profile test activated.
+2021-01-27 10:24:42,508 INFO  [io.quarkus] (main) Installed features: [cdi, greeting-extension, servlet]
+2021-01-27 10:24:43,764 INFO  [io.quarkus] (main) Quarkus stopped in 0.018s
+[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.799 s - in org.acme.greeting.extension.deployment.GreetingExtensionTest
+[INFO]
 [INFO] Results:
-[INFO] 
+[INFO]
 [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
 [INFO]
+[INFO]
+[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ greeting-extension-deployment ---
+[INFO] Building jar: /Users/ia3andy/workspace/redhat/quarkus/demo/greeting-extension/deployment/target/greeting-extension-deployment-1.0.0-SNAPSHOT.jar
+[INFO]
+[INFO] --- maven-install-plugin:2.4:install (default-install) @ greeting-extension-deployment ---
+...
 [INFO] ------------------------------------------------------------------------
-[INFO] Reactor Summary for getting-started-extension 1.0-SNAPSHOT:
+[INFO] Reactor Summary for Greeting Extension - Parent 1.0.0-SNAPSHOT:
 [INFO]
-[INFO] getting-started-extension .......................... SUCCESS [  0.076 s]
-[INFO] Greeting Extension - Parent ........................ SUCCESS [  0.002 s]
-[INFO] Greeting Extension - Runtime ....................... SUCCESS [  1.467 s]
-[INFO] Greeting Extension - Deployment .................... SUCCESS [  4.099 s]
+[INFO] Greeting Extension - Parent ........................ SUCCESS [  0.303 s]
+[INFO] Greeting Extension - Runtime ....................... SUCCESS [  3.345 s]
+[INFO] Greeting Extension - Deployment .................... SUCCESS [  7.365 s]
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-[INFO] Total time:  5.745 s
-[INFO] Finished at: 2020-01-28T22:40:56+01:00
+[INFO] Total time:  11.246 s
+[INFO] Finished at: 2021-01-27T10:24:44+01:00
 [INFO] ------------------------------------------------------------------------
 ----
 
@@ -680,14 +659,14 @@ Edsger W. Dijkstra
 ==== Debugging your application build
 
 Since your extension deployment is made during the application build, this process is triggered by your build tool.
-That means if your want to debug this phase you need to launch your build tool with the remote debug mode switched one.
+That means if you want to debug this phase you need to launch your build tool with the remote debug mode switched one.
 
 ===== Maven
 
 You can activate Maven remote debugging by using `mvnDebug`.
 You can launch your application with the following command line:
 
-[source, shell]
+[source,bash]
 ----
 mvnDebug clean compile quarkus:dev
 ----
@@ -700,12 +679,12 @@ Now, you can run your IDE `Remote` configuration to attach it to `localhost:8000
 You can activate Gradle remote debugging by using the flags `org.gradle.debug=true` or `org.gradle.daemon.debug=true` in daemon mode.
 You can launch your application with the following command line:
 
-[source, shell]
+[source,bash]
 ----
 ./gradlew quarkusDev -Dorg.gradle.daemon.debug=true
 ----
 
-By default, Maven will wait for a connection on `localhost:5005`.
+By default, Gradle will wait for a connection on `localhost:5005`.
 Now, you can run your IDE `Remote` configuration to attach it to `localhost:5005`.
 
 
@@ -714,82 +693,73 @@ Now, you can run your IDE `Remote` configuration to attach it to `localhost:5005
 We have seen together how to test your extension and sometimes things don't go so well and you want to debug your tests.
 Same principle here, the trick is to enable the Maven Surefire remote debugging in order to attach an IDE `Remote` configuration.
 
-[source, shell]
+[source,shell]
 ----
-$ cd ./greeting
-$ mvn clean test -Dmaven.surefire.debug
+cd ./greeting-extension
+mvn clean test -Dmaven.surefire.debug
 ----
 
 By default, Maven will wait for a connection on `localhost:5005`.
 
-=== Extension publication
+=== Time to use your new extension
 
-Now that you just finish to build your first extension you should be eager to use it in a Quarkus application! 
+Now that you just finished building your first extension you should be eager to use it in a Quarkus application!
 
 *Classic Maven publication*
 
-Because your extension produces traditional JARs, the easiest way to share your extension is to publish it to a Maven repository.
-Once published you can simply declare it with your project dependencies. Let's demonstrate that by creating a simple Quarkus application
+If not already done in the previous step, you should install the `greeting-extension` in your local repository:
+[source,shell]
+----
+cd ./greeting-extension
+mvn clean install
+----
 
-[source, schell]
+Then from another directory, use our tooling to create a new `greeting-app` Quarkus application with your new extension:
+[source,bash, subs=attributes+]
 ----
-$mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
      -DprojectGroupId=org.acme \
      -DprojectArtifactId=greeting-app \
-     -DprojectVersion=1.0-SNAPSHOT \
-     -DclassName=HelloResource
+     -Dextensions="org.acme:greeting-extension:1.0.0-SNAPSHOT" \
+     -DnoExamples
 ----
 
-`cd` into `greeting-app` and add the dependency on `quarkus-greeting` extension we created above.
+`cd` into `greeting-app`.
 
-NOTE: `quarkus-greeting` extension has to be installed in the local Maven repository to be usable in the application. 
+NOTE: The `greeting-extension` extension has to be installed in the local Maven repository to be usable in the application.
 
-[source, xml]
-----
-    <dependencies>
-        <dependency>
-            <groupId>org.acme</groupId>
-            <artifactId>quarkus-greeting</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <!-- the rest of the application dependencies -->
-----
 
-Run the application and notice the `Install Features` list contains the `quarkus-greeting` extension.
+Run the application and notice the `Installed Features` list contains the `greeting-extension` extension.
 
-[source, shell]
+[source,shell,subs=attributes+]
 ----
 $ mvn clean compile quarkus:dev
 [INFO] Scanning for projects...
 [INFO]
-[INFO] ---------------------< org.acme:code-with-quarkus >---------------------
-[INFO] Building code-with-quarkus 1.0.0-SNAPSHOT
+[INFO] -----------------------< org.acme:greeting-app >------------------------
+[INFO] Building greeting-app 1.0.0-SNAPSHOT
 [INFO] --------------------------------[ jar ]---------------------------------
 [INFO]
-[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ code-with-quarkus ---
-[INFO] Deleting /tmp/code-with-quarkus/target
+[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ greeting-app ---
+[INFO]
+[INFO] --- quarkus-maven-plugin:{quarkus-version}:generate-code (default) @ greeting-app ---
 [INFO]
-[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ code-with-quarkus ---
+[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ greeting-app ---
 [INFO] Using 'UTF-8' encoding to copy filtered resources.
-[INFO] Copying 2 resources
+[INFO] Copying 1 resource
 [INFO]
-[INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ code-with-quarkus ---
-[INFO] Changes detected - recompiling the module!
-[INFO] Compiling 1 source file to /tmp/code-with-quarkus/target/classes
+[INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ greeting-app ---
+[INFO] Nothing to compile - all classes are up to date
 [INFO]
-[INFO] --- quarkus-maven-plugin:{quarkus-version}:dev (default-cli) @ code-with-quarkus ---
+[INFO] --- quarkus-maven-plugin:{quarkus-version}:dev (default-cli) @ greeting-app ---
 Listening for transport dt_socket at address: 5005
-__  ____  __  _____   ___  __ ____  ______ 
- --/ __ \/ / / / _ | / _ \/ //_/ / / / __/ 
- -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \   
---\___\_\____/_/ |_/_/|_/_/|_|\____/___/   
-2020-04-23 14:17:36,137 INFO  [io.quarkus] (Quarkus Main Thread) greeting-app 1.0-SNAPSHOT (powered by Quarkus {quarkus-version}) started in 0.985s. Listening on: http://0.0.0.0:8080
-2020-04-23 14:17:36,140 INFO  [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated.
-2020-04-23 14:17:36,140 INFO  [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, quarkus-greeting, resteasy, servlet]
+__  ____  __  _____   ___  __ ____  ______
+ --/ __ \/ / / / _ | / _ \/ //_/ / / / __/
+ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \
+--\___\_\____/_/ |_/_/|_/_/|_|\____/___/
+2021-01-27 10:28:07,240 INFO  [io.quarkus] (Quarkus Main Thread) greeting-app 1.0.0-SNAPSHOT on JVM (powered by Quarkus {quarkus-version}) started in 0.531s. Listening on: http://localhost:8080
+2021-01-27 10:28:07,242 INFO  [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated.
+2021-01-27 10:28:07,243 INFO  [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, greeting-extension, servlet]
 ----
 
 From an extension developer standpoint the Maven publication strategy is very handy and fast but Quarkus wants to go one step further by also ensuring a reliability of the ecosystem for the people who will use the extensions.
@@ -811,12 +781,30 @@ If the extension solves a general problem, it is very handy for Quarkus users to
 But this comes with some responsibility for you, keeping it up to date with Quarkus minor releases (every month or so at the moment).
 When in doubt, have a conversation with the community in the https://groups.google.com/forum/#!forum/quarkus-dev[Quarkus Google Group]. We can make a collective decision.
 
-[NOTE]
-As for now, the process to propose a new extension is not defined yet.
-Your best chance is to present your extension on the https://groups.google.com/forum/#!forum/quarkus-dev[Quarkus Google Group] and wait for an official invitation to join the Quarkus Platform.
+If you want to contribute a new extension, we strongly suggest you to host it in the Quarkiverse Hub.
+
+*Quarkiverse Hub*
+
+link:https://github.com/quarkiverse[Quarkiverse Hub] is the GitHub organization that provides repository hosting (including build, CI and release publishing setup) for Quarkus extension projects contributed by the community.
+
+You can get started by creating an link:https://github.com/quarkusio/quarkus/issues/new/choose[Extension Request] issue (check first if one wasn't already submitted link:https://github.com/quarkusio/quarkus/labels/kind%2Fextension-proposal[here]) and asking to lead it.
+
+We'll take care of provisioning a new repository and set it up to:
+
+- Be supported by our tooling;
+- Publish the documentation you produce for your extension to the Quarkiverse website;
+- Configure your extension to use the link:https://github.com/quarkusio/quarkus-ecosystem-ci#quarkus-ecosystem-ci[Quarkus Ecosystem CI] to build against the latest Quarkus Core changes;
+- Give you the freedom to manage the project and release to Maven Central as you like.
+
+For more information, check link:https://github.com/quarkiverse/quarkiverse/wiki[the Quarkiverse Wiki] and link:https://quarkus.io/blog/quarkiverse/[this blog post].
 
 == Conclusion
 
 Creating new extensions may appear to be an intricate task at first but once you understood the Quarkus game-changer paradigm (build time vs runtime) the structure of an extension makes perfectly sense.
 
 As usual, along the path Quarkus simplifies things under the hood (Maven Mojo, bytecode generation or testing) to make it pleasant to develop new features.
+
+== Further reading
+
+- link:writing-extensions[Writing your own extension] for the full documentation.
+- link:dev-console[Quarkus DEV Console] to learn how to support the DEV Console in your extension
diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc
index 76ea137e93a3a..9d550738ae7c5 100644
--- a/docs/src/main/asciidoc/building-native-image.adoc
+++ b/docs/src/main/asciidoc/building-native-image.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Building a Native Executable
 
@@ -11,18 +11,74 @@ This guide covers:
 
 * Compiling the application to a native executable
 * Packaging the native executable in a container
+* Debugging native executable
 
 This guide takes as input the application developed in the link:getting-started[Getting Started Guide].
 
-== Prerequisites
+== GraalVM
+
+Building a native executable requires using a distribution of GraalVM.
+There are three distributions:
+Oracle GraalVM Community Edition (CE), Oracle GraalVM Enterprise Edition (EE) and Mandrel.
+The differences between the Oracle and Mandrel distributions are as follows:
+
+* Mandrel is a downstream distribution of the Oracle GraalVM CE.
+Mandrel's main goal is to provide a way to build native executables specifically designed to support Quarkus.
+
+* Mandrel releases are built from a code base derived from the upstream Oracle GraalVM CE code base,
+with only minor changes but some significant exclusions that are not necessary for Quarkus native apps.
+They support the same capabilities to build native executables as Oracle GraalVM CE,
+with no significant changes to functionality.
+Notably, they do not include support for polyglot programming.
+The reason for these exclusions is to provide a better level of support for the majority of Quarkus users.
+These exclusions also mean Mandrel offers a considerable reduction in its distribution size
+when compared with Oracle GraalVM CE/EE.
+
+* Mandrel is built slightly differently to Oracle GraalVM CE, using the standard OpenJDK project.
+This means that it does not profit from a few small enhancements that Oracle have added to the version of OpenJDK used to build their own GraalVM downloads.
+This enhancements are omitted because upstream OpenJDK does not manage them, and cannot vouch for.
+This is particularly important when it comes to conformance and security.
+
+* Mandrel is currently only recommended for building native executables that target Linux containerized environments.
+This means that Mandrel users should use containers to build their native executables.
+If you are building native executables for macOS or Windows target platforms,
+you should consider using Oracle GraalVM instead,
+because Mandrel does not currently target these platforms.
+Building native executables directly on bare metal Linux is possible,
+with details available in the https://github.com/graalvm/mandrel/blob/default/README.md[Mandrel README]
+and https://github.com/graalvm/mandrel/releases[Mandrel releases].
+
+The prerequisites vary slightly depending on whether you are using Oracle GraalVM CE/EE or Mandrel.
+
+[IMPORTANT]
+.Install the Java 11 version of GraalVM
+====
+While Oracle GraalVM is available for both Java 8 and Java 11 (Mandrel only supports Java 11), Quarkus only works with the Java 11 version.
+If you use the Oracle distribution, make sure to install the Java 11 version.
+====
+
+== Prerequisites for Mandrel
+
+To complete this guide using Mandrel, you need:
+
+* less than 15 minutes
+* an IDE
+* JDK 11 installed with `JAVA_HOME` configured appropriately
+* A working container runtime (Docker, podman)
+* The code of the application developed in the link:getting-started[Getting Started Guide].
+
+Skip to <<#container-runtime,this section>> to continue with the guide for Mandrel,
+and follow the Mandrel-specific instructions in that section.
+
+== Prerequisites for Oracle GraalVM CE/EE
 
 To complete this guide, you need:
 
 * less than 15 minutes
 * an IDE
-* JDK 8 installed with `JAVA_HOME` configured appropriately
+* JDK 11 installed with `JAVA_HOME` configured appropriately
 * A xref:configuring-c-development[working C development environment]
-* GraalVM version {graalvm-version} installed and xref:configuring-graalvm[configured appropriately]
+* GraalVM version {graalvm-version} (be sure to install the Java 11 support) installed and xref:configuring-graalvm[configured appropriately]
 * A working container runtime (Docker, podman)
 * The code of the application developed in the link:getting-started[Getting Started Guide].
 
@@ -34,7 +90,7 @@ What does having a working C developer environment mean?
 
 * On Linux, you will need GCC, and the glibc and zlib headers. Examples for common distributions:
 +
-[source,shell]
+[source,bash]
 ----
 # dnf (rpm-based)
 sudo dnf install gcc glibc-devel zlib-devel libstdc++-static
@@ -43,7 +99,7 @@ sudo apt-get install build-essential libz-dev zlib1g-dev
 ----
 * XCode provides the required dependencies on macOS:
 +
-[source,shell]
+[source,bash]
 ----
 xcode-select --install
 ----
@@ -60,19 +116,20 @@ If you cannot install GraalVM, you can use a multi-stage Docker build to run Mav
 
 Version {graalvm-version} is required. Using the community edition is enough.
 
-1. Install GraalVM if you haven't already. You have a few options for this:
+1. Install GraalVM (pick the java 11 version) if you haven't already. You have a few options for this:
 ** Use platform-specific install tools like https://github.com/graalvm/homebrew-tap[homebrew], https://sdkman.io/jdks#Oracle[sdkman], or https://github.com/ScoopInstaller/Java[scoop].
 ** Download the appropriate Community Edition archive from <https://github.com/graalvm/graalvm-ce-builds/releases>, and unpack it like you would any other JDK.
+Make sure to download and install at Java 11 version.
 2. Configure the runtime environment. Set `GRAALVM_HOME` environment variable to the GraalVM installation directory, for example:
 +
-[source,shell]
+[source,bash]
 ----
 export GRAALVM_HOME=$HOME/Development/graalvm/
 ----
 +
 On macOS, point the variable to the `Home` sub-directory:
 +
-[source,shell]
+[source,bash]
 ----
 export GRAALVM_HOME=$HOME/Development/graalvm/Contents/Home/
 ----
@@ -85,7 +142,7 @@ Installing via scoop will do this for you.
 ====
 3. Install the `native-image` tool using `gu install`:
 +
-[source,shell]
+[source,bash]
 ----
 ${GRAALVM_HOME}/bin/gu install native-image
 ----
@@ -93,13 +150,13 @@ ${GRAALVM_HOME}/bin/gu install native-image
 Some previous releases of GraalVM included the `native-image` tool by default.  This is no longer the case; it must be installed as a second step after GraalVM itself is installed. Note: there is an outstanding issue xref:graal-and-catalina[using GraalVM with macOS Catalina].
 4. (Optional) Set the `JAVA_HOME` environment variable to the GraalVM installation directory.
 +
-[source,shell]
+[source,bash]
 ----
 export JAVA_HOME=${GRAALVM_HOME}
 ----
 5. (Optional) Add the GraalVM `bin` directory to the path
 +
-[source,shell]
+[source,bash]
 ----
 export PATH=${GRAALVM_HOME}/bin:$PATH
 ----
@@ -110,14 +167,14 @@ export PATH=${GRAALVM_HOME}/bin:$PATH
 ====
 GraalVM binaries are not (yet) notarized for macOS Catalina as reported in this https://github.com/oracle/graal/issues/1724[GraalVM issue]. This means that you may see the following error when using `gu`:
 
-[source,shell]
+[source,bash]
 ----
 “gu” cannot be opened because the developer cannot be verified
 ----
 
 Use the following command to recursively delete the `com.apple.quarantine` extended attribute on the GraalVM install directory as a workaround:
 
-[source,shell]
+[source,bash]
 -----
 xattr -r -d com.apple.quarantine ${GRAALVM_HOME}/../..
 -----
@@ -177,14 +234,14 @@ the `x64 Native Tools Command Prompt` that was installed with the Visual Studio
 
 Another solution is to write a script to do this for you:
 
-[source,shell]
+[source,bash]
 ----
 cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" && mvn package -Pnative'
 ----
 ====
 
-In addition to the regular files, the build also produces `target/getting-started-1.0-SNAPSHOT-runner`.
-You can run it using: `./target/getting-started-1.0-SNAPSHOT-runner`.
+In addition to the regular files, the build also produces `target/getting-started-1.0.0-SNAPSHOT-runner`.
+You can run it using: `./target/getting-started-1.0.0-SNAPSHOT-runner`.
 
 == Testing the native executable
 
@@ -241,16 +298,16 @@ The executable is retrieved using the `native.image.path` system property config
 To see the `NativeGreetingResourceIT` run against the native executable, use `./mvnw verify -Pnative`:
 [source,shell]
 ----
-./mvnw verify -Pnative
+$ ./mvnw verify -Pnative
 ...
-[getting-started-1.0-SNAPSHOT-runner:18820]     universe:     587.26 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]      (parse):   2,247.59 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]     (inline):   1,985.70 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]    (compile):  14,922.77 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]      compile:  20,361.28 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]        image:   2,228.30 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]        write:     364.35 ms
-[getting-started-1.0-SNAPSHOT-runner:18820]      [total]:  52,777.76 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]     universe:     587.26 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]      (parse):   2,247.59 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]     (inline):   1,985.70 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]    (compile):  14,922.77 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]      compile:  20,361.28 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]        image:   2,228.30 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]        write:     364.35 ms
+[getting-started-1.0.0-SNAPSHOT-runner:18820]      [total]:  52,777.76 ms
 [INFO]
 [INFO] --- maven-failsafe-plugin:2.22.1:integration-test (default) @ getting-started ---
 [INFO]
@@ -258,7 +315,7 @@ To see the `NativeGreetingResourceIT` run against the native executable, use `./
 [INFO]  T E S T S
 [INFO] -------------------------------------------------------
 [INFO] Running org.acme.quickstart.NativeGreetingResourceIT
-Executing [/data/home/gsmet/git/quarkus-quickstarts/getting-started/target/getting-started-1.0-SNAPSHOT-runner, -Dquarkus.http.port=8081, -Dtest.url=http://localhost:8081, -Dquarkus.log.file.path=build/quarkus.log]
+Executing [/data/home/gsmet/git/quarkus-quickstarts/getting-started/target/getting-started-1.0.0-SNAPSHOT-runner, -Dquarkus.http.port=8081, -Dtest.url=http://localhost:8081, -Dquarkus.log.file.path=build/quarkus.log]
 2019-04-15 11:33:20,348 INFO  [io.quarkus] (main) Quarkus 999-SNAPSHOT started in 0.002s. Listening on: http://[::]:8081
 2019-04-15 11:33:20,348 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy]
 [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.387 s - in org.acme.quickstart.NativeGreetingResourceIT
@@ -272,6 +329,12 @@ duration can be changed using the `quarkus.test.native-image-wait-time` system p
 to 300 seconds, use: `./mvnw verify -Pnative -Dquarkus.test.native-image-wait-time=300`.
 ====
 
+[WARNING]
+====
+In the future, `@NativeImageTest` will be deprecated in favor of `@QuarkusIntegrationTest` which provides a superset of the testing
+capabilities of `@NativeImageTest`. More information about `@QuarkusIntegrationTest` can be found in the link:getting-started-testing#quarkus-integration-test[Testing Guide].
+====
+
 By default, native tests runs using the `prod` profile.
 This can be overridden using the `quarkus.test.native-image-profile` property.
 For example, in your `application.properties` file, add: `quarkus.test.native-image-profile=test`.
@@ -311,26 +374,53 @@ to install as little software as possible).
 To this end, Quarkus provides a very convenient way of creating a native Linux executable by leveraging a container runtime such as Docker or podman.
 The easiest way of accomplishing this task is to execute:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative -Dquarkus.native.container-build=true
 ----
 
 [TIP]
 ====
-You can also select the container runtime to use with:
-[source,shell]
+By default Quarkus automatically detects the container runtime.
+If you want to explicitely select the container runtime, you can do it with:
+[source,bash]
 ----
 # Docker
-./mvnw package -Pnative -Dquarkus.native.container-runtime=docker
+./mvnw package -Pnative -Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=docker
 # Podman
-./mvnw package -Pnative -Dquarkus.native.container-runtime=podman
+./mvnw package -Pnative -Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=podman
 ----
 
-
 These are normal Quarkus config properties, so if you always want to build in a container
 it is recommended you add these to your `application.properties` in order to avoid specifying them every time.
+====
+
+[TIP]
+====
+If you see the following invalid path error for your application JAR when trying to create a native executable using a container build, even though your JAR was built successfully, you're most likely using a remote daemon for your container runtime.
+----
+Error: Invalid Path entry getting-started-1.0.0-SNAPSHOT-runner.jar
+Caused by: java.nio.file.NoSuchFileException: /project/getting-started-1.0.0-SNAPSHOT-runner.jar
+----
+In this case, use the parameter `-Dquarkus.native.remote-container-build=true` instead of `-Dquarkus.native.container-build=true`.
 
+The reason for this is that the local build driver invoked through `-Dquarkus.native.container-build=true` uses volume mounts to make the JAR available in the build container, but volume mounts do not work with remote daemons. The remote container build driver copies the necessary files instead of mounting them. Note that even though the remote driver also works with local daemons, the local driver should be preferred in the local case because mounting is usually more performant than copying.
+====
+
+[TIP]
+====
+Building with Mandrel requires a custom builder image parameter to be passed additionally:
+[source,bash,subs=attributes+]
+----
+./mvnw package -Pnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel:{mandrel-flavor}
+----
+
+Please note that the above command points to a floating tag.
+It is highly recommended to use the floating tag,
+so that your builder image remains up-to-date and secure.
+If you absolutely must, you may hard-code to a specific tag
+(see https://quay.io/repository/quarkus/ubi-quarkus-mandrel?tab=tags[here] for available tags),
+but be aware that you won't get security updates that way and it's unsupported.
 ====
 
 == Creating a container
@@ -341,7 +431,7 @@ By far the easiest way to create a container-image from your Quarkus application
 
 If one of those extensions is present, then creating a container image for the native executable is essentially a matter of executing a single command:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative -Dquarkus.native.container-build=true -Dquarkus.container-image.build=true
 ----
@@ -392,14 +482,14 @@ You can read more about UBI on:
 
 Then, if you didn't delete the generated native executable, you can build the docker image with:
 
-[source,shell]
+[source,bash]
 ----
 docker build -f src/main/docker/Dockerfile.native -t quarkus-quickstart/getting-started .
 ----
 
 And finally, run it with:
 
-[source,shell]
+[source,bash]
 ----
 docker run -i --rm -p 8080:8080 quarkus-quickstart/getting-started
 ----
@@ -410,10 +500,11 @@ NOTE: If you are interested in tiny Docker images, check the {quarkus-images-url
 
 The previous section showed you how to build a native executable using Maven, but implicitly required that the proper GraalVM version be installed on the building machine (be it your local machine or your CI/CD infrastructure).
 
-In cases where the GraalVM requirement cannot be met, you can use Docker to perform the Maven build by using a multi-stage Docker build. A multi-stage Docker build is like two Dockerfile files combined in one, the first is used to build the artifact used by the second.
+In cases where the GraalVM requirement cannot be met, you can use Docker to perform the Maven or Gradle build by using a multi-stage Docker build. A multi-stage Docker build is like two Dockerfile files combined in one, the first is used to build the artifact used by the second.
 
-In this guide we will use the first stage to generate the native executable using Maven and the second stage to create our runtime image.
+In this guide we will use the first stage to generate the native executable and the second stage to create our runtime image.
 
+Sample Dockerfile for building with Maven:
 [source,dockerfile,subs=attributes+]
 ----
 ## Stage 1 : build with maven builder image with native capabilities
@@ -443,22 +534,46 @@ USER 1001
 CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
 ----
 
-
 Save this file in `src/main/docker/Dockerfile.multistage` as it is not included in the getting started quickstart.
 
+Sample Dockerfile for building with Gradle:
+[source,dockerfile,subs=attributes+]
+----
+## Stage 1 : build with maven builder image with native capabilities
+FROM quay.io/quarkus/centos-quarkus-maven:{graalvm-version}-java8 AS build
+COPY src /usr/src/app/src
+COPY build.gradle /usr/src/app
+COPY settings.gradle /usr/src/app
+COPY gradle.properties /usr/src/app
+USER root
+RUN chown -R quarkus /usr/src/app
+USER quarkus
+RUN gradle -b /usr/src/app/build.gradle clean buildNative
+
+## Stage 2 : create the docker final image
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+WORKDIR /work/
+COPY --from=build /usr/src/app/build/*-runner /work/application
+RUN chmod 775 /work
+EXPOSE 8080
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+----
+
+If you are using Gradle in your project, you can use this sample Dockerfile.  Save it in `src/main/docker/Dockerfile.multistage`.
+
 [WARNING]
 ====
 Before launching our Docker build, we need to update the default `.dockerignore` file as it filters everything except the `target` directory and as we plan to build inside a container we need to be able to copy the `src` directory. So edit your `.dockerignore` and remove or comment its content.
 ====
 
-[source,shell]
+[source,bash]
 ----
 docker build -f src/main/docker/Dockerfile.multistage -t quarkus-quickstart/getting-started .
 ----
 
 And finally, run it with:
 
-[source,shell]
+[source,bash]
 ----
 docker run -i --rm -p 8080:8080 quarkus-quickstart/getting-started
 ----
@@ -470,6 +585,76 @@ If you need SSL support in your native executable, you can easily include the ne
 Please see link:native-and-ssl#working-with-containers[our Using SSL With Native Executables guide] for more information.
 ====
 
+== Debugging native executable
+
+Starting with Oracle GraalVM 20.2 or Mandrel 20.1,
+debug symbols for native executables can be generated for Linux environments
+(Windows support is still under development).
+These symbols can be used to debug native executables with tools such as `gdb`.
+
+To generate debug symbols,
+add `-Dquarkus.native.debug.enabled=true` flag when generating the native executable.
+You will find the debug symbols for the native executable in a `.debug` file next to the native executable.
+
+[NOTE]
+====
+The generation of the `.debug` file depends on `objcopy`.
+On common Linux distributions and macOS you will need to install the `binutils` package:
+
+[source,bash]
+----
+# dnf (rpm-based)
+sudo dnf install binutils
+# Debian-based distributions
+sudo apt-get install binutils
+# macOS
+brew install binutils
+export PATH=/usr/local/opt/binutils/bin:$PATH
+----
+
+When `objcopy` is not available debug symbols are embedded in the executable.
+====
+
+Aside from debug symbols,
+setting `-Dquarkus.native.debug.enabled=true` flag generates a cache of source files
+for any JDK runtime classes, GraalVM classes and application classes resolved during native executable generation.
+This source cache is useful for native debugging tools,
+to establish the link between the symbols and matching source code.
+It provides a convenient way of making just the necessary sources available to the debugger/IDE when debugging a native executable.
+
+Sources for third party jar dependencies, including Quarkus source code,
+are not added to the source cache by default.
+To include those, make sure you invoke `mvn dependency:sources` first.
+This step is required in order to pull the sources for these dependencies,
+and get them included in the source cache.
+
+The source cache is located in the `target/sources` folder.
+
+[TIP]
+====
+If running `gdb` from a different directory than `target`, then the sources can be loaded by running:
+
+[source,bash]
+----
+directory path/to/target
+----
+
+in the `gdb` prompt.
+
+Or start `gdb` with:
+
+[source,bash]
+----
+gdb -ex 'directory path/to/target' path/to/target/{project.name}-{project.version}-runner
+----
+
+e.g.,
+[source,bash]
+----
+gdb -ex 'directory ./target' ./target/getting-started-1.0.0-SNAPSHOT-runner
+----
+====
+
 [[configuration-reference]]
 == Configuring the Native Executable
 
diff --git a/docs/src/main/asciidoc/building-substrate-howto.adoc b/docs/src/main/asciidoc/building-substrate-howto.adoc
index b5d0d0d678bc5..e5466d9f4c54d 100644
--- a/docs/src/main/asciidoc/building-substrate-howto.adoc
+++ b/docs/src/main/asciidoc/building-substrate-howto.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Building a Custom SubstrateVM
 
@@ -22,7 +22,7 @@ auth param.
 
 After obtaining the download install it and set `JAVA_HOME`
 
-[source,shell]
+[source,bash]
 ----
 wget -O jvmci.tgz http://download.oracle.com/otn/utilities_drivers/oracle-labs/labsjdk-8u202-jvmci-0.56-darwin-amd64.tar.gz?AuthParam=[GENERATED AUTH TOKEN HERE]
 tar -xzvf jvmci.tgz -C /opt
@@ -39,7 +39,7 @@ the minimum requirements.
 
 Now you need to install Graal’s special build tool, `mx`.
 
-[source,shell]
+[source,bash]
 ----
 git clone https://github.com/graalvm/mx.git
 export PATH=`pwd`/mx:$PATH
@@ -49,7 +49,7 @@ export PATH=`pwd`/mx:$PATH
 
 You can now check-out and build Substrate:
 
-[source,shell]
+[source,bash]
 ----
 git clone https://github.com/oracle/graal.git
 cd graal/substratevm
@@ -58,7 +58,7 @@ mx build
 
 Once built, you can quickly run the tools in place
 
-[source,shell]
+[source,bash]
 ----
 echo "public class HelloWorld { public static void main(String[] args) { System.out.println(\"Hello World\"); } }" > HelloWorld.java
 javac HelloWorld.java
@@ -75,7 +75,7 @@ build options to pick the modules in your distribution.
 For a simple subset VM with just substrate and its native tools execute
 the following:
 
-[source,shell]
+[source,bash]
 ----
  cd ../vm
  mx --dy /substratevm,/tools build
@@ -84,7 +84,7 @@ the following:
 
 For a stock CE build the following will do:
 
-[source,shell]
+[source,bash]
 ----
 mx --dy /substratevm,/tools,/sulong,/graal-nodejs build
 tar -czvf my-custom-graal.tgz -C latest_graalvm .
diff --git a/docs/src/main/asciidoc/cache.adoc b/docs/src/main/asciidoc/cache.adoc
index 3e0a34619b97c..9361e964e27fa 100644
--- a/docs/src/main/asciidoc/cache.adoc
+++ b/docs/src/main/asciidoc/cache.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Application Data Caching
 :extension-status: preview
@@ -36,23 +36,23 @@ However, you can go right to the completed example.
 
 Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
 
-The solution is located in the `cache-quickstart` directory.
+The solution is located in the `cache-quickstart` {quickstarts-tree-url}/cache-quickstart[directory].
 
 == Creating the Maven project
 
 First, we need to create a new Quarkus project using Maven with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=cache-quickstart \
     -DclassName="org.acme.cache.WeatherForecastResource" \
     -Dpath="/weather" \
-    -Dextensions="cache,resteasy-jsonb"
+    -Dextensions="resteasy,cache,resteasy-jackson"
 ----
 
-This command generates the Maven project with a REST endpoint and imports the `cache` and `resteasy-jsonb` extensions.
+This command generates the Maven project with a REST endpoint and imports the `cache` and `resteasy-jackson` extensions.
 
 If you already have your Quarkus project configured, you can add the `cache` extension
 to your project by running the following command in your project base directory:
@@ -158,7 +158,6 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 import org.jboss.resteasy.annotations.jaxrs.QueryParam;
@@ -170,7 +169,6 @@ public class WeatherForecastResource {
     WeatherForecastService service;
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public WeatherForecast getForecast(@QueryParam String city, @QueryParam long daysInFuture) { <1>
         long executionStart = System.currentTimeMillis();
         List<String> dailyForecasts = Arrays.asList(
@@ -193,7 +191,7 @@ First, run the application using `./mvnw compile quarkus:dev` from the project d
 Then, call `http://localhost:8080/weather?city=Raleigh` from a browser.
 After six long seconds, the application will answer something like this:
 
-[source]
+[source,json]
 ----
 {"dailyForecasts":["MONDAY will be cloudy in Raleigh","TUESDAY will be chilly in Raleigh","WEDNESDAY will be rainy in Raleigh"],"executionTimeInMs":6001}
 ----
@@ -276,6 +274,12 @@ The following sections will show you everything there is to know about it.
 
 Quarkus offers a set of annotations that can be used in a CDI managed bean to enable caching abilities.
 
+[WARNING]
+====
+Caching annotations are not allowed on private methods.
+They will work fine with any other access modifier including package-private (no explicit modifier).
+====
+
 === @CacheResult
 
 Loads a method result from the cache without executing the method body whenever possible.
@@ -283,9 +287,9 @@ Loads a method result from the cache without executing the method body whenever
 When a method annotated with `@CacheResult` is invoked, Quarkus will compute a cache key and use it to check in the cache whether the method has been already invoked.
 If the method has one or more arguments, the key computation is done from all the method arguments if none of them is annotated with `@CacheKey`, or all the arguments annotated with `@CacheKey` otherwise.
 Each non-primitive method argument that is part of the key must implement `equals()` and `hashCode()` correctly for the cache to work as expected.
-This annotation can also be used on a method with no arguments, a default key derived from the cache name is generated in that case.
+This annotation can also be used on a method with no arguments, a default key derived from the cache name is used in that case.
 If a value is found in the cache, it is returned and the annotated method is never actually executed.
-If no value is found, the annotated method is invoked and the returned value is stored in the cache using the computed or generated key.
+If no value is found, the annotated method is invoked and the returned value is stored in the cache using the computed key.
 
 A method annotated with `CacheResult` is protected by a lock on cache miss mechanism.
 If several concurrent invocations try to retrieve a cache value from the same missing key, the method will only be invoked once.
@@ -308,14 +312,9 @@ Removes an entry from the cache.
 
 When a method annotated with `@CacheInvalidate` is invoked, Quarkus will compute a cache key and use it to try to remove an existing entry from the cache.
 If the method has one or more arguments, the key computation is done from all the method arguments if none of them is annotated with `@CacheKey`, or all the arguments annotated with `@CacheKey` otherwise.
-This annotation can also be used on a method with no arguments, a default key derived from the cache name is generated in that case.
+This annotation can also be used on a method with no arguments, a default key derived from the cache name is used in that case.
 If the key does not identify any cache entry, nothing will happen.
 
-[TIP]
-====
-If the `@CacheResult` or `@CacheInvalidate` annotations are used on a method with no parameters, a unique default cache key derived from the cache name will be generated and used.
-====
-
 === @CacheInvalidateAll
 
 When a method annotated with `@CacheInvalidateAll` is invoked, Quarkus will remove all entries from the cache.
@@ -327,6 +326,49 @@ method annotated with `@CacheResult` or `@CacheInvalidate`.
 
 This annotation is optional and should only be used when some of the method arguments are NOT part of the cache key.
 
+=== Composite cache key building logic
+
+When a cache key is built from several method arguments, whether they are explicitly identified with `@CacheKey` or not, the building logic depends on the order of these arguments in the method signature. On the other hand, the arguments names are not used at all and do not have any effect on the cache key.
+
+[source,java]
+----
+package org.acme.cache;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.cache.CacheInvalidate;
+import io.quarkus.cache.CacheResult;
+
+@ApplicationScoped
+public class CachedService {
+
+    @CacheResult(cacheName = "foo")
+    public Object load(String keyElement1, Integer keyElement2) {
+        // Call expensive service here.
+    }
+
+    @CacheInvalidate(cacheName = "foo")
+    public void invalidate1(String keyElement2, Integer keyElement1) { <1>
+    }
+
+    @CacheInvalidate(cacheName = "foo")
+    public void invalidate2(Integer keyElement2, String keyElement1) { <2>
+    }
+
+    @CacheInvalidate(cacheName = "foo")
+    public void invalidate3(Object notPartOfTheKey, @CacheKey String keyElement1, @CacheKey Integer keyElement2) { <3>
+    }
+
+    @CacheInvalidate(cacheName = "foo")
+    public void invalidate4(Object notPartOfTheKey, @CacheKey Integer keyElement2, @CacheKey String keyElement1) { <4>
+    }
+}
+----
+<1> Calling this method WILL invalidate values cached by the `load` method even if the key elements names have been swapped.
+<2> Calling this method WILL NOT invalidate values cached by the `load` method because the key elements order is different.
+<3> Calling this method WILL invalidate values cached by the `load` method because the key elements order is the same.
+<4> Calling this method WILL NOT invalidate values cached by the `load` method because the key elements order is different.
+
 == Configuring the underlying caching provider
 
 This extension uses https://github.com/ben-manes/caffeine[Caffeine] as its underlying caching provider.
@@ -356,17 +398,6 @@ quarkus.cache.caffeine."bar".maximum-size=1000 <2>
 <1> The `foo` cache is being configured.
 <2> The `bar` cache is being configured.
 
-== Context propagation
-
-This extension relies on non-blocking calls internally for cache values computations.
-By default, there's no context propagation between the calling thread (from your application) and a thread that performs such a computation.
-
-The context propagation can be enabled for this extension by simply adding the `quarkus-smallrye-context-propagation` extension to your project.
-
-If you see a `javax.enterprise.context.ContextNotActiveException` in your application log during a cache computation, then you probably need to enable the context propagation.
-
-You can find more information about context propagation in Quarkus in the link:context-propagation[dedicated guide].
-
 == Annotated beans examples
 
 === Implicit simple cache key
@@ -461,7 +492,7 @@ public class CachedService {
     }
 }
 ----
-<1> A unique default cache key derived from the cache name is generated and used.
+<1> A unique default cache key derived from the cache name is used because the method has no arguments.
 
 === Multiple annotations on a single method
 
@@ -496,7 +527,7 @@ public class CachedService {
 [#negative-cache]
 == Negative caching and nulls
 
-Sometimes one wants to cache the results of an (expensive) remote call.
+Sometimes one wants to cache the result of an (expensive) remote call.
 If the remote call fails, one may not want to cache the result or exception,
 but rather re-try the remote call on the next invocation.
 
@@ -504,15 +535,15 @@ A simple approach could be to catch the exception and return `null`, so that the
 act accordingly:
 
 .Sample code
-[souce,java]
+[source,java]
 ----
     public void caller(int val) {
 
-        Integer result = callRemote(val);  //<1>
-        if (result == null) {
+        Integer result = callRemote(val); //<1>
+        if (result != null) {
             System.out.println("Result is " + result);
         else {
-           System.out.println("Got an exception");
+            System.out.println("Got an exception");
         }
     }
 
@@ -520,10 +551,10 @@ act accordingly:
     private Integer callRemote(int val)  {
 
         try {
-            Integer val = remoteWebServer.getResult(val);  //<2>
+            Integer val = remoteWebServer.getResult(val); //<2>
             return val;
         } catch (Exception e) {
-            return null;  // <3>
+            return null; // <3>
         }
     }
 ----
@@ -542,7 +573,7 @@ To prevent the cache from caching (marker) results from a remote call, we need t
 the exception bubble out of the called method and catch it at the caller side:
 
 .With Exception bubbling up
-[souce,java]
+[source,java]
 ----
    public void caller(int val) {
        try {
@@ -567,11 +598,4 @@ the exception bubble out of the called method and catch it at the caller side:
 When the call to the remote throws an exception, the cache does not store the result,
 so that a subsequent call to `callRemote()` with the same parameter value will not be
 answered out of the cache.
-It will instead result in another
-attempt to call the remote.
-
-The previous code example has the side-effect that the cache logs the thrown exception
-with a long stack trace to the console. This is done to inform developers that something
-exceptional has happened, but if you have a setup like above, you are already catching
-the exception and know what you are doing.
-
+It will instead result in another attempt to call the remote.
diff --git a/docs/src/main/asciidoc/camel.adoc b/docs/src/main/asciidoc/camel.adoc
index 7c5111ca92536..6a9f60131a8c7 100644
--- a/docs/src/main/asciidoc/camel.adoc
+++ b/docs/src/main/asciidoc/camel.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Apache Camel on Quarkus
 
diff --git a/docs/src/main/asciidoc/cassandra.adoc b/docs/src/main/asciidoc/cassandra.adoc
index 89dc0314cae2a..dddcc695b8aaa 100644
--- a/docs/src/main/asciidoc/cassandra.adoc
+++ b/docs/src/main/asciidoc/cassandra.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using the Cassandra Client
 
@@ -66,6 +66,11 @@ The most important part of the `pom.xml` is adding the `cassandra-quarkus` exten
 </dependency>
 ----
 
+Also make sure to follow the
+link:https://docs.datastax.com/en/developer/java-driver/latest/manual/mapper/config/[instructions]
+on how to add an annotation processor to the compiler configuration. When the project is compiled,
+additional mapper classes are generated.
+
 == Creating JSON REST service
 
 In this example, we will create an application to manage a list of fruits.
@@ -179,6 +184,9 @@ public class FruitDaoProducer {
 Note how the `QuarkusCqlSession` instance is injected automatically by the cassandra-quarkus
 extension in the `FruitDaoProducer` constructor.
 
+Also note that `FruitMapperBuilder` is one of the classes generated automatically by the
+`java-driver-mapper-processor` annotation processor.
+
 Now create a `FruitService` that will be the business layer of our application and store/load the
 fruits from the Cassandra database.
 
@@ -212,8 +220,6 @@ The last missing piece is the REST API that will expose GET and POST methods:
 [source,java]
 ----
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
   private static final String STORE_NAME = "acme";
@@ -345,7 +351,7 @@ following CQL query: `SELECT data_center FROM system.local`.
 If you want to use Docker to run a Cassandra database, you can use the following command to launch
 one:
 
-[source,shell]
+[source,bash]
 ----
 docker run \
    --name local-cassandra-instance \
@@ -365,18 +371,18 @@ like JMX monitoring of the Cassandra instance.
 Next you need to create the keyspace and table that will be used by your application. If you are
 using Docker, run the following commands:
 
-[source,shell]
+[source,bash]
 ----
 docker exec -it local-cassandra-instance cqlsh -e "CREATE KEYSPACE IF NOT EXISTS k1 WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}"
-docker exec -it local-cassandra-instance cqlsh -e "CREATE TABLE IF NOT EXISTS k1.fruit(id text, name text, description text, PRIMARY KEY((id), name))"
+docker exec -it local-cassandra-instance cqlsh -e "CREATE TABLE IF NOT EXISTS k1.fruit(store_id text, name text, description text, PRIMARY KEY((store_id), name))"
 ----
 
 If you're running Cassandra locally you can execute the cqlsh commands directly:
 
-[source,shell]
+[source,bash]
 ----
 cqlsh -e "CREATE KEYSPACE IF NOT EXISTS k1 WITH replication = {'class':'SimpleStrategy', 'replication_factor':1}
-cqlsh -e "CREATE TABLE IF NOT EXISTS k1.fruit(id text, name text, description text, PRIMARY KEY((id), name))
+cqlsh -e "CREATE TABLE IF NOT EXISTS k1.fruit(store_id text, name text, description text, PRIMARY KEY((store_id), name))
 ----
 
 == Creating a frontend
@@ -400,7 +406,7 @@ When using `QuarkusCqlSession` you have access to reactive variant of methods th
 Quarkus and Mutiny.
 
 TIP:  If you're not familiar with Mutiny, read the
-link:https://quarkus.io/guides/getting-started-reactive[Getting Started with Reactive guide] first.
+link:getting-started-reactive[Getting Started with Reactive guide] first.
 
 Let's rewrite the previous example using reactive programming with Mutiny.
 
@@ -542,7 +548,7 @@ You can now interact with your reactive REST service:
 If you are using the `quarkus-smallrye-health` extension, `cassandra-quarkus` will automatically
 add a readiness health check to validate the connection to the cluster.
 
-So when you access the `/health/ready` endpoint of your application you will have information about
+So when you access the `/q/health/ready` endpoint of your application you will have information about
 the connection validation status.
 
 TIP: This behavior can be disabled by setting the `quarkus.cassandra.health.enabled` property to
@@ -577,7 +583,7 @@ For the full list of available metrics, please refer to the
 link:https://docs.datastax.com/en/developer/java-driver/latest/manual/core/configuration/reference/[driver settings reference]
 and the `advanced.metrics` section.
 
-When metrics are properly enabled and when you access the `/metrics` endpoint of your application,
+When metrics are enabled and you access the `/q/metrics` endpoint of your application,
 you will see metric reports for all enabled metrics.
 
 == Building a native executable
@@ -594,4 +600,4 @@ You can then point your browser to `http://localhost:8080/fruits.html` and use y
 
 Accessing a Cassandra database from a client application is easy with Quarkus and the Cassandra
 extension, which provides configuration and native support for the DataStax Java driver for
-Apache Cassandra.
\ No newline at end of file
+Apache Cassandra.
diff --git a/docs/src/main/asciidoc/cdi-integration.adoc b/docs/src/main/asciidoc/cdi-integration.adoc
new file mode 100644
index 0000000000000..93e2440aa1a9f
--- /dev/null
+++ b/docs/src/main/asciidoc/cdi-integration.adoc
@@ -0,0 +1,556 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - CDI Integration Guide
+
+include::./attributes.adoc[]
+:numbered:
+:toc:
+:toclevels: 2
+
+ArC, the CDI container, is bootstrapped at build time.
+The downside of this approach is that CDI Portable Extensions cannot be supported.
+Nevertheless, the functionality can be achieved using the Quarkus-specific extensions API.
+
+The container is bootstrapped in multiple phases.
+From a high level perspective these phases go as follows:
+
+1. Initialization
+2. Bean discovery 
+3. Registration of synthetic components
+4. Validation
+
+In the _initialization_ phase the preparatory work is being carried out and custom contexts are registered.
+_Bean discovery_ is then the process where the container analyzes all application classes, identifies beans and wires them all together based on the provided metadata.
+Subsequently, the extensions can register _synthetic components_.
+Attributes of these components are fully controlled by the extensions, i.e. are not derived from an existing class.
+Finally, the _deployment is validated_.
+For example, the container validates every injection point in the application and fails the build if there is no bean that satisfies the given required type and qualifiers.
+
+TIP: You can see more information about the bootstrap by enabling additional logging. Simply run the Maven build with `-X` or `--debug` and grep the lines that contain `io.quarkus.arc`. In the <<cdi-reference.adoc#dev-mode,development mode>>, you can use `quarkus.log.category."io.quarkus.arc.processor".level=DEBUG` and two special endpoints are also registered automatically to provide some basic debug info in the JSON format.
+
+Quarkus build steps can produce and consume various build items and hook into each phase.
+In the following sections we will describe all the relevant build items and common scenarios.
+
+== Metadata Sources
+
+Classes and annotations are the primary source of bean-level metadata.
+The initial metadata are read from the _bean archive index_, an immutable https://github.com/wildfly/jandex[Jandex index, window="_blank"] which is built from various sources during <<cdi-reference.adoc#bean_discovery,bean discovery>>.
+However, extensions can add, remove or transform the metadata at certain stages of the bootstrap.
+Moreover, extensions can also register <<synthetic_beans,synthetic components>>. 
+This is an important aspect to realize when integrating CDI components in Quarkus.
+
+This way, extensions can turn classes, that would be otherwise ignored, into beans and vice versa.
+For example, a class that declares a `@Scheduled` method is always registered as a bean even if it is not annotated with a bean defining annotation and would be normally ignored.
+
+:sectnums:
+:sectnumlevels: 4
+
+== Use Case - My Class Is Not Recognized as a Bean
+
+An `UnsatisfiedResolutionException` indicates a problem during <<cdi.adoc#typesafe_resolution,typesafe resolution>>.
+Sometimes an injection point cannot be satisfied even if there is a class on the classpath that appears to be eligible for injection.
+There are several reasons why a class is not recognized and also several ways to fix it.
+In the first step we should identify the _reason_.
+
+[[additional_bean_build_item]]
+=== _Reason 1_: Class Is Not discovered 
+
+Quarkus has a <<cdi-reference.adoc#bean_discovery,simplified discovery>>.
+It might happen that the class is not part of the application index.
+For example, classes from the _runtime module_ of a Quarkus extension are not indexed automatically.
+
+_Solution_: Use the `AdditionalBeanBuildItem`. 
+This build item can be used to specify one or more additional classes to be analyzed during the discovery. 
+Additional bean classes are transparently added to the application index processed by the container.
+
+.`AdditionalBeanBuildItem` Example
+[source,java]
+----
+@BuildStep
+AdditionalBeanBuildItem additionalBeans() {
+     return new AdditionalBeanBuildItem(SmallRyeHealthReporter.class, HealthServlet.class)); <1>
+}
+----
+<1> `AdditionalBeanBuildItem.Builder` can be used for more complex use cases.
+
+Bean classes added via `AdditionalBeanBuildItem` are _removable_ by default.
+If the container considers them <<cdi-reference.adoc#remove_unused_beans,unused>>, they are just ignored.
+However, you can use `AdditionalBeanBuildItem.Builder.setUnremovable()` method to instruct the container to never remove bean classes registered via this build item.
+See also <<cdi-reference.adoc#remove_unused_beans,Removing Unused Beans>> and <<unremovable_builditem>> for more details.
+
+It is aso possible to set the default scope via `AdditionalBeanBuildItem.Builder#setDefaultScope()`.
+The default scope is only used if there is no scope declared on the bean class. 
+
+NOTE: If no default scope is specified the `@Dependent` pseudo-scope is used.
+
+=== _Reason 2_: Class Is Discovered but Has No Bean Defining Annotation
+
+In Quarkus, the application is represented by a single bean archive with the https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#default_bean_discovery[bean discovery mode `annotated`, window="_blank"].
+Therefore, bean classes that don't have a https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#bean_defining_annotations[bean defining annotation, window="_blank"] are ignored.
+Bean defining annotations are declared on the class-level and incluce scopes, stereotypes and `@Interceptor`.
+
+_Solution 1_: Use the `AutoAddScopeBuildItem`. This build item can be used to add a scope to a class that meets certain conditions.
+
+.`AutoAddScopeBuildItem` Example
+[source,java]
+----
+@BuildStep
+AutoAddScopeBuildItem autoAddScope() {
+   return AutoAddScopeBuildItem.builder().containsAnnotations(SCHEDULED_NAME, SCHEDULES_NAME) <1>
+      .defaultScope(BuiltinScope.SINGLETON) <2>
+      .build();
+}
+----
+<1> Find all classes annotated with `@Scheduled`.
+<2> Add `@Singleton` as default scope. Classes already annotated with a scope are skipped automatically.
+
+_Solution 2_: If you need to process classes annotated with a specific annotation then it's possible to extend the set of bean defining annotations via the `BeanDefiningAnnotationBuildItem`.
+
+.`BeanDefiningAnnotationBuildItem` Example
+[source,java]
+----
+@BuildStep
+BeanDefiningAnnotationBuildItem additionalBeanDefiningAnnotation() {
+   return new BeanDefiningAnnotationBuildItem(Annotations.GRAPHQL_API); <1>
+}
+----
+<1> Add `org.eclipse.microprofile.graphql.GraphQLApi` to the set of bean defining annotations.
+
+Bean classes added via `BeanDefiningAnnotationBuildItem` are _not removable_ by default, i.e. the resulting beans must not be removed even if they are considered unused.
+However, you can change the default behavior.
+See also <<cdi-reference.adoc#remove_unused_beans,Removing Unused Beans>> and <<unremovable_builditem>> for more details.
+
+It is also possible to specify the default scope.
+The default scope is only used if there is no scope declared on the bean class. 
+
+NOTE: If no default scope is specified the `@Dependent` pseudo-scope is used.
+
+[[unremovable_builditem]]
+=== _Reason 3_: Class Was Discovered and Has a Bean Defining Annotation but Was Removed
+
+The container attempts to <<cdi-reference.adoc#remove_unused_beans,remove all unused beans>> during the build by default.
+This optimization allows for _framework-level dead code elimination_.
+In few special cases, it's not possible to correctly identify an unused bean. 
+In particular, Quarkus is not able to detect the usage of the `CDI.current()` static method yet.
+Extensions can eliminate possible false positives by producing an `UnremovableBeanBuildItem`.
+
+.`UnremovableBeanBuildItem` Example
+[source,java]
+----
+@BuildStep
+UnremovableBeanBuildItem unremovableBeans() {
+   return UnremovableBeanBuildItem.targetWithAnnotation(STARTUP_NAME); <1>
+}
+----
+<1> Make all classes annotated with `@Startup` unremovable.
+
+== Use Case - My Annotation Is Not Recognized as a Qualifier or an Interceptor Binding
+
+It is likely that the annotation class is not part of the application index.
+For example, classes from the _runtime module_ of a Quarkus extension are not indexed automatically.
+
+_Solution_: Use the `AdditionalBeanBuildItem` as described in <<additional_bean_build_item>>. 
+
+[[annotations_transformer_build_item]]
+== Use Case - I Need To Transform Metadata
+
+In some cases, it's useful to be able to modify the metadata.
+Quarkus provides a powerful alternative to https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#process_annotated_type[`javax.enterprise.inject.spi.ProcessAnnotatedType`, window="_blank"].
+With an `AnnotationsTransformerBuildItem` it's possible to override the annotations that exist on bean classes.
+
+For example, you might want to add an interceptor binding to a specific bean class.
+Here is how to do it: 
+
+.`AnnotationsTransformerBuildItem` Example
+[source,java]
+----
+@BuildStep
+AnnotationsTransformerBuildItem transform() {
+   return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
+
+      public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind kind) {
+         return kind == org.jboss.jandex.AnnotationTarget.Kind.CLASS; <1>
+      }
+
+      public void transform(TransformationContext context) {
+         if (context.getTarget().asClass().name().toString().equals("org.acme.Bar")) {
+            context.transform().add(MyInterceptorBinding.class).done(); <2>
+         }
+      }
+    });
+}
+----
+<1> The transformer is only applied to classes.
+<2> If the class name equals to `org.acme.Bar` then add `@MyInterceptorBinding`. Don't forget to invoke `Transformation#done()`.
+
+NOTE: Keep in mind that annotation transformers must be produced _before_ the bean discovery starts.
+
+Build steps can query the transformed annotations for a given annotation target via the `TransformedAnnotationsBuildItem`.
+
+.`TransformedAnnotationsBuildItem` Example
+[source,java]
+----
+@BuildStep
+void queryAnnotations(TransformedAnnotationsBuildItem transformedAnnotations, BuildProducer<MyBuildItem> myBuildItem) {
+   ClassInfo myClazz = ...;
+   if (transformedAnnotations.getAnnotations(myClazz).isEmpty()) { <1>
+     myBuildItem.produce(new MyBuildItem());
+   }
+}
+----
+<1> `TransformedAnnotationsBuildItem.getAnnotations()` will return a possibly transformed set of annotations.
+
+NOTE: There are other build items specialized in transformation: <<additional_interceptor_bindings>> and <<injection_point_transformation>>.
+
+[[inspect_beans]]
+== Use Case - Inspect Beans, Observers and Injection Points
+
+=== _Solution 1_: `BeanDiscoveryFinishedBuildItem`
+
+Consumers of `BeanDiscoveryFinishedBuildItem` can easily inspect all class-based beans, observers and injection points registered in the application.
+However, synthetic beans and observers are _not included_ because this build item is produced _before_ the synthetic components are registered.
+
+Additionaly, the bean resolver returned from `BeanDiscoveryFinishedBuildItem#getBeanResolver()` can be used to apply the type-safe resolution rules, e.g. to find out whether there is a bean that would satisfy certain combination of required type and qualifiers.
+
+.`BeanDiscoveryFinishedBuildItem` Example
+[source,java]
+----
+@BuildStep
+void doSomethingWithNamedBeans(BeanDiscoveryFinishedBuildItem beanDiscovery, BuildProducer<NamedBeansBuildItem> namedBeans) {
+   List<BeanInfo> namedBeans = beanDiscovery.beanStream().withName().collect(toList())); <1>
+   namedBeans.produce(new NamedBeansBuildItem(namedBeans));
+}
+----
+<1> The resulting list will not contain `@Named` synthetic beans.
+
+=== _Solution 2_: `SynthesisFinishedBuildItem`
+
+Consumers of `SynthesisFinishedBuildItem` can easily inspect all beans, observers and injection points registered in the application. Synthetic beans and observers are included because this build item is produced _after_ the synthetic components are registered.
+
+Additionaly, the bean resolver returned from `SynthesisFinishedBuildItem#getBeanResolver()` can be used to apply the type-safe resolution rules, e.g. to find out whether there is a bean that would satisfy certain combination of required type and qualifiers.
+
+.`SynthesisFinishedBuildItem` Example
+[source,java]
+----
+@BuildStep
+void doSomethingWithNamedBeans(SynthesisFinishedBuildItem synthesisFinished, BuildProducer<NamedBeansBuildItem> namedBeans) {
+   List<BeanInfo> namedBeans = synthesisFinished.beanStream().withName().collect(toList())); <1>
+   namedBeans.produce(new NamedBeansBuildItem(namedBeans));
+}
+----
+<1> The resulting list will contain `@Named` synthetic beans.
+
+[[synthetic_beans]]
+== Use Case - The Need for Synthetic Beans
+
+Sometimes it is practical to be able to register a _synthetic bean_.
+Bean attributes of a synthetic bean are not derived from a Java class, method or field.
+Instead, all the attributes are defined by an extension.
+In regular CDI, this could be achieved using the https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#after_bean_discovery[`AfterBeanDiscovery.addBean()`, window="_blank"] methods.
+
+_Solution_: If you need to register a synthetic bean then use the `SyntheticBeanBuildItem`.
+
+.`SyntheticBeanBuildItem` Example 1
+[source,java]
+----
+@BuildStep
+SyntheticBeanBuildItem syntheticBean() {
+   return SyntheticBeanBuildItem.configure(String.class)
+             .qualifiers(new MyQualifierLiteral())
+             .creator(mc -> mc.returnValue(mc.load("foo"))) <1>
+             .done();
+}
+----
+<1> Generate the bytecode of the `javax.enterprise.context.spi.Contextual#create(CreationalContext<T>)` implementation.
+
+The output of a bean configurator is recorded as bytecode. 
+Therefore, there are some limitations in how a synthetic bean instance is created at runtime. 
+You can:
+
+1. Generate the bytecode of the `Contextual#create(CreationalContext<T>)` method directly via `ExtendedBeanConfigurator.creator(Consumer<MethodCreator>)`.
+2. Pass a `io.quarkus.arc.BeanCreator` implementation class via `ExtendedBeanConfigurator#creator(Class<? extends BeanCreator<U>>)`, and possibly specify some parameters via `ExtendedBeanConfigurator#param()`.
+3. Produce the runtime instance through a proxy returned from a <<writing-extensions.adoc#bytecode-recording,`@Recorder` method>> and set it via `ExtendedBeanConfigurator#runtimeValue(RuntimeValue<?>)` or `ExtendedBeanConfigurator#supplier(Supplier<?>)`.
+
+.`SyntheticBeanBuildItem` Example 2
+[source,java]
+----
+@BuildStep
+@Record(STATIC_INIT) <1>
+SyntheticBeanBuildItem syntheticBean(TestRecorder recorder) {
+   return SyntheticBeanBuildItem.configure(Foo.class).scope(Singleton.class)
+                .runtimeValue(recorder.createFoo()) <2>
+                .done();
+}
+----
+<1> By default, a synthetic bean is initialized during `STATIC_INIT`.
+<2> The bean instance is supplied by a value returned from a recorder method.
+
+It is possible to mark a synthetic bean to be initialized during `RUNTIME_INIT`.
+See the <<writing-extensions.adoc#bootstrap-three-phases,Three Phases of Bootstrap and Quarkus Philosophy>> for more information about the difference between `STATIC_INIT` and `RUNTIME_INIT`.
+
+.`RUNTIME_INIT` `SyntheticBeanBuildItem` Example
+[source,java]
+----
+@BuildStep
+@Record(RUNTIME_INIT) <1>
+SyntheticBeanBuildItem syntheticBean(TestRecorder recorder) {
+   return SyntheticBeanBuildItem.configure(Foo.class).scope(Singleton.class)
+                .setRuntimeInit() <2>
+                .runtimeValue(recorder.createFoo())
+                .done();
+}
+----
+<1> The recorder must be executed in the `ExecutionTime.RUNTIME_INIT` phase.
+<2> The bean instance is initialized during `RUNTIME_INIT`.
+
+[IMPORTANT]
+====
+Synthetic beans initialized during `RUNTIME_INIT` must not be accessed during `STATIC_INIT`. `RUNTIME_INIT` build steps that access a runtime-init synthetic bean should consume the `SyntheticBeansRuntimeInitBuildItem`:
+
+[source,java]
+----
+@BuildStep
+@Record(RUNTIME_INIT) 
+@Consume(SyntheticBeansRuntimeInitBuildItem.class) <1>
+void accessFoo(TestRecorder recorder) {
+   recorder.foo(); <2>
+}
+----
+<1> This build step must be executed after `syntheticBean()` completes.
+<2> This recorder method results in an invocation upon the `Foo` bean instance and thus we need to make sure that the build step is executed after all synthetic beans are initialized.
+====
+
+NOTE: It is also possible to use the `BeanRegistrationPhaseBuildItem` to register a synthetic bean. However, we recommend extension authors to stick with `SyntheticBeanBuildItem` which is more idiomatic for Quarkus.
+
+[[synthetic_observers]]
+== Use Case - Synthetic Observers
+
+Similar to <<synthetic_beans,synthetic beans>>, the attributes of a synthetic observer method are not derived from a Java method. Instead, all the attributes are defined by an extension.
+
+_Solution_: If you need to register a synthetic observer, use the `ObserverRegistrationPhaseBuildItem`.
+
+IMPORTANT: A build step that consumes the `ObserverRegistrationPhaseBuildItem` should always produce an `ObserverConfiguratorBuildItem` or at least inject a `BuildProducer` for this build item, otherwise it could be ignored or processed at the wrong time (e.g. after the correct CDI bootstrap phase).
+
+.`ObserverRegistrationPhaseBuildItem` Example
+[source,java]
+----
+@BuildStep
+void syntheticObserver(ObserverRegistrationPhaseBuildItem observerRegistrationPhase,
+            BuildProducer<MyBuildItem> myBuildItem, 
+            BuildProducer<ObserverConfiguratorBuildItem> observerConfigurators) {
+   observerConfigurators.produce(new ObserverConfiguratorBuildItem(observerRegistrationPhase.getContext()
+       .configure()
+       .beanClass(DotName.createSimple(MyBuildStep.class.getName()))
+       .observedType(String.class)
+       .notify(mc -> {
+           // do some gizmo bytecode generation...
+       })));
+   myBuildItem.produce(new MyBuildItem());
+}
+----
+
+The output of a `ObserverConfigurator` is recorded as bytecode. 
+Therefore, there are some limitations in how a synthetic observer is invoked at runtime. 
+Currently, you must generate the bytecode of the method body directly.
+
+[[generated_beans]]
+== Use Case - I Have a Generated Bean Class
+
+No problem.
+You can generate the bytecode of a bean class manually and then all you need to do is to produce a `GeneratedBeanBuildItem` instead of `GeneratedClassBuildItem`.
+
+.`GeneratedBeanBuildItem` Example
+[source,java]
+----
+@BuildStep
+void generatedBean(BuildProducer<GeneratedBeanBuildItem> generatedBeans) {
+    ClassOutput beansClassOutput = new GeneratedBeanGizmoAdaptor(generatedBeans); <1>
+    ClassCreator beanClassCreator = ClassCreator.builder().classOutput(beansClassOutput)
+                .className("org.acme.MyBean")
+                .build();
+    beanClassCreator.addAnnotation(Singleton.class);
+    beanClassCreator.close(); <2>
+}
+----
+<1> `io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor` makes it easy to produce ``GeneratedBeanBuildItem``s from Gizmo constructs.
+<2> The resulting bean class is something like `public class @Singleton MyBean { }`.
+
+== Use Case - I Need to Validate the Deployment
+
+Sometimes extensions need to inspect the beans, observers and injection points, then perform additional validations and fail the build if something is wrong.
+
+_Solution_: If an extension needs to validate the deployment it should use the `ValidationPhaseBuildItem`.
+
+IMPORTANT: A build step that consumes the `ValidationPhaseBuildItem` should always produce a `ValidationErrorBuildItem` or at least inject a `BuildProducer` for this build item, otherwise it could be ignored or processed at the wrong time (e.g. after the correct CDI bootstrap phase).
+
+[source,java]
+----
+@BuildStep
+void validate(ValidationPhaseBuildItem validationPhase,
+            BuildProducer<MyBuildItem> myBuildItem, 
+            BuildProducer<ValidationErrorBuildItem> errors) {
+   if (someCondition) {
+     errors.produce(new ValidationErrorBuildItem(new IllegalStateException()));
+     myBuildItem.produce(new MyBuildItem());
+   }
+}
+----
+
+TIP: You can easily filter all registered beans via the convenient `BeanStream` returned from the `ValidationPhaseBuildItem.getContext().beans()` method.
+
+[[custom_context]]
+== Use Case - Register a Custom CDI Context
+
+Sometimes extensions need to extend the set of built-in CDI contexts.
+
+_Solution_: If you need to register a custom context, use the `ContextRegistrationPhaseBuildItem`.
+
+IMPORTANT: A build step that consumes the `ContextRegistrationPhaseBuildItem` should always produce a `ContextConfiguratorBuildItem` or at least inject a `BuildProducer` for this build item, otherwise it could be ignored or processed at the wrong time (e.g. after the correct CDI bootstrap phase).
+
+`ContextRegistrationPhaseBuildItem` Example
+[source,java]
+----
+@BuildStep
+ContextConfiguratorBuildItem registerContext(ContextRegistrationPhaseBuildItem phase) {
+      return new ContextConfiguratorBuildItem(phase.getContext().configure(TransactionScoped.class).normal().contextClass(TransactionContext.class));
+}
+----
+
+Additionally, each extension that registers a custom CDI context via `ContextRegistrationPhaseBuildItem` should also produce the `CustomScopeBuildItem` in order to contribute the custom scope annotation name to the set of bean defining annotations.
+
+`CustomScopeBuildItem` Example
+[source,java]
+----
+@BuildStep
+CustomScopeBuildItem customScope() {
+   return new CustomScopeBuildItem(DotName.createSimple(TransactionScoped.class.getName()));
+}
+----
+
+=== What if I Need to Know All the Scopes Used in the Application?
+
+_Solution_: You can inject the `CustomScopeAnnotationsBuildItem` in a build step and use the convenient methods such as `CustomScopeAnnotationsBuildItem.isScopeDeclaredOn()`.
+
+[[additional_interceptor_bindings]]
+== Use Case - Additional Interceptor Bindings
+
+In rare cases it might be handy to programmatically register an existing annotation that is not annotated with `@javax.interceptor.InterceptorBinding` as an interceptor binding.
+This is similar to what CDI achieves through `BeforeBeanDiscovery#addInterceptorBinding()`.
+We are going to use `InterceptorBindingRegistrarBuildItem` to get it done.
+
+.`InterceptorBindingRegistrarBuildItem` Example
+[source,java]
+----
+@BuildStep
+InterceptorBindingRegistrarBuildItem addInterceptorBindings() {
+    return new InterceptorBindingRegistrarBuildItem(new InterceptorBindingRegistrar() {
+        @Override
+        public Map<DotName, Set<String>> registerAdditionalBindings() {
+            return Collections.singletonMap(DotName.createSimple(NotAnInterceptorBinding.class.getName()),
+                                        Collections.emptySet());
+        }
+    });
+}
+----
+
+== Use Case - Additional Qualifiers
+
+Sometimes it might be useful to register an existing annotation that is not annotated with `@javax.inject.Qualifier` as a CDI qualifier.
+This is similar to what CDI achieves through `BeforeBeanDiscovery#addQualifier()`.
+We are going to use `QualifierRegistrarBuildItem` to get it done.
+
+.`QualifierRegistrarBuildItem` Example
+[source,java]
+----
+@BuildStep
+QualifierRegistrarBuildItem addQualifiers() {
+    return new QualifierRegistrarBuildItem(new QualifierRegistrar() {
+        @Override
+        public Map<DotName, Set<String>> getAdditionalQualifiers() {
+            return Collections.singletonMap(DotName.createSimple(NotAQualifier.class.getName()),
+                                        Collections.emptySet());
+        }
+    });
+}
+----
+
+[[injection_point_transformation]]
+== Use Case - Injection Point Transformation
+
+Every now and then it is handy to be able to change the qualifiers of an injection point programmatically.
+You can do just that with `InjectionPointTransformerBuildItem`.
+The following sample shows how to apply transformation to injection points with type `Foo` that contain qualifier `MyQualifier`:
+
+.`InjectionPointTransformerBuildItem` Example
+[source,java]
+----
+@BuildStep
+InjectionPointTransformerBuildItem transformer() {
+    return new InjectionPointTransformerBuildItem(new InjectionPointsTransformer() {
+
+        public boolean appliesTo(Type requiredType) {
+            return requiredType.name().equals(DotName.createSimple(Foo.class.getName()));
+        }
+
+        public void transform(TransformationContext context) {
+            if (context.getQualifiers().stream()
+                    .anyMatch(a -> a.name().equals(DotName.createSimple(MyQualifier.class.getName())))) {
+                context.transform()
+                        .removeAll()
+                        .add(DotName.createSimple(MyOtherQualifier.class.getName()))
+                        .done();
+            }
+        }
+    });
+}
+----
+
+NOTE: In theory, you can use <<annotations_transformer_build_item,an `AnnotationsTransformer`>> to achieve the same goal. However, there are few differences that make `InjectionPointsTransformer` more suitable for this particular task: (1) annotation transformers are applied to all classes during bean discovery, whereas `InjectionPointsTransformer` is only applied to discovered injection points after bean discovery; (2) with `InjectionPointsTransformer` you don't need to handle various types of injection points (field, parameters of initializer methods, etc.).
+
+== Use Case - Resource Annotations and Injection
+
+The `ResourceAnnotationBuildItem` can be used to specify resource annotations that make it possible to resolve non-CDI injection points, such as Jakarta EE resources.
+An integrator must also provide a corresponding `io.quarkus.arc.ResourceReferenceProvider` service provider implementation. 
+
+.`ResourceAnnotationBuildItem` Example
+[source,java]
+----
+@BuildStep
+void setupResourceInjection(BuildProducer<ResourceAnnotationBuildItem> resourceAnnotations, BuildProducer<GeneratedResourceBuildItem> resources) {
+    resources.produce(new GeneratedResourceBuildItem("META-INF/services/io.quarkus.arc.ResourceReferenceProvider",
+        MyResourceReferenceProvider.class.getName().getBytes()));
+    resourceAnnotations.produce(new ResourceAnnotationBuildItem(DotName.createSimple(MyAnnotation.class.getName())));
+}
+----
+
+[[build_metadata]]
+== Available Build Time Metadata
+
+Any of the above extensions that operates with `BuildExtension.BuildContext` can leverage certain build time metadata that are generated during build.
+The built-in keys located in `io.quarkus.arc.processor.BuildExtension.Key` are:
+
+ANNOTATION_STORE:: Contains an `AnnotationStore` that keeps information about all `AnnotationTarget` annotations after application of annotation transformers
+INJECTION_POINTS:: `Collection<InjectionPointInfo>` containing all injection points
+BEANS:: `Collection<BeanInfo>` containing all beans
+REMOVED_BEANS:: `Collection<BeanInfo>` containing all the removed beans; see <<cdi-reference.adoc#remove_unused_beans,Removing unused beans>> for more information
+OBSERVERS:: `Collection<ObserverInfo>` containing all observers
+SCOPES:: `Collection<ScopeInfo>` containing all scopes, including custom ones
+QUALIFIERS:: `Map<DotName, ClassInfo>` containing all qualifiers
+INTERCEPTOR_BINDINGS:: `Map<DotName, ClassInfo>` containing all interceptor bindings
+STEREOTYPES:: `Map<DotName, StereotypeInfo>` containing all stereotypes
+
+To get hold of these, simply query the extension context object for given key.
+Note that these metadata are made available as build proceeds which means that extensions can only leverage metadata that were built before the extensions are invoked.
+If your extension attempts to retrieve metadata that wasn't yet produced, `null` will be returned.
+Here is a summary of which extensions can access which metadata:
+
+AnnotationsTransformer:: Shouldn't rely on any metadata as it could be used at any time in any phase of the bootstrap
+ContextRegistrar:: Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`
+InjectionPointsTransformer:: Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`
+ObserverTransformer:: Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`
+BeanRegistrar:: Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`, `BEANS` (class-based beans only), `OBSERVERS` (class-based observers only), `INJECTION_POINTS`
+ObserverRegistrar:: Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`, `BEANS`, `OBSERVERS` (class-based observers only), `INJECTION_POINTS`
+BeanDeploymentValidator:: Has access to all build metadata
diff --git a/docs/src/main/asciidoc/cdi-reference.adoc b/docs/src/main/asciidoc/cdi-reference.adoc
index 8ff45199a1805..43d9a167a039f 100644
--- a/docs/src/main/asciidoc/cdi-reference.adoc
+++ b/docs/src/main/asciidoc/cdi-reference.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Contexts and Dependency Injection
 
@@ -11,7 +11,7 @@ include::./attributes.adoc[]
 :sectnumlevels: 4
 :toc:
 
-Quarkus DI solution is based on the http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html[Contexts and Dependency Injection for Java 2.0, window="_blank"] specification.
+Quarkus DI solution (also called ArC) is based on the http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html[Contexts and Dependency Injection for Java 2.0, window="_blank"] specification.
 However, it is not a full CDI implementation verified by the TCK.
 Only a subset of the CDI features is implemented - see also <<supported_features,the list of supported features>> and <<limitations,the list of limitations>>.
 
@@ -67,6 +67,15 @@ To generate the index just add the following to your `pom.xml`:
 </build>
 ----
 
+If you are are using gradle, you can apply the following plugin to your `build.gradle`:
+
+[source,groovy]
+----
+plugins {
+    id 'org.kordamp.gradle.jandex' version '0.6.0'
+}
+----
+
 If you can't modify the dependency, you can still index it by adding `quarkus.index-dependency` entries to your `application.properties`:
 
 [source,properties]
@@ -78,6 +87,15 @@ quarkus.index-dependency.<name>.classifier=(this one is optional)
 
 For example, the following entries ensure that the `org.acme:acme-api` dependency is indexed:
 
+.Example application.properties
+[source,properties]
+----
+quarkus.index-dependency.acme.group-id=org.acme <1>
+quarkus.index-dependency.acme.artifact-id=acme-api <2>
+----
+<1> Value is a group id for a dependency identified by name `acme`.
+<2> Value is an artifact id for a dependency identified by name `acme`.
+
 === How To Exclude Types and Dependencies from Discovery
 
 It may happen that some beans from third-party libraries do not work correctly in Quarkus.
@@ -118,7 +136,7 @@ quarkus.arc.exclude-dependency.acme.artifact-id=acme-services <2>
 == Native Executables and Private Members
 
 Quarkus is using GraalVM to build a native executable.
-One of the limitations of GraalVM is the usage of https://github.com/oracle/graal/blob/master/substratevm/LIMITATIONS.md#user-content-reflection[Reflection, window="_blank"].
+One of the limitations of GraalVM is the usage of https://github.com/oracle/graal/blob/master/substratevm/Limitations.md#reflection[Reflection, window="_blank"].
 Reflective operations are supported but all relevant members must be registered for reflection explicitly.
 Those registrations result in a bigger native executable.
 
@@ -250,6 +268,7 @@ public class PingResource {
 <2> Injection itself does not result in the instantiation of `CoolService`. A client proxy is injected. 
 <3> The first invocation upon the injected proxy triggers the instantiation of `CoolService`.
 
+[[startup_event]]
 ==== Startup Event
 
 However, if you really need to instantiate a bean eagerly you can:
@@ -483,7 +502,7 @@ Quarkus adds a capability that CDI currently does not support which is to condit
 via the `@io.quarkus.arc.profile.IfBuildProfile` and `@io.quarkus.arc.profile.UnlessBuildProfile` annotations.
 When used in conjunction with `@io.quarkus.arc.DefaultBean`, these annotations allow for the creation of different bean configurations for different build profiles.
 
-Imagine for instance that an application contains a bean named `Tracer`, which needs to be do nothing when in tests or dev-mode, but work in its normal capacity for the production artifact.
+Imagine for instance that an application contains a bean named `Tracer`, which needs to be do nothing when in tests or dev-mode, but works in its normal capacity for the production artifact.
 An elegant way to create such beans is the following:
 
 [source,java]
@@ -505,7 +524,7 @@ public class TracerConfiguration {
 }
 ----
 
-If instead, it is required that the `Tracer` bean also work in dev-mode and only default to doing nothing for tests, then `@UnlessBuildProfile` would be ideal. The code would look like:
+If instead, it is required that the `Tracer` bean also works in dev-mode and only default to doing nothing for tests, then `@UnlessBuildProfile` would be ideal. The code would look like:
 
 [source,java]
 ----
@@ -513,13 +532,13 @@ If instead, it is required that the `Tracer` bean also work in dev-mode and only
 public class TracerConfiguration {
 
     @Produces
-    @DefaultBean
+    @UnlessBuildProfile("test") // this will be enabled for both prod and dev build time profiles
     public Tracer realTracer(Reporter reporter, Configuration configuration) {
         return new RealTracer(reporter, configuration);
     }
 
     @Produces
-    @UnlessBuildProfile("prod") // this will be enabled for both test and dev build time profiles
+    @DefaultBean
     public Tracer noopTracer() {
         return new NoopTracer();
     }
@@ -531,7 +550,7 @@ NOTE: The runtime profile has absolutely no effect on the bean resolution using
 === Enabling Beans for Quarkus Build Properties
 
 Quarkus adds a capability that CDI currently does not support which is to conditionally enable a bean when a Quarkus build time property has a specific value,
-via the `@io.quarkus.arc.properties.IfBuildProperty` annotation.
+via the `@io.quarkus.arc.properties.IfBuildProperty` and `@io.quarkus.arc.properties.UnlessBuildProperty` annotation.
 When used in conjunction with `@io.quarkus.arc.DefaultBean`, this annotation allow for the creation of different bean configurations for different build properties.
 
 The scenario we mentioned above with `Tracer` could also be implemented in the following way:
@@ -555,6 +574,27 @@ public class TracerConfiguration {
 }
 ----
 
+If instead, it is required that the `RealTracer` bean is only used if the `some.tracer.enabled` property is not `false`, then `@UnlessBuildProperty` would be ideal. The code would look like:
+
+[source,java]
+----
+@Dependent
+public class TracerConfiguration {
+
+    @Produces
+    @UnlessBuildProperty(name = "some.tracer.enabled", stringValue = "false")
+    public Tracer realTracer(Reporter reporter, Configuration configuration) {
+        return new RealTracer(reporter, configuration);
+    }
+
+    @Produces
+    @DefaultBean
+    public Tracer noopTracer() {
+        return new NoopTracer();
+    }
+}
+----
+
 NOTE: Properties set at runtime have absolutely no effect on the bean resolution using `@IfBuildProperty`.
 
 === Declaring Selected Alternatives
@@ -635,7 +675,7 @@ It's possible to annotate a non-private static method with an interceptor bindin
 class Services {
 
   @Logged <1>
-  static BigDecimal computePrice(long amout) { <2>
+  static BigDecimal computePrice(long amount) { <2>
     BigDecimal price;
     // Perform computations...
     return price;
@@ -681,7 +721,7 @@ import io.quarkus.arc.Lock;
 @ApplicationScoped
 class SharedService {
 
-  void addAmount(BigDecimal amout) {
+  void addAmount(BigDecimal amount) {
     // ...changes some internal state of the bean
   }
   
@@ -695,368 +735,75 @@ class SharedService {
 <2> `@Lock(Lock.Type.READ)` overrides the value specified at class level. It means that any number of clients can invoke the method concurrently, unless the bean instance is locked by `@Lock(Lock.Type.WRITE)`. 
 <3> You can also specify the "wait time". If it's not possible to acquire the lock in the given time a `LockException` is thrown.
 
-[[build_time_apis]]
-== Build Time Extension Points
-
-[[portable_extensions]]
-=== Portable Extensions
-
-Quarkus incorporates build-time optimizations in order to provide instant startup and low memory footprint.
-The downside of this approach is that CDI Portable Extensions cannot be supported.
-Nevertheless, most of the functionality can be achieved using Quarkus link:writing-extensions[extensions].
-
-=== Additional Bean Defining Annotations
-
-As described in <<bean_discovery>> bean classes that don’t have a bean defining annotation are not discovered.
-However, `BeanDefiningAnnotationBuildItem` can be used to extend the set of default bean defining annotations (`@Dependent`, `@Singleton`, `@ApplicationScoped`, `@RequestScoped` and `@Stereotype` annotations):
-
-[source,java]
-----
-@BuildStep
-BeanDefiningAnnotationBuildItem additionalBeanDefiningAnnotation() {
-    return new BeanDefiningAnnotationBuildItem(DotName.createSimple("javax.ws.rs.Path")));
-}
-----
-
-NOTE: Bean registrations that are result of a `BeanDefiningAnnotationBuildItem` are unremovable by default. See also <<remove_unused_beans>>.
-
-=== Resource Annotations
-
-`ResourceAnnotationBuildItem` is used to specify resource annotations  that make it possible to resolve non-CDI injection points, such as Java EE resources.
-
-NOTE: An integrator must also provide a corresponding `io.quarkus.arc.ResourceReferenceProvider` implementation. 
-
-[source,java]
-----
-@BuildStep
-void setupResourceInjection(BuildProducer<ResourceAnnotationBuildItem> resourceAnnotations, BuildProducer<GeneratedResourceBuildItem> resources) {
-    resources.produce(new GeneratedResourceBuildItem("META-INF/services/io.quarkus.arc.ResourceReferenceProvider",
-        JPAResourceReferenceProvider.class.getName().getBytes()));
-    resourceAnnotations.produce(new ResourceAnnotationBuildItem(DotName.createSimple(PersistenceContext.class.getName())));
-}
-----
-
-[[additional_beans]]
-=== Additional Beans
-
-`AdditionalBeanBuildItem` is used to specify additional bean classes to be analyzed during discovery.
-Additional bean classes are transparently added to the application index processed by the container.
-
-[source,java]
-----
-@BuildStep
-List<AdditionalBeanBuildItem> additionalBeans() {
-     return Arrays.asList(
-          new AdditionalBeanBuildItem(SmallRyeHealthReporter.class),
-          new AdditionalBeanBuildItem(HealthServlet.class));
-}
-----
-
-NOTE: A bean registration that is a result of an `AdditionalBeanBuildItem` is removable by default. See also <<remove_unused_beans>>.
-
-[[synthetic_beans]]
-=== Synthetic Beans
-
-Sometimes it is very useful to be able to register a synthetic bean.
-Bean attributes of a synthetic bean are not derived from a java class, method or field.
-Instead, the attributes are specified by an extension.
-In CDI, this could be achieved using the `AfterBeanDiscovery.addBean()` methods.
-In Quarkus, there are three ways to register a synthetic bean.
-
-==== `BeanRegistrarBuildItem`
-
-A build step can produce a `BeanRegistrarBuildItem` and leverage the `io.quarkus.arc.processor.BeanConfigurator` API to build a synthetic bean definition.
-
-.`BeanRegistrarBuildItem` Example
-[source,java]
-----
-@BuildStep
-BeanRegistrarBuildItem syntheticBean() {
-     return new BeanRegistrarBuildItem(new BeanRegistrar() {
-
-            @Override
-            public void register(RegistrationContext registrationContext) {
-                 registrationContext.configure(String.class).types(String.class).qualifiers(new MyQualifierLiteral()).creator(mc -> mc.returnValue(mc.load("foo"))).done();
-            }
-        }));
-}
-----
-
-NOTE: The output of a `BeanConfigurator` is recorded as bytecode. Therefore there are some limitations in how a synthetic bean instance is created. See also `BeanConfigurator.creator()` methods.
-
-TIP: You can easily filter all class-based beans via the convenient `BeanStream` returned from the `RegistrationContext.beans()` method.
-
-==== `BeanRegistrationPhaseBuildItem`
-
-If a build step *needs to produce other build items during the registration* it should use the `BeanRegistrationPhaseBuildItem`.
-The reason is that injected objects are only valid during a `@BuildStep` method invocation.
-
-.`BeanRegistrationPhaseBuildItem` Example
-[source,java]
-----
-@BuildStep
-void syntheticBean(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
-            BuildProducer<MyBuildItem> myBuildItem, 
-            BuildProducer<BeanConfiguratorBuildItem> beanConfigurators) {
-   beanConfigurators.produce(new BeanConfiguratorBuildItem(beanRegistrationPhase.getContext().configure(String.class).types(String.class).qualifiers(new MyQualifierLiteral()).creator(mc -> mc.returnValue(mc.load("foo")))));
-   myBuildItem.produce(new MyBuildItem());
-}
-----
-
-NOTE: See the `BeanRegistrationPhaseBuildItem` javadoc for more information.
-
-==== `SyntheticBeanBuildItem`
-
-Finally, a build step can produce a `SyntheticBeanBuildItem` to register a synthetic bean whose instance can be easily *produced through a <<writing-extensions.adoc#bytecode-recording,recorder>>*.
-The extended `BeanConfigurator` accepts either a `io.quarkus.runtime.RuntimeValue` or a `java.util.function.Supplier`.
-
-.`SyntheticBeanBuildItem` Example
-[source,java]
-----
-@BuildStep
-@Record(STATIC_INIT)
-SyntheticBeanBuildItem syntheticBean(TestRecorder recorder) {
-   return SyntheticBeanBuildItem.configure(Foo.class).scope(Singleton.class)
-                .runtimeValue(recorder.createFoo())
-                .done();
-}
-----
-
-
-=== Annotation Transformations
-
-A very common task is to override the annotations found on the bean classes.
-For example you might want to add an interceptor binding to a specific bean class.
-Here is how to do it - use the `AnnotationsTransformerBuildItem`:
-
-[source,java]
-----
-@BuildStep
-AnnotationsTransformerBuildItem transform() {
-    return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
-        public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind kind) {
-            return kind == org.jboss.jandex.AnnotationTarget.Kind.CLASS;
-        }
-
-        public void transform(TransformationContext context) {
-            if (context.getTarget().asClass().name().toString().equals("com.foo.Bar")) {
-                context.transform().add(MyInterceptorBinding.class).done();
-            }
-        }
-    });
-}
-----
-
-=== Additional Interceptor Bindings
-
-In rare cases it might be handy to programmatically register an existing annotation as interceptor binding.
-This is similar to what pure CDI achieves through `BeforeBeanDiscovery#addInterceptorBinding()`.
-Though here we are going to use `InterceptorBindingRegistrarBuildItem` to get it done.
-Note that you can register multiple annotations in one go:
-
-[source,java]
-----
-@BuildStep
-InterceptorBindingRegistrarBuildItem addInterceptorBindings() {
-    InterceptorBindingRegistrarBuildItem additionalBindingsRegistrar = new InterceptorBindingRegistrarBuildItem(new InterceptorBindingRegistrar() {
-        @Override
-        public Collection<DotName> registerAdditionalBindings() {
-            Collection<DotName> result = new HashSet<>();
-            result.add(DotName.createSimple(MyAnnotation.class.getName()));
-            result.add(DotName.createSimple(MyOtherAnnotation.class.getName()));
-            return result;
-        }
-    });
-    return additionalBindingsRegistrar;
-}
-----
-
-=== Injection Point Transformation
-
-Every now and then it is handy to be able to change qualifiers of an injection point programmatically.
-You can do just that with `InjectionPointTransformerBuildItem`.
-The following sample shows how to apply transformation to injection points with type `Foo` that contain qualifier `MyQualifier`:
-
-[source,java]
-----
-@BuildStep
-InjectionPointTransformerBuildItem transformer() {
-    return new InjectionPointTransformerBuildItem(new InjectionPointsTransformer() {
-
-        public boolean appliesTo(Type requiredType) {
-            return requiredType.name().equals(DotName.createSimple(Foo.class.getName()));
-        }
-
-        public void transform(TransformationContext context) {
-            if (context.getQualifiers().stream()
-                    .anyMatch(a -> a.name().equals(DotName.createSimple(MyQualifier.class.getName())))) {
-                context.transform()
-                        .removeAll()
-                        .add(DotName.createSimple(MyOtherQualifier.class.getName()))
-                        .done();
-            }
-        }
-    });
-}
-----
+=== Repeatable interceptor bindings
 
-=== Observer Transformation
+Quarkus has limited support for `@Repeatable` interceptor binding annotations.
 
-Any https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#observer_methods[observer method] definition can be vetoed or transformed using an `ObserverTransformerBuildItem`.
-The attributes that can be transformed include:
+When binding an interceptor to a component, you can declare multiple `@Repeatable` annotations on methods.
+Repeatable interceptor bindings declared on classes and stereotypes are not supported, because there are some open questions around interactions with the Interceptors specification.
+This might be added in the future.
 
-- https://docs.jboss.org/cdi/api/2.0/javax/enterprise/inject/spi/ObserverMethod.html#getObservedQualifiers--[qualifiers] 
-- https://docs.jboss.org/cdi/api/2.0/javax/enterprise/inject/spi/ObserverMethod.html#getReception--[reception] 
-- https://docs.jboss.org/cdi/api/2.0/javax/enterprise/inject/spi/ObserverMethod.html#getPriority--[priority] 
-- https://docs.jboss.org/cdi/api/2.0/javax/enterprise/inject/spi/ObserverMethod.html#getTransactionPhase--[transaction phase] 
-- https://docs.jboss.org/cdi/api/2.0/javax/enterprise/inject/spi/ObserverMethod.html#isAsync--[asynchronous] 
+As an example, suppose we have an interceptor that clears a cache.
+The corresponding interceptor binding would be called `@CacheInvalidateAll` and would be declared as `@Repeatable`.
+If we wanted to clear two caches at the same time, we would add `@CacheInvalidateAll` twice:
 
 [source,java]
 ----
-@BuildStep
-ObserverTransformerBuildItem transformer() {
-    return new ObserverTransformerBuildItem(new ObserverTransformer() {
-
-        public boolean appliesTo(Type observedType, Set<AnnotationInstance> qualifiers) {
-            return observedType.name.equals(DotName.createSimple(MyEvent.class.getName()));
-        }
-
-        public void transform(TransformationContext context) {
-            // Veto all observers of MyEvent
-            context.veto();
-        }
-    });
+@ApplicationScoped
+class CachingService {
+  @CacheInvalidateAll(cacheName = "foo")
+  @CacheInvalidateAll(cacheName = "bar")
+  void heavyComputation() {
+    // ...
+    // some computation that updates a lot of data
+    // and requires 2 caches to be invalidated
+    // ...
+  }
 }
 ----
 
-=== Bean Deployment Validation
-
-Once the bean deployment is ready an extension can perform additional validations and inspect the found beans, observers and injection points.
-Register a `BeanDeploymentValidatorBuildItem`:
-
-[source,java]
-----
-@BuildStep
-BeanDeploymentValidatorBuildItem beanDeploymentValidator() {
-    return new BeanDeploymentValidatorBuildItem(new BeanDeploymentValidator() {
-         public void validate(ValidationContext validationContext) {
-             for (InjectionPointInfo injectionPoint : validationContext.get(Key.INJECTION_POINTS)) {
-                 System.out.println("Injection point: " + injectionPoint);
-             }
-         }
-    });
-}
-----
+This is how interceptors are used.
+What about creating an interceptor?
 
-TIP: You can easily filter all registered beans via the convenient `BeanStream` returned from the `ValidationContext.beans()` method.
+When declaring interceptor bindings of an interceptor, you can add multiple `@Repeatable` annotations to the interceptor class as usual.
+This is useless when the annotation members are `@Nonbinding`, as would be the case for the `@Cached` annotation, but is important otherwise.
 
-If an extension needs to produce other build items during the "validation" phase it should use the `ValidationPhaseBuildItem` instead.
-The reason is that injected objects are only valid during a `@BuildStep` method invocation.
+For example, suppose we have an interceptor that can automatically log method invocations to certain targets.
+The interceptor binding annotation `@Logged` would have a member called `target`, which specifies where to store the log.
+Our implementation could be restricted to console logging and file logging:
 
 [source,java]
 ----
-@BuildStep
-void validate(ValidationPhaseBuildItem validationPhase,
-            BuildProducer<MyBuildItem> myBuildItem, 
-            BuildProducer<ValidationErrorBuildItem> errors) {
-   if (someCondition) {
-     errors.produce(new ValidationErrorBuildItem(new IllegalStateException()));
-     myBuildItem.produce(new MyBuildItem());
-   }
+@Interceptor
+@Logged(target = "console")
+@Logged(target = "file")
+class NaiveLoggingInterceptor {
+  // ...
 }
 ----
 
-NOTE: See `ValidationPhaseBuildItem` javadoc for more information.
-
-
-=== Custom Contexts
-
-An extension can register a custom `InjectableContext` implementation by means of a `ContextRegistrarBuildItem`:
-
-[source,java]
-----
-@BuildStep
-ContextRegistrarBuildItem customContext() {
-    return new ContextRegistrarBuildItem(new ContextRegistrar() {
-         public void register(RegistrationContext registrationContext) {
-            registrationContext.configure(CustomScoped.class).normal().contextClass(MyCustomContext.class).done();
-         }
-    });
-}
-----
+Other interceptors could be provided to log method invocations to different targets.
 
-If an extension needs to produce other build items during the "context registration" phase it should use the `ContextRegistrationPhaseBuildItem` instead.
-The reason is that injected objects are only valid during a `@BuildStep` method invocation.
+[[build_time_apis]]
+== Build Time Extensions
 
-[source,java]
-----
-@BuildStep
-void addContext(ContextRegistrationPhaseBuildItem contextRegistrationPhase,
-            BuildProducer<MyBuildItem> myBuildItem, 
-            BuildProducer<ContextConfiguratorBuildItem> contexts) {
-   contexts.produce(new ContextConfiguratorBuildItem(contextRegistrationPhase.getContext().configure(CustomScoped.class).normal().contextClass(MyCustomContext.class)));
-   myBuildItem.produce(new MyBuildItem());
-}
-----
+Quarkus incorporates build-time optimizations in order to provide instant startup and low memory footprint.
+The downside of this approach is that CDI Portable Extensions cannot be supported.
+Nevertheless, most of the functionality can be achieved using Quarkus link:writing-extensions[extensions].
+See the link:cdi-integration[integration guide] for more information.
 
-NOTE: See `ContextRegistrationPhaseBuildItem` javadoc for more information.
-
-
-[[build_metadata]]
-=== Available Build Time Metadata
-
-Any of the above extensions that operates with `BuildExtension.BuildContext` can leverage certain build time metadata that are generated during build.
-The built-in keys located in `io.quarkus.arc.processor.BuildExtension.Key` are:
-
-* `ANNOTATION_STORE`
-** Contains an `AnnotationStore` that keeps information about all `AnnotationTarget` annotations after application of annotation transformers
-* `INJECTION_POINTS`
-** `Collection<InjectionPointInfo>` containing all injection points
-* `BEANS`
-** `Collection<BeanInfo>` containing all beans
-* `REMOVED_BEANS`
-** `Collection<BeanInfo>` containing all the removed beans; see <<remove_unused_beans>> for more information
-* `OBSERVERS`
-** `Collection<ObserverInfo>` containing all observers
-* `SCOPES`
-** `Collection<ScopeInfo>` containing all scopes, including custom ones
-* `QUALIFIERS`
-** `Map<DotName, ClassInfo>` containing all qualifiers
-* `INTERCEPTOR_BINDINGS`
-** `Map<DotName, ClassInfo>` containing all interceptor bindings
-* `STEREOTYPES`
-** `Map<DotName, ClassInfo>` containing all stereotypes
-
-To get hold of these, simply query the extension context object for given key.
-Note that these metadata are made available as build proceeds which means that extensions can only leverage metadata that were build before they are invoked.
-If your extension attempts to retrieve metadata that wasn't yet produced, `null` will be returned.
-Here is a summary of which extensions can access which metadata:
-
-* `AnnotationsTransformer`
-** Shouldn't rely on any metadata as this is one of the first CDI extensions invoked
-* `ContextRegistrar`
-** Has access to `ANNOTATION_STORE`
-* `InjectionPointsTransformer`
-** Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`
-* `ObserverTransformer`
-** Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`
-* `BeanRegistrar`
-** Has access to `ANNOTATION_STORE`, `QUALIFIERS`, `INTERCEPTOR_BINDINGS`, `STEREOTYPES`, `BEANS`
-* `BeanDeploymentValidator`
-** Has access to all build metadata
-
-[[dev-mode]]
 == Development Mode
 
 In the development mode, two special endpoints are registered automatically to provide some basic debug info in the JSON format:
 
-* HTTP GET `/quarkus/arc/beans` - returns the list of all beans
+* HTTP GET `/q/arc` - returns the summary; number of beans, config properties, etc.
+* HTTP GET `/q/arc/beans` - returns the list of all beans
 ** You can use query params to filter the output:
-*** `scope` - include beans with scope that ends with the given value, i.e. `http://localhost:8080/quarkus/arc/beans?scope=ApplicationScoped`
-*** `beanClass` - include beans with bean class that starts with the given value, i.e. `http://localhost:8080/quarkus/arc/beans?beanClass=org.acme.Foo`
-*** `kind` - include beans of the specified kind (`CLASS`, `PRODUCER_FIELD`, `PRODUCER_METHOD`, `INTERCEPTOR` or `SYNTHETIC`), i.e. `http://localhost:8080/quarkus/arc/beans?kind=PRODUCER_METHOD`
-* HTTP GET `/quarkus/arc/observers` - returns the list of all observer methods
+*** `scope` - include beans with scope that ends with the given value, i.e. `http://localhost:8080/q/arc/beans?scope=ApplicationScoped`
+*** `beanClass` - include beans with bean class that starts with the given value, i.e. `http://localhost:8080/q/arc/beans?beanClass=org.acme.Foo`
+*** `kind` - include beans of the specified kind (`CLASS`, `PRODUCER_FIELD`, `PRODUCER_METHOD`, `INTERCEPTOR` or `SYNTHETIC`), i.e. `http://localhost:8080/q/arc/beans?kind=PRODUCER_METHOD`
+* HTTP GET `/q/arc/removed-beans` - returns the list of unused beans removed during build
+* HTTP GET `/q/arc/observers` - returns the list of all observer methods
 
 NOTE: These endpoints are only available in the development mode, i.e. when you run your application via `mvn quarkus:dev` (or `./gradlew quarkusDev`).
 
diff --git a/docs/src/main/asciidoc/cdi.adoc b/docs/src/main/asciidoc/cdi.adoc
index 4805d02c537fd..2578910ddbc18 100644
--- a/docs/src/main/asciidoc/cdi.adoc
+++ b/docs/src/main/asciidoc/cdi.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Introduction to Contexts and Dependency Injection
 
@@ -13,26 +13,26 @@ include::./attributes.adoc[]
 
 In this guide we're going to describe the basic principles of the Quarkus programming model that is based on the http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html[Contexts and Dependency Injection for Java 2.0, window="_blank"] specification.
 
-== _Q: OK. Let's start simple. What is a bean?_
+== OK. Let's start simple. What is a bean?
 
-A: Well, a bean is a _container-managed_ object that supports a set of basic services, such as injection of dependencies, lifecycle callbacks and interceptors.
+Well, a bean is a _container-managed_ object that supports a set of basic services, such as injection of dependencies, lifecycle callbacks and interceptors.
 
-== _Q: Wait a minute. What does "container-managed" mean?_
+== Wait a minute. What does "container-managed" mean?
 
-A: Simply put, you don't control the lifecycle of the object instance directly.
+Simply put, you don't control the lifecycle of the object instance directly.
 Instead, you can affect the lifecycle through declarative means, such as annotations, configuration, etc.
 The container is the _environment_ where your application runs.
 It creates and destroys the instances of beans, associates the instances with a designated context, and injects them into other beans.
 
-== _Q: What is it good for?_
+== What is it good for?
 
-A: An application developer can focus on the business logic rather than finding out "where and how" to obtain a fully initialized component with all of its dependencies.
+An application developer can focus on the business logic rather than finding out "where and how" to obtain a fully initialized component with all of its dependencies.
 
 NOTE: You've probably heard of the _inversion of control_ (IoC) programming principle. Dependency injection is one of the implementation techniques of IoC. 
 
-== _Q: What does a bean look like?_
+== What does a bean look like?
 
-A: There are several kinds of beans.
+There are several kinds of beans.
 The most common ones are class-based beans:
 
 .Simple Bean Example
@@ -56,11 +56,12 @@ public class Translator {
 ----
 <1> This is a scope annotation. It tells the container which context to associate the bean instance with. In this particular case, a *single bean instance* is created for the application and used by all other beans that inject `Translator`.
 <2> This is a field injection point. It tells the container that `Translator` depends on the `Dictionary` bean. If there is no matching bean the build fails.
-<3> This is an interceptor binding annotation. In this case, the annotation comes from the MicroProfile Metrics. The relevant interceptor intercepts the invocation and updates the relevant metrics. We will about <<interceptors,interceptors>> later.
+<3> This is an interceptor binding annotation. In this case, the annotation comes from the MicroProfile Metrics. The relevant interceptor intercepts the invocation and updates the relevant metrics. We will talk about <<interceptors,interceptors>> later.
 
-== _Q: Nice. How does the dependency resolution work? I see no names or identifiers._
+[[typesafe_resolution]]
+== Nice. How does the dependency resolution work? I see no names or identifiers.
 
-A: That's a good question.
+That's a good question.
 In CDI the process of matching a bean to an injection point is *type-safe*.
 Each bean declares a set of bean types.
 In our example above, the `Translator` bean has two bean types: `Translator` and `java.lang.Object`.
@@ -68,9 +69,9 @@ Subsequently, a bean is assignable to an injection point if the bean has a bean
 We'll talk about qualifiers later.
 For now, it's enough to know that the bean above is assignable to an injection point of type `Translator` and `java.lang.Object`.
 
-== _Q: Hm, wait a minute. What happens if multiple beans declare the same type?_
+== Hm, wait a minute. What happens if multiple beans declare the same type?
 
-A: There is a simple rule: *exactly one bean must be assignable to an injection point, otherwise the build fails*.
+There is a simple rule: *exactly one bean must be assignable to an injection point, otherwise the build fails*.
 If none is assignable the build fails with `UnsatisfiedResolutionException`.
 If multiple are assignable the build fails with `AmbiguousResolutionException`.
 This is very useful because your application fails fast whenever the container is not able to find an unambiguous dependency for any injection point.
@@ -97,11 +98,11 @@ public class Translator {
 <2> `javax.enterprise.inject.Instance` extends `Iterable`.
 ====
 
-== _Q: Can I use setter and constructor injection?_
+== Can I use setter and constructor injection?
 
-A: Yes, you can.
+Yes, you can.
 In fact, in CDI the "setter injection" is superseded by more powerful https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#initializer_methods[initializer methods, window="_blank"].
-Intializers may accept multiple parameters and don't have to follow the JavaBean naming conventions.
+Initializers may accept multiple parameters and don't have to follow the JavaBean naming conventions.
 
 .Initialized and Constructor Injection Example
 [source,java]
@@ -109,7 +110,7 @@ Intializers may accept multiple parameters and don't have to follow the JavaBean
 @ApplicationScoped
 public class Translator {
 
-    private final TranslatorHelper helper
+    private final TranslatorHelper helper;
 
     Translator(TranslatorHelper helper) { <1>
        this.helper = helper;
@@ -128,9 +129,9 @@ It's also not necessary to add `@Inject` if there is only one constructor presen
 <2> An initializer method must be annotated with `@Inject`. 
 <3> An initializer may accept multiple parameters - each one is an injection point.
 
-== _Q: You talked about some qualifiers?_
+== You talked about some qualifiers?
 
-A: https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#qualifiers[Qualifiers, window="_blank"] are annotations that help the container to distinguish beans that implement the same type.
+https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#qualifiers[Qualifiers, window="_blank"] are annotations that help the container to distinguish beans that implement the same type.
 As we already said a bean is assignable to an injection point if it has all the required qualifiers.
 If you declare no qualifier at an injection point the `@Default` qualifier is assumed.
 
@@ -165,15 +166,15 @@ This bean would be assignable to `@Inject @Superior Translator` and `@Inject @Su
 The reason is that `@Inject Translator` is automatically transformed to `@Inject @Default Translator` during typesafe resolution.
 And since our `SuperiorTranslator` does not declare `@Default` only the original `Translator` bean is assignable.
 
-== _Q: Looks good. What is the bean scope?_
+== Looks good. What is the bean scope?
 
 The scope of a bean determines the lifecycle of its instances, i.e. when and where an instance should be created and destroyed.
 
 NOTE: Every bean has exactly one scope.
 
-== _Q: What scopes can I actually use in my Quarkus application?_
+== What scopes can I actually use in my Quarkus application?
 
-A: You can use all the built-in scopes mentioned by the specification except for `javax.enterprise.context.ConversationScoped`.
+You can use all the built-in scopes mentioned by the specification except for `javax.enterprise.context.ConversationScoped`.
 
 [options="header",cols="1,1"]
 |===
@@ -183,18 +184,39 @@ A: You can use all the built-in scopes mentioned by the specification except for
 |`@javax.inject.Singleton`   | Just like `@ApplicationScoped` except that no client proxy is used. The instance is created when an injection point that resolves to a @Singleton bean is being injected.
 |`@javax.enterprise.context.RequestScoped`   | The bean instance is associated with the current _request_ (usually an HTTP request). 
 |`@javax.enterprise.context.Dependent`   | This is a pseudo-scope. The instances are not shared and every injection point spawns a new instance of the dependent bean. The lifecycle of dependent bean is bound to the bean injecting it - it will be created and destroyed along with the bean injecting it.
-|`@javax.enterprise.context.SessionScoped`   | This scope is backed by an `javax.servlet.http.HttpSession` object. It's only available if the `quarkus-undertow` extension is used.
+|`@javax.enterprise.context.SessionScoped`   | This scope is backed by a `javax.servlet.http.HttpSession` object. It's only available if the `quarkus-undertow` extension is used.
 |===
 
 NOTE: There can be other custom scopes provided by Quarkus extensions. For example, `quarkus-narayana-jta` provides `javax.transaction.TransactionScoped`.
 
+== `@ApplicationScoped` and `@Singleton` look very similar. Which one should I choose for my Quarkus application?
+
+It depends ;-).
+
+A `@Singleton` bean has no <<client_proxies,client proxy>> and hence an instance is _created eagerly_ when the bean is injected. By contrast, an instance of an `@ApplicationScoped` bean is _created lazily_, i.e.
+when a method is invoked upon an injected instance for the first time.
+
+Furthermore, client proxies only delegate method invocations and thus you should never read/write fields of an injected `@ApplicationScoped` bean directly.
+You can read/write fields of an injected `@Singleton` safely.
+
+`@Singleton` should have a slightly better performance because the is no indirection (no proxy that delegates to the current instance from the context).
+
+On the other hand, you cannot mock `@Singleton` beans using <<getting-started-testing.adoc#quarkus_mock,QuarkusMock>>.
+
+`@ApplicationScoped` beans can be also destroyed and recreated at runtime.
+Existing injection points just work because the injected proxy delegates to the current instance.
+
+Therefore, we recommend to stick with `@ApplicationScoped` by default unless there's a good reason to use `@Singleton`.
+
 [[client_proxies]]
-== _Q: I don't undestand the concept of client proxies._
+== I don't understand the concept of client proxies.
 
 Indeed, the https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#client_proxies[client proxies, window="_blank"] could be hard to grasp but they provide some useful functionality.
 A client proxy is basically an object that delegates all method invocations to a target bean instance.
 It's a container construct that implements `io.quarkus.arc.ClientProxy` and extends the bean class.
 
+IMPORTANT: Client proxies only delegate method invocations. So never read or write a field of a normal scoped bean, otherwise you will work with non-contextual or stale data. 
+
 .Generated Client Proxy Example
 [source,java]
 ----
@@ -227,16 +249,16 @@ Client proxies allow for:
 * In rare cases it's practical to destroy the beans manually. A direct injected reference would lead to a stale bean instance.
  
  
-== _Q: OK. You said that there are several kinds of beans?_
+== OK. You said that there are several kinds of beans?
 
-A: Yes. In general, we distinguish:
+Yes. In general, we distinguish:
 
 1. Class beans
 2. Producer methods
 3. Producer fields
 4. Synthetic beans
 
-NOTE: Synthetic beans are usually provided by extensions. Therefore, we not going to cover them in this guide.
+NOTE: Synthetic beans are usually provided by extensions. Therefore, we are not going to cover them in this guide.
 
 Producer methods and fields are useful if you need additional control over instantiation of a bean.
 They are also useful when integrating third-party libraries where you don't control the class source and may not add additional annotations etc.
@@ -285,9 +307,9 @@ No scope annotation is declared and so it's defaulted to `@Dependent`.
 
 There's more about producers. 
 You can declare qualifiers, inject dependencies into the producer methods parameters, etc. 
-You can read more about producers for example in the https://docs.jboss.org/weld/reference/latest/en-US/html/beanscdi.html#_producer_methods[Weld docs, window="_blank"].
+You can read more about producers for example in the https://docs.jboss.org/weld/reference/latest/en-US/html/producermethods.html[Weld docs, window="_blank"].
 
-== _Q: OK, injection looks cool. What other services are provided?_
+== OK, injection looks cool. What other services are provided?
 
 === Lifecycle Callbacks
 
@@ -339,9 +361,9 @@ public class LoggingInterceptor {
    Logger logger;
 
    @AroundInvoke <5>
-   Objec logInvocation(InvocationContext context) {
+   Object logInvocation(InvocationContext context) {
       // ...log before
-      Objec ret = context.proceed(); <6>
+      Object ret = context.proceed(); <6>
       // ...log after
       return ret;
    }
@@ -375,7 +397,7 @@ class TaskCompleted {
 class ComplicatedService {
 
    @Inject
-   Event<Task> event; <1>
+   Event<TaskCompleted> event; <1>
 
    void doSomething() {
       // ...
diff --git a/docs/src/main/asciidoc/centralized-log-management.adoc b/docs/src/main/asciidoc/centralized-log-management.adoc
index ea235ab3a159c..84561341aae5e 100644
--- a/docs/src/main/asciidoc/centralized-log-management.adoc
+++ b/docs/src/main/asciidoc/centralized-log-management.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Centralized log management (Graylog, Logstash, Fluentd)
 
@@ -23,14 +23,14 @@ The following examples will all be based on the same example application that yo
 
 Create an application with the `quarkus-logging-gelf` extension. You can use the following Maven command to create it:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=gelf-logging \
     -DclassName="org.acme.quickstart.GelfLoggingResource" \
     -Dpath="/gelf-logging" \
-    -Dextensions="logging-gelf"
+    -Dextensions="resteasy,logging-gelf"
 ----
 
 If you already have your Quarkus project configured, you can add the `logging-gelf` extension
@@ -136,7 +136,7 @@ You can do it from the Graylog web console (System -> Input -> Select GELF UDP)
 
 This curl example will create a new Input of type GELF UDP, it uses the default login from Graylog (admin/admin).
 
-[source,shell]
+[source,bash]
 ----
 curl -H "Content-Type: application/json" -H "Authorization: Basic YWRtaW46YWRtaW4=" -H "X-Requested-By: curl" -X POST -v -d \
 '{"title":"udp input","configuration":{"recv_buffer_size":262144,"bind_address":"0.0.0.0","port":12201,"decompress_size_limit":8388608},"type":"org.graylog2.inputs.gelf.udp.GELFUDPInput","global":true}' \
@@ -227,7 +227,7 @@ Launch your application, you should see your logs arriving inside the Elastic St
 First, you need to create a Fluentd image with the needed plugins: elasticsearch and input-gelf.
 You can use the following Dockerfile that should be created inside a `fluentd` directory.
 
-[source]
+[source,dockerfile]
 ----
 FROM fluent/fluentd:v1.3-debian
 RUN ["gem", "install", "fluent-plugin-elasticsearch", "--version", "3.7.0"]
@@ -315,7 +315,7 @@ As opposed to the GELF input, the Syslog input will not render multiline logs in
 First, you need to create a Fluentd image with the elasticsearch plugin.
 You can use the following Dockerfile that should be created inside a `fluentd` directory.
 
-[source]
+[source,dockerfile]
 ----
 FROM fluent/fluentd:v1.3-debian
 RUN ["gem", "install", "fluent-plugin-elasticsearch", "--version", "3.7.0"]
diff --git a/docs/src/main/asciidoc/class-loading-reference.adoc b/docs/src/main/asciidoc/class-loading-reference.adoc
index 36a77678a99bd..aaf6077792429 100644
--- a/docs/src/main/asciidoc/class-loading-reference.adoc
+++ b/docs/src/main/asciidoc/class-loading-reference.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Class Loading Reference
 
@@ -19,25 +19,6 @@ a normal production Quarkus application.
 For all other use cases (e.g. tests, dev mode, and building the application) Quarkus
 uses the class loading architecture outlined here.
 
-== Reading Class Bytecode
-
-It is important to use the correct `ClassLoader`. The recommended approach is to get it by calling the
-`Thread.currentThread().getContextClassLoader()` method.
-
-Example:
-
-
-[source,java,subs=attributes+]
-----
-@BuildStep
-GeneratedClassBuildItem instrument(final CombinedIndexBuildItem index) {
-    final String classname = "com.example.SomeClass";
-    final ClassLoader cl = Thread.currentThread().getContextClassLoader();
-    final byte[] originalBytecode = IoUtil.readClassAsBytes(cl, classname);
-    final byte[] enhancedBytecode = ... // class instrumentation from originalBytecode
-    return new GeneratedClassBuildItem(true, classname, enhancedBytecode));
-}
-----
 
 == Bootstrapping Quarkus
 
@@ -191,3 +172,32 @@ file). Simply add an `excludedArtifacts` section as shown below:
 
 This should only be done if the extension depends on a newer version of these artifacts. If the extension does not bring
 in a replacement artifact as a dependency then classes the application needs might end up missing.
+
+== Configuring Class Loading
+
+It is possible to configure some aspects of class loading in dev and test mode. This can be done using `application.properties`.
+Note that class loading config is different to normal config, in that it does not use the standard Quarkus config mechanisms
+(as it is needed too early), so only supports `application.properties`. The following options are supported.
+
+
+include::{generated-dir}/config/quarkus-class-loading-configuration-class-loading-config.adoc[opts=optional, leveloffset=+1]
+
+== Reading Class Bytecode
+
+It is important to use the correct `ClassLoader`. The recommended approach is to get it by calling the
+`Thread.currentThread().getContextClassLoader()` method.
+
+Example:
+
+
+[source,java,subs=attributes+]
+----
+@BuildStep
+GeneratedClassBuildItem instrument(final CombinedIndexBuildItem index) {
+    final String classname = "com.example.SomeClass";
+    final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+    final byte[] originalBytecode = IoUtil.readClassAsBytes(cl, classname);
+    final byte[] enhancedBytecode = ... // class instrumentation from originalBytecode
+    return new GeneratedClassBuildItem(true, classname, enhancedBytecode));
+}
+----
\ No newline at end of file
diff --git a/docs/src/main/asciidoc/cli-tooling.adoc b/docs/src/main/asciidoc/cli-tooling.adoc
index a76ad0e8108a4..c1358c0e00db8 100644
--- a/docs/src/main/asciidoc/cli-tooling.adoc
+++ b/docs/src/main/asciidoc/cli-tooling.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Building Quarkus apps with Quarkus Command Line Interface (CLI)
 
@@ -24,24 +24,32 @@ binary there.
 Then in your shell profile (for Bash shell edit '~/.bash_profile'), export the 'QUARKUS_HOME' 
 folder and add that to your 'PATH':
 
-[source,shell]
+[source,bash]
+----
 export QUARKUS_HOME=/path/to/quarkus-cli
 export PATH="$PATH:$QUARKUS_HOME"
+----
 
 Reload your terminal or do:
 
-[source,shell]
+[source,bash]
+----
 source ~/.bash_profile
+----
 
 Now you can run the Quarkus CLI:
 
 [source,shell]
+----
 $ quarkus --help
+----
 
 This will display the help information with all the available commands.
 
 [source,shell]
+----
 $ quarkus -i
+----
 
 This will start the Quarkus CLI in interactive mode.
 
@@ -54,7 +62,9 @@ As with the native CLI we recommend that you copy the binary to a specific folde
 The jar file requires Java 8 or newer to run. To start the CLI:
 
 [source,shell]
+----
 $ java -jar quarkus-cli.jar
+----
 
 The jar file CLI accepts all the same options and commands as the native binary.
 
@@ -67,7 +77,9 @@ Note: In the examples below switch out 'quarkus' with 'java -jar quarkus-cli.jar
 To create a new project we use the create-project command:
 
 [source,shell]
+----
 $ quarkus create-project hello-world
+----
 
 This will create a folder called 'hello-world' in your current working directory using default
 groupId, artifactId and version values 
@@ -77,25 +89,33 @@ To specify the groupId, artifactId and version values,
 use the '--groupid', '--artifactid' and '--version' options:
 
 [source,shell]
+----
 $ quarkus create-project --groupid=com.foo --artifactId=bar --version=1.0  hello-world
+----
 
 
 Use the help option to display all the possible options:
 
 [source,shell]
+----
 $ quarkus create-project --help
+----
 
 == Dealing with extensions
 
 The Quarkus CLI can obtain a list of the available extensions with:
 
 [source,shell]
+----
 $ quarkus list-extensions
+----
 
 To more easily get an overview and only display the extension names:
 
 [source,shell]
+----
 $ quarkus list-extensions -n
+----
 
 
 == Adding extension(s)
@@ -104,7 +124,9 @@ The Quarkus CLI can add Quarkus extensions to your project with the 'add-extensi
 command:
 
 [source,shell]
+----
 $ quarkus add-extension --extension=hibernate-validator /path/to/my/project
+----
 
 The argument path either needs to be the base folder for the project or a direct path to the 
 build file.
@@ -114,7 +136,9 @@ build file.
 To start dev mode from the Quarkus CLI do:
 
 [source,shell]
+----
 $ quarkus dev /path/to/my/project
+----
 
 As with 'add-extension' the argument path needs to be the base folder for the project or a 
 direct path to the build file.
diff --git a/docs/src/main/asciidoc/command-mode-reference.adoc b/docs/src/main/asciidoc/command-mode-reference.adoc
index 76ae957b596d9..f6f762241e35b 100644
--- a/docs/src/main/asciidoc/command-mode-reference.adoc
+++ b/docs/src/main/asciidoc/command-mode-reference.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Command Mode Applications
 
@@ -113,7 +113,7 @@ As command mode applications will often require arguments to be passed on the co
 mvn compile quarkus:dev -Dquarkus.args='--help'
 ----
 
-The same can be achived with Gradle:
+The same can be achieved with Gradle:
 
 ----
 ./gradlew quarkusDev --quarkus-args='--help'
diff --git a/docs/src/main/asciidoc/config-reference.adoc b/docs/src/main/asciidoc/config-reference.adoc
new file mode 100644
index 0000000000000..0e3aaaae3e37e
--- /dev/null
+++ b/docs/src/main/asciidoc/config-reference.adoc
@@ -0,0 +1,834 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Configuration Reference Guide
+
+include::./attributes.adoc[]
+
+:numbered:
+:sectnums:
+:sectnumlevels: 4
+:toc:
+
+In this reference guide we're going to describe various aspects of Quarkus configuration.
+A Quarkus application and Quarkus itself (core and extensions) are both configured via the same mechanism that leverages the https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config] API.
+Quarkus configuration is based on https://github.com/smallrye/smallrye-config[SmallRye Config], an implementation of the MicroProfile Config specification.
+All of the standard features are supported.
+Moreover, there are several additional features which are made available by the SmallRye Config project as well as by Quarkus itself.
+
+TIP: If you're looking for information how to make a Quarkus extension configurable then see the <<writing-extensions.adoc#configuration,Writing Your Own Extension>> guide.
+
+[[configuration_sources]]
+== Configuration Sources
+
+By default, Quarkus reads configuration properties from several sources (in decreasing priority):
+
+1. <<system_properties,System properties>>
+2. <<environment_variables,Environment variables>>
+3. <<env_file,File named `.env`>> placed in the current working directory
+4. <<pwd_config_application_file,`application.properties` file placed in the `$PWD/config/` directory>>
+5. <<application_properties_file,An application configuration file>>, i.e. `src/main/resources/application.properties`
+
+[[system_properties]]
+=== System properties
+
+* for a runner jar: `java -Dquarkus.datasource.password=youshallnotpass -jar target/quarkus-app/quarkus-run.jar`
+* for a native executable: `./target/myapp-runner -Dquarkus.datasource.password=youshallnotpass`
+
+[[environment_variables]]
+=== Environment variables
+
+* for a runner jar: `export QUARKUS_DATASOURCE_PASSWORD=youshallnotpass ; java -jar target/quarkus-app/quarkus-run.jar`
+* for a native executable: `export QUARKUS_DATASOURCE_PASSWORD=youshallnotpass ; ./target/myapp-runner`
+
+NOTE: Environment variables names are following the conversion rules of link:https://github.com/eclipse/microprofile-config/blob/master/spec/src/main/asciidoc/configsources.asciidoc#default-configsources[Eclipse MicroProfile Config].
+
+[[env_file]]
+=== File named `.env` placed in the current working directory
+
+.Example `.env` file
+[source,properties]
+----
+QUARKUS_DATASOURCE_PASSWORD=youshallnotpass <1>
+----
+<1> The name `QUARKUS_DATASOURCE_PASSWORD` is converted using the same rules as for <<environment_variables>>.
+
+For dev mode, this file can be placed in the root of the project, but it is advised to **not** check it in to version control.
+
+NOTE: Environment variables without a configuration profile defined in `.env` file will overwrite all its related profiles in `application.properties`, e.g. `%test.application.value` is overwritten by `APPLICATION_VALUE` in `.env` file.
+
+[[pwd_config_application_file]]
+=== An `application.properties` file placed in `$PWD/config/`
+
+By placing an `application.properties` file inside a directory named `config` which resides in the directory where the application runs, any runtime properties defined in that file will override the default configuration. 
+Furthermore any runtime properties added to this file that were not part of the original `application.properties` file
+_will also_ be taken into account.
+This works in the same way for runner jar and the native executable.
+
+NOTE: The `config/application.properties` feature is available in development mode as well. To make use of it, `config/application.properties` needs to be placed inside the build tool's output directory (`target` for Maven and `build/classes/java/main` for Gradle).
+Keep in mind however that any cleaning operation from the build tool like `mvn clean` or `gradle clean` will remove the `config` directory as well.
+
+[[application_properties_file]]
+=== An application configuration file
+
+This is the main application configuration file located in `src/main/resources/application.properties`.
+
+.Example `application.properties` file
+[source,properties]
+----
+greeting.message=hello <1>
+quarkus.http.port=9090 <2>
+----
+<1> This is a user-defined configuration property.
+<2> This is a configuration property consumed by the `quarkus-vertx-http` extension.
+
+TIP: Quarkus supports the use of <<using_property_expressions,property expressions>> in the `application.properties` file.
+
+== Embedding a configuration file inside a dependency
+
+You can embed a configuration file inside one of your dependencies by adding a `META-INF/microprofile.properties` configuration file to it
+(this is a standard functionality of MicroProfile Config).
+
+When you add this dependency to your application, its configuration properties will be merged.
+
+You can override the properties coming from it inside your `application.properties` that takes precedence over it.
+
+== Injecting configuration properties
+
+Quarkus uses https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config] annotations to inject the configuration properties in the application.
+
+[source,java]
+----
+@ConfigProperty(name = "greeting.message") <1>
+String message;
+----
+<1> You can use `@Inject @ConfigProperty` or just `@ConfigProperty`.
+The `@Inject` annotation is not necessary for members annotated with `@ConfigProperty`.
+This behavior differs from https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config].
+
+NOTE: If the application attempts to inject a configuration property that is not set, an error is thrown, thus allowing you to quickly know when your configuration is complete.
+
+.More `@ConfigProperty` Examples
+[source,java]
+----
+@ConfigProperty(name = "greeting.message") <1>
+String message;
+
+@ConfigProperty(name = "greeting.suffix", defaultValue="!") <2>
+String suffix;
+
+@ConfigProperty(name = "greeting.name")
+Optional<String> name; <3>
+----
+<1> If you do not provide a value for this property, the application startup fails with `javax.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`.
+<2> The default value is injected if the configuration does not provide a value for `greeting.suffix`.
+<3> This property is optional - an empty `Optional` is injected if the configuration does not provide a value for `greeting.name`.
+
+== Programmatically access the configuration
+
+You can also access the configuration programmatically.
+It can be handy to achieve dynamic lookup, or retrieve configured values from classes that are neither CDI beans or JAX-RS resources.
+
+You can access the configuration programmatically using `org.eclipse.microprofile.config.ConfigProvider.getConfig()` such as in:
+
+[source,java]
+----
+String databaseName = ConfigProvider.getConfig().getValue("database.name", String.class);
+Optional<String> maybeDatabaseName = ConfigProvider.getConfig().getOptionalValue("database.name", String.class);
+----
+
+[[using_configproperties]]
+== Using @ConfigProperties
+
+As an alternative to injecting multiple related configuration values in the way that was shown in the previous example,
+users can also use the `@io.quarkus.arc.config.ConfigProperties` annotation to group these properties together.
+
+For the greeting properties above, a `GreetingConfiguration` class could be created like so:
+
+[source,java]
+----
+package org.acme.config;
+
+import io.quarkus.arc.config.ConfigProperties;
+import java.util.Optional;
+
+@ConfigProperties(prefix = "greeting") <1>
+public class GreetingConfiguration {
+
+    private String message;
+    private String suffix = "!"; <2>
+    private Optional<String> name;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public void setSuffix(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public Optional<String> getName() {
+        return name;
+    }
+
+    public void setName(Optional<String> name) {
+        this.name = name;
+    }
+}
+----
+<1> `prefix` is optional. If not set then the prefix to be used will be determined by the class name. In this case it would still be `greeting` (since the `Configuration` suffix is removed). If the class were named `GreetingExtraConfiguration` then the resulting default prefix would be `greeting-extra`.
+<2> `!` will be the default value if `greeting.suffix` is not set.
+
+This class could then be injected into the `GreetingResource` using the familiar CDI `@Inject` annotation like so:
+
+[source,java]
+----
+@Inject
+GreetingConfiguration greetingConfiguration;
+----
+
+Another alternative style provided by Quarkus is to create `GreetingConfiguration` as an interface like so:
+
+[source,java]
+----
+package org.acme.config;
+
+import io.quarkus.arc.config.ConfigProperties;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import java.util.Optional;
+
+@ConfigProperties(prefix = "greeting")
+public interface GreetingConfiguration {
+
+    @ConfigProperty(name = "message") <1>
+    String message();
+
+    @ConfigProperty(defaultValue = "!")
+    String getSuffix(); <2>
+
+    Optional<String> getName(); <3>
+}
+----
+<1> The `@ConfigProperty` annotation is needed because the name of the configuration property that the method corresponds to doesn't follow the getter method naming conventions.
+<2> In this case since `name` was not set, the corresponding property will be `greeting.suffix`.
+<3> It is unnecessary to specify the `@ConfigProperty` annotation because the method name follows the getter method naming conventions (`greeting.name` being the corresponding property) and no default value is needed.
+
+When using `@ConfigProperties` on a class or an interface, if the value of one of its fields is not provided, the application startup will fail and a `javax.enterprise.inject.spi.DeploymentException` indicating the missing value information will be thrown.
+This does not apply to `Optional` fields and fields with a default value.
+
+=== Additional notes on @ConfigProperties
+
+When using a regular class annotated with `@ConfigProperties` the class doesn't necessarily have to declare getters and setters.
+Having simple public non-final fields is valid as well.
+
+Furthermore, the configuration classes support nested object configuration. Suppose there was a need to have an extra layer
+of greeting configuration named `content` that would contain a few fields. This could be achieved like so:
+
+[source,java]
+----
+@ConfigProperties(prefix = "greeting")
+public class GreetingConfiguration {
+
+    public String message;
+    public String suffix = "!";
+    public Optional<String> name;
+    public ContentConfig content; <1>
+
+    public static class ContentConfig {
+        public Integer prizeAmount;
+        public List<String> recipients;
+    }
+}
+----
+<1> The name of the field (not the class name) will determine the name of the properties that are bound to the object.
+
+Setting the properties would occur in the normal manner, for example in `application.properties` one could have:
+
+[source,properties]
+----
+greeting.message = hello
+greeting.name = quarkus
+greeting.content.prize-amount=10
+greeting.content.recipients=Jane,John
+----
+
+Furthermore, classes annotated with `@ConfigProperties` can be annotated with Bean Validation annotations similar to the following example:
+
+[source,java]
+----
+@ConfigProperties(prefix = "greeting")
+public class GreetingConfiguration {
+
+    @Size(min = 20)
+    public String message;
+    public String suffix = "!";
+
+}
+----
+
+WARNING: For validation to work, the `quarkus-hibernate-validator` extension needs to be present.
+
+If the validation fails with the given configuration, the application will fail to start and indicate the corresponding validation errors in the log.
+
+In the case of an interface being annotated with `@ConfigProperties`, the interface is allowed to extend other interfaces and methods from
+the entire interface hierarchy are used to bind properties.
+
+=== Using same ConfigProperties with different prefixes
+
+Quarkus also supports the use of the same `@ConfigProperties` object with different prefixes for each injection point using the `io.quarkus.arc.config.@ConfigPrefix` annotation.
+Say for example that `GreetingConfiguration` from above needs to be used for both the `greeting` prefix and the `other` prefix.
+In that case the code would look like so:
+
+`GreetingConfiguration.java`
+[source,java]
+----
+@ConfigProperties(prefix = "greeting")
+public class GreetingConfiguration {
+
+    @Size(min = 20)
+    public String message;
+    public String suffix = "!";
+
+}
+----
+
+`SomeBean.java`
+[source,java]
+----
+@ApplicationScoped
+public class SomeBean {
+
+    @Inject <1>
+    GreetingConfiguration greetingConfiguration;
+
+    @ConfigPrefix("other") <2>
+    GreetingConfiguration otherConfiguration;
+
+}
+----
+<1> At this injection point `greetingConfiguration` will use the `greeting` prefix since that is what has been defined on `@ConfigProperties`.
+<2> At this injection point `otherConfiguration` will use the `other` prefix from `@ConfigPrefix` instead of the `greeting` prefix. Notice that in this case `@Inject` is not required.
+
+=== Using a list of objects
+
+In certain cases it might be necessary to support complex configuration structures that utilize a list of objects as shown in the following example:
+
+`ComplexConfiguration.java`
+[source,java]
+----
+@ConfigProperties(prefix = "complex")
+public class ComplexConfiguration {
+    public String name;
+    public String user;
+    public String password;
+    public List<Nested> inputs;
+    public List<Nested> outputs;
+
+    public static class Nested {
+        public String user;
+        public String password;
+    }
+}
+----
+
+Support for such use cases is only available when using YAML configuration with the `quarkus-config-yaml` extension. A corresponding example YAML configuration could be:
+
+`application.yaml`
+[source,yaml]
+----
+complex:
+  name: defaultName
+  user: defaultUser
+  password: defaultPassword
+  inputs:
+    - user: user
+      password: secret
+    - user: otheruser
+      password: secret2
+  outputs:
+    - user: someuser
+      password: asecret
+    - user: someotheruser
+      password: anothersecret
+----
+
+WARNING: A limitation of such configuration is that the types used as the generic types of the lists need to be classes and not interfaces.
+
+[[configuration_profiles]]
+== Configuration Profiles
+
+Quarkus supports the notion of configuration profiles. 
+These allow you to have multiple configurations in the same file and select between them via a profile name.
+
+The syntax for this is `%{profile}.config.key=value`. For example if I have the following:
+
+[source,properties]
+----
+quarkus.http.port=9090
+%dev.quarkus.http.port=8181
+----
+
+The Quarkus HTTP port will be 9090, unless the `dev` profile is active, in which case it will be 8181.
+
+To use profiles in the `.env` file, you can follow a `_{PROFILE}_CONFIG_KEY=value` pattern. An equivalent of the above example in an `.env` file would be:
+
+[source,.env]
+----
+QUARKUS_HTTP_PORT=9090
+_DEV_QUARKUS_HTTP_PORT=8181
+----
+
+By default, Quarkus has three profiles, although it is possible to use as many as you like. 
+The default profiles are:
+
+* *dev* - Activated when in development mode (i.e. `quarkus:dev`)
+* *test* - Activated when running tests
+* *prod* - The default profile when not running in development or test mode
+
+There are two ways to set a custom profile, either via the `quarkus.profile` system property or the `QUARKUS_PROFILE`
+environment variable. If both are set the system property takes precedence. Note that it is not necessary to
+define the names of these profiles anywhere, all that is necessary is to create a config property with the profile
+name, and then set the current profile to that name. For example if I want a `staging` profile with a different HTTP port I can add the following to `application.properties`:
+
+[source,properties]
+----
+quarkus.http.port=9090
+%staging.quarkus.http.port=9999
+----
+
+And then set the `QUARKUS_PROFILE` environment variable to `staging` to activate my profile.
+
+[NOTE]
+====
+The proper way to check the active profile programmatically is to use the `getActiveProfile` method of `io.quarkus.runtime.configuration.ProfileManager`.
+
+Using `@ConfigProperty("quarkus.profile")` will *not* work properly.
+====
+
+=== Default Runtime Profile
+
+The default Quarkus application runtime profile is set to the profile used to build the application.
+For example:
+[source,bash]
+----
+./mvnw package -Pnative -Dquarkus.profile=prod-aws
+./target/my-app-1.0-runner // <1>
+----
+<1> The command will run with the `prod-aws` profile. This can be overridden using the `quarkus.profile` system property.
+
+
+[[using_property_expressions]]
+== Using Property Expressions
+
+Quarkus supports the use of property expressions in the `application.properties` file.
+
+These expressions are resolved when the property is read.
+So if your configuration property is a build time configuration property, the property expression will be resolved at build time.
+If your configuration property is overridable at runtime, the property expression will be resolved at runtime.
+
+You can use property expressions both for the Quarkus configuration or for your own configuration properties.
+
+Property expressions are defined this way: `${my-property-expression}`.
+
+For example, having the following property:
+
+[source,properties]
+----
+remote.host=quarkus.io
+----
+and another property defined as:
+
+[source,properties]
+----
+callable.url=https://${remote.host}/
+----
+
+will result in the value of the `callable.url` property being set to:
+
+[source,properties]
+----
+callable.url=https://quarkus.io/
+----
+
+Another example would be defining different database servers depending on the profile used:
+
+[source,properties]
+----
+%dev.quarkus.datasource.jdbc.url=jdbc:mysql://localhost:3306/mydatabase?useSSL=false
+quarkus.datasource.jdbc.url=jdbc:mysql://remotehost:3306/mydatabase?useSSL=false
+----
+
+can be simplified by having:
+
+[source,properties]
+----
+%dev.application.server=localhost
+application.server=remotehost
+
+quarkus.datasource.jdbc.url=jdbc:mysql://${application.server}:3306/mydatabase?useSSL=false
+----
+
+It does result in one more line in this example but the value of `application.server` can be reused in other properties,
+diminishing the possibility of typos and providing more flexibility in property definitions.
+
+
+[#combine-property-env-var]
+== Combining Property Expressions and Environment Variables
+
+Quarkus also supports the combination of both property expressions and environment variables.
+
+Let's assume you have the following property defined in `application.properties`:
+
+[source,properties]
+----
+remote.host=quarkus.io
+----
+
+You can combine environment variables and property expressions by having a property defined as follows:
+
+[source,properties]
+----
+application.host=${HOST:${remote.host}}
+----
+
+This will expand the `HOST` environment variable and use the value of the property `remote.host` as the default value if `HOST` is not set.
+
+For the purpose of this section we used the property `remote.host` we defined previously.
+It has to be noted that the value could have been a fixed one such as in:
+
+[source,properties]
+----
+application.host=${HOST:localhost}
+----
+
+which will result in `localhost` as the default value if `HOST` is not set.
+
+[[configuring_quarkus]]
+== Configuring Quarkus
+
+Quarkus itself is configured via the same mechanism as your application. Quarkus reserves the `quarkus.` namespace
+for its own configuration and the configuration of all of its extensions. For example to configure the HTTP server port you can set `quarkus.http.port` in
+`application.properties`. All the Quarkus configuration properties are link:all-config[documented and searchable].
+
+[IMPORTANT]
+====
+As mentioned above, properties prefixed with `quarkus.` are effectively reserved for configuring Quarkus itself and its extensions.
+Therefore `quarkus.` should **never** be used as prefix for application specific properties.
+
+In the previous examples using `quarkus.message` instead of `greeting.message` would result in unexpected behavior.
+====
+
+Quarkus does much of its configuration and bootstrap at build time and some configuration properties are read and used during the build.
+These properties are _fixed at build time_ and it's not possible to change them at runtime.
+You always need to repackage your application in order to reflect changes of such properties.
+
+TIP: The properties fixed at build time are marked with a lock icon (icon:lock[]) in the link:all-config[list of all configuration options].
+
+However, some extensions do define properties that can be _overriden at runtime_.
+A canonical example is the database URL, username and password which are only known specifically in your target environment.
+This is a tradeoff as the more runtime properties are available, the less build time prework Quarkus can do. 
+The list of runtime properties is therefore lean.
+You can override these runtime properties with the following mechanisms (in decreasing priority) using:
+
+1. System properties
+2. Environment variables
+3. An environment file named `.env` placed in the current working directory
+4. A configuration file placed in `$PWD/config/application.properties`
+
+See <<configuration_sources>> for more details.
+
+== Generating configuration for your application
+
+It is also possible to generate an example `application.properties` with all known configuration properties, to make
+it easy to see what Quarkus configuration options are available. To do this, run:
+
+[source,bash]
+--
+./mvnw quarkus:generate-config
+--
+
+This will create a `src/main/resources/application.properties.example` file that contains all the config options
+exposed via the extensions you currently have installed. These options are commented out, and have their default value
+when applicable. For example this HTTP port config entry will appear as:
+
+
+[source,properties]
+--
+#
+# The HTTP port
+#
+#quarkus.http.port=8080
+--
+
+Rather than generating an example config file, you can also add these to you actual config file by setting the `-Dfile`
+parameter:
+
+[source,bash]
+--
+./mvnw quarkus:generate-config -Dfile=application.properties
+--
+
+If a config option is already present (commented or not) it will not be added, so it is safe to run this after
+adding an additional extension to see what additional options have been added.
+
+== Clearing properties
+
+Run time properties which are optional, and which have had values set at build time or which have a default value,
+may be explicitly cleared by assigning an empty string to the property.  Note that this will _only_ affect
+runtime properties, and will _only_ work with properties whose values are not required.
+
+The property may be cleared by setting the corresponding `application.properties` property, setting the
+corresponding system property, or setting the corresponding environment variable.
+
+[[custom_configuration]]
+== Custom Configuration
+
+=== Custom configuration sources
+
+You can also introduce custom configuration sources in the standard MicroProfile Config manner.  To
+do this, you must provide a class which implements either `org.eclipse.microprofile.config.spi.ConfigSource`
+or `org.eclipse.microprofile.config.spi.ConfigSourceProvider`.  Create a
+https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html[service file] for the
+class and it will be detected and installed at application startup.
+
+=== Custom configuration converters
+
+You can also use your custom types for configuration values. This can be done by implementing `org.eclipse.microprofile.config.spi.Converter<T>`
+and adding its fully qualified class name in the `META-INF/services/org.eclipse.microprofile.config.spi.Converter` file.
+
+Let us assume you have a custom type like this one:
+
+[source,java]
+----
+package org.acme.config;
+
+public class MicroProfileCustomValue {
+
+    private final int number;
+
+    public MicroProfileCustomValue(int number) {
+        this.number = number;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+}
+----
+
+The corresponding converter will look like the one below. Please note that your custom converter class must be `public` and must have
+a `public` no-argument constructor. It also must not be `abstract`.
+
+
+[source,java]
+----
+package org.acme.config;
+
+import org.eclipse.microprofile.config.spi.Converter;
+
+public class MicroProfileCustomValueConverter implements Converter<MicroProfileCustomValue> {
+
+    @Override
+    public MicroProfileCustomValue convert(String value) {
+        return new MicroProfileCustomValue(Integer.parseInt(value));
+    }
+}
+----
+
+Then you need to include the fully qualified class name of the converter in a service file `META-INF/services/org.eclipse.microprofile.config.spi.Converter`.
+If you have more converters, simply add their class names in this file as well. One fully qualified class name per line, for example:
+
+[source]
+----
+org.acme.config.MicroProfileCustomValueConverter
+org.acme.config.SomeOtherConverter
+org.acme.config.YetAnotherConverter
+----
+
+Please note that `SomeOtherConverter` and `YetAnotherConverter` were added just for demonstration purposes. If you include in this file classes
+which are not available at runtime, the converters loading will fail.
+
+After this is done, you can use your custom type as a configuration value:
+
+[source,java]
+----
+@ConfigProperty(name = "configuration.value.name")
+MicroProfileCustomValue value;
+----
+
+==== Converter priority
+
+In some cases, you may want to use a custom converter to convert a type which is already converted
+by a different converter. In such cases, you can use the `javax.annotation.Priority` annotation to
+change converters precedence and make your custom converter of higher priority than the other
+in the list.
+
+By default, if no `@Priority` can be found on a converter, it's registered with a priority of 100
+and all Quarkus core converters are registered with a priority of 200, so depending on which
+converter you would like to replace, you need to set a higher value.
+
+To demonstrate the idea let us implement a custom converter which will take precedence over
+`MicroProfileCustomValueConverter` implemented in the previous example.
+
+[source,java]
+----
+package org.acme.config;
+
+import javax.annotation.Priority;
+import org.eclipse.microprofile.config.spi.Converter;
+
+@Priority(150)
+public class MyCustomConverter implements Converter<MicroProfileCustomValue> {
+
+    @Override
+    public MicroProfileCustomValue convert(String value) {
+
+        final int secretNumber;
+        if (value.startsFrom("OBF:")) {
+            secretNumber = Integer.parseInt(SecretDecoder.decode(value));
+        } else {
+            secretNumber = Integer.parseInt(value);
+        }
+
+        return new MicroProfileCustomValue(secretNumber);
+    }
+}
+----
+
+Since it converts the same value type (namely `MicroProfileCustomValue`) and has a priority
+of 150, it will be used instead of a `MicroProfileCustomValueConverter` which has a default
+priority of 100.
+
+NOTE: This new converter also needs to be listed in a service file, i.e. `META-INF/services/org.eclipse.microprofile.config.spi.Converter`.
+
+[[yaml]]
+== YAML for Configuration
+
+=== Add YAML Config Support
+
+You might want to use YAML over properties for configuration.
+Since link:https://github.com/smallrye/smallrye-config[SmallRye Config] brings support for YAML
+configuration, Quarkus supports this as well.
+
+First you will need to add the Config YAML extension to your `pom.xml`:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-config-yaml</artifactId>
+</dependency>
+----
+
+Or you can alternatively run this command in the directory containing your Quarkus project:
+
+[source,bash]
+----
+./mvnw quarkus:add-extension -Dextensions="config-yaml"
+----
+
+Now Quarkus can read YAML configuration files.
+The config directories and priorities are the same as before.
+
+NOTE: Quarkus will choose an `application.yaml` over an `application.properties`.
+YAML files are just an alternative way to configure your application.
+You should decide and keep one configuration type to avoid errors.
+
+==== Configuration Examples
+[source,yaml]
+----
+# YAML supports comments
+quarkus:
+  datasource:
+    db-kind: postgresql
+    jdbc:
+      url: jdbc:postgresql://localhost:5432/some-database
+    username: quarkus
+    password: quarkus
+
+# REST Client configuration property
+org:
+  acme:
+    restclient:
+      CountriesService/mp-rest/url: https://restcountries.eu/rest
+
+# For configuration property names that use quotes, do not split the string inside the quotes.
+quarkus:
+  log:
+    category:
+      "io.quarkus.category":
+        level: INFO
+----
+
+[NOTE]
+====
+Quarkus also supports using `application.yml` as the name of the YAML file. The same rules apply for this file as for `application.yaml`.
+====
+
+=== Profile dependent configuration
+
+Providing profile dependent configuration with YAML is done like with properties.
+Just add the `%profile` wrapped in quotation marks before defining the key-value pairs:
+
+[source,yaml]
+----
+"%dev":
+  quarkus:
+    datasource:
+      db-kind: postgresql
+      jdbc:
+        url: jdbc:postgresql://localhost:5432/some-database
+      username: quarkus
+      password: quarkus
+----
+
+=== Configuration key conflicts
+
+The MicroProfile Configuration specification defines configuration keys as an arbitrary `.`-delimited string.
+However, structured formats like YAML naively only support a subset of the possible configuration namespace.
+For example, consider the two configuration properties `quarkus.http.cors` and `quarkus.http.cors.methods`.
+One property is the prefix of another, so it may not be immediately evident how to specify both keys in your YAML configuration.
+
+This is solved by using a `null` key (normally represented by `~`) for any YAML property which is a prefix of another one.  Here's an example:
+
+.An example YAML configuration resolving prefix-related key name conflicts
+[source,yaml]
+----
+quarkus:
+  http:
+    cors:
+      ~: true
+      methods: GET,PUT,POST
+----
+
+In general, `null` YAML keys are not included in assembly of the configuration property name, allowing them to be used to
+any level for disambiguating configuration keys.
+
+== More info on how to configure
+
+Quarkus relies on SmallRye Config and inherits its features.
+
+SmallRye Config provides:
+
+* Additional Config Sources
+* Additional Converters
+* Indexed Properties
+* Parent Profile
+* Interceptors for configuration value resolution
+* Relocate Configuration Properties
+* Fallback Configuration Properties
+* Logging
+* Hide Secrets
+
+For more information, please check the
+link:https://smallrye.io/docs/smallrye-config/index.html[SmallRye Config documentation].
diff --git a/docs/src/main/asciidoc/config.adoc b/docs/src/main/asciidoc/config.adoc
index b330837b7d24b..4dd23e6e4dd65 100644
--- a/docs/src/main/asciidoc/config.adoc
+++ b/docs/src/main/asciidoc/config.adoc
@@ -1,12 +1,14 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Configuring Your Application
 
 include::./attributes.adoc[]
 
+:toc:
+
 Hardcoded values in your code are a _no go_ (even if we all did it at some point ;-)).
 In this guide, we learn how to configure your application.
 
@@ -32,7 +34,7 @@ The solution is located in the `config-quickstart` {quickstarts-tree-url}/config
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
@@ -51,19 +53,34 @@ It generates:
 * an `org.acme.config.GreetingResource` resource
 * an associated test
 
-== Injecting configuration value
+== Create the configuration
+
+By default, Quarkus reads configuration properties from <<config-reference.adoc#configuration_sources,several sources>>.
+For the purpose of this guide, we will use an application configuration file located in `src/main/resources/application.properties`.
+Edit the file with the following content:
+
+[source,properties]
+----
+# Your configuration properties
+greeting.message = hello
+greeting.name = quarkus
+----
 
-Quarkus uses https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config] to inject the configuration in the application.
-The injection uses the `@ConfigProperty` annotation.
+== Injecting configuration properties
+
+Quarkus uses https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config] annotations to inject the configuration properties in the application.
 
 [source,java]
 ----
-@ConfigProperty(name = "greeting.message")
+@ConfigProperty(name = "greeting.message") <1>
 String message;
 ----
+<1> You can use `@Inject @ConfigProperty` or just `@ConfigProperty`.
+The `@Inject` annotation is not necessary for members annotated with `@ConfigProperty`.
+This behavior differs from https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config].
 
-NOTE: When injecting a configured value, you can use `@Inject @ConfigProperty` or just `@ConfigProperty`.
-The `@Inject` annotation is not necessary for members annotated with `@ConfigProperty`, a behavior which differs from https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config]
+NOTE: If the application attempts to inject a configuration property that is not set, an error is thrown.
+So you can quickly know when your configuration is complete.
 
 Edit the `org.acme.config.GreetingResource`, and introduce the following configuration properties:
 
@@ -93,19 +110,6 @@ public String hello() {
 }
 ----
 
-
-== Create the configuration
-
-By default, Quarkus reads `application.properties`.
-Edit the `src/main/resources/application.properties` with the following content:
-
-[source,shell]
-----
-# Your configuration properties
-greeting.message = hello
-greeting.name = quarkus
-----
-
 Once set, check the application with:
 
 [source,shell]
@@ -114,15 +118,14 @@ $ curl http://localhost:8080/greeting
 hello quarkus!
 ----
 
-TIP: If the application requires configuration values and these values are not set, an error is thrown.
-So you can quickly know when your configuration is complete.
+TIP: As an alternative to injecting multiple related configuration values, you can also use the `@io.quarkus.arc.config.ConfigProperties` annotation to group these properties together. 
+See the <<config-reference.adoc#using_configproperties,Configuration Reference Guide>> for more information.
 
 == Update the test
 
 We also need to update the functional test to reflect the changes made to the endpoint.
 Edit the `src/test/java/org/acme/config/GreetingResourceTest.java` file and change the content of the `testHelloEndpoint` method to:
 
-
 [source,java]
 ----
 package org.acme.config;
@@ -156,12 +159,12 @@ Open your browser to http://localhost:8080/greeting.
 Changing the configuration file is immediately reflected.
 You can add the `greeting.suffix`, remove the other properties, change the values, etc.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
 == Programmatically access the configuration
 
-You can access the configuration programmatically.
+You can also access the configuration programmatically.
 It can be handy to achieve dynamic lookup, or retrieve configured values from classes that are neither CDI beans or JAX-RS resources.
 
 You can access the configuration programmatically using `org.eclipse.microprofile.config.ConfigProvider.getConfig()` such as in:
@@ -172,190 +175,28 @@ String databaseName = ConfigProvider.getConfig().getValue("database.name", Strin
 Optional<String> maybeDatabaseName = ConfigProvider.getConfig().getOptionalValue("database.name", String.class);
 ----
 
-== Using @ConfigProperties
-
-As an alternative to injecting multiple related configuration values in the way that was shown in the previous example,
-users can also use the `@io.quarkus.arc.config.ConfigProperties` annotation to group these properties together.
+== Configuration Profiles
 
-For the greeting properties above, a `GreetingConfiguration` class could be created like so:
-
-[source,java]
-----
-package org.acme.config;
-
-import io.quarkus.arc.config.ConfigProperties;
-import java.util.Optional;
-
-@ConfigProperties(prefix = "greeting") <1>
-public class GreetingConfiguration {
-
-    private String message;
-    private String suffix = "!"; <2>
-    private Optional<String> name;
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getSuffix() {
-        return suffix;
-    }
-
-    public void setSuffix(String suffix) {
-        this.suffix = suffix;
-    }
-
-    public Optional<String> getName() {
-        return name;
-    }
-
-    public void setName(Optional<String> name) {
-        this.name = name;
-    }
-}
-----
-<1> `prefix` is optional. If not set then the prefix to be used will be determined by the class name. In this case it would still be `greeting` (since the `Configuration` suffix is removed). If the class were named `GreetingExtraConfiguration` then the resulting default prefix would be `greeting-extra`.
-<2> `!` will be the default value if `greeting.suffix` is not set
-
-This class could then be injected into the `GreetingResource` using the familiar CDI `@Inject` annotation like so:
-
-[source,java]
-----
-@Inject
-GreetingConfiguration greetingConfiguration;
-----
-
-Another alternative style provided by Quarkus is to create `GreetingConfiguration` as an interface like so:
-
-[source,java]
-----
-package org.acme.config;
-
-import io.quarkus.arc.config.ConfigProperties;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import java.util.Optional;
-
-@ConfigProperties(prefix = "greeting")
-public interface GreetingConfiguration {
-
-    @ConfigProperty(name = "message") <1>
-    String message();
-
-    @ConfigProperty(defaultValue = "!")
-    String getSuffix(); <2>
-
-    Optional<String> getName(); <3>
-}
-----
-<1> The `@ConfigProperty` annotation is needed because the name of the configuration property that the method corresponds to doesn't follow the getter method naming conventions
-<2> In this case since `name` was not set, the corresponding property will be `greeting.suffix`.
-<3> It is unnecessary to specify the `@ConfigProperty` annotation because the method name follows the getter method naming conventions (`greeting.name` being the corresponding property) and no default value is needed.
-
-When using `@ConfigProperties` on a class or an interface, if the value of one of its fields is not provided, the application startup will fail and a `javax.enterprise.inject.spi.DeploymentException` indicating the missing value information will be thrown.
-This does not apply to `Optional` fields and fields with a default value.
-
-=== Additional notes on @ConfigProperties
-
-When using a regular class annotated with `@ConfigProperties` the class doesn't necessarily have to declare getters and setters.
-Having simple public non-final fields is valid as well.
-
-Furthermore, the configuration classes support nested object configuration. Suppose there was a need to have an extra layer
-of greeting configuration named `hidden` that would contain a few fields. This could be achieved like so:
-
-[source,java]
-----
-@ConfigProperties(prefix = "greeting")
-public class GreetingConfiguration {
-
-    public String message;
-    public String suffix = "!";
-    public Optional<String> name;
-    public HiddenConfig hidden; <1>
-
-    public static class HiddenConfig {
-        public Integer prizeAmount;
-        public List<String> recipients;
-    }
-}
-----
-<1> The name of the field (not the class name) will determine the name of the properties that are bound to the object.
+Quarkus supports the notion of configuration profiles. 
+These allow you to have multiple configuration values in the same file and select between them via a profile name.
 
-Setting the properties would occur in the normal manner, for example in `application.properties` one could have:
+The syntax for this is `%{profile}.config.key=value`. For example if I have the following:
 
 [source,properties]
 ----
-greeting.message = hello
-greeting.name = quarkus
-greeting.hidden.prize-amount=10
-greeting.hidden.recipients=Jane,John
-----
-
-Furthermore, classes annotated with `@ConfigProperties` can be annotated with Bean Validation annotations similar to the following example:
-
-[source,java]
-----
-@ConfigProperties(prefix = "greeting")
-public class GreetingConfiguration {
-
-    @Size(min = 20)
-    public String message;
-    public String suffix = "!";
-
-}
-----
-
-WARNING: For validation to work, the `quarkus-hibernate-validator` extension needs to be present.
-
-If the validation fails with the given configuration, the application will fail to start and indicate the corresponding validation errors in the log.
-
-In the case of an interface being annotated with `@ConfigProperties`, the interface is allowed to extend other interfaces and methods from
-the entire interface hierarchy are used to bind properties.
-
-=== Using same ConfigProperties with different prefixes
-
-Quarkus also supports the use of the same `@ConfigProperties` object with different prefixes for each injection point using the `io.quarkus.arc.config.@ConfigPrefix` annotation.
-Say for example that `GreetingConfiguration` from above needs to be used for both the `greeting` prefix and the `other` prefix.
-In that case the code would look like so:
-
-`GreetingConfiguration.java`
-[source,java]
-----
-@ConfigProperties(prefix = "greeting")
-public class GreetingConfiguration {
-
-    @Size(min = 20)
-    public String message;
-    public String suffix = "!";
-
-}
-----
-
-`SomeBean.java`
-[source,java]
+quarkus.http.port=9090
+%dev.quarkus.http.port=8181
 ----
-@ApplicationScoped
-public class SomeBean {
 
-    @Inject <1>
-    GreetingConfiguration greetingConfiguration;
+Then the Quarkus HTTP port will be 9090, unless the `dev` profile is active, in which case it will be 8181.
 
-    @ConfigPrefix("other") <2>
-    GreetingConfiguration otherConfiguration;
-
-}
-----
-<1> At this injection point `greetingConfiguration` will use the `greeting` prefix since that is what has been defined on `@ConfigProperties`.
-<2> At this injection point `otherConfiguration` will use the `other` prefix from `@ConfigPrefix` instead of the `greeting` prefix. Notice that in this case `@Inject` is not required.
+See the <<config-reference.adoc#configuration_profiles,Configuration Reference Guide>> for more information about configuration profiles.
 
 == Configuring Quarkus
 
 Quarkus itself is configured via the same mechanism as your application. Quarkus reserves the `quarkus.` namespace
 for its own configuration. For example to configure the HTTP server port you can set `quarkus.http.port` in
-`application.properties`.
+`application.properties`. All the Quarkus configuration properties are link:all-config[documented and searchable].
 
 [IMPORTANT]
 ====
@@ -365,457 +206,18 @@ therefore `quarkus.` should **never** be used as prefix for application specific
 In the previous examples using `quarkus.message` instead of `greeting.message` would result in unexpected behavior.
 ====
 
-=== List of all configuration properties
-
-All the Quarkus configuration properties are link:all-config[documented and searcheable].
-
-=== Generating configuration for your application
-
-It is also possible to generate an example `application.properties` with all known configuration properties, to make
-it easy to see what Quarkus configuration options are available. To do this, run:
-
-[source,shell]
---
-./mvnw quarkus:generate-config
---
+Quarkus does much of its configuration and bootstrap at build time and some configuration properties are read and used during the build.
+These properties are _fixed at build time_ and it's not possible to change them at runtime.
+You always need to repackage your application in order to reflect changes of such properties.
 
-This will create a `src/main/resources/application.properties.example` file that contains all the config options
-exposed via the extensions you currently have installed. These options are commented out, and have their default value
-when applicable. For example this HTTP port config entry will appear as:
+TIP: The properties fixed at build time are marked with a lock icon (icon:lock[]) in the link:all-config[list of all configuration options].
 
-
-[source,properties]
---
-#
-# The HTTP port
-#
-#quarkus.http.port=8080
---
-
-Rather than generating an example config file, you can also add these to you actual config file by setting the `-Dfile`
-parameter:
-
-[source,shell]
---
-./mvnw quarkus:generate-config -Dfile=application.properties
---
-
-If a config option is already present (commented or not) it will not be added, so it is safe to run this after
-adding an additional extension to see what additional options have been added.
-
-== Overriding properties at runtime
-
-Quarkus does much of its configuration and bootstrap at build time.
-Most properties will then be read and set during the build time step.
-To change them, make sure to repackage your application.
-
-[source,shell]
---
-./mvnw clean package
---
-
-Extensions do define _some_ properties as overridable at runtime.
+However, some extensions do define properties _overridable at runtime_.
 A canonical example is the database URL, username and password which is only known specifically in your target environment.
-This is a tradeoff as the more runtime properties are available, the less build time prework Quarkus can do. The list of runtime properties is therefore lean.
-
-You can override these runtime properties with the following mechanisms (in decreasing priority):
-
-1. using system properties:
-  * for a runner jar: `java -Dquarkus.datasource.password=youshallnotpass -jar target/myapp-runner.jar`
-  * for a native executable: `./target/myapp-runner -Dquarkus.datasource.password=youshallnotpass`
-2. using environment variables:
-  * for a runner jar: `export QUARKUS_DATASOURCE_PASSWORD=youshallnotpass ; java -jar target/myapp-runner.jar`
-  * for a native executable: `export QUARKUS_DATASOURCE_PASSWORD=youshallnotpass ; ./target/myapp-runner`
-3. using an environment file named `.env` placed in the current working directory containing the line `QUARKUS_DATASOURCE_PASSWORD=youshallnotpass` (for dev mode, this file can be placed in the root of the project, but it is advised to not check it in to version control)
-4. using a configuration file placed in `$PWD/config/application.properties`
-  * By placing an `application.properties` file inside a directory named `config` which resides in the directory where the application runs, any runtime properties defined
-in that file will override the default configuration. Furthermore any runtime properties added to this file that were not part of the original `application.properties` file
-_will also_ be taken into account.
-  * This works in the same way for runner jar and the native executable
-
-NOTE: Environment variables names are following the conversion rules of link:https://github.com/eclipse/microprofile-config/blob/master/spec/src/main/asciidoc/configsources.asciidoc#default-configsources[Eclipse MicroProfile]
-
-NOTE: The `config/application.properties` features is available in development mode as well. To make use of it, `config/application.properties` needs to be placed inside the build tool's output directory (`target` for Maven and `build/classes/java/main` for Gradle).
-Keep in mind however that any cleaning operation from the build tool like `mvn clean` or `gradle clean` will remove the `config` directory as well.
-
-=== Configuration Profiles
-
-Quarkus supports the notion of configuration profiles. These allow you to have multiple configuration in the same file and
-select between them via a profile name.
-
-The syntax for this is `%{profile}.config.key=value`. For example if I have the following:
-
-[source,properties]
-----
-quarkus.http.port=9090
-%dev.quarkus.http.port=8181
-----
-
-The Quarkus HTTP port will be 9090, unless the `dev` profile is active, in which case it will be 8181.
-
-By default Quarkus has three profiles, although it is possible to use as many as you like. The default profiles are:
-
-* *dev* - Activated when in development mode (i.e. `quarkus:dev`)
-* *test* - Activated when running tests
-* *prod* - The default profile when not running in development or test mode
-
-There are two ways to set a custom profile, either via the `quarkus.profile` system property or the `QUARKUS_PROFILE`
-environment variable. If both are set the system property takes precedence. Note that it is not necessary to
-define the names of these profiles anywhere, all that is necessary is to create a config property with the profile
-name, and then set the current profile to that name. For example if I want a `staging` profile with a different HTTP port
-I can add the following to `application.properties`:
-
-[source,properties]
-----
-quarkus.http.port=9090
-%staging.quarkus.http.port=9999
-----
-
-And then set the `QUARKUS_PROFILE` environment variable to `staging` to activate my profile.
-
-[NOTE]
-====
-The proper way to check the active profile programmatically is to use the `getActiveProfile` method of `io.quarkus.runtime.configuration.ProfileManager`.
-
-Using `@ConfigProperty("quarkus.profile")` will *not* work properly.
-====
-
-=== Using Property Expressions
-
-Quarkus supports the use of property expressions in the `application.properties` file.
-
-These expressions are resolved when the property is read.
-So if your configuration property is a build time configuration property, the property expression will be resolved at build time.
-If your configuration property is overridable at runtime, the property expression will be resolved at runtime.
-
-You can use property expressions both for the Quarkus configuration or for your own configuration properties.
-
-Property expressions are defined this way: `${my-property-expression}`.
-
-For example, having the following property:
-
-[source,properties]
-----
-remote.host=quarkus.io
-----
-and another property defined as:
-
-[source,properties]
-----
-callable.url=https://${remote.host}/
-----
-
-will result in the value of the `callable.url` property being set to:
-
-[source,properties]
-----
-callable.url=https://quarkus.io/
-----
-
-Another example would be defining different database servers depending on the profile used:
-
-[source,properties]
-----
-%dev.quarkus.datasource.url=jdbc:mysql://localhost:3306/mydatabase?useSSL=false
-quarkus.datasource.url=jdbc:mysql://remotehost:3306/mydatabase?useSSL=false
-----
-
-can be simplified by having:
-
-[source,properties]
-----
-%dev.application.server=localhost
-application.server=remotehost
-
-quarkus.datasource.url=jdbc:mysql://${application.server}:3306/mydatabase?useSSL=false
-----
-
-It does result in one more line in this example but the value of `application.server` can be reused in other properties,
-diminishing the possibility of typos and providing more flexibility in property definitions.
-
-=== Combining Property Expressions and Environment Variables
-
-Quarkus also supports the combination of both property expressions and environment variables.
-
-Let's assume you have following property defined in `application.properties`:
-
-[source,properties]
-----
-remote.host=quarkus.io
-----
-
-You can combine environment variables and property expressions by having a property defined as follows:
-
-[source,properties]
-----
-application.host=${HOST:${remote.host}}
-----
-
-This will expand the `HOST` environment variable and use the value of the property `remote.host` as the default value if `HOST` is not set.
-
-For the purpose of this section we used the property `remote.host` we defined previously.
-It has to be noted that the value could have been a fixed one such as in:
-
-[source,properties]
-----
-application.host=${HOST:localhost}
-----
-
-which will result in `localhost` as the default value if `HOST` is not set.
-
-=== Clearing properties
-
-Run time properties which are optional, and which have had values set at build time or which have a default value,
-may be explicitly cleared by assigning an empty string to the property.  Note that this will _only_ affect
-run time properties, and will _only_ work with properties whose values are not required.
-
-The property may be cleared by setting the corresponding `application.properties` property, setting the
-corresponding system property, or setting the corresponding environment variable.
-
-==== Miscellaneous
-The default Quarkus application runtime profile is set to the profile used to build the application.
-For example:
-[source,shell]
-----
-./mvnw package -Pnative -Dquarkus.profile=prod-aws
-./target/my-app-1.0-runner // <1>
-----
-<1> The command will run with the `prod-aws` profile. This can be overridden using the `quarkus.profile` system property.
-
-== Custom Configuration
-
-=== Custom configuration sources
-
-You can also introduce custom configuration sources in the standard MicroProfile Config manner.  To
-do this, you must provide a class which implements either `org.eclipse.microprofile.config.spi.ConfigSource`
-or `org.eclipse.microprofile.config.spi.ConfigSourceProvider`.  Create a
-https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html[service file] for the
-class and it will be detected and installed at application startup.
-
-=== Custom configuration converters
-
-You can also use your custom types as a configuration values. This can be done by implementing `org.eclipse.microprofile.config.spi.Converter<T>`
-and adding its fully qualified class name in the `META-INF/services/org.eclipse.microprofile.config.spi.Converter` file.
-
-Let us assume you have a custom type like this one:
-
-[source,java]
-----
-package org.acme.config;
-
-public class MicroProfileCustomValue {
-
-    private final int number;
-
-    public MicroProfileCustomValue(int number) {
-        this.number = number;
-    };
-
-    public int getNumber() {
-        return number;
-    }
-}
-----
-
-The corresponding converter will look like the one below. Please note that your custom converter class must be `public` and must have
-a `public` no-argument constructor. It also must not be `abstract`.
-
-
-[source,java]
-----
-package org.acme.config;
-
-import org.eclipse.microprofile.config.spi.Converter;
-
-public class MicroProfileCustomValueConverter implements Converter<MicroProfileCustomValue> {
-
-    @Override
-    public MicroProfileCustomValue convert(String value) {
-        return new MicroProfileCustomValue(Integer.valueOf(value));
-    }
-}
-----
-
-Then you need to include the fully qualified class name of the converter in a service file `META-INF/services/org.eclipse.microprofile.config.spi.Converter`.
-If you have more converters, simply add their class names in this file as well. Single fully qualified class name per line, for example:
-
-[source]
-----
-org.acme.config.MicroProfileCustomValueConverter
-org.acme.config.SomeOtherConverter
-org.acme.config.YetAnotherConverter
-----
-
-Please note that `SomeOtherConverter` and `YetAnotherConverter` were added just for a demonstration. If you include in this file classes
-which are not available at runtime, the converters loading will fail.
-
-After this is done you can use your custom type as a configuration value:
-
-[source,java]
-----
-@ConfigProperty(name = "configuration.value.name")
-MicroProfileCustomValue value;
-----
-
-==== Converter priority
-
-In some cases, you may want to use a custom converter to convert a type which is already converted
-by a different converter. In such cases, you can use the `javax.annotation.Priority` annotation to
-change converters precedence and make your custom converter of higher priority than the other
-on the list.
-
-By default, if no `@Priority` can be found on a converter, it's registered with a priority of 100
-and all Quarkus core converters are registered with a priority of 200, so depending on which
-converter you would like to replace, you need to set a higher value.
-
-To demonstrate the idea let us implement a custom converter which will take precedence over
-`MicroProfileCustomValueConverter` implemented in the previous example.
-
-[source,java]
-----
-package org.acme.config;
-
-import javax.annotation.Priority;
-import org.eclipse.microprofile.config.spi.Converter;
-
-@Priority(150)
-public class MyCustomConverter implements Converter<MicroProfileCustomValue> {
-
-    @Override
-    public MicroProfileCustomValue convert(String value) {
-
-        final int secretNumber;
-        if (value.startsFrom("OBF:")) {
-            secretNumber = Integer.valueOf(SecretDecoder.decode(value));
-        } else {
-            secretNumber = Integer.valueOf(value);
-        }
-
-        return new MicroProfileCustomValue(secretNumber);
-    }
-}
-----
-
-Since it converts the same value type (namely `MicroProfileCustomValue`) and has a priority
-of 150, it will be used instead of a `MicroProfileCustomValueConverter` which has a default
-priority of 100.
-
-NOTE: This new converter also needs to be listed in a service file, i.e. `META-INF/services/org.eclipse.microprofile.config.spi.Converter`.
-
-[[yaml]]
-== YAML for Configuration
-
-=== Add YAML Config Support
-
-You might want to use YAML over properties for configuration.
-Since link:https://github.com/smallrye/smallrye-config[SmallRye Config] brings support for YAML
-configuration, Quarkus supports this as well.
-
-First you will need to add the YAML extension to your `pom.xml`:
-
-[source,xml]
-----
-<dependency>
-    <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-config-yaml</artifactId>
-</dependency>
-----
-
-Or you can alternatively run this command in the directory containing your Quarkus project:
-
-[source,bash]
-----
-./mvnw quarkus:add-extension -Dextensions="config-yaml"
-----
-
-Now Quarkus can read YAML configuration files.
-The config directories and priorities are the same as before.
-
-NOTE: Quarkus will choose an `application.yaml` over an `application.properties`.
-YAML files are just an alternative way to configure your application.
-You should decide and keep one configuration type to avoid errors.
-
-==== Configuration Examples
-[source,yaml]
-----
-# YAML supports comments
-quarkus:
-  datasource:
-    url: jdbc:postgresql://localhost:5432/some-database
-    driver: org.postgresql.Driver
-    username: quarkus
-    password: quarkus
-
-# REST Client configuration property
-org:
-  acme:
-    restclient:
-      CountriesService/mp-rest/url: https://restcountries.eu/rest
-
-# For configuration property names that use quotes, do not split the string inside the quotes.
-quarkus:
-  log:
-    category:
-      "io.quarkus.category":
-        level: INFO
-----
-
-[NOTE]
-====
-Quarkus also supports using `application.yml` as the name of the YAML file. The same rules apply for this file as for `application.yaml`.
-====
-
-=== Profile dependent configuration
-
-Providing profile dependent configuration with YAML is done like with properties.
-Just add the `%profile` wrapped in quotation marks before defining the key-value pairs:
-
-[source,yaml]
-----
-"%dev":
-  quarkus:
-    datasource:
-      url: jdbc:postgresql://localhost:5432/some-database
-      driver: org.postgresql.Driver
-      username: quarkus
-      password: quarkus
-----
-
-=== Configuration key conflicts
-
-The MicroProfile Configuration specification defines configuration keys as an arbitrary `.`-delimited string.
-However, structured formats like YAML naively only support a subset of the possible configuration namespace.
-For example, consider the two configuration properties `quarkus.http.cors` and `quarkus.http.cors.methods`.
-One property is the prefix of another, so it may not be immediately evident how to specify both keys in your YAML configuration.
-
-This is solved by using a null key (normally represented by `~`) for any YAML property which is a prefix of another one.  Here's an example:
-
-.An example YAML configuration resolving prefix-related key name conflicts
-[source,yaml]
-----
-quarkus:
-  http:
-    cors:
-      ~: true
-      methods: GET,PUT,POST
-----
-
-In general, null YAML keys are not included in assembly of the configuration property name, allowing them to be used to
-any level for disambiguating configuration keys.
-
-== More info on how to configure
-
-Quarkus relies on SmallRye Config and inherits its features.
-
-SmallRye Config provides:
 
-* Additional Config Sources
-* Additional Converters
-* Interceptors for configuration value resolution
-* Relocate Configuration Properties
-* Fallback Configuration Properties
-* Logging
-* Hide Secrets
+1. System properties
+2. Environment variables
+3. An environment file named `.env` placed in the current working directory
+4. A configuration file placed in `$PWD/config/application.properties`
 
-For more information, please check the
-link:https://smallrye.io/docs/smallrye-config/index.html[SmallRye Config documentation].
+See the <<config-reference.adoc#configuring_quarkus,Configuration Reference Guide>> for more information.
diff --git a/docs/src/main/asciidoc/consul-config.adoc b/docs/src/main/asciidoc/consul-config.adoc
index 09525166fd1fd..64652eee8dfd0 100644
--- a/docs/src/main/asciidoc/consul-config.adoc
+++ b/docs/src/main/asciidoc/consul-config.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Reading properties from Consul
 
@@ -35,7 +35,7 @@ This Key-Value store is what the `quarkus-consul-config` extension interacts wit
 
 There are various ways to start Consul that vary in complexity, but for the purposes of this guide, we elect to start a single Consul server with no persistence via Docker, like so:
 
-[source]
+[source,bash]
 ----
 docker run --rm --name consul -p 8500:8500 -p 8501:8501 consul:1.7 agent -dev -ui -client=0.0.0.0 -bind=0.0.0.0 --https-port=8501
 ----
@@ -46,7 +46,7 @@ Please consult the https://www.consul.io/docs/install[documentation] to learn mo
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
diff --git a/docs/src/main/asciidoc/container-image.adoc b/docs/src/main/asciidoc/container-image.adoc
index a4a0da120f0c4..f3b7e3ae4c2db 100644
--- a/docs/src/main/asciidoc/container-image.adoc
+++ b/docs/src/main/asciidoc/container-image.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Container Images
 
@@ -25,7 +25,7 @@ when all that is needed is the ability to push to a container image registry.
 
 To use this feature, add the following extension to your project:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="container-image-jib"
 ----
@@ -48,7 +48,7 @@ The extension `quarkus-container-image-docker` is using the Docker binary and th
 
 To use this feature, add the following extension to your project.
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="container-image-docker"
 ----
@@ -75,7 +75,7 @@ The creation of such objects is being taken care of by the Quarkus Kubernetes ex
 
 To build a container image for your project, `quarkus.container-image.build=true` needs to be set using any of the ways that Quarkus supports.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -Dquarkus.container-image.build=true
 ----
@@ -84,7 +84,7 @@ To build a container image for your project, `quarkus.container-image.build=true
 
 To push a container image for your project, `quarkus.container-image.push=true` needs to be set using any of the ways that Quarkus supports.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -Dquarkus.container-image.push=true
 ----
@@ -97,7 +97,7 @@ It does not make sense to use multiple extension as part of the same build. When
 
 For example, if both `container-image-docker` and `container-image-s2i` are present and the user needs to use `container-image-docker`:
 
-[source]
+[source,properties]
 ----
 quarkus.container-image.builder=docker
 ----
@@ -110,6 +110,22 @@ The following properties can be used to customize the container image build proc
 
 include::{generated-dir}/config/quarkus-container-image.adoc[opts=optional, leveloffset=+1]
 
+==== Using CI Environments
+
+Various CI environments provide a ready to use container-image registry which can be combined with the container-image Quarkus extensions in order to
+effortlessly create and push a Quarkus application to said registry.
+
+For example, https://gitlab.com/[GitLab] provides such a registry and in the provided CI environment,
+makes available the `CI_REGISTRY_IMAGE` environment variable
+(see GitLab's https://docs.gitlab.com/ee/ci/variables/[documentation]) for more information), which can be used in Quarkus like so:
+
+[source,properties]
+----
+quarkus.container-image.image=${CI_REGISTRY_IMAGE}
+----
+
+NOTE: See link:config.adoc#combine-property-env-var[this] for more information on how to combine properties with environment variables.
+
 === Jib Options
 
 In addition to the generic container image options, the `container-image-jib` also provides the following options:
diff --git a/docs/src/main/asciidoc/context-propagation.adoc b/docs/src/main/asciidoc/context-propagation.adoc
index 12c976ea5a5e9..147ca885f8545 100644
--- a/docs/src/main/asciidoc/context-propagation.adoc
+++ b/docs/src/main/asciidoc/context-propagation.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Context Propagation in Quarkus
 
@@ -101,7 +101,7 @@ you need manual context propagation. You can do that by injecting a `ThreadConte
 or `ManagedExecutor` that will propagate every context. For example, here we use the link:vertx[Vert.x Web Client]
 to get the list of Star Wars people, then store them in the database using
 link:hibernate-orm-panache[Hibernate ORM with Panache] (all in the same transaction) before returning
-them to the client as JSON using link:rest-json[JSON-B or Jackson]:
+them to the client as JSON using link:rest-json[Jackson or JSON-B]:
 
 [source,java]
 ----
@@ -112,12 +112,11 @@ them to the client as JSON using link:rest-json[JSON-B or Jackson]:
     @Transactional
     @GET
     @Path("/people")
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<List<Person>> people() throws SystemException {
         // Create a REST client to the Star Wars API
         WebClient client = WebClient.create(vertx,
                          new WebClientOptions()
-                          .setDefaultHost("swapi.co")
+                          .setDefaultHost("swapi.dev")
                           .setDefaultPort(443)
                           .setSsl(true));
         // get the list of Star Wars people, with context capture
@@ -173,3 +172,21 @@ You need to include the following modules to get RxJava2 support:
     </dependency>
 </dependencies>
 ----
+
+== Context Propagation for CDI
+
+In terms of CDI, `@RequestScoped`, `@ApplicationScoped` and `@Singleton` beans get propagated and are available in other threads.
+`@Dependent` beans as well as any custom scoped beans cannot be automatically propagated via CDI Context Propagation.
+
+
+`@ApplicationScoped` and `@Singleton` beans are always active scopes and as such are easy to deal with - context propagation tasks can work with those beans so long as the CDI container is running.
+However, `@RequestScoped` beans are a different story. They are only active for a short period of time which can be bound either to HTTP request or some other request/task when manually activated/deactivated.
+In this case user must be aware that once the original thread gets to an end of a request, it will terminate the context, calling `@PreDestroy` on those beans and then clearing them from the context.
+Subsequent attempts to access those beans from other threads can result in unexpected behaviour.
+It is therefore recommended to make sure all tasks using request scoped beans via context propagation are performed in such a manner that they don't outlive the original request duration.
+
+
+[NOTE]
+====
+Due to the above described behavior, it is recommended to avoid using `@PreDestroy` on `@RequestScoped` beans when working with Context Propagation in CDI.
+====
diff --git a/docs/src/main/asciidoc/credentials-provider.adoc b/docs/src/main/asciidoc/credentials-provider.adoc
index f37587ac2b306..d9ba21f0b9abf 100644
--- a/docs/src/main/asciidoc/credentials-provider.adoc
+++ b/docs/src/main/asciidoc/credentials-provider.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using a Credentials Provider
 
diff --git a/docs/src/main/asciidoc/datasource.adoc b/docs/src/main/asciidoc/datasource.adoc
index 51c536ec7934b..f011b9794b121 100644
--- a/docs/src/main/asciidoc/datasource.adoc
+++ b/docs/src/main/asciidoc/datasource.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Datasources
 
@@ -22,7 +22,7 @@ Both are configured via unified and flexible configuration.
 [NOTE]
 ====
 Agroal is a modern, light weight connection pool implementation designed for very high performance and scalability,
-and features first class integration with the other components in Quarkus, such as security, transaction management components, health metrics.
+and features first class integration with the other components in Quarkus, such as security, transaction management components, health, and metrics.
 ====
 
 This guide will explain how to:
@@ -40,6 +40,39 @@ please refer to the link:reactive-sql-clients[Reactive SQL clients guide].
 This is a quick introduction to datasource configuration.
 If you want a better understanding of how all this works, this guide has a lot more information in the subsequent paragraphs.
 
+=== Zero Config Setup (DevServices)
+
+When testing or running in dev mode Quarkus can even provide you with a zero config database out of the box, a feature
+we refer to as DevServices. Depending on your database type you may need docker installed in order to use this feature. DevServices
+is supported for the following open source databases:
+
+* Postgresql (container)
+* MySQL (container)
+* MariaDB (container)
+* H2 (in-process)
+* Apache Derby (in-process)
+* DB2 (container) (requires license acceptance)
+* MSSQL (container) (requires license acceptance)
+
+
+If you want to use DevServices then all you need to do is include the relevant extension for the type of database you want (either reactive or
+JDBC, or both), and don't configure a database URL, username and password, Quarkus will provide the database and you can just start
+coding without worrying about config.
+
+If you are using a proprietary database such as DB2 or MSSQL you will need to accept the license agreement. To do this
+create a `src/main/resources/container-license-acceptance.txt` files in your project and add a line with the image
+name and tag of the database. By default Quarkus uses the default image for the current version of Testcontainers, if
+you attempt to start Quarkus the resulting failure will tell you the exact image name in use for you to add to the
+file.
+
+An example file is shown below:
+
+.src/main/resources/container-license-acceptance.txt
+----
+ibmcom/db2:11.5.0.0a
+mcr.microsoft.com/mssql/server:2017-CU12
+----
+
 === JDBC datasource
 
 Add the `agroal` extension plus one of `jdbc-db2`, `jdbc-derby`, `jdbc-h2`, `jdbc-mariadb`, `jdbc-mssql`, `jdbc-mysql`, or `jdbc-postgresql`.
@@ -48,14 +81,16 @@ Then configure your datasource:
 
 [source, properties]
 ----
-quarkus.datasource.db-kind=postgresql
+quarkus.datasource.db-kind=postgresql <1>
 quarkus.datasource.username=<your username>
 quarkus.datasource.password=<your password>
 
 quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/hibernate_orm_test
-quarkus.datasource.jdbc.min-size=4
 quarkus.datasource.jdbc.max-size=16
 ----
+<1> If you only have a single JDBC extension, or you are running tests and only have a single test scoped JDBC extension installed then this is
+optional. If there is only one possible extension we assume this is the correct one, and if a driver has been added with test scope then
+we assume that this should be used in testing.
 
 === Reactive datasource
 
@@ -65,20 +100,22 @@ Then configure your reactive datasource:
 
 [source, properties]
 ----
-quarkus.datasource.db-kind=postgresql
+quarkus.datasource.db-kind=postgresql <1>
 quarkus.datasource.username=<your username>
 quarkus.datasource.password=<your password>
 
 quarkus.datasource.reactive.url=postgresql:///your_database
 quarkus.datasource.reactive.max-size=20
 ----
+<1> As specified above this is optional.
 
 == Default datasource
 
 A datasource can be either a JDBC datasource, a reactive one or both.
 It all depends on how you configure it and which extensions you added to your project.
 
-To define a datasource, start with the following:
+To define a datasource, start with the following (note that this is only required if you have more than one
+database type installed):
 
 [source, properties]
 ----
@@ -136,7 +173,7 @@ First, you will need to add the `quarkus-agroal` dependency to your project.
 
 You can add it using a simple Maven command:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="agroal"
 ----
@@ -164,7 +201,7 @@ See <<other-databases>> if you want to use a JDBC driver for another database.
 [NOTE]
 ====
 The H2 and Derby databases can normally be configured to run in "embedded mode";
-the extension does not support compiling the embedded database engine into native images.
+the extension does not support compiling the embedded database engine into native executables.
 
 Read <<in-memory-databases,Testing with in-memory databases>> (below) for suggestions regarding integration testing.
 ====
@@ -173,7 +210,7 @@ As usual, you can install the extension using `add-extension`.
 
 To install the PostgreSQL driver dependency for instance, run the following command:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="jdbc-postgresql"
 ----
@@ -347,10 +384,8 @@ So it is not currently possible to create multiple reactive datasources.
 
 [NOTE]
 ====
-Currently, Hibernate ORM supports only one persistence unit which uses the default datasource.
-If you want to use multiple datasources, you will need to manipulate them directly.
-
-Multiple persistence units support is planned for a future version of Quarkus.
+The Hibernate ORM extension link:hibernate-orm#multiple-persistence-units[supports defining several persistence units using configuration properties].
+For each persistence unit, you can point to the datasource of your choice.
 ====
 
 Defining multiple datasources works exactly the same way as defining a single datasource, with one important change:
@@ -369,25 +404,26 @@ each with its own configuration.
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
 quarkus.datasource.jdbc.max-size=13
 
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 ----
 
 Notice there is an extra bit in the key.
 The syntax is as follows: `quarkus.datasource.[optional name.][datasource property]`.
 
+NOTE: Even when only one database extension is installed, named databases need to specify at least one build time
+property so that Quarkus knows they exist. Generally this will be the `db-kind` property, although you can also
+specify DevServices properties to create named datasources (covered later in this guide).
+
 === Named Datasource Injection
 
 When using multiple datasources, each `DataSource` also has the `io.quarkus.agroal.DataSource` qualifier with the name of the datasource as the value.
@@ -412,25 +448,25 @@ AgroalDataSource inventoryDataSource;
 If you are using the `quarkus-smallrye-health` extension, the `quarkus-agroal` and reactive client extensions will automatically add a readiness health check
 to validate the datasource.
 
-So when you access the `/health/ready` endpoint of your application you will have information about the datasource validation status.
+When you access the `/q/health/ready` endpoint of your application you will have information about the datasource validation status.
 If you have multiple datasources, all datasources will be checked and the status will be `DOWN` as soon as there is one datasource validation failure.
 
 This behavior can be disabled via the property `quarkus.datasource.health.enabled`.
 
 == Datasource Metrics
 
-If you are using the `quarkus-smallrye-metrics` extension, `quarkus-agroal` can expose some data source metrics on the
-`/metrics` endpoint. This can be turned on by setting the property `quarkus.datasource.metrics.enabled` to true.
+If you are using the `quarkus-micrometer` or `quarkus-smallrye-metrics` extension, `quarkus-agroal` can expose some data source metrics on the
+`/q/metrics` endpoint. This can be turned on by setting the property `quarkus.datasource.metrics.enabled` to true.
 
 For the exposed metrics to contain any actual values, it is necessary that metric collection is enabled internally
-by Agroal mechanisms. By default, this metric collection mechanism gets turned on for all data sources if the `quarkus-smallrye-metrics`
+by Agroal mechanisms. By default, this metric collection mechanism gets turned on for all data sources if a metrics extension
 is present and metrics for the Agroal extension are enabled. If you want to disable metrics for a particular data source,
 this can be done by setting `quarkus.datasource.jdbc.enable-metrics` to `false` (or `quarkus.datasource.<datasource name>.jdbc.enable-metrics` for a named datasource).
-This disables collecting the metrics as well as exposing them in the `/metrics` endpoint,
+This disables collecting the metrics as well as exposing them in the `/q/metrics` endpoint,
 because it does not make sense to expose metrics if the mechanism to collect them is disabled.
 
 Conversely, setting `quarkus.datasource.jdbc.enable-metrics` to `true` (or `quarkus.datasource.<datasource name>.jdbc.enable-metrics` for a named datasource) explicitly can be used to enable collection of metrics even if
-the `quarkus-smallrye-metrics` extension is not in use.
+a metrics extension is not in use.
 This can be useful if you need to access the collected metrics programmatically.
 They are available after calling `dataSource.getMetrics()` on an injected `AgroalDataSource` instance. If collection of metrics is disabled
 for this data source, all values will be zero.
@@ -441,6 +477,28 @@ If the Narayana JTA extension is also available, integration is automatic.
 
 You can override this by setting the `transactions` configuration property - see the <<configuration-reference, Configuration Reference>> below.
 
+== DevServices (Configuration Free Databases)
+
+As mentioned above Quarkus supports a feature called DevServices that allows you to create datasources without any config. If
+you have a database extension that supports it and no config is provided, Quarkus will automatically start a database (either
+using Testcontainers, or by starting a Java DB in process), and automatically configure a connection to this database.
+
+Production databases need to be configured as normal, so if you want to include a production database config in your
+application.properties and continue to use DevServices we recommend that you use the `%prod.` profile to define your
+database settings.
+
+=== Configuring DevServices
+
+DevServices supports the following config options:
+
+include::{generated-dir}/config/quarkus-datasource-config-group-dev-services-build-time-config.adoc[opts=optional, leveloffset=+1]
+
+=== Named Datasources
+
+When using DevServices the default datasource will always be created, but to specify a named datasource you need to have
+at least one build time property so Quarkus knows to create the datasource. In general you will usually either specify
+the `db-kind` property, or explicitly enable DevDb: `quarkus.datasource."named".devservices=true`.
+
 [[in-memory-databases]]
 == Testing with in-memory databases
 
@@ -451,11 +509,11 @@ good reasons to also want the ability to run quick integration tests using the J
 so this is possible as well.
 
 It is important to remember that when configuring H2 (or Derby) to use the embedded engine,
-this will work as usual in JVM mode but such an application will not compile into a native image, as the Quarkus extensions only cover for making the JDBC client code compatible with the native compilation step: embedding the whole database engine into a native image is currently not implemented.
+this will work as usual in JVM mode but such an application will not compile into a native executable, as the Quarkus extensions only cover for making the JDBC client code compatible with the native compilation step: embedding the whole database engine into a native executable is currently not implemented.
 
 If you plan to run such integration tests in the JVM exclusively, it will of course work as usual.
 
-If you want the ability to run such integration test in both JVM and/or native images, we have some cool helpers for you: just add either `@QuarkusTestResource(H2DatabaseTestResource.class)` or `@QuarkusTestResource(DerbyDatabaseTestResource.class)` on any class in your integration tests, this will make sure the test suite starts (and stops) the embedded database into a separate process as necessary to run your tests.
+If you want the ability to run such integration test in both JVM and/or native executables, we have some cool helpers for you: just add either `@QuarkusTestResource(H2DatabaseTestResource.class)` or `@QuarkusTestResource(DerbyDatabaseTestResource.class)` on any class in your integration tests, this will make sure the test suite starts (and stops) the embedded database into a separate process as necessary to run your tests.
 
 These additional helpers are provided by the artifacts having Maven coordinates `io.quarkus:quarkus-test-h2` and `io.quarkus:quarkus-test-derby`, respectively for H2 and Derby.
 
@@ -473,15 +531,15 @@ public class TestResources {
 }
 ----
 
-This will allow you to test your application even when it's compiled into a native image,
+This will allow you to test your application even when it's compiled into a native executable,
 while the database will run in the JVM as usual.
 
 Connect to it using:
 
-[source]
+[source,properties]
 ----
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.driver=org.h2.Driver
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 ----
 
 [[configuration-reference]]
@@ -577,6 +635,8 @@ It can run as a server, based on a file, or live completely in memory.
 All of these options are available as listed above.
 You can find more information at the https://db.apache.org/derby/docs/10.8/devguide/cdevdvlp17453.html#cdevdvlp17453[official documentation].
 
+:no-duration-note: true
+
 [[reactive-configuration]]
 == Reactive Datasource Configuration Reference
 
diff --git a/docs/src/main/asciidoc/deploying-to-azure-cloud.adoc b/docs/src/main/asciidoc/deploying-to-azure-cloud.adoc
index e05a006e995d6..e65bd5321dfe1 100644
--- a/docs/src/main/asciidoc/deploying-to-azure-cloud.adoc
+++ b/docs/src/main/asciidoc/deploying-to-azure-cloud.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Deploying to Microsoft Azure Cloud
 
diff --git a/docs/src/main/asciidoc/deploying-to-google-cloud.adoc b/docs/src/main/asciidoc/deploying-to-google-cloud.adoc
new file mode 100644
index 0000000000000..b969cf6932321
--- /dev/null
+++ b/docs/src/main/asciidoc/deploying-to-google-cloud.adoc
@@ -0,0 +1,225 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Deploying to Google Cloud Platform (GCP)
+
+include::./attributes.adoc[]
+
+This guide covers:
+
+* Login to Google Cloud
+* Deploying a function to Google Cloud Functions
+* Deploying a JAR to Google App Engine Standard
+* Deploying a Docker image to Google App Engine Flexible Custom Runtimes
+* Deploying a Docker image to Google Cloud Run
+
+== Prerequisites
+
+For this guide you need:
+
+* Roughly 1 hour for all modalities
+* JDK 11
+* Apache Maven {maven-version}
+* https://cloud.google.com/[A Google Cloud Account].  Free accounts work.
+* https://cloud.google.com/sdk[Cloud SDK CLI Installed]
+
+This guide will take as input an application developed in the link:getting-started[Getting Started guide].
+
+Make sure you have the getting-started application at hand, or clone the Git repository: `git clone {quickstarts-clone-url}`,
+or download an {quickstarts-archive-url}[archive]. The solution is located in the `getting-started` directory.
+
+== Login to Google Cloud
+
+Login to Google Cloud is necessary for deploying the application and it can be done as follows:
+
+[source, subs=attributes+]
+----
+gcloud auth login
+----
+
+== Deploying to Google Cloud Functions
+
+Quarkus supports deploying your application to Google Cloud Functions via the following extensions:
+
+- link:gcp-functions[Google Cloud Functions]: Build functions using the Google Cloud Functions API.
+- link:gcp-functions-http[Google Cloud Functions HTTP binding]: Build functions using Quarkus HTTP APIs: RESTEasy (JAX-RS),
+Undertow (Servlet), Vert.x Web, or link:funqy-http[Funqy HTTP].
+- link:funqy-gcp-functions[Funky Google Cloud Functions]: Build functions using Funqy.
+
+Each extension supports a specific kind of application development,
+follow the specific guides for more information on how to develop, package and deploy your applications using them.
+
+== Deploying to Google App Engine Standard
+
+We will only cover the Java 11 runtime as the Java 8 runtime uses its own Servlet engine which is not compatible with Quarkus.
+
+First of all, make sure to have an App Engine environment initialized for your Google Cloud project, if not, initialize one via `gcloud app create --project=[YOUR_PROJECT_ID]`.
+
+Then, you will need to create a `src/main/appengine/app.yaml` file, let's keep it minimalistic with only the selected engine:
+
+[source, yaml]
+----
+runtime: java11
+----
+
+This will create a default service for your App Engine application.
+
+Then, you can choose to build the application by yourself or letting `gcloud` or the Google Cloud Maven plugin build it for you.
+
+=== Building the application manually
+
+Set up your application to be packaged as an uber-jar via your `application.properties` file:
+
+[source, properties]
+----
+quarkus.package.type=uber-jar
+----
+
+Use Maven to build the application using `mvn clean package`, it will generate a single JAR that contains all the classes of your application including its dependencies.
+
+Finally, use `gcloud` to deploy your application as an App Engine service.
+
+[source, shell script]
+----
+gcloud app deploy target/getting-started-1.0.0-SNAPSHOT-runner.jar
+----
+
+This command will upload your application jar and launch it on App Engine.
+
+When done, the output will display the URL of your application (target url), you can use it with curl or directly open it in your browser using `gcloud app browse`.
+
+=== Building the application via gcloud
+
+You can choose to let `gcloud` build your application for you, this is the simplest way to deploy to App Engine.
+
+Just launch `gcloud app deploy` in the root of your project, it will upload all your project files (the list can be reduced via the  `.gcloudignore` file),
+package your JAR via Maven (or Gradle) and launch it on App Engine.
+
+When done, the output will display the URL of your application (target url), you can use it with curl or directly open it in your browser using `gcloud app browse`.
+
+=== Building the application via the Google Cloud Maven plugin
+
+You can also let Maven control the deployment of your application using the App Engine Maven plugin.
+
+First, add the plugin to your `pom.xml`:
+
+[source,xml]
+----
+<plugin>
+    <groupId>com.google.cloud.tools</groupId>
+    <artifactId>appengine-maven-plugin</artifactId>
+    <version>2.4.0</version>
+    <configuration>
+        <projectId>GCLOUD_CONFIG</projectId> <1>
+        <version>gettingstarted</version>
+        <artifact>${project.build.directory}/getting-started-${project.version}-runner.jar</artifact> <2>
+    </configuration>
+</plugin>
+----
+
+1. Use the default `gcloud` configuration
+2. Override the default JAR name to the one generated by the Quarkus Maven plugin
+
+Then you would be able to use Maven to build and deploy your application to App Engine via `mvn clean package appengine:deploy`.
+
+When it’s done, the output will display the URL of your application (target URL), you can use it with curl or directly open it in your browser using `gcloud app browse`.
+
+== Deploying to Google App Engine Flexible Custom Runtimes
+
+Before all, make sure to have an App Engine environment initialized for your Google Cloud project, if not, initialize one via `gcloud app create --project=[YOUR_PROJECT_ID]`.
+
+App Engine Flexible Custom Runtimes uses a Docker image to run your application.
+
+First, create an `app.yaml` file at the root of your project with the following content:
+
+[source, yaml]
+----
+runtime: custom
+env: flex
+----
+
+App Engine Flexible Custom Runtimes deploys your application as a Docker container, you can choose to deploy one of the Dockerfile provided inside your application.
+
+Both JVM and native executable versions will work.
+
+To deploy a JVM application:
+
+- Copy the JVM Dockerfile to the root directory of your project: `cp src/main/docker/Dockerfile.jvm Dockerfile`.
+- Build your application using `mvn clean package`.
+
+To deploy a native application:
+
+- Copy the native Dockerfile to the root directory of your project: `cp src/main/docker/Dockerfile.native Dockerfile`.
+- Build your application as a native executable using `mvn clean package -Dnative`.
+
+Finally, launch `gcloud app deploy` in the root of your project, it will upload all your project files (the list can be reduced via the  `.gcloudignore` file),
+build your Dockerfile and launch it on App Engine Flexible custom runtime.
+
+It uses Cloud Build to build your Docker image and deploy it to Google Container Registry (GCR).
+
+When done, the output will display the URL of your application (target url), you can use it with curl or directly open it in your browser using `gcloud app browse`.
+
+NOTE: App Engine Flexible custom runtimes support link:https://cloud.google.com/appengine/docs/flexible/custom-runtimes/configuring-your-app-with-app-yaml#updated_health_checks[health checks],
+it is strongly advised to provide them thanks to Quarkus link:microprofile-health[Microprofile Health] support.
+
+== Deploying to Google Cloud Run
+
+Google Cloud Run allows you to run your Docker containers inside Google Cloud Platform in a managed way.
+
+NOTE: By default, Quarkus listens on port 8080, and it's also the Cloud Run default port.
+No need to use the `PORT` environment variable defined in Cloud Run to customize the Quarkus HTTP port.
+
+Cloud Run will use Cloud Build to build your Docker image and deploy it to Google Container Registry (GCR).
+
+Both JVM and native executable versions will work.
+
+To deploy a JVM application:
+
+- Copy the JVM Dockerfile to the root directory of your project: `cp src/main/docker/Dockerfile.jvm Dockerfile`.
+- Build your application using `mvn clean package`.
+
+To deploy a native application:
+
+- Copy the native Dockerfile to the root directory of your project: `cp src/main/docker/Dockerfile.native Dockerfile`.
+- Build your application as a native executable using `mvn clean package -Dnative`.
+
+Then, create a `.gcloudignore` file to tell gcloud which files should be not be uploaded for Cloud Build,
+without it, it defaults to `.gitignore` that usually exclude the target directory where you packaged application has been created.
+
+In this example, I only exclude the `src` directory:
+
+[source]
+----
+src/
+----
+
+Then, use Cloud Build to build your image, it will upload to a Google Cloud Storage bucket all the files of your application (except the ones ignored by the `.gcloudignore`file),
+build your Docker image and push it to Google Container Registry (GCR).
+
+[source, shell script]
+----
+gcloud builds submit --tag gcr.io/PROJECT-ID/helloworld
+----
+
+NOTE: You can also build your image locally and push it to a publicly accessible Docker registry, then use this image in the next step.
+
+Finally, use Cloud Run to launch your application.
+
+[source, shell script]
+----
+gcloud run deploy --image gcr.io/PROJECT-ID/helloworld --platform managed
+----
+
+Cloud run will ask you questions on the service name, the region and whether or not unauthenticated calls are allowed.
+After you answer to these questions, it will deploy your application.
+
+When the deployment is done, the output will display the URL to access your application.
+
+== Going further
+
+You can find a set of extensions to access various Google Cloud Services in the Quarkiverse (a GitHub organization for Quarkus extensions maintained by the community),
+including PubSub, BigQuery, Storage, Spanner, Firestore (visit the repository for an accurate list of supported services).
+
+You can find some documentation about them in the link:https://github.com/quarkiverse/quarkiverse-google-cloud-services[Quarkiverse Google Cloud Services repository].
diff --git a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc
index e261bb8593d82..e009c0d8709ca 100644
--- a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc
+++ b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Kubernetes extension
 
@@ -27,14 +27,14 @@ To complete this guide, you need:
 
 Let's create a new project that contains both the Kubernetes and Jib extensions:
 
-[source,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=kubernetes-quickstart \
     -DclassName="org.acme.rest.GreetingResource" \
     -Dpath="/greeting" \
-    -Dextensions="kubernetes, jib"
+    -Dextensions="resteasy,kubernetes,jib"
 cd kubernetes-quickstart
 ----
 
@@ -73,7 +73,7 @@ The full source of the `kubernetes.json` file looks something like this:
       },
       "labels" : {
         "app.kubernetes.io/name" : "test-quarkus-app",
-        "app.kubernetes.io/version" : "1.0-SNAPSHOT",
+        "app.kubernetes.io/version" : "1.0.0-SNAPSHOT",
       },
       "name" : "test-quarkus-app"
     },
@@ -82,14 +82,14 @@ The full source of the `kubernetes.json` file looks something like this:
       "selector" : {
         "matchLabels" : {
           "app.kubernetes.io/name" : "test-quarkus-app",
-          "app.kubernetes.io/version" : "1.0-SNAPSHOT",
+          "app.kubernetes.io/version" : "1.0.0-SNAPSHOT",
         }
       },
       "template" : {
         "metadata" : {
           "labels" : {
             "app.kubernetes.io/name" : "test-quarkus-app",
-            "app.kubernetes.io/version" : "1.0-SNAPSHOT"
+            "app.kubernetes.io/version" : "1.0.0-SNAPSHOT"
           }
         },
         "spec" : {
@@ -102,7 +102,7 @@ The full source of the `kubernetes.json` file looks something like this:
                 }
               }
             } ],
-            "image" : "yourDockerUsername/test-quarkus-app:1.0-SNAPSHOT",
+            "image" : "yourDockerUsername/test-quarkus-app:1.0.0-SNAPSHOT",
             "imagePullPolicy" : "Always",
             "name" : "test-quarkus-app"
           } ]
@@ -120,7 +120,7 @@ The full source of the `kubernetes.json` file looks something like this:
       },
       "labels" : {
         "app.kubernetes.io/name" : "test-quarkus-app",
-        "app.kubernetes.io/version" : "1.0-SNAPSHOT",
+        "app.kubernetes.io/version" : "1.0.0-SNAPSHOT",
       },
       "name" : "test-quarkus-app"
     },
@@ -132,7 +132,7 @@ The full source of the `kubernetes.json` file looks something like this:
     } ],
     "selector" : {
       "app.kubernetes.io/name" : "test-quarkus-app",
-      "app.kubernetes.io/version" : "1.0-SNAPSHOT"
+      "app.kubernetes.io/version" : "1.0.0-SNAPSHOT"
     },
     "type" : "ClusterIP"
   }
@@ -142,17 +142,17 @@ The full source of the `kubernetes.json` file looks something like this:
 
 The generated manifest can be applied to the cluster from the project root using `kubectl`:
 
-[source]
+[source,bash]
 ----
 kubectl apply -f target/kubernetes/kubernetes.json
 ----
 
-An important thing to note about the `Deployment` is that is uses `yourDockerUsername/test-quarkus-app:1.0-SNAPSHOT` as the container image of the `Pod`.
+An important thing to note about the `Deployment` is that is uses `yourDockerUsername/test-quarkus-app:1.0.0-SNAPSHOT` as the container image of the `Pod`.
 The name of the image is controlled by the Jib extension and can be customized using the usual `application.properties`.
 
 For example with a configuration like:
 
-[source]
+[source,properties]
 ----
 quarkus.container-image.group=quarkus #optional, default to the system user name
 quarkus.container-image.name=demo-app #optional, defaults to the application name
@@ -161,11 +161,27 @@ quarkus.container-image.tag=1.0       #optional, defaults to the application ver
 
 The image that will be used in the generated manifests will be `quarkus/demo-app:1.0`
 
+=== Namespace
+
+By default Quarkus omits the namespace in the generated manifests, rather than enforce the `default` namespace. That means that you can apply the manifest to your chosen namespace when using `kubctl`, which in the example below is `test`:
+
+[source,bash]
+----
+kubectl apply -f target/kubernetes/kubernetes.json -n=test
+----
+
+To specify the namespace in your manifest customize with the following property in your `application.properties`:
+
+[source,properties]
+----
+quarkus.kubernetes.namespace=mynamespace 
+----
+
 === Defining a Docker registry
 
 The Docker registry can be specified with the following property:
 
-[source]
+[source,properties]
 ----
 quarkus.container-image.registry=my.docker-registry.net
 ----
@@ -181,13 +197,26 @@ The generated manifests use the Kubernetes link:https://kubernetes.io/docs/conce
 These labels can be customized using `quarkus.kubernetes.name`, `quarkus.kubernetes.version` and `quarkus.kubernetes.part-of`.
 For example by adding the following configuration to your `application.properties`:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.part-of=todo-app
 quarkus.kubernetes.name=todo-rest
 quarkus.kubernetes.version=1.0-rc.1
 ----
 
+[NOTE]
+====
+As is described in detail in the <<#openshift, OpenShift>> section, customizing OpenShift (or Knative) properties is done in the same way, but replacing
+`kubernetes` with `openshift` (or `knative`). The previous example for OpenShift would look like this:
+
+[source,properties]
+----
+quarkus.openshift.part-of=todo-app
+quarkus.openshift.name=todo-rest
+quarkus.openshift.version=1.0-rc.1
+----
+====
+
 The labels in generated resources will look like:
 
 [source, json]
@@ -203,7 +232,7 @@ The labels in generated resources will look like:
 
 To add additional custom labels, for example `foo=bar` just apply the following configuration:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.labels.foo=bar
 ----
@@ -226,10 +255,10 @@ Out of the box, the generated resources will be annotated with version control r
 
 Custom annotations can be added in a way similar to labels.For example to add the annotation `foo=bar` and `app.quarkus/id=42` just apply the following configuration:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.annotations.foo=bar
-quarkus."app.quarkus/id"=42
+quarkus.kubernetes.annotations."app.quarkus/id"=42
 ----
 
 [#env-vars]
@@ -347,11 +376,22 @@ This would generate the following in the `env` section of your container:
 
 It's also possible to use the value from another field to add a new environment variable by specifying the path of the field to be used as a source, as follows:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.env.fields.foo=metadata.name
 ----
 
+[NOTE]
+====
+As is described in detail in the <<#openshift, OpenShift>> section, customizing OpenShift properties is done in the same way, but replacing
+`kubernetes` with `openshift`. The previous example for OpenShift would look like this:
+
+[source,properties]
+----
+quarkus.openshift.env.fields.foo=metadata.name
+----
+====
+
 ===== Validation
 
 A conflict between two definitions, e.g. mistakenly assigning both a value and specifying that a variable is derived from a field, will result in an error being thrown at build time so that you get the opportunity to fix the issue before you deploy your application to your cluster where it might be more difficult to diagnose the source of the issue.
@@ -386,7 +426,7 @@ only generate an environment variable `MY_ENV_VAR=newValue` and issue a warning.
 The Kubernetes extension allows the user to configure both volumes and mounts for the application.
 Any volume can be mounted with a simple configuration:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.mounts.my-volume.path=/where/to/mount
 ----
@@ -396,23 +436,51 @@ The volumes themselves can be configured as shown in the sections below.
 
 ===== Secret volumes
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.secret-volumes.my-volume.secret-name=my-secret
 ----
 
 ===== ConfigMap volumes
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.config-map-volumes.my-volume.config-map-name=my-secret
 ----
 
+==== Passing application configuration
+
+Quarkus supports passing configuration from external locations (via Smallrye Config). This usually requires setting an additional environment variable or system propertiy.
+When you need to use a secret or a config map for the purpose of application configuration, you need to:
+
+- define a volume
+- mount the volume
+- create an environment variable for `SMALLRYE_CONFIG_LOCATIONS`
+
+To simplify things, quarkus provides single step alternative:
+
+[source,properties]
+----
+quarkus.kubernetes.app-secret=<name of the secret containing the configuration>
+----
+
+or
+
+[source,properties]
+----
+quarkus.kubernetes.app-config-map=<name of the config map containing the configuration>
+----
+
+When these properties are used, the generated manifests will contain everything required.
+The application config volumes will be created using path: `/mnt/app-secret` and `/mnt/app-config-map` for secrets and configmaps respectively.
+
+Note: Users may use both properties at the same time.
+
 === Changing the number of replicas:
 
 To change the number of replicas from 1 to 3:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.replicas=3
 ----
@@ -435,12 +503,61 @@ More information about the health extension can be found in the relevant link:mi
 === Customizing the readiness probe:
 To set the initial delay of the probe to 20 seconds and the period to 45:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.readiness-probe.initial-delay=20s
 quarkus.kubernetes.readiness-probe.period=45s
 ----
 
+=== Add hostAliases
+To add entries to a Pod's `/etc/hosts` file (more information can be found in https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/[Kubernetes documentation]), just apply the following configuration:
+
+[source,properties]
+----
+quarkus.kubernetes.hostaliases."10.0.0.0".hostnames=foo.com,bar.org
+----
+
+This would generate the following `hostAliases` section in the `deployment` definition:
+
+[source,yaml]
+----
+kind: Deployment
+spec:
+  template:
+    spec:
+      hostAliases:
+      - hostnames:
+        - foo.com
+        - bar.org
+        ip: 10.0.0.0
+----
+
+=== Container Resources Management
+
+CPU & Memory limits and requests can be applied to a `Container` (more info in https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/[Kubernetes documentation]) using the following configuration:
+
+[source]
+----
+quarkus.kubernetes.resources.requests.memory=64Mi
+quarkus.kubernetes.resources.requests.cpu=250m
+quarkus.kubernetes.resources.limits.memory=512Mi
+quarkus.kubernetes.resources.limits.cpu=1000m
+----
+
+This would generate the following entry in the `container` section:
+
+[source, yaml]
+----
+containers:
+  resources:
+    limits:
+      cpu: 1000m
+      memory: 512Mi
+    requests:
+      cpu: 250m
+      memory: 64Mi
+----
+
 === Using the Kubernetes client
 
 Applications that are deployed to Kubernetes and need to access the API server will usually make use of the `kubernetes-client` extension:
@@ -476,7 +593,7 @@ This extension assumes a couple things:
 * Users won't be using an image registry and will instead make their container image accessible to the Kubernetes cluster by building it directly
 into Minikube's Docker daemon. To use Minikube's Docker daemon you must first execute:
 +
-[source]
+[source,bash]
 ----
 eval $(minikube -p minikube docker-env)
 ----
@@ -484,7 +601,7 @@ eval $(minikube -p minikube docker-env)
 * Applications deployed to Kubernetes won't be accessed via a Kubernetes `Ingress`, but rather as a `NodePort` `Service`.
 The advantage of doing this is that the URL of an application can be retrieved trivially by executing:
 +
-[source]
+[source,bash]
 ----
 minikube service list
 ----
@@ -513,16 +630,18 @@ The table below describe all the available configuration options.
 | quarkus.kubernetes.name                            | String                                    |             | ${quarkus.container-image.name}
 | quarkus.kubernetes.version                         | String                                    |             | ${quarkus.container-image.tag}
 | quarkus.kubernetes.part-of                         | String                                    |             |
-| quarkus.kubernetes.init-containers                 | Map<String, Container>                    |             | 
+| quarkus.kubernetes.init-containers                 | Map<String, Container>                    |             |
+| quarkus.kubernetes.namespace                       | String                                    |             |
 | quarkus.kubernetes.labels                          | Map                                       |             |
 | quarkus.kubernetes.annotations                     | Map                                       |             |
+| quarkus.kubernetes.app-secret                      | String                                    |             |
+| quarkus.kubernetes.app-config-map                  | String                                    |             |
 | quarkus.kubernetes.env-vars                        | Map<String, Env>                          |             |
 | quarkus.kubernetes.working-dir                     | String                                    |             |
 | quarkus.kubernetes.command                         | String[]                                  |             |
 | quarkus.kubernetes.arguments                       | String[]                                  |             |
 | quarkus.kubernetes.replicas                        | int                                       |             | 1
 | quarkus.kubernetes.service-account                 | String                                    |             |
-| quarkus.kubernetes.host                            | String                                    |             |
 | quarkus.kubernetes.ports                           | Map<String, Port>                         |             |
 | quarkus.kubernetes.service-type                    | ServiceType                               |             | ClusterIP
 | quarkus.kubernetes.pvc-volumes                     | Map<String, PersistentVolumeClaimVolume>  |             |
@@ -538,14 +657,21 @@ The table below describe all the available configuration options.
 | quarkus.kubernetes.liveness-probe                  | Probe                                     |             | ( see Probe )
 | quarkus.kubernetes.readiness-probe                 | Probe                                     |             | ( see Probe )
 | quarkus.kubernetes.sidecars                        | Map<String, Container>                    |             |
-| quarkus.kubernetes.expose                          | boolean                                   |             | false
+| quarkus.kubernetes.ingress.expose                  | boolean                                   |             | false
+| quarkus.kubernetes.ingress.host                    | String                                    |             |
+| quarkus.kubernetes.ingress.annotations             | Map<String, String>                       |             |
 | quarkus.kubernetes.headless                        | boolean                                   |             | false
+| quarkus.kubernetes.hostaliases                     | Map<String, HostAlias>                    |             |
+| quarkus.kubernetes.resources.requests.cpu          | String                                    |             |
+| quarkus.kubernetes.resources.requests.memory       | String                                    |             |
+| quarkus.kubernetes.resources.limits.cpu            | String                                    |             |
+| quarkus.kubernetes.resources.limits.memory         | String                                    |             |
 |====
 
 Properties that use non-standard types, can be referenced by expanding the property.
 For example to define a `kubernetes-readiness-probe` which is of type `Probe`:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.readiness-probe.initial-delay=20s
 quarkus.kubernetes.readiness-probe.period=45s
@@ -564,9 +690,9 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 |====
 | Property  | Type   | Description | Default Value
 | value     | String |             |
-| secret    | String |             |              
-| configmap | String |             |              
-| field     | String |             |              
+| secret    | String |             |
+| configmap | String |             |
+| field     | String |             |
 |====
 
 .Probe
@@ -574,7 +700,7 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 | Property              | Type     | Description | Default Value
 | http-action-path      | String   |             |
 | exec-action           | String   |             |
-| tcp-socket-action     | String   |             |              
+| tcp-socket-action     | String   |             |
 | initial-delay         | Duration |             |             0
 | period                | Duration |             |           30s
 | timeout               | Duration |             |           10s
@@ -594,16 +720,21 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 | Property          | Type                                    | Description | Default Value
 | image             | String                                  |             |
 | env-vars          | Env[]                                   |             |
-| working-dir       | String                                  |             |                                          
+| working-dir       | String                                  |             |
 | command           | String[]                                |             |
 | arguments         | String[]                                |             |
 | ports             | Port[]                                  |             |
 | mounts            | Mount[]                                 |             |
-| image-pull-policy | ImagePullPolicy                         |             | Always                             
-| liveness-probe    | Probe                                   |             |                                          
-| readiness-probe   | Probe                                   |             |                                          
+| image-pull-policy | ImagePullPolicy                         |             | Always
+| liveness-probe    | Probe                                   |             |
+| readiness-probe   | Probe                                   |             |
 |====
 
+.HostAlias
+|====
+| Property    | Type     | Description       | Default Value
+| hostnames   | String[] | list of hostnames |
+|====
 
 ==== Mounts and Volumes
 
@@ -611,8 +742,8 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 |====
 | Property  | Type    | Description | Default Value
 | path      | String  |             |
-| sub-path  | String  |             |               
-| read-only | boolean |             | false         
+| sub-path  | String  |             |
+| read-only | boolean |             | false
 |====
 
 .ConfigMapVolume
@@ -636,11 +767,11 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 |====
 | Property     | Type    | Description | Default Value
 | disk-name    | String  |             |
-| disk-uri     | String  |             |               
+| disk-uri     | String  |             |
 | kind         | String  |             | Managed
-| caching-mode | String  |             | ReadWrite     
-| fs-type      | String  |             | ext4          
-| read-only    | boolean |             | false         
+| caching-mode | String  |             | ReadWrite
+| fs-type      | String  |             | ext4
+| read-only    | boolean |             | false
 |====
 
 .AwsElasticBlockStoreVolume
@@ -648,8 +779,8 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 | Property    | Type    | Description | Default Value
 | volume-id   | String  |             |
 | partition   | int     |             |
-| fs-type     | String  |             | ext4          
-| read-only   | boolean |             | false         
+| fs-type     | String  |             | ext4
+| read-only   | boolean |             | false
 |====
 
 .GitRepoVolume
@@ -664,47 +795,67 @@ Allowed values: `cluster-ip`, `node-port`, `load-balancer`, `external-name`
 |====
 | Property    | Type    | Description | Default Value
 | claim-name  | String  |             |
-| read-only   | boolean |             | false        
+| read-only   | boolean |             | false
 |====
 
 .AzureFileVolume
 |====
 | Property    | Type    | Description | Default Value
 | share-name  | String  |             |
-| secret-name | String  |             |              
-| read-only   | boolean |             | false        
+| secret-name | String  |             |
+| read-only   | boolean |             | false
 |====
 
 [#openshift]
 === OpenShift
 
+One way to deploy an application to OpenShift is to use s2i (source to image) to create an image stream from the source and then deploy the image stream:
+
+[source,bash]
+----
+./mvnw quarkus:remove-extension -Dextensions="kubernetes, jib"
+./mvnw quarkus:add-extension -Dextensions="openshift"
+
+oc new-project quarkus-project
+./mvnw clean package -Dquarkus.container-image.build=true 
+
+oc new-app --name=greeting  quarkus-project/kubernetes-quickstart:1.0.0-SNAPSHOT
+oc expose svc/greeting
+oc get route
+curl <route>/greeting
+----
+
+See further information in link:deploying-to-openshift[Deploying to OpenShift].
+
+A description of OpenShift resources and customisable properties is given below alongside Kubernetes resources to show similarities where applicable.   This includes an alternative to  `oc new-app ...` above, i.e. `oc apply -f target/kubernetes/openshift.json` .
+
 To enable the generation of OpenShift resources, you need to include OpenShift in the target platforms:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.deployment-target=openshift
 ----
 
 If you need to generate resources for both platforms (vanilla Kubernetes and OpenShift), then you need to include both (comma separated).
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.deployment-target=kubernetes,openshift
 ----
 
-Following the execution of `./mvnw package` you will notice amongst the other files that are created, two files named
+Following the execution of `./mvnw package -Dquarkus.container-image.build=true ` you will notice amongst the other files that are created, two files named
 `openshift.json` and `openshift.yml` in the `target/kubernetes/` directory.
 
 These manifests can be deployed as is to a running cluster, using `kubectl`:
 
-[source]
+[source,bash]
 ----
 kubectl apply -f target/kubernetes/openshift.json
 ----
 
-Openshift users might want to use `oc` instead of `kubectl`:
+OpenShift users might want to use `oc` instead of `kubectl`:
 
-[source]
+[source,bash]
 ----
 oc apply -f target/kubernetes/openshift.json
 ----
@@ -724,13 +875,14 @@ The OpenShift resources can be customized in a similar approach with Kubernetes.
 | quarkus.openshift.init-containers                 | Map<String, Container>                    |             |
 | quarkus.openshift.labels                          | Map                                       |             |
 | quarkus.openshift.annotations                     | Map                                       |             |
+| quarkus.openshift.app-secret                      | String                                    |             |
+| quarkus.openshift.app-config-map                  | String                                    |             |
 | quarkus.openshift.env-vars                        | Map<String, Env>                          |             |
 | quarkus.openshift.working-dir                     | String                                    |             |
 | quarkus.openshift.command                         | String[]                                  |             |
 | quarkus.openshift.arguments                       | String[]                                  |             |
 | quarkus.openshift.replicas                        | int                                       |             | 1
 | quarkus.openshift.service-account                 | String                                    |             |
-| quarkus.openshift.host                            | String                                    |             |
 | quarkus.openshift.ports                           | Map<String, Port>                         |             |
 | quarkus.openshift.service-type                    | ServiceType                               |             | ClusterIP
 | quarkus.openshift.pvc-volumes                     | Map<String, PersistentVolumeClaimVolume>  |             |
@@ -746,16 +898,18 @@ The OpenShift resources can be customized in a similar approach with Kubernetes.
 | quarkus.openshift.liveness-probe                  | Probe                                     |             | ( see Probe )
 | quarkus.openshift.readiness-probe                 | Probe                                     |             | ( see Probe )
 | quarkus.openshift.sidecars                        | Map<String, Container>                    |             |
-| quarkus.openshift.expose                          | boolean                                   |             | false
+| quarkus.openshift.route.expose                    | boolean                                   |             | false
+| quarkus.openshift.route.host                      | String                                    |             |
+| quarkus.openshift.route.annotations               | Map<String, String>                       |             |
 | quarkus.openshift.headless                        | boolean                                   |             | false
 |====
 
 [#knative]
 === Knative
-    
+
 To enable the generation of Knative resources, you need to include Knative in the target platforms:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes.deployment-target=knative
 ----
@@ -780,7 +934,7 @@ The full source of the `knative.json` file looks something like this:
       },
       "labels" : {
         "app.kubernetes.io/name" : "test-quarkus-app",
-        "app.kubernetes.io/version" : "1.0-SNAPSHOT"
+        "app.kubernetes.io/version" : "1.0.0-SNAPSHOT"
       },
       "name" : "knative.
     },
@@ -790,7 +944,7 @@ The full source of the `knative.json` file looks something like this:
           "revisionTemplate" : {
             "spec" : {
               "container" : {
-                "image" : "dev.local/yourDockerUsername/test-quarkus-app:1.0-SNAPSHOT",
+                "image" : "dev.local/yourDockerUsername/test-quarkus-app:1.0.0-SNAPSHOT",
                 "imagePullPolicy" : "Always"
               }
             }
@@ -804,7 +958,7 @@ The full source of the `knative.json` file looks something like this:
 
 The generated manifest can be deployed as is to a running cluster, using `kubectl`:
 
-[source]
+[source,bash]
 ----
 kubectl apply -f target/kubernetes/knative.json
 ----
@@ -820,6 +974,8 @@ The generated service can be customized using the following properties:
 | quarkus.knative.init-containers                 | Map<String, Container>                    |             |
 | quarkus.knative.labels                          | Map                                       |             |
 | quarkus.knative.annotations                     | Map                                       |             |
+| quarkus.knative.app-secret                      | String                                    |             |
+| quarkus.knative.app-config-map                  | String                                    |             |
 | quarkus.knative.env-vars                        | Map<String, Env>                          |             |
 | quarkus.knative.working-dir                     | String                                    |             |
 | quarkus.knative.command                         | String[]                                  |             |
@@ -842,8 +998,20 @@ The generated service can be customized using the following properties:
 | quarkus.knative.liveness-probe                  | Probe                                     |             | ( see Probe )
 | quarkus.knative.readiness-probe                 | Probe                                     |             | ( see Probe )
 | quarkus.knative.sidecars                        | Map<String, Container>                    |             |
+| quarkus.knative.revision-name                   | String                                    |             | 
+| quarkus.knative.traffic                         | Traffic[]                                 |             | ( see Traffic)
 |====
 
+.Traffic
+|====
+| Property        | Type    | Description | Default Value
+| revision-name   | String  | A specific revision to which to send this portion of traffic                                    |
+| tag             | String  | Expose a dedicated url for referncing this target                                               |
+| latest-revision | Boolean | Optionally provided to indicate that the latest revision should be used for this traffic target | false 
+| percent         | Logn    | Indicates the percent of traffic that is be routed to this revision                             | 100
+|====
+
+
 === Deployment targets
 
 Mentioned in the previous sections was the concept of `deployment-target`. This concept allows users to control which Kubernetes manifests will be generated
@@ -876,7 +1044,7 @@ Properties referring to config group arrays (e.g. `kubernetes.labels[0]`, `kuber
 
 The code below demonstrates the change in `labels` config:
 
-[source]
+[source,properties]
 ----
 # Old labels config:
 kubernetes.labels[0].name=foo
@@ -888,7 +1056,7 @@ quarkus.kubernetes.labels.foo=bar
 
 The code below demonstrates the change in `env-vars` config:
 
-[source]
+[source,properties]
 ----
 # Old env-vars config:
 kubernetes.env-vars[0].name=foo
@@ -908,7 +1076,7 @@ See <<#env-vars>> and more specifically <<env-vars-backwards>> for more details.
 To trigger building and deploying a container image you need to enable the `quarkus.kubernetes.deploy` flag (the flag is disabled by default - furthermore it has no effect during test runs or dev mode).
 This can be easily done with the command line:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -Dquarkus.kubernetes.deploy=true
 ----
@@ -988,7 +1156,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: "kubernetes-quickstart"
-      app.kubernetes.io/version: "1.0-SNAPSHOT"
+      app.kubernetes.io/version: "1.0.0-SNAPSHOT"
   template:
     metadata:
       annotations:
@@ -1000,7 +1168,7 @@ spec:
       - env:
         - name: "FOO" <3>
           value: "BAR"
-        image: "<<yourDockerUsernmae>>/kubernetes-quickstart:1.0-SNAPSHOT" <4>
+        image: "<<yourDockerUsername>>/kubernetes-quickstart:1.0.0-SNAPSHOT" <4>
         imagePullPolicy: "Always"
         name: "kubernetes-quickstart"
         ports:
@@ -1017,3 +1185,67 @@ The provided replicas <1>, labels <2> and environment variables <3>  were retain
 If the resource name does not match the application name (or the overridden name) instead of reusing the resource a new one will be added. Same goes for the container.
 If the name of the container does not match the application name (or the overridden name), container specific configuration will be ignored.
 ====
+
+== Service Binding
+
+Quarkus supports binding services to applications via the link:https://github.com/k8s-service-bindings/spec[Service Binding Specification for Kubernetes].
+Specifically Quarkus implements the link:https://github.com/k8s-service-bindings/spec#application-projection[Application Projection] part of the specification, thus allowing
+applications running in appropriately configured Kubernetes clusters to consume services (such as a Database or a Broker) without the need for user configuration.
+
+Currently, the following Quarkus extensions support this feature:
+
+* quarkus-jdbc-mariadb
+* quarkus-jdbc-mssql
+* quarkus-jdbc-mysql
+* quarkus-jdbc-postgresql
+* quarkus-kafka-client
+* quarkus-smallrye-reactive-messaging-kafka
+
+This list of extensions will grow as more services with supported bindings become available on Kubernetes.
+
+To enable Service Binding support, in addition to one of the currently supported extensions, the `quarkus-kubernetes-service-binding` extension needs to be added to the application dependencies.
+
+=== Example using PostgreSQL
+
+If the Kubernetes cluster in which your Quarkus application runs supports provisioning a PostgreSQL database, one could use the following dependencies to take advantage of the Service Binding feature:
+
+[source,xml]
+----
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+        </dependency>
+
+       <!-- Hibernate isn't necessary for Service Binding, but most relational database access will benefit from using it -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+        </dependency>
+----
+
+The configuration of the application could be as simple as:
+
+[source,properties]
+----
+quarkus.hibernate-orm.database.generation=validate
+----
+
+You'll notice that all the configuration for the datasource is absent, as it will be auto-discovered by Quarkus when the application is deployed to Kubernetes.
+
+=== How does it work?
+
+When the application is deployed to an appropriately configured Kubernetes cluster, Kubernetes will create on the filesystem a set of files containing the runtime configuration (for example a file containing the URL of the database, another for the username).
+Quarkus knows where in the file system to look for these files (as it consults the `SERVICE_BINDING_ROOT` environment variable which is set by Kubernetes) and if they exist, Quarkus knows how to map the values of these files to the appropriate extension configuration properties.
+
+An example of what the file system looks like can be seen link:https://github.com/quarkusio/quarkus/tree/e7efe6b3efba91b9c4ae26f9318f8397e23e7505/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb[here].
+In that example, the `k8s-sb` directory is meant to be the root of all service bindings. Only one binding which exists in that case and it is named `fruit-db`. This binding has a `type` file indicating that it is a `postgresql` database
+while the other files provide the necessary connection information.
+
+[TIP]
+====
+For more details on how the discovery of the available properties works, please read the link:https://github.com/k8s-service-bindings/spec#application-projection[Application Projection] part of the Service Binding specification.
+====
diff --git a/docs/src/main/asciidoc/deploying-to-openshift-s2i.adoc b/docs/src/main/asciidoc/deploying-to-openshift-s2i.adoc
deleted file mode 100644
index cf1d2d31e1b3a..0000000000000
--- a/docs/src/main/asciidoc/deploying-to-openshift-s2i.adoc
+++ /dev/null
@@ -1,156 +0,0 @@
-////
-This guide is maintained in the main Quarkus repository
-and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
-////
-= Quarkus - Deploying on OpenShift with S2I
-
-include::./attributes.adoc[]
-
-This guide covers:
-
-* The deployment of the application to OpenShift using S2I to build
-
-== Prerequisites
-
-For this guide you need:
-
-* roughly 5 minutes
-* having access to an OpenShift cluster. Minishift is a valid option.
-
-== Solution
-
-We recommend to follow the instructions in the next sections and build the application step by step.
-However, you can go right to the completed example.
-
-Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
-
-The solution is located in the `getting-started` directory.
-
-== Deploying the application as GraalVM native executable in OpenShift
-
-In this section, we are going to leverage the S2I build mechanism of OpenShift.
-We use Quarkus' GraalVM Native S2I Builder, and therefore do not need a `Dockerfile` in this approach.
-You do not need to locally clone the Git repository, as it will be directly built inside OpenShift.
-We are going to create an OpenShift `build` executing it:
-
-[source,shell, subs="attributes"]
-----
-# To build the image on OpenShift
-oc new-app quay.io/quarkus/ubi-quarkus-native-s2i:{graalvm-flavor}~{quickstarts-clone-url} --context-dir=getting-started --name=quarkus-quickstart-native
-oc logs -f bc/quarkus-quickstart-native
-
-# To create the route
-oc expose svc/quarkus-quickstart-native
-
-# Get the route URL
-export URL="http://$(oc get route | grep quarkus-quickstart-native | awk '{print $2}')"
-echo $URL
-curl $URL/hello/greeting/quarkus
-----
-
-Your application is accessible at the printed URL.
-
-Note that GraalVM-based native build are more memory & CPU intensive than regular pure Java builds.
-https://docs.openshift.com/container-platform/3.11/dev_guide/builds/advanced_build_operations.html[By default, builds are completed by pods using unbound resources, such as memory and CPU],
-but note that https://docs.openshift.com/container-platform/3.11/admin_guide/limits.html#admin-guide-limits[your OpenShift Project may have limit ranges defined].
-
-Testing indicates that the "hello, world" getting-started demo application builds in around 2 minutes on typical hardware when the build is given 4 GB of RAM and 4 (virtual) CPUs for concurrency. You therefore may need to increase the respective limits for OpenShift's S2I build containers like so:
-
-[source,yaml]
-----
-apiVersion: "v1"
-kind: "BuildConfig"
-metadata:
-    name: "quarkus-quickstart-native"
-spec:
-    resources:
-    limits:
-        cpu: '4'
-        memory: 4Gi
-----
-
-The following `oc patch` command adds these `limits`, and `oc start-build` launches a new build:
-
-[source,shell]
-----
-oc patch bc/quarkus-quickstart-native -p '{"spec":{"resources":{"limits":{"cpu":"4", "memory":"4Gi"}}}}'
-
-oc start-build quarkus-quickstart-native
-----
-
-== Building a minimal runtime container
-
-As an alternative to creating an application from the S2I build process one can use chained builds to produce a runner image that is minimal in size and does not contain all the dependencies required to build the application.
-
-The following command will create a chained build that is triggered whenever the quarkus-quickstart-native is built.  
-
-[source,shell]
-----
-oc new-build --name=minimal-quarkus-quickstart-native \
-    --docker-image=registry.access.redhat.com/ubi7-dev-preview/ubi-minimal \
-    --source-image=quarkus-quickstart-native \
-    --source-image-path='/home/quarkus/application:.' \
-    --dockerfile=$'FROM registry.access.redhat.com/ubi7-dev-preview/ubi-minimal:latest\nCOPY application /application\nCMD /application\nEXPOSE 8080'
-----
-
-To create a service from the minimal build run the following command:
-
-[source,shell]
-----
-oc new-app minimal-quarkus-quickstart-native
-
-oc expose svc minimal-quarkus-quickstart-native
-----
-
-The end result is an image that is less than 40 MB in size (compressed) and does not contain build dependencies like GraalVM, OpenJDK, Maven, etc.
-
-[TIP]
-.Creating build without config.
-====
-The minimal build is depending on the S2I build since it is using the output (native runnable application) from the S2I build. However, you do not need to create an application with `oc new-app`. Instead you could use `oc new-build` like this:
-[source, shell, subs="attributes"]
-----
-oc new-build quay.io/quarkus/ubi-quarkus-native-s2i:{graalvm-flavor}~{quickstarts-clone-url} \
-    --context-dir=getting-started --name=quarkus-quickstart-native
-----
-====
-
-== Deploying the application as Java application in OpenShift
-
-In this section, we are going to leverage the S2I build mechanism of OpenShift.
-We use a Java S2I Builder, and therefore do not need a `Dockerfile` in this approach.
-You do not need to locally clone the Git repository, as it will be directly built inside OpenShift.
-We are going to create an OpenShift `build` executing it:
-
-[source,shell, subs="attributes"]
-----
-# To build the image on OpenShift
-oc new-app registry.access.redhat.com/ubi8/openjdk-11:latest~{quickstarts-clone-url} --context-dir=getting-started --name=quarkus-quickstart
-oc logs -f bc/quarkus-quickstart
-
-# To create the route
-oc expose svc/quarkus-quickstart
-
-# Get the route URL
-export URL="http://$(oc get route | grep quarkus-quickstart | awk '{print $2}')"
-curl $URL/hello/greeting/quarkus
-----
-
-Your application is accessible at the printed URL.
-
-The `.s2i/environment` file in the quickstart sets required variables for the S2I Builder image to find the Quarkus `runner` JAR, and copy the JARs from the `lib/` directory:
-
-[source,text]
-----
-MAVEN_S2I_ARTIFACT_DIRS=target
-S2I_SOURCE_DEPLOYMENTS_FILTER=*-runner.jar lib
-JAVA_OPTIONS=-Dquarkus.http.host=0.0.0.0
-AB_JOLOKIA_OFF=true
-----
-
-== Going further
-
-This guide covered the deployment of a Quarkus application on OpenShift using S2I.
-However, there is much more, and the integration with these environments has been tailored to make Quarkus applications execution very smooth.
-For instance, the health extension can be used for health check; the configuration support allows mounting the application configuration using config map, the metric extension produces data _scrapable_ by Prometheus and so on.
diff --git a/docs/src/main/asciidoc/deploying-to-openshift.adoc b/docs/src/main/asciidoc/deploying-to-openshift.adoc
index 543721836edf0..6d52a44fdfd06 100644
--- a/docs/src/main/asciidoc/deploying-to-openshift.adoc
+++ b/docs/src/main/asciidoc/deploying-to-openshift.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Deploying on OpenShift
 
@@ -19,19 +19,20 @@ To complete this guide, you need:
 * JDK 1.8+ installed with `JAVA_HOME` configured appropriately
 * Apache Maven {maven-version}
 * access to an OpenShift cluster (Minishift is a viable option)
+* OpenShift CLI (Optional. Only required for manually deploying)
 
 == Creating the Maven project
 
 First, we need a new project that contains the OpenShift extension. This can be done using the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=openshift-quickstart \
     -DclassName="org.acme.rest.GreetingResource" \
     -Dpath="/greeting" \
-    -Dextensions="openshift"
+    -Dextensions="resteasy,openshift"
 
 cd openshift-quickstart
 ----
@@ -56,53 +57,100 @@ By adding this dependency, we now have the ability to configure the OpenShift re
 The configuration items that are available can be found in: `io.quarkus.kubernetes.deployment.OpenShiftConfig` class.
 Furthermore, the items provided by `io.quarkus.deployment.ApplicationConfig` affect the OpenShift resources.
 
-=== Building
+=== Build and Deploy (in separate steps)
 
+If the OpenShift extension was not included during the bootstraping of the project nor was it added subsequently (check pom.xml file for it), then it can be added like this:
+
+[source,bash,subs=attributes+]
+----
+ ./mvnw quarkus:add-extension -Dextensions="openshift"
+----
+ 
 Building is handled by the link:container-image#s2i[container-image-s2i] extension. To trigger a build:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -Dquarkus.container-image.build=true
 ----
 
 The build that will be performed is an s2i binary build. The input of the build is the jar that has been built locally and the output of the build is an ImageStream that is configured to automatically trigger a deployment.
 
+To deploy the container image created in the above step to OpenShift, follow these commands:
+[source,bash,subs=attributes+]
+----
+oc get is
+oc new-app --name=greeting <project>/openshift-quickstart:1.0.0-SNAPSHOT
+oc get svc
+oc expose svc/greeting
+oc get routes
+curl http://<route>/greeting
+----
+
+In the above, `oc get is` will list the image stream created.  It should be tagged as <project>/openshift-quickstart:1.0.0-SNAPSHOT.
+
+Similarly, `oc get route` will list the route URL for the exposed service "greeting" so that you can use it to test the application.
+
 === Non S2i Builds
 
 Out of the box the openshift extension is configured to use link:container-image#s2i[container-image-s2i]. However, it's still possible to use other container image extensions like:
 
-- link:container-image#s2i[container-image-docker]
-- link:container-image#s2i[container-image-jib]
+- link:container-image#docker[container-image-docker]
+- link:container-image#jib[container-image-jib]
 
 When a non-s2i container image extension is used, an ImageStream is created that is pointing to an external `dockerImageRepository`. The image is built and pushed to the registry and the ImageStream populates the tags that are available in the `dockerImageRepository`. 
 
 To select which extension will be used for building the image:
 
-[source]
----
+[source,properties]
+----
 quarkus.container-image.builder=docker
----
+----
 
 or
 
-[source]
----
+[source,properties]
+----
 quarkus.container-image.builder=jib
----
+----
 
-=== Deploying
+=== Build and Deploy (in a single step)
 
-To trigger a deployment:
+If the OpenShift extension was not included during the bootstraping of the project nor was it added subsequently (check pom.xml file for it), then it can be added like this:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
+----
+ ./mvnw quarkus:add-extension -Dextensions="openshift"
+----
+
+To trigger a build and deployment in a single step:
+
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -Dquarkus.kubernetes.deploy=true
 ----
 
-The command above will trigger a container image build and will apply the generated OpenShift resources, right after.
+The aforementioned command will build a jar file locally, trigger a container image build and then apply the generated OpenShift resources.
 The generated resources are using OpenShift's `DeploymentConfig` that is configured to automatically trigger a redeployment when a change in the `ImageStream` is noticed.
 In other words, any container image build after the initial deployment will automatically trigger redeployment, without the need to delete, update or re-apply the generated resources.
 
+To confirm the above command has created an image stream, a service resource and has deployed the application (has a pod running), apply these commands:
+
+[source,bash,subs=attributes+]
+----
+oc get is
+oc get pods
+oc get svc
+----
+
+To expose the created service to a route and test it:
+
+[source,bash,subs=attributes+]
+----
+oc expose svc/greeting
+oc get routes
+curl http://<route>/greeting
+----
+
 === Customizing
 
 All available customization options are available in the link:deploying-to-kubernetes#openshift[OpenShift configuration options].
@@ -113,25 +161,28 @@ Some examples are provided in the sections below:
 
 To expose a `Route` for the Quarkus application:
 
-[source]
+[source,properties]
 ----
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
 ----
 
-Tip: You don't necessarily need to add this property in the `application.properties`. You can pass it as a command line argument:
+[TIP]
+====
+You don't necessarily need to add this property in the `application.properties`. You can pass it as a command line argument:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-./mvnw clean package -Dquarkus.openshift.expose=true
+./mvnw clean package -Dquarkus.openshift.route.expose=true
 ----
 
 The same applies to all properties listed below.
+====
 
 ==== Labels
 
 To add a label in the generated resources:
 
-[source]
+[source,properties]
 ----
 quarkus.openshift.labels.foo=bar
 ----
@@ -140,44 +191,157 @@ quarkus.openshift.labels.foo=bar
 
 To add an annotation in the generated resources:
 
-[source]
+[source,properties]
 ----
 quarkus.openshift.annotations.foo=bar
 ----
 
+[#env-vars]
 ==== Environment variables
 
-To add an annotation in the generated resources:
+OpenShift provides multiple ways of defining environment variables:
+
+- key/value pairs
+- import all values from a Secret or ConfigMap
+- interpolate a single value identified by a given field in a Secret or ConfigMap
+- interpolate a value from a field within the same resource
+
+===== Environment variables from key/value pairs
 
-[source]
+To add a key/value pair as an environment variable in the generated resources:
+
+[source,properties]
 ----
-quarkus.openshift.env-vars.my-env-var.value=foobar
+quarkus.openshift.env.vars.my-env-var=foobar
 ----
 
 The command above will add `MY_ENV_VAR=foobar` as an environment variable.
 Please note that the key `my-env-var` will be converted to uppercase and dashes will be replaced by underscores resulting in `MY_ENV_VAR`.
 
-You may also noticed that in contrast to labels, and annotations for environment variables you don't just use a key=value approach.
-That is because for environment variables there are additional options rather than just value.
-
 ===== Environment variables from Secret
 
-To add all key value pairs of a `Secret` as environment variables:
+To add all key/value pairs of `Secret` as environment variables just apply the following configuration, separating each `Secret`
+to be used as source by a comma (`,`):
 
-[source]
+[source,properties]
 ----
-quarkus.openshift.env-vars.my-env-var.secret=my-secret
+quarkus.openshift.env.secrets=my-secret,my-other-secret
+----
+
+which would generate the following in the container definition:
+
+[source,yaml]
+----
+envFrom:
+  - secretRef:
+      name: my-secret
+      optional: false
+  - secretRef:
+      name: my-other-secret
+      optional: false
+----
+
+The following extracts a value identified by the `keyName` field from the `my-secret` Secret into a `foo` environment variable:
+
+[source,properties]
+----
+quarkus.openshift.env.mapping.foo.from-secret=my-secret
+quarkus.openshift.env.mapping.foo.with-key=keyName
+----
+
+This would generate the following in the `env` section of your container:
+
+[source,yaml]
+----
+- env:
+  - name: FOO
+    valueFrom:
+      secretKeyRef:
+        key: keyName
+        name: my-secret
+        optional: false
 ----
 
 ===== Environment variables from ConfigMap
 
-To add all key value pairs of a `ConfigMap` as environment variables:
+To add all key/value pairs from `ConfigMap` as environment variables just apply the following configuration, separating each
+`ConfigMap` to be used as source by a comma (`,`):
+
+[source,properties]
+----
+quarkus.openshift.env.configmaps=my-config-map,another-config-map
+----
+
+which would generate the following in the container definition:
 
-[source]
+[source,yaml]
 ----
-quarkus.openshift.env-vars.my-env-var.configmap=my-secret
+envFrom:
+  - configMapRef:
+      name: my-config-map
+      optional: false
+  - configMapRef:
+      name: another-config-map
+      optional: false
 ----
 
+The following extracts a value identified by the `keyName` field from the `my-config-map` ConfigMap into a `foo`
+environment variable:
+
+[source,properties]
+----
+quarkus.openshift.env.mapping.foo.from-configmap=my-configmap
+quarkus.openshift.env.mapping.foo.with-key=keyName
+----
+
+This would generate the following in the `env` section of your container:
+
+[source,yaml]
+----
+- env:
+  - name: FOO
+    valueFrom:
+      configMapRefKey:
+        key: keyName
+        name: my-configmap
+        optional: false
+----
+
+===== Environment variables from fields
+
+It's also possible to use the value from another field to add a new environment variable by specifying the path of the field to be used as a source, as follows:
+
+[source,properties]
+----
+quarkus.openshift.env.fields.foo=metadata.name
+----
+
+===== Validation
+
+A conflict between two definitions, e.g. mistakenly assigning both a value and specifying that a variable is derived from a field, will result in an error being thrown at build time so that you get the opportunity to fix the issue before you deploy your application to your cluster where it might be more difficult to diagnose the source of the issue.
+
+Similarly, two redundant definitions, e.g. defining an injection from the same secret twice, will not cause an issue but will indeed report a warning to let you know that you might not have intended to duplicate that definition.
+
+[#env-vars-backwards]
+===== Backwards compatibility
+
+Previous versions of the OpenShift extension supported a different syntax to add environment variables. The older syntax is still supported but is deprecated, and it's advised that you migrate to the new syntax.
+
+.Old vs. new syntax
+|====
+|                               |Old                                                    | New                                                 |
+| Plain variable                |`quarkus.openshift.env-vars.my-env-var.value=foobar`  | `quarkus.openshift.env.vars.my-env-var=foobar`     |
+| From field                    |`quarkus.openshift.env-vars.my-env-var.field=foobar`  | `quarkus.openshift.env.fields.my-env-var=foobar`   |
+| All from `ConfigMap`          |`quarkus.openshift.env-vars.xxx.configmap=foobar`     | `quarkus.openshift.env.configmaps=foobar`          |
+| All from `Secret`             |`quarkus.openshift.env-vars.xxx.secret=foobar`        | `quarkus.openshift.env.secrets=foobar`             |
+| From one `Secret` field       |`quarkus.openshift.env-vars.foo.secret=foobar`        | `quarkus.openshift.env.mapping.foo.from-secret=foobar` |
+|                               |`quarkus.openshift.env-vars.foo.value=field`          | `quarkus.openshift.env.mapping.foo.with-key=field` |
+| From one `ConfigMap` field    |`quarkus.openshift.env-vars.foo.configmap=foobar`     | `quarkus.openshift.env.mapping.foo.from-configmap=foobar` |
+|                               |`quarkus.openshift.env-vars.foo.value=field`          | `quarkus.openshift.env.mapping.foo.with-key=field` |
+|====
+
+NOTE: If you redefine the same variable using the new syntax while keeping the old syntax, **ONLY** the new version will be kept, and a warning will be issued to alert you of the problem. For example, if you define both
+`quarkus.openshift.env-vars.my-env-var.value=foobar` and `quarkus.openshift.env.vars.my-env-var=newValue`, the extension will only generate an environment variable `MY_ENV_VAR=newValue` and issue a warning.
 
 ==== Mounting volumes
 
@@ -185,7 +349,7 @@ The OpenShift extension allows the user to configure both volumes and mounts for
 
 Any volume can be mounted with a simple configuration:
 
-[source]
+[source,properties]
 ----
 quarkus.openshift.mounts.my-volume.path=/where/to/mount
 ----
@@ -196,14 +360,38 @@ The volumes themselves can be configured as shown in the sections below:
 
 ===== Secret volumes
 
-[source]
+[source,properties]
 ----
 quarkus.openshift.secret-volumes.my-volume.secret-name=my-secret
 ----
 
 ===== ConfigMap volumes
 
-[source]
+[source,properties]
 ----
 quarkus.openshift.config-map-volumes.my-volume.config-map-name=my-secret
 ----
+
+=== Knative - OpenShift Serverless
+
+OpenShift also provides the ability to use Knative via the link:https://www.openshift.com/learn/topics/serverless[OpenShift Serverless] functionality.
+
+The first order of business is to instruct Quarkus to generate Knative resources by setting:
+
+[source,properties]
+----
+quarkus.kubernetes.deployment-target=knative
+----
+
+In order to leverage OpenShift S2I to build the container image on the cluster and use the resulting container image for the Knative application,
+we need to set a couple of configuration properties:
+
+[source,properties]
+----
+# set the Kubernetes namespace which will be used to run the application
+quarkus.container-image.group=geoand
+# set the container image registry - this is the standard URL used to refer to the internal OpenShift registry
+quarkus.container-image.registry=image-registry.openshift-image-registry.svc:5000
+----
+
+The application can then be deployed to OpenShift Serverless by enabling the standard `quarkus.kubernetes.deploy=true` property.
diff --git a/docs/src/main/asciidoc/dev-ui.adoc b/docs/src/main/asciidoc/dev-ui.adoc
new file mode 100644
index 0000000000000..22d2404019a20
--- /dev/null
+++ b/docs/src/main/asciidoc/dev-ui.adoc
@@ -0,0 +1,402 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Dev UI
+
+include::./attributes.adoc[]
+
+This guide covers the Quarkus Dev UI for link:building-my-first-extension[extension authors].
+
+Quarkus now ships with a new experimental Dev UI, which is available in dev mode (when you start
+quarkus with `mvn quarkus:dev`) at http://localhost:8080/q/dev[/q/dev] by default. It will show you something like
+this:
+
+image::dev-ui-overview.png[alt=Dev UI overview,role="center"]
+
+It allows you to quickly visualize all the extensions currently loaded, see their status and go directly
+to their documentation.
+
+On top of that, each extension can add:
+
+- <<how-can-i-make-my-extension-support-the-dev-ui,Custom useful bits of runtime information in the overview>> 
+- <<adding-full-pages,Full custom pages>>
+- <<advanced-usage-adding-actions,Interactive pages with actions>>
+
+== How can I make my extension support the Dev UI?
+
+In order to make your extension listed in the Dev UI you don't need to do anything!
+
+So you can always start with that :)
+
+If you want to contribute badges or links in your extension card on the Dev UI overview
+page, like this:
+
+image:dev-ui-embedded.png[alt=Dev UI embedded,role="center"]
+
+You have to add a file named `dev-templates/embedded.html` in your 
+link:building-my-first-extension#description-of-a-quarkus-extension[`deployment`]
+extension module's resources:
+
+image::dev-ui-embedded-file.png[alt=Dev UI embedded.html]
+
+The contents of this file will be included in your extension card, so for example we can place
+two links with some styling and icons:
+
+[source,html]
+----
+<a href="{config:http-path('quarkus.smallrye-openapi.path')}" class="badge badge-light">
+  <i class="fa fa-map-signs fa-fw"></i>
+  OpenAPI</a>
+<br>
+<a href="{config:http-path('quarkus.swagger-ui.path')}/" class="badge badge-light">
+  <i class="fa fa-map-signs fa-fw"></i>
+  Swagger UI</a>
+----
+
+TIP: We use the Font Awesome Free icon set.
+
+Note how the paths are specified: `{config:http-path('quarkus.smallrye-openapi.path')}`. This is a special
+directive that the quarkus dev console understands: it will replace that value with the resolved route
+named 'quarkus.smallrye-openapi.path'.
+
+The corresponding non-application endpoint is declared using `.routeConfigKey` to associate the route with a name:
+
+[source,java]
+----
+    nonApplicationRootPathBuildItem.routeBuilder()
+            .route(openApiConfig.path) // <1>
+            .routeConfigKey("quarkus.smallrye-openapi.path") // <2>
+            ...
+            .build();
+----
+<1> The configured path is resolved into a valid route.
+<2> The resolved route path is then associated with the key `quarkus.smallrye-openapi.path`.
+
+== Path considerations
+
+Paths are tricky business. Keep the following in mind:
+
+* Assume your UI will be nested under the dev endpoint. Do not provide a way to customize this without a strong reason.
+* Never construct your own absolute paths. Adding a suffix to a known, normalized and resolved path is fine.
+
+Configured paths, like the `dev` endpoint used by the console or the SmallRye OpenAPI path shown in the example above,
+need to be properly resolved against both `quarkus.http.root-path` and `quarkus.http.non-application-root-path`.
+Use `NonApplicationRootPathBuildItem` or `HttpRootPathBuildItem` to construct endpoint routes and identify resolved
+path values that can then be used in templates.
+
+The `{devRootAppend}` variable can also be used in templates to construct URLs for static dev console resources, for example:
+
+[source,html]
+----
+<img src="{devRootAppend}/resources/images/quarkus_icon_rgb_reverse.svg" width="40" height="30" class="d-inline-block align-middle" alt="Quarkus"/>
+----
+
+Refer to the link:all-config#quarkus-vertx-http_quarkus.http.non-application-root-path[Quarkus Vertx HTTP configuration reference]
+for details on how the non-application root path is configured.
+
+== Template and styling support
+
+Both the `embedded.html` files and any full page you add in `/dev-templates` will be interpreted by
+link:qute[the Qute template engine].
+
+This also means that you can link:qute-reference#user_tags[add custom Qute tags] in 
+`/dev-templates/tags` for your templates to use.
+
+The style system currently in use is https://getbootstrap.com/docs/4.6/getting-started/introduction/[Bootstrap V4 (4.6.0)]
+but note that this might change in the future.
+
+The main template also includes https://jquery.com/[jQuery 3.5.1], but here again this might change.
+
+=== Accessing Config Properties
+
+A `config:property(name)` expression can be used to output the config value for the given property name.
+The property name can be either a string literal or obtained dynamically by another expression.
+For example `{config:property('quarkus.lambda.handler')}` and `{config:property(foo.propertyName)}`.
+
+Reminder: do not use this to retrieve raw configured path values. As shown above, use `{config:http-path(...)}` with
+a known route configuration key when working with resource paths.
+
+== Adding full pages
+
+To add full pages for your Dev UI extension such as this one:
+
+image::dev-ui-page.png[alt=Dev UI custom page]
+
+You need to place them in your extension's 
+link:building-my-first-extension#description-of-a-quarkus-extension[`deployment`] module's 
+`/dev-templates` resource folder, like this page for the link:cache[`quarkus-cache` extension]:
+
+[[action-example]]
+[source,java]
+----
+{#include main}// <1>
+    {#style}// <2>
+        .custom {
+            color: gray;
+        }
+    {/style}
+    {#script} // <3>
+     $(document).ready(function(){
+        $(function () {
+          $('[data-toggle="tooltip"]').tooltip()
+        });
+    });
+    {/script}
+    {#title}Cache{/title}// <4>
+    {#body}// <5>
+        <table class="table table-striped custom">
+            <thead class="thead-dark">
+                <tr>
+                    <th scope="col">Name</th>
+                    <th scope="col">Size</th>
+                </tr>
+            </thead>
+            <tbody>
+                {#for cacheInfo in info:cacheInfos}// <6>
+                    <tr>
+                        <td>
+                            {cacheInfo.name}
+                        </td>
+                        <td>
+                            <form method="post"// <7> 
+                                  enctype="application/x-www-form-urlencoded">
+                                <label class="form-check-label" for="clear">
+                                    {cacheInfo.size}
+                                </label>
+                                <input type="hidden" name="name" value="{cacheInfo.name}">
+                                <input id="clear" type="submit" 
+                                       class="btn btn-primary btn-sm" value="Clear" >
+                            </form>
+                        </td>
+                    </tr>
+                {/for}
+            </tbody>
+        </table>
+    {/body}
+{/include}
+----
+<1> In order to benefit from the same style as other Dev UI pages, extend the `main` template
+<2> You can pass extra CSS for your page in the `style` template parameter
+<3> You can pass extra JavaScript for your page in the `script` template parameter. This will be added inline after the JQuery script, so you can safely use JQuery in your script.
+<4> Don't forget to set your page title in the `title` template parameter
+<5> The `body` template parameter will contain your content
+<6> In order for your template to read custom information from your Quarkus extension, you can use
+    the `info` link:qute-reference#namespace_extension_methods[namespace].
+<7> This shows an <<advanced-usage-adding-actions,interactive page>>
+
+== Linking to your full-page templates
+
+Full-page templates for extensions live under a pre-defined `{devRootAppend}/{groupId}.{artifactId}/` directory
+that is referenced using the `urlbase` template parameter. Using configuration defaults, that would resolve to
+`/q/dev/io.quarkus.quarkus-cache/`, as an example.
+
+Use the `{urlbase}` template parameter to reference this folder in `embedded.html`:
+
+[source,html]
+----
+<a href="{urlbase}/caches" class="badge badge-light">// <1>
+  <i class="fa ..."></i>
+  Caches <span class="badge badge-light">{info:cacheInfos.size()}</span></a>
+----
+<1> Use the `urlbase` template parameter to reference full-page templates for your extension
+
+== Passing information to your templates
+
+In `embedded.html` or in full-page templates, you will likely want to display information that is
+available from your extension.
+
+There are two ways to make that information available, depending on whether it is available at
+build time or at run time.
+
+In both cases we advise that you add support for the Dev UI in your `{pkg}.deployment.devconsole`
+package in a `DevConsoleProcessor` class (in your extension's 
+link:building-my-first-extension#description-of-a-quarkus-extension[`deployment`] module).
+
+=== Passing run-time information
+
+[source,java]
+----
+package io.quarkus.cache.deployment.devconsole;
+
+import io.quarkus.cache.runtime.CaffeineCacheSupplier;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)// <1>
+    public DevConsoleRuntimeTemplateInfoBuildItem collectBeanInfo() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("cacheInfos",
+                      new CaffeineCacheSupplier());// <2>
+    }
+}
+----
+<1> Don't forget to make this link:building-my-first-extension#deploying-the-greeting-feature[build step]
+    conditional on being in dev mode
+<2> Declare a run-time dev `info:cacheInfos` template value
+
+This will map the `info:cacheInfos` value to this supplier in your extension's 
+link:building-my-first-extension#description-of-a-quarkus-extension[`runtime module`]:
+
+[source,java]
+----
+package io.quarkus.cache.runtime;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+
+public class CaffeineCacheSupplier implements Supplier<Collection<CaffeineCache>> {
+
+    @Override
+    public List<CaffeineCache> get() {
+        List<CaffeineCache> allCaches = new ArrayList<>(allCaches());
+        allCaches.sort(Comparator.comparing(CaffeineCache::getName));
+        return allCaches;
+    }
+
+    public static Collection<CaffeineCache> allCaches() {
+        // Get it from ArC at run-time
+        return (Collection<CaffeineCache>) (Collection) 
+            Arc.container().instance(CacheManagerImpl.class).get().getAllCaches();
+    }
+}
+----
+
+=== Passing build-time information
+
+Sometimes you only need build-time information to be passed to your template, so you can do it like this:
+
+[source,java]
+----
+package io.quarkus.qute.deployment.devconsole;
+
+import java.util.List;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
+import io.quarkus.qute.deployment.CheckedTemplateBuildItem;
+import io.quarkus.qute.deployment.TemplateVariantsBuildItem;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleTemplateInfoBuildItem collectBeanInfo(
+            List<CheckedTemplateBuildItem> checkedTemplates,// <1>
+            TemplateVariantsBuildItem variants) {
+        DevQuteInfos quteInfos = new DevQuteInfos();
+        for (CheckedTemplateBuildItem checkedTemplate : checkedTemplates) {
+            DevQuteTemplateInfo templateInfo = 
+                new DevQuteTemplateInfo(checkedTemplate.templateId,
+                    variants.getVariants().get(checkedTemplate.templateId),
+                    checkedTemplate.bindings);
+            quteInfos.addQuteTemplateInfo(templateInfo);
+        }
+        return new DevConsoleTemplateInfoBuildItem("devQuteInfos", quteInfos);// <2>
+    }
+
+}
+----
+<1> Use whatever dependencies you need as input
+<2> Declare a build-time `info:devQuteInfos` DEV template value
+
+== Advanced usage: adding actions
+
+You can also add actions to your Dev UI templates:
+
+image::dev-ui-interactive.png[alt=Dev UI interactive page]
+
+This can be done by adding another link:building-my-first-extension#deploying-the-greeting-feature[build step] to
+declare the action in your extension's
+link:building-my-first-extension#description-of-a-quarkus-extension[`deployment`] module:
+
+
+[source,java]
+----
+package io.quarkus.cache.deployment.devconsole;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import io.quarkus.cache.runtime.devconsole.CacheDevConsoleRecorder;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+
+public class DevConsoleProcessor {
+
+    @BuildStep
+    @Record(value = STATIC_INIT, optional = true)// <1>
+    DevConsoleRouteBuildItem invokeEndpoint(CacheDevConsoleRecorder recorder) {
+        return new DevConsoleRouteBuildItem("caches", "POST",
+                                            recorder.clearCacheHandler());// <2>
+    }
+}
+----
+<1> Mark the recorder as optional, so it will only be invoked when in dev mode
+<2> Declare a `POST {urlbase}/caches` route handled by the given handler
+
+
+Note: you can see <<action-example,how to invoke this action from your full page>>.
+
+Now all you have to do is implement the recorder in your extension's 
+link:building-my-first-extension#description-of-a-quarkus-extension[`runtime module`]:
+
+
+[source,java]
+----
+package io.quarkus.cache.runtime.devconsole;
+
+import io.quarkus.cache.runtime.CaffeineCacheSupplier;
+import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.vertx.http.runtime.devmode.devconsole.FlashScopeUtil.FlashMessageStatus;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class CacheDevConsoleRecorder {
+
+    public Handler<RoutingContext> clearCacheHandler() {
+        return new DevConsolePostHandler() {// <1>
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form) // <2> 
+              throws Exception {
+                String cacheName = form.get("name");
+                for (CaffeineCache cache : CaffeineCacheSupplier.allCaches()) {
+                    if (cache.getName().equals(cacheName)) {
+                        cache.invalidateAll();
+                        flashMessage(event, "Cache for " + cacheName + " cleared");// <3>
+                        return;
+                    }
+                }
+                flashMessage(event, "Cache for " + cacheName + " not found", 
+                             FlashMessageStatus.ERROR);// <4>
+            }
+        };
+    }
+}
+----
+<1> While you can use https://vertx.io/docs/vertx-web/java/#_routing_by_http_method[any Vert.x handler], 
+    the `DevConsolePostHandler` superclass will handle your POST actions
+    nicely, and auto-redirect to the `GET` URI right after your `POST` for optimal behavior.
+<2> You can get the Vert.x `RoutingContext` as well as the `form` contents
+<3> Don't forget to add a message for the user to let them know everything went fine
+<4> You can also add error messages
+
+
+NOTE: Flash messages are handled by the `main` DEV template and will result in nice notifications for your
+users:
+
+image::dev-ui-message.png[alt=Dev UI message]
+
diff --git a/docs/src/main/asciidoc/elasticsearch.adoc b/docs/src/main/asciidoc/elasticsearch.adoc
index 0fa996c2f6f40..dbc4ae998597e 100644
--- a/docs/src/main/asciidoc/elasticsearch.adoc
+++ b/docs/src/main/asciidoc/elasticsearch.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Connecting to an Elasticsearch cluster
 include::./attributes.adoc[]
@@ -49,14 +49,14 @@ The solution for the high level client is located in the `elasticsearch-rest-hig
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=elasticsearch-quickstart \
     -DclassName="org.acme.elasticsearch.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jackson,elasticsearch-rest-client"
+    -Dextensions="resteasy,resteasy-jackson,elasticsearch-rest-client"
 cd elasticsearch-quickstart
 ----
 
@@ -203,8 +203,6 @@ Now, edit the `org.acme.elasticsearch.FruitResource` class as follows:
 [source,java]
 ----
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
     @Inject
     FruitService fruitService;
@@ -262,6 +260,52 @@ quarkus.elasticsearch.hosts = localhost:9200
 
 If you need a more advanced configuration, you can find the comprehensive list of supported configuration properties at the end of this guide.
 
+== Programmatically Configuring Elasticsearch
+On top of the parametric configuration, you can also programmatically apply additional configuration to the client by implementing a `RestClientBuilder.HttpClientConfigCallback` and annotating it with `ElasticsearchClientConfig`. You may provide multiple implementations and configuration provided by each implementation will be applied in a randomly ordered cascading manner.
+
+For example, when accessing an Elasticsearch cluster that is set up for TLS on the HTTP layer, the client needs to trust the certificate that Elasticsearch is using. The following is an example of setting up the client to trust the CA that has signed the certificate that Elasticsearch is using, when that CA certificate is available in a PKCS#12 keystore.
+
+[source,java]
+----
+import io.quarkus.elasticsearch.restclient.lowlevel.ElasticsearchClientConfig;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.ssl.SSLContexts;
+import org.elasticsearch.client.RestClientBuilder;
+
+import javax.enterprise.context.Dependent;
+import javax.net.ssl.SSLContext;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+
+@ElasticsearchClientConfig
+@Dependent
+public class SSLContextConfigurator implements RestClientBuilder.HttpClientConfigCallback {
+    @Override
+    public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
+        try {
+            String keyStorePass = "password-for-keystore";
+            Path trustStorePath = Paths.get("/path/to/truststore.p12");
+            KeyStore truststore = KeyStore.getInstance("pkcs12");
+            try (InputStream is = Files.newInputStream(trustStorePath)) {
+                truststore.load(is, keyStorePass.toCharArray());
+            }
+            SSLContextBuilder sslBuilder = SSLContexts.custom()
+                    .loadTrustMaterial(truststore, null);
+            SSLContext sslContext = sslBuilder.build();
+            httpClientBuilder.setSSLContext(sslContext);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return httpClientBuilder;
+    }
+}
+----
+See https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/_encrypted_communication.html[Elasticsearch documentation] for more details on this particular example.
 
 == Running an Elasticsearch cluster
 
@@ -270,7 +314,7 @@ if you have a local running instance on this port, there is nothing more to do b
 
 If you want to use Docker to run an Elasticsearch instance, you can use the following command to launch one:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 docker run --name elasticsearch  -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms512m -Xmx512m"\
        --rm -p 9200:9200 docker.elastic.co/elasticsearch/elasticsearch-oss:{elasticsearch-version}
@@ -382,18 +426,18 @@ In this example you can note the following:
 
 == Hibernate Search Elasticsearch
 
-Quarkus supports Hibernate Search with Elasticsearch via the `hibernate-search-elasticsearch` extension.
+Quarkus supports Hibernate Search with Elasticsearch via the `hibernate-search-orm-elasticsearch` extension.
 
 Hibernate Search Elasticsearch allows to synchronize your JPA entities to an Elasticsearch cluster and offers a way to query your Elasticsearch cluster using the Hibernate Search API.
 
-If you're interested in it, you can read the link:hibernate-search-elasticsearch[Hibernate Search with Elasticsearch guide].
+If you're interested in it, you can read the link:hibernate-search-orm-elasticsearch[Hibernate Search with Elasticsearch guide].
 
 == Cluster Health Check
 
 If you are using the `quarkus-smallrye-health` extension, both the extension will automatically add a readiness health check
 to validate the health of the cluster.
 
-So when you access the `/health/ready` endpoint of your application you will have information about the cluster status.
+So when you access the `/q/health/ready` endpoint of your application you will have information about the cluster status.
 It uses the cluster health endpoint, the check will be down if the status of the cluster is **red**, or the cluster is not available.
 
 This behavior can be disabled by setting the `quarkus.elasticsearch.health.enabled` property to `false` in your `application.properties`.
@@ -404,7 +448,7 @@ You can use both clients in a native executable.
 
 You can build a native executable with the usual command `./mvnw package -Pnative`.
 
-Running it is as simple as executing `./target/elasticsearch-low-level-client-quickstart-1.0-SNAPSHOT-runner`.
+Running it is as simple as executing `./target/elasticsearch-low-level-client-quickstart-1.0.0-SNAPSHOT-runner`.
 
 You can then point your browser to `http://localhost:8080/fruits.html` and use your application.
 
diff --git a/docs/src/main/asciidoc/flyway.adoc b/docs/src/main/asciidoc/flyway.adoc
index da3f622b72de8..be18403db2377 100644
--- a/docs/src/main/asciidoc/flyway.adoc
+++ b/docs/src/main/asciidoc/flyway.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Flyway
 
@@ -27,7 +27,7 @@ In your `pom.xml`, add the following dependencies:
 * your JDBC driver extension (`quarkus-jdbc-postgresql`, `quarkus-jdbc-h2`, `quarkus-jdbc-mariadb`, ...)
 
 [source,xml]
---
+----
 <dependencies>
     <!-- Flyway specific dependencies -->
     <dependency>
@@ -41,7 +41,7 @@ In your `pom.xml`, add the following dependencies:
         <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
 </dependencies>
---
+----
 
 Flyway support relies on the Quarkus datasource config.
 It can be customized for the default datasource as well as for every <<multiple-datasources,named datasource>>.
@@ -55,7 +55,7 @@ include::{generated-dir}/config/quarkus-flyway.adoc[opts=optional, leveloffset=+
 The following is an example for the `{config-file}` file:
 
 [source,properties]
---
+----
 # configure your datasource
 quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=sarah
@@ -75,13 +75,12 @@ quarkus.flyway.migrate-at-start=true
 # quarkus.flyway.locations=db/location1,db/location2
 # quarkus.flyway.sql-migration-prefix=X
 # quarkus.flyway.repeatable-sql-migration-prefix=K
-
---
+----
 
 Add a SQL migration to the default folder following the Flyway naming conventions: `{migrations-path}/V1.0.0__Quarkus.sql`
 
 [source,sql]
---
+----
 CREATE TABLE quarkus
 (
   id   INT,
@@ -89,12 +88,12 @@ CREATE TABLE quarkus
 );
 INSERT INTO quarkus(id, name)
 VALUES (1, 'QUARKED');
---
+----
 
 Now you can start your application and Quarkus will run the Flyway's migrate method according to your config:
 
 [source,java]
---
+----
 @ApplicationScoped
 public class MigrationService {
     // You can Inject the object if you want to use it manually
@@ -106,7 +105,7 @@ public class MigrationService {
         System.out.println(flyway.info().current().getVersion().toString());
     }
 }
---
+----
 
 <1> Inject the Flyway object if you want to use it directly
 
@@ -116,23 +115,20 @@ Flyway can be configured for multiple datasources.
 The Flyway properties are prefixed exactly the same way as the named datasources, for example:
 
 [source,properties]
---
+----
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
 quarkus.datasource.jdbc.max-size=13
 
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 
 # Flyway configuration for the default datasource
@@ -149,7 +145,7 @@ quarkus.flyway.users.migrate-at-start=true
 quarkus.flyway.inventory.schemas=INVENTORY_TEST_SCHEMA
 quarkus.flyway.inventory.locations=db/inventory/location1,db/inventory/location2
 quarkus.flyway.inventory.migrate-at-start=true
---
+----
 
 Notice there's an extra bit in the key.
 The syntax is as follows: `quarkus.flyway.[optional name.][datasource property]`.
@@ -164,7 +160,7 @@ NOTE: If you enabled the `quarkus.flyway.migrate-at-start` property, by the time
 Quarkus will already have run the migrate operation
 
 [source,java]
---
+----
 @ApplicationScoped
 public class MigrationService {
     // You can Inject the object if you want to use it manually
@@ -187,7 +183,7 @@ public class MigrationService {
         System.out.println(flyway.info().current().getVersion().toString());
     }
 }
---
+----
 
 <1> Inject the Flyway object if you want to use it directly
 <2> Inject Flyway for named datasources using the Quarkus `FlywayDataSource` qualifier
diff --git a/docs/src/main/asciidoc/funqy-amazon-lambda-http.adoc b/docs/src/main/asciidoc/funqy-amazon-lambda-http.adoc
index 5492fb09481f2..8258479ed3c54 100644
--- a/docs/src/main/asciidoc/funqy-amazon-lambda-http.adoc
+++ b/docs/src/main/asciidoc/funqy-amazon-lambda-http.adoc
@@ -1,9 +1,9 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
-= Quarkus - Funqy HTTP with Amazon Lambda 
+= Quarkus - Funqy HTTP Binding with Amazon Lambda 
 :extension-status: preview
 
 include::./attributes.adoc[]
diff --git a/docs/src/main/asciidoc/funqy-amazon-lambda.adoc b/docs/src/main/asciidoc/funqy-amazon-lambda.adoc
index ab2f312e85105..3f003d2bf9087 100644
--- a/docs/src/main/asciidoc/funqy-amazon-lambda.adoc
+++ b/docs/src/main/asciidoc/funqy-amazon-lambda.adoc
@@ -1,9 +1,9 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
-= Quarkus - Funqy Amazon Lambdas
+= Quarkus - Funqy Amazon Lambda Binding
 :extension-status: preview
 
 include::./attributes.adoc[]
@@ -51,7 +51,7 @@ environments and AWS Lambda is one of them.  The Java code is actually the same
 Only one Funqy function can be exported per Amazon Lambda deployment.  If you have multiple functions defined
 within your project, then you will need to choose the function within your Quarkus `application.properties`:
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 quarkus.funqy.export=greet
 ----
@@ -70,7 +70,7 @@ at build time.
 
 Build the project using maven.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package
 ----
@@ -84,7 +84,7 @@ a lambda with AWS CLI.  Specifically, make sure you have created an `Execution R
 a `LAMBDA_ROLE_ARN` environment variable in your profile or console window,  Alternatively, you can edit
 the `manage.sh` script that is generated by the build and put the role value directly there:
 
-[source]
+[source,bash]
 ----
 LAMBDA_ROLE_ARN="arn:aws:iam::1234567890:role/lambda-role"
 ----
@@ -113,21 +113,21 @@ and setup the `LAMBDA_ROLE_ARN` environment variable (as described above), pleas
 A usage statement will be printed to guide you accordingly.
 
 To see the `usage` statement, and validate AWS configuration:
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh
 ----
 
 You can `create` your function using the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh create
 ----
 
 or if you do not have `LAMBDA_ROLE_ARN` already defined in this shell:
 
-[source]
+[source,bash]
 ----
 LAMBDA_ROLE_ARN="arn:aws:iam::1234567890:role/lambda-role" sh target/manage.sh create
 ----
@@ -138,13 +138,13 @@ This special handler is Funqy's integration point with AWS Lambda.
 If there are any problems creating the function, you must delete it with the `delete` function before re-running
 the `create` command.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh delete
 ----
 
 Commands may also be stacked:
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh delete create
 ----
@@ -153,7 +153,7 @@ sh target/manage.sh delete create
 
 Use the `invoke` command to invoke your function.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh invoke
 ----
@@ -163,14 +163,14 @@ in the root directory of the project.
 
 The function can also be invoked locally with the SAM CLI like this:
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.jvm.yaml --event payload.json
 ----
 
 If you are working with your native image build, simply replace the template name with the native version:
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.native.yaml --event payload.json
 ----
@@ -180,7 +180,7 @@ sam local invoke --template target/sam.native.yaml --event payload.json
 You can update the Java code as you see fit.  Once you've rebuilt, you can redeploy your function by executing the
 `update` command.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh update
 ----
@@ -192,7 +192,7 @@ code to a native executable.  Just make sure to rebuild your project with the `-
 
 For Linux hosts execute:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn package -Pnative
 ----
@@ -201,7 +201,7 @@ NOTE: If you are building on a non-Linux system, you will need to also pass in a
 Lambda requires linux binaries.  You can do this by passing this property to your Maven build:
 `-Dnative-image.docker-build=true`, or for Gradle: `--docker-build=true`.  This requires you to have docker installed locally, however.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean install -Pnative -Dnative-image.docker-build=true
 ----
@@ -213,7 +213,7 @@ Custom (Provided) Runtime.
 The instructions here are exactly as above with one change:  you'll need to add `native` as the first parameter to the
 `manage.sh` script:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 sh target/manage.sh native create
 ----
@@ -228,7 +228,7 @@ to create, delete, and update your functions.
 One thing to note about the create command for native is that the `aws lambda create-function`
 call must set a specific environment variable:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 --environment 'Variables={DISABLE_SIGNAL_HANDLERS=true}'
 ----
@@ -279,21 +279,21 @@ A starter template has been generated for both JVM and native execution modes.
 Run the following SAM CLI command to locally test your function, passing the appropriate SAM `template`.
 The `event` parameter takes any JSON file, in this case the sample `payload.json`.
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.jvm.yaml --event payload.json
 ----
 
 The native image can also be locally tested using the `sam.native.yaml` template:
 
-[source]
+[source,bash]
 ----
 sam local invoke --template target/sam.native.yaml --event payload.json
 ----
 
 == Modifying `function.zip`
 
-The are times where you may have to add additional entries to the `function.zip` lambda deployment that is generated
+There are times where you may have to add additional entries to the `function.zip` lambda deployment that is generated
 by the build.  To do this create a `zip.jvm` or `zip.native` directory within `src/main`.
 Create `zip.jvm/` if you are doing a pure Java.  `zip.native/` if you are doing a native deployment.
 
diff --git a/docs/src/main/asciidoc/funqy-azure-functions-http.adoc b/docs/src/main/asciidoc/funqy-azure-functions-http.adoc
index 0f7124745a6fa..2952aed2afabc 100644
--- a/docs/src/main/asciidoc/funqy-azure-functions-http.adoc
+++ b/docs/src/main/asciidoc/funqy-azure-functions-http.adoc
@@ -1,9 +1,9 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
-= Quarkus - Funqy Azure Functions
+= Quarkus - Funqy HTTP Binding with Azure Functions
 :extension-status: preview
 
 include::./attributes.adoc[]
diff --git a/docs/src/main/asciidoc/funqy-gcp-functions-http.adoc b/docs/src/main/asciidoc/funqy-gcp-functions-http.adoc
new file mode 100644
index 0000000000000..1b9c89c4cb3e7
--- /dev/null
+++ b/docs/src/main/asciidoc/funqy-gcp-functions-http.adoc
@@ -0,0 +1,55 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Funqy HTTP Binding with Google Cloud Functions
+:extension-status: experimental
+
+include::./attributes.adoc[]
+
+If you want to allow HTTP clients to invoke your Funqy functions on Google Cloud Functions, Quarkus allows you to expose multiple
+Funqy functions through HTTP deployed as one Google Cloud Function.  This approach does add overhead over the
+regular Funqy Google Cloud Function integration.
+
+include::./status-include.adoc[]
+
+Follow the link:gcp-functions-http[Google Cloud Functions Http Guide].  It walks through using a variety of HTTP
+frameworks on Google Cloud Functions, including Funqy.
+
+WARNING: The Funqy HTTP + Google Cloud Functions binding is not a replacement for REST over HTTP.  Because Funqy
+needs to be portable across a lot of different protocols and function providers its HTTP binding
+is very minimalistic and you will lose REST features like linking and the ability to leverage
+HTTP features like cache-control and conditional GETs.  You may want to consider using Quarkus's
+JAX-RS, Spring MVC, or Vert.x Web Reactive Route link:gcp-functions-http[support] instead.  They also work with Quarkus and Google Cloud Functions.
+
+== An additional Quickstart
+
+Beyond generating a Google Cloud Functions project that is covered in the link:gcp-functions-http[Google Cloud Functions HTTP Guide],
+there's also a quickstart for running Funqy HTTP on Google Cloud Functions.
+
+Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
+
+The solution is located in the `funqy-google-cloud-functions-http-quickstart` {quickstarts-tree-url}/funqy-quickstarts/funqy-google-cloud-functions-http-quickstart[directory].
+
+== The Code
+
+There is nothing special about the code and more importantly nothing Google Cloud specific.  Funqy functions can be deployed to many different
+environments and Google Cloud Functions is one of them.  The Java code is actually the same exact code as the {quickstarts-tree-url}/funqy-quickstarts/funqy-http-quickstart[funqy-http-quickstart].
+
+== Getting Started
+
+The steps to get this quickstart running are exactly the same as defined in the link:gcp-functions-http[Google Cloud Functions HTTP Guide].
+This differences are that you are running from a quickstart and the Maven dependencies are slightly different.
+
+[source, xml]
+----
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-google-cloud-functions-http</artifactId>
+        </dependency>
+----
diff --git a/docs/src/main/asciidoc/funqy-gcp-functions.adoc b/docs/src/main/asciidoc/funqy-gcp-functions.adoc
index 50df2cb7fec52..7f9bd88483fed 100644
--- a/docs/src/main/asciidoc/funqy-gcp-functions.adoc
+++ b/docs/src/main/asciidoc/funqy-gcp-functions.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Funqy Google Cloud Functions
 :extension-status: experimental
@@ -28,18 +28,46 @@ To complete this guide, you need:
 
 Login to Google Cloud is necessary for deploying the application and it can be done as follows:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 gcloud auth login
 ----
 
 At the time of this writing, Cloud Functions are still in beta so make sure to install the `beta` command group.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 gcloud components install beta
 ----
 
+== The Quickstart
+
+Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
+
+The solution is located in the `funqy-google-cloud-functions-quickstart` {quickstarts-tree-url}/funqy-quickstarts/funqy-google-cloud-functions-quickstart[directory].
+
+== Creating the Maven Deployment Project
+
+Create an application with the `quarkus-funqy-google-cloud-functions` extension.
+You can use the following Maven command to create it:
+
+[source,bash,subs=attributes+]
+----
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
+    -DprojectGroupId=org.acme \
+    -DprojectArtifactId=funqy-google-cloud-functions \
+    -DclassName="org.acme.quickstart.GreetingResource" \
+    -Dpath="/hello" \
+    -Dextensions="resteasy,funqy-google-cloud-functions"
+----
+
+Now, let's remove what's not needed inside the generated application:
+
+- Remove the dependency `io.quarkus:quarkus-reasteasy` from your `pom.xml` file.
+- Remove the generated `org.acme.quickstart.GreetingResource` class.
+- Remove the `index.html` from `resources/META-INF/resources` or it will be picked up instead of your Function.
+- Remove the existing tests.
+
 == The Code
 
 There is nothing special about the code and more importantly nothing Google Cloud specific.  Funqy functions can be deployed to many different
@@ -52,7 +80,7 @@ Only one Funqy function can be exported per Google Cloud Functions deployment.
 annotated with `@Funq` in your project, then there is no worries.  If you have multiple functions defined
 within your project, then you will need to choose the function within your Quarkus `application.properties`:
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 quarkus.funqy.export=greet
 ----
@@ -63,7 +91,7 @@ Alternatively, you can set the `QUARKUS_FUNQY_EXPORT` environment variable when
 
 Build the project using maven.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package
 ----
@@ -86,16 +114,15 @@ import io.quarkus.funqy.gcp.functions.event.StorageEvent;
 
 public class GreetingFunctions {
 
-    @Inject
-    GreetingService service;
+    @Inject GreetingService service; // <1>
 
-    @Funq // <1>
+    @Funq // <2>
     public void helloPubSubWorld(PubsubMessage pubSubEvent) {
-        String message = service.hello("world");
+        String message = service.hello(pubSubEvent.data);
         System.out.println(pubSubEvent.messageId + " - " + message);
     }
 
-    @Funq // <2>
+    @Funq // <3>
     public void helloGCSWorld(StorageEvent storageEvent) {
         String message = service.hello("world");
         System.out.println(storageEvent.name + " - " + message);
@@ -106,9 +133,10 @@ public class GreetingFunctions {
 
 NOTE: Function return type can also be Mutiny reactive types.
 
-1. This is a background function that takes as parameter a `io.quarkus.funqy.gcp.functions.event.PubsubMessage`,
+1. Injection works inside your function.
+2. This is a background function that takes as parameter a `io.quarkus.funqy.gcp.functions.event.PubsubMessage`,
 this is a convenient class to deserialize a PubSub message.
-2. This is a background function that takes as parameter a `io.quarkus.funqy.gcp.functions.event.StorageEvent`,
+3. This is a background function that takes as parameter a `io.quarkus.funqy.gcp.functions.event.StorageEvent`,
 this is a convenient class to deserialize a Google Storage event.
 
 NOTE: we provide convenience class to deserialize common Google Cloud event inside the `io.quarkus.funqy.gcp.functions.event` package.
@@ -118,7 +146,7 @@ As our project contains multiple function, we need to specify which function nee
 
 [source,property]
 ----
-quarkus.funqy.export=helloHttpWorld
+quarkus.funqy.export=helloPubSubWorld
 ----
 
 == Build and Deploy to Google Cloud
@@ -131,9 +159,11 @@ Then you will be able to use `gcloud` to deploy your function to Google Cloud, t
 [WARNING]
 ====
 The first time you launch the `gcloud beta functions deploy`, you can have the following error message:
-```
+
+[source]
+----
 ERROR: (gcloud.beta.functions.deploy) OperationError: code=7, message=Build Failed: Cloud Build has not been used in project <project_name> before or it is disabled. Enable it by visiting https://console.developers.google.com/apis/api/cloudbuild.googleapis.com/overview?project=<my-project> then retry.
-```
+----
 This means that Cloud Build is not activated yet. To overcome this error, open the URL shown in the error, follow the instructions and then wait a few minutes before retrying the command.
 ====
 
@@ -141,7 +171,7 @@ This means that Cloud Build is not activated yet. To overcome this error, open t
 
 Use this command to deploy to Google Cloud Functions:
 
-[source]
+[source,bash]
 ----
 gcloud beta functions deploy quarkus-example-funky-pubsub \
   --entry-point=io.quarkus.funqy.gcp.functions.FunqyBackgroundFunction \
@@ -157,9 +187,9 @@ define that this function will be triggered by all message publication inside th
 
 To trigger an event to this function, you can use the `gcloud functions call` command:
 
-[source]
+[source,bash]
 ----
-gcloud functions call quarkus-example-funky-pubsub --data '{"data":"Hello, Pub/Sub"}'
+gcloud functions call quarkus-example-funky-pubsub --data '{"data":"Pub/Sub"}'
 ----
 
 The `--data '{"data":"Hello, Pub/Sub"}'` option allow to specify the message to be send to PubSub.
@@ -168,14 +198,14 @@ The `--data '{"data":"Hello, Pub/Sub"}'` option allow to specify the message to
 
 Before deploying your function, you need to create a bucket.
 
-[source]
+[source,bash]
 ----
 gsutil mb gs://quarkus-hello
 ----
 
 Then, use this command to deploy to Google Cloud Functions:
 
-[source]
+[source,bash]
 ----
 gcloud beta functions deploy quarkus-example-funky-storage \
   --entry-point=io.quarkus.funqy.gcp.functions.FunqyBackgroundFunction \
@@ -191,9 +221,9 @@ define that this function will be triggered by all new file inside this bucket.
 
 To trigger an event to this function, you can use the `gcloud functions call` command:
 
-[source]
+[source,bash]
 ----
-gcloud functions call quarkus-example-funky-pubsub --data '{"name":"test.txt"}'
+gcloud functions call quarkus-example-funky-storage --data '{"name":"test.txt"}'
 ----
 
 The `--data '{"name":"test.txt"}'` option allow to specify a fake file name, a fake Cloud Storage event will be created for this name.
@@ -206,31 +236,35 @@ The easiest way to locally test your function is using the Cloud Function invoke
 
 You can download it via Maven using the following command:
 
-[source]
+[source,bash]
 ----
 mvn dependency:copy \
   -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-beta1' \
   -DoutputDirectory=.
 ----
 
+Before using the invoker, you first need to build your function via `mvn package`.
+
 Then you can use it to launch your function locally, again, the command depends on the type of function and the type of events.
 
 === Background Functions - PubSub
 
 For background functions, you launch the invoker with a target class of `io.quarkus.funqy.gcp.functions.FunqyBackgroundFunction`.
 
-[source]
+[source,bash]
 ----
 java -jar java-function-invoker-1.0.0-beta1.jar \
-  --classpath target/funqy-google-cloud-functions-1.0-SNAPSHOT-runner.jar \
+  --classpath target/funqy-google-cloud-functions-1.0.0-SNAPSHOT-runner.jar \
   --target io.quarkus.funqy.gcp.functions.FunqyBackgroundFunction
 ----
 
+IMPORTANT: The `--classpath` parameter needs to be set to the previously packaged JAR that contains your function class and all Quarkus related classes.
+
 Then you can call your background function via an HTTP call with a payload containing the event:
 
-[source]
+[source,bash]
 ----
-curl localhost:8080 -d '{"data":{"data":"hello"}}'
+curl localhost:8080 -d '{"data":{"data":"world"}}'
 ----
 
 This will call your PubSub background function with a PubSubMessage `{"data":"hello"}`.
@@ -239,30 +273,24 @@ This will call your PubSub background function with a PubSubMessage `{"data":"he
 
 For background functions, you launch the invoker with a target class of `io.quarkus.funqy.gcp.functions.FunqyBackgroundFunction`.
 
-[source]
+[source,bash]
 ----
 java -jar java-function-invoker-1.0.0-beta1.jar \
-  --classpath target/funqy-google-cloud-functions-1.0-SNAPSHOT-runner.jar \
+  --classpath target/funqy-google-cloud-functions-1.0.0-SNAPSHOT-runner.jar \
   --target io.quarkus.funqy.gcp.functions.FunqyBackgroundFunction
 ----
 
+IMPORTANT: The `--classpath` parameter needs to be set to the previously packaged JAR that contains your function class and all Quarkus related classes.
+
 Then you can call your background function via an HTTP call with a payload containing the event:
 
-[source]
+[source,bash]
 ----
 curl localhost:8080 -d '{"data":{"name":"text"}}'
 ----
 
 This will call your PubSub background function with a Cloud Storage event `{"name":"file.txt"}`, so an event on the `file.txt` file.
 
-
-== Deploying HTTP Functions via Funqy
-
-You can use link:funqy-http[Funqy HTTP] on Google Cloud Functions.
-This allows you to invoke on multiple Funqy functions using HTTP deployed as one Google Cloud Function.
-
-For this you need to include both `quarkus-funqy-http` and `quarkus-google-cloud-functions` extension.
-
 == What's next?
 
 If you are looking for JAX-RS, Servlet or Vert.x support for Google Cloud Functions, we have it thanks to our link:gcp-functions-http[Google Cloud Functions HTTP binding].
diff --git a/docs/src/main/asciidoc/funqy-http.adoc b/docs/src/main/asciidoc/funqy-http.adoc
index 80ec9123a566a..008d04499e9d5 100644
--- a/docs/src/main/asciidoc/funqy-http.adoc
+++ b/docs/src/main/asciidoc/funqy-http.adoc
@@ -1,9 +1,9 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
-= Quarkus - Funqy HTTP (Standalone)
+= Quarkus - Funqy HTTP Binding (Standalone)
 
 include::./attributes.adoc[]
 :extension-status: preview
@@ -39,9 +39,21 @@ The solution is located in the `funqy-http-quickstart` {quickstarts-tree-url}/fu
 If you look at the Java code, you'll see that there is no HTTP specific API.  Its just simple Java methods
 annotated with `@Funq`.  Simple, easy, straightforward.
 
+== Maven Dependencies
+
+To write Funqy HTTP functions, simply include the `quarkus-funqy-http` dependency into your Quarkus `pom.xml` file:
+
+[source, xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-funqy-http</artifactId>
+</dependency>
+----
+
 == Build Project
 
-[source, shell]
+[source,bash]
 ----
 mvn clean quarkus:dev
 ----
@@ -50,15 +62,13 @@ This starts your functions in Quarkus dev mode.
 
 == Execute Funqy HTTP functions
 
-Funqy HTTP input and output is always JSON.  The Jackson JSON parser is used behind the scenes and you can
-use Jackson annotations to fine tune your JSON mappings for your input and output objects.
-
-The HTTP POST method can be used to execute any Funqy function.  HTTP GET can be used if your function does
-not have any input.  No other HTTP method can be used besides POST and GET.
-
 The URL path to execute a function is the function name.  For example if your function name is `foo` then the URL path
 to execute the function would be `/foo`.
 
+The HTTP POST or GET methods can be used to invoke on a function.  The return value of the function
+is marshalled to JSON using the Jackson JSON library.  Jackson annotations can be used.  If your function
+has an input parameter, a POST invocation must use JSON as the input type.  Jackson is also used here for unmarshalling.
+
 You can invoke the `hello` function defined in {quickstarts-tree-url}/funqy-quickstarts/funqy-http-quickstart/src/main/java/org/acme/funqy/PrimitiveFunctions.java[PrimitiveFunctions.java]
 by pointing your browser to http://localhost:8080/hello
 
@@ -66,7 +76,7 @@ Invoking the other functions in the quickstart requires an HTTP POST.
 To execute the `greet` function defined in {quickstarts-tree-url}/funqy-quickstarts/funqy-http-quickstart/src/main/java/org/acme/funqy/GreetingFunction.java[GreetingFunction.java]
 invoke this curl script.
 
-[source, shell]
+[source,bash]
 ----
 curl "http://localhost:8080/greet" \
 -X POST \
@@ -78,7 +88,7 @@ Primitive types can also be passed as input using the standard JSON mapping for
 To execute the `toLowerCase` function defined in {quickstarts-tree-url}/funqy-quickstarts/funqy-http-quickstart/src/main/java/org/acme/funqy/PrimitiveFunctions.java[PrimitiveFunctions.java]
 invoke this curl script:
 
-[source, shell]
+[source,bash]
 ----
 curl "http://localhost:8080/toLowerCase" \
 -X POST \
@@ -89,7 +99,7 @@ curl "http://localhost:8080/toLowerCase" \
 To execute the `double` function defined in {quickstarts-tree-url}/funqy-quickstarts/funqy-http-quickstart/src/main/java/org/acme/funqy/PrimitiveFunctions.java[PrimitiveFunctions.java]
 invoke this curl script:
 
-[source, shell]
+[source,bash]
 ----
 curl "http://localhost:8080/double" \
 -X POST \
@@ -97,15 +107,198 @@ curl "http://localhost:8080/double" \
 -d '2'
 ----
 
-== Maven Dependencies
+== GET Query Parameter Mapping
 
-To write Funqy HTTP functions, simply include the `quarkus-funqy-http` dependency into your Quarkus `pom.xml` file:
+For GET requests, the Funqy HTTP Binding also has a query parameter mapping for function input parameters.
+Only bean style classes and `java.util.Map` can be used for your input parameter.  For bean style
+classes, query parameter names are mapped to properties on the bean class.  Here's an example of a simple
+`Map`:
 
-[source, xml]
+[source, java]
 ----
-<dependency>
-    <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-funqy-http</artifactId>
-</dependency>
+@Funq
+public String hello(Map<String, Integer> map) {
+...
+}
+----
+
+Key values must be a primitive type (except char) or `String`.  Values can be primitives (except char), `String`, `OffsetDateTime` or a complex
+bean style class.  For the above example, here's the corresponding curl request:
+
+[source,bash]
+----
+curl "http://localhost:8080/a=1&b=2"
+----
+
+The `map` input parameter of the `hello` function would have the key value pairs: `a`->1, `b`->2.
+
+Bean style classes can also be use as the input parameter type.  Here's an example:
+
+[source, java]
+----
+public class Person {
+    String first;
+    String last;
+
+    public String getFirst() { return first; }
+    public void setFirst(String first) { this.first = first; }
+    public String getLast() { return last; }
+    public void setLast(String last) { this.last = last; }
+}
+
+public class MyFunctions {
+    @Funq
+    public String greet(Person p) {
+       return "Hello " + p.getFirst() + " " + p.getLast();
+    }
+}
+----
+
+Property values can be any primitive type except `char`. It can also be `String`, and `OffsetDateTime`.
+`OffsetDateTime` query param values must be in ISO-8601 format.
+
+You can invoke on this using an HTTP GET and query parameters:
+
+[source,bash]
+----
+curl "http://localhost:8080/greet?first=Bill&last=Burke"
+----
+
+In the above request, the query parameter names are mapped to corresponding properties in the input class.
+
+The input class can also have nested bean classes.  Expanding on the previous example:
+
+[source, java]
+----
+public class Family {
+    private Person dad;
+    private Person mom;
+
+    public Person getDad() { return dad; }
+    public void setDad(Person dad) { this.dad = dad; }
+    public Person getMom() { return mom; }
+    public void setMom(Person mom) { this.mom = mom; }
+}
+
+public class MyFunctions {
+    @Funq
+    public String greet(Family family) {
+       ...
+    }
+}
+
 ----
 
+In this case, query parameters for nested values use the `.` notation.  For example:
+
+[source,bash]
+----
+curl "http://localhost:8080/greet?dad.first=John&dad.last=Smith&mom.first=Martha&mom.last=Smith"
+----
+
+`java.util.List` and `Set` are also supported as property values.  For example:
+
+[source, java]
+----
+public class Family {
+    ...
+
+    List<String> pets;
+}
+
+public class MyFunctions {
+    @Funq
+    public String greet(Family family) {
+       ...
+    }
+}
+
+----
+
+To invoke a GET request, just list the `pets` query parameter multiple times.
+
+[source,bash]
+----
+curl "http://localhost:8080/greet?pets=itchy&pets=scratchy"
+----
+
+For more complex types, `List` and `Set` members must have an identifier in the
+query parameter.  For example:
+
+[source, java]
+----
+public class Family {
+    ...
+
+    List<Person> kids;
+}
+
+public class MyFunctions {
+    @Funq
+    public String greet(Family family) {
+       ...
+    }
+}
+
+----
+
+Each `kids` query parameter must identify the kid they are referencing so that
+the runtime can figure out which
+property values go to which members in the list.  Here's the curl request:
+
+[source,bash]
+----
+curl "http://localhost:8080/greet?kids.1.first=Buffy&kids.2.first=Charlie"
+----
+
+The above URL uses the value `1` and `2` to identity the target member of the list, but any unique
+string can be used.
+
+A property can also be a `java.util.Map`.  The key of the map can be any primitive type and `String`.
+For example:
+
+[source, java]
+----
+public class Family {
+    ...
+
+    Map<String, String> address;
+}
+
+public class MyFunctions {
+    @Funq
+    public String greet(Family family) {
+       ...
+    }
+}
+----
+
+The corresponding call would look like this:
+
+[source,bash]
+----
+curl "http://localhost:8080/greet?address.state=MA&address.city=Boston"
+----
+
+If your `Map` value is a complex type, then just continue the notation by adding the property to set at the end.
+
+[source, java]
+----
+public class Family {
+    ...
+
+    Map<String, Address> addresses;
+}
+
+public class MyFunctions {
+    @Funq
+    public String greet(Family family) {
+       ...
+    }
+}
+----
+
+[source,bash]
+----
+curl "http://localhost:8080/greet?addresses.home.state=MA&addresses.home.city=Boston"
+----
diff --git a/docs/src/main/asciidoc/funqy-knative-events.adoc b/docs/src/main/asciidoc/funqy-knative-events.adoc
index 48529f1e44079..f33d010f6faa1 100644
--- a/docs/src/main/asciidoc/funqy-knative-events.adoc
+++ b/docs/src/main/asciidoc/funqy-knative-events.adoc
@@ -1,9 +1,9 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
-= Quarkus - Funqy Knative Events
+= Quarkus - Funqy Knative Events Binding
 
 include::./attributes.adoc[]
 :extension-status: preview
@@ -28,7 +28,7 @@ To complete this guide, you need:
 
 Setting up Knative locally in a Minikube environment is beyond the scope of this guide.  It is advised
 to follow  https://redhat-developer-demos.github.io/knative-tutorial/knative-tutorial/index.html[this] Knative Tutorial
-put together by Red Hat.  It walks through how to set up Knative on Minikube or Openshift in a local environment.
+put together by Red Hat.  It walks through how to set up Knative on Minikube or OpenShift in a local environment.
 
 NOTE: Specifically you should run the link:https://redhat-developer-demos.github.io/knative-tutorial/knative-tutorial-eventing/eventing-trigger-broker.html[Brokers and Triggers]
 tutorial as this guide requires that you can invoke on a Broker to trigger the quickstart code.
@@ -107,7 +107,7 @@ public class SimpleFunctionChain {
 The `configChain` function has its Cloud Event mapping changed by configuration within {quickstarts-tree-url}/funqy-quickstarts/funqy-knative-events-quickstart/src/main/resources/application.properties[application.properties].
 
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 quarkus.funqy.knative-events.mapping.configChain.trigger=defaultChain.output
 quarkus.funqy.knative-events.mapping.configChain.response-type=annotated
@@ -207,14 +207,14 @@ Funqy also works with Quarkus Dev mode!
 
 First build the Java artifacts:
 
-[source, shell]
+[source,bash]
 ----
 mvn clean install
 ----
 
 Next, a docker image is required by Knative, so you'll need to build that next:
 
-[source, shell]
+[source,bash]
 ----
 docker build -f src/main/docker/Dockerfile.jvm -t yourAccountName/funqy-knative-events-quickstart .
 ----
@@ -224,17 +224,29 @@ Dockerfile is a standard Quarkus dockerfile.  No special Knative magic.
 
 Push your image to docker hub or quay
 
-[source, shell]
+[source,bash]
 ----
 docker push yourAccountName/funqy-knative-events-quickstart
 ----
 
 Again, make sure to replace `yourAccountName` with your docker or quay account name when you run `docker push`.
 
-== Deploy to Kubernetes/Openshift
+== Deploy to Kubernetes/OpenShift
+
+The first step is to set up the broker in our namespace.
+Following is an example command from the the Knative cli.
+
+[source, yaml]
+----
+kn broker create default \
+  --namespace knativetutorial
+----
+
+The broker we have created is called `default`, this broker will receive the cloud events.
+The broker is also referenced in the function YAML files.
 
-The first step is to define a Kubernetes/Openshift service to points to your the docker image you created and pushed
-during build.  Take a look at {quickstarts-tree-url}/funqy-quickstarts/funqy-knative-events-quickstart/src/main/k8s/funqy-service.yaml[funqy-service.yaml]
+The second step is to define a Kubernetes/OpenShift service to point to the Docker image you created and pushed
+during build. Take a look at {quickstarts-tree-url}/funqy-quickstarts/funqy-knative-events-quickstart/src/main/k8s/funqy-service.yaml[funqy-service.yaml]
 
 [source, yaml]
 ----
@@ -253,22 +265,22 @@ spec:
         - image: docker.io/yourAccountName/funqy-knative-events-quickstart
 ----
 
-This is a standard Kubernetes service definition yaml file.
+This is a standard Kubernetes service definition YAML file.
 
-NOTE: Make sure you change the image url to point to the image you built and pushed earlier!
+NOTE: Make sure you change the image URL to point to the image you built and pushed earlier!
 
-For our quickstart, one Kubernetes service will contain all functions.  There's no reason you couldn't break up this
+For our quickstart, one Kubernetes service will contain all functions. There's no reason you couldn't break up this
 quickstart into multiple different projects and deploy a service for each function.  For simplicity, and to show that you
 don't have to have a deployment per function, the quickstart combines everything into one project, image, and service.
 
-Deploy the service yaml.
+Deploy the service:
 
-[source, shell]
+[source,bash]
 ----
 kubectl apply -n knativetutorial -f src/main/k8s/funqy-service.yaml
 ----
 
-The next step is to deploy Knative Event triggers for each of the event types.  As noted in the code section, each
+The next step is to deploy Knative Event triggers for each of the event types. As noted in the code section, each
 Funqy function is mapped to a specific Cloud Event type.  You must create Knative Event triggers that map a Cloud Event
 and route it to a specific Kubernetes service.  We have 4 different triggers.
 
@@ -281,6 +293,7 @@ kind: Trigger
 metadata:
   name: defaultchain
 spec:
+  broker: default
   filter:
     attributes:
       type: defaultChain
@@ -294,13 +307,13 @@ spec:
 The `spec:filter:attributes:type` maps a Cloud Event type to the Kubernetes service defined in `spec:subscriber:ref`.
 When a Cloud Event is pushed to the Broker, it will trigger the spin up of the service mapped to that event.
 
-There's a trigger yaml file for each of our 4 Funqy functions.  Deploy them all:
+There's a trigger YAML file for each of our 4 Funqy functions.  Deploy them all:
 
-[source, shell]
+[source,bash]
 ----
 kubectl apply -n knativetutorial -f src/main/k8s/defaultChain-trigger.yaml
 kubectl apply -n knativetutorial -f src/main/k8s/configChain-trigger.yaml
-kubectl apply -n knativetutorial -f src/main/k8s/annoatedChain-trigger.yaml
+kubectl apply -n knativetutorial -f src/main/k8s/annotatedChain-trigger.yaml
 kubectl apply -n knativetutorial -f src/main/k8s/lastChainLink-trigger.yaml
 ----
 
@@ -310,33 +323,41 @@ You'll need two different terminal windows.  One to do a curl request to the Bro
 files so you can see the messages flowing through the Funqy function event chain.
 
 Make sure you have the `stern` tool installed.  See the Knative Tutorial setup for information on that.  Run stern
-to look for logs outputed by our Funqy deployment
+to look for logs outputted by our Funqy deployment
 
-[source, shell]
+[source,bash]
 ----
 stern funq user-container
 ----
 
 Open a separate terminal.  You'll first need to learn the URL of the broker.  Execute this command to find it.
 
-[source, shell]
+[source,bash]
 ----
 kubectl get broker default -o jsonpath='{.status.address.url}'
 ----
 
-This will provide you a url like this (exactly like this if you followed the knative tutorial): `http://default-broker.knativetutorial.svc.cluster.local`
-Remember this URL.
+This will provide you a URL similar to e.g.: `http://broker-ingress.knative-eventing.svc.cluster.local/knativetutorial/default`. Remember this URL.
 
 Next thing we need to do is ssh into our Kubernetes cluster so that we can send a curl request to our broker.
+Following command will create a simple OS pod so we can curl into our functions.
+
+[source,bash]
+----
+kubectl -n knativetutorial apply -f src/main/k8s/curler.yaml
+----
+
+You might need to wait a couple of seconds until the curler pod comes up. Run the following to get bash access to the curler pod:
 
-[source, shell]
+[source,bash]
 ----
 kubectl -n knativetutorial exec -it curler -- /bin/bash
 ----
 
-You will now be in a shell within the Kubernetes cluster.  Within the shell, execute this curl command
 
-[source, shell]
+You will now be in a shell within the Kubernetes cluster.  Within the shell, execute this curl command , the broker address is an example and might differ based on your project or broker name.
+
+[source,bash]
 ----
 curl -v "http://default-broker.knativetutorial.svc.cluster.local" \
 -X POST \
diff --git a/docs/src/main/asciidoc/funqy.adoc b/docs/src/main/asciidoc/funqy.adoc
index 9fb28d0520a04..5afa10ccba5a3 100644
--- a/docs/src/main/asciidoc/funqy.adoc
+++ b/docs/src/main/asciidoc/funqy.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Funqy
 
diff --git a/docs/src/main/asciidoc/gcp-functions-http.adoc b/docs/src/main/asciidoc/gcp-functions-http.adoc
index bfc037366226a..67bf8bce26327 100644
--- a/docs/src/main/asciidoc/gcp-functions-http.adoc
+++ b/docs/src/main/asciidoc/gcp-functions-http.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Google Cloud Functions (Serverless) with RESTEasy, Undertow, or Vert.x Web
 :extension-status: experimental
@@ -9,9 +9,9 @@ https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
 include::./attributes.adoc[]
 
 The `quarkus-google-cloud-functions-http` extension allows you to write microservices with RESTEasy (JAX-RS),
-Undertow (Servlet) or Vert.x Web, and make these microservices deployable to the Google Cloud Functions runtime.
+Undertow (Servlet), Vert.x Web, or link:funqy-http[Funqy HTTP], and make these microservices deployable to the Google Cloud Functions runtime.
 
-One Google Cloud Functions deployment can represent any number of JAX-RS, Servlet, or Vert.x Web endpoints.
+One Google Cloud Functions deployment can represent any number of JAX-RS, Servlet, Vert.x Web, or link:funqy-http[Funqy HTTP] endpoints.
 
 As the Google Cloud Function Java engine is a new Beta feature of Google Cloud, this extension is flagged as experimental.
 
@@ -30,7 +30,7 @@ To complete this guide, you need:
 == Solution
 
 This guide walks you through generating a sample project followed by creating three HTTP endpoints
-written with JAX-RS APIs, Servlet APIs or Vert.x Web APIs. Once built, you will be able to deploy
+written with JAX-RS APIs, Servlet APIs, Vert.x Web, or link:funqy-http[Funqy HTTP] APIs. Once built, you will be able to deploy
 the project to Google Cloud.
 
 If you don't want to follow all these steps, you can go right to the completed example.
@@ -44,36 +44,36 @@ The solution is located in the `google-cloud-functions-http-quickstart` {quickst
 Create an application with the `quarkus-google-cloud-functions-http` extension.
 You can use the following Maven command to create it:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=google-cloud-functions-http \
     -DclassName="org.acme.quickstart.GreetingResource" \
     -Dpath="/hello" \
-    -Dextensions="google-cloud-functions-http,resteasy-json,undertow,vertx-web"
+    -Dextensions="resteasy,google-cloud-functions-http,resteasy-json,undertow,vertx-web,funqy-http"
 ----
 
 == Login to Google Cloud
 
 Login to Google Cloud is necessary for deploying the application and it can be done as follows:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 gcloud auth login
 ----
 
 At the time of this writing, Cloud Functions are still in beta so make sure to install the `beta` command group.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 gcloud components install beta
 ----
 
 == Creating the endpoints
 
-For this example project, we will create three endpoints, one for RESTEasy (JAX-RS), one for Undertow (Servlet)
-and one for Vert.x Web (reactive routes).
+For this example project, we will create four endpoints, one for RESTEasy (JAX-RS), one for Undertow (Servlet),
+one for Vert.x Web (reactive routes) and one for link:funqy-http[Funqy HTTP].
 
 If you don't need endpoints of each type, you can remove the corresponding extensions from your `pom.xml`.
 
@@ -146,6 +146,20 @@ public class GreetingRoutes {
 }
 ----
 
+=== The Funqy HTTP endpoint
+
+[source,java]
+----
+import io.quarkus.funqy.Funq;
+
+public class GreetingFunqy {
+    @Funq
+    public String funqy() {
+        return "Make it funqy";
+    }
+}
+----
+
 == Build and Deploy to Google Cloud
 
 NOTE: Quarkus forces a packaging of type `uber-jar` for your function as Google Cloud Function deployment requires a single JAR.
@@ -155,7 +169,7 @@ The result of the previous command is a single JAR file inside the `target/deplo
 
 Then you will be able to use `gcloud` to deploy your function to Google Cloud.
 
-[source]
+[source,bash]
 ----
 gcloud beta functions deploy quarkus-example-http \
   --entry-point=io.quarkus.gcp.functions.http.QuarkusHttpFunction \
@@ -185,6 +199,7 @@ You can then call your endpoints via:
 - For JAX-RS: {httpsTrigger.url}/hello
 - For servlet: {httpsTrigger.url}/servlet/hello
 - For Vert.x Web: {httpsTrigger.url}/vertx/hello
+- For Funqy: {httpsTrigger.url}/funqy
 
 == Testing locally
 
@@ -192,22 +207,26 @@ The easiest way to locally test your function is using the Cloud Function invoke
 
 You can download it via Maven using the following command:
 
-[source]
+[source,bash]
 ----
 mvn dependency:copy \
   -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-beta1' \
   -DoutputDirectory=.
 ----
 
+Before using the invoker, you first need to build your function via `mvn package`.
+
 Then you can use it to launch your function locally.
 
-[source]
+[source,bash]
 ----
 java -jar java-function-invoker-1.0.0-beta1.jar \
-  --classpath target/deployment/google-cloud-functions-http-1.0-SNAPSHOT-runner.jar \
+  --classpath target/deployment/google-cloud-functions-http-1.0.0-SNAPSHOT-runner.jar \
   --target io.quarkus.gcp.functions.http.QuarkusHttpFunction
 ----
 
+IMPORTANT: The `--classpath` parameter needs to be set to the previously packaged JAR that contains your function class and all Quarkus related classes.
+
 Your endpoints will be available on http://localhost:8080.
 
 == What's next?
diff --git a/docs/src/main/asciidoc/gcp-functions.adoc b/docs/src/main/asciidoc/gcp-functions.adoc
old mode 100755
new mode 100644
index 2fe67612d58f0..5f756e8fbe01b
--- a/docs/src/main/asciidoc/gcp-functions.adoc
+++ b/docs/src/main/asciidoc/gcp-functions.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Google Cloud Functions (Serverless)
 :extension-status: experimental
@@ -42,19 +42,19 @@ The solution is located in the `google-cloud-functions-quickstart` {quickstarts-
 Create an application with the `quarkus-google-cloud-functions` extension.
 You can use the following Maven command to create it:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=google-cloud-functions \
     -DclassName="org.acme.quickstart.GreetingResource" \
     -Dpath="/hello" \
-    -Dextensions="google-cloud-functions"
+    -Dextensions="resteasy,google-cloud-functions"
 ----
 
 Now, let's remove what's not needed inside the generated application:
 
-- Remove the dependency `io.quarkus:quarkus-reasteasy` from your `pom.xml` file.
+- Remove the dependency `io.quarkus:quarkus-resteasy` from your `pom.xml` file.
 - Remove the generated `org.acme.quickstart.GreetingResource` class.
 - Remove the `index.html` from `resources/META-INF/resources` or it will be picked up instead of your Function.
 - Remove the existing tests.
@@ -63,25 +63,25 @@ Now, let's remove what's not needed inside the generated application:
 
 Login to Google Cloud is necessary for deploying the application and it can be done as follows:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 gcloud auth login
 ----
 
 At the time of this writing, Cloud Functions are still in beta so make sure to install the `beta` command group.
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 gcloud components install beta
 ----
 
 == Creating the functions
 
-For this example project, we will create three functions, one `HttpFunction`, one `BackgroundFunction` (Storage event) and one `RawBakgroundFunction` (PubSub event).
+For this example project, we will create three functions, one `HttpFunction`, one `BackgroundFunction` (Storage event) and one `RawBackgroundFunction` (PubSub event).
 
 == Choose Your Function
 
-The `quarkus-google-cloud-functions` extension scans your project for a class that directly implements the Google Cloud `HttpFunction`, `BackgroundFunction` or `RawBakgroundFunction` interface.
+The `quarkus-google-cloud-functions` extension scans your project for a class that directly implements the Google Cloud `HttpFunction`, `BackgroundFunction` or `RawBackgroundFunction` interface.
 It must find a class in your project that implements one of these interfaces or it will throw a build time failure.
 If it finds more than one function classes, a build time exception will also be thrown.
 
@@ -91,7 +91,7 @@ project and use configuration or an environment variable to pick the function yo
 
 To configure the name of the function, you can use the following configuration property:
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 quarkus.google-cloud-functions.function=test
 ----
@@ -239,7 +239,7 @@ This means that Cloud Build is not activated yet. To overcome this error, open t
 
 This is an example command to deploy your `HttpFunction` to Google Cloud:
 
-[source]
+[source,bash]
 ----
 gcloud beta functions deploy quarkus-example-http \
   --entry-point=io.quarkus.gcp.functions.QuarkusHttpFunction \
@@ -257,7 +257,7 @@ This command will give you as output a `httpsTrigger.url` that points to your fu
 
 Before deploying your function, you need to create a bucket.
 
-[source]
+[source,bash]
 ----
 gsutil mb gs://quarkus-hello
 ----
@@ -265,7 +265,7 @@ gsutil mb gs://quarkus-hello
 This is an example command to deploy your `BackgroundFunction` to Google Cloud, as the function is triggered by a Storage event,
 it needs to use `--trigger-event google.storage.object.finalize` and the `--trigger-resource` parameter with the name of a previously created bucket:
 
-[source]
+[source,bash]
 ----
 gcloud beta functions deploy quarkus-example-storage \
     --entry-point=io.quarkus.gcp.functions.QuarkusBackgroundFunction \
@@ -280,7 +280,7 @@ The entry point must always be set to `io.quarkus.gcp.functions.QuarkusBackgroun
 
 To trigger the event, you can send a file to the GCS `quarkus-hello` bucket or you can use gcloud to simulate one:
 
-[source]
+[source,bash]
 ----
 gcloud functions call quarkus-example-storage  --data '{"name":"test.txt"}'
 ----
@@ -292,7 +292,7 @@ NOTE: `--data` contains the GCS event, it is a JSON document with the name of th
 This is an example command to deploy your `RawBackgroundFunction` to Google Cloud, as the function is triggered by a PubSub event,
 it needs to use `--trigger-event google.pubsub.topic.publish` and the `--trigger-resource` parameter with the name of a previously created topic:
 
-[source]
+[source,bash]
 ----
 gcloud beta functions deploy quarkus-example-pubsub \
   --entry-point=io.quarkus.gcp.functions.QuarkusBackgroundFunction \
@@ -304,9 +304,9 @@ gcloud beta functions deploy quarkus-example-pubsub \
 The entry point must always be set to `io.quarkus.gcp.functions.QuarkusBackgroundFunction` as this is the class that integrates Cloud Functions with Quarkus.
 ====
 
-To trigger the event, you can send a file to the `hello_topic` topic of you can use gcloud to simulate one:
+To trigger the event, you can send a file to the `hello_topic` topic or you can use gcloud to simulate one:
 
-[source]
+[source,bash]
 ----
 gcloud functions call quarkus-example-pubsub --data '{"data":{"greeting":"world"}}'
 ----
@@ -317,40 +317,46 @@ The easiest way to locally test your function is using the Cloud Function invoke
 
 You can download it via Maven using the following command:
 
-[source]
+[source,bash]
 ----
 mvn dependency:copy \
   -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-beta1' \
   -DoutputDirectory=.
 ----
 
+Before using the invoker, you first need to build your function via `mvn package`.
+
 === The HttpFunction
 
 To test an `HttpFunction`, you can use this command to launch your function locally.
 
-[source]
+[source,bash]
 ----
 java -jar java-function-invoker-1.0.0-beta1.jar \
-  --classpath target/google-cloud-functions-1.0-SNAPSHOT-runner.jar \
+  --classpath target/google-cloud-functions-1.0.0-SNAPSHOT-runner.jar \
   --target io.quarkus.gcp.functions.QuarkusHttpFunction
 ----
 
+IMPORTANT: The `--classpath` parameter needs to be set to the previously packaged JAR that contains your function class and all Quarkus related classes.
+
 Your endpoints will be available on http://localhost:8080.
 
 === The BackgroundFunction
 
 For background functions, you launch the invoker with a target class of `io.quarkus.gcp.functions.BackgroundFunction`.
 
-[source]
+[source,bash]
 ----
 java -jar java-function-invoker-1.0.0-beta1.jar \
-  --classpath target/google-cloud-functions-1.0-SNAPSHOT-runner.jar \
+  --classpath target/google-cloud-functions-1.0.0-SNAPSHOT-runner.jar \
   --target io.quarkus.gcp.functions.QuarkusBackgroundFunction
 ----
 
+IMPORTANT: The `--classpath` parameter needs to be set to the previously packaged JAR that contains your function class and all Quarkus related classes.
+
 Then you can call your background function via an HTTP call with a payload containing the event:
 
-[source]
+[source,bash]
 ----
 curl localhost:8080 -d '{"data":{"name":"hello.txt"}}'
 ----
@@ -361,16 +367,18 @@ This will call your Storage background function with an event `{"name":"hello.tx
 
 For background functions, you launch the invoker with a target class of `io.quarkus.gcp.functions.BackgroundFunction`.
 
-[source]
+[source,bash]
 ----
 java -jar java-function-invoker-1.0.0-beta1.jar \
-  --classpath target/google-cloud-functions-1.0-SNAPSHOT-runner.jar \
+  --classpath target/google-cloud-functions-1.0.0-SNAPSHOT-runner.jar \
   --target io.quarkus.gcp.functions.QuarkusBackgroundFunction
 ----
 
+IMPORTANT: The `--classpath` parameter needs to be set to the previously packaged JAR that contains your function class and all Quarkus related classes.
+
 Then you can call your background function via an HTTP call with a payload containing the event:
 
-[source]
+[source,bash]
 ----
 curl localhost:8080 -d '{"data":{"greeting":"world"}}'
 ----
diff --git a/docs/src/main/asciidoc/getting-started-knative.adoc b/docs/src/main/asciidoc/getting-started-knative.adoc
deleted file mode 100644
index f0a6f0ea3e5ea..0000000000000
--- a/docs/src/main/asciidoc/getting-started-knative.adoc
+++ /dev/null
@@ -1,133 +0,0 @@
-////
-This guide is maintained in the main Quarkus repository
-and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
-////
-= Quarkus - Deploying Knative Application to Kubernetes or OpenShift
-
-include::./attributes.adoc[]
-:experimental:
-
-This guide covers:
-
-The deployment of a serverless application to Kubernetes using https://knative.dev[Knative].
-
-This guide takes as input the application developed in the link:building-native-image[native application guide].
-So, you should have been able to package your application as a binary executable, copied it in a Docker image and run this image.
-
-Depending on whether you are a _bare_ Kubernetes user or an OpenShift user, pick the section you need.
-The OpenShift section leverages OpenShift build and route features which are not available in _bare_ Kubernetes.
-
-== Prerequisites
-
-For this guide you need:
-
-* roughly 20 minutes
-* having access to a Kubernetes cluster. Minikube is a valid option.
-* having deployed Knative components on https://knative.dev/docs/install/knative-with-minikube/[minikube]
-* having https://skaffold.dev/[Skaffold] CLI on your PATH
-
-== Solution
-
-We recommend to follow the instructions in the next sections and build the application step by step. However, you can go right to the completed example.
-
-Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
-
-The solution is located in the `getting-started-knative` directory.
-
-== Set up Kubernetes Cluster
-
-The following script will start minikube and deploy Knative.
-
-[source,bash]
-----
-./bin/start-minikube.sh
-eval $(minikube docker-env) #<1>
-----
-
-<1> Make the current Docker context to be that of minikube
-
-== Set up Nexus(Optional)
-
-Nexus is used for caching maven artifacts so that Apache Maven builds are faster.
-
-[source,bash]
-----
-kubectl apply -f k8s/nexus.yaml
-----
-
-Wait for some time to have Nexus initialize and run. You can watch the status via `kubectl get pods -w`, use kbd:[Ctrl+c] to terminate the watch.
-
-== Why Skaffold ?
-
-As vanilla Kubernetes does not have an easy and developer friendly way to build and deploy application to a local cluster like minikube, without the need to push the image to external container registry. We will be using Skaffold to help us build and deploy the Quarkus application onto Kubernetes.
-
-== Build and deploy application
-
-[IMPORTANT]
-====
-The container image will not be pushed to a remote container registry, and hence the container image url has to be `dev.local`, to make Knative deploy it without trying to pull it from external container registry.
-====
-
-To run Knative Quarkus applications, we need to use the multi stage docker build; to build the Quarkus application container image and use it in Kubernetes application deployment.
-
-The following command start a one time deployment of Quarkus application and runs starts the Knative service after successful container image build.
-
-[NOTE]
-====
-If you want to deploy a Quarkus JVM image (using HotSpot), then run the following command before running Skaffold:
-
-[source,bash]
-----
-cp src/main/docker/Dockerfile.jvm Dockerfile
-----
-
-If you want to deploy a Quarkus Native executable image (using GraalVM), then run the following command before running Skaffold:
-
-[source,bash]
-----
-cp src/main/docker/Dockerfile.native Dockerfile
-----
-
-It is very important to note that the Dockerfile in `src/main/docker` folder has been modified Dockerfiles to support multi stage Docker build.The multi stage Docker build helps in building and containerization of application with single Dockerfile.
-====
-
-[source,bash]
-----
-skaffold run
-----
-
-As it will take a few minutes for the build and deployment to be completed you can watch the status using:
-
-[source,bash]
-----
-watch kubectl get pods 
-----
-
-A successful Knative service deployment will show the following pods in the current namespace:
-
-[source,bash]
-----
-NAME                                     READY   STATUS    AGE
-greeter-deployment-5749cc98fc-gs6zr      2/2     Running   10s
-----
-
-NOTE: The deployment name could differ in your environment.
-
-Once the Knative service is successfully running, you can call it using the script `./bin/call.sh`, which should return a response like `hello`. Allowing it to idle for approximately 60-65 seconds - that is without any further requests -, you will see it automatically scales down to zero pods.
-
-=== Cleanup 
-
-To delete the application:
-
-[source,bash]
-----
-skaffold delete
-----
-
-== Going further
-
-This guide covered the deployment of a Quarkus application as Knative application on Kubernetes
-However, there is much more, and the integration with these environments has been tailored to make Quarkus applications execution very smooth.
-For instance, the health extension can be used for health check; the configuration support allows mounting the application configuration using config map, the metric extension produces data _scrapable_ by Prometheus and so on.
-
diff --git a/docs/src/main/asciidoc/getting-started-reactive.adoc b/docs/src/main/asciidoc/getting-started-reactive.adoc
index bfcaac781c09c..0976da65afef5 100644
--- a/docs/src/main/asciidoc/getting-started-reactive.adoc
+++ b/docs/src/main/asciidoc/getting-started-reactive.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Getting started with Reactive
 
@@ -12,7 +12,8 @@ This guide covers:
 
 * A quick glance at the Quarkus engine and how it enables reactive
 * A brief introduction to Mutiny - the reactive programming library used by Quarkus
-* Bootstrapping a reactive application
+* The difference between RESTEasy, RESTEasy Reactive and Reactive Routes
+* The bootstrap of a reactive application using RESTEasy Reactive
 * Creating a reactive JAX-RS endpoint (asynchronous, streams...)
 * Using reactive database access
 * Interacting with other reactive APIs
@@ -28,13 +29,13 @@ To complete this guide, you need:
 
 == Solutions
 
-We recommend that you follow the instructions from <<bootstrapping-the-project,Boostrapping project>> and onwards to create the application step by step.
+We recommend that you follow the instructions from <<bootstrapping-the-project,Bootstrapping project>> and onwards to create the application step by step.
 
 However, you can go right to the completed example.
 
 Download an {quickstarts-archive-url}[archive] or clone the git repository:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 git clone {quickstarts-clone-url}
 ----
@@ -46,22 +47,30 @@ The solutions are located in the `getting-started-reactive` and `getting-started
 Quarkus is reactive.
 If you look under the hood, you will find a reactive engine powering your Quarkus application.
 This engine is Eclipse Vert.x (https://vertx.io).
-Every IO interaction passes through the non-blocking and reactive Vert.x engine.
+All network I/O passes through the non-blocking and reactive Vert.x engine.
 
-image:quarkus-reactive-stack.png[alt=Quarkus is based on a reactive engine, 50%]
+image:quarkus-reactive-stack.png[alt=Quarkus is based on a reactive engine, 70%]
 
 Let's take 2 examples to explain how it works.
 Imagine an incoming HTTP request.
-The (Vert.x) HTTP server receives the request and then routes it to the application.
-If the request targets a JAX-RS resource, the routing layer invokes the resource method in a worker thread and writes the response when the data is available.
+The (Vert.x) HTTP server, embedded in Quarkus, receives the request and then routes it to the application.
+If the request targets an _imperative_ method (traditional JAX-RS, code annotated with `@Blocking`...), the routing layer invokes the resource method in a _worker_ thread and writes the response when the data is available.
 So far, nothing new or outstanding.
 The following picture depicts this behavior.
+In this case, the application code is invoked on a worker thread, and the business logic can block that thread.
 
-image:http-blocking-sequence.png[alt=Behavior when using the imperative routes, 50%]
+image:http-blocking-sequence.png[alt=Behavior when using the imperative routes, 70%]
 
-But if the HTTP request targets a reactive (non-blocking) route, the routing layer invokes the route on the IO thread giving lots of benefits such as higher concurrency and performance:
+But, if the HTTP request targets a reactive method (JAX-RS using RESTEasy Reactive, reactive routes, `@Incoming` method not annotated with `@Blocking`...), the routing layer invokes the route on the I/O thread giving lots of benefits such as higher concurrency and performance:
 
-image:http-reactive-sequence.png[alt=Behavior when using the reactive routes, 50%]
+image:http-reactive-sequence.png[alt=Behavior when using the reactive routes, 70%]
+
+Because Quarkus uses the I/O thread to invoke your code, we save context-switches, avoid large thread pool management, and so improve the resource utilization.
+However, the code must **NOT** block that thread.
+Why? Because, I/O threads are used to handle multiple concurrent requests.
+As soon as the handling of a request cannot make progress because it needs to execute some I/O, it schedules these I/O and passes a continuation.
+It releases the thread which can handle another request.
+When the scheduled I/O complete, the continuation is executed, back on the I/O thread.
 
 As a consequence, many Quarkus components are designed with reactive in mind, such as database access (PostgreSQL, MySQL, Mongo, etc.), application services (mail, template engine, etc.), messaging (Kafka, AMQP, etc.) and so on.
 But, to fully benefit from this model, the application code should be written in a non-blocking manner.
@@ -71,7 +80,7 @@ That’s where having a reactive API is an ultimate weapon.
 == Mutiny - A reactive programming library
 
 https://github.com/smallrye/smallrye-mutiny[Mutiny] is a reactive programming library allowing to express and compose asynchronous actions.
-It offers 2 types:
+It offers two types:
 
 * `io.smallrye.mutiny.Uni` - for asynchronous action providing 0 or 1 result
 * `io.smallrye.mutiny.Multi` - for multi-item (with back-pressure) streams
@@ -160,18 +169,25 @@ But enough talking, let's get our hands dirty!
 
 == Bootstrapping the project
 
+There are several ways to implement reactive application with Quarkus.
+In this guide we are going to use RESTEasy Reactive, an implementation of RESTEasy benefiting from the Quarkus reactive engine.
+By default, it invokes the HTTP endpoint on the I/O thread.
+
+IMPORTANT: While it's possible to use _traditional_ RESTEasy, you would need to add the `quarkus-resteasy-mutiny` extension, and the method will still be invoked on a _worker_ thread.
+So, while it would use reactive programming, it would still require worker threads, which defeats the purpose.
+
 The easiest way to create a new Quarkus project is to open a terminal and run the following command:
 
 For Linux and macOS users
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=getting-started-reactive \
-    -DclassName="org.acme.quickstart.ReactiveGreetingResource" \
+    -DclassName="org.acme.getting.started.ReactiveGreetingResource" \
     -Dpath="/hello" \
-    -Dextensions="resteasy-mutiny, resteasy-jsonb"
+    -Dextensions="resteasy-reactive"
 cd getting-started-reactive
 ----
 
@@ -179,16 +195,16 @@ For Windows users
 
 - If using cmd, (don't use forward slash `\`)
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create -DprojectGroupId=org.acme -DprojectArtifactId=getting-started-reactive -DclassName="org.acme.quickstart.ReactiveGreetingResource" -Dpath="/hello" -Dextensions="resteasy-mutiny,resteasy-jsonb"
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create -DprojectGroupId=org.acme -DprojectArtifactId=getting-started-reactive -DclassName="org.acme.getting.started.ReactiveGreetingResource" -Dpath="/hello" -Dextensions="resteasy-reactive"
 ----
 
 - If using Powershell, wrap `-D` parameters in double quotes
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create "-DprojectGroupId=org.acme" "-DprojectArtifactId=getting-started-reactive" "-DclassName=org.acme.quickstart.ReactiveGreetingResource" "-Dpath=/hello" "-Dextensions=resteasy-mutiny,resteasy-jsonb"
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create "-DprojectGroupId=org.acme" "-DprojectArtifactId=getting-started-reactive" "-DclassName=org.acme.getting.started.ReactiveGreetingResource" "-Dpath=/hello" "-Dextensions=resteasy-reactive"
 ----
 
 It generates the following in  `./getting-started-reactive`:
@@ -200,15 +216,13 @@ It generates the following in  `./getting-started-reactive`:
 * example `Dockerfile` files for both `native` and `jvm` modes in `src/main/docker`
 * the application configuration file
 
-The generated `pom.xml` also declares the RESTEasy Mutiny support and RESTEasy JSON-B to serialize payloads.
-
 === Reactive JAX-RS resources
 
-During the project creation, the `src/main/java/org/acme/quickstart/ReactiveGreetingResource.java` file has been created with the following content:
+During the project creation, the `src/main/java/org/acme/getting/started/ReactiveGreetingResource.java` file has been created with the following content:
 
 [source,java]
 ----
-package org.acme.quickstart;
+package org.acme.getting.started;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -221,12 +235,31 @@ public class ReactiveGreetingResource {
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public String hello() {
-        return "hello";
+        return "Hello RESTEasy Reactive";
     }
 }
 ----
 
-It's a very simple REST endpoint, returning "hello" to requests on "/hello".
+It's a very simple REST endpoint, returning "Hello RESTEasy Reactive" to requests on "/hello".
+As it uses RESTEAsy Reactive, this method is called on the I/O thread.
+
+[NOTE]
+====
+To instruct Quarkus to invoke this method on a _worker_ thread, annotate it with the `io.smallrye.common.annotation.Blocking` annotation.
+You can use `@Blocking` on a method, class or enable it for the whole application by annotated an `Application` class:
+
+[source, java]
+----
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+import io.smallrye.common.annotation.Blocking;
+
+@ApplicationPath("/")
+@Blocking
+public class RestBlockingApplication extends Application {
+}
+----
+====
 
 Let's now create a `ReactiveGreetingService` class with the following content:
 
@@ -245,7 +278,7 @@ public class ReactiveGreetingService {
 
     public Uni<String> greeting(String name) {
         return Uni.createFrom().item(name)
-                .onItem().transform(n -> String.format("hello %s", name));
+                .onItem().transform(n -> String.format("hello %s", n));
     }
 }
 ----
@@ -264,8 +297,6 @@ import javax.ws.rs.core.MediaType;
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import org.jboss.resteasy.annotations.SseElementType;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
 import org.reactivestreams.Publisher;
 
 @Path("/hello")
@@ -277,7 +308,7 @@ public class ReactiveGreetingResource {
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     @Path("/greeting/{name}")
-    public Uni<String> greeting(@PathParam String name) {
+    public Uni<String> greeting(String name) {
         return service.greeting(name);
     }
 
@@ -290,16 +321,17 @@ public class ReactiveGreetingResource {
 ----
 
 The `ReactiveGreetingService` class contains a straightforward method producing a `Uni`.
-While, in this example, the resulting item is emitted immediately, you can imagine any async API producing a `Uni`. We cover this later in this guide.
+While, in this example, the resulting item is emitted immediately, you can imagine any async API producing a `Uni`.
+We cover this later in this guide.
 
 Now, start the application using:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw quarkus:dev
 ----
 
-Once running, check that you get the expected greeting message by opening http://localhost:8080/hello/greeting/neo.
+Once running, check you get the expected greeting message by opening http://localhost:8080/hello/greeting/neo.
 
 == Handling streams
 So far, we only return an asynchronous result.
@@ -317,6 +349,8 @@ public Multi<String> greetings(int count, String name) {
 }
 ----
 
+TIP: you may need to add the `import io.smallrye.mutiny.Multi;` and `import java.time.Duration;` statements.
+
 It generates a greeting message every second and stops after `count` messages.
 
 In the `ReactiveGreetingResource` add the following method:
@@ -326,7 +360,7 @@ In the `ReactiveGreetingResource` add the following method:
 @GET
 @Produces(MediaType.APPLICATION_JSON)
 @Path("/greeting/{count}/{name}")
-public Multi<String> greetings(@PathParam int count, @PathParam String name) {
+public Multi<String> greetings(int count, String name) {
   return service.greetings(count, name);
 }
 ----
@@ -335,10 +369,11 @@ This endpoint streams the items to the client as a JSON Array.
 The name and number of messages are parameterized using path parameters.
 
 So calling the endpoint produces something like:
-[source, shell]
+
+[source,shell]
 ----
 $ curl http://localhost:8080/hello/greeting/3/neo
-["hello neo - 0","hello neo - 1","hello neo - 2"]
+["hello neo - 0", "hello neo - 1", "hello neo - 2"]
 ----
 
 We can also generate Server-Sent Event responses by returning a `Multi`:
@@ -347,19 +382,21 @@ We can also generate Server-Sent Event responses by returning a `Multi`:
 ----
 @GET
 @Produces(MediaType.SERVER_SENT_EVENTS)
-@SseElementType(MediaType.TEXT_PLAIN)
+@RestSseElementType(MediaType.TEXT_PLAIN)
 @Path("/stream/{count}/{name}")
-public Multi<String> greetingsAsStream(@PathParam int count, @PathParam String name) {
+public Multi<String> greetingsAsStream(int count, String name) {
     return service.greetings(count, name);
 }
 ----
 
-The only difference with the previous snippet is the produced type and the `@SseElementType` annotation indicating the type of each event.
+The only difference with the previous snippet is the produced type and the `@RestSseElementType` annotation indicating the type of each event.
 As the `@Produces` annotation defines `SERVER_SENT_EVENTS`, JAX-RS needs it to knows the content type of each (nested) event.
 
+TIP: You may need to add the `import org.jboss.resteasy.reactive.RestSseElementType;` statement.
+
 You can see the result using:
 
-[source, shell]
+[source,shell]
 ----
 $ curl -N http://localhost:8080/hello/stream/5/neo
 data: hello neo - 0
@@ -382,20 +419,20 @@ In this section, we are going to see how you can use the Reactive PostgreSQL dri
 
 Create a new project using:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=getting-started-reactive-crud \
     -DclassName="org.acme.reactive.crud.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-mutiny, resteasy-jsonb, reactive-pg-client"
+    -Dextensions="resteasy-reactive,resteasy-reactive-jackson,reactive-pg-client"
 cd getting-started-reactive-crud
 ----
 
 This application is interacting with a PostgreSQL database, so you need one:
 
-[source, shell]
+[source,bash]
 ----
 docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 \
            --name postgres-quarkus-reactive -e POSTGRES_USER=quarkus_test \
@@ -493,21 +530,57 @@ These methods return either `Unis` or `Multis` as the produced items are emitted
 Notice that the reactive PostgreSQL client already provides `Uni` and `Multi` instances.
 So you only transform the results from the database into _business-friendly_ objects.
 
-Then, let's use this `Fruit` class in the `FruitResource`.
-Edit the `FruitResource` class to match the following content:
+For the purposes of initializing the database when the application starts, we will create a class named `DBInit` with the following content:
 
 [source, java]
 ----
 package org.acme.reactive.crud;
 
-import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.Uni;
+import io.quarkus.runtime.StartupEvent;
 import io.vertx.mutiny.pgclient.PgPool;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+@ApplicationScoped
+public class DBInit {
+
+    private final PgPool client;
+    private final boolean schemaCreate;
+
+    public DBInit(PgPool client, @ConfigProperty(name = "myapp.schema.create", defaultValue = "true") boolean schemaCreate) {
+        this.client = client;
+        this.schemaCreate = schemaCreate;
+    }
+
+    void onStart(@Observes StartupEvent ev) {
+        if (schemaCreate) {
+            initdb();
+        }
+    }
+
+    private void initdb() {
+        client.query("DROP TABLE IF EXISTS fruits").execute()
+                .flatMap(r -> client.query("CREATE TABLE fruits (id SERIAL PRIMARY KEY, name TEXT NOT NULL)").execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Kiwi')").execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Durian')").execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Pomelo')").execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Lychee')").execute())
+                .await().indefinitely();
+    }
+}
+----
+
+Then, let's use this `Fruit` class in the `FruitResource`.
+Edit the `FruitResource` class to match the following content:
+
+[source, java]
+----
+package org.acme.reactive.crud;
+
+import java.net.URI;
+
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -519,25 +592,20 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
-import java.net.URI;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import io.vertx.mutiny.pgclient.PgPool;
 
 @Path("fruits")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
-    @Inject
-    @ConfigProperty(name = "myapp.schema.create", defaultValue = "true")
-    boolean schemaCreate;
-
-    @Inject
-    PgPool client;
+    private final PgPool client;
 
-    @PostConstruct
-    void config() {
-        if (schemaCreate) {
-            initdb();
-        }
+    public FruitResource(PgPool client) {
+        this.client = client;
     }
 
     private void initdb() {
@@ -557,7 +625,7 @@ public class FruitResource {
 
     @GET
     @Path("{id}")
-    public Uni<Response> getSingle(@PathParam Long id) {
+    public Uni<Response> getSingle(Long id) {
         return Fruit.findById(client, id)
                 .onItem().transform(fruit -> fruit != null ? Response.ok(fruit) : Response.status(Status.NOT_FOUND))
                 .onItem().transform(ResponseBuilder::build);
@@ -572,7 +640,7 @@ public class FruitResource {
 
     @PUT
     @Path("{id}")
-    public Uni<Response> update(@PathParam Long id, Fruit fruit) {
+    public Uni<Response> update(Long id, Fruit fruit) {
         return fruit.update(client)
                 .onItem().transform(updated -> updated ? Status.OK : Status.NOT_FOUND)
                 .onItem().transform(status -> Response.status(status).build());
@@ -580,7 +648,7 @@ public class FruitResource {
 
     @DELETE
     @Path("{id}")
-    public Uni<Response> delete(@PathParam Long id) {
+    public Uni<Response> delete(Long id) {
         return Fruit.delete(client, id)
                 .onItem().transform(deleted -> deleted ? Status.NO_CONTENT : Status.NOT_FOUND)
                 .onItem().transform(status -> Response.status(status).build());
@@ -597,7 +665,7 @@ Also, you can use Vert.x clients directly.
 
 First of all, make sure the `quarkus-vertx` extension is present. If not, activate the extension by executing the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:add-extensions \
     -Dextensions=vertx
diff --git a/docs/src/main/asciidoc/getting-started-testing.adoc b/docs/src/main/asciidoc/getting-started-testing.adoc
index c24a5115e240a..bc51fdbda8a41 100644
--- a/docs/src/main/asciidoc/getting-started-testing.adoc
+++ b/docs/src/main/asciidoc/getting-started-testing.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Testing Your Application
 
@@ -47,7 +47,7 @@ However, you can go right to the completed example.
 
 Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
 
-The solution is located in the `getting-started-testing` directory.
+The solution is located in the `getting-started-testing` {quickstarts-tree-url}/getting-started-testing[directory].
 
 This guide assumes you already have the completed application from the `getting-started` directory.
 
@@ -159,6 +159,16 @@ quarkus.http.test-ssl-port=8446
 Quarkus also provides RestAssured integration that updates the default port used by RestAssured before the tests are run,
 so no additional configuration should be required.
 
+=== Controlling HTTP interaction timeout
+
+When using REST Assured in your test, the connection and response timeouts are set to 30 seconds.
+You can override this setting with the `quarkus.http.test-timeout` property:
+
+[source]
+----
+quarkus.http.test-timeout=10s
+----
+
 === Injecting a URI
 
 It is also possible to directly inject the URL into the test which can make is easy to use a different client. This is
@@ -228,6 +238,117 @@ public class StaticContentTest {
 
 For now `@TestHTTPResource` allows you to inject `URI`, `URL` and `String` representations of the URL.
 
+== Testing a specific endpoint
+
+Both RESTassured and `@TestHTTPResource` allow you to specify the endpoint class you are testing rather than hard coding
+a path. This currently supports both JAX-RS endpoints, Servlets and Reactive Routes. This makes it a lot easier to see exactly which endpoints
+a given test is testing.
+
+For the purposes of these examples I am going to assume we have an endpoint that looks like the following:
+
+[source,java]
+----
+@Path("/hello")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
+----
+
+NOTE: This currently does not support the `@ApplicationPath()` annotation to set the JAX-RS context path. Use the
+`quarkus.resteasy.path` config value instead if you want a custom context path.
+
+=== TestHTTPResource
+
+You can the use the `io.quarkus.test.common.http.TestHTTPEndpoint` annotation to specify the endpoint path, and the path
+will be extracted from the provided endpoint. If you also specify a value for the `TestHTTPResource` endpoint it will
+be appended to the end of the endpoint path.
+
+[source,java]
+----
+package org.acme.getting.started.testing;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPEndpoint;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class StaticContentTest {
+
+    @TestHTTPEndpoint(GreetingResource.class)  // <1>
+    @TestHTTPResource
+    URL url;
+
+    @Test
+    public void testIndexHtml() throws Exception {
+        try (InputStream in = url.openStream()) {
+            String contents = readStream(in);
+            Assertions.assertTrue(contents.equals("hello"));
+        }
+    }
+
+    private static String readStream(InputStream in) throws IOException {
+        byte[] data = new byte[1024];
+        int r;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        while ((r = in.read(data)) > 0) {
+            out.write(data, 0, r);
+        }
+        return new String(out.toByteArray(), StandardCharsets.UTF_8);
+    }
+}
+----
+<1> Because `GreetingResource` is annotated with `@Path("/hello")` the injected URL
+will end with `/hello`.
+
+=== RESTassured
+
+To control the RESTassured base path (i.e. the default path that serves as the root for every
+request) you can use the `io.quarkus.test.common.http.TestHTTPEndpoint` annotation. This can
+be applied at the class or method level. To test out greeting resource we would do:
+
+[source,java]
+----
+package org.acme.getting.started.testing;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.common.http.TestHTTPEndpoint;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+@TestHTTPEndpoint(GreetingResource.class) //<1>
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        when().get()    //<2>
+          .then()
+             .statusCode(200)
+             .body(is("hello"));
+    }
+}
+----
+<1> This tells RESTAssured to prefix all requests with `/hello`.
+<2> Note we don't need to specify a path here, as `/hello` is the default for this test
+
 == Injection into tests
 
 So far we have only covered integration style tests that test the app via HTTP endpoints, but what if we want to do unit
@@ -303,14 +424,24 @@ public class TestStereotypeTestCase {
 }
 ----
 
+== Tests and Transactions
+
+You can use the standard Quarkus `@Transactional` annotation on tests, but this means that the changes your
+test makes to the database will be persistent. If you want any changes made to be rolled back at the end of
+the test you can use the `io.quarkus.test.TestTransaction` annotation. This will run the test method in a
+transaction, but roll it back once the test method is complete to revert any database changes.
+
 == Enrichment via QuarkusTest*Callback
 
 Alternatively or additionally to an interceptor, you can enrich *all* your `@QuarkusTest` classes by implementing the following callback interfaces:
 
-* `io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback`
+* `io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback`
+* `io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback`
 * `io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback`
 * `io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback`
 
+WARNING: `io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback` has been deprecated in favor of `io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback` and will be removed in future releases of Quarkus
+
 Such a callback implementation has to be registered as a "service provider" as defined by `java.util.ServiceLoader`.
 
 E.g. the following sample callback:
@@ -363,10 +494,12 @@ To implement a test profile we need to implement `io.quarkus.test.junit.QuarkusT
 package org.acme.getting.started.testing;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.QuarkusTestProfile.TestResourceEntry;
 
 public class MockGreetingProfile implements QuarkusTestProfile {
 
@@ -385,17 +518,122 @@ public class MockGreetingProfile implements QuarkusTestProfile {
     public String getConfigProfile() { <3>
         return "test";
     }
+
+    @Override
+    public List<TestResourceEntry> testResources() { <4>
+        return Collections.singletonList(new TestResourceEntry(CustomWireMockServerManager.class));
+    }
 }
 ----
 <1> This method allows us to override configuration properties. Here we are changing the JAX-RS root path.
 <2> This method allows us to enable CDI `@Alternative` beans. This makes it easy to mock out certain beans functionality.
 <3> This can be used to change the config profile. As this default is `test` this does nothing, but is included for completeness.
+<4> This method allows us to apply **additional** `QuarkusTestResourceLifecycleManager` classes, specific for this profile only. If this
+method is not overridden, then only the `QuarkusTestResourceLifecycleManager` classes enabled via the `@QuarkusTestResource` class
+annotation will be used for the tests using this profile (which is the same behavior as tests that don't use a profile at all).
 
 Now we have defined our profile we need to include it on our test class. We do this with `@TestProfile(MockGreetingProfile.class)`.
 
 All the test profile config is stored in a single class, which makes it easy to tell if the previous test ran with the
 same configuration.
 
+=== Running specific tests
+
+Quarkus provides the ability to limit test execution to tests with specific  `@TestProfile` annotations.
+This works by leveraging the `tags` method of `QuarkusTestProfile` in conjunction with the `quarkus.test.profile.tags` system property.
+
+Essentially, any `QuarkusTestProfile` with at least one matching tag matching the value of `quarkus.test.profile.tags` will be considered active
+and all the tests annotated with `@TestProfile` of active profiles, will be run while the rest will be skipped.
+This is best shown in the following example.
+
+First let's define a few `QuarkusTestProfile` implementations like so:
+[source,java]
+----
+public class Profiles {
+
+    public static class NoTags implements QuarkusTestProfile {
+
+    }
+
+    public static class SingleTag implements QuarkusTestProfile {
+        @Override
+        public Set<String> tags() {
+            return Collections.singleton("test1");
+        }
+    }
+
+    public static class MultipleTags implements QuarkusTestProfile {
+        @Override
+        public Set<String> tags() {
+            return new HashSet<>(Arrays.asList("test1", "test2"));
+        }
+    }
+}
+----
+
+Now let's assume that we have the following tests:
+
+[source,java]
+----
+@QuarkusTest
+public class NoQuarkusProfileTest {
+
+    @Test
+    public void test() {
+        // test something
+    }
+}
+----
+
+[source,java]
+----
+@QuarkusTest
+@TestProfile(Profiles.NoTags.class)
+public class NoTagsTest {
+
+    @Test
+    public void test() {
+        // test something
+    }
+}
+----
+
+[source,java]
+----
+@QuarkusTest
+@TestProfile(Profiles.SingleTag.class)
+public class SingleTagTest {
+
+    @Test
+    public void test() {
+        // test something
+    }
+}
+----
+
+[source,java]
+----
+@QuarkusTest
+@TestProfile(Profiles.MultipleTags.class)
+public class MultipleTagsTest {
+
+    @Test
+    public void test() {
+        // test something
+    }
+}
+----
+
+Let's consider the following scenarios:
+
+* `quarkus.test.profile.tags` is not set: All tests will be executed.
+* `quarkus.test.profile.tags=foo`: In this case none of tests will be executed because none of the tags defined on the `QuarkusTestProfile` implementations match the value of `quarkus.test.profile.tags`.
+Note that `NoQuarkusProfileTest` is not executed either because it is not annotated with `@TestProfile`.
+* `quarkus.test.profile.tags=test1`: In this case `SingleTagTest` and `MultipleTagsTest` will be run because the tags on their respective `QuarkusTestProfile` implementations
+match the value of `quarkus.test.profile.tags`.
+* `quarkus.test.profile.tags=test1,test3`: This case results in the same tests being executed as the previous case.
+* `quarkus.test.profile.tags=test2,test3`: In this case only `MultipleTagsTest` will be run because `MultipleTagsTest` is the only `QuarkusTestProfile` implementation whose `tags` method
+matches the value of `quarkus.test.profile.tags`.
 
 == Mock Support
 
@@ -443,6 +681,7 @@ it will take effect all the time, not just when testing.
 Note that at present this approach does not work with native image testing, as this would required the test alternatives
 to be baked into the native image.
 
+[[quarkus_mock]]
 === Mocking using QuarkusMock
 
 The `io.quarkus.test.junit.QuarkusMock` class can be used to temporarily mock out any normal scoped
@@ -480,7 +719,7 @@ public class MockTestCase {
 
     @Test
     public void testPerTestMock() {
-        QuarkusMock.installMockForInstance(new BonourGreeter(), mockableBean2); // <2>
+        QuarkusMock.installMockForInstance(new BonjourGreeter(), mockableBean2); // <2>
         Assertions.assertEquals("A mock for Stuart", mockableBean1.greet("Stuart"));
         Assertions.assertEquals("Bonjour Stuart", mockableBean2.greet("Stuart"));
     }
@@ -501,7 +740,7 @@ public class MockTestCase {
         }
     }
 
-    public static class BonourGreeter extends MockableBean2 {
+    public static class BonjourGreeter extends MockableBean2 {
         @Override
         public String greet(String name) {
             return "Bonjour " + name;
@@ -737,7 +976,7 @@ If you are using the `quarkus-hibernate-orm-panache` or `quarkus-mongodb-panache
 
 == Testing Security
 
-If you are using Quarkus Security, check out the link:security.adoc#testing-security[Testing Security] section for information on how to easily test security features of the application.
+If you are using Quarkus Security, check out the link:security-testing[Testing Security] section for information on how to easily test security features of the application.
 
 [#quarkus-test-resource]
 == Starting services before the Quarkus application starts
@@ -745,12 +984,80 @@ If you are using Quarkus Security, check out the link:security.adoc#testing-secu
 A very common need is to start some services on which your Quarkus application depends, before the Quarkus application starts for testing. To address this need, Quarkus provides `@io.quarkus.test.common.QuarkusTestResource` and `io.quarkus.test.common.QuarkusTestResourceLifecycleManager`.
 
 By simply annotating any test in the test suite with `@QuarkusTestResource`, Quarkus will run the corresponding `QuarkusTestResourceLifecycleManager` before any tests are run.
-A test suite is also free to utilize multiple `@QuarkusTestResource` annotations, in which case all the corresponding `QuarkusTestResourceLifecycleManager` objects will be run before the tests.
+A test suite is also free to utilize multiple `@QuarkusTestResource` annotations, in which case all the corresponding `QuarkusTestResourceLifecycleManager` objects will be run before the tests. When using multiple test resources they can be started concurrently. For that you need to set `@QuarkusTestResource(parallel = true)`.
+
+NOTE: test resources are global, even if they are defined on a test class or custom profile, which means they will all be activated for all tests, even though we do
+remove duplicates. If you want to only enable a test resource on a single test class or test profile, you can use `@QuarkusTestResource(restrictToAnnotatedClass = true)`.
 
 Quarkus provides a few implementations of `QuarkusTestResourceLifecycleManager` out of the box (see `io.quarkus.test.h2.H2DatabaseTestResource` which starts an H2 database, or `io.quarkus.test.kubernetes.client.KubernetesMockServerTestResource` which starts a mock Kubernetes API server),
 but it is common to create custom implementations to address specific application needs.
-Common cases include starting docker containers using https://www.testcontainers.org/[Testcontainers] (an example of which can be found https://github.com/quarkusio/quarkus-quickstarts/blob/master/kafka-quickstart/src/test/java/org/acme/kafka/KafkaResource.java[here]),
-or starting a mock HTTP server using http://wiremock.org/[Wiremock] (an example of which can be found https://github.com/geoand/quarkus-test-demo/blob/master/src/test/java/org/acme/getting/started/country/WiremockCountries.java[here]).
+Common cases include starting docker containers using https://www.testcontainers.org/[Testcontainers] (an example of which can be found https://github.com/quarkusio/quarkus-quickstarts/blob/main/kafka-quickstart/src/test/java/org/acme/kafka/KafkaResource.java[here]),
+or starting a mock HTTP server using http://wiremock.org/[Wiremock] (an example of which can be found https://github.com/geoand/quarkus-test-demo/blob/main/src/test/java/org/acme/getting/started/country/WiremockCountries.java[here]).
+
+=== Annotation-based test resources
+
+It is possible to write test resources that are enabled and configured using annotations. This is enabled by placing the `@QuarkusTestResource`
+on an annotation which will be used to enable and configure the test resource.
+
+For example, this defines the `@WithKubernetesTestServer` annotation, which you can use on your tests to activate the `KubernetesServerTestResource`,
+but only for the annotated test class. You can also place them on your `QuarkusTestProfile` test profiles.
+
+[source,java]
+----
+@QuarkusTestResource(KubernetesServerTestResource.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface WithKubernetesTestServer {
+    /**
+     * Start it with HTTPS
+     */
+    boolean https() default false;
+
+    /**
+     * Start it in CRUD mode
+     */
+    boolean crud() default true;
+
+    /**
+     * Port to use, defaults to any available port
+     */
+    int port() default 0;
+}
+----
+
+The `KubernetesServerTestResource` class has to implement the
+`QuarkusTestResourceConfigurableLifecycleManager` interface in order to be configured using the previous annotation:
+
+[source,java]
+----
+public class KubernetesServerTestResource
+        implements QuarkusTestResourceConfigurableLifecycleManager<WithKubernetesTestServer> {
+
+    private boolean https = false;
+    private boolean crud = true;
+    private int port = 0;
+
+    @Override
+    public void init(WithKubernetesTestServer annotation) {
+        this.https = annotation.https();
+        this.crud = annotation.crud();
+        this.port = annotation.port();
+    }
+
+    // ...
+}
+----
+
+== Hang Detection
+
+`@QuarkusTest` has support for hang detection to help diagnose any unexpected hangs. If no progress is made for a specified
+time (i.e. no JUnit callbacks are invoked) then Quarkus will print a stack trace to the console to help diagnose the hang.
+The default value for this timeout is 10 minutes.
+
+No further action will be taken, and the tests will continue as normal (generally until CI times out), however the printed
+stack traces should help diagnose why the build has failed. You can control this timeout with the
+`quarkus.test.hang-detection-timeout` system property (you can also set this in application.properties, but this won't
+be read until Quarkus has started, so the timeout for Quarkus start will be the default of 10 minutes).
 
 == Native Executable Testing
 
@@ -760,6 +1067,23 @@ guide except injecting into tests (and the native executable runs in a separate
 
 This is covered in the link:building-native-image[Native Executable Guide].
 
+[WARNING]
+====
+Although `@NativeImageTest` is not yet deprecated, it will be in the future as it's functionality is covered by `@QuarkusIntegrationTest`
+which is described in the following section.
+====
+
+[#quarkus-integration-test]
+== Using @QuarkusIntegrationTest
+
+`@QuarkusIntegrationTest` should be used to launch and test the artifact produced by the Quarkus build, and supports testing a jar (of whichever type), a native image or container-image.
+Put simply, this means that if the result of a Quarkus build (`mvn package` or `gradle build`) is a jar, that jar will be launched as `java -jar ...` and tests run against it.
+If instead a native image was build, then the application is launched as `./application ...` and again the tests run against the running application.
+Finally, if a container image was created during the build (by using including the `quarkus-container-image-jib` or `quarkus-container-image-docker` extensions and having the
+`quarkus.container-image.build=true` property configured), then a container is created and run (this requires the `docker` executable being present).
+
+As is the case with `@NativeImageTest`, this is a black box test that supports the same set features and has the same limitations.
+
 [[test-from-ide]]
 == Running `@QuarkusTest` from an IDE
 
@@ -767,7 +1091,7 @@ Most IDEs offer the possibility to run a selected class as JUnit test directly.
 
 * `java.util.logging.manager` (see link:logging[Logging Guide])
 
-* `maven.home` (only if there are any custom settings in `${maven.home}/conf/settings.mxl`, see link:maven-tooling[Maven Guide])
+* `maven.home` (only if there are any custom settings in `${maven.home}/conf/settings.xml`, see link:maven-tooling[Maven Guide])
 
 * `maven.settings` (in case a custom version of `settings.xml` file should be used for the tests)
 
diff --git a/docs/src/main/asciidoc/getting-started.adoc b/docs/src/main/asciidoc/getting-started.adoc
index 377816b396422..3a1e60df3d615 100644
--- a/docs/src/main/asciidoc/getting-started.adoc
+++ b/docs/src/main/asciidoc/getting-started.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Creating Your First Application
 
@@ -56,18 +56,18 @@ This guide also covers the testing of the endpoint.
 
 == Solution
 
-We recommend that you follow the instructions from <<bootstrapping-the-project,Boostrapping project>> and onwards to create the application step by step.
+We recommend that you follow the instructions from <<bootstrapping-the-project,Bootstrapping project>> and onwards to create the application step by step.
 
 However, you can go right to the completed example.
 
 Download an {quickstarts-archive-url}[archive] or clone the git repository:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 git clone {quickstarts-clone-url}
 ----
 
-The solution is located in the `getting-started` directory.
+The solution is located in the `getting-started` {quickstarts-tree-url}/getting-started[directory].
 
 == Bootstrapping the project
 
@@ -75,7 +75,7 @@ The easiest way to create a new Quarkus project is to open a terminal and run th
 
 For Linux & MacOS users
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
@@ -87,16 +87,16 @@ cd getting-started
 
 For Windows users
 
-- If using cmd , (don't use forward slash `\`)
+- If using cmd , (don't use backward slash `\`)
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create -DprojectGroupId=org.acme -DprojectArtifactId=getting-started -DclassName="org.acme.getting.started.GreetingResource" -Dpath="/hello"
 ----
 
 - If using Powershell , wrap `-D` parameters in double quotes
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create "-DprojectGroupId=org.acme" "-DprojectArtifactId=getting-started" "-DclassName=org.acme.getting.started.GreetingResource" "-Dpath=/hello"
 ----
@@ -120,8 +120,8 @@ In addition, you can see the `quarkus-maven-plugin` responsible of the packaging
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bom</artifactId>
-            <version>${quarkus.version}</version>
+            <artifactId>quarkus-universe-bom</artifactId>
+            <version>${quarkus.platform.version}</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -133,11 +133,14 @@ In addition, you can see the `quarkus-maven-plugin` responsible of the packaging
         <plugin>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus.version}</version>
+            <version>${quarkus-plugin.version}</version>
+            <extensions>true</extensions>
             <executions>
                 <execution>
                     <goals>
                         <goal>build</goal>
+                        <goal>generate-code</goal>
+                        <goal>generate-code-tests</goal>
                     </goals>
                 </execution>
             </executions>
@@ -198,7 +201,7 @@ Use: `./mvnw compile quarkus:dev`:
 ----
 $ ./mvnw compile quarkus:dev
 [INFO] --------------------< org.acme:getting-started >---------------------
-[INFO] Building getting-started 1.0-SNAPSHOT
+[INFO] Building getting-started 1.0.0-SNAPSHOT
 [INFO] --------------------------------[ jar ]---------------------------------
 [INFO]
 [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ getting-started ---
@@ -219,10 +222,11 @@ Listening for transport dt_socket at address: 5005
 
 Once started, you can request the provided endpoint:
 
-```
+[source,shell]
+----
 $ curl -w "\n" http://localhost:8080/hello
 hello
-```
+----
 
 Hit `CTRL+C` to stop the application, or keep it running and enjoy the blazing fast hot-reload.
 
@@ -235,7 +239,9 @@ We are using `curl -w "\n"` in this example to avoid your terminal printing a '%
 == Using injection
 
 Dependency injection in Quarkus is based on ArC which is a CDI-based dependency injection solution tailored for Quarkus' architecture.
-You can learn more about it in the link:cdi-reference[Contexts and Dependency Injection guide].
+If you're new to CDI then we recommend you to read the link:cdi[Introduction to CDI] guide.
+
+Quarkus only implements a subset of the CDI features and comes with non-standard features and specific APIS, you can learn more about it in the link:cdi-reference[Contexts and Dependency Injection guide].
 
 ArC comes as a dependency of `quarkus-resteasy` so you already have it handy.
 
@@ -404,7 +410,7 @@ These tests use http://rest-assured.io/[RestAssured], but feel free to use your
 
 You can run these using Maven:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw test
 ----
@@ -429,7 +435,7 @@ property called `test.url` that is set to the base test URL for situations where
 
 == Working with multi-module project or external modules
 
-Quarkus heavily utilizes https://github.com/wildfly/jandex[Jandex] at build time, to discover various classes or annotations. One immediately recongizable application of this, is CDI bean discovery.
+Quarkus heavily utilizes https://github.com/wildfly/jandex[Jandex] at build time, to discover various classes or annotations. One immediately recognizable application of this, is CDI bean discovery.
 As a result, most of the Quarkus extensions will not work properly if this build time discovery isn't properly setup.
 
 This index is created by default on the project on which Quarkus is configured for, thanks to our Maven and Gradle plugins.
@@ -446,20 +452,35 @@ Be sure to read the link:cdi-reference#bean_discovery[Bean Discovery] section of
 == Packaging and run the application
 
 The application is packaged using `./mvnw package`.
-It produces 2 jar files in `/target`:
+It produces several outputs in `/target`:
 
-* `getting-started-1.0-SNAPSHOT.jar` - containing just the classes and resources of the projects, it's the regular
-artifact produced by the Maven build;
-* `getting-started-1.0-SNAPSHOT-runner.jar` - being an executable _jar_. Be aware that it's not an _über-jar_ as
-the dependencies are copied into the `target/lib` directory.
+* `getting-started-1.0.0-SNAPSHOT.jar` - containing just the classes and resources of the projects, it's the regular
+artifact produced by the Maven build - it is *not* the runnable jar;
+* the `quarkus-app` directory which contains the `quarkus-run.jar` jar file - being an executable _jar_. Be aware that it's not an _über-jar_ as
+the dependencies are copied into subdirectories of `quarkus-app/lib/`.
 
-You can run the application using: `java -jar target/getting-started-1.0-SNAPSHOT-runner.jar`
+You can run the application using: `java -jar target/quarkus-app/quarkus-run.jar`
 
-NOTE: The `Class-Path` entry of the `MANIFEST.MF` from the _runner jar_ explicitly lists the jars from the `lib` directory.
-So if you want to deploy your application somewhere, you need to copy the _runner_ jar as well as the _lib_ directory.
+NOTE: If you want to deploy your application soemwhere (typically in a container), you need to deploy the whole `quarkus-app` directory.
 
 NOTE: Before running the application, don't forget to stop the hot reload mode (hit `CTRL+C`), or you will have a port conflict.
 
+=== Using fast-jar
+
+The previous section assumes that the configuration property `quarkus.package.type` has either not been configured explicitly,
+or that it has been set to `legacy-jar` (in `application.properties` or any of the other supported configuration sources).
+When the property has been set to `fast-jar` (which will become in Quarkus 1.12), then the result of executing
+`./mvnw package` is a new directory under `target` named `quarkus-app`.
+
+You can run the application using: `java -jar target/quarkus-app/quarkus-run.jar`.
+
+WARNING: In order to successfully run the produced jar, you need to have the entire contents of the `quarkus-app` directory. If any of the files are missing, the application will not start or
+might not function correctly.
+
+TIP: The `fast-jar` packaging results in creating an artifact that starts a little faster and consumes slightly less memory than a legacy Quarkus jar
+because it has indexed information about which dependency jar contains classes and resources. It can thus avoid the lookup into potentially every jar
+on the classpath that the legacy jar necessitates, when loading a class or resource.
+
 [#banner]
 == Configuring the banner
 
diff --git a/docs/src/main/asciidoc/gradle-config.adoc b/docs/src/main/asciidoc/gradle-config.adoc
index f82b083dd34dc..fc3cb980093b5 100644
--- a/docs/src/main/asciidoc/gradle-config.adoc
+++ b/docs/src/main/asciidoc/gradle-config.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Gradle Plugin Repositories
 
diff --git a/docs/src/main/asciidoc/gradle-tooling.adoc b/docs/src/main/asciidoc/gradle-tooling.adoc
index 891c91192cc96..eb2f0361e6aad 100644
--- a/docs/src/main/asciidoc/gradle-tooling.adoc
+++ b/docs/src/main/asciidoc/gradle-tooling.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Building Quarkus apps with Gradle
 
@@ -9,7 +9,7 @@ include::./attributes.adoc[]
 
 CAUTION: Quarkus Gradle support is considered preview.
 You can use Gradle to create Quarkus projects as outlined in our guides. If you go beyond there will be cases where
-the Gradle tasks https://github.com/quarkusio/quarkus/issues/5101[does not behave as expected].
+the Gradle tasks https://github.com/quarkusio/quarkus/issues/10189[does not behave as expected].
 This is just a caution, and we recommend if you like Gradle you try it out and give us feedback.
 
 [[project-creation]]
@@ -17,14 +17,14 @@ This is just a caution, and we recommend if you like Gradle you try it out and g
 
 The easiest way to scaffold a Gradle project, is currently to use the Quarkus Maven plugin like so:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=my-groupId \
     -DprojectArtifactId=my-artifactId \
     -DprojectVersion=my-version \
     -DclassName="org.my.group.MyResource" \
-    -Dextensions="resteasy-jsonb" \
+    -Dextensions="resteasy,resteasy-jackson" \
     -DbuildTool=gradle
 ----
 
@@ -55,7 +55,7 @@ The following table lists the attributes you can pass to the `create` command:
 | The artifact id of the created project. Not passing it triggers the interactive mode.
 
 | `projectVersion`
-| `1.0-SNAPSHOT`
+| `1.0.0-SNAPSHOT`
 | The version of the created project
 
 | `className`
@@ -120,14 +120,14 @@ It is not possible to use a custom test configuration profile in native mode for
 
 From inside a Quarkus project, you can obtain a list of the available extensions with:
 
-[source,shell]
+[source,bash]
 ----
 ./gradlew listExtensions
 ----
 
 You can enable an extension using:
 
-[source,shell]
+[source,bash]
 ----
 ./gradlew addExtension --extensions="hibernate-validator"
 ----
@@ -141,7 +141,7 @@ If no extension is found or if more than one extensions match, you will see a re
 
 [source,shell]
 ----
-./gradlew addExtension --extensions="jdbc,agroal,non-exist-ent"
+$ ./gradlew addExtension --extensions="jdbc,agroal,non-exist-ent"
 [...]
 ❌ Multiple extensions matching 'jdbc'
      * io.quarkus:quarkus-jdbc-h2
@@ -155,7 +155,7 @@ If no extension is found or if more than one extensions match, you will see a re
 
 You can install all extensions which match a globbing pattern:
 
-[source,shell]
+[source,bash]
 ----
 ./gradlew addExtension --extensions="hibernate*"
 ----
@@ -165,7 +165,7 @@ You can install all extensions which match a globbing pattern:
 Quarkus comes with a built-in development mode.
 Run your application with:
 
-[source,shell]
+[source,bash]
 ----
 ./gradlew quarkusDev
 ----
@@ -197,6 +197,25 @@ quarkusDev {
 By default, the `quarkusDev` task uses `compileJava` compiler options. These can be overridden by setting the `compilerArgs` property in the task.
 ====
 
+[NOTE]
+====
+By default, `quarkusDev` sets the debug host to `localhost` (for security reasons). If you need to change this, for example to enable debugging on all hosts, you can use the `-DdebugHost` option like so:
+
+[source,bash]
+----
+./gradlew quarkusDev -DdebugHost=0.0.0.0
+----
+====
+The plugin also exposes a `quarkusDev` configuration. Using this configuration to declare a dependency will restrict the usage of that dependency to development mode.
+The `quarkusDev` configuration can be used as following:
+
+[source,groovy]
+----
+dependencies {
+    quarkusDev 'io.quarkus:quarkus-jdbc-h2'
+}
+----
+
 === Remote Development Mode
 
 It is possible to use development mode remotely, so that you can run Quarkus in a container environment (such as OpenShift)
@@ -206,24 +225,42 @@ This allows you to develop in the same environment you will actually run your ap
 
 WARNING: Do not use this in production. This should only be used in a development environment. You should not run production applications in dev mode.
 
-To do this you must have the `quarkus-undertow-websockets` extension installed:
+To do this you must build a mutable application, using the `mutable-jar` format. Set the following properties in `application.properties`:
 
-[source,shell]
+[source,properties]
 ----
-./gradlew addExtension --extensions="undertow-websockets"
+quarkus.package.type=mutable-jar <1>
+quarkus.live-reload.password=changeit <2>
+quarkus.live-reload.url=http://my.cluster.host.com:8080 <3>
 ----
+<1> This tells Quarkus to use the mutable-jar format. Mutable applications also include the deployment time parts of Quarkus,
+so they take up a bit more disk space. If run normally they start just as fast and use the same memory as an immutable application,
+however they can also be started in dev mode.
+<2> The password that is used to secure communication between the remote side and the local side.
+<3> The URL that your app is going to be running in dev mode at. This is only needed on the local side, so you
+may want to leave it out of the properties file and specify it as a system property on the command line.
 
-You must also have the following config properties set:
+The `mutable-jar` is then built in the same way that a regular Quarkus jar is built, i.e. by issuing:
 
-- `quarkus.live-reload.password`
-- `quarkus.live-reload.url`
+[source,bash]
+----
+./gradlew build
+----
 
-These can be set via `application.properties`, or any other way (e.g. system properties, environment vars etc). The
-password must be set on both the local and remote processes, while the url only needs to be set on the local host.
+Before you start Quarkus on the remote host set the environment variable `QUARKUS_LAUNCH_DEVMODE=true`. If you are
+on bare metal you can set it via the `export QUARKUS_LAUNCH_DEVMODE=true` command and then run the application with the proper `java -jar ...` command to run the application.
 
-Start Quarkus in dev mode on the remote host. Now you need to connect your local agent to the remote host:
+If you plan on running the application via Docker, then you'll need to add `-e QUARKUS_LAUNCH_DEVMODE=true` to the `docker run` command.
+When the application starts you should now see the following line in the logs: `Profile dev activated. Live Coding activated`.
 
-[source,shell]
+
+NOTE: The remote side does not need to include Maven or any other development tools. The normal `fast-jar` Dockerfile
+that is generated with a new Quarkus application is all you need. If you are using bare metal launch the Quarkus runner
+jar, do not attempt to run normal devmode.
+
+Now you need to connect your local agent to the remote host, using the `remote-dev` command:
+
+[source,bash]
 ----
 ./gradlew quarkusRemoteDev -Dquarkus.live-reload.url=http://my-remote-host:8080
 ----
@@ -231,6 +268,10 @@ Start Quarkus in dev mode on the remote host. Now you need to connect your local
 Now every time you refresh the browser you should see any changes you have made locally immediately visible in the remote
 app.
 
+All the config options are shown below:
+
+include::{generated-dir}/config/quarkus-live-reload-live-reload-config.adoc[opts=optional, leveloffset=+1]
+
 == Debugging
 
 In development mode, Quarkus starts by default with debug mode enabled, listening to port `5005` without suspending the JVM.
@@ -298,7 +339,7 @@ Open the project directory in VS Code. If you have installed the Java Extension
 
 Native executables make Quarkus applications ideal for containers and serverless workloads.
 
-Make sure to have `GRAALVM_HOME` configured and pointing to GraalVM version {graalvm-version}.
+Make sure to have `GRAALVM_HOME` configured and pointing to GraalVM version {graalvm-version} (Make sure to use a Java 11 version of GraalVM).
 
 Create a native executable using: `./gradlew build -Dquarkus.package.type=native`.
 A native executable will be present in `build/`.
@@ -322,16 +363,35 @@ quarkusBuild {
 }
 ----
 
+or if you are using the Gradle Kotlin DSL:
+
+[source,kotlin,subs=attributes+]
+----
+tasks.quarkusBuild {
+    nativeArgs {
+        "container-build" to true <1>
+        "buildImage" to "quay.io/quarkus/ubi-quarkus-native-image:{graalvm-flavor}" <2>
+        "quarkus.native.java-home" to "/opt/java-11/"
+    }
+}
+----
+
 <1> Set `quarkus.native.containerBuild` property to `true`
 <2> Set `quarkus.native.buildImage` property to `quay.io/quarkus/ubi-quarkus-native-image:{graalvm-flavor}`
 
+[WARNING]
+====
+When using the Gradle Groovy DSL, property keys must follow lower camel case notation.
+e.g. `container-build` is not valid, and should be replaced by `containerBuild`.
+This limitation does not apply to the Gradle Kotlin DSL.
+====
 
 === Build a container friendly executable
 
 The native executable will be specific to your operating system.
 To create an executable that will run in a container, use the following:
 
-[source,shell]
+[source,bash]
 ----
 ./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
 ----
@@ -355,27 +415,55 @@ Be aware that a given Quarkus version might not be compatible with all the image
 
 Run the native tests using:
 
-[source,shell]
+[source,bash]
 ----
 ./gradlew testNative
 ----
 
 This task depends on `quarkusBuild`, so it will generate the native image before running the tests.
 
+[NOTE]
+====
+By default, the `native-test` source set is based on `main` and `test` source sets. It is possible to add an extra source set. For example, if your integration tests are located in an `integrationTest` source set, you can specify it as:
+
+[source,groovy]
+----
+quarkus {
+    sourceSets {
+        extraNativeTest = sourceSets.integrationTest
+    }
+}
+----
+
+====
+
+== Using fast-jar
+
+`fast-jar` is now the default quarkus package type. The result of `./gradlew build` command is a new directory under `build` named `quarkus-app`.
+
+You can run the application using: `java -jar target/quarkus-app/quarkus-run.jar`.
+
+WARNING: In order to successfully run the produced jar, you need to have the entire contents of the `quarkus-app` directory. If any of the files are missing, the application will not start or
+might not function correctly.
+
+TIP: The `fast-jar` packaging results in creating an artifact that starts a little faster and consumes slightly less memory than a legacy Quarkus jar
+because it has indexed information about which dependency jar contains classes and resources. It can thus avoid the lookup into potentially every jar
+on the classpath that the legacy jar necessitates, when loading a class or resource.
+
 == Building Uber-Jars
 
-Quarkus Gradle plugin supports the generation of Uber-Jars by specifying an `--uber-jar` argument as follows:
+Quarkus Gradle plugin supports the generation of Uber-Jars by specifying a `quarkus.package.type` argument as follows:
 
-[source,shell]
+[source,bash]
 ----
-./gradlew quarkusBuild --uber-jar
+./gradlew quarkusBuild -Dquarkus.package.type=uber-jar
 ----
 
 When building an Uber-Jar you can specify entries that you want to exclude from the generated jar by using the `--ignored-entry` argument:
 
-[source,shell]
+[source,bash]
 ----
-./gradlew quarkusBuild --uber-jar --ignored-entry=META-INF/file1.txt
+./gradlew quarkusBuild -Dquarkus.package.type=uber-jar --ignored-entry=META-INF/file1.txt
 ----
 
 The entries are relative to the root of the generated Uber-Jar. You can specify multiple entries by adding extra `--ignored-entry` arguments.
@@ -388,7 +476,7 @@ By default, Quarkus will not discover CDI beans inside another module.
 The best way to enable CDI bean discovery for a module in a multi-module project would be to include a `META-INF/beans.xml` file,
 unless it is the main application module already configured with the quarkus-maven-plugin, in which case it will indexed automatically.
 
-Alternatively, there is some unofficial link:https://plugins.gradle.org/search?term=jandex[Gradle Jandex plugins]) that can be used instead of the `META-INF/beans.xml` file.
+Alternatively, there is some unofficial link:https://plugins.gradle.org/search?term=jandex[Gradle Jandex plugins] that can be used instead of the `META-INF/beans.xml` file.
 
 More information on this topic can be found on the link:cdi-reference#bean_discovery[Bean Discovery] section of the CDI guide.
 
diff --git a/docs/src/main/asciidoc/grpc-getting-started.adoc b/docs/src/main/asciidoc/grpc-getting-started.adoc
index ae0ed1717d720..e19de7e4cea90 100644
--- a/docs/src/main/asciidoc/grpc-getting-started.adoc
+++ b/docs/src/main/asciidoc/grpc-getting-started.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Getting Started with gRPC
 
@@ -25,7 +25,9 @@ Edit the `pom.xml` file to add the Quarkus gRPC extension dependency (just under
 </dependency>
 ----
 
-Make sure you have `prepare` goal of `quarkus-maven-plugin` enabled in your `pom.xml`:
+Make sure you have `generate-code` goal of `quarkus-maven-plugin` enabled in your `pom.xml`.
+If you wish to generate code from different `proto` files for tests, also add the `generate-code-tests` goal.
+Please note that no additional task/goal is required for the Gradle plugin.
 
 [source,xml]
 ----
@@ -34,11 +36,14 @@ Make sure you have `prepare` goal of `quarkus-maven-plugin` enabled in your `pom
         <plugin>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-maven-plugin</artifactId>
+            <version>${quarkus-plugin.version}</version>
+            <extensions>true</extensions>
             <executions>
                 <execution>
                     <goals>
-                        <goal>prepare</goal>
                         <goal>build</goal>
+                        <goal>generate-code</goal>
+                        <goal>generate-code-tests</goal>
                     </goals>
                 </execution>
             </executions>
@@ -49,12 +54,17 @@ Make sure you have `prepare` goal of `quarkus-maven-plugin` enabled in your `pom
 
 With this configuration, you can put your service and message definitions in the `src/main/proto` directory.
 `quarkus-maven-plugin` will generate Java files from your `proto` files.
-Alternatively to using the `prepare` goal of the `quarkus-maven-plugin`, you can use `protobuf-maven-plugin` to generate these files, more in <<Generating Java files from proto with protobuf-maven-plugin>>
+
+`quarkus-maven-plugin` retrieves a version of `protoc` (the protobuf compiler) from Maven repositories. The retrieved version matches your operating system and CPU architecture.
+If this retrieved version does not work in your context, you can download the suitable binary and specify the location via
+`-Dquarkus.grpc.protoc-path=/path/to/protoc`.
+
+Alternatively to using the `generate-code` goal of the `quarkus-maven-plugin`, you can use `protobuf-maven-plugin` to generate these files, more in <<Generating Java files from proto with protobuf-maven-plugin>>
 
 Let's start with a simple _Hello_ service.
 Create the `src/main/proto/helloworld.proto` file with the following content:
 
-[source]
+[source,javascript]
 ----
 syntax = "proto3";
 
@@ -86,36 +96,49 @@ This `proto` file defines a simple service interface with a single method (`SayH
 Before coding, we need to generate the classes used to implement and consume gRPC services.
 In a terminal, run:
 
-[source, bash]
+[source,shell]
 ----
 $ mvn compile
 ----
 
-Once generated, you can look at the `target/generated-sources/protobuf` directory:
+Once generated, you can look at the `target/generated-sources/grpc` directory:
 
-[source, txt]
+[source,txt]
 ----
-target/generated-sources/protobuf
-├── grpc-java
-│   └── io
-│       └── quarkus
-│           └── example
-│               └── GreeterGrpc.java
-└── java
-    └── io
-        └── quarkus
-            └── example
-                ├── HelloReply.java
-                ├── HelloReplyOrBuilder.java
-                ├── HelloRequest.java
-                ├── HelloRequestOrBuilder.java
-                ├── HelloWorldProto.java
-                └── MutinyGreeterGrpc.java
+target/generated-sources/grpc
+└── io
+    └── quarkus
+        └── example
+            ├── GreeterGrpc.java
+            ├── HelloReply.java
+            ├── HelloReplyOrBuilder.java
+            ├── HelloRequest.java
+            ├── HelloRequestOrBuilder.java
+            ├── HelloWorldProto.java
+            └── MutinyGreeterGrpc.java
 ----
 
 These are the classes we are going to use.
 
-IMPORTANT: Every time you update the `proto` files, you need to re-generate the classes (using `mvn compile`).
+
+=== `proto` files with imports
+
+Protocol Buffers specification provides a way to import `proto` files.
+The Quarkus code generation mechanism lets you control the scope of dependencies to scan for possible imports by setting the `quarkus.generate-code.grpc.scan-for-imports` property to one of the following:
+
+- `all` - scan all the dependencies
+- `none` - don't scan the dependencies, use only what is defined in the `src/main/proto` or `src/test/proto`
+- `groupId1:artifactId1,groupId2:artifactId2` - scan only the dependencies with group id and artifact id in the list.
+
+If not specified, the property is set to `com.google.protobuf:protobuf-java`.
+To override it, set the `quarkus.generate-code.grpc.scan-for-imports` property in your pom.xml (or gradle.properties) to the desired value, e.g.
+
+[source,xml]
+----
+<properties>
+  <quarkus.generate-code.grpc.scan-for-imports>all</quarkus.generate-code.grpc.scan-for-imports>
+</properties>
+----
 
 == Implementing a gRPC service
 
@@ -129,7 +152,7 @@ IMPORTANT: Don't use `@ApplicationScoped` as the gRPC service implementation can
 
 Create the `src/main/java/org/acme/HelloService.java` file with the following content:
 
-[source, java]
+[source,java]
 ----
 package org.acme;
 
@@ -153,11 +176,11 @@ public class HelloService extends GreeterGrpc.GreeterImplBase {
 }
 
 ----
-1. Expose your implementation as bean
+1. Expose your implementation as bean.
 2. Extends the `ImplBase` class. This is a generated class.
-3. Implement the methods defined in the service definition (here we have a single method)
-4. Build and send the response
-5. Close the response
+3. Implement the methods defined in the service definition (here we have a single method).
+4. Build and send the response.
+5. Close the response.
 
 Quarkus also provides an additional model with Mutiny, a Reactive Programming API integrated in Quarkus.
 Learn more about Mutiny on the link:getting-started-reactive#mutiny[Getting Started with Reactive guide].
@@ -191,6 +214,11 @@ The main differences are the following:
 * it extends the `ImplBase` from `MutinyGreeterGrpc` instead of `GreeterGrpc`
 * the signature of the method is using Mutiny types
 
+NOTE: If your service implementation logic is blocking (use blocking I/O for example), annotate your method with
+`@Blocking`.
+The `io.smallrye.common.annotation.Blocking` annotation instructs the framework to invoke the
+annotated method on a worker thread instead of the I/O thread (event-loop).
+
 === The gRPC server
 
 The services are _served_ by a _server_.
@@ -243,20 +271,20 @@ public class ExampleResource {
 }
 ----
 
-1. Inject the service and configure its name.This name is used in the application configuration
-2. Use the _blocking_ stub (also a generated class)
-3. Invoke the service
+1. Inject the service and configure its name. This name is used in the application configuration.
+2. Use the _blocking_ stub (also a generated class).
+3. Invoke the service.
 
-We need to configure the application to indicate where is the `hello` service.
+We need to configure the application to indicate where the `hello` service is found.
 In the `src/main/resources/application.properties` file, add the following property:
 
-[source,text]
+[source,properties]
 ----
 quarkus.grpc.clients.hello.host=localhost
 ----
 
-`hello` is the name of the service used in the `@GrpcService` annotation
-`host` configures the service host (here it's localhost).
+- `hello` is the name of the service used in the `@GrpcService` annotation.
+- `host` configures the service host (here it's localhost).
 
 Then, open http://localhost:8080/hello/quarkus in a browser, and you should get `Hello quarkus`!
 
@@ -340,3 +368,5 @@ Then, add to the `build` section the `os-maven-plugin` extension and the `protob
 That's why we use the `os-maven-plugin` to target the executable compatible with the operating system.
 
 NOTE: This configuration instructs the `protobuf-maven-plugin` to generate the default gRPC classes and classes using Mutiny to fit with the Quarkus development experience.
+
+IMPORTANT: When using `protobuf-maven-plugin`, instead of the `quarkus-maven-plugin`, every time you update the `proto` files, you need to re-generate the classes (using `mvn compile`).
diff --git a/docs/src/main/asciidoc/grpc-service-consumption.adoc b/docs/src/main/asciidoc/grpc-service-consumption.adoc
index 6669fda56a54a..d5180ffa09619 100644
--- a/docs/src/main/asciidoc/grpc-service-consumption.adoc
+++ b/docs/src/main/asciidoc/grpc-service-consumption.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Consuming a gRPC Service
 
@@ -160,12 +160,16 @@ Don't forget to replace it with the name you used in in the `@GrpcService` annot
 
 === Enabling TLS
 
-To enable TLS, use the following configuration:
+To enable TLS, use the following configuration.
+Note that all paths in the configuration may either specify a resource on the classpath
+(typically from `src/main/resources` or its subfolder) or an external file.
 
-[source]
+[source,properties]
 ----
 quarkus.grpc.clients.hello.host=localhost
-quarkus.grpc.clients.hello.ssl.trust-store=src/main/resources/tls/ca.pem
+
+# either a path to a classpath resource or to a file:
+quarkus.grpc.clients.hello.ssl.trust-store=tls/ca.pem
 ----
 
 NOTE: When SSL/TLS is configured, `plain-text` is automatically disabled.
@@ -174,11 +178,56 @@ NOTE: When SSL/TLS is configured, `plain-text` is automatically disabled.
 
 To use TLS with mutual authentication, use the following configuration:
 
-[source]
+[source,properties]
 ----
 quarkus.grpc.clients.hello.host=localhost
 quarkus.grpc.clients.hello.plain-text=false
-quarkus.grpc.clients.hello.ssl.certificate=src/main/resources/tls/client.pem
-quarkus.grpc.clients.hello.ssl.key=src/main/resources/tls/client.key
-quarkus.grpc.clients.hello.ssl.trust-store=src/main/resources/tls/ca.pem
+
+# all the following may use either a path to a classpath resource or to a file:
+quarkus.grpc.clients.hello.ssl.certificate=tls/client.pem
+quarkus.grpc.clients.hello.ssl.key=tls/client.key
+quarkus.grpc.clients.hello.ssl.trust-store=tls/ca.pem
+----
+
+== Client Interceptors
+
+You can implement a gRPC client interceptor by implementing an `@ApplicationScoped` bean implementing `io.grpc.ClientInterceptor`:
+
+[source, java]
+----
+@ApplicationScoped
+public class MyInterceptor implements ClientInterceptor {
+
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
+            CallOptions callOptions, Channel next) {
+       // ...
+    }
+}
 ----
+
+TIP: Check the https://grpc.github.io/grpc-java/javadoc/io/grpc/ClientInterceptor.html[ClientInterceptor JavaDoc] to properly implement your interceptor.
+
+When you have multiple client interceptors, you can order them by implementing the `javax.enterprise.inject.spi.Prioritized` interface:
+
+source, java]
+----
+@ApplicationScoped
+public class MyInterceptor implements ClientInterceptor, Prioritized {
+
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
+            CallOptions callOptions, Channel next) {
+       // ...
+    }
+
+    @Override
+    public int getPriority() {
+        return 10;
+    }
+}
+----
+
+Interceptors with the highest priority are called first.
+The default priority, used if the interceptor does not implement the `Prioritized` interface, is `0`.
+
diff --git a/docs/src/main/asciidoc/grpc-service-implementation.adoc b/docs/src/main/asciidoc/grpc-service-implementation.adoc
index 3b85b3b68ed15..8c1024d0f0003 100644
--- a/docs/src/main/asciidoc/grpc-service-implementation.adoc
+++ b/docs/src/main/asciidoc/grpc-service-implementation.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Implementing a gRPC Service
 
@@ -41,7 +41,7 @@ When extending them, you need to override the service methods defined in the ser
 
 To implement a gRPC service using the default gRPC API, create a class extending the default implementation base.
 Then, override the methods defined in the service interface.
-Finally, expose the service as a CDI bean using the `@Singleton` annotation:
+Finally, implement the service as a CDI bean using the `@Singleton` annotation:
 
 [source, java]
 ----
@@ -65,7 +65,7 @@ public class HelloService extends GreeterGrpc.GreeterImplBase {
 To implement a gRPC service using the Mutiny gRPC API, create a class extending the Mutiny implementation base.
 Then, override the methods defined in the service interface.
 These methods are using Mutiny types.
-Finally, expose the service as a CDI bean using the `@Singleton` annotation:
+Finally, implement the service as a CDI bean using the `@Singleton` annotation:
 
 [source, java]
 ----
@@ -83,6 +83,21 @@ public class ReactiveHelloService extends MutinyGreeterGrpc.GreeterImplBase {
 }
 ----
 
+== Blocking service implementation
+
+By default, all the methods from a gRPC service run on the event loop.
+As a consequence, you must **not** block.
+If your service logic must block, annotate the method with `io.smallrye.common.annotation.Blocking`:
+
+[source, java]
+----
+@Override
+@Blocking
+public Uni<HelloReply> sayHelloBlocking(HelloRequest request) {
+    // Do something blocking before returning the Uni
+}
+----
+
 == Handling streams
 
 gRPC allows receiving and returning streams:
@@ -135,7 +150,7 @@ public class StreamingService extends MutinyStreamingGrpc.StreamingImplBase {
 ----
 
 == Health check
-For the exposed services, Quarkus gRPC exposes health information in the following format:
+For the implemented services, Quarkus gRPC exposes health information in the following format:
 [source,protobuf]
 ----
 syntax = "proto3";
@@ -169,7 +184,7 @@ For more details, check out the
 https://github.com/grpc/grpc/blob/v1.28.1/doc/health-checking.md[gRPC documentation]
 
 Additionally, if Quarkus SmallRye Health is added to the application, a readiness check for
-the state of the gRPC services will be added to the MicroProfile Health endpoint response, that is `/health`.
+the state of the gRPC services will be added to the MicroProfile Health endpoint response, that is `/q/health`.
 
 == Reflection Service
 
@@ -177,7 +192,7 @@ Quarkus gRPC Server implements the https://github.com/grpc/grpc/blob/master/doc/
 This service allows tools like https://github.com/fullstorydev/grpcurl[grpcurl] or https://github.com/gusaul/grpcox[grpcox] to interact with your services.
 
 The reflection service is enabled by default in _dev_ mode.
-In test or production mode, you need to enable it explicitly by setting `quarkus.grpc-server.enable-reflection-service` to `true`.
+In test or production mode, you need to enable it explicitly by setting `quarkus.grpc.server.enable-reflection-service` to `true`.
 
 == Scaling
 By default, quarkus-grpc starts a single gRPC server running on a single event loop.
@@ -192,12 +207,15 @@ include::{generated-dir}/config/quarkus-grpc-config-group-config-grpc-server-con
 
 === Enabling TLS
 
-To enable TLS, use the following configuration:
+To enable TLS, use the following configuration.
 
-[source]
+Note that all paths in the configuration may either specify a resource on the classpath
+(typically from `src/main/resources` or its subfolder) or an external file.
+
+[source,properties]
 ----
-quarkus.grpc-server.ssl.certificate=src/main/resources/tls/server.pem
-quarkus.grpc-server.ssl.key=src/main/resources/tls/server.key
+quarkus.grpc.server.ssl.certificate=tls/server.pem
+quarkus.grpc.server.ssl.key=tls/server.key
 ----
 
 NOTE: When SSL/TLS is configured, `plain-text` is automatically disabled.
@@ -206,11 +224,54 @@ NOTE: When SSL/TLS is configured, `plain-text` is automatically disabled.
 
 To use TLS with mutual authentication, use the following configuration:
 
-[source]
+[source,properties]
+----
+quarkus.grpc.server.ssl.certificate=tls/server.pem
+quarkus.grpc.server.ssl.key=tls/server.key
+quarkus.grpc.server.ssl.trust-store=tls/ca.jks
+quarkus.grpc.server.ssl.trust-store-password=*****
+quarkus.grpc.server.ssl.client-auth=REQUIRED
+----
+
+== Server Interceptors
+
+You can implement a gRPC server interceptor by implementing an `@ApplicationScoped` bean implementing `io.grpc.ServerInterceptor`:
+
+[source, java]
+----
+@ApplicationScoped
+public class MyInterceptor implements ServerInterceptor {
+
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> serverCall,
+            Metadata metadata, ServerCallHandler<ReqT, RespT> serverCallHandler) {
+        // ...
+    }
+}
 ----
-quarkus.grpc-server.ssl.certificate=src/main/resources/tls/server.pem
-quarkus.grpc-server.ssl.key=src/main/resources/tls/server.key
-quarkus.grpc-server.ssl.trust-store=src/main/resources/tls/ca.jks
-quarkus.grpc-server.ssl.trust-store-password=*****
-quarkus.grpc-server.ssl.client-auth=REQUIRED
+
+TIP: Check the https://grpc.github.io/grpc-java/javadoc/io/grpc/ServerInterceptor.html[ServerInterceptor JavaDoc] to properly implement your interceptor.
+
+When you have multiple server interceptors, you can order them by implementing the `javax.enterprise.inject.spi.Prioritized` interface:
+
+source, java]
 ----
+@ApplicationScoped
+public class MyInterceptor implements ServerInterceptor, Prioritized {
+
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> serverCall,
+            Metadata metadata, ServerCallHandler<ReqT, RespT> serverCallHandler) {
+        // ...
+    }
+
+    @Override
+    public int getPriority() {
+        return 10;
+    }
+}
+----
+
+Interceptors with the highest priority are called first.
+The default priority, used if the interceptor does not implement the `Prioritized` interface, is `0`.
+
diff --git a/docs/src/main/asciidoc/grpc.adoc b/docs/src/main/asciidoc/grpc.adoc
index cbdb6de4e56a7..2e753f6d6a06b 100644
--- a/docs/src/main/asciidoc/grpc.adoc
+++ b/docs/src/main/asciidoc/grpc.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus gRPC
 
diff --git a/docs/src/main/asciidoc/hibernate-orm-panache-kotlin.adoc b/docs/src/main/asciidoc/hibernate-orm-panache-kotlin.adoc
index 37911591cd285..d91d00d02cdb9 100644
--- a/docs/src/main/asciidoc/hibernate-orm-panache-kotlin.adoc
+++ b/docs/src/main/asciidoc/hibernate-orm-panache-kotlin.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Simplified Hibernate ORM with Panache and Kotlin
 
@@ -10,7 +10,7 @@ include::./attributes.adoc[]
 
 Hibernate ORM is the de facto standard JPA implementation and is well-known in the Java ecosystem.  Panache offers a
 new layer atop this familiar framework.  This guide will not dive in to the specifics of either as those are already
-covered in the link:hibernate-orm-panache.adoc[Panache guide].  In this guide, we'll cover the Kotlin specific changes
+covered in the link:hibernate-orm-panache[Panache guide].  In this guide, we'll cover the Kotlin specific changes
 needed to use Panache in your Kotlin-based Quarkus applications.
 
 == First: an example
@@ -31,12 +31,12 @@ class Person: PanacheEntity {
 
 As you can see our entities remain simple.  There is, however, a slight difference from the Java version.  The Kotlin
 language doesn't support the notion of static methods in quite the same way as Java does.  Instead, we must use a
-[companion object](https://kotlinlang.org/docs/tutorials/kotlin-for-py/objects-and-companion-objects.html#companion-objects):
+https://kotlinlang.org/docs/tutorials/kotlin-for-py/objects-and-companion-objects.html#companion-objects[companion object]:
 
 [source,kotlin]
 ----
 @Entity
-class Person : PanacheEntity {
+class Person : PanacheEntity() {
     companion object: PanacheCompanion<Person> {  // <1>
         fun findByName(name: String) = find("name", name).firstResult()
         fun findAlive() = list("status", Status.Alive)
@@ -89,6 +89,7 @@ by making them implement `PanacheRepository`:
 
 [source,kotlin]
 ----
+@ApplicationScoped
 class PersonRepository: PanacheRepository<Person> {
      fun findByName(name: String) = find("name", name).firstResult()
      fun findAlive() = list("status", Status.Alive)
diff --git a/docs/src/main/asciidoc/hibernate-orm-panache.adoc b/docs/src/main/asciidoc/hibernate-orm-panache.adoc
index fa50fb508bd1f..91072d469ba16 100644
--- a/docs/src/main/asciidoc/hibernate-orm-panache.adoc
+++ b/docs/src/main/asciidoc/hibernate-orm-panache.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Simplified Hibernate ORM with Panache
 
@@ -341,9 +341,9 @@ Once you have written your repository, here are the most common operations you w
 ----
 // creating a person
 Person person = new Person();
-person.name = "Stef";
-person.birth = LocalDate.of(1910, Month.FEBRUARY, 1);
-person.status = Status.Alive;
+person.setName("Stef");
+person.setBirth(LocalDate.of(1910, Month.FEBRUARY, 1));
+person.setStatus(Status.Alive);
 
 // persist it
 personRepository.persist(person);
@@ -618,6 +618,43 @@ so the compiler must be configured to store parameter names inside the compiled
 This is enabled by default if you are using the Quarkus Maven archetype. If you are not using it, add the property `<maven.compiler.parameters>true</maven.compiler.parameters>` to your pom.xml.
 ====
 
+If in the DTO projection object you have a field from a referenced entity, you can use the `@ProjectedFieldName` annotation to provide the path for the SELECT statement.
+
+[source,java]
+----
+@Entity
+public class Dog extends PanacheEntity {
+    public String name;
+    public String race;
+    @ManyToOne
+    public Person owner;
+}
+
+@RegisterForReflection
+public class DogDto {
+    public String name;
+    public String ownerName;
+
+    public DogDto(String name, @ProjectedFieldName("owner.name") String ownerName) {  // <1>
+        this.name = name;
+        this.ownerName = ownerName;
+    }
+}
+
+PanacheQuery<DogDto> query = Dog.findAll().project(DogDto.class);
+----
+
+1. The `ownerName` DTO constructor's parameter will be loaded from the `owner.name` HQL property.
+
+== Multiple Persistence Units
+
+The support for multiple persistence units is described in detail in link:hibernate-orm#multiple-persistence-units[the Hibernate ORM guide].
+
+When using Panache, things are simple:
+
+* A given Panache entity can be attached to only a single persistence unit.
+* Given that, Panache already provides the necessary plumbing to transparently find the appropriate `EntityManager` associated to a Panache entity.
+
 == Transactions
 
 Make sure to wrap methods modifying your database (e.g. `entity.persist()`) within a transaction. Marking a
@@ -776,11 +813,11 @@ public class PanacheFunctionalityTest {
         Assertions.assertEquals(0, Person.count());
 
         // Now let's specify the return value
-        Mockito.when(Person.count()).thenReturn(23l);
+        Mockito.when(Person.count()).thenReturn(23L);
         Assertions.assertEquals(23, Person.count());
 
         // Now let's change the return value
-        Mockito.when(Person.count()).thenReturn(42l);
+        Mockito.when(Person.count()).thenReturn(42L);
         Assertions.assertEquals(42, Person.count());
 
         // Now let's call the original method
@@ -792,13 +829,13 @@ public class PanacheFunctionalityTest {
 
         // Mock only with specific parameters
         Person p = new Person();
-        Mockito.when(Person.findById(12l)).thenReturn(p);
-        Assertions.assertSame(p, Person.findById(12l));
-        Assertions.assertNull(Person.findById(42l));
+        Mockito.when(Person.findById(12L)).thenReturn(p);
+        Assertions.assertSame(p, Person.findById(12L));
+        Assertions.assertNull(Person.findById(42L));
 
         // Mock throwing
-        Mockito.when(Person.findById(12l)).thenThrow(new WebApplicationException());
-        Assertions.assertThrows(WebApplicationException.class, () -> Person.findById(12l));
+        Mockito.when(Person.findById(12L)).thenThrow(new WebApplicationException());
+        Assertions.assertThrows(WebApplicationException.class, () -> Person.findById(12L));
 
         // We can even mock your custom methods
         Mockito.when(Person.findOrdered()).thenReturn(Collections.emptyList());
@@ -895,11 +932,11 @@ public class PanacheFunctionalityTest {
         Assertions.assertEquals(0, personRepository.count());
 
         // Now let's specify the return value
-        Mockito.when(personRepository.count()).thenReturn(23l);
+        Mockito.when(personRepository.count()).thenReturn(23L);
         Assertions.assertEquals(23, personRepository.count());
 
         // Now let's change the return value
-        Mockito.when(personRepository.count()).thenReturn(42l);
+        Mockito.when(personRepository.count()).thenReturn(42L);
         Assertions.assertEquals(42, personRepository.count());
 
         // Now let's call the original method
@@ -911,13 +948,13 @@ public class PanacheFunctionalityTest {
 
         // Mock only with specific parameters
         Person p = new Person();
-        Mockito.when(personRepository.findById(12l)).thenReturn(p);
-        Assertions.assertSame(p, personRepository.findById(12l));
-        Assertions.assertNull(personRepository.findById(42l));
+        Mockito.when(personRepository.findById(12L)).thenReturn(p);
+        Assertions.assertSame(p, personRepository.findById(12L));
+        Assertions.assertNull(personRepository.findById(42L));
 
         // Mock throwing
-        Mockito.when(personRepository.findById(12l)).thenThrow(new WebApplicationException());
-        Assertions.assertThrows(WebApplicationException.class, () -> personRepository.findById(12l));
+        Mockito.when(personRepository.findById(12L)).thenThrow(new WebApplicationException());
+        Assertions.assertThrows(WebApplicationException.class, () -> personRepository.findById(12L));
 
         Mockito.when(personRepository.findOrdered()).thenReturn(Collections.emptyList());
         Assertions.assertTrue(personRepository.findOrdered().isEmpty());
@@ -1001,4 +1038,4 @@ yourself, or add the `quarkus-panache-common` as well, as shown below:
       </annotationProcessorPaths>
     </configuration>
 </plugin>
-----
\ No newline at end of file
+----
diff --git a/docs/src/main/asciidoc/hibernate-orm.adoc b/docs/src/main/asciidoc/hibernate-orm.adoc
index 8b3a9427d0f57..efa82492f36e7 100644
--- a/docs/src/main/asciidoc/hibernate-orm.adoc
+++ b/docs/src/main/asciidoc/hibernate-orm.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Hibernate ORM and JPA
 
@@ -40,7 +40,7 @@ Add the following dependencies to your project:
 
 [source,xml]
 .Example dependencies using Maven
---
+----
 <dependencies>
     <!-- Hibernate ORM specific dependencies -->
     <dependency>
@@ -54,14 +54,14 @@ Add the following dependencies to your project:
         <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
 </dependencies>
---
+----
 
 Annotate your persistent objects with `@Entity`,
 then add the relevant configuration properties in `{config-file}`.
 
 [source,properties]
 .Example `{config-file}`
---
+----
 # datasource configuration
 quarkus.datasource.db-kind = postgresql
 quarkus.datasource.username = hibernate
@@ -70,12 +70,12 @@ quarkus.datasource.jdbc.url = jdbc:postgresql://localhost:5432/hibernate_db
 
 # drop and create the database at startup (use `update` to only update the schema)
 quarkus.hibernate-orm.database.generation=drop-and-create
---
+----
 
-Note that these configuration properties are not the same ones as in your typical Hibernate ORM configuration file: these drive Quarkus configuration properties,
-which often will map to Hibernate configuration properties but could have different names and don't necessarily map 1:1 to each other.
+Note that these configuration properties are not the same ones as in your typical Hibernate ORM configuration file.
+They will often map to Hibernate ORM configuration properties but could have different names and don't necessarily map 1:1 to each other.
 
-Also, Quarkus will set many Hibernate configuration settings automatically, and will often use more modern defaults.
+Also, Quarkus will set many Hibernate ORM configuration settings automatically, and will often use more modern defaults.
 
 Please see below section <<hibernate-configuration-properties, Hibernate ORM configuration properties>> for the list of properties you can set in `{config-file}`.
 
@@ -87,7 +87,7 @@ You can then happily inject your `EntityManager`:
 
 [source,java]
 .Example application bean using Hibernate
---
+----
 @ApplicationScoped
 public class SantaClausService {
     @Inject
@@ -100,20 +100,22 @@ public class SantaClausService {
         em.persist(gift);
     }
 }
---
+----
 
 <1> Inject your entity manager and have fun
 <2> Mark your CDI bean method as `@Transactional` and the `EntityManager` will enlist and flush at commit.
 
 [source,java]
 .Example Entity
---
+----
 @Entity
 public class Gift {
     private Long id;
     private String name;
 
-    @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator="giftSeq")
+    @Id
+    @SequenceGenerator(name = "giftSeq", sequenceName = "gift_id_seq", allocationSize = 1, initialValue = 1)
+    @GeneratedValue(generator = "giftSeq")
     public Long getId() {
         return id;
     }
@@ -130,10 +132,12 @@ public class Gift {
         this.name = name;
     }
 }
---
+----
+
+To load SQL statements when Hibernate ORM starts, add an `import.sql` file to the root of your resources directory.
+This script can contain any SQL DML statements.
+Make sure to terminate each statement with a semicolon.
 
-To load some SQL statements when Hibernate ORM starts, add an `import.sql` in the root of your resources directory.
-Such a script can contain any SQL DML statements; make sure to terminate each statement with a semicolon.
 This is useful to have a data set ready for your tests or demos.
 
 WARNING: Make sure to wrap methods modifying your database (e.g. `entity.persist()`) within a transaction. Marking a
@@ -165,20 +169,187 @@ Make up your mind on which approach you want to use.
 ====
 Want to start a PostgreSQL server on the side with Docker?
 
-[source,shell]
---
-docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 \
-           --name postgres-quarkus-hibernate -e POSTGRES_USER=hibernate \
+[source,bash]
+----
+docker run --rm=true --name postgres-quarkus-hibernate -e POSTGRES_USER=hibernate \
            -e POSTGRES_PASSWORD=hibernate -e POSTGRES_DB=hibernate_db \
-           -p 5432:5432 postgres:10.5
---
+           -p 5432:5432 postgres:13.1
+----
 
 This will start a non-durable empty database: ideal for a quick experiment!
 ====
 
+[[multiple-persistence-units]]
+=== Multiple persistence units
+
+==== Setting up multiple persistence units
+
+It is possible to define multiple persistence units using the Quarkus configuration properties.
+
+The properties at the root of the `quarkus.hibernate-orm.` namespace define the default persistence unit.
+For instance, the following snippet defines a default datasource and a default persistence unit:
+
+[source,properties]
+----
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+----
+
+Using a map based approach, it is possible to define named persistence units:
+
+[source,properties]
+----
+quarkus.datasource."users".db-kind=h2 <1>
+quarkus.datasource."users".jdbc.url=jdbc:h2:mem:users;DB_CLOSE_DELAY=-1
+
+quarkus.datasource."inventory".db-kind=h2 <2>
+quarkus.datasource."inventory".jdbc.url=jdbc:h2:mem:inventory;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm."users".database.generation=drop-and-create <3>
+quarkus.hibernate-orm."users".datasource=users <4>
+quarkus.hibernate-orm."users".packages=org.acme.model.user <5>
+
+quarkus.hibernate-orm."inventory".database.generation=drop-and-create <6>
+quarkus.hibernate-orm."inventory".datasource=inventory
+quarkus.hibernate-orm."inventory".packages=org.acme.model.inventory
+----
+<1> Define a datasource named `users`.
+<2> Define a datasource named `inventory`.
+<3> Define a persistence unit called `users`.
+<4> Define the datasource used by the persistence unit.
+<5> This configuration property is important but we will discuss it a bit later.
+<6> Define a persistence unit called `inventory` pointing to the `inventory` datasource.
+
+[NOTE]
+====
+You can mix the default datasource and named datasources or only have one or the other.
+====
+
+[NOTE]
+====
+The default persistence unit points to the default datasource by default.
+For named persistence units, the `datasource` property is mandatory.
+You can point your persistence unit to the default datasource by setting it to `<default>`
+(which is the internal name of the default datasource).
+
+It is perfectly valid to have several persistence units pointing to the same datasource.
+====
+
+[[multiple-persistence-units-attaching-model-classes]]
+==== Attaching model classes to persistence units
+
+There are two ways to attach model classes to persistence units, and they should not be mixed:
+
+* Via the `packages` configuration property;
+* Via the `@io.quarkus.hibernate.orm.PersistenceUnit` package-level annotation.
+
+If both are mixed, the annotations are ignored and only the `packages` configuration properties are taken into account.
+
+Using the `packages` configuration property is simple:
+
+[source,properties]
+----
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=org.acme.model.defaultpu
+
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
+quarkus.hibernate-orm."users".packages=org.acme.model.user
+----
+
+This configuration snippet will create two persistence units:
+
+* The default one which will contain all the model classes under the `org.acme.model.defaultpu` package, subpackages included.
+* A named `users` persistence unit which will contain all the model classes under the `org.acme.model.user` package, subpackages included.
+
+You can attach several packages to a persistence unit:
+
+[source,properties]
+----
+quarkus.hibernate-orm."users".packages=org.acme.model.shared,org.acme.model.user
+----
+
+All the model classes under the `org.acme.model.shared` and `org.acme.model.user` packages will be attached to the `users` persistence unit.
+
+It is also supported to attach a given model class to several persistence units.
+
+[NOTE]
+====
+Model classes need to be consistently added to a given persistence unit.
+That meant that all dependent model classes of a given entity (mapped super classes, embeddables...) are required to be attached to the persistence unit.
+As we are dealing with the persistence unit at the package level, it should be simple enough.
+====
+
+[WARNING]
+====
+Panache entities can be attached to only one persistence unit.
+
+For entities attached to several persistence units, you cannot use Panache.
+You can mix the two approaches though and mix Panache entities and traditional entities where multiple persistence units are required.
+
+If you have a use case for that and clever ideas about how to implement it without cluttering the simplified Panache approach,
+contact us on the link:{quarkus-mailing-list-index}[quarkus-dev mailing list].
+====
+
+The second approach to attach model classes to a persistence unit is to use package-level `@io.quarkus.hibernate.orm.PersistenceUnit` annotations.
+Again, the two approaches cannot be mixed.
+
+To obtain a configuration similar to the one above with the `packages` configuration property, create a `package-info.java` file with the following content:
+
+[source,java]
+----
+@PersistenceUnit("users") <1>
+package org.acme.model.user;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+----
+<1> Be careful, use the `@io.quarkus.hibernate.orm.PersistenceUnit` annotation, not the JPA one.
+
+[CAUTION]
+====
+We only support defining the `@PersistenceUnit` for model classes at the package level,
+using the `@PersistenceUnit` annotation at the class level is not supported in this case.
+====
+
+Note that, similarly to what we do with the configuration property, we take into account the annotated package but also all its subpackages.
+
+==== CDI integration
+
+If you are familiar with using Hibernate ORM in Quarkus, you probably already have injected the `EntityManager` using CDI:
+
+[source,java]
+----
+@Inject
+EntityManager entityManager;
+----
+
+This will inject the `EntityManager` of the default persistence unit.
+
+Injecting the `EntityManager` of a named persistence unit (`users` in our example) is as simple as:
+
+[source,java]
+----
+@Inject
+@PersistenceUnit("users") <1>
+EntityManager entityManager;
+----
+<1> Here again, we use the same `@io.quarkus.hibernate.orm.PersistenceUnit` annotation.
+
+You can inject the `EntityManagerFactory` of a named persistence unit using the exact same mechanism:
+
+[source,java]
+----
+@Inject
+@PersistenceUnit("users")
+EntityManagerFactory entityManagerFactory;
+----
+
 == Setting up and configuring Hibernate ORM with a `persistence.xml`
 
-Alternatively, you can use a `META-INF/persistence.xml` to setup Hibernate ORM.
+Alternatively, you can use a `META-INF/persistence.xml` to set up Hibernate ORM.
 This is useful for:
 
 * migrating existing code
@@ -186,17 +357,17 @@ This is useful for:
 * or if you like it the good old way
 
 [NOTE]
---
+====
 If you have a `persistence.xml`, then you cannot use the `quarkus.hibernate-orm.*` properties
 and only persistence units defined in `persistence.xml` will be taken into account.
---
+====
 
 Your `pom.xml` dependencies as well as your Java code would be identical to the precedent example. The only
 difference is that you would specify your Hibernate ORM configuration in `META-INF/persistence.xml`:
 
 [source,xml]
 .Example persistence.xml resource
---
+----
 <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
@@ -225,7 +396,7 @@ difference is that you would specify your Hibernate ORM configuration in `META-I
 
     </persistence-unit>
 </persistence>
---
+----
 
 When using the `persistence.xml` configuration you are configuring Hibernate ORM directly,
 so in this case the appropriate reference is the link:https://docs.jboss.org/hibernate/orm/5.4/userguide/html_single/Hibernate_User_Guide.html#configurations[documentation on hibernate.org].
@@ -257,10 +428,10 @@ This is best to perfectly control your environment and works magic with Quarkus
 your entity changes or any change to your `import.sql` is immediately picked up and the schema updated without restarting the application!
 
 [TIP]
---
+====
 By default in `dev` and `test` modes, Hibernate ORM, upon boot, will read and execute the SQL statements in the `/import.sql` file (if present).
 You can change the file name by changing the property `quarkus.hibernate-orm.sql-load-script` in `application.properties`.
---
+====
 
 The second approach is to use `quarkus.hibernate-orm.database.generation=update`.
 This approach is best when you do many entity changes but
@@ -273,7 +444,7 @@ But for development, these limitations are acceptable.
 
 The third approach is to use `quarkus.hibernate-orm.database.generation=none`.
 This approach is best when you are working on a copy of the production data but want to fully control the schema evolution.
-Or if you use a database schema migration tool like https://quarkus.io/guides/flyway[Flyway].
+Or if you use a database schema migration tool like link:flyway[Flyway].
 
 With this approach when making changes to an entity, make sure to adapt the database schema accordingly;
 you could also use `validate` to have Hibernate verify the schema matches its expectations.
@@ -282,13 +453,13 @@ WARNING: Do not use `quarkus.hibernate-orm.database.generation` `drop-and-create
 
 
 These approaches become really powerful when combined with Quarkus configuration profiles.
-You can define different https://quarkus.io/guides/config#configuration-profiles[configuration profiles]
+You can define different link:config#configuration-profiles[configuration profiles]
 to select different behaviors depending on your environment.
 This is great because you can define different combinations of Hibernate ORM properties matching the development style you currently need.
 
-[source]
+[source,properties]
 .application.properties
---
+----
 %dev.quarkus.hibernate-orm.database.generation = drop-and-create
 %dev.quarkus.hibernate-orm.sql-load-script = import-dev.sql
 
@@ -297,13 +468,13 @@ This is great because you can define different combinations of Hibernate ORM pro
 
 %prod.quarkus.hibernate-orm.database.generation = none
 %prod.quarkus.hibernate-orm.sql-load-script = no-file
---
+----
 
 [source,bash]
 .Start "dev mode" using a custom profile via Maven
---
+----
 ./mvnw compile quarkus:dev -Dquarkus.profile=dev-with-data
---
+----
 
 == Hibernate ORM in production mode
 
@@ -321,12 +492,12 @@ but we wanted you to avoid overriding your database by accident in prod :)
 Speaking of, make sure to not drop your database schema in production!
 Add the following in your properties file.
 
-[source]
+[source,properties]
 .application.properties
---
+----
 %prod.quarkus.hibernate-orm.database.generation = none
 %prod.quarkus.hibernate-orm.sql-load-script = no-file
---
+----
 
 [[caching]]
 == Caching
@@ -338,14 +509,14 @@ Applications that frequently read the same entities can see their performance im
 To enable second-level cache, mark the entities that you want cached with `@javax.persistence.Cacheable`:
 
 [source,java]
---
+----
 @Entity
 @Cacheable
 public class Country {
     int dialInCode;
     // ...
 }
---
+----
 
 When an entity is annotated with `@Cacheable`, all its field values are cached except for collections and relations to other entities.
 
@@ -356,7 +527,7 @@ This means the entity can be loaded without querying the database, but be carefu
 Collections and relations need to be individually annotated to be cached; in this case the Hibernate specific `@org.hibernate.annotations.Cache` should be used, which requires also to specify the `CacheConcurrencyStrategy`:
 
 [source,java]
---
+----
 package org.acme;
 
 @Entity
@@ -370,7 +541,7 @@ public class Country {
 
     // ...
 }
---
+----
 
 === Caching of queries
 
@@ -381,22 +552,22 @@ Be careful as this implies the results might not reflect recent changes.
 To cache a query, mark it as cacheable on the `Query` instance:
 
 [source,java]
---
+----
 Query query = ...
 query.setHint("org.hibernate.cacheable", Boolean.TRUE);
---
+----
 
 If you have a `NamedQuery` then you can enable caching directly on its definition, which will usually be on an entity:
 
 [source,java]
---
+----
 @Entity
 @NamedQuery(name = "Fruits.findAll",
       query = "SELECT f FROM Fruit f ORDER BY f.name",
       hints = @QueryHint(name = "org.hibernate.cacheable", value = "true") )
 public class Fruit {
    ...
---
+----
 
 That's all! Caching technology is already integrated and enabled by default in Quarkus, so it's enough to set which ones are safe to be cached.
 
@@ -419,9 +590,11 @@ To set the maximum idle time, provide the duration (see note on duration's forma
 [NOTE]
 ====
 The double quotes are mandatory if your region name contains a dot. For instance:
-```
+
+[source,properties]
+----
 quarkus.hibernate-orm.cache."org.acme.MyEntity".memory.object-count=1000
-```
+----
 ====
 
 
@@ -434,7 +607,7 @@ The caching technology provided within Quarkus is currently quite rudimentary an
 The team thought it was better to have _some_ caching capability to start with, than having nothing; you can expect better caching solution to be integrated in future releases, and any help and feedback in this area is very welcome.
 
 [NOTE]
---
+====
 These caches are kept locally, so they are not invalidated or updated when changes are made to the persistent store by other applications.
 
 Also, when running multiple copies of the same application (in a cluster, for example on Kubernetes/OpenShift), caches in separate copies of the application aren't synchronized.
@@ -449,7 +622,7 @@ On top of immutable data, in certain contexts it might be acceptable to enable c
  produce unexpected and unforeseen effects on the data.
 
 Rather than enabling caching on mutable data, ideally a better solution would be to use a clustered cache; however at this time Quarkus doesn't provide any such implementation: feel free to get in touch and let this need known so that the team can take this into account.
---
+====
 
 Finally, the second-level cache can be disabled globally by setting `hibernate.cache.use_second_level_cache` to `false`; this is a setting that needs to be specified in the `persistence.xml` configuration file.
 
@@ -463,13 +636,13 @@ In Quarkus, Envers has a dedicated Quarkus Extension `io.quarkus:quarkus-hiberna
 
 [source,xml]
 .Additional dependency to enable Hibernate Envers
---
+----
     <!-- Add the Hibernate Envers extension -->
     <dependency>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-hibernate-envers</artifactId>
     </dependency>
---
+----
 
 At this point the extension does not expose additional configuration properties.
 
@@ -477,9 +650,10 @@ For more information about Hibernate Envers, see link:https://hibernate.org/orm/
 
 [[metrics]]
 == Metrics
-The SmallRye Metrics extension is capable of exposing metrics that Hibernate ORM collects at runtime. To enable exposure of Hibernate metrics
-on the `/metrics` endpoint, make sure your project depends on the `quarkus-smallrye-metrics` artifact and set the configuration property `quarkus.hibernate-orm.metrics.enabled` to `true`.
-Metrics will then be available under the `vendor` scope.
+Either link:micrometer[Micrometer] or link:microprofile-metrics[SmallRye Metrics] are
+capable of exposing metrics that Hibernate ORM collects at runtime. To enable exposure of Hibernate metrics
+on the `/q/metrics` endpoint, make sure your project depends on a metrics extension and set the configuration property `quarkus.hibernate-orm.metrics.enabled` to `true`.
+When using link:microprofile-metrics[SmallRye Metrics], metrics will be available under the `vendor` scope.
 
 == Limitations and other things you should know
 
@@ -498,6 +672,13 @@ applications perform better.
 Typically you would need to adapt your build scripts to include the Hibernate Enhancement plugins; in Quarkus this is
 not necessary as the enhancement step is integrated in the build and analysis of the Quarkus application.
 
+[WARNING]
+====
+Due to the usage of enhancement, using the `clone()` method on entities is currently not supported
+as it will also clone some enhancement-specific fields that are specific to the entity.
+
+This limitation might be removed in the future.
+====
 
 === Automatic integration
 
@@ -542,10 +723,6 @@ JPA Callbacks::
 Annotations allowing for application callbacks on entity lifecycle events defined by JPA such as `@javax.persistence.PostUpdate`, `@javax.persistence.PostLoad`, `@javax.persistence.PostPersist`, etc... are currently not processed.
 This limitation could be resolved in a future version, depending on user demand.
 
-Single instance::
-It is currently not possible to configure more than one instance of Hibernate ORM.
-This is a temporary limitation, the team is working on it - please be patient!
-
 === Other notable differences
 
 Format of `import.sql`::
@@ -564,6 +741,7 @@ it's implemented by the Agroal connection pool extension for Quarkus.
 
 Jump over to link:datasource[Quarkus - Datasources] for all details.
 
+[[multitenancy]]
 == Multitenancy
 
 "The term multitenancy, in general, is applied to software development to indicate an architecture in which a single running instance of an application simultaneously serves multiple clients (tenants). This is highly common in SaaS solutions. Isolating information (data, customizations, etc.) pertaining to the various tenants is a particular challenge in these systems. This includes the data owned by each tenant stored in the database" (link:https://docs.jboss.org/hibernate/orm/5.4/userguide/html_single/Hibernate_User_Guide.html#multitenacy[Hibernate User Guide]).
@@ -579,14 +757,10 @@ Let's start by implementing the `/{tenant}` endpoint. As you can see from the so
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 
 @ApplicationScoped
-@Produces("application/json")
-@Consumes("application/json")
 @Path("/{tenant}")
 public class FruitResource {
 
@@ -609,13 +783,10 @@ In order to resolve the tenant from incoming requests and map it to a specific t
 ----
 import javax.enterprise.context.ApplicationScoped;
 
-import io.quarkus.arc.Arc;
-import io.quarkus.arc.Unremovable;
 import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
 import io.vertx.ext.web.RoutingContext;
 
-@RequestScoped
-@Unremovable
+@RequestScoped <1>
 public class CustomTenantResolver implements TenantResolver {
 
     @Inject
@@ -641,14 +812,62 @@ public class CustomTenantResolver implements TenantResolver {
     
 }
 ----
+<1> The bean is made `@RequestScoped` as the tenant resolution depends on the incoming request.
 
 From the implementation above, tenants are resolved from the request path so that in case no tenant could be inferred, the default tenant identifier is returned.
 
+[NOTE]
+====
+If <<multiple-persistence-units,named persistence units>> are used, you need to qualify the `TenantResolver` with the persistence unit name:
+
+[source,java]
+----
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
+import io.vertx.ext.web.RoutingContext;
+
+@PersistenceUnit("name-of-persistence-unit") <1>
+@RequestScoped
+public class CustomTenantResolver implements TenantResolver {
+
+   // ...
+
+}
+----
+<1> Make sure to use the `@io.quarkus.hibernate.orm.PersistenceUnit` annotation, not the JPA one.
+====
+
+[NOTE]
+====
+If you also use link:security-openid-connect-multitenancy[OIDC multitenancy] and both OIDC and Hibernate ORM tenant IDs are the same and must be extracted from the Vert.x `RoutingContext` then you can pass the tenant id from the OIDC Tenant Resolver to the Hibernate ORM Tenant Resolver as a `RoutingContext` attribute, for example:
+
+[source,java]
+----
+import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
+import io.vertx.ext.web.RoutingContext;
+
+@RequestScoped
+public class CustomTenantResolver implements TenantResolver {
+
+    @Inject
+    RoutingContext context;
+    ...
+    @Override
+    public String resolveTenantId() {
+        // OIDC TenantResolver has already calculated the tenant id and saved it as a RoutingContext `tenantId` attribute:
+        return context.get("tenantId");
+    }
+}
+----
+====
+
 === Configuring the application
 
 In general it is not possible to use the Hibernate ORM database generation feature in conjunction with a multitenancy setup.
 Therefore you have to disable it and you need to make sure that the tables are created per schema. 
-The following setup will use the link:https://quarkus.io/guides/flyway[Flyway] extension to achieve this goal.
+The following setup will use the link:flyway[Flyway] extension to achieve this goal.
 
 ==== SCHEMA approach
 
diff --git a/docs/src/main/asciidoc/hibernate-search-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-elasticsearch.adoc
deleted file mode 100644
index 117b4854b954f..0000000000000
--- a/docs/src/main/asciidoc/hibernate-search-elasticsearch.adoc
+++ /dev/null
@@ -1,700 +0,0 @@
-////
-This guide is maintained in the main Quarkus repository
-and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
-////
-= Quarkus - Hibernate Search guide
-:extension-status: preview
-include::./attributes.adoc[]
-
-You have a Hibernate ORM-based application? You want to provide a full-featured full-text search to your users? You're at the right place.
-
-With this guide, you'll learn how to synchronize your entities to an Elasticsearch cluster in a heart beat with Hibernate Search.
-We will also explore how you can can query your Elasticsearch cluster using the Hibernate Search API.
-
-include::./status-include.adoc[]
-
-[WARNING]
-====
-This extension is based on a beta version of Hibernate Search.
-While APIs are quite stable and the code is of production quality and thoroughly tested, some features are still missing, performance might not be optimal and some APIs or configuration properties might change as the extension matures.
-====
-
-== Prerequisites
-
-To complete this guide, you need:
-
-* less than 20 minutes
-* an IDE
-* JDK 1.8+ installed with `JAVA_HOME` configured appropriately
-* Apache Maven {maven-version}
-* Docker
-* link:building-native-image[GraalVM installed if you want to run in native mode]
-
-== Architecture
-
-The application described in this guide allows to manage a (simple) library: you manage authors and their books.
-
-The entities are stored in a PostgreSQL database and indexed in an Elasticsearch cluster.
-
-== Solution
-
-We recommend that you follow the instructions in the next sections and create the application step by step.
-However, you can go right to the completed example.
-
-Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
-
-The solution is located in the `hibernate-search-elasticsearch-quickstart` {quickstarts-tree-url}/hibernate-search-elasticsearch-quickstart[directory].
-
-[NOTE]
-====
-The provided solution contains a few additional elements such as tests and testing infrastructure.
-====
-
-== Creating the Maven project
-
-First, we need a new project. Create a new project with the following command:
-
-[source,shell,subs=attributes+]
-----
-mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
-    -DprojectGroupId=org.acme \
-    -DprojectArtifactId=hibernate-search-elasticsearch-quickstart \
-    -DclassName="org.acme.hibernate.search.elasticsearch.LibraryResource" \
-    -Dpath="/library" \
-    -Dextensions="hibernate-orm-panache, hibernate-search-elasticsearch, resteasy-jsonb, jdbc-postgresql"
-cd hibernate-search-elasticsearch-quickstart
-----
-
-This command generates a Maven structure importing the following extensions:
-
- * Hibernate ORM with Panache,
- * the PostgreSQL JDBC driver,
- * Hibernate Search + Elasticsearch,
- * RESTEasy and JSON-B.
-
-If you already have your Quarkus project configured, you can add the `hibernate-search-elasticsearch` extension
-to your project by running the following command in your project base directory:
-
-[source,bash]
-----
-./mvnw quarkus:add-extension -Dextensions="hibernate-search-elasticsearch"
-----
-
-This will add the following to your `pom.xml`:
-
-[source,xml]
-----
-<dependency>
-    <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
-</dependency>
-----
-
-[IMPORTANT]
-====
-For now, let's delete the two generated tests `LibraryResourceTest` and `NativeLibraryResourceIT` present in `src/test/java`.
-If you are interested in how you can test this application, just refer to the solution in the quickstarts Git repository:
-it contains a lot of tests and the required testing infrastructure.
-====
-
-== Creating the bare entities
-
-First, let's create our Hibernate ORM entities `Book` and `Author` in the `model` subpackage.
-
-[source,java]
-----
-package org.acme.hibernate.search.elasticsearch.model;
-
-import java.util.List;
-import java.util.Objects;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-@Entity
-public class Author extends PanacheEntity { // <1>
-
-    public String firstName;
-
-    public String lastName;
-
-    @OneToMany(mappedBy = "author", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) // <2>
-    public List<Book> books;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Author)) {
-            return false;
-        }
-
-        Author other = (Author) o;
-
-        return Objects.equals(id, other.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return 31;
-    }
-}
-----
-<1> We are using Hibernate ORM with Panache, it is not mandatory.
-<2> We are loading these elements eagerly so that they are present in the JSON output.
-In a real world application, you should probably use a DTO approach.
-
-[source,java]
-----
-package org.acme.hibernate.search.elasticsearch.model;
-
-import java.util.Objects;
-
-import javax.json.bind.annotation.JsonbTransient;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-@Entity
-public class Book extends PanacheEntity {
-
-    public String title;
-
-    @ManyToOne
-    @JsonbTransient // <1>
-    public Author author;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof Book)) {
-            return false;
-        }
-
-        Book other = (Book) o;
-
-        return Objects.equals(id, other.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return 31;
-    }
-}
-----
-<1> We mark this property with `@JsonbTransient` to avoid infinite loops when serializing with JSON-B.
-
-== Initializing the REST service
-
-While everything is not yet set up for our REST service, we can initialize it with the standard CRUD operations we will need.
-
-Just copy this content in the `LibraryResource` file created by the Maven `create-project` command:
-
-[source,java]
-----
-package org.acme.hibernate.search.elasticsearch;
-
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.acme.hibernate.search.elasticsearch.model.Author;
-import org.acme.hibernate.search.elasticsearch.model.Book;
-import org.jboss.resteasy.annotations.jaxrs.FormParam;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
-
-@Path("/library")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class LibraryResource {
-
-    @Inject
-    EntityManager em;
-
-    @PUT
-    @Path("book")
-    @Transactional
-    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
-    public void addBook(@FormParam String title, @FormParam Long authorId) {
-        Author author = Author.findById(authorId);
-        if (author == null) {
-            return;
-        }
-
-        Book book = new Book();
-        book.title = title;
-        book.author = author;
-        book.persist();
-
-        author.books.add(book);
-        author.persist();
-    }
-
-    @DELETE
-    @Path("book/{id}")
-    @Transactional
-    public void deleteBook(@PathParam Long id) {
-        Book book = Book.findById(id);
-        if (book != null) {
-            book.author.books.remove(book);
-            book.delete();
-        }
-    }
-
-    @PUT
-    @Path("author")
-    @Transactional
-    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
-    public void addAuthor(@FormParam String firstName, @FormParam String lastName) {
-        Author author = new Author();
-        author.firstName = firstName;
-        author.lastName = lastName;
-        author.persist();
-    }
-
-    @POST
-    @Path("author/{id}")
-    @Transactional
-    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
-    public void updateAuthor(@PathParam Long id, @FormParam String firstName, @FormParam String lastName) {
-        Author author = Author.findById(id);
-        if (author == null) {
-            return;
-        }
-        author.firstName = firstName;
-        author.lastName = lastName;
-        author.persist();
-    }
-
-    @DELETE
-    @Path("author/{id}")
-    @Transactional
-    public void deleteAuthor(@PathParam Long id) {
-        Author author = Author.findById(id);
-        if (author != null) {
-            author.delete();
-        }
-    }
-}
-----
-
-Nothing out of the ordinary here: it is just good old Hibernate ORM with Panache operations in a standard JAX-RS service.
-
-In fact, the interesting part is that we will need to add very few elements to make our full text search application working.
-
-== Using Hibernate Search annotations
-
-Let's go back to our entities.
-
-Enabling full text search capabilities for them is as simple as adding a few annotations.
-
-Let's edit the `Author` entity again to include this content:
-
-[source,java]
-----
-package org.acme.hibernate.search.elasticsearch.model;
-
-import java.util.Objects;
-
-import javax.json.bind.annotation.JsonbTransient;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-@Entity
-@Indexed // <1>
-public class Book extends PanacheEntity {
-
-    @FullTextField(analyzer = "english") // <2>
-    public String title;
-
-    @ManyToOne
-    @JsonbTransient
-    public Author author;
-
-    // Preexisting equals()/hashCode() methods
-}
-----
-<1> First, let's use the `@Indexed` annotation to register our `Book` entity as part of the full text index.
-<2> The `@FullTextField` annotation declares a field in the index specifically tailored for full text search.
-In particular, we have to define an analyzer to split and analyze the tokens (~ words) - more on this later.
-
-Now that our books are indexed, we can do the same for the authors.
-
-Open the `Author` class and include the content below.
-
-Things are quite similar here: we use the `@Indexed`, `@FullTextField` and `@KeywordField` annotations.
-
-There are a few differences/additions though. Let's check them out.
-
-[source,java]
-----
-package org.acme.hibernate.search.elasticsearch.model;
-
-import java.util.List;
-import java.util.Objects;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-
-import org.hibernate.search.engine.backend.types.Sortable;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-@Entity
-@Indexed
-public class Author extends PanacheEntity {
-
-    @FullTextField(analyzer = "name") // <1>
-    @KeywordField(name = "firstName_sort", sortable = Sortable.YES, normalizer = "sort") // <2>
-    public String firstName;
-
-    @FullTextField(analyzer = "name")
-    @KeywordField(name = "lastName_sort", sortable = Sortable.YES, normalizer = "sort")
-    public String lastName;
-
-    @OneToMany(mappedBy = "author", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
-    @IndexedEmbedded // <3>
-    public List<Book> books;
-
-    // Preexisting equals()/hashCode() methods
-}
-----
-<1> We use a `@FullTextField` similar to what we did for `Book` but you'll notice that the analyzer is different - more on this later.
-<2> As you can see, we can define several fields for the same property.
-Here, we define a `@KeywordField` with a specific name.
-The main difference is that a keyword field is not tokenized (the string is kept as one single token) but can be normalized (i.e. filtered) - more on this later.
-This field is marked as sortable as our intention is to use it for sorting our authors.
-<3> The purpose of `@IndexedEmbedded` is to include the `Book` fields into the `Author` index.
-In this case, we just use the default configuration: all the fields of the associated `Book` entities are included in the index (i.e. the `title` field).
-The nice thing with `@IndexedEmbedded` is that it is able to automatically reindex an `Author` if one of its ``Book``s has been updated thanks to the bidirectional relation.
-`@IndexedEmbedded` also supports nested documents (using the `storage = NESTED` attribute) but we don't need it here.
-You can also specify the fields you want to include in your parent index using the `includePaths` attribute if you don't want them all.
-
-== Analyzers and normalizers
-
-=== Introduction
-
-Analysis is a big part of full text search: it defines how text will be processed when indexing or building search queries.
-
-The role of analyzers is to split the text into tokens (~ words) and filter them (making it all lowercase and removing accents for instance).
-
-Normalizers are a special type of analyzers that keeps the input as a single token.
-It is especially useful for sorting or indexing keywords.
-
-There are a lot of bundled analyzers but you can also develop your own for your own specific purposes.
-
-You can learn more about the Elasticsearch analysis framework in the https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis.html[Analysis section of the Elasticsearch documentation].
-
-=== Defining the analyzers used
-
-When we added the Hibernate Search annotations to our entities, we defined the analyzers and normalizers used.
-Typically:
-
-[source,java]
-----
-@FullTextField(analyzer = "english")
-----
-
-[source,java]
-----
-@FullTextField(analyzer = "name")
-----
-
-[source,java]
-----
-@KeywordField(name = "lastName_sort", sortable = Sortable.YES, normalizer = "sort")
-----
-
-We use:
-
- * an analyzer called `name` for person names,
- * an analyzer called `english` for book titles,
- * a normalizer called `sort` for our sort fields
-
-but we haven't set them up yet.
-
-Let's see how you can do it with Hibernate Search.
-
-=== Setting up the analyzers
-
-It is an easy task, we just need to create an implementation of `ElasticsearchAnalysisConfigurer`
-(and configure Quarkus to use it, more on that later).
-
-To fulfill our requirements, let's create the following implementation:
-
-[source,java]
-----
-package org.acme.hibernate.search.elasticsearch.config;
-
-import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
-import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
-
-public class AnalysisConfigurer implements ElasticsearchAnalysisConfigurer {
-
-    @Override
-    public void configure(ElasticsearchAnalysisConfigurationContext context) {
-        context.analyzer("name").custom() // <1>
-                .tokenizer("standard")
-                .tokenFilters("asciifolding", "lowercase");
-
-        context.analyzer("english").custom() // <2>
-                .tokenizer("standard")
-                .tokenFilters("asciifolding", "lowercase", "porter_stem");
-
-        context.normalizer("sort").custom() // <3>
-                .tokenFilters("asciifolding", "lowercase");
-    }
-}
-----
-<1> This is a simple analyzer separating the words on spaces, removing any non-ASCII characters by its ASCII counterpart (and thus removing accents) and putting everything in lowercase.
-It is used in our examples for the author's names.
-<2> We are a bit more aggressive with this one and we include some stemming: we will be able to search for `mystery` and get a result even if the indexed input contains `mysteries`.
-It is definitely too aggressive for person names but it is perfect for the book titles.
-<3> Here is the normalizer used for sorting. Very similar to our first analyzer, except we don't tokenize the words as we want one and only one token.
-
-== Adding full text capabilities to our REST service
-
-In our existing `LibraryResource`, we just need to inject the following methods (and add a few ``import``s):
-
-[source,java]
-----
-    @Transactional // <1>
-    void onStart(@Observes StartupEvent ev) throws InterruptedException { // <2>
-        // only reindex if we imported some content
-        if (Book.count() > 0) {
-            Search.session(em)
-                    .massIndexer()
-                    .startAndWait();
-        }
-    }
-
-    @GET
-    @Path("author/search") // <3>
-    @Transactional
-    public List<Author> searchAuthors(@QueryParam String pattern, // <4>
-            @QueryParam Optional<Integer> size) {
-        return Search.session(em) // <5>
-                .search(Author.class) // <6>
-                .where(f ->
-                    pattern == null || pattern.trim().isEmpty() ?
-                            f.matchAll() : // <7>
-                            f.simpleQueryString()
-                                .fields("firstName", "lastName", "books.title").matching(pattern) // <8>
-                )
-                .sort(f -> f.field("lastName_sort").then().field("firstName_sort")) // <9>
-                .fetchHits(size.orElse(20)); // <10>
-    }
-----
-<1> Important point: we need a transactional context for these methods.
-<2> As we will import data into the PostgreSQL database using an SQL script, we need to reindex the data at startup.
-For this, we use Hibernate Search's mass indexer, which allows to index a lot of data efficiently (you can fine tune it for better performances).
-All the upcoming updates coming through Hibernate ORM operations will be synchronized automatically to the full text index.
-If you don't import data manually in the database, you don't need that:
-the mass indexer should then only be used when you change your indexing configuration (adding a new field, changing an analyzer's configuration...) and you want the new configuration to be applied to your existing entities.
-<3> This is where the magic begins: just adding the annotations to our entities makes them available for full text search: we can now query the index using the Hibernate Search DSL.
-<4> Use the `org.jboss.resteasy.annotations.jaxrs.QueryParam` annotation type to avoid repeating the parameter name.
-<5> First, we get an Hibernate Search session from the injected entity manager.
-<6> We indicate that we are searching for ``Author``s.
-<7> We create a predicate: if the pattern is empty, we use a `matchAll()` predicate.
-<8> If we have a valid pattern, we create a https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-simple-query-string-query.html[`simpleQueryString()`] predicate on the `firstName`, `lastName` and `books.title` fields matching our pattern.
-<9> We define the sort order of our results. Here we sort by last name, then by first name. Note that we use the specific fields we created for sorting.
-<10> Fetch the `size` top hits, `20` by default. Obviously, paging is also supported.
-
-[NOTE]
-====
-The Hibernate Search DSL supports a significant subset of the Elasticsearch predicates (match, range, nested, phrase, spatial...).
-Feel free to explore the DSL using autocompletion.
-
-When that's not enough, you can always fall back to
-link:https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#search-dsl-predicate-extensions-elasticsearch-from-json[defining a predicate using JSON directly].
-====
-
-== Configuring the application
-
-As usual, we can configure everything in the Quarkus configuration file, `application.properties`.
-
-Edit `src/main/resources/application.properties` and inject the following configuration:
-
-[source,properties]
-----
-quarkus.ssl.native=false <1>
-
-quarkus.datasource.db-kind=postgresql <2>
-quarkus.datasource.username=quarkus_test
-quarkus.datasource.password=quarkus_test
-quarkus.datasource.jdbc.url=jdbc:postgresql:quarkus_test
-
-quarkus.hibernate-orm.database.generation=drop-and-create <3>
-quarkus.hibernate-orm.sql-load-script=import.sql <4>
-
-quarkus.hibernate-search.elasticsearch.version=7 <5>
-quarkus.hibernate-search.elasticsearch.analysis.configurer=org.acme.hibernate.search.elasticsearch.config.AnalysisConfigurer <6>
-quarkus.hibernate-search.schema-management.strategy=drop-and-create <7>
-quarkus.hibernate-search.elasticsearch.index-defaults.schema-management.required-status=yellow <8>
-quarkus.hibernate-search.automatic-indexing.synchronization.strategy=sync <9>
-----
-<1> We won't use SSL so we disable it to have a more compact native executable.
-<2> Let's create a PostgreSQL datasource.
-<3> We will drop and recreate the schema every time we start the application.
-<4> We load some initial data.
-<5> We need to tell Hibernate Search about the version of Elasticsearch we will use.
-It is important because there are significant differences between Elasticsearch mapping syntax depending on the version.
-Since the mapping is created at build time to reduce startup time, Hibernate Search cannot connect to the cluster to automatically detect the version.
-<6> We point to the custom `AnalysisConfigurer` which defines the configuration of our analyzers and normalizers.
-<7> Obviously, this is not for production: we drop and recreate the index every time we start the application.
-<8> We consider the `yellow` status is sufficient to proceed after an index is created.
-This is for testing purposes with the Elasticsearch Docker container.
-It should not be used in production.
-<9> This means that we wait for the entities to be searchable before considering a write complete.
-On a production setup, the `write-sync` default will provide better performance.
-Using `sync` is especially important when testing as you need the entities to be searchable immediately.
-
-[TIP]
-For more information about the Hibernate Search extension configuration please refer to the <<configuration-reference, Configuration Reference>>.
-
-== Creating a frontend
-
-Now let's add a simple web page to interact with our `LibraryResource`.
-Quarkus automatically serves static resources located under the `META-INF/resources` directory.
-In the `src/main/resources/META-INF/resources` directory, overwrite the existing `index.html` file with the content from this
-{quickstarts-blob-url}/hibernate-search-elasticsearch-quickstart/src/main/resources/META-INF/resources/index.html[index.html] file.
-
-== Automatic import script
-
-For the purpose of this demonstration, let's import an initial dataset.
-
-Let's create a `src/main/resources/import.sql` file with the following content:
-
-[source,sql]
-----
-INSERT INTO author(id, firstname, lastname) VALUES (nextval('hibernate_sequence'), 'John', 'Irving');
-INSERT INTO author(id, firstname, lastname) VALUES (nextval('hibernate_sequence'), 'Paul', 'Auster');
-
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The World According to Garp', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The Hotel New Hampshire', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The Cider House Rules', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'A Prayer for Owen Meany', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Last Night in Twisted River', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'In One Person', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Avenue of Mysteries', 1);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The New York Trilogy', 2);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Mr. Vertigo', 2);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The Brooklyn Follies', 2);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Invisible', 2);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Sunset Park', 2);
-INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), '4 3 2 1', 2);
-----
-
-== Preparing the infrastructure
-
-We need a PostgreSQL instance and an Elasticsearch cluster.
-
-Let's use Docker to start one of each:
-
-[source, shell,subs=attributes+]
-----
-docker run -it --rm=true --name elasticsearch_quarkus_test -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch-oss:{elasticsearch-version}
-----
-
-[source, shell]
-----
-docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgresql_quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:11.3
-----
-
-== Time to play with your application
-
-You can now interact with your REST service:
-
- * start Quarkus with `./mvnw compile quarkus:dev`
- * open a browser to `http://localhost:8080/`
- * search for authors or book titles (we initialized some data for you)
- * create new authors and books and search for them too
-
-As you can see, all your updates are automatically synchronized to the Elasticsearch cluster.
-
-== Building a native executable
-
-You can build a native executable with the usual command `./mvnw package -Pnative`.
-
-[NOTE]
-====
-As usual with native executable compilation, this operation consumes a lot of memory.
-
-It might be safer to stop the two containers while you are building the native executable and start them again once you are done.
-====
-
-Running it is as simple as executing `./target/hibernate-search-elasticsearch-quickstart-1.0-SNAPSHOT-runner`.
-
-You can then point your browser to `http://localhost:8080/` and use your application.
-
-[NOTE]
-====
-The startup is a bit slower than usual: it is mostly due to us dropping and recreating the database schema and the Elasticsearch mapping every time at startup.
-We also inject some data and execute the mass indexer.
-
-In a real life application, it is obviously something you won't do at startup.
-====
-
-== Further reading
-
-If you are interested into learning more about Hibernate Search 6, the Hibernate team has https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/[some documentation] in the works.
-
-It is still work in progress but covers all main concepts and features,
-so it can guide you in your exploration.
-
-== FAQ
-
-=== Why Hibernate Search 6 (and not a fully supported version)?
-
-To optimize the Hibernate Search bootstrap for Quarkus, the Hibernate team had to reorganize things a bit (collect the metadata offline, start the Elasticsearch client later...).
-
-This couldn't be done in the 5.x code base so we decided to go with the in-progress Hibernate Search 6.
-
-=== Can I really use it?
-
-While Hibernate Search 6 is still at Beta stage, the code is of production quality and can be relied on.
-
-What we don't guarantee is that there might be API changes along the way to the final release of Hibernate Search 6 and you might have to adapt your code.
-
-If it is not a major issue for you, then sure you can use it.
-
-=== Why Elasticsearch only?
-
-Hibernate Search supports both a Lucene backend and an Elasticsearch backend.
-
-In the context of Quarkus and to build microservices, we thought the latter would make more sense.
-Thus we focused our efforts on it.
-
-We don't have plans to support the Lucene backend in Quarkus for now.
-
-[[configuration-reference]]
-== Hibernate Search Configuration Reference
-
-include::{generated-dir}/config/quarkus-hibernate-search-elasticsearch.adoc[leveloffset=+1, opts=optional]
diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc
new file mode 100644
index 0000000000000..e0b09a227b57b
--- /dev/null
+++ b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc
@@ -0,0 +1,807 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Hibernate Search guide
+:hibernate-search-doc-prefix: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/
+include::./attributes.adoc[]
+
+You have a Hibernate ORM-based application? You want to provide a full-featured full-text search to your users? You're at the right place.
+
+With this guide, you'll learn how to synchronize your entities to an Elasticsearch cluster in a heart beat with Hibernate Search.
+We will also explore how you can can query your Elasticsearch cluster using the Hibernate Search API.
+
+== Prerequisites
+
+To complete this guide, you need:
+
+* less than 20 minutes
+* an IDE
+* JDK 1.8+ installed with `JAVA_HOME` configured appropriately
+* Apache Maven {maven-version}
+* Docker
+* link:building-native-image[GraalVM installed if you want to run in native mode]
+
+== Architecture
+
+The application described in this guide allows to manage a (simple) library: you manage authors and their books.
+
+The entities are stored in a PostgreSQL database and indexed in an Elasticsearch cluster.
+
+== Solution
+
+We recommend that you follow the instructions in the next sections and create the application step by step.
+However, you can go right to the completed example.
+
+Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
+
+The solution is located in the `hibernate-search-orm-elasticsearch-quickstart` {quickstarts-tree-url}/hibernate-search-orm-elasticsearch-quickstart[directory].
+
+[NOTE]
+====
+The provided solution contains a few additional elements such as tests and testing infrastructure.
+====
+
+== Creating the Maven project
+
+First, we need a new project. Create a new project with the following command:
+
+[source,bash,subs=attributes+]
+----
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
+    -DprojectGroupId=org.acme \
+    -DprojectArtifactId=hibernate-search-orm-elasticsearch-quickstart \
+    -DclassName="org.acme.hibernate.search.elasticsearch.LibraryResource" \
+    -Dpath="/library" \
+    -Dextensions="resteasy,hibernate-orm-panache,hibernate-search-orm-elasticsearch,resteasy-jackson,jdbc-postgresql"
+cd hibernate-search-orm-elasticsearch-quickstart
+----
+
+This command generates a Maven structure importing the following extensions:
+
+ * Hibernate ORM with Panache,
+ * the PostgreSQL JDBC driver,
+ * Hibernate Search + Elasticsearch,
+ * RESTEasy and Jackson.
+
+If you already have your Quarkus project configured, you can add the `hibernate-search-orm-elasticsearch` extension
+to your project by running the following command in your project base directory:
+
+[source,bash]
+----
+./mvnw quarkus:add-extension -Dextensions="hibernate-search-orm-elasticsearch"
+----
+
+This will add the following to your `pom.xml`:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
+</dependency>
+----
+
+[IMPORTANT]
+====
+For now, let's delete the two generated tests `LibraryResourceTest` and `NativeLibraryResourceIT` present in `src/test/java`.
+If you are interested in how you can test this application, just refer to the solution in the quickstarts Git repository:
+it contains a lot of tests and the required testing infrastructure.
+====
+
+== Creating the bare entities
+
+First, let's create our Hibernate ORM entities `Book` and `Author` in the `model` subpackage.
+
+[source,java]
+----
+package org.acme.hibernate.search.elasticsearch.model;
+
+import java.util.List;
+import java.util.Objects;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class Author extends PanacheEntity { // <1>
+
+    public String firstName;
+
+    public String lastName;
+
+    @OneToMany(mappedBy = "author", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER) // <2>
+    public List<Book> books;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Author)) {
+            return false;
+        }
+
+        Author other = (Author) o;
+
+        return Objects.equals(id, other.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return 31;
+    }
+}
+----
+<1> We are using Hibernate ORM with Panache, it is not mandatory.
+<2> We are loading these elements eagerly so that they are present in the JSON output.
+In a real world application, you should probably use a DTO approach.
+
+[source,java]
+----
+package org.acme.hibernate.search.elasticsearch.model;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class Book extends PanacheEntity {
+
+    public String title;
+
+    @ManyToOne
+    @JsonIgnore <1>
+    public Author author;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Book)) {
+            return false;
+        }
+
+        Book other = (Book) o;
+
+        return Objects.equals(id, other.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return 31;
+    }
+}
+----
+<1> We mark this property with `@JsonIgnore` to avoid infinite loops when serializing with Jackson.
+
+== Initializing the REST service
+
+While everything is not yet set up for our REST service, we can initialize it with the standard CRUD operations we will need.
+
+Just copy this content in the `LibraryResource` file created by the Maven `create-project` command:
+
+[source,java]
+----
+package org.acme.hibernate.search.elasticsearch;
+
+import javax.transaction.Transactional;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.acme.hibernate.search.elasticsearch.model.Author;
+import org.acme.hibernate.search.elasticsearch.model.Book;
+import org.jboss.resteasy.annotations.jaxrs.FormParam;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@Path("/library")
+public class LibraryResource {
+
+    @PUT
+    @Path("book")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public void addBook(@FormParam String title, @FormParam Long authorId) {
+        Author author = Author.findById(authorId);
+        if (author == null) {
+            return;
+        }
+
+        Book book = new Book();
+        book.title = title;
+        book.author = author;
+        book.persist();
+
+        author.books.add(book);
+        author.persist();
+    }
+
+    @DELETE
+    @Path("book/{id}")
+    @Transactional
+    public void deleteBook(@PathParam Long id) {
+        Book book = Book.findById(id);
+        if (book != null) {
+            book.author.books.remove(book);
+            book.delete();
+        }
+    }
+
+    @PUT
+    @Path("author")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public void addAuthor(@FormParam String firstName, @FormParam String lastName) {
+        Author author = new Author();
+        author.firstName = firstName;
+        author.lastName = lastName;
+        author.persist();
+    }
+
+    @POST
+    @Path("author/{id}")
+    @Transactional
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public void updateAuthor(@PathParam Long id, @FormParam String firstName, @FormParam String lastName) {
+        Author author = Author.findById(id);
+        if (author == null) {
+            return;
+        }
+        author.firstName = firstName;
+        author.lastName = lastName;
+        author.persist();
+    }
+
+    @DELETE
+    @Path("author/{id}")
+    @Transactional
+    public void deleteAuthor(@PathParam Long id) {
+        Author author = Author.findById(id);
+        if (author != null) {
+            author.delete();
+        }
+    }
+}
+----
+
+Nothing out of the ordinary here: it is just good old Hibernate ORM with Panache operations in a standard JAX-RS service.
+
+In fact, the interesting part is that we will need to add very few elements to make our full text search application working.
+
+== Using Hibernate Search annotations
+
+Let's go back to our entities.
+
+Enabling full text search capabilities for them is as simple as adding a few annotations.
+
+Let's edit the `Book` entity again to include this content:
+
+[source,java]
+----
+package org.acme.hibernate.search.elasticsearch.model;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+@Indexed // <1>
+public class Book extends PanacheEntity {
+
+    @FullTextField(analyzer = "english") // <2>
+    public String title;
+
+    @ManyToOne
+    @JsonIgnore
+    public Author author;
+
+    // Preexisting equals()/hashCode() methods
+}
+----
+<1> First, let's use the `@Indexed` annotation to register our `Book` entity as part of the full text index.
+<2> The `@FullTextField` annotation declares a field in the index specifically tailored for full text search.
+In particular, we have to define an analyzer to split and analyze the tokens (~ words) - more on this later.
+
+Now that our books are indexed, we can do the same for the authors.
+
+Open the `Author` class and include the content below.
+
+Things are quite similar here: we use the `@Indexed`, `@FullTextField` and `@KeywordField` annotations.
+
+There are a few differences/additions though. Let's check them out.
+
+[source,java]
+----
+package org.acme.hibernate.search.elasticsearch.model;
+
+import java.util.List;
+import java.util.Objects;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+
+import org.hibernate.search.engine.backend.types.Sortable;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+@Indexed
+public class Author extends PanacheEntity {
+
+    @FullTextField(analyzer = "name") // <1>
+    @KeywordField(name = "firstName_sort", sortable = Sortable.YES, normalizer = "sort") // <2>
+    public String firstName;
+
+    @FullTextField(analyzer = "name")
+    @KeywordField(name = "lastName_sort", sortable = Sortable.YES, normalizer = "sort")
+    public String lastName;
+
+    @OneToMany(mappedBy = "author", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    @IndexedEmbedded // <3>
+    public List<Book> books;
+
+    // Preexisting equals()/hashCode() methods
+}
+----
+<1> We use a `@FullTextField` similar to what we did for `Book` but you'll notice that the analyzer is different - more on this later.
+<2> As you can see, we can define several fields for the same property.
+Here, we define a `@KeywordField` with a specific name.
+The main difference is that a keyword field is not tokenized (the string is kept as one single token) but can be normalized (i.e. filtered) - more on this later.
+This field is marked as sortable as our intention is to use it for sorting our authors.
+<3> The purpose of `@IndexedEmbedded` is to include the `Book` fields into the `Author` index.
+In this case, we just use the default configuration: all the fields of the associated `Book` entities are included in the index (i.e. the `title` field).
+The nice thing with `@IndexedEmbedded` is that it is able to automatically reindex an `Author` if one of its ``Book``s has been updated thanks to the bidirectional relation.
+`@IndexedEmbedded` also supports nested documents (using the `storage = NESTED` attribute) but we don't need it here.
+You can also specify the fields you want to include in your parent index using the `includePaths` attribute if you don't want them all.
+
+== Analyzers and normalizers
+
+=== Introduction
+
+Analysis is a big part of full text search: it defines how text will be processed when indexing or building search queries.
+
+The role of analyzers is to split the text into tokens (~ words) and filter them (making it all lowercase and removing accents for instance).
+
+Normalizers are a special type of analyzers that keeps the input as a single token.
+It is especially useful for sorting or indexing keywords.
+
+There are a lot of bundled analyzers but you can also develop your own for your own specific purposes.
+
+You can learn more about the Elasticsearch analysis framework in the https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis.html[Analysis section of the Elasticsearch documentation].
+
+=== Defining the analyzers used
+
+When we added the Hibernate Search annotations to our entities, we defined the analyzers and normalizers used.
+Typically:
+
+[source,java]
+----
+@FullTextField(analyzer = "english")
+----
+
+[source,java]
+----
+@FullTextField(analyzer = "name")
+----
+
+[source,java]
+----
+@KeywordField(name = "lastName_sort", sortable = Sortable.YES, normalizer = "sort")
+----
+
+We use:
+
+ * an analyzer called `name` for person names,
+ * an analyzer called `english` for book titles,
+ * a normalizer called `sort` for our sort fields
+
+but we haven't set them up yet.
+
+Let's see how you can do it with Hibernate Search.
+
+[[analysis-configurer]]
+=== Setting up the analyzers
+
+It is an easy task, we just need to create an implementation of `ElasticsearchAnalysisConfigurer`
+(and configure Quarkus to use it, more on that later).
+
+To fulfill our requirements, let's create the following implementation:
+
+[source,java]
+----
+package org.acme.hibernate.search.elasticsearch.config;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Named;
+
+@Dependent
+@Named("myAnalysisConfigurer") // <1>
+public class AnalysisConfigurer implements ElasticsearchAnalysisConfigurer {
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        context.analyzer("name").custom() // <2>
+                .tokenizer("standard")
+                .tokenFilters("asciifolding", "lowercase");
+
+        context.analyzer("english").custom() // <3>
+                .tokenizer("standard")
+                .tokenFilters("asciifolding", "lowercase", "porter_stem");
+
+        context.normalizer("sort").custom() // <4>
+                .tokenFilters("asciifolding", "lowercase");
+    }
+}
+----
+<1> We will need to reference the configurer from the configuration properties, so we make it a named bean.
+<2> This is a simple analyzer separating the words on spaces, removing any non-ASCII characters by its ASCII counterpart (and thus removing accents) and putting everything in lowercase.
+It is used in our examples for the author's names.
+<3> We are a bit more aggressive with this one and we include some stemming: we will be able to search for `mystery` and get a result even if the indexed input contains `mysteries`.
+It is definitely too aggressive for person names but it is perfect for the book titles.
+<4> Here is the normalizer used for sorting. Very similar to our first analyzer, except we don't tokenize the words as we want one and only one token.
+
+== Adding full text capabilities to our REST service
+
+In our existing `LibraryResource`, we just need to inject the `SearchSession`:
+
+[source,java]
+----
+    @Inject
+    SearchSession searchSession; // <1>
+----
+<1> Inject a Hibernate Search session, which relies on the `EntityManager` under the hood.
+Applications with multiple persistence units can use the CDI qualifier `@io.quarkus.hibernate.orm.PersistenceUnit`
+to select the right one:
+see <<multiple-persistence-units-attaching-cdi>>.
+
+And then we can add the following methods (and a few ``import``s):
+
+[source,java]
+----
+    @Transactional // <1>
+    void onStart(@Observes StartupEvent ev) throws InterruptedException { // <2>
+        // only reindex if we imported some content
+        if (Book.count() > 0) {
+            searchSession.massIndexer()
+                    .startAndWait();
+        }
+    }
+
+    @GET
+    @Path("author/search") // <3>
+    @Transactional
+    public List<Author> searchAuthors(@QueryParam String pattern, // <4>
+            @QueryParam Optional<Integer> size) {
+        return searchSession.search(Author.class) // <5>
+                .where(f ->
+                    pattern == null || pattern.trim().isEmpty() ?
+                            f.matchAll() : // <6>
+                            f.simpleQueryString()
+                                .fields("firstName", "lastName", "books.title").matching(pattern) // <7>
+                )
+                .sort(f -> f.field("lastName_sort").then().field("firstName_sort")) // <8>
+                .fetchHits(size.orElse(20)); // <9>
+    }
+----
+<1> Important point: we need a transactional context for these methods.
+<2> As we will import data into the PostgreSQL database using an SQL script, we need to reindex the data at startup.
+For this, we use Hibernate Search's mass indexer, which allows to index a lot of data efficiently (you can fine tune it for better performances).
+All the upcoming updates coming through Hibernate ORM operations will be synchronized automatically to the full text index.
+If you don't import data manually in the database, you don't need that:
+the mass indexer should then only be used when you change your indexing configuration (adding a new field, changing an analyzer's configuration...) and you want the new configuration to be applied to your existing entities.
+<3> This is where the magic begins: just adding the annotations to our entities makes them available for full text search: we can now query the index using the Hibernate Search DSL.
+<4> Use the `org.jboss.resteasy.annotations.jaxrs.QueryParam` annotation type to avoid repeating the parameter name.
+<5> We indicate that we are searching for ``Author``s.
+<6> We create a predicate: if the pattern is empty, we use a `matchAll()` predicate.
+<7> If we have a valid pattern, we create a https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-simple-query-string-query.html[`simpleQueryString()`] predicate on the `firstName`, `lastName` and `books.title` fields matching our pattern.
+<8> We define the sort order of our results. Here we sort by last name, then by first name. Note that we use the specific fields we created for sorting.
+<9> Fetch the `size` top hits, `20` by default. Obviously, paging is also supported.
+
+[NOTE]
+====
+The Hibernate Search DSL supports a significant subset of the Elasticsearch predicates (match, range, nested, phrase, spatial...).
+Feel free to explore the DSL using autocompletion.
+
+When that's not enough, you can always fall back to
+link:{hibernate-search-doc-prefix}#search-dsl-predicate-extensions-elasticsearch-from-json[defining a predicate using JSON directly].
+====
+
+== Configuring the application
+
+As usual, we can configure everything in the Quarkus configuration file, `application.properties`.
+
+Edit `src/main/resources/application.properties` and inject the following configuration:
+
+[source,properties]
+----
+quarkus.ssl.native=false <1>
+
+quarkus.datasource.db-kind=postgresql <2>
+quarkus.datasource.username=quarkus_test
+quarkus.datasource.password=quarkus_test
+quarkus.datasource.jdbc.url=jdbc:postgresql:quarkus_test
+
+quarkus.hibernate-orm.database.generation=drop-and-create <3>
+quarkus.hibernate-orm.sql-load-script=import.sql <4>
+
+quarkus.hibernate-search-orm.elasticsearch.version=7 <5>
+quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=bean:myAnalysisConfigurer <6>
+quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create <7>
+quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=sync <8>
+----
+<1> We won't use SSL so we disable it to have a more compact native executable.
+<2> Let's create a PostgreSQL datasource.
+<3> We will drop and recreate the schema every time we start the application.
+<4> We load some initial data.
+<5> We need to tell Hibernate Search about the version of Elasticsearch we will use.
+It is important because there are significant differences between Elasticsearch mapping syntax depending on the version.
+Since the mapping is created at build time to reduce startup time, Hibernate Search cannot connect to the cluster to automatically detect the version.
+<6> We point to the custom `AnalysisConfigurer` which defines the configuration of our analyzers and normalizers.
+<7> Obviously, this is not for production: we drop and recreate the index every time we start the application.
+<8> This means that we wait for the entities to be searchable before considering a write complete.
+On a production setup, the `write-sync` default will provide better performance.
+Using `sync` is especially important when testing as you need the entities to be searchable immediately.
+
+[TIP]
+For more information about the Hibernate Search extension configuration please refer to the <<configuration-reference, Configuration Reference>>.
+
+== Creating a frontend
+
+Now let's add a simple web page to interact with our `LibraryResource`.
+Quarkus automatically serves static resources located under the `META-INF/resources` directory.
+In the `src/main/resources/META-INF/resources` directory, overwrite the existing `index.html` file with the content from this
+{quickstarts-blob-url}/hibernate-search-orm-elasticsearch-quickstart/src/main/resources/META-INF/resources/index.html[index.html] file.
+
+== Automatic import script
+
+For the purpose of this demonstration, let's import an initial dataset.
+
+Let's create a `src/main/resources/import.sql` file with the following content:
+
+[source,sql]
+----
+INSERT INTO author(id, firstname, lastname) VALUES (nextval('hibernate_sequence'), 'John', 'Irving');
+INSERT INTO author(id, firstname, lastname) VALUES (nextval('hibernate_sequence'), 'Paul', 'Auster');
+
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The World According to Garp', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The Hotel New Hampshire', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The Cider House Rules', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'A Prayer for Owen Meany', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Last Night in Twisted River', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'In One Person', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Avenue of Mysteries', 1);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The New York Trilogy', 2);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Mr. Vertigo', 2);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'The Brooklyn Follies', 2);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Invisible', 2);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), 'Sunset Park', 2);
+INSERT INTO book(id, title, author_id) VALUES (nextval('hibernate_sequence'), '4 3 2 1', 2);
+----
+
+== Preparing the infrastructure
+
+We need a PostgreSQL instance and an Elasticsearch cluster.
+
+Let's use Docker to start one of each:
+
+[source,bash,subs=attributes+]
+----
+docker run -it --rm=true --name elasticsearch_quarkus_test -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch-oss:{elasticsearch-version}
+----
+
+[source,bash]
+----
+docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgresql_quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:13.1
+----
+
+== Time to play with your application
+
+You can now interact with your REST service:
+
+ * start Quarkus with `./mvnw compile quarkus:dev`
+ * open a browser to `http://localhost:8080/`
+ * search for authors or book titles (we initialized some data for you)
+ * create new authors and books and search for them too
+
+As you can see, all your updates are automatically synchronized to the Elasticsearch cluster.
+
+[[multiple-persistence-units]]
+== Multiple persistence units
+
+=== Configuring multiple persistence units
+
+With the Hibernate ORM extension,
+link:hibernate-orm#multiple-persistence-units[you can set up multiple persistence units],
+each with its own datasource and configuration.
+
+If you do declare multiple persistence units,
+you will also configure Hibernate Search separately for each persistence unit.
+
+The properties at the root of the `quarkus.hibernate-search-orm.` namespace define the default persistence unit.
+For instance, the following snippet defines a default datasource and a default persistence unit,
+and sets the Elasticsearch host for that persistence unit to `es1.mycompany.com:9200`.
+
+[source,properties]
+----
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+
+quarkus.hibernate-search-orm.elasticsearch.hosts=es1.mycompany.com:9200
+quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=write-sync
+----
+
+Using a map based approach, it is also possible to configure named persistence units:
+
+[source,properties]
+----
+quarkus.datasource."users".db-kind=h2 <1>
+quarkus.datasource."users".jdbc.url=jdbc:h2:mem:users;DB_CLOSE_DELAY=-1
+
+quarkus.datasource."inventory".db-kind=h2 <2>
+quarkus.datasource."inventory".jdbc.url=jdbc:h2:mem:inventory;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm."users".datasource=users <3>
+quarkus.hibernate-orm."users".packages=org.acme.model.user
+
+quarkus.hibernate-orm."inventory".datasource=inventory <4>
+quarkus.hibernate-orm."inventory".packages=org.acme.model.inventory
+
+quarkus.hibernate-search-orm."users".elasticsearch.hosts=es1.mycompany.com:9200 <5>
+quarkus.hibernate-search-orm."users".elasticsearch.version=7
+quarkus.hibernate-search-orm."users".automatic-indexing.synchronization.strategy=write-sync
+
+quarkus.hibernate-search-orm."inventory".elasticsearch.hosts=es2.mycompany.com:9200 <6>
+quarkus.hibernate-search-orm."inventory".elasticsearch.version=7
+quarkus.hibernate-search-orm."inventory".automatic-indexing.synchronization.strategy=write-sync
+----
+<1> Define a datasource named `users`.
+<2> Define a datasource named `inventory`.
+<3> Define a persistence unit called `users` pointing to the `users` datasource.
+<4> Define a persistence unit called `inventory` pointing to the `inventory` datasource.
+<5> Configure Hibernate Search for the `users` persistence unit,
+setting the Elasticsearch host for that persistence unit to `es1.mycompany.com:9200`.
+<6> Configure Hibernate Search for the `inventory` persistence unit,
+setting the Elasticsearch host for that persistence unit to `es2.mycompany.com:9200`.
+
+[[multiple-persistence-units-attaching-model-classes]]
+=== Attaching model classes to persistence units
+
+For each persistence unit, Hibernate Search will only consider indexed entities that are attached to that persistence unit.
+Entities are attached to a persistence unit by
+link:hibernate-orm#multiple-persistence-units-attaching-model-classes[configuring the Hibernate ORM extension].
+
+[[multiple-persistence-units-attaching-cdi]]
+=== CDI integration
+
+You can inject Hibernate Search's main entry points, `SearchSession` and `SearchMapping`, using CDI:
+
+[source,java]
+----
+@Inject
+SearchSession searchSession;
+----
+
+This will inject the `SearchSession` of the default persistence unit.
+
+To inject the `SearchSession` of a named persistence unit (`users` in our example),
+just add a qualifier:
+
+[source,java]
+----
+@Inject
+@PersistenceUnit("users") <1>
+SearchSession searchSession;
+----
+<1> This is the `@io.quarkus.hibernate.orm.PersistenceUnit` annotation.
+
+You can inject the `SearchMapping` of a named persistence unit using the exact same mechanism:
+
+[source,java]
+----
+@Inject
+@PersistenceUnit("users")
+SearchMapping searchMapping;
+----
+
+== Building a native executable
+
+You can build a native executable with the usual command `./mvnw package -Pnative`.
+
+[NOTE]
+====
+As usual with native executable compilation, this operation consumes a lot of memory.
+
+It might be safer to stop the two containers while you are building the native executable and start them again once you are done.
+====
+
+Running it is as simple as executing `./target/hibernate-search-orm-elasticsearch-quickstart-1.0.0-SNAPSHOT-runner`.
+
+You can then point your browser to `http://localhost:8080/` and use your application.
+
+[NOTE]
+====
+The startup is a bit slower than usual: it is mostly due to us dropping and recreating the database schema and the Elasticsearch mapping every time at startup.
+We also inject some data and execute the mass indexer.
+
+In a real life application, it is obviously something you won't do at startup.
+====
+
+== Further reading
+
+If you are interested in learning more about Hibernate Search 6,
+the Hibernate team publishes link:{hibernate-search-doc-prefix}[an extensive reference documentation].
+
+== FAQ
+
+=== Why Elasticsearch only?
+
+Hibernate Search supports both a Lucene backend and an Elasticsearch backend.
+
+In the context of Quarkus and to build microservices, we thought the latter would make more sense.
+Thus we focused our efforts on it.
+
+We don't have plans to support the Lucene backend in Quarkus for now.
+
+[[configuration-reference]]
+== Hibernate Search Configuration Reference
+
+include::{generated-dir}/config/quarkus-hibernate-search-orm-elasticsearch.adoc[leveloffset=+1, opts=optional]
+
+[NOTE]
+[[bean-reference-note-anchor]]
+.About bean references
+====
+When referencing beans using a string value in configuration properties, that string is parsed.
+
+Here are the most common formats:
+
+* `bean:` followed by the name of a `@Named` CDI bean.
+For example `bean:myBean`.
+* `class:` followed by the fully-qualified name of a class, to be instantiated through CDI if it's a CDI bean,
+or through its public, no-argument constructor otherwise.
+For example `class:com.mycompany.MyClass`.
+* An arbitrary string referencing a built-in implementation.
+Available values are detailed in the documentation of each configuration property,
+such as `async`/`read-sync`/`write-sync`/`sync` for
+<<quarkus-hibernate-search-orm-elasticsearch_quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy,`quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy`>>.
+
+Other formats are also accepted, but are only useful for advanced use cases.
+See link:{hibernate-search-doc-prefix}#configuration-bean-reference-parsing[this section of Hibernate Search's reference documentation]
+for more information.
+====
diff --git a/docs/src/main/asciidoc/http-reference.adoc b/docs/src/main/asciidoc/http-reference.adoc
index b10f5dbe9a9b5..5ff491113760d 100644
--- a/docs/src/main/asciidoc/http-reference.adoc
+++ b/docs/src/main/asciidoc/http-reference.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - HTTP Reference
 
@@ -67,6 +67,7 @@ will be served relative to `{quarkus.http.root-path}/{quarkus.servlet.context-pa
 If REST Assured is used for testing and `quarkus.http.root-path` is set then Quarkus will automatically configure the
 base URL for use in Quarkus tests, so test URL's should not include the root path.
 
+[[ssl]]
 == Supporting secure connections with SSL
 
 In order to have Quarkus support secure connections, you must either provide a certificate and associated key file, or supply a keystore.
@@ -101,7 +102,7 @@ As with the certificate/key file combination, Quarkus will first try to resolve
 
 Add the following property to your `application.properties`:
 
-[source,shell]
+[source,bash]
 ----
 quarkus.http.ssl.certificate.key-store-file=/path/to/keystore
 ----
@@ -155,6 +156,19 @@ If you want to disable HTTP/2 you can set:
 quarkus.http.http2=false
 ----
 
+== Listening on a Random Port
+
+If you don't want to specify a port you can set `quarkus.http.port=0` or `quarkus.http.test-port=0`. A random open port
+will be picked by the OS, and a log message printed in the console. When the port is bound the `quarkus.http.port` system
+property will be set to the actual port that was selected, so you can use this to get the actual port number from inside
+the application. If you are in a test you can inject the URL normally and this will be configured with the actual port,
+and REST Assured will also be configured appropriately.
+
+WARNING: As this sets a system property you can access `quarkus.http.port` via MicroProfile Config, however if you use
+injection the injected value may not always be correct. This port allocation is one of the last things to happen in
+Quarkus startup, so if your object that is being injected is created eagerly before the port has opened the injected
+value will not be correct.
+
 == CORS filter
 
 link:https://en.wikipedia.org/wiki/Cross-origin_resource_sharing[Cross-origin resource sharing] (CORS) is a mechanism that
@@ -175,13 +189,13 @@ following properties will be applied before passing the request on to its actual
 [cols="<m,<m,<2",options="header"]
 |===
 |Property Name|Default|Description
-|quarkus.http.cors.origins||The comma-separated list of origins allowed for CORS. The filter allows any origin if this is not
-set.
-|quarkus.http.cors.methods||The comma-separated list of HTTP methods allowed for CORS. The filter allows any method if this is
-not set.
-|quarkus.http.cors.headers||The comma-separated list of HTTP headers allowed for CORS. The filter allows any header if this is
-not set.
-|quarkus.http.cors.exposed-headers||The comma-separated list of HTTP headers exposed in CORS.
+|quarkus.http.cors.origins|*|The comma-separated list of origins allowed for CORS. The filter allows any origin if this is not set or set to '*'.
+|quarkus.http.cors.methods|*|The comma-separated list of HTTP methods allowed for CORS. The filter allows any method if this is
+not set or set to '*'.
+|quarkus.http.cors.headers|*|The comma-separated list of HTTP headers allowed for CORS. The filter allows any header if this is
+not set or set to '*'.
+|quarkus.http.cors.exposed-headers|*|The comma-separated list of HTTP headers exposed in CORS. The filter allows any headers to be exposed if this is
+not set or set to '*'.
 |quarkus.http.cors.access-control-max-age||The duration (see note below) indicating how long the results of a pre-flight request can be cached.
 This value will be returned in a `Access-Control-Max-Age` response header.
 |quarkus.http.cors.access-control-allow-credentials||Boolean value to tell the browsers to expose the response to front-end JavaScript code
diff --git a/docs/src/main/asciidoc/ide-tooling.adoc b/docs/src/main/asciidoc/ide-tooling.adoc
new file mode 100644
index 0000000000000..0e009fdf5c884
--- /dev/null
+++ b/docs/src/main/asciidoc/ide-tooling.adoc
@@ -0,0 +1,161 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Quarkus Tools in your favorite IDE
+
+include::./attributes.adoc[]
+
+The following IDEs have support for the community developed Quarkus Tools:
+
+* https://marketplace.visualstudio.com/items?itemName=redhat.vscode-quarkus[Quarkus Tools for Visual Studio Code]
+* https://marketplace.eclipse.org/content/quarkus-tools[Quarkus Tools for Eclipse]
+* https://plugins.jetbrains.com/plugin/13234-quarkus/versions[Quarkus Tools for IntelliJ]
+* https://github.com/eclipse/che-devfile-registry/blob/master/devfiles/quarkus/devfile.yaml[Quarkus Tools for Eclipse Che]
+
+In addition IntelliJ has additional support for Quarkus in their Ultimate non-open source version.
+
+* https://www.jetbrains.com/help/idea/quarkus.html[IntelliJ Ultimate Edition built-in Quarkus support]
+
+The table below gives an overview of the current IDEs with links and a high-level overview of their features.
+
+:vscode-logo: https://simpleicons.org/icons/visualstudiocode.svg 
+:eclipse-logo: https://simpleicons.org/icons/eclipseide.svg
+:intellij-logo: https://simpleicons.org/icons/intellijidea.svg
+:che-logo: https://simpleicons.org/icons/eclipseche.svg
+[cols="6*^", header]
+|===
+| .
+| image:{vscode-logo}[VSCode,100,100]
+{empty} +
+VSCode Quarkus Tools
+| image:{eclipse-logo}[Eclipse,100,100]
+{empty} +
+Eclipse Quarkus Tools
+| image:{intellij-logo}[IntelliJ,100,100]
+{empty} +
+IntelliJ Quarkus Tools
+| image:{intellij-logo}[IntelliJ,100,100]
+{empty} +
+IntelliJ Ultimate
+| image:{che-logo}[Eclipse Che,100,100]
+{empty} +
+Eclipse Che
+
+|Description
+|Visual Studio Code extension to install using the marketplace  
+|Eclipse plugin to install into Eclipse using an updatesite
+|IntelliJ plugin that works in IntelliJ Community and Ultimate. Available from Marketplace.
+|Built-in Quarkus features available only in IntelliJ Ultimate
+|Built-in Quarkus features available in Eclipse Che incl. che.openshift.io.
+
+|Status
+|Stable
+|Stable
+|Stable
+|Stable
+|Stable
+
+|Downloads
+| https://marketplace.visualstudio.com/items?itemName=redhat.vscode-quarkus[Marketplace]
+{empty} +
+ https://download.jboss.org/jbosstools/vscode/snapshots/vscode-quarkus/?C=M;O=D[Development Builds]
+| https://download.jboss.org/jbosstools/photon/snapshots/builds/jbosstools-quarkus_master/[Development Update Site]
+| https://plugins.jetbrains.com/plugin/13234-quarkus/versions[Marketplace]
+{empty} +
+https://download.jboss.org/jbosstools/intellij/snapshots/intellij-quarkus/[Development Builds]
+| https://www.jetbrains.com/idea/nextversion/[Installer]
+| https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/getting-started/quarkus/devfile.yaml[Start Che Workspace]
+
+|Source
+|https://github.com/redhat-developer/vscode-quarkus[Github]
+|https://github.com/jbosstools/jbosstools-quarkus[Github]
+|https://github.com/redhat-developer/intellij-quarkus[Github]
+|Closed-Source
+|
+
+|https://github.com/redhat-developer/quarkus-ls[Quarkus Language Server]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:times[]
+|icon:check[]
+
+|Wizards w/code.quarkus.io
+|icon:check[]
+|icon:check[]
+|https://issues.jboss.org/browse/JBIDE-26950[icon:times[]]
+|icon:check[]
+|icon:check[]
+
+|Custom Wizard
+|icon:times[]
+|icon:times[]
+|icon:check[]
+|icon:check[]
+|icon:times[]
+
+|Config editor
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:times[]
+|icon:check[]
+
+|Config autocompletion
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+
+|Config validation
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+
+|Config jump to definition
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|?
+|icon:check[]
+
+|Config profiles
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:check[]
+
+|Config outline 
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:times[]
+|icon:check[]
+
+|Easy Launch debug/dev:mode
+|icon:check[]
+|icon:check[]
+|icon:times[]
+|icon:check[]
+|icon:check[]
+
+|Quarkus Code Snippets
+|icon:check[]
+|icon:check[]
+|icon:check[]
+|icon:times[]
+|icon:check[]
+
+|Injection Discovery/Navigation
+|icon:times[]
+|icon:times[]
+|icon:times[]
+|icon:check[]
+|icon:times[]
+|===
diff --git a/docs/src/main/asciidoc/images/dev-ui-embedded-file.png b/docs/src/main/asciidoc/images/dev-ui-embedded-file.png
new file mode 100644
index 0000000000000..3a9db71c6c9e8
Binary files /dev/null and b/docs/src/main/asciidoc/images/dev-ui-embedded-file.png differ
diff --git a/docs/src/main/asciidoc/images/dev-ui-embedded.png b/docs/src/main/asciidoc/images/dev-ui-embedded.png
new file mode 100644
index 0000000000000..f73049c7d54dd
Binary files /dev/null and b/docs/src/main/asciidoc/images/dev-ui-embedded.png differ
diff --git a/docs/src/main/asciidoc/images/dev-ui-interactive.png b/docs/src/main/asciidoc/images/dev-ui-interactive.png
new file mode 100644
index 0000000000000..d057c25975a05
Binary files /dev/null and b/docs/src/main/asciidoc/images/dev-ui-interactive.png differ
diff --git a/docs/src/main/asciidoc/images/dev-ui-message.png b/docs/src/main/asciidoc/images/dev-ui-message.png
new file mode 100644
index 0000000000000..fe77b0f884d43
Binary files /dev/null and b/docs/src/main/asciidoc/images/dev-ui-message.png differ
diff --git a/docs/src/main/asciidoc/images/dev-ui-overview.png b/docs/src/main/asciidoc/images/dev-ui-overview.png
new file mode 100644
index 0000000000000..de9b428e504c3
Binary files /dev/null and b/docs/src/main/asciidoc/images/dev-ui-overview.png differ
diff --git a/docs/src/main/asciidoc/images/dev-ui-page.png b/docs/src/main/asciidoc/images/dev-ui-page.png
new file mode 100644
index 0000000000000..59a2ce0254a6a
Binary files /dev/null and b/docs/src/main/asciidoc/images/dev-ui-page.png differ
diff --git a/docs/src/main/asciidoc/images/graphql-ui-screenshot01.png b/docs/src/main/asciidoc/images/graphql-ui-screenshot01.png
index 6b8731dde8196..33fb24a1a11e2 100644
Binary files a/docs/src/main/asciidoc/images/graphql-ui-screenshot01.png and b/docs/src/main/asciidoc/images/graphql-ui-screenshot01.png differ
diff --git a/docs/src/main/asciidoc/images/health-ui-screenshot01.png b/docs/src/main/asciidoc/images/health-ui-screenshot01.png
index 153f48aed202e..782c66f47baf8 100644
Binary files a/docs/src/main/asciidoc/images/health-ui-screenshot01.png and b/docs/src/main/asciidoc/images/health-ui-screenshot01.png differ
diff --git a/docs/src/main/asciidoc/images/http-blocking-sequence.png b/docs/src/main/asciidoc/images/http-blocking-sequence.png
index 7c65758553415..9556452764afa 100644
Binary files a/docs/src/main/asciidoc/images/http-blocking-sequence.png and b/docs/src/main/asciidoc/images/http-blocking-sequence.png differ
diff --git a/docs/src/main/asciidoc/images/http-reactive-sequence.png b/docs/src/main/asciidoc/images/http-reactive-sequence.png
index 2e576a634bf56..a2dfd5820d2ff 100644
Binary files a/docs/src/main/asciidoc/images/http-reactive-sequence.png and b/docs/src/main/asciidoc/images/http-reactive-sequence.png differ
diff --git a/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot01.png b/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot01.png
index eb45a392ce4b8..41e2f61e433fa 100644
Binary files a/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot01.png and b/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot01.png differ
diff --git a/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot02.png b/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot02.png
index 53890f1819f36..11578b9e88144 100644
Binary files a/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot02.png and b/docs/src/main/asciidoc/images/openapi-swaggerui-guide-screenshot02.png differ
diff --git a/docs/src/main/asciidoc/images/quarkus-reactive-stack.png b/docs/src/main/asciidoc/images/quarkus-reactive-stack.png
index cf477385c7bb1..22fdb38294008 100644
Binary files a/docs/src/main/asciidoc/images/quarkus-reactive-stack.png and b/docs/src/main/asciidoc/images/quarkus-reactive-stack.png differ
diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/index.adoc
deleted file mode 100644
index d4242d507fe10..0000000000000
--- a/docs/src/main/asciidoc/index.adoc
+++ /dev/null
@@ -1,105 +0,0 @@
-= Quarkus
-
-include::./attributes.adoc[]
-
-include::quarkus-intro.adoc[tag=intro]
-
-== Getting Started
-
-* link:getting-started.html[Getting Started]
-* link:building-native-image.html[Building Native Executable]
-* link:deploying-to-kubernetes.html[Deploy Application on Kubernetes]
-* link:getting-started-knative.html[Deploy as Knative Application on Kubernetes]
-* link:tooling.html[Project Scaffolding and IDE]
-
-== Other guides
-
-* link:tooling.html[Use tooling with Quarkus]
-* link:config.html[Configuring Your Application]
-* link:logging.html[Configuring Logging]
-* link:centralized-log-management.html[Central log management]
-* link:lifecycle.html[Application Initialization and Termination]
-* link:rest-json.html[Writing JSON REST Services]
-* link:scheduler.html[Schedule Periodic Tasks]
-* link:quartz.html[Schedule Periodic Tasks with Quartz]
-* link:websockets.html[Using Websockets]
-* link:validation.html[Validation with Hibernate Validator]
-* link:transaction.html[Using Transactions]
-* link:software-transactional-memory.html[Using Software Transactional Memory]
-* link:hibernate-orm.html[Using Hibernate ORM]
-* link:hibernate-orm-panache.html[Simplified Hibernate ORM with Panache]
-* link:blaze-persistence.html[Using Blaze-Persistence]
-* link:rest-client.html[Using REST Client]
-* link:native-and-ssl.html[Native executables and SSL]
-* link:opentracing.html[Using OpenTracing]
-* link:security.html[Using Security]
-* link:security-jwt.html[Using JWT RBAC Security]
-* link:infinispan-client.html[Using Infinispan Client]
-* link:spring-di.html[Quarkus Extension for Spring DI API]
-* link:spring-web.html[Quarkus Extension for Spring Web API]
-* link:spring-data-jpa.html[Quarkus Extension for Spring Data API]
-* link:kotlin.html[Using Kotlin]
-* link:microprofile-health.html[Using MicroProfile Health]
-* link:microprofile-fault-tolerance.html[Using Fault Tolerance]
-* link:context-propagation.html[Context Propagation]
-* link:http-reference.html[HTTP Reference]
-* link:writing-extensions.html[Write Your Own Extension] _(advanced)_
-* link:writing-native-applications-tips.html[Tips for writing native applications] _(advanced)_
-* link:performance-measure.html[Measuring Performance] _(advanced)_
-* link:cdi-reference.html[Contexts and Dependency Injection] _(advanced)_
-* link:security-openid-connect.html[Using OpenID Connect Adapter to Protect JAX-RS Applications]
-* link:security-openid-connect-web-authentication.html[Protecting Web Applications Using OpenID Connect]
-* link:security-openid-connect-multitenancy.html[Supporting Multi-Tenancy in OpenID Connect Applications]
-* link:security-keycloak-authorization.html[Keycloak Authorization]
-* link:kogito.html[Using Kogito (business automation with processes and rules)]
-* link:optaplanner.html[Using AI to optimize a schedule with OptaPlanner]
-* link:security-oauth2.html[Using OAuth2 RBAC]
-* link:tika.html[Using Apache Tika]
-* link:mongodb.html[Using MongoDB]
-* link:mongodb-panache.html[Simplified MongoDB with Panache]
-* link:jms.html[Using Artemis JMS Client]
-* link:reactive-routes.html[Using Reactive Routes]
-* link:camel.html[Apache Camel]
-* link:command-mode-reference.html[Command Mode Applications]
-* link:grpc.html[Using gRPC]
-* link:picocli.html[Command Mode with Picocli]
-* link:redis.html[Connecting to Redis]
-
-* link:faq.html[FAQs]
-
-== Recommended tooling
-
-_Mandatory:_
-
-* https://adoptopenjdk.net/[Java - OpenJDK 1.8+]
-* https://maven.apache.org/install.html[Maven 3.5+]
-
-_Recommended:_
-
-* https://docs.docker.com/install/[Docker]
-* http://www.graalvm.org/docs/getting-started/[GraalVM {graalvm-version}]
-
-
-== Feedback, looking for help?
-
-You can contact the project team using:
-
-* the https://groups.google.com/forum/#!forum/quarkus-dev[quarkus-dev Google Groups]
-* chat using https://quarkus.zulipchat.com[Zulip]
-
-Your help is more than welcome! Don't hesitate to join the crowd.
-
-== Contributing
-
-Check the https://github.com/quarkus-project/quarkus/blob/master/CONTRIBUTING.md[Contribution Guide] for details on reporting issues and the process for submitting pull requests.
-
-Every contribution is valuable.
-It can be a bug report, an example application, a feature request, a fix in the documentation or just feedback.
-
-== Versioning
-
-We are in an incubation phase, so we don't have a 1.0.0 release yet.
-
-== License
-
-This project is licensed under the Apache Software License 2.0 - see the https://github.com/quarkus-project/quarkus/blob/master/LICENSE.txt[License file] for details.
diff --git a/docs/src/main/asciidoc/infinispan-client.adoc b/docs/src/main/asciidoc/infinispan-client.adoc
index 65f1eb85fcfe3..97a4d191b725c 100644
--- a/docs/src/main/asciidoc/infinispan-client.adoc
+++ b/docs/src/main/asciidoc/infinispan-client.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Infinispan Client
 
@@ -10,8 +10,8 @@ include::./attributes.adoc[]
 Infinispan is an in memory data grid that allows running in a server outside of application processes. This extension
 provides functionality to allow the client that can connect to said server when running in Quarkus.
 
-More information can be found about Infinispan at https://infinispan.org and the client/server at
-https://infinispan.org/docs/dev/user_guide/user_guide.html#client_server
+Check out the https://infinispan.org/documentation[Infinispan documentation] to find out more about the Infinispan project,
+in particular the https://infinispan.org/docs/stable/titles/hotrod_java/hotrod_java.html[Hot Rod Java client guide].
 
 == Configuration
 
@@ -72,12 +72,14 @@ public class Book {
    private final String description;
    private final int publicationYear;
    private final Set<Author> authors;
+   private final BigDecimal price;
 
-   public Book(String title, String description, int publicationYear, Set<Author> authors) {
+   public Book(String title, String description, int publicationYear, Set<Author> authors, BigDecimal price) {
       this.title = Objects.requireNonNull(title);
       this.description = Objects.requireNonNull(description);
       this.publicationYear = publicationYear;
       this.authors = Objects.requireNonNull(authors);
+      this.price = price;
    }
    // Getter/Setter/equals/hashCode/toString omitted
 }
@@ -144,6 +146,24 @@ Here is an example of how the preceding classes should be changed:
         return authors;
     }
 ----
+
+.BigDecimalAdapter.java
+[source,java]
+----
+@ProtoAdapter(BigDecimal.class)
+public class BigDecimalAdapter {
+    @ProtoFactory
+    BigDecimal create(Double value) {
+        return BigDecimal.valueOf(value);
+    }
+
+    @ProtoField(number = 1, type = Type.DOUBLE, defaultValue = "0")
+    Double value(BigDecimal value) {
+        return value.doubleValue();
+    }
+}
+----
+
 If your classes have only mutable fields, then the `ProtoFactory` annotation
 is not required, assuming your class has a no arg constructor.
 
@@ -153,7 +173,7 @@ on it to specify configuration settings
 .BookContextInitializer.java
 [source,java]
 ----
-@AutoProtoSchemaBuilder(includeClasses = { Book.class, Author.class }, schemaPackageName = "book_sample")
+@AutoProtoSchemaBuilder(includeClasses = { Book.class, Author.class, BigDecimalAdapter.class }, schemaPackageName = "book_sample")
 interface BookContextInitializer extends SerializationContextInitializer {
 }
 ----
@@ -185,8 +205,8 @@ message Book {
   required string title = 1;
   required string description = 2;
   required int32 publicationYear = 3; // no native Date type available in Protobuf
-
   repeated Author authors = 4;
+  requited double price = 5; // no native BigDecimal type available in Protobuf
 }
 
 message Author {
@@ -211,6 +231,8 @@ message Author {
             "  required int32 publicationYear = 3; // no native Date type available in Protobuf\n" +
             "\n" +
             "  repeated Author authors = 4;\n" +
+            "\n" +
+            "  required double price = 5; // no native BigDecimal type available in Protobuf\n" +
             "}\n" +
             "\n" +
             "message Author {\n" +
@@ -279,6 +301,7 @@ public class BookMarshaller implements MessageMarshaller<Book> {
       writer.writeString("description", book.getDescription());
       writer.writeInt("publicationYear", book.getPublicationYear());
       writer.writeCollection("authors", book.getAuthors(), Author.class);
+      writer.writeDouble("price", book.getPrice().doubleValue());
    }
 
    @Override
@@ -287,7 +310,8 @@ public class BookMarshaller implements MessageMarshaller<Book> {
       String description = reader.readString("description");
       int publicationYear = reader.readInt("publicationYear");
       Set<Author> authors = reader.readCollection("authors", new HashSet<>(), Author.class);
-      return new Book(title, description, publicationYear, authors);
+      BigDecimal price = BigDecimal.valueOf(reader.readDouble("price"));
+      return new Book(title, description, publicationYear, authors, price);
    }
 }
 ----
@@ -348,7 +372,7 @@ Either method of Serialization above will automatically register the schema with
 startup, meaning that you will automatically gain the ability to query objects stored in the
 remote Infinispan Server.
 
-You can read more about this at https://infinispan.org/docs/stable/titles/developing/developing.html#query_dsl.
+You can read more about https://infinispan.org/docs/stable/titles/developing/developing.html#creating_ickle_queries-querying[querying] in the Infinispan documentation.
 
 You can use either the Query DSL or the Ickle Query language with the Quarkus Infinispan client
 extension.
@@ -368,6 +392,8 @@ and you get it with no fuss. You can then use counters as you would normally.
 CounterManager counterManager;
 ----
 
+You can read more about https://infinispan.org/docs/stable/titles/developing/developing.html#clustered_counters[clustered counters] in the Infinispan documentation.
+
 == Near Caching
 
 Near caching is disabled by default, but you can enable it by setting the profile config property
@@ -380,8 +406,7 @@ a regular expression so that only a subset of caches have near caching applied t
 Encryption at this point requires additional steps to get working.
 
 The first step is to configure the `hotrod-client.properties` file to point to your truststore
-and/or keystore. This is further detailed at
-https://infinispan.org/docs/dev/user_guide/user_guide.html#hr_encryption.
+and/or keystore. This is further detailed https://infinispan.org/docs/stable/titles/hotrod_java/hotrod_java.html#hotrod_encryption[here].
 
 The Infinispan Client extension enables SSL by default. You can read more about this
 at link:native-and-ssl[Using SSL With Native Executables].
@@ -412,7 +437,7 @@ the Quarkus Infinispan Client extension.
 
 |===
 
-The guide for configuring these can be found at https://infinispan.org/docs/dev/user_guide/user_guide.html#authentication.
+The guide for configuring these can be found https://infinispan.org/docs/stable/titles/hotrod_java/hotrod_java.html#hotrod_authentication[here].
 However you need to configure these through the `hotrod-client.properties` file if using Dependency Injection.
 
 == Additional Features
diff --git a/docs/src/main/asciidoc/jgit.adoc b/docs/src/main/asciidoc/jgit.adoc
index 35939eab6a05f..c357432a345e1 100644
--- a/docs/src/main/asciidoc/jgit.adoc
+++ b/docs/src/main/asciidoc/jgit.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - JGit
 
diff --git a/docs/src/main/asciidoc/jms.adoc b/docs/src/main/asciidoc/jms.adoc
index 8b5b8806c9068..f49be31e9e1d8 100644
--- a/docs/src/main/asciidoc/jms.adoc
+++ b/docs/src/main/asciidoc/jms.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using JMS
 include::./attributes.adoc[]
@@ -51,24 +51,25 @@ We recommend that you follow the instructions in the next sections and create th
 However, you can go right to the completed example.
 
 Clone the Git repository: `git clone https://github.com/amqphub/quarkus-qpid-jms-quickstart.git`,
-or download an https://github.com/amqphub/quarkus-qpid-jms-quickstart/archive/master.zip[archive].
-
+or download an https://github.com/amqphub/quarkus-qpid-jms-quickstart/archive/main.zip[archive].
 
 === Creating the Maven Project
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=jms-quickstart \
-    -Dextensions="qpid-jms"
+    -DclassName="org.acme.jms.PriceResource" \
+    -Dpath="/prices" \
+    -Dextensions="resteasy,qpid-jms"
 cd jms-quickstart
 ----
 
 This command generates a Maven project, with its pom.xml importing the quarkus-qpid-jms extension:
-[source]
+[source,xml]
 ----
 <dependency>
     <groupId>org.amqphub.quarkus</groupId>
@@ -82,7 +83,7 @@ This command generates a Maven project, with its pom.xml importing the quarkus-q
 Then, we need an AMQP broker. In this case we will use an ActiveMQ Artemis server.
 You can follow the instructions from the https://activemq.apache.org/components/artemis/[Apache Artemis web site] or start a broker via docker:
 
-[source]
+[source,bash]
 ----
 docker run -it --rm -p 8161:8161 -p 61616:61616 -p 5672:5672 -e ARTEMIS_USERNAME=quarkus -e ARTEMIS_PASSWORD=quarkus vromero/activemq-artemis:2.11.0-alpine
 ----
@@ -287,7 +288,7 @@ injecting the ConnectionFactory.
 
 This is done in the `src/main/resources/application.properties` file.
 
-[source]
+[source,properties]
 ----
 # Configures the Qpid JMS properties.
 quarkus.qpid-jms.url=amqp://localhost:5672
@@ -303,7 +304,7 @@ More detail about the configuration are available in the https://github.com/amqp
 If you followed the instructions, you should have the Artemis server running.
 Then, you just need to run the application using:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -314,22 +315,22 @@ Open `http://localhost:8080/prices.html` in your browser.
 
 You can build the native executable with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative
 ----
 
 Or, if you don't have GraalVM installed, you can instead use Docker to build the native executable using:
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative -Dquarkus.native.container-build=true
 ----
 
 and then run with:
 
-[source, shell]
+[source,bash]
 ----
-./target/jms-quickstart-1.0-SNAPSHOT-runner
+./target/jms-quickstart-1.0.0-SNAPSHOT-runner
 ----
 
 Open `http://localhost:8080/prices.html` in your browser.
@@ -359,17 +360,19 @@ The Artemis JMS solution is located in the `jms-quickstart` {quickstarts-tree-ur
 
 Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=jms-quickstart \
-    -Dextensions="artemis-jms"
+    -DclassName="org.acme.jms.PriceResource" \
+    -Dpath="/prices" \
+    -Dextensions="resteasy,artemis-jms"
 cd jms-quickstart
 ----
 
 This creates a Maven project, with its pom.xml importing the quarkus-artemis-jms extension:
-[source]
+[source,xml]
 ----
 <dependency>
   <groupId>io.quarkus</groupId>
@@ -386,7 +389,7 @@ configuration below instead.
 We need to configure the Artemis connection properties.
 This is done in the `src/main/resources/application.properties` file.
 
-[source]
+[source,properties]
 ----
 # Configures the Artemis properties.
 quarkus.artemis.url=tcp://localhost:61616
diff --git a/docs/src/main/asciidoc/kafka-streams.adoc b/docs/src/main/asciidoc/kafka-streams.adoc
index cbd149dddeaf3..474774966661a 100644
--- a/docs/src/main/asciidoc/kafka-streams.adoc
+++ b/docs/src/main/asciidoc/kafka-streams.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Apache Kafka Streams
 
@@ -32,14 +32,14 @@ Using the dev mode, you'll instantly see messages on the output topic(s) as prod
 
 For the best development experience, we recommend applying the following configuration settings to your Kafka broker:
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 group.min.session.timeout.ms=250
 ----
 
 Also specify the following settings in your Quarkus `application.properties`:
 
-[source, subs=attributes+]
+[source,properties,subs=attributes+]
 ----
 kafka-streams.consumer.session.timeout.ms=250
 kafka-streams.consumer.heartbeat.interval.ms=200
@@ -52,7 +52,7 @@ Together, these settings will ensure that the application can very quickly recon
 
 In this guide, we are going to generate (random) temperature values in one component (named `generator`).
 These values are associated to given weather stations and are written in a Kafka topic (`temperature-values`).
-Another topic (`weather-stations`) contains just the master data about the weather stations themselves (id and name).
+Another topic (`weather-stations`) contains just the main data about the weather stations themselves (id and name).
 
 A second component (`aggregator`) reads from the two Kafka topics and processes them in a streaming pipeline:
 
@@ -82,12 +82,13 @@ The solution is located in the `kafka-streams-quickstart` {quickstarts-tree-url}
 First, we need a new project with the temperature value producer.
 Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=kafka-streams-quickstart-producer \
     -Dextensions="kafka" \
+    -DnoExamples \
     && mv kafka-streams-quickstart-producer producer
 ----
 
@@ -98,7 +99,7 @@ to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="kafka"
+./mvnw quarkus:add-extension -Dextensions="quarkus-smallrye-reactive-messaging-kafka"
 ----
 
 This will add the following to your `pom.xml`:
@@ -122,22 +123,20 @@ package org.acme.kafka.streams.producer.generator;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import javax.enterprise.context.ApplicationScoped;
 
+import io.smallrye.mutiny.Multi;
+import io.smallrye.reactive.messaging.kafka.Record;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 import org.jboss.logging.Logger;
 
-import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.kafka.KafkaRecord;
-
 /**
  * A bean producing random temperature data every second.
  * The values are written to a Kafka topic (temperature-values).
@@ -164,12 +163,10 @@ public class ValuesGenerator {
                     new WeatherStation(9, "Marrakesh", 20)
             ));
 
-
-    @Outgoing("temperature-values")                             // <1>
-    public Flowable<KafkaRecord<Integer, String>> generate() {
-
-        return Flowable.interval(500, TimeUnit.MILLISECONDS)    // <2>
-                .onBackpressureDrop()
+    @Outgoing("temperature-values")                                        // <1>
+    public Multi<Record<Integer, String>> generate() {
+        return Multi.createFrom().ticks().every(Duration.ofMillis(500))    // <2>
+                .onOverflow().drop()
                 .map(tick -> {
                     WeatherStation station = stations.get(random.nextInt(stations.size()));
                     double temperature = BigDecimal.valueOf(random.nextGaussian() * 15 + station.averageTemperature)
@@ -177,21 +174,19 @@ public class ValuesGenerator {
                             .doubleValue();
 
                     LOG.infov("station: {0}, temperature: {1}", station.name, temperature);
-                    return KafkaRecord.of(station.id, Instant.now() + ";" + temperature);
+                    return Record.of(station.id, Instant.now() + ";" + temperature);
                 });
     }
 
-    @Outgoing("weather-stations")                               // <3>
-    public Flowable<KafkaRecord<Integer, String>> weatherStations() {
-        List<KafkaRecord<Integer, String>> stationsAsJson = stations.stream()
-            .map(s -> KafkaRecord.of(
+    @Outgoing("weather-stations")                                          // <3>
+    public Multi<Record<Integer, String>> weatherStations() {
+        return Multi.createFrom().items(stations.stream()
+            .map(s -> Record.of(
                     s.id,
                     "{ \"id\" : " + s.id +
                     ", \"name\" : \"" + s.name + "\" }"))
-            .collect(Collectors.toList());
-
-        return Flowable.fromIterable(stationsAsJson);
-    };
+        );
+    }
 
     private static class WeatherStation {
 
@@ -207,9 +202,9 @@ public class ValuesGenerator {
     }
 }
 ----
-<1> Instruct Reactive Messaging to dispatch the items from the returned `Flowable` to `temperature-values`.
-<2> The method returns a RX Java 2 _stream_ (`Flowable`) emitting a random temperature value every 0.5 seconds.
-<3> Instruct Reactive Messaging to dispatch the items from the returned `Flowable` (static list of weather stations) to `weather-stations`.
+<1> Instruct Reactive Messaging to dispatch the items from the returned `Multi` to `temperature-values`.
+<2> The method returns a Mutiny _stream_ (`Multi`) emitting a random temperature value every 0.5 seconds.
+<3> Instruct Reactive Messaging to dispatch the items from the returned `Multi` (static list of weather stations) to `weather-stations`.
 
 The two methods each return a _reactive stream_ whose items are sent to the streams named `temperature-values` and `weather-stations`, respectively.
 
@@ -218,7 +213,7 @@ The two methods each return a _reactive stream_ whose items are sent to the stre
 The two channels are mapped to Kafka topics using the Quarkus configuration file `application.properties`.
 For that, add the following to the file `producer/src/main/resources/application.properties`:
 
-[source]
+[source,properties]
 ----
 # Configure the Kafka broker location
 kafka.bootstrap.servers=localhost:9092
@@ -241,16 +236,17 @@ With the producer application in place, it's time to implement the actual aggreg
 which will run the Kafka Streams pipeline.
 Create another project like so:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=kafka-streams-quickstart-aggregator \
-    -Dextensions="kafka-streams,resteasy-jsonb" \
+    -Dextensions="resteasy,kafka-streams,resteasy-jackson" \
+    -DnoExamples \
     && mv kafka-streams-quickstart-aggregator aggregator
 ----
 
-This creates the `aggregator` project with the Quarkus extension for Kafka Streams and with RESTEasy support for JSON-B.
+This creates the `aggregator` project with the Quarkus extension for Kafka Streams and with RESTEasy support for Jackson.
 
 If you already have your Quarkus project configured, you can add the `kafka-streams` extension
 to your project by running the following command in your project base directory:
@@ -385,7 +381,7 @@ import org.apache.kafka.streams.kstream.Produced;
 import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
 import org.apache.kafka.streams.state.Stores;
 
-import io.quarkus.kafka.client.serialization.JsonbSerde;
+import io.quarkus.kafka.client.serialization.ObjectMapperSerde;
 
 @ApplicationScoped
 public class TopologyProducer {
@@ -400,9 +396,9 @@ public class TopologyProducer {
     public Topology buildTopology() {
         StreamsBuilder builder = new StreamsBuilder();
 
-        JsonbSerde<WeatherStation> weatherStationSerde = new JsonbSerde<>(
+        ObjectMapperSerde<WeatherStation> weatherStationSerde = new ObjectMapperSerde<>(
                 WeatherStation.class);
-        JsonbSerde<Aggregation> aggregationSerde = new JsonbSerde<>(Aggregation.class);
+        ObjectMapperSerde<Aggregation> aggregationSerde = new ObjectMapperSerde<>(Aggregation.class);
 
         KeyValueBytesStoreSupplier storeSupplier = Stores.persistentKeyValueStore(
                 WEATHER_STATIONS_STORE);
@@ -472,6 +468,8 @@ e.g. via environment variables or system properties.
 `topics` is specific to Quarkus: the application will wait for all the given topics to exist before launching the Kafka Streams engine.
 This is to done to gracefully await the creation of topics that don't yet exist at application startup time.
 
+TIP: Alternatively, you can use `kafka.bootstrap.servers` instead of `quarkus.kafka-streams.bootstrap-servers` as you did in the _generator_ project above.
+
 All the properties within the `kafka-streams` namespace are passed through as-is to the Kafka Streams engine.
 Changing their values requires a rebuild of the application.
 
@@ -479,7 +477,7 @@ Changing their values requires a rebuild of the application.
 
 We now can build the `producer` and `aggregator` applications:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -f producer/pom.xml
 ./mvnw clean package -f aggregator/pom.xml
@@ -500,7 +498,7 @@ version: '3.5'
 
 services:
   zookeeper:
-    image: strimzi/kafka:0.11.3-kafka-2.1.0
+    image: strimzi/kafka:0.19.0-kafka-2.5.0
     command: [
       "sh", "-c",
       "bin/zookeeper-server-start.sh config/zookeeper.properties"
@@ -512,7 +510,7 @@ services:
     networks:
       - kafkastreams-network
   kafka:
-    image: strimzi/kafka:0.11.3-kafka-2.1.0
+    image: strimzi/kafka:0.19.0-kafka-2.5.0
     command: [
       "sh", "-c",
       "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT} --override num.partitions=$${KAFKA_NUM_PARTITIONS}"
@@ -558,19 +556,21 @@ networks:
 To launch all the containers, building the `producer` and `aggregator` container images,
 run `docker-compose up --build`.
 
+TIP: Instead of `QUARKUS_KAFKA_STREAMS_BOOTSTRAP_SERVERS`, you can use `KAFKA_BOOTSTRAP_SERVERS`.
+
 You should see log statements from the `producer` application about messages being sent to the "temperature-values" topic.
 
 Now run an instance of the _debezium/tooling_ image, attaching to the same network all the other containers run in.
 This image provides several useful tools such as _kafkacat_ and _httpie_:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
-docker run --tty --rm -i --network ks debezium/tooling:1.0
+docker run --tty --rm -i --network ks debezium/tooling:1.1
 ----
 
 Within the tooling container, run _kafkacat_ to examine the results of the streaming pipeline:
 
-[source, subs=attributes+]
+[source,subs=attributes+]
 ----
 kafkacat -b kafka:9092 -C -o beginning -q -t temperatures-aggregated
 
@@ -731,11 +731,9 @@ import java.util.List;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
@@ -752,8 +750,6 @@ public class WeatherStationEndpoint {
 
     @GET
     @Path("/data/{id}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     public Response getWeatherStationData(@PathParam("id") int id) {
         GetWeatherStationDataResult result = interactiveQueries.getWeatherStationData(id);
 
@@ -771,7 +767,7 @@ public class WeatherStationEndpoint {
 
 With this code in place, it's time to rebuild the application and the `aggregator` service in Docker Compose:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -f aggregator/pom.xml
 docker-compose stop aggregator
@@ -1021,7 +1017,7 @@ public class WeatherStationEndpoint {
 Now stop the `aggregator` service again and rebuild it.
 Then let's spin up three instances of it:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 ./mvnw clean package -f aggregator/pom.xml
 docker-compose stop aggregator
@@ -1078,7 +1074,8 @@ http 2af13fe516a9:8080/weather-stations/data/1
 
 If that node holds the data for key "1", you'll get a response like this:
 
-```
+[source]
+----
 HTTP/1.1 200 OK
 Connection: keep-alive
 Content-Length: 74
@@ -1093,23 +1090,25 @@ Date: Tue, 11 Jun 2019 19:16:31 GMT
   "stationId": 1,
   "stationName": "Hamburg"
 }
-```
+----
 
 Otherwise, the service will send a redirect:
 
-```
+[source]
+----
 HTTP/1.1 303 See Other
 Connection: keep-alive
 Content-Length: 0
 Date: Tue, 18 Jun 2019 20:01:03 GMT
 Location: http://1eb39af8d587:8080/weather-stations/data/1
-```
+----
 
 You can also have _httpie_ automatically follow the redirect by passing the `--follow option`:
 
-```bash
+[source,bash]
+----
 http --follow 2af13fe516a9:8080/weather-stations/data/1
-```
+----
 
 == Running Natively
 
@@ -1119,7 +1118,7 @@ natively via GraalVM without further configuration.
 To run both the `producer` and `aggregator` applications in native mode,
 the Maven builds can be executed using the `native` profile:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw clean package -f producer/pom.xml -Pnative -Dnative-image.container-runtime=docker
 ./mvnw clean package -f aggregator/pom.xml -Pnative -Dnative-image.container-runtime=docker
@@ -1127,7 +1126,7 @@ the Maven builds can be executed using the `native` profile:
 
 Now create an environment variable named `QUARKUS_MODE` and with value set to "native":
 
-[source, shell]
+[source,bash]
 ----
 export QUARKUS_MODE=native
 ----
@@ -1136,7 +1135,7 @@ This is used by the Docker Compose file to use the correct `Dockerfile` when bui
 The Kafka Streams application can work with less than 50 MB RSS in native mode.
 To do so, add the `Xmx` option to the program invocation in `aggregator/src/main/docker/Dockerfile.native`:
 
-[source, shell]
+[source,dockerfile]
 ----
 CMD ["./application", "-Dquarkus.http.host=0.0.0.0", "-Xmx32m"]
 ----
@@ -1151,12 +1150,12 @@ If you are using the `quarkus-smallrye-health` extension, `quarkus-kafka-streams
 * a readiness health check to validate that all topics declared in the `quarkus.kafka-streams.topics` property are created,
 * a liveness health check based on the Kafka Streams state.
 
-So when you access the `/health` endpoint of your application you will have information about the state of the Kafka Streams and the available and/or missing topics.
+So when you access the `/q/health` endpoint of your application you will have information about the state of the Kafka Streams and the available and/or missing topics.
 
 This is an example of when the status is `DOWN`:
 [source, subs=attributes+]
 ----
-curl -i http://aggregator:8080/health
+curl -i http://aggregator:8080/q/health
 
 HTTP/1.1 503 Service Unavailable
 content-type: application/json; charset=UTF-8
@@ -1183,8 +1182,8 @@ content-length: 454
     ]
 }
 ----
-<1> Liveness health check. Also available at `/health/live` endpoint.
-<2> Readiness health check. Also available at `/health/ready` endpoint.
+<1> Liveness health check. Also available at `/q/health/live` endpoint.
+<2> Readiness health check. Also available at `/q/health/ready` endpoint.
 
 So as you can see, the status is `DOWN` as soon as one of the `quarkus.kafka-streams.topics` is missing or the Kafka Streams `state` is not `RUNNING`.
 
@@ -1193,13 +1192,15 @@ As well as if no topics are missing, the `missing_topics` key will not be presen
 
 You can of course disable the health check of the `quarkus-kafka-streams` extension by setting the `quarkus.kafka-streams.health.enabled` property to `false` in your `application.properties`.
 
-Obviously you can create your liveness and readiness probes based on the respective endpoints `/health/live` and `/health/ready`.
+Obviously you can create your liveness and readiness probes based on the respective endpoints `/q/health/live` and `/q/health/ready`.
 
 === Liveness health check
 
 Here is an example of the liveness check:
-```
-curl -i http://aggregator:8080/health/live
+
+[source]
+----
+curl -i http://aggregator:8080/q/health/live
 
 HTTP/1.1 503 Service Unavailable
 content-type: application/json; charset=UTF-8
@@ -1217,14 +1218,16 @@ content-length: 225
         }
     ]
 }
-```
+----
 The `state` is coming from the `KafkaStreams.State` enum.
 
 === Readiness health check
 
 Here is an example of the readiness check:
-```
-curl -i http://aggregator:8080/health/ready
+
+[source]
+----
+curl -i http://aggregator:8080/q/health/ready
 
 HTTP/1.1 503 Service Unavailable
 content-type: application/json; charset=UTF-8
@@ -1242,15 +1245,14 @@ content-length: 265
         }
     ]
 }
-
-```
+----
 
 == Going Further
 
 This guide has shown how you can build stream processing applications using Quarkus and the Kafka Streams APIs,
 both in JVM and native modes.
 For running your KStreams application in production, you could also add health checks and metrics for the data pipeline.
-Refer to the Quarkus guides on link:microprofile-metrics[metrics] and link:microprofile-health[health checks] to learn more.
+Refer to the Quarkus guides on link:micrometer[Micrometer], link:microprofile-metrics[MicroProfile Metrics], and link:microprofile-health[health checks] to learn more.
 
 == Configuration Reference
 
diff --git a/docs/src/main/asciidoc/kafka.adoc b/docs/src/main/asciidoc/kafka.adoc
index 80b555fba604d..553910a150c30 100644
--- a/docs/src/main/asciidoc/kafka.adoc
+++ b/docs/src/main/asciidoc/kafka.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Apache Kafka with Reactive Messaging
 
@@ -43,12 +43,14 @@ The solution is located in the `kafka-quickstart` {quickstarts-tree-url}/kafka-q
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=kafka-quickstart \
-    -Dextensions="kafka"
+    -DclassName="org.acme.kafka.PriceResource" \
+    -Dpath="/prices" \
+    -Dextensions="resteasy,smallrye-reactive-messaging-kafka"
 cd kafka-quickstart
 ----
 
@@ -59,7 +61,7 @@ to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="kafka"
+./mvnw quarkus:add-extension -Dextensions="smallrye-reactive-messaging-kafka"
 ----
 
 This will add the following to your `pom.xml`:
@@ -84,7 +86,7 @@ version: '2'
 services:
 
   zookeeper:
-    image: strimzi/kafka:0.11.3-kafka-2.1.0
+    image: strimzi/kafka:0.19.0-kafka-2.5.0
     command: [
       "sh", "-c",
       "bin/zookeeper-server-start.sh config/zookeeper.properties"
@@ -95,7 +97,7 @@ services:
       LOG_DIR: /tmp/logs
 
   kafka:
-    image: strimzi/kafka:0.11.3-kafka-2.1.0
+    image: strimzi/kafka:0.19.0-kafka-2.5.0
     command: [
       "sh", "-c",
       "bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
@@ -123,12 +125,13 @@ Create the `src/main/java/org/acme/kafka/PriceGenerator.java` file, with the fol
 ----
 package org.acme.kafka;
 
-import io.reactivex.Flowable;
-import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import java.time.Duration;
+import java.util.Random;
 
 import javax.enterprise.context.ApplicationScoped;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
+
+import io.smallrye.mutiny.Multi;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
 
 /**
  * A bean producing random prices every 5 seconds.
@@ -140,15 +143,16 @@ public class PriceGenerator {
     private Random random = new Random();
 
     @Outgoing("generated-price")                        // <1>
-    public Flowable<Integer> generate() {               // <2>
-        return Flowable.interval(5, TimeUnit.SECONDS)
+    public Multi<Integer> generate() {                  // <2>
+        return Multi.createFrom().ticks().every(Duration.ofSeconds(5))
+                .onOverflow().drop()
                 .map(tick -> random.nextInt(100));
     }
 
 }
 ----
 <1> Instruct Reactive Messaging to dispatch the items from returned stream to `generated-price`.
-<2> The method returns a RX Java 2 _stream_ (`Flowable`) emitting a random _price_ every 5 seconds.
+<2> The method returns a Mutiny _stream_ (`Multi`) emitting a random _price_ every 5 seconds.
 
 The method returns a _Reactive Stream_. The generated items are sent to the stream named `generated-price`.
 This stream is mapped to Kafka using the `application.properties` file that we will create soon.
@@ -163,6 +167,7 @@ Create the `src/main/java/org/acme/kafka/PriceConverter.java` file with the foll
 package org.acme.kafka;
 
 import io.smallrye.reactive.messaging.annotations.Broadcast;
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 
@@ -177,9 +182,10 @@ public class PriceConverter {
 
     private static final double CONVERSION_RATE = 0.88;
 
-    @Incoming("prices")                                 // <1>
-    @Outgoing("my-data-stream")                         // <2>
-    @Broadcast                                          // <3>
+    @Incoming("prices")                                     // <1>
+    @Outgoing("my-data-stream")                             // <2>
+    @Broadcast                                              // <3>
+    @Acknowledgment(Acknowledgment.Strategy.PRE_PROCESSING) // <4>
     public double process(int priceInUsd) {
         return priceInUsd * CONVERSION_RATE;
     }
@@ -189,6 +195,7 @@ public class PriceConverter {
 <1> Indicates that the method consumes the items from the `prices` topic
 <2> Indicates that the objects returned by the method are sent to the `my-data-stream` stream
 <3> Indicates that the item are dispatched to all _subscribers_
+<4> Make sure to acknowledge the incoming message
 
 The `process` method is called for every Kafka _record_ from the `prices` topic (configured in the application configuration).
 Every result is sent to the `my-data-stream` in-memory stream.
@@ -247,7 +254,7 @@ The `channel-name` segment must match the value set in the `@Incoming` and `@Out
 * `generated-price` -> sink in which we write the prices
 * `prices` -> source in which we read the prices
 
-[source]
+[source,properties]
 ----
 # Configure the SmallRye Kafka connector
 kafka.bootstrap.servers=localhost:9092
@@ -255,6 +262,7 @@ kafka.bootstrap.servers=localhost:9092
 # Configure the Kafka sink (we write to it)
 mp.messaging.outgoing.generated-price.connector=smallrye-kafka
 mp.messaging.outgoing.generated-price.topic=prices
+mp.messaging.incoming.prices.health-readiness-enabled=false
 mp.messaging.outgoing.generated-price.value.serializer=org.apache.kafka.common.serialization.IntegerSerializer
 
 # Configure the Kafka source (we read from it)
@@ -266,6 +274,18 @@ More details about this configuration is available on the https://kafka.apache.o
 
 NOTE: What about `my-data-stream`? This is an in-memory stream, not connected to a message broker.
 
+[TIP]
+.What is "mp.messaging.incoming.prices.health-readiness-enabled=false"?
+====
+The `health-readiness-enabled` disables the readiness health check.
+By default, it verifies that there is an active connection with the broker.
+In our case, the connection only happens when we get the first consumer.
+This is because the stream is consumed as an SSE, waiting lazily for the first connection to trigger the whole stream.
+So, if you are running in an environment only routing traffic to containers that are _ready_ (such as Kubernetes), it would not send traffic to your application, which, as a consequence, will never connect to Kafka and pass the readiness check.
+
+More details about health reporting is given in <<kafka-health-check>>.
+====
+
 == The HTML page
 
 Final touch, the HTML page reading the converted prices using SSE.
@@ -311,7 +331,7 @@ Nothing spectacular here. On each received price, it updates the page.
 If you followed the instructions, you should have Kafka running.
 Then, you just need to run the application using:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw quarkus:dev
 ----
@@ -324,7 +344,7 @@ NOTE: If you started the Kafka broker with docker compose, stop it using `CTRL+C
 
 You can build the native executable with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative
 ----
@@ -377,14 +397,46 @@ The `io.smallrye.reactive.messaging.annotations.Emitter`, `io.smallrye.reactive.
 The new `Emitter.send` method returns a `CompletionStage` completed when the produced message is acknowledged.
 ====
 
-== Kafka Health Check
+[[kafka-health-check]]
+== Kafka Health Checks
+
+Quarkus provides several health checks for Kafka.
+These checks are used in combination with the `quarkus-smallrye-health` extension.
+
+When using the `quarkus-kafka` extension, you can enable _readiness_ health check by setting the `quarkus.kafka.health.enabled` property to `true` in your `application.properties`.
+This check reports the status of the interaction with a _default_ Kafka broker (configured using `kafka.bootstrap.servers`).
+That check requires an _admin connection_ with the Kafka broker.
+This check is disabled by default.
+If enabled, when you access the `/q/health/ready` endpoint of your application, you will have information about the connection validation status.
+
+When using Reactive Messaging and the Kafka connector, each configured channel (incoming or outgoing) provides a _liveness_ and _readiness_ check.
+The _liveness_ check captures any unrecoverable failure happening during the communication with Kafka.
+The _readiness_ check verifies that communication with Kafka is established.
+For each channel, you can disable the checks using:
+
+[source, properties]
+----
+# Disable both liveness and readiness checks with `health-enabled=false`:
+
+# Incoming channel (receiving records form Kafka)
+mp.messaging.incoming.your-channel.health-enabled=false
+# Outgoing channel (writing records to Kafka)
+mp.messaging.outgoing.your-channel.health-enabled=false
+
+# Disable only the readiness check with `health-readiness-enabled=false`:
 
-If you are using the `quarkus-smallrye-health` extension, `quarkus-kafka` can add a readiness health check
-to validate the connection to the broker. This is disabled by default.
+mp.messaging.incoming.your-channel.health-readiness-enabled=false
+mp.messaging.outgoing.your-channel.health-readiness-enabled=false
+----
+
+NOTE: You can configure the `bootstrap.servers` for each channel. Defaults is `kafka.bootstrap.servers`.
 
-If enabled, when you access the `/health/ready` endpoint of your application you will have information about the connection validation status.
+Reactive Messaging readiness check offers two strategies.
+The default strategy verifies that an active connection is established with the broker.
+This approach is not intrusive as it's based on built-in metrics.
 
-This behavior can be enabled by setting the `quarkus.kafka.health.enabled` property to `true` in your `application.properties`.
+Using the `health-readiness-topic-verification=true` attribute, you can also check the topics used by the application exist in the broker.
+Note that, to achieve this, an _admin connection_ is required.
 
 == JSON serialization
 
@@ -431,7 +483,7 @@ public class FruitProcessor {
     @Incoming("fruit-in")
     @Outgoing("fruit-out")
     @Broadcast
-    public double process(Fruit fruit) {
+    public Fruit process(Fruit fruit) {
         fruit.price = fruit.price * CONVERSION_RATE;
         return fruit;
     }
@@ -439,34 +491,34 @@ public class FruitProcessor {
 }
 ----
 
-To do this, we will need to setup JSON serialization with JSON-B or Jackson.
+To do this, we will need to setup JSON serialization with Jackson or JSON-B.
 
 NOTE: With JSON serialization correctly configured, you can also use `Publisher<Fruit>` and `Emitter<Fruit>`.
 
-=== Serializing via JSON-B
+=== Serializing via Jackson
 
-First, you need to include the `quarkus-jsonb` extension (if you already use the `quarkus-resteasy-jsonb` extension, this is not needed).
+First, you need to include the `quarkus-jackson` extension (if you already use the `quarkus-resteasy-jackson` extension, this is not needed).
 
 [source, xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-jsonb</artifactId>
+    <artifactId>quarkus-jackson</artifactId>
 </dependency>
 ----
 
-There is an existing `JsonbSerializer` that can be used to serialize all pojos via JSON-B,
+There is an existing `ObjectMapperSerializer` that can be used to serialize all pojos via Jackson,
 but the corresponding deserializer is generic, so it needs to be subclassed.
 
-So, let's create a `FruitDeserializer` that extends the generic `JsonbDeserializer`.
+So, let's create a `FruitDeserializer` that extends the `ObjectMapperDeserializer`.
 
 [source,java]
 ----
-package com.acme.fruit.jsonb;
+package com.acme.fruit.jackson;
 
-import io.quarkus.kafka.client.serialization.JsonbDeserializer;
+import io.quarkus.kafka.client.serialization.ObjectMapperDeserializer;
 
-public class FruitDeserializer extends JsonbDeserializer<Fruit> {
+public class FruitDeserializer extends ObjectMapperDeserializer<Fruit> {
     public FruitDeserializer(){
         // pass the class to the parent.
         super(Fruit.class);
@@ -474,50 +526,47 @@ public class FruitDeserializer extends JsonbDeserializer<Fruit> {
 }
 ----
 
-NOTE: If you don't want to create a deserializer for each of your pojo, you can use the generic `io.vertx.kafka.client.serialization.JsonObjectDeserializer`
-that will deserialize to a `javax.json.JsonObject`. The corresponding serializer can also be used: `io.vertx.kafka.client.serialization.JsonObjectSerializer`.
-
-Finally, configure your streams to use the JSON-B serializer and deserializer.
+Finally, configure your streams to use the Jackson serializer and deserializer.
 
 [source,properties]
 ----
 # Configure the Kafka source (we read from it)
 mp.messaging.incoming.fruit-in.connector=smallrye-kafka
 mp.messaging.incoming.fruit-in.topic=fruit-in
-mp.messaging.incoming.fruit-in.value.deserializer=com.acme.fruit.jsonb.FruitDeserializer
+mp.messaging.incoming.fruit-in.value.deserializer=com.acme.fruit.jackson.FruitDeserializer
 
 # Configure the Kafka sink (we write to it)
 mp.messaging.outgoing.fruit-out.connector=smallrye-kafka
 mp.messaging.outgoing.fruit-out.topic=fruit-out
-mp.messaging.outgoing.fruit-out.value.serializer=io.quarkus.kafka.client.serialization.JsonbSerializer
+mp.messaging.outgoing.fruit-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
 ----
 
-Now, your Kafka messages will contain a JSON-B serialized representation of your Fruit pojo.
+Now, your Kafka messages will contain a Jackson serialized representation of your Fruit pojo.
 
-=== Serializing via Jackson
+=== Serializing via JSON-B
 
-First, you need to include the `quarkus-jackson` extension (if you already use the `quarkus-resteasy-jackson` extension, this is not needed).
+First, you need to include the `quarkus-jsonb` extension (if you already use the `quarkus-resteasy-jsonb` extension, this is not needed).
 
 [source, xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-jackson</artifactId>
+    <artifactId>quarkus-jsonb</artifactId>
 </dependency>
 ----
 
-There is an existing `ObjectMapperSerializer` that can be used to serialize all pojos via Jackson,
+There is an existing `JsonbSerializer` that can be used to serialize all pojos via JSON-B,
 but the corresponding deserializer is generic, so it needs to be subclassed.
 
-So, let's create a `FruitDeserializer` that extends the `ObjectMapperDeserializer`.
+So, let's create a `FruitDeserializer` that extends the generic `JsonbDeserializer`.
 
 [source,java]
 ----
-package com.acme.fruit.jackson;
+package com.acme.fruit.jsonb;
 
-import io.quarkus.kafka.client.serialization.ObjectMapperDeserializer;
+import io.quarkus.kafka.client.serialization.JsonbDeserializer;
 
-public class FruitDeserializer extends ObjectMapperDeserializer<Fruit> {
+public class FruitDeserializer extends JsonbDeserializer<Fruit> {
     public FruitDeserializer(){
         // pass the class to the parent.
         super(Fruit.class);
@@ -525,22 +574,25 @@ public class FruitDeserializer extends ObjectMapperDeserializer<Fruit> {
 }
 ----
 
-Finally, configure your streams to use the Jackson serializer and deserializer.
+NOTE: If you don't want to create a deserializer for each of your pojo, you can use the generic `io.vertx.kafka.client.serialization.JsonObjectDeserializer`
+that will deserialize to a `javax.json.JsonObject`. The corresponding serializer can also be used: `io.vertx.kafka.client.serialization.JsonObjectSerializer`.
+
+Finally, configure your streams to use the JSON-B serializer and deserializer.
 
 [source,properties]
 ----
 # Configure the Kafka source (we read from it)
 mp.messaging.incoming.fruit-in.connector=smallrye-kafka
 mp.messaging.incoming.fruit-in.topic=fruit-in
-mp.messaging.incoming.fruit-in.value.deserializer=com.acme.fruit.jackson.FruitDeserializer
+mp.messaging.incoming.fruit-in.value.deserializer=com.acme.fruit.jsonb.FruitDeserializer
 
 # Configure the Kafka sink (we write to it)
 mp.messaging.outgoing.fruit-out.connector=smallrye-kafka
 mp.messaging.outgoing.fruit-out.topic=fruit-out
-mp.messaging.outgoing.fruit-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
+mp.messaging.outgoing.fruit-out.value.serializer=io.quarkus.kafka.client.serialization.JsonbSerializer
 ----
 
-Now, your Kafka messages will contain a Jackson serialized representation of your Fruit pojo.
+Now, your Kafka messages will contain a JSON-B serialized representation of your Fruit pojo.
 
 === Sending JSON Server-Sent Events (SSE)
 
@@ -562,7 +614,7 @@ import javax.ws.rs.core.MediaType;
 import org.jboss.resteasy.annotations.SseElementType;
 
 @Path("/fruits")
-public class PriceResource {
+public class FruitResource {
 
     @Inject
     @Channel("fruit-out") Publisher<Fruit> fruits;
@@ -611,6 +663,475 @@ public class PriceStorage {
 
 The complete example is available in the `kafka-panache-quickstart` {quickstarts-tree-url}/kafka-panache-quickstart[directory].
 
+[NOTE]
+====
+There are 2 `@Blocking` annotations:
+
+ 1. `io.smallrye.reactive.messaging.annotations.Blocking`
+ 2. `io.smallrye.common.annotation.Blocking`
+
+They have the same effect.
+Thus, you can use both.
+The first one provides more fine-grain tuning such as the worker pool to use and whether it preserves the order.
+The second one, used in also with other reactive features of Quarkus, uses the default worker pool and preserves the order.
+====
+
+== Testing a Kafka application
+
+=== Testing without a broker
+
+It can be useful to test the application without having to start a Kafka broker.
+To achieve this, you can _switch_ the channels managed by the Kafka connector to _in-memory_.
+
+IMPORTANT: This approach only works for JVM tests. It cannot be used for native tests (because they do not support injection).
+
+First, add the following dependency to your application:
+
+[source, xml]
+----
+<dependency>
+    <groupId>io.smallrye.reactive</groupId>
+    <artifactId>smallrye-reactive-messaging-in-memory</artifactId>
+    <scope>test</scope>
+</dependency>
+----
+
+Then, create a Quarkus Test Resource as follows:
+
+[source, java]
+----
+public class KafkaTestResourceLifecycleManager implements QuarkusTestResourceLifecycleManager {
+
+    @Override
+    public Map<String, String> start() {
+        Map<String, String> env = new HashMap<>();
+        Map<String, String> props1 = InMemoryConnector.switchIncomingChannelsToInMemory("orders");  // <1>
+        Map<String, String> props2 = InMemoryConnector.switchOutgoingChannelsToInMemory("queue");   // <2>
+        env.putAll(props1);
+        env.putAll(props2);
+        return env;  // <3>
+    }
+
+    @Override
+    public void stop() {
+        InMemoryConnector.clear();  // <4>
+    }
+}
+----
+1. Switch the incoming channel "orders" (expecting messages from Kafka) to in-memory.
+2. Switch the outgoing channel "queue" (writing messages to Kafka) to in-memory.
+3. Builds and returns a `Map` containing all the properties required to configure the application to use in-memory channels.
+4. When the test stops, clear the `InMemoryConnector` (discard all the received and sent messages)
+
+Create a Quarkus Test using the test resource created above:
+
+[source, java]
+----
+@QuarkusTest
+@QuarkusTestResource(KafkaTestResourceLifecycleManager.class)
+class BaristaTest {
+
+    @Inject @Any
+    InMemoryConnector connector; // <1>
+
+    @Test
+    void testProcessOrder() {
+        InMemorySource<Order> orders = connector.source("orders"); // <2>
+        InMemorySink<Beverage> queue = connector.sink("queue");    // <3>
+
+        Order order = new Order();
+        order.setProduct("coffee");
+        order.setName("Coffee lover");
+        order.setOrderId("1234");
+
+        orders.send(order);  // <4>
+
+        await().<List<? extends Message<Beverage>>>until(queue::received, t -> t.size() == 1); // <5>
+
+        Beverage queuedBeverage = queue.received().get(0).getPayload();
+        Assertions.assertEquals(Beverage.State.READY, queuedBeverage.getPreparationState());
+        Assertions.assertEquals("coffee", queuedBeverage.getBeverage());
+        Assertions.assertEquals("Coffee lover", queuedBeverage.getCustomer());
+        Assertions.assertEquals("1234", queuedBeverage.getOrderId());
+    }
+
+}
+----
+1. Inject the in-memory connector in your test class.
+2. Retrieve the incoming channel (`orders`) - the channel must have been switched to in-memory in the test resource.
+3. Retrieve the outgoing channel (`queue`) - the channel must have been switched to in-memory in the test resource.
+4. Use the `send` method to send a message to the `orders` channel. So, the application will process this message.
+5. Use the `received` method to check the messages produced by the application.
+
+=== Starting Kafka in a test resource
+
+Alternatively, you can start a Kafka broker in a test resource.
+The following snippet shows a test resource starting a Kafka broker using https://www.testcontainers.org/modules/kafka/[Testcontainers]:
+
+[source, java]
+----
+public class KafkaResource implements QuarkusTestResourceLifecycleManager {
+
+    private final KafkaContainer kafka = new KafkaContainer();
+
+    @Override
+    public Map<String, String> start() {
+        kafka.start();
+        return Collections.singletonMap("kafka.bootstrap.servers", kafka.getBootstrapServers());  // <1>
+    }
+
+    @Override
+    public void stop() {
+        kafka.close();
+    }
+}
+----
+1. Configure the Kafka bootstrap location, so the application connects to this broker.
+
+== Authenticating with OAuth
+
+If your Kafka broker uses OAuth as authentication mechanism, you need to configure the Kafka consumer to enable this authentication process.
+First, add the following dependency to your application:
+
+[source, xml]
+----
+<dependency>
+    <groupId>io.strimzi</groupId>
+    <artifactId>kafka-oauth-client</artifactId>
+</dependency>
+----
+
+This dependency provides the callback handler required to handle the OAuth workflow.
+Then, in the `application.properties`, add:
+
+[source, properties]
+----
+mp.messaging.connector.smallrye-kafka.security.protocol=SASL_PLAINTEXT
+mp.messaging.connector.smallrye-kafka.sasl.mechanism=OAUTHBEARER
+mp.messaging.connector.smallrye-kafka.sasl.jaas.config=org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required \
+  oauth.client.id="team-a-client" \
+  oauth.client.secret="team-a-client-secret" \
+  oauth.token.endpoint.uri="http://keycloak:8080/auth/realms/kafka-authz/protocol/openid-connect/token" ;
+mp.messaging.connector.smallrye-kafka.sasl.login.callback.handler.class=io.strimzi.kafka.oauth.client.JaasClientOauthLoginCallbackHandler
+----
+
+Update the `oauth.client.id`, `oauth.client.secret` and `oauth.token.endpoint.uri` values.
+
+OAuth authentication works for both JVM and native modes.
+
+== Using Snappy
+
+On _outgoing_ channels, you can enable Snappy compression by setting the `compression.type` attribute to `snappy`:
+
+[source, properties]
+----
+mp.messaging.outgoing.fruit-out.compression.type=snappy
+----
+
+In JVM mode, it will work out of the box.
+However, to compile your application to a native executable, you need to:
+
+1. Uses GraalVM 21.+
+2. Add `quarkus.kafka.snappy.enabled=true` to your `application.properties`
+
+In native mode, Snappy is disabled by default as the use of Snappy requires embedding a native library and unpacking it when the application starts.
+
+== Configuration
+
+More details about the SmallRye Reactive Messaging configuration can be found in the https://smallrye.io/smallrye-reactive-messaging/smallrye-reactive-messaging/2.8/kafka/kafka.html[SmallRye Reactive Messaging - Kafka Connector Documentation].
+The most important attributes are listed in the tables below:
+
+=== Incoming channel configuration (polling from Kafka)
+
+The following attributes are configured using:
+
+[source, properties]
+----
+mp.messaging.incoming.your-channel-name.attribute=value
+----
+
+Some properties have aliases which can be configured globally:
+
+[source, properties]
+----
+kafka.bootstrap.servers=...
+----
+
+.Incoming Attributes of the 'smallrye-kafka' connector
+[cols="25, 30, 15, 20",options="header"]
+|===
+|Attribute (_alias_) | Description | Mandatory | Default
+
+| *bootstrap.servers*
+
+_(kafka.bootstrap.servers)_ | A comma-separated list of host:port to use for establishing the initial connection to the Kafka cluster.
+
+Type: _string_ | false | `localhost:9092`
+
+| *topic* | The consumed / populated Kafka topic. If neither this property nor the `topics` properties are set, the channel name is used
+
+Type: _string_ | false |
+
+| *health-enabled* | Whether health reporting is enabled (default) or disabled
+
+Type: _boolean_ | false | `true`
+
+| *health-readiness-enabled* | Whether readiness health reporting is enabled (default) or disabled
+
+Type: _boolean_ | false | `true`
+
+| *health-readiness-topic-verification* | Whether the readiness check should verify that topics exist on the broker. Default to false. Enabling it requires an admin connection.
+
+Type: _boolean_ | false | `false`
+
+| *health-readiness-timeout* | During the readiness health check, the connector connects to the broker and retrieves the list of topics. This attribute specifies the maximum duration (in ms) for the retrieval. If exceeded, the channel is considered not-ready.
+
+Type: _long_ | false | `2000`
+
+| *tracing-enabled* | Whether tracing is enabled (default) or disabled
+
+Type: _boolean_ | false | `true`
+
+| *cloud-events* | Enables (default) or disables the Cloud Event support. If enabled on an _incoming_ channel, the connector analyzes the incoming records and try to create Cloud Event metadata. If enabled on an _outgoing_, the connector sends the outgoing messages as Cloud Event if the message includes Cloud Event Metadata.
+
+Type: _boolean_ | false | `true`
+
+| *topics* | A comma-separating list of topics to be consumed. Cannot be used with the `topic` or `pattern` properties
+
+Type: _string_ | false |
+
+| *pattern* | Indicate that the `topic` property is a regular expression. Must be used with the `topic` property. Cannot be used with the `topics` property
+
+Type: _boolean_ | false | `false`
+
+| *key.deserializer* | The deserializer classname used to deserialize the record's key
+
+Type: _string_ | false | `org.apache.kafka.common.serialization.StringDeserializer`
+
+| *value.deserializer* | The deserializer classname used to deserialize the record's value
+
+Type: _string_ | true |
+
+| *fetch.min.bytes* | The minimum amount of data the server should return for a fetch request. The default setting of 1 byte means that fetch requests are answered as soon as a single byte of data is available or the fetch request times out waiting for data to arrive.
+
+Type: _int_ | false | `1`
+
+| *group.id* | A unique string that identifies the consumer group the application belongs to. If not set, a unique, generated id is used
+
+Type: _string_ | false |
+
+| *enable.auto.commit* | If enabled, consumer's offset will be periodically committed in the background by the underlying Kafka client, ignoring the actual processing outcome of the records. It is recommended to NOT enable this setting and let Reactive Messaging handles the commit.
+
+Type: _boolean_ | false | `false`
+
+| *retry* | Whether or not the connection to the broker is re-attempted in case of failure
+
+Type: _boolean_ | false | `true`
+
+| *retry-attempts* | The maximum number of reconnection before failing. -1 means infinite retry
+
+Type: _int_ | false | `-1`
+
+| *retry-max-wait* | The max delay (in seconds) between 2 reconnects
+
+Type: _int_ | false | `30`
+
+| *broadcast* | Whether the Kafka records should be dispatched to multiple consumer
+
+Type: _boolean_ | false | `false`
+
+| *auto.offset.reset* | What to do when there is no initial offset in Kafka.Accepted values are earliest, latest and none
+
+Type: _string_ | false | `latest`
+
+| *failure-strategy* | Specify the failure strategy to apply when a message produced from a record is acknowledged negatively (nack). Values can be `fail` (default), `ignore`, or `dead-letter-queue`
+
+Type: _string_ | false | `fail`
+
+| *commit-strategy* | Specify the commit strategy to apply when a message produced from a record is acknowledged. Values can be `latest`, `ignore` or `throttled`. If `enable.auto.commit` is true then the default is `ignore` otherwise it is `throttled`
+
+Type: _string_ | false |
+
+| *throttled.unprocessed-record-max-age.ms* | While using the `throttled` commit-strategy, specify the max age in milliseconds that an unprocessed message can be before the connector is marked as unhealthy.
+
+Type: _int_ | false | `60000`
+
+| *dead-letter-queue.topic* | When the `failure-strategy` is set to `dead-letter-queue` indicates on which topic the record is sent. Defaults is `dead-letter-topic-$channel`
+
+Type: _string_ | false |
+
+| *dead-letter-queue.key.serializer* | When the `failure-strategy` is set to `dead-letter-queue` indicates the key serializer to use. If not set the serializer associated to the key deserializer is used
+
+Type: _string_ | false |
+
+| *dead-letter-queue.value.serializer* | When the `failure-strategy` is set to `dead-letter-queue` indicates the value serializer to use. If not set the serializer associated to the value deserializer is used
+
+Type: _string_ | false |
+
+| *partitions* | The number of partitions to be consumed concurrently. The connector creates the specified amount of Kafka consumers. It should match the number of partition of the targeted topic
+
+Type: _int_ | false | `1`
+
+| *consumer-rebalance-listener.name* | The name set in `javax.inject.Named` of a bean that implements `io.smallrye.reactive.messaging.kafka.KafkaConsumerRebalanceListener`. If set, this rebalance listener is applied to the consumer.
+
+Type: _string_ | false |
+
+| *key-deserialization-failure-handler* | The name set in `javax.inject.Named` of a bean that implements `io.smallrye.reactive.messaging.kafka.DeserializationFailureHandler`. If set, deserialization failure happening when deserializing keys are delegated to this handler which may provide a fallback value.
+
+Type: _string_ | false |
+
+| *value-deserialization-failure-handler* | The name set in `javax.inject.Named` of a bean that implements `io.smallrye.reactive.messaging.kafka.DeserializationFailureHandler`. If set, deserialization failure happening when deserializing values are delegated to this handler which may provide a fallback value.
+
+Type: _string_ | false |
+
+| *graceful-shutdown* | Whether or not a graceful shutdown should be attempted when the application terminates.
+
+Type: _boolean_ | false | `true`
+
+|===
+
+=== Outgoing channel configuration (writing to Kafka)
+
+The following attributes are configured using:
+
+
+[source, properties]
+----
+mp.messaging.outgoing.your-channel-name.attribute=value
+----
+
+Some properties have aliases which can be configured globally:
+
+[source, properties]
+----
+kafka.bootstrap.servers=...
+----
+
+.Outgoing Attributes of the 'smallrye-kafka' connector
+[cols="25, 30, 15, 20",options="header"]
+|===
+|Attribute (_alias_) | Description | Mandatory | Default
+
+| *acks* | The number of acknowledgments the producer requires the leader to have received before considering a request complete. This controls the durability of records that are sent. Accepted values are: 0, 1, all
+
+Type: _string_ | false | `1`
+
+| *bootstrap.servers*
+
+_(kafka.bootstrap.servers)_ | A comma-separated list of host:port to use for establishing the initial connection to the Kafka cluster.
+
+Type: _string_ | false | `localhost:9092`
+
+| *buffer.memory* | The total bytes of memory the producer can use to buffer records waiting to be sent to the server.
+
+Type: _long_ | false | `33554432`
+
+| *close-timeout* | The amount of milliseconds waiting for a graceful shutdown of the Kafka producer
+
+Type: _int_ | false | `10000`
+
+| *cloud-events* | Enables (default) or disables the Cloud Event support. If enabled on an _incoming_ channel, the connector analyzes the incoming records and try to create Cloud Event metadata. If enabled on an _outgoing_, the connector sends the outgoing messages as Cloud Event if the message includes Cloud Event Metadata.
+
+Type: _boolean_ | false | `true`
+
+| *cloud-events-data-content-type*
+
+_(cloud-events-default-data-content-type)_ | Configure the default `datacontenttype` attribute of the outgoing Cloud Event. Requires `cloud-events` to be set to `true`. This value is used if the message does not configure the `datacontenttype` attribute itself
+
+Type: _string_ | false |
+
+| *cloud-events-data-schema*
+
+_(cloud-events-default-data-schema)_ | Configure the default `dataschema` attribute of the outgoing Cloud Event. Requires `cloud-events` to be set to `true`. This value is used if the message does not configure the `dataschema` attribute itself
+
+Type: _string_ | false |
+
+| *cloud-events-insert-timestamp*
+
+_(cloud-events-default-timestamp)_ | Whether or not the connector should insert automatically the `time` attribute` into the outgoing Cloud Event. Requires `cloud-events` to be set to `true`. This value is used if the message does not configure the `time` attribute itself
+
+Type: _boolean_ | false | `true`
+
+| *cloud-events-mode* | The Cloud Event mode (`structured` or `binary` (default)). Indicates how are written the cloud events in the outgoing record
+
+Type: _string_ | false | `binary`
+
+| *cloud-events-source*
+
+_(cloud-events-default-source)_ | Configure the default `source` attribute of the outgoing Cloud Event. Requires `cloud-events` to be set to `true`. This value is used if the message does not configure the `source` attribute itself
+
+Type: _string_ | false |
+
+| *cloud-events-subject*
+
+_(cloud-events-default-subject)_ | Configure the default `subject` attribute of the outgoing Cloud Event. Requires `cloud-events` to be set to `true`. This value is used if the message does not configure the `subject` attribute itself
+
+Type: _string_ | false |
+
+| *cloud-events-type*
+
+_(cloud-events-default-type)_ | Configure the default `type` attribute of the outgoing Cloud Event. Requires `cloud-events` to be set to `true`. This value is used if the message does not configure the `type` attribute itself
+
+Type: _string_ | false |
+
+| *health-enabled* | Whether health reporting is enabled (default) or disabled
+
+Type: _boolean_ | false | `true`
+
+| *health-readiness-enabled* | Whether readiness health reporting is enabled (default) or disabled
+
+Type: _boolean_ | false | `true`
+
+| *health-readiness-timeout* | During the readiness health check, the connector connects to the broker and retrieves the list of topics. This attribute specifies the maximum duration (in ms) for the retrieval. If exceeded, the channel is considered not-ready.
+
+Type: _long_ | false | `2000`
+
+| *health-readiness-topic-verification* | Whether the readiness check should verify that topics exist on the broker. Default to false. Enabling it requires an admin connection.
+
+Type: _boolean_ | false | `false`
+
+| *key* | A key to used when writing the record
+
+Type: _string_ | false |
+
+| *key.serializer* | The serializer classname used to serialize the record's key
+
+Type: _string_ | false | `org.apache.kafka.common.serialization.StringSerializer`
+
+| *max-inflight-messages* | The maximum number of messages to be written to Kafka concurrently. It limits the number of messages waiting to be written and acknowledged by the broker. You can set this attribute to `0` remove the limit
+
+Type: _long_ | false | `1024`
+
+| *merge* | Whether the connector should allow multiple upstreams
+
+Type: _boolean_ | false | `false`
+
+| *partition* | The target partition id. -1 to let the client determine the partition
+
+Type: _int_ | false | `-1`
+
+| *retries* | Setting a value greater than zero will cause the client to resend any record whose send fails with a potentially transient error.
+
+Type: _long_ | false | `2147483647`
+
+| *topic* | The consumed / populated Kafka topic. If neither this property nor the `topics` properties are set, the channel name is used
+
+Type: _string_ | false |
+
+| *tracing-enabled* | Whether tracing is enabled (default) or disabled
+
+Type: _boolean_ | false | `true`
+
+| *value.serializer* | The serializer classname used to serialize the payload
+
+Type: _string_ | true |
+
+| *waitForWriteCompletion* | Whether the client waits for Kafka to acknowledge the written record before acknowledging the message
+
+Type: _boolean_ | false | `true`
+
+|===
+
 == Going further
 
 This guide has shown how you can interact with Kafka using Quarkus.
diff --git a/docs/src/main/asciidoc/kogito.adoc b/docs/src/main/asciidoc/kogito.adoc
index 483f8b89af4a7..0b41facf0cef2 100644
--- a/docs/src/main/asciidoc/kogito.adoc
+++ b/docs/src/main/asciidoc/kogito.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Kogito to add business automation capabilities to an application
 
@@ -80,12 +80,13 @@ The solution is located in the `kogito-quickstart` {quickstarts-tree-url}/kogito
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=kogito-quickstart \
-    -Dextensions="kogito"
+    -Dextensions="kogito" \
+    -DnoExamples
 cd kogito-quickstart
 ----
 
@@ -242,7 +243,7 @@ Then run it:
 
 [source,bash]
 ----
-java -jar ./target/kogito-quickstart-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 === Running in Native Mode
diff --git a/docs/src/main/asciidoc/kotlin.adoc b/docs/src/main/asciidoc/kotlin.adoc
index 2918d0eb8f735..ba88483030e31 100644
--- a/docs/src/main/asciidoc/kotlin.adoc
+++ b/docs/src/main/asciidoc/kotlin.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Kotlin
 
@@ -29,20 +29,20 @@ NB: For Gradle project setup please see below, and for further reference consult
 
 First, we need a new Kotlin project. This can be done using the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=rest-kotlin-quickstart \
     -DclassName="org.acme.rest.GreetingResource" \
     -Dpath="/greeting" \
-    -Dextensions="kotlin,resteasy-jsonb"
+    -Dextensions="resteasy,kotlin,resteasy-jackson"
 cd rest-kotlin-quickstart
 ----
 
 When adding `kotlin` to the extensions list, the Maven plugin will generate a project that is properly
 configured to work with Kotlin. Furthermore  the `org.acme.rest.GreetingResource` class is implemented as Kotlin source code (as is the case with the generated tests).
-The addition of `resteasy-jsonb` in the extension list results in importing the RESTEasy/JAX-RS and JSON-B extensions.
+The addition of `resteasy-jackson` in the extension list results in importing the RESTEasy/JAX-RS and Jackson extensions.
 
 `GreetingResource.kt` looks like this:
 
@@ -81,14 +81,12 @@ We also update the `GreetingResource.kt` like so:
 ----
 import javax.ws.rs.GET
 import javax.ws.rs.Path
-import javax.ws.rs.Produces
 import javax.ws.rs.core.MediaType
 
 @Path("/greeting")
 class GreetingResource {
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     fun hello() = Greeting("hello")
 }
 ----
@@ -192,123 +190,199 @@ Similar to the Maven configuration, when using Gradle, the following modificatio
 ----
 plugins {
     id 'java'
-    id 'io.quarkus' version '{quarkus-version}' // <1>
+    id 'io.quarkus' 
 
-    id "org.jetbrains.kotlin.jvm" version "{kotlin-version}" // <2>
-    id "org.jetbrains.kotlin.plugin.allopen" version "{kotlin-version}" // <2>
+    id "org.jetbrains.kotlin.jvm" version "{kotlin-version}" // <1>
+    id "org.jetbrains.kotlin.plugin.allopen" version "{kotlin-version}" // <1>
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 
-group = '...' // set your group
-version = '1.0.0-SNAPSHOT'
-
 dependencies { 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:{kotlin-version}'
 
-    // <3>
-    implementation enforcedPlatform('io.quarkus:quarkus-bom:{quarkus-version}')
+   implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+ 
     implementation 'io.quarkus:quarkus-resteasy'
-    implementation 'io.quarkus:quarkus-resteasy-jsonb'
+    implementation 'io.quarkus:quarkus-resteasy-jackson'
     implementation 'io.quarkus:quarkus-kotlin'
 
     testImplementation 'io.quarkus:quarkus-junit5'
     testImplementation 'io.rest-assured:rest-assured'
 }
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
-
-test {
-    useJUnitPlatform()
-    exclude '**/Native*'
-}
+group = '...' // set your group
+version = '1.0.0-SNAPSHOT'
 
-buildNative {
-    enableHttpUrlHandler = true
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
-allOpen { // <4>
+allOpen { // <2>
     annotation("javax.ws.rs.Path")
     annotation("javax.enterprise.context.ApplicationScoped")
     annotation("io.quarkus.test.junit.QuarkusTest")
 }
+
+compileKotlin {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_11
+    kotlinOptions.javaParameters = true
+}
+
+compileTestKotlin {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_11
+}
 ----
 
-<1> The Quarkus plugin needs to be applied.
-<2> The Kotlin plugin version needs to be specified.
-<3> We include the Quarkus BOM using Gradle's link:https://docs.gradle.org/5.4.1/userguide/managing_transitive_dependencies.html#sec:bom_import[relevant syntax]
-<4> The all-open configuration required, as per Maven guide above
+<1> The Kotlin plugin version needs to be specified.
+<2> The all-open configuration required, as per Maven guide above
 
 or, if you use the Gradle Kotlin DSL:
 
 [source,kotlin,subs=attributes+]
 ----
-import io.quarkus.gradle.tasks.QuarkusNative
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-group = "..."
-version = "1.0.0-SNAPSHOT"
 
 plugins {
-    java
-    id("io.quarkus") version "{quarkus-version}" // <1>
+    kotlin("jvm") version "{kotlin-version}" // <1>
+    kotlin("plugin.allopen") version "{kotlin-version}"
+    id("io.quarkus")
+}
 
-    kotlin("jvm") version "{kotlin-version}" // <2>
-    id("org.jetbrains.kotlin.plugin.allopen") version "{kotlin-version}" // <2>
+repositories {
+    mavenLocal()
+    mavenCentral()
 }
 
+val quarkusPlatformGroupId: String by project
+val quarkusPlatformArtifactId: String by project
+val quarkusPlatformVersion: String by project
+
+group = "..."
+version = "1.0.0-SNAPSHOT"
+
+
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
 
-    // <3>
-    implementation(enforcedPlatform("io.quarkus:quarkus-bom:${quarkusVersion}"))
+    implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
+
     implementation("io.quarkus:quarkus-kotlin")
     implementation("io.quarkus:quarkus-resteasy")
-    implementation("io.quarkus:quarkus-resteasy-jsonb")
+    implementation("io.quarkus:quarkus-resteasy-jackson")
 
     testImplementation("io.quarkus:quarkus-junit5")
     testImplementation("io.rest-assured:rest-assured")
 }
 
-tasks {
-    named<QuarkusNative>("buildNative") {
-        setEnableHttpUrlHandler(true)
-    }
+group = '...' // set your group
+version = "1.0.0-SNAPSHOT"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
-allOpen { // <4>
+allOpen { // <2>
     annotation("javax.ws.rs.Path")
     annotation("javax.enterprise.context.ApplicationScoped")
     annotation("io.quarkus.test.junit.QuarkusTest")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
+    kotlinOptions.javaParameters = true
 }
 
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}
+----
 
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}
+<1> The Kotlin plugin version needs to be specified.
+<2> The all-open configuration required, as per Maven guide above
+
+
+
+== Live reload
+
+Quarkus provides support for live reloading changes made to source code. This support is also available to Kotlin, meaning that developers can update their Kotlin source
+code and immediately see their changes reflected.
+
+To see this feature in action, first execute: `./mvnw compile quarkus:dev`
+
+When executing an HTTP GET request against `http://localhost:8080/greeting`, you see a JSON message with the value `hello` as its `message` field.
+
+Now using your favorite editor or IDE, update `GreetingResource.kt` and change the `hello` method to the following:
+
+[source,kotlin]
+----
+fun hello() = Greeting("hi")
 ----
 
-<1> The Quarkus plugin needs to be applied.
-<2> The Kotlin plugin version needs to be specified.
-<3> We include the Quarkus BOM using Gradle's link:https://docs.gradle.org/5.4.1/userguide/managing_transitive_dependencies.html#sec:bom_import[relevant syntax]
-<4> The all-open configuration required, as per Maven guide above
+When you now execute an HTTP GET request against `http://localhost:8080/greeting`, you should see a JSON message with the value `hi` as its `message` field.
+
+One thing to note is that the live reload feature is not available when making changes to both Java and Kotlin source that have dependencies on each other. We hope to alleviate this limitation in the future.
+
+== Packaging the application
+
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file. You can also build the native executable using `./mvnw package -Pnative`, or `./gradlew buildNative`.
+
+== Kotlin and Jackson
+
+If the `com.fasterxml.jackson.module:jackson-module-kotlin` dependency and the `quarkus-jackson` extension (or the `quarkus-resteasy-jackson` extension) have been added to the project,
+then Quarkus automatically registers the `KotlinModule` to the `ObjectMapper` bean (see link:rest-json#jackson[this] guide for more details).
+
+When using Kotlin data classes with `native-image` you may experience serialization errors that do not occur with the `JVM` version, despite the Kotlin Jackson Module being registered. This is especially so if you have a more complex JSON hierarchy, where an issue on a lower node causes a serialization failure. The error message displayed is a catch-all and typically displays an issue with the root object, which may not necessarily be the case.
+
+[source]
+----
+com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Cannot construct instance of `Address` (no Creators, like default construct, exist): cannot deserialize from Object value (no delegate- or property-based Creator)
+----
+
+To ensure full-compability with `native-image`, it is recommended to apply the Jackson `@field:JsonProperty("fieldName")` annotation, and set a nullable default, as illustrated below. You can automate the generation of Kotlin data classes for your sample JSON using Intellij plugins (such as JSON to Kotlin Class), and easily enable the Jackson annotation and select nullable parameters as part of the auto-code generation.
+
+[source,kotlin]
+----
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class Response(
+	@field:JsonProperty("chart")
+	val chart: ChartData? = null
+)
+
+data class ChartData(
+	@field:JsonProperty("result")
+	val result: List<ResultItem?>? = null,
+
+	@field:JsonProperty("error")
+	val error: Any? = null
+)
+
+data class ResultItem(
+	@field:JsonProperty("meta")
+	val meta: Meta? = null,
+
+	@field:JsonProperty("indicators")
+	val indicators: IndicatorItems? = null,
+
+	@field:JsonProperty("timestamp")
+	val timestamp: List<Int?>? = null
+)
+
+...
+----
+
+
+== Kotlin coroutines and Mutiny
+
+Kotlin coroutines provide a imperative programming model that actually gets executed in an asynchronous, reactive manner.
+To simplify the interoperation between Mutiny and Kotlin there is the module `io.smallrye.reactive:mutiny-kotlin`, described link:https://smallrye.io/smallrye-mutiny/guides/kotlin[here].
 
 == CDI @Inject with Kotlin
 
@@ -362,32 +436,3 @@ class GreetingResource {
 <1> Kotlin requires a @field: xxx qualifier as it has no @Target on the annotation definition. Add @field: xxx in this example. @Default is used as the qualifier, explicitly specifying the use of the default bean.
 
 
-
-== Live reload
-
-Quarkus provides support for live reloading changes made to source code. This support is also available to Kotlin, meaning that developers can update their Kotlin source
-code and immediately see their changes reflected.
-
-To see this feature in action, first execute: `./mvnw compile quarkus:dev`
-
-When executing an HTTP GET request against `http://localhost:8080/greeting`, you see a JSON message with the value `hello` as its `message` field.
-
-Now using your favorite editor or IDE, update `GreetingResource.kt` and change the `hello` method to the following:
-
-[source,kotlin]
-----
-fun hello() = Greeting("hi")
-----
-
-When you now execute an HTTP GET request against `http://localhost:8080/greeting`, you should see a JSON message with the value `hi` as its `message` field.
-
-One thing to note is that the live reload feature is not available when making changes to both Java and Kotlin source that have dependencies on each other. We hope to alleviate this limitation in the future.
-
-== Packaging the application
-
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file. You can also build the native executable using `./mvnw package -Pnative`, or `./gradlew buildNative`.
-
-== Kotlin and Jackson
-
-If the `com.fasterxml.jackson.module:jackson-module-kotlin` dependency and the `quarkus-jackson` extension (or the `quarkus-resteasy-extension`) have been added to project,
-then Quarkus automatically registers the `KotlinModule` to the `ObjectMapper` bean (see link:rest-json#jackson[this] guide for more details).
\ No newline at end of file
diff --git a/docs/src/main/asciidoc/kubernetes-client.adoc b/docs/src/main/asciidoc/kubernetes-client.adoc
index 3a86f2b54a665..5f0b86e57c978 100644
--- a/docs/src/main/asciidoc/kubernetes-client.adoc
+++ b/docs/src/main/asciidoc/kubernetes-client.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Kubernetes Client
 
@@ -21,7 +21,7 @@ Being able to write such operators in Java with the very low footprint that nati
 Once you have your Quarkus project configured you can add the `kubernetes-client` extension
 to your project by running the following command in your project base directory.
 
-[source]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="kubernetes-client"
 ----
@@ -41,13 +41,13 @@ This will add the following to your `pom.xml`:
 Quarkus configures a Bean of type `KubernetesClient` which can be injected into application code using the well known CDI methods.
 This client can be configured using various properties as can be seen in the following example:
 
-[source]
+[source,properties]
 ----
 quarkus.kubernetes-client.trust-certs=false
 quarkus.kubernetes-client.namespace=default
 ----
 
-Note that the full list of properties is available in the https://github.com/quarkusio/quarkus/blob/master/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java[KubernetesClientBuildConfig] class.
+Note that the full list of properties is available in the https://github.com/quarkusio/quarkus/blob/main/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java[KubernetesClientBuildConfig] class.
 
 === Overriding
 
@@ -58,7 +58,7 @@ An example of this can be seen in the following snippet:
 
 [source,java]
 ----
-@ApplicationScoped
+@Singleton
 public class KubernetesClientProducer {
 
     @Produces
@@ -71,9 +71,9 @@ public class KubernetesClientProducer {
 
 == Testing
 
-To make testing against a mock Kubernetes API extremely simple, Quarkus provides the `KubernetesMockServerTestResource` which automatically launches
+To make testing against a mock Kubernetes API extremely simple, Quarkus provides the `WithKubernetesTestServer` annotation which automatically launches
 a mock of the Kubernetes API server and sets the proper environment variables needed so that the Kubernetes Client configures itself to use said mock.
-Tests can inject the mock and set it up in any way necessary for the particular testing using the `@MockServer` annotation.
+Tests can inject the mock server and set it up in any way necessary for the particular testing using the `@KubernetesTestServer` annotation.
 
 Let's assume we have a REST endpoint defined like so:
 
@@ -89,7 +89,6 @@ public class Pods {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     @Path("/{namespace}")
     public List<Pod> pods(@PathParam("namespace") String namespace) {
         return kubernetesClient.pods().inNamespace(namespace).list().getItems();
@@ -101,12 +100,13 @@ We could write a test for this endpoint very easily like so:
 
 [source%nowrap,java]
 ----
-@QuarkusTestResource(KubernetesMockServerTestResource.class)
+// you can even configure aspects like crud, https and port on this annotation
+@WithKubernetesTestServer
 @QuarkusTest
 public class KubernetesClientTest {
 
-    @MockServer
-    KubernetesMockServer mockServer;
+    @KubernetesTestServer
+    KubernetesServer mockServer;
 
     @BeforeEach
     public void before() {
@@ -140,9 +140,40 @@ Note that to take advantage of these features, the `quarkus-test-kubernetes-clie
 </dependency>
 ----
 
+Alternately, you can create a `CustomKubernetesMockServerTestResource.java` to ensure all your `@QuarkusTest` enabled test classes share the same mock server setup:
+
+[source%nowrap,java]
+----
+public class CustomKubernetesMockServerTestResource extends KubernetesServerTestResource {
+
+    @Override
+    public void configureMockServer(KubernetesServer mockServer) {
+        mockServer.expect().get().withPath("/api/v1/namespaces/test/pods")
+                .andReturn(200, new PodList())
+                .always();
+    }
+}
+----
+
+and use this in your other test classes as follows:
+[source%nowrap,java]
+----
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
+@QuarkusTest
+public class KubernetesClientTest {
+
+    //tests will now use the configured server...
+}
+----
+
+Furthermore, to get a mock server that replies with empty lists by default (instead of getting 404 responses from the Kubernetes API),
+you can use the `EmptyDefaultKubernetesMockServerTestResource.class` instead of
+`KubernetesMockServerTestResource.class`.
+
+
 == Note on implementing the Watcher interface
 
-Due to the restrictions imposed by GraalVM, extra care needs to be taken when implementing a `io.fabric8.kubernetes.client.Watcher` if the application is intended to work in native mode.
+Due to the restrictions imposed by GraalVM, extra care needs to be taken when implementing an `io.fabric8.kubernetes.client.Watcher` if the application is intended to work in native mode.
 Essentially every `Watcher` implementation needs to specify the Kubernetes model class that it handles via the ``Watcher``'s generic type at class definition time.
 To better understand this, suppose we want to watch for changes to Kubernetes `Pod` resources. There are a couple ways to write such a `Watcher` that are guaranteed to work in native:
 
@@ -264,6 +295,71 @@ subjects:
 Replace `<applicationName>` and `<namespace>` with your values.
 Have a look at https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/[Configure Service Accounts for Pods] to get further information.
 
+== OpenShift Client
+
+If the targeted Kubernetes cluster is an OpenShift cluster, it is possible to access it through
+the `openshift-client` extension, in a similar way. This leverages the dedicated fabric8
+openshift client, and provides access to `OpenShift` proprietary objects (e.g. `Route`, `ProjectRequest`, `BuildConfig` ...)
+
+Note that the configuration properties are shared with the `kubernetes-client` extension. In
+particular they have the same `quarkus.kubernetes-client` prefix.
+
+Add the extension with:
+
+[source]
+----
+./mvnw quarkus:add-extension -Dextensions="openshift-client"
+----
+
+Note that `openshift-client` extension has a dependency on the `kubernetes-client` extension.
+
+To use the client, inject an `OpenShiftClient` instead of the `KubernetesClient`:
+
+[source, java]
+----
+@Inject
+private OpenShiftClient openshiftClient;
+----
+
+If you need to override the default `OpenShiftClient`, provide a producer such as:
+
+[source, java]
+----
+@Singleton
+public class OpenShiftClientProducer {
+
+    @Produces
+    public OpenShiftClient openshiftClient() {
+        // here you would create a custom client
+        return new DefaultOpenShiftClient();
+    }
+}
+----
+
+Mock support is also provided in a similar fashion:
+
+[source, java]
+----
+@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTest
+public class OpenShiftClientTest {
+
+    @MockServer
+    private OpenShiftMockServer mockServer;
+...
+----
+
+To use this feature, you have to add a dependency on `quarkus-test-openshift-client`:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-test-openshift-client</artifactId>
+    <scope>test</scope>
+</dependency>
+----
+
 == Configuration Reference
 
 include::{generated-dir}/config/quarkus-kubernetes-client.adoc[opts=optional, leveloffset=+1]
diff --git a/docs/src/main/asciidoc/kubernetes-config.adoc b/docs/src/main/asciidoc/kubernetes-config.adoc
index 4eeb8949a102e..a8a8209bfcb84 100644
--- a/docs/src/main/asciidoc/kubernetes-config.adoc
+++ b/docs/src/main/asciidoc/kubernetes-config.adoc
@@ -1,14 +1,14 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Kubernetes Config
 
 include::./attributes.adoc[]
 
 
-Quarkus includes the `kubernetes-config` extension which allows developers to use Kubernetes https://cloud.google.com/kubernetes-engine/docs/concepts/configmap[ConfigMaps] as a configuration source, without having to mount the ConfigMaps into the https://kubernetes.io/docs/concepts/workloads/pods/pod/[Pod] running the Quarkus application.
+Quarkus includes the `kubernetes-config` extension which allows developers to use Kubernetes https://cloud.google.com/kubernetes-engine/docs/concepts/configmap[ConfigMaps] and https://cloud.google.com/kubernetes-engine/docs/concepts/secret[Secrets] as a configuration source, without having to mount them into the https://kubernetes.io/docs/concepts/workloads/pods/pod/[Pod] running the Quarkus application.
 
 
 == Configuration
@@ -16,7 +16,7 @@ Quarkus includes the `kubernetes-config` extension which allows developers to us
 Once you have your Quarkus project configured you can add the `kubernetes-config` extension
 by running the following command in your project base directory.
 
-[source]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="kubernetes-config"
 ----
@@ -33,19 +33,27 @@ This will add the following to your `pom.xml`:
 
 == Usage
 
-The extension works by reading ConfigMaps directly from the Kubernetes API server using the link:kubernetes-client[Kubernetes Client].
+The extension works by reading ConfigMaps and Secrets directly from the Kubernetes API server using the link:kubernetes-client[Kubernetes Client].
 
-The extension understands the following types of ConfigMaps as input sources:
+The extension understands the following types of ConfigMaps and Secrets as input sources:
 
-* ConfigMaps that contain literal data (see https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#create-configmaps-from-literal-values[this] for an example on how to create one)
-* ConfigMaps created from files named, `application.properties`, `application.yaml` or `application.yml` (see https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#create-configmaps-from-files[this] for an example on how to create one).
+* ConfigMaps and Secrets that contain literal data (see https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#create-configmaps-from-literal-values[this] for an example on how to create one)
+* ConfigMaps and Secrets created from files named `application.properties`, `application.yaml` or `application.yml` (see https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#create-configmaps-from-files[this] for an example on how to create one).
 
-To configure which ConfigMaps (from the namespace that the application runs in, or the explicitly configured namespace via `quarkus.kubernetes-client.namespace`), you can set the `quarkus.kubernetes-config.config-maps` property (in any of the usual Quarkus ways). If access to ConfigMaps from a specific namespace you can set the
-`quarkus.kubernetes-config.namespace` property. Keep in mind however that you will also have to explicitly enable the retrieval of ConfigMaps by setting `quarkus.kubernetes-config.enabled=true` (the default is `false` in order to make it easy to test the application locally).
+You have to explicitly enable the retrieval of ConfigMaps and Secrets by setting `quarkus.kubernetes-config.enabled=true`.
+The default is `false` in order to make it easy to test the application locally.
+
+Afterwards, set the `quarkus.kubernetes-config.config-maps` property to configure which ConfigMaps should be used.
+Set the `quarkus.kubernetes-config.secrets` property to configure which Secrets should be used.
+To access ConfigMaps and Secrets from a specific namespace, you can set the `quarkus.kubernetes-config.namespace` property.
 
 === Priority of obtained properties
 
-The properties obtained from the ConfigMaps have a higher priority (i.e. they override) any properties of the same name that are found in `application.properties` (or the YAML equivalents), but they have lower priority than properties set via Environment Variables or Java System Properties.
+The properties obtained from the ConfigMaps and Secrets have a higher priority than (i.e. they override) any properties of the same name that are found in `application.properties` (or the YAML equivalents), but they have lower priority than properties set via Environment Variables or Java System Properties.
+
+Furthermore, when multiple ConfigMaps (or Secrets) are used, ConfigMaps (or Secrets) defined later in the list have a higher priority that ConfigMaps defined earlier in the list.
+
+Finally, when both ConfigMaps and Secrets are used, the latter always a higher priority than the former.
 
 === Kubernetes Permissions
 
@@ -54,6 +62,11 @@ that is used to run the application needs to have the proper permissions for suc
 
 Thankfully, when using the `kubernetes-config` extension along with the link:deploying-to-kubernetes[Kubernetes] extension, all the necessary Kubernetes resources to make that happen are automatically generated.
 
+==== Secrets
+
+By default, the link:deploying-to-kubernetes[Kubernetes] extension doesn't generate the necessary resources to allow accessing secrets.
+Set `quarkus.kubernetes-config.secrets.enabled=true` to generate the necessary role and corresponding role binding.
+
 == Configuration Reference
 
 include::{generated-dir}/config/quarkus-kubernetes-config-kubernetes-config-source-config.adoc[opts=optional, leveloffset=+1]
diff --git a/docs/src/main/asciidoc/lifecycle.adoc b/docs/src/main/asciidoc/lifecycle.adoc
index b95d7debc9586..a97a99fe594d1 100644
--- a/docs/src/main/asciidoc/lifecycle.adoc
+++ b/docs/src/main/asciidoc/lifecycle.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Application Initialization and Termination
 
@@ -37,7 +37,7 @@ The solution is located in the `lifecycle-quickstart` {quickstarts-tree-url}/lif
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
@@ -58,7 +58,7 @@ It generates:
 
 == The main method
 
-By default Quarkus will automatically generate a main method, that will boostrap Quarkus and then just wait for
+By default Quarkus will automatically generate a main method, that will bootstrap Quarkus and then just wait for
 shutdown to be initiated. Let's provide our own main method:
 [source,java]
 ----
@@ -214,7 +214,7 @@ TIP: If a class is annotated with `@Startup` but with no scope annotation then `
 Run the application with: `./mvnw compile quarkus:dev`, the logged message is printed.
 When the application is stopped, the second log message is printed.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable using `./mvnw clean package -Pnative`.
 
 == Launch Modes
diff --git a/docs/src/main/asciidoc/liquibase.adoc b/docs/src/main/asciidoc/liquibase.adoc
index 2a6d8fbc50216..0bb4c2dfa2fdc 100644
--- a/docs/src/main/asciidoc/liquibase.adoc
+++ b/docs/src/main/asciidoc/liquibase.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Liquibase
 
@@ -134,19 +134,16 @@ The Liquibase properties are prefixed exactly the same way as the named datasour
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
 quarkus.datasource.jdbc.max-size=13
 
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 
 # Liquibase configuration for the default datasource
diff --git a/docs/src/main/asciidoc/logging-sentry.adoc b/docs/src/main/asciidoc/logging-sentry.adoc
index 5e1ba7fc87846..67e259d5b3c68 100644
--- a/docs/src/main/asciidoc/logging-sentry.adoc
+++ b/docs/src/main/asciidoc/logging-sentry.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Logging to Sentry
 
diff --git a/docs/src/main/asciidoc/logging.adoc b/docs/src/main/asciidoc/logging.adoc
index 32a32cec44380..abef279077cb3 100644
--- a/docs/src/main/asciidoc/logging.adoc
+++ b/docs/src/main/asciidoc/logging.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Configuring Logging
 
@@ -51,6 +51,32 @@ public class ExampleResource {
 
 NOTE: If you use JBoss Logging but one of your libraries uses a different logging API, you may need to configure a link:#logging-adapters[Logging Adapter].
 
+You can also inject a configured `org.jboss.logging.Logger` instance in your beans and resource classes.
+
+[source, java]
+----
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+class SimpleBean {
+
+   @Inject
+   Logger log; <1>
+
+   @LoggerName("foo")
+   Logger fooLog; <2>
+
+   public void ping() {
+     log.info("Simple!");
+     fooLog.info("Goes to _foo_ logger!");
+   }
+}
+----
+<1> The FQCN of the declaring class is used as a logger name, i.e. `org.jboss.logging.Logger.getLogger(SimpleBean.class)` will be used.
+<2> In this case, the name _foo_ is used as a logger name, i.e. `org.jboss.logging.Logger.getLogger("foo")` will be used.
+
+NOTE: The logger instances are cached internally. Therefore, a logger injected e.g. into a `@RequestScoped` bean is shared for all bean instances to avoid possible performance penalty associated with logger instantiation.
+
 === What about Apache Log4j ?
 
 link:https://logging.apache.org/log4j/2.x/[Log4j] is a logging implementation: it contains a logging backend and a logging facade.
@@ -105,10 +131,19 @@ quarkus.log.level=INFO
 quarkus.log.category."org.hibernate".level=DEBUG
 ----
 
+Setting a log level below `DEBUG` requires the minimum log level to be adjusted,
+either globally via the `quarkus.log.min-level` property or per-category as shown in the example above,
+as well as adjusting the log level itself.
+
+Minimum logging level sets a floor level that Quarkus will be needed to potentially generate,
+opening the door to optimization opportunities.
+As an example, in native execution the minimum level enables lower level checks (e.g. `isTraceEnabled`) to be folded to `false`,
+resulting in dead code elimination for code that will never to be executed.
+
 All possible properties are listed in <<loggingConfigurationReference, the logging configuration reference>>.
 
 NOTE: If you are adding these properties via command line make sure `"` is escaped.
-For example `-Dquarkus.log.category.\"org.hibernate\".level=DEBUG`.
+For example `-Dquarkus.log.category.\"org.hibernate\".level=TRACE`.
 
 === Logging categories
 
@@ -122,6 +157,7 @@ These can also be overridden by attaching a one or more named handlers to a cate
 |===
 |Property Name|Default|Description
 |quarkus.log.category."<category-name>".level|INFO footnote:[Some extensions may define customized default log levels for certain categories, in order to reduce log noise by default.  Setting the log level in configuration will override any extension-defined log levels.]|The level to use to configure the category named `<category-name>`.  The quotes are necessary.
+|quarkus.log.category."<category-name>".min-level|DEBUG |The minimum logging level to use to configure the category named `<category-name>`.  The quotes are necessary.
 |quarkus.log.category."<category-name>".use-parent-handlers|true|Specify whether or not this logger should send its output to its parent logger.
 |quarkus.log.category."<category-name>".handlers=[<handler>]|empty footnote:[By default the configured category gets the same handlers attached as the one on the root logger.]|The names of the handlers that you want to attach to a specific category.
 |===
@@ -136,7 +172,8 @@ The root logger category is handled separately, and is configured via the follow
 [cols="<m,<m,<2",options="header"]
 |===
 |Property Name|Default|Description
-|quarkus.log.level|INFO|The default minimum log level for every log category.
+|quarkus.log.level|INFO|The default log level for every log category.
+|quarkus.log.min-level|DEBUG|The default minimum log level for every log category.
 |===
 
 If no level configuration exists for a given logger category, the enclosing (parent) category is examined. If no categories are configured which enclose the category in question, then the root logger configuration is used.
@@ -281,6 +318,7 @@ quarkus.log.file.path=/tmp/trace.log
 quarkus.log.file.level=TRACE
 quarkus.log.file.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n
 # Set 2 categories (io.quarkus.smallrye.jwt, io.undertow.request.security) to TRACE level
+quarkus.log.min-level=TRACE
 quarkus.log.category."io.quarkus.smallrye.jwt".level=TRACE
 quarkus.log.category."io.undertow.request.security".level=TRACE
 ----
@@ -373,23 +411,13 @@ These adapters are available for most of the common Open Source logging componen
 </dependency>
 ----
 
-JDK Logging:
-
-[source, xml]
-----
-<dependency>
-    <groupId>org.jboss.logging</groupId>
-    <artifactId>jboss-logging-jdk</artifactId>
-</dependency>
-----
-
 Log4j:
 
 [source, xml]
 ----
 <dependency>
-    <groupId>org.jboss.logging</groupId>
-    <artifactId>jboss-logging-log4j</artifactId>
+    <groupId>org.jboss.logmanager</groupId>
+    <artifactId>log4j-jboss-logmanager</artifactId>
 </dependency>
 ----
 
@@ -398,7 +426,7 @@ Log4j2:
 [source, xml]
 ----
 <dependency>
-    <groupId>org.jboss.logging</groupId>
+    <groupId>org.jboss.logmanager</groupId>
     <artifactId>log4j2-jboss-logmanager</artifactId>
 </dependency>
 ----
@@ -409,7 +437,7 @@ And Slf4j:
 ----
 <dependency>
     <groupId>org.jboss.slf4j</groupId>
-    <artifactId>slf4j-jboss-logging</artifactId>
+    <artifactId>slf4j-jboss-logmanager</artifactId>
 </dependency>
 ----
 
diff --git a/docs/src/main/asciidoc/mailer.adoc b/docs/src/main/asciidoc/mailer.adoc
index 10a134dbd1fc0..1c692d72cf093 100644
--- a/docs/src/main/asciidoc/mailer.adoc
+++ b/docs/src/main/asciidoc/mailer.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Sending emails
 
@@ -29,18 +29,20 @@ It covers simple emails, attachments, inlined attachments, the reactive and impe
 
 Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=sending-email-quickstart \
-    -Dextensions="mailer"
+    -DclassName="org.acme.mailer.SimpleMailerResource" \
+    -Dpath="/simple" \
+    -Dextensions="resteasy,mailer"
 cd sending-email-quickstart
 ----
 
 If you already have an existing project, add the `mailer` extension:
 
-[source]
+[source,bash]
 ----
 ./mvnw quarkus:add-extensions -Dextensions="mailer"
 ----
@@ -62,7 +64,7 @@ Note that the password can also be configured using system properties and enviro
 
 Here is an example using _sendgrid_:
 
-[source]
+[source,properties]
 ----
 quarkus.mailer.from=test@quarkus.io
 quarkus.mailer.host=smtp.sendgrid.net
@@ -79,14 +81,16 @@ It is recommended to encrypt any sensitive data, such as the `quarkus.mailer.pas
 One approach is to save the value into a secure store like HashiCorp Vault, and refer to it from the configuration.
 Assuming for instance that Vault contains key `mail-password` at path `myapps/myapp/myconfig`, then the mailer
 extension can be simply configured as:
-```
+
+[source,properties]
+----
 ...
 # path within the kv secret engine where is located the application sensitive configuration
 quarkus.vault.secret-config-kv-path=myapps/myapp/myconfig
 
 ...
 quarkus.mailer.password=${mail-password}
-```
+----
 Please note that the password value is evaluated only once, at startup time. If `mail-password` was changed in Vault,
 the only way to get the new value would be to restart the application.
 ====
@@ -287,6 +291,27 @@ public CompletionStage<Response> send() {
 
 TIP: Injected mail templates are validated during build. If there is no matching template in `src/main/resources/templates` the build fails.
 
+Adding `quarkus-resteasy-reactive` extension allows you to directly return a `Uni`, such as:
+
+[source, java]
+----
+@Inject
+MailTemplate hello;
+
+@GET
+@Path("/mail")
+public Uni<Response> send() { <1>
+    return hello.to("to@acme.org")
+        .subject("Hello from Qute template")
+        // the template looks like: Hello {name}!
+        .data("name", "John")
+        .send()
+        .onItem().transform(x -> Response.accepted().build()); <2>
+}
+----
+<1> The method returns a `Uni`
+<2> Transform the `Uni<Void>` returned by `MailTemplate` into `Unit<Response>`
+
 == Testing email sending
 
 Because it is very inconvenient to send emails during development and testing, you can set the `quarkus.mailer.mock` boolean
@@ -340,7 +365,7 @@ When done, you can configure your Quarkus application by adding the following pr
 
 With TLS:
 
-[source]
+[source,properties]
 ----
 quarkus.mailer.auth-methods=DIGEST-MD5 CRAM-SHA256 CRAM-SHA1 CRAM-MD5 PLAIN LOGIN
 quarkus.mailer.from=YOUREMAIL@gmail.com
@@ -353,7 +378,7 @@ quarkus.mailer.password=YOURGENERATEDAPPLICATIONPASSWORD
 
 Or with SSL:
 
-[source]
+[source,properties]
 ---- 
 quarkus.mailer.auth-methods=DIGEST-MD5 CRAM-SHA256 CRAM-SHA1 CRAM-MD5 PLAIN LOGIN
 quarkus.mailer.from=YOUREMAIL@gmail.com
@@ -388,8 +413,6 @@ If you need fine control on how the mail is sent, for instance if you need to re
 Three API flavors are exposed:
 
 * the Mutiny client (`io.vertx.mutiny.ext.mail.MailClient`)
-* the Axle client (`io.vertx.axle.ext.mail.MailClient`), using `CompletionStage` and Reactive Streams `Publisher` - deprecated, it is recommended to switch to the Mutiny client
-* the RX Java 2 client (`io.vertx.reactivex.ext.mail.MailClient`) - deprecated, it is recommended to switch to the Mutiny client
 * the bare client (`io.vertx.ext.mail.MailClient`)
 
 Check the link:vertx[Using Vert.x guide] for further details about these different APIs and how to select the most suitable for you.
diff --git a/docs/src/main/asciidoc/maven-tooling.adoc b/docs/src/main/asciidoc/maven-tooling.adoc
index c63409ff1735f..0cfb5cf4abf0f 100644
--- a/docs/src/main/asciidoc/maven-tooling.adoc
+++ b/docs/src/main/asciidoc/maven-tooling.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Building applications with Maven
 
@@ -12,7 +12,7 @@ include::./attributes.adoc[]
 
 With Maven, you can scaffold a new project with:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=my-groupId \
@@ -41,7 +41,7 @@ The following table lists the attributes you can pass to the `create` command:
 | The artifact id of the created project. Not passing it triggers the interactive mode.
 
 | `projectVersion`
-| `1.0-SNAPSHOT`
+| `1.0.0-SNAPSHOT`
 | The version of the created project
 
 | `platformGroupId`
@@ -85,14 +85,14 @@ Instructions to build the image and run the container are written in those Docke
 
 From inside a Quarkus project, you can obtain a list of the available extensions with:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:list-extensions
 ----
 
 You can enable an extension using:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="hibernate-validator"
 ----
@@ -120,7 +120,7 @@ $ ./mvnw quarkus:add-extensions -Dextensions=jdbc,agroal,non-exist-ent
 
 You can install all extensions which match a globbing pattern :
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="hibernate-*"
 ----
@@ -130,7 +130,7 @@ You can install all extensions which match a globbing pattern :
 Quarkus comes with a built-in development mode.
 Run your application with:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -149,16 +149,26 @@ with compilation or deployment an error page will let you know.
 
 Hit `CTRL+C` to stop the application.
 
+[NOTE]
+====
+By default, `quarkus:dev` sets the debug host to `localhost` (for security reasons). If you need to change this, for example to enable debugging on all hosts, you can use the `-DdebugHost` option like so:
+
+[source,bash]
+----
+./mvnw compile quarkus:dev -DdebugHost=0.0.0.0
+----
+====
+
 === Remote Development Mode
 
-It is possible to use development mode remotely, so that you can run Quarkus in a container environment (such as Openshift)
+It is possible to use development mode remotely, so that you can run Quarkus in a container environment (such as OpenShift)
 and have changes made to your local files become immediately visible.
 
 This allows you to develop in the same environment you will actually run your app in, and with access to the same services.
 
 WARNING: Do not use this in production. This should only be used in a development environment. You should not run production application in dev mode.
 
-To do this you must build a mutable application, using the `mutable-jar` format. Set the following properties in `application.xml`:
+To do this you must build a mutable application, using the `mutable-jar` format. Set the following properties in `application.properties`:
 
 [source,properties]
 ----
@@ -173,10 +183,18 @@ however they can also be started in dev mode.
 <3> The URL that your app is going to be running in dev mode at. This is only needed on the local side, so you
 may want to leave it out of the properties file and specify it as a system property on the command line.
 
+The `mutable-jar` is then built in the same way that a regular Quarkus jar is built, i.e. by issuing:
+
+[source,bash]
+----
+./mvnw package
+----
+
 Before you start Quarkus on the remote host set the environment variable `QUARKUS_LAUNCH_DEVMODE=true`. If you are
-on bare metal you can just set this via the `export QUARKUS_LAUNCH_DEVMODE=true` command, if you are running using
-docker start the image with `-e QUARKUS_LAUNCH_DEVMODE=true`. When the application starts you should now see the following
-line in the logs: `Profile dev activated. Live Coding activated`.
+on bare metal you can set it via the `export QUARKUS_LAUNCH_DEVMODE=true` command and then run the application with the proper `java -jar ...` command to run the application.
+
+If you plan on running the application via Docker, then you'll need to add `-e QUARKUS_LAUNCH_DEVMODE=true` to the `docker run` command.
+When the application starts you should now see the following line in the logs: `Profile dev activated. Live Coding activated`.
 
 NOTE: The remote side does not need to include Maven or any other development tools. The normal `fast-jar` Dockerfile
 that is generated with a new Quarkus application is all you need. If you are using bare metal launch the Quarkus runner
@@ -184,7 +202,7 @@ jar, do not attempt to run normal devmode.
 
 Now you need to connect your local agent to the remote host, using the `remote-dev` command:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:remote-dev -Dquarkus.live-reload.url=http://my-remote-host:8080
 ----
@@ -197,6 +215,10 @@ If you do not want to use the HTTP feature then you can simply run the `remote-d
 In this mode the command will continuously rebuild the local application, so you can use an external tool such as odo or
 rsync to sync to the remote application.
 
+All the config options are shown below:
+
+include::{generated-dir}/config/quarkus-live-reload-live-reload-config.adoc[opts=optional, leveloffset=+1]
+
 NOTE: It is recommended you use SSL when using remote dev mode, however even if you are using an unencrypted connection
 your password is never sent directly over the wire. For the initial connection request the password is hashed with the
 initial state data, and subsequent requests hash it with a random session id generated by the server and any body contents
@@ -254,7 +276,7 @@ An additional system property `suspend` can be used to suspend the JVM, when lau
 
 [TIP]
 ====
-You can also run a Quarkus application in debug mode with a suspended JVM using `./mvnw compile quarkus:dev -Ddebug` which is a shorthand for `./mvnw compile quarkus:dev -Ddebug=true`.
+You can also run a Quarkus application in debug mode with a suspended JVM using `./mvnw compile quarkus:dev -Dsuspend` which is a shorthand for `./mvnw compile quarkus:dev -Dsuspend=true`.
 
 Then, attach your debugger to `localhost:5005`.
 ====
@@ -318,10 +340,10 @@ To be able to use it, the following plugin configuration has to be added to the
 
 Now you should be able to execute `./mvnw quarkus-bootstrap:build-tree` on your project and see something like:
 
-[source,shell,subs=attributes+]
+[source,text,subs=attributes+]
 ----
 [INFO] --- quarkus-bootstrap-maven-plugin:{quarkus-version}:build-tree (default-cli) @ getting-started ---
-[INFO] org.acme:getting-started:jar:1.0-SNAPSHOT
+[INFO] org.acme:getting-started:jar:1.0.0-SNAPSHOT
 [INFO] └─ io.quarkus:quarkus-resteasy-deployment:jar:{quarkus-version} (compile)
 [INFO]    ├─ io.quarkus:quarkus-resteasy-server-common-deployment:jar:{quarkus-version} (compile)
 [INFO]    │  ├─ io.quarkus:quarkus-core-deployment:jar:{quarkus-version} (compile)
@@ -335,7 +357,7 @@ Now you should be able to execute `./mvnw quarkus-bootstrap:build-tree` on your
 
 Native executables make Quarkus applications ideal for containers and serverless workloads.
 
-Make sure to have `GRAALVM_HOME` configured and pointing to GraalVM version {graalvm-version}.
+Make sure to have `GRAALVM_HOME` configured and pointing to GraalVM version {graalvm-version} (Make sure to use a Java 11 version of GraalVM).
 Verify that your `pom.xml` has the proper `native` profile (see <<build-tool-maven>>).
 
 Create a native executable using: `./mvnw package -Pnative`.
@@ -345,7 +367,7 @@ To run Integration Tests on the native executable, make sure to have the proper
 
 [source,shell]
 ----
-./mvnw verify -Pnative
+$ ./mvnw verify -Pnative
 ...
 [quarkus-quickstart-runner:50955]     universe:     391.96 ms
 [quarkus-quickstart-runner:50955]      (parse):     904.37 ms
@@ -379,7 +401,7 @@ Executing [/Users/starksm/Dev/JBoss/Quarkus/starksm64-quarkus-quickstarts/gettin
 The native executable will be specific to your operating system.
 To create an executable that will run in a container, use the following:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw package -Dnative -Dquarkus.native.container-build=true
 ----
@@ -412,7 +434,7 @@ If you have not used <<project-creation,project scaffolding>>, add the following
     <dependencies>
         <dependency> <1>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bom</artifactId>
+            <artifactId>quarkus-universe-bom</artifactId>
             <version>${quarkus.platform.version}</version>
             <type>pom</type>
             <scope>import</scope>
@@ -426,10 +448,13 @@ If you have not used <<project-creation,project scaffolding>>, add the following
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-maven-plugin</artifactId>
             <version>${quarkus-plugin.version}</version>
+            <extensions>true</extensions>
             <executions>
                 <execution>
                     <goals>
                         <goal>build</goal>
+                        <goal>generate-code</goal>
+                        <goal>generate-code-tests</goal>
                     </goals>
                 </execution>
             </executions>
@@ -490,10 +515,24 @@ If you have not used <<project-creation,project scaffolding>>, add the following
 <5> Enable the `native` package type. The build will therefore produce a native executable.
 <6> If you want to test your native executable with Integration Tests, add the following plugin configuration. Test names `*IT` and annotated `@NativeImageTest` will be run against the native executable. See the link:building-native-image[Native executable guide] for more info.
 
+=== Using fast-jar
+
+`fast-jar` is now the default quarkus package type. The result of `./mvnw package` command is a new directory under `target` named `quarkus-app`.
+
+You can run the application using: `java -jar target/quarkus-app/quarkus-run.jar`.
+
+WARNING: In order to successfully run the produced jar, you need to have the entire contents of the `quarkus-app` directory. If any of the files are missing, the application will not start or
+might not function correctly.
+
+TIP: The `fast-jar` packaging results in creating an artifact that starts a little faster and consumes slightly less memory than a legacy Quarkus jar
+because it has indexed information about which dependency jar contains classes and resources. It can thus avoid the lookup into potentially every jar
+on the classpath that the legacy jar necessitates, when loading a class or resource.
+
 [[uber-jar-maven]]
 === Uber-Jar Creation
 
-Quarkus Maven plugin supports the generation of Uber-Jars by specifying a `quarkus.package.type=uber-jar` configuration option in your `application.properties`.
+Quarkus Maven plugin supports the generation of Uber-Jars by specifying a `quarkus.package.type=uber-jar` configuration option in your `application.properties`
+(or `<quarkus.package.type>uber-jar</quarkus.package.type>` in your `pom.xml`).
 
 The original jar will still be present in the `target` directory but it will be renamed to contain the `.original` suffix.
 
diff --git a/docs/src/main/asciidoc/micrometer.adoc b/docs/src/main/asciidoc/micrometer.adoc
new file mode 100644
index 0000000000000..860e7c8c755a4
--- /dev/null
+++ b/docs/src/main/asciidoc/micrometer.adoc
@@ -0,0 +1,438 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Micrometer Metrics
+
+include::./attributes.adoc[]
+
+This guide demonstrates how your Quarkus application can utilize the Micrometer
+metrics library for runtime and application metrics.
+
+Apart from application-specific metrics, which are described in this guide, you may also utilize built-in metrics
+exposed by various Quarkus extensions. These are described in the guide for each particular extension that supports
+built-in metrics.
+
+IMPORTANT: Micrometer is the recommended approach to metrics for Quarkus.
+
+== Prerequisites
+
+To complete this guide, you need:
+
+* less than 15 minutes
+* an IDE
+* JDK 1.8+ installed with `JAVA_HOME` configured appropriately
+* Apache Maven {maven-version}
+
+== Architecture
+
+In this example, we build a very simple microservice which offers one REST endpoint and that determines
+if a number is prime.
+
+== Solution
+
+We recommend that you follow the instructions in the next sections and create the application step by step.
+However, you can go right to the completed example.
+
+Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
+
+The solution is located in the `micrometer-quickstart` {quickstarts-tree-url}/micrometer-quickstart[directory].
+
+== Creating the Maven Project
+
+Micrometer defines a core library and a set of additional libraries that support different monitoring systems.
+Quarkus Micrometer extensions are structured similarly: `quarkus-micrometer` provides core micrometer support and
+runtime integration and other supporting Quarkus and Quarkiverse extensions bring in additional dependencies
+and requirements to support specific monitoring systems.
+
+For this example, we'll use the Prometheus registry.
+
+First, we need a new project. Create a new project with the following command:
+
+[source,bash,subs=attributes+]
+----
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
+    -DprojectGroupId=org.acme \
+    -DprojectArtifactId=micrometer-quickstart \
+    -DclassName="org.acme.micrometer.PrimeNumberResource" \
+    -Dpath="/" \
+    -Dextensions="resteasy,micrometer-registry-prometheus"
+cd micrometer-quickstart
+----
+
+This command generates a Maven project, that imports the `micrometer-registry-prometheus` extension as a dependency.
+This extension will load the core `micrometer` extension as well as additional library dependencies required to support
+prometheus.
+
+If you already have your Quarkus project configured, you can add the `micrometer-registry-prometheus` extension
+to your project by running the following command in your project base directory:
+
+[source,bash]
+----
+./mvnw quarkus:add-extension -Dextensions="micrometer-registry-prometheus"
+----
+
+This will add the following to your `pom.xml`:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+</dependency>
+----
+
+== Writing the application
+
+The application consists of a single class that implements an algorithm for checking whether a number is prime.
+This algorithm is exposed over a REST interface. With the Micrometer extension enabled, metrics for all http
+server requests are collected automatically.
+
+We do want to add a few other metrics to demonstrate how those types work:
+
+* A counter will be incremented for every prime number discovered
+* A gauge will store the highest prime number discovered
+* A timer will record the time spent testing if ia number is prime.
+
+[source,java]
+----
+package org.acme.micrometer;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.function.Supplier;
+
+@Path("/")
+public class PrimeNumberResource {
+
+    private final LongAccumulator highestPrime = new LongAccumulator(Long::max, 0);
+    private final MeterRegistry registry;
+
+    PrimeNumberResource(MeterRegistry registry) {
+        this.registry = registry;
+
+        // Create a gauge that uses the highestPrimeNumberSoFar method
+        // to obtain the highest observed prime number
+        registry.gauge("prime.number.max", this,
+                PrimeNumberResource::highestObservedPrimeNumber);
+    }
+
+    @GET
+    @Path("/{number}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String checkIfPrime(@PathParam("number") long number) {
+        if (number < 1) {
+            return "Only natural numbers can be prime numbers.";
+        }
+        if (number == 1) {
+            return "1 is not prime.";
+        }
+        if (number == 2) {
+            return "2 is prime.";
+        }
+        if (number % 2 == 0) {
+            return number + " is not prime, it is divisible by 2.";
+        }
+
+        Supplier<String> supplier = () -> {
+            for (int i = 3; i < Math.floor(Math.sqrt(number)) + 1; i = i + 2) {
+                if (number % i == 0) {
+                    return number + " is not prime, is divisible by " + i + ".";
+                }
+            }
+            highestPrime.accumulate(number);
+            return number + " is prime.";
+        };
+
+        return registry.timer("prime.number.test").wrap(supplier).get();
+    }
+
+    /**
+     * This method is called by the registered {@code highest.prime.number} gauge.
+     * @return the highest observed prime value
+     */
+    long highestObservedPrimeNumber() {
+        return highestPrime.get();
+    }
+}
+----
+
+== Running and using the application
+
+To run the microservice in dev mode, use `./mvnw clean compile quarkus:dev`
+
+=== Generate some values for the metrics
+
+First, ask the endpoint whether some numbers are prime numbers.
+
+[source,bash]
+----
+curl localhost:8080/350
+----
+
+The application will respond that 350 is not a prime number because it can be divided by 2.
+
+Now for some large prime number so that the test takes a bit more time:
+
+[source,bash]
+----
+curl localhost:8080/629521085409773
+----
+
+The application will respond that 629521085409773 is a prime number.
+If you want, try some more calls with numbers of your choice.
+
+=== Review the generated metrics
+
+To view the metrics, execute `curl localhost:8080/q/metrics/`
+
+Prometheus-formatted metrics will be returned in plain text in no particular order.
+
+The application above has only one custom gauge that measures the time
+spent determining whether or not a number is prime. The Micrometer extension
+enables additional system, jvm, and http metrics. A subset of the collected metrics
+are shown below.
+
+[source,text]
+----
+# HELP http_server_requests_seconds
+# TYPE http_server_requests_seconds summary
+http_server_requests_seconds_count{method="GET",outcome="SUCCESS",status="200",uri="/{number}",} 4.0
+http_server_requests_seconds_sum{method="GET",outcome="SUCCESS",status="200",uri="/{number}",} 0.041501773
+# HELP http_server_requests_seconds_max
+# TYPE http_server_requests_seconds_max gauge
+http_server_requests_seconds_max{method="GET",outcome="SUCCESS",status="200",uri="/{number}",} 0.038066359
+# HELP jvm_threads_peak_threads The peak live thread count since the Java virtual machine started or peak was reset
+# TYPE jvm_threads_peak_threads gauge
+jvm_threads_peak_threads 56.0
+# HELP http_server_connections_seconds_max
+# TYPE http_server_connections_seconds_max gauge
+http_server_connections_seconds_max 0.102580737
+# HELP http_server_connections_seconds
+# TYPE http_server_connections_seconds summary
+http_server_connections_seconds_active_count 5.0
+http_server_connections_seconds_duration_sum 0.175032815
+# HELP system_load_average_1m The sum of the number of runnable entities queued to available processors and the number of runnable entities running on the available processors averaged over a period of time
+# TYPE system_load_average_1m gauge
+system_load_average_1m 2.4638671875
+# HELP http_server_bytes_written_max
+# TYPE http_server_bytes_written_max gauge
+http_server_bytes_written_max 39.0
+# HELP http_server_bytes_written
+# TYPE http_server_bytes_written summary
+http_server_bytes_written_count 4.0
+http_server_bytes_written_sum 99.0
+# HELP jvm_classes_loaded_classes The number of classes that are currently loaded in the Java virtual machine
+# TYPE jvm_classes_loaded_classes gauge
+jvm_classes_loaded_classes 9341.0
+# HELP prime_number_max
+# TYPE prime_number_max gauge
+prime_number_max 887.0
+# HELP jvm_info JVM version info
+# TYPE jvm_info gauge
+jvm_info{runtime="OpenJDK Runtime Environment",vendor="Oracle Corporation",version="13.0.2+8",} 1.0
+# HELP jvm_classes_unloaded_classes_total The total number of classes unloaded since the Java virtual machine has started execution
+# TYPE jvm_classes_unloaded_classes_total counter
+jvm_classes_unloaded_classes_total 28.0
+# HELP prime_number_test_seconds
+# TYPE prime_number_test_seconds summary
+prime_number_test_seconds_count 3.0
+prime_number_test_seconds_sum 1.94771E-4
+# HELP prime_number_test_seconds_max
+# TYPE prime_number_test_seconds_max gauge
+prime_number_test_seconds_max 1.76162E-4
+# HELP http_server_bytes_read
+# TYPE http_server_bytes_read summary
+http_server_bytes_read_count 4.0
+http_server_bytes_read_sum 0.0
+# HELP http_server_bytes_read_max
+# TYPE http_server_bytes_read_max gauge
+http_server_bytes_read_max 0.0
+# HELP jvm_threads_states_threads The current number of threads having NEW state
+# TYPE jvm_threads_states_threads gauge
+jvm_threads_states_threads{state="runnable",} 37.0
+jvm_threads_states_threads{state="blocked",} 0.0
+jvm_threads_states_threads{state="waiting",} 15.0
+jvm_threads_states_threads{state="timed-waiting",} 4.0
+jvm_threads_states_threads{state="new",} 0.0
+jvm_threads_states_threads{state="terminated",} 0.0
+# HELP jvm_buffer_memory_used_bytes An estimate of the memory that the Java virtual machine is using for this buffer pool
+# TYPE jvm_buffer_memory_used_bytes gauge
+jvm_buffer_memory_used_bytes{id="mapped",} 0.0
+jvm_buffer_memory_used_bytes{id="direct",} 149521.0
+# HELP jvm_memory_committed_bytes The amount of memory in bytes that is committed for the Java virtual machine to use
+# TYPE jvm_memory_committed_bytes gauge
+jvm_memory_committed_bytes{area="nonheap",id="CodeHeap 'profiled nmethods'",} 1.1403264E7
+jvm_memory_committed_bytes{area="heap",id="G1 Survivor Space",} 4194304.0
+jvm_memory_committed_bytes{area="heap",id="G1 Old Gen",} 9.2274688E7
+jvm_memory_committed_bytes{area="nonheap",id="Metaspace",} 4.9803264E7
+jvm_memory_committed_bytes{area="nonheap",id="CodeHeap 'non-nmethods'",} 2555904.0
+jvm_memory_committed_bytes{area="heap",id="G1 Eden Space",} 6.9206016E7
+jvm_memory_committed_bytes{area="nonheap",id="Compressed Class Space",} 6815744.0
+jvm_memory_committed_bytes{area="nonheap",id="CodeHeap 'non-profiled nmethods'",} 2555904.0
+----
+
+Note that metrics appear lazily, you often won't see any data for your endpoint until
+something tries to access it, etc.
+
+== Using MeterFilter to configure metrics
+
+Micrometer uses `MeterFilter` instances to customize the metrics emitted by `MeterRegistry` instances.
+The Micrometer extension will detect `MeterFilter` CDI beans and use them when initializing `MeterRegistry`
+instances.
+
+[source,java]
+----
+@Singleton
+public class CustomConfiguration {
+
+    @ConfigProperty(name = "deployment.env")
+    String deploymentEnv;
+
+    /** Define common tags that apply only to a Prometheus Registry */
+    @Produces
+    @Singleton
+    @MeterFilterConstraint(applyTo = PrometheusMeterRegistry.class)
+    public MeterFilter configurePrometheusRegistries() {
+        return MeterFilter.commonTags(Arrays.asList(
+                Tag.of("registry", "prometheus")));
+    }
+
+    /** Define common tags that apply globally */
+    @Produces
+    @Singleton
+    public MeterFilter configureAllRegistries() {
+        return MeterFilter.commonTags(Arrays.asList(
+                Tag.of("env", deploymentEnv)));
+    }
+
+    /** Enable histogram buckets for a specific timer */
+    @Produces
+    @Singleton
+    public MeterFilter enableHistogram() {
+        return new MeterFilter() {
+            @Override
+            public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticConfig config) {
+                if(id.getName().startsWith("myservice")) {
+                    return DistributionStatisticConfig.builder()
+                        .percentiles(0.5, 0.95)     // median and 95th percentile, not aggregable
+                        .percentilesHistogram(true) // histogram buckets (e.g. prometheus histogram_quantile)
+                        .build()
+                        .merge(config);
+                }
+                return config;
+            }
+        };
+    }
+}
+----
+
+In this example, a singleton CDI bean will produce two different `MeterFilter` beans. One will be applied only to
+Prometheus `MeterRegistry` instances (using the `@MeterFilterConstraint` qualifier), and another will be applied
+to all `MeterRegistry` instances. An application configuration property is also injected and used as a tag value.
+
+== Using other Registry implementations
+
+If you aren't using Prometheus, you have a few options. Some Micrometer registry implementations
+have been wrapped in
+https://github.com/quarkiverse/quarkiverse-micrometer-registry[Quarkiverse extensions].
+To use the Micrometer StackDriver MeterRegistry, for example, you would use the
+`quarkus-micrometer-registry-stackdriver` extension:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkiverse</groupId>
+    <artifactId>quarkus-micrometer-registry-stackdriver</artifactId>
+</dependency>
+----
+
+If the Micrometer registry you would like to use does not yet have an associated extension,
+use the `quarkus-micrometer` extension and bring in the packaged MeterRegistry dependency directly:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-micrometer</artifactId>
+</dependency>
+<dependency>
+    <groupId>com.acme</groupId>
+    <artifactId>custom-micrometer-registry</artifactId>
+</dependency>
+----
+
+You will then need to specify your own provider to configure and initialize the
+MeterRegistry, as discussed in the next section.
+
+== Creating a customized MeterRegistry
+
+Use a custom `@Produces` method to create and configure a customized `MeterRegistry` if you need to.
+
+The following example customizes the line format used for StatsD:
+
+[source,java]
+----
+@Produces
+@Singleton
+public StatsdMeterRegistry createStatsdMeterRegistry(StatsdConfig statsdConfig, Clock clock) {
+    // define what to do with lines
+    Consumer<String> lineLogger = line -> logger.info(line);
+
+    // inject a configuration object, and then customize the line builder
+    return StatsdMeterRegistry.builder(statsdConfig)
+          .clock(clock)
+          .lineSink(lineLogger)
+          .build();
+}
+----
+
+This example corresponds to the following instructions in the Micrometer documentation:
+https://micrometer.io/docs/registry/statsD#_customizing_the_metrics_sink
+
+Note that the method returns the specific type of `MeterRegistry` as a `@Singleton`. Use MicroProfile Config
+to inject any configuration attributes you need to configure the registry. Most Micrometer registry extensions,
+like `quarkus-micrometer-registry-statsd`, define a producer for registry-specific configuration objects
+that are integrated with the Quarkus configuration model.
+
+== Support for the MicroProfile Metrics API
+
+If you use the MicroProfile Metrics API in your application, the Micrometer extension will create an adaptive
+layer to map those metrics into the Micrometer registry. Note that naming conventions between the two
+systems will change, but you can use MeterFilters to remap names or tags to what your dashboards require.
+
+[source,java]
+----
+@Produces
+@Singleton
+public MeterFilter renameApplicationMeters() {
+    final String targetMetric = PrimeResource.class.getName() + ".highestPrimeNumberSoFar";
+
+    return MeterFilter() {
+        @Override
+        public Meter.Id map(Meter.Id id) {
+            // rename the specified metric (remove package), and drop the scope tag
+            // you could also use this to prepend a scope tag (application, base, vendor, if present) to the metric name
+            if (id.getName().equals(targetMetric)) {
+                List<Tag> tags = id.getTags().stream().filter(x -> !"scope".equals(x.getKey()))
+                        .collect(Collectors.toList());
+                return id.withName("highestPrimeNumberSoFar").replaceTags(tags);
+            }
+            return id;
+        }
+    };
+}
+----
+
+NOTE: The MP Metrics API compatibility layer will be moved to a different extension in the future.
+
+== Configuration Reference
+
+include::{generated-dir}/config/quarkus-micrometer.adoc[opts=optional, leveloffset=+1]
diff --git a/docs/src/main/asciidoc/microprofile-fault-tolerance.adoc b/docs/src/main/asciidoc/microprofile-fault-tolerance.adoc
index c0600c8dd4b2e..6cb2699413ab6 100644
--- a/docs/src/main/asciidoc/microprofile-fault-tolerance.adoc
+++ b/docs/src/main/asciidoc/microprofile-fault-tolerance.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Fault Tolerance
 
@@ -44,14 +44,14 @@ The solution is located in the `microprofile-fault-tolerance-quickstart` {quicks
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=microprofile-fault-tolerance-quickstart \
     -DclassName="org.acme.microprofile.faulttolerance.CoffeeResource" \
     -Dpath="/coffee" \
-    -Dextensions="smallrye-fault-tolerance, resteasy-jsonb"
+    -Dextensions="resteasy,smallrye-fault-tolerance,resteasy-jackson"
 cd microprofile-fault-tolerance-quickstart
 ----
 
@@ -163,19 +163,16 @@ import java.util.concurrent.atomic.AtomicLong;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.jboss.logging.Logger;
 
 @Path("/coffee")
-@Produces(MediaType.APPLICATION_JSON)
 public class CoffeeResource {
 
     private static final Logger LOGGER = Logger.getLogger(CoffeeResource.class);
 
     @Inject
-    private CoffeeRepositoryService coffeeRepository;
+    CoffeeRepositoryService coffeeRepository;
 
     private AtomicLong counter = new AtomicLong(0);
 
@@ -204,7 +201,7 @@ in the `CoffeeResource#coffees()` endpoint method in about 50 % of requests.
 
 Why not check that our application works? Run the Quarkus development server with:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -447,6 +444,39 @@ To test this out, do the following:
 5. Give it 5 seconds during which circuit breaker should close and you should be able to make two successful requests
    again.
 
+== Runtime configuration
+
+You can override the annotations parameters at runtime inside your `application.properties` file.
+
+If we take the retry example that we already saw:
+
+[source,java]
+----
+package org.acme;
+
+import org.eclipse.microprofile.faulttolerance.Retry;
+...
+
+public class CoffeeResource {
+    ...
+    @GET
+    @Retry(maxRetries = 4)
+    public List<Coffee> coffees() {
+        ...
+    }
+    ...
+}
+----
+
+We can override the `maxRetries` parameter with 6 retries instead of 4 by the following configuration item:
+[source,properties]
+----
+org.acme.CoffeeResource/coffees/Retry/maxRetries=6
+----
+
+NOTE: The format is `fully-qualified-class-name/method-name/annotation-name/property-name=value`.
+You can also configure a property for all the annotation via `annotation-name/property-name=value`.
+
 == Conclusion
 
 MicroProfile Fault Tolerance allows to improve resiliency of your application, without having an impact on the complexity
@@ -456,7 +486,7 @@ All that is needed to enable the fault tolerance features in Quarkus is:
 
 * adding the `smallrye-fault-tolerance` Quarkus extension to your project using the `quarkus-maven-plugin`:
 +
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="smallrye-fault-tolerance"
 ----
diff --git a/docs/src/main/asciidoc/microprofile-graphql.adoc b/docs/src/main/asciidoc/microprofile-graphql.adoc
index eb474468bf858..789adcf782269 100644
--- a/docs/src/main/asciidoc/microprofile-graphql.adoc
+++ b/docs/src/main/asciidoc/microprofile-graphql.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - GraphQL
 
@@ -65,13 +65,13 @@ The solution is located in the `microprofile-graphql-quickstart` {quickstarts-tr
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=microprofile-graphql-quickstart \
     -DclassName="org.acme.microprofile.graphql.FilmResource" \
-    -Dextensions="graphql"
+    -Dextensions="resteasy,graphql"
 cd microprofile-graphql-quickstart
 ----
 
@@ -360,7 +360,7 @@ Launch the quarkus app:
 
 The full schema of the GraphQL API can be retrieved by calling the following:
 
-[source]
+[source,bash]
 ----
 curl http://localhost:8080/graphql/schema.graphql
 ----
@@ -380,6 +380,8 @@ GraphiQL can be accessed from http://localhost:8080/graphql-ui/ .
 
 image:graphql-ui-screenshot01.png[alt=GraphQL UI]
 
+Have a look at the link:security-authorization[Authorization of Web Endpoints] Guide on how to add/remove security for the GraphQL UI.
+
 == Query the GraphQL API
 
 Now visit the GraphiQL page that has been deployed in `dev` mode.
@@ -529,6 +531,68 @@ query getFilmHeroes {
 
 The response now includes the heroes of the film.
 
+=== Batching
+
+When you are exposing a `Collection` return like our `getAllFilms`, you might want to use the batch form of the above, to more efficiently fetch
+the heroes:
+
+[source,java]
+----
+    public List<List<Hero>> heroes(@Source List<Film> films) { // <1>
+        // Here fetch all hero lists
+    }
+----
+
+<1> Here receive the films as a batch, allowing you to fetch the corresponding heroes.
+
+=== Reactive
+
+Queries can be made reactive by using `Uni`, or `CompletionStage` as a return type, for example:
+
+[source,java]
+----
+    @Query
+    @Description("Get a Films from a galaxy far far away")
+    public Uni<Film> getFilm(@Name("filmId") int id) {
+        // ...
+    }
+----
+
+NOTE: Due to the underlying library, graphql-java, `Uni` is creating a `CompletionStage` under the hood.
+
+Or you can use `CompletionStage`:
+
+[source,java]
+----
+    @Query
+    @Description("Get a Films from a galaxy far far away")
+    public CompletionStage<Film> getFilm(@Name("filmId") int id) {
+        // ...
+    }
+----
+ 
+Using `Uni` or `CompletionStage` means that when a request contains more than one query, they will be executed concurrently.
+
+For instance, the query below will fetch `film0` and `film1` concurrently:
+
+[source, graphql]
+----
+query getFilms {
+  film0: film(filmId: 0) {
+    title
+    director
+    releaseDate
+    episodeID
+  }
+  film1: film(filmId: 1) {
+    title
+    director
+    releaseDate
+    episodeID
+  }
+}
+----
+
 == Mutations
 
 Mutations are used when data is created, updated or deleted.
@@ -631,6 +695,159 @@ query heroWithSurnames {
 }
 ----
 
+== Context
+
+You can get information about the GraphQL request anywhere in your code, using this experimental, SmallRye specific feature:
+
+[source,java]
+----
+@Inject
+Context context;
+----
+
+The context object allows you to get:
+
+- the original request (Query/Mutation)
+- the arguments
+- the path
+- the selected fields
+- any variables
+
+This allows you to optimize the downstream queries to the datastore.
+
+See the https://javadoc.io/doc/io.smallrye/smallrye-graphql-api/latest/io/smallrye/graphql/api/Context.html[JavaDoc] for more details.
+
+=== GraphQL-Java
+
+This context object also allows you to fall down to the underlying https://www.graphql-java.com/[graphql-java] features by using the leaky abstraction:
+
+[source,java]
+----
+DataFetchingEnvironment dfe = context.unwrap(DataFetchingEnvironment.class);
+----
+
+You can also get access to the underlying `graphql-java` during schema generation, to add your own features directly:
+
+[source,java]
+----
+public GraphQLSchema.Builder addMyOwnEnum(@Observes GraphQLSchema.Builder builder) {
+
+    // Here add your own features directly, example adding an Enum
+    GraphQLEnumType myOwnEnum = GraphQLEnumType.newEnum()
+            .name("SomeEnum")
+            .description("Adding some enum type")
+            .value("value1")
+            .value("value2").build();
+
+    return builder.additionalType(myOwnEnum);
+}
+----
+
+By using the `@Observer` you can add anything to the Schema builder. 
+
+== Map to Scalar
+
+Another SmallRye specific experimental feature, allows you to map an existing scalar (that is mapped by the implementation to a certain Java type) to another type,
+or to map complex object, that would typically create a `Type` or `Input` in GraphQL, to an existing scalar.
+
+=== Mapping an existing Scalar to another type:
+
+[source,java]
+----
+public class Movie {
+
+    @ToScalar(Scalar.Int.class)
+    Long idLongThatShouldChangeToInt;
+    
+    // ....
+}
+----
+
+Above will map the `Long` java type to an `Int` Scalar type, rather than the https://download.eclipse.org/microprofile/microprofile-graphql-1.0/microprofile-graphql.html#scalars[default] `BigInteger`.
+
+=== Mapping a complex object to a Scalar type:
+
+[source,java]
+----
+public class Person {
+
+    @ToScalar(Scalar.String.class)
+    Phone phone;
+    
+    // ....
+}
+----
+
+This will, rather than creating a `Type` or `Input` in GraphQL, map to a String scalar.
+
+To be able to do the above, the `Phone` object needs to have a constructor that takes a String (or `Int` / `Date` / etc.), 
+or have a setter method for the String  (or `Int` / `Date` / etc.),
+or have a `fromString` (or `fromInt` / `fromDate` - depending on the Scalar type) static method.
+
+For example:
+
+[source,java]
+----
+public class Phone {
+
+    private String number;
+    
+    // Getters and setters....
+    
+    public static Phone fromString(String number) {
+        Phone phone = new Phone();
+        phone.setNumber(number);
+        return phone;
+    }
+}
+----
+
+See more about the `@ToScalar` feature in the https://javadoc.io/static/io.smallrye/smallrye-graphql-api/1.0.6/index.html?io/smallrye/graphql/api/ToScalar.html[JavaDoc].
+
+== Error code
+
+You can add an error code on the error output in the GraphQL response by using the (SmallRye specific) `@ErrorCode`:
+
+[source,java]
+----
+@ErrorCode("some-business-error-code")
+public class SomeBusinessException extends RuntimeException {
+    // ...
+}
+----
+
+When `SomeBusinessException` occurs, the error output will contain the Error code:
+
+[source,graphql]
+----
+{
+    "errors": [
+        {
+            "message": "Unexpected failure in the system. Jarvis is working to fix it.",
+            "locations": [
+                {
+                    "line": 2,
+                    "column": 3
+                }
+            ],
+            "path": [
+                "annotatedCustomBusinessException"
+            ],
+            "extensions": {
+                "exception": "io.smallrye.graphql.test.apps.error.api.ErrorApi$AnnotatedCustomBusinessException",
+                "classification": "DataFetchingException",
+                "code": "some-business-error-code" <1>
+            }
+        }
+    ],
+    "data": {
+        ...
+    }
+}
+----
+
+<1> The error code
+
 == Conclusion
 
 MicroProfile GraphQL enables clients to retrieve the exact data that is
diff --git a/docs/src/main/asciidoc/microprofile-health.adoc b/docs/src/main/asciidoc/microprofile-health.adoc
index ac181ae400136..52e2075173faf 100644
--- a/docs/src/main/asciidoc/microprofile-health.adoc
+++ b/docs/src/main/asciidoc/microprofile-health.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - MicroProfile Health
 
@@ -27,7 +27,7 @@ To complete this guide, you need:
 == Architecture
 
 In this guide, we build a simple REST application that exposes MicroProfile Health 
-functionalities at the `/health/live` and `/health/ready` endpoints according to the 
+functionalities at the `/q/health/live` and `/q/health/ready` endpoints according to the
 specification.
 
 == Solution
@@ -45,12 +45,12 @@ The solution is located in the `microprofile-health-quickstart`
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=microprofile-health-quickstart \
-    -Dextensions="health"
+    -Dextensions="smallrye-health"
 cd microprofile-health-quickstart
 ----
 
@@ -79,15 +79,15 @@ This will add the following to your `pom.xml`:
 
 Importing the `smallrye-health` extension directly exposes three REST endpoints:
 
-- `/health/live` - The application is up and running.
-- `/health/ready` - The application is ready to serve requests.
-- `/health` - Accumulating all health check procedures in the application.
+- `/q/health/live` - The application is up and running.
+- `/q/health/ready` - The application is ready to serve requests.
+- `/q/health` - Accumulating all health check procedures in the application.
  
 To check that the `smallrye-health` extension is working as expected:
 
 * start your Quarkus application with `./mvnw compile quarkus:dev`
-* access the `http://localhost:8080/health/live` endpoint using your browser or 
-`curl http://localhost:8080/health/live`
+* access the `http://localhost:8080/q/health/live` endpoint using your browser or
+`curl http://localhost:8080/q/health/live`
 
 All of the health REST endpoints return a simple JSON object with two fields:
 
@@ -129,16 +129,16 @@ public class SimpleHealthCheck implements HealthCheck {
 
 As you can see, the health check procedures are defined as CDI beans that implement the `HealthCheck` interface and are annotated with one of the health check qualifiers, such as: 
 
-- `@Liveness` - the liveness check accessible at `/health/live`
-- `@Readiness` - the readiness check accessible at `/health/ready`
+- `@Liveness` - the liveness check accessible at `/q/health/live`
+- `@Readiness` - the readiness check accessible at `/q/health/ready`
 
 `HealthCheck` is a functional interface whose single method `call` returns a 
 `HealthCheckResponse` object which can be easily constructed by the fluent builder 
 API shown in the example.
 
 As we have started our Quarkus application in dev mode simply repeat the request 
-to `http://localhost:8080/health/live` by refreshing your browser window or by 
-using `curl http://localhost:8080/health/live`. Because we defined our health check 
+to `http://localhost:8080/q/health/live` by refreshing your browser window or by
+using `curl http://localhost:8080/q/health/live`. Because we defined our health check
 to be a liveness procedure (with `@Liveness` qualifier) the new health check procedure 
 is now present in the `checks` array.
 
@@ -180,15 +180,15 @@ public class DatabaseConnectionHealthCheck implements HealthCheck {
 
 ----
 
-If you now rerun the health check at `http://localhost:8080/health/live` the `checks` 
+If you now rerun the health check at `http://localhost:8080/q/health/live` the `checks`
 array will contain only the previously defined `SimpleHealthCheck` as it is the only 
 check defined with the `@Liveness` qualifier. However, if you access 
-`http://localhost:8080/health/ready` (in the browser or with 
-`curl http://localhost:8080/health/ready`) you will see only the 
+`http://localhost:8080/q/health/ready` (in the browser or with
+`curl http://localhost:8080/q/health/ready`) you will see only the
 `Database connection health check` as it is the only health check defined with the 
 `@Readiness` qualifier as the readiness health check procedure.
 
-NOTE: If you access `http://localhost:8080/health` you will get back both checks.
+NOTE: If you access `http://localhost:8080/q/health` you will get back both checks.
 
 More information about which health check procedures should be used in which situation 
 is detailed in the MicroProfile Health specification. Generally, the liveness 
@@ -253,9 +253,9 @@ through the `HealthCheckResponse#up(String)` (there is also
 From now on, we utilize the full builder capabilities provided by the
 `HealthCheckResponseBuilder` class.
 
-If you now rerun the readiness health check (at `http://localhost:8080/health/ready`) 
+If you now rerun the readiness health check (at `http://localhost:8080/q/health/ready`)
 the overall `status` should be DOWN. You can also check the liveness check at 
-`http://localhost:8080/health/live` which will return the overall `status` UP because 
+`http://localhost:8080/q/health/live` which will return the overall `status` UP because
 it isn't influenced by the readiness checks.
 
 As we shouldn't leave this application with a readiness check in a DOWN state and 
@@ -300,7 +300,7 @@ public class DataHealthCheck implements HealthCheck {
 }
 ----
 
-If you rerun the liveness health check procedure by accessing the `/health/live` 
+If you rerun the liveness health check procedure by accessing the `/q/health/live`
 endpoint you can see that the new health check `Health check with data` is present 
 in the `checks` array. This check contains a new attribute called `data` which is a 
 JSON object consisting of the properties we have defined in our health check procedure.
@@ -338,7 +338,7 @@ NOTE: Experimental - not included in the MicroProfile specification
 
 The Quarkus `smallrye-health` extension ships with `health-ui` and enables it by default in dev and test modes, but it can also be explicitly configured for production mode as well.
 
-`health-ui` can be accessed from http://localhost:8080/health-ui/ .
+`health-ui` can be accessed from http://localhost:8080/q/health-ui/ .
 
 image:health-ui-screenshot01.png[alt=Health UI]
 
@@ -355,7 +355,7 @@ All that is needed to enable the MicroProfile Health features in Quarkus is:
 `quarkus-maven-plugin`: +
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="health"
+./mvnw quarkus:add-extension -Dextensions="smallrye-health"
 ----
 
 * or simply adding the following Maven dependency: +
diff --git a/docs/src/main/asciidoc/microprofile-metrics.adoc b/docs/src/main/asciidoc/microprofile-metrics.adoc
index 57fc2e367a06d..bc1438a5bff3f 100644
--- a/docs/src/main/asciidoc/microprofile-metrics.adoc
+++ b/docs/src/main/asciidoc/microprofile-metrics.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - MicroProfile Metrics
 
@@ -21,6 +21,9 @@ Apart from application-specific metrics, which are described in this guide, you
 exposed by various Quarkus extensions. These are described in the guide for each particular extension that supports
 built-in metrics.
 
+IMPORTANT: link:micrometer[Micrometer] is the recommended approach to metrics for Quarkus.
+Use the MicroProfile Metrics extension when it's required to retain MicroProfile specification compatibility.
+
 == Prerequisites
 
 To complete this guide, you need:
@@ -48,12 +51,14 @@ The solution is located in the `microprofile-metrics-quickstart` {quickstarts-tr
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=microprofile-metrics-quickstart \
-    -Dextensions="smallrye-metrics"
+    -DclassName="org.acme.microprofile.metrics.PrimeNumberResource" \
+    -Dpath="/" \
+    -Dextensions="resteasy,smallrye-metrics"
 cd microprofile-metrics-quickstart
 ----
 
@@ -104,6 +109,7 @@ import org.jboss.resteasy.annotations.jaxrs.PathParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 
 @Path("/")
 public class PrimeNumberChecker {
@@ -112,7 +118,7 @@ public class PrimeNumberChecker {
 
     @GET
     @Path("/{number}")
-    @Produces("text/plain")
+    @Produces(MediaType.TEXT_PLAIN)
     @Counted(name = "performedChecks", description = "How many primality checks have been performed.")
     @Timed(name = "checksTimer", description = "A measure of how long it takes to perform the primality test.", unit = MetricUnits.MILLISECONDS)
     public String checkIfPrime(@PathParam long number) {
@@ -154,7 +160,7 @@ To run the microservice in dev mode, use `./mvnw clean compile quarkus:dev`
 === Generate some values for the metrics
 First, ask the endpoint whether some numbers are prime numbers.
 
-[source,shell]
+[source,bash]
 ----
 curl localhost:8080/350
 ----
@@ -163,7 +169,7 @@ The application will respond that 350 is not a prime number because it can be di
 
 Now for some large prime number so that the test takes a bit more time:
 
-[source,shell]
+[source,bash]
 ----
 curl localhost:8080/629521085409773
 ----
@@ -172,7 +178,7 @@ The application will respond that 629521085409773 is a prime number.
 If you want, try some more calls with numbers of your choice.
 
 === Review the generated metrics
-To view the metrics, execute `curl -H"Accept: application/json" localhost:8080/metrics/application`
+To view the metrics, execute `curl -H"Accept: application/json" localhost:8080/q/metrics/application`
 You will receive a response such as:
 
 [source,json]
diff --git a/docs/src/main/asciidoc/mongodb-panache.adoc b/docs/src/main/asciidoc/mongodb-panache.adoc
index 35096915171b7..bb1d3e2d90ca5 100644
--- a/docs/src/main/asciidoc/mongodb-panache.adoc
+++ b/docs/src/main/asciidoc/mongodb-panache.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Simplified MongoDB with Panache
 
@@ -63,18 +63,18 @@ The solution is located in the `mongodb-panache-quickstart` {quickstarts-tree-ur
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=mongodb-panache-quickstart \
     -DclassName="org.acme.mongodb.panache.PersonResource" \
     -Dpath="/persons" \
-    -Dextensions="resteasy-jsonb,mongodb-panache"
+    -Dextensions="resteasy,resteasy-jackson,mongodb-panache"
 cd mongodb-panache-quickstart
 ----
 
-This command generates a Maven structure importing the RESTEasy/JAX-RS, JSON-B and MongoDB with Panache extensions.
+This command generates a Maven structure importing the RESTEasy/JAX-RS, Jackson and MongoDB with Panache extensions.
 After this, the `quarkus-mongodb-panache` extension has been added to your `pom.xml`.
 
 If you don't want to generate a new project, add the dependency in your `pom.xml`:
@@ -151,6 +151,8 @@ If you need to write accessors, you can:
 [source,java]
 ----
 public class Person extends PanacheMongoEntity {
+
+    @JsonProperty
     public String name;
     public LocalDate birth;
     public Status status;
@@ -182,7 +184,7 @@ person.name = "Loïc";
 person.birth = LocalDate.of(1910, Month.FEBRUARY, 1);
 person.status = Status.Alive;
 
-// persist it
+// persist it: if you keep the default ObjectId ID field, it will be populated by the MongoDB driver
 person.persist();
 
 person.status = Status.Dead;
@@ -197,6 +199,8 @@ person.delete();
 List<Person> allPersons = Person.listAll();
 
 // finding a specific person by ID
+// here we build a new ObjectId but you can also retrieve it from the existing entity after being persisted
+ObjectId personId = new ObjectId(idAsString);
 person = Person.findById(personId);
 
 // finding a specific person by ID via an Optional
@@ -348,7 +352,7 @@ person.name = "Loïc";
 person.birth = LocalDate.of(1910, Month.FEBRUARY, 1);
 person.status = Status.Alive;
 
-// persist it
+// persist it: if you keep the default ObjectId ID field, it will be populated by the MongoDB driver
 personRepository.persist(person);
 
 person.status = Status.Dead;
@@ -363,6 +367,8 @@ personRepository.delete(person);
 List<Person> allPersons = personRepository.listAll();
 
 // finding a specific person by ID
+// here we build a new ObjectId but you can also retrieve it from the existing entity after being persisted
+ObjectId personId = new ObjectId(idAsString);
 person = personRepository.findById(personId);
 
 // finding a specific person by ID via an Optional
@@ -507,6 +513,10 @@ Here are some query examples:
 - `lastname is not null` will be mapped to `{'lastname':{'$exists': true}}`
 - `status in ?1` will be mapped to `{'status':{$in: [?1]}}`
 
+WARNING: MongoDB queries must be valid JSON documents,
+using the same field multiple times in a query is not allowed using PanacheQL as it would generate an invalid JSON
+(see link:https://github.com/quarkusio/quarkus/issues/12086[this issue on github]).
+
 We also handle some basic date type transformations: all fields of type `Date`, `LocalDate`, `LocalDateTime` or `Instant` will be mapped to the
 link:https://docs.mongodb.com/manual/reference/bson-types/#document-bson-type-date[BSON Date] using the `ISODate` type (UTC datetime).
 The MongoDB POJO codec doesn't support `ZonedDateTime` and `OffsetDateTime` so you should convert them prior usage.
@@ -652,7 +662,7 @@ WARNING: MongoDB offers ACID transactions since version 4.0. MongoDB with Panach
 
 IDs are often a touchy subject. In MongoDB, they are usually auto-generated by the database with an `ObjectId` type.
 In MongoDB with Panache the ID are defined by a field named `id` of the `org.bson.types.ObjectId` type,
-but if you want ot customize them, once again we have you covered.
+but if you want to customize them, once again we have you covered.
 
 You can specify your own ID strategy by extending `PanacheMongoEntityBase` instead of `PanacheMongoEntity`. Then
 you just declare whatever ID you want as a public field by annotating it by `@BsonId`:
@@ -687,7 +697,21 @@ you need to provide the value by yourself.
 ====
 
 `ObjectId` can be difficult to use if you want to expose its value in your REST service.
-So we created JSON-B and Jackson providers to serialize/deserialize them as a `String` which are automatically registered if your project depends on either the RESTEasy JSON-B extension or the RESTEasy Jackson extension.
+So we created Jackson and JSON-B providers to serialize/deserialize them as a `String` which are automatically registered if your project depends on either the RESTEasy Jackson extension or the RESTEasy JSON-B extension.
+
+[IMPORTANT]
+====
+If you use the standard `ObjectId` ID type, don't forget to retrieve your entity by creating a new `ObjectId` when the identifier comes from a path parameter. For example:
+
+[source,java]
+----
+@GET
+@Path("/{id}")
+public Person findById(@PathParam("id") String id) {
+    return Person.findById(new ObjectId(id));
+}
+----
+====
 
 == Working with Kotlin Data classes
 
@@ -795,21 +819,24 @@ person.name = "Loïc";
 person.birth = LocalDate.of(1910, Month.FEBRUARY, 1);
 person.status = Status.Alive;
 
-// persist it
-Uni<Void> cs1 = person.persist();
+// persist it: if you keep the default ObjectId ID field, it will be populated by the MongoDB driver,
+// and accessible when uni1 will be resolved
+Uni<Void> uni1 = person.persist();
 
 person.status = Status.Dead;
 
 // Your must call update() in order to send your entity modifications to MongoDB
-Uni<Void> cs2 = person.update();
+Uni<Void> uni2 = person.update();
 
 // delete it
-Uni<Void> cs3 = person.delete();
+Uni<Void> uni3 = person.delete();
 
 // getting a list of all persons
 Uni<List<ReactivePerson>> allPersons = ReactivePerson.listAll();
 
 // finding a specific person by ID
+// here we build a new ObjectId but you can also retrieve it from the existing entity after being persisted
+ObjectId personId = new ObjectId(idAsString);
 Uni<ReactivePerson> personById = ReactivePerson.findById(personId);
 
 // finding a specific person by ID via an Optional
@@ -911,11 +938,11 @@ public class PanacheFunctionalityTest {
         Assertions.assertEquals(0, Person.count());
 
         // Now let's specify the return value
-        Mockito.when(Person.count()).thenReturn(23l);
+        Mockito.when(Person.count()).thenReturn(23L);
         Assertions.assertEquals(23, Person.count());
 
         // Now let's change the return value
-        Mockito.when(Person.count()).thenReturn(42l);
+        Mockito.when(Person.count()).thenReturn(42L);
         Assertions.assertEquals(42, Person.count());
 
         // Now let's call the original method
@@ -927,13 +954,13 @@ public class PanacheFunctionalityTest {
 
         // Mock only with specific parameters
         Person p = new Person();
-        Mockito.when(Person.findById(12l)).thenReturn(p);
-        Assertions.assertSame(p, Person.findById(12l));
-        Assertions.assertNull(Person.findById(42l));
+        Mockito.when(Person.findById(12L)).thenReturn(p);
+        Assertions.assertSame(p, Person.findById(12L));
+        Assertions.assertNull(Person.findById(42L));
 
         // Mock throwing
-        Mockito.when(Person.findById(12l)).thenThrow(new WebApplicationException());
-        Assertions.assertThrows(WebApplicationException.class, () -> Person.findById(12l));
+        Mockito.when(Person.findById(12L)).thenThrow(new WebApplicationException());
+        Assertions.assertThrows(WebApplicationException.class, () -> Person.findById(12L));
 
         // We can even mock your custom methods
         Mockito.when(Person.findOrdered()).thenReturn(Collections.emptyList());
@@ -1002,11 +1029,11 @@ public class PanacheFunctionalityTest {
         Assertions.assertEquals(0, personRepository.count());
 
         // Now let's specify the return value
-        Mockito.when(personRepository.count()).thenReturn(23l);
+        Mockito.when(personRepository.count()).thenReturn(23L);
         Assertions.assertEquals(23, personRepository.count());
 
         // Now let's change the return value
-        Mockito.when(personRepository.count()).thenReturn(42l);
+        Mockito.when(personRepository.count()).thenReturn(42L);
         Assertions.assertEquals(42, personRepository.count());
 
         // Now let's call the original method
@@ -1018,13 +1045,13 @@ public class PanacheFunctionalityTest {
 
         // Mock only with specific parameters
         Person p = new Person();
-        Mockito.when(personRepository.findById(12l)).thenReturn(p);
-        Assertions.assertSame(p, personRepository.findById(12l));
-        Assertions.assertNull(personRepository.findById(42l));
+        Mockito.when(personRepository.findById(12L)).thenReturn(p);
+        Assertions.assertSame(p, personRepository.findById(12L));
+        Assertions.assertNull(personRepository.findById(42L));
 
         // Mock throwing
-        Mockito.when(personRepository.findById(12l)).thenThrow(new WebApplicationException());
-        Assertions.assertThrows(WebApplicationException.class, () -> personRepository.findById(12l));
+        Mockito.when(personRepository.findById(12L)).thenThrow(new WebApplicationException());
+        Assertions.assertThrows(WebApplicationException.class, () -> personRepository.findById(12L));
 
         Mockito.when(personRepository.findOrdered()).thenReturn(Collections.emptyList());
         Assertions.assertTrue(personRepository.findOrdered().isEmpty());
diff --git a/docs/src/main/asciidoc/mongodb.adoc b/docs/src/main/asciidoc/mongodb.adoc
index 50c53ee202163..020637917b5a8 100644
--- a/docs/src/main/asciidoc/mongodb.adoc
+++ b/docs/src/main/asciidoc/mongodb.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using the MongoDB Client
 include::./attributes.adoc[]
@@ -41,18 +41,18 @@ The solution is located in the `mongodb-quickstart` {quickstarts-tree-url}/mongo
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=mongodb-quickstart \
     -DclassName="org.acme.mongodb.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jsonb,mongodb-client,resteasy-mutiny,context-propagation"
+    -Dextensions="resteasy,resteasy-jackson,mongodb-client,resteasy-mutiny,context-propagation"
 cd mongodb-quickstart
 ----
 
-This command generates a Maven structure importing the RESTEasy/JAX-RS, JSON-B, Mutiny, Context Propagation and MongoDB Client extensions.
+This command generates a Maven structure importing the RESTEasy/JAX-RS, Jackson, Mutiny, Context Propagation and MongoDB Client extensions.
 After this, the quarkus-mongodb-client extension has been added to your `pom.xml`.
 
 If you already have your Quarkus project configured, you can add the `mongodb-client` extension
@@ -89,6 +89,7 @@ public class Fruit {
 
     private String name;
     private String description;
+    private String id;
 
     public Fruit() {
     }
@@ -129,6 +130,14 @@ public class Fruit {
     public int hashCode() {
         return Objects.hash(this.name);
     }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
 }
 ----
 
@@ -191,8 +200,6 @@ Now, edit the `org.acme.mongodb.FruitResource` class as follows:
 [source,java]
 ----
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
     @Inject FruitService fruitService;
@@ -260,11 +267,11 @@ multiple clients are **not** necessary as a single client is able to access all
 
 === Named Mongo client Injection
 
-When using multiple clients, each `MongoClient`, you can select the client to inject using the `io.quarkus.mongodb.runtime.MongoClientName` qualifier.
+When using multiple clients, each `MongoClient`, you can select the client to inject using the `io.quarkus.mongodb.MongoClientName` qualifier.
 Using the above properties to configure three different clients, you can also inject each one as follows:
 
 [source,java,indent=0]
---
+----
 @Inject
 MongoClient defaultMongoClient;
 
@@ -275,13 +282,18 @@ MongoClient mongoClient1;
 @Inject
 @MongoClientName("inventory")
 ReactiveMongoClient mongoClient2;
---
+----
+
+[NOTE]
+====
+The old `io.quarkus.mongodb.runtime.MongoClientName` has been deprecated. It still works, but will soon be removed, therefore users are encouraged to not use it.
+====
 
 == Running a MongoDB Database
 As by default, `MongoClient` is configured to access a local MongoDB database on port 27017 (the default MongoDB port), if you have a local running database on this port, there is nothing more to do before being able to test it!
 
 If you want to use Docker to run a MongoDB database, you can use the following command to launch one:
-[source,shell]
+[source,bash]
 ----
 docker run -ti --rm -p 27017:27017 mongo:4.0
 ----
@@ -559,25 +571,30 @@ a discriminator field inside the document. It can be useful when working with ab
 
 Quarkus will automatically register all the classes annotated with `@BsonDiscriminator` with the POJO codec.
 
+The POJO Codec have enhanced generic support via `PropertyCodecProvider`,
+Quarkus will automatically register any `PropertyCodecProvider` with the POJO Codec.
+When building native executables and using generic types, you might need to register the type arguments for reflection.
+
 == Simplifying MongoDB with Panache
 
 The link:mongodb-panache[MongoDB with Panache] extension facilitates the usage of MongoDB by providing active record style entities (and repositories) like you have in link:hibernate-orm-panache.html[Hibernate ORM with Panache] and focuses on making your entities trivial and fun to write in Quarkus.
 
 == Connection Health Check
 
-If you are using the `quarkus-smallrye-health` extension, `quarkus-mongodb` will automatically add a readiness health check
+If you are using the `quarkus-smallrye-health` extension, `quarkus-mongodb-client` will automatically add a readiness health check
 to validate the connection to the cluster.
 
-So when you access the `/health/ready` endpoint of your application you will have information about the connection validation status.
+So when you access the `/q/health/ready` endpoint of your application you will have information about the connection validation status.
 
 This behavior can be disabled by setting the `quarkus.mongodb.health.enabled` property to `false` in your `application.properties`.
 
 == Metrics
 
-If you are using the `quarkus-smallrye-metrics` extension, `quarkus-mongodb` can provide metrics about the connection pools.
+If you are using the `quarkus-micrometer` or `quarkus-smallrye-metrics` extension, `quarkus-mongodb-client` can provide metrics about the connection pools.
 This behavior must first be enabled by setting the `quarkus.mongodb.metrics.enabled` property to `true` in your `application.properties`.
 
-So when you access the `/metrics` endpoint of your application you will have information about the connection pool status in the `vendor` scope.
+So when you access the `/q/metrics` endpoint of your application you will have information about the connection pool status.
+When using link:microprofile-metrics[SmallRye Metrics], connection pool metrics will be available under the `vendor` scope.
 
 
 == The legacy client
@@ -609,7 +626,7 @@ quarkus.mongodb.tls-insecure=true # only if TLS certificate cannot be validated
 
 You can then build a native executable with the usual command `./mvnw package -Pnative`.
 
-Running it is as simple as executing `./target/mongodb-quickstart-1.0-SNAPSHOT-runner`.
+Running it is as simple as executing `./target/mongodb-quickstart-1.0.0-SNAPSHOT-runner`.
 
 You can then point your browser to `http://localhost:8080/fruits.html` and use your application.
 
diff --git a/docs/src/main/asciidoc/native-and-ssl.adoc b/docs/src/main/asciidoc/native-and-ssl.adoc
index b978b8627bf9b..352647f88bac5 100644
--- a/docs/src/main/asciidoc/native-and-ssl.adoc
+++ b/docs/src/main/asciidoc/native-and-ssl.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using SSL With Native Executables
 
@@ -20,7 +20,7 @@ To complete this guide, you need:
 
 * less than 20 minutes
 * an IDE
-* GraalVM installed with `JAVA_HOME` and `GRAALVM_HOME` configured appropriately
+* GraalVM (Java 11) installed with `JAVA_HOME` and `GRAALVM_HOME` configured appropriately
 * Apache Maven {maven-version}
 
 This guide is based on the REST client guide so you should get this Maven project first.
@@ -32,34 +32,44 @@ The project is located in the `rest-client-quickstart` {quickstarts-tree-url}/re
 == Looks like it works out of the box?!?
 
 If you open the application's configuration file (`src/main/resources/application.properties`), you can see the following line:
-```
+
+[source,properties]
+----
 org.acme.restclient.CountriesService/mp-rest/url=https://restcountries.eu/rest
-```
+----
 which configures our REST client to connect to an SSL REST service.
 
 Now let's build the application as a native executable and run the tests:
-```
+
+[source,bash]
+----
 ./mvnw clean install -Pnative
-```
+----
 
 And we obtain the following result:
-```
+
+[source]
+----
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-```
+----
 
 So, yes, it appears it works out of the box and this guide is pretty useless.
 
 It's not. The magic happens when building the native executable:
-```
-[INFO] [io.quarkus.creator.phase.nativeimage.NativeImagePhase] /opt/graalvm/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dcom.sun.xml.internal.bind.v2.bytecode.ClassTailor.noOptimize=true -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -jar rest-client-1.0-SNAPSHOT-runner.jar -J-Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -H:+PrintAnalysisCallTree -H:EnableURLProtocols=http,https --enable-all-security-services -H:-SpawnIsolates -H:+JNI --no-server -H:-UseServiceLoaderFeature -H:+StackTrace
-```
+
+[source]
+----
+[INFO] [io.quarkus.creator.phase.nativeimage.NativeImagePhase] /opt/graalvm/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dcom.sun.xml.internal.bind.v2.bytecode.ClassTailor.noOptimize=true -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -jar rest-client-1.0.0-SNAPSHOT-runner.jar -J-Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -H:+PrintAnalysisCallTree -H:EnableURLProtocols=http,https --enable-all-security-services -H:-SpawnIsolates -H:+JNI --no-server -H:-UseServiceLoaderFeature -H:+StackTrace
+----
 
 The important elements are these 3 options:
-```
+
+[source,bash]
+----
 -H:EnableURLProtocols=http,https --enable-all-security-services -H:+JNI
-```
+----
 
 They enable the native SSL support for your native executable.
 
@@ -67,7 +77,7 @@ As SSL is de facto the standard nowadays, we decided to enable its support autom
 
  * the Agroal connection pooling extension (`quarkus-agroal`),
  * the Amazon DynamoDB extension (`quarkus-amazon-dynamodb`),
- * the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-elasticsearch`),
+ * the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-orm-elasticsearch`),
  * the Infinispan Client extension (`quarkus-infinispan-client`).
  * the Jaeger extension (`quarkus-jaeger`),
  * the JGit extension (`quarkus-jgit`),
@@ -82,14 +92,17 @@ As SSL is de facto the standard nowadays, we decided to enable its support autom
  * the Reactive client for PostgreSQL extension (`quarkus-reactive-pg-client`),
  * the Reactive client for MySQL extension (`quarkus-reactive-mysql-client`),
  * the Reactive client for DB2 extension (`quarkus-reactive-db2-client`).
+ * the Cassandra client extensions (`cassandra-quarkus-client`)
 
 As long as you have one of those extensions in your project, the SSL support will be enabled by default.
 
 Now, let's just check the size of our native executable as it will be useful later:
-```
-$ ls -lh target/rest-client-quickstart-1.0-SNAPSHOT-runner
--rwxrwxr-x. 1 gandrian gandrian 46M Jun 11 13:01 target/rest-client-quickstart-1.0-SNAPSHOT-runner
-```
+
+[source,shell]
+----
+$ ls -lh target/rest-client-quickstart-1.0.0-SNAPSHOT-runner
+-rwxrwxr-x. 1 gandrian gandrian 46M Jun 11 13:01 target/rest-client-quickstart-1.0.0-SNAPSHOT-runner
+----
 
 == Let's disable SSL and see how it goes
 
@@ -100,50 +113,66 @@ So if you are sure you don't need it, you can disable it entirely.
 First, let's disable it without changing the REST service URL and see how it goes.
 
 Open `src/main/resources/application.properties` and add the following line:
-```
+
+[source,properties]
+----
 quarkus.ssl.native=false
-```
+----
 
 And let's try to build again:
-```
+
+[source,bash]
+----
 ./mvnw clean install -Pnative
-```
+----
 
 The native executable tests will fail with the following error:
-```
+
+[source]
+----
 Exception handling request to /country/name/greece: com.oracle.svm.core.jdk.UnsupportedFeatureError: Accessing an URL protocol that was not enabled. The URL protocol https is supported but not enabled by default. It must be enabled by adding the --enable-url-protocols=https option to the native-image command.
-```
+----
 
 This error is the one you obtain when trying to use SSL while it was not explicitly enabled in your native executable.
 
 Now, let's change the REST service URL to **not** use SSL in `src/main/resources/application.properties`:
-```
+
+[source,properties]
+----
 org.acme.restclient.CountriesService/mp-rest/url=http://restcountries.eu/rest
-```
+----
 
 And build again:
-```
+
+[source,bash]
+----
 ./mvnw clean install -Pnative
-```
+----
 
 If you check carefully the native executable build options, you can see that the SSL related options are gone:
-```
-[INFO] [io.quarkus.creator.phase.nativeimage.NativeImagePhase] /opt/graalvm/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dcom.sun.xml.internal.bind.v2.bytecode.ClassTailor.noOptimize=true -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -jar rest-client-1.0-SNAPSHOT-runner.jar -J-Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -H:+PrintAnalysisCallTree -H:EnableURLProtocols=http -H:-SpawnIsolates -H:+JNI --no-server -H:-UseServiceLoaderFeature -H:+StackTrace
-```
+
+[source]
+----
+[INFO] [io.quarkus.creator.phase.nativeimage.NativeImagePhase] /opt/graalvm/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dcom.sun.xml.internal.bind.v2.bytecode.ClassTailor.noOptimize=true -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime -jar rest-client-1.0.0-SNAPSHOT-runner.jar -J-Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -H:+PrintAnalysisCallTree -H:EnableURLProtocols=http -H:-SpawnIsolates -H:+JNI --no-server -H:-UseServiceLoaderFeature -H:+StackTrace
+----
 
 And we end up with:
-```
+
+[source]
+----
 [INFO] ------------------------------------------------------------------------
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
-```
+----
 
 You remember we checked the size of the native executable with SSL enabled?
 Let's check again with SSL support entirely disabled:
-```
-$ ls -lh target/rest-client-quickstart-1.0-SNAPSHOT-runner
--rwxrwxr-x. 1 gandrian gandrian 35M Jun 11 13:06 target/rest-client-quickstart-1.0-SNAPSHOT-runner
-```
+
+[source,shell]
+----
+$ ls -lh target/rest-client-quickstart-1.0.0-SNAPSHOT-runner
+-rwxrwxr-x. 1 gandrian gandrian 35M Jun 11 13:06 target/rest-client-quickstart-1.0.0-SNAPSHOT-runner
+----
 
 Yes, it is now **35 MB** whereas it used to be **46 MB**. SSL comes with a 11 MB overhead in native executable size.
 
@@ -152,14 +181,18 @@ And there's more to it.
 == Let's start again with a clean slate
 
 Let's revert the changes we made to the configuration file and go back to SSL with the following command:
-```
+
+[source,bash]
+----
 git checkout -- src/main/resources/application.properties
-```
+----
 
 And let's build the native executable again:
-```
+
+[source,bash]
+----
 ./mvnw clean install -Pnative
-```
+----
 
 [#the-truststore-path]
 == The TrustStore path
@@ -179,9 +212,10 @@ As a consequence, system properties such as `javax.net.ssl.trustStore` do not ha
 run time, so when the defaults need to be changed, these system properties must be provided at image build time.
 The easiest way to do so is by setting `quarkus.native.additional-build-args`. For example:
 
-```
+[source,bash]
+----
 quarkus.native.additional-build-args=-J-Djavax.net.ssl.trustStore=/tmp/mycerts,-J-Djavax.net.ssl.trustStorePassword=changeit
-```
+----
 
 will ensure that the certificates of `/tmp/mycerts` are baked into the native binary and used *in addition* to the default cacerts.
 
diff --git a/docs/src/main/asciidoc/neo4j.adoc b/docs/src/main/asciidoc/neo4j.adoc
index bfe88c56d9521..d5546cedfc8c6 100644
--- a/docs/src/main/asciidoc/neo4j.adoc
+++ b/docs/src/main/asciidoc/neo4j.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Neo4j
 :neo4j_version: 4.0.0
@@ -99,7 +99,7 @@ To complete this guide, you need:
 
 The easiest way to start a Neo4j instance is a locally installed Docker environment.
 
-[source,shell,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes"]
 ----
 docker run --publish=7474:7474 --publish=7687:7687 -e 'NEO4J_AUTH=neo4j/secret' neo4j:{neo4j_version}
 ----
@@ -122,12 +122,13 @@ It contains a very simple UI to use the JAX-RS resources created here, too.
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=neo4j-quickstart \
-    -Dextensions="neo4j,resteasy-jsonb"
+    -DclassName="org.acme.datasource.GreetingResource" \
+    -Dextensions="resteasy,neo4j,resteasy-jackson"
 cd neo4j-quickstart
 ----
 
@@ -141,10 +142,10 @@ It generates:
 * an associated test
 
 The Neo4j extension has been added already to your `pom.xml`.
-In addition, we added `resteasy-jsonb`, which allows us to expose `Fruit` instances over HTTP in the JSON format via JAX-RS resources.
+In addition, we added `resteasy-jackson`, which allows us to expose `Fruit` instances over HTTP in the JSON format via JAX-RS resources.
 If you have an already created project, the `neo4j` extension can be added to an existing Quarkus project with the `add-extension` command:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="neo4j"
 ----
@@ -163,7 +164,7 @@ Otherwise, you can manually add this to the dependencies section of your `pom.xm
 
 The Neo4j driver can be configured with standard Quarkus properties:
 
-[source]
+[source,properties]
 .src/main/resources/application.properties
 ----
 quarkus.neo4j.uri = bolt://localhost:7687
@@ -200,16 +201,11 @@ Add a `FruitResource` skeleton like this and `@Inject` a `org.neo4j.driver.Drive
 package org.acme.neo4j;
 
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.neo4j.driver.Driver;
 
 @Path("fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
     @Inject
@@ -247,14 +243,14 @@ public CompletionStage<Response> get() {
 
 Now start Quarkus in `dev` mode with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
 
 and retrieve the endpoint like this
 
-[source, shell]
+[source,bash]
 ----
 curl localhost:8080/fruits
 ----
@@ -291,7 +287,7 @@ The node is returned, a `Fruit` entity created and then mapped to a `201` create
 
 A curl request against this path may look like this:
 
-[source, shell]
+[source,bash]
 ----
 curl -v -X "POST" "http://localhost:8080/fruits" \
      -H 'Content-Type: application/json; charset=utf-8' \
@@ -340,7 +336,7 @@ public CompletionStage<Response> getSingle(@PathParam("id") Long id) {
 
 A request may look like this:
 
-[source, shell]
+[source,bash]
 ----
 curl localhost:8080/fruits/42
 ----
@@ -374,7 +370,7 @@ public CompletionStage<Response> delete(@PathParam("id") Long id) {
 
 A request may look like this
 
-[source, shell]
+[source,bash]
 ----
 curl -X DELETE localhost:8080/fruits/42
 ----
@@ -389,7 +385,7 @@ The Cypher manual linked in the introduction will help you with modelling your q
 === Packaging
 
 Packaging your application is as simple as `./mvnw clean package`.
-It can be run with `java -jar target/neo4j-quickstart-1.0-SNAPSHOT-runner.jar`.
+It can be run with `java -jar target/quarkus-app/quarkus-run.jar`.
 
 With GraalVM installed, you can also create a native executable binary: `./mvnw clean package -Dnative`.
 Depending on your system, that will take some time.
@@ -399,10 +395,15 @@ Depending on your system, that will take some time.
 If you are using the `quarkus-smallrye-health` extension, `quarkus-neo4j` will automatically add a readiness health check
 to validate the connection to Neo4j.
 
-So when you access the `/health/ready` endpoint of your application you will have information about the connection validation status.
+So when you access the `/q/health/ready` endpoint of your application you will have information about the connection validation status.
 
 This behavior can be disabled by setting the `quarkus.neo4j.health.enabled` property to `false` in your `application.properties`.
 
+=== Driver metrics
+
+If you are using a metrics extension and specify the config property `quarkus.neo4j.pool.metrics-enabled=true`, the Neo4j extension will
+expose several metrics related to the Neo4j connection pool.
+
 === Explore Cypher and the Graph
 
 There are tons of options to model your domain within a Graph.
diff --git a/docs/src/main/asciidoc/openapi-swaggerui.adoc b/docs/src/main/asciidoc/openapi-swaggerui.adoc
index 72cdca1dbc81b..0b973fc5d1cb1 100644
--- a/docs/src/main/asciidoc/openapi-swaggerui.adoc
+++ b/docs/src/main/asciidoc/openapi-swaggerui.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OpenAPI and Swagger UI
 
@@ -37,14 +37,14 @@ The solution is located in the `openapi-swaggerui-quickstart` {quickstarts-tree-
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=openapi-swaggerui-quickstart \
     -DclassName="org.acme.openapi.swaggerui.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jsonb"
+    -Dextensions="resteasy,resteasy-jackson"
 cd openapi-swaggerui-quickstart
 ----
 
@@ -82,16 +82,11 @@ import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Set;
 
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
     private Set<Fruit> fruits = Collections.newSetFromMap(Collections.synchronizedMap(new LinkedHashMap<>()));
@@ -183,7 +178,7 @@ specification in order to generate your API https://github.com/OAI/OpenAPI-Speci
 
 You just need to add the `openapi` extension to your Quarkus application:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="quarkus-smallrye-openapi"
 ----
@@ -200,16 +195,16 @@ This will add the following to your `pom.xml`:
 
 Now, we are ready to run our application:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
 
-Once your application is started, you can make a request to the default `/openapi` endpoint:
+Once your application is started, you can make a request to the default `/q/openapi` endpoint:
 
-[source, shell]
+[source,shell]
 ----
-$ curl http://localhost:8080/openapi
+$ curl http://localhost:8080/q/openapi
 openapi: 3.0.3
 info:
   title: Generated API
@@ -256,7 +251,7 @@ components:
 
 [NOTE]
 ====
-If you do not like the default endpoint location `/openapi`, you can change it by adding the following configuration to your `application.properties`:
+If you do not like the default endpoint location `/q/openapi`, you can change it by adding the following configuration to your `application.properties`:
 [source, properties]
 ----
 quarkus.smallrye-openapi.path=/swagger
@@ -296,7 +291,7 @@ empty class can then be annotated with various OpenAPI annotations such as `@Ope
             email = "techsupport@example.com"),
         license = @License(
             name = "Apache 2.0",
-            url = "http://www.apache.org/licenses/LICENSE-2.0.html"))
+            url = "https://www.apache.org/licenses/LICENSE-2.0.html"))
 )
 public class ExampleApiApplication extends Application {
 }
@@ -319,7 +314,7 @@ mp.openapi.extensions.smallrye.info.contact.email=techsupport@example.com
 mp.openapi.extensions.smallrye.info.contact.name=Example API Support
 mp.openapi.extensions.smallrye.info.contact.url=http://exampleurl.com/contact
 mp.openapi.extensions.smallrye.info.license.name=Apache 2.0
-mp.openapi.extensions.smallrye.info.license.url=http://www.apache.org/licenses/LICENSE-2.0.html
+mp.openapi.extensions.smallrye.info.license.url=https://www.apache.org/licenses/LICENSE-2.0.html
 ----
 
 This will give you similar information as the `@OpenAPIDefinition` example above.
@@ -333,7 +328,7 @@ An OpenAPI document that conforms to the  OpenAPI Specification is itself a vali
 To see this in action, we'll put OpenAPI documentation under `META-INF/openapi.yaml` for our `/fruits` endpoints.
 Quarkus also supports alternative <<open-document-paths, OpenAPI document paths>> if you prefer.
 
-[source, shell]
+[source,yaml]
 ----
 openapi: 3.0.1
 info:
@@ -342,7 +337,7 @@ info:
   version: "1.0"
 
 servers:
-  - url: http://localhost:8080/openapi
+  - url: http://localhost:8080/q/openapi
     description: Optional dev mode server description
 
 paths:
@@ -384,10 +379,10 @@ components:
         name:
           type: string
 ----
-By default, a request to `/openapi` will serve the combined OpenAPI document from the static file and the model generated from application endpoints code.
+By default, a request to `/q/openapi` will serve the combined OpenAPI document from the static file and the model generated from application endpoints code.
 We can however change this to only serve the static OpenAPI document by adding `mp.openapi.scan.disable=true` configuration into `application.properties`.
 
-Now, a request to `/openapi` endpoint will serve the static OpenAPI document instead of the generated one.
+Now, a request to `/q/openapi` endpoint will serve the static OpenAPI document instead of the generated one.
 
 [[open-document-paths]]
 [TIP]
@@ -416,7 +411,7 @@ will be used. You can also define the version in SmallRye using the following co
 mp.openapi.extensions.smallrye.openapi=3.0.2
 ----
 
-This might be useful if your API go through a Gateway that needs a certain version.
+This might be useful if your API goes through a Gateway that needs a certain version.
 
 == Auto-generation of Operation Id
 
@@ -466,23 +461,24 @@ This is a build time property, it cannot be changed at runtime after your applic
 
 ====
 
-By default, Swagger UI is accessible at `/swagger-ui`.
+By default, Swagger UI is accessible at `/q/swagger-ui`.
 
-You can update this path by setting the `quarkus.swagger-ui.path` property in your `application.properties`:
+You can update the `/swagger-ui` sub path by setting the `quarkus.swagger-ui.path` property in your `application.properties`:
 
 [source, properties]
 ----
-quarkus.swagger-ui.path=/my-custom-path
+quarkus.swagger-ui.path=my-custom-path
 ----
 
 [WARNING]
 ====
 The value `/` is not allowed as it blocks the application from serving anything else.
+A value prefixed with '/' makes it absolute and not relative.
 ====
 
 Now, we are ready to run our application:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -491,10 +487,10 @@ You can check the Swagger UI path in your application's log:
 
 [source]
 ----
-00:00:00,000 INFO  [io.qua.swa.run.SwaggerUiServletExtension] Swagger UI available at /swagger-ui
+00:00:00,000 INFO  [io.qua.swa.run.SwaggerUiServletExtension] Swagger UI available at /q/swagger-ui
 ----
 
-Once your application is started, you can go to http://localhost:8080/swagger-ui and play with your API.
+Once your application is started, you can go to http://localhost:8080/q/swagger-ui and play with your API.
 
 You can visualize your API's operations and schemas.
 image:openapi-swaggerui-guide-screenshot01.png[alt=Visualize your API]
diff --git a/docs/src/main/asciidoc/opentracing.adoc b/docs/src/main/asciidoc/opentracing.adoc
index da30a960035ef..9195e6f6fe991 100644
--- a/docs/src/main/asciidoc/opentracing.adoc
+++ b/docs/src/main/asciidoc/opentracing.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OpenTracing
 
@@ -39,14 +39,14 @@ The solution is located in the `opentracing-quickstart` {quickstarts-tree-url}/o
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=opentracing-quickstart \
     -DclassName="org.acme.opentracing.TracedResource" \
     -Dpath="/hello" \
-    -Dextensions="quarkus-smallrye-opentracing"
+    -Dextensions="resteasy,quarkus-smallrye-opentracing"
 cd opentracing-quickstart
 ----
 
@@ -108,12 +108,12 @@ There are two ways to configure the Jaeger tracer within the application.
 
 The first approach is by providing the properties within the `src/main/resources/application.properties` file:
 
-[source,shell]
+[source,properties]
 ----
 quarkus.jaeger.service-name=myservice // <1>
 quarkus.jaeger.sampler-type=const // <2>
 quarkus.jaeger.sampler-param=1 // <3>
-quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{2.}] (%t) %s%e%n // <4>
+quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, parentId=%X{parentId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{2.}] (%t) %s%e%n // <4>
 ----
 
 <1> If the `quarkus.jaeger.service-name` property (or `JAEGER_SERVICE_NAME` environment variable) is not provided then a "no-op" tracer will be configured, resulting in no tracing data being reported to the backend.
@@ -127,41 +127,71 @@ The second approach is to supply the properties as https://www.jaegertracing.io/
 
 The first step is to start the tracing system to collect and display the captured traces:
 
-[source, text]
+[source,bash]
 ----
 docker run -p 5775:5775/udp -p 6831:6831/udp -p 6832:6832/udp -p 5778:5778 -p 16686:16686 -p 14268:14268 jaegertracing/all-in-one:latest
 ----
 
 Now we are ready to run our application. If using `application.properties` to configure the tracer:
 
-[source, text]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
 
 or if configuring the tracer via environment variables:
 
-[source, text]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev -Djvm.args="-DJAEGER_SERVICE_NAME=myservice -DJAEGER_SAMPLER_TYPE=const -DJAEGER_SAMPLER_PARAM=1"
 ----
 
 Once both the application and tracing system are started, you can make a request to the provided endpoint:
 
-```
+[source,shell]
+----
 $ curl http://localhost:8080/hello
 hello
-```
+----
 When the first request has been submitted, the Jaeger tracer within the app will be initialized:
-```
+
+[source]
+----
 2019-10-16 09:35:23,464 INFO  [io.jae.Configuration] (executor-thread-1) Initialized tracer=JaegerTracer(version=Java-0.34.0, serviceName=myservice, reporter=RemoteReporter(sender=UdpSender(), closeEnqueueTimeout=1000), sampler=ConstSampler(decision=true, tags={sampler.type=const, sampler.param=true}), tags={hostname=localhost.localdomain, jaeger.version=Java-0.34.0, ip=127.0.0.1}, zipkinSharedRpcSpan=false, expandExceptionLogs=false, useTraceId128Bit=false)
-13:20:11 INFO  traceId=1336b2b0a76a96a3, spanId=1336b2b0a76a96a3, sampled=true [or.ac.qu.TracedResource] (executor-thread-63) hello
-```
+13:20:11 INFO  traceId=1336b2b0a76a96a3, parentId=0, spanId=1336b2b0a76a96a3, sampled=true [or.ac.qu.TracedResource] (executor-thread-63) hello
+----
 
 Then visit the http://localhost:16686[Jaeger UI] to see the tracing information.
 
 Hit `CTRL+C` to stop the application.
 
+== Tracing additional methods
+
+REST endpoints are automatically traced.
+If you need to trace additional methods, you can use the `org.eclipse.microprofile.opentracing.Traced` annotation at class or method level.
+
+This can be useful to trace incoming requests from non-REST calls (like request coming from a message) or to create spans inside a trace.
+
+Here is an example of a `FrancophoneService` which methods are traced.
+
+[source, java]
+----
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.opentracing.Traced;
+
+@Traced
+@ApplicationScoped
+public class FrancophoneService {
+
+    public String bonjour() {
+        return "bonjour";
+    }
+}
+----
+
+NOTE: the best way to add OpenTracing capability to reactive messaging based applications is by adding the `Traced` annotation to all incoming methods.
+
 == Additional instrumentation
 
 The https://github.com/opentracing-contrib[OpenTracing API Contributions project] offers additional instrumentation that can be used to add tracing to a large variety of technologies/components.
@@ -193,8 +223,40 @@ quarkus.datasource.jdbc.driver=io.opentracing.contrib.jdbc.TracingDriver
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.PostgreSQLDialect
 ----
 
+
+=== Kafka
+
+The https://github.com/opentracing-contrib/java-kafka-client[Kafka instrumentation] will add a span for each message sent to or received from a Kafka topic. To enable it, add the following dependency to your pom.xml:
+
+[source, xml]
+----
+<dependency>
+    <groupId>io.opentracing.contrib</groupId>
+    <artifactId>opentracing-kafka-client</artifactId>
+</dependency>
+----
+
+It contains OpenTracing interceptors that must be registered on Kafka producers and consumers.
+
+If you followed the link:kafka[Kafka guide], the interceptors can be added on the `generated-price` and the `prices` channels as follows:
+
+[source, properties]
+----
+# Configure the Kafka sink (we write to it)
+mp.messaging.outgoing.generated-price.connector=smallrye-kafka
+mp.messaging.outgoing.generated-price.topic=prices
+mp.messaging.outgoing.generated-price.value.serializer=org.apache.kafka.common.serialization.IntegerSerializer
+mp.messaging.outgoing.generated-price.interceptor.classes=io.opentracing.contrib.kafka.TracingProducerInterceptor
+
+# Configure the Kafka source (we read from it)
+mp.messaging.incoming.prices.connector=smallrye-kafka
+mp.messaging.incoming.prices.value.deserializer=org.apache.kafka.common.serialization.IntegerDeserializer
+mp.messaging.incoming.prices.interceptor.classes=io.opentracing.contrib.kafka.TracingConsumerInterceptor
+----
+
+NOTE: `interceptor.classes` accept a list of classes separated by a comma.
+
 [[configuration-reference]]
 == Jaeger Configuration Reference
 
 include::{generated-dir}/config/quarkus-jaeger.adoc[leveloffset=+1, opts=optional]
-
diff --git a/docs/src/main/asciidoc/optaplanner.adoc b/docs/src/main/asciidoc/optaplanner.adoc
index 22f600404956c..1ef8e6ecabad2 100644
--- a/docs/src/main/asciidoc/optaplanner.adoc
+++ b/docs/src/main/asciidoc/optaplanner.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = OptaPlanner - Using AI to optimize a schedule with OptaPlanner
 
@@ -65,12 +65,13 @@ with the following extensions, for Maven or Gradle:
 
 Alternatively, generate it from the command line with Maven:
 
-[source,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=optaplanner-quickstart \
-    -Dextensions="resteasy, resteasy-jackson, optaplanner-quarkus, optaplanner-quarkus-jackson"
+    -Dextensions="resteasy,resteasy-jackson,optaplanner-quarkus,optaplanner-quarkus-jackson" \
+    -DnoExamples
 cd optaplanner-quickstart
 ----
 
@@ -450,9 +451,7 @@ public class TimeTableConstraintProvider implements ConstraintProvider {
                         // ... in the same timeslot ...
                         Joiners.equal(Lesson::getTimeslot),
                         // ... in the same room ...
-                        Joiners.equal(Lesson::getRoom),
-                        // ... and the pair is unique (different id, no reverse pairs)
-                        Joiners.lessThan(Lesson::getId))
+                        Joiners.equal(Lesson::getRoom))
                 // then penalize each pair with a hard weight.
                 .penalize("Room conflict", HardSoftScore.ONE_HARD);
     }
@@ -504,7 +503,7 @@ import java.util.List;
 import org.optaplanner.core.api.domain.solution.PlanningEntityCollectionProperty;
 import org.optaplanner.core.api.domain.solution.PlanningScore;
 import org.optaplanner.core.api.domain.solution.PlanningSolution;
-import org.optaplanner.core.api.domain.solution.drools.ProblemFactCollectionProperty;
+import org.optaplanner.core.api.domain.solution.ProblemFactCollectionProperty;
 import org.optaplanner.core.api.domain.valuerange.ValueRangeProvider;
 import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
 
@@ -612,19 +611,14 @@ package org.acme.optaplanner.rest;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.acme.optaplanner.domain.TimeTable;
 import org.optaplanner.core.api.solver.SolverJob;
 import org.optaplanner.core.api.solver.SolverManager;
 
 @Path("/timeTable")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class TimeTableResource {
 
     @Inject
@@ -859,9 +853,9 @@ You have just developed a Quarkus application with https://www.optaplanner.org/[
 
 Now try adding database and UI integration:
 
-. Store `Timeslot`, `Room`, and `Lesson` in the database with https://quarkus.io/guides/hibernate-orm-panache[Hibernate and Panache].
+. Store `Timeslot`, `Room`, and `Lesson` in the database with link:hibernate-orm-panache[Hibernate and Panache].
 
-. https://quarkus.io/guides/rest-json[Expose them through REST].
+. link:rest-json[Expose them through REST].
 
 . Adjust the `TimeTableResource` to read and write a `TimeTable` in a single transaction
 and use those accordingly:
@@ -885,6 +879,7 @@ import org.acme.optaplanner.domain.Room;
 import org.acme.optaplanner.domain.TimeTable;
 import org.acme.optaplanner.domain.Timeslot;
 import org.optaplanner.core.api.score.ScoreManager;
+import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
 import org.optaplanner.core.api.solver.SolverManager;
 import org.optaplanner.core.api.solver.SolverStatus;
 
@@ -898,7 +893,7 @@ public class TimeTableResource {
     @Inject
     SolverManager<TimeTable, Long> solverManager;
     @Inject
-    ScoreManager<TimeTable> scoreManager;
+    ScoreManager<TimeTable, HardSoftScore> scoreManager;
 
     // To try, open http://localhost:8080/timeTable
     @GET
diff --git a/docs/src/main/asciidoc/performance-measure.adoc b/docs/src/main/asciidoc/performance-measure.adoc
index 319a66d0d6a10..5c43ca028e8c6 100644
--- a/docs/src/main/asciidoc/performance-measure.adoc
+++ b/docs/src/main/asciidoc/performance-measure.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Measuring Performance
 
@@ -60,15 +60,15 @@ Linux::
  The linux https://linux.die.net/man/1/pmap[pmap] and https://linux.die.net/man/1/ps[ps] tools provide a report on the native memory map for a process
 
 [source,shell]
---
+----
  $ ps -o pid,rss,command -p <pid>
 
    PID   RSS COMMAND
- 11229 12628 ./target/getting-started-1.0-SNAPSHOT-runner
---
+ 11229 12628 ./target/getting-started-1.0.0-SNAPSHOT-runner
+----
 
 [source,shell]
---
+----
  $ pmap -x <pid>
 
  13150:   /data/quarkus-application -Xmx100m -Xmn70m
@@ -84,7 +84,7 @@ Linux::
  ...
  ---------------- ------- ------- -------
  total kB         9726508  256092  220900
---
+----
 
 Each Memory region that has been allocated for the process is listed;
 
@@ -101,12 +101,12 @@ macOS::
 On macOS, you can use `ps x -o pid,rss,command -p <PID>` which list the RSS for a given process in KB (1024 bytes).
 
 [source,shell]
---
+----
 $ ps x -o pid,rss,command -p 57160
 
   PID    RSS COMMAND
 57160 288548 /Applications/IntelliJ IDEA CE.app/Contents/jdk/Contents/Home/jre/bin/java
---
+----
 
 Which means IntelliJ IDEA consumes 281,8 MB of resident memory.
 
@@ -121,7 +121,7 @@ Here is how we measure startup time in our tests.
 We create a sample application that logs timestamps for certain points in the application lifecycle.
 
 [source, java]
---
+----
 @Path("/")
 public class GreetingEndpoint {
 
@@ -129,7 +129,7 @@ public class GreetingEndpoint {
 
     @GET
     @Path("/greeting")
-    @Produces("application/json")
+    @Produces(MediaType.APPLICATION_JSON)
     public Greeting greeting(@QueryParam("name") String name) {
         System.out.println(new SimpleDateFormat("HH:mm:ss.SSS").format(new java.util.Date(System.currentTimeMillis())));
         String suffix = name != null ? name : "World";
@@ -140,27 +140,27 @@ public class GreetingEndpoint {
         System.out.println(new SimpleDateFormat("HH:mm:ss.SSS").format(new Date()));
     }
 }
---
+----
 
 We start looping in a shell, sending requests to the rest endpoint of the sample application we are testing.
 
-[source, shell]
---
+[source,shell]
+----
 $ while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/api/greeting)" != "200" ]]; do sleep .00001; done
---
+----
 
 In a separate terminal, we start the timing application that we are testing, printing the time the application starts
 
-[source, shell]
---
+[source,shell]
+----
 $ date +"%T.%3N" &&  ./target/quarkus-timing-runner
 
 10:57:32.508
 10:57:32.512
 2019-04-05 10:57:32,512 INFO  [io.quarkus] (main) Quarkus 0.11.0 started in 0.002s. Listening on: http://127.0.0.1:8080
-2019-04-05 10:57:32,512 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jsonb]
+2019-04-05 10:57:32,512 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jackson]
 10:57:32.537
---
+----
 
 The difference between the final timestamp and the first timestamp is the total startup time for the application to serve the first request.
 
diff --git a/docs/src/main/asciidoc/picocli.adoc b/docs/src/main/asciidoc/picocli.adoc
index cfd1c2dadff09..8e2138d65f85e 100644
--- a/docs/src/main/asciidoc/picocli.adoc
+++ b/docs/src/main/asciidoc/picocli.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Command Mode with Picocli
 :extension-status: experimental
diff --git a/docs/src/main/asciidoc/platform.adoc b/docs/src/main/asciidoc/platform.adoc
new file mode 100644
index 0000000000000..084344e1ab804
--- /dev/null
+++ b/docs/src/main/asciidoc/platform.adoc
@@ -0,0 +1,191 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Platform
+
+include::./attributes.adoc[]
+
+The Quarkus extension ecosystem consists of the Quarkus extensions developed and maintained by the community, including the Quarkus core development team. While the Quarkus ecosystem (sometimes also referred to as the "Quarkus universe") includes all the Quarkus extensions ever developed, there is also a concept of a Quarkus platform.
+
+== Quarkus Platform
+
+The fundamental promise of a Quarkus platform is any combination of the Quarkus extensions the platform consists of can be used in the same application without causing any conflict for each other.
+Each organization creating their Quarkus platform may establish their own criterions for the extensions to be accepted into the platform and the means to guarantee the compatibility between the accepted extensions.
+
+=== Quarkus Platform Artifacts
+
+Each Quarkus platform is defined with a few artifacts.
+
+=== Quarkus Platform BOM
+
+Each Quarkus Platform is expected to provide a Maven BOM artifact that
+
+* imports a chosen version of `io.quarkus:quarkus-bom` (the platform BOM may be flattened at the end but it has to be based on some version of `io.quarkus:quarkus-bom`)
+* includes all the Quarkus extension artifacts (the runtime and the deployment ones) the platform consists of
+* includes all the necessary third-party artifacts that align the transitive dependency versions of the platform extensions to guarantee compatibility between them
+* includes the <<platform-descriptor,platform JSON descriptor>> artifact
+* possibly includes the <<platform-properties,platform configuration properties>> artifacts
+
+Quarkus applications that want to include extensions from a Quarkus platform will be importing the Quarkus platform BOM.
+
+[[platform-descriptor]]
+=== Quarkus Platform Descriptor
+
+Quarkus platform descriptor is a JSON artifact that provides information about the platform and its extensions to the Quarkus tools. E.g. http://code.quarkus.io and the Quarkus command line tools consult this descriptor to list, add and remove extensions to/from the project on user's request.
+This artifact is also used as a Quarkus platform identifier. When Quarkus tools need to identify the Quarkus platform(s) used in the project, they will analyze the dependency version constraints of the project (the effective list of the managed dependencies from the `dependencyManagement` section in Maven terms) looking for the platform descriptor artifact(s) among them. Given that the platform descriptors are included into the Quarkus platform BOMs, every Quarkus application will inherit the platform descriptor artifact from the imported platform BOM(s) as a dependency version constraint (managed dependency in Maven terms).
+
+To be able to easily identify Quarkus platform descriptors among the project's dependency constraints, the platform descriptor Maven artifact coordinates should follow the following naming convention:
+
+* the `groupId` of the descriptor artifact should match the `groupId` of the corresponding Quarkus Platform BOM;
+* the `artifactId` of the descriptor artifact should be the `artifactId` of the corresponding Quarkus Platform BOM with the `-quarkus-platform-descriptor` suffix;
+* the `classifier` of the descriptor artifact should match the `version` of the corresponding Quarkus Platform BOM;
+* the `type` of the descriptor artifact should be `json`;
+* the `version` of the descriptor artifact should match the `version` of the  corresponding Quarkus Platform BOM.
+
+As a string it will look like `<platform-bom-groupId>:<platform-bom-artifactId>-quarkus-platform-descriptor:<platform-version>:json:<platform-version>`
+
+E.g. the coordinates of the descriptor for Quarkus BOM `io.quarkus:quarkus-bom::pom:1.2.3` will be `io.quarkus:quarkus-bom-quarkus-platform-descriptor:1.2.3:json:1.2.3`.
+And for a custom Quarkus platform defined with BOM `org.acme:acme-bom::pom:555` it will be `org.acme:acme-bom-quarkus-platform-descriptor:555:json:555`.
+
+The classifier matching the version of the platform may look confusing at first. But this is what turns the descriptor into a true "fingerprint" of the platform. In both Maven and Gradle, the effective set of the dependency version constraints (or the managed dependencies) is obtained by merging all the imported BOMs and version constraints specified individually in the current project and also its parent(s). The artifact `classifier` is a part of the dependency ID, which could be expressed as `groupId:artifactId:classifier:type`. Which means that if a project is based on a couple of Quarkus platforms (by importing their BOMs), e.g. `io.quarkus:quarkus-universe-bom::pom:1.2.3` and `org.acme:acme-bom::pom:555`, and these two platforms are based on different `io.quarkus:quarkus-bom::pom` versions (which is technically a Quarkus platform in its turn as well), the Quarkus tools will be able to detect this fact and make the user aware of it, since it *might* not be a safe combination. If the descriptor artifact didn't include the classifer containing the version of the platform then the tools wouldn't be able to detect a potentially incompatible mix of different versions of the same platform in the same project.
+
+The platform descriptor will normally be generated using a Maven plugin, e.g.
+
+[source,xml]
+----
+<plugin>
+  <groupId>io.quarkus</groupId>
+  <artifactId>quarkus-platform-descriptor-json-plugin</artifactId>
+  <version>${quarkus.version}</version> <1>
+  <executions>
+    <execution>
+      <phase>process-resources</phase>
+      <goals>
+        <goal>generate-extensions-json</goal> <2>
+      </goals>
+    </execution>
+  </executions>
+  <configuration>
+    <bomGroupId>${quarkus.platform.group-id}</bomGroupId> <3>
+    <bomArtifactId>${quarkus.platform.artifact-id}</bomArtifactId> <4>
+    <bomVersion>${quarkus.platform.version}</bomVersion> <5>
+    <overridesFile>${overridesfile}</overridesFile> <6>
+    <resolveDependencyManagement>true</resolveDependencyManagement> <7>
+  </configuration>
+</plugin>
+----
+
+<1> the version of the `quarkus-platform-descriptor-json-plugin`
+<2> `generate-extensions-json` is the goal generating the platform descriptor
+<3> the `groupId` of the platform BOM
+<4> the `artifactId` of the platform BOM
+<5> the `version` of the platform BOM
+<6> this parameter is optional, it allows to override some metadata from the Quarkus extension descriptors found in every runtime extension artifact from which the platform descriptor is generated
+<7> this parameter is also optional and defaults to false. It has to be set to true in case the platform BOM *is not generated* and *is not flattened*. Which for example is the case for `io.quarkus:quarkus-bom`.
+
+[[platform-properties]]
+=== Quarkus Platform Properties
+
+A Quarkus platform may provide its own default values for some of the configuration options.
+
+Quarkus is using https://github.com/eclipse/microprofile-config[Eclipse MicroProfile Config] for wiring application configuration. A Quarkus platform may be used as another source of configuration in the hierarchy of the configuration sources dominated by the application's `application.properties`.
+
+To provide platform-specific defaults, the platform needs to include a dependency version constraint in its BOM for a properties artifact whose coordinates follow the following naming convention:
+
+* the `groupId` of the properties artifact should match the `groupId` of the corresponding Quarkus Platform BOM;
+* the `artifactId` of the properties artifact should be the `artifactId` of the corresponding Quarkus Platform BOM with the `-quarkus-platform-properties` suffix;
+* the `classifier` of the descriptor artifact should be left empty/null;
+* the `type` of the descriptor artifact should be `properties`;
+* the `version` of the descriptor artifact should match the `version` of the  corresponding Quarkus Platform BOM.
+
+The properties artifact itself is expected to be a traditional `properties` file that will be loaded into an instance of `java.util.Properties` class.
+
+IMPORTANT: At this point, platform properties are only allowed to provide the default values for a restricted set of configuration options. The property names in the platform properties file must be prefixed with the `platform.` suffix.
+
+Extension developers that want to make their configuration options platform-specific should set their default values to properties that start with the `platform.` suffix. Here is an example:
+
+[source,java]
+----
+package io.quarkus.deployment.pkg;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+public class NativeConfig {
+
+    /**
+     * The docker image to use to do the image build
+     */
+    @ConfigItem(defaultValue = "${platform.quarkus.native.builder-image}")
+    public String builderImage;
+}
+----
+
+In this case the default value for `quarkus.native.builder-image` will be provided by the platform. The user will still be able to set the desired value for `quarkus.native.builder-image` in its `application.properties`, of course. But in case it's not customized by the user, the default value will be coming from the platform properties.
+A platform properties file for the example above would contain (the actual value is provided as an example):
+
+[source,text]
+----
+platform.quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java11
+----
+
+There is also a Maven plugin goal that validates the platform properties content and its artifact coordinates and also checks whether the platform properties artifact is present in the platform's BOM. Here is a sample plugin configuration:
+
+[source,xml]
+----
+<plugin>
+  <groupId>io.quarkus</groupId>
+  <artifactId>quarkus-platform-descriptor-json-plugin</artifactId>
+  <version>${quarkus.version}</version>
+  <executions>
+    <execution>
+      <phase>process-resources</phase>
+      <goals>
+        <goal>platform-properties</goal>
+      </goals>
+    </execution>
+  </executions>
+</plugin>
+----
+
+==== Merging Quarkus Platform Properties
+
+In case an application is importing more than one Quarkus platform and those platforms include their own platform properties artifacts, the content of those platform properties artifacts will be merged to form a single set of properties that will be used for the application build.
+The order in which the properties artifacts are merged will correspond to the order in which they appear in the list of dependency version constraints of the application (in the Maven terms that will correspond to the effective list of application's managed dependencies, i.e. the flattened `managedDependencies` POM section).
+
+IMPORTANT: The content of the properties artifacts found earlier will dominate over those found later among the application's dependency constraints!
+
+That means if a platform needs to override a certain property value defined in the platform it is based on, it will need to include its platform properties artifact into the `managedDependencies` section of its BOM before importing the base platform.
+
+For example, the `quarkus-universe-bom` platform is based on the `quarkus-bom` platform. In case, the `quarkus-universe-bom` platform were to override certain properties defined in `quarkus-bom-quarkus-platform-properties` included into the `quarkus-bom` platform, the `quarkus-universe-bom` would have to be composed as
+[source,xml]
+----
+  <!-- skipped content -->
+
+  <artifactId>quarkus-universe-bom</artifactId>
+  <name>Quarkus universe - BOM</name>
+  <packaging>pom</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- universe platform properties -->
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-universe-bom-quarkus-platform-properties</artifactId>
+        <type>properties</type>
+        <version>${project.version}</version>
+      </dependency>
+
+      <!-- Quarkus Core BOM -->
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${quarkus.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+  <!-- skipped content -->
+----
+
+That way, the `quarkus-universe-bom` platform properties will appear before the `quarkus-bom` platform properties and so will be dominating during merging.
\ No newline at end of file
diff --git a/docs/src/main/asciidoc/quartz.adoc b/docs/src/main/asciidoc/quartz.adoc
index fb0306846abfd..dc4a5a101e455 100644
--- a/docs/src/main/asciidoc/quartz.adoc
+++ b/docs/src/main/asciidoc/quartz.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Scheduling Periodic Tasks with Quartz
 
@@ -42,14 +42,14 @@ The solution is located in the `quartz-quickstart` {quickstarts-tree-url}/quartz
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=quartz-quickstart \
     -DclassName="org.acme.quartz.TaskResource" \
     -Dpath="/tasks" \
-    -Dextensions="quartz, hibernate-orm-panache, flyway, resteasy-jsonb, jdbc-postgresql"
+    -Dextensions="resteasy,quartz,hibernate-orm-panache,flyway,resteasy-jackson,jdbc-postgresql"
 cd quartz-quickstart
 ----
 
@@ -82,6 +82,11 @@ This will add the following to your `pom.xml`:
 </dependency>
 ----
 
+[TIP]
+====
+To use a JDBC store, the `quarkus-agroal` extension, which provides the datasource support, is also required.
+====
+
 == Creating the Task Entity
 
 In the `org.acme.quartz` package, create the `Task` class, with the following content:
@@ -110,7 +115,7 @@ public class Task extends PanacheEntity { <1>
     }
 }
 ----
-1. Declare the entity using https://quarkus.io/guides/hibernate-orm-panache[Panache]
+1. Declare the entity using link:hibernate-orm-panache[Panache]
 
 == Creating a scheduled job
 
@@ -130,7 +135,7 @@ import io.quarkus.scheduler.Scheduled;
 public class TaskBean {
 
     @Transactional
-    @Scheduled(every = "10s") <2>
+    @Scheduled(every = "10s", identity = "task-job") <2>
     void schedule() {
         Task task = new Task(); <3>
         task.persist(); <4>
@@ -138,9 +143,9 @@ public class TaskBean {
 }
 ----
 1. Declare the bean in the _application_ scope
-2. Use the `@Scheduled` annotation to instruct Quarkus to run this method every 10 seconds.
+2. Use the `@Scheduled` annotation to instruct Quarkus to run this method every 10 seconds and set the unique identifier for this job.
 3. Create a new `Task` with the current start time.
-4. Persist the task in database using https://quarkus.io/guides/hibernate-orm-panache[Panache].
+4. Persist the task in database using link:hibernate-orm-panache[Panache].
 
 === Scheduling Jobs Programmatically
 
@@ -157,7 +162,7 @@ public class TaskBean {
     @Inject
     org.quartz.Scheduler quartz; <1>
     
-    void onStart(@Observes StartupEvent event) {
+    void onStart(@Observes StartupEvent event) throws SchedulerException {
        JobDetail job = JobBuilder.newJob(MyJob.class)
                          .withIdentity("myJob", "myGroup")
                          .build();
@@ -180,9 +185,12 @@ public class TaskBean {
     
     // A new instance of MyJob is created by Quartz for every job execution
     public static class MyJob implements Job {
+
+       @Inject
+       TaskBean taskBean;
     
        public void execute(JobExecutionContext context) throws JobExecutionException {
-          Arc.container().instance(TaskBean.class).get(). performTask(); <3>
+          taskBean.performTask(); <3>
        }
     
     }
@@ -190,14 +198,14 @@ public class TaskBean {
 ----
 1. Inject the underlying `org.quartz.Scheduler` instance.
 2. Schedule a new job using the Quartz API.
-3. Lookup the bean instance of `TaskBean` and invoke the `performTask()` method from the job.
+3. Invoke the `TaskBean#performTask()` method from the job. Jobs are also link:cdi[container-managed] beans if they belong to a link:cdi-reference[bean archive].
 
 NOTE: By default, the scheduler is not started unless a `@Scheduled` business method is found. You may need to force the start of the scheduler for "pure" programmatic scheduling. See also <<quartz-configuration-reference>>.  
 
 == Updating the application configuration file
 
 Edit the `application.properties` file and add the below configuration:
-[source,shell]
+[source,properties]
 ----
 # Quartz configuration
 quarkus.quartz.clustered=true <1>
@@ -242,7 +250,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 @Path("/tasks")
-@Produces(MediaType.APPLICATION_JSON)
 public class TaskResource {
 
     @GET
@@ -346,7 +353,7 @@ services:
       - tasks-network
 
   postgres: <3>
-    image: postgres:11.3
+    image: postgres:13.1
     container_name: quarkus_test
     environment:
       - POSTGRES_USER=quarkus_test
@@ -370,7 +377,7 @@ networks:
 
 In a separate terminal, run the below command:
 
-[source,shell]
+[source,bash]
 ----
 docker-compose up postgres <1>
 ----
@@ -382,14 +389,14 @@ docker-compose up postgres <1>
 Run the application with: `./mvnw quarkus:dev`.
 After a few seconds, open another terminal and run `curl localhost:8080/tasks` to verify that we have at least one task created.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
 == Packaging the application and run several instances
 
 The application can be packaged using `./mvnw clean package`. Once the build is successful, run the below command:
 
-[source,shell]
+[source,bash]
 ----
 docker-compose up --scale tasks=2 --scale nginx=1 <1>
 ----
@@ -400,6 +407,33 @@ After a few seconds, in another terminal, run `curl localhost:8080/tasks` to ver
 
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
+WARNING: It's the reponsibility of the deployer to clear/remove the previous state, i.e. stale jobs and triggers. Moreover, the applications that form the "Quartz cluster" should be identical, otherwise an unpredictable result may occur.
+
+[[quartz-register-plugin-listeners]]
+== Registering Plugin and Listeners
+
+You can register `plugins`, `job-listeners` and `trigger-listeners` through Quarkus configuration.
+
+The example below registers the plugin `org.quartz.plugins.history.LoggingJobHistoryPlugin` named as `jobHistory` with the property `jobSuccessMessage` defined as `Job [{1}.{0}] execution complete and reports: {8}`
+
+[source,conf]
+----
+quarkus.quartz.plugins.jobHistory.class=org.quartz.plugins.history.LoggingJobHistoryPlugin
+quarkus.quartz.plugins.jobHistory.properties.jobSuccessMessage=Job [{1}.{0}] execution complete and reports: {8}
+----
+
+You can also register a listener programmatically with an injected `org.quartz.Scheduler`:
+
+[source,java]
+----
+public class MyListenerManager {
+    void onStart(@Observes StartupEvent event, org.quartz.Scheduler scheduler) throws SchedulerException {
+        scheduler.getListenerManager().addJobListener(new MyJogListener());
+        scheduler.getListenerManager().addTriggerListener(new MyTriggerListener());
+    }
+}
+----
+
 [[quartz-configuration-reference]]
 == Quartz Configuration Reference
 
diff --git a/docs/src/main/asciidoc/qute-reference.adoc b/docs/src/main/asciidoc/qute-reference.adoc
index a411ab7ebd7a7..ec15b22043500 100644
--- a/docs/src/main/asciidoc/qute-reference.adoc
+++ b/docs/src/main/asciidoc/qute-reference.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Qute Reference Guide
 
@@ -11,10 +11,15 @@ include::./attributes.adoc[]
 :sectnums:
 :sectnumlevels: 4
 :toc:
-:extension-status: experimental
 
-include::./status-include.adoc[]
+Qute is a templating engine designed specifically to meet the Quarkus needs.
+The usage of reflection is minimized to reduce the size of native images.
+The API combines both the imperative and the non-blocking reactive style of coding.
+In the development mode, all files located in the `src/main/resources/templates` folder are watched for changes and modifications are immediately visible in your application.
+Furthermore, Qute attempts to detect most of the template problems at build time and fail fast.
+In this guide, you will find an <<hello_world_example,introductory example>>, the description of the <<core_features,core features>> and <<quarkus_integration,Quarkus integration>> details.
 
+[[hello_world_example]]
 == Hello World Example
 
 In this example, we'd like to demonstrate the basic workflow when working with Qute templates.
@@ -44,7 +49,7 @@ Engine engine = Engine.builder().addDefaults().build();
 
 TIP: In Quarkus, there is a preconfigured `Engine` available for injection - see <<quarkus_integration>>.
 
-If we have an `Engine` instance we could parse the template contents:
+Once we have an `Engine` instance we could parse the template contents:
 
 [source,java]
 ----
@@ -58,9 +63,10 @@ Finally, we will create a *template instance*, set the data and render the outpu
 [source,java]
 ----
 // Renders <html><p>Hello Jim!</p></html>
-helloTemplate.data("name", "Jim").render(); <1> 
+helloTemplate.data("name", "Jim").render(); <1> <2>
 ----
 <1> `Template.data(String, Object)` is a convenient method that creates a template instance and sets the data in one step.
+<2> `TemplateInstance.render()` triggers a synchronous rendering, i.e. the current thread is blocked until the rendering is finished. However, there are also asynchronous ways to trigger the rendering and consume the results. For example there is the `TemplateInstance.renderAsync()` method that returns `CompletionStage<String>` or `TemplateInstance.createMulti()` that returns Mutiny's `Multi<String>`.
 
 So the workflow is simple: 
 
@@ -69,65 +75,85 @@ So the workflow is simple:
 3. Create template instance (`io.quarkus.qute.TemplateInstance`),
 4. Render output.
 
-The `Engine` is able to cache the definitions so that it's not necessary to parse the contents again and again.
-
-NOTE: In Quarkus, the caching is done automatically.
+TIP: The `Engine` is able to cache the definitions so that it's not necessary to parse the contents again and again. In Quarkus, the caching is done automatically.
 
+[[core_features]]
 == Core Features
 
-=== Syntax and Building Blocks
-
-The dynamic parts of a template include:
-
-* *Comment* 
-** Starts with `{!` and ends with `!}`:  `{! This is a comment !}`,
-** Could be multi-line,
-** May contain expressions and sections: `{! {#if true} !}`.
-* *Expression*
-** Outputs the evaluated value,
-** Simple properties: `{foo}`, `{item.name}`,
-** Virtual methods: `{item.get(name)}`, `{name ?: 'John'}`,
-** With namespace: `{inject:colors}`.
-* *Section*
-** May contain expressions and sections: `{#if foo}{foo.name}{/if}`,
-** The name in the closing tag is optional: `{#if active}ACTIVE!{/}`,
-** Can be empty: `{#myTag image=true /}`,
-** May declare nested section blocks: `{#if item.valid} Valid. {#else} Invalid. {/if}` and decide which block to render.
-* *Unparsed Character Data*
-** Starts with `{[` and ends with `]}`: `{[ <script>if(true){alert('Qute is cute!')};</script> ]}`,
-** Could be multi-line,
-** Used to mark the content that should be rendered but not parsed.
-
-=== Identifiers
-
-Expressions/tags must start with a curly bracket (`{`) followed by a valid identifier.
-A valid identifier is a digit, an alphabet character, underscore (`_`), or a section command (`#`).
-Expressions/tags starting with an invalid identifier are ignored.
-A closing curly bracket (`}`) is ignored if not inside an expression/tag.
+=== Basic Building Blocks
+
+The dynamic parts of a template include comments, expressions, sections and unparsed character data.
+
+==== Comments 
+A comment starts with `{!` and ends with `!}`, e.g. `{! This is a comment !}`.
+It could be multi-line and may contain expressions and sections: `{! {#if true} !}`.
+Of course, the content of a comment is completely ignored.
+
+[[blocks_expressions]]
+==== Expressions
+An <<expressions,expression>> outputs an evaluated value. 
+It consists of one or more parts.
+A part may represent simple properties: `{foo}`, `{item.name}` or virtual methods: `{item.get(name)}`, `{name ?: 'John'}`.
+An expression may start with a namespace: `{inject:colors}`.
+
+[[blocks_sections]]
+==== Sections
+A <<sections,section>> may contain text, expressions and nested sections: `{#if foo}{foo.name}{/if}`.
+The name in the closing tag is optional: `{#if active}ACTIVE!{/}`.
+It can be empty: `{#myTag image=true /}`.
+A section may declare nested section blocks: `{#if item.valid} Valid. {#else} Invalid. {/if}` and decide which block to render.
+
+==== Unparsed Character Data
+It is used to mark the content that should be rendered but not parsed.
+It starts with `{|` and ends with `|}`: `{| <script>if(true){alert('Qute is cute!')};</script> |}`, and could be multi-line.
+
+NOTE: Previously, unparsed character data had to start with `{[` and end with `]}`. This syntax is still supported but we encourage users to switch to the new syntax to avoid some common collisions with constructs from other languages.
+
+[[identifiers]]
+=== Identifiers and Tags
+
+Identifiers are used in expressions and section tags.
+A valid identifier is a sequence of non-whitespace characters.
+However, users are encouraged to only use valid Java identifiers in expressions.
+
+TIP: You can use bracket notation if you need to specify an identifier that contains a dot, e.g. `{map['my.key']}`.
+
+When parsing a template document the parser identifies all _tags_.
+A tag starts and ends with a curly bracket, e.g. `{foo}`.
+The content of a tag must start with:
+
+* a digit, or
+* an alphabet character, or
+* underscore, or 
+* a built-in command: `#`, `!`, `@`, `/`.
+
+If it does not start with any of the above it is ignored by the parser.
  
-.hello.html
+.Tag Examples
 [source,html]
 ----
 <html>
    <body>
-   {_foo}       <1>
-   {  foo}      <2>
-   {{foo}}      <3>
-   {"foo":true} <4>
+   {_foo.bar}   <1>
+   {! comment !}<2>
+   {  foo}      <3>
+   {{foo}}      <4>
+   {"foo":true} <5>
    </body>
 </html>
 ----
-<1> Evaluated: expression starts with underscore.
-<2> Ignored: expression starts with whitespace. 
-<3> Ignored: expression starts with `{`.
-<4> Ignored: expression starts with `"`.
+<1> Parsed: an expression that starts with underscore.
+<2> Parsed: a comment
+<3> Ignored: starts with whitespace. 
+<4> Ignored: starts with `{`.
+<5> Ignored: starts with `"`.
 
-TIP: It is also possible to use escape sequences `\{` and `\}` to insert delimiters in the text. In fact, an escape sequence is usually only needed for the start delimiter, ie. `\\{foo}` will be rendered as `{foo}` (no evaluation will happen).
+TIP: It is also possible to use escape sequences `\{` and `\}` to insert delimiters in the text. In fact, an escape sequence is usually only needed for the start delimiter, ie. `\\{foo}` will be rendered as `{foo}` (no parsing/evaluation will happen).
 
 === Removing Standalone Lines From the Template
 
-By default, Qute parser removes standalone lines from the template output.
-A *standalone line* is a line that contains at least one section tag (e.g. `{#each}` and `{/each}`) or parameter declaration (e.g. `{@org.acme.Foo foo}`) but no expression and non-whitespace character.
+By default, the parser removes standalone lines from the template output.
+A *standalone line* is a line that contains at least one section tag (e.g. `{#each}` and `{/each}`), parameter declaration (e.g. `{@org.acme.Foo foo}`) or comment but no expression and no non-whitespace character.
 In other words, a line that contains no section tag or a parameter declaration is *not* a standalone line.
 Likewise, a line that contains an _expression_ or a _non-whitespace character_ is *not* a standalone line.
 
@@ -163,7 +189,7 @@ Likewise, a line that contains an _expression_ or a _non-whitespace character_ i
 </html>
 ----
 
-The default behavior can be disabled by setting the property `quarkus.qute.remove-standalone-lines` to `false`.
+TIP: In Quarkus, the default behavior can be disabled by setting the property `quarkus.qute.remove-standalone-lines` to `false`.
 In this case, all whitespace characters from a standalone line will be printed to the output.
 
 .Output with `quarkus.qute.remove-standalone-lines=false`
@@ -181,66 +207,83 @@ In this case, all whitespace characters from a standalone line will be printed t
 </html>
 ----
 
-==== Expressions
-
-An expression consists of:
-
-* an optional namespace followed by a colon (`:`), 
-* one or more parts separated by dot (`.`).
-
-The first part of the expression is always resolved against the <<current_context_object, current context object>>.
-If no result is found for the first part it's resolved against the parent context object (if available).
-For an expression that starts with a namespace the current context object is found using all the available ``NamespaceResolver``s.
-For an expression that does not start with a namespace the current context object is *derived from the position* of the tag.
-All other parts are resolved using ``ValueResolver``s against the result of the previous resolution.
+[[expressions]]
+=== Expressions
 
-For example, expression `{name}` has no namespace and single part - `name`.
-The "name" will be resolved using all available value resolvers against the current context object.
-However, the expression `{global:colors}` has the namespace `global` and single part - `colors`.
-First, all available ``NamespaceResolver``s will be used to find the current context object.
-And afterwards value resolvers will be used to resolve "colors" against the context object found. 
+An expression outputs a value.
+It consists of one or more parts separated by dot (dot notation) or square brackets (bracket notation).
+In the `object.property` (dot notation) syntax, the `property` must be a <<identifiers,valid identifier>>.
+In the `object[property_name]` (bracket notation) syntax, the `property_name` has to be a non-null <<literals, literal>> value. 
+An expression could start with an optional namespace followed by a colon (`:`).
 
+.Expressions Example
 [source]
 ----
 {name} <1>
 {item.name} <2>
-{global:colors} <3> 
+{item['name']} <3>
+{global:colors} <4> 
 ----
-<1> no namespace, one part -`name`
-<2> no namespace, two parts - `item`, `name`
-<3> namespace `global`, one part - `colors`
+<1> no namespace, one part: `name`
+<2> no namespace, two parts: `item`, `name`
+<3> equivalent to `{item.name}` but using the bracket notation
+<4> namespace `global`, one part: `colors`
 
-An expression part could be a "virtual method" in which case the name can be followed by a list of comma-separated parameters in parentheses: 
+A part of an expression could be a _virtual method_ in which case the name can be followed by a list of comma-separated parameters in parentheses. 
+A parameter of a virtual method can be either a nested expression or a <<literals, literal>> value.
+We call it "virtual" because it does not have to be backed by a real Java method.
 
+.Virtual Methods Example
 [source]
 ----
 {item.getLabels(1)} <1>
 {name or 'John'} <2>
 ----
 <1> no namespace, two parts - `item`, `getLabels(1)`, the second part is a virtual method with name `getLabels` and params `1`
-<2> infix notation, translated to `name.or('John')`; no namespace, two parts - `name`, `or('John')`
+<2> infix notation that can be used for virtual methods with single parameter, translated to `name.or('John')`; no namespace, two parts - `name`, `or('John')`
 
-[[current_context_object]]
-===== Current Context
+[[literals]]
+==== Supported Literals
 
-If an expression does not specify a namespace the current context object is derived from the position of the tag.
-By default, the current context object represents the data passed to the template instance.
-However, sections may change the current context object.
-A typical example is the for/each loop - during iteration the content of the section is rendered with each element as the current context object:
+|===
+|Literal |Examples
 
-[source]
-----
-{#each items}
-  {count}. {it.name} <1>
-{/each}
+|boolean 
+|`true`, `false`
 
-{! Another form of iteration... !}
-{#for item in items}
-  {count}. {item.name} <2>
-{/for}
-----
-<1> `it` is an implicit alias. `name` is resolved against the current iteration element.
-<2> Loop with an explicit alias `item`.
+|null 
+|`null`
+
+|string 
+|`'value'`, `"string"`
+
+|integer 
+|`1`, `-5`
+
+|long
+|`1l`, `-5L`
+
+|double
+|`1D`, `-5d`
+
+|float
+|`1f`, `-5F`
+
+|===
+
+==== Resolution
+
+The first part of the expression is always resolved against the <<current_context_object, current context object>>.
+If no result is found for the first part it's resolved against the parent context object (if available).
+For an expression that starts with a namespace the current context object is found using all the available ``NamespaceResolver``s.
+For an expression that does not start with a namespace the current context object is *derived from the position* of the tag.
+All other parts of an expression are resolved using all ``ValueResolver``s against the result of the previous resolution.
+
+For example, expression `{name}` has no namespace and single part - `name`.
+The "name" will be resolved using all available value resolvers against the current context object.
+However, the expression `{global:colors}` has the namespace `global` and single part - `colors`.
+First, all available ``NamespaceResolver``s will be used to find the current context object.
+And afterwards value resolvers will be used to resolve "colors" against the context object found. 
 
 [TIP]
 ====
@@ -269,27 +312,96 @@ This could be useful to access data for which the key is overridden:
 
 ====
 
-===== Built-in Operators
+[[current_context_object]]
+==== Current Context
+
+If an expression does not specify a namespace the _current context object_ is derived from the position of the tag.
+By default, the current context object represents the data passed to the template instance.
+However, sections may change the current context object.
+A typical example is the `with` section that could be used to set the current context object in order to simplify the template structure:
+
+[source,html]
+----
+{#with item}
+  <h1>{name}</h1>  <1>
+  <p>{description}</p>
+{/with}
+----
+<1> `name` is resolved against the `item`.
+
+Another built-in section that modifies the current context object is `let`/`set`:
+[source,html]
+----
+{#let myParent=order.item.parent myPrice=order.price} <1>
+  <h1>{myParent.name}</h1>
+  <p>Price: {myPrice}</p>
+{/let}
+----
+<1> The current context object inside the section is the map of resolved parameters.
+
+NOTE: The current context can be accessed via the implicit binding `this`.
+
+==== Built-in Resolvers
 
 |===
-|Operator |Description	|Examples
+|Name |Description	|Examples
 
-|Elvis 
+|Elvis Operator
 |Outputs the default value if the previous part cannot be resolved or resolves to `null`.
-|`{person.name ?: 'John'}`, `{person.name or 'John'}`
+|`{person.name ?: 'John'}`, `{person.name or 'John'}`, `{person.name.or('John')}`
+
+|orEmpty
+|Outputs an empty list if the previous part cannot be resolved or resolves to `null`.
+|`{#for pet in pets.orEmpty}{pet.name}{/for}`
 
-|Ternary 
+|Ternary Operator
 |Shorthand for if-then-else statement. Unlike in <<if_section>> nested operators are not supported.
 |`{item.isActive ? item.name : 'Inactive item'}` outputs the value of `item.name` if `item.isActive` resolves to `true`.
+
+|Logical AND Operator
+|Outputs `true` if both parts are not `falsy` as described in the <<if_section>>. The parameter is only evaluated if needed.
+|`{person.isActive && person.hasStyle}`
+
+|Logical OR Operator
+|Outputs `true` if any of the parts is not `falsy` as described in the <<if_section>>. The parameter is only evaluated if needed.
+|`{person.isActive \|\| person.hasStyle}`
+
 |===
 
 TIP: The condition in a ternary operator evaluates to `true` if the value is not considered `falsy` as described in the <<if_section>>.
 
-NOTE: In fact, the operators are implemented as "virtual methods" that consume one parameter and can be used with infix notation, i.e. `{person.name or 'John'}` is translated to `{person.name.or('John')}`.
+NOTE: In fact, the operators are implemented as "virtual methods" that consume one parameter and can be used with infix notation. For example `{person.name or 'John'}` is translated to `{person.name.or('John')}` and `{item.isActive ? item.name : 'Inactive item'}` is translated to `{item.isActive.ifTruthy(item.name).or('Inactive item')}`
+
+==== Arrays
+
+You can iterate over elements of an array with the <<loop_section>>. Moreover, it's also possible to get the length of the specified array and access the elements directly via an index value.
+
+.Array Examples
+[source,html]
+----
+<h1>Array of length: {myArray.length}</h1> <1>
+<ul>
+  <li>First: {myArray.0}</li> <2>
+  <li>Second: {myArray[1]}</li> <3>
+  <li>Third: {myArray.get(2)}</li> <4>
+</ul>
+<ol>
+ {#for element in myArray}
+ <li>{element}</li>
+ {/for}
+</ol>
+----
+<1> Outputs the length of the array.
+<2> Outputs the first element of the array.
+<3> Outputs the second element of the array using the bracket notation.
+<4> Outputs the third element of the array via the virtual method `get()`.
+
+==== Character Escapes
+
+For HTML and XML templates the `'`, `"`, `<`, `>`, `&` characters are escaped by default if a template variant is set.
 
-===== Character Escapes
+NOTE: In Quarkus, a variant is set automatically for templates located in the `src/main/resources/templates`. By default, the `java.net.URLConnection#getFileNameMap()` is used to determine the content type of a template file. The additional map of suffixes to content types can be set via `quarkus.qute.content-types`.
 
-For HTML and XML templates the `'`, `"`, `<`, `>`, `&` characters are escaped by default.
 If you need to render the unescaped value:
 
 1. Use the `raw` or `safe` properties implemented as extension methods of the `java.lang.Object`,
@@ -305,7 +417,7 @@ If you need to render the unescaped value:
 <1> `title` that resolves to `Expressions & Escapes` will be rendered as `Expressions &amp;amp; Escapes`
 <2> `paragraph` that resolves to `<p>My text!</p>` will be rendered as `<p>My text!</p>`
 
-===== Virtual Methods
+==== Virtual Methods
 
 A virtual method is a *part of an expression* that looks like a regular Java method invocation.
 It's called "virtual" because it does not have to match the actual method of a Java class.
@@ -330,7 +442,7 @@ class Item {
 }
 ----
 
-NOTE: Virtual methods are usually evaluated by value resolvers generated for <<template_extension_methods,@TemplateExtension methods>>, <<template_data,@TemplateData>> or classes used in <<parameter_declarations,parameter declarations>>. However, a custom value resolver that is not backed by any Java class/method can be registered as well.
+NOTE: Virtual methods are usually evaluated by value resolvers generated for <<template_extension_methods,@TemplateExtension methods>>, <<template_data,@TemplateData>> or classes used in <<typesafe_expressions,parameter declarations>>. However, a custom value resolver that is not backed by any Java class/method can be registered as well.
 
 A virtual method with single parameter can be called using the infix notation:
 
@@ -354,9 +466,15 @@ Virtual method parameters can be "nested" virtual method invocations.
 ----
 <1> `item.calculateDiscount(10)` is evaluated first and then passed as an argument to `item.subtractPrice()`.
 
+==== Evaluation of `CompletionStage` and `Uni` Objects
 
+Objects that implement `java.util.concurrent.CompletionStage` and `io.smallrye.mutiny.Uni` are evaluated in a special way.
+If a part of an expression resolves to a `CompletionStage`, the resolution continues once this stage is completed and the next part of the expression (if any) is evaluated against the result of the completed stage.
+For example, if there is an expression `{foo.size}` and `foo` resolves to `CompletionStage<List<String>>` then `size` is resolved against the completed result, i.e. `List<String>`.
+If a part of an expression resolves to a `Uni`, a `CompletionStage` is first created from `Uni` using `Uni#subscribeAsCompletionStage()` and then evaluated as described above.
 
-==== Sections
+[[sections]]
+=== Sections
 
 A section:
 
@@ -385,7 +503,8 @@ A section helper that defines the logic of a section can "execute" any of the bl
 {/if}
 ----
 
-===== Loop Section
+[[loop_section]]
+==== Loop Section
 
 The loop section makes it possible to iterate over an instance of `Iterable`, `Map` 's entry set, `Stream` and an Integer.
 It has two flavors.
@@ -435,7 +554,7 @@ The output will be:
 ----
 
 [[if_section]]
-===== If Section
+==== If Section
 
 The `if` section represents a basic control flow section.
 The simplest possible version accepts a single parameter and renders the content if the condition is evaluated to `true`.
@@ -535,7 +654,99 @@ You can also add any number of `else` blocks:
 {/if}
 ----
 
-===== With Section
+[[when_section]]
+==== When/Switch Section
+
+This section is similar to Java's `switch` or Kotlin's `when` constructs.
+It matches a _tested value_ against all blocks sequentially until a condition is satisfied.
+The first matching block is executed.
+All other blocks are ignored (this behavior differs to the Java `switch` where a `break` statement is necessary).
+
+.Example using the `when`/`is` name aliases
+[source]
+----
+{#when items.size}
+  {#is 1} <1>
+    There is exactly one item!
+  {#is > 10} <2>
+    There are more than 10 items!
+  {#else} <3>
+    There are 2 -10 items!
+{/when}
+----
+<1> If there is exactly one parameter it's tested for equality.
+<2> It's possible to use <<when_operators,an operator>> to specify the matching logic. Unlike in the <<if_section>> nested operators are not supported.
+<3> `else` is block is executed if no other block matches the value.
+
+.Example using the `switch`/`case` name aliases
+[source]
+----
+{#switch person.name}
+  {#case 'John'} <1>
+    Hey John!
+  {#case 'Mary'}
+    Hey Mary!
+{/switch}
+----
+<1> `case` is an alias for `is`.
+
+A tested value that resolves to an enum is handled specifically.
+The parameters of an `is`/`case` block are not evaluated as expressions but compared with the result of `toString()` invocation upon the tested value.
+
+[source]
+----
+{#when machine.status}
+  {#is ON} 
+    It's running. <1>
+  {#is in OFF BROKEN}
+    It's broken or OFF. <2>
+{/when}
+----
+<1> This block is executed if `machine.status.toString().equals("ON")`.
+<2> This block is executed if  `machine.status.toString().equals("OFF")` or `machine.status.toString().equals("BROKEN")`.
+
+NOTE: An enum constant is validated if the tested value has a type information available and resolves to an enum type.
+
+The following operators are supported in `is`/`case` block conditions:
+
+[[when_operators]]
+
+|===
+|Operator |Aliases |Example
+
+|not equal 
+|`!=`, `not`, `ne` 
+|`{#is not 10}`,`{#case != 10}`
+
+|greater than 
+|`gt`, `>`
+|`{#case le 10}`
+
+|greater than or equal to
+|`ge`, `>=`
+|`{#is >= 10}`
+
+|less than 
+|`lt`, `<`
+|`{#is < 10}`
+
+|less than or equal to
+|`le`, `\<=`
+|`{#case le 10}`
+
+|in
+|`in`
+|`{#is in 'foo' 'bar' 'baz'}`
+
+|not in
+|`ni`,`!in`
+|`{#is !in 1 2 3}`
+
+|===
+
+
+[[with_section]]
+==== With Section
 
 This section can be used to set the current context object.
 This could be useful to simplify the template structure:
@@ -564,15 +775,18 @@ This section might also come in handy when we'd like to avoid multiple expensive
 ----
 <1> `this` is the result of `item.callExpensiveLogicToGetTheValue(1,'foo',bazinga)`. The method is only invoked once even though the result may be used in multiple expressions.
 
-===== Let/Set Section
+==== Let/Set Section
 
 This section allows you to define named local variables:
 [source,html]
 ----
-{#let myParent=order.item.parent}
+{#let myParent=order.item.parent isActive=false age=10} <1>
   <h1>{myParent.name}</h1>
+  Is active: {isActive}
+  Age: {age}
 {/let}
 ----
+<1> The local variable is initialized with an expression that can also represent a <<literals,literal>>.
 
 The section tag is also registered under the `set` alias:
 
@@ -586,9 +800,27 @@ The section tag is also registered under the `set` alias:
 
 
 [[include_helper]]
-===== Include/Insert Sections
+==== Include Section
+
+This section can be used to include another template and possibly override some parts of the template (template inheritance).
+
+.Simple Example
+[source,html]
+----
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Simple Include</title>
+</head>
+<body>
+  {#include foo limit=10 /} <1><2>
+</body>
+</html>
+----
+<1> Include a template with id `foo`. The included template can reference data from the current context. 
+<2> It's also possible to define optional parameters that can be used in the included template.
 
-These sections can be used to include another template and possibly override some parts of the template (template inheritance).
+Template inheritance makes it possible to reuse template layouts.
 
 .Template "base"
 [source,html]
@@ -624,7 +856,7 @@ These sections can be used to include another template and possibly override som
 NOTE: Section blocks can also define an optional end tag - `{/title}`.
 
 [[user_tags]]
-===== User-defined Tags
+==== User-defined Tags
 
 User-defined tags can be used to include a template and optionally pass some parameters.
 Let's suppose we have a template called `itemDetail.html`:
@@ -668,8 +900,66 @@ We can include the tag like this:
 <1> `item` is resolved to an iteration element and can be referenced using the `it` key in the tag template.
 <2> Tag content injected using the `nested-content` key in the tag template.
 
+=== Rendering Output
+
+`TemplateInstance` provides several ways to trigger the rendering and consume the result.
+The most straightforward approach is represented by `TemplateInstance.render()`.
+This method triggers a synchronous rendering, i.e. the current thread is blocked until the rendering is finished, and returns the output.
+By contrast, `TemplateInstance.renderAsync()` returns a `CompletionStage<String>` which is completed when the rendering is finished.
+
+.`TemplateInstance.renderAsync()` Example
+[source,java]
+----
+template.data(foo).renderAsync().whenComplete((result, failure) -> { <1>
+   if (failure == null) {
+      // consume the output...
+   } else {
+      // process failure...
+   }
+};
+----
+<1> Register a callback that is executed once the rendering is finished. 
+
+There are also two methods that return https://smallrye.io/smallrye-mutiny/[Mutiny] types.
+`TemplateInstance.createUni()` returns a new `Uni<String>` object.
+If you call `createUni()` the template is not rendered right away. 
+Instead, every time `Uni.subscribe()` is called a new rendering of the template is triggered.
+
+.`TemplateInstance.createUni()` Example
+[source,java]
+----
+template.data(foo).createUni().subscribe().with(System.out::println);
+----
+
+`TemplateInstance.createMulti()` returns a new `Multi<String>` object.
+Each item represents a part/chunk of the rendered template.
+Again, `createMulti()` does not trigger rendering. 
+Instead, every time a computation is triggered by a subscriber the template is rendered again.
+
+.`TemplateInstance.createMulti()` Example
+[source,java]
+----
+template.data(foo).createMulti().subscribe().with(buffer:append,buffer::flush);
+----
+
+NOTE: The template rendering is divided in two phases. During the first phase, which is asynchronous, all expressions in the template are resolved and a _result tree_ is built. In the second phase, which is synchronous, the result tree is _materialized_, i.e. one by one the result nodes emit chunks that are consumed/buffered by the specific consumer.
+
 === Engine Configuration
 
+==== Value Resolvers
+
+Value resolvers are used when evaluating expressions.
+A custom `io.quarkus.qute.ValueResolver` can be registered programmatically via `EngineBuilder.addValueResolver()`.
+
+.`ValueResolver` Builder Example
+[source,java]
+----
+engineBuilder.addValueResolver(ValueResolver.builder()
+    .appliesTo(ctx -> ctx.getBase() instanceof Long && ctx.getName().equals("tenTimes"))
+    .resolveSync(ctx -> (Long) ctx.getBase() * 10)
+    .build());
+----
+
 ==== Template Locator
 
 Manual registration is sometimes handy but it's also possible to register a template locator using `EngineBuilder.addLocator(Function<String, Optional<Reader>>)`.
@@ -677,6 +967,22 @@ This locator is used whenever the `Engine.getTemplate()` method is called and th
 
 NOTE: In Quarkus, all templates from the `src/main/resources/templates` are located automatically.
 
+==== Content Filters
+
+Content filters can be used to modify the template contents before parsing.
+
+.Content Filter Example
+[source,java]
+----
+engineBuilder.addParserHook(new ParserHook() {
+    @Override
+    public void beforeParsing(ParserHelper parserHelper) {
+        parserHelper.addContentFilter(contents -> contents.replace("${", "$\\{")); <1>
+    }
+});
+----
+<1> Escape all occurences of `${`.
+
 [[quarkus_integration]]
 == Quarkus Integration
 
@@ -697,24 +1003,42 @@ Moreover, all templates located in the `src/main/resources/templates` directory
 ----
 import io.quarkus.qute.Engine;
 import io.quarkus.qute.Template;
-import io.quarkus.qute.api.ResourcePath;
+import io.quarkus.qute.Location;
 
 class MyBean {
 
     @Inject 
     Template items; <1>
 
-    @ResourcePath("detail/items2_v1.html") <2>
+    @Location("detail/items2_v1.html") <2>
     Template items2;
 
     @Inject
     Engine engine; <3>
 }
 ----
-<1> If there is no `ResourcePath` qualifier provided, the field name is used to locate the template. In this particular case, the container will attempt to locate a template with path `src/main/resources/templates/items.html`.
-<2> The `ResourcePath` qualifier instructs the container to inject a template from a path relative from `src/main/resources/templates`. In this case, the full path is `src/main/resources/templates/detail/items2_v1.html`. 
+<1> If there is no `Location` qualifier provided, the field name is used to locate the template. In this particular case, the container will attempt to locate a template with path `src/main/resources/templates/items.html`.
+<2> The `Location` qualifier instructs the container to inject a template from a path relative from `src/main/resources/templates`. In this case, the full path is `src/main/resources/templates/detail/items2_v1.html`. 
 <3> Inject the configured `Engine` instance.
 
+It's also possible to contribute to the engine configuration via a CDI observer method.
+
+.`EngineBuilder` Observer Example
+[source,java]
+----
+import io.quarkus.qute.EngineBuilder;
+
+class MyBean {
+
+    void configureEngine(@Observes EngineBuilder builder) {
+       builder.addValueResolver(ValueResolver.builder()
+                .appliesTo(ctx -> ctx.getBase() instanceof Long && ctx.getName().equals("tenTimes"))
+                .resolveSync(ctx -> (Long) ec.getBase() * 10)
+                .build());
+    }
+}
+----
+
 === Template Variants
 
 Sometimes it's useful to render a specific variant of the template based on the content negotiation.
@@ -753,13 +1077,19 @@ For the expression `inject:foo.price` the implementation class of the injected b
 
 NOTE: A `ValueResolver` is also generated for all beans annotated with `@Named` so that it's possible to access its properties without reflection.
 
-[[parameter_declarations]]
-=== Parameter Declarations
+[[typesafe_expressions]]
+=== Type-safe Expressions
+
+Template expressions can be optionally type-safe.
+Which means that an expression is validated against the existing Java types and template extension methods.
+If an invalid/incorrect expression is found then the build fails.
+
+For example, if there is an expression `item.name` where `item` maps to `org.acme.Item` then `Item` must have a property `name` or a matching template extension method must exist.
 
-It is possible to specify optional parameter declarations in a template.
-Quarkus attempts to validate all expressions that reference such parameters.
-If an invalid/incorrect expression is found the build fails.
+An optional _parameter declaration_ is used to bind a Java type to expressions whose first part matches the parameter name.
+Parameter declarations are specified directly in a template.
 
+.Parameter Declaration Example
 [source,html]
 ----
 {@org.acme.Foo foo} <1>
@@ -771,17 +1101,20 @@ If an invalid/incorrect expression is found the build fails.
 </head>
 <body>
   <h1>{title}</h1> <2>
-  Hello {foo.message}! <3>
+  Hello {foo.message.toLowerCase}! <3> <4>
 </body>
 </html>
 ----
 <1> Parameter declaration - maps `foo` to `org.acme.Foo`.
 <2> Not validated - not matching a param declaration.
 <3> This expression is validated. `org.acme.Foo` must have a property `message` or a matching template extension method must exist. 
+<4> Likewise, the Java type of the object resolved from `foo.message` must have a property `toLowerCase` or a matching template extension method must exist.
 
-NOTE: A value resolver is also generated for all types used in parameter declarations so that it's possible to access its properties without reflection.
+IMPORTANT: A value resolver is automatically generated for all types used in parameter declarations so that it's possible to access its properties without reflection.
 
-==== Overriding Parameter Declarations
+TIP: Method parameters of <<typesafe_templates,type-safe templates>> are automatically turned into parameter declarations.
+
+Note that sections can override names that would otherwise match a parameter declaration:
 
 [source,html]
 ----
@@ -802,27 +1135,123 @@ NOTE: A value resolver is also generated for all types used in parameter declara
 ----
 <1> Validated against `org.acme.Foo`.
 <2> Not validated - `foo` is overridden in the loop section.
+ 
+[[typesafe_templates]]
+=== Type-safe Templates
+You can also declare your templates in your Java code.
+If using <<resteasy_integration,templates in JAX-RS resources>>, you can rely on the following convention:
+
+- Organise your template files in the `/src/main/resources/templates` directory, by grouping them into one directory per resource class. So, if
+  your `ItemResource` class references two templates `hello` and `goodbye`, place them at `/src/main/resources/templates/ItemResource/hello.txt`
+  and `/src/main/resources/templates/ItemResource/goodbye.txt`. Grouping templates per resource class makes it easier to navigate to them.
+- In each of your resource class, declare a `@CheckedTemplate static class Template {}` class within your resource class.
+- Declare one `public static native TemplateInstance method();` per template file for your resource.
+- Use those static methods to build your template instances.
+
+.ItemResource.java
+[source,java]
+----
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.CheckedTemplate;
+
+@Path("item")
+public class ItemResource {
+
+    @CheckedTemplate
+    public static class Templates {
+        public static native TemplateInstance item(Item item); <1> <2>
+    }
+
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get(@PathParam("id") Integer id) {
+        return Templates.item(service.findItem(id)); <3>
+    }
+}
+----
+<1> Declare a method that gives us a `TemplateInstance` for `templates/ItemResource/item.html` and declare its `Item item` parameter so we can validate the template.
+<2> The `item` parameter is automatically turned into a <<typesafe_expressions,parameter declaration>> and so all expressions that reference this name will be validated.
+<3> Make the `Item` object accessible in the template.
+ 
+You can also declare a top-level Java class annotated with `@CheckedTemplate`:
+
+.Top-level checked templates
+[source,java]
+----
+package org.acme.quarkus.sample;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.CheckedTemplate;
+
+@CheckedTemplate
+public class Templates {
+    public static native TemplateInstance hello(String name); <1>
+}
+----
+<1> This declares a template with path `templates/hello.txt`. The `name` parameter is automatically turned into a  <<typesafe_expressions,parameter declaration>> and so all expressions that reference this name will be validated.
+
+Then declare one `public static native TemplateInstance method();` per template file.
+Use those static methods to build your template instances:
+
+.HelloResource.java
+[source,java]
+----
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import io.quarkus.qute.TemplateInstance;
+
+@Path("hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public TemplateInstance get(@QueryParam("name") String name) {
+        return Templates.hello(name);
+    }
+}
+----
 
 [[template_extension_methods]]
 === Template Extension Methods
 
-Extension methods can be used to extend the data classes with new functionality.
-For example, it is possible to add "computed properties" and "virtual methods".
+Extension methods can be used to extend the data classes with new functionality (to extend the set of accessible properties and methods) or to resolve expressions for a specific <<namespace_extension_methods,namespace>>.
+For example, it is possible to add _computed properties_ and _virtual methods_.
+
 A value resolver is automatically generated for a method annotated with `@TemplateExtension`.
-If declared on a class a value resolver is generated for every non-private method declared on the class.
+If a class is annotated with `@TemplateExtension` then a value resolver is generated for every _non-private static method_ declared on the class.
+Method-level annotations override the behavior defined on the class.
 Methods that do not meet the following requirements are ignored.
 
 A template extension method:
 
+* must not be `private`
 * must be static, 
-* must not return `void`,
-* must accept at least one parameter.
- 
-The class of the first parameter is always used to match the base object.
+* must not return `void`.
+
+If there is no namespace defined the class of the first parameter that is not annotated with `@TemplateAttribute` is used to match the base object. Otherwise the namespace is used to match an expression.
+
 The method name is used to match the property name by default. 
 However, it is possible to specify the matching name with `TemplateExtension#matchName()`.
-
-NOTE: A special constant - `ANY` - may be used to specify that the extension method matches any name. In that case, the method must declare at least two parameters and the second parameter must be a string. 
+A special constant - `TemplateExtension#ANY` - may be used to specify that the extension method matches any name.
+It is also possible to match the name against a regular expression specified in `TemplateExtension#matchRegex()`.
+In both cases, an additional string method parameter must be used to pass the property name.
+If both `matchName()` and `matchRegex()` are set the regular expression is used for matching.
 
 .Extension Method Example
 [source,java]
@@ -858,15 +1287,17 @@ This template extension method makes it possible to render the following templat
 
 ==== Method Parameters
 
-An extension method may accept multiple parameters.
-The first parameter is always used to pass the base object, ie. `org.acme.Item` in the previous example.
-Other parameters are resolved when rendering the template and passed to the extension method.
+An extension method may declare parameters.
+If no namespace is specified then the first parameter that is not annotated with `@TemplateAttribute` is used to pass the base object, i.e. `org.acme.Item` in the first example.
+If matching any name or using a regular expression then a string method parameter needs to be used to pass the property name.
+Parameters annotated with `@TemplateAttribute` are obtained via `TemplateInstance#getAttribute()`.
+All other parameters are resolved when rendering the template and passed to the extension method.
 
 .Multiple Parameters Example
 [source,java]
 ----
 @TemplateExtension
-class MyExtensions {
+class BigDecimalExtensions {
 
     static BigDecimal scale(BigDecimal val, int scale, RoundingMode mode) { <1>
         return val.setScale(scale, mode);
@@ -881,11 +1312,44 @@ class MyExtensions {
 ----
 <1> `item.discountedPrice` is resolved to an instance of `BigDecimal`.
 
-==== Built-in Template Extension methods
+[[namespace_extension_methods]]
+==== Namespace Extension Methods
+
+If `TemplateExtension#namespace()` is specified then the extension method is used to resolve expressions with the given <<expressions,namespace>>.
+Template extension methods that share the same namespace are grouped in one resolver ordered by `TemplateExtension#priority()`.
+The first matching extension method is used to resolve an expression.
+
+.Namespace Extension Method Example
+[source,java]
+----
+@TemplateExtension(namespace = "str")
+public static class StringExtensions {
+
+   static String format(String fmt, Object... args) {
+      return String.format(fmt, args);
+   }
+   
+   static String reverse(String val) {
+      return new StringBuilder(val).reverse().toString();
+   }
+}
+----
+
+These extension methods can be used as follows.
+
+[source,html]
+----
+{str:format('%s %s!','Hello', 'world')} <1>
+{str:reverse('hello')} <2>
+----
+<1> The output is `Hello world!`
+<2> The output is `olleh`
+
+==== Built-in Template Extension
 
 Quarkus provides a set of built-in extension methods.
 
-===== Map extension methods:
+===== Maps
 
 * `keys` or `keySet`: Returns a Set view of the keys contained in a map
 ** `{#for key in map.keySet}`
@@ -900,18 +1364,50 @@ Quarkus provides a set of built-in extension methods.
 ** `{#if map.isEmpty}`
 
 * `get(key)`: Returns the value to which the specified key is mapped
-** `{map.get('foo')}` or `{map['foo']}`
+** `{map.get('foo')}`
+
+TIP: A map value can be also accessed directly: `{map.myKey}`. Use the bracket notation for keys that are not legal identifiers: `{map['my key']}`.
 
-===== Collection extension methods:
+===== Collections
 
 * `get(index)`: Returns the element at the specified position in a list
-** `{list.get(0)}` or `{list[0]}`
+** `{list.get(0)}`
 
-===== Number extension methods:
+TIP: A list element can be accessed directly: `{list.10}` or `{list[10]}`.
+
+===== Numbers
 
 * `mod`: Modulo operation
 ** `{#if counter.mod(5) == 0}`
 
+===== Config 
+
+* `config:<name>` or `config:[<name>]`: Returns the config value for the given property name
+** `{config:foo}` or `{config:['property.with.dot.in.name']}`
+
+* `config:property(name)`: Returns the config value for the given property name; the name can be obtained dynamically by an expression 
+** `{config:property('quarkus.foo')}` or `{config:property(foo.getPropertyName())}`
+
+===== Time
+
+* `format(pattern)`: Formats temporal objects from the `java.time` package
+** `{dateTime.format('d MMM uuuu')}`
+
+* `format(pattern,locale)`: Formats temporal objects from the `java.time` package
+** `{dateTime.format('d MMM uuuu',myLocale)}`
+
+* `format(pattern,locale,timeZone)`: Formats temporal objects from the `java.time` package
+** `{dateTime.format('d MMM uuuu',myLocale,myTimeZoneId)}`
+
+* `time:format(dateTime,pattern)`: Formats temporal objects from the `java.time` package, `java.util.Date`, `java.util.Calendar` and `java.lang.Number`
+** `{time:format(myDate,'d MMM uuuu')}`
+
+* `time:format(dateTime,pattern,locale)`: Formats temporal objects from the `java.time` package, `java.util.Date`, `java.util.Calendar` and `java.lang.Number`
+** `{time:format(myDate,'d MMM uuuu', myLocale)}`
+
+* `time:format(dateTime,pattern,locale,timeZone)`: Formats temporal objects from the `java.time` package, `java.util.Date`, `java.util.Calendar` and `java.lang.Number`
+** `{time:format(myDate,'d MMM uuuu',myTimeZoneId)}`
+
 [[template_data]]
 === @TemplateData
 
@@ -977,8 +1473,8 @@ class Item {
 [[resteasy_integration]]
 === RESTEasy Integration
 
-If you want to use Qute in your JAX-RS application, you'll need to add the `quarkus-resteasy-qute` extension first.
-In your `pom.xml` file, add:
+If you want to use Qute in your JAX-RS application, then depending on which JAX-RS stack you are using, you'll need to register the proper extension first.
+If you are using the traditional `quakus-resteasy` extension, then in your `pom.xml` file, add:
 
 [source,xml]
 ----
@@ -988,8 +1484,19 @@ In your `pom.xml` file, add:
 </dependency>
 ----
 
-This extension registers a special `ContainerResponseFilter` implementation so that a resource method can return a `TemplateInstance` and the filter takes care of all necessary steps.
-A simple JAX-RS resource may look like this:
+If instead you are using RESTEasy Reactive via the `quarkus-resteasy-reactive` extension, then in your `pom.xml` file, add:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-resteasy-reactive-qute</artifactId>
+</dependency>
+----
+
+Both of these extensions register a special `ContainerResponseFilter` implementation which enables resource methods to return a `TemplateInstance`, thus freeing users of having to take care of all necessary internal steps.
+
+The end result is that a using Qute within a JAX-RS resource may look as simple as:
 
 .HelloResource.java
 [source,java]
@@ -1017,10 +1524,11 @@ public class HelloResource {
     }
 }
 ----
-<1> If there is no `@ResourcePath` qualifier provided, the field name is used to locate the template. In this particular case, we're injecting a template with path `templates/hello.txt`.
+<1> If there is no `@Location` qualifier provided, the field name is used to locate the template. In this particular case, we're injecting a template with path `templates/hello.txt`.
 <2> `Template.data()` returns a new template instance that can be customized before the actual rendering is triggered. In this case, we put the name value under the key `name`. The data map is accessible during rendering. 
 <3> Note that we don't trigger the rendering - this is done automatically by a special `ContainerResponseFilter` implementation.
 
+TIP: Users are encouraged to use <<typesafe_templates,Type-safe templates>> that help to organize the templates for a specific JAX-RS resource and enable <<typesafe_expressions,type-safe expressions>> automatically.
 
 The content negotiation is performed automatically.
 The resulting output depends on the `Accept` header received from the client.
@@ -1043,6 +1551,24 @@ class DetailResource {
 <1> Inject a variant template with base path derived from the injected field - `src/main/resources/templates/item`.
 <2> For `text/plain` the `src/main/resources/templates/item.txt` template is used. For `text/html` the `META-INF/resources/templates/item.html` template is used.
 
+The `RestTemplate` util class can be used to obtain a template instance from a body of a JAX-RS resource method:
+
+.RestTemplate Example
+[source,java]
+----
+@Path("/detail")
+class DetailResource {
+
+    @GET
+    @Produces({ MediaType.TEXT_HTML, MediaType.TEXT_PLAIN })
+    public TemplateInstance item() {
+        return RestTemplate.data("myItem", new Item("Alpha", 1000)); <1>
+    }
+}
+----
+<1> The name of the template is derived from the resource class and method name; `DetailResource/item` in this particular case.
+
+WARNING: Unlike with `@Inject` the templates obtained via `RestTemplate` are not validated, i.e. the build does not fail if a template does not exist.
 
 === Development Mode
 
@@ -1059,7 +1585,17 @@ Subsequently, the bundles can be used at runtime:
 
 1. Directly in your code via `io.quarkus.qute.i18n.MessageBundles#get()`; e.g. `MessageBundles.get(AppMessages.class).hello_name("Lucie")`
 2. Injected in your beans via `@Inject`; e.g. `@Inject AppMessages`
-3. Referenced in the templates via the message bundle name; e.g. `{msg:hello_name('Lucie')}`
+3. Referenced in the templates via the message bundle namespace:
++
+[source,html]
+----
+ {msg:hello_name('Lucie')} <1> <2> <3>
+ {msg:message(myKey,'Lu')} <4>
+----
+<1> `msg` is the default namespace.
+<2> `hello_name` is the message key.
+<3> `Lucie` is the parameter of the message bundle interface method.  
+<4> It is also possible to obtain a localized message for a key resolved at runtime using a reserved key `message`. The validation is skipped in this case though.
 
 .Message Bundle Interface Example
 [source,java]
@@ -1103,7 +1639,7 @@ NOTE: A warning message is logged for each _unused_ parameter.
 
 The default locale of the Java Virtual Machine used to *build the application* is used for the `@MessageBundle` interface by default.
 However, the `io.quarkus.qute.i18n.MessageBundle#locale()` can be used to specify a custom locale.
-Additionaly, there are two ways to define a localized bundle:
+Additionally, there are two ways to define a localized bundle:
 
 1. Create an interface that extends the default interface that is annotated with `@Localized`
 2. Create an UTF-8 encoded file located in `src/main/resources/messages`; e.g. `msg_de.properties`.
@@ -1117,7 +1653,7 @@ import io.quarkus.qute.i18n.Localized;
 import io.quarkus.qute.i18n.Message;
 
 @Localized("de") <1>
-public interface GermanAppMessages {
+public interface GermanAppMessages extends AppMessages {
 
     @Override
     @Message("Hallo {name}!") <2>
@@ -1143,6 +1679,47 @@ hello_name=Hallo {name}! <1> <2>
 <1> Each line in a localized file represents a message template. 
 <2> Keys and values are separated by the equals sign.
 
+Once we have the localized bundles defined we need a way to _select_ a correct bundle.
+If you use a message bundle expression in a template you'll have to specify the `locale` attribute of a template instance.
+
+.`locale` Attribute Example
+[source,java]
+----
+@Singleton
+public class MyBean {
+   
+    @Inject
+    Template hello;
+    
+    String render() {
+       return hello.instance().setAttribute("locale", Locale.forLanguageTag("cs")).render(); <1>
+    }
+}
+----
+<1> You can set a `Locale` instance or a locale tag string (IETF).
+
+
+NOTE: When using <<resteasy_integration,quarkus-resteasy-qute>> the `locale` attribute is derived from the the `Accept-Language` header if not set by a user.
+
+The `@Localized` qualifier can be used to inject a localized message bundle interface.
+
+.Injected Localized Message Bundle Example
+[source,java]
+----
+@Singleton
+public class MyBean {
+   
+    @Localized("cs") <1>
+    AppMessages msg;
+    
+    String render() {
+       return msg.hello_name("Jachym");
+    }
+}
+----
+<1> The annotation value is a locale tag string (IETF).
+
+
 === Configuration Reference
 
-include::{generated-dir}/config/quarkus-qute.adoc[leveloffset=+1, opts=optional]
\ No newline at end of file
+include::{generated-dir}/config/quarkus-qute.adoc[leveloffset=+1, opts=optional]
diff --git a/docs/src/main/asciidoc/qute.adoc b/docs/src/main/asciidoc/qute.adoc
index 3061e6003d63f..a53ab455466ae 100644
--- a/docs/src/main/asciidoc/qute.adoc
+++ b/docs/src/main/asciidoc/qute.adoc
@@ -1,10 +1,9 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Qute Templating Engine
-:extension-status: experimental
 
 include::./attributes.adoc[]
 
@@ -15,11 +14,9 @@ In the development mode, all files located in `src/main/resources/templates` are
 Furthermore, we try to detect most of the template problems at build time.
 In this guide, you will learn how to easily render templates in your application.
 
-include::./status-include.adoc[]
-
 == Hello World with JAX-RS
 
-If you want to use Qute in your JAX-RS application, you need to add the `quarkus-qute-resteasy` extension first.
+If you want to use Qute in your JAX-RS application, you need to add the `quarkus-resteasy-qute` extension first.
 In your `pom.xml` file, add:
 
 [source,xml]
@@ -75,7 +72,7 @@ public class HelloResource {
 
 If your application is running, you can request the endpoint:
 
-[source, shell]
+[source,shell]
 ----
 $ curl -w "\n" http://localhost:8080/hello?name=Martin
 Hello Martin!
@@ -116,7 +113,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
 
 import io.quarkus.qute.TemplateInstance;
-import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.qute.CheckedTemplate;
 
 @Path("hello")
 public class HelloResource {
@@ -137,8 +134,7 @@ public class HelloResource {
 <2> `Templates.hello()` returns a new template instance that can be customized before the actual rendering is triggered. In this case, we put the name value under the key `name`. The data map is accessible during rendering. 
 <3> Note that we don't trigger the rendering - this is done automatically by a special `ContainerResponseFilter` implementation.
  
-NOTE: Once you have declared a `@CheckedTemplate` class, we will check that all its methods point to existing templates, so if you try to use a template
-from your Java code and you forgot to add it, we will let you know at build time :)
+NOTE: Once you have declared a `@CheckedTemplate` class, we will check that all its methods point to existing templates, so if you try to use a template from your Java code and you forgot to add it, we will let you know at build time :)
 
 Keep in mind this style of declaration allows you to reference templates declared in other resources too:
 
@@ -165,9 +161,9 @@ public class GoodbyeResource {
 }
 ----
 
-=== Toplevel type-safe templates
+=== Top-level type-safe templates
 
-Naturally, if you want to declare templates at the toplevel, directly in `/src/main/resources/templates/hello.txt`, for example,
+Naturally, if you want to declare templates at the top-level, directly in `/src/main/resources/templates/hello.txt`, for example,
 you can declare them in a toplevel (non-nested) `Templates` class:
 
 .HelloResource.java
@@ -177,7 +173,7 @@ package org.acme.quarkus.sample;
 
 import io.quarkus.qute.TemplateInstance;
 import io.quarkus.qute.Template;
-import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.qute.CheckedTemplate;
 
 @CheckedTemplate
 public class Templates {
@@ -240,7 +236,7 @@ import javax.ws.rs.core.MediaType;
 
 import io.quarkus.qute.TemplateInstance;
 import io.quarkus.qute.Template;
-import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.qute.CheckedTemplate;
 
 @Path("item")
 public class ItemResource {
diff --git a/docs/src/main/asciidoc/reactive-event-bus.adoc b/docs/src/main/asciidoc/reactive-event-bus.adoc
index d21b8e72fbcfc..183d79755e001 100644
--- a/docs/src/main/asciidoc/reactive-event-bus.adoc
+++ b/docs/src/main/asciidoc/reactive-event-bus.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using the event bus
 
@@ -25,19 +25,20 @@ However, it is limited to single-event behavior (no stream) and to local message
 This mechanism uses the Vert.x EventBus, so you need to enable the `vertx` extension to use this feature.
 If you are creating a new project, set the `extensions` parameter are follows:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=vertx-quickstart \
-    -Dextensions="vertx,resteasy-mutiny"
+    -Dextensions="vertx,resteasy-mutiny" \
+    -DnoExamples
 cd vertx-quickstart
 ----
 
 If you have an already created project, the `vertx` extension can be added to an existing Quarkus project with
 the `add-extension` command:
 
-[source]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="vertx,resteasy-mutiny"
 ----
@@ -88,6 +89,18 @@ void consumeBlocking(String message) {
     // Something blocking
 }
 ----
+
+Alternatively, you can annotate your method with `@io.smallrye.common.annotation.Blocking`:
+[source, java]
+----
+@ConsumeEvent(value = "blocking-consumer")
+@Blocking
+void consumeBlocking(String message) {
+    // Something blocking
+}
+----
+
+When using `@Blocking`, it ignores the value of the `blocking` attribute of `@ConsumeEvent`.
 ====
 
 Asynchronous processing is also possible by returning either an `io.smallrye.mutiny.Uni` or a `java.util.concurrent.CompletionStage`:
@@ -262,12 +275,13 @@ This message is consumed by another bean and the response is sent using the _rep
 
 First create a new project using:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=vertx-http-quickstart \
-    -Dextensions="vertx"
+    -Dextensions="vertx" \
+    -DnoExamples
 cd vertx-http-quickstart
 ----
 
@@ -351,14 +365,14 @@ To better understand, let's detail how the HTTP request/response has been handle
 
 This application can be packaged using:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw clean package
 ----
 
 You can also compile it as a native executable with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw clean package -Pnative
 ----
diff --git a/docs/src/main/asciidoc/reactive-messaging-http.adoc b/docs/src/main/asciidoc/reactive-messaging-http.adoc
new file mode 100644
index 0000000000000..2e653d4ee86f8
--- /dev/null
+++ b/docs/src/main/asciidoc/reactive-messaging-http.adoc
@@ -0,0 +1,395 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Using HTTP and WebSockets with Reactive Messaging
+
+include::./attributes.adoc[]
+
+This guide demonstrates how your Quarkus application can utilize MicroProfile Reactive Messaging to
+consume and produce HTTP messages.
+
+== Prerequisites
+
+To complete this guide, you need:
+
+* less than 15 minutes
+* an IDE
+* JDK 1.8+ installed with `JAVA_HOME` configured appropriately
+* Apache Maven {maven-version}
+* GraalVM, Docker or Podman installed if you want to run in native mode.
+
+== Architecture
+
+In this guide we will implement a service, namely `CostConverter` that consumes HTTP messages
+with costs in multiple currencies and converts each cost to its value in Euro.
+
+To let a user easily try out the service, we will implement an HTTP resource summing up the costs
+(`CostCollector`), and a simple web page to add new costs and watch the sum.
+
+
+== Solution
+
+We recommend that you follow the instructions in the next sections and create the application step by step.
+However, you can go right to the completed example.
+
+Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
+
+The solution is located in the `reactive-messaging-http-quickstart` {quickstarts-tree-url}/reactive-messaging-http-quickstart[directory].
+
+== Creating the Maven Project
+
+First, we need a new project. Create a new project with the following command:
+
+[source,bash,subs=attributes+]
+----
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
+    -DprojectGroupId=org.acme \
+    -DprojectArtifactId=reactive-messaging-http-quickstart \
+    -Dextensions="reactive-messaging-http" \
+    -DnoExamples
+cd reactive-http
+----
+
+This command generates a Maven project, importing the Reactive Messaging and HTTP connector extensions.
+
+== The Converter
+
+Create the `src/main/java/org/acme/reactivehttp/CostConverter.java` file, with the following content:
+
+[source, java]
+----
+package org.acme.reactivehttp;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.jboss.logging.Logger;
+
+import javax.enterprise.context.ApplicationScoped;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A bean consuming costs in multiple currencies and producing prices in EUR from them
+ */
+@ApplicationScoped
+public class CostConverter {
+
+    private static final Logger log = Logger.getLogger(CostConverter.class);
+
+    private static final Map<String, Double> conversionRatios = new HashMap<>();
+
+    static {
+        conversionRatios.put("CHF", 0.93);
+        conversionRatios.put("USD", 0.84);
+        conversionRatios.put("PLN", 0.22);
+        conversionRatios.put("EUR", 1.);
+    }
+
+    @Incoming("incoming-costs") // <1>
+    @Outgoing("outgoing-costs") // <2>
+    double convert(Cost cost) { // <3>
+        Double conversionRatio = conversionRatios.get(cost.getCurrency().toUpperCase());
+        if (conversionRatio == null) {
+            return 0.;
+        }
+        return conversionRatio * cost.getValue();
+    }
+}
+
+
+----
+<1> Consume messages from the `incoming-costs` stream.
+<2> Dispatch returned values to the `outgoing-costs` stream.
+<3> Consume an event with payload of type `Cost` and produce a `double`.
+In the case of consuming an arbitrary object, the reactive-messaging-http extension will attempt
+to deserialize the request body assuming it is JSON.
+
+Let's define the `Cost` class:
+[source, java]
+----
+package org.acme.reactivehttp;
+
+public class Cost {
+    private double value;
+    private String currency;
+
+    public double getValue() {
+        return value;
+    }
+
+    public void setValue(double value) {
+        this.value = value;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+}
+
+----
+
+
+
+In the next step, we will create configurations for both streams in the `application.properties` file.
+
+== Configuring the HTTP connector
+
+We need to configure the HTTP connector. This is done in the `application.properties` file.
+The keys are structured as follows:
+
+`mp.messaging.[outgoing|incoming].{channel-name}.{property}=value`
+
+The `channel-name` segment must match the value set in the `@Incoming` and `@Outgoing` annotation:
+
+- `incoming-costs` -> a source that receives costs
+- `outgoing-costs` -> a sink that receives converted costs
+
+[source,properties]
+----
+mp.messaging.outgoing.outgoing-costs.connector=quarkus-http
+
+# here we are using a URL pointing to a test endpoint
+# you can use e.g. an environment variable to change it
+mp.messaging.outgoing.outgoing-costs.url=http://localhost:${quarkus.http.port}/cost-collector
+
+# POST is the default method. Another possibility is PUT
+mp.messaging.outgoing.outgoing-costs.method=POST
+
+
+mp.messaging.incoming.incoming-costs.connector=quarkus-http
+
+# the incoming-costs channel will be fed via an endpoint on the `/costs` path
+mp.messaging.incoming.incoming-costs.path=/costs
+
+# POST is the default method. Another possibility is PUT
+mp.messaging.incoming.incoming-costs.method=POST
+----
+
+
+== The CostCollector
+To illustrate that converting messages and passing them through works, let's add an endpoint that will
+receive the outgoing costs and sum them up.
+This is a usual JAX-RS endpoint.
+
+[source, java]
+----
+package org.acme.reactivehttp;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+@Path("/cost-collector")
+@ApplicationScoped
+public class CostCollector {
+
+    private double sum = 0;
+
+    @POST
+    public void consumeCost(String valueAsString) {
+        sum += Double.parseDouble(valueAsString);
+    }
+
+    @GET
+    public double getSum() {
+        return sum;
+    }
+
+}
+
+----
+
+== The HTML page
+
+To conveniently interact with the application, let's create a simple web page.
+
+The page will provide a form to add costs, and an info of the current sum of costs.
+The page periodically updates the sum by requesting the current sum from `/cost-collector`.
+
+Create the `src/main/resources/META-INF/resources/index.html` file, with the following content:
+
+[source, html]
+----
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Costs</title>
+
+    <link rel="stylesheet" type="text/css"
+          href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.24.0/css/patternfly.min.css">
+    <link rel="stylesheet" type="text/css"
+          href="https://cdnjs.cloudflare.com/ajax/libs/patternfly/3.24.0/css/patternfly-additions.min.css">
+</head>
+<body>
+<div class="container">
+
+    <h2>Add a cost</h2>
+    <div>
+        <div>
+            <label for="value">Value</label>
+            <input type="text" id="value">
+        </div>
+        <div>
+            <label for="currency">Currency</label>
+            <select id="currency">
+                <option value="CHF">Swiss franc</option>
+                <option value="USD">United States dollar</option>
+                <option value="CHF">Polish złoty</option>
+            </select>
+        </div>
+        <input type="button" onclick="add()" value="Add">
+    </div>
+
+
+    <h2>Last cost</h2>
+    <div class="row">
+        <p class="col-md-12">The total cost is <strong><span id="content">N/A</span>&nbsp;&euro;</strong>.</p>
+    </div>
+</div>
+</body>
+<script>
+    add = function() {
+        var value = document.getElementById('value').value;
+        var currency = document.getElementById('currency').value;
+
+        var cost = {
+            value: document.getElementById('value').value,
+            currency: document.getElementById('currency').value
+        };
+
+        fetch('costs', { method: 'POST', body: JSON.stringify(cost) });
+    }
+
+    updateCost = function() {
+        fetch('cost-collector').then(response => response.text()).then(sum =>
+            document.getElementById('content').textContent=sum
+        );
+    }
+
+    window.setInterval(updateCost, 500);
+</script>
+</html>
+----
+
+== Get it running
+
+Run the application using:
+
+[source,bash]
+----
+./mvnw quarkus:dev
+----
+
+Open `http://localhost:8080/index.html` in your browser.
+
+
+== Running Native
+
+You can build the native executable with:
+
+[source,bash]
+----
+./mvnw package -Pnative
+----
+
+== Going further
+
+=== HTTP connector options
+All `quarkus-http` connector options:
+
+[source, properties]
+----
+# OUTGOING
+
+# The target URL
+mp.messaging.outgoing.<channelName>.url=http://localhost:8213
+
+# Message payload serializer, optional, implementation of `io.quarkus.reactivemessaging.http.runtime.serializers.Serializer`
+mp.messaging.outgoing.<channelName>.serializer=com.example.MySerializer
+
+# The number of attempts to make for sending a request to a remote endpoint. Must not be less than zero
+# Zero by default
+mp.messaging.outgoing.<channelName>.maxRetries=3
+
+# Configures the random factor when using back-off with maxRetries > 0. 0.5 by default
+mp.messaging.outgoing.<channelName>.jitter=0.3
+
+# Configures a back-off delay between attempts to send a request.
+# A random factor (jitter) is applied to increase the delay when several failures happen.
+mp.messaging.outgoing.<channelName>.delay=1s
+
+#The HTTP method (either `POST` or `PUT`), `POST` by default
+mp.messaging.outgoing.<channelName>.method=PUT
+
+#INCOMING
+# The HTTP method (either `POST` or `PUT`, `POST` by default
+mp.messaging.incoming.<channelName>.method=POST
+
+# The path of the endpoint
+mp.messaging.incoming.<channelName>.path=/my-reactive-ws-endpoint
+
+# HTTP endpoint buffers messages if a consumer is not able to keep up. This setting specifies the size of the buffer.
+# 8 by default.
+mp.messaging.incoming.<channelName>.buffer-size=13
+
+----
+
+=== WebSockets
+Except of the `quarkus-http` connector, the `quarkus-reactive-messaging-http` extension also brings in
+`quarkus-websocket` - a connector for exposing and feeding WebSockets.
+At the moment only binary data is supported.
+
+NOTE: While the sink of the HTTP connector checks if the message is consumed by the remote endpoint,
+the WebSocket sink does not. It may happen that a failure to receive a message is not reported,
+e.g. if the remote side closes the WebSocket connection in a crucial moment.
+
+The `quarkus-websocket` connector is configured with the following properties:
+
+[source,properties]
+----
+# OUTGOING
+
+# The target URL
+mp.messaging.outgoing.<channelName>.url=ws://localhost:8234/
+
+# Message serializer, optional, implementation of `io.quarkus.reactivemessaging.http.runtime.serializers.Serializer`
+mp.messaging.outgoing.<channelName>.serializer=com.example.MySerializer
+
+# The number of retries to make for sending a message to a remote websocket endpoint.
+# A value greater than 0 is advised. Otherwise, a web socket timeout can result in a dropped message
+# The default value is 1
+mp.messaging.outgoing.<channelName>.maxRetries=1
+
+# Configures the random factor when using back-off with maxAttempts > 1, 0.5 by default
+mp.messaging.outgoing.<channelName>.jitter=0.7
+
+# Configures a back-off delay between attempts to send a request.
+# A random factor (jitter) is applied to increase the delay when several failures happen.
+mp.messaging.outgoing.<channelName>.delay=2s
+
+
+# INCOMING
+
+# The path of the endpoint
+mp.messaging.incoming.<channelName>.path=/my-ws-endpoint
+
+# Web socket endpoint buffers messages if a consumer is not able to keep up.
+# This setting specifies the size of the buffer. 8 by default
+mp.messaging.incoming.<channelName>.buffer-size=3
+----
+
+=== Reactive Messaging
+This extension utilizes MicroProfile Reactive Messaging to build data streaming applications.
+
+If you did the Kafka or AMQP quickstart, you have realized that it's the same code.
+The only difference is the connector configuration.
+
+If you want to go further check the documentation of https://smallrye.io/smallrye-reactive-messaging[SmallRye Reactive Messaging], the implementation used in Quarkus.
diff --git a/docs/src/main/asciidoc/reactive-routes.adoc b/docs/src/main/asciidoc/reactive-routes.adoc
index 41c9ed639c291..8ea768c54419e 100644
--- a/docs/src/main/asciidoc/reactive-routes.adoc
+++ b/docs/src/main/asciidoc/reactive-routes.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Using Reactive Routes
 
@@ -101,6 +101,20 @@ public void blocking(RoutingContext rc) {
 }
 ----
 
+[NOTE]
+====
+Alternatively, you can use `@io.smallrye.common.annotation.Blocking` and omit the `type = Route.HandlerType.BLOCKING`:
+[source, java]
+----
+@Route(methods = HttpMethod.POST, path = "/post")
+@Blocking
+public void blocking(RoutingContext rc) {
+    // ...
+}
+----
+When `@Blocking` is used, it ignores the `type` attribute of `@Route`.
+====
+
 The `@Route` annotation is repeatable and so you can declare several routes for a single method:
 
 [source,java]
@@ -186,15 +200,18 @@ A route method must be a non-private non-static method of a CDI bean.
 If the annotated method returns `void` then it has to accept at least one argument - see the supported types below. 
 If the annotated method does not return `void` then the arguments are optional.
 
+NOTE: Methods that return `void` must __end__ the response or the HTTP request to this route will never end.
+Some methods of `RoutingExchange` do it for you, others not and you must call the `end()` method of the response by yourself, please refer to its JavaDoc for more information.
+
 A route method can accept arguments of the following types: 
 
 * `io.vertx.ext.web.RoutingContext`
-* `io.vertx.reactivex.ext.web.RoutingContext`
+* `io.vertx.mutiny.ext.web.RoutingContext`
 * `io.quarkus.vertx.web.RoutingExchange`
 * `io.vertx.core.http.HttpServerRequest`
 * `io.vertx.core.http.HttpServerResponse`
-* `io.vertx.reactivex.core.http.HttpServerRequest`
-* `io.vertx.reactivex.core.http.HttpServerResponse`
+* `io.vertx.mutiny.core.http.HttpServerRequest`
+* `io.vertx.mutiny.core.http.HttpServerResponse`
 
 Furthermore, it is possible to inject the `HttpServerRequest` parameters into a method parameter annotated with `@io.quarkus.vertx.web.Param`:
 
@@ -259,6 +276,18 @@ Person createPerson(@Body Person person, @Param("id") Optional<String> primaryKe
 }
 ----
 
+A failure handler can declare a single method parameter whose type extends `Throwable`. 
+The type of the parameter is used to match the result of `RoutingContext#failure()`.
+
+.Failure Handler Example
+[source,java]
+----
+@Route(type = HandlerType.FAILURE)
+void unsupported(UnsupportedOperationException e, HttpServerResponse response) {
+  response.setStatusCode(501).end(e.getMessage());
+}
+----
+
 === Returning Unis
 
 In a reactive route, you can return a `Uni` directly:
@@ -310,7 +339,7 @@ String helloSync(RoutingContext context) {
 ----
 
 Be aware, the processing must be **non-blocking** as reactive routes are invoked on the IO Thread.
-Otherwise, use the `blocking` attribute of the `@Route` annotation.
+Otherwise, set the `type` attribute of the `@Route` annotation to `Route.HandlerType.BLOCKING`, or use the `@io.smallrye.common.annotation.Blocking` annotation.
 
 The method can return:
 
@@ -475,6 +504,40 @@ id: 3
 
 ----
 
+=== Using Bean Validation
+
+You can combine reactive routes and Bean Validation.
+First, don't forget to add the `quarkus-hibernate-validator` extension to your project.
+Then, you can add constraints to your route parameter (annotated with `@Param` or `@Body`):
+
+[source,java]
+----
+@Route(produces = "application/json")
+Person createPerson(@Body @Valid Person person, @NonNull @Param("id") String primaryKey) {
+  // ...
+}
+----
+
+If the parameters do not pass the tests, it returns an HTTP 400 response.
+If the request accepts JSON payload, the response follows the https://opensource.zalando.com/problem/constraint-violation/[Problem] format.
+
+When returning an object or a `Uni`, you can also use the `@Valid` annotation:
+
+[source,java]
+----
+@Route(...)
+@Valid Uni<Person> createPerson(@Body @Valid Person person, @NonNull @Param("id") String primaryKey) {
+  // ...
+}
+----
+
+If the item produced by the route does not pass the validation, it returns a HTTP 500 response.
+If the request accepts JSON payload, the response follows the https://opensource.zalando.com/problem/constraint-violation/[Problem] format.
+
+Note that only `@Valid` is supported on the return type.
+The returned class can use any constraint.
+In the case of `Uni`, it checks the item produced asynchronously.
+
 == Using the Vert.x Web Router
 
 You can also register your route directly on the _HTTP routing layer_ by registering routes directly on the `Router` object.
@@ -547,7 +610,7 @@ This is enough to generate a basic OpenAPI schema document from your Vert.x Rout
 
 [source,bash]
 ----
-curl http://localhost:8080/openapi
+curl http://localhost:8080/q/openapi
 ----
 
 You will see the generated OpenAPI schema document:
@@ -600,7 +663,7 @@ example, adding header info, or specifying the return type on `void` methods mig
             email = "techsupport@example.com"),
         license = @License(
             name = "Apache 2.0",
-            url = "http://www.apache.org/licenses/LICENSE-2.0.html"))
+            url = "https://www.apache.org/licenses/LICENSE-2.0.html"))
 )
 @ApplicationScoped
 public class MyDeclarativeRoutes {
@@ -646,7 +709,7 @@ info:
     email: techsupport@example.com
   license:
     name: Apache 2.0
-    url: http://www.apache.org/licenses/LICENSE-2.0.html
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
   version: 1.0.1
 paths:
   /greetings:
@@ -683,7 +746,7 @@ paths:
 Swagger UI is included by default when running in `dev` or `test` mode, and can optionally added to `prod` mode.
 See <<openapi-swaggerui.adoc#use-swagger-ui-for-development,the Swagger UI>> Guide for more details.
 
-Navigate to link:http://localhost:8080/swagger-ui/[localhost:8080/swagger-ui/] and you will see the Swagger UI screen:
+Navigate to link:http://localhost:8080/q/swagger-ui/[localhost:8080/q/swagger-ui/] and you will see the Swagger UI screen:
 
 image:reactive-routes-guide-screenshot01.png[alt=Swagger UI]
 
diff --git a/docs/src/main/asciidoc/reactive-sql-clients.adoc b/docs/src/main/asciidoc/reactive-sql-clients.adoc
index 8e7dd391897e3..bf0ad6b551166 100644
--- a/docs/src/main/asciidoc/reactive-sql-clients.adoc
+++ b/docs/src/main/asciidoc/reactive-sql-clients.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Reactive SQL Clients
 
@@ -49,7 +49,7 @@ public class Fruit {
 ====
 Do you need a ready-to-use PostgreSQL server to try out the examples?
 
-[source,shell]
+[source,bash]
 ----
 docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:10.5
 ----
@@ -62,18 +62,20 @@ docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name qua
 First, make sure your project has the `quarkus-reactive-pg-client` extension enabled.
 If you are creating a new project, set the `extensions` parameter as follows:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=reactive-pg-client-quickstart \
-    -Dextensions="reactive-pg-client"
+    -DclassName="org.acme.vertx.FruitResource" \
+    -Dpath="/fruits" \
+    -Dextensions="resteasy,reactive-pg-client,resteasy-mutiny"
 cd reactive-pg-client-quickstart
 ----
 
 If you have an already created project, the `reactive-pg-client` extension can be added to an existing Quarkus project with the `add-extension` command:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="reactive-pg-client"
 ----
@@ -88,8 +90,16 @@ Otherwise, you can manually add this to the dependencies section of your `pom.xm
 </dependency>
 ----
 
+=== Mutiny
+
+Reactive REST endpoints in your application that return Uni or Multi need `Mutiny support for RESTEasy` extension (`io.quarkus:quarkus-resteasy-mutiny`) to work properly:
+
+[source,bash]
+----
+./mvnw quarkus:add-extension -Dextensions="resteasy-mutiny"
+----
+
 [TIP]
-.Mutiny
 ====
 In this guide, we will use the Mutiny API of the Reactive PostgreSQL Client.
 If you're not familiar with Mutiny reactive types, read the link:getting-started-reactive#mutiny[Getting Started with Reactive guide] first.
@@ -98,11 +108,11 @@ If you're not familiar with Mutiny reactive types, read the link:getting-started
 === JSON Binding
 
 We will expose `Fruit` instances over HTTP in the JSON format.
-Consequently, you also need to add the `quarkus-resteasy-jsonb` extension:
+Consequently, you also need to add the `quarkus-resteasy-jackson` extension:
 
-[source,shell]
+[source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="resteasy-jsonb"
+./mvnw quarkus:add-extension -Dextensions="resteasy-jackson"
 ----
 
 If you prefer not to use the command line, manually add this to the dependencies section of your `pom.xml` file:
@@ -111,7 +121,7 @@ If you prefer not to use the command line, manually add this to the dependencies
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-resteasy-jsonb</artifactId>
+    <artifactId>quarkus-resteasy-jackson</artifactId>
 </dependency>
 ----
 
@@ -121,7 +131,7 @@ Of course, this is only a requirement for this guide, not any application using
 
 The Reactive PostgreSQL Client can be configured with standard Quarkus datasource properties and a reactive URL:
 
-[source]
+[source,properties]
 .src/main/resources/application.properties
 ----
 quarkus.datasource.db-kind=postgresql
@@ -136,8 +146,6 @@ With that you may create your `FruitResource` skeleton and `@Inject` a `io.vertx
 .src/main/java/org/acme/vertx/FruitResource.java
 ----
 @Path("fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
     @Inject
@@ -261,14 +269,14 @@ public Multi<Fruit> get() {
 
 Now start Quarkus in `dev` mode with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
 
 Lastly, open your browser and navigate to http://localhost:8080/fruits, you should see:
 
-[source, shell]
+[source,json]
 ----
 [{"id":3,"name":"Apple"},{"id":1,"name":"Orange"},{"id":2,"name":"Pear"}]
 ----
@@ -322,7 +330,7 @@ The same logic applies when saving a `Fruit`:
 .src/main/java/org/acme/vertx/Fruit.java
 ----
 public Uni<Long> save(PgPool client) {
-    return client.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING (id)").execute(Tuple.of(name))
+    return client.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING id").execute(Tuple.of(name))
             .onItem().transform(pgRowSet -> pgRowSet.iterator().next().getLong("id"));
 }
 ----
@@ -494,9 +502,9 @@ The following snippet shows how to run 2 insertions in the same transaction:
 ----
 public static Uni<Void> insertTwoFruits(PgPool client, Fruit fruit1, Fruit fruit2) {
     return SqlClientHelper.inTransactionUni(client, tx -> {
-        Uni<RowSet<Row>> insertOne = tx.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING (id)")
+        Uni<RowSet<Row>> insertOne = tx.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING id")
                 .execute(Tuple.of(fruit1.name));
-        Uni<RowSet<Row>> insertTwo = tx.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING (id)")
+        Uni<RowSet<Row>> insertTwo = tx.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING id")
                 .execute(Tuple.of(fruit2.name));
 
         return insertOne.and(insertTwo)
@@ -514,7 +522,7 @@ You can also create dependent actions as follows:
 ----
 return SqlClientHelper.inTransactionUni(client, tx -> tx
 
-        .preparedQuery("INSERT INTO person (firstname,lastname) VALUES ($1,$2) RETURNING (id)")
+        .preparedQuery("INSERT INTO person (firstname,lastname) VALUES ($1,$2) RETURNING id")
                 .execute(Tuple.of(person.getFirstName(), person.getLastName()))
 
         .onItem().transformToUni(id -> tx.preparedQuery("INSERT INTO addr (person_id,addrline1) VALUES ($1,$2)")
@@ -523,6 +531,124 @@ return SqlClientHelper.inTransactionUni(client, tx -> tx
         .onItem().ignore().andContinueWithNull());
 ----
 
+== Multiple Datasources
+
+The reactive SQL clients support defining several datasources.
+
+A typical configuration with several datasources would look like:
+
+[source,properties]
+----
+quarkus.datasource.db-kind=postgresql <1>
+quarkus.datasource.username=user-default
+quarkus.datasource.password=password-default
+quarkus.datasource.reactive.url=postgresql://localhost:5432/default
+
+quarkus.datasource."additional1".db-kind=postgresql <2>
+quarkus.datasource."additional1".username=user-additional1
+quarkus.datasource."additional1".password=password-additional1
+quarkus.datasource."additional1".reactive.url=postgresql://localhost:5432/additional1
+
+quarkus.datasource."additional2".db-kind=mysql <3>
+quarkus.datasource."additional2".username=user-additional2
+quarkus.datasource."additional2".password=password-additional2
+quarkus.datasource."additional2".reactive.url=mysql://localhost:3306/additional2
+----
+<1> The default datasource - using PostgreSQL.
+<2> A named datasource called `additional1` - using PostgreSQL.
+<3> A named datasource called `additional2` - using MySQL.
+
+You can then inject the clients as follows:
+
+[source,java]
+----
+@Inject <1>
+PgPool defaultClient;
+
+@Inject
+@ReactiveDataSource("additional1") <2>
+PgPool additional1Client;
+
+@Inject
+@ReactiveDataSource("additional2")
+MySQLPool additional2Client;
+----
+<1> Injecting the client for the default datasource does not require anything special.
+<2> For a named datasource, you use the `@ReactiveDataSource` CDI qualifier with the datasource name as its value.
+
+== UNIX Domain Socket connections
+
+The PostgreSQL and MariaDB/MySQL clients can be configured to connect to the server through a UNIX domain socket.
+
+First make sure that link:vertx#native-transport[native transport support] is enabled.
+
+Then configure the database connection url.
+This step depends on the database type.
+
+=== PostgreSQL
+
+PostgresSQL domain socket paths have the following form: `<directory>/.s.PGSQL.<port>`
+
+The database connection url must be configured so that:
+
+* the `host` is the `directory` in the socket path
+* the `port` is the `port` in the socket path
+
+Consider the following socket path: `/var/run/postgresql/.s.PGSQL.5432`.
+
+In `application.properties` add:
+
+[source,properties]
+----
+quarkus.datasource.reactive.url=postgresql://:5432/quarkus_test?host=/var/run/postgresql
+----
+
+=== MariaDB/MySQL
+
+The database connection url must be configured so that the `host` is the socket path.
+
+Consider the following socket path: `/var/run/mysqld/mysqld.sock`.
+
+In `application.properties` add:
+
+[source,properties]
+----
+quarkus.datasource.reactive.url=mysql:///quarkus_test?host=/var/run/mysqld/mysqld.sock
+----
+
+== TCP Connection `idle-timeout`
+
+Reactive datasources can be configured with an `idle-timeout` (in milliseconds) that applies at the TCP connection level.
+
+NOTE: The `idle-timeout` is disabled by default.
+
+For example, you could expire idle connections after 60 minutes:
+
+[source,properties]
+----
+quarkus.datasource.reactive.idle-timeout=PT60M
+----
+
+[WARNING]
+====
+This timeout does not apply to the pool, but to the TCP connection.
+
+If it expires while the connection is idle in the pool, the connection is closed and removed from the pool.
+
+If it expires immediately after your borrowed the connection from the pool and before you execute a query, you will get an error.
+
+
+While this is unlikely to happen, you must be prepared for such eventuality:
+
+[source,java]
+----
+// Run a query, retry at most 3 times if it fails
+Uni<RowSet<Row>> rowSet = client.query("SELECT id, name FROM fruits ORDER BY name ASC")
+                            .execute()
+                            .onFailure().retry().atMost(3);
+----
+====
+
 == Configuration Reference
 
 === Common Datasource
diff --git a/docs/src/main/asciidoc/redis.adoc b/docs/src/main/asciidoc/redis.adoc
index 4d33438cc4964..4476ce8163317 100644
--- a/docs/src/main/asciidoc/redis.adoc
+++ b/docs/src/main/asciidoc/redis.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using the Redis Client
 :extension-status: preview
@@ -43,12 +43,13 @@ The solution is located in the `redis-quickstart` {quickstarts-tree-url}/redis-q
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=redis-quickstart \
-    -Dextensions="redis-client, resteasy-jsonb, resteasy-mutiny"
+    -Dextensions="redis-client,resteasy-jackson,resteasy-mutiny" \
+    -DnoExamples
 cd redis-quickstart
 ----
 
@@ -88,9 +89,9 @@ docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name red
 Once we have the Redis server running, we need to configure the Redis connection properties.
 This is done in the `application.properties` configuration file. Edit it to the following content:
 
-[source]
+[source,properties]
 ----
-quarkus.redis.hosts=localhost:6379 <1>
+quarkus.redis.hosts=redis://localhost:6379 <1>
 ----
 
 1. Configure Redis hosts to connect to. Here we connect to the Redis server we started in the previous section
@@ -200,19 +201,14 @@ import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.PUT;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
 import javax.ws.rs.Path;
 import javax.ws.rs.POST;
 import javax.ws.rs.DELETE;
-import javax.ws.rs.core.MediaType;
 import java.util.List;
 
 import io.smallrye.mutiny.Uni;
 
 @Path("/increments")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class IncrementResource {
 
     @Inject
@@ -394,7 +390,7 @@ public class IncrementResourceTest {
 If you followed the instructions, you should have the Redis server running.
 Then, you just need to run the application using:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw quarkus:dev
 ----
@@ -409,7 +405,7 @@ a key.
 
 === Creating a new increment
 
-[source, shell]
+[source,bash]
 ----
 curl -X POST -H "Content-Type: application/json" -d '{"key":"first","value":10}' http://localhost:8080/increments <1>
 ----
@@ -430,7 +426,7 @@ Running the above command should return the result below:
 
 To see the list of current increments keys, run the following command:
 
-[source, shell]
+[source,bash]
 ----
 curl http://localhost:8080/increments
 ----
@@ -441,7 +437,7 @@ The above command should return  `["first"]` indicating that we have only one in
 
 To retrieve an increment using its key, we will have to run the below command:
 
-[source, shell]
+[source,bash]
 ----
 curl http://localhost:8080/increments/first <1>
 ----
@@ -460,7 +456,7 @@ curl http://localhost:8080/increments/first <1>
 
 To increment a value, run the following command:
 
-[source, shell]
+[source,bash]
 ----
 curl -X PUT -H "Content-Type: application/json" -d '27' http://localhost:8080/increments/first <1>
 ----
@@ -483,7 +479,7 @@ Now, running the command `curl http://localhost:8080/increments/first` should re
 
 Use the command below, to delete an increment given its key.
 
-[source, shell]
+[source,bash]
 ----
 curl -X DELETE  http://localhost:8080/increments/first <1>
 ----
@@ -498,7 +494,7 @@ You can run the application as a conventional jar file.
 
 First, we will need to package it:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package
 ----
@@ -507,9 +503,9 @@ NOTE: This command will start a Redis instance to execute the tests. Thus your R
 
 Then run it:
 
-[source, shell]
+[source,bash]
 ----
-java -jar ./target/redis-quickstart-1.0-SNAPSHOT-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 == Running Native
@@ -523,16 +519,16 @@ Compiling a native executable takes a bit longer, as GraalVM performs additional
 steps to remove unnecessary codepaths. Use the  `native` profile to compile a
 native executable:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative
 ----
 
 Once the build is finished, you can run the executable with:
 
-[source, shell]
+[source,bash]
 ----
-./target/redis-quickstart-1.0-SNAPSHOT-runner
+./target/redis-quickstart-1.0.0-SNAPSHOT-runner
 ----
 
 == Connection Health Check
@@ -540,10 +536,44 @@ Once the build is finished, you can run the executable with:
 If you are using the `quarkus-smallrye-health` extension, `quarkus-vertx-redis` will automatically add a readiness health check
 to validate the connection to the Redis server.
 
-So when you access the `/health/ready` endpoint of your application you will have information about the connection validation status.
+So when you access the `/q/health/ready` endpoint of your application you will have information about the connection validation status.
 
 This behavior can be disabled by setting the `quarkus.redis.health.enabled` property to `false` in your `application.properties`.
 
+== Multiple Redis Clients
+
+The Redis extension allows you to configure multiple clients.
+Using several clients works the same way as having a single client.
+
+[source,properties]
+----
+quarkus.redis.hosts=redis://localhost:6379
+quarkus.redis.second.hosts=redis://localhost:6379
+----
+
+Notice there's an extra bit in the key (the `second` segment).
+The syntax is as follows: `quarkus.redis.[optional name.][redis configuration property]`.
+If the name is omitted, it configures the default client.
+
+=== Named Redis client Injection
+
+When using multiple clients, you can select the client to inject using the `io.quarkus.redis.client.RedisClientName` qualifier.
+Using the above properties to configure three different clients, you can also inject each one as follows:
+
+[source,java,indent=0]
+----
+@Inject
+RedisClient defaultRedisClient;
+
+@Inject
+@RedisClientName("second")
+RedisClient redisClient2;
+
+@Inject
+@RedisClientName("second")
+ReactiveRedisClient reactiveClient2;
+----
+
 == Configuration Reference
 
 include::{generated-dir}/config/quarkus-redis-client.adoc[opts=optional, leveloffset=+1]
diff --git a/docs/src/main/asciidoc/rest-client-multipart.adoc b/docs/src/main/asciidoc/rest-client-multipart.adoc
index 42341ae3d8185..f84ff56f4de4c 100644
--- a/docs/src/main/asciidoc/rest-client-multipart.adoc
+++ b/docs/src/main/asciidoc/rest-client-multipart.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using the REST Client with Multipart
 
@@ -11,7 +11,7 @@ RESTEasy has rich support for the `multipart/*` and `multipart/form-data` mime t
 
 
 This guide explains how to use the MicroProfile REST Client with Multipart in order to interact with REST APIs
-requiring multipart/form-data content-type with very little effort.
+requiring `multipart/form-data` content-type with very little effort.
 
 == Prerequisites
 
@@ -35,37 +35,28 @@ The solution is located in the `rest-client-multipart-quickstart` {quickstarts-t
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=rest-client-multipart-quickstart \
     -DclassName="org.acme.rest.client.multipart.MultipartClientResource" \
     -Dpath="/client" \
-    -Dextensions="rest-client, resteasy"
+    -Dextensions="rest-client, resteasy, resteasy-multipart"
 cd rest-client-multipart-quickstart
 ----
 
 This command generates the Maven project with a REST endpoint and imports the `rest-client` and `resteasy` extensions.
-
-Then, we'll add the following dependency to support `multipart/form-data` requests:
-
-[source,xml]
-----
-<dependency>
-    <groupId>org.jboss.resteasy</groupId>
-    <artifactId>resteasy-multipart-provider</artifactId>
-</dependency>
-----
+It also adds the `resteasy-multipart` extension to support `multipart/form-data` requests.
 
 == Setting up the model
 
-In this guide we will be demonstrating how to invoke a REST service accepting multipart/form-data input.
+In this guide we will be demonstrating how to invoke a REST service accepting `multipart/form-data` input.
 We are assuming the payload is well-known before the request is sent, so we can model as a POJO.
 
 [NOTE]
 ====
-If the payload is unknown, you can also use the RESTEasy custom API instead. If that's the case, see the RESTEasy Multipart Providers link in the end of the guide.
+If the payload is unknown, you can also use the RESTEasy custom API instead. If that's the case, see the RESTEasy Multipart Providers link at the end of the guide.
 ====
 
 Our first order of business is to setup the model we will be using to define the `multipart/form-data` payload, in the form of a `MultipartBody` POJO.
@@ -156,7 +147,7 @@ It will allow to narrow down the number of JAX-RS providers (which can be seen a
 In order to determine the base URL to which REST calls will be made, the REST Client uses configuration from `application.properties`.
 The name of the property needs to follow a certain convention which is best displayed in the following code:
 
-[source,shell]
+[source,properties]
 ----
 # Your configuration properties
 org.acme.rest.client.multipart.MultipartService/mp-rest/url=http://localhost:8080/
@@ -274,7 +265,7 @@ The code above uses link:http://rest-assured.io/[REST Assured] to assert that th
 
 Because the test runs in a different port, we also need to include an `application.properties` in our `src/test/resources` with the following content:
 
-[source,shell]
+[source,properties]
 ----
 # Your configuration properties
 org.acme.rest.client.multipart.MultipartService/mp-rest/url=http://localhost:8081/
@@ -287,7 +278,7 @@ org.acme.rest.client.multipart.MultipartService/mp-rest/url=http://localhost:808
 
 You should see an output similar to:
 
-[source,shell]
+[source,text]
 ----
 --89d288bd-960f-460c-b266-64c5b4d170fa
 Content-Disposition: form-data; name="fileName"
@@ -302,10 +293,10 @@ HELLO WORLD
 --89d288bd-960f-460c-b266-64c5b4d170fa--
 ----
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
 == Further reading
 
- * link:https://download.eclipse.org/microprofile/microprofile-rest-client-1.2.1/microprofile-rest-client-1.2.1.html[MicroProfile Rest Client specification]
- * link:https://docs.jboss.org/resteasy/docs/4.3.1.Final/userguide/html/Multipart.html[RESTEasy Multipart Providers]
+ * link:https://download.eclipse.org/microprofile/microprofile-rest-client-1.4.1/microprofile-rest-client-1.4.1.html[MicroProfile Rest Client specification]
+ * link:https://docs.jboss.org/resteasy/docs/4.5.6.Final/userguide/html/Multipart.html[RESTEasy Multipart Provider]
diff --git a/docs/src/main/asciidoc/rest-client.adoc b/docs/src/main/asciidoc/rest-client.adoc
index 5cb611e2b2fdf..b16d5a665632e 100644
--- a/docs/src/main/asciidoc/rest-client.adoc
+++ b/docs/src/main/asciidoc/rest-client.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using the REST Client
 
@@ -34,30 +34,28 @@ The solution is located in the `rest-client-quickstart` {quickstarts-tree-url}/r
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=rest-client-quickstart \
     -DclassName="org.acme.rest.client.CountriesResource" \
     -Dpath="/country" \
-    -Dextensions="rest-client, resteasy-jsonb"
+    -Dextensions="resteasy,resteasy-jackson,rest-client,rest-client-jackson"
 cd rest-client-quickstart
 ----
 
-This command generates the Maven project with a REST endpoint and imports the `rest-client` and `resteasy-jsonb` extensions.
+This command generates the Maven project with a REST endpoint and imports:
 
-[NOTE]
-====
-If your application does not expose any JAX-RS endpoints (eg. a link:command-mode-reference[command mode application]), use the `rest-client-jsonb` or the `rest-client-jackson` extension instead.
-====
+* the `resteasy` and `resteasy-jackson` extensions for the REST server support;
+* the `rest-client` and `rest-client-jackson` extensions for the REST client support.
 
-If you already have your Quarkus project configured, you can add the `rest-client` and the `rest-client-jsonb` extensions
+If you already have your Quarkus project configured, you can add the `rest-client` and the `rest-client-jackson` extensions
 to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="rest-client,resteasy-jsonb"
+./mvnw quarkus:add-extension -Dextensions="rest-client,rest-client-jackson"
 ----
 
 This will add the following to your `pom.xml`:
@@ -70,7 +68,7 @@ This will add the following to your `pom.xml`:
 </dependency>
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-resteasy-jsonb</artifactId>
+    <artifactId>quarkus-rest-client-jackson</artifactId>
 </dependency>
 ----
 
@@ -87,6 +85,9 @@ package org.acme.rest.client;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Country {
 
     public String name;
@@ -102,7 +103,8 @@ public class Country {
 }
 ----
 
-The model above is only a subset of the fields provided by the service, but it suffices for the purposes of this guide.
+The model above is only a subset of the fields provided by the service (thus the `@JsonIgnoreProperties` annotation),
+but it suffices for the purposes of this guide.
 
 == Create the interface
 
@@ -126,7 +128,6 @@ public interface CountriesService {
 
     @GET
     @Path("/name/{name}")
-    @Produces("application/json")
     Set<Country> getByName(@PathParam String name);
 }
 ----
@@ -142,18 +143,52 @@ CDI injection as a REST Client
 
 [NOTE]
 ====
-While `@Consumes` and `@Produces` are optional as auto-negotiation is supported,
-it is heavily recommended to annotate your endpoints with them to define precisely the expected content-types.
+When a JSON extension is installed such as `quarkus-rest-client-jackson` or `quarkus-rest-client-jsonb`, Quarkus will use the `application/json` media type
+by default for most return values, unless the media type is explicitly set via
+`@Produces` or `@Consumes` annotations (there are some exceptions for well known types, such as `String` and `File`, which default to `text/plain` and `application/octet-stream`
+respectively).
+
+If you don't want JSON by default you can set `quarkus.resteasy-json.default-json=false` and the default will change back to being auto-negotiated. If you set this
+you will need to add `@Produces(MediaType.APPLICATION_JSON)` and `@Consumes(MediaType.APPLICATION_JSON)` to your endpoints in order to use JSON.
 
+If you don't rely on the JSON default, it is heavily recommended to annotate your endpoints with the `@Produces` and `@Consumes` annotations to define precisely the expected content-types.
 It will allow to narrow down the number of JAX-RS providers (which can be seen as converters) included in the native executable.
 ====
 
+=== Query Parameters
+
+If the GET request requires query parameters you can leverage the `@QueryParam("parameter-name")` annotation instead of (or in addition to) the `@PathParam`. Path and query parameters can be combined, as required, as illustrated in a mock example below.
+
+[source, java]
+----
+package org.acme.rest.client;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+import org.jboss.resteasy.annotations.jaxrs.QueryParam;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.Set;
+
+@Path("/v2")
+@RegisterRestClient
+public interface CountriesService {
+
+    @GET
+    @Path("/name/{region}")
+    Set<Country> getByRegion(@PathParam String region, @QueryParam("city") String city);
+}
+----
+
+
 == Create the configuration
 
 In order to determine the base URL to which REST calls will be made, the REST Client uses configuration from `application.properties`.
 The name of the property needs to follow a certain convention which is best displayed in the following code:
 
-[source,shell]
+[source,properties]
 ----
 # Your configuration properties
 org.acme.rest.client.CountriesService/mp-rest/url=https://restcountries.eu/rest # // <1>
@@ -185,6 +220,16 @@ country-api/mp-rest/url=https://restcountries.eu/rest #
 country-api/mp-rest/scope=javax.inject.Singleton # /
 ----
 
+
+=== Disabling Hostname Verification
+
+To disable the SSL hostname verification for a specific REST client, add the following property to your configuration:
+
+[source,properties]
+----
+country-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier
+----
+
 == Update the JAX-RS resource
 
 Open the `src/main/java/org/acme/rest/client/CountriesResource.java` file and update it with the following content:
@@ -211,7 +256,6 @@ public class CountriesResource {
 
     @GET
     @Path("/name/{name}")
-    @Produces(MediaType.APPLICATION_JSON)
     public Set<Country> name(@PathParam String name) {
         return countriesService.getByName(name);
     }
@@ -261,7 +305,7 @@ The code above uses link:http://rest-assured.io/[REST Assured]'s link:https://gi
 
 == Async Support
 The rest client supports asynchronous rest calls.
-Async support comes in 2 flavors: you can return a `CompletionStage` or a `Uni` (requires the `quarkus-resteasy-mutiny` extension).
+Async support comes in 2 flavors: you can return a `CompletionStage` or a `Uni` (requires the `quarkus-rest-client-mutiny` extension).
 Let's see it in action by adding a `getByNameAsync` method in our `CountriesService` REST interface. The code should look like:
 
 [source, java]
@@ -320,14 +364,12 @@ public class CountriesResource {
 
     @GET
     @Path("/name/{name}")
-    @Produces(MediaType.APPLICATION_JSON)
     public Set<Country> name(@PathParam String name) {
         return countriesService.getByName(name);
     }
 
     @GET
     @Path("/name-async/{name}")
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<Set<Country>> nameAsync(@PathParam String name) {
         return countriesService.getByNameAsync(name);
     }
@@ -409,7 +451,6 @@ public class CountriesResource {
 
     @GET
     @Path("/name-uni/{name}")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<Set<Country>> nameAsync(@PathParam String name) {
         return countriesService.getByNameAsUni(name);
     }
@@ -441,6 +482,68 @@ If you use a `CompletionStage`, you would need to call the service's method to r
 This difference comes from the laziness aspect of Mutiny and its subscription protocol.
 More details about this can be found in https://smallrye.io/smallrye-mutiny/#_uni_and_multi[the Mutiny documentation].
 
+== Custom headers support
+The MicroProfile REST client allows amending request headers by registering a `ClientHeadersFactory` with the `@RegisterClientHeaders` annotation.
+
+Let's see it in action by adding a `@RegisterClientHeaders` annotation pointing to a `RequestUUIDHeaderFactory` class in our `CountriesService` REST interface:
+
+[source, java]
+----
+package org.acme.rest.client;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.concurrent.CompletionStage;
+import java.util.Set;
+
+@Path("/v2")
+@RegisterRestClient
+@RegisterClientHeaders(RequestUUIDHeaderFactory.class)
+public interface CountriesService {
+
+    @GET
+    @Path("/name/{name}")
+    @Produces("application/json")
+    Set<Country> getByName(@PathParam String name);
+
+    @GET
+    @Path("/name/{name}")
+    @Produces("application/json")
+    CompletionStage<Set<Country>> getByNameAsync(@PathParam String name);
+}
+----
+
+And the `RequestUUIDHeaderFactory` would look like:
+
+[source, java]
+----
+package org.acme.rest.client;
+
+import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
+import org.jboss.resteasy.specimpl.MultivaluedMapImpl;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.core.MultivaluedMap;
+import java.util.UUID;
+
+@ApplicationScoped
+public class RequestUUIDHeaderFactory implements ClientHeadersFactory {
+
+    @Override
+    public MultivaluedMap<String, String> update(MultivaluedMap<String, String> incomingHeaders, MultivaluedMap<String, String> clientOutgoingHeaders) {
+        MultivaluedMap<String, String> result = new MultivaluedMapImpl<>();
+        result.add("X-request-uuid", UUID.randomUUID().toString());
+        return result;
+    }
+}
+----
+
+Any CDI bean matching the declared factory class will be picked up and can of course benefit from the usual CDI infrastructure.
+
 == Package and run the application
 
 Run the application with: `./mvnw compile quarkus:dev`.
@@ -448,9 +551,22 @@ Open your browser to http://localhost:8080/country/name/greece.
 
 You should see a JSON object containing some basic information about Greece.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
+== REST Client and RESTEasy interactions
+
+In Quarkus, the REST Client extension and link:rest-json[the RESTEasy extension] share the same infrastructure.
+One important consequence of this consideration is that they share the same list of providers (in the JAX-RS meaning of the word).
+
+For instance, if you declare a `WriterInterceptor`, it will by default intercept both the servers calls and the client calls,
+which might not be the desired behavior.
+
+However, you can change this default behavior and constrain a provider to:
+
+* only consider *client* calls by adding the `@ConstrainedTo(RuntimeType.CLIENT)` annotation to your provider;
+* only consider *server* calls by adding the `@ConstrainedTo(RuntimeType.SERVER)` annotation to your provider.
+
 == Using a Mock HTTP Server for tests
 
 Setting up a mock HTTP server, against which tests are run, is a common testing pattern.
diff --git a/docs/src/main/asciidoc/rest-data-panache.adoc b/docs/src/main/asciidoc/rest-data-panache.adoc
index ce279c9fa70e6..7b9fface7e183 100644
--- a/docs/src/main/asciidoc/rest-data-panache.adoc
+++ b/docs/src/main/asciidoc/rest-data-panache.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Generating JAX-RS resources with Panache
 
@@ -12,13 +12,13 @@ A lot of web applications are monotonous CRUD applications with REST APIs that a
 To streamline this task, REST Data with Panache extension can generate the basic CRUD endpoints for your entities and repositories.
 
 While this extension is still experimental and provides a limited feature set, we hope to get an early feedback for it.
-Currently this extension supports Hibernate ORM with Panache and can generate CRUD resources that work with `application/json` and `application/hal+json` content.
+Currently this extension supports Hibernate ORM and MongoDB with Panache and can generate CRUD resources that work with `application/json` and `application/hal+json` content.
 
 include::./status-include.adoc[]
 
 == Setting up REST Data with Panache
 
-To begin with:
+=== Hibernate ORM
 
 * Add the required dependencies to your `pom.xml`
 ** Hibernate ORM REST Data with Panache extension (`quarkus-hibernate-orm-rest-data-panache`)
@@ -44,12 +44,35 @@ To begin with:
 ----
 
 * Implement the Panache entities and/or repositories as explained in the link:hibernate-orm-panache[Hibernate ORM with Panache guide].
-* Define the interfaces for generation as explained in the sections below.
+* Define the interfaces for generation as explained in the resource generation section.
+
+=== MongoDB
+
+* Add the required dependencies to your `pom.xml`
+** MongoDB REST Data with Panache extension (`quarkus-mongodb-rest-data-panache`)
+** One of the RESTEasy JSON serialization extensions (`quarkus-resteasy-jackson` or `quarkus-resteasy-jsonb`)
+
+[source,xml]
+----
+<dependencies>
+    <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-mongodb-rest-data-panache</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-resteasy-jackson</artifactId>
+    </dependency>
+</dependencies>
+----
+
+* Implement the Panache entities and/or repositories as explained in the link:mongodb-panache[MongoDB with Panache guide].
+* Define the interfaces for generation as explained in the resource generation section.
 
 == Generating resources
 
 REST Data with Panache generates JAX-RS resources based on the interfaces available in your application.
-For each entity and repository that you want to generate, provide an interface that extends either `PanacheEntityResource` or `PanacheRepositoryResource` interface.
+For each entity and repository that you want to generate, provide a resource interface.
 _Do not implement these interfaces and don't provide custom methods because they will be ignored._ You can, however, override the methods from the extended interface in order to customize them (see the section at the end).
 
 === PanacheEntityResource
@@ -72,52 +95,92 @@ public interface PeopleResource extends PanacheRepositoryResource<PersonReposito
 }
 ----
 
+=== PanacheMongoEntityResource
+
+If your application has an entity (e.g. `Person`) that extends either `PanacheMongoEntity` or `PanacheMongoEntityBase` class, you could instruct REST Data with Panache to generate its JAX-RS resource with the following interface:
+
+[source,java]
+----
+public interface PeopleResource extends PanacheMongoEntityResource<Person, Long> {
+}
+----
+
+=== PanacheMongoRepositoryResource
+
+If your application has a simple entity (e.g. `Person`) and a repository (e.g. `PersonRepository`) that implements either `PanacheMongoRepository` or `PanacheMongoRepositoryBase` interface, you could instruct REST Data with Panache to generate its JAX-RS resource with the following interface:
+
+[source,java]
+----
+public interface PeopleResource extends PanacheMongoRepositoryResource<PersonRepository, Person, Long> {
+}
+----
+
 === The generated resource
 
 The generated resources will be functionally equivalent for both entities and repositories.
-The only difference being the particular data access pattern in use.
+The only difference being the particular data access pattern and data storage in use.
 
-If you have defined one of the `PeopleResource` interfaces mentioned above, REST Data with Panache will generate a JAX-RS resource similar to this:
+If you have defined one of the `PeopleResource` interfaces mentioned above, this extension will generate its implementation using a particular data access strategy.
+The implemented class then will be used by a generated JAX-RS resource, which will look like this:
 
 [source,java]
 ----
-@Path("/people") // Default path is a hyphenated lowercase resource name without a suffix of `resource` or `controller`.
-public class PeopleResourceImpl implements PeopleResource { // The actual class name is going to be unique
+public class PeopleResourceJaxRs { // The actual class name is going to be unique
+    @Inject
+    PeopleResource resource;
+
     @GET
-    @Produces("application/json")
     @Path("{id}")
+    @Produces("application/json")
     public Person get(@PathParam("id") Long id){
-        // ...
+        Person person = resource.get(id);
+        if (person == null) {
+            throw new WebApplicationException(404);
+        }
+        return person;
     }
 
     @GET
     @Produces("application/json")
-    public Response list(){
-        // ...
+    public Response list(@QueryParam("sort") List<String> sortQuery,
+            @QueryParam("page") @DefaultValue("0") int pageIndex,
+            @QueryParam("size") @DefaultValue("20") int pageSize) {
+        Page page = Page.of(pageIndex, pageSize);
+        Sort sort = getSortFromQuery(sortQuery);
+        List<Person> people = resource.list(page, sort);
+        // ... build a response with page links and return a 200 response with a list
     }
 
     @Transactional
     @POST
     @Consumes("application/json")
     @Produces("application/json")
-    public Response add(Person entity) {
-        // ..
+    public Response add(Person personToSave) {
+        Person person = resource.add(person);
+        // ... build a new location URL and return 201 response with an entity
     }
 
     @Transactional
     @PUT
+    @Path("{id}")
     @Consumes("application/json")
     @Produces("application/json")
-    @Path("{id}")
-    public Response update(@PathParam("id") Long id, Person person) {
-        // ..
+    public Response update(@PathParam("id") Long id, Person personToSave) {
+        if (resource.get(id) == null) {
+            Person person = resource.update(id, personToSave);
+            return Response.status(204).build();
+        }
+        Person person = resource.update(id, personToSave);
+        // ... build a new location URL and return 201 response with an entity
     }
 
     @Transactional
     @DELETE
     @Path("{id}")
     public void delete(@PathParam("id") Long id) {
-        // ..
+        if (!resource.delete(id)) {
+            throw new WebApplicationException(404);
+        }
     }
 }
 ----
@@ -132,10 +195,10 @@ It can be used in your resource interface:
 @ResourceProperties(hal = true, path = "my-people")
 public interface PeopleResource extends PanacheEntityResource<Person, Long> {
     @MethodProperties(path = "all")
-    Response list();
+    List<Person> list(Page page, Sort sort);
 
     @MethodProperties(exposed = false)
-    void delete(Long id);
+    boolean delete(Long id);
 }
 ----
 
@@ -143,19 +206,33 @@ public interface PeopleResource extends PanacheEntityResource<Person, Long> {
 
 `@ResourceProperties`
 
-* `hal` - in addition to the standard `application/json` responses, generates additional methods that can return `application/hal+json` responses if requested via an `Accept` header.
-Default is `false`.
+* `exposed` - whether resource could be exposed. A global resource property that can be overridden for each method. Default is `true`.
 * `path` - resource base path. Default path is a hyphenated lowercase resource name without a suffix of `resource` or `controller`.
 * `paged` - whether collection responses should be paged or not.
 First, last, previous and next page URIs are included in the response headers if they exist.
 Request page index and size are taken from the `page` and `size` query parameters that default to `0` and `20` respectively.
 Default is `true`.
+* `hal` - in addition to the standard `application/json` responses, generates additional methods that can return `application/hal+json` responses if requested via an `Accept` header.
+Default is `false`.
+* `halCollectionName` - name that should be used when generating a hal collection response. Default name is a hyphenated lowercase resource name without a suffix of `resource` or `controller`.
 
 `@MethodProperties`
 
 * `exposed` - does not expose a particular HTTP verb when set to `false`. Default is `true`.
 * `path` - operation path (this is appended to the resource base path). Default is an empty string.
 
+== Query parameters
+
+REST Data with Panache supports the following query parameters with the generated resources.
+
+* `page` - a page number which should be returned by a list operation.
+It applies to the paged resources only and is a number starting with 0. Default is 0.
+* `size` - a page size which should be returned by a list operation.
+It applies to the paged resources only and is a number starting with 1. Default is 20.
+* `sort` - a comma separated list of fields which should be used for sorting a result of a list operation.
+Fields are sorted in the ascending order unless they're prefixed with a `-`.
+E.g. `?sort=name,-age` will sort the result by the name ascending by the age descending.
+
 == Response body examples
 
 As mentioned above REST Data with Panache supports the `application/json` and `application/hal+json` response content types.
@@ -183,11 +260,21 @@ Here are a couple of examples of how a response body would look like for the `ge
   "name": "John Johnson",
   "birth": "1988-01-10",
   "_links": {
-    "self": "http://example.com/people/1",
-    "remove": "http://example.com/people/1",
-    "update": "http://example.com/people/1",
-    "add": "http://example.com/people",
-    "list": "http://example.com/people"
+    "self": {
+      "href": "http://example.com/people/1"
+    },
+    "remove": {
+      "href": "http://example.com/people/1"
+    },
+    "update": {
+      "href": "http://example.com/people/1"
+    },
+    "add": {
+      "href": "http://example.com/people"
+    },
+    "list": {
+      "href": "http://example.com/people"
+    }
   }
 }
 ----
@@ -224,11 +311,21 @@ Here are a couple of examples of how a response body would look like for the `ge
       "name": "John Johnson",
       "birth": "1988-01-10",
       "_links": {
-        "self": "http://example.com/people/1",
-        "remove": "http://example.com/people/1",
-        "update": "http://example.com/people/1",
-        "add": "http://example.com/people",
-        "list": "http://example.com/people"
+        "self": {
+          "href": "http://example.com/people/1"
+        },
+        "remove": {
+          "href": "http://example.com/people/1"
+        },
+        "update": {
+          "href": "http://example.com/people/1"
+        },
+        "add": {
+          "href": "http://example.com/people"
+        },
+        "list": {
+          "href": "http://example.com/people"
+        }
       }
     },
     {
@@ -236,20 +333,40 @@ Here are a couple of examples of how a response body would look like for the `ge
       "name": "Peter Peterson",
       "birth": "1986-11-20",
       "_links": {
-        "self": "http://example.com/people/2",
-        "remove": "http://example.com/people/2",
-        "update": "http://example.com/people/2",
-        "add": "http://example.com/people",
-        "list": "http://example.com/people"
+        "self": {
+          "href": "http://example.com/people/2"
+        },
+        "remove": {
+          "href": "http://example.com/people/2"
+        },
+        "update": {
+          "href": "http://example.com/people/2"
+        },
+        "add": {
+          "href": "http://example.com/people"
+        },
+        "list": {
+          "href": "http://example.com/people"
+        }
       }
     }
   ],
   "_links": {
-    "add": "http://example.com/people",
-    "list": "http://example.com/people",
-    "first": "http://example.com/people?page=0&size=2",
-    "last": "http://example.com/people?page=2&size=2",
-    "next": "http://example.com/people?page=1&size=2"
+    "add": {
+      "href": "http://example.com/people"
+    },
+    "list": {
+      "href": "http://example.com/people"
+    },
+    "first": {
+      "href": "http://example.com/people?page=0&size=2"
+    },
+    "last": {
+      "href": "http://example.com/people?page=2&size=2"
+    },
+    "next": {
+      "href": "http://example.com/people?page=1&size=2"
+    }
   }
 }
 ----
diff --git a/docs/src/main/asciidoc/rest-json.adoc b/docs/src/main/asciidoc/rest-json.adoc
index 423afc4905304..64f81c91bc295 100644
--- a/docs/src/main/asciidoc/rest-json.adoc
+++ b/docs/src/main/asciidoc/rest-json.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Writing JSON REST Services
 
@@ -41,54 +41,57 @@ The solution is located in the `rest-json-quickstart` {quickstarts-tree-url}/res
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=rest-json-quickstart \
     -DclassName="org.acme.rest.json.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jsonb"
+    -Dextensions="resteasy,resteasy-jackson"
 cd rest-json-quickstart
 ----
 
-This command generates a Maven structure importing the RESTEasy/JAX-RS and http://json-b.net/[JSON-B] extensions,
+This command generates a Maven structure importing the RESTEasy/JAX-RS and https://github.com/FasterXML/jackson[Jackson] extensions,
 and in particular adds the following dependency:
 
 [source,xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-resteasy-jsonb</artifactId>
+    <artifactId>quarkus-resteasy-jackson</artifactId>
 </dependency>
 ----
 
-Quarkus also supports https://github.com/FasterXML/jackson[Jackson] so, if you prefer Jackson over JSON-B, you can create a project relying on the RESTEasy Jackson extension instead:
+[NOTE]
+====
+To improve user experience, Quarkus registers the three Jackson https://github.com/FasterXML/jackson-modules-java8[Java 8 modules] so you don't need to do it manually.
+====
+
+Quarkus also supports http://json-b.net/[JSON-B] so, if you prefer JSON-B over Jackson, you can create a project relying on the RESTEasy JSON-B extension instead:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=rest-json-quickstart \
     -DclassName="org.acme.rest.json.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jackson"
+    -Dextensions="resteasy-jsonb"
 cd rest-json-quickstart
 ----
 
-This command generates a Maven structure importing the RESTEasy/JAX-RS and https://github.com/FasterXML/jackson[Jackson] extensions,
+This command generates a Maven structure importing the RESTEasy/JAX-RS and http://json-b.net/[JSON-B] extensions,
 and in particular adds the following dependency:
 
 [source,xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-resteasy-jackson</artifactId>
+    <artifactId>quarkus-resteasy-jsonb</artifactId>
 </dependency>
 ----
 
-To improve user experience, Quarkus registers the three Jackson https://github.com/FasterXML/jackson-modules-java8[Java 8 modules] so you don't need to do it manually.
-
 == Creating your first JSON REST service
 
 In this example, we will create an application to manage a list of fruits.
@@ -126,17 +129,12 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Set;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
 
     private Set<Fruit> fruits = Collections.newSetFromMap(Collections.synchronizedMap(new LinkedHashMap<>()));
@@ -172,17 +170,90 @@ depending on the extension you chose when initializing the project.
 
 [NOTE]
 ====
-While RESTEasy supports auto-negotiation, when using Quarkus, it is very important to define the `@Produces` and `@Consumes` annotations.
-They are analyzed at build time and Quarkus restricts the number of JAX-RS providers included in the native executable to the minimum required by the application.
-It allows to reduce the size of the native executable.
+When a JSON extension is installed such as `quarkus-resteasy-jackson` or `quarkus-resteasy-jsonb`, Quarkus will use the `application/json` media type
+by default for most return values, unless the media type is explicitly set via
+`@Produces` or `@Consumes` annotations (there are some exceptions for well known types, such as `String` and `File`, which default to `text/plain` and `application/octet-stream`
+respectively).
+
+If you don't want JSON by default you can set `quarkus.resteasy-json.default-json=false` and the default will change back to being auto-negotiated. If you set this
+you will need to add `@Produces(MediaType.APPLICATION_JSON)` and `@Consumes(MediaType.APPLICATION_JSON)` to your endpoints in order to use JSON.
+
+If you don't rely on the JSON default, it is heavily recommended to annotate your endpoints with the `@Produces` and `@Consumes` annotations to define precisely the expected content-types.
+It will allow to narrow down the number of JAX-RS providers (which can be seen as converters) included in the native executable.
 ====
 
 === Configuring JSON support
 
+==== Jackson
+
+In Quarkus, the default Jackson `ObjectMapper` obtained via CDI (and consumed by the Quarkus extensions) is configured to ignore unknown properties
+(by disabling the `DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES` feature).
+
+You can restore the default behavior of Jackson by setting `quarkus.jackson.fail-on-unknown-properties=true` in your `application.properties`
+or on a per class basis via `@JsonIgnoreProperties(ignoreUnknown = false)`.
+
+Furthermore, the `ObjectMapper` is configured to format dates and time in ISO-8601
+(by disabling the `SerializationFeature.WRITE_DATES_AS_TIMESTAMPS` feature).
+
+The default behaviour of Jackson can be restored by setting `quarkus.jackson.write-dates-as-timestamps=true`
+in your `application.properties`. If you want to change the format for a single field, you can use the
+`@JsonFormat` annotation.
+
+Also, Quarkus makes it very easy to configure various Jackson settings via CDI beans.
+The simplest (and suggested) approach is to define a CDI bean of type `io.quarkus.jackson.ObjectMapperCustomizer`
+inside of which any Jackson configuration can be applied.
+
+An example where a custom module needs to be registered would look like so:
+
+[source,java]
+----
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.quarkus.jackson.ObjectMapperCustomizer;
+import javax.inject.Singleton;
+
+@Singleton
+public class RegisterCustomModuleCustomizer implements ObjectMapperCustomizer {
+
+    public void customize(ObjectMapper mapper) {
+        mapper.registerModule(new CustomModule());
+    }
+}
+----
+
+Users can even provide their own `ObjectMapper` bean if they so choose.
+If this is done, it is very important to manually inject and apply all `io.quarkus.jackson.ObjectMapperCustomizer` beans in the CDI producer that produces `ObjectMapper`.
+Failure to do so will prevent Jackson specific customizations provided by various extensions from being applied. 
+
+[source,java]
+----
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.quarkus.jackson.ObjectMapperCustomizer;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Singleton;
+
+public class CustomObjectMapper {
+
+    // Replaces the CDI producer for ObjectMapper built into Quarkus
+    @Singleton
+    ObjectMapper objectMapper(Instance<ObjectMapperCustomizer> customizers) {
+        ObjectMapper mapper = myObjectMapper(); // Custom `ObjectMapper`
+
+        // Apply all ObjectMapperCustomerizer beans (incl. Quarkus)
+        for (ObjectMapperCustomizer customizer : customizers) {
+            customizer.customize(mapper);
+        }
+
+        return mapper;
+    }
+}
+----
+
 ==== JSON-B
 
-Quarkus makes it very easy to configure various JSON-B settings via CDI beans. The simplest (and suggested) approach is to define a CDI bean of type `io.quarkus.jsonb.JsonbConfigCustomizer`
-inside of which any JSON-B configuration can be applied.
+As stated above, Quarkus provides the option of using JSON-B instead of Jackson via the use of the `quarkus-resteasy-jsonb` extension.
+
+Following the same approach as described in the previous section, JSON-B can be configured using a `io.quarkus.jsonb.JsonbConfigCustomizer` bean.
 
 If for example a custom serializer named `FooSerializer` for type `com.example.Foo` needs to be registered with JSON-B, the addition of a bean like the following would suffice:
 
@@ -206,31 +277,31 @@ A more advanced option would be to directly provide a bean of `javax.json.bind.J
 If the latter approach is leveraged it is very important to manually inject and apply all `io.quarkus.jsonb.JsonbConfigCustomizer` beans in the CDI producer that produces `javax.json.bind.Jsonb`.
 Failure to do so will prevent JSON-B specific customizations provided by various extensions from being applied.
 
-==== Jackson
+[source,java]
+----
+import io.quarkus.jsonb.JsonbConfigCustomizer;
 
-As stated above, Quarkus provides the option of using https://github.com/FasterXML/jackson[Jackson] instead of JSON-B via the use of the `quarkus-resteasy-jackson` extension.
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Instance;
+import javax.json.bind.JsonbConfig;
 
-Following the same approach as described in the previous section, Jackson's `ObjectMapper` can be configured using a `io.quarkus.jackson.ObjectMapperCustomizer` bean.
-An example where a custom module needs to be registered would like so:
+public class CustomJsonbConfig {
 
-[source,java]
-----
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.quarkus.jackson.ObjectMapperCustomizer;
-import javax.inject.Singleton;
+    // Replaces the CDI producer for JsonbConfig built into Quarkus
+    @Dependent
+    JsonbConfig jsonConfig(Instance<JsonbConfigCustomizer> customizers) {
+        JsonbConfig config = myJsonbConfig(); // Custom `JsonbConfig`
 
-@Singleton
-public class RegisterCustomModuleCustomizer implements ObjectMapperCustomizer {
+        // Apply all JsonbConfigCustomizer beans (incl. Quarkus)
+        for (JsonbConfigCustomizer customizer : customizers) {
+            customizer.customize(config);
+        }
 
-    public void customize(ObjectMapper mapper) {
-        mapper.registerModule(new CustomModule());
+        return config;
     }
 }
 ----
 
-Users can even provide their own `ObjectMapper` bean if they so choose.
-If this is done, it is very important to manually inject and apply all `io.quarkus.jackson.ObjectMapperCustomizer` beans in the CDI producer that produces `ObjectMapper`.
-Failure to do so will prevent Jackson specific customizations provided by various extensions from being applied.
 
 == Creating a frontend
 
@@ -248,7 +319,7 @@ You can now interact with your REST service:
 
 You can build a native executable with the usual command `./mvnw package -Pnative`.
 
-Running it is as simple as executing `./target/rest-json-quickstart-1.0-SNAPSHOT-runner`.
+Running it is as simple as executing `./target/rest-json-quickstart-1.0.0-SNAPSHOT-runner`.
 
 You can then point your browser to `http://localhost:8080/fruits.html` and use your application.
 
@@ -266,7 +337,6 @@ When you have the following REST method, Quarkus determines that `Fruit` will be
 [source,JAVA]
 ----
 @GET
-@Produces("application/json")
 public List<Fruit> list() {
     // ...
 }
@@ -286,7 +356,6 @@ Your REST method then looks like this:
 [source,JAVA]
 ----
 @GET
-@Produces("application/json")
 public Response list() {
     // ...
 }
@@ -367,7 +436,7 @@ Open a browser to http://localhost:8080/legumes.html and you will see our list o
 The interesting part starts when running the application as a native executable:
 
  * create the native executable with `./mvnw package -Pnative`.
- * execute it with `./target/rest-json-quickstart-1.0-SNAPSHOT-runner`
+ * execute it with `./target/rest-json-quickstart-1.0.0-SNAPSHOT-runner`
  * open a browser and go to http://localhost:8080/legumes.html
 
 No legumes there.
@@ -398,7 +467,7 @@ Let's do that and follow the same steps as before:
 
  * hit `Ctrl+C` to stop the application
  * create the native executable with `./mvnw package -Pnative`.
- * execute it with `./target/rest-json-quickstart-1.0-SNAPSHOT-runner`
+ * execute it with `./target/rest-json-quickstart-1.0.0-SNAPSHOT-runner`
  * open a browser and go to http://localhost:8080/legumes.html
 
 This time, you can see our list of legumes.
@@ -492,7 +561,7 @@ public class LoggingFilter implements ContainerRequestFilter {
 
 Now, whenever a REST method is invoked, the request will be logged into the console:
 
-[source,shell]
+[source,text]
 ----
 2019-06-05 12:44:26,526 INFO  [org.acm.res.jso.LoggingFilter] (executor-thread-1) Request GET /legumes from IP 127.0.0.1
 2019-06-05 12:49:19,623 INFO  [org.acm.res.jso.LoggingFilter] (executor-thread-1) Request GET /fruits from IP 0:0:0:0:0:0:0:1
@@ -523,26 +592,69 @@ quarkus.resteasy.gzip.max-input=10M // <2>
 <2> Configure the upper limit on deflated request body. This is useful to mitigate potential attacks by limiting their reach. The default value is `10M`.
 This configuration option would recognize strings in this format (shown as a regular expression): `[0-9]+[KkMmGgTtPpEeZzYy]?`. If no suffix is given, assume bytes.
 
+Once GZip support has been enabled you can use it on an endpoint by adding the `@org.jboss.resteasy.annotations.GZIP` annotation to your endpoint method.
+
+If you want to compress everything then we recommended that you use the `quarkus.http.enable-compression=true` setting instead to globally enable
+compression support.
+
+== Multipart Support
+
+RESTEasy supports multipart via the https://docs.jboss.org/resteasy/docs/4.5.6.Final/userguide/html/Multipart.html[RESTEasy Multipart Provider].
+
+Quarkus provides an extension called `quarkus-resteasy-multipart` to make things easier for you.
+
+This extension slightly differs from the RESTEasy default behavior as the default charset (if none is specified in your request) is UTF-8 rather than US-ASCII.
+
+You can configure this behavior with the following configuration properties:
+
+include::{generated-dir}/config/quarkus-resteasy-multipart.adoc[leveloffset=+1, opts=optional]
+
 == Servlet compatibility
 
 In Quarkus, RESTEasy can either run directly on top of the Vert.x HTTP server, or on top of Undertow if you have any servlet dependency.
 
 As a result, certain classes, such as `HttpServletRequest` are not always available for injection. Most use-cases for this particular
 class are covered by JAX-RS equivalents, except for getting the remote client's IP. RESTEasy comes with a replacement API which you can inject:
-https://docs.jboss.org/resteasy/docs/4.4.2.Final/javadocs/org/jboss/resteasy/spi/HttpRequest.html[`HttpRequest`], which has the methods
-https://docs.jboss.org/resteasy/docs/4.4.2.Final/javadocs/org/jboss/resteasy/spi/HttpRequest.html#getRemoteAddress--[`getRemoteAddress()`]
-and https://docs.jboss.org/resteasy/docs/4.4.2.Final/javadocs/org/jboss/resteasy/spi/HttpRequest.html#getRemoteHost--[`getRemoteHost()`]
+https://docs.jboss.org/resteasy/docs/4.5.6.Final/javadocs/org/jboss/resteasy/spi/HttpRequest.html[`HttpRequest`], which has the methods
+https://docs.jboss.org/resteasy/docs/4.5.6.Final/javadocs/org/jboss/resteasy/spi/HttpRequest.html#getRemoteAddress--[`getRemoteAddress()`]
+and https://docs.jboss.org/resteasy/docs/4.5.6.Final/javadocs/org/jboss/resteasy/spi/HttpRequest.html#getRemoteHost--[`getRemoteHost()`]
 to solve this problem.
 
+== RESTEasy and REST Client interactions
+
+In Quarkus, the RESTEasy extension and link:rest-client[the REST Client extension] share the same infrastructure.
+One important consequence of this consideration is that they share the same list of providers (in the JAX-RS meaning of the word).
+
+For instance, if you declare a `WriterInterceptor`, it will by default intercept both the servers calls and the client calls,
+which might not be the desired behavior.
+
+However, you can change this default behavior and constrain a provider to:
+
+* only consider *server* calls by adding the `@ConstrainedTo(RuntimeType.SERVER)` annotation to your provider;
+* only consider *client* calls by adding the `@ConstrainedTo(RuntimeType.CLIENT)` annotation to your provider.
+
 == What's Different from Jakarta EE Development
 
 === No Need for `Application` Class
 
 Configuration via an application-supplied subclass of `Application` is supported, but not required.
 
+=== Only a single JAX-RS application
+
+In contrast to JAX-RS (and RESTeasy) running in a standard servlet-container, Quarkus only supports the deployment of a single JAX-RS application.
+If multiple JAX-RS `Application` classes are defined, the build will fail with the message `Multiple classes have been annotated with @ApplicationPath which is currently not supported`.
+
+If multiple JAX-RS applications are defined, the property `quarkus.resteasy.ignoreApplicationClasses=true` can be used to ignore all explicit `Application` classes. This makes all resource-classes available via the application-path as defined by `quarkus.resteasy.path` (default: `/`).
+
+=== Support limitations of JAX-RS application
+
+The RESTEasy extension doesn't support the method `getProperties()` of the class `javax.ws.rs.core.Application`. Moreover, it only relies on the methods `getClasses()` and `getSingletons()` to filter out the annotated resource, provider and feature classes.
+It doesn't filter out the built-in resource, provider and feature classes and also the resource, provider and feature classes registered by the other extensions.
+Finally the objects returned by the method `getSingletons()` are ignored, only the classes are took into account to filter out the resource, provider and feature classes, in other words the method `getSingletons()` is actually managed the same way as `getClasses()`.
+
 === Lifecycle of Resources
 
-In Quarkus all JAX-RS resources are treated as CDI beans. 
+In Quarkus all JAX-RS resources are treated as CDI beans.
 It's possible to inject other beans via `@Inject`, bind interceptors using bindings such as `@Transactional`, define `@PostConstruct` callbacks, etc.
 
 If there is no scope annotation declared on the resource class then the scope is defaulted.
@@ -551,6 +663,28 @@ If set to `true` (default) then a *single instance* of a resource class is creat
 If set to `false` then a *new instance* of the resource class is created per each request.
 An explicit CDI scope annotation (`@RequestScoped`, `@ApplicationScoped`, etc.) always overrides the default behavior and specifies the lifecycle of resource instances.
 
+== Include/Exclude JAX-RS classes with build time conditions
+
+Quarkus enables the inclusion or exclusion of JAX-RS Resources, Providers and Features directly thanks to build time conditions in the same that it does for CDI beans.
+Thus, the various JAX-RS classes can be annotated with profile conditions (`@io.quarkus.arc.profile.IfBuildProfile` or `@io.quarkus.arc.profile.UnlessBuildProfile`) and/or with property conditions (`io.quarkus.arc.properties.IfBuildProperty` or `io.quarkus.arc.properties.UnlessBuildProperty`) to indicate to Quarkus at build time under which conditions these JAX-RS classes should be included.
+
+In the following example, Quarkus includes the endpoint `sayHello` if and only if the build profile `app1` has been enabled.
+
+[source,java]
+----
+@IfBuildProfile("app1")
+public class ResourceForApp1Only {
+
+    @GET
+    @Path("sayHello")
+    public String sayHello() {
+        return "hello";
+     }
+}
+----
+
+Please note that if a JAX-RS Application has been detected and the method `getClasses()` and/or `getSingletons()` has/have been overridden, Quarkus will ignore the build time conditions and consider only what has been defined in the JAX-RS Application.
+
 == Conclusion
 
 Creating JSON REST services with Quarkus is easy as it relies on proven and well known technologies.
diff --git a/docs/src/main/asciidoc/resteasy-reactive.adoc b/docs/src/main/asciidoc/resteasy-reactive.adoc
new file mode 100644
index 0000000000000..15d7ed851f6ae
--- /dev/null
+++ b/docs/src/main/asciidoc/resteasy-reactive.adoc
@@ -0,0 +1,1830 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Writing REST Services with RESTEasy Reactive
+
+include::./attributes.adoc[]
+:jaxrsapi: https://javadoc.io/doc/javax.ws.rs/javax.ws.rs-api/2.1.1
+:jaxrsspec: /specs/jaxrs/2.1/index.html
+:jdkapi: https://docs.oracle.com/en/java/javase/11/docs/api/java.base
+:mutinyapi: https://smallrye.io/smallrye-mutiny/apidocs
+:httpspec: https://tools.ietf.org/html/rfc7231
+:jsonpapi: https://javadoc.io/doc/javax.json/javax.json-api/1.1.4
+:vertxapi: https://javadoc.io/static/io.vertx/vertx-core/3.9.4
+
+This guide explains how to write REST Services with RESTEasy Reactive in Quarkus.
+
+== What is RESTEasy Reactive?
+
+RESTEasy Reactive is a new link:{jaxrsspec}[JAX-RS]
+implementation written from the ground up to work on our
+common https://vertx.io/[Vert.x] layer and is thus fully reactive, while also being very tightly integrated with
+Quarkus and consequently moving a lot of work to build time.
+
+You should be able to use it in place of any JAX-RS implementation, but on top of that it has
+great performance for both blocking and non-blocking endpoints, and a lot of new features on top
+of what JAX-RS provides.
+
+== Writing endpoints
+
+=== Getting started
+
+Add the following import to your `pom.xml` file:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-resteasy-reactive</artifactId>
+</dependency>
+----
+
+You can now write your first endpoint in the `org.acme.rest.Endpoint` class:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("")
+public class Endpoint {
+
+    @GET
+    public String hello(){
+        return "Hello, World!";
+    }
+}
+----
+
+=== Terminology
+
+REST:: https://en.wikipedia.org/wiki/Representational_state_transfer[REpresentational State Transfer]
+Endpoint:: Java method which is called to serve a REST call
+URL / URI (Uniform Resource Locator / Identifier):: Used to identify the location of REST resources (https://tools.ietf.org/html/rfc7230#section-2.7[specification])
+Resource:: Represents your domain object. This is what your API serves and modifies. Also called an `entity` in JAX-RS.
+Representation:: How your resource is represented on the wire, can vary depending on content types
+Content type:: Designates a particular representation (also called a media type), for example `text/plain` or `application/json`
+HTTP:: Underlying wire protocol for routing REST calls (see https://tools.ietf.org/html/rfc7230[HTTP specifications])
+HTTP request:: the request part of the HTTP call, consisting of an HTTP method, a target URI, headers and an optional message body
+HTTP response:: the response part of the HTTP call, consisting of an HTTP response status, headers and an optional message body
+
+=== Declaring endpoints: URI mapping
+
+Any class annotated with a link:{jaxrsapi}/javax/ws/rs/Path.html[`@Path`] annotation can have its methods exposed as REST endpoints,
+provided they have an HTTP method annotation (see below).
+
+That link:{jaxrsapi}/javax/ws/rs/Path.html[`@Path`] annotation defines the URI prefix under which those methods will be exposed. It can
+be empty, or contain a prefix such as `rest` or `rest/V1`.
+
+Each exposed endpoint method can in turn have another link:{jaxrsapi}/javax/ws/rs/Path.html[`@Path`] annotation which adds to its containing
+class annotation. For example, this defines a `rest/hello` endpoint:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("rest")
+public class Endpoint {
+
+    @Path("hello")
+    @GET
+    public String hello(){
+        return "Hello, World!";
+    }
+}
+----
+
+See <<uri-parameters,URI parameters>> for more information about URI mapping.
+
+You can set the root path for all rest endpoints using the `@ApplicationPath` annotation, as shown below.
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/api")
+public static class MyApplication extends Application {
+
+}
+----
+
+This will cause all rest endpoints to be resolve relative to `/api`, so the endpoint above with `@Path("rest")` would
+be accessible at `/api/rest/. You can also set the `quarkus.rest.path` build time property to set the root path if you
+don't want to use an annotation.
+
+=== Declaring endpoints: HTTP methods
+
+Each endpoint method must be annotated with one of the following annotations, which defines which HTTP
+method will be mapped to the method:
+
+.Table HTTP method annotations
+|===
+|Annotation|Usage 
+
+|link:{jaxrsapi}/javax/ws/rs/GET.html[`@GET`]
+|Obtain a resource representation, should not modify state, link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.1[HTTP docs])
+
+|link:{jaxrsapi}/javax/ws/rs/HEAD.html[`@HEAD`]
+|Obtain metadata about a resource, similar to `GET` with no body (link:{httpspec}#section-4.3.2[HTTP docs])
+
+|link:{jaxrsapi}/javax/ws/rs/POST.html[`@POST`]
+|Create a resource and obtain a link to it (link:{httpspec}#section-4.3.3[HTTP docs])
+
+|link:{jaxrsapi}/javax/ws/rs/PUT.html[`@PUT`]
+|Replace a resource or create one, should be link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.4[HTTP docs])
+
+|link:{jaxrsapi}/javax/ws/rs/DELETE.html[`@DELETE`]
+|Delete an existing resource, link:{httpspec}#section-4.2.2[idempotent]  (link:{httpspec}#section-4.3.5[HTTP docs])
+
+|link:{jaxrsapi}/javax/ws/rs/OPTIONS.html[`@OPTIONS`]
+|Obtain information about a resource, link:{httpspec}#section-4.2.2[idempotent] (link:{httpspec}#section-4.3.7[HTTP docs])
+
+|link:{jaxrsapi}/javax/ws/rs/PATCH.html[`@PATCH`]
+|Update a resource, or create one, not link:{httpspec}#section-4.2.2[idempotent] (https://tools.ietf.org/html/rfc5789#section-2[HTTP docs])
+
+|===
+
+You can also declare other HTTP methods by declaring them as an annotation with the
+link:{jaxrsapi}/javax/ws/rs/HttpMethod.html[`@HttpMethod`] annotation:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.Path;
+
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod("FROMAGE")
+@interface FROMAGE {
+}
+
+@Path("")
+public class Endpoint {
+
+    @FROMAGE
+    public String hello(){
+        return "Hello, Cheese World!";
+    }
+}
+----
+
+=== Declaring endpoints: representation / content types
+
+Each endpoint method may consume or produce specific resource representations, which are indicated by
+the HTTP link:{httpspec}#section-3.1.1.5[`Content-Type`] header, which in turn contains 
+link:{httpspec}#section-3.1.1.1[MIME (Media Type)] values, such as the following:
+
+- `text/plain` which is the default for any endpoint returning a `String`.
+- `text/html` for HTML (such as with link:qute[Qute templating])
+- `application/json` for a <<json,JSON REST endpoint>>
+- `text/*` which is a sub-type wildcard for any text media type
+- `\*/*` which is a wildcard for any media type
+
+You may annotate your endpoint class with the link:{jaxrsapi}/javax/ws/rs/Produces.html[`@Produces`] 
+or link:{jaxrsapi}/javax/ws/rs/Consumes.html[`@Consumes`] annotations, which
+allow you to specify one or more media types that your endpoint may accept as HTTP request body
+or produce as HTTP response body. Those class annotations apply to each method.
+
+Any method may also be annotated with the link:{jaxrsapi}/javax/ws/rs/Produces.html[`@Produces`] 
+or link:{jaxrsapi}/javax/ws/rs/Consumes.html[`@Consumes`] annotations, in which
+case they override any eventual class annotation.
+
+The link:{jaxrsapi}/javax/ws/rs/core/MediaType.html[`MediaType`] class has many constants you
+can use to point to specific pre-defined media types.
+
+See <<negotiation>> for more information.
+
+=== Accessing request parameters
+
+[[request-parameters]]
+
+NOTE: don't forget to configure your compiler to generate parameter name information with `-parameters` (javac)
+or `<parameters>` or `<maven.compiler.parameters>` (https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#parameters[Maven]).
+
+The following HTTP request elements may be obtained by your endpoint method:
+
+.Table HTTP request parameter annotations
+|===
+|HTTP element|Annotation|Usage 
+
+|[[path-parameter]]Path parameter
+|`@RestPath` (or nothing)
+|URI template parameter (simplified version of the https://tools.ietf.org/html/rfc6570[URI Template specification]), 
+see <<uri-parameters,URI parameters>> for more information.
+
+|Query parameter
+|`@RestQuery`
+|The value of an https://tools.ietf.org/html/rfc3986#section-3.4[URI query parameter]
+
+|Header
+|`@RestHeader`
+|The value of an https://tools.ietf.org/html/rfc7230#section-3.2[HTTP header]
+
+|Cookie
+|`@RestCookie`
+|The value of an https://tools.ietf.org/html/rfc6265#section-4.2[HTTP cookie]
+
+|Form parameter
+|`@RestForm`
+|The value of an https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST[HTTP URL-encoded FORM]
+
+|Matrix parameter
+|`@RestMatrix`
+|The value of an https://tools.ietf.org/html/rfc3986#section-3.3[URI path segment parameter]
+
+|===
+
+For each of those annotations, you may specify the name of the element they refer to, otherwise
+they will use the name of the annotated method parameter.
+
+If a client made the following HTTP call:
+
+[source,http]
+----
+POST /cheeses;variant=goat/tomme?age=matured HTTP/1.1
+Content-Type: application/x-www-form-urlencoded
+Cookie: level=hardcore
+X-Cheese-Secret-Handshake: fist-bump
+
+smell=strong
+----
+
+Then you could obtain all the various parameters with this endpoint method:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+import org.jboss.resteasy.reactive.RestCookie;
+import org.jboss.resteasy.reactive.RestForm;
+import org.jboss.resteasy.reactive.RestHeader;
+import org.jboss.resteasy.reactive.RestMatrix;
+import org.jboss.resteasy.reactive.RestPath;
+import org.jboss.resteasy.reactive.RestQuery;
+
+@Path("/cheeses/{type}")
+public class Endpoint {
+
+    @POST
+    public String allParams(@RestPath String type,
+                            @RestMatrix String variant,
+                            @RestQuery String age,
+                            @RestCookie String level,
+                            @RestHeader("X-Cheese-Secret-Handshake")
+                            String secretHandshake,
+                            @RestForm String smell){
+        return type + "/" + variant + "/" + age + "/" + level + "/" + secretHandshake + "/" + smell;
+    }
+}
+----
+
+NOTE: the `@RestPath` annotation is optional: any parameter whose name matches an existing URI
+template variable will be automatically assumed to have `@RestPath`.
+
+You can also use any of the JAX-RS annotations link:{jaxrsapi}/javax/ws/rs/PathParam.html[`@PathParam`],
+link:{jaxrsapi}/javax/ws/rs/QueryParam.html[`@QueryParam`],
+link:{jaxrsapi}/javax/ws/rs/HeaderParam.html[`@HeaderParam`],
+link:{jaxrsapi}/javax/ws/rs/CookieParam.html[`@CookieParam`],
+link:{jaxrsapi}/javax/ws/rs/FormParam.html[`@FormParam`] or
+link:{jaxrsapi}/javax/ws/rs/MatrixParam.html[`@MatrixParam`] for this,
+but they require you to specify the parameter name.
+
+See <<parameter-mapping>> for more advanced use-cases.
+
+=== Declaring URI parameters
+
+[[uri-parameters]]
+
+You can declare URI parameters and use regular expressions in your path, so for instance
+the following endpoint will serve requests for `/hello/stef/23` and `/hello` but not
+`/hello/stef/0x23`:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("hello")
+public class Endpoint {
+
+    @Path("{name}/{age:\\d+}")
+    @GET
+    public String personalisedHello(String name, int age){
+        return "Hello " + name + " is your age really " + age + "?";
+    }
+
+    @GET
+    public String genericHello(){
+        return "Hello stranger";
+    }
+}
+----
+
+
+=== Accessing the request body
+
+Any method parameter with no annotation will receive the method body.footnote:[Unless it is a
+<<path-parameter,URI template parameter>> or a <<context-objects,context object>>.], after it has been mapped from
+its HTTP representation to the Java type of the parameter.
+
+The following parameter types will be supported out of the box:
+
+[[resource-types]]
+
+.Table Request body parameter type
+|===
+|Type|Usage
+
+|link:{jdkapi}/java/io/File.html[`File`]
+|The entire request body in a temporary file
+
+|`byte[]`
+|The entire request body, not decoded
+
+|`char[]`
+|The entire request body, decoded
+
+|link:{jdkapi}/java/lang/String.html[`String`]
+|The entire request body, decoded
+
+|link:{jdkapi}/java/io/InputStream.html[`InputStream`]
+|The request body in a blocking stream
+
+|link:{jdkapi}/java/io/Reader.html[`Reader`]
+|The request body in a blocking stream
+
+|All Java primitives and their wrapper classes
+|Java primitive types
+
+|link:{jdkapi}/java/math/BigDecimal.html[`BigDecimal`], link:{jdkapi}/java/math/BigInteger.html[`BigInteger`]
+|Large integers and decimals.
+
+|link:{jsonpapi}/javax/json/JsonArray.html[`JsonArray`], link:{jsonpapi}/javax/json/JsonArray.html[`JsonObject`],
+link:{jsonpapi}/javax/json/JsonArray.html[`JsonStructure`], link:{jsonpapi}/javax/json/JsonArray.html[`JsonValue`]
+|JSON value types  
+
+|link:{vertxapi}io/vertx/core/buffer/Buffer.html[`Buffer`]
+|Vert.x Buffer 
+
+|any other type
+|Will be <<json,mapped from JSON to that type>>
+
+|===
+
+NOTE: You can add support for more <<readers-writers,body parameter types>>.
+
+=== Handling Multipart Form data
+
+To handle HTTP requests that have `multipart/form-data` as their content type, RESTEasy Reactive introduces the `@org.jboss.resteasy.reactive.MultipartForm` annotation.
+Let us look at an example of its use.
+
+Assuming an HTTP request containing a file upload and a form value containing a string description need to be handled, we could write a POJO
+that will hold this information like so:
+
+[source,java]
+----
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.RestForm;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+
+public class FormData {
+
+    @RestForm
+    @PartType(MediaType.TEXT_PLAIN)
+    public String description;
+
+    @RestForm("image")
+    public FileUpload file;
+}
+----
+
+The `name` field will contain the data contained in the part of HTTP request called `description` (because `@RestForm` does not define a value, the field name is used),
+while the `file` field will contain data about the uploaded file in the `image` part of HTTP request.
+
+NOTE: `FileUpload` provides access to various metadata of the uploaded file. If however all you need is a handle to the uploaded file, `java.nio.file.Path` or `java.io.File` could be used.
+
+NOTE: `@PartType` is used to aid in deserialization of the corresponding part of the request into the desired Java type. It is very useful when for example the corresponding body part is JSON
+and needs to be converted to a POJO.
+
+This POJO could be used in a Resource method like so:
+
+[source,java]
+----
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.MultipartForm;
+
+@Path("multipart")
+public class Endpoint {
+
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("form")
+    public String form(@MultipartForm FormData formData) {
+        // return something
+    }
+}
+----
+
+The use of `@MultipartForm` as method parameter makes RESTEasy Reactive handle the request as a multipart form request.
+
+WARNING: When handling file uploads, it is very important to move the file to permanent storage (like a database, a dedicated file system or a cloud storage) in your code that handles the POJO.
+Otherwise, the file will no longer be accessible when the request terminates.
+Moreoever if `quarkus.http.body.delete-uploaded-files-on-end` is set to true, Quarkus will delete the uploaded file when the HTTP response is sent. If the setting is disabled,
+the file will reside on the file system of the server (in the directory defined by the `quarkus.http.body.uploads-directory` configuration option), but as the uploaded files are saved
+with a UUID file name and no additional metadata is saved, these files are essentially a random dump of files.
+
+
+=== Returning a response body
+
+In order to return an HTTP response, simply return the resource you want from your method. The method
+return type and its optional content type will be used to decide how to serialise it to the HTTP
+response (see <<negotiation>> for more advanced information).
+
+You can return any of the pre-defined types that you can read from the <<resource-types,HTTP response>>,
+and any other type will be mapped <<json,from that type to JSON>>.
+
+Alternately, you can also return a <<reactive,reactive type>> such as link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni`], 
+link:{mutinyapi}/io/smallrye/mutiny/Multi.html[`Multi`] or 
+link:{jdkapi}/java/util/concurrent/CompletionStage.html[`CompletionStage`]
+that resolve to one of the mentioned return types.
+
+=== Setting other response properties
+
+If you need to set more properties on the HTTP response than just the body, such as the status code
+or headers, you can make your method return the link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`]
+type:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+
+@Path("")
+public class Endpoint {
+
+    @GET
+    public Response hello() {
+        // HTTP OK status with text/plain content type
+        return Response.ok("Hello, World!", MediaType.TEXT_PLAIN_TYPE)
+         // set a response header
+         .header("X-FroMage", "Camembert")
+         // set the Expires response header to two days from now
+         .expires(Date.from(Instant.now().plus(Duration.ofDays(2))))
+         // send a new cookie
+         .cookie(new NewCookie("Flavour", "praliné"))
+         // end of builder API
+         .build();
+    }
+}
+----
+
+=== Async/reactive support
+
+[[reactive]]
+
+If your endpoint method needs to accomplish an asynchronous or reactive task before
+being able to answer, you can declare your method to return the 
+link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni`] type (from https://smallrye.io/smallrye-mutiny/[Mutiny]), in which
+case the current HTTP request will be automatically suspended after your method, until
+the returned link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni`] instance resolves to a value,
+which will be mapped to a response exactly according to the previously described rules:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("escoffier")
+public class Endpoint {
+
+    @GET
+    public Uni<Book> culinaryGuide(){
+        return Book.findByIsbn("978-2081229297");
+    }
+}
+----
+
+This allows you to not block the event-loop thread while the book is being fetched from the
+database, and allows Quarkus to serve more requests until your book is ready to
+be sent to the client and terminate this request. Check out our 
+<<execution-model,Execution Model documentation>> for more information.
+
+The link:{jdkapi}/java/util/concurrent/CompletionStage.html[`CompletionStage`] return
+type is also supported.
+
+=== Streaming support
+
+If you want to stream your response element by element, you can make your endpoint method return a 
+link:{mutinyapi}/io/smallrye/mutiny/Multi.html[`Multi`] type (from https://smallrye.io/smallrye-mutiny/[Mutiny]).
+This is especially useful for streaming text or binary data.
+
+This example, using link:reactive-messaging-http[Reactive Messaging] shows how to stream
+text data:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+
+import io.smallrye.mutiny.Multi;
+
+@Path("logs")
+public class Endpoint {
+
+    @Inject
+    @Channel("log-out")
+    Multi<String> logs;
+
+    @GET
+    public Multi<String> streamLogs() {
+        return logs;
+    }
+}
+----
+
+=== Server-Sent Event (SSE) support
+
+If you want to stream JSON objects in your response, you can use 
+https://html.spec.whatwg.org/multipage/server-sent-events.html[Server-Sent Events]
+by just annotating your endpoint method with 
+link:{jaxrsapi}/javax/ws/rs/Produces.html[`@Produces(MediaType.SERVER_SENT_EVENTS)`]
+and specifying that each element should be <<json,serialised to JSON>> with 
+`@RestSseElementType(MediaType.APPLICATION_JSON)`.
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.RestSseElementType;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+import io.smallrye.reactive.messaging.annotations.Channel;
+
+@Path("escoffier")
+public class Endpoint {
+
+    // Inject our Book channel
+    @Inject
+    @Channel("book-out")
+    Multi<Book> books;
+
+    @GET
+    // Send the stream over SSE
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    // Each element will be sent as JSON
+    @RestSseElementType(MediaType.APPLICATION_JSON)
+    public Multi<Book> stream() {
+        return books;
+    }
+}
+----
+
+=== Accessing context objects
+
+[[context-objects]]
+
+There are a number of contextual objects that the framework will give you, if your endpoint
+method takes parameters of the following type:
+
+.Table Context object
+|===
+|Type|Usage
+
+|link:{jaxrsapi}/javax/ws/rs/core/HttpHeaders.html[`HttpHeaders`]
+|All the request headers
+
+|link:{jaxrsapi}/javax/ws/rs/container/ResourceInfo.html[`ResourceInfo`]
+|Information about the current endpoint method and class (requires reflection)
+
+|link:{jaxrsapi}/javax/ws/rs/core/SecurityContext.html[`SecurityContext`]
+|Access to the current user and roles
+
+|`SimpleResourceInfo`
+|Information about the current endpoint method and class (no reflection required)
+
+|link:{jaxrsapi}/javax/ws/rs/core/UriInfo.html[`UriInfo`]
+|Provides information about the current endpoint and application URI
+
+|link:{jaxrsapi}/javax/ws/rs/core/Application.html[`Application`]
+|Advanced: Current JAX-RS application class
+
+|link:{jaxrsapi}/javax/ws/rs/core/Configuration.html[`Configuration`]
+|Advanced: Configuration about the deployed JAX-RS application
+
+|link:{jaxrsapi}/javax/ws/rs/ext/Providers.html[`Providers`]
+|Advanced: Runtime access to JAX-RS providers
+
+|link:{jaxrsapi}/javax/ws/rs/core/Request.html[`Request`]
+|Advanced: Access to the current HTTP method and <<preconditions>>
+
+|link:{jaxrsapi}/javax/ws/rs/core/ResourceContext.html[`ResourceContext`]
+|Advanced: access to instances of endpoints
+
+|`ServerRequestContext`
+|Advanced: RESTEasy Reactive access to the current request/response
+
+|link:{jaxrsapi}/javax/ws/rs/sse/Sse.html[`Sse`]
+|Advanced: Complex SSE use-cases
+
+|===
+
+For example, here is how you can return the name of the currently logged-in user:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.security.Principal;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.SecurityContext;
+
+@Path("user")
+public class Endpoint {
+
+    @GET
+    public String userName(SecurityContext security) {
+        Principal user = security.getUserPrincipal();
+        return user != null ? user.getName() : "<NOT LOGGED IN>";
+    }
+}
+----
+
+You can also inject those context objects using 
+https://javadoc.io/static/javax.inject/javax.inject/1/javax/inject/Inject.html[`@Inject`] on fields of the same
+type:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.security.Principal;
+
+import javax.inject.Inject;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.SecurityContext;
+
+@Path("user")
+public class Endpoint {
+
+    @Inject
+    SecurityContext security;
+
+    @GET
+    public String userName() {
+        Principal user = security.getUserPrincipal();
+        return user != null ? user.getName() : "<NOT LOGGED IN>";
+    }
+}
+----
+
+Or even on your endpoint constructor:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.security.Principal;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.SecurityContext;
+
+@Path("user")
+public class Endpoint {
+
+    SecurityContext security;
+
+    Endpoint(SecurityContext security){
+        this.security = security;
+    }
+
+    @GET
+    public String userName() {
+        Principal user = security.getUserPrincipal();
+        return user != null ? user.getName() : "<NOT LOGGED IN>";
+    }
+}
+----
+
+
+=== JSON serialisation
+
+[[json]]
+
+Instead of importing `io.quarkus:quarkus-resteasy-reactive`, you can import either of the following modules to get support for JSON:
+
+.Table Context object
+|===
+|GAV|Usage
+
+|`io.quarkus:quarkus-resteasy-reactive-jackson`
+|https://github.com/FasterXML/jackson[Jackson support]
+
+|`io.quarkus:quarkus-resteasy-reactive-jsonb`
+|http://json-b.net/[JSONB support]
+
+|===
+
+In both cases, importing those modules will allow HTTP message bodies to be read from JSON
+and serialised to JSON, for <<resource-types,all the types not already registered with a more specific
+serialisation>>.
+
+==== Advanced Jackson-specific features
+
+When using the `quarkus-resteasy-reactive-jackson` extension there are some advanced features that RESTEasy Reactive supports.
+
+===== @JsonView support
+
+JAX-RS methods can be annotated with https://fasterxml.github.io/jackson-annotations/javadoc/2.10/com/fasterxml/jackson/annotation/JsonView.html[@JsonView]
+in order to customize the serialization of the returned POJO, on a per method-basis. This is best explained with an example.
+
+A typical use of `@JsonView` is to hide certain fields on certain methods. In that vein, let's define two views:
+
+[source,java]
+----
+public class Views {
+
+    public static class Public {
+    }
+
+    public static class Private extends Public {
+    }
+}
+----
+
+Let's assume we have the `User` POJO on which we want to hide some field during serialization. A simple example of this is:
+
+[source,java]
+----
+public class User {
+
+    @JsonView(Views.Private.class)
+    public int id;
+
+    @JsonView(Views.Public.class)
+    public String name;
+}
+----
+
+Depending on the JAX-RS method that returns this user, we might want to exclude the `id` field from serialization - for example you might want an insecure method
+to not expose this field. The way we can achieve that in RESTEasy Reactive is shown in the following example:
+
+[source,java]
+----
+@JsonView(Views.Public.class)
+@GET
+@Path("/public")
+public User userPublic() {
+    return testUser();
+}
+
+@JsonView(Views.Private.class)
+@GET
+@Path("/private")
+public User userPrivate() {
+    return testUser();
+}
+----
+
+When the result the `userPublic` method is serialized, the `id` field will not be contained in the response as the `Public` view does not include it.
+The result of `userPrivate` however will include the `id` as expected when serialized.
+
+===== Completely customized per method serialization
+
+There are times when you need to completely customize the serialization of a POJO on a per JAX-RS method basis. For such use cases, the `@io.quarkus.resteasy.reactive.jackson.CustomSerialization` annotation
+is a great tool, as it allows you to configure a per-method `com.fasterxml.jackson.databind.ObjectWriter` which can be configured at will.
+
+Here is an example use case:
+
+[source,java]
+----
+@CustomSerialization(UnquotedFields.class)
+@GET
+@Path("/invalid-use-of-custom-serializer")
+public User invalidUseOfCustomSerializer() {
+    return testUser();
+}
+----
+
+where `UnquotedFields` is a `BiFunction` defined as so:
+
+[source,java]
+----
+public static class UnquotedFields implements BiFunction<ObjectMapper, Type, ObjectWriter> {
+
+    @Override
+    public ObjectWriter apply(ObjectMapper objectMapper, Type type) {
+        return objectMapper.writer().without(JsonWriteFeature.QUOTE_FIELD_NAMES);
+    }
+}
+----
+
+Essentially what this class does is force Jackson to not include quotes in the field names.
+
+It is important to note that this customization is only performed for the serialization of the JAX-RS methods that use `@CustomSerialization(UnquotedFields.class)`.
+
+== More advanced usage
+
+Here are some more advanced topics that you may not need to know about initially, but
+could prove useful for more complex use cases.
+
+=== Execution model, blocking, non-blocking
+
+[[execution-model]]
+
+RESTEasy Reactive is implemented using two main thread types:
+
+- Event-loop threads: which are responsible, among other things, for reading bytes from the HTTP request and
+ writing bytes back to the HTTP response
+- Worker threads: they are pooled and can be used to offload long-running operations
+
+The event-loop threads (also called IO threads) are responsible for actually performing all the IO
+operations in an asynchronous way, and to trigger any listener interested in the completion of those
+IO operations.
+
+By default, RESTEasy Reactive will run endpoint methods on the event-loop threads, on the assumption that
+they are going to be fast and only invoke non-blocking operations.
+
+This is the model of execution that leads to best performance if your endpoints do not do any blocking
+operation (such as blocking IO, blocking on an asynchronous operation, or sleeping).
+
+If your endpoint method needs to do any of those blocking operations, you should add the 
+https://javadoc.io/doc/io.smallrye.common/smallrye-common-annotation/1.5.0/io/smallrye/common/annotation/Blocking.html[`@Blocking`]
+annotation on your endpoint and it will instead be invoked on a worker thread. Your endpoint method
+code can remain exactly the same, and it will be allowed to block:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.smallrye.common.annotation.Blocking;
+
+@Path("yawn")
+public class Endpoint {
+
+    @Blocking
+    @GET
+    public String blockingHello() throws InterruptedException {
+        // do a blocking operation
+        Thread.sleep(1000);
+        return "Yaaaawwwwnnnnnn…";
+    }
+}
+----
+
+Most of the time, there are ways to achieve the same blocking operations in an asynchronous/reactive
+way, using https://smallrye.io/smallrye-mutiny/[Mutiny], http://hibernate.org/reactive/[Hibernate Reactive] 
+or any of the link:getting-started-reactive[Quarkus Reactive extensions] for example:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.time.Duration;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("yawn")
+public class Endpoint {
+
+    @GET
+    public Uni<String> blockingHello() throws InterruptedException {
+        return Uni.createFrom().item("Yaaaawwwwnnnnnn…")
+                // do a non-blocking sleep
+                .onItem().delayIt().by(Duration.ofSeconds(2));
+    }
+}
+----
+
+=== Exception mapping
+
+If your application needs to return non-nominal HTTP codes in error cases, the best is
+to throw exceptions that will result in the proper HTTP response being sent by the
+framework using link:{jaxrsapi}/javax/ws/rs/WebApplicationException.html[`WebApplicationException`] or any of its subtypes:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Path;
+
+@Path("fromages/{fromage}")
+public class Endpoint {
+
+    @GET
+    public String findFromage(String fromage) {
+        if(fromage == null)
+            // send a 400
+            throw new BadRequestException();
+        if(!fromage.equals("camembert"))
+            // send a 404
+            throw new NotFoundException("Unknown cheese: " + fromage);
+        return "Camembert is a very nice cheese";
+    }
+}
+----
+
+If your endpoint method is delegating calls to another service layer which
+does not know of JAX-RS, you need a way to turn service exceptions to an
+HTTP response, and you can do that using the `@ServerExceptionMapper` annotation
+on a method, with one parameter of the exception type you want to handle, and turning
+that exception into a link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`] (or a 
+link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni<Response>`]):
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+class UnknownCheeseException extends RuntimeException {
+    public final String name;
+    
+    public UnknownCheeseException(String name) {
+        this.name = name;
+    }
+}
+
+@ApplicationScoped
+class CheeseService {
+    private static final Map<String, String> cheeses = 
+            Map.of("camembert", "Camembert is a very nice cheese",
+                   "gouda", "Gouda is acceptable too, especially with cumin");
+
+    public String findCheese(String name) {
+        String ret = cheeses.get(name);
+        if(ret != null)
+            return ret;
+        throw new UnknownCheeseException(name);
+    }
+}
+
+@Path("fromages/{fromage}")
+public class Endpoint {
+
+    @Inject
+    CheeseService cheeses;
+    
+    @ServerExceptionMapper
+    public Response mapException(UnknownCheeseException x) {
+        return Response.status(Response.Status.NOT_FOUND)
+                       .entity("Unknown cheese: " + x.name)
+                       .build();
+    }
+    
+    @GET
+    public String findFromage(String fromage) {
+        if(fromage == null)
+            // send a 400
+            throw new BadRequestException();
+        return cheeses.findCheese(fromage);
+    }
+} 
+----
+
+NOTE: exception mappers defined in REST endpoint classes will only be called if the
+exception is thrown in the same class. If you want to define global exception mappers,
+simply define them outside a REST endpoint class:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+class ExceptionMappers {
+    @ServerExceptionMapper
+    public Response mapException(UnknownCheeseException x) {
+        return Response.status(Response.Status.NOT_FOUND)
+                       .entity("Unknown cheese: " + x.name)
+                       .build();
+    }
+}
+----
+
+You can also declare link:{jaxrsspec}#exceptionmapper[exception mappers in the JAX-RS way].
+
+Your exception mapper may declare any of the following parameter types:
+
+.Table Exception mapper parameters
+|===
+|Type|Usage
+
+|An exception type
+|Defines the exception type you want to handle
+
+|Any of the <<context-objects,Context objects>>
+|
+
+|link:{jaxrsapi}/javax/ws/rs/container/ContainerRequestContext.html[`ContainerRequestContext`]
+|A context object to access the current request
+
+|===
+
+It may declare any of the following return types:
+
+.Table Exception mapper return types
+|===
+|Type|Usage
+
+|link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`]
+|The response to send to the client when the exception occurs
+
+|link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni<Response>`]
+|An asynchronous response to send to the client when the exception occurs
+
+|===
+
+=== Request or response filters
+
+You can declare functions which are invoked in the following phases of the request processing:
+
+- Before the endpoint method is identified: pre-routing request filter
+- After routing, but before the endpoint method is called: normal request filter
+- After the endpoint method is called: response filter
+
+These filters allow you to do various things such as examine the request URI,
+HTTP method, influence routing, look or change request headers, abort the request,
+or modify the response.
+
+Request filters can be declared with the `@ServerRequestFilter` annotation:
+
+[source,java]
+----
+class Filters {
+    
+    @ServerRequestFilter(preMatching = true)
+    public void preMatchingFilter(ContainerRequestContext requestContext) {
+        // make sure we don't lose cheese lovers
+        if("yes".equals(requestContext.getHeaderString("Cheese"))) {
+            requestContext.setRequestUri(URI.create("/cheese"));
+        }
+    }
+    
+    @ServerRequestFilter
+    public void getFilter(ContainerRequestContext ctx) {
+        // only allow GET methods for now
+        if(ctx.getMethod().equals(HttpMethod.GET)) {
+            ctx.abortWith(Response.status(Response.Status.METHOD_NOT_ALLOWED).build());
+        }
+    }
+}
+----
+
+Similarly, response filters can be declared with the `@ServerResponseFilter` annotation:
+
+[source,java]
+----
+class Filters {
+    @ServerResponseFilter
+    public void getFilter(ContainerResponseContext responseContext) {
+        Object entity = responseContext.getEntity();
+        if(entity instanceof String) {
+            // make it shout
+            responseContext.setEntity(((String)entity).toUpperCase());
+        }
+    }
+}
+----
+
+You can also link:{jaxrsspec}#filters[declare request and response filters in the JAX-RS way].
+
+Your filters may declare any of the following parameter types:
+
+.Table Filter parameters
+|===
+|Type|Usage
+
+|Any of the <<context-objects,Context objects>>
+|
+
+|link:{jaxrsapi}/javax/ws/rs/container/ContainerRequestContext.html[`ContainerRequestContext`]
+|A context object to access the current request
+
+|link:{jaxrsapi}/javax/ws/rs/container/ContainerResponseContext.html[`ContainerResponseContext`]
+|A context object to access the current response
+
+|link:{jdkapi}/java/lang/Throwable.html[`Throwable`]
+|Any thrown exception, or `null` (only for response filters)
+
+|===
+
+It may declare any of the following return types:
+
+.Table Filter return types
+|===
+|Type|Usage
+
+|link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`]
+|The response to send to the client instead of continuing the filter chain, or `null` if the filter chain should proceed
+
+|link:{jdkapi}/java/util/Optional.html[`Optional<Response>`]
+|An optional response to send to the client instead of continuing the filter chain, or an empty value if the filter chain should proceed
+
+|link:{mutinyapi}/io/smallrye/mutiny/Uni.html[`Uni<Response>`]
+|An asynchronous response to send to the client instead of continuing the filter chain, or `null` if the filter chain should proceed
+
+|===
+
+NOTE: You can restrict the Resource methods for which a filter runs, by using link:{jaxrsapi}/javax/ws/rs/NameBinding.html[`@NameBinding`] meta-annotations.
+
+=== Readers and Writers: mapping entities and HTTP bodies
+
+[[readers-writers]]
+
+Whenever your endpoint methods return a object (of when they return a 
+link:{jaxrsapi}/javax/ws/rs/core/Response.html[`Response`] with
+an entity), RESTEasy Reactive will look for a way to map that into an HTTP response body.
+
+Similarly, whenever your endpoint method takes an object as parameter, we will look for
+a way to map the HTTP request body into that object.
+
+This is done via a pluggable system of link:{jaxrsapi}/javax/ws/rs/ext/MessageBodyReader.html[`MessageBodyReader`]
+and link:{jaxrsapi}/javax/ws/rs/ext/MessageBodyWriter.html[`MessageBodyWriter`] interfaces,
+which are responsible for defining which Java type they map from/to, for which media types,
+and how they turn HTTP bodies to/from Java instances of that type.
+
+For example, if we have our own `FroMage` type on our endpoint:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+
+class FroMage {
+    public String name;
+    
+    public FroMage(String name) {
+        this.name = name;
+    }
+}
+
+@Path("cheese")
+public class Endpoint {
+
+    @GET
+    public FroMage sayCheese() {
+        return new FroMage("Cheeeeeese");
+    }
+
+    @PUT
+    public void addCheese(FroMage fromage) {
+        System.err.println("Received a new cheese: " + fromage.name);
+    }
+}
+----
+
+Then we can define how to read and write it with our body reader/writers, annotated
+with link:{jaxrsapi}/javax/ws/rs/ext/Provider.html[`@Provider`]:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class FroMageBodyHandler implements MessageBodyReader<FroMage>, 
+                                           MessageBodyWriter<FroMage> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, 
+                               Annotation[] annotations, MediaType mediaType) {
+        return type == FroMage.class;
+    }
+
+    @Override
+    public void writeTo(FroMage t, Class<?> type, Type genericType, 
+                        Annotation[] annotations, MediaType mediaType,
+                        MultivaluedMap<String, Object> httpHeaders, 
+                        OutputStream entityStream)
+            throws IOException, WebApplicationException {
+        entityStream.write(("[FroMageV1]" + t.name)
+                           .getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, 
+                              Annotation[] annotations, MediaType mediaType) {
+        return type == FroMage.class;
+    }
+
+    @Override
+    public FroMage readFrom(Class<FroMage> type, Type genericType, 
+                            Annotation[] annotations, MediaType mediaType,
+                            MultivaluedMap<String, String> httpHeaders,
+                            InputStream entityStream)
+            throws IOException, WebApplicationException {
+        String body = new String(entityStream.readAllBytes(), StandardCharsets.UTF_8);
+        if(body.startsWith("[FroMageV1]"))
+            return new FroMage(body.substring(11));
+        throw new IOException("Invalid fromage: " + body);
+    }
+
+}
+----
+
+If you want to get the most performance our of your writer, you can extend `ServerMessageBodyWriter` instead
+of link:{jaxrsapi}/javax/ws/rs/ext/MessageBodyWriter.html[`MessageBodyWriter`]
+where you will be able to use less reflection and bypass the blocking IO layer:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class FroMageBodyHandler implements MessageBodyReader<FroMage>, 
+                                           ServerMessageBodyWriter<FroMage> {
+
+    // …
+
+    @Override
+    public boolean isWriteable(Class<?> type, ResteasyReactiveResourceInfo target, 
+                               MediaType mediaType) {
+        return type == FroMage.class;
+    }
+
+    @Override
+    public void writeResponse(FroMage t, ServerRequestContext context) 
+      throws WebApplicationException, IOException {
+        context.serverResponse().end("[FroMageV1]" + t.name);
+    }
+}
+----
+
+NOTE: You can restrict which content-types your reader/writer apply to by adding 
+link:{jaxrsapi}/javax/ws/rs/Consumes.html[`Consumes`]/link:{jaxrsapi}/javax/ws/rs/Produces.html[`Produces`] annotations
+on your provider class.
+
+=== Reader and Writer interceptors
+
+Just as you can intercept requests and responses, you can also intercept readers and writers, by
+extending the link:{jaxrsapi}/javax/ws/rs/ext/ReaderInterceptor.html[`ReaderInterceptor`] or 
+link:{jaxrsapi}/javax/ws/rs/ext/WriterInterceptor.html[`WriterInterceptor`] on a class annotated with 
+link:{jaxrsapi}/javax/ws/rs/ext/Provider.html[`@Provider`].
+
+If we look at this endpoint:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+
+@Path("cheese")
+public class Endpoint {
+
+    @GET
+    public String sayCheese() {
+        return "Cheeeeeese";
+    }
+
+    @PUT
+    public void addCheese(String fromage) {
+        System.err.println("Received a new cheese: " + fromage);
+    }
+}
+----
+
+We can add reader and writer interceptors like this:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.io.IOException;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.ext.WriterInterceptorContext;
+
+@Provider
+public class FroMageIOInterceptor implements ReaderInterceptor, WriterInterceptor {
+
+    @Override
+    public void aroundWriteTo(WriterInterceptorContext context)
+      throws IOException, WebApplicationException {
+        System.err.println("Before writing " + context.getEntity());
+        context.proceed();
+        System.err.println("After writing " + context.getEntity());
+    }
+
+    @Override
+    public Object aroundReadFrom(ReaderInterceptorContext context)
+      throws IOException, WebApplicationException {
+        System.err.println("Before reading " + context.getGenericType());
+        Object entity = context.proceed();
+        System.err.println("After reading " + entity);
+        return entity;
+    }
+}
+----
+
+=== Parameter mapping
+
+All <<request-parameters,Request Parameters>> can be declared as link:{jdkapi}/java/lang/String.html[`String`], but also
+any of the following types:
+
+- Types for which a link:{jaxrsapi}/javax/ws/rs/ext/ParamConverter.html[`ParamConverter`] is available via a registered 
+link:{jaxrsapi}/javax/ws/rs/ext/ParamConverterProvider.html[`ParamConverterProvider`].
+- Primitive types.
+- Types that have a constructor that accepts a single link:{jdkapi}/java/lang/String.html[`String`] argument.
+- Types that have a static method named `valueOf` or `fromString` with a single link:{jdkapi}/java/lang/String.html[`String`] argument
+that return an instance of the type. If both methods are present then `valueOf` will be used unless
+the type is an `enum` in which case `fromString` will be used.
+- link:{jdkapi}/java/util/List.html[`List<T>`], link:{jdkapi}/java/util/Set.html[`Set<T>`], or 
+link:{jdkapi}/java/util/SortedSet.html[`SortedSet<T>`], where `T` satisfies any above criterion.
+
+The following example illustrates all those possibilities:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.reactive.RestQuery;
+
+@Provider
+class MyConverterProvider implements ParamConverterProvider {
+
+    @Override
+    public <T> ParamConverter<T> getConverter(Class<T> rawType, Type genericType,
+                                              Annotation[] annotations) {
+        // declare a converter for this type
+        if(rawType == Converter.class) {
+            return (ParamConverter<T>) new MyConverter();
+        }
+        return null;
+    }
+    
+}
+
+// this is my custom converter
+class MyConverter implements ParamConverter<Converter> {
+
+    @Override
+    public Converter fromString(String value) {
+        return new Converter(value);
+    }
+
+    @Override
+    public String toString(Converter value) {
+        return value.value;
+    }
+    
+}
+
+// this uses a converter
+class Converter {
+    String value;
+    Converter(String value) {
+        this.value = value;
+    }
+}
+
+class Constructor {
+    String value;
+    // this will use the constructor
+    public Constructor(String value) {
+        this.value = value;
+    }
+}
+
+class ValueOf {
+    String value;
+    private ValueOf(String value) {
+        this.value = value;
+    }
+    // this will use the valueOf method
+    public static ValueOf valueOf(String value) {
+        return new ValueOf(value);
+    }
+}
+
+@Path("hello")
+public class Endpoint {
+
+    @Path("{converter}/{constructor}/{primitive}/{valueOf}")
+    @GET
+    public String convertions(Converter converter, Constructor constructor,
+                              int primitive, ValueOf valueOf, 
+                              @RestQuery List<Constructor> list){
+        return converter + "/" + constructor + "/" + primitive 
+               + "/" + valueOf + "/" + list;
+    }
+}
+----
+
+=== Preconditions
+
+https://tools.ietf.org/html/rfc7232[HTTP allows requests to be conditional], based on a number of
+conditions, such as:
+
+- Date of last resource modification
+- A resource tag, similar to a hash code of the resource to designate its state or version
+
+Let's see how you can do conditional request validation using the
+link:{jaxrsapi}/javax/ws/rs/core/Request.html[`Request`] context object:
+
+[source,java]
+----
+package org.acme.rest;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
+import java.util.Date;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+
+@Path("conditional")
+public class Endpoint {
+
+    // It's important to keep our date on seconds because that's how it's sent to the
+    // user in the Last-Modified header
+    private Date date = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
+    private int version = 1;
+    private EntityTag tag = new EntityTag("v1");
+    private String resource = "Some resource";
+    
+    @GET
+    public Response get(Request request){
+        // first evaluate preconditions
+        ResponseBuilder conditionalResponse = request.evaluatePreconditions(date, tag);
+        if(conditionalResponse != null)
+            return conditionalResponse.build();
+        // preconditions are OK
+        return Response.ok(resource)
+                .lastModified(date)
+                .tag(tag)
+                .build();
+    }
+
+    @PUT
+    public Response put(Request request, String body){
+        // first evaluate preconditions
+        ResponseBuilder conditionalResponse = request.evaluatePreconditions(date, tag);
+        if(conditionalResponse != null)
+            return conditionalResponse.build();
+        // preconditions are OK, we can update our resource
+        resource = body;
+        date = Date.from(Instant.now().truncatedTo(ChronoUnit.SECONDS));
+        version++;
+        tag = new EntityTag("v" + version);
+        return Response.ok(resource)
+                .lastModified(date)
+                .tag(tag)
+                .build();
+    }
+}
+----
+
+When we call `GET /conditional` the first time, we will get this response:
+
+[source]
+----
+HTTP/1.1 200 OK
+Content-Type: text/plain;charset=UTF-8
+ETag: "v1"
+Last-Modified: Wed, 09 Dec 2020 16:10:19 GMT
+Content-Length: 13
+
+Some resource
+----
+
+So now if we want to check if we need to fetch a new version, we can make the following request:
+
+[source]
+----
+GET /conditional HTTP/1.1
+Host: localhost:8080
+If-Modified-Since: Wed, 09 Dec 2020 16:10:19 GMT
+----
+
+And we would get the following response:
+
+[source]
+----
+HTTP/1.1 304 Not Modified
+----
+
+Because the resource has not been modified since that date. This saves on sending the resource,
+but can also help your users detect concurrent modification, for example, let's suppose that one
+client wants to update the resource, but another user has modified it since. You can follow the
+previous `GET` request with this update:
+
+[source]
+----
+PUT /conditional HTTP/1.1
+Host: localhost:8080
+If-Unmodified-Since: Wed, 09 Dec 2020 16:25:43 GMT
+If-Match: v1
+Content-Length: 8
+Content-Type: text/plain
+
+newstuff
+----
+
+And if some other user has modified the resource between your `GET` and your `PUT` you would
+get this answer back:
+
+[source]
+----
+HTTP/1.1 412 Precondition Failed
+ETag: "v2"
+Content-Length: 0
+----
+
+=== Negotiation
+
+One of the main ideas of REST (https://tools.ietf.org/html/rfc7231#section-3.4[and HTTP]) is that
+your resource is independent from its representation, and
+that both the client and server are free to represent their resources in as many media types as
+they want. This allows the server to declare support for multiple representations and let the
+client declare which ones it supports and get served something appropriate.
+
+The following endpoint supports serving cheese in plain text or JSON:
+
+[source,java]
+----
+package org.acme.rest;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+class FroMage {
+    public String name;
+    @JsonCreator
+    public FroMage(String name) {
+        this.name = name;
+    }
+    @Override
+    public String toString() {
+        return "Cheese: " + name;
+    }
+}
+
+@Path("negotiated")
+public class Endpoint {
+
+    @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
+    @GET
+    public FroMage get(){
+        return new FroMage("Morbier");
+    }
+
+    @Consumes(MediaType.TEXT_PLAIN)
+    @PUT
+    public FroMage putString(String cheese){
+        return new FroMage(cheese);
+    }
+
+    @Consumes(MediaType.APPLICATION_JSON)
+    @PUT
+    public FroMage putJson(FroMage fromage){
+        return fromage;
+    }
+}
+----
+
+The user will be able to select which representation it gets with the 
+link:{httpspec}#section-5.3.2[`Accept`] header, in the case of JSON:
+
+[source,sh]
+----
+> GET /negotiated HTTP/1.1
+> Host: localhost:8080
+> Accept: application/json
+
+< HTTP/1.1 200 OK
+< Content-Type: application/json
+< Content-Length: 18
+< 
+< {"name":"Morbier"} 
+----
+
+And for text:
+
+[source,sh]
+----
+> GET /negotiated HTTP/1.1
+> Host: localhost:8080
+> Accept: text/plain
+> 
+< HTTP/1.1 200 OK
+< Content-Type: text/plain
+< Content-Length: 15
+< 
+< Cheese: Morbier 
+----
+
+Similarly, you can `PUT` two different representations. JSON:
+
+[source,sh]
+----
+> PUT /negotiated HTTP/1.1
+> Host: localhost:8080
+> Content-Type: application/json
+> Content-Length: 16
+> 
+> {"name": "brie"}
+
+< HTTP/1.1 200 OK
+< Content-Type: application/json;charset=UTF-8
+< Content-Length: 15
+< 
+< {"name":"brie"} 
+----
+
+Or plain text:
+
+[source,sh]
+----
+> PUT /negotiated HTTP/1.1
+> Host: localhost:8080
+> Content-Type: text/plain
+> Content-Length: 9
+>
+> roquefort
+ 
+< HTTP/1.1 200 OK
+< Content-Type: application/json;charset=UTF-8
+< Content-Length: 20
+< 
+< {"name":"roquefort"} 
+----
+
+== Include/Exclude JAX-RS classes with build time conditions
+
+Quarkus enables the inclusion or exclusion of JAX-RS Resources, Providers and Features directly thanks to build time conditions in the same that it does for CDI beans.
+Thus, the various JAX-RS classes can be annotated with profile conditions (`@io.quarkus.arc.profile.IfBuildProfile` or `@io.quarkus.arc.profile.UnlessBuildProfile`) and/or with property conditions (`io.quarkus.arc.properties.IfBuildProperty` or `io.quarkus.arc.properties.UnlessBuildProperty`) to indicate to Quarkus at build time under which conditions these JAX-RS classes should be included.
+
+In the following example, Quarkus includes the endpoint `sayHello` if and only if the build profile `app1` has been enabled.
+
+[source,java]
+----
+@IfBuildProfile("app1")
+public class ResourceForApp1Only {
+
+    @GET
+    @Path("sayHello")
+    public String sayHello() {
+        return "hello";
+     }
+}
+----
+
+Please note that if a JAX-RS Application has been detected and the method `getClasses()` and/or `getSingletons()` has/have been overridden, Quarkus will ignore the build time conditions and consider only what has been defined in the JAX-RS Application.
+
+
+== RESTEasy Reactive client
+In addition to the Server side, RESTEasy Reactive comes with a new MicroProfile Rest Client implementation that is non-blocking at its core.
+
+To use it, add the `quarkus-rest-client-reactive` extension to your project.
+The client can be used as described in https://quarkus.io/guides/rest-client[Using the REST Client guide] and specified in the https://download.eclipse.org/microprofile/microprofile-rest-client-1.4.1/microprofile-rest-client-1.4.1.html[MicroProfile Rest Client specification], with a few exceptions:
+
+- the extension name
+- the default scope of the client for the new extension is `@ApplicationScoped` while the `quarkus-rest-client` defaults to `@Dependent`
+To change this behavior, set the `quarkus.rest.client.scope` property to the fully qualified scope name.
+- it is not possible to set `HostnameVerifier` or `SSLContext`
+- a few things that don't make sense for a non-blocking implementations, such as setting the `ExecutorService`, don't work
+
+It is important to note that the `quarkus-rest-client` extension may not work properly with RESTEasy Reactive.
+
diff --git a/docs/src/main/asciidoc/scheduler-reference.adoc b/docs/src/main/asciidoc/scheduler-reference.adoc
index 4632a22bc01ba..a67d81e785c2e 100644
--- a/docs/src/main/asciidoc/scheduler-reference.adoc
+++ b/docs/src/main/asciidoc/scheduler-reference.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Scheduler Reference Guide
 
@@ -99,6 +99,15 @@ Sometimes a possibility to specify an explicit id may come in handy.
 void myMethod() { }
 ----
 
+If a value starts with `{` and ends with `}` then the scheduler attempts to find a corresponding config property and use the configured value instead.
+
+.Interval Config Property Example
+[source,java]
+----
+@Scheduled(identity = "{myMethod.identity.expr}")
+void myMethod() { }
+----
+
 === Delayed Execution
 
 `@Scheduled` provides two ways to delay the time a trigger should start firing at.
@@ -182,7 +191,7 @@ class MyService {
 
 == Programmatic Scheduling
 
-If you need to schedule a job programmatically you'll need to add the link:quartz[Quartz extension] and use the Quartz API direcly.
+If you need to schedule a job programmatically you'll need to add the link:quartz[Quartz extension] and use the Quartz API directly.
 
 .Programmatic Scheduling with Quartz API
 [source,java]
diff --git a/docs/src/main/asciidoc/scheduler.adoc b/docs/src/main/asciidoc/scheduler.adoc
index 9fab6275c102f..d00951e91fc5a 100644
--- a/docs/src/main/asciidoc/scheduler.adoc
+++ b/docs/src/main/asciidoc/scheduler.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Scheduling Periodic Tasks
 
@@ -41,7 +41,7 @@ The solution is located in the `scheduler-quickstart` {quickstarts-tree-url}/sch
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
@@ -134,7 +134,7 @@ it should be invoked as soon as possible. The invocation of the scheduled method
 == Updating the application configuration file
 
 Edit the `application.properties` file and add the `cron.expr` configuration:
-[source,shell]
+[source,properties]
 ----
 # By default, the syntax used for cron expressions is based on Quartz - http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html
 # You can change the syntax using the following property:
@@ -210,7 +210,7 @@ After a few seconds, re-run `curl localhost:8080/count` to verify the counter ha
 Observe the console to verify that the message `Cron expression configured in application.properties` has been displayed indicating
 that the cron job using an expression configured in `application.properties` has been triggered.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
 [[scheduler-configuration-reference]]
diff --git a/docs/src/main/asciidoc/scripting.adoc b/docs/src/main/asciidoc/scripting.adoc
new file mode 100644
index 0000000000000..c7b8c7f1e6caf
--- /dev/null
+++ b/docs/src/main/asciidoc/scripting.adoc
@@ -0,0 +1,441 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Scripting with Quarkus
+include::./attributes.adoc[]
+:extension-status: preview
+
+Quarkus provides integration with https://jbang.dev[jbang] which allows you to write Java scripts/applications requiring no Maven nor Gradle to get running.
+
+In this guide, we will see how you can write a REST application using just a single Java file.
+
+include::./status-include.adoc[]
+
+== Prerequisites
+
+To complete this guide, you need:
+
+* less than 5 minutes
+* https://jbang.dev/download[jbang v0.40.3+]
+* an IDE
+* GraalVM installed if you want to run in native mode
+
+== Solution
+
+Normally we would link to a Git repository to clone but in this case there is no additional files than the following:
+
+[source,java,subs=attributes+]
+----
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS io.quarkus:quarkus-resteasy:{quarkus-version}
+//JAVAC_OPTIONS -parameters
+//JAVA_OPTIONS -Djava.util.logging.manager=org.jboss.logmanager.LogManager
+
+import io.quarkus.runtime.Quarkus;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+import org.jboss.logging.Logger;
+
+@Path("/hello")
+@ApplicationScoped
+public class quarkusapp {
+
+    @GET
+    public String sayHello() {
+        return "hello";
+    }
+
+    public static void main(String[] args) {
+        Quarkus.run(args);
+    }
+
+    @Inject
+    GreetingService service;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("/greeting/{name}")
+    public String greeting(@PathParam String name) {
+        return service.greeting(name);
+    }
+
+    @ApplicationScoped
+    static public class GreetingService {
+
+        public String greeting(String name) {
+            return "hello " + name;
+        }
+    }
+}
+----
+
+== Architecture
+
+In this guide, we create a straightforward application serving a `hello` endpoint with a single source file, no additional build files like `pom.xml` or `build.gradle` needed. To demonstrate dependency injection, this endpoint uses a `greeting` bean.
+
+image::getting-started-architecture.png[alt=Architecture]
+
+== Creating the initial file
+
+First, we need a Java file. jbang lets you create an initial version using:
+
+[source,bash,subs=attributes+]
+----
+jbang init scripting/quarkusapp.java
+cd scripting
+----
+
+This command generates a .java file that you can directly run on Linux and macOS, i.e. `./quarkusapp.java` - on Windows you need to use `jbang quarkusapp.java`.
+
+This initial version will print `Hello World` when run.
+
+Once generated, look at the `quarkusapp.java`.
+
+You will find at the top a line looking like this:
+
+[source,java]
+----
+//usr/bin/env jbang "$0" "$@" ; exit $?
+----
+
+This line is what on Linux and macOS allows you to run it as a script. On Windows this line is ignored.
+
+The next line
+
+[source,java]
+----
+// //DEPS <dependency1> <dependency2>
+----
+
+Is illustrating how you add dependencies to this script. This is a feature of `jbang`.
+
+Go ahead and update this line to include the `quarkus-resteasy` dependency like so:
+
+[source,java,subs=attributes+]
+----
+//DEPS io.quarkus:quarkus-resteasy:{quarkus-version}
+----
+
+Now, run `jbang quarkusapp.java` and you will see `jbang` resolving this dependency and building the jar with help from Quarkus' jbang integration.
+
+[source,shell,subs=attributes+]
+----
+$ jbang quarkusapp.java
+
+[jbang] Resolving dependencies...
+[jbang]     Resolving io.quarkus:quarkus-resteasy:{quarkus-version}...Done
+[jbang] Dependencies resolved
+[jbang] Building jar...
+[jbang] Post build with io.quarkus.launcher.JBangIntegration
+Aug 30, 2020 5:40:55 AM org.jboss.threads.Version <clinit>
+INFO: JBoss Threads version 3.1.1.Final
+Aug 30, 2020 5:40:56 AM io.quarkus.deployment.QuarkusAugmentor run
+INFO: Quarkus augmentation completed in 722ms
+Hello World
+----
+
+For now the application does nothing new.
+
+[TIP]
+.How do I edit this file and get content assist?
+====
+As there is nothing but a `.java` file, most IDE's don't handle content assist well.
+To work around that you can run `jbang edit quarkusapp.java`, this will print out a directory that will have a temporary project setup you can use in your IDE.
+
+On Linux/macOS you can run `<idecommand> `jbang edit quarkusapp.java``.
+
+If you add dependencies while editing you can get jbang to automatically refresh
+the IDE project using `jbang edit --live=<idecommand> quarkusapp.java`.
+====
+
+
+=== The JAX-RS resources
+
+Now let us replace the class with one that uses Quarkus features:
+
+[source,java]
+----
+import io.quarkus.runtime.Quarkus;
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/hello")
+@ApplicationScoped
+public class quarkusapp {
+
+    @GET
+    public String sayHello() {
+        return "hello";
+    }
+
+    public static void main(String[] args) {
+        Quarkus.run(args);
+    }
+}
+----
+
+It's a very simple class with a main method that starts Quarkus with a REST endpoint, returning "hello" to requests on "/hello".
+
+[TIP]
+.Why is the `main` method there?
+====
+A `main` method is currently needed for the `jbang` integration to work - we might remove this requirement in the future.
+====
+
+== Running the application
+
+Now when you run the application you will see Quarkus start up.
+
+Use: `jbang quarkusapp.java`:
+
+[source,shell,subs=attributes+]
+----
+$ jbang quarkusapp.java
+
+[jbang] Building jar...
+[jbang] Post build with io.quarkus.launcher.JBangIntegration
+Aug 30, 2020 5:49:01 AM org.jboss.threads.Version <clinit>
+INFO: JBoss Threads version 3.1.1.Final
+Aug 30, 2020 5:49:02 AM io.quarkus.deployment.QuarkusAugmentor run
+INFO: Quarkus augmentation completed in 681ms
+__  ____  __  _____   ___  __ ____  ______
+ --/ __ \/ / / / _ | / _ \/ //_/ / / / __/
+ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \
+--\___\_\____/_/ |_/_/|_/_/|_|\____/___/
+2020-08-30 05:49:03,255 INFO  [io.quarkus] (main) Quarkus {quarkus-version} on JVM started in 0.638s. Listening on: http://0.0.0.0:8080
+2020-08-30 05:49:03,272 INFO  [io.quarkus] (main) Profile prod activated.
+2020-08-30 05:49:03,272 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy]
+----
+
+Once started, you can request the provided endpoint:
+
+[source,shell]
+----
+$ curl -w "\n" http://localhost:8080/hello
+hello
+----
+
+After that, hit `CTRL+C` to stop the application.
+
+[TIP]
+.Automatically add newline with `curl -w "\n"`
+====
+We are using `curl -w "\n"` in this example to avoid your terminal printing a '%' or put both result and next command prompt on the same line.
+====
+
+[TIP]
+.Why is `quarkus-resteasy` not resolved?
+====
+In this second run you should not see a line saying it is resolving `quarkus-resteasy` as jbang caches the dependency resolution between runs.
+If you want to clear the caches to force resolution use `jbang cache clear`.
+====
+
+== Using injection
+
+Dependency injection in Quarkus is based on ArC which is a CDI-based dependency injection solution tailored for Quarkus' architecture.
+You can learn more about it in the link:cdi-reference[Contexts and Dependency Injection guide].
+
+ArC comes as a dependency of `quarkus-resteasy` so you already have it handy.
+
+Let's modify the application and add a companion bean.
+
+Normally you would add a separate class, but as we are aiming to have it all in one file you will add a
+nested class.
+
+Add the following *inside* the `quarkusapp` class body.
+
+[source, java]
+----
+@ApplicationScoped
+static public class GreetingService {
+
+    public String greeting(String name) {
+        return "hello " + name;
+    }
+
+}
+----
+
+[TIP]
+.Use of nested static public classes
+====
+We are using a nested static public class instead of a top level class for two reasons:
+
+. jbang currently does not support multiple source files.
+. All Java frameworks relying on introspection have challenges using top level classes as they are not as visible as public classes; and in Java there can only be one top level public class in a file.
+
+====
+
+Edit the `quarksapp` class to inject the `GreetingService` and create a new endpoint using it, you should end up with something like:
+
+[source,java,subs=attributes+]
+----
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS io.quarkus:quarkus-resteasy:{quarkus-version}
+
+import io.quarkus.runtime.Quarkus;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@Path("/hello")
+@ApplicationScoped
+public class quarkusapp {
+
+    @GET
+    public String sayHello() {
+        return "hello from Quarkus with jbang.dev";
+    }
+
+    public static void main(String[] args) {
+        Quarkus.run(args);
+    }
+
+    @Inject
+    GreetingService service;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("/greeting/{name}")
+    public String greeting(@PathParam String name) {
+        return service.greeting(name);
+    }
+
+    @ApplicationScoped
+    static public class GreetingService {
+
+        public String greeting(String name) {
+            return "hello " + name;
+        }
+    }
+}
+----
+
+Now when you run `jbang quarkusapp.java` you can check what the new end point returns:
+
+[source,shell,subs=attributes+]
+----
+$ curl -w "\n" http://localhost:8080/hello/greeting/quarkus
+hello null
+----
+
+Now that is unexpected, why is it returning `hello null` and not `hello quarkus`?
+
+The reason is that JAX-RS `@PathParam` relies on the `-parameters` compiler flag to be set to be able to map `{name}` to the `name` parameter.
+
+We fix that by adding the following comment instruction to the file:
+
+[source,java,subs=attributes+]
+----
+//JAVAC_OPTIONS -parameters
+----
+
+Now when you run with `jbang quarkusapp.java` the end point should return what you expect:
+
+[source,shell,subs=attributes+]
+----
+$ curl -w "\n" http://localhost:8080/hello/greeting/quarkus
+hello quarkus
+----
+
+== Debugging
+
+To debug the application you use `jbang --debug quarkusapp.java` and you can use your IDE to connect on port 4004; if you want to use the
+more traditional Quarkus debug port you can use `jbang --debug=5005 quarkusapp.java`.
+
+Note: `jbang` debugging always suspends thus you need to connect the debugger to have the application run.
+
+== Logging
+
+To use logging in Quarkus scripting with jbang you do as usual, with configuring a logger, i.e.
+
+[source,java]
+----
+public static final Logger LOG = Logger.getLogger(quarkusapp.class);
+----
+
+To get it to work you need to add a Java option to ensure the logging is initialized properly, i.e.
+
+[source,java]
+----
+//JAVA_OPTIONS -Djava.util.logging.manager=org.jboss.logmanager.LogManager
+----
+
+With that in place running `jbang quarkusapp.java` will log and render as expected.
+
+== Configuring Application
+
+You can use `//Q:CONFIG <property>=<value>` to set up static configuration for your application.
+
+I.e. if you wanted to add the `smallrye-openapi` and `swagger-ui` extensions and have the Swagger UI always show up you would add the following:
+
+[source,java,subs=attributes+]
+----
+//DEPS io.quarkus:quarkus-smallrye-openapi:{quarkus-version}
+//DEPS io.quarkus:quarkus-swagger-ui:{quarkus-version}
+//Q:CONFIG quarkus.swagger-ui.always-include=true
+----
+
+Now during build the `quarkus.swagger-ui.always-include` will be generated into the resulting jar and `http://0.0.0.0:8080/q/swagger-ui` will be available when run.
+
+== Running as a native application
+
+If you have the `native-image` binary installed and `GRAALVM_HOME` set, you can get the native executable built and run using `jbang --native quarkusapp.java`:
+
+[source,shell,subs=attributes+]
+----
+$ jbang --native quarkusapp
+
+[jbang] Building jar...
+[jbang] Post build with io.quarkus.launcher.JBangIntegration
+Aug 30, 2020 6:21:15 AM org.jboss.threads.Version <clinit>
+INFO: JBoss Threads version 3.1.1.Final
+Aug 30, 2020 6:21:16 AM io.quarkus.deployment.pkg.steps.JarResultBuildStep buildNativeImageThinJar
+INFO: Building native image source jar: /var/folders/yb/sytszfld4sg8vwr1h0w20jlw0000gn/T/quarkus-jbang3291688251685023074/quarkus-application-native-image-source-jar/quarkus-application-runner.jar
+Aug 30, 2020 6:21:16 AM io.quarkus.deployment.pkg.steps.NativeImageBuildStep build
+INFO: Building native image from /var/folders/yb/sytszfld4sg8vwr1h0w20jlw0000gn/T/quarkus-jbang3291688251685023074/quarkus-application-native-image-source-jar/quarkus-application-runner.jar
+Aug 30, 2020 6:21:16 AM io.quarkus.deployment.pkg.steps.NativeImageBuildStep checkGraalVMVersion
+INFO: Running Quarkus native-image plugin on GraalVM Version 20.1.0 (Java Version 11.0.7)
+Aug 30, 2020 6:21:16 AM io.quarkus.deployment.pkg.steps.NativeImageBuildStep build
+INFO: /Users/max/.sdkman/candidates/java/20.1.0.r11-grl/bin/native-image -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dvertx.disableDnsResolver=true -J-Dio.netty.leakDetection.level=DISABLED -J-Dio.netty.allocator.maxOrder=1 -J-Duser.language=en -J-Dfile.encoding=UTF-8 --initialize-at-build-time= -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy\$BySpaceAndTime -H:+JNI -jar quarkus-application-runner.jar -H:FallbackThreshold=0 -H:+ReportExceptionStackTraces -H:-AddAllCharsets -H:EnableURLProtocols=http --no-server -H:-UseServiceLoaderFeature -H:+StackTrace quarkus-application-runner
+
+Aug 30, 2020 6:22:31 AM io.quarkus.deployment.QuarkusAugmentor run
+INFO: Quarkus augmentation completed in 76010ms
+__  ____  __  _____   ___  __ ____  ______
+ --/ __ \/ / / / _ | / _ \/ //_/ / / / __/
+ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \
+--\___\_\____/_/ |_/_/|_/_/|_|\____/___/
+2020-08-30 06:22:32,012 INFO  [io.quarkus] (main) Quarkus {quarkus-version} native started in 0.017s. Listening on: http://0.0.0.0:8080
+2020-08-30 06:22:32,013 INFO  [io.quarkus] (main) Profile prod activated.
+2020-08-30 06:22:32,013 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy]
+----
+
+This native build will take some time on first run but any subsequent runs (without changing `quarkusapp.java`) will be close to instant thanks to jbang cache:
+
+[source,shell,subs=attributes+]
+----
+$ jbang --native quarkusapp.java
+__  ____  __  _____   ___  __ ____  ______
+ --/ __ \/ / / / _ | / _ \/ //_/ / / / __/
+ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \
+--\___\_\____/_/ |_/_/|_/_/|_|\____/___/
+2020-08-30 06:23:36,846 INFO  [io.quarkus] (main) Quarkus {quarkus-version} native started in 0.015s. Listening on: http://0.0.0.0:8080
+2020-08-30 06:23:36,846 INFO  [io.quarkus] (main) Profile prod activated.
+2020-08-30 06:23:36,846 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy]
+----
+
+=== Conclusion
+
+If you want to get started with Quarkus or write something quickly, Quarkus Scripting with jbang lets you do that. No Maven, no Gradle - just a Java file. In this guide we outlined the very basics on using Quarkus with jbang; if you want to learn more about what jbang can do, go see https://jbang.dev.
diff --git a/docs/src/main/asciidoc/security-authorization.adoc b/docs/src/main/asciidoc/security-authorization.adoc
index 3eb27fb1de816..fde71e04b0bd4 100644
--- a/docs/src/main/asciidoc/security-authorization.adoc
+++ b/docs/src/main/asciidoc/security-authorization.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Authorization of Web Endpoints
 
@@ -152,6 +152,20 @@ That is if the security annotations do not define the access control. Defaults t
 and JAX-RS endpoints that do not have security annotations but are defined in classes that contain methods with
 security annotations. Defaults to `false`.
 
+=== Disabling permissions 
+
+Permissions can be disabled at build time with an `enabled` property for each declared permission, for example: 
+
+[source,properties]
+----
+quarkus.http.auth.permission.permit1.enabled=false
+quarkus.http.auth.permission.permit1.paths=/public/*,/css/*,/js/*,/robots.txt
+quarkus.http.auth.permission.permit1.policy=permit
+quarkus.http.auth.permission.permit1.methods=GET,HEAD
+----
+
+and enabled at runtime with a system property or environment variable, for example: `-Dquarkus.http.auth.permission.permit1.enabled=true`.
+
 [#standard-security-annotations]
 == Authorization using Annotations
 
@@ -211,3 +225,7 @@ public class SubjectExposingResource {
 <3> The `/subject/unsecured` endpoint allows for unauthenticated access by specifying the `@PermitAll` annotation.
 <4> This call to obtain the user principal will return null if the caller is unauthenticated, non-null if the caller is authenticated.
 <5> The `/subject/denied` endpoint disallows any access regardless of whether the call is authenticated by specifying the `@DenyAll` annotation.
+
+== References
+
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-built-in-authentication.adoc b/docs/src/main/asciidoc/security-built-in-authentication.adoc
index 4c43d67acd3d0..eb7fd2bc21d83 100644
--- a/docs/src/main/asciidoc/security-built-in-authentication.adoc
+++ b/docs/src/main/asciidoc/security-built-in-authentication.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Built-In Authentication Support
 
@@ -17,6 +17,8 @@ that provides a username/password based `IdentityProvider`, such as link:securit
 
 Please see link:security#identity-providers[Security Identity Providers] for more information.
 
+Please also see link:security-testing#configuring-user-information[Configuring User Information in application.properties] section.
+
 [[form-auth]]
 == Form Based Authentication
 
@@ -28,7 +30,7 @@ be read by all members of the cluster (provided they all share the same encrypti
 The encryption key can be set using the `quarkus.http.auth.session.encryption-key` property, and it must be at least 16 characters
 long. This key is hashed using SHA-256 and the resulting digest is used as a key for AES-256 encryption of the cookie
 value. This cookie contains an expiry time as part of the encrypted value, so all nodes in the cluster must have their
-clocks synchronised. At one minute intervals a new cookie will be generated with an updated expiry time if the session
+clocks synchronized. At one minute intervals a new cookie will be generated with an updated expiry time if the session
 is in use.
 
 The following properties can be used to configure form based auth:
@@ -40,7 +42,7 @@ include::{generated-dir}/config/quarkus-vertx-http-config-group-form-auth-config
 
 Quarkus provides mTLS authentication so that you can authenticate users based on their X.509 certificates.
 
-To use this authentication method, you should first enable SSL for your application. For more details, check the link:http-reference[Supporting secure connections with SSL] guide.
+To use this authentication method, you should first enable SSL for your application. For more details, check the link:http-reference#ssl[Supporting secure connections with SSL] guide.
 
 Once your application is accepting secure connections, the next step is to configure a `quarkus.http.ssl.certificate.trust-store-file`
 holding all the certificates that your application should trust as well as how your application should ask for certificates when
@@ -87,10 +89,18 @@ You should also be able to get the certificate as follows:
 .Obtaining the certificate
 [source,java]
 ----
+import java.security.cert.X509Certificate;
+import io.quarkus.security.credential.CertificateCredential;
+
 CertificateCredential credential = identity.getCredential(CertificateCredential.class);
 X509Certificate certificate = credential.getCertificate();
 ----
 
+=== Authorization
+
+The information from the client certificate can be used to enhance Quarkus `SecurityIdentity`. For example, one can add new roles after checking a client certificate subject name, etc.
+Please see the link:security-customization#security-identity-customization[SecurityIdentity Customization] section for more information about customizing Quarkus `SecurityIdentity`.
+
 [[proactive-authentication]]
 == Proactive Authentication
 
@@ -98,5 +108,26 @@ By default Quarkus does what we call proactive authentication. This means that i
 credential then that request will always be authenticated (even if the target page does not require authentication).
 
 This means that requests with an invalid credential will always be rejected, even for public pages. You can change
-this behaviour and only authenticate when required by setting `quarkus.http.auth.proactive=false`.
+this behavior and only authenticate when required by setting `quarkus.http.auth.proactive=false`.
+
+If you disable proactive authentication then the authentication process will only be run when an identity is requested,
+either because there are security rules that requires the user to be authenticated, or due to programatic access to the
+current identity.
+
+Note that if proactive authentication is in use accessing the `SecurityIdentity` is a blocking operation. This is because
+authentication may not have happened yet, and accessing it may require calls to external systems such as databases that
+may block. For blocking applications this is no problem, however if you are have disabled authentication in a reactive
+application this will fail (as you cannot do blocking operations on the IO thread). To work around this you need to
+`@Inject` an instance of `io.quarkus.security.identity.CurrentIdentityAssociation`, and call the
+`Uni<SecurityIdentity> getDeferredIdentity();` method. You can then subscribe to the resulting `Uni` and will be notified
+when authentication is complete and the identity is available.
+
+[NOTE]
+====
+By default the authentication security constraints are enforced before the JAX-RS chain starts.
+Disabling the proactive authentication effectively shifts this process to the moment when the JAX-RS chain starts running thus making it possible to use JAX-RS `ExceptionMapper` to capture Quarkus Security authentication exceptions such as `io.quarkus.security.AuthenticationFailedException` if required.
+====
+
+== References
 
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-customization.adoc b/docs/src/main/asciidoc/security-customization.adoc
index 458dcac1034a1..07b588c00a78b 100644
--- a/docs/src/main/asciidoc/security-customization.adoc
+++ b/docs/src/main/asciidoc/security-customization.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Security Tips and Tricks
 
@@ -48,6 +48,7 @@ public class CustomAwareJWTAuthMechanism implements HttpAuthenticationMechanism
 }
 ----
 
+[[security-identity-customization]]
 == Security Identity Customization
 
 Internally, the identity providers create and update an instance of the `io.quarkus.security.identity.SecurityIdentity` class which holds the principal, roles, credentials which were used to authenticate the client (user) and other security attributes. An easy option to customize `SecurityIdentity` is to register a custom `SecurityIdentityAugmentor`. For example, the augmentor below adds an addition role:
@@ -66,26 +67,20 @@ import java.util.function.Supplier;
 @ApplicationScoped
 public class RolesAugmentor implements SecurityIdentityAugmentor {
 
-    @Override
-    public int priority() {
-        return 0;
-    }
-
     @Override
     public Uni<SecurityIdentity> augment(SecurityIdentity identity, AuthenticationRequestContext context) {
-        return context.runBlocking(build(identity));
+        return Uni.createFrom().item(build(identity));
+
+        // Do 'return context.runBlocking(build(identity));'
+        // if a blocking call is required to customize the identity
     }
 
     private Supplier<SecurityIdentity> build(SecurityIdentity identity) {
         if(identity.isAnonymous()) {
             return () -> identity;
         } else {
-            // create a new builder and copy principal, attributes, credentials and roles from the original
-            QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder()
-                    .setPrincipal(identity.getPrincipal())
-                    .addAttributes(identity.getAttributes())
-                    .addCredentials(identity.getCredentials())
-                    .addRoles(identity.getRoles());
+            // create a new builder and copy principal, attributes, credentials and roles from the original identity
+            QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder(identity);
 
             // add custom role source here
             builder.addRole("dummy");
@@ -95,6 +90,62 @@ public class RolesAugmentor implements SecurityIdentityAugmentor {
 }
 ----
 
+Here is another example showing how to use the client certificate available in the current link:security-built-in-authentication#mutual-tls[Mutual TLS] request to add more roles:
+
+[source,java]
+----
+import java.security.cert.X509Certificate;
+import io.quarkus.security.credential.CertificateCredential;
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.identity.SecurityIdentityAugmentor;
+import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+import io.smallrye.mutiny.Uni;
+
+import javax.enterprise.context.ApplicationScoped;
+import java.util.function.Supplier;
+import java.util.Set;
+
+@ApplicationScoped
+public class RolesAugmentor implements SecurityIdentityAugmentor {
+
+    @Override
+    public Uni<SecurityIdentity> augment(SecurityIdentity identity, AuthenticationRequestContext context) {
+        return Uni.createFrom().item(build(identity));
+    }
+
+    private Supplier<SecurityIdentity> build(SecurityIdentity identity) {
+        // create a new builder and copy principal, attributes, credentials and roles from the original identity
+        QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder(identity);
+
+        CertificateCredential certificate = identity.getCredential(CertificateCredential.class);
+        if (certificate != null) {
+            builder.addRoles(extractRoles(certificate.getCertificate()));
+        }
+        return builder::build;
+    }
+
+    private Set<String> extractRoles(X509Certificate certificate) {
+        String name = certificate.getSubjectX500Principal().getName();
+
+        switch (name) {
+            case "CN=client":
+                return Collections.singleton("user");
+            case "CN=guest-client":
+                return Collections.singleton("guest");
+            default:
+                return Collections.emptySet();
+        }
+    }
+}
+----
+
+[NOTE]
+===
+If more than one custom `SecurityIdentityAugmentor` is registered then they will be considered equal candidates and invoked in random order.
+You can enforce the order by implementing a default `SecurityIdentityAugmentor#priority` method. Augmentors with higher priorities will be invoked first.
+===
+
 == Custom JAX-RS SecurityContext
 
 If you use JAX-RS `ContainerRequestFilter` to set a custom JAX-RS `SecurityContext` then make sure `ContainerRequestFilter` runs in the JAX-RS pre-match phase by adding a `@PreMatching` annotation to it for this custom security context to be linked with Quarkus `SecurityIdentity`, for example:
@@ -159,18 +210,20 @@ If you have a good reason to disable the authorization (for example, when testin
 @Priority(Interceptor.Priority.LIBRARY_AFTER)
 @ApplicationScoped
 public class DisabledAuthController extends AuthorizationController {
-    @ConfigProperty(name = "disable.authorization")
+    @ConfigProperty(name = "disable.authorization", defaultValue = "false")
     boolean disableAuthorization;
 
     @Override
     public boolean isAuthorizationEnabled() {
-        return disableAuthorization;
+        return !disableAuthorization;
     }
 }
 ----
 
 == Registering Security Providers
 
+=== Default providers
+
 When running in native mode, the default behavior for GraalVM native executable generation is to only include the main "SUN" provider
 unless you have enabled SSL, in which case all security providers are registered. If you are not using SSL, then you can selectively
 register security providers by name using the `quarkus.security.security-providers` property. The following example illustrates
@@ -182,6 +235,117 @@ configuration to register the "SunRsaSign" and "SunJCE" security providers:
 quarkus.security.security-providers=SunRsaSign,SunJCE
 ----
 
+=== BouncyCastle
+
+If you need to register an `org.bouncycastle.jce.provider.BouncyCastleProvider` JCE provider then please set a `BC` provider name:
+
+.Example Security Providers BouncyCastle Configuration
+[source,properties]
+----
+quarkus.security.security-providers=BC
+----
+
+and add the BouncyCastle provider dependency:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcprov-jdk15on</artifactId>
+</dependency>
+----
+
+=== BouncyCastle JSSE
+
+If you need to register an `org.bouncycastle.jsse.provider.BouncyCastleJsseProvider` JSSE provider and use it instead of the default SunJSSE provider then please set a `BCJSSE` provider name:
+
+.Example Security Providers BouncyCastle JSSE Configuration
+[source,properties]
+----
+quarkus.security.security-providers=BCJSSE
+
+quarkus.http.ssl.client-auth=REQUIRED
+
+quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
+quarkus.http.ssl.certificate.key-store-password=password
+quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks
+quarkus.http.ssl.certificate.trust-store-password=password
+----
+
+and add the BouncyCastle TLS dependency:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bctls-jdk15on</artifactId>
+</dependency>
+----
+
+=== BouncyCastle FIPS
+
+If you need to register an `org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider` JCE provider then please set a `BCFIPS` provider name:
+
+.Example Security Providers BouncyCastle FIPS Configuration
+[source,properties]
+----
+quarkus.security.security-providers=BCFIPS
+----
+
+and add the BouncyCastle FIPS provider dependency:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bc-fips</artifactId>
+</dependency>
+----
+
+=== BouncyCastle JSSE FIPS
+
+If you need to register an `org.bouncycastle.jsse.provider.BouncyCastleJsseProvider` JSSE provider and use it in combination with `org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider` instead of the default SunJSSE provider then please set a `BCFIPSJSSE` provider name:
+
+.Example Security Providers BouncyCastle FIPS JSSE Configuration
+[source,properties]
+----
+quarkus.security.security-providers=BCFIPSJSSE
+
+quarkus.http.ssl.client-auth=REQUIRED
+
+quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
+quarkus.http.ssl.certificate.key-store-password=password
+quarkus.http.ssl.certificate.key-store-file-type=BCFKS
+quarkus.http.ssl.certificate.key-store-provider=BCFIPS
+quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks
+quarkus.http.ssl.certificate.trust-store-password=password
+quarkus.http.ssl.certificate.trust-store-file-type=BCFKS
+quarkus.http.ssl.certificate.trust-store-provider=BCFIPS
+----
+
+and the BouncyCastle TLS dependency optimized for using the BouncyCastle FIPS provider:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bctls-fips</artifactId>
+</dependency>
+
+<dependency>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bc-fips</artifactId>
+</dependency>
+----
+
+Note that the keystore and truststore type and provider are set to `BCFKS` and `BCFIPS`.
+One can generate a keystore with this type and provider like this:
+
+[source,shell]
+----
+keytool -genkey -alias server -keyalg RSA -keystore server-keystore.jks -keysize 2048 -keypass password -provider org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider -providerpath $PATH_TO_BC_FIPS_JAR -storetype BCFKS
+----
+
 == Reactive Security
 
 If you are going to use security in a reactive environment, you will likely need SmallRye Context Propagation:
@@ -196,6 +360,9 @@ If you are going to use security in a reactive environment, you will likely need
 
 This will allow you to propagate the identity throughout the reactive callbacks. You also need to make sure you
 are using an executor that is capable of propagating the identity (e.g. no `CompletableFuture.supplyAsync`),
-to make sure that quarkus can propagate it. For more information see the
+to make sure that Quarkus can propagate it. For more information see the
 link:context-propagation[Context Propagation Guide].
 
+== References
+
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-jdbc.adoc b/docs/src/main/asciidoc/security-jdbc.adoc
index 50c0ccfb32243..23fb2b79f345d 100644
--- a/docs/src/main/asciidoc/security-jdbc.adoc
+++ b/docs/src/main/asciidoc/security-jdbc.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Security with JDBC
 
@@ -44,12 +44,13 @@ The solution is located in the `security-jdbc-quickstart` {quickstarts-tree-url}
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-jdbc-quickstart \
-    -Dextensions="elytron-security-jdbc, jdbc-postgresql, resteasy"
+    -Dextensions="elytron-security-jdbc,jdbc-postgresql,resteasy" \
+    -DnoExamples
 cd security-jdbc-quickstart
 ----
 
@@ -141,9 +142,7 @@ import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.SecurityContext;
 
 @Path("/api/users")
@@ -152,7 +151,6 @@ public class UserResource {
     @GET
     @RolesAllowed("user")
     @Path("/me")
-    @Produces(MediaType.APPLICATION_JSON)
     public String me(@Context SecurityContext securityContext) {
         return securityContext.getUserPrincipal().getName();
     }
@@ -171,7 +169,7 @@ quarkus.datasource.password=quarkus
 quarkus.datasource.jdbc.url=jdbc:postgresql:elytron-security-jdbc
 ----
 
-In our context, we are using PostgreSQL as identity store and we init the database with users and roles.
+In our context, we are using PostgreSQL as identity store and we initialize the database with users and roles.
 
 [source,sql]
 ----
@@ -257,6 +255,7 @@ By providing the `admin:admin` credentials, the extension authenticated the user
 The `admin` user is authorized to access to the protected resources.
 
 The user `admin` should be forbidden to access a resource protected with `@RolesAllowed("user")` because it doesn't have this role.
+
 [source,shell]
 ----
 $ curl -i -X GET -u admin:admin http://localhost:8080/api/users/me
@@ -268,9 +267,10 @@ Forbidden%
 ----
 
 Finally, using the user `user` works and the security context contains the principal details (username for instance).
+
 [source,shell]
 ----
-curl -i -X GET -u user:user http://localhost:8080/api/users/me
+$ curl -i -X GET -u user:user http://localhost:8080/api/users/me
 HTTP/1.1 200 OK
 Content-Length: 4
 Content-Type: text/plain;charset=UTF-8
@@ -310,7 +310,6 @@ quarkus.security.jdbc.principal-query.roles.attribute-mappings.0.to=groups
 
 include::{generated-dir}/config/quarkus-elytron-security-jdbc.adoc[opts=optional, leveloffset=+1]
 
-== Future Work
+== References
 
-* Propose more password mappers.
-* Provide an opinionated configuration.
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-jpa.adoc b/docs/src/main/asciidoc/security-jpa.adoc
index a00fd77f9dfec..acacf06d410a3 100644
--- a/docs/src/main/asciidoc/security-jpa.adoc
+++ b/docs/src/main/asciidoc/security-jpa.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Security with JPA
 
@@ -45,12 +45,13 @@ The solution is located in the `security-jpa-quickstart` {quickstarts-tree-url}/
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-jpa-quickstart \
-    -Dextensions="security-jpa, jdbc-postgresql, resteasy, hibernate-orm-panache"
+    -Dextensions="security-jpa,jdbc-postgresql,resteasy,hibernate-orm-panache" \
+    -DnoExamples
 cd security-jpa-quickstart
 ----
 
@@ -142,9 +143,7 @@ import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.SecurityContext;
 
 @Path("/api/users")
@@ -153,7 +152,6 @@ public class UserResource {
     @GET
     @RolesAllowed("user")
     @Path("/me")
-    @Produces(MediaType.APPLICATION_JSON)
     public String me(@Context SecurityContext securityContext) {
         return securityContext.getUserPrincipal().getName();
     }
@@ -210,7 +208,7 @@ The `security-jpa` extension is only initialized if there is a single entity ann
 
 <1> This annotation must be present on a single entity. It can be a regular Hibernate ORM entity or a Hibernate ORM with Panache entity as in this example.
 <2> This indicates the field used for the user name.
-<3> This indicates the field used for the password. This defaults to using bcrypt hashed passwords, but you can also configure it for clear text passwords.
+<3> This indicates the field used for the password. This defaults to using bcrypt hashed passwords, but you can also configure it for clear text passwords or custom passwords.
 <4> This indicates the comma-separated list of roles added to the target Principal representation attributes.
 <5> This method allows us to add users while hashing the password with the proper bcrypt hash.
 
@@ -229,7 +227,7 @@ quarkus.hibernate-orm.database.generation=drop-and-create
 ----
 
 In our context, we are using PostgreSQL as identity store. The database schema is created by Hibernate ORM automatically
-on startup (change this in production) and we initialise the database with users and roles in the `Startup` class:
+on startup (change this in production) and we initialize the database with users and roles in the `Startup` class:
 
 [source,java]
 ----
@@ -262,6 +260,11 @@ As a result, the `security-jpa` defaults to using bcrypt-hashed passwords.
 
 == Testing the Application
 
+[NOTE]
+====
+In the following tests we use the basic authentication mechanism, you can enable it by setting `quarkus.http.auth.basic=true` in the `application.properties` file.
+====
+
 The application is now protected and the identities are provided by our database.
 The very first thing to check is to ensure the anonymous access works.
 
@@ -302,6 +305,7 @@ By providing the `admin:admin` credentials, the extension authenticated the user
 The `admin` user is authorized to access to the protected resources.
 
 The user `admin` should be forbidden to access a resource protected with `@RolesAllowed("user")` because it doesn't have this role.
+
 [source,shell]
 ----
 $ curl -i -X GET -u admin:admin http://localhost:8080/api/users/me
@@ -313,9 +317,10 @@ Forbidden%
 ----
 
 Finally, using the user `user` works and the security context contains the principal details (username for instance).
+
 [source,shell]
 ----
-curl -i -X GET -u user:user http://localhost:8080/api/users/me
+$ curl -i -X GET -u user:user http://localhost:8080/api/users/me
 HTTP/1.1 200 OK
 Content-Length: 4
 Content-Type: text/plain;charset=UTF-8
@@ -371,8 +376,45 @@ When you need to create such a hashed password we provide the convenient `String
 function, which defaults to creating a random salt and hashing in 10 iterations (though you can specify the iterations and salt
 too).
 
-NOTE: with MCF you don't need dedicated columns to store the hashing algo, the iterations count or the salt because
+NOTE: with MCF you don't need dedicated columns to store the hashing algorithm, the iterations count or the salt because
 they're all stored in the hashed value.
 
+You also have the possibility to store password using different hashing algorithm `@Password(value = PasswordType.CUSTOM, provider = CustomPasswordProvider.class)`:
+
+[source,java]
+----
+@UserDefinition
+@Table(name = "test_user")
+@Entity
+public class CustomPasswordUserEntity {
+    @Id
+    @GeneratedValue
+    public Long id;
+
+    @Column(name = "username")
+    @Username
+    public String name;
+
+    @Column(name = "password")
+    @Password(value = PasswordType.CUSTOM, provider = CustomPasswordProvider.class)
+    public String pass;
+
+    @Roles
+    public String role;
+}
+
+public class CustomPasswordProvider implements PasswordProvider {
+    @Override
+    public Password getPassword(String pass) {
+        byte[] digest = DatatypeConverter.parseHexBinary(pass);
+        return SimpleDigestPassword.createRaw(SimpleDigestPassword.ALGORITHM_SIMPLE_DIGEST_SHA_256, digest);
+    }
+}
+----
+
 WARN: you can also store passwords in clear text with `@Password(PasswordType.CLEAR)` but we strongly recommend against
 it in production.
+
+== References
+
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-jwt.adoc b/docs/src/main/asciidoc/security-jwt.adoc
index 89ad1a4c26de7..b8dd9b340296b 100644
--- a/docs/src/main/asciidoc/security-jwt.adoc
+++ b/docs/src/main/asciidoc/security-jwt.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using JWT RBAC
 
@@ -27,14 +27,14 @@ The solution is located in the `security-jwt-quickstart` {quickstarts-tree-url}/
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-jwt-quickstart \
     -DclassName="org.acme.security.jwt.TokenSecuredResource" \
     -Dpath="/secured" \
-    -Dextensions="resteasy-jsonb, jwt"
+    -Dextensions="resteasy,resteasy-jackson,smallrye-jwt,smallrye-jwt-build"
 cd security-jwt-quickstart
 ----
 
@@ -45,7 +45,7 @@ to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="smallrye-jwt"
+./mvnw quarkus:add-extension -Dextensions="smallrye-jwt, smallrye-jwt-build"
 ----
 
 This will add the following to your `pom.xml`:
@@ -56,6 +56,10 @@ This will add the following to your `pom.xml`:
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-smallrye-jwt</artifactId>
 </dependency>
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-smallrye-jwt-build</artifactId>
+</dependency>
 ----
 
 === Examine the JAX-RS resource
@@ -156,7 +160,7 @@ will produce undesirable behavior since JWT claims are naturally request scoped.
 
 Now we are ready to run our application. Use:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -170,13 +174,13 @@ $ ./mvnw compile quarkus:dev
 [INFO] Scanning for projects...
 [INFO]
 [INFO] ----------------------< org.acme:security-jwt-quickstart >-----------------------
-[INFO] Building security-jwt-quickstart 1.0-SNAPSHOT
+[INFO] Building security-jwt-quickstart 1.0.0-SNAPSHOT
 [INFO] --------------------------------[ jar ]---------------------------------
 ...
 Listening for transport dt_socket at address: 5005
-2020-07-15 16:09:50,883 INFO  [io.quarkus] (Quarkus Main Thread) security-jwt-quickstart 1.0-SNAPSHOT on JVM (powered by Quarkus 999-SNAPSHOT) started in 1.073s. Listening on: http://0.0.0.0:8080
+2020-07-15 16:09:50,883 INFO  [io.quarkus] (Quarkus Main Thread) security-jwt-quickstart 1.0.0-SNAPSHOT on JVM (powered by Quarkus 999-SNAPSHOT) started in 1.073s. Listening on: http://0.0.0.0:8080
 2020-07-15 16:09:50,885 INFO  [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated.
-2020-07-15 16:09:50,885 INFO  [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, mutiny, resteasy, resteasy-jsonb, security, smallrye-context-propagation, smallrye-jwt, vertx, vertx-web]
+2020-07-15 16:09:50,885 INFO  [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, mutiny, resteasy, resteasy-jackson, security, smallrye-context-propagation, smallrye-jwt, vertx, vertx-web]
 ----
 
 Now that the REST endpoint is running, we can access it using a command line tool like curl:
@@ -303,10 +307,10 @@ Create a `security-jwt-quickstart/src/main/resources/application.properties` wit
 [source, properties]
 ----
 mp.jwt.verify.publickey.location=META-INF/resources/publicKey.pem #<1>
-mp.jwt.verify.issuer=https://quarkus.io/using-jwt-rbac #<2>
+mp.jwt.verify.issuer=https://example.com/issuer #<2>
 ----
 <1> We are setting public key location to point to a classpath publicKey.pem resource location. We will add this key in part B, <<Adding a Public Key>>.
-<2> We are setting the issuer to the URL string `https://quarkus.io/using-jwt-rbac`.
+<2> We are setting the issuer to the URL string `https://example.com/issuer`.
  
 === Adding a Public Key
 
@@ -357,7 +361,7 @@ public class GenerateToken {
      */
     public static void main(String[] args) {
         String token =
-           Jwt.issuer("https://quarkus.io/using-jwt-rbac") // <1>
+           Jwt.issuer("https://example.com/issuer") // <1>
              .upn("jdoe@quarkus.io") // <2>
              .groups(new HashSet<>(Arrays.asList("User", "Admin"))) // <3>
              .claim(Claims.birthdate.name(), "2001-07-13") // <4>
@@ -374,7 +378,7 @@ in order for the token to be accepted as valid.
 <3> The `group` claim provides the groups and top-level roles associated with the JWT bearer.
 <4> The `birthday` claim. It can be considered to be a sensitive claim so you may want to consider encrypting the claims, see <<generate-jwt-tokens, Generate JWT tokens with SmallRye JWT>>.
 
-Note for this code to work we need the content of the RSA private key that corresponds to the public key we have in the TokenSecuredResource application. Take the following PEM content and place it into `security-jwt-quickstart/src/main/resources/META-INF/resources/privateKey.pem`:
+Note for this code to work we need the content of the RSA private key that corresponds to the public key we have in the TokenSecuredResource application. Take the following PEM content and place it into `security-jwt-quickstart/src/test/resources/privateKey.pem`:
 
 .RSA Private Key PEM Content
 [source, text]
@@ -411,6 +415,29 @@ f3cg+fr8aou7pr9SHhJlZCU=
 
 We will use a `smallrye.jwt.sign.key-location` property to point to this private signing key.
 
+[NOTE]
+.Generating Keys with OpenSSL
+====
+It is also possible to generate a public and private key pair using the OpenSSL command line tool.
+
+.openssl commands for generating keys
+[source, text]
+----
+openssl genrsa -out rsaPrivateKey.pem 2048
+openssl rsa -pubout -in rsaPrivateKey.pem -out publicKey.pem
+----
+
+An additional step is needed for generating the private key for converting it into the PKCS#8 format.
+
+.openssl command for converting private key
+[source, text]
+----
+openssl pkcs8 -topk8 -nocrypt -inform pem -in rsaPrivateKey.pem -outform pem -out privateKey.pem
+----
+
+You can use the generated pair of keys instead of the keys used in this quickstart.
+====
+
 Now we can generate a JWT to use with `TokenSecuredResource` endpoint. To do this, run the following command:
 
 .Command to Generate JWT
@@ -429,7 +456,7 @@ First part - JWT headers, second part - JWT claims, third part - JWT signature.
 == Finally, Secured Access to /secured/roles-allowed
 Now let's use this to make a secured request to the /secured/roles-allowed endpoint. Make sure you have the Quarkus server running using the `./mvnw compile quarkus:dev` command, and then run the following command, making sure to use your version of the generated JWT from the previous step:
 
-[source,shell]
+[source,bash]
 ----
 curl -H "Authorization: Bearer eyJraWQiOiJcL3ByaXZhdGVLZXkucGVtIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJqZG9lLXVzaW5nLWp3dC1yYmFjIiwiYXVkIjoidXNpbmctand0LXJiYWMiLCJ1cG4iOiJqZG9lQHF1YXJrdXMuaW8iLCJiaXJ0aGRhdGUiOiIyMDAxLTA3LTEzIiwiYXV0aF90aW1lIjoxNTUxNjUyMDkxLCJpc3MiOiJodHRwczpcL1wvcXVhcmt1cy5pb1wvdXNpbmctand0LXJiYWMiLCJyb2xlTWFwcGluZ3MiOnsiZ3JvdXAyIjoiR3JvdXAyTWFwcGVkUm9sZSIsImdyb3VwMSI6Ikdyb3VwMU1hcHBlZFJvbGUifSwiZ3JvdXBzIjpbIkVjaG9lciIsIlRlc3RlciIsIlN1YnNjcmliZXIiLCJncm91cDIiXSwicHJlZmVycmVkX3VzZXJuYW1lIjoiamRvZSIsImV4cCI6MTU1MTY1MjM5MSwiaWF0IjoxNTUxNjUyMDkxLCJqdGkiOiJhLTEyMyJ9.aPA4Rlc4kw7n_OZZRRk25xZydJy_J_3BRR8ryYLyHTO1o68_aNWWQCgpnAuOW64svPhPnLYYnQzK-l2vHX34B64JySyBD4y_vRObGmdwH_SEufBAWZV7mkG3Y4mTKT3_4EWNu4VH92IhdnkGI4GJB6yHAEzlQI6EdSOa4Nq8Gp4uPGqHsUZTJrA3uIW0TbNshFBm47-oVM3ZUrBz57JKtr0e9jv0HjPQWyvbzx1HuxZd6eA8ow8xzvooKXFxoSFCMnxotd3wagvYQ9ysBa89bgzL-lhjWtusuMFDUVYwFqADE7oOSOD4Vtclgq8svznBQ-YpfTHfb9QEcofMlpyjNA" http://127.0.0.1:8080/secured/roles-allowed; echo
 ----
@@ -438,7 +465,7 @@ curl -H "Authorization: Bearer eyJraWQiOiJcL3ByaXZhdGVLZXkucGVtIiwidHlwIjoiSldUI
 [source,shell]
 ----
 $ curl -H "Authorization: Bearer eyJraWQ..." http://127.0.0.1:8080/secured/roles-allowed; echo
-hello + jdoe@quarkus.io, isHttps: false, authScheme: MP-JWT, hasJWT: true, birthdate: 2001-07-13
+hello + jdoe@quarkus.io, isHttps: false, authScheme: Bearer, hasJWT: true, birthdate: 2001-07-13
 ----
 
 Success! We now have:
@@ -459,7 +486,7 @@ hold of the caller `JsonWebToken` interface by casting the `SecurityContext#getU
 The `JsonWebToken` interface defines methods for accessing claims in the underlying JWT. It provides accessors for common
 claims that are required by the {mp-jwt} specification as well as arbitrary claims that may exist in the JWT.
 
-All the JWT claims can also be injected. Let's expand our `TokenSecuredResource` with another endpoint /secured/roles-allowed-admin which users the injected `birthdate` claim
+All the JWT claims can also be injected. Let's expand our `TokenSecuredResource` with another endpoint /secured/roles-allowed-admin which uses the injected `birthdate` claim
 (as opposed to getting it from `JsonWebToken`):
 
 [source, java]
@@ -542,7 +569,7 @@ public class TokenSecuredResource {
 
 Now generate the token again and run:
 
-[source,shell]
+[source,bash]
 ----
 curl -H "Authorization: Bearer eyJraWQiOiJcL3ByaXZhdGVLZXkucGVtIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJqZG9lLXVzaW5nLWp3dC1yYmFjIiwiYXVkIjoidXNpbmctand0LXJiYWMiLCJ1cG4iOiJqZG9lQHF1YXJrdXMuaW8iLCJiaXJ0aGRhdGUiOiIyMDAxLTA3LTEzIiwiYXV0aF90aW1lIjoxNTUxNjUyMDkxLCJpc3MiOiJodHRwczpcL1wvcXVhcmt1cy5pb1wvdXNpbmctand0LXJiYWMiLCJyb2xlTWFwcGluZ3MiOnsiZ3JvdXAyIjoiR3JvdXAyTWFwcGVkUm9sZSIsImdyb3VwMSI6Ikdyb3VwMU1hcHBlZFJvbGUifSwiZ3JvdXBzIjpbIkVjaG9lciIsIlRlc3RlciIsIlN1YnNjcmliZXIiLCJncm91cDIiXSwicHJlZmVycmVkX3VzZXJuYW1lIjoiamRvZSIsImV4cCI6MTU1MTY1MjM5MSwiaWF0IjoxNTUxNjUyMDkxLCJqdGkiOiJhLTEyMyJ9.aPA4Rlc4kw7n_OZZRRk25xZydJy_J_3BRR8ryYLyHTO1o68_aNWWQCgpnAuOW64svPhPnLYYnQzK-l2vHX34B64JySyBD4y_vRObGmdwH_SEufBAWZV7mkG3Y4mTKT3_4EWNu4VH92IhdnkGI4GJB6yHAEzlQI6EdSOa4Nq8Gp4uPGqHsUZTJrA3uIW0TbNshFBm47-oVM3ZUrBz57JKtr0e9jv0HjPQWyvbzx1HuxZd6eA8ow8xzvooKXFxoSFCMnxotd3wagvYQ9ysBa89bgzL-lhjWtusuMFDUVYwFqADE7oOSOD4Vtclgq8svznBQ-YpfTHfb9QEcofMlpyjNA" http://127.0.0.1:8080/secured/roles-allowed-admin; echo
 ----
@@ -550,29 +577,28 @@ curl -H "Authorization: Bearer eyJraWQiOiJcL3ByaXZhdGVLZXkucGVtIiwidHlwIjoiSldUI
 [source,shell]
 ----
 $ curl -H "Authorization: Bearer eyJraWQ..." http://127.0.0.1:8080/secured/roles-allowed-admin; echo
-hello + jdoe@quarkus.io, isHttps: false, authScheme: MP-JWT, hasJWT: true, birthdate: 2001-07-13
+hello + jdoe@quarkus.io, isHttps: false, authScheme: Bearer, hasJWT: true, birthdate: 2001-07-13
 ----
 
 === Package and run the application
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file:
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file:
 .Runner jar Example
-[source,shell]
+[source,shell,subs=attributes+]
 ----
-Scotts-iMacPro:security-jwt-quickstart starksm$ ./mvnw clean package
+$ ./mvnw clean package
 [INFO] Scanning for projects...
 ...
-[INFO] [io.quarkus.creator.phase.runnerjar.RunnerJarPhase] Building jar: /Users/starksm/Dev/JBoss/Protean/starksm64-quarkus-quickstarts/security-jwt-quickstart/target/security-jwt-quickstart-runner.jar
 
-Scotts-iMacPro:security-jwt-quickstart starksm$ java -jar target/security-jwt-quickstart-runner.jar
-2019-03-28 14:27:48,839 INFO  [io.quarkus] (main) Quarkus 0.12.0 started in 0.796s. Listening on: http://[::]:8080
-2019-03-28 14:27:48,841 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jsonb, security, smallrye-jwt]
+$ java -jar target/quarkus-app/quarkus-run.jar
+2019-03-28 14:27:48,839 INFO  [io.quarkus] (main) Quarkus {quarkus-version} started in 0.796s. Listening on: http://[::]:8080
+2019-03-28 14:27:48,841 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jackson, security, smallrye-jwt]
 ----
 
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 .Native Executable Example
 [source,shell]
 ----
-Scotts-iMacPro:security-jwt-quickstart starksm$ ./mvnw clean package -Pnative
+$ ./mvnw clean package -Pnative
 [INFO] Scanning for projects...
 ...
 [security-jwt-quickstart-runner:25602]     universe:     493.17 ms
@@ -590,9 +616,9 @@ Scotts-iMacPro:security-jwt-quickstart starksm$ ./mvnw clean package -Pnative
 [INFO] Finished at: 2019-03-28T14:30:56-07:00
 [INFO] ------------------------------------------------------------------------
 
-Scotts-iMacPro:security-jwt-quickstart starksm$ ./target/security-jwt-quickstart-runner
+$ ./target/security-jwt-quickstart-runner
 2019-03-28 14:31:37,315 INFO  [io.quarkus] (main) Quarkus 0.12.0 started in 0.006s. Listening on: http://[::]:8080
-2019-03-28 14:31:37,316 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jsonb, security, smallrye-jwt]
+2019-03-28 14:31:37,316 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jackson, security, smallrye-jwt]
 ----
 
 === Explore the Solution
@@ -638,12 +664,14 @@ SmallRye JWT provides more properties which can be used to customize the token p
 [cols="<m,<m,<2",options="header"]
 |===
 |Property Name|Default|Description
+|smallrye.jwt.verify.key.location|NONE|Location of the verification key which can point to both public and secret keys. Secret keys can only be in the JWK format. Note that 'mp.jwt.verify.publickey.location' will be ignored if this property is set.
 |smallrye.jwt.verify.algorithm|`RS256`|Signature algorithm. Set it to `ES256` to support the Elliptic Curve signature algorithm.
 |smallrye.jwt.verify.key-format|`ANY`|Set this property to a specific key format such as `PEM_KEY`, `PEM_CERTIFICATE`, `JWK` or `JWK_BASE64URL` to optimize the way the verification key is loaded.
 |smallrye.jwt.verify.relax-key-validation|false|Relax the validation of the verification keys, setting this property to `true` will allow public RSA keys with the length less than 2048 bit.
+|smallrye.jwt.verify.certificate-thumbprint|false|If this property is enabled then a signed token must contain either 'x5t' or 'x5t#S256' X509Certificate thumbprint headers. Verification keys can only be in JWK or PEM Certificate key formats in this case. JWK keys must have a 'x5c' (Base64-encoded X509Certificate) property set.
 |smallrye.jwt.token.header|`Authorization`|Set this property if another header such as `Cookie` is used to pass the token.
 |smallrye.jwt.token.cookie|none|Name of the cookie containing a token. This property will be effective only if  `smallrye.jwt.token.header` is set to `Cookie`.
-|smallrye.jwt.always-check-authorization|false|Set this property to true for Authorization header be checked even if the smallrye.jwt.token.header is set to Cookie but no cookie with a smallrye.jwt.token.cookie name exists.
+|smallrye.jwt.always-check-authorization|false|Set this property to `true` for `Authorization` header be checked even if the `smallrye.jwt.token.header` is set to `Cookie` but no cookie with a `smallrye.jwt.token.cookie` name exists.
 |smallrye.jwt.token.schemes|`Bearer`|Comma-separated list containing an alternative single or multiple schemes, for example, `DPoP`.
 |smallrye.jwt.token.kid|none|Key identifier. If it is set then the verification JWK key as well every JWT token must have a matching `kid` header.
 |smallrye.jwt.time-to-live|none|The maximum number of seconds that a JWT may be issued for use. Effectively, the difference between the expiration date of the JWT and the issued at date must not exceed this value.
@@ -653,12 +681,12 @@ SmallRye JWT provides more properties which can be used to customize the token p
 |smallrye.jwt.path.groups|none|Path to the claim containing the groups. It starts from the top level JSON object and can contain multiple segments where each segment represents a JSON object name only, example: `realm/groups`. This property can be used if a token has no 'groups' claim but has the groups set in a different claim. Use double quotes with the namespace qualified claims.
 |smallrye.jwt.groups-separator|' '|Separator for splitting a string which may contain multiple group values. It will only be used if the `smallrye.jwt.path.groups` property points to a custom claim whose value is a string. The default value is a single space because a standard OAuth2 `scope` claim may contain a space separated sequence.
 |smallrye.jwt.claims.groups|none| This property can be used to set a default groups claim value when the current token has no standard or custom groups claim available.
-|smallrye.jwt.jwks.refresh-interval|60|JWK cache refresh interval in minutes. It will be ignored unless the `mp.jwt.verify.publickey.location` points to the HTTPS URL based JWK set and no HTTP `Cache-Control` response header with a positive `max-age` parameter value is returned from a JWK HTTPS endpoint.
-|smallrye.jwt.jwks.forced-refresh-interval|30|Forced JWK cache refresh interval in minutes which is used to restrict the frequency of the forced refresh attempts which may happen when the token verification fails due to the cache having no JWK key with a kid property matching the current token's kid header. It will be ignored unless the mp.jwt.verify.publickey.location points to the HTTPS URL based JWK set.
+|smallrye.jwt.jwks.refresh-interval|60|JWK cache refresh interval in minutes. It will be ignored unless the `mp.jwt.verify.publickey.location` points to the HTTP or HTTPS URL based JWK set and no HTTP `Cache-Control` response header with a positive `max-age` parameter value is returned from a JWK HTTPS endpoint.
+|smallrye.jwt.jwks.forced-refresh-interval|30|Forced JWK cache refresh interval in minutes which is used to restrict the frequency of the forced refresh attempts which may happen when the token verification fails due to the cache having no JWK key with a `kid` property matching the current token's `kid` header. It will be ignored unless the `mp.jwt.verify.publickey.location` points to the HTTP or HTTPS URL based JWK set.
 |smallrye.jwt.expiration.grace|60|Expiration grace in seconds. By default an expired token will still be accepted if the current time is no more than 1 min after the token expiry time.
 |smallrye.jwt.verify.aud|none|Comma separated list of the audiences that a token `aud` claim may contain.
 |smallrye.jwt.required.claims|none|Comma separated list of the claims that a token must contain.
-|smallrye.jwt.decrypt.key-location|none|Config property allows for an external or internal location of Private Decryption Key to be specified.
+|smallrye.jwt.decrypt.key.location|none|Config property allows for an external or internal location of Private Decryption Key to be specified.
 |smallrye.jwt.decrypt.algorithm|`RSA_OAEP`|Decryption algorithm.
 |smallrye.jwt.token.decryption.kid|none|Decryption Key identifier. If it is set then the decryption JWK key as well every JWT token must have a matching `kid` header.
 |===
@@ -666,7 +694,9 @@ SmallRye JWT provides more properties which can be used to customize the token p
 == Create JsonWebToken with JWTParser
 
 If the JWT token can not be injected, for example, if it is embedded in the service request payload or the service endpoint acquires it out of band, then one can use `JWTParser`:
-```
+
+[source,java]
+----
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import io.smallrye.jwt.auth.principal.JWTParser;
 ...
@@ -676,11 +706,12 @@ String token = getTokenFromOidcServer();
 
 // Parse and verify the token
 JsonWebToken jwt = parser.parse(token);
-```
+----
 
 You can also use it to customize the way the token is verified or decrypted. For example, one can supply a local `SecretKey`:
 
-```
+[source,java]
+----
 import javax.crypto.SecretKey;
 import javax.ws.rs.GET;
 import javax.ws.rs.core.NewCookie;
@@ -691,25 +722,28 @@ import io.smallrye.jwt.build.Jwt;
 
 @Path("/secured")
 public class SecuredResource {
- @Inject JWTParser parser;
- private SecretKey key = createSecretKey();
+  @Inject JWTParser parser;
+  private String secret = "AyM1SysPpbyDfgZld3umj1qzKObwVMko";
 
- @GET
- @Produces("text/plain")
- public Response getUserName(@CookieParam("jwt") String jwtCookie) {
+  @GET
+  @Produces("text/plain")
+  public Response getUserName(@CookieParam("jwt") String jwtCookie) {
     Response response = null;
     if (jwtCookie == null) {
-        String newJwtCookie = Jwt.upn("Alice").sign(key);
-        // or newJwtCookie = Jwt.upn("alice").encrypt(key);
+        // Create a JWT token signed using the 'HS256' algorithm
+        String newJwtCookie = Jwt.upn("Alice").signWithSecret(secret);
+        // or create a JWT token encrypted using the 'A256KW' algorithm
+        // Jwt.upn("alice").encryptWithSecret(secret);
         return Response.ok("Alice").cookie(new NewCookie("jwt", newJwtCookie)).build();
-    else {
+    } else {
         // All mp.jwt and smallrye.jwt properties are still effective, only the verification key is customized.
-        JsonWebToken jwt = parser.verify(jwtCookie, key);
-        // or jwt = parser.decrypt(jwtCookie, key);
+        JsonWebToken jwt = parser.verify(jwtCookie, secret);
+        // or jwt = parser.decrypt(jwtCookie, secret);
         return Response.ok(jwt.getName()).build();
     }
+  }
 }
-```
+----
 
 == Token Decryption
 
@@ -724,7 +758,47 @@ See <<generate-jwt-tokens, Generate JWT tokens with SmallRye JWT>> and learn how
 
 == How to check the errors in the logs ==
 
-Set `quarkus.log.category."io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator".level=TRACE` to see more details about the token verification or decryption errors.
+Set `quarkus.log.category."io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator".level=TRACE` and `quarkus.log.category."io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator".min-level=TRACE` to see more details about the token verification or decryption errors.
+
+== Custom Factories
+
+`io.smallrye.jwt.auth.principal.DefaultJWTCallerPrincipalFactory` is used by default to parse and verify JWT tokens and convert them to `JsonWebToken` principals.
+It uses `MP JWT` and `smallrye-jwt` properties listed in the `Configuration` section to verify and customize JWT tokens.
+
+If you need to provide your own factory, for example, to avoid verifying the tokens again which have already been verified by the firewall, then you can either use a `ServiceLoader` mechanism by providing a `META-INF/services/io.smallrye.jwt.auth.principal.JWTCallerPrincipalFactory` resource or simply have an `Alternative` CDI bean implementation like this one:
+
+[source,java]
+----
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.jwt.consumer.InvalidJwtException;
+import io.smallrye.jwt.auth.principal.DefaultJWTCallerPrincipal;
+import io.smallrye.jwt.auth.principal.JWTAuthContextInfo;
+import io.smallrye.jwt.auth.principal.JWTCallerPrincipal;
+import io.smallrye.jwt.auth.principal.JWTCallerPrincipalFactory;
+import io.smallrye.jwt.auth.principal.ParseException;
+
+@ApplicationScoped
+@Alternative
+@Priority(1)
+public class TestJWTCallerPrincipalFactory extends JWTCallerPrincipalFactory {
+
+    @Override
+    public JWTCallerPrincipal parse(String token, JWTAuthContextInfo authContextInfo) throws ParseException {
+        try {
+            // Token has already been verified, parse the token claims only
+            String json = new String(Base64.getUrlDecoder().decode(token.split("\\.")[1]), StandardCharsets.UTF_8);
+            return new DefaultJWTCallerPrincipal(JwtClaims.parse(json));
+        } catch (InvalidJwtException ex) {
+            throw new ParseException(ex.getMessage());
+        }
+    }
+}
+----
 
 [[generate-jwt-tokens]]
 == Generate JWT tokens with SmallRye JWT
@@ -736,6 +810,19 @@ Finally both the confidentiality and integrity of the claims can be further enfo
 
 SmallRye JWT provides an API for securing the JWT claims using all of these options.
 
+== Maven dependency
+
+[source,xml]
+----
+<dependency>
+  <groupId>io.quarkus</groupId>
+  <artifactId>quarkus-smallrye-jwt-build</artifactId>
+</dependency>
+----
+
+Note you can use Smallrye JWT Build API without having to create MP JWT endpoints.
+It can also be excluded from `quarkus-smallrye-jwt` if MP JWT endpoints do not need to generate JWT tokens.
+
 === Create JwtClaimsBuilder and set the claims
 
 The first step is to initialize a `JwtClaimsBuilder` using one of the options below and add some claims to it:
@@ -832,7 +919,9 @@ String jwt = Jwt.claims("/tokenClaims.json").innerSign().encrypt();
 === Fast JWT Generation
 
 If `smallrye.jwt.sign.key-location` or/and `smallrye.jwt.encrypt.key-location` properties are set then one can secure the existing claims (resources, maps, JsonObjects) with a single call:
-```
+
+[source,java]
+----
 // More compact than Jwt.claims("/claims.json").sign();
 Jwt.sign("/claims.json");
 
@@ -841,20 +930,24 @@ Jwt.encrypt("/claims.json");
 
 // More compact than Jwt.claims("/claims.json").innerSign().encrypt();
 Jwt.signAndEncrypt("/claims.json");
-```
+----
 As mentioned above, `iat`, `exp`, `jti` and `iss` claims will be added if needed.
 
 === SmallRye JWT Builder configuration
 
-Smallrye JWT supports the following properties which can be used to customize the way claims are signed and encrypted:
+SmallRye JWT supports the following properties which can be used to customize the way claims are signed and encrypted:
 
 [cols="<m,<m,<2",options="header"]
 |===
 |Property Name|Default|Description
-|smallrye.jwt.sign.key-location|`none`|Location of a private key which will be used to sign the claims when either a no-argument `sign()` or `innerSign()` method is called.
-|smallrye.jwt.encrypt.key-location|`none`|Location of a public key which will be used to encrypt the claims or inner JWT when a no-argument `encrypt()` method is called.
-|smallrye.jwt.new-token.lifespan|300|Token lifespan in seconds which will be used to calculate an exp (expiry) claim value if this claim has not already been set.
-|smallrye.jwt.new-token.issuer|none|Token issuer which can be used to set an iss (issuer) claim value if this claim has not already been set.
+|smallrye.jwt.sign.key.location|`none`|Location of a private key which will be used to sign the claims when either a no-argument `sign()` or `innerSign()` method is called.
+|smallrye.jwt.sign.key-location|`none`|Location of a private key which will be used to sign the claims when either a no-argument `sign()` or `innerSign()` method is called. This property has been deprecated and will be removed in the next major `smallrye-jwt` release.
+|smallrye.jwt.encrypt.key.location|`none`|Location of a public key which will be used to encrypt the claims or inner JWT when a no-argument `encrypt()` method is called.
+|smallrye.jwt.encrypt.key-location|`none`|Location of a public key which will be used to encrypt the claims or inner JWT when a no-argument `encrypt()` method is called. This property has been deprecated and will be removed in the next major `smallrye-jwt` release.
+|smallrye.jwt.new-token.lifespan|300|Token lifespan in seconds which will be used to calculate an `exp` (expiry) claim value if this claim has not already been set.
+|smallrye.jwt.new-token.issuer|none|Token issuer which can be used to set an `iss` (issuer) claim value if this claim has not already been set.
+|smallrye.jwt.new-token.audience|none|Token audience which can be used to set an `aud` (audience) claim value if this claim has not already been set.
+|smallrye.jwt.new-token.override-matching-claims|false| Set this property to `true` for `smallrye.jwt.new-token.issuer` and `smallrye.jwt.new-token.audience` values to override the already initialized `iss` (issuer) and `aud` (audience) claims.
 |===
 
 == References
@@ -866,3 +959,4 @@ Smallrye JWT supports the following properties which can be used to customize th
 * link:https://tools.ietf.org/html/rfc7515[JSON Web Signature]
 * link:https://tools.ietf.org/html/rfc7516[JSON Web Encryption]
 * link:https://tools.ietf.org/html/rfc7518[JSON Web Algorithms]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-keycloak-authorization.adoc b/docs/src/main/asciidoc/security-keycloak-authorization.adoc
index fe04be2dd14ad..4121457d56506 100644
--- a/docs/src/main/asciidoc/security-keycloak-authorization.adoc
+++ b/docs/src/main/asciidoc/security-keycloak-authorization.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OpenID Connect and Keycloak to Centralize Authorization
 
@@ -9,12 +9,14 @@ include::./attributes.adoc[]
 
 This guide demonstrates how your Quarkus application can authorize a bearer token access to protected resources using https://www.keycloak.org/docs/latest/authorization_services/index.html[Keycloak Authorization Services].
 
-The `quarkus-keycloak-authorization` extension is based on `quarkus-oidc` and provides a policy enforcer that enforces access to protected resources based on permissions managed by Keycloak and currently can only be used with the Quarkus link:security-openid-connect[OIDC service appications].
+The `quarkus-keycloak-authorization` extension is based on `quarkus-oidc` and provides a policy enforcer that enforces access to protected resources based on permissions managed by Keycloak and currently can only be used with the Quarkus link:security-openid-connect[OIDC service applications].
 It provides a flexible and dynamic authorization capability based on Resource-Based Access Control.
 In other words, instead of explicitly enforcing access based on some specific access control mechanism (e.g.: RBAC), you just check whether or not a request is allowed to access a resource based on its name, identifier or URI.
 
 By externalizing authorization from your application, you are allowed to protect your applications using different access control mechanisms as well as avoid re-deploying your application every time your security requirements change, where Keycloak will be acting as a centralized authorization service from where your protected resources and their associated permissions are managed.
 
+See the link:security-openid-connect[Using OpenID Connect to Protect Service Applications] guide for more information about `Bearer Token` authentication mechanism.
+
 If you are already familiar with Keycloak, you’ll notice that the extension is basically another adapter implementation but specific for Quarkus applications.
 Otherwise, you can find more information in the Keycloak https://www.keycloak.org/docs/latest/authorization_services/index.html#_enforcer_overview[documentation].
 
@@ -66,12 +68,13 @@ The solution is located in the `security-keycloak-authorization-quickstart` {qui
 First, we need a new project.
 Create a new project with the following command:
 
-[source,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-keycloak-authorization-quickstart \
-    -Dextensions="oidc, keycloak-authorization, resteasy-jsonb"
+    -Dextensions="oidc,keycloak-authorization,resteasy-jackson" \
+    -DnoExamples
 cd security-keycloak-authorization-quickstart
 ----
 
@@ -104,13 +107,11 @@ As you can see from the source code below it is just a regular JAX-RS resource:
 
 [source,java]
 ----
-package org.acme.security.keycloak.authorization;;
+package org.acme.security.keycloak.authorization;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.jboss.resteasy.annotations.cache.NoCache;
 
@@ -124,7 +125,6 @@ public class UsersResource {
 
     @GET
     @Path("/me")
-    @Produces(MediaType.APPLICATION_JSON)
     @NoCache
     public User me() {
         return new User(identity);
@@ -149,7 +149,7 @@ The source code for the `/api/admin` endpoint is also very simple:
 
 [source,java]
 ----
-package org.acme.security.keycloak.authorization;;
+package org.acme.security.keycloak.authorization;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -180,9 +180,10 @@ The OpenID Connect extension allows you to define the adapter configuration usin
 [source,properties]
 ----
 # OIDC Configuration
-quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/quarkus
+quarkus.oidc.auth-server-url=https://localhost:8543/auth/realms/quarkus
 quarkus.oidc.client-id=backend-service
 quarkus.oidc.credentials.secret=secret
+quarkus.oidc.tls.verification=none
 
 # Enable Policy Enforcement
 quarkus.keycloak.policy-enforcer.enable=true
@@ -196,10 +197,10 @@ To start a Keycloak Server you can use Docker and just run the following command
 
 [source,bash,subs=attributes+]
 ----
-docker run --name keycloak -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -p 8180:8080 {keycloak-docker-image}
+docker run --name keycloak -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -p 8180:8080 -p 8543:8443 {keycloak-docker-image}
 ----
 
-You should be able to access your Keycloak Server at http://localhost:8180/auth[localhost:8180/auth].
+You should be able to access your Keycloak Server at http://localhost:8180/auth[localhost:8180/auth] or https://localhost:8543/auth[localhost:8543/auth].
 
 Log in as the `admin` user to access the Keycloak Administration Console.
 Username should be `admin` and password `admin`.
@@ -228,7 +229,7 @@ Then run it:
 
 [source,bash]
 ----
-java -jar ./target/security-keycloak-authorization-quickstart-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 === Running in Native Mode
@@ -258,7 +259,7 @@ The application is using bearer token authorization and the first thing to do is
 [source,bash]
 ----
 export access_token=$(\
-    curl -X POST http://localhost:8180/auth/realms/quarkus/protocol/openid-connect/token \
+    curl --insecure -X POST https://localhost:8543/auth/realms/quarkus/protocol/openid-connect/token \
     --user backend-service:secret \
     -H 'content-type: application/x-www-form-urlencoded' \
     -d 'username=alice&password=alice&grant_type=password' | jq --raw-output '.access_token' \
@@ -293,7 +294,7 @@ In order to access the admin endpoint you should obtain a token for the `admin`
 [source,bash]
 ----
 export access_token=$(\
-    curl -X POST http://localhost:8180/auth/realms/quarkus/protocol/openid-connect/token \
+    curl --insecure -X POST https://localhost:8543/auth/realms/quarkus/protocol/openid-connect/token \
     --user backend-service:secret \
     -H 'content-type: application/x-www-form-urlencoded' \
     -d 'username=admin&password=admin&grant_type=password' | jq --raw-output '.access_token' \
@@ -315,10 +316,9 @@ public class ProtectedResource {
     
     
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<List<Permission>> get() {
         return identity.checkPermission(new AuthPermission("{resource_name}"))
-                .thenCompose(granted -> {
+                .transform(granted -> {
                     if (granted) {
                         return CompletableFuture.completedFuture(doGetState());
                     }
@@ -359,3 +359,4 @@ include::{generated-dir}/config/quarkus-keycloak-keycloak-policy-enforcer-config
 * https://www.keycloak.org/docs/latest/authorization_services/index.html[Keycloak Authorization Services Documentation]
 * https://openid.net/connect/[OpenID Connect]
 * https://tools.ietf.org/html/rfc7519[JSON Web Token]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-ldap.adoc b/docs/src/main/asciidoc/security-ldap.adoc
index 1d0f76033f78c..095a587404d0d 100644
--- a/docs/src/main/asciidoc/security-ldap.adoc
+++ b/docs/src/main/asciidoc/security-ldap.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Security with an LDAP Realm
 
@@ -44,17 +44,18 @@ The solution is located in the `security-ldap-quickstart` {quickstarts-tree-url}
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-ldap-quickstart \
-    -Dextensions="elytron-security-ldap, resteasy"
+    -Dextensions="elytron-security-ldap,resteasy" \
+    -DnoExamples
 cd security-ldap-quickstart
 ----
 
 This command generates a Maven project, importing the `elytron-security-ldap` extension
-which is a https://docs.wildfly.org/19/WildFly_Elytron_Security.html#ldap-security-realm[`wildfly-elytron-realm-ldap`] adapter for Quarkus applications.
+which is a `wildfly-elytron-realm-ldap` adapter for Quarkus applications.
 
 If you already have your Quarkus project configured, you can add the `elytron-security-ldap` extension
 to your project by running the following command in your project base directory:
@@ -136,9 +137,7 @@ import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.SecurityContext;
 
 @Path("/api/users")
@@ -147,7 +146,6 @@ public class UserResource {
     @GET
     @RolesAllowed("standardRole")
     @Path("/me")
-    @Produces(MediaType.APPLICATION_JSON)
     public String me(@Context SecurityContext securityContext) {
         return securityContext.getUserPrincipal().getName();
     }
@@ -173,6 +171,8 @@ quarkus.security.ldap.identity-mapping.attribute-mappings."0".filter=(member=uid
 quarkus.security.ldap.identity-mapping.attribute-mappings."0".filter-base-dn=ou=roles,ou=tool,o=YourCompany,c=DE
 ----
 
+`{0}` is substituted by the `uid`, whereas `{1}` will be substituted by the `dn` of the user entry.
+
 The `elytron-security-ldap` extension requires a dir-context and an identity-mapping with at least one attribute-mapping to authenticate the user and its identity.
 
 == Testing the Application
@@ -217,6 +217,7 @@ By providing the `adminUser:adminUserPassword` credentials, the extension authen
 The `adminUser` user is authorized to access to the protected resources.
 
 The user `adminUser` should be forbidden to access a resource protected with `@RolesAllowed("standardRole")` because it doesn't have this role.
+
 [source,shell]
 ----
 $ curl -i -X GET -u adminUser:adminUserPassword http://localhost:8080/api/users/me
@@ -228,9 +229,10 @@ Forbidden%
 ----
 
 Finally, using the user `standardUser` works and the security context contains the principal details (username for instance).
+
 [source,shell]
 ----
-curl -i -X GET -u standardUser:standardUserPassword http://localhost:8080/api/users/me
+$ curl -i -X GET -u standardUser:standardUserPassword http://localhost:8080/api/users/me
 HTTP/1.1 200 OK
 Content-Length: 4
 Content-Type: text/plain;charset=UTF-8
@@ -242,3 +244,8 @@ user%
 == Configuration Reference
 
 include::{generated-dir}/config/quarkus-elytron-security-ldap.adoc[opts=optional, leveloffset=+1]
+
+== References
+
+* https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol[LDAP]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-oauth2.adoc b/docs/src/main/asciidoc/security-oauth2.adoc
index fdc66290231ed..eccfe5c01a36c 100644
--- a/docs/src/main/asciidoc/security-oauth2.adoc
+++ b/docs/src/main/asciidoc/security-oauth2.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OAuth2 RBAC
 
@@ -35,14 +35,14 @@ It contains a very simple UI to use the JAX-RS resources created here, too.
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-oauth2-quickstart \
     -DclassName="org.acme.security.oauth2.TokenSecuredResource" \
     -Dpath="/secured" \
-    -Dextensions="resteasy-jsonb, security-oauth2"
+    -Dextensions="resteasy,resteasy-jackson,security-oauth2"
 cd security-oauth2-quickstart
 ----
 
@@ -62,7 +62,6 @@ If you don't want to use the Maven plugin, you can just include the dependency i
 
 Open the `src/main/java/org/acme/security/oauth2/TokenSecuredResource.java` file and see the following content:
 
-.Basic REST Endpoint
 [source,java]
 ----
 package org.acme.security.oauth2;
@@ -124,39 +123,34 @@ public class TokenSecuredResource {
 <3> Here we obtain the current request user/caller `Principal`. For an unsecured call this will be null, so we build the user name by checking `caller` against null.
 <4> The reply we build up makes use of the caller name, the `isSecure()` and `getAuthenticationScheme()` states of the request `SecurityContext`.
 
-== Run the application
 
-Now we are ready to run our application. Use:
+=== Setting up application.properties
 
-[source,shell]
+You need to configure your application with the following minimal properties:
+
+[source, properties]
 ----
-./mvnw compile quarkus:dev
+quarkus.oauth2.client-id=client_id
+quarkus.oauth2.client-secret=secret
+quarkus.oauth2.introspection-url=http://oauth-server/introspect
 ----
 
-and you should see output similar to:
+You need to specify the introspection URL of your authentication server and the `client-id` / `client-secret` that your application will use to authenticate itself to the authentication server. +
+The extension will then use this information to validate the token and recover the information associate with it.
 
-.quarkus:dev Output
-[source,shell]
-----
-$ ./mvnw clean compile quarkus:dev
-[INFO] Scanning for projects...
-[INFO] 
-[INFO] ---------------------< org.acme:security-oauth2-quickstart >---------------------
-[INFO] Building security-oauth2-quickstart 1.0-SNAPSHOT
-[INFO] --------------------------------[ jar ]---------------------------------
-...
-[INFO] --- quarkus-maven-plugin:999-SNAPSHOT:dev (default-cli) @ security-oauth2-quickstart ---
-Listening for transport dt_socket at address: 5005
-2019-07-16 09:58:09,753 INFO  [io.qua.dep.QuarkusAugmentor] (main) Beginning quarkus augmentation
-2019-07-16 09:58:10,884 INFO  [io.qua.dep.QuarkusAugmentor] (main) Quarkus augmentation completed in 1131ms
-2019-07-16 09:58:11,385 INFO  [io.quarkus] (main) Quarkus 0.20.0 started in 1.813s. Listening on: http://[::]:8080
-2019-07-16 09:58:11,391 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jsonb, security, security-oauth2]
+For all configuration properties, see the link:#config-reference[Configuration reference] section at the end of this guide.
+
+== Run the application
+
+Now we are ready to run our application. Use:
 
+[source,bash]
+----
+./mvnw quarkus:dev
 ----
 
 Now that the REST endpoint is running, we can access it using a command line tool like curl:
 
-.curl command for /secured/permit-all
 [source,shell]
 ----
 $ curl http://127.0.0.1:8080/secured/permit-all; echo
@@ -169,6 +163,8 @@ We have not provided any token in our request, so we would not expect that there
 * `isSecure` is false as https is not used
 * `authScheme` is null
 
+=== Securing the endpoint
+
 So now let's actually secure something. Take a look at the new endpoint method `helloRolesAllowed` in the following:
 
 [source,java]
@@ -219,7 +215,6 @@ public class TokenSecuredResource {
 
 After you make this addition to your `TokenSecuredResource`, try `curl -v http://127.0.0.1:8080/secured/roles-allowed; echo` to attempt to access the new endpoint. Your output should be:
 
-.curl command for /secured/roles-allowed
 [source,shell]
 ----
 $ curl -v http://127.0.0.1:8080/secured/roles-allowed; echo
@@ -243,34 +238,13 @@ Not authorized
 
 Excellent, we have not provided any OAuth2 token in the request, so we should not be able to access the endpoint, and we were not. Instead we received an HTTP 401 Unauthorized error. We need to obtain and pass in a valid OAuth2 token to access that endpoint. There are two steps to this, 1) configuring our {extension-name} extension with information on how to validate the token, and 2) generating a matching token with the appropriate claims.
 
-== Configuring the {extension-name} Extension Security Information
-
-include::{generated-dir}/config/quarkus-elytron-security-oauth2.adoc[opts=optional, leveloffset=+1]
-
-=== Setting up application.properties
-
-For part A of step 1, create a `security-oauth2-quickstart/src/main/resources/application.properties` with the following content:
-
-.application.properties for TokenSecuredResource
-[source, properties]
-----
-quarkus.oauth2.client-id=client_id
-quarkus.oauth2.client-secret=secret
-quarkus.oauth2.introspection-url=http://oauth-server/introspect
-----
-
-You need to specify the introspection URL of your authentication server and the `client-id` / `client-secret` that your application will use to authenticate itself to the authentication server.
-
-The extension will then use this information to validate the token and recover the information associate with it.
-
-
 === Generating a token
 
 You need to obtain the token from a standard OAuth2 authentication server (https://www.keycloak.org/[Keycloak] for example) using the token endpoint.
 
 You can find below a curl example of such call for a `client_credential` flow:
 
-[source,shell]
+[source,bash]
 ----
 curl -X POST "http://oauth-server/token?grant_type=client_credentials" \
 -H  "Accept: application/json" -H  "Authorization: Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ="
@@ -284,10 +258,9 @@ It should respond something like that...
 ----
 
 
-== Finally, Secured Access to /secured/roles-allowed
+=== Finally, make a secured request to /secured/roles-allowed
 Now let's use this to make a secured request to the `/secured/roles-allowed` endpoint
 
-.curl Command for /secured/roles-allowed With a token
 [source,shell]
 ----
 $ curl -H "Authorization: Bearer 60acf56d-9daf-49ba-b3be-7a423d9c7288" http://127.0.0.1:8080/secured/roles-allowed; echo
@@ -307,20 +280,20 @@ You can customize the name of the claim to use for the roles with the `quarkus.o
 
 == Package and run the application
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file:
-.Runner jar Example
-[source,shell]
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file:
+
+[source,shell,subs=attributes+]
 ----
 $ ./mvnw clean package
 [INFO] Scanning for projects...
 ...
-$ java -jar target/security-oauth2-quickstart-runner.jar
-2019-03-28 14:27:48,839 INFO  [io.quarkus] (main) Quarkus 0.20.0 started in 0.796s. Listening on: http://[::]:8080
-2019-03-28 14:27:48,841 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jsonb, security, security-oauth2]
+$ java -jar target/quarkus-app/quarkus-run.jar
+2019-03-28 14:27:48,839 INFO  [io.quarkus] (main) Quarkus {quarkus-version} started in 0.796s. Listening on: http://[::]:8080
+2019-03-28 14:27:48,841 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jackson, security, security-oauth2]
 ----
 
 You can also generate the native executable with `./mvnw clean package -Pnative`.
-.Native Executable Example
+
 [source,shell]
 ----
 $ ./mvnw clean package -Pnative
@@ -343,7 +316,7 @@ $ ./mvnw clean package -Pnative
 
 $ ./target/security-oauth2-quickstart-runner
 2019-03-28 14:31:37,315 INFO  [io.quarkus] (main) Quarkus 0.20.0 started in 0.006s. Listening on: http://[::]:8080
-2019-03-28 14:31:37,316 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jsonb, security, security-oauth2]
+2019-03-28 14:31:37,316 INFO  [io.quarkus] (main) Installed features: [cdi, resteasy, resteasy-jackson, security, security-oauth2]
 ----
 
 [[integration-testing]]
@@ -465,3 +438,14 @@ class TokenSecuredResourceTest {
 ====
 `@QuarkusTestResource` applies to all tests, not just `TokenSecuredResourceTest`.
 ====
+
+
+== References
+
+* https://tools.ietf.org/html/rfc6749[OAuth2]
+* link:security[Quarkus Security]
+
+[[config-reference]]
+== Configuration Reference
+
+include::{generated-dir}/config/quarkus-elytron-security-oauth2.adoc[opts=optional, leveloffset=+1]
diff --git a/docs/src/main/asciidoc/security-openid-connect-client.adoc b/docs/src/main/asciidoc/security-openid-connect-client.adoc
new file mode 100644
index 0000000000000..ae62a005c7bc5
--- /dev/null
+++ b/docs/src/main/asciidoc/security-openid-connect-client.adoc
@@ -0,0 +1,437 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Using OpenID Connect and OAuth2 Client and Filters to manage access tokens
+
+include::./attributes.adoc[]
+:toc:
+
+This guide explains how to use:
+
+ * `quarkus-oidc-client` and `quarkus-oidc-client-filter` extensions to acquire and refresh access tokens from OpenId Connect and OAuth 2.0 compliant Authorization Servers such as https://www.keycloak.org/about.html[Keycloak]
+ * `quarkus-oidc-token-propagation` extension to propagate the current bearer or authorization code flow access tokens
+
+The access tokens managed by these extensions can be used as HTTP Authorization Bearer tokens to access the remote services.
+
+== OidcClient
+
+`quarkus-oidc-client` extension provides a reactive `io.quarkus.oidc.client.OidcClient` which can be used to acquire and refresh tokens using SmallRye Mutiny `Uni` and `Vert.x WebClient`.
+
+`OidcClient` is initialized at the build time with the IDP token endpoint URL which can be auto-discovered or manually configured and uses this endpoint to acquire access tokens using `client_credentials` or `password` token grants and refresh the tokens using `refresh_token` grant.
+
+Here is how `OidcClient` can be configured to use the `client_credentials` grant:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus2/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.secret=secret
+----
+
+Here is how `OidcClient` can be configured to use the `password` grant:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus2/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.secret=secret
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=alice
+quarkus.oidc-client.grant-options.password.password=alice
+----
+In both cases `OidcClient` will auto-discover the token endpoint URL and use it to acquire the tokens.
+
+=== Use OidcClient directly
+
+One can use `OidcClient` directly as follows:
+
+[source,java]
+----
+import javax.inject.PostConstruct;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.Tokens;
+
+@Path("/service")
+public class OidcClientResource {
+
+    @Inject
+    OidcClient client;
+
+    volatile Tokens currentTokens;
+
+    @PostConstruct
+    public init() {
+        currentTokens = client.getTokens().await().indefinitely();
+    }
+
+    @GET
+    public String getResponse() {
+        
+        Tokens tokens = currentTokens;
+        if (tokens.isAccessTokenExpired()) {
+            tokens = client.refreshTokens(tokens.getRefreshToken()).await().indefinitely();
+            currentTokens = tokens;
+        } 
+        // use tokens.getAccessToken() to configure MP RestClient Authorization header/etc
+    }
+}
+----
+
+=== Use OidcClient in MicroProfile RestClient client filter
+
+`quarkus-oidc-client-filter` extension provides `io.quarkus.oidc.client.filter.OidcClientRequestFilter` JAX-RS ClientRequestFilter which uses `OidcClient` to acquire the access token, refresh it if needed, and set it as an HTTP `Authorization` `Bearer` scheme value.
+
+By default, this filter will get `OidcClient` to acquire the first pair of access and refresh tokens at its initialization time. If the access tokens are short-lived and refresh tokens are not available then the token acquisition should be delayed with `quarkus.oidc-client.early-tokens-acquisition=false`.
+
+You can selectively register `OidcClientRequestFilter` by using either `io.quarkus.oidc.client.filter.OidcClientFilter` or `org.eclipse.microprofile.rest.client.annotation.RegisterProvider` annotations:
+
+[source,java]
+----
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import io.quarkus.oidc.client.filter.OidcClientFilter;
+
+@RegisterRestClient
+@OidcClientFilter
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
+----
+
+or
+
+[source,java]
+----
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import io.quarkus.oidc.client.filter.OidcClientRequestFilter;
+
+@RegisterRestClient
+@RegisterProvider(OidcClientRequestFilter.class)
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
+----
+
+Alternatively, `OidcClientRequestFilter` can be registered automatically with all MP Rest or JAX-RS clients if `quarkus.oidc-client-filter.register-filter=true` property is set.
+
+=== Use injected Tokens
+
+If you prefer you can use your own custom filter and inject `Tokens`:
+
+[source,java]
+----
+@Provider
+@Priority(Priorities.AUTHENTICATION)
+@RequestScoped
+public class OidcClientRequestCustomFilter implements ClientRequestFilter {
+
+    @Inject
+    Tokens tokens;
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + tokens.getAccessToken());
+    }
+}
+----
+
+The `Tokens` producer will acquire and refresh the tokens, and the custom filter will decide how and when to use the token.
+
+See also the previous section about delaying the token acquisition in some cases.
+
+=== Refreshing Access Tokens
+
+Both `OidcClientRequestFilter` and `Tokens` producer will refresh the current expired access token if the refresh token is available.
+Additionally, `quarkus.oidc-client.refresh-token-time-skew` property can be used for a preemptive access token refreshment to avoid sending nearly expired access tokens which may cause HTTP 401 errors. For example if this property is set to `3S` and the access token will expire in less than 3 seconds then this token will be auto-refreshed.
+
+If the access token needs to be refreshed but no refresh token is available then an attempt will be made to acquire a new token using the configured grant such as `client_credentials`.
+
+Please note that some OpenId Connect Providers will not return a refresh token in a `client_credentials` grant response. For example, starting from Keycloak 12 a refresh token will not be returned by default for `client_credentials`. The providers may also restrict a number of times a refresh token can be used.
+
+=== OidcClients
+
+`io.quarkus.oidc.client.OidcClients` is a container of `OidcClient`s - it includes a default `OidcClient` (which can also be injected directly as described above) and named clients which can be configured like this:
+
+[source,properties]
+----
+quarkus.oidc-client.client-enabled=false
+
+quarkus.oidc-client.jwt-secret.auth-server-url=${keycloak.url}/realms/quarkus2/
+quarkus.oidc-client.jwt-secret.client-id=quarkus-app
+quarkus.oidc-client.jwt-secret.credentials.jwt.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
+----
+
+Note in this case the default client is disabled with a `client-enabled=false` property. The `jwt-secret` client can be accessed like this:
+
+[source,java]
+----
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClients;
+
+@Path("/clients")
+public class OidcClientResource {
+
+    @Inject
+    OidcClients clients;
+
+    @GET
+    public String getResponse() {
+        OidcClient client = clients.getClient("jwt-secret");
+        // use this client to get the token
+    }
+}
+----
+
+[NOTE]
+====
+If you also use link:security-openid-connect-multitenancy[OIDC multitenancy] and each OIDC tenant has its own associated `OidcClient` then you can use a Vert.x `RoutingContext` `tenantId` attribute, for example:
+
+[source,java]
+----
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClients;
+import io.vertx.ext.web.RoutingContext;
+
+@Path("/clients")
+public class OidcClientResource {
+
+    @Inject
+    OidcClients clients;
+    @Inject
+    RoutingContext context;
+
+    @GET
+    public String getResponse() {
+        String tenantId = context.get("tenantId");
+        // named OIDC tenant and client configurations use the same key:
+        OidcClient client = clients.getClient(tenantId);
+        // use this client to get the token
+    }
+}
+----
+====
+
+If you need you can also create new `OidcClient` programmatically like this:
+
+[source,java]
+----
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClients;
+import io.quarkus.oidc.client.OidcClientConfig;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("/clients")
+public class OidcClientResource {
+
+    @Inject
+    OidcClients clients;
+
+    @GET
+    public String getResponse() {
+        OidcClientConfig cfg = new OidcClientConfig();
+        cfg.setId("myclient");
+        cfg.setAuthServerUrl("http://localhost:8081/auth/realms/quarkus/");
+        cfg.setClientId("quarkus");
+        cfg.getCredentials().setSecret("secret");
+        Uni<OidcClient> client = clients.newClient(config);
+        // use this client to get the token
+    }
+}
+----
+
+[[oidc-client-authentication]]
+=== OidcClient Authentication
+
+`OidcClient` has to authenticate to the OpenId Connect Provider for the `client_credentials` and other grant requests to succeed.
+All the https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication[OIDC Client Authentication] options are supported, for example:
+
+`client_secret_basic`:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.secret=mysecret
+----
+
+`client_secret_post`:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.client-secret.value=mysecret
+quarkus.oidc-client.credentials.client-secret.method=post
+----
+
+`client_secret_jwt`:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.jwt.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
+----
+
+`private_key_jwt` with the PEM key file:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.jwt.key-file=privateKey.pem
+----
+
+`private_key_jwt` with the key store file:
+
+[source,properties]
+----
+quarkus.oidc-client.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.jwt.key-store-file=keystore.jks
+quarkus.oidc-client.credentials.jwt.key-store-password=mypassword
+quarkus.oidc-client.credentials.jwt.key-password=mykeypassword
+quarkus.oidc-client.credentials.jwt.key-id=mykey
+----
+
+Using `private_key_jwt` or `private_key_jwt` authentication methods ensures that no client secret goes over the wire.
+
+[[token-propagation]]
+== Token Propagation in MicroProfile RestClient client filter
+
+`quarkus-oidc-token-propagation` extension provide `io.quarkus.oidc.token.propagation.AccessTokenRequestFilter` and `io.quarkus.oidc.token.propagation.JsonWebTokenRequestFilter` JAX-RS ClientRequestFilters which propagates the current link:security-openid-connect[Bearer] or link:security-openid-connect-web-authentication[Authorization Code Flow] access token as an HTTP `Authorization` `Bearer` scheme value.
+
+=== AccessTokenRequestFilter
+
+`AccessTokenRequestFilter` treats all tokens as Strings and as such it can work with both JWT and opaque tokens.
+
+When you need to propagate the current Authorization Code Flow access token then `AccessTokenRequestFilter` will be the best option as such tokens do not need to be exchanged or otherwise re-enhanced. Authorization Code Flow access tokens may be also be opaque/binary tokens.
+
+You can selectively register `AccessTokenRequestFilter` by using either `io.quarkus.oidc.token.propagation.AccessToken` or `org.eclipse.microprofile.rest.client.annotation.RegisterProvider`, for example:
+
+[source,java]
+----
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import io.quarkus.oidc.token.propagation.AccessToken;
+
+@RegisterRestClient
+@AccessToken
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
+----
+or
+
+[source,java]
+----
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import io.quarkus.oidc.token.propagation.AccessTokenRequestFilter;
+
+@RegisterRestClient
+@RegisterProvider(AccessTokenRequestFilter.class)
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
+----
+
+Alternatively, `AccessTokenRequestFilter` can be registered automatically with all MP Rest or JAX-RS clients if `quarkus.oidc-token-propagation.register-filter` property is set to `true` and `quarkus.oidc-token-propagation.json-web-token` property is set to `false` (which is a default value).
+
+This filter will be additionally enhanced in the future to support exchanging the access tokens before propagating them.
+
+=== JsonWebTokenRequestFilter
+
+Using `JsonWebTokenRequestFilter` is recommended if you work with Bearer JWT tokens where these tokens can have their claims such as `issuer` and `audience` modified and the updated tokens secured (for example, re-signed) again. It expects an injected `org.eclipse.microprofile.jwt.JsonWebToken` and therefore will not work with the opaque tokens.
+
+Direct end to end Bearer token propagation should be avoided if possible. For example, `Client -> Service A -> Service B` where `Service B` receives a token sent by `Client` to `Service A`. In such cases `Service B` will not be able to distinguish if the token came from `Service A` or from `Client` directly. For `Service B` to verify the token came from `Service A` it should be able to assert a new issuer and audience claims.
+
+`JsonWebTokenRequestFilter` makes it easy for `Service A` implemementations to update the injected `org.eclipse.microprofile.jwt.JsonWebToken` with the new `issuer` and `audience` claim values and secure the updated token again with a new signature. The only difficult step is to ensure `Service A` has a signing key - it should be provisioned from a secure file system or from the remote secure storage such as Vault.
+
+You can selectively register `JsonWebTokenRequestFilter` by using either `io.quarkus.oidc.token.propagation.JsonWebToken` or `org.eclipse.microprofile.rest.client.annotation.RegisterProvider`, for example:
+
+[source,java]
+----
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import io.quarkus.oidc.token.propagation.JsonWebToken;
+
+@RegisterRestClient
+@AccessToken
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
+----
+or
+
+[source,java]
+----
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import io.quarkus.oidc.token.propagation.JsonWebTokenRequestFilter;
+
+@RegisterRestClient
+@RegisterProvider(JsonWebTokenTokenRequestFilter.class)
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
+----
+
+Alternatively, `JsonWebTokenRequestFilter` can be registered automatically with all MP Rest or JAX-RS clients if both `quarkus.oidc-token-propagation.register-filter` and ``quarkus.oidc-token-propagation.json-web-token` properties are set to `true`.
+
+If this filter has to update the inject token and secure it with a new signature again then you can configure it like this:
+
+[source,properties]
+----
+quarkus.oidc-token-propagation.secure-json-web-token=true
+smallrye.jwt.sign.key.location=/privateKey.pem
+# Set a new issuer
+smallrye.jwt.new-token.issuer=http://frontend-resource
+# Set a new audience
+smallrye.jwt.new-token.audience=http://downstream-resource
+# Override the existing token issuer and audience claims if they are already set
+smallrye.jwt.new-token.override-matching-claims=true
+----
+
+
+This filter will be additionally enhanced in the future to support exchanging the access tokens before propagating them.
+
+== References
+
+* link:security[Quarkus Security]
+* link:security-openid-connect[Quarkus - Using OpenID Connect to Protect Service Applications using Bearer Token Authorization]
+* link:security-openid-connect-web-authentication[Quarkus - Using OpenID Connect to Protect Web Applications using Authorization Code Flow]
diff --git a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc
index abb30ee4de6ce..7678364c6d6f3 100644
--- a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc
+++ b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OpenID Connect Multi-Tenancy
 
@@ -42,19 +42,20 @@ However, you can go right to the completed example.
 
 Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
 
-The solution is located in the `security-openid-connect-multi-tenancy` {quickstarts-tree-url}/security-openid-connect-multi-tenancy[directory].
+The solution is located in the `security-openid-connect-multi-tenancy-quickstart` {quickstarts-tree-url}/security-openid-connect-multi-tenancy-quickstart[directory].
 
 == Creating the Maven Project
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
-    -DprojectArtifactId=security-openid-connect-multi-tenancy \
-    -Dextensions="oidc, resteasy-jsonb"
-cd security-openid-connect-multi-tenancy
+    -DprojectArtifactId=security-openid-connect-multi-tenancy-quickstart \
+    -Dextensions="oidc,resteasy-jackson" \
+    -DnoExamples
+cd security-openid-connect-multi-tenancy-quickstart
 ----
 
 If you already have your Quarkus project configured, you can add the `oidc` extension
@@ -151,6 +152,24 @@ public class CustomTenantResolver implements TenantResolver {
 
 From the implementation above, tenants are resolved from the request path so that in case no tenant could be inferred, `null` is returned to indicate that the default tenant configuration should be used.
 
+[NOTE]
+===
+If you also use link:hibernate-orm#multitenancy[Hibernate ORM multitenancy] and both OIDC and Hibernate ORM tenant IDs are the same and must be extracted from the Vert.x `RoutingContext` then you can pass the tenant id from the OIDC Tenant Resolver to the Hibernate ORM Tenant Resolver as a `RoutingContext` attribute, for example:
+
+[source,java]
+----
+public class CustomTenantResolver implements TenantResolver {
+
+    @Override
+    public String resolve(RoutingContext context) {
+        String tenantId = extractTenantId(context);
+        context.put("tenantId", tenantId);
+        return tenantId;
+    }
+}
+----
+===
+
 == Configuring the application
 
 [source,properties]
@@ -210,8 +229,8 @@ Log in as the `admin` user to access the Keycloak Administration Console. Userna
 
 Now, follow the steps below to import the realms for the two tenants:
 
-* Import the {quickstarts-tree-url}/security-openid-connect-multi-tenancy/config/default-tenant-realm.json[default-tenant-realm.json] to create the default realm
-* Import the {quickstarts-tree-url}/security-openid-connect-multi-tenancy/config/tenant-a-realm.json[tenant-a-realm.json] to create the realm for the tenant `tenant-a`.
+* Import the {quickstarts-tree-url}/security-openid-connect-multi-tenancy-quickstart/config/default-tenant-realm.json[default-tenant-realm.json] to create the default realm
+* Import the {quickstarts-tree-url}/security-openid-connect-multi-tenancy-quickstart/config/tenant-a-realm.json[tenant-a-realm.json] to create the realm for the tenant `tenant-a`.
 
 For more details, see the Keycloak documentation about how to https://www.keycloak.org/docs/latest/server_admin/index.html#_create-realm[create a new realm].
 
@@ -236,7 +255,7 @@ Then run it:
 
 [source,bash]
 ----
-java -jar ./target/security-openid-connect-multi-tenancy-quickstart-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 === Running in Native Mode
@@ -342,6 +361,56 @@ public class CustomTenantConfigResolver implements TenantConfigResolver {
 
 The `OidcTenantConfig` returned from this method is the same used to parse the `oidc` namespace configuration from the `application.properties`. You can populate it using any of the settings supported by the `quarkus-oidc` extension.
 
+== Tenant Resolution for OIDC 'web-app' applications
+
+Several options are available for selecting the tenant configuration which should be used to secure the current HTTP request for both `service` and `web-app` OIDC applications, such as:
+
+- Check URL paths, for example, a `tenant-service` configuration has to be used for the "/service" paths, while a `tenant-manage` configuration - for the "/management" paths
+- Check HTTP headers, for example, with a URL path always being '/service', a header such as "Realm: service" or "Realm: management" can help selecting between the `tenant-service` and `tenant-manage` configurations
+- Check URL query parameters - it can work similarly to the way the headers are used to select the tenant configuration
+
+All these options can be easily implemented with the custom `TenantResolver` and `TenantConfigResolver` implementations for the OIDC `service` applications.
+
+However, due to an HTTP redirect required to complete the code authentication flow for the OIDC `web-app` applications, a custom HTTP cookie may be needed to select the same tenant configuration before and after this redirect request because:
+
+- URL path may not be the same after the redirect request if a single redirect URL has been registered in the OIDC Provider - the original request path can be restored but after the the tenant configuration is resolved
+- HTTP headers used during the original request are not available after the redirect
+- Custom URL query parameters are restored after the redirect but after the tenant configuration is resolved
+
+One option to ensure the information for resolving the tenant configurations for `web-app` applications is available before and after the redirect is to use a cookie, for example:
+
+[source,java]
+----
+package org.acme.quickstart.oidc;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.oidc.TenantResolver;
+import io.vertx.core.http.Cookie;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class CustomTenantResolver implements TenantResolver {
+
+    @Override
+    public String resolve(RoutingContext context) {
+        List<String> tenantIdQuery = context.queryParam("tenantId");
+        if (!tenantIdQuery.isEmpty()) {
+            String tenantId = tenantIdQuery.get(0);
+            context.addCookie(Cookie.cookie("tenant", tenantId));
+            return tenantId;
+        } else if (context.cookieMap().containsKey("tenant")) {
+            return context.getCookie("tenant").getValue();
+        }
+
+        return null;
+    }
+}
+----
+
+[[disable-tenant]]
 == Disabling Tenant Configurations
 
 Custom `TenantResolver` and `TenantConfigResolver` implementations may return `null` if no tenant can be inferred from the current request and a fallback to the default tenant configuration is required.
@@ -360,3 +429,4 @@ include::{generated-dir}/config/quarkus-oidc.adoc[opts=optional]
 * https://openid.net/connect/[OpenID Connect]
 * https://tools.ietf.org/html/rfc7519[JSON Web Token]
 * https://developers.google.com/identity/protocols/OpenIDConnect[Google OpenID Connect]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc b/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc
index 6e470c17605cb..9ee4523d5e681 100644
--- a/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc
+++ b/docs/src/main/asciidoc/security-openid-connect-web-authentication.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OpenID Connect to Protect Web Applications using Authorization Code Flow.
 
@@ -48,12 +48,13 @@ The solution is located in the `security-openid-connect-web-authentication-quick
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-openid-connect-web-authentication-quickstart \
-    -Dextensions="oidc"
+    -Dextensions="resteasy,oidc" \
+    -DnoExamples
 cd security-openid-connect-web-authentication-quickstart
 ----
 
@@ -75,6 +76,82 @@ This will add the following to your `pom.xml`:
 </dependency>
 ----
 
+== Writing the application
+
+Let's write a simple JAX-RS resource which has all the tokens returned in the authorization code grant response injected:
+
+[source,java]
+----
+package org.acme.security.openid.connect.web.authentication;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.quarkus.oidc.IdToken;
+import io.quarkus.oidc.RefreshToken;
+
+@Path("/tokens")
+public class TokenResource {
+
+    /**
+     * Injection point for the ID Token issued by the OpenID Connect Provider
+     */
+    @Inject
+    @IdToken
+    JsonWebToken idToken;
+
+    /**
+     * Injection point for the Access Token issued by the OpenID Connect Provider
+     */
+    @Inject
+    JsonWebToken accessToken;
+
+    /**
+     * Injection point for the Refresh Token issued by the OpenID Connect Provider
+     */
+    @Inject
+    RefreshToken refreshToken;
+
+    /**
+     * Returns the tokens available to the application. This endpoint exists only for demonstration purposes, you should not
+     * expose these tokens in a real application.
+     *
+     * @return a map containing the tokens available to the application
+     */
+    @GET
+    public String getTokens() {
+        StringBuilder response = new StringBuilder().append("<html>")
+                .append("<body>")
+                .append("<ul>");
+
+        Object userName = this.idToken.getClaim("preferred_username");
+
+        if (userName != null) {
+            response.append("<li>username: ").append(userName.toString()).append("</li>");
+        }
+
+        Object scopes = this.accessToken.getClaim("scope");
+
+        if (scopes != null) {
+            response.append("<li>scopes: ").append(scopes.toString()).append("</li>");
+        }
+
+        response.append("<li>refresh_token: ").append(refreshToken.getToken() != null).append("</li>");
+
+        return response.append("</ul>").append("</body>").append("</html>").toString();
+    }
+}
+----
+
+This endpoint has ID, access and refresh tokens injected. It returns a `preferred_username` claim from the ID token, a `scope` claim from the access token and also a refresh token availability status.
+
+Note that you do not have to inject the tokens - it is only required if the endpoint needs to use the ID token to interact with the currently authenticated user or use the access token to access a downstream service on behalf of this user.
+
+Please see <<access_id_and_access_tokens,Access ID and Access Tokens>> section below for more information.
+
 == Configuring the application
 
 The OpenID Connect extension allows you to define the configuration using the `application.properties` file which should be located at the `src/main/resources` directory.
@@ -97,7 +174,11 @@ The `quarkus.oidc.client-id` property references the `client_id` issued by the O
 The `quarkus.oidc.application-type` property is set to `web-app` in order to tell Quarkus that you want to enable the OpenID Connect Authorization Code Flow, so that your users are redirected to the OpenID Connect Provider to authenticate.
 
 For last, the `quarkus.http.auth.permission.authenticated` permission is set to tell Quarkus about the paths you want to protect. In this case,
-all paths are being protected by a policy that ensures that only `authenticated` users are allowed to access. For more details check link:security[Security Guide].
+all paths are being protected by a policy that ensures that only `authenticated` users are allowed to access. For more details check link:security-authorization[Security Authorization Guide].
+
+=== Configuring CORS
+
+If you plan to consume this application from another application running on a different domain, you will need to configure CORS (Cross-Origin Resource Sharing). Please read the link:http-reference#cors-filter[HTTP CORS documentation] for more details.
 
 == Starting and Configuring the Keycloak Server
 
@@ -135,7 +216,7 @@ Then run it:
 
 [source,bash]
 ----
-java -jar ./target/security-openid-connect-web-authentication-quickstart-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 === Running in Native Mode
@@ -187,6 +268,31 @@ In such cases a `quarkus.oidc.authentication.redirect-path` property has to be s
 
 If `quarkus.oidc.authentication.redirect-path` is set but the original request URL has to be restored after the user has been redirected back to a callback URL such as `http://localhost:8080/service/callback` then a `quarkus.oidc.authentication.restore-path-after-redirect` property has to be set to `true` which will restore the request URL such as `http://localhost:8080/service/1`, etc.
 
+[[oidc-cookies]]
+== Dealing with Cookies
+
+The OIDC adapter uses cookies to keep the session, code flow and post logout state.
+
+`quarkus.oidc.authentication.cookie-path` property is used to ensure the cookies are visible especially when you access the protected resources with overlapping or different roots, for example: 
+
+* `/index.html` and `/web-app/service`
+* `/web-app/service1` and `/web-app/service2`
+* `/web-app1/service` and `/web-app2/service` 
+
+`quarkus.oidc.authentication.cookie-path` is set to `/` by default but can be narrowed to the more specific root path such as `/web-app`.
+
+You can also set a `quarkus.oidc.authentication.cookie-path-header` property if the cookie path needs to be set dynamically.
+For example, setting `quarkus.oidc.authentication.cookie-path-header=X-Forwarded-Prefix` means that the value of HTTP `X-Forwarded-Prefix` header will be used to set a cookie path.
+
+If `quarkus.oidc.authentication.cookie-path-header` is set but no configured HTTP header is available in the current request then the `quarkus.oidc.authentication.cookie-path` will be checked.
+
+If your application is deployed across multiple domains, make sure to set a `quarkus.oidc.authentication.cookie-domain` property for the session cookie be visible to all protected Quarkus services, for example, if you have 2 services deployed at:
+
+* https://whatever.wherever.company.net/
+* https://another.address.company.net/
+
+then the `quarkus.oidc.authentication.cookie-domain` property must be set to `company.net`.
+
 == Logout
 
 By default the logout is based on the expiration time of the ID Token issued by the OpenID Connect Provider. When the ID Token expires, the current user session at the Quarkus endpoint is invalidated and the user is redirected to the OpenID Connect Provider again to authenticate. If the session at the OpenID Connect Provider is still active, users are automatically re-authenticated without having to provide their credentials again.
@@ -206,9 +312,36 @@ If the `quarkus.oidc.logout.post-logout-path` is set then a `q_post_logout` cook
 
 Note that a cookie name will vary when using link:security-openid-connect-multitenancy[OpenID Connect Multi-Tenancy]. For example, it will be named `q_post_logout_tenant_1` for a tenant with a `tenant_1` id, etc.
 
+Here is an example of how to configure an RP initiated logout flow:
+
+[source,properties]
+----
+quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/quarkus
+quarkus.oidc.client-id=frontend
+quarkus.oidc.application-type=web-app
+
+quarkus.oidc.tenant-logout.logout.path=/logout
+quarkus.oidc.tenant-logout.logout.post-logout-path=/postlogout
+
+# Only the authenticated users can initiate a logout:
+quarkus.http.auth.permission.authenticated.paths=/logout
+quarkus.http.auth.permission.authenticated.policy=authenticated
+
+# Logged out users should be returned to the /welcome.html site which will offer an option to re-login:
+quarkus.http.auth.permission.authenticated.paths=/welcome.html
+quarkus.http.auth.permission.authenticated.policy=permit
+----
+
+You may also need to set `quarkus.oidc.authentication.cookie-path` to a path value common to all of the application resources which is `/` in this example.
+See <<oidc-cookies, Dealing with Cookies>> for more information.
+
+[[access_id_and_access_tokens]]
 == Accessing ID and Access Tokens
 
-ID Token is always a JWT token. One can access ID Token claims by injecting `JsonWebToken` with an `IdToken` qualifier:
+OIDC Code Authentication Mechanism acquires three tokens during the authorization code flow: https://openid.net/specs/openid-connect-core-1_0.html#IDToken[IDToken], Access Token and Refresh Token.
+
+ID Token is always a JWT token and is used to represent a user authentication with the JWT claims.
+One can access ID Token claims by injecting `JsonWebToken` with an `IdToken` qualifier:
 
 [source, java]
 ----
@@ -268,10 +401,19 @@ Note that `AccessTokenCredential` will have to be used if the Access Token issue
 
 Injection of the `JsonWebToken` and `AccessTokenCredential` is supported in both `@RequestScoped` and `@ApplicationScoped` contexts.
 
+RefreshToken is only used to refresh the current ID and access tokens as part of its link:#session_management[session management] process.
+
+[[user-info]]
 == User Info
 
-Set `quarkus.oidc.user-info-required=true` if a UserInfo JSON object from the OIDC userinfo endpoint has to be requested.
-This will make an `io.quarkus.oidc.UserInfo` (which is a simple `javax.json.JsonObject` wrapper) object accessible as a SecurityIdentity `userinfo` attribute.
+If IdToken does not provide enough information about the currently authenticated user then you can set a `quarkus.oidc.user-info-required=true` property for a https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo] JSON object from the OIDC userinfo endpoint to be requested.
+
+A request will be sent to the OpenId Provider UserInfo endpoint using the access token returned with the authorization code grant response and an `io.quarkus.oidc.UserInfo` (a simple `javax.json.JsonObject` wrapper) object will be created. `io.quarkus.oidc.UserInfo` can be either injected or accessed as a SecurityIdentity `userinfo` attribute.
+
+[[config-metadata]]
+== Configuration Metadata
+
+The discovered link:https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata[OpenId Connect Configuration Metadata] is represented by `io.quarkus.oidc.OidcConfigurationMetadata` and can be either injected or accessed as a `SecurityIdentity` `configuration-metadata` attribute.
 
 == Token Claims And SecurityIdentity Roles
 
@@ -281,32 +423,129 @@ Note if you use Keycloak then you should set a Microprofile JWT client scope for
 
 If only the access token contains the roles and this access token is not meant to be propagated to the downstream endpoints then set `quarkus.oidc.roles.source=accesstoken`.
 
-If UserInfo is the source of the roles then set `quarkus.oidc.user-info-required=true` and `quarkus.oidc.roles.source=userinfo`, and if needed, `quarkus.oidc.roles.role-claim-path`.
+If UserInfo is the source of the roles then set `quarkus.oidc.authentication.user-info-required=true` and `quarkus.oidc.roles.source=userinfo`, and if needed, `quarkus.oidc.roles.role-claim-path`.
+
+Additionally a custom `SecurityIdentityAugmentor` can also be used to add the roles as documented link:security#security-identity-customization[here].
+
+[[session-management]]
+== Session Management
+
+If you have a link:security-openid-connect#single-page-applications[Single Page Application for Service Applications] where your OpenId Connect Provider script such as `keycloak.js` is managing an authoriization code flow then that script will also control the SPA authentication session lifespan.
+
+If your work with a Quarkus OIDC `web-app` application then it is Quarkus OIDC Code Authentication mechanism which is managing the user session lifespan.
+
+The session age is calculated by adding the lifespan value of the current IDToken and the values of the `quarkus.oidc.authentication.session-age-extension` and `quarkus.oidc.token.lifespan-grace` properties. Of the last two properties only `quarkus.oidc.authentication.session-age-extension` should be used to significantly extend the session lifespan if required since `quarkus.oidc.token.lifespan-grace` is only meant for taking some small clock skews into consideration.
+
+When the currently authenticated user returns to the protected Quarkus endpoint and the ID token associated with the session cookie has expired then, by default, the user will be auto-redirected to the OIDC Authorization endpoint to re-authenticate. Most likely the OIDC provider will challenge the user again though not necessarily if the session between the user and this OIDC provider is still active which may happen if it is configured to last longer than the ID token.
+
+If the `quarkus.oidc.token.refresh-expired` then the expired ID token (as well as the access token) will be refreshed using the refresh token returned with the authorization code grant response. This refresh token may also be recycled (refreshed) itself as part of this process. As a result the new session cookie will be created and the session will be extended.
+
+Note, `quarkus.oidc.authentication.session-age-extension` can be important when dealing with expired ID tokens, when the user is not very active. In such cases, if the ID token expires, then the session cookie may not be returned back to the Quarkus endpoint during the next user request and Quarkus will assume it is the first authentication request. Therefore using `quarkus.oidc.authentication.session-age-extension` is important if you need to have even the expired ID tokens refreshed.
+
+You can also complement refreshing the expired ID tokens by proactively refreshing the valid ID tokens which are about to be expired within the `quarkus.oidc.token.refresh-token-time-skew` value. If, during the current user request, it is calculated that the current ID token will expire within this `quarkus.oidc.token.refresh-token-time-skew` then it will be refreshed and the new session cookie will be created. This property should be set to a value which is less than the ID token lifespan; the closer it is to this lifespan value the more often the ID token will be refreshed.
+
+You can have this process further optimized by having a simple JavaScript function periodically emulating the user activity by pinging your Quarkus endpoint thus minimizing the window during which the user may have to be re-authenticated.
+
+Note this user session can not be extended forever - the returning user with the expired ID token will have to re-authenticate at the OIDC provider endpoint once the refresh token has expired.
+
+=== TokenStateManager
+
+OIDC `CodeAuthenticationMechanism` is using the default `io.quarkus.oidc.TokenStateManager' interface implementation to keep the ID, access and refresh tokens returned in the authorization code or refresh grant responses in a session cookie. It makes Quarkus OIDC endpoints completely stateless.
+
+Note that some endpoints do not require the access token. An access token is only required if the endpoint needs to retrieve `UserInfo` or access the downstream service with this access token or use the roles associated with the access token (the roles in the ID token are checked by default). In such cases you can set either `quarkus.oidc.state-session-manager.strategy=id-refresh-token` (keep ID and refresh tokens only) or `quarkus.oidc.state-session-manager.strategy=id-token` (keep ID token only).
+
+If the ID, access and refresh tokens are JWT tokens then combining all of them (if the strategy is the default `keep-all-tokens`) or only ID and refresh tokens (if the strategy is `id-refresh-token`) may produce a session cookie value larger than 4KB and the browsers may not be able to keep this cookie.
+In such cases, you can use `quarkus.oidc.token-state-manager.split-tokens=true` to have a unique session token per each of these tokens.
+
+Register your own `io.quarkus.oidc.TokenStateManager' implementation as an `@ApplicationScoped` CDI bean if you need to customize the way the tokens are associated with the session cookie. For example, you may want to keep the tokens in a database and have only a database pointer stored in a session cookie. Note though that it may present some challenges in making the tokens available across multiple microservices nodes.
+
+== Listening to important authentication events
+
+One can register `@ApplicationScoped` bean which will observe important OIDC authentication events. The listener will be updated when a user has logged in for the first time or re-authenticated, as well as when the session has been refreshed. More events may be reported in the future. For example:
+
+[source, java]
+----
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import io.quarkus.oidc.IdTokenCredential;
+import io.quarkus.oidc.SecurityEvent;
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class SecurityEventListener {
+
+    public void event(@Observes SecurityEvent event) {
+        String tenantId = event.getSecurityIdentity().getAttribute("tenant-id");
+        RoutingContext vertxContext = event.getSecurityIdentity().getCredential(IdTokenCredential.class).getRoutingContext();
+        vertxContext.put("listener-message", String.format("event:%s,tenantId:%s", event.getEventType().name(), tenantId));
+    }
+}
+----
 
 == Single Page Applications
 
 Please check if implementing SPAs the way it is suggested in the link:security-openid-connect#single-page-applications[Single Page Applications for Service Applications] section can meet your requirements.
 
-If you do prefer to use SPA and `XMLHttpRequest`(XHR) with Quarkus `web-app` applications then please be aware that OpenId Connect Providers may not support CORS for Authorization endpoints where the users
- are authenticated after a redirect from Quarkus which will lead to the authentication failures if the Quarkus `web-app` application and OpenId Connect Provider are hosted on the different HTTP domains/ports.
+If you prefer to use SPA and JavaScript API such as `Fetch` or `XMLHttpRequest`(XHR) with Quarkus web applications, please be aware that OpenID Connect Providers may not support CORS for Authorization endpoints where the users are authenticated after a redirect from Quarkus. This will lead to authentication failures if the Quarkus application and the OpenID Connect Provider are hosted on the different HTTP domains/ports.
 
-In such cases one needs to set the `quarkus.oidc.authentication.xhr-auto-redirect` property to `false` which will instruct Quarkus to return a `499` status code and `WWW-Authenticate` header with the `OIDC` value and the browser script needs to be updated to set "X-Requested-With" header with the `XMLHttpRequest` value and reload the last requested page in case of `499`, for example:
+In such cases, set the `quarkus.oidc.authentication.java-script-auto-redirect` property to `false` which will instruct Quarkus to return a `499` status code and `WWW-Authenticate` header with the `OIDC` value. The browser script also needs to be updated to set `X-Requested-With` header with the `JavaScript` value and reload the last requested page in case of `499`, for example:
 
 [source,javascript]
 ----
 Future<void> callQuarkusService() async {
-    Map<String, String> headers = Map.fromEntries([MapEntry("X-Requested-With", "XMLHttpRequest")]);
+    Map<String, String> headers = Map.fromEntries([MapEntry("X-Requested-With", "JavaScript")]);
 
     await http
         .get("https://localhost:443/serviceCall")
         .then((response) {
             if (response.statusCode == 499) {
-                window.location.assign(https://localhost.com:443/serviceCall);
+                window.location.assign("https://localhost.com:443/serviceCall");
             }
          });
   }
 ----
 
+== Running behind a reverse proxy
+
+OIDC authentication mechanism can be affected if your Quarkus application is running behind a reverse proxy/gateway/firewall when HTTP `Host` header may be reset to the internal IP address, HTTPS connection may be terminated, etc. For example, an authorization code flow `redirect_uri` parameter may be set to the internal host instead of the expected external one.
+
+In such cases configuring Quarkus to recognize the original headers forwarded by the proxy will be required, see link:vertx#reverse-proxy[Running behind a reverse proxy] Vert.x documentation section for more information.
+
+`quarkus.oidc.authentication.force-redirect-https-scheme` property may also be used when the Quarkus application is running behind a SSL terminating reverse proxy.
+
+== Cloud Services
+
+=== Google Cloud
+
+You can have Quarkus OIDC `web-app` applications access **Google Cloud services** such as **BigQuery** on behalf of the currently authenticated users who have enabled OpendId Connect (Authorization Code Flow) permissions to such services in their Google Developer Consoles.
+
+It is super easy to do with https://github.com/quarkiverse[Quarkiverse] https://github.com/quarkiverse/quarkiverse-google-cloud-services[Google Cloud Services], only add
+the https://github.com/quarkiverse/quarkiverse-google-cloud-services/releases/latest[latest tag] service dependency, for example:
+
+[source,xml]
+----
+<dependency>
+  <groupId>io.quarkiverse.googlecloudservices</groupId>
+  <artifactId>quarkus-google-cloud-bigquery</artifactId>
+  <version>${quarkiverse.googlecloudservices.version}</version>
+</dependency>
+----
+
+and configure Google OIDC properties:
+
+[source, properties]
+----
+quarkus.oidc.auth-server-url=https://accounts.google.com
+quarkus.oidc.application-type=web-app
+quarkus.oidc.client-id={GOOGLE_CLIENT_ID}
+quarkus.oidc.credentials.secret={GOOGLE_CLIENT_SECRET}
+quarkus.oidc.token.issuer=https://accounts.google.com
+----
+
+== Token Propagation
+Please see link:security-openid-connect-client#token-propagation[Token Propagation] section about the Authorization Code Flow access token propagation to the downstream services.
 
 == Configuration Reference
 
@@ -317,3 +556,5 @@ include::{generated-dir}/config/quarkus-oidc.adoc[opts=optional]
 * https://www.keycloak.org/documentation.html[Keycloak Documentation]
 * https://openid.net/connect/[OpenID Connect]
 * https://tools.ietf.org/html/rfc7519[JSON Web Token]
+* link:security-openid-connect-client[Quarkus - Using OpenID Connect and OAuth2 Client and Filters to manage access tokens]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-openid-connect.adoc b/docs/src/main/asciidoc/security-openid-connect.adoc
index 19a1502b9a7f5..15941f07173b4 100644
--- a/docs/src/main/asciidoc/security-openid-connect.adoc
+++ b/docs/src/main/asciidoc/security-openid-connect.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using OpenID Connect to Protect Service Applications using Bearer Token Authorization
 
@@ -14,6 +14,8 @@ Bearer Token Authorization is the process of authorizing HTTP requests based on
 
 Please read the link:security-openid-connect-web-authentication[Using OpenID Connect to Protect Web Applications] guide if you need to authenticate and authorize the users using OpenId Connect Authorization Code Flow.
 
+If you use Keycloak and Bearer tokens then also see the link:security-keycloak-authorization[Using Keycloak to Centralize Authorization] guide.
+
 Please read the link:security-openid-connect-multitenancy[Using OpenID Connect Multi-Tenancy] guide how to support multiple tenants.
 
 == Prerequisites
@@ -55,12 +57,13 @@ The solution is located in the `security-openid-connect-quickstart` {quickstarts
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=security-openid-connect-quickstart \
-    -Dextensions="oidc, resteasy-jsonb"
+    -Dextensions="resteasy,oidc,resteasy-jackson" \
+    -DnoExamples
 cd security-openid-connect-quickstart
 ----
 
@@ -97,8 +100,6 @@ import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.jboss.resteasy.annotations.cache.NoCache;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -112,7 +113,6 @@ public class UsersResource {
     @GET
     @Path("/me")
     @RolesAllowed("user")
-    @Produces(MediaType.APPLICATION_JSON)
     @NoCache
     public User me() {
         return new User(securityIdentity);
@@ -168,7 +168,7 @@ If you need to access `JsonWebToken` claims, you may simply inject the token its
 package org.acme.security.openid.connect;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
-
+import javax.inject.Inject;
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -251,7 +251,7 @@ Then run it:
 
 [source,bash]
 ----
-java -jar ./target/security-openid-connect-quickstart-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 === Running in Native Mode
@@ -329,6 +329,18 @@ export access_token=$(\
  )
 ----
 
+[[user-info]]
+== User Info
+
+Set `quarkus.oidc.user-info-required=true` if a UserInfo JSON object from the OIDC userinfo endpoint has to be requested.
+A request will be sent to the OpenId Provider UserInfo endpoint and  an `io.quarkus.oidc.UserInfo` (a simple `javax.json.JsonObject` wrapper) object will be created.
+`io.quarkus.oidc.UserInfo` can be either injected or accessed as a SecurityIdentity `userinfo` attribute.
+
+[[config-metadata]]
+== Configuration Metadata
+
+The discovered link:https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata[OpenId Connect Configuration Metadata] is represented by `io.quarkus.oidc.OidcConfigurationMetadata` and can be either injected or accessed as a `SecurityIdentity` `configuration-metadata` attribute.
+
 == Token Claims And SecurityIdentity Roles
 
 SecurityIdentity roles can be mapped from the verified JWT access tokens as follows:
@@ -341,9 +353,11 @@ SecurityIdentity roles can be mapped from the verified JWT access tokens as foll
 
 If the token is opaque (binary) then a `scope` property from the remote token introspection response will be used.
 
+If UserInfo is the source of the roles then set `quarkus.oidc.authentication.user-info-required=true` and `quarkus.oidc.roles.source=userinfo`, and if needed, `quarkus.oidc.roles.role-claim-path`.
+
 Additionally a custom `SecurityIdentityAugmentor` can also be used to add the roles as documented link:security#security-identity-customization[here].
 
-[[oidc-single-page-applications]]
+[[single-page-applications]]
 == Single Page Applications
 
 Single Page Application (SPA) typically uses `XMLHttpRequest`(XHR) and the Java Script utility code provided by the OpenId Connect provider to acquire a bearer token and use it
@@ -391,9 +405,14 @@ For example, here is how you can use `keycloak.js` to authenticate the users and
 </html>
 ----
 
+== Token Propagation
+
+Please see link:security-openid-connect-client#token-propagation[Token Propagation] section about the Bearer access token propagation to the downstream services.
 
 == References
 
 * https://www.keycloak.org/documentation.html[Keycloak Documentation]
 * https://openid.net/connect/[OpenID Connect]
 * https://tools.ietf.org/html/rfc7519[JSON Web Token]
+* link:security-openid-connect-client[Quarkus - Using OpenID Connect and OAuth2 Client and Filters to manage access tokens]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-properties.adoc b/docs/src/main/asciidoc/security-properties.adoc
index dba58fb1a9b9f..8312095ce1aec 100644
--- a/docs/src/main/asciidoc/security-properties.adoc
+++ b/docs/src/main/asciidoc/security-properties.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Security with .properties File
 
@@ -134,3 +134,7 @@ quarkus.security.users.embedded.roles.noadmin=user
 ----
 <1> User `scott` has roles `Admin`, `admin`, `Tester`, and `user`
 <2> User `stuart` has roles `admin` and `user`
+
+== References
+
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security-testing.adoc b/docs/src/main/asciidoc/security-testing.adoc
index eca37da1d0478..ff5e16408d395 100644
--- a/docs/src/main/asciidoc/security-testing.adoc
+++ b/docs/src/main/asciidoc/security-testing.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Security Testing
 
@@ -9,11 +9,12 @@ include::./attributes.adoc[]
 
 This document describes how to test Quarkus Security.
 
+[[configuring-user-information]]
 == Configuring User Information
 
 You can use link:security-properties[quarkus-elytron-security-properties-file] for testing security. This supports both embedding user info in `application.properties` and standalone properties files.
 
-For example, the following configuration will allow for configuring the users in both the production where OAuth2 is required and development modes using link:https://quarkus.io/guides/config#configuration-profiles[Configuration Profiles].
+For example, the following configuration will allow for configuring the users in both the production where OAuth2 is required and development modes using link:config#configuration-profiles[Configuration Profiles].
 
 [source,properties]
 ----
@@ -95,5 +96,8 @@ for example by setting `quarkus.http.auth.basic=true` or `%test.quarkus.http.aut
 == Use Wiremock for Integration Testing
 
 You can also use Wiremock to mock the authorization OAuth2 and OIDC services: 
-See link:security-oauth#integration-testing[OAuth2 Integration testing] for more details.
+See link:security-oauth2#integration-testing[OAuth2 Integration testing] for more details.
 
+== References
+
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/security.adoc b/docs/src/main/asciidoc/security.adoc
index e1f96671cdcd1..e0266ec6ff7d4 100644
--- a/docs/src/main/asciidoc/security.adoc
+++ b/docs/src/main/asciidoc/security.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Security Architecture and Guides
 
@@ -20,7 +20,7 @@ complete the conversion of these credentials to `SecurityIdentity`.
 
 For example, the credentials may be coming with the HTTP `Authorization` header, client HTTPS certificates or cookies.
 
-`IdentityProvider` verifies the authentication credentials and maps them to `SecurityIdentity` which contains the user name, roles, the original authentication credentials, and other attributes.
+`IdentityProvider` verifies the authentication credentials and maps them to `SecurityIdentity` which contains the username, roles, the original authentication credentials, and other attributes.
 
 For every authenticated resource, you can inject a `SecurityIdentity` instance to get the authenticated identity information.
 
@@ -42,7 +42,9 @@ Quarkus provides Mutual TLS authentication so that you can authenticate users ba
 
 Please see link:security-built-in-authentication#mutual-tls[Mutual TLS Authentication] for more information.
 
-== OpenId Connect
+=== OpenId Connect, JWT, OAuth2
+
+==== OpenId Connect
 
 `quarkus-oidc` extension provides a reactive, interoperable, multi-tenant enabled OpenId Connect adapter which supports `Bearer Token` and `Authorization Code Flow` authentication mechanisms.
 
@@ -62,10 +64,31 @@ Both `quarkus-oidc` `Bearer` and `Authorization Code Flow` Authentication mechan
 
 See link:security-openid-connect-multitenancy[Using OpenID Connect Multi-Tenancy] for more information about multiple tenants which can support `Bearer` or `Authorization Code Flow` authentication mechanism and configured statically or dynamically.
 
+[NOTE]
+====
+If you would like to have Quarkus OIDC extension enabled at runtime then set `quarkus.oidc.tenant-enabled=false` at build time and re-enable it at runtime using a system property.
+See also link:security-openid-connect-multitenancy#disable-tenant[Disabling Tenant Configurations] for more information about managing the individual tenant configurations in the multi-tenant OIDC deployments.
+====
+
 If you use Keycloak and Bearer tokens then also see the link:security-keycloak-authorization[Using Keycloak to Centralize Authorization] guide.  
 
+[NOTE]
+====
+If you need to configure Keycloak programmatically then consider using https://www.keycloak.org/docs/latest/server_development/#admin-rest-api[Keycloak Admin REST API] with the help of the `quarkus-keycloak-admin-client` extension.
+====
+
+==== OpenId Connect Client and Filters
+
+`quarkus-oidc-client` extension provides `OidcClient` for acquiring and refreshing access tokens from OpenId Connect and OAuth2 providers which support `client-credentials`, `password` and `refresh_token` token grants.
+
+`quarkus-oidc-client-filter` extension depends on the `quarkus-oidc-client` extension and provides JAX-RS `OidcClientRequestFilter` which sets the access token acquired by `OidcClient` as an HTTP `Authorization` header's  `Bearer` scheme value. This filter can be registered with MP RestClient implementations injected into the current Quarkus endpoint but it is not related to the authentication requirements of this service endpoint. For example, it can be a public endpoint or it can be protected with MTLS - the important point is that this Quarkus endpoint does not have to be protected itself with the Quarkus OpenId Connect adapter.
+
+`quarkus-oidc-token-propagation` extension depends on the `quarkus-oidc` extension and provides JAX-RS `TokenCredentialRequestFilter` which sets the OpenId Connect Bearer or Authorization Code Flow access token as an HTTP `Authorization` header's  `Bearer` scheme value. This filter can be registered with MP RestClient implementations injected into the current Quarkus endpoint and the Quarkus endpoint must be protected itself with the Quarkus OpenId Connect adapter. This filter can be used to propagate the access token to the downstream services.
+
+See the link:security-openid-connect-client[Using OpenID Connect and OAuth2 Client] guide for more information.
+
 [[smallrye-jwt]]
-== SmallRye JWT
+==== SmallRye JWT
 
 `quarkus-smallrye-jwt` provides Microprofile JWT 1.1.1 implementation and many more options to verify signed and encrypted `JWT` tokens and represent them as `org.eclipse.microprofile.jwt.JsonWebToken`.
 
@@ -75,13 +98,82 @@ Additionally it provides `JWT Generation API` for creating `signed`, `inner-sign
 
 See the link:security-jwt[Using SmallRye JWT] guide for more information.
 
-== OAuth2
+==== OAuth2
 
 `quarkus-elytron-security-oauth2` provides an alternative to `quarkus-oidc` Bearer Token Authentication Mechanism. It is based on `Elytron` and is primarily meant for introspecting the opaque tokens remotely.
 
 See the link:security-oauth2[Using OAuth2] guide for more information.
 
-== LDAP
+==== Choosing between OpenId Connect, SmallRye JWT and OAuth2 extensions
+
+`quarkus-oidc` extension requires an OpenId Connect provider such as Keycloak which can be used to verify the Bearer tokens or authenticate the end users with the Authorization Code flow. In both cases `quarkus-oidc` requires a connection to this OpenId Connect provider.
+
+`quarkus-oidc` is the only option when the user authentication via Authorization Code flow or supporting multiple tenants is required. It can also request a UserInfo using both Authorization Code Flow and Bearer access tokens.
+
+When the Bearer tokens have to be verified then `quarkus-oidc`, `quarkus-smallrye-jwt` and `quarkus-elytron-security-oauth2` can be used.
+
+If you have Bearer tokens in a JWT format then all these 3 extensions can be used. Both `quarkus-oidc` and `quarkus-smallrye-jwt` support refreshing the JsonWebKey (JWK) set when the OpenId Connect provider rotates the keys, therefore `quarkus-oidc` or `quarkus-smallrye-jwt` should be used for verifying JWT tokens if the remote token introspection has to be avoided or not supported by the providers.
+
+`quarkus-smallrye-jwt` does not support the remote introspection of the opaque tokens or even JWT tokens - it always relies on the locally available keys - possibly fetched from the OpenId Connect provider. So if you need to introspect the JWT tokens remotely then both `quarkus-oidc` and `quarkus-elytron-security-oauth2` will work. Both extensions also support the verification of the opaque/binary tokens via the remote introspection.
+
+`quarkus-oidc` and `quarkus-smallrye-jwt` can have both JWT and opaque tokens injected into the endpoint code - the injected JWT tokens may offer a richer information about the user. All extensions can have the tokens injected as `Principal`.
+
+`quarkus-smallrye-jwt` supports more key formats than `quarkus-oidc`. The latter will only use the JWK-formatted keys which are part of a JWK set. The former - can also work with PEM keys.
+
+`quarkus-smallrye-jwt` can handle locally not only signed but also inner-signed-and-encrypted or only encrypted tokens. In fact `quarkus-oidc` and `quarkus-elytron-security-oauth2` can verify such tokens too but only by treating them as opaque tokens and verifying them via the remote introspection.
+
+`quarkus-elytron-security-oauth2` is the best choice if you need a light weight library for the remote introspection of either opaque or JWT tokens.
+
+Note that a choice of using the opaque versus JWT token format is often driven by the architectural considerations. Opaque tokens are usually much shorter than JWT tokens but they require maintaining most of the token associated state in the provider database - the opaque tokens are effectively the database pointers. JWT tokens are significantly longer than the opaque tokens - but the providers are effectively delegating storing most of the token associated state to the client by storing it as the token claims and either signing and/or encrypting them.
+
+Below is a summary of the options.
+
+|===
+| | quarkus-oidc| quarkus-smallrye-jwt | quarkus-elytron-security-oauth2
+
+|Bearer JWT verification is required
+|Local Verification or Introspection
+|Local Verification
+|Introspection
+|Bearer Opaque Token verification is required
+|Introspection
+|No
+|Introspection
+|Refreshing JsonWebKey set for verifying JWT tokens
+|Yes
+|Yes
+|No
+|Represent token as Principal
+|Yes
+|Yes
+|Yes
+|Inject JWT as MP JWT JsonWebToken
+|Yes
+|Yes
+|No
+|Authorization Code Flow
+|Yes
+|No
+|No
+|Multi-tenancy
+|Yes
+|No
+|No
+|UserInfo support
+|Yes
+|No
+|No
+|Pem Key format support
+|No
+|Yes
+|No
+|InnerSigned/Encrypted or Encrypted tokens
+|Introspection
+|Local Verification
+|Introspection
+|===
+
+=== LDAP
 
 Please see the link:security-ldap[Authenticate with LDAP] guide for more information about LDAP authentication mechanism.
 
@@ -96,6 +188,7 @@ For example, `quarkus-oidc` uses its own `IdentityProvider` to convert a token t
 If you use `Basic` or `Form` HTTP-based authentication then you have to add an `IdentityProvider` which can convert a user name and password to `SecurityIdentity`.
 
 See link:security-jpa[JPA IdentityProvider] and link:security-jdbc[JDBC IdentityProvider] for more information.
+You can also use link:security-testing#configuring-user-information[User Properties IdentityProvider] for testing.
 
 == Combining Authentication Mechanisms
 
@@ -119,11 +212,31 @@ Quarkus Security is highly customizable. One can register custom ``HttpAuthentic
 
 See link:security-customization[Security Customization] for more information about customizing Quarkus Security and other useful tips about the reactive security, registering the security providers, etc.
 
+== Secure connections with SSL
+
+See the link:http-reference#ssl[Supporting secure connections with SSL] guide for more information.
+
+== Cross-Origin Resource Sharing
+
+If you plan to make your Quarkus application accessible to another application running on a different domain, you will need to configure CORS (Cross-Origin Resource Sharing). Please read the link:http-reference#cors-filter[HTTP CORS documentation] for more information.
+
+== SameSite cookies
+
+Please see link:vertx#same-site-cookie[SameSite cookies] for information about adding a https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite[SameSite] cookie property to any of the cookies set by a Quarkus endpoint.
+
 == Testing
 
 See link:security-testing[Security Testing] for more information about testing Quarkus Security.
 
 == Secret Engines
-
+=== Vault
 Quarkus provides a very comprehensive HashiCorp Vault support, please see the link:vault[Quarkus and HashiCorp Vault] documentation for more information.
 
+== National Vulnerability Database
+
+Most of Quarkus tags have been registered in link:https://nvd.nist.gov[National Vulnerability Database] (NVD) using a Common Platform Enumeration (CPE) name format.
+All registered Quarkus CPE names can be found using link:https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=quarkus[this search query].
+If a Quarkus tag represented by the given CPE name entry is affected by some CVE then you'll be able to follow a provided link to that CVE.
+
+We will be asking the NVD CPE team to update the list as well as link Quarkus CPE name entries with the related CVEs on a regular basis.
+If you work with a plugin like OWASP plugin which is using NVD feeds to detect the vulnerabilities at the application build time and you see a false positive reported then please re-open link:https://github.com/quarkusio/quarkus/issues/2611[this issue] and provide the details.
diff --git a/docs/src/main/asciidoc/software-transactional-memory.adoc b/docs/src/main/asciidoc/software-transactional-memory.adoc
index a36a4d94aa10b..5295c99cb8037 100644
--- a/docs/src/main/asciidoc/software-transactional-memory.adoc
+++ b/docs/src/main/asciidoc/software-transactional-memory.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Using Software Transactional Memory in Quarkus
 
@@ -102,7 +102,7 @@ To use the extension include it as a dependency in your application pom:
 
 == Defining STM-aware classes
 
-In order for the STM subsytem to have knowledge about which classes are to be managed within the context
+In order for the STM subsystem to have knowledge about which classes are to be managed within the context
 of transactional memory it is necessary to provide a minimal level of instrumentation. This occurs by
 categorising STM-aware and STM-unaware classes through an interface boundary; specifically all STM-aware objects
 must be instances of classes which inherit from interfaces that themselves have been annotated to identify them
@@ -180,7 +180,7 @@ concurrency control.
 <2> Then you create an instance that implements `FlightService`. You should not use it directly at this stage because
     access to it is not being managed by the STM subsystem.
 <3> To obtain a managed instance, pass the original object to the STM `container` which then returns a reference
-    through which you will be able perform transactional operations. This reference can be used safely from multiple threads.
+    through which you will be able to perform transactional operations. This reference can be used safely from multiple threads.
 
 == Defining transaction boundaries
 
diff --git a/docs/src/main/asciidoc/spring-boot-properties.adoc b/docs/src/main/asciidoc/spring-boot-properties.adoc
index 2e224ab68450e..23f4605cc748d 100644
--- a/docs/src/main/asciidoc/spring-boot-properties.adoc
+++ b/docs/src/main/asciidoc/spring-boot-properties.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Accessing application properties with Spring Boot properties API
 
@@ -35,14 +35,14 @@ The solution is located in the `spring-boot-properties-quickstart` {quickstarts-
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-boot-properties-quickstart \
     -DclassName="org.acme.spring.boot.properties.GreetingResource" \
     -Dpath="/greeting" \
-    -Dextensions="spring-boot-properties"
+    -Dextensions="resteasy,spring-boot-properties"
 cd spring-boot-properties-quickstart
 ----
 
@@ -112,7 +112,7 @@ Here `text` field is public, but it could also be a private field with getter an
 Because `text` does not have a default value it is considered required and unless it is defined in a configuration file (`application.properties` by default)  your application will fail to start.
 Define this property in your `src/main/resources/application.properties` file:
 
-[source,shell]
+[source,properties]
 ----
 # Your configuration properties
 greeting.text = hello
@@ -153,7 +153,7 @@ Open your browser to http://localhost:8080/greeting.
 
 Changing the configuration file is immediately reflected.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
 == Default values
@@ -350,7 +350,7 @@ This is especially useful when then number of properties grows.
 Because of the additional class, our property names have changed.
 Let's update the properties file and the `GreetingResource` class.
 
-[source,shell]
+[source,properties]
 ----
 # Your configuration properties
 greeting.message.text = hello
@@ -387,6 +387,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 * link:spring-di[Quarkus - Extension for Spring DI]
 * link:spring-web[Quarkus - Extension for Spring Web]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-security[Quarkus - Extension for Spring Security]
 * link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
 * link:spring-cache[Quarkus - Extension for Spring Cache]
diff --git a/docs/src/main/asciidoc/spring-cache.adoc b/docs/src/main/asciidoc/spring-cache.adoc
index bbe0ea000e8bc..6637d38c6c646 100644
--- a/docs/src/main/asciidoc/spring-cache.adoc
+++ b/docs/src/main/asciidoc/spring-cache.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Quarkus Extension for Spring Cache API
 
@@ -29,14 +29,14 @@ To complete this guide, you need:
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-cache-quickstart \
     -DclassName="org.acme.spring.cache.GreeterResource" \
     -Dpath="/greeting" \
-    -Dextensions="spring-di,spring-cache"
+    -Dextensions="resteasy,spring-di,spring-cache"
 cd spring-cache-quickstart
 ----
 
@@ -146,8 +146,6 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.jboss.resteasy.annotations.jaxrs.QueryParam;
 
@@ -158,7 +156,6 @@ public class WeatherForecastResource {
     WeatherForecastService service;
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public WeatherForecast getForecast(@QueryParam String city, @QueryParam long daysInFuture) { // <1>
         long executionStart = System.currentTimeMillis();
         List<String> dailyForecasts = Arrays.asList(
@@ -276,6 +273,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 * link:spring-web[Quarkus - Extension for Spring Web]
 * link:spring-security[Quarkus - Extension for Spring Security]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
 * link:spring-scheduled[Quarkus - Extension for Spring Scheduled]
diff --git a/docs/src/main/asciidoc/spring-cloud-config-client.adoc b/docs/src/main/asciidoc/spring-cloud-config-client.adoc
index 1a27ea32046b8..ad49ab9c26f2f 100644
--- a/docs/src/main/asciidoc/spring-cloud-config-client.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-config-client.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Reading properties from Spring Cloud Config Server
 
@@ -35,7 +35,7 @@ The end result of that process is a running Config Server that will provide the
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
@@ -150,6 +150,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 * link:spring-di[Quarkus - Extension for Spring DI]
 * link:spring-web[Quarkus - Extension for Spring Web]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-security[Quarkus - Extension for Spring Security]
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
 * link:spring-cache[Quarkus - Extension for Spring Cache]
@@ -158,5 +159,5 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 [[spring-cloud-config-client-configuration-reference]]
 == Spring Cloud Config Client Reference
 
-include::{generated-dir}/config/quarkus-spring-cloud-config.adoc[leveloffset=+1, opts=optional]
+include::{generated-dir}/config/quarkus-spring-cloud-config-client.adoc[leveloffset=+1, opts=optional]
 
diff --git a/docs/src/main/asciidoc/spring-data-jpa.adoc b/docs/src/main/asciidoc/spring-data-jpa.adoc
index 54d4aadfda32e..e8de3fb6d4032 100644
--- a/docs/src/main/asciidoc/spring-data-jpa.adoc
+++ b/docs/src/main/asciidoc/spring-data-jpa.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Extension for Spring Data API
 
@@ -35,14 +35,14 @@ The solution is located in the `spring-data-jpa-quickstart` {quickstarts-tree-ur
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-data-jpa-quickstart \
     -DclassName="org.acme.spring.data.jpa.FruitResource" \
     -Dpath="/greeting" \
-    -Dextensions="spring-data-jpa,resteasy-jsonb,quarkus-jdbc-postgresql"
+    -Dextensions="resteasy,spring-data-jpa,resteasy-jackson,quarkus-jdbc-postgresql"
 cd spring-data-jpa-quickstart
 ----
 
@@ -144,9 +144,10 @@ This configuration assumes that PostgreSQL will be running locally.
 
 A very easy way to accomplish that is by using the following Docker command:
 
-```
+[source,bash]
+----
 docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:11.5
-```
+----
 
 If you plan on using a different setup, please change your `application.properties` accordingly.
 
@@ -161,6 +162,7 @@ INSERT INTO fruit(id, name, color) VALUES (1, 'Cherry', 'Red');
 INSERT INTO fruit(id, name, color) VALUES (2, 'Apple', 'Red');
 INSERT INTO fruit(id, name, color) VALUES (3, 'Banana', 'Yellow');
 INSERT INTO fruit(id, name, color) VALUES (4, 'Avocado', 'Green');
+INSERT INTO fruit(id, name, color) VALUES (5, 'Strawberry', 'Red');
 ----
 
 Hibernate ORM will execute these queries on application startup.
@@ -201,7 +203,6 @@ import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 
 import org.jboss.resteasy.annotations.jaxrs.PathParam;
 
@@ -218,7 +219,6 @@ public class FruitResource {
     }
 
     @GET
-    @Produces("application/json")
     public Iterable<Fruit> findAll() {
         return fruitRepository.findAll();
     }
@@ -232,14 +232,12 @@ public class FruitResource {
 
     @POST
     @Path("/name/{name}/color/{color}")
-    @Produces("application/json")
     public Fruit create(@PathParam String name, @PathParam String color) {
         return fruitRepository.save(new Fruit(name, color));
     }
 
     @PUT
     @Path("/id/{id}/color/{color}")
-    @Produces("application/json")
     public Fruit changeColor(@PathParam Long id, @PathParam String color) {
         Optional<Fruit> optional = fruitRepository.findById(id);
         if (optional.isPresent()) {
@@ -253,7 +251,6 @@ public class FruitResource {
 
     @GET
     @Path("/color/{color}")
-    @Produces("application/json")
     public List<Fruit> findByColor(@PathParam String color) {
         return fruitRepository.findByColor(color);
     }
@@ -599,7 +596,7 @@ quarkus.hibernate-orm.implicit-naming-strategy=org.springframework.boot.orm.jpa.
 
 ==== More examples
 
-An extensive list of examples can be seen in the https://github.com/quarkusio/quarkus/tree/master/integration-tests/spring-data-jpa[integration tests] directory which is located inside the Quarkus source code.
+An extensive list of examples can be seen in the https://github.com/quarkusio/quarkus/tree/main/integration-tests/spring-data-jpa[integration tests] directory which is located inside the Quarkus source code.
 
 === What is currently unsupported
 
@@ -633,3 +630,4 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
 * link:spring-cache[Quarkus - Extension for Spring Cache]
 * link:spring-scheduled[Quarkus - Extension for Spring Scheduled]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
diff --git a/docs/src/main/asciidoc/spring-data-rest.adoc b/docs/src/main/asciidoc/spring-data-rest.adoc
new file mode 100644
index 0000000000000..0d1e4865e398c
--- /dev/null
+++ b/docs/src/main/asciidoc/spring-data-rest.adoc
@@ -0,0 +1,441 @@
+////
+This guide is maintained in the main Quarkus repository
+and pull requests should be submitted there:
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
+////
+= Quarkus - Extension for Spring Data REST
+
+include::./attributes.adoc[]
+:extension-status: experimental
+
+While users are encouraged to use REST Data with Panache for the REST data access endpoints generation,
+Quarkus provides a compatibility layer for Spring Data REST in the form of the `spring-data-rest` extension.
+
+
+include::./status-include.adoc[]
+
+== Prerequisites
+
+To complete this guide, you need:
+
+* less than 15 minutes
+* an IDE
+* JDK 1.8+ installed with `JAVA_HOME` configured appropriately
+* Apache Maven {maven-version}
+
+== Solution
+
+We recommend that you follow the instructions in the next sections and create the application step by step.
+However, you can go right to the completed example.
+
+Clone the Git repository: `git clone {quickstarts-clone-url}`, or download an {quickstarts-archive-url}[archive].
+
+The solution is located in the `spring-data-rest-quickstart` {quickstarts-tree-url}/spring-data-rest-quickstart[directory].
+
+== Creating the Maven project
+
+First, we need a new project. Create a new project with the following command:
+
+[source,bash,subs=attributes+]
+----
+mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
+    -DprojectGroupId=org.acme \
+    -DprojectArtifactId=spring-data-rest-quickstart \
+    -Dextensions="spring-data-rest,resteasy-jackson,quarkus-jdbc-postgresql" \
+    -DnoExamples
+cd spring-data-rest-quickstart
+----
+
+This command generates a Maven project with the `spring-data-rest` extension.
+
+If you already have your Quarkus project configured, you can add the `spring-data-rest` extension
+to your project by running the following command in your project base directory:
+
+[source,bash]
+----
+./mvnw quarkus:add-extension -Dextensions="spring-data-rest"
+----
+
+This will add the following to your `pom.xml`:
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-spring-data-rest</artifactId>
+</dependency>
+----
+
+For the tests you will also need REST Assured. Add it to the `pom.xml`:
+[source,xml]
+----
+<dependency>
+    <groupId>io.rest-assured</groupId>
+    <artifactId>rest-assured</artifactId>
+    <scope>test</scope>
+</dependency>
+----
+
+Note: both `resteasy-jackson` and `resteasy-jsonb` are supported and can be interchanged.
+
+== Define the Entity
+
+Throughout the course of this guide, the following JPA Entity will be used:
+
+[source,java]
+----
+package org.acme.spring.data.rest;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Fruit {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+
+    private String color;
+
+
+    public Fruit() {
+    }
+
+    public Fruit(String name, String color) {
+        this.name = name;
+        this.color = color;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+}
+----
+
+
+== Configure database access properties
+
+Add the following properties to `application.properties` to configure access to a local PostgreSQL instance.
+
+[source,properties]
+----
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=quarkus_test
+quarkus.datasource.password=quarkus_test
+quarkus.datasource.jdbc.url=jdbc:postgresql:quarkus_test
+quarkus.datasource.jdbc.max-size=8
+quarkus.hibernate-orm.database.generation=drop-and-create
+----
+
+This configuration assumes that PostgreSQL will be running locally.
+
+A very easy way to accomplish that is by using the following Docker command:
+
+[source,bash]
+----
+docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:11.5
+----
+
+If you plan on using a different setup, please change your `application.properties` accordingly.
+
+== Prepare the data
+
+To make it easier to showcase some capabilities of Spring Data REST on Quarkus, some test data should be inserted into the database
+by adding the following content to a new file named `src/main/resources/import.sql`:
+
+[source,sql]
+----
+INSERT INTO fruit(id, name, color) VALUES (1, 'Cherry', 'Red');
+INSERT INTO fruit(id, name, color) VALUES (2, 'Apple', 'Red');
+INSERT INTO fruit(id, name, color) VALUES (3, 'Banana', 'Yellow');
+INSERT INTO fruit(id, name, color) VALUES (4, 'Avocado', 'Green');
+INSERT INTO fruit(id, name, color) VALUES (5, 'Strawberry', 'Red');
+----
+
+Hibernate ORM will execute these queries on application startup.
+
+== Define the repository
+
+It is now time to define the repository that will be used to access `Fruit`.
+In a typical Spring Data fashion, create a repository like so:
+
+[source,java]
+----
+package org.acme.spring.data.rest;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface FruitsRepository extends CrudRepository<Fruit, Long> {
+}
+----
+
+The `FruitsRepository` above extends Spring Data's `org.springframework.data.repository.CrudRepository` which means that all of the latter's methods are
+available to `FruitsRepository`.
+
+The `spring-data-jpa` extension will generate an implementation for this repository. Then the `spring-data-rest` extension will generate a REST CRUD resource for it.
+
+== Update the test
+
+To test the capabilities of `FruitsRepository` proceed to update the content of `FruitsRepositoryTest` to:
+
+[source,java]
+----
+package org.acme.spring.data.rest;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.core.IsNot.not;
+
+@QuarkusTest
+class FruitsRepositoryTest {
+
+    @Test
+    void testListAllFruits() {
+        //List all, should have all 3 fruits the database has initially:
+        given()
+                .accept("application/json")
+                .when().get("/fruits")
+                .then()
+                .statusCode(200)
+                .body(
+                        containsString("Cherry"),
+                        containsString("Apple"),
+                        containsString("Banana")
+                );
+
+        //Delete the Cherry:
+        given()
+                .when().delete("/fruits/1")
+                .then()
+                .statusCode(204);
+
+        //List all, cherry should be missing now:
+        given()
+                .accept("application/json")
+                .when().get("/fruits")
+                .then()
+                .statusCode(200)
+                .body(
+                        not(containsString("Cherry")),
+                        containsString("Apple"),
+                        containsString("Banana")
+                );
+
+        //Create a new Fruit
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body("{\"name\": \"Orange\", \"color\": \"Orange\"}")
+                .when().post("/fruits")
+                .then()
+                .statusCode(201)
+                .body(containsString("Orange"))
+                .body("id", notNullValue())
+                .extract().body().jsonPath().getString("id");
+
+        //List all, Orange should be present now:
+        given()
+                .accept("application/json")
+                .when().get("/fruits")
+                .then()
+                .statusCode(200)
+                .body(
+                        not(containsString("Cherry")),
+                        containsString("Apple"),
+                        containsString("Orange")
+                );
+    }
+}
+
+----
+
+The test can be easily run by issuing: `./mvnw test`.
+
+== Package and run the application
+
+Quarkus dev mode works with the defined repositories just like with any other Quarkus extension, greatly enhancing your productivity during the dev cycle.
+The application can be started in dev mode as usual using:
+
+[source, bash]
+----
+./mvnw quarkus:dev
+----
+
+== Run the application as a native binary
+
+You can of course create a native executable following the instructions of the link:building-native-image[Building native executables] guide.
+
+== Supported Spring Data REST functionalities
+
+Quarkus currently supports a subset of Spring Data REST features, namely the most useful and most commonly used features.
+
+=== What is supported
+
+The following sections describe the most important supported features of Spring Data REST.
+
+==== Automatic REST endpoint generation
+
+Interfaces that extend any of the following Spring Data repositories get automatically generated REST endpoints:
+
+* `org.springframework.data.repository.CrudRepository`
+* `org.springframework.data.repository.PagingAndSortingRepository`
+* `org.springframework.data.jpa.repository.JpaRepository`
+
+Endpoints generated from the above repositories expose five common REST operations:
+
+* `GET /fruits` - lists all entities or returns a page if `PagingAndSortingRepository` or `JpaRepository` is used.
+* `GET /fruits/:id` - returns an entity by ID.
+* `POST /fruits` - creates a new entity.
+* `PUT /fruits/:id` - updates an existing entity or creates a new one with a specified ID (if allowed by the entity definition).
+* `DELETE /fruits/:id` - deletes an entity by ID.
+
+There are two supported data types: `application/json` and `application/hal+json`.
+The former is used by default, but it is highly recommended to specify which one you prefer with an `Accept` header.
+
+==== Exposing many entities
+
+If a database contains many entities, it might not be a great idea to return them all at once.
+`PagingAndSortingRepository` allows the `spring-data-rest` extension to access data in chunks.
+
+Replace the `CrudRepository` with `PagingAndSortingRepository` in the `FruitsRepository`:
+
+[source,java]
+----
+package org.acme.spring.data.rest;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface FruitsRepository extends PagingAndSortingRepository<Fruit, Long> {
+}
+----
+
+Now the `GET /fruits` will accept three new query parameters: `sort`, `page` and `size`.
+
+|===
+| Query parameter | Description | Default value | Example values
+
+| `sort`
+| Sorts the entities that are returned by the list operation
+| ""
+| `?sort=name` (ascending name), `?sort=name,-color` (ascending name and descending color)
+
+| `page`
+| Zero indexed page number. Invalid value is interpreted as 0.
+| 0
+| 0, 11, 100
+
+| `size`
+| Page size. Minimal accepted value is 1. Any lower value is interpreted as 1.
+| 20
+| 1, 11, 100
+|===
+
+For paged responses, `spring-data-rest` also returns a set of link headers that can be used to access other pages: first, previous, next and last.
+
+==== Fine tuning endpoints generation
+
+This allows user to specify which methods should be exposed and what path should be used to access them.
+Spring Data REST provides two annotations that can be used: `@RepositoryRestResource` and `@RestResource`.
+`spring-data-rest` extension supports the `exported`, `path` `collectionResourceRel` attributes of these annotations.
+
+Assume for example that fruits repository should be accessible by a `/my-fruits` path and only allow `GET` operation.
+In such a case, `FruitsRepository` would look like so:
+
+[source,java]
+----
+package org.acme.spring.data.rest;
+
+import java.util.Optional;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+@RepositoryRestResource(exported = false, path = "/my-fruits")
+public interface FruitsRepository extends CrudRepository<Fruit, Long> {
+
+    @RestResource(exported = true)
+    Optional<Fruit> findById(Long id);
+
+    @RestResource(exported = true)
+    Iterable<Fruit> findAll();
+}
+----
+
+`spring-data-rest` uses only a subset of the repository methods for data access.
+It is important to annotate the correct method in order to customize its REST endpoint:
+
+|===
+|REST operation |CrudRepository |PagingAndSortingRepository and JpaRepository
+
+|Get by ID
+|`Optional<T> findById(ID id)`
+|`Optional<T> findById(ID id)`
+
+|List
+|`Iterable<T> findAll()`
+|`Page<T> findAll(Pageable pageable)`
+
+|Create
+|`<S extends T> S save(S entity)`
+|`<S extends T> S save(S entity)`
+
+|Update
+|`<S extends T> S save(S entity)`
+|`<S extends T> S save(S entity)`
+
+|Delete
+|`void deleteById(ID id)`
+|`void deleteById(ID id)`
+|===
+
+=== What is currently unsupported
+
+* Only the repository methods listed above are supported. No other standard or custom methods are supported.
+* Only the `exposed`, `path` and `collectionResourceRel` annotation properties are supported.
+
+== Important Technical Note
+
+Please note that the Spring support in Quarkus does not start a Spring Application Context nor are any Spring infrastructure classes run.
+Spring classes and annotations are only used for reading metadata and / or are used as user code method return types or parameter types.
+
+== More Spring guides
+
+Quarkus has more Spring compatibility features. See the following guides for more details:
+
+* link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-di[Quarkus - Extension for Spring DI]
+* link:spring-web[Quarkus - Extension for Spring Web]
+* link:spring-security[Quarkus - Extension for Spring Security]
+* link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
+* link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
+* link:spring-cache[Quarkus - Extension for Spring Cache]
+* link:spring-scheduled[Quarkus - Extension for Spring Scheduled]
diff --git a/docs/src/main/asciidoc/spring-di.adoc b/docs/src/main/asciidoc/spring-di.adoc
index 03335f70a9e09..10c9a9b0e28ae 100644
--- a/docs/src/main/asciidoc/spring-di.adoc
+++ b/docs/src/main/asciidoc/spring-di.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Quarkus Extension for Spring DI API
 
@@ -37,14 +37,14 @@ The solution is located in the `spring-di-quickstart` {quickstarts-tree-url}/spr
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-di-quickstart \
     -DclassName="org.acme.spring.di.GreeterResource" \
     -Dpath="/greeting" \
-    -Dextensions="spring-di"
+    -Dextensions="resteasy,spring-di"
 cd spring-di-quickstart
 ----
 
@@ -106,6 +106,8 @@ public class AppConfiguration {
     }
 }
 ----
+As a Spring developer, you might be tempted to add the `@ComponentScan` annotation in order to define specific packages to scan for additional beans. Do note that `@ComponentScan` is entirely unnecessary since Quarkus performs link:cdi-reference#bean_discovery[bean discovery] only in `annotated` mode with no visibility boundaries. Moreover, note that the bean discovery in Quarkus happens at build time.
+In the same vein, Quarkus does not support the Spring `@Import` annotation.
 
 Now we define another bean that will implement `StringFunction` using Spring's stereotype annotation style.
 This bean will effectively be a no-op bean that simply returns the input as is.
@@ -130,7 +132,7 @@ public class NoOpSingleStringFunction implements StringFunction {
 Quarkus also provides support for injecting configuration values using Spring's `@Value` annotation.
 To see that in action, first edit the `src/main/resources/application.properties` with the following content:
 
-[source,java]
+[source,properties]
 ----
 # Your configuration properties
 greeting.message = hello
@@ -275,7 +277,9 @@ You can of course create a native image using instructions similar to link:build
 Please note that the Spring support in Quarkus does not start a Spring Application Context nor are any Spring infrastructure classes run.
 Spring classes and annotations are only used for reading metadata and / or are used as user code method return types or parameter types.
 What that means for end users, is that adding arbitrary Spring libraries will not have any effect. Moreover Spring infrastructure
-classes (like `org.springframework.beans.factory.config.BeanPostProcessor` for example) will not be executed.
+classes (like `org.springframework.beans.factory.config.BeanPostProcessor` , `org.springframework.context.ApplicationContext` for example) will not be executed.
+Regarding the dependency injection in particular, Quarkus uses a Dependency Injection mechanism (called ArC) based on the https://docs.jboss.org/cdi/spec/2.0/cdi-spec.html[Contexts and Dependency Injection for Java 2.0] specification. If you want to learn more about it we recommend you to read the link:cdi[Quarkus introduction to CDI] and the link:cdi-reference#arc-configuration-reference[CDI reference guide]
+The various Spring Boot test features are not supported by Quarkus. For testing purposes, please, check the link:getting-started-testing[Quarkus testing guide].
 
 == Conversion Table
 
@@ -319,6 +323,14 @@ The following table shows how Spring DI annotations can be converted to CDI and
 |@Scope
 |
 |Doesn't have a one-to-one mapping to a CDI annotation. Depending on the value of @Scope, one of the @Singleton, @ApplicationScoped, @SessionScoped, @RequestScoped, @Dependent could be used
+
+|@ComponentScan
+|
+|Doesn't have a one-to-one mapping to a CDI annotation. It is not used in Quarkus because Quarkus does all classpath scanning at build time.
+
+|@Import
+|
+|Doesn't have a one-to-one mapping to a CDI annotation.
 |===
 
 == More Spring guides
@@ -327,6 +339,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 
 * link:spring-web[Quarkus - Extension for Spring Web]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-security[Quarkus - Extension for Spring Security]
 * link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
diff --git a/docs/src/main/asciidoc/spring-scheduled.adoc b/docs/src/main/asciidoc/spring-scheduled.adoc
index f8255d9560d2a..8643c063899ad 100644
--- a/docs/src/main/asciidoc/spring-scheduled.adoc
+++ b/docs/src/main/asciidoc/spring-scheduled.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Quarkus Extension for Spring Scheduling API
 
@@ -38,14 +38,14 @@ The solution is located in the `spring-scheduled-quickstart` {quickstarts-tree-u
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-scheduler-quickstart \
     -DclassName="org.acme.spring.scheduler.CountResource" \
     -Dpath="/count" \
-    -Dextensions="spring-scheduled"
+    -Dextensions="resteasy,spring-scheduled"
 cd spring-scheduler-quickstart
 ----
 
@@ -126,7 +126,7 @@ public class CounterBean {
 == Updating the application configuration file
 
 Edit the `application.properties` file and add the `cron.expr` and the `fixedRate.expr` configuration:
-[source,shell]
+[source,properties]
 ----
 # The syntax used by Spring for cron expressions is the same as which is used by regular Quarkus scheduler.
 cron.expr=*/5 * * * * ?
@@ -206,7 +206,7 @@ Observe the console to verify that the following messages has been displayed:
 - `Fixed Rate expression configured in application.properties`
 These messages indicate that the executions of methods annotated with `@Scheduled` have been triggered.
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also generate the native executable with `./mvnw clean package -Pnative`.
 
 == Using Property Expressions
@@ -236,6 +236,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 * link:spring-di[Quarkus - Extension for Spring DI]
 * link:spring-web[Quarkus - Extension for Spring Web]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
 * link:spring-cache[Quarkus - Extension for Spring Cache]
diff --git a/docs/src/main/asciidoc/spring-security.adoc b/docs/src/main/asciidoc/spring-security.adoc
index 0f010feef908e..a2e5c2d472bca 100644
--- a/docs/src/main/asciidoc/spring-security.adoc
+++ b/docs/src/main/asciidoc/spring-security.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Quarkus Extension for Spring Security API
 
@@ -38,14 +38,14 @@ The solution is located in the `spring-security-quickstart` {quickstarts-tree-ur
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=spring-security-quickstart \
     -DclassName="org.acme.spring.security.GreetingController" \
     -Dpath="/greeting" \
-    -Dextensions="spring-web, spring-security, quarkus-elytron-security-properties-file"
+    -Dextensions="spring-web,spring-security,quarkus-elytron-security-properties-file"
 cd spring-security-quickstart
 ----
 
@@ -56,7 +56,7 @@ to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="spring-web, spring-security, quarkus-elytron-security-properties-file"
+./mvnw quarkus:add-extension -Dextensions="spring-web,spring-security,quarkus-elytron-security-properties-file"
 ----
 
 This will add the following to your `pom.xml`:
@@ -91,7 +91,6 @@ package org.acme.spring.security;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.PathVariable;
 
 @RestController
 @RequestMapping("/greeting")
@@ -149,10 +148,10 @@ The updated controller will be:
 ----
 package org.acme.spring.security;
 
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.PathVariable;
 
 @RestController
 @RequestMapping("/greeting")
@@ -402,7 +401,7 @@ Some examples of allowed expressions are:
 
     @PreAuthorize("hasAnyRole('view1', 'view2') OR isAnonymous() OR hasRole('test')")
     public void allowedForAdminOrAnonymous() {
-        
+
     }
 ----
 
@@ -435,6 +434,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 * link:spring-di[Quarkus - Extension for Spring DI]
 * link:spring-web[Quarkus - Extension for Spring Web]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
 * link:spring-cache[Quarkus - Extension for Spring Cache]
diff --git a/docs/src/main/asciidoc/spring-web.adoc b/docs/src/main/asciidoc/spring-web.adoc
index c0933cb00c49f..ed61c15a8f9bc 100644
--- a/docs/src/main/asciidoc/spring-web.adoc
+++ b/docs/src/main/asciidoc/spring-web.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Quarkus Extension for Spring Web API
 
@@ -37,7 +37,7 @@ The solution is located in the `spring-web-quickstart` {quickstarts-tree-url}/sp
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
@@ -221,7 +221,7 @@ This is enough to generate a basic OpenAPI schema document from your REST Endpoi
 
 [source,bash]
 ----
-curl http://localhost:8080/openapi
+curl http://localhost:8080/q/openapi
 ----
 
 You will see the generated OpenAPI schema document:
@@ -255,7 +255,7 @@ paths:
         "200":
           description: OK
           content:
-            '*/*':
+            'application/json':
               schema:
                 $ref: '#/components/schemas/Greeting'
 components:
@@ -267,11 +267,11 @@ components:
           type: string
 ----
 
-Also see link:https://quarkus.io/guides/openapi-swaggerui[the OpenAPI Guide]
+Also see link:openapi-swaggerui[the OpenAPI Guide]
 
 === Adding MicroProfile OpenAPI Annotations
 
-You can use link:https://github.com/eclipse/microprofile-open-api[MicroProfile OpenAPI] to better document your schema, 
+You can use link:https://github.com/eclipse/microprofile-open-api[MicroProfile OpenAPI] to better document your schema,
 example, adding the following to the class level of the `GreetingController`:
 
 [source, java]
@@ -286,7 +286,7 @@ example, adding the following to the class level of the `GreetingController`:
             email = "techsupport@example.com"),
         license = @License(
             name = "Apache 2.0",
-            url = "http://www.apache.org/licenses/LICENSE-2.0.html"))
+            url = "https://www.apache.org/licenses/LICENSE-2.0.html"))
 )
 ----
 
@@ -321,7 +321,7 @@ info:
     email: techsupport@example.com
   license:
     name: Apache 2.0
-    url: http://www.apache.org/licenses/LICENSE-2.0.html
+    url: https://www.apache.org/licenses/LICENSE-2.0.html
   version: 1.0.1
 tags:
 - name: Hello
@@ -369,9 +369,9 @@ components:
 === Using Swagger UI
 
 Swagger UI is included by default when running in `Dev` or `Test` mode, and can optionally added to `Prod` mode.
-See link:https://quarkus.io/guides/openapi-swaggerui#use-swagger-ui-for-development[the Swagger UI] Guide for more details.
+See link:openapi-swaggerui#use-swagger-ui-for-development[the Swagger UI] Guide for more details.
 
-Navigate to link:http://localhost:8080/swagger-ui/[localhost:8080/swagger-ui/] and you will see the Swagger UI screen:
+Navigate to link:http://localhost:8080/q/swagger-ui/[localhost:8080/q/swagger-ui/] and you will see the Swagger UI screen:
 
 image:spring-web-guide-screenshot01.png[alt=Swagger UI]
 
@@ -443,7 +443,7 @@ For this to function however, users need to add the `quarkus-undertow` dependenc
 The following method return types are supported:
 
 * `org.springframework.http.ResponseEntity`
-* `java.util.Map` 
+* `java.util.Map`
 
 Other return types mentioned in the Spring `https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/bind/annotation/ExceptionHandler.html[ExceptionHandler javadoc]` are not supported.
 
@@ -453,7 +453,7 @@ The following parameter types are supported, in arbitrary order:
 
 * An exception argument: declared as a general `Exception` or as a more specific exception. This also serves as a mapping hint if the annotation itself does not narrow the exception types through its `value()`.
 * Request and/or response objects (typically from the Servlet API). You may choose any specific request/response type, e.g. `ServletRequest` / `HttpServletRequest`. To use Servlet API, the `quarkus-undertow` dependency needs to be added.
- 
+
 Other parameter types mentioned in the Spring `https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/bind/annotation/ExceptionHandler.html[ExceptionHandler javadoc]` are not supported.
 
 == Important Technical Note
@@ -470,7 +470,7 @@ The following table shows how Spring Web annotations can be converted to JAX-RS
 |===
 |Spring |JAX-RS |Comments
 
-|@RequestController
+|@RestController
 |
 |There is no equivalent in JAX-RS. Annotating a class with @Path suffices
 
@@ -517,6 +517,7 @@ Quarkus has more Spring compatibility features. See the following guides for mor
 
 * link:spring-di[Quarkus - Extension for Spring DI]
 * link:spring-data-jpa[Quarkus - Extension for Spring Data JPA]
+* link:spring-data-rest[Quarkus - Extension for Spring Data REST]
 * link:spring-security[Quarkus - Extension for Spring Security]
 * link:spring-cloud-config-client[Quarkus - Reading properties from Spring Cloud Config Server]
 * link:spring-boot-properties[Quarkus - Extension for Spring Boot properties]
diff --git a/docs/src/main/asciidoc/tests-with-coverage.adoc b/docs/src/main/asciidoc/tests-with-coverage.adoc
index fb46d008fb54a..9ddcc097ea9d2 100644
--- a/docs/src/main/asciidoc/tests-with-coverage.adoc
+++ b/docs/src/main/asciidoc/tests-with-coverage.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Measuring the coverage of your tests
 
@@ -35,7 +35,7 @@ To complete this guide, you need:
 * an IDE
 * JDK 1.8+ installed with JAVA_HOME configured appropriately
 * Apache Maven {maven-version}
-* Having completed the link:https://quarkus.io/guides/getting-started-testing[Testing your application guide]
+* Having completed the link:getting-started-testing[Testing your application guide]
 
 == Architecture
 
@@ -53,7 +53,7 @@ The solution is located in the `tests-with-coverage-quickstart` {quickstarts-tre
 
 Let's start from an empty application created with the Quarkus Maven plugin: 
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:create \
     -DprojectGroupId=org.acme \
@@ -119,26 +119,7 @@ public class GreetingService {
 }
 ----
 
-The project will also need some tests. First a simple JUnit:
-
-[source,java]
-----
-package org.acme.testcoverage;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class GreetingServiceTest {
-
-    @Test
-    public void testGreetingService() {
-        GreetingService service = new GreetingService();
-        Assertions.assertEquals("hello Quarkus", service.greeting("Quarkus"));
-    }
-}
-----
-
-But also a `@QuarkusTest`:
+The project will also need a test:
 
 [source,java]
 ----
@@ -154,7 +135,6 @@ import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.is;
 
 @QuarkusTest
-@Tag("integration")
 public class GreetingResourceTest {
 
     @Test
@@ -179,283 +159,56 @@ public class GreetingResourceTest {
 }
 ----
 
-The first one will be our example of a Unit Test and the second one will be our example of Integration Test.
+== Setting up Jacoco
 
-== Separating executions of Unit Tests and Integration Tests
+Now we need to add Jacoco to our project. To do this we need to add the following to the `pom.xml` dependencies section:
 
-You may want to consider that JUnits and QuarkusTests are two different kind of tests and that they deserve to be separated. This way you could run them separately, in different cases or some more often than the others.
-In order to do so, we'll use a feature of JUnit 5 that allows us to tag some tests. Let's tag `GreetingResourceTest.java` and specify that it is an Integration Test:
-
-[source,java]
+[source,xml]
 ----
-import org.junit.jupiter.api.Tag;
-...
-
-@QuarkusTest
-@Tag("integration")
-public class GreetingResourceTest {
-    ...
-}
+<dependency>
+  <groupId>io.quarkus</groupId>
+  <artifactId>quarkus-jacoco</artifactId>
+  <scope>test</scope>
+</dependency>
 ----
 
-We're now able to distinguish unit tests and integration tests. Now, let's bind them to different Maven lifecycle phases. Let's use surefire to bind unit tests to the *test* phase and the integration tests to the *integration-test* phase.
+This Quarkus extension takes care of everything that would usually be done via the Jacoco maven plugin, so no additional
+config is required.
 
-[source,xml,subs=attributes+]
-----
-<project>
-    ...
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <excludedGroups>integration</excludedGroups>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <excludedGroups>!integration</excludedGroups>
-                            <groups>integration</groups>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    ...
-</project>
-----
-
-NOTE: This way, the `QuarkusTest` instances will be executed as part of the `integration-test` build phase while the other JUnit tests will still be ran during the `test` phase.
-You can run all the tests with the command `./mvnw clean verify` (and you will notice that two tests are ran in different phases).
+== Running the tests with coverage
 
-== Measuring the coverage of JUnit tests using JaCoCo
+Run `mvn verify`, the tests will be run and the results will end up in `target/jacoco-reports`. This is all that is needed,
+the `quarkus-jacoco` extension allows Jacoco to just work out of the box.
 
-It is now time to introduce JaCoCo to measure the coverage. The straightforward way to add JaCoCo to your build is to reference the plugin in your `pom.xml`.
+There are some config options that affect this:
 
-[source,xml,subs=attributes+]
-----
-    <properties>
-    ...
-        <jacoco.version>0.8.4</jacoco.version>
-    </properties>
+include::{generated-dir}/config/quarkus-jacoco-jacoco-config.adoc[opts=optional, leveloffset=+1]
 
-    <build>
-        <plugins>
-        ...
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-----
+== Coverage for tests not using @QuarkusTest
 
-NOTE: If you run `./mvnw clean test` the coverage information will be collected during the execution of the unit tests in the file `jacoco.exec`.
+The Quarkus automatic Jacoco config will only work for tests that are annotated with `@QuarkusTest`. If you want to check
+the coverage of other tests as well then you will need to fall back to the Jacoco maven plugin.
 
-== Measuring separately the coverage of each test type
+Because Quarkus uses class file transformation it is not possible to use online transformation with the Jacoco agent.
+Instead we need to use offline transformation.
 
-It is not strictly necessary, but let's distinguish the coverage brought by each test type. To do so, we`ll just output the coverage info in two different files, one in `jacoco-ut.exec` and one in `jacoco-it.exec`.
-We also need to generate a separate report for each test execution. Let's adjust the Jacoco configuration for that:
-
-[source,xml,subs=attributes+]
-----
-    <properties>
-    ...
-        <jacoco.version>0.8.4</jacoco.version>
-    </properties>
-
-    <build>
-        <plugins>
-        ...
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent-ut</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/jacoco-ut.exec</destFile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>prepare-agent-it</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/jacoco-it.exec</destFile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>report-ut</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco-ut.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>report-it</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco-it.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-----
-
-== The coverage does not seem to correspond to the reality
-
-You can now run the tests: `./mvnw clean verify` As explained earlier, it will run the unit tests first, then the integration tests. And finally, it will generate two separate reports. First a report of the coverage of the unit tests in `target/site/jacoco-ut` then a report of the coverage of the integration tests in `target/site/jacoco-it`.
-
-Given the content of `GreetingResourceTest`, `GreetingResource` should have been covered. But when we open the report `target/site/jacoco-it/index.html`, the class `GreetingResource` is reported with 0% of coverage. But the fact that `GreetingService` is reported as covered shows that the test execution was actually recorded. How come?
-
-During the report generation, you may have noticed a warning:
-
-[source,shell,subs=attributes+]
-----
-[WARNING] Classes in bundle '***' do no match with execution data. For report generation the same class files must be used as at runtime.
-[WARNING] Execution data for class org/acme/testcoverage/GreetingResource does not match.
-----
-
-It seems that Quarkus and JaCoCo step on each other's toes. What happens is that Quarkus transforms the JAX-RS resources (and also the Panache files).
-You may have noticed that `GreetingResource` was not written in the simplest way like:
-
-[source,java]
-----
-...
-@Path("/hello")
-public class GreetingResource {
-
-    @Inject
-    GreetingService service;
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    @Path("/greeting/{name}")
-    public String greeting(@PathParam("name") String name) {
-        return service.greeting(name);
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public String hello() {
-        return "hello";
-    }
-}
-----
-
-Above, the constructor is implicit and we use injection to have an instance of `GreetingService`. Note that, with this code relying on an implicit constructor, the coverage would have been reported properly by JaCoCo.
-Instead, we introduced a constructor based injection:
-
-[source,java]
-----
-...
-@Path("/hello")
-public class GreetingResource {
-
-    private final GreetingService service;
-
-    @Inject
-    public GreetingResource(GreetingService service) {
-        this.service = service;
-    }
-...
-}
-----
-
-Some might say that this approach is preferable since the field can be *final* like this. Anyway, in some cases you might need an explicit constructor. And, in that case, the coverage is not reported properly by JaCoCo.
-This is because Quarkus generates a constructor without any parameter and does some bycode manipulations in order to add it to the class. That is what happened here, just before the execution of the integration tests:
-
-[source,shell,subs=attributes+]
-----
-[INFO] --- quarkus-maven-plugin:0.16.0:build (default) @ getting-started-testing ---
-[INFO] [io.quarkus.deployment.QuarkusAugmentor] Beginning quarkus augmentation
-...
-----
-
-As a consequence, JaCoCo does not recognize the classes when it wants to create its report. But wait... there is a solution.
-
-== Instrumenting the classes instead
-
-JaCoCo has two modes. The first one is based on an agent and instruments classes on-the-fly. Unfortunately, this is incompatible with the dynamic classfile transformations that Quarkus does. The second mode is called link:https://www.eclemma.org/jacoco/trunk/doc/offline.html[offline instrumentation]. Classes are pre-instrumented in advance via the *jacoco:instrument* Maven goal and during their usage (when the tests are ran), *jacocoagent.jar* must be added to the classpath.
-Once the tests have been executed, it is recommended to restore the original classes using the *jacoco:restore-instrumented-classes* Maven goal.
-
-Let's first add the dependency on *jacocoagent.jar*:
+Instead of including the `quarkus-jacoco` extension in your pom you will need the following config:
 
 [source,xml,subs=attributes+]
 ----
 <project>
     ...
     <dependencies>
-        ...
+    ...
         <dependency>
-            <groupId>org.jacoco</groupId>
-            <artifactId>org.jacoco.agent</artifactId>
-            <classifier>runtime</classifier>
-            <scope>test</scope>
-            <version>${jacoco.version}</version>
+          <groupId>org.jacoco</groupId>
+          <artifactId>org.jacoco.agent</artifactId>
+          <classifier>runtime</classifier>
+          <scope>test</scope>
+          <version>${jacoco.version}</version>
         </dependency>
-    </dependencies>
-</project>
-----
-
-Then let's configure three jacoco plugin goals for unit tests:
-
-* One to instrument the classes during the *process-classes* phase
-* One to restore the original classes during the *prepare-package* phase (after the tests are ran)
-* One to generate the report during the *verify* phase (the report generation requires the original classes to have been restored)
-
-and a similar setup for the integration tests too:
-
-[source,xml,subs=attributes+]
-----
-<project>
     ...
+    </dependencies>
     <build>
         <plugins>
             ...
@@ -482,33 +235,7 @@ and a similar setup for the integration tests too:
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <dataFile>${project.build.directory}/jacoco-ut.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>instrument-it</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>restore-it</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>restore-instrumented-classes</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report-it</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco-it.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-reports</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -531,178 +258,19 @@ It also requires a small change in the Surefire configuration. Note below that w
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-plugin.version}</version>
                 <configuration>
-                    <excludedGroups>integration</excludedGroups>
                     <systemPropertyVariables>
-                        <jacoco-agent.destfile>${project.build.directory}/jacoco-ut.exec</jacoco-agent.destfile>
+                        <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <excludedGroups>!integration</excludedGroups>
-                            <groups>integration</groups>
-                            <systemPropertyVariables>
-                                <jacoco-agent.destfile>${project.build.directory}/jacoco-it.exec</jacoco-agent.destfile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
 </project>
 ----
 
-Let's now check the generated report that can be found in `target/site/jacoco-it/index.html`. The report now shows that `GreetingResource` is actually properly covered! Yay!
-
-== Bonus: Building a consolidated report for Unit Tests and Integration Tests
-
-So, finally, let's improve the setup even further and let's merge the two execution files (*jacoco-ut.exec* and *jacoco-it.exec*) into one consolidated report and generate a consolidated report that will show the coverage of all your tests combined.
-
-You should end up with something like this (note the addition of the `merge-results` and `post-merge-report` executions):
-
-[source,xml,subs=attributes+]
-----
-<project>
-    ...
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <excludedGroups>integration</excludedGroups>
-                    <systemPropertyVariables>
-                        <jacoco-agent.destfile>${project.build.directory}/jacoco-ut.exec</jacoco-agent.destfile>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <excludedGroups>!integration</excludedGroups>
-                            <groups>integration</groups>
-                            <systemPropertyVariables>
-                                <jacoco-agent.destfile>${project.build.directory}/jacoco-it.exec</jacoco-agent.destfile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            ...
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <executions>
-                    <execution>
-                        <id>instrument-ut</id>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>restore-ut</id>
-                        <goals>
-                            <goal>restore-instrumented-classes</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report-ut</id>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco-ut.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>instrument-it</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>restore-it</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>restore-instrumented-classes</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report-it</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco-it.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>merge-results</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <configuration>
-                            <fileSets>
-                                <fileSet>
-                                    <directory>${project.build.directory}</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco.exec</destFile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-merge-report</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/jacoco.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    ...
-    <dependencies>
-        ...
-        <dependency>
-            <groupId>org.jacoco</groupId>
-            <artifactId>org.jacoco.agent</artifactId>
-            <classifier>runtime</classifier>
-            <scope>test</scope>
-            <version>${jacoco.version}</version>
-        </dependency>
-    </dependencies>
-</project>
-----
-
 == Conclusion
 
 You now have all the information you need to study the coverage of your tests!
-But remember, some code that is not covered is certinaly not well tested. But some code that is covered is not necessarily *well* tested. Make sure to write good tests!
+But remember, some code that is not covered is certainly not well tested. But some code that is covered is not necessarily *well* tested. Make sure to write good tests!
diff --git a/docs/src/main/asciidoc/tika.adoc b/docs/src/main/asciidoc/tika.adoc
index b6c7f529e71ea..41bcd48ea5893 100644
--- a/docs/src/main/asciidoc/tika.adoc
+++ b/docs/src/main/asciidoc/tika.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Apache Tika
 
@@ -13,25 +13,13 @@ https://tika.apache.org/[Apache Tika] is a content analysis toolkit which is use
 
 [NOTE]
 ====
-If you are planning to run the application as a native executable and parse documents that may have been created with charsets different than the standard ones supported in Java such as `UTF-8` then you should configure Quarkus Maven Plugin to get the native image generator include all the charsets available to the JVM:
+If you are planning to run the application as a native executable and parse documents that may have been created with charsets different than the standard ones supported in Java such as `UTF-8` then you should configure Quarkus to get the native image generator include all the charsets available to the JVM:
 [source,xml]
 ----
-<plugin>
-    <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-maven-plugin</artifactId>
-    <executions>
-        <execution>
-            <id>native-image</id>
-            <goals>
-                <goal>native-image</goal>
-            </goals>
-            <configuration>
-                <addAllCharsets>true</addAllCharsets>
-                ...
-            </configuration>
-        </execution>
-    </executions>
-</plugin>
+<properties>
+    <quarkus.package.type>native</quarkus.package.type>
+    <quarkus.native.add-all-charsets>true</quarkus.native.add-all-charsets>
+<properties>
 ----
 ====
 
@@ -66,7 +54,7 @@ The provided solution contains a few additional elements such as tests and testi
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme.example \
@@ -178,7 +166,7 @@ As you can see the JAX-RS resource method was renamed to `extractText`, `@GET` a
 
 Now we are ready to run our application. Use:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -192,7 +180,7 @@ $ ./mvnw clean compile quarkus:dev
 [INFO] Scanning for projects...
 [INFO]
 INFO] --------------------< org.acme.example:apache-tika >--------------------
-[INFO] Building apache-tika 1.0-SNAPSHOT
+[INFO] Building apache-tika 1.0.0-SNAPSHOT
 [INFO] --------------------------------[ jar ]---------------------------------
 ...
 Listening for transport dt_socket at address: 5005
@@ -224,7 +212,7 @@ Hello Quarkus
 == Building a native executable
 
 You can build a native executable with the usual command `./mvnw package -Pnative`.
-Running it is as simple as executing `./target/tika-quickstart-1.0-SNAPSHOT-runner`.
+Running it is as simple as executing `./target/tika-quickstart-1.0.0-SNAPSHOT-runner`.
 
 == Configuration Reference
 
diff --git a/docs/src/main/asciidoc/tooling.adoc b/docs/src/main/asciidoc/tooling.adoc
index 13d062d986600..4d3d7478db241 100644
--- a/docs/src/main/asciidoc/tooling.adoc
+++ b/docs/src/main/asciidoc/tooling.adoc
@@ -1,31 +1,34 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using our Tooling
 
 include::./attributes.adoc[]
 
-Quarkus comes with a toolchain enabling developers from live reload all the way down to deploying a Kubernetes application.
+Quarkus comes with a toolchain enabling developers from live reload all the way down to deploying a Kubernetes application. In addition there are plugins and extensions to all major IDEs.
+
 In this guide, we will explore:
 
 * how to use link:maven-tooling[Maven] as a build tool
 * how to use link:gradle-tooling[Gradle] as a build tool
-* how to use the native CLI for your toolchain (coming soon)
+* how to use the CLI for your toolchain (coming soon)
 * how to create and scaffold a new project
 * how to deal with extensions
 * how to enable live reload
 * how to develop your application in your IDE
 * how to compile your application natively
+* how to setup Quarkus tools in link:ide-tooling[Visual Studio Code, Eclipse IDE, Eclipse Che and IntelliJ] 
 
 [[build-tool]]
 == Choosing your build tool
 
 Quarkus comes with a toolchain to help you at all development stages.
 You can use Maven or Gradle as build tool.
-And we offer a native CLI that is convenient to use (coming soon).
+And we offer a CLI that is convenient to use (coming soon).
 
 * link:maven-tooling[Maven]
 * link:gradle-tooling[Gradle]
 //* link:cli-tooling[CLI]
+* link:ide-tooling[IDE]
diff --git a/docs/src/main/asciidoc/transaction.adoc b/docs/src/main/asciidoc/transaction.adoc
index 1dc455cb2c693..015779dbb2fe9 100644
--- a/docs/src/main/asciidoc/transaction.adoc
+++ b/docs/src/main/asciidoc/transaction.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Using Transactions in Quarkus
 
@@ -206,7 +206,7 @@ Does it work everywhere I want to?::
 Yep, it works in your Quarkus application, in your IDE, in your tests, because all of these are Quarkus applications.
 JTA has some bad press for some people.
 I don't know why.
-Let's just say that this is not your grand'pa's JTA implementation.
+Let's just say that this is not your grandpa's JTA implementation.
 What we have is perfectly embeddable and lean.
 
 Does it do 2 Phase Commit and slow down my app?::
diff --git a/docs/src/main/asciidoc/validation.adoc b/docs/src/main/asciidoc/validation.adoc
index 54a5fbcce5373..f758f52900111 100644
--- a/docs/src/main/asciidoc/validation.adoc
+++ b/docs/src/main/asciidoc/validation.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Validation with Hibernate Validator
 
@@ -42,18 +42,18 @@ The solution is located in the `validation-quickstart` {quickstarts-tree-url}/va
 
 First, we need a new project. Create a new project with the following command:
 
-[source, subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=validation-quickstart \
     -DclassName="org.acme.validation.BookResource" \
     -Dpath="/books" \
-    -Dextensions="resteasy-jsonb, hibernate-validator"
+    -Dextensions="resteasy,resteasy-jackson,hibernate-validator"
 cd validation-quickstart
 ----
 
-This command generates a Maven structure importing the RESTEasy/JAX-RS, JSON-B and Hibernate Validator/Bean Validation extensions.
+This command generates a Maven structure importing the RESTEasy/JAX-RS, Jackson and Hibernate Validator/Bean Validation extensions.
 
 If you already have your Quarkus project configured, you can add the `hibernate-validator` extension
 to your project by running the following command in your project base directory:
@@ -122,8 +122,6 @@ Add the following method:
 ----
 @Path("/manual-validation")
 @POST
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public Result tryMeManualValidation(Book book) {
     Set<ConstraintViolation<Book>> violations = validator.validate(book);
     if (violations.isEmpty()) {
@@ -233,8 +231,6 @@ Calling the service in your rest end point triggers the `Book` validation automa
 
 @Path("/service-method-validation")
 @POST
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public Result tryMeServiceMethodValidation(Book book) {
     try {
         bookService.validateBook(book);
@@ -273,7 +269,7 @@ Then, open your browser to http://localhost:8080/:
 
 image:validation-guide-screenshot.png[alt=Application]
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also build the native executable using `./mvnw package -Pnative`.
 
 == Going further
@@ -363,6 +359,76 @@ provided the supported locales have been properly specified in the `application.
 quarkus.locales=en-US,es-ES,fr-FR
 ----
 
+=== Validation groups for REST endpoint or service method validation
+
+It's sometimes necessary to enable different validation constraints
+for the same class when it's passed to a different method.
+
+For example, a `Book` may need to have a `null` identifier when passed to the `put` method
+(because the identifier will be generated),
+but a non-`null` identifier when passed to the `post` method
+(because the method needs the identifier to know what to update).
+
+To address this, you can take advantage of validation groups.
+Validation groups are markers that you put on your constraints in order to enable or disable them at will.
+
+First, define the `Put` and `Post` groups, which are just Java interfaces.
+
+[source, java]
+----
+public interface ValidationGroups {
+    interface Put extends Default { // <1>
+    }
+    interface Post extends Default { // <1>
+    }
+}
+----
+<1> Make the custom groups extend the `Default` group.
+This means that whenever these groups are enabled, the `Default` group is also enabled.
+This is useful if you have constraints that you want validated in both the `Put` and `Post` method:
+you can simply use the default group on those constraints, like on the `title` property below.
+
+Then add the relevant constraints to `Book`, assigning the right group to each constraint:
+
+[source, java]
+----
+public class Book {
+
+    @Null(groups = ValidationGroups.Put.class)
+    @NotNull(groups = ValidationGroups.Post.class)
+    public Long id;
+
+    @NotBlank
+    public String title;
+
+}
+----
+
+Finally, add a `@ConvertGroup` annotation next to your `@Valid` annotation in your validated method.
+
+[source, java]
+----
+@Path("/")
+@PUT
+@Consumes(MediaType.APPLICATION_JSON)
+public void put(@Valid @ConvertGroup(to = ValidationGroups.Put.class) Book book) { // <1>
+    // ...
+}
+
+@Path("/")
+@POST
+@Consumes(MediaType.APPLICATION_JSON)
+public void post(@Valid @ConvertGroup(to = ValidationGroups.Post.class) Book book) { // <2>
+    // ...
+}
+----
+<1> Enable the `Put` group, meaning only constraints assigned to the `Put` (and `Default`) groups
+will be validated for the `book` parameter of the `put` method.
+In this case, it means `Book.id` must be `null` and `Book.title` must not be blank.
+<2> Enable the `Post` group, meaning only constraints assigned to the `Post` (and `Default`) groups
+will be validated for the `book` parameter of the `post` method.
+In this case, it means `Book.id` must not be `null` and `Book.title` must not be blank.
+
 [[configuration-reference]]
 == Hibernate Validator Configuration Reference
 
diff --git a/docs/src/main/asciidoc/vault-auth.adoc b/docs/src/main/asciidoc/vault-auth.adoc
index 75814d457da2c..223f6648bcdd4 100644
--- a/docs/src/main/asciidoc/vault-auth.adoc
+++ b/docs/src/main/asciidoc/vault-auth.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Working with HashiCorp Vault’s Authentication
 
@@ -51,14 +51,14 @@ To complete this guide, you need:
 We assume there is a Vault container and a PostgreSQL container running from the {base-guide}, and the root token is known.
 
 First, create a new shell, `docker exec` into the container and set the root token:
-[source, shell, subs=attributes+]
+[source,shell, subs=attributes+]
 ----
 docker exec -it dev-vault sh
 / # export VAULT_TOKEN={root-token}
 ----
 
 Create a token for the `vault-quickstart-policy` policy:
-[source, shell, subs=attributes+]
+[source,shell, subs=attributes+]
 ----
 / # vault token create -policy=vault-quickstart-policy
 Key                  Value
@@ -79,14 +79,14 @@ quarkus.vault.authentication.client-token={client-token}
 ----
 
 Compile and start the application:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 ./mvnw clean install
-java -jar target/vault-quickstart-1.0-SNAPSHOT-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 Finally test the application endpoint:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl http://localhost:8080/hello/private-key
 ----
@@ -111,7 +111,7 @@ If the _Wrapping Token_ gets stolen and unwrapped, we will notice immediately be
 will get an error saying that the token is invalid.
 
 With that in mind, let’s create a new token and wrap it inside a _Wrapping Token_ with a TTL of 1 minute:
-[source, shell, subs=attributes+]
+[source,shell, subs=attributes+]
 ----
 / # vault token create -wrap-ttl=60s -policy=vault-quickstart-policy
 Key                              Value
@@ -133,7 +133,7 @@ quarkus.vault.authentication.client-token-wrapping-token={client-token-wrapping-
 Compile and run the application *without the tests*, you should be able now to curl the private key `{private-key}` as before.
 
 Stop the application, and execute tests with `./mvnw test`. They should fail with the following error:
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 ERROR: Failed to start application
 io.quarkus.vault.VaultException: wrapping token is not valid or does not exist; this means that the token has already expired (if so you can increase the TTL on the wrapping token) or has been consumed by somebody else (potentially indicating that the wrapping token has been stolen)
@@ -143,7 +143,7 @@ io.quarkus.vault.VaultException: wrapping token is not valid or does not exist;
 
 Normally the `userpass` auth method should already be enabled from the {base-guide}. If not, execute the following
 commands now:
-[source, shell]
+[source,bash]
 ----
 vault auth enable userpass
 vault write auth/userpass/users/bob password=sinclair policies=vault-quickstart-policy
@@ -157,7 +157,7 @@ quarkus.vault.authentication.userpass.password=sinclair
 ----
 
 Test the application endpoint after compiling and starting the application again:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl http://localhost:8080/hello/private-key
 ----
@@ -180,7 +180,7 @@ _Approle_ is an authentication method suited for technical workflows. It relies
 
 To set up _Approle_ you need to enable the `approle` auth method, create an app role,
 and generate a role id and secret id:
-[source, shell, subs=attributes+]
+[source,shell, subs=attributes+]
 ----
 / # vault auth enable approle
 / # vault write auth/approle/role/myapprole policies=vault-quickstart-policy
@@ -210,7 +210,7 @@ After compiling and running the application you should be able to curl it on the
 === Approle using Response Wrapping
 
 Similarly to direct client token authentication, it is possible to wrap the `secret-id`:
-[source, shell, subs=attributes+]
+[source,shell, subs=attributes+]
 ----
 / # vault write -wrap-ttl=60s -f auth/approle/role/myapprole/secret-id
 Key                              Value
@@ -271,7 +271,7 @@ And apply it: `kubectl apply -f vault-auth-k8s.yml`.
 
 Once the objects are created, we need to capture the JWT token of this service account,
 and grab the public certificate of the cluster:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 secret_name=$(kubectl get sa vault-auth-sa -o json | jq -r '.secrets[0].name')
 token=$(kubectl get secret $secret_name -o json | jq -r '.data.token' | base64 --decode)
@@ -283,7 +283,7 @@ kubectl get secret $secret_name -o json | jq -r '.data."ca.crt"' | base64 -D > /
 
 The next step requires to exec interactively with the root token into the Vault container
 to configure the Kubernetes auth method:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 docker exec -it dev-vault sh
 export VAULT_TOKEN={root-token}
@@ -292,7 +292,7 @@ export VAULT_TOKEN={root-token}
 Once inside the pod, set the token variable to the value that was just printed in the console before, and
 recreate `ca.crt` with the same content as `/tmp/ca.crt` outside the container. Finally use `kubectl config view`
 to assess the url of your Kubernetes cluster:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 token=...       => set the value printed in the console just before
 vi ca.crt       => copy/paste /tmp/ca.crt from outside the container
@@ -300,7 +300,7 @@ kubernetes_host => url from the kubectl config view (e.g. https://kubernetes.doc
 ----
 
 Now we have all the information we need to configure Vault:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 vault auth enable kubernetes
 
@@ -327,7 +327,10 @@ such that they will be accessible from the pod):
 [source, properties, subs=attributes+]
 ----
 quarkus.vault.url=http://<host>:8200
-quarkus.datasource.url = jdbc:postgresql://<host>:5432/mydatabase
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=<your username>
+quarkus.datasource.password=<your password>
+quarkus.datasource.jdbc.url = jdbc:postgresql://<host>:5432/mydatabase
 
 quarkus.vault.authentication.kubernetes.role=vault-quickstart-role
 
@@ -335,7 +338,7 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 ----
 
 Now build the application:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 ./mvnw package -DskipTests
 docker build -f src/main/docker/Dockerfile.jvm -t quarkus/vault-quickstart-jvm .
@@ -397,7 +400,7 @@ And apply it: `kubectl apply -f vault-quickstart-k8s.yml`.
 This will deploy the application, and make it available on port `30400` of the Kubernetes host.
 
 You can check that the application has started from the logs:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 kubectl get pods
 pod=$(kubectl get pod -l app=vaultapp -o json | jq -r '.items[0].metadata.name')
@@ -405,7 +408,7 @@ kubectl logs $pod
 ----
 
 You should see:
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 exec java -Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:+ExitOnOutOfMemoryError -cp . -jar /deployments/app.jar
 __  ____  __  _____   ___  __ ____  ______
@@ -419,21 +422,21 @@ __  ____  __  _____   ___  __ ____  ______
 2020-04-15 18:30:01,779 DEBUG [io.qua.vau.run.VaultAuthManager] (main) created new login token: {clientToken: ***, renewable: true, leaseDuration: 3600s, valid_until: Wed Apr 15 19:30:01 GMT 2020}
 2020-04-15 18:30:01,802 DEBUG [io.qua.vau.run.con.VaultConfigSource] (main) loaded 1 properties from vault
 2020-04-15 18:30:02,722 DEBUG [io.qua.vau.run.VaultAuthManager] (Agroal_7305849841) extended login token: {clientToken: ***, renewable: true, leaseDuration: 3600s, valid_until: Wed Apr 15 19:30:02 GMT 2020}
-2020-04-15 18:30:03,274 INFO  [io.quarkus] (main) vault-quickstart 1.0-SNAPSHOT (powered by Quarkus 999-SNAPSHOT) started in 4.255s. Listening on: http://0.0.0.0:8080
+2020-04-15 18:30:03,274 INFO  [io.quarkus] (main) vault-quickstart 1.0.0-SNAPSHOT (powered by Quarkus 999-SNAPSHOT) started in 4.255s. Listening on: http://0.0.0.0:8080
 2020-04-15 18:30:03,276 INFO  [io.quarkus] (main) Profile prod activated.
 2020-04-15 18:30:03,276 INFO  [io.quarkus] (main) Installed features: [agroal, cdi, hibernate-orm, jdbc-postgresql, narayana-jta, resteasy, vault]
 ----
 
 Notice in particular the following log line:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 authenticate with jwt at: /var/run/secrets/kubernetes.io/serviceaccount/token => ***
 ----
 
 Finally curl the `private-key` endpoint to make sure you can retrieve your secret:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl http://localhost:30400/hello/private-key
 ----
 
-You should see `{private-key}`.
\ No newline at end of file
+You should see `{private-key}`.
diff --git a/docs/src/main/asciidoc/vault-datasource.adoc b/docs/src/main/asciidoc/vault-datasource.adoc
index bd7f5ef894d68..b353510284700 100644
--- a/docs/src/main/asciidoc/vault-datasource.adoc
+++ b/docs/src/main/asciidoc/vault-datasource.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using HashiCorp Vault with Databases
 
@@ -109,7 +109,7 @@ public int geGiftCount() {
 
 Start a PostgreSQL database:
 
-[source, shell]
+[source,bash]
 ----
 docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgres-quarkus-hibernate -e POSTGRES_USER=sarah -e POSTGRES_PASSWORD=connor -e POSTGRES_DB=mydatabase -p 5432:5432 postgres:10.5
 ----
@@ -122,7 +122,7 @@ The simplest approach is to write the database password in the KV secret engine
 fetched from the Vault MicroProfile Config Source.
 
 Open a new shell, `docker exec` in the Vault container and set the root token:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 docker exec -it dev-vault sh
 export VAULT_TOKEN={root-token}
@@ -130,7 +130,7 @@ export VAULT_TOKEN={root-token}
 
 Add a `dbpassword` property in the `config` path of the KV secret engine, beside the original `a-private-key`
 property:
-[source, shell]
+[source,bash]
 ----
 vault kv put secret/myapps/vault-quickstart/config a-private-key=123456 dbpassword=connor
 ----
@@ -149,22 +149,22 @@ quarkus.hibernate-orm.database.generation=drop-and-create
 ----
 
 Compile and start the application:
-[source, shell]
+[source,bash]
 ----
 ./mvnw package
-java -jar target/vault-quickstart-1.0-SNAPSHOT-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 Test it with the `gift-count` endpoint:
 
-[source, shell]
+[source,bash]
 ----
 curl http://localhost:8080/hello/gift-count
 ----
 
 You should see:
 
-[source, shell]
+[source,text]
 ----
 0
 ----
@@ -187,7 +187,7 @@ we make sure we have a fresh value every time.
 
 Create a new path (different than the `config` path) in Vault where the database password will be added:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 vault kv put secret/myapps/vault-quickstart/db password=connor
 ----
@@ -234,7 +234,7 @@ of databases are supported, such as https://www.vaultproject.io/docs/secrets/dat
 First we need to enable the `database` secret engine, configure the `postgresql-database-plugin` and create
 the database role `mydbrole` (replace `10.0.0.3` by the actual host that is running the PostgreSQL container;
 for simplicity we disabled _TLS_ between Vault and the PostgreSQL database):
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 vault secrets enable database
 
@@ -266,7 +266,7 @@ to create users.
 ====
 
 Then we need to give a read capability to the Quarkus application on path `database/creds/mydbrole`.
-[source, shell]
+[source,bash]
 ----
 cat <<EOF | vault policy write vault-quickstart-policy -
 path "secret/data/myapps/vault-quickstart/*" {
@@ -297,7 +297,7 @@ is not the owner. As expected this will fail. As a result, it is recommended to
 Recompile with `./mvnw package`, start and test the `gift-count` endpoint. You should see `0` again.
 
 Notice in the logs:
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 2020-04-22 14:29:48,522 DEBUG [io.qua.vau.run.VaultDbManager] (Agroal_682171661) generated mydbrole credentials: {leaseId: database/creds/mydbrole/L6PxoI68gZDeVPXP0RAA4c0a, renewable: true, leaseDuration: 60s, valid_until: Wed Apr 22 14:30:48 CEST 2020, username: v-userpass-mydbrole-HeOMJCmy9coEnO2my2AR-1587558588, password:***}
 ----
diff --git a/docs/src/main/asciidoc/vault-transit.adoc b/docs/src/main/asciidoc/vault-transit.adoc
index 4f73b7a343bcd..54c1e224044c6 100644
--- a/docs/src/main/asciidoc/vault-transit.adoc
+++ b/docs/src/main/asciidoc/vault-transit.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using HashiCorp Vault's Transit Secret Engine
 
@@ -50,7 +50,7 @@ To complete this guide, you need:
 We assume there is a Vault running from the {base-guide}, and the root token is known.
 The first step consists in activating the Transit Secret Engine, and creating the different keys:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 docker exec -it dev-vault sh
 export VAULT_TOKEN={root-token}
@@ -70,7 +70,7 @@ keep it secured.
 
 Once the keys have been created, we now need to create a policy that provides access for it:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 cat <<EOF | vault policy write vault-transit-quickstart-policy -
 path "transit/encrypt/my-encryption-key" {
@@ -91,21 +91,21 @@ EOF
 
 And finally, let's add the `vault-transit-quickstart-policy` to user `bob` that was created in the {base-guide}:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 vault write auth/userpass/users/bob password=sinclair policies=vault-quickstart-policy,vault-transit-quickstart-policy
 ----
 
 To check that the configuration is correct, try logging in:
 
-[source, shell]
+[source,bash]
 ----
 vault login -method=userpass username=bob password=sinclair
 ----
 
 You should see:
 
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 Success! You are now authenticated. The token information displayed below
 is already stored in the token helper. You do NOT need to run "vault login"
@@ -125,7 +125,7 @@ token_meta_username    bob
 
 Now set `VAULT_TOKEN` to the `token` above (instead of the root token), and try encrypting some data:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 export VAULT_TOKEN={client-token}
 # note: "my secret data" in base64 is "bXkgc2VjcmV0IGRhdGEK"
@@ -133,7 +133,7 @@ vault write transit/encrypt/my-encryption-key plaintext=bXkgc2VjcmV0IGRhdGEK
 ----
 
 You should see:
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 Key           Value
 ---           -----
@@ -142,16 +142,16 @@ ciphertext    vault:v1:vIQxsLANFbcfKofJL55zjoIXV6MqAzvjKUUQLGg5pWTz0W2Qab/B4nEJa
 
 == Encrypt and Decrypt
 
-First, let's create a simple Quarkus application with vault and jsonb capabilities:
+First, let's create a simple Quarkus application with Vault and Jackson extensions:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=vault-transit-quickstart \
     -DclassName="org.acme.quickstart.GreetingResource" \
     -Dpath="/hello" \
-    -Dextensions="vault,resteasy-jsonb"
+    -Dextensions="resteasy,vault,resteasy-jackson"
 cd vault-transit-quickstart
 ----
 
@@ -198,14 +198,14 @@ public class TransitResource {
 ----
 
 After compiling and starting the Quarkus application, let's encrypt some data:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl -X POST --data 'some secret data' --header "Content-Type: text/plain"  http://localhost:8080/transit/encrypt
 # ==> vault:v1:fN4P7WNjIegpb3lD/pSuhXvyONhGrI21gcKNcedk+5jpjguOw6JkqXYXlkY=
 ----
 
 And decrypt back this cipher text:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl -X POST --data 'vault:v1:fN4P7WNjIegpb3lD/pSuhXvyONhGrI21gcKNcedk+5jpjguOw6JkqXYXlkY=' --header "Content-Type: text/plain"  http://localhost:8080/transit/decrypt
 # ==> some secret data
@@ -238,14 +238,14 @@ public Response verify(VerifyRequest request) {
 ----
 
 And start signing some data:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl -X POST --data 'some secret data' --header "Content-Type: text/plain"  http://localhost:8080/transit/sign
 # ==> vault:v1:MEUCIQDl+nE4y4E878bkugGG6FG1/RsttaQnoWfZHppeuk4TnQIgTGWTtMhVPCzN8VH/EEr2qp5h34lI1bnEP6L1F+QQoPI=
 ----
 
 And finally, let's make sure the signature is matching our input data:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 curl -v -X POST --data '{"input":"some secret data","signature":"vault:v1:MEUCIQDl+nE4y4E878bkugGG6FG1/RsttaQnoWfZHppeuk4TnQIgTGWTtMhVPCzN8VH/EEr2qp5h34lI1bnEP6L1F+QQoPI="}' --header "Content-Type: application/json" http://localhost:8080/transit/verify
 # ==> ... < HTTP/1.1 202 Accepted
diff --git a/docs/src/main/asciidoc/vault.adoc b/docs/src/main/asciidoc/vault.adoc
index d006d31a8db97..5c383210e7e01 100644
--- a/docs/src/main/asciidoc/vault.adoc
+++ b/docs/src/main/asciidoc/vault.adoc
@@ -1,13 +1,13 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using HashiCorp Vault
 
 include::./attributes.adoc[]
 :config-file: application.properties
-:vault-version: 1.2.2
+:vault-version: 1.6.0
 :root-token: s.5VUS8pte13RqekCB2fmMT3u2
 :client-token: s.s93BVzJPzBiIGuYJHBTkG8Uw
 :extension-status: preview
@@ -47,20 +47,20 @@ To complete this guide, you need:
 
 Let's start Vault in development mode:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 docker run --rm --cap-add=IPC_LOCK -e VAULT_ADDR=http://localhost:8200 -p 8200:8200 -d --name=dev-vault vault:{vault-version}
 ----
 
 You can check that vault is running with:
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 docker logs dev-vault
 ----
 
 You should see:
 
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 ==> Vault server configuration:
 
@@ -115,21 +115,21 @@ to access a secret stored in the _kv secret engine_.
 
 First open a shell inside the vault container:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 docker exec -it dev-vault sh
 ----
 
 Set the `VAULT_TOKEN` with the value that was printed in the logs:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 export VAULT_TOKEN={root-token}
 ----
 
 You can check Vault's status using the CLI command `vault status`:
 
-[source, shell]
+[source,text]
 ----
 Key             Value
 ---             -----
@@ -138,7 +138,7 @@ Initialized     true
 Sealed          false
 Total Shares    1
 Threshold       1
-Version         1.2.2
+Version         1.6.0
 Cluster Name    vault-cluster-b07e80d8
 Cluster ID      55bd74b6-eaaf-3862-f7ce-3473ab86c57f
 HA Enabled      false
@@ -146,7 +146,7 @@ HA Enabled      false
 
 Now let's add a secret configuration for our application:
 
-[source, shell]
+[source,bash]
 ----
 vault kv put secret/myapps/vault-quickstart/config a-private-key=123456
 ----
@@ -155,7 +155,7 @@ We have defined a path `secret/myapps/vault-quickstart` in Vault that we need to
 
 Create a policy that gives read access to `secret/myapps/vault-quickstart` and subpaths:
 
-[source, shell]
+[source,bash]
 ----
 cat <<EOF | vault policy write vault-quickstart-policy -
 path "secret/data/myapps/vault-quickstart/*" {
@@ -176,7 +176,7 @@ It would be `secret/myapps/vault-quickstart/*` with a _kv secret engine version
 
 And finally, let's enable the _userpass auth secret engine_, and create user `bob` with access to the `vault-quickstart-policy`:
 
-[source, shell]
+[source,bash]
 ----
 vault auth enable userpass
 vault write auth/userpass/users/bob password=sinclair policies=vault-quickstart-policy
@@ -189,14 +189,14 @@ Quarkus supports additional Vault Authentication methods. Check the {vault-auth-
 
 To check that the configuration is correct, try logging in:
 
-[source, shell]
+[source,bash]
 ----
 vault login -method=userpass username=bob password=sinclair
 ----
 
 You should see:
 
-[source, shell, subs=attributes+]
+[source,text, subs=attributes+]
 ----
 Success! You are now authenticated. The token information displayed below
 is already stored in the token helper. You do NOT need to run "vault login"
@@ -216,7 +216,7 @@ token_meta_username    bob
 
 Now set `VAULT_TOKEN` to the `token` above (instead of the root token), and try reading the vault-quickstart secret config:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 export VAULT_TOKEN={client-token}
 vault kv get secret/myapps/vault-quickstart/config
@@ -224,7 +224,7 @@ vault kv get secret/myapps/vault-quickstart/config
 
 You should see:
 
-[source, shell]
+[source,text]
 ----
 ======== Data ========
 Key              Value
@@ -234,14 +234,14 @@ a-private-key    123456
 
 == Create a Quarkus application with a secret configuration
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=vault-quickstart \
     -DclassName="org.acme.quickstart.GreetingResource" \
     -Dpath="/hello" \
-    -Dextensions="vault"
+    -Dextensions="resteasy,vault"
 cd vault-quickstart
 ----
 
@@ -303,26 +303,33 @@ public class GreetingResource {
 
 Now compile the application and run it:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw clean install
-java -jar target/vault-quickstart-1.0-SNAPSHOT-runner.jar
+java -jar target/quarkus-app/quarkus-run.jar
 ----
 
 Finally test the new endpoint:
 
-[source, shell]
+[source,bash]
 ----
 curl http://localhost:8080/hello/private-key
 ----
 
 You should see:
 
-[source, shell]
+[source,text]
 ----
 123456
 ----
 
+[NOTE]
+====
+The MicroProfile _Vault Config Source_ is configured with ordinal `270`, which is higher than the file system
+or jar ordinals, but lower than environment variables.
+This value can be changed using property `quarkus.vault.config-ordinal`.
+====
+
 == Programmatic access to the KV secret engine
 
 Sometimes secrets are retrieved from an arbitrary path that is known only at runtime through an application
@@ -347,20 +354,20 @@ public String getSecrets(@PathParam("vault-path") String vaultPath) {
 ----
 
 Add a new key in Vault:
-[source, shell]
+[source,bash]
 ----
 vault kv put secret/myapps/vault-quickstart/private mysecret=abc
 ----
 
 Restart the application after rebuilding it, and test it with the new endpoint:
 
-[source, shell]
+[source,bash]
 ----
 curl http://localhost:8080/hello/secrets/private
 ----
 
 You should see:
-[source, shell]
+[source,text]
 ----
 {mysecret=abc}
 ----
@@ -408,7 +415,7 @@ boolean valid = vaultTOTPSecretEngine.validateCode("my_key_2", keyCode); // <4>
 If you are using the `quarkus-smallrye-health` extension, `quarkus-vault` can add a readiness health check
 to validate the connection to the Vault server. This is disabled by default.
 
-If enabled, when you access the `/health/ready` endpoint of your application you will have information about the connection validation status.
+If enabled, when you access the `/q/health/ready` endpoint of your application you will have information about the connection validation status.
 
 This behavior can be enabled by setting the `quarkus.vault.health.enabled` property to `true` in your `application.properties`.
 
@@ -446,12 +453,13 @@ discouraged in production as it is not more secure than talking to Vault in plai
 == Vault Provisioning
 
 Beside the typical client use cases, the Quarkus extension can be used to provision Vault as well, 
-for instance as part of a CD pipeline. Specific CDI beans support this scenario:
+for instance as part of a CD pipeline. Specific CDI beans and operations support this scenario:
 
 * `VaultSystemBackendEngine`: create Vault Policies. See the https://www.vaultproject.io/api-docs/system/policy[Vault documentation].
 * `VaultKubernetesAuthService`. See the https://www.vaultproject.io/api-docs/auth/kubernetes[Vault documentation].
 ** Configure the Kubernetes Auth Method (Kubernetes host, certificates, keys, ...)
 ** Create Kubernetes Auth Roles (association between Kubernetes service accounts, Kubernetes namespaces and Vault policies)
+* `VaultTransitSecretEngine`: _CRUD_ operations on keys. See the https://www.vaultproject.io/api-docs/secret/transit[Vault documentation].
 
 For instance:
 
@@ -512,4 +520,9 @@ credentials), which goes a long way towards creating secured applications.
 [[configuration-reference]]
 == Configuration Reference
 
-include::{generated-dir}/config/quarkus-vault.adoc[opts=optional, leveloffset=+1]
\ No newline at end of file
+include::{generated-dir}/config/quarkus-vault.adoc[opts=optional, leveloffset=+1]
+
+== References
+
+* https://www.vaultproject.io/[HashiCorp Vault]
+* link:security[Quarkus Security]
diff --git a/docs/src/main/asciidoc/vertx.adoc b/docs/src/main/asciidoc/vertx.adoc
index b34d15a241f96..bc28612aaaf6e 100644
--- a/docs/src/main/asciidoc/vertx.adoc
+++ b/docs/src/main/asciidoc/vertx.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using Eclipse Vert.x
 
@@ -22,19 +22,21 @@ You can also use various Vert.x APIs in your Quarkus application, such as deploy
 To access Vert.x, well, you need to enable the `vertx` extension to use this feature.
 If you are creating a new project, set the `extensions` parameter are follows:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=vertx-quickstart \
-    -Dextensions="vertx"
+    -DclassName="org.acme.vertx.GreetingResource" \
+    -Dpath="/hello" \
+    -Dextensions="resteasy,vertx"
 cd vertx-quickstart
 ----
 
 If you have an already created project, the `vertx` extension can be added to an existing Quarkus project with
 the `add-extension` command:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:add-extension -Dextensions="vertx"
 ----
@@ -73,7 +75,7 @@ to use the correct one, that includes none at all on unsupported platforms:
 
 You will also have to explicitly configure Vert.x to use the native transport. In `application.properties` add:
 
-[source]
+[source,properties]
 ----
 quarkus.vertx.prefer-native-transport=true
 ----
@@ -133,9 +135,9 @@ Once the extension has been added, you can access the _managed_ Vert.x instance
 ----
 
 If you are familiar with Vert.x, you know that Vert.x provides different API models.
-For instance _bare_ Vert.x uses callbacks, the Mutiny variants uses `Uni` and `Multi`, the RX Java 2 version uses `Single`, `Maybe`, `Completable`, `Observable` and `Flowable`...
+The _bare_ Vert.x uses callbacks, while the Mutiny variant uses `Uni` and `Multi`.
 
-Quarkus provides 4 Vert.x APIs:
+Quarkus provides 2 Vert.x APIs:
 
 [options="header"]
 |===
@@ -146,21 +148,15 @@ Quarkus provides 4 Vert.x APIs:
 
 | https://smallrye.io/smallrye-mutiny/[Mutiny] | `@Inject io.vertx.mutiny.core.Vertx vertx` | The Mutiny API for Vert.x.
 
-| RX Java 2 | `@Inject io.vertx.reactivex.core.Vertx vertx` | RX Java 2 Vert.x, the API uses RX Java 2 types (deprecated).
-
-| _Axle_ | `@Inject io.vertx.axle.core.Vertx vertx` | Axle Vert.x, the API uses `CompletionStage` and `Reactive Streams` (deprecated).
-
 |===
 
-TIP: You may inject any of the 4 flavors of `Vertx` as well as the `EventBus` in your Quarkus application beans: `bare`, `Mutiny`, `Axle`, `RxJava2`.
+TIP: You may inject any of the 2 flavors of `Vertx` as well as the `EventBus` in your Quarkus application beans: `bare` and `Mutiny`.
 They are just shims and rely on a single _managed_ Vert.x instance.
 
 You will pick one or the other depending on your use cases.
 
 - `bare`: for advanced usage or if you have existing Vert.x code you want to reuse in your Quarkus application
 - `mutiny`: Mutiny is an event-driven reactive programming API. It uses 2 types: `Uni` and `Multi`. This is the recommended API.
-- `Axle`: works well with Quarkus and MicroProfile APIs (`CompletionStage` for single results and `Publisher` for streams) - deprecated, it is recommended to switch to Mutiny
-- `Rx Java 2`: when you need support for a wide range of data transformation operators on your streams - deprecated, it is recommended to switch to Mutiny
 
 The following snippets illustrate the difference between these 4 APIs:
 
@@ -183,25 +179,6 @@ vertx.fileSystem().readFile("lorem-ipsum.txt")
             content -> System.out.println("Content: " + content),
             err -> System.out.println("Cannot read the file: " + err.getMessage())
     );
-
-// Rx Java 2 Vert.x
-vertx.fileSystem().rxReadFile("lorem-ipsum.txt")
-    .map(buffer -> buffer.toString("UTF-8"))
-    .subscribe(
-            content -> System.out.println("Content: " + content),
-            err -> System.out.println("Cannot read the file: " + err.getMessage())
-    );
-
-// Axle API:
-vertx.fileSystem().readFile("lorem-ipsum.txt")
-    .thenApply(buffer -> buffer.toString("UTF-8"))
-    .whenComplete((content, err) -> {
-        if (err != null) {
-            System.out.println("Cannot read the file: " + err.getMessage());
-        } else {
-            System.out.println("Content: " + content);
-        }
-    });
 ----
 
 [TIP]
@@ -235,7 +212,7 @@ public class GreetingResource {
 ----
 
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -465,22 +442,8 @@ Depending on the API model you want to use you need to add the right dependency
   <groupId>io.smallrye.reactive</groupId>
   <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
 </dependency>
-
-<!-- Axle API -->
-<dependency>
-  <groupId>io.smallrye.reactive</groupId>
-  <artifactId>smallrye-axle-web-client</artifactId>
-</dependency>
-
-<!-- RX Java 2 API -->
-<dependency>
-  <groupId>io.vertx</groupId>
-  <artifactId>vertx-rx-java2</artifactId>
-</dependency>
 ----
 
-NOTE: The `vertx-rx-java2` provides the RX Java 2 API for the whole Vert.x stack, not only the web client.
-
 In this guide, we are going to use the Mutiny API, so:
 
 [source, xml, subs=attributes+]
@@ -556,7 +519,7 @@ The `WebClient` is obviously asynchronous (and non-blocking), to the endpoint re
 
 Run the application with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev
 ----
@@ -567,14 +530,14 @@ The application can also run as a native executable.
 But, first, we need to instruct Quarkus to enable _ssl_.
 Open the `src/main/resources/application.properties` and add:
 
-[source]
+[source,properties]
 ----
 quarkus.ssl.native=true
 ----
 
 Then, create the native executable with:
 
-[source, shell]
+[source,bash]
 ----
 ./mvnw package -Pnative
 ----
@@ -701,8 +664,9 @@ In environments with read only file systems you may receive errors of the form:
 java.lang.IllegalStateException: Failed to create cache dir
 ----
 
-Assuming `/tmp/` is writeable this can be fixed by setting the `vertx.cacheDirBase` property to point to a directory in `/tmp/` for instance in OpenShift by creating an environment variable `JAVA_OPTS` with the value `-Dvertx.cacheDirBase=/tmp/vertx`.
+Assuming `/tmp/` is writable this can be fixed by setting the `vertx.cacheDirBase` property to point to a directory in `/tmp/` for instance in OpenShift by creating an environment variable `JAVA_OPTS` with the value `-Dvertx.cacheDirBase=/tmp/vertx`.
 
+[[reverse-proxy]]
 == Running behind a reverse proxy
 
 Quarkus could be accessed through proxies that additionally generate headers (e.g. `X-Forwarded-Host`) to keep
@@ -714,28 +678,27 @@ IMPORTANT: Activating this feature makes the server exposed to several security
 Consider activate it only when running behind a reverse proxy.
 
 To setup this feature, please include the following lines in `src/main/resources/application.properties`:
-[source]
+[source,properties]
 ----
 quarkus.http.proxy-address-forwarding=true
 ----
 
 To consider only de-facto standard header (`Forwarded` header), please include the following lines in `src/main/resources/application.properties`:
-[source]
+[source,properties]
 ----
-quarkus.http.allow-forwarded=true
+quarkus.http.proxy.allow-forwarded=true
 ----
 
 To consider only non-standard headers, please include the following lines instead in `src/main/resources/application.properties`:
 
-[source]
+[source,properties]
 ----
-quarkus.http.proxy-address-forwarding=true
+quarkus.http.proxy.proxy-address-forwarding=true
 quarkus.http.proxy.enable-forwarded-host=true
 quarkus.http.proxy.enable-forwarded-prefix=true
 ----
 
-Both configurations related with standard and non-standard headers can be combine.
-In this case, the `Forwarded` header will have precedence in presence of both set of headers.
+Both configurations related to standard and non-standard headers can be combined, although the standard headers configuration will have precedence.
 
 Supported forwarding address headers are:
 
@@ -746,6 +709,18 @@ Supported forwarding address headers are:
 * `X-Forwarded-Ssl`
 * `X-Forwarded-Prefix`
 
+[[same-site-cookie]]
+== SameSite cookies
+
+One can easily add a https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite[SameSite] cookie property to any of the cookies set by a Quarkus endpoint by listing a cookie name and a `SameSite` attribute, for example:
+
+[source]
+----
+quarkus.http.same-site-cookie.jwt.value=Lax
+quarkus.http.same-site-cookie.session.value=Strict
+----
+
+Given this configuration, the `jwt` cookie will have a `SameSite=Lax` attribute and the `session` cookie will have a `SameSite=Strict` attribute.
 
 == Going further
 
@@ -755,7 +730,7 @@ There are many other facets of Quarkus using Vert.x underneath:
 Quarkus integrates it so different beans can interact with asynchronous messages.
 This part is covered in the link:reactive-event-bus[event bus documentation].
 
-* Data streaming and Apache Kafka are a important parts of modern systems.
+* Data streaming and Apache Kafka are an important part of modern systems.
 Quarkus integrates data streaming using Reactive Messaging.
 More details on link:kafka[Interacting with Kafka].
 
diff --git a/docs/src/main/asciidoc/websockets.adoc b/docs/src/main/asciidoc/websockets.adoc
index 88990ae04f8d1..2251c6bfb008f 100644
--- a/docs/src/main/asciidoc/websockets.adoc
+++ b/docs/src/main/asciidoc/websockets.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Using WebSockets
 
@@ -40,23 +40,24 @@ The solution is located in the `websockets-quickstart` {quickstarts-tree-url}/we
 
 First, we need a new project. Create a new project with the following command:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=websockets-quickstart \
-    -Dextensions="undertow-websockets"
+    -Dextensions="websockets" \
+    -DnoExamples
 cd websockets-quickstart
 ----
 
-This command generates the Maven project (without any classes) and import the `undertow-websockets` extension.
+This command generates the Maven project (without any classes) and import the `websockets` extension.
 
-If you already have your Quarkus project configured, you can add the `undertow-websockets` extension
+If you already have your Quarkus project configured, you can add the `websockets` extension
 to your project by running the following command in your project base directory:
 
 [source,bash]
 ----
-./mvnw quarkus:add-extension -Dextensions="undertow-websockets"
+./mvnw quarkus:add-extension -Dextensions="websockets"
 ----
 
 This will add the following to your `pom.xml`:
@@ -65,7 +66,7 @@ This will add the following to your `pom.xml`:
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-undertow-websockets</artifactId>
+    <artifactId>quarkus-websockets</artifactId>
 </dependency>
 ----
 
@@ -145,9 +146,10 @@ Create the `src/main/resources/META-INF/resources` directory and copy this {quic
 
 Now, let's see our application in action. Run it with:
 
-```
+[source,bash]
+----
 ./mvnw compile quarkus:dev
-```
+----
 
 Then open your 2 browser windows to http://localhost:8080/:
 
@@ -157,7 +159,83 @@ Then open your 2 browser windows to http://localhost:8080/:
 
 image:websocket-guide-screenshot.png[alt=Application]
 
-As usual, the application can be packaged using `./mvnw clean package` and executed using the `-runner.jar` file.
+As usual, the application can be packaged using `./mvnw clean package` and executed using the `target/quarkus-app/quarkus-run.jar` file.
 You can also build the native executable using `./mvnw package -Pnative`.
 
-You can also test your web socket applications using the approach detailed {quickstarts-blob-url}/websockets-quickstart/src/test/java/org/acme/websockets/ChatTestCase.java[here].
+You can also test your web socket applications using the approach detailed {quickstarts-blob-url}/websockets-quickstart/src/test/java/org/acme/websockets/ChatTest.java[here].
+
+== WebSocket Clients
+
+Quarkus also contains a WebSocket client. You can call `ContainerProvider.getWebSocketContainer().connectToServer` to create a websocket connection.
+
+When you connect to the server you can either pass in the Class of the annotated client endpoint you want to use, or an instance of `javax.websocket.Endpoint`. If you
+are using the annotated endpoint then you can use the exact same annotations as you can on the server, except it must be annotated with `@ClientEndpoint` instead of
+`@ServerEndpoint`.
+
+The example below shows the client being used to test the chat endpoint above.
+
+[source,java]
+----
+package org.acme.websockets;
+
+import java.net.URI;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.ContainerProvider;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class ChatTest {
+
+    private static final LinkedBlockingDeque<String> MESSAGES = new LinkedBlockingDeque<>();
+
+    @TestHTTPResource("/chat/stu")
+    URI uri;
+
+    @Test
+    public void testWebsocketChat() throws Exception {
+        try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(Client.class, uri)) {
+            Assertions.assertEquals("CONNECT", MESSAGES.poll(10, TimeUnit.SECONDS));
+            Assertions.assertEquals("User stu joined", MESSAGES.poll(10, TimeUnit.SECONDS));
+            session.getAsyncRemote().sendText("hello world");
+            Assertions.assertEquals(">> stu: hello world", MESSAGES.poll(10, TimeUnit.SECONDS));
+        }
+    }
+
+    @ClientEndpoint
+    public static class Client {
+
+        @OnOpen
+        public void open(Session session) {
+            MESSAGES.add("CONNECT");
+            // Send a message to indicate that we are ready,
+            // as the message handler may not be registered immediately after this callback.
+            session.getAsyncRemote().sendText("_ready_");
+        }
+
+        @OnMessage
+        void message(String msg) {
+            MESSAGES.add(msg);
+        }
+
+    }
+
+}
+----
+
+
+== More WebSocket Information
+
+The Quarkus WebSocket implementation is an implementation of link:https://eclipse-ee4j.github.io/websocket-api/[Jakarta Websockets].
+
+
diff --git a/docs/src/main/asciidoc/writing-extensions.adoc b/docs/src/main/asciidoc/writing-extensions.adoc
old mode 100755
new mode 100644
index 679482e3bc13c..2d79e65bd0008
--- a/docs/src/main/asciidoc/writing-extensions.adoc
+++ b/docs/src/main/asciidoc/writing-extensions.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Writing Your Own Extension
 
@@ -17,6 +17,8 @@ Quarkus extensions add a new developer focused behavior to the core offering, an
 This means that metadata is only processed once at build time, which both saves on startup time, and also on memory
 usage as the classes etc that are used for processing are not loaded (or even present) in the runtime JVM.
 
+NOTE: This is an in-depth documentation, see the link:building-my-first-extension[building my first extension] if you need an introduction.
+
 == Extension philosophy
 
 This section is a work in progress and gathers the philosophy under which extensions should be designed and written.
@@ -91,7 +93,7 @@ An extension can produce an <<cdi-reference.adoc#additional_beans,`AdditionalBea
 .Bean Class Registered by `AdditionalBeanBuildItem`
 [source%nowrap,java]
 ----
-@ApplicationScoped <1>
+@Singleton <1>
 public class Echo {
 
    public String echo(String val) {
@@ -125,7 +127,7 @@ And vice versa - the extension bean can inject application beans and beans provi
 .Extension Bean Injection Example
 [source%nowrap,java]
 ----
-@ApplicationScoped
+@Singleton
 public class Echo {
 
     @Inject
@@ -321,7 +323,7 @@ These operations should be done at build time and the metamodel be passed to the
 Get a CDI portable extension running::
 The CDI portable extension model is very flexible.
 Too flexible to benefit from the build time boot promoted by Quarkus.
-Most extension we have seen do not make use of these extreme flexibilities capabilities.
+Most extension we have seen do not make use of these extreme flexibility capabilities.
 The way to port a CDI extension to Quarkus is to rewrite it as a Quarkus extension which will define the various beans at build time (deployment time in extension parlance).
 
 == Technical aspect
@@ -380,7 +382,7 @@ TIP: You may want to use the `create-extension` mojo of `io.quarkus:quarkus-mave
 Your runtime artifact should depend on `io.quarkus:quarkus-core`, and possibly the runtime artifacts of other Quarkus
 modules if you want to use functionality provided by them.
 You will also need to include the `io.quarkus:quarkus-bootstrap-maven-plugin` to generate the Quarkus extension descriptor included into the runtime artifact, if you are using the Quarkus parent pom it will automatically inherit the correct configuration.
-Futhermore, you'll need to configure the `maven-compiler-plugin` to detect the `quarkus-extension-processor` annotation processor.
+Furthermore, you'll need to configure the `maven-compiler-plugin` to detect the `quarkus-extension-processor` annotation processor.
 
 NOTE: By convention the deployment time artifact has the `-deployment` suffix, and the runtime artifact
 has no suffix (and is what the end user adds to their project).
@@ -467,25 +469,32 @@ You will also need to configure the `maven-compiler-plugin` to detect the `quark
 </build>
 ----
 
-==== Create new extension modules using Maven
+==== Create new Quarkus Core extension modules using Maven
 
-The `create-extension` mojo of `io.quarkus:quarkus-maven-plugin` can be used to generate stubs of Maven modules needed for implementing a new Quarkus extension.
+Quarkus provides `create-extension` Maven Mojo to initialize your extension project.
 
-WARNING: This mojo can be currently used only for adding extensions to an established source tree hosting multiple extensions in one subdirectory, such as https://github.com/quarkusio/quarkus[Quarkus] or https://github.com/apache/camel-quarkus[Camel Quarkus]. Creating extension projects from scratch is not supported yet.
+It will try to auto-detect its options:
+
+* from `quarkus` (Quarkus Core) or `quarkus/extensions` directory, it will use the 'Quarkus Core' extension layout and defaults.
+* with `-DgroupId=io.quarkiverse.[extensionId]`, it will use the 'Quarkiverse' extension layout and defaults.
+* in other cases it will use the 'Standalone' extension layout and defaults.
+* we may introduce other layout types in the future.
+
+TIP: You may not specify any parameter to use the interactive mode: `mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create-extension -N`
 
 As and example, let's add a new extension called `my-ext` to the Quarkus source tree:
 
-[source, shell, subs=attributes+]
+[source,bash, subs=attributes+]
 ----
 git clone https://github.com/quarkusio/quarkus.git
 cd quarkus
-cd extensions
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create-extension -N \
-    -Dquarkus.artifactIdBase=my-ext \
-    -Dquarkus.artifactIdPrefix=quarkus- \
-    -Dquarkus.nameBase="My Extension"
+    -DextensionId=my-ext \
+    -Dname="My Extension"
 ----
 
+NOTE: by default, the `groupId`, `version`, `quarkusVersion`, `namespaceId`, and `namespaceName` will be consistent with other Quarkus core extensions.
+
 The above sequence of commands does the following:
 
 * Creates four new Maven modules:
@@ -495,14 +504,11 @@ The above sequence of commands does the following:
 ** `quarkus-my-ext-integration-test` in the `integration-tests/my-ext/deployment` directory; an empty JAX-RS Resource class and two test classes (for JVM mode and native mode) are generated in this module.
 * Links these three modules where necessary:
 ** `quarkus-my-ext-parent` is added to the `<modules>` of `quarkus-extensions-parent`
-** `quarkus-my-ext` is added to the `<dependencyManagement>` of the runtime BOM (Bill of Materials) `bom/runtime/pom.xml`
-** `quarkus-my-ext-deployment` is added to the `<dependencyManagement>` of the deployment BOM (Bill of Materials) `bom/deployment/pom.xml`
+** `quarkus-my-ext` is added to the `<dependencyManagement>` of the Quarkus BOM (Bill of Materials) `bom/application/pom.xml`
+** `quarkus-my-ext-deployment` is added to the `<dependencyManagement>` of the Quarkus BOM (Bill of Materials) `bom/application/pom.xml`
 ** `quarkus-my-ext-integration-test` is added to the `<modules>` of `quarkus-integration-tests-parent`
 
-A Maven build performed immediately after generating the modules should fail due to a `fail()` assertion in one of the test classes.
-
-There is one step (specific to the Quarkus source tree) that you should do manually when creating a new extension:
-create a `quarkus-extension.yaml` file that describe your extension inside the runtime module `src/main/resources/META-INF` folder.
+NOTE: You also have to fill the `quarkus-extension.yaml` file that describe your extension inside the runtime module `src/main/resources/META-INF` folder.
 
 This is the `quarkus-extension.yaml` of the `quarkus-agroal` extension, you can use it as an example:
 
@@ -521,30 +527,9 @@ metadata:
   status: "stable"
 ----
 
-Note that the parameters of the mojo that will be constant for all the extensions added to this source tree are configured in `extensions/pom.xml` so that they do not need to be passed on the command line each time a new extension is added:
-
-[source,xml]
-----
-<plugin>
-    <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-maven-plugin</artifactId>
-    <version>${quarkus.version}</version>
-    <inherited>false</inherited>
-    <!-- Settings for stubbing new extensions via
-           ./mvnw quarkus:create-extension -N -Dquarkus.artifactIdBase=my-ext -Dquarkus.nameBase="My Extension"
-    -->
-    <configuration>
-        <namePrefix xml:space="preserve">Quarkus - </namePrefix>
-        <runtimeBomPath>../bom/runtime/pom.xml</runtimeBomPath>
-        <deploymentBomPath>../bom/deployment/pom.xml</deploymentBomPath>
-        <itestParentPath>../integration-tests/pom.xml</itestParentPath>
-    </configuration>
-</plugin>
-----
-
-TIP: The `nameBase` parameter of the mojo is optional.
-If you do not specify it on the command line, the plugin will derive it from `artifactIdBase` by replacing dashes with spaces and uppercasing each token.
-So you may consider omitting explicit `nameBase` in some cases.
+TIP: The `name` parameter of the mojo is optional.
+If you do not specify it on the command line, the plugin will derive it from `extensionId` by replacing dashes with spaces and uppercasing each token.
+So you may consider omitting explicit `name` in some cases.
 
 // The following link should point to the mojo page once https://github.com/quarkusio/quarkusio.github.io/issues/265 is fixed
 Please refer to https://github.com/quarkusio/quarkus/blob/{quarkus-version}/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java[CreateExtensionMojo JavaDoc] for all the available options of the mojo.
@@ -913,18 +898,6 @@ ExecutorBuildItem createExecutor( // <2>
 <1> Note the `optional` attribute.
 <2> This example is using recorder proxies; see the section on <<bytecode-recording,bytecode recording>> for more information.
 
-==== Capabilities
-
-The `@BuildStep` annotation has a `providesCapabilities` property that can be used to provide capability information
-to other extensions about what is present in the current application. Capabilities are simply strings that are used to
-describe an extension. Capabilities should generally be named after an extensions root package, for example the transactions
-extension will provide `io.quarkus.transactions`.
-
-To check if a capability is present you can inject the `io.quarkus.deployment.Capabilities` object and call
-`isCapabilityPresent`.
-
-Capabilities should be used when checking for the presence of an extension rather than class path based checks.
-
 ==== Application Archives
 
 The `@BuildStep` annotation can also register marker files that determine which archives on the class path are considered
@@ -1093,8 +1066,9 @@ lowercased, and re-joined using hyphens (`-`).
 
 A configuration root's class name can contain an extra suffix segment for the case where there are configuration
 roots for multiple <<Configuration Root Phases>>.  Classes which correspond to the `BUILD_TIME` and `BUILD_AND_RUN_TIME_FIXED`
-may end with `BuildTimeConfig` or `BuildTimeConfiguration`, and classes which correspond to the `RUN_TIME` phase
-may end with `RuntimeConfig`, `RunTimeConfig`, `RuntimeConfiguration` or `RunTimeConfiguration`.
+may end with `BuildTimeConfig` or `BuildTimeConfiguration`, classes which correspond to the `RUN_TIME` phase
+may end with `RuntimeConfig`, `RunTimeConfig`, `RuntimeConfiguration` or `RunTimeConfiguration` while classes which correspond
+to the `BOOTSTRAP` configuration may end with `BootstrapConfig` or `BootstrapConfiguration`.
 
 Note: The current implementation is still using injection site to determine the root set, so to avoid migration problems, it
 is recommended that the injection site (field or parameter) have the same name as the configuration root class until
@@ -1128,6 +1102,13 @@ A configuration root dictates when its contained keys are read from configuratio
 | ✗
 | Appropriate for things which affect build and must be visible for run time code.  Not read from config at run time.
 
+| BOOTSTRAP
+| ✗
+| ✓
+| ✗
+| ✓
+| Used when runtime configuration needs to be obtained from an external system (like `Consul`), but details of that system need to be configurable (for example Consul's URL). The high level way this works is by using the standard Quarkus config sources (such as properties files, system properties, etc.) and producing `ConfigSourceProvider` objects which are subsequently taken into account by Quarkus when creating the final runtime `Config` object.
+
 | RUN_TIME
 | ✗
 | ✓
@@ -1139,6 +1120,8 @@ A configuration root dictates when its contained keys are read from configuratio
 
 For all cases other than the `BUILD_TIME` case, the configuration root class and all of the configuration groups and types contained therein must be located in, or reachable from, the extension's run time artifact.  Configuration roots of phase `BUILD_TIME` may be located in or reachable from either of the extension's run time or deployment artifacts.
 
+IMPORTANT: _Bootstrap_ configuration steps are executed during runtime-init *before* any of other runtime steps. This means that code executed as part of this step cannot access anything that gets initialized in runtime init steps (runtime synthetic CDI beans being one such example).
+
 ==== Configuration Example
 
 [source%nowrap,java]
@@ -1359,6 +1342,9 @@ static class IsDevMode implements BooleanSupplier {
 }
 ----
 
+If you need to make your build step conditional on the presence or absence of another extension, you can
+use <<capabilities>> for that.
+
 [id='bytecode-recording']
 === Bytecode Recording
 
@@ -1439,7 +1425,7 @@ convenience to avoid the need to explicitly load classes in the recorders.
 ==== Printing step execution time
 
 At times, it can be useful to know how the exact time each startup task (which is the result of each bytecode recording) takes when the application is run.
-The simplest way to determine this information is to set the `quarkus.debug.print-startup-times` property to `true` when running the application.
+The simplest way to determine this information is to launch the Quarkus application with the `-Dquarkus.debug.print-startup-times=true` system property.
 The output will look something like:
 
 [source%nowrap]
@@ -1467,6 +1453,58 @@ As a CDI based runtime, Quarkus extensions often make CDI beans available as par
 However, Quarkus DI solution does not support CDI Portable Extensions.
 Instead, Quarkus extensions can make use of various link:cdi-reference[Build Time Extension Points].
 
+=== Quarkus DEV UI
+
+You can make your extension support the link:dev-ui[Quarkus DEV UI] for a greater developer experience.
+
+=== Extension-defined endpoints
+
+Your extension can add additional, non-application endpoints to be served alongside endpoints
+for Health, Metrics, OpenAPI, Swagger UI, etc. 
+
+Use a `NonApplicationRootPathBuildItem` to define an endpoint:
+
+[source%nowrap,java]
+----
+@BuildStep
+RouteBuildItem myExtensionRoute(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
+    return nonApplicationRootPathBuildItem.routeBuilder()
+                .route("custom-endpoint")
+                .handler(new MyCustomHandler())
+                .displayOnNotFoundPage()
+                .build();
+}
+----
+
+Note that the path above does not start with a '/', indicating it is a relative path. The above
+endpoint will be served relative to the configured non-application endpoint root. The non-application
+endpoint root is `/q` by default, which means the resulting endpoint will be found at `/q/custom-endpoint`. 
+
+Absolute paths are handled differently. If the above called `route("/custom-endpoint")`, the resulting 
+endpoint will be found at `/custom-endpoint`.
+
+If an extension needs nested non-application endpoints:
+
+[source%nowrap,java]
+----
+@BuildStep
+RouteBuildItem myNestedExtensionRoute(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
+    return nonApplicationRootPathBuildItem.routeBuilder()
+                .nestedRoute("custom-endpoint", "deep")
+                .handler(new MyCustomHandler())
+                .displayOnNotFoundPage()
+                .build();
+}
+----
+
+Given a default non-application endpoint root of `/q`, this will create an endpoint at `/q/custom-endpoint/deep`.
+
+Absolute paths also have an impact on nested endpoints. If the above called `nestedRoute("custom-endpoint", "/deep")`, 
+the resulting endpoint will be found at `/deep`.
+
+Refer to the link:all-config#quarkus-vertx-http_quarkus.http.non-application-root-path[Quarkus Vertx HTTP configuration reference]
+for details on how the non-application root path is configured.
+
 === Extension Health Check
 
 Health checks are provided via the `quarkus-smallrye-health` extension. It provides both liveness and readiness checks capabilities.
@@ -1496,266 +1534,286 @@ HealthBuildItem addHealthCheck(AgroalBuildTimeConfig agroalBuildTimeConfig) {
 
 === Extension Metrics
 
-An extension can decide to provide metrics through the `quarkus-smallrye-metrics` extension.
-A typical use case for this would be that an extension scans the application code for relevant components (like entities, messaging endpoints, etc.)
-and creates a set of metrics for each of these components. A unified mechanism for metric registration is provided via the `MetricBuildItem` class
-provided by the `quarkus-smallrye-metrics-spi` module.
+The `quarkus-micrometer` extension and the `quarkus-smallrye-metrics` extension provide support for collecting metrics.
+As a compatibility note, the `quarkus-micrometer` extension adapts the MP Metrics API to Micrometer library primitives, so the `quarkus-micrometer` extension can be enabled without breaking code that relies on the MP Metrics API.
+Note that the metrics emitted by Micrometer are different, see the `quarkus-micrometer` extension documentation for more information.
 
-There are several distinct situations that can occur and each requires slightly different handling:
+NOTE: The compatibility layer for MP Metrics APIs will move to a different extension in the future.
 
-1. The underlying library used by your extension is using the MicroProfile Metrics API directly.
-2. The underlying library uses its own way for collecting metrics and makes them available at runtime using its own API.
-3. The underlying library does not provide metrics (or there is no library at all) and you need to insert some code in the extension's codebase that will collect the metrics.
+There are two broad patterns that extensions can use to interact with an optional metrics extension to add their own metrics:
 
-What is common for all cases is that the extension should have a build-time config property that enables metrics exposure for the extension,
-it should be named `quarkus.<extension>.metrics.enabled` and be `false` by default.
+* Consumer pattern: An extension declares a `MetricsFactoryConsumerBuildItem` and uses that to provide a bytecode recorder to the metrics extension. When the metrics extension has initialized, it will iterate over registered consumers to initialize them with a `MetricsFactory`. This factory can be used to declare API-agnostic metrics, which can be a good fit for extensions that provide an instrumentable object for gathering statistics (e.g. Hibernate's `Statistics` class).
 
-==== Case 1: The library uses MP Metrics
-If the library exposes metrics by itself, we don't have to do much. However, there are a few points to consider:
+* Binder pattern: An extension can opt to use completely different gathering implementations depending on the metrics system. An `Optional<MetricsCapabilityBuildItem> metricsCapability` build step parameter can be used to declare or otherwise initialize API-specific metrics based on the active metrics extension (e.g. "smallrye-metrics" or "micrometer"). This pattern can be combined with the consumer pattern by using `MetricsFactory::metricsSystemSupported()` to test the active metrics extension within the recorder. 
 
-- It should be possible to disable all metrics for an extension, which can be a bit problematic if the library registers them directly
-rather than through the unified registration mechanism in the `quarkus-smallrye-metrics-spi` module. Therefore the library should contain
-a way to turn all metrics off, for example using a library-specific system property that can be set during build time (by emitting a `SystemPropertyBuildItem`),
-and will disable metrics if at least one of the properties `quarkus.<extensionName>.metrics.enabled` and `quarkus.smallrye-metrics.extensions.enabled` is `false`.
-- It is desirable to be able to omit the MP Metrics dependency at runtime, so if possible, the library should be written in a way that
-it will still work when the MP Metrics dependencies (or at least the implementation, `io.smallrye:smallrye-metrics`) are unavailable. This can be achieved by
-wrapping all code that does something metric-related into an `if` condition that checks whether metrics integration is enabled. If the library performs injections
-of the `MetricRegistry`, which is not avoidable by introducing an `if` condition, it will unfortunately not be possible to remove the `microprofile-metrics` dependency,
-but it is still possible to avoid the need for `smallrye-metrics` (which contains the implementation class of the metric registry) by introducing a custom "no-op"
-implementation of the `MetricRegistry` which can, for example, return `null` from all its methods. This no-op implementation should be added to the application's classes
-so that it can be injected instead of the regular `io.smallrye.metrics.MetricRegistryImpl`. An example of a no-op implementation can be found at
-https://github.com/quarkusio/quarkus/blob/master/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/NoopMetricRegistry.java[NoopMetricRegistry]
+Remember that support for metrics is optional. Extensions can use an `Optional<MetricsCapabilityBuildItem> metricsCapability` parameter in their build step to test for the presence of an enabled metrics extension. Consider using additional configuration to control behavior of metrics. Datasource metrics can be expensive, for example, so additional configuration flags are used enable metrics collection on individual datasources. 
+
+When adding metrics for your extension, you may find yourself in one of the following situations:
+
+1. An underlying library used by the extension is using a specific Metrics API directly (either MP Metrics, Micrometer, or some other).
+2. An underlying library uses its own mechanism for collecting metrics and makes them available at runtime using its own API, e.g. Hibernate's `Statistics` class, or Vert.x `MetricsOptions`.
+3. An underlying library does not provide metrics (or there is no library at all) and you want to add instrumentation.
+
+==== Case 1: The library uses a metrics library directly
+
+If the library directly uses a metrics API, there are two options:
+
+- Use an `Optional<MetricsCapabilityBuildItem> metricsCapability` parameter to test which metrics API is supported (e.g. "smallrye-metrics" or "micrometer") in your build step, and use that to selectively declare or initialize API-specific beans or build items.
+
+- Create a separate build step that consumes a `MetricsFactory`, and use the `MetricsFactory::metricsSystemSupported()` method within the bytecode recorder to initialize required resources if the desired metrics API is supported (e.g. "smallrye-metrics" or "micrometer").
+
+Extensions may need to provide a fallback if there is no active metrics extension or the extension doesn't support the API required by the library.
 
 ==== Case 2: The library provides its own metric API
-In this case, the extension can make use of the `quarkus-smallrye-metrics-spi` module to expose the metrics from the library using MP Metrics.
 
-You should do the following:
+There are two examples of a library providing its own metrics API:
+
+- The extension defines an instrumentable object as Agroal does with `io.agroal.api.AgroalDataSourceMetrics`, or
+- The extension provides its own abstraction of metrics, as Jaeger does with `io.jaegertracing.spi.MetricsFactory`.
 
-- Import the `quarkus-smallrye-metrics-spi` library in your deployment module.
-- Import the `quarkus-smallrye-metrics` extension as an **optional** dependency in your runtime module so it will not impact the size of the application if
-metrics are not included.
-- In your processor, produce any number of `MetricBuildItem` items as shown in the example below.
-The metric name of all metrics should start with a short name of the extension that owns them.
-- Pass the value of `quarkus.<extension>.metrics.enabled` to the constructor of `MetricBuildItem` objects that the extension produces and if it is false, the metric will be ignored.
+===== Observing instrumentable objects
 
-An example build step for build-time registration of metrics:
+Let's take the instrumentable object (`io.agroal.api.AgroalDataSourceMetrics`) case first. In this case, you can do the following:
 
+- Define a `BuildStep` that produces a `MetricsFactoryConsumerBuildItem` that uses a `RUNTIME_INIT` or `STATIC_INIT` Recorder to define a `MetricsFactory` consumer. For example, the following creates a `MetricsFactoryConsumerBuildItem` if and only if metrics are enabled both for Agroal generally, and for a datasource specifically:
++
 [source%nowrap,java]
 ----
 @BuildStep
-void registerMetrics(BuildProducer<MetricBuildItem> metrics) {
-    Metadata activeCountMetadata = Metadata.builder()
-            .withName("agroal.active.count")
-            .withDescription("Count of active connections")
-            .withType(MetricType.GAUGE)
-            .build();
-    List<DataSource> dataSources = getAllDataSources(); // your relevant components specific to the extension
-    for(DataSource dataSource : dataSources) {
-        metrics.produce(new MetricBuildItem(activeCountMetadata,
-                new ActiveCountGauge(dataSource.getName()),
-                agroalBuildTimeConfig.metricsEnabled,
-                configRootName, // name of the config root pertaining to this extension
-                new Tag("datasource", dataSource.getName())));
+@Record(ExecutionTime.RUNTIME_INIT)
+void registerMetrics(AgroalMetricsRecorder recorder,
+        DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+        BuildProducer<MetricsFactoryConsumerBuildItem> datasourceMetrics,
+        List<AggregatedDataSourceBuildTimeConfigBuildItem> aggregatedDataSourceBuildTimeConfigs) {
+
+    for (AggregatedDataSourceBuildTimeConfigBuildItem aggregatedDataSourceBuildTimeConfig : aggregatedDataSourceBuildTimeConfigs) {
+        // Create a MetricsFactory consumer to register metrics for a data source
+        // IFF metrics are enabled globally and for the data source
+        // (they are enabled for each data source by default if they are also enabled globally)
+        if (dataSourcesBuildTimeConfig.metricsEnabled &&
+                aggregatedDataSourceBuildTimeConfig.getJdbcConfig().enableMetrics.orElse(true)) {
+            datasourceMetrics.produce(new MetricsFactoryConsumerBuildItem(
+                    recorder.registerDataSourceMetrics(aggregatedDataSourceBuildTimeConfig.getName())));
+        }
     }
 }
 ----
 
-In this example, there is a gauge per each data source that shows the current number of active connections.
-In this example, we provide an object that implements the logic of the metric, in the case of a gauge,
-it needs to implement `org.eclipse.microprofile.metrics.Gauge`. Example:
-
+- The associated recorder should use the provided `MetricsFactory` to register metrics. For Agroal, this means using the `MetricFactory` API to observe `io.agroal.api.AgroalDataSourceMetrics` methods. For example:
++
 [source%nowrap,java]
 ----
-public class ActiveCountGauge implements Gauge<Long> {
-
-    private String dataSourceName;
-
-    public ActiveCountGauge() {
-
-    }
-
-    public ActiveCountGauge(String dataSourceName) {
-        this.dataSourceName = dataSourceName;
-    }
+/* RUNTIME_INIT */
+public Consumer<MetricsFactory> registerDataSourceMetrics(String dataSourceName) {
+    return new Consumer<MetricsFactory>() {
+        @Override
+        public void accept(MetricsFactory metricsFactory) {
+            String tagValue = DataSourceUtil.isDefault(dataSourceName) ? "default" : dataSourceName;
+            AgroalDataSourceMetrics metrics = getDataSource(dataSourceName).getMetrics();
 
-    @Override
-    public Long getValue() {
-        DataSource ds = obtainDataSource(dataSourceName); // some logic to get hold of the data source
-        return ds.getMetrics().getActiveCount();
-    }
-}
+            // When using MP Metrics, the builder uses the VENDOR registry by default.
+            metricsFactory.builder("agroal.active.count")
+                    .description(
+                            "Number of active connections. These connections are in use and not available to be acquired.")
+                    .tag("datasource", tagValue)
+                    .buildGauge(metrics::activeCount);
+            ....
 ----
 
-When registering gauges, it is required to provide a custom object that implements the correct metric type.
-For metric types other than gauges, this is optional - you can choose whether to provide an implementation,
-or whether the default implementation class from `SmallRye Metrics` should be instantiated for the metric and registered
-in the metric registry. To update the metric value, it will be necessary to look them up in the metric registry
-and call the methods specific to each metric type.
-
-Look into the `AgroalProcessor#registerMetrics` method for an example how this was done for the Agroal extension.
+The `MetricsFactory` provides a fluid builder for registration of metrics, with the final step constructing gauges or counters based on a `Supplier` or `ToDoubleFunction`. Timers can either wrap `Callable`, `Runnable`, or `Supplier` implementations, or can use a `TimeRecorder` to accumulate chunks of time. The underlying metrics extension will create appropriate artifacts to observe or measure the defined functions.
 
-==== Case 3: It is necessary to collect metrics within the extension code
+===== Using a Metrics API-specific implementation
 
-In this case, the dependency setup and build-time registration is the same as in case 2. The difference will be that instead of introducing
-custom metric objects that bridge between library-specific metrics and MP Metrics, the extension's code will contain metric collection code like this:
+Using metrics-API specific implementations may be preferred in some cases. Jaeger, for example, defines its own metrics interface, `io.jaegertracing.spi.MetricsFactory`, that it uses to define counters and gauges. A direct mapping from that interface to the metrics system will be the most efficient. In this case, it is important to isolate these specialized implementations and to avoid eager classloading to ensure the metrics API remains an optional, compile-time dependency.
 
+`Optional<MetricsCapabilityBuildItem> metricsCapability` can be used in the build step to selectively control initialization of beans or the production of other build items. The Jaeger extension, for example, can use the following to control initialization of specialized Metrics API adapters:
++
 [source%nowrap,java]
 ----
-public void methodThatShouldBeCounted() {
-    if(metricsEnabled) {
-        Counter counter = MetricRegistries.get(MetricRegistry.Type.VENDOR).counter("name");
-        counter.inc();
+/* RUNTIME_INIT */
+@BuildStep
+@Record(ExecutionTime.RUNTIME_INIT)
+void setupTracer(JaegerDeploymentRecorder jdr, JaegerBuildTimeConfig buildTimeConfig, JaegerConfig jaeger,
+        ApplicationConfig appConfig, Optional<MetricsCapabilityBuildItem> metricsCapability) {
+
+    // Indicates that this extension would like the SSL support to be enabled
+    extensionSslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.JAEGER.getName()));
+
+    if (buildTimeConfig.enabled) {
+        // To avoid dependency creep, use two separate recorder methods for the two metrics systems
+        if (buildTimeConfig.metricsEnabled && metricsCapability.isPresent()) {
+            if (metricsCapability.get().metricsSupported(MetricsFactory.MICROMETER)) {
+                jdr.registerTracerWithMicrometerMetrics(jaeger, appConfig);
+            } else {
+                jdr.registerTracerWithMpMetrics(jaeger, appConfig);
+            }
+        } else {
+            jdr.registerTracerWithoutMetrics(jaeger, appConfig);
+        }
     }
-    // proceed with the invocation normally
 }
 ----
 
-In this case, be aware that the MP Metrics API and implementation might not be available on the runtime classpath!
-This is why there is a `if(metricsEnabled)` check that should make sure that if metrics are not enabled, we don't touch MP Metrics classes,
-because that would fail. The extension itself will need to provide such check, and it must return true only if both of these conditions hold:
+A recorder consuming a `MetricsFactory` can use `MetricsFactory::metricsSystemSupported()` can be used to control initialization of metrics objects during bytecode recording in a similar way.
 
-- The Metrics capability is present and therefore the SmallRye Metrics library is available
-- Metrics are not disabled for this extension
+==== Case 3: It is necessary to collect metrics within the extension code
 
-The recommended way to implement this check would be to produce a specific `SystemPropertyBuildItem` during build, which will make it easy
-to evaluate these two conditions, and then check back to this system property at runtime. Example:
+To define your own metrics from scratch, you have two basic options: Use the generic `MetricFactory` builders, or follow the binder pattern, and create instrumentation specific to the enabled metrics extension.
 
+To use the extension-agnostic `MetricFactory` API, your processor can define a `BuildStep` that produces a `MetricsFactoryConsumerBuildItem` that uses a `RUNTIME_INIT` or `STATIC_INIT` Recorder to define a `MetricsFactory` consumer.
++
 [source%nowrap,java]
 ----
 @BuildStep
-SystemPropertyBuildItem produceMetricsEnabledProperty(AgroalBuildTimeConfig extensionSpecificConfig,
-        Capabilities capabilities) {
-    return new SystemPropertyBuildItem("metrics.enabled",
-            String.valueOf(capabilities.isCapabilityPresent(Capabilities.METRICS) &&
-                            extensionSpecificConfig.metricsEnabled));
+@Record(ExecutionTime.RUNTIME_INIT)
+MetricsFactoryConsumerBuildItem registerMetrics(MyExtensionRecorder recorder) {
+    return new MetricsFactoryConsumerBuildItem(recorder.registerMetrics());
 }
 ----
++
+- The associated recorder should use the provided `MetricsFactory` to register metrics, for example
++
+[source%nowrap,java]
+----
+final LongAdder extensionCounter = new LongAdder();
 
+/* RUNTIME_INIT */
+public Consumer<MetricsFactory> registerMetrics() {
+    return new Consumer<MetricsFactory>() {
+        @Override
+        public void accept(MetricsFactory metricsFactory) {
+            metricsFactory.builder("my.extension.counter")
+                    .buildGauge(extensionCounter::longValue);
+            ....
+----
+
+Remember that metrics extensions are optional. Keep metrics-related initialization isolated from other setup for your extension, and structure your code to avoid eager imports of metrics APIs. Gathering metrics can also be expensive. Consider using additional extension-specific configuration to control behavior of metrics if the presence/absence of metrics support isn't sufficient.
 
 === Customizing JSON handling from an extension
+
 Extensions often need to register serializers and/or deserializers for types the extension provides.
 
-For this, both JSON-B and Jackson extension provide a way to register serializer/deserializer from within an
+For this, both Jackson and JSON-B extensions provide a way to register serializer/deserializer from within an
 extension deployment module.
 
 Keep in mind that not everybody will need JSON, so you need to make it optional.
 
 If an extension intends to provide JSON related customization,
-it is strongly advised to provide customization for both JSON-B and Jackson.
+it is strongly advised to provide customization for both Jackson and JSON-B.
 
-==== Customizing JSON-B
-First, add an *optional* dependency to `quarkus-jsonb` on your extension's runtime module.
+==== Customizing Jackson
+
+First, add an *optional* dependency to `quarkus-jackson` on your extension's runtime module.
 
 [source%nowrap,xml]
 ----
 <dependency>
   <groupId>io.quarkus</groupId>
-  <artifactId>quarkus-jsonb</artifactId>
+  <artifactId>quarkus-jackson</artifactId>
   <optional>true</optional>
 </dependency>
 ----
 
-Then create a serializer and/or a deserializer for JSON-B, an example of which can be seen in the `mongodb-panache` extension.
+Then create a serializer or a deserializer (or both) for Jackson, an example of which can be seen in the `mongodb-panache` extension.
 
 [source%nowrap,java]
 ----
-public class ObjectIdSerializer implements JsonbSerializer<ObjectId> {
+public class ObjectIdSerializer extends StdSerializer<ObjectId> {
+    public ObjectIdSerializer() {
+        super(ObjectId.class);
+    }
     @Override
-    public void serialize(ObjectId obj, JsonGenerator generator, SerializationContext ctx) {
-        if (obj != null) {
-            generator.write(obj.toString());
+    public void serialize(ObjectId objectId, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+            throws IOException {
+        if (objectId != null) {
+            jsonGenerator.writeString(objectId.toString());
         }
     }
 }
 ----
 
-Add a dependency to `quarkus-jsonb-spi` on your extension's deployment module.
+Add a dependency to `quarkus-jackson-spi` on your extension's deployment module.
 
 [source%nowrap,xml]
 ----
 <dependency>
   <groupId>io.quarkus</groupId>
-  <artifactId>quarkus-jsonb-spi</artifactId>
+  <artifactId>quarkus-jackson-spi</artifactId>
 </dependency>
 ----
 
-Add a build step to your processor to register the serializer via the `JsonbSerializerBuildItem`.
+Add a build step to your processor to register a Jackson module via the `JacksonModuleBuildItem`.
+You need to name your module in a unique way across all Jackson modules.
 
 [source%nowrap,java]
 ----
 @BuildStep
-JsonbSerializerBuildItem registerJsonbSerializer() {
-    return new JsonbSerializerBuildItem(io.quarkus.mongodb.panache.jsonb.ObjectIdSerializer.class.getName()));
+JacksonModuleBuildItem registerJacksonSerDeser() {
+    return new JacksonModuleBuildItem.Builder("ObjectIdModule")
+                    .add(io.quarkus.mongodb.panache.jackson.ObjectIdSerializer.class.getName(),
+                            io.quarkus.mongodb.panache.jackson.ObjectIdDeserializer.class.getName(),
+                            ObjectId.class.getName())
+                    .build();
 }
 ----
 
-The JSON-B extension will then use the produced build item to register your serializer/deserializer automatically.
-
-If you need more customization capabilities than registering a serializer or a deserializer,
-you can produce a CDI bean that implements `io.quarkus.jsonb.JsonbConfigCustomizer` via an `AdditionalBeanBuildItem`.
-More info about customizing JSON-B can be found on the JSON guide link:rest-json#configuring-json-support[Configuring JSON support]
+The Jackson extension will then use the produced build item to register a module within Jackson automatically.
 
-==== Customizing Jackson
+If you need more customization capabilities than registering a module,
+you can produce a CDI bean that implements `io.quarkus.jackson.ObjectMapperCustomizer` via an `AdditionalBeanBuildItem`.
+More info about customizing Jackson can be found on the JSON guide link:rest-json#configuring-json-support[Configuring JSON support]
 
-First, add an *optional* dependency to `quarkus-jackson` on your extension's runtime module.
+==== Customizing JSON-B
+First, add an *optional* dependency to `quarkus-jsonb` on your extension's runtime module.
 
 [source%nowrap,xml]
 ----
 <dependency>
   <groupId>io.quarkus</groupId>
-  <artifactId>quarkus-jackson</artifactId>
+  <artifactId>quarkus-jsonb</artifactId>
   <optional>true</optional>
 </dependency>
 ----
 
-Then create a serializer or a deserializer (or both) for Jackson, an example of which can be seen in the `mongodb-panache` extension.
+Then create a serializer and/or a deserializer for JSON-B, an example of which can be seen in the `mongodb-panache` extension.
 
 [source%nowrap,java]
 ----
-public class ObjectIdSerializer extends StdSerializer<ObjectId> {
-    public ObjectIdSerializer() {
-        super(ObjectId.class);
-    }
+public class ObjectIdSerializer implements JsonbSerializer<ObjectId> {
     @Override
-    public void serialize(ObjectId objectId, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
-            throws IOException {
-        if (objectId != null) {
-            jsonGenerator.writeString(objectId.toString());
+    public void serialize(ObjectId obj, JsonGenerator generator, SerializationContext ctx) {
+        if (obj != null) {
+            generator.write(obj.toString());
         }
     }
 }
 ----
 
-Add a dependency to `quarkus-jackson-spi` on your extension's deployment module.
+Add a dependency to `quarkus-jsonb-spi` on your extension's deployment module.
 
 [source%nowrap,xml]
 ----
 <dependency>
   <groupId>io.quarkus</groupId>
-  <artifactId>quarkus-jackson-spi</artifactId>
+  <artifactId>quarkus-jsonb-spi</artifactId>
 </dependency>
 ----
 
-Add a build step to your processor to register a Jackson module via the `JacksonModuleBuildItem`.
-You need to name your module in a unique way across all Jackson modules.
+Add a build step to your processor to register the serializer via the `JsonbSerializerBuildItem`.
 
 [source%nowrap,java]
 ----
 @BuildStep
-JacksonModuleBuildItem registerJacksonSerDeser() {
-    return new JacksonModuleBuildItem.Builder("ObjectIdModule")
-                    .add(io.quarkus.mongodb.panache.jackson.ObjectIdSerializer.class.getName(),
-                            io.quarkus.mongodb.panache.jackson.ObjectIdDeserializer.class.getName(),
-                            ObjectId.class.getName())
-                    .build();
+JsonbSerializerBuildItem registerJsonbSerializer() {
+    return new JsonbSerializerBuildItem(io.quarkus.mongodb.panache.jsonb.ObjectIdSerializer.class.getName()));
 }
 ----
 
-The Jackson extension will then use the produced build item to register a module within Jackson automatically.
+The JSON-B extension will then use the produced build item to register your serializer/deserializer automatically.
 
-If you need more customization capabilities than registering a module,
-you can produce a CDI bean that implements `io.quarkus.jackson.ObjectMapperCustomizer` via an `AdditionalBeanBuildItem`.
-More info about customizing Jackson can be found on the JSON guide link:rest-json#configuring-json-support[Configuring JSON support]
+If you need more customization capabilities than registering a serializer or a deserializer,
+you can produce a CDI bean that implements `io.quarkus.jsonb.JsonbConfigCustomizer` via an `AdditionalBeanBuildItem`.
+More info about customizing JSON-B can be found on the JSON guide link:rest-json#configuring-json-support[Configuring JSON support]
 
 === Testing Extensions
 
@@ -1812,7 +1870,7 @@ public class FailingUnitTest {
 
     @Test
     public void testHealthServlet() {
-        RestAssured.when().get("/health").then().statusCode(503);                       // <4>
+        RestAssured.when().get("/q/health").then().statusCode(503);                       // <4>
     }
 
     @Test
@@ -2007,12 +2065,9 @@ A convenience feature that allows you to control most of the above features from
 `io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem`::
 Indicates that all charsets should be enabled in native image.
 
-`io.quarkus.deployment.builditem.NativeImageEnableAllTimeZonesBuildItem`::
-Indicates that all timezones should be enabled in native image.
-
 `io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem`::
 A convenient way to tell Quarkus that the extension requires SSL and it should be enabled during native image build.
-When using this feature, remember to add your extension to the list of extensions that offer SSL support automatically on the https://github.com/quarkusio/quarkus/blob/master/docs/src/main/asciidoc/native-and-ssl.adoc[native and ssl guide].
+When using this feature, remember to add your extension to the list of extensions that offer SSL support automatically on the https://github.com/quarkusio/quarkus/blob/main/docs/src/main/asciidoc/native-and-ssl.adoc[native and ssl guide].
 
 === IDE support tips
 
@@ -2027,11 +2082,18 @@ The only particular aspect of writing Quarkus extensions in Eclipse is that APT
 
 === Troubleshooting / Debugging Tips
 
-==== Dump the Generated Classes to the File System
+// This id was previously used for the "Dump the Generated Classes to the File System" section
+[[dump-the-generated-classes-to-the-file-system]]
+==== Inspecting the Generated/Transformed Classes
+
+Quarkus generates a lot of classes during the build phase and in many cases also transforms existing classes.
+It is often extremely useful to see the generated bytecode and transformed classes during the development of an extension.
 
-During the augmentation phase Quarkus extensions generate new and modify existing classes for various purposes. 
-Sometimes you need to inspect the generated bytecode to debug or understand an issue.
-There are three system properties that allow you to dump the classes to the filesystem:
+If you set the `quarkus.package.fernflower.enabled` property to `true` then Quarkus will download and invoke the https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine[Fernflower decompiler] and dump the result in the `decompiled` directory of the build tool output (`target/decompiled` for Maven for example).
+
+NOTE: This property only works during a normal production build (i.e. not for dev mode/tests) and when `fast-jar` packaging type is used (the default behavior).
+
+There are also three system properties that allow you to dump the generated/transformed classes to the filesystem and inspect them later, for example via a decompiler in your IDE.
 
 - `quarkus.debug.generated-classes-dir` - to dump the generated classes, such as bean metadata
 - `quarkus.debug.transformed-classes-dir` - to dump the transformed classes, e.g. Panache entities
@@ -2041,7 +2103,7 @@ These properties are especially useful in the development mode or when running t
 
 For example, you can specify the `quarkus.debug.generated-classes-dir` system property to have these classes written out to disk for inspection in the development mode:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw quarkus:dev -Dquarkus.debug.generated-classes-dir=dump-classes
 ----
@@ -2050,28 +2112,27 @@ NOTE: The property value could be either an absolute path, such as `/home/foo/du
 
 You should see a line in the log for each class written to the directory:
 
-[source,shell]
+[source,text]
 ----
 INFO  [io.qua.run.boo.StartupActionImpl] (main) Wrote /path/to/my/app/target/dump-classes/io/quarkus/arc/impl/ActivateRequestContextInterceptor_Bean.class
 ----
 
 The property is also honored when running tests:
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw clean test -Dquarkus.debug.generated-classes-dir=target/dump-generated-classes
 ----
 
 Analogously, you can use the `quarkus.debug.transformed-classes-dir` and `quarkus.debug.transformed-classes-dir` properties to dump the relevant output.
 
-
 ==== Multi-module Maven Projects and the Development Mode
 
 It's not uncommon to develop an extension in a multi-module Maven project that also contains an "example" module.
 However, if you want to run the example in the development mode then the `-DnoDeps` system property must be used in order to exclude the local project dependencies.
 Otherwise, Quarkus attempts to monitor the extension classes and this may result in weird class loading issues.
 
-[source,shell]
+[source,bash]
 ----
 ./mvnw compile quarkus:dev -DnoDeps
 ----
@@ -2092,7 +2153,7 @@ A _feature_ represents a functionality provided by an extension.
 The name of the feature gets displayed in the log during application bootstrap.
 
 .Example Startup Lines
-[source, bash]
+[source,text]
 ----
 2019-03-22 14:02:37,884 INFO  [io.quarkus] (main) Quarkus 999-SNAPSHOT started in 0.061s.
 2019-03-22 14:02:37,884 INFO  [io.quarkus] (main) Installed features: [cdi, test-extension] <1>
@@ -2116,16 +2177,16 @@ If multiple extensions register a feature of the same name the build fails.
 
 The feature name should also map to a label in the extension's `devtools/common/src/main/filtered/extensions.json` entry so that
 the feature name displayed by the startup line matches a label that one can used to select the extension when creating a project
-using the Quarkus maven plugin as shown in this example taken from the link:rest-json[Writing JSON REST Services] guide where the `resteasy-jsonb` feature is referenced:
+using the Quarkus maven plugin as shown in this example taken from the link:rest-json[Writing JSON REST Services] guide where the `resteasy-jackson` feature is referenced:
 
-[source,shell,subs=attributes+]
+[source,bash,subs=attributes+]
 ----
 mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \
     -DprojectGroupId=org.acme \
     -DprojectArtifactId=rest-json \
     -DclassName="org.acme.rest.json.FruitResource" \
     -Dpath="/fruits" \
-    -Dextensions="resteasy-jsonb"
+    -Dextensions="resteasy,resteasy-jackson"
 cd rest-json
 ----
 
@@ -2134,6 +2195,7 @@ cd rest-json
 A _capability_ represents a technical capability that can be queried by other extensions.
 An extension may provide multiple capabilities and multiple extensions can provide the same capability. 
 By default, capabilities are not displayed to users.
+Capabilities should be used when checking for the presence of an extension rather than class path based checks.
 
 Capabilities can be registered in a <<Build Step Processors>> method that produces a `CapabilityBuildItem`:
 
@@ -2166,7 +2228,7 @@ Capabilities provided by core extensions should be listed in the `io.quarkus.dep
 ==== Bean Defining Annotations
 The CDI layer processes CDI beans that are either explicitly registered or that it discovers based on bean defining annotations as defined in http://docs.jboss.org/cdi/spec/2.0/cdi-spec.html#bean_defining_annotations[2.5.1. Bean defining annotations]. You can expand this set of annotations to include annotations your extension processes using a `BeanDefiningAnnotationBuildItem` as shown in this `TestProcessor#registerBeanDefinningAnnotations` example:
 
-.Register a Bean Definining Annotation
+.Register a Bean Defining Annotation
 [source,java]
 ----
 import javax.enterprise.context.ApplicationScoped;
@@ -2270,7 +2332,7 @@ If your extension defines annotations or interfaces that mark beans needing to b
                         .stream()
                         .anyMatch(dotName -> dotName.equals(DotName.createSimple(IConfigConsumer.class.getName()))); <4>
                 if (isConfigConsumer) {
-                    Class<IConfigConsumer> beanClass = (Class<IConfigConsumer>) Class.forName(beanClassInfo.name().toString());
+                    Class<IConfigConsumer> beanClass = (Class<IConfigConsumer>) Class.forName(beanClassInfo.name().toString(), false, Thread.currentThread().getContextClassLoader());
                     testBeanProducer.produce(new TestBeanBuildItem(beanClass)); <5>
                     log.infof("Configured bean: %s", beanClass);
                 }
@@ -2418,7 +2480,7 @@ and shutdown. There are CDI events fired that components can observe are illustr
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
 
-puclic class SomeBean {
+public class SomeBean {
     /**
      * Called when the runtime has started
      * @param event
@@ -2437,7 +2499,7 @@ puclic class SomeBean {
 }
 ----
 <1> Observe a `StartupEvent` to be notified the runtime has started.
-<2> Observe a 'ShutdownEvent` to be notified when the runtime is going to shutdown.
+<2> Observe a `ShutdownEvent` to be notified when the runtime is going to shutdown.
 
 What is the relevance of startup and shutdown events for extension authors? We have already seen the use of a `ShutdownContext`
 to register a callback to perform shutdown tasks in the <<Starting a Service>> section. These shutdown tasks would be called
@@ -2611,7 +2673,7 @@ public class SomeServiceRecorder {
 Objects created during the build phase that are passed into the runtime need to have a default constructor in order for them to be created and configured at startup of the runtime from the build time state. If an object does not have a default constructor you will see an error similar to the following during generation of the augmented artifacts:
 
 .DSAPublicKey Serialization Error
-[source,bash]
+[source,text]
 ----
 	[error]: Build step io.quarkus.deployment.steps.MainClassBuildStep#build threw an exception: java.lang.RuntimeException: Unable to serialize objects of type class sun.security.provider.DSAPublicKeyImpl to bytecode as it has no default constructor
 	at io.quarkus.builder.Execution.run(Execution.java:123)
@@ -2670,7 +2732,7 @@ public class DSAPublicKeyObjectSubstitution implements ObjectSubstitution<DSAPub
 
 An extension registers this substitution by producing an `ObjectSubstitutionBuildItem` as shown in this `TestProcessor#loadDSAPublicKey` fragment:
 
-.Registering an Object Subtitution
+.Registering an Object Substitution
 [source,java]
 ----
     @BuildStep
diff --git a/docs/src/main/asciidoc/writing-native-applications-tips.adoc b/docs/src/main/asciidoc/writing-native-applications-tips.adoc
index d04ade319720c..44f0f7bd4a8d8 100644
--- a/docs/src/main/asciidoc/writing-native-applications-tips.adoc
+++ b/docs/src/main/asciidoc/writing-native-applications-tips.adoc
@@ -1,7 +1,7 @@
 ////
 This guide is maintained in the main Quarkus repository
 and pull requests should be submitted there:
-https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc
+https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 ////
 = Quarkus - Tips for writing native applications
 
@@ -48,7 +48,7 @@ Here we include all the XML files and JSON files into the native executable.
 
 [NOTE]
 ====
-You can find more information about this topic in https://github.com/oracle/graal/blob/master/substratevm/RESOURCES.md[the GraalVM documentation].
+You can find more information about this topic in https://github.com/oracle/graal/blob/master/substratevm/Resources.md[the GraalVM documentation].
 ====
 
 The final order of business is to make the configuration file known to the `native-image` executable by adding the proper configuration to `application.properties`:
@@ -172,11 +172,20 @@ public class MyClass {
 }
 ----
 
-==== Using a configuration file
+If your class is in a third-party jar, you can do it by using an empty class that will host the `@RegisterForReflection` for it.
 
-Obviously, adding `@RegisterForReflection` is not possible if the class is in a third-party jar.
+[source,java]
+----
+@RegisterForReflection(targets=MyClass.class)
+public class MyReflectionConfiguration {
+}
+----
 
-In this case, you can use a configuration file to register classes for reflection.
+Note that `MyClass` will be registered for reflection but not `MyReflectionConfiguration`.
+
+==== Using a configuration file
+
+You can use a configuration file to register classes for reflection.
 
 As an example, in order to register all methods of class `com.acme.MyClass` for reflection, we create `reflection-config.json` (the most common location is within `src/main/resources`)
 
@@ -197,7 +206,7 @@ As an example, in order to register all methods of class `com.acme.MyClass` for
 
 [NOTE]
 ====
-For more details on the format of this file, please refer to https://github.com/oracle/graal/blob/master/substratevm/REFLECTION.md[the GraalVM documentation].
+For more details on the format of this file, please refer to https://github.com/oracle/graal/blob/master/substratevm/Reflection.md[the GraalVM documentation].
 ====
 
 The final order of business is to make the configuration file known to the `native-image` executable by adding the proper configuration to `application.properties`:
@@ -258,11 +267,11 @@ Call path from entry point to com.amazonaws.services.s3.model.CryptoConfiguratio
 
 If you need to delay the initialization of a class, you can use the `--initialize-at-run-time=<package or class>` configuration knob.
 
-It should be added to the `native-image` configuration using an `<additionalBuildArg>` as shown in the examples above.
+It should be added to the `native-image` configuration using the `quarkus.native.additional-build-args` configuration property as shown in the examples above.
 
 [NOTE]
 ====
-You can find more information about all this in https://github.com/oracle/graal/blob/master/substratevm/CLASS-INITIALIZATION.md[the GraalVM documentation].
+You can find more information about all this in https://github.com/oracle/graal/blob/master/substratevm/ClassInitialization.md[the GraalVM documentation].
 ====
 
 [NOTE]
@@ -270,10 +279,17 @@ You can find more information about all this in https://github.com/oracle/graal/
 When multiple classes or packages need to be specified via the `quarkus.native.additional-build-args` configuration property, the `,` symbol needs to be escaped.
 An example of this is the following:
 
-[source]
+[source,properties]
 ----
 quarkus.native.additional-build-args=--initialize-at-run-time=com.example.SomeClass\\,org.acme.SomeOtherClass
 ----
+
+and in the case of using the Maven configuration instead of `application.properties`:
+
+[source,xml]
+----
+<quarkus.native.additional-build-args>--initialize-at-run-time=com.example.SomeClass\,org.acme.SomeOtherClass</quarkus.native.additional-build-args>
+----
 ====
 
 === Managing Proxy Classes
@@ -288,7 +304,7 @@ com.oracle.svm.core.jdk.UnsupportedFeatureError: Proxy class defined by interfac
 ----
 
 Solving this issue requires adding the `-H:DynamicProxyConfigurationResources=<comma-separated-config-resources>` option and to provide a dynamic proxy configuration file.
-You can find all the information about the format of this file in https://github.com/oracle/graal/blob/master/substratevm/DYNAMIC_PROXY.md#manual-configuration[the GraalVM documentation].
+You can find all the information about the format of this file in https://github.com/oracle/graal/blob/master/substratevm/DynamicProxy.md#manual-configuration[the GraalVM documentation].
 
 [[native-in-extension]]
 == Supporting native in a Quarkus extension
@@ -321,13 +337,9 @@ public class SaxParserProcessor {
 
 [NOTE]
 ====
-More information about reflection in GraalVM can be found https://github.com/oracle/graal/blob/master/substratevm/REFLECTION.md[here].
+More information about reflection in GraalVM can be found https://github.com/oracle/graal/blob/master/substratevm/Reflection.md[here].
 ====
 
-=== Alternative with @RegisterForReflection
-
-As for applications, you can also use the `@RegisterForReflection` annotation if the class is in your extension and not in a third-party jar.
-
 === Including resources
 
 In the context of an extension, Quarkus eliminates the need for a JSON configuration file by allowing extension authors to specify a `NativeImageResourceBuildItem`:
@@ -346,7 +358,7 @@ public class ResourcesProcessor {
 
 [NOTE]
 ====
-For more information about GraalVM resource handling in native executables please refer to https://github.com/oracle/graal/blob/master/substratevm/RESOURCES.md[the GraalVM documentation].
+For more information about GraalVM resource handling in native executables please refer to https://github.com/oracle/graal/blob/master/substratevm/Resources.md[the GraalVM documentation].
 ====
 
 
@@ -370,7 +382,7 @@ Using such a construct means that a `--initialize-at-run-time` option will autom
 
 [NOTE]
 ====
-For more information about `--initialize-at-run-time`, please read https://github.com/oracle/graal/blob/master/substratevm/CLASS-INITIALIZATION.md[the GraalVM documentation].
+For more information about `--initialize-at-run-time`, please read https://github.com/oracle/graal/blob/master/substratevm/ClassInitialization.md[the GraalVM documentation].
 ====
 
 === Managing Proxy Classes
@@ -394,7 +406,7 @@ Using such a construct means that a `-H:DynamicProxyConfigurationResources` opti
 
 [NOTE]
 ====
-For more information about Proxy Classes you can read https://github.com/oracle/graal/blob/master/substratevm/DYNAMIC_PROXY.md[the GraalVM documentation].
+For more information about Proxy Classes you can read https://github.com/oracle/graal/blob/master/substratevm/DynamicProxy.md[the GraalVM documentation].
 ====
 
 === Logging with Native Image
diff --git a/docs/src/main/java/io/quarkus/docs/generation/AllConfigGenerator.java b/docs/src/main/java/io/quarkus/docs/generation/AllConfigGenerator.java
index f82e376e3f8e0..5fb7b4c999604 100644
--- a/docs/src/main/java/io/quarkus/docs/generation/AllConfigGenerator.java
+++ b/docs/src/main/java/io/quarkus/docs/generation/AllConfigGenerator.java
@@ -21,10 +21,6 @@
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-
 import io.quarkus.annotation.processor.generate_doc.ConfigDocGeneratedOutput;
 import io.quarkus.annotation.processor.generate_doc.ConfigDocItem;
 import io.quarkus.annotation.processor.generate_doc.ConfigDocItemScanner;
@@ -33,9 +29,18 @@
 import io.quarkus.annotation.processor.generate_doc.DocGeneratorUtil;
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import io.quarkus.docs.generation.ExtensionJson.Extension;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
 
 public class AllConfigGenerator {
+
+    public static Artifact toAetherArtifact(ArtifactCoords coords) {
+        return new DefaultArtifact(coords.getGroupId(), coords.getArtifactId(), coords.getClassifier(), coords.getType(),
+                coords.getVersion());
+    }
+
     public static void main(String[] args) throws BootstrapMavenException, IOException {
         if (args.length != 2) {
             // exit 1 will break Maven
@@ -51,30 +56,26 @@ public static void main(String[] args) throws BootstrapMavenException, IOExcepti
             // exit 0 will break Maven
             return;
         }
-        ObjectMapper mapper = new ObjectMapper()
-                .enable(JsonParser.Feature.ALLOW_COMMENTS)
-                .enable(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS)
-                .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
         MavenArtifactResolver resolver = MavenArtifactResolver.builder().setWorkspaceDiscovery(false).build();
 
-        // let's read it (and ignore the fields we don't need)
-        ExtensionJson extensionJson = mapper.readValue(jsonFile, ExtensionJson.class);
+        final JsonExtensionCatalog extensionJson = JsonCatalogMapperHelper.deserialize(jsonFile.toPath(),
+                JsonExtensionCatalog.class);
 
         // now get all the listed extension jars via Maven
-        List<ArtifactRequest> requests = new ArrayList<>(extensionJson.extensions.size());
+        List<ArtifactRequest> requests = new ArrayList<>(extensionJson.getExtensions().size());
         Map<String, Extension> extensionsByGav = new HashMap<>();
         Map<String, Extension> extensionsByConfigRoots = new HashMap<>();
-        for (Extension extension : extensionJson.extensions) {
+        for (Extension extension : extensionJson.getExtensions()) {
             ArtifactRequest request = new ArtifactRequest();
-            Artifact artifact = new DefaultArtifact(extension.groupId, extension.artifactId, "jar", version);
+            Artifact artifact = toAetherArtifact(extension.getArtifact());
             request.setArtifact(artifact);
             requests.add(request);
             // record the extension for this GAV
-            extensionsByGav.put(extension.groupId + ":" + extension.artifactId, extension);
+            extensionsByGav.put(artifact.getGroupId() + ":" + artifact.getArtifactId(), extension);
         }
 
         // examine all the extension jars
-        List<ArtifactRequest> deploymentRequests = new ArrayList<>(extensionJson.extensions.size());
+        List<ArtifactRequest> deploymentRequests = new ArrayList<>(extensionJson.getExtensions().size());
         for (ArtifactResult result : resolver.resolve(requests)) {
             Artifact artifact = result.getArtifact();
             // which extension was this for?
@@ -130,24 +131,26 @@ public static void main(String[] args) throws BootstrapMavenException, IOExcepti
 
         // Temporary fix for https://github.com/quarkusio/quarkus/issues/5214 until we figure out how to fix it
         Extension openApi = extensionsByGav.get("io.quarkus:quarkus-smallrye-openapi");
-        if (openApi != null)
+        if (openApi != null) {
             extensionsByConfigRoots.put("io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig", openApi);
+        }
 
         // sort extensions by name, assign their config items based on their config roots
         for (Entry<String, Extension> entry : extensionsByConfigRoots.entrySet()) {
             List<ConfigDocItem> items = docItemsByConfigRoots.get(entry.getKey());
             if (items != null) {
-                String extensionName = entry.getValue().name;
+                String extensionName = entry.getValue().getName();
                 if (extensionName == null) {
-                    String extensionGav = entry.getValue().groupId + ":" + entry.getValue().artifactId;
                     // compute the docs file name for this extension
                     String docFileName = DocGeneratorUtil.computeExtensionDocFileName(entry.getKey());
                     // now approximate an extension file name based on it
                     extensionName = guessExtensionNameFromDocumentationFileName(docFileName);
-                    System.err.println("WARNING: Extension name missing for " + extensionGav + " using guessed extension name: "
-                            + extensionName);
+                    System.err.println("WARNING: Extension name missing for "
+                            + (entry.getValue().getArtifact().getGroupId() + ":"
+                                    + entry.getValue().getArtifact().getArtifactId())
+                            + " using guessed extension name: " + extensionName);
                 }
-                artifactIdsByName.put(extensionName, entry.getValue().artifactId);
+                artifactIdsByName.put(extensionName, entry.getValue().getArtifact().getArtifactId());
                 List<ConfigDocItem> existingConfigDocItems = sortedConfigItemsByExtension.get(extensionName);
                 if (existingConfigDocItems != null) {
                     DocGeneratorUtil.appendConfigItemsIntoExistingOnes(existingConfigDocItems, items);
diff --git a/docs/src/main/java/io/quarkus/docs/generation/ExtensionJson.java b/docs/src/main/java/io/quarkus/docs/generation/ExtensionJson.java
deleted file mode 100644
index c81ae58911924..0000000000000
--- a/docs/src/main/java/io/quarkus/docs/generation/ExtensionJson.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.quarkus.docs.generation;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ExtensionJson {
-    public List<Extension> extensions;
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class Extension {
-        public String name, groupId, artifactId;
-    }
-}
\ No newline at end of file
diff --git a/docs/sync-web-site.sh b/docs/sync-web-site.sh
index a246f37b7f6cf..ce6beead98300 100755
--- a/docs/sync-web-site.sh
+++ b/docs/sync-web-site.sh
@@ -14,7 +14,7 @@ rsync -vr --delete \
     --exclude='**/index.adoc' \
     --exclude='**/attributes.adoc' \
     ../target/asciidoc/generated/ \
-    target/web-site/_generated-config
+    target/web-site/_generated-config/latest
 
 echo "Sync done!"
 echo "=========="
diff --git a/extensions/agroal/deployment/pom.xml b/extensions/agroal/deployment/pom.xml
index e3e4440556a56..a31bf2739534f 100644
--- a/extensions/agroal/deployment/pom.xml
+++ b/extensions/agroal/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-agroal-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,10 +45,7 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics-spi</artifactId>
-        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -61,6 +57,11 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -78,7 +79,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AggregatedDataSourceBuildTimeConfigBuildItem.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AggregatedDataSourceBuildTimeConfigBuildItem.java
index 342c9f942685e..8e5c66c27137b 100644
--- a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AggregatedDataSourceBuildTimeConfigBuildItem.java
+++ b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AggregatedDataSourceBuildTimeConfigBuildItem.java
@@ -1,7 +1,6 @@
 package io.quarkus.agroal.deployment;
 
 import io.quarkus.agroal.runtime.DataSourceJdbcBuildTimeConfig;
-import io.quarkus.agroal.runtime.LegacyDataSourceJdbcBuildTimeConfig;
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig;
@@ -14,25 +13,19 @@ final class AggregatedDataSourceBuildTimeConfigBuildItem extends MultiBuildItem
 
     private final DataSourceJdbcBuildTimeConfig jdbcConfig;
 
-    private final LegacyDataSourceJdbcBuildTimeConfig legacyDataSourceJdbcConfig;
-
-    private final String resolvedDbKind;
+    private final String dbKind;
 
     private final String resolvedDriverClass;
 
-    private boolean legacy;
-
     AggregatedDataSourceBuildTimeConfigBuildItem(String name, DataSourceBuildTimeConfig dataSourceConfig,
             DataSourceJdbcBuildTimeConfig jdbcConfig,
-            LegacyDataSourceJdbcBuildTimeConfig legacyDataSourceJdbcConfig, String resolvedDbKind,
-            String resolvedDriverClass, boolean legacy) {
+            String dbKind,
+            String resolvedDriverClass) {
         this.name = name;
         this.dataSourceConfig = dataSourceConfig;
         this.jdbcConfig = jdbcConfig;
-        this.legacyDataSourceJdbcConfig = legacyDataSourceJdbcConfig;
-        this.resolvedDbKind = resolvedDbKind;
+        this.dbKind = dbKind;
         this.resolvedDriverClass = resolvedDriverClass;
-        this.legacy = legacy;
     }
 
     public String getName() {
@@ -47,23 +40,15 @@ public DataSourceJdbcBuildTimeConfig getJdbcConfig() {
         return jdbcConfig;
     }
 
-    public LegacyDataSourceJdbcBuildTimeConfig getLegacyDataSourceJdbcConfig() {
-        return legacyDataSourceJdbcConfig;
-    }
-
     public boolean isDefault() {
         return DataSourceUtil.isDefault(name);
     }
 
-    public String getResolvedDbKind() {
-        return resolvedDbKind;
+    public String getDbKind() {
+        return dbKind;
     }
 
     public String getResolvedDriverClass() {
         return resolvedDriverClass;
     }
-
-    public boolean isLegacy() {
-        return legacy;
-    }
 }
diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalMetricsProcessor.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalMetricsProcessor.java
new file mode 100644
index 0000000000000..cc7f79e6cc31c
--- /dev/null
+++ b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalMetricsProcessor.java
@@ -0,0 +1,33 @@
+package io.quarkus.agroal.deployment;
+
+import java.util.List;
+
+import io.quarkus.agroal.runtime.metrics.AgroalMetricsRecorder;
+import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem;
+
+public class AgroalMetricsProcessor {
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void registerMetrics(AgroalMetricsRecorder recorder,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            BuildProducer<MetricsFactoryConsumerBuildItem> datasourceMetrics,
+            List<AggregatedDataSourceBuildTimeConfigBuildItem> aggregatedDataSourceBuildTimeConfigs) {
+
+        for (AggregatedDataSourceBuildTimeConfigBuildItem aggregatedDataSourceBuildTimeConfig : aggregatedDataSourceBuildTimeConfigs) {
+            // Create a MetricsFactory consumer to register metrics for a data source
+            // IFF metrics are enabled globally and for the data source
+            // (they are enabled for each data source by default if they are also enabled globally)
+            if (dataSourcesBuildTimeConfig.metricsEnabled &&
+                    aggregatedDataSourceBuildTimeConfig.getJdbcConfig().enableMetrics.orElse(true)) {
+                datasourceMetrics.produce(new MetricsFactoryConsumerBuildItem(
+                        recorder.registerDataSourceMetrics(aggregatedDataSourceBuildTimeConfig.getName())));
+            }
+        }
+    }
+}
diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
index 5229cc5c98ee7..d953511a950b9 100644
--- a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
+++ b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
@@ -12,10 +12,6 @@
 import javax.inject.Singleton;
 import javax.sql.XADataSource;
 
-import org.eclipse.microprofile.metrics.Metadata;
-import org.eclipse.microprofile.metrics.MetricType;
-import org.eclipse.microprofile.metrics.MetricUnits;
-import org.eclipse.microprofile.metrics.Tag;
 import org.jboss.jandex.DotName;
 import org.jboss.logging.Logger;
 
@@ -27,16 +23,14 @@
 import io.quarkus.agroal.runtime.DataSourceSupport;
 import io.quarkus.agroal.runtime.DataSources;
 import io.quarkus.agroal.runtime.DataSourcesJdbcBuildTimeConfig;
-import io.quarkus.agroal.runtime.LegacyDataSourceJdbcBuildTimeConfig;
-import io.quarkus.agroal.runtime.LegacyDataSourcesJdbcBuildTimeConfig;
 import io.quarkus.agroal.runtime.TransactionIntegration;
-import io.quarkus.agroal.runtime.metrics.AgroalCounter;
-import io.quarkus.agroal.runtime.metrics.AgroalGauge;
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
-import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
 import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
@@ -53,9 +47,9 @@
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
-import io.quarkus.smallrye.metrics.deployment.spi.MetricBuildItem;
 
 @SuppressWarnings("deprecation")
 class AgroalProcessor {
@@ -64,10 +58,6 @@ class AgroalProcessor {
 
     private static final DotName DATA_SOURCE = DotName.createSimple(javax.sql.DataSource.class.getName());
 
-    private static final String QUARKUS_DATASOURCE_CONFIG_PREFIX = "quarkus.datasource.";
-    private static final String QUARKUS_DATASOURCE_DB_KIND_CONFIG_NAME = "db-kind";
-    private static final String QUARKUS_DATASOURCE_DRIVER_CONFIG_NAME = "driver";
-
     @BuildStep
     void agroal(BuildProducer<FeatureBuildItem> feature,
             BuildProducer<CapabilityBuildItem> capability) {
@@ -79,17 +69,23 @@ void agroal(BuildProducer<FeatureBuildItem> feature,
     void build(
             DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
             DataSourcesJdbcBuildTimeConfig dataSourcesJdbcBuildTimeConfig,
-            LegacyDataSourcesJdbcBuildTimeConfig legacyDataSourcesJdbcBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDbKinds,
             List<JdbcDriverBuildItem> jdbcDriverBuildItems,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<NativeImageResourceBuildItem> resource,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport,
-            BuildProducer<AggregatedDataSourceBuildTimeConfigBuildItem> aggregatedConfig) throws Exception {
+            BuildProducer<AggregatedDataSourceBuildTimeConfigBuildItem> aggregatedConfig,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception {
+        if (dataSourcesBuildTimeConfig.driver.isPresent() || dataSourcesBuildTimeConfig.url.isPresent()) {
+            throw new ConfigurationException(
+                    "quarkus.datasource.url and quarkus.datasource.driver have been deprecated in Quarkus 1.3 and removed in 1.9. "
+                            + "Please use the new datasource configuration as explained in https://quarkus.io/guides/datasource.");
+        }
+
         List<AggregatedDataSourceBuildTimeConfigBuildItem> aggregatedDataSourceBuildTimeConfigs = getAggregatedConfigBuildItems(
                 dataSourcesBuildTimeConfig,
-                dataSourcesJdbcBuildTimeConfig,
-                legacyDataSourcesJdbcBuildTimeConfig,
-                jdbcDriverBuildItems);
+                dataSourcesJdbcBuildTimeConfig, curateOutcomeBuildItem,
+                jdbcDriverBuildItems, defaultDbKinds);
 
         if (aggregatedDataSourceBuildTimeConfigs.isEmpty()) {
             log.warn("The Agroal dependency is present but no JDBC datasources have been defined.");
@@ -171,9 +167,9 @@ private DataSourceSupport getDataSourceSupport(
         for (AggregatedDataSourceBuildTimeConfigBuildItem aggregatedDataSourceBuildTimeConfig : aggregatedBuildTimeConfigBuildItems) {
             String dataSourceName = aggregatedDataSourceBuildTimeConfig.getName();
             dataSourceSupportEntries.put(dataSourceName,
-                    new DataSourceSupport.Entry(dataSourceName, aggregatedDataSourceBuildTimeConfig.getResolvedDbKind(),
+                    new DataSourceSupport.Entry(dataSourceName, aggregatedDataSourceBuildTimeConfig.getDbKind(),
                             aggregatedDataSourceBuildTimeConfig.getResolvedDriverClass(),
-                            aggregatedDataSourceBuildTimeConfig.isLegacy(), aggregatedDataSourceBuildTimeConfig.isDefault()));
+                            aggregatedDataSourceBuildTimeConfig.isDefault()));
         }
 
         return new DataSourceSupport(sslNativeConfig.isExplicitlyDisabled(),
@@ -263,21 +259,21 @@ void generateDataSourceBeans(AgroalRecorder recorder,
     private List<AggregatedDataSourceBuildTimeConfigBuildItem> getAggregatedConfigBuildItems(
             DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
             DataSourcesJdbcBuildTimeConfig dataSourcesJdbcBuildTimeConfig,
-            LegacyDataSourcesJdbcBuildTimeConfig legacyDataSourcesJdbcBuildTimeConfig,
-            List<JdbcDriverBuildItem> jdbcDriverBuildItems) {
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            List<JdbcDriverBuildItem> jdbcDriverBuildItems, List<DefaultDataSourceDbKindBuildItem> defaultDbKinds) {
         List<AggregatedDataSourceBuildTimeConfigBuildItem> dataSources = new ArrayList<>();
 
-        // New configuration
-        if (dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()) {
+        Optional<String> effectiveDbKind = DefaultDataSourceDbKindBuildItem
+                .resolve(dataSourcesBuildTimeConfig.defaultDataSource.dbKind, defaultDbKinds, curateOutcomeBuildItem);
+
+        if (effectiveDbKind.isPresent()) {
             if (dataSourcesJdbcBuildTimeConfig.jdbc.enabled) {
                 dataSources.add(new AggregatedDataSourceBuildTimeConfigBuildItem(DataSourceUtil.DEFAULT_DATASOURCE_NAME,
                         dataSourcesBuildTimeConfig.defaultDataSource,
                         dataSourcesJdbcBuildTimeConfig.jdbc,
-                        null,
-                        dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get(),
-                        resolveDriver(null, dataSourcesBuildTimeConfig.defaultDataSource,
-                                dataSourcesJdbcBuildTimeConfig.jdbc, jdbcDriverBuildItems),
-                        false));
+                        effectiveDbKind.get(),
+                        resolveDriver(DataSourceUtil.DEFAULT_DATASOURCE_NAME, effectiveDbKind.get(),
+                                dataSourcesJdbcBuildTimeConfig.jdbc, jdbcDriverBuildItems)));
             }
         }
         for (Entry<String, DataSourceBuildTimeConfig> entry : dataSourcesBuildTimeConfig.namedDataSources.entrySet()) {
@@ -287,102 +283,29 @@ private List<AggregatedDataSourceBuildTimeConfigBuildItem> getAggregatedConfigBu
             if (!jdbcBuildTimeConfig.enabled) {
                 continue;
             }
+            Optional<String> dbKind = DefaultDataSourceDbKindBuildItem
+                    .resolve(entry.getValue().dbKind, defaultDbKinds, curateOutcomeBuildItem);
+            if (!dbKind.isPresent()) {
+                continue;
+            }
             dataSources.add(new AggregatedDataSourceBuildTimeConfigBuildItem(entry.getKey(),
                     entry.getValue(),
                     jdbcBuildTimeConfig,
-                    null,
-                    entry.getValue().dbKind.get(),
-                    resolveDriver(entry.getKey(), entry.getValue(), jdbcBuildTimeConfig, jdbcDriverBuildItems),
-                    false));
-        }
-
-        // Legacy configuration
-        if (legacyDataSourcesJdbcBuildTimeConfig.defaultDataSource.driver.isPresent()) {
-            String resolvedDbKind = resolveLegacyKind(legacyDataSourcesJdbcBuildTimeConfig.defaultDataSource.driver.get());
-            boolean alreadyConfigured = ensureNoConfigurationClash(dataSources, DataSourceUtil.DEFAULT_DATASOURCE_NAME,
-                    resolvedDbKind);
-
-            if (!alreadyConfigured) {
-                dataSources.add(new AggregatedDataSourceBuildTimeConfigBuildItem(DataSourceUtil.DEFAULT_DATASOURCE_NAME,
-                        dataSourcesBuildTimeConfig.defaultDataSource,
-                        dataSourcesJdbcBuildTimeConfig.jdbc,
-                        legacyDataSourcesJdbcBuildTimeConfig.defaultDataSource,
-                        resolvedDbKind,
-                        legacyDataSourcesJdbcBuildTimeConfig.defaultDataSource.driver.get(),
-                        true));
-            }
-        }
-        for (Entry<String, LegacyDataSourceJdbcBuildTimeConfig> entry : legacyDataSourcesJdbcBuildTimeConfig.namedDataSources
-                .entrySet()) {
-            String datasourceName = entry.getKey();
-            DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig.namedDataSources
-                    .containsKey(datasourceName) ? dataSourcesBuildTimeConfig.namedDataSources.get(datasourceName)
-                            : new DataSourceBuildTimeConfig();
-            DataSourceJdbcBuildTimeConfig jdbcBuildTimeConfig = dataSourcesJdbcBuildTimeConfig.namedDataSources
-                    .containsKey(datasourceName) ? dataSourcesJdbcBuildTimeConfig.namedDataSources.get(datasourceName).jdbc
-                            : new DataSourceJdbcBuildTimeConfig();
-
-            String resolvedDbKind = resolveLegacyKind(entry.getValue().driver.get());
-            boolean alreadyConfigured = ensureNoConfigurationClash(dataSources, datasourceName, resolvedDbKind);
-
-            if (!alreadyConfigured) {
-                dataSources.add(new AggregatedDataSourceBuildTimeConfigBuildItem(datasourceName,
-                        dataSourceBuildTimeConfig,
-                        jdbcBuildTimeConfig,
-                        entry.getValue(),
-                        resolvedDbKind,
-                        entry.getValue().driver.get(),
-                        true));
-            }
+                    dbKind.get(),
+                    resolveDriver(entry.getKey(), dbKind.get(), jdbcBuildTimeConfig, jdbcDriverBuildItems)));
         }
 
         return dataSources;
     }
 
-    private boolean ensureNoConfigurationClash(List<AggregatedDataSourceBuildTimeConfigBuildItem> dataSources,
-            String datasourceName, String resolvedDbKind) {
-
-        boolean alreadyConfigured = false;
-        for (AggregatedDataSourceBuildTimeConfigBuildItem alreadyConfiguredDataSource : dataSources) {
-            if (alreadyConfiguredDataSource.getName().equals(datasourceName)) {
-                if (!alreadyConfiguredDataSource.getResolvedDbKind().equals(resolvedDbKind)) {
-                    throw new RuntimeException("Incompatible values detected between "
-                            + quotedDataSourcePropertyName(datasourceName, QUARKUS_DATASOURCE_DB_KIND_CONFIG_NAME) + " and "
-                            + quotedDataSourcePropertyName(datasourceName, QUARKUS_DATASOURCE_DRIVER_CONFIG_NAME)
-                            + ". Consider removing the latter.");
-                }
-                alreadyConfigured = true;
-            }
-        }
-        if (alreadyConfigured) {
-            log.warn("Configuring " + quotedDataSourcePropertyName(datasourceName, QUARKUS_DATASOURCE_DRIVER_CONFIG_NAME)
-                    + " is redundant when "
-                    + quotedDataSourcePropertyName(datasourceName, QUARKUS_DATASOURCE_DB_KIND_CONFIG_NAME)
-                    + " is also configured");
-        }
-
-        return alreadyConfigured;
-    }
-
-    private String quotedDataSourcePropertyName(String datasourceName, String propertyName) {
-        return "\"" + dataSourcePropertyName(datasourceName, propertyName) + "\"";
-    }
-
-    private String dataSourcePropertyName(String datasourceName, String propertyName) {
-        if (DataSourceUtil.DEFAULT_DATASOURCE_NAME.equals(datasourceName)) {
-            return QUARKUS_DATASOURCE_CONFIG_PREFIX + propertyName;
-        }
-        return QUARKUS_DATASOURCE_CONFIG_PREFIX + datasourceName + "." + propertyName;
-    }
-
-    private String resolveDriver(String dataSourceName, DataSourceBuildTimeConfig dataSourceBuildTimeConfig,
+    private String resolveDriver(String dataSourceName, String dbKind,
             DataSourceJdbcBuildTimeConfig dataSourceJdbcBuildTimeConfig, List<JdbcDriverBuildItem> jdbcDriverBuildItems) {
         if (dataSourceJdbcBuildTimeConfig.driver.isPresent()) {
             return dataSourceJdbcBuildTimeConfig.driver.get();
         }
 
         Optional<JdbcDriverBuildItem> matchingJdbcDriver = jdbcDriverBuildItems.stream()
-                .filter(i -> dataSourceBuildTimeConfig.dbKind.get().equals(i.getDbKind()))
+                .filter(i -> dbKind.equals(i.getDbKind()))
                 .findFirst();
 
         if (matchingJdbcDriver.isPresent()) {
@@ -395,33 +318,14 @@ private String resolveDriver(String dataSourceName, DataSourceBuildTimeConfig da
             }
         }
 
-        throw new ConfigurationException("Unable to determine the driver for " + (dataSourceName == null ? "default datasource"
-                : "datasource named " + dataSourceName));
-    }
-
-    private String resolveLegacyKind(String driver) {
-        switch (driver) {
-            case "org.apache.derby.jdbc.ClientDriver":
-            case "org.apache.derby.jdbc.ClientXADataSource":
-                return DatabaseKind.DERBY;
-            case "org.h2.Driver":
-            case "org.h2.jdbcx.JdbcDataSource":
-                return DatabaseKind.H2;
-            case "org.mariadb.jdbc.Driver":
-            case "org.mariadb.jdbc.MySQLDataSource":
-                return DatabaseKind.MARIADB;
-            case "com.microsoft.sqlserver.jdbc.SQLServerDriver":
-            case "com.microsoft.sqlserver.jdbc.SQLServerXADataSource":
-                return DatabaseKind.MSSQL;
-            case "com.mysql.cj.jdbc.Driver":
-            case "com.mysql.cj.jdbc.MysqlXADataSource":
-                return DatabaseKind.MYSQL;
-            case "org.postgresql.Driver":
-            case "org.postgresql.xa.PGXADataSource":
-                return DatabaseKind.POSTGRESQL;
-        }
-
-        return "other-legacy";
+        throw new ConfigurationException("Unable to find a JDBC driver corresponding to the database kind '"
+                + dbKind + "' for the "
+                + (DataSourceUtil.isDefault(dataSourceName) ? "default datasource"
+                        : "datasource '" + dataSourceName + "'")
+                + ". Either provide a suitable JDBC driver extension, define the driver manually, or disable the JDBC datasource by adding "
+                + (DataSourceUtil.isDefault(dataSourceName) ? "'quarkus.datasource.jdbc=false'"
+                        : "'quarkus.datasource." + dataSourceName + ".jdbc=false'")
+                + " to your configuration if you don't need it.");
     }
 
     @BuildStep
@@ -429,197 +333,4 @@ HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeCo
         return new HealthBuildItem("io.quarkus.agroal.runtime.health.DataSourceHealthCheck",
                 dataSourcesBuildTimeConfig.healthEnabled);
     }
-
-    @BuildStep
-    void registerMetrics(
-            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
-            List<AggregatedDataSourceBuildTimeConfigBuildItem> aggregatedDataSourceBuildTimeConfigs,
-            BuildProducer<MetricBuildItem> metrics) {
-        Metadata activeCountMetadata = Metadata.builder()
-                .withName("agroal.active.count")
-                .withDescription("Number of active connections. These connections are in use and not available to be acquired.")
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata availableCountMetadata = Metadata.builder()
-                .withName("agroal.available.count")
-                .withDescription("Number of idle connections in the pool, available to be acquired.")
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata maxUsedCountMetadata = Metadata.builder()
-                .withName("agroal.max.used.count")
-                .withDescription("Maximum number of connections active simultaneously.")
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata awaitingCountMetadata = Metadata.builder()
-                .withName("agroal.awaiting.count")
-                .withDescription("Approximate number of threads blocked, waiting to acquire a connection.")
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata blockingTimeAverageMetadata = Metadata.builder()
-                .withName("agroal.blocking.time.average")
-                .withDescription("Average time an application waited to acquire a connection.")
-                .withUnit(MetricUnits.MILLISECONDS)
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata blockingTimeMaxMetadata = Metadata.builder()
-                .withName("agroal.blocking.time.max")
-                .withDescription("Maximum time an application waited to acquire a connection.")
-                .withUnit(MetricUnits.MILLISECONDS)
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata blockingTimeTotalMetadata = Metadata.builder()
-                .withName("agroal.blocking.time.total")
-                .withDescription("Total time applications waited to acquire a connection.")
-                .withUnit(MetricUnits.MILLISECONDS)
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata creationTimeAverageMetadata = Metadata.builder()
-                .withName("agroal.creation.time.average")
-                .withDescription("Average time for a connection to be created.")
-                .withUnit(MetricUnits.MILLISECONDS)
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata creationTimeMaxMetadata = Metadata.builder()
-                .withName("agroal.creation.time.max")
-                .withDescription("Maximum time for a connection to be created.")
-                .withUnit(MetricUnits.MILLISECONDS)
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata creationTimeTotalMetadata = Metadata.builder()
-                .withName("agroal.creation.time.total")
-                .withDescription("Total time waiting for connections to be created.")
-                .withUnit(MetricUnits.MILLISECONDS)
-                .withType(MetricType.GAUGE)
-                .build();
-        Metadata acquireCountMetadata = Metadata.builder()
-                .withName("agroal.acquire.count")
-                .withDescription("Number of times an acquire operation succeeded.")
-                .withType(MetricType.COUNTER)
-                .build();
-        Metadata creationCountMetadata = Metadata.builder()
-                .withName("agroal.creation.count")
-                .withDescription("Number of created connections.")
-                .withType(MetricType.COUNTER)
-                .build();
-        Metadata leakDetectionCountMetadata = Metadata.builder()
-                .withName("agroal.leak.detection.count")
-                .withDescription("Number of times a leak was detected. A single connection can be detected multiple times.")
-                .withType(MetricType.COUNTER)
-                .build();
-        Metadata destroyCountMetadata = Metadata.builder()
-                .withName("agroal.destroy.count")
-                .withDescription("Number of destroyed connections.")
-                .withType(MetricType.COUNTER)
-                .build();
-        Metadata flushCountMetadata = Metadata.builder()
-                .withName("agroal.flush.count")
-                .withDescription("Number of connections removed from the pool, not counting invalid / idle.")
-                .withType(MetricType.COUNTER)
-                .build();
-        Metadata invalidCountMetadata = Metadata.builder()
-                .withName("agroal.invalid.count")
-                .withDescription("Number of connections removed from the pool for being invalid.")
-                .withType(MetricType.COUNTER)
-                .build();
-        Metadata reapCountMetadata = Metadata.builder()
-                .withName("agroal.reap.count")
-                .withDescription("Number of connections removed from the pool for being idle.")
-                .withType(MetricType.COUNTER)
-                .build();
-
-        for (AggregatedDataSourceBuildTimeConfigBuildItem aggregatedDataSourceBuildTimeConfig : aggregatedDataSourceBuildTimeConfigs) {
-            String dataSourceName = aggregatedDataSourceBuildTimeConfig.getName();
-            // expose metrics for this datasource if metrics are enabled both globally and for this data source
-            // (they are enabled for each data source by default if they are also enabled globally)
-            boolean metricsEnabledForThisDatasource = dataSourcesBuildTimeConfig.metricsEnabled &&
-                    aggregatedDataSourceBuildTimeConfig.getJdbcConfig().enableMetrics.orElse(true);
-            Tag tag = new Tag("datasource", DataSourceUtil.isDefault(dataSourceName) ? "default" : dataSourceName);
-            String configRootName = "datasource";
-            metrics.produce(new MetricBuildItem(activeCountMetadata,
-                    new AgroalGauge(dataSourceName, "activeCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(maxUsedCountMetadata,
-                    new AgroalGauge(dataSourceName, "maxUsedCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(awaitingCountMetadata,
-                    new AgroalGauge(dataSourceName, "awaitingCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(availableCountMetadata,
-                    new AgroalGauge(dataSourceName, "availableCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(blockingTimeAverageMetadata,
-                    new AgroalGauge(dataSourceName, "blockingTimeAverage"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(blockingTimeMaxMetadata,
-                    new AgroalGauge(dataSourceName, "blockingTimeMax"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(blockingTimeTotalMetadata,
-                    new AgroalGauge(dataSourceName, "blockingTimeTotal"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(creationTimeAverageMetadata,
-                    new AgroalGauge(dataSourceName, "creationTimeAverage"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(creationTimeMaxMetadata,
-                    new AgroalGauge(dataSourceName, "creationTimeMax"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(creationTimeTotalMetadata,
-                    new AgroalGauge(dataSourceName, "creationTimeTotal"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(acquireCountMetadata,
-                    new AgroalCounter(dataSourceName, "acquireCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(creationCountMetadata,
-                    new AgroalCounter(dataSourceName, "creationCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(leakDetectionCountMetadata,
-                    new AgroalCounter(dataSourceName, "leakDetectionCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(destroyCountMetadata,
-                    new AgroalCounter(dataSourceName, "destroyCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(flushCountMetadata,
-                    new AgroalCounter(dataSourceName, "flushCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(invalidCountMetadata,
-                    new AgroalCounter(dataSourceName, "invalidCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-            metrics.produce(new MetricBuildItem(reapCountMetadata,
-                    new AgroalCounter(dataSourceName, "reapCount"),
-                    metricsEnabledForThisDatasource,
-                    configRootName,
-                    tag));
-        }
-    }
 }
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java
index 95d46dc3230be..bff4db9e227e6 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/AgroalMetricsTestCase.java
@@ -39,10 +39,11 @@ public class AgroalMetricsTestCase {
 
     @Test
     public void testMetricsOfDefaultDS() throws SQLException {
-        Counter acquireCount = registry.getCounters().get(new MetricID("agroal.acquire.count",
-                new Tag("datasource", "default")));
-        Gauge<?> maxUsed = registry.getGauges().get(new MetricID("agroal.max.used.count",
-                new Tag("datasource", "default")));
+        Counter acquireCount = registry.getCounters()
+                .get(new MetricID("agroal.acquire.count", new Tag("datasource", "default")));
+        Gauge<?> maxUsed = registry.getGauges()
+                .get(new MetricID("agroal.max.used.count", new Tag("datasource", "default")));
+
         Assertions.assertNotNull(acquireCount, "Agroal metrics should be registered eagerly");
         Assertions.assertNotNull(maxUsed, "Agroal metrics should be registered eagerly");
 
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/CompatibleKindAndDriverDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/CompatibleKindAndDriverDataSourceConfigTest.java
deleted file mode 100644
index 85794a696b2c4..0000000000000
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/CompatibleKindAndDriverDataSourceConfigTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.agroal.test;
-
-import javax.inject.Inject;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.agroal.api.AgroalDataSource;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class CompatibleKindAndDriverDataSourceConfigTest {
-
-    @Inject
-    AgroalDataSource defaultDataSource;
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .withConfigurationResource("compatible-kind-and-driver-datasource.properties");
-
-    @Test
-    public void testApplicationStarts() {
-
-    }
-}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java
index ad3495062885c..6783d51864248 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DefaultDataSourceConfigTest.java
@@ -1,9 +1,11 @@
 package io.quarkus.agroal.test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.entry;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.sql.Connection;
 import java.sql.SQLException;
 import java.time.Duration;
 
@@ -38,7 +40,7 @@ public void testDefaultDataSourceInjection() throws SQLException {
 
     private static void testDataSource(AgroalDataSource dataSource, String username, int minSize, int maxSize,
             int initialSize, Duration backgroundValidationInterval, Duration acquisitionTimeout, Duration leakDetectionInterval,
-            Duration idleRemovalInterval, Duration maxLifetime, String newConnectionSql) throws SQLException {
+            Duration idleRemovalInterval, Duration maxLifetime, String newConnectionSql) {
         AgroalConnectionPoolConfiguration configuration = dataSource.getConfiguration().connectionPoolConfiguration();
         AgroalConnectionFactoryConfiguration agroalConnectionFactoryConfiguration = configuration
                 .connectionFactoryConfiguration();
@@ -59,7 +61,10 @@ private static void testDataSource(AgroalDataSource dataSource, String username,
         assertTrue(agroalConnectionFactoryConfiguration.trackJdbcResources());
         assertTrue(dataSource.getConfiguration().metricsEnabled());
         assertEquals(newConnectionSql, agroalConnectionFactoryConfiguration.initialSql());
-        try (Connection connection = dataSource.getConnection()) {
-        }
+        assertThat(agroalConnectionFactoryConfiguration.jdbcProperties())
+                .contains(
+                        entry("extraProperty1", "extraProperty1Value"),
+                        entry("extraProperty2", "extraProperty2Value"));
+        assertThatCode(() -> dataSource.getConnection().close()).doesNotThrowAnyException();
     }
 }
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DeprecatedDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DeprecatedDataSourceConfigTest.java
new file mode 100644
index 0000000000000..36d73a1bf2c6b
--- /dev/null
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DeprecatedDataSourceConfigTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.agroal.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DeprecatedDataSourceConfigTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-deprecated-config.properties")
+            .assertException(e -> {
+                assertThat(e).isInstanceOf(ConfigurationException.class);
+                assertThat(e)
+                        .hasMessageStartingWith("quarkus.datasource.url and quarkus.datasource.driver have been deprecated");
+            });
+
+    @Test
+    public void deprecatedConfigThrowsException() {
+        // Should not be reached: verify
+        assertTrue(false);
+    }
+
+}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java
index 2152c6ba1e24e..d8a641e6299a1 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/DevModeTestEndpoint.java
@@ -17,10 +17,10 @@
 public class DevModeTestEndpoint {
 
     @GET
-    @Path("/{dataSourceName}/{jdbcUrl}/{username}/{minSize}/{maxSize}")
+    @Path("/{dataSourceName}/{jdbcUrl}/{username}/{maxSize}")
     public String test(@PathParam("dataSourceName") String dataSourceName, @PathParam("jdbcUrl") String jdbcUrl,
             @PathParam("username") String username,
-            @PathParam("minSize") int minSize, @PathParam("maxSize") int maxSize) throws Exception {
+            @PathParam("maxSize") int maxSize) throws Exception {
         AgroalDataSource ds;
         if (dataSourceName.equals("default")) {
             ds = CDI.current().select(AgroalDataSource.class)
@@ -29,7 +29,7 @@ public String test(@PathParam("dataSourceName") String dataSourceName, @PathPara
             ds = CDI.current().select(AgroalDataSource.class, new DataSource.DataSourceLiteral(dataSourceName))
                     .get();
         }
-        testDataSource(dataSourceName, ds, URLDecoder.decode(jdbcUrl, StandardCharsets.UTF_8.name()), username, minSize,
+        testDataSource(dataSourceName, ds, URLDecoder.decode(jdbcUrl, StandardCharsets.UTF_8.name()), username,
                 maxSize);
         return "ok";
     }
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/IncompatibleKindAndDriverDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/IncompatibleKindAndDriverDataSourceConfigTest.java
deleted file mode 100644
index 6e31c46d9b126..0000000000000
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/IncompatibleKindAndDriverDataSourceConfigTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.agroal.test;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-
-public class IncompatibleKindAndDriverDataSourceConfigTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .withConfigurationResource("incompatible-kind-and-driver-datasource.properties")
-            .setExpectedException(RuntimeException.class);
-
-    @Test
-    public void testApplicationShouldNotStart() {
-        fail("Application should not start when db-kind and driver are incompatible");
-    }
-}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/IncompatibleKindAndDriverMultipleDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/IncompatibleKindAndDriverMultipleDataSourceConfigTest.java
deleted file mode 100644
index c47a4342e256e..0000000000000
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/IncompatibleKindAndDriverMultipleDataSourceConfigTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.agroal.test;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-
-public class IncompatibleKindAndDriverMultipleDataSourceConfigTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .withConfigurationResource("incompatible-multiple-datasources.properties")
-            .setExpectedException(RuntimeException.class);
-
-    @Test
-    public void testApplicationShouldNotStart() {
-        fail("Application should not start when db-kind and driver are incompatible");
-    }
-}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/LegacyDefaultDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/LegacyDefaultDataSourceConfigTest.java
deleted file mode 100644
index 8367cd633917b..0000000000000
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/LegacyDefaultDataSourceConfigTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.quarkus.agroal.test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.time.Duration;
-
-import javax.inject.Inject;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.agroal.api.AgroalDataSource;
-import io.agroal.api.configuration.AgroalConnectionFactoryConfiguration;
-import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
-import io.agroal.narayana.NarayanaTransactionIntegration;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class LegacyDefaultDataSourceConfigTest {
-
-    //tag::injection[]
-    @Inject
-    AgroalDataSource defaultDataSource;
-    //end::injection[]
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .withConfigurationResource("legacy-application-default-datasource.properties");
-
-    @Test
-    public void testDefaultDataSourceInjection() throws SQLException {
-        testDataSource(defaultDataSource, "username-default", 3, 13, 7, Duration.ofSeconds(53), Duration.ofSeconds(54),
-                Duration.ofSeconds(55), Duration.ofSeconds(56), Duration.ofSeconds(57),
-                "create schema if not exists schema_default");
-    }
-
-    private static void testDataSource(AgroalDataSource dataSource, String username, int minSize, int maxSize,
-            int initialSize, Duration backgroundValidationInterval, Duration acquisitionTimeout, Duration leakDetectionInterval,
-            Duration idleRemovalInterval, Duration maxLifetime, String newConnectionSql) throws SQLException {
-        AgroalConnectionPoolConfiguration configuration = dataSource.getConfiguration().connectionPoolConfiguration();
-        AgroalConnectionFactoryConfiguration agroalConnectionFactoryConfiguration = configuration
-                .connectionFactoryConfiguration();
-
-        assertEquals("jdbc:h2:tcp://localhost/mem:default", agroalConnectionFactoryConfiguration.jdbcUrl());
-        assertEquals(username, agroalConnectionFactoryConfiguration.principal().getName());
-        assertEquals(minSize, configuration.minSize());
-        assertEquals(maxSize, configuration.maxSize());
-        assertEquals(initialSize, configuration.initialSize());
-        assertEquals(backgroundValidationInterval, configuration.validationTimeout());
-        assertEquals(acquisitionTimeout, configuration.acquisitionTimeout());
-        assertEquals(leakDetectionInterval, configuration.leakTimeout());
-        assertEquals(idleRemovalInterval, configuration.reapTimeout());
-        assertEquals(maxLifetime, configuration.maxLifetime());
-        assertTrue(configuration.transactionIntegration() instanceof NarayanaTransactionIntegration);
-        assertEquals(AgroalConnectionFactoryConfiguration.TransactionIsolation.SERIALIZABLE,
-                agroalConnectionFactoryConfiguration.jdbcTransactionIsolation());
-        assertTrue(agroalConnectionFactoryConfiguration.trackJdbcResources());
-        assertTrue(dataSource.getConfiguration().metricsEnabled());
-        assertEquals(newConnectionSql, agroalConnectionFactoryConfiguration.initialSql());
-        try (Connection connection = dataSource.getConnection()) {
-        }
-    }
-}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/LegacyMultipleDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/LegacyMultipleDataSourcesConfigTest.java
deleted file mode 100644
index 2510247a34e26..0000000000000
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/LegacyMultipleDataSourcesConfigTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.quarkus.agroal.test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.inject.Inject;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.agroal.api.AgroalDataSource;
-import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
-import io.quarkus.agroal.DataSource;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class LegacyMultipleDataSourcesConfigTest {
-
-    //tag::injection[]
-    @Inject
-    AgroalDataSource defaultDataSource;
-
-    @Inject
-    @DataSource("users")
-    AgroalDataSource dataSource1;
-
-    @Inject
-    @DataSource("inventory")
-    AgroalDataSource dataSource2;
-    //end::injection[]
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .withConfigurationResource("legacy-application-multiple-datasources.properties");
-
-    @Test
-    public void testDataSourceInjection() throws SQLException {
-        testDataSource("default", defaultDataSource, "jdbc:h2:tcp://localhost/mem:default", "username-default", 3, 13);
-        testDataSource("users", dataSource1, "jdbc:h2:tcp://localhost/mem:users", "username1", 1, 11);
-        testDataSource("inventory", dataSource2, "jdbc:h2:tcp://localhost/mem:inventory", "username2", 2, 12);
-    }
-
-    private static void testDataSource(String dataSourceName, AgroalDataSource dataSource, String jdbcUrl, String username,
-            int minSize, int maxSize)
-            throws SQLException {
-        AgroalConnectionPoolConfiguration configuration = null;
-
-        try {
-            configuration = dataSource.getConfiguration().connectionPoolConfiguration();
-        } catch (NullPointerException e) {
-            // we catch the NPE here as we have a proxy and we can't test dataSource directly
-            fail("Datasource " + dataSourceName + " should not be null");
-        }
-        assertEquals(jdbcUrl, configuration.connectionFactoryConfiguration().jdbcUrl());
-        assertEquals(username, configuration.connectionFactoryConfiguration().principal().getName());
-        assertEquals(minSize, configuration.minSize());
-        assertEquals(maxSize, configuration.maxSize());
-
-        try (Connection connection = dataSource.getConnection()) {
-        }
-    }
-}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java
index da422852e1319..53618b3a638c5 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigDevModeTest.java
@@ -41,7 +41,7 @@ static void runTest(String dataSourceName, String jdbcUrl, String username,
             int minSize, int maxSize) throws UnsupportedEncodingException {
         RestAssured
                 .get("/test/" + dataSourceName + "/" + URLEncoder.encode(jdbcUrl, StandardCharsets.UTF_8.name()) + "/"
-                        + username + "/" + minSize + "/" + maxSize)
+                        + username + "/" + maxSize)
                 .then()
                 .statusCode(200).body(Matchers.equalTo("ok"));
     }
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java
index f04c48499bd84..cfbb502ae9816 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesConfigTest.java
@@ -38,8 +38,8 @@ public class MultipleDataSourcesConfigTest {
 
     @Test
     public void testDataSourceInjection() throws SQLException {
-        testDataSource("default", defaultDataSource, "jdbc:h2:tcp://localhost/mem:default", "username-default", 3, 13);
-        testDataSource("users", dataSource1, "jdbc:h2:tcp://localhost/mem:users", "username1", 1, 11);
-        testDataSource("inventory", dataSource2, "jdbc:h2:tcp://localhost/mem:inventory", "username2", 2, 12);
+        testDataSource("default", defaultDataSource, "jdbc:h2:tcp://localhost/mem:default", "username-default", 13);
+        testDataSource("users", dataSource1, "jdbc:h2:tcp://localhost/mem:users", "username1", 11);
+        testDataSource("inventory", dataSource2, "jdbc:h2:tcp://localhost/mem:inventory", "username2", 12);
     }
 }
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java
index 22bcff740a32d..cd68fa18cac32 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesErroneousButWorkingConfigTest.java
@@ -36,9 +36,9 @@ public class MultipleDataSourcesErroneousButWorkingConfigTest {
 
     @Test
     public void testDataSourceInjection() throws SQLException {
-        testDataSource("default", defaultDataSource, "jdbc:h2:tcp://localhost/mem:default", "username-default", 3, 13);
-        testDataSource("users", dataSource1, "jdbc:h2:tcp://localhost/mem:users", "username1", 1, 11);
-        testDataSource("inventory", dataSource2, "jdbc:h2:tcp://localhost/mem:inventory", "username2", 2, 12);
+        testDataSource("default", defaultDataSource, "jdbc:h2:tcp://localhost/mem:default", "username-default", 13);
+        testDataSource("users", dataSource1, "jdbc:h2:tcp://localhost/mem:users", "username1", 11);
+        testDataSource("inventory", dataSource2, "jdbc:h2:tcp://localhost/mem:inventory", "username2", 12);
     }
 
 }
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesTestUtil.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesTestUtil.java
index b30233373afc6..080b09afbc07c 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesTestUtil.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDataSourcesTestUtil.java
@@ -15,7 +15,7 @@ private MultipleDataSourcesTestUtil() {
     }
 
     static void testDataSource(String dataSourceName, AgroalDataSource dataSource, String jdbcUrl, String username,
-            int minSize, int maxSize)
+            int maxSize)
             throws SQLException {
         AgroalConnectionPoolConfiguration configuration = null;
 
@@ -27,7 +27,6 @@ static void testDataSource(String dataSourceName, AgroalDataSource dataSource, S
         }
         assertEquals(jdbcUrl, configuration.connectionFactoryConfiguration().jdbcUrl());
         assertEquals(username, configuration.connectionFactoryConfiguration().principal().getName());
-        assertEquals(minSize, configuration.minSize());
         assertEquals(maxSize, configuration.maxSize());
 
         try (Connection connection = dataSource.getConnection()) {
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java
new file mode 100644
index 0000000000000..19fec44312d04
--- /dev/null
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/MultipleDevServicesDataSourcesConfigTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.agroal.test;
+
+import static io.quarkus.agroal.test.MultipleDataSourcesTestUtil.testDataSource;
+
+import java.sql.SQLException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultipleDevServicesDataSourcesConfigTest {
+
+    //tag::injection[]
+    @Inject
+    AgroalDataSource defaultDataSource;
+
+    @Inject
+    @DataSource("users")
+    AgroalDataSource dataSource1;
+
+    @Inject
+    @DataSource("inventory")
+    AgroalDataSource dataSource2;
+    //end::injection[]
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MultipleDataSourcesTestUtil.class))
+            .withConfigurationResource("application-multiple-devservices-datasources.properties");
+
+    @Test
+    public void testDataSourceInjection() throws SQLException {
+        testDataSource("default", defaultDataSource,
+                "jdbc:h2:tcp://localhost:" + extractPort(defaultDataSource) + "/mem:default;DB_CLOSE_DELAY=-1", "sa", 20);
+        testDataSource("users", dataSource1,
+                "jdbc:h2:tcp://localhost:" + extractPort(dataSource1) + "/mem:users;DB_CLOSE_DELAY=-1", "sa", 20);
+        testDataSource("inventory", dataSource2,
+                "jdbc:h2:tcp://localhost:" + extractPort(dataSource2) + "/mem:inventory;DB_CLOSE_DELAY=-1", "sa", 20);
+    }
+
+    public int extractPort(AgroalDataSource ds) {
+        String url = ds.getConfiguration().connectionPoolConfiguration().connectionFactoryConfiguration().jdbcUrl();
+        Matcher matcher = Pattern.compile("jdbc:h2:tcp://localhost:(\\d+)/").matcher(url);
+        matcher.find();
+        return Integer.parseInt(matcher.group(1));
+    }
+}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java
index 4e4515e80247b..0fd72eeccf9be 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NamedDataSourceConfigTest.java
@@ -45,7 +45,6 @@ private static void dataSourceAssert(String dataSourceName, AgroalDataSource dat
         }
         assertEquals(jdbcUrl, configuration.connectionFactoryConfiguration().jdbcUrl());
         assertEquals(username, configuration.connectionFactoryConfiguration().principal().getName());
-        assertEquals(minSize, configuration.minSize());
         assertEquals(maxSize, configuration.maxSize());
         assertFalse(dataSource.getConfiguration().metricsEnabled()); // metrics not enabled by default
 
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoSuitableDriverTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoSuitableDriverTest.java
new file mode 100644
index 0000000000000..da7d8f6072823
--- /dev/null
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoSuitableDriverTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.agroal.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoSuitableDriverTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-no-suitable-driver.properties")
+            .assertException(t -> {
+                assertEquals(ConfigurationException.class, t.getClass());
+                assertThat(t).hasMessageStartingWith("Unable to find a JDBC driver corresponding to the database kind");
+            });
+
+    @Test
+    public void noSuitableDriver() {
+        // Should not be reached: verify
+        assertTrue(false);
+    }
+
+}
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java
index 1cbb9e5042204..20a8b2dd85e68 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/PoolLessTestCase.java
@@ -31,8 +31,8 @@ public void testConnectionDisposal() throws SQLException {
             }
         }
 
-        // Assert there are no connections on the pool
-        Assertions.assertEquals(0L, defaultDS.getMetrics().availableCount());
+        // Assert there are no connections in the pool
+        Assertions.assertEquals(0L, defaultDS.getMetrics().activeCount());
 
         Assertions.assertEquals(1L, defaultDS.getMetrics().creationCount());
         Assertions.assertEquals(1L, defaultDS.getMetrics().acquireCount());
diff --git a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java
index f3b5d4665ab5b..b5a5e602e85b5 100644
--- a/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java
+++ b/extensions/agroal/deployment/src/test/java/io/quarkus/agroal/test/UnknownDriverConfigTest.java
@@ -43,7 +43,6 @@ private static void testDataSource(AgroalDataSource dataSource, String username,
 
         assertEquals("jdbc:h2:tcp://localhost/mem:default", agroalConnectionFactoryConfiguration.jdbcUrl());
         assertEquals(username, agroalConnectionFactoryConfiguration.principal().getName());
-        assertEquals(minSize, configuration.minSize());
         assertEquals(maxSize, configuration.maxSize());
         assertEquals(initialSize, configuration.initialSize());
         assertEquals(backgroundValidationInterval, configuration.validationTimeout());
diff --git a/extensions/agroal/deployment/src/test/resources/application-default-datasource-unknown-driver.properties b/extensions/agroal/deployment/src/test/resources/application-default-datasource-unknown-driver.properties
index c053b993880f6..c736df20c1c69 100644
--- a/extensions/agroal/deployment/src/test/resources/application-default-datasource-unknown-driver.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-default-datasource-unknown-driver.properties
@@ -3,11 +3,10 @@ quarkus.datasource.username=username-default
 
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
 quarkus.datasource.jdbc.driver=org.h2.Driver
-quarkus.datasource.jdbc.min-size=3
 quarkus.datasource.jdbc.max-size=13
+quarkus.datasource.jdbc.initial-size=7
 quarkus.datasource.jdbc.enable-metrics=true
 
-quarkus.datasource.jdbc.initial-size=7
 quarkus.datasource.jdbc.background-validation-interval=53
 quarkus.datasource.jdbc.acquisition-timeout=54
 quarkus.datasource.jdbc.leak-detection-interval=55
diff --git a/extensions/agroal/deployment/src/test/resources/application-default-datasource.properties b/extensions/agroal/deployment/src/test/resources/application-default-datasource.properties
index 81ba3f917e392..83ff238367387 100644
--- a/extensions/agroal/deployment/src/test/resources/application-default-datasource.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-default-datasource.properties
@@ -1,17 +1,17 @@
-#tag::basic[]
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
 quarkus.datasource.jdbc.min-size=3
+quarkus.datasource.jdbc.initial-size=7
 quarkus.datasource.jdbc.max-size=13
 quarkus.datasource.jdbc.enable-metrics=true
-#end::basic[]
-quarkus.datasource.jdbc.initial-size=7
 quarkus.datasource.jdbc.background-validation-interval=53
 quarkus.datasource.jdbc.acquisition-timeout=54
 quarkus.datasource.jdbc.leak-detection-interval=55
 quarkus.datasource.jdbc.idle-removal-interval=56
 quarkus.datasource.jdbc.max-lifetime=57
 quarkus.datasource.jdbc.transaction-isolation-level=serializable
-quarkus.datasource.jdbc.new-connection-sql=create schema if not exists schema_default
\ No newline at end of file
+quarkus.datasource.jdbc.new-connection-sql=create schema if not exists schema_default
+quarkus.datasource.jdbc.additional-jdbc-properties.extraProperty1=extraProperty1Value
+quarkus.datasource.jdbc.additional-jdbc-properties.extraProperty2=extraProperty2Value
\ No newline at end of file
diff --git a/extensions/agroal/deployment/src/test/resources/application-deprecated-config.properties b/extensions/agroal/deployment/src/test/resources/application-deprecated-config.properties
new file mode 100644
index 0000000000000..fed3e2f0a4108
--- /dev/null
+++ b/extensions/agroal/deployment/src/test/resources/application-deprecated-config.properties
@@ -0,0 +1,4 @@
+quarkus.datasource.driver=org.h2.Driver
+quarkus.datasource.username=username-default
+quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:default
+quarkus.datasource.max-size=13
diff --git a/extensions/agroal/deployment/src/test/resources/application-metrics-enabled.properties b/extensions/agroal/deployment/src/test/resources/application-metrics-enabled.properties
index 0c0b871f538ae..5729cf306aa86 100644
--- a/extensions/agroal/deployment/src/test/resources/application-metrics-enabled.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-metrics-enabled.properties
@@ -1,17 +1,15 @@
 quarkus.datasource.metrics.enabled=true
 
 # default ds
-quarkus.datasource.enable-metrics=true
-quarkus.datasource.url=jdbc:h2:mem:defaultdb
-quarkus.datasource.driver=org.h2.Driver
+quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username1
-quarkus.datasource.min-size=3
-quarkus.datasource.max-size=13
+quarkus.datasource.jdbc.url=jdbc:h2:mem:defaultdb
+quarkus.datasource.jdbc.max-size=13
+quarkus.datasource.jdbc.enable-metrics=true
 
 # another ds
-quarkus.datasource.ds1.enable-metrics=true
-quarkus.datasource.ds1.url=jdbc:h2:mem:db1
-quarkus.datasource.ds1.driver=org.h2.Driver
+quarkus.datasource.ds1.db-kind=h2
 quarkus.datasource.ds1.username=username1
-quarkus.datasource.ds1.min-size=3
-quarkus.datasource.ds1.max-size=13
\ No newline at end of file
+quarkus.datasource.ds1.jdbc.url=jdbc:h2:mem:db1
+quarkus.datasource.ds1.jdbc.max-size=13
+quarkus.datasource.ds1.jdbc.enable-metrics=true
\ No newline at end of file
diff --git a/extensions/agroal/deployment/src/test/resources/application-multiple-datasources-erroneous-but-working.properties b/extensions/agroal/deployment/src/test/resources/application-multiple-datasources-erroneous-but-working.properties
index ba211b4d09300..b0b0dd55dd85f 100644
--- a/extensions/agroal/deployment/src/test/resources/application-multiple-datasources-erroneous-but-working.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-multiple-datasources-erroneous-but-working.properties
@@ -1,19 +1,16 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
 quarkus.datasource.jdbc.max-size=13
 
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.driver=org.h2.Driver
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.driver=org.h2.Driver
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
diff --git a/extensions/agroal/deployment/src/test/resources/application-multiple-datasources.properties b/extensions/agroal/deployment/src/test/resources/application-multiple-datasources.properties
index fdcdde17599fc..a56b071e0abcf 100644
--- a/extensions/agroal/deployment/src/test/resources/application-multiple-datasources.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-multiple-datasources.properties
@@ -1,19 +1,16 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username-default
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
 quarkus.datasource.jdbc.max-size=13
 
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.driver=org.h2.Driver
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.driver=org.h2.Driver
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
diff --git a/extensions/agroal/deployment/src/test/resources/application-multiple-devservices-datasources.properties b/extensions/agroal/deployment/src/test/resources/application-multiple-devservices-datasources.properties
new file mode 100644
index 0000000000000..3101fa09fec0c
--- /dev/null
+++ b/extensions/agroal/deployment/src/test/resources/application-multiple-devservices-datasources.properties
@@ -0,0 +1,2 @@
+quarkus.datasource.users.devservices=true
+quarkus.datasource.inventory.devservices=true
diff --git a/extensions/agroal/deployment/src/test/resources/application-named-datasource.properties b/extensions/agroal/deployment/src/test/resources/application-named-datasource.properties
index f0eee864fc8a6..df9feff733394 100644
--- a/extensions/agroal/deployment/src/test/resources/application-named-datasource.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-named-datasource.properties
@@ -2,5 +2,4 @@ quarkus.datasource.testing.db-kind=h2
 quarkus.datasource.testing.username=username-named
 quarkus.datasource.testing.jdbc.url=jdbc:h2:tcp://localhost/mem:testing
 quarkus.datasource.testing.jdbc.driver=org.h2.Driver
-quarkus.datasource.testing.jdbc.min-size=3
 quarkus.datasource.testing.jdbc.max-size=13
diff --git a/extensions/agroal/deployment/src/test/resources/application-no-suitable-driver.properties b/extensions/agroal/deployment/src/test/resources/application-no-suitable-driver.properties
new file mode 100644
index 0000000000000..08161477c2aef
--- /dev/null
+++ b/extensions/agroal/deployment/src/test/resources/application-no-suitable-driver.properties
@@ -0,0 +1,3 @@
+quarkus.datasource.db-kind=no-suitable-driver
+quarkus.datasource.username=username-named
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:testing
diff --git a/extensions/agroal/deployment/src/test/resources/application-pool-interception.properties b/extensions/agroal/deployment/src/test/resources/application-pool-interception.properties
index d67e193a8905d..4f4b26aead078 100644
--- a/extensions/agroal/deployment/src/test/resources/application-pool-interception.properties
+++ b/extensions/agroal/deployment/src/test/resources/application-pool-interception.properties
@@ -1,23 +1,20 @@
 # default ds
-quarkus.datasource.url=jdbc:h2:mem:db0;
-quarkus.datasource.driver=org.h2.Driver
+quarkus.datasource.db-kind=h2
 quarkus.datasource.username=username1
-quarkus.datasource.min-size=0
-quarkus.datasource.max-size=2
-quarkus.datasource.new-connection-sql=CREATE SCHEMA IF NOT EXISTS INTERCEPTOR;
+quarkus.datasource.jdbc.url=jdbc:h2:mem:db0;
+quarkus.datasource.jdbc.max-size=2
+quarkus.datasource.jdbc.new-connection-sql=CREATE SCHEMA IF NOT EXISTS INTERCEPTOR;
 
 # another ds
-quarkus.datasource.another.url=jdbc:h2:mem:db1
-quarkus.datasource.another.driver=org.h2.Driver
+quarkus.datasource.another.db-kind=h2
 quarkus.datasource.another.username=username1
-quarkus.datasource.another.min-size=0
-quarkus.datasource.another.max-size=2
-quarkus.datasource.another.new-connection-sql=CREATE SCHEMA IF NOT EXISTS LOW; CREATE SCHEMA IF NOT EXISTS PRIORITY;
+quarkus.datasource.another.jdbc.url=jdbc:h2:mem:db1
+quarkus.datasource.another.jdbc.max-size=2
+quarkus.datasource.another.jdbc.new-connection-sql=CREATE SCHEMA IF NOT EXISTS LOW; CREATE SCHEMA IF NOT EXISTS PRIORITY;
 
 # a ds that does not have interception
-quarkus.datasource.pure.url=jdbc:h2:mem:db2
-quarkus.datasource.pure.driver=org.h2.Driver
+quarkus.datasource.pure.db-kind=h2
 quarkus.datasource.pure.username=username1
-quarkus.datasource.pure.min-size=0
-quarkus.datasource.pure.max-size=2
-quarkus.datasource.pure.new-connection-sql=CREATE SCHEMA IF NOT EXISTS PURE;
+quarkus.datasource.pure.jdbc.url=jdbc:h2:mem:db2
+quarkus.datasource.pure.jdbc.max-size=2
+quarkus.datasource.pure.jdbc.new-connection-sql=CREATE SCHEMA IF NOT EXISTS PURE;
diff --git a/extensions/agroal/deployment/src/test/resources/compatible-kind-and-driver-datasource.properties b/extensions/agroal/deployment/src/test/resources/compatible-kind-and-driver-datasource.properties
deleted file mode 100644
index fc9fdf9e18491..0000000000000
--- a/extensions/agroal/deployment/src/test/resources/compatible-kind-and-driver-datasource.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.username=username-default
-
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
-quarkus.datasource.jdbc.max-size=13
-quarkus.datasource.jdbc.enable-metrics=true
diff --git a/extensions/agroal/deployment/src/test/resources/incompatible-kind-and-driver-datasource.properties b/extensions/agroal/deployment/src/test/resources/incompatible-kind-and-driver-datasource.properties
deleted file mode 100644
index 8344e9da33c09..0000000000000
--- a/extensions/agroal/deployment/src/test/resources/incompatible-kind-and-driver-datasource.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.driver=org.postgresql.Driver
-quarkus.datasource.username=username-default
-
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
-quarkus.datasource.jdbc.max-size=13
-quarkus.datasource.jdbc.enable-metrics=true
diff --git a/extensions/agroal/deployment/src/test/resources/incompatible-multiple-datasources.properties b/extensions/agroal/deployment/src/test/resources/incompatible-multiple-datasources.properties
deleted file mode 100644
index ceb1dc67f953e..0000000000000
--- a/extensions/agroal/deployment/src/test/resources/incompatible-multiple-datasources.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.username=username-default
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.jdbc.min-size=3
-quarkus.datasource.jdbc.max-size=13
-
-quarkus.datasource.users.db-kind=h2
-quarkus.datasource.users.username=username1
-quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
-quarkus.datasource.users.jdbc.max-size=11
-
-quarkus.datasource.inventory.db-kind=h2
-quarkus.datasource.inventory.driver=org.postgresql.Driver
-quarkus.datasource.inventory.username=username2
-quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
-quarkus.datasource.inventory.jdbc.max-size=12
diff --git a/extensions/agroal/deployment/src/test/resources/legacy-application-default-datasource.properties b/extensions/agroal/deployment/src/test/resources/legacy-application-default-datasource.properties
deleted file mode 100644
index 74d72ce5e6dfb..0000000000000
--- a/extensions/agroal/deployment/src/test/resources/legacy-application-default-datasource.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#tag::basic[]
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.username=username-default
-quarkus.datasource.min-size=3
-quarkus.datasource.max-size=13
-quarkus.datasource.enable-metrics=true
-#end::basic[]
-quarkus.datasource.initial-size=7
-quarkus.datasource.background-validation-interval=53
-quarkus.datasource.acquisition-timeout=54
-quarkus.datasource.leak-detection-interval=55
-quarkus.datasource.idle-removal-interval=56
-quarkus.datasource.max-lifetime=57
-quarkus.datasource.transaction-isolation-level=serializable
-quarkus.datasource.new-connection-sql=create schema if not exists schema_default
\ No newline at end of file
diff --git a/extensions/agroal/deployment/src/test/resources/legacy-application-multiple-datasources.properties b/extensions/agroal/deployment/src/test/resources/legacy-application-multiple-datasources.properties
deleted file mode 100644
index 98fc934def1e7..0000000000000
--- a/extensions/agroal/deployment/src/test/resources/legacy-application-multiple-datasources.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:default
-quarkus.datasource.username=username-default
-quarkus.datasource.min-size=3
-quarkus.datasource.max-size=13
-
-quarkus.datasource.users.driver=org.h2.Driver
-quarkus.datasource.users.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.username=username1
-quarkus.datasource.users.min-size=1
-quarkus.datasource.users.max-size=11
-
-quarkus.datasource.inventory.driver=org.h2.Driver
-quarkus.datasource.inventory.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.username=username2
-quarkus.datasource.inventory.min-size=2
-quarkus.datasource.inventory.max-size=12
diff --git a/extensions/agroal/pom.xml b/extensions/agroal/pom.xml
index 8a54c82f8d120..2ebcce6c78b23 100644
--- a/extensions/agroal/pom.xml
+++ b/extensions/agroal/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/agroal/runtime/pom.xml b/extensions/agroal/runtime/pom.xml
index 1ee243105ee45..54183eb20ebf2 100644
--- a/extensions/agroal/runtime/pom.xml
+++ b/extensions/agroal/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-agroal-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,6 +32,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Add the health extension as optional as we will produce the health check only if it's included -->
@@ -41,11 +41,6 @@
             <artifactId>quarkus-smallrye-health</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
-            <optional>true</optional>
-        </dependency>
 
         <dependency>
             <groupId>org.jboss.narayana.jta</groupId>
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java
index 7afac46f239e7..cdf7ea6fde4e6 100644
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/DataSource.java
@@ -24,7 +24,7 @@
 
     String value();
 
-    class DataSourceLiteral extends AnnotationLiteral<DataSource> implements DataSource {
+    public class DataSourceLiteral extends AnnotationLiteral<DataSource> implements DataSource {
 
         private String name;
 
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java
index 26aa1715184f1..2b9c324b2a263 100644
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java
@@ -29,8 +29,8 @@ public class DataSourceJdbcBuildTimeConfig {
     public TransactionIntegration transactions = TransactionIntegration.ENABLED;
 
     /**
-     * Enable datasource metrics collection. If unspecified, collecting metrics will be enabled by default if the
-     * smallrye-metrics extension is active.
+     * Enable datasource metrics collection. If unspecified, collecting metrics will be enabled by default if
+     * a metrics extension is active.
      */
     @ConfigItem
     public Optional<Boolean> enableMetrics = Optional.empty();
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java
index 5b9c310b44676..34c7556b662c5 100644
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java
@@ -1,6 +1,7 @@
 package io.quarkus.agroal.runtime;
 
 import java.time.Duration;
+import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
 
@@ -103,4 +104,11 @@ public class DataSourceJdbcRuntimeConfig {
      */
     @ConfigItem(defaultValue = "true")
     public boolean poolingEnabled = true;
+
+    /**
+     * Other unspecified properties to be passed to the JDBC driver when creating new connections.
+     */
+    @ConfigItem
+    public Map<String, String> additionalJdbcProperties;
+
 }
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceSupport.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceSupport.java
index 471598fa0dd15..455d53ee144a4 100644
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceSupport.java
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceSupport.java
@@ -23,18 +23,16 @@ public static class Entry {
         public String dataSourceName;
         public String resolvedDbKind;
         public String resolvedDriverClass;
-        public boolean isLegacy;
         public boolean isDefault;
 
         public Entry() {
         }
 
-        public Entry(String dataSourceName, String resolvedDbKind, String resolvedDriverClass, boolean isLegacy,
+        public Entry(String dataSourceName, String resolvedDbKind, String resolvedDriverClass,
                 boolean isDefault) {
             this.dataSourceName = dataSourceName;
             this.resolvedDbKind = resolvedDbKind;
             this.resolvedDriverClass = resolvedDriverClass;
-            this.isLegacy = isLegacy;
             this.isDefault = isDefault;
         }
     }
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java
index 66c86d87c01bb..411f2aed72677 100644
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSources.java
@@ -5,6 +5,7 @@
 import java.sql.Statement;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -46,9 +47,6 @@
 import io.quarkus.datasource.runtime.DataSourceRuntimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourceRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourcesRuntimeConfig;
-import io.quarkus.runtime.configuration.ConfigurationException;
 
 /**
  * This class is sort of a producer for {@link AgroalDataSource}.
@@ -59,7 +57,6 @@
  * {@link AgroalRecorder#agroalDataSourceSupplier(String, DataSourcesRuntimeConfig)})
  * in order to produce the actual {@code AgroalDataSource} objects.
  */
-@SuppressWarnings("deprecation")
 @Singleton
 public class DataSources {
 
@@ -69,9 +66,6 @@ public class DataSources {
     private final DataSourcesRuntimeConfig dataSourcesRuntimeConfig;
     private final DataSourcesJdbcBuildTimeConfig dataSourcesJdbcBuildTimeConfig;
     private final DataSourcesJdbcRuntimeConfig dataSourcesJdbcRuntimeConfig;
-    private final LegacyDataSourcesJdbcBuildTimeConfig legacyDataSourcesJdbcBuildTimeConfig;
-    private final LegacyDataSourcesRuntimeConfig legacyDataSourcesRuntimeConfig;
-    private final LegacyDataSourcesJdbcRuntimeConfig legacyDataSourcesJdbcRuntimeConfig;
     private final TransactionManager transactionManager;
     private final TransactionSynchronizationRegistry transactionSynchronizationRegistry;
     private final DataSourceSupport dataSourceSupport;
@@ -82,18 +76,13 @@ public class DataSources {
     public DataSources(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
             DataSourcesRuntimeConfig dataSourcesRuntimeConfig, DataSourcesJdbcBuildTimeConfig dataSourcesJdbcBuildTimeConfig,
             DataSourcesJdbcRuntimeConfig dataSourcesJdbcRuntimeConfig,
-            LegacyDataSourcesJdbcBuildTimeConfig legacyDataSourcesJdbcBuildTimeConfig,
-            LegacyDataSourcesRuntimeConfig legacyDataSourcesRuntimeConfig,
-            LegacyDataSourcesJdbcRuntimeConfig legacyDataSourcesJdbcRuntimeConfig, TransactionManager transactionManager,
+            TransactionManager transactionManager,
             TransactionSynchronizationRegistry transactionSynchronizationRegistry, DataSourceSupport dataSourceSupport,
             @Any Instance<AgroalPoolInterceptor> agroalPoolInterceptors) {
         this.dataSourcesBuildTimeConfig = dataSourcesBuildTimeConfig;
         this.dataSourcesRuntimeConfig = dataSourcesRuntimeConfig;
         this.dataSourcesJdbcBuildTimeConfig = dataSourcesJdbcBuildTimeConfig;
         this.dataSourcesJdbcRuntimeConfig = dataSourcesJdbcRuntimeConfig;
-        this.legacyDataSourcesJdbcBuildTimeConfig = legacyDataSourcesJdbcBuildTimeConfig;
-        this.legacyDataSourcesRuntimeConfig = legacyDataSourcesRuntimeConfig;
-        this.legacyDataSourcesJdbcRuntimeConfig = legacyDataSourcesJdbcRuntimeConfig;
         this.transactionManager = transactionManager;
         this.transactionSynchronizationRegistry = transactionSynchronizationRegistry;
         this.dataSourceSupport = dataSourceSupport;
@@ -133,48 +122,19 @@ public AgroalDataSource doCreateDataSource(String dataSourceName) {
         DataSourceJdbcBuildTimeConfig dataSourceJdbcBuildTimeConfig = getDataSourceJdbcBuildTimeConfig(dataSourceName);
         DataSourceRuntimeConfig dataSourceRuntimeConfig = getDataSourceRuntimeConfig(dataSourceName);
         DataSourceJdbcRuntimeConfig dataSourceJdbcRuntimeConfig = getDataSourceJdbcRuntimeConfig(dataSourceName);
-        LegacyDataSourceJdbcBuildTimeConfig legacyDataSourceJdbcBuildTimeConfig = getLegacyDataSourceJdbcBuildTimeConfig(
-                dataSourceName);
-        LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig = getLegacyDataSourceRuntimeConfig(dataSourceName);
-        LegacyDataSourceJdbcRuntimeConfig legacyDataSourceJdbcRuntimeConfig = getLegacyDataSourceJdbcRuntimeConfig(
-                dataSourceName);
 
         DataSourceSupport.Entry matchingSupportEntry = dataSourceSupport.entries.get(dataSourceName);
-        boolean isLegacy = matchingSupportEntry.isLegacy;
-        if (!isLegacy) {
-            if (!dataSourceJdbcRuntimeConfig.url.isPresent()) {
-                String errorMessage;
-                if (!legacyDataSourceRuntimeConfig.url.isPresent()) {
-                    // we don't have any URL configuration so using a standard message
-                    if (DataSourceUtil.isDefault(dataSourceName)) {
-                        errorMessage = "quarkus.datasource.jdbc.url has not been defined";
-                    } else {
-                        errorMessage = "quarkus.datasource." + dataSourceName + ".jdbc.url has not been defined";
-                    }
-                } else {
-                    // the user mixed legacy configuration and the new style, let's use an appropriate message
-                    if (DataSourceUtil.isDefault(dataSourceName)) {
-                        errorMessage = "Using legacy quarkus.datasource.url with a db-kind is not supported, please use "
-                                + " quarkus.datasource.jdbc.url instead. See https://quarkus.io/guides/datasource for more information.";
-                    } else {
-                        errorMessage = "Using legacy quarkus.datasource." + dataSourceName
-                                + ".url with a db-kind is not supported, please use "
-                                + "quarkus.datasource." + dataSourceName + ".jdbc.url "
-                                + "instead. See https://quarkus.io/guides/datasource for more information.";
-                    }
-                }
-                throw new ConfigurationException(errorMessage);
-            }
-        } else {
-            if (!legacyDataSourceRuntimeConfig.url.isPresent()) {
-                String errorMessage;
-                if (DataSourceUtil.isDefault(dataSourceName)) {
-                    errorMessage = "quarkus.datasource.url has not been defined";
-                } else {
-                    errorMessage = "quarkus.datasource." + dataSourceName + ".url has not been defined";
-                }
-                throw new ConfigurationException(errorMessage);
+        if (!dataSourceJdbcRuntimeConfig.url.isPresent()) {
+            String errorMessage;
+            // we don't have any URL configuration so using a standard message
+            if (DataSourceUtil.isDefault(dataSourceName)) {
+                errorMessage = "quarkus.datasource.jdbc.url has not been defined";
+            } else {
+                errorMessage = "quarkus.datasource." + dataSourceName + ".jdbc.url has not been defined";
             }
+            //this is not an error situation, because we want to allow the situation where a JDBC extension
+            //is installed but has not been configured
+            return new UnconfiguredDataSource(errorMessage);
         }
 
         // we first make sure that all available JDBC drivers are loaded in the current TCCL
@@ -206,14 +166,8 @@ public AgroalDataSource doCreateDataSource(String dataSourceName) {
                 .connectionFactoryConfiguration();
 
         boolean mpMetricsPresent = dataSourceSupport.mpMetricsPresent;
-        if (!isLegacy) {
-            applyNewConfiguration(dataSourceConfiguration, poolConfiguration, connectionFactoryConfiguration, driver,
-                    dataSourceJdbcBuildTimeConfig, dataSourceRuntimeConfig, dataSourceJdbcRuntimeConfig, mpMetricsPresent);
-        } else {
-            applyLegacyConfiguration(dataSourceConfiguration, poolConfiguration, connectionFactoryConfiguration, driver,
-                    dataSourceRuntimeConfig, legacyDataSourceJdbcBuildTimeConfig, legacyDataSourceRuntimeConfig,
-                    legacyDataSourceJdbcRuntimeConfig, mpMetricsPresent);
-        }
+        applyNewConfiguration(dataSourceConfiguration, poolConfiguration, connectionFactoryConfiguration, driver,
+                dataSourceJdbcBuildTimeConfig, dataSourceRuntimeConfig, dataSourceJdbcRuntimeConfig, mpMetricsPresent);
 
         if (dataSourceSupport.disableSslSupport) {
             if (agroalConnectionConfigurerHandle.isAvailable()) {
@@ -298,6 +252,11 @@ private void applyNewConfiguration(AgroalDataSourceConfigurationSupplier dataSou
                     .credential(new AgroalVaultCredentialsProviderPassword(name, credentialsProvider));
         }
 
+        // Extra JDBC properties
+        for (Map.Entry<String, String> entry : dataSourceJdbcRuntimeConfig.additionalJdbcProperties.entrySet()) {
+            connectionFactoryConfiguration.jdbcProperty(entry.getKey(), entry.getValue());
+        }
+
         // Pool size configuration:
         poolConfiguration.minSize(dataSourceJdbcRuntimeConfig.minSize);
         poolConfiguration.maxSize(dataSourceJdbcRuntimeConfig.maxSize);
@@ -340,105 +299,6 @@ public boolean isValid(Connection connection) {
         }
     }
 
-    private void applyLegacyConfiguration(AgroalDataSourceConfigurationSupplier dataSourceConfiguration,
-            AgroalConnectionPoolConfigurationSupplier poolConfiguration,
-            AgroalConnectionFactoryConfigurationSupplier connectionFactoryConfiguration, Class<?> driver,
-            DataSourceRuntimeConfig dataSourceRuntimeConfig,
-            LegacyDataSourceJdbcBuildTimeConfig legacyDataSourceJdbcBuildTimeConfig,
-            LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig,
-            LegacyDataSourceJdbcRuntimeConfig legacyDataSourceJdbcRuntimeConfig, boolean mpMetricsPresent) {
-        connectionFactoryConfiguration.jdbcUrl(legacyDataSourceRuntimeConfig.url.get());
-        connectionFactoryConfiguration.connectionProviderClass(driver);
-        connectionFactoryConfiguration.trackJdbcResources(legacyDataSourceJdbcRuntimeConfig.detectStatementLeaks);
-
-        if (legacyDataSourceJdbcRuntimeConfig.transactionIsolationLevel.isPresent()) {
-            connectionFactoryConfiguration
-                    .jdbcTransactionIsolation(
-                            legacyDataSourceJdbcRuntimeConfig.transactionIsolationLevel.get());
-        }
-
-        if (legacyDataSourceJdbcBuildTimeConfig.transactions != io.quarkus.agroal.runtime.TransactionIntegration.DISABLED) {
-            TransactionIntegration txIntegration = new NarayanaTransactionIntegration(transactionManager,
-                    transactionSynchronizationRegistry);
-            poolConfiguration.transactionIntegration(txIntegration);
-        }
-
-        // New connection SQL
-        if (legacyDataSourceJdbcRuntimeConfig.newConnectionSql.isPresent()) {
-            connectionFactoryConfiguration.initialSql(legacyDataSourceJdbcRuntimeConfig.newConnectionSql.get());
-        }
-
-        // metrics
-        if (legacyDataSourceJdbcBuildTimeConfig.enableMetrics.isPresent()) {
-            dataSourceConfiguration.metricsEnabled(legacyDataSourceJdbcBuildTimeConfig.enableMetrics.get());
-        } else {
-            // if the enable-metrics property is unspecified, treat it as true if MP Metrics are being exposed
-            dataSourceConfiguration.metricsEnabled(dataSourcesBuildTimeConfig.metricsEnabled && mpMetricsPresent);
-        }
-
-        // Authentication
-        if (dataSourceRuntimeConfig.username.isPresent()) {
-            connectionFactoryConfiguration
-                    .principal(new NamePrincipal(dataSourceRuntimeConfig.username.get()));
-        }
-        if (dataSourceRuntimeConfig.password.isPresent()) {
-            connectionFactoryConfiguration
-                    .credential(new SimplePassword(dataSourceRuntimeConfig.password.get()));
-        }
-
-        // credentials provider
-        if (dataSourceRuntimeConfig.credentialsProvider.isPresent()) {
-            String beanName = dataSourceRuntimeConfig.credentialsProviderName.orElse(null);
-            CredentialsProvider credentialsProvider = CredentialsProviderFinder.find(beanName);
-
-            String name = dataSourceRuntimeConfig.credentialsProvider.get();
-            connectionFactoryConfiguration
-                    .credential(new AgroalVaultCredentialsProviderPassword(name, credentialsProvider));
-        }
-
-        // Pool size configuration:
-        poolConfiguration.minSize(legacyDataSourceJdbcRuntimeConfig.minSize);
-        poolConfiguration.maxSize(legacyDataSourceRuntimeConfig.maxSize);
-        if (legacyDataSourceJdbcRuntimeConfig.initialSize.isPresent()
-                && legacyDataSourceJdbcRuntimeConfig.initialSize.get() > 0) {
-            poolConfiguration.initialSize(legacyDataSourceJdbcRuntimeConfig.initialSize.get());
-        }
-
-        // Connection management
-        poolConfiguration.connectionValidator(ConnectionValidator.defaultValidator());
-        if (legacyDataSourceJdbcRuntimeConfig.acquisitionTimeout.isPresent()) {
-            poolConfiguration.acquisitionTimeout(legacyDataSourceJdbcRuntimeConfig.acquisitionTimeout.get());
-        }
-        if (legacyDataSourceJdbcRuntimeConfig.backgroundValidationInterval.isPresent()) {
-            poolConfiguration.validationTimeout(legacyDataSourceJdbcRuntimeConfig.backgroundValidationInterval.get());
-        }
-        if (legacyDataSourceJdbcRuntimeConfig.validationQuerySql.isPresent()) {
-            String validationQuery = legacyDataSourceJdbcRuntimeConfig.validationQuerySql.get();
-            poolConfiguration.connectionValidator(new ConnectionValidator() {
-
-                @Override
-                public boolean isValid(Connection connection) {
-                    try (Statement stmt = connection.createStatement()) {
-                        stmt.execute(validationQuery);
-                        return true;
-                    } catch (Exception e) {
-                        log.warn("Connection validation failed", e);
-                    }
-                    return false;
-                }
-            });
-        }
-        if (legacyDataSourceJdbcRuntimeConfig.idleRemovalInterval.isPresent()) {
-            poolConfiguration.reapTimeout(legacyDataSourceJdbcRuntimeConfig.idleRemovalInterval.get());
-        }
-        if (legacyDataSourceJdbcRuntimeConfig.leakDetectionInterval.isPresent()) {
-            poolConfiguration.leakTimeout(legacyDataSourceJdbcRuntimeConfig.leakDetectionInterval.get());
-        }
-        if (legacyDataSourceJdbcRuntimeConfig.maxLifetime.isPresent()) {
-            poolConfiguration.maxLifetime(legacyDataSourceJdbcRuntimeConfig.maxLifetime.get());
-        }
-    }
-
     public DataSourceBuildTimeConfig getDataSourceBuildTimeConfig(String dataSourceName) {
         if (DataSourceUtil.isDefault(dataSourceName)) {
             return dataSourcesBuildTimeConfig.defaultDataSource;
@@ -481,38 +341,6 @@ public DataSourceJdbcRuntimeConfig getDataSourceJdbcRuntimeConfig(String dataSou
         return namedOuterConfig != null ? namedOuterConfig.jdbc : new DataSourceJdbcRuntimeConfig();
     }
 
-    public LegacyDataSourceJdbcBuildTimeConfig getLegacyDataSourceJdbcBuildTimeConfig(String dataSourceName) {
-        if (DataSourceUtil.isDefault(dataSourceName)) {
-            return legacyDataSourcesJdbcBuildTimeConfig.defaultDataSource;
-        }
-
-        LegacyDataSourceJdbcBuildTimeConfig namedConfig = legacyDataSourcesJdbcBuildTimeConfig.namedDataSources
-                .get(dataSourceName);
-
-        return namedConfig != null ? namedConfig : new LegacyDataSourceJdbcBuildTimeConfig();
-    }
-
-    public LegacyDataSourceRuntimeConfig getLegacyDataSourceRuntimeConfig(String dataSourceName) {
-        if (DataSourceUtil.isDefault(dataSourceName)) {
-            return legacyDataSourcesRuntimeConfig.defaultDataSource;
-        }
-
-        LegacyDataSourceRuntimeConfig namedConfig = legacyDataSourcesRuntimeConfig.namedDataSources.get(dataSourceName);
-
-        return namedConfig != null ? namedConfig : new LegacyDataSourceRuntimeConfig();
-    }
-
-    public LegacyDataSourceJdbcRuntimeConfig getLegacyDataSourceJdbcRuntimeConfig(String dataSourceName) {
-        if (DataSourceUtil.isDefault(dataSourceName)) {
-            return legacyDataSourcesJdbcRuntimeConfig.defaultDataSource;
-        }
-
-        LegacyDataSourceJdbcRuntimeConfig namedConfig = legacyDataSourcesJdbcRuntimeConfig.namedDataSources
-                .get(dataSourceName);
-
-        return namedConfig != null ? namedConfig : new LegacyDataSourceJdbcRuntimeConfig();
-    }
-
     /**
      * Uses the {@link ServiceLoader#load(Class) ServiceLoader to load the JDBC drivers} in context
      * of the current {@link Thread#getContextClassLoader() TCCL}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourceJdbcBuildTimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourceJdbcBuildTimeConfig.java
deleted file mode 100644
index 3421431d17b6f..0000000000000
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourceJdbcBuildTimeConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.quarkus.agroal.runtime;
-
-import java.util.Optional;
-
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-
-/**
- * This configuration class is here for compatibility reason and is planned for removal.
- */
-@Deprecated
-@ConfigGroup
-public class LegacyDataSourceJdbcBuildTimeConfig {
-
-    /**
-     * @deprecated use quarkus.datasource.db-kind (and quarkus.datasource.jdbc.driver if you really need a specific JDBC
-     *             driver).
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<String> driver;
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.transactions instead.
-     */
-    @ConfigItem(defaultValue = "enabled")
-    @Deprecated
-    public TransactionIntegration transactions = TransactionIntegration.ENABLED;
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.enable-metrics instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Boolean> enableMetrics = Optional.empty();
-}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourceJdbcRuntimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourceJdbcRuntimeConfig.java
deleted file mode 100644
index d402f97cf317e..0000000000000
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourceJdbcRuntimeConfig.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package io.quarkus.agroal.runtime;
-
-import java.time.Duration;
-import java.util.Optional;
-
-import io.agroal.api.configuration.AgroalConnectionFactoryConfiguration;
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-
-/**
- * This configuration class is here for compatibility reason and is planned for removal.
- */
-@Deprecated
-@ConfigGroup
-public class LegacyDataSourceJdbcRuntimeConfig {
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.initial-size instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Integer> initialSize = Optional.empty();
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.min-size instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public int minSize = 0;
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.background-validation-interval instead.
-     */
-    @ConfigItem(defaultValue = "2M")
-    @Deprecated
-    public Optional<Duration> backgroundValidationInterval = Optional.of(Duration.ofMinutes(2));
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.acquisition-timeout instead.
-     */
-    @ConfigItem(defaultValue = "5")
-    @Deprecated
-    public Optional<Duration> acquisitionTimeout = Optional.of(Duration.ofSeconds(5));
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.leak-detection-interval instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Duration> leakDetectionInterval = Optional.empty();
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.idle-removal-interval instead.
-     */
-    @ConfigItem(defaultValue = "5M")
-    @Deprecated
-    public Optional<Duration> idleRemovalInterval = Optional.of(Duration.ofMinutes(5));
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.max-lifetime instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Duration> maxLifetime = Optional.empty();
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.transaction-isolation-level instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<AgroalConnectionFactoryConfiguration.TransactionIsolation> transactionIsolationLevel = Optional.empty();
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.detect-statement-leaks instead.
-     */
-    @ConfigItem(defaultValue = "true")
-    @Deprecated
-    public boolean detectStatementLeaks = true;
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.new-connection-sql instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<String> newConnectionSql = Optional.empty();
-
-    /**
-     * @deprecated use quarkus.datasource.jdbc.validation-query-sql instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<String> validationQuerySql = Optional.empty();
-}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourcesJdbcBuildTimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourcesJdbcBuildTimeConfig.java
deleted file mode 100644
index ba67f54c2b5ac..0000000000000
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourcesJdbcBuildTimeConfig.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.quarkus.agroal.runtime;
-
-import java.util.Map;
-
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-/**
- * This configuration class is here for compatibility reason and is planned for removal.
- */
-@Deprecated
-@ConfigRoot(name = "datasource", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
-public class LegacyDataSourcesJdbcBuildTimeConfig {
-
-    /**
-     * The default datasource.
-     */
-    @ConfigItem(name = ConfigItem.PARENT)
-    public LegacyDataSourceJdbcBuildTimeConfig defaultDataSource;
-
-    /**
-     * Additional named datasources.
-     */
-    @ConfigDocSection
-    @ConfigDocMapKey("datasource-name")
-    @ConfigItem(name = ConfigItem.PARENT)
-    public Map<String, LegacyDataSourceJdbcBuildTimeConfig> namedDataSources;
-}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourcesJdbcRuntimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourcesJdbcRuntimeConfig.java
deleted file mode 100644
index b32b7394f9f6a..0000000000000
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/LegacyDataSourcesJdbcRuntimeConfig.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.quarkus.agroal.runtime;
-
-import java.util.Map;
-
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-/**
- * This configuration class is here for compatibility reason and is planned for removal.
- */
-@Deprecated
-@ConfigRoot(name = "datasource", phase = ConfigPhase.RUN_TIME)
-public class LegacyDataSourcesJdbcRuntimeConfig {
-
-    /**
-     * The default datasource.
-     */
-    @ConfigItem(name = ConfigItem.PARENT)
-    public LegacyDataSourceJdbcRuntimeConfig defaultDataSource;
-
-    /**
-     * Additional named datasources.
-     */
-    @ConfigDocSection
-    @ConfigDocMapKey("datasource-name")
-    @ConfigItem(name = ConfigItem.PARENT)
-    public Map<String, LegacyDataSourceJdbcRuntimeConfig> namedDataSources;
-}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/UnconfiguredDataSource.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/UnconfiguredDataSource.java
new file mode 100644
index 0000000000000..0e30f2a092dff
--- /dev/null
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/UnconfiguredDataSource.java
@@ -0,0 +1,104 @@
+package io.quarkus.agroal.runtime;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Logger;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.AgroalDataSourceMetrics;
+import io.agroal.api.AgroalPoolInterceptor;
+import io.agroal.api.configuration.AgroalDataSourceConfiguration;
+import io.quarkus.runtime.configuration.ConfigurationException;
+
+public class UnconfiguredDataSource implements AgroalDataSource {
+
+    private final String errorMessage;
+
+    public UnconfiguredDataSource(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public void throwException() {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public AgroalDataSourceConfiguration getConfiguration() {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public AgroalDataSourceMetrics getMetrics() {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public void flush(FlushMode mode) {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public void setPoolInterceptors(Collection<AgroalPoolInterceptor> interceptors) {
+        //noop
+    }
+
+    @Override
+    public List<AgroalPoolInterceptor> getPoolInterceptors() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Connection getConnection() throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public Connection getConnection(String username, String password) throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public PrintWriter getLogWriter() throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public void setLogWriter(PrintWriter out) throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public void setLoginTimeout(int seconds) throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public int getLoginTimeout() throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        throw new ConfigurationException(errorMessage);
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;
+    }
+}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalCounter.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalCounter.java
deleted file mode 100644
index 4fb7605927e6d..0000000000000
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalCounter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package io.quarkus.agroal.runtime.metrics;
-
-import org.eclipse.microprofile.metrics.Counter;
-
-import io.agroal.api.AgroalDataSource;
-import io.agroal.api.AgroalDataSourceMetrics;
-import io.quarkus.agroal.DataSource.DataSourceLiteral;
-import io.quarkus.arc.Arc;
-import io.quarkus.datasource.common.runtime.DataSourceUtil;
-
-public class AgroalCounter implements Counter {
-
-    private String dataSourceName;
-    private volatile AgroalDataSource dataSource;
-    private String metric;
-
-    public AgroalCounter() {
-
-    }
-
-    /**
-     * @param dataSourceName Which datasource should be queried for metric
-     * @param metricName Name of the method from DataSource.getMetrics() that should be called to retrieve the particular value.
-     *        This has nothing to do with the metric name from MP Metrics point of view!
-     */
-    public AgroalCounter(String dataSourceName, String metricName) {
-        this.dataSourceName = dataSourceName;
-        this.metric = metricName;
-    }
-
-    public String getDataSourceName() {
-        return dataSourceName;
-    }
-
-    public void setDataSourceName(String dataSourceName) {
-        this.dataSourceName = dataSourceName;
-    }
-
-    private AgroalDataSource getDataSource() {
-        AgroalDataSource dsLocal = dataSource;
-        if (dsLocal == null) {
-            synchronized (this) {
-                dsLocal = dataSource;
-                if (dsLocal == null) {
-                    if (dataSourceName == null || DataSourceUtil.isDefault(dataSourceName)) {
-                        dataSource = dsLocal = Arc.container().instance(AgroalDataSource.class).get();
-                    } else {
-                        dataSource = dsLocal = Arc.container()
-                                .instance(AgroalDataSource.class, new DataSourceLiteral(dataSourceName))
-                                .get();
-                    }
-                }
-            }
-        }
-        return dsLocal;
-    }
-
-    public void setDataSource(AgroalDataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    public String getMetric() {
-        return metric;
-    }
-
-    public void setMetric(String metric) {
-        this.metric = metric;
-    }
-
-    @Override
-    public void inc() {
-    }
-
-    @Override
-    public void inc(long n) {
-    }
-
-    @Override
-    public long getCount() {
-        AgroalDataSourceMetrics metrics = getDataSource().getMetrics();
-        switch (metric) {
-            case "acquireCount":
-                return metrics.acquireCount();
-            case "creationCount":
-                return metrics.creationCount();
-            case "leakDetectionCount":
-                return metrics.leakDetectionCount();
-            case "destroyCount":
-                return metrics.destroyCount();
-            case "flushCount":
-                return metrics.flushCount();
-            case "invalidCount":
-                return metrics.invalidCount();
-            case "reapCount":
-                return metrics.reapCount();
-            default:
-                throw new IllegalArgumentException("Unknown datasource metric");
-        }
-    }
-}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalGauge.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalGauge.java
deleted file mode 100644
index 22c8654923de4..0000000000000
--- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalGauge.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package io.quarkus.agroal.runtime.metrics;
-
-import org.eclipse.microprofile.metrics.Gauge;
-
-import io.agroal.api.AgroalDataSource;
-import io.agroal.api.AgroalDataSourceMetrics;
-import io.quarkus.agroal.DataSource.DataSourceLiteral;
-import io.quarkus.arc.Arc;
-import io.quarkus.datasource.common.runtime.DataSourceUtil;
-
-public class AgroalGauge implements Gauge<Long> {
-
-    private String dataSourceName;
-    private volatile AgroalDataSource dataSource;
-    private String metric;
-
-    public AgroalGauge() {
-
-    }
-
-    /**
-     * @param dataSourceName Which datasource should be queried for metric
-     * @param metricName Name of the method from DataSource.getMetrics() that should be called to retrieve the particular value.
-     *        This has nothing to do with the metric name from MP Metrics point of view!
-     */
-    public AgroalGauge(String dataSourceName, String metricName) {
-        this.dataSourceName = dataSourceName;
-        this.metric = metricName;
-    }
-
-    public String getDataSourceName() {
-        return dataSourceName;
-    }
-
-    public void setDataSourceName(String dataSourceName) {
-        this.dataSourceName = dataSourceName;
-    }
-
-    public String getMetric() {
-        return metric;
-    }
-
-    public void setMetric(String metric) {
-        this.metric = metric;
-    }
-
-    private AgroalDataSource getDataSource() {
-        AgroalDataSource dsLocal = dataSource;
-        if (dsLocal == null) {
-            synchronized (this) {
-                dsLocal = dataSource;
-                if (dsLocal == null) {
-                    if (dataSourceName == null || DataSourceUtil.isDefault(dataSourceName)) {
-                        dataSource = dsLocal = Arc.container().instance(AgroalDataSource.class).get();
-                    } else {
-                        dataSource = dsLocal = Arc.container()
-                                .instance(AgroalDataSource.class, new DataSourceLiteral(dataSourceName))
-                                .get();
-                    }
-                }
-            }
-        }
-        return dsLocal;
-    }
-
-    @Override
-    public Long getValue() {
-        AgroalDataSourceMetrics metrics = getDataSource().getMetrics();
-        switch (metric) {
-            case "activeCount":
-                return metrics.activeCount();
-            case "availableCount":
-                return metrics.availableCount();
-            case "maxUsedCount":
-                return metrics.maxUsedCount();
-            case "awaitingCount":
-                return metrics.awaitingCount();
-            case "blockingTimeAverage":
-                return metrics.blockingTimeAverage().toMillis();
-            case "blockingTimeMax":
-                return metrics.blockingTimeMax().toMillis();
-            case "blockingTimeTotal":
-                return metrics.blockingTimeTotal().toMillis();
-            case "creationTimeAverage":
-                return metrics.creationTimeAverage().toMillis();
-            case "creationTimeMax":
-                return metrics.creationTimeMax().toMillis();
-            case "creationTimeTotal":
-                return metrics.creationTimeTotal().toMillis();
-            default:
-                throw new IllegalArgumentException("Unknown data source metric");
-        }
-    }
-}
diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalMetricsRecorder.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalMetricsRecorder.java
new file mode 100644
index 0000000000000..081ef0c0b6d95
--- /dev/null
+++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/metrics/AgroalMetricsRecorder.java
@@ -0,0 +1,127 @@
+package io.quarkus.agroal.runtime.metrics;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.AgroalDataSourceMetrics;
+import io.quarkus.agroal.DataSource;
+import io.quarkus.arc.Arc;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+/**
+ * Subclasses are created and registered as {literal @}Dependent beans for each
+ * datasource that has metrics enabled.
+ */
+@Recorder
+public class AgroalMetricsRecorder {
+    static Function<Supplier<Duration>, Long> convertToMillis = new Function<Supplier<Duration>, Long>() {
+        @Override
+        public Long apply(Supplier<Duration> durationSupplier) {
+            return durationSupplier.get().toMillis();
+        }
+    };
+
+    /* RUNTIME_INIT */
+    public Consumer<MetricsFactory> registerDataSourceMetrics(String dataSourceName) {
+        return new Consumer<MetricsFactory>() {
+            @Override
+            public void accept(MetricsFactory metricsFactory) {
+                String tagValue = DataSourceUtil.isDefault(dataSourceName) ? "default" : dataSourceName;
+                AgroalDataSourceMetrics metrics = getDataSource(dataSourceName).getMetrics();
+
+                metricsFactory.builder("agroal.active.count")
+                        .description(
+                                "Number of active connections. These connections are in use and not available to be acquired.")
+                        .tag("datasource", tagValue)
+                        .buildGauge(metrics::activeCount);
+                metricsFactory.builder("agroal.available.count")
+                        .description("Number of idle connections in the pool, available to be acquired.")
+                        .tag("datasource", tagValue)
+                        .buildGauge(metrics::availableCount);
+                metricsFactory.builder("agroal.max.used.count")
+                        .description("Maximum number of connections active simultaneously.")
+                        .tag("datasource", tagValue)
+                        .buildGauge(metrics::maxUsedCount);
+                metricsFactory.builder("agroal.awaiting.count")
+                        .description("Approximate number of threads blocked, waiting to acquire a connection.")
+                        .tag("datasource", tagValue)
+                        .buildGauge(metrics::awaitingCount);
+
+                metricsFactory.builder("agroal.acquire.count")
+                        .description("Number of times an acquire operation succeeded.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::acquireCount);
+                metricsFactory.builder("agroal.creation.count")
+                        .description("Number of created connections.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::creationCount);
+                metricsFactory.builder("agroal.leak.detection.count")
+                        .description("Number of times a leak was detected. A single connection can be detected multiple times.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::leakDetectionCount);
+                metricsFactory.builder("agroal.destroy.count")
+                        .description("Number of destroyed connections.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::destroyCount);
+                metricsFactory.builder("agroal.flush.count")
+                        .description("Number of connections removed from the pool, not counting invalid / idle.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::flushCount);
+                metricsFactory.builder("agroal.invalid.count")
+                        .description("Number of connections removed from the pool for being idle.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::invalidCount);
+                metricsFactory.builder("agroal.reap.count")
+                        .description("Number of connections removed from the pool for being idle.")
+                        .tag("datasource", tagValue)
+                        .buildCounter(metrics::reapCount);
+
+                metricsFactory.builder("agroal.blocking.time.average")
+                        .description("Average time an application waited to acquire a connection.")
+                        .tag("datasource", tagValue)
+                        .unit("milliseconds")
+                        .buildGauge(metrics::blockingTimeAverage, convertToMillis);
+                metricsFactory.builder("agroal.blocking.time.max")
+                        .description("Maximum time an application waited to acquire a connection.")
+                        .tag("datasource", tagValue)
+                        .unit("milliseconds")
+                        .buildGauge(metrics::blockingTimeMax, convertToMillis);
+                metricsFactory.builder("agroal.blocking.time.total")
+                        .description("Total time applications waited to acquire a connection.")
+                        .tag("datasource", tagValue)
+                        .unit("milliseconds")
+                        .buildGauge(metrics::blockingTimeTotal, convertToMillis);
+                metricsFactory.builder("agroal.creation.time.average")
+                        .description("Average time for a connection to be created.")
+                        .tag("datasource", tagValue)
+                        .unit("milliseconds")
+                        .buildGauge(metrics::creationTimeAverage, convertToMillis);
+                metricsFactory.builder("agroal.creation.time.max")
+                        .description("Maximum time for a connection to be created.")
+                        .tag("datasource", tagValue)
+                        .unit("milliseconds")
+                        .buildGauge(metrics::creationTimeMax, convertToMillis);
+                metricsFactory.builder("agroal.creation.time.total")
+                        .description("Total time waiting for connections to be created.")
+                        .tag("datasource", tagValue)
+                        .unit("milliseconds")
+                        .buildGauge(metrics::creationTimeTotal, convertToMillis);
+            }
+        };
+    }
+
+    private AgroalDataSource getDataSource(String dataSourceName) {
+        if (dataSourceName == null || DataSourceUtil.isDefault(dataSourceName)) {
+            return Arc.container().instance(AgroalDataSource.class).get();
+        } else {
+            return Arc.container()
+                    .instance(AgroalDataSource.class, new DataSource.DataSourceLiteral(dataSourceName))
+                    .get();
+        }
+    }
+}
diff --git a/extensions/agroal/spi/pom.xml b/extensions/agroal/spi/pom.xml
index b3805de67593d..dc8fe8e1ef587 100644
--- a/extensions/agroal/spi/pom.xml
+++ b/extensions/agroal/spi/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-agroal-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDataSourceBuildItem.java b/extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDataSourceBuildItem.java
similarity index 95%
rename from extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDataSourceBuildItem.java
rename to extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDataSourceBuildItem.java
index 82806454396e0..f584fb0ebea2b 100644
--- a/extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDataSourceBuildItem.java
+++ b/extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDataSourceBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.agroal.deployment;
+package io.quarkus.agroal.spi;
 
 import io.quarkus.builder.item.MultiBuildItem;
 
diff --git a/extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDataSourceSchemaReadyBuildItem.java b/extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDataSourceSchemaReadyBuildItem.java
similarity index 94%
rename from extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDataSourceSchemaReadyBuildItem.java
rename to extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDataSourceSchemaReadyBuildItem.java
index 280ab686ba38f..687ed1ba40362 100644
--- a/extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDataSourceSchemaReadyBuildItem.java
+++ b/extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDataSourceSchemaReadyBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.agroal.deployment;
+package io.quarkus.agroal.spi;
 
 import java.util.Collection;
 
diff --git a/extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDriverBuildItem.java b/extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDriverBuildItem.java
similarity index 96%
rename from extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDriverBuildItem.java
rename to extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDriverBuildItem.java
index 00dd028786c04..bd8849bb2f8d6 100644
--- a/extensions/agroal/spi/src/main/java/io/quarkus/agroal/deployment/JdbcDriverBuildItem.java
+++ b/extensions/agroal/spi/src/main/java/io/quarkus/agroal/spi/JdbcDriverBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.agroal.deployment;
+package io.quarkus.agroal.spi;
 
 import java.util.Optional;
 
diff --git a/extensions/amazon-alexa/deployment/pom.xml b/extensions/amazon-alexa/deployment/pom.xml
index 4f526c040370b..435fe773c1a83 100644
--- a/extensions/amazon-alexa/deployment/pom.xml
+++ b/extensions/amazon-alexa/deployment/pom.xml
@@ -15,10 +15,6 @@
     <name>Quarkus - Amazon Alexa - Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-amazon-alexa</artifactId>
@@ -26,7 +22,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jackson</artifactId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/extensions/amazon-alexa/pom.xml b/extensions/amazon-alexa/pom.xml
index c7b0b8764b9f1..b9d123c8d7066 100644
--- a/extensions/amazon-alexa/pom.xml
+++ b/extensions/amazon-alexa/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-amazon-alexa-parent</artifactId>
diff --git a/extensions/amazon-alexa/runtime/pom.xml b/extensions/amazon-alexa/runtime/pom.xml
index 8053553d747a8..fb60b57c1bf2c 100644
--- a/extensions/amazon-alexa/runtime/pom.xml
+++ b/extensions/amazon-alexa/runtime/pom.xml
@@ -58,7 +58,11 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/extensions/amazon-lambda-http/deployment/pom.xml b/extensions/amazon-lambda-http/deployment/pom.xml
index 56903db647fde..be40bb1244994 100644
--- a/extensions/amazon-lambda-http/deployment/pom.xml
+++ b/extensions/amazon-lambda-http/deployment/pom.xml
@@ -31,10 +31,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-amazon-lambda-http</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java b/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java
index 14280d0cf7c62..f4cbe7755bf34 100644
--- a/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java
+++ b/extensions/amazon-lambda-http/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java
@@ -2,17 +2,12 @@
 
 import org.jboss.logging.Logger;
 
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
+
 import io.quarkus.amazon.lambda.deployment.LambdaUtil;
 import io.quarkus.amazon.lambda.deployment.ProvidedAmazonLambdaHandlerBuildItem;
 import io.quarkus.amazon.lambda.http.LambdaHttpHandler;
-import io.quarkus.amazon.lambda.http.model.AlbContext;
-import io.quarkus.amazon.lambda.http.model.ApiGatewayAuthorizerContext;
-import io.quarkus.amazon.lambda.http.model.ApiGatewayRequestIdentity;
-import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
-import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext;
-import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
-import io.quarkus.amazon.lambda.http.model.CognitoAuthorizerClaims;
-import io.quarkus.amazon.lambda.http.model.ErrorModel;
 import io.quarkus.amazon.lambda.http.model.Headers;
 import io.quarkus.amazon.lambda.http.model.MultiValuedTreeMap;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -43,16 +38,14 @@ public ProvidedAmazonLambdaHandlerBuildItem setHandler() {
     public void registerReflectionClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer) {
         reflectiveClassBuildItemBuildProducer
                 .produce(new ReflectiveClassBuildItem(true, true, true,
-                        AlbContext.class,
-                        ApiGatewayAuthorizerContext.class,
-                        ApiGatewayRequestIdentity.class,
-                        AwsProxyRequest.class,
-                        AwsProxyRequestContext.class,
-                        AwsProxyResponse.class,
-                        CognitoAuthorizerClaims.class,
-                        ErrorModel.class,
-                        Headers.class,
-                        MultiValuedTreeMap.class));
+                        APIGatewayV2HTTPEvent.class,
+                        APIGatewayV2HTTPEvent.RequestContext.class,
+                        APIGatewayV2HTTPEvent.RequestContext.Http.class,
+                        APIGatewayV2HTTPEvent.RequestContext.Authorizer.class,
+                        APIGatewayV2HTTPEvent.RequestContext.CognitoIdentity.class,
+                        APIGatewayV2HTTPEvent.RequestContext.IAM.class,
+                        APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT.class,
+                        APIGatewayV2HTTPResponse.class, Headers.class, MultiValuedTreeMap.class));
     }
 
     /**
diff --git a/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.jvm.yaml b/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.jvm.yaml
index a2476a2a1a648..0d41bbbf07590 100644
--- a/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.jvm.yaml
+++ b/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.jvm.yaml
@@ -18,15 +18,12 @@
         Policies: AWSLambdaBasicExecutionRole
         Timeout: 15
         Events:
-          GetResource:
-            Type: Api
-            Properties:
-              Path: /{proxy+}
-              Method: any
+          HttpApiEvent:
+            Type: HttpApi
 
   Outputs:
     ${lambdaName}Api:
       Description: URL for application
-      Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/'
+      Value: !Sub 'https://${ServerlessHttpApi}.execute-api.${AWS::Region}.amazonaws.com/'
       Export:
         Name: ${lambdaName}Api
diff --git a/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.native.yaml b/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.native.yaml
index 80d6075f0a3b3..88ab665088ee6 100644
--- a/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.native.yaml
+++ b/extensions/amazon-lambda-http/deployment/src/main/resources/http/sam.native.yaml
@@ -21,15 +21,12 @@
           Variables:
             DISABLE_SIGNAL_HANDLERS: true
         Events:
-          GetResource:
-            Type: Api
-            Properties:
-              Path: /{proxy+}
-              Method: any
+          HttpApiEvent:
+            Type: HttpApi
 
   Outputs:
     ${lambdaName}NativeApi:
       Description: URL for application
-      Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/'
+      Value: !Sub 'https://${ServerlessHttpApi}.execute-api.${AWS::Region}.amazonaws.com/'
       Export:
         Name: ${lambdaName}NativeApi
diff --git a/extensions/amazon-lambda-http/maven-archetype/pom.xml b/extensions/amazon-lambda-http/maven-archetype/pom.xml
index f3924edd417c4..dce1a1e348f69 100644
--- a/extensions/amazon-lambda-http/maven-archetype/pom.xml
+++ b/extensions/amazon-lambda-http/maven-archetype/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-amazon-lambda-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 2fa0f4f537844..b1292683a4bb4 100644
--- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -9,7 +9,7 @@ to you 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
+  https://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
diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 24ece3b6b497b..528362e2869d6 100644
--- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -73,9 +73,6 @@
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
                 <version>\${quarkus-plugin.version}</version>
-                <configuration>
-                    <uberJar>true</uberJar>
-                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -108,47 +105,9 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>\${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>\${assembly-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>zip-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <finalName>function</finalName>
-                                    <descriptors>
-                                        <descriptor>src${file.separator}assembly${file.separator}zip.xml</descriptor>
-                                    </descriptors>
-                                    <attach>false</attach>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/assembly/zip.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/assembly/zip.xml
deleted file mode 100644
index 54d667c9b7dc9..0000000000000
--- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/src/assembly/zip.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>lambda-package</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <files>
-      <file>
-	<source>${project.build.directory}${file.separator}${artifactId}-${version}-runner</source>
-	<outputDirectory>/</outputDirectory>
-	<destName>bootstrap</destName>
-	<fileMode>755</fileMode>
-      </file>
-    </files>
-</assembly>
diff --git a/extensions/amazon-lambda-http/pom.xml b/extensions/amazon-lambda-http/pom.xml
index a3f26fdc8d883..61c49706a6b97 100644
--- a/extensions/amazon-lambda-http/pom.xml
+++ b/extensions/amazon-lambda-http/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-amazon-lambda-http-parent</artifactId>
diff --git a/extensions/amazon-lambda-http/runtime/pom.xml b/extensions/amazon-lambda-http/runtime/pom.xml
index d85203509b16e..032f4a25bc399 100644
--- a/extensions/amazon-lambda-http/runtime/pom.xml
+++ b/extensions/amazon-lambda-http/runtime/pom.xml
@@ -29,12 +29,13 @@
             <artifactId>quarkus-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.amazonaws.serverless</groupId>
-            <artifactId>aws-serverless-java-container-core</artifactId>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
index 539a94f9f2b71..fa99269e88ee1 100644
--- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
+++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
@@ -2,20 +2,21 @@
 
 import java.io.ByteArrayOutputStream;
 import java.net.InetSocketAddress;
-import java.net.URLEncoder;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 import org.jboss.logging.Logger;
 
-import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -29,51 +30,56 @@
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.util.ReferenceCountUtil;
-import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
-import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
 import io.quarkus.amazon.lambda.http.model.Headers;
 import io.quarkus.netty.runtime.virtual.VirtualClientConnection;
 import io.quarkus.netty.runtime.virtual.VirtualResponseHandler;
+import io.quarkus.vertx.http.runtime.QuarkusHttpHeaders;
 import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
 
 @SuppressWarnings("unused")
-public class LambdaHttpHandler implements RequestHandler<AwsProxyRequest, AwsProxyResponse> {
+public class LambdaHttpHandler implements RequestHandler<APIGatewayV2HTTPEvent, APIGatewayV2HTTPResponse> {
     private static final Logger log = Logger.getLogger("quarkus.amazon.lambda.http");
 
+    private static final int BUFFER_SIZE = 8096;
+
     private static Headers errorHeaders = new Headers();
     static {
         errorHeaders.putSingle("Content-Type", "application/json");
     }
 
-    public AwsProxyResponse handleRequest(AwsProxyRequest request, Context context) {
+    public APIGatewayV2HTTPResponse handleRequest(APIGatewayV2HTTPEvent request, Context context) {
         InetSocketAddress clientAddress = null;
-        if (request.getRequestContext() != null && request.getRequestContext().getIdentity() != null) {
-            if (request.getRequestContext().getIdentity().getSourceIp() != null) {
-                clientAddress = new InetSocketAddress(request.getRequestContext().getIdentity().getSourceIp(), 443);
+        if (request.getRequestContext() != null && request.getRequestContext().getHttp() != null) {
+            if (request.getRequestContext().getHttp().getSourceIp() != null) {
+                clientAddress = new InetSocketAddress(request.getRequestContext().getHttp().getSourceIp(), 443);
             }
         }
 
         try {
-            return nettyDispatch(clientAddress, request);
+            return nettyDispatch(clientAddress, request, context);
         } catch (Exception e) {
             log.error("Request Failure", e);
-            return new AwsProxyResponse(500, errorHeaders, "{ \"message\": \"Internal Server Error\" }");
+            APIGatewayV2HTTPResponse res = new APIGatewayV2HTTPResponse();
+            res.setStatusCode(500);
+            res.setBody("{ \"message\": \"Internal Server Error\" }");
+            res.setMultiValueHeaders(errorHeaders);
+            return res;
         }
 
     }
 
     private class NettyResponseHandler implements VirtualResponseHandler {
-        AwsProxyResponse responseBuilder = new AwsProxyResponse();
+        APIGatewayV2HTTPResponse responseBuilder = new APIGatewayV2HTTPResponse();
         ByteArrayOutputStream baos;
         WritableByteChannel byteChannel;
-        final AwsProxyRequest request;
-        CompletableFuture<AwsProxyResponse> future = new CompletableFuture<>();
+        final APIGatewayV2HTTPEvent request;
+        CompletableFuture<APIGatewayV2HTTPResponse> future = new CompletableFuture<>();
 
-        public NettyResponseHandler(AwsProxyRequest request) {
+        public NettyResponseHandler(APIGatewayV2HTTPEvent request) {
             this.request = request;
         }
 
-        public CompletableFuture<AwsProxyResponse> getFuture() {
+        public CompletableFuture<APIGatewayV2HTTPResponse> getFuture() {
             return future;
         }
 
@@ -86,13 +92,11 @@ public void handleMessage(Object msg) {
                     HttpResponse res = (HttpResponse) msg;
                     responseBuilder.setStatusCode(res.status().code());
 
-                    if (request.getRequestSource() == AwsProxyRequest.RequestSource.ALB) {
-                        responseBuilder.setStatusDescription(res.status().reasonPhrase());
-                    }
-                    responseBuilder.setMultiValueHeaders(new Headers());
+                    Headers multiValueHeaders = new Headers();
+                    responseBuilder.setMultiValueHeaders(multiValueHeaders);
                     for (String name : res.headers().names()) {
                         for (String v : res.headers().getAll(name)) {
-                            responseBuilder.getMultiValueHeaders().add(name, v);
+                            multiValueHeaders.add(name, v);
                         }
                     }
                 }
@@ -118,11 +122,11 @@ public void handleMessage(Object msg) {
                 }
                 if (msg instanceof LastHttpContent) {
                     if (baos != null) {
-                        if (isBinary(responseBuilder.getMultiValueHeaders().getFirst("Content-Type"))) {
-                            responseBuilder.setBase64Encoded(true);
+                        if (isBinary(((Headers) responseBuilder.getMultiValueHeaders()).getFirst("Content-Type"))) {
+                            responseBuilder.setIsBase64Encoded(true);
                             responseBuilder.setBody(Base64.getMimeEncoder().encodeToString(baos.toByteArray()));
                         } else {
-                            responseBuilder.setBody(new String(baos.toByteArray(), "UTF-8"));
+                            responseBuilder.setBody(new String(baos.toByteArray(), StandardCharsets.UTF_8));
                         }
                     }
                     future.complete(responseBuilder);
@@ -143,38 +147,25 @@ public void close() {
         }
     }
 
-    private AwsProxyResponse nettyDispatch(InetSocketAddress clientAddress, AwsProxyRequest request) throws Exception {
-        String path = request.getPath();
+    private APIGatewayV2HTTPResponse nettyDispatch(InetSocketAddress clientAddress, APIGatewayV2HTTPEvent request,
+            Context context)
+            throws Exception {
+        StringBuilder sb = new StringBuilder(request.getRawPath());
+        sb.append('?').append(request.getRawQueryString());
+        String path = new StringBuilder(request.getRawPath()).append('?').append(request.getRawQueryString()).toString();
         //log.info("---- Got lambda request: " + path);
-        if (request.getMultiValueQueryStringParameters() != null && !request.getMultiValueQueryStringParameters().isEmpty()) {
-            StringBuilder sb = new StringBuilder(path);
-            sb.append("?");
-            boolean first = true;
-            for (Map.Entry<String, List<String>> e : request.getMultiValueQueryStringParameters().entrySet()) {
-                for (String v : e.getValue()) {
-                    if (first) {
-                        first = false;
-                    } else {
-                        sb.append("&");
-                    }
-                    if (request.getRequestSource() == AwsProxyRequest.RequestSource.ALB) {
-                        sb.append(e.getKey());
-                        sb.append("=");
-                        sb.append(v);
-                    } else {
-                        sb.append(URLEncoder.encode(e.getKey(), StandardCharsets.UTF_8.name()));
-                        sb.append("=");
-                        sb.append(URLEncoder.encode(v, StandardCharsets.UTF_8.name()));
-                    }
-                }
-            }
-            path = sb.toString();
-        }
+        QuarkusHttpHeaders quarkusHeaders = new QuarkusHttpHeaders();
+        quarkusHeaders.setContextObject(Context.class, context);
+        quarkusHeaders.setContextObject(APIGatewayV2HTTPEvent.class, request);
+        quarkusHeaders.setContextObject(APIGatewayV2HTTPEvent.RequestContext.class, request.getRequestContext());
         DefaultHttpRequest nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1,
-                HttpMethod.valueOf(request.getHttpMethod()), path);
-        if (request.getMultiValueHeaders() != null) { //apparently this can be null if no headers are sent
-            for (Map.Entry<String, List<String>> header : request.getMultiValueHeaders().entrySet()) {
-                nettyRequest.headers().add(header.getKey(), header.getValue());
+                HttpMethod.valueOf(request.getRequestContext().getHttp().getMethod()), path, quarkusHeaders);
+        if (request.getHeaders() != null) { //apparently this can be null if no headers are sent
+            for (Map.Entry<String, String> header : request.getHeaders().entrySet()) {
+                if (header.getValue() != null) {
+                    for (String val : header.getValue().split(","))
+                        nettyRequest.headers().add(header.getKey(), val);
+                }
             }
         }
         if (!nettyRequest.headers().contains(HttpHeaderNames.HOST)) {
@@ -183,7 +174,7 @@ private AwsProxyResponse nettyDispatch(InetSocketAddress clientAddress, AwsProxy
 
         HttpContent requestContent = LastHttpContent.EMPTY_LAST_CONTENT;
         if (request.getBody() != null) {
-            if (request.isBase64Encoded()) {
+            if (request.getIsBase64Encoded()) {
                 ByteBuf body = Unpooled.wrappedBuffer(Base64.getMimeDecoder().decode(request.getBody()));
                 requestContent = new DefaultLastHttpContent(body);
             } else {
@@ -205,18 +196,27 @@ private AwsProxyResponse nettyDispatch(InetSocketAddress clientAddress, AwsProxy
     }
 
     private ByteArrayOutputStream createByteStream() {
-        ByteArrayOutputStream baos;// todo what is right size?
-        baos = new ByteArrayOutputStream(1000);
+        ByteArrayOutputStream baos;
+        baos = new ByteArrayOutputStream(BUFFER_SIZE);
         return baos;
     }
 
+    static Set<String> binaryTypes = new HashSet<>();
+
+    static {
+        binaryTypes.add("application/octet-stream");
+        binaryTypes.add("image/jpeg");
+        binaryTypes.add("image/png");
+        binaryTypes.add("image/gif");
+    }
+
     private boolean isBinary(String contentType) {
         if (contentType != null) {
             int index = contentType.indexOf(';');
             if (index >= 0) {
-                return LambdaContainerHandler.getContainerConfig().isBinaryContentType(contentType.substring(0, index));
+                return binaryTypes.contains(contentType.substring(0, index));
             } else {
-                return LambdaContainerHandler.getContainerConfig().isBinaryContentType(contentType);
+                return binaryTypes.contains(contentType);
             }
         }
         return false;
diff --git a/extensions/amazon-lambda-rest/deployment/pom.xml b/extensions/amazon-lambda-rest/deployment/pom.xml
new file mode 100644
index 0000000000000..bb4da0e13edbc
--- /dev/null
+++ b/extensions/amazon-lambda-rest/deployment/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-amazon-lambda-rest-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-amazon-lambda-rest-deployment</artifactId>
+    <name>Quarkus - Amazon Lambda AWS Gateway REST API - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-rest</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java
new file mode 100644
index 0000000000000..14280d0cf7c62
--- /dev/null
+++ b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java
@@ -0,0 +1,83 @@
+package io.quarkus.amazon.lambda.http.deployment;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.amazon.lambda.deployment.LambdaUtil;
+import io.quarkus.amazon.lambda.deployment.ProvidedAmazonLambdaHandlerBuildItem;
+import io.quarkus.amazon.lambda.http.LambdaHttpHandler;
+import io.quarkus.amazon.lambda.http.model.AlbContext;
+import io.quarkus.amazon.lambda.http.model.ApiGatewayAuthorizerContext;
+import io.quarkus.amazon.lambda.http.model.ApiGatewayRequestIdentity;
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext;
+import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
+import io.quarkus.amazon.lambda.http.model.CognitoAuthorizerClaims;
+import io.quarkus.amazon.lambda.http.model.ErrorModel;
+import io.quarkus.amazon.lambda.http.model.Headers;
+import io.quarkus.amazon.lambda.http.model.MultiValuedTreeMap;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.vertx.http.deployment.RequireVirtualHttpBuildItem;
+import io.vertx.core.file.impl.FileResolver;
+
+public class AmazonLambdaHttpProcessor {
+    private static final Logger log = Logger.getLogger(AmazonLambdaHttpProcessor.class);
+
+    @BuildStep
+    public RequireVirtualHttpBuildItem requestVirtualHttp(LaunchModeBuildItem launchMode) {
+        return launchMode.getLaunchMode() == LaunchMode.NORMAL ? RequireVirtualHttpBuildItem.MARKER : null;
+    }
+
+    @BuildStep
+    public ProvidedAmazonLambdaHandlerBuildItem setHandler() {
+        return new ProvidedAmazonLambdaHandlerBuildItem(LambdaHttpHandler.class, "AWS Lambda HTTP");
+    }
+
+    @BuildStep
+    public void registerReflectionClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer) {
+        reflectiveClassBuildItemBuildProducer
+                .produce(new ReflectiveClassBuildItem(true, true, true,
+                        AlbContext.class,
+                        ApiGatewayAuthorizerContext.class,
+                        ApiGatewayRequestIdentity.class,
+                        AwsProxyRequest.class,
+                        AwsProxyRequestContext.class,
+                        AwsProxyResponse.class,
+                        CognitoAuthorizerClaims.class,
+                        ErrorModel.class,
+                        Headers.class,
+                        MultiValuedTreeMap.class));
+    }
+
+    /**
+     * Lambda provides /tmp for temporary files. Set vertx cache dir
+     */
+    @BuildStep
+    void setTempDir(BuildProducer<SystemPropertyBuildItem> systemProperty) {
+        systemProperty.produce(new SystemPropertyBuildItem(FileResolver.CACHE_DIR_BASE_PROP_NAME, "/tmp"));
+    }
+
+    @BuildStep
+    public void generateScripts(OutputTargetBuildItem target,
+            BuildProducer<ArtifactResultBuildItem> artifactResultProducer) throws Exception {
+        String lambdaName = LambdaUtil.artifactToLambda(target.getBaseName());
+
+        String output = LambdaUtil.copyResource("lambda/bootstrap-example.sh");
+        LambdaUtil.writeFile(target, "bootstrap-example.sh", output);
+
+        output = LambdaUtil.copyResource("http/sam.jvm.yaml")
+                .replace("${lambdaName}", lambdaName);
+        LambdaUtil.writeFile(target, "sam.jvm.yaml", output);
+
+        output = LambdaUtil.copyResource("http/sam.native.yaml")
+                .replace("${lambdaName}", lambdaName);
+        LambdaUtil.writeFile(target, "sam.native.yaml", output);
+    }
+
+}
diff --git a/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.jvm.yaml b/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.jvm.yaml
new file mode 100644
index 0000000000000..a2476a2a1a648
--- /dev/null
+++ b/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.jvm.yaml
@@ -0,0 +1,32 @@
+  AWSTemplateFormatVersion: '2010-09-09'
+  Transform: AWS::Serverless-2016-10-31
+  Description: AWS Serverless Quarkus HTTP - ${artifactId}
+  Globals:
+    Api:
+      EndpointConfiguration: REGIONAL
+      BinaryMediaTypes:
+        - "*/*"
+
+  Resources:
+    ${lambdaName}:
+      Type: AWS::Serverless::Function
+      Properties:
+        Handler: io.quarkus.amazon.lambda.runtime.QuarkusStreamHandler::handleRequest
+        Runtime: java11
+        CodeUri: function.zip
+        MemorySize: 512
+        Policies: AWSLambdaBasicExecutionRole
+        Timeout: 15
+        Events:
+          GetResource:
+            Type: Api
+            Properties:
+              Path: /{proxy+}
+              Method: any
+
+  Outputs:
+    ${lambdaName}Api:
+      Description: URL for application
+      Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/'
+      Export:
+        Name: ${lambdaName}Api
diff --git a/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.native.yaml b/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.native.yaml
new file mode 100644
index 0000000000000..80d6075f0a3b3
--- /dev/null
+++ b/extensions/amazon-lambda-rest/deployment/src/main/resources/http/sam.native.yaml
@@ -0,0 +1,35 @@
+  AWSTemplateFormatVersion: '2010-09-09'
+  Transform: AWS::Serverless-2016-10-31
+  Description: AWS Serverless Quarkus HTTP - ${artifactId}
+  Globals:
+    Api:
+      EndpointConfiguration: REGIONAL
+      BinaryMediaTypes:
+        - "*/*"
+
+  Resources:
+    ${lambdaName}Native:
+      Type: AWS::Serverless::Function
+      Properties:
+        Handler: not.used.in.provided.runtimei
+        Runtime: provided
+        CodeUri: function.zip
+        MemorySize: 128
+        Policies: AWSLambdaBasicExecutionRole
+        Timeout: 15
+        Environment:
+          Variables:
+            DISABLE_SIGNAL_HANDLERS: true
+        Events:
+          GetResource:
+            Type: Api
+            Properties:
+              Path: /{proxy+}
+              Method: any
+
+  Outputs:
+    ${lambdaName}NativeApi:
+      Description: URL for application
+      Value: !Sub 'https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/'
+      Export:
+        Name: ${lambdaName}NativeApi
diff --git a/extensions/amazon-lambda-rest/maven-archetype/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/pom.xml
new file mode 100644
index 0000000000000..326475ac1feed
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-amazon-lambda-rest-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-amazon-lambda-rest-archetype</artifactId>
+    <name>Quarkus - Amazon Lambda AWS Gateway REST API - Archetype</name>
+    <packaging>maven-archetype</packaging>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>archetype-resources/pom.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>archetype-resources/pom.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>3.0.1</version>
+            </extension>
+        </extensions>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.1.0</version>
+                    <configuration>
+                        <escapeString>\</escapeString>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-archetype-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>integration-test</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 0000000000000..b1292683a4bb4
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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
+
+  https://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.
+-->
+
+<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+  name="${artifactId}">
+  <fileSets>
+    <fileSet filtered="true" packaged="true">
+      <directory>src/main/java</directory>
+    </fileSet>
+    <fileSet filtered="true" packaged="true">
+      <directory>src/test/java</directory>
+    </fileSet>
+    <fileSet>
+      <directory>src/assembly</directory>
+      <includes>
+        <include>*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</archetype-descriptor>
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 0000000000000..2219570cb59c7
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>\${groupId}</groupId>
+    <artifactId>\${artifactId}</artifactId>
+    <version>\${version}</version>
+    <properties>
+        <assembly-plugin.version>3.1.0</assembly-plugin.version>
+        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <quarkus-plugin.version>999-SNAPSHOT</quarkus-plugin.version>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
+        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>\${quarkus.platform.group-id}</groupId>
+                <artifactId>\${quarkus.platform.artifact-id}</artifactId>
+                <version>\${quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <!-- remove if not using jaxrs -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <!-- remove if not using servlets -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
+        <!-- remove if not using vertx web -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web</artifactId>
+        </dependency>
+        <!-- remove if not using funqy -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>\${quarkus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>\${compiler-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>\${surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <maven.home>\${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java
new file mode 100644
index 0000000000000..a6b00f53041eb
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingFunction.java
@@ -0,0 +1,11 @@
+package ${package};
+
+import io.quarkus.funqy.Funq;
+
+public class GreetingFunction {
+
+    @Funq
+    public String funqyHello() {
+        return "hello funqy";
+    }
+}
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java
new file mode 100644
index 0000000000000..63cd0cdcc30ea
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingResource.java
@@ -0,0 +1,16 @@
+package ${package};
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello jaxrs";
+    }
+}
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java
new file mode 100644
index 0000000000000..9ea933ac90f4f
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingServlet.java
@@ -0,0 +1,19 @@
+package ${package};
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello")
+public class GreetingServlet extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.setStatus(200);
+        resp.addHeader("Content-Type", "text/plain");
+        resp.getWriter().write("hello servlet");
+    }
+}
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java
new file mode 100644
index 0000000000000..d3787e91a4a82
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/main/java/GreetingVertx.java
@@ -0,0 +1,14 @@
+package ${package};
+
+import static io.vertx.core.http.HttpMethod.*;
+
+import io.quarkus.vertx.web.Route;
+import io.vertx.ext.web.RoutingContext;
+
+public class GreetingVertx {
+    @Route(path = "/vertx/hello", methods = GET)
+    void hello(RoutingContext context) {
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(200).end("hello vertx");
+    }
+}
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java
new file mode 100644
index 0000000000000..48e1b89cfade9
--- /dev/null
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/src/test/java/GreetingTest.java
@@ -0,0 +1,40 @@
+package ${package};
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+@QuarkusTest
+public class GreetingTest
+{
+    @Test
+    public void testJaxrs() {
+        RestAssured.when().get("/hello").then()
+                .contentType("text/plain")
+                .body(equalTo("hello jaxrs"));
+    }
+
+    @Test
+    public void testServlet() {
+        RestAssured.when().get("/servlet/hello").then()
+                .contentType("text/plain")
+                .body(equalTo("hello servlet"));
+    }
+
+    @Test
+    public void testVertx() {
+        RestAssured.when().get("/vertx/hello").then()
+                .contentType("text/plain")
+                .body(equalTo("hello vertx"));
+    }
+
+    @Test
+    public void testFunqy() {
+        RestAssured.when().get("/funqyHello").then()
+                .contentType("application/json")
+                .body(equalTo("\"hello funqy\""));
+    }
+
+}
diff --git a/extensions/amazon-lambda-rest/pom.xml b/extensions/amazon-lambda-rest/pom.xml
new file mode 100644
index 0000000000000..34cb1cf262363
--- /dev/null
+++ b/extensions/amazon-lambda-rest/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-amazon-lambda-rest-parent</artifactId>
+    <name>Quarkus - Amazon Lambda AWS Gateway REST API</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+        <module>maven-archetype</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/extensions/amazon-lambda-rest/runtime/pom.xml b/extensions/amazon-lambda-rest/runtime/pom.xml
new file mode 100644
index 0000000000000..a6e0f2a074f04
--- /dev/null
+++ b/extensions/amazon-lambda-rest/runtime/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-amazon-lambda-rest-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-amazon-lambda-rest</artifactId>
+    <name>Quarkus - Amazon Lambda AWS Gateway REST API- Runtime</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda</artifactId>
+        </dependency>
+         <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws.serverless</groupId>
+            <artifactId>aws-serverless-java-container-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
new file mode 100644
index 0000000000000..484264e245e4d
--- /dev/null
+++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java
@@ -0,0 +1,233 @@
+package io.quarkus.amazon.lambda.http;
+
+import java.io.ByteArrayOutputStream;
+import java.net.InetSocketAddress;
+import java.net.URLEncoder;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import org.jboss.logging.Logger;
+
+import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.FileRegion;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DefaultLastHttpContent;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.ReferenceCountUtil;
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext;
+import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
+import io.quarkus.amazon.lambda.http.model.Headers;
+import io.quarkus.netty.runtime.virtual.VirtualClientConnection;
+import io.quarkus.netty.runtime.virtual.VirtualResponseHandler;
+import io.quarkus.vertx.http.runtime.QuarkusHttpHeaders;
+import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
+
+@SuppressWarnings("unused")
+public class LambdaHttpHandler implements RequestHandler<AwsProxyRequest, AwsProxyResponse> {
+    private static final Logger log = Logger.getLogger("quarkus.amazon.lambda.http");
+
+    private static final int BUFFER_SIZE = 8096;
+
+    private static Headers errorHeaders = new Headers();
+    static {
+        errorHeaders.putSingle("Content-Type", "application/json");
+    }
+
+    public AwsProxyResponse handleRequest(AwsProxyRequest request, Context context) {
+        InetSocketAddress clientAddress = null;
+        if (request.getRequestContext() != null && request.getRequestContext().getIdentity() != null) {
+            if (request.getRequestContext().getIdentity().getSourceIp() != null) {
+                clientAddress = new InetSocketAddress(request.getRequestContext().getIdentity().getSourceIp(), 443);
+            }
+        }
+
+        try {
+            return nettyDispatch(clientAddress, request, context);
+        } catch (Exception e) {
+            log.error("Request Failure", e);
+            return new AwsProxyResponse(500, errorHeaders, "{ \"message\": \"Internal Server Error\" }");
+        }
+
+    }
+
+    private class NettyResponseHandler implements VirtualResponseHandler {
+        AwsProxyResponse responseBuilder = new AwsProxyResponse();
+        ByteArrayOutputStream baos;
+        WritableByteChannel byteChannel;
+        final AwsProxyRequest request;
+        CompletableFuture<AwsProxyResponse> future = new CompletableFuture<>();
+
+        public NettyResponseHandler(AwsProxyRequest request) {
+            this.request = request;
+        }
+
+        public CompletableFuture<AwsProxyResponse> getFuture() {
+            return future;
+        }
+
+        @Override
+        public void handleMessage(Object msg) {
+            try {
+                //log.info("Got message: " + msg.getClass().getName());
+
+                if (msg instanceof HttpResponse) {
+                    HttpResponse res = (HttpResponse) msg;
+                    responseBuilder.setStatusCode(res.status().code());
+
+                    if (request.getRequestSource() == AwsProxyRequest.RequestSource.ALB) {
+                        responseBuilder.setStatusDescription(res.status().reasonPhrase());
+                    }
+                    responseBuilder.setMultiValueHeaders(new Headers());
+                    for (String name : res.headers().names()) {
+                        for (String v : res.headers().getAll(name)) {
+                            responseBuilder.getMultiValueHeaders().add(name, v);
+                        }
+                    }
+                }
+                if (msg instanceof HttpContent) {
+                    HttpContent content = (HttpContent) msg;
+                    int readable = content.content().readableBytes();
+                    if (baos == null && readable > 0) {
+                        baos = createByteStream();
+                    }
+                    for (int i = 0; i < readable; i++) {
+                        baos.write(content.content().readByte());
+                    }
+                }
+                if (msg instanceof FileRegion) {
+                    FileRegion file = (FileRegion) msg;
+                    if (file.count() > 0 && file.transferred() < file.count()) {
+                        if (baos == null)
+                            baos = createByteStream();
+                        if (byteChannel == null)
+                            byteChannel = Channels.newChannel(baos);
+                        file.transferTo(byteChannel, file.transferred());
+                    }
+                }
+                if (msg instanceof LastHttpContent) {
+                    if (baos != null) {
+                        if (isBinary(responseBuilder.getMultiValueHeaders().getFirst("Content-Type"))) {
+                            responseBuilder.setBase64Encoded(true);
+                            responseBuilder.setBody(Base64.getMimeEncoder().encodeToString(baos.toByteArray()));
+                        } else {
+                            responseBuilder.setBody(new String(baos.toByteArray(), StandardCharsets.UTF_8));
+                        }
+                    }
+                    future.complete(responseBuilder);
+                }
+            } catch (Throwable ex) {
+                future.completeExceptionally(ex);
+            } finally {
+                if (msg != null) {
+                    ReferenceCountUtil.release(msg);
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+            if (!future.isDone())
+                future.completeExceptionally(new RuntimeException("Connection closed"));
+        }
+    }
+
+    private AwsProxyResponse nettyDispatch(InetSocketAddress clientAddress, AwsProxyRequest request, Context context)
+            throws Exception {
+        String path = request.getPath();
+        //log.info("---- Got lambda request: " + path);
+        if (request.getMultiValueQueryStringParameters() != null && !request.getMultiValueQueryStringParameters().isEmpty()) {
+            StringBuilder sb = new StringBuilder(path);
+            sb.append("?");
+            boolean first = true;
+            for (Map.Entry<String, List<String>> e : request.getMultiValueQueryStringParameters().entrySet()) {
+                for (String v : e.getValue()) {
+                    if (first) {
+                        first = false;
+                    } else {
+                        sb.append("&");
+                    }
+                    if (request.getRequestSource() == AwsProxyRequest.RequestSource.ALB) {
+                        sb.append(e.getKey());
+                        sb.append("=");
+                        sb.append(v);
+                    } else {
+                        sb.append(URLEncoder.encode(e.getKey(), StandardCharsets.UTF_8.name()));
+                        sb.append("=");
+                        sb.append(URLEncoder.encode(v, StandardCharsets.UTF_8.name()));
+                    }
+                }
+            }
+            path = sb.toString();
+        }
+        QuarkusHttpHeaders quarkusHeaders = new QuarkusHttpHeaders();
+        quarkusHeaders.setContextObject(Context.class, context);
+        quarkusHeaders.setContextObject(AwsProxyRequestContext.class, request.getRequestContext());
+        DefaultHttpRequest nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1,
+                HttpMethod.valueOf(request.getHttpMethod()), path, quarkusHeaders);
+        if (request.getMultiValueHeaders() != null) { //apparently this can be null if no headers are sent
+            for (Map.Entry<String, List<String>> header : request.getMultiValueHeaders().entrySet()) {
+                nettyRequest.headers().add(header.getKey(), header.getValue());
+            }
+        }
+        if (!nettyRequest.headers().contains(HttpHeaderNames.HOST)) {
+            nettyRequest.headers().add(HttpHeaderNames.HOST, "localhost");
+        }
+
+        HttpContent requestContent = LastHttpContent.EMPTY_LAST_CONTENT;
+        if (request.getBody() != null) {
+            if (request.isBase64Encoded()) {
+                ByteBuf body = Unpooled.wrappedBuffer(Base64.getMimeDecoder().decode(request.getBody()));
+                requestContent = new DefaultLastHttpContent(body);
+            } else {
+                ByteBuf body = Unpooled.copiedBuffer(request.getBody(), StandardCharsets.UTF_8); //TODO: do we need to look at the request encoding?
+                requestContent = new DefaultLastHttpContent(body);
+            }
+        }
+        NettyResponseHandler handler = new NettyResponseHandler(request);
+        VirtualClientConnection connection = VirtualClientConnection.connect(handler, VertxHttpRecorder.VIRTUAL_HTTP,
+                clientAddress);
+
+        connection.sendMessage(nettyRequest);
+        connection.sendMessage(requestContent);
+        try {
+            return handler.getFuture().get();
+        } finally {
+            connection.close();
+        }
+    }
+
+    private ByteArrayOutputStream createByteStream() {
+        ByteArrayOutputStream baos;
+        baos = new ByteArrayOutputStream(BUFFER_SIZE);
+        return baos;
+    }
+
+    private boolean isBinary(String contentType) {
+        if (contentType != null) {
+            int index = contentType.indexOf(';');
+            if (index >= 0) {
+                return LambdaContainerHandler.getContainerConfig().isBinaryContentType(contentType.substring(0, index));
+            } else {
+                return LambdaContainerHandler.getContainerConfig().isBinaryContentType(contentType);
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AlbContext.java
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java
similarity index 96%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java
index a66872f72cbe2..293ea5f7db49a 100644
--- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java
+++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayAuthorizerContext.java
@@ -43,6 +43,10 @@ public class ApiGatewayAuthorizerContext {
     //-------------------------------------------------------------
 
     @JsonAnyGetter
+    public Map<String, String> getContextProperties() {
+        return contextProperties;
+    }
+
     public String getContextValue(String key) {
         return contextProperties.get(key);
     }
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ApiGatewayRequestIdentity.java
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequest.java
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyRequestContext.java
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/AwsProxyResponse.java
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/CognitoAuthorizerClaims.java
diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java
similarity index 100%
rename from extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java
rename to extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/ErrorModel.java
diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java
new file mode 100644
index 0000000000000..f9115351d2835
--- /dev/null
+++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/Headers.java
@@ -0,0 +1,10 @@
+package io.quarkus.amazon.lambda.http.model;
+
+public class Headers extends MultiValuedTreeMap<String, String> {
+
+    private static final long serialVersionUID = 42L;
+
+    public Headers() {
+        super(String.CASE_INSENSITIVE_ORDER);
+    }
+}
diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java
new file mode 100644
index 0000000000000..2ee1669bf7198
--- /dev/null
+++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/model/MultiValuedTreeMap.java
@@ -0,0 +1,201 @@
+package io.quarkus.amazon.lambda.http.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * Simple implementation of a multi valued tree map to use for case-insensitive headers
+ *
+ * @param <Key> The type for the map key
+ * @param <Value> The type for the map values
+ */
+public class MultiValuedTreeMap<Key, Value> implements Map<Key, List<Value>>, Serializable, Cloneable {
+
+    private static final long serialVersionUID = 42L;
+
+    private final Map<Key, List<Value>> map;
+
+    public MultiValuedTreeMap() {
+        map = new TreeMap<>();
+    }
+
+    public MultiValuedTreeMap(Comparator<Key> comparator) {
+        map = new TreeMap<>(comparator);
+    }
+
+    public void add(Key key, Value value) {
+        List<Value> values = findKey(key);
+        values.add(value);
+    }
+
+    public Value getFirst(Key key) {
+        List<Value> values = get(key);
+        if (values == null || values.size() == 0) {
+            return null;
+        }
+        return values.get(0);
+    }
+
+    public void putSingle(Key key, Value value) {
+        List<Value> values = findKey(key);
+        values.clear();
+        values.add(value);
+    }
+
+    @Override
+    public void clear() {
+        map.clear();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return map.containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return map.containsValue(value);
+    }
+
+    @Override
+    public Set<Entry<Key, List<Value>>> entrySet() {
+        return map.entrySet();
+    }
+
+    public boolean equals(Object o) {
+        return map.equals(o);
+    }
+
+    @Override
+    public List<Value> get(Object key) {
+        return map.get(key);
+    }
+
+    public int hashCode() {
+        return map.hashCode();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    @Override
+    public Set<Key> keySet() {
+        return map.keySet();
+    }
+
+    @Override
+    public List<Value> put(Key key, List<Value> value) {
+        return map.put(key, value);
+    }
+
+    @Override
+    public void putAll(Map<? extends Key, ? extends List<Value>> t) {
+        map.putAll(t);
+    }
+
+    @Override
+    public List<Value> remove(Object key) {
+        return map.remove(key);
+    }
+
+    @Override
+    public int size() {
+        return map.size();
+    }
+
+    @Override
+    public Collection<List<Value>> values() {
+        return map.values();
+    }
+
+    public void addAll(Key key, Value... newValues) {
+        for (Value value : newValues) {
+            add(key, value);
+        }
+    }
+
+    public void addAll(Key key, List<Value> valueList) {
+        for (Value value : valueList) {
+            add(key, value);
+        }
+    }
+
+    public void addFirst(Key key, Value value) {
+        List<Value> values = get(key);
+        if (values == null) {
+            add(key, value);
+            return;
+        } else {
+            values.add(0, value);
+        }
+    }
+
+    public boolean equalsIgnoreValueOrder(MultiValuedTreeMap<Key, Value> vmap) {
+        if (this == vmap) {
+            return true;
+        }
+        if (!keySet().equals(vmap.keySet())) {
+            return false;
+        }
+        for (Entry<Key, List<Value>> e : entrySet()) {
+            List<Value> olist = vmap.get(e.getKey());
+            if (e.getValue().size() != olist.size()) {
+                return false;
+            }
+            for (Value v : e.getValue()) {
+                if (!olist.contains(v)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private List<Value> findKey(Key key) {
+        List<Value> values = this.get(key);
+        if (values == null) {
+            values = new ArrayList<>();
+            put(key, values);
+        }
+        return values;
+    }
+
+    @Override
+    public MultiValuedTreeMap<Key, Value> clone() {
+        MultiValuedTreeMap<Key, Value> clone = new MultiValuedTreeMap<>();
+        for (Key key : keySet()) {
+            List<Value> value = get(key);
+            List<Value> newValue = new ArrayList<>(value);
+            clone.put(key, newValue);
+        }
+        return clone;
+    }
+
+    public String toString() {
+        StringBuilder result = new StringBuilder();
+        String delim = ",";
+        for (Object name : keySet()) {
+            for (Object value : get(name)) {
+                result.append(delim);
+                if (name == null) {
+                    result.append("null"); //$NON-NLS-1$
+                } else {
+                    result.append(name.toString());
+                }
+                if (value != null) {
+                    result.append('=');
+                    result.append(value.toString());
+                }
+            }
+        }
+        return "[" + result.toString() + "]";
+    }
+}
diff --git a/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..01e578e12c75e
--- /dev/null
+++ b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "AWS Lambda Gateway REST API"
+metadata:
+  keywords:
+  - "lambda"
+  - "aws"
+  - "amazon"
+  - "http"
+  - "rest"
+  categories:
+  - "cloud"
+  guide: "https://quarkus.io/guides/amazon-lambda-http"
+  status: "preview"
diff --git a/extensions/amazon-lambda-xray/deployment/pom.xml b/extensions/amazon-lambda-xray/deployment/pom.xml
index 82361891992a8..96bff089902ee 100644
--- a/extensions/amazon-lambda-xray/deployment/pom.xml
+++ b/extensions/amazon-lambda-xray/deployment/pom.xml
@@ -23,10 +23,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-amazon-lambda-xray</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/extensions/amazon-lambda-xray/pom.xml b/extensions/amazon-lambda-xray/pom.xml
index 7be7d2070003d..017de6ed72fad 100644
--- a/extensions/amazon-lambda-xray/pom.xml
+++ b/extensions/amazon-lambda-xray/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-amazon-lambda-xray-parent</artifactId>
diff --git a/extensions/amazon-lambda-xray/runtime/pom.xml b/extensions/amazon-lambda-xray/runtime/pom.xml
index abf9c24e25746..a219a49bdb9b0 100644
--- a/extensions/amazon-lambda-xray/runtime/pom.xml
+++ b/extensions/amazon-lambda-xray/runtime/pom.xml
@@ -31,6 +31,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index bbb79f645a17c..a0b9c03843af7 100644
--- a/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -6,6 +6,7 @@ metadata:
   - "aws"
   - "amazon"
   - "xray"
+  guide: "https://quarkus.io/guides/amazon-lambda#tracing-with-aws-xray-and-graalvm"
   categories:
   - "cloud"
   status: "preview"
diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java
index 93ead288f693a..df692697ed573 100644
--- a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java
+++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java
@@ -14,12 +14,21 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
+import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeBuild;
-import io.quarkus.jackson.ObjectMapperProducer;
+import io.quarkus.deployment.pkg.steps.NativeSourcesBuild;
+import io.quarkus.jackson.runtime.ObjectMapperProducer;
 import io.quarkus.runtime.LaunchMode;
 
 @SuppressWarnings("unchecked")
 public final class AmazonLambdaCommonProcessor {
+
+    @BuildStep(onlyIf = NativeSourcesBuild.class)
+    void failForNativeSources(BuildProducer<ArtifactResultBuildItem> artifactResultProducer) {
+        throw new IllegalArgumentException(
+                "The Amazon Lambda extensions are incompatible with the 'native-sources' package type.");
+    }
+
     /**
      * Lambda custom runtime does not like ipv6.
      */
diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/FunctionZipProcessor.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/FunctionZipProcessor.java
index 436139236c923..bcc32c6967a36 100644
--- a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/FunctionZipProcessor.java
+++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/FunctionZipProcessor.java
@@ -19,19 +19,25 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
+import io.quarkus.deployment.pkg.builditem.LegacyJarRequiredBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeBuild;
 
 /**
- * Generate deployoment package zip for lambda.
+ * Generate deployment package zip for lambda.
  *
  */
 public class FunctionZipProcessor {
     private static final Logger log = Logger.getLogger(FunctionZipProcessor.class);
 
+    @BuildStep(onlyIf = IsNormal.class, onlyIfNot = NativeBuild.class)
+    public void requireLegacy(BuildProducer<LegacyJarRequiredBuildItem> required) {
+        required.produce(new LegacyJarRequiredBuildItem());
+    }
+
     /**
-     * Function.zip is same as the jar plus dependencies in lib/ if not uberjar
+     * Function.zip is same as the runner jar plus dependencies in lib/
      * plus anything in src/main/zip.jvm
      *
      * @param target
diff --git a/extensions/amazon-lambda/common-deployment/src/main/resources/lambda/manage.sh b/extensions/amazon-lambda/common-deployment/src/main/resources/lambda/manage.sh
index c4f0f732e15a2..6990202eca9ea 100644
--- a/extensions/amazon-lambda/common-deployment/src/main/resources/lambda/manage.sh
+++ b/extensions/amazon-lambda/common-deployment/src/main/resources/lambda/manage.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 function cmd_create() {
   echo Creating function
@@ -55,12 +55,12 @@ RUNTIME=java11
 ZIP_FILE=${targetUri}
 
 function usage() {
-  [ "_$1" == "_" ] && echo "\nUsage (JVM): \n$0 [create|delete|invoke]\ne.g.: $0 invoke"
-  [ "_$1" == "_" ] && echo "\nUsage (Native): \n$0 native [create|delete|invoke]\ne.g.: $0 native invoke"
+  [ "_$1" == "_" ] && echo -e "\nUsage (JVM): \n$0 [create|delete|invoke]\ne.g.: $0 invoke"
+  [ "_$1" == "_" ] && echo -e "\nUsage (Native): \n$0 native [create|delete|invoke]\ne.g.: $0 native invoke"
 
-  [ "_" == "_`which aws 2>/dev/null`" ] && echo "\naws CLI not installed. Please see https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html"
-  [ ! -e $HOME/.aws/credentials ] && [ "_$AWS_ACCESS_KEY_ID" == "_" ] && echo "\naws configure not setup.  Please execute: aws configure"
-  [ "_$LAMBDA_ROLE_ARN" == "_" ] && echo "\nEnvironment variable must be set: LAMBDA_ROLE_ARN\ne.g.: export LAMBDA_ROLE_ARN=arn:aws:iam::123456789012:role/my-example-role"
+  [ "_" == "_`which aws 2>/dev/null`" ] && echo -e "\naws CLI not installed. Please see https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html"
+  [ ! -e $HOME/.aws/credentials ] && [ "_$AWS_ACCESS_KEY_ID" == "_" ] && echo -e "\naws configure not setup.  Please execute: aws configure"
+  [ "_$LAMBDA_ROLE_ARN" == "_" ] && echo -e "\nEnvironment variable must be set: LAMBDA_ROLE_ARN\ne.g.: export LAMBDA_ROLE_ARN=arn:aws:iam::123456789012:role/my-example-role"
 }
 
 if [ "_$1" == "_" ] || [ "$1" == "help" ]
diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java
index 347f0b3d4c845..0777ce720e8a6 100644
--- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java
+++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java
@@ -14,7 +14,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.ObjectWriter;
 
 import io.quarkus.runtime.Application;
 import io.quarkus.runtime.ShutdownContext;
@@ -37,7 +36,6 @@ public AbstractLambdaPollLoop(ObjectMapper objectMapper, ObjectReader cognitoIdR
     public void startPollLoop(ShutdownContext context) {
 
         final AtomicBoolean running = new AtomicBoolean(true);
-
         final Thread pollingThread = new Thread(new Runnable() {
             @SuppressWarnings("unchecked")
             @Override
@@ -123,8 +121,11 @@ public void run() {
                 }
             }
         }, "Lambda Thread");
+        pollingThread.setDaemon(true);
         context.addShutdownTask(() -> {
             running.set(false);
+            //note that this does not seem to be 100% reliable in unblocking the thread
+            //which is why it is a daemon.
             pollingThread.interrupt();
         });
         pollingThread.start();
@@ -144,9 +145,9 @@ public void run() {
     protected abstract void processRequest(InputStream input, OutputStream output, AmazonLambdaContext context)
             throws Exception;
 
-    protected abstract ObjectReader getInputReader();
+    protected abstract LambdaInputReader getInputReader();
 
-    protected abstract ObjectWriter getOutputWriter();
+    protected abstract LambdaOutputWriter getOutputWriter();
 
     protected AmazonLambdaContext createContext(HttpURLConnection requestConnection) throws IOException {
         return new AmazonLambdaContext(requestConnection, cognitoIdReader, clientCtxReader);
@@ -202,4 +203,4 @@ boolean abortGracefully(Exception ex) {
         return graceful;
     }
 
-}
\ No newline at end of file
+}
diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonInputReader.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonInputReader.java
new file mode 100644
index 0000000000000..e66a774548c7b
--- /dev/null
+++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonInputReader.java
@@ -0,0 +1,19 @@
+package io.quarkus.amazon.lambda.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.fasterxml.jackson.databind.ObjectReader;
+
+public class JacksonInputReader implements LambdaInputReader {
+    final private ObjectReader reader;
+
+    public JacksonInputReader(ObjectReader reader) {
+        this.reader = reader;
+    }
+
+    @Override
+    public Object readValue(InputStream is) throws IOException {
+        return reader.readValue(is);
+    }
+}
diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java
new file mode 100644
index 0000000000000..d950a57f741cf
--- /dev/null
+++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java
@@ -0,0 +1,19 @@
+package io.quarkus.amazon.lambda.runtime;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+public class JacksonOutputWriter implements LambdaOutputWriter {
+    final private ObjectWriter writer;
+
+    public JacksonOutputWriter(ObjectWriter writer) {
+        this.writer = writer;
+    }
+
+    @Override
+    public void writeValue(OutputStream os, Object obj) throws IOException {
+        writer.writeValue(os, obj);
+    }
+}
diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaInputReader.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaInputReader.java
new file mode 100644
index 0000000000000..ff9574d608715
--- /dev/null
+++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaInputReader.java
@@ -0,0 +1,8 @@
+package io.quarkus.amazon.lambda.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface LambdaInputReader<T> {
+    T readValue(InputStream is) throws IOException;
+}
diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java
new file mode 100644
index 0000000000000..d9de5be4e9ff0
--- /dev/null
+++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java
@@ -0,0 +1,8 @@
+package io.quarkus.amazon.lambda.runtime;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public interface LambdaOutputWriter {
+    void writeValue(OutputStream os, Object obj) throws IOException;
+}
diff --git a/extensions/amazon-lambda/common-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda/common-runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..135c2caef5587
--- /dev/null
+++ b/extensions/amazon-lambda/common-runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,4 @@
+---
+name: "AWS Lambda Common"
+metadata:
+  unlisted: true
diff --git a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java
index fa3a57f31263b..128109ea22523 100644
--- a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java
+++ b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java
@@ -118,8 +118,16 @@ List<AmazonLambdaBuildItem> discover(CombinedIndexBuildItem combinedIndexBuildIt
                             break;
                         } else if (method.parameters().size() == 2
                                 && !method.parameters().get(0).name().equals(DotName.createSimple(Object.class.getName()))) {
-                            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(method.parameters().get(0)));
-                            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(method.returnType()));
+                            String source = getClass().getSimpleName() + " > " + method.declaringClass() + "[" + method + "]";
+
+                            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                                    .type(method.parameters().get(0))
+                                    .source(source)
+                                    .build());
+                            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                                    .type(method.returnType())
+                                    .source(source)
+                                    .build());
                             done = true;
                             break;
                         }
diff --git a/extensions/amazon-lambda/maven-archetype/pom.xml b/extensions/amazon-lambda/maven-archetype/pom.xml
index 958d7c2f6d6fb..32e7bcd3439bf 100644
--- a/extensions/amazon-lambda/maven-archetype/pom.xml
+++ b/extensions/amazon-lambda/maven-archetype/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-amazon-lambda-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6a193f75b4558..adf934726668b 100644
--- a/extensions/amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -9,7 +9,7 @@ to you 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
+  https://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
diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 6d91e08c433d9..d43f3f1d25ef6 100644
--- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -84,25 +84,9 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>\${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/extensions/amazon-lambda/pom.xml b/extensions/amazon-lambda/pom.xml
index 74a5fdbd938c9..71ccac1880aee 100644
--- a/extensions/amazon-lambda/pom.xml
+++ b/extensions/amazon-lambda/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-amazon-lambda-parent</artifactId>
diff --git a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java
index 5374bf6c47943..025873490e433 100644
--- a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java
+++ b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java
@@ -12,10 +12,10 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import com.amazonaws.services.lambda.runtime.events.S3Event;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.ObjectWriter;
 
+import io.quarkus.amazon.lambda.runtime.handlers.S3EventInputReader;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
@@ -32,8 +32,8 @@ public class AmazonLambdaRecorder {
     private static Class<? extends RequestHandler<?, ?>> handlerClass;
     private static Class<? extends RequestStreamHandler> streamHandlerClass;
     private static BeanContainer beanContainer;
-    private static ObjectReader objectReader;
-    private static ObjectWriter objectWriter;
+    private static LambdaInputReader objectReader;
+    private static LambdaOutputWriter objectWriter;
 
     public void setStreamHandlerClass(Class<? extends RequestStreamHandler> handler, BeanContainer container) {
         streamHandlerClass = handler;
@@ -45,8 +45,12 @@ public void setHandlerClass(Class<? extends RequestHandler<?, ?>> handler, BeanC
         beanContainer = container;
         ObjectMapper objectMapper = AmazonLambdaMapperRecorder.objectMapper;
         Method handlerMethod = discoverHandlerMethod(handlerClass);
-        objectReader = objectMapper.readerFor(handlerMethod.getParameterTypes()[0]);
-        objectWriter = objectMapper.writerFor(handlerMethod.getReturnType());
+        if (handlerMethod.getParameterTypes()[0].equals(S3Event.class)) {
+            objectReader = new S3EventInputReader(objectMapper);
+        } else {
+            objectReader = new JacksonInputReader(objectMapper.readerFor(handlerMethod.getParameterTypes()[0]));
+        }
+        objectWriter = new JacksonOutputWriter(objectMapper.writerFor(handlerMethod.getReturnType()));
     }
 
     /**
@@ -80,9 +84,12 @@ private Method discoverHandlerMethod(Class<? extends RequestHandler<?, ?>> handl
                 }
             }
         }
-        if (method == null) {
+        if (method == null && methods.length > 0) {
             method = methods[0];
         }
+        if (method == null) {
+            throw new RuntimeException("Unable to find a method which handles request on handler class " + handlerClass);
+        }
         return method;
     }
 
@@ -149,12 +156,12 @@ protected Object processRequest(Object input, AmazonLambdaContext context) throw
             }
 
             @Override
-            protected ObjectReader getInputReader() {
+            protected LambdaInputReader getInputReader() {
                 return objectReader;
             }
 
             @Override
-            protected ObjectWriter getOutputWriter() {
+            protected LambdaOutputWriter getOutputWriter() {
                 return objectWriter;
             }
 
diff --git a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/handlers/JacksonUtil.java b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/handlers/JacksonUtil.java
new file mode 100644
index 0000000000000..ef02659f069db
--- /dev/null
+++ b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/handlers/JacksonUtil.java
@@ -0,0 +1,15 @@
+package io.quarkus.amazon.lambda.runtime.handlers;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class JacksonUtil {
+    public static String getText(String name, JsonNode node) {
+        JsonNode e = node.get(name);
+        return e == null ? null : e.asText();
+    }
+
+    public static Long getLong(String name, JsonNode node) {
+        JsonNode e = node.get(name);
+        return e == null ? null : e.asLong();
+    }
+}
diff --git a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/handlers/S3EventInputReader.java b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/handlers/S3EventInputReader.java
new file mode 100644
index 0000000000000..602c602259b44
--- /dev/null
+++ b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/handlers/S3EventInputReader.java
@@ -0,0 +1,97 @@
+package io.quarkus.amazon.lambda.runtime.handlers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.amazonaws.services.lambda.runtime.events.S3Event;
+import com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.amazon.lambda.runtime.LambdaInputReader;
+
+public class S3EventInputReader implements LambdaInputReader<S3Event> {
+    final ObjectMapper mapper;
+
+    public S3EventInputReader(ObjectMapper mapper) {
+        this.mapper = mapper;
+    }
+
+    @Override
+    public S3Event readValue(InputStream is) throws IOException {
+        JsonNode json = mapper.readTree(is);
+        JsonNode records = json.get("Records");
+        if (records == null || !records.isArray()) {
+            return new S3Event(Collections.EMPTY_LIST);
+        }
+        List<S3EventNotification.S3EventNotificationRecord> list = new ArrayList<>();
+
+        for (int i = 0; i < records.size(); i++) {
+            JsonNode record = records.get(i);
+            String awsRegion = JacksonUtil.getText("awsRegion", record);
+            String eventName = JacksonUtil.getText("eventName", record);
+            String eventSource = JacksonUtil.getText("eventSource", record);
+            String eventTime = JacksonUtil.getText("eventTime", record);
+            String eventVersion = JacksonUtil.getText("eventVersion", record);
+            JsonNode params = record.get("requestParameters");
+            S3EventNotification.RequestParametersEntity requestParameters = null;
+            if (params != null) {
+                requestParameters = new S3EventNotification.RequestParametersEntity(
+                        JacksonUtil.getText("sourceIPAddress", params));
+            }
+            JsonNode elems = record.get("responseElements");
+            S3EventNotification.ResponseElementsEntity responseElements = null;
+            if (elems != null) {
+                String requestId = JacksonUtil.getText("x-amz-request-id", elems);
+                String id = JacksonUtil.getText("x-amz-id-2", elems);
+                responseElements = new S3EventNotification.ResponseElementsEntity(id, requestId);
+            }
+            JsonNode userIdentity = record.get("userIdentity");
+            S3EventNotification.UserIdentityEntity userId = null;
+            if (userIdentity != null) {
+                String principalId = JacksonUtil.getText("principalId", userIdentity);
+                userId = new S3EventNotification.UserIdentityEntity(principalId);
+            }
+
+            JsonNode s3 = record.get("s3");
+            S3EventNotification.S3Entity s3Entity = null;
+            if (s3 != null) {
+                String configurationId = JacksonUtil.getText("configurationId", s3);
+                String schemaVersion = JacksonUtil.getText("s3SchemaVersion", s3);
+                JsonNode bucketNode = s3.get("bucket");
+                S3EventNotification.S3BucketEntity bucket = null;
+                if (bucketNode != null) {
+                    String name = JacksonUtil.getText("name", bucketNode);
+                    JsonNode ownerIdentity = bucketNode.get("ownerIdentity");
+                    S3EventNotification.UserIdentityEntity owner = null;
+                    if (ownerIdentity != null) {
+                        String principalId = JacksonUtil.getText("principalId", ownerIdentity);
+                        owner = new S3EventNotification.UserIdentityEntity(principalId);
+                    }
+                    String arn = JacksonUtil.getText("arn", bucketNode);
+                    bucket = new S3EventNotification.S3BucketEntity(name, owner, arn);
+                }
+                JsonNode object = s3.get("object");
+                S3EventNotification.S3ObjectEntity obj = null;
+                if (object != null) {
+                    String key = JacksonUtil.getText("key", object);
+                    Long size = JacksonUtil.getLong("size", object);
+                    String eTag = JacksonUtil.getText("eTag", object);
+                    String versionId = JacksonUtil.getText("versionId", object);
+                    String sequencer = JacksonUtil.getText("sequencer", object);
+                    obj = new S3EventNotification.S3ObjectEntity(key, size, eTag, versionId, sequencer);
+                }
+                s3Entity = new S3EventNotification.S3Entity(configurationId, bucket, obj, schemaVersion);
+            }
+            S3EventNotification.S3EventNotificationRecord r = new S3EventNotification.S3EventNotificationRecord(awsRegion,
+                    eventName, eventSource, eventTime,
+                    eventVersion, requestParameters,
+                    responseElements, s3Entity, userId);
+            list.add(r);
+        }
+        return new S3Event(list);
+    }
+}
diff --git a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index ee534812a3b46..caa4652ad141a 100644
--- a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,11 +1,15 @@
----
 name: "AWS Lambda"
 metadata:
   keywords:
-  - "lambda"
-  - "aws"
-  - "amazon"
+    - "lambda"
+    - "aws"
+    - "amazon"
   categories:
-  - "cloud"
+    - "cloud"
   guide: "https://quarkus.io/guides/amazon-lambda"
   status: "preview"
+  codestart:
+    name: "amazon-lambda"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/amazon-lambda/runtime/src/test/java/io/quarkus/amazon/lambda/runtime/S3EventTest.java b/extensions/amazon-lambda/runtime/src/test/java/io/quarkus/amazon/lambda/runtime/S3EventTest.java
new file mode 100644
index 0000000000000..400759f43e959
--- /dev/null
+++ b/extensions/amazon-lambda/runtime/src/test/java/io/quarkus/amazon/lambda/runtime/S3EventTest.java
@@ -0,0 +1,85 @@
+package io.quarkus.amazon.lambda.runtime;
+
+import java.io.ByteArrayInputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.amazonaws.services.lambda.runtime.events.S3Event;
+import com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.amazon.lambda.runtime.handlers.S3EventInputReader;
+
+public class S3EventTest {
+
+    static String json = "{\n" +
+            "  \"Records\":[\n" +
+            "    {\n" +
+            "      \"eventVersion\":\"2.0\",\n" +
+            "      \"eventSource\":\"aws:s3\",\n" +
+            "      \"awsRegion\":\"us-west-2\",\n" +
+            "      \"eventTime\":\"1970-01-01T00:00:00.000Z\",\n" +
+            "      \"eventName\":\"ObjectCreated:Put\",\n" +
+            "      \"userIdentity\":{\n" +
+            "        \"principalId\":\"AIDAJDPLRKLG7UEXAMPLE\"\n" +
+            "      },\n" +
+            "      \"requestParameters\":{\n" +
+            "        \"sourceIPAddress\":\"127.0.0.1\"\n" +
+            "      },\n" +
+            "      \"responseElements\":{\n" +
+            "        \"x-amz-request-id\":\"C3D13FE58DE4C810\",\n" +
+            "        \"x-amz-id-2\":\"FMyUVURIY8/IgAtTv8xRjskZQpcIZ9KG4V5Wp6S7S/JRWeUWerMUE5JgHvANOjpD\"\n" +
+            "      },\n" +
+            "      \"s3\":{\n" +
+            "        \"s3SchemaVersion\":\"1.0\",\n" +
+            "        \"configurationId\":\"testConfigRule\",\n" +
+            "        \"bucket\":{\n" +
+            "          \"name\":\"sourcebucket\",\n" +
+            "          \"ownerIdentity\":{\n" +
+            "            \"principalId\":\"A3NL1KOZZKExample\"\n" +
+            "          },\n" +
+            "          \"arn\":\"arn:aws:s3:::sourcebucket\"\n" +
+            "        },\n" +
+            "        \"object\":{\n" +
+            "          \"key\":\"HappyFace.jpg\",\n" +
+            "          \"size\":1024,\n" +
+            "          \"eTag\":\"d41d8cd98f00b204e9800998ecf8427e\",\n" +
+            "          \"versionId\":\"096fKKXTRTtl3on89fVO.nfljtsv6qko\"\n" +
+            "        }\n" +
+            "      }\n" +
+            "    }\n" +
+            "  ]\n" +
+            "}";
+
+    @Test
+    public void testParse() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        S3EventInputReader reader = new S3EventInputReader(mapper);
+        ByteArrayInputStream is = new ByteArrayInputStream(json.getBytes());
+        S3Event event = reader.readValue(is);
+        Assertions.assertEquals(1, event.getRecords().size());
+        S3EventNotification.S3EventNotificationRecord record = event.getRecords().get(0);
+        Assertions.assertEquals("2.0", record.getEventVersion());
+        Assertions.assertEquals("aws:s3", record.getEventSource());
+        Assertions.assertEquals("us-west-2", record.getAwsRegion());
+        Assertions.assertEquals("1970-01-01T00:00:00.000Z", record.getEventTime().toString());
+        Assertions.assertEquals("ObjectCreated:Put", record.getEventName());
+        Assertions.assertEquals("AIDAJDPLRKLG7UEXAMPLE", record.getUserIdentity().getPrincipalId());
+        Assertions.assertEquals("127.0.0.1", record.getRequestParameters().getSourceIPAddress());
+        Assertions.assertEquals("C3D13FE58DE4C810", record.getResponseElements().getxAmzRequestId());
+        Assertions.assertEquals("FMyUVURIY8/IgAtTv8xRjskZQpcIZ9KG4V5Wp6S7S/JRWeUWerMUE5JgHvANOjpD",
+                record.getResponseElements().getxAmzId2());
+
+        Assertions.assertEquals("1.0", record.getS3().getS3SchemaVersion());
+        Assertions.assertEquals("testConfigRule", record.getS3().getConfigurationId());
+        Assertions.assertEquals("sourcebucket", record.getS3().getBucket().getName());
+        Assertions.assertEquals("arn:aws:s3:::sourcebucket", record.getS3().getBucket().getArn());
+        Assertions.assertEquals("A3NL1KOZZKExample", record.getS3().getBucket().getOwnerIdentity().getPrincipalId());
+        Assertions.assertEquals("HappyFace.jpg", record.getS3().getObject().getKey());
+        Assertions.assertEquals(1024, record.getS3().getObject().getSizeAsLong());
+        Assertions.assertEquals("d41d8cd98f00b204e9800998ecf8427e", record.getS3().getObject().geteTag());
+        Assertions.assertEquals("096fKKXTRTtl3on89fVO.nfljtsv6qko", record.getS3().getObject().getVersionId());
+
+    }
+}
diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java
index 46b7ae6cf6982..7928a7617e82e 100644
--- a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java
+++ b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java
@@ -7,8 +7,10 @@
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
 
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.common.runtime.AwsConfig;
 import io.quarkus.amazon.common.runtime.NettyHttpClientConfig;
 import io.quarkus.amazon.common.runtime.SdkBuildTimeConfig;
@@ -72,58 +74,103 @@ protected void setupExtension(BeanRegistrationPhaseBuildItem beanRegistrationPha
         }
     }
 
-    public void createTransportBuilders(List<AmazonClientBuildItem> amazonClients,
-            AmazonClientTransportRecorder recorder,
+    protected void createApacheSyncTransportBuilder(List<AmazonClientBuildItem> amazonClients,
+            AmazonClientApacheTransportRecorder recorder,
             SyncHttpClientBuildTimeConfig buildSyncConfig,
             RuntimeValue<SyncHttpClientConfig> syncConfig,
-            RuntimeValue<NettyHttpClientConfig> asyncConfig,
-            BuildProducer<AmazonClientTransportsBuildItem> clientTransports) {
+            BuildProducer<AmazonClientSyncTransportBuildItem> clientSyncTransports) {
 
         Optional<AmazonClientBuildItem> matchingClientBuildItem = amazonClients.stream()
                 .filter(c -> c.getAwsClientName().equals(configName()))
                 .findAny();
 
         matchingClientBuildItem.ifPresent(client -> {
-            RuntimeValue<SdkHttpClient.Builder> syncTransport = null;
-            RuntimeValue<SdkAsyncHttpClient.Builder> asyncTransport = null;
-
-            if (client.getSyncClassName().isPresent()) {
-                syncTransport = recorder.configureSync(configName(), buildSyncConfig,
-                        syncConfig);
+            if (!client.getSyncClassName().isPresent()) {
+                return;
             }
+            if (buildSyncConfig.type != SyncHttpClientBuildTimeConfig.SyncClientType.APACHE) {
+                return;
+            }
+
+            clientSyncTransports.produce(
+                    new AmazonClientSyncTransportBuildItem(
+                            client.getAwsClientName(),
+                            client.getSyncClassName().get(),
+                            recorder.configureSync(configName(), syncConfig)));
+        });
+    }
+
+    protected void createUrlConnectionSyncTransportBuilder(List<AmazonClientBuildItem> amazonClients,
+            AmazonClientUrlConnectionTransportRecorder recorder,
+            SyncHttpClientBuildTimeConfig buildSyncConfig,
+            RuntimeValue<SyncHttpClientConfig> syncConfig,
+            BuildProducer<AmazonClientSyncTransportBuildItem> clientSyncTransports) {
+
+        Optional<AmazonClientBuildItem> matchingClientBuildItem = amazonClients.stream()
+                .filter(c -> c.getAwsClientName().equals(configName()))
+                .findAny();
 
-            if (client.getAsyncClassName().isPresent()) {
-                asyncTransport = recorder.configureAsync(configName(), asyncConfig);
+        matchingClientBuildItem.ifPresent(client -> {
+            if (!client.getSyncClassName().isPresent()) {
+                return;
+            }
+            if (buildSyncConfig.type != SyncHttpClientBuildTimeConfig.SyncClientType.URL) {
+                return;
             }
 
-            clientTransports.produce(
-                    new AmazonClientTransportsBuildItem(
-                            client.getSyncClassName(), client.getAsyncClassName(),
-                            syncTransport,
-                            asyncTransport,
-                            client.getAwsClientName()));
+            clientSyncTransports.produce(
+                    new AmazonClientSyncTransportBuildItem(
+                            client.getAwsClientName(),
+                            client.getSyncClassName().get(),
+                            recorder.configureSync(configName(), syncConfig)));
         });
+    }
 
+    protected void createNettyAsyncTransportBuilder(List<AmazonClientBuildItem> amazonClients,
+            AmazonClientNettyTransportRecorder recorder,
+            RuntimeValue<NettyHttpClientConfig> asyncConfig,
+            BuildProducer<AmazonClientAsyncTransportBuildItem> clientAsyncTransports) {
+
+        Optional<AmazonClientBuildItem> matchingClientBuildItem = amazonClients.stream()
+                .filter(c -> c.getAwsClientName().equals(configName()))
+                .findAny();
+
+        matchingClientBuildItem.ifPresent(client -> {
+            if (!client.getAsyncClassName().isPresent()) {
+                return;
+            }
+
+            clientAsyncTransports.produce(
+                    new AmazonClientAsyncTransportBuildItem(
+                            client.getAwsClientName(),
+                            client.getAsyncClassName().get(),
+                            recorder.configureAsync(configName(), asyncConfig)));
+        });
     }
 
-    protected void createClientBuilders(List<AmazonClientTransportsBuildItem> clients,
+    protected void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncClientBuilders,
+            List<AmazonClientAsyncTransportBuildItem> asyncClientBuilders,
             BuildProducer<AmazonClientBuilderBuildItem> builderProducer,
             Function<RuntimeValue<SdkHttpClient.Builder>, RuntimeValue<AwsClientBuilder>> syncFunc,
             Function<RuntimeValue<SdkAsyncHttpClient.Builder>, RuntimeValue<AwsClientBuilder>> asyncFunc) {
-
-        for (AmazonClientTransportsBuildItem client : clients) {
-            if (configName().equals(client.getAwsClientName())) {
-                RuntimeValue<AwsClientBuilder> syncBuilder = null;
-                RuntimeValue<AwsClientBuilder> asyncBuilder = null;
-                if (client.getSyncClassName().isPresent()) {
-                    syncBuilder = syncFunc.apply(client.getSyncTransport());
-                }
-                if (client.getAsyncClassName().isPresent()) {
-                    asyncBuilder = asyncFunc.apply(client.getAsyncTransport());
-                }
-                builderProducer.produce(new AmazonClientBuilderBuildItem(client.getAwsClientName(), syncBuilder, asyncBuilder));
-            }
+        String configName = configName();
+
+        Optional<RuntimeValue<SdkHttpClient.Builder>> syncClientBuilder = syncClientBuilders.stream()
+                .filter(c -> configName.equals(c.getAwsClientName()))
+                .map(c -> c.getClientBuilder())
+                .findFirst();
+        Optional<RuntimeValue<SdkAsyncHttpClient.Builder>> asyncClientBuilder = asyncClientBuilders.stream()
+                .filter(c -> configName.equals(c.getAwsClientName()))
+                .map(c -> c.getClientBuilder())
+                .findFirst();
+
+        if (!syncClientBuilder.isPresent() && !asyncClientBuilder.isPresent()) {
+            return;
         }
+
+        builderProducer.produce(new AmazonClientBuilderBuildItem(configName,
+                syncClientBuilder.isPresent() ? syncFunc.apply(syncClientBuilder.get()) : null,
+                asyncClientBuilder.isPresent() ? asyncFunc.apply(asyncClientBuilder.get()) : null));
     }
 
     protected void buildClients(List<AmazonClientBuilderConfiguredBuildItem> configuredClients,
diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientAsyncTransportBuildItem.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientAsyncTransportBuildItem.java
new file mode 100644
index 0000000000000..7c44981ab8395
--- /dev/null
+++ b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientAsyncTransportBuildItem.java
@@ -0,0 +1,34 @@
+package io.quarkus.amazon.common.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+
+public final class AmazonClientAsyncTransportBuildItem extends MultiBuildItem {
+
+    private final String awsClientName;
+    private final DotName className;
+    private final RuntimeValue<SdkAsyncHttpClient.Builder> clientBuilder;
+
+    public AmazonClientAsyncTransportBuildItem(String awsClientName,
+            DotName className,
+            RuntimeValue<SdkAsyncHttpClient.Builder> clientBuilder) {
+        this.awsClientName = awsClientName;
+        this.className = className;
+        this.clientBuilder = clientBuilder;
+    }
+
+    public String getAwsClientName() {
+        return awsClientName;
+    }
+
+    public DotName getClassName() {
+        return className;
+    }
+
+    public RuntimeValue<SdkAsyncHttpClient.Builder> getClientBuilder() {
+        return clientBuilder;
+    }
+}
diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientSyncTransportBuildItem.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientSyncTransportBuildItem.java
new file mode 100644
index 0000000000000..6501d3f62543e
--- /dev/null
+++ b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientSyncTransportBuildItem.java
@@ -0,0 +1,34 @@
+package io.quarkus.amazon.common.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+import software.amazon.awssdk.http.SdkHttpClient;
+
+public final class AmazonClientSyncTransportBuildItem extends MultiBuildItem {
+
+    private final String awsClientName;
+    private final DotName className;
+    private final RuntimeValue<SdkHttpClient.Builder> clientBuilder;
+
+    public AmazonClientSyncTransportBuildItem(String awsClientName,
+            DotName className,
+            RuntimeValue<SdkHttpClient.Builder> clientBuilder) {
+        this.awsClientName = awsClientName;
+        this.className = className;
+        this.clientBuilder = clientBuilder;
+    }
+
+    public String getAwsClientName() {
+        return awsClientName;
+    }
+
+    public DotName getClassName() {
+        return className;
+    }
+
+    public RuntimeValue<SdkHttpClient.Builder> getClientBuilder() {
+        return clientBuilder;
+    }
+}
diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientTransportsBuildItem.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientTransportsBuildItem.java
deleted file mode 100644
index 94b00bd12dc66..0000000000000
--- a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientTransportsBuildItem.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.quarkus.amazon.common.deployment;
-
-import java.util.Optional;
-
-import org.jboss.jandex.DotName;
-
-import io.quarkus.builder.item.MultiBuildItem;
-import io.quarkus.runtime.RuntimeValue;
-import software.amazon.awssdk.http.SdkHttpClient;
-import software.amazon.awssdk.http.SdkHttpClient.Builder;
-import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
-
-public final class AmazonClientTransportsBuildItem extends MultiBuildItem {
-    private final Optional<DotName> syncClassName;
-    private final Optional<DotName> asyncClassName;
-    private final RuntimeValue<SdkHttpClient.Builder> syncTransport;
-    private final RuntimeValue<SdkAsyncHttpClient.Builder> asyncTransport;
-
-    private final String awsClientName;
-
-    public AmazonClientTransportsBuildItem(Optional<DotName> syncClassName, Optional<DotName> asyncClassName,
-            RuntimeValue<Builder> syncTransport,
-            RuntimeValue<SdkAsyncHttpClient.Builder> asyncTransport,
-            String awsClientName) {
-        this.syncClassName = syncClassName;
-        this.asyncClassName = asyncClassName;
-        this.syncTransport = syncTransport;
-        this.asyncTransport = asyncTransport;
-        this.awsClientName = awsClientName;
-    }
-
-    public Optional<DotName> getSyncClassName() {
-        return syncClassName;
-    }
-
-    public Optional<DotName> getAsyncClassName() {
-        return asyncClassName;
-    }
-
-    public RuntimeValue<Builder> getSyncTransport() {
-        return syncTransport;
-    }
-
-    public RuntimeValue<SdkAsyncHttpClient.Builder> getAsyncTransport() {
-        return asyncTransport;
-    }
-
-    public String getAwsClientName() {
-        return awsClientName;
-    }
-}
diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonHttpClients.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonHttpClients.java
new file mode 100644
index 0000000000000..7642ba22804db
--- /dev/null
+++ b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonHttpClients.java
@@ -0,0 +1,46 @@
+package io.quarkus.amazon.common.deployment;
+
+import java.util.function.BooleanSupplier;
+
+public class AmazonHttpClients {
+
+    public static final String APACHE_HTTP_SERVICE = "software.amazon.awssdk.http.apache.ApacheSdkHttpService";
+    public static final String NETTY_HTTP_SERVICE = "software.amazon.awssdk.http.nio.netty.NettySdkAsyncHttpService";
+    public static final String URL_CONNECTION_HTTP_SERVICE = "software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService";
+
+    public static class IsAmazonApacheHttpServicePresent implements BooleanSupplier {
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName(APACHE_HTTP_SERVICE);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    };
+
+    public static class IsAmazonNettyHttpServicePresent implements BooleanSupplier {
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName(NETTY_HTTP_SERVICE);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    };
+
+    public static class IsAmazonUrlConnectionHttpServicePresent implements BooleanSupplier {
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName(URL_CONNECTION_HTTP_SERVICE);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    };
+}
diff --git a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonServicesClientsProcessor.java b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonServicesClientsProcessor.java
index 92253de931b7a..204f2c50f0a9f 100644
--- a/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonServicesClientsProcessor.java
+++ b/extensions/amazon-services/common/deployment/src/main/java/io/quarkus/amazon/common/deployment/AmazonServicesClientsProcessor.java
@@ -27,10 +27,7 @@
 
 public class AmazonServicesClientsProcessor {
     public static final String AWS_SDK_APPLICATION_ARCHIVE_MARKERS = "software/amazon/awssdk";
-
-    private static final String APACHE_HTTP_SERVICE = "software.amazon.awssdk.http.apache.ApacheSdkHttpService";
-    private static final String NETTY_HTTP_SERVICE = "software.amazon.awssdk.http.nio.netty.NettySdkAsyncHttpService";
-    private static final String URL_HTTP_SERVICE = "software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService";
+    public static final String AWS_SDK_XRAY_ARCHIVE_MARKER = "com/amazonaws/xray";
 
     private static final DotName EXECUTION_INTERCEPTOR_NAME = DotName.createSimple(ExecutionInterceptor.class.getName());
 
@@ -41,8 +38,9 @@ void globalInterceptors(BuildProducer<AmazonClientInterceptorsPathBuildItem> pro
     }
 
     @BuildStep
-    AdditionalApplicationArchiveMarkerBuildItem awsAppArchiveMarkers() {
-        return new AdditionalApplicationArchiveMarkerBuildItem(AWS_SDK_APPLICATION_ARCHIVE_MARKERS);
+    void awsAppArchiveMarkers(BuildProducer<AdditionalApplicationArchiveMarkerBuildItem> archiveMarker) {
+        archiveMarker.produce(new AdditionalApplicationArchiveMarkerBuildItem(AWS_SDK_APPLICATION_ARCHIVE_MARKERS));
+        archiveMarker.produce(new AdditionalApplicationArchiveMarkerBuildItem(AWS_SDK_XRAY_ARCHIVE_MARKER));
     }
 
     @BuildStep
@@ -67,8 +65,9 @@ void setup(CombinedIndexBuildItem combinedIndexBuildItem,
         for (AmazonClientBuildItem client : amazonClients) {
             SdkBuildTimeConfig clientSdkConfig = client.getBuildTimeSdkConfig();
             if (clientSdkConfig != null) {
-                clientSdkConfig.interceptors.orElse(Collections.emptyList()).forEach(interceptorClass -> {
-                    if (!knownInterceptorImpls.contains(interceptorClass.getName())) {
+                clientSdkConfig.interceptors.orElse(Collections.emptyList()).forEach(interceptorClassName -> {
+                    interceptorClassName = interceptorClassName.trim();
+                    if (!knownInterceptorImpls.contains(interceptorClassName)) {
                         throw new ConfigurationError(
                                 String.format(
                                         "quarkus.%s.interceptors (%s) - must list only existing implementations of software.amazon.awssdk.core.interceptor.ExecutionInterceptor",
@@ -92,39 +91,75 @@ void setup(CombinedIndexBuildItem combinedIndexBuildItem,
         final Predicate<AmazonClientBuildItem> isSyncApache = client -> client
                 .getBuildTimeSyncConfig().type == SyncClientType.APACHE;
 
-        //Register only clients that are used
+        // Register what's needed depending on the clients in the classpath and the configuration.
+        // We use the configuration to guide us but if we don't have any clients configured,
+        // we still register what's needed depending on what is in the classpath.
+        boolean isSyncApacheInClasspath = isInClasspath(AmazonHttpClients.APACHE_HTTP_SERVICE);
+        boolean isSyncUrlConnectionInClasspath = isInClasspath(AmazonHttpClients.URL_CONNECTION_HTTP_SERVICE);
+        boolean isAsyncInClasspath = isInClasspath(AmazonHttpClients.NETTY_HTTP_SERVICE);
+
+        // Check that the clients required by the configuration are available
         if (syncTransportNeeded) {
             if (amazonClients.stream().filter(isSyncApache).findAny().isPresent()) {
-                checkClasspath(APACHE_HTTP_SERVICE, "apache-client");
-                //Register Apache client as sync client
-                proxyDefinition
-                        .produce(new NativeImageProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
-                                "org.apache.http.pool.ConnPoolControl",
-                                "software.amazon.awssdk.http.apache.internal.conn.Wrapped"));
-
-                serviceProvider.produce(
-                        new ServiceProviderBuildItem(SdkHttpService.class.getName(), APACHE_HTTP_SERVICE));
+                if (isSyncApacheInClasspath) {
+                    registerSyncApacheClient(proxyDefinition, serviceProvider);
+                } else {
+                    throw missingDependencyException("apache-client");
+                }
+            } else if (isSyncUrlConnectionInClasspath) {
+                registerSyncUrlConnectionClient(serviceProvider);
             } else {
-                checkClasspath(URL_HTTP_SERVICE, "url-connection-client");
-                serviceProvider.produce(new ServiceProviderBuildItem(SdkHttpService.class.getName(), URL_HTTP_SERVICE));
+                throw missingDependencyException("url-connection-client");
+            }
+        } else {
+            // even if we don't register any clients via configuration, we still register the clients
+            // but this time only based on the classpath.
+            if (isSyncApacheInClasspath) {
+                registerSyncApacheClient(proxyDefinition, serviceProvider);
+            } else if (isSyncUrlConnectionInClasspath) {
+                registerSyncUrlConnectionClient(serviceProvider);
             }
         }
 
-        if (asyncTransportNeeded) {
-            checkClasspath(NETTY_HTTP_SERVICE, "netty-nio-client");
-            //Register netty as async client
-            serviceProvider.produce(
-                    new ServiceProviderBuildItem(SdkAsyncHttpService.class.getName(),
-                            NETTY_HTTP_SERVICE));
+        if (isAsyncInClasspath) {
+            registerAsyncNettyClient(serviceProvider);
+        } else if (asyncTransportNeeded) {
+            throw missingDependencyException("netty-nio-client");
         }
     }
 
-    private void checkClasspath(String className, String dependencyName) {
+    private static void registerSyncApacheClient(BuildProducer<NativeImageProxyDefinitionBuildItem> proxyDefinition,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider) {
+        proxyDefinition
+                .produce(new NativeImageProxyDefinitionBuildItem("org.apache.http.conn.HttpClientConnectionManager",
+                        "org.apache.http.pool.ConnPoolControl",
+                        "software.amazon.awssdk.http.apache.internal.conn.Wrapped"));
+
+        serviceProvider.produce(
+                new ServiceProviderBuildItem(SdkHttpService.class.getName(), AmazonHttpClients.APACHE_HTTP_SERVICE));
+    }
+
+    private static void registerSyncUrlConnectionClient(BuildProducer<ServiceProviderBuildItem> serviceProvider) {
+        serviceProvider.produce(
+                new ServiceProviderBuildItem(SdkHttpService.class.getName(), AmazonHttpClients.URL_CONNECTION_HTTP_SERVICE));
+    }
+
+    private static void registerAsyncNettyClient(BuildProducer<ServiceProviderBuildItem> serviceProvider) {
+        serviceProvider.produce(
+                new ServiceProviderBuildItem(SdkAsyncHttpService.class.getName(),
+                        AmazonHttpClients.NETTY_HTTP_SERVICE));
+    }
+
+    private static boolean isInClasspath(String className) {
         try {
             Class.forName(className, true, Thread.currentThread().getContextClassLoader());
+            return true;
         } catch (ClassNotFoundException e) {
-            throw new DeploymentException(
-                    "Missing 'software.amazon.awssdk:" + dependencyName + "' dependency on the classpath");
+            return false;
         }
     }
+
+    private DeploymentException missingDependencyException(String dependencyName) {
+        return new DeploymentException("Missing 'software.amazon.awssdk:" + dependencyName + "' dependency on the classpath");
+    }
 }
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AbstractAmazonClientTransportRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AbstractAmazonClientTransportRecorder.java
new file mode 100644
index 0000000000000..aa2682e0a9c1b
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AbstractAmazonClientTransportRecorder.java
@@ -0,0 +1,115 @@
+package io.quarkus.amazon.common.runtime;
+
+import java.net.URI;
+import java.util.Optional;
+
+import io.quarkus.runtime.RuntimeValue;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.TlsKeyManagersProvider;
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.utils.StringUtils;
+
+public abstract class AbstractAmazonClientTransportRecorder {
+
+    @SuppressWarnings("rawtypes")
+    public RuntimeValue<SdkHttpClient.Builder> configureSync(String clientName,
+            RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) {
+        throw new IllegalStateException("Configuring a sync client is not supported by " + this.getClass().getName());
+    }
+
+    @SuppressWarnings("rawtypes")
+    public RuntimeValue<SdkAsyncHttpClient.Builder> configureAsync(String clientName,
+            RuntimeValue<NettyHttpClientConfig> asyncConfigRuntime) {
+        throw new IllegalStateException("Configuring an async client is not supported by " + this.getClass().getName());
+    }
+
+    protected Optional<TlsKeyManagersProvider> getTlsKeyManagersProvider(TlsKeyManagersProviderConfig config) {
+        if (config.fileStore != null && config.fileStore.path.isPresent() && config.fileStore.type.isPresent()) {
+            return Optional.of(config.type.create(config));
+        }
+        return Optional.empty();
+    }
+
+    protected Optional<TlsTrustManagersProvider> getTlsTrustManagersProvider(TlsTrustManagersProviderConfig config) {
+        if (config.fileStore != null && config.fileStore.path.isPresent() && config.fileStore.type.isPresent()) {
+            return Optional.of(config.type.create(config));
+        }
+        return Optional.empty();
+    }
+
+    protected void validateProxyEndpoint(String extension, URI endpoint, String clientType) {
+        if (StringUtils.isBlank(endpoint.getScheme())) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - scheme must be specified",
+                            extension, clientType, endpoint.toString()));
+        }
+        if (StringUtils.isBlank(endpoint.getHost())) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - host must be specified",
+                            extension, clientType, endpoint.toString()));
+        }
+        if (StringUtils.isNotBlank(endpoint.getUserInfo())) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - user info is not supported.",
+                            extension, clientType, endpoint.toString()));
+        }
+        if (StringUtils.isNotBlank(endpoint.getPath())) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - path is not supported.",
+                            extension, clientType, endpoint.toString()));
+        }
+        if (StringUtils.isNotBlank(endpoint.getQuery())) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - query is not supported.",
+                            extension, clientType, endpoint.toString()));
+        }
+        if (StringUtils.isNotBlank(endpoint.getFragment())) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - fragment is not supported.",
+                            extension, clientType, endpoint.toString()));
+        }
+    }
+
+    protected void validateTlsKeyManagersProvider(String extension, TlsKeyManagersProviderConfig config, String clientType) {
+        if (config != null && config.type == TlsKeyManagersProviderType.FILE_STORE) {
+            validateFileStore(extension, clientType, "key", config.fileStore);
+        }
+    }
+
+    protected void validateTlsTrustManagersProvider(String extension, TlsTrustManagersProviderConfig config,
+            String clientType) {
+        if (config != null && config.type == TlsTrustManagersProviderType.FILE_STORE) {
+            validateFileStore(extension, clientType, "trust", config.fileStore);
+        }
+    }
+
+    protected void validateFileStore(String extension, String clientType, String storeType,
+            FileStoreTlsManagersProviderConfig fileStore) {
+        if (fileStore == null) {
+            throw new RuntimeConfigurationError(
+                    String.format(
+                            "quarkus.%s.%s-client.tls-%s-managers-provider.file-store must be specified if 'FILE_STORE' provider type is used",
+                            extension, clientType, storeType));
+        } else {
+            if (!fileStore.password.isPresent()) {
+                throw new RuntimeConfigurationError(
+                        String.format(
+                                "quarkus.%s.%s-client.tls-%s-managers-provider.file-store.path should not be empty if 'FILE_STORE' provider is used.",
+                                extension, clientType, storeType));
+            }
+            if (!fileStore.type.isPresent()) {
+                throw new RuntimeConfigurationError(
+                        String.format(
+                                "quarkus.%s.%s-client.tls-%s-managers-provider.file-store.type should not be empty if 'FILE_STORE' provider is used.",
+                                extension, clientType, storeType));
+            }
+            if (!fileStore.password.isPresent()) {
+                throw new RuntimeConfigurationError(
+                        String.format(
+                                "quarkus.%s.%s-client.tls-%s-managers-provider.file-store.password should not be empty if 'FILE_STORE' provider is used.",
+                                extension, clientType, storeType));
+            }
+        }
+    }
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientApacheTransportRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientApacheTransportRecorder.java
new file mode 100644
index 0000000000000..cc1a0c7fffe7f
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientApacheTransportRecorder.java
@@ -0,0 +1,59 @@
+package io.quarkus.amazon.common.runtime;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache.ApacheHttpClient.Builder;
+import software.amazon.awssdk.http.apache.ProxyConfiguration;
+
+@Recorder
+public class AmazonClientApacheTransportRecorder extends AbstractAmazonClientTransportRecorder {
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public RuntimeValue<SdkHttpClient.Builder> configureSync(String clientName,
+            RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) {
+        SyncHttpClientConfig syncConfig = syncConfigRuntime.getValue();
+        validateTlsKeyManagersProvider(clientName, syncConfig.tlsKeyManagersProvider, "sync");
+        validateTlsTrustManagersProvider(clientName, syncConfig.tlsTrustManagersProvider, "sync");
+        Builder builder = ApacheHttpClient.builder();
+        validateApacheClientConfig(clientName, syncConfig);
+
+        builder.connectionTimeout(syncConfig.connectionTimeout);
+        builder.connectionAcquisitionTimeout(syncConfig.apache.connectionAcquisitionTimeout);
+        builder.connectionMaxIdleTime(syncConfig.apache.connectionMaxIdleTime);
+        syncConfig.apache.connectionTimeToLive.ifPresent(builder::connectionTimeToLive);
+        builder.expectContinueEnabled(syncConfig.apache.expectContinueEnabled);
+        builder.maxConnections(syncConfig.apache.maxConnections);
+        builder.socketTimeout(syncConfig.socketTimeout);
+        builder.useIdleConnectionReaper(syncConfig.apache.useIdleConnectionReaper);
+
+        if (syncConfig.apache.proxy.enabled && syncConfig.apache.proxy.endpoint.isPresent()) {
+            ProxyConfiguration.Builder proxyBuilder = ProxyConfiguration.builder()
+                    .endpoint(syncConfig.apache.proxy.endpoint.get());
+            syncConfig.apache.proxy.username.ifPresent(proxyBuilder::username);
+            syncConfig.apache.proxy.password.ifPresent(proxyBuilder::password);
+            syncConfig.apache.proxy.nonProxyHosts.ifPresent(c -> c.forEach(proxyBuilder::addNonProxyHost));
+            syncConfig.apache.proxy.ntlmDomain.ifPresent(proxyBuilder::ntlmDomain);
+            syncConfig.apache.proxy.ntlmWorkstation.ifPresent(proxyBuilder::ntlmWorkstation);
+            syncConfig.apache.proxy.preemptiveBasicAuthenticationEnabled
+                    .ifPresent(proxyBuilder::preemptiveBasicAuthenticationEnabled);
+
+            builder.proxyConfiguration(proxyBuilder.build());
+        }
+        getTlsKeyManagersProvider(syncConfig.tlsKeyManagersProvider).ifPresent(builder::tlsKeyManagersProvider);
+        getTlsTrustManagersProvider(syncConfig.tlsTrustManagersProvider).ifPresent(builder::tlsTrustManagersProvider);
+        return new RuntimeValue<>(builder);
+    }
+
+    private void validateApacheClientConfig(String extension, SyncHttpClientConfig config) {
+        if (config.apache.maxConnections <= 0) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.sync-client.max-connections may not be negative or zero.", extension));
+        }
+        if (config.apache.proxy.enabled) {
+            config.apache.proxy.endpoint.ifPresent(uri -> validateProxyEndpoint(extension, uri, "sync"));
+        }
+    }
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientNettyTransportRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientNettyTransportRecorder.java
new file mode 100644
index 0000000000000..7cd4691b7e2a1
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientNettyTransportRecorder.java
@@ -0,0 +1,108 @@
+package io.quarkus.amazon.common.runtime;
+
+import java.util.Collections;
+import java.util.HashSet;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.Http2Configuration;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
+import software.amazon.awssdk.utils.ThreadFactoryBuilder;
+
+@Recorder
+public class AmazonClientNettyTransportRecorder extends AbstractAmazonClientTransportRecorder {
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public RuntimeValue<SdkAsyncHttpClient.Builder> configureAsync(String clientName,
+            RuntimeValue<NettyHttpClientConfig> asyncConfigRuntime) {
+        NettyNioAsyncHttpClient.Builder builder = NettyNioAsyncHttpClient.builder();
+        NettyHttpClientConfig asyncConfig = asyncConfigRuntime.getValue();
+        validateNettyClientConfig(clientName, asyncConfig);
+
+        builder.connectionAcquisitionTimeout(asyncConfig.connectionAcquisitionTimeout);
+        builder.connectionMaxIdleTime(asyncConfig.connectionMaxIdleTime);
+        builder.connectionTimeout(asyncConfig.connectionTimeout);
+        asyncConfig.connectionTimeToLive.ifPresent(builder::connectionTimeToLive);
+        builder.maxConcurrency(asyncConfig.maxConcurrency);
+        builder.maxPendingConnectionAcquires(asyncConfig.maxPendingConnectionAcquires);
+        builder.protocol(asyncConfig.protocol);
+        builder.readTimeout(asyncConfig.readTimeout);
+        builder.writeTimeout(asyncConfig.writeTimeout);
+        asyncConfig.sslProvider.ifPresent(builder::sslProvider);
+        builder.useIdleConnectionReaper(asyncConfig.useIdleConnectionReaper);
+
+        if (asyncConfig.http2.initialWindowSize.isPresent() || asyncConfig.http2.maxStreams.isPresent()) {
+            Http2Configuration.Builder http2Builder = Http2Configuration.builder();
+            asyncConfig.http2.initialWindowSize.ifPresent(http2Builder::initialWindowSize);
+            asyncConfig.http2.maxStreams.ifPresent(http2Builder::maxStreams);
+            asyncConfig.http2.healthCheckPingPeriod.ifPresent(http2Builder::healthCheckPingPeriod);
+            builder.http2Configuration(http2Builder.build());
+        }
+
+        if (asyncConfig.proxy.enabled && asyncConfig.proxy.endpoint.isPresent()) {
+            software.amazon.awssdk.http.nio.netty.ProxyConfiguration.Builder proxyBuilder = software.amazon.awssdk.http.nio.netty.ProxyConfiguration
+                    .builder().scheme(asyncConfig.proxy.endpoint.get().getScheme())
+                    .host(asyncConfig.proxy.endpoint.get().getHost())
+                    .nonProxyHosts(new HashSet<>(asyncConfig.proxy.nonProxyHosts.orElse(Collections.emptyList())));
+
+            if (asyncConfig.proxy.endpoint.get().getPort() != -1) {
+                proxyBuilder.port(asyncConfig.proxy.endpoint.get().getPort());
+            }
+            builder.proxyConfiguration(proxyBuilder.build());
+        }
+
+        getTlsKeyManagersProvider(asyncConfig.tlsKeyManagersProvider).ifPresent(builder::tlsKeyManagersProvider);
+        getTlsTrustManagersProvider(asyncConfig.tlsTrustManagersProvider).ifPresent(builder::tlsTrustManagersProvider);
+
+        if (asyncConfig.eventLoop.override) {
+            SdkEventLoopGroup.Builder eventLoopBuilder = SdkEventLoopGroup.builder();
+            asyncConfig.eventLoop.numberOfThreads.ifPresent(eventLoopBuilder::numberOfThreads);
+            if (asyncConfig.eventLoop.threadNamePrefix.isPresent()) {
+                eventLoopBuilder.threadFactory(
+                        new ThreadFactoryBuilder().threadNamePrefix(asyncConfig.eventLoop.threadNamePrefix.get()).build());
+            }
+            builder.eventLoopGroupBuilder(eventLoopBuilder);
+        }
+
+        return new RuntimeValue<>(builder);
+    }
+
+    private void validateNettyClientConfig(String extension, NettyHttpClientConfig config) {
+        if (config.maxConcurrency <= 0) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.async-client.max-concurrency may not be negative or zero.", extension));
+        }
+
+        if (config.http2.maxStreams.isPresent() && config.http2.maxStreams.get() <= 0) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.async-client.http2.max-streams may not be negative.", extension));
+        }
+
+        if (config.http2.initialWindowSize.isPresent() && config.http2.initialWindowSize.getAsInt() <= 0) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.async-client.http2.initial-window-size may not be negative.", extension));
+        }
+
+        if (config.maxPendingConnectionAcquires <= 0) {
+            throw new RuntimeConfigurationError(
+                    String.format("quarkus.%s.async-client.max-pending-connection-acquires may not be negative or zero.",
+                            extension));
+        }
+        if (config.eventLoop.override) {
+            if (config.eventLoop.numberOfThreads.isPresent() && config.eventLoop.numberOfThreads.getAsInt() <= 0) {
+                throw new RuntimeConfigurationError(
+                        String.format("quarkus.%s.async-client.event-loop.number-of-threads may not be negative or zero.",
+                                extension));
+            }
+        }
+        if (config.proxy.enabled) {
+            config.proxy.endpoint.ifPresent(uri -> validateProxyEndpoint(extension, uri, "async"));
+        }
+
+        validateTlsKeyManagersProvider(extension, config.tlsKeyManagersProvider, "async");
+        validateTlsTrustManagersProvider(extension, config.tlsTrustManagersProvider, "async");
+    }
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientRecorder.java
index c6b381aca6904..9e225a4551b56 100644
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientRecorder.java
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientRecorder.java
@@ -72,17 +72,19 @@ public void initSdkClient(SdkClientBuilder builder, String extension, SdkConfig
         config.apiCallAttemptTimeout.ifPresent(overrides::apiCallAttemptTimeout);
 
         buildConfig.interceptors.orElse(Collections.emptyList()).stream()
+                .map(String::trim)
                 .map(this::createInterceptor)
                 .filter(Objects::nonNull)
                 .forEach(overrides::addExecutionInterceptor);
         builder.overrideConfiguration(overrides.build());
     }
 
-    private ExecutionInterceptor createInterceptor(Class<?> interceptorClass) {
+    private ExecutionInterceptor createInterceptor(String interceptorClassName) {
         try {
-            return (ExecutionInterceptor) Class.forName(interceptorClass.getName()).newInstance();
+            return (ExecutionInterceptor) Class
+                    .forName(interceptorClassName, false, Thread.currentThread().getContextClassLoader()).newInstance();
         } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
-            LOG.error("Unable to create interceptor", e);
+            LOG.error("Unable to create interceptor " + interceptorClassName, e);
             return null;
         }
     }
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java
deleted file mode 100644
index 91f64f34be6ab..0000000000000
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientTransportRecorder.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package io.quarkus.amazon.common.runtime;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Optional;
-
-import io.quarkus.amazon.common.runtime.SyncHttpClientBuildTimeConfig.SyncClientType;
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.annotations.Recorder;
-import software.amazon.awssdk.http.SdkHttpClient;
-import software.amazon.awssdk.http.TlsKeyManagersProvider;
-import software.amazon.awssdk.http.apache.ApacheHttpClient;
-import software.amazon.awssdk.http.apache.ApacheHttpClient.Builder;
-import software.amazon.awssdk.http.apache.ProxyConfiguration;
-import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
-import software.amazon.awssdk.http.nio.netty.Http2Configuration;
-import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
-import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
-import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
-import software.amazon.awssdk.utils.StringUtils;
-import software.amazon.awssdk.utils.ThreadFactoryBuilder;
-
-@Recorder
-public class AmazonClientTransportRecorder {
-
-    public RuntimeValue<SdkHttpClient.Builder> configureSync(String clientName, SyncHttpClientBuildTimeConfig buildConfig,
-            RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) {
-
-        SdkHttpClient.Builder syncBuilder;
-        SyncHttpClientConfig syncConfig = syncConfigRuntime.getValue();
-
-        validateTlsManagersProvider(clientName, syncConfig.tlsManagersProvider, "sync");
-
-        if (buildConfig.type == SyncClientType.APACHE) {
-            Builder builder = ApacheHttpClient.builder();
-            validateApacheClientConfig(clientName, syncConfig);
-
-            builder.connectionTimeout(syncConfig.connectionTimeout);
-            builder.connectionAcquisitionTimeout(syncConfig.apache.connectionAcquisitionTimeout);
-            builder.connectionMaxIdleTime(syncConfig.apache.connectionMaxIdleTime);
-            syncConfig.apache.connectionTimeToLive.ifPresent(builder::connectionTimeToLive);
-            builder.expectContinueEnabled(syncConfig.apache.expectContinueEnabled);
-            builder.maxConnections(syncConfig.apache.maxConnections);
-            builder.socketTimeout(syncConfig.socketTimeout);
-            builder.useIdleConnectionReaper(syncConfig.apache.useIdleConnectionReaper);
-
-            if (syncConfig.apache.proxy.enabled && syncConfig.apache.proxy.endpoint.isPresent()) {
-                ProxyConfiguration.Builder proxyBuilder = ProxyConfiguration.builder()
-                        .endpoint(syncConfig.apache.proxy.endpoint.get());
-                syncConfig.apache.proxy.username.ifPresent(proxyBuilder::username);
-                syncConfig.apache.proxy.password.ifPresent(proxyBuilder::password);
-                syncConfig.apache.proxy.nonProxyHosts.ifPresent(c -> c.forEach(proxyBuilder::addNonProxyHost));
-                syncConfig.apache.proxy.ntlmDomain.ifPresent(proxyBuilder::ntlmDomain);
-                syncConfig.apache.proxy.ntlmWorkstation.ifPresent(proxyBuilder::ntlmWorkstation);
-                syncConfig.apache.proxy.preemptiveBasicAuthenticationEnabled
-                        .ifPresent(proxyBuilder::preemptiveBasicAuthenticationEnabled);
-
-                builder.proxyConfiguration(proxyBuilder.build());
-            }
-            getTlsKeyManagersProvider(syncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider);
-
-            syncBuilder = builder;
-        } else {
-            UrlConnectionHttpClient.Builder builder = UrlConnectionHttpClient.builder();
-            builder.connectionTimeout(syncConfig.connectionTimeout);
-            builder.socketTimeout(syncConfig.socketTimeout);
-            getTlsKeyManagersProvider(syncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider);
-
-            syncBuilder = builder;
-        }
-
-        return new RuntimeValue<>(syncBuilder);
-    }
-
-    public RuntimeValue<SdkAsyncHttpClient.Builder> configureAsync(String clientName,
-            RuntimeValue<NettyHttpClientConfig> asyncConfigRuntime) {
-        NettyNioAsyncHttpClient.Builder builder = NettyNioAsyncHttpClient.builder();
-        NettyHttpClientConfig asyncConfig = asyncConfigRuntime.getValue();
-        validateNettyClientConfig(clientName, asyncConfig);
-
-        builder.connectionAcquisitionTimeout(asyncConfig.connectionAcquisitionTimeout);
-        builder.connectionMaxIdleTime(asyncConfig.connectionMaxIdleTime);
-        builder.connectionTimeout(asyncConfig.connectionTimeout);
-        asyncConfig.connectionTimeToLive.ifPresent(builder::connectionTimeToLive);
-        builder.maxConcurrency(asyncConfig.maxConcurrency);
-        builder.maxPendingConnectionAcquires(asyncConfig.maxPendingConnectionAcquires);
-        builder.protocol(asyncConfig.protocol);
-        builder.readTimeout(asyncConfig.readTimeout);
-        builder.writeTimeout(asyncConfig.writeTimeout);
-        asyncConfig.sslProvider.ifPresent(builder::sslProvider);
-        builder.useIdleConnectionReaper(asyncConfig.useIdleConnectionReaper);
-
-        if (asyncConfig.http2.initialWindowSize.isPresent() || asyncConfig.http2.maxStreams.isPresent()) {
-            Http2Configuration.Builder http2Builder = Http2Configuration.builder();
-            asyncConfig.http2.initialWindowSize.ifPresent(http2Builder::initialWindowSize);
-            asyncConfig.http2.maxStreams.ifPresent(http2Builder::maxStreams);
-            asyncConfig.http2.healthCheckPingPeriod.ifPresent(http2Builder::healthCheckPingPeriod);
-            builder.http2Configuration(http2Builder.build());
-        }
-
-        if (asyncConfig.proxy.enabled && asyncConfig.proxy.endpoint.isPresent()) {
-            software.amazon.awssdk.http.nio.netty.ProxyConfiguration.Builder proxyBuilder = software.amazon.awssdk.http.nio.netty.ProxyConfiguration
-                    .builder().scheme(asyncConfig.proxy.endpoint.get().getScheme())
-                    .host(asyncConfig.proxy.endpoint.get().getHost())
-                    .nonProxyHosts(new HashSet<>(asyncConfig.proxy.nonProxyHosts.orElse(Collections.emptyList())));
-
-            if (asyncConfig.proxy.endpoint.get().getPort() != -1) {
-                proxyBuilder.port(asyncConfig.proxy.endpoint.get().getPort());
-            }
-            builder.proxyConfiguration(proxyBuilder.build());
-        }
-
-        getTlsKeyManagersProvider(asyncConfig.tlsManagersProvider).ifPresent(builder::tlsKeyManagersProvider);
-
-        if (asyncConfig.eventLoop.override) {
-            SdkEventLoopGroup.Builder eventLoopBuilder = SdkEventLoopGroup.builder();
-            asyncConfig.eventLoop.numberOfThreads.ifPresent(eventLoopBuilder::numberOfThreads);
-            if (asyncConfig.eventLoop.threadNamePrefix.isPresent()) {
-                eventLoopBuilder.threadFactory(
-                        new ThreadFactoryBuilder().threadNamePrefix(asyncConfig.eventLoop.threadNamePrefix.get()).build());
-            }
-            builder.eventLoopGroupBuilder(eventLoopBuilder);
-        }
-
-        return new RuntimeValue<>(builder);
-    }
-
-    private Optional<TlsKeyManagersProvider> getTlsKeyManagersProvider(TlsManagersProviderConfig config) {
-        if (config.fileStore != null && config.fileStore.path.isPresent() && config.fileStore.type.isPresent()) {
-            return Optional.of(config.type.create(config));
-        }
-        return Optional.empty();
-    }
-
-    private void validateApacheClientConfig(String extension, SyncHttpClientConfig config) {
-        if (config.apache.maxConnections <= 0) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.sync-client.max-connections may not be negative or zero.", extension));
-        }
-        if (config.apache.proxy.enabled) {
-            config.apache.proxy.endpoint.ifPresent(uri -> validateProxyEndpoint(extension, uri, "sync"));
-        }
-    }
-
-    private void validateNettyClientConfig(String extension, NettyHttpClientConfig config) {
-        if (config.maxConcurrency <= 0) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.async-client.max-concurrency may not be negative or zero.", extension));
-        }
-
-        if (config.http2.maxStreams.isPresent() && config.http2.maxStreams.get() <= 0) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.async-client.http2.max-streams may not be negative.", extension));
-        }
-
-        if (config.http2.initialWindowSize.isPresent() && config.http2.initialWindowSize.getAsInt() <= 0) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.async-client.http2.initial-window-size may not be negative.", extension));
-        }
-
-        if (config.maxPendingConnectionAcquires <= 0) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.async-client.max-pending-connection-acquires may not be negative or zero.",
-                            extension));
-        }
-        if (config.eventLoop.override) {
-            if (config.eventLoop.numberOfThreads.isPresent() && config.eventLoop.numberOfThreads.getAsInt() <= 0) {
-                throw new RuntimeConfigurationError(
-                        String.format("quarkus.%s.async-client.event-loop.number-of-threads may not be negative or zero.",
-                                extension));
-            }
-        }
-        if (config.proxy.enabled) {
-            config.proxy.endpoint.ifPresent(uri -> validateProxyEndpoint(extension, uri, "async"));
-        }
-
-        validateTlsManagersProvider(extension, config.tlsManagersProvider, "async");
-    }
-
-    private void validateProxyEndpoint(String extension, URI endpoint, String clientType) {
-        if (StringUtils.isBlank(endpoint.getScheme())) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - scheme must be specified",
-                            extension, clientType, endpoint.toString()));
-        }
-        if (StringUtils.isBlank(endpoint.getHost())) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - host must be specified",
-                            extension, clientType, endpoint.toString()));
-        }
-        if (StringUtils.isNotBlank(endpoint.getUserInfo())) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - user info is not supported.",
-                            extension, clientType, endpoint.toString()));
-        }
-        if (StringUtils.isNotBlank(endpoint.getPath())) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - path is not supported.",
-                            extension, clientType, endpoint.toString()));
-        }
-        if (StringUtils.isNotBlank(endpoint.getQuery())) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - query is not supported.",
-                            extension, clientType, endpoint.toString()));
-        }
-        if (StringUtils.isNotBlank(endpoint.getFragment())) {
-            throw new RuntimeConfigurationError(
-                    String.format("quarkus.%s.%s-client.proxy.endpoint (%s) - fragment is not supported.",
-                            extension, clientType, endpoint.toString()));
-        }
-    }
-
-    private void validateTlsManagersProvider(String extension, TlsManagersProviderConfig config, String clientType) {
-        if (config != null && config.type == TlsManagersProviderType.FILE_STORE) {
-            if (config.fileStore == null) {
-                throw new RuntimeConfigurationError(
-                        String.format(
-                                "quarkus.%s.%s-client.tls-managers-provider.file-store must be specified if 'FILE_STORE' provider type is used",
-                                extension, clientType));
-            } else {
-                if (!config.fileStore.password.isPresent()) {
-                    throw new RuntimeConfigurationError(
-                            String.format(
-                                    "quarkus.%s.%s-client.tls-managers-provider.file-store.path should not be empty if 'FILE_STORE' provider is used.",
-                                    extension, clientType));
-                }
-                if (!config.fileStore.type.isPresent()) {
-                    throw new RuntimeConfigurationError(
-                            String.format(
-                                    "quarkus.%s.%s-client.tls-managers-provider.file-store.type should not be empty if 'FILE_STORE' provider is used.",
-                                    extension, clientType));
-                }
-                if (!config.fileStore.password.isPresent()) {
-                    throw new RuntimeConfigurationError(
-                            String.format(
-                                    "quarkus.%s.%s-client.tls-managers-provider.file-store.password should not be empty if 'FILE_STORE' provider is used.",
-                                    extension, clientType));
-                }
-            }
-        }
-    }
-}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientUrlConnectionTransportRecorder.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientUrlConnectionTransportRecorder.java
new file mode 100644
index 0000000000000..591eaa08ceb96
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientUrlConnectionTransportRecorder.java
@@ -0,0 +1,25 @@
+package io.quarkus.amazon.common.runtime;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+
+@Recorder
+public class AmazonClientUrlConnectionTransportRecorder extends AbstractAmazonClientTransportRecorder {
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public RuntimeValue<SdkHttpClient.Builder> configureSync(String clientName,
+            RuntimeValue<SyncHttpClientConfig> syncConfigRuntime) {
+        SyncHttpClientConfig syncConfig = syncConfigRuntime.getValue();
+        validateTlsKeyManagersProvider(clientName, syncConfig.tlsKeyManagersProvider, "sync");
+        validateTlsTrustManagersProvider(clientName, syncConfig.tlsTrustManagersProvider, "sync");
+        UrlConnectionHttpClient.Builder builder = UrlConnectionHttpClient.builder();
+        builder.connectionTimeout(syncConfig.connectionTimeout);
+        builder.socketTimeout(syncConfig.socketTimeout);
+        getTlsKeyManagersProvider(syncConfig.tlsKeyManagersProvider).ifPresent(builder::tlsKeyManagersProvider);
+        getTlsTrustManagersProvider(syncConfig.tlsTrustManagersProvider).ifPresent(builder::tlsTrustManagersProvider);
+        return new RuntimeValue<>(builder);
+    }
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AwsCredentialsProviderConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AwsCredentialsProviderConfig.java
index 70dacdf9e9e2f..cb0c0313e6b7f 100644
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AwsCredentialsProviderConfig.java
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AwsCredentialsProviderConfig.java
@@ -18,7 +18,7 @@ public class AwsCredentialsProviderConfig {
      * Available values:
      *
      * * `default` - the provider will attempt to identify the credentials automatically using the following checks:
-     * ** Java System Properties - `aws.accessKeyId` and `aws.secretKey`
+     * ** Java System Properties - `aws.accessKeyId` and `aws.secretAccessKey`
      * ** Environment Variables - `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`
      * ** Credential profiles file at the default location (`~/.aws/credentials`) shared by all AWS SDKs and the AWS CLI
      * ** Credentials delivered through the Amazon EC2 container service if `AWS_CONTAINER_CREDENTIALS_RELATIVE_URI` environment variable is set and security manager has permission to access the variable.
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/FileStoreTlsManagersProviderConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/FileStoreTlsManagersProviderConfig.java
new file mode 100644
index 0000000000000..be4e086162189
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/FileStoreTlsManagersProviderConfig.java
@@ -0,0 +1,34 @@
+package io.quarkus.amazon.common.runtime;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class FileStoreTlsManagersProviderConfig {
+
+    /**
+     * Path to the key store.
+     */
+    @ConfigItem
+    public Optional<Path> path;
+
+    /**
+     * Key store type.
+     * <p>
+     * See the KeyStore section in
+     * the https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore[Java Cryptography
+     * Architecture Standard Algorithm Name Documentation]
+     * for information about standard keystore types.
+     */
+    @ConfigItem
+    public Optional<String> type;
+
+    /**
+     * Key store password
+     */
+    @ConfigItem
+    public Optional<String> password;
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/FileStoreTlsTrustManagersProvider.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/FileStoreTlsTrustManagersProvider.java
new file mode 100644
index 0000000000000..bb059c2b4fe0d
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/FileStoreTlsTrustManagersProvider.java
@@ -0,0 +1,50 @@
+package io.quarkus.amazon.common.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
+
+/**
+ * A TlsTrustManagersProvider for creating trustmanagers from a file-based truststore
+ */
+public class FileStoreTlsTrustManagersProvider implements TlsTrustManagersProvider {
+
+    private final Path path;
+    private final String type;
+    private final char[] password;
+
+    public FileStoreTlsTrustManagersProvider(FileStoreTlsManagersProviderConfig fileStore) {
+        path = fileStore.path.get();
+        type = fileStore.type.get();
+        password = fileStore.password.map(String::toCharArray).orElse(null);
+    }
+
+    @Override
+    public TrustManager[] trustManagers() {
+        try (InputStream storeInputStream = Files.newInputStream(path)) {
+            KeyStore keyStore = KeyStore.getInstance(type);
+            keyStore.load(storeInputStream, password);
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init(keyStore);
+            return tmf.getTrustManagers();
+        } catch (KeyStoreException | CertificateException | NoSuchAlgorithmException | IOException e) {
+            LOGGER.error("Failed to load truststore", e);
+            return null;
+        }
+    }
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileStoreTlsTrustManagersProvider.class);
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NettyHttpClientConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NettyHttpClientConfig.java
index bf3217ab94d01..019eb58608cdb 100644
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NettyHttpClientConfig.java
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NettyHttpClientConfig.java
@@ -70,7 +70,7 @@ public class NettyHttpClientConfig {
      * <p>
      * Currently has no effect if `quarkus.<amazon-service>.async-client.use-idle-connection-reaper` is false.
      */
-    @ConfigItem(defaultValue = "60S")
+    @ConfigItem(defaultValue = "5S")
     public Duration connectionMaxIdleTime;
 
     /**
@@ -109,10 +109,16 @@ public class NettyHttpClientConfig {
     public NettyProxyConfiguration proxy;
 
     /**
-     * TLS Managers provider configuration
+     * TLS Key Managers provider configuration
      */
     @ConfigItem
-    public TlsManagersProviderConfig tlsManagersProvider;
+    public TlsKeyManagersProviderConfig tlsKeyManagersProvider;
+
+    /**
+     * TLS Trust Managers provider configuration
+     */
+    @ConfigItem
+    public TlsTrustManagersProviderConfig tlsTrustManagersProvider;
 
     /**
      * Netty event loop configuration override
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NoneTlsTrustManagersProvider.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NoneTlsTrustManagersProvider.java
new file mode 100644
index 0000000000000..e4c0cf010c9c1
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/NoneTlsTrustManagersProvider.java
@@ -0,0 +1,39 @@
+package io.quarkus.amazon.common.runtime;
+
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
+
+/**
+ * A TlsTrustManagersProvider that creates a trustmanager trusting all certificates
+ */
+public class NoneTlsTrustManagersProvider implements TlsTrustManagersProvider {
+    private static final NoneTlsTrustManagersProvider INSTANCE = new NoneTlsTrustManagersProvider();
+
+    @Override
+    public TrustManager[] trustManagers() {
+        return new TrustManager[] { new InsecureTrustManager() };
+    }
+
+    private static class InsecureTrustManager implements X509TrustManager {
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType) {
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType) {
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[] {};
+        }
+    }
+
+    public static NoneTlsTrustManagersProvider getInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SdkBuildTimeConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SdkBuildTimeConfig.java
index 364aab283b9bc..4f366aecff950 100644
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SdkBuildTimeConfig.java
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SdkBuildTimeConfig.java
@@ -22,5 +22,5 @@ public class SdkBuildTimeConfig {
      * @see software.amazon.awssdk.core.interceptor.ExecutionInterceptor
      */
     @ConfigItem
-    public Optional<List<Class<?>>> interceptors;
+    public Optional<List<String>> interceptors; // cannot be classes as can be runtime initialized (e.g. XRay interceptor)
 }
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SyncHttpClientConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SyncHttpClientConfig.java
index 2e34970217785..67574a0a4e021 100644
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SyncHttpClientConfig.java
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SyncHttpClientConfig.java
@@ -25,10 +25,16 @@ public class SyncHttpClientConfig {
     public Duration socketTimeout;
 
     /**
-     * TLS Managers provider configuration
+     * TLS Key Managers provider configuration
      */
     @ConfigItem
-    public TlsManagersProviderConfig tlsManagersProvider;
+    public TlsKeyManagersProviderConfig tlsKeyManagersProvider;
+
+    /**
+     * TLS Trust Managers provider configuration
+     */
+    @ConfigItem
+    public TlsTrustManagersProviderConfig tlsTrustManagersProvider;
 
     /**
      * Apache HTTP client specific configurations
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SystemPropertyTlsTrustManagersProvider.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SystemPropertyTlsTrustManagersProvider.java
new file mode 100644
index 0000000000000..7292f5ce14874
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/SystemPropertyTlsTrustManagersProvider.java
@@ -0,0 +1,21 @@
+package io.quarkus.amazon.common.runtime;
+
+import javax.net.ssl.TrustManager;
+
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
+
+/**
+ * A TlsTrustManagersProvider for loading system default truststore configuration
+ */
+public class SystemPropertyTlsTrustManagersProvider implements TlsTrustManagersProvider {
+    private static final SystemPropertyTlsTrustManagersProvider INSTANCE = new SystemPropertyTlsTrustManagersProvider();
+
+    @Override
+    public TrustManager[] trustManagers() {
+        return null;
+    }
+
+    public static SystemPropertyTlsTrustManagersProvider getInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsKeyManagersProviderConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsKeyManagersProviderConfig.java
new file mode 100644
index 0000000000000..22101dd1920d4
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsKeyManagersProviderConfig.java
@@ -0,0 +1,35 @@
+package io.quarkus.amazon.common.runtime;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class TlsKeyManagersProviderConfig {
+
+    // @formatter:off
+    /**
+     * TLS key managers provider type.
+     *
+     * Available providers:
+     *
+     * * `none` - Use this provider if you don't want the client to present any certificates to the remote TLS host.
+     * * `system-property` - Provider checks the standard `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword`, and
+     *                       `javax.net.ssl.keyStoreType` properties defined by the
+     *                        https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html[JSSE].
+     * * `file-store` - Provider that loads a the key store from a file.
+     *
+     * @asciidoclet
+     */
+    // @formatter:on
+    @ConfigItem(defaultValue = "system-property")
+    public TlsKeyManagersProviderType type;
+
+    /**
+     * Configuration of the file store provider.
+     * <p>
+     * Used only if {@code FILE_STORE} type is chosen.
+     */
+    @ConfigItem
+    public FileStoreTlsManagersProviderConfig fileStore;
+
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsKeyManagersProviderType.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsKeyManagersProviderType.java
new file mode 100644
index 0000000000000..1b383510fa4a9
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsKeyManagersProviderType.java
@@ -0,0 +1,30 @@
+package io.quarkus.amazon.common.runtime;
+
+import software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider;
+import software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider;
+import software.amazon.awssdk.http.TlsKeyManagersProvider;
+
+public enum TlsKeyManagersProviderType {
+    NONE {
+        @Override
+        public TlsKeyManagersProvider create(TlsKeyManagersProviderConfig config) {
+            return TlsKeyManagersProvider.noneProvider();
+        }
+    },
+    SYSTEM_PROPERTY {
+        @Override
+        public TlsKeyManagersProvider create(TlsKeyManagersProviderConfig config) {
+            return SystemPropertyTlsKeyManagersProvider.create();
+        }
+    },
+    FILE_STORE {
+        @Override
+        public TlsKeyManagersProvider create(TlsKeyManagersProviderConfig config) {
+            final FileStoreTlsManagersProviderConfig fileStore = config.fileStore;
+            return FileStoreTlsKeyManagersProvider.create(fileStore.path.get(), fileStore.type.get(),
+                    fileStore.password.orElse(null));
+        }
+    };
+
+    public abstract TlsKeyManagersProvider create(TlsKeyManagersProviderConfig config);
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsManagersProviderConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsManagersProviderConfig.java
deleted file mode 100644
index 543dced36c0fe..0000000000000
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsManagersProviderConfig.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.quarkus.amazon.common.runtime;
-
-import java.nio.file.Path;
-import java.util.Optional;
-
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-
-@ConfigGroup
-public class TlsManagersProviderConfig {
-
-    // @formatter:off
-    /**
-     * TLS managers provider type.
-     *
-     * Available providers:
-     *
-     * * `none` - Use this provider if you don't want the client to present any certificates to the remote TLS host.
-     * * `system-property` - Provider checks the standard `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword`, and
-     *                       `javax.net.ssl.keyStoreType` properties defined by the
-     *                        https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html[JSSE].
-     * * `file-store` - Provider that loads a the key store from a file.
-     *
-     * @asciidoclet
-     */
-    // @formatter:on
-    @ConfigItem(defaultValue = "system-property")
-    public TlsManagersProviderType type;
-
-    /**
-     * Configuration of the file store provider.
-     * <p>
-     * Used only if {@code FILE_STORE} type is chosen.
-     */
-    @ConfigItem
-    public FileStoreTlsManagersProviderConfig fileStore;
-
-    @ConfigGroup
-    public static class FileStoreTlsManagersProviderConfig {
-
-        /**
-         * Path to the key store.
-         */
-        @ConfigItem
-        public Optional<Path> path;
-
-        /**
-         * Key store type.
-         * <p>
-         * See the KeyStore section in
-         * the https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#KeyStore[Java Cryptography
-         * Architecture Standard Algorithm Name Documentation]
-         * for information about standard keystore types.
-         */
-        @ConfigItem
-        public Optional<String> type;
-
-        /**
-         * Key store password
-         */
-        @ConfigItem
-        public Optional<String> password;
-    }
-
-}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsManagersProviderType.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsManagersProviderType.java
deleted file mode 100644
index bd5ebce5ea5f6..0000000000000
--- a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsManagersProviderType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.quarkus.amazon.common.runtime;
-
-import software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider;
-import software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider;
-import software.amazon.awssdk.http.TlsKeyManagersProvider;
-
-public enum TlsManagersProviderType {
-    NONE {
-        @Override
-        public TlsKeyManagersProvider create(TlsManagersProviderConfig config) {
-            return TlsKeyManagersProvider.noneProvider();
-        }
-    },
-    SYSTEM_PROPERTY {
-        @Override
-        public TlsKeyManagersProvider create(TlsManagersProviderConfig config) {
-            return SystemPropertyTlsKeyManagersProvider.create();
-        }
-    },
-    FILE_STORE {
-        @Override
-        public TlsKeyManagersProvider create(TlsManagersProviderConfig config) {
-            final TlsManagersProviderConfig.FileStoreTlsManagersProviderConfig fileStore = config.fileStore;
-            return FileStoreTlsKeyManagersProvider.create(fileStore.path.get(), fileStore.type.get(),
-                    fileStore.password.orElse(null));
-        }
-    };
-
-    public abstract TlsKeyManagersProvider create(TlsManagersProviderConfig config);
-}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsTrustManagersProviderConfig.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsTrustManagersProviderConfig.java
new file mode 100644
index 0000000000000..97f0f10150506
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsTrustManagersProviderConfig.java
@@ -0,0 +1,35 @@
+package io.quarkus.amazon.common.runtime;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class TlsTrustManagersProviderConfig {
+
+    // @formatter:off
+    /**
+     * TLS trust managers provider type.
+     *
+     * Available providers:
+     *
+     * * `trust-all` - Use this provider to disable the validation of servers certificates and therefor turst all server certificates.
+     * * `system-property` - Provider checks the standard `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword`, and
+     *                       `javax.net.ssl.keyStoreType` properties defined by the
+     *                        https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html[JSSE].
+     * * `file-store` - Provider that loads a the key store from a file.
+     *
+     * @asciidoclet
+     */
+    // @formatter:on
+    @ConfigItem(defaultValue = "system-property")
+    public TlsTrustManagersProviderType type;
+
+    /**
+     * Configuration of the file store provider.
+     * <p>
+     * Used only if {@code FILE_STORE} type is chosen.
+     */
+    @ConfigItem
+    public FileStoreTlsManagersProviderConfig fileStore;
+
+}
diff --git a/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsTrustManagersProviderType.java b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsTrustManagersProviderType.java
new file mode 100644
index 0000000000000..05fd05083be84
--- /dev/null
+++ b/extensions/amazon-services/common/runtime/src/main/java/io/quarkus/amazon/common/runtime/TlsTrustManagersProviderType.java
@@ -0,0 +1,26 @@
+package io.quarkus.amazon.common.runtime;
+
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
+
+public enum TlsTrustManagersProviderType {
+    TRUST_ALL {
+        @Override
+        public TlsTrustManagersProvider create(TlsTrustManagersProviderConfig config) {
+            return new NoneTlsTrustManagersProvider();
+        }
+    },
+    SYSTEM_PROPERTY {
+        @Override
+        public TlsTrustManagersProvider create(TlsTrustManagersProviderConfig config) {
+            return new SystemPropertyTlsTrustManagersProvider();
+        }
+    },
+    FILE_STORE {
+        @Override
+        public TlsTrustManagersProvider create(TlsTrustManagersProviderConfig config) {
+            return new FileStoreTlsTrustManagersProvider(config.fileStore);
+        }
+    };
+
+    public abstract TlsTrustManagersProvider create(TlsTrustManagersProviderConfig config);
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/main/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessor.java b/extensions/amazon-services/dynamodb/deployment/src/main/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessor.java
index ee98f3ee319e5..6a2e0d57d33c0 100644
--- a/extensions/amazon-services/dynamodb/deployment/src/main/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessor.java
+++ b/extensions/amazon-services/dynamodb/deployment/src/main/java/io/quarkus/amazon/dynamodb/deployment/DynamodbProcessor.java
@@ -5,13 +5,17 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
-import io.quarkus.amazon.common.deployment.AmazonClientTransportsBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.dynamodb.runtime.DynamodbBuildTimeConfig;
 import io.quarkus.amazon.dynamodb.runtime.DynamodbClientProducer;
 import io.quarkus.amazon.dynamodb.runtime.DynamodbConfig;
@@ -75,26 +79,51 @@ void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
                 buildTimeConfig.sdk, buildTimeConfig.syncClient);
     }
 
-    @BuildStep
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTransport(List<AmazonClientBuildItem> amazonClients, DynamodbRecorder recorder,
-            AmazonClientTransportRecorder transportRecorder,
-            DynamodbConfig runtimeConfig, BuildProducer<AmazonClientTransportsBuildItem> clientTransportBuildProducer) {
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, DynamodbRecorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            DynamodbConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
 
-        createTransportBuilders(amazonClients,
+        createApacheSyncTransportBuilder(amazonClients,
                 transportRecorder,
                 buildTimeConfig.syncClient,
                 recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, DynamodbRecorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            DynamodbConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, DynamodbRecorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            DynamodbConfig runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
                 recorder.getAsyncConfig(runtimeConfig),
-                clientTransportBuildProducer);
+                asyncTransports);
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void createClientBuilders(List<AmazonClientTransportsBuildItem> transportBuildItems, DynamodbRecorder recorder,
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports, DynamodbRecorder recorder,
             DynamodbConfig runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
 
-        createClientBuilders(transportBuildItems, builderProducer,
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
                 (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
                 (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
     }
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsFileStoreConfigTest.java
deleted file mode 100644
index 047da6262e9e7..0000000000000
--- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsFileStoreConfigTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.amazon.dynamodb.deployment;
-
-import javax.inject.Inject;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
-
-public class DynamodbAsyncClientTlsFileStoreConfigTest {
-
-    @Inject
-    DynamoDbAsyncClient client;
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource("async-tls-filestore-config.properties", "application.properties"));
-
-    @Test
-    public void test() {
-        // Application should start with full config.
-    }
-}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java
new file mode 100644
index 0000000000000..1b0a647150c13
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsKeyFileStoreConfigTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.amazon.dynamodb.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+public class DynamodbAsyncClientTlsKeyFileStoreConfigTest {
+
+    @Inject
+    DynamoDbAsyncClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("async-tls-key-filestore-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        // Application should start with full config.
+    }
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java
new file mode 100644
index 0000000000000..c48476f6e5456
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustFileStoreConfigTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.amazon.dynamodb.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+public class DynamodbAsyncClientTlsTrustFileStoreConfigTest {
+
+    @Inject
+    DynamoDbAsyncClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("async-tls-trust-filestore-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        // Application should start with full config.
+    }
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java
new file mode 100644
index 0000000000000..c87fe02d3f9ed
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbAsyncClientTlsTrustTrustAllConfigTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.amazon.dynamodb.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+public class DynamodbAsyncClientTlsTrustTrustAllConfigTest {
+
+    @Inject
+    DynamoDbAsyncClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("async-tls-trust-trustall-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        // Application should start with full config.
+    }
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsFileStoreConfigTest.java
deleted file mode 100644
index 84cb010bb95a0..0000000000000
--- a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsFileStoreConfigTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.amazon.dynamodb.deployment;
-
-import javax.inject.Inject;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-public class DynamodbSyncClientTlsFileStoreConfigTest {
-
-    @Inject
-    DynamoDbClient client;
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource("sync-tls-filestore-config.properties", "application.properties"));
-
-    @Test
-    public void test() {
-        // Application should start with full config.
-    }
-}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java
new file mode 100644
index 0000000000000..06fa6ddb85dcb
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsKeyFileStoreConfigTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.amazon.dynamodb.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+public class DynamodbSyncClientTlsKeyFileStoreConfigTest {
+
+    @Inject
+    DynamoDbClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("sync-tls-key-filestore-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        // Application should start with full config.
+    }
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java
new file mode 100644
index 0000000000000..dd9a300518e53
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustFileStoreConfigTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.amazon.dynamodb.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+public class DynamodbSyncClientTlsTrustFileStoreConfigTest {
+
+    @Inject
+    DynamoDbClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("sync-tls-trust-filestore-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        // Application should start with full config.
+    }
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java
new file mode 100644
index 0000000000000..12b43826df709
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/java/io/quarkus/amazon/dynamodb/deployment/DynamodbSyncClientTlsTrustTrustAllConfigTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.amazon.dynamodb.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+public class DynamodbSyncClientTlsTrustTrustAllConfigTest {
+
+    @Inject
+    DynamoDbClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("sync-tls-trust-trustall-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        // Application should start with full config.
+    }
+}
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-full-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-full-config.properties
index d7eb7c06ba241..809e195becff9 100644
--- a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-full-config.properties
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-full-config.properties
@@ -28,4 +28,5 @@ quarkus.dynamodb.async-client.event-loop.thread-name-prefix = Quarkus-Netty-Even
 quarkus.dynamodb.async-client.proxy.enabled = true
 quarkus.dynamodb.async-client.proxy.endpoint = http://127.1.1.1
 quarkus.dynamodb.async-client.proxy.non-proxy-hosts = localhost, hostlocal
-quarkus.dynamodb.async-client.tls-managers-provider.type=system-property
\ No newline at end of file
+quarkus.dynamodb.async-client.tls-key-managers-provider.type=system-property
+quarkus.dynamodb.async-client.tls-trust-managers-provider.type=system-property
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-filestore-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-filestore-config.properties
deleted file mode 100644
index 65ffaa596619f..0000000000000
--- a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-filestore-config.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-quarkus.dynamodb.aws.region=us-east-1
-
-quarkus.dynamodb.async-client.tls-managers-provider.type=file-store
-quarkus.dynamodb.async-client.tls-managers-provider.file-store.path=/tmp/file.key
-quarkus.dynamodb.async-client.tls-managers-provider.file-store.type=pkcs11
-quarkus.dynamodb.async-client.tls-managers-provider.file-store.password=thePassword
\ No newline at end of file
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-key-filestore-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-key-filestore-config.properties
new file mode 100644
index 0000000000000..b52db5f3ca9a3
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-key-filestore-config.properties
@@ -0,0 +1,6 @@
+quarkus.dynamodb.aws.region=us-east-1
+
+quarkus.dynamodb.async-client.tls-key-managers-provider.type=file-store
+quarkus.dynamodb.async-client.tls-key-managers-provider.file-store.path=/tmp/file.key
+quarkus.dynamodb.async-client.tls-key-managers-provider.file-store.type=pkcs11
+quarkus.dynamodb.async-client.tls-key-managers-provider.file-store.password=thePassword
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-trust-filestore-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-trust-filestore-config.properties
new file mode 100644
index 0000000000000..e3da5c1d379c9
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-trust-filestore-config.properties
@@ -0,0 +1,6 @@
+quarkus.dynamodb.aws.region=us-east-1
+
+quarkus.dynamodb.async-client.tls-trust-managers-provider.type=file-store
+quarkus.dynamodb.async-client.tls-trust-managers-provider.file-store.path=/tmp/file.key
+quarkus.dynamodb.async-client.tls-trust-managers-provider.file-store.type=pkcs11
+quarkus.dynamodb.async-client.tls-trust-managers-provider.file-store.password=thePassword
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-trust-trustall-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-trust-trustall-config.properties
new file mode 100644
index 0000000000000..8dc3d37155d51
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/async-tls-trust-trustall-config.properties
@@ -0,0 +1,3 @@
+quarkus.dynamodb.aws.region=us-east-1
+
+quarkus.dynamodb.async-client.tls-trust-managers-provider.type=trust-all
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-apache-full-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-apache-full-config.properties
index 0f9933147e73e..009b577b7758b 100644
--- a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-apache-full-config.properties
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-apache-full-config.properties
@@ -11,7 +11,8 @@ quarkus.dynamodb.aws.credentials.static-provider.secret-access-key=test-secret
 quarkus.dynamodb.sync-client.type = apache
 quarkus.dynamodb.sync-client.connection-timeout = 0.100S
 quarkus.dynamodb.sync-client.socket-timeout = 0.100S
-quarkus.dynamodb.sync-client.tls-managers-provider.type=system-property
+quarkus.dynamodb.sync-client.tls-key-managers-provider.type=system-property
+quarkus.dynamodb.sync-client.tls-trust-managers-provider.type=system-property
 
 quarkus.dynamodb.sync-client.apache.connection-acquisition-timeout = 0.100S
 quarkus.dynamodb.sync-client.apache.connection-max-idle-time = 0.100S
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-filestore-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-filestore-config.properties
deleted file mode 100644
index 1c91626607373..0000000000000
--- a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-filestore-config.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-quarkus.dynamodb.aws.region=us-east-1
-
-quarkus.dynamodb.sync-client.tls-managers-provider.type=file-store
-quarkus.dynamodb.sync-client.tls-managers-provider.file-store.path=/tmp/file.key
-quarkus.dynamodb.sync-client.tls-managers-provider.file-store.type=pkcs11
-quarkus.dynamodb.sync-client.tls-managers-provider.file-store.password=thePassword
\ No newline at end of file
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-key-filestore-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-key-filestore-config.properties
new file mode 100644
index 0000000000000..51c963429bd83
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-key-filestore-config.properties
@@ -0,0 +1,6 @@
+quarkus.dynamodb.aws.region=us-east-1
+
+quarkus.dynamodb.sync-client.tls-key-managers-provider.type=file-store
+quarkus.dynamodb.sync-client.tls-key-managers-provider.file-store.path=/tmp/file.key
+quarkus.dynamodb.sync-client.tls-key-managers-provider.file-store.type=pkcs11
+quarkus.dynamodb.sync-client.tls-key-managers-provider.file-store.password=thePassword
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-trust-filestore-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-trust-filestore-config.properties
new file mode 100644
index 0000000000000..3e551cd316b95
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-trust-filestore-config.properties
@@ -0,0 +1,6 @@
+quarkus.dynamodb.aws.region=us-east-1
+
+quarkus.dynamodb.sync-client.tls-trust-managers-provider.type=file-store
+quarkus.dynamodb.sync-client.tls-trust-managers-provider.file-store.path=/tmp/file.key
+quarkus.dynamodb.sync-client.tls-trust-managers-provider.file-store.type=pkcs11
+quarkus.dynamodb.sync-client.tls-trust-managers-provider.file-store.password=thePassword
diff --git a/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-trust-trustall-config.properties b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-trust-trustall-config.properties
new file mode 100644
index 0000000000000..b92d397b60b3f
--- /dev/null
+++ b/extensions/amazon-services/dynamodb/deployment/src/test/resources/sync-tls-trust-trustall-config.properties
@@ -0,0 +1,3 @@
+quarkus.dynamodb.aws.region=us-east-1
+
+quarkus.dynamodb.sync-client.tls-trust-managers-provider.type=trust-all
diff --git a/extensions/amazon-services/dynamodb/runtime/pom.xml b/extensions/amazon-services/dynamodb/runtime/pom.xml
index 9a475c0e3900e..d700cb81061b6 100644
--- a/extensions/amazon-services/dynamodb/runtime/pom.xml
+++ b/extensions/amazon-services/dynamodb/runtime/pom.xml
@@ -35,6 +35,21 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>dynamodb</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/extensions/amazon-services/iam/deployment/pom.xml b/extensions/amazon-services/iam/deployment/pom.xml
new file mode 100644
index 0000000000000..366dfcbacad36
--- /dev/null
+++ b/extensions/amazon-services/iam/deployment/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-amazon-iam-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-amazon-iam-deployment</artifactId>
+    <name>Quarkus - Amazon Services - IAM - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-iam</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>url-connection-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/amazon-services/iam/deployment/src/main/java/io/quarkus/amazon/iam/deployment/IamProcessor.java b/extensions/amazon-services/iam/deployment/src/main/java/io/quarkus/amazon/iam/deployment/IamProcessor.java
new file mode 100644
index 0000000000000..54016a4c4cabe
--- /dev/null
+++ b/extensions/amazon-services/iam/deployment/src/main/java/io/quarkus/amazon/iam/deployment/IamProcessor.java
@@ -0,0 +1,152 @@
+package io.quarkus.amazon.iam.deployment;
+
+import java.util.List;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
+import io.quarkus.amazon.iam.runtime.IamBuildTimeConfig;
+import io.quarkus.amazon.iam.runtime.IamClientProducer;
+import io.quarkus.amazon.iam.runtime.IamConfig;
+import io.quarkus.amazon.iam.runtime.IamRecorder;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import software.amazon.awssdk.services.iam.IamAsyncClient;
+import software.amazon.awssdk.services.iam.IamClient;
+
+public class IamProcessor extends AbstractAmazonServiceProcessor {
+
+    IamBuildTimeConfig buildTimeConfig;
+
+    @Override
+    protected Feature amazonServiceClientName() {
+        return Feature.AMAZON_IAM;
+    }
+
+    @Override
+    protected String configName() {
+        return "iam";
+    }
+
+    @Override
+    protected DotName syncClientName() {
+        return DotName.createSimple(IamClient.class.getName());
+    }
+
+    @Override
+    protected DotName asyncClientName() {
+        return DotName.createSimple(IamAsyncClient.class.getName());
+    }
+
+    @Override
+    protected String builtinInterceptorsPath() {
+        return "software/amazon/awssdk/services/iam/execution.interceptors";
+    }
+
+    @BuildStep
+    AdditionalBeanBuildItem producer() {
+        return AdditionalBeanBuildItem.unremovableOf(IamClientProducer.class);
+    }
+
+    @BuildStep
+    void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
+            BuildProducer<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport,
+            BuildProducer<FeatureBuildItem> feature,
+            BuildProducer<AmazonClientInterceptorsPathBuildItem> interceptors,
+            BuildProducer<AmazonClientBuildItem> clientProducer) {
+
+        setupExtension(beanRegistrationPhase, extensionSslNativeSupport, feature, interceptors, clientProducer,
+                buildTimeConfig.sdk, buildTimeConfig.syncClient);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, IamRecorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            IamConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createApacheSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, IamRecorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            IamConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, IamRecorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            IamConfig runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
+                recorder.getAsyncConfig(runtimeConfig),
+                asyncTransports);
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports, IamRecorder recorder,
+            IamConfig runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
+
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
+                (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
+                (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void configureClient(List<AmazonClientBuilderBuildItem> clients, IamRecorder recorder,
+            AmazonClientRecorder commonRecorder,
+            IamConfig runtimeConfig,
+            BuildProducer<AmazonClientBuilderConfiguredBuildItem> producer) {
+
+        initClientBuilders(clients, commonRecorder, recorder.getAwsConfig(runtimeConfig), recorder.getSdkConfig(runtimeConfig),
+                buildTimeConfig.sdk, producer);
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void buildClients(List<AmazonClientBuilderConfiguredBuildItem> configuredClients, IamRecorder recorder,
+            BeanContainerBuildItem beanContainer,
+            ShutdownContextBuildItem shutdown) {
+
+        buildClients(configuredClients,
+                (syncBuilder) -> recorder.buildClient(syncBuilder, beanContainer.getValue(), shutdown),
+                (asyncBuilder) -> recorder.buildAsyncClient(asyncBuilder, beanContainer.getValue(), shutdown));
+    }
+}
diff --git a/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java b/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java
new file mode 100644
index 0000000000000..312eaf1bfd9e6
--- /dev/null
+++ b/extensions/amazon-services/iam/deployment/src/test/java/io/quarkus/amazon/iam/deployment/IamSyncClientFullConfigTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.amazon.iam.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import software.amazon.awssdk.services.iam.IamAsyncClient;
+import software.amazon.awssdk.services.iam.IamClient;
+
+public class IamSyncClientFullConfigTest {
+
+    @Inject
+    IamClient client;
+
+    @Inject
+    IamAsyncClient async;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("sync-urlconn-full-config.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        Assertions.assertNotNull(client);
+        Assertions.assertNotNull(async);
+    }
+}
diff --git a/extensions/amazon-services/iam/deployment/src/test/resources/sync-urlconn-full-config.properties b/extensions/amazon-services/iam/deployment/src/test/resources/sync-urlconn-full-config.properties
new file mode 100644
index 0000000000000..1023781cb67df
--- /dev/null
+++ b/extensions/amazon-services/iam/deployment/src/test/resources/sync-urlconn-full-config.properties
@@ -0,0 +1,10 @@
+quarkus.iam.endpoint-override=http://localhost:9090
+
+quarkus.iam.aws.region=us-east-1
+quarkus.iam.aws.credentials.type=static
+quarkus.iam.aws.credentials.static-provider.access-key-id=test-key
+quarkus.iam.aws.credentials.static-provider.secret-access-key=test-secret
+
+quarkus.iam.sync-client.type = url
+quarkus.iam.sync-client.connection-timeout = 0.100S
+quarkus.iam.sync-client.socket-timeout = 0.100S
\ No newline at end of file
diff --git a/extensions/amazon-services/iam/pom.xml b/extensions/amazon-services/iam/pom.xml
new file mode 100644
index 0000000000000..788eb7f6f9611
--- /dev/null
+++ b/extensions/amazon-services/iam/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-amazon-services-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-amazon-iam-parent</artifactId>
+    <name>Quarkus - Amazon Services - IAM</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+</project>
diff --git a/extensions/amazon-services/iam/runtime/pom.xml b/extensions/amazon-services/iam/runtime/pom.xml
new file mode 100644
index 0000000000000..156283cfff290
--- /dev/null
+++ b/extensions/amazon-services/iam/runtime/pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-amazon-iam-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-amazon-iam</artifactId>
+    <name>Quarkus - Amazon Services - IAM - Runtime</name>
+    <description>Connect to Amazon IAM</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>iam</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>url-connection-client</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache-client</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamBuildTimeConfig.java b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamBuildTimeConfig.java
new file mode 100644
index 0000000000000..07cadf1644727
--- /dev/null
+++ b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamBuildTimeConfig.java
@@ -0,0 +1,26 @@
+package io.quarkus.amazon.iam.runtime;
+
+import io.quarkus.amazon.common.runtime.SdkBuildTimeConfig;
+import io.quarkus.amazon.common.runtime.SyncHttpClientBuildTimeConfig;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * Amazon IAM build time configuration
+ */
+@ConfigRoot(name = "iam", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class IamBuildTimeConfig {
+
+    /**
+     * SDK client configurations for AWS IAM client
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    public SdkBuildTimeConfig sdk;
+
+    /**
+     * Sync HTTP transport configuration for Amazon IAM client
+     */
+    @ConfigItem
+    public SyncHttpClientBuildTimeConfig syncClient;
+}
diff --git a/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamClientProducer.java b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamClientProducer.java
new file mode 100644
index 0000000000000..6bc9926bdc8f0
--- /dev/null
+++ b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamClientProducer.java
@@ -0,0 +1,52 @@
+package io.quarkus.amazon.iam.runtime;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+
+import software.amazon.awssdk.services.iam.IamAsyncClient;
+import software.amazon.awssdk.services.iam.IamAsyncClientBuilder;
+import software.amazon.awssdk.services.iam.IamClient;
+import software.amazon.awssdk.services.iam.IamClientBuilder;
+
+@ApplicationScoped
+public class IamClientProducer {
+
+    private volatile IamClientBuilder syncConfiguredBuilder;
+    private volatile IamAsyncClientBuilder asyncConfiguredBuilder;
+
+    private IamClient client;
+    private IamAsyncClient asyncClient;
+
+    @Produces
+    @ApplicationScoped
+    public IamClient client() {
+        client = syncConfiguredBuilder.build();
+        return client;
+    }
+
+    @Produces
+    @ApplicationScoped
+    public IamAsyncClient asyncClient() {
+        asyncClient = asyncConfiguredBuilder.build();
+        return asyncClient;
+    }
+
+    @PreDestroy
+    public void destroy() {
+        if (client != null) {
+            client.close();
+        }
+        if (asyncClient != null) {
+            asyncClient.close();
+        }
+    }
+
+    public void setSyncConfiguredBuilder(IamClientBuilder syncConfiguredBuilder) {
+        this.syncConfiguredBuilder = syncConfiguredBuilder;
+    }
+
+    public void setAsyncConfiguredBuilder(IamAsyncClientBuilder asyncConfiguredBuilder) {
+        this.asyncConfiguredBuilder = asyncConfiguredBuilder;
+    }
+}
diff --git a/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamConfig.java b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamConfig.java
new file mode 100644
index 0000000000000..4d6ecad8d02b5
--- /dev/null
+++ b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamConfig.java
@@ -0,0 +1,42 @@
+package io.quarkus.amazon.iam.runtime;
+
+import io.quarkus.amazon.common.runtime.AwsConfig;
+import io.quarkus.amazon.common.runtime.NettyHttpClientConfig;
+import io.quarkus.amazon.common.runtime.SdkConfig;
+import io.quarkus.amazon.common.runtime.SyncHttpClientConfig;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "iam", phase = ConfigPhase.RUN_TIME)
+public class IamConfig {
+
+    /**
+     * AWS SDK client configurations
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    @ConfigDocSection
+    public SdkConfig sdk;
+
+    /**
+     * AWS services configurations
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public AwsConfig aws;
+
+    /**
+     * Sync HTTP transport configurations
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public SyncHttpClientConfig syncClient;
+
+    /**
+     * Netty HTTP transport configurations
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public NettyHttpClientConfig asyncClient;
+}
diff --git a/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamRecorder.java b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamRecorder.java
new file mode 100644
index 0000000000000..eaabce592f437
--- /dev/null
+++ b/extensions/amazon-services/iam/runtime/src/main/java/io/quarkus/amazon/iam/runtime/IamRecorder.java
@@ -0,0 +1,73 @@
+package io.quarkus.amazon.iam.runtime;
+
+import io.quarkus.amazon.common.runtime.AwsConfig;
+import io.quarkus.amazon.common.runtime.NettyHttpClientConfig;
+import io.quarkus.amazon.common.runtime.SdkConfig;
+import io.quarkus.amazon.common.runtime.SyncHttpClientConfig;
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.ShutdownContext;
+import io.quarkus.runtime.annotations.Recorder;
+import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.services.iam.IamAsyncClient;
+import software.amazon.awssdk.services.iam.IamAsyncClientBuilder;
+import software.amazon.awssdk.services.iam.IamClient;
+import software.amazon.awssdk.services.iam.IamClientBuilder;
+
+@Recorder
+public class IamRecorder {
+
+    public RuntimeValue<SyncHttpClientConfig> getSyncConfig(IamConfig config) {
+        return new RuntimeValue<>(config.syncClient);
+    }
+
+    public RuntimeValue<NettyHttpClientConfig> getAsyncConfig(IamConfig config) {
+        return new RuntimeValue<>(config.asyncClient);
+    }
+
+    public RuntimeValue<AwsConfig> getAwsConfig(IamConfig config) {
+        return new RuntimeValue<>(config.aws);
+    }
+
+    public RuntimeValue<SdkConfig> getSdkConfig(IamConfig config) {
+        return new RuntimeValue<>(config.sdk);
+    }
+
+    public RuntimeValue<AwsClientBuilder> createSyncBuilder(IamConfig config, RuntimeValue<SdkHttpClient.Builder> transport) {
+        IamClientBuilder builder = IamClient.builder();
+        if (transport != null) {
+            builder.httpClientBuilder(transport.getValue());
+        }
+        return new RuntimeValue<>(builder);
+    }
+
+    public RuntimeValue<AwsClientBuilder> createAsyncBuilder(IamConfig config,
+            RuntimeValue<SdkAsyncHttpClient.Builder> transport) {
+
+        IamAsyncClientBuilder builder = IamAsyncClient.builder();
+        if (transport != null) {
+            builder.httpClientBuilder(transport.getValue());
+        }
+        return new RuntimeValue<>(builder);
+    }
+
+    public RuntimeValue<IamClient> buildClient(RuntimeValue<? extends AwsClientBuilder> builder,
+            BeanContainer beanContainer,
+            ShutdownContext shutdown) {
+        IamClientProducer producer = beanContainer.instance(IamClientProducer.class);
+        producer.setSyncConfiguredBuilder((IamClientBuilder) builder.getValue());
+        shutdown.addShutdownTask(producer::destroy);
+        return new RuntimeValue<>(producer.client());
+    }
+
+    public RuntimeValue<IamAsyncClient> buildAsyncClient(RuntimeValue<? extends AwsClientBuilder> builder,
+            BeanContainer beanContainer,
+            ShutdownContext shutdown) {
+        IamClientProducer producer = beanContainer.instance(IamClientProducer.class);
+        producer.setAsyncConfiguredBuilder((IamAsyncClientBuilder) builder.getValue());
+        shutdown.addShutdownTask(producer::destroy);
+        return new RuntimeValue<>(producer.asyncClient());
+    }
+}
diff --git a/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..b7c66cf0be5aa
--- /dev/null
+++ b/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,11 @@
+---
+name: "Amazon IAM"
+metadata:
+  keywords:
+    - "iam"
+    - "aws"
+    - "amazon"
+  guide: "https://quarkus.io/guides/amazon-iam"
+  categories:
+    - "data"
+  status: "preview"
diff --git a/extensions/amazon-services/kms/deployment/src/main/java/io/quarkus/amazon/kms/deployment/KmsProcessor.java b/extensions/amazon-services/kms/deployment/src/main/java/io/quarkus/amazon/kms/deployment/KmsProcessor.java
index 4c97d707ae865..64d256bd147be 100644
--- a/extensions/amazon-services/kms/deployment/src/main/java/io/quarkus/amazon/kms/deployment/KmsProcessor.java
+++ b/extensions/amazon-services/kms/deployment/src/main/java/io/quarkus/amazon/kms/deployment/KmsProcessor.java
@@ -5,13 +5,17 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
-import io.quarkus.amazon.common.deployment.AmazonClientTransportsBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.kms.runtime.KmsBuildTimeConfig;
 import io.quarkus.amazon.kms.runtime.KmsClientProducer;
 import io.quarkus.amazon.kms.runtime.KmsConfig;
@@ -75,26 +79,51 @@ void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
                 buildTimeConfig.sdk, buildTimeConfig.syncClient);
     }
 
-    @BuildStep
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTransport(List<AmazonClientBuildItem> amazonClients, KmsRecorder recorder,
-            AmazonClientTransportRecorder transportRecorder,
-            KmsConfig runtimeConfig, BuildProducer<AmazonClientTransportsBuildItem> clientTransportBuildProducer) {
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, KmsRecorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            KmsConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
 
-        createTransportBuilders(amazonClients,
+        createApacheSyncTransportBuilder(amazonClients,
                 transportRecorder,
                 buildTimeConfig.syncClient,
                 recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, KmsRecorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            KmsConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, KmsRecorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            KmsConfig runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
                 recorder.getAsyncConfig(runtimeConfig),
-                clientTransportBuildProducer);
+                asyncTransports);
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void createClientBuilders(List<AmazonClientTransportsBuildItem> transportBuildItems, KmsRecorder recorder,
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports, KmsRecorder recorder,
             KmsConfig runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
 
-        createClientBuilders(transportBuildItems, builderProducer,
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
                 (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
                 (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
     }
diff --git a/extensions/amazon-services/kms/runtime/pom.xml b/extensions/amazon-services/kms/runtime/pom.xml
index 3b22a4dc99619..0eba7e257d8be 100644
--- a/extensions/amazon-services/kms/runtime/pom.xml
+++ b/extensions/amazon-services/kms/runtime/pom.xml
@@ -35,6 +35,21 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>kms</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/extensions/amazon-services/pom.xml b/extensions/amazon-services/pom.xml
index e973bc3730751..128b00c01338a 100644
--- a/extensions/amazon-services/pom.xml
+++ b/extensions/amazon-services/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,6 +17,7 @@
     <modules>
         <module>common</module>
         <module>dynamodb</module>
+        <module>iam</module>
         <module>s3</module>
         <module>sns</module>
         <module>sqs</module>
diff --git a/extensions/amazon-services/s3/deployment/src/main/java/io/quarkus/amazon/s3/deployment/S3Processor.java b/extensions/amazon-services/s3/deployment/src/main/java/io/quarkus/amazon/s3/deployment/S3Processor.java
index 57c0b4aaabfa9..b8b128ef98555 100644
--- a/extensions/amazon-services/s3/deployment/src/main/java/io/quarkus/amazon/s3/deployment/S3Processor.java
+++ b/extensions/amazon-services/s3/deployment/src/main/java/io/quarkus/amazon/s3/deployment/S3Processor.java
@@ -5,13 +5,17 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
-import io.quarkus.amazon.common.deployment.AmazonClientTransportsBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.s3.runtime.S3BuildTimeConfig;
 import io.quarkus.amazon.s3.runtime.S3ClientProducer;
 import io.quarkus.amazon.s3.runtime.S3Config;
@@ -76,26 +80,52 @@ void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
                 buildTimeConfig.syncClient);
     }
 
-    @BuildStep
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTransport(List<AmazonClientBuildItem> amazonClients, S3Recorder recorder,
-            AmazonClientTransportRecorder transportRecorder,
-            S3Config runtimeConfig, BuildProducer<AmazonClientTransportsBuildItem> clientTransportBuildProducer) {
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, S3Recorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            S3Config runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
 
-        createTransportBuilders(amazonClients,
+        createApacheSyncTransportBuilder(amazonClients,
                 transportRecorder,
                 buildTimeConfig.syncClient,
                 recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, S3Recorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            S3Config runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, S3Recorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            S3Config runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
                 recorder.getAsyncConfig(runtimeConfig),
-                clientTransportBuildProducer);
+                asyncTransports);
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void createClientBuilders(List<AmazonClientTransportsBuildItem> transportBuildItems, S3Recorder recorder,
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports,
+            S3Recorder recorder,
             S3Config runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
 
-        createClientBuilders(transportBuildItems, builderProducer,
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
                 (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
                 (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
     }
diff --git a/extensions/amazon-services/s3/runtime/pom.xml b/extensions/amazon-services/s3/runtime/pom.xml
index 96bd3e4df1100..96d6f0c353dc0 100644
--- a/extensions/amazon-services/s3/runtime/pom.xml
+++ b/extensions/amazon-services/s3/runtime/pom.xml
@@ -34,6 +34,21 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/extensions/amazon-services/ses/deployment/src/main/java/io/quarkus/amazon/ses/deployment/SesProcessor.java b/extensions/amazon-services/ses/deployment/src/main/java/io/quarkus/amazon/ses/deployment/SesProcessor.java
index 5811f5e3a5306..198924ee1ae45 100644
--- a/extensions/amazon-services/ses/deployment/src/main/java/io/quarkus/amazon/ses/deployment/SesProcessor.java
+++ b/extensions/amazon-services/ses/deployment/src/main/java/io/quarkus/amazon/ses/deployment/SesProcessor.java
@@ -5,13 +5,17 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
-import io.quarkus.amazon.common.deployment.AmazonClientTransportsBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.ses.runtime.SesBuildTimeConfig;
 import io.quarkus.amazon.ses.runtime.SesClientProducer;
 import io.quarkus.amazon.ses.runtime.SesConfig;
@@ -75,26 +79,51 @@ void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
                 buildTimeConfig.sdk, buildTimeConfig.syncClient);
     }
 
-    @BuildStep
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTransport(List<AmazonClientBuildItem> amazonClients, SesRecorder recorder,
-            AmazonClientTransportRecorder transportRecorder,
-            SesConfig runtimeConfig, BuildProducer<AmazonClientTransportsBuildItem> clientTransportBuildProducer) {
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, SesRecorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            SesConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
 
-        createTransportBuilders(amazonClients,
+        createApacheSyncTransportBuilder(amazonClients,
                 transportRecorder,
                 buildTimeConfig.syncClient,
                 recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, SesRecorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            SesConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, SesRecorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            SesConfig runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
                 recorder.getAsyncConfig(runtimeConfig),
-                clientTransportBuildProducer);
+                asyncTransports);
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void createClientBuilders(List<AmazonClientTransportsBuildItem> transportBuildItems, SesRecorder recorder,
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports, SesRecorder recorder,
             SesConfig runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
 
-        createClientBuilders(transportBuildItems, builderProducer,
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
                 (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
                 (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
     }
diff --git a/extensions/amazon-services/ses/runtime/pom.xml b/extensions/amazon-services/ses/runtime/pom.xml
index f7f80fee7191b..8ba690cc0d18c 100644
--- a/extensions/amazon-services/ses/runtime/pom.xml
+++ b/extensions/amazon-services/ses/runtime/pom.xml
@@ -35,6 +35,21 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>ses</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/extensions/amazon-services/sns/deployment/src/main/java/io/quarkus/amazon/sns/deployment/SnsProcessor.java b/extensions/amazon-services/sns/deployment/src/main/java/io/quarkus/amazon/sns/deployment/SnsProcessor.java
index 00e237cb8b657..b4240b44c288d 100644
--- a/extensions/amazon-services/sns/deployment/src/main/java/io/quarkus/amazon/sns/deployment/SnsProcessor.java
+++ b/extensions/amazon-services/sns/deployment/src/main/java/io/quarkus/amazon/sns/deployment/SnsProcessor.java
@@ -5,13 +5,17 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
-import io.quarkus.amazon.common.deployment.AmazonClientTransportsBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.sns.runtime.SnsBuildTimeConfig;
 import io.quarkus.amazon.sns.runtime.SnsClientProducer;
 import io.quarkus.amazon.sns.runtime.SnsConfig;
@@ -76,26 +80,51 @@ void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
                 buildTimeConfig.syncClient);
     }
 
-    @BuildStep
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTransport(List<AmazonClientBuildItem> amazonClients, SnsRecorder recorder,
-            AmazonClientTransportRecorder transportRecorder,
-            SnsConfig runtimeConfig, BuildProducer<AmazonClientTransportsBuildItem> clientTransportBuildProducer) {
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, SnsRecorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            SnsConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
 
-        createTransportBuilders(amazonClients,
+        createApacheSyncTransportBuilder(amazonClients,
                 transportRecorder,
                 buildTimeConfig.syncClient,
                 recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, SnsRecorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            SnsConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, SnsRecorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            SnsConfig runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
                 recorder.getAsyncConfig(runtimeConfig),
-                clientTransportBuildProducer);
+                asyncTransports);
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void createClientBuilders(List<AmazonClientTransportsBuildItem> transportBuildItems, SnsRecorder recorder,
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports, SnsRecorder recorder,
             SnsConfig runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
 
-        createClientBuilders(transportBuildItems, builderProducer,
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
                 (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
                 (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
     }
diff --git a/extensions/amazon-services/sns/runtime/pom.xml b/extensions/amazon-services/sns/runtime/pom.xml
index ef899fd76fc2f..af02948433173 100644
--- a/extensions/amazon-services/sns/runtime/pom.xml
+++ b/extensions/amazon-services/sns/runtime/pom.xml
@@ -34,6 +34,21 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sns</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/extensions/amazon-services/sqs/deployment/src/main/java/io/quarkus/amazon/sqs/deployment/SqsProcessor.java b/extensions/amazon-services/sqs/deployment/src/main/java/io/quarkus/amazon/sqs/deployment/SqsProcessor.java
index 6ba7663a0400b..b718a9239f458 100644
--- a/extensions/amazon-services/sqs/deployment/src/main/java/io/quarkus/amazon/sqs/deployment/SqsProcessor.java
+++ b/extensions/amazon-services/sqs/deployment/src/main/java/io/quarkus/amazon/sqs/deployment/SqsProcessor.java
@@ -5,13 +5,17 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor;
+import io.quarkus.amazon.common.deployment.AmazonClientAsyncTransportBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientBuilderConfiguredBuildItem;
 import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem;
-import io.quarkus.amazon.common.deployment.AmazonClientTransportsBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem;
+import io.quarkus.amazon.common.deployment.AmazonHttpClients;
+import io.quarkus.amazon.common.runtime.AmazonClientApacheTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientNettyTransportRecorder;
 import io.quarkus.amazon.common.runtime.AmazonClientRecorder;
-import io.quarkus.amazon.common.runtime.AmazonClientTransportRecorder;
+import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder;
 import io.quarkus.amazon.sqs.runtime.SqsBuildTimeConfig;
 import io.quarkus.amazon.sqs.runtime.SqsClientProducer;
 import io.quarkus.amazon.sqs.runtime.SqsConfig;
@@ -76,26 +80,51 @@ void setup(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
                 buildTimeConfig.syncClient);
     }
 
-    @BuildStep
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonApacheHttpServicePresent.class)
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTransport(List<AmazonClientBuildItem> amazonClients, SqsRecorder recorder,
-            AmazonClientTransportRecorder transportRecorder,
-            SqsConfig runtimeConfig, BuildProducer<AmazonClientTransportsBuildItem> clientTransportBuildProducer) {
+    void setupApacheSyncTransport(List<AmazonClientBuildItem> amazonClients, SqsRecorder recorder,
+            AmazonClientApacheTransportRecorder transportRecorder,
+            SqsConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
 
-        createTransportBuilders(amazonClients,
+        createApacheSyncTransportBuilder(amazonClients,
                 transportRecorder,
                 buildTimeConfig.syncClient,
                 recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonUrlConnectionHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, SqsRecorder recorder,
+            AmazonClientUrlConnectionTransportRecorder transportRecorder,
+            SqsConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) {
+
+        createUrlConnectionSyncTransportBuilder(amazonClients,
+                transportRecorder,
+                buildTimeConfig.syncClient,
+                recorder.getSyncConfig(runtimeConfig),
+                syncTransports);
+    }
+
+    @BuildStep(onlyIf = AmazonHttpClients.IsAmazonNettyHttpServicePresent.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setupNettyAsyncTransport(List<AmazonClientBuildItem> amazonClients, SqsRecorder recorder,
+            AmazonClientNettyTransportRecorder transportRecorder,
+            SqsConfig runtimeConfig, BuildProducer<AmazonClientAsyncTransportBuildItem> asyncTransports) {
+
+        createNettyAsyncTransportBuilder(amazonClients,
+                transportRecorder,
                 recorder.getAsyncConfig(runtimeConfig),
-                clientTransportBuildProducer);
+                asyncTransports);
     }
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void createClientBuilders(List<AmazonClientTransportsBuildItem> transportBuildItems, SqsRecorder recorder,
+    void createClientBuilders(List<AmazonClientSyncTransportBuildItem> syncTransports,
+            List<AmazonClientAsyncTransportBuildItem> asyncTransports, SqsRecorder recorder,
             SqsConfig runtimeConfig, BuildProducer<AmazonClientBuilderBuildItem> builderProducer) {
 
-        createClientBuilders(transportBuildItems, builderProducer,
+        createClientBuilders(syncTransports, asyncTransports, builderProducer,
                 (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport),
                 (asyncTransport) -> recorder.createAsyncBuilder(runtimeConfig, asyncTransport));
     }
diff --git a/extensions/amazon-services/sqs/runtime/pom.xml b/extensions/amazon-services/sqs/runtime/pom.xml
index f1b7442edc1a8..2ae995235ef61 100644
--- a/extensions/amazon-services/sqs/runtime/pom.xml
+++ b/extensions/amazon-services/sqs/runtime/pom.xml
@@ -34,6 +34,21 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sqs</artifactId>
+            <exclusions>
+                <!-- we exclude them here because we want to make them optional -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/extensions/arc/deployment/pom.xml b/extensions/arc/deployment/pom.xml
index 2d39867a76e85..9d20499b6ff75 100644
--- a/extensions/arc/deployment/pom.xml
+++ b/extensions/arc/deployment/pom.xml
@@ -1,54 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>quarkus-arc-parent</artifactId>
-    <groupId>io.quarkus</groupId>
-    <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-arc-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>quarkus-arc-deployment</artifactId>
-  <name>Quarkus - ArC - Deployment</name>
+    <artifactId>quarkus-arc-deployment</artifactId>
+    <name>Quarkus - ArC - Deployment</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-core-deployment</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-arc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus.arc</groupId>
-      <artifactId>arc-processor</artifactId>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.arc</groupId>
+            <artifactId>arc-processor</artifactId>
+        </dependency>
 
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-  </dependencies>
+        <!-- Used to test wrong @Singleton detection -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+            <version>1.0.2.Final</version>
+            <scope>test</scope>
+        </dependency>
 
-  <build>
-    <plugins>
-      <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-              <annotationProcessorPaths>
-                  <path>
-                      <groupId>io.quarkus</groupId>
-                      <artifactId>quarkus-extension-processor</artifactId>
-                      <version>${project.version}</version>
-                  </path>
-              </annotationProcessorPaths>
-          </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AdditionalBeanBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AdditionalBeanBuildItem.java
index 6766f2d6b5d24..f85b8c0b33d0d 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AdditionalBeanBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AdditionalBeanBuildItem.java
@@ -12,10 +12,15 @@
 import io.quarkus.builder.item.MultiBuildItem;
 
 /**
- * This build item is used to specify one or more additional bean classes to be analyzed.
+ * This build item is used to specify one or more additional bean classes to be analyzed during bean discovery.
  * <p>
  * By default, the resulting beans may be removed if they are considered unused and {@link ArcConfig#removeUnusedBeans} is
- * enabled.
+ * enabled. You can change the default behavior by setting the {@link #removable} to {@code false} and via
+ * {@link Builder#setUnremovable()}.
+ * <p>
+ * An additional bean may have the scope defaulted via {@link #defaultScope} and {@link Builder#setDefaultScope(DotName)}. The
+ * default scope is only used if there is no scope declared on the bean class. The default scope should be used in cases where a
+ * bean class source is not controlled by the extension and the scope annotation cannot be declared directly on the class.
  */
 public final class AdditionalBeanBuildItem extends MultiBuildItem {
 
@@ -122,6 +127,15 @@ public Builder setUnremovable() {
             return this;
         }
 
+        /**
+         * The default scope is only used if there is no scope declared on the bean class.
+         * <p>
+         * The default scope should be used in cases where a bean class source is not controlled by the extension and the
+         * scope annotation cannot be declared directly on the class.
+         * 
+         * @param defaultScope
+         * @return self
+         */
         public Builder setDefaultScope(DotName defaultScope) {
             this.defaultScope = defaultScope;
             return this;
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java
index 499f6b7024f2b..6ad7fb53dbf23 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java
@@ -12,6 +12,8 @@
 
 import io.quarkus.arc.config.ConfigProperties;
 import io.quarkus.deployment.index.IndexDependencyConfig;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
@@ -42,7 +44,7 @@ public class ArcConfig {
      * <li>does not declare any producer which is eligible for injection to any injection point,</li>
      * <li>is not directly eligible for injection into any {@link javax.enterprise.inject.Instance} injection point</li>
      * </ul>
-     * 
+     *
      * @see UnremovableBeanBuildItem
      */
     @ConfigItem(defaultValue = "all")
@@ -96,7 +98,7 @@ public class ArcConfig {
     public Optional<List<String>> selectedAlternatives;
 
     /**
-     * If set to true then {@code javax.enterprise.inject.Produces} is automatically added to all methods that are
+     * If set to true then {@code javax.enterprise.inject.Produces} is automatically added to all non-void methods that are
      * annotated with a scope annotation, a stereotype or a qualifier, and are not annotated with {@code Inject} or
      * {@code Produces}, and no parameter is annotated with {@code Disposes}, {@code Observes} or {@code ObservesAsync}.
      */
@@ -140,12 +142,47 @@ public class ArcConfig {
     public Optional<List<String>> unremovableTypes;
 
     /**
-     * The artifacts that should be excluded from discovery. These artifacts would be otherwise scanned for beans, i.e. they
+     * Artifacts that should be excluded from discovery.
+     * <p>
+     * These artifacts would be otherwise scanned for beans, i.e. they
      * contain a Jandex index or a beans.xml descriptor.
      */
     @ConfigItem
+    @ConfigDocSection
+    @ConfigDocMapKey("dependency-name")
     Map<String, IndexDependencyConfig> excludeDependency;
 
+    /**
+     * If set to true then the container attempts to detect "unused removed beans" false positives during programmatic lookup at
+     * runtime. You can disable this feature to conserve some memory when running your application in production.
+     *
+     * @see ArcConfig#removeUnusedBeans
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean detectUnusedFalsePositives;
+
+    /**
+     * If set to true then the container attempts to detect usage of <i>wrong</i> annotations.
+     * <p>
+     * A <i>wrong</i> annotation may lead to unexpected behavior in a Quarkus application. A typical example is
+     * {@code @javax.ejb.Singleton} which is often confused with {@code @javax.inject.Singleton}. As a result a component
+     * annotated with {@code @javax.ejb.Singleton} can be completely ignored.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean detectWrongAnnotations;
+
+    /**
+     * Dev mode configuration.
+     */
+    @ConfigItem
+    public ArcDevModeConfig devMode;
+
+    /**
+     * Test mode configuration.
+     */
+    @ConfigItem
+    public ArcTestConfig test;
+
     public final boolean isRemoveUnusedBeansFieldValid() {
         return ALLOWED_REMOVE_UNUSED_BEANS_VALUES.contains(removeUnusedBeans.toLowerCase());
     }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcDevModeConfig.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcDevModeConfig.java
new file mode 100644
index 0000000000000..18ac7917643ca
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcDevModeConfig.java
@@ -0,0 +1,15 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class ArcDevModeConfig {
+
+    /**
+     * If set to true then the container monitors business method invocations and fired events during the development mode.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean monitoringEnabled;
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java
index c060653781f48..dad024319f59f 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java
@@ -33,19 +33,23 @@
 import io.quarkus.arc.deployment.ObserverRegistrationPhaseBuildItem.ObserverConfiguratorBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassNameExclusion;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanTypeExclusion;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
 import io.quarkus.arc.processor.AlternativePriorities;
 import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanConfigurator;
 import io.quarkus.arc.processor.BeanDefiningAnnotation;
 import io.quarkus.arc.processor.BeanDeployment;
+import io.quarkus.arc.processor.BeanDeploymentValidator;
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.arc.processor.BeanProcessor;
+import io.quarkus.arc.processor.BeanRegistrar;
 import io.quarkus.arc.processor.BytecodeTransformer;
 import io.quarkus.arc.processor.ContextConfigurator;
 import io.quarkus.arc.processor.ContextRegistrar;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.ObserverConfigurator;
+import io.quarkus.arc.processor.ObserverRegistrar;
 import io.quarkus.arc.processor.ReflectionRegistration;
 import io.quarkus.arc.processor.ResourceOutput;
 import io.quarkus.arc.processor.StereotypeInfo;
@@ -53,17 +57,20 @@
 import io.quarkus.arc.runtime.ArcRecorder;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.arc.runtime.LaunchModeProducer;
-import io.quarkus.arc.runtime.LifecycleEventRunner;
+import io.quarkus.arc.runtime.LoggerProducer;
+import io.quarkus.arc.runtime.test.PreloadedTestApplicationClassPredicate;
 import io.quarkus.bootstrap.BootstrapDebug;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.IsTest;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
-import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
+import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -81,6 +88,7 @@
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.QuarkusApplication;
 import io.quarkus.runtime.annotations.QuarkusMain;
+import io.quarkus.runtime.test.TestApplicationClassPredicate;
 
 /**
  * This class contains build steps that trigger various phases of the bean processing.
@@ -90,6 +98,7 @@
  * <ol>
  * <li>{@link ContextRegistrationPhaseBuildItem}</li>
  * <li>{@link BeanRegistrationPhaseBuildItem}</li>
+ * <li>{@link ObserverRegistrationPhaseBuildItem}</li>
  * <li>{@link ValidationPhaseBuildItem}</li>
  * </ol>
  * These build items are especially useful if an extension needs to produce other build items within the given phase.
@@ -122,48 +131,63 @@ AdditionalBeanBuildItem quarkusApplication(CombinedIndexBuildItem combinedIndexB
                 .build();
     }
 
-    // PHASE 1 - build BeanProcessor, register custom contexts
+    // PHASE 1 - build BeanProcessor
     @BuildStep
     public ContextRegistrationPhaseBuildItem initialize(
             ArcConfig arcConfig,
             BeanArchiveIndexBuildItem beanArchiveIndex,
-            ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            CombinedIndexBuildItem combinedIndex,
+            ApplicationIndexBuildItem applicationIndex,
             List<AnnotationsTransformerBuildItem> annotationTransformers,
             List<InjectionPointTransformerBuildItem> injectionPointTransformers,
             List<ObserverTransformerBuildItem> observerTransformers,
-            List<InterceptorBindingRegistrarBuildItem> interceptorBindingRegistrarBuildItems,
+            List<InterceptorBindingRegistrarBuildItem> interceptorBindingRegistrars,
+            List<QualifierRegistrarBuildItem> qualifierRegistrars,
             List<AdditionalStereotypeBuildItem> additionalStereotypeBuildItems,
             List<ApplicationClassPredicateBuildItem> applicationClassPredicates,
             List<AdditionalBeanBuildItem> additionalBeans,
-            List<BeanRegistrarBuildItem> beanRegistrars,
-            List<ObserverRegistrarBuildItem> observerRegistrars,
-            List<ContextRegistrarBuildItem> contextRegistrars,
-            List<BeanDeploymentValidatorBuildItem> beanDeploymentValidators,
             List<ResourceAnnotationBuildItem> resourceAnnotations,
             List<BeanDefiningAnnotationBuildItem> additionalBeanDefiningAnnotations,
-            List<UnremovableBeanBuildItem> removalExclusions,
             Optional<TestClassPredicateBuildItem> testClassPredicate,
             Capabilities capabilities,
-            CustomScopeAnnotationsBuildItem scopes,
-            LaunchModeBuildItem launchModeBuildItem) {
+            CustomScopeAnnotationsBuildItem customScopes,
+            LaunchModeBuildItem launchModeBuildItem,
+            BuildProducer<CompletedApplicationClassPredicateBuildItem> applicationClassPredicateProducer) {
 
         if (!arcConfig.isRemoveUnusedBeansFieldValid()) {
             throw new IllegalArgumentException("Invalid configuration value set for 'quarkus.arc.remove-unused-beans'." +
                     " Please use one of " + ArcConfig.ALLOWED_REMOVE_UNUSED_BEANS_VALUES);
         }
 
-        List<String> additionalBeansTypes = beanArchiveIndex.getAdditionalBeans();
+        // bean type -> default scope (may be null)
+        Map<String, DotName> additionalBeanTypes = new HashMap<>();
+        for (AdditionalBeanBuildItem additionalBean : additionalBeans) {
+            DotName defaultScope = additionalBean.getDefaultScope();
+            for (String beanClass : additionalBean.getBeanClasses()) {
+                DotName existingDefaultScope = additionalBeanTypes.get(beanClass);
+                if (existingDefaultScope != null && defaultScope != null && !existingDefaultScope.equals(defaultScope)) {
+                    throw new IllegalStateException("Different default scopes defined for additional bean class: " + beanClass
+                            + "\n\t - scopes: " + defaultScope + " and "
+                            + existingDefaultScope);
+                }
+                additionalBeanTypes.put(beanClass, defaultScope);
+            }
+        }
+
         Set<DotName> generatedClassNames = beanArchiveIndex.getGeneratedClassNames();
         IndexView index = beanArchiveIndex.getIndex();
         BeanProcessor.Builder builder = BeanProcessor.builder();
-        IndexView applicationClassesIndex = applicationArchivesBuildItem.getRootArchive().getIndex();
-        builder.setApplicationClassPredicate(new AbstractCompositeApplicationClassesPredicate<DotName>(
+        IndexView applicationClassesIndex = applicationIndex.getIndex();
+        Predicate<DotName> applicationClassPredicate = new AbstractCompositeApplicationClassesPredicate<DotName>(
                 applicationClassesIndex, generatedClassNames, applicationClassPredicates, testClassPredicate) {
             @Override
             protected DotName getDotName(DotName dotName) {
                 return dotName;
             }
-        });
+        };
+        applicationClassPredicateProducer.produce(new CompletedApplicationClassPredicateBuildItem(applicationClassPredicate));
+        builder.setApplicationClassPredicate(applicationClassPredicate);
+
         builder.addAnnotationTransformer(new AnnotationsTransformer() {
 
             @Override
@@ -175,25 +199,29 @@ public boolean appliesTo(AnnotationTarget.Kind kind) {
             public void transform(TransformationContext transformationContext) {
                 ClassInfo beanClass = transformationContext.getTarget().asClass();
                 String beanClassName = beanClass.name().toString();
-                if (additionalBeansTypes.contains(beanClassName)) {
-                    if (scopes.isScopeDeclaredOn(beanClass)) {
-                        // If it declares a built-in scope no action is needed
-                        return;
-                    }
-                    // Try to determine the default scope
-                    DotName defaultScope = additionalBeans.stream()
-                            .filter(ab -> ab.contains(beanClassName)).findFirst().map(AdditionalBeanBuildItem::getDefaultScope)
-                            .orElse(null);
-                    if (defaultScope == null && !beanClass.annotations().containsKey(ADDITIONAL_BEAN)) {
-                        // Add special stereotype so that @Dependent is automatically used even if no scope is declared
+                if (!additionalBeanTypes.containsKey(beanClassName)) {
+                    // Not an additional bean type
+                    return;
+                }
+                if (customScopes.isScopeDeclaredOn(beanClass)) {
+                    // If it declares a scope no action is needed
+                    return;
+                }
+                DotName defaultScope = additionalBeanTypes.get(beanClassName);
+                if (defaultScope != null) {
+                    transformationContext.transform().add(defaultScope).done();
+                } else {
+                    if (!beanClass.annotations().containsKey(ADDITIONAL_BEAN)) {
+                        // Add special stereotype is added so that @Dependent is automatically used even if no scope is declared
+                        // Otherwise the bean class would be ignored during bean discovery
                         transformationContext.transform().add(ADDITIONAL_BEAN).done();
-                    } else {
-                        transformationContext.transform().add(defaultScope).done();
                     }
                 }
             }
         });
-        builder.setIndex(index);
+
+        builder.setBeanArchiveIndex(index);
+        builder.setApplicationIndex(combinedIndex.getIndex());
         List<BeanDefiningAnnotation> beanDefiningAnnotations = additionalBeanDefiningAnnotations.stream()
                 .map((s) -> new BeanDefiningAnnotation(s.getName(), s.getDefaultScope())).collect(Collectors.toList());
         beanDefiningAnnotations.add(new BeanDefiningAnnotation(ADDITIONAL_BEAN, null));
@@ -219,20 +247,12 @@ public void transform(TransformationContext transformationContext) {
             builder.addObserverTransformer(transformer.getInstance());
         }
         // register additional interceptor bindings
-        for (InterceptorBindingRegistrarBuildItem bindingRegistrar : interceptorBindingRegistrarBuildItems) {
-            builder.addInterceptorbindingRegistrar(bindingRegistrar.getInterceptorBindingRegistrar());
-        }
-        for (BeanRegistrarBuildItem item : beanRegistrars) {
-            builder.addBeanRegistrar(item.getBeanRegistrar());
-        }
-        for (ObserverRegistrarBuildItem item : observerRegistrars) {
-            builder.addObserverRegistrar(item.getObserverRegistrar());
-        }
-        for (ContextRegistrarBuildItem item : contextRegistrars) {
-            builder.addContextRegistrar(item.getContextRegistrar());
+        for (InterceptorBindingRegistrarBuildItem registrar : interceptorBindingRegistrars) {
+            builder.addInterceptorBindingRegistrar(registrar.getInterceptorBindingRegistrar());
         }
-        for (BeanDeploymentValidatorBuildItem item : beanDeploymentValidators) {
-            builder.addBeanDeploymentValidator(item.getBeanDeploymentValidator());
+        // register additional qualifiers
+        for (QualifierRegistrarBuildItem registrar : qualifierRegistrars) {
+            builder.addQualifierRegistrar(registrar.getQualifierRegistrar());
         }
         builder.setRemoveUnusedBeans(arcConfig.shouldEnableBeanRemoval());
         if (arcConfig.shouldOnlyKeepAppBeans()) {
@@ -244,7 +264,7 @@ protected DotName getDotName(BeanInfo bean) {
                 }
             });
         }
-        builder.addRemovalExclusion(new BeanClassNameExclusion(LifecycleEventRunner.class.getName()));
+        builder.addRemovalExclusion(new BeanTypeExclusion(DotName.createSimple(TestApplicationClassPredicate.class.getName())));
         for (AdditionalBeanBuildItem additionalBean : additionalBeans) {
             if (!additionalBean.isRemovable()) {
                 for (String beanClass : additionalBean.getBeanClasses()) {
@@ -257,9 +277,6 @@ protected DotName getDotName(BeanInfo bean) {
                 builder.addRemovalExclusion(new BeanClassAnnotationExclusion(annotation.getName()));
             }
         }
-        for (UnremovableBeanBuildItem exclusion : removalExclusions) {
-            builder.addRemovalExclusion(exclusion.getPredicate());
-        }
         // unremovable beans specified in application.properties
         if (arcConfig.unremovableTypes.isPresent()) {
             List<Predicate<ClassInfo>> classPredicates = initClassPredicates(arcConfig.unremovableTypes.get());
@@ -345,6 +362,7 @@ public Integer compute(AnnotationTarget target, Collection<StereotypeInfo> stere
     public BeanRegistrationPhaseBuildItem registerBeans(ContextRegistrationPhaseBuildItem contextRegistrationPhase,
             List<ContextConfiguratorBuildItem> contextConfigurators,
             BuildProducer<InterceptorResolverBuildItem> interceptorResolver,
+            BuildProducer<BeanDiscoveryFinishedBuildItem> beanDiscoveryFinished,
             BuildProducer<TransformedAnnotationsBuildItem> transformedAnnotations) {
 
         for (ContextConfiguratorBuildItem contextConfigurator : contextConfigurators) {
@@ -353,13 +371,15 @@ public BeanRegistrationPhaseBuildItem registerBeans(ContextRegistrationPhaseBuil
                 value.done();
             }
         }
-
-        BeanDeployment beanDeployment = contextRegistrationPhase.getBeanProcessor().getBeanDeployment();
+        BeanProcessor beanProcessor = contextRegistrationPhase.getBeanProcessor();
+        beanProcessor.registerScopes();
+        BeanRegistrar.RegistrationContext registrationContext = beanProcessor.registerBeans();
+        BeanDeployment beanDeployment = beanProcessor.getBeanDeployment();
         interceptorResolver.produce(new InterceptorResolverBuildItem(beanDeployment));
+        beanDiscoveryFinished.produce(new BeanDiscoveryFinishedBuildItem(beanDeployment));
         transformedAnnotations.produce(new TransformedAnnotationsBuildItem(beanDeployment));
 
-        return new BeanRegistrationPhaseBuildItem(contextRegistrationPhase.getBeanProcessor().registerBeans(),
-                contextRegistrationPhase.getBeanProcessor());
+        return new BeanRegistrationPhaseBuildItem(registrationContext, beanProcessor);
     }
 
     // PHASE 3 - register synthetic observers
@@ -372,31 +392,41 @@ public ObserverRegistrationPhaseBuildItem registerSyntheticObservers(BeanRegistr
             configurator.getValues().forEach(BeanConfigurator::done);
         }
 
-        return new ObserverRegistrationPhaseBuildItem(beanRegistrationPhase.getBeanProcessor().registerSyntheticObservers(),
-                beanRegistrationPhase.getBeanProcessor());
+        BeanProcessor beanProcessor = beanRegistrationPhase.getBeanProcessor();
+        ObserverRegistrar.RegistrationContext registrationContext = beanProcessor.registerSyntheticObservers();
+
+        return new ObserverRegistrationPhaseBuildItem(registrationContext, beanProcessor);
     }
 
     // PHASE 4 - initialize and validate the bean deployment
     @BuildStep
     public ValidationPhaseBuildItem validate(ObserverRegistrationPhaseBuildItem observerRegistrationPhase,
             List<ObserverConfiguratorBuildItem> observerConfigurators,
-            BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformer) {
+            List<UnremovableBeanBuildItem> unremovableBeans,
+            BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformer,
+            BuildProducer<SynthesisFinishedBuildItem> synthesisFinished) {
 
         for (ObserverConfiguratorBuildItem configurator : observerConfigurators) {
             // Just make sure the configurator is processed
             configurator.getValues().forEach(ObserverConfigurator::done);
         }
 
+        BeanProcessor beanProcessor = observerRegistrationPhase.getBeanProcessor();
+        synthesisFinished.produce(new SynthesisFinishedBuildItem(beanProcessor.getBeanDeployment()));
+
         Consumer<BytecodeTransformer> bytecodeTransformerConsumer = new BytecodeTransformerConsumer(bytecodeTransformer);
-        observerRegistrationPhase.getBeanProcessor().initialize(bytecodeTransformerConsumer);
-        return new ValidationPhaseBuildItem(observerRegistrationPhase.getBeanProcessor().validate(bytecodeTransformerConsumer),
-                observerRegistrationPhase.getBeanProcessor());
+
+        beanProcessor.initialize(bytecodeTransformerConsumer,
+                unremovableBeans.stream().map(UnremovableBeanBuildItem::getPredicate).collect(Collectors.toList()));
+        BeanDeploymentValidator.ValidationContext validationContext = beanProcessor.validate(bytecodeTransformerConsumer);
+
+        return new ValidationPhaseBuildItem(validationContext, beanProcessor);
     }
 
     // PHASE 5 - generate resources and initialize the container
     @BuildStep
     @Record(STATIC_INIT)
-    public BeanContainerBuildItem generateResources(ArcRecorder recorder, ShutdownContextBuildItem shutdown,
+    public BeanContainerBuildItem generateResources(ArcConfig config, ArcRecorder recorder, ShutdownContextBuildItem shutdown,
             ValidationPhaseBuildItem validationPhase,
             List<ValidationPhaseBuildItem.ValidationErrorBuildItem> validationErrors,
             List<BeanContainerListenerBuildItem> beanContainerListenerBuildItems,
@@ -435,7 +465,8 @@ public void registerMethod(MethodInfo methodInfo) {
             public void registerField(FieldInfo fieldInfo) {
                 reflectiveFields.produce(new ReflectiveFieldBuildItem(fieldInfo));
             }
-        }, existingClasses.existingClasses, bytecodeTransformerConsumer);
+        }, existingClasses.existingClasses, bytecodeTransformerConsumer,
+                config.shouldEnableBeanRemoval() && config.detectUnusedFalsePositives);
         for (ResourceOutput.Resource resource : resources) {
             switch (resource.getType()) {
                 case JAVA_CLASS:
@@ -465,13 +496,30 @@ public void registerField(FieldInfo fieldInfo) {
         ArcContainer container = recorder.getContainer(shutdown);
         BeanContainer beanContainer = recorder.initBeanContainer(container,
                 beanContainerListenerBuildItems.stream().map(BeanContainerListenerBuildItem::getBeanContainerListener)
-                        .collect(Collectors.toList()),
-                beanProcessor.getBeanDeployment().getRemovedBeans().stream().flatMap(b -> b.getTypes().stream())
-                        .map(t -> t.name().toString())
-                        .collect(Collectors.toSet()));
+                        .collect(Collectors.toList()));
 
         return new BeanContainerBuildItem(beanContainer);
+    }
 
+    @BuildStep(onlyIf = IsTest.class)
+    public AdditionalBeanBuildItem testApplicationClassPredicateBean() {
+        // We need to register the bean implementation for TestApplicationClassPredicate
+        // TestApplicationClassPredicate is used programatically in the ArC recorder when StartupEvent is fired  
+        return AdditionalBeanBuildItem.unremovableOf(PreloadedTestApplicationClassPredicate.class);
+    }
+
+    @BuildStep(onlyIf = IsTest.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    void initTestApplicationClassPredicateBean(ArcRecorder recorder, BeanContainerBuildItem beanContainer,
+            BeanDiscoveryFinishedBuildItem beanDiscoveryFinished,
+            CompletedApplicationClassPredicateBuildItem predicate) {
+        Set<String> applicationBeanClasses = new HashSet<>();
+        for (BeanInfo bean : beanDiscoveryFinished.beanStream().classBeans()) {
+            if (predicate.test(bean.getBeanClass())) {
+                applicationBeanClasses.add(bean.getBeanClass().toString());
+            }
+        }
+        recorder.initTestApplicationClassPredicate(applicationBeanClasses);
     }
 
     @BuildStep
@@ -492,10 +540,15 @@ AdditionalBeanBuildItem launchMode() {
     }
 
     @BuildStep
-    CustomScopeAnnotationsBuildItem exposeCustomScopeNames(List<ContextRegistrarBuildItem> contextBuildItems) {
+    AdditionalBeanBuildItem loggerProducer() {
+        return new AdditionalBeanBuildItem(LoggerProducer.class);
+    }
+
+    @BuildStep
+    CustomScopeAnnotationsBuildItem exposeCustomScopeNames(List<CustomScopeBuildItem> customScopes) {
         Set<DotName> names = new HashSet<>();
-        for (ContextRegistrarBuildItem item : contextBuildItems) {
-            names.addAll(item.getAnnotationNames());
+        for (CustomScopeBuildItem customScope : customScopes) {
+            names.add(customScope.getAnnotationName());
         }
         return new CustomScopeAnnotationsBuildItem(names);
     }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestConfig.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestConfig.java
new file mode 100644
index 0000000000000..3973f0c061e57
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcTestConfig.java
@@ -0,0 +1,16 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class ArcTestConfig {
+
+    /**
+     * If set to true then disable {@code StartupEvent} and {@code ShutdownEvent} observers declared on application bean classes
+     * during the tests.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean disableApplicationLifecycleObservers;
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeBuildItem.java
new file mode 100644
index 0000000000000..d0c586447bc56
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeBuildItem.java
@@ -0,0 +1,242 @@
+package io.quarkus.arc.deployment;
+
+import java.util.Collection;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+
+import io.quarkus.arc.processor.Annotations;
+import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * This build item can be used to turn a class that is not annotated with a CDI scope annotation into a bean, i.e. the default
+ * scope annotation is added automatically if conditions are met.
+ */
+public final class AutoAddScopeBuildItem extends MultiBuildItem {
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    private final MatchPredicate matchPredicate;
+    private final boolean containerServicesRequired;
+    private final DotName defaultScope;
+    private final boolean unremovable;
+    private final String reason;
+
+    private AutoAddScopeBuildItem(MatchPredicate matchPredicate, boolean containerServicesRequired,
+            DotName defaultScope, boolean unremovable, String reason) {
+        this.matchPredicate = matchPredicate;
+        this.containerServicesRequired = containerServicesRequired;
+        this.defaultScope = defaultScope;
+        this.unremovable = unremovable;
+        this.reason = reason;
+    }
+
+    public boolean isContainerServicesRequired() {
+        return containerServicesRequired;
+    }
+
+    public DotName getDefaultScope() {
+        return defaultScope;
+    }
+
+    public boolean isUnremovable() {
+        return unremovable;
+    }
+
+    public String getReason() {
+        return reason != null ? ": " + reason : "";
+    }
+
+    public boolean test(ClassInfo clazz, Collection<AnnotationInstance> annotations, IndexView index) {
+        return matchPredicate.test(clazz, annotations, index);
+    }
+
+    public interface MatchPredicate {
+
+        /**
+         * @param clazz
+         * @param annotations
+         * @param index
+         * @return {@code true} if the input arguments match the predicate,
+         *         {@code false} otherwise
+         */
+        boolean test(ClassInfo clazz, Collection<AnnotationInstance> annotations, IndexView index);
+
+        default MatchPredicate and(MatchPredicate other) {
+            return new MatchPredicate() {
+                @Override
+                public boolean test(ClassInfo clazz, Collection<AnnotationInstance> annotations, IndexView index) {
+                    return test(clazz, annotations, index) && other.test(clazz, annotations, index);
+                }
+            };
+        }
+
+    }
+
+    public static class Builder {
+
+        private MatchPredicate matchPredicate;
+        private boolean requiresContainerServices;
+        private DotName defaultScope;
+        private boolean unremovable;
+        private String reason;
+
+        private Builder() {
+            this.defaultScope = BuiltinScope.DEPENDENT.getName();
+            this.unremovable = false;
+            this.requiresContainerServices = false;
+        }
+
+        /**
+         * At least one injection point or lifecycle callback must be declared in the class hierarchy. Otherwise, the scope
+         * annotation is not added.
+         * <p>
+         * Note that the detection algorithm is just the best effort. Some inheritance rules defined by the spec are not
+         * followed, e.g. per spec an initializer method is only inherited if not overriden. This method merely scans the
+         * annotations.
+         * 
+         * @return self
+         */
+        public Builder requiresContainerServices() {
+            this.requiresContainerServices = true;
+            return this;
+        }
+
+        /**
+         * The bean will be unremovable.
+         * 
+         * @see ArcConfig#removeUnusedBeans
+         * @return self
+         */
+        public Builder unremovable() {
+            this.unremovable = true;
+            return this;
+        }
+
+        /**
+         * Set a custom predicate.
+         * 
+         * @param predicate
+         * @return self
+         */
+        public Builder match(MatchPredicate predicate) {
+            this.matchPredicate = predicate;
+            return this;
+        }
+
+        /**
+         * The class must be annotated with the given annotation. Otherwise, the scope annotation is not added.
+         * <p>
+         * The final predicate is a short-circuiting logical AND of the previous predicate (if any) and this condition.
+         * 
+         * @param annotationName
+         * @return self
+         */
+        public Builder isAnnotatedWith(DotName annotationName) {
+            return and((clazz, annotations, index) -> Annotations.contains(annotations, annotationName));
+        }
+
+        /**
+         * The class or any of its element must be annotated with the given annotation. Otherwise, the scope annotation is not
+         * added.
+         * <p>
+         * The final predicate is a short-circuiting logical AND of the previous predicate (if any) and this condition.
+         * 
+         * 
+         * @param annotationNames
+         * @return self
+         */
+        public Builder containsAnnotations(DotName... annotationNames) {
+            return and((clazz, annotations, index) -> {
+                for (DotName annotation : annotationNames) {
+                    if (clazz.annotations().containsKey(annotation)) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+        }
+
+        /**
+         * The class must directly or indirectly implement the given interface.
+         * <p>
+         * The final predicate is a short-circuiting logical AND of the previous predicate (if any) and this condition.
+         * 
+         * @param interfaceName
+         * @return self
+         */
+        public Builder implementsInterface(DotName interfaceName) {
+            return and((clazz, annotations, index) -> {
+                if (clazz.interfaceNames().contains(interfaceName)) {
+                    return true;
+                }
+                DotName superName = clazz.superName();
+                while (superName != null && !superName.equals(DotNames.OBJECT)) {
+                    ClassInfo superClass = index.getClassByName(superName);
+                    if (superClass != null) {
+                        if (superClass.interfaceNames().contains(interfaceName)) {
+                            return true;
+                        }
+                        superName = superClass.superName();
+                    }
+                }
+                return false;
+            });
+        }
+
+        /**
+         * The scope annotation added to the class.
+         * 
+         * @param scopeAnnotationName
+         * @return self
+         */
+        public Builder defaultScope(DotName scopeAnnotationName) {
+            this.defaultScope = scopeAnnotationName;
+            return this;
+        }
+
+        /**
+         * The scope annotation added to the class.
+         * 
+         * @param scope
+         * @return
+         */
+        public Builder defaultScope(BuiltinScope scope) {
+            return defaultScope(scope.getName());
+        }
+
+        /**
+         * Specify an optional reason description that is used in log messages.
+         * 
+         * @param reason
+         * @return the reason why the scope annotation was added
+         */
+        public Builder reason(String reason) {
+            this.reason = reason;
+            return this;
+        }
+
+        private Builder and(MatchPredicate other) {
+            if (matchPredicate == null) {
+                matchPredicate = other;
+            } else {
+                matchPredicate = matchPredicate.and(other);
+            }
+            return this;
+        }
+
+        public AutoAddScopeBuildItem build() {
+            if (matchPredicate == null) {
+                throw new IllegalStateException("A matching predicate must be set!");
+            }
+            return new AutoAddScopeBuildItem(matchPredicate, requiresContainerServices, defaultScope, unremovable, reason);
+        }
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java
new file mode 100644
index 0000000000000..eb6eaf51c2538
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java
@@ -0,0 +1,131 @@
+package io.quarkus.arc.deployment;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.jboss.jandex.AnnotationTarget.Kind;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class AutoAddScopeProcessor {
+
+    private static final Logger LOGGER = Logger.getLogger(AutoAddScopeProcessor.class);
+
+    @BuildStep
+    void annotationTransformer(List<AutoAddScopeBuildItem> autoScopes, CustomScopeAnnotationsBuildItem scopes,
+            List<AutoInjectAnnotationBuildItem> autoInjectAnnotations,
+            BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformers,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
+            BeanArchiveIndexBuildItem beanArchiveIndex) throws Exception {
+        if (autoScopes.isEmpty()) {
+            return;
+        }
+        Set<DotName> containerAnnotationNames = autoInjectAnnotations.stream().flatMap(a -> a.getAnnotationNames().stream())
+                .collect(Collectors.toSet());
+        containerAnnotationNames.add(DotNames.POST_CONSTRUCT);
+        containerAnnotationNames.add(DotNames.PRE_DESTROY);
+        containerAnnotationNames.add(DotNames.INJECT);
+
+        Set<DotName> unremovables = new HashSet<>();
+
+        annotationsTransformers.produce(new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
+
+            @Override
+            public boolean appliesTo(Kind kind) {
+                return kind == Kind.CLASS;
+            }
+
+            @Override
+            public void transform(TransformationContext context) {
+                if (scopes.isScopeIn(context.getAnnotations())) {
+                    // Skip classes annotated with a scope
+                    return;
+                }
+                ClassInfo clazz = context.getTarget().asClass();
+                Boolean requiresContainerServices = null;
+
+                for (AutoAddScopeBuildItem autoScope : autoScopes) {
+                    if (autoScope.isContainerServicesRequired()) {
+                        if (requiresContainerServices == null) {
+                            requiresContainerServices = requiresContainerServices(clazz, containerAnnotationNames,
+                                    beanArchiveIndex.getIndex());
+                        }
+                        if (!requiresContainerServices) {
+                            // Skip - no injection point detected
+                            continue;
+                        }
+                    }
+                    if (autoScope.test(clazz, context.getAnnotations(), beanArchiveIndex.getIndex())) {
+                        context.transform().add(autoScope.getDefaultScope()).done();
+                        if (autoScope.isUnremovable()) {
+                            unremovables.add(clazz.name());
+                        }
+                        LOGGER.debugf("Automatically added scope %s to class %s" + autoScope.getReason(),
+                                autoScope.getDefaultScope(), clazz, autoScope.getReason());
+                        break;
+                    }
+                }
+            }
+        }));
+
+        if (!unremovables.isEmpty()) {
+            unremovableBeans.produce(new UnremovableBeanBuildItem(new Predicate<BeanInfo>() {
+
+                @Override
+                public boolean test(BeanInfo bean) {
+                    return bean.isClassBean() && unremovables.contains(bean.getBeanClass());
+                }
+            }));
+        }
+    }
+
+    private boolean requiresContainerServices(ClassInfo clazz, Set<DotName> containerAnnotationNames, IndexView index) {
+        // Note that transformed methods/fields are not taken into account
+        if (hasContainerAnnotation(clazz, containerAnnotationNames)) {
+            return true;
+        }
+        if (index != null) {
+            DotName superName = clazz.superName();
+            while (superName != null && !superName.equals(DotNames.OBJECT)) {
+                final ClassInfo superClass = index.getClassByName(superName);
+                if (superClass != null) {
+                    if (hasContainerAnnotation(superClass, containerAnnotationNames)) {
+                        return true;
+                    }
+                    superName = superClass.superName();
+                } else {
+                    superName = null;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean hasContainerAnnotation(ClassInfo clazz, Set<DotName> containerAnnotationNames) {
+        if (clazz.annotations().isEmpty() || containerAnnotationNames.isEmpty()) {
+            return false;
+        }
+        return containsAny(clazz, containerAnnotationNames);
+    }
+
+    private boolean containsAny(ClassInfo clazz, Set<DotName> annotationNames) {
+        for (DotName annotation : clazz.annotations().keySet()) {
+            if (annotationNames.contains(annotation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java
index 548e048081cbd..861dd0206506f 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java
@@ -24,11 +24,15 @@ public class AutoInjectFieldProcessor {
 
     @BuildStep
     void autoInjectQualifiers(BeanArchiveIndexBuildItem beanArchiveIndex,
-            BuildProducer<AutoInjectAnnotationBuildItem> autoInjectAnnotations) {
+            BuildProducer<AutoInjectAnnotationBuildItem> autoInjectAnnotations,
+            List<QualifierRegistrarBuildItem> qualifierRegistrars) {
         List<DotName> qualifiers = new ArrayList<>();
         for (AnnotationInstance qualifier : beanArchiveIndex.getIndex().getAnnotations(DotNames.QUALIFIER)) {
             qualifiers.add(qualifier.target().asClass().name());
         }
+        for (QualifierRegistrarBuildItem registrar : qualifierRegistrars) {
+            qualifiers.addAll(registrar.getQualifierRegistrar().getAdditionalQualifiers().keySet());
+        }
         autoInjectAnnotations.produce(new AutoInjectAnnotationBuildItem(qualifiers));
     }
 
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java
index 45808cfe3741d..759f627fa64a2 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoProducerMethodsProcessor.java
@@ -26,7 +26,7 @@ public class AutoProducerMethodsProcessor {
     private static final Logger LOGGER = Logger.getLogger(AutoProducerMethodsProcessor.class);
 
     /**
-     * Register an annotation transformer that automatically adds {@link Produces} to all non-static methods that are annotated
+     * Register an annotation transformer that automatically adds {@link Produces} to all non-void methods that are annotated
      * with a qualifier or a scope annotation.
      */
     @BuildStep
@@ -62,6 +62,10 @@ public int getPriority() {
 
             @Override
             public void transform(TransformationContext ctx) {
+                if (ctx.getTarget().asMethod().returnType().kind() == org.jboss.jandex.Type.Kind.VOID) {
+                    // Skip void methods
+                    return;
+                }
                 Set<AnnotationInstance> methodAnnotations = Annotations.getAnnotations(Kind.METHOD, ctx.getAnnotations());
                 if (methodAnnotations.isEmpty() || contains(methodAnnotations, DotNames.PRODUCES)
                         || contains(methodAnnotations, DotNames.INJECT)) {
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java
index 8b742ad5a7b00..314475a88c8df 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveIndexBuildItem.java
@@ -1,6 +1,5 @@
 package io.quarkus.arc.deployment;
 
-import java.util.List;
 import java.util.Set;
 
 import org.jboss.jandex.DotName;
@@ -25,13 +24,10 @@ public final class BeanArchiveIndexBuildItem extends SimpleBuildItem {
 
     private final IndexView index;
     private final Set<DotName> generatedClassNames;
-    private final List<String> additionalBeans;
 
-    public BeanArchiveIndexBuildItem(IndexView index, Set<DotName> generatedClassNames,
-            List<String> additionalBeans) {
+    public BeanArchiveIndexBuildItem(IndexView index, Set<DotName> generatedClassNames) {
         this.index = index;
         this.generatedClassNames = generatedClassNames;
-        this.additionalBeans = additionalBeans;
     }
 
     public IndexView getIndex() {
@@ -42,8 +38,4 @@ public Set<DotName> getGeneratedClassNames() {
         return generatedClassNames;
     }
 
-    public List<String> getAdditionalBeans() {
-        return additionalBeans;
-    }
-
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java
index 9a1f71d0a84b7..75847771074b4 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java
@@ -7,8 +7,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget.Kind;
 import org.jboss.jandex.CompositeIndex;
@@ -22,7 +20,6 @@
 import io.quarkus.arc.processor.BeanDefiningAnnotation;
 import io.quarkus.arc.processor.BeanDeployment;
 import io.quarkus.arc.processor.DotNames;
-import io.quarkus.arc.runtime.LifecycleEventRunner;
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.deployment.ApplicationArchive;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -32,41 +29,32 @@
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.index.IndexDependencyConfig;
 import io.quarkus.deployment.index.IndexingUtil;
+import io.quarkus.deployment.index.PersistentClassIndex;
 
 public class BeanArchiveProcessor {
 
-    @Inject
-    ApplicationArchivesBuildItem applicationArchivesBuildItem;
-
-    @Inject
-    List<BeanDefiningAnnotationBuildItem> additionalBeanDefiningAnnotations;
-
-    @Inject
-    List<AdditionalBeanBuildItem> additionalBeans;
-
-    @Inject
-    List<GeneratedBeanBuildItem> generatedBeans;
-
-    @Inject
-    BuildProducer<GeneratedClassBuildItem> generatedClass;
-
-    ArcConfig config;
-
     @BuildStep
-    public BeanArchiveIndexBuildItem build(LiveReloadBuildItem liveReloadBuildItem) throws Exception {
+    public BeanArchiveIndexBuildItem build(ArcConfig config, ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            List<BeanDefiningAnnotationBuildItem> additionalBeanDefiningAnnotations,
+            List<AdditionalBeanBuildItem> additionalBeans, List<GeneratedBeanBuildItem> generatedBeans,
+            LiveReloadBuildItem liveReloadBuildItem, BuildProducer<GeneratedClassBuildItem> generatedClass,
+            CustomScopeAnnotationsBuildItem customScopes)
+            throws Exception {
 
         // First build an index from application archives
-        IndexView applicationIndex = buildApplicationIndex();
+        IndexView applicationIndex = buildApplicationIndex(config, applicationArchivesBuildItem,
+                additionalBeanDefiningAnnotations, customScopes);
 
         // Then build additional index for beans added by extensions
         Indexer additionalBeanIndexer = new Indexer();
-        List<String> additionalBeans = new ArrayList<>();
-        for (AdditionalBeanBuildItem i : this.additionalBeans) {
-            additionalBeans.addAll(i.getBeanClasses());
+        List<String> additionalBeanClasses = new ArrayList<>();
+        for (AdditionalBeanBuildItem i : additionalBeans) {
+            additionalBeanClasses.addAll(i.getBeanClasses());
         }
-        additionalBeans.add(LifecycleEventRunner.class.getName());
+
+        // Build the index for additional beans and generated bean classes
         Set<DotName> additionalIndex = new HashSet<>();
-        for (String beanClass : additionalBeans) {
+        for (String beanClass : additionalBeanClasses) {
             IndexingUtil.indexClass(beanClass, additionalBeanIndexer, applicationIndex, additionalIndex,
                     Thread.currentThread().getContextClassLoader());
         }
@@ -80,21 +68,23 @@ public BeanArchiveIndexBuildItem build(LiveReloadBuildItem liveReloadBuildItem)
                     generatedBeanClass.getSource()));
         }
 
-        BeanArchives.PersistentClassIndex index = liveReloadBuildItem.getContextObject(BeanArchives.PersistentClassIndex.class);
+        PersistentClassIndex index = liveReloadBuildItem.getContextObject(PersistentClassIndex.class);
         if (index == null) {
-            index = new BeanArchives.PersistentClassIndex();
-            liveReloadBuildItem.setContextObject(BeanArchives.PersistentClassIndex.class, index);
+            index = new PersistentClassIndex();
+            liveReloadBuildItem.setContextObject(PersistentClassIndex.class, index);
         }
 
         // Finally, index ArC/CDI API built-in classes
         return new BeanArchiveIndexBuildItem(
-                BeanArchives.buildBeanArchiveIndex(Thread.currentThread().getContextClassLoader(), index, applicationIndex,
+                BeanArchives.buildBeanArchiveIndex(Thread.currentThread().getContextClassLoader(), index.getAdditionalClasses(),
+                        applicationIndex,
                         additionalBeanIndexer.complete()),
-                generatedClassNames,
-                additionalBeans);
+                generatedClassNames);
     }
 
-    private IndexView buildApplicationIndex() {
+    private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            List<BeanDefiningAnnotationBuildItem> additionalBeanDefiningAnnotations,
+            CustomScopeAnnotationsBuildItem customScopes) {
 
         Set<ApplicationArchive> archives = applicationArchivesBuildItem.getAllApplicationArchives();
 
@@ -111,10 +101,13 @@ private IndexView buildApplicationIndex() {
             }
         }
 
-        Collection<DotName> beanDefiningAnnotations = BeanDeployment
+        Set<DotName> beanDefiningAnnotations = BeanDeployment
                 .initBeanDefiningAnnotations(additionalBeanDefiningAnnotations.stream()
                         .map(bda -> new BeanDefiningAnnotation(bda.getName(), bda.getDefaultScope()))
                         .collect(Collectors.toList()), stereotypes);
+        for (DotName customScopeAnnotationName : customScopes.getCustomScopeNames()) {
+            beanDefiningAnnotations.add(customScopeAnnotationName);
+        }
         // Also include archives that are not bean archives but contain qualifiers or interceptor bindings
         beanDefiningAnnotations.add(DotNames.QUALIFIER);
         beanDefiningAnnotations.add(DotNames.INTERCEPTOR_BINDING);
@@ -122,7 +115,7 @@ private IndexView buildApplicationIndex() {
         List<IndexView> indexes = new ArrayList<>();
 
         for (ApplicationArchive archive : applicationArchivesBuildItem.getApplicationArchives()) {
-            if (isApplicationArchiveExcluded(archive)) {
+            if (isApplicationArchiveExcluded(config, archive)) {
                 continue;
             }
             IndexView index = archive.getIndex();
@@ -137,14 +130,17 @@ && containsBeanDefiningAnnotation(index, beanDefiningAnnotations))) {
         return CompositeIndex.create(indexes);
     }
 
-    private boolean isApplicationArchiveExcluded(ApplicationArchive archive) {
+    private boolean isApplicationArchiveExcluded(ArcConfig config, ApplicationArchive archive) {
         if (archive.getArtifactKey() != null) {
             AppArtifactKey key = archive.getArtifactKey();
             for (IndexDependencyConfig excludeDependency : config.excludeDependency.values()) {
                 if (Objects.equal(key.getArtifactId(), excludeDependency.artifactId)
-                        && Objects.equal(key.getGroupId(), excludeDependency.groupId)
-                        && Objects.equal(key.getClassifier(), excludeDependency.classifier)) {
-                    return true;
+                        && Objects.equal(key.getGroupId(), excludeDependency.groupId)) {
+                    if (excludeDependency.classifier.isPresent()) {
+                        return Objects.equal(key.getClassifier(), excludeDependency.classifier.get());
+                    } else {
+                        return true;
+                    }
                 }
             }
         }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanDeploymentValidatorBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanDeploymentValidatorBuildItem.java
deleted file mode 100644
index ac674cd404536..0000000000000
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanDeploymentValidatorBuildItem.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.arc.deployment;
-
-import io.quarkus.arc.processor.BeanDeploymentValidator;
-import io.quarkus.builder.item.MultiBuildItem;
-
-/**
- * Register a custom {@link BeanDeploymentValidator} which can either perform additional validation or enforce
- * validation skip for certain components.
- *
- * @see NoArgsConstructorProcessor#addMissingConstructors()
- * @see ObserverValidationProcessor
- */
-public final class BeanDeploymentValidatorBuildItem extends MultiBuildItem {
-
-    private final BeanDeploymentValidator beanDeploymentValidator;
-
-    public BeanDeploymentValidatorBuildItem(BeanDeploymentValidator beanDeploymentValidator) {
-        this.beanDeploymentValidator = beanDeploymentValidator;
-    }
-
-    public BeanDeploymentValidator getBeanDeploymentValidator() {
-        return beanDeploymentValidator;
-    }
-
-}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanDiscoveryFinishedBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanDiscoveryFinishedBuildItem.java
new file mode 100644
index 0000000000000..1072487dae251
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanDiscoveryFinishedBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.arc.processor.BeanDeployment;
+
+/**
+ * Consumers of this build item can easily inspect all class-based beans, observers and injection points registered in the
+ * application. Synthetic beans and observers are not included. If you need to consider synthetic components as well use
+ * the {@link SynthesisFinishedBuildItem} instead.
+ * <p>
+ * Additionaly, the bean resolver can be used to apply the type-safe resolution rules, e.g. to find out wheter there is a bean
+ * that would satisfy certain combination of required type and qualifiers.
+ * 
+ * @see SynthesisFinishedBuildItem
+ */
+public final class BeanDiscoveryFinishedBuildItem extends RegisteredComponentsBuildItem {
+
+    public BeanDiscoveryFinishedBuildItem(BeanDeployment beanDeployment) {
+        super(beanDeployment);
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrarBuildItem.java
deleted file mode 100644
index d318e50ef1b24..0000000000000
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrarBuildItem.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.quarkus.arc.deployment;
-
-import io.quarkus.arc.processor.BeanRegistrar;
-import io.quarkus.builder.item.MultiBuildItem;
-
-/**
- * Used for registration of a synthetic bean; grants access to {@link BeanRegistrar} which is an API allowing to
- * specify a synthetic bean through series of configuration methods (scope, type, qualifiers, ...).
- *
- * This is a build time alternative to CDI BeanConfigurator API.
- */
-public final class BeanRegistrarBuildItem extends MultiBuildItem {
-
-    private final BeanRegistrar beanRegistrar;
-
-    public BeanRegistrarBuildItem(BeanRegistrar beanRegistrar) {
-        this.beanRegistrar = beanRegistrar;
-    }
-
-    public BeanRegistrar getBeanRegistrar() {
-        return beanRegistrar;
-    }
-}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrationPhaseBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrationPhaseBuildItem.java
index ba956c71f37b7..aa7d79a46923a 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrationPhaseBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanRegistrationPhaseBuildItem.java
@@ -1,12 +1,15 @@
 package io.quarkus.arc.deployment;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import io.quarkus.arc.processor.BeanConfigurator;
 import io.quarkus.arc.processor.BeanProcessor;
 import io.quarkus.arc.processor.BeanRegistrar;
 import io.quarkus.arc.processor.BeanRegistrar.RegistrationContext;
+import io.quarkus.arc.processor.BuildExtension;
+import io.quarkus.arc.processor.InjectionPointInfo;
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -36,6 +39,10 @@ public RegistrationContext getContext() {
         return context;
     }
 
+    public Collection<InjectionPointInfo> getInjectionPoints() {
+        return getContext().get(BuildExtension.Key.INJECTION_POINTS);
+    }
+
     public BeanProcessor getBeanProcessor() {
         return beanProcessor;
     }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeConditionBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeConditionBuildItem.java
index e912c5e56e4a7..1554e7b54eb8c 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeConditionBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeConditionBuildItem.java
@@ -10,12 +10,15 @@ public final class BuildTimeConditionBuildItem extends MultiBuildItem {
     private final boolean enabled;
 
     public BuildTimeConditionBuildItem(AnnotationTarget target, boolean enabled) {
-        AnnotationTarget.Kind kind = target.kind();
-        if ((kind != AnnotationTarget.Kind.CLASS) && (kind != AnnotationTarget.Kind.METHOD)
-                && (kind != AnnotationTarget.Kind.FIELD)) {
-            throw new IllegalArgumentException("'target' can only be a class, a field or a method");
+        switch (target.kind()) {
+            case CLASS:
+            case METHOD:
+            case FIELD:
+                this.target = target;
+                break;
+            default:
+                throw new IllegalArgumentException("'target' can only be a class, a field or a method");
         }
-        this.target = target;
         this.enabled = enabled;
     }
 
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java
index d93b1788df7de..7a1f8d12ccec5 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
@@ -14,15 +16,18 @@
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.AnnotationsTransformer.TransformationContext;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.Transformation;
 import io.quarkus.arc.profile.IfBuildProfile;
 import io.quarkus.arc.profile.UnlessBuildProfile;
 import io.quarkus.arc.properties.IfBuildProperty;
+import io.quarkus.arc.properties.UnlessBuildProperty;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -36,41 +41,108 @@ public class BuildTimeEnabledProcessor {
     private static final DotName UNLESS_BUILD_PROFILE = DotName.createSimple(UnlessBuildProfile.class.getName());
 
     private static final DotName IF_BUILD_PROPERTY = DotName.createSimple(IfBuildProperty.class.getName());
+    private static final DotName UNLESS_BUILD_PROPERTY = DotName.createSimple(UnlessBuildProperty.class.getName());
 
     @BuildStep
-    void ifBuildProfile(CombinedIndexBuildItem index, BuildProducer<BuildTimeConditionBuildItem> producer) {
+    void ifBuildProfile(CombinedIndexBuildItem index, BuildProducer<BuildTimeConditionBuildItem> producer,
+            BuildProducer<PreAdditionalBeanBuildTimeConditionBuildItem> producerPreAdditionalBean) {
         Collection<AnnotationInstance> annotationInstances = index.getIndex().getAnnotations(IF_BUILD_PROFILE);
         for (AnnotationInstance instance : annotationInstances) {
             String profileOnInstance = instance.value().asString();
             boolean enabled = profileOnInstance.equals(ProfileManager.getActiveProfile());
             if (enabled) {
-                LOGGER.debug("Enabling " + instance + " since the profile value matches the active profile.");
+                LOGGER.debug("Enabling " + instance.target() + " since the profile value matches the active profile.");
             } else {
-                LOGGER.debug("Disabling " + instance + " since the profile value does not match the active profile.");
+                LOGGER.debug("Disabling " + instance.target() + " since the profile value does not match the active profile.");
             }
             producer.produce(new BuildTimeConditionBuildItem(instance.target(), enabled));
+            producerPreAdditionalBean.produce(new PreAdditionalBeanBuildTimeConditionBuildItem(instance.target(), enabled));
         }
     }
 
     @BuildStep
-    void unlessBuildProfile(CombinedIndexBuildItem index, BuildProducer<BuildTimeConditionBuildItem> producer) {
+    void unlessBuildProfile(CombinedIndexBuildItem index, BuildProducer<BuildTimeConditionBuildItem> producer,
+            BuildProducer<PreAdditionalBeanBuildTimeConditionBuildItem> producerPreAdditionalBean) {
         Collection<AnnotationInstance> annotationInstances = index.getIndex().getAnnotations(UNLESS_BUILD_PROFILE);
         for (AnnotationInstance instance : annotationInstances) {
             String profileOnInstance = instance.value().asString();
             boolean enabled = !profileOnInstance.equals(ProfileManager.getActiveProfile());
             if (enabled) {
-                LOGGER.debug("Enabling " + instance + " since the profile value does not match the active profile.");
+                LOGGER.debug("Enabling " + instance.target() + " since the profile value does not match the active profile.");
             } else {
-                LOGGER.debug("Disabling " + instance + " since the profile value matches the active profile.");
+                LOGGER.debug("Disabling " + instance.target() + " since the profile value matches the active profile.");
             }
             producer.produce(new BuildTimeConditionBuildItem(instance.target(), enabled));
+            producerPreAdditionalBean.produce(new PreAdditionalBeanBuildTimeConditionBuildItem(instance.target(), enabled));
         }
     }
 
     @BuildStep
     void ifBuildProperty(BeanArchiveIndexBuildItem index, BuildProducer<BuildTimeConditionBuildItem> producer) {
+        buildProperty(IF_BUILD_PROPERTY, new BiFunction<String, String, Boolean>() {
+            @Override
+            public Boolean apply(String stringValue, String expectedStringValue) {
+                return stringValue.equals(expectedStringValue);
+            }
+        }, index.getIndex(), new BiConsumer<AnnotationTarget, Boolean>() {
+            @Override
+            public void accept(AnnotationTarget target, Boolean enabled) {
+                producer.produce(new BuildTimeConditionBuildItem(target, enabled));
+            }
+        });
+    }
+
+    @BuildStep
+    void unlessBuildProperty(BeanArchiveIndexBuildItem index, BuildProducer<BuildTimeConditionBuildItem> producer) {
+        buildProperty(UNLESS_BUILD_PROPERTY, new BiFunction<String, String, Boolean>() {
+            @Override
+            public Boolean apply(String stringValue, String expectedStringValue) {
+                return !stringValue.equals(expectedStringValue);
+            }
+        }, index.getIndex(), new BiConsumer<AnnotationTarget, Boolean>() {
+            @Override
+            public void accept(AnnotationTarget target, Boolean enabled) {
+                producer.produce(new BuildTimeConditionBuildItem(target, enabled));
+            }
+        });
+    }
+
+    @BuildStep
+    void ifBuildPropertyPreAdditionalBean(CombinedIndexBuildItem index,
+            BuildProducer<PreAdditionalBeanBuildTimeConditionBuildItem> producer) {
+        buildProperty(IF_BUILD_PROPERTY, new BiFunction<String, String, Boolean>() {
+            @Override
+            public Boolean apply(String stringValue, String expectedStringValue) {
+                return stringValue.equals(expectedStringValue);
+            }
+        }, index.getIndex(), new BiConsumer<AnnotationTarget, Boolean>() {
+            @Override
+            public void accept(AnnotationTarget target, Boolean enabled) {
+                producer.produce(new PreAdditionalBeanBuildTimeConditionBuildItem(target, enabled));
+            }
+        });
+    }
+
+    @BuildStep
+    void unlessBuildPropertyPreAdditionalBean(CombinedIndexBuildItem index,
+            BuildProducer<PreAdditionalBeanBuildTimeConditionBuildItem> producer) {
+        buildProperty(UNLESS_BUILD_PROPERTY, new BiFunction<String, String, Boolean>() {
+            @Override
+            public Boolean apply(String stringValue, String expectedStringValue) {
+                return !stringValue.equals(expectedStringValue);
+            }
+        }, index.getIndex(), new BiConsumer<AnnotationTarget, Boolean>() {
+            @Override
+            public void accept(AnnotationTarget target, Boolean enabled) {
+                producer.produce(new PreAdditionalBeanBuildTimeConditionBuildItem(target, enabled));
+            }
+        });
+    }
+
+    void buildProperty(DotName annotationName, BiFunction<String, String, Boolean> testFun, IndexView index,
+            BiConsumer<AnnotationTarget, Boolean> producer) {
         Config config = ConfigProviderResolver.instance().getConfig();
-        Collection<AnnotationInstance> annotationInstances = index.getIndex().getAnnotations(IF_BUILD_PROPERTY);
+        Collection<AnnotationInstance> annotationInstances = index.getAnnotations(annotationName);
         for (AnnotationInstance instance : annotationInstances) {
             String propertyName = instance.value("name").asString();
             String expectedStringValue = instance.value("stringValue").asString();
@@ -80,27 +152,26 @@ void ifBuildProperty(BeanArchiveIndexBuildItem index, BuildProducer<BuildTimeCon
             Optional<String> optionalValue = config.getOptionalValue(propertyName, String.class);
             boolean enabled;
             if (optionalValue.isPresent()) {
-                if (optionalValue.get().equals(expectedStringValue)) {
-                    LOGGER.debug("Enabling " + instance + " since the property value matches the expected one.");
+                if (testFun.apply(optionalValue.get(), expectedStringValue)) {
+                    LOGGER.debug("Enabling " + instance.target() + " since the property value matches the expected one.");
                     enabled = true;
                 } else {
-                    LOGGER.debug("Disabling " + instance
-                            + " since the property value does not match the expected one.");
+                    LOGGER.debug("Disabling " + instance.target()
+                            + " since the property value matches the specified value one.");
                     enabled = false;
                 }
             } else {
                 if (enableIfMissing) {
-                    LOGGER.debug("Enabling " + instance
+                    LOGGER.debug("Enabling " + instance.target()
                             + " since the property has not been set and 'enableIfMissing' is set to 'true'.");
                     enabled = true;
                 } else {
-                    LOGGER.debug("Disabling " + instance
+                    LOGGER.debug("Disabling " + instance.target()
                             + " since the property has not been set and 'enableIfMissing' is set to 'false'.");
                     enabled = false;
                 }
             }
-
-            producer.produce(new BuildTimeConditionBuildItem(instance.target(), enabled));
+            producer.accept(instance.target(), enabled);
         }
     }
 
@@ -146,18 +217,18 @@ public void transform(TransformationContext ctx) {
                 if (ctx.isClass()) {
                     DotName classDotName = target.asClass().name();
                     if (classTargets.containsKey(classDotName)) {
-                        transformBean(target, ctx.transform(), classTargets.get(classDotName));
+                        transformBean(target, ctx, classTargets.get(classDotName));
                     }
                 } else if (ctx.isMethod()) {
                     MethodInfo method = target.asMethod();
                     if (methodTargets.containsKey(method)) {
-                        transformBean(target, ctx.transform(), methodTargets.get(method));
+                        transformBean(target, ctx, methodTargets.get(method));
                     }
                 } else if (ctx.isField()) {
                     FieldInfo field = target.asField();
                     String uniqueFieldName = toUniqueString(field);
                     if (fieldTargets.containsKey(uniqueFieldName)) {
-                        transformBean(target, ctx.transform(), fieldTargets.get(uniqueFieldName));
+                        transformBean(target, ctx, fieldTargets.get(uniqueFieldName));
                     }
                 }
             }
@@ -168,32 +239,18 @@ private String toUniqueString(FieldInfo field) {
         return field.declaringClass().name().toString() + "." + field.name();
     }
 
-    private void transformBean(AnnotationTarget target, Transformation transform, boolean enable) {
-        if (enable) {
-            enableBean(transform);
-        } else {
-            disableBean(target, transform);
+    private void transformBean(AnnotationTarget target, TransformationContext ctx, boolean enabled) {
+        if (!enabled) {
+            Transformation transform = ctx.transform();
+            if (target.kind() == Kind.CLASS) {
+                // Veto the class
+                transform.add(DotNames.VETOED);
+            } else {
+                // Add @Alternative to the producer
+                transform.add(DotNames.ALTERNATIVE);
+            }
+            transform.done();
         }
-        transform.done();
-    }
-
-    private void enableBean(Transformation transform) {
-        transform.add(DotNames.ALTERNATIVE_PRIORITY,
-                createAlternativePriority());
     }
 
-    private AnnotationValue createAlternativePriority() {
-        // use Integer.MAX_VALUE - 1 to avoid having conflicts with enabling beans via config
-        return AnnotationValue.createIntegerValue("value", Integer.MAX_VALUE - 1);
-    }
-
-    private void disableBean(AnnotationTarget target, Transformation transform) {
-        if (target.kind() == Kind.CLASS) {
-            // Veto the class
-            transform.add(DotNames.VETOED);
-        } else {
-            // Add @Alternative to the producer
-            transform.add(DotNames.ALTERNATIVE);
-        }
-    }
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CommandLineArgumentsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CommandLineArgumentsProcessor.java
index 25369b165810a..51ff75c510d90 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CommandLineArgumentsProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CommandLineArgumentsProcessor.java
@@ -1,26 +1,27 @@
 package io.quarkus.arc.deployment;
 
-import io.quarkus.arc.runtime.ArcRecorder;
-import io.quarkus.arc.runtime.CommandLineArgumentsProducer;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.RawCommandLineArgumentsBuildItem;
 import io.quarkus.runtime.annotations.CommandLineArguments;
 
 public class CommandLineArgumentsProcessor {
 
     @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    BeanContainerListenerBuildItem commandLineArgs(RawCommandLineArgumentsBuildItem rawCommandLineArgumentsBuildItem,
-            ArcRecorder arcRecorder) {
-        //todo: this should be filtered
-        return new BeanContainerListenerBuildItem(arcRecorder.initCommandLineArgs(rawCommandLineArgumentsBuildItem));
-    }
+    SyntheticBeanBuildItem commandLineArgs(RawCommandLineArgumentsBuildItem rawCommandLineArgumentsBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        additionalBeans.produce(new AdditionalBeanBuildItem(CommandLineArguments.class));
 
-    @BuildStep
-    AdditionalBeanBuildItem qualifier() {
-        return AdditionalBeanBuildItem.builder().setUnremovable()
-                .addBeanClasses(CommandLineArguments.class, CommandLineArgumentsProducer.class).build();
+        Type stringArray = Type.create(DotName.createSimple(String[].class.getName()), Kind.ARRAY);
+        // implClazz is ignored because a provider type is set
+        return SyntheticBeanBuildItem.configure(Object.class).providerType(stringArray).addType(stringArray)
+                .addQualifier(CommandLineArguments.class)
+                .setRuntimeInit().supplier(rawCommandLineArgumentsBuildItem)
+                .unremovable().done();
     }
+
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CompletedApplicationClassPredicateBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CompletedApplicationClassPredicateBuildItem.java
new file mode 100644
index 0000000000000..fd02286dbee49
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CompletedApplicationClassPredicateBuildItem.java
@@ -0,0 +1,29 @@
+package io.quarkus.arc.deployment;
+
+import java.util.function.Predicate;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * This build item hold the "final" predicate that is used to distinguish application classes from framework/library classes.
+ */
+public final class CompletedApplicationClassPredicateBuildItem extends SimpleBuildItem implements Predicate<DotName> {
+
+    private final Predicate<DotName> applicationClassPredicate;
+
+    CompletedApplicationClassPredicateBuildItem(Predicate<DotName> applicationClassPredicate) {
+        this.applicationClassPredicate = applicationClassPredicate;
+    }
+
+    public Predicate<DotName> getApplicationClassPredicate() {
+        return applicationClassPredicate;
+    }
+
+    @Override
+    public boolean test(DotName name) {
+        return applicationClassPredicate.test(name);
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java
index 6d90e69e4ba84..dc5d10e7a70d2 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java
@@ -1,21 +1,26 @@
 package io.quarkus.arc.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
+import static io.smallrye.config.ConfigMappings.ConfigMappingWithPrefix.configMappingWithPrefix;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.CreationException;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
@@ -25,20 +30,26 @@
 import org.jboss.jandex.Type.Kind;
 
 import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem;
-import io.quarkus.arc.processor.BeanRegistrar;
-import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.InjectionPointInfo;
 import io.quarkus.arc.runtime.ConfigBeanCreator;
+import io.quarkus.arc.runtime.ConfigMappingCreator;
 import io.quarkus.arc.runtime.ConfigRecorder;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.ConfigurationBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.configuration.definition.RootDefinition;
+import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.annotations.ConfigPhase;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.ConfigMappingLoader;
+import io.smallrye.config.ConfigMappingMetadata;
+import io.smallrye.config.ConfigMappings.ConfigMappingWithPrefix;
 import io.smallrye.config.inject.ConfigProducer;
 
 /**
@@ -47,23 +58,26 @@
 public class ConfigBuildStep {
 
     private static final DotName CONFIG_PROPERTY_NAME = DotName.createSimple(ConfigProperty.class.getName());
+    private static final DotName CONFIG_MAPPING_NAME = DotName.createSimple(ConfigMapping.class.getName());
     private static final DotName SET_NAME = DotName.createSimple(Set.class.getName());
     private static final DotName LIST_NAME = DotName.createSimple(List.class.getName());
 
+    private static final DotName CONFIG_VALUE_NAME = DotName.createSimple(io.smallrye.config.ConfigValue.class.getName());
+
     @BuildStep
     AdditionalBeanBuildItem bean() {
         return new AdditionalBeanBuildItem(ConfigProducer.class);
     }
 
     @BuildStep
-    void analyzeConfigPropertyInjectionPoints(BeanRegistrationPhaseBuildItem beanRegistrationPhase,
+    void analyzeConfigPropertyInjectionPoints(BeanDiscoveryFinishedBuildItem beanDiscovery,
             BuildProducer<ConfigPropertyBuildItem> configProperties,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<BeanConfiguratorBuildItem> beanConfigurators) {
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans) {
 
         Set<Type> customBeanTypes = new HashSet<>();
 
-        for (InjectionPointInfo injectionPoint : beanRegistrationPhase.getContext().get(BuildExtension.Key.INJECTION_POINTS)) {
+        for (InjectionPointInfo injectionPoint : beanDiscovery.getInjectionPoints()) {
             if (injectionPoint.hasDefaultedQualifier()) {
                 // Defaulted qualifier means no @ConfigProperty
                 continue;
@@ -96,7 +110,10 @@ void analyzeConfigPropertyInjectionPoints(BeanRegistrationPhaseBuildItem beanReg
                     customBeanTypes.add(requiredType);
                 }
 
-                if (DotNames.OPTIONAL.equals(requiredType.name())) {
+                if (DotNames.OPTIONAL.equals(requiredType.name())
+                        || DotNames.OPTIONAL_INT.equals(requiredType.name())
+                        || DotNames.OPTIONAL_LONG.equals(requiredType.name())
+                        || DotNames.OPTIONAL_DOUBLE.equals(requiredType.name())) {
                     // Never validate Optional values
                     continue;
                 }
@@ -114,13 +131,14 @@ void analyzeConfigPropertyInjectionPoints(BeanRegistrationPhaseBuildItem beanReg
                 // Implicit converters are most likely used
                 reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, type.name().toString()));
             }
-            beanConfigurators.produce(new BeanConfiguratorBuildItem(beanRegistrationPhase.getContext().configure(
-                    type.kind() == Kind.ARRAY ? DotName.createSimple(ConfigBeanCreator.class.getName()) : type.name())
+            DotName implClazz = type.kind() == Kind.ARRAY ? DotName.createSimple(ConfigBeanCreator.class.getName())
+                    : type.name();
+            syntheticBeans.produce(SyntheticBeanBuildItem.configure(implClazz)
                     .creator(ConfigBeanCreator.class)
                     .providerType(type)
                     .types(type)
-                    .qualifiers(AnnotationInstance.create(CONFIG_PROPERTY_NAME, null, Collections.emptyList()))
-                    .param("requiredType", type.name().toString())));
+                    .addQualifier(CONFIG_PROPERTY_NAME)
+                    .param("requiredType", type.name().toString()).done());
         }
     }
 
@@ -146,29 +164,110 @@ void validateConfigProperties(ConfigRecorder recorder, List<ConfigPropertyBuildI
     }
 
     @BuildStep
-    BeanRegistrarBuildItem registerConfigRootsAsBeans(ConfigurationBuildItem configItem) {
-        return new BeanRegistrarBuildItem(new BeanRegistrar() {
-            @Override
-            public void register(RegistrationContext context) {
-                for (RootDefinition rootDefinition : configItem.getReadResult().getAllRoots()) {
-                    if (rootDefinition.getConfigPhase() == ConfigPhase.BUILD_AND_RUN_TIME_FIXED
-                            || rootDefinition.getConfigPhase() == ConfigPhase.RUN_TIME) {
-                        Class<?> configRootClass = rootDefinition.getConfigurationClass();
-                        context.configure(configRootClass).types(configRootClass)
-                                .scope(Dependent.class).creator(mc -> {
-                                    // e.g. return Config.ApplicationConfig
-                                    ResultHandle configRoot = mc.readStaticField(rootDefinition.getDescriptor());
-                                    // BUILD_AND_RUN_TIME_FIXED roots are always set before the container is started (in the static initializer of the generated Config class)
-                                    // However, RUN_TIME roots may be not be set when the bean instance is created 
-                                    mc.ifNull(configRoot).trueBranch().throwException(CreationException.class,
-                                            String.format("Config root [%s] with config phase [%s] not initialized yet.",
-                                                    configRootClass.getName(), rootDefinition.getConfigPhase().name()));
-                                    mc.returnValue(configRoot);
-                                }).done();
+    void registerConfigRootsAsBeans(ConfigurationBuildItem configItem, BuildProducer<SyntheticBeanBuildItem> syntheticBeans) {
+        for (RootDefinition rootDefinition : configItem.getReadResult().getAllRoots()) {
+            if (rootDefinition.getConfigPhase() == ConfigPhase.BUILD_AND_RUN_TIME_FIXED
+                    || rootDefinition.getConfigPhase() == ConfigPhase.RUN_TIME) {
+                Class<?> configRootClass = rootDefinition.getConfigurationClass();
+                syntheticBeans.produce(SyntheticBeanBuildItem.configure(configRootClass).types(configRootClass)
+                        .scope(Dependent.class).creator(mc -> {
+                            // e.g. return Config.ApplicationConfig
+                            ResultHandle configRoot = mc.readStaticField(rootDefinition.getDescriptor());
+                            // BUILD_AND_RUN_TIME_FIXED roots are always set before the container is started (in the static initializer of the generated Config class)
+                            // However, RUN_TIME roots may be not be set when the bean instance is created 
+                            mc.ifNull(configRoot).trueBranch().throwException(CreationException.class,
+                                    String.format("Config root [%s] with config phase [%s] not initialized yet.",
+                                            configRootClass.getName(), rootDefinition.getConfigPhase().name()));
+                            mc.returnValue(configRoot);
+                        }).done());
+            }
+        }
+    }
+
+    @BuildStep
+    void generateConfigMappings(
+            CombinedIndexBuildItem combinedIndex,
+            BeanRegistrationPhaseBuildItem beanRegistrationPhase,
+            BuildProducer<GeneratedClassBuildItem> generatedClasses,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+            BuildProducer<ConfigMappingBuildItem> configMappings,
+            BuildProducer<BeanConfiguratorBuildItem> beanConfigurators) {
+
+        for (AnnotationInstance instance : combinedIndex.getIndex().getAnnotations(CONFIG_MAPPING_NAME)) {
+            AnnotationTarget target = instance.target();
+            if (!target.kind().equals(AnnotationTarget.Kind.CLASS)) {
+                continue;
+            }
+
+            Class<?> type = toClass(target.asClass());
+            String prefix = Optional.ofNullable(instance.value("prefix")).map(AnnotationValue::asString).orElse("");
+
+            List<ConfigMappingMetadata> configMappingsMetadata = ConfigMappingLoader.getConfigMappingsMetadata(type);
+            List<ClassInfo> mappingsInfo = new ArrayList<>();
+            configMappingsMetadata.forEach(mappingMetadata -> {
+                generatedClasses.produce(
+                        new GeneratedClassBuildItem(true, mappingMetadata.getClassName(), mappingMetadata.getClassBytes()));
+                reflectiveClasses
+                        .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getInterfaceType()).methods(true).build());
+                reflectiveClasses
+                        .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getClassName()).constructors(true).build());
+
+                ClassInfo mappingInfo = combinedIndex.getIndex()
+                        .getClassByName(DotName.createSimple(mappingMetadata.getInterfaceType().getName()));
+                if (mappingInfo != null) {
+                    mappingsInfo.add(mappingInfo);
+                }
+            });
+
+            // Search and register possible classes for implicit Converter methods
+            for (ClassInfo classInfo : mappingsInfo) {
+                for (MethodInfo method : classInfo.methods()) {
+                    if (!isHandledByProducers(method.returnType()) &&
+                            mappingsInfo.stream()
+                                    .map(ClassInfo::name)
+                                    .noneMatch(name -> name.equals(method.returnType().name()))) {
+                        reflectiveClasses
+                                .produce(new ReflectiveClassBuildItem(true, false, method.returnType().name().toString()));
                     }
                 }
             }
-        });
+
+            configMappings.produce(new ConfigMappingBuildItem(type, prefix));
+
+            beanConfigurators.produce(new BeanConfiguratorBuildItem(
+                    beanRegistrationPhase.getContext()
+                            .configure(type)
+                            .types(type)
+                            .creator(ConfigMappingCreator.class)
+                            .param("type", type)));
+        }
+    }
+
+    @BuildStep
+    @Record(RUNTIME_INIT)
+    void registerConfigMappings(
+            RecorderContext context,
+            ConfigRecorder recorder,
+            List<ConfigMappingBuildItem> configMappings) throws Exception {
+
+        context.registerNonDefaultConstructor(
+                ConfigMappingWithPrefix.class.getDeclaredConstructor(Class.class, String.class),
+                configMappingWithPrefix -> Stream.of(configMappingWithPrefix.getKlass(), configMappingWithPrefix.getPrefix())
+                        .collect(toList()));
+
+        recorder.registerConfigMappings(configMappings.stream()
+                .map(configMapping -> configMappingWithPrefix(configMapping.getInterfaceType(), configMapping.getPrefix()))
+                .collect(toSet()));
+    }
+
+    private static Class<?> toClass(ClassInfo classInfo) {
+        String className = classInfo.name().toString();
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            return classLoader.loadClass(className);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException("The class (" + className + ") cannot be created during deployment.", e);
+        }
     }
 
     private String getPropertyName(String name, ClassInfo declaringClass) {
@@ -181,7 +280,7 @@ private String getPropertyName(String name, ClassInfo declaringClass) {
         return builder.append(".").append(name).toString();
     }
 
-    private boolean isHandledByProducers(Type type) {
+    public static boolean isHandledByProducers(Type type) {
         if (type.kind() == Kind.ARRAY) {
             return false;
         }
@@ -190,6 +289,9 @@ private boolean isHandledByProducers(Type type) {
         }
         return DotNames.STRING.equals(type.name()) ||
                 DotNames.OPTIONAL.equals(type.name()) ||
+                DotNames.OPTIONAL_INT.equals(type.name()) ||
+                DotNames.OPTIONAL_LONG.equals(type.name()) ||
+                DotNames.OPTIONAL_DOUBLE.equals(type.name()) ||
                 SET_NAME.equals(type.name()) ||
                 LIST_NAME.equals(type.name()) ||
                 DotNames.LONG.equals(type.name()) ||
@@ -199,7 +301,8 @@ private boolean isHandledByProducers(Type type) {
                 DotNames.DOUBLE.equals(type.name()) ||
                 DotNames.SHORT.equals(type.name()) ||
                 DotNames.BYTE.equals(type.name()) ||
-                DotNames.CHARACTER.equals(type.name());
+                DotNames.CHARACTER.equals(type.name()) ||
+                CONFIG_VALUE_NAME.equals(type.name());
     }
 
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigMappingBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigMappingBuildItem.java
new file mode 100644
index 0000000000000..b97fa357e77e9
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigMappingBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class ConfigMappingBuildItem extends MultiBuildItem {
+    private final Class<?> interfaceType;
+    private final String prefix;
+
+    public ConfigMappingBuildItem(final Class<?> interfaceType, final String prefix) {
+        this.interfaceType = interfaceType;
+        this.prefix = prefix;
+    }
+
+    public Class<?> getInterfaceType() {
+        return interfaceType;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrarBuildItem.java
deleted file mode 100644
index 5a24cfe1f85c7..0000000000000
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrarBuildItem.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.quarkus.arc.deployment;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.jboss.jandex.DotName;
-import org.jboss.logging.Logger;
-
-import io.quarkus.arc.processor.ContextRegistrar;
-import io.quarkus.builder.item.MultiBuildItem;
-
-/**
- * Make it possible to register one or more custom CDI contexts.
- * If you are registering a new context, you also pass in the respective annotation value into the constructor either in
- * {@link DotName} form, or as {@code Class<? extends Annotation>}.
- *
- * This information is then leveraged in {@link CustomScopeAnnotationsBuildItem} which allows consumers to browse
- * all known custom scoped within deployment even early in the build process.
- */
-public final class ContextRegistrarBuildItem extends MultiBuildItem {
-
-    private static final Logger LOGGER = Logger.getLogger(ContextRegistrarBuildItem.class);
-
-    private final ContextRegistrar contextRegistrar;
-    private final Collection<DotName> annotationNames;
-
-    public ContextRegistrarBuildItem(ContextRegistrar contextRegistrar, DotName... annotationsNames) {
-        this.contextRegistrar = contextRegistrar;
-        if (annotationsNames.length == 0) {
-            // log info level - usually you want to pass in annotation name as well
-            LOGGER.infof("A ContextRegistrarBuildItem was created but no annotation name/class was specified." +
-                    "This information can be later on consumed by other extensions via CustomScopeAnnotationsBuildItem, " +
-                    "please consider adding it.");
-        }
-        Collection<DotName> names = new ArrayList<>(annotationsNames.length);
-        for (DotName name : annotationsNames) {
-            names.add(name);
-        }
-        this.annotationNames = names;
-    }
-
-    public ContextRegistrarBuildItem(ContextRegistrar contextRegistrar, Class<? extends Annotation>... annotationsClasses) {
-        this(contextRegistrar, Arrays.stream(annotationsClasses).map(Class::getName)
-                .map(DotName::createSimple).toArray(DotName[]::new));
-    }
-
-    public ContextRegistrar getContextRegistrar() {
-        return contextRegistrar;
-    }
-
-    public Collection<DotName> getAnnotationNames() {
-        return annotationNames;
-    }
-}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrationPhaseBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrationPhaseBuildItem.java
index 2e34c898d4f18..e8cb7c1487fe1 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrationPhaseBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ContextRegistrationPhaseBuildItem.java
@@ -19,6 +19,7 @@
  * {@link ArcProcessor#registerBeans(ContextRegistrationPhaseBuildItem, List)}.
  * 
  * @see ContextConfiguratorBuildItem
+ * @see CustomScopeBuildItem
  */
 public final class ContextRegistrationPhaseBuildItem extends SimpleBuildItem {
 
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeAnnotationsBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeAnnotationsBuildItem.java
index cc537051f04c8..cbfa7f4b3ffa9 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeAnnotationsBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeAnnotationsBuildItem.java
@@ -18,7 +18,7 @@ public final class CustomScopeAnnotationsBuildItem extends SimpleBuildItem {
 
     private final Set<DotName> customScopeNames;
 
-    public CustomScopeAnnotationsBuildItem(Set<DotName> customScopeNames) {
+    CustomScopeAnnotationsBuildItem(Set<DotName> customScopeNames) {
         this.customScopeNames = customScopeNames;
     }
 
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeBuildItem.java
new file mode 100644
index 0000000000000..478b8a3913c65
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/CustomScopeBuildItem.java
@@ -0,0 +1,32 @@
+package io.quarkus.arc.deployment;
+
+import java.lang.annotation.Annotation;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * An extension that registers a custom CDI context via {@link ContextRegistrationPhaseBuildItem} should produce this build
+ * item in order to contribute the custom scope annotation name to the set of bean defining annotations.
+ * 
+ * @see CustomScopeAnnotationsBuildItem
+ * @see ContextRegistrationPhaseBuildItem
+ */
+public final class CustomScopeBuildItem extends MultiBuildItem {
+
+    private final DotName annotationName;
+
+    public CustomScopeBuildItem(Class<? extends Annotation> scope) {
+        this(DotName.createSimple(scope.getName()));
+    }
+
+    public CustomScopeBuildItem(DotName annotationName) {
+        this.annotationName = annotationName;
+    }
+
+    public DotName getAnnotationName() {
+        return annotationName;
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/HotDeploymentConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/HotDeploymentConfigBuildStep.java
index 31976bb8fe051..e3804bf91d460 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/HotDeploymentConfigBuildStep.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/HotDeploymentConfigBuildStep.java
@@ -1,13 +1,52 @@
 package io.quarkus.arc.deployment;
 
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.MethodParameterInfo;
+
+import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
+import io.quarkus.deployment.dev.DisableInstrumentationForIndexPredicateBuildItem;
+import io.quarkus.runtime.StartupEvent;
 
 public class HotDeploymentConfigBuildStep {
 
+    private static final DotName STARTUP_EVENT_NAME = DotName.createSimple(StartupEvent.class.getName());
+
     @BuildStep
     HotDeploymentWatchedFileBuildItem configFile() {
         return new HotDeploymentWatchedFileBuildItem("META-INF/beans.xml");
     }
 
+    @BuildStep
+    DisableInstrumentationForIndexPredicateBuildItem startup() {
+        return new DisableInstrumentationForIndexPredicateBuildItem(new Predicate<Index>() {
+            @Override
+            public boolean test(Index index) {
+                if (!index.getAnnotations(StartupBuildSteps.STARTUP_NAME).isEmpty()) {
+                    return true;
+                }
+                List<AnnotationInstance> observesInstances = index.getAnnotations(DotNames.OBSERVES);
+                if (!observesInstances.isEmpty()) {
+                    for (AnnotationInstance observesInstance : observesInstances) {
+                        if (observesInstance.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER) {
+                            MethodParameterInfo methodParameterInfo = observesInstance.target().asMethodParameter();
+                            short paramPos = methodParameterInfo.position();
+                            if (STARTUP_EVENT_NAME.equals(methodParameterInfo.method().parameters().get(paramPos).name())) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
+        });
+    }
+
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/LifecycleEventsBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/LifecycleEventsBuildStep.java
index 2fb195c60941c..7ff5ed89ca6f5 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/LifecycleEventsBuildStep.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/LifecycleEventsBuildStep.java
@@ -6,20 +6,25 @@
 
 import io.quarkus.arc.runtime.ArcRecorder;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ApplicationStartBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.RuntimeConfigSetupCompleteBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 
 public class LifecycleEventsBuildStep {
 
+    @Consume(RuntimeConfigSetupCompleteBuildItem.class)
     @BuildStep
     @Record(RUNTIME_INIT)
     ApplicationStartBuildItem startupEvent(ArcRecorder recorder,
             List<ServiceStartBuildItem> startList,
             BeanContainerBuildItem beanContainer,
-            ShutdownContextBuildItem shutdown) {
-        recorder.handleLifecycleEvents(shutdown, beanContainer.getValue());
+            ShutdownContextBuildItem shutdown,
+            LaunchModeBuildItem launchMode, ArcConfig config) {
+        recorder.handleLifecycleEvents(shutdown, launchMode.getLaunchMode(), config.test.disableApplicationLifecycleObservers);
         return new ApplicationStartBuildItem();
     }
 
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverRegistrarBuildItem.java
deleted file mode 100644
index b072e4ed4c689..0000000000000
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverRegistrarBuildItem.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.arc.deployment;
-
-import io.quarkus.arc.processor.ObserverRegistrar;
-import io.quarkus.builder.item.MultiBuildItem;
-
-/**
- * Used for registration of a synthetic observer; grants access to {@link ObserverRegistrar} which is an API allowing to
- * specify a synthetic observer through series of configuration methods.
- *
- * This is a build time alternative to CDI ObserverMethodConfigurator API.
- */
-public final class ObserverRegistrarBuildItem extends MultiBuildItem {
-
-    private final ObserverRegistrar observerRegistrar;
-
-    public ObserverRegistrarBuildItem(ObserverRegistrar observerRegistrar) {
-        this.observerRegistrar = observerRegistrar;
-    }
-
-    public ObserverRegistrar getObserverRegistrar() {
-        return observerRegistrar;
-    }
-
-}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverValidationProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverValidationProcessor.java
index c4f6d1fc3813d..79011c3c53674 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverValidationProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ObserverValidationProcessor.java
@@ -1,14 +1,13 @@
 package io.quarkus.arc.deployment;
 
-import java.util.Collection;
-
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.logging.Logger;
 
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
 import io.quarkus.arc.processor.Annotations;
-import io.quarkus.arc.processor.BeanDeploymentValidator;
+import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.ObserverInfo;
@@ -26,38 +25,30 @@ public class ObserverValidationProcessor {
 
     @BuildStep
     public void validateApplicationObserver(ApplicationArchivesBuildItem applicationArchivesBuildItem,
-            BuildProducer<BeanDeploymentValidatorBuildItem> validators) {
+            ValidationPhaseBuildItem validationPhase, BuildProducer<ValidationErrorBuildItem> errors) {
         // an index of all root archive classes (usually src/main/classes)
         IndexView applicationClassesIndex = applicationArchivesBuildItem.getRootArchive().getIndex();
-
-        validators.produce(new BeanDeploymentValidatorBuildItem(new BeanDeploymentValidator() {
-
-            @Override
-            public void validate(ValidationContext context) {
-                Collection<ObserverInfo> allObservers = context.get(Key.OBSERVERS);
-                // do the validation for each observer that can be found within application classes
-                for (ObserverInfo observer : allObservers) {
-                    if (observer.isSynthetic()) {
-                        // Skip synthetic observers
-                        continue;
-                    }
-                    DotName declaringBeanDotName = observer.getDeclaringBean().getBeanClass();
-                    AnnotationInstance instance = Annotations.getParameterAnnotation(observer.getObserverMethod(),
-                            DotNames.INITIALIZED);
-                    if (applicationClassesIndex.getClassByName(declaringBeanDotName) != null && instance != null &&
-                            instance.value().asClass().name().equals(BuiltinScope.APPLICATION.getName())) {
-                        // found an observer for @Initialized(ApplicationScoped.class)
-                        // log a warning and recommend to use StartupEvent instead
-                        final String observerWarning = "The method %s#%s is an observer for " +
-                                "@Initialized(ApplicationScoped.class). Observer notification for this event may " +
-                                "vary between JVM and native modes! We strongly recommend to observe StartupEvent " +
-                                "instead as that one is consistently delivered in both modes once the container is " +
-                                "running.";
-                        LOGGER.warnf(observerWarning, observer.getDeclaringBean().getImplClazz(),
-                                observer.getObserverMethod().name());
-                    }
-                }
+        // do the validation for each observer that can be found within application classes
+        for (ObserverInfo observer : validationPhase.getContext().get(BuildExtension.Key.OBSERVERS)) {
+            if (observer.isSynthetic()) {
+                // Skip synthetic observers
+                continue;
+            }
+            DotName declaringBeanDotName = observer.getDeclaringBean().getBeanClass();
+            AnnotationInstance instance = Annotations.getParameterAnnotation(observer.getObserverMethod(),
+                    DotNames.INITIALIZED);
+            if (applicationClassesIndex.getClassByName(declaringBeanDotName) != null && instance != null &&
+                    instance.value().asClass().name().equals(BuiltinScope.APPLICATION.getName())) {
+                // found an observer for @Initialized(ApplicationScoped.class)
+                // log a warning and recommend to use StartupEvent instead
+                final String observerWarning = "The method %s#%s is an observer for " +
+                        "@Initialized(ApplicationScoped.class). Observer notification for this event may " +
+                        "vary between JVM and native modes! We strongly recommend to observe StartupEvent " +
+                        "instead as that one is consistently delivered in both modes once the container is " +
+                        "running.";
+                LOGGER.warnf(observerWarning, observer.getDeclaringBean().getImplClazz(),
+                        observer.getObserverMethod().name());
             }
-        }));
+        }
     }
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/PreAdditionalBeanBuildTimeConditionBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/PreAdditionalBeanBuildTimeConditionBuildItem.java
new file mode 100644
index 0000000000000..1a23fb7cd6221
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/PreAdditionalBeanBuildTimeConditionBuildItem.java
@@ -0,0 +1,40 @@
+package io.quarkus.arc.deployment;
+
+import org.jboss.jandex.AnnotationTarget;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A type of build item that is similar to {@link BuildTimeConditionBuildItem} but evaluated before
+ * processing the {@link AdditionalBeanBuildItem} in order to filter the beans thanks to build time conditions
+ * before actually adding them with a {@link AdditionalBeanBuildItem}.
+ *
+ * @see io.quarkus.arc.deployment.BuildTimeConditionBuildItem
+ * @see io.quarkus.arc.deployment.AdditionalBeanBuildItem
+ */
+public final class PreAdditionalBeanBuildTimeConditionBuildItem extends MultiBuildItem {
+
+    private final AnnotationTarget target;
+    private final boolean enabled;
+
+    public PreAdditionalBeanBuildTimeConditionBuildItem(AnnotationTarget target, boolean enabled) {
+        switch (target.kind()) {
+            case CLASS:
+            case METHOD:
+            case FIELD:
+                this.target = target;
+                break;
+            default:
+                throw new IllegalArgumentException("'target' can only be a class, a field or a method");
+        }
+        this.enabled = enabled;
+    }
+
+    public AnnotationTarget getTarget() {
+        return target;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java
new file mode 100644
index 0000000000000..61ba26d156ec8
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/QualifierRegistrarBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.arc.processor.QualifierRegistrar;
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Makes it possible to register annotations that should be considered qualifiers but are not annotated with
+ * {@code javax.inject.Qualifier}.
+ */
+public final class QualifierRegistrarBuildItem extends MultiBuildItem {
+
+    private final QualifierRegistrar registrar;
+
+    public QualifierRegistrarBuildItem(QualifierRegistrar registrar) {
+        this.registrar = registrar;
+    }
+
+    public QualifierRegistrar getQualifierRegistrar() {
+        return registrar;
+    }
+}
\ No newline at end of file
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RegisteredComponentsBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RegisteredComponentsBuildItem.java
new file mode 100644
index 0000000000000..47ce22ad5f548
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/RegisteredComponentsBuildItem.java
@@ -0,0 +1,66 @@
+package io.quarkus.arc.deployment;
+
+import java.util.Collection;
+import java.util.stream.Stream;
+
+import io.quarkus.arc.processor.BeanDeployment;
+import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.BeanResolver;
+import io.quarkus.arc.processor.BeanStream;
+import io.quarkus.arc.processor.InjectionPointInfo;
+import io.quarkus.arc.processor.ObserverInfo;
+import io.quarkus.builder.item.SimpleBuildItem;
+
+abstract class RegisteredComponentsBuildItem extends SimpleBuildItem {
+
+    private final Collection<BeanInfo> beans;
+    private final Collection<InjectionPointInfo> injectionPoints;
+    private final Collection<ObserverInfo> observers;
+    private final BeanResolver beanResolver;
+
+    public RegisteredComponentsBuildItem(BeanDeployment beanDeployment) {
+        this.beans = beanDeployment.getBeans();
+        this.injectionPoints = beanDeployment.getInjectionPoints();
+        this.observers = beanDeployment.getObservers();
+        this.beanResolver = beanDeployment.getBeanResolver();
+    }
+
+    /**
+     * @return the registered beans
+     */
+    public Collection<BeanInfo> geBeans() {
+        return beans;
+    }
+
+    /**
+     * @return the registered injection points
+     */
+    public Collection<InjectionPointInfo> getInjectionPoints() {
+        return injectionPoints;
+    }
+
+    /**
+     * @return the registered observers
+     */
+    public Collection<ObserverInfo> getObservers() {
+        return observers;
+    }
+
+    /**
+     * 
+     * @return a convenient {@link Stream} wrapper that can be used to filter a set of beans
+     */
+    public BeanStream beanStream() {
+        return new BeanStream(beans);
+    }
+
+    /**
+     * The bean resolver can be used to apply the type-safe resolution rules.
+     * 
+     * @return the bean resolver
+     */
+    public BeanResolver getBeanResolver() {
+        return beanResolver;
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java
index 8261d2e093c54..3fc42d9158fcd 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/StartupBuildSteps.java
@@ -1,6 +1,5 @@
 package io.quarkus.arc.deployment;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 
@@ -8,7 +7,6 @@
 import org.jboss.jandex.AnnotationTarget.Kind;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.DotName;
-import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
@@ -18,8 +16,6 @@
 import io.quarkus.arc.deployment.ObserverRegistrationPhaseBuildItem.ObserverConfiguratorBuildItem;
 import io.quarkus.arc.impl.CreationalContextImpl;
 import io.quarkus.arc.processor.AnnotationStore;
-import io.quarkus.arc.processor.Annotations;
-import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.BuiltinScope;
@@ -48,29 +44,14 @@ public class StartupBuildSteps {
     static final MethodDescriptor CONTEXTUAL_DESTROY = MethodDescriptor.ofMethod(Contextual.class,
             "destroy", void.class, Object.class, CreationalContext.class);
 
-    private static final Logger LOGGER = Logger.getLogger(StartupBuildSteps.class);
-
     @BuildStep
-    AnnotationsTransformerBuildItem annotationTransformer(CustomScopeAnnotationsBuildItem customScopes) {
-        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
-            @Override
-            public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind kind) {
-                return kind == org.jboss.jandex.AnnotationTarget.Kind.CLASS;
-            }
-
-            @Override
-            public void transform(TransformationContext context) {
-                if (context.isClass() && !customScopes.isScopeDeclaredOn(context.getTarget().asClass())) {
-                    // Class with no built-in scope annotation but with @Scheduled method
-                    if (Annotations.contains(context.getTarget().asClass().classAnnotations(), STARTUP_NAME)) {
-                        LOGGER.debugf("Found @Startup on a class %s with no scope annotations - adding @ApplicationScoped",
-                                context.getTarget());
-                        context.transform().add(ApplicationScoped.class).done();
-                    }
-                }
-            }
-        });
+    AutoAddScopeBuildItem addScope(CustomScopeAnnotationsBuildItem customScopes) {
+        // Class with no built-in scope annotation but with @Startup method
+        return AutoAddScopeBuildItem.builder()
+                .defaultScope(BuiltinScope.APPLICATION)
+                .isAnnotatedWith(STARTUP_NAME)
+                .reason("Found classes containing @Startup annotation.")
+                .build();
     }
 
     @BuildStep
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SynthesisFinishedBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SynthesisFinishedBuildItem.java
new file mode 100644
index 0000000000000..a345fc282c4b2
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SynthesisFinishedBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.arc.deployment;
+
+import io.quarkus.arc.processor.BeanDeployment;
+
+/**
+ * Consumers of this build item can easily inspect all beans, observers and injection points registered in the
+ * application. Synthetic beans and observers are included. If interested in class-based components only you can use the
+ * {@link BeanDiscoveryFinishedBuildItem} instead.
+ * <p>
+ * Additionaly, the bean resolver can be used to apply the type-safe resolution rules, e.g. to find out whether there is a bean
+ * that would satisfy certain combination of required type and qualifiers.
+ * 
+ * @see BeanDiscoveryFinishedBuildItem
+ */
+public final class SynthesisFinishedBuildItem extends RegisteredComponentsBuildItem {
+
+    public SynthesisFinishedBuildItem(BeanDeployment beanDeployment) {
+        super(beanDeployment);
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeanBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeanBuildItem.java
index e9a9df065be05..26d614e751315 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeanBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeanBuildItem.java
@@ -6,23 +6,39 @@
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.DotName;
 
-import io.quarkus.arc.processor.BeanConfigurator;
 import io.quarkus.arc.processor.BeanConfiguratorBase;
+import io.quarkus.arc.processor.BeanRegistrar;
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.runtime.RuntimeValue;
 
 /**
- * Makes it possible to register a synthetic bean whose instance can be easily produced through a recorder.
+ * Makes it possible to register a synthetic bean.
+ * <p>
+ * Bean instances can be easily produced through a recorder and set via {@link ExtendedBeanConfigurator#supplier(Supplier)} and
+ * {@link ExtendedBeanConfigurator#runtimeValue(RuntimeValue)}.
  * 
- * @see BeanConfigurator
+ * @see ExtendedBeanConfigurator
+ * @see BeanRegistrar
  */
 public final class SyntheticBeanBuildItem extends MultiBuildItem {
 
+    /**
+     * 
+     * @param implClazz
+     * @return a new configurator instance
+     * @see ExtendedBeanConfigurator#done()
+     */
     public static ExtendedBeanConfigurator configure(Class<?> implClazz) {
         return configure(DotName.createSimple(implClazz.getName()));
     }
 
+    /**
+     * 
+     * @param implClazz
+     * @return a new configurator instance
+     * @see ExtendedBeanConfigurator#done()
+     */
     public static ExtendedBeanConfigurator configure(DotName implClazz) {
         return new ExtendedBeanConfigurator(implClazz).addType(implClazz);
     }
@@ -33,22 +49,26 @@ public static ExtendedBeanConfigurator configure(DotName implClazz) {
         this.configurator = configurator;
     }
 
-    public ExtendedBeanConfigurator configurator() {
+    ExtendedBeanConfigurator configurator() {
         return configurator;
     }
 
-    public boolean isStaticInit() {
+    boolean isStaticInit() {
         return configurator.staticInit;
     }
 
+    boolean hasRecorderInstance() {
+        return configurator.supplier != null || configurator.runtimeValue != null;
+    }
+
     /**
      * This construct is not thread-safe and should not be reused.
      */
     public static class ExtendedBeanConfigurator extends BeanConfiguratorBase<ExtendedBeanConfigurator, Object> {
 
-        Supplier<?> supplier;
-        RuntimeValue<?> runtimeValue;
-        boolean staticInit;
+        private Supplier<?> supplier;
+        private RuntimeValue<?> runtimeValue;
+        private boolean staticInit;
 
         ExtendedBeanConfigurator(DotName implClazz) {
             super(implClazz);
@@ -64,8 +84,9 @@ public SyntheticBeanBuildItem done() {
             if (supplier != null && runtimeValue != null) {
                 throw new IllegalStateException("It is not possible to specify both - a supplier and a runtime value");
             }
-            if (supplier == null && runtimeValue == null) {
-                throw new IllegalStateException("Either a supplier or a runtime value must be set");
+            if (creatorConsumer == null && supplier == null && runtimeValue == null) {
+                throw new IllegalStateException(
+                        "Synthetic bean does not provide a creation method, use ExtendedBeanConfigurator#creator(), ExtendedBeanConfigurator#supplier() or ExtendedBeanConfigurator#runtimeValue()");
             }
             return new SyntheticBeanBuildItem(this);
         }
@@ -81,22 +102,30 @@ public ExtendedBeanConfigurator runtimeValue(RuntimeValue<?> runtimeValue) {
         }
 
         /**
-         * By default, synthetic beans are initialized during {@link ExecutionTime#STATIC_INIT}. It is possible to mark a
-         * synthetic bean to be initialized during {@link ExecutionTime#RUNTIME_INIT}. However, in such case a client that
-         * attempts to obtain such bean during {@link ExecutionTime#STATIC_INIT} will receive an exception.
+         * A synthetic bean whose instance is produced through a recorder is initialized during
+         * {@link ExecutionTime#STATIC_INIT} by default.
+         * <p>
+         * It is possible to change this behavior and initialize the bean during the {@link ExecutionTime#RUNTIME_INIT}.
+         * However, in such case a client that attempts to obtain such bean during {@link ExecutionTime#STATIC_INIT} or before
+         * runtime-init synthetic beans are
+         * initialized will receive an exception.
+         * <p>
+         * {@link ExecutionTime#RUNTIME_INIT} build steps that access a runtime-init synthetic bean should consume the
+         * {@link SyntheticBeansRuntimeInitBuildItem}.
          * 
          * @return self
+         * @see SyntheticBeansRuntimeInitBuildItem
          */
         public ExtendedBeanConfigurator setRuntimeInit() {
             this.staticInit = false;
             return this;
         }
 
-        public DotName getImplClazz() {
+        DotName getImplClazz() {
             return implClazz;
         }
 
-        public Set<AnnotationInstance> getQualifiers() {
+        Set<AnnotationInstance> getQualifiers() {
             return qualifiers;
         }
 
@@ -105,5 +134,13 @@ protected ExtendedBeanConfigurator self() {
             return this;
         }
 
+        Supplier<?> getSupplier() {
+            return supplier;
+        }
+
+        RuntimeValue<?> getRuntimeValue() {
+            return runtimeValue;
+        }
+
     }
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java
index 0498d1d218cb6..7161c6bf4cb55 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansProcessor.java
@@ -11,6 +11,7 @@
 import org.jboss.jandex.DotName;
 
 import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem;
+import io.quarkus.arc.processor.BeanConfigurator;
 import io.quarkus.arc.runtime.ArcRecorder;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -34,8 +35,8 @@ void initStatic(ArcRecorder recorder, List<SyntheticBeanBuildItem> syntheticBean
         Map<String, Supplier<?>> suppliersMap = new HashMap<>();
 
         for (SyntheticBeanBuildItem bean : syntheticBeans) {
-            if (bean.isStaticInit()) {
-                initSyntheticBean(recorder, suppliersMap, beanRegistration, bean);
+            if (bean.hasRecorderInstance() && bean.isStaticInit()) {
+                configureSyntheticBean(recorder, suppliersMap, beanRegistration, bean);
             }
         }
         // Init the map of bean instances
@@ -51,27 +52,40 @@ ServiceStartBuildItem initRuntime(ArcRecorder recorder, List<SyntheticBeanBuildI
         Map<String, Supplier<?>> suppliersMap = new HashMap<>();
 
         for (SyntheticBeanBuildItem bean : syntheticBeans) {
-            if (!bean.isStaticInit()) {
-                initSyntheticBean(recorder, suppliersMap, beanRegistration, bean);
+            if (bean.hasRecorderInstance() && !bean.isStaticInit()) {
+                configureSyntheticBean(recorder, suppliersMap, beanRegistration, bean);
             }
         }
         recorder.initRuntimeSupplierBeans(suppliersMap);
         return new ServiceStartBuildItem("runtime-bean-init");
     }
 
-    private void initSyntheticBean(ArcRecorder recorder, Map<String, Supplier<?>> suppliersMap,
+    @BuildStep
+    void initRegular(List<SyntheticBeanBuildItem> syntheticBeans,
+            BeanRegistrationPhaseBuildItem beanRegistration, BuildProducer<BeanConfiguratorBuildItem> configurators) {
+
+        for (SyntheticBeanBuildItem bean : syntheticBeans) {
+            if (!bean.hasRecorderInstance()) {
+                configureSyntheticBean(null, null, beanRegistration, bean);
+            }
+        }
+    }
+
+    private void configureSyntheticBean(ArcRecorder recorder, Map<String, Supplier<?>> suppliersMap,
             BeanRegistrationPhaseBuildItem beanRegistration, SyntheticBeanBuildItem bean) {
         DotName implClazz = bean.configurator().getImplClazz();
         String name = createName(implClazz.toString(), bean.configurator().getQualifiers().toString());
-        if (bean.configurator().runtimeValue != null) {
-            suppliersMap.put(name, recorder.createSupplier(bean.configurator().runtimeValue));
-        } else {
-            suppliersMap.put(name, bean.configurator().supplier);
+        if (bean.configurator().getRuntimeValue() != null) {
+            suppliersMap.put(name, recorder.createSupplier(bean.configurator().getRuntimeValue()));
+        } else if (bean.configurator().getSupplier() != null) {
+            suppliersMap.put(name, bean.configurator().getSupplier());
+        }
+        BeanConfigurator<?> configurator = beanRegistration.getContext().configure(implClazz)
+                .read(bean.configurator());
+        if (bean.hasRecorderInstance()) {
+            configurator.creator(creator(name, bean));
         }
-        beanRegistration.getContext().configure(implClazz)
-                .read(bean.configurator())
-                .creator(creator(name))
-                .done();
+        configurator.done();
     }
 
     private String createName(String beanClass, String qualifiers) {
@@ -79,7 +93,7 @@ private String createName(String beanClass, String qualifiers) {
                 + HashUtil.sha1(qualifiers);
     }
 
-    private Consumer<MethodCreator> creator(String name) {
+    private Consumer<MethodCreator> creator(String name, SyntheticBeanBuildItem bean) {
         return new Consumer<MethodCreator>() {
             @Override
             public void accept(MethodCreator m) {
@@ -90,7 +104,7 @@ public void accept(MethodCreator m) {
                         m.load(name));
                 // Throw an exception if no supplier is found
                 m.ifNull(supplier).trueBranch().throwException(CreationException.class,
-                        "Synthetic bean instance not initialized yet: " + name);
+                        createMessage(name, bean));
                 ResultHandle result = m.invokeInterfaceMethod(
                         MethodDescriptor.ofMethod(Supplier.class, "get", Object.class),
                         supplier);
@@ -99,4 +113,18 @@ public void accept(MethodCreator m) {
         };
     }
 
+    private String createMessage(String name, SyntheticBeanBuildItem bean) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Synthetic bean instance for ");
+        builder.append(bean.configurator().getImplClazz());
+        builder.append(" not initialized yet: ");
+        builder.append(name);
+        if (!bean.isStaticInit()) {
+            builder.append("\n\t- a synthetic bean initialized during RUNTIME_INIT must not be accessed during STATIC_INIT");
+            builder.append(
+                    "\n\t- RUNTIME_INIT build steps that require access to synthetic beans initialized during RUNTIME_INIT should consume the SyntheticBeansRuntimeInitBuildItem");
+        }
+        return builder.toString();
+    }
+
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansRuntimeInitBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansRuntimeInitBuildItem.java
index 9857f0ce84640..ac094c35ef22f 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansRuntimeInitBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SyntheticBeansRuntimeInitBuildItem.java
@@ -4,6 +4,8 @@
 
 /**
  * This build item should be consumed by build steps that require RUNTIME_INIT synthetic beans to be initialized.
+ * 
+ * @see SyntheticBeanBuildItem
  */
 public final class SyntheticBeansRuntimeInitBuildItem extends EmptyBuildItem {
 
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/TransformedAnnotationsBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/TransformedAnnotationsBuildItem.java
index 10bc173dc5535..bb5f5574f968a 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/TransformedAnnotationsBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/TransformedAnnotationsBuildItem.java
@@ -5,6 +5,7 @@
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.DotName;
 
 import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanDeployment;
@@ -18,19 +19,23 @@
 public final class TransformedAnnotationsBuildItem extends SimpleBuildItem
         implements Function<AnnotationTarget, Collection<AnnotationInstance>> {
 
-    private final Function<AnnotationTarget, Collection<AnnotationInstance>> fun;
+    private final BeanDeployment beanDeployment;
 
     TransformedAnnotationsBuildItem(BeanDeployment beanDeployment) {
-        this.fun = beanDeployment::getAnnotations;
+        this.beanDeployment = beanDeployment;
     }
 
     public Collection<AnnotationInstance> getAnnotations(AnnotationTarget target) {
-        return fun.apply(target);
+        return beanDeployment.getAnnotations(target);
+    }
+
+    public AnnotationInstance getAnnotation(AnnotationTarget target, DotName name) {
+        return beanDeployment.getAnnotation(target, name);
     }
 
     @Override
     public Collection<AnnotationInstance> apply(AnnotationTarget target) {
-        return fun.apply(target);
+        return beanDeployment.getAnnotations(target);
     }
 
 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationsProcessor.java
new file mode 100644
index 0000000000000..9ddc293634783
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/WrongAnnotationsProcessor.java
@@ -0,0 +1,88 @@
+package io.quarkus.arc.deployment;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Function;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
+
+public class WrongAnnotationsProcessor {
+
+    @BuildStep
+    void detect(ArcConfig config, ApplicationIndexBuildItem applicationIndex,
+            BuildProducer<ValidationErrorBuildItem> validationError) {
+
+        if (!config.detectWrongAnnotations) {
+            return;
+        }
+
+        IndexView index = applicationIndex.getIndex();
+        List<WrongAnnotation> wrongAnnotations = new ArrayList<>();
+        Function<AnnotationInstance, String> singletonFun = new Function<AnnotationInstance, String>() {
+
+            @Override
+            public String apply(AnnotationInstance annotationInstance) {
+                return String.format("%s declared on %s, use @javax.inject.Singleton instead",
+                        annotationInstance.toString(false), getTargetInfo(annotationInstance));
+            }
+        };
+        wrongAnnotations.add(new WrongAnnotation(DotName.createSimple("com.google.inject.Singleton"), singletonFun));
+        wrongAnnotations.add(new WrongAnnotation(DotName.createSimple("javax.ejb.Singleton"), singletonFun));
+        wrongAnnotations.add(new WrongAnnotation(DotName.createSimple("groovy.lang.Singleton"), singletonFun));
+        wrongAnnotations.add(new WrongAnnotation(DotName.createSimple("jakarta.ejb.Singleton"), singletonFun));
+
+        Map<AnnotationInstance, String> wrongUsages = new HashMap<>();
+
+        for (WrongAnnotation wrongAnnotation : wrongAnnotations) {
+            for (AnnotationInstance annotationInstance : index.getAnnotations(wrongAnnotation.name)) {
+                wrongUsages.put(annotationInstance, wrongAnnotation.messageFun.apply(annotationInstance));
+            }
+        }
+
+        if (!wrongUsages.isEmpty()) {
+            for (Entry<AnnotationInstance, String> entry : wrongUsages.entrySet()) {
+                validationError.produce(new ValidationErrorBuildItem(
+                        new IllegalStateException(entry.getValue())));
+            }
+        }
+    }
+
+    private static class WrongAnnotation {
+
+        final DotName name;
+        final Function<AnnotationInstance, String> messageFun;
+
+        WrongAnnotation(DotName name, Function<AnnotationInstance, String> messageFun) {
+            this.name = name;
+            this.messageFun = messageFun;
+        }
+
+    }
+
+    private static String getTargetInfo(AnnotationInstance annotationInstance) {
+        AnnotationTarget target = annotationInstance.target();
+        switch (target.kind()) {
+            case FIELD:
+                return target.asField().declaringClass().toString() + "."
+                        + target.asField().name();
+            case METHOD:
+                return target.asMethod().declaringClass().toString()
+                        + "."
+                        + target.asMethod().name() + "()";
+            default:
+                return target.toString();
+        }
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java
index 64bdaa58cac56..84212e48284a3 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ClassConfigPropertiesUtil.java
@@ -3,6 +3,7 @@
 import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.createReadMandatoryValueAndConvertIfNeeded;
 import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.createReadOptionalValueAndConvertIfNeeded;
 import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.determineSingleGenericType;
+import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.registerImplicitConverter;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -16,9 +17,11 @@
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.DeploymentException;
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
@@ -32,8 +35,11 @@
 import io.quarkus.arc.config.ConfigProperties;
 import io.quarkus.arc.deployment.ConfigPropertyBuildItem;
 import io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.ReadOptionalResponse;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
@@ -55,7 +61,28 @@ final class ClassConfigPropertiesUtil {
     private static final String HIBERNATE_VALIDATOR_IMPL_CLASS = "org.hibernate.validator.HibernateValidator";
     private static final String CONSTRAINT_VIOLATION_EXCEPTION_CLASS = "javax.validation.ConstraintViolationException";
 
-    private ClassConfigPropertiesUtil() {
+    private final IndexView applicationIndex;
+    private final YamlListObjectHandler yamlListObjectHandler;
+    private final ClassCreator producerClassCreator;
+    private final Capabilities capabilities;
+    private final BuildProducer<ReflectiveClassBuildItem> reflectiveClasses;
+    private final BuildProducer<ReflectiveMethodBuildItem> reflectiveMethods;
+    private final BuildProducer<ConfigPropertyBuildItem> configProperties;
+
+    ClassConfigPropertiesUtil(IndexView applicationIndex, YamlListObjectHandler yamlListObjectHandler,
+            ClassCreator producerClassCreator,
+            Capabilities capabilities,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+            BuildProducer<ReflectiveMethodBuildItem> reflectiveMethods,
+            BuildProducer<ConfigPropertyBuildItem> configProperties) {
+
+        this.applicationIndex = applicationIndex;
+        this.yamlListObjectHandler = yamlListObjectHandler;
+        this.producerClassCreator = producerClassCreator;
+        this.capabilities = capabilities;
+        this.reflectiveClasses = reflectiveClasses;
+        this.reflectiveMethods = reflectiveMethods;
+        this.configProperties = configProperties;
     }
 
     /**
@@ -122,12 +149,10 @@ static void generateStartupObserverThatInjectsConfigClass(ClassOutput classOutpu
     /**
      * @return true if the configuration class needs validation
      */
-    static boolean addProducerMethodForClassConfigProperties(ClassLoader classLoader, ClassInfo configPropertiesClassInfo,
-            ClassCreator producerClassCreator, String prefixStr, ConfigProperties.NamingStrategy namingStrategy,
+    boolean addProducerMethodForClassConfigProperties(ClassLoader classLoader, ClassInfo configPropertiesClassInfo,
+            String prefixStr, ConfigProperties.NamingStrategy namingStrategy,
             boolean failOnMismatchingMember,
-            boolean needsQualifier, IndexView applicationIndex,
-            BuildProducer<ReflectiveMethodBuildItem> reflectiveMethods,
-            BuildProducer<ConfigPropertyBuildItem> configProperties) {
+            boolean needsQualifier) {
 
         if (!configPropertiesClassInfo.hasNoArgsConstructor()) {
             throw new IllegalArgumentException(
@@ -180,7 +205,7 @@ static boolean addProducerMethodForClassConfigProperties(ClassLoader classLoader
             }
 
             ResultHandle configObject = populateConfigObject(classLoader, configPropertiesClassInfo, prefixStr, namingStrategy,
-                    failOnMismatchingMember, methodCreator, applicationIndex, reflectiveMethods, configProperties);
+                    failOnMismatchingMember, methodCreator);
 
             if (needsValidation) {
                 createValidationCodePath(methodCreator, configObject, prefixStr);
@@ -202,18 +227,15 @@ private static boolean needsValidation() {
 
     private static boolean isHibernateValidatorInClasspath() {
         try {
-            Class.forName(HIBERNATE_VALIDATOR_IMPL_CLASS);
+            Class.forName(HIBERNATE_VALIDATOR_IMPL_CLASS, false, Thread.currentThread().getContextClassLoader());
             return true;
         } catch (ClassNotFoundException e) {
             return false;
         }
     }
 
-    private static ResultHandle populateConfigObject(ClassLoader classLoader, ClassInfo configClassInfo, String prefixStr,
-            ConfigProperties.NamingStrategy namingStrategy, boolean failOnMismatchingMember, MethodCreator methodCreator,
-            IndexView applicationIndex,
-            BuildProducer<ReflectiveMethodBuildItem> reflectiveMethods,
-            BuildProducer<ConfigPropertyBuildItem> configProperties) {
+    private ResultHandle populateConfigObject(ClassLoader classLoader, ClassInfo configClassInfo, String prefixStr,
+            ConfigProperties.NamingStrategy namingStrategy, boolean failOnMismatchingMember, MethodCreator methodCreator) {
         String configObjectClassStr = configClassInfo.name().toString();
         ResultHandle configObject = methodCreator.newInstance(MethodDescriptor.ofConstructor(configObjectClassStr));
 
@@ -238,10 +260,15 @@ private static ResultHandle populateConfigObject(ClassLoader classLoader, ClassI
                 if (field.hasAnnotation(DotNames.CONFIG_IGNORE)) {
                     continue;
                 }
-                if (field.hasAnnotation(DotNames.CONFIG_PROPERTY)) {
-                    LOGGER.warn(
-                            "'@ConfigProperty' is ignored when added to a field of a class annotated with '@ConfigProperties'. Offending field is '"
-                                    + field.name() + "' of class '" + field.declaringClass().toString() + "'");
+                AnnotationInstance configPropertyAnnotation = field.annotation(DotNames.CONFIG_PROPERTY);
+                if (configPropertyAnnotation != null) {
+                    AnnotationValue configPropertyDefaultValue = configPropertyAnnotation.value("defaultValue");
+                    if ((configPropertyDefaultValue != null)
+                            && !configPropertyDefaultValue.asString().equals(ConfigProperty.UNCONFIGURED_VALUE)) {
+                        LOGGER.warn(
+                                "'defaultValue' of '@ConfigProperty' is ignored when added to a field of a class annotated with '@ConfigProperties'. Offending field is '"
+                                        + field.name() + "' of class '" + field.declaringClass().toString() + "'");
+                    }
                 }
                 boolean useFieldAccess = false;
 
@@ -309,8 +336,7 @@ private static ResultHandle populateConfigObject(ClassLoader classLoader, ClassI
 
                         ResultHandle nestedConfigObject = populateConfigObject(classLoader, fieldTypeClassInfo,
                                 getFullConfigName(prefixStr, namingStrategy, field), namingStrategy, failOnMismatchingMember,
-                                methodCreator,
-                                applicationIndex, reflectiveMethods, configProperties);
+                                methodCreator);
                         createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, nestedConfigObject);
                     }
                 } else {
@@ -321,6 +347,7 @@ private static ResultHandle populateConfigObject(ClassLoader classLoader, ClassI
 
                         // config.getOptionalValue
                         if (genericType.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+                            registerImplicitConverter(genericType, reflectiveClasses);
                             ResultHandle setterValue = methodCreator.invokeInterfaceMethod(
                                     MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class, String.class,
                                             Class.class),
@@ -344,7 +371,18 @@ private static ResultHandle populateConfigObject(ClassLoader classLoader, ClassI
                                     readOptionalResponse.getIsPresentFalse().invokeStaticMethod(
                                             MethodDescriptor.ofMethod(Optional.class, "empty", Optional.class)));
                         }
+                    } else if (ConfigPropertiesUtil.isListOfObject(fieldType)) {
+                        if (!capabilities.isPresent(Capability.CONFIG_YAML)) {
+                            throw new DeploymentException(
+                                    "Support for List of objects in classes annotated with '@ConfigProperties' is only possible via the 'quarkus-config-yaml' extension. Offending field is '"
+                                            + field.name() + "' of class '" + field.declaringClass().name().toString());
+                        }
+                        ResultHandle setterValue = yamlListObjectHandler.handle(new YamlListObjectHandler.FieldMember(field),
+                                methodCreator, mpConfig,
+                                getEffectiveConfigName(namingStrategy, field), fullConfigName);
+                        createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, setterValue);
                     } else {
+                        registerImplicitConverter(fieldType, reflectiveClasses);
                         populateTypicalProperty(methodCreator, configObject, configPropertyBuildItemCandidates,
                                 currentClassInHierarchy, field, useFieldAccess, fieldType, setter, mpConfig,
                                 fullConfigName);
@@ -414,12 +452,26 @@ private static void populateTypicalProperty(MethodCreator methodCreator, ResultH
             createWriteValue(methodCreator, configObject, field, setter, useFieldAccess, setterValue);
 
         }
-        configPropertyBuildItemCandidates
-                .add(new ConfigPropertyBuildItemCandidate(field.name(), fullConfigName, fieldType));
+        if (field.type().kind() != Type.Kind.PRIMITIVE) { // the JVM assigns primitive types a default even though it doesn't show up in the bytecode
+            configPropertyBuildItemCandidates
+                    .add(new ConfigPropertyBuildItemCandidate(field.name(), fullConfigName, fieldType));
+        }
     }
 
     private static String getFullConfigName(String prefixStr, ConfigProperties.NamingStrategy namingStrategy, FieldInfo field) {
-        return prefixStr + "." + namingStrategy.getName(field.name());
+        return prefixStr + "." + getEffectiveConfigName(namingStrategy, field);
+    }
+
+    private static String getEffectiveConfigName(ConfigProperties.NamingStrategy namingStrategy, FieldInfo field) {
+        String nameToUse = field.name();
+        AnnotationInstance configPropertyAnnotation = field.annotation(DotNames.CONFIG_PROPERTY);
+        if (configPropertyAnnotation != null) {
+            AnnotationValue configPropertyNameValue = configPropertyAnnotation.value("name");
+            if ((configPropertyNameValue != null) && !configPropertyNameValue.asString().isEmpty()) {
+                nameToUse = configPropertyNameValue.asString();
+            }
+        }
+        return namingStrategy.getName(nameToUse);
     }
 
     private static void createWriteValue(BytecodeCreator bytecodeCreator, ResultHandle configObject, FieldInfo field,
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java
index 96db87f92c62c..88ff89a1acabf 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesBuildStep.java
@@ -1,8 +1,5 @@
 package io.quarkus.arc.deployment.configproperties;
 
-import static io.quarkus.arc.deployment.configproperties.InterfaceConfigPropertiesUtil.addProducerMethodForInterfaceConfigProperties;
-import static io.quarkus.arc.deployment.configproperties.InterfaceConfigPropertiesUtil.generateImplementationForInterfaceConfigProperties;
-
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,12 +22,14 @@
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.arc.deployment.configproperties.InterfaceConfigPropertiesUtil.GeneratedClass;
+import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
@@ -105,10 +104,12 @@ private String getPrefix(AnnotationInstance annotationInstance) {
     @BuildStep
     void setup(CombinedIndexBuildItem combinedIndex,
             List<ConfigPropertiesMetadataBuildItem> configPropertiesMetadataList,
+            Capabilities capabilities,
             BuildProducer<GeneratedClassBuildItem> generatedClasses,
             BuildProducer<GeneratedBeanBuildItem> generatedBeans,
             BuildProducer<RunTimeConfigurationDefaultBuildItem> defaultConfigValues,
             BuildProducer<ReflectiveMethodBuildItem> reflectiveMethods,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
             BuildProducer<ConfigPropertyBuildItem> configProperties) {
         if (configPropertiesMetadataList.isEmpty()) {
             return;
@@ -128,6 +129,14 @@ void setup(CombinedIndexBuildItem combinedIndex,
         producerClassCreator.addAnnotation(Singleton.class);
 
         Set<DotName> configClassesThatNeedValidation = new HashSet<>(configPropertiesMetadataList.size());
+        IndexView index = combinedIndex.getIndex();
+        YamlListObjectHandler yamlListObjectHandler = new YamlListObjectHandler(nonBeansClassOutput, index, reflectiveClasses);
+        ClassConfigPropertiesUtil classConfigPropertiesUtil = new ClassConfigPropertiesUtil(index,
+                yamlListObjectHandler, producerClassCreator, capabilities, reflectiveClasses, reflectiveMethods,
+                configProperties);
+        InterfaceConfigPropertiesUtil interfaceConfigPropertiesUtil = new InterfaceConfigPropertiesUtil(index,
+                yamlListObjectHandler, nonBeansClassOutput, producerClassCreator, capabilities, defaultConfigValues,
+                configProperties, reflectiveClasses);
         for (ConfigPropertiesMetadataBuildItem configPropertiesMetadata : configPropertiesMetadataList) {
             ClassInfo classInfo = configPropertiesMetadata.getClassInfo();
 
@@ -139,14 +148,13 @@ void setup(CombinedIndexBuildItem combinedIndex,
                  */
 
                 Map<DotName, GeneratedClass> interfaceToGeneratedClass = new HashMap<>();
-                generateImplementationForInterfaceConfigProperties(
-                        classInfo, nonBeansClassOutput, combinedIndex.getIndex(), configPropertiesMetadata.getPrefix(),
-                        configPropertiesMetadata.getNamingStrategy(), defaultConfigValues, configProperties,
+                interfaceConfigPropertiesUtil.generateImplementationForInterfaceConfigProperties(
+                        classInfo, configPropertiesMetadata.getPrefix(),
+                        configPropertiesMetadata.getNamingStrategy(),
                         interfaceToGeneratedClass);
                 for (Map.Entry<DotName, GeneratedClass> entry : interfaceToGeneratedClass.entrySet()) {
-                    addProducerMethodForInterfaceConfigProperties(entry.getKey(),
+                    interfaceConfigPropertiesUtil.addProducerMethodForInterfaceConfigProperties(entry.getKey(),
                             configPropertiesMetadata.getPrefix(), configPropertiesMetadata.isNeedsQualifier(),
-                            producerClassCreator,
                             entry.getValue());
                 }
             } else {
@@ -154,11 +162,10 @@ void setup(CombinedIndexBuildItem combinedIndex,
                  * In this case the producer method contains all the logic to instantiate the config class
                  * and call setters for value obtained from MP Config
                  */
-                boolean needsValidation = ClassConfigPropertiesUtil.addProducerMethodForClassConfigProperties(
-                        Thread.currentThread().getContextClassLoader(), classInfo, producerClassCreator,
+                boolean needsValidation = classConfigPropertiesUtil.addProducerMethodForClassConfigProperties(
+                        Thread.currentThread().getContextClassLoader(), classInfo,
                         configPropertiesMetadata.getPrefix(), configPropertiesMetadata.getNamingStrategy(),
-                        configPropertiesMetadata.isFailOnMismatchingMember(), configPropertiesMetadata.isNeedsQualifier(),
-                        combinedIndex.getIndex(), reflectiveMethods, configProperties);
+                        configPropertiesMetadata.isFailOnMismatchingMember(), configPropertiesMetadata.isNeedsQualifier());
                 if (needsValidation) {
                     configClassesThatNeedValidation.add(classInfo.name());
                 }
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesMetadataBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesMetadataBuildItem.java
index 3d5bd1f82c28a..8e3e301193e16 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesMetadataBuildItem.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesMetadataBuildItem.java
@@ -56,7 +56,7 @@ private String sanitisePrefix(String prefix) {
     }
 
     private boolean isPrefixUnset(String prefix) {
-        return prefix == null || "".equals(prefix.trim()) || ConfigProperties.UNSET_PREFIX.equals(prefix.trim());
+        return prefix == null || prefix.trim().isEmpty() || ConfigProperties.UNSET_PREFIX.equals(prefix.trim());
     }
 
     private String getPrefixFromClassName(DotName className) {
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java
index dc90cebe401f5..48de13b00794b 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/ConfigPropertiesUtil.java
@@ -9,6 +9,9 @@
 import org.jboss.jandex.ParameterizedType;
 import org.jboss.jandex.Type;
 
+import io.quarkus.arc.deployment.ConfigBuildStep;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.MethodDescriptor;
@@ -107,6 +110,20 @@ static ReadOptionalResponse createReadOptionalValueAndConvertIfNeeded(String pro
         return new ReadOptionalResponse(value, isPresentTrue, isPresentBranch.falseBranch());
     }
 
+    public static boolean isListOfObject(Type type) {
+        if (type.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+            return false;
+        }
+        ParameterizedType parameterizedType = (ParameterizedType) type;
+        if (!DotNames.LIST.equals(parameterizedType.name())) {
+            return false;
+        }
+        if (parameterizedType.arguments().size() != 1) {
+            return false;
+        }
+        return !parameterizedType.arguments().get(0).name().toString().startsWith("java");
+    }
+
     private static boolean isCollection(final Type resultType) {
         return DotNames.COLLECTION.equals(resultType.name()) ||
                 DotNames.LIST.equals(resultType.name()) ||
@@ -128,6 +145,15 @@ static Type determineSingleGenericType(Type type, DotName declaringClass) {
         return type.asParameterizedType().arguments().get(0);
     }
 
+    static void registerImplicitConverter(Type type, BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+        // We need to register for reflection in case an implicit converter is required.
+        if (!ConfigBuildStep.isHandledByProducers(type)) {
+            if (type.kind() != Type.Kind.ARRAY) {
+                reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, type.name().toString()));
+            }
+        }
+    }
+
     static class ReadOptionalResponse {
         private final ResultHandle value; //this is only valid within 'isPresentTrue'
         private final BytecodeCreator isPresentTrue;
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java
index bd919b970863c..0efa06befc810 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/InterfaceConfigPropertiesUtil.java
@@ -3,6 +3,7 @@
 import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.createReadMandatoryValueAndConvertIfNeeded;
 import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.createReadOptionalValueAndConvertIfNeeded;
 import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.determineSingleGenericType;
+import static io.quarkus.arc.deployment.configproperties.ConfigPropertiesUtil.registerImplicitConverter;
 import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
 import java.lang.annotation.Annotation;
@@ -15,6 +16,7 @@
 
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.DeploymentException;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -32,9 +34,12 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.arc.config.ConfigProperties;
 import io.quarkus.arc.deployment.ConfigPropertyBuildItem;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.bean.JavaBeanUtil;
 import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.gizmo.FieldDescriptor;
@@ -45,7 +50,28 @@
 
 final class InterfaceConfigPropertiesUtil {
 
-    private InterfaceConfigPropertiesUtil() {
+    private final IndexView index;
+    private final YamlListObjectHandler yamlListObjectHandler;
+    private final ClassOutput classOutput;
+    private final ClassCreator classCreator;
+    private final Capabilities capabilities;
+    private final BuildProducer<RunTimeConfigurationDefaultBuildItem> defaultConfigValues;
+    private final BuildProducer<ConfigPropertyBuildItem> configProperties;
+    private final BuildProducer<ReflectiveClassBuildItem> reflectiveClasses;
+
+    InterfaceConfigPropertiesUtil(IndexView index, YamlListObjectHandler yamlListObjectHandler, ClassOutput classOutput,
+            ClassCreator classCreator,
+            Capabilities capabilities, BuildProducer<RunTimeConfigurationDefaultBuildItem> defaultConfigValues,
+            BuildProducer<ConfigPropertyBuildItem> configProperties,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+        this.index = index;
+        this.yamlListObjectHandler = yamlListObjectHandler;
+        this.classOutput = classOutput;
+        this.classCreator = classCreator;
+        this.capabilities = capabilities;
+        this.defaultConfigValues = defaultConfigValues;
+        this.configProperties = configProperties;
+        this.reflectiveClasses = reflectiveClasses;
     }
 
     /**
@@ -58,8 +84,7 @@ private InterfaceConfigPropertiesUtil() {
      *  }
      * </pre>
      */
-    static void addProducerMethodForInterfaceConfigProperties(DotName interfaceName, String prefix, boolean needsQualifier,
-            ClassCreator classCreator,
+    void addProducerMethodForInterfaceConfigProperties(DotName interfaceName, String prefix, boolean needsQualifier,
             GeneratedClass generatedClass) {
         String methodName = "produce" + interfaceName.withoutPackagePrefix();
         if (needsQualifier) {
@@ -84,21 +109,17 @@ static void addProducerMethodForInterfaceConfigProperties(DotName interfaceName,
         }
     }
 
-    static void generateImplementationForInterfaceConfigProperties(ClassInfo originalInterface, ClassOutput classOutput,
-            IndexView index, String prefixStr, ConfigProperties.NamingStrategy namingStrategy,
-            BuildProducer<RunTimeConfigurationDefaultBuildItem> defaultConfigValues,
-            BuildProducer<ConfigPropertyBuildItem> configProperties,
+    void generateImplementationForInterfaceConfigProperties(ClassInfo originalInterface,
+            String prefixStr, ConfigProperties.NamingStrategy namingStrategy,
             Map<DotName, GeneratedClass> interfaceToGeneratedClass) {
 
-        generateImplementationForInterfaceConfigPropertiesRec(originalInterface, originalInterface, classOutput, index,
-                prefixStr, namingStrategy, defaultConfigValues, configProperties, interfaceToGeneratedClass);
+        generateImplementationForInterfaceConfigPropertiesRec(originalInterface, originalInterface,
+                prefixStr, namingStrategy, interfaceToGeneratedClass);
     }
 
-    private static void generateImplementationForInterfaceConfigPropertiesRec(ClassInfo originalInterface,
-            ClassInfo currentInterface, ClassOutput classOutput,
-            IndexView index, String prefixStr, ConfigProperties.NamingStrategy namingStrategy,
-            BuildProducer<RunTimeConfigurationDefaultBuildItem> defaultConfigValues,
-            BuildProducer<ConfigPropertyBuildItem> configProperties,
+    private String generateImplementationForInterfaceConfigPropertiesRec(ClassInfo originalInterface,
+            ClassInfo currentInterface,
+            String prefixStr, ConfigProperties.NamingStrategy namingStrategy,
             Map<DotName, GeneratedClass> interfaceToGeneratedClass) {
 
         Set<DotName> allInterfaces = new HashSet<>();
@@ -106,9 +127,11 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
         collectInterfacesRec(currentInterface, index, allInterfaces);
 
         String generatedClassName = createName(currentInterface.name(), prefixStr);
-        // the generated class needs to be unremovable if it's not top-level interface since it will only be obtains via Arc.container().instance() in generated code
-        interfaceToGeneratedClass.put(currentInterface.name(),
-                new GeneratedClass(generatedClassName, !originalInterface.name().equals(currentInterface.name())));
+
+        // we only need to generate CDI producers for the top-level interface, not the sub-interfaces
+        if (originalInterface.name().equals(currentInterface.name())) {
+            interfaceToGeneratedClass.put(currentInterface.name(), new GeneratedClass(generatedClassName, true));
+        }
 
         try (ClassCreator interfaceImplClassCreator = ClassCreator.builder().classOutput(classOutput)
                 .interfaces(currentInterface.name().toString()).className(generatedClassName)
@@ -133,7 +156,9 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
                 List<MethodInfo> methods = classInfo.methods();
                 for (MethodInfo method : methods) {
                     Type returnType = method.returnType();
-                    if (isDefault(method.flags())) { // don't do anything with default methods
+                    short methodModifiers = method.flags();
+                    if (isDefault(methodModifiers) || Modifier.isStatic(methodModifiers)
+                            || Modifier.isPrivate(methodModifiers)) {
                         continue;
                     }
                     if (!method.parameters().isEmpty()) {
@@ -153,25 +178,25 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
                         if ((returnType.kind() == Type.Kind.CLASS)) {
                             ClassInfo returnTypeClassInfo = index.getClassByName(returnType.name());
                             if ((returnTypeClassInfo != null) && Modifier.isInterface(returnTypeClassInfo.flags())) {
-                                // when the return type is an interface,
-                                // 1) we generate an implementation
-                                // 2) retrieve the implementation from Arc
-
-                                generateImplementationForInterfaceConfigPropertiesRec(originalInterface, returnTypeClassInfo,
-                                        classOutput,
-                                        index, fullConfigName, namingStrategy, defaultConfigValues, configProperties,
-                                        interfaceToGeneratedClass);
+                                String generatedSubInterfaceImp = generateImplementationForInterfaceConfigPropertiesRec(
+                                        originalInterface, returnTypeClassInfo,
+                                        fullConfigName, namingStrategy, interfaceToGeneratedClass);
 
                                 ResultHandle arcContainer = methodCreator
                                         .invokeStaticMethod(
                                                 MethodDescriptor.ofMethod(Arc.class, "container", ArcContainer.class));
-                                ResultHandle instanceHandle = methodCreator.invokeInterfaceMethod(
+                                ResultHandle configInstanceHandle = methodCreator.invokeInterfaceMethod(
                                         ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class,
                                                 Annotation[].class),
-                                        arcContainer, methodCreator.loadClass(returnTypeClassInfo.name().toString()),
+                                        arcContainer, methodCreator.loadClass(Config.class),
                                         methodCreator.newArray(Annotation.class, 0));
-                                methodCreator.returnValue(methodCreator.invokeInterfaceMethod(
-                                        MethodDescriptor.ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle));
+                                ResultHandle config = methodCreator.invokeInterfaceMethod(
+                                        ofMethod(InstanceHandle.class, "get", Object.class), configInstanceHandle);
+
+                                ResultHandle interImpl = methodCreator
+                                        .newInstance(MethodDescriptor.ofConstructor(generatedSubInterfaceImp,
+                                                Config.class.getName()), config);
+                                methodCreator.returnValue(interImpl);
                                 continue;
                             }
                         }
@@ -196,6 +221,7 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
                                     method.declaringClass().name());
 
                             if (genericType.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+                                registerImplicitConverter(genericType, reflectiveClasses);
                                 ResultHandle result = methodCreator.invokeInterfaceMethod(
                                         MethodDescriptor.ofMethod(Config.class, "getOptionalValue", Optional.class,
                                                 String.class,
@@ -220,6 +246,17 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
                                                 MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class),
                                                 readOptionalResponse.getValue()));
                             }
+                        } else if (ConfigPropertiesUtil.isListOfObject(method.returnType())) {
+                            if (!capabilities.isPresent(Capability.CONFIG_YAML)) {
+                                throw new DeploymentException(
+                                        "Support for List of objects in classes annotated with '@ConfigProperties' is only possible via the 'quarkus-config-yaml' extension. Offending method is '"
+                                                + method.name() + "' of interface '"
+                                                + method.declaringClass().name().toString());
+                            }
+                            ResultHandle value = yamlListObjectHandler.handle(
+                                    new YamlListObjectHandler.MethodReturnTypeMember(method), methodCreator, config,
+                                    nameAndDefaultValue.getName(), fullConfigName);
+                            methodCreator.returnValue(value);
                         } else {
                             if (defaultValueStr != null) {
                                 /*
@@ -231,6 +268,7 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
                                         .produce(new RunTimeConfigurationDefaultBuildItem(fullConfigName, defaultValueStr));
                             }
                             // use config.getValue to obtain and return the result taking  converting it to collection if needed
+                            registerImplicitConverter(returnType, reflectiveClasses);
                             ResultHandle value = createReadMandatoryValueAndConvertIfNeeded(
                                     fullConfigName, returnType,
                                     method.declaringClass().name(), methodCreator, config);
@@ -244,6 +282,8 @@ private static void generateImplementationForInterfaceConfigPropertiesRec(ClassI
                 }
             }
         }
+
+        return generatedClassName;
     }
 
     private static void collectInterfacesRec(ClassInfo current, IndexView index, Set<DotName> result) {
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java
new file mode 100644
index 0000000000000..8bfc071cc6f92
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/configproperties/YamlListObjectHandler.java
@@ -0,0 +1,246 @@
+package io.quarkus.arc.deployment.configproperties;
+
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.microprofile.config.spi.Converter;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.smallrye.config.SmallRyeConfig;
+
+/**
+ * Class used to handle all the plumbing needed to support fields with types like {@code List<SomeClass>}
+ * values for which can only be provided in YAML.
+ *
+ * The basic idea for handling these fields is to convert the string value of the field (which is SR Config
+ * populates with the "serialized" value of the field) using SnakeYAML.
+ * To achieve that various intermediate classes and Yaml configuration need to be generated.
+ */
+class YamlListObjectHandler {
+
+    private static final String ABSTRACT_YAML_CONVERTER_CNAME = "io.quarkus.config.yaml.runtime.AbstractYamlObjectConverter";
+
+    private final ClassOutput classOutput;
+    private final IndexView index;
+    private final BuildProducer<ReflectiveClassBuildItem> reflectiveClasses;
+
+    public YamlListObjectHandler(ClassOutput classOutput, IndexView index,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+        this.classOutput = classOutput;
+        this.index = index;
+        this.reflectiveClasses = reflectiveClasses;
+    }
+
+    public ResultHandle handle(Member member, MethodCreator configPopulator, ResultHandle configObject,
+            String configName, String fullConfigName) {
+        ClassInfo classInfo = validateType(member.type());
+        validateClass(classInfo, member);
+        // these need to be registered for reflection because SnakeYaml used reflection to instantiate them
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, classInfo.name().toString()));
+
+        String wrapperClassName = classInfo.name().toString() + "_GeneratedListWrapper_" + configName;
+
+        // generate a class that has a List field and getters and setter which have the proper generic type
+        // this way SnakeYaml can properly populate the field
+        MethodDescriptor getterDesc;
+        try (ClassCreator cc = ClassCreator.builder().classOutput(classOutput)
+                .className(wrapperClassName)
+                .build()) {
+            FieldDescriptor fieldDesc = cc.getFieldCreator(configName, List.class).setModifiers(Modifier.PRIVATE)
+                    .getFieldDescriptor();
+
+            MethodCreator getter = cc.getMethodCreator(JavaBeanUtil.getGetterName(configName, classInfo.name()), List.class);
+            getter.setSignature(String.format("()Ljava/util/List<L%s;>;", forSignature(classInfo)));
+            getterDesc = getter.getMethodDescriptor();
+            getter.returnValue(getter.readInstanceField(fieldDesc, getter.getThis()));
+
+            MethodCreator setter = cc.getMethodCreator(JavaBeanUtil.getSetterName(configName), void.class, List.class);
+            setter.setSignature(String.format("(Ljava/util/List<L%s;>;)V", forSignature(classInfo)));
+            setter.writeInstanceField(fieldDesc, setter.getThis(), setter.getMethodParam(0));
+            setter.returnValue(null);
+        }
+        // we always generate getters and setters, so reflection is only needed on the methods
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, wrapperClassName));
+
+        // generate an MP-Config converter which looks something like this
+        // public class GeneratedInputsConverter extends io.quarkus.config.yaml.runtime.AbstractYamlObjectConverter<SomeClass_GeneratedListWrapper_fieldName> {
+        //
+        //     @Override
+        //     Map<String, String> getFieldNameMap() {
+        //         Map<String, String> result = new HashMap<>();
+        //         result.put("some_field", "someField");
+        //         return result;
+        //     }
+        //
+        //     @Override
+        //     Class<SomeClass_GeneratedListWrapper_fieldName> getClazz() {
+        //         return SomeClass_GeneratedListWrapper_fieldName.class;
+        //     }
+        // }
+        String wrapperConverterClassName = wrapperClassName + "_Converter";
+        try (ClassCreator cc = ClassCreator.builder().classOutput(classOutput)
+                .className(wrapperConverterClassName)
+                .superClass(ABSTRACT_YAML_CONVERTER_CNAME)
+                .signature(
+                        String.format("L%s<L%s;>;", ABSTRACT_YAML_CONVERTER_CNAME.replace('.', '/'),
+                                wrapperClassName.replace('.', '/')))
+                .build()) {
+            MethodCreator getClazz = cc.getMethodCreator("getClazz", Class.class).setModifiers(Modifier.PROTECTED);
+            getClazz.returnValue(getClazz.loadClass(wrapperClassName));
+
+            // generate the getFieldNameMap method by searching for fields annotated with @ConfigProperty
+            List<AnnotationInstance> configPropertyInstances = classInfo.annotations().get(DotNames.CONFIG_PROPERTY);
+            Map<String, String> fieldNameMap = new HashMap<>();
+            if (configPropertyInstances != null) {
+                for (AnnotationInstance instance : configPropertyInstances) {
+                    if (instance.target().kind() != AnnotationTarget.Kind.FIELD) {
+                        continue;
+                    }
+                    AnnotationValue nameValue = instance.value("name");
+                    if (nameValue != null) {
+                        String nameValueStr = nameValue.asString();
+                        if ((nameValueStr != null) && !nameValueStr.isEmpty()) {
+                            String annotatedFieldName = instance.target().asField().name();
+                            fieldNameMap.put(nameValueStr, annotatedFieldName);
+                        }
+                    }
+                }
+            }
+            if (!fieldNameMap.isEmpty()) {
+                MethodCreator getFieldNameMap = cc.getMethodCreator("getFieldNameMap", Map.class);
+                ResultHandle resultHandle = getFieldNameMap.newInstance(MethodDescriptor.ofConstructor(HashMap.class));
+                for (Map.Entry<String, String> entry : fieldNameMap.entrySet()) {
+                    getFieldNameMap.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(HashMap.class, "put", Object.class, Object.class, Object.class),
+                            resultHandle, getFieldNameMap.load(entry.getKey()), getFieldNameMap.load(entry.getValue()));
+                }
+                getFieldNameMap.returnValue(resultHandle);
+            }
+        }
+
+        // use the generated converter to convert the string value into the wrapper
+        ResultHandle smallryeConfig = configPopulator.checkCast(configObject, SmallRyeConfig.class);
+        ResultHandle getValueHandle = configPopulator.invokeVirtualMethod(
+                MethodDescriptor.ofMethod(SmallRyeConfig.class, "getValue", Object.class, String.class, Converter.class),
+                smallryeConfig,
+                configPopulator.load(fullConfigName),
+                configPopulator.newInstance(MethodDescriptor.ofConstructor(wrapperConverterClassName)));
+        ResultHandle wrapperHandle = configPopulator.checkCast(getValueHandle, wrapperClassName);
+        //pull the actual value out of the wrapper
+        return configPopulator.invokeVirtualMethod(getterDesc, wrapperHandle);
+    }
+
+    private void validateClass(ClassInfo classInfo, Member member) {
+        if (Modifier.isInterface(classInfo.flags())) {
+            throw new IllegalArgumentException(
+                    "The use of interfaces as the generic type of Lists fields / methods is not allowed. Offending field is '"
+                            + member.name() + "' of class '" + member.declaringClass().name().toString() + "'");
+        }
+        if (!classInfo.hasNoArgsConstructor()) {
+            throw new IllegalArgumentException(
+                    String.format("Class '%s' which is used as %s in class '%s' must be have a no-args constructor", classInfo,
+                            member.phraseUsage(), member.declaringClass().name().toString()));
+        }
+        if (!Modifier.isPublic(classInfo.flags())) {
+            throw new IllegalArgumentException(
+                    String.format("Class '%s' which is used as %s in class '%s' must be a public class", classInfo,
+                            member.phraseUsage(), member.declaringClass().name().toString()));
+        }
+    }
+
+    private ClassInfo validateType(Type type) {
+        if (type.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+            throw new IllegalArgumentException(ILLEGAL_ARGUMENT_MESSAGE);
+        }
+        ParameterizedType parameterizedType = (ParameterizedType) type;
+        if (!DotNames.LIST.equals(parameterizedType.name())) {
+            throw new IllegalArgumentException(ILLEGAL_ARGUMENT_MESSAGE);
+        }
+        if (parameterizedType.arguments().size() != 1) {
+            throw new IllegalArgumentException(ILLEGAL_ARGUMENT_MESSAGE);
+        }
+        ClassInfo classInfo = index.getClassByName(parameterizedType.arguments().get(0).name());
+        if (classInfo == null) {
+            throw new IllegalArgumentException(ILLEGAL_ARGUMENT_MESSAGE);
+        }
+        return classInfo;
+    }
+
+    private String forSignature(ClassInfo classInfo) {
+        return classInfo.name().toString().replace('.', '/');
+    }
+
+    /**
+     * An abstraction over Field and Method which we will use in order to keep the same code for Class and Interface cases
+     */
+    static abstract class Member {
+        private final ClassInfo declaringClass;
+        private final Type type;
+        private final String name;
+
+        protected abstract String phraseUsage();
+
+        public Member(ClassInfo declaringClass, Type type, String name) {
+            this.declaringClass = declaringClass;
+            this.type = type;
+            this.name = name;
+        }
+
+        public ClassInfo declaringClass() {
+            return declaringClass;
+        }
+
+        public Type type() {
+            return type;
+        }
+
+        public String name() {
+            return name;
+        }
+    }
+
+    static class FieldMember extends Member {
+
+        public FieldMember(FieldInfo fieldInfo) {
+            super(fieldInfo.declaringClass(), fieldInfo.type(), fieldInfo.name());
+        }
+
+        @Override
+        protected String phraseUsage() {
+            return "field '" + name() + "'";
+        }
+    }
+
+    static class MethodReturnTypeMember extends Member {
+
+        public MethodReturnTypeMember(MethodInfo methodInfo) {
+            super(methodInfo.declaringClass(), methodInfo.returnType(), methodInfo.name());
+        }
+
+        @Override
+        protected String phraseUsage() {
+            return "return type of method '" + name() + "'";
+        }
+    }
+
+    private static final String ILLEGAL_ARGUMENT_MESSAGE = "YamlListObjectHandler can only be used for fields / methods that are of type 'List<SomeClass>' where 'SomeClass' is an application class";
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanInfo.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanInfo.java
new file mode 100644
index 0000000000000..85809f19c0bbd
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanInfo.java
@@ -0,0 +1,140 @@
+package io.quarkus.arc.deployment.devconsole;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationTarget.Kind;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+import io.quarkus.arc.deployment.CompletedApplicationClassPredicateBuildItem;
+import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.DotNames;
+
+public class DevBeanInfo implements Comparable<DevBeanInfo> {
+
+    public static DevBeanInfo from(BeanInfo bean, CompletedApplicationClassPredicateBuildItem predicate) {
+        Set<Name> qualifiers = new HashSet<>();
+        for (AnnotationInstance qualifier : bean.getQualifiers()) {
+            qualifiers.add(Name.from(qualifier));
+        }
+        Set<Name> types = new HashSet<>();
+        for (Type beanType : bean.getTypes()) {
+            types.add(Name.from(beanType));
+        }
+        Name scope = Name.from(bean.getScope().getDotName());
+        Name providerType = Name.from(bean.getProviderType());
+
+        if (bean.getTarget().isPresent()) {
+            AnnotationTarget target = bean.getTarget().get();
+            DevBeanKind kind;
+            String memberName;
+            boolean isApplicationBean;
+            Name declaringClass;
+            if (target.kind() == Kind.METHOD) {
+                MethodInfo method = target.asMethod();
+                memberName = method.name();
+                kind = DevBeanKind.METHOD;
+                isApplicationBean = predicate.test(bean.getDeclaringBean().getBeanClass());
+                declaringClass = Name.from(bean.getDeclaringBean().getBeanClass());
+            } else if (target.kind() == Kind.FIELD) {
+                FieldInfo field = target.asField();
+                memberName = field.name();
+                kind = DevBeanKind.FIELD;
+                isApplicationBean = predicate.test(bean.getDeclaringBean().getBeanClass());
+                declaringClass = Name.from(bean.getDeclaringBean().getBeanClass());
+            } else if (target.kind() == Kind.CLASS) {
+                ClassInfo clazz = target.asClass();
+                kind = DevBeanKind.CLASS;
+                memberName = null;
+                isApplicationBean = predicate.test(clazz.name());
+                declaringClass = null;
+            } else {
+                throw new IllegalArgumentException("Invalid annotation target: " + target);
+            }
+            return new DevBeanInfo(kind, isApplicationBean, providerType, memberName, types, qualifiers, scope, declaringClass);
+        } else {
+            // Synthetic bean
+            return new DevBeanInfo(DevBeanKind.SYNTHETIC, false, providerType, null, types, qualifiers, scope, null);
+        }
+    }
+
+    public DevBeanInfo(DevBeanKind kind, boolean isApplicationBean, Name providerType, String memberName, Set<Name> types,
+            Set<Name> qualifiers, Name scope, Name declaringClass) {
+        this.kind = kind;
+        this.isApplicationBean = isApplicationBean;
+        this.providerType = providerType;
+        this.memberName = memberName;
+        this.types = types;
+        this.qualifiers = qualifiers;
+        this.scope = scope;
+        this.declaringClass = declaringClass;
+    }
+
+    private final DevBeanKind kind;
+    private final boolean isApplicationBean;
+    private final Name providerType;
+    private final String memberName;
+    private final Set<Name> types;
+    private final Set<Name> qualifiers;
+    private final Name scope;
+    private final Name declaringClass;
+
+    public DevBeanKind getKind() {
+        return kind;
+    }
+
+    public Name getScope() {
+        return scope;
+    }
+
+    public Set<Name> getQualifiers() {
+        return qualifiers;
+    }
+
+    public Set<Name> getNonDefaultQualifiers() {
+        Set<Name> nonDefault = new HashSet<>();
+        String atDefault = DotNames.DEFAULT.toString();
+        String atAny = DotNames.ANY.toString();
+        for (Name qualifier : qualifiers) {
+            if (qualifier.toString().endsWith(atDefault) || qualifier.toString().endsWith(atAny)) {
+                continue;
+            }
+            nonDefault.add(qualifier);
+        }
+        return nonDefault;
+    }
+
+    public Set<Name> getTypes() {
+        return types;
+    }
+
+    public Name getProviderType() {
+        return providerType;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public boolean isApplicationBean() {
+        return isApplicationBean;
+    }
+
+    public Name getDeclaringClass() {
+        return declaringClass;
+    }
+
+    @Override
+    public int compareTo(DevBeanInfo o) {
+        // Application beans should go first
+        if (isApplicationBean == o.isApplicationBean) {
+            return providerType.compareTo(o.providerType);
+        }
+        return isApplicationBean ? -1 : 1;
+    }
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanInfos.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanInfos.java
new file mode 100644
index 0000000000000..e9e7b6200de8e
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanInfos.java
@@ -0,0 +1,48 @@
+package io.quarkus.arc.deployment.devconsole;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class DevBeanInfos {
+
+    private final List<DevBeanInfo> beans;
+    private final List<DevBeanInfo> removedBeans;
+    private final List<DevObserverInfo> observers;
+
+    public DevBeanInfos() {
+        beans = new ArrayList<>();
+        removedBeans = new ArrayList<>();
+        observers = new ArrayList<>();
+    }
+
+    public List<DevBeanInfo> getRemovedBeans() {
+        return removedBeans;
+    }
+
+    public List<DevBeanInfo> getBeans() {
+        return beans;
+    }
+
+    public List<DevObserverInfo> getObservers() {
+        return observers;
+    }
+
+    void addBean(DevBeanInfo beanInfo) {
+        beans.add(beanInfo);
+    }
+
+    void addRemovedBean(DevBeanInfo beanInfo) {
+        removedBeans.add(beanInfo);
+    }
+
+    void addObserver(DevObserverInfo observer) {
+        observers.add(observer);
+    }
+
+    void sort() {
+        Collections.sort(beans);
+        Collections.sort(removedBeans);
+        Collections.sort(observers);
+    }
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanKind.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanKind.java
new file mode 100644
index 0000000000000..e87ac408df65d
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevBeanKind.java
@@ -0,0 +1,8 @@
+package io.quarkus.arc.deployment.devconsole;
+
+public enum DevBeanKind {
+    METHOD,
+    FIELD,
+    CLASS,
+    SYNTHETIC;
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevConsoleProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..f3235148f9b98
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,118 @@
+package io.quarkus.arc.deployment.devconsole;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.ArcConfig;
+import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.arc.deployment.CompletedApplicationClassPredicateBuildItem;
+import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
+import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.BeanDeploymentValidator;
+import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.BuildExtension;
+import io.quarkus.arc.processor.ObserverInfo;
+import io.quarkus.arc.runtime.ArcContainerSupplier;
+import io.quarkus.arc.runtime.ArcRecorder;
+import io.quarkus.arc.runtime.BeanLookupSupplier;
+import io.quarkus.arc.runtime.devconsole.EventsMonitor;
+import io.quarkus.arc.runtime.devconsole.InvocationInterceptor;
+import io.quarkus.arc.runtime.devconsole.InvocationTree;
+import io.quarkus.arc.runtime.devconsole.InvocationsMonitor;
+import io.quarkus.arc.runtime.devconsole.Monitored;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    public DevConsoleRuntimeTemplateInfoBuildItem exposeArcContainer(ArcRecorder recorder) {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("arcContainer",
+                new ArcContainerSupplier());
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void monitor(ArcConfig config, BuildProducer<DevConsoleRuntimeTemplateInfoBuildItem> runtimeInfos,
+            BuildProducer<AdditionalBeanBuildItem> beans, BuildProducer<AnnotationsTransformerBuildItem> annotationTransformers,
+            CustomScopeAnnotationsBuildItem customScopes,
+            List<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) {
+        if (!config.devMode.monitoringEnabled) {
+            return;
+        }
+        if (!config.transformUnproxyableClasses) {
+            throw new IllegalStateException(
+                    "Dev UI problem: monitoring of CDI business method invocations not possible\n\t- quarkus.arc.transform-unproxyable-classes was set to false and therefore it would not be possible to apply interceptors to unproxyable bean classes\n\t- please disable the monitoring feature via quarkus.arc.dev-mode.monitoring-enabled=false or enable unproxyable classes transformation");
+        }
+        // Events
+        runtimeInfos.produce(
+                new DevConsoleRuntimeTemplateInfoBuildItem("eventsMonitor",
+                        new BeanLookupSupplier(EventsMonitor.class)));
+        beans.produce(AdditionalBeanBuildItem.unremovableOf(EventsMonitor.class));
+        // Invocations
+        beans.produce(AdditionalBeanBuildItem.builder().setUnremovable()
+                .addBeanClasses(InvocationTree.class, InvocationsMonitor.class, InvocationInterceptor.class,
+                        Monitored.class)
+                .build());
+        Set<DotName> skipNames = new HashSet<>();
+        skipNames.add(DotName.createSimple(InvocationTree.class.getName()));
+        skipNames.add(DotName.createSimple(InvocationsMonitor.class.getName()));
+        skipNames.add(DotName.createSimple(EventsMonitor.class.getName()));
+        annotationTransformers.produce(new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
+            @Override
+            public void transform(TransformationContext transformationContext) {
+                if (transformationContext.isClass()) {
+                    ClassInfo beanClass = transformationContext.getTarget().asClass();
+                    if ((customScopes.isScopeDeclaredOn(beanClass)
+                            || isAdditionalBeanDefiningAnnotationOn(beanClass, beanDefiningAnnotations))
+                            && !skipNames.contains(beanClass.name())) {
+                        transformationContext.transform().add(Monitored.class).done();
+                    }
+                }
+            }
+        }));
+        runtimeInfos.produce(new DevConsoleRuntimeTemplateInfoBuildItem("invocationsMonitor",
+                new BeanLookupSupplier(InvocationsMonitor.class)));
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleTemplateInfoBuildItem collectBeanInfo(ValidationPhaseBuildItem validationPhaseBuildItem,
+            CompletedApplicationClassPredicateBuildItem predicate) {
+        BeanDeploymentValidator.ValidationContext validationContext = validationPhaseBuildItem.getContext();
+        DevBeanInfos beanInfos = new DevBeanInfos();
+        for (BeanInfo beanInfo : validationContext.beans()) {
+            beanInfos.addBean(DevBeanInfo.from(beanInfo, predicate));
+        }
+        for (BeanInfo beanInfo : validationContext.removedBeans()) {
+            beanInfos.addRemovedBean(DevBeanInfo.from(beanInfo, predicate));
+        }
+        for (ObserverInfo observerInfo : validationContext.get(BuildExtension.Key.OBSERVERS)) {
+            beanInfos.addObserver(DevObserverInfo.from(observerInfo, predicate));
+        }
+        beanInfos.sort();
+        return new DevConsoleTemplateInfoBuildItem("devBeanInfos", beanInfos);
+    }
+
+    private boolean isAdditionalBeanDefiningAnnotationOn(ClassInfo beanClass,
+            List<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) {
+        for (BeanDefiningAnnotationBuildItem beanDefiningAnnotation : beanDefiningAnnotations) {
+            if (beanClass.classAnnotation(beanDefiningAnnotation.getName()) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java
new file mode 100644
index 0000000000000..d09374728e023
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/DevObserverInfo.java
@@ -0,0 +1,120 @@
+package io.quarkus.arc.deployment.devconsole;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.enterprise.event.Reception;
+import javax.enterprise.event.TransactionPhase;
+
+import io.quarkus.arc.deployment.CompletedApplicationClassPredicateBuildItem;
+import io.quarkus.arc.processor.ObserverInfo;
+
+public class DevObserverInfo implements Comparable<DevObserverInfo> {
+
+    public static DevObserverInfo from(ObserverInfo observer, CompletedApplicationClassPredicateBuildItem predicate) {
+        List<Name> qualifiers;
+        if (observer.getQualifiers().isEmpty()) {
+            qualifiers = Collections.emptyList();
+        } else {
+            qualifiers = observer.getQualifiers().stream().map(Name::from).collect(Collectors.toList());
+        }
+        if (observer.getDeclaringBean() != null) {
+            return new DevObserverInfo(predicate.test(observer.getObserverMethod().declaringClass().name()),
+                    Name.from(observer.getObserverMethod().declaringClass().name()), observer.getObserverMethod().name(),
+                    Name.from(observer.getObservedType()), qualifiers, observer.getPriority(), observer.isAsync(),
+                    observer.getReception(), observer.getTransactionPhase());
+        } else {
+            return new DevObserverInfo(false, null, null, Name.from(observer.getObservedType()), qualifiers,
+                    observer.getPriority(), observer.isAsync(), observer.getReception(), observer.getTransactionPhase());
+        }
+    }
+
+    private final boolean isApplicationObserver;
+    private final Name declaringClass;
+    private final String methodName;
+    private final Name observedType;
+    private List<Name> qualifiers;
+    private final int priority;
+    private final boolean isAsync;
+    private final Reception reception;
+    private final TransactionPhase transactionPhase;
+
+    public DevObserverInfo(boolean isApplicationObserver, Name declaringClass, String methodName, Name observedType,
+            List<Name> qualifiers, int priority, boolean isAsync, Reception reception, TransactionPhase transactionPhase) {
+        this.isApplicationObserver = isApplicationObserver;
+        this.declaringClass = declaringClass;
+        this.methodName = methodName;
+        this.observedType = observedType;
+        this.qualifiers = qualifiers;
+        this.priority = priority;
+        this.isAsync = isAsync;
+        this.reception = reception;
+        this.transactionPhase = transactionPhase;
+    }
+
+    public Name getDeclaringClass() {
+        return declaringClass;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public Name getObservedType() {
+        return observedType;
+    }
+
+    public List<Name> getQualifiers() {
+        return qualifiers;
+    }
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public boolean isAsync() {
+        return isAsync;
+    }
+
+    public Reception getReception() {
+        return reception;
+    }
+
+    public TransactionPhase getTransactionPhase() {
+        return transactionPhase;
+    }
+
+    public boolean isApplicationObserver() {
+        return isApplicationObserver;
+    }
+
+    @Override
+    public int compareTo(DevObserverInfo other) {
+        // Application observers should go first
+        int ret = 0;
+        if (isApplicationObserver != other.isApplicationObserver) {
+            ret = isApplicationObserver ? -1 : 1;
+        } else {
+            // Note that declaringClass and methodName are null for synthetic observers
+            if (declaringClass == null && other.declaringClass == null) {
+                // Synthetic observers
+                ret = observedType.compareTo(other.observedType);
+            } else {
+                // At this point we can be sure that at least one of the observers is not synthetic
+                if (declaringClass == null && other.declaringClass != null) {
+                    ret = 1;
+                } else if (declaringClass != null && other.declaringClass == null) {
+                    ret = -1;
+                } else {
+                    ret = declaringClass.compareTo(other.declaringClass);
+                }
+                if (ret == 0) {
+                    // Observers are not synthetic - method name must be present 
+                    ret = methodName.compareTo(other.methodName);
+                }
+            }
+        }
+        return ret;
+    }
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java
new file mode 100644
index 0000000000000..828c49f7ccb4e
--- /dev/null
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devconsole/Name.java
@@ -0,0 +1,112 @@
+package io.quarkus.arc.deployment.devconsole;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+
+public class Name implements Comparable<Name> {
+
+    public static Name from(DotName dotName) {
+        return new Name(dotName.toString(), dotName.withoutPackagePrefix());
+    }
+
+    public static Name from(Type type) {
+        return new Name(type.toString(), createSimpleName(type));
+    }
+
+    public static Name from(AnnotationInstance annotation) {
+        return new Name(annotation.toString(false), createSimple(annotation));
+    }
+
+    private final String name;
+    private final String simpleName;
+
+    private Name(String name, String simpleName) {
+        this.name = Objects.requireNonNull(name);
+        this.simpleName = simpleName;
+    }
+
+    public Name(String name) {
+        this(name, null);
+    }
+
+    public String getSimpleName() {
+        return simpleName != null ? simpleName : name;
+    }
+
+    static String createSimpleName(Type type) {
+        switch (type.kind()) {
+            case CLASS:
+                return createSimple(type.name().toString());
+            case PARAMETERIZED_TYPE:
+                return createSimple(type.asParameterizedType());
+            case ARRAY:
+                Type component = type.asArrayType().component();
+                if (component.kind() == Kind.CLASS) {
+                    return createSimple(type.toString());
+                }
+            default:
+                return null;
+        }
+    }
+
+    static String createSimple(String name) {
+        int lastDot = name.lastIndexOf('.');
+        if (lastDot != -1) {
+            return name.substring(lastDot + 1);
+        }
+        return name;
+    }
+
+    static String createSimple(ParameterizedType parameterizedType) {
+        StringBuilder builder = new StringBuilder();
+        builder.append(createSimple(parameterizedType.name().toString()));
+        List<Type> args = parameterizedType.arguments();
+        if (!args.isEmpty()) {
+            builder.append('<');
+            for (Iterator<Type> it = args.iterator(); it.hasNext();) {
+                builder.append(createSimpleName(it.next()));
+                if (it.hasNext()) {
+                    builder.append(", ");
+                }
+            }
+            builder.append('>');
+        }
+        return builder.toString();
+    }
+
+    static String createSimple(AnnotationInstance annotation) {
+        StringBuilder builder = new StringBuilder("@").append(createSimple(annotation.name().toString()));
+        List<AnnotationValue> values = annotation.values();
+        if (!values.isEmpty()) {
+            builder.append("(");
+            for (Iterator<AnnotationValue> it = values.iterator(); it.hasNext();) {
+                builder.append(it.next());
+                if (it.hasNext()) {
+                    builder.append(",");
+                }
+            }
+            builder.append(')');
+        }
+
+        return builder.toString();
+    }
+
+    @Override
+    public int compareTo(Name other) {
+        return name.compareTo(other.name);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+}
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java
index f970b233e64e2..d04f45d0b6989 100644
--- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java
+++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/staticmethods/InterceptedStaticMethodsProcessor.java
@@ -170,12 +170,13 @@ void processInterceptedStaticMethods(BeanArchiveIndexBuildItem beanArchiveIndex,
         String initAllMethodName = "init_static_intercepted_methods";
         for (Entry<DotName, List<InterceptedStaticMethodBuildItem>> entry : interceptedStaticMethodsMap.entrySet()) {
 
-            String packageName = DotNames.packageName(entry.getKey());
-            String intializerName = packageName + "." + entry.getKey().withoutPackagePrefix() + INITIALIZER_CLASS_SUFFIX;
+            String packageName = DotNames.internalPackageNameWithTrailingSlash(entry.getKey());
+            String intializerName = packageName.replace("/", ".") + entry.getKey().withoutPackagePrefix()
+                    + INITIALIZER_CLASS_SUFFIX;
             initializers.put(entry.getKey(), intializerName);
 
             ClassCreator initializer = ClassCreator.builder().classOutput(classOutput)
-                    .className(intializerName.replace('.', '/')).setFinal(true).build();
+                    .className(intializerName).setFinal(true).build();
 
             List<String> initMethods = new ArrayList<>();
             for (InterceptedStaticMethodBuildItem interceptedStaticMethod : entry.getValue()) {
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/beans.html b/extensions/arc/deployment/src/main/resources/dev-templates/beans.html
new file mode 100644
index 0000000000000..e00309161893b
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/beans.html
@@ -0,0 +1,61 @@
+{#include main}
+  {#style}
+   .annotation {
+     color: gray;
+     font-style: italic;
+   }
+   span.larger-badge {
+     font-size: 0.9em;
+   }
+   span.app-class {
+     cursor:pointer;
+     color:blue;
+     text-decoration:underline;
+   }
+
+  {/style}
+
+  {#script}
+    $(document).ready(function(){
+      if (!ideKnown()) {
+        return;
+      }
+      $(".class-candidate").each(function() {
+        var className = $(this).text();
+        if (appClassLang(className)) {
+          $(this).addClass("app-class");
+        }
+      });
+
+      $(".app-class").on("click", function() {
+        openInIDE($(this).text());
+      });
+    });
+
+  {/script}
+
+  {#title}Beans{/title}
+  {#body}
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Bean</th>
+      <th scope="col">Kind</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#for bean in info:devBeanInfos.beans}
+    <tr>
+      <td>{count}.</td>
+      <td>
+       {#display-bean bean/}
+      </td>
+      <td>
+       {#bean-declaration bean/}
+      </td>
+    {/for}
+   </tbody>
+  </table>
+  {/body}
+{/include}
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/embedded.html b/extensions/arc/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..dd2fe654bde0d
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,21 @@
+<a href="{urlbase}/beans" class="badge badge-light">
+  <i class="fa fa-egg fa-fw"></i>
+  Beans <span class="badge badge-light">{info:devBeanInfos.beans.size}</span></a>
+<br>
+<a href="{urlbase}/observers" class="badge badge-light">
+  <i class="fa fa-eye fa-fw"></i>
+  Observers <span class="badge badge-light">{info:arcContainer.observers.size}</span></a>
+<br>
+{#if config:property('quarkus.arc.dev-mode.monitoring-enabled') is "true"}
+<a href="{urlbase}/events" class="badge badge-light">
+  <i class="far fa-eye"></i>
+  Fired Events</a>
+<br>
+<a href="{urlbase}/invocations" class="badge badge-light">
+  <i class="fas fa-project-diagram"></i>
+  Invocation Trees</a>
+<br>
+{/if}
+<a href="{urlbase}/removed-beans" class="badge badge-light">
+  <i class="fa fa-trash-alt fa-fw"></i>
+  Removed Beans <span class="badge badge-light">{info:arcContainer.removedBeans.size}</span></a>
\ No newline at end of file
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/events.html b/extensions/arc/deployment/src/main/resources/dev-templates/events.html
new file mode 100644
index 0000000000000..e7d62ddc3fda1
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/events.html
@@ -0,0 +1,63 @@
+{#include main fluid=true}
+  {#style}
+   .nav-item {
+     padding: .5rem .3rem;
+   }
+  {/style}  
+  {#title}Fired Events{/title}
+  {#body}
+  <ul class="nav">
+    <li class="nav-item">
+        <input id="clear" type="submit" class="btn btn-primary btn-sm" value="Refresh"
+            onClick="window.location.reload();">
+    </li>
+    <li class="nav-item">
+        <form method="post" enctype="application/x-www-form-urlencoded" class="form-inline">
+            <input id="clear" type="submit" class="btn btn-primary btn-sm" value="Clear">
+        </form>
+    </li>
+    <li class="nav-item">
+        <form method="post" enctype="application/x-www-form-urlencoded" class="form-inline">
+            <input id="skipContextsCheck" type="checkbox" class="form-check-input" disabled{#if info:eventsMonitor.skipContextEvents} checked{/if}>
+      <label for="skipContextsCheck">Skip context lifecycle events</label>
+      <input type="hidden" name="action" value="skipContext">
+      &nbsp;
+      <input id="toggle" type="submit" class="btn btn-primary btn-sm" value="Toggle">
+    </form>
+    </li>
+  </ul>
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">Timestamp <i class="fas fa-caret-down"></i></th>
+      <th scope="col">Event Type</th>
+      <th scope="col">Qualifiers</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#for event in info:eventsMonitor.lastEvents.orEmpty}
+    <tr>
+      <td>
+       {event.timestamp}
+      </td>
+      <td>
+        {event.type}
+      </td>
+      <td>
+       {#when event.qualifiers.size}
+         {#is 1}
+            <code>{event.qualifiers.iterator.next}</code>
+         {#is > 1}
+            <ul>
+            {#for q in event.qualifiers}
+              <li>{q}</li>
+            {/for}
+            </ul>
+       {/when}
+       </td>
+      </tr>
+    {/for}
+   </tbody>
+  </table>
+ {/body}
+{/include}
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/invocations.html b/extensions/arc/deployment/src/main/resources/dev-templates/invocations.html
new file mode 100644
index 0000000000000..320bf44699109
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/invocations.html
@@ -0,0 +1,91 @@
+{#include main fluid=true}
+  {#style}
+   .nav-item {
+     padding: .5rem .3rem;
+   }
+   ul#tree, ul.nested {
+     list-style-type: none;
+   }
+   #tree {
+     margin: 0;
+     padding: 0;
+   }
+   span.caret {
+      cursor: pointer;
+      user-select: none;
+   }
+   span.caret::before {
+     content: "\229E";
+     color: black;
+     display: inline-block;
+     margin-right: 6px;
+   }
+   span.caret-down::before {
+     content: "\229F"
+     /*transform: rotate(90deg);*/ 
+   }
+   ul.nested {
+     display: none;
+   }
+   ul.active {
+     display: block;
+   }
+   ul code {
+     color: #343a40; 
+   }
+   ul li {
+     margin-top: 5px; 
+   }
+   span.declaring-class {
+     color: gray;
+   }
+  {/style}  
+  {#script}
+  var carets = document.getElementsByClassName("caret");
+  for (i = 0; i < carets.length; i++) {
+    carets[i].addEventListener("click", function() {
+      this.parentElement.querySelector(".nested").classList.toggle("active");
+      this.classList.toggle("caret-down");
+    });
+  } 
+  {/script}
+  {#title}Invocation Trees{/title}
+  {#body}
+  <ul class="nav">
+    <li class="nav-item">
+        <input type="submit" class="btn btn-primary btn-sm" value="Refresh"
+            onClick="window.location.reload();">
+    </li>
+    <li class="nav-item">
+        <form method="post" enctype="application/x-www-form-urlencoded" class="form-inline">
+            <button type="submit" class="btn btn-primary btn-sm">Clear</button>
+        </form>
+    </li>
+    <li class="nav-item">
+        <form method="post" enctype="application/x-www-form-urlencoded" class="form-inline">
+        <input id="filterOutQuarkusBeans" type="checkbox" class="form-check-input" disabled{#if info:invocationsMonitor.filterOutQuarkusBeans} checked{/if}>
+        <label for="filterOutQuarkusBeans">Filter out Quarkus beans</label>
+        <input type="hidden" name="action" value="filterOutQuarkusBeans">
+        &nbsp;
+        <input id="toggle" type="submit" class="btn btn-primary btn-sm" value="Toggle">
+    </form>
+    </li>
+  </ul>
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">Start <i class="fas fa-caret-down"></i></th>
+      <th scope="col" style="width:80%;">Invocations</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#each info:invocationsMonitor.lastInvocations.orEmpty}
+    <tr>
+      <td>{it.startFormatted}</td>
+      <td><ul id="tree">{#tree it root=true /}</ul></td>
+      </tr>
+    {/each}
+   </tbody>
+  </table>
+ {/body}
+{/include}
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/observers.html b/extensions/arc/deployment/src/main/resources/dev-templates/observers.html
new file mode 100644
index 0000000000000..b378d9a7f56bf
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/observers.html
@@ -0,0 +1,59 @@
+{#include main fluid=true}
+   {#style}
+   .annotation {
+     color: gray;
+     font-style: italic;
+   }
+   span.larger-badge {
+     font-size: 0.9em;
+   }
+  {/style}
+  {#title}Observers{/title}
+  {#body}
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Source</th>
+      <th scope="col">Observed Type/Qualifiers</th>
+      <th scope="col">Priority</th>
+      <th scope="col">Reception</th>
+      <th scope="col">Transaction Phase</th>
+      <th scope="col">Async</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#for observer in info:devBeanInfos.observers}
+    <tr>
+      <td>{count}.</td>
+      <td>
+       {#if observer.declaringClass}
+       {observer.declaringClass}#{observer.methodName}()
+       {#else}
+       <span class="badge badge-secondary larger-badge">Synthetic</span>
+       {/if}
+      </td>
+      <td>
+       {#each observer.qualifiers}
+        <span title="{it}" class="annotation"><i>{it.simpleName}</i> </span>
+       {/each}
+       {observer.observedType}
+      </td>
+      <td>
+       {observer.priority}
+      </td>
+      <td>
+       {observer.reception}
+      </td>
+      <td>
+       {observer.transactionPhase}
+      </td>
+      <td>
+       {observer.async}
+      </td>
+     </tr>
+    {/for}
+   </tbody>
+  </table>
+ {/body}
+{/include}
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/removed-beans.html b/extensions/arc/deployment/src/main/resources/dev-templates/removed-beans.html
new file mode 100644
index 0000000000000..9cae8bf25ac30
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/removed-beans.html
@@ -0,0 +1,35 @@
+{#include main}
+  {#style}
+   .annotation {
+     color: gray;
+     font-style: italic;
+   }
+   span.larger-badge {
+     font-size: 0.9em;
+   }
+  {/style}
+  {#title}Removed Beans{/title}
+  {#body}
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Bean</th>
+      <th scope="col">Kind</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#for bean in info:devBeanInfos.removedBeans}
+    <tr>
+      <td>{count}.</td>
+      <td>
+       {#display-bean bean/}
+      </td>
+      <td>
+       {#bean-declaration bean/}
+      </td>
+    {/for}
+   </tbody>
+  </table>
+ {/body}
+{/include}
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/tags/bean-declaration.html b/extensions/arc/deployment/src/main/resources/dev-templates/tags/bean-declaration.html
new file mode 100644
index 0000000000000..473affc152f1b
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/tags/bean-declaration.html
@@ -0,0 +1,10 @@
+{#switch it.kind}
+  {#case METHOD}
+  <span class="badge badge-success larger-badge">Producer method</span><br><code><span title="{it.declaringClass}">{it.declaringClass.simpleName}</span>.{it.memberName}()</code>
+  {#case FIELD}
+  <span class="badge badge-success larger-badge">Producer field</span><br><code><span title="{it.declaringClass}">{it.declaringClass.simpleName}</span>.{it.memberName}</code>
+  {#case CLASS}
+  <span class="badge badge-primary larger-badge">Class</span>
+  {#else}
+  <span class="badge badge-secondary larger-badge">Synthetic</span>
+{/switch}
\ No newline at end of file
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/tags/display-bean.html b/extensions/arc/deployment/src/main/resources/dev-templates/tags/display-bean.html
new file mode 100644
index 0000000000000..a29c121a90abb
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/tags/display-bean.html
@@ -0,0 +1,5 @@
+<span class="annotation" title="Scope: {it.scope}">@{it.scope.simpleName}</span><br/>
+{#for q in it.nonDefaultQualifiers}
+<span class="annotation" title="Qualifier: {q}">{q.simpleName}</span><br/>
+{/for}
+<span class="class-candidate">{it.providerType}</span>
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/tags/duration.html b/extensions/arc/deployment/src/main/resources/dev-templates/tags/duration.html
new file mode 100644
index 0000000000000..adb73e72277ab
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/tags/duration.html
@@ -0,0 +1,3 @@
+<span class="badge badge-info"{#if it.durationMillis le 0} title="{it.duration} ns"{/if}>
+  {#if it.durationMillis > 0}{it.durationMillis} ms{#else}&lt; 1 ms{/if}
+</span>
\ No newline at end of file
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/tags/kind.html b/extensions/arc/deployment/src/main/resources/dev-templates/tags/kind.html
new file mode 100644
index 0000000000000..078a39546f5be
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/tags/kind.html
@@ -0,0 +1,8 @@
+{#when it.kind}
+  {#is PRODUCER}
+<span class="badge badge-success">Producer</span>
+  {#is DISPOSER}
+<span class="badge badge-warning">Disposer</span>
+  {#is OBSERVER}
+<span class="badge badge-secondary">Observer</span>  
+{/when}
\ No newline at end of file
diff --git a/extensions/arc/deployment/src/main/resources/dev-templates/tags/tree.html b/extensions/arc/deployment/src/main/resources/dev-templates/tags/tree.html
new file mode 100644
index 0000000000000..211f0446aaa4f
--- /dev/null
+++ b/extensions/arc/deployment/src/main/resources/dev-templates/tags/tree.html
@@ -0,0 +1,15 @@
+<li>
+{#if !root}
+{#if next}├─{#else}└─{/if}
+{/if}
+{#if it.children}
+<span class="caret declaring-class">{it.declaringClassName}#</span>{it.method.name}() {#duration it /}{#kind it /}{#if it.message != null} <span class="badge badge-danger" title="Exception message: {it.message}">Error</span>{/if}
+<ul class="nested">
+{#each it.children}
+{#tree it root=false next=hasNext /}
+{/each}
+</ul>
+{#else}
+<span class="declaring-class">{it.declaringClassName}#</span>{it.method.name}() {#duration it /}{#kind it /}{#if it.message != null} <span class="badge badge-danger" title="Exception message: {it.message}">Error</span>{/if}
+{/if}
+</li>
\ No newline at end of file
diff --git a/extensions/arc/deployment/src/test/java/B.java b/extensions/arc/deployment/src/test/java/B.java
new file mode 100644
index 0000000000000..5194ebda21cdd
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/B.java
@@ -0,0 +1,21 @@
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@ApplicationScoped
+public class B {
+
+    @Inject
+    @ConfigProperty(name = "simpleBean.baz")
+    Optional<String> bazOptional;
+
+    @ActivateRequestContext
+    String ping() {
+        return bazOptional.orElse("bang!");
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/C.java b/extensions/arc/deployment/src/test/java/C.java
new file mode 100644
index 0000000000000..aa51f51320b50
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/C.java
@@ -0,0 +1,17 @@
+import javax.inject.Inject;
+
+@javax.inject.Singleton
+public class C {
+
+    private B b;
+
+    @Inject
+    void setB(B b) {
+        this.b = b;
+    }
+
+    String ping() {
+        return b.ping();
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/L.java b/extensions/arc/deployment/src/test/java/L.java
new file mode 100644
index 0000000000000..f385d890d5113
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/L.java
@@ -0,0 +1,14 @@
+@javax.inject.Singleton
+public class L {
+
+    private final C c;
+
+    L(C c) {
+        this.c = c;
+    }
+
+    String ping() {
+        return c.ping();
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java b/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java
new file mode 100644
index 0000000000000..a1bb0783b04b7
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/SingleLetterDefaultPackageTest.java
@@ -0,0 +1,37 @@
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SingleLetterDefaultPackageTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(B.class, C.class, L.class)
+                    .addAsResource(new StringAsset("simpleBean.baz=1"), "application.properties"));
+
+    @Inject
+    B b;
+
+    @Inject
+    C c;
+
+    @Inject
+    L l;
+
+    @Test
+    public void testB() {
+        assertEquals("1", b.ping());
+        assertEquals(c.ping(), b.ping());
+        assertEquals(l.ping(), b.ping());
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java
index 56bec4d7ea3b4..c4cc4fa6ce2c3 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoproduces/AutoProducerMethodTest.java
@@ -79,6 +79,11 @@ List<String> strings() {
             return Collections.emptyList();
         }
 
+        // void methods should be ignored
+        @MyQualifier
+        void ignored() {
+        }
+
     }
 
     @Qualifier
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValuesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValuesTest.java
new file mode 100644
index 0000000000000..5ff2078ff58d5
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValuesTest.java
@@ -0,0 +1,66 @@
+package io.quarkus.arc.test.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ConfigDefaultValuesTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(
+                            "config_ordinal=1000\n" +
+                                    "my.prop=1234\n" +
+                                    "%prod.my.prop=1234\n" +
+                                    "%dev.my.prop=5678\n" +
+                                    "%test.my.prop=1234"),
+                            "application.properties"));
+    @Inject
+    Config config;
+
+    @Test
+    void configDefaultValues() {
+        ConfigSource defaultValues = getConfigSourceByName("PropertiesConfigSource[source=Specified default values]");
+        assertNotNull(defaultValues);
+        assertEquals(Integer.MIN_VALUE + 100, defaultValues.getOrdinal());
+
+        // Should be the first
+        ConfigSource applicationProperties = config.getConfigSources().iterator().next();
+        assertNotNull(applicationProperties);
+        assertEquals(1000, applicationProperties.getOrdinal());
+
+        assertEquals("1234", defaultValues.getValue("my.prop"));
+        assertEquals("1234", applicationProperties.getValue("my.prop"));
+    }
+
+    @Test
+    void profileDefaultValues() {
+        ConfigSource defaultValues = getConfigSourceByName("PropertiesConfigSource[source=Specified default values]");
+        assertNotNull(defaultValues);
+        assertEquals("1234", defaultValues.getValue("my.prop"));
+        assertEquals("1234", defaultValues.getValue("%prod.my.prop"));
+        assertEquals("5678", defaultValues.getValue("%dev.my.prop"));
+        assertEquals("1234", defaultValues.getValue("%test.my.prop"));
+        assertEquals("1234", config.getValue("my.prop", String.class));
+    }
+
+    private ConfigSource getConfigSourceByName(String name) {
+        for (ConfigSource configSource : config.getConfigSources()) {
+            if (configSource.getName().contains(name)) {
+                return configSource;
+            }
+        }
+        return null;
+    }
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java
new file mode 100644
index 0000000000000..8620e9ebbc4e5
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java
@@ -0,0 +1,293 @@
+package io.quarkus.arc.test.config;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.StreamSupport.stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.stream.Stream;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.spi.Converter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.ConfigValue;
+import io.smallrye.config.SmallRyeConfig;
+import io.smallrye.config.WithConverter;
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithName;
+import io.smallrye.config.WithParentName;
+
+public class ConfigMappingTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("config.my.prop=1234\n" +
+                            "group.host=localhost\n" +
+                            "group.port=8080\n" +
+                            "types.int=9\n" +
+                            "types.long=9999999999\n" +
+                            "types.float=99.9\n" +
+                            "types.double=99.99\n" +
+                            "types.char=c\n" +
+                            "types.boolean=true\n" +
+                            "types.value=1234\n" +
+                            "optionals.server.host=localhost\n" +
+                            "optionals.server.port=8080\n" +
+                            "optionals.optional=optional\n" +
+                            "optionals.optional.int=9\n" +
+                            "collections.strings=foo,bar\n" +
+                            "collections.ints=1,2,3\n" +
+                            "maps.server.host=localhost\n" +
+                            "maps.server.port=8080\n" +
+                            "maps.group.server.host=localhost\n" +
+                            "maps.group.server.port=8080\n" +
+                            "converters.foo=notbar\n" +
+                            "override.server.host=localhost\n" +
+                            "override.server.port=8080\n" +
+                            "cloud.server.host=cloud\n" +
+                            "cloud.server.port=9000\n"), "application.properties"));
+    @Inject
+    Config config;
+
+    @ConfigMapping(prefix = "config")
+    public interface MyConfigMapping {
+        @WithName("my.prop")
+        String myProp();
+    }
+
+    @Inject
+    MyConfigMapping myConfigMapping;
+
+    @Test
+    void configMapping() {
+        SmallRyeConfig smallRyeConfig = ((SmallRyeConfig) config);
+        MyConfigMapping configMapping = smallRyeConfig.getConfigMapping(MyConfigMapping.class);
+        assertNotNull(configMapping);
+        assertEquals("1234", configMapping.myProp());
+
+        assertNotNull(myConfigMapping);
+        assertEquals("1234", myConfigMapping.myProp());
+    }
+
+    @ConfigMapping(prefix = "group")
+    public interface GroupMapping {
+        @WithParentName
+        ServerHost host();
+
+        @WithParentName
+        ServerPort port();
+
+        interface ServerHost {
+            String host();
+        }
+
+        interface ServerPort {
+            int port();
+        }
+    }
+
+    @Inject
+    GroupMapping groupMapping;
+
+    @Test
+    void groups() {
+        assertNotNull(groupMapping);
+        assertEquals("localhost", groupMapping.host().host());
+        assertEquals(8080, groupMapping.port().port());
+    }
+
+    @ConfigMapping(prefix = "types")
+    public interface SomeTypes {
+        @WithName("int")
+        int intPrimitive();
+
+        @WithName("int")
+        Integer intWrapper();
+
+        @WithName("long")
+        long longPrimitive();
+
+        @WithName("long")
+        Long longWrapper();
+
+        @WithName("float")
+        float floatPrimitive();
+
+        @WithName("float")
+        Float floatWrapper();
+
+        @WithName("double")
+        double doublePrimitive();
+
+        @WithName("double")
+        Double doubleWrapper();
+
+        @WithName("char")
+        char charPrimitive();
+
+        @WithName("char")
+        Character charWrapper();
+
+        @WithName("boolean")
+        boolean booleanPrimitive();
+
+        @WithName("boolean")
+        Boolean booleanWrapper();
+
+        @WithName("value")
+        ConfigValue configValue();
+    }
+
+    @Inject
+    SomeTypes types;
+
+    @Test
+    void types() {
+        assertNotNull(types);
+        assertEquals(9, types.intPrimitive());
+        assertEquals(9, types.intWrapper());
+        assertEquals(9999999999L, types.longPrimitive());
+        assertEquals(9999999999L, types.longWrapper());
+        assertEquals(99.9f, types.floatPrimitive());
+        assertEquals(99.9f, types.floatWrapper());
+        assertEquals(99.99, types.doublePrimitive());
+        assertEquals(99.99, types.doubleWrapper());
+        assertEquals('c', types.charPrimitive());
+        assertEquals('c', types.charWrapper());
+        assertTrue(types.booleanPrimitive());
+        assertTrue(types.booleanWrapper());
+        assertEquals("1234", types.configValue().getValue());
+    }
+
+    @ConfigMapping(prefix = "optionals")
+    public interface Optionals {
+        Optional<Server> server();
+
+        Optional<String> optional();
+
+        @WithName("optional.int")
+        OptionalInt optionalInt();
+
+        interface Server {
+            String host();
+
+            int port();
+        }
+    }
+
+    @Inject
+    Optionals optionals;
+
+    @Test
+    void optionals() {
+        assertTrue(optionals.server().isPresent());
+        assertEquals("localhost", optionals.server().get().host());
+        assertEquals(8080, optionals.server().get().port());
+
+        assertTrue(optionals.optional().isPresent());
+        assertEquals("optional", optionals.optional().get());
+        assertTrue(optionals.optionalInt().isPresent());
+        assertEquals(9, optionals.optionalInt().getAsInt());
+    }
+
+    @ConfigMapping(prefix = "collections")
+    public interface Collections {
+        @WithName("strings")
+        List<String> listStrings();
+
+        @WithName("ints")
+        List<Integer> listInts();
+    }
+
+    @Inject
+    Collections collections;
+
+    @Test
+    void collections() {
+        assertEquals(Stream.of("foo", "bar").collect(toList()), collections.listStrings());
+        assertEquals(Stream.of(1, 2, 3).collect(toList()), collections.listInts());
+    }
+
+    @ConfigMapping(prefix = "maps")
+    public interface Maps {
+        Map<String, String> server();
+
+        Map<String, Server> group();
+
+        interface Server {
+            String host();
+
+            int port();
+        }
+    }
+
+    @Inject
+    Maps maps;
+
+    @Test
+    void maps() {
+        assertEquals("localhost", maps.server().get("host"));
+        assertEquals(8080, Integer.valueOf(maps.server().get("port")));
+
+        assertEquals("localhost", maps.group().get("server").host());
+        assertEquals(8080, maps.group().get("server").port());
+    }
+
+    @ConfigMapping(prefix = "defaults")
+    public interface Defaults {
+        @WithDefault("foo")
+        String foo();
+
+        @WithDefault("bar")
+        String bar();
+    }
+
+    @Inject
+    Defaults defaults;
+
+    @Test
+    void defaults() {
+        assertEquals("foo", defaults.foo());
+        assertEquals("bar", defaults.bar());
+        assertEquals("foo", config.getValue("defaults.foo", String.class));
+
+        final List<String> propertyNames = stream(config.getPropertyNames().spliterator(), false).collect(toList());
+        assertFalse(propertyNames.contains("defaults.foo"));
+    }
+
+    @ConfigMapping(prefix = "converters")
+    public interface Converters {
+        @WithConverter(FooBarConverter.class)
+        String foo();
+
+        class FooBarConverter implements Converter<String> {
+            @Override
+            public String convert(final String value) {
+                return "bar";
+            }
+        }
+    }
+
+    @Inject
+    Converters converters;
+
+    @Test
+    void converters() {
+        assertEquals("bar", converters.foo());
+    }
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java
new file mode 100644
index 0000000000000..183fb4014dd9a
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java
@@ -0,0 +1,114 @@
+package io.quarkus.arc.test.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ConfigOptionalsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(UsingOptionals.class)
+                    .addAsResource(new StringAsset("foo=42\nbar=4.2"), "application.properties"));
+
+    @Inject
+    UsingOptionals usingOptionals;
+
+    @Test
+    public void testOptionals() {
+        assertTrue(usingOptionals.optionalOfInteger.isPresent());
+        assertEquals(42, usingOptionals.optionalOfInteger.get());
+
+        assertTrue(usingOptionals.optionalOfLong.isPresent());
+        assertEquals(42, usingOptionals.optionalOfLong.get());
+
+        assertTrue(usingOptionals.optionalOfDouble.isPresent());
+        assertEquals(4.2, usingOptionals.optionalOfDouble.get());
+
+        assertTrue(usingOptionals.optionalInt.isPresent());
+        assertEquals(42, usingOptionals.optionalInt.getAsInt());
+
+        assertTrue(usingOptionals.optionalLong.isPresent());
+        assertEquals(42, usingOptionals.optionalLong.getAsLong());
+
+        assertTrue(usingOptionals.optionalDouble.isPresent());
+        assertEquals(4.2, usingOptionals.optionalDouble.getAsDouble());
+
+        assertFalse(usingOptionals.missingOptionalOfInteger.isPresent());
+        assertFalse(usingOptionals.missingOptionalOfLong.isPresent());
+        assertFalse(usingOptionals.missingOptionalOfDouble.isPresent());
+        assertFalse(usingOptionals.missingOptionalInt.isPresent());
+        assertFalse(usingOptionals.missingOptionalLong.isPresent());
+        assertFalse(usingOptionals.missingOptionalDouble.isPresent());
+    }
+
+    @Singleton
+    static class UsingOptionals {
+        @Inject
+        @ConfigProperty(name = "foo")
+        Optional<Integer> optionalOfInteger;
+
+        @Inject
+        @ConfigProperty(name = "foo")
+        Optional<Long> optionalOfLong;
+
+        @Inject
+        @ConfigProperty(name = "bar")
+        Optional<Double> optionalOfDouble;
+
+        @Inject
+        @ConfigProperty(name = "foo")
+        OptionalInt optionalInt;
+
+        @Inject
+        @ConfigProperty(name = "foo")
+        OptionalLong optionalLong;
+
+        @Inject
+        @ConfigProperty(name = "bar")
+        OptionalDouble optionalDouble;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        Optional<Integer> missingOptionalOfInteger;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        Optional<Long> missingOptionalOfLong;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        Optional<Double> missingOptionalOfDouble;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        OptionalInt missingOptionalInt;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        OptionalLong missingOptionalLong;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        OptionalDouble missingOptionalDouble;
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java
index 9a81c7c799821..433d8a2fff1f7 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/ClassWithAllPublicFieldsConfigPropertiesTest.java
@@ -11,6 +11,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -27,7 +28,7 @@ public class ClassWithAllPublicFieldsConfigPropertiesTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(DummyBean.class, DummyProperties.class)
                     .addAsResource(new StringAsset(
-                            "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.bool-with-default=true\ndummy.optional-int=100\ndummy.optional-int-list=1,2"),
+                            "dummy.name=quarkus\ndummy.numbers=1,2,3,4\ndummy.bool-with-default=true\ndummy.optional-int=100\ndummy.opt-int-lst=1,2"),
                             "application.properties"));
 
     @Inject
@@ -39,6 +40,7 @@ public void testConfiguredValues() {
         assertEquals(Arrays.asList(1, 2, 3, 4), dummyBean.getNumbers());
         assertEquals("default", dummyBean.getUnset());
         assertTrue(dummyBean.isBoolWithDefault());
+        assertFalse(dummyBean.isUnsetBoolean());
         assertTrue(dummyBean.getOptionalInt().isPresent());
         assertEquals(100, dummyBean.getOptionalInt().get());
         assertFalse(dummyBean.getOptionalString().isPresent());
@@ -68,6 +70,10 @@ boolean isBoolWithDefault() {
             return dummyProperties.boolWithDefault;
         }
 
+        boolean isUnsetBoolean() {
+            return dummyProperties.unsetBoolean;
+        }
+
         Optional<Integer> getOptionalInt() {
             return dummyProperties.optionalInt;
         }
@@ -91,10 +97,13 @@ public static class DummyProperties {
         public String name;
         public String unset = "default";
         public boolean boolWithDefault = false;
+        public boolean unsetBoolean;
         public List<Integer> numbers;
         public Optional<Integer> optionalInt;
         public Optional<String> optionalString;
+        @ConfigProperty(name = "opt-str-lst")
         public Optional<List<String>> optionalStringList;
+        @ConfigProperty(name = "opt-int-lst")
         public Optional<List<Integer>> optionalIntList;
     }
 }
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java
index 10ef058906694..2f59a91048431 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/InterfaceWithNestedInterfaceConfigPrefixTest.java
@@ -27,7 +27,7 @@ public class InterfaceWithNestedInterfaceConfigPrefixTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(DummyBean.class, DummyProperties.class, DummyProperties.NestedDummy.class)
                     .addAsResource(new StringAsset(
-                            "dummy.name=quarkus\ndummy.boolWD=true\ndummy.nested-dummy.foo=bar\ndummy.nested-dummy.other=some"),
+                            "dummy.name=quarkus\ndummy.boolWD=true\ndummy.nested-dummy.foo=bar\ndummy.nested-dummy.other=some\ndummy.other-nested.foo=bar2\ndummy.other-nested.other=some2"),
                             "application.properties"));
 
     @Inject
@@ -37,11 +37,18 @@ public class InterfaceWithNestedInterfaceConfigPrefixTest {
     public void testConfiguredValues() {
         assertEquals("quarkus", dummyBean.dummyProperties.getName());
         assertTrue(dummyBean.dummyProperties.isBoolWithDef());
+
         DummyProperties.NestedDummy nestedDummy = dummyBean.dummyProperties.getNestedDummy();
         assertNotNull(nestedDummy);
         assertEquals("some", nestedDummy.getOther());
         assertEquals("bar", nestedDummy.getFooBar());
         assertEquals(Arrays.asList(1, 2, 3), nestedDummy.getNumbers());
+
+        DummyProperties.NestedDummy otherNested = dummyBean.dummyProperties.getOtherNested();
+        assertNotNull(otherNested);
+        assertEquals("some2", otherNested.getOther());
+        assertEquals("bar2", otherNested.getFooBar());
+        assertEquals(Arrays.asList(1, 2, 3), otherNested.getNumbers());
     }
 
     @Singleton
@@ -61,6 +68,8 @@ public interface DummyProperties {
 
         NestedDummy getNestedDummy();
 
+        NestedDummy getOtherNested();
+
         interface NestedDummy {
 
             @ConfigProperty(defaultValue = "1,2,3")
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java
index 42e904e5a4b82..736992ba740c8 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/MultipleInterfaceConfigPrefixTest.java
@@ -88,5 +88,9 @@ public interface DummyProperties {
         default String nameWithSuffix() {
             return getFirstName() + "!";
         }
+
+        static void someStatic() {
+
+        }
     }
 }
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java
index 3bb92c52c6b99..8b493eea6e782 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassAndSuperclassConfigPropertiesTest.java
@@ -9,6 +9,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -26,7 +27,7 @@ public class NestedClassAndSuperclassConfigPropertiesTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(DummyBean.class, DummyProperties.class, DummyProperties.NestedDummyProperties.class)
                     .addAsResource(new StringAsset(
-                            "dummy.lastname=redhat\ndummy.name=quarkus\ndummy.nested.ages=1,2,3,4\ndummy.supernested.heights=100,200\ndummy.unused=whatever\ndummy.nested.unused=whatever2"),
+                            "dummy.lname=redhat\ndummy.name=quarkus\ndummy.nested.ages=1,2,3,4\ndummy.supernested.afraid-of-heights=100,200\ndummy.unused=whatever\ndummy.nested.unused=whatever2"),
                             "application.properties"));
 
     @Inject
@@ -78,6 +79,7 @@ public static class NestedDummyProperties {
     }
 
     public static class SuperDummyProperties {
+        @ConfigProperty(name = "lname")
         private String lastname;
         private NestedSuperDummyProperties supernested;
 
@@ -99,6 +101,7 @@ public void setSupernested(NestedSuperDummyProperties supernested) {
 
         public static class NestedSuperDummyProperties {
 
+            @ConfigProperty(name = "afraid-of-heights")
             public Set<Integer> heights;
             @ConfigIgnore
             public Integer ignored;
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java
index 0211647d0622d..7738d4ef3f6cf 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/configproperties/NestedClassConfigPropertiesTest.java
@@ -8,6 +8,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -24,7 +25,7 @@ public class NestedClassConfigPropertiesTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(DummyBean.class, DummyProperties.class, DummyProperties.NestedDummyProperties.class)
                     .addAsResource(new StringAsset(
-                            "dummy.name=quarkus\ndummy.nested.ages=1,2,3,4\ndummy.unused=whatever\ndummy.nested.unused=whatever2"),
+                            "dummy.name=quarkus\ndummy.nested.rock-of-ages=1,2,3,4\ndummy.unused=whatever\ndummy.nested.unused=whatever2"),
                             "application.properties"));
 
     @Inject
@@ -70,6 +71,7 @@ public void setName(String name) {
 
         public static class NestedDummyProperties {
 
+            @ConfigProperty(name = "rock-of-ages")
             public Set<Integer> ages;
         }
     }
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java
new file mode 100644
index 0000000000000..ca364db576e2f
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/DevObserverInfoTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.arc.test.devconsole;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.event.Reception;
+import javax.enterprise.event.TransactionPhase;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.arc.deployment.devconsole.DevObserverInfo;
+import io.quarkus.arc.deployment.devconsole.Name;
+
+public class DevObserverInfoTest {
+
+    @Test
+    public void testCompare() {
+        List<DevObserverInfo> observers = new ArrayList<>();
+        // Synthetic non-app - should be last
+        observers.add(new DevObserverInfo(false, null, null, new Name("Delta"),
+                Collections.emptyList(), 0, false, Reception.ALWAYS, TransactionPhase.IN_PROGRESS));
+        // App observers
+        observers.add(new DevObserverInfo(true, new Name("Alpha"), "fooish", new Name("java.lang.String"),
+                Collections.emptyList(), 0, false, Reception.ALWAYS, TransactionPhase.IN_PROGRESS));
+        observers.add(new DevObserverInfo(true, new Name("Alpha"), "blabla", new Name("java.lang.String"),
+                Collections.emptyList(), 1, false, Reception.ALWAYS, TransactionPhase.IN_PROGRESS));
+        observers.add(new DevObserverInfo(true, null, null, new Name("Charlie"),
+                Collections.emptyList(), 0, false, Reception.ALWAYS, TransactionPhase.IN_PROGRESS));
+        observers.add(new DevObserverInfo(true, new Name("Bravo"), "hop", new Name("java.lang.String"),
+                Collections.emptyList(), 0, false, Reception.IF_EXISTS, TransactionPhase.IN_PROGRESS));
+
+        Collections.sort(observers);
+        assertEquals("blabla", observers.get(0).getMethodName());
+        assertEquals("Alpha", observers.get(0).getDeclaringClass().toString());
+        assertEquals("fooish", observers.get(1).getMethodName());
+        assertEquals("Alpha", observers.get(1).getDeclaringClass().toString());
+        assertEquals("hop", observers.get(2).getMethodName());
+        assertEquals("Bravo", observers.get(2).getDeclaringClass().toString());
+        assertNull(observers.get(3).getMethodName());
+        assertEquals("Charlie", observers.get(3).getObservedType().toString());
+        assertEquals("Delta", observers.get(observers.size() - 1).getObservedType().toString());
+        assertNull(observers.get(observers.size() - 1).getDeclaringClass());
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/NameTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/NameTest.java
new file mode 100644
index 0000000000000..dba9292e95acc
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/devconsole/NameTest.java
@@ -0,0 +1,67 @@
+package io.quarkus.arc.test.devconsole;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ArrayType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.PrimitiveType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.arc.deployment.devconsole.Name;
+
+public class NameTest {
+
+    @Test
+    public void testFromDotName() {
+        assertName(Name.from(DotName.createSimple("org.acme.Foo")), "org.acme.Foo", "Foo");
+        assertName(Name.from(DotName.createSimple("org.acme.Foo$Lu")), "org.acme.Foo$Lu", "Foo$Lu");
+        assertName(Name.from(PrimitiveType.BYTE.name()), "byte", "byte");
+    }
+
+    @Test
+    public void testFromType() {
+        assertName(Name.from(Type.create(DotName.createSimple("org.acme.Foo"), Kind.CLASS)), "org.acme.Foo", "Foo");
+        assertName(Name.from(PrimitiveType.BOOLEAN), "boolean", "boolean");
+        assertName(Name.from(ArrayType.create(PrimitiveType.LONG, 1)), "long[]", "long[]");
+        assertName(Name.from(ArrayType.create(Type.create(DotName.createSimple("org.acme.Foo"), Kind.CLASS), 1)),
+                "org.acme.Foo[]", "Foo[]");
+        assertName(
+                Name.from(ParameterizedType.create(DotName.createSimple("org.acme.Foo"),
+                        new Type[] { Type.create(DotName.createSimple("java.lang.String"), Kind.CLASS) }, null)),
+                "org.acme.Foo<java.lang.String>", "Foo<String>");
+        assertName(
+                Name.from(ParameterizedType.create(DotName.createSimple("org.acme.Foo"),
+                        new Type[] { ParameterizedType.create(DotName.createSimple("java.util.List"),
+                                new Type[] { Type.create(DotName.createSimple("java.lang.String"), Kind.CLASS) }, null) },
+                        null)),
+                "org.acme.Foo<java.util.List<java.lang.String>>", "Foo<List<String>>");
+    }
+
+    @Test
+    public void testFromAnnotation() {
+        assertName(
+                Name.from(AnnotationInstance.create(DotName.createSimple("org.acme.Bar"), null,
+                        new AnnotationValue[] {})),
+                "@org.acme.Bar", "@Bar");
+        assertName(
+                Name.from(AnnotationInstance.create(DotName.createSimple("org.acme.Bar"), null,
+                        new AnnotationValue[] { AnnotationValue.createBooleanValue("checked", false) })),
+                "@org.acme.Bar(checked = false)", "@Bar(checked = false)");
+        assertName(
+                Name.from(AnnotationInstance.create(DotName.createSimple("org.acme.Bar"), null,
+                        new AnnotationValue[] { AnnotationValue.createClassValue("impl",
+                                Type.create(DotName.createSimple("org.acme.Baz"), Kind.CLASS)) })),
+                "@org.acme.Bar(impl = org.acme.Baz)", "@Bar(impl = org.acme.Baz)");
+    }
+
+    private void assertName(Name name, String expectedName, String expectedSimpleName) {
+        assertEquals(expectedName, name.toString());
+        assertEquals(expectedSimpleName, name.getSimpleName());
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java
index 7679fdad1399c..c4908cf3ba7c7 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/exclude/ExcludeTypesTest.java
@@ -1,11 +1,21 @@
 package io.quarkus.arc.test.exclude;
 
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
@@ -23,9 +33,9 @@ public class ExcludeTypesTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(ExcludeTypesTest.class, Pong.class, Alpha.class, Bravo.class, Charlie.class, Bar.class,
-                            Baz.class)
+                            Baz.class, Magic.class, MagicInterceptor.class)
                     .addAsResource(new StringAsset(
-                            "quarkus.arc.exclude-types=Alpha,io.quarkus.arc.test.exclude.Bravo,io.quarkus.arc.test.exclude.bar.*,,io.quarkus.arc.test.exclude.baz.**"),
+                            "quarkus.arc.exclude-types=Alpha,io.quarkus.arc.test.exclude.Bravo,io.quarkus.arc.test.exclude.bar.*,,io.quarkus.arc.test.exclude.baz.**,MagicInterceptor"),
                             "application.properties"));
 
     @Inject
@@ -51,6 +61,7 @@ public String ping() {
     @ApplicationScoped
     static class Charlie implements Pong {
 
+        @Magic
         public String ping() {
             return "charlie";
         }
@@ -63,4 +74,22 @@ public interface Pong {
 
     }
 
+    @Magic
+    @Interceptor
+    public static class MagicInterceptor {
+
+        @AroundInvoke
+        public Object toUpperCase(InvocationContext context) throws Exception {
+            return context.proceed().toString().toUpperCase();
+        }
+
+    }
+
+    @InterceptorBinding
+    @Target({ TYPE, METHOD })
+    @Retention(RUNTIME)
+    @interface Magic {
+
+    }
+
 }
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java
new file mode 100644
index 0000000000000..24e0bcb3a9039
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/log/InjectedLoggerTest.java
@@ -0,0 +1,82 @@
+package io.quarkus.arc.test.log;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.log.LoggerName;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InjectedLoggerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SimpleBean.class));
+
+    @Inject
+    SimpleBean simpleBean;
+
+    @Inject
+    AnotherSimpleBean anotherSimpleBean;
+
+    @Test
+    public void testInjectedLogger() {
+        assertEquals(SimpleBean.class.getName(), simpleBean.getLog().getName());
+        assertEquals("shared", simpleBean.getSharedLog().getName());
+        assertEquals(AnotherSimpleBean.class.getName(), anotherSimpleBean.getLog().getName());
+        assertEquals(simpleBean.getSharedLog(), anotherSimpleBean.getSharedLog());
+    }
+
+    @ApplicationScoped
+    static class SimpleBean {
+
+        @Inject
+        Logger log;
+
+        @LoggerName("shared")
+        Logger sharedLog;
+
+        public Logger getLog() {
+            log.info("Someone is here!");
+            return log;
+        }
+
+        public Logger getSharedLog() {
+            return sharedLog;
+        }
+
+    }
+
+    @Dependent
+    static class AnotherSimpleBean {
+
+        private final Logger log;
+
+        @LoggerName("shared")
+        Logger sharedLog;
+
+        public AnotherSimpleBean(Logger log) {
+            this.log = log;
+        }
+
+        public Logger getLog() {
+            return log;
+        }
+
+        public Logger getSharedLog() {
+            sharedLog.info("Yet another someone is here!");
+            return sharedLog;
+        }
+
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java
index 24583e5471241..e784c3dc94176 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/observer/SyntheticObserverTest.java
@@ -10,14 +10,15 @@
 import javax.enterprise.event.Observes;
 import javax.inject.Singleton;
 
+import org.jboss.jandex.DotName;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.deployment.ObserverRegistrarBuildItem;
-import io.quarkus.arc.processor.ObserverRegistrar;
+import io.quarkus.arc.deployment.ObserverRegistrationPhaseBuildItem;
+import io.quarkus.arc.deployment.ObserverRegistrationPhaseBuildItem.ObserverConfiguratorBuildItem;
 import io.quarkus.builder.BuildChainBuilder;
 import io.quarkus.builder.BuildContext;
 import io.quarkus.builder.BuildStep;
@@ -43,21 +44,22 @@ public void accept(BuildChainBuilder builder) {
 
                     @Override
                     public void execute(BuildContext context) {
-                        context.produce(new ObserverRegistrarBuildItem(new ObserverRegistrar() {
-                            @Override
-                            public void register(RegistrationContext context) {
-                                context.configure().observedType(String.class).notify(mc -> {
-                                    ResultHandle events = mc
-                                            .readStaticField(FieldDescriptor.of(MyObserver.class, "EVENTS", List.class));
-                                    mc.invokeInterfaceMethod(
-                                            MethodDescriptor.ofMethod(List.class, "add", boolean.class, Object.class),
-                                            events, mc.load("synthetic"));
-                                    mc.returnValue(null);
-                                }).done();
-                            }
-                        }));
+                        ObserverRegistrationPhaseBuildItem observerRegistrationPhase = context
+                                .consume(ObserverRegistrationPhaseBuildItem.class);
+                        context.produce(new ObserverConfiguratorBuildItem(
+                                observerRegistrationPhase.getContext().configure()
+                                        .beanClass(DotName.createSimple(SyntheticObserverTest.class.getName()))
+                                        .observedType(String.class).notify(mc -> {
+                                            ResultHandle events = mc
+                                                    .readStaticField(
+                                                            FieldDescriptor.of(MyObserver.class, "EVENTS", List.class));
+                                            mc.invokeInterfaceMethod(
+                                                    MethodDescriptor.ofMethod(List.class, "add", boolean.class, Object.class),
+                                                    events, mc.load("synthetic"));
+                                            mc.returnValue(null);
+                                        })));
                     }
-                }).produces(ObserverRegistrarBuildItem.class).build();
+                }).consumes(ObserverRegistrationPhaseBuildItem.class).produces(ObserverConfiguratorBuildItem.class).build();
             }
         };
     }
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java
new file mode 100644
index 0000000000000..934bc0b857f4a
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/SimpleUnlessBuildPropertyTest.java
@@ -0,0 +1,61 @@
+package io.quarkus.arc.test.properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.properties.UnlessBuildProperty;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SimpleUnlessBuildPropertyTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(PingService.class, AlphaService.class, BravoService.class))
+            .overrideConfigKey("foo.bar", "baz");
+
+    @Inject
+    PingService pingService;
+
+    @Test
+    public void testInjection() {
+        // AlphaService is ignored
+        assertEquals(20, pingService.ping());
+    }
+
+    interface PingService {
+
+        int ping();
+
+    }
+
+    @UnlessBuildProperty(name = "foo.bar", stringValue = "baz")
+    @ApplicationScoped
+    static class AlphaService implements PingService {
+
+        @Override
+        public int ping() {
+            return 10;
+        }
+
+    }
+
+    @UnlessBuildProperty(name = "foo.bar", stringValue = "qux")
+    @ApplicationScoped
+    static class BravoService implements PingService {
+
+        @Override
+        public int ping() {
+            return 20;
+        }
+
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java
new file mode 100644
index 0000000000000..ff4414cd8ddee
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/properties/UnlessBuildPropertyTest.java
@@ -0,0 +1,170 @@
+package io.quarkus.arc.test.properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.CDI;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.DefaultBean;
+import io.quarkus.arc.properties.UnlessBuildProperty;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class UnlessBuildPropertyTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Producer.class, AnotherProducer.class,
+                            GreetingBean.class, PingBean.class, PongBean.class, FooBean.class, BarBean.class))
+            .overrideConfigKey("some.prop1", "v1")
+            .overrideConfigKey("some.prop2", "v2");
+
+    @Inject
+    GreetingBean bean;
+
+    @Inject
+    PingBean ping;
+
+    @Inject
+    PongBean pongBean;
+
+    @Inject
+    FooBean fooBean;
+
+    @Inject
+    Instance<BarBean> barBean;
+
+    @Test
+    public void testInjection() {
+        assertEquals("hello from matching prop. Foo is: foo from missing prop", bean.greet());
+        assertEquals("ping", ping.ping());
+        assertEquals("pong", pongBean.pong());
+        assertEquals("foo from missing prop", fooBean.foo());
+        assertTrue(barBean.isUnsatisfied());
+    }
+
+    @Test
+    public void testSelect() {
+        assertEquals("hello from matching prop. Foo is: foo from missing prop",
+                CDI.current().select(GreetingBean.class).get().greet());
+    }
+
+    @DefaultBean
+    @Singleton
+    static class GreetingBean {
+
+        String greet() {
+            return "hola";
+        }
+    }
+
+    @DefaultBean
+    @Singleton
+    static class PingBean {
+
+        String ping() {
+            return "ping";
+        }
+    }
+
+    @UnlessBuildProperty(name = "some.prop1", stringValue = "v1") // won't be enabled because the values don't match
+    @Singleton
+    static class PongBean {
+
+        String pong() {
+            return "pong from non matching value";
+        }
+    }
+
+    static interface FooBean {
+
+        String foo();
+    }
+
+    @UnlessBuildProperty(name = "some.other.prop1", stringValue = "v2")
+    static class BarBean {
+
+    }
+
+    @Singleton
+    static class Producer {
+
+        @Produces
+        @UnlessBuildProperty(name = "some.prop2", stringValue = "v2", enableIfMissing = true) // won't be enabled because the property values match - enableIfMissing has no effect when the property does exist
+        PingBean nonMatchingPingBean;
+
+        public Producer() {
+            this.nonMatchingPingBean = new PingBean() {
+
+                @Override
+                String ping() {
+                    return "ping dev";
+                }
+
+            };
+        }
+
+        @Produces
+        @UnlessBuildProperty(name = "some.prop1", stringValue = "v")
+        GreetingBean matchingValueGreetingBean(FooBean fooBean) {
+            return new GreetingBean() {
+
+                @Override
+                String greet() {
+                    return "hello from matching prop. Foo is: " + fooBean.foo();
+                }
+
+            };
+        }
+
+        @Produces
+        @UnlessBuildProperty(name = "some.prop2", stringValue = "v2") // won't be enabled because the property values match
+        GreetingBean nonMatchingValueGreetingBean(BarBean barBean) {
+            return new GreetingBean() {
+
+                @Override
+                String greet() {
+                    return "hello from dev";
+                }
+
+            };
+        }
+
+        @Produces
+        @DefaultBean
+        PongBean defaultPongBean() {
+            return new PongBean() {
+                @Override
+                String pong() {
+                    return "pong";
+                }
+            };
+        }
+
+    }
+
+    @UnlessBuildProperty(name = "some.other.prop1", stringValue = "v", enableIfMissing = true)
+    static class AnotherProducer {
+
+        @Produces
+        FooBean testFooBean;
+
+        public AnotherProducer() {
+            testFooBean = new FooBean() {
+                @Override
+                public String foo() {
+                    return "foo from missing prop";
+                }
+            };
+        }
+    }
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java
new file mode 100644
index 0000000000000..b917b9d66659e
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/qualifiers/QualifierRegistrarTest.java
@@ -0,0 +1,90 @@
+package io.quarkus.arc.test.qualifiers;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.jandex.DotName;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.deployment.QualifierRegistrarBuildItem;
+import io.quarkus.arc.processor.QualifierRegistrar;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class QualifierRegistrarTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(NotAQualifier.class, SimpleBean.class, Client.class))
+            .addBuildChainCustomizer(b -> {
+                b.addBuildStep(new BuildStep() {
+                    @Override
+                    public void execute(BuildContext context) {
+                        context.produce(new QualifierRegistrarBuildItem(new QualifierRegistrar() {
+                            @Override
+                            public Map<DotName, Set<String>> getAdditionalQualifiers() {
+                                return Collections.singletonMap(DotName.createSimple(NotAQualifier.class.getName()), null);
+                            }
+                        }));
+                    }
+                }).produces(QualifierRegistrarBuildItem.class).build();
+            });
+
+    @Inject
+    Client client;
+
+    @Test
+    public void testQualifier() {
+        assertTrue(client.instance.isUnsatisfied());
+        assertEquals("PONG", client.simpleBean.ping());
+    }
+
+    @Dependent
+    static class Client {
+
+        @NotAQualifier
+        SimpleBean simpleBean;
+
+        @Inject
+        Instance<SimpleBean> instance;
+
+    }
+
+    @NotAQualifier
+    @Singleton
+    static class SimpleBean {
+
+        public String ping() {
+            return "PONG";
+        }
+
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @interface NotAQualifier {
+
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java
new file mode 100644
index 0000000000000..b8e3249a45f23
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/MultipleAddMissingNoargsConstructorTest.java
@@ -0,0 +1,68 @@
+package io.quarkus.arc.test.unproxyable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultipleAddMissingNoargsConstructorTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyBean.class, MyBeanProducer.class));
+
+    @Inject
+    Instance<MyBean> myBeanInstances;
+
+    @Test
+    public void testBeansProperlyCreated() {
+        List<String> vals = new ArrayList<>(2);
+        for (MyBean myBeanInstance : myBeanInstances) {
+            vals.add(myBeanInstance.getVal());
+        }
+        Collections.sort(vals);
+        Assertions.assertEquals(Arrays.asList("val1", "val2"), vals);
+    }
+
+    static class MyBean {
+
+        private final String val;
+
+        MyBean(String val) {
+            this.val = val;
+        }
+
+        public String getVal() {
+            return val;
+        }
+    }
+
+    @Dependent
+    static class MyBeanProducer {
+
+        @ApplicationScoped
+        public MyBean myBean1() {
+            return new MyBean("val1");
+        }
+
+        @ApplicationScoped
+        public MyBean myBean2() {
+            return new MyBean("val2");
+        }
+    }
+
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java
new file mode 100644
index 0000000000000..da72411db6389
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unproxyable/SynthProxiableBeanWithoutNoArgConstructorTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.arc.test.unproxyable;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.function.Consumer;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Vetoed;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SynthProxiableBeanWithoutNoArgConstructorTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SynthBean.class))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(new BuildStep() {
+
+                    @Override
+                    public void execute(BuildContext context) {
+                        context.produce(SyntheticBeanBuildItem.configure(SynthBean.class)
+                                .scope(ApplicationScoped.class)
+                                .types(SynthBean.class)
+                                .unremovable()
+                                .creator(mc -> {
+                                    ResultHandle ret = mc.newInstance(
+                                            MethodDescriptor.ofConstructor(SynthBean.class, String.class),
+                                            mc.load("foo"));
+                                    mc.returnValue(ret);
+                                })
+                                .done());
+                    }
+                }).produces(SyntheticBeanBuildItem.class).build();
+            }
+        };
+    }
+
+    @Test
+    public void testSyntheticBean() {
+        InstanceHandle<SynthBean> instance = Arc.container().instance(SynthBean.class);
+        assertTrue(instance.isAvailable());
+        assertEquals("foo", instance.get().getString());
+    }
+
+    @Vetoed
+    static class SynthBean {
+        private String s;
+
+        public SynthBean(String s) {
+            this.s = s;
+        }
+
+        public String getString() {
+            return s;
+        }
+    }
+}
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java
index 22bfca5a9c46e..ce03e4d9ede99 100644
--- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/unused/UnusedExclusionTest.java
@@ -1,6 +1,12 @@
 package io.quarkus.arc.test.unused;
 
+import java.lang.reflect.Method;
+import java.util.function.Consumer;
+
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
@@ -12,7 +18,15 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.arc.test.unused.subpackage.Beta;
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.deployment.builditem.StaticBytecodeRecorderBuildItem;
+import io.quarkus.deployment.recording.BytecodeRecorderImpl;
+import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class UnusedExclusionTest {
@@ -21,13 +35,56 @@ public class UnusedExclusionTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(UnusedExclusionTest.class, Alpha.class, Beta.class, Charlie.class, Delta.class,
-                            ProducerBean.class)
+                            ProducerBean.class, TestRecorder.class, Gama.class, GamaProducer.class)
                     .addAsResource(new StringAsset(
                             "quarkus.arc.unremovable-types=io.quarkus.arc.test.unused.UnusedExclusionTest$Alpha,io.quarkus.arc.test.unused.subpackage.**,io.quarkus.arc.test.unused.Charlie,Delta"),
-                            "application.properties"));
+                            "application.properties"))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(new BuildStep() {
+
+                    @Override
+                    public void execute(BuildContext context) {
+                        BeanContainer beanContainer = context.consume(BeanContainerBuildItem.class).getValue();
+                        BytecodeRecorderImpl bytecodeRecorder = new BytecodeRecorderImpl(true,
+                                TestRecorder.class.getSimpleName(),
+                                "test", "" + TestRecorder.class.hashCode());
+                        // We need to use reflection due to some class loading problems
+                        Object recorderProxy = bytecodeRecorder.getRecordingProxy(TestRecorder.class);
+                        try {
+                            Method test = recorderProxy.getClass().getDeclaredMethod("test", BeanContainer.class);
+                            Object[] args = new Object[1];
+                            args[0] = beanContainer;
+                            test.invoke(recorderProxy, args);
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
+                        context.produce(new StaticBytecodeRecorderBuildItem(bytecodeRecorder));
+                    }
+                }).consumes(BeanContainerBuildItem.class).produces(StaticBytecodeRecorderBuildItem.class).build();
+            }
+        };
+    }
+
+    @Recorder
+    public static class TestRecorder {
+
+        public void test(BeanContainer beanContainer) {
+            // This should trigger the warning - Gama was removed
+            Gama gama = beanContainer.instance(Gama.class);
+            // Test that fallback was used - no injection was performed
+            Assertions.assertNull(gama.beanManager);
+        }
+
+    }
 
     @Test
-    public void testBeansWereNotRemoved() {
+    public void testBeans() {
         ArcContainer container = Arc.container();
         String expectedBeanResponse = "ok";
         InstanceHandle<Alpha> alphaInstance = container.instance(Alpha.class);
@@ -45,6 +102,8 @@ public void testBeansWereNotRemoved() {
         InstanceHandle<Delta> deltaInstance = container.instance(Delta.class);
         Assertions.assertTrue(deltaInstance.isAvailable());
         Assertions.assertEquals(expectedBeanResponse, deltaInstance.get().ping());
+
+        Assertions.assertFalse(container.instance(Gama.class).isAvailable());
     }
 
     // unused bean, won't be removed
@@ -56,4 +115,26 @@ public String ping() {
         }
 
     }
+
+    // unused bean, will be removed
+    @ApplicationScoped
+    public static class Gama {
+
+        @Inject
+        BeanManager beanManager;
+
+        public String ping() {
+            return "ok";
+        }
+
+    }
+
+    public static class GamaProducer {
+
+        @Produces
+        public Gama ping() {
+            return new Gama();
+        }
+
+    }
 }
diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongsingleton/WrongSingletonTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongsingleton/WrongSingletonTest.java
new file mode 100644
index 0000000000000..0932bf4299a3b
--- /dev/null
+++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/wrongsingleton/WrongSingletonTest.java
@@ -0,0 +1,60 @@
+package io.quarkus.arc.test.wrongsingleton;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.util.ExceptionUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class WrongSingletonTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(EjbSingleton.class))
+            .assertException(t -> {
+                Throwable rootCause = ExceptionUtil.getRootCause(t);
+                assertTrue(rootCause.getMessage().contains("javax.ejb.Singleton"), t.toString());
+                assertTrue(rootCause.getMessage().contains("com.google.inject.Singleton"), t.toString());
+            });
+
+    @Test
+    public void testValidationFailed() {
+        // This method should not be invoked
+        fail();
+    }
+
+    @javax.ejb.Singleton
+    static class EjbSingleton {
+
+        @Inject
+        @ConfigProperty(name = "unconfigured")
+        String foo;
+
+    }
+
+    @ApplicationScoped
+    static class GuiceProducers {
+
+        @com.google.inject.Singleton
+        @Produces
+        List<String> produceEjbSingleton() {
+            return Collections.emptyList();
+        }
+
+    }
+
+}
diff --git a/extensions/arc/pom.xml b/extensions/arc/pom.xml
index 5126cd7c61387..455b95ec65d3a 100644
--- a/extensions/arc/pom.xml
+++ b/extensions/arc/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/arc/runtime/pom.xml b/extensions/arc/runtime/pom.xml
index 6bec3f5e8c949..ae1c08899981d 100644
--- a/extensions/arc/runtime/pom.xml
+++ b/extensions/arc/runtime/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-arc-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java
new file mode 100644
index 0000000000000..81644222f3b80
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/log/LoggerName.java
@@ -0,0 +1,48 @@
+package io.quarkus.arc.log;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.Nonbinding;
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target({ FIELD, PARAMETER, METHOD })
+public @interface LoggerName {
+
+    /**
+     * The logger name must not be empty.
+     * 
+     * @return the logger name
+     */
+    @Nonbinding
+    String value();
+
+    /**
+     * Supports inline instantiation of this qualifier.
+     */
+    public static final class Literal extends AnnotationLiteral<LoggerName> implements LoggerName {
+
+        private static final long serialVersionUID = 1L;
+
+        private final String value;
+
+        public Literal(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String value() {
+            return value;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/profile/UnlessBuildProfile.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/profile/UnlessBuildProfile.java
index 1e9a495ab6740..f6f3951c37886 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/profile/UnlessBuildProfile.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/profile/UnlessBuildProfile.java
@@ -7,7 +7,7 @@
 
 /**
  * When applied to a bean class or producer method (or field), the bean will only be enabled
- * if the Quarkus build time profile dot not match the specified annotation value.
+ * if the Quarkus build time profile does not match the specified annotation value.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/IfBuildProperty.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/IfBuildProperty.java
index 5e83e6b495873..186357615e702 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/IfBuildProperty.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/IfBuildProperty.java
@@ -8,6 +8,7 @@
 /**
  * When applied to a bean class or producer method (or field), the bean will only be enabled
  * if the Quarkus build time property matches the provided value.
+ * <p>
  * By default, the bean is not enabled when the build time property is not defined at all, but this behavior is configurable
  * via the {#code enableIfMissing} property.
  */
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/UnlessBuildProperty.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/UnlessBuildProperty.java
new file mode 100644
index 0000000000000..9abd62c7c5192
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/properties/UnlessBuildProperty.java
@@ -0,0 +1,33 @@
+package io.quarkus.arc.properties;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * When applied to a bean class or producer method (or field), the bean will only be enabled
+ * if the Quarkus build time property does not match the provided value.
+ * <p>
+ * By default, the bean is not enabled when the build time property is not defined at all, but this behavior is configurable
+ * via the {#code enableIfMissing} property.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
+public @interface UnlessBuildProperty {
+
+    /**
+     * Name of the build time property to check
+     */
+    String name();
+
+    /**
+     * The bean is enabled if the build time property (specified by {@code name}) does not match this value.
+     */
+    String stringValue();
+
+    /**
+     * Determines if the bean is enabled when the property name specified by {@code name} has not been specified at all
+     */
+    boolean enableIfMissing() default false;
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java
index 54747f84b708f..4b5dabc4c4b33 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/AdditionalBean.java
@@ -6,10 +6,14 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Stereotype;
 
 /**
- * This built-in stereotype is automatically added to all additional beans.
+ * This built-in stereotype is automatically added to all additional beans that do not have a scope annotation declared.
+ * <p>
+ * Note that stereotypes are bean defining annotations and so bean classes annotated with this stereotype but no scope have
+ * their scope defaulted to {@link Dependent}.
  */
 @Stereotype
 @Target({ TYPE })
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcContainerSupplier.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcContainerSupplier.java
new file mode 100644
index 0000000000000..ede27fd340226
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcContainerSupplier.java
@@ -0,0 +1,13 @@
+package io.quarkus.arc.runtime;
+
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+
+public class ArcContainerSupplier implements Supplier<ArcContainer> {
+    @Override
+    public ArcContainer get() {
+        return Arc.container();
+    }
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcRecorder.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcRecorder.java
index b4acc0f73cc70..82de993b4c258 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcRecorder.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ArcRecorder.java
@@ -1,36 +1,41 @@
 package io.quarkus.arc.runtime;
 
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
-import io.quarkus.arc.InstanceHandle;
-import io.quarkus.arc.ManagedContext;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InjectableBean.Kind;
+import io.quarkus.arc.impl.ArcContainerImpl;
+import io.quarkus.arc.runtime.test.PreloadedTestApplicationClassPredicate;
+import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.test.TestApplicationClassPredicate;
 
-/**
- */
 @Recorder
 public class ArcRecorder {
 
+    private static final Logger LOG = Logger.getLogger(ArcRecorder.class);
+
     /**
      * Used to hold the Supplier instances used for synthetic bean declarations.
      */
     public static volatile Map<String, Supplier<?>> supplierMap;
 
-    private static final Logger LOGGER = Logger.getLogger(ArcRecorder.class.getName());
-
     public ArcContainer getContainer(ShutdownContext shutdown) throws Exception {
         ArcContainer container = Arc.initialize();
         shutdown.addShutdownTask(new Runnable() {
@@ -54,67 +59,47 @@ public void initRuntimeSupplierBeans(Map<String, Supplier<?>> beans) {
         supplierMap.putAll(beans);
     }
 
-    public BeanContainer initBeanContainer(ArcContainer container, List<BeanContainerListener> listeners,
-            Collection<String> removedBeanTypes)
+    public BeanContainer initBeanContainer(ArcContainer container, List<BeanContainerListener> listeners)
             throws Exception {
-
         if (container == null) {
             throw new IllegalArgumentException("Arc container was null");
         }
-        BeanContainer beanContainer = new BeanContainer() {
-            @Override
-            public <T> Factory<T> instanceFactory(Class<T> type, Annotation... qualifiers) {
-                Supplier<InstanceHandle<T>> handleSupplier = container.instanceSupplier(type, qualifiers);
-                if (handleSupplier == null) {
-                    if (removedBeanTypes.contains(type.getName())) {
-                        // Note that this only catches the simplest use cases
-                        LOGGER.warnf(
-                                "Bean matching %s was marked as unused and removed during build.\nExtensions can eliminate false positives using:\n\t- a custom UnremovableBeanBuildItem\n\t- AdditionalBeanBuildItem(false, beanClazz)",
-                                type);
-                    } else {
-                        LOGGER.debugf(
-                                "No matching bean found for type %s and qualifiers %s. The bean might have been marked as unused and removed during build.",
-                                type, Arrays.toString(qualifiers));
-                    }
-                    return new DefaultInstanceFactory<>(type);
-                }
-                return new Factory<T>() {
-                    @Override
-                    public Instance<T> create() {
-                        InstanceHandle<T> handle = handleSupplier.get();
-                        return new Instance<T>() {
-                            @Override
-                            public T get() {
-                                return handle.get();
-                            }
-
-                            @Override
-                            public void close() {
-                                handle.close();
-                            }
-                        };
-                    }
-                };
-            }
-
-            @Override
-            public ManagedContext requestContext() {
-                return container.requestContext();
-            }
-        };
+        BeanContainer beanContainer = new BeanContainerImpl(container);
         for (BeanContainerListener listener : listeners) {
+            long start = System.currentTimeMillis();
             listener.created(beanContainer);
+            LOG.debugf("Bean container listener %s finished in %s ms", listener.getClass().getName(),
+                    System.currentTimeMillis() - start);
         }
         return beanContainer;
     }
 
-    public void handleLifecycleEvents(ShutdownContext context, BeanContainer beanContainer) {
-        LifecycleEventRunner instance = beanContainer.instance(LifecycleEventRunner.class);
-        instance.fireStartupEvent();
+    public void handleLifecycleEvents(ShutdownContext context, LaunchMode launchMode,
+            boolean disableApplicationLifecycleObservers) {
+        ArcContainerImpl container = ArcContainerImpl.instance();
+        List<Class<?>> mockBeanClasses;
+
+        // If needed then mock all app observers in the test mode
+        if (launchMode == LaunchMode.TEST && disableApplicationLifecycleObservers) {
+            Predicate<String> predicate = container
+                    .select(TestApplicationClassPredicate.class).get();
+            mockBeanClasses = new ArrayList<>();
+            for (InjectableBean<?> bean : container.getBeans()) {
+                // Mock observers for all application class beans
+                if (bean.getKind() == Kind.CLASS && predicate.test(bean.getBeanClass().getName())) {
+                    mockBeanClasses.add(bean.getBeanClass());
+                }
+            }
+        } else {
+            mockBeanClasses = Collections.emptyList();
+        }
+
+        fireLifecycleEvent(container, new StartupEvent(), mockBeanClasses);
+
         context.addShutdownTask(new Runnable() {
             @Override
             public void run() {
-                instance.fireShutdownEvent();
+                fireLifecycleEvent(container, new ShutdownEvent(), mockBeanClasses);
             }
         });
     }
@@ -128,35 +113,22 @@ public Object get() {
         };
     }
 
-    public BeanContainerListener initCommandLineArgs(Supplier<String[]> args) {
-        return new BeanContainerListener() {
-            @Override
-            public void created(BeanContainer container) {
-                container.instance(CommandLineArgumentsProducer.class).setCommandLineArgs(args);
-            }
-        };
+    public void initTestApplicationClassPredicate(Set<String> applicationBeanClasses) {
+        PreloadedTestApplicationClassPredicate predicate = Arc.container()
+                .instance(PreloadedTestApplicationClassPredicate.class).get();
+        predicate.setApplicationBeanClasses(applicationBeanClasses);
     }
 
-    private static final class DefaultInstanceFactory<T> implements BeanContainer.Factory<T> {
-
-        final Class<T> type;
-
-        private DefaultInstanceFactory(Class<T> type) {
-            this.type = type;
+    private void fireLifecycleEvent(ArcContainerImpl container, Object event, List<Class<?>> mockBeanClasses) {
+        if (!mockBeanClasses.isEmpty()) {
+            for (Class<?> beanClass : mockBeanClasses) {
+                container.mockObserversFor(beanClass, true);
+            }
         }
-
-        @Override
-        public BeanContainer.Instance<T> create() {
-            try {
-                T instance = type.newInstance();
-                return new BeanContainer.Instance<T>() {
-                    @Override
-                    public T get() {
-                        return instance;
-                    }
-                };
-            } catch (InstantiationException | IllegalAccessException e) {
-                throw new RuntimeException(e);
+        container.beanManager().getEvent().fire(event);
+        if (!mockBeanClasses.isEmpty()) {
+            for (Class<?> beanClass : mockBeanClasses) {
+                container.mockObserversFor(beanClass, false);
             }
         }
     }
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainerImpl.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainerImpl.java
new file mode 100644
index 0000000000000..e01fc9f2e5c5e
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanContainerImpl.java
@@ -0,0 +1,80 @@
+package io.quarkus.arc.runtime;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.function.Supplier;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.ManagedContext;
+
+public class BeanContainerImpl implements BeanContainer {
+
+    private static final Logger LOGGER = Logger.getLogger(BeanContainerImpl.class.getName());
+
+    private final ArcContainer container;
+
+    public BeanContainerImpl(ArcContainer container) {
+        this.container = container;
+    }
+
+    @Override
+    public <T> Factory<T> instanceFactory(Class<T> type, Annotation... qualifiers) {
+        Supplier<InstanceHandle<T>> handleSupplier = container.instanceSupplier(type, qualifiers);
+        if (handleSupplier == null) {
+            LOGGER.debugf(
+                    "No matching bean found for type %s and qualifiers %s. The bean might have been marked as unused and removed during build.",
+                    type, Arrays.toString(qualifiers));
+            return new DefaultInstanceFactory<>(type);
+        }
+        return new Factory<T>() {
+            @Override
+            public Instance<T> create() {
+                InstanceHandle<T> handle = handleSupplier.get();
+                return new Instance<T>() {
+                    @Override
+                    public T get() {
+                        return handle.get();
+                    }
+
+                    @Override
+                    public void close() {
+                        handle.close();
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public ManagedContext requestContext() {
+        return container.requestContext();
+    }
+
+    static final class DefaultInstanceFactory<T> implements BeanContainer.Factory<T> {
+
+        final Class<T> type;
+
+        DefaultInstanceFactory(Class<T> type) {
+            this.type = type;
+        }
+
+        @Override
+        public BeanContainer.Instance<T> create() {
+            try {
+                T instance = type.newInstance();
+                return new BeanContainer.Instance<T>() {
+                    @Override
+                    public T get() {
+                        return instance;
+                    }
+                };
+            } catch (InstantiationException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanInvoker.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanInvoker.java
index d0a0741e3e436..ed4c248a87b93 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanInvoker.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanInvoker.java
@@ -10,7 +10,7 @@
  */
 public interface BeanInvoker<T> {
 
-    default void invoke(T param) {
+    default void invoke(T param) throws Exception {
         ManagedContext requestContext = Arc.container().requestContext();
         if (requestContext.isActive()) {
             invokeBean(param);
@@ -24,6 +24,6 @@ default void invoke(T param) {
         }
     }
 
-    void invokeBean(T param);
+    void invokeBean(T param) throws Exception;
 
 }
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanLookupSupplier.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanLookupSupplier.java
new file mode 100644
index 0000000000000..26543219e879f
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/BeanLookupSupplier.java
@@ -0,0 +1,31 @@
+package io.quarkus.arc.runtime;
+
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+
+public class BeanLookupSupplier implements Supplier<Object> {
+
+    private Class<?> type;
+
+    public BeanLookupSupplier() {
+    }
+
+    public BeanLookupSupplier(Class<?> type) {
+        this.type = type;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public BeanLookupSupplier setType(Class<?> type) {
+        this.type = type;
+        return this;
+    }
+
+    @Override
+    public Object get() {
+        return Arc.container().instance(type).get();
+    }
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/CommandLineArgumentsProducer.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/CommandLineArgumentsProducer.java
deleted file mode 100644
index 026285d4e8eac..0000000000000
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/CommandLineArgumentsProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.arc.runtime;
-
-import java.util.function.Supplier;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-import io.quarkus.runtime.annotations.CommandLineArguments;
-
-@ApplicationScoped
-public class CommandLineArgumentsProducer {
-
-    private volatile Supplier<String[]> commandLineArgs;
-
-    @Produces
-    @CommandLineArguments
-    public String[] getCommandLineArgs() {
-        return commandLineArgs.get();
-    }
-
-    public void setCommandLineArgs(Supplier<String[]> commandLineArgs) {
-        this.commandLineArgs = commandLineArgs;
-    }
-}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java
new file mode 100644
index 0000000000000..b038d663a18e6
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java
@@ -0,0 +1,19 @@
+package io.quarkus.arc.runtime;
+
+import java.util.Map;
+
+import javax.enterprise.context.spi.CreationalContext;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.arc.BeanCreator;
+import io.smallrye.config.SmallRyeConfig;
+
+public class ConfigMappingCreator implements BeanCreator<Object> {
+    @Override
+    public Object create(CreationalContext<Object> creationalContext, Map<String, Object> params) {
+        Class<?> interfaceType = (Class<?>) params.get("type");
+        SmallRyeConfig config = (SmallRyeConfig) ConfigProvider.getConfig();
+        return config.getConfigMapping(interfaceType);
+    }
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java
index 00f4a4398559e..59bce34c1a713 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigRecorder.java
@@ -10,6 +10,8 @@
 import org.eclipse.microprofile.config.ConfigProvider;
 
 import io.quarkus.runtime.annotations.Recorder;
+import io.smallrye.config.ConfigMappings;
+import io.smallrye.config.SmallRyeConfig;
 
 /**
  * @author Martin Kouba
@@ -44,6 +46,12 @@ public void validateConfigProperties(Map<String, Set<String>> properties) {
         }
     }
 
+    public void registerConfigMappings(final Set<ConfigMappings.ConfigMappingWithPrefix> configMappingsWithPrefix)
+            throws Exception {
+        SmallRyeConfig config = (SmallRyeConfig) ConfigProvider.getConfig();
+        ConfigMappings.registerConfigMappings(config, configMappingsWithPrefix);
+    }
+
     private Class<?> load(String className, ClassLoader cl) {
         switch (className) {
             case "boolean":
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LifecycleEventRunner.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LifecycleEventRunner.java
deleted file mode 100644
index 1708172ba4d4d..0000000000000
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LifecycleEventRunner.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.quarkus.arc.runtime;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-
-import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.StartupEvent;
-
-/**
- *
- */
-@Dependent
-public class LifecycleEventRunner {
-
-    @Inject
-    Event<StartupEvent> startup;
-
-    @Inject
-    Event<ShutdownEvent> shutdown;
-
-    public void fireStartupEvent() {
-        startup.fire(new StartupEvent());
-    }
-
-    public void fireShutdownEvent() {
-        shutdown.fire(new ShutdownEvent());
-    }
-
-}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java
new file mode 100644
index 0000000000000..5a8b929bc3e95
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/LoggerProducer.java
@@ -0,0 +1,49 @@
+package io.quarkus.arc.runtime;
+
+import java.lang.annotation.Annotation;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.log.LoggerName;
+
+@Singleton
+public class LoggerProducer {
+
+    private final ConcurrentMap<String, Logger> loggers = new ConcurrentHashMap<>();
+
+    @Dependent
+    @Produces
+    Logger getSimpleLogger(InjectionPoint injectionPoint) {
+        return loggers.computeIfAbsent(injectionPoint.getMember().getDeclaringClass().getName(), Logger::getLogger);
+    }
+
+    @LoggerName("")
+    @Dependent
+    @Produces
+    Logger getLoggerWithCustomName(InjectionPoint injectionPoint) {
+        String name = null;
+        for (Annotation qualifier : injectionPoint.getQualifiers()) {
+            if (qualifier.annotationType().equals(LoggerName.class)) {
+                name = ((LoggerName) qualifier).value();
+            }
+        }
+        if (name == null || name.isEmpty()) {
+            throw new IllegalStateException("Unable to derive the logger name at " + injectionPoint);
+        }
+        return loggers.computeIfAbsent(name, Logger::getLogger);
+    }
+
+    @PreDestroy
+    void destroy() {
+        loggers.clear();
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java
index 5537feb0935ad..92941faaa6148 100644
--- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java
@@ -66,12 +66,6 @@ public String getThreadContextType() {
         return ThreadContext.CDI;
     }
 
-    // see ThreadContextController#endContext()
-    private static void deactivateRequestContext() throws IllegalStateException {
-        // Only deactivate the context
-        Arc.container().requestContext().deactivate();
-    }
-
     private static final class ClearContextSnapshot implements ThreadContextSnapshot {
 
         @Override
@@ -92,7 +86,7 @@ public ThreadContextController begin() {
             } else {
                 // context not active, activate blank one, deactivate afterwards
                 requestContext.activate();
-                return ArcContextProvider::deactivateRequestContext;
+                return requestContext::deactivate;
             }
         }
     }
@@ -155,7 +149,7 @@ public ThreadContextController begin() {
             } else {
                 // context not active, activate and pass it new instance, deactivate afterwards
                 requestContext.activate(state);
-                return ArcContextProvider::deactivateRequestContext;
+                return requestContext::deactivate;
             }
         }
 
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java
new file mode 100644
index 0000000000000..72c0cb997ead1
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/EventsMonitor.java
@@ -0,0 +1,120 @@
+package io.quarkus.arc.runtime.devconsole;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.context.BeforeDestroyed;
+import javax.enterprise.context.Destroyed;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.spi.EventMetadata;
+import javax.inject.Singleton;
+
+@Singleton
+public class EventsMonitor {
+
+    private static final int DEFAULT_LIMIT = 500;
+
+    private volatile boolean skipContextEvents = true;
+    private final List<EventInfo> events = Collections.synchronizedList(new ArrayList<EventInfo>(DEFAULT_LIMIT));
+
+    void notify(@Observes Object payload, EventMetadata eventMetadata) {
+        if (skipContextEvents && isContextEvent(eventMetadata)) {
+            return;
+        }
+        if (events.size() > DEFAULT_LIMIT) {
+            // Remove some old data if the limit is exceeded
+            synchronized (events) {
+                if (events.size() > DEFAULT_LIMIT) {
+                    events.subList(0, DEFAULT_LIMIT / 2).clear();
+                }
+            }
+        }
+        events.add(EventInfo.from(eventMetadata));
+    }
+
+    public void clear() {
+        events.clear();
+    }
+
+    public List<EventInfo> getLastEvents() {
+        List<EventInfo> result = new ArrayList<>(events);
+        Collections.reverse(result);
+        return result;
+    }
+
+    public boolean isSkipContextEvents() {
+        return skipContextEvents;
+    }
+
+    public void toggleSkipContextEvents() {
+        // This is not thread-safe but we don't expect concurrent actions from dev ui
+        skipContextEvents = !skipContextEvents;
+    }
+
+    boolean isContextEvent(EventMetadata eventMetadata) {
+        if (!eventMetadata.getType().equals(Object.class) || eventMetadata.getQualifiers().size() != 2) {
+            return false;
+        }
+        for (Annotation qualifier : eventMetadata.getQualifiers()) {
+            Type qualifierType = qualifier.annotationType();
+            // @Any, @Initialized, @BeforeDestroyed or @Destroyed
+            if (!qualifierType.equals(Any.class) && !qualifierType.equals(Initialized.class)
+                    && !qualifierType.equals(BeforeDestroyed.class) && !qualifierType.equals(Destroyed.class)) {
+
+                return false;
+            }
+        }
+        return true;
+    }
+
+    static class EventInfo {
+
+        static EventInfo from(EventMetadata eventMetadata) {
+            List<Annotation> qualifiers;
+            if (eventMetadata.getQualifiers().size() == 1) {
+                // Just @Any
+                qualifiers = Collections.emptyList();
+            } else {
+                qualifiers = new ArrayList<>(1);
+                for (Annotation qualifier : eventMetadata.getQualifiers()) {
+                    // Skip @Any and @Default
+                    if (!qualifier.annotationType().equals(Any.class) && !qualifier.annotationType().equals(Default.class)) {
+                        qualifiers.add(qualifier);
+                    }
+                }
+            }
+            return new EventInfo(eventMetadata.getType(), qualifiers);
+        }
+
+        private final LocalDateTime timestamp;
+        private final Type type;
+        private final List<Annotation> qualifiers;
+
+        EventInfo(Type type, List<Annotation> qualifiers) {
+            this.timestamp = LocalDateTime.now();
+            this.type = type;
+            this.qualifiers = qualifiers;
+        }
+
+        public LocalDateTime getTimestamp() {
+            return timestamp;
+        }
+
+        public String getType() {
+            return type.getTypeName();
+        }
+
+        public List<Annotation> getQualifiers() {
+            return qualifiers;
+        }
+
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java
new file mode 100644
index 0000000000000..0ef4947314283
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java
@@ -0,0 +1,182 @@
+package io.quarkus.arc.runtime.devconsole;
+
+import java.lang.reflect.Method;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import io.quarkus.arc.InjectableBean;
+
+/**
+ * Business method invocation.
+ */
+public class Invocation {
+
+    private final InjectableBean<?> interceptedBean;
+    /**
+     * Start time in ms
+     */
+    private final long start;
+    /**
+     * Duration in ns
+     */
+    private final long duration;
+    private final Method method;
+    private final Kind kind;
+    private final String message;
+    private final List<Invocation> children;
+
+    Invocation(InjectableBean<?> interceptedBean, long start, long duration,
+            Method method, Kind kind, String message, List<Invocation> children) {
+        this.interceptedBean = interceptedBean;
+        this.start = start;
+        this.duration = duration;
+        this.method = method;
+        this.children = children;
+        this.kind = kind;
+        this.message = message;
+    }
+
+    public InjectableBean<?> getInterceptedBean() {
+        return interceptedBean;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    public String getStartFormatted() {
+        return LocalDateTime.ofInstant(Instant.ofEpochMilli(start), ZoneId.systemDefault()).toString();
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public long getDurationMillis() {
+        return TimeUnit.NANOSECONDS.toMillis(duration);
+    }
+
+    public Method getMethod() {
+        return method;
+    }
+
+    public String getDeclaringClassName() {
+        return method.getDeclaringClass().getName();
+    }
+
+    public List<Invocation> getChildren() {
+        return children;
+    }
+
+    public Kind getKind() {
+        return kind;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public String toString() {
+        return kind + " invocation of " + method;
+    }
+
+    public String getPackageName(String name) {
+        int lastDot = name.lastIndexOf('.');
+        if (lastDot != -1) {
+            return name.substring(0, lastDot);
+        }
+        return "";
+    }
+
+    public enum Kind {
+
+        BUSINESS,
+        PRODUCER,
+        DISPOSER,
+        OBSERVER
+
+    }
+
+    static class Builder {
+
+        private InjectableBean<?> interceptedBean;
+        private long start;
+        private long duration;
+        private Method method;
+        private List<Builder> children;
+        private Builder parent;
+        private Kind kind;
+        private String message;
+
+        Builder newChild() {
+            Invocation.Builder child = new Builder();
+            addChild(child);
+            return child;
+        }
+
+        Builder setInterceptedBean(InjectableBean<?> bean) {
+            this.interceptedBean = bean;
+            return this;
+        }
+
+        Builder setStart(long start) {
+            this.start = start;
+            return this;
+        }
+
+        Builder setDuration(long duration) {
+            this.duration = duration;
+            return this;
+        }
+
+        Builder setMethod(Method method) {
+            this.method = method;
+            return this;
+        }
+
+        Builder setKind(Kind kind) {
+            this.kind = kind;
+            return this;
+        }
+
+        Builder getParent() {
+            return parent;
+        }
+
+        Builder setParent(Builder parent) {
+            this.parent = parent;
+            return this;
+        }
+
+        Builder setMessage(String message) {
+            this.message = message;
+            return this;
+        }
+
+        boolean addChild(Builder child) {
+            if (children == null) {
+                children = new ArrayList<>();
+            }
+            child.setParent(this);
+            return children.add(child);
+        }
+
+        Invocation build() {
+            List<Invocation> invocations = null;
+            if (children != null) {
+                invocations = new ArrayList<>(children.size());
+                for (Builder builder : children) {
+                    invocations.add(builder.build());
+                }
+            }
+            return new Invocation(interceptedBean, start, duration, method, kind, message, invocations);
+        }
+
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java
new file mode 100644
index 0000000000000..74c96b01fbf2d
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java
@@ -0,0 +1,96 @@
+package io.quarkus.arc.runtime.devconsole;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+import javax.annotation.Priority;
+import javax.enterprise.event.Observes;
+import javax.enterprise.event.ObservesAsync;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Intercepted;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.ManagedContext;
+import io.quarkus.arc.runtime.devconsole.Invocation.Builder;
+import io.quarkus.arc.runtime.devconsole.Invocation.Kind;
+
+@Priority(Interceptor.Priority.LIBRARY_BEFORE)
+@Monitored
+@Interceptor
+public class InvocationInterceptor {
+
+    @Inject
+    InvocationsMonitor invocationMonitor;
+
+    @Intercepted
+    InjectableBean<?> bean;
+
+    @Inject
+    Instance<InvocationTree> invocationTree;
+
+    @AroundInvoke
+    public Object monitor(InvocationContext context) throws Exception {
+        ManagedContext requestContext = Arc.container().requestContext();
+        if (requestContext.isActive()) {
+            InvocationTree tree = invocationTree.get();
+            return proceed(tree.invocationStarted(bean, context.getMethod(), getKind(context)), context, requestContext, tree);
+        } else {
+            return proceed(
+                    new Builder().setInterceptedBean(bean).setMethod(context.getMethod()).setKind(getKind(context))
+                            .setStart(System.currentTimeMillis()),
+                    context, requestContext, null);
+        }
+    }
+
+    Object proceed(Invocation.Builder builder, InvocationContext context, ManagedContext requestContext, InvocationTree tree)
+            throws Exception {
+        long nanoTime = System.nanoTime();
+        // Object result;
+        try {
+            return context.proceed();
+        } catch (Exception e) {
+            builder.setMessage(e.getMessage());
+            throw e;
+        } finally {
+            builder.setDuration(System.nanoTime() - nanoTime);
+            if (builder.getParent() == null) {
+                // Flush the data about a top-level invocation
+                invocationMonitor.addInvocation(builder.build());
+            }
+            if (tree != null && requestContext.isActive()) {
+                tree.invocationCompleted();
+            }
+        }
+    }
+
+    Invocation.Kind getKind(InvocationContext ctx) {
+        // This will only work for "unmodified" discovered types
+        Method method = ctx.getMethod();
+        if (!method.getReturnType().equals(Void.TYPE) && method.isAnnotationPresent(Produces.class)) {
+            return Kind.PRODUCER;
+        } else if (method.getParameterCount() > 0) {
+            Annotation[][] parameterAnnotations = method.getParameterAnnotations();
+            if (parameterAnnotations.length > 0) {
+                for (Annotation[] annotations : parameterAnnotations) {
+                    for (Annotation annotation : annotations) {
+                        Class<? extends Annotation> type = annotation.annotationType();
+                        if (Observes.class.equals(type) || ObservesAsync.class.equals(type)) {
+                            return Kind.OBSERVER;
+                        } else if (Disposes.class.equals(type)) {
+                            return Kind.DISPOSER;
+                        }
+                    }
+                }
+            }
+        }
+        return Kind.BUSINESS;
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java
new file mode 100644
index 0000000000000..6c1afff940609
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java
@@ -0,0 +1,44 @@
+package io.quarkus.arc.runtime.devconsole;
+
+import java.lang.reflect.Method;
+
+import javax.enterprise.context.RequestScoped;
+
+import io.quarkus.arc.InjectableBean;
+
+@RequestScoped
+public class InvocationTree {
+
+    // The current invocation builder
+    // It is volatile because a request scoped bean should not be invoked concurrently, however it can be invoked on a different thread 
+    private volatile Invocation.Builder current;
+
+    Invocation.Builder invocationStarted(InjectableBean<?> bean, Method method, Invocation.Kind kind) {
+        Invocation.Builder builder = this.current;
+        if (builder == null) {
+            // Entry point
+            builder = new Invocation.Builder();
+        } else {
+            // Nested invocation
+            builder = builder.newChild();
+        }
+        builder.setStart(System.currentTimeMillis()).setInterceptedBean(bean)
+                .setMethod(method).setKind(kind);
+        this.current = builder;
+        return builder;
+    }
+
+    void invocationCompleted() {
+        Invocation.Builder current = this.current;
+        if (current == null) {
+            // Something went wrong, for example the request context was terminated unexpectedly
+            return;
+        }
+        if (current.getParent() != null) {
+            this.current = current.getParent();
+        } else {
+            this.current = null;
+        }
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java
new file mode 100644
index 0000000000000..0a65ff3bee254
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java
@@ -0,0 +1,58 @@
+package io.quarkus.arc.runtime.devconsole;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.inject.Singleton;
+
+@Singleton
+public class InvocationsMonitor {
+
+    private static final int DEFAULT_LIMIT = 1000;
+
+    private final List<Invocation> invocations = Collections.synchronizedList(new ArrayList<>());
+
+    private volatile boolean filterOutQuarkusBeans = true;
+
+    void addInvocation(Invocation invocation) {
+        if (invocations.size() > DEFAULT_LIMIT) {
+            // Remove some old data if the limit is exceeded
+            synchronized (invocations) {
+                if (invocations.size() > DEFAULT_LIMIT) {
+                    invocations.subList(0, DEFAULT_LIMIT / 2).clear();
+                }
+            }
+        }
+        invocations.add(invocation);
+    }
+
+    public List<Invocation> getLastInvocations() {
+        List<Invocation> result = new ArrayList<>(invocations);
+        if (filterOutQuarkusBeans) {
+            for (Iterator<Invocation> it = result.iterator(); it.hasNext();) {
+                Invocation invocation = it.next();
+                if (invocation.getInterceptedBean().getBeanClass().getName().startsWith("io.quarkus")) {
+                    it.remove();
+                }
+            }
+        }
+        Collections.reverse(result);
+        return result;
+    }
+
+    public void clear() {
+        invocations.clear();
+    }
+
+    public boolean isFilterOutQuarkusBeans() {
+        return filterOutQuarkusBeans;
+    }
+
+    public void toggleFilterOutQuarkusBeans() {
+        // This is not thread-safe but we don't expect concurrent actions from dev ui
+        filterOutQuarkusBeans = !filterOutQuarkusBeans;
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java
new file mode 100644
index 0000000000000..bd8a9e1c15d24
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java
@@ -0,0 +1,18 @@
+package io.quarkus.arc.runtime.devconsole;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Inherited
+@InterceptorBinding
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+public @interface Monitored {
+}
diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java
new file mode 100644
index 0000000000000..9e47053377c35
--- /dev/null
+++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/test/PreloadedTestApplicationClassPredicate.java
@@ -0,0 +1,23 @@
+package io.quarkus.arc.runtime.test;
+
+import java.util.Set;
+
+import javax.inject.Singleton;
+
+import io.quarkus.runtime.test.TestApplicationClassPredicate;
+
+@Singleton
+public class PreloadedTestApplicationClassPredicate implements TestApplicationClassPredicate {
+
+    private volatile Set<String> applicationBeanClasses;
+
+    @Override
+    public boolean test(String name) {
+        return applicationBeanClasses.contains(name);
+    }
+
+    public void setApplicationBeanClasses(Set<String> applicationBeanClasses) {
+        this.applicationBeanClasses = applicationBeanClasses;
+    }
+
+}
diff --git a/extensions/arc/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.InterceptorBindingService$Provider b/extensions/arc/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.InterceptorBindingService$Provider
index ac107a38a0be5..2b70cdf694fbd 100644
--- a/extensions/arc/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.InterceptorBindingService$Provider
+++ b/extensions/arc/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.InterceptorBindingService$Provider
@@ -5,7 +5,7 @@
 # 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
+#     https://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,
@@ -21,7 +21,7 @@
 # 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
+#     https://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,
diff --git a/extensions/artemis-core/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java b/extensions/artemis-core/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java
index f3dd5fe2d86e4..97aba3d6076f6 100644
--- a/extensions/artemis-core/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java
+++ b/extensions/artemis-core/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java
@@ -3,6 +3,9 @@
 import java.util.Collection;
 import java.util.Optional;
 
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
 import org.apache.activemq.artemis.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy;
 import org.apache.activemq.artemis.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy;
@@ -14,9 +17,7 @@
 import org.jboss.jandex.DotName;
 import org.jboss.logging.Logger;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.artemis.core.runtime.ArtemisCoreProducer;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.artemis.core.runtime.ArtemisCoreRecorder;
 import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
 import io.quarkus.deployment.Feature;
@@ -92,25 +93,32 @@ HealthBuildItem health(ArtemisBuildTimeConfig buildConfig, Optional<ArtemisJmsBu
     }
 
     @BuildStep
-    void load(BuildProducer<AdditionalBeanBuildItem> additionalBean, BuildProducer<FeatureBuildItem> feature,
-            Optional<ArtemisJmsBuildItem> artemisJms) {
+    void load(BuildProducer<FeatureBuildItem> feature, Optional<ArtemisJmsBuildItem> artemisJms) {
 
         if (artemisJms.isPresent()) {
             return;
         }
         feature.produce(new FeatureBuildItem(Feature.ARTEMIS_CORE));
-        additionalBean.produce(AdditionalBeanBuildItem.unremovableOf(ArtemisCoreProducer.class));
     }
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
     ArtemisCoreConfiguredBuildItem configure(ArtemisCoreRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
-            BeanContainerBuildItem beanContainer, Optional<ArtemisJmsBuildItem> artemisJms) {
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer, Optional<ArtemisJmsBuildItem> artemisJms) {
 
         if (artemisJms.isPresent()) {
             return null;
         }
-        recorder.setConfig(runtimeConfig, beanContainer.getValue());
+
+        SyntheticBeanBuildItem serverLocator = SyntheticBeanBuildItem.configure(ServerLocator.class)
+                .supplier(recorder.getServerLocatorSupplier(runtimeConfig))
+                .scope(ApplicationScoped.class)
+                .defaultBean()
+                .unremovable()
+                .setRuntimeInit()
+                .done();
+        syntheticBeanProducer.produce(serverLocator);
+
         return new ArtemisCoreConfiguredBuildItem();
     }
 }
diff --git a/extensions/artemis-core/pom.xml b/extensions/artemis-core/pom.xml
index 81e68f5e51c7e..81a3c3154868a 100644
--- a/extensions/artemis-core/pom.xml
+++ b/extensions/artemis-core/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/artemis-core/runtime/pom.xml b/extensions/artemis-core/runtime/pom.xml
index c3660a1d4241c..ccf838385bc7e 100644
--- a/extensions/artemis-core/runtime/pom.xml
+++ b/extensions/artemis-core/runtime/pom.xml
@@ -43,20 +43,6 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-core-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-json_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.johnzon</groupId>
-                    <artifactId>johnzon-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -67,6 +53,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreProducer.java b/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreProducer.java
deleted file mode 100644
index 6ee05aeb1d237..0000000000000
--- a/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreProducer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.quarkus.artemis.core.runtime;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
-import org.apache.activemq.artemis.api.core.client.ServerLocator;
-
-import io.quarkus.arc.DefaultBean;
-
-@ApplicationScoped
-public class ArtemisCoreProducer {
-
-    private ArtemisRuntimeConfig config;
-
-    @Produces
-    @ApplicationScoped
-    @DefaultBean
-    public ServerLocator serverLocator() throws Exception {
-        return ActiveMQClient.createServerLocator(config.url);
-    }
-
-    public ArtemisRuntimeConfig getConfig() {
-        return config;
-    }
-
-    public void setConfig(ArtemisRuntimeConfig config) {
-        this.config = config;
-    }
-}
diff --git a/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreRecorder.java b/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreRecorder.java
index 654e08d7c6a04..1c752cf508da2 100644
--- a/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreRecorder.java
+++ b/extensions/artemis-core/runtime/src/main/java/io/quarkus/artemis/core/runtime/ArtemisCoreRecorder.java
@@ -1,12 +1,25 @@
 package io.quarkus.artemis.core.runtime;
 
-import io.quarkus.arc.runtime.BeanContainer;
+import java.util.function.Supplier;
+
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
 public class ArtemisCoreRecorder {
 
-    public void setConfig(ArtemisRuntimeConfig config, BeanContainer container) {
-        container.instance(ArtemisCoreProducer.class).setConfig(config);
+    public Supplier<ServerLocator> getServerLocatorSupplier(ArtemisRuntimeConfig config) {
+        return new Supplier<ServerLocator>() {
+            @Override
+            public ServerLocator get() {
+                try {
+                    return ActiveMQClient.createServerLocator(config.url);
+                } catch (Exception e) {
+                    throw new RuntimeException("Could not create ServerLocator", e);
+                }
+            }
+        };
     }
 }
diff --git a/extensions/artemis-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java b/extensions/artemis-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java
index a2343bbc064d1..f8621d8fd8faa 100644
--- a/extensions/artemis-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java
+++ b/extensions/artemis-jms/deployment/src/main/java/io/quarkus/artemis/jms/deployment/ArtemisJmsProcessor.java
@@ -1,11 +1,12 @@
 package io.quarkus.artemis.jms.deployment;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import javax.enterprise.context.ApplicationScoped;
+import javax.jms.ConnectionFactory;
+
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.artemis.core.deployment.ArtemisBuildTimeConfig;
 import io.quarkus.artemis.core.deployment.ArtemisJmsBuildItem;
 import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
-import io.quarkus.artemis.jms.runtime.ArtemisJmsProducer;
 import io.quarkus.artemis.jms.runtime.ArtemisJmsRecorder;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -18,12 +19,10 @@
 public class ArtemisJmsProcessor {
 
     @BuildStep
-    void load(BuildProducer<AdditionalBeanBuildItem> additionalBean, BuildProducer<FeatureBuildItem> feature,
-            BuildProducer<ArtemisJmsBuildItem> artemisJms) {
+    void load(BuildProducer<FeatureBuildItem> feature, BuildProducer<ArtemisJmsBuildItem> artemisJms) {
 
         artemisJms.produce(new ArtemisJmsBuildItem());
         feature.produce(new FeatureBuildItem(Feature.ARTEMIS_JMS));
-        additionalBean.produce(AdditionalBeanBuildItem.unremovableOf(ArtemisJmsProducer.class));
     }
 
     @BuildStep
@@ -36,9 +35,17 @@ HealthBuildItem health(ArtemisBuildTimeConfig buildConfig) {
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
     ArtemisJmsConfiguredBuildItem configure(ArtemisJmsRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
-            BeanContainerBuildItem beanContainer) {
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanProducer) {
+
+        SyntheticBeanBuildItem connectionFactory = SyntheticBeanBuildItem.configure(ConnectionFactory.class)
+                .supplier(recorder.getConnectionFactorySupplier(runtimeConfig))
+                .scope(ApplicationScoped.class)
+                .defaultBean()
+                .unremovable()
+                .setRuntimeInit()
+                .done();
+        syntheticBeanProducer.produce(connectionFactory);
 
-        recorder.setConfig(runtimeConfig, beanContainer.getValue());
         return new ArtemisJmsConfiguredBuildItem();
     }
 }
diff --git a/extensions/artemis-jms/pom.xml b/extensions/artemis-jms/pom.xml
index bc14e024dc9aa..4fe85d1fbcbd9 100644
--- a/extensions/artemis-jms/pom.xml
+++ b/extensions/artemis-jms/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsProducer.java b/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsProducer.java
deleted file mode 100644
index 7e4748c7a170b..0000000000000
--- a/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsProducer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.quarkus.artemis.jms.runtime;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.jms.ConnectionFactory;
-
-import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
-
-import io.quarkus.arc.DefaultBean;
-import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
-
-@ApplicationScoped
-public class ArtemisJmsProducer {
-
-    private ArtemisRuntimeConfig config;
-
-    @Produces
-    @ApplicationScoped
-    @DefaultBean
-    public ConnectionFactory connectionFactory() {
-        return new ActiveMQJMSConnectionFactory(config.url,
-                config.username.orElse(null), config.password.orElse(null));
-    }
-
-    public ArtemisRuntimeConfig getConfig() {
-        return config;
-    }
-
-    public void setConfig(ArtemisRuntimeConfig config) {
-        this.config = config;
-    }
-}
diff --git a/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java b/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java
index fffef19ee8396..8069ced0bba59 100644
--- a/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java
+++ b/extensions/artemis-jms/runtime/src/main/java/io/quarkus/artemis/jms/runtime/ArtemisJmsRecorder.java
@@ -1,13 +1,23 @@
 package io.quarkus.artemis.jms.runtime;
 
-import io.quarkus.arc.runtime.BeanContainer;
+import java.util.function.Supplier;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+
 import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
 public class ArtemisJmsRecorder {
 
-    public void setConfig(ArtemisRuntimeConfig config, BeanContainer container) {
-        container.instance(ArtemisJmsProducer.class).setConfig(config);
+    public Supplier<ConnectionFactory> getConnectionFactorySupplier(ArtemisRuntimeConfig config) {
+        return new Supplier<ConnectionFactory>() {
+            @Override
+            public ConnectionFactory get() {
+                return new ActiveMQJMSConnectionFactory(config.url, config.username.orElse(null), config.password.orElse(null));
+            }
+        };
     }
 }
diff --git a/extensions/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroProcessor.java b/extensions/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroProcessor.java
index 1cf6a40f8ed89..d1f96c6f6b280 100644
--- a/extensions/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroProcessor.java
+++ b/extensions/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroProcessor.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 
-import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.specific.AvroGenerated;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -24,14 +23,12 @@ public void build(CombinedIndexBuildItem indexBuildItem,
             BuildProducer<NativeImageConfigBuildItem> conf) {
 
         NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder();
-        builder.addRuntimeInitializedClass(GenericDatumReader.class.getName());
 
         Collection<AnnotationInstance> annotations = indexBuildItem.getIndex()
                 .getAnnotations(DotName.createSimple(AvroGenerated.class.getName()));
         for (AnnotationInstance annotation : annotations) {
             if (annotation.target().kind() == AnnotationTarget.Kind.CLASS) {
                 String className = annotation.target().asClass().name().toString();
-                builder.addRuntimeInitializedClass(className);
                 reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true, className));
             }
         }
diff --git a/extensions/avro/pom.xml b/extensions/avro/pom.xml
index 0712b2d3ba836..5cfa0fa587bcf 100644
--- a/extensions/avro/pom.xml
+++ b/extensions/avro/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/avro/runtime/pom.xml b/extensions/avro/runtime/pom.xml
index b44c445472a23..ff58f1febfdb6 100644
--- a/extensions/avro/runtime/pom.xml
+++ b/extensions/avro/runtime/pom.xml
@@ -27,6 +27,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/avro/runtime/src/main/java/io/quarkus/avro/graal/AvroSubstitutions.java b/extensions/avro/runtime/src/main/java/io/quarkus/avro/graal/AvroSubstitutions.java
index 6d480fef3d507..009db1593e49e 100644
--- a/extensions/avro/runtime/src/main/java/io/quarkus/avro/graal/AvroSubstitutions.java
+++ b/extensions/avro/runtime/src/main/java/io/quarkus/avro/graal/AvroSubstitutions.java
@@ -2,10 +2,16 @@
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.function.Function;
 
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.IndexedRecord;
+import org.apache.avro.io.DatumReader;
+import org.apache.avro.io.ResolvingDecoder;
+import org.apache.avro.util.WeakIdentityHashMap;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Inject;
@@ -79,5 +85,45 @@ public Target_org_apache_avro_reflect_ReflectData_ClassAccessorData(Class<?> c)
 
 }
 
+@TargetClass(className = "org.apache.avro.generic.GenericDatumReader")
+final class Target_org_apache_avro_generic_GenericDatumReader {
+
+    @Alias
+    private GenericData data;
+    @Alias
+    private Schema actual;
+    @Alias
+    private Schema expected;
+    @Alias
+    private DatumReader<?> fastDatumReader;
+    @Alias
+    private ResolvingDecoder creatorResolver;
+    @Alias
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
+    private Thread creator;
+
+    @Alias
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
+    private static ThreadLocal<Map<Schema, Map<Schema, ResolvingDecoder>>> RESOLVER_CACHE = ThreadLocal.withInitial(
+            WeakIdentityHashMap::new);
+    @Alias
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
+    private Map<Schema, Class> stringClassCache;
+    @Alias
+    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
+    private Map<Class, Constructor> stringCtorCache;
+
+    @Substitute
+    protected Target_org_apache_avro_generic_GenericDatumReader(GenericData data) {
+        this.fastDatumReader = null;
+        this.creatorResolver = null;
+        this.stringClassCache = new IdentityHashMap();
+        this.stringCtorCache = new HashMap();
+        this.data = data;
+        this.creator = Thread.currentThread();
+    }
+
+}
+
 class AvroSubstitutions {
 }
diff --git a/extensions/azure-functions-http/deployment/pom.xml b/extensions/azure-functions-http/deployment/pom.xml
index 307de958f33e9..873720ccb3ae7 100644
--- a/extensions/azure-functions-http/deployment/pom.xml
+++ b/extensions/azure-functions-http/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-azure-functions-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,6 +28,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/azure-functions-http/deployment/src/main/java/io/quarkus/azure/functions/resteasy/deployment/AzureFunctionsHttpProcessor.java b/extensions/azure-functions-http/deployment/src/main/java/io/quarkus/azure/functions/resteasy/deployment/AzureFunctionsHttpProcessor.java
index e64cfef50b761..aa2f04dbdf1df 100644
--- a/extensions/azure-functions-http/deployment/src/main/java/io/quarkus/azure/functions/resteasy/deployment/AzureFunctionsHttpProcessor.java
+++ b/extensions/azure-functions-http/deployment/src/main/java/io/quarkus/azure/functions/resteasy/deployment/AzureFunctionsHttpProcessor.java
@@ -4,12 +4,19 @@
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.pkg.builditem.UberJarRequiredBuildItem;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.vertx.http.deployment.RequireVirtualHttpBuildItem;
 
 public class AzureFunctionsHttpProcessor {
     private static final Logger log = Logger.getLogger(AzureFunctionsHttpProcessor.class);
 
+    @BuildStep
+    public UberJarRequiredBuildItem forceUberJar() {
+        // Azure Functions needs a single JAR inside a dedicated directory
+        return new UberJarRequiredBuildItem();
+    }
+
     @BuildStep
     public RequireVirtualHttpBuildItem requestVirtualHttp(LaunchModeBuildItem launchMode) {
         return launchMode.getLaunchMode() == LaunchMode.NORMAL ? RequireVirtualHttpBuildItem.MARKER : null;
diff --git a/extensions/azure-functions-http/maven-archetype/pom.xml b/extensions/azure-functions-http/maven-archetype/pom.xml
index 363f2f2b28ea0..c41613ce774f0 100644
--- a/extensions/azure-functions-http/maven-archetype/pom.xml
+++ b/extensions/azure-functions-http/maven-archetype/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-azure-functions-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/azure-functions-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index ca92bc8d96dc3..3fc29d816748a 100644
--- a/extensions/azure-functions-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -9,7 +9,7 @@ to you 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
+  https://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
diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/function.json b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/function.json
index 86d9f31b56892..416c0c0274e11 100644
--- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/function.json
+++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/azure-config/function.json
@@ -1,5 +1,5 @@
 {
-  "scriptFile" : "../${project.build.finalName}-runner.jar",
+  "scriptFile" : "../${project.build.finalName}.jar",
   "entryPoint" : "io.quarkus.azure.functions.resteasy.runtime.Function.run",
   "bindings" : [ {
     "type" : "httpTrigger",
diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 254fd89bb7cf8..24d48af000f54 100644
--- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -8,8 +8,8 @@
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus-plugin.version>999-SNAPSHOT</quarkus-plugin.version>
@@ -19,12 +19,13 @@
     <resources-plugin.version>3.1.0</resources-plugin.version>
     <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 
-    <azure.functions.maven.plugin.version>1.3.2</azure.functions.maven.plugin.version>
+    <azure.functions.maven.plugin.version>1.9.1</azure.functions.maven.plugin.version>
     <functionAppName>${appName}</functionAppName>
     <functionAppRegion>${appRegion}</functionAppRegion>
     <functionResourceGroup>${resourceGroup}</functionResourceGroup>
     <function>${function}</function>
     <stagingDirectory>${project.build.directory}/azure-functions/${functionAppName}</stagingDirectory>
+    <quarkus.package.type>uber-jar</quarkus.package.type>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -79,9 +80,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>
         <version>${quarkus-plugin.version}</version>
-        <configuration>
-          <uberJar>true</uberJar>
-        </configuration>
         <executions>
           <execution>
             <goals>
@@ -114,19 +112,19 @@
           <resourceGroup>${functionResourceGroup}</resourceGroup>
           <appName>${functionAppName}</appName>
           <region>${functionAppRegion}</region>
+          <runtime>
+            <!-- runtime os, could be windows, linux or docker-->
+            <os>windows</os>
+            <javaVersion>11</javaVersion>
+            <!-- for docker function, please set the following parameters -->
+            <!-- <image>[hub-user/]repo-name[:tag]</image> -->
+            <!-- <serverId></serverId> -->
+            <!-- <registryUrl></registryUrl>  -->
+          </runtime>
           <appSettings>
-            <!-- Run Azure Function from package file by default -->
-            <property>
-              <name>WEBSITE_RUN_FROM_PACKAGE</name>
-              <value>1</value>
-            </property>
             <property>
               <name>FUNCTIONS_EXTENSION_VERSION</name>
-              <value>~2</value>
-            </property>
-            <property>
-              <name>FUNCTIONS_WORKER_RUNTIME</name>
-              <value>java</value>
+              <value>~3</value>
             </property>
           </appSettings>
         </configuration>
@@ -179,24 +177,23 @@
               </resources>
             </configuration>
           </execution>
-          <!-- copy the uber-jar into Azure staging directory -->
+        </executions>
+      </plugin>
+      <!-- azure plugin wants a specific name for the jar so need to copy runner jar and rename it -->
+      <plugin>
+        <groupId>com.coderplus.maven.plugins</groupId>
+        <artifactId>copy-rename-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
           <execution>
-            <id>copy-uberjar</id>
-            <phase>install</phase>
+            <id>rename-file</id>
+            <phase>package</phase>
             <goals>
-              <goal>copy-resources</goal>
+              <goal>copy</goal>
             </goals>
             <configuration>
-              <overwrite>true</overwrite>
-              <outputDirectory>${stagingDirectory}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}</directory>
-                  <includes>
-                    <include>${project.artifactId}-${project.version}-runner.jar</include>
-                  </includes>
-                </resource>
-              </resources>
+              <sourceFile>${project.build.directory}/${project.artifactId}-${project.version}-runner.jar</sourceFile>
+              <destinationFile>${stagingDirectory}/${project.artifactId}-${project.version}.jar</destinationFile>
             </configuration>
           </execution>
         </executions>
diff --git a/extensions/azure-functions-http/pom.xml b/extensions/azure-functions-http/pom.xml
index e9c4267f9f1cb..b68a683b1ab58 100644
--- a/extensions/azure-functions-http/pom.xml
+++ b/extensions/azure-functions-http/pom.xml
@@ -6,7 +6,7 @@
   ~ 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
+  ~     https://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,
@@ -19,10 +19,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/azure-functions-http/runtime/pom.xml b/extensions/azure-functions-http/runtime/pom.xml
index 5a2cf1ce6b60a..d77049dd8bcca 100644
--- a/extensions/azure-functions-http/runtime/pom.xml
+++ b/extensions/azure-functions-http/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-azure-functions-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure.functions</groupId>
diff --git a/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/BaseFunction.java b/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/BaseFunction.java
index 6f21cd88ce7cb..1f3f55629f98f 100644
--- a/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/BaseFunction.java
+++ b/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/BaseFunction.java
@@ -34,10 +34,13 @@
 public class BaseFunction {
     private static final Logger log = Logger.getLogger("io.quarkus.azure");
 
-    protected static final String deploymentStatus;
+    protected static String deploymentStatus;
     protected static boolean started = false;
+    protected static boolean bootstrapError = false;
 
-    static {
+    private static final int BUFFER_SIZE = 8096;
+
+    protected static void initQuarkus() {
         StringWriter error = new StringWriter();
         PrintWriter errorWriter = new PrintWriter(error, true);
         if (Application.currentApplication() == null) { // were we already bootstrapped?  Needed for mock azure unit testing.
@@ -48,7 +51,8 @@ public class BaseFunction {
                 app.start(args);
                 errorWriter.println("Quarkus bootstrapped successfully.");
                 started = true;
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
+                bootstrapError = true;
                 errorWriter.println("Quarkus bootstrap failed.");
                 ex.printStackTrace(errorWriter);
             }
@@ -59,7 +63,7 @@ public class BaseFunction {
         deploymentStatus = error.toString();
     }
 
-    protected HttpResponseMessage dispatch(HttpRequestMessage<Optional<byte[]>> request) {
+    protected HttpResponseMessage dispatch(HttpRequestMessage<Optional<String>> request) {
         try {
             return nettyDispatch(request);
         } catch (Exception e) {
@@ -69,7 +73,7 @@ protected HttpResponseMessage dispatch(HttpRequestMessage<Optional<byte[]>> requ
         }
     }
 
-    protected HttpResponseMessage nettyDispatch(HttpRequestMessage<Optional<byte[]>> request)
+    protected HttpResponseMessage nettyDispatch(HttpRequestMessage<Optional<String>> request)
             throws Exception {
         String path = request.getUri().getRawPath();
         String query = request.getUri().getRawQuery();
@@ -88,7 +92,7 @@ protected HttpResponseMessage nettyDispatch(HttpRequestMessage<Optional<byte[]>>
 
         HttpContent requestContent = LastHttpContent.EMPTY_LAST_CONTENT;
         if (request.getBody().isPresent()) {
-            ByteBuf body = Unpooled.wrappedBuffer(request.getBody().get());
+            ByteBuf body = Unpooled.wrappedBuffer(request.getBody().get().getBytes());
             requestContent = new DefaultLastHttpContent(body);
         }
 
@@ -106,7 +110,7 @@ protected HttpResponseMessage nettyDispatch(HttpRequestMessage<Optional<byte[]>>
 
     private static ByteArrayOutputStream createByteStream() {
         ByteArrayOutputStream baos;
-        baos = new ByteArrayOutputStream(500);
+        baos = new ByteArrayOutputStream(BUFFER_SIZE);
         return baos;
     }
 
@@ -115,9 +119,9 @@ private static class ResponseHandler implements VirtualResponseHandler {
         ByteArrayOutputStream baos;
         WritableByteChannel byteChannel;
         CompletableFuture<HttpResponseMessage> future = new CompletableFuture<>();
-        final HttpRequestMessage<Optional<byte[]>> request;
+        final HttpRequestMessage<Optional<String>> request;
 
-        public ResponseHandler(HttpRequestMessage<Optional<byte[]>> request) {
+        public ResponseHandler(HttpRequestMessage<Optional<String>> request) {
             this.request = request;
         }
 
@@ -136,7 +140,6 @@ public void handleMessage(Object msg) {
                 if (msg instanceof HttpContent) {
                     HttpContent content = (HttpContent) msg;
                     if (baos == null) {
-                        // todo what is right size?
                         baos = createByteStream();
                     }
                     int readable = content.content().readableBytes();
diff --git a/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/Function.java b/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/Function.java
index 9c178b7d53b2c..94a73ac9f9c85 100644
--- a/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/Function.java
+++ b/extensions/azure-functions-http/runtime/src/main/java/io/quarkus/azure/functions/resteasy/runtime/Function.java
@@ -12,9 +12,12 @@
 public class Function extends BaseFunction {
 
     public HttpResponseMessage run(
-            @HttpTrigger(name = "req") HttpRequestMessage<Optional<byte[]>> request,
+            @HttpTrigger(name = "req") HttpRequestMessage<Optional<String>> request,
             final ExecutionContext context) {
-        if (!started) {
+        if (!started && !bootstrapError) {
+            initQuarkus();
+        }
+        if (bootstrapError) {
             HttpResponseMessage.Builder responseBuilder = request
                     .createResponseBuilder(HttpStatus.valueOf(500)).body(
                             deploymentStatus.getBytes(StandardCharsets.UTF_8));
diff --git a/extensions/azure-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/azure-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 7bb126a9fd9e0..628632236297d 100644
--- a/extensions/azure-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/azure-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -8,3 +8,8 @@ metadata:
   - "cloud"
   guide: "https://quarkus.io/guides/azure-functions-http"
   status: "preview"
+  codestart:
+    name: "azure-functions-http"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/cache/deployment/pom.xml b/extensions/cache/deployment/pom.xml
index 8188d8178cb88..7f5f0197b7714 100644
--- a/extensions/cache/deployment/pom.xml
+++ b/extensions/cache/deployment/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-cache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-cache-deployment</artifactId>
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheAnnotationsTransformer.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheAnnotationsTransformer.java
index 5e28635699d07..da9123645f01d 100644
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheAnnotationsTransformer.java
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheAnnotationsTransformer.java
@@ -1,109 +1,52 @@
 package io.quarkus.cache.deployment;
 
 import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_INVALIDATE;
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_INVALIDATE_ALL;
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_INVALIDATE_ALL_LIST;
 import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_INVALIDATE_LIST;
 import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_KEY;
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_KEY_PARAMETER_POSITIONS_PARAM;
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_NAME_PARAM;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_KEY_PARAMETER_POSITIONS;
 import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_RESULT;
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.LOCK_TIMEOUT_PARAM;
+import static org.jboss.jandex.AnnotationInstance.create;
+import static org.jboss.jandex.AnnotationTarget.Kind.METHOD;
+import static org.jboss.jandex.AnnotationValue.createArrayValue;
+import static org.jboss.jandex.AnnotationValue.createShortValue;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationTarget.Kind;
 import org.jboss.jandex.AnnotationValue;
-import org.jboss.jandex.DotName;
 import org.jboss.jandex.MethodInfo;
 
 import io.quarkus.arc.processor.AnnotationsTransformer;
-import io.quarkus.cache.runtime.CacheInvalidateAllInterceptorBinding;
-import io.quarkus.cache.runtime.CacheInvalidateInterceptorBinding;
-import io.quarkus.cache.runtime.CacheResultInterceptorBinding;
 
 public class CacheAnnotationsTransformer implements AnnotationsTransformer {
 
     @Override
     public boolean appliesTo(Kind kind) {
-        return Kind.METHOD == kind;
+        return kind == METHOD;
     }
 
     @Override
     public void transform(TransformationContext context) {
         MethodInfo method = context.getTarget().asMethod();
-        List<AnnotationInstance> interceptorBindings = new ArrayList<>();
-        for (AnnotationInstance annotation : method.annotations()) {
-            AnnotationTarget target = annotation.target();
-            if (target.kind() == Kind.METHOD) {
-                if (CACHE_INVALIDATE_ALL.equals(annotation.name())) {
-                    interceptorBindings.add(createCacheInvalidateAllBinding(annotation, target));
-                } else if (CACHE_INVALIDATE_ALL_LIST.equals(annotation.name())) {
-                    for (AnnotationInstance nestedAnnotation : annotation.value("value").asNestedArray()) {
-                        interceptorBindings.add(createCacheInvalidateAllBinding(nestedAnnotation, target));
-                    }
-                } else if (CACHE_INVALIDATE.equals(annotation.name())) {
-                    interceptorBindings.add(createCacheInvalidateBinding(method, annotation, target));
-                } else if (CACHE_INVALIDATE_LIST.equals(annotation.name())) {
-                    for (AnnotationInstance nestedAnnotation : annotation.value("value").asNestedArray()) {
-                        interceptorBindings.add(createCacheInvalidateBinding(method, nestedAnnotation, target));
-                    }
-                } else if (CACHE_RESULT.equals(annotation.name())) {
-                    interceptorBindings.add(createCacheResultBinding(method, annotation, target));
-                }
+        if (requiresCacheKeyParameterPositionsInterceptorBinding(method)) {
+            List<AnnotationValue> positions = new ArrayList<>();
+            for (AnnotationInstance annotation : method.annotations(CACHE_KEY)) {
+                positions.add(createShortValue("", annotation.target().asMethodParameter().position()));
             }
-        }
-        context.transform().addAll(interceptorBindings).done();
-    }
-
-    private AnnotationInstance createCacheInvalidateAllBinding(AnnotationInstance annotation, AnnotationTarget target) {
-        return createBinding(CacheInvalidateAllInterceptorBinding.class, target, getCacheName(annotation));
-    }
-
-    private AnnotationInstance createCacheInvalidateBinding(MethodInfo method, AnnotationInstance annotation,
-            AnnotationTarget target) {
-        List<AnnotationValue> parameters = new ArrayList<>();
-        parameters.add(getCacheName(annotation));
-        findCacheKeyParameters(method).ifPresent(parameters::add);
-        return createBinding(CacheInvalidateInterceptorBinding.class, target, toArray(parameters));
-    }
-
-    private AnnotationInstance createCacheResultBinding(MethodInfo method, AnnotationInstance annotation,
-            AnnotationTarget target) {
-        List<AnnotationValue> parameters = new ArrayList<>();
-        parameters.add(getCacheName(annotation));
-        findCacheKeyParameters(method).ifPresent(parameters::add);
-        findLockTimeout(annotation).ifPresent(parameters::add);
-        return createBinding(CacheResultInterceptorBinding.class, target, toArray(parameters));
-    }
-
-    private AnnotationInstance createBinding(Class<?> bindingClass, AnnotationTarget target, AnnotationValue... values) {
-        return AnnotationInstance.create(DotName.createSimple(bindingClass.getName()), target, values);
-    }
-
-    private AnnotationValue getCacheName(AnnotationInstance annotation) {
-        return annotation.value(CACHE_NAME_PARAM);
-    }
-
-    private Optional<AnnotationValue> findCacheKeyParameters(MethodInfo method) {
-        List<AnnotationValue> parameters = new ArrayList<>();
-        for (AnnotationInstance annotation : method.annotations()) {
-            if (annotation.target().kind() == Kind.METHOD_PARAMETER && CACHE_KEY.equals(annotation.name())) {
-                parameters.add(AnnotationValue.createShortValue("", annotation.target().asMethodParameter().position()));
+            if (!positions.isEmpty()) {
+                AnnotationValue annotationValue = createArrayValue("value", toArray(positions));
+                AnnotationInstance binding = create(CACHE_KEY_PARAMETER_POSITIONS, method,
+                        new AnnotationValue[] { annotationValue });
+                context.transform().add(binding).done();
             }
         }
-        if (parameters.isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(AnnotationValue.createArrayValue(CACHE_KEY_PARAMETER_POSITIONS_PARAM, toArray(parameters)));
     }
 
-    private Optional<AnnotationValue> findLockTimeout(AnnotationInstance annotation) {
-        return Optional.ofNullable(annotation.value(LOCK_TIMEOUT_PARAM));
+    private boolean requiresCacheKeyParameterPositionsInterceptorBinding(MethodInfo method) {
+        return method.hasAnnotation(CACHE_KEY) && (method.hasAnnotation(CACHE_INVALIDATE)
+                || method.hasAnnotation(CACHE_INVALIDATE_LIST) || method.hasAnnotation(CACHE_RESULT));
     }
 
     private AnnotationValue[] toArray(List<AnnotationValue> parameters) {
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheConfig.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheConfig.java
index 9a23c59c6a80e..fa87ec3073a9d 100644
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheConfig.java
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheConfig.java
@@ -14,6 +14,12 @@
 @ConfigRoot
 public class CacheConfig {
 
+    /**
+     * Whether or not the cache extension is enabled.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enabled;
+
     /**
      * Cache type.
      */
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheDeploymentConstants.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheDeploymentConstants.java
index 0116dadc22830..3cc4b256e6c94 100644
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheDeploymentConstants.java
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheDeploymentConstants.java
@@ -8,26 +8,37 @@
 import io.quarkus.cache.CacheInvalidate;
 import io.quarkus.cache.CacheInvalidateAll;
 import io.quarkus.cache.CacheKey;
+import io.quarkus.cache.CacheName;
 import io.quarkus.cache.CacheResult;
+import io.quarkus.cache.runtime.CacheInvalidateAllInterceptor;
+import io.quarkus.cache.runtime.CacheInvalidateInterceptor;
+import io.quarkus.cache.runtime.CacheKeyParameterPositions;
+import io.quarkus.cache.runtime.CacheResultInterceptor;
 
 public class CacheDeploymentConstants {
 
     // API annotations names.
+    public static final DotName CACHE_NAME = dotName(CacheName.class);
     public static final DotName CACHE_INVALIDATE_ALL = dotName(CacheInvalidateAll.class);
     public static final DotName CACHE_INVALIDATE_ALL_LIST = dotName(CacheInvalidateAll.List.class);
     public static final DotName CACHE_INVALIDATE = dotName(CacheInvalidate.class);
     public static final DotName CACHE_INVALIDATE_LIST = dotName(CacheInvalidate.List.class);
     public static final DotName CACHE_RESULT = dotName(CacheResult.class);
     public static final DotName CACHE_KEY = dotName(CacheKey.class);
-    public static final List<DotName> API_METHODS_ANNOTATIONS = Arrays.asList(
-            CACHE_RESULT, CACHE_INVALIDATE, CACHE_INVALIDATE_ALL);
-    public static final List<DotName> API_METHODS_ANNOTATIONS_LISTS = Arrays.asList(
-            CACHE_INVALIDATE_LIST, CACHE_INVALIDATE_ALL_LIST);
+    public static final List<DotName> INTERCEPTOR_BINDINGS = Arrays.asList(CACHE_RESULT, CACHE_INVALIDATE,
+            CACHE_INVALIDATE_ALL);
+    public static final List<DotName> INTERCEPTOR_BINDING_CONTAINERS = Arrays.asList(CACHE_INVALIDATE_LIST,
+            CACHE_INVALIDATE_ALL_LIST);
+    public static final List<DotName> INTERCEPTORS = Arrays.asList(dotName(CacheInvalidateAllInterceptor.class),
+            dotName(CacheInvalidateInterceptor.class), dotName(CacheResultInterceptor.class));
+    public static final DotName CACHE_KEY_PARAMETER_POSITIONS = dotName(CacheKeyParameterPositions.class);
+
+    // MicroProfile REST Client.
+    public static final DotName REGISTER_REST_CLIENT = DotName
+            .createSimple("org.eclipse.microprofile.rest.client.inject.RegisterRestClient");
 
     // Annotations parameters.
     public static final String CACHE_NAME_PARAM = "cacheName";
-    public static final String CACHE_KEY_PARAMETER_POSITIONS_PARAM = "cacheKeyParameterPositions";
-    public static final String LOCK_TIMEOUT_PARAM = "lockTimeout";
 
     // Caffeine.
     public static final String CAFFEINE_CACHE_TYPE = "caffeine";
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheMethodValidator.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheMethodValidator.java
deleted file mode 100644
index ebcc057f0c573..0000000000000
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheMethodValidator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.cache.deployment;
-
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_RESULT;
-
-import java.util.List;
-
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.Type.Kind;
-
-import io.quarkus.arc.processor.AnnotationStore;
-import io.quarkus.arc.processor.BeanInfo;
-import io.quarkus.cache.deployment.exception.IllegalReturnTypeException;
-
-public class CacheMethodValidator {
-
-    public static void validateAnnotations(AnnotationStore annotationStore, BeanInfo bean, MethodInfo method,
-            List<Throwable> throwables) {
-
-        AnnotationInstance cacheResult = annotationStore.getAnnotation(method, CACHE_RESULT);
-        if (cacheResult != null && method.returnType().kind() == Kind.VOID) {
-            String exceptionMessage = "The @CacheResult annotation is not allowed on a method returning void: [class= "
-                    + bean.getBeanClass() + ", method= " + method + "]";
-            throwables.add(new IllegalReturnTypeException(exceptionMessage));
-        }
-    }
-}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheNamesBuildItem.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheNamesBuildItem.java
new file mode 100644
index 0000000000000..2d3c6807e6f70
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheNamesBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.cache.deployment;
+
+import java.util.Set;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * This build item is used to pass the full list of cache names from the validation step to the recording step.
+ */
+public final class CacheNamesBuildItem extends SimpleBuildItem {
+
+    private final Set<String> names;
+
+    public CacheNamesBuildItem(Set<String> names) {
+        this.names = names;
+    }
+
+    public Set<String> getNames() {
+        return names;
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java
index 4358b4d236b60..8f562a9fc0567 100644
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java
@@ -1,40 +1,53 @@
 package io.quarkus.cache.deployment;
 
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.API_METHODS_ANNOTATIONS;
-import static io.quarkus.cache.deployment.CacheDeploymentConstants.API_METHODS_ANNOTATIONS_LISTS;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_INVALIDATE;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_INVALIDATE_LIST;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_KEY;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_NAME;
 import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_NAME_PARAM;
-import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
-import static org.jboss.jandex.AnnotationTarget.Kind.METHOD;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.CACHE_RESULT;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.INTERCEPTORS;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.INTERCEPTOR_BINDINGS;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.INTERCEPTOR_BINDING_CONTAINERS;
+import static io.quarkus.cache.deployment.CacheDeploymentConstants.REGISTER_REST_CLIENT;
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Supplier;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.spi.DeploymentException;
 
 import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationTarget.Kind;
+import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
+import io.quarkus.arc.deployment.AutoInjectAnnotationBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
-import io.quarkus.arc.processor.AnnotationStore;
-import io.quarkus.arc.processor.BeanInfo;
-import io.quarkus.arc.processor.BuildExtension.Key;
-import io.quarkus.cache.runtime.CacheInvalidateAllInterceptor;
-import io.quarkus.cache.runtime.CacheInvalidateInterceptor;
-import io.quarkus.cache.runtime.CacheResultInterceptor;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.deployment.exception.ClassTargetException;
+import io.quarkus.cache.deployment.exception.PrivateMethodTargetException;
+import io.quarkus.cache.deployment.exception.UnknownCacheNameException;
+import io.quarkus.cache.deployment.exception.UnsupportedRepeatedAnnotationException;
+import io.quarkus.cache.deployment.exception.VoidReturnTypeTargetException;
 import io.quarkus.cache.runtime.caffeine.CaffeineCacheBuildRecorder;
 import io.quarkus.cache.runtime.caffeine.CaffeineCacheInfo;
+import io.quarkus.cache.runtime.noop.NoOpCacheBuildRecorder;
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 
@@ -46,71 +59,194 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    AnnotationsTransformerBuildItem annotationsTransformer() {
-        return new AnnotationsTransformerBuildItem(new CacheAnnotationsTransformer());
+    AutoInjectAnnotationBuildItem autoInjectCacheName() {
+        return new AutoInjectAnnotationBuildItem(CACHE_NAME);
     }
 
     @BuildStep
-    List<AdditionalBeanBuildItem> additionalBeans() {
-        return Arrays.asList(
-                new AdditionalBeanBuildItem(CacheInvalidateAllInterceptor.class),
-                new AdditionalBeanBuildItem(CacheInvalidateInterceptor.class),
-                new AdditionalBeanBuildItem(CacheResultInterceptor.class));
+    AnnotationsTransformerBuildItem annotationsTransformer() {
+        return new AnnotationsTransformerBuildItem(new CacheAnnotationsTransformer());
     }
 
     @BuildStep
-    ValidationErrorBuildItem validateBeanDeployment(ValidationPhaseBuildItem validationPhase) {
-        AnnotationStore annotationStore = validationPhase.getContext().get(Key.ANNOTATION_STORE);
+    void validateCacheAnnotationsAndProduceCacheNames(CombinedIndexBuildItem combinedIndex,
+            List<AdditionalCacheNameBuildItem> additionalCacheNames, BuildProducer<ValidationErrorBuildItem> validationErrors,
+            BuildProducer<CacheNamesBuildItem> cacheNames) {
+
+        // Validation errors produced by this build step.
         List<Throwable> throwables = new ArrayList<>();
-        for (BeanInfo bean : validationPhase.getContext().get(Key.BEANS)) {
-            if (bean.isClassBean()) {
-                for (MethodInfo method : bean.getTarget().get().asClass().methods()) {
-                    if (annotationStore.hasAnyAnnotation(method, API_METHODS_ANNOTATIONS)) {
-                        CacheMethodValidator.validateAnnotations(annotationStore, bean, method, throwables);
+        // Cache names produced by this build step.
+        Set<String> names = new HashSet<>();
+
+        /*
+         * First, for each non-repeated cache interceptor binding:
+         * - its target is validated
+         * - the corresponding cache name is collected
+         */
+        for (DotName bindingName : INTERCEPTOR_BINDINGS) {
+            for (AnnotationInstance binding : combinedIndex.getIndex().getAnnotations(bindingName)) {
+                throwables.addAll(validateInterceptorBindingTarget(binding, binding.target()));
+                if (binding.target().kind() == Kind.METHOD) {
+                    /*
+                     * Cache names from the interceptor bindings placed on cache interceptors must not be collected to prevent
+                     * the instantiation of a cache with an empty name.
+                     */
+                    names.add(binding.value(CACHE_NAME_PARAM).asString());
+                }
+            }
+        }
+
+        // The exact same things need to be done for repeated cache interceptor bindings.
+        for (DotName containerName : INTERCEPTOR_BINDING_CONTAINERS) {
+            for (AnnotationInstance container : combinedIndex.getIndex().getAnnotations(containerName)) {
+                for (AnnotationInstance binding : container.value("value").asNestedArray()) {
+                    throwables.addAll(validateInterceptorBindingTarget(binding, container.target()));
+                    names.add(binding.value(CACHE_NAME_PARAM).asString());
+                }
+                /*
+                 * Interception from repeated interceptor bindings won't work with the CDI implementation from MicroProfile REST
+                 * Client. Using repeated interceptor bindings on a method from a class annotated with @RegisterRestClient must
+                 * therefore be forbidden.
+                 */
+                if (container.target().kind() == Kind.METHOD) {
+                    MethodInfo methodInfo = container.target().asMethod();
+                    if (methodInfo.declaringClass().classAnnotation(REGISTER_REST_CLIENT) != null) {
+                        throwables.add(new UnsupportedRepeatedAnnotationException(methodInfo));
                     }
                 }
             }
         }
-        return new ValidationErrorBuildItem(throwables.toArray(new Throwable[0]));
-    }
 
-    @BuildStep
-    @Record(RUNTIME_INIT)
-    void recordCachesBuild(CombinedIndexBuildItem combinedIndex, BeanContainerBuildItem beanContainer, CacheConfig config,
-            CaffeineCacheBuildRecorder caffeineRecorder,
-            List<AdditionalCacheNameBuildItem> additionalCacheNames) {
-        Set<String> cacheNames = getCacheNames(combinedIndex.getIndex());
+        /*
+         * Before @CacheName can be validated, additional cache names provided by other extensions must be added to the cache
+         * names collection built above.
+         */
         for (AdditionalCacheNameBuildItem additionalCacheName : additionalCacheNames) {
-            cacheNames.add(additionalCacheName.getName());
+            names.add(additionalCacheName.getName());
         }
-        switch (config.type) {
-            case CacheDeploymentConstants.CAFFEINE_CACHE_TYPE:
-                Set<CaffeineCacheInfo> cacheInfos = CaffeineCacheInfoBuilder.build(cacheNames, config);
-                caffeineRecorder.buildCaches(beanContainer.getValue(), cacheInfos);
+
+        // @CacheName can now be validated.
+        for (AnnotationInstance qualifier : combinedIndex.getIndex().getAnnotations(CACHE_NAME)) {
+            String cacheName = qualifier.value().asString();
+            AnnotationTarget target = qualifier.target();
+            switch (target.kind()) {
+                case FIELD:
+                    if (!names.contains(cacheName)) {
+                        ClassInfo declaringClass = target.asField().declaringClass();
+                        throwables.add(new UnknownCacheNameException(declaringClass.name(), cacheName));
+                    }
+                    break;
+                case METHOD:
+                    /*
+                     * This should only happen in CacheProducer. It'd be nice if we could forbid using @CacheName in any other
+                     * class, but Arc throws an AmbiguousResolutionException before we get a chance to validate things here.
+                     */
+                    break;
+                case METHOD_PARAMETER:
+                    if (!names.contains(cacheName)) {
+                        ClassInfo declaringClass = target.asMethodParameter().method().declaringClass();
+                        throwables.add(new UnknownCacheNameException(declaringClass.name(), cacheName));
+                    }
+                    break;
+                default:
+                    // This should never be thrown.
+                    throw new DeploymentException("Unexpected @CacheName target: " + target.kind());
+            }
+        }
+
+        validationErrors.produce(new ValidationErrorBuildItem(throwables.toArray(new Throwable[0])));
+        cacheNames.produce(new CacheNamesBuildItem(names));
+    }
+
+    private List<Throwable> validateInterceptorBindingTarget(AnnotationInstance binding, AnnotationTarget target) {
+        List<Throwable> throwables = new ArrayList<>();
+        switch (target.kind()) {
+            case CLASS:
+                ClassInfo classInfo = target.asClass();
+                if (!INTERCEPTORS.contains(classInfo.name())) {
+                    throwables.add(new ClassTargetException(classInfo.name(), binding.name()));
+                }
+                break;
+            case METHOD:
+                MethodInfo methodInfo = target.asMethod();
+                if (Modifier.isPrivate(methodInfo.flags())) {
+                    throwables.add(new PrivateMethodTargetException(methodInfo, binding.name()));
+                }
+                if (CACHE_RESULT.equals(binding.name()) && methodInfo.returnType().kind() == Type.Kind.VOID) {
+                    throwables.add(new VoidReturnTypeTargetException(methodInfo));
+                }
                 break;
             default:
-                throw new DeploymentException("Unknown cache type: " + config.type);
+                // This should never be thrown.
+                throw new DeploymentException("Unexpected cache interceptor binding target: " + target.kind());
         }
+        return throwables;
     }
 
-    private Set<String> getCacheNames(IndexView index) {
-        Set<String> cacheNames = new HashSet<>();
-        for (DotName cacheAnnotation : API_METHODS_ANNOTATIONS) {
-            for (AnnotationInstance annotation : index.getAnnotations(cacheAnnotation)) {
-                if (annotation.target().kind() == METHOD) {
-                    cacheNames.add(annotation.value(CACHE_NAME_PARAM).asString());
-                }
+    @BuildStep
+    @Record(STATIC_INIT)
+    SyntheticBeanBuildItem configureCacheManagerSyntheticBean(CacheNamesBuildItem cacheNames, CacheConfig config,
+            CaffeineCacheBuildRecorder caffeineRecorder, NoOpCacheBuildRecorder noOpRecorder) {
+
+        Supplier<CacheManager> cacheManagerSupplier;
+        if (config.enabled) {
+            switch (config.type) {
+                case CacheDeploymentConstants.CAFFEINE_CACHE_TYPE:
+                    Set<CaffeineCacheInfo> cacheInfos = CaffeineCacheInfoBuilder.build(cacheNames.getNames(), config);
+                    cacheManagerSupplier = caffeineRecorder.getCacheManagerSupplier(cacheInfos);
+                    break;
+                default:
+                    throw new DeploymentException("Unknown cache type: " + config.type);
             }
+        } else {
+            cacheManagerSupplier = noOpRecorder.getCacheManagerSupplier(cacheNames.getNames());
         }
-        for (DotName list : API_METHODS_ANNOTATIONS_LISTS) {
-            for (AnnotationInstance annotation : index.getAnnotations(list)) {
-                if (annotation.target().kind() == METHOD) {
-                    for (AnnotationInstance nestedAnnotation : annotation.value("value").asNestedArray()) {
-                        cacheNames.add(nestedAnnotation.value(CACHE_NAME_PARAM).asString());
+
+        return SyntheticBeanBuildItem.configure(CacheManager.class)
+                .scope(ApplicationScoped.class)
+                .supplier(cacheManagerSupplier)
+                .done();
+    }
+
+    @BuildStep
+    List<BytecodeTransformerBuildItem> enhanceRestClientMethods(CombinedIndexBuildItem combinedIndex) {
+        List<BytecodeTransformerBuildItem> bytecodeTransformers = new ArrayList<>();
+        for (AnnotationInstance registerRestClientAnnotation : combinedIndex.getIndex().getAnnotations(REGISTER_REST_CLIENT)) {
+            if (registerRestClientAnnotation.target().kind() == Kind.CLASS) {
+                ClassInfo classInfo = registerRestClientAnnotation.target().asClass();
+                for (MethodInfo methodInfo : classInfo.methods()) {
+                    if (methodInfo.hasAnnotation(CACHE_INVALIDATE) || methodInfo.hasAnnotation(CACHE_INVALIDATE_LIST)
+                            || methodInfo.hasAnnotation(CACHE_RESULT)) {
+                        short[] cacheKeyParameterPositions = getCacheKeyParameterPositions(methodInfo);
+                        /*
+                         * The bytecode transformation is always performed even if `cacheKeyParameterPositions` is empty because
+                         * the method parameters would be inspected using reflection at run time otherwise.
+                         */
+                        bytecodeTransformers.add(new BytecodeTransformerBuildItem(classInfo.toString(),
+                                new RestClientMethodEnhancer(methodInfo.name(), cacheKeyParameterPositions)));
                     }
                 }
             }
         }
-        return cacheNames;
+        return bytecodeTransformers;
+    }
+
+    /**
+     * Returns an array containing the positions of the given method parameters annotated with
+     * {@link io.quarkus.cache.CacheKey @CacheKey}, or an empty array if no such parameter is found.
+     * 
+     * @param methodInfo method info
+     * @return cache key parameters positions
+     */
+    private short[] getCacheKeyParameterPositions(MethodInfo methodInfo) {
+        List<Short> positions = new ArrayList<>();
+        for (AnnotationInstance annotation : methodInfo.annotations(CACHE_KEY)) {
+            positions.add(annotation.target().asMethodParameter().position());
+        }
+        short[] result = new short[positions.size()];
+        for (int i = 0; i < positions.size(); i++) {
+            result[i] = positions.get(i);
+        }
+        return result;
     }
 }
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CaffeineCacheInfoBuilder.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CaffeineCacheInfoBuilder.java
index 1e61fdb56426a..87563be91a767 100644
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CaffeineCacheInfoBuilder.java
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CaffeineCacheInfoBuilder.java
@@ -1,5 +1,6 @@
 package io.quarkus.cache.deployment;
 
+import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -9,19 +10,21 @@
 public class CaffeineCacheInfoBuilder {
 
     public static Set<CaffeineCacheInfo> build(Set<String> cacheNames, CacheConfig cacheConfig) {
-        return cacheNames.stream().map(cacheName -> {
-            CaffeineCacheInfo cacheInfo = new CaffeineCacheInfo();
-            cacheInfo.name = cacheName;
-
-            CaffeineNamespaceConfig namespaceConfig = cacheConfig.caffeine.namespace.get(cacheInfo.name);
-            if (namespaceConfig != null) {
-                namespaceConfig.initialCapacity.ifPresent(capacity -> cacheInfo.initialCapacity = capacity);
-                namespaceConfig.maximumSize.ifPresent(size -> cacheInfo.maximumSize = size);
-                namespaceConfig.expireAfterWrite.ifPresent(delay -> cacheInfo.expireAfterWrite = delay);
-                namespaceConfig.expireAfterAccess.ifPresent(delay -> cacheInfo.expireAfterAccess = delay);
-            }
-
-            return cacheInfo;
-        }).collect(Collectors.toSet());
+        if (cacheNames.isEmpty()) {
+            return Collections.emptySet();
+        } else {
+            return cacheNames.stream().map(cacheName -> {
+                CaffeineCacheInfo cacheInfo = new CaffeineCacheInfo();
+                cacheInfo.name = cacheName;
+                CaffeineNamespaceConfig namespaceConfig = cacheConfig.caffeine.namespace.get(cacheInfo.name);
+                if (namespaceConfig != null) {
+                    namespaceConfig.initialCapacity.ifPresent(capacity -> cacheInfo.initialCapacity = capacity);
+                    namespaceConfig.maximumSize.ifPresent(size -> cacheInfo.maximumSize = size);
+                    namespaceConfig.expireAfterWrite.ifPresent(delay -> cacheInfo.expireAfterWrite = delay);
+                    namespaceConfig.expireAfterAccess.ifPresent(delay -> cacheInfo.expireAfterAccess = delay);
+                }
+                return cacheInfo;
+            }).collect(Collectors.toSet());
+        }
     }
 }
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/RestClientMethodEnhancer.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/RestClientMethodEnhancer.java
new file mode 100644
index 0000000000000..c7b4e8810258e
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/RestClientMethodEnhancer.java
@@ -0,0 +1,66 @@
+package io.quarkus.cache.deployment;
+
+import java.util.function.BiFunction;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+
+import io.quarkus.cache.runtime.CacheKeyParameterPositions;
+import io.quarkus.gizmo.Gizmo;
+
+/*
+ * When a MicroProfile REST Client method annotated with a caching annotation is executed, an interception is performed by the
+ * MP REST Client interceptors implementation, which is not Arc. This implementation is unaware of the
+ * @CacheKeyParameterPositions annotation that we add at build time in CacheAnnotationsTransformer to avoid relying on
+ * reflection at run time to identify the cache key elements. Reflection is bad for performances because of underlying
+ * synchronized calls. This class does a similar job as CacheAnnotationsTransformer and since it relies on bytecode
+ * transformation, the @CacheKeyParameterPositions annotation is available during the MP REST Client cache interception.
+ */
+class RestClientMethodEnhancer implements BiFunction<String, ClassVisitor, ClassVisitor> {
+
+    private static final String CACHE_KEY_PARAMETER_POSITIONS_DESCRIPTOR = "L"
+            + CacheKeyParameterPositions.class.getName().replace('.', '/') + ";";
+
+    private final String methodName;
+    private final short[] cacheKeyParameterPositions;
+
+    public RestClientMethodEnhancer(String methodName, short[] cacheKeyParameterPositions) {
+        this.methodName = methodName;
+        this.cacheKeyParameterPositions = cacheKeyParameterPositions;
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor classVisitor) {
+        return new ClassVisitor(Gizmo.ASM_API_VERSION, classVisitor) {
+
+            @Override
+            public MethodVisitor visitMethod(int access, String name, String descriptor, String signature,
+                    String[] exceptions) {
+
+                MethodVisitor superVisitor = super.visitMethod(access, name, descriptor, signature, exceptions);
+                if (!name.equals(methodName)) {
+                    // This is not the method we want to enhance, let's skip the bytecode transformation.
+                    return superVisitor;
+                } else {
+                    return new MethodVisitor(Gizmo.ASM_API_VERSION, superVisitor) {
+
+                        @Override
+                        public void visitEnd() {
+
+                            /*
+                             * If the method parameters at positions 0 and 2 are annotated with @CacheKey, the following code
+                             * will add the `@CacheKeyParameterPositions(value={0, 2})` annotation to the method.
+                             */
+                            AnnotationVisitor annotation = super.visitAnnotation(CACHE_KEY_PARAMETER_POSITIONS_DESCRIPTOR,
+                                    true);
+                            annotation.visit("value", cacheKeyParameterPositions);
+                            annotation.visitEnd();
+                            super.visitEnd();
+                        }
+                    };
+                }
+            }
+        };
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devconsole/DevConsoleProcessor.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..f079dc2758f7a
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,25 @@
+package io.quarkus.cache.deployment.devconsole;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import io.quarkus.cache.runtime.CaffeineCacheSupplier;
+import io.quarkus.cache.runtime.devconsole.CacheDevConsoleRecorder;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleRuntimeTemplateInfoBuildItem collectBeanInfo() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("cacheInfos", new CaffeineCacheSupplier());
+    }
+
+    @BuildStep
+    @Record(value = STATIC_INIT, optional = true)
+    DevConsoleRouteBuildItem invokeEndpoint(CacheDevConsoleRecorder recorder) {
+        return new DevConsoleRouteBuildItem("caches", "POST", recorder.clearCacheHandler());
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/ClassTargetException.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/ClassTargetException.java
new file mode 100644
index 0000000000000..d989baa4907f6
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/ClassTargetException.java
@@ -0,0 +1,24 @@
+package io.quarkus.cache.deployment.exception;
+
+import org.jboss.jandex.DotName;
+
+/**
+ * This exception is thrown at build time during the validation phase if a class is annotated with
+ * {@link io.quarkus.cache.CacheInvalidate @CacheInvalidate}, {@link io.quarkus.cache.CacheInvalidateAll @CacheInvalidateAll} or
+ * {@link io.quarkus.cache.CacheResult @CacheResult}. These annotations are only allowed at type level for the caching
+ * interceptors from this extension.
+ */
+@SuppressWarnings("serial")
+public class ClassTargetException extends RuntimeException {
+
+    private final DotName className;
+
+    public ClassTargetException(DotName className, DotName annotationName) {
+        super("Caching annotations are not allowed on a class [class=" + className + ", annotation=" + annotationName + "]");
+        this.className = className;
+    }
+
+    public DotName getClassName() {
+        return className;
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/IllegalReturnTypeException.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/IllegalReturnTypeException.java
deleted file mode 100644
index 197715fe29046..0000000000000
--- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/IllegalReturnTypeException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.quarkus.cache.deployment.exception;
-
-@SuppressWarnings("serial")
-public class IllegalReturnTypeException extends RuntimeException {
-
-    public IllegalReturnTypeException(String message) {
-        super(message);
-    }
-}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/PrivateMethodTargetException.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/PrivateMethodTargetException.java
new file mode 100644
index 0000000000000..de1b85baa3da5
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/PrivateMethodTargetException.java
@@ -0,0 +1,25 @@
+package io.quarkus.cache.deployment.exception;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+
+/**
+ * This exception is thrown at build time during the validation phase if a private method is annotated with
+ * {@link io.quarkus.cache.CacheInvalidate @CacheInvalidate}, {@link io.quarkus.cache.CacheInvalidateAll @CacheInvalidateAll} or
+ * {@link io.quarkus.cache.CacheResult @CacheResult}.
+ */
+@SuppressWarnings("serial")
+public class PrivateMethodTargetException extends RuntimeException {
+
+    private final MethodInfo methodInfo;
+
+    public PrivateMethodTargetException(MethodInfo methodInfo, DotName annotationName) {
+        super("Caching annotations are not allowed on a private method [class=" + methodInfo.declaringClass().name()
+                + ", method=" + methodInfo.name() + ", annotation=" + annotationName + "]");
+        this.methodInfo = methodInfo;
+    }
+
+    public MethodInfo getMethodInfo() {
+        return methodInfo;
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/UnknownCacheNameException.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/UnknownCacheNameException.java
new file mode 100644
index 0000000000000..a1e91a78b4421
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/UnknownCacheNameException.java
@@ -0,0 +1,26 @@
+package io.quarkus.cache.deployment.exception;
+
+import org.jboss.jandex.DotName;
+
+/**
+ * This exception is thrown at build time during the validation phase if a field, a constructor or a method parameter annotated
+ * with {@link io.quarkus.cache.CacheName @CacheName} is referencing an unknown cache name. A cache name is unknown if it is not
+ * used in any {@link io.quarkus.cache.CacheInvalidate @CacheInvalidate},
+ * {@link io.quarkus.cache.CacheInvalidateAll @CacheInvalidateAll} or {@link io.quarkus.cache.CacheResult @CacheResult}
+ * annotation.
+ */
+@SuppressWarnings("serial")
+public class UnknownCacheNameException extends RuntimeException {
+
+    private final String cacheName;
+
+    public UnknownCacheNameException(DotName className, String cacheName) {
+        super("A field or method parameter is annotated with a @CacheName annotation referencing an unknown cache name [class="
+                + className + ", cacheName=" + cacheName + "]");
+        this.cacheName = cacheName;
+    }
+
+    public String getCacheName() {
+        return cacheName;
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/UnsupportedRepeatedAnnotationException.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/UnsupportedRepeatedAnnotationException.java
new file mode 100644
index 0000000000000..a3ed104ddb50b
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/UnsupportedRepeatedAnnotationException.java
@@ -0,0 +1,25 @@
+package io.quarkus.cache.deployment.exception;
+
+import org.jboss.jandex.MethodInfo;
+
+/**
+ * This exception is thrown at build time during the validation phase if a method from a MicroProfile REST Client bean is
+ * annotated with repeated {@link io.quarkus.cache.CacheInvalidate @CacheInvalidate} or
+ * {@link io.quarkus.cache.CacheInvalidateAll @CacheInvalidateAll} annotations. Interceptions on such a bean are not managed by
+ * Arc and the usage of repeated interceptor bindings is not currently supported.
+ */
+@SuppressWarnings("serial")
+public class UnsupportedRepeatedAnnotationException extends RuntimeException {
+
+    private final MethodInfo methodInfo;
+
+    public UnsupportedRepeatedAnnotationException(MethodInfo methodInfo) {
+        super("Repeated caching annotations on a method from a class annotated with @RegisterRestClient are not currently supported [class="
+                + methodInfo.declaringClass().name() + ", method=" + methodInfo.name() + "]");
+        this.methodInfo = methodInfo;
+    }
+
+    public MethodInfo getMethodInfo() {
+        return methodInfo;
+    }
+}
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/VoidReturnTypeTargetException.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/VoidReturnTypeTargetException.java
new file mode 100644
index 0000000000000..7ba13fb12e659
--- /dev/null
+++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/exception/VoidReturnTypeTargetException.java
@@ -0,0 +1,23 @@
+package io.quarkus.cache.deployment.exception;
+
+import org.jboss.jandex.MethodInfo;
+
+/**
+ * This exception is thrown at build time during the validation phase if a method returning void is annotated with
+ * {@link io.quarkus.cache.CacheResult @CacheResult}.
+ */
+@SuppressWarnings("serial")
+public class VoidReturnTypeTargetException extends RuntimeException {
+
+    private final MethodInfo methodInfo;
+
+    public VoidReturnTypeTargetException(MethodInfo methodInfo) {
+        super("@CacheResult is not allowed on a method returning void [class=" + methodInfo.declaringClass().name()
+                + ", method=" + methodInfo.name() + "]");
+        this.methodInfo = methodInfo;
+    }
+
+    public MethodInfo getMethodInfo() {
+        return methodInfo;
+    }
+}
diff --git a/extensions/cache/deployment/src/main/resources/dev-templates/caches.html b/extensions/cache/deployment/src/main/resources/dev-templates/caches.html
new file mode 100644
index 0000000000000..6a10705f6a4d9
--- /dev/null
+++ b/extensions/cache/deployment/src/main/resources/dev-templates/caches.html
@@ -0,0 +1,35 @@
+{#include main}
+{#style}
+.annotation {
+color: gray;
+}
+{/style}
+{#title}Caches{/title}
+{#body}
+<table class="table table-striped">
+    <thead class="thead-dark">
+    <tr>
+        <th scope="col">Name</th>
+        <th scope="col">Size</th>
+    </tr>
+    </thead>
+    <tbody>
+    {#for cacheInfo in info:cacheInfos}
+    <tr>
+        <td>
+            {cacheInfo.name}
+        </td>
+        <td>
+            <form method="post"  enctype="application/x-www-form-urlencoded">
+                <label class="form-check-label" for="clear">
+                    {cacheInfo.size}
+                </label>
+                <input type="hidden" name="name" value="{cacheInfo.name}">
+                <input id="clear" type="submit" class="btn btn-primary btn-sm" value="Clear" >
+            </form>
+        </td>
+    {/for}
+    </tbody>
+</table>
+{/body}
+{/include}
diff --git a/extensions/cache/deployment/src/main/resources/dev-templates/embedded.html b/extensions/cache/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..ea948f9198934
--- /dev/null
+++ b/extensions/cache/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,3 @@
+<a href="{urlbase}/caches" class="badge badge-light">
+  <i class="fa fa-boxes fa-fw"></i>
+  Caches <span class="badge badge-light">{info:cacheInfos.size()}</span></a>
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java
index d2cfac8cd281f..013daa0dd8b94 100644
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheConfigTest.java
@@ -13,8 +13,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.cache.CacheManager;
 import io.quarkus.cache.CacheResult;
-import io.quarkus.cache.runtime.CacheRepository;
 import io.quarkus.cache.runtime.caffeine.CaffeineCache;
 import io.quarkus.test.QuarkusUnitTest;
 
@@ -29,11 +29,11 @@ public class CacheConfigTest {
     private static final String CACHE_NAME = "test-cache";
 
     @Inject
-    CacheRepository cacheRepository;
+    CacheManager cacheManager;
 
     @Test
     public void testConfig() {
-        CaffeineCache cache = (CaffeineCache) cacheRepository.getCache(CACHE_NAME);
+        CaffeineCache cache = (CaffeineCache) cacheManager.getCache(CACHE_NAME).get();
         assertEquals(10, cache.getInitialCapacity());
         assertEquals(100L, cache.getMaximumSize());
         assertEquals(Duration.ofSeconds(30L), cache.getExpireAfterWrite());
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheResultVoidReturnTypeTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheResultVoidReturnTypeTest.java
deleted file mode 100644
index 07308282c7b83..0000000000000
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/CacheResultVoidReturnTypeTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.quarkus.cache.test.deployment;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import javax.enterprise.inject.spi.DeploymentException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.cache.CacheResult;
-import io.quarkus.cache.deployment.exception.IllegalReturnTypeException;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class CacheResultVoidReturnTypeTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(TestResource.class)).assertException(e -> {
-                assertEquals(DeploymentException.class, e.getClass());
-                assertEquals(IllegalReturnTypeException.class, e.getCause().getClass());
-            });
-
-    @Test
-    public void shouldNotBeInvoked() {
-        fail("This method should not be invoked");
-    }
-
-    @Path("/test")
-    static class TestResource {
-
-        @GET
-        @CacheResult(cacheName = "test-cache")
-        public void shouldThrowDeploymentException(String key) {
-        }
-    }
-}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java
new file mode 100644
index 0000000000000..892918f5ba7bf
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DeploymentExceptionsTest.java
@@ -0,0 +1,123 @@
+package io.quarkus.cache.test.deployment;
+
+import static java.util.Arrays.stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.stream.Stream;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheInvalidate;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheName;
+import io.quarkus.cache.CacheResult;
+import io.quarkus.cache.deployment.exception.ClassTargetException;
+import io.quarkus.cache.deployment.exception.PrivateMethodTargetException;
+import io.quarkus.cache.deployment.exception.UnknownCacheNameException;
+import io.quarkus.cache.deployment.exception.VoidReturnTypeTargetException;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * This class tests many kinds of {@link DeploymentException} causes related to caching annotations.
+ */
+public class DeploymentExceptionsTest {
+
+    private static final String UNKNOWN_CACHE_1 = "unknown-cache-1";
+    private static final String UNKNOWN_CACHE_2 = "unknown-cache-2";
+    private static final String UNKNOWN_CACHE_3 = "unknown-cache-3";
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestResource.class, TestBean.class))
+            .assertException(t -> {
+                assertEquals(DeploymentException.class, t.getClass());
+                assertEquals(10, t.getSuppressed().length);
+                assertPrivateMethodTargetException(t, "shouldThrowPrivateMethodTargetException", 1);
+                assertPrivateMethodTargetException(t, "shouldAlsoThrowPrivateMethodTargetException", 2);
+                assertVoidReturnTypeTargetException(t, "showThrowVoidReturnTypeTargetException");
+                assertClassTargetException(t, TestResource.class, 1);
+                assertClassTargetException(t, TestBean.class, 2);
+                assertUnknownCacheNameException(t, UNKNOWN_CACHE_1);
+                assertUnknownCacheNameException(t, UNKNOWN_CACHE_2);
+                assertUnknownCacheNameException(t, UNKNOWN_CACHE_3);
+            });
+
+    private static void assertPrivateMethodTargetException(Throwable t, String expectedMethodName, long expectedCount) {
+        assertEquals(expectedCount, filterSuppressed(t, PrivateMethodTargetException.class)
+                .filter(s -> expectedMethodName.equals(s.getMethodInfo().name())).count());
+    }
+
+    private static void assertVoidReturnTypeTargetException(Throwable t, String expectedMethodName) {
+        assertEquals(1, filterSuppressed(t, VoidReturnTypeTargetException.class)
+                .filter(s -> expectedMethodName.equals(s.getMethodInfo().name())).count());
+    }
+
+    private static void assertClassTargetException(Throwable t, Class<?> expectedClassName, long expectedCount) {
+        assertEquals(expectedCount, filterSuppressed(t, ClassTargetException.class)
+                .filter(s -> expectedClassName.getName().equals(s.getClassName().toString())).count());
+    }
+
+    private static void assertUnknownCacheNameException(Throwable t, String expectedCacheName) {
+        assertEquals(1, filterSuppressed(t, UnknownCacheNameException.class)
+                .filter(s -> expectedCacheName.equals(s.getCacheName())).count());
+    }
+
+    private static <T extends RuntimeException> Stream<T> filterSuppressed(Throwable t, Class<T> filterClass) {
+        return stream(t.getSuppressed()).filter(filterClass::isInstance).map(filterClass::cast);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+        fail("This method should not be invoked");
+    }
+
+    @Path("/test")
+    // Single annotation test.
+    @CacheInvalidate(cacheName = "should-throw-class-target-exception")
+    static class TestResource {
+
+        @GET
+        // Single annotation test.
+        @CacheInvalidateAll(cacheName = "should-throw-private-method-target-exception")
+        private void shouldThrowPrivateMethodTargetException() {
+        }
+
+        @GET
+        // Repeated annotations test.
+        @CacheInvalidate(cacheName = "should-throw-private-method-target-exception")
+        @CacheInvalidate(cacheName = "should-throw-private-method-target-exception")
+        private void shouldAlsoThrowPrivateMethodTargetException() {
+        }
+
+        @GET
+        @CacheResult(cacheName = "should-throw-void-return-type-target-exception")
+        public void showThrowVoidReturnTypeTargetException(String key) {
+        }
+    }
+
+    @ApplicationScoped
+    // Repeated annotations test.
+    @CacheInvalidateAll(cacheName = "should-throw-class-target-exception")
+    @CacheInvalidateAll(cacheName = "should-throw-class-target-exception")
+    static class TestBean {
+
+        @CacheName(UNKNOWN_CACHE_1)
+        Cache cache;
+
+        public TestBean(@CacheName(UNKNOWN_CACHE_2) Cache cache) {
+        }
+
+        public void setCache(@CacheName(UNKNOWN_CACHE_3) Cache cache) {
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java
new file mode 100644
index 0000000000000..57234f7b34e88
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/DisabledCacheTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.cache.test.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheResult;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DisabledCacheTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties")
+                    .addClass(CachedService.class));
+
+    private static final String KEY = "key";
+
+    @Inject
+    CachedService cachedService;
+
+    @Test
+    public void testEnabledFlagProperty() {
+        assertNotEquals(cachedService.cachedMethod(KEY), cachedService.cachedMethod(KEY));
+    }
+
+    @Dependent
+    static class CachedService {
+
+        @CacheResult(cacheName = "test-cache")
+        public Object cachedMethod(String key) {
+            return new Object();
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java
index e45781af4745f..3beff50967f1e 100644
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/deployment/UnknownCacheTypeTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.spi.DeploymentException;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -10,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.cache.CacheResult;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class UnknownCacheTypeTest {
@@ -17,11 +19,21 @@ public class UnknownCacheTypeTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource(new StringAsset("quarkus.cache.type=i_am_an_unknown_cache_type"), "application.properties"))
+                    .addAsResource(new StringAsset("quarkus.cache.type=i_am_an_unknown_cache_type"), "application.properties")
+                    .addClass(CachedService.class))
             .setExpectedException(DeploymentException.class);
 
     @Test
     public void shouldNotBeInvoked() {
         fail("This method should not be invoked");
     }
+
+    @ApplicationScoped
+    static class CachedService {
+
+        @CacheResult(cacheName = "test-cache")
+        public Object cachedMethod(String key) {
+            return new Object();
+        }
+    }
 }
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheInterceptionContextTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheInterceptionContextTest.java
new file mode 100644
index 0000000000000..2c79c35879156
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheInterceptionContextTest.java
@@ -0,0 +1,53 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.cache.CacheResult;
+import io.quarkus.cache.runtime.CacheInterceptionContext;
+
+public class CacheInterceptionContextTest {
+
+    @Test
+    public void testConstructor() {
+        assertThrows(NullPointerException.class, () -> {
+            new CacheInterceptionContext<>(null, new ArrayList<>());
+        }, "A NullPointerException should be thrown when the interceptor bindings list is null");
+        assertThrows(NullPointerException.class, () -> {
+            new CacheInterceptionContext<>(new ArrayList<>(), null);
+        }, "A NullPointerException should be thrown when the cache key parameter positions list is null");
+        // Empty lists should be allowed.
+        new CacheInterceptionContext<>(new ArrayList<>(), new ArrayList<>());
+    }
+
+    @Test
+    public void testImmutability() {
+        CacheInterceptionContext<CacheResult> context = new CacheInterceptionContext<>(new ArrayList<>(), new ArrayList<>());
+        // Lists should be unmodifiable.
+        assertThrows(UnsupportedOperationException.class, () -> {
+            context.getInterceptorBindings().add(new CacheResult() {
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return CacheResult.class;
+                }
+
+                @Override
+                public String cacheName() {
+                    return "cacheName";
+                }
+
+                @Override
+                public long lockTimeout() {
+                    return 0;
+                }
+            });
+        });
+        assertThrows(UnsupportedOperationException.class, () -> {
+            context.getCacheKeyParameterPositions().add((short) 123);
+        });
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheInterceptorTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheInterceptorTest.java
new file mode 100644
index 0000000000000..a78c7dfed858d
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheInterceptorTest.java
@@ -0,0 +1,84 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.cache.runtime.AbstractCache;
+import io.quarkus.cache.runtime.CacheInterceptor;
+import io.quarkus.cache.runtime.CompositeCacheKey;
+import io.quarkus.cache.runtime.DefaultCacheKey;
+import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.cache.runtime.caffeine.CaffeineCacheInfo;
+
+public class CacheInterceptorTest {
+
+    private static final TestCacheInterceptor TEST_CACHE_INTERCEPTOR = new TestCacheInterceptor();
+
+    @Test
+    public void testDefaultKey() {
+        // We need a CaffeineCache instance to test the default key logic.
+        CaffeineCacheInfo cacheInfo = new CaffeineCacheInfo();
+        cacheInfo.name = "test-cache";
+        CaffeineCache cache = new CaffeineCache(cacheInfo);
+
+        DefaultCacheKey expectedKey = new DefaultCacheKey(cacheInfo.name);
+        Object actualKey = getCacheKey(cache, Collections.emptyList(), new Object[] {});
+        assertEquals(expectedKey, actualKey);
+    }
+
+    @Test
+    public void testExplicitSimpleKey() {
+        Object expectedKey = new Object();
+        Object actualKey = getCacheKey(Arrays.asList((short) 1), new Object[] { new Object(), expectedKey });
+        // A cache key with one element should be the element itself (same object reference).
+        assertEquals(expectedKey, actualKey);
+    }
+
+    @Test
+    public void testExplicitCompositeKey() {
+        Object keyElement1 = new Object();
+        Object keyElement2 = new Object();
+        Object expectedKey = new CompositeCacheKey(keyElement1, keyElement2);
+        Object actualKey = getCacheKey(Arrays.asList((short) 0, (short) 2),
+                new Object[] { keyElement1, new Object(), keyElement2 });
+        assertEquals(expectedKey, actualKey);
+    }
+
+    @Test
+    public void testImplicitSimpleKey() {
+        Object expectedKey = new Object();
+        Object actualKey = getCacheKey(Collections.emptyList(), new Object[] { expectedKey });
+        // A cache key with one element should be the element itself (same object reference).
+        assertEquals(expectedKey, actualKey);
+    }
+
+    @Test
+    public void testImplicitCompositeKey() {
+        Object keyElement1 = new Object();
+        Object keyElement2 = new Object();
+        Object expectedKey = new CompositeCacheKey(keyElement1, keyElement2);
+        Object actualKey = getCacheKey(Collections.emptyList(), new Object[] { keyElement1, keyElement2 });
+        assertEquals(expectedKey, actualKey);
+    }
+
+    private Object getCacheKey(AbstractCache cache, List<Short> cacheKeyParameterPositions, Object[] methodParameterValues) {
+        return TEST_CACHE_INTERCEPTOR.getCacheKey(cache, cacheKeyParameterPositions, methodParameterValues);
+    }
+
+    private Object getCacheKey(List<Short> cacheKeyParameterPositions, Object[] methodParameterValues) {
+        return TEST_CACHE_INTERCEPTOR.getCacheKey(null, cacheKeyParameterPositions, methodParameterValues);
+    }
+
+    // This inner class changes the CacheInterceptor#getCacheKey method visibility to public.
+    private static class TestCacheInterceptor extends CacheInterceptor {
+        @Override
+        public Object getCacheKey(AbstractCache cache, List<Short> cacheKeyParameterPositions, Object[] methodParameterValues) {
+            return super.getCacheKey(cache, cacheKeyParameterPositions, methodParameterValues);
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyBuilderTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyBuilderTest.java
deleted file mode 100644
index 3f45d516ec9ac..0000000000000
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheKeyBuilderTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package io.quarkus.cache.test.runtime;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.cache.runtime.CacheKeyBuilder;
-
-public class CacheKeyBuilderTest {
-
-    @Test
-    public void testInvalidKeyElements() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            CacheKeyBuilder.build(null);
-        });
-        assertThrows(IllegalArgumentException.class, () -> {
-            CacheKeyBuilder.build(Collections.emptyList());
-        });
-        assertThrows(NullPointerException.class, () -> {
-            CacheKeyBuilder.build(Collections.singletonList(null));
-        }, CacheKeyBuilder.NULL_KEYS_NOT_SUPPORTED_MSG);
-    }
-
-    @Test
-    public void testSimpleKey() {
-        String keyElement = "quarkus";
-
-        // A cache key with one element should be the element itself (same object reference).
-        Object simpleKey1 = CacheKeyBuilder.build(Collections.singletonList(keyElement));
-        assertTrue(keyElement == simpleKey1);
-
-        // Two cache keys built from the same single element should have the same object reference.
-        Object simpleKey2 = CacheKeyBuilder.build(Collections.singletonList(keyElement));
-        assertTrue(simpleKey1 == simpleKey2);
-
-        // Two cache keys built from different single elements should not be equal.
-        Object simpleKey3 = CacheKeyBuilder.build(Collections.singletonList(Boolean.valueOf("true")));
-        assertNotEquals(simpleKey2, simpleKey3);
-    }
-
-    @Test
-    public void testCompositeKey() {
-        String keyElement1 = "quarkus";
-        long keyElement2 = 123L;
-        Object keyElement3 = new Object();
-
-        // Two cache keys built from the same elements and in the same order should be equal.
-        Object compositeKey1 = CacheKeyBuilder.build(Arrays.asList(keyElement1, keyElement2, keyElement3));
-        Object compositeKey2 = CacheKeyBuilder.build(Arrays.asList(keyElement1, keyElement2, keyElement3));
-        assertEquals(compositeKey1, compositeKey2);
-
-        // Two cache keys built from the same elements but not in the same order should not be equal.
-        Object compositeKey3 = CacheKeyBuilder.build(Arrays.asList(keyElement2, keyElement1, keyElement3));
-        assertNotEquals(compositeKey2, compositeKey3);
-
-        // Two cache keys built from a different number of elements should not be equal.
-        Object compositeKey4 = CacheKeyBuilder
-                .build(Arrays.asList(keyElement1, keyElement2, keyElement3, keyElement1, keyElement2, keyElement3));
-        assertNotEquals(compositeKey2, compositeKey4);
-
-        // Two cache keys built from multiple elements should only be equal if all elements are equal pairwise.
-        Object compositeKey5 = CacheKeyBuilder.build(Arrays.asList(new AtomicInteger(456), keyElement2, keyElement3));
-        assertNotEquals(compositeKey2, compositeKey5);
-        Object compositeKey6 = CacheKeyBuilder.build(Arrays.asList(keyElement1, new Object(), keyElement3));
-        assertNotEquals(compositeKey2, compositeKey6);
-        Object compositeKey7 = CacheKeyBuilder.build(Arrays.asList(keyElement1, keyElement2, new BigDecimal(10)));
-        assertNotEquals(compositeKey2, compositeKey7);
-    }
-}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java
new file mode 100644
index 0000000000000..ccfd0dbe76667
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CacheNamesTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheInvalidate;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheKey;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.CacheResult;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CacheNamesTest {
+
+    private static final String CACHE_NAME_1 = "test-cache-1";
+    private static final String CACHE_NAME_2 = "test-cache-2";
+    private static final String CACHE_NAME_3 = "test-cache-3";
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class).addClasses(CachedService1.class, CachedService2.class));
+
+    @Inject
+    CacheManager cacheManager;
+
+    @Test
+    public void testCacheNamesCollection() {
+        /*
+         * The main goal of this test is to check that a cache with an empty name is not instantiated at build time because of
+         * the bindings with an empty `cacheName` parameter from the cache interceptors.
+         */
+        List<String> cacheNames = new ArrayList<>(cacheManager.getCacheNames());
+        assertEquals(3, cacheNames.size());
+        assertTrue(cacheNames.containsAll(Arrays.asList(CACHE_NAME_1, CACHE_NAME_2, CACHE_NAME_3)));
+    }
+
+    @ApplicationScoped
+    static class CachedService1 {
+
+        @CacheResult(cacheName = CACHE_NAME_1)
+        public String getValue(Object key) {
+            return new String();
+        }
+
+        @CacheInvalidate(cacheName = CACHE_NAME_2)
+        public void invalidate(Object key) {
+        }
+    }
+
+    @Singleton
+    static class CachedService2 {
+
+        @CacheResult(cacheName = CACHE_NAME_1)
+        public String getValue(@CacheKey Object key, BigDecimal notPartOfTheKey) {
+            return new String();
+        }
+
+        @CacheInvalidateAll(cacheName = CACHE_NAME_3)
+        public void invalidateAll() {
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java
new file mode 100644
index 0000000000000..dd90c8f09d77d
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheInjectionTest.java
@@ -0,0 +1,72 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.CacheName;
+import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CaffeineCacheInjectionTest {
+
+    private static final String CACHE_NAME = "test-cache";
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class));
+
+    @Inject
+    CachedService cachedService;
+
+    @CacheName(CACHE_NAME)
+    Cache cache;
+
+    @Inject
+    CacheManager cacheManager;
+
+    @Test
+    public void testInjection() {
+        assertEquals(CaffeineCache.class, cache.getClass());
+        assertEquals(cache, cacheManager.getCache(CACHE_NAME).get());
+        assertEquals(cache, cachedService.getConstructorInjectedCache());
+        assertEquals(cache, cachedService.getMethodInjectedCache());
+    }
+
+    @ApplicationScoped
+    static class CachedService {
+
+        Cache constructorInjectedCache;
+        Cache methodInjectedCache;
+
+        public CachedService(@CacheName(CACHE_NAME) Cache cache) {
+            constructorInjectedCache = cache;
+        }
+
+        public Cache getConstructorInjectedCache() {
+            return constructorInjectedCache;
+        }
+
+        public Cache getMethodInjectedCache() {
+            return methodInjectedCache;
+        }
+
+        @Inject
+        public void setMethodInjectedCache(@CacheName(CACHE_NAME) Cache cache) {
+            methodInjectedCache = cache;
+        }
+
+        @CacheInvalidateAll(cacheName = CACHE_NAME)
+        public void invalidateAll() {
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheLockTimeoutTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheLockTimeoutTest.java
deleted file mode 100644
index 56d1398cf5d4c..0000000000000
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CaffeineCacheLockTimeoutTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package io.quarkus.cache.test.runtime;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.cache.CacheResult;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class CaffeineCacheLockTimeoutTest {
-
-    private static final Object TIMEOUT_KEY = new Object();
-    private static final Object NO_TIMEOUT_KEY = new Object();
-
-    @RegisterExtension
-    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-            .addAsResource(new StringAsset("quarkus.cache.type=caffeine"), "application.properties")
-            .addClass(CachedService.class));
-
-    @Inject
-    CachedService cachedService;
-
-    @Test
-    public void testConcurrentCacheAccessWithLockTimeout() throws InterruptedException, ExecutionException {
-        // This is required to make sure the CompletableFuture from this test are executed concurrently.
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-
-        CompletableFuture<Object> future1 = CompletableFuture.supplyAsync(() -> {
-            try {
-                return cachedService.cachedMethodWithLockTimeout(TIMEOUT_KEY);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }, executorService);
-
-        CompletableFuture<Object> future2 = CompletableFuture.supplyAsync(() -> {
-            try {
-                return cachedService.cachedMethodWithLockTimeout(TIMEOUT_KEY);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }, executorService);
-
-        CompletableFuture.allOf(future1, future2).get();
-
-        // The following assertion checks that the objects references resulting from both futures executions are different,
-        // which means the method was invoked twice because the lock timeout was triggered.
-        assertTrue(future1.get() != future2.get());
-    }
-
-    @Test
-    public void testConcurrentCacheAccessWithoutLockTimeout() throws InterruptedException, ExecutionException {
-        // This is required to make sure the CompletableFuture from this test are executed concurrently.
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-
-        CompletableFuture<Object> future1 = CompletableFuture.supplyAsync(() -> {
-            try {
-                return cachedService.cachedMethodWithoutLockTimeout(NO_TIMEOUT_KEY);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }, executorService);
-
-        CompletableFuture<Object> future2 = CompletableFuture.supplyAsync(() -> {
-            try {
-                return cachedService.cachedMethodWithoutLockTimeout(NO_TIMEOUT_KEY);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }, executorService);
-
-        CompletableFuture.allOf(future1, future2).get();
-
-        // The following assertion checks that the objects references resulting from both futures executions are the same,
-        // which means the method was invoked once and the lock timeout was NOT triggered.
-        assertTrue(future1.get() == future2.get());
-    }
-
-    @Singleton
-    static class CachedService {
-
-        private static final String CACHE_NAME = "test-cache";
-
-        @CacheResult(cacheName = CACHE_NAME, lockTimeout = 500)
-        public Object cachedMethodWithLockTimeout(Object key) throws InterruptedException {
-            // The following sleep is longer than the @CacheResult lockTimeout parameter value, a timeout will be triggered if
-            // two concurrent calls are made at the same time.
-            Thread.sleep(1000);
-            return new Object();
-        }
-
-        @CacheResult(cacheName = CACHE_NAME, lockTimeout = 1000)
-        public Object cachedMethodWithoutLockTimeout(Object key) throws InterruptedException {
-            // The following sleep is shorter than the @CacheResult lockTimeout parameter value, two concurrent calls made at
-            // the same time won't trigger a timeout.
-            Thread.sleep(500);
-            return new Object();
-        }
-    }
-}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeCacheKeyTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeCacheKeyTest.java
new file mode 100644
index 0000000000000..da9885f7e2ca7
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/CompositeCacheKeyTest.java
@@ -0,0 +1,51 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.math.BigDecimal;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.cache.runtime.CompositeCacheKey;
+
+public class CompositeCacheKeyTest {
+
+    private static final String KEY_ELEMENT_1 = "test";
+    private static final long KEY_ELEMENT_2 = 123L;
+    private static final Object KEY_ELEMENT_3 = new Object();
+
+    @Test
+    public void testEquality() {
+
+        // Two composite keys built from the same elements and in the same order should be equal.
+        CompositeCacheKey key1 = new CompositeCacheKey(KEY_ELEMENT_1, KEY_ELEMENT_2, KEY_ELEMENT_3);
+        CompositeCacheKey key2 = new CompositeCacheKey(KEY_ELEMENT_1, KEY_ELEMENT_2, KEY_ELEMENT_3);
+        assertEquals(key1, key2);
+        assertEquals(key1.hashCode(), key2.hashCode());
+
+        // If the same elements are used but their order is changed, the keys should not be equal.
+        CompositeCacheKey key3 = new CompositeCacheKey(KEY_ELEMENT_2, KEY_ELEMENT_1, KEY_ELEMENT_3);
+        assertNotEquals(key2, key3);
+
+        // If the numbers of elements are different, the keys should not be equal.
+        CompositeCacheKey key4 = new CompositeCacheKey(KEY_ELEMENT_1, KEY_ELEMENT_2, KEY_ELEMENT_3, new Object());
+        assertNotEquals(key2, key4);
+
+        // Two composite keys built from multiple elements should only be equal if all elements are equal pairwise.
+        CompositeCacheKey key5 = new CompositeCacheKey(Boolean.TRUE, KEY_ELEMENT_2, KEY_ELEMENT_3);
+        assertNotEquals(key2, key5);
+        CompositeCacheKey key6 = new CompositeCacheKey(KEY_ELEMENT_1, new Object(), KEY_ELEMENT_3);
+        assertNotEquals(key2, key6);
+        CompositeCacheKey key7 = new CompositeCacheKey(KEY_ELEMENT_1, KEY_ELEMENT_2, BigDecimal.TEN);
+        assertNotEquals(key2, key7);
+    }
+
+    @Test
+    public void testNoElementsKey() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new CompositeCacheKey();
+        });
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java
new file mode 100644
index 0000000000000..206afa5b9e329
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ConcurrencyTest.java
@@ -0,0 +1,138 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheResult;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ConcurrencyTest {
+
+    private static final Object TIMEOUT_KEY = new Object();
+    private static final Object NO_TIMEOUT_KEY = new Object();
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class));
+
+    @Inject
+    CachedService cachedService;
+
+    @Test
+    public void testConcurrentCacheAccessWithLockTimeout() throws InterruptedException, ExecutionException {
+        // This is required to make sure the CompletableFuture from this test are executed concurrently.
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+
+        AtomicReference<String> callingThreadName1 = new AtomicReference<>();
+        CompletableFuture<Object> future1 = CompletableFuture.supplyAsync(() -> {
+            callingThreadName1.set(Thread.currentThread().getName());
+            try {
+                return cachedService.cachedMethodWithLockTimeout(TIMEOUT_KEY);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }, executorService);
+
+        AtomicReference<String> callingThreadName2 = new AtomicReference<>();
+        CompletableFuture<Object> future2 = CompletableFuture.supplyAsync(() -> {
+            callingThreadName2.set(Thread.currentThread().getName());
+            try {
+                return cachedService.cachedMethodWithLockTimeout(TIMEOUT_KEY);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }, executorService);
+
+        // Let's wait for both futures to complete before running assertions.
+        CompletableFuture.allOf(future1, future2).get();
+
+        /*
+         * A cache lock timeout should be triggered during the second cached method call, which means that both calls should
+         * result in an execution of the value loader function. Since the calls are done from different threads, the resulting
+         * values (threads names) should be different.
+         */
+        assertNotEquals(future1.get(), future2.get());
+
+        // All value loader executions should be done synchronously on the calling thread.
+        assertEquals(callingThreadName1.get(), future1.get());
+        assertEquals(callingThreadName2.get(), future2.get());
+    }
+
+    @Test
+    public void testConcurrentCacheAccessWithoutLockTimeout() throws InterruptedException, ExecutionException {
+        // This is required to make sure the CompletableFuture from this test are executed concurrently.
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+
+        AtomicReference<String> callingThreadName1 = new AtomicReference<>();
+        CompletableFuture<String> future1 = CompletableFuture.supplyAsync(() -> {
+            callingThreadName1.set(Thread.currentThread().getName());
+            try {
+                return cachedService.cachedMethodWithoutLockTimeout(NO_TIMEOUT_KEY);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }, executorService);
+
+        AtomicReference<String> callingThreadName2 = new AtomicReference<>();
+        CompletableFuture<String> future2 = CompletableFuture.supplyAsync(() -> {
+            callingThreadName2.set(Thread.currentThread().getName());
+            try {
+                return cachedService.cachedMethodWithoutLockTimeout(NO_TIMEOUT_KEY);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }, executorService);
+
+        // Let's wait for both futures to complete before running assertions.
+        CompletableFuture.allOf(future1, future2).get();
+
+        /*
+         * This test should NOT trigger any cache lock timeout so there should only be one value loader execution and the
+         * resulting values from both cached methods calls should be the same.
+         */
+        assertEquals(future1.get(), future2.get());
+
+        /*
+         * The value loader execution should be done synchronously on the calling thread.
+         * Both thread names need to be checked because there's no way to determine which future will be run first.
+         */
+        assertTrue(callingThreadName1.get().equals(future1.get()) || callingThreadName2.get().equals(future1.get()));
+    }
+
+    @Singleton
+    static class CachedService {
+
+        private static final String CACHE_NAME = "test-cache";
+
+        @CacheResult(cacheName = CACHE_NAME, lockTimeout = 500)
+        public String cachedMethodWithLockTimeout(Object key) throws InterruptedException {
+            // The following sleep is longer than the @CacheResult lockTimeout parameter value, a timeout will be triggered if
+            // two concurrent calls are made at the same time.
+            Thread.sleep(1000);
+            return Thread.currentThread().getName();
+        }
+
+        @CacheResult(cacheName = CACHE_NAME, lockTimeout = 1000)
+        public String cachedMethodWithoutLockTimeout(Object key) throws InterruptedException {
+            // The following sleep is shorter than the @CacheResult lockTimeout parameter value, two concurrent calls made at
+            // the same time won't trigger a timeout.
+            Thread.sleep(500);
+            return Thread.currentThread().getName();
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java
index 189336b5238a3..fe6ecb0796294 100644
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ExplicitCompositeKeyCacheTest.java
@@ -81,7 +81,7 @@ public void testAllCacheAnnotations() {
         // Action: cache entry invalidation.
         // Expected effect: STEP 2 cache entry removed.
         // Verified by: STEP 7.
-        cachedService.invalidate(KEY_1_ELEMENT_1, KEY_1_ELEMENT_2, new Object());
+        cachedService.invalidate(new Object(), KEY_1_ELEMENT_1, KEY_1_ELEMENT_2);
 
         // STEP 7
         // Action: same call as STEP 2.
@@ -129,7 +129,7 @@ public String cachedMethod(@CacheKey Locale keyElement1, @CacheKey BigDecimal ke
         }
 
         @CacheInvalidate(cacheName = CACHE_NAME)
-        public void invalidate(@CacheKey Locale keyElement1, @CacheKey BigDecimal keyElement2, Object notPartOfTheKey) {
+        public void invalidate(Object notPartOfTheKey, @CacheKey Locale keyElement1, @CacheKey BigDecimal keyElement2) {
         }
 
         @CacheInvalidateAll(cacheName = CACHE_NAME)
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java
new file mode 100644
index 0000000000000..3d1278adf7835
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheInjectionTest.java
@@ -0,0 +1,52 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.CacheName;
+import io.quarkus.cache.runtime.noop.NoOpCache;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoOpCacheInjectionTest {
+
+    private static final String CACHE_NAME = "test-cache";
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties")
+            .addClass(CachedService.class));
+
+    @Inject
+    CachedService cachedService;
+
+    @CacheName(CACHE_NAME)
+    Cache cache;
+
+    @Inject
+    CacheManager cacheManager;
+
+    @Test
+    public void testInjection() {
+        assertEquals(NoOpCache.class, cache.getClass());
+        assertEquals(cache, cacheManager.getCache(CACHE_NAME).get());
+    }
+
+    @Singleton
+    static class CachedService {
+
+        @CacheInvalidateAll(cacheName = CACHE_NAME)
+        public void invalidateAll() {
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java
new file mode 100644
index 0000000000000..af194e30d71e4
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NoOpCacheTest.java
@@ -0,0 +1,112 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheInvalidate;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheResult;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoOpCacheTest {
+
+    private static final String CACHE_NAME = "test-cache";
+    private static final Object KEY = new Object();
+    private static final String FORCED_EXCEPTION_MESSAGE = "Forced exception";
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties")
+            .addClass(CachedService.class));
+
+    @Inject
+    CachedService cachedService;
+
+    @Test
+    public void testAllCacheAnnotations() {
+        // STEP 1
+        // Action: @CacheResult-annotated method call.
+        // Expected effect: method invoked and result not cached.
+        // Verified by: STEP 2.
+        String value1 = cachedService.cachedMethod(KEY);
+
+        // STEP 2
+        // Action: same call as STEP 1.
+        // Expected effect: method invoked and result not cached.
+        // Verified by: different objects references between STEPS 1 and 2 results.
+        String value2 = cachedService.cachedMethod(KEY);
+        assertTrue(value1 != value2);
+
+        // The following methods have no effect at all, but let's check if they're running fine anyway.
+        cachedService.invalidate(KEY);
+        cachedService.invalidateAll();
+    }
+
+    @Test
+    public void testRuntimeExceptionThrowDuringCacheComputation() {
+        NumberFormatException e = assertThrows(NumberFormatException.class, () -> {
+            cachedService.throwRuntimeExceptionDuringCacheComputation();
+        });
+        assertEquals(FORCED_EXCEPTION_MESSAGE, e.getMessage());
+    }
+
+    @Test
+    public void testCheckedExceptionThrowDuringCacheComputation() {
+        IOException e = assertThrows(IOException.class, () -> {
+            cachedService.throwCheckedExceptionDuringCacheComputation();
+        });
+        assertEquals(FORCED_EXCEPTION_MESSAGE, e.getMessage());
+    }
+
+    @Test
+    public void testErrorThrowDuringCacheComputation() {
+        OutOfMemoryError e = assertThrows(OutOfMemoryError.class, () -> {
+            cachedService.throwErrorDuringCacheComputation();
+        });
+        assertEquals(FORCED_EXCEPTION_MESSAGE, e.getMessage());
+    }
+
+    @Singleton
+    static class CachedService {
+
+        @CacheResult(cacheName = CACHE_NAME)
+        public String cachedMethod(Object key) {
+            return new String();
+        }
+
+        @CacheInvalidate(cacheName = CACHE_NAME)
+        public void invalidate(Object key) {
+        }
+
+        @CacheInvalidateAll(cacheName = CACHE_NAME)
+        public void invalidateAll() {
+        }
+
+        @CacheResult(cacheName = "runtime-exception-cache")
+        public String throwRuntimeExceptionDuringCacheComputation() {
+            throw new NumberFormatException(FORCED_EXCEPTION_MESSAGE);
+        }
+
+        @CacheResult(cacheName = "checked-exception-cache")
+        public String throwCheckedExceptionDuringCacheComputation() throws IOException {
+            throw new IOException(FORCED_EXCEPTION_MESSAGE);
+        }
+
+        @CacheResult(cacheName = "error-cache")
+        public String throwErrorDuringCacheComputation() {
+            throw new OutOfMemoryError(FORCED_EXCEPTION_MESSAGE);
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java
index 9dfd126094626..05047bc4e705b 100644
--- a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/NullKeyOrValueCacheTest.java
@@ -1,6 +1,6 @@
 package io.quarkus.cache.test.runtime;
 
-import static io.quarkus.cache.runtime.CacheKeyBuilder.NULL_KEYS_NOT_SUPPORTED_MSG;
+import static io.quarkus.cache.runtime.AbstractCache.NULL_KEYS_NOT_SUPPORTED_MSG;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java
new file mode 100644
index 0000000000000..0c4ddb1a0267a
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ThrowExecutionExceptionCauseTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheResult;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ThrowExecutionExceptionCauseTest {
+
+    private static final String FORCED_EXCEPTION_MESSAGE = "Forced exception";
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(CachedService.class));
+
+    @Inject
+    CachedService cachedService;
+
+    @Test
+    public void testRuntimeExceptionThrowDuringCacheComputation() {
+        NumberFormatException e = assertThrows(NumberFormatException.class, () -> {
+            cachedService.throwRuntimeExceptionDuringCacheComputation();
+        });
+        assertEquals(FORCED_EXCEPTION_MESSAGE, e.getMessage());
+        // Let's check we didn't put an uncompleted future in the cache because of the previous exception.
+        assertThrows(NumberFormatException.class, () -> {
+            cachedService.throwRuntimeExceptionDuringCacheComputation();
+        });
+    }
+
+    @Test
+    public void testCheckedExceptionThrowDuringCacheComputation() {
+        IOException e = assertThrows(IOException.class, () -> {
+            cachedService.throwCheckedExceptionDuringCacheComputation();
+        });
+        assertEquals(FORCED_EXCEPTION_MESSAGE, e.getMessage());
+    }
+
+    @Test
+    public void testErrorThrowDuringCacheComputation() {
+        OutOfMemoryError e = assertThrows(OutOfMemoryError.class, () -> {
+            cachedService.throwErrorDuringCacheComputation();
+        });
+        assertEquals(FORCED_EXCEPTION_MESSAGE, e.getMessage());
+    }
+
+    @ApplicationScoped
+    static class CachedService {
+
+        @CacheResult(cacheName = "runtime-exception-cache")
+        public String throwRuntimeExceptionDuringCacheComputation() {
+            throw new NumberFormatException(FORCED_EXCEPTION_MESSAGE);
+        }
+
+        @CacheResult(cacheName = "checked-exception-cache")
+        public String throwCheckedExceptionDuringCacheComputation() throws IOException {
+            throw new IOException(FORCED_EXCEPTION_MESSAGE);
+        }
+
+        @CacheResult(cacheName = "error-cache")
+        public String throwErrorDuringCacheComputation() {
+            throw new OutOfMemoryError(FORCED_EXCEPTION_MESSAGE);
+        }
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java
new file mode 100644
index 0000000000000..1d3894afa09d4
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroCaffeineCacheTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheManager;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * This test checks that no exception is thrown when a {@link CacheManager} method is called while the extension is enabled and
+ * no cache is declared in the application.
+ */
+public class ZeroCaffeineCacheTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    CacheManager cacheManager;
+
+    @Test
+    public void testNoExceptionThrown() {
+        assertTrue(cacheManager.getCacheNames().isEmpty());
+        assertFalse(cacheManager.getCache("unknown-cache").isPresent());
+    }
+}
diff --git a/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java
new file mode 100644
index 0000000000000..9d14808d9c77b
--- /dev/null
+++ b/extensions/cache/deployment/src/test/java/io/quarkus/cache/test/runtime/ZeroNoOpCacheTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.cache.test.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.cache.CacheManager;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * This test checks that no exception is thrown when a {@link CacheManager} method is called while the extension is disabled
+ * and no cache is declared in the application.
+ */
+public class ZeroNoOpCacheTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .addAsResource(new StringAsset("quarkus.cache.enabled=false"), "application.properties"));
+
+    @Inject
+    CacheManager cacheManager;
+
+    @Test
+    public void testNoExceptionThrown() {
+        assertTrue(cacheManager.getCacheNames().isEmpty());
+        assertFalse(cacheManager.getCache("unknown-cache").isPresent());
+    }
+}
diff --git a/extensions/cache/pom.xml b/extensions/cache/pom.xml
index 1b80933ca83db..65befebd45a1e 100644
--- a/extensions/cache/pom.xml
+++ b/extensions/cache/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-cache-parent</artifactId>
diff --git a/extensions/cache/runtime/pom.xml b/extensions/cache/runtime/pom.xml
index d0bbb9cc44967..73dd9f19a3744 100644
--- a/extensions/cache/runtime/pom.xml
+++ b/extensions/cache/runtime/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-cache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-cache</artifactId>
@@ -25,8 +24,14 @@
             <artifactId>quarkus-caffeine</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.microprofile.context-propagation</groupId>
-            <artifactId>microprofile-context-propagation-api</artifactId>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/Cache.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/Cache.java
new file mode 100644
index 0000000000000..8faeb4ee1449a
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/Cache.java
@@ -0,0 +1,13 @@
+package io.quarkus.cache;
+
+/**
+ * Use this interface to interact with a cache programmatically. The cache can be injected using the {@link CacheName}
+ * annotation or retrieved using {@link CacheManager}.
+ */
+public interface Cache {
+
+    /*
+     * This interface is intentionally empty for now.
+     * TODO: Add the methods that will be exposed by the programmatic API.
+     */
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java
index 4f1a27f46e4e4..69a2f2c6ab4d8 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidate.java
@@ -7,6 +7,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
+import javax.interceptor.InterceptorBinding;
 
 import io.quarkus.cache.CacheInvalidate.List;
 
@@ -15,7 +16,7 @@
  * remove an existing entry from the cache. If the method has one or more arguments, the key computation is done from all the
  * method arguments if none of them is annotated with {@link CacheKey}, or all the arguments annotated with {@link CacheKey}
  * otherwise. This annotation can also be used on a method with no arguments, a default key derived from the cache name is
- * generated in that case. If the key does not identify any cache entry, nothing will happen.
+ * used in that case. If the key does not identify any cache entry, nothing will happen.
  * <p>
  * This annotation can be combined with multiple other caching annotations on a single method. Caching operations will always
  * be executed in the same order: {@link CacheInvalidateAll} first, then {@link CacheInvalidate} and finally
@@ -23,8 +24,9 @@
  * <p>
  * The underlying caching provider can be chosen and configured in the Quarkus {@link application.properties} file.
  */
+@InterceptorBinding
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
 @Repeatable(List.class)
 public @interface CacheInvalidate {
 
@@ -34,8 +36,8 @@
     @Nonbinding
     String cacheName();
 
+    @Target({ ElementType.TYPE, ElementType.METHOD })
     @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
     @interface List {
         CacheInvalidate[] value();
     }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java
index 51b166bf60f4f..62b8ebb808b6a 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheInvalidateAll.java
@@ -7,6 +7,7 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
+import javax.interceptor.InterceptorBinding;
 
 import io.quarkus.cache.CacheInvalidateAll.List;
 
@@ -19,8 +20,9 @@
  * <p>
  * The underlying caching provider can be chosen and configured in the Quarkus {@link application.properties} file.
  */
+@InterceptorBinding
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
 @Repeatable(List.class)
 public @interface CacheInvalidateAll {
 
@@ -30,8 +32,8 @@
     @Nonbinding
     String cacheName();
 
+    @Target({ ElementType.TYPE, ElementType.METHOD })
     @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
     @interface List {
         CacheInvalidateAll[] value();
     }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManager.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManager.java
new file mode 100644
index 0000000000000..114d65b9345bc
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManager.java
@@ -0,0 +1,46 @@
+package io.quarkus.cache;
+
+import java.util.Collection;
+import java.util.Optional;
+
+/**
+ * <p>
+ * Use this interface to retrieve all existing {@link Cache} names and interact with any cache programmatically. It shares the
+ * same cache collection the Quarkus caching annotations use. The {@link CacheName} annotation can also be used to inject and
+ * access a specific cache from its name.
+ * </p>
+ * <p>
+ * Code example:
+ * 
+ * <pre>
+ * {@literal @}ApplicationScoped
+ * public class CachedService {
+ * 
+ *     {@literal @}Inject
+ *     CacheManager cacheManager;
+ *     
+ *     void doSomething() {
+ *         Cache cache = cacheManager.getCache("my-cache");
+ *         // Interact with the cache.
+ *     }
+ * }
+ * </pre>
+ * </p>
+ */
+public interface CacheManager {
+
+    /**
+     * Gets a collection of all cache names.
+     * 
+     * @return names of all caches
+     */
+    Collection<String> getCacheNames();
+
+    /**
+     * Gets the cache identified by the given name.
+     * 
+     * @param name cache name
+     * @return an {@link Optional} containing the identified cache if it exists, or an empty {@link Optional} otherwise
+     */
+    Optional<Cache> getCache(String name);
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java
new file mode 100644
index 0000000000000..7a375c3b3aeaf
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheName.java
@@ -0,0 +1,79 @@
+package io.quarkus.cache;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.Nonbinding;
+import javax.inject.Qualifier;
+
+/**
+ * <p>
+ * Use this annotation on a field, a constructor parameter or a method parameter to inject a {@link Cache} and interact with it
+ * programmatically.
+ * </p>
+ * <p>
+ * Field injection example:
+ * 
+ * <pre>
+ * {@literal @}ApplicationScoped
+ * public class CachedService {
+ * 
+ *     {@literal @}CacheName("my-cache")
+ *     Cache cache;
+ *     
+ *     // Interact with the cache.
+ * }
+ * </pre>
+ * 
+ * Constructor parameter injection example:
+ * 
+ * <pre>
+ * {@literal @}ApplicationScoped
+ * public class CachedService {
+ * 
+ *     private Cache cache;
+ * 
+ *     public CachedService(@CacheName("my-cache") Cache cache) {
+ *         this.cache = cache;
+ *     }
+ *     
+ *     // Interact with the cache.
+ * }
+ * </pre>
+ * 
+ * Method parameter injection example:
+ * 
+ * <pre>
+ * {@literal @}ApplicationScoped
+ * public class CachedService {
+ * 
+ *     private Cache cache;
+ * 
+ *     {@literal @}Inject
+ *     public void setCache(@CacheName("my-cache") Cache cache) {
+ *         this.cache = cache;
+ *     }
+ *     
+ *     // Interact with the cache.
+ * }
+ * </pre>
+ * </p>
+ * 
+ * @see CacheManager
+ */
+@Qualifier
+@Target({ FIELD, METHOD, PARAMETER })
+@Retention(RUNTIME)
+public @interface CacheName {
+
+    /**
+     * The name of the cache.
+     */
+    @Nonbinding
+    String value();
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java
index 41047adb4bcb8..30357c2364941 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheResult.java
@@ -6,15 +6,16 @@
 import java.lang.annotation.Target;
 
 import javax.enterprise.util.Nonbinding;
+import javax.interceptor.InterceptorBinding;
 
 /**
  * When a method annotated with {@link CacheResult} is invoked, Quarkus will compute a cache key and use it to check in the
  * cache whether the method has been already invoked. If the method has one or more arguments, the key computation is done from
  * all the method arguments if none of them is annotated with {@link CacheKey}, or all the arguments annotated with
  * {@link CacheKey} otherwise. This annotation can also be used on a method with no arguments, a default key derived from the
- * cache name is generated in that case. If a value is found in the cache, it is returned and the annotated method is never
- * actually executed. If no value is found, the annotated method is invoked and the returned value is stored in the cache using
- * the computed or generated key.
+ * cache name is used in that case. If a value is found in the cache, it is returned and the annotated method is never actually
+ * executed. If no value is found, the annotated method is invoked and the returned value is stored in the cache using the
+ * computed key.
  * <p>
  * A method annotated with {@link CacheResult} is protected by a lock on cache miss mechanism. If several concurrent
  * invocations try to retrieve a cache value from the same missing key, the method will only be invoked once. The first
@@ -29,8 +30,9 @@
  * <p>
  * The underlying caching provider can be chosen and configured in the Quarkus {@link application.properties} file.
  */
+@InterceptorBinding
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
 public @interface CacheResult {
 
     /**
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/AbstractCache.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/AbstractCache.java
new file mode 100644
index 0000000000000..8545d93c1b95a
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/AbstractCache.java
@@ -0,0 +1,35 @@
+package io.quarkus.cache.runtime;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+import io.quarkus.cache.Cache;
+
+public abstract class AbstractCache implements Cache {
+
+    public static final String NULL_KEYS_NOT_SUPPORTED_MSG = "Null keys are not supported by the Quarkus application data cache";
+
+    private Object defaultKey;
+
+    public abstract String getName();
+
+    /**
+     * Returns the unique and immutable default key for the current cache. This key is used by the annotations caching API when
+     * a no-args method annotated with {@link io.quarkus.cache.CacheResult CacheResult} or
+     * {@link io.quarkus.cache.CacheInvalidate CacheInvalidate} is invoked.
+     * 
+     * @return default cache key
+     */
+    public Object getDefaultKey() {
+        if (defaultKey == null) {
+            defaultKey = new DefaultCacheKey(getName());
+        }
+        return defaultKey;
+    }
+
+    public abstract CompletableFuture<Object> get(Object key, Function<Object, Object> valueLoader);
+
+    public abstract void invalidate(Object key);
+
+    public abstract void invalidateAll();
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheException.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheException.java
new file mode 100644
index 0000000000000..4f1ae7daef547
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheException.java
@@ -0,0 +1,10 @@
+package io.quarkus.cache.runtime;
+
+public class CacheException extends RuntimeException {
+
+    private static final long serialVersionUID = -3465350968605912384L;
+
+    public CacheException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptionContext.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptionContext.java
new file mode 100644
index 0000000000000..06bfc80b8ebab
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptionContext.java
@@ -0,0 +1,27 @@
+package io.quarkus.cache.runtime;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class CacheInterceptionContext<T extends Annotation> {
+
+    private final List<T> interceptorBindings;
+    private final List<Short> cacheKeyParameterPositions;
+
+    public CacheInterceptionContext(List<T> interceptorBindings, List<Short> cacheKeyParameterPositions) {
+        Objects.requireNonNull(interceptorBindings);
+        Objects.requireNonNull(cacheKeyParameterPositions);
+        this.interceptorBindings = Collections.unmodifiableList(interceptorBindings);
+        this.cacheKeyParameterPositions = Collections.unmodifiableList(cacheKeyParameterPositions);
+    }
+
+    public List<T> getInterceptorBindings() {
+        return interceptorBindings;
+    }
+
+    public List<Short> getCacheKeyParameterPositions() {
+        return cacheKeyParameterPositions;
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java
index 6dbe8f668401e..7bf783ff3b23b 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInterceptor.java
@@ -1,55 +1,132 @@
 package io.quarkus.cache.runtime;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Parameter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
 
 import javax.inject.Inject;
 import javax.interceptor.Interceptor.Priority;
 import javax.interceptor.InvocationContext;
 
+import org.jboss.logging.Logger;
+
 import io.quarkus.arc.runtime.InterceptorBindings;
+import io.quarkus.cache.CacheKey;
+import io.quarkus.cache.CacheManager;
 
 public abstract class CacheInterceptor {
 
     public static final int BASE_PRIORITY = Priority.PLATFORM_BEFORE;
 
+    private static final Logger LOGGER = Logger.getLogger(CacheInterceptor.class);
+    private static final String PERFORMANCE_WARN_MSG = "Cache key resolution based on reflection calls. Please create a GitHub issue in the Quarkus repository, the maintainers might be able to improve your application performance.";
+
     @Inject
-    CacheRepository cacheRepository;
+    CacheManager cacheManager;
 
-    @SuppressWarnings("unchecked")
-    protected <T> List<T> getInterceptorBindings(InvocationContext context, Class<T> bindingClass) {
-        List<T> bindings = new ArrayList<>();
-        for (Annotation binding : InterceptorBindings.getInterceptorBindings(context)) {
-            if (bindingClass.isInstance(binding)) {
-                bindings.add((T) binding);
+    /*
+     * The interception is almost always managed by Arc in a Quarkus application. In such a case, we want to retrieve the
+     * interceptor bindings stored by Arc in the invocation context data (very good performance-wise). But sometimes the
+     * interception is managed by another CDI interceptors implementation. It can happen for example while using caching
+     * annotations on a MicroProfile REST Client method. In that case, we have no other choice but to rely on reflection (with
+     * underlying synchronized blocks which are bad for performances) to retrieve the interceptor bindings.
+     */
+    protected <T extends Annotation> CacheInterceptionContext<T> getInterceptionContext(InvocationContext invocationContext,
+            Class<T> interceptorBindingClass, boolean supportsCacheKey) {
+        return getArcCacheInterceptionContext(invocationContext, interceptorBindingClass)
+                .orElseGet(new Supplier<CacheInterceptionContext<T>>() {
+                    @Override
+                    public CacheInterceptionContext<T> get() {
+                        return getNonArcCacheInterceptionContext(invocationContext, interceptorBindingClass, supportsCacheKey);
+                    }
+                });
+    }
+
+    private <T extends Annotation> Optional<CacheInterceptionContext<T>> getArcCacheInterceptionContext(
+            InvocationContext invocationContext, Class<T> interceptorBindingClass) {
+        Set<Annotation> bindings = InterceptorBindings.getInterceptorBindings(invocationContext);
+        if (bindings == null) {
+            // This should only happen when the interception is not managed by Arc.
+            return Optional.empty();
+        }
+        List<T> interceptorBindings = new ArrayList<>();
+        List<Short> cacheKeyParameterPositions = new ArrayList<>();
+        for (Annotation binding : bindings) {
+            if (binding instanceof CacheKeyParameterPositions) {
+                for (short position : ((CacheKeyParameterPositions) binding).value()) {
+                    cacheKeyParameterPositions.add(position);
+                }
+            } else if (interceptorBindingClass.isInstance(binding)) {
+                interceptorBindings.add(cast(binding, interceptorBindingClass));
             }
         }
-        return bindings;
+        return Optional.of(new CacheInterceptionContext<>(interceptorBindings, cacheKeyParameterPositions));
     }
 
-    protected <T> T getInterceptorBinding(InvocationContext context, Class<T> bindingClass) {
-        return getInterceptorBindings(context, bindingClass).get(0);
+    private <T extends Annotation> CacheInterceptionContext<T> getNonArcCacheInterceptionContext(
+            InvocationContext invocationContext, Class<T> interceptorBindingClass, boolean supportsCacheKey) {
+        List<T> interceptorBindings = new ArrayList<>();
+        List<Short> cacheKeyParameterPositions = new ArrayList<>();
+        boolean cacheKeyParameterPositionsFound = false;
+        for (Annotation annotation : invocationContext.getMethod().getAnnotations()) {
+            if (annotation instanceof CacheKeyParameterPositions) {
+                cacheKeyParameterPositionsFound = true;
+                for (short position : ((CacheKeyParameterPositions) annotation).value()) {
+                    cacheKeyParameterPositions.add(position);
+                }
+            } else if (interceptorBindingClass.isInstance(annotation)) {
+                interceptorBindings.add(cast(annotation, interceptorBindingClass));
+            }
+        }
+        if (supportsCacheKey && !cacheKeyParameterPositionsFound) {
+            /*
+             * This block is a fallback that should ideally never be executed because of the poor performance of reflection
+             * calls. If the following warn message is displayed, then it means that we should update the build time bytecode
+             * generation to cover the missing case. See RestClientMethodEnhancer for more details.
+             */
+            LOGGER.warn(PERFORMANCE_WARN_MSG);
+            Parameter[] parameters = invocationContext.getMethod().getParameters();
+            for (short i = 0; i < parameters.length; i++) {
+                if (parameters[i].isAnnotationPresent(CacheKey.class)) {
+                    cacheKeyParameterPositions.add(i);
+                }
+            }
+        }
+        return new CacheInterceptionContext<>(interceptorBindings, cacheKeyParameterPositions);
     }
 
-    protected Object buildCacheKey(String cacheName, short[] cacheKeyParameterPositions, Object[] methodParameterValues) {
-        // If the method doesn't have any parameter, then a unique default key is generated and used.
-        if (methodParameterValues.length == 0) {
-            return CacheKeyBuilder.buildDefault(cacheName);
-        } else {
+    @SuppressWarnings("unchecked")
+    private <T extends Annotation> T cast(Annotation annotation, Class<T> interceptorBindingClass) {
+        return (T) annotation;
+    }
+
+    protected Object getCacheKey(AbstractCache cache, List<Short> cacheKeyParameterPositions, Object[] methodParameterValues) {
+        if (methodParameterValues == null || methodParameterValues.length == 0) {
+            // If the intercepted method doesn't have any parameter, then the default cache key will be used.
+            return cache.getDefaultKey();
+        } else if (cacheKeyParameterPositions.size() == 1) {
+            // If exactly one @CacheKey-annotated parameter was identified for the intercepted method at build time, then this
+            // parameter will be used as the cache key.
+            return methodParameterValues[cacheKeyParameterPositions.get(0)];
+        } else if (cacheKeyParameterPositions.size() >= 2) {
+            // If two or more @CacheKey-annotated parameters were identified for the intercepted method at build time, then a
+            // composite cache key built from all these parameters will be used.
             List<Object> keyElements = new ArrayList<>();
-            // If at least one of the method parameters is annotated with @CacheKey, then the key is composed of all
-            // @CacheKey-annotated parameters that were identified at build time.
-            if (cacheKeyParameterPositions.length > 0) {
-                for (int i = 0; i < cacheKeyParameterPositions.length; i++) {
-                    keyElements.add(methodParameterValues[i]);
-                }
-            } else {
-                // Otherwise, the key is composed of all of the method parameters.
-                keyElements.addAll(Arrays.asList(methodParameterValues));
+            for (short position : cacheKeyParameterPositions) {
+                keyElements.add(methodParameterValues[position]);
             }
-            return CacheKeyBuilder.build(keyElements);
+            return new CompositeCacheKey(keyElements.toArray(new Object[0]));
+        } else if (methodParameterValues.length == 1) {
+            // If the intercepted method has exactly one parameter, then this parameter will be used as the cache key.
+            return methodParameterValues[0];
+        } else {
+            // If the intercepted method has two or more parameters, then a composite cache key built from all these parameters
+            // will be used.
+            return new CompositeCacheKey(methodParameterValues);
         }
     }
 }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java
index 21add43b4e6f2..24ba3401c83c5 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptor.java
@@ -7,25 +7,32 @@
 
 import org.jboss.logging.Logger;
 
-import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.cache.CacheInvalidateAll;
 
-@CacheInvalidateAllInterceptorBinding
+@CacheInvalidateAll(cacheName = "") // The `cacheName` attribute is @Nonbinding.
 @Interceptor
 @Priority(CacheInterceptor.BASE_PRIORITY)
 public class CacheInvalidateAllInterceptor extends CacheInterceptor {
 
     private static final Logger LOGGER = Logger.getLogger(CacheInvalidateAllInterceptor.class);
+    private static final String INTERCEPTOR_BINDINGS_ERROR_MSG = "The Quarkus cache extension is not working properly (CacheInvalidateAll interceptor bindings retrieval failed), please create a GitHub issue in the Quarkus repository to help the maintainers fix this bug";
 
     @AroundInvoke
-    public Object intercept(InvocationContext context) throws Exception {
-        for (CacheInvalidateAllInterceptorBinding binding : getInterceptorBindings(context,
-                CacheInvalidateAllInterceptorBinding.class)) {
-            CaffeineCache cache = cacheRepository.getCache(binding.cacheName());
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debugf("Invalidating all entries from cache [%s]", cache.getName());
+    public Object intercept(InvocationContext invocationContext) throws Exception {
+        CacheInterceptionContext<CacheInvalidateAll> interceptionContext = getInterceptionContext(invocationContext,
+                CacheInvalidateAll.class, false);
+        if (interceptionContext.getInterceptorBindings().isEmpty()) {
+            // This should never happen.
+            LOGGER.warn(INTERCEPTOR_BINDINGS_ERROR_MSG);
+        } else {
+            for (CacheInvalidateAll binding : interceptionContext.getInterceptorBindings()) {
+                AbstractCache cache = (AbstractCache) cacheManager.getCache(binding.cacheName()).get();
+                if (LOGGER.isDebugEnabled()) {
+                    LOGGER.debugf("Invalidating all entries from cache [%s]", binding.cacheName());
+                }
+                cache.invalidateAll();
             }
-            cache.invalidateAll();
         }
-        return context.proceed();
+        return invocationContext.proceed();
     }
 }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptorBinding.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptorBinding.java
deleted file mode 100644
index e98dd8e96a5cd..0000000000000
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateAllInterceptorBinding.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.quarkus.cache.runtime;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
-
-import io.quarkus.cache.runtime.CacheInvalidateAllInterceptorBinding.List;
-
-@InterceptorBinding
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Repeatable(List.class)
-public @interface CacheInvalidateAllInterceptorBinding {
-
-    @Nonbinding
-    String cacheName() default "";
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    @interface List {
-        CacheInvalidateAllInterceptorBinding[] value();
-    }
-}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java
index d55b8567b70d3..0cb72b16ae780 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptor.java
@@ -7,29 +7,37 @@
 
 import org.jboss.logging.Logger;
 
-import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.cache.CacheInvalidate;
 
-@CacheInvalidateInterceptorBinding
+@CacheInvalidate(cacheName = "") // The `cacheName` attribute is @Nonbinding.
 @Interceptor
 @Priority(CacheInterceptor.BASE_PRIORITY + 1)
 public class CacheInvalidateInterceptor extends CacheInterceptor {
 
     private static final Logger LOGGER = Logger.getLogger(CacheInvalidateInterceptor.class);
+    private static final String INTERCEPTOR_BINDINGS_ERROR_MSG = "The Quarkus cache extension is not working properly (CacheInvalidate interceptor bindings retrieval failed), please create a GitHub issue in the Quarkus repository to help the maintainers fix this bug";
 
     @AroundInvoke
-    public Object intercept(InvocationContext context) throws Exception {
-        Object key = null;
-        for (CacheInvalidateInterceptorBinding binding : getInterceptorBindings(context,
-                CacheInvalidateInterceptorBinding.class)) {
-            if (key == null) {
-                key = buildCacheKey(binding.cacheName(), binding.cacheKeyParameterPositions(), context.getParameters());
+    public Object intercept(InvocationContext invocationContext) throws Exception {
+        CacheInterceptionContext<CacheInvalidate> interceptionContext = getInterceptionContext(invocationContext,
+                CacheInvalidate.class, true);
+        if (interceptionContext.getInterceptorBindings().isEmpty()) {
+            // This should never happen.
+            LOGGER.warn(INTERCEPTOR_BINDINGS_ERROR_MSG);
+        } else {
+            Object key = null;
+            for (CacheInvalidate binding : interceptionContext.getInterceptorBindings()) {
+                AbstractCache cache = (AbstractCache) cacheManager.getCache(binding.cacheName()).get();
+                if (key == null) {
+                    key = getCacheKey(cache, interceptionContext.getCacheKeyParameterPositions(),
+                            invocationContext.getParameters());
+                }
+                if (LOGGER.isDebugEnabled()) {
+                    LOGGER.debugf("Invalidating entry with key [%s] from cache [%s]", key, binding.cacheName());
+                }
+                cache.invalidate(key);
             }
-            CaffeineCache cache = cacheRepository.getCache(binding.cacheName());
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debugf("Invalidating entry with key [%s] from cache [%s]", key, cache.getName());
-            }
-            cache.invalidate(key);
         }
-        return context.proceed();
+        return invocationContext.proceed();
     }
 }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptorBinding.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptorBinding.java
deleted file mode 100644
index 94da6f15a5410..0000000000000
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheInvalidateInterceptorBinding.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.quarkus.cache.runtime;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
-
-import io.quarkus.cache.runtime.CacheInvalidateInterceptorBinding.List;
-
-@InterceptorBinding
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Repeatable(List.class)
-public @interface CacheInvalidateInterceptorBinding {
-
-    @Nonbinding
-    String cacheName() default "";
-
-    @Nonbinding
-    short[] cacheKeyParameterPositions() default {};
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    @interface List {
-        CacheInvalidateInterceptorBinding[] value();
-    }
-}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyBuilder.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyBuilder.java
deleted file mode 100644
index 95b4eb63dca81..0000000000000
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyBuilder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package io.quarkus.cache.runtime;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-public class CacheKeyBuilder {
-
-    public static final String NULL_KEYS_NOT_SUPPORTED_MSG = "Null keys are not supported by the Quarkus application data cache";
-
-    /**
-     * Builds a default immutable and unique cache key from a cache name. This key is intended to be used for no-args methods
-     * annotated with {@link io.quarkus.cache.CacheResult CacheResult} or {@link io.quarkus.cache.CacheInvalidate
-     * CacheInvalidate}.
-     * 
-     * @param cacheName cache name
-     * @return default immutable and unique cache key
-     */
-    public static Object buildDefault(String cacheName) {
-        return new DefaultCacheKey(cacheName);
-    }
-
-    /**
-     * Builds a cache key from a list of key elements. The list must be non-null and contain at least one key element.
-     * 
-     * @param keyElements key elements
-     * @return cache key
-     */
-    public static Object build(List<Object> keyElements) {
-        if (keyElements == null || keyElements.isEmpty()) {
-            throw new IllegalArgumentException("At least one key element is required to build a cache key");
-        } else if (keyElements.size() == 1) {
-            if (keyElements.get(0) == null) {
-                throw new NullPointerException(NULL_KEYS_NOT_SUPPORTED_MSG);
-            }
-            return keyElements.get(0);
-        } else {
-            return new CompositeCacheKey(keyElements);
-        }
-    }
-
-    private static class DefaultCacheKey {
-
-        private final String cacheName;
-
-        public DefaultCacheKey(String cacheName) {
-            this.cacheName = cacheName;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(cacheName);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-            if (obj instanceof DefaultCacheKey) {
-                DefaultCacheKey other = (DefaultCacheKey) obj;
-                return Objects.equals(cacheName, other.cacheName);
-            }
-            return false;
-        }
-    }
-
-    private static class CompositeCacheKey {
-
-        private final Object[] keyElements;
-
-        public CompositeCacheKey(List<Object> keyElements) {
-            this.keyElements = keyElements.toArray(new Object[0]);
-        }
-
-        @Override
-        public int hashCode() {
-            return Arrays.deepHashCode(keyElements);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-            if (CompositeCacheKey.class.isInstance(obj)) {
-                final CompositeCacheKey other = (CompositeCacheKey) obj;
-                return Arrays.deepEquals(keyElements, other.keyElements);
-            }
-            return false;
-        }
-    }
-}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java
new file mode 100644
index 0000000000000..a3e48e3668c9b
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheKeyParameterPositions.java
@@ -0,0 +1,29 @@
+package io.quarkus.cache.runtime;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.Nonbinding;
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * This interceptor binding is added at build time on a method if:
+ * <ul>
+ * <li>it is annotated with {@link io.quarkus.cache.CacheResult CacheResult} or {@link io.quarkus.cache.CacheInvalidate
+ * CacheInvalidate}</li>
+ * <li>at least one of its arguments is annotated with {@link io.quarkus.cache.CacheKey CacheKey}</li>
+ * </ul>
+ * It helps improving performances by storing at build time the positions of {@link io.quarkus.cache.CacheKey
+ * CacheKey}-annotated arguments instead of relying on reflection at run time (which is bad for performances) to identify these
+ * positions.
+ */
+@InterceptorBinding
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+public @interface CacheKeyParameterPositions {
+
+    @Nonbinding
+    short[] value() default {};
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerImpl.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerImpl.java
new file mode 100644
index 0000000000000..f1c3b0b491267
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerImpl.java
@@ -0,0 +1,38 @@
+package io.quarkus.cache.runtime;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheManager;
+
+/**
+ * This class is registered as an @ApplicationScoped synthetic bean at build time.
+ */
+public class CacheManagerImpl implements CacheManager {
+
+    private final Map<String, Cache> caches;
+    private final Set<String> cacheNames;
+
+    public CacheManagerImpl(Map<String, Cache> caches) {
+        Objects.requireNonNull(caches);
+        this.caches = Collections.unmodifiableMap(caches);
+        cacheNames = Collections.unmodifiableSet(caches.keySet());
+    }
+
+    @Override
+    public Set<String> getCacheNames() {
+        return cacheNames;
+    }
+
+    @Override
+    public Optional<Cache> getCache(String name) {
+        if (name == null) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(caches.get(name));
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java
new file mode 100644
index 0000000000000..b2b9f3d275c6a
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheManagerInitializer.java
@@ -0,0 +1,17 @@
+package io.quarkus.cache.runtime;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+
+import io.quarkus.cache.CacheManager;
+
+/**
+ * This class is used to eagerly create the {@link CacheManager} bean instance at STATIC_INIT execution time.
+ */
+public class CacheManagerInitializer {
+
+    private static void onStaticInit(@Observes @Initialized(ApplicationScoped.class) Object event, CacheManager cacheManager) {
+        cacheManager.getCacheNames();
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java
new file mode 100644
index 0000000000000..a8d1cffc7e54f
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheProducer.java
@@ -0,0 +1,31 @@
+package io.quarkus.cache.runtime;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.CacheName;
+
+@ApplicationScoped
+public class CacheProducer {
+
+    @Inject
+    CacheManager cacheManager;
+
+    @Produces
+    @CacheName("") // The `value` attribute is @Nonbinding.
+    Cache produce(InjectionPoint injectionPoint) {
+        for (Annotation qualifier : injectionPoint.getQualifiers()) {
+            if (qualifier instanceof CacheName) {
+                return cacheManager.getCache(((CacheName) qualifier).value()).get();
+            }
+        }
+        // This will never be returned.
+        return null;
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheRepository.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheRepository.java
deleted file mode 100644
index 87b1d5df4d44c..0000000000000
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheRepository.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.cache.runtime;
-
-import java.util.Collections;
-import java.util.Map;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import io.quarkus.cache.runtime.caffeine.CaffeineCache;
-
-@ApplicationScoped
-public class CacheRepository {
-
-    // There's no need for concurrency here since the map is created at build time and never modified after that.
-    private Map<String, CaffeineCache> caches;
-
-    public void setCaches(Map<String, CaffeineCache> caches) {
-        if (this.caches != null) {
-            throw new IllegalStateException("The caches map must only be set at build time");
-        }
-        this.caches = Collections.unmodifiableMap(caches);
-    }
-
-    public CaffeineCache getCache(String cacheName) {
-        return caches.get(cacheName);
-    }
-}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java
index 424b6581f4526..60d19de8fd61d 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptor.java
@@ -1,5 +1,11 @@
 package io.quarkus.cache.runtime;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
+
 import javax.annotation.Priority;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
@@ -7,23 +13,84 @@
 
 import org.jboss.logging.Logger;
 
-import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.cache.CacheResult;
 
-@CacheResultInterceptorBinding
+@CacheResult(cacheName = "") // The `cacheName` attribute is @Nonbinding.
 @Interceptor
 @Priority(CacheInterceptor.BASE_PRIORITY + 2)
 public class CacheResultInterceptor extends CacheInterceptor {
 
     private static final Logger LOGGER = Logger.getLogger(CacheResultInterceptor.class);
+    private static final String INTERCEPTOR_BINDING_ERROR_MSG = "The Quarkus cache extension is not working properly (CacheResult interceptor binding retrieval failed), please create a GitHub issue in the Quarkus repository to help the maintainers fix this bug";
 
     @AroundInvoke
-    public Object intercept(InvocationContext context) throws Exception {
-        CacheResultInterceptorBinding binding = getInterceptorBinding(context, CacheResultInterceptorBinding.class);
-        Object key = buildCacheKey(binding.cacheName(), binding.cacheKeyParameterPositions(), context.getParameters());
-        CaffeineCache cache = cacheRepository.getCache(binding.cacheName());
+    public Object intercept(InvocationContext invocationContext) throws Throwable {
+        CacheInterceptionContext<CacheResult> interceptionContext = getInterceptionContext(invocationContext,
+                CacheResult.class, true);
+
+        if (interceptionContext.getInterceptorBindings().isEmpty()) {
+            // This should never happen.
+            LOGGER.warn(INTERCEPTOR_BINDING_ERROR_MSG);
+            return invocationContext.proceed();
+        }
+
+        CacheResult binding = interceptionContext.getInterceptorBindings().get(0);
+        AbstractCache cache = (AbstractCache) cacheManager.getCache(binding.cacheName()).get();
+        Object key = getCacheKey(cache, interceptionContext.getCacheKeyParameterPositions(), invocationContext.getParameters());
         if (LOGGER.isDebugEnabled()) {
-            LOGGER.debugf("Loading entry with key [%s] from cache [%s]", key, cache.getName());
+            LOGGER.debugf("Loading entry with key [%s] from cache [%s]", key, binding.cacheName());
+        }
+
+        try {
+
+            CompletableFuture<Object> cacheValue = cache.get(key, new Function<Object, Object>() {
+                @Override
+                public Object apply(Object k) {
+                    try {
+                        return invocationContext.proceed();
+                    } catch (Exception e) {
+                        throw new CacheException(e);
+                    }
+                }
+            });
+
+            if (binding.lockTimeout() <= 0) {
+                return cacheValue.get();
+            } else {
+                try {
+                    /*
+                     * If the current thread started the cache value computation, then the computation is already finished since
+                     * it was done synchronously and the following call will never time out.
+                     */
+                    return cacheValue.get(binding.lockTimeout(), TimeUnit.MILLISECONDS);
+                } catch (TimeoutException e) {
+                    // TODO: Add statistics here to monitor the timeout.
+                    return invocationContext.proceed();
+                }
+            }
+
+        } catch (ExecutionException e) {
+            /*
+             * Any exception raised during a cache computation will be encapsulated into an ExecutionException because it is
+             * thrown during a CompletionStage execution.
+             */
+            if (e.getCause() instanceof CacheException) {
+                /*
+                 * The ExecutionException was caused by a CacheException (most likely case).
+                 * Let's throw the CacheException cause if possible or the CacheException itself otherwise.
+                 */
+                if (e.getCause().getCause() != null) {
+                    throw e.getCause().getCause();
+                } else {
+                    throw e.getCause();
+                }
+            } else if (e.getCause() != null) {
+                // The ExecutionException was caused by another type of Throwable (unlikely case).
+                throw e.getCause();
+            } else {
+                // The ExecutionException does not have a cause (very unlikely case).
+                throw e;
+            }
         }
-        return cache.get(key, () -> context.proceed(), binding.lockTimeout());
     }
 }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptorBinding.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptorBinding.java
deleted file mode 100644
index d091e9b6b5248..0000000000000
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CacheResultInterceptorBinding.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.cache.runtime;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
-
-@InterceptorBinding
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD })
-public @interface CacheResultInterceptorBinding {
-
-    @Nonbinding
-    String cacheName() default "";
-
-    @Nonbinding
-    short[] cacheKeyParameterPositions() default {};
-
-    @Nonbinding
-    long lockTimeout() default 0;
-}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CaffeineCacheSupplier.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CaffeineCacheSupplier.java
new file mode 100644
index 0000000000000..29ecd2a4b5570
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CaffeineCacheSupplier.java
@@ -0,0 +1,35 @@
+package io.quarkus.cache.runtime;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+
+public class CaffeineCacheSupplier implements Supplier<Collection<CaffeineCache>> {
+
+    @Override
+    public List<CaffeineCache> get() {
+        CacheManager cacheManager = cacheManager();
+        Collection<String> names = cacheManager.getCacheNames();
+        List<CaffeineCache> allCaches = new ArrayList<>(names.size());
+        for (String name : names) {
+            Optional<Cache> cache = cacheManager.getCache(name);
+            if (cache.isPresent() && cache.get() instanceof CaffeineCache) {
+                allCaches.add((CaffeineCache) cache.get());
+            }
+        }
+        allCaches.sort(Comparator.comparing(CaffeineCache::getName));
+        return allCaches;
+    }
+
+    public static CacheManager cacheManager() {
+        return Arc.container().instance(CacheManager.class).get();
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CompositeCacheKey.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CompositeCacheKey.java
new file mode 100644
index 0000000000000..41fe0b88a0d81
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/CompositeCacheKey.java
@@ -0,0 +1,45 @@
+package io.quarkus.cache.runtime;
+
+import java.util.Arrays;
+
+/**
+ * A composite cache key is used by the annotations caching API when a method annotated with
+ * {@link io.quarkus.cache.CacheResult CacheResult} or {@link io.quarkus.cache.CacheInvalidate CacheInvalidate} is invoked and
+ * when the cache key is composed of several of the method arguments (annotated with {@link io.quarkus.cache.CacheKey CacheKey}
+ * or not).
+ */
+public class CompositeCacheKey {
+
+    private final Object[] keyElements;
+
+    /**
+     * Constructor.
+     * 
+     * @param keyElements key elements
+     * @throws IllegalArgumentException if no key elements are provided
+     */
+    public CompositeCacheKey(Object... keyElements) {
+        if (keyElements.length == 0) {
+            throw new IllegalArgumentException(
+                    "At least one key element is required to create a composite cache key instance");
+        }
+        this.keyElements = keyElements;
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.deepHashCode(keyElements);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (CompositeCacheKey.class.isInstance(obj)) {
+            final CompositeCacheKey other = (CompositeCacheKey) obj;
+            return Arrays.deepEquals(keyElements, other.keyElements);
+        }
+        return false;
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/DefaultCacheKey.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/DefaultCacheKey.java
new file mode 100644
index 0000000000000..54181cffb8aa7
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/DefaultCacheKey.java
@@ -0,0 +1,39 @@
+package io.quarkus.cache.runtime;
+
+import java.util.Objects;
+
+/**
+ * A default cache key is used by the annotations caching API when a no-args method annotated with
+ * {@link io.quarkus.cache.CacheResult CacheResult} or {@link io.quarkus.cache.CacheInvalidate CacheInvalidate} is invoked.
+ */
+public class DefaultCacheKey {
+
+    private final String cacheName;
+
+    /**
+     * Constructor.
+     * 
+     * @param cacheName cache name
+     * @throws NullPointerException if the cache name is {@code null}
+     */
+    public DefaultCacheKey(String cacheName) {
+        this.cacheName = Objects.requireNonNull(cacheName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(cacheName);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (obj instanceof DefaultCacheKey) {
+            DefaultCacheKey other = (DefaultCacheKey) obj;
+            return Objects.equals(cacheName, other.cacheName);
+        }
+        return false;
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCache.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCache.java
index 3ef488ac1c80b..e4e2ba8aa11d3 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCache.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCache.java
@@ -1,20 +1,21 @@
 package io.quarkus.cache.runtime.caffeine;
 
-import static io.quarkus.cache.runtime.NullValueConverter.fromCacheValue;
-import static io.quarkus.cache.runtime.NullValueConverter.toCacheValue;
-
 import java.time.Duration;
-import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
+import java.util.function.Function;
 
 import com.github.benmanes.caffeine.cache.AsyncCache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
-public class CaffeineCache {
+import io.quarkus.cache.runtime.AbstractCache;
+import io.quarkus.cache.runtime.CacheException;
+import io.quarkus.cache.runtime.NullValueConverter;
+
+/**
+ * This class is an internal Quarkus cache implementation. Do not use it explicitly from your Quarkus application. The public
+ * methods signatures may change without prior notice.
+ */
+public class CaffeineCache extends AbstractCache {
 
     private AsyncCache<Object, Object> cache;
 
@@ -28,12 +29,9 @@ public class CaffeineCache {
 
     private Duration expireAfterAccess;
 
-    public CaffeineCache(CaffeineCacheInfo cacheInfo, Executor executor) {
+    public CaffeineCache(CaffeineCacheInfo cacheInfo) {
         this.name = cacheInfo.name;
         Caffeine<Object, Object> builder = Caffeine.newBuilder();
-        if (executor != null) {
-            builder.executor(executor);
-        }
         if (cacheInfo.initialCapacity != null) {
             this.initialCapacity = cacheInfo.initialCapacity;
             builder.initialCapacity(cacheInfo.initialCapacity);
@@ -53,55 +51,74 @@ public CaffeineCache(CaffeineCacheInfo cacheInfo, Executor executor) {
         cache = builder.buildAsync();
     }
 
-    public Object get(Object key, Callable<Object> valueLoader, long lockTimeout) throws Exception {
-        if (lockTimeout <= 0) {
-            return fromCacheValue(cache.synchronous().get(key, k -> new MappingSupplier(valueLoader).get()));
-        }
-
-        // The lock timeout logic starts here.
-
-        /*
-         * If the current key is not already associated with a value in the Caffeine cache, there's no way to know if the
-         * current thread or another one started the missing value computation. The following variable will be used to
-         * determine whether or not a timeout should be triggered during the computation depending on which thread started it.
-         */
-        boolean[] isCurrentThreadComputation = { false };
-
-        CompletableFuture<Object> future = cache.get(key, (k, executor) -> {
-            isCurrentThreadComputation[0] = true;
-            return CompletableFuture.supplyAsync(new MappingSupplier(valueLoader), executor);
-        });
+    @Override
+    public String getName() {
+        return name;
+    }
 
-        if (isCurrentThreadComputation[0]) {
-            // The value is missing and its computation was started from the current thread.
-            // We'll wait for the result no matter how long it takes.
-            return fromCacheValue(future.get());
-        } else {
-            // The value is either already present in the cache or missing and its computation was started from another thread.
-            // We want to retrieve it from the cache within the lock timeout delay.
+    /**
+     * Returns a {@link CompletableFuture} holding the cache value identified by {@code key}, obtaining that value from
+     * {@code valueLoader} if necessary. The value computation is done synchronously on the calling thread and the
+     * {@link CompletableFuture} is immediately completed before being returned.
+     * 
+     * @param key cache key
+     * @param valueLoader function used to compute the cache value if {@code key} is not already associated with a value
+     * @return a {@link CompletableFuture} holding the cache value
+     * @throws CacheException if an exception is thrown during the cache value computation
+     */
+    @Override
+    public CompletableFuture<Object> get(Object key, Function<Object, Object> valueLoader) {
+        if (key == null) {
+            throw new NullPointerException(NULL_KEYS_NOT_SUPPORTED_MSG);
+        }
+        CompletableFuture<Object> newCacheValue = new CompletableFuture<Object>();
+        CompletableFuture<Object> existingCacheValue = cache.asMap().putIfAbsent(key, newCacheValue);
+        if (existingCacheValue == null) {
             try {
-                return fromCacheValue(future.get(lockTimeout, TimeUnit.MILLISECONDS));
-            } catch (TimeoutException e) {
-                // Timeout triggered! We don't want to wait any longer for the value computation and we'll simply invoke the
-                // cached method and return its result without caching it.
-                // TODO: Add statistics here to monitor the timeout.
-                return valueLoader.call();
+                Object value = valueLoader.apply(key);
+                newCacheValue.complete(NullValueConverter.toCacheValue(value));
+            } catch (Throwable t) {
+                cache.asMap().remove(key, newCacheValue);
+                newCacheValue.complete(new CaffeineComputationThrowable(t));
             }
+            return unwrapCacheValueOrThrowable(newCacheValue);
+        } else {
+            return unwrapCacheValueOrThrowable(existingCacheValue);
         }
     }
 
+    private CompletableFuture<Object> unwrapCacheValueOrThrowable(CompletableFuture<Object> cacheValue) {
+        return cacheValue.thenApply(new Function<Object, Object>() {
+            @Override
+            public Object apply(Object value) {
+                // If there's a throwable encapsulated into a CaffeineComputationThrowable, it must be rethrown.
+                if (value instanceof CaffeineComputationThrowable) {
+                    Throwable cause = ((CaffeineComputationThrowable) value).getCause();
+                    if (cause instanceof RuntimeException) {
+                        throw (RuntimeException) cause;
+                    } else {
+                        throw new CacheException(cause);
+                    }
+                } else {
+                    return NullValueConverter.fromCacheValue(value);
+                }
+            }
+        });
+    }
+
+    @Override
     public void invalidate(Object key) {
+        if (key == null) {
+            throw new NullPointerException(NULL_KEYS_NOT_SUPPORTED_MSG);
+        }
         cache.synchronous().invalidate(key);
     }
 
+    @Override
     public void invalidateAll() {
         cache.synchronous().invalidateAll();
     }
 
-    public String getName() {
-        return name;
-    }
-
     // For testing purposes only.
     public Integer getInitialCapacity() {
         return initialCapacity;
@@ -122,23 +139,7 @@ public Duration getExpireAfterAccess() {
         return expireAfterAccess;
     }
 
-    private static class MappingSupplier implements Supplier<Object> {
-
-        private final Callable<?> valueLoader;
-
-        public MappingSupplier(Callable<?> valueLoader) {
-            this.valueLoader = valueLoader;
-        }
-
-        @Override
-        public Object get() {
-            try {
-                return toCacheValue(valueLoader.call());
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
+    public long getSize() {
+        return cache.synchronous().estimatedSize();
     }
 }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCacheBuildRecorder.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCacheBuildRecorder.java
index 3c06dc89e71bd..15e259a9d5b60 100644
--- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCacheBuildRecorder.java
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineCacheBuildRecorder.java
@@ -1,15 +1,17 @@
 package io.quarkus.cache.runtime.caffeine;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
+import java.util.function.Supplier;
 
-import org.eclipse.microprofile.context.ManagedExecutor;
 import org.jboss.logging.Logger;
 
-import io.quarkus.arc.Arc;
-import io.quarkus.arc.runtime.BeanContainer;
-import io.quarkus.cache.runtime.CacheRepository;
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.runtime.CacheManagerImpl;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
@@ -17,24 +19,29 @@ public class CaffeineCacheBuildRecorder {
 
     private static final Logger LOGGER = Logger.getLogger(CaffeineCacheBuildRecorder.class);
 
-    public void buildCaches(BeanContainer beanContainer,
-            Set<CaffeineCacheInfo> cacheInfos) {
-        // The number of caches is known at build time so we can use fixed initialCapacity and loadFactor for the caches map.
-        Map<String, CaffeineCache> caches = new HashMap<>(cacheInfos.size() + 1, 1.0F);
-
-        ManagedExecutor managedExecutor = Arc.container().instance(ManagedExecutor.class).orElse(null);
-
-        for (CaffeineCacheInfo cacheInfo : cacheInfos) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debugf(
-                        "Building Caffeine cache [%s] with [initialCapacity=%s], [maximumSize=%s], [expireAfterWrite=%s] and [expireAfterAccess=%s]",
-                        cacheInfo.name, cacheInfo.initialCapacity, cacheInfo.maximumSize, cacheInfo.expireAfterWrite,
-                        cacheInfo.expireAfterAccess);
+    public Supplier<CacheManager> getCacheManagerSupplier(Set<CaffeineCacheInfo> cacheInfos) {
+        Objects.requireNonNull(cacheInfos);
+        return new Supplier<CacheManager>() {
+            @Override
+            public CacheManager get() {
+                if (cacheInfos.isEmpty()) {
+                    return new CacheManagerImpl(Collections.emptyMap());
+                } else {
+                    // The number of caches is known at build time so we can use fixed initialCapacity and loadFactor for the caches map.
+                    Map<String, Cache> caches = new HashMap<>(cacheInfos.size() + 1, 1.0F);
+                    for (CaffeineCacheInfo cacheInfo : cacheInfos) {
+                        if (LOGGER.isDebugEnabled()) {
+                            LOGGER.debugf(
+                                    "Building Caffeine cache [%s] with [initialCapacity=%s], [maximumSize=%s], [expireAfterWrite=%s] and [expireAfterAccess=%s]",
+                                    cacheInfo.name, cacheInfo.initialCapacity, cacheInfo.maximumSize,
+                                    cacheInfo.expireAfterWrite, cacheInfo.expireAfterAccess);
+                        }
+                        CaffeineCache cache = new CaffeineCache(cacheInfo);
+                        caches.put(cacheInfo.name, cache);
+                    }
+                    return new CacheManagerImpl(caches);
+                }
             }
-            CaffeineCache cache = new CaffeineCache(cacheInfo, managedExecutor);
-            caches.put(cacheInfo.name, cache);
-        }
-
-        beanContainer.instance(CacheRepository.class).setCaches(caches);
+        };
     }
 }
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineComputationThrowable.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineComputationThrowable.java
new file mode 100644
index 0000000000000..761431d9b6d70
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/caffeine/CaffeineComputationThrowable.java
@@ -0,0 +1,17 @@
+package io.quarkus.cache.runtime.caffeine;
+
+/**
+ * This class is used to prevent Caffeine from logging unwanted warnings.
+ */
+public class CaffeineComputationThrowable {
+
+    private Throwable cause;
+
+    public CaffeineComputationThrowable(Throwable cause) {
+        this.cause = cause;
+    }
+
+    public Throwable getCause() {
+        return cause;
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devconsole/CacheDevConsoleRecorder.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devconsole/CacheDevConsoleRecorder.java
new file mode 100644
index 0000000000000..c8d1058f50983
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devconsole/CacheDevConsoleRecorder.java
@@ -0,0 +1,34 @@
+package io.quarkus.cache.runtime.devconsole;
+
+import java.util.Optional;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.runtime.CaffeineCacheSupplier;
+import io.quarkus.cache.runtime.caffeine.CaffeineCache;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil.FlashMessageStatus;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class CacheDevConsoleRecorder {
+
+    public Handler<RoutingContext> clearCacheHandler() {
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form) throws Exception {
+                String cacheName = form.get("name");
+                Optional<Cache> cache = CaffeineCacheSupplier.cacheManager().getCache(cacheName);
+                if (cache.isPresent() && cache.get() instanceof CaffeineCache) {
+                    ((CaffeineCache) cache.get()).invalidateAll();
+                    // redirect to the same page so we can make sure we see the updated results
+                    flashMessage(event, "Cache for " + cacheName + " cleared");
+                    return;
+                }
+                flashMessage(event, "Cache for " + cacheName + " not found", FlashMessageStatus.ERROR);
+            }
+        };
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/noop/NoOpCache.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/noop/NoOpCache.java
new file mode 100644
index 0000000000000..2bd7ebdb0fb07
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/noop/NoOpCache.java
@@ -0,0 +1,40 @@
+package io.quarkus.cache.runtime.noop;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+import io.quarkus.cache.runtime.AbstractCache;
+
+/**
+ * This class is an internal Quarkus cache implementation. Do not use it explicitly from your Quarkus application. The public
+ * methods signatures may change without prior notice.
+ */
+public class NoOpCache extends AbstractCache {
+
+    private static final String NAME = NoOpCache.class.getName();
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @Override
+    public CompletableFuture<Object> get(Object key, Function<Object, Object> valueLoader) {
+        CompletableFuture<Object> cacheValue = new CompletableFuture<Object>();
+        try {
+            Object value = valueLoader.apply(key);
+            cacheValue.complete(value);
+        } catch (Throwable t) {
+            cacheValue.completeExceptionally(t);
+        }
+        return cacheValue;
+    }
+
+    @Override
+    public void invalidate(Object key) {
+    }
+
+    @Override
+    public void invalidateAll() {
+    }
+}
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/noop/NoOpCacheBuildRecorder.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/noop/NoOpCacheBuildRecorder.java
new file mode 100644
index 0000000000000..26d6aadcddc4d
--- /dev/null
+++ b/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/noop/NoOpCacheBuildRecorder.java
@@ -0,0 +1,37 @@
+package io.quarkus.cache.runtime.noop;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import io.quarkus.cache.Cache;
+import io.quarkus.cache.CacheManager;
+import io.quarkus.cache.runtime.CacheManagerImpl;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class NoOpCacheBuildRecorder {
+
+    public Supplier<CacheManager> getCacheManagerSupplier(Set<String> cacheNames) {
+        Objects.requireNonNull(cacheNames);
+        return new Supplier<CacheManager>() {
+            @Override
+            public CacheManager get() {
+                if (cacheNames.isEmpty()) {
+                    return new CacheManagerImpl(Collections.emptyMap());
+                } else {
+                    // The number of caches is known at build time so we can use fixed initialCapacity and loadFactor for the caches map.
+                    Map<String, Cache> caches = new HashMap<>(cacheNames.size() + 1, 1.0F);
+                    NoOpCache cache = new NoOpCache();
+                    for (String cacheName : cacheNames) {
+                        caches.put(cacheName, cache);
+                    }
+                    return new CacheManagerImpl(caches);
+                }
+            }
+        };
+    }
+}
diff --git a/extensions/caffeine/deployment/src/main/java/io/quarkus/caffeine/deployment/CaffeineProcessor.java b/extensions/caffeine/deployment/src/main/java/io/quarkus/caffeine/deployment/CaffeineProcessor.java
index eaabad23faae9..c3b4ad9286697 100644
--- a/extensions/caffeine/deployment/src/main/java/io/quarkus/caffeine/deployment/CaffeineProcessor.java
+++ b/extensions/caffeine/deployment/src/main/java/io/quarkus/caffeine/deployment/CaffeineProcessor.java
@@ -2,14 +2,23 @@
 
 import java.io.IOException;
 
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 
 public class CaffeineProcessor {
+    private static final String CACHE_LOADER_CLASS_NAME = "com.github.benmanes.caffeine.cache.CacheLoader";
+    private static final DotName CACHE_LOADER_NAME = DotName.createSimple(CACHE_LOADER_CLASS_NAME);
 
     @BuildStep
     ReflectiveClassBuildItem cacheClasses() throws IOException {
-        //todo: how to we want to handle this? There are a lot of different cache classes
+        // for now, we register classes that have been required by our users
+        // registering all the implementations for reflection gives us a 14 MB penalty in native executable size
+        // see https://github.com/quarkusio/quarkus/issues/12961
         return new ReflectiveClassBuildItem(false, false,
                 "com.github.benmanes.caffeine.cache.SSLMS",
                 "com.github.benmanes.caffeine.cache.SILMS",
@@ -17,6 +26,19 @@ ReflectiveClassBuildItem cacheClasses() throws IOException {
                 "com.github.benmanes.caffeine.cache.PDMS",
                 "com.github.benmanes.caffeine.cache.SSMS",
                 "com.github.benmanes.caffeine.cache.SSLA",
-                "com.github.benmanes.caffeine.cache.PSA");
+                "com.github.benmanes.caffeine.cache.PSA",
+                "com.github.benmanes.caffeine.cache.SSMSW",
+                "com.github.benmanes.caffeine.cache.PSWMW",
+                "com.github.benmanes.caffeine.cache.SSW",
+                "com.github.benmanes.caffeine.cache.PSW");
+    }
+
+    @BuildStep
+    void cacheLoaders(CombinedIndexBuildItem combinedIndex, BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, CACHE_LOADER_CLASS_NAME));
+
+        for (ClassInfo info : combinedIndex.getIndex().getAllKnownImplementors(CACHE_LOADER_NAME)) {
+            reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, info.name().toString()));
+        }
     }
 }
diff --git a/extensions/caffeine/pom.xml b/extensions/caffeine/pom.xml
index dd80bc2cb8f20..8ab1e106ca586 100644
--- a/extensions/caffeine/pom.xml
+++ b/extensions/caffeine/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/caffeine/runtime/pom.xml b/extensions/caffeine/runtime/pom.xml
index d7a9ad92799da..7504c562c5f26 100644
--- a/extensions/caffeine/runtime/pom.xml
+++ b/extensions/caffeine/runtime/pom.xml
@@ -13,6 +13,10 @@
     <name>Quarkus - Caffeine - Runtime</name>
     <description>A high performance caching library for Java 8+</description>
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
@@ -20,6 +24,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/config-yaml/deployment/pom.xml b/extensions/config-yaml/deployment/pom.xml
index 377e1eed0f290..fcbb526f40966 100644
--- a/extensions/config-yaml/deployment/pom.xml
+++ b/extensions/config-yaml/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-config-yaml-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-config-yaml-deployment</artifactId>
diff --git a/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java b/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java
index 405e7e244da13..7119701d73c49 100644
--- a/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java
+++ b/extensions/config-yaml/deployment/src/main/java/io/quarkus/config/yaml/deployment/ConfigYamlProcessor.java
@@ -1,10 +1,12 @@
 package io.quarkus.config.yaml.deployment;
 
-import io.quarkus.config.yaml.runtime.ApplicationYamlProvider;
+import io.quarkus.config.yaml.runtime.ApplicationYamlConfigSourceLoader;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.AdditionalBootstrapConfigSourceProviderBuildItem;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 
@@ -16,13 +18,22 @@ public FeatureBuildItem feature() {
     }
 
     @BuildStep
-    public AdditionalBootstrapConfigSourceProviderBuildItem bootstrap() {
-        return new AdditionalBootstrapConfigSourceProviderBuildItem(ApplicationYamlProvider.class.getName());
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.CONFIG_YAML);
+    }
+
+    @BuildStep
+    public void bootstrap(
+            BuildProducer<AdditionalBootstrapConfigSourceProviderBuildItem> additionalBootstrapConfigSourceProvider) {
+        additionalBootstrapConfigSourceProvider.produce(new AdditionalBootstrapConfigSourceProviderBuildItem(
+                ApplicationYamlConfigSourceLoader.InFileSystem.class.getName()));
+        additionalBootstrapConfigSourceProvider.produce(new AdditionalBootstrapConfigSourceProviderBuildItem(
+                ApplicationYamlConfigSourceLoader.InClassPath.class.getName()));
     }
 
     @BuildStep
     void watchYamlConfig(BuildProducer<HotDeploymentWatchedFileBuildItem> items) {
-        items.produce(new HotDeploymentWatchedFileBuildItem(ApplicationYamlProvider.APPLICATION_YAML));
-        items.produce(new HotDeploymentWatchedFileBuildItem(ApplicationYamlProvider.APPLICATION_YML));
+        items.produce(new HotDeploymentWatchedFileBuildItem("application.yaml"));
+        items.produce(new HotDeploymentWatchedFileBuildItem("application.yml"));
     }
 }
diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java
index e747da196da75..55785f32f7670 100644
--- a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java
+++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ApplicationYamlHotDeploymentTest.java
@@ -1,7 +1,5 @@
 package io.quarkus.config.yaml.deployment;
 
-import static io.quarkus.config.yaml.runtime.ApplicationYamlProvider.APPLICATION_YAML;
-import static io.quarkus.config.yaml.runtime.ApplicationYamlProvider.APPLICATION_YML;
 import static org.hamcrest.Matchers.is;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -17,8 +15,8 @@ public class ApplicationYamlHotDeploymentTest {
     @RegisterExtension
     static final QuarkusDevModeTest test = new QuarkusDevModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource(APPLICATION_YAML)
-                    .addAsResource(APPLICATION_YML)
+                    .addAsResource("application.yaml")
+                    .addAsResource("application.yml")
                     .addClass(FooResource.class));
 
     @Test
@@ -31,13 +29,13 @@ public void testConfigReload() {
                 .statusCode(200)
                 .body(is("CCCC"));
 
-        test.modifyResourceFile(APPLICATION_YAML, s -> s.replace("AAAA", "BBBB"));
+        test.modifyResourceFile("application.yaml", s -> s.replace("AAAA", "BBBB"));
 
         RestAssured.when().get("/foo").then()
                 .statusCode(200)
                 .body(is("BBBB"));
 
-        test.modifyResourceFile(APPLICATION_YML, s -> s.replace("CCCC", "DDDD"));
+        test.modifyResourceFile("application.yml", s -> s.replace("CCCC", "DDDD"));
 
         RestAssured.when().get("/foo2").then()
                 .statusCode(200)
diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java
new file mode 100644
index 0000000000000..6ce6457315bc6
--- /dev/null
+++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/ClassConfigPropertiesTest.java
@@ -0,0 +1,150 @@
+package io.quarkus.config.yaml.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.config.ConfigProperties;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ClassConfigPropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DummyBean.class, SqlConfiguration.class, Nested.class)
+                    .addAsResource("configprops.yaml", "application.yaml"));
+
+    @Inject
+    DummyBean dummyBean;
+
+    @Test
+    public void testConfiguredValues() {
+        SqlConfiguration sqlConfiguration = dummyBean.sqlConfiguration;
+        assertEquals("defaultName", sqlConfiguration.name);
+        assertEquals("defaultUser", sqlConfiguration.user);
+        assertEquals("defaultPassword", sqlConfiguration.getPassword());
+        assertEquals(100, sqlConfiguration.maxPoolSize);
+        assertEquals(200, sqlConfiguration.getMaxIdleTimeSeconds());
+        assertEquals(Type.DEFAULT_TYPE, sqlConfiguration.type);
+
+        assertEquals(2, sqlConfiguration.inputs.size());
+        Nested firstInput = sqlConfiguration.inputs.get(0);
+        assertEquals("my_connection_1", firstInput.name);
+        assertEquals("systemuser", firstInput.user);
+        assertEquals("secret", firstInput.password);
+        assertEquals(Type.MSSQL, firstInput.getType());
+        assertEquals(100, firstInput.getMaxPoolSize());
+        assertEquals(150, firstInput.maxIdleTimeSeconds);
+        Nested secondInput = sqlConfiguration.inputs.get(1);
+        assertEquals("my_connection_2", secondInput.name);
+        assertEquals("otheruser", secondInput.user);
+        assertEquals("secret", secondInput.password);
+        assertEquals(Type.POSTGRES, secondInput.getType());
+        assertEquals(10, secondInput.getMaxPoolSize());
+        assertEquals(20, secondInput.maxIdleTimeSeconds);
+
+        assertEquals(2, sqlConfiguration.getOutputs().size());
+        Nested firstOutput = sqlConfiguration.getOutputs().get(0);
+        assertEquals("out_connection_1", firstOutput.name);
+        assertEquals("someuser", firstOutput.user);
+        assertEquals("asecret", firstOutput.password);
+        assertEquals(Type.MSSQL, firstOutput.getType());
+        assertEquals(100, firstOutput.getMaxPoolSize());
+        assertEquals(200, firstOutput.maxIdleTimeSeconds);
+        Nested secondOutput = sqlConfiguration.getOutputs().get(1);
+        assertEquals("out_connection_2", secondOutput.name);
+        assertEquals("someuser", secondOutput.user);
+        assertEquals("asecret", secondOutput.password);
+        assertEquals(Type.POSTGRES, secondOutput.getType());
+        assertEquals(200, secondOutput.getMaxPoolSize());
+        assertEquals(300, secondOutput.maxIdleTimeSeconds);
+    }
+
+    @Singleton
+    public static class DummyBean {
+        @Inject
+        SqlConfiguration sqlConfiguration;
+    }
+
+    @ConfigProperties(prefix = "sql")
+    public static class SqlConfiguration {
+        @ConfigProperty(name = "max_pool_size")
+        public int maxPoolSize = 50;
+        @ConfigProperty(name = "max_idle_time_seconds")
+        private int maxIdleTimeSeconds = 100;
+        public String name;
+        public String user;
+        private String password;
+        public Type type;
+        public List<Nested> inputs;
+        private List<Nested> outputs;
+
+        public int getMaxIdleTimeSeconds() {
+            return maxIdleTimeSeconds;
+        }
+
+        public void setMaxIdleTimeSeconds(int maxIdleTimeSeconds) {
+            this.maxIdleTimeSeconds = maxIdleTimeSeconds;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+
+        public List<Nested> getOutputs() {
+            return outputs;
+        }
+
+        public void setOutputs(List<Nested> outputs) {
+            this.outputs = outputs;
+        }
+    }
+
+    public static class Nested {
+        @ConfigProperty(name = "max_pool_size")
+        private int maxPoolSize = 50;
+        @ConfigProperty(name = "max_idle_time_seconds")
+        public int maxIdleTimeSeconds = 150;
+        public String name;
+        public String user;
+        public String password;
+        private Type type;
+
+        public int getMaxPoolSize() {
+            return maxPoolSize;
+        }
+
+        public void setMaxPoolSize(int maxPoolSize) {
+            this.maxPoolSize = maxPoolSize;
+        }
+
+        public Type getType() {
+            return type;
+        }
+
+        public void setType(Type type) {
+            this.type = type;
+        }
+    }
+
+    public enum Type {
+        MSSQL,
+        POSTGRES,
+        MYSQL,
+        DEFAULT_TYPE
+    }
+}
diff --git a/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java
new file mode 100644
index 0000000000000..bb61a594aa0a4
--- /dev/null
+++ b/extensions/config-yaml/deployment/src/test/java/io/quarkus/config/yaml/deployment/InterfaceConfigPropertiesTest.java
@@ -0,0 +1,135 @@
+package io.quarkus.config.yaml.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.config.ConfigProperties;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InterfaceConfigPropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DummyBean.class, SqlConfiguration.class, SqlConfiguration.Nested.class,
+                            SqlConfiguration.Type.class)
+                    .addAsResource("configprops.yaml", "application.yaml"));
+
+    @Inject
+    DummyBean dummyBean;
+
+    @Test
+    public void testConfiguredValues() {
+        SqlConfiguration sqlConfiguration = dummyBean.sqlConfiguration;
+        assertEquals("defaultName", sqlConfiguration.getName());
+        assertEquals("defaultUser", sqlConfiguration.getUser());
+        assertEquals("defaultPassword", sqlConfiguration.getPassword());
+        assertEquals(100, sqlConfiguration.maxPoolSize());
+        assertEquals(200, sqlConfiguration.maxIdleTimeSeconds());
+        assertEquals(SqlConfiguration.Type.DEFAULT_TYPE, sqlConfiguration.getType());
+
+        assertEquals(2, sqlConfiguration.getInputs().size());
+        SqlConfiguration.Nested firstInput = sqlConfiguration.getInputs().get(0);
+        assertEquals("my_connection_1", firstInput.name);
+        assertEquals("systemuser", firstInput.user);
+        assertEquals("secret", firstInput.password);
+        assertEquals(SqlConfiguration.Type.MSSQL, firstInput.getType());
+        assertEquals(100, firstInput.getMaxPoolSize());
+        assertEquals(150, firstInput.maxIdleTimeSeconds);
+        SqlConfiguration.Nested secondInput = sqlConfiguration.getInputs().get(1);
+        assertEquals("my_connection_2", secondInput.name);
+        assertEquals("otheruser", secondInput.user);
+        assertEquals("secret", secondInput.password);
+        assertEquals(SqlConfiguration.Type.POSTGRES, secondInput.getType());
+        assertEquals(10, secondInput.getMaxPoolSize());
+        assertEquals(20, secondInput.maxIdleTimeSeconds);
+
+        assertEquals(2, sqlConfiguration.getOutputs().size());
+        SqlConfiguration.Nested firstOutput = sqlConfiguration.getOutputs().get(0);
+        assertEquals("out_connection_1", firstOutput.name);
+        assertEquals("someuser", firstOutput.user);
+        assertEquals("asecret", firstOutput.password);
+        assertEquals(SqlConfiguration.Type.MSSQL, firstOutput.getType());
+        assertEquals(100, firstOutput.getMaxPoolSize());
+        assertEquals(200, firstOutput.maxIdleTimeSeconds);
+        SqlConfiguration.Nested secondOutput = sqlConfiguration.getOutputs().get(1);
+        assertEquals("out_connection_2", secondOutput.name);
+        assertEquals("someuser", secondOutput.user);
+        assertEquals("asecret", secondOutput.password);
+        assertEquals(SqlConfiguration.Type.POSTGRES, secondOutput.getType());
+        assertEquals(200, secondOutput.getMaxPoolSize());
+        assertEquals(300, secondOutput.maxIdleTimeSeconds);
+    }
+
+    @Singleton
+    public static class DummyBean {
+        @Inject
+        SqlConfiguration sqlConfiguration;
+    }
+
+    @ConfigProperties(prefix = "sql")
+    public interface SqlConfiguration {
+        @ConfigProperty(name = "max_pool_size", defaultValue = "50")
+        int maxPoolSize();
+
+        @ConfigProperty(name = "max_idle_time_seconds", defaultValue = "100")
+        int maxIdleTimeSeconds();
+
+        String getName();
+
+        String getUser();
+
+        String getPassword();
+
+        Type getType();
+
+        List<Nested> getInputs();
+
+        List<Nested> getOutputs();
+
+        class Nested {
+            @ConfigProperty(name = "max_pool_size")
+            private int maxPoolSize = 50;
+            @ConfigProperty(name = "max_idle_time_seconds")
+            public int maxIdleTimeSeconds = 150;
+            public String name;
+            public String user;
+            public String password;
+            private Type type;
+
+            public int getMaxPoolSize() {
+                return maxPoolSize;
+            }
+
+            public void setMaxPoolSize(int maxPoolSize) {
+                this.maxPoolSize = maxPoolSize;
+            }
+
+            public Type getType() {
+                return type;
+            }
+
+            public void setType(Type type) {
+                this.type = type;
+            }
+        }
+
+        enum Type {
+            MSSQL,
+            POSTGRES,
+            MYSQL,
+            DEFAULT_TYPE
+        }
+    }
+
+}
diff --git a/extensions/config-yaml/deployment/src/test/resources/configprops.yaml b/extensions/config-yaml/deployment/src/test/resources/configprops.yaml
new file mode 100644
index 0000000000000..93f4e5984a139
--- /dev/null
+++ b/extensions/config-yaml/deployment/src/test/resources/configprops.yaml
@@ -0,0 +1,37 @@
+sql:
+  max_pool_size: 100
+  max_idle_time_seconds: 200
+  name: defaultName
+  user: defaultUser
+  password: defaultPassword
+  type: DEFAULT_TYPE
+  inputs:
+    - name: my_connection_1
+      type: MSSQL
+      min_pool_size: 1
+      max_pool_size: 100
+      user: systemuser
+      password: secret
+    - name: my_connection_2
+      type: POSTGRES
+      max_pool_size: 10
+      max_idle_time_seconds: 20
+      user: otheruser
+      password: secret
+  outputs:
+    - name: out_connection_1
+      type: MSSQL
+      max_pool_size: 100
+      min_pool_size: 1
+      create_increment: 5
+      max_idle_time_seconds: 200
+      user: someuser
+      password: asecret
+    - name: out_connection_2
+      type: POSTGRES
+      max_pool_size: 200
+      min_pool_size: 1
+      create_increment: 5
+      max_idle_time_seconds: 300
+      user: someuser
+      password: asecret
diff --git a/extensions/config-yaml/pom.xml b/extensions/config-yaml/pom.xml
index a51802c75422f..799d1334b02c0 100644
--- a/extensions/config-yaml/pom.xml
+++ b/extensions/config-yaml/pom.xml
@@ -3,10 +3,10 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-       <artifactId>quarkus-build-parent</artifactId>
+       <artifactId>quarkus-extensions-parent</artifactId>
        <groupId>io.quarkus</groupId>
        <version>999-SNAPSHOT</version>
-       <relativePath>../../build-parent/pom.xml</relativePath>
+       <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/AbstractYamlObjectConverter.java b/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/AbstractYamlObjectConverter.java
new file mode 100644
index 0000000000000..216aeb4617c03
--- /dev/null
+++ b/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/AbstractYamlObjectConverter.java
@@ -0,0 +1,53 @@
+package io.quarkus.config.yaml.runtime;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.microprofile.config.spi.Converter;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.introspector.Property;
+import org.yaml.snakeyaml.introspector.PropertyUtils;
+
+/**
+ * This class is used by generated code to support the list of objects use case in {@code @ConfigProperties}
+ */
+@SuppressWarnings("unused")
+public abstract class AbstractYamlObjectConverter<T> implements Converter<T> {
+
+    protected abstract Class<T> getClazz();
+
+    /**
+     * Contains names of fields that need to be converted from the value that MP-Config has set
+     * to the actual name of the field in the class
+     */
+    protected Map<String, String> getFieldNameMap() {
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public T convert(String value) {
+        org.yaml.snakeyaml.constructor.Constructor constructor = new Constructor();
+        CustomPropertyUtils propertyUtils = new CustomPropertyUtils(getFieldNameMap());
+        propertyUtils.setSkipMissingProperties(true);
+        constructor.setPropertyUtils(propertyUtils);
+        return new Yaml(constructor).loadAs(value, getClazz());
+    }
+
+    private static class CustomPropertyUtils extends PropertyUtils {
+
+        private final Map<String, String> fieldNameMap;
+
+        public CustomPropertyUtils(Map<String, String> fieldNameMap) {
+            this.fieldNameMap = fieldNameMap;
+        }
+
+        @Override
+        public Property getProperty(Class<?> type, String name) {
+            if (fieldNameMap.containsKey(name)) {
+                name = fieldNameMap.get(name);
+            }
+            return super.getProperty(type, name);
+        }
+    }
+}
diff --git a/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/ApplicationYamlConfigSourceLoader.java b/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/ApplicationYamlConfigSourceLoader.java
new file mode 100644
index 0000000000000..cfb664721c4b6
--- /dev/null
+++ b/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/ApplicationYamlConfigSourceLoader.java
@@ -0,0 +1,69 @@
+package io.quarkus.config.yaml.runtime;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+
+import io.smallrye.config.AbstractLocationConfigSourceLoader;
+import io.smallrye.config.source.yaml.YamlConfigSource;
+
+public class ApplicationYamlConfigSourceLoader extends AbstractLocationConfigSourceLoader {
+    @Override
+    protected String[] getFileExtensions() {
+        return new String[] {
+                "yaml",
+                "yml"
+        };
+
+    }
+
+    @Override
+    protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+        return new YamlConfigSource(url, ordinal);
+    }
+
+    public static class InClassPath extends ApplicationYamlConfigSourceLoader implements ConfigSourceProvider {
+        @Override
+        protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+            return super.loadConfigSource(url, 255);
+        }
+
+        @Override
+        public List<ConfigSource> getConfigSources(final ClassLoader classLoader) {
+            List<ConfigSource> configSources = new ArrayList<>();
+            configSources.addAll(loadConfigSources("application.yaml", classLoader));
+            configSources.addAll(loadConfigSources("application.yml", classLoader));
+            return configSources;
+        }
+
+        @Override
+        protected List<ConfigSource> tryFileSystem(final URI uri) {
+            return new ArrayList<>();
+        }
+    }
+
+    public static class InFileSystem extends ApplicationYamlConfigSourceLoader implements ConfigSourceProvider {
+        @Override
+        protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws IOException {
+            return super.loadConfigSource(url, 265);
+        }
+
+        @Override
+        public List<ConfigSource> getConfigSources(final ClassLoader classLoader) {
+            List<ConfigSource> configSources = new ArrayList<>();
+            configSources.addAll(loadConfigSources("config/application.yaml", classLoader));
+            configSources.addAll(loadConfigSources("config/application.yml", classLoader));
+            return configSources;
+        }
+
+        @Override
+        protected List<ConfigSource> tryClassPath(final URI uri, final ClassLoader classLoader) {
+            return new ArrayList<>();
+        }
+    }
+}
diff --git a/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/ApplicationYamlProvider.java b/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/ApplicationYamlProvider.java
deleted file mode 100644
index df3c86d8b62fb..0000000000000
--- a/extensions/config-yaml/runtime/src/main/java/io/quarkus/config/yaml/runtime/ApplicationYamlProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.quarkus.config.yaml.runtime;
-
-import java.io.Closeable;
-import java.io.FileNotFoundException;
-import java.io.IOError;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
-
-import io.smallrye.config.source.yaml.YamlConfigSource;
-
-/**
- *
- */
-public final class ApplicationYamlProvider implements ConfigSourceProvider {
-
-    public static final String APPLICATION_YAML = "application.yaml";
-    private static final int APPLICATION_YAML_IN_JAR_ORDINAL = 254;
-    public static final String APPLICATION_YML = "application.yml";
-    private static final int APPLICATION_YML_IN_JAR_ORDINAL = 253;
-
-    @Override
-    public Iterable<ConfigSource> getConfigSources(final ClassLoader forClassLoader) {
-        List<ConfigSource> yamlSources = getConfigSourcesForFileName(APPLICATION_YAML, APPLICATION_YAML_IN_JAR_ORDINAL,
-                forClassLoader);
-        List<ConfigSource> ymlSources = getConfigSourcesForFileName(APPLICATION_YML, APPLICATION_YML_IN_JAR_ORDINAL,
-                forClassLoader);
-        if (yamlSources.isEmpty() && ymlSources.isEmpty()) {
-            return Collections.emptyList();
-        } else if (yamlSources.isEmpty()) {
-            return ymlSources;
-        } else if (ymlSources.isEmpty()) {
-            return yamlSources;
-        }
-        List<ConfigSource> result = new ArrayList<>(yamlSources.size() + ymlSources.size());
-        result.addAll(yamlSources);
-        result.addAll(ymlSources);
-        return result;
-    }
-
-    private List<ConfigSource> getConfigSourcesForFileName(String fileName, int inJarOrdinal, ClassLoader forClassLoader) {
-        List<ConfigSource> sources = Collections.emptyList();
-        // mirror the in-JAR application.properties
-        try {
-            InputStream str = forClassLoader.getResourceAsStream(fileName);
-            if (str != null) {
-                try (Closeable c = str) {
-                    YamlConfigSource configSource = new YamlConfigSource(fileName, str, inJarOrdinal);
-                    assert sources.isEmpty();
-                    sources = Collections.singletonList(configSource);
-                }
-            }
-        } catch (IOException e) {
-            // configuration problem should be thrown
-            throw new IOError(e);
-        }
-        // mirror the on-filesystem application.properties
-        final Path path = Paths.get("config", fileName);
-        if (Files.exists(path)) {
-            try (InputStream str = Files.newInputStream(path)) {
-                YamlConfigSource configSource = new YamlConfigSource(fileName, str, inJarOrdinal + 10);
-                if (sources.isEmpty()) {
-                    sources = Collections.singletonList(configSource);
-                } else {
-                    // todo: sources = List.of(sources.get(0), configSource);
-                    sources = Arrays.asList(sources.get(0), configSource);
-                }
-            } catch (NoSuchFileException | FileNotFoundException e) {
-                // skip (race)
-            } catch (IOException e) {
-                // configuration problem should be thrown
-                throw new IOError(e);
-            }
-        }
-        return sources;
-    }
-}
diff --git a/extensions/config-yaml/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/config-yaml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index be50cd6e20284..3335e7ff29e83 100644
--- a/extensions/config-yaml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/config-yaml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "YAML Configuration"
 metadata:
   keywords:
@@ -9,3 +8,10 @@ metadata:
   - "core"
   status: "stable"
   guide: "https://quarkus.io/guides/config#yaml"
+  codestart:
+    name: "config-yaml"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/config-yaml/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider b/extensions/config-yaml/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
index e85b2e9dda1c0..67fab24d3e354 100644
--- a/extensions/config-yaml/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
+++ b/extensions/config-yaml/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
@@ -1 +1,2 @@
-io.quarkus.config.yaml.runtime.ApplicationYamlProvider
+io.quarkus.config.yaml.runtime.ApplicationYamlConfigSourceLoader$InFileSystem
+io.quarkus.config.yaml.runtime.ApplicationYamlConfigSourceLoader$InClassPath
diff --git a/extensions/consul-config/deployment/pom.xml b/extensions/consul-config/deployment/pom.xml
index fb678f3990a74..411e420da0eaf 100644
--- a/extensions/consul-config/deployment/pom.xml
+++ b/extensions/consul-config/deployment/pom.xml
@@ -17,6 +17,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/consul-config/pom.xml b/extensions/consul-config/pom.xml
index 3d7259e52405d..88d7557158f4d 100644
--- a/extensions/consul-config/pom.xml
+++ b/extensions/consul-config/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/consul-config/runtime/pom.xml b/extensions/consul-config/runtime/pom.xml
index 03fe8274555e1..06ecea7a8fc14 100644
--- a/extensions/consul-config/runtime/pom.xml
+++ b/extensions/consul-config/runtime/pom.xml
@@ -23,14 +23,16 @@
             <artifactId>quarkus-jackson</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
diff --git a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigGateway.java b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigGateway.java
index 72317f85d4839..593eb79eb8ce4 100644
--- a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigGateway.java
+++ b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigGateway.java
@@ -1,12 +1,13 @@
 package io.quarkus.consul.config.runtime;
 
-import java.io.IOException;
-import java.util.Optional;
+import io.smallrye.mutiny.Uni;
 
 interface ConsulConfigGateway {
 
     /**
      * Retrieves a value from Consul's Key / Value store using the value of {@code key}
      */
-    Optional<Response> getValue(String key) throws IOException;
+    Uni<Response> getValue(String key);
+
+    void close();
 }
diff --git a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProvider.java b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProvider.java
index 4c01b3d67d36d..8bd60a0d15660 100644
--- a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProvider.java
+++ b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProvider.java
@@ -1,17 +1,19 @@
 package io.quarkus.consul.config.runtime;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
+import java.util.concurrent.CompletionException;
+import java.util.function.Consumer;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
 import org.jboss.logging.Logger;
 
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.groups.UniAwait;
+
 class ConsulConfigSourceProvider implements ConfigSourceProvider {
 
     private static final Logger log = Logger.getLogger(ConsulConfigSourceProvider.class);
@@ -22,7 +24,7 @@ class ConsulConfigSourceProvider implements ConfigSourceProvider {
     private final ResponseConfigSourceUtil responseConfigSourceUtil;
 
     public ConsulConfigSourceProvider(ConsulConfig config) {
-        this(config, new DefaultConsulConfigGateway(config), new ResponseConfigSourceUtil());
+        this(config, new VertxConsulConfigGateway(config), new ResponseConfigSourceUtil());
     }
 
     // visible for testing
@@ -47,27 +49,40 @@ public Iterable<ConfigSource> getConfigSources(ClassLoader cl) {
 
         List<ConfigSource> result = new ArrayList<>(keys.size());
 
+        List<Uni<?>> allUnis = new ArrayList<>();
+
         for (Map.Entry<String, ValueType> entry : keys.entrySet()) {
             String fullKey = config.prefix.isPresent() ? config.prefix.get() + "/" + entry.getKey() : entry.getKey();
-            log.debug("Attempting to look up value of key '" + fullKey + "' from Consul.");
-
-            try {
-                Optional<Response> optionalResponse = consulConfigGateway.getValue(fullKey);
-                if (optionalResponse.isPresent()) {
-                    result.add(
-                            responseConfigSourceUtil.toConfigSource(optionalResponse.get(), entry.getValue(), config.prefix));
-                } else {
-                    String message = "Key '" + fullKey + "' not found in Consul.";
-                    if (config.failOnMissingKey) {
-                        throw new RuntimeException(message);
+            allUnis.add(consulConfigGateway.getValue(fullKey).invoke(new Consumer<Response>() {
+                @Override
+                public void accept(Response response) {
+                    if (response != null) {
+                        result.add(
+                                responseConfigSourceUtil.toConfigSource(response, entry.getValue(),
+                                        config.prefix));
                     } else {
-                        log.info(message);
+                        String message = "Key '" + fullKey + "' not found in Consul.";
+                        if (config.failOnMissingKey) {
+                            throw new RuntimeException(message);
+                        } else {
+                            log.info(message);
+                        }
                     }
                 }
-                log.debug("Done reading value of key '" + fullKey + "'");
-            } catch (IOException e) {
-                throw new UncheckedIOException("An error occurred while attempting to fetch configuration from Consul.", e);
+            }));
+        }
+
+        try {
+            UniAwait<Void> await = Uni.combine().all().unis(allUnis).discardItems().await();
+            if (config.agent.connectionTimeout.isZero() && config.agent.readTimeout.isZero()) {
+                await.indefinitely();
+            } else {
+                await.atMost(config.agent.connectionTimeout.plus(config.agent.readTimeout.multipliedBy(2)));
             }
+        } catch (CompletionException e) {
+            throw new RuntimeException("An error occurred while attempting to fetch configuration from Consul.", e);
+        } finally {
+            consulConfigGateway.close();
         }
 
         return result;
diff --git a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java
deleted file mode 100644
index b2482d48ad801..0000000000000
--- a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/DefaultConsulConfigGateway.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package io.quarkus.consul.config.runtime;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustAllStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.EntityUtils;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-class DefaultConsulConfigGateway implements ConsulConfigGateway {
-
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-    private final ConsulConfig consulConfig;
-    private final SSLConnectionSocketFactory sslSocketFactory;
-
-    public DefaultConsulConfigGateway(ConsulConfig consulConfig) {
-        this.consulConfig = consulConfig;
-        if (consulConfig.agent.trustStore.isPresent() || consulConfig.agent.keyStore.isPresent()
-                || consulConfig.agent.trustCerts) {
-            this.sslSocketFactory = createFactoryFromAgentConfig(consulConfig.agent);
-        } else {
-            this.sslSocketFactory = null;
-        }
-
-    }
-
-    private SSLConnectionSocketFactory createFactoryFromAgentConfig(ConsulConfig.AgentConfig agentConfig) {
-        try {
-            SSLContextBuilder sslContextBuilder = SSLContexts.custom();
-            if (agentConfig.trustStore.isPresent()) {
-                sslContextBuilder = sslContextBuilder
-                        .loadTrustMaterial(readStore(agentConfig.trustStore.get(), agentConfig.trustStorePassword), null);
-            } else if (agentConfig.trustCerts) {
-                sslContextBuilder = sslContextBuilder.loadTrustMaterial(TrustAllStrategy.INSTANCE);
-            }
-            if (agentConfig.keyStore.isPresent()) {
-                String keyPassword = agentConfig.keyPassword.orElse(agentConfig.keyStorePassword.orElse(""));
-                sslContextBuilder = sslContextBuilder.loadKeyMaterial(
-                        readStore(agentConfig.keyStore.get(), agentConfig.keyStorePassword), keyPassword.toCharArray());
-            }
-            return new SSLConnectionSocketFactory(sslContextBuilder.build(), NoopHostnameVerifier.INSTANCE);
-        } catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException | IOException | CertificateException
-                | UnrecoverableKeyException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static String findKeystoreFileType(Path keyStorePath) {
-        String pathName = keyStorePath.toString().toLowerCase();
-        if (pathName.endsWith(".p12") || pathName.endsWith(".pkcs12") || pathName.endsWith(".pfx")) {
-            return "PKS12";
-        }
-        return "JKS";
-    }
-
-    private static KeyStore readStore(Path keyStorePath, Optional<String> keyStorePassword)
-            throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
-
-        String keyStoreType = findKeystoreFileType(keyStorePath);
-
-        InputStream classPathResource = Thread.currentThread().getContextClassLoader()
-                .getResourceAsStream(keyStorePath.toString());
-        if (classPathResource != null) {
-            try (InputStream is = classPathResource) {
-                return doReadStore(is, keyStoreType, keyStorePassword);
-            }
-        } else {
-            try (InputStream is = Files.newInputStream(keyStorePath)) {
-                return doReadStore(is, keyStoreType, keyStorePassword);
-            }
-        }
-    }
-
-    private static KeyStore doReadStore(InputStream keyStoreStream, String keyStoreType, Optional<String> keyStorePassword)
-            throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
-        KeyStore keyStore = KeyStore.getInstance(keyStoreType);
-        keyStore.load(keyStoreStream, keyStorePassword.isPresent() ? keyStorePassword.get().toCharArray() : null);
-        return keyStore;
-    }
-
-    @Override
-    public Optional<Response> getValue(String key) throws IOException {
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectionRequestTimeout((int) consulConfig.agent.connectionTimeout.toMillis())
-                .setSocketTimeout((int) consulConfig.agent.readTimeout.toMillis())
-                .build();
-        HttpClientBuilder httpClientBuilder = HttpClients.custom().setDefaultRequestConfig(requestConfig);
-        if (sslSocketFactory != null) {
-            httpClientBuilder.setSSLSocketFactory(sslSocketFactory);
-        }
-        try (CloseableHttpClient client = httpClientBuilder.build()) {
-            String finalUri = (consulConfig.agent.useHttps ? "https" : "http") + "://"
-                    + consulConfig.agent.hostPort.getHostName() + ":" + consulConfig.agent.hostPort.getPort()
-                    + "/v1/kv/"
-                    + key;
-            HttpGet request = new HttpGet(finalUri);
-            request.addHeader("Accept", "application/json");
-            if (consulConfig.agent.token.isPresent()) {
-                request.addHeader("Authorization", "Bearer " + consulConfig.agent.token.get());
-            }
-
-            try (CloseableHttpResponse response = client.execute(request)) {
-                int statusCode = response.getStatusLine().getStatusCode();
-                if (statusCode == HttpStatus.SC_NOT_FOUND) {
-                    return Optional.empty();
-                }
-                if (statusCode != HttpStatus.SC_OK) {
-                    throw new RuntimeException("Got unexpected HTTP response code " + statusCode
-                            + " from " + finalUri);
-                }
-                HttpEntity entity = response.getEntity();
-                if (entity == null) {
-                    throw new RuntimeException("Got empty HTTP response body " + finalUri);
-                }
-
-                List<Response> value = OBJECT_MAPPER.readValue(EntityUtils.toString(entity),
-                        new TypeReference<List<Response>>() {
-                        });
-                if (value.size() != 1) {
-                    throw new IllegalStateException(
-                            "Consul returned an unexpected number of results when looking up value of key '" + key + "'");
-                }
-                return Optional.of(value.get(0));
-            }
-        }
-    }
-}
diff --git a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/Response.java b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/Response.java
index c12df522f990b..c5e39bef2b4ce 100644
--- a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/Response.java
+++ b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/Response.java
@@ -3,9 +3,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * Represent (part of) the JSON response from Consul
  *
@@ -16,8 +13,7 @@ public class Response {
     private final String key;
     private final String value;
 
-    @JsonCreator
-    public Response(@JsonProperty("Key") String key, @JsonProperty("Value") String value) {
+    public Response(String key, String value) {
         this.key = key;
         this.value = value;
     }
diff --git a/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/VertxConsulConfigGateway.java b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/VertxConsulConfigGateway.java
new file mode 100644
index 0000000000000..1548e997d0e32
--- /dev/null
+++ b/extensions/consul-config/runtime/src/main/java/io/quarkus/consul/config/runtime/VertxConsulConfigGateway.java
@@ -0,0 +1,167 @@
+package io.quarkus.consul.config.runtime;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.jboss.logging.Logger;
+
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.JksOptions;
+import io.vertx.core.net.KeyStoreOptionsBase;
+import io.vertx.core.net.PfxOptions;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.core.buffer.Buffer;
+import io.vertx.mutiny.ext.web.client.HttpRequest;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+public class VertxConsulConfigGateway implements ConsulConfigGateway {
+
+    private static final Logger log = Logger.getLogger(VertxConsulConfigGateway.class);
+
+    private static final String PKS_12 = "PKS12";
+    private static final String JKS = "JKS";
+
+    private final ConsulConfig consulConfig;
+    private final Vertx vertx;
+    private final WebClient webClient;
+
+    public VertxConsulConfigGateway(ConsulConfig consulConfig) {
+        this.consulConfig = consulConfig;
+        this.vertx = Vertx.vertx();
+        this.webClient = createHttpClient(vertx, consulConfig.agent);
+    }
+
+    public static WebClient createHttpClient(Vertx vertx, ConsulConfig.AgentConfig agentConfig) {
+
+        WebClientOptions webClientOptions = new WebClientOptions()
+                .setConnectTimeout((int) agentConfig.connectionTimeout.toMillis())
+                .setIdleTimeout((int) agentConfig.readTimeout.getSeconds());
+
+        boolean trustAll = agentConfig.trustCerts;
+        try {
+            if (agentConfig.trustStore.isPresent()) {
+                Path trustStorePath = agentConfig.trustStore.get();
+                String type = determineStoreType(trustStorePath);
+                KeyStoreOptionsBase storeOptions = storeOptions(trustStorePath, agentConfig.trustStorePassword,
+                        createStoreOptions(type));
+                if (isPfx(type)) {
+                    webClientOptions.setPfxTrustOptions((PfxOptions) storeOptions);
+                } else {
+                    webClientOptions.setTrustStoreOptions((JksOptions) storeOptions);
+                }
+            } else if (trustAll) {
+                skipVerify(webClientOptions);
+            } else if (agentConfig.keyStore.isPresent()) {
+                Path trustStorePath = agentConfig.keyStore.get();
+                String type = determineStoreType(trustStorePath);
+                KeyStoreOptionsBase storeOptions = storeOptions(trustStorePath, agentConfig.keyStorePassword,
+                        createStoreOptions(type));
+                if (isPfx(type)) {
+                    webClientOptions.setPfxTrustOptions((PfxOptions) storeOptions);
+                } else {
+                    webClientOptions.setTrustStoreOptions((JksOptions) storeOptions);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return WebClient.create(vertx, webClientOptions);
+    }
+
+    private static void skipVerify(WebClientOptions options) {
+        options.setTrustAll(true);
+        options.setVerifyHost(false);
+    }
+
+    private static KeyStoreOptionsBase createStoreOptions(String type) {
+        if (isPfx(type)) {
+            return new PfxOptions();
+        }
+        return new JksOptions();
+    }
+
+    private static boolean isPfx(String type) {
+        return PKS_12.equals(type);
+    }
+
+    private static <T extends KeyStoreOptionsBase> KeyStoreOptionsBase storeOptions(Path storePath,
+            Optional<String> storePassword, T store) throws Exception {
+        return store
+                .setPassword(storePassword.orElse(""))
+                .setValue(io.vertx.core.buffer.Buffer.buffer(storeBytes(storePath)));
+    }
+
+    private static String determineStoreType(Path keyStorePath) {
+        String pathName = keyStorePath.toString().toLowerCase();
+        if (pathName.endsWith(".p12") || pathName.endsWith(".pkcs12") || pathName.endsWith(".pfx")) {
+            return PKS_12;
+        }
+        return JKS;
+    }
+
+    private static byte[] storeBytes(Path keyStorePath)
+            throws Exception {
+        InputStream classPathResource = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream(keyStorePath.toString());
+        if (classPathResource != null) {
+            try (InputStream is = classPathResource) {
+                return allBytes(is);
+            }
+        } else {
+            try (InputStream is = Files.newInputStream(keyStorePath)) {
+                return allBytes(is);
+            }
+        }
+    }
+
+    private static byte[] allBytes(InputStream inputStream) throws Exception {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        int nRead;
+        byte[] data = new byte[1024];
+        while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
+            buffer.write(data, 0, nRead);
+        }
+        buffer.flush();
+        return buffer.toByteArray();
+    }
+
+    @Override
+    public Uni<Response> getValue(String key) {
+        HttpRequest<Buffer> request = webClient
+                .get(consulConfig.agent.hostPort.getPort(), consulConfig.agent.hostPort.getHostString(), "/v1/kv/" + key)
+                .ssl(consulConfig.agent.useHttps)
+                .putHeader("Accept", "application/json;charset=UTF-8");
+        if (consulConfig.agent.token.isPresent()) {
+            request.putHeader("Authorization", "Bearer " + consulConfig.agent.token.get());
+        }
+
+        log.debug("Attempting to look up value of key '" + key + "' from Consul.");
+        return request.send().map(r -> {
+            if (r.statusCode() != 200) {
+                log.debug("Look up of key '" + key + "' from Consul yielded a non success HTTP error-code: " + r.statusCode());
+                return null;
+            } else {
+                JsonArray jsonArray = r.bodyAsJsonArray();
+                if (jsonArray.size() != 1) {
+                    throw new IllegalStateException(
+                            "Consul returned an unexpected number of results when looking up value of key '" + key + "'");
+                }
+                JsonObject jsonObject = jsonArray.getJsonObject(0);
+                return new Response(jsonObject.getString("Key"), jsonObject.getString("Value"));
+            }
+        });
+    }
+
+    @Override
+    public void close() {
+        this.webClient.close();
+        this.vertx.closeAndAwait();
+    }
+}
diff --git a/extensions/consul-config/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/consul-config/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 3bad0aac55319..f3d83e1724b11 100644
--- a/extensions/consul-config/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/consul-config/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -7,5 +7,5 @@ metadata:
   - "configuration"
   - "consul"
   categories:
-  - "configuration"
+  - "core"
   status: "preview"
diff --git a/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProviderTest.java b/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProviderTest.java
index 979cf3af256aa..fff9a6aea4906 100644
--- a/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProviderTest.java
+++ b/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ConsulConfigSourceProviderTest.java
@@ -1,6 +1,7 @@
 package io.quarkus.consul.config.runtime;
 
-import static io.quarkus.consul.config.runtime.ResponseUtil.createOptionalResponse;
+import static io.quarkus.consul.config.runtime.ResponseUtil.emptyResponse;
+import static io.quarkus.consul.config.runtime.ResponseUtil.validResponse;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.entry;
@@ -12,6 +13,7 @@
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -45,9 +47,9 @@ void testWithMissingKeysAndFailureConfigured() throws IOException {
 
         ConsulConfigGateway mockGateway = mock(ConsulConfigGateway.class);
         // make sure the first is is properly resolved
-        when(mockGateway.getValue("some/first")).thenReturn(createOptionalResponse("some/first", "whatever"));
+        when(mockGateway.getValue("some/first")).thenReturn(validResponse("some/first", "whatever"));
         // make sure the second is not resolved
-        when(mockGateway.getValue("some/second")).thenReturn(Optional.empty());
+        when(mockGateway.getValue("some/second")).thenReturn(emptyResponse());
 
         ConsulConfigSourceProvider sut = new ConsulConfigSourceProvider(config, mockGateway);
 
@@ -68,21 +70,21 @@ void testWithMissingKeysAndIgnoreFailureConfigured() throws IOException {
 
         ConsulConfigGateway mockGateway = mock(ConsulConfigGateway.class);
         // make sure the first is is properly resolved
-        when(mockGateway.getValue("some/first")).thenReturn(createOptionalResponse("some/first", "whatever"));
+        when(mockGateway.getValue("some/first")).thenReturn(validResponse("some/first", "whatever"));
         // make sure the second is not resolved
-        when(mockGateway.getValue("some/second")).thenReturn(Optional.empty());
+        when(mockGateway.getValue("some/second")).thenReturn(emptyResponse());
         // make sure the third is is properly resolved
-        when(mockGateway.getValue("some/third")).thenReturn(createOptionalResponse("some/third", "other"));
+        when(mockGateway.getValue("some/third")).thenReturn(validResponse("some/third", "other"));
 
         ConsulConfigSourceProvider sut = new ConsulConfigSourceProvider(config, mockGateway);
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("some.first", "whatever"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("third")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("third")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("some.third", "other"));
         });
@@ -100,19 +102,19 @@ void testRawKeysWithoutPrefix() throws IOException {
 
         ConsulConfigGateway mockGateway = mock(ConsulConfigGateway.class);
         when(mockGateway.getValue("greeting/message"))
-                .thenReturn(createOptionalResponse("greeting/message", "hello"));
+                .thenReturn(validResponse("greeting/message", "hello"));
         when(mockGateway.getValue("greeting/name"))
-                .thenReturn(createOptionalResponse("greeting/name", "quarkus"));
+                .thenReturn(validResponse("greeting/name", "quarkus"));
 
         ConsulConfigSourceProvider sut = new ConsulConfigSourceProvider(config, mockGateway);
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hello"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.name", "quarkus"));
         });
@@ -129,19 +131,19 @@ void testRawKeysWithPrefix() throws IOException {
 
         ConsulConfigGateway mockGateway = mock(ConsulConfigGateway.class);
         when(mockGateway.getValue("whatever/greeting/message"))
-                .thenReturn(createOptionalResponse("whatever/greeting/message", "hello"));
+                .thenReturn(validResponse("whatever/greeting/message", "hello"));
         when(mockGateway.getValue("whatever/greeting/name"))
-                .thenReturn(createOptionalResponse("whatever/greeting/name", "quarkus"));
+                .thenReturn(validResponse("whatever/greeting/name", "quarkus"));
 
         ConsulConfigSourceProvider sut = new ConsulConfigSourceProvider(config, mockGateway);
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("message")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hello"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("name")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.name", "quarkus"));
         });
@@ -157,20 +159,20 @@ void testPropertiesKeysWithoutPrefix() throws IOException {
 
         ConsulConfigGateway mockGateway = mock(ConsulConfigGateway.class);
         when(mockGateway.getValue("first"))
-                .thenReturn(createOptionalResponse("first", "greeting.message=hi\ngreeting.name=quarkus"));
+                .thenReturn(validResponse("first", "greeting.message=hi\ngreeting.name=quarkus"));
         when(mockGateway.getValue("second"))
-                .thenReturn(createOptionalResponse("second", "other.key=value"));
+                .thenReturn(validResponse("second", "other.key=value"));
 
         ConsulConfigSourceProvider sut = new ConsulConfigSourceProvider(config, mockGateway);
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hi"),
                     entry("greeting.name", "quarkus"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("other.key", "value"));
         });
@@ -187,20 +189,20 @@ void testPropertiesKeysWithPrefix() throws IOException {
 
         ConsulConfigGateway mockGateway = mock(ConsulConfigGateway.class);
         when(mockGateway.getValue("config/first"))
-                .thenReturn(createOptionalResponse("config/first", "greeting.message=hi\ngreeting.name=quarkus"));
+                .thenReturn(validResponse("config/first", "greeting.message=hi\ngreeting.name=quarkus"));
         when(mockGateway.getValue("config/second"))
-                .thenReturn(createOptionalResponse("config/second", "other.key=value"));
+                .thenReturn(validResponse("config/second", "other.key=value"));
 
         ConsulConfigSourceProvider sut = new ConsulConfigSourceProvider(config, mockGateway);
 
         Iterable<ConfigSource> configSources = sut.getConfigSources(null);
         assertThat(configSources).hasSize(2);
-        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("first")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("greeting.message", "hi"),
                     entry("greeting.name", "quarkus"));
         });
-        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).filteredOn(c -> c.getName().contains("second")).singleElement().satisfies(c -> {
             assertThat(c.getOrdinal()).isEqualTo(EXPECTED_ORDINAL);
             assertThat(c.getProperties()).containsOnly(entry("other.key", "value"));
         });
@@ -217,6 +219,8 @@ private ConsulConfig defaultConfig() {
         config.propertiesValueKeys = Optional.empty();
         config.prefix = Optional.empty();
         config.agent = new ConsulConfig.AgentConfig();
+        config.agent.readTimeout = Duration.ofSeconds(10);
+        config.agent.connectionTimeout = Duration.ofSeconds(10);
         return config;
     }
 
diff --git a/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ResponseUtil.java b/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ResponseUtil.java
index 415b2b95fc2dd..08900bde568de 100644
--- a/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ResponseUtil.java
+++ b/extensions/consul-config/runtime/src/test/java/io/quarkus/consul/config/runtime/ResponseUtil.java
@@ -1,18 +1,19 @@
 package io.quarkus.consul.config.runtime;
 
 import java.util.Base64;
-import java.util.Optional;
+
+import io.smallrye.mutiny.Uni;
 
 final class ResponseUtil {
 
     private ResponseUtil() {
     }
 
-    static Response createResponse(String key, String rawValue) {
-        return new Response(key, Base64.getEncoder().encodeToString(rawValue.getBytes()));
+    static Uni<Response> validResponse(String key, String rawValue) {
+        return Uni.createFrom().item(new Response(key, Base64.getEncoder().encodeToString(rawValue.getBytes())));
     }
 
-    static Optional<Response> createOptionalResponse(String key, String rawValue) {
-        return Optional.of(createResponse(key, rawValue));
+    static Uni<Response> emptyResponse() {
+        return Uni.createFrom().nullItem();
     }
 }
diff --git a/extensions/container-image/container-image-docker/deployment/pom.xml b/extensions/container-image/container-image-docker/deployment/pom.xml
index ba0177762c944..32e5e5f7394c5 100644
--- a/extensions/container-image/container-image-docker/deployment/pom.xml
+++ b/extensions/container-image/container-image-docker/deployment/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>quarkus-container-image-docker-deployment</artifactId>
-    <name>Quarkus - Container - Image - Docker - Deployment</name>
+    <name>Quarkus - Container Image - Docker - Deployment</name>
 
     <dependencies>
         <dependency>
diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java
index df2b94c3378ca..7b7032c7f21ad 100644
--- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java
+++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerBuild.java
@@ -15,6 +15,6 @@ public class DockerBuild implements BooleanSupplier {
 
     @Override
     public boolean getAsBoolean() {
-        return containerImageConfig.builder.map(b -> b.equals(DockerProcessor.DOCKER)).orElse(true);
+        return containerImageConfig.builder.map(b -> b.equals(DockerProcessor.DOCKER_CONTAINER_IMAGE_NAME)).orElse(true);
     }
 }
diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java
index 7a7bedbce1200..eae7920acc860 100644
--- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java
+++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerConfig.java
@@ -40,4 +40,10 @@ public class DockerConfig {
      */
     @ConfigItem
     public Optional<List<String>> cacheFrom;
+
+    /**
+     * Name of binary used to execute the docker commands.
+     */
+    @ConfigItem(defaultValue = "docker")
+    public String executableName;
 }
diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
index 54277ac78d738..00773933ba4b9 100644
--- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
+++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java
@@ -24,15 +24,17 @@
 
 import io.quarkus.container.image.deployment.ContainerImageConfig;
 import io.quarkus.container.image.deployment.util.NativeBinaryUtil;
+import io.quarkus.container.spi.AvailableContainerImageExtensionBuildItem;
 import io.quarkus.container.spi.ContainerImageBuildRequestBuildItem;
 import io.quarkus.container.spi.ContainerImageInfoBuildItem;
 import io.quarkus.container.spi.ContainerImagePushRequestBuildItem;
 import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsNormalNotRemoteDev;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.AppCDSResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
@@ -43,29 +45,36 @@
 public class DockerProcessor {
 
     private static final Logger log = Logger.getLogger(DockerProcessor.class);
+    private static final String DOCKER = "docker";
     private static final String DOCKERFILE_JVM = "Dockerfile.jvm";
-    private static final String DOCKERFILE_FAST_JAR = "Dockerfile.fast-jar";
+    private static final String DOCKERFILE_LEGACY_JAR = "Dockerfile.legacy-jar";
     private static final String DOCKERFILE_NATIVE = "Dockerfile.native";
-    public static final String DOCKER_BINARY_NAME = "docker";
-    public static final String DOCKER = "docker";
+    private static final String DOCKER_DIRECTORY_NAME = "docker";
+    static final String DOCKER_CONTAINER_IMAGE_NAME = "docker";
 
     private final DockerWorking dockerWorking = new DockerWorking();
 
+    @BuildStep
+    public AvailableContainerImageExtensionBuildItem availability() {
+        return new AvailableContainerImageExtensionBuildItem(DOCKER);
+    }
+
     @BuildStep(onlyIf = DockerBuild.class)
     public CapabilityBuildItem capability() {
         return new CapabilityBuildItem(Capability.CONTAINER_IMAGE_DOCKER);
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, DockerBuild.class }, onlyIfNot = NativeBuild.class)
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, DockerBuild.class }, onlyIfNot = NativeBuild.class)
     public void dockerBuildFromJar(DockerConfig dockerConfig,
-            ContainerImageConfig containerImageConfig, // TODO: use to check whether we need to also push to registry
+            ContainerImageConfig containerImageConfig,
             OutputTargetBuildItem out,
-            ContainerImageInfoBuildItem containerImage,
+            ContainerImageInfoBuildItem containerImageInfo,
             Optional<ContainerImageBuildRequestBuildItem> buildRequest,
             Optional<ContainerImagePushRequestBuildItem> pushRequest,
+            @SuppressWarnings("unused") Optional<AppCDSResultBuildItem> appCDSResult, // ensure docker build will be performed after AppCDS creation
             BuildProducer<ArtifactResultBuildItem> artifactResultProducer,
             PackageConfig packageConfig,
-            // used to ensure that the jar has been built
+            @SuppressWarnings("unused") // used to ensure that the jar has been built
             JarBuildItem jar) {
 
         if (!containerImageConfig.build && !containerImageConfig.push && !buildRequest.isPresent()
@@ -79,17 +88,16 @@ public void dockerBuildFromJar(DockerConfig dockerConfig,
 
         log.info("Building docker image for jar.");
 
-        String image = containerImage.getImage();
-        List<String> additionalImageTags = containerImage.getAdditionalImageTags();
-
         ImageIdReader reader = new ImageIdReader();
-        createContainerImage(containerImageConfig, dockerConfig, image, additionalImageTags, out, reader, false,
+        String builtContainerImage = createContainerImage(containerImageConfig, dockerConfig, containerImageInfo, out, reader,
+                false,
                 pushRequest.isPresent(), packageConfig);
 
-        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap()));
+        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container",
+                Collections.singletonMap("container-image", builtContainerImage)));
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, NativeBuild.class, DockerBuild.class })
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, NativeBuild.class, DockerBuild.class })
     public void dockerBuildFromNativeImage(DockerConfig dockerConfig,
             ContainerImageConfig containerImageConfig,
             ContainerImageInfoBuildItem containerImage,
@@ -117,57 +125,59 @@ public void dockerBuildFromNativeImage(DockerConfig dockerConfig,
 
         log.info("Starting docker image build");
 
-        String image = containerImage.getImage();
-        List<String> additionalImageTags = containerImage.getAdditionalImageTags();
-
         ImageIdReader reader = new ImageIdReader();
-        createContainerImage(containerImageConfig, dockerConfig, image, additionalImageTags, out, reader, true,
+        String builtContainerImage = createContainerImage(containerImageConfig, dockerConfig, containerImage, out, reader, true,
                 pushRequest.isPresent(), packageConfig);
-        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container", Collections.emptyMap()));
+        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container",
+                Collections.singletonMap("container-image", builtContainerImage)));
     }
 
-    private void createContainerImage(ContainerImageConfig containerImageConfig, DockerConfig dockerConfig, String image,
-            List<String> additionalImageTags,
+    private String createContainerImage(ContainerImageConfig containerImageConfig, DockerConfig dockerConfig,
+            ContainerImageInfoBuildItem containerImageInfo,
             OutputTargetBuildItem out, ImageIdReader reader, boolean forNative, boolean pushRequested,
             PackageConfig packageConfig) {
 
         DockerfilePaths dockerfilePaths = getDockerfilePaths(dockerConfig, forNative, packageConfig, out);
-        String[] dockerArgs = getDockerArgs(image, dockerfilePaths, dockerConfig);
-        log.infof("Executing the following command to build docker image: '%s %s'", DOCKER_BINARY_NAME,
+        String[] dockerArgs = getDockerArgs(containerImageInfo.getImage(), dockerfilePaths, dockerConfig);
+        log.infof("Executing the following command to build docker image: '%s %s'", dockerConfig.executableName,
                 String.join(" ", dockerArgs));
-        boolean buildSuccessful = ExecUtil.exec(out.getOutputDirectory().toFile(), reader, DOCKER_BINARY_NAME, dockerArgs);
+        boolean buildSuccessful = ExecUtil.exec(out.getOutputDirectory().toFile(), reader, dockerConfig.executableName,
+                dockerArgs);
         if (!buildSuccessful) {
             throw dockerException(dockerArgs);
         }
 
-        log.infof("Built container image %s (%s)\n", image, reader.getImageId());
+        log.infof("Built container image %s (%s)\n", containerImageInfo.getImage(), reader.getImageId());
 
-        if (!additionalImageTags.isEmpty()) {
-            createAdditionalTags(image, additionalImageTags);
+        if (!containerImageInfo.getAdditionalImageTags().isEmpty()) {
+            createAdditionalTags(containerImageInfo.getImage(), containerImageInfo.getAdditionalImageTags(), dockerConfig);
         }
 
         if (pushRequested || containerImageConfig.push) {
             String registry = "docker.io";
-            if (!containerImageConfig.registry.isPresent()) {
+            if (!containerImageInfo.getRegistry().isPresent()) {
                 log.info("No container image registry was set, so 'docker.io' will be used");
             } else {
-                registry = containerImageConfig.registry.get();
+                registry = containerImageInfo.getRegistry().get();
             }
             // Check if we need to login first
             if (containerImageConfig.username.isPresent() && containerImageConfig.password.isPresent()) {
-                boolean loginSuccessful = ExecUtil.exec("docker", "login", registry, "-u", containerImageConfig.username.get(),
+                boolean loginSuccessful = ExecUtil.exec(dockerConfig.executableName, "login", registry, "-u",
+                        containerImageConfig.username.get(),
                         "-p" + containerImageConfig.password.get());
                 if (!loginSuccessful) {
                     throw dockerException(new String[] { "-u", containerImageConfig.username.get(), "-p", "********" });
                 }
             }
 
-            List<String> imagesToPush = new ArrayList<>(additionalImageTags);
-            imagesToPush.add(image);
+            List<String> imagesToPush = new ArrayList<>(containerImageInfo.getAdditionalImageTags());
+            imagesToPush.add(containerImageInfo.getImage());
             for (String imageToPush : imagesToPush) {
-                pushImage(imageToPush);
+                pushImage(imageToPush, dockerConfig);
             }
         }
+
+        return containerImageInfo.getImage();
     }
 
     private String[] getDockerArgs(String image, DockerfilePaths dockerfilePaths, DockerConfig dockerConfig) {
@@ -188,19 +198,19 @@ private String[] getDockerArgs(String image, DockerfilePaths dockerfilePaths, Do
         return dockerArgs.toArray(new String[0]);
     }
 
-    private void createAdditionalTags(String image, List<String> additionalImageTags) {
+    private void createAdditionalTags(String image, List<String> additionalImageTags, DockerConfig dockerConfig) {
         for (String additionalTag : additionalImageTags) {
             String[] tagArgs = { "tag", image, additionalTag };
-            boolean tagSuccessful = ExecUtil.exec("docker", tagArgs);
+            boolean tagSuccessful = ExecUtil.exec(dockerConfig.executableName, tagArgs);
             if (!tagSuccessful) {
                 throw dockerException(tagArgs);
             }
         }
     }
 
-    private void pushImage(String image) {
+    private void pushImage(String image, DockerConfig dockerConfig) {
         String[] pushArgs = { "push", image };
-        boolean pushSuccessful = ExecUtil.exec("docker", pushArgs);
+        boolean pushSuccessful = ExecUtil.exec(dockerConfig.executableName, pushArgs);
         if (!pushSuccessful) {
             throw dockerException(pushArgs);
         }
@@ -225,9 +235,8 @@ private DockerfilePaths getDockerfilePaths(DockerConfig dockerConfig, boolean fo
         } else {
             if (dockerConfig.dockerfileJvmPath.isPresent()) {
                 return ProvidedDockerfile.get(Paths.get(dockerConfig.dockerfileJvmPath.get()), outputDirectory);
-            } else if (packageConfig.type.equals(PackageConfig.FAST_JAR)
-                    || packageConfig.type.equalsIgnoreCase(PackageConfig.MUTABLE_JAR)) {
-                return DockerfileDetectionResult.detect(DOCKERFILE_FAST_JAR, outputDirectory);
+            } else if (packageConfig.type.equals(PackageConfig.LEGACY_JAR)) {
+                return DockerfileDetectionResult.detect(DOCKERFILE_LEGACY_JAR, outputDirectory);
             } else {
                 return DockerfileDetectionResult.detect(DOCKERFILE_JVM, outputDirectory);
             }
@@ -312,7 +321,7 @@ private static Map.Entry<Path, Path> findDockerfileRoot(Path outputDirectory) {
             if (mainSourcesRoot == null) {
                 return null;
             }
-            Path dockerfilesRoot = mainSourcesRoot.getKey().resolve("docker");
+            Path dockerfilesRoot = mainSourcesRoot.getKey().resolve(DOCKER_DIRECTORY_NAME);
             if (!dockerfilesRoot.toFile().exists()) {
                 return null;
             }
@@ -337,7 +346,7 @@ public static ProvidedDockerfile get(Path dockerfilePath, Path outputDirectory)
             }
             Path effectiveDockerfilePath = dockerfilePath.isAbsolute() ? dockerfilePath
                     : mainSourcesRoot.getValue().resolve(dockerfilePath);
-            if (!dockerfilePath.toFile().exists()) {
+            if (!effectiveDockerfilePath.toFile().exists()) {
                 throw new IllegalArgumentException(
                         "Specified Dockerfile path " + effectiveDockerfilePath.toAbsolutePath().toString() + " does not exist");
             }
diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerWorking.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerWorking.java
index 395f121de8829..a396ae16e191e 100644
--- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerWorking.java
+++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerWorking.java
@@ -25,7 +25,7 @@ public boolean getAsBoolean() {
                 return false;
             }
         } catch (Exception e) {
-            LOGGER.warn("No Docker binary found");
+            LOGGER.warnf("No Docker binary found or general error: %s", e);
             return false;
         }
 
diff --git a/extensions/container-image/container-image-docker/pom.xml b/extensions/container-image/container-image-docker/pom.xml
index afe09d8500ce7..9e778d91943f8 100644
--- a/extensions/container-image/container-image-docker/pom.xml
+++ b/extensions/container-image/container-image-docker/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-docker-parent</artifactId>
-    <name>Quarkus - Container - Image - Docker - Parent</name>
+    <name>Quarkus - Container Image - Docker - Parent</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>
diff --git a/extensions/container-image/container-image-docker/runtime/pom.xml b/extensions/container-image/container-image-docker/runtime/pom.xml
index 20fb4dedcc4d6..53c73e0d5ef5e 100644
--- a/extensions/container-image/container-image-docker/runtime/pom.xml
+++ b/extensions/container-image/container-image-docker/runtime/pom.xml
@@ -11,9 +11,15 @@
     </parent>
 
     <artifactId>quarkus-container-image-docker</artifactId>
-    <name>Quarkus - Container - Image - Docker</name>
+    <name>Quarkus - Container Image - Docker</name>
     <description>Build container images of your application using Docker</description>
 
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
diff --git a/extensions/container-image/container-image-jib/deployment/pom.xml b/extensions/container-image/container-image-jib/deployment/pom.xml
index 866a74c77eb54..d595ade0ff69a 100644
--- a/extensions/container-image/container-image-jib/deployment/pom.xml
+++ b/extensions/container-image/container-image-jib/deployment/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>quarkus-container-image-jib-deployment</artifactId>
-    <name>Quarkus - Container - Image - Jib - Deployment</name>
+    <name>Quarkus - Container Image - Jib - Deployment</name>
 
     <dependencies>
         <dependency>
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerBuilderHelper.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerBuilderHelper.java
index 2769f1abc90c1..58cf61c7a4eaa 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerBuilderHelper.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerBuilderHelper.java
@@ -5,7 +5,7 @@
  * 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
+ *      https://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
@@ -84,8 +84,8 @@ public static FileEntriesLayer extraDirectoryLayerConfiguration(
 
                                 // Add with default permissions
                                 if (localPath.toFile().canExecute()) {
-                                    // make sure we can execute the file in the container
-                                    builder.addEntry(localPath, pathOnContainer, FilePermissions.fromOctalString("754"),
+                                    // make sure the file or directory can be executed
+                                    builder.addEntry(localPath, pathOnContainer, FilePermissions.fromOctalString("755"),
                                             modificationTime);
                                 } else {
                                     builder.addEntry(localPath, pathOnContainer, modificationTime);
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
index 11f280b2e4f4a..79a794daa304c 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
@@ -26,14 +27,14 @@ public class JibConfig {
     /**
      * Additional JVM arguments to pass to the JVM when starting the application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0,-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
+    @ConfigItem(defaultValue = "-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
     public List<String> jvmArguments;
 
     /**
      * Additional arguments to pass when starting the native application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0")
-    public List<String> nativeArguments;
+    @ConfigItem
+    public Optional<List<String>> nativeArguments;
 
     /**
      * If this is set, then it will be used as the entry point of the container image.
@@ -41,9 +42,10 @@ public class JibConfig {
      * <ul>
      * <li>A valid entrypoint is jar package specific (see {@code quarkus.package.type})</li>
      * <li>A valid entrypoint depends on the location of both the launching scripts and the application jar file. To that
-     * end it's helpful to remember that when {@code fast-jar} packaging is used, all necessary application jars are added to
-     * the {@code /work} directory and that the same
-     * directory is also used as the working directory. When {@code legacy} or {@code uber-jar} are used, the application jars
+     * end it's helpful to remember that when {@code fast-jar} packaging is used (the default), all necessary application
+     * jars are added to the {@code /work} directory and that the same
+     * directory is also used as the working directory. When {@code legacy-jar} or {@code uber-jar} are used, the application
+     * jars
      * are unpacked under the {@code /app} directory
      * and that directory is used as the working directory.</li>
      * <li>Even if the {@code jvmArguments} field is set, it is ignored completely</li>
@@ -98,4 +100,43 @@ public class JibConfig {
      */
     @ConfigItem
     public Optional<String> baseRegistryPassword;
+
+    /**
+     * The ports to expose
+     */
+    @ConfigItem(defaultValue = "${quarkus.http.port:8080}")
+    public List<Integer> ports;
+
+    /**
+     * The user to use in generated image
+     */
+    @ConfigItem
+    public Optional<String> user;
+
+    /**
+     * Controls the optimization which skips downloading base image layers that exist in a target
+     * registry. If the user does not set this property, then read as false.
+     *
+     * If {@code true}, base image layers are always pulled and cached. If
+     * {@code false}, base image layers will not be pulled/cached if they already exist on the
+     * target registry.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean alwaysCacheBaseImage;
+
+    /**
+     * List of target platforms. Each platform is defined using the pattern: \<os\>|\<arch\>[/variant]|\<os\>/\<arch\>[/variant]
+     * ex: linux/amd64,linux/arm64/v8. If not specified, OS default is linux and architecture default is amd64
+     * 
+     * If more than one platform is configured, it is important to note that the base image has to be a Docker manifest or an
+     * OCI image index containing a version of each chosen platform
+     * 
+     * It doesn't work with native images, as cross-compilation is not supported
+     * 
+     * Target Platform is a incubating feature of Jib. See <a href=
+     * "https://github.com/GoogleContainerTools/jib/blob/master/docs/faq.md#how-do-i-specify-a-platform-in-the-manifest-list-or-oci-index-of-a-base-image">Jib
+     * FAQ</a> for more information
+     */
+    @ConfigItem
+    public Optional<Set<String>> platforms;
 }
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
index 344ec2b8fd77b..cc988c5515807 100644
--- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
@@ -4,18 +4,23 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.jboss.logging.Logger;
 
@@ -32,25 +37,32 @@
 import com.google.cloud.tools.jib.api.buildplan.AbsoluteUnixPath;
 import com.google.cloud.tools.jib.api.buildplan.FileEntriesLayer;
 import com.google.cloud.tools.jib.api.buildplan.FilePermissions;
+import com.google.cloud.tools.jib.api.buildplan.Port;
 import com.google.cloud.tools.jib.frontend.CredentialRetrieverFactory;
 
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
 import io.quarkus.bootstrap.util.ZipUtils;
+import io.quarkus.builder.Version;
 import io.quarkus.container.image.deployment.ContainerImageConfig;
 import io.quarkus.container.image.deployment.util.NativeBinaryUtil;
+import io.quarkus.container.spi.AvailableContainerImageExtensionBuildItem;
 import io.quarkus.container.spi.ContainerImageBuildRequestBuildItem;
 import io.quarkus.container.spi.ContainerImageInfoBuildItem;
 import io.quarkus.container.spi.ContainerImageLabelBuildItem;
 import io.quarkus.container.spi.ContainerImagePushRequestBuildItem;
 import io.quarkus.container.util.PathsUtil;
 import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsNormalNotRemoteDev;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.MainClassBuildItem;
 import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.AppCDSContainerImageBuildItem;
+import io.quarkus.deployment.pkg.builditem.AppCDSResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
@@ -65,21 +77,42 @@ public class JibProcessor {
     private static final IsClassPredicate IS_CLASS_PREDICATE = new IsClassPredicate();
     private static final String BINARY_NAME_IN_CONTAINER = "application";
 
+    @BuildStep
+    public AvailableContainerImageExtensionBuildItem availability() {
+        return new AvailableContainerImageExtensionBuildItem(JIB);
+    }
+
     @BuildStep(onlyIf = JibBuild.class)
     public CapabilityBuildItem capability() {
         return new CapabilityBuildItem(Capability.CONTAINER_IMAGE_JIB);
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, JibBuild.class }, onlyIfNot = NativeBuild.class)
+    // when AppCDS are enabled and a container image build via Jib has been requested,
+    // we want the AppCDS generation process to use the same JVM as the base image
+    // in order to make the AppCDS usable by the runtime JVM
+    @BuildStep(onlyIf = JibBuild.class)
+    public void appCDS(ContainerImageConfig containerImageConfig, JibConfig jibConfig,
+            BuildProducer<AppCDSContainerImageBuildItem> producer) {
+
+        if (!containerImageConfig.build && !containerImageConfig.push) {
+            return;
+        }
+
+        producer.produce(new AppCDSContainerImageBuildItem(jibConfig.baseJvmImage));
+    }
+
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, JibBuild.class }, onlyIfNot = NativeBuild.class)
     public void buildFromJar(ContainerImageConfig containerImageConfig, JibConfig jibConfig,
             PackageConfig packageConfig,
             ContainerImageInfoBuildItem containerImage,
             JarBuildItem sourceJar,
             MainClassBuildItem mainClass,
-            OutputTargetBuildItem outputTarget, ApplicationInfoBuildItem applicationInfo,
+            OutputTargetBuildItem outputTarget,
+            CurateOutcomeBuildItem curateOutcome,
             Optional<ContainerImageBuildRequestBuildItem> buildRequest,
             Optional<ContainerImagePushRequestBuildItem> pushRequest,
             List<ContainerImageLabelBuildItem> containerImageLabels,
+            Optional<AppCDSResultBuildItem> appCDSResult,
             BuildProducer<ArtifactResultBuildItem> artifactResultProducer) {
 
         if (!containerImageConfig.build && !containerImageConfig.push && !buildRequest.isPresent()
@@ -93,23 +126,26 @@ public void buildFromJar(ContainerImageConfig containerImageConfig, JibConfig ji
             jibContainerBuilder = createContainerBuilderFromLegacyJar(jibConfig,
                     sourceJar, outputTarget, mainClass, containerImageLabels);
         } else if (packageConfig.isFastJar()) {
-            jibContainerBuilder = createContainerBuilderFromFastJar(jibConfig, sourceJar, containerImageLabels);
+            jibContainerBuilder = createContainerBuilderFromFastJar(jibConfig, sourceJar, curateOutcome, containerImageLabels,
+                    appCDSResult);
         } else {
             throw new IllegalArgumentException(
                     "Package type '" + packageType + "' is not supported by the container-image-jib extension");
         }
+        setUser(jibConfig, jibContainerBuilder);
+        setPlatforms(jibConfig, jibContainerBuilder);
         handleExtraFiles(outputTarget, jibContainerBuilder);
-        containerize(applicationInfo, containerImageConfig, containerImage, jibContainerBuilder,
+        JibContainer container = containerize(containerImageConfig, jibConfig, containerImage, jibContainerBuilder,
                 pushRequest.isPresent());
 
-        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap()));
+        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container",
+                Collections.singletonMap("container-image", container.getTargetImage().toString())));
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, JibBuild.class, NativeBuild.class })
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, JibBuild.class, NativeBuild.class })
     public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig jibConfig,
             ContainerImageInfoBuildItem containerImage,
             NativeImageBuildItem nativeImage,
-            ApplicationInfoBuildItem applicationInfo,
             OutputTargetBuildItem outputTarget,
             Optional<ContainerImageBuildRequestBuildItem> buildRequest,
             Optional<ContainerImagePushRequestBuildItem> pushRequest,
@@ -128,16 +164,20 @@ public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig
 
         JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(containerImageConfig, jibConfig,
                 nativeImage, containerImageLabels);
+        setUser(jibConfig, jibContainerBuilder);
+        setPlatforms(jibConfig, jibContainerBuilder);
         handleExtraFiles(outputTarget, jibContainerBuilder);
-        containerize(applicationInfo, containerImageConfig, containerImage, jibContainerBuilder,
+        JibContainer container = containerize(containerImageConfig, jibConfig, containerImage, jibContainerBuilder,
                 pushRequest.isPresent());
 
-        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container", Collections.emptyMap()));
+        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container",
+                Collections.singletonMap("container-image", container.getTargetImage().toString())));
     }
 
-    private JibContainer containerize(ApplicationInfoBuildItem applicationInfo, ContainerImageConfig containerImageConfig,
-            ContainerImageInfoBuildItem containerImage, JibContainerBuilder jibContainerBuilder, boolean pushRequested) {
-        Containerizer containerizer = createContainerizer(containerImageConfig, containerImage, applicationInfo, pushRequested);
+    private JibContainer containerize(ContainerImageConfig containerImageConfig,
+            JibConfig jibConfig, ContainerImageInfoBuildItem containerImage, JibContainerBuilder jibContainerBuilder,
+            boolean pushRequested) {
+        Containerizer containerizer = createContainerizer(containerImageConfig, jibConfig, containerImage, pushRequested);
         for (String additionalTag : containerImage.getAdditionalTags()) {
             containerizer.withAdditionalTag(additionalTag);
         }
@@ -155,17 +195,11 @@ private JibContainer containerize(ApplicationInfoBuildItem applicationInfo, Cont
     }
 
     private Containerizer createContainerizer(ContainerImageConfig containerImageConfig,
-            ContainerImageInfoBuildItem containerImage,
-            ApplicationInfoBuildItem applicationInfo, boolean pushRequested) {
+            JibConfig jibConfig, ContainerImageInfoBuildItem containerImage,
+            boolean pushRequested) {
         Containerizer containerizer;
-        ImageReference imageReference = getImageReference(containerImageConfig, containerImage, applicationInfo);
-
-        for (String additionalTag : containerImage.getAdditionalTags()) {
-            if (!ImageReference.isValidTag(additionalTag)) {
-                throw new IllegalArgumentException(
-                        "The supplied container-image additional tag '" + additionalTag + "' is invalid");
-            }
-        }
+        ImageReference imageReference = ImageReference.of(containerImage.getRegistry().orElse(null),
+                containerImage.getRepository(), containerImage.getTag());
 
         if (pushRequested || containerImageConfig.push) {
             if (!containerImageConfig.registry.isPresent()) {
@@ -178,12 +212,14 @@ private Containerizer createContainerizer(ContainerImageConfig containerImageCon
             containerizer = Containerizer.to(DockerDaemonImage.named(imageReference));
         }
         containerizer.setToolName("Quarkus");
+        containerizer.setToolVersion(Version.getVersion());
         containerizer.addEventHandler(LogEvent.class, (e) -> {
             if (!e.getMessage().isEmpty()) {
                 log.log(toJBossLoggingLevel(e.getLevel()), e.getMessage());
             }
         });
         containerizer.setAllowInsecureRegistries(containerImageConfig.insecure);
+        containerizer.setAlwaysCacheBaseImage(jibConfig.alwaysCacheBaseImage);
         return containerizer;
     }
 
@@ -212,29 +248,6 @@ private Logger.Level toJBossLoggingLevel(LogEvent.Level level) {
         }
     }
 
-    private ImageReference getImageReference(ContainerImageConfig containerImageConfig,
-            ContainerImageInfoBuildItem containerImage,
-            ApplicationInfoBuildItem applicationInfo) {
-
-        String registry = containerImageConfig.registry.orElse(null);
-        if ((registry != null) && !ImageReference.isValidRegistry(registry)) {
-            throw new IllegalArgumentException("The supplied container-image registry '" + registry + "' is invalid");
-        }
-
-        String repository = (containerImageConfig.getEffectiveGroup().map(s -> s + "/").orElse(""))
-                + containerImageConfig.name.orElse(applicationInfo.getName());
-        if (!ImageReference.isValidRepository(repository)) {
-            throw new IllegalArgumentException("The supplied container-image repository '" + repository + "' is invalid");
-        }
-
-        final String tag = containerImage.getTag();
-        if (!ImageReference.isValidTag(tag)) {
-            throw new IllegalArgumentException("The supplied container-image tag '" + tag + "' is invalid");
-        }
-
-        return ImageReference.of(registry, repository, tag);
-    }
-
     /**
      * We don't use Jib's JavaContainerBuilder here because we need to support the custom fast-jar format
      * We create the following layers (least likely to change to most likely to change):
@@ -249,8 +262,10 @@ private ImageReference getImageReference(ContainerImageConfig containerImageConf
      */
     private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfig,
             JarBuildItem sourceJarBuildItem,
-            List<ContainerImageLabelBuildItem> containerImageLabels) {
+            CurateOutcomeBuildItem curateOutcome, List<ContainerImageLabelBuildItem> containerImageLabels,
+            Optional<AppCDSResultBuildItem> appCDSResult) {
         Path componentsPath = sourceJarBuildItem.getPath().getParent();
+        Path appLibDir = componentsPath.resolve(JarResultBuildStep.LIB).resolve(JarResultBuildStep.MAIN);
 
         AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work");
 
@@ -258,19 +273,136 @@ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfi
         if (jibConfig.jvmEntrypoint.isPresent()) {
             entrypoint = jibConfig.jvmEntrypoint.get();
         } else {
-            entrypoint = new ArrayList<>(3 + jibConfig.jvmArguments.size());
+            List<String> effectiveJvmArguments = determineEffectiveJvmArguments(jibConfig, appCDSResult);
+            entrypoint = new ArrayList<>(3 + effectiveJvmArguments.size());
             entrypoint.add("java");
-            entrypoint.addAll(jibConfig.jvmArguments);
+            entrypoint.addAll(effectiveJvmArguments);
             entrypoint.add("-jar");
             entrypoint.add(JarResultBuildStep.QUARKUS_RUN_JAR);
         }
 
+        List<AppArtifact> fastChangingLibs = new ArrayList<>();
+        List<AppDependency> userDependencies = curateOutcome.getEffectiveModel().getUserDependencies();
+        for (AppDependency dep : userDependencies) {
+            AppArtifact artifact = dep.getArtifact();
+            if (artifact == null) {
+                continue;
+            }
+            String artifactVersion = artifact.getVersion();
+            if ((artifactVersion == null) || artifactVersion.isEmpty()) {
+                continue;
+            }
+            if (artifactVersion.toLowerCase().contains("snapshot")) {
+                fastChangingLibs.add(artifact);
+            }
+        }
+        Set<Path> fastChangingLibPaths = Collections.emptySet();
+        List<Path> nonFastChangingLibPaths = null;
+        if (!fastChangingLibs.isEmpty()) {
+            fastChangingLibPaths = new HashSet<>(fastChangingLibs.size());
+            Map<String, Path> libNameToPath = new HashMap<>();
+            try (DirectoryStream<Path> allLibPaths = Files.newDirectoryStream(appLibDir)) {
+                for (Path libPath : allLibPaths) {
+                    libNameToPath.put(libPath.getFileName().toString(), libPath);
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+            List<String> libFileNames = new ArrayList<>(libNameToPath.keySet());
+            for (AppArtifact appArtifact : fastChangingLibs) {
+                String matchingLibDirFileName = null;
+                for (Path appArtifactPath : appArtifact.getPaths()) {
+                    for (String libFileName : libFileNames) {
+                        if (libFileName.contains(appArtifact.getGroupId())
+                                && libFileName.contains(appArtifactPath.getFileName().toString())) {
+                            matchingLibDirFileName = libFileName;
+                            break;
+                        }
+                    }
+                    if (matchingLibDirFileName != null) {
+                        break;
+                    }
+                }
+                if (matchingLibDirFileName != null) {
+                    fastChangingLibPaths.add(libNameToPath.get(matchingLibDirFileName));
+                }
+            }
+            Collection<Path> allLibPaths = libNameToPath.values();
+            nonFastChangingLibPaths = new ArrayList<>(allLibPaths.size() - fastChangingLibPaths.size());
+            for (Path libPath : allLibPaths) {
+                if (!fastChangingLibPaths.contains(libPath)) {
+                    nonFastChangingLibPaths.add(libPath);
+                }
+            }
+        }
+
         try {
-            return Jib.from(toRegistryImage(ImageReference.parse(jibConfig.baseJvmImage), jibConfig.baseRegistryUsername,
-                    jibConfig.baseRegistryPassword))
-                    .addLayer(Collections.singletonList(componentsPath.resolve(JarResultBuildStep.LIB)), workDirInContainer)
-                    .addLayer(Collections.singletonList(componentsPath.resolve(JarResultBuildStep.QUARKUS_RUN_JAR)),
-                            workDirInContainer)
+
+            JibContainerBuilder jibContainerBuilder = Jib
+                    .from(toRegistryImage(ImageReference.parse(jibConfig.baseJvmImage), jibConfig.baseRegistryUsername,
+                            jibConfig.baseRegistryPassword));
+            if (fastChangingLibPaths.isEmpty()) {
+                // just create a layer with the entire lib structure intact
+                jibContainerBuilder.addLayer(Collections.singletonList(componentsPath.resolve(JarResultBuildStep.LIB)),
+                        workDirInContainer);
+            } else {
+                // we need to manually create each layer
+                // the idea here is that the fast changing libraries are created in a later layer, thus when they do change,
+                // docker doesn't have to create an entire layer with all dependencies - only change the fast ones
+
+                FileEntriesLayer.Builder bootLibsLayerBuilder = FileEntriesLayer.builder();
+                Path bootLibPath = componentsPath.resolve(JarResultBuildStep.LIB).resolve(JarResultBuildStep.BOOT_LIB);
+                Files.list(bootLibPath).forEach(lib -> {
+                    try {
+                        AbsoluteUnixPath libPathInContainer = workDirInContainer.resolve(JarResultBuildStep.LIB)
+                                .resolve(JarResultBuildStep.BOOT_LIB)
+                                .resolve(lib.getFileName());
+                        if (appCDSResult.isPresent()) {
+                            // the boot lib jars need to preserve the modification time because otherwise AppCDS won't work
+                            bootLibsLayerBuilder.addEntry(lib, libPathInContainer, Files.getLastModifiedTime(lib).toInstant());
+                        } else {
+                            bootLibsLayerBuilder.addEntry(lib, libPathInContainer);
+                        }
+
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
+                jibContainerBuilder.addFileEntriesLayer(bootLibsLayerBuilder.build());
+
+                Path deploymentPath = componentsPath.resolve(JarResultBuildStep.LIB).resolve(JarResultBuildStep.DEPLOYMENT_LIB);
+                if (Files.exists(deploymentPath)) { // this is the case of mutable-jar
+                    FileEntriesLayer.Builder deploymentLayerBuilder = FileEntriesLayer.builder();
+                    Files.list(deploymentPath).forEach(lib -> {
+                        AbsoluteUnixPath libPathInContainer = workDirInContainer.resolve(JarResultBuildStep.LIB)
+                                .resolve(JarResultBuildStep.DEPLOYMENT_LIB)
+                                .resolve(lib.getFileName());
+                        deploymentLayerBuilder.addEntry(lib, libPathInContainer);
+                    });
+                    jibContainerBuilder.addFileEntriesLayer(deploymentLayerBuilder.build());
+                }
+
+                jibContainerBuilder.addLayer(nonFastChangingLibPaths,
+                        workDirInContainer.resolve(JarResultBuildStep.LIB).resolve(JarResultBuildStep.MAIN));
+                jibContainerBuilder.addLayer(new ArrayList<>(fastChangingLibPaths),
+                        workDirInContainer.resolve(JarResultBuildStep.LIB).resolve(JarResultBuildStep.MAIN));
+            }
+
+            if (appCDSResult.isPresent()) {
+                jibContainerBuilder.addFileEntriesLayer(FileEntriesLayer.builder().addEntry(
+                        componentsPath.resolve(JarResultBuildStep.QUARKUS_RUN_JAR),
+                        workDirInContainer.resolve(JarResultBuildStep.QUARKUS_RUN_JAR),
+                        Files.getLastModifiedTime(componentsPath.resolve(JarResultBuildStep.QUARKUS_RUN_JAR)).toInstant())
+                        .build());
+                jibContainerBuilder
+                        .addLayer(Collections.singletonList(appCDSResult.get().getAppCDS()), workDirInContainer);
+            } else {
+                jibContainerBuilder.addFileEntriesLayer(FileEntriesLayer.builder().addEntry(
+                        componentsPath.resolve(JarResultBuildStep.QUARKUS_RUN_JAR),
+                        workDirInContainer.resolve(JarResultBuildStep.QUARKUS_RUN_JAR)).build());
+            }
+
+            jibContainerBuilder
                     .addLayer(Collections.singletonList(componentsPath.resolve(JarResultBuildStep.APP)), workDirInContainer)
                     .addLayer(Collections.singletonList(componentsPath.resolve(JarResultBuildStep.QUARKUS)), workDirInContainer)
                     .setWorkingDirectory(workDirInContainer)
@@ -278,6 +410,11 @@ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfi
                     .setEnvironment(jibConfig.environmentVariables)
                     .setLabels(allLabels(jibConfig, containerImageLabels))
                     .setCreationTime(Instant.now());
+            for (int port : jibConfig.ports) {
+                jibContainerBuilder.addExposedPort(Port.tcp(port));
+            }
+
+            return jibContainerBuilder;
 
         } catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -286,9 +423,35 @@ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfi
         }
     }
 
+    private List<String> determineEffectiveJvmArguments(JibConfig jibConfig, Optional<AppCDSResultBuildItem> appCDSResult) {
+        List<String> effectiveJvmArguments = new ArrayList<>(jibConfig.jvmArguments);
+        if (appCDSResult.isPresent()) {
+            boolean containsAppCDSOptions = false;
+            for (String effectiveJvmArgument : effectiveJvmArguments) {
+                if (effectiveJvmArgument.startsWith("-XX:SharedArchiveFile")) {
+                    containsAppCDSOptions = true;
+                    break;
+                }
+            }
+            if (!containsAppCDSOptions) {
+                effectiveJvmArguments.add("-XX:SharedArchiveFile=" + appCDSResult.get().getAppCDS().getFileName().toString());
+            }
+        }
+        return effectiveJvmArguments;
+    }
+
+    private void setUser(JibConfig jibConfig, JibContainerBuilder jibContainerBuilder) {
+        jibConfig.user.ifPresent(jibContainerBuilder::setUser);
+    }
+
+    private void setPlatforms(JibConfig jibConfig, JibContainerBuilder jibContainerBuilder) {
+        jibConfig.platforms.map(PlatformHelper::parse).ifPresent(jibContainerBuilder::setPlatforms);
+    }
+
     private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibConfig,
             JarBuildItem sourceJarBuildItem,
-            OutputTargetBuildItem outputTargetBuildItem, MainClassBuildItem mainClassBuildItem,
+            OutputTargetBuildItem outputTargetBuildItem,
+            MainClassBuildItem mainClassBuildItem,
             List<ContainerImageLabelBuildItem> containerImageLabels) {
         try {
             // not ideal since this has been previously zipped - we would like to just reuse it
@@ -308,12 +471,14 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon
             }
 
             if (sourceJarBuildItem.getLibraryDir() != null) {
-                javaContainerBuilder
-                        .addDependencies(
-                                Files.list(sourceJarBuildItem.getLibraryDir())
-                                        .filter(p -> Files.isRegularFile(p) && p.getFileName().toString().endsWith(".jar"))
-                                        .sorted(Comparator.comparing(Path::getFileName))
-                                        .collect(Collectors.toList()));
+                try (Stream<Path> dependenciesPaths = Files.list(sourceJarBuildItem.getLibraryDir())) {
+                    javaContainerBuilder
+                            .addDependencies(
+                                    dependenciesPaths
+                                            .filter(p -> Files.isRegularFile(p) && p.getFileName().toString().endsWith(".jar"))
+                                            .sorted(Comparator.comparing(Path::getFileName))
+                                            .collect(Collectors.toList()));
+                }
             }
 
             JibContainerBuilder jibContainerBuilder = javaContainerBuilder.toContainerBuilder()
@@ -340,13 +505,14 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi
         if (jibConfig.nativeEntrypoint.isPresent()) {
             entrypoint = jibConfig.nativeEntrypoint.get();
         } else {
-            entrypoint = new ArrayList<>(jibConfig.nativeArguments.size() + 1);
+            List<String> nativeArguments = jibConfig.nativeArguments.orElse(Collections.emptyList());
+            entrypoint = new ArrayList<>(nativeArguments.size() + 1);
             entrypoint.add("./" + BINARY_NAME_IN_CONTAINER);
-            entrypoint.addAll(jibConfig.nativeArguments);
+            entrypoint.addAll(nativeArguments);
         }
         try {
             AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work");
-            return Jib
+            JibContainerBuilder jibContainerBuilder = Jib
                     .from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), containerImageConfig.username,
                             containerImageConfig.password))
                     .addFileEntriesLayer(FileEntriesLayer.builder()
@@ -358,6 +524,10 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi
                     .setEnvironment(jibConfig.environmentVariables)
                     .setLabels(allLabels(jibConfig, containerImageLabels))
                     .setCreationTime(Instant.now());
+            for (int port : jibConfig.ports) {
+                jibContainerBuilder.addExposedPort(Port.tcp(port));
+            }
+            return jibContainerBuilder;
         } catch (InvalidImageReferenceException e) {
             throw new RuntimeException(e);
         }
diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java
new file mode 100755
index 0000000000000..b6544f150c2a1
--- /dev/null
+++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java
@@ -0,0 +1,170 @@
+package io.quarkus.container.image.jib.deployment;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jboss.logging.Logger;
+
+import com.google.cloud.tools.jib.api.buildplan.Platform;
+
+/*
+ * This code is a simplified version of <a href="https://github.com/containerd/containerd/blob/release/1.4/platforms/platforms.go">platforms</a>
+ * The reason is to comply with docker's convention and the format is not formally defined in Jib, although it use a reverse notation "arch/os" in documentation
+ * 
+ * The accepted platform format is: <os>|<arch>[/variant]|<os>/<arch>[/variant]
+ * The default OS is linux and the default Architecture is amd64 (as in Jib lib)
+ * Valid values for OS and Arch are define by OCI. See <a href="https://github.com/opencontainers/image-spec/blob/master/image-index.md">image-index</a>
+ *
+*/
+final class PlatformHelper {
+    private static final Logger log = Logger.getLogger(PlatformHelper.class);
+
+    public static final String OS_DEFAULT = "linux";
+    public static final String ARCH_DEFAULT = "amd64";
+
+    private PlatformHelper() {
+    }
+
+    private static Optional<String> normalizeOs(String os) {
+        os = os.trim().toLowerCase();
+        if (os.isEmpty()) {
+            return Optional.empty();
+        }
+        switch (os) {
+            case "macos":
+                os = "darwin";
+                break;
+        }
+        return Optional.of(os);
+    }
+
+    private static boolean isKnownOs(String os) {
+        switch (os) {
+            case "aix":
+            case "android":
+            case "darwin":
+            case "dragonfly":
+            case "freebsd":
+            case "hurd":
+            case "illumos":
+            case "js":
+            case "linux":
+            case "nacl":
+            case "netbsd":
+            case "openbsd":
+            case "plan9":
+            case "solaris":
+            case "windows":
+            case "zos":
+                return true;
+        }
+        return false;
+    }
+
+    private static boolean isKnownArch(String arch) {
+        String[] elements = arch.split("/", 2);
+        switch (elements[0]) {
+            case "386":
+            case "amd64":
+            case "arm64":
+            case "arm":
+            case "amd64p32":
+            case "armbe":
+            case "arm64be":
+            case "ppc64":
+            case "ppc64le":
+            case "mips":
+            case "mipsle":
+            case "mips64":
+            case "mips64le":
+            case "mips64p32":
+            case "mips64p32le":
+                return true;
+        }
+        return false;
+    }
+
+    private static Optional<String> normalizeArch(String arch) {
+        String[] elements = arch.split("/", 2);
+        if (elements[0].isEmpty()) {
+            return Optional.empty();
+        }
+        Optional<String> variant = elements.length == 1 || elements[1].isEmpty() ? Optional.empty()
+                : Optional.of(elements[1].trim().toLowerCase());
+        arch = elements[0].trim().toLowerCase();
+        switch (arch) {
+            case "i386":
+                arch = "386";
+                break;
+
+            case "x86_64":
+            case "x86-64":
+                arch = "amd64";
+                break;
+
+            case "aarch64":
+            case "arm64":
+                arch = "arm64";
+                if (variant.filter(v -> v.equals("8") || v.equals("v8")).isPresent()) {
+                    variant = Optional.empty();
+                }
+                break;
+
+            case "armhf":
+                arch = "arm";
+                variant = Optional.of("v7");
+                break;
+
+            case "armel":
+                arch = "arm";
+                variant = Optional.of("v6");
+                break;
+
+            case "arm":
+                if (!variant.isPresent()) {
+                    variant = Optional.of("v7");
+                } else if (variant.get().matches("\\d+")) {
+                    variant = Optional.of("v" + variant.get());
+                }
+                break;
+        }
+        return Optional.of(variant.isPresent() ? arch + "/" + variant.get() : arch);
+    }
+
+    public static Platform parse(String specifier) {
+        Platform platform;
+        String[] elements = specifier.split("/", 2);
+        if (elements.length == 1) {
+            Optional<String> os = normalizeOs(elements[0]);
+            if (os.filter(PlatformHelper::isKnownOs).isPresent()) {
+                platform = new Platform(ARCH_DEFAULT, os.get());
+            } else {
+                platform = new Platform(normalizeArch(elements[0]).orElse(ARCH_DEFAULT), OS_DEFAULT);
+            }
+        } else {
+            Optional<String> arch = normalizeArch(specifier);
+            if (arch.filter(PlatformHelper::isKnownArch).isPresent()) {
+                platform = new Platform(arch.get(), OS_DEFAULT);
+            } else {
+                platform = new Platform(normalizeArch(elements[1]).orElse(ARCH_DEFAULT),
+                        normalizeOs(elements[0]).orElse(OS_DEFAULT));
+            }
+        }
+        log.debug("Platform Added=" + PlatformHelper.platformToString(platform) + " from specifier: " + specifier);
+        return platform;
+    }
+
+    public static String platformToString(Platform platform) {
+        return platform.getOs() + "/" + platform.getArchitecture();
+    }
+
+    public static Set<Platform> parse(Collection<String> platformSpecifiers) {
+        return platformSpecifiers
+                .stream()
+                .map(PlatformHelper::parse)
+                .collect(Collectors.toSet());
+    }
+
+}
diff --git a/extensions/container-image/container-image-jib/pom.xml b/extensions/container-image/container-image-jib/pom.xml
index 57fc005596825..da9f7101c7ab4 100644
--- a/extensions/container-image/container-image-jib/pom.xml
+++ b/extensions/container-image/container-image-jib/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-jib-parent</artifactId>
-    <name>Quarkus - Container - Image - Jib - Parent</name>
+    <name>Quarkus - Container Image - Jib - Parent</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>
diff --git a/extensions/container-image/container-image-jib/runtime/pom.xml b/extensions/container-image/container-image-jib/runtime/pom.xml
index ab7f32ec573a3..c7818700bb646 100644
--- a/extensions/container-image/container-image-jib/runtime/pom.xml
+++ b/extensions/container-image/container-image-jib/runtime/pom.xml
@@ -11,9 +11,15 @@
     </parent>
 
     <artifactId>quarkus-container-image-jib</artifactId>
-    <name>Quarkus - Container - Image - Jib</name>
+    <name>Quarkus - Container Image - Jib</name>
     <description>Build container images of your application using Jib</description>
 
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
diff --git a/extensions/container-image/container-image-openshift/deployment/pom.xml b/extensions/container-image/container-image-openshift/deployment/pom.xml
new file mode 100644
index 0000000000000..822a2c7a0cd53
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-container-image-openshift-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-container-image-openshift-deployment</artifactId>
+    <name>Quarkus - Container Image - OpenShift - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-openshift</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.dekorate</groupId>
+            <artifactId>openshift-annotations</artifactId>
+            <classifier>noapt</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.sundr</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ApplyDockerfileToBuildConfigDecorator.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ApplyDockerfileToBuildConfigDecorator.java
new file mode 100644
index 0000000000000..475aba86ddd0d
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ApplyDockerfileToBuildConfigDecorator.java
@@ -0,0 +1,37 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+
+import io.dekorate.deps.kubernetes.api.model.ObjectMeta;
+import io.dekorate.deps.openshift.api.model.BuildConfigSpecFluent;
+import io.dekorate.kubernetes.decorator.NamedResourceDecorator;
+import io.quarkus.deployment.util.FileUtil;
+
+public class ApplyDockerfileToBuildConfigDecorator extends NamedResourceDecorator<BuildConfigSpecFluent<?>> {
+
+    private final Path pathToDockerfile;
+
+    public ApplyDockerfileToBuildConfigDecorator(String name, Path pathToDockerfile) {
+        super(name);
+        this.pathToDockerfile = pathToDockerfile;
+    }
+
+    @Override
+    public void andThenVisit(final BuildConfigSpecFluent<?> spec, ObjectMeta meta) {
+        try (InputStream is = new FileInputStream(pathToDockerfile.toFile())) {
+            spec.withNewSource()
+                    .withDockerfile(new String(FileUtil.readFileContents(is)))
+                    .endSource()
+                    .withNewStrategy()
+                    .withNewDockerStrategy()
+                    .endDockerStrategy()
+                    .endStrategy();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/BuildStatus.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/BuildStatus.java
new file mode 100644
index 0000000000000..21c91562ccc6b
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/BuildStatus.java
@@ -0,0 +1,14 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+public enum BuildStatus {
+
+    New,
+    Pending,
+    Running,
+    Complete,
+    Failed,
+    Error,
+    Cancelled;
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/BuildStrategy.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/BuildStrategy.java
new file mode 100644
index 0000000000000..7fb2cb77864d3
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/BuildStrategy.java
@@ -0,0 +1,9 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+public enum BuildStrategy {
+
+    BINARY,
+    DOCKER;
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseJavaImage.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseJavaImage.java
new file mode 100644
index 0000000000000..4cee5990eb667
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseJavaImage.java
@@ -0,0 +1,86 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.container.image.deployment.util.ImageUtil;
+
+public enum OpenshiftBaseJavaImage {
+
+    //We only compare `repositories` so registries and tags are stripped
+    FABRIC8("fabric8/s2i-java:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJDK_8_RHEL7("redhat-openjdk-18/openjdk18-openshift:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR",
+            "JAVA_LIB_DIR", "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJDK_8_RHEL8("openjdk/openjdk-8-rhel8:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJDK_11_RHEL7("openjdk/openjdk-11-rhel7:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJDK_11_RHEL8("openjdk/openjdk-11-rhel8:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJ9_8_RHEL7("openj9/openj9-8-rhel7:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJ9_8_RHEL8("openj9/openj9-8-rhel8:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJ9_11_RHEL7("openj9/openj9-11-rhel7:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJ9_11_RHEL8("openj9/openj9-11-rhel8:latest", "/deployments", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS");
+
+    private final String image;
+    private final String jarDirectory;
+    private final String javaMainClassEnvVar;
+    private final String jarEnvVar;
+    private final String jarLibEnvVar;
+    private final String classpathEnvVar;
+    private final String jvmOptionsEnvVar;
+
+    public static Optional<OpenshiftBaseJavaImage> findMatching(String image) {
+        for (OpenshiftBaseJavaImage candidate : OpenshiftBaseJavaImage.values()) {
+            if (ImageUtil.getRepository(candidate.getImage()).equals(ImageUtil.getRepository(image))) {
+                return Optional.of(candidate);
+            }
+        }
+        return Optional.empty();
+    }
+
+    private OpenshiftBaseJavaImage(String image, String jarDirectory, String javaMainClassEnvVar, String jarEnvVar,
+            String jarLibEnvVar, String classpathEnvVar, String jvmOptionsEnvVar) {
+        this.image = image;
+        this.jarDirectory = jarDirectory;
+        this.javaMainClassEnvVar = javaMainClassEnvVar;
+        this.jarEnvVar = jarEnvVar;
+        this.jarLibEnvVar = jarLibEnvVar;
+        this.classpathEnvVar = classpathEnvVar;
+        this.jvmOptionsEnvVar = jvmOptionsEnvVar;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public String getJarDirectory() {
+        return this.jarDirectory;
+    }
+
+    public String getJavaMainClassEnvVar() {
+        return javaMainClassEnvVar;
+    }
+
+    public String getJvmOptionsEnvVar() {
+        return jvmOptionsEnvVar;
+    }
+
+    public String getClasspathEnvVar() {
+        return classpathEnvVar;
+    }
+
+    public String getJarLibEnvVar() {
+        return jarLibEnvVar;
+    }
+
+    public String getJarEnvVar() {
+        return jarEnvVar;
+    }
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseNativeImage.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseNativeImage.java
new file mode 100644
index 0000000000000..dd2cf596b963c
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBaseNativeImage.java
@@ -0,0 +1,57 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.container.image.deployment.util.ImageUtil;
+
+public enum OpenshiftBaseNativeImage {
+
+    //We only compare `repositories` so registries and tags are stripped
+    QUARKUS("quarkus/ubi-quarkus-native-binary-s2i:latest", "/home/quarkus/", "application", "QUARKUS_HOME", "QUARKUS_OPTS");
+
+    private final String image;
+    private final String nativeBinaryDirectory;
+    private final String fixedNativeBinaryName;
+    private final String homeDirEnvVar;
+    private final String optsEnvVar;
+
+    public static Optional<OpenshiftBaseNativeImage> findMatching(String image) {
+        for (OpenshiftBaseNativeImage candidate : OpenshiftBaseNativeImage.values()) {
+            if (ImageUtil.getRepository(candidate.getImage()).equals(ImageUtil.getRepository(image))) {
+                return Optional.of(candidate);
+            }
+        }
+        return Optional.empty();
+    }
+
+    private OpenshiftBaseNativeImage(String image, String nativeBinaryDirectory, String fixedNativeBinaryName,
+            String homeDirEnvVar, String optsEnvVar) {
+        this.image = image;
+        this.nativeBinaryDirectory = nativeBinaryDirectory;
+        this.fixedNativeBinaryName = fixedNativeBinaryName;
+        this.homeDirEnvVar = homeDirEnvVar;
+        this.optsEnvVar = optsEnvVar;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public String getNativeBinaryDirectory() {
+        return nativeBinaryDirectory;
+    }
+
+    public String getFixedNativeNinaryName() {
+        return this.fixedNativeBinaryName;
+    }
+
+    public String getHomeDirEnvVar() {
+        return homeDirEnvVar;
+    }
+
+    public String getOptsEnvVar() {
+        return optsEnvVar;
+    }
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBuild.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBuild.java
new file mode 100644
index 0000000000000..8956edbf3e03e
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftBuild.java
@@ -0,0 +1,19 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.container.image.deployment.ContainerImageConfig;
+
+public class OpenshiftBuild implements BooleanSupplier {
+
+    private ContainerImageConfig containerImageConfig;
+
+    OpenshiftBuild(ContainerImageConfig containerImageConfig) {
+        this.containerImageConfig = containerImageConfig;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return containerImageConfig.builder.map(b -> b.equals(OpenshiftProcessor.OPENSHIFT)).orElse(true);
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftConfig.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftConfig.java
new file mode 100644
index 0000000000000..3eb6911834ba3
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftConfig.java
@@ -0,0 +1,136 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+public class OpenshiftConfig {
+
+    public static final String DEFAULT_BASE_JVM_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11";
+    public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:1.0";
+    public static final String DEFAULT_NATIVE_TARGET_FILENAME = "application";
+
+    public static final String DEFAULT_JVM_DOCKERFILE = "src/main/docker/Dockerfile.jvm";
+    public static final String DEFAULT_NATIVE_DOCKERFILE = "src/main/docker/Dockerfile.native";
+
+    public static final String FALLBACK_JAR_DIRECTORY = "/deployments/";
+    public static final String FALLBAC_NATIVE_BINARY_DIRECTORY = "/home/quarkus/";
+
+    /**
+     * The build config strategy to use.
+     */
+    @ConfigItem(defaultValue = "binary")
+    public BuildStrategy buildStrategy;
+
+    /**
+     * The base image to be used when a container image is being produced for the jar build
+     */
+    @ConfigItem(defaultValue = DEFAULT_BASE_JVM_IMAGE)
+    public String baseJvmImage;
+
+    /**
+     * The base image to be used when a container image is being produced for the native binary build
+     */
+    @ConfigItem(defaultValue = DEFAULT_BASE_NATIVE_IMAGE)
+    public String baseNativeImage;
+
+    /**
+     * The default Dockerfile to use for jvm builds
+     */
+    @ConfigItem(defaultValue = DEFAULT_JVM_DOCKERFILE)
+    public String jvmDockerfile;
+
+    /**
+     * The default Dockerfile to use for native builds
+     */
+    @ConfigItem(defaultValue = DEFAULT_NATIVE_DOCKERFILE)
+    public String nativeDockerfile;
+
+    /**
+     * Additional JVM arguments to pass to the JVM when starting the application
+     */
+    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0,-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
+    public List<String> jvmArguments;
+
+    /**
+     * Additional arguments to pass when starting the native application
+     */
+    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0")
+    public List<String> nativeArguments;
+
+    /**
+     * The directory where the jar is added during the assemble phase.
+     * This is dependent on the S2I image and should be supplied if a non default image is used.
+     */
+    @ConfigItem
+    public Optional<String> jarDirectory;
+
+    /**
+     * The resulting filename of the jar in the S2I image.
+     * This option may be used if the selected S2I image uses a fixed name for the jar.
+     */
+    @ConfigItem
+    public Optional<String> jarFileName;
+
+    /**
+     * The directory where the native binary is added during the assemble phase.
+     * This is dependent on the S2I image and should be supplied if a non-default image is used.
+     */
+    @ConfigItem
+    public Optional<String> nativeBinaryDirectory;
+
+    /**
+     * The resulting filename of the native binary in the S2I image.
+     * This option may be used if the selected S2I image uses a fixed name for the native binary.
+     */
+    @ConfigItem
+    public Optional<String> nativeBinaryFileName;
+
+    /**
+     * The build timeout.
+     */
+    @ConfigItem(defaultValue = "PT5M")
+    Duration buildTimeout;
+
+    /**
+     * Check if baseJvmImage is the default
+     *
+     * @returns true if baseJvmImage is the default
+     */
+    public boolean hasDefaultBaseJvmImage() {
+        return baseJvmImage.equals(DEFAULT_BASE_JVM_IMAGE);
+    }
+
+    /**
+     * Check if baseNativeImage is the default
+     *
+     * @returns true if baseNativeImage is the default
+     */
+    public boolean hasDefaultBaseNativeImage() {
+        return baseNativeImage.equals(DEFAULT_BASE_NATIVE_IMAGE);
+    }
+
+    /**
+     * Check if jvmDockerfile is the default
+     *
+     * @returns true if jvmDockerfile is the default
+     */
+    public boolean hasDefaultJvmDockerfile() {
+        return jvmDockerfile.equals(DEFAULT_JVM_DOCKERFILE);
+    }
+
+    /**
+     * Check if nativeDockerfile is the default
+     *
+     * @returns true if nativeDockerfile is the default
+     */
+    public boolean hasDefaultativeDockerfile() {
+        return nativeDockerfile.equals(DEFAULT_NATIVE_DOCKERFILE);
+    }
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java
new file mode 100644
index 0000000000000..e0d9a806c9abe
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessor.java
@@ -0,0 +1,565 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import static io.quarkus.container.image.openshift.deployment.OpenshiftUtils.mergeConfig;
+import static io.quarkus.container.util.PathsUtil.findMainSourcesRoot;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.jboss.logging.Logger;
+
+import io.dekorate.deps.kubernetes.api.model.HasMetadata;
+import io.dekorate.deps.kubernetes.api.model.KubernetesList;
+import io.dekorate.deps.kubernetes.api.model.Secret;
+import io.dekorate.deps.kubernetes.client.KubernetesClient;
+import io.dekorate.deps.kubernetes.client.dsl.LogWatch;
+import io.dekorate.deps.openshift.api.model.Build;
+import io.dekorate.deps.openshift.api.model.BuildConfig;
+import io.dekorate.deps.openshift.api.model.ImageStream;
+import io.dekorate.deps.openshift.client.OpenShiftClient;
+import io.dekorate.utils.Clients;
+import io.dekorate.utils.Packaging;
+import io.dekorate.utils.Serialization;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.container.image.deployment.ContainerImageConfig;
+import io.quarkus.container.image.deployment.util.ImageUtil;
+import io.quarkus.container.spi.AvailableContainerImageExtensionBuildItem;
+import io.quarkus.container.spi.BaseImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageBuildRequestBuildItem;
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImagePushRequestBuildItem;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.IsNormalNotRemoteDev;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ArchiveRootBuildItem;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.GeneratedFileSystemResourceBuildItem;
+import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.deployment.pkg.builditem.JarBuildItem;
+import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeBuild;
+import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHanlder;
+import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesEnvBuildItem;
+
+public class OpenshiftProcessor {
+
+    public static final String OPENSHIFT = "openshift";
+    private static final String BUILD_CONFIG_NAME = "openshift.io/build-config.name";
+    private static final String RUNNING = "Running";
+
+    private static final Logger LOG = Logger.getLogger(OpenshiftProcessor.class);
+
+    @BuildStep
+    public AvailableContainerImageExtensionBuildItem availability() {
+        return new AvailableContainerImageExtensionBuildItem(OPENSHIFT);
+    }
+
+    @BuildStep(onlyIf = OpenshiftBuild.class)
+    public CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.CONTAINER_IMAGE_OPENSHIFT);
+    }
+
+    @BuildStep(onlyIf = { OpenshiftBuild.class }, onlyIfNot = NativeBuild.class)
+    public void openshiftPrepareJvmDockerBuild(OpenshiftConfig openshiftConfig,
+            S2iConfig s2iConfig,
+            OutputTargetBuildItem out,
+            BuildProducer<DecoratorBuildItem> decorator) {
+        OpenshiftConfig config = mergeConfig(openshiftConfig, s2iConfig);
+        if (config.buildStrategy == BuildStrategy.DOCKER) {
+            decorator.produce(new DecoratorBuildItem(new ApplyDockerfileToBuildConfigDecorator(null,
+                    findMainSourcesRoot(out.getOutputDirectory()).getValue().resolve(openshiftConfig.jvmDockerfile))));
+            //When using the docker build strategy, we can't possibly know these values, so it's the image responsibility to work without them.
+            decorator.produce(new DecoratorBuildItem(new RemoveEnvVarDecorator(null, "JAVA_APP_JAR")));
+            decorator.produce(new DecoratorBuildItem(new RemoveEnvVarDecorator(null, "JAVA_APP_LIB")));
+        }
+    }
+
+    @BuildStep(onlyIf = { OpenshiftBuild.class, NativeBuild.class })
+    public void openshiftPrepareNativeDockerBuild(OpenshiftConfig openshiftConfig,
+            S2iConfig s2iConfig,
+            OutputTargetBuildItem out,
+            BuildProducer<DecoratorBuildItem> decorator) {
+        OpenshiftConfig config = mergeConfig(openshiftConfig, s2iConfig);
+        if (config.buildStrategy == BuildStrategy.DOCKER) {
+            decorator.produce(new DecoratorBuildItem(new ApplyDockerfileToBuildConfigDecorator(null,
+                    findMainSourcesRoot(out.getOutputDirectory()).getValue().resolve(openshiftConfig.nativeDockerfile))));
+        }
+        //Let's remove this for all kinds of native build
+        decorator.produce(new DecoratorBuildItem(new RemoveEnvVarDecorator(null, "JAVA_APP_JAR")));
+        decorator.produce(new DecoratorBuildItem(new RemoveEnvVarDecorator(null, "JAVA_APP_LIB")));
+    }
+
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, OpenshiftBuild.class }, onlyIfNot = NativeBuild.class)
+    public void openshiftRequirementsJvm(OpenshiftConfig openshiftConfig,
+            S2iConfig s2iConfig,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            OutputTargetBuildItem out,
+            PackageConfig packageConfig,
+            JarBuildItem jarBuildItem,
+            BuildProducer<DecoratorBuildItem> decorator,
+            BuildProducer<KubernetesEnvBuildItem> envProducer,
+            BuildProducer<BaseImageInfoBuildItem> builderImageProducer,
+            BuildProducer<KubernetesCommandBuildItem> commandProducer) {
+
+        OpenshiftConfig config = mergeConfig(openshiftConfig, s2iConfig);
+        final List<AppDependency> appDeps = curateOutcomeBuildItem.getEffectiveModel().getUserDependencies();
+        String outputJarFileName = jarBuildItem.getPath().getFileName().toString();
+        String jarFileName = config.jarFileName.orElse(outputJarFileName);
+
+        builderImageProducer.produce(new BaseImageInfoBuildItem(config.baseJvmImage));
+        Optional<OpenshiftBaseJavaImage> baseImage = OpenshiftBaseJavaImage.findMatching(config.baseJvmImage);
+        boolean libRequired = !packageConfig.type.equalsIgnoreCase(PackageConfig.UBER_JAR);
+
+        if (config.buildStrategy == BuildStrategy.BINARY) {
+            // Jar directory priorities:
+            // 1. explictly specified by the user.
+            // 2. detected via OpenshiftBaseJavaImage
+            // 3. fallback value
+            String jarDirectory = config.jarDirectory
+                    .orElse(baseImage.map(i -> i.getJarDirectory()).orElse(config.FALLBACK_JAR_DIRECTORY));
+            String pathToJar = concatUnixPaths(jarDirectory, jarFileName);
+            String classpath = appDeps.stream()
+                    .map(d -> d.getArtifact().getGroupId() + "." + d.getArtifact().getPath().getFileName())
+                    .map(s -> concatUnixPaths(jarDirectory, "lib", s))
+                    .collect(Collectors.joining(":"));
+
+            // If the image is known, we can define env vars for classpath, jar, lib etc.
+            baseImage.ifPresent(b -> {
+                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJarEnvVar(), pathToJar, null));
+                if (libRequired) {
+                    envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJarLibEnvVar(),
+                            concatUnixPaths(jarDirectory, "lib"), null));
+                    envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getClasspathEnvVar(), classpath, null));
+                }
+                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJvmOptionsEnvVar(),
+                        String.join(" ", config.jvmArguments), null));
+            });
+            //In all other cases its the responsibility of the image to set those up correctly.
+            if (!baseImage.isPresent()) {
+                List<String> args = new ArrayList<>();
+                args.addAll(Arrays.asList("-jar", pathToJar));
+                if (libRequired) {
+                    args.addAll(Arrays.asList("-cp", classpath));
+                    envProducer.produce(
+                            KubernetesEnvBuildItem.createSimpleVar("JAVA_LIB_DIR", concatUnixPaths(jarDirectory, "lib"), null));
+                }
+                args.addAll(config.jvmArguments);
+                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar("JAVA_APP_JAR", pathToJar, null));
+                commandProducer.produce(new KubernetesCommandBuildItem("java", args.toArray(new String[args.size()])));
+            }
+        }
+    }
+
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, OpenshiftBuild.class, NativeBuild.class })
+    public void openshiftRequirementsNative(OpenshiftConfig openshiftConfig,
+            S2iConfig s2iConfig,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            OutputTargetBuildItem out,
+            PackageConfig packageConfig,
+            NativeImageBuildItem nativeImage,
+            BuildProducer<KubernetesEnvBuildItem> envProducer,
+            BuildProducer<BaseImageInfoBuildItem> builderImageProducer,
+            BuildProducer<KubernetesCommandBuildItem> commandProducer) {
+
+        OpenshiftConfig config = mergeConfig(openshiftConfig, s2iConfig);
+        boolean usingDefaultBuilder = ImageUtil.getRepository(OpenshiftConfig.DEFAULT_BASE_NATIVE_IMAGE)
+                .equals(ImageUtil.getRepository(config.baseNativeImage));
+        String outputNativeBinaryFileName = nativeImage.getPath().getFileName().toString();
+
+        String nativeBinaryFileName = null;
+
+        //The default openshift builder for native builds, renames the native binary.
+        //To make things easier for the user, we need to handle it.
+        if (usingDefaultBuilder && !config.nativeBinaryFileName.isPresent()) {
+            nativeBinaryFileName = OpenshiftConfig.DEFAULT_NATIVE_TARGET_FILENAME;
+        } else {
+            nativeBinaryFileName = config.nativeBinaryFileName.orElse(outputNativeBinaryFileName);
+        }
+
+        if (config.buildStrategy == BuildStrategy.BINARY) {
+            builderImageProducer.produce(new BaseImageInfoBuildItem(config.baseNativeImage));
+            Optional<OpenshiftBaseNativeImage> baseImage = OpenshiftBaseNativeImage.findMatching(config.baseNativeImage);
+            // Native binary directory priorities:
+            // 1. explictly specified by the user.
+            // 2. detected via OpenshiftBaseNativeImage
+            // 3. fallback value
+            String nativeBinaryDirectory = config.nativeBinaryDirectory
+                    .orElse(baseImage.map(i -> i.getNativeBinaryDirectory()).orElse(config.FALLBAC_NATIVE_BINARY_DIRECTORY));
+            String pathToNativeBinary = concatUnixPaths(nativeBinaryDirectory, nativeBinaryFileName);
+
+            baseImage.ifPresent(b -> {
+                envProducer.produce(
+                        KubernetesEnvBuildItem.createSimpleVar(b.getHomeDirEnvVar(), nativeBinaryDirectory, OPENSHIFT));
+                envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getOptsEnvVar(),
+                        String.join(" ", config.nativeArguments), OPENSHIFT));
+            });
+
+            if (!baseImage.isPresent()) {
+                commandProducer.produce(new KubernetesCommandBuildItem(pathToNativeBinary,
+                        config.nativeArguments.toArray(new String[config.nativeArguments.size()])));
+            }
+        }
+    }
+
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, OpenshiftBuild.class }, onlyIfNot = NativeBuild.class)
+    public void openshiftBuildFromJar(OpenshiftConfig openshiftConfig,
+            S2iConfig s2iConfig,
+            ContainerImageConfig containerImageConfig,
+            KubernetesClientBuildItem kubernetesClient,
+            ContainerImageInfoBuildItem containerImage,
+            ArchiveRootBuildItem archiveRoot, OutputTargetBuildItem out, PackageConfig packageConfig,
+            List<GeneratedFileSystemResourceBuildItem> generatedResources,
+            Optional<ContainerImageBuildRequestBuildItem> buildRequest,
+            Optional<ContainerImagePushRequestBuildItem> pushRequest,
+            BuildProducer<ArtifactResultBuildItem> artifactResultProducer,
+            // used to ensure that the jar has been built
+            JarBuildItem jar) {
+
+        OpenshiftConfig config = mergeConfig(openshiftConfig, s2iConfig);
+        if (!containerImageConfig.build && !containerImageConfig.push && !buildRequest.isPresent()
+                && !pushRequest.isPresent()) {
+            return;
+        }
+
+        Optional<GeneratedFileSystemResourceBuildItem> openshiftYml = generatedResources
+                .stream()
+                .filter(r -> r.getName().endsWith("kubernetes" + File.separator + "openshift.yml"))
+                .findFirst();
+
+        if (!openshiftYml.isPresent()) {
+            LOG.warn(
+                    "No Openshift manifests were generated (most likely due to the fact that the service is not an HTTP service) so no openshift process will be taking place");
+            return;
+        }
+
+        String namespace = Optional.ofNullable(kubernetesClient.getClient().getNamespace()).orElse("default");
+        LOG.info("Performing openshift binary build with jar on server: " + kubernetesClient.getClient().getMasterUrl()
+                + " in namespace:" + namespace + ".");
+
+        //The contextRoot is where inside the tarball we will add the jars. A null value means everything will be added under '/' while "target" means everything will be added under '/target'.
+        //For docker kind of builds where we use instructions like: `COPY target/*.jar /deployments` it using '/target' is a requirement.
+        //For s2i kind of builds where jars are expected directly in the '/' we have to use null.
+        String contextRoot = config.buildStrategy == BuildStrategy.DOCKER ? "target" : null;
+        if (packageConfig.isFastJar()) {
+            createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(),
+                    jar.getPath().getParent());
+        } else if (jar.getLibraryDir() != null) { //When using uber-jar the libraryDir is going to be null, potentially causing NPE.
+            createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(),
+                    jar.getPath(), jar.getLibraryDir());
+        } else {
+            createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, jar.getPath().getParent(),
+                    jar.getPath());
+        }
+        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap()));
+    }
+
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, OpenshiftBuild.class, NativeBuild.class })
+    public void openshiftBuildFromNative(OpenshiftConfig openshiftConfig, S2iConfig s2iConfig,
+            ContainerImageConfig containerImageConfig,
+            KubernetesClientBuildItem kubernetesClient,
+            ContainerImageInfoBuildItem containerImage,
+            ArchiveRootBuildItem archiveRoot, OutputTargetBuildItem out, PackageConfig packageConfig,
+            List<GeneratedFileSystemResourceBuildItem> generatedResources,
+            Optional<ContainerImageBuildRequestBuildItem> buildRequest,
+            Optional<ContainerImagePushRequestBuildItem> pushRequest,
+            BuildProducer<ArtifactResultBuildItem> artifactResultProducer,
+            NativeImageBuildItem nativeImage) {
+
+        OpenshiftConfig config = mergeConfig(openshiftConfig, s2iConfig);
+        if (!containerImageConfig.build && !containerImageConfig.push && !buildRequest.isPresent()
+                && !pushRequest.isPresent()) {
+            return;
+        }
+
+        String namespace = Optional.ofNullable(kubernetesClient.getClient().getNamespace()).orElse("default");
+        LOG.info("Performing openshift binary build with native image on server: " + kubernetesClient.getClient().getMasterUrl()
+                + " in namespace:" + namespace + ".");
+
+        Optional<GeneratedFileSystemResourceBuildItem> openshiftYml = generatedResources
+                .stream()
+                .filter(r -> r.getName().endsWith("kubernetes" + File.separator + "openshift.yml"))
+                .findFirst();
+
+        if (!openshiftYml.isPresent()) {
+            LOG.warn(
+                    "No Openshift manifests were generated (most likely due to the fact that the service is not an HTTP service) so no openshift process will be taking place");
+            return;
+        }
+        //The contextRoot is where inside the tarball we will add the jars. A null value means everything will be added under '/' while "target" means everything will be added under '/target'.
+        //For docker kind of builds where we use instructions like: `COPY target/*.jar /deployments` it using '/target' is a requirement.
+        //For s2i kind of builds where jars are expected directly in the '/' we have to use null.
+        String contextRoot = config.buildStrategy == BuildStrategy.DOCKER ? "target" : null;
+        createContainerImage(kubernetesClient, openshiftYml.get(), config, contextRoot, out.getOutputDirectory(),
+                nativeImage.getPath());
+        artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container", Collections.emptyMap()));
+    }
+
+    public static void createContainerImage(KubernetesClientBuildItem kubernetesClient,
+            GeneratedFileSystemResourceBuildItem openshiftManifests,
+            OpenshiftConfig openshiftConfig,
+            String base,
+            Path output,
+            Path... additional) {
+
+        File tar;
+        try {
+            File original = Packaging.packageFile(output, base, additional);
+            //Let's rename the archive and give it a more descriptive name, as it may appear in the logs.
+            tar = Files.createTempFile("quarkus-", "-openshift").toFile();
+            Files.move(original.toPath(), tar.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        } catch (Exception e) {
+            throw new RuntimeException("Error creating the openshift binary build archive.", e);
+        }
+
+        Config config = kubernetesClient.getClient().getConfiguration();
+        //Let's disable http2 as it causes issues with duplicate build triggers.
+        config.setHttp2Disable(true);
+        try (KubernetesClient client = Clients.fromConfig(config)) {
+            OpenShiftClient openShiftClient = client.adapt(OpenShiftClient.class);
+            KubernetesList kubernetesList = Serialization
+                    .unmarshalAsList(new ByteArrayInputStream(openshiftManifests.getData()));
+
+            List<HasMetadata> buildResources = kubernetesList.getItems().stream()
+                    .filter(i -> i instanceof BuildConfig || i instanceof ImageStream || i instanceof Secret)
+                    .collect(Collectors.toList());
+
+            applyOpenshiftResources(openShiftClient, buildResources);
+            openshiftBuild(openShiftClient, buildResources, tar, openshiftConfig);
+        }
+    }
+
+    /**
+     * Apply the openshift resources and wait until ImageStreamTags are created.
+     *
+     * @param client the client instance
+     * @param buildResources resources to apply
+     */
+    private static void applyOpenshiftResources(OpenShiftClient client, List<HasMetadata> buildResources) {
+        // Apply build resource requirements
+        try {
+            for (HasMetadata i : distinct(buildResources)) {
+                if (i instanceof BuildConfig) {
+                    client.resource(i).cascading(true).delete();
+                    try {
+                        client.resource(i).waitUntilCondition(d -> d == null, 10, TimeUnit.SECONDS);
+                    } catch (IllegalArgumentException e) {
+                        // We should ignore that, as its expected to be thrown when item is actually
+                        // deleted.
+                    } catch (InterruptedException e) {
+                        openshiftException(e);
+                    }
+                } else if (i instanceof ImageStream) {
+                    ImageStream is = (ImageStream) i;
+                    ImageStream existing = client.imageStreams().withName(i.getMetadata().getName()).get();
+                    if (existing != null &&
+                            existing.getSpec() != null &&
+                            existing.getSpec().getDockerImageRepository() != null &&
+                            existing.getSpec().getDockerImageRepository().equals(is.getSpec().getDockerImageRepository())) {
+                        LOG.info("Found: " + i.getKind() + " " + i.getMetadata().getName() + " repository: "
+                                + existing.getSpec().getDockerImageRepository());
+                        continue;
+                    }
+                }
+                client.resource(i).createOrReplace();
+                LOG.info("Applied: " + i.getKind() + " " + i.getMetadata().getName());
+            }
+            OpenshiftUtils.waitForImageStreamTags(client, buildResources, 2, TimeUnit.MINUTES);
+
+        } catch (KubernetesClientException e) {
+            KubernetesClientErrorHanlder.handle(e);
+        }
+    }
+
+    private static void openshiftBuild(OpenShiftClient client, List<HasMetadata> buildResources, File binaryFile,
+            OpenshiftConfig openshiftConfig) {
+        distinct(buildResources).stream().filter(i -> i instanceof BuildConfig).map(i -> (BuildConfig) i)
+                .forEach(bc -> openshiftBuild(client, bc, binaryFile, openshiftConfig));
+    }
+
+    /**
+     * Performs the binary build of the specified {@link BuildConfig} with the given
+     * binary input.
+     *
+     * @param client The openshift client instance
+     * @param buildConfig The build config
+     * @param binaryFile The binary file
+     * @param openshiftConfig The openshift configuration
+     */
+    private static void openshiftBuild(OpenShiftClient client, BuildConfig buildConfig, File binaryFile,
+            OpenshiftConfig openshiftConfig) {
+        Build build;
+        try {
+            build = client.buildConfigs().withName(buildConfig.getMetadata().getName())
+                    .instantiateBinary()
+                    .withTimeoutInMillis(openshiftConfig.buildTimeout.toMillis())
+                    .fromFile(binaryFile);
+        } catch (Exception e) {
+            Optional<Build> running = runningBuildsOf(client, buildConfig).findFirst();
+            if (running.isPresent()) {
+                LOG.warn("An exception: '" + e.getMessage()
+                        + " ' occurred while instantiating the build, however the build has been started.");
+                build = running.get();
+            } else {
+                throw openshiftException(e);
+            }
+        }
+
+        while (isNew(build) || isPending(build) || isRunning(build)) {
+            Build updated = client.builds().withName(build.getMetadata().getName()).get();
+            if (updated == null) {
+                throw new IllegalStateException("Build:" + build.getMetadata().getName() + " is no longer present!");
+            } else if (updated.getStatus() == null) {
+                throw new IllegalStateException("Build:" + build.getMetadata().getName() + " has no status!");
+            } else if (isNew(updated) || isPending(updated) || isRunning(updated)) {
+                build = updated;
+                final String buildName = build.getMetadata().getName();
+                try (LogWatch w = client.builds().withName(build.getMetadata().getName()).withPrettyOutput().watchLog();
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(w.getOutput()))) {
+                    watchBuild(client, openshiftConfig, buildName, w);
+                    for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+                        LOG.info(line);
+                    }
+                } catch (IOException e) {
+                    throw openshiftException(e);
+                }
+            } else if (isComplete(updated)) {
+                return;
+            } else if (isCancelled(updated)) {
+                throw new IllegalStateException("Build:" + build.getMetadata().getName() + " cancelled!");
+            } else if (isFailed(updated)) {
+                throw new IllegalStateException(
+                        "Build:" + build.getMetadata().getName() + " failed! " + updated.getStatus().getMessage());
+            } else if (isError(updated)) {
+                throw new IllegalStateException(
+                        "Build:" + build.getMetadata().getName() + " encountered error! " + updated.getStatus().getMessage());
+            }
+        }
+    }
+
+    private static void watchBuild(OpenShiftClient client, OpenshiftConfig openshiftConfig, String buildName, Closeable watch) {
+        Executor executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+            try {
+                client.builds().withName(buildName).waitUntilCondition(b -> !RUNNING.equalsIgnoreCase(b.getStatus().getPhase()),
+                        openshiftConfig.buildTimeout.toMillis(), TimeUnit.MILLISECONDS);
+            } catch (InterruptedException e) {
+                openshiftException(e);
+            } finally {
+                try {
+                    watch.close();
+                } catch (IOException e) {
+                    LOG.debug("Error closing log reader.");
+                }
+            }
+        });
+    }
+
+    public static Predicate<HasMetadata> distictByResourceKey() {
+        Map<Object, Boolean> seen = new ConcurrentHashMap<>();
+        return t -> seen.putIfAbsent(t.getApiVersion() + "/" + t.getKind() + ":" + t.getMetadata().getName(),
+                Boolean.TRUE) == null;
+    }
+
+    private static Collection<HasMetadata> distinct(Collection<HasMetadata> resources) {
+        return resources.stream().filter(distictByResourceKey()).collect(Collectors.toList());
+    }
+
+    private static List<Build> buildsOf(OpenShiftClient client, BuildConfig config) {
+        return client.builds().withLabel(BUILD_CONFIG_NAME, config.getMetadata().getName()).list().getItems();
+    }
+
+    private static Stream<Build> runningBuildsOf(OpenShiftClient client, BuildConfig config) {
+        return buildsOf(client, config).stream().filter(b -> RUNNING.equalsIgnoreCase(b.getStatus().getPhase()));
+    }
+
+    private static RuntimeException openshiftException(Throwable t) {
+        if (t instanceof KubernetesClientException) {
+            KubernetesClientErrorHanlder.handle((KubernetesClientException) t);
+        }
+        return new RuntimeException("Execution of openshift build failed. See build output for more details", t);
+    }
+
+    // visible for test
+    static String concatUnixPaths(String... elements) {
+        StringBuilder result = new StringBuilder();
+        for (String element : elements) {
+            if (element.endsWith("/")) {
+                element = element.substring(0, element.length() - 1);
+            }
+            if (element.isEmpty()) {
+                continue;
+            }
+            if (!element.startsWith("/") && result.length() > 0) {
+                result.append('/');
+            }
+            result.append(element);
+        }
+        return result.toString();
+    }
+
+    static boolean isNew(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.New.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+    static boolean isPending(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.Pending.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+    static boolean isRunning(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.Running.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+    static boolean isComplete(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.Complete.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+    static boolean isFailed(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.Failed.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+    static boolean isError(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.Error.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+    static boolean isCancelled(Build build) {
+        return build != null && build.getStatus() != null
+                && BuildStatus.Cancelled.name().equalsIgnoreCase(build.getStatus().getPhase());
+    }
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java
new file mode 100644
index 0000000000000..0d3da3115e93c
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/OpenshiftUtils.java
@@ -0,0 +1,145 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.dekorate.deps.kubernetes.api.model.HasMetadata;
+import io.dekorate.deps.kubernetes.api.model.KubernetesListBuilder;
+import io.dekorate.deps.kubernetes.api.model.ObjectReference;
+import io.dekorate.deps.openshift.api.model.ImageStreamTag;
+import io.dekorate.deps.openshift.api.model.SourceBuildStrategyFluent;
+import io.dekorate.deps.openshift.client.OpenShiftClient;
+import io.dekorate.kubernetes.decorator.Decorator;
+
+/**
+ * This class is copied from Dekorate, with the difference that the {@code waitForImageStreamTags} method
+ * take a client as the argument
+ *
+ * TODO: Update dekorate to take the client as an argument and then remove this class
+ */
+public class OpenshiftUtils {
+
+    /**
+     * Wait for the references ImageStreamTags to become available.
+     *
+     * @param client The openshift client used to check the status of the ImageStream
+     * @param items A list of items, possibly referencing image stream tags.
+     * @param amount The max amount of time to wait.
+     * @param timeUnit The time unit of the time to wait.
+     * @return True if the items became available false otherwise.
+     */
+    public static boolean waitForImageStreamTags(OpenShiftClient client, Collection<HasMetadata> items, long amount,
+            TimeUnit timeUnit) {
+        if (items == null || items.isEmpty()) {
+            return true;
+        }
+        final List<String> tags = new ArrayList<>();
+        new KubernetesListBuilder()
+                .withItems(new ArrayList<>(items))
+                .accept(new Decorator<SourceBuildStrategyFluent>() {
+                    @Override
+                    public void visit(SourceBuildStrategyFluent strategy) {
+                        ObjectReference from = strategy.buildFrom();
+                        if (from.getKind().equals("ImageStreamTag")) {
+                            tags.add(from.getName());
+                        }
+                    }
+                }).build();
+
+        boolean tagsMissing = true;
+        long started = System.currentTimeMillis();
+        long elapsed = 0;
+
+        while (tagsMissing && elapsed < timeUnit.toMillis(amount) && !Thread.interrupted()) {
+            tagsMissing = false;
+            for (String tag : tags) {
+                ImageStreamTag t = client.imageStreamTags().withName(tag).get();
+                if (t == null) {
+                    tagsMissing = true;
+                }
+            }
+
+            if (tagsMissing) {
+                try {
+                    Thread.sleep(1000);
+                    elapsed = System.currentTimeMillis() - started;
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+        return !tagsMissing;
+    }
+
+    /**
+     * Merges {@link OpenshiftConfig} with {@link S2iConfig} prioritizing in the former.
+     * 
+     * @param openshiftConfig the Openshift config
+     * @param s2iConfig the s2i config
+     * @param an instance of {@link OpenshiftConfig} with the merged configuration.
+     */
+    public static OpenshiftConfig mergeConfig(OpenshiftConfig openshiftConfig, S2iConfig s2iConfig) {
+        OpenshiftConfig result = openshiftConfig != null ? openshiftConfig : new OpenshiftConfig();
+        if (s2iConfig == null) {
+            return result;
+        }
+
+        Config config = ConfigProvider.getConfig();
+        Set<String> properties = StreamSupport.stream(config.getPropertyNames().spliterator(), false)
+                .filter(s -> s.startsWith("quarkus.s2i.") || s.startsWith("quarkus.openshift."))
+                .collect(Collectors.toSet());
+
+        boolean hasS2iBaseJvmImage = properties.contains("quarkus.s2i.base-jvm-image");
+        boolean hasS2iBaseNativeImage = properties.contains("quarkus.s2i.base-native-image");
+        boolean hasS2iJvmArguments = properties.contains("quarkus.s2i.jvm-arguments");
+        boolean hasS2iNativeArguments = properties.contains("quarkus.s2i.native-arguments");
+        boolean hasS2iJarDirectory = properties.contains("quarkus.s2i.jar-directory");
+        boolean hasS2iJarFileName = properties.contains("quarkus.s2i.jar-file-name");
+        boolean hasS2iNativeBinaryDirectory = properties.contains("quarkus.s2i.native-binary-directory");
+        boolean hasS2iNativeBinaryFileName = properties.contains("quarkus.s2i.native-binary-file-name");
+        boolean hasS2iBuildTimeout = properties.contains("quarkus.s2i.native-binary-file-name");
+
+        boolean hasOpenshiftBaseJvmImage = properties.contains("quarkus.openshift.base-jvm-image");
+        boolean hasOpenshiftBaseNativeImage = properties.contains("quarkus.openshift.base-native-image");
+        boolean hasOpenshiftJvmArguments = properties.contains("quarkus.openshift.jvm-arguments");
+        boolean hasOpenshiftNativeArguments = properties.contains("quarkus.openshift.native-arguments");
+        boolean hasOpenshiftJarDirectory = properties.contains("quarkus.openshift.jar-directory");
+        boolean hasOpenshiftJarFileName = properties.contains("quarkus.openshift.jar-file-name");
+        boolean hasOpenshiftNativeBinaryDirectory = properties.contains("quarkus.openshift.native-binary-directory");
+        boolean hasOpenshiftNativeBinaryFileName = properties.contains("quarkus.openshift.native-binary-file-name");
+        boolean hasOpenshiftBuildTimeout = properties.contains("quarkus.openshift.native-binary-file-name");
+
+        result.baseJvmImage = hasS2iBaseJvmImage && !hasOpenshiftBaseJvmImage ? s2iConfig.baseJvmImage
+                : openshiftConfig.baseJvmImage;
+        result.baseNativeImage = hasS2iBaseNativeImage && !hasOpenshiftBaseNativeImage ? s2iConfig.baseNativeImage
+                : openshiftConfig.baseNativeImage;
+        result.jvmArguments = hasS2iJvmArguments && !hasOpenshiftJvmArguments ? s2iConfig.jvmArguments
+                : openshiftConfig.jvmArguments;
+        result.nativeArguments = hasS2iNativeArguments && !hasOpenshiftNativeArguments ? s2iConfig.nativeArguments
+                : openshiftConfig.nativeArguments;
+        result.jarDirectory = hasS2iJarDirectory && !hasOpenshiftJarDirectory ? Optional.of(s2iConfig.jarDirectory)
+                : openshiftConfig.jarDirectory;
+        result.jarFileName = hasS2iJarFileName && !hasOpenshiftJarFileName ? s2iConfig.jarFileName
+                : openshiftConfig.jarFileName;
+        result.nativeBinaryDirectory = hasS2iNativeBinaryDirectory && !hasOpenshiftNativeBinaryDirectory
+                ? Optional.of(s2iConfig.nativeBinaryDirectory)
+                : openshiftConfig.nativeBinaryDirectory;
+        result.nativeBinaryFileName = hasS2iNativeBinaryFileName && !hasOpenshiftNativeBinaryFileName
+                ? s2iConfig.nativeBinaryFileName
+                : openshiftConfig.nativeBinaryFileName;
+        result.buildTimeout = hasS2iBuildTimeout && !hasOpenshiftBuildTimeout ? s2iConfig.buildTimeout
+                : openshiftConfig.buildTimeout;
+        result.buildStrategy = openshiftConfig.buildStrategy;
+
+        return result;
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/RemoveEnvVarDecorator.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/RemoveEnvVarDecorator.java
new file mode 100644
index 0000000000000..0864977fbad7e
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/RemoveEnvVarDecorator.java
@@ -0,0 +1,58 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import io.dekorate.deps.kubernetes.api.model.ContainerFluent;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.kubernetes.decorator.Decorator;
+import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
+
+public class RemoveEnvVarDecorator extends ApplicationContainerDecorator<ContainerFluent<?>> {
+
+    private final String envVarName;
+
+    public RemoveEnvVarDecorator(String envVarName) {
+        this(ANY, envVarName);
+    }
+
+    public RemoveEnvVarDecorator(String name, String envVarName) {
+        super(name);
+        this.envVarName = envVarName;
+    }
+
+    public void andThenVisit(ContainerFluent<?> container) {
+        container.removeMatchingFromEnv(e -> e.getName().equals(envVarName));
+    }
+
+    public String getEnvVarKey() {
+        return this.envVarName;
+    }
+
+    public Class<? extends Decorator>[] after() {
+        return new Class[] { ResourceProvidingDecorator.class, AddEnvVarDecorator.class };
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((envVarName == null) ? 0 : envVarName.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        RemoveEnvVarDecorator other = (RemoveEnvVarDecorator) obj;
+        if (envVarName == null) {
+            if (other.envVarName != null)
+                return false;
+        } else if (!envVarName.equals(other.envVarName))
+            return false;
+        return true;
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java
new file mode 100644
index 0000000000000..138292aaf28a8
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseJavaImage.java
@@ -0,0 +1,79 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.container.image.deployment.util.ImageUtil;
+
+public enum S2iBaseJavaImage {
+
+    //We only compare `repositories` so registries and tags are stripped
+    FABRIC8("fabric8/s2i-java:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJDK_8_RHEL7("redhat-openjdk-18/openjdk18-openshift:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR",
+            "JAVA_CLASSPATH", "JAVA_OPTIONS"),
+    OPENJDK_8_RHEL8("openjdk/openjdk-8-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJDK_11_RHEL7("openjdk/openjdk-11-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJDK_11_RHEL8("openjdk/openjdk-11-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJ9_8_RHEL7("openj9/openj9-8-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJ9_8_RHEL8("openj9/openj9-8-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJ9_11_RHEL7("openj9/openj9-11-rhel7:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS"),
+    OPENJ9_11_RHEL8("openj9/openj9-11-rhel8:latest", "JAVA_MAIN_CLASS", "JAVA_APP_JAR", "JAVA_LIB_DIR", "JAVA_CLASSPATH",
+            "JAVA_OPTIONS");
+
+    private final String image;
+    private final String javaMainClassEnvVar;
+    private final String jarEnvVar;
+    private final String jarLibEnvVar;
+    private final String classpathEnvVar;
+    private final String jvmOptionsEnvVar;
+
+    public static Optional<S2iBaseJavaImage> findMatching(String image) {
+        for (S2iBaseJavaImage candidate : S2iBaseJavaImage.values()) {
+            if (ImageUtil.getRepository(candidate.getImage()).equals(ImageUtil.getRepository(image))) {
+                return Optional.of(candidate);
+            }
+        }
+        return Optional.empty();
+    }
+
+    private S2iBaseJavaImage(String image, String javaMainClassEnvVar, String jarEnvVar, String jarLibEnvVar,
+            String classpathEnvVar, String jvmOptionsEnvVar) {
+        this.image = image;
+        this.javaMainClassEnvVar = javaMainClassEnvVar;
+        this.jarEnvVar = jarEnvVar;
+        this.jarLibEnvVar = jarLibEnvVar;
+        this.classpathEnvVar = classpathEnvVar;
+        this.jvmOptionsEnvVar = jvmOptionsEnvVar;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public String getJavaMainClassEnvVar() {
+        return javaMainClassEnvVar;
+    }
+
+    public String getJvmOptionsEnvVar() {
+        return jvmOptionsEnvVar;
+    }
+
+    public String getClasspathEnvVar() {
+        return classpathEnvVar;
+    }
+
+    public String getJarLibEnvVar() {
+        return jarLibEnvVar;
+    }
+
+    public String getJarEnvVar() {
+        return jarEnvVar;
+    }
+
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseNativeImage.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseNativeImage.java
new file mode 100644
index 0000000000000..ee2f4f937b0a9
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iBaseNativeImage.java
@@ -0,0 +1,49 @@
+
+package io.quarkus.container.image.openshift.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.container.image.deployment.util.ImageUtil;
+
+public enum S2iBaseNativeImage {
+
+    //We only compare `repositories` so registries and tags are stripped
+    QUARKUS("quarkus/ubi-quarkus-native-binary-s2i:latest", "application", "QUARKUS_HOME", "QUARKUS_OPTS");
+
+    private final String image;
+    private final String fixedNativeBinaryName;
+    private final String homeDirEnvVar;
+    private final String optsEnvVar;
+
+    public static Optional<S2iBaseNativeImage> findMatching(String image) {
+        for (S2iBaseNativeImage candidate : S2iBaseNativeImage.values()) {
+            if (ImageUtil.getRepository(candidate.getImage()).equals(ImageUtil.getRepository(image))) {
+                return Optional.of(candidate);
+            }
+        }
+        return Optional.empty();
+    }
+
+    private S2iBaseNativeImage(String image, String fixedNativeBinaryName, String homeDirEnvVar, String optsEnvVar) {
+        this.image = image;
+        this.fixedNativeBinaryName = fixedNativeBinaryName;
+        this.homeDirEnvVar = homeDirEnvVar;
+        this.optsEnvVar = optsEnvVar;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public String getFixedNativeNinaryName() {
+        return this.fixedNativeBinaryName;
+    }
+
+    public String getHomeDirEnvVar() {
+        return homeDirEnvVar;
+    }
+
+    public String getOptsEnvVar() {
+        return optsEnvVar;
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java
new file mode 100644
index 0000000000000..2f961800e8238
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java
@@ -0,0 +1,93 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+public class S2iConfig {
+
+    public static final String DEFAULT_BASE_JVM_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11";
+    public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:1.0";
+    public static final String DEFAULT_NATIVE_TARGET_FILENAME = "application";
+
+    /**
+     * The base image to be used when a container image is being produced for the jar build
+     */
+    @ConfigItem(defaultValue = DEFAULT_BASE_JVM_IMAGE)
+    public String baseJvmImage;
+
+    /**
+     * The base image to be used when a container image is being produced for the native binary build
+     */
+    @ConfigItem(defaultValue = DEFAULT_BASE_NATIVE_IMAGE)
+    public String baseNativeImage;
+
+    /**
+     * Additional JVM arguments to pass to the JVM when starting the application
+     */
+    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0,-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
+    public List<String> jvmArguments;
+
+    /**
+     * Additional arguments to pass when starting the native application
+     */
+    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0")
+    public List<String> nativeArguments;
+
+    /**
+     * The directory where the jar is added during the assemble phase.
+     * This is dependent on the S2I image and should be supplied if a non default image is used.
+     */
+    @ConfigItem(defaultValue = "/deployments/target/")
+    public String jarDirectory;
+
+    /**
+     * The resulting filename of the jar in the S2I image.
+     * This option may be used if the selected S2I image uses a fixed name for the jar.
+     */
+    @ConfigItem
+    public Optional<String> jarFileName;
+
+    /**
+     * The directory where the native binary is added during the assemble phase.
+     * This is dependent on the S2I image and should be supplied if a non-default image is used.
+     */
+    @ConfigItem(defaultValue = "/home/quarkus/")
+    public String nativeBinaryDirectory;
+
+    /**
+     * The resulting filename of the native binary in the S2I image.
+     * This option may be used if the selected S2I image uses a fixed name for the native binary.
+     */
+    @ConfigItem
+    public Optional<String> nativeBinaryFileName;
+
+    /**
+     * The build timeout.
+     */
+    @ConfigItem(defaultValue = "PT5M")
+    Duration buildTimeout;
+
+    /**
+     * Check if baseJvmImage is the default
+     *
+     * @returns true if baseJvmImage is the default
+     */
+    public boolean hasDefaultBaseJvmImage() {
+        return baseJvmImage.equals(DEFAULT_BASE_JVM_IMAGE);
+    }
+
+    /**
+     * Check if baseNativeImage is the default
+     *
+     * @returns true if baseNativeImage is the default
+     */
+    public boolean hasDefaultBaseNativeImage() {
+        return baseNativeImage.equals(DEFAULT_BASE_NATIVE_IMAGE);
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/deployment/src/test/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessorTest.java b/extensions/container-image/container-image-openshift/deployment/src/test/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessorTest.java
new file mode 100644
index 0000000000000..2437794a1010f
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/deployment/src/test/java/io/quarkus/container/image/openshift/deployment/OpenshiftProcessorTest.java
@@ -0,0 +1,56 @@
+package io.quarkus.container.image.openshift.deployment;
+
+import static io.quarkus.container.image.openshift.deployment.OpenshiftProcessor.concatUnixPaths;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class OpenshiftProcessorTest {
+    @Test
+    public void concatUnixPathsTest() {
+        assertEquals("foo/bar", concatUnixPaths("foo", "bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "/bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo", "/bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo", "bar/"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "bar/"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "/bar/"));
+        assertEquals("foo/bar", concatUnixPaths("foo", "/bar/"));
+
+        assertEquals("foo/bar", concatUnixPaths("foo", "/", "bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "/", "bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "/", "/bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo", "/", "/bar"));
+        assertEquals("foo/bar", concatUnixPaths("foo", "/", "bar/"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "/", "bar/"));
+        assertEquals("foo/bar", concatUnixPaths("foo/", "/", "/bar/"));
+        assertEquals("foo/bar", concatUnixPaths("foo", "/", "/bar/"));
+
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "bar/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "bar/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/bar/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/bar/"));
+
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/", "bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/", "bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/", "/bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/", "/bar"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/", "bar/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/", "bar/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/", "/bar/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/", "/bar/"));
+
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "bar", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "bar", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/bar", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/bar", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "bar/", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "bar/", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo/", "/bar/", "/"));
+        assertEquals("/foo/bar", concatUnixPaths("/foo", "/bar/", "/"));
+    }
+}
diff --git a/extensions/container-image/container-image-openshift/pom.xml b/extensions/container-image/container-image-openshift/pom.xml
new file mode 100644
index 0000000000000..eb7c4c2dc81f0
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-container-image-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-container-image-openshift-parent</artifactId>
+    <name>Quarkus - Container Image - OpenShift - Parent</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/container-image/container-image-openshift/runtime/pom.xml b/extensions/container-image/container-image-openshift/runtime/pom.xml
new file mode 100644
index 0000000000000..b14f1a1a04495
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/runtime/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-container-image-openshift-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-container-image-openshift</artifactId>
+    <name>Quarkus - Container Image - OpenShift</name>
+    <description>Build container images of your application using OpenShift</description>
+
+    <dependencies>
+        <!-- We need the config to be on the runtime classpath because it's referenced from the config generation -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-internal</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..b68bef7b3ee46
--- /dev/null
+++ b/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,10 @@
+---
+name: "Container Image OpenShift"
+metadata:
+  keywords:
+    - "openshift"
+    - "container"
+    - "image"
+  categories:
+    - "cloud"
+  status: "preview"
diff --git a/extensions/container-image/container-image-s2i/deployment/pom.xml b/extensions/container-image/container-image-s2i/deployment/pom.xml
index c0fa549a1635e..549ed4feea96f 100644
--- a/extensions/container-image/container-image-s2i/deployment/pom.xml
+++ b/extensions/container-image/container-image-s2i/deployment/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>quarkus-container-image-s2i-deployment</artifactId>
-    <name>Quarkus - Container - Image - S2i - Deployment</name>
+    <name>Quarkus - Container Image - S2I - Deployment</name>
 
     <dependencies>
         <dependency>
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/RemoveEnvVarDecorator.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/RemoveEnvVarDecorator.java
new file mode 100644
index 0000000000000..4f9eb0ee4a837
--- /dev/null
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/RemoveEnvVarDecorator.java
@@ -0,0 +1,58 @@
+package io.quarkus.container.image.s2i;
+
+import io.dekorate.deps.kubernetes.api.model.ContainerFluent;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.kubernetes.decorator.Decorator;
+import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
+
+public class RemoveEnvVarDecorator extends ApplicationContainerDecorator<ContainerFluent<?>> {
+
+    private final String envVarName;
+
+    public RemoveEnvVarDecorator(String envVarName) {
+        this(ANY, envVarName);
+    }
+
+    public RemoveEnvVarDecorator(String name, String envVarName) {
+        super(name);
+        this.envVarName = envVarName;
+    }
+
+    public void andThenVisit(ContainerFluent<?> container) {
+        container.removeMatchingFromEnv(e -> e.getName().equals(envVarName));
+    }
+
+    public String getEnvVarKey() {
+        return this.envVarName;
+    }
+
+    public Class<? extends Decorator>[] after() {
+        return new Class[] { ResourceProvidingDecorator.class, AddEnvVarDecorator.class };
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((envVarName == null) ? 0 : envVarName.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        RemoveEnvVarDecorator other = (RemoveEnvVarDecorator) obj;
+        if (envVarName == null) {
+            if (other.envVarName != null)
+                return false;
+        } else if (!envVarName.equals(other.envVarName))
+            return false;
+        return true;
+    }
+}
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ApplyDockerfileToBuildConfigDecorator.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ApplyDockerfileToBuildConfigDecorator.java
new file mode 100644
index 0000000000000..59ec79acc0779
--- /dev/null
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/ApplyDockerfileToBuildConfigDecorator.java
@@ -0,0 +1,37 @@
+
+package io.quarkus.container.image.s2i.deployment;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+
+import io.dekorate.deps.kubernetes.api.model.ObjectMeta;
+import io.dekorate.deps.openshift.api.model.BuildConfigSpecFluent;
+import io.dekorate.kubernetes.decorator.NamedResourceDecorator;
+import io.quarkus.deployment.util.FileUtil;
+
+public class ApplyDockerfileToBuildConfigDecorator extends NamedResourceDecorator<BuildConfigSpecFluent<?>> {
+
+    private final Path pathToDockerfile;
+
+    public ApplyDockerfileToBuildConfigDecorator(String name, Path pathToDockerfile) {
+        super(name);
+        this.pathToDockerfile = pathToDockerfile;
+    }
+
+    @Override
+    public void andThenVisit(final BuildConfigSpecFluent<?> spec, ObjectMeta meta) {
+        try (InputStream is = new FileInputStream(pathToDockerfile.toFile())) {
+            spec.withNewSource()
+                    .withDockerfile(new String(FileUtil.readFileContents(is)))
+                    .endSource()
+                    .withNewStrategy()
+                    .withNewDockerStrategy()
+                    .endDockerStrategy()
+                    .endStrategy();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/BuildStrategy.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/BuildStrategy.java
new file mode 100644
index 0000000000000..5d5c5ed0a368e
--- /dev/null
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/BuildStrategy.java
@@ -0,0 +1,9 @@
+
+package io.quarkus.container.image.s2i.deployment;
+
+public enum BuildStrategy {
+
+    BINARY,
+    DOCKER;
+
+}
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/PackageUtil.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/PackageUtil.java
new file mode 100644
index 0000000000000..1b6d1b067b7db
--- /dev/null
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/PackageUtil.java
@@ -0,0 +1,216 @@
+
+package io.quarkus.container.image.s2i.deployment;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jsoup.helper.StringUtil;
+
+import io.dekorate.DekorateException;
+import io.dekorate.deps.commons.compress.archivers.tar.TarArchiveEntry;
+import io.dekorate.deps.commons.compress.archivers.tar.TarArchiveOutputStream;
+
+public class PackageUtil {
+
+    private static final String DEFAULT_DOCKERFILE = "Dockerfile";
+    private static final String DOCKER_IGNORE = ".dockerignore";
+
+    protected static final String DEFAULT_TEMP_DIR = System.getProperty("java.io.tmpdir", "/tmp");
+    protected static final String DOCKER_PREFIX = "docker-";
+    protected static final String BZIP2_SUFFIX = ".tar.bzip2";
+
+    private static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    public static File packageFile(String path) {
+        return packageFile(path, null);
+    }
+
+    public static File packageFile(String path, String base) {
+        try {
+            final Path root = Paths.get(path).getParent();
+            File tempFile = Files.createTempFile(Paths.get(DEFAULT_TEMP_DIR), DOCKER_PREFIX, BZIP2_SUFFIX).toFile();
+            try (final TarArchiveOutputStream tout = buildTarStream(tempFile)) {
+                Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                        String absolutePath = file.toAbsolutePath().toString();
+                        if (!path.equals(absolutePath)) {
+                            return FileVisitResult.CONTINUE;
+                        }
+                        final Path relativePath = root.relativize(file);
+                        final boolean hasBasePath = !StringUtil.isBlank(base);
+                        final TarArchiveEntry entry = hasBasePath
+                                ? new TarArchiveEntry(base + File.separator + file.toFile())
+                                : new TarArchiveEntry(file.toFile());
+
+                        entry.setName(hasBasePath ? base + File.separator + relativePath.toString() : relativePath.toString());
+                        if (file.toFile().canExecute()) {
+                            entry.setMode(entry.getMode() | 0755);
+                        }
+                        entry.setSize(attrs.size());
+                        putTarEntry(tout, entry, file);
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+                tout.flush();
+            }
+            return tempFile;
+
+        } catch (IOException e) {
+            throw DekorateException.launderThrowable(e);
+        }
+    }
+
+    public static File packageFile(Path root, Path... additional) {
+        return packageFile(root, null, additional);
+    }
+
+    public static File packageFile(Path root, String base, Path... additional) {
+        try {
+            final Set<String> includes = Arrays
+                    .stream(additional)
+                    .map(p -> p.toAbsolutePath().toString())
+                    .collect(Collectors.toSet());
+
+            File tempFile = Files.createTempFile(Paths.get(DEFAULT_TEMP_DIR), DOCKER_PREFIX, BZIP2_SUFFIX).toFile();
+            try (final TarArchiveOutputStream tout = buildTarStream(tempFile)) {
+                Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                        String absolutePath = file.toAbsolutePath().toString();
+                        if (!shouldInclude(absolutePath, includes)) {
+                            return FileVisitResult.CONTINUE;
+                        }
+                        final Path relativePath = root.relativize(file);
+                        final boolean hasBasePath = !StringUtil.isBlank(base);
+                        final TarArchiveEntry entry = hasBasePath
+                                ? new TarArchiveEntry(base + File.separator + file.toFile())
+                                : new TarArchiveEntry(file.toFile());
+
+                        entry.setName(hasBasePath ? base + File.separator + relativePath.toString() : relativePath.toString());
+                        if (file.toFile().canExecute()) {
+                            entry.setMode(entry.getMode() | 0755);
+                        }
+                        entry.setSize(attrs.size());
+                        putTarEntry(tout, entry, file);
+                        return FileVisitResult.CONTINUE;
+                    }
+                });
+                tout.flush();
+            }
+            return tempFile;
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void putTarEntry(TarArchiveOutputStream tarArchiveOutputStream, TarArchiveEntry tarArchiveEntry,
+            Path inputPath) throws IOException {
+        tarArchiveEntry.setSize(Files.size(inputPath));
+        tarArchiveOutputStream.putArchiveEntry(tarArchiveEntry);
+        Files.copy(inputPath, tarArchiveOutputStream);
+        tarArchiveOutputStream.closeArchiveEntry();
+    }
+
+    public static TarArchiveOutputStream buildTarStream(File outputPath) throws IOException {
+        FileOutputStream fout = new FileOutputStream(outputPath);
+        BufferedOutputStream bout = new BufferedOutputStream(fout);
+        //BZip2CompressorOutputStream bzout = new BZip2CompressorOutputStream(bout);
+        TarArchiveOutputStream stream = new TarArchiveOutputStream(bout);
+        stream.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+        return stream;
+    }
+
+    public static void tar(Path inputPath, Path outputPath) throws IOException {
+        if (!Files.exists(inputPath)) {
+            throw new FileNotFoundException("File not found " + inputPath);
+        }
+
+        try (TarArchiveOutputStream tarArchiveOutputStream = buildTarStream(outputPath.toFile())) {
+            if (!Files.isDirectory(inputPath)) {
+                TarArchiveEntry tarEntry = new TarArchiveEntry(inputPath.toFile().getName());
+                if (inputPath.toFile().canExecute()) {
+                    tarEntry.setMode(tarEntry.getMode() | 0755);
+                }
+                putTarEntry(tarArchiveOutputStream, tarEntry, inputPath);
+            } else {
+                Files.walkFileTree(inputPath,
+                        new TarDirWalker(inputPath, tarArchiveOutputStream));
+            }
+            tarArchiveOutputStream.flush();
+        }
+    }
+
+    private static boolean shouldInclude(String candidate, String path) {
+        return candidate.equals(path) || candidate.startsWith(path);
+    }
+
+    private static boolean shouldInclude(String candidate, Set<String> paths) {
+        for (String path : paths) {
+            if (shouldInclude(candidate, path)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static class TarDirWalker extends SimpleFileVisitor<Path> {
+        private Path basePath;
+        private TarArchiveOutputStream tarArchiveOutputStream;
+
+        public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream) {
+            this.basePath = basePath;
+            this.tarArchiveOutputStream = tarArchiveOutputStream;
+        }
+
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+            if (!dir.equals(basePath)) {
+                tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(basePath.relativize(dir).toFile()));
+                tarArchiveOutputStream.closeArchiveEntry();
+            }
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+            TarArchiveEntry tarEntry = new TarArchiveEntry(basePath.relativize(file).toFile());
+            tarEntry.setSize(attrs.size());
+            if (file.toFile().canExecute()) {
+                tarEntry.setMode(tarEntry.getMode() | 0755);
+            }
+            putTarEntry(tarArchiveOutputStream, tarEntry, file);
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+            tarArchiveOutputStream.close();
+            throw exc;
+        }
+    }
+}
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iConfig.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iConfig.java
index fef81a7b125ba..8664e350f9d48 100644
--- a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iConfig.java
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iConfig.java
@@ -11,7 +11,7 @@
 @ConfigRoot(phase = ConfigPhase.BUILD_TIME)
 public class S2iConfig {
 
-    public static final String DEFAULT_BASE_JVM_IMAGE = "fabric8/s2i-java:2.3";
+    public static final String DEFAULT_BASE_JVM_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11";
     public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:1.0";
     public static final String DEFAULT_NATIVE_TARGET_FILENAME = "application";
 
@@ -30,14 +30,14 @@ public class S2iConfig {
     /**
      * Additional JVM arguments to pass to the JVM when starting the application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0,-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
+    @ConfigItem(defaultValue = "-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
     public List<String> jvmArguments;
 
     /**
      * Additional arguments to pass when starting the native application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0")
-    public List<String> nativeArguments;
+    @ConfigItem
+    public Optional<List<String>> nativeArguments;
 
     /**
      * The directory where the jar is added during the assemble phase.
@@ -82,4 +82,13 @@ public boolean hasDefaultBaseJvmImage() {
         return baseJvmImage.equals(DEFAULT_BASE_JVM_IMAGE);
     }
 
+    /**
+     * Check if baseNativeImage is the default
+     *
+     * @returns true if baseNativeImage is the default
+     */
+    public boolean hasDefaultBaseNativeImage() {
+        return baseNativeImage.equals(DEFAULT_BASE_NATIVE_IMAGE);
+    }
+
 }
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
index 14f672468fd91..4995a96773945 100644
--- a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
@@ -1,10 +1,21 @@
 package io.quarkus.container.image.s2i.deployment;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -25,26 +36,30 @@
 import io.dekorate.deps.openshift.api.model.ImageStream;
 import io.dekorate.deps.openshift.client.OpenShiftClient;
 import io.dekorate.utils.Clients;
-import io.dekorate.utils.Packaging;
 import io.dekorate.utils.Serialization;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.quarkus.bootstrap.model.AppDependency;
 import io.quarkus.container.image.deployment.ContainerImageConfig;
 import io.quarkus.container.image.deployment.util.ImageUtil;
+import io.quarkus.container.spi.AvailableContainerImageExtensionBuildItem;
 import io.quarkus.container.spi.BaseImageInfoBuildItem;
 import io.quarkus.container.spi.ContainerImageBuildRequestBuildItem;
 import io.quarkus.container.spi.ContainerImageInfoBuildItem;
 import io.quarkus.container.spi.ContainerImagePushRequestBuildItem;
 import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsNormalNotRemoteDev;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ArchiveRootBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.GeneratedFileSystemResourceBuildItem;
 import io.quarkus.deployment.pkg.PackageConfig;
-import io.quarkus.deployment.pkg.builditem.*;
+import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.deployment.pkg.builditem.JarBuildItem;
+import io.quarkus.deployment.pkg.builditem.NativeImageBuildItem;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeBuild;
 import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHanlder;
 import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem;
@@ -60,12 +75,17 @@ public class S2iProcessor {
 
     private static final Logger LOG = Logger.getLogger(S2iProcessor.class);
 
+    @BuildStep
+    public AvailableContainerImageExtensionBuildItem availability() {
+        return new AvailableContainerImageExtensionBuildItem(S2I);
+    }
+
     @BuildStep(onlyIf = S2iBuild.class)
     public CapabilityBuildItem capability() {
         return new CapabilityBuildItem(Capability.CONTAINER_IMAGE_S2I);
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, S2iBuild.class }, onlyIfNot = NativeBuild.class)
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, S2iBuild.class }, onlyIfNot = NativeBuild.class)
     public void s2iRequirementsJvm(S2iConfig s2iConfig,
             CurateOutcomeBuildItem curateOutcomeBuildItem,
             OutputTargetBuildItem out,
@@ -92,6 +112,7 @@ public void s2iRequirementsJvm(S2iConfig s2iConfig,
 
         builderImageProducer.produce(new BaseImageInfoBuildItem(s2iConfig.baseJvmImage));
         Optional<S2iBaseJavaImage> baseImage = S2iBaseJavaImage.findMatching(s2iConfig.baseJvmImage);
+
         baseImage.ifPresent(b -> {
             envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJarEnvVar(), pathToJar, OPENSHIFT));
             envProducer.produce(KubernetesEnvBuildItem.createSimpleVar(b.getJarLibEnvVar(),
@@ -106,7 +127,7 @@ public void s2iRequirementsJvm(S2iConfig s2iConfig,
         }
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, S2iBuild.class, NativeBuild.class })
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, S2iBuild.class, NativeBuild.class })
     public void s2iRequirementsNative(S2iConfig s2iConfig,
             CurateOutcomeBuildItem curateOutcomeBuildItem,
             OutputTargetBuildItem out,
@@ -134,21 +155,21 @@ public void s2iRequirementsNative(S2iConfig s2iConfig,
 
         builderImageProducer.produce(new BaseImageInfoBuildItem(s2iConfig.baseNativeImage));
         Optional<S2iBaseNativeImage> baseImage = S2iBaseNativeImage.findMatching(s2iConfig.baseNativeImage);
+        List<String> nativeArguments = s2iConfig.nativeArguments.orElse(Collections.emptyList());
         baseImage.ifPresent(b -> {
             envProducer.produce(
                     KubernetesEnvBuildItem.createSimpleVar(b.getHomeDirEnvVar(), s2iConfig.nativeBinaryDirectory, OPENSHIFT));
             envProducer.produce(
-                    KubernetesEnvBuildItem.createSimpleVar(b.getOptsEnvVar(), String.join(" ", s2iConfig.nativeArguments),
+                    KubernetesEnvBuildItem.createSimpleVar(b.getOptsEnvVar(), String.join(" ", nativeArguments),
                             OPENSHIFT));
         });
 
         if (!baseImage.isPresent()) {
-            commandProducer.produce(new KubernetesCommandBuildItem(pathToNativeBinary,
-                    s2iConfig.nativeArguments.toArray(new String[s2iConfig.nativeArguments.size()])));
+            commandProducer.produce(new KubernetesCommandBuildItem(pathToNativeBinary, nativeArguments.toArray(new String[0])));
         }
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, S2iBuild.class }, onlyIfNot = NativeBuild.class)
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, S2iBuild.class }, onlyIfNot = NativeBuild.class)
     public void s2iBuildFromJar(S2iConfig s2iConfig, ContainerImageConfig containerImageConfig,
             KubernetesClientBuildItem kubernetesClient,
             ContainerImageInfoBuildItem containerImage,
@@ -185,7 +206,7 @@ public void s2iBuildFromJar(S2iConfig s2iConfig, ContainerImageConfig containerI
         artifactResultProducer.produce(new ArtifactResultBuildItem(null, "jar-container", Collections.emptyMap()));
     }
 
-    @BuildStep(onlyIf = { IsNormal.class, S2iBuild.class, NativeBuild.class })
+    @BuildStep(onlyIf = { IsNormalNotRemoteDev.class, S2iBuild.class, NativeBuild.class })
     public void s2iBuildFromNative(S2iConfig s2iConfig, ContainerImageConfig containerImageConfig,
             KubernetesClientBuildItem kubernetesClient,
             ContainerImageInfoBuildItem containerImage,
@@ -216,7 +237,8 @@ public void s2iBuildFromNative(S2iConfig s2iConfig, ContainerImageConfig contain
             return;
         }
 
-        createContainerImage(kubernetesClient, openshiftYml.get(), s2iConfig, out.getOutputDirectory(), nativeImage.getPath());
+        createContainerImage(kubernetesClient, openshiftYml.get(), s2iConfig, out.getOutputDirectory(),
+                nativeImage.getPath());
         artifactResultProducer.produce(new ArtifactResultBuildItem(null, "native-container", Collections.emptyMap()));
     }
 
@@ -228,7 +250,7 @@ public static void createContainerImage(KubernetesClientBuildItem kubernetesClie
 
         File tar;
         try {
-            File original = Packaging.packageFile(output, additional);
+            File original = PackageUtil.packageFile(output, additional);
             //Let's rename the archive and give it a more descriptive name, as it may appear in the logs.
             tar = Files.createTempFile("quarkus-", "-s2i").toFile();
             Files.move(original.toPath(), tar.toPath(), StandardCopyOption.REPLACE_EXISTING);
diff --git a/extensions/container-image/container-image-s2i/pom.xml b/extensions/container-image/container-image-s2i/pom.xml
index 4d9433a29c02c..c7464d927fdbc 100644
--- a/extensions/container-image/container-image-s2i/pom.xml
+++ b/extensions/container-image/container-image-s2i/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-s2i-parent</artifactId>
-    <name>Quarkus - Container - Image - S2i - Parent</name>
+    <name>Quarkus - Container Image - S2I - Parent</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>
diff --git a/extensions/container-image/container-image-s2i/runtime/pom.xml b/extensions/container-image/container-image-s2i/runtime/pom.xml
index 57730813477a6..0f800fc49b3fa 100644
--- a/extensions/container-image/container-image-s2i/runtime/pom.xml
+++ b/extensions/container-image/container-image-s2i/runtime/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>quarkus-container-image-s2i</artifactId>
-    <name>Quarkus - Container - Image - S2I</name>
+    <name>Quarkus - Container Image - S2I</name>
     <description>Build container images of your application using OpenShift S2I</description>
 
     <dependencies>
@@ -20,6 +20,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/container-image/deployment/pom.xml b/extensions/container-image/deployment/pom.xml
index 02f8c41496f74..f6dd3f9da0772 100644
--- a/extensions/container-image/deployment/pom.xml
+++ b/extensions/container-image/deployment/pom.xml
@@ -10,13 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-deployment</artifactId>
-    <name>Quarkus - Container - Deployment</name>
+    <name>Quarkus - Container Image - Deployment</name>
 
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-container-image-spi</artifactId>
@@ -25,7 +29,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-container-image-util</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageCapabilitiesUtil.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageCapabilitiesUtil.java
index 6177d54c7e016..1f4cec0f5bf45 100644
--- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageCapabilitiesUtil.java
+++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageCapabilitiesUtil.java
@@ -16,6 +16,7 @@ public final class ContainerImageCapabilitiesUtil {
         CAPABILITY_TO_EXTENSION_NAME.put(Capability.CONTAINER_IMAGE_JIB.getName(), "quarkus-container-image-jib");
         CAPABILITY_TO_EXTENSION_NAME.put(Capability.CONTAINER_IMAGE_DOCKER.getName(), "quarkus-container-image-docker");
         CAPABILITY_TO_EXTENSION_NAME.put(Capability.CONTAINER_IMAGE_S2I.getName(), "quarkus-container-image-s2i");
+        CAPABILITY_TO_EXTENSION_NAME.put(Capability.CONTAINER_IMAGE_OPENSHIFT.getName(), "quarkus-container-image-openshift");
     }
 
     private ContainerImageCapabilitiesUtil() {
@@ -30,7 +31,7 @@ public static Optional<String> getActiveContainerImageCapability(Capabilities ca
         if (activeContainerImageCapabilities.size() > 1) {
             throw new IllegalStateException(String.join(" and ", activeContainerImageCapabilities)
                     + " were detected, at most one container-image extension can be present.\n"
-                    + "Either remove the uneeded ones, or select one using the property 'quarkus.container-image-builder=<extension name (without the `container-image-` prefix)>'.");
+                    + "Either remove the unneeded ones, or select one by adding the property 'quarkus.container-image.builder=<extension name (without the `container-image-` prefix)>' in application.properties or as a system property.");
         }
         return activeContainerImageCapabilities.isEmpty() ? Optional.empty()
                 : Optional.of(activeContainerImageCapabilities.iterator().next());
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java
index edc379e8753e4..87547b9f92a7b 100644
--- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java
+++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java
@@ -39,6 +39,14 @@ public class ContainerImageConfig {
     @ConfigItem
     public Optional<String> registry;
 
+    /**
+     * Represents the entire image string.
+     * If set, then {@code group}, {@code name}, {@code registry}, {@code tags}, {@code additionalTags}
+     * are ignored
+     */
+    @ConfigItem
+    public Optional<String> image;
+
     /**
      * The username to use to authenticate with the registry where the built image will be pushed
      */
@@ -79,6 +87,7 @@ public class ContainerImageConfig {
     /**
      * Since user.name which is default value can be uppercase and uppercase values are not allowed
      * in the repository part of image references, we need to make the username lowercase.
+     * If spaces exist in the user name, we replace them with the dash character.
      *
      * We purposely don't change the value of an explicitly set group.
      */
@@ -86,7 +95,7 @@ public Optional<String> getEffectiveGroup() {
         if (group.isPresent()) {
             String originalGroup = group.get();
             if (originalGroup.equals(System.getProperty("user.name"))) {
-                return Optional.of(originalGroup.toLowerCase());
+                return Optional.of(originalGroup.toLowerCase().replace(' ', '-'));
             }
         }
         return group;
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageProcessor.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageProcessor.java
new file mode 100644
index 0000000000000..7443750fab6d7
--- /dev/null
+++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageProcessor.java
@@ -0,0 +1,88 @@
+package io.quarkus.container.image.deployment;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.container.spi.ImageReference;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeSourcesBuild;
+
+public class ContainerImageProcessor {
+
+    private static final String UNKNOWN_USER = "?";
+    private static final Logger log = Logger.getLogger(ContainerImageProcessor.class);
+
+    @BuildStep(onlyIf = NativeSourcesBuild.class)
+    void failForNativeSources(BuildProducer<ArtifactResultBuildItem> artifactResultProducer) {
+        throw new IllegalArgumentException(
+                "The Container Imagee extensions are incompatible with the 'native-sources' package type.");
+    }
+
+    @BuildStep
+    public void publishImageInfo(ApplicationInfoBuildItem app,
+            ContainerImageConfig containerImageConfig, Capabilities capabilities,
+            BuildProducer<ContainerImageInfoBuildItem> containerImage) {
+
+        ensureSingleContainerImageExtension(capabilities);
+
+        // additionalTags are used even containerImageConfig.image is set because that string cannot contain multiple tags
+        if (containerImageConfig.additionalTags.isPresent()) {
+            for (String additionalTag : containerImageConfig.additionalTags.get()) {
+                if (!ImageReference.isValidTag(additionalTag)) {
+                    throw new IllegalArgumentException(
+                            "The supplied additional container-image tag '" + additionalTag + "' is invalid");
+                }
+            }
+        }
+
+        String effectiveGroup = containerImageConfig.getEffectiveGroup().orElse("");
+        //This can be the case when running inside kubernetes/minikube in dev-mode. Instead of failing, we should just catch and log.
+        if (UNKNOWN_USER.equals(effectiveGroup)) {
+            log.warn(
+                    "Can't get the current user name, which is used as default for container image group. Can't publish container image info.");
+            return;
+        }
+
+        // if the user supplied the entire image string, use it
+        if (containerImageConfig.image.isPresent()) {
+            ImageReference imageReference = ImageReference.parse(containerImageConfig.image.get());
+            String repository = imageReference.getRepository();
+            containerImage.produce(new ContainerImageInfoBuildItem(Optional.of(imageReference.getRegistry()), repository,
+                    imageReference.getTag(), containerImageConfig.additionalTags.orElse(Collections.emptyList())));
+            return;
+        }
+
+        String registry = containerImageConfig.registry.orElse(null);
+        if ((registry != null) && !ImageReference.isValidRegistry(registry)) {
+            throw new IllegalArgumentException("The supplied container-image registry '" + registry + "' is invalid");
+        }
+
+        String effectiveName = containerImageConfig.name.orElse(app.getName());
+        String repository = (containerImageConfig.getEffectiveGroup().map(s -> s + "/").orElse("")) + effectiveName;
+        if (!ImageReference.isValidRepository(repository)) {
+            throw new IllegalArgumentException("The supplied combination of container-image group '"
+                    + effectiveGroup + "' and name '" + effectiveName + "' is invalid");
+        }
+
+        final String effectiveTag = containerImageConfig.tag.orElse(app.getVersion());
+        if (!ImageReference.isValidTag(effectiveTag)) {
+            throw new IllegalArgumentException("The supplied container-image tag '" + effectiveTag + "' is invalid");
+        }
+
+        containerImage.produce(new ContainerImageInfoBuildItem(containerImageConfig.registry,
+                containerImageConfig.getEffectiveGroup(),
+                effectiveName, effectiveTag,
+                containerImageConfig.additionalTags.orElse(Collections.emptyList())));
+    }
+
+    private void ensureSingleContainerImageExtension(Capabilities capabilities) {
+        ContainerImageCapabilitiesUtil.getActiveContainerImageCapability(capabilities);
+    }
+}
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerProcessor.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerProcessor.java
deleted file mode 100644
index 62411055b8b6e..0000000000000
--- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerProcessor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.quarkus.container.image.deployment;
-
-import java.util.Collections;
-
-import io.quarkus.container.spi.ContainerImageInfoBuildItem;
-import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
-
-public class ContainerProcessor {
-
-    @BuildStep
-    public ContainerImageInfoBuildItem publishImageInfo(ApplicationInfoBuildItem app,
-            ContainerImageConfig containerImageConfig, Capabilities capabilities) {
-
-        ensureSingleContainerImageExtension(capabilities);
-
-        return new ContainerImageInfoBuildItem(containerImageConfig.registry,
-                containerImageConfig.getEffectiveGroup(),
-                containerImageConfig.name.orElse(app.getName()),
-                containerImageConfig.tag.orElse(app.getVersion()),
-                containerImageConfig.additionalTags.orElse(Collections.emptyList()));
-    }
-
-    private void ensureSingleContainerImageExtension(Capabilities capabilities) {
-        ContainerImageCapabilitiesUtil.getActiveContainerImageCapability(capabilities);
-    }
-}
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devconsole/ContainerImageDevConsoleProcessor.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devconsole/ContainerImageDevConsoleProcessor.java
new file mode 100644
index 0000000000000..12161727fc443
--- /dev/null
+++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devconsole/ContainerImageDevConsoleProcessor.java
@@ -0,0 +1,42 @@
+package io.quarkus.container.image.deployment.devconsole;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import io.quarkus.container.spi.AvailableContainerImageExtensionBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
+
+public class ContainerImageDevConsoleProcessor {
+
+    @BuildStep
+    DevConsoleRouteBuildItem builder() {
+        return new DevConsoleRouteBuildItem("build", "POST",
+                new RebuildHandler(Collections.singletonMap("quarkus.container-image.build", "true")));
+    }
+
+    @BuildStep
+    DevConsoleTemplateInfoBuildItem handleGetBuilders(List<AvailableContainerImageExtensionBuildItem> extensions) {
+        return new DevConsoleTemplateInfoBuildItem("builder",
+                extensions.stream().map(s -> new BuilderType(s.getName())).collect(Collectors.toList()));
+    }
+
+    public static class BuilderType implements Comparable<BuilderType> {
+        private final String name;
+
+        public BuilderType(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return this.name;
+        }
+
+        @Override
+        public int compareTo(BuilderType o) {
+            return name.compareTo(o.name);
+        }
+    }
+}
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devconsole/RebuildHandler.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devconsole/RebuildHandler.java
new file mode 100644
index 0000000000000..57769a2cea5c1
--- /dev/null
+++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devconsole/RebuildHandler.java
@@ -0,0 +1,56 @@
+package io.quarkus.container.image.deployment.devconsole;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+
+import io.quarkus.bootstrap.app.ArtifactResult;
+import io.quarkus.bootstrap.app.AugmentResult;
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.dev.console.TempSystemProperties;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+public class RebuildHandler extends DevConsolePostHandler {
+
+    private final Map<String, String> config;
+
+    public RebuildHandler(Map<String, String> config) {
+        this.config = config;
+    }
+
+    @Override
+    protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception {
+        QuarkusBootstrap existing = (QuarkusBootstrap) DevConsoleManager.getQuarkusBootstrap();
+        try (TempSystemProperties properties = new TempSystemProperties()) {
+            for (Map.Entry<String, String> i : config.entrySet()) {
+                properties.set(i.getKey(), i.getValue());
+            }
+            for (Map.Entry<String, String> i : form.entries()) {
+                if (!i.getValue().isEmpty()) {
+                    properties.set(i.getKey(), i.getValue());
+                }
+            }
+            QuarkusBootstrap quarkusBootstrap = existing.clonedBuilder()
+                    .setMode(QuarkusBootstrap.Mode.PROD)
+                    .setIsolateDeployment(true).build();
+            try (CuratedApplication bootstrap = quarkusBootstrap.bootstrap()) {
+                AugmentResult augmentResult = bootstrap
+                        .createAugmentor().createProductionApplication();
+                List<ArtifactResult> containerArtifactResults = augmentResult
+                        .resultsMatchingType((s) -> s.contains("container"));
+                if (containerArtifactResults.size() >= 1) {
+                    flashMessage(event,
+                            "Container-image: " + containerArtifactResults.get(0).getMetadata().get("container-image")
+                                    + " created.",
+                            Duration.ofSeconds(10));
+                }
+            }
+        }
+        ;
+    }
+
+}
diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/util/ImageUtil.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/util/ImageUtil.java
index 184f9272be1d4..6bb41d4dba104 100644
--- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/util/ImageUtil.java
+++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/util/ImageUtil.java
@@ -35,33 +35,6 @@ public static String getImage(Optional<String> registry, String repository, Stri
         return sb.toString();
     }
 
-    /*
-     * Checks if the specified image has a registry part.
-     * 
-     * @param image the image
-     * 
-     * @return true if registry is part of the image, false otherwise
-     */
-    public static boolean hasRegistry(String image) {
-        String r = getRegistry(image);
-        return r != null && !r.isEmpty();
-    }
-
-    /**
-     * Return the registry part of the docker image.
-     * 
-     * @param image The actual docker image.
-     * @return The registry or null, if not registry was found.
-     */
-    public static String getRegistry(String image) {
-        String[] parts = image.split(SLASH);
-        if (parts.length <= 2) {
-            return null;
-        } else {
-            return parts[0];
-        }
-    }
-
     /**
      * Return the docker image repository.
      * 
diff --git a/extensions/container-image/deployment/src/main/resources/dev-templates/build.html b/extensions/container-image/deployment/src/main/resources/dev-templates/build.html
new file mode 100644
index 0000000000000..a3c1f0a85101b
--- /dev/null
+++ b/extensions/container-image/deployment/src/main/resources/dev-templates/build.html
@@ -0,0 +1,27 @@
+{#include main}
+{#title}Build{/title}
+{#body}
+
+<form method="post"  enctype="application/x-www-form-urlencoded">
+    <div class="form-group">
+        <label for="quarkus.build.package-type">Build Type</label>
+        <select name="quarkus.package.type" class="form-control">
+            <option value="">Default</option>
+            <option value="jar">Jar</option>
+            <option value="mutable-jar">Mutable Jar</option>
+            <option value="legacy-jar">Legacy Jar</option>
+            <option value="native">Native</option>
+        </select>
+    </div>
+    <div class="form-group">
+        <label for="quarkus.container-image.builder">Builder Type</label>
+        <select name="quarkus.container-image.builder" required="false" class="form-control">
+        {#for item in info:builder}
+            <option value="{item.name}">{item.name}</option>
+        {/for}
+        </select>
+    </div>
+    <button type="submit" class="btn btn-primary">Build</button>
+</form>
+{/body}
+{/include}
diff --git a/extensions/container-image/deployment/src/main/resources/dev-templates/embedded.html b/extensions/container-image/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..7d704d8f2482d
--- /dev/null
+++ b/extensions/container-image/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,3 @@
+<a href="{urlbase}/build" class="badge badge-light">
+    <i class="fa fa-industry fa-fw"></i>
+    Build</a>
diff --git a/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageConfigEffectiveGroupTest.java b/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageConfigEffectiveGroupTest.java
index 3bf2cd8430f95..d319ae11875f3 100644
--- a/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageConfigEffectiveGroupTest.java
+++ b/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageConfigEffectiveGroupTest.java
@@ -28,6 +28,14 @@ void testFromUppercaseUsername() {
         });
     }
 
+    @Test
+    void testFromSpaceInUsername() {
+        testWithNewUsername("user name", () -> {
+            sut.group = Optional.of(System.getProperty(USER_NAME_SYSTEM_PROPERTY));
+            assertEquals(sut.getEffectiveGroup(), Optional.of("user-name"));
+        });
+    }
+
     @Test
     void testFromOther() {
         testWithNewUsername("WhateveR", () -> {
diff --git a/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageInfoTest.java b/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageInfoTest.java
new file mode 100644
index 0000000000000..e14798fd48e9b
--- /dev/null
+++ b/extensions/container-image/deployment/src/test/java/io/quarkus/container/image/deployment/ContainerImageInfoTest.java
@@ -0,0 +1,142 @@
+package io.quarkus.container.image.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Properties;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.configuration.BuildTimeConfigurationReader;
+import io.quarkus.deployment.configuration.DefaultValuesConfigurationSource;
+import io.quarkus.runtime.configuration.ConfigUtils;
+import io.smallrye.config.PropertiesConfigSource;
+import io.smallrye.config.SmallRyeConfig;
+import io.smallrye.config.SmallRyeConfigBuilder;
+
+public class ContainerImageInfoTest {
+
+    private static final String APP_NAME = "repo/name";
+    private static final String APP_VERSION = "v1.0.1";
+
+    private static final String APP_PROPERTY = "quarkus.application.name";
+    private static final String VERSION_PROPERTY = "quarkus.application.version";
+    private static final String GROUP_PROPERTY = "quarkus.container-image.group";
+    private static final String USER_NAME_PROPERTY = "user.name";
+
+    ContainerImageInfoBuildItem actualContainerImageInfo;
+
+    static Properties propertiesBeforeTests;
+
+    @BeforeEach
+    public void setupForTest() {
+        clearProperty(USER_NAME_PROPERTY);
+        clearProperty(GROUP_PROPERTY);
+        givenProperty(APP_PROPERTY, APP_NAME);
+        givenProperty(VERSION_PROPERTY, APP_VERSION);
+    }
+
+    @BeforeAll
+    public static void backupProperties() {
+        propertiesBeforeTests = (Properties) System.getProperties().clone();
+    }
+
+    @AfterAll
+    public static void restoreProperties() {
+        System.setProperties(propertiesBeforeTests);
+    }
+
+    @Test
+    public void shouldUseAppNameAndVersionWhenNoUserName() {
+        givenNoUserName();
+        whenPublishImageInfo();
+        thenImageIs(APP_NAME + ":" + APP_VERSION);
+    }
+
+    @Test
+    public void shouldUseUserAppNameAndVersionWhenUserName() {
+        givenUserName("user");
+        whenPublishImageInfo();
+        thenImageIs("user/" + APP_NAME + ":" + APP_VERSION);
+    }
+
+    @Test
+    public void shouldReplaceSpacesInUserName() {
+        givenUserName("user surname");
+        whenPublishImageInfo();
+        thenImageIs("user-surname/" + APP_NAME + ":" + APP_VERSION);
+    }
+
+    @Test
+    public void shouldFailWhenSpacesInGroupProperty() {
+        givenProperty(GROUP_PROPERTY, "group with space");
+        // user error should not be auto-corrected
+        thenImagePublicationFails(
+                IllegalArgumentException.class,
+                "The supplied combination of container-image group 'group with space' and name 'repo/name' is invalid");
+    }
+
+    private void givenNoUserName() {
+        givenProperty(USER_NAME_PROPERTY, "");
+    }
+
+    private void givenUserName(String value) {
+        givenProperty(USER_NAME_PROPERTY, value);
+    }
+
+    private void givenProperty(String key, String value) {
+        System.setProperty(key, value);
+    }
+
+    private void clearProperty(String key) {
+        System.getProperties().remove(key);
+    }
+
+    private void whenPublishImageInfo() {
+        BuildTimeConfigurationReader reader = new BuildTimeConfigurationReader(
+                Collections.singletonList(ContainerImageConfig.class));
+        SmallRyeConfigBuilder builder = ConfigUtils.configBuilder(false);
+
+        DefaultValuesConfigurationSource ds = new DefaultValuesConfigurationSource(
+                reader.getBuildTimePatternMap());
+        PropertiesConfigSource pcs = new PropertiesConfigSource(new Properties(), "Test Properties");
+        builder.withSources(ds, pcs);
+
+        SmallRyeConfig src = builder.build();
+        BuildTimeConfigurationReader.ReadResult readResult = reader.readConfiguration(src);
+        ContainerImageConfig containerImageConfig = (ContainerImageConfig) readResult
+                .requireRootObjectForClass(ContainerImageConfig.class);
+
+        ApplicationInfoBuildItem app = new ApplicationInfoBuildItem(Optional.of(APP_NAME), Optional.of(APP_VERSION));
+        Capabilities capabilities = new Capabilities(Collections.emptySet());
+        BuildProducer<ContainerImageInfoBuildItem> containerImage = actualImageConfig -> actualContainerImageInfo = actualImageConfig;
+        ContainerImageProcessor processor = new ContainerImageProcessor();
+        processor.publishImageInfo(app, containerImageConfig, capabilities, containerImage);
+    }
+
+    private void thenImageIs(String expectedImage) {
+        assertEquals(expectedImage, actualContainerImageInfo.getImage());
+    }
+
+    private <T extends Throwable> void thenImagePublicationFails(Class<T> expectedErrorType, String expectedErrorMessage) {
+        T thrown = assertThrows(
+                expectedErrorType,
+                this::whenPublishImageInfo,
+                String.format("Expected %s to be thrown from ContainerImageProcessor.publishImageInfo",
+                        expectedErrorType.getName()));
+
+        assertTrue(
+                thrown.getMessage().contains(expectedErrorMessage),
+                String.format("Expected the error message to be '%s' but was '%s'", expectedErrorMessage, thrown.getMessage()));
+    }
+}
diff --git a/extensions/container-image/pom.xml b/extensions/container-image/pom.xml
index d2a337a0e29c4..89cc62936e863 100644
--- a/extensions/container-image/pom.xml
+++ b/extensions/container-image/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -15,11 +15,13 @@
     <name>Quarkus - Container Image</name>
     <packaging>pom</packaging>
     <modules>
+        <module>runtime</module>
         <module>deployment</module>
         <module>spi</module>
         <module>util</module>
         <module>container-image-docker</module>
         <module>container-image-jib</module>
         <module>container-image-s2i</module>
+        <module>container-image-openshift</module>
     </modules>
 </project>
diff --git a/extensions/container-image/runtime/pom.xml b/extensions/container-image/runtime/pom.xml
new file mode 100644
index 0000000000000..3f51e7abf2fd3
--- /dev/null
+++ b/extensions/container-image/runtime/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-container-image-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-container-image</artifactId>
+    <name>Quarkus - Container Image - Runtime</name>
+    <description>Build container images of your application</description>
+    <!--
+        Build container images of your application. Only needed to make sure that the container image
+        configuration is generated from the io.quarkus.container.image.deployment.ContainerImageConfig.
+        See https://github.com/quarkusio/quarkus/issues/12316#issuecomment-698287955 for more information.
+    -->
+
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/container-image/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/container-image/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..e4c9d0cbc8ebd
--- /dev/null
+++ b/extensions/container-image/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,10 @@
+---
+name: "Container Image"
+metadata:
+  keywords:
+    - "container"
+    - "image"
+  categories:
+    - "cloud"
+  status: "preview"
+  unlisted: true
diff --git a/extensions/container-image/spi/pom.xml b/extensions/container-image/spi/pom.xml
index 0e725f2721606..7b744c342557f 100644
--- a/extensions/container-image/spi/pom.xml
+++ b/extensions/container-image/spi/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-spi</artifactId>
-    <name>Quarkus - Container - Image - SPI</name>
+    <name>Quarkus - Container Image - SPI</name>
     <description>Extensions that provide Container features should include this module and the corresponding BuildItems</description>
 
     <dependencies>
diff --git a/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/AvailableContainerImageExtensionBuildItem.java b/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/AvailableContainerImageExtensionBuildItem.java
new file mode 100644
index 0000000000000..22f50f2543294
--- /dev/null
+++ b/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/AvailableContainerImageExtensionBuildItem.java
@@ -0,0 +1,18 @@
+
+package io.quarkus.container.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class AvailableContainerImageExtensionBuildItem extends MultiBuildItem {
+
+    private final String name;
+
+    public AvailableContainerImageExtensionBuildItem(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+}
diff --git a/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ContainerImageInfoBuildItem.java b/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ContainerImageInfoBuildItem.java
index 7e6f5b2895696..fd67ab86f1d7c 100644
--- a/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ContainerImageInfoBuildItem.java
+++ b/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ContainerImageInfoBuildItem.java
@@ -20,19 +20,34 @@ public final class ContainerImageInfoBuildItem extends SimpleBuildItem {
     public final Optional<String> registry;
 
     private final String imagePrefix;
+    private final String repository;
 
     private final String tag;
 
     private final Set<String> additionalTags;
 
-    public ContainerImageInfoBuildItem(Optional<String> registry, Optional<String> group, String name, String tag,
-            List<String> additionalTags) {
+    public ContainerImageInfoBuildItem(Optional<String> registry, String repository, String tag, List<String> additionalTags) {
         this.registry = registry;
+        this.repository = repository;
 
         StringBuilder sb = new StringBuilder();
         registry.ifPresent(r -> sb.append(r).append(SLASH));
-        group.ifPresent(s -> sb.append(s).append(SLASH));
-        this.imagePrefix = sb.append(name).toString();
+        sb.append(repository);
+        this.imagePrefix = sb.toString();
+        this.tag = tag;
+        this.additionalTags = new HashSet<>(additionalTags);
+    }
+
+    public ContainerImageInfoBuildItem(Optional<String> registry, Optional<String> group, String name, String tag,
+            List<String> additionalTags) {
+        this.registry = registry;
+
+        StringBuilder imagePrefixSB = new StringBuilder();
+        StringBuilder repositorySB = new StringBuilder();
+        registry.ifPresent(r -> imagePrefixSB.append(r).append(SLASH));
+        group.ifPresent(s -> repositorySB.append(s).append(SLASH));
+        repositorySB.append(name);
+        this.imagePrefix = imagePrefixSB.append(this.repository = repositorySB.toString()).toString();
         this.tag = tag;
         this.additionalTags = new HashSet<>(additionalTags);
     }
@@ -56,4 +71,12 @@ public List<String> getAdditionalImageTags() {
     public Set<String> getAdditionalTags() {
         return additionalTags;
     }
+
+    public String getRepository() {
+        return repository;
+    }
+
+    public String getGroup() {
+        return repository == null ? null : repository.split("/")[0];
+    }
 }
diff --git a/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ImageReference.java b/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ImageReference.java
new file mode 100644
index 0000000000000..6426488f89fca
--- /dev/null
+++ b/extensions/container-image/spi/src/main/java/io/quarkus/container/spi/ImageReference.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2018 Google LLC.
+ *
+ * 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
+ *
+ *      https://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 io.quarkus.container.spi;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.google.common.base.Strings;
+
+/**
+ * This is basically a simplified version of {@code com.google.cloud.tools.jib.api.ImageReference}
+ */
+public class ImageReference {
+
+    private static final String DOCKER_HUB_REGISTRY = "registry-1.docker.io";
+    private static final String DEFAULT_TAG = "latest";
+    private static final String LIBRARY_REPOSITORY_PREFIX = "library/";
+
+    /**
+     * Matches all sequences of alphanumeric characters possibly separated by any number of dashes in
+     * the middle.
+     */
+    private static final String REGISTRY_COMPONENT_REGEX = "(?:[a-zA-Z\\d]|(?:[a-zA-Z\\d][a-zA-Z\\d-]*[a-zA-Z\\d]))";
+
+    /**
+     * Matches sequences of {@code REGISTRY_COMPONENT_REGEX} separated by a dot, with an optional
+     * {@code :port} at the end.
+     */
+    private static final String REGISTRY_REGEX = String.format("%s(?:\\.%s)*(?::\\d+)?", REGISTRY_COMPONENT_REGEX,
+            REGISTRY_COMPONENT_REGEX);
+
+    /**
+     * Matches all sequences of alphanumeric characters separated by a separator.
+     *
+     * <p>
+     * A separator is either an underscore, a dot, two underscores, or any number of dashes.
+     */
+    private static final String REPOSITORY_COMPONENT_REGEX = "[a-z\\d]+(?:(?:[_.]|__|-+)[a-z\\d]+)*";
+
+    /** Matches all repetitions of {@code REPOSITORY_COMPONENT_REGEX} separated by a backslash. */
+    private static final String REPOSITORY_REGEX = String.format("(?:%s/)*%s", REPOSITORY_COMPONENT_REGEX,
+            REPOSITORY_COMPONENT_REGEX);
+
+    /** Matches a tag of max length 128. */
+    private static final String TAG_REGEX = "[\\w][\\w.-]{0,127}";
+
+    /** Pattern matches a SHA-256 hash - 32 bytes in lowercase hexadecimal. */
+    private static final String HASH_REGEX = String.format("[a-f0-9]{%d}", 64);
+
+    /** The algorithm prefix for the digest string. */
+    private static final String DIGEST_PREFIX = "sha256:";
+
+    /** Pattern matches a SHA-256 digest - a SHA-256 hash prefixed with "sha256:". */
+    private static final String DIGEST_REGEX = DIGEST_PREFIX + HASH_REGEX;
+
+    /**
+     * Matches a full image reference, which is the registry, repository, and tag/digest separated by
+     * backslashes. The repository is required, but the registry and tag/digest are optional.
+     */
+    private static final String REFERENCE_REGEX = String.format(
+            "^(?:(%s)/)?(%s)(?::(%s))?(?:@(%s))?$",
+            REGISTRY_REGEX, REPOSITORY_REGEX, TAG_REGEX, DIGEST_REGEX);
+
+    private static final Pattern REFERENCE_PATTERN = Pattern.compile(REFERENCE_REGEX);
+
+    private final String registry;
+    private final String repository;
+    private final String tag;
+    private final String digest;
+
+    /**
+     * Returns {@code true} if {@code registry} is a valid registry string. For example, a valid
+     * registry could be {@code gcr.io} or {@code localhost:5000}.
+     *
+     * @param registry the registry to check
+     * @return {@code true} if is a valid registry; {@code false} otherwise
+     */
+    public static boolean isValidRegistry(String registry) {
+        return registry.matches(REGISTRY_REGEX);
+    }
+
+    /**
+     * Returns {@code true} if {@code repository} is a valid repository string. For example, a valid
+     * repository could be {@code distroless} or {@code my/container-image/repository}.
+     *
+     * @param repository the repository to check
+     * @return {@code true} if is a valid repository; {@code false} otherwise
+     */
+    public static boolean isValidRepository(String repository) {
+        return repository.matches(REPOSITORY_REGEX);
+    }
+
+    /**
+     * Returns {@code true} if {@code tag} is a valid tag string. For example, a valid tag could be
+     * {@code v120.5-release}.
+     *
+     * @param tag the tag to check
+     * @return {@code true} if is a valid tag; {@code false} otherwise
+     */
+    public static boolean isValidTag(String tag) {
+        return tag.matches(TAG_REGEX);
+    }
+
+    /**
+     * Parses a string {@code reference} into an {@link ImageReference}.
+     *
+     * <p>
+     * Image references should generally be in the form: {@code <registry>/<repository>:<tag>} For
+     * example, an image reference could be {@code gcr.io/distroless/java:debug}.
+     *
+     * <p>
+     * See <a
+     * href=
+     * "https://docs.docker.com/engine/reference/commandline/tag/#extended-description">https://docs.docker.com/engine/reference/commandline/tag/#extended-description</a>
+     * for a description of valid image reference format. Note, however, that the image reference is
+     * referred confusingly as {@code tag} on that page.
+     *
+     * @param reference the string to parse
+     * @return an {@link ImageReference} parsed from the string
+     * @throws IllegalArgumentException if {@code reference} is formatted incorrectly
+     */
+    public static ImageReference parse(String reference) {
+
+        Matcher matcher = REFERENCE_PATTERN.matcher(reference);
+
+        if (!matcher.find() || matcher.groupCount() < 4) {
+            throw new IllegalArgumentException("Reference " + reference + " is invalid");
+        }
+
+        String registry = matcher.group(1);
+        String repository = matcher.group(2);
+        String tag = matcher.group(3);
+        String digest = matcher.group(4);
+
+        // If no registry was matched, use Docker Hub by default.
+        if (Strings.isNullOrEmpty(registry)) {
+            registry = DOCKER_HUB_REGISTRY;
+        }
+
+        if (Strings.isNullOrEmpty(repository)) {
+            throw new IllegalArgumentException("Reference " + reference + " is invalid: The repository was not set");
+        }
+        /*
+         * If a registry was matched but it does not contain any dots or colons, it should actually be
+         * part of the repository unless it is "localhost".
+         *
+         * See https://github.com/docker/distribution/blob/245ca4659e09e9745f3cc1217bf56e946509220c/reference/normalize.go#L62
+         */
+        if (!registry.contains(".") && !registry.contains(":") && !"localhost".equals(registry)) {
+            repository = registry + "/" + repository;
+            registry = DOCKER_HUB_REGISTRY;
+        }
+
+        /*
+         * For Docker Hub, if the repository is only one component, then it should be prefixed with
+         * 'library/'.
+         *
+         * See https://docs.docker.com/engine/reference/commandline/pull/#pull-an-image-from-docker-hub
+         */
+        if (DOCKER_HUB_REGISTRY.equals(registry) && repository.indexOf('/') < 0) {
+            repository = LIBRARY_REPOSITORY_PREFIX + repository;
+        }
+
+        if (Strings.isNullOrEmpty(tag) && Strings.isNullOrEmpty(digest)) {
+            tag = DEFAULT_TAG;
+        }
+        if (Strings.isNullOrEmpty(tag)) {
+            tag = null;
+        }
+        if (Strings.isNullOrEmpty(digest)) {
+            digest = null;
+        }
+
+        return new ImageReference(registry, repository, tag, digest);
+    }
+
+    private ImageReference(
+            String registry, String repository, String tag, String digest) {
+        this.registry = registry;
+        this.repository = repository;
+        this.tag = tag;
+        this.digest = digest;
+    }
+
+    public String getRegistry() {
+        return registry;
+    }
+
+    public String getRepository() {
+        return repository;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public String getDigest() {
+        return digest;
+    }
+}
diff --git a/extensions/container-image/util/pom.xml b/extensions/container-image/util/pom.xml
index b225b53052902..07742e983ff32 100644
--- a/extensions/container-image/util/pom.xml
+++ b/extensions/container-image/util/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-container-image-util</artifactId>
-    <name>Quarkus - Container - Image - Util</name>
+    <name>Quarkus - Container Image - Util</name>
     <description>Utility classes common to the container image extensions</description>
 
 </project>
diff --git a/extensions/container-image/util/src/main/java/io/quarkus/container/util/PathsUtil.java b/extensions/container-image/util/src/main/java/io/quarkus/container/util/PathsUtil.java
index 1a6dad4c61afa..172d5ebaaf1c6 100644
--- a/extensions/container-image/util/src/main/java/io/quarkus/container/util/PathsUtil.java
+++ b/extensions/container-image/util/src/main/java/io/quarkus/container/util/PathsUtil.java
@@ -21,7 +21,7 @@ public static AbstractMap.SimpleEntry<Path, Path> findMainSourcesRoot(Path outpu
             if (toCheck.toFile().exists()) {
                 return new AbstractMap.SimpleEntry<>(toCheck, currentPath);
             }
-            if (Files.exists(currentPath.getParent())) {
+            if (currentPath.getParent() != null && Files.exists(currentPath.getParent())) {
                 currentPath = currentPath.getParent();
             } else {
                 return null;
diff --git a/extensions/credentials/deployment/pom.xml b/extensions/credentials/deployment/pom.xml
index 4a636ce74c7e3..8ec28c952111b 100644
--- a/extensions/credentials/deployment/pom.xml
+++ b/extensions/credentials/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-credentials-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/credentials/pom.xml b/extensions/credentials/pom.xml
index 10a72abec4590..f7588cbfab3e1 100644
--- a/extensions/credentials/pom.xml
+++ b/extensions/credentials/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/credentials/runtime/pom.xml b/extensions/credentials/runtime/pom.xml
index 2c5089618c812..e5e90becca4b6 100644
--- a/extensions/credentials/runtime/pom.xml
+++ b/extensions/credentials/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-credentials-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/datasource/common/pom.xml b/extensions/datasource/common/pom.xml
index bdc65355879fe..adf4b76faecde 100644
--- a/extensions/datasource/common/pom.xml
+++ b/extensions/datasource/common/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-datasource-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,5 +17,10 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
     </dependencies>
 </project>
diff --git a/extensions/datasource/deployment-spi/pom.xml b/extensions/datasource/deployment-spi/pom.xml
new file mode 100644
index 0000000000000..c5fe1bd7c7c4d
--- /dev/null
+++ b/extensions/datasource/deployment-spi/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-datasource-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-datasource-deployment-spi</artifactId>
+    <name>Quarkus - Datasource - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DefaultDataSourceDbKindBuildItem.java b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DefaultDataSourceDbKindBuildItem.java
new file mode 100644
index 0000000000000..52a25ccdb2cd0
--- /dev/null
+++ b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DefaultDataSourceDbKindBuildItem.java
@@ -0,0 +1,93 @@
+package io.quarkus.datasource.deployment.spi;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.deployment.util.ArtifactInfoUtil;
+
+/**
+ * A build item that represents the "quarkus.datasource.db-kind" value.
+ * This is generated by specific extensions that are meant to take away the burden of
+ * configuring anything datasource related from the user.
+ */
+public final class DefaultDataSourceDbKindBuildItem extends MultiBuildItem {
+
+    public static final String TEST = "test";
+    private final String dbKind;
+    private final Class<?> callerClass;
+    private volatile String scope;
+
+    public DefaultDataSourceDbKindBuildItem(String dbKind) {
+        this.dbKind = dbKind;
+        String callerClassName = new RuntimeException().getStackTrace()[1].getClassName();
+        try {
+            callerClass = Thread.currentThread().getContextClassLoader().loadClass(callerClassName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getDbKind() {
+        return dbKind;
+    }
+
+    public String getScope(CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (scope == null) {
+            Map.Entry<String, String> artifact = ArtifactInfoUtil.groupIdAndArtifactId(callerClass, curateOutcomeBuildItem);
+            for (AppDependency i : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
+                if (i.getArtifact().getArtifactId().equals(artifact.getValue())
+                        && i.getArtifact().getGroupId().equals(artifact.getKey())) {
+                    scope = i.getScope();
+                    break;
+                }
+            }
+            if (scope == null) {
+                throw new RuntimeException("Could not determine scope for " + dbKind);
+            }
+        }
+        return scope;
+    }
+
+    public static Optional<String> resolve(Optional<String> configured, List<DefaultDataSourceDbKindBuildItem> defaultDbKinds,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (configured.isPresent()) {
+            return Optional.of(DatabaseKind.normalize(configured.get()));
+        }
+        return resolve(defaultDbKinds, curateOutcomeBuildItem);
+    }
+
+    /**
+     * Attempts to resolve the default DB kind for the case where none has been specified.
+     */
+    public static Optional<String> resolve(List<DefaultDataSourceDbKindBuildItem> defaultDbKinds,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (defaultDbKinds.isEmpty()) {
+            return Optional.empty();
+        } else if (defaultDbKinds.size() == 1) {
+            return Optional.of(defaultDbKinds.get(0).dbKind);
+        } else {
+            //if we have one and only one test scoped driver we assume it is the default
+            //if is commmon to use a different DB such as H2 in tests
+            DefaultDataSourceDbKindBuildItem testScopedDriver = null;
+            for (DefaultDataSourceDbKindBuildItem i : defaultDbKinds) {
+                if (i.getScope(curateOutcomeBuildItem).equals(TEST)) {
+                    if (testScopedDriver == null) {
+                        testScopedDriver = i;
+                    } else {
+                        return Optional.empty();
+                    }
+                }
+            }
+            if (testScopedDriver == null) {
+                return Optional.empty();
+            } else {
+                return Optional.of(testScopedDriver.dbKind);
+            }
+        }
+    }
+}
diff --git a/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceConfigurationHandlerBuildItem.java b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceConfigurationHandlerBuildItem.java
new file mode 100644
index 0000000000000..75ebf45d1a2de
--- /dev/null
+++ b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceConfigurationHandlerBuildItem.java
@@ -0,0 +1,111 @@
+package io.quarkus.datasource.deployment.spi;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A handler that can map an automatic datasource to the relevant config properties.
+ */
+public final class DevServicesDatasourceConfigurationHandlerBuildItem extends MultiBuildItem {
+
+    /**
+     * The type of database this is for
+     */
+    private final String dbKind;
+    /**
+     * The function that provides the runtime config given a running DevServices database
+     */
+    private final BiFunction<String, DevServicesDatasourceProvider.RunningDevServicesDatasource, Map<String, String>> configProviderFunction;
+
+    /**
+     * Function that checks if a given datasource has been configured. If it has been configured generally the
+     * DevServices will not be started.
+     */
+    private final Predicate<String> checkConfiguredFunction;
+
+    public DevServicesDatasourceConfigurationHandlerBuildItem(String dbKind,
+            BiFunction<String, DevServicesDatasourceProvider.RunningDevServicesDatasource, Map<String, String>> configProviderFunction,
+            Predicate<String> checkConfiguredFunction) {
+        this.dbKind = dbKind;
+        this.configProviderFunction = configProviderFunction;
+        this.checkConfiguredFunction = checkConfiguredFunction;
+    }
+
+    public BiFunction<String, DevServicesDatasourceProvider.RunningDevServicesDatasource, Map<String, String>> getConfigProviderFunction() {
+        return configProviderFunction;
+    }
+
+    public String getDbKind() {
+        return dbKind;
+    }
+
+    public Predicate<String> getCheckConfiguredFunction() {
+        return checkConfiguredFunction;
+    }
+
+    public static DevServicesDatasourceConfigurationHandlerBuildItem jdbc(String dbKind) {
+        return new DevServicesDatasourceConfigurationHandlerBuildItem(dbKind,
+                new BiFunction<String, DevServicesDatasourceProvider.RunningDevServicesDatasource, Map<String, String>>() {
+                    @Override
+                    public Map<String, String> apply(String dsName,
+                            DevServicesDatasourceProvider.RunningDevServicesDatasource runningDevDb) {
+                        if (dsName == null) {
+                            return Collections.singletonMap("quarkus.datasource.jdbc.url", runningDevDb.getUrl());
+                        } else {
+                            return Collections.singletonMap("quarkus.datasource.\"" + dsName + "\".jdbc.url",
+                                    runningDevDb.getUrl());
+                        }
+                    }
+                }, new Predicate<String>() {
+                    @Override
+                    public boolean test(String dsName) {
+                        if (dsName == null) {
+                            return ConfigProvider.getConfig().getOptionalValue("quarkus.datasource.jdbc.url", String.class)
+                                    .isPresent();
+                        } else {
+                            return ConfigProvider.getConfig()
+                                    .getOptionalValue("quarkus.datasource.\"" + dsName + "\".jdbc.url", String.class)
+                                    .isPresent() ||
+                                    ConfigProvider.getConfig()
+                                            .getOptionalValue("quarkus.datasource." + dsName + ".jdbc.url", String.class)
+                                            .isPresent();
+                        }
+                    }
+                });
+    }
+
+    public static DevServicesDatasourceConfigurationHandlerBuildItem reactive(String dbKind) {
+        return new DevServicesDatasourceConfigurationHandlerBuildItem(dbKind,
+                new BiFunction<String, DevServicesDatasourceProvider.RunningDevServicesDatasource, Map<String, String>>() {
+                    @Override
+                    public Map<String, String> apply(String dsName,
+                            DevServicesDatasourceProvider.RunningDevServicesDatasource runningDevDb) {
+                        if (dsName == null) {
+                            return Collections.singletonMap("quarkus.datasource.reactive.url",
+                                    runningDevDb.getUrl().replaceFirst("jdbc:", "vertx-reactive:"));
+                        } else {
+                            return Collections.singletonMap("quarkus.datasource.\"" + dsName + "\".reactive.url",
+                                    runningDevDb.getUrl().replaceFirst("jdbc:", "vertx-reactive:"));
+                        }
+                    }
+                }, new Predicate<String>() {
+                    @Override
+                    public boolean test(String dsName) {
+                        if (dsName == null) {
+                            return ConfigProvider.getConfig().getOptionalValue("quarkus.datasource.reactive.url", String.class)
+                                    .isPresent();
+                        } else {
+                            return ConfigProvider.getConfig()
+                                    .getOptionalValue("quarkus.datasource.\"" + dsName + "\".reactive.url", String.class)
+                                    .isPresent();
+                        }
+                    }
+                });
+    }
+}
diff --git a/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceProvider.java b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceProvider.java
new file mode 100644
index 0000000000000..2a320aa324f44
--- /dev/null
+++ b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceProvider.java
@@ -0,0 +1,45 @@
+package io.quarkus.datasource.deployment.spi;
+
+import java.io.Closeable;
+import java.util.Map;
+import java.util.Optional;
+
+public interface DevServicesDatasourceProvider {
+
+    RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+            Optional<String> datasourceName,
+            Optional<String> imageName, Map<String, String> additionalProperties);
+
+    class RunningDevServicesDatasource {
+
+        private final String url;
+        private final String username;
+        private final String password;
+        private final Closeable closeTask;
+
+        public RunningDevServicesDatasource(String url, String username, String password, Closeable closeTask) {
+            this.url = url;
+            this.username = username;
+            this.password = password;
+            this.closeTask = closeTask;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public Closeable getCloseTask() {
+            return closeTask;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+    }
+
+}
diff --git a/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceProviderBuildItem.java b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceProviderBuildItem.java
new file mode 100644
index 0000000000000..a75ec73e6d393
--- /dev/null
+++ b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceProviderBuildItem.java
@@ -0,0 +1,25 @@
+package io.quarkus.datasource.deployment.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A provider that knows how to start a database of a specific type.
+ */
+public final class DevServicesDatasourceProviderBuildItem extends MultiBuildItem {
+
+    private final String database;
+    private final DevServicesDatasourceProvider devDBProvider;
+
+    public DevServicesDatasourceProviderBuildItem(String database, DevServicesDatasourceProvider devDBProvider) {
+        this.database = database;
+        this.devDBProvider = devDBProvider;
+    }
+
+    public String getDatabase() {
+        return database;
+    }
+
+    public DevServicesDatasourceProvider getDevServicesProvider() {
+        return devDBProvider;
+    }
+}
diff --git a/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceResultBuildItem.java b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceResultBuildItem.java
new file mode 100644
index 0000000000000..2cbd92f923a5b
--- /dev/null
+++ b/extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceResultBuildItem.java
@@ -0,0 +1,55 @@
+package io.quarkus.datasource.deployment.spi;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+
+public final class DevServicesDatasourceResultBuildItem extends SimpleBuildItem {
+
+    final DbResult defaultDatasource;
+    final Map<String, DbResult> namedDatasources;
+
+    public DevServicesDatasourceResultBuildItem(DbResult defaultDatasource, Map<String, DbResult> namedDatasources) {
+        this.defaultDatasource = defaultDatasource;
+        this.namedDatasources = Collections.unmodifiableMap(namedDatasources);
+    }
+
+    public DbResult getDefaultDatasource() {
+        return defaultDatasource;
+    }
+
+    public Map<String, DbResult> getNamedDatasources() {
+        return namedDatasources;
+    }
+
+    public static DbResult resolve(Optional<DevServicesDatasourceResultBuildItem> devDbResultBuildItem, String dataSourceName) {
+        if (devDbResultBuildItem.isPresent()) {
+            if (dataSourceName.equals(DataSourceUtil.DEFAULT_DATASOURCE_NAME)) {
+                return devDbResultBuildItem.get().defaultDatasource;
+            }
+            return devDbResultBuildItem.get().namedDatasources.get(dataSourceName);
+        }
+        return null;
+    }
+
+    public static class DbResult {
+        final String dbType;
+        final Map<String, String> configProperties;
+
+        public DbResult(String dbType, Map<String, String> configProperties) {
+            this.dbType = dbType;
+            this.configProperties = Collections.unmodifiableMap(configProperties);
+        }
+
+        public String getDbType() {
+            return dbType;
+        }
+
+        public Map<String, String> getConfigProperties() {
+            return configProperties;
+        }
+    }
+}
diff --git a/extensions/datasource/deployment/pom.xml b/extensions/datasource/deployment/pom.xml
index c05bb2f91415d..5306f76c8e6b3 100644
--- a/extensions/datasource/deployment/pom.xml
+++ b/extensions/datasource/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-datasource-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-datasource</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DummyForJavadoc.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DummyForJavadoc.java
deleted file mode 100644
index 02399e135310f..0000000000000
--- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/DummyForJavadoc.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.datasource.deployment;
-
-/**
- * Quick workaround to have at least one public class and generate a Javadoc jar.
- */
-public class DummyForJavadoc {
-
-}
diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
new file mode 100644
index 0000000000000..c90126381936e
--- /dev/null
+++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
@@ -0,0 +1,232 @@
+package io.quarkus.datasource.deployment.devservices;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
+
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem;
+import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig;
+import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
+import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
+import io.quarkus.deployment.builditem.ServiceStartBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.runtime.LaunchMode;
+
+public class DevServicesDatasourceProcessor {
+
+    private static final Logger log = Logger.getLogger(DevServicesDatasourceProcessor.class);
+
+    static volatile List<Closeable> databases;
+
+    static volatile Map<String, String> cachedProperties;
+
+    static volatile boolean first = true;
+
+    @BuildStep(onlyIfNot = IsNormal.class)
+    DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem curateOutcomeBuildItem,
+            List<DefaultDataSourceDbKindBuildItem> installedDrivers,
+            List<DevServicesDatasourceProviderBuildItem> devDBProviders,
+            DataSourcesBuildTimeConfig dataSourceBuildTimeConfig,
+            LaunchModeBuildItem launchMode,
+            BuildProducer<RunTimeConfigurationDefaultBuildItem> runTimeConfigurationDefaultBuildItemBuildProducer,
+            List<DevServicesDatasourceConfigurationHandlerBuildItem> configurationHandlerBuildItems,
+            BuildProducer<ServiceStartBuildItem> serviceStartBuildItemBuildProducer) {
+        //figure out if we need to shut down and restart existing databases
+        //if not and the DB's have already started we just return
+        if (databases != null) {
+            boolean restartRequired = launchMode.getLaunchMode() == LaunchMode.TEST;
+            if (!restartRequired) {
+                for (Map.Entry<String, String> i : cachedProperties.entrySet()) {
+                    if (!Objects.equals(i.getValue(),
+                            ConfigProvider.getConfig().getOptionalValue(i.getKey(), String.class).orElse(null))) {
+                        restartRequired = true;
+                        break;
+                    }
+                }
+            }
+            if (!restartRequired) {
+                return null;
+            }
+            for (Closeable i : databases) {
+                try {
+                    i.close();
+                } catch (Throwable e) {
+                    log.error("Failed to stop database", e);
+                }
+            }
+            databases = null;
+            cachedProperties = null;
+        }
+        DevServicesDatasourceResultBuildItem.DbResult defaultResult;
+        Map<String, DevServicesDatasourceResultBuildItem.DbResult> namedResults = new HashMap<>();
+        //now we need to figure out if we need to launch some databases
+        //note that because we run in dev and test mode only we know the runtime
+        //config at build time, as they both execute in the same JVM
+
+        //to keep things simpler for now we are only going to support this for the default datasource
+        //support for named datasources will come later
+
+        Map<String, String> propertiesMap = new HashMap<>();
+        List<Closeable> closeableList = new ArrayList<>();
+        Map<String, List<DevServicesDatasourceConfigurationHandlerBuildItem>> configHandlersByDbType = configurationHandlerBuildItems
+                .stream()
+                .collect(Collectors.toMap(DevServicesDatasourceConfigurationHandlerBuildItem::getDbKind,
+                        Collections::singletonList,
+                        (configurationHandlerBuildItems1, configurationHandlerBuildItems2) -> {
+                            List<DevServicesDatasourceConfigurationHandlerBuildItem> ret = new ArrayList<>();
+                            ret.addAll(configurationHandlerBuildItems1);
+                            ret.addAll(configurationHandlerBuildItems2);
+                            return ret;
+                        }));
+        Map<String, DevServicesDatasourceProvider> devDBProviderMap = devDBProviders.stream()
+                .collect(Collectors.toMap(DevServicesDatasourceProviderBuildItem::getDatabase,
+                        DevServicesDatasourceProviderBuildItem::getDevServicesProvider));
+
+        defaultResult = startDevDb(null, curateOutcomeBuildItem, installedDrivers, devDBProviderMap,
+                dataSourceBuildTimeConfig.defaultDataSource,
+                configHandlersByDbType, propertiesMap, closeableList);
+        if (defaultResult != null) {
+            for (Map.Entry<String, String> i : defaultResult.getConfigProperties().entrySet()) {
+                runTimeConfigurationDefaultBuildItemBuildProducer
+                        .produce(new RunTimeConfigurationDefaultBuildItem(i.getKey(), i.getValue()));
+            }
+        }
+        for (Map.Entry<String, DataSourceBuildTimeConfig> entry : dataSourceBuildTimeConfig.namedDataSources.entrySet()) {
+            DevServicesDatasourceResultBuildItem.DbResult result = startDevDb(entry.getKey(), curateOutcomeBuildItem,
+                    installedDrivers,
+                    devDBProviderMap, entry.getValue(), configHandlersByDbType, propertiesMap, closeableList);
+            if (result != null) {
+                namedResults.put(entry.getKey(), result);
+                for (Map.Entry<String, String> i : result.getConfigProperties().entrySet()) {
+                    runTimeConfigurationDefaultBuildItemBuildProducer
+                            .produce(new RunTimeConfigurationDefaultBuildItem(i.getKey(), i.getValue()));
+                }
+            }
+        }
+
+        if (first) {
+            first = false;
+            Runnable closeTask = new Runnable() {
+                @Override
+                public void run() {
+                    if (databases != null) {
+                        for (Closeable i : databases) {
+                            try {
+                                i.close();
+                            } catch (Throwable t) {
+                                log.error("Failed to stop database", t);
+                            }
+                        }
+                    }
+                    first = true;
+                    databases = null;
+                    cachedProperties = null;
+                }
+            };
+            QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+            ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask);
+            Thread closeHookThread = new Thread(closeTask, "Database shutdown thread");
+            Runtime.getRuntime().addShutdownHook(closeHookThread);
+            ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() {
+                @Override
+                public void run() {
+                    Runtime.getRuntime().removeShutdownHook(closeHookThread);
+                }
+            });
+        }
+        databases = closeableList;
+        cachedProperties = propertiesMap;
+        return new DevServicesDatasourceResultBuildItem(defaultResult, namedResults);
+    }
+
+    private DevServicesDatasourceResultBuildItem.DbResult startDevDb(String dbName,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            List<DefaultDataSourceDbKindBuildItem> installedDrivers,
+            Map<String, DevServicesDatasourceProvider> devDBProviders, DataSourceBuildTimeConfig dataSourceBuildTimeConfig,
+            Map<String, List<DevServicesDatasourceConfigurationHandlerBuildItem>> configurationHandlerBuildItems,
+            Map<String, String> propertiesMap, List<Closeable> closeableList) {
+        Optional<String> defaultDbKind = DefaultDataSourceDbKindBuildItem.resolve(
+                dataSourceBuildTimeConfig.dbKind,
+                installedDrivers, curateOutcomeBuildItem);
+
+        if (!defaultDbKind.isPresent()) {
+            //nothing we can do
+            log.warn("Unable to determine a database type for " + (dbName == null ? "default datasource" : dbName));
+            return null;
+        }
+        DevServicesDatasourceProvider devDbProvider = devDBProviders.get(defaultDbKind.get());
+        List<DevServicesDatasourceConfigurationHandlerBuildItem> configHandlers = configurationHandlerBuildItems
+                .get(defaultDbKind.get());
+        if (devDbProvider == null || configHandlers == null) {
+            log.warn("Unable to start devservices for " + (dbName == null ? "default datasource" : dbName)
+                    + " as this datasource type (" + defaultDbKind.get() + ") does not support devservices");
+            return null;
+        }
+
+        Optional<Boolean> enabled = dataSourceBuildTimeConfig.devservices.enabled;
+        if (enabled.isPresent()) {
+            if (!enabled.get()) {
+                //explicitly disabled
+                log.debug("Not starting devservices for " + (dbName == null ? "default datasource" : dbName)
+                        + " as it has been disabled in the config");
+                return null;
+            }
+        } else {
+            for (DevServicesDatasourceConfigurationHandlerBuildItem i : configHandlers) {
+                if (i.getCheckConfiguredFunction().test(dbName)) {
+                    //this database has explicit configuration
+                    //we don't start the devservices
+                    log.debug("Not starting devservices for " + (dbName == null ? "default datasource" : dbName)
+                            + " as it has explicit configuration");
+                    return null;
+                }
+            }
+        }
+        //ok, so we know we need to start one
+
+        String prefix = "quarkus.datasource.";
+        if (dbName != null) {
+            prefix = prefix + dbName + ".";
+        }
+
+        DevServicesDatasourceProvider.RunningDevServicesDatasource datasource = devDbProvider
+                .startDatabase(ConfigProvider.getConfig().getOptionalValue(prefix + "username", String.class),
+                        ConfigProvider.getConfig().getOptionalValue(prefix + "password", String.class),
+                        Optional.ofNullable(dbName), dataSourceBuildTimeConfig.devservices.imageName,
+                        dataSourceBuildTimeConfig.devservices.properties);
+        closeableList.add(datasource.getCloseTask());
+
+        Map<String, String> devDebProperties = new HashMap<>();
+        propertiesMap.put(prefix + "db-kind", dataSourceBuildTimeConfig.dbKind.orElse(null));
+        for (DevServicesDatasourceConfigurationHandlerBuildItem devDbConfigurationHandlerBuildItem : configHandlers) {
+            devDebProperties.putAll(devDbConfigurationHandlerBuildItem.getConfigProviderFunction()
+                    .apply(dbName, datasource));
+        }
+        devDebProperties.put(prefix + "db-kind", defaultDbKind.get());
+        if (datasource.getUsername() != null) {
+            devDebProperties.put(prefix + "username", datasource.getUsername());
+        }
+        if (datasource.getPassword() != null) {
+            devDebProperties.put(prefix + "password", datasource.getPassword());
+        }
+        return new DevServicesDatasourceResultBuildItem.DbResult(defaultDbKind.get(), devDebProperties);
+    }
+}
diff --git a/extensions/datasource/pom.xml b/extensions/datasource/pom.xml
index 0253e1ca568ed..3831e40d41a48 100644
--- a/extensions/datasource/pom.xml
+++ b/extensions/datasource/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,5 +17,6 @@
         <module>common</module>
         <module>deployment</module>
         <module>runtime</module>
+        <module>deployment-spi</module>
     </modules>
 </project>
diff --git a/extensions/datasource/runtime/pom.xml b/extensions/datasource/runtime/pom.xml
index 002e30226bbe3..4cb3c34c53622 100644
--- a/extensions/datasource/runtime/pom.xml
+++ b/extensions/datasource/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-datasource-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java
index af5286e0d65f2..96d00399d4dae 100644
--- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java
+++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java
@@ -16,4 +16,10 @@ public class DataSourceBuildTimeConfig {
     @ConvertWith(DatabaseKindConverter.class)
     public Optional<String> dbKind = Optional.empty();
 
+    /**
+     * Configuration for DevServices. DevServices allows Quarkus to automatically start a database in dev and test mode.
+     */
+    @ConfigItem
+    public DevServicesBuildTimeConfig devservices;
+
 }
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java
index 82c9f351e8ce0..843523b3b0849 100644
--- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java
+++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java
@@ -36,4 +36,13 @@ public class DataSourceRuntimeConfig {
      */
     @ConfigItem
     public Optional<String> credentialsProviderName = Optional.empty();
+
+    /**
+     * If this is true then when running in dev or test mode Quarkus will attempt to start a testcontainers based
+     * database with these provided settings.
+     *
+     * This is not supported for all databases, and will not work in production.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean startContainer;
 }
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesBuildTimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesBuildTimeConfig.java
index 950ab6ea0fa9d..263d054407e13 100644
--- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesBuildTimeConfig.java
+++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesBuildTimeConfig.java
@@ -1,7 +1,9 @@
 package io.quarkus.datasource.runtime;
 
 import java.util.Map;
+import java.util.Optional;
 
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -34,7 +36,7 @@ public class DataSourcesBuildTimeConfig {
     public boolean healthEnabled;
 
     /**
-     * Whether or not datasource metrics are published in case the smallrye-metrics extension is present.
+     * Whether or not datasource metrics are published in case a metrics extension is present.
      * <p>
      * This is a global setting and is not specific to a datasource.
      * <p>
@@ -44,4 +46,35 @@ public class DataSourcesBuildTimeConfig {
     @ConfigItem(name = "metrics.enabled")
     public boolean metricsEnabled;
 
+    /**
+     * Only here to detect configuration errors.
+     * <p>
+     * This used to be runtime but we don't really care, we just want to catch invalid configurations.
+     *
+     * @deprecated
+     */
+    @Deprecated
+    public Optional<String> url;
+
+    /**
+     * Only here to detect configuration errors.
+     *
+     * @deprecated
+     */
+    @Deprecated
+    public Optional<String> driver;
+
+    public DataSourceBuildTimeConfig getDataSourceRuntimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceBuildTimeConfig dataSourceBuildTimeConfig = namedDataSources.get(dataSourceName);
+        if (dataSourceBuildTimeConfig == null) {
+            return new DataSourceBuildTimeConfig();
+        }
+
+        return dataSourceBuildTimeConfig;
+    }
+
 }
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesRuntimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesRuntimeConfig.java
index a92e1ea3c1a8e..a45770def8706 100644
--- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesRuntimeConfig.java
+++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourcesRuntimeConfig.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -24,4 +25,17 @@ public class DataSourcesRuntimeConfig {
     @ConfigDocMapKey("datasource-name")
     @ConfigItem(name = ConfigItem.PARENT)
     public Map<String, DataSourceRuntimeConfig> namedDataSources;
+
+    public DataSourceRuntimeConfig getDataSourceRuntimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceRuntimeConfig dataSourceRuntimeConfig = namedDataSources.get(dataSourceName);
+        if (dataSourceRuntimeConfig == null) {
+            return new DataSourceRuntimeConfig();
+        }
+
+        return dataSourceRuntimeConfig;
+    }
 }
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java
new file mode 100644
index 0000000000000..f681c427eba6a
--- /dev/null
+++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java
@@ -0,0 +1,35 @@
+package io.quarkus.datasource.runtime;
+
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class DevServicesBuildTimeConfig {
+
+    /**
+     * If DevServices has been explicitly enabled or disabled. DevServices is generally enabled
+     * by default, unless there is an existing configuration present.
+     *
+     * When DevServices is enabled Quarkus will attempt to automatically configure and start
+     * a database when running in Dev or Test mode.
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Optional<Boolean> enabled = Optional.empty();
+
+    /**
+     * The container image name to use, for container based DevServices providers.
+     *
+     * If the provider is not container based (e.g. a H2 Database) then this has no effect.
+     */
+    @ConfigItem
+    public Optional<String> imageName;
+
+    /**
+     * Generic properties that are added to the database connection URL.
+     */
+    @ConfigItem
+    public Map<String, String> properties;
+}
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/LegacyDataSourceRuntimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/LegacyDataSourceRuntimeConfig.java
deleted file mode 100644
index d27f6c05af250..0000000000000
--- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/LegacyDataSourceRuntimeConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.datasource.runtime;
-
-import java.util.Optional;
-
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-
-/**
- * This configuration class is here for compatibility reason and is planned for removal.
- */
-@Deprecated
-@ConfigGroup
-public class LegacyDataSourceRuntimeConfig {
-
-    /**
-     * @deprecated use either quarkus.datasource.jdbc.url or quarkus.datasource.reactive.url.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<String> url;
-
-    /**
-     * @deprecated use either quarkus.datasource.jdbc.max-size or quarkus.datasource.reactive.max-size.
-     */
-    @ConfigItem(defaultValue = "20")
-    public int maxSize = 20;
-}
diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/LegacyDataSourcesRuntimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/LegacyDataSourcesRuntimeConfig.java
deleted file mode 100644
index af3f6aae8b1cd..0000000000000
--- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/LegacyDataSourcesRuntimeConfig.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.quarkus.datasource.runtime;
-
-import java.util.Map;
-
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-/**
- * This configuration class is here for compatibility reason and is planned for removal.
- */
-@Deprecated
-@ConfigRoot(name = "datasource", phase = ConfigPhase.RUN_TIME)
-public class LegacyDataSourcesRuntimeConfig {
-
-    /**
-     * The default datasource.
-     */
-    @ConfigItem(name = ConfigItem.PARENT)
-    public LegacyDataSourceRuntimeConfig defaultDataSource;
-
-    /**
-     * Additional named datasources.
-     */
-    @ConfigDocSection
-    @ConfigDocMapKey("datasource-name")
-    @ConfigItem(name = ConfigItem.PARENT)
-    public Map<String, LegacyDataSourceRuntimeConfig> namedDataSources;
-}
diff --git a/extensions/devservices/db2/pom.xml b/extensions/devservices/db2/pom.xml
new file mode 100644
index 0000000000000..a618290b07f9a
--- /dev/null
+++ b/extensions/devservices/db2/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-db2</artifactId>
+    <name>Quarkus - DevServices - DB2</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>db2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.db2</groupId>
+            <artifactId>jcc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java b/extensions/devservices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java
new file mode 100644
index 0000000000000..19ec6c3b2ef8c
--- /dev/null
+++ b/extensions/devservices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java
@@ -0,0 +1,42 @@
+package io.quarkus.devservices.db2.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+
+import org.testcontainers.containers.Db2Container;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class DB2DevServicesProcessor {
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupDB2() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.DB2, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                Db2Container container = new Db2Container(
+                        imageName.orElse("ibmcom/db2:" + Db2Container.DEFAULT_TAG))
+                                .withPassword(password.orElse("quarkus"))
+                                .withUsername(username.orElse("quarkus"))
+                                .withDatabaseName(datasourceName.orElse("default"));
+                additionalProperties.forEach(container::withUrlParam);
+                container.start();
+                return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
+                        container.getPassword(),
+                        new Closeable() {
+                            @Override
+                            public void close() throws IOException {
+                                container.stop();
+                            }
+                        });
+            }
+        });
+    }
+
+}
diff --git a/extensions/devservices/derby/pom.xml b/extensions/devservices/derby/pom.xml
new file mode 100644
index 0000000000000..3187ee20cb35b
--- /dev/null
+++ b/extensions/devservices/derby/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-derby</artifactId>
+    <name>Quarkus - DevServices - Derby</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/derby/src/main/java/io/quarkus/devservices/postgresql/deployment/DerbyDevServicesProcessor.java b/extensions/devservices/derby/src/main/java/io/quarkus/devservices/postgresql/deployment/DerbyDevServicesProcessor.java
new file mode 100644
index 0000000000000..d6de868ab047d
--- /dev/null
+++ b/extensions/devservices/derby/src/main/java/io/quarkus/devservices/postgresql/deployment/DerbyDevServicesProcessor.java
@@ -0,0 +1,77 @@
+package io.quarkus.devservices.postgresql.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.derby.drda.NetworkServerControl;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class DerbyDevServicesProcessor {
+
+    static final int NUMBER_OF_PINGS = 10;
+    static final int SLEEP_BETWEEN_PINGS = 500;
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupDerby() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.DERBY, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                try {
+                    NetworkServerControl server = new NetworkServerControl();
+                    server.start(new PrintWriter(System.out));
+                    for (int i = 1; i <= NUMBER_OF_PINGS; i++) {
+                        try {
+                            System.out.println("[INFO] Attempt " + i + " to see if Derby Network server started");
+                            server.ping();
+                            break;
+                        } catch (Exception ex) {
+                            if (i == NUMBER_OF_PINGS) {
+                                System.out.println("Derby Network server failed to start");
+                                ex.printStackTrace();
+                                throw ex;
+                            }
+                            try {
+                                Thread.sleep(SLEEP_BETWEEN_PINGS);
+                            } catch (InterruptedException ignore) {
+                            }
+                        }
+                    }
+                    StringBuilder additionalArgs = new StringBuilder();
+                    for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
+                        additionalArgs.append(";");
+                        additionalArgs.append(i.getKey());
+                        additionalArgs.append("=");
+                        additionalArgs.append(i.getValue());
+                    }
+                    return new RunningDevServicesDatasource(
+                            "jdbc:derby://localhost:1527/memory:" + datasourceName.orElse("quarkus") + ";create=true"
+                                    + additionalArgs.toString(),
+                            null,
+                            null,
+                            new Closeable() {
+                                @Override
+                                public void close() throws IOException {
+                                    try {
+                                        NetworkServerControl server = new NetworkServerControl();
+                                        server.shutdown();
+                                        System.out.println("[INFO] Derby database was shut down");
+                                    } catch (Exception e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                }
+                            });
+                } catch (Exception throwable) {
+                    throw new RuntimeException(throwable);
+                }
+            }
+        });
+    }
+}
diff --git a/extensions/devservices/h2/pom.xml b/extensions/devservices/h2/pom.xml
new file mode 100644
index 0000000000000..e01ae5f9430ff
--- /dev/null
+++ b/extensions/devservices/h2/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-h2</artifactId>
+    <name>Quarkus - DevServices - H2</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/h2/src/main/java/io/quarkus/devservices/postgresql/deployment/H2DevServicesProcessor.java b/extensions/devservices/h2/src/main/java/io/quarkus/devservices/postgresql/deployment/H2DevServicesProcessor.java
new file mode 100644
index 0000000000000..729e5fe190578
--- /dev/null
+++ b/extensions/devservices/h2/src/main/java/io/quarkus/devservices/postgresql/deployment/H2DevServicesProcessor.java
@@ -0,0 +1,69 @@
+package io.quarkus.devservices.postgresql.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+import java.util.Optional;
+
+import org.h2.tools.Server;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class H2DevServicesProcessor {
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupH2() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.H2, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                try {
+                    final Server tcpServer = Server.createTcpServer("-tcpPort", "0");
+                    tcpServer.start();
+
+                    StringBuilder additionalArgs = new StringBuilder();
+                    for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
+                        additionalArgs.append(";");
+                        additionalArgs.append(i.getKey());
+                        additionalArgs.append("=");
+                        additionalArgs.append(i.getValue());
+                    }
+                    System.out
+                            .println("[INFO] H2 database started in TCP server mode; server status: " + tcpServer.getStatus());
+                    String connectionUrl = "jdbc:h2:tcp://localhost:" + tcpServer.getPort() + "/mem:"
+                            + datasourceName.orElse("default")
+                            + ";DB_CLOSE_DELAY=-1" + additionalArgs.toString();
+                    return new RunningDevServicesDatasource(
+                            connectionUrl,
+                            "sa",
+                            "sa",
+                            new Closeable() {
+                                @Override
+                                public void close() throws IOException {
+                                    //make sure the DB is removed on close
+                                    try (Connection connection = DriverManager.getConnection(connectionUrl, "sa", "sa")) {
+                                        try (Statement statement = connection.createStatement()) {
+                                            statement.execute("SET DB_CLOSE_DELAY 0");
+                                        }
+                                    } catch (SQLException t) {
+                                        t.printStackTrace();
+                                    }
+                                    tcpServer.stop();
+                                    System.out.println(
+                                            "[INFO] H2 database was shut down; server status: " + tcpServer.getStatus());
+                                }
+                            });
+                } catch (SQLException throwables) {
+                    throw new RuntimeException(throwables);
+                }
+            }
+        });
+    }
+}
diff --git a/extensions/devservices/mariadb/pom.xml b/extensions/devservices/mariadb/pom.xml
new file mode 100644
index 0000000000000..9af0b64e35714
--- /dev/null
+++ b/extensions/devservices/mariadb/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-mariadb</artifactId>
+    <name>Quarkus - DevServices - MariaDB</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mariadb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/postgresql/deployment/MariaDBDevServicesProcessor.java b/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/postgresql/deployment/MariaDBDevServicesProcessor.java
new file mode 100644
index 0000000000000..f3f9a9ea0ddda
--- /dev/null
+++ b/extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/postgresql/deployment/MariaDBDevServicesProcessor.java
@@ -0,0 +1,42 @@
+package io.quarkus.devservices.postgresql.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+
+import org.testcontainers.containers.MariaDBContainer;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class MariaDBDevServicesProcessor {
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupMariaDB() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.MARIADB, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                MariaDBContainer container = new MariaDBContainer(
+                        imageName.orElse(MariaDBContainer.IMAGE + ":" + MariaDBContainer.DEFAULT_TAG))
+                                .withPassword(password.orElse("quarkus"))
+                                .withUsername(username.orElse("quarkus"))
+                                .withDatabaseName(datasourceName.orElse("default"));
+                additionalProperties.forEach(container::withUrlParam);
+                container.start();
+                return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
+                        container.getPassword(),
+                        new Closeable() {
+                            @Override
+                            public void close() throws IOException {
+                                container.stop();
+                            }
+                        });
+            }
+        });
+    }
+
+}
diff --git a/extensions/devservices/mssql/pom.xml b/extensions/devservices/mssql/pom.xml
new file mode 100644
index 0000000000000..7cf81235367f4
--- /dev/null
+++ b/extensions/devservices/mssql/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-mssql</artifactId>
+    <name>Quarkus - DevServices - MSSQL</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mssqlserver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/mssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java b/extensions/devservices/mssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java
new file mode 100644
index 0000000000000..6b2bddc178fee
--- /dev/null
+++ b/extensions/devservices/mssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java
@@ -0,0 +1,41 @@
+package io.quarkus.devservices.mssql.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.MSSQLServerContainer;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class MSSQLDevServicesProcessor {
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupMSSQL() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.MSSQL, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                JdbcDatabaseContainer container = new MSSQLServerContainer(
+                        imageName.orElse(MSSQLServerContainer.IMAGE + ":" + MSSQLServerContainer.DEFAULT_TAG))
+                                .withPassword(password.orElse("Quarkuspassword1"));
+                additionalProperties.forEach(container::withUrlParam);
+                container.start();
+                return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
+                        container.getPassword(),
+                        new Closeable() {
+                            @Override
+                            public void close() throws IOException {
+                                container.stop();
+                            }
+                        });
+            }
+        });
+    }
+
+}
diff --git a/extensions/devservices/mysql/pom.xml b/extensions/devservices/mysql/pom.xml
new file mode 100644
index 0000000000000..04058995766ea
--- /dev/null
+++ b/extensions/devservices/mysql/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-mysql</artifactId>
+    <name>Quarkus - DevServices - MySQL</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>mysql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/mysql/src/main/java/io/quarkus/devservices/postgresql/deployment/MySQLDevServicesProcessor.java b/extensions/devservices/mysql/src/main/java/io/quarkus/devservices/postgresql/deployment/MySQLDevServicesProcessor.java
new file mode 100644
index 0000000000000..3058d55739610
--- /dev/null
+++ b/extensions/devservices/mysql/src/main/java/io/quarkus/devservices/postgresql/deployment/MySQLDevServicesProcessor.java
@@ -0,0 +1,42 @@
+package io.quarkus.devservices.postgresql.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+
+import org.testcontainers.containers.MySQLContainer;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class MySQLDevServicesProcessor {
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupMysql() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.MYSQL, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                MySQLContainer container = new MySQLContainer(
+                        imageName.orElse(MySQLContainer.IMAGE + ":" + MySQLContainer.DEFAULT_TAG))
+                                .withPassword(password.orElse("quarkus"))
+                                .withUsername(username.orElse("quarkus"))
+                                .withDatabaseName(datasourceName.orElse("default"));
+                additionalProperties.forEach(container::withUrlParam);
+                container.start();
+                return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
+                        container.getPassword(),
+                        new Closeable() {
+                            @Override
+                            public void close() throws IOException {
+                                container.stop();
+                            }
+                        });
+            }
+        });
+    }
+
+}
diff --git a/extensions/devservices/pom.xml b/extensions/devservices/pom.xml
new file mode 100644
index 0000000000000..28b06fd455407
--- /dev/null
+++ b/extensions/devservices/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-parent</artifactId>
+    <name>Quarkus - DevServices</name>
+    <description>
+        DevServices allows Quarkus to automatically configure and start databases and other containers in
+        dev and test mode.
+    </description>
+    <packaging>pom</packaging>
+    <modules>
+        <module>postgresql</module>
+        <module>mysql</module>
+        <module>mariadb</module>
+        <module>h2</module>
+        <module>derby</module>
+        <module>mssql</module>
+        <module>db2</module>
+    </modules>
+
+</project>
diff --git a/extensions/devservices/postgresql/pom.xml b/extensions/devservices/postgresql/pom.xml
new file mode 100644
index 0000000000000..079f81cd25b29
--- /dev/null
+++ b/extensions/devservices/postgresql/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-devservices-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-devservices-postgresql</artifactId>
+    <name>Quarkus - DevServices - Postgresql</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java b/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java
new file mode 100644
index 0000000000000..310d41b558093
--- /dev/null
+++ b/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java
@@ -0,0 +1,42 @@
+package io.quarkus.devservices.postgresql.deployment;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+
+import org.testcontainers.containers.PostgreSQLContainer;
+
+import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProviderBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+
+public class PostgresqlDevServicesProcessor {
+
+    @BuildStep
+    DevServicesDatasourceProviderBuildItem setupPostgres() {
+        return new DevServicesDatasourceProviderBuildItem(DatabaseKind.POSTGRESQL, new DevServicesDatasourceProvider() {
+            @Override
+            public RunningDevServicesDatasource startDatabase(Optional<String> username, Optional<String> password,
+                    Optional<String> datasourceName, Optional<String> imageName, Map<String, String> additionalProperties) {
+                PostgreSQLContainer container = new PostgreSQLContainer(
+                        imageName.orElse(PostgreSQLContainer.IMAGE + ":" + PostgreSQLContainer.DEFAULT_TAG))
+                                .withPassword(password.orElse("quarkus"))
+                                .withUsername(username.orElse("quarkus"))
+                                .withDatabaseName(datasourceName.orElse("default"));
+                additionalProperties.forEach(container::withUrlParam);
+                container.start();
+                return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
+                        container.getPassword(),
+                        new Closeable() {
+                            @Override
+                            public void close() throws IOException {
+                                container.stop();
+                            }
+                        });
+            }
+        });
+    }
+
+}
diff --git a/extensions/elasticsearch-rest-client-common/deployment/pom.xml b/extensions/elasticsearch-rest-client-common/deployment/pom.xml
index 3a4a0a046bbcd..c56ddb213e763 100644
--- a/extensions/elasticsearch-rest-client-common/deployment/pom.xml
+++ b/extensions/elasticsearch-rest-client-common/deployment/pom.xml
@@ -6,12 +6,11 @@
         <artifactId>quarkus-elasticsearch-rest-client-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-elasticsearch-rest-client-common-deployment</artifactId>
-    <name>Quarkus - Elasticsearch REST client - Deployment</name>
+    <name>Quarkus - Elasticsearch REST client common - Deployment</name>
 
     <dependencies>
         <dependency>
diff --git a/extensions/elasticsearch-rest-client-common/pom.xml b/extensions/elasticsearch-rest-client-common/pom.xml
index 0f20c640641ab..186615e41e0e5 100644
--- a/extensions/elasticsearch-rest-client-common/pom.xml
+++ b/extensions/elasticsearch-rest-client-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elasticsearch-rest-client-common/runtime/pom.xml b/extensions/elasticsearch-rest-client-common/runtime/pom.xml
index 49bee4f77e45f..ad08b3c2b8693 100644
--- a/extensions/elasticsearch-rest-client-common/runtime/pom.xml
+++ b/extensions/elasticsearch-rest-client-common/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elasticsearch-rest-client-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,6 +44,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/elasticsearch-rest-client/deployment/pom.xml b/extensions/elasticsearch-rest-client/deployment/pom.xml
index 379ab306974f6..314a5c7744d5a 100644
--- a/extensions/elasticsearch-rest-client/deployment/pom.xml
+++ b/extensions/elasticsearch-rest-client/deployment/pom.xml
@@ -34,6 +34,13 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
         </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java
new file mode 100644
index 0000000000000..06c308031e99f
--- /dev/null
+++ b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java
@@ -0,0 +1,55 @@
+package io.quarkus.elasticsearch.restclient.lowlevel.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
+import org.elasticsearch.client.RestClientBuilder;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.elasticsearch.restclient.lowlevel.ElasticsearchClientConfig;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ElasticsearchClientConfigTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(
+                    () -> ShrinkWrap.create(JavaArchive.class).addClass(TestConfigurator.class)
+                            .addAsResource(new StringAsset("quarkus.elasticsearch.hosts=elasticsearch:9200"),
+                                    "application.properties"));
+
+    @Inject
+    ElasticsearchConfig config;
+    @Inject
+    @ElasticsearchClientConfig
+    TestConfigurator testConfigurator;
+
+    @Test
+    public void testRestClientBuilderHelperWithElasticsearchClientConfig() {
+        RestClientBuilderHelper.createRestClientBuilder(config).build();
+        assertTrue(testConfigurator.isInvoked());
+    }
+
+    @ElasticsearchClientConfig
+    @ApplicationScoped
+    public static class TestConfigurator implements RestClientBuilder.HttpClientConfigCallback {
+        private boolean invoked = false;
+
+        @Override
+        public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder builder) {
+            invoked = true;
+            return builder;
+        }
+
+        public boolean isInvoked() {
+            return invoked;
+        }
+    }
+
+}
diff --git a/extensions/elasticsearch-rest-client/pom.xml b/extensions/elasticsearch-rest-client/pom.xml
index 41ed2e11676c0..3fe3538d20f32 100644
--- a/extensions/elasticsearch-rest-client/pom.xml
+++ b/extensions/elasticsearch-rest-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java
new file mode 100644
index 0000000000000..1af174c1e9bc8
--- /dev/null
+++ b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/ElasticsearchClientConfig.java
@@ -0,0 +1,28 @@
+package io.quarkus.elasticsearch.restclient.lowlevel;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+
+/**
+ * Annotate implementations of {@code org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback} to provide further
+ * configuration of injected Elasticsearch {@code RestClient} You may provide multiple implementations each annotated with
+ * {@code ElasticsearchClientConfig} and configuration provided by each implementation will be applied in a randomly ordered
+ * cascading manner
+ */
+@Qualifier
+@Target({ FIELD, TYPE, PARAMETER })
+@Retention(RUNTIME)
+public @interface ElasticsearchClientConfig {
+
+    class Literal extends AnnotationLiteral<ElasticsearchClientConfig> implements ElasticsearchClientConfig {
+
+    }
+}
diff --git a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/RestClientBuilderHelper.java b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/RestClientBuilderHelper.java
index 1262b78f75380..7c1f6272d308f 100644
--- a/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/RestClientBuilderHelper.java
+++ b/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/RestClientBuilderHelper.java
@@ -21,6 +21,10 @@
 import org.elasticsearch.client.sniff.SnifferBuilder;
 import org.jboss.logging.Logger;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.elasticsearch.restclient.lowlevel.ElasticsearchClientConfig;
+
 public final class RestClientBuilderHelper {
 
     private static final Logger LOG = Logger.getLogger(RestClientBuilderHelper.class);
@@ -77,7 +81,16 @@ public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpCli
                     httpClientBuilder.setSSLStrategy(NoopIOSessionStrategy.INSTANCE);
                 }
 
-                return httpClientBuilder;
+                // Apply configuration from RestClientBuilder.HttpClientConfigCallback implementations annotated with ElasticsearchClientConfig
+                HttpAsyncClientBuilder result = httpClientBuilder;
+                Iterable<InstanceHandle<RestClientBuilder.HttpClientConfigCallback>> handles = Arc.container()
+                        .select(RestClientBuilder.HttpClientConfigCallback.class, new ElasticsearchClientConfig.Literal())
+                        .handles();
+                for (InstanceHandle<RestClientBuilder.HttpClientConfigCallback> handle : handles) {
+                    result = handle.get().customizeHttpClient(result);
+                    handle.close();
+                }
+                return result;
             }
         });
 
diff --git a/extensions/elasticsearch-rest-client/runtime/src/main/resources/quarkus-extension.yaml b/extensions/elasticsearch-rest-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/elasticsearch-rest-client/runtime/src/main/resources/quarkus-extension.yaml
rename to extensions/elasticsearch-rest-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/elasticsearch-rest-high-level-client/pom.xml b/extensions/elasticsearch-rest-high-level-client/pom.xml
index 4f356f28a2b78..79f0f2240d206 100644
--- a/extensions/elasticsearch-rest-high-level-client/pom.xml
+++ b/extensions/elasticsearch-rest-high-level-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/quarkus-extension.yaml b/extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/quarkus-extension.yaml
rename to extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/elytron-security-common/deployment/pom.xml b/extensions/elytron-security-common/deployment/pom.xml
index 918566bbf26fc..ee2a9b249beca 100644
--- a/extensions/elytron-security-common/deployment/pom.xml
+++ b/extensions/elytron-security-common/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security-common/pom.xml b/extensions/elytron-security-common/pom.xml
index 87f78bd184749..2172b9de5e91a 100644
--- a/extensions/elytron-security-common/pom.xml
+++ b/extensions/elytron-security-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security-common/runtime/pom.xml b/extensions/elytron-security-common/runtime/pom.xml
index 098e5390a7fb0..2e8180020a343 100644
--- a/extensions/elytron-security-common/runtime/pom.xml
+++ b/extensions/elytron-security-common/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,6 +20,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
diff --git a/extensions/elytron-security-jdbc/deployment/pom.xml b/extensions/elytron-security-jdbc/deployment/pom.xml
index 69f4b0914705c..2052e377cb9ff 100644
--- a/extensions/elytron-security-jdbc/deployment/pom.xml
+++ b/extensions/elytron-security-jdbc/deployment/pom.xml
@@ -36,11 +36,6 @@
             <artifactId>quarkus-agroal-deployment</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-undertow-deployment</artifactId>
diff --git a/extensions/elytron-security-jdbc/deployment/src/main/java/io/quarkus/elytron/security/jdbc/deployment/ElytronSecurityJdbcProcessor.java b/extensions/elytron-security-jdbc/deployment/src/main/java/io/quarkus/elytron/security/jdbc/deployment/ElytronSecurityJdbcProcessor.java
index 3db87dbc27fe9..deb65039e9d27 100644
--- a/extensions/elytron-security-jdbc/deployment/src/main/java/io/quarkus/elytron/security/jdbc/deployment/ElytronSecurityJdbcProcessor.java
+++ b/extensions/elytron-security-jdbc/deployment/src/main/java/io/quarkus/elytron/security/jdbc/deployment/ElytronSecurityJdbcProcessor.java
@@ -4,7 +4,7 @@
 
 import org.wildfly.security.auth.server.SecurityRealm;
 
-import io.quarkus.agroal.deployment.JdbcDataSourceBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
diff --git a/extensions/elytron-security-ldap/deployment/pom.xml b/extensions/elytron-security-ldap/deployment/pom.xml
index 3cf64668dd879..d9c58274e63f5 100644
--- a/extensions/elytron-security-ldap/deployment/pom.xml
+++ b/extensions/elytron-security-ldap/deployment/pom.xml
@@ -32,11 +32,6 @@
             <artifactId>quarkus-elytron-security-deployment</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-undertow-deployment</artifactId>
diff --git a/extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/ElytronSecurityLdapProcessor.java b/extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/ElytronSecurityLdapProcessor.java
index 15269fe075728..add5914fb6696 100644
--- a/extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/ElytronSecurityLdapProcessor.java
+++ b/extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/ElytronSecurityLdapProcessor.java
@@ -16,8 +16,8 @@
 import io.quarkus.elytron.security.deployment.SecurityRealmBuildItem;
 import io.quarkus.elytron.security.ldap.LdapRecorder;
 import io.quarkus.elytron.security.ldap.QuarkusDirContextFactory;
-import io.quarkus.elytron.security.ldap.config.LdapSecurityRealmBuildTimeConfig;
 import io.quarkus.elytron.security.ldap.config.LdapSecurityRealmRuntimeConfig;
+import io.quarkus.elytron.security.ldap.deployment.config.LdapSecurityRealmBuildTimeConfig;
 import io.quarkus.runtime.RuntimeValue;
 
 class ElytronSecurityLdapProcessor {
diff --git a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/LdapSecurityRealmBuildTimeConfig.java b/extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/config/LdapSecurityRealmBuildTimeConfig.java
similarity index 85%
rename from extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/LdapSecurityRealmBuildTimeConfig.java
rename to extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/config/LdapSecurityRealmBuildTimeConfig.java
index 7982341874a39..cde9faf29fa6b 100644
--- a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/LdapSecurityRealmBuildTimeConfig.java
+++ b/extensions/elytron-security-ldap/deployment/src/main/java/io/quarkus/elytron/security/ldap/deployment/config/LdapSecurityRealmBuildTimeConfig.java
@@ -1,4 +1,4 @@
-package io.quarkus.elytron.security.ldap.config;
+package io.quarkus.elytron.security.ldap.deployment.config;
 
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
@@ -8,7 +8,7 @@
  * A configuration object for a LDAP based realm configuration,
  * {@linkplain org.wildfly.security.auth.realm.ldap.LdapSecurityRealm}
  */
-@ConfigRoot(name = "security.ldap", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+@ConfigRoot(name = "security.ldap", phase = ConfigPhase.BUILD_TIME)
 public class LdapSecurityRealmBuildTimeConfig {
 
     /**
diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/LdapSecurityRealmTest.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/LdapSecurityRealmTest.java
index ed589a1af7aed..95c5d47be5cb3 100644
--- a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/LdapSecurityRealmTest.java
+++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/LdapSecurityRealmTest.java
@@ -32,6 +32,13 @@ public void testSecureAccessFailure() {
                 .statusCode(401);
     }
 
+    @Test()
+    public void testNotSearchingRecursiveFailure() {
+        RestAssured.given().auth().preemptive().basic("subUser", "subUserPassword")
+                .when().get("/servlet-secured").then()
+                .statusCode(401);
+    }
+
     @Test()
     public void testSecureRoleFailure() {
         RestAssured.given().auth().preemptive().basic("noRoleUser", "noRoleUserPassword")
diff --git a/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java
new file mode 100644
index 0000000000000..b90805c2937c7
--- /dev/null
+++ b/extensions/elytron-security-ldap/deployment/src/test/java/io/quarkus/elytron/security/ldap/SearchRecursiveTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.elytron.security.ldap;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.elytron.security.ldap.rest.SingleRoleSecuredServlet;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.ldap.LdapServerTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(LdapServerTestResource.class)
+public class SearchRecursiveTest {
+
+    protected static Class[] testClasses = {
+            SingleRoleSecuredServlet.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("search-recursive/application.properties", "application.properties"));
+
+    @Test()
+    public void testNotSearchingRecursiveFailure() {
+        RestAssured.given().auth().preemptive().basic("subUser", "subUserPassword")
+                .when().get("/servlet-secured").then()
+                .statusCode(200);
+    }
+}
diff --git a/extensions/elytron-security-ldap/deployment/src/test/resources/search-recursive/application.properties b/extensions/elytron-security-ldap/deployment/src/test/resources/search-recursive/application.properties
new file mode 100644
index 0000000000000..7d5ab1814eaf5
--- /dev/null
+++ b/extensions/elytron-security-ldap/deployment/src/test/resources/search-recursive/application.properties
@@ -0,0 +1,12 @@
+quarkus.security.ldap.enabled=true
+
+quarkus.security.ldap.dir-context.principal=uid=admin,ou=system
+quarkus.security.ldap.dir-context.url=ldap://127.0.0.1:10389
+quarkus.security.ldap.dir-context.password=secret
+
+quarkus.security.ldap.identity-mapping.search-recursive=true
+quarkus.security.ldap.identity-mapping.search-base-dn=ou=Users,dc=quarkus,dc=io
+
+quarkus.security.ldap.identity-mapping.attribute-mappings."0".from=cn
+quarkus.security.ldap.identity-mapping.attribute-mappings."0".filter=(member=uid={0},ou=SubUsers,ou=Users,dc=quarkus,dc=io)
+quarkus.security.ldap.identity-mapping.attribute-mappings."0".filter-base-dn=ou=Roles,dc=quarkus,dc=io
diff --git a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/LdapRecorder.java b/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/LdapRecorder.java
index fcef51078e622..4d30255d81d38 100644
--- a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/LdapRecorder.java
+++ b/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/LdapRecorder.java
@@ -29,19 +29,25 @@ public class LdapRecorder {
      * @return runtime value wrapper for the SecurityRealm
      */
     public RuntimeValue<SecurityRealm> createRealm(LdapSecurityRealmRuntimeConfig runtimeConfig) {
-        LdapSecurityRealmBuilder builder = LdapSecurityRealmBuilder.builder()
+        LdapSecurityRealmBuilder.IdentityMappingBuilder identityMappingBuilder = LdapSecurityRealmBuilder.builder()
                 .setDirContextSupplier(createDirContextSupplier(runtimeConfig.dirContext))
-                .identityMapping()
+                .identityMapping();
+
+        if (runtimeConfig.identityMapping.searchRecursive) {
+            identityMappingBuilder.searchRecursive();
+        }
+
+        LdapSecurityRealmBuilder ldapSecurityRealmBuilder = identityMappingBuilder
                 .map(createAttributeMappings(runtimeConfig.identityMapping))
                 .setRdnIdentifier(runtimeConfig.identityMapping.rdnIdentifier)
                 .setSearchDn(runtimeConfig.identityMapping.searchBaseDn)
                 .build();
 
         if (runtimeConfig.directVerification) {
-            builder.addDirectEvidenceVerification(false);
+            ldapSecurityRealmBuilder.addDirectEvidenceVerification(false);
         }
 
-        return new RuntimeValue<>(builder.build());
+        return new RuntimeValue<>(ldapSecurityRealmBuilder.build());
     }
 
     private ExceptionSupplier<DirContext, NamingException> createDirContextSupplier(DirContextConfig dirContext) {
@@ -49,7 +55,7 @@ private ExceptionSupplier<DirContext, NamingException> createDirContextSupplier(
                 dirContext.url,
                 dirContext.principal.orElse(null),
                 dirContext.password.orElse(null));
-        return () -> dirContextFactory.obtainDirContext(DirContextFactory.ReferralMode.IGNORE);
+        return () -> dirContextFactory.obtainDirContext(dirContext.referralMode);
     }
 
     private AttributeMapping[] createAttributeMappings(IdentityMappingConfig identityMappingConfig) {
diff --git a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/DirContextConfig.java b/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/DirContextConfig.java
index e38aa32ee647f..9a8bad254b20e 100644
--- a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/DirContextConfig.java
+++ b/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/DirContextConfig.java
@@ -2,6 +2,8 @@
 
 import java.util.Optional;
 
+import org.wildfly.security.auth.realm.ldap.DirContextFactory;
+
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 
@@ -26,12 +28,19 @@ public class DirContextConfig {
     @ConfigItem
     public Optional<String> password;
 
+    /**
+     * how ldap redirects are handled
+     */
+    @ConfigItem(defaultValue = "ignore")
+    public DirContextFactory.ReferralMode referralMode;
+
     @Override
     public String toString() {
         return "DirContextConfig{" +
                 "url='" + url + '\'' +
-                ", principal='" + principal + '\'' +
-                ", password='" + password + '\'' +
+                ", principal=" + principal +
+                ", password=" + password +
+                ", referralMode=" + referralMode +
                 '}';
     }
 }
diff --git a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/IdentityMappingConfig.java b/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/IdentityMappingConfig.java
index 1846c259df185..db7b13acba608 100644
--- a/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/IdentityMappingConfig.java
+++ b/extensions/elytron-security-ldap/runtime/src/main/java/io/quarkus/elytron/security/ldap/config/IdentityMappingConfig.java
@@ -20,6 +20,12 @@ public class IdentityMappingConfig {
     @ConfigItem
     public String searchBaseDn;
 
+    /**
+     * If the child nodes are also searched for identities
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean searchRecursive;
+
     /**
      * The configs how we get from the attribute to the Role
      */
@@ -31,6 +37,7 @@ public String toString() {
         return "IdentityMappingConfig{" +
                 "rdnIdentifier='" + rdnIdentifier + '\'' +
                 ", searchBaseDn='" + searchBaseDn + '\'' +
+                ", searchRecursive=" + searchRecursive +
                 ", attributeMappings=" + attributeMappings +
                 '}';
     }
diff --git a/extensions/elytron-security-oauth2/deployment/pom.xml b/extensions/elytron-security-oauth2/deployment/pom.xml
index 461b44998aee9..8602d41d65d87 100644
--- a/extensions/elytron-security-oauth2/deployment/pom.xml
+++ b/extensions/elytron-security-oauth2/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-oauth2-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-elytron-security-deployment</artifactId>
         </dependency>
+        <!-- JSON-P is needed for cases where JSON-B is not in scope-->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/elytron-security-oauth2/pom.xml b/extensions/elytron-security-oauth2/pom.xml
index 9d791a00991e8..ad71d1fd4080a 100644
--- a/extensions/elytron-security-oauth2/pom.xml
+++ b/extensions/elytron-security-oauth2/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security-oauth2/runtime/pom.xml b/extensions/elytron-security-oauth2/runtime/pom.xml
index a2996620d4904..e4826f6704473 100644
--- a/extensions/elytron-security-oauth2/runtime/pom.xml
+++ b/extensions/elytron-security-oauth2/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-oauth2-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,6 +17,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-elytron-security</artifactId>
         </dependency>
+        <!-- JSON-P is needed for cases where JSON-B is not in scope-->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-realm-token</artifactId>
diff --git a/extensions/elytron-security-properties-file/deployment/pom.xml b/extensions/elytron-security-properties-file/deployment/pom.xml
index bc7605804a9f8..455b9eef52ec6 100644
--- a/extensions/elytron-security-properties-file/deployment/pom.xml
+++ b/extensions/elytron-security-properties-file/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-properties-file-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded-encrypted.properties b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded-encrypted.properties
index 515b0a189e6e3..003f3e8f3a519 100644
--- a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded-encrypted.properties
+++ b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded-encrypted.properties
@@ -16,6 +16,4 @@ quarkus.security.users.embedded.roles.noadmin=user
 quarkus.security.users.embedded.auth-mechanism=CUSTOM
 quarkus.security.users.embedded.plain-text=false
 
-#quarkus.log.min-level=DEBUG
-#quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
\ No newline at end of file
diff --git a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded.properties b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded.properties
index 6906a4bf42905..d24d24cd7aabb 100644
--- a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded.properties
+++ b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth-embedded.properties
@@ -9,7 +9,3 @@ quarkus.security.users.embedded.roles.jdoe=NoRolesUser
 quarkus.security.users.embedded.roles.noadmin=user
 quarkus.security.users.embedded.auth-mechanism=CUSTOM
 quarkus.security.users.embedded.plain-text=true
-
-#quarkus.log.min-level=DEBUG
-#quarkus.log.level=DEBUG
-#quarkus.log.console.level=DEBUG
\ No newline at end of file
diff --git a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth.properties b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth.properties
index 9feeb092b9813..3f44daa1d2e17 100644
--- a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth.properties
+++ b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-custom-auth.properties
@@ -2,7 +2,3 @@ quarkus.security.users.file.enabled=true
 quarkus.security.users.file.users=test-users.properties
 quarkus.security.users.file.roles=test-roles.properties
 quarkus.security.users.file.plain-text=true
-
-#quarkus.log.min-level=DEBUG
-#quarkus.log.level=DEBUG
-#quarkus.log.console.level=DEBUG
\ No newline at end of file
diff --git a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-form-auth.properties b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-form-auth.properties
index 5b1d3aa17e61e..c5d11ccd073d8 100644
--- a/extensions/elytron-security-properties-file/deployment/src/test/resources/application-form-auth.properties
+++ b/extensions/elytron-security-properties-file/deployment/src/test/resources/application-form-auth.properties
@@ -6,7 +6,9 @@
 #quarkus.log.file.path=/tmp/trace.log
 #quarkus.log.file.level=TRACE
 #quarkus.log.file.format=%d{HH:mm:ss} %-5p [%c{2.}]] (%t) %s%e%n
+#quarkus.log.category."io.quarkus.arc".min-level=TRACE
 #quarkus.log.category."io.quarkus.arc".level=TRACE
+#quarkus.log.category."io.undertow.request.security".min-level=TRACE
 #quarkus.log.category."io.undertow.request.security".level=TRACE
 
 # Identities
diff --git a/extensions/elytron-security-properties-file/deployment/src/test/resources/application.properties b/extensions/elytron-security-properties-file/deployment/src/test/resources/application.properties
index 7548cdc43904e..1374708d9e230 100644
--- a/extensions/elytron-security-properties-file/deployment/src/test/resources/application.properties
+++ b/extensions/elytron-security-properties-file/deployment/src/test/resources/application.properties
@@ -12,5 +12,7 @@ quarkus.security.users.file.plain-text=true
 #quarkus.log.file.level=TRACE
 #quarkus.log.file.format=%d{HH:mm:ss} %-5p [%c{2.}]] (%t) %s%e%n
 # Set 2 categories (io.quarkus.smallrye.jwt, io.undertow.request.security) to TRACE level
+#quarkus.log.category."io.quarkus.arc".min-level=TRACE
 #quarkus.log.category."io.quarkus.arc".level=TRACE
+#quarkus.log.category."io.undertow.request.security".min-level=TRACE
 #quarkus.log.category."io.undertow.request.security".level=TRACE
diff --git a/extensions/elytron-security-properties-file/pom.xml b/extensions/elytron-security-properties-file/pom.xml
index 366f69c82918a..21fc44bf232ae 100644
--- a/extensions/elytron-security-properties-file/pom.xml
+++ b/extensions/elytron-security-properties-file/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security-properties-file/runtime/pom.xml b/extensions/elytron-security-properties-file/runtime/pom.xml
index 5734531e313ee..b82e6c5451ac1 100644
--- a/extensions/elytron-security-properties-file/runtime/pom.xml
+++ b/extensions/elytron-security-properties-file/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-properties-file-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,6 +28,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
diff --git a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/DigestAlgorithm.java b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/DigestAlgorithm.java
new file mode 100644
index 0000000000000..5e74458a6ce63
--- /dev/null
+++ b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/DigestAlgorithm.java
@@ -0,0 +1,23 @@
+package io.quarkus.elytron.security.runtime;
+
+import org.wildfly.security.password.interfaces.DigestPassword;
+
+public enum DigestAlgorithm {
+
+    DIGEST_MD5(DigestPassword.ALGORITHM_DIGEST_MD5),
+    DIGEST_SHA(DigestPassword.ALGORITHM_DIGEST_SHA),
+    DIGEST_SHA_256(DigestPassword.ALGORITHM_DIGEST_SHA_256),
+    DIGEST_SHA_384(DigestPassword.ALGORITHM_DIGEST_SHA_384),
+    DIGEST_SHA_512(DigestPassword.ALGORITHM_DIGEST_SHA_512),
+    DIGEST_SHA_512_256(DigestPassword.ALGORITHM_DIGEST_SHA_512_256);
+
+    private final String name;
+
+    DigestAlgorithm(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java
index 9e91dab9e4e2a..e1040f1a30c46 100644
--- a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java
+++ b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java
@@ -29,7 +29,6 @@
 import org.wildfly.security.password.PasswordFactory;
 import org.wildfly.security.password.WildFlyElytronPasswordProvider;
 import org.wildfly.security.password.interfaces.ClearPassword;
-import org.wildfly.security.password.interfaces.DigestPassword;
 import org.wildfly.security.password.spec.DigestPasswordSpec;
 
 import io.quarkus.runtime.RuntimeValue;
@@ -143,7 +142,8 @@ public void run() {
                                     .asUtf8String().hexDecode().drain();
 
                             password = PasswordFactory
-                                    .getInstance(DigestPassword.ALGORITHM_DIGEST_MD5, new WildFlyElytronPasswordProvider())
+                                    .getInstance(runtimeConfig.algorithm.getName(),
+                                            new WildFlyElytronPasswordProvider())
                                     .generatePassword(new DigestPasswordSpec(user, config.realmName, hashed));
                         } catch (Exception e) {
                             throw new RuntimeException("Unable to register password for user:" + user
diff --git a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmConfig.java b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmConfig.java
index da94b152ef42b..d573b9610edbe 100644
--- a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmConfig.java
+++ b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmConfig.java
@@ -41,7 +41,7 @@ public void setEnabled(boolean enabled) {
     @Override
     public String toString() {
         return "MPRealmConfig{" +
-                ", realmName='" + realmName + '\'' +
+                "realmName='" + realmName + '\'' +
                 ", enabled=" + enabled +
                 '}';
     }
diff --git a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmRuntimeConfig.java b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmRuntimeConfig.java
index 31d8fc590a491..d6f348ed8dd45 100644
--- a/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmRuntimeConfig.java
+++ b/extensions/elytron-security-properties-file/runtime/src/main/java/io/quarkus/elytron/security/runtime/MPRealmRuntimeConfig.java
@@ -2,9 +2,13 @@
 
 import java.util.Map;
 
+import org.wildfly.security.password.interfaces.DigestPassword;
+
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.runtime.annotations.ConvertWith;
+import io.quarkus.runtime.configuration.TrimmedStringConverter;
 
 /**
  * Configuration information used to populate a {@linkplain org.wildfly.security.auth.realm.SimpleMapBackedSecurityRealm}
@@ -20,11 +24,20 @@ public class MPRealmRuntimeConfig {
     @ConfigItem
     public boolean plainText;
 
+    /**
+     * Determine which algorithm to use.
+     * <p>
+     * This property is ignored if {@code plainText} is true.
+     */
+    @ConfigItem(defaultValue = DigestPassword.ALGORITHM_DIGEST_MD5)
+    public DigestAlgorithm algorithm;
+
     /**
      * The realm users user1=password\nuser2=password2... mapping.
      * See <a href="#embedded-users">Embedded Users</a>.
      */
     @ConfigItem(defaultValueDocumentation = "none")
+    @ConvertWith(TrimmedStringConverter.class)
     public Map<String, String> users;
 
     /**
@@ -32,6 +45,7 @@ public class MPRealmRuntimeConfig {
      * See <a href="#embedded-roles">Embedded Roles</a>.
      */
     @ConfigItem(defaultValueDocumentation = "none")
+    @ConvertWith(TrimmedStringConverter.class)
     public Map<String, String> roles;
 
 }
diff --git a/extensions/elytron-security/deployment/pom.xml b/extensions/elytron-security/deployment/pom.xml
index 92b5d69b49485..0bc492a2d6e31 100644
--- a/extensions/elytron-security/deployment/pom.xml
+++ b/extensions/elytron-security/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security/pom.xml b/extensions/elytron-security/pom.xml
index 0f2c42149e76e..00650552699be 100644
--- a/extensions/elytron-security/pom.xml
+++ b/extensions/elytron-security/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/elytron-security/runtime/pom.xml b/extensions/elytron-security/runtime/pom.xml
index f0264403def11..fe3db9a291038 100644
--- a/extensions/elytron-security/runtime/pom.xml
+++ b/extensions/elytron-security/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-elytron-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayCallbacksLocator.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayCallbacksLocator.java
new file mode 100644
index 0000000000000..3ae28bd3ac14a
--- /dev/null
+++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayCallbacksLocator.java
@@ -0,0 +1,100 @@
+package io.quarkus.flyway;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.flywaydb.core.api.callback.Callback;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.flyway.runtime.FlywayBuildTimeConfig;
+
+/**
+ * Logic to locate and process Flyway {@link Callback} classes.
+ * This class also helps to keep the {@link FlywayProcessor} class as lean as possible to make it easier to maintain
+ */
+class FlywayCallbacksLocator {
+    private final Collection<String> dataSourceNames;
+    private final FlywayBuildTimeConfig flywayBuildConfig;
+    private final CombinedIndexBuildItem combinedIndexBuildItem;
+    private final BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer;
+
+    private FlywayCallbacksLocator(Collection<String> dataSourceNames, FlywayBuildTimeConfig flywayBuildConfig,
+            CombinedIndexBuildItem combinedIndexBuildItem, BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer) {
+        this.dataSourceNames = dataSourceNames;
+        this.flywayBuildConfig = flywayBuildConfig;
+        this.combinedIndexBuildItem = combinedIndexBuildItem;
+        this.reflectiveClassProducer = reflectiveClassProducer;
+    }
+
+    public static FlywayCallbacksLocator with(Collection<String> dataSourceNames, FlywayBuildTimeConfig flywayBuildConfig,
+            CombinedIndexBuildItem combinedIndexBuildItem, BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer) {
+        return new FlywayCallbacksLocator(dataSourceNames, flywayBuildConfig, combinedIndexBuildItem, reflectiveClassProducer);
+    }
+
+    /**
+     * Main logic to identify callbacks and return them to be processed by the {@link FlywayProcessor}
+     * 
+     * @return Map containing the callbacks for each datasource. The datasource name is the map key
+     * @exception ClassNotFoundException if the {@link Callback} class cannot be located by the Quarkus class loader
+     * @exception InstantiationException if the {@link Callback} class represents an abstract class.
+     * @exception InvocationTargetException if the underlying constructor throws an exception.
+     * @exception IllegalAccessException if the {@link Callback} constructor is enforcing Java language access control
+     *            and the underlying constructor is inaccessible
+     */
+    public Map<String, Collection<Callback>> getCallbacks()
+            throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
+        final Map<String, Collection<Callback>> callbacks = new HashMap<>();
+        for (String dataSourceName : dataSourceNames) {
+            final Collection<Callback> instances = callbacksForDataSource(dataSourceName);
+            callbacks.put(dataSourceName, instances);
+        }
+        return callbacks;
+    }
+
+    /**
+     *
+     * Reads the configuration, instantiates the {@link Callback} class. Also, adds it to the reflective producer
+     * 
+     * @return List of callbacks for the datasource
+     * @exception ClassNotFoundException if the {@link Callback} class cannot be located by the Quarkus class loader
+     * @exception InstantiationException if the {@link Callback} class represents an abstract class.
+     * @exception InvocationTargetException if the underlying constructor throws an exception.
+     * @exception IllegalAccessException if the {@link Callback} constructor is enforcing Java language access control
+     *            and the underlying constructor is inaccessible
+     */
+    private Collection<Callback> callbacksForDataSource(String dataSourceName)
+            throws ClassNotFoundException, IllegalAccessException, InvocationTargetException, InstantiationException {
+        final Optional<List<String>> callbackConfig = flywayBuildConfig.getConfigForDataSourceName(dataSourceName).callbacks;
+        if (!callbackConfig.isPresent()) {
+            return Collections.emptyList();
+        }
+        final Collection<String> callbacks = callbackConfig.get();
+        final Collection<Callback> instances = new ArrayList<>(callbacks.size());
+        for (String callback : callbacks) {
+            final ClassInfo clazz = combinedIndexBuildItem.getIndex().getClassByName(DotName.createSimple(callback));
+            Objects.requireNonNull(clazz,
+                    "Flyway callback not found, please verify the fully qualified name for the class: " + callback);
+            if (Modifier.isAbstract(clazz.flags()) || !clazz.hasNoArgsConstructor()) {
+                throw new IllegalArgumentException(
+                        "Invalid Flyway callback. It shouldn't be abstract and must have a default constructor");
+            }
+            final Class<?> clazzType = Class.forName(callback, false, Thread.currentThread().getContextClassLoader());
+            final Callback instance = (Callback) clazzType.getConstructors()[0].newInstance();
+            instances.add(instance);
+            reflectiveClassProducer.produce(new ReflectiveClassBuildItem(false, false, clazz.name().toString()));
+        }
+        return instances;
+    }
+}
diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java
index 571b16f3b065a..9aab0fc11a912 100644
--- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java
+++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/FlywayProcessor.java
@@ -27,13 +27,15 @@
 import javax.enterprise.inject.Default;
 
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.Location;
+import org.flywaydb.core.api.callback.Callback;
 import org.flywaydb.core.api.migration.JavaMigration;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.logging.Logger;
 
-import io.quarkus.agroal.deployment.JdbcDataSourceBuildItem;
-import io.quarkus.agroal.deployment.JdbcDataSourceSchemaReadyBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
@@ -51,6 +53,7 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.flyway.runtime.FlywayBuildTimeConfig;
 import io.quarkus.flyway.runtime.FlywayContainerProducer;
@@ -88,7 +91,7 @@ void build(BuildProducer<FeatureBuildItem> featureProducer,
             FlywayRecorder recorder,
             RecorderContext context,
             CombinedIndexBuildItem combinedIndexBuildItem,
-            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems) throws IOException, URISyntaxException {
+            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems) throws Exception {
 
         featureProducer.produce(new FeatureBuildItem(Feature.FLYWAY));
 
@@ -102,6 +105,13 @@ void build(BuildProducer<FeatureBuildItem> featureProducer,
                 reflectiveClassProducer, javaMigrationClasses);
         recorder.setApplicationMigrationClasses(javaMigrationClasses);
 
+        final Map<String, Collection<Callback>> callbacks = FlywayCallbacksLocator.with(
+                dataSourceNames,
+                flywayBuildConfig,
+                combinedIndexBuildItem,
+                reflectiveClassProducer).getCallbacks();
+        recorder.setApplicationCallbackClasses(callbacks);
+
         resourceProducer.produce(new NativeImageResourceBuildItem(applicationMigrations.toArray(new String[0])));
     }
 
@@ -132,6 +142,8 @@ ServiceStartBuildItem createBeansAndStartActions(FlywayRecorder recorder,
         // add the @FlywayDataSource class otherwise it won't registered as a qualifier
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(FlywayDataSource.class).build());
 
+        recorder.resetFlywayContainers();
+
         Collection<String> dataSourceNames = getDataSourceNames(jdbcDataSourceBuildItems);
 
         for (String dataSourceName : dataSourceNames) {
@@ -181,11 +193,6 @@ private Collection<String> getMigrationLocations(Collection<String> dataSourceNa
                 .map(flywayBuildConfig::getConfigForDataSourceName)
                 .flatMap(config -> config.locations.stream())
                 .collect(Collectors.toCollection(LinkedHashSet::new));
-
-        if (DataSourceUtil.hasDefault(dataSourceNames)) {
-            migrationLocations.addAll(flywayBuildConfig.defaultDataSource.locations);
-        }
-
         return migrationLocations;
     }
 
@@ -195,14 +202,12 @@ private Collection<String> discoverApplicationMigrations(Collection<String> loca
             LinkedHashSet<String> applicationMigrationResources = new LinkedHashSet<>();
             // Locations can be a comma separated list
             for (String location : locations) {
-                // Strip any 'classpath:' protocol prefixes because they are assumed
-                // but not recognized by ClassLoader.getResources()
-                if (location != null && location.startsWith(CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL + ':')) {
-                    location = location.substring(CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL.length() + 1);
-                    if (location.startsWith("/")) {
-                        location = location.substring(1);
-                    }
+                location = normalizeLocation(location);
+                if (location.startsWith(Location.FILESYSTEM_PREFIX)) {
+                    applicationMigrationResources.add(location);
+                    continue;
                 }
+
                 Enumeration<URL> migrations = Thread.currentThread().getContextClassLoader().getResources(location);
                 while (migrations.hasMoreElements()) {
                     URL path = migrations.nextElement();
@@ -232,11 +237,33 @@ private Collection<String> discoverApplicationMigrations(Collection<String> loca
         }
     }
 
+    private String normalizeLocation(String location) {
+        if (location == null) {
+            throw new IllegalStateException("Flyway migration location may not be null.");
+        }
+
+        // Strip any 'classpath:' protocol prefixes because they are assumed
+        // but not recognized by ClassLoader.getResources()
+        if (location.startsWith(CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL + ':')) {
+            location = location.substring(CLASSPATH_APPLICATION_MIGRATIONS_PROTOCOL.length() + 1);
+            if (location.startsWith("/")) {
+                location = location.substring(1);
+            }
+        }
+        if (!location.endsWith("/")) {
+            location += "/";
+        }
+
+        return location;
+    }
+
     private Set<String> getApplicationMigrationsFromPath(final String location, final URL path)
             throws IOException, URISyntaxException {
-        try (final Stream<Path> pathStream = Files.walk(Paths.get(path.toURI()))) {
+        Path rootPath = Paths.get(path.toURI());
+
+        try (final Stream<Path> pathStream = Files.walk(rootPath)) {
             return pathStream.filter(Files::isRegularFile)
-                    .map(it -> Paths.get(location, it.getFileName().toString()).toString())
+                    .map(it -> Paths.get(location, rootPath.relativize(it).toString()).normalize().toString())
                     // we don't want windows paths here since the paths are going to be used as classpath paths anyway
                     .map(it -> it.replace('\\', '/'))
                     .peek(it -> LOGGER.debugf("Discovered path: %s", it))
@@ -250,4 +277,12 @@ private FileSystem initFileSystem(final URI uri) throws IOException {
         return FileSystems.newFileSystem(uri, env);
     }
 
+    /**
+     * Reinitialize {@code InsertRowLock} to avoid using a cached seed when invoking {@code getNextRandomString}
+     */
+    @BuildStep
+    public RuntimeReinitializedClassBuildItem reinitInsertRowLock() {
+        return new RuntimeReinitializedClassBuildItem(
+                "org.flywaydb.core.internal.database.InsertRowLock");
+    }
 }
diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/devconsole/DevConsoleProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..bbc46c6d59a42
--- /dev/null
+++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,25 @@
+package io.quarkus.flyway.devconsole;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.flyway.runtime.FlywayContainersSupplier;
+import io.quarkus.flyway.runtime.devconsole.FlywayDevConsoleRecorder;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleRuntimeTemplateInfoBuildItem collectBeanInfo() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("containers", new FlywayContainersSupplier());
+    }
+
+    @BuildStep
+    @Record(value = RUNTIME_INIT, optional = true)
+    DevConsoleRouteBuildItem invokeEndpoint(FlywayDevConsoleRecorder recorder) {
+        return new DevConsoleRouteBuildItem("containers", "POST", recorder.handler());
+    }
+}
diff --git a/extensions/flyway/deployment/src/main/resources/dev-templates/datasources.html b/extensions/flyway/deployment/src/main/resources/dev-templates/datasources.html
new file mode 100644
index 0000000000000..d09f5167e6f2e
--- /dev/null
+++ b/extensions/flyway/deployment/src/main/resources/dev-templates/datasources.html
@@ -0,0 +1,36 @@
+{#include main}
+{#title}Managed datasources{/title}
+{#body}
+<table class="table table-striped">
+    <thead class="thead-dark">
+    <tr>
+        <th scope="col">Name</th>
+        <th scope="col">Actions</th>
+    </tr>
+    </thead>
+    <tbody>
+    {#for container in info:containers}
+    <tr>
+        <td>
+            {container.dataSourceName}
+        </td>
+        <td>
+            <div class="btn-group">
+                <form method="post"  enctype="application/x-www-form-urlencoded">
+                    <input type="hidden" name="datasource" value="{container.dataSourceName}">
+                    <input type="hidden" name="operation" value="clean">
+                    <input id="clear" type="submit" class="btn btn-primary btn-sm" value="Clean" >
+                </form>
+                &nbsp;
+                <form method="post"  enctype="application/x-www-form-urlencoded">
+                    <input type="hidden" name="datasource" value="{container.dataSourceName}">
+                    <input type="hidden" name="operation" value="migrate">
+                    <input id="migrate" type="submit" class="btn btn-primary btn-sm" value="Migrate" >
+                </form>
+            </div>
+        </td>
+    {/for}
+    </tbody>
+</table>
+{/body}
+{/include}
diff --git a/extensions/flyway/deployment/src/main/resources/dev-templates/embedded.html b/extensions/flyway/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..a262f79ed8abd
--- /dev/null
+++ b/extensions/flyway/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,3 @@
+<a href="{urlbase}/datasources" class="badge badge-light">
+  <i class="fa fa-database fa-fw"></i>
+  Datasources <span class="badge badge-light">{info:containers.size()}</span></a>
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java
index 88e890c6a1fd7..d8d849d052c6c 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeTest.java
@@ -2,7 +2,6 @@
 
 import java.util.function.Function;
 
-import org.flywaydb.core.Flyway;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.DisplayName;
@@ -36,8 +35,7 @@ public String apply(String s) {
                 return "quarkus.datasource.db-kind=h2\n" +
                         "quarkus.datasource.username=sa\n" +
                         "quarkus.datasource.password=sa\n" +
-                        "quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-migrate-at-start;DB_CLOSE_DELAY=-1\n"
-                        +
+                        "quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-dev-mode;DB_CLOSE_DELAY=-1\n" +
                         "quarkus.flyway.migrate-at-start=true";
             }
         });
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java
index 3e00aa79d0e67..413d5cb8e774a 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateNamedDataSourceTest.java
@@ -21,9 +21,17 @@ public class FlywayExtensionBaselineOnMigrateNamedDataSourceTest {
     @FlywayDataSource("users")
     Flyway flyway;
 
+    static final FlywayH2TestCustomizer customizer = FlywayH2TestCustomizer
+            .withDbName("quarkus-flyway-baseline-on-named-ds")
+            .withPort(11302)
+            .withInitSqlFile("src/test/resources/h2-init-data.sql");
+
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setBeforeAllCustomizer(customizer::startH2)
+            .setAfterAllCustomizer(customizer::stopH2)
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(FlywayH2TestCustomizer.class)
                     .addAsResource("baseline-on-migrate-named-datasource.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java
index cd9e9b38dc31f..13e94e82b9d86 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionBaselineOnMigrateTest.java
@@ -19,9 +19,17 @@ public class FlywayExtensionBaselineOnMigrateTest {
     @Inject
     Flyway flyway;
 
+    static final FlywayH2TestCustomizer customizer = FlywayH2TestCustomizer
+            .withDbName("quarkus-flyway-baseline-on-migrate")
+            .withPort(11301)
+            .withInitSqlFile("src/test/resources/h2-init-data.sql");
+
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setBeforeAllCustomizer(customizer::startH2)
+            .setAfterAllCustomizer(customizer::stopH2)
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(FlywayH2TestCustomizer.class)
                     .addAsResource("baseline-on-migrate.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallback.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallback.java
new file mode 100644
index 0000000000000..07392f456a032
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallback.java
@@ -0,0 +1,47 @@
+package io.quarkus.flyway.test;
+
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
+
+import org.flywaydb.core.api.callback.Callback;
+import org.flywaydb.core.api.callback.Context;
+import org.flywaydb.core.api.callback.Event;
+
+public class FlywayExtensionCallback implements Callback {
+
+    public static List<Event> DEFAULT_EVENTS = Arrays.asList(
+            Event.BEFORE_BASELINE,
+            Event.AFTER_BASELINE,
+            Event.BEFORE_MIGRATE,
+            Event.BEFORE_EACH_MIGRATE,
+            Event.AFTER_EACH_MIGRATE,
+            Event.AFTER_VERSIONED,
+            Event.AFTER_MIGRATE,
+            Event.AFTER_MIGRATE_OPERATION_FINISH);
+
+    @Override
+    public boolean supports(Event event, Context context) {
+        return DEFAULT_EVENTS.contains(event);
+    }
+
+    @Override
+    public boolean canHandleInTransaction(Event event, Context context) {
+        return true;
+    }
+
+    @Override
+    public void handle(Event event, Context context) {
+        try (Statement stmt = context.getConnection().createStatement()) {
+            stmt.executeUpdate("INSERT INTO quarked_callback(name) VALUES('" + event.getId() + "')");
+        } catch (SQLException exception) {
+            throw new IllegalStateException(exception);
+        }
+    }
+
+    @Override
+    public String getCallbackName() {
+        return "Quarked Flyway Callback";
+    }
+}
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallback2.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallback2.java
new file mode 100644
index 0000000000000..0f61e6f55b141
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallback2.java
@@ -0,0 +1,39 @@
+package io.quarkus.flyway.test;
+
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
+
+import org.flywaydb.core.api.callback.Callback;
+import org.flywaydb.core.api.callback.Context;
+import org.flywaydb.core.api.callback.Event;
+
+public class FlywayExtensionCallback2 implements Callback {
+
+    public static List<Event> DEFAULT_EVENTS = Arrays.asList(Event.AFTER_MIGRATE);
+
+    @Override
+    public boolean supports(Event event, Context context) {
+        return DEFAULT_EVENTS.contains(event);
+    }
+
+    @Override
+    public boolean canHandleInTransaction(Event event, Context context) {
+        return true;
+    }
+
+    @Override
+    public void handle(Event event, Context context) {
+        try (Statement stmt = context.getConnection().createStatement()) {
+            stmt.executeUpdate("INSERT INTO quarked_callback(name) VALUES('" + event.getId() + "')");
+        } catch (SQLException exception) {
+            throw new IllegalStateException(exception);
+        }
+    }
+
+    @Override
+    public String getCallbackName() {
+        return "Quarked Flyway Callback 2";
+    }
+}
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java
new file mode 100644
index 0000000000000..c38e34c944007
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCallbackTest.java
@@ -0,0 +1,68 @@
+package io.quarkus.flyway.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.inject.Inject;
+
+import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.MigrationInfo;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class FlywayExtensionCallbackTest {
+
+    // Quarkus built object
+    @Inject
+    Flyway flyway;
+
+    @Inject
+    AgroalDataSource defaultDataSource;
+
+    static final FlywayH2TestCustomizer customizer = FlywayH2TestCustomizer
+            .withDbName("quarkus-flyway-callback")
+            .withPort(11303)
+            .withInitSqlFile("src/test/resources/callback-init-data.sql");
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setBeforeAllCustomizer(customizer::startH2)
+            .setAfterAllCustomizer(customizer::stopH2)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FlywayH2TestCustomizer.class,
+                            FlywayExtensionCallback.class, FlywayExtensionCallback2.class)
+                    .addAsResource("db/migration/V1.0.3__Quarkus_Callback.sql")
+                    .addAsResource("callback-config.properties", "application.properties"));
+
+    @Test
+    @DisplayName("Migrates at start correctly and executes callback")
+    public void testFlywayCallback() throws SQLException {
+        MigrationInfo migrationInfo = flyway.info().current();
+        assertNotNull(migrationInfo, "No Flyway migration was executed");
+
+        String currentVersion = migrationInfo.getVersion().toString();
+        // Expected to be 1.0.3 as migration runs at start
+        assertEquals("1.0.3", currentVersion);
+        try (Connection connection = defaultDataSource.getConnection(); Statement stat = connection.createStatement()) {
+            try (ResultSet executeQuery = stat.executeQuery("select COUNT(name) from quarked_callback")) {
+                assertTrue(executeQuery.next(), "Table exists but it is empty");
+                int count = executeQuery.getInt(1);
+                // Expect one row for each callback invoked by Flyway
+                int expected = FlywayExtensionCallback.DEFAULT_EVENTS.size() + FlywayExtensionCallback2.DEFAULT_EVENTS.size();
+                assertEquals(expected, count);
+            }
+        }
+    }
+}
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java
index a63a2f1d3feb7..1ce19f72bf305 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionCleanAndMigrateAtStartTest.java
@@ -1,7 +1,7 @@
 package io.quarkus.flyway.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -11,6 +11,7 @@
 import javax.inject.Inject;
 
 import org.flywaydb.core.Flyway;
+import org.h2.jdbc.JdbcSQLException;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.DisplayName;
@@ -40,7 +41,9 @@ public void testFlywayConfigInjection() throws SQLException {
 
         try (Connection connection = defaultDataSource.getConnection(); Statement stat = connection.createStatement()) {
             try (ResultSet executeQuery = stat.executeQuery("select * from fake_existing_tbl")) {
-                assertFalse(executeQuery.next(), "Table exists but is not empty");
+                fail("fake_existing_tbl should not exist");
+            } catch (JdbcSQLException e) {
+                // expected fake_existing_tbl does not exist
             }
         }
         String currentVersion = flyway.info().current().getVersion().toString();
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java
index b42729f107488..aa6800c0f71c6 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigDefaultDataSourceTest.java
@@ -25,6 +25,7 @@ public class FlywayExtensionConfigDefaultDataSourceTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(FlywayExtensionConfigFixture.class)
+                    .addClasses(FlywayExtensionCallback.class, FlywayExtensionCallback2.class)
                     .addAsResource("config-for-default-datasource.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java
index 44fa584feae3c..29a1dd6910a93 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigFixture.java
@@ -37,6 +37,7 @@ public void assertAllConfigurationSettings(Configuration configuration, String d
         assertEquals(baselineOnMigrate(configuration), baselineOnMigrate(dataSourceName));
         assertEquals(baselineVersion(configuration), baselineVersion(dataSourceName));
         assertEquals(baselineDescription(configuration), baselineDescription(dataSourceName));
+        assertEquals(callbacks(configuration), callbacks(dataSourceName));
     }
 
     public void assertDefaultConfigurationSettings(Configuration configuration) {
@@ -52,6 +53,15 @@ public void assertDefaultConfigurationSettings(Configuration configuration) {
         assertEquals(baselineOnMigrate(configuration), baselineOnMigrate(defaultConfiguration));
         assertEquals(baselineVersion(configuration), baselineVersion(defaultConfiguration));
         assertEquals(baselineDescription(configuration), baselineDescription(defaultConfiguration));
+        assertEquals(callbacks(configuration), callbacks(defaultConfiguration));
+    }
+
+    public int callbacks(Configuration configuration) {
+        return configuration.getCallbacks().length;
+    }
+
+    public int callbacks(String datasourceName) {
+        return getStringValue("quarkus.flyway.%s.callbacks", datasourceName).split(",").length;
     }
 
     public int connectRetries(String datasourceName) {
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java
index 4dd14e1da05f7..d9fabe94e96c9 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesTest.java
@@ -41,7 +41,7 @@ public class FlywayExtensionConfigMultiDataSourcesTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(FlywayExtensionConfigFixture.class)
+                    .addClasses(FlywayExtensionConfigFixture.class, FlywayExtensionCallback.class)
                     .addAsResource("config-for-multiple-datasources.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java
index 66118d4712055..3290a92ab3c0b 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest.java
@@ -33,7 +33,7 @@ public class FlywayExtensionConfigMultiDataSourcesWithoutDefaultTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(FlywayExtensionConfigFixture.class)
+                    .addClasses(FlywayExtensionConfigFixture.class, FlywayExtensionCallback.class)
                     .addAsResource("config-for-multiple-datasources-without-default.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java
index 4effb9578dafe..022ba04df7623 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionConfigNamedDataSourceWithoutDefaultTest.java
@@ -29,7 +29,7 @@ public class FlywayExtensionConfigNamedDataSourceWithoutDefaultTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(FlywayExtensionConfigFixture.class)
+                    .addClasses(FlywayExtensionConfigFixture.class, FlywayExtensionCallback.class)
                     .addAsResource("config-for-named-datasource-without-default.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java
new file mode 100644
index 0000000000000..56fdbcb3f8ec1
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionFilesystemResourceTest.java
@@ -0,0 +1,107 @@
+package io.quarkus.flyway.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.inject.Inject;
+
+import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.MigrationVersion;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.flywaydb.core.api.migration.JavaMigration;
+import org.h2.jdbc.JdbcSQLException;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class FlywayExtensionFilesystemResourceTest {
+
+    @Inject
+    Flyway flyway;
+
+    @Inject
+    AgroalDataSource defaultDataSource;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(V1_0_1__Update.class, V1_0_2__Update.class)
+                    .addAsResource("clean-and-migrate-at-start-with-fs-resource-config.properties", "application.properties"));
+
+    @Test
+    @DisplayName("Clean and migrate at start correctly")
+    public void testFlywayConfigInjection() throws SQLException {
+
+        try (Connection connection = defaultDataSource.getConnection(); Statement stat = connection.createStatement()) {
+            try (ResultSet executeQuery = stat.executeQuery("select * from fake_existing_tbl")) {
+                fail("fake_existing_tbl should not exist. Clean was run at start");
+            } catch (JdbcSQLException e) {
+                // expected fake_existing_tbl does not exist
+            }
+            try (ResultSet countQuery = stat.executeQuery("select count(1) from quarked_flyway")) {
+                assertTrue(countQuery.first());
+                assertEquals(2,
+                        countQuery.getInt(1),
+                        "Table 'quarked_flyway' does not contain the expected number of rows");
+            }
+        }
+        String currentVersion = flyway.info().current().getVersion().toString();
+        assertEquals("1.0.3", currentVersion, "Expected to be 1.0.3 as there is a SQL and two Java migration scripts");
+    }
+
+    public static class V1_0_1__Update extends BaseJavaMigration {
+        @Override
+        public void migrate(Context context) throws Exception {
+            try (Statement statement = context.getConnection().createStatement()) {
+                statement.executeUpdate("INSERT INTO quarked_flyway VALUES (1001, 'test')");
+            }
+        }
+    }
+
+    public static class V1_0_2__Update implements JavaMigration {
+        @Override
+        public MigrationVersion getVersion() {
+            return MigrationVersion.fromVersion("1.0.2");
+        }
+
+        @Override
+        public String getDescription() {
+            return getClass().getSimpleName();
+        }
+
+        @Override
+        public Integer getChecksum() {
+            return null;
+        }
+
+        @Override
+        public boolean isUndo() {
+            return false;
+        }
+
+        @Override
+        public boolean canExecuteInTransaction() {
+            return true;
+        }
+
+        @Override
+        public void migrate(Context context) throws Exception {
+            try (Statement statement = context.getConnection().createStatement()) {
+                statement.executeUpdate("INSERT INTO quarked_flyway VALUES (1002, 'test')");
+            }
+        }
+    }
+
+}
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java
new file mode 100644
index 0000000000000..fa3d8e04c9c63
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartSubfolderTest.java
@@ -0,0 +1,41 @@
+package io.quarkus.flyway.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.inject.Inject;
+
+import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.MigrationInfo;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class FlywayExtensionMigrateAtStartSubfolderTest {
+    // Quarkus built object
+    @Inject
+    Flyway flyway;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("db/migration-subfolder/subfolder/V1.0.0__Quarkus.sql")
+                    .addAsResource("migrate-at-start-subfolder-config.properties", "application.properties"));
+
+    @Test
+    @DisplayName("Migrates at start correctly")
+    public void testFlywayConfigInjection() {
+        MigrationInfo migrationInfo = flyway.info().current();
+        assertNotNull(migrationInfo, "No Flyway migration was executed");
+
+        String currentVersion = migrationInfo
+                .getVersion()
+                .toString();
+        // Expected to be 1.0.0 as migration runs at start
+        assertEquals("1.0.0", currentVersion);
+    }
+}
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java
index f3bc80033029a..72c1472a12496 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionMigrateAtStartTest.java
@@ -35,7 +35,7 @@ public void testFlywayConfigInjection() {
         String currentVersion = migrationInfo
                 .getVersion()
                 .toString();
-        // Expected to be 1.0.0 as migration runs at start
+
         assertEquals("1.0.0", currentVersion);
     }
 }
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayH2TestCustomizer.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayH2TestCustomizer.java
new file mode 100644
index 0000000000000..43ffd5c100a24
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayH2TestCustomizer.java
@@ -0,0 +1,81 @@
+package io.quarkus.flyway.test;
+
+import static java.util.Objects.requireNonNull;
+
+import java.nio.charset.Charset;
+import java.sql.SQLException;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.h2.tools.RunScript;
+import org.h2.tools.Server;
+
+public class FlywayH2TestCustomizer {
+    private String initSqlFile;
+    private String dbName;
+    private int port = ThreadLocalRandom.current().nextInt(49152, 65535);
+    private Server tcpServer;
+
+    protected FlywayH2TestCustomizer() {
+    }
+
+    private FlywayH2TestCustomizer(String dbName) {
+        this.dbName = dbName;
+    }
+
+    public static FlywayH2TestCustomizer withDbName(String dbName) {
+        return new FlywayH2TestCustomizer(dbName);
+    }
+
+    public FlywayH2TestCustomizer withPort(int port) {
+        this.port = port;
+        return this;
+    }
+
+    public FlywayH2TestCustomizer withInitSqlFile(String initSqlFile) {
+        this.initSqlFile = initSqlFile;
+        return this;
+    }
+
+    void startH2() {
+        try {
+            tcpServer = Server.createTcpServer("-tcpPort", String.valueOf(port));
+            tcpServer.start();
+            System.out.println("[INFO] Custom H2 database started in TCP server mode; server status: " + tcpServer.getStatus());
+            if (initSqlFile != null) {
+                executeInitSQL();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    void executeInitSQL() {
+        requireNonNull(dbName, "Flyway-H2: Default db for init-sql must be specified!");
+        requireNonNull(initSqlFile, "Flyway-H2: init-sql must be specified!");
+        final String url = buildDbURL();
+        try {
+            System.out.println("[INFO] Custom H2 Intializing DB: " + url);
+            RunScript.execute(
+                    url,
+                    "sa",
+                    "sa",
+                    initSqlFile,
+                    Charset.defaultCharset(),
+                    false);
+        } catch (SQLException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+
+    public String buildDbURL() {
+        return "jdbc:h2:tcp://localhost:" + port + "/mem:" + dbName + ";DB_CLOSE_DELAY=-1";
+    }
+
+    public void stopH2() {
+        if (tcpServer != null) {
+            tcpServer.stop();
+            System.out.println("[INFO] Custom H2 database was shut down; server status: " + tcpServer.getStatus());
+            tcpServer = null;
+        }
+    }
+}
diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java
index 5b8aa5f2fa070..e81e0559534ca 100644
--- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java
+++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayMultiDataSourcesDevModeTest.java
@@ -16,7 +16,7 @@ public class FlywayMultiDataSourcesDevModeTest {
     @RegisterExtension
     static final QuarkusDevModeTest config = new QuarkusDevModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(MultiDataSourcesDevModeEndpoint.class)
+                    .addClasses(MultiDataSourcesDevModeEndpoint.class, FlywayExtensionCallback.class)
                     .addAsResource("config-for-multiple-datasources.properties", "application.properties"));
 
     @Test
diff --git a/extensions/flyway/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties b/extensions/flyway/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties
index 284b6a0ea7baa..bdae3e948bf8c 100644
--- a/extensions/flyway/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties
+++ b/extensions/flyway/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties
@@ -1,8 +1,7 @@
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=sa
 quarkus.datasource.users.password=sa
-quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-baseline-on-migrate;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/test/resources/h2-init-data.sql'
-
+quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost:11302/mem:quarkus-flyway-baseline-on-named-ds
 # Flyway config properties
 quarkus.flyway.users.migrate-at-start=true
 quarkus.flyway.users.table=test_flyway_history
diff --git a/extensions/flyway/deployment/src/test/resources/baseline-on-migrate.properties b/extensions/flyway/deployment/src/test/resources/baseline-on-migrate.properties
index 1f845c5831c07..db84abca3e79c 100644
--- a/extensions/flyway/deployment/src/test/resources/baseline-on-migrate.properties
+++ b/extensions/flyway/deployment/src/test/resources/baseline-on-migrate.properties
@@ -1,8 +1,7 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=sa
 quarkus.datasource.password=sa
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-baseline-on-migrate;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/test/resources/h2-init-data.sql'
-
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost:11301/mem:quarkus-flyway-baseline-on-migrate
 # Flyway config properties
 quarkus.flyway.migrate-at-start=true
 quarkus.flyway.table=test_flyway_history
diff --git a/extensions/flyway/deployment/src/test/resources/callback-config.properties b/extensions/flyway/deployment/src/test/resources/callback-config.properties
new file mode 100644
index 0000000000000..98b1440f351e7
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/resources/callback-config.properties
@@ -0,0 +1,10 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=sa
+quarkus.datasource.password=sa
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost:11303/mem:quarkus-flyway-callback;DB_CLOSE_DELAY=-1
+
+# Flyway config properties
+quarkus.flyway.migrate-at-start=true
+quarkus.flyway.baseline-on-migrate=true
+quarkus.flyway.baseline-version=0.0.1
+quarkus.flyway.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback,io.quarkus.flyway.test.FlywayExtensionCallback2
diff --git a/extensions/flyway/deployment/src/test/resources/callback-init-data.sql b/extensions/flyway/deployment/src/test/resources/callback-init-data.sql
new file mode 100644
index 0000000000000..0adea0251a6cc
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/resources/callback-init-data.sql
@@ -0,0 +1,4 @@
+CREATE TABLE quarked_callback
+(
+    name VARCHAR(120)
+);
diff --git a/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-config.properties b/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-config.properties
index 3f73200aab71c..ef6fab20a9c65 100644
--- a/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-config.properties
+++ b/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-config.properties
@@ -1,12 +1,12 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=sa
 quarkus.datasource.password=sa
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-clean-at-start;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/test/resources/h2-init-data.sql'
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:quarkus-flyway;DB_CLOSE_DELAY=-1
 
 # Flyway config properties
 quarkus.flyway.clean-at-start=true
 quarkus.flyway.migrate-at-start=true
 quarkus.flyway.table=test_flyway_history
-quarkus.flyway.baseline-on-migrate=true
+quarkus.flyway.baseline-on-migrate=false
 quarkus.flyway.baseline-version=0.0.1
 quarkus.flyway.baseline-description=Initial description for test
diff --git a/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-with-fs-resource-config.properties b/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-with-fs-resource-config.properties
new file mode 100644
index 0000000000000..352ca17e521d9
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/resources/clean-and-migrate-at-start-with-fs-resource-config.properties
@@ -0,0 +1,13 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=sa
+quarkus.datasource.password=sa
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:quarkus-flyway;DB_CLOSE_DELAY=-1
+
+# Flyway config properties
+quarkus.flyway.clean-at-start=true
+quarkus.flyway.migrate-at-start=true
+quarkus.flyway.table=test_flyway_history
+quarkus.flyway.baseline-on-migrate=false
+quarkus.flyway.baseline-version=0.0.1
+quarkus.flyway.baseline-description=Initial description for test
+quarkus.flyway.locations=filesystem:src/test/resources/db/migration
diff --git a/extensions/flyway/deployment/src/test/resources/clean-at-start-config.properties b/extensions/flyway/deployment/src/test/resources/clean-at-start-config.properties
index be897c8cb98bb..6f477ccf03444 100644
--- a/extensions/flyway/deployment/src/test/resources/clean-at-start-config.properties
+++ b/extensions/flyway/deployment/src/test/resources/clean-at-start-config.properties
@@ -1,12 +1,12 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.username=sa
 quarkus.datasource.password=sa
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-clean-at-start;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/test/resources/h2-init-data.sql'
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-clean-at-start;DB_CLOSE_DELAY=-1;
 
 # Flyway config properties
 quarkus.flyway.clean-at-start=true
 quarkus.flyway.migrate-at-start=false
 quarkus.flyway.table=test_flyway_history
-quarkus.flyway.baseline-on-migrate=true
+quarkus.flyway.baseline-on-migrate=false
 quarkus.flyway.baseline-version=0.0.1
 quarkus.flyway.baseline-description=Initial description for test
diff --git a/extensions/flyway/deployment/src/test/resources/config-empty.properties b/extensions/flyway/deployment/src/test/resources/config-empty.properties
index e69de29bb2d1d..f032a4af991ee 100644
--- a/extensions/flyway/deployment/src/test/resources/config-empty.properties
+++ b/extensions/flyway/deployment/src/test/resources/config-empty.properties
@@ -0,0 +1 @@
+quarkus.datasource.devservices=false
\ No newline at end of file
diff --git a/extensions/flyway/deployment/src/test/resources/config-for-default-datasource.properties b/extensions/flyway/deployment/src/test/resources/config-for-default-datasource.properties
index bf00b82123321..cc374dffc5ea4 100644
--- a/extensions/flyway/deployment/src/test/resources/config-for-default-datasource.properties
+++ b/extensions/flyway/deployment/src/test/resources/config-for-default-datasource.properties
@@ -14,4 +14,5 @@ quarkus.flyway.repeatable-sql-migration-prefix=K
 quarkus.flyway.migrate-at-start=false
 quarkus.flyway.baseline-on-migrate=true
 quarkus.flyway.baseline-version=2.0.1
-quarkus.flyway.baseline-description=Initial description
\ No newline at end of file
+quarkus.flyway.baseline-description=Initial description
+quarkus.flyway.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback,io.quarkus.flyway.test.FlywayExtensionCallback2
\ No newline at end of file
diff --git a/extensions/flyway/deployment/src/test/resources/config-for-missing-named-datasource.properties b/extensions/flyway/deployment/src/test/resources/config-for-missing-named-datasource.properties
index 27430d4d46f63..7aa7e8ef355fe 100644
--- a/extensions/flyway/deployment/src/test/resources/config-for-missing-named-datasource.properties
+++ b/extensions/flyway/deployment/src/test/resources/config-for-missing-named-datasource.properties
@@ -2,7 +2,6 @@
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 quarkus.datasource.inventory.jdbc.transactions=xa
 
diff --git a/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties b/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties
index feebb82cb9502..ae8786f2ef502 100644
--- a/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties
+++ b/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties
@@ -2,7 +2,6 @@
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 # Datasource for "inventory"
@@ -10,7 +9,6 @@ quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.driver=org.h2.jdbcx.JdbcDataSource
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 quarkus.datasource.inventory.jdbc.transactions=xa
 
@@ -25,6 +23,7 @@ quarkus.flyway.users.migrate-at-start=false
 quarkus.flyway.users.baseline-on-migrate=true
 quarkus.flyway.users.baseline-version=2.0.1
 quarkus.flyway.users.baseline-description=Users initial description
+quarkus.flyway.users.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback
 
 # Flyway configuration for "inventory" datasource
 quarkus.flyway.inventory.connect-retries=12
@@ -36,4 +35,5 @@ quarkus.flyway.inventory.repeatable-sql-migration-prefix=N
 quarkus.flyway.inventory.migrate-at-start=false
 quarkus.flyway.inventory.baseline-on-migrate=true
 quarkus.flyway.inventory.baseline-version=3.0.1
-quarkus.flyway.inventory.baseline-description=Inventory initial description
\ No newline at end of file
+quarkus.flyway.inventory.baseline-description=Inventory initial description
+quarkus.flyway.inventory.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback
diff --git a/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources.properties b/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources.properties
index 03fe87ddb9582..6ea0b197cb8e2 100644
--- a/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources.properties
+++ b/extensions/flyway/deployment/src/test/resources/config-for-multiple-datasources.properties
@@ -9,18 +9,14 @@ quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.driver=org.h2.Driver
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
-quarkus.datasource.users.jdbc.xa=false
 
 # Datasource for "inventory"
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.driver=org.h2.jdbcx.JdbcDataSource
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
-quarkus.datasource.inventory.jdbc.xa=true
 
 # Flyway configuration for default datasource
 quarkus.flyway.connect-retries=10
@@ -33,6 +29,7 @@ quarkus.flyway.migrate-at-start=false
 quarkus.flyway.baseline-on-migrate=true
 quarkus.flyway.baseline-version=2.0.1
 quarkus.flyway.baseline-description=Initial description
+quarkus.flyway.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback
 
 # Flyway configuration for "users" datasource
 quarkus.flyway.users.connect-retries=11
@@ -45,6 +42,7 @@ quarkus.flyway.users.migrate-at-start=false
 quarkus.flyway.users.baseline-on-migrate=true
 quarkus.flyway.users.baseline-version=2.0.1
 quarkus.flyway.users.baseline-description=Users initial description
+quarkus.flyway.users.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback
 
 # Flyway configuration for "inventory" datasource
 quarkus.flyway.inventory.connect-retries=12
@@ -56,4 +54,5 @@ quarkus.flyway.inventory.repeatable-sql-migration-prefix=N
 quarkus.flyway.inventory.migrate-at-start=false
 quarkus.flyway.inventory.baseline-on-migrate=true
 quarkus.flyway.inventory.baseline-version=3.0.1
-quarkus.flyway.inventory.baseline-description=Inventory initial description
\ No newline at end of file
+quarkus.flyway.inventory.baseline-description=Inventory initial description
+quarkus.flyway.inventory.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback
diff --git a/extensions/flyway/deployment/src/test/resources/config-for-named-datasource-without-default.properties b/extensions/flyway/deployment/src/test/resources/config-for-named-datasource-without-default.properties
index 03b645aa0da7f..546ce3cc0ba18 100644
--- a/extensions/flyway/deployment/src/test/resources/config-for-named-datasource-without-default.properties
+++ b/extensions/flyway/deployment/src/test/resources/config-for-named-datasource-without-default.properties
@@ -2,7 +2,6 @@
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 # Flyway configuration for "users" datasource
@@ -15,4 +14,5 @@ quarkus.flyway.users.repeatable-sql-migration-prefix=S
 quarkus.flyway.users.migrate-at-start=false
 quarkus.flyway.users.baseline-on-migrate=true
 quarkus.flyway.users.baseline-version=2.0.1
-quarkus.flyway.users.baseline-description=Users initial description
\ No newline at end of file
+quarkus.flyway.users.baseline-description=Users initial description
+quarkus.flyway.users.callbacks=io.quarkus.flyway.test.FlywayExtensionCallback
diff --git a/extensions/flyway/deployment/src/test/resources/db/migration-subfolder/subfolder/V1.0.0__Quarkus.sql b/extensions/flyway/deployment/src/test/resources/db/migration-subfolder/subfolder/V1.0.0__Quarkus.sql
new file mode 100644
index 0000000000000..241cad5122ccb
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/resources/db/migration-subfolder/subfolder/V1.0.0__Quarkus.sql
@@ -0,0 +1,5 @@
+CREATE TABLE quarked_flyway
+(
+    id   INT,
+    name VARCHAR(20)
+);
\ No newline at end of file
diff --git a/extensions/flyway/deployment/src/test/resources/db/migration/V1.0.3__Quarkus_Callback.sql b/extensions/flyway/deployment/src/test/resources/db/migration/V1.0.3__Quarkus_Callback.sql
new file mode 100644
index 0000000000000..1f46dcd82ef47
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/resources/db/migration/V1.0.3__Quarkus_Callback.sql
@@ -0,0 +1,4 @@
+CREATE TABLE quarked_callback_2
+(
+    name VARCHAR(120)
+);
\ No newline at end of file
diff --git a/extensions/flyway/deployment/src/test/resources/migrate-at-start-config-named-datasource.properties b/extensions/flyway/deployment/src/test/resources/migrate-at-start-config-named-datasource.properties
index 642e89b61ef9e..c7ca3a02a4830 100644
--- a/extensions/flyway/deployment/src/test/resources/migrate-at-start-config-named-datasource.properties
+++ b/extensions/flyway/deployment/src/test/resources/migrate-at-start-config-named-datasource.properties
@@ -1,5 +1,4 @@
-quarkus.log.category."org.flywaydb.core".level=DEBUG
-quarkus.log.category."io.quarkus.flyway".level=DEBUG
+#quarkus.log.category."io.quarkus.flyway".level=DEBUG
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=sa
 quarkus.datasource.users.password=sa
diff --git a/extensions/flyway/deployment/src/test/resources/migrate-at-start-subfolder-config.properties b/extensions/flyway/deployment/src/test/resources/migrate-at-start-subfolder-config.properties
new file mode 100644
index 0000000000000..c57bf8416f737
--- /dev/null
+++ b/extensions/flyway/deployment/src/test/resources/migrate-at-start-subfolder-config.properties
@@ -0,0 +1,8 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=sa
+quarkus.datasource.password=sa
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-migrate-at-start-subfolder;DB_CLOSE_DELAY=-1
+
+# Flyway config properties
+quarkus.flyway.locations=db/migration-subfolder
+quarkus.flyway.migrate-at-start=true
diff --git a/extensions/flyway/pom.xml b/extensions/flyway/pom.xml
index 80da7552111f3..78fe0ed722454 100644
--- a/extensions/flyway/pom.xml
+++ b/extensions/flyway/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/flyway/runtime/pom.xml b/extensions/flyway/runtime/pom.xml
index 8401d705a6930..ca9811bc5916a 100644
--- a/extensions/flyway/runtime/pom.xml
+++ b/extensions/flyway/runtime/pom.xml
@@ -29,9 +29,24 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-narayana-jta</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- test dependencies -->
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayBuildTimeConfig.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayBuildTimeConfig.java
index 8e856d661872f..47e7a4878c7f4 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayBuildTimeConfig.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayBuildTimeConfig.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -10,16 +11,13 @@
 @ConfigRoot(name = "flyway", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
 public final class FlywayBuildTimeConfig {
 
-    public static final FlywayBuildTimeConfig defaultConfig() {
-        FlywayBuildTimeConfig defaultConfig = new FlywayBuildTimeConfig();
-        defaultConfig.defaultDataSource = FlywayDataSourceBuildTimeConfig.defaultConfig();
-        return defaultConfig;
-    }
-
     /**
      * Gets the {@link FlywayDataSourceBuildTimeConfig} for the given datasource name.
      */
     public FlywayDataSourceBuildTimeConfig getConfigForDataSourceName(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
         return namedDataSources.getOrDefault(dataSourceName, FlywayDataSourceBuildTimeConfig.defaultConfig());
     }
 
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainer.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainer.java
index 945c7cdc7a471..b792887bc60d8 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainer.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainer.java
@@ -7,11 +7,13 @@ public class FlywayContainer {
     private final Flyway flyway;
     private final boolean cleanAtStart;
     private final boolean migrateAtStart;
+    private final String dataSourceName;
 
-    public FlywayContainer(Flyway flyway, boolean cleanAtStart, boolean migrateAtStart) {
+    public FlywayContainer(Flyway flyway, boolean cleanAtStart, boolean migrateAtStart, String dataSourceName) {
         this.flyway = flyway;
         this.cleanAtStart = cleanAtStart;
         this.migrateAtStart = migrateAtStart;
+        this.dataSourceName = dataSourceName;
     }
 
     public Flyway getFlyway() {
@@ -25,4 +27,8 @@ public boolean isCleanAtStart() {
     public boolean isMigrateAtStart() {
         return migrateAtStart;
     }
+
+    public String getDataSourceName() {
+        return dataSourceName;
+    }
 }
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainerProducer.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainerProducer.java
index 372453b51b34d..b46b380934152 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainerProducer.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainerProducer.java
@@ -1,10 +1,11 @@
 package io.quarkus.flyway.runtime;
 
+import java.util.Collection;
+
 import javax.sql.DataSource;
 
 import org.flywaydb.core.Flyway;
-
-import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import org.flywaydb.core.api.callback.Callback;
 
 /**
  * This class is sort of a producer for {@link Flyway}.
@@ -28,13 +29,12 @@ public FlywayContainerProducer(FlywayRuntimeConfig flywayRuntimeConfig, FlywayBu
     }
 
     public FlywayContainer createFlyway(DataSource dataSource, String dataSourceName) {
-        FlywayDataSourceRuntimeConfig matchingRuntimeConfig = DataSourceUtil.isDefault(dataSourceName)
-                ? flywayRuntimeConfig.defaultDataSource
-                : flywayRuntimeConfig.getConfigForDataSourceName(dataSourceName);
-        FlywayDataSourceBuildTimeConfig matchingBuildTimeConfig = DataSourceUtil.isDefault(dataSourceName)
-                ? flywayBuildConfig.defaultDataSource
-                : flywayBuildConfig.getConfigForDataSourceName(dataSourceName);
-        Flyway flyway = new FlywayCreator(matchingRuntimeConfig, matchingBuildTimeConfig).createFlyway(dataSource);
-        return new FlywayContainer(flyway, matchingRuntimeConfig.cleanAtStart, matchingRuntimeConfig.migrateAtStart);
+        FlywayDataSourceRuntimeConfig matchingRuntimeConfig = flywayRuntimeConfig.getConfigForDataSourceName(dataSourceName);
+        FlywayDataSourceBuildTimeConfig matchingBuildTimeConfig = flywayBuildConfig.getConfigForDataSourceName(dataSourceName);
+        final Collection<Callback> callbacks = QuarkusPathLocationScanner.callbacksForDataSource(dataSourceName);
+        final Flyway flyway = new FlywayCreator(matchingRuntimeConfig, matchingBuildTimeConfig).withCallbacks(callbacks)
+                .createFlyway(dataSource);
+        return new FlywayContainer(flyway, matchingRuntimeConfig.cleanAtStart, matchingRuntimeConfig.migrateAtStart,
+                dataSourceName);
     }
 }
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainersSupplier.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainersSupplier.java
new file mode 100644
index 0000000000000..47537af91e9bd
--- /dev/null
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayContainersSupplier.java
@@ -0,0 +1,43 @@
+package io.quarkus.flyway.runtime;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Supplier;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+
+public class FlywayContainersSupplier implements Supplier<Collection<FlywayContainer>> {
+
+    @Override
+    public Collection<FlywayContainer> get() {
+        if (FlywayRecorder.FLYWAY_CONTAINERS.isEmpty()) {
+            return Collections.emptySet();
+        }
+
+        Set<FlywayContainer> containers = new TreeSet<>(FlywayContainerComparator.INSTANCE);
+        containers.addAll(FlywayRecorder.FLYWAY_CONTAINERS);
+        return containers;
+    }
+
+    private static class FlywayContainerComparator implements Comparator<FlywayContainer> {
+
+        private static final FlywayContainerComparator INSTANCE = new FlywayContainerComparator();
+
+        @Override
+        public int compare(FlywayContainer o1, FlywayContainer o2) {
+            String dataSourceName1 = o1.getDataSourceName();
+            String dataSourceName2 = o2.getDataSourceName();
+            if (DataSourceUtil.isDefault(dataSourceName1)) {
+                return -1;
+            }
+            if (DataSourceUtil.isDefault(dataSourceName2)) {
+                return 1;
+            }
+            return dataSourceName1.compareTo(dataSourceName2);
+        }
+
+    }
+}
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java
index 87007bebd89b7..1cd73f2ac0b32 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java
@@ -1,10 +1,13 @@
 package io.quarkus.flyway.runtime;
 
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 import javax.sql.DataSource;
 
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.callback.Callback;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
 
 class FlywayCreator {
@@ -13,6 +16,7 @@ class FlywayCreator {
 
     private final FlywayDataSourceRuntimeConfig flywayRuntimeConfig;
     private final FlywayDataSourceBuildTimeConfig flywayBuildTimeConfig;
+    private Collection<Callback> callbacks = Collections.emptyList();
 
     public FlywayCreator(FlywayDataSourceRuntimeConfig flywayRuntimeConfig,
             FlywayDataSourceBuildTimeConfig flywayBuildTimeConfig) {
@@ -20,6 +24,11 @@ public FlywayCreator(FlywayDataSourceRuntimeConfig flywayRuntimeConfig,
         this.flywayBuildTimeConfig = flywayBuildTimeConfig;
     }
 
+    public FlywayCreator withCallbacks(Collection<Callback> callbacks) {
+        this.callbacks = callbacks;
+        return this;
+    }
+
     public Flyway createFlyway(DataSource dataSource) {
         FluentConfiguration configure = Flyway.configure();
         configure.dataSource(dataSource);
@@ -41,6 +50,8 @@ public Flyway createFlyway(DataSource dataSource) {
         }
         configure.baselineOnMigrate(flywayRuntimeConfig.baselineOnMigrate);
         configure.validateOnMigrate(flywayRuntimeConfig.validateOnMigrate);
+        configure.ignoreMissingMigrations(flywayRuntimeConfig.ignoreMissingMigrations);
+        configure.ignoreFutureMigrations(flywayRuntimeConfig.ignoreFutureMigrations);
         configure.outOfOrder(flywayRuntimeConfig.outOfOrder);
         if (flywayRuntimeConfig.baselineVersion.isPresent()) {
             configure.baselineVersion(flywayRuntimeConfig.baselineVersion.get());
@@ -56,7 +67,9 @@ public Flyway createFlyway(DataSource dataSource) {
         if (flywayRuntimeConfig.placeholderSuffix.isPresent()) {
             configure.placeholderSuffix(flywayRuntimeConfig.placeholderSuffix.get());
         }
-
+        if (!callbacks.isEmpty()) {
+            configure.callbacks(callbacks.toArray(new Callback[0]));
+        }
         /*
          * Ensure that no classpath scanning takes place by setting the ClassProvider and the ResourceProvider
          * (see Flyway#createResourceAndClassProviders)
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceBuildTimeConfig.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceBuildTimeConfig.java
index ee3e41f382c38..92329b6c5437d 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceBuildTimeConfig.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceBuildTimeConfig.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -11,17 +12,6 @@ public final class FlywayDataSourceBuildTimeConfig {
 
     private static final String DEFAULT_LOCATION = "db/migration";
 
-    /**
-     * Creates a {@link FlywayDataSourceBuildTimeConfig} with default settings.
-     *
-     * @return {@link FlywayDataSourceBuildTimeConfig}
-     */
-    public static final FlywayDataSourceBuildTimeConfig defaultConfig() {
-        FlywayDataSourceBuildTimeConfig defaultConfig = new FlywayDataSourceBuildTimeConfig();
-        defaultConfig.locations = Arrays.asList(DEFAULT_LOCATION);
-        return defaultConfig;
-    }
-
     /**
      * Comma-separated list of locations to scan recursively for migrations. The location type is determined by its prefix.
      * <p>
@@ -33,4 +23,24 @@ public static final FlywayDataSourceBuildTimeConfig defaultConfig() {
      */
     @ConfigItem(defaultValue = DEFAULT_LOCATION)
     public List<String> locations;
+
+    /**
+     * Comma-separated list of fully qualified class names of Callback implementations
+     * to use to hook into the Flyway lifecycle.
+     * The {@link org.flywaydb.core.api.callback.Callback} sub-class must have a no-args constructor and must not be abstract.
+     * These classes must also not have any fields that hold state (unless that state is initialized in the constructor).
+     */
+    @ConfigItem
+    public Optional<List<String>> callbacks = Optional.empty();
+
+    /**
+     * Creates a {@link FlywayDataSourceBuildTimeConfig} with default settings.
+     *
+     * @return {@link FlywayDataSourceBuildTimeConfig}
+     */
+    public static final FlywayDataSourceBuildTimeConfig defaultConfig() {
+        FlywayDataSourceBuildTimeConfig defaultConfig = new FlywayDataSourceBuildTimeConfig();
+        defaultConfig.locations = Arrays.asList(DEFAULT_LOCATION);
+        return defaultConfig;
+    }
 }
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java
index d32c8522f2b11..03f38a13b4fc4 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java
@@ -108,6 +108,22 @@ public static final FlywayDataSourceRuntimeConfig defaultConfig() {
     @ConfigItem
     public boolean outOfOrder;
 
+    /**
+     * Ignore missing migrations when reading the history table. When set to true migrations from older versions present in the
+     * history table but absent in the configured locations will be ignored (and logged as a warning), when false (the default)
+     * the validation step will fail.
+     */
+    @ConfigItem
+    public boolean ignoreMissingMigrations;
+
+    /**
+     * Ignore future migrations when reading the history table. When set to true migrations from newer versions present in the
+     * history table but absent in the configured locations will be ignored (and logged as a warning), when false (the default)
+     * the validation step will fail.
+     */
+    @ConfigItem
+    public boolean ignoreFutureMigrations;
+
     /**
      * Sets the placeholders to replace in SQL migration scripts.
      */
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java
index 1bc72c8963592..c2da29f02b0d3 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java
@@ -3,15 +3,19 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Supplier;
 
+import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.sql.DataSource;
 
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.callback.Callback;
 import org.flywaydb.core.api.migration.JavaMigration;
 import org.jboss.logging.Logger;
 
 import io.quarkus.agroal.runtime.DataSources;
+import io.quarkus.agroal.runtime.UnconfiguredDataSource;
 import io.quarkus.arc.Arc;
 import io.quarkus.runtime.annotations.Recorder;
 
@@ -20,7 +24,7 @@ public class FlywayRecorder {
 
     private static final Logger log = Logger.getLogger(FlywayRecorder.class);
 
-    private final List<FlywayContainer> flywayContainers = new ArrayList<>(2);
+    static final List<FlywayContainer> FLYWAY_CONTAINERS = new ArrayList<>(2);
 
     public void setApplicationMigrationFiles(Collection<String> migrationFiles) {
         log.debugv("Setting the following application migration files: {0}", migrationFiles);
@@ -32,11 +36,28 @@ public void setApplicationMigrationClasses(Collection<Class<? extends JavaMigrat
         QuarkusPathLocationScanner.setApplicationMigrationClasses(migrationClasses);
     }
 
+    public void setApplicationCallbackClasses(Map<String, Collection<Callback>> callbackClasses) {
+        log.debugv("Setting application callbacks: {0} total", callbackClasses.values().size());
+        QuarkusPathLocationScanner.setApplicationCallbackClasses(callbackClasses);
+    }
+
+    public void resetFlywayContainers() {
+        FLYWAY_CONTAINERS.clear();
+    }
+
     public Supplier<Flyway> flywaySupplier(String dataSourceName) {
         DataSource dataSource = DataSources.fromName(dataSourceName);
+        if (dataSource instanceof UnconfiguredDataSource) {
+            return new Supplier<Flyway>() {
+                @Override
+                public Flyway get() {
+                    throw new UnsatisfiedResolutionException("No datasource present");
+                }
+            };
+        }
         FlywayContainerProducer flywayProducer = Arc.container().instance(FlywayContainerProducer.class).get();
         FlywayContainer flywayContainer = flywayProducer.createFlyway(dataSource, dataSourceName);
-        flywayContainers.add(flywayContainer);
+        FLYWAY_CONTAINERS.add(flywayContainer);
         return new Supplier<Flyway>() {
             @Override
             public Flyway get() {
@@ -46,7 +67,7 @@ public Flyway get() {
     }
 
     public void doStartActions() {
-        for (FlywayContainer flywayContainer : flywayContainers) {
+        for (FlywayContainer flywayContainer : FLYWAY_CONTAINERS) {
             if (flywayContainer.isCleanAtStart()) {
                 flywayContainer.getFlyway().clean();
             }
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRuntimeConfig.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRuntimeConfig.java
index 637761d1be00f..966ef4afdffbd 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRuntimeConfig.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRuntimeConfig.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -10,14 +11,13 @@
 @ConfigRoot(name = "flyway", phase = ConfigPhase.RUN_TIME)
 public final class FlywayRuntimeConfig {
 
-    public static final FlywayRuntimeConfig defaultConfig() {
-        return new FlywayRuntimeConfig();
-    }
-
     /**
      * Gets the {@link FlywayDataSourceRuntimeConfig} for the given datasource name.
      */
     public FlywayDataSourceRuntimeConfig getConfigForDataSourceName(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
         return namedDataSources.getOrDefault(dataSourceName, FlywayDataSourceRuntimeConfig.defaultConfig());
     }
 
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusFlywayResourceProvider.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusFlywayResourceProvider.java
index d44fa13b2ce3f..8887f954ccd1a 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusFlywayResourceProvider.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusFlywayResourceProvider.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 import org.flywaydb.core.api.ResourceProvider;
-import org.flywaydb.core.internal.resource.LoadableResource;
+import org.flywaydb.core.api.resource.LoadableResource;
 import org.flywaydb.core.internal.util.StringUtils;
 import org.jboss.logging.Logger;
 
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusPathLocationScanner.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusPathLocationScanner.java
index 8b47a55d984c3..f2f517c17338e 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusPathLocationScanner.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/QuarkusPathLocationScanner.java
@@ -4,12 +4,15 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 
 import org.flywaydb.core.api.Location;
+import org.flywaydb.core.api.callback.Callback;
 import org.flywaydb.core.api.migration.JavaMigration;
-import org.flywaydb.core.internal.resource.LoadableResource;
+import org.flywaydb.core.api.resource.LoadableResource;
 import org.flywaydb.core.internal.resource.classpath.ClassPathResource;
 import org.flywaydb.core.internal.scanner.classpath.ResourceAndClassScanner;
+import org.flywaydb.core.internal.scanner.filesystem.FileSystemScanner;
 import org.jboss.logging.Logger;
 
 /**
@@ -22,6 +25,7 @@ public final class QuarkusPathLocationScanner implements ResourceAndClassScanner
     private static final String LOCATION_SEPARATOR = "/";
     private static Collection<String> applicationMigrationFiles = Collections.emptyList(); // the set default to aid unit tests
     private static Collection<Class<? extends JavaMigration>> applicationMigrationClasses = Collections.emptyList(); // the set default to aid unit tests
+    private static Map<String, Collection<Callback>> applicationCallbackClasses = Collections.emptyMap(); // the set default to aid unit tests
 
     private final Collection<LoadableResource> scannedResources;
 
@@ -31,15 +35,32 @@ public QuarkusPathLocationScanner(Collection<Location> locations) {
         this.scannedResources = new ArrayList<>();
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
 
+        FileSystemScanner fileSystemScanner = null;
         for (String migrationFile : applicationMigrationFiles) {
-            if (canHandleMigrationFile(locations, migrationFile)) {
+            if (isClassPathResource(locations, migrationFile)) {
                 LOGGER.debugf("Loading %s", migrationFile);
                 scannedResources.add(new ClassPathResource(null, migrationFile, classLoader, StandardCharsets.UTF_8));
+            } else if (migrationFile.startsWith(Location.FILESYSTEM_PREFIX)) {
+                if (fileSystemScanner == null) {
+                    fileSystemScanner = new FileSystemScanner(StandardCharsets.UTF_8, false);
+                }
+                LOGGER.debugf("Checking %s for migration files", migrationFile);
+                Collection<LoadableResource> resources = fileSystemScanner.scanForResources(new Location(migrationFile));
+                LOGGER.debugf("%s contains %d migration files", migrationFile, resources.size());
+                scannedResources.addAll(resources);
             }
         }
 
     }
 
+    public static void setApplicationCallbackClasses(Map<String, Collection<Callback>> callbackClasses) {
+        QuarkusPathLocationScanner.applicationCallbackClasses = callbackClasses;
+    }
+
+    public static Collection<Callback> callbacksForDataSource(String dsName) {
+        return applicationCallbackClasses.getOrDefault(dsName, Collections.emptyList());
+    }
+
     /**
      *
      * @return The resources that were found.
@@ -49,7 +70,7 @@ public Collection<LoadableResource> scanForResources() {
         return scannedResources;
     }
 
-    private boolean canHandleMigrationFile(Collection<Location> locations, String migrationFile) {
+    private boolean isClassPathResource(Collection<Location> locations, String migrationFile) {
         for (Location location : locations) {
             String locationPath = location.getPath();
             if (!locationPath.endsWith(LOCATION_SEPARATOR)) {
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devconsole/FlywayDevConsoleRecorder.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devconsole/FlywayDevConsoleRecorder.java
new file mode 100644
index 0000000000000..e3a2f755e5c98
--- /dev/null
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devconsole/FlywayDevConsoleRecorder.java
@@ -0,0 +1,47 @@
+package io.quarkus.flyway.runtime.devconsole;
+
+import java.util.Collection;
+
+import org.flywaydb.core.Flyway;
+
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil.FlashMessageStatus;
+import io.quarkus.flyway.runtime.FlywayContainer;
+import io.quarkus.flyway.runtime.FlywayContainersSupplier;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class FlywayDevConsoleRecorder {
+
+    public Handler<RoutingContext> handler() {
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form) throws Exception {
+                String datasource = form.get("datasource");
+                String operation = form.get("operation");
+                Collection<FlywayContainer> liquibaseContainers = new FlywayContainersSupplier().get();
+                for (FlywayContainer flywayContainer : liquibaseContainers) {
+                    if (flywayContainer.getDataSourceName().equals(datasource)) {
+                        Flyway flyway = flywayContainer.getFlyway();
+                        if ("clean".equals(operation)) {
+                            flyway.clean();
+                            flashMessage(event, "Database cleaned");
+                            return;
+                        } else if ("migrate".equals(operation)) {
+                            flyway.migrate();
+                            flashMessage(event, "Database migrated");
+                            return;
+                        } else {
+                            flashMessage(event, "Invalid operation: " + operation, FlashMessageStatus.ERROR);
+                            return;
+                        }
+                    }
+                }
+                flashMessage(event, "Datasource not found: " + datasource, FlashMessageStatus.ERROR);
+            }
+        };
+    }
+}
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassPathScannerSubstitutions.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassPathScannerSubstitutions.java
new file mode 100644
index 0000000000000..56a8156dce874
--- /dev/null
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ClassPathScannerSubstitutions.java
@@ -0,0 +1,65 @@
+package io.quarkus.flyway.runtime.graal;
+
+import java.util.HashMap;
+import java.util.function.BooleanSupplier;
+
+import org.flywaydb.core.internal.scanner.LocationScannerCache;
+import org.flywaydb.core.internal.scanner.ResourceNameCache;
+import org.flywaydb.core.internal.scanner.classpath.ClassPathLocationScanner;
+import org.flywaydb.core.internal.scanner.classpath.FileSystemClassPathLocationScanner;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+/**
+ * Get rid of JBoss VFS if it is not present in the classpath.
+ */
+@TargetClass(className = "org.flywaydb.core.internal.scanner.classpath.ClassPathScanner", onlyWith = ClassPathScannerSubstitutions.IsJBossVFSAbsent.class)
+public final class ClassPathScannerSubstitutions {
+
+    @Alias
+    private LocationScannerCache locationScannerCache;
+
+    @Alias
+    private ResourceNameCache resourceNameCache;
+
+    @Substitute
+    private ClassPathLocationScanner createLocationScanner(String protocol) {
+        if (locationScannerCache.containsKey(protocol)) {
+            return locationScannerCache.get(protocol);
+        }
+
+        if ("file".equals(protocol)) {
+            FileSystemClassPathLocationScanner locationScanner = new FileSystemClassPathLocationScanner();
+            locationScannerCache.put(protocol, locationScanner);
+            resourceNameCache.put(locationScanner, new HashMap<>());
+            return locationScanner;
+        }
+
+        if ("jar".equals(protocol)) {
+            String separator = "!/";
+            ClassPathLocationScanner locationScanner = (ClassPathLocationScanner) (Object) new JarFileClassPathLocationScannerSubstitutions(
+                    separator);
+            locationScannerCache.put(protocol, locationScanner);
+            resourceNameCache.put(locationScanner, new HashMap<>());
+            return locationScanner;
+        }
+
+        return null;
+    }
+
+    static final class IsJBossVFSAbsent implements BooleanSupplier {
+
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName("org.jboss.vfs.VFS");
+                return false;
+            } catch (ClassNotFoundException e) {
+                return true;
+            }
+        }
+    }
+
+}
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java
index a6e896505c636..ea58bdce93382 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/FeatureDetectorSubstitutions.java
@@ -42,4 +42,9 @@ public boolean isAndroidAvailable() {
         return false;
     }
 
+    @Substitute
+    public boolean isLog4J2Available() {
+        return false;
+    }
+
 }
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/JarFileClassPathLocationScannerSubstitutions.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/JarFileClassPathLocationScannerSubstitutions.java
new file mode 100644
index 0000000000000..a5f9f966f70b2
--- /dev/null
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/JarFileClassPathLocationScannerSubstitutions.java
@@ -0,0 +1,15 @@
+package io.quarkus.flyway.runtime.graal;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.TargetClass;
+
+/**
+ * Just make the constructor visible to ClassPathScannerSubstitutions.
+ */
+@TargetClass(className = "org.flywaydb.core.internal.scanner.classpath.JarFileClassPathLocationScanner")
+public final class JarFileClassPathLocationScannerSubstitutions {
+
+    @Alias
+    public JarFileClassPathLocationScannerSubstitutions(String separator) {
+    }
+}
\ No newline at end of file
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/PostgreSQLParserSubstitutions.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/PostgreSQLParserSubstitutions.java
index 533746dd20192..7418e308f0ffc 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/PostgreSQLParserSubstitutions.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/PostgreSQLParserSubstitutions.java
@@ -18,7 +18,7 @@
  * This substitution removes de PosgreSQL COPY statement support in Flyway to allow native image compilation
  * when the PostgreSQL Driver is not in the classpath.
  */
-@TargetClass(className = "org.flywaydb.core.internal.database.postgresql.PostgreSQLParser", onlyWith = PostgreSQLParserSubstitutions.Selector.class)
+@TargetClass(className = "org.flywaydb.core.internal.database.postgresql.PostgreSQLParser", onlyWith = PostgreSQLParserSubstitutions.IsPostgreSQLDriverAbsent.class)
 public final class PostgreSQLParserSubstitutions {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
@@ -43,7 +43,7 @@ protected ParsedSqlStatement createStatement(PeekingReader reader, Recorder reco
                 sql, delimiter, canExecuteInTransaction);
     }
 
-    static final class Selector implements BooleanSupplier {
+    static final class IsPostgreSQLDriverAbsent implements BooleanSupplier {
 
         @Override
         public boolean getAsBoolean() {
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ScannerSubstitutions.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ScannerSubstitutions.java
index 11881097efa88..1840d08819ff2 100644
--- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ScannerSubstitutions.java
+++ b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/graal/ScannerSubstitutions.java
@@ -18,7 +18,9 @@ public final class ScannerSubstitutions {
 
     @Substitute
     public ScannerSubstitutions(Class<?> implementedInterface, Collection<Location> locations, ClassLoader classLoader,
-            Charset encoding, ResourceNameCache resourceNameCache, LocationScannerCache locationScannerCache) {
+            Charset encoding,
+            boolean stream,
+            ResourceNameCache resourceNameCache, LocationScannerCache locationScannerCache) {
         throw new IllegalStateException("'org.flywaydb.core.internal.scanner.Scanner' is never used in Quarkus");
     }
 }
diff --git a/extensions/flyway/runtime/src/test/java/io/quarkus/flyway/runtime/FlywayCreatorTest.java b/extensions/flyway/runtime/src/test/java/io/quarkus/flyway/runtime/FlywayCreatorTest.java
index 59a9407a89ca6..23c1e37524068 100644
--- a/extensions/flyway/runtime/src/test/java/io/quarkus/flyway/runtime/FlywayCreatorTest.java
+++ b/extensions/flyway/runtime/src/test/java/io/quarkus/flyway/runtime/FlywayCreatorTest.java
@@ -179,6 +179,30 @@ void testOutOfOrder() {
         assertTrue(createdFlywayConfig().isOutOfOrder());
     }
 
+    @Test
+    @DisplayName("ignoreMissingMigrations is correctly set")
+    void testIgnoreMissingMigrations() {
+        runtimeConfig.ignoreMissingMigrations = false;
+        creator = new FlywayCreator(runtimeConfig, buildConfig);
+        assertFalse(createdFlywayConfig().isIgnoreMissingMigrations());
+
+        runtimeConfig.ignoreMissingMigrations = true;
+        creator = new FlywayCreator(runtimeConfig, buildConfig);
+        assertTrue(createdFlywayConfig().isIgnoreMissingMigrations());
+    }
+
+    @Test
+    @DisplayName("ignoreFutureMigrations is correctly set")
+    void testIgnoreFutureMigrations() {
+        runtimeConfig.ignoreFutureMigrations = false;
+        creator = new FlywayCreator(runtimeConfig, buildConfig);
+        assertFalse(createdFlywayConfig().isIgnoreFutureMigrations());
+
+        runtimeConfig.ignoreFutureMigrations = true;
+        creator = new FlywayCreator(runtimeConfig, buildConfig);
+        assertTrue(createdFlywayConfig().isIgnoreFutureMigrations());
+    }
+
     @ParameterizedTest
     @MethodSource("validateOnMigrateOverwritten")
     @DisplayName("validate on migrate overwritten in configuration")
diff --git a/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml b/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml
index d7832163a07a8..2a03684b9a675 100644
--- a/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-amazon-lambda-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,10 +29,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java b/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java
index 54a84d5360126..f6b374d81e519 100644
--- a/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java
+++ b/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java
@@ -10,8 +10,10 @@
 import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
@@ -24,6 +26,8 @@
 
 public class FunqyLambdaBuildStep {
 
+    public static final String FUNQY_AMAZON_LAMBDA = "funqy-amazon-lambda";
+
     public static final class RuntimeComplete extends SimpleBuildItem {
     }
 
@@ -31,11 +35,13 @@ public static final class RuntimeComplete extends SimpleBuildItem {
     @Record(STATIC_INIT)
     public void init(List<FunctionBuildItem> functions,
             FunqyLambdaBindingRecorder recorder,
+            BuildProducer<FeatureBuildItem> feature,
             Optional<FunctionInitializedBuildItem> hasFunctions,
             LambdaObjectMapperInitializedBuildItem mapperDependency,
             BeanContainerBuildItem beanContainer) throws Exception {
         if (!hasFunctions.isPresent() || hasFunctions.get() == null)
             return;
+        feature.produce(new FeatureBuildItem(FUNQY_AMAZON_LAMBDA));
         recorder.init(beanContainer.getValue());
     }
 
diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml
index ffa35f94ea6a5..6b0414ec4538f 100644
--- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-amazon-lambda-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 7867aac3ccedf..26176181cc127 100644
--- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -9,7 +9,7 @@ to you 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
+  https://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
diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 1ba20ebc4a1e3..75f6f71b57536 100644
--- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -74,25 +74,9 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>\${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/extensions/funqy/funqy-amazon-lambda/pom.xml b/extensions/funqy/funqy-amazon-lambda/pom.xml
index a5d589089e602..d35c9dab581b7 100644
--- a/extensions/funqy/funqy-amazon-lambda/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-funqy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-amazon-lambda/runtime/pom.xml b/extensions/funqy/funqy-amazon-lambda/runtime/pom.xml
index fd38e96cba2a9..d5f86f18397b8 100644
--- a/extensions/funqy/funqy-amazon-lambda/runtime/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-amazon-lambda-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-amazon-lambda/runtime/src/main/java/io/quarkus/funqy/lambda/FunqyLambdaBindingRecorder.java b/extensions/funqy/funqy-amazon-lambda/runtime/src/main/java/io/quarkus/funqy/lambda/FunqyLambdaBindingRecorder.java
index 9e620c2fce2cd..03ac85133e80c 100644
--- a/extensions/funqy/funqy-amazon-lambda/runtime/src/main/java/io/quarkus/funqy/lambda/FunqyLambdaBindingRecorder.java
+++ b/extensions/funqy/funqy-amazon-lambda/runtime/src/main/java/io/quarkus/funqy/lambda/FunqyLambdaBindingRecorder.java
@@ -7,6 +7,7 @@
 import org.jboss.logging.Logger;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
@@ -14,6 +15,10 @@
 import io.quarkus.amazon.lambda.runtime.AbstractLambdaPollLoop;
 import io.quarkus.amazon.lambda.runtime.AmazonLambdaContext;
 import io.quarkus.amazon.lambda.runtime.AmazonLambdaMapperRecorder;
+import io.quarkus.amazon.lambda.runtime.JacksonInputReader;
+import io.quarkus.amazon.lambda.runtime.JacksonOutputWriter;
+import io.quarkus.amazon.lambda.runtime.LambdaInputReader;
+import io.quarkus.amazon.lambda.runtime.LambdaOutputWriter;
 import io.quarkus.arc.ManagedContext;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.funqy.runtime.FunctionConstructor;
@@ -34,8 +39,8 @@ public class FunqyLambdaBindingRecorder {
 
     private static FunctionInvoker invoker;
     private static BeanContainer beanContainer;
-    private static ObjectReader reader;
-    private static ObjectWriter writer;
+    private static LambdaInputReader reader;
+    private static LambdaOutputWriter writer;
 
     public void init(BeanContainer bc) {
         beanContainer = bc;
@@ -43,11 +48,13 @@ public void init(BeanContainer bc) {
         ObjectMapper objectMapper = AmazonLambdaMapperRecorder.objectMapper;
         for (FunctionInvoker invoker : FunctionRecorder.registry.invokers()) {
             if (invoker.hasInput()) {
-                ObjectReader reader = objectMapper.readerFor(invoker.getInputType());
+                JavaType javaInputType = objectMapper.constructType(invoker.getInputType());
+                ObjectReader reader = objectMapper.readerFor(javaInputType);
                 invoker.getBindingContext().put(ObjectReader.class.getName(), reader);
             }
             if (invoker.hasOutput()) {
-                ObjectWriter writer = objectMapper.writerFor(invoker.getOutputType());
+                JavaType javaOutputType = objectMapper.constructType(invoker.getOutputType());
+                ObjectWriter writer = objectMapper.writerFor(javaOutputType);
                 invoker.getBindingContext().put(ObjectWriter.class.getName(), writer);
             }
         }
@@ -69,10 +76,10 @@ public void chooseInvoker(FunqyConfig config) {
             invoker = FunctionRecorder.registry.invokers().iterator().next();
         }
         if (invoker.hasInput()) {
-            reader = (ObjectReader) invoker.getBindingContext().get(ObjectReader.class.getName());
+            reader = new JacksonInputReader((ObjectReader) invoker.getBindingContext().get(ObjectReader.class.getName()));
         }
         if (invoker.hasOutput()) {
-            writer = (ObjectWriter) invoker.getBindingContext().get(ObjectWriter.class.getName());
+            writer = new JacksonOutputWriter((ObjectWriter) invoker.getBindingContext().get(ObjectWriter.class.getName()));
         }
 
     }
@@ -111,12 +118,12 @@ protected Object processRequest(Object input, AmazonLambdaContext context) throw
             }
 
             @Override
-            protected ObjectReader getInputReader() {
+            protected LambdaInputReader getInputReader() {
                 return reader;
             }
 
             @Override
-            protected ObjectWriter getOutputWriter() {
+            protected LambdaOutputWriter getOutputWriter() {
                 return writer;
             }
 
diff --git a/extensions/funqy/funqy-amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/funqy/funqy-amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..3f17a02242044
--- /dev/null
+++ b/extensions/funqy/funqy-amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,17 @@
+name: "Funqy AWS Lambda Binding"
+metadata:
+  keywords:
+  - "funqy"
+  - "function"
+  - "lambda"
+  - "aws"
+  - "amazon"
+  guide: "https://quarkus.io/guides/funqy-amazon-lambda"
+  categories:
+  - "cloud"
+  status: "experimental"
+  codestart:
+    name: "funqy-amazon-lambda"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/funqy/funqy-google-cloud-functions/deployment/pom.xml b/extensions/funqy/funqy-google-cloud-functions/deployment/pom.xml
index 22dddb34c8a97..f61c2eeba3a36 100644
--- a/extensions/funqy/funqy-google-cloud-functions/deployment/pom.xml
+++ b/extensions/funqy/funqy-google-cloud-functions/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-google-cloud-functions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/CloudFunctionsDeploymentBuildStep.java b/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/CloudFunctionsDeploymentBuildStep.java
index c612499472289..d68595654ebcf 100644
--- a/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/CloudFunctionsDeploymentBuildStep.java
+++ b/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/CloudFunctionsDeploymentBuildStep.java
@@ -31,7 +31,7 @@ public ArtifactResultBuildItem functionDeployment(OutputTargetBuildItem target,
             throws BuildException, IOException {
         if (!jar.isUberJar()) {
             throw new BuildException("Google Cloud Function deployment need to use a uberjar, " +
-                    "please set 'quarkus.package.uber-jar=true' inside your application.properties",
+                    "please set 'quarkus.package.type=uber-jar' inside your application.properties",
                     Collections.EMPTY_LIST);
         }
 
diff --git a/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/FunqyCloudFunctionsBuildStep.java b/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/FunqyCloudFunctionsBuildStep.java
index 81a328b6f1924..8546fd20dcccf 100644
--- a/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/FunqyCloudFunctionsBuildStep.java
+++ b/extensions/funqy/funqy-google-cloud-functions/deployment/src/main/java/io/quarkus/funqy/gcp/functions/deployment/bindings/FunqyCloudFunctionsBuildStep.java
@@ -6,7 +6,11 @@
 import java.util.List;
 import java.util.Optional;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -15,6 +19,7 @@
 import io.quarkus.funqy.deployment.FunctionInitializedBuildItem;
 import io.quarkus.funqy.gcp.functions.FunqyCloudFunctionsBindingRecorder;
 import io.quarkus.funqy.runtime.FunqyConfig;
+import io.quarkus.jackson.runtime.ObjectMapperProducer;
 
 public class FunqyCloudFunctionsBuildStep {
     private static final String FEATURE_NAME = "funqy-google-cloud-functions";
@@ -36,7 +41,7 @@ public void init(List<FunctionBuildItem> functions,
             FunqyCloudFunctionsBindingRecorder recorder,
             Optional<FunctionInitializedBuildItem> hasFunctions,
             BeanContainerBuildItem beanContainer) throws Exception {
-        if (!hasFunctions.isPresent() || hasFunctions.get() == null)
+        if (!hasFunctions.isPresent())
             return;
 
         recorder.init(beanContainer.getValue());
@@ -47,4 +52,12 @@ public void init(List<FunctionBuildItem> functions,
     public void choose(FunqyConfig config, FunqyCloudFunctionsBindingRecorder recorder) {
         recorder.chooseInvoker(config);
     }
+
+    @BuildStep
+    public void markObjectMapperUnremovable(BuildProducer<UnremovableBeanBuildItem> unremovable) {
+        unremovable.produce(new UnremovableBeanBuildItem(
+                new UnremovableBeanBuildItem.BeanClassNameExclusion(ObjectMapper.class.getName())));
+        unremovable.produce(new UnremovableBeanBuildItem(
+                new UnremovableBeanBuildItem.BeanClassNameExclusion(ObjectMapperProducer.class.getName())));
+    }
 }
diff --git a/extensions/funqy/funqy-google-cloud-functions/pom.xml b/extensions/funqy/funqy-google-cloud-functions/pom.xml
index f6e615b817ab8..2ad5b7e65acb8 100644
--- a/extensions/funqy/funqy-google-cloud-functions/pom.xml
+++ b/extensions/funqy/funqy-google-cloud-functions/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-funqy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-google-cloud-functions/runtime/pom.xml b/extensions/funqy/funqy-google-cloud-functions/runtime/pom.xml
index 144a5646165e8..04962ed7575b7 100644
--- a/extensions/funqy/funqy-google-cloud-functions/runtime/pom.xml
+++ b/extensions/funqy/funqy-google-cloud-functions/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-google-cloud-functions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/java/io/quarkus/funqy/gcp/functions/FunqyCloudFunctionsBindingRecorder.java b/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/java/io/quarkus/funqy/gcp/functions/FunqyCloudFunctionsBindingRecorder.java
index 5c73cad4a35b9..fa4b57b26e337 100644
--- a/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/java/io/quarkus/funqy/gcp/functions/FunqyCloudFunctionsBindingRecorder.java
+++ b/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/java/io/quarkus/funqy/gcp/functions/FunqyCloudFunctionsBindingRecorder.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
@@ -34,11 +35,13 @@ public void init(BeanContainer bc) {
 
         for (FunctionInvoker invoker : FunctionRecorder.registry.invokers()) {
             if (invoker.hasInput()) {
-                ObjectReader reader = objectMapper.readerFor(invoker.getInputType());
+                JavaType javaInputType = objectMapper.constructType(invoker.getInputType());
+                ObjectReader reader = objectMapper.readerFor(javaInputType);
                 invoker.getBindingContext().put(ObjectReader.class.getName(), reader);
             }
             if (invoker.hasOutput()) {
-                ObjectWriter writer = objectMapper.writerFor(invoker.getOutputType());
+                JavaType javaOutputType = objectMapper.constructType(invoker.getOutputType());
+                ObjectWriter writer = objectMapper.writerFor(javaOutputType);
                 invoker.getBindingContext().put(ObjectWriter.class.getName(), writer);
             }
         }
diff --git a/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f829017a6ee6c..6edd7d48904e6 100644
--- a/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/funqy/funqy-google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Funqy Google Cloud Functions"
 metadata:
   keywords:
@@ -11,4 +10,9 @@ metadata:
   categories:
     - "cloud"
   guide: "https://quarkus.io/guides/funqy-gcp-functions"
-  status: "experimental"
\ No newline at end of file
+  status: "experimental"
+  codestart:
+    name: "funqy-google-cloud-functions-example"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
\ No newline at end of file
diff --git a/extensions/funqy/funqy-http/deployment/pom.xml b/extensions/funqy/funqy-http/deployment/pom.xml
index c63f799c4db57..231189e3b612d 100644
--- a/extensions/funqy/funqy-http/deployment/pom.xml
+++ b/extensions/funqy/funqy-http/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,10 +33,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
diff --git a/extensions/funqy/funqy-http/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/http/FunqyHttpBuildStep.java b/extensions/funqy/funqy-http/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/http/FunqyHttpBuildStep.java
index 23357901917dc..496711d1d6590 100644
--- a/extensions/funqy/funqy-http/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/http/FunqyHttpBuildStep.java
+++ b/extensions/funqy/funqy-http/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/http/FunqyHttpBuildStep.java
@@ -21,7 +21,7 @@
 import io.quarkus.funqy.deployment.FunctionBuildItem;
 import io.quarkus.funqy.deployment.FunctionInitializedBuildItem;
 import io.quarkus.funqy.runtime.bindings.http.FunqyHttpBindingRecorder;
-import io.quarkus.jackson.ObjectMapperProducer;
+import io.quarkus.jackson.runtime.ObjectMapperProducer;
 import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
 import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/Nested.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/Nested.java
new file mode 100644
index 0000000000000..cd9ced011ac8a
--- /dev/null
+++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/Nested.java
@@ -0,0 +1,22 @@
+package io.quarkus.funqy.test;
+
+public class Nested {
+    private Simple nestedOne;
+    private Simple nestedTwo;
+
+    public Simple getNestedOne() {
+        return nestedOne;
+    }
+
+    public void setNestedOne(Simple nestedOne) {
+        this.nestedOne = nestedOne;
+    }
+
+    public Simple getNestedTwo() {
+        return nestedTwo;
+    }
+
+    public void setNestedTwo(Simple nestedTwo) {
+        this.nestedTwo = nestedTwo;
+    }
+}
diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/NestedCollection.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/NestedCollection.java
new file mode 100644
index 0000000000000..ba8debec3cb2c
--- /dev/null
+++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/NestedCollection.java
@@ -0,0 +1,52 @@
+package io.quarkus.funqy.test;
+
+import java.util.List;
+import java.util.Map;
+
+public class NestedCollection {
+    private Map<String, Integer> intMap;
+    private Map<Integer, String> intKeyMap;
+    private Map<String, Simple> simpleMap;
+    private List<String> stringList;
+    private List<Simple> simpleList;
+
+    public Map<Integer, String> getIntKeyMap() {
+        return intKeyMap;
+    }
+
+    public void setIntKeyMap(Map<Integer, String> intKeyMap) {
+        this.intKeyMap = intKeyMap;
+    }
+
+    public Map<String, Integer> getIntMap() {
+        return intMap;
+    }
+
+    public void setIntMap(Map<String, Integer> intMap) {
+        this.intMap = intMap;
+    }
+
+    public Map<String, Simple> getSimpleMap() {
+        return simpleMap;
+    }
+
+    public void setSimpleMap(Map<String, Simple> simpleMap) {
+        this.simpleMap = simpleMap;
+    }
+
+    public List<String> getStringList() {
+        return stringList;
+    }
+
+    public void setStringList(List<String> stringList) {
+        this.stringList = stringList;
+    }
+
+    public List<Simple> getSimpleList() {
+        return simpleList;
+    }
+
+    public void setSimpleList(List<Simple> simpleList) {
+        this.simpleList = simpleList;
+    }
+}
diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryFunction.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryFunction.java
new file mode 100644
index 0000000000000..055d7cbebfd50
--- /dev/null
+++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryFunction.java
@@ -0,0 +1,28 @@
+package io.quarkus.funqy.test;
+
+import java.util.Map;
+
+import io.quarkus.funqy.Funq;
+
+public class QueryFunction {
+
+    @Funq
+    public Simple simple(Simple simple) {
+        return simple;
+    }
+
+    @Funq
+    public Nested nested(Nested nested) {
+        return nested;
+    }
+
+    @Funq
+    public NestedCollection nestedCollection(NestedCollection nested) {
+        return nested;
+    }
+
+    @Funq
+    public Map<String, String> map(Map<String, String> nested) {
+        return nested;
+    }
+}
diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java
new file mode 100644
index 0000000000000..4db5558ce1fcf
--- /dev/null
+++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java
@@ -0,0 +1,126 @@
+package io.quarkus.funqy.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
+
+public class QueryReaderTest {
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Simple.class, Nested.class, NestedCollection.class, QueryFunction.class));
+
+    @Test
+    public void testSimple() throws Exception {
+        RestAssured.given()
+                .queryParam("intVal", 42)
+                .queryParam("shortVal", 4)
+                .queryParam("longVal", 442)
+                .queryParam("doubleVal", "4.2")
+                .queryParam("floatVal", "4.2")
+                .queryParam("b", "1")
+                .queryParam("boolVal", "true")
+                .queryParam("value", "hello world")
+                .get("/simple")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("intVal", equalTo(42))
+                .body("shortVal", equalTo(4))
+                .body("longVal", equalTo(442))
+                .body("floatVal", equalTo(4.2f))
+                .body("doubleVal", equalTo(4.2f))
+                .body("b", equalTo(1))
+                .body("boolVal", equalTo(true))
+                .body("value", equalTo("hello world"));
+    }
+
+    @Test
+    public void testNested() throws Exception {
+        RestAssured.given()
+                .queryParam("nestedOne.intVal", 42)
+                .queryParam("nestedOne.shortVal", 4)
+                .queryParam("nestedOne.longVal", 442)
+                .queryParam("nestedOne.doubleVal", "4.2")
+                .queryParam("nestedOne.floatVal", "4.2")
+                .queryParam("nestedOne.b", "1")
+                .queryParam("nestedOne.boolVal", "true")
+                .queryParam("nestedOne.value", "hello world")
+                .queryParam("nestedTwo.intVal", 32)
+                .queryParam("nestedTwo.shortVal", 3)
+                .queryParam("nestedTwo.longVal", 332)
+                .queryParam("nestedTwo.doubleVal", "3.2")
+                .queryParam("nestedTwo.floatVal", "3.2")
+                .queryParam("nestedTwo.b", "2")
+                .queryParam("nestedTwo.boolVal", "true")
+                .queryParam("nestedTwo.value", "hello world too")
+                .get("/nested")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("nestedOne.intVal", equalTo(42))
+                .body("nestedOne.shortVal", equalTo(4))
+                .body("nestedOne.longVal", equalTo(442))
+                .body("nestedOne.floatVal", equalTo(4.2f))
+                .body("nestedOne.doubleVal", equalTo(4.2f))
+                .body("nestedOne.b", equalTo(1))
+                .body("nestedOne.boolVal", equalTo(true))
+                .body("nestedOne.value", equalTo("hello world"))
+                .body("nestedTwo.intVal", equalTo(32))
+                .body("nestedTwo.shortVal", equalTo(3))
+                .body("nestedTwo.longVal", equalTo(332))
+                .body("nestedTwo.floatVal", equalTo(3.2f))
+                .body("nestedTwo.doubleVal", equalTo(3.2f))
+                .body("nestedTwo.b", equalTo(2))
+                .body("nestedTwo.boolVal", equalTo(true))
+                .body("nestedTwo.value", equalTo("hello world too"));
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        RestAssured.given()
+                .queryParam("intMap.one", 1)
+                .queryParam("intMap.two", 2)
+                .queryParam("intKeyMap.1", "one")
+                .queryParam("intKeyMap.2", "two")
+                .queryParam("stringList", "one")
+                .queryParam("stringList", "two")
+                .get("/nestedCollection")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("intMap.one", equalTo(1))
+                .body("intMap.two", equalTo(2))
+                .body("stringList[0]", equalTo("one"))
+                .body("stringList[1]", equalTo("two"))
+                .body("intKeyMap.1", equalTo("one"))
+                .body("intKeyMap.1", equalTo("one"));
+
+        RestAssured.given()
+                .queryParam("simpleMap.one.value", "one")
+                .queryParam("simpleMap.two.value", "two")
+                .queryParam("simpleMap.one.intVal", 1)
+                .queryParam("simpleMap.two.intVal", 2)
+                .queryParam("simpleList.one.value", "one")
+                .queryParam("simpleList.two.value", "two")
+                .queryParam("simpleList.one.intVal", 1)
+                .queryParam("simpleList.two.intVal", 2)
+                .get("/nestedCollection")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("simpleMap.one.intVal", equalTo(1))
+                .body("simpleMap.two.intVal", equalTo(2))
+                .body("simpleMap.one.value", equalTo("one"))
+                .body("simpleMap.two.value", equalTo("two"))
+                .body("simpleList[0].intVal", equalTo(1))
+                .body("simpleList[1].intVal", equalTo(2))
+                .body("simpleList[0].value", equalTo("one"))
+                .body("simpleList[1].value", equalTo("two"));
+
+    }
+
+}
diff --git a/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/Simple.java b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/Simple.java
new file mode 100644
index 0000000000000..2424c11896525
--- /dev/null
+++ b/extensions/funqy/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/Simple.java
@@ -0,0 +1,76 @@
+package io.quarkus.funqy.test;
+
+public class Simple {
+    private String value;
+    private int intVal;
+    private short shortVal;
+    private long longVal;
+    private byte b;
+    private float floatVal;
+    private double doubleVal;
+    private boolean boolVal;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getIntVal() {
+        return intVal;
+    }
+
+    public void setIntVal(int intVal) {
+        this.intVal = intVal;
+    }
+
+    public short getShortVal() {
+        return shortVal;
+    }
+
+    public void setShortVal(short shortVal) {
+        this.shortVal = shortVal;
+    }
+
+    public long getLongVal() {
+        return longVal;
+    }
+
+    public void setLongVal(long longVal) {
+        this.longVal = longVal;
+    }
+
+    public byte getB() {
+        return b;
+    }
+
+    public void setB(byte b) {
+        this.b = b;
+    }
+
+    public float getFloatVal() {
+        return floatVal;
+    }
+
+    public void setFloatVal(float floatVal) {
+        this.floatVal = floatVal;
+    }
+
+    public double getDoubleVal() {
+        return doubleVal;
+    }
+
+    public void setDoubleVal(double doubleVal) {
+        this.doubleVal = doubleVal;
+    }
+
+    public boolean isBoolVal() {
+        return boolVal;
+    }
+
+    public void setBoolVal(boolean boolVal) {
+        this.boolVal = boolVal;
+    }
+}
diff --git a/extensions/funqy/funqy-http/pom.xml b/extensions/funqy/funqy-http/pom.xml
index 4c3148f883bd9..8d93ea4e99c9a 100644
--- a/extensions/funqy/funqy-http/pom.xml
+++ b/extensions/funqy/funqy-http/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-funqy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-http/runtime/pom.xml b/extensions/funqy/funqy-http/runtime/pom.xml
index 4454a827b6a6a..709e36041c504 100644
--- a/extensions/funqy/funqy-http/runtime/pom.xml
+++ b/extensions/funqy/funqy-http/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/FunqyHttpBindingRecorder.java b/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/FunqyHttpBindingRecorder.java
index dbc1b7428900b..2d517d594aa5a 100644
--- a/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/FunqyHttpBindingRecorder.java
+++ b/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/FunqyHttpBindingRecorder.java
@@ -4,6 +4,7 @@
 import java.util.function.Supplier;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
@@ -15,6 +16,8 @@
 import io.quarkus.funqy.runtime.FunctionConstructor;
 import io.quarkus.funqy.runtime.FunctionInvoker;
 import io.quarkus.funqy.runtime.FunctionRecorder;
+import io.quarkus.funqy.runtime.query.QueryObjectMapper;
+import io.quarkus.funqy.runtime.query.QueryReader;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.core.Handler;
@@ -27,18 +30,24 @@
 @Recorder
 public class FunqyHttpBindingRecorder {
     private static ObjectMapper objectMapper;
+    private static QueryObjectMapper queryMapper;
 
     public void init() {
         objectMapper = getObjectMapper()
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
+        queryMapper = new QueryObjectMapper();
         for (FunctionInvoker invoker : FunctionRecorder.registry.invokers()) {
             if (invoker.hasInput()) {
-                ObjectReader reader = objectMapper.readerFor(invoker.getInputType());
+                JavaType javaInputType = objectMapper.constructType(invoker.getInputType());
+                ObjectReader reader = objectMapper.readerFor(javaInputType);
+                QueryReader queryReader = queryMapper.readerFor(invoker.getInputType());
                 invoker.getBindingContext().put(ObjectReader.class.getName(), reader);
+                invoker.getBindingContext().put(QueryReader.class.getName(), queryReader);
             }
             if (invoker.hasOutput()) {
-                ObjectWriter writer = objectMapper.writerFor(invoker.getOutputType());
+                JavaType javaOutputType = objectMapper.constructType(invoker.getOutputType());
+                ObjectWriter writer = objectMapper.writerFor(javaOutputType);
                 invoker.getBindingContext().put(ObjectWriter.class.getName(), writer);
             }
         }
diff --git a/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java b/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java
index 1a49a049d5831..eb918f79755be 100644
--- a/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java
+++ b/extensions/funqy/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java
@@ -2,7 +2,6 @@
 
 import java.io.InputStream;
 import java.util.concurrent.Executor;
-import java.util.function.Consumer;
 
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.spi.CDI;
@@ -19,11 +18,11 @@
 import io.quarkus.funqy.runtime.FunctionInvoker;
 import io.quarkus.funqy.runtime.FunctionRecorder;
 import io.quarkus.funqy.runtime.RequestContextImpl;
+import io.quarkus.funqy.runtime.query.QueryReader;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
-import io.smallrye.mutiny.Uni;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpMethod;
@@ -60,33 +59,16 @@ public VertxRequestHandler(Vertx vertx,
         currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
     }
 
-    private boolean checkHttpMethod(RoutingContext routingContext, FunctionInvoker invoker) {
-        if (invoker.hasInput()) {
-            if (routingContext.request().method() != HttpMethod.POST) {
-                routingContext.fail(405);
-                log.error("Must be POST for: " + invoker.getName());
-                return false;
-            }
-        }
-        if (routingContext.request().method() != HttpMethod.POST && routingContext.request().method() != HttpMethod.GET) {
-            routingContext.fail(405);
-            log.error("Must be POST or GET for: " + invoker.getName());
-            return false;
-
-        }
-        return true;
-    }
-
     @Override
-    public void handle(RoutingContext request) {
-        String path = request.request().path();
+    public void handle(RoutingContext routingContext) {
+        String path = routingContext.request().path();
         if (path == null) {
-            request.fail(404);
+            routingContext.fail(404);
             return;
         }
         // expects rootPath to end with '/'
         if (!path.startsWith(rootPath)) {
-            request.fail(404);
+            routingContext.fail(404);
             return;
         }
 
@@ -95,38 +77,62 @@ public void handle(RoutingContext request) {
         FunctionInvoker invoker = FunctionRecorder.registry.matchInvoker(path);
 
         if (invoker == null) {
-            request.fail(404);
+            routingContext.fail(404);
             return;
         }
 
-        if (!checkHttpMethod(request, invoker))
-            return;
-
-        request.request().bodyHandler(buff -> {
+        if (routingContext.request().method() == HttpMethod.GET) {
             Object input = null;
-            if (buff.length() > 0) {
-                ByteBufInputStream in = new ByteBufInputStream(buff.getByteBuf());
-                ObjectReader reader = (ObjectReader) invoker.getBindingContext().get(ObjectReader.class.getName());
+            if (invoker.hasInput()) {
+                QueryReader reader = (QueryReader) invoker.getBindingContext().get(QueryReader.class.getName());
                 try {
-                    input = reader.readValue((InputStream) in);
+                    input = reader.readValue(routingContext.request().params().iterator());
                 } catch (Exception e) {
                     log.error("Failed to unmarshal input", e);
-                    request.fail(400);
+                    routingContext.fail(400);
                     return;
                 }
             }
             Object finalInput = input;
             executor.execute(() -> {
-                dispatch(request, invoker, finalInput);
+                dispatch(routingContext, invoker, finalInput);
+            });
+        } else if (routingContext.request().method() == HttpMethod.POST) {
+            routingContext.request().bodyHandler(buff -> {
+                Object input = null;
+                if (buff.length() > 0) {
+                    ByteBufInputStream in = new ByteBufInputStream(buff.getByteBuf());
+                    ObjectReader reader = (ObjectReader) invoker.getBindingContext().get(ObjectReader.class.getName());
+                    try {
+                        input = reader.readValue((InputStream) in);
+                    } catch (Exception e) {
+                        log.error("Failed to unmarshal input", e);
+                        routingContext.fail(400);
+                        return;
+                    }
+                }
+                Object finalInput = input;
+                executor.execute(() -> {
+                    dispatch(routingContext, invoker, finalInput);
+                });
             });
-        });
+        } else {
+            routingContext.fail(405);
+            log.error("Must be POST or GET for: " + invoker.getName());
+        }
     }
 
     private void dispatch(RoutingContext routingContext, FunctionInvoker invoker, Object input) {
         ManagedContext requestContext = beanContainer.requestContext();
         requestContext.activate();
         if (association != null) {
-            ((Consumer<Uni<SecurityIdentity>>) association).accept(QuarkusHttpUser.getSecurityIdentity(routingContext, null));
+            QuarkusHttpUser existing = (QuarkusHttpUser) routingContext.user();
+            if (existing != null) {
+                SecurityIdentity identity = existing.getSecurityIdentity();
+                association.setIdentity(identity);
+            } else {
+                association.setIdentity(QuarkusHttpUser.getSecurityIdentity(routingContext, null));
+            }
         }
         currentVertxRequest.setCurrent(routingContext);
         try {
diff --git a/extensions/funqy/funqy-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/funqy/funqy-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..5513c07da8213
--- /dev/null
+++ b/extensions/funqy/funqy-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,15 @@
+name: "Funqy HTTP Binding"
+metadata:
+  keywords:
+  - "funqy"
+  - "function"
+  - "http"
+  guide: "https://quarkus.io/guides/funqy-http"
+  categories:
+  - "cloud"
+  status: "experimental"
+  codestart:
+    name: "funqy-http"
+    kind: "example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/funqy/funqy-knative-events/deployment/pom.xml b/extensions/funqy/funqy-knative-events/deployment/pom.xml
index 33bc3843a647b..4c25454e815ad 100644
--- a/extensions/funqy/funqy-knative-events/deployment/pom.xml
+++ b/extensions/funqy/funqy-knative-events/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-knative-events-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,10 +33,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/knative/events/FunqyKnativeEventsBuildStep.java b/extensions/funqy/funqy-knative-events/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/knative/events/FunqyKnativeEventsBuildStep.java
index 460011023781e..7ec8d445cb541 100644
--- a/extensions/funqy/funqy-knative-events/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/knative/events/FunqyKnativeEventsBuildStep.java
+++ b/extensions/funqy/funqy-knative-events/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/knative/events/FunqyKnativeEventsBuildStep.java
@@ -5,7 +5,6 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Consumer;
 
 import org.jboss.logging.Logger;
 
@@ -24,10 +23,12 @@
 import io.quarkus.funqy.runtime.FunqyConfig;
 import io.quarkus.funqy.runtime.bindings.knative.events.FunqyKnativeEventsConfig;
 import io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder;
-import io.quarkus.jackson.ObjectMapperProducer;
+import io.quarkus.jackson.runtime.ObjectMapperProducer;
 import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
-import io.quarkus.vertx.http.deployment.DefaultRouteBuildItem;
-import io.vertx.ext.web.Route;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
 
 public class FunqyKnativeEventsBuildStep {
     private static final Logger log = Logger.getLogger(FunqyKnativeEventsBuildStep.class);
@@ -60,20 +61,36 @@ public void boot(ShutdownContextBuildItem shutdown,
             FunqyKnativeEventsConfig eventsConfig,
             KnativeEventsBindingRecorder binding,
             Optional<FunctionInitializedBuildItem> hasFunctions,
+            List<FunctionBuildItem> functions,
             BuildProducer<FeatureBuildItem> feature,
-            BuildProducer<DefaultRouteBuildItem> defaultRoutes,
+            BuildProducer<RouteBuildItem> routes,
             CoreVertxBuildItem vertx,
             BeanContainerBuildItem beanContainer,
+            HttpBuildTimeConfig httpConfig,
             ExecutorBuildItem executorBuildItem) throws Exception {
         if (!hasFunctions.isPresent() || hasFunctions.get() == null)
             return;
 
         feature.produce(new FeatureBuildItem(FUNQY_KNATIVE_FEATURE));
-        Consumer<Route> ut = binding.start(funqyConfig, eventsConfig, vertx.getVertx(),
+
+        String rootPath = httpConfig.rootPath;
+        if (rootPath == null) {
+            rootPath = "/";
+        } else if (!rootPath.endsWith("/")) {
+            rootPath += "/";
+        }
+
+        Handler<RoutingContext> handler = binding.start(rootPath, funqyConfig, eventsConfig, vertx.getVertx(),
                 shutdown,
                 beanContainer.getValue(),
                 executorBuildItem.getExecutorProxy());
 
-        defaultRoutes.produce(new DefaultRouteBuildItem(ut));
+        routes.produce(new RouteBuildItem("/", handler, false));
+
+        for (FunctionBuildItem function : functions) {
+            String name = function.getFunctionName() == null ? function.getMethodName() : function.getFunctionName();
+            String path = "/" + name;
+            routes.produce(new RouteBuildItem(path, handler, false));
+        }
     }
 }
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayload.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayload.java
new file mode 100644
index 0000000000000..37e8c0ccfab79
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayload.java
@@ -0,0 +1,19 @@
+package io.quarkus.funqy.test;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import io.quarkus.funqy.Funq;
+import io.quarkus.funqy.knative.events.CloudEventMapping;
+
+public class BinaryPayload {
+
+    @Funq
+    @CloudEventMapping(trigger = "test-type")
+    public byte[] doubleInt32BE(byte[] data) {
+        int i = ByteBuffer.wrap(data).order(ByteOrder.BIG_ENDIAN).getInt();
+        byte[] result = new byte[4];
+        ByteBuffer.wrap(result).order(ByteOrder.BIG_ENDIAN).putInt(i * 2);
+        return result;
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java
new file mode 100644
index 0000000000000..5dc4b26e11e48
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/BinaryPayloadTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.funqy.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.Base64;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class BinaryPayloadTest {
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BinaryPayload.class));
+
+    private static final byte[] IN = new byte[] { 0x12, 0x34, 0x56, 0x78 };
+    private static final String IN_AS_BASE_64 = Base64.getEncoder().encodeToString(IN);
+    private static final byte[] OUT = new byte[] { 0x24, 0x68, (byte) 0xAC, (byte) 0xf0 };
+    private static final String OUT_AS_BASE_64 = Base64.getEncoder().encodeToString(OUT);
+
+    @Test
+    void testBinaryEncoding() {
+
+        byte[] ba = RestAssured.given().contentType("application/octet-stream")
+                .header("ce-specversion", "1.0")
+                .header("ce-id", "test-id")
+                .header("ce-type", "test-type")
+                .header("ce-source", "test-source")
+                .body(IN)
+                .post("/")
+                .then()
+                .statusCode(200)
+                .extract().response().getBody().asByteArray();
+
+        Assertions.assertArrayEquals(OUT, ba);
+    }
+
+    @Test
+    void testStructuredEncodingV1() {
+        RestAssured.given().contentType("application/cloudevents+json")
+                .body(STRUCTURED_ENCODED_EVENT_V1_1_BODY)
+                .post("/")
+                .then()
+                .statusCode(200)
+                .body("data_base64", equalTo(OUT_AS_BASE_64));
+    }
+
+    @Test
+    void testStructuredEncodingV03() {
+        RestAssured.given().contentType("application/cloudevents+json")
+                .body(STRUCTURED_ENCODED_EVENT_V03_BODY)
+                .post("/")
+                .then()
+                .statusCode(200)
+                .body("datacontentencoding", equalTo("base64"))
+                .body("data", equalTo(OUT_AS_BASE_64));
+    }
+
+    private static final String STRUCTURED_ENCODED_EVENT_V1_1_BODY = "{ \"id\" : \"test-id\", " +
+            "  \"specversion\": \"1.1\", " +
+            "  \"source\": \"test-source\", " +
+            "  \"type\": \"test-type\", " +
+            "  \"data_base64\": \"" + IN_AS_BASE_64 + "\" " +
+            "}";
+
+    private static final String STRUCTURED_ENCODED_EVENT_V03_BODY = "{ \"id\" : \"test-id\", " +
+            "  \"specversion\": \"0.3\", " +
+            "  \"source\": \"test-source\", " +
+            "  \"type\": \"test-type\", " +
+            "  \"datacontentencoding\": \"base64\", " +
+            "  \"data\": \"" + IN_AS_BASE_64 + "\" " +
+            "}";
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java
new file mode 100644
index 0000000000000..af7873a7438a3
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEventTest.java
@@ -0,0 +1,210 @@
+package io.quarkus.funqy.test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.specification.RequestSpecification;
+
+public class ExposedCloudEventTest {
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ExposedCloudEvents.class));
+
+    @Test
+    public void testVanillaHttp() {
+        // when a function handles CloudEvent explicitly, vanilla HTTP is considered to be a bad request.
+        RestAssured.given().contentType("application/json")
+                .body("{}")
+                .post("/doubleIt")
+                .then()
+                .statusCode(400);
+    }
+
+    @Test
+    public void testCloudEventAttributeDefaultsForStructuredEncoding() {
+        String event = "{ \"id\" : \"test-id\", " +
+                "  \"specversion\": \"1.0\", " +
+                "  \"source\": \"test-source\", " +
+                "  \"type\": \"test-defaults\" " +
+                "}";
+        RestAssured.given().contentType("application/cloudevents+json")
+                .body(event)
+                .post("/")
+                .then()
+                .statusCode(200)
+                .body("specversion", equalTo("1.0"))
+                .body("id", notNullValue())
+                .body("type", equalTo("default-type"))
+                .body("source", equalTo("default-source"));
+    }
+
+    @Test
+    public void testCloudEventAttributeDefaultsForBinaryEncoding() {
+        RestAssured.given()
+                .header("ce-id", "test-id")
+                .header("ce-specversion", "1.0")
+                .header("ce-type", "test-defaults")
+                .header("ce-source", "test-source")
+                .post()
+                .then()
+                .statusCode(204)
+                .header("ce-specversion", equalTo("1.0"))
+                .header("ce-id", notNullValue())
+                .header("ce-type", equalTo("default-type"))
+                .header("ce-source", equalTo("default-source"));
+    }
+
+    @Test
+    public void testGenericInput() {
+        RestAssured.given().contentType("application/json")
+                .header("ce-id", "test-id")
+                .header("ce-specversion", "1.0")
+                .header("ce-type", "test-generics")
+                .header("ce-source", "test-source")
+                .body("[{\"i\" : 1}, {\"i\" : 2}, {\"i\" : 3}]")
+                .then()
+                .statusCode(200)
+                .body(equalTo("6"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideBinaryEncodingTestArgs")
+    public void testBinaryEncoding(Map<String, String> headers, String specversion, String dataSchemaHdrName) {
+
+        RequestSpecification req = RestAssured.given().contentType("application/json");
+
+        for (Map.Entry<String, String> h : headers.entrySet()) {
+            req = req.header(h.getKey(), h.getValue());
+        }
+
+        req.body(BINARY_ENCODED_EVENT_BODY)
+                .post("/")
+                .then()
+                .statusCode(200)
+                .header("ce-specversion", equalTo(specversion))
+                .header("ce-id", equalTo("double-it-id"))
+                .header("ce-type", equalTo("double-it-type"))
+                .header("ce-source", equalTo("/OfDoubleIt"))
+                .header(dataSchemaHdrName, equalTo("dataschema-server"))
+                .header("ce-extserver", equalTo("ext-server-val"))
+                .body("i", equalTo(42))
+                .body("s", equalTo("abcabc"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideStructuredEncodingTestArgs")
+    public void testStructuredEncoding(String event, String specversion, String dataSchemaFieldName) {
+        RestAssured.given().contentType("application/cloudevents+json")
+                .body(event)
+                .post("/")
+                .then()
+                .statusCode(200)
+                .body("specversion", equalTo(specversion))
+                .body("id", equalTo("double-it-id"))
+                .body("type", equalTo("double-it-type"))
+                .body("source", equalTo("/OfDoubleIt"))
+                .body(dataSchemaFieldName, equalTo("dataschema-server"))
+                .body("extserver", equalTo("ext-server-val"))
+                .body("data.i", equalTo(42))
+                .body("data.s", equalTo("abcabc"));
+    }
+
+    static {
+        Map<String, String> common = new HashMap<>();
+        common.put("ce-id", "test-id");
+        common.put("ce-type", "test-type");
+        common.put("ce-source", "/OfTest");
+        common.put("ce-subject", "test-subj");
+        common.put("ce-time", "2018-04-05T17:31:00Z");
+        common.put("ce-extclient", "ext-client-val");
+
+        Map<String, String> v1 = new HashMap<>(common);
+        v1.put("ce-specversion", "1.0");
+        v1.put("ce-dataschema", "test-dataschema-client");
+        BINARY_ENCODED_EVENT_V1_HEADERS = Collections.unmodifiableMap(v1);
+
+        Map<String, String> v1_1 = new HashMap<>(common);
+        v1_1.put("ce-specversion", "1.1");
+        v1_1.put("ce-dataschema", "test-dataschema-client");
+        BINARY_ENCODED_EVENT_V1_1_HEADERS = Collections.unmodifiableMap(v1_1);
+
+        Map<String, String> v03 = new HashMap<>(common);
+        v03.put("ce-specversion", "0.3");
+        v03.put("ce-schemaurl", "test-dataschema-client");
+        BINARY_ENCODED_EVENT_V03_HEADERS = Collections.unmodifiableMap(v03);
+    }
+
+    public static final Map<String, String> BINARY_ENCODED_EVENT_V1_HEADERS;
+    public static final Map<String, String> BINARY_ENCODED_EVENT_V1_1_HEADERS;
+    public static final Map<String, String> BINARY_ENCODED_EVENT_V03_HEADERS;
+
+    private static Stream<Arguments> provideBinaryEncodingTestArgs() {
+        return Stream.<Arguments> builder()
+                .add(Arguments.arguments(BINARY_ENCODED_EVENT_V1_HEADERS, "1.0", "ce-dataschema"))
+                .add(Arguments.arguments(BINARY_ENCODED_EVENT_V1_1_HEADERS, "1.1", "ce-dataschema"))
+                .add(Arguments.arguments(BINARY_ENCODED_EVENT_V03_HEADERS, "0.3", "ce-schemaurl"))
+                .build();
+    }
+
+    public static final String BINARY_ENCODED_EVENT_BODY = " { \"i\" : 21, \"s\" : \"abc\" } ";
+
+    static final String STRUCTURED_ENCODED_EVENT_V1_BODY = "{ \"id\" : \"test-id\", " +
+            "  \"specversion\": \"1.0\", " +
+            "  \"source\": \"/OfTest\", " +
+            "  \"subject\": \"test-subj\", " +
+            "  \"time\": \"2018-04-05T17:31:00Z\", " +
+            "  \"type\": \"test-type\", " +
+            "  \"extclient\": \"ext-client-val\", " +
+            "  \"dataschema\": \"test-dataschema-client\", " +
+            "  \"datacontenttype\": \"application/json\", " +
+            "  \"data\": { \"i\" : 21, \"s\" : \"abc\" } " +
+            "}";
+
+    static final String STRUCTURED_ENCODED_EVENT_V1_1_BODY = "{ \"id\" : \"test-id\", " +
+            "  \"specversion\": \"1.1\", " +
+            "  \"source\": \"/OfTest\", " +
+            "  \"subject\": \"test-subj\", " +
+            "  \"time\": \"2018-04-05T17:31:00Z\", " +
+            "  \"type\": \"test-type\", " +
+            "  \"extclient\": \"ext-client-val\", " +
+            "  \"dataschema\": \"test-dataschema-client\", " +
+            "  \"datacontenttype\": \"application/json\", " +
+            "  \"data\": { \"i\" : 21, \"s\" : \"abc\" } " +
+            "}";
+
+    static final String STRUCTURED_ENCODED_EVENT_V03_BODY = "{ \"id\" : \"test-id\", " +
+            "  \"specversion\": \"0.3\", " +
+            "  \"source\": \"/OfTest\", " +
+            "  \"subject\": \"test-subj\", " +
+            "  \"time\": \"2018-04-05T17:31:00Z\", " +
+            "  \"type\": \"test-type\", " +
+            "  \"extclient\": \"ext-client-val\", " +
+            "  \"schemaurl\": \"test-dataschema-client\", " +
+            "  \"datacontenttype\": \"application/json\", " +
+            "  \"data\": { \"i\" : 21, \"s\" : \"abc\" } " +
+            "}";
+
+    private static Stream<Arguments> provideStructuredEncodingTestArgs() {
+        return Stream.<Arguments> builder()
+                .add(Arguments.arguments(STRUCTURED_ENCODED_EVENT_V1_BODY, "1.0", "dataschema"))
+                .add(Arguments.arguments(STRUCTURED_ENCODED_EVENT_V1_1_BODY, "1.1", "dataschema"))
+                .add(Arguments.arguments(STRUCTURED_ENCODED_EVENT_V03_BODY, "0.3", "schemaurl"))
+                .build();
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEvents.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEvents.java
new file mode 100644
index 0000000000000..b44e6ff9a6ad1
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/ExposedCloudEvents.java
@@ -0,0 +1,119 @@
+package io.quarkus.funqy.test;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import io.quarkus.funqy.Funq;
+import io.quarkus.funqy.knative.events.CloudEvent;
+import io.quarkus.funqy.knative.events.CloudEventBuilder;
+import io.quarkus.funqy.knative.events.CloudEventMapping;
+
+public class ExposedCloudEvents {
+
+    @Funq
+    @CloudEventMapping(trigger = "test-type")
+    public CloudEvent<TestBean> doubleIt(CloudEvent<TestBean> event) {
+
+        if (event == null)
+            throw new RuntimeException("Event is null!");
+        if (!event.id().equals("test-id"))
+            throw new RuntimeException("Bad id!");
+        if (!event.source().equals("/OfTest"))
+            throw new RuntimeException("Bad source!");
+        if (!event.type().equals("test-type"))
+            throw new RuntimeException("Bad type!");
+        if (!event.subject().equals("test-subj"))
+            throw new RuntimeException("Bad subject!");
+        if (!event.dataSchema().equals("test-dataschema-client"))
+            throw new RuntimeException("Bad dataschema!");
+        if (!event.extensions().equals(Collections.singletonMap("extclient", "ext-client-val")))
+            throw new RuntimeException("Bad extensions!");
+        if (event.time() == null)
+            throw new RuntimeException("Bad time!");
+
+        TestBean inBean = event.data();
+        return CloudEventBuilder.create()
+                .specVersion(event.specVersion())
+                .id("double-it-id")
+                .type("double-it-type")
+                .source("/OfDoubleIt")
+                .extensions(Collections.singletonMap("extserver", "ext-server-val"))
+                .dataSchema("dataschema-server")
+                .build(new TestBean(inBean.getI() * 2, inBean.getS() + inBean.getS()));
+    }
+
+    @Funq
+    @CloudEventMapping(trigger = "test-defaults", responseSource = "default-source", responseType = "default-type")
+    public CloudEvent<Void> withDefaults(CloudEvent<Void> event) {
+        return CloudEventBuilder.create().build();
+    }
+
+    @Funq
+    @CloudEventMapping(trigger = "test-generics")
+    public CloudEvent<Integer> sum(CloudEvent<List<TestBean>> event) {
+        Integer data = event.data().stream()
+                .map(TestBean::getI)
+                .reduce((a, b) -> a + b)
+                .orElse(0);
+
+        return CloudEventBuilder.create()
+                .specVersion(event.specVersion())
+                .id("test-sum-id")
+                .type("test-sum-type")
+                .build(data);
+    }
+
+    public static class TestBean implements Serializable {
+        private int i;
+        private String s;
+
+        public TestBean() {
+        }
+
+        public TestBean(int i, String s) {
+            this.i = i;
+            this.s = s;
+        }
+
+        public int getI() {
+            return i;
+        }
+
+        public void setI(int i) {
+            this.i = i;
+        }
+
+        public String getS() {
+            return s;
+        }
+
+        public void setS(String s) {
+            this.s = s;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+            TestBean testBean = (TestBean) o;
+            return i == testBean.i && Objects.equals(s, testBean.s);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(s, i);
+        }
+
+        @Override
+        public String toString() {
+            return "TestBean{" +
+                    "i=" + i +
+                    ", s='" + s + '\'' +
+                    '}';
+        }
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java
index 184f22956839f..d1ef5a25da77f 100644
--- a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/MappingTest.java
@@ -26,6 +26,7 @@ public class MappingTest {
     public void testMapping() {
         RestAssured.given().contentType("application/json")
                 .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-specversion", "1.0")
                 .header("ce-type", "tolower")
                 .header("ce-source", "test")
                 .body("\"HELLO\"")
@@ -41,6 +42,7 @@ public void testMapping() {
     public void testAnnotatedMapping() {
         RestAssured.given().contentType("application/json")
                 .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-specversion", "1.0")
                 .header("ce-type", "echo")
                 .header("ce-source", "test")
                 .body("\"HELLO\"")
@@ -59,6 +61,7 @@ public void testNoopDefaultMapping() {
                         EncoderConfig.encoderConfig().appendDefaultContentCharsetToContentTypeIfUndefined(false)))
                 .contentType("")
                 .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-specversion", "1.0")
                 .header("ce-type", "noop")
                 .header("ce-source", "test")
                 .post("/")
@@ -75,6 +78,7 @@ public void testNoopDefaultMappingGet() {
                         EncoderConfig.encoderConfig().appendDefaultContentCharsetToContentTypeIfUndefined(false)))
                 .contentType("")
                 .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-specversion", "1.0")
                 .header("ce-type", "noop")
                 .header("ce-source", "test")
                 .get("/")
@@ -101,6 +105,7 @@ public void testNoopGet() {
     public void testDefaultMapping() {
         RestAssured.given().contentType("application/json")
                 .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-specversion", "1.0")
                 .header("ce-type", "doubleIt")
                 .header("ce-source", "test")
                 .body("2")
@@ -128,6 +133,7 @@ public void testHttp() {
     public void testNoTrigger() {
         RestAssured.given().contentType("application/json")
                 .header("ce-id", UUID.randomUUID().toString())
+                .header("ce-specversion", "1.0")
                 .header("ce-type", "foo")
                 .header("ce-source", "test")
                 .body("2")
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/Nested.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/Nested.java
new file mode 100644
index 0000000000000..cd9ced011ac8a
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/Nested.java
@@ -0,0 +1,22 @@
+package io.quarkus.funqy.test;
+
+public class Nested {
+    private Simple nestedOne;
+    private Simple nestedTwo;
+
+    public Simple getNestedOne() {
+        return nestedOne;
+    }
+
+    public void setNestedOne(Simple nestedOne) {
+        this.nestedOne = nestedOne;
+    }
+
+    public Simple getNestedTwo() {
+        return nestedTwo;
+    }
+
+    public void setNestedTwo(Simple nestedTwo) {
+        this.nestedTwo = nestedTwo;
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/NestedCollection.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/NestedCollection.java
new file mode 100644
index 0000000000000..ba8debec3cb2c
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/NestedCollection.java
@@ -0,0 +1,52 @@
+package io.quarkus.funqy.test;
+
+import java.util.List;
+import java.util.Map;
+
+public class NestedCollection {
+    private Map<String, Integer> intMap;
+    private Map<Integer, String> intKeyMap;
+    private Map<String, Simple> simpleMap;
+    private List<String> stringList;
+    private List<Simple> simpleList;
+
+    public Map<Integer, String> getIntKeyMap() {
+        return intKeyMap;
+    }
+
+    public void setIntKeyMap(Map<Integer, String> intKeyMap) {
+        this.intKeyMap = intKeyMap;
+    }
+
+    public Map<String, Integer> getIntMap() {
+        return intMap;
+    }
+
+    public void setIntMap(Map<String, Integer> intMap) {
+        this.intMap = intMap;
+    }
+
+    public Map<String, Simple> getSimpleMap() {
+        return simpleMap;
+    }
+
+    public void setSimpleMap(Map<String, Simple> simpleMap) {
+        this.simpleMap = simpleMap;
+    }
+
+    public List<String> getStringList() {
+        return stringList;
+    }
+
+    public void setStringList(List<String> stringList) {
+        this.stringList = stringList;
+    }
+
+    public List<Simple> getSimpleList() {
+        return simpleList;
+    }
+
+    public void setSimpleList(List<Simple> simpleList) {
+        this.simpleList = simpleList;
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryFunction.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryFunction.java
new file mode 100644
index 0000000000000..055d7cbebfd50
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryFunction.java
@@ -0,0 +1,28 @@
+package io.quarkus.funqy.test;
+
+import java.util.Map;
+
+import io.quarkus.funqy.Funq;
+
+public class QueryFunction {
+
+    @Funq
+    public Simple simple(Simple simple) {
+        return simple;
+    }
+
+    @Funq
+    public Nested nested(Nested nested) {
+        return nested;
+    }
+
+    @Funq
+    public NestedCollection nestedCollection(NestedCollection nested) {
+        return nested;
+    }
+
+    @Funq
+    public Map<String, String> map(Map<String, String> nested) {
+        return nested;
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java
new file mode 100644
index 0000000000000..4db5558ce1fcf
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java
@@ -0,0 +1,126 @@
+package io.quarkus.funqy.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
+
+public class QueryReaderTest {
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Simple.class, Nested.class, NestedCollection.class, QueryFunction.class));
+
+    @Test
+    public void testSimple() throws Exception {
+        RestAssured.given()
+                .queryParam("intVal", 42)
+                .queryParam("shortVal", 4)
+                .queryParam("longVal", 442)
+                .queryParam("doubleVal", "4.2")
+                .queryParam("floatVal", "4.2")
+                .queryParam("b", "1")
+                .queryParam("boolVal", "true")
+                .queryParam("value", "hello world")
+                .get("/simple")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("intVal", equalTo(42))
+                .body("shortVal", equalTo(4))
+                .body("longVal", equalTo(442))
+                .body("floatVal", equalTo(4.2f))
+                .body("doubleVal", equalTo(4.2f))
+                .body("b", equalTo(1))
+                .body("boolVal", equalTo(true))
+                .body("value", equalTo("hello world"));
+    }
+
+    @Test
+    public void testNested() throws Exception {
+        RestAssured.given()
+                .queryParam("nestedOne.intVal", 42)
+                .queryParam("nestedOne.shortVal", 4)
+                .queryParam("nestedOne.longVal", 442)
+                .queryParam("nestedOne.doubleVal", "4.2")
+                .queryParam("nestedOne.floatVal", "4.2")
+                .queryParam("nestedOne.b", "1")
+                .queryParam("nestedOne.boolVal", "true")
+                .queryParam("nestedOne.value", "hello world")
+                .queryParam("nestedTwo.intVal", 32)
+                .queryParam("nestedTwo.shortVal", 3)
+                .queryParam("nestedTwo.longVal", 332)
+                .queryParam("nestedTwo.doubleVal", "3.2")
+                .queryParam("nestedTwo.floatVal", "3.2")
+                .queryParam("nestedTwo.b", "2")
+                .queryParam("nestedTwo.boolVal", "true")
+                .queryParam("nestedTwo.value", "hello world too")
+                .get("/nested")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("nestedOne.intVal", equalTo(42))
+                .body("nestedOne.shortVal", equalTo(4))
+                .body("nestedOne.longVal", equalTo(442))
+                .body("nestedOne.floatVal", equalTo(4.2f))
+                .body("nestedOne.doubleVal", equalTo(4.2f))
+                .body("nestedOne.b", equalTo(1))
+                .body("nestedOne.boolVal", equalTo(true))
+                .body("nestedOne.value", equalTo("hello world"))
+                .body("nestedTwo.intVal", equalTo(32))
+                .body("nestedTwo.shortVal", equalTo(3))
+                .body("nestedTwo.longVal", equalTo(332))
+                .body("nestedTwo.floatVal", equalTo(3.2f))
+                .body("nestedTwo.doubleVal", equalTo(3.2f))
+                .body("nestedTwo.b", equalTo(2))
+                .body("nestedTwo.boolVal", equalTo(true))
+                .body("nestedTwo.value", equalTo("hello world too"));
+    }
+
+    @Test
+    public void testNestedCollection() throws Exception {
+        RestAssured.given()
+                .queryParam("intMap.one", 1)
+                .queryParam("intMap.two", 2)
+                .queryParam("intKeyMap.1", "one")
+                .queryParam("intKeyMap.2", "two")
+                .queryParam("stringList", "one")
+                .queryParam("stringList", "two")
+                .get("/nestedCollection")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("intMap.one", equalTo(1))
+                .body("intMap.two", equalTo(2))
+                .body("stringList[0]", equalTo("one"))
+                .body("stringList[1]", equalTo("two"))
+                .body("intKeyMap.1", equalTo("one"))
+                .body("intKeyMap.1", equalTo("one"));
+
+        RestAssured.given()
+                .queryParam("simpleMap.one.value", "one")
+                .queryParam("simpleMap.two.value", "two")
+                .queryParam("simpleMap.one.intVal", 1)
+                .queryParam("simpleMap.two.intVal", 2)
+                .queryParam("simpleList.one.value", "one")
+                .queryParam("simpleList.two.value", "two")
+                .queryParam("simpleList.one.intVal", 1)
+                .queryParam("simpleList.two.intVal", 2)
+                .get("/nestedCollection")
+                .then().statusCode(200)
+                .defaultParser(Parser.JSON)
+                .body("simpleMap.one.intVal", equalTo(1))
+                .body("simpleMap.two.intVal", equalTo(2))
+                .body("simpleMap.one.value", equalTo("one"))
+                .body("simpleMap.two.value", equalTo("two"))
+                .body("simpleList[0].intVal", equalTo(1))
+                .body("simpleList[1].intVal", equalTo(2))
+                .body("simpleList[0].value", equalTo("one"))
+                .body("simpleList[1].value", equalTo("two"));
+
+    }
+
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java
new file mode 100644
index 0000000000000..9bf5c72ac79b9
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/RootPathTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.funqy.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class RootPathTest {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.root-path=/api\n" +
+            "quarkus.funqy.export=toLowerCase\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties")
+                    .addClasses(PrimitiveFunctions.class));
+
+    @Test
+    public void testRoot() {
+        // RestAssured is aware of quarkus.http.root-path
+        RestAssured.given().contentType("application/json").body("\"Hello Test\"").post("/")
+                .then().statusCode(200).body(equalTo("\"hello test\""));
+        RestAssured.given().contentType("application/json").body("\"Hello Test\"").post("/toLowerCase")
+                .then().statusCode(200).body(equalTo("\"hello test\""));
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/Simple.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/Simple.java
new file mode 100644
index 0000000000000..2424c11896525
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/Simple.java
@@ -0,0 +1,76 @@
+package io.quarkus.funqy.test;
+
+public class Simple {
+    private String value;
+    private int intVal;
+    private short shortVal;
+    private long longVal;
+    private byte b;
+    private float floatVal;
+    private double doubleVal;
+    private boolean boolVal;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getIntVal() {
+        return intVal;
+    }
+
+    public void setIntVal(int intVal) {
+        this.intVal = intVal;
+    }
+
+    public short getShortVal() {
+        return shortVal;
+    }
+
+    public void setShortVal(short shortVal) {
+        this.shortVal = shortVal;
+    }
+
+    public long getLongVal() {
+        return longVal;
+    }
+
+    public void setLongVal(long longVal) {
+        this.longVal = longVal;
+    }
+
+    public byte getB() {
+        return b;
+    }
+
+    public void setB(byte b) {
+        this.b = b;
+    }
+
+    public float getFloatVal() {
+        return floatVal;
+    }
+
+    public void setFloatVal(float floatVal) {
+        this.floatVal = floatVal;
+    }
+
+    public double getDoubleVal() {
+        return doubleVal;
+    }
+
+    public void setDoubleVal(double doubleVal) {
+        this.doubleVal = doubleVal;
+    }
+
+    public boolean isBoolVal() {
+        return boolVal;
+    }
+
+    public void setBoolVal(boolean boolVal) {
+        this.boolVal = boolVal;
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenerics.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenerics.java
new file mode 100644
index 0000000000000..05380d0ba4013
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenerics.java
@@ -0,0 +1,29 @@
+package io.quarkus.funqy.test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import io.quarkus.funqy.Funq;
+import io.quarkus.funqy.knative.events.CloudEventMapping;
+import io.smallrye.mutiny.Uni;
+
+public class WithGenerics {
+
+    @Funq
+    @CloudEventMapping(trigger = "listOfStrings")
+    public String toCommaSeparated(List<Identity> identityList) {
+        return identityList
+                .stream()
+                .map(Identity::getName)
+                .collect(Collectors.joining(","));
+    }
+
+    @Funq
+    @CloudEventMapping(trigger = "integer")
+    public Uni<List<Integer>> range(int n) {
+        return Uni.createFrom().item(() -> IntStream.range(0, n)
+                .boxed()
+                .collect(Collectors.toList()));
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java
new file mode 100644
index 0000000000000..3e2084403e7fe
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/deployment/src/test/java/io/quarkus/funqy/test/WithGenericsTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.funqy.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class WithGenericsTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(WithGenerics.class, Identity.class));
+
+    @Test
+    public void testToCommaSeparated() {
+        RestAssured.given().contentType("application/json")
+                .body("[{\"name\": \"Bill\"}, {\"name\": \"Matej\"}]")
+                .header("ce-id", "42")
+                .header("ce-type", "listOfStrings")
+                .header("ce-source", "/ofTest")
+                .header("ce-specversion", "1.0")
+                .post("/")
+                .then().statusCode(200)
+                .body(equalTo("\"Bill,Matej\""));
+    }
+
+    @Test
+    public void testRange() {
+        RestAssured.given().contentType("application/json")
+                .body("3")
+                .header("ce-id", "42")
+                .header("ce-type", "integer")
+                .header("ce-source", "/ofTest")
+                .header("ce-specversion", "1.0")
+                .post("/")
+                .then().statusCode(200);
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/pom.xml b/extensions/funqy/funqy-knative-events/pom.xml
index 6e9cd313f5789..0f488a9727b3f 100644
--- a/extensions/funqy/funqy-knative-events/pom.xml
+++ b/extensions/funqy/funqy-knative-events/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-funqy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-knative-events/runtime/pom.xml b/extensions/funqy/funqy-knative-events/runtime/pom.xml
index a926996545444..5c1e78c7bfa59 100644
--- a/extensions/funqy/funqy-knative-events/runtime/pom.xml
+++ b/extensions/funqy/funqy-knative-events/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-knative-events-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/AbstractCloudEvent.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/AbstractCloudEvent.java
new file mode 100644
index 0000000000000..58c84b77fd5d3
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/AbstractCloudEvent.java
@@ -0,0 +1,60 @@
+package io.quarkus.funqy.knative.events;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public abstract class AbstractCloudEvent<T> implements CloudEvent<T> {
+
+    @Override
+    public String toString() {
+        return "CloudEvent{" +
+                "specVersion='" + specVersion() + '\'' +
+                ", id='" + id() + '\'' +
+                ", type='" + type() + '\'' +
+                ", source='" + source() + '\'' +
+                ", subject='" + subject() + '\'' +
+                ", time=" + time() +
+                ", extensions=" + extensions() +
+                ", dataSchema=" + dataSchema() +
+                ", dataContentType='" + dataContentType() + '\'' +
+                ", data=" + data() +
+                '}';
+    }
+
+    private static final Pattern VERSION_REGEX = Pattern.compile("^(\\d+)\\.(\\d+)$");
+
+    public static int parseMajorSpecVersion(String ver) {
+        if (ver == null) {
+            return -1;
+        }
+        Matcher m = VERSION_REGEX.matcher(ver);
+        if (m.find()) {
+            ver = m.group(1);
+            if (ver == null) {
+                return -1;
+            }
+            try {
+                return Integer.parseInt(ver);
+            } catch (NumberFormatException e) {
+                return -1;
+            }
+        }
+        return -1;
+    }
+
+    public static boolean isKnownSpecVersion(String ceSpecVersion) {
+        int maj = parseMajorSpecVersion(ceSpecVersion);
+        return maj == 0 || maj == 1;
+    }
+
+    private boolean isMajorParsed;
+    private int majorSpecVersion;
+
+    protected int majorSpecVersion() {
+        if (!isMajorParsed) {
+            majorSpecVersion = parseMajorSpecVersion(specVersion());
+            isMajorParsed = true;
+        }
+        return majorSpecVersion;
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEvent.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEvent.java
index cd96fb91fecdf..b0bba9bb74b95 100644
--- a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEvent.java
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEvent.java
@@ -1,19 +1,32 @@
 package io.quarkus.funqy.knative.events;
 
 import java.time.OffsetDateTime;
+import java.util.Map;
 
 /**
- * Cloud event. Represents only the headers. No data.
+ * CloudEvent.
  *
  */
-public interface CloudEvent {
+public interface CloudEvent<T> {
+
     String id();
 
     String specVersion();
 
     String source();
 
+    String type();
+
     String subject();
 
     OffsetDateTime time();
+
+    Map<String, String> extensions();
+
+    String dataSchema();
+
+    String dataContentType();
+
+    T data();
+
 }
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEventBuilder.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEventBuilder.java
new file mode 100644
index 0000000000000..52af4bd24bb3f
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/knative/events/CloudEventBuilder.java
@@ -0,0 +1,198 @@
+package io.quarkus.funqy.knative.events;
+
+import java.time.OffsetDateTime;
+import java.util.Collections;
+import java.util.Map;
+
+public class CloudEventBuilder {
+    private String specVersion;
+    private String id;
+    private String type;
+    private String source;
+    private String subject;
+    private OffsetDateTime time;
+    private String dataSchema;
+    private Map<String, String> extensions;
+
+    private CloudEventBuilder() {
+    }
+
+    public static CloudEventBuilder create() {
+        return new CloudEventBuilder();
+    }
+
+    public CloudEventBuilder specVersion(String specVersion) {
+        if ((specVersion.charAt(0) != '0' && specVersion.charAt(0) != '1') || specVersion.charAt(1) != '.') {
+            throw new IllegalArgumentException("Only supported major versions are 0 and 1.");
+        }
+        this.specVersion = specVersion;
+        return this;
+    }
+
+    public CloudEventBuilder id(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public CloudEventBuilder type(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public CloudEventBuilder source(String source) {
+        this.source = source;
+        return this;
+    }
+
+    public CloudEventBuilder subject(String subject) {
+        this.subject = subject;
+        return this;
+    }
+
+    public CloudEventBuilder time(OffsetDateTime time) {
+        this.time = time;
+        return this;
+    }
+
+    public CloudEventBuilder dataSchema(String dataSchema) {
+        this.dataSchema = dataSchema;
+        return this;
+    }
+
+    public CloudEventBuilder extensions(Map<String, String> extensions) {
+        this.extensions = extensions;
+        return this;
+    }
+
+    public CloudEvent<byte[]> build(byte[] data, String dataContentType) {
+
+        return new SimpleCloudEvent(specVersion,
+                id,
+                type,
+                source,
+                subject,
+                time,
+                extensions,
+                dataSchema,
+                dataContentType,
+                data);
+    }
+
+    public <T> CloudEvent<T> build(T data) {
+        return new SimpleCloudEvent(specVersion,
+                id,
+                type,
+                source,
+                subject,
+                time,
+                extensions,
+                dataSchema,
+                "application/json",
+                data);
+    }
+
+    public CloudEvent<Void> build() {
+        return new SimpleCloudEvent(specVersion,
+                id,
+                type,
+                source,
+                subject,
+                time,
+                extensions,
+                dataSchema,
+                null,
+                null);
+    }
+
+    private static final class SimpleCloudEvent<T> extends AbstractCloudEvent<T> implements CloudEvent<T> {
+        private final String specVersion;
+        private final String id;
+        private final String type;
+        private final String source;
+        private final String subject;
+        private final OffsetDateTime time;
+        private final Map<String, String> extensions;
+        private final String dataSchema;
+        private final String dataContentType;
+        private final T data;
+
+        SimpleCloudEvent(String specVersion,
+                String id,
+                String type,
+                String source,
+                String subject,
+                OffsetDateTime time,
+                Map<String, String> extensions,
+                String dataSchema,
+                String dataContentType,
+                T data) {
+
+            if (extensions == null) {
+                this.extensions = Collections.emptyMap();
+            } else {
+                this.extensions = Collections.unmodifiableMap(extensions);
+            }
+
+            this.specVersion = specVersion;
+            this.id = id;
+            this.type = type;
+            this.source = source;
+            this.subject = subject;
+            this.time = time;
+            this.dataSchema = dataSchema;
+            this.dataContentType = dataContentType;
+            this.data = data;
+        }
+
+        @Override
+        public String id() {
+            return id;
+        }
+
+        @Override
+        public String specVersion() {
+            return specVersion;
+        }
+
+        @Override
+        public String source() {
+            return source;
+        }
+
+        @Override
+        public String type() {
+            return type;
+        }
+
+        @Override
+        public String subject() {
+            return subject;
+        }
+
+        @Override
+        public OffsetDateTime time() {
+            return time;
+        }
+
+        @Override
+        public String dataSchema() {
+            return dataSchema;
+        }
+
+        @Override
+        public Map<String, String> extensions() {
+            return extensions;
+        }
+
+        @Override
+        public String dataContentType() {
+            return dataContentType;
+        }
+
+        @Override
+        public T data() {
+            return data;
+        }
+
+    }
+}
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/HeaderCloudEventImpl.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/HeaderCloudEventImpl.java
index bdc5787533e33..f7443a056d3fc 100644
--- a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/HeaderCloudEventImpl.java
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/HeaderCloudEventImpl.java
@@ -1,27 +1,55 @@
 package io.quarkus.funqy.runtime.bindings.knative.events;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.reflect.Type;
 import java.time.OffsetDateTime;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+
+import io.quarkus.funqy.knative.events.AbstractCloudEvent;
 import io.quarkus.funqy.knative.events.CloudEvent;
-import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.MultiMap;
+import io.vertx.core.buffer.Buffer;
 
-class HeaderCloudEventImpl implements CloudEvent {
+class HeaderCloudEventImpl<T> extends AbstractCloudEvent<T> implements CloudEvent<T> {
     String id;
     String specVersion;
     String source;
+    String type;
+
     String subject;
     OffsetDateTime time;
+    Map<String, String> extensions;
+
+    String dataSchema;
+    String dataContentType;
+    T data;
 
-    final HttpServerRequest request;
+    final MultiMap headers;
+    final Buffer buffer;
+    final Type dataType;
+    final ObjectMapper mapper;
+    private ObjectReader reader;
 
-    HeaderCloudEventImpl(HttpServerRequest request) {
-        this.request = request;
+    HeaderCloudEventImpl(MultiMap headers, Buffer buffer, Type dataType, ObjectMapper mapper, ObjectReader reader) {
+        this.headers = headers;
+        this.buffer = buffer;
+        this.dataType = dataType;
+        this.mapper = mapper;
+        this.reader = reader;
     }
 
     @Override
     public String id() {
         if (id == null) {
-            id = this.request.getHeader("ce-id");
+            id = headers.get("ce-id");
         }
 
         return id;
@@ -30,7 +58,10 @@ public String id() {
     @Override
     public String specVersion() {
         if (specVersion == null) {
-            specVersion = this.request.getHeader("ce-specversion");
+            String sv = headers.get("ce-specversion");
+            if (sv != null) {
+                this.specVersion = sv;
+            }
         }
 
         return specVersion;
@@ -38,17 +69,26 @@ public String specVersion() {
 
     @Override
     public String source() {
-        if (source == null) {
-            source = this.request.getHeader("ce-source");
+        if (source == null && headers.contains("ce-source")) {
+            source = headers.get("ce-source");
         }
 
         return source;
     }
 
+    @Override
+    public String type() {
+        if (type == null) {
+            type = headers.get("ce-type");
+        }
+
+        return type;
+    }
+
     @Override
     public String subject() {
         if (subject == null) {
-            subject = this.request.getHeader("ce-subject");
+            subject = headers.get("ce-subject");
         }
 
         return subject;
@@ -57,9 +97,92 @@ public String subject() {
     @Override
     public OffsetDateTime time() {
         if (time == null) {
-            time = OffsetDateTime.parse(this.request.getHeader("ce-time"));
+            String t = headers.get("ce-time");
+            if (t != null) {
+                time = OffsetDateTime.parse(t);
+            }
         }
 
         return time;
     }
+
+    private static final Set<String> reservedHeaders;
+    static {
+        Set<String> ra = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        ra.add("ce-specversion");
+        ra.add("ce-id");
+        ra.add("ce-source");
+        ra.add("ce-type");
+
+        ra.add("Content-Type");
+        ra.add("ce-subject");
+        ra.add("ce-time");
+
+        ra.add("ce-datacontentencoding");
+        ra.add("ce-schemaurl");
+
+        ra.add("ce-dataschema");
+
+        reservedHeaders = Collections.unmodifiableSet(ra);
+    }
+
+    private static boolean isCEHeader(String value) {
+        return (value.charAt(0) == 'C' || value.charAt(0) == 'c') &&
+                (value.charAt(1) == 'E' || value.charAt(1) == 'e') &&
+                value.charAt(2) == '-';
+    }
+
+    @Override
+    public Map<String, String> extensions() {
+        if (extensions == null) {
+            extensions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+            for (Map.Entry<String, String> entry : headers) {
+                if (isCEHeader(entry.getKey()) && !reservedHeaders.contains(entry.getKey())) {
+                    extensions.put(entry.getKey().substring(3), entry.getValue());
+                }
+            }
+            extensions = Collections.unmodifiableMap(extensions);
+        }
+        return extensions;
+    }
+
+    @Override
+    public String dataSchema() {
+        if (dataSchema == null) {
+            String dsName = majorSpecVersion() == 0 ? "ce-schemaurl" : "ce-dataschema";
+            dataSchema = headers.get(dsName);
+        }
+        return dataSchema;
+    }
+
+    @Override
+    public String dataContentType() {
+        if (dataContentType == null) {
+            dataContentType = headers.get("Content-Type");
+        }
+
+        return dataContentType;
+    }
+
+    @Override
+    public T data() {
+        if (data != null) {
+            return data;
+        }
+        if (dataContentType() != null && dataContentType().startsWith("application/json") && !byte[].class.equals(dataType)) {
+            try {
+                data = reader.readValue(buffer.getBytes());
+                return data;
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        } else if (byte[].class.equals(dataType)) {
+            data = (T) buffer.getBytes();
+            return data;
+        } else {
+            String msg = String.format("Don't know how to get event data (dataContentType: '%s', javaType: '%s').",
+                    dataContentType(), dataType.getTypeName());
+            throw new RuntimeException(msg);
+        }
+    }
 }
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/JsonCloudEventImpl.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/JsonCloudEventImpl.java
index bbaebd95fc956..ac0608838de64 100644
--- a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/JsonCloudEventImpl.java
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/JsonCloudEventImpl.java
@@ -1,22 +1,48 @@
 package io.quarkus.funqy.runtime.bindings.knative.events;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.reflect.Type;
 import java.time.OffsetDateTime;
-
+import java.util.Base64;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
 
+import io.quarkus.funqy.knative.events.AbstractCloudEvent;
 import io.quarkus.funqy.knative.events.CloudEvent;
 
-class JsonCloudEventImpl implements CloudEvent {
+class JsonCloudEventImpl<T> extends AbstractCloudEvent<T> implements CloudEvent<T> {
     String id;
     String specVersion;
     String source;
+    String type;
+
     String subject;
     OffsetDateTime time;
+    Map<String, String> extensions;
+
+    String dataSchema;
+    String dataContentType;
+    T data;
 
     final JsonNode event;
+    final ObjectMapper mapper;
+    final Type dataType;
+    private ObjectReader reader;
 
-    public JsonCloudEventImpl(JsonNode event) {
+    public JsonCloudEventImpl(JsonNode event, Type dataType, ObjectMapper mapper, ObjectReader reader) {
         this.event = event;
+        this.mapper = mapper;
+        this.dataType = dataType;
+        this.reader = reader;
     }
 
     @Override
@@ -34,8 +60,9 @@ public String id() {
     public String specVersion() {
         if (specVersion == null) {
             JsonNode specVersion = event.get("specversion");
-            if (specVersion != null)
+            if (specVersion != null) {
                 this.specVersion = specVersion.asText();
+            }
         }
 
         return specVersion;
@@ -43,21 +70,31 @@ public String specVersion() {
 
     @Override
     public String source() {
-        if (source == null) {
-            JsonNode source = event.get("source");
-            if (source != null)
-                this.source = source.asText();
+        if (source == null && event.has("source")) {
+            this.source = event.get("source").asText();
         }
 
         return source;
     }
 
+    @Override
+    public String type() {
+        if (type == null) {
+            JsonNode source = event.get("type");
+            if (source != null)
+                this.type = source.asText();
+        }
+
+        return type;
+    }
+
     @Override
     public String subject() {
         if (subject == null) {
             JsonNode subject = event.get("subject");
-            if (subject != null)
+            if (subject != null) {
                 this.subject = subject.asText();
+            }
         }
 
         return subject;
@@ -74,4 +111,130 @@ public OffsetDateTime time() {
 
         return time;
     }
+
+    private static final Set<String> reservedAttributes;
+    static {
+        Set<String> ra = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        ra.add("specversion");
+        ra.add("id");
+        ra.add("source");
+        ra.add("type");
+
+        ra.add("datacontenttype");
+        ra.add("subject");
+        ra.add("time");
+
+        ra.add("datacontentencoding");
+        ra.add("schemaurl");
+        ra.add("dataschema");
+
+        ra.add("data");
+
+        reservedAttributes = Collections.unmodifiableSet(ra);
+    }
+
+    @Override
+    public Map<String, String> extensions() {
+
+        if (extensions == null) {
+            extensions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+            event.fields().forEachRemaining(e -> {
+                if (!reservedAttributes.contains(e.getKey())) {
+                    extensions.put(e.getKey(), e.getValue().textValue());
+                }
+            });
+            extensions = Collections.unmodifiableMap(extensions);
+        }
+
+        return extensions;
+    }
+
+    @Override
+    public String dataSchema() {
+        if (dataSchema == null) {
+            String dsName = majorSpecVersion() == 0 ? "schemaurl" : "dataschema";
+            JsonNode dataSchema = event.get(dsName);
+            if (dataSchema != null) {
+                this.dataSchema = dataSchema.asText();
+            }
+        }
+
+        return dataSchema;
+    }
+
+    @Override
+    public String dataContentType() {
+        if (dataContentType == null) {
+            JsonNode dataContentType = event.get("datacontenttype");
+            if (dataContentType != null) {
+                this.dataContentType = dataContentType.asText();
+            }
+        }
+
+        return dataContentType;
+    }
+
+    @Override
+    public T data() {
+        if (data != null) {
+            return data;
+        }
+        if (dataContentType() != null && dataContentType().startsWith("application/json") && !byte[].class.equals(dataType)) {
+            try {
+                data = reader.readValue(event.get("data"));
+                return data;
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        } else if (byte[].class.equals(dataType)) {
+            try {
+                if (majorSpecVersion() == 0) {
+                    boolean isBase64 = false;
+                    if (event.has("datacontentencoding")) {
+                        String dce = event.get("datacontentencoding").asText();
+                        if ("base64".equals(dce)) {
+                            isBase64 = true;
+                        } else {
+                            throw new RuntimeException("Cannot deserialize data for data-content-encoding: '" + dce + "'.");
+                        }
+                    }
+                    if (isBase64) {
+                        if (event.has("data")) {
+                            String txt = event.get("data").asText();
+                            data = (T) Base64.getDecoder().decode(txt);
+                            return data;
+                        } else {
+                            return null;
+                        }
+                    } else {
+                        if (event.has("data")) {
+                            data = (T) mapper.writeValueAsBytes(event.get("data"));
+                            return data;
+                        } else {
+                            return null;
+                        }
+                    }
+                } else {
+                    if (event.has("data")) {
+                        data = (T) mapper.writeValueAsBytes(event.get("data"));
+                        return data;
+                    } else if (event.has("data_base64")) {
+                        String txt = event.get("data_base64").asText();
+                        data = (T) Base64.getDecoder().decode(txt);
+                        return data;
+                    } else {
+                        return null;
+                    }
+                }
+
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            String msg = String.format("Don't know how to get event data (dataContentType: '%s', javaType: '%s').",
+                    dataContentType(), dataType.getTypeName());
+            throw new RuntimeException(msg);
+        }
+    }
+
 }
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/KnativeEventsBindingRecorder.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/KnativeEventsBindingRecorder.java
index bb1e506b1a711..7028d2b2f82d1 100644
--- a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/KnativeEventsBindingRecorder.java
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/KnativeEventsBindingRecorder.java
@@ -1,15 +1,17 @@
 package io.quarkus.funqy.runtime.bindings.knative.events;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import org.jboss.logging.Logger;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
@@ -17,17 +19,20 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.impl.Reflections;
 import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.funqy.knative.events.CloudEvent;
 import io.quarkus.funqy.knative.events.CloudEventMapping;
 import io.quarkus.funqy.runtime.FunctionConstructor;
 import io.quarkus.funqy.runtime.FunctionInvoker;
 import io.quarkus.funqy.runtime.FunctionRecorder;
 import io.quarkus.funqy.runtime.FunqyConfig;
+import io.quarkus.funqy.runtime.query.QueryObjectMapper;
+import io.quarkus.funqy.runtime.query.QueryReader;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.ext.web.Route;
 import io.vertx.ext.web.RoutingContext;
 
 /**
@@ -38,16 +43,22 @@ public class KnativeEventsBindingRecorder {
     private static final Logger log = Logger.getLogger(KnativeEventsBindingRecorder.class);
 
     private static ObjectMapper objectMapper;
+    private static QueryObjectMapper queryMapper;
     private static Map<String, FunctionInvoker> typeTriggers;
 
     public static final String RESPONSE_TYPE = "response.cloud.event.type";
     public static final String RESPONSE_SOURCE = "response.cloud.event.source";
+    public static final String INPUT_CE_DATA_TYPE = "io.quarkus.funqy.knative.events.INPUT_CE_DATA_TYPE";
+    public static final String OUTPUT_CE_DATA_TYPE = "io.quarkus.funqy.knative.events.OUTPUT_CE_DATA_TYPE";
+    public static final String DATA_OBJECT_READER = ObjectReader.class.getName() + "_DATA_OBJECT_READER";
+    public static final String DATA_OBJECT_WRITER = ObjectWriter.class.getName() + "_DATA_OBJECT_WRITER";
 
     public void init() {
         typeTriggers = new HashMap<>();
         objectMapper = getObjectMapper()
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
+        queryMapper = new QueryObjectMapper();
         for (FunctionInvoker invoker : FunctionRecorder.registry.invokers()) {
             Method method = invoker.getMethod();
             CloudEventMapping annotation = method.getAnnotation(CloudEventMapping.class);
@@ -58,12 +69,44 @@ public void init() {
             }
 
             if (invoker.hasInput()) {
-                ObjectReader reader = objectMapper.readerFor(invoker.getInputType());
-                invoker.getBindingContext().put(ObjectReader.class.getName(), reader);
+                Type inputType = invoker.getInputType();
+
+                if (CloudEvent.class.equals(Reflections.getRawType(inputType))) {
+                    if (inputType instanceof ParameterizedType) {
+                        Type[] params = ((ParameterizedType) inputType).getActualTypeArguments();
+                        if (params.length == 1) {
+                            inputType = params[0];
+                            invoker.getBindingContext().put(INPUT_CE_DATA_TYPE, inputType);
+                        }
+                    } else {
+                        throw new RuntimeException("When using CloudEvent<> generic parameter must be used.");
+                    }
+                }
+
+                JavaType javaInputType = objectMapper.constructType(inputType);
+                ObjectReader reader = objectMapper.readerFor(javaInputType);
+                invoker.getBindingContext().put(DATA_OBJECT_READER, reader);
+                QueryReader queryReader = queryMapper.readerFor(inputType);
+                invoker.getBindingContext().put(QueryReader.class.getName(), queryReader);
             }
             if (invoker.hasOutput()) {
-                ObjectWriter writer = objectMapper.writerFor(invoker.getOutputType());
-                invoker.getBindingContext().put(ObjectWriter.class.getName(), writer);
+                Type outputType = invoker.getOutputType();
+
+                if (CloudEvent.class.equals(Reflections.getRawType(outputType))) {
+                    if (outputType instanceof ParameterizedType) {
+                        Type[] params = ((ParameterizedType) outputType).getActualTypeArguments();
+                        if (params.length == 1) {
+                            outputType = params[0];
+                            invoker.getBindingContext().put(OUTPUT_CE_DATA_TYPE, outputType);
+                        }
+                    } else {
+                        throw new RuntimeException("When using CloudEvent<> generic parameter must be used.");
+                    }
+                }
+
+                JavaType outputJavaType = objectMapper.constructType(outputType);
+                ObjectWriter writer = objectMapper.writerFor(outputJavaType);
+                invoker.getBindingContext().put(DATA_OBJECT_WRITER, writer);
 
                 String functionName = invoker.getName();
                 if (annotation != null && !annotation.responseType().isEmpty()) {
@@ -88,7 +131,8 @@ private ObjectMapper getObjectMapper() {
         return new ObjectMapper();
     }
 
-    public Consumer<Route> start(
+    public Handler<RoutingContext> start(
+            String rootPath,
             FunqyConfig funqyConfig,
             FunqyKnativeEventsConfig eventsConfig,
             Supplier<Vertx> vertx,
@@ -141,15 +185,10 @@ public void run() {
 
         }
 
-        Handler<RoutingContext> handler = new VertxRequestHandler(vertx.get(), beanContainer, objectMapper, eventsConfig,
+        Handler<RoutingContext> handler = new VertxRequestHandler(vertx.get(), rootPath, beanContainer, objectMapper,
+                eventsConfig,
                 defaultInvoker, typeTriggers, executor);
 
-        return new Consumer<Route>() {
-
-            @Override
-            public void accept(Route route) {
-                route.handler(handler);
-            }
-        };
+        return handler;
     }
 }
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java
index 62c530d8acf16..5de658751d771 100644
--- a/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/knative/events/VertxRequestHandler.java
@@ -1,9 +1,17 @@
 package io.quarkus.funqy.runtime.bindings.knative.events;
 
+import static io.quarkus.funqy.knative.events.AbstractCloudEvent.isKnownSpecVersion;
+import static io.quarkus.funqy.knative.events.AbstractCloudEvent.parseMajorSpecVersion;
+import static io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder.DATA_OBJECT_READER;
+import static io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder.DATA_OBJECT_WRITER;
+import static io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder.INPUT_CE_DATA_TYPE;
+import static io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder.OUTPUT_CE_DATA_TYPE;
 import static io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder.RESPONSE_SOURCE;
 import static io.quarkus.funqy.runtime.bindings.knative.events.KnativeEventsBindingRecorder.RESPONSE_TYPE;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -25,18 +33,21 @@
 import io.quarkus.arc.ManagedContext;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.funqy.knative.events.CloudEvent;
+import io.quarkus.funqy.knative.events.CloudEventBuilder;
 import io.quarkus.funqy.runtime.FunctionInvoker;
 import io.quarkus.funqy.runtime.FunctionRecorder;
 import io.quarkus.funqy.runtime.FunqyServerResponse;
 import io.quarkus.funqy.runtime.RequestContextImpl;
+import io.quarkus.funqy.runtime.query.QueryReader;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
-import io.smallrye.mutiny.Uni;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 
@@ -51,14 +62,17 @@ public class VertxRequestHandler implements Handler<RoutingContext> {
     protected final Executor executor;
     protected final FunctionInvoker defaultInvoker;
     protected final Map<String, FunctionInvoker> typeTriggers;
+    protected final String rootPath;
 
     public VertxRequestHandler(Vertx vertx,
+            String rootPath,
             BeanContainer beanContainer,
             ObjectMapper mapper,
             FunqyKnativeEventsConfig config,
             FunctionInvoker defaultInvoker,
             Map<String, FunctionInvoker> typeTriggers,
             Executor executor) {
+        this.rootPath = rootPath;
         this.defaultInvoker = defaultInvoker;
         this.vertx = vertx;
         this.beanContainer = beanContainer;
@@ -70,35 +84,26 @@ public VertxRequestHandler(Vertx vertx,
         this.currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
     }
 
-    private boolean checkHttpMethod(RoutingContext routingContext, FunctionInvoker invoker) {
-        if (invoker.hasInput()) {
-            if (routingContext.request().method() != HttpMethod.POST) {
-                routingContext.fail(405);
-                log.error("Must be POST for: " + invoker.getName());
-                return false;
-            }
-        }
-        if (routingContext.request().method() != HttpMethod.POST && routingContext.request().method() != HttpMethod.GET) {
-            routingContext.fail(405);
-            log.error("Must be POST or GET for: " + invoker.getName());
-            return false;
-
-        }
-        return true;
-    }
-
     @Override
     public void handle(RoutingContext routingContext) {
-        String mediaType = routingContext.request().getHeader("Content-Type");
-        if (mediaType == null || mediaType.startsWith("application/json") || mediaType.trim().equals("")) {
-            if (routingContext.request().getHeader("ce-id") != null) {
-                binaryContentMode(routingContext);
-            } else {
-                regularFunqyHttp(routingContext);
+        final HttpServerRequest request = routingContext.request();
+        final String mediaType = request.getHeader("Content-Type");
+        boolean binaryCE = request.headers().contains("Ce-Id");
+        boolean structuredCE = false;
+        if (mediaType != null) {
+            structuredCE = mediaType.startsWith("application/cloudevents+json");
+        }
+
+        if (structuredCE || binaryCE) {
+            try {
+                processCloudEvent(routingContext);
+            } catch (Throwable t) {
+                routingContext.fail(t);
             }
-        } else if (mediaType.startsWith("application/cloudevents+json")) {
-            structuredMode(routingContext);
-        } else if (mediaType.startsWith("application/cloudevents-batch+json")) {
+        } else if ((mediaType != null && mediaType.startsWith("application/json") && request.method() == HttpMethod.POST) ||
+                request.method() == HttpMethod.GET) {
+            regularFunqyHttp(routingContext);
+        } else if (mediaType != null && mediaType.startsWith("application/cloudevents-batch+json")) {
             routingContext.fail(406);
             log.error("Batch mode not supported yet");
             return;
@@ -110,209 +115,369 @@ public void handle(RoutingContext routingContext) {
         }
     }
 
-    private void regularFunqyHttp(RoutingContext routingContext) {
-        FunctionInvoker invoker = defaultInvoker;
-        if (invoker == null) {
-            String path = routingContext.request().path();
-            if (path.startsWith("/"))
-                path = path.substring(1);
-            invoker = FunctionRecorder.registry.matchInvoker(path);
-            if (invoker == null) {
-                routingContext.fail(404);
-                log.error("Could not vanilla http request to function: " + path);
-                return;
-            }
-        }
-        processHttpRequest(null, routingContext, () -> {
-        }, invoker);
-    }
+    private void processCloudEvent(RoutingContext routingContext) {
+        final HttpServerRequest httpRequest = routingContext.request();
+        final HttpServerResponse httpResponse = routingContext.response();
+        final boolean binaryCE = httpRequest.headers().contains("ce-id");
 
-    private void binaryContentMode(RoutingContext routingContext) {
-        String ceType = routingContext.request().getHeader("ce-type");
-        FunctionInvoker invoker = defaultInvoker;
-        if (invoker == null) {
-            // map by type trigger
-            invoker = typeTriggers.get(ceType);
-            if (invoker == null) {
-                routingContext.fail(404);
-                log.error("Could not map ce-type header: " + ceType + " to a function");
-                return;
-            }
+        httpRequest.bodyHandler(bodyBuff -> executor.execute(() -> {
+            try {
+                final String ceType;
+                final String ceSpecVersion;
+                final JsonNode structuredPayload;
 
-        }
-        final FunctionInvoker targetInvoker = invoker;
-        processHttpRequest(new HeaderCloudEventImpl(routingContext.request()), routingContext, () -> {
-            routingContext.response().putHeader("ce-id", getResponseId());
-            routingContext.response().putHeader("ce-specversion", "1.0");
-            routingContext.response().putHeader("ce-source",
-                    (String) targetInvoker.getBindingContext().get(RESPONSE_SOURCE));
-            routingContext.response().putHeader("ce-type",
-                    (String) targetInvoker.getBindingContext().get(RESPONSE_TYPE));
-        }, invoker);
-    }
+                if (binaryCE) {
+                    ceType = httpRequest.headers().get("ce-type");
+                    ceSpecVersion = httpRequest.headers().get("ce-specversion");
+                    structuredPayload = null;
+                } else {
+                    try {
+                        structuredPayload = mapper.readTree(bodyBuff.getBytes());
+                        ceType = structuredPayload.get("type").asText();
+                        ceSpecVersion = structuredPayload.get("specversion").asText();
+                    } catch (IOException e) {
+                        routingContext.fail(e);
+                        return;
+                    }
+                }
 
-    @FunctionalInterface
-    interface ResponseProcessing {
-        void handle();
-    }
+                if (!isKnownSpecVersion(ceSpecVersion)) {
+                    log.warnf("Unexpected CloudEvent spec-version '%s'.", ceSpecVersion);
+                }
 
-    private void processHttpRequest(CloudEvent event, RoutingContext routingContext, ResponseProcessing handler,
-            FunctionInvoker invoker) {
-        if (!checkHttpMethod(routingContext, invoker)) {
-            return;
-        }
-        routingContext.request().bodyHandler(buff -> {
-            try {
-                Object input = null;
-                if (buff.length() > 0) {
-                    ByteBufInputStream in = new ByteBufInputStream(buff.getByteBuf());
-                    ObjectReader reader = (ObjectReader) invoker.getBindingContext().get(ObjectReader.class.getName());
-                    try {
-                        input = reader.readValue((InputStream) in);
-                    } catch (JsonProcessingException e) {
-                        log.error("Failed to unmarshal input", e);
-                        routingContext.fail(400);
+                final FunctionInvoker invoker;
+                if (defaultInvoker != null) {
+                    invoker = defaultInvoker;
+                } else {
+                    invoker = typeTriggers.get(ceType);
+                    if (invoker == null) {
+                        routingContext.fail(404);
+                        log.error("Couldn't map CloudEvent type: '" + ceType + "' to a function.");
                         return;
                     }
                 }
-                Object finalInput = input;
-                executor.execute(() -> {
+
+                final Type inputCeDataType = (Type) invoker.getBindingContext().get(INPUT_CE_DATA_TYPE);
+                final Type outputCeDataType = (Type) invoker.getBindingContext().get(OUTPUT_CE_DATA_TYPE);
+                final Type innerInputType = inputCeDataType != null ? inputCeDataType : invoker.getInputType();
+                final Type innerOutputType = outputCeDataType != null ? outputCeDataType : invoker.getOutputType();
+                final ObjectReader reader = (ObjectReader) invoker.getBindingContext().get(DATA_OBJECT_READER);
+                final ObjectWriter writer = (ObjectWriter) invoker.getBindingContext().get(DATA_OBJECT_WRITER);
+
+                final CloudEvent<?> inputCloudEvent;
+                final Object input;
+                if (invoker.hasInput()) {
+                    if (binaryCE) {
+                        inputCloudEvent = new HeaderCloudEventImpl<>(
+                                httpRequest.headers(),
+                                bodyBuff,
+                                inputCeDataType != null ? inputCeDataType : innerInputType,
+                                mapper,
+                                reader);
+                    } else {
+                        inputCloudEvent = new JsonCloudEventImpl<>(
+                                structuredPayload,
+                                inputCeDataType != null ? inputCeDataType : innerInputType,
+                                mapper,
+                                reader);
+                    }
+                    if (inputCeDataType == null) {
+                        // we need to unwrap user data from CloudEvent
+                        input = inputCloudEvent.data();
+                    } else {
+                        // user is explicitly handling CloudEvent
+                        input = inputCloudEvent;
+                    }
+                } else {
+                    input = inputCloudEvent = null;
+                }
+
+                final Consumer<Object> sendOutput = output -> {
                     try {
-                        final HttpServerResponse httpResponse = routingContext.response();
-                        FunqyServerResponse response = dispatch(event, routingContext, invoker, finalInput);
-
-                        response.getOutput().emitOn(executor).subscribe().with(
-                                obj -> {
-                                    if (invoker.hasOutput()) {
-                                        try {
-                                            httpResponse.setStatusCode(200);
-                                            handler.handle();
-                                            ObjectWriter writer = (ObjectWriter) invoker.getBindingContext()
-                                                    .get(ObjectWriter.class.getName());
-                                            httpResponse.putHeader("Content-Type", "application/json");
-                                            httpResponse.end(writer.writeValueAsString(obj));
-                                        } catch (JsonProcessingException jpe) {
-                                            log.error("Failed to unmarshal input", jpe);
-                                            routingContext.fail(400);
-                                        } catch (Throwable e) {
-                                            routingContext.fail(e);
-                                        }
+                        if (!invoker.hasOutput()) {
+                            routingContext.response().setStatusCode(204);
+                            routingContext.response().end();
+                            return;
+                        }
+
+                        final CloudEvent<?> outputCloudEvent;
+                        if (outputCeDataType == null) {
+                            // we need to wrap user data into CloudEvent
+                            CloudEventBuilder builder = CloudEventBuilder.create();
+                            if (byte[].class.equals(innerOutputType)) {
+                                outputCloudEvent = builder.build((byte[]) output, "application/octet-stream");
+                            } else {
+                                outputCloudEvent = builder.build(output);
+                            }
+                        } else {
+                            // user is explicitly returning CloudEvent
+                            outputCloudEvent = (CloudEvent<?>) output;
+                        }
+
+                        String id = outputCloudEvent.id();
+                        if (id == null) {
+                            id = getResponseId();
+                        }
+                        String specVersion;
+                        if (outputCloudEvent.specVersion() != null) {
+                            specVersion = outputCloudEvent.specVersion();
+                        } else if (inputCloudEvent.specVersion() != null) {
+                            specVersion = inputCloudEvent.specVersion();
+                        } else {
+                            specVersion = "1.0";
+                        }
+                        String source = outputCloudEvent.source();
+                        if (source == null) {
+                            source = (String) invoker.getBindingContext().get(RESPONSE_SOURCE);
+                        }
+                        String type = outputCloudEvent.type();
+                        if (type == null) {
+                            type = (String) invoker.getBindingContext().get(RESPONSE_TYPE);
+                        }
+
+                        boolean ceHasData = !Void.class.equals(innerInputType);
+
+                        int majorSpecVer = parseMajorSpecVersion(specVersion);
+
+                        if (binaryCE) {
+                            httpResponse.putHeader("ce-id", id);
+                            httpResponse.putHeader("ce-specversion", specVersion);
+                            httpResponse.putHeader("ce-source", source);
+                            httpResponse.putHeader("ce-type", type);
+
+                            if (outputCloudEvent.time() != null) {
+                                httpResponse.putHeader("ce-time", outputCloudEvent.time().toString());
+                            }
+
+                            if (outputCloudEvent.subject() != null) {
+                                httpResponse.putHeader("ce-subject", outputCloudEvent.subject());
+                            }
+
+                            if (outputCloudEvent.dataSchema() != null) {
+                                String dsName = majorSpecVer == 0 ? "ce-schemaurl" : "ce-dataschema";
+                                httpResponse.putHeader(dsName, outputCloudEvent.dataSchema());
+                            }
+
+                            outputCloudEvent.extensions()
+                                    .entrySet()
+                                    .forEach(e -> httpResponse.putHeader("ce-" + e.getKey(), e.getValue()));
+
+                            String dataContentType = outputCloudEvent.dataContentType();
+                            if (dataContentType != null) {
+                                httpResponse.putHeader("Content-Type", dataContentType);
+                            }
+
+                            if (ceHasData) {
+                                if (dataContentType != null && dataContentType.startsWith("application/json")) {
+                                    httpResponse.end(Buffer.buffer(writer.writeValueAsBytes(outputCloudEvent.data())));
+                                } else if (byte[].class.equals(innerOutputType)) {
+                                    httpResponse.end(Buffer.buffer((byte[]) outputCloudEvent.data()));
+                                } else {
+                                    log.errorf("Don't know how to write ce to output (dataContentType: %s, javaType: %s).",
+                                            dataContentType, innerOutputType);
+                                    routingContext.fail(500);
+                                    return;
+                                }
+                            } else {
+                                routingContext.response().setStatusCode(204);
+                                routingContext.response().end();
+                            }
+                            return;
+                        } else {
+                            final Map<String, Object> responseEvent = new HashMap<>();
+                            responseEvent.put("id", id);
+                            responseEvent.put("specversion", specVersion);
+                            responseEvent.put("source", source);
+                            responseEvent.put("type", type);
+
+                            if (outputCloudEvent.time() != null) {
+                                responseEvent.put("time", outputCloudEvent.time());
+                            }
+
+                            if (outputCloudEvent.subject() != null) {
+                                responseEvent.put("subject", outputCloudEvent.subject());
+                            }
+
+                            if (outputCloudEvent.dataSchema() != null) {
+                                String dsName = majorSpecVer == 0 ? "schemaurl" : "dataschema";
+                                responseEvent.put(dsName, outputCloudEvent.dataSchema());
+                            }
+
+                            outputCloudEvent.extensions()
+                                    .entrySet()
+                                    .forEach(e -> responseEvent.put(e.getKey(), e.getValue()));
+
+                            String dataContentType = outputCloudEvent.dataContentType();
+                            if (dataContentType != null) {
+                                responseEvent.put("datacontenttype", dataContentType);
+                            }
+
+                            if (ceHasData) {
+                                if (majorSpecVer == 0) {
+                                    if (dataContentType != null && dataContentType.startsWith("application/json")) {
+                                        responseEvent.put("data", outputCloudEvent.data());
+                                    } else if (byte[].class.equals(innerOutputType)) {
+                                        responseEvent.put("datacontentencoding", "base64");
+                                        responseEvent.put("data", (byte[]) outputCloudEvent.data());
                                     } else {
-                                        httpResponse.setStatusCode(204);
-                                        httpResponse.end();
+                                        log.errorf(
+                                                "Don't know how to write ce to output (dataContentType: %s, javaType: %s).",
+                                                dataContentType, innerOutputType);
+                                        routingContext.fail(500);
+                                        return;
+                                    }
+                                } else {
+                                    if (dataContentType != null && dataContentType.startsWith("application/json")) {
+                                        responseEvent.put("data", outputCloudEvent.data());
+                                    } else if (byte[].class.equals(innerOutputType)) {
+                                        responseEvent.put("data_base64", (byte[]) outputCloudEvent.data());
+                                    } else {
+                                        log.errorf(
+                                                "Don't know how to write ce to output (dataContentType: %s, javaType: %s).",
+                                                dataContentType, innerOutputType);
+                                        routingContext.fail(500);
+                                        return;
                                     }
-                                },
-                                t -> routingContext.fail(t));
 
+                                }
+                            }
+
+                            routingContext.response().putHeader("Content-Type", "application/cloudevents+json");
+                            httpResponse.end(Buffer.buffer(mapper.writer().writeValueAsBytes(responseEvent)));
+                            return;
+                        }
                     } catch (Throwable t) {
-                        log.error(t);
-                        routingContext.fail(500, t);
+                        routingContext.fail(t);
                     }
-                });
+                };
+
+                dispatch(inputCloudEvent, routingContext, invoker, input)
+                        .getOutput()
+                        .subscribe()
+                        .with(sendOutput, t -> routingContext.fail(t));
+
             } catch (Throwable t) {
-                log.error(t);
-                routingContext.fail(500, t);
+                routingContext.fail(t);
             }
-        });
+        }));
+
     }
 
-    private void structuredMode(RoutingContext routingContext) {
-        if (routingContext.request().method() != HttpMethod.POST) {
-            routingContext.fail(405);
-            log.error("Must be POST method");
+    private void regularFunqyHttp(RoutingContext routingContext) {
+        String path = routingContext.request().path();
+        if (path == null) {
+            routingContext.fail(404);
             return;
         }
-        routingContext.request().bodyHandler(buff -> {
-            try {
-                ByteBufInputStream in = new ByteBufInputStream(buff.getByteBuf());
-                Object input = null;
-                JsonNode event;
+        // expects rootPath to end with '/'
+        if (!path.startsWith(rootPath)) {
+            routingContext.fail(404);
+            return;
+        }
+
+        path = path.substring(rootPath.length());
+
+        final FunctionInvoker invoker;
+        if (!path.isEmpty()) {
+            invoker = FunctionRecorder.registry.matchInvoker(path);
+        } else {
+            invoker = defaultInvoker;
+        }
+
+        if (invoker == null) {
+            routingContext.fail(404);
+            log.error("There is no function matching the path.");
+            return;
+        }
+
+        if (invoker.getBindingContext().get(INPUT_CE_DATA_TYPE) != null ||
+                invoker.getBindingContext().get(OUTPUT_CE_DATA_TYPE) != null) {
+            routingContext.fail(400);
+            log.errorf("Bad request: the '%s' function expects CloudEvent, but plain HTTP was received.",
+                    invoker.getName());
+            return;
+        }
+
+        processHttpRequest(null, routingContext, invoker);
+    }
+
+    private void processHttpRequest(CloudEvent event, RoutingContext routingContext,
+            FunctionInvoker invoker) {
+        if (routingContext.request().method() == HttpMethod.GET) {
+            Object input = null;
+            if (invoker.hasInput()) {
+                QueryReader reader = (QueryReader) invoker.getBindingContext().get(QueryReader.class.getName());
                 try {
-                    event = mapper.reader().readTree((InputStream) in);
-                } catch (JsonProcessingException e) {
+                    input = reader.readValue(routingContext.request().params().iterator());
+                } catch (Exception e) {
                     log.error("Failed to unmarshal input", e);
                     routingContext.fail(400);
                     return;
                 }
-                FunctionInvoker invoker = defaultInvoker;
-                if (invoker == null) {
-                    String eventType = event.get("type").asText();
-                    invoker = typeTriggers.get(eventType);
-                    if (invoker == null) {
-                        routingContext.fail(404);
-                        log.error("Could not map json cloud event to function: " + eventType);
-                        return;
-                    }
-
-                }
-                final FunctionInvoker targetInvoker = invoker;
-                if (invoker.hasInput()) {
-
-                    JsonNode dct = event.get("datacontenttype");
-                    if (dct == null) {
-                        routingContext.fail(400);
-                        return;
-                    }
-                    String type = dct.asText();
-                    if (type != null) {
-                        if (!type.equals("application/json")) {
-                            routingContext.fail(406);
-                            log.error("Illegal datacontenttype");
+            }
+            try {
+                execute(event, routingContext, invoker, input);
+            } catch (Throwable t) {
+                log.error(t);
+                routingContext.fail(500, t);
+            }
+        } else if (routingContext.request().method() == HttpMethod.POST) {
+            routingContext.request().bodyHandler(buff -> {
+                try {
+                    Object input = null;
+                    if (buff.length() > 0) {
+                        ByteBufInputStream in = new ByteBufInputStream(buff.getByteBuf());
+                        ObjectReader reader = (ObjectReader) invoker.getBindingContext().get(DATA_OBJECT_READER);
+                        try {
+                            input = reader.readValue((InputStream) in);
+                        } catch (JsonProcessingException e) {
+                            log.error("Failed to unmarshal input", e);
+                            routingContext.fail(400);
                             return;
                         }
-                        JsonNode data = event.get("data");
-                        if (data != null) {
-                            ObjectReader reader = (ObjectReader) invoker.getBindingContext().get(ObjectReader.class.getName());
-                            try {
-                                input = reader.readValue(data);
-                            } catch (JsonProcessingException e) {
-                                log.error("Failed to unmarshal input", e);
-                                routingContext.fail(400);
-                                return;
-                            }
-                        }
                     }
+                    execute(event, routingContext, invoker, input);
+                } catch (Throwable t) {
+                    log.error(t);
+                    routingContext.fail(500, t);
                 }
-                Object finalInput = input;
+            });
+        } else {
+            routingContext.fail(405);
+            log.error("Must be POST or GET for: " + invoker.getName());
+        }
 
-                executor.execute(() -> {
-                    try {
-                        final HttpServerResponse httpResponse = routingContext.response();
-                        final FunqyServerResponse response = dispatch(new JsonCloudEventImpl(event), routingContext,
-                                targetInvoker, finalInput);
-
-                        response.getOutput().emitOn(executor).subscribe().with(
-                                obj -> {
-                                    if (targetInvoker.hasOutput()) {
-                                        httpResponse.setStatusCode(200);
-                                        final Map<String, Object> responseEvent = new HashMap<>();
-
-                                        responseEvent.put("id", getResponseId());
-                                        responseEvent.put("specversion", "1.0");
-                                        responseEvent.put("source",
-                                                targetInvoker.getBindingContext().get(RESPONSE_SOURCE));
-                                        responseEvent.put("type",
-                                                targetInvoker.getBindingContext().get(RESPONSE_TYPE));
-                                        responseEvent.put("datacontenttype", "application/json");
-                                        responseEvent.put("data", obj);
-                                        try {
-                                            httpResponse.end(mapper.writer().writeValueAsString(responseEvent));
-                                        } catch (JsonProcessingException e) {
-                                            log.error("Failed to marshal", e);
-                                            routingContext.fail(400);
-                                        }
-                                    } else {
-                                        httpResponse.setStatusCode(204);
-                                        httpResponse.end();
-                                    }
-                                },
-                                t -> routingContext.fail(t));
+    }
+
+    private void execute(CloudEvent event, RoutingContext routingContext, FunctionInvoker invoker,
+            Object finalInput) {
+        executor.execute(() -> {
+            try {
+                final HttpServerResponse httpResponse = routingContext.response();
+                FunqyServerResponse response = dispatch(event, routingContext, invoker, finalInput);
+
+                response.getOutput().emitOn(executor).subscribe().with(
+                        obj -> {
+                            if (invoker.hasOutput()) {
+                                try {
+                                    httpResponse.setStatusCode(200);
+                                    ObjectWriter writer = (ObjectWriter) invoker.getBindingContext()
+                                            .get(DATA_OBJECT_WRITER);
+                                    httpResponse.putHeader("Content-Type", "application/json");
+                                    httpResponse.end(writer.writeValueAsString(obj));
+                                } catch (JsonProcessingException jpe) {
+                                    log.error("Failed to unmarshal input", jpe);
+                                    routingContext.fail(400);
+                                } catch (Throwable e) {
+                                    routingContext.fail(e);
+                                }
+                            } else {
+                                httpResponse.setStatusCode(204);
+                                httpResponse.end();
+                            }
+                        },
+                        t -> routingContext.fail(t));
 
-                    } catch (Throwable t) {
-                        log.error(t);
-                        routingContext.fail(500, t);
-                    }
-                });
             } catch (Throwable t) {
                 log.error(t);
                 routingContext.fail(500, t);
@@ -329,7 +494,13 @@ private FunqyServerResponse dispatch(CloudEvent event, RoutingContext routingCon
         ManagedContext requestContext = beanContainer.requestContext();
         requestContext.activate();
         if (association != null) {
-            ((Consumer<Uni<SecurityIdentity>>) association).accept(QuarkusHttpUser.getSecurityIdentity(routingContext, null));
+            QuarkusHttpUser existing = (QuarkusHttpUser) routingContext.user();
+            if (existing != null) {
+                SecurityIdentity identity = existing.getSecurityIdentity();
+                association.setIdentity(identity);
+            } else {
+                association.setIdentity(QuarkusHttpUser.getSecurityIdentity(routingContext, null));
+            }
         }
         currentVertxRequest.setCurrent(routingContext);
         try {
diff --git a/extensions/funqy/funqy-knative-events/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/funqy/funqy-knative-events/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..2a97adcc96f8f
--- /dev/null
+++ b/extensions/funqy/funqy-knative-events/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,16 @@
+name: "Funqy Knative Events Binding"
+metadata:
+  keywords:
+  - "knative"
+  - "function"
+  - "funqy"
+  - "cloud event"
+  guide: "https://quarkus.io/guides/funqy-knative-events"
+  categories:
+  - "cloud"
+  status: "experimental"
+  codestart:
+    name: "funqy-knative-events"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/funqy/funqy-server-common/deployment/pom.xml b/extensions/funqy/funqy-server-common/deployment/pom.xml
index 73ec30a6aeef5..cc7074d7e7b23 100644
--- a/extensions/funqy/funqy-server-common/deployment/pom.xml
+++ b/extensions/funqy/funqy-server-common/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-server-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,10 +25,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/FunctionScannerBuildStep.java b/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/FunctionScannerBuildStep.java
index 5f9f836e07adb..d84049b4749c6 100644
--- a/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/FunctionScannerBuildStep.java
+++ b/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/FunctionScannerBuildStep.java
@@ -1,6 +1,7 @@
 package io.quarkus.funqy.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+import static io.quarkus.funqy.deployment.ReflectionRegistrationUtil.*;
 
 import java.lang.reflect.Modifier;
 import java.util.Collection;
@@ -14,6 +15,7 @@
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 import org.objectweb.asm.ClassVisitor;
@@ -32,13 +34,16 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
+import io.quarkus.funqy.Context;
 import io.quarkus.funqy.Funq;
 import io.quarkus.funqy.runtime.FunctionRecorder;
 import io.quarkus.gizmo.Gizmo;
 
 public class FunctionScannerBuildStep {
     public static final DotName FUNQ = DotName.createSimple(Funq.class.getName());
+    public static final DotName CONTEXT = DotName.createSimple(Context.class.getName());
 
     @BuildStep
     public void scanFunctions(BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
@@ -46,8 +51,10 @@ public void scanFunctions(BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
             BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformer,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
             BuildProducer<FunctionBuildItem> functions) {
-        Collection<AnnotationInstance> funqs = beanArchiveIndexBuildItem.getIndex().getAnnotations(FUNQ);
+        IndexView index = beanArchiveIndexBuildItem.getIndex();
+        Collection<AnnotationInstance> funqs = index.getAnnotations(FUNQ);
         Set<ClassInfo> classes = new HashSet<>();
         Set<String> classNames = new HashSet<>();
         for (AnnotationInstance funqMethod : funqs) {
@@ -60,9 +67,37 @@ public void scanFunctions(BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
             if (funqMethod.value() != null) {
                 functionName = funqMethod.value().asString();
             }
-            if (functionName != null && "".equals(functionName))
+            if (functionName != null && functionName.isEmpty())
                 functionName = null;
             functions.produce(new FunctionBuildItem(className, methodName, functionName));
+
+            String source = FunctionScannerBuildStep.class.getSimpleName() + " > " + method.declaringClass() + "[" + method
+                    + "]";
+
+            Type returnType = method.returnType();
+            if (returnType.kind() != Type.Kind.VOID) {
+                reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                        .type(returnType)
+                        .index(index)
+                        .ignoreTypePredicate(IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                        .ignoreFieldPredicate(IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                        .ignoreMethodPredicate(IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                        .source(source)
+                        .build());
+            }
+            for (short i = 0; i < method.parameters().size(); i++) {
+                Type parameterType = method.parameters().get(i);
+                if (!hasAnnotation(method, i, CONTEXT)) {
+                    reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                            .type(parameterType)
+                            .index(index)
+                            .ignoreTypePredicate(IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                            .ignoreFieldPredicate(IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                            .ignoreMethodPredicate(IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                            .source(source)
+                            .build());
+                }
+            }
         }
         Set<ClassInfo> withoutDefaultCtor = new HashSet<>();
         for (ClassInfo clazz : classes) {
@@ -96,6 +131,18 @@ public void transform(TransformationContext transformationContext) {
         }));
     }
 
+    private static boolean hasAnnotation(MethodInfo method, short paramPosition, DotName annotation) {
+        for (AnnotationInstance annotationInstance : method.annotations()) {
+            AnnotationTarget target = annotationInstance.target();
+            if (target != null && target.kind() == AnnotationTarget.Kind.METHOD_PARAMETER
+                    && target.asMethodParameter().position() == paramPosition
+                    && annotationInstance.name().equals(annotation)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @BuildStep
     @Record(STATIC_INIT)
     public FunctionInitializedBuildItem staticInit(FunctionRecorder recorder, List<FunctionBuildItem> functions,
diff --git a/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java b/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java
new file mode 100644
index 0000000000000..aa60c6dc782aa
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/deployment/src/main/java/io/quarkus/funqy/deployment/ReflectionRegistrationUtil.java
@@ -0,0 +1,63 @@
+package io.quarkus.funqy.deployment;
+
+import java.util.function.Predicate;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+
+final class ReflectionRegistrationUtil {
+
+    private ReflectionRegistrationUtil() {
+    }
+
+    static final IgnoreTypeForReflectionPredicate IGNORE_TYPE_FOR_REFLECTION_PREDICATE = new IgnoreTypeForReflectionPredicate();
+    static final IgnoreFieldForReflectionPredicate IGNORE_FIELD_FOR_REFLECTION_PREDICATE = new IgnoreFieldForReflectionPredicate();
+    static final IgnoreMethodForReflectionPredicate IGNORE_METHOD_FOR_REFLECTION_PREDICATE = new IgnoreMethodForReflectionPredicate();
+
+    private static final DotName JSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");
+    private static final DotName JSONB_TRANSIENT = DotName.createSimple("javax.json.bind.annotation.JsonbTransient");
+
+    private static class IgnoreTypeForReflectionPredicate implements Predicate<DotName> {
+
+        @Override
+        public boolean test(DotName dotName) {
+            if (ReflectiveHierarchyBuildItem.DefaultIgnoreTypePredicate.INSTANCE.test(dotName)) {
+                return true;
+            }
+
+            String name = dotName.toString();
+            for (String packageName : PACKAGES_IGNORED_FOR_REFLECTION) {
+                if (name.startsWith(packageName)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private static class IgnoreFieldForReflectionPredicate implements Predicate<FieldInfo> {
+
+        @Override
+        public boolean test(FieldInfo fieldInfo) {
+            return fieldInfo.hasAnnotation(JSON_IGNORE)
+                    || fieldInfo.hasAnnotation(JSONB_TRANSIENT);
+        }
+    }
+
+    private static class IgnoreMethodForReflectionPredicate implements Predicate<MethodInfo> {
+
+        @Override
+        public boolean test(MethodInfo methodInfo) {
+            return methodInfo.hasAnnotation(JSON_IGNORE)
+                    || methodInfo.hasAnnotation(JSONB_TRANSIENT);
+        }
+    }
+
+    private static final String[] PACKAGES_IGNORED_FOR_REFLECTION = {
+            // Mutiny
+            "io.smallrye.mutiny."
+    };
+}
diff --git a/extensions/funqy/funqy-server-common/pom.xml b/extensions/funqy/funqy-server-common/pom.xml
index beab55c90c762..060217e666f06 100644
--- a/extensions/funqy/funqy-server-common/pom.xml
+++ b/extensions/funqy/funqy-server-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-funqy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/funqy/funqy-server-common/runtime/pom.xml b/extensions/funqy/funqy-server-common/runtime/pom.xml
index d87ade6f1b65b..3583471b6f497 100644
--- a/extensions/funqy/funqy-server-common/runtime/pom.xml
+++ b/extensions/funqy/funqy-server-common/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-funqy-server-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,6 +26,11 @@
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>mutiny</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/FunctionInvoker.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/FunctionInvoker.java
index b0957e1bba513..f633eb47d64c5 100644
--- a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/FunctionInvoker.java
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/FunctionInvoker.java
@@ -14,8 +14,8 @@ public class FunctionInvoker {
     protected Method method;
     protected FunctionConstructor<?> constructor;
     protected ArrayList<ValueInjector> parameterInjectors;
-    protected Class<?> inputType;
-    protected Class<?> outputType;
+    protected Type inputType;
+    protected Type outputType;
     protected boolean isAsync;
 
     protected Map<String, Object> bindingContext = new ConcurrentHashMap<>();
@@ -32,7 +32,7 @@ public FunctionInvoker(String name, Class<?> targetClass, Method method) {
                 Annotation[] annotations = method.getParameterAnnotations()[i];
                 ValueInjector injector = ParameterInjector.createInjector(type, clz, annotations);
                 if (injector instanceof InputValueInjector) {
-                    inputType = clz;
+                    inputType = type;
                 }
                 parameterInjectors.add(injector);
             }
@@ -46,8 +46,8 @@ public FunctionInvoker(String name, Class<?> targetClass, Method method) {
                 Type genericReturnType = method.getGenericReturnType();
                 if (genericReturnType instanceof ParameterizedType) {
                     Type[] actualParams = ((ParameterizedType) genericReturnType).getActualTypeArguments();
-                    if (actualParams.length == 1 && actualParams[0] instanceof Class<?>) {
-                        outputType = (Class<?>) actualParams[0];
+                    if (actualParams.length == 1) {
+                        outputType = actualParams[0];
                     }
                 }
                 if (outputType == null) {
@@ -55,7 +55,7 @@ public FunctionInvoker(String name, Class<?> targetClass, Method method) {
                             "Uni must be used with type parameter (e.g. Uni<String>).");
                 }
             } else {
-                outputType = returnType;
+                outputType = method.getGenericReturnType();
             }
         }
     }
@@ -74,11 +74,11 @@ public boolean hasInput() {
         return inputType != null;
     }
 
-    public Class getInputType() {
+    public Type getInputType() {
         return inputType;
     }
 
-    public Class getOutputType() {
+    public Type getOutputType() {
         return outputType;
     }
 
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/BaseCollectionReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/BaseCollectionReader.java
new file mode 100644
index 0000000000000..943cb84b3e573
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/BaseCollectionReader.java
@@ -0,0 +1,71 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import io.quarkus.arc.impl.Reflections;
+
+public abstract class BaseCollectionReader extends BaseObjectReader implements BaseObjectReader.ValueSetter {
+    protected Function<String, Object> valueExtractor;
+    protected QueryPropertySetter setter;
+
+    public BaseCollectionReader(Type genericType, QueryObjectMapper mapper) {
+        if (genericType == null) {
+            valueExtractor = mapper.extractor(String.class);
+            return;
+        }
+        if (genericType instanceof ParameterizedType) {
+            Type valueType = ((ParameterizedType) genericType).getActualTypeArguments()[0];
+            if (valueType != null) {
+                Class<Object> rawType = Reflections.getRawType(valueType);
+                valueExtractor = mapper.extractor(valueType);
+                if (valueExtractor == null) {
+                    setter = mapper.setterFor(rawType, valueType);
+                }
+            } else {
+                valueExtractor = mapper.extractor(String.class);
+            }
+        } else {
+            Class<Object> rawType = Reflections.getRawType(genericType);
+            valueExtractor = mapper.extractor(rawType);
+            if (valueExtractor == null) {
+                setter = mapper.setterFor(rawType, genericType);
+            }
+        }
+    }
+
+    @Override
+    public Function<String, Object> getExtractor() {
+        return valueExtractor;
+    }
+
+    @Override
+    public QueryPropertySetter getSetter() {
+        return setter;
+    }
+
+    @Override
+    ValueSetter getValueSetter(String propName) {
+        return this;
+    }
+
+    @Override
+    public void setValue(Object target, String propName, Object value) {
+        ((Collection) target).add(value);
+    }
+
+    @Override
+    public void setValue(Object target, String name, String value, Map<String, List<Object>> paramToObject) {
+        if (valueExtractor != null) {
+            if (name != null)
+                return; // ignore query parameter
+            ((Collection) target).add(valueExtractor.apply(value));
+        } else {
+            super.setValue(target, name, value, paramToObject);
+        }
+    }
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/BaseObjectReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/BaseObjectReader.java
new file mode 100644
index 0000000000000..69a3fb8046a48
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/BaseObjectReader.java
@@ -0,0 +1,82 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public abstract class BaseObjectReader implements QueryReader<Object>, QueryPropertySetter {
+    interface ValueSetter {
+        void setValue(Object target, String propName, Object value);
+
+        Function<String, Object> getExtractor();
+
+        QueryPropertySetter getSetter();
+    }
+
+    @Override
+    public Object readValue(Iterator<Map.Entry<String, String>> params) {
+        Object target = create();
+        // exists to track nested non-primitive objects
+        Map<String, List<Object>> paramToObject = new HashMap<>();
+
+        while (params.hasNext()) {
+            Map.Entry<String, String> entry = params.next();
+            String name = entry.getKey();
+            String value = entry.getValue();
+            setValue(target, name, value, paramToObject);
+        }
+
+        return target;
+    }
+
+    abstract ValueSetter getValueSetter(String propName);
+
+    @Override
+    public void setValue(Object target, String name, String value, Map<String, List<Object>> paramToObject) {
+        try {
+            if (name == null)
+                return;
+            String propName = name;
+            String suffix = null;
+            int dot = propName.indexOf('.');
+            if (dot == 0)
+                return;
+            else if (dot > 0) {
+                propName = name.substring(0, dot);
+                suffix = name.substring(dot + 1);
+            }
+            ValueSetter setter = getValueSetter(propName);
+            if (setter == null)
+                return;
+            if (suffix != null && setter.getSetter() == null)
+                return;
+            if (setter.getExtractor() != null) {
+                Object val = setter.getExtractor().apply(value);
+                setter.setValue(target, propName, val);
+            } else if (setter.getSetter() != null) {
+                List<Object> propEntry = paramToObject.get(propName);
+                Object obj;
+                Map<String, List<Object>> paramEntries;
+                if (propEntry == null) {
+                    obj = setter.getSetter().create();
+                    paramEntries = new HashMap<>();
+                    propEntry = Arrays.asList(obj, paramEntries);
+                    paramToObject.put(propName, propEntry);
+                    setter.setValue(target, propName, obj);
+                } else {
+                    obj = propEntry.get(0);
+                    paramEntries = (Map<String, List<Object>>) propEntry.get(1);
+                }
+                setter.getSetter().setValue(obj, suffix, value, paramEntries);
+            } else {
+                // throw Exception?
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryListReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryListReader.java
new file mode 100644
index 0000000000000..36cfccb83aaf5
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryListReader.java
@@ -0,0 +1,21 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.lang.reflect.Type;
+import java.util.LinkedList;
+
+/**
+ * Value can be any primitive, primitive object, string, or bean style class
+ *
+ */
+class QueryListReader extends BaseCollectionReader {
+
+    public QueryListReader(Type genericType, QueryObjectMapper mapper) {
+        super(genericType, mapper);
+    }
+
+    @Override
+    public Object create() {
+        return new LinkedList<>();
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryMapReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryMapReader.java
new file mode 100644
index 0000000000000..a6834bcfebae1
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryMapReader.java
@@ -0,0 +1,77 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+import io.quarkus.arc.impl.Reflections;
+
+/**
+ * Key can be any primitive, primitive object (i.e. Integer), or String
+ * Value can be any primitive, primitive object, string, or bean style class
+ *
+ */
+class QueryMapReader extends BaseObjectReader implements BaseObjectReader.ValueSetter {
+    private Function<String, Object> keyExtractor;
+    private Function<String, Object> valueExtractor;
+    private QueryPropertySetter setter;
+
+    public QueryMapReader(Type genericType, QueryObjectMapper mapper) {
+        if (genericType == null) {
+            keyExtractor = mapper.extractor(String.class);
+            valueExtractor = mapper.extractor(String.class);
+            return;
+        }
+        if (genericType instanceof ParameterizedType) {
+            Type keyType = ((ParameterizedType) genericType).getActualTypeArguments()[0];
+            keyExtractor = mapper.extractor(keyType);
+            if (keyType == null)
+                throw new RuntimeException("Illegal key type for map");
+            Type valueType = ((ParameterizedType) genericType).getActualTypeArguments()[1];
+            if (valueType != null) {
+                Class<Object> rawType = Reflections.getRawType(valueType);
+                valueExtractor = mapper.extractor(valueType);
+                if (valueExtractor == null) {
+                    setter = mapper.setterFor(rawType, valueType);
+                }
+            } else {
+                valueExtractor = mapper.extractor(String.class);
+            }
+        } else {
+            keyExtractor = mapper.extractor(String.class);
+            Class<Object> rawType = Reflections.getRawType(genericType);
+            valueExtractor = mapper.extractor(rawType);
+            if (valueExtractor == null) {
+                setter = mapper.setterFor(rawType, genericType);
+            }
+        }
+    }
+
+    @Override
+    public void setValue(Object target, String propName, Object value) {
+        ((Map) target).put(keyExtractor.apply(propName), value);
+    }
+
+    @Override
+    public Function<String, Object> getExtractor() {
+        return valueExtractor;
+    }
+
+    @Override
+    public QueryPropertySetter getSetter() {
+        return setter;
+    }
+
+    @Override
+    ValueSetter getValueSetter(String propName) {
+        return this;
+    }
+
+    @Override
+    public Object create() {
+        return new HashMap();
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryObjectMapper.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryObjectMapper.java
new file mode 100644
index 0000000000000..85a24caa5aabe
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryObjectMapper.java
@@ -0,0 +1,112 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import io.quarkus.arc.impl.Reflections;
+
+/**
+ * Turn URI parameter map into an object
+ *
+ */
+public class QueryObjectMapper {
+    Function<String, Object> extractor(Type type) {
+        return extractor(Reflections.getRawType(type));
+    }
+
+    Function<String, Object> extractor(Class clz) {
+        if (String.class.equals(clz)) {
+            return (strVal) -> {
+                return strVal;
+            };
+        }
+        if (clz.equals(long.class) || clz.equals(Long.class)) {
+            return (strVal) -> {
+                return Long.valueOf(strVal);
+            };
+        }
+        if (clz.equals(int.class) || clz.equals(Integer.class)) {
+            return (strVal) -> {
+                return Integer.valueOf(strVal);
+            };
+        }
+        if (clz.equals(short.class) || clz.equals(Short.class)) {
+            return (strVal) -> {
+                return Short.valueOf(strVal);
+            };
+        }
+        if (clz.equals(float.class) || clz.equals(Float.class)) {
+            return (strVal) -> {
+                return Float.valueOf(strVal);
+            };
+        }
+        if (clz.equals(double.class) || clz.equals(Double.class)) {
+            return (strVal) -> {
+                return Double.valueOf(strVal);
+            };
+        }
+        if (clz.equals(boolean.class) || clz.equals(Boolean.class)) {
+            return (strVal) -> {
+                return Boolean.valueOf(strVal);
+            };
+        }
+        if (clz.equals(byte.class) || clz.equals(Byte.class)) {
+            return (strVal) -> {
+                return Byte.valueOf(strVal);
+            };
+        }
+        if (clz.equals(OffsetDateTime.class)) {
+            return (strVal) -> {
+                return OffsetDateTime.parse(strVal);
+            };
+        }
+        return null;
+    }
+
+    Map<Class, QueryObjectReader> readers = new HashMap<>();
+
+    public <T> QueryReader<T> readerFor(Class<T> clz) {
+        return readerFor(clz, null);
+    }
+
+    public QueryReader readerFor(Type type) {
+        Class<?> clazz = null;
+        if (type instanceof Class) {
+            clazz = (Class<?>) type;
+        } else if (type instanceof ParameterizedType) {
+            clazz = (Class<?>) ((ParameterizedType) type).getRawType();
+        } else {
+            throw new RuntimeException("Cannot get QueryReader for: " + type);
+        }
+        return readerFor(clazz, type);
+    }
+
+    public <T> QueryReader<T> readerFor(Class<T> clz, Type genericType) {
+        if (clz.equals(Map.class)) {
+            return (QueryReader<T>) new QueryMapReader(genericType, this);
+        }
+        QueryObjectReader reader = readers.get(clz);
+        if (reader != null)
+            return (QueryReader<T>) reader;
+        reader = new QueryObjectReader(clz, this);
+        readers.put(clz, reader);
+        return (QueryReader<T>) reader;
+    }
+
+    QueryPropertySetter setterFor(Class clz, Type genericType) {
+        if (clz.equals(List.class)) {
+            return new QueryListReader(genericType, this);
+        }
+        if (clz.equals(Set.class)) {
+            return new QuerySetReader(genericType, this);
+        }
+        return (QueryPropertySetter) readerFor(clz, genericType);
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryObjectReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryObjectReader.java
new file mode 100644
index 0000000000000..3cc7dc9722207
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryObjectReader.java
@@ -0,0 +1,81 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * Turn URI parameter map into an object
+ *
+ */
+class QueryObjectReader extends BaseObjectReader {
+
+    Map<String, ValueSetter> properties = new HashMap<>();
+    Class clz;
+
+    @Override
+    public Object create() {
+        try {
+            return clz.newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    QueryObjectReader(Class clz, QueryObjectMapper mapper) {
+        this.clz = clz;
+        for (Method m : clz.getMethods()) {
+            if (!isSetter(m))
+                continue;
+            Class paramType = m.getParameterTypes()[0];
+            Type paramGenericType = m.getGenericParameterTypes()[0];
+            final Function<String, Object> extractor = mapper.extractor(paramType);
+
+            String name;
+            if (m.getName().length() > 4) {
+                name = Character.toLowerCase(m.getName().charAt(3)) + m.getName().substring(4);
+            } else {
+                name = m.getName().substring(3).toLowerCase();
+            }
+            ValueSetter setter = new ValueSetter() {
+                @Override
+                public void setValue(Object target, String propName, Object value) {
+                    try {
+                        m.invoke(target, value);
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+
+                @Override
+                public Function<String, Object> getExtractor() {
+                    return extractor;
+                }
+
+                @Override
+                public QueryPropertySetter getSetter() {
+                    if (extractor == null) {
+                        return mapper.setterFor(paramType, paramGenericType);
+                    } else {
+                        return null;
+                    }
+                }
+            };
+            properties.put(name, setter);
+        }
+
+    }
+
+    static boolean isSetter(Method m) {
+        return !Modifier.isStatic(m.getModifiers()) && m.getName().startsWith("set") && m.getName().length() > "set".length()
+                && m.getParameterCount() == 1;
+    }
+
+    @Override
+    ValueSetter getValueSetter(String propName) {
+        return properties.get(propName);
+    }
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryPropertySetter.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryPropertySetter.java
new file mode 100644
index 0000000000000..070d32e46bfae
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryPropertySetter.java
@@ -0,0 +1,10 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.util.List;
+import java.util.Map;
+
+interface QueryPropertySetter {
+    Object create();
+
+    void setValue(Object target, String name, String value, Map<String, List<Object>> paramToObject);
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryReader.java
new file mode 100644
index 0000000000000..62d135a8ed4aa
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QueryReader.java
@@ -0,0 +1,8 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.util.Iterator;
+import java.util.Map;
+
+public interface QueryReader<T> {
+    T readValue(Iterator<Map.Entry<String, String>> params);
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QuerySetReader.java b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QuerySetReader.java
new file mode 100644
index 0000000000000..7f28ab2bc3a66
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/java/io/quarkus/funqy/runtime/query/QuerySetReader.java
@@ -0,0 +1,21 @@
+package io.quarkus.funqy.runtime.query;
+
+import java.lang.reflect.Type;
+import java.util.HashSet;
+
+/**
+ * Value can be any primitive, primitive object, string, or bean style class
+ *
+ */
+class QuerySetReader extends BaseCollectionReader {
+
+    public QuerySetReader(Type genericType, QueryObjectMapper mapper) {
+        super(genericType, mapper);
+    }
+
+    @Override
+    public Object create() {
+        return new HashSet<>();
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/funqy/funqy-server-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..b93ae46bcb67b
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,4 @@
+---
+name: "Funqy Server Common"
+metadata:
+  unlisted: true
diff --git a/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/Nested.java b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/Nested.java
new file mode 100644
index 0000000000000..cd9ced011ac8a
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/Nested.java
@@ -0,0 +1,22 @@
+package io.quarkus.funqy.test;
+
+public class Nested {
+    private Simple nestedOne;
+    private Simple nestedTwo;
+
+    public Simple getNestedOne() {
+        return nestedOne;
+    }
+
+    public void setNestedOne(Simple nestedOne) {
+        this.nestedOne = nestedOne;
+    }
+
+    public Simple getNestedTwo() {
+        return nestedTwo;
+    }
+
+    public void setNestedTwo(Simple nestedTwo) {
+        this.nestedTwo = nestedTwo;
+    }
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/NestedCollection.java b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/NestedCollection.java
new file mode 100644
index 0000000000000..bcba6a495e0b4
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/NestedCollection.java
@@ -0,0 +1,71 @@
+package io.quarkus.funqy.test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class NestedCollection {
+    private Map<String, Integer> intMap;
+    private Map<Integer, String> intKeyMap;
+    private Map<String, Simple> simpleMap;
+    private List<String> stringList;
+    private List<Simple> simpleList;
+    private Set<Integer> intSet;
+    private Set<Simple> simpleSet;
+
+    public Set<Integer> getIntSet() {
+        return intSet;
+    }
+
+    public void setIntSet(Set<Integer> intSet) {
+        this.intSet = intSet;
+    }
+
+    public Set<Simple> getSimpleSet() {
+        return simpleSet;
+    }
+
+    public void setSimpleSet(Set<Simple> simpleSet) {
+        this.simpleSet = simpleSet;
+    }
+
+    public Map<Integer, String> getIntKeyMap() {
+        return intKeyMap;
+    }
+
+    public void setIntKeyMap(Map<Integer, String> intKeyMap) {
+        this.intKeyMap = intKeyMap;
+    }
+
+    public Map<String, Integer> getIntMap() {
+        return intMap;
+    }
+
+    public void setIntMap(Map<String, Integer> intMap) {
+        this.intMap = intMap;
+    }
+
+    public Map<String, Simple> getSimpleMap() {
+        return simpleMap;
+    }
+
+    public void setSimpleMap(Map<String, Simple> simpleMap) {
+        this.simpleMap = simpleMap;
+    }
+
+    public List<String> getStringList() {
+        return stringList;
+    }
+
+    public void setStringList(List<String> stringList) {
+        this.stringList = stringList;
+    }
+
+    public List<Simple> getSimpleList() {
+        return simpleList;
+    }
+
+    public void setSimpleList(List<Simple> simpleList) {
+        this.simpleList = simpleList;
+    }
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java
new file mode 100644
index 0000000000000..3169e1f002fec
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/QueryReaderTest.java
@@ -0,0 +1,195 @@
+package io.quarkus.funqy.test;
+
+import java.time.Month;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.funqy.runtime.query.QueryObjectMapper;
+import io.quarkus.funqy.runtime.query.QueryReader;
+
+public class QueryReaderTest {
+
+    @Test
+    public void testSimple() throws Exception {
+        QueryObjectMapper mapper = new QueryObjectMapper();
+        QueryReader<Simple> reader = mapper.readerFor(Simple.class);
+        Map<String, String> params = new HashMap<>();
+        params.put("time", "2020-07-29T10:15:30+01:00");
+        params.put("intVal", "42");
+        params.put("shortVal", "4");
+        params.put("longVal", "442");
+        params.put("doubleVal", "4.2");
+        params.put("floatVal", "4.2");
+        params.put("b", "1");
+        params.put("boolVal", "true");
+        params.put("value", "hello");
+
+        Simple simple = reader.readValue(params.entrySet().iterator());
+
+        Assertions.assertEquals(42, simple.getIntVal());
+        Assertions.assertEquals(4, simple.getShortVal());
+        Assertions.assertEquals(442, simple.getLongVal());
+        Assertions.assertTrue(simple.getDoubleVal() <= 4.2 && simple.getDoubleVal() > 4.1);
+        Assertions.assertTrue(simple.getFloatVal() <= 4.2 && simple.getFloatVal() > 4.1);
+        Assertions.assertEquals(1, simple.getB());
+        Assertions.assertEquals(true, simple.isBoolVal());
+        Assertions.assertEquals("hello", simple.getValue());
+        Assertions.assertEquals(Month.JULY, simple.getTime().getMonth());
+        Assertions.assertEquals(29, simple.getTime().getDayOfMonth());
+    }
+
+    @Test
+    public void testNested() throws Exception {
+        QueryObjectMapper mapper = new QueryObjectMapper();
+        QueryReader<Nested> reader = mapper.readerFor(Nested.class);
+        Map<String, String> params = new HashMap<>();
+        params.put("nestedOne.intVal", "42");
+        params.put("nestedOne.shortVal", "4");
+        params.put("nestedOne.longVal", "442");
+        params.put("nestedOne.doubleVal", "4.2");
+        params.put("nestedOne.floatVal", "4.2");
+        params.put("nestedOne.b", "1");
+        params.put("nestedOne.boolVal", "true");
+        params.put("nestedOne.value", "hello");
+
+        params.put("nestedTwo.intVal", "32");
+        params.put("nestedTwo.shortVal", "3");
+        params.put("nestedTwo.longVal", "332");
+        params.put("nestedTwo.doubleVal", "3.2");
+        params.put("nestedTwo.floatVal", "3.2");
+        params.put("nestedTwo.b", "2");
+        params.put("nestedTwo.boolVal", "true");
+        params.put("nestedTwo.value", "world");
+
+        Nested nested = reader.readValue(params.entrySet().iterator());
+
+        Assertions.assertEquals(42, nested.getNestedOne().getIntVal());
+        Assertions.assertEquals(4, nested.getNestedOne().getShortVal());
+        Assertions.assertEquals(442, nested.getNestedOne().getLongVal());
+        Assertions.assertTrue(nested.getNestedOne().getDoubleVal() <= 4.3 && nested.getNestedOne().getDoubleVal() > 4.1);
+        Assertions.assertTrue(nested.getNestedOne().getFloatVal() <= 4.3 && nested.getNestedOne().getFloatVal() > 4.1);
+        Assertions.assertEquals(1, nested.getNestedOne().getB());
+        Assertions.assertEquals(true, nested.getNestedOne().isBoolVal());
+        Assertions.assertEquals("hello", nested.getNestedOne().getValue());
+
+        Assertions.assertEquals(32, nested.getNestedTwo().getIntVal());
+        Assertions.assertEquals(3, nested.getNestedTwo().getShortVal());
+        Assertions.assertEquals(332, nested.getNestedTwo().getLongVal());
+        Assertions.assertTrue(nested.getNestedTwo().getDoubleVal() <= 3.3 && nested.getNestedTwo().getDoubleVal() > 3.1);
+        Assertions.assertTrue(nested.getNestedTwo().getFloatVal() <= 3.3 && nested.getNestedTwo().getFloatVal() > 3.1);
+        Assertions.assertEquals(2, nested.getNestedTwo().getB());
+        Assertions.assertEquals(true, nested.getNestedTwo().isBoolVal());
+        Assertions.assertEquals("world", nested.getNestedTwo().getValue());
+    }
+
+    @Test
+    public void testDirectMap() {
+        QueryObjectMapper mapper = new QueryObjectMapper();
+        QueryReader reader = mapper.readerFor(Map.class);
+        Map<String, String> params = new HashMap<>();
+
+        params.put("val", "42");
+
+        Map<String, String> map = (Map<String, String>) reader.readValue(params.entrySet().iterator());
+
+        Assertions.assertEquals("42", map.get("val"));
+
+    }
+
+    @Test
+    public void testNestedCollections() {
+        QueryObjectMapper mapper = new QueryObjectMapper();
+        QueryReader<NestedCollection> reader = mapper.readerFor(NestedCollection.class);
+        List<Map.Entry<String, String>> params = new LinkedList<>();
+
+        params.add(entry("intMap.one", "1"));
+        params.add(entry("intMap.two", "2"));
+        params.add(entry("intKeyMap.1", "one"));
+        params.add(entry("intKeyMap.2", "two"));
+        params.add(entry("stringList", "one"));
+        params.add(entry("stringList", "two"));
+        params.add(entry("intSet", "1"));
+        params.add(entry("intSet", "2"));
+        params.add(entry("simpleMap.one.value", "one"));
+        params.add(entry("simpleMap.two.value", "two"));
+        params.add(entry("simpleList.one.value", "one"));
+        params.add(entry("simpleList.one.intVal", "1"));
+        params.add(entry("simpleList.two.value", "two"));
+        params.add(entry("simpleList.two.intVal", "2"));
+        params.add(entry("simpleSet.one.value", "one"));
+        params.add(entry("simpleSet.one.intVal", "1"));
+        params.add(entry("simpleSet.two.value", "two"));
+        params.add(entry("simpleSet.two.intVal", "2"));
+        params.add(entry("time", "2020-07-29T10:15:30+01:00"));
+
+        NestedCollection nested = reader.readValue(params.iterator());
+
+        Assertions.assertEquals(1, nested.getIntMap().get("one"));
+        Assertions.assertEquals(2, nested.getIntMap().get("two"));
+        Assertions.assertEquals("one", nested.getIntKeyMap().get(1));
+        Assertions.assertEquals("two", nested.getIntKeyMap().get(2));
+        Assertions.assertEquals("one", nested.getSimpleMap().get("one").getValue());
+        Assertions.assertEquals("two", nested.getSimpleMap().get("two").getValue());
+        Assertions.assertTrue(nested.getStringList().contains("one"));
+        Assertions.assertTrue(nested.getStringList().contains("two"));
+        Assertions.assertTrue(nested.getIntSet().contains(1));
+        Assertions.assertTrue(nested.getIntSet().contains(2));
+
+        Assertions.assertNotNull(nested.getSimpleList());
+        Assertions.assertEquals(2, nested.getSimpleList().size());
+        Assertions.assertEquals(1, nested.getSimpleList().get(0).getIntVal());
+        Assertions.assertEquals("one", nested.getSimpleList().get(0).getValue());
+        Assertions.assertEquals(2, nested.getSimpleList().get(1).getIntVal());
+        Assertions.assertEquals("two", nested.getSimpleList().get(1).getValue());
+
+        Assertions.assertNotNull(nested.getSimpleSet());
+        Assertions.assertEquals(2, nested.getSimpleSet().size());
+        boolean hasOne = false;
+        boolean hasTwo = false;
+        for (Simple simple : nested.getSimpleSet()) {
+            if (simple.getIntVal() == 1) {
+                hasOne = true;
+                Assertions.assertEquals("one", simple.getValue());
+            }
+            if (simple.getIntVal() == 2) {
+                hasTwo = true;
+                Assertions.assertEquals("two", simple.getValue());
+            }
+
+        }
+        Assertions.assertTrue(hasOne);
+        Assertions.assertTrue(hasTwo);
+
+    }
+
+    @Test
+    public void testRecursiveType() {
+        QueryObjectMapper mapper = new QueryObjectMapper();
+        QueryReader<RecursiveType> reader = mapper.readerFor(RecursiveType.class);
+    }
+
+    static Map.Entry<String, String> entry(String key, String value) {
+        return new Map.Entry() {
+            @Override
+            public Object getKey() {
+                return key;
+            }
+
+            @Override
+            public Object getValue() {
+                return value;
+            }
+
+            @Override
+            public Object setValue(Object o) {
+                throw new RuntimeException();
+            }
+        };
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/RecursiveType.java b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/RecursiveType.java
new file mode 100644
index 0000000000000..297c413d255c1
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/RecursiveType.java
@@ -0,0 +1,34 @@
+package io.quarkus.funqy.test;
+
+import java.util.List;
+
+public class RecursiveType {
+    private int value;
+    private RecursiveType parent;
+    private List<RecursiveType> children;
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public RecursiveType getParent() {
+        return parent;
+    }
+
+    public void setParent(RecursiveType parent) {
+        this.parent = parent;
+    }
+
+    public List<RecursiveType> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<RecursiveType> children) {
+        this.children = children;
+    }
+
+}
diff --git a/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/Simple.java b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/Simple.java
new file mode 100644
index 0000000000000..a0d77977a403f
--- /dev/null
+++ b/extensions/funqy/funqy-server-common/runtime/src/test/java/io/quarkus/funqy/test/Simple.java
@@ -0,0 +1,87 @@
+package io.quarkus.funqy.test;
+
+import java.time.OffsetDateTime;
+
+public class Simple {
+    private String value;
+    private int intVal;
+    private short shortVal;
+    private long longVal;
+    private byte b;
+    private float floatVal;
+    private double doubleVal;
+    private boolean boolVal;
+    private OffsetDateTime time;
+
+    public OffsetDateTime getTime() {
+        return time;
+    }
+
+    public void setTime(OffsetDateTime time) {
+        this.time = time;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public int getIntVal() {
+        return intVal;
+    }
+
+    public void setIntVal(int intVal) {
+        this.intVal = intVal;
+    }
+
+    public short getShortVal() {
+        return shortVal;
+    }
+
+    public void setShortVal(short shortVal) {
+        this.shortVal = shortVal;
+    }
+
+    public long getLongVal() {
+        return longVal;
+    }
+
+    public void setLongVal(long longVal) {
+        this.longVal = longVal;
+    }
+
+    public byte getB() {
+        return b;
+    }
+
+    public void setB(byte b) {
+        this.b = b;
+    }
+
+    public float getFloatVal() {
+        return floatVal;
+    }
+
+    public void setFloatVal(float floatVal) {
+        this.floatVal = floatVal;
+    }
+
+    public double getDoubleVal() {
+        return doubleVal;
+    }
+
+    public void setDoubleVal(double doubleVal) {
+        this.doubleVal = doubleVal;
+    }
+
+    public boolean isBoolVal() {
+        return boolVal;
+    }
+
+    public void setBoolVal(boolean boolVal) {
+        this.boolVal = boolVal;
+    }
+}
diff --git a/extensions/funqy/pom.xml b/extensions/funqy/pom.xml
index 03c07028e2872..0c578b71fcf89 100644
--- a/extensions/funqy/pom.xml
+++ b/extensions/funqy/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/google-cloud-functions-http/deployment/pom.xml b/extensions/google-cloud-functions-http/deployment/pom.xml
index b434890a393a6..4af62db26e4b9 100644
--- a/extensions/google-cloud-functions-http/deployment/pom.xml
+++ b/extensions/google-cloud-functions-http/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-google-cloud-functions-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,10 +21,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-http-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/google-cloud-functions-http/deployment/src/main/java/io/quarkus/gcp/functions/http/deployment/CloudFunctionsDeploymentBuildStep.java b/extensions/google-cloud-functions-http/deployment/src/main/java/io/quarkus/gcp/functions/http/deployment/CloudFunctionsDeploymentBuildStep.java
index 125ae2c29e7ea..2c28c2cdc3a39 100644
--- a/extensions/google-cloud-functions-http/deployment/src/main/java/io/quarkus/gcp/functions/http/deployment/CloudFunctionsDeploymentBuildStep.java
+++ b/extensions/google-cloud-functions-http/deployment/src/main/java/io/quarkus/gcp/functions/http/deployment/CloudFunctionsDeploymentBuildStep.java
@@ -30,7 +30,7 @@ public ArtifactResultBuildItem functionDeployment(OutputTargetBuildItem target,
             throws BuildException, IOException {
         if (!jar.isUberJar()) {
             throw new BuildException("Google Cloud Function deployment need to use a uberjar, " +
-                    "please set 'quarkus.package.uber-jar=true' inside your application.properties",
+                    "please set 'quarkus.package.type=uber-jar' inside your application.properties",
                     Collections.EMPTY_LIST);
         }
 
diff --git a/extensions/google-cloud-functions-http/pom.xml b/extensions/google-cloud-functions-http/pom.xml
index 6582abe9471a5..dea5d9f83d99a 100644
--- a/extensions/google-cloud-functions-http/pom.xml
+++ b/extensions/google-cloud-functions-http/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/google-cloud-functions-http/runtime/pom.xml b/extensions/google-cloud-functions-http/runtime/pom.xml
index 58ad771204138..afaf187dcc707 100644
--- a/extensions/google-cloud-functions-http/runtime/pom.xml
+++ b/extensions/google-cloud-functions-http/runtime/pom.xml
@@ -6,13 +6,12 @@
         <artifactId>quarkus-google-cloud-functions-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-google-cloud-functions-http</artifactId>
     <name>Quarkus - HTTP Google Cloud Functions - Runtime</name>
-    <description>Write Google Cloud functions</description>
+    <description>Write Google Cloud functions with HTTP endpoints</description>
 
     <dependencies>
         <dependency>
@@ -26,6 +25,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.cloud.functions</groupId>
diff --git a/extensions/google-cloud-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/google-cloud-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 9c86ef89856be..977d107cd6f2e 100644
--- a/extensions/google-cloud-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/google-cloud-functions-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Google Cloud Functions HTTP"
 metadata:
   keywords:
@@ -11,3 +10,8 @@ metadata:
   - "cloud"
   guide: "https://quarkus.io/guides/gcp-functions-http"
   status: "experimental"
+  codestart:
+    name: "google-cloud-functions-http"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/google-cloud-functions/deployment/pom.xml b/extensions/google-cloud-functions/deployment/pom.xml
index b8b10f42523bb..750177b130f89 100755
--- a/extensions/google-cloud-functions/deployment/pom.xml
+++ b/extensions/google-cloud-functions/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-google-cloud-functions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/CloudFunctionDeploymentBuildStep.java b/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/CloudFunctionDeploymentBuildStep.java
index 1e44ab89b4395..33a6a141652b9 100644
--- a/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/CloudFunctionDeploymentBuildStep.java
+++ b/extensions/google-cloud-functions/deployment/src/main/java/io/quarkus/gcp/functions/deployment/CloudFunctionDeploymentBuildStep.java
@@ -7,12 +7,14 @@
 
 import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.JarBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.UberJarRequiredBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeBuild;
+import io.quarkus.deployment.pkg.steps.NativeSourcesBuild;
 
 public class CloudFunctionDeploymentBuildStep {
     @BuildStep
@@ -21,6 +23,12 @@ public UberJarRequiredBuildItem forceUberJar() {
         return new UberJarRequiredBuildItem();
     }
 
+    @BuildStep(onlyIf = NativeSourcesBuild.class)
+    void failForNativeSources(BuildProducer<ArtifactResultBuildItem> artifactResultProducer) {
+        throw new IllegalArgumentException(
+                "The Google Cloud extensions are incompatible with the 'native-sources' package type.");
+    }
+
     /**
      * Creates a target/deployment dir and copy the uber jar in it.
      * This facilitates the usage of the 'glcoud' command.
@@ -30,7 +38,7 @@ public ArtifactResultBuildItem functionDeployment(OutputTargetBuildItem target,
             throws BuildException, IOException {
         if (!jar.isUberJar()) {
             throw new BuildException("Google Cloud Function deployment need to use a uberjar, " +
-                    "please set 'quarkus.package.uber-jar=true' inside your application.properties",
+                    "please set 'quarkus.package.type=uber-jar' inside your application.properties",
                     Collections.EMPTY_LIST);
         }
 
diff --git a/extensions/google-cloud-functions/pom.xml b/extensions/google-cloud-functions/pom.xml
index 6450e0a794c97..c3f3895d66613 100755
--- a/extensions/google-cloud-functions/pom.xml
+++ b/extensions/google-cloud-functions/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusBackgroundFunction.java b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusBackgroundFunction.java
index ff19cc3bd449c..e0c31dfd72951 100644
--- a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusBackgroundFunction.java
+++ b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusBackgroundFunction.java
@@ -55,7 +55,7 @@ public final class QuarkusBackgroundFunction implements RawBackgroundFunction {
     static void setDelegates(String selectedDelegate, String selectedRawDelegate) {
         if (selectedDelegate != null) {
             try {
-                Class<?> clazz = Class.forName(selectedDelegate);
+                Class<?> clazz = Class.forName(selectedDelegate, false, Thread.currentThread().getContextClassLoader());
                 for (Method method : clazz.getDeclaredMethods()) {
                     if (method.getName().equals("accept")) {
                         // the first parameter of the accept method is the event, we need to register it's type to
@@ -73,7 +73,7 @@ static void setDelegates(String selectedDelegate, String selectedRawDelegate) {
 
         if (selectedRawDelegate != null) {
             try {
-                Class<?> clazz = Class.forName(selectedRawDelegate);
+                Class<?> clazz = Class.forName(selectedRawDelegate, false, Thread.currentThread().getContextClassLoader());
                 rawDelegate = (RawBackgroundFunction) Arc.container().instance(clazz).get();
             } catch (ClassNotFoundException e) {
                 throw new RuntimeException(e);
diff --git a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java
index 1f90baebb1e4d..0c81c526f6e31 100755
--- a/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java
+++ b/extensions/google-cloud-functions/runtime/src/main/java/io/quarkus/gcp/functions/QuarkusHttpFunction.java
@@ -50,7 +50,7 @@ public final class QuarkusHttpFunction implements HttpFunction {
     static void setDelegate(String selectedDelegate) {
         if (selectedDelegate != null) {
             try {
-                Class<?> clazz = Class.forName(selectedDelegate);
+                Class<?> clazz = Class.forName(selectedDelegate, false, Thread.currentThread().getContextClassLoader());
                 delegate = (HttpFunction) Arc.container().instance(clazz).get();
             } catch (ClassNotFoundException e) {
                 throw new RuntimeException(e);
diff --git a/extensions/google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index da5df5ba35c49..1f487b0e0caae 100755
--- a/extensions/google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/google-cloud-functions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Google Cloud Functions"
 metadata:
   keywords:
@@ -10,3 +9,8 @@ metadata:
   - "cloud"
   guide: "https://quarkus.io/guides/gcp-functions"
   status: "experimental"
+  codestart:
+    name: "google-cloud-functions"
+    kind: "singleton-example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/grpc-common/deployment/pom.xml b/extensions/grpc-common/deployment/pom.xml
new file mode 100644
index 0000000000000..801044c4f2937
--- /dev/null
+++ b/extensions/grpc-common/deployment/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-grpc-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-grpc-common-deployment</artifactId>
+    <name>Quarkus - gRPC Common - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-deployment</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcCommonProcessor.java b/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcCommonProcessor.java
new file mode 100644
index 0000000000000..ebff9fee02754
--- /dev/null
+++ b/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcCommonProcessor.java
@@ -0,0 +1,65 @@
+package io.quarkus.grpc.common.deployment;
+
+import java.util.Collection;
+
+import org.jboss.jandex.ClassInfo;
+
+import io.grpc.internal.DnsNameResolverProvider;
+import io.grpc.internal.PickFirstLoadBalancerProvider;
+import io.grpc.netty.NettyChannelProvider;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+
+public class GrpcCommonProcessor {
+
+    @BuildStep
+    public void configureNativeExecutable(CombinedIndexBuildItem combinedIndex,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+
+        // we force the usage of the reflection invoker.
+        Collection<ClassInfo> messages = combinedIndex.getIndex()
+                .getAllKnownSubclasses(GrpcDotNames.GENERATED_MESSAGE_V3);
+        for (ClassInfo message : messages) {
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true, message.name().toString()));
+        }
+        Collection<ClassInfo> builders = combinedIndex.getIndex().getAllKnownSubclasses(GrpcDotNames.MESSAGE_BUILDER);
+        for (ClassInfo builder : builders) {
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true, builder.name().toString()));
+        }
+
+        Collection<ClassInfo> lbs = combinedIndex.getIndex().getAllKnownSubclasses(GrpcDotNames.LOAD_BALANCER_PROVIDER);
+        for (ClassInfo lb : lbs) {
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, lb.name().toString()));
+        }
+
+        Collection<ClassInfo> nrs = combinedIndex.getIndex().getAllKnownSubclasses(GrpcDotNames.NAME_RESOLVER_PROVIDER);
+        for (ClassInfo nr : nrs) {
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, nr.name().toString()));
+        }
+
+        // Built-In providers:
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, DnsNameResolverProvider.class));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, PickFirstLoadBalancerProvider.class));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false,
+                "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider"));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, NettyChannelProvider.class));
+    }
+
+    @BuildStep
+    NativeImageConfigBuildItem nativeImageConfiguration() {
+        NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder()
+                .addRuntimeInitializedClass("io.grpc.netty.Utils$ByteBufAllocatorPreferDirectHolder")
+                .addRuntimeInitializedClass("io.grpc.netty.Utils$ByteBufAllocatorPreferHeapHolder")
+                // substitutions are runtime-only, Utils have to be substituted until we cannot use EPoll
+                // in native. NettyServerBuilder and NettyChannelBuilder would "bring in" Utils in build time
+                // if they were not marked as runtime initialized:
+                .addRuntimeInitializedClass("io.grpc.netty.Utils")
+                .addRuntimeInitializedClass("io.grpc.netty.NettyServerBuilder")
+                .addRuntimeInitializedClass("io.grpc.netty.NettyChannelBuilder");
+        return builder.build();
+    }
+
+}
diff --git a/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcDotNames.java b/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcDotNames.java
new file mode 100644
index 0000000000000..12e5ca80aafec
--- /dev/null
+++ b/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcDotNames.java
@@ -0,0 +1,15 @@
+package io.quarkus.grpc.common.deployment;
+
+import org.jboss.jandex.DotName;
+
+import com.google.protobuf.GeneratedMessageV3;
+
+import io.grpc.LoadBalancerProvider;
+import io.grpc.NameResolverProvider;
+
+public class GrpcDotNames {
+    static final DotName MESSAGE_BUILDER = DotName.createSimple(GeneratedMessageV3.Builder.class.getName());
+    static final DotName GENERATED_MESSAGE_V3 = DotName.createSimple(GeneratedMessageV3.class.getName());
+    static final DotName NAME_RESOLVER_PROVIDER = DotName.createSimple(NameResolverProvider.class.getName());
+    static final DotName LOAD_BALANCER_PROVIDER = DotName.createSimple(LoadBalancerProvider.class.getName());
+}
diff --git a/extensions/grpc-common/pom.xml b/extensions/grpc-common/pom.xml
new file mode 100644
index 0000000000000..eb4f6ebc3e505
--- /dev/null
+++ b/extensions/grpc-common/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-grpc-common-parent</artifactId>
+    <name>Quarkus - gRPC Common</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/extensions/grpc-common/runtime/pom.xml b/extensions/grpc-common/runtime/pom.xml
new file mode 100644
index 0000000000000..d66663f38f12a
--- /dev/null
+++ b/extensions/grpc-common/runtime/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-grpc-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-grpc-common</artifactId>
+    <name>Quarkus - gRPC Common - Runtime</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-grpc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.android</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-extension-descriptor</id>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/runtime/graal/GrpcNettySubstitutions.java b/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/runtime/graal/GrpcNettySubstitutions.java
new file mode 100644
index 0000000000000..4bd57480ce5a2
--- /dev/null
+++ b/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/runtime/graal/GrpcNettySubstitutions.java
@@ -0,0 +1,74 @@
+package io.quarkus.grpc.common.runtime.graal;
+
+import java.security.Provider;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslProvider;
+
+@TargetClass(className = "io.grpc.netty.ProtocolNegotiators")
+final class Target_io_grpc_netty_ProtocolNegotiators {
+
+    @Substitute
+    static void logSslEngineDetails(Level level, ChannelHandlerContext ctx, String msg, Throwable t) {
+        Logger log = Logger.getLogger("io.grpc.netty.ProtocolNegotiators");
+        if (log.isLoggable(level)) {
+            log.log(level, msg + "\nNo SSLEngine details available!", t);
+        }
+    }
+}
+
+@TargetClass(className = "io.grpc.netty.GrpcSslContexts")
+final class Target_io_grpc_netty_GrpcSslContexts {
+
+    @Substitute
+    public static SslContextBuilder configure(SslContextBuilder builder, SslProvider provider) {
+        switch (provider) {
+            case JDK: {
+                Provider jdkProvider = findJdkProvider();
+                if (jdkProvider == null) {
+                    throw new IllegalArgumentException(
+                            "Could not find Jetty NPN/ALPN or Conscrypt as installed JDK providers");
+                }
+                return configure(builder, jdkProvider);
+            }
+            default:
+                throw new IllegalArgumentException("Unsupported provider: " + provider);
+        }
+    }
+
+    @Alias
+    private static Provider findJdkProvider() {
+        return null;
+    }
+
+    @Alias
+    public static SslContextBuilder configure(SslContextBuilder builder, Provider jdkProvider) {
+        return null;
+    }
+
+}
+
+@TargetClass(className = "io.grpc.netty.Utils")
+final class Target_io_grpc_netty_Utils {
+
+    @Substitute
+    static boolean isEpollAvailable() {
+        return false;
+    }
+
+    @Substitute
+    private static Throwable getEpollUnavailabilityCause() {
+        return null;
+    }
+}
+
+@SuppressWarnings("unused")
+class GrpcNettySubstitutions {
+}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/graal/GrpcSubstitutions.java b/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/runtime/graal/GrpcSubstitutions.java
similarity index 97%
rename from extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/graal/GrpcSubstitutions.java
rename to extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/runtime/graal/GrpcSubstitutions.java
index 5d8faa629d379..cc41a3a9ac477 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/graal/GrpcSubstitutions.java
+++ b/extensions/grpc-common/runtime/src/main/java/io/quarkus/grpc/common/runtime/graal/GrpcSubstitutions.java
@@ -1,4 +1,4 @@
-package io.quarkus.grpc.runtime.graal;
+package io.quarkus.grpc.common.runtime.graal;
 
 import static io.grpc.InternalServiceProviders.getCandidatesViaHardCoded;
 
diff --git a/extensions/grpc-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/grpc-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..fd36e68616d82
--- /dev/null
+++ b/extensions/grpc-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,11 @@
+---
+name: "gRPC Common"
+metadata:
+  keywords:
+    - "gRPC"
+  categories:
+    - "web"
+    - "serialization"
+    - "reactive"
+  status: "experimental"
+  unlisted: "true"
diff --git a/extensions/grpc/codegen/pom.xml b/extensions/grpc/codegen/pom.xml
index 74e06a25f5f6b..fb5f22ae1ab63 100644
--- a/extensions/grpc/codegen/pom.xml
+++ b/extensions/grpc/codegen/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-grpc-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-grpc-codegen</artifactId>
@@ -103,17 +102,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java b/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java
index dcdc158210bfb..3e83504fe61fa 100644
--- a/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java
+++ b/extensions/grpc/codegen/src/main/java/io/quarkus/grpc/deployment/GrpcCodeGen.java
@@ -2,16 +2,29 @@
 
 import static java.lang.Boolean.TRUE;
 import static java.util.Arrays.asList;
+import static org.codehaus.plexus.util.FileUtils.copyStreamToFile;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import org.codehaus.plexus.util.io.RawInputStreamFacade;
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.model.AppArtifact;
@@ -21,13 +34,23 @@
 import io.quarkus.bootstrap.prebuild.CodeGenFailureException;
 import io.quarkus.deployment.CodeGenContext;
 import io.quarkus.deployment.CodeGenProvider;
+import io.quarkus.deployment.util.ProcessUtil;
+import io.quarkus.runtime.util.HashUtil;
 import io.quarkus.utilities.JavaBinFinder;
 import io.quarkus.utilities.OS;
 
+/**
+ * Code generation for gRPC. Generates java classes from proto files placed in either src/main/proto or src/test/proto
+ * Inspired by <a href="https://github.com/xolstice/protobuf-maven-plugin">Protobuf Maven Plugin</a>
+ */
 public class GrpcCodeGen implements CodeGenProvider {
     private static final Logger log = Logger.getLogger(GrpcCodeGen.class);
 
     private static final String quarkusProtocPluginMain = "io.quarkus.grpc.protoc.plugin.MutinyGrpcGenerator";
+    private static final String EXE = "exe";
+    private static final String PROTO = ".proto";
+    private static final String PROTOC = "protoc";
+    private static final String PROTOC_GROUPID = "com.google.protobuf";
 
     private Executables executables;
 
@@ -58,35 +81,42 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
 
         try {
             if (Files.isDirectory(protoDir)) {
-                List<String> protoFiles = Files.walk(protoDir)
-                        .filter(Files::isRegularFile)
-                        .filter(path -> path.toString().endsWith(".proto"))
-                        .map(Path::toString)
-                        .map(this::escapeWhitespace)
-                        .collect(Collectors.toList());
-                if (!protoFiles.isEmpty()) {
-                    initExecutables(workDir, context.appModel());
-
-                    List<String> command = new ArrayList<>();
-                    command.addAll(asList(executables.protoc.toString(),
-                            "-I=" + escapeWhitespace(protoDir.toString()),
-                            "--plugin=protoc-gen-grpc=" + executables.grpc,
-                            "--plugin=protoc-gen-q-grpc=" + executables.quarkusGrpc,
-                            "--q-grpc_out=" + outDir,
-                            "--grpc_out=" + outDir,
-                            "--java_out=" + outDir));
-                    command.addAll(protoFiles);
-
-                    Process process = new ProcessBuilder()
-                            .command(command)
-                            .inheritIO()
-                            .start();
-                    int resultCode = process.waitFor();
-                    if (resultCode != 0) {
-                        throw new CodeGenException("Failed to generate Java classes from proto files: " + protoFiles +
-                                " to " + outDir.toAbsolutePath().toString());
+                try (Stream<Path> protoFilesPaths = Files.walk(protoDir)) {
+                    List<String> protoFiles = protoFilesPaths
+                            .filter(Files::isRegularFile)
+                            .map(Path::toString)
+                            .filter(s -> s.endsWith(PROTO))
+                            .map(this::escapeWhitespace)
+                            .collect(Collectors.toList());
+                    if (!protoFiles.isEmpty()) {
+                        initExecutables(workDir, context.appModel());
+
+                        Collection<String> protosToImport = gatherImports(workDir.resolve("protoc-dependencies"), context);
+
+                        List<String> command = new ArrayList<>();
+                        command.add(executables.protoc.toString());
+                        for (String protoImportDir : protosToImport) {
+                            command.add(String.format("-I=%s", escapeWhitespace(protoImportDir)));
+                        }
+
+                        command.addAll(asList("-I=" + escapeWhitespace(protoDir.toString()),
+                                "--plugin=protoc-gen-grpc=" + executables.grpc,
+                                "--plugin=protoc-gen-q-grpc=" + executables.quarkusGrpc,
+                                "--q-grpc_out=" + outDir,
+                                "--grpc_out=" + outDir,
+                                "--java_out=" + outDir));
+                        command.addAll(protoFiles);
+
+                        ProcessBuilder processBuilder = new ProcessBuilder(command);
+
+                        final Process process = ProcessUtil.launchProcess(processBuilder, context.shouldRedirectIO());
+                        int resultCode = process.waitFor();
+                        if (resultCode != 0) {
+                            throw new CodeGenException("Failed to generate Java classes from proto files: " + protoFiles +
+                                    " to " + outDir.toAbsolutePath().toString());
+                        }
+                        return true;
                     }
-                    return true;
                 }
             }
         } catch (IOException | InterruptedException e) {
@@ -95,9 +125,71 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
         return false;
     }
 
+    private Collection<String> gatherImports(Path workDir, CodeGenContext context) throws CodeGenException {
+        Map<String, String> properties = context.properties();
+
+        String scanForImports = properties.getOrDefault("quarkus.generate-code.grpc.scan-for-imports",
+                "com.google.protobuf:protobuf-java");
+
+        if ("none".equals(scanForImports.toLowerCase(Locale.getDefault()))) {
+            return Collections.emptyList();
+        }
+
+        boolean scanAll = "all".equals(scanForImports.toLowerCase(Locale.getDefault()));
+        List<String> dependenciesToScan = Arrays.asList(scanForImports.split(","));
+
+        Set<String> importDirectories = new HashSet<>();
+        AppModel appModel = context.appModel();
+        for (AppDependency dependency : appModel.getUserDependencies()) {
+            AppArtifact artifact = dependency.getArtifact();
+            if (scanAll
+                    || dependenciesToScan.contains(String.format("%s:%s", artifact.getGroupId(), artifact.getArtifactId()))) {
+                for (Path path : artifact.getPaths()) {
+                    Path jarName = path.getFileName();
+                    if (jarName.toString().endsWith(".jar")) {
+                        final JarFile jar;
+                        try {
+                            jar = new JarFile(path.toFile());
+                        } catch (final IOException e) {
+                            throw new CodeGenException("Failed to read Jar: " + path.normalize().toAbsolutePath(), e);
+                        }
+
+                        for (JarEntry jarEntry : jar.stream().collect(Collectors.toList())) {
+                            String jarEntryName = jarEntry.getName();
+                            if (jarEntryName.endsWith(PROTO)) {
+                                Path protoUnzipDir = workDir.resolve(HashUtil.sha1(jar.getName())).normalize().toAbsolutePath();
+                                try {
+                                    Files.createDirectories(protoUnzipDir);
+                                    importDirectories.add(protoUnzipDir.toString());
+                                } catch (IOException e) {
+                                    throw new CodeGenException(
+                                            "Failed to create directory: " + protoUnzipDir, e);
+                                }
+                                // checking for https://snyk.io/research/zip-slip-vulnerability
+                                Path unzippedProto = protoUnzipDir.resolve(jarEntryName);
+                                if (!unzippedProto.normalize().toAbsolutePath().startsWith(workDir.toAbsolutePath())) {
+                                    throw new CodeGenException("Attempted to unzip " + jarEntryName
+                                            + " to a location outside the working directory");
+                                }
+                                try {
+                                    copyStreamToFile(new RawInputStreamFacade(jar.getInputStream(jarEntry)),
+                                            unzippedProto.toFile());
+                                } catch (IOException e) {
+                                    throw new CodeGenException("Failed to create input stream for reading " + jarEntryName
+                                            + " from " + jar.getName(), e);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return importDirectories;
+    }
+
     private String escapeWhitespace(String path) {
         if (OS.determineOS() == OS.LINUX) {
-            return path.replaceAll(" ", "\\ ");
+            return path.replace(" ", "\\ ");
         } else {
             return path;
         }
@@ -105,10 +197,18 @@ private String escapeWhitespace(String path) {
 
     private void initExecutables(Path workDir, AppModel model) throws CodeGenException {
         if (executables == null) {
-            Path protocExe = prepareExecutable(workDir, model,
-                    "com.google.protobuf", "protoc", osClassifier(), "exe");
+            Path protocPath;
+            String protocPathProperty = System.getProperty("quarkus.grpc.protoc-path");
+            String classifier = osClassifier();
+            if (protocPathProperty == null) {
+                protocPath = findArtifactPath(model, PROTOC_GROUPID, PROTOC, classifier, EXE);
+            } else {
+                protocPath = Paths.get(protocPathProperty);
+            }
+            Path protocExe = makeExecutableFromPath(workDir, PROTOC_GROUPID, PROTOC, classifier, "exe", protocPath);
+
             Path protocGrpcPluginExe = prepareExecutable(workDir, model,
-                    "io.grpc", "protoc-gen-grpc-java", osClassifier(), "exe");
+                    "io.grpc", "protoc-gen-grpc-java", classifier, "exe");
 
             Path quarkusGrpcPluginExe = prepareQuarkusGrpcExecutable(model, workDir);
 
@@ -120,6 +220,11 @@ private Path prepareExecutable(Path buildDir, AppModel model,
             String groupId, String artifactId, String classifier, String packaging) throws CodeGenException {
         Path artifactPath = findArtifactPath(model, groupId, artifactId, classifier, packaging);
 
+        return makeExecutableFromPath(buildDir, groupId, artifactId, classifier, packaging, artifactPath);
+    }
+
+    private Path makeExecutableFromPath(Path buildDir, String groupId, String artifactId, String classifier, String packaging,
+            Path artifactPath) throws CodeGenException {
         Path exe = buildDir.resolve(String.format("%s-%s-%s-%s", groupId, artifactId, classifier, packaging));
 
         if (Files.exists(exe)) {
@@ -204,7 +309,7 @@ private static Path writeScript(Path buildDir, Path pluginPath, String shebang,
     }
 
     private static void writePluginExeCmd(Path pluginPath, BufferedWriter writer) throws IOException {
-        writer.write(JavaBinFinder.findBin() + " -cp \"" +
+        writer.write("\"" + JavaBinFinder.findBin() + "\" -cp \"" +
                 pluginPath.toAbsolutePath().toString() + "\" " + quarkusProtocPluginMain);
         writer.newLine();
     }
diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml
index f434fb18c047e..f9ec73eec580f 100644
--- a/extensions/grpc/deployment/pom.xml
+++ b/extensions/grpc/deployment/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-grpc-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-grpc-deployment</artifactId>
@@ -22,10 +21,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-devtools-utilities</artifactId>
@@ -37,18 +32,32 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc</artifactId>
-            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
         </dependency>
+        <!-- Add the health extension as optional as we will produce the health check only if it's included -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc-codegen</artifactId>
         </dependency>
 
+       <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -74,41 +83,46 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-health</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+            </extension>
+        </extensions>
 
         <plugins>
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
                 <configuration>
-                    <systemProperties>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    </systemProperties>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
+                    <pluginId>grpc-java</pluginId>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+                    <protocPlugins>
+                        <protocPlugin>
+                            <id>quarkus-grpc-protoc-plugin</id>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-grpc-protoc-plugin</artifactId>
+                            <version>${project.version}</version>
+                            <mainClass>io.quarkus.grpc.protoc.plugin.MutinyGrpcGenerator</mainClass>
+                        </protocPlugin>
+                    </protocPlugins>
                 </configuration>
-            </plugin>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>test-compile</id>
                         <goals>
-                            <goal>prepare-tests</goal>
+                            <goal>test-compile</goal>
+                            <goal>test-compile-custom</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/BindableServiceBuildItem.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/BindableServiceBuildItem.java
index 253e94786eec9..f2a8120ce67ba 100644
--- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/BindableServiceBuildItem.java
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/BindableServiceBuildItem.java
@@ -1,5 +1,8 @@
 package io.quarkus.grpc.deployment;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.jboss.jandex.DotName;
 
 import io.quarkus.builder.item.MultiBuildItem;
@@ -7,9 +10,25 @@
 public final class BindableServiceBuildItem extends MultiBuildItem {
 
     final DotName serviceClass;
+    final List<String> blockingMethods = new ArrayList<>();
 
     public BindableServiceBuildItem(DotName serviceClass) {
         this.serviceClass = serviceClass;
     }
 
+    /**
+     * A method from {@code serviceClass} is annotated with {@link io.smallrye.common.annotation.Blocking}.
+     * Stores the method name so the runtime interceptor can recognize it.
+     * Note: gRPC method have unique names - overloading is not permitted.
+     *
+     * @param method the method name
+     */
+    public void registerBlockingMethod(String method) {
+        blockingMethods.add(method);
+    }
+
+    public boolean hasBlockingMethods() {
+        return !blockingMethods.isEmpty();
+    }
+
 }
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
index 032e3fd604541..b4eca2f58b59a 100644
--- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcClientProcessor.java
@@ -3,15 +3,19 @@
 import static io.quarkus.deployment.Feature.GRPC_CLIENT;
 import static io.quarkus.grpc.deployment.GrpcDotNames.CREATE_CHANNEL_METHOD;
 import static io.quarkus.grpc.deployment.GrpcDotNames.RETRIEVE_CHANNEL_METHOD;
+import static io.quarkus.grpc.deployment.ResourceRegistrationUtils.registerResourcesForProperties;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;
 
 import javax.enterprise.inject.spi.DeploymentException;
 import javax.inject.Singleton;
 
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassType;
 import org.jboss.jandex.DotName;
@@ -27,22 +31,31 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.grpc.runtime.GrpcClientInterceptorContainer;
 import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.runtime.supports.Channels;
 import io.quarkus.grpc.runtime.supports.GrpcClientConfigProvider;
+import io.quarkus.grpc.runtime.supports.IOThreadClientInterceptor;
 
 public class GrpcClientProcessor {
 
     private static final Logger LOGGER = Logger.getLogger(GrpcClientProcessor.class.getName());
 
+    private static final String SSL_PREFIX = "quarkus\\.grpc\\.clients\\..*.ssl\\.";
+    private static final Pattern KEY_PATTERN = Pattern.compile(SSL_PREFIX + "key");
+    private static final Pattern CERTIFICATE_PATTERN = Pattern.compile(SSL_PREFIX + "certificate");
+    private static final Pattern TRUST_STORE_PATTERN = Pattern.compile(SSL_PREFIX + "trust-store");
+
     @BuildStep
     void registerBeans(BuildProducer<AdditionalBeanBuildItem> beans) {
         beans.produce(AdditionalBeanBuildItem.unremovableOf(GrpcService.class));
         beans.produce(AdditionalBeanBuildItem.unremovableOf(GrpcClientConfigProvider.class));
         beans.produce(AdditionalBeanBuildItem.unremovableOf(GrpcClientInterceptorContainer.class));
+        beans.produce(AdditionalBeanBuildItem.unremovableOf(IOThreadClientInterceptor.class));
     }
 
     @BuildStep
@@ -84,11 +97,7 @@ void discoverInjectedGrpcServices(
                 type = injectionType.asClassType();
             }
             if (!type.name().equals(GrpcDotNames.CHANNEL)) {
-                if (isMutinyStub(type.name())) {
-                    item.setMutinyStubClass(type);
-                } else {
-                    item.setBlockingStubClass(type);
-                }
+                item.addStubClass(type);
             }
         }
 
@@ -134,44 +143,38 @@ public void generateGrpcServicesProducers(List<GrpcServiceBuildItem> services,
                         public void accept(MethodCreator mc) {
                             GrpcClientProcessor.this.generateChannelProducer(mc, svc);
                         }
-                    });
+                    })
+                    .destroyer(Channels.ChannelDestroyer.class);
             channelProducer.done();
             beans.produce(new BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem(channelProducer));
 
-            if (svc.blockingStubClass != null) {
-                BeanConfigurator<Object> blockingStubProducer = phase.getContext()
-                        .configure(svc.blockingStubClass.name())
-                        .types(svc.blockingStubClass)
-                        .addQualifier().annotation(GrpcDotNames.GRPC_SERVICE).addValue("value", svc.getServiceName()).done()
-                        .scope(Singleton.class)
-                        .creator(new Consumer<MethodCreator>() {
-                            @Override
-                            public void accept(MethodCreator mc) {
-                                GrpcClientProcessor.this.generateStubProducer(mc, svc, false);
-                            }
-                        });
-                blockingStubProducer.done();
-                beans.produce(new BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem(blockingStubProducer));
-            }
-
-            if (svc.mutinyStubClass != null) {
-                BeanConfigurator<Object> blockingStubProducer = phase.getContext()
-                        .configure(svc.mutinyStubClass.name())
-                        .types(svc.mutinyStubClass)
-                        .addQualifier().annotation(GrpcDotNames.GRPC_SERVICE).addValue("value", svc.getServiceName()).done()
+            String svcName = svc.getServiceName();
+            for (ClassType stubClass : svc.getStubClasses()) {
+                DotName stubClassName = stubClass.name();
+                BeanConfigurator<Object> stubProducer = phase.getContext()
+                        .configure(stubClassName)
+                        .types(stubClass)
+                        .addQualifier().annotation(GrpcDotNames.GRPC_SERVICE).addValue("value", svcName).done()
                         .scope(Singleton.class)
                         .creator(new Consumer<MethodCreator>() {
                             @Override
                             public void accept(MethodCreator mc) {
-                                GrpcClientProcessor.this.generateStubProducer(mc, svc, true);
+                                GrpcClientProcessor.this.generateStubProducer(mc, svcName, stubClassName,
+                                        isMutinyStub(stubClassName));
                             }
                         });
-                blockingStubProducer.done();
-                beans.produce(new BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem(blockingStubProducer));
+                stubProducer.done();
+                beans.produce(new BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem(stubProducer));
             }
         }
     }
 
+    @BuildStep
+    void registerSslResources(BuildProducer<NativeImageResourceBuildItem> resourceBuildItem) {
+        Config config = ConfigProvider.getConfig();
+        registerResourcesForProperties(config, resourceBuildItem, TRUST_STORE_PATTERN, CERTIFICATE_PATTERN, KEY_PATTERN);
+    }
+
     private void generateChannelProducer(MethodCreator mc, GrpcServiceBuildItem svc) {
         ResultHandle name = mc.load(svc.getServiceName());
         ResultHandle result = mc.invokeStaticMethod(CREATE_CHANNEL_METHOD, name);
@@ -179,19 +182,20 @@ private void generateChannelProducer(MethodCreator mc, GrpcServiceBuildItem svc)
         mc.close();
     }
 
-    private void generateStubProducer(MethodCreator mc, GrpcServiceBuildItem svc, boolean mutiny) {
-        ResultHandle prefix = mc.load(svc.getServiceName());
+    private void generateStubProducer(MethodCreator mc, String svcName, DotName stubClassName, boolean mutiny) {
+        ResultHandle prefix = mc.load(svcName);
         ResultHandle channel = mc.invokeStaticMethod(RETRIEVE_CHANNEL_METHOD, prefix);
 
         MethodDescriptor descriptor;
         if (mutiny) {
             descriptor = MethodDescriptor
-                    .ofMethod(svc.getMutinyGrpcServiceName(), "newMutinyStub", svc.mutinyStubClass.name().toString(),
+                    .ofMethod(convertToServiceName(stubClassName), "newMutinyStub",
+                            stubClassName.toString(),
                             Channel.class.getName());
         } else {
             descriptor = MethodDescriptor
-                    .ofMethod(svc.getBlockingGrpcServiceName(), "newBlockingStub",
-                            svc.blockingStubClass.name().toString(),
+                    .ofMethod(convertToServiceName(stubClassName), "newBlockingStub",
+                            stubClassName.toString(),
                             Channel.class.getName());
         }
 
@@ -199,4 +203,12 @@ private void generateStubProducer(MethodCreator mc, GrpcServiceBuildItem svc, bo
         mc.returnValue(stub);
         mc.close();
     }
+
+    private String convertToServiceName(DotName stubName) {
+        if (stubName.isInner()) {
+            return stubName.prefix().toString();
+        } else {
+            return stubName.toString();
+        }
+    }
 }
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java
index f3b72e7e7fa8a..df25b3afde93e 100644
--- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcDotNames.java
@@ -2,25 +2,20 @@
 
 import org.jboss.jandex.DotName;
 
-import com.google.protobuf.GeneratedMessageV3;
-
 import io.grpc.BindableService;
 import io.grpc.Channel;
-import io.grpc.LoadBalancerProvider;
-import io.grpc.NameResolverProvider;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.grpc.runtime.annotations.GrpcService;
 import io.quarkus.grpc.runtime.supports.Channels;
+import io.smallrye.common.annotation.Blocking;
 
 public class GrpcDotNames {
 
     static final DotName BINDABLE_SERVICE = DotName.createSimple(BindableService.class.getName());
     static final DotName CHANNEL = DotName.createSimple(Channel.class.getName());
     static final DotName GRPC_SERVICE = DotName.createSimple(GrpcService.class.getName());
-    static final DotName MESSAGE_BUILDER = DotName.createSimple(GeneratedMessageV3.Builder.class.getName());
-    static final DotName GENERATED_MESSAGE_V3 = DotName.createSimple(GeneratedMessageV3.class.getName());
-    static final DotName NAME_RESOLVER_PROVIDER = DotName.createSimple(NameResolverProvider.class.getName());
-    static final DotName LOAD_BALANCER_PROVIDER = DotName.createSimple(LoadBalancerProvider.class.getName());
+
+    static final DotName BLOCKING = DotName.createSimple(Blocking.class.getName());
 
     static final MethodDescriptor CREATE_CHANNEL_METHOD = MethodDescriptor.ofMethod(Channels.class, "createChannel",
             Channel.class, String.class);
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java
index af6228a251384..447c88138c3b8 100644
--- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java
@@ -1,19 +1,21 @@
 package io.quarkus.grpc.deployment;
 
 import static io.quarkus.deployment.Feature.GRPC_SERVER;
+import static java.util.Arrays.asList;
 
 import java.lang.reflect.Modifier;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.MethodInfo;
 import org.jboss.logging.Logger;
 
-import io.grpc.internal.DnsNameResolverProvider;
-import io.grpc.internal.PickFirstLoadBalancerProvider;
 import io.grpc.internal.ServerImpl;
-import io.grpc.netty.NettyChannelProvider;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.IsDevelopment;
@@ -28,8 +30,7 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.grpc.deployment.devmode.FieldDefinalizingVisitor;
 import io.quarkus.grpc.runtime.GrpcContainer;
 import io.quarkus.grpc.runtime.GrpcServerRecorder;
@@ -45,6 +46,12 @@ public class GrpcServerProcessor {
 
     private static final Logger logger = Logger.getLogger(GrpcServerProcessor.class);
 
+    private static final String SSL_PREFIX = "quarkus.grpc.server.ssl.";
+    private static final String CERTIFICATE = SSL_PREFIX + "certificate";
+    private static final String KEY = SSL_PREFIX + "key";
+    private static final String KEY_STORE = SSL_PREFIX + "key-store";
+    private static final String TRUST_STORE = SSL_PREFIX + "trust-store";
+
     @BuildStep
     void discoverBindableServices(BuildProducer<BindableServiceBuildItem> bindables,
             CombinedIndexBuildItem combinedIndexBuildItem) {
@@ -52,15 +59,21 @@ void discoverBindableServices(BuildProducer<BindableServiceBuildItem> bindables,
                 .getAllKnownImplementors(GrpcDotNames.BINDABLE_SERVICE);
         for (ClassInfo service : bindableServices) {
             if (!Modifier.isAbstract(service.flags()) && service.classAnnotation(DotNames.SINGLETON) != null) {
-                bindables.produce(new BindableServiceBuildItem(service.name()));
+                BindableServiceBuildItem item = new BindableServiceBuildItem(service.name());
+                for (MethodInfo method : service.methods()) {
+                    if (method.hasAnnotation(GrpcDotNames.BLOCKING)) {
+                        item.registerBlockingMethod(method.name());
+                    }
+                }
+                bindables.produce(item);
             }
         }
     }
 
     @BuildStep(onlyIf = IsNormal.class)
-    public KubernetesPortBuildItem registerGrpcServiceInKubernetes(List<BindableServiceBuildItem> bindables) {
+    KubernetesPortBuildItem registerGrpcServiceInKubernetes(List<BindableServiceBuildItem> bindables) {
         if (!bindables.isEmpty()) {
-            int port = ConfigProvider.getConfig().getOptionalValue("quarkus.grpc-server.port", Integer.class)
+            int port = ConfigProvider.getConfig().getOptionalValue("quarkus.grpc.server.port", Integer.class)
                     .orElse(9000);
             return new KubernetesPortBuildItem(port, GRPC_SERVER);
         }
@@ -83,8 +96,17 @@ void buildContainerBean(BuildProducer<AdditionalBeanBuildItem> beans,
     ServiceStartBuildItem build(GrpcServerRecorder recorder, GrpcConfiguration config,
             ShutdownContextBuildItem shutdown, List<BindableServiceBuildItem> bindables,
             VertxBuildItem vertx) {
+
+        // Build the list of blocking methods per service implementation
+        Map<String, List<String>> blocking = new HashMap<>();
+        for (BindableServiceBuildItem bindable : bindables) {
+            if (bindable.hasBlockingMethods()) {
+                blocking.put(bindable.serviceClass.toString(), bindable.blockingMethods);
+            }
+        }
+
         if (!bindables.isEmpty()) {
-            recorder.initializeGrpcServer(vertx.getVertx(), config, shutdown);
+            recorder.initializeGrpcServer(vertx.getVertx(), config, shutdown, blocking);
             return new ServiceStartBuildItem(GRPC_SERVER);
         }
         return null;
@@ -98,42 +120,6 @@ void definializeGrpcFieldsForDevMode(BuildProducer<BytecodeTransformerBuildItem>
                 new FieldDefinalizingVisitor("interceptors")));
     }
 
-    @BuildStep
-    public void configureNativeExecutable(CombinedIndexBuildItem combinedIndex,
-            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport) {
-
-        // we force the usage of the reflection invoker.
-        Collection<ClassInfo> messages = combinedIndex.getIndex()
-                .getAllKnownSubclasses(GrpcDotNames.GENERATED_MESSAGE_V3);
-        for (ClassInfo message : messages) {
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true, message.name().toString()));
-        }
-        Collection<ClassInfo> builders = combinedIndex.getIndex().getAllKnownSubclasses(GrpcDotNames.MESSAGE_BUILDER);
-        for (ClassInfo builder : builders) {
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true, builder.name().toString()));
-        }
-
-        Collection<ClassInfo> lbs = combinedIndex.getIndex().getAllKnownSubclasses(GrpcDotNames.LOAD_BALANCER_PROVIDER);
-        for (ClassInfo lb : lbs) {
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, lb.name().toString()));
-        }
-
-        Collection<ClassInfo> nrs = combinedIndex.getIndex().getAllKnownSubclasses(GrpcDotNames.NAME_RESOLVER_PROVIDER);
-        for (ClassInfo nr : nrs) {
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, nr.name().toString()));
-        }
-
-        // Built-In providers:
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, DnsNameResolverProvider.class));
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, PickFirstLoadBalancerProvider.class));
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false,
-                "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider"));
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, NettyChannelProvider.class));
-
-        extensionSslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(GRPC_SERVER));
-    }
-
     @BuildStep
     HealthBuildItem addHealthChecks(GrpcServerBuildTimeConfig config,
             List<BindableServiceBuildItem> bindables,
@@ -157,11 +143,16 @@ HealthBuildItem addHealthChecks(GrpcServerBuildTimeConfig config,
     }
 
     @BuildStep
-    NativeImageConfigBuildItem nativeImageConfiguration() {
-        NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder()
-                .addRuntimeInitializedClass("io.grpc.netty.Utils$ByteBufAllocatorPreferDirectHolder")
-                .addRuntimeInitializedClass("io.grpc.netty.Utils$ByteBufAllocatorPreferHeapHolder");
-        return builder.build();
+    void registerSslResources(BuildProducer<NativeImageResourceBuildItem> resourceBuildItem) {
+        Config config = ConfigProvider.getConfig();
+        for (String sslProperty : asList(CERTIFICATE, KEY, KEY_STORE, TRUST_STORE)) {
+            config.getOptionalValue(sslProperty, String.class)
+                    .ifPresent(value -> ResourceRegistrationUtils.registerResourceForProperty(resourceBuildItem, value));
+        }
     }
 
+    @BuildStep
+    ExtensionSslNativeSupportBuildItem extensionSslNativeSupport() {
+        return new ExtensionSslNativeSupportBuildItem(GRPC_SERVER);
+    }
 }
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServiceBuildItem.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServiceBuildItem.java
index 6214cd19a7a03..3a13af76c03fe 100644
--- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServiceBuildItem.java
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServiceBuildItem.java
@@ -1,6 +1,7 @@
 package io.quarkus.grpc.deployment;
 
-import javax.enterprise.inject.spi.DeploymentException;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.jboss.jandex.ClassType;
 
@@ -8,48 +9,22 @@
 
 public final class GrpcServiceBuildItem extends MultiBuildItem {
 
-    ClassType blockingStubClass;
-    ClassType mutinyStubClass;
     final String name;
+    Set<ClassType> stubClasses = new HashSet<ClassType>();
 
     public GrpcServiceBuildItem(String name) {
         this.name = name;
     }
 
-    public void setBlockingStubClass(ClassType blockingStubClass) {
-        if (this.blockingStubClass != null
-                && !this.blockingStubClass.name().equals(blockingStubClass.name())) {
-            throw new DeploymentException("Invalid gRPC Service - multiple stubs founds for " + name);
-        }
-        this.blockingStubClass = blockingStubClass;
+    public Set<ClassType> getStubClasses() {
+        return stubClasses;
     }
 
-    public void setMutinyStubClass(ClassType mutinyStubClass) {
-        if (this.mutinyStubClass != null
-                && !this.mutinyStubClass.name().equals(mutinyStubClass.name())) {
-            throw new DeploymentException("Invalid gRPC Service - multiple stubs founds for " + name);
-        }
-
-        this.mutinyStubClass = mutinyStubClass;
+    public void addStubClass(ClassType stubClass) {
+        stubClasses.add(stubClass);
     }
 
     public String getServiceName() {
         return name;
     }
-
-    public String getBlockingGrpcServiceName() {
-        if (blockingStubClass.name().isInner()) {
-            return blockingStubClass.name().prefix().toString();
-        } else {
-            return blockingStubClass.name().toString();
-        }
-    }
-
-    public String getMutinyGrpcServiceName() {
-        if (mutinyStubClass.name().isInner()) {
-            return mutinyStubClass.name().prefix().toString();
-        } else {
-            return mutinyStubClass.name().toString();
-        }
-    }
 }
diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/ResourceRegistrationUtils.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/ResourceRegistrationUtils.java
new file mode 100644
index 0000000000000..81ee81999375d
--- /dev/null
+++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/ResourceRegistrationUtils.java
@@ -0,0 +1,38 @@
+package io.quarkus.grpc.deployment;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.microprofile.config.Config;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+
+class ResourceRegistrationUtils {
+
+    static void registerResourcesForProperties(Config config,
+            BuildProducer<NativeImageResourceBuildItem> resourceBuildItem,
+            Pattern... patterns) {
+        for (String propertyName : config.getPropertyNames()) {
+            for (Pattern pattern : patterns) {
+                if (pattern.matcher(propertyName).matches()) {
+                    String maybeResource = config.getValue(propertyName, String.class);
+                    registerResourceForProperty(resourceBuildItem, maybeResource);
+                }
+            }
+        }
+    }
+
+    static void registerResourceForProperty(BuildProducer<NativeImageResourceBuildItem> resourceBuildItem,
+            String maybeResource) {
+        if (isOnClassPath(maybeResource)) {
+            resourceBuildItem.produce(new NativeImageResourceBuildItem(maybeResource));
+        }
+    }
+
+    private static boolean isOnClassPath(String path) {
+        return Thread.currentThread().getContextClassLoader().getResourceAsStream(path) != null;
+    }
+
+    private ResourceRegistrationUtils() {
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java
new file mode 100644
index 0000000000000..d465032c4857c
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/HelloWorldTlsEndpointTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.grpc.client;
+
+import static io.restassured.RestAssured.get;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.grpc.client.tls.HelloWorldTlsEndpoint;
+import io.quarkus.test.QuarkusUnitTest;
+
+class HelloWorldTlsEndpointTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(HelloWorldTlsEndpoint.class.getPackage())
+                    .addPackage(io.grpc.examples.helloworld.GreeterGrpc.class.getPackage()))
+            .withConfigurationResource("grpc-client-tls-configuration.properties");
+
+    @Test
+    void shouldExposeAndConsumeTLSWithKeysFromFiles() {
+        String response = get("/hello/blocking/neo").asString();
+        assertThat(response).isEqualTo("Hello neo");
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java
index f8af9a6c17c9e..f674138406157 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java
@@ -21,6 +21,8 @@
 import io.quarkus.grpc.runtime.annotations.GrpcService;
 import io.quarkus.grpc.server.services.HelloService;
 import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Uni;
+import io.vertx.mutiny.core.Vertx;
 
 public class MutinyStubInjectionTest {
 
@@ -40,7 +42,10 @@ public class MutinyStubInjectionTest {
     @Test
     public void test() {
         String neo = service.invoke("neo-mutiny");
-        assertThat(neo).isEqualTo("Hello neo-mutiny");
+        assertThat(neo).startsWith("Hello neo-mutiny").doesNotContain("vert.x");
+
+        neo = service.invokeFromIoThread("neo-io");
+        assertThat(neo).startsWith("Hello neo-io").contains("vert.x");
     }
 
     @ApplicationScoped
@@ -50,11 +55,26 @@ static class MyConsumer {
         @GrpcService("hello-service")
         MutinyGreeterGrpc.MutinyGreeterStub service;
 
+        @Inject
+        Vertx vertx;
+
         public String invoke(String s) {
             return service.sayHello(HelloRequest.newBuilder().setName(s).build())
                     .map(HelloReply::getMessage)
+                    .map(r -> r + " " + Thread.currentThread().getName())
                     .await().atMost(Duration.ofSeconds(5));
         }
 
+        public String invokeFromIoThread(String s) {
+            return Uni.createFrom().<String> emitter(e -> {
+                vertx.runOnContext(x -> {
+                    service.sayHello(HelloRequest.newBuilder().setName(s).build())
+                            .map(HelloReply::getMessage)
+                            .map(r -> r + " " + Thread.currentThread().getName())
+                            .subscribe().with(e::complete, e::fail);
+                });
+            }).await().atMost(Duration.ofSeconds(5));
+        }
+
     }
 }
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutipleStubsInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutipleStubsInjectionTest.java
index 6bd4b426fde8f..525a38b307246 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutipleStubsInjectionTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutipleStubsInjectionTest.java
@@ -13,13 +13,10 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.grpc.Channel;
-import io.grpc.examples.helloworld.GreeterGrpc;
-import io.grpc.examples.helloworld.HelloReply;
-import io.grpc.examples.helloworld.HelloReplyOrBuilder;
-import io.grpc.examples.helloworld.HelloRequest;
-import io.grpc.examples.helloworld.HelloRequestOrBuilder;
-import io.grpc.examples.helloworld.MutinyGreeterGrpc;
+import io.grpc.examples.goodbyeworld.*;
+import io.grpc.examples.helloworld.*;
 import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.server.services.GoodbyeService;
 import io.quarkus.grpc.server.services.HelloService;
 import io.quarkus.test.QuarkusUnitTest;
 
@@ -32,7 +29,11 @@ public class MutipleStubsInjectionTest {
                             MutinyGreeterGrpc.class, GreeterGrpc.class,
                             MutinyGreeterGrpc.MutinyGreeterStub.class,
                             HelloService.class, HelloRequest.class, HelloReply.class,
-                            HelloReplyOrBuilder.class, HelloRequestOrBuilder.class))
+                            HelloReplyOrBuilder.class, HelloRequestOrBuilder.class,
+                            MutinyFarewellGrpc.class, FarewellGrpc.class,
+                            MutinyFarewellGrpc.MutinyFarewellStub.class,
+                            GoodbyeService.class, GoodbyeRequest.class, GoodbyeReply.class,
+                            GoodbyeReplyOrBuilder.class, GoodbyeRequestOrBuilder.class))
             .withConfigurationResource("hello-config.properties");
 
     @Inject
@@ -40,12 +41,18 @@ public class MutipleStubsInjectionTest {
 
     @Test
     public void test() {
-        String neo = service.invokeMutiny("neo-mutiny");
+        String neo = service.invokeMutinyGreeter("neo-mutiny");
         assertThat(neo).isEqualTo("Hello neo-mutiny");
 
-        neo = service.invokeBlocking("neo-blocking");
+        neo = service.invokeBlockingGreeter("neo-blocking");
         assertThat(neo).isEqualTo("Hello neo-blocking");
 
+        neo = service.invokeMutinyFarewell("neo-mutiny");
+        assertThat(neo).isEqualTo("Goodbye neo-mutiny");
+
+        neo = service.invokeBlockingFarewell("neo-blocking");
+        assertThat(neo).isEqualTo("Goodbye neo-blocking");
+
         service.validateChannel();
     }
 
@@ -54,24 +61,42 @@ static class MyConsumer {
 
         @Inject
         @GrpcService("hello-service")
-        MutinyGreeterGrpc.MutinyGreeterStub mutiny;
+        MutinyGreeterGrpc.MutinyGreeterStub mutinyGreeter;
 
         @Inject
         @GrpcService("hello-service")
-        GreeterGrpc.GreeterBlockingStub blocking;
+        GreeterGrpc.GreeterBlockingStub blockingGreeter;
+
+        @Inject
+        @GrpcService("hello-service")
+        MutinyFarewellGrpc.MutinyFarewellStub mutinyFarewell;
+
+        @Inject
+        @GrpcService("hello-service")
+        FarewellGrpc.FarewellBlockingStub blockingFarewell;
 
         @Inject
         @GrpcService("hello-service-2")
         Channel channel;
 
-        public String invokeMutiny(String s) {
-            return mutiny.sayHello(HelloRequest.newBuilder().setName(s).build())
+        public String invokeMutinyGreeter(String s) {
+            return mutinyGreeter.sayHello(HelloRequest.newBuilder().setName(s).build())
                     .map(HelloReply::getMessage)
                     .await().atMost(Duration.ofSeconds(5));
         }
 
-        public String invokeBlocking(String s) {
-            return blocking.sayHello(HelloRequest.newBuilder().setName(s).build()).getMessage();
+        public String invokeBlockingGreeter(String s) {
+            return blockingGreeter.sayHello(HelloRequest.newBuilder().setName(s).build()).getMessage();
+        }
+
+        public String invokeMutinyFarewell(String s) {
+            return mutinyFarewell.sayGoodbye(GoodbyeRequest.newBuilder().setName(s).build())
+                    .map(GoodbyeReply::getMessage)
+                    .await().atMost(Duration.ofSeconds(5));
+        }
+
+        public String invokeBlockingFarewell(String s) {
+            return blockingFarewell.sayGoodbye(GoodbyeRequest.newBuilder().setName(s).build()).getMessage();
         }
 
         public void validateChannel() {
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java
new file mode 100644
index 0000000000000..8e28c22feb6ab
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsEndpoint.java
@@ -0,0 +1,37 @@
+package io.quarkus.grpc.client.tls;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.examples.helloworld.MutinyGreeterGrpc;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.smallrye.mutiny.Uni;
+
+@Path("/hello")
+public class HelloWorldTlsEndpoint {
+
+    @Inject
+    @GrpcService("hello")
+    GreeterGrpc.GreeterBlockingStub blockingHelloService;
+    @Inject
+    @GrpcService("hello")
+    MutinyGreeterGrpc.MutinyGreeterStub mutinyHelloService;
+
+    @GET
+    @Path("/blocking/{name}")
+    public String helloBlocking(@PathParam("name") String name) {
+        return blockingHelloService.sayHello(HelloRequest.newBuilder().setName(name).build()).getMessage();
+    }
+
+    @GET
+    @Path("/mutiny/{name}")
+    public Uni<String> helloMutiny(@PathParam("name") String name) {
+        return mutinyHelloService.sayHello(HelloRequest.newBuilder().setName(name).build())
+                .onItem().transform(HelloReply::getMessage);
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsService.java
new file mode 100644
index 0000000000000..a912a1dba40c2
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/tls/HelloWorldTlsService.java
@@ -0,0 +1,19 @@
+package io.quarkus.grpc.client.tls;
+
+import javax.inject.Singleton;
+
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.examples.helloworld.MutinyGreeterGrpc;
+import io.smallrye.mutiny.Uni;
+
+@Singleton
+public class HelloWorldTlsService extends MutinyGreeterGrpc.GreeterImplBase {
+
+    @Override
+    public Uni<HelloReply> sayHello(HelloRequest request) {
+        String name = request.getName();
+        return Uni.createFrom().item("Hello " + name)
+                .map(res -> HelloReply.newBuilder().setMessage(res).build());
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/ClientCallFromBlockingServiceTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/ClientCallFromBlockingServiceTest.java
new file mode 100644
index 0000000000000..1194484230bd3
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/ClientCallFromBlockingServiceTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.grpc.server;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld3.Greeter3Grpc;
+import io.grpc.examples.helloworld3.HelloReply3;
+import io.grpc.examples.helloworld3.HelloRequest3;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.server.services.GrpcCallWithinBlockingService;
+import io.quarkus.grpc.server.services.HelloService;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ClientCallFromBlockingServiceTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(Greeter3Grpc.class.getPackage())
+                    .addPackage(GreeterGrpc.class.getPackage())
+                    .addClass(HelloService.class)
+                    .addClass(GrpcCallWithinBlockingService.class))
+            .withConfigurationResource("call-from-blocking-service.properties");
+
+    @Inject
+    @GrpcService("service3")
+    Greeter3Grpc.Greeter3BlockingStub greeter3Client;
+
+    @Test
+    @Timeout(5)
+    void shouldWorkMultipleTimes() {
+        for (int i = 0; i < 20; i++) {
+            HelloReply3 reply = greeter3Client.sayHello(HelloRequest3.newBuilder().setName("Slim").build());
+            assertThat(reply.getMessage()).isEqualTo("response:Hello Slim");
+        }
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithPlainTextTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithPlainTextTest.java
index 265fea4f3d94f..9f1b620a2fec0 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithPlainTextTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithPlainTextTest.java
@@ -15,6 +15,7 @@
 import io.grpc.testing.integration.Messages;
 import io.grpc.testing.integration.MutinyTestServiceGrpc;
 import io.grpc.testing.integration.TestServiceGrpc;
+import io.quarkus.grpc.server.services.AssertHelper;
 import io.quarkus.grpc.server.services.MutinyHelloService;
 import io.quarkus.grpc.server.services.MutinyTestService;
 import io.quarkus.test.QuarkusUnitTest;
@@ -28,7 +29,7 @@ public class MutinyGrpcServiceWithPlainTextTest extends GrpcServiceTestBase {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(MutinyHelloService.class, MutinyTestService.class,
+                    .addClasses(MutinyHelloService.class, MutinyTestService.class, AssertHelper.class,
                             GreeterGrpc.class, HelloRequest.class, HelloReply.class, MutinyGreeterGrpc.class,
                             HelloRequestOrBuilder.class, HelloReplyOrBuilder.class,
                             EmptyProtos.class, Messages.class, MutinyTestServiceGrpc.class,
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java
index e577ef08c5848..e11c4adaa6cc6 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/MutinyGrpcServiceWithSSLTest.java
@@ -25,6 +25,7 @@
 import io.grpc.testing.integration.MutinyTestServiceGrpc;
 import io.grpc.testing.integration.TestServiceGrpc;
 import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.AssertHelper;
 import io.quarkus.grpc.server.services.MutinyHelloService;
 import io.quarkus.grpc.server.services.MutinyTestService;
 import io.quarkus.test.QuarkusUnitTest;
@@ -38,7 +39,7 @@ public class MutinyGrpcServiceWithSSLTest extends GrpcServiceTestBase {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(MutinyHelloService.class, MutinyTestService.class,
+                    .addClasses(MutinyHelloService.class, MutinyTestService.class, AssertHelper.class,
                             GreeterGrpc.class, HelloRequest.class, HelloReply.class, MutinyGreeterGrpc.class,
                             HelloRequestOrBuilder.class, HelloReplyOrBuilder.class,
                             EmptyProtos.class, Messages.class, MutinyTestServiceGrpc.class,
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithPlainTextTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithPlainTextTest.java
index fbc2e7016dd17..6141737347690 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithPlainTextTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithPlainTextTest.java
@@ -15,6 +15,7 @@
 import io.grpc.testing.integration.Messages;
 import io.grpc.testing.integration.MutinyTestServiceGrpc;
 import io.grpc.testing.integration.TestServiceGrpc;
+import io.quarkus.grpc.server.services.AssertHelper;
 import io.quarkus.grpc.server.services.HelloService;
 import io.quarkus.grpc.server.services.TestService;
 import io.quarkus.test.QuarkusUnitTest;
@@ -28,7 +29,7 @@ public class RegularGrpcServiceWithPlainTextTest extends GrpcServiceTestBase {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(HelloService.class, TestService.class,
+                    .addClasses(HelloService.class, TestService.class, AssertHelper.class,
                             GreeterGrpc.class, HelloRequest.class, HelloReply.class, MutinyGreeterGrpc.class,
                             HelloRequestOrBuilder.class, HelloReplyOrBuilder.class,
                             EmptyProtos.class, Messages.class, MutinyTestServiceGrpc.class,
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java
index 6b34ae2e4580e..d8d1c9937b662 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLFromClasspathTest.java
@@ -26,6 +26,7 @@
 import io.grpc.testing.integration.MutinyTestServiceGrpc;
 import io.grpc.testing.integration.TestServiceGrpc;
 import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.AssertHelper;
 import io.quarkus.grpc.server.services.HelloService;
 import io.quarkus.grpc.server.services.TestService;
 import io.quarkus.test.QuarkusUnitTest;
@@ -39,7 +40,7 @@ public class RegularGrpcServiceWithSSLFromClasspathTest extends GrpcServiceTestB
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(HelloService.class, TestService.class,
+                    .addClasses(HelloService.class, TestService.class, AssertHelper.class,
                             GreeterGrpc.class, HelloRequest.class, HelloReply.class, MutinyGreeterGrpc.class,
                             HelloRequestOrBuilder.class, HelloReplyOrBuilder.class,
                             EmptyProtos.class, Messages.class, MutinyTestServiceGrpc.class,
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java
index ecc77f0273b73..aeb0f28d596a0 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/RegularGrpcServiceWithSSLTest.java
@@ -25,6 +25,7 @@
 import io.grpc.testing.integration.MutinyTestServiceGrpc;
 import io.grpc.testing.integration.TestServiceGrpc;
 import io.netty.handler.ssl.SslContext;
+import io.quarkus.grpc.server.services.AssertHelper;
 import io.quarkus.grpc.server.services.HelloService;
 import io.quarkus.grpc.server.services.TestService;
 import io.quarkus.test.QuarkusUnitTest;
@@ -38,7 +39,7 @@ public class RegularGrpcServiceWithSSLTest extends GrpcServiceTestBase {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(HelloService.class, TestService.class,
+                    .addClasses(HelloService.class, TestService.class, AssertHelper.class,
                             GreeterGrpc.class, HelloRequest.class, HelloReply.class, MutinyGreeterGrpc.class,
                             HelloRequestOrBuilder.class, HelloReplyOrBuilder.class,
                             EmptyProtos.class, Messages.class, MutinyTestServiceGrpc.class,
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java
new file mode 100644
index 0000000000000..010067485d342
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingAndNonBlockingTest.java
@@ -0,0 +1,103 @@
+package io.quarkus.grpc.server.blocking;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.protobuf.EmptyProtos;
+
+import grpc.health.v1.HealthGrpc;
+import grpc.health.v1.HealthOuterClass;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.reflection.v1alpha.MutinyServerReflectionGrpc;
+import io.grpc.reflection.v1alpha.ServerReflectionRequest;
+import io.grpc.reflection.v1alpha.ServerReflectionResponse;
+import io.grpc.reflection.v1alpha.ServiceResponse;
+import io.grpc.testing.integration.Messages;
+import io.grpc.testing.integration.TestServiceGrpc;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.runtime.health.GrpcHealthStorage;
+import io.quarkus.grpc.server.services.AssertHelper;
+import io.quarkus.grpc.server.services.BlockingMutinyHelloService;
+import io.quarkus.grpc.server.services.TestService;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+
+public class BlockingAndNonBlockingTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(HealthGrpc.class.getPackage())
+                    .addPackage(GreeterGrpc.class.getPackage())
+                    .addPackage(TestServiceGrpc.class.getPackage())
+                    .addPackage(EmptyProtos.class.getPackage())
+                    .addClasses(BlockingMutinyHelloService.class, TestService.class, AssertHelper.class))
+            .withConfigurationResource("blocking-config.properties");
+
+    @Inject
+    GrpcHealthStorage healthService;
+
+    @Inject
+    @GrpcService("reflection-service")
+    MutinyServerReflectionGrpc.MutinyServerReflectionStub reflection;
+
+    @Inject
+    @GrpcService("test-service")
+    TestServiceGrpc.TestServiceBlockingStub test;
+
+    @Inject
+    @GrpcService("greeter-service")
+    GreeterGrpc.GreeterBlockingStub greeter;
+
+    @Test
+    public void testInvokingABlockingService() {
+        HelloReply reply = greeter.sayHello(HelloRequest.newBuilder().setName("neo").build());
+        assertThat(reply.getMessage()).contains("worker-thread", "neo");
+    }
+
+    @Test
+    public void testInvokingANonBlockingService() {
+        Messages.SimpleResponse reply = test.unaryCall(Messages.SimpleRequest.newBuilder().build());
+        assertThat(reply).isNotNull();
+    }
+
+    @Test
+    public void testHealth() {
+        assertThat(healthService.getStatuses()).contains(
+                entry(GreeterGrpc.SERVICE_NAME, HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING),
+                entry(TestServiceGrpc.SERVICE_NAME, HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING)
+
+        );
+    }
+
+    @Test
+    public void testReflection() {
+        ServerReflectionRequest request = ServerReflectionRequest.newBuilder().setHost("localhost")
+                .setListServices("").build();
+
+        ServerReflectionResponse response = invoke(request);
+        List<ServiceResponse> list = response.getListServicesResponse().getServiceList();
+        assertThat(list).hasSize(3)
+                .anySatisfy(r -> assertThat(r.getName()).isEqualTo(GreeterGrpc.SERVICE_NAME))
+                .anySatisfy(r -> assertThat(r.getName()).isEqualTo(TestServiceGrpc.SERVICE_NAME))
+                .anySatisfy(r -> assertThat(r.getName()).isEqualTo("grpc.health.v1.Health"));
+    }
+
+    private ServerReflectionResponse invoke(ServerReflectionRequest request) {
+        return reflection.serverReflectionInfo(Multi.createFrom().item(request))
+                .collectItems().first()
+                .await().indefinitely();
+    }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingMethodsTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingMethodsTest.java
new file mode 100644
index 0000000000000..5ee841f3da7c4
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingMethodsTest.java
@@ -0,0 +1,218 @@
+package io.quarkus.grpc.server.blocking;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.inject.Inject;
+
+import org.assertj.core.api.Assertions;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.EmptyProtos;
+
+import io.grpc.StatusRuntimeException;
+import io.grpc.testing.integration.Messages;
+import io.quarkus.grpc.blocking.BlockingTestServiceGrpc;
+import io.quarkus.grpc.blocking.MutinyBlockingTestServiceGrpc;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.server.services.AssertHelper;
+import io.quarkus.grpc.server.services.BlockingTestService;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public class BlockingMethodsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(EmptyProtos.class.getPackage())
+                    .addPackage(Messages.class.getPackage())
+                    .addPackage(BlockingTestServiceGrpc.class.getPackage())
+                    .addClasses(BlockingTestService.class, AssertHelper.class))
+            .withConfigurationResource("blocking-test-config.properties");
+
+    protected static final Duration TIMEOUT = Duration.ofSeconds(5);
+
+    @Inject
+    @GrpcService("blocking-test")
+    BlockingTestServiceGrpc.BlockingTestServiceBlockingStub service;
+
+    @Inject
+    @GrpcService("blocking-test")
+    MutinyBlockingTestServiceGrpc.MutinyBlockingTestServiceStub mutiny;
+
+    @Test
+    @Timeout(5)
+    public void testEmpty() {
+        EmptyProtos.Empty empty = service
+                .emptyCall(EmptyProtos.Empty.newBuilder().build());
+        assertThat(empty).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testBlockingEmpty() {
+        EmptyProtos.Empty empty = service
+                .emptyCallBlocking(EmptyProtos.Empty.newBuilder().build());
+        assertThat(empty).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testUnaryMethod() {
+        Messages.SimpleResponse response = service
+                .unaryCall(Messages.SimpleRequest.newBuilder().build());
+        assertThat(response).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testUnaryMethodBlocking() {
+        Messages.SimpleResponse response = service
+                .unaryCallBlocking(Messages.SimpleRequest.newBuilder().build());
+        assertThat(response).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingOutMethod() {
+        Iterator<Messages.StreamingOutputCallResponse> iterator = service
+                .streamingOutputCall(Messages.StreamingOutputCallRequest.newBuilder().build());
+        assertThat(iterator).isNotNull();
+        List<String> list = new CopyOnWriteArrayList<>();
+        iterator.forEachRemaining(so -> {
+            String content = so.getPayload().getBody().toStringUtf8();
+            list.add(content);
+        });
+        assertThat(list).hasSize(10)
+                .allSatisfy(s -> {
+                    assertThat(s).contains("eventloop");
+                });
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingOutMethodBlocking() {
+        Iterator<Messages.StreamingOutputCallResponse> iterator = service
+                .streamingOutputCallBlocking(Messages.StreamingOutputCallRequest.newBuilder().build());
+        assertThat(iterator).isNotNull();
+        List<String> list = new CopyOnWriteArrayList<>();
+        iterator.forEachRemaining(so -> {
+            String content = so.getPayload().getBody().toStringUtf8();
+            list.add(content);
+        });
+        assertThat(list).hasSize(10)
+                .allSatisfy(s -> {
+                    assertThat(s).contains("worker");
+                });
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingInMethodWithMutinyClient() {
+        Multi<Messages.StreamingInputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingInputCallRequest.newBuilder().setPayload(p).build());
+        Uni<Messages.StreamingInputCallResponse> done = mutiny.streamingInputCall(input);
+        assertThat(done).isNotNull();
+        done.await().atMost(TIMEOUT);
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingInMethodBlockingWithMutinyClient() {
+        Multi<Messages.StreamingInputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingInputCallRequest.newBuilder().setPayload(p).build());
+        Uni<Messages.StreamingInputCallResponse> done = mutiny.streamingInputCallBlocking(input);
+        assertThat(done).isNotNull();
+        done.await().atMost(TIMEOUT);
+    }
+
+    @Test
+    @Timeout(5)
+    public void testFullDuplexMethodWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.fullDuplexCall(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .allSatisfy(s -> {
+                    assertThat(s).contains("eventloop");
+                });
+    }
+
+    @Test
+    @Timeout(5)
+    public void testFullDuplexMethodBlockingWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.fullDuplexCallBlocking(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .allSatisfy(s -> {
+                    assertThat(s).contains("worker");
+                });
+    }
+
+    @Test
+    public void testHalfDuplexMethodWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.halfDuplexCall(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .allSatisfy(s -> {
+                    assertThat(s).contains("eventloop");
+                });
+    }
+
+    @Test
+    public void testHalfDuplexMethodBlockingWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.halfDuplexCallBlocking(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .allSatisfy(s -> {
+                    assertThat(s).contains("worker");
+                });
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    @Test
+    public void testUnimplementedMethod() {
+        Assertions.assertThatThrownBy(
+                () -> service
+                        .unimplementedCall(EmptyProtos.Empty.newBuilder().build()))
+                .isInstanceOf(StatusRuntimeException.class).hasMessageContaining("UNIMPLEMENTED");
+
+        Assertions.assertThatThrownBy(
+                () -> service
+                        .unimplementedCallBlocking(EmptyProtos.Empty.newBuilder().build()))
+                .isInstanceOf(StatusRuntimeException.class).hasMessageContaining("UNIMPLEMENTED");
+    }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingMethodsWithMutinyImplTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingMethodsWithMutinyImplTest.java
new file mode 100644
index 0000000000000..b7c6b3c4a6c72
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingMethodsWithMutinyImplTest.java
@@ -0,0 +1,207 @@
+package io.quarkus.grpc.server.blocking;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.inject.Inject;
+
+import org.assertj.core.api.Assertions;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.EmptyProtos;
+
+import io.grpc.StatusRuntimeException;
+import io.grpc.testing.integration.Messages;
+import io.quarkus.grpc.blocking.BlockingTestServiceGrpc;
+import io.quarkus.grpc.blocking.MutinyBlockingTestServiceGrpc;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.server.services.AssertHelper;
+import io.quarkus.grpc.server.services.BlockingMutinyTestService;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public class BlockingMethodsWithMutinyImplTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(EmptyProtos.class.getPackage())
+                    .addPackage(Messages.class.getPackage())
+                    .addPackage(BlockingTestServiceGrpc.class.getPackage())
+                    .addClasses(BlockingMutinyTestService.class, AssertHelper.class))
+            .withConfigurationResource("blocking-test-config.properties");
+
+    protected static final Duration TIMEOUT = Duration.ofSeconds(5);
+
+    @Inject
+    @GrpcService("blocking-test")
+    BlockingTestServiceGrpc.BlockingTestServiceBlockingStub service;
+
+    @Inject
+    @GrpcService("blocking-test")
+    MutinyBlockingTestServiceGrpc.MutinyBlockingTestServiceStub mutiny;
+
+    @Test
+    @Timeout(5)
+    public void testEmpty() {
+        EmptyProtos.Empty empty = service
+                .emptyCall(EmptyProtos.Empty.newBuilder().build());
+        assertThat(empty).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testBlockingEmpty() {
+        EmptyProtos.Empty empty = service
+                .emptyCallBlocking(EmptyProtos.Empty.newBuilder().build());
+        assertThat(empty).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testUnaryMethod() {
+        Messages.SimpleResponse response = service
+                .unaryCall(Messages.SimpleRequest.newBuilder().build());
+        assertThat(response).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testUnaryMethodBlocking() {
+        Messages.SimpleResponse response = service
+                .unaryCallBlocking(Messages.SimpleRequest.newBuilder().build());
+        assertThat(response).isNotNull();
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingOutMethod() {
+        Iterator<Messages.StreamingOutputCallResponse> iterator = service
+                .streamingOutputCall(Messages.StreamingOutputCallRequest.newBuilder().build());
+        assertThat(iterator).isNotNull();
+        List<String> list = new CopyOnWriteArrayList<>();
+        iterator.forEachRemaining(so -> {
+            String content = so.getPayload().getBody().toStringUtf8();
+            list.add(content);
+        });
+        assertThat(list).containsExactly("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingOutMethodBlocking() {
+        Iterator<Messages.StreamingOutputCallResponse> iterator = service
+                .streamingOutputCallBlocking(Messages.StreamingOutputCallRequest.newBuilder().build());
+        assertThat(iterator).isNotNull();
+        List<String> list = new CopyOnWriteArrayList<>();
+        iterator.forEachRemaining(so -> {
+            String content = so.getPayload().getBody().toStringUtf8();
+            list.add(content);
+        });
+        assertThat(list).hasSize(10)
+                .containsExactly("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingInMethodWithMutinyClient() {
+        Multi<Messages.StreamingInputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingInputCallRequest.newBuilder().setPayload(p).build());
+        Uni<Messages.StreamingInputCallResponse> done = mutiny.streamingInputCall(input);
+        assertThat(done).isNotNull();
+        done.await().atMost(TIMEOUT);
+    }
+
+    @Test
+    @Timeout(5)
+    public void testStreamingInMethodBlockingWithMutinyClient() {
+        Multi<Messages.StreamingInputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingInputCallRequest.newBuilder().setPayload(p).build());
+        Uni<Messages.StreamingInputCallResponse> done = mutiny.streamingInputCallBlocking(input);
+        assertThat(done).isNotNull();
+        done.await().atMost(TIMEOUT);
+    }
+
+    @Test
+    @Timeout(5)
+    public void testFullDuplexMethodWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.fullDuplexCall(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .containsExactly("a1", "b2", "c3", "d4");
+    }
+
+    @Test
+    @Timeout(5)
+    public void testFullDuplexMethodBlockingWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.fullDuplexCallBlocking(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .containsExactly("a1", "b2", "c3", "d4");
+    }
+
+    @Test
+    @Timeout(5)
+    public void testHalfDuplexMethodWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.halfDuplexCall(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4).containsExactly("A", "B", "C", "D");
+
+    }
+
+    @Test
+    @Timeout(5)
+    public void testHalfDuplexMethodBlockingWithMutinyClient() {
+        Multi<Messages.StreamingOutputCallRequest> input = Multi.createFrom().items("a", "b", "c", "d")
+                .map(s -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(s)).build())
+                .map(p -> Messages.StreamingOutputCallRequest.newBuilder().setPayload(p).build());
+        List<String> response = mutiny.halfDuplexCallBlocking(input)
+                .map(o -> o.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .await().atMost(TIMEOUT);
+        assertThat(response).isNotNull().hasSize(4)
+                .containsExactly("A", "B", "C", "D");
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    @Test
+    public void testUnimplementedMethod() {
+        Assertions.assertThatThrownBy(
+                () -> service
+                        .unimplementedCall(EmptyProtos.Empty.newBuilder().build()))
+                .isInstanceOf(StatusRuntimeException.class).hasMessageContaining("UNIMPLEMENTED");
+
+        Assertions.assertThatThrownBy(
+                () -> service
+                        .unimplementedCallBlocking(EmptyProtos.Empty.newBuilder().build()))
+                .isInstanceOf(StatusRuntimeException.class).hasMessageContaining("UNIMPLEMENTED");
+    }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java
new file mode 100644
index 0000000000000..4c1b1df3ab022
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/blocking/BlockingServiceTest.java
@@ -0,0 +1,97 @@
+package io.quarkus.grpc.server.blocking;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import grpc.health.v1.HealthGrpc;
+import grpc.health.v1.HealthOuterClass;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.reflection.v1alpha.MutinyServerReflectionGrpc;
+import io.grpc.reflection.v1alpha.ServerReflectionRequest;
+import io.grpc.reflection.v1alpha.ServerReflectionResponse;
+import io.grpc.reflection.v1alpha.ServiceResponse;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.runtime.health.GrpcHealthStorage;
+import io.quarkus.grpc.server.services.BlockingMutinyHelloService;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+
+public class BlockingServiceTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(HealthGrpc.class.getPackage())
+                    .addPackage(GreeterGrpc.class.getPackage())
+                    .addClasses(BlockingMutinyHelloService.class))
+            .withConfigurationResource("reflection-config.properties");
+
+    protected ManagedChannel channel;
+
+    @Inject
+    GrpcHealthStorage healthService;
+
+    @Inject
+    @GrpcService("reflection-service")
+    MutinyServerReflectionGrpc.MutinyServerReflectionStub reflection;
+
+    @BeforeEach
+    public void init() {
+        channel = ManagedChannelBuilder.forAddress("localhost", 9000)
+                .usePlaintext()
+                .build();
+    }
+
+    @AfterEach
+    public void shutdown() {
+        if (channel != null) {
+            channel.shutdownNow();
+        }
+    }
+
+    @Test
+    public void testInvokingABlockingService() {
+        HelloReply reply = GreeterGrpc.newBlockingStub(channel)
+                .sayHello(HelloRequest.newBuilder().setName("neo").build());
+        assertThat(reply.getMessage()).contains("worker-thread", "neo");
+    }
+
+    @Test
+    public void testHealth() {
+        assertThat(healthService.getStatuses())
+                .contains(entry("helloworld.Greeter", HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING));
+    }
+
+    @Test
+    public void testReflection() {
+        ServerReflectionRequest request = ServerReflectionRequest.newBuilder().setHost("localhost")
+                .setListServices("").build();
+
+        ServerReflectionResponse response = invoke(request);
+        List<ServiceResponse> list = response.getListServicesResponse().getServiceList();
+        assertThat(list).hasSize(2)
+                .anySatisfy(r -> assertThat(r.getName()).isEqualTo("helloworld.Greeter"))
+                .anySatisfy(r -> assertThat(r.getName()).isEqualTo("grpc.health.v1.Health"));
+    }
+
+    private ServerReflectionResponse invoke(ServerReflectionRequest request) {
+        return reflection.serverReflectionInfo(Multi.createFrom().item(request))
+                .collectItems().first()
+                .await().indefinitely();
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/GrpcDevModeTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/GrpcDevModeTest.java
index 95e26ba115a29..ba79bfa7be652 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/GrpcDevModeTest.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/devmode/GrpcDevModeTest.java
@@ -105,7 +105,7 @@ public void testReloadBeforeRest() {
     public void testEchoStreamReload() {
         final CopyOnWriteArrayList<String> results = new CopyOnWriteArrayList<>();
         CompletionStage<Boolean> firstStreamFinished = callEcho("foo", results);
-        Awaitility.await().atMost(1, TimeUnit.SECONDS)
+        Awaitility.await().atMost(10, TimeUnit.SECONDS)
                 .until(() -> results, Matchers.hasItem("echo::foo"));
 
         test.modifySourceFile("DevModeTestStreamService.java",
@@ -113,7 +113,7 @@ public void testEchoStreamReload() {
 
         final CopyOnWriteArrayList<String> newResults = new CopyOnWriteArrayList<>();
         callEcho("foo", newResults);
-        Awaitility.await().atMost(5, TimeUnit.SECONDS)
+        Awaitility.await().atMost(10, TimeUnit.SECONDS)
                 .until(() -> newResults, Matchers.hasItem("newecho::foo"));
         assertThat(firstStreamFinished).isCompleted();
     }
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/AssertHelper.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/AssertHelper.java
new file mode 100644
index 0000000000000..93b6cd2a7838e
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/AssertHelper.java
@@ -0,0 +1,25 @@
+package io.quarkus.grpc.server.services;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.quarkus.arc.Arc;
+import io.vertx.core.Vertx;
+
+public class AssertHelper {
+
+    public static void assertThatTheRequestScopeIsActive() {
+        assertThat(Arc.container().requestContext().isActive()).isTrue();
+    }
+
+    public static void assertRunOnEventLoop() {
+        assertThat(Vertx.currentContext()).isNotNull();
+        assertThat(Vertx.currentContext().isEventLoopContext());
+        assertThat(Thread.currentThread().getName()).contains("eventloop");
+    }
+
+    public static void assertRunOnWorker() {
+        assertThat(Vertx.currentContext()).isNotNull();
+        assertThat(Thread.currentThread().getName()).contains("worker");
+    }
+
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyHelloService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyHelloService.java
new file mode 100644
index 0000000000000..e4cefb2947337
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyHelloService.java
@@ -0,0 +1,22 @@
+
+package io.quarkus.grpc.server.services;
+
+import javax.inject.Singleton;
+
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.examples.helloworld.MutinyGreeterGrpc;
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.mutiny.Uni;
+
+@Singleton
+public class BlockingMutinyHelloService extends MutinyGreeterGrpc.GreeterImplBase {
+
+    @Override
+    @Blocking
+    public Uni<HelloReply> sayHello(HelloRequest request) {
+        return Uni.createFrom().item(request.getName())
+                .map(s -> Thread.currentThread().getName() + " " + s)
+                .map(s -> HelloReply.newBuilder().setMessage(s).build());
+    }
+}
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyTestService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyTestService.java
new file mode 100644
index 0000000000000..84c44ea012d09
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingMutinyTestService.java
@@ -0,0 +1,169 @@
+package io.quarkus.grpc.server.services;
+
+import static io.quarkus.grpc.server.services.AssertHelper.assertRunOnEventLoop;
+import static io.quarkus.grpc.server.services.AssertHelper.assertRunOnWorker;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.inject.Singleton;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.EmptyProtos;
+
+import io.grpc.testing.integration.Messages;
+import io.quarkus.grpc.blocking.MutinyBlockingTestServiceGrpc;
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+@Singleton
+public class BlockingMutinyTestService
+        extends MutinyBlockingTestServiceGrpc.BlockingTestServiceImplBase {
+
+    @Override
+    public Uni<EmptyProtos.Empty> emptyCall(EmptyProtos.Empty request) {
+        assertThat(request).isNotNull();
+        assertRunOnEventLoop();
+        return Uni.createFrom().item(EmptyProtos.Empty.newBuilder().build());
+    }
+
+    @Override
+    @Blocking
+    public Uni<EmptyProtos.Empty> emptyCallBlocking(EmptyProtos.Empty request) {
+        assertThat(request).isNotNull();
+        assertRunOnWorker();
+        return Uni.createFrom().item(EmptyProtos.Empty.newBuilder().build());
+    }
+
+    @Override
+    public Uni<Messages.SimpleResponse> unaryCall(Messages.SimpleRequest request) {
+        assertThat(request).isNotNull();
+        assertRunOnEventLoop();
+        return Uni.createFrom().item(Messages.SimpleResponse.newBuilder().build());
+    }
+
+    @Override
+    @Blocking
+    public Uni<Messages.SimpleResponse> unaryCallBlocking(Messages.SimpleRequest request) {
+        assertThat(request).isNotNull();
+        assertRunOnWorker();
+        return Uni.createFrom().item(Messages.SimpleResponse.newBuilder().build());
+    }
+
+    @Override
+    public Multi<Messages.StreamingOutputCallResponse> streamingOutputCall(
+            Messages.StreamingOutputCallRequest request) {
+        assertThat(request).isNotNull();
+        assertRunOnEventLoop();
+        return Multi.createFrom().range(0, 10)
+                .map(i -> ByteString.copyFromUtf8(Integer.toString(i)))
+                .map(s -> Messages.Payload.newBuilder().setBody(s).build())
+                .map(p -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(p).build());
+    }
+
+    @Override
+    @Blocking
+    public Multi<Messages.StreamingOutputCallResponse> streamingOutputCallBlocking(
+            Messages.StreamingOutputCallRequest request) {
+        assertThat(request).isNotNull();
+        assertRunOnWorker();
+        return Multi.createFrom().range(0, 10)
+                .map(i -> ByteString.copyFromUtf8(Integer.toString(i)))
+                .map(s -> Messages.Payload.newBuilder().setBody(s).build())
+                .map(p -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(p).build());
+    }
+
+    @Override
+    public Uni<Messages.StreamingInputCallResponse> streamingInputCall(
+            Multi<Messages.StreamingInputCallRequest> request) {
+        assertRunOnEventLoop();
+        return request.map(i -> i.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .map(list -> {
+                    assertRunOnEventLoop();
+                    assertThat(list).containsExactly("a", "b", "c", "d");
+                    return Messages.StreamingInputCallResponse.newBuilder().build();
+                });
+    }
+
+    @Override
+    @Blocking
+    public Uni<Messages.StreamingInputCallResponse> streamingInputCallBlocking(
+            Multi<Messages.StreamingInputCallRequest> request) {
+        assertRunOnWorker();
+        return request.map(i -> i.getPayload().getBody().toStringUtf8())
+                .collectItems().asList()
+                .map(list -> {
+                    assertRunOnWorker();
+                    assertThat(list).containsExactly("a", "b", "c", "d");
+                    return Messages.StreamingInputCallResponse.newBuilder().build();
+                });
+    }
+
+    @Override
+    public Multi<Messages.StreamingOutputCallResponse> fullDuplexCall(
+            Multi<Messages.StreamingOutputCallRequest> request) {
+        AtomicInteger counter = new AtomicInteger();
+        assertRunOnEventLoop();
+        return request
+                .map(r -> r.getPayload().getBody().toStringUtf8())
+                .map(r -> {
+                    assertRunOnEventLoop();
+                    return r + counter.incrementAndGet();
+                })
+                .map(r -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(r)).build())
+                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build());
+    }
+
+    @Override
+    @Blocking
+    public Multi<Messages.StreamingOutputCallResponse> fullDuplexCallBlocking(
+            Multi<Messages.StreamingOutputCallRequest> request) {
+        AtomicInteger counter = new AtomicInteger();
+        assertRunOnWorker();
+        return request
+                .map(r -> r.getPayload().getBody().toStringUtf8())
+                .map(r -> {
+                    assertRunOnWorker();
+                    return r + counter.incrementAndGet();
+                })
+                .map(r -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(r)).build())
+                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build());
+    }
+
+    @Override
+    public Multi<Messages.StreamingOutputCallResponse> halfDuplexCall(
+            Multi<Messages.StreamingOutputCallRequest> request) {
+        assertRunOnEventLoop();
+        return request
+                .map(r -> {
+                    assertRunOnEventLoop();
+                    return r.getPayload().getBody().toStringUtf8();
+                })
+                .map(String::toUpperCase)
+                .collectItems().asList()
+                .onItem().transformToMulti(s -> Multi.createFrom().iterable(s))
+                .map(r -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(r)).build())
+                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build());
+
+    }
+
+    @Override
+    @Blocking
+    public Multi<Messages.StreamingOutputCallResponse> halfDuplexCallBlocking(
+            Multi<Messages.StreamingOutputCallRequest> request) {
+        assertRunOnWorker();
+        return request
+                .map(r -> {
+                    assertRunOnWorker();
+                    return r.getPayload().getBody().toStringUtf8();
+                })
+                .map(String::toUpperCase)
+                .collectItems().asList()
+                .onItem().transformToMulti(s -> Multi.createFrom().iterable(s))
+                .map(r -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(r)).build())
+                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build());
+
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingTestService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingTestService.java
new file mode 100644
index 0000000000000..655ae9610ace3
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/BlockingTestService.java
@@ -0,0 +1,269 @@
+package io.quarkus.grpc.server.services;
+
+import static io.quarkus.grpc.server.services.AssertHelper.assertRunOnEventLoop;
+import static io.quarkus.grpc.server.services.AssertHelper.assertRunOnWorker;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.inject.Singleton;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.EmptyProtos;
+
+import io.grpc.stub.StreamObserver;
+import io.grpc.testing.integration.Messages;
+import io.quarkus.grpc.blocking.BlockingTestServiceGrpc;
+import io.smallrye.common.annotation.Blocking;
+
+@Singleton
+public class BlockingTestService extends BlockingTestServiceGrpc.BlockingTestServiceImplBase {
+
+    @Override
+    public void emptyCall(EmptyProtos.Empty request, StreamObserver<EmptyProtos.Empty> responseObserver) {
+        assertThat(request).isNotNull();
+        assertRunOnEventLoop();
+        responseObserver.onNext(EmptyProtos.Empty.newBuilder().build());
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    @Blocking
+    public void emptyCallBlocking(EmptyProtos.Empty request, StreamObserver<EmptyProtos.Empty> responseObserver) {
+        assertThat(request).isNotNull();
+        assertRunOnWorker();
+        responseObserver.onNext(EmptyProtos.Empty.newBuilder().build());
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    public void unaryCall(Messages.SimpleRequest request,
+            StreamObserver<Messages.SimpleResponse> responseObserver) {
+        assertThat(request).isNotNull();
+        assertRunOnEventLoop();
+        responseObserver.onNext(Messages.SimpleResponse.newBuilder().build());
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    @Blocking
+    public void unaryCallBlocking(Messages.SimpleRequest request,
+            StreamObserver<Messages.SimpleResponse> responseObserver) {
+        assertThat(request).isNotNull();
+        assertRunOnWorker();
+        responseObserver.onNext(Messages.SimpleResponse.newBuilder().build());
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    public void streamingOutputCall(Messages.StreamingOutputCallRequest request,
+            StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        assertThat(request).isNotNull();
+        assertRunOnEventLoop();
+        for (int i = 0; i < 10; i++) {
+            ByteString value = ByteString.copyFromUtf8(i + "-" + Thread.currentThread().getName());
+            Messages.Payload payload = Messages.Payload.newBuilder().setBody(value).build();
+            responseObserver.onNext(Messages.StreamingOutputCallResponse.newBuilder().setPayload(payload).build());
+        }
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    @Blocking
+    public void streamingOutputCallBlocking(Messages.StreamingOutputCallRequest request,
+            StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        assertThat(request).isNotNull();
+        assertRunOnWorker();
+        for (int i = 0; i < 10; i++) {
+            ByteString value = ByteString.copyFromUtf8(i + "-" + Thread.currentThread().getName());
+            Messages.Payload payload = Messages.Payload.newBuilder().setBody(value).build();
+            responseObserver.onNext(Messages.StreamingOutputCallResponse.newBuilder().setPayload(payload).build());
+        }
+        responseObserver.onCompleted();
+    }
+
+    @Override
+    public StreamObserver<Messages.StreamingInputCallRequest> streamingInputCall(
+            StreamObserver<Messages.StreamingInputCallResponse> responseObserver) {
+        List<String> list = new CopyOnWriteArrayList<>();
+        assertRunOnEventLoop();
+        return new StreamObserver<Messages.StreamingInputCallRequest>() {
+            @Override
+            public void onNext(Messages.StreamingInputCallRequest streamingInputCallRequest) {
+                assertRunOnEventLoop();
+                list.add(streamingInputCallRequest.getPayload().getBody().toStringUtf8());
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                responseObserver.onError(throwable);
+            }
+
+            @Override
+            public void onCompleted() {
+                assertThat(list).containsExactly("a", "b", "c", "d");
+                assertRunOnEventLoop();
+                responseObserver.onNext(Messages.StreamingInputCallResponse.newBuilder().build());
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    @Override
+    @Blocking
+    public StreamObserver<Messages.StreamingInputCallRequest> streamingInputCallBlocking(
+            StreamObserver<Messages.StreamingInputCallResponse> responseObserver) {
+        List<String> list = new CopyOnWriteArrayList<>();
+        assertRunOnWorker();
+        return new StreamObserver<Messages.StreamingInputCallRequest>() {
+            @Override
+            public void onNext(Messages.StreamingInputCallRequest streamingInputCallRequest) {
+                assertRunOnWorker();
+                list.add(streamingInputCallRequest.getPayload().getBody().toStringUtf8());
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                responseObserver.onError(throwable);
+            }
+
+            @Override
+            public void onCompleted() {
+                assertThat(list).containsExactly("a", "b", "c", "d");
+                assertRunOnWorker();
+                responseObserver.onNext(Messages.StreamingInputCallResponse.newBuilder().build());
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    @Override
+    public StreamObserver<Messages.StreamingOutputCallRequest> fullDuplexCall(
+            StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        AtomicInteger counter = new AtomicInteger();
+        assertRunOnEventLoop();
+        return new StreamObserver<Messages.StreamingOutputCallRequest>() {
+            @Override
+            public void onNext(Messages.StreamingOutputCallRequest streamingOutputCallRequest) {
+                assertRunOnEventLoop();
+                Messages.Payload payload = streamingOutputCallRequest.getPayload();
+                ByteString value = ByteString
+                        .copyFromUtf8(payload.getBody().toStringUtf8() + counter.incrementAndGet() + "-"
+                                + Thread.currentThread().getName());
+                Messages.Payload resp = Messages.Payload.newBuilder().setBody(value).build();
+                Messages.StreamingOutputCallResponse response = Messages.StreamingOutputCallResponse.newBuilder()
+                        .setPayload(resp).build();
+                responseObserver.onNext(response);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                responseObserver.onError(throwable);
+            }
+
+            @Override
+            public void onCompleted() {
+                assertRunOnEventLoop();
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    @Override
+    @Blocking
+    public StreamObserver<Messages.StreamingOutputCallRequest> fullDuplexCallBlocking(
+            StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        AtomicInteger counter = new AtomicInteger();
+        assertRunOnWorker();
+        return new StreamObserver<Messages.StreamingOutputCallRequest>() {
+            @Override
+            public void onNext(Messages.StreamingOutputCallRequest streamingOutputCallRequest) {
+                assertRunOnWorker();
+                Messages.Payload payload = streamingOutputCallRequest.getPayload();
+                ByteString value = ByteString
+                        .copyFromUtf8(payload.getBody().toStringUtf8() + counter.incrementAndGet() + "-"
+                                + Thread.currentThread().getName());
+                Messages.Payload resp = Messages.Payload.newBuilder().setBody(value).build();
+                Messages.StreamingOutputCallResponse response = Messages.StreamingOutputCallResponse.newBuilder()
+                        .setPayload(resp).build();
+                responseObserver.onNext(response);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                responseObserver.onError(throwable);
+            }
+
+            @Override
+            public void onCompleted() {
+                assertRunOnWorker();
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    @Override
+    public StreamObserver<Messages.StreamingOutputCallRequest> halfDuplexCall(
+            StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        assertRunOnEventLoop();
+        List<Messages.StreamingOutputCallResponse> list = new CopyOnWriteArrayList<>();
+        return new StreamObserver<Messages.StreamingOutputCallRequest>() {
+            @Override
+            public void onNext(Messages.StreamingOutputCallRequest streamingOutputCallRequest) {
+                assertRunOnEventLoop();
+                String payload = streamingOutputCallRequest.getPayload().getBody().toStringUtf8();
+                ByteString value = ByteString.copyFromUtf8(payload.toUpperCase() + "-" + Thread.currentThread().getName());
+                Messages.Payload response = Messages.Payload.newBuilder().setBody(value).build();
+                Messages.StreamingOutputCallResponse resp = Messages.StreamingOutputCallResponse.newBuilder()
+                        .setPayload(response).build();
+                list.add(resp);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                responseObserver.onError(throwable);
+            }
+
+            @Override
+            public void onCompleted() {
+                assertRunOnEventLoop();
+                list.forEach(responseObserver::onNext);
+                responseObserver.onCompleted();
+            }
+        };
+    }
+
+    @Override
+    @Blocking
+    public StreamObserver<Messages.StreamingOutputCallRequest> halfDuplexCallBlocking(
+            StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        assertRunOnWorker();
+        List<Messages.StreamingOutputCallResponse> list = new CopyOnWriteArrayList<>();
+        return new StreamObserver<Messages.StreamingOutputCallRequest>() {
+            @Override
+            public void onNext(Messages.StreamingOutputCallRequest streamingOutputCallRequest) {
+                assertRunOnWorker();
+                String payload = streamingOutputCallRequest.getPayload().getBody().toStringUtf8();
+                ByteString value = ByteString.copyFromUtf8(payload.toUpperCase() + "-" + Thread.currentThread().getName());
+                Messages.Payload response = Messages.Payload.newBuilder().setBody(value).build();
+                Messages.StreamingOutputCallResponse resp = Messages.StreamingOutputCallResponse.newBuilder()
+                        .setPayload(response).build();
+                list.add(resp);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                responseObserver.onError(throwable);
+            }
+
+            @Override
+            public void onCompleted() {
+                assertRunOnWorker();
+                list.forEach(responseObserver::onNext);
+                responseObserver.onCompleted();
+            }
+        };
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/GoodbyeService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/GoodbyeService.java
new file mode 100644
index 0000000000000..9d27797112d66
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/GoodbyeService.java
@@ -0,0 +1,18 @@
+package io.quarkus.grpc.server.services;
+
+import javax.inject.Singleton;
+
+import io.grpc.examples.goodbyeworld.FarewellGrpc;
+import io.grpc.examples.goodbyeworld.GoodbyeReply;
+import io.grpc.examples.goodbyeworld.GoodbyeRequest;
+import io.grpc.stub.StreamObserver;
+
+@Singleton
+public class GoodbyeService extends FarewellGrpc.FarewellImplBase {
+
+    @Override
+    public void sayGoodbye(GoodbyeRequest request, StreamObserver<GoodbyeReply> responseObserver) {
+        responseObserver.onNext(GoodbyeReply.newBuilder().setMessage("Goodbye " + request.getName()).build());
+        responseObserver.onCompleted();
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/GrpcCallWithinBlockingService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/GrpcCallWithinBlockingService.java
new file mode 100644
index 0000000000000..6040db97944cb
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/GrpcCallWithinBlockingService.java
@@ -0,0 +1,30 @@
+package io.quarkus.grpc.server.services;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.examples.helloworld3.Greeter3Grpc;
+import io.grpc.examples.helloworld3.HelloReply3;
+import io.grpc.examples.helloworld3.HelloRequest3;
+import io.grpc.stub.StreamObserver;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.smallrye.common.annotation.Blocking;
+
+@Singleton
+public class GrpcCallWithinBlockingService extends Greeter3Grpc.Greeter3ImplBase {
+
+    @Inject
+    @GrpcService("greeter")
+    GreeterGrpc.GreeterBlockingStub greeter;
+
+    @Override
+    @Blocking
+    public void sayHello(HelloRequest3 request, StreamObserver<HelloReply3> responseObserver) {
+        HelloReply reply = greeter.sayHello(HelloRequest.newBuilder().setName(request.getName()).build());
+        responseObserver.onNext(HelloReply3.newBuilder().setMessage("response:" + reply.getMessage()).build());
+        responseObserver.onCompleted();
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyGoodbyeService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyGoodbyeService.java
new file mode 100644
index 0000000000000..c07ddd92f8ae9
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyGoodbyeService.java
@@ -0,0 +1,19 @@
+package io.quarkus.grpc.server.services;
+
+import javax.inject.Singleton;
+
+import io.grpc.examples.goodbyeworld.GoodbyeReply;
+import io.grpc.examples.goodbyeworld.GoodbyeRequest;
+import io.grpc.examples.goodbyeworld.MutinyFarewellGrpc;
+import io.smallrye.mutiny.Uni;
+
+@Singleton
+public class MutinyGoodbyeService extends MutinyFarewellGrpc.FarewellImplBase {
+
+    @Override
+    public Uni<GoodbyeReply> sayGoodbye(GoodbyeRequest request) {
+        return Uni.createFrom().item(request.getName())
+                .map(s -> "Goodbye " + s)
+                .map(s -> GoodbyeReply.newBuilder().setMessage(s).build());
+    }
+}
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyTestService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyTestService.java
index 1cd32ebd4467f..6343fb0e31158 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyTestService.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/MutinyTestService.java
@@ -1,5 +1,6 @@
 package io.quarkus.grpc.server.services;
 
+import static io.quarkus.grpc.server.services.AssertHelper.assertThatTheRequestScopeIsActive;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ -20,12 +21,14 @@ public class MutinyTestService extends MutinyTestServiceGrpc.TestServiceImplBase
     @Override
     public Uni<EmptyProtos.Empty> emptyCall(EmptyProtos.Empty request) {
         assertThat(request).isNotNull();
+        assertThatTheRequestScopeIsActive();
         return Uni.createFrom().item(EmptyProtos.Empty.newBuilder().build());
     }
 
     @Override
     public Uni<Messages.SimpleResponse> unaryCall(Messages.SimpleRequest request) {
         assertThat(request).isNotNull();
+        assertThatTheRequestScopeIsActive();
         return Uni.createFrom().item(Messages.SimpleResponse.newBuilder().build());
     }
 
@@ -33,44 +36,51 @@ public Uni<Messages.SimpleResponse> unaryCall(Messages.SimpleRequest request) {
     public Multi<Messages.StreamingOutputCallResponse> streamingOutputCall(
             Messages.StreamingOutputCallRequest request) {
         assertThat(request).isNotNull();
+        assertThatTheRequestScopeIsActive();
         return Multi.createFrom().range(0, 10)
                 .map(i -> ByteString.copyFromUtf8(Integer.toString(i)))
                 .map(s -> Messages.Payload.newBuilder().setBody(s).build())
-                .map(p -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(p).build());
+                .map(p -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(p).build())
+                .onItem().invoke(() -> assertThatTheRequestScopeIsActive());
     }
 
     @Override
     public Uni<Messages.StreamingInputCallResponse> streamingInputCall(
             Multi<Messages.StreamingInputCallRequest> request) {
+        assertThatTheRequestScopeIsActive();
         return request.map(i -> i.getPayload().getBody().toStringUtf8())
                 .collectItems().asList()
                 .map(list -> {
                     assertThat(list).containsExactly("a", "b", "c", "d");
                     return Messages.StreamingInputCallResponse.newBuilder().build();
-                });
+                })
+                .onItem().invoke(() -> assertThatTheRequestScopeIsActive());
     }
 
     @Override
     public Multi<Messages.StreamingOutputCallResponse> fullDuplexCall(
             Multi<Messages.StreamingOutputCallRequest> request) {
+        assertThatTheRequestScopeIsActive();
         AtomicInteger counter = new AtomicInteger();
         return request
                 .map(r -> r.getPayload().getBody().toStringUtf8())
                 .map(r -> r + counter.incrementAndGet())
                 .map(r -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(r)).build())
-                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build());
+                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build())
+                .onItem().invoke(() -> assertThatTheRequestScopeIsActive());
     }
 
     @Override
     public Multi<Messages.StreamingOutputCallResponse> halfDuplexCall(
             Multi<Messages.StreamingOutputCallRequest> request) {
+        assertThatTheRequestScopeIsActive();
         return request
                 .map(r -> r.getPayload().getBody().toStringUtf8())
                 .map(String::toUpperCase)
                 .collectItems().asList()
                 .onItem().transformToMulti(s -> Multi.createFrom().iterable(s))
                 .map(r -> Messages.Payload.newBuilder().setBody(ByteString.copyFromUtf8(r)).build())
-                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build());
-
+                .map(r -> Messages.StreamingOutputCallResponse.newBuilder().setPayload(r).build())
+                .onItem().invoke(() -> assertThatTheRequestScopeIsActive());
     }
 }
diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/TestService.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/TestService.java
index ee8acb863a54e..79c5749c867fe 100644
--- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/TestService.java
+++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/server/services/TestService.java
@@ -1,5 +1,6 @@
 package io.quarkus.grpc.server.services;
 
+import static io.quarkus.grpc.server.services.AssertHelper.assertThatTheRequestScopeIsActive;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
@@ -20,6 +21,7 @@ public class TestService extends TestServiceGrpc.TestServiceImplBase {
 
     @Override
     public void emptyCall(EmptyProtos.Empty request, StreamObserver<EmptyProtos.Empty> responseObserver) {
+        assertThatTheRequestScopeIsActive();
         assertThat(request).isNotNull();
         responseObserver.onNext(EmptyProtos.Empty.newBuilder().build());
         responseObserver.onCompleted();
@@ -28,6 +30,7 @@ public void emptyCall(EmptyProtos.Empty request, StreamObserver<EmptyProtos.Empt
     @Override
     public void unaryCall(Messages.SimpleRequest request,
             StreamObserver<Messages.SimpleResponse> responseObserver) {
+        assertThatTheRequestScopeIsActive();
         assertThat(request).isNotNull();
         responseObserver.onNext(Messages.SimpleResponse.newBuilder().build());
         responseObserver.onCompleted();
@@ -36,18 +39,27 @@ public void unaryCall(Messages.SimpleRequest request,
     @Override
     public void streamingOutputCall(Messages.StreamingOutputCallRequest request,
             StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        assertThatTheRequestScopeIsActive();
         assertThat(request).isNotNull();
         for (int i = 0; i < 10; i++) {
             ByteString value = ByteString.copyFromUtf8(Integer.toString(i));
             Messages.Payload payload = Messages.Payload.newBuilder().setBody(value).build();
             responseObserver.onNext(Messages.StreamingOutputCallResponse.newBuilder().setPayload(payload).build());
         }
-        responseObserver.onCompleted();
+        // Send the completion signal on another thread.
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                responseObserver.onCompleted();
+            }
+        }).start();
+
     }
 
     @Override
     public StreamObserver<Messages.StreamingInputCallRequest> streamingInputCall(
             StreamObserver<Messages.StreamingInputCallResponse> responseObserver) {
+        assertThatTheRequestScopeIsActive();
         List<String> list = new CopyOnWriteArrayList<>();
         return new StreamObserver<Messages.StreamingInputCallRequest>() {
             @Override
@@ -64,6 +76,7 @@ public void onError(Throwable throwable) {
             public void onCompleted() {
                 assertThat(list).containsExactly("a", "b", "c", "d");
                 responseObserver.onNext(Messages.StreamingInputCallResponse.newBuilder().build());
+                assertThatTheRequestScopeIsActive();
                 responseObserver.onCompleted();
             }
         };
@@ -74,6 +87,7 @@ public void onCompleted() {
     @Override
     public StreamObserver<Messages.StreamingOutputCallRequest> fullDuplexCall(
             StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
+        assertThatTheRequestScopeIsActive();
         AtomicInteger counter = new AtomicInteger();
         return new StreamObserver<Messages.StreamingOutputCallRequest>() {
             @Override
@@ -94,6 +108,7 @@ public void onError(Throwable throwable) {
 
             @Override
             public void onCompleted() {
+                assertThatTheRequestScopeIsActive();
                 responseObserver.onCompleted();
             }
         };
@@ -102,7 +117,7 @@ public void onCompleted() {
     @Override
     public StreamObserver<Messages.StreamingOutputCallRequest> halfDuplexCall(
             StreamObserver<Messages.StreamingOutputCallResponse> responseObserver) {
-
+        assertThatTheRequestScopeIsActive();
         List<Messages.StreamingOutputCallResponse> list = new CopyOnWriteArrayList<>();
         return new StreamObserver<Messages.StreamingOutputCallRequest>() {
             @Override
@@ -122,6 +137,7 @@ public void onError(Throwable throwable) {
 
             @Override
             public void onCompleted() {
+                assertThatTheRequestScopeIsActive();
                 list.forEach(responseObserver::onNext);
                 responseObserver.onCompleted();
             }
diff --git a/extensions/grpc/deployment/src/test/proto/blocking-test.proto b/extensions/grpc/deployment/src/test/proto/blocking-test.proto
new file mode 100644
index 0000000000000..ad54c492f63d6
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/proto/blocking-test.proto
@@ -0,0 +1,40 @@
+syntax = "proto3";
+
+import "empty.proto";
+import "messages.proto";
+
+package grpc.testing;
+
+option java_package = "io.quarkus.grpc.blocking";
+
+// Expect implementation to use @Blocking on method with names suffixed with Blocking
+service BlockingTestService {
+    // Called on event loop
+    rpc EmptyCall (grpc.testing.Empty) returns (grpc.testing.Empty);
+
+    // Called on blocking
+    rpc EmptyCallBlocking (grpc.testing.Empty) returns (grpc.testing.Empty);
+
+    // The response contains the thread name
+    rpc UnaryCall (SimpleRequest) returns (SimpleResponse);
+    rpc UnaryCallBlocking (SimpleRequest) returns (SimpleResponse);
+    // The response contains the thread name in each item
+    rpc StreamingOutputCall (StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse);
+    rpc StreamingOutputCallBlocking (StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse);
+
+    // The response contains the thread name
+    rpc StreamingInputCall (stream StreamingInputCallRequest) returns (StreamingInputCallResponse);
+    rpc StreamingInputCallBlocking (stream StreamingInputCallRequest) returns (StreamingInputCallResponse);
+
+    rpc FullDuplexCall (stream StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse);
+    rpc FullDuplexCallBlocking (stream StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse);
+
+    rpc HalfDuplexCall (stream StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse);
+    rpc HalfDuplexCallBlocking (stream StreamingOutputCallRequest) returns (stream StreamingOutputCallResponse);
+
+    // The test server will not implement this method. It will be used
+    // to test the behavior when clients call unimplemented methods.
+    rpc UnimplementedCall (grpc.testing.Empty) returns (grpc.testing.Empty);
+    rpc UnimplementedCallBlocking (grpc.testing.Empty) returns (grpc.testing.Empty);
+}
+
diff --git a/extensions/grpc/deployment/src/test/proto/goodbyeworld.proto b/extensions/grpc/deployment/src/test/proto/goodbyeworld.proto
new file mode 100644
index 0000000000000..f86e335ebe66d
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/proto/goodbyeworld.proto
@@ -0,0 +1,24 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "io.grpc.examples.goodbyeworld";
+option java_outer_classname = "GoodbyeWorldProto";
+option objc_class_prefix = "GBW";
+
+package goodbyeworld;
+
+// The farewell service definition.
+service Farewell {
+    // Sends a farewell
+    rpc SayGoodbye (GoodbyeRequest) returns (GoodbyeReply) {}
+}
+
+// The request message containing the user's name.
+message GoodbyeRequest {
+    string name = 1;
+}
+
+// The response message containing the farewells
+message GoodbyeReply {
+    string message = 1;
+}
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/proto/helloworld3.proto b/extensions/grpc/deployment/src/test/proto/helloworld3.proto
new file mode 100644
index 0000000000000..9a5827fb3c090
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/proto/helloworld3.proto
@@ -0,0 +1,24 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "io.grpc.examples.helloworld3";
+option java_outer_classname = "HelloWorldProto3";
+option objc_class_prefix = "HLW";
+
+package helloworld;
+
+// The greeting service definition.
+service Greeter3 {
+  // Sends a greeting
+  rpc SayHello (HelloRequest3) returns (HelloReply3) {}
+}
+
+// The request message containing the user's name.
+message HelloRequest3 {
+  string name = 1;
+}
+
+// The response message containing the greetings
+message HelloReply3 {
+  string message = 1;
+}
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/blocking-config.properties b/extensions/grpc/deployment/src/test/resources/blocking-config.properties
new file mode 100644
index 0000000000000..cef3311f67737
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/blocking-config.properties
@@ -0,0 +1,4 @@
+quarkus.grpc.clients.reflection-service.host=localhost
+quarkus.grpc.clients.test-service.host=localhost
+quarkus.grpc.clients.greeter-service.host=localhost
+quarkus.grpc.server.enable-reflection-service=true
diff --git a/extensions/grpc/deployment/src/test/resources/blocking-test-config.properties b/extensions/grpc/deployment/src/test/resources/blocking-test-config.properties
new file mode 100644
index 0000000000000..6077654bf8893
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/blocking-test-config.properties
@@ -0,0 +1,2 @@
+quarkus.grpc.clients.blocking-test.host=localhost
+quarkus.grpc.server.enable-reflection-service=true
diff --git a/extensions/grpc/deployment/src/test/resources/call-from-blocking-service.properties b/extensions/grpc/deployment/src/test/resources/call-from-blocking-service.properties
new file mode 100644
index 0000000000000..a05a7c427c735
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/call-from-blocking-service.properties
@@ -0,0 +1,2 @@
+quarkus.grpc.clients.greeter.host=localhost
+quarkus.grpc.clients.service3.host=localhost
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties b/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties
new file mode 100644
index 0000000000000..2ffa41c43d264
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/grpc-client-tls-configuration.properties
@@ -0,0 +1,5 @@
+quarkus.grpc.clients.hello.host=localhost
+quarkus.grpc.clients.hello.ssl.trust-store=src/test/resources/tls-from-file/ca.pem
+
+quarkus.grpc.server.ssl.certificate=src/test/resources/tls-from-file/server.pem
+quarkus.grpc.server.ssl.key=src/test/resources/tls-from-file/server.key
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/README.md b/extensions/grpc/deployment/src/test/resources/tls-from-file/README.md
new file mode 100644
index 0000000000000..8c1886e98b5e4
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/tls-from-file/README.md
@@ -0,0 +1,54 @@
+# Generating the certificates and keys
+
+The ca is self-signed:
+----------------------
+
+```bash
+openssl req -x509 -new -newkey rsa:2048 -nodes -keyout ca.key -out ca.pem \
+  -config ca-openssl.cnf -days 3650 -extensions v3_req
+```
+
+When prompted for certificate information, everything is default.
+
+Client is issued by CA:
+-----------------------
+
+```bash
+openssl genrsa -out client.key.rsa 2048
+openssl pkcs8 -topk8 -in client.key.rsa -out client.key -nocrypt
+openssl req -new -key client.key -out client.csr
+```
+
+When prompted for certificate information, everything is default except the
+common name which is set to `testclient`.
+
+```bash
+openssl x509 -req -CA ca.pem -CAkey ca.key -CAcreateserial -in client.csr \
+  -out client.pem -days 3650
+```
+
+server is issued by CA with a special config for subject alternative names:
+----------------------------------------------------------------------------
+
+```bash
+openssl genrsa -out server1.key.rsa 2048
+openssl pkcs8 -topk8 -in server.key.rsa -out server.key -nocrypt
+openssl req -new -key server.key -out server.csr -config server-openssl.cnf
+```
+
+When prompted for certificate information, everything is default except the
+common name which is set to `localhost`.
+
+```bash
+openssl x509 -req -CA ca.pem -CAkey ca.key -CAcreateserial -in server.csr \
+  -out server.pem -extfile server-openssl.cnf -days 3650
+```
+
+Cleanup
+-------
+
+```bash
+rm *.rsa
+rm *.csr
+rm ca.srl
+```
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/ca-openssl.cnf b/extensions/grpc/deployment/src/test/resources/tls-from-file/ca-openssl.cnf
new file mode 100644
index 0000000000000..7a8528ec2304a
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/tls-from-file/ca-openssl.cnf
@@ -0,0 +1,17 @@
+[req]
+distinguished_name  = req_distinguished_name
+req_extensions = v3_req
+
+[req_distinguished_name]
+countryName           = Country Name (2 letter code)
+countryName_default = FR
+stateOrProvinceName   = State or Province Name (full name)
+stateOrProvinceName_default = Some-State
+organizationName          = Organization Name (eg, company)
+organizationName_default = Acme Corp
+commonName            = Common Name (eg, YOUR name)
+commonName_default = testca
+
+[v3_req]
+basicConstraints = CA:true
+keyUsage = critical, keyCertSign
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/ca.pem b/extensions/grpc/deployment/src/test/resources/tls-from-file/ca.pem
new file mode 100644
index 0000000000000..b3c622bc96b47
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/tls-from-file/ca.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDMTCCAhmgAwIBAgIJAKH9BBbnY/fjMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlBY21lIENvcnAx
+DzANBgNVBAMMBnRlc3RjYTAeFw0yMDA0MDQwNzI5NTdaFw0zMDA0MDIwNzI5NTda
+MEcxCzAJBgNVBAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlB
+Y21lIENvcnAxDzANBgNVBAMMBnRlc3RjYTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJqJz93r5o5q+yr2zX97CZaW+6pqVhdf8x73x+/E+9fIML96pvUJ
+VQJSMVV+dOHqb860inw9WE7itckTlArB5vpVfjGunbCGOxNTgaUBMJeaalXgFUkL
+36mFpGhwXVaUVKdrCSbol3R/eKAc6qcN4g/plKgSnGtODjxd1za64OhZn3Cz8tUN
+yxmnGlFkOU7S3F8YF2aTmIjZZcs7JF93VmLyVzDkWzlySmKqXXt1xpzFADCMzHjR
+GuUaOilC9dstvfZHNhQv2TIBYHwltShYV/86J+p5RXlRkaHxfnqKgPenw82SehWs
+2eGkgLFnUp1Q9nTwIB4l7NmEyJzzTg0xMj8CAwEAAaMgMB4wDAYDVR0TBAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAAxVmtqKlPaXOIDv
+ZHaLLt0TdhukEqf13nMPSb6sxA0eOD3GNR3CUBMfftVRkEVjvqZRbYjJTnG9IW8E
+39tESrLPnoWEYdvDJBM4sTsG2JLVpaq6mNcMQABkAIjnbjq0yXK+WwP6Ug5HD7Ds
+r8hbiu5T039v0uHxJOM/+nhkyyHMsAYaAnUKQ9F0fbo8Jp/d5KK70k5hMpb2smr1
+cYVkN9AZlBgOeciFfO1RrWGsnTo3Aln6wciSXPqqj42t8WZJp1s11Lqcml1zJqHe
+dQkI9NjPZ67V0D0mytvIixchClMCl9E9AkXjGdapE1lQ3s6TK5t0COpo0VE4KAvd
+cXRzvCI=
+-----END CERTIFICATE-----
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/server-openssl.cnf b/extensions/grpc/deployment/src/test/resources/tls-from-file/server-openssl.cnf
new file mode 100644
index 0000000000000..3962a52d790d4
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/tls-from-file/server-openssl.cnf
@@ -0,0 +1,80 @@
+[req]
+distinguished_name  = req_distinguished_name
+req_extensions     = v3_req
+
+[req_distinguished_name]
+countryName           = Country Name (2 letter code)
+countryName_default   = FR
+stateOrProvinceName   = State or Province Name (full name)
+stateOrProvinceName_default = Some-State
+localityName          = Locality Name (eg, city)
+localityName_default  = Valence
+organizationName          = Organization Name (eg, company)
+organizationName_default  = Acme Corp
+commonName            = Common Name (eg, YOUR name)
+commonName_max        = 64
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= . # Where everything is kept
+certs		= $dir # Where the issued certs are kept
+crl_dir		= $dir		# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+new_certs_dir	= $dir		# default place for new certs.
+
+certificate	= $dir/ca.pem 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crlnumber	= $dir/crlnumber	# the current crl number
+					# must be commented out to leave a V1 CRL
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/cakey.pem# The private key
+RANDFILE	= $dir/private/.rand	# private random number file
+
+x509_extensions	= usr_cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt 	= ca_default		# Subject Name options
+cert_opt 	= ca_default		# Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions	= crl_ext
+
+default_days	= 365			# how long to certify for
+default_crl_days= 30			# how long before next CRL
+default_md	= default		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_anything
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+[v3_req]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = localhost
+DNS.2 = *.test.com
+IP.1 = "127.0.0.1"
+IP.2 = "192.168.1.3"
\ No newline at end of file
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/server.key b/extensions/grpc/deployment/src/test/resources/tls-from-file/server.key
new file mode 100644
index 0000000000000..b49d98c926e61
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/tls-from-file/server.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCy40A8Keuwa6aK
+NRxqa5nbrNpQnWF1hd9kO848UzUI06X9GLve459Q4KCNUDgUA1PL6zUaVbFpmLrp
+6iBimxr1u+HqVyYkha4veLXKA1+nLcp0gUOQTb4Dk6jHdGhgwIaPo8saFO9sY2Vy
++xh8MU8cepjZtxgt9cI/+RGQgg0uEz7NT3tjlX3b7Y7SQChv2fsA6ZuE/3v2XBLg
+zCgNEfdYh46B0pkE3Od3xq+cieOOuFHCeHFX+wZcCJWHa7tLxsgKIp+QohqG4MoF
+KWCf7484nu8EYd7YzNdzPN6XmcQuw2IUr2YjDFaY0EZ6ERTkSRoMBbvjq9bGPYix
+kPHwQnOFAgMBAAECggEBAJP7yJy8tRvpwgidLRegUdRXZva/aus0xvt9OfvPfZUC
+uVLpzijxtk7KtCaS0QFFS2Hq/q/9admIHj/5jbbkxuW3+ojIdWZLLDBbNE+cgNmk
+2NGOSZ0rouAEm9/8HYjEW8yh3BeEcBgDFd6Ld9LtW5uck6uvepIytvIDEhOwckTF
+BtrtJubHIAjeTFfdikcNuQbQHwWDWu8ykRG7gXyEGXJjWXV+lRZqY+JtBm8TpF2H
+6pj1DwPcBt0yt7LoXrrfIlMabqdWXgmfu+j5kvxyZNWOg56G48hfFIg3e8dri/7/
+xHI8t3dnN/L67VbHMor3xMYmeGQQnq9Zkv5tcj+c40ECgYEA2Q5svQA66l6ubpJo
+sSKfBIskIe/WuzWB0YmV0jdg0mqivG/bxObK0sZr6Jcd4T3v5J3PMit0G3gOfhPO
+sD6otk/Lo9d7whOfskjG3kDODrx+mRVHhVfamUcqzk722OrDGh9NeCHaCbPBAhMd
+tmugi+SF1eSUPtfAwqW9o0qP7NUCgYEA0vu1gOxFZPbIdThNIGyzudn1+FSpEc67
+kiB/FJnculpPf9fRaL//dMG+sItUwFvSTJ+xYf+mRcSXl6imY7zSTgakjAp+mzMZ
+LPZeMY9qZxEgIIiLcX/WVi6Ldveukh9Mbzd6v+dfqZJEBiA5EDfyjdVl6APRmybv
+3VR/rHoGA/ECgYEA12TMHWY8ENXyTUG26IkNukmFirPhqBd6AwCAj4Jq74PoiAyM
+z0Gj5jQHY2GKwjlfdMPxl7ytVJD3+L8ZLaaQb5KR573vTvGAWUCFMIqosND25FzM
+g5NiFxcbcG3F4g5dm++SRfN51oTttGxZ4Ou+/vPAqDhTsGUUIVSt8nwMhR0CgYAM
+iTQxothEtX0Xqe67PHo5UsAQr0cUbcorVo72dGXvFKqgl/wzUyUklNZ1uvGgNFR8
+hQiPIBeLEbFIK5cnWfLM/AwO3hjDs/eM+l6CZ1kVIqlcBYDzj3r2x/E1cmYG/KEY
+Ap3ihSbj9nLgQk3hrtFUqBdT/9YWd+vMpNapMt7koQKBgBNzxUtQOKcT3EaJytfe
+LqVayA6mfhjZisUtw1ufg9iPUDyGo8Wj3h5QI0aY9240Bztp/f/qWRF0vCcA6mNm
+U4edOI1EjWqvgkLw0Nav3xSNO4jDchA/A9Lj2y6mjGmmaj5E17vowRz1s3GHDtIX
+lpwir++lc7qUgPNttzfK/ltI
+-----END PRIVATE KEY-----
diff --git a/extensions/grpc/deployment/src/test/resources/tls-from-file/server.pem b/extensions/grpc/deployment/src/test/resources/tls-from-file/server.pem
new file mode 100644
index 0000000000000..0564aead54463
--- /dev/null
+++ b/extensions/grpc/deployment/src/test/resources/tls-from-file/server.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDJDCCAgygAwIBAgIJAKhxPs8iIgiBMA0GCSqGSIb3DQEBBQUAMEcxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlBY21lIENvcnAx
+DzANBgNVBAMMBnRlc3RjYTAeFw0yMDA0MDQwODEzMjhaFw0zMDA0MDIwODEzMjha
+MFwxCzAJBgNVBAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMRAwDgYDVQQHDAdW
+YWxlbmNlMRIwEAYDVQQKDAlBY21lIENvcnAxEjAQBgNVBAMMCWxvY2FsaG9zdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLjQDwp67Brpoo1HGprmdus
+2lCdYXWF32Q7zjxTNQjTpf0Yu97jn1DgoI1QOBQDU8vrNRpVsWmYuunqIGKbGvW7
+4epXJiSFri94tcoDX6ctynSBQ5BNvgOTqMd0aGDAho+jyxoU72xjZXL7GHwxTxx6
+mNm3GC31wj/5EZCCDS4TPs1Pe2OVfdvtjtJAKG/Z+wDpm4T/e/ZcEuDMKA0R91iH
+joHSmQTc53fGr5yJ4464UcJ4cVf7BlwIlYdru0vGyAoin5CiGobgygUpYJ/vjzie
+7wRh3tjM13M83peZxC7DYhSvZiMMVpjQRnoRFORJGgwFu+Or1sY9iLGQ8fBCc4UC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAFEYYp3wV1xH9+Z44GJSjTa9Ltg5gxqmf
+t7ROsiy01vPuWQDhLILRpGQHdyz07AOmYsaGRTMOCcOsUCDY7u0NYi991HBEn1ZI
+/+2tFNZnLTk/hLtNSW30MWt0sNE2d6DIMZQBAtvrWnFdrQAThzTQLeFpbi+nTX+O
+KwtVpci8gMej90fEnyYRdNn/yTmjo79Q4+yuD9oKhvsOxy65CmSvXh9oLpqH7HzQ
+TR6LfuWSpG6wGKy1JW5fXuwb0YJC1QjvAOVWr9zm79wyeXUuXfQ6A2SNHTPwwEbu
+K+kV+UX7NofWhepi1QOxKnnO3EXbdN7fl44jEuzaGOKtmfhiRse4cQ==
+-----END CERTIFICATE-----
diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml
index df1ba5339850c..17349a62f9db1 100644
--- a/extensions/grpc/pom.xml
+++ b/extensions/grpc/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/grpc/protoc/pom.xml b/extensions/grpc/protoc/pom.xml
index f1d653bc52344..4c5c1266a7f6e 100644
--- a/extensions/grpc/protoc/pom.xml
+++ b/extensions/grpc/protoc/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-grpc-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-grpc-protoc-plugin</artifactId>
diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml
index 4b40c3ad42acc..7ba12eaf42669 100644
--- a/extensions/grpc/runtime/pom.xml
+++ b/extensions/grpc/runtime/pom.xml
@@ -18,30 +18,8 @@
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-grpc</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -69,26 +47,30 @@
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
         <!-- Add the health extension as optional as we will produce the health check only if it's included -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -104,6 +86,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java
index 02d3c7b18ebfa..4dd6ab02aaf09 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcClientInterceptorContainer.java
@@ -1,6 +1,5 @@
 package io.quarkus.grpc.runtime;
 
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -14,14 +13,11 @@
 
 @ApplicationScoped
 public class GrpcClientInterceptorContainer {
+    // Cannot be empty, as we have the IO Thread client interceptor
     @Inject
     Instance<ClientInterceptor> interceptors;
 
     public List<ClientInterceptor> getSortedInterceptors() {
-        if (interceptors.isUnsatisfied()) {
-            return Collections.emptyList();
-        }
-
         return interceptors.stream().sorted(new Comparator<ClientInterceptor>() { // NOSONAR
             @Override
             public int compare(ClientInterceptor si1, ClientInterceptor si2) {
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
index 5ca99a60e324a..0ddaee2cc7b61 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
@@ -7,6 +7,7 @@
 import java.io.UncheckedIOException;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,6 +20,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import javax.enterprise.inject.Instance;
 
@@ -27,15 +29,20 @@
 import grpc.health.v1.HealthOuterClass;
 import io.grpc.BindableService;
 import io.grpc.ServerInterceptor;
+import io.grpc.ServerInterceptors;
 import io.grpc.ServerMethodDefinition;
 import io.grpc.ServerServiceDefinition;
 import io.quarkus.arc.Arc;
 import io.quarkus.grpc.runtime.config.GrpcConfiguration;
 import io.quarkus.grpc.runtime.config.GrpcServerConfiguration;
+import io.quarkus.grpc.runtime.config.GrpcServerNettyConfig;
 import io.quarkus.grpc.runtime.devmode.GrpcHotReplacementInterceptor;
 import io.quarkus.grpc.runtime.devmode.GrpcServerReloader;
 import io.quarkus.grpc.runtime.health.GrpcHealthStorage;
 import io.quarkus.grpc.runtime.reflection.ReflectionService;
+import io.quarkus.grpc.runtime.supports.BlockingServerInterceptor;
+import io.quarkus.grpc.runtime.supports.CompressionInterceptor;
+import io.quarkus.grpc.runtime.supports.RequestScopeHandlerInterceptor;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
@@ -46,6 +53,7 @@
 import io.vertx.core.DeploymentOptions;
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
+import io.vertx.core.Verticle;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.grpc.VertxServer;
@@ -56,10 +64,12 @@ public class GrpcServerRecorder {
     private static final Logger LOGGER = Logger.getLogger(GrpcServerRecorder.class.getName());
 
     private static final AtomicInteger grpcVerticleCount = new AtomicInteger(0);
+    private Map<String, List<String>> blockingMethodsPerService = Collections.emptyMap();
 
     public void initializeGrpcServer(RuntimeValue<Vertx> vertxSupplier,
             GrpcConfiguration cfg,
-            ShutdownContext shutdown) {
+            ShutdownContext shutdown,
+            Map<String, List<String>> blockingMethodsPerServiceImplementationClass) {
         GrpcContainer grpcContainer = Arc.container().instance(GrpcContainer.class).get();
         if (grpcContainer == null) {
             throw new IllegalStateException("gRPC not initialized, GrpcContainer not found");
@@ -70,6 +80,8 @@ public void initializeGrpcServer(RuntimeValue<Vertx> vertxSupplier,
                     "Unable to find beans exposing the `BindableService` interface - not starting the gRPC server");
         }
 
+        this.blockingMethodsPerService = blockingMethodsPerServiceImplementationClass;
+
         GrpcServerConfiguration configuration = cfg.server;
         final boolean devMode = ProfileManager.getLaunchMode() == LaunchMode.DEVELOPMENT;
 
@@ -89,32 +101,24 @@ public void initializeGrpcServer(RuntimeValue<Vertx> vertxSupplier,
     private void prodStart(GrpcContainer grpcContainer, Vertx vertx, GrpcServerConfiguration configuration) {
         CompletableFuture<Void> startResult = new CompletableFuture<>();
 
-        vertx.deployVerticle(() -> new GrpcServerVerticle(configuration, grpcContainer),
+        vertx.deployVerticle(
+                new Supplier<Verticle>() {
+                    @Override
+                    public Verticle get() {
+                        return new GrpcServerVerticle(configuration, grpcContainer);
+                    }
+                },
                 new DeploymentOptions().setInstances(configuration.instances),
-                result -> {
-                    if (result.failed()) {
-                        startResult.completeExceptionally(result.cause());
-                    } else {
-                        grpcContainer.getHealthStorage().stream().forEach(new Consumer<GrpcHealthStorage>() { //NOSONAR
-                            @Override
-                            public void accept(GrpcHealthStorage storage) {
-                                storage.setStatus(GrpcHealthStorage.DEFAULT_SERVICE_NAME,
-                                        HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING);
-                                grpcContainer.getServices().forEach(
-                                        new Consumer<BindableService>() { // NOSONAR
-                                            @Override
-                                            public void accept(BindableService service) {
-                                                ServerServiceDefinition definition = service.bindService();
-                                                storage.setStatus(definition.getServiceDescriptor().getName(),
-                                                        HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING);
-                                            }
-                                        });
-                            }
-                        });
-                        LOGGER.infof("gRPC Server started on %s:%d [SSL enabled: %s]",
-                                configuration.host, configuration.port, !configuration.plainText);
+                new Handler<AsyncResult<String>>() {
+                    @Override
+                    public void handle(AsyncResult<String> result) {
+                        if (result.failed()) {
+                            startResult.completeExceptionally(result.cause());
+                        } else {
+                            GrpcServerRecorder.this.postStartup(grpcContainer, configuration);
 
-                        startResult.complete(null);
+                            startResult.complete(null);
+                        }
                     }
                 });
 
@@ -130,6 +134,27 @@ public void accept(BindableService service) {
         }
     }
 
+    private void postStartup(GrpcContainer grpcContainer, GrpcServerConfiguration configuration) {
+        grpcContainer.getHealthStorage().stream().forEach(new Consumer<GrpcHealthStorage>() { //NOSONAR
+            @Override
+            public void accept(GrpcHealthStorage storage) {
+                storage.setStatus(GrpcHealthStorage.DEFAULT_SERVICE_NAME,
+                        HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING);
+                grpcContainer.getServices().forEach(
+                        new Consumer<BindableService>() { // NOSONAR
+                            @Override
+                            public void accept(BindableService service) {
+                                ServerServiceDefinition definition = service.bindService();
+                                storage.setStatus(definition.getServiceDescriptor().getName(),
+                                        HealthOuterClass.HealthCheckResponse.ServingStatus.SERVING);
+                            }
+                        });
+            }
+        });
+        LOGGER.infof("gRPC Server started on %s:%d [SSL enabled: %s]",
+                configuration.host, configuration.port, !configuration.plainText);
+    }
+
     private void devModeStart(GrpcContainer grpcContainer, Vertx vertx, GrpcServerConfiguration configuration,
             ShutdownContext shutdown) {
         CompletableFuture<Boolean> future = new CompletableFuture<>();
@@ -142,6 +167,7 @@ public void handle(AsyncResult<Void> ar) {
                             LOGGER.error("Unable to start the gRPC server", ar.cause());
                             future.completeExceptionally(ar.cause());
                         } else {
+                            postStartup(grpcContainer, configuration);
                             future.complete(true);
                             grpcVerticleCount.incrementAndGet();
                         }
@@ -168,6 +194,14 @@ public void run() {
                 });
     }
 
+    private void applyNettySettings(GrpcServerConfiguration configuration, VertxServerBuilder builder) {
+        if (configuration.netty != null) {
+            GrpcServerNettyConfig config = configuration.netty;
+            config.keepAliveTime.ifPresent(duration -> builder.nettyBuilder()
+                    .keepAliveTime(duration.toNanos(), TimeUnit.NANOSECONDS));
+        }
+    }
+
     private void applyTransportSecurityConfig(GrpcServerConfiguration configuration, VertxServerBuilder builder) {
         if (configuration.transportSecurity != null) {
             File cert = configuration.transportSecurity.certificate
@@ -198,37 +232,48 @@ private static boolean hasNoServices(Instance<BindableService> services) {
                         && services.get().bindService().getServiceDescriptor().getName().equals("grpc.health.v1.Health");
     }
 
-    private static List<ServerServiceDefinition> gatherServices(Instance<BindableService> services) {
-        List<ServerServiceDefinition> definitions = new ArrayList<>();
-
-        services.forEach(new Consumer<BindableService>() { // NOSONAR
-            @Override
-            public void accept(BindableService bindable) {
-                ServerServiceDefinition definition = bindable.bindService();
-                LOGGER.debugf("Registered gRPC service '%s'", definition.getServiceDescriptor().getName());
-                definitions.add(definition);
-            }
-        });
+    private static List<GrpcServiceDefinition> collectServiceDefinitions(Instance<BindableService> services) {
+        List<GrpcServiceDefinition> definitions = new ArrayList<>();
+        for (BindableService service : services) {
+            ServerServiceDefinition definition = service.bindService();
+            definitions.add(new GrpcServiceDefinition(service, definition));
+        }
         return definitions;
     }
 
+    private static class GrpcServiceDefinition {
+        public final BindableService service;
+        public final ServerServiceDefinition definition;
+
+        GrpcServiceDefinition(BindableService service, ServerServiceDefinition definition) {
+            this.service = service;
+            this.definition = definition;
+        }
+
+        public String getImplementationClassName() {
+            return service.getClass().getName();
+        }
+    }
+
     private static void devModeReload(GrpcContainer grpcContainer) {
-        List<ServerServiceDefinition> serviceDefinitions = gatherServices(grpcContainer.getServices());
+        List<GrpcServiceDefinition> svc = collectServiceDefinitions(grpcContainer.getServices());
 
+        List<ServerServiceDefinition> definitions = new ArrayList<>();
         Map<String, ServerMethodDefinition<?, ?>> methods = new HashMap<>();
-        for (ServerServiceDefinition service : serviceDefinitions) {
-            for (ServerMethodDefinition<?, ?> method : service.getMethods()) {
+        for (GrpcServiceDefinition service : svc) {
+            for (ServerMethodDefinition<?, ?> method : service.definition.getMethods()) {
                 methods.put(method.getMethodDescriptor().getFullMethodName(), method);
             }
+            definitions.add(service.definition);
         }
 
-        ServerServiceDefinition reflectionService = new ReflectionService(serviceDefinitions).bindService();
+        ServerServiceDefinition reflectionService = new ReflectionService(definitions).bindService();
 
         for (ServerMethodDefinition<?, ?> method : reflectionService.getMethods()) {
             methods.put(method.getMethodDescriptor().getFullMethodName(), method);
         }
 
-        GrpcServerReloader.reinitialize(serviceDefinitions, methods, grpcContainer.getSortedInterceptors());
+        GrpcServerReloader.reinitialize(definitions, methods, grpcContainer.getSortedInterceptors());
     }
 
     public static int getVerticleCount() {
@@ -255,6 +300,11 @@ public void handle(HttpServerOptions options) {
         if (configuration.maxInboundMessageSize.isPresent()) {
             builder.maxInboundMessageSize(configuration.maxInboundMessageSize.getAsInt());
         }
+
+        if (configuration.maxInboundMetadataSize.isPresent()) {
+            builder.maxInboundMetadataSize(configuration.maxInboundMetadataSize.getAsInt());
+        }
+
         Optional<Duration> handshakeTimeout = configuration.handshakeTimeout;
         if (handshakeTimeout.isPresent()) {
             builder.handshakeTimeout(handshakeTimeout.get().toMillis(), TimeUnit.MILLISECONDS);
@@ -262,11 +312,35 @@ public void handle(HttpServerOptions options) {
 
         applyTransportSecurityConfig(configuration, builder);
 
+        applyNettySettings(configuration, builder);
+
         boolean reflectionServiceEnabled = configuration.enableReflectionService
                 || ProfileManager.getLaunchMode() == LaunchMode.DEVELOPMENT;
-        List<ServerServiceDefinition> definitions = gatherServices(grpcContainer.getServices());
-        for (ServerServiceDefinition definition : definitions) {
-            builder.addService(definition);
+        List<GrpcServiceDefinition> toBeRegistered = collectServiceDefinitions(grpcContainer.getServices());
+        List<ServerServiceDefinition> definitions = new ArrayList<>();
+
+        CompressionInterceptor compressionInterceptor = null;
+        if (configuration.compression.isPresent()) {
+            compressionInterceptor = new CompressionInterceptor(configuration.compression.get());
+        }
+
+        for (GrpcServiceDefinition service : toBeRegistered) {
+            List<ServerInterceptor> interceptors = new ArrayList<>();
+            if (compressionInterceptor != null) {
+                interceptors.add(compressionInterceptor);
+            }
+            // We only register the blocking interceptor if needed by at least one method of the service.
+            if (!blockingMethodsPerService.isEmpty()) {
+                List<String> list = blockingMethodsPerService.get(service.getImplementationClassName());
+                if (list != null) {
+                    interceptors.add(new BlockingServerInterceptor(vertx, list));
+                }
+            }
+            // Order matters! Request scope must be called first (on the event loop) and so should be last in the list...
+            interceptors.add(new RequestScopeHandlerInterceptor());
+            builder.addService(ServerInterceptors.intercept(service.definition, interceptors));
+            LOGGER.debugf("Registered gRPC service '%s'", service.definition.getServiceDescriptor().getName());
+            definitions.add(service.definition);
         }
 
         if (reflectionServiceEnabled) {
@@ -279,14 +353,24 @@ public void handle(HttpServerOptions options) {
         }
 
         if (devMode) {
-            builder.commandDecorator(command -> vertx.executeBlocking(new Handler<Promise<Boolean>>() {
+            builder.commandDecorator(new Consumer<Runnable>() {
                 @Override
-                public void handle(Promise<Boolean> event) {
-                    event.complete(GrpcHotReplacementInterceptor.fire());
+                public void accept(Runnable command) {
+                    vertx.executeBlocking(new Handler<Promise<Boolean>>() {
+                        @Override
+                        public void handle(Promise<Boolean> event) {
+                            event.complete(GrpcHotReplacementInterceptor.fire());
+                        }
+                    },
+                            false,
+                            new Handler<AsyncResult<Boolean>>() {
+                                @Override
+                                public void handle(AsyncResult<Boolean> result) {
+                                    command.run();
+                                }
+                            });
                 }
-            },
-                    false,
-                    result -> command.run()));
+            });
         }
 
         LOGGER.debugf("Starting gRPC Server on %s:%d  [SSL enabled: %s]...",
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java
index 37f3d6ac6a62b..7e509fb1f1e44 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java
@@ -34,6 +34,12 @@ public class GrpcServerConfiguration {
      */
     public @ConfigItem OptionalInt maxInboundMessageSize;
 
+    /**
+     * The max inbound metadata size in bytes
+     */
+    @ConfigItem
+    public OptionalInt maxInboundMetadataSize;
+
     /**
      * The SSL/TLS config.
      */
@@ -73,4 +79,16 @@ public class GrpcServerConfiguration {
      */
     @ConfigItem(defaultValue = "1")
     public int instances;
+
+    /**
+     * Configures the netty server settings.
+     */
+    @ConfigItem
+    public GrpcServerNettyConfig netty;
+
+    /**
+     * gRPC compression, e.g. "gzip"
+     */
+    @ConfigItem
+    public Optional<String> compression;
 }
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerNettyConfig.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerNettyConfig.java
new file mode 100644
index 0000000000000..dc7c78f36a2f5
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerNettyConfig.java
@@ -0,0 +1,20 @@
+package io.quarkus.grpc.runtime.config;
+
+import java.time.Duration;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+@ConfigGroup
+public class GrpcServerNettyConfig {
+
+    /**
+     * Sets a custom keep-alive duration. This configures the time before sending a `keepalive` ping
+     * when there is no read activity.
+     */
+    @ConfigItem
+    public Optional<Duration> keepAliveTime;
+
+}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslClientConfig.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslClientConfig.java
index ed0eb4acc6a28..46fedf5a71404 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslClientConfig.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslClientConfig.java
@@ -13,19 +13,21 @@
 @ConfigGroup
 public class SslClientConfig {
     /**
-     * The file path to a server certificate or certificate chain in PEM format.
+     * The classpath path or file path to a server certificate or certificate chain in PEM format.
      */
     @ConfigItem
     public Optional<Path> certificate;
 
     /**
-     * The file path to the corresponding certificate private key file in PEM format.
+     * The classpath path or file path to the corresponding certificate private key file in PEM format.
      */
     @ConfigItem
     public Optional<Path> key;
 
     /**
      * An optional trust store which holds the certificate information of the certificates to trust
+     *
+     * The trust store can be either on classpath or in an external file.
      */
     @ConfigItem
     public Optional<Path> trustStore;
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java
index beaac10f3ed44..77f47bfd2a09a 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/SslServerConfig.java
@@ -16,19 +16,20 @@
 @ConfigGroup
 public class SslServerConfig {
     /**
-     * The file path to a server certificate or certificate chain in PEM format.
+     * The classpath path or file path to a server certificate or certificate chain in PEM format.
      */
     @ConfigItem
     public Optional<Path> certificate;
 
     /**
-     * The file path to the corresponding certificate private key file in PEM format.
+     * The classpath path or file path to the corresponding certificate private key file in PEM format.
      */
     @ConfigItem
     public Optional<Path> key;
 
     /**
      * An optional key store which holds the certificate information instead of specifying separate files.
+     * The key store can be either on classpath or an external file.
      */
     @ConfigItem
     public Optional<Path> keyStore;
@@ -48,6 +49,8 @@ public class SslServerConfig {
 
     /**
      * An optional trust store which holds the certificate information of the certificates to trust
+     *
+     * The trust store can be either on classpath or an external file.
      */
     @ConfigItem
     public Optional<Path> trustStore;
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServerReloader.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServerReloader.java
index 4096cc5f1743d..a601059087cb4 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServerReloader.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devmode/GrpcServerReloader.java
@@ -87,7 +87,9 @@ private static void forceSet(Object object, String fieldName, Object value)
     }
 
     public static void shutdown() {
-        server.shutdown();
-        server = null;
+        if (server != null) {
+            server.shutdown();
+            server = null;
+        }
     }
 }
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/graal/GrpcNettySubtitutions.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/graal/GrpcNettySubtitutions.java
deleted file mode 100644
index 9b90c24e54e40..0000000000000
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/graal/GrpcNettySubtitutions.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.quarkus.grpc.runtime.graal;
-
-import java.security.Provider;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
-
-@TargetClass(className = "io.grpc.netty.ProtocolNegotiators")
-final class Target_io_grpc_netty_ProtocolNegotiators {
-
-    @Substitute
-    static void logSslEngineDetails(Level level, ChannelHandlerContext ctx, String msg, Throwable t) {
-        Logger log = Logger.getLogger("io.grpc.netty.ProtocolNegotiators");
-        if (log.isLoggable(level)) {
-            log.log(level, msg + "\nNo SSLEngine details available!", t);
-        }
-    }
-}
-
-@TargetClass(className = "io.grpc.netty.GrpcSslContexts")
-final class Target_io_grpc_netty_GrpcSslContexts {
-
-    @Substitute
-    public static SslContextBuilder configure(SslContextBuilder builder, SslProvider provider) {
-        switch (provider) {
-            case JDK: {
-                Provider jdkProvider = findJdkProvider();
-                if (jdkProvider == null) {
-                    throw new IllegalArgumentException(
-                            "Could not find Jetty NPN/ALPN or Conscrypt as installed JDK providers");
-                }
-                return configure(builder, jdkProvider);
-            }
-            default:
-                throw new IllegalArgumentException("Unsupported provider: " + provider);
-        }
-    }
-
-    @Alias
-    private static Provider findJdkProvider() {
-        return null;
-    }
-
-    @Alias
-    public static SslContextBuilder configure(SslContextBuilder builder, Provider jdkProvider) {
-        return null;
-    }
-
-}
-
-@SuppressWarnings("unused")
-class GrpcNettySubstitutions {
-}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/BlockingServerInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/BlockingServerInterceptor.java
new file mode 100644
index 0000000000000..ef5720b49f018
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/BlockingServerInterceptor.java
@@ -0,0 +1,150 @@
+package io.quarkus.grpc.runtime.supports;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import io.grpc.Context;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.vertx.core.Handler;
+import io.vertx.core.Promise;
+import io.vertx.core.Vertx;
+
+/**
+ * gRPC Server interceptor offloading the execution of the gRPC method on a wroker thread if the method is annotated
+ * with {@link io.smallrye.common.annotation.Blocking}.
+ *
+ * For non-annotated methods, the interceptor acts as a pass-through.
+ */
+public class BlockingServerInterceptor implements ServerInterceptor {
+
+    private final Vertx vertx;
+    private final List<String> blockingMethods;
+    private final Map<String, Boolean> cache = new HashMap<>();
+
+    public BlockingServerInterceptor(Vertx vertx, List<String> blockingMethods) {
+        this.vertx = vertx;
+        this.blockingMethods = new ArrayList<>();
+        for (String method : blockingMethods) {
+            this.blockingMethods.add(method.toLowerCase());
+        }
+    }
+
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
+            Metadata headers,
+            ServerCallHandler<ReqT, RespT> next) {
+
+        // We need to check if the method is annotated with @Blocking.
+        // Unfortunately, we can't have the Java method object, we can only have the gRPC full method name.
+        // We extract the method name, and check if the name if is the list.
+        // This makes the following assumptions:
+        // 1. the code generator does not change the method name (which makes sense)
+        // 2. the method name is unique, which is a constraint of gRPC
+
+        // For performance purpose, we execute the lookup only once
+        String fullMethodName = call.getMethodDescriptor().getFullMethodName();
+        boolean isBlocking = cache.computeIfAbsent(fullMethodName, new Function<String, Boolean>() {
+            @Override
+            public Boolean apply(String name) {
+                String methodName = name.substring(name.lastIndexOf("/") + 1);
+                return blockingMethods.contains(methodName.toLowerCase());
+            }
+        });
+
+        if (isBlocking) {
+            ReplayListener<ReqT> replay = new ReplayListener<>();
+
+            vertx.executeBlocking(new Handler<Promise<Object>>() {
+                @Override
+                public void handle(Promise<Object> f) {
+                    ServerCall.Listener<ReqT> listener = next.startCall(call, headers);
+                    replay.setDelegate(listener);
+                    f.complete(null);
+                }
+            }, null);
+
+            return replay;
+        } else {
+            return next.startCall(call, headers);
+        }
+    }
+
+    /**
+     * Stores the incoming events until the listener is injected.
+     * When injected, replay the events.
+     *
+     * Note that event must be executed in order, explaining the `ordered:true`.
+     */
+    private class ReplayListener<ReqT> extends ServerCall.Listener<ReqT> {
+        private ServerCall.Listener<ReqT> delegate;
+        private final List<Consumer<ServerCall.Listener<ReqT>>> incomingEvents = new LinkedList<>();
+
+        synchronized void setDelegate(ServerCall.Listener<ReqT> delegate) {
+            this.delegate = delegate;
+            for (Consumer<ServerCall.Listener<ReqT>> event : incomingEvents) {
+                event.accept(delegate);
+            }
+            incomingEvents.clear();
+        }
+
+        private synchronized void executeOnContextOrEnqueue(Consumer<ServerCall.Listener<ReqT>> consumer) {
+            if (this.delegate != null) {
+                final Context grpcContext = Context.current();
+                vertx.executeBlocking(new Handler<Promise<Object>>() {
+                    @Override
+                    public void handle(Promise<Object> f) {
+                        final Context previous = Context.current();
+                        grpcContext.attach();
+                        try {
+                            consumer.accept(delegate);
+                            f.complete();
+                        } finally {
+                            grpcContext.detach(previous);
+                        }
+                    }
+                }, true, null);
+            } else {
+                incomingEvents.add(consumer);
+            }
+        }
+
+        @Override
+        public void onMessage(ReqT message) {
+            executeOnContextOrEnqueue(new Consumer<ServerCall.Listener<ReqT>>() {
+                @Override
+                public void accept(ServerCall.Listener<ReqT> t) {
+                    t.onMessage(message);
+                }
+            });
+        }
+
+        @Override
+        public void onHalfClose() {
+            executeOnContextOrEnqueue(ServerCall.Listener::onHalfClose);
+        }
+
+        @Override
+        public void onCancel() {
+            executeOnContextOrEnqueue(ServerCall.Listener::onCancel);
+        }
+
+        @Override
+        public void onComplete() {
+            executeOnContextOrEnqueue(ServerCall.Listener::onComplete);
+        }
+
+        @Override
+        public void onReady() {
+            executeOnContextOrEnqueue(ServerCall.Listener::onReady);
+        }
+    }
+
+}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
index 203c483995d37..a9c86fd383ee9 100644
--- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/Channels.java
@@ -4,21 +4,31 @@
 import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
 import static io.grpc.netty.NettyChannelBuilder.DEFAULT_FLOW_CONTROL_WINDOW;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import javax.enterprise.context.spi.CreationalContext;
 import javax.net.ssl.SSLException;
 
+import org.jboss.logging.Logger;
+
 import io.grpc.Channel;
 import io.grpc.ClientInterceptor;
+import io.grpc.ManagedChannel;
 import io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.NegotiationType;
 import io.grpc.netty.NettyChannelBuilder;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.BeanDestroyer;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.grpc.runtime.GrpcClientInterceptorContainer;
 import io.quarkus.grpc.runtime.annotations.GrpcServiceLiteral;
@@ -27,6 +37,8 @@
 @SuppressWarnings({ "OptionalIsPresent", "Convert2Lambda" })
 public class Channels {
 
+    private static final Logger LOGGER = Logger.getLogger(Channels.class.getName());
+
     private Channels() {
         // Avoid direct instantiation
     }
@@ -54,11 +66,20 @@ public static Channel createChannel(String name) throws SSLException {
             Path keyPath = config.ssl.key.orElse(null);
             SslContextBuilder sslContextBuilder = GrpcSslContexts.forClient();
             if (trustStorePath != null) {
-                sslContextBuilder.trustManager(trustStorePath.toFile());
+                try (InputStream stream = streamFor(trustStorePath, "trust store")) {
+                    sslContextBuilder.trustManager(stream);
+                } catch (IOException e) {
+                    throw new UncheckedIOException("Configuring gRPC client trust store failed", e);
+                }
             }
 
             if (certificatePath != null && keyPath != null) {
-                sslContextBuilder.keyManager(certificatePath.toFile(), keyPath.toFile());
+                try (InputStream certificate = streamFor(certificatePath, "certificate");
+                        InputStream key = streamFor(keyPath, "key")) {
+                    sslContextBuilder.keyManager(certificate, key);
+                } catch (IOException e) {
+                    throw new UncheckedIOException("Configuring gRPC client certificate failed", e);
+                }
             }
 
             context = sslContextBuilder.build();
@@ -69,8 +90,8 @@ public static Channel createChannel(String name) throws SSLException {
                 .keepAliveWithoutCalls(config.keepAliveWithoutCalls)
                 .maxHedgedAttempts(config.maxHedgedAttempts)
                 .maxRetryAttempts(config.maxRetryAttempts)
-                .maxInboundMetadataSize(config.maxInboundMessageSize.orElse(DEFAULT_MAX_HEADER_LIST_SIZE))
-                .maxInboundMetadataSize(config.maxInboundMessageSize.orElse(DEFAULT_MAX_MESSAGE_SIZE))
+                .maxInboundMetadataSize(config.maxInboundMetadataSize.orElse(DEFAULT_MAX_HEADER_LIST_SIZE))
+                .maxInboundMessageSize(config.maxInboundMessageSize.orElse(DEFAULT_MAX_MESSAGE_SIZE))
                 .negotiationType(NegotiationType.valueOf(config.negotiationType.toUpperCase()));
 
         if (config.retry) {
@@ -126,11 +147,44 @@ public static Channel createChannel(String name) throws SSLException {
         return builder.build();
     }
 
+    private static InputStream streamFor(Path path, String resourceName) {
+        final InputStream resource = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream(path.toString());
+        if (resource != null) {
+            return resource;
+        } else {
+            try {
+                return Files.newInputStream(path);
+            } catch (IOException e) {
+                throw new UncheckedIOException("Unable to read " + resourceName + " from " + path, e);
+            }
+        }
+    }
+
     public static Channel retrieveChannel(String name) {
         InstanceHandle<Channel> instance = Arc.container().instance(Channel.class, GrpcServiceLiteral.of(name));
         if (!instance.isAvailable()) {
             throw new IllegalStateException("Unable to retrieve the gRPC Channel " + name);
         }
+
         return instance.get();
     }
+
+    public static class ChannelDestroyer implements BeanDestroyer<Channel> {
+
+        @Override
+        public void destroy(Channel instance, CreationalContext creationalContext, Map params) {
+            if (instance instanceof ManagedChannel) {
+                ManagedChannel channel = (ManagedChannel) instance;
+                LOGGER.info("Shutting down gRPC channel " + channel);
+                channel.shutdownNow();
+                try {
+                    channel.awaitTermination(10, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    LOGGER.info("Unable to shutdown channel after 10 seconds");
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+    }
 }
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/CompressionInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/CompressionInterceptor.java
new file mode 100644
index 0000000000000..631ae34d6b07f
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/CompressionInterceptor.java
@@ -0,0 +1,27 @@
+package io.quarkus.grpc.runtime.supports;
+
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+
+public class CompressionInterceptor implements ServerInterceptor {
+
+    private final String compression;
+
+    public CompressionInterceptor(String compression) {
+        if (compression == null) {
+            throw new NullPointerException("Compression cannot be null");
+        }
+        this.compression = compression;
+    }
+
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
+            ServerCall<ReqT, RespT> call,
+            Metadata headers,
+            ServerCallHandler<ReqT, RespT> next) {
+        call.setCompression(compression);
+        return next.startCall(call, headers);
+    }
+}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java
new file mode 100644
index 0000000000000..b4a44661f58d3
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java
@@ -0,0 +1,81 @@
+package io.quarkus.grpc.runtime.supports;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.spi.Prioritized;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.Status;
+import io.vertx.core.Context;
+import io.vertx.core.Vertx;
+
+@ApplicationScoped
+public class IOThreadClientInterceptor implements ClientInterceptor, Prioritized {
+
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
+            CallOptions callOptions, Channel next) {
+
+        Context context = Vertx.currentContext();
+
+        return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+
+            @Override
+            public void start(Listener<RespT> responseListener, Metadata headers) {
+                super.start(new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
+                    private volatile CompletableFuture<Void> onMessageCompletion;
+
+                    @Override
+                    public void onMessage(RespT message) {
+                        if (context != null) {
+                            onMessageCompletion = new CompletableFuture<>();
+                            context.runOnContext(unused -> {
+                                try {
+                                    super.onMessage(message);
+                                    onMessageCompletion.complete(null);
+                                } catch (Throwable any) {
+                                    onMessageCompletion.completeExceptionally(any);
+                                }
+                            });
+                        } else {
+                            super.onMessage(message);
+                        }
+                    }
+
+                    @Override
+                    public void onClose(Status status, Metadata trailers) {
+                        if (onMessageCompletion != null && !Context.isOnEventLoopThread()) {
+                            try {
+                                onMessageCompletion.get(60, TimeUnit.SECONDS);
+                            } catch (InterruptedException | ExecutionException e) {
+                                throw new RuntimeException("`onMessage` failed or interrupted", e);
+                            } catch (TimeoutException e) {
+                                throw new RuntimeException("`onMessage` did not complete in 60 seconds");
+                            }
+                            super.onClose(status, trailers);
+                        } else {
+                            super.onClose(status, trailers);
+                        }
+                    }
+                }, headers);
+            }
+        };
+    }
+
+    @Override
+    public int getPriority() {
+        // MAX to be sure to be called first.
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/RequestScopeHandlerInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/RequestScopeHandlerInterceptor.java
new file mode 100644
index 0000000000000..40ed99d29f5e5
--- /dev/null
+++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/RequestScopeHandlerInterceptor.java
@@ -0,0 +1,58 @@
+package io.quarkus.grpc.runtime.supports;
+
+import org.jboss.logmanager.Logger;
+
+import io.grpc.ForwardingServerCall;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.Status;
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ManagedContext;
+import io.vertx.core.Context;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+
+public class RequestScopeHandlerInterceptor implements ServerInterceptor {
+
+    private final ManagedContext reqContext;
+    private static final Logger LOGGER = Logger.getLogger(RequestScopeHandlerInterceptor.class.getName());
+
+    public RequestScopeHandlerInterceptor() {
+        reqContext = Arc.container().requestContext();
+    }
+
+    @Override
+    public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
+            Metadata headers,
+            ServerCallHandler<ReqT, RespT> next) {
+
+        // This interceptor is called first, so, we should be on the event loop.
+        Context capturedVertxContext = Vertx.currentContext();
+        if (capturedVertxContext != null) {
+            boolean activateAndDeactivateContext = !reqContext.isActive();
+            if (activateAndDeactivateContext) {
+                reqContext.activate();
+            }
+            return next.startCall(new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
+                @Override
+                public void close(Status status, Metadata trailers) {
+                    super.close(status, trailers);
+                    if (activateAndDeactivateContext) {
+                        capturedVertxContext.runOnContext(new Handler<Void>() {
+                            @Override
+                            public void handle(Void ignored) {
+                                reqContext.deactivate();
+                            }
+                        });
+                    }
+                }
+            }, headers);
+        } else {
+            LOGGER.warning("Unable to activate the request scope - interceptor not called on the Vert.x event loop");
+            return next.startCall(call, headers);
+        }
+    }
+
+}
diff --git a/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/ClientAndServerCallsTest.java b/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/ClientAndServerCallsTest.java
index aff68a96d45a9..9511e8f4cfd28 100644
--- a/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/ClientAndServerCallsTest.java
+++ b/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/ClientAndServerCallsTest.java
@@ -18,7 +18,7 @@
 public class ClientAndServerCallsTest {
 
     protected static final Duration TIMEOUT = Duration.ofSeconds(5);
-    private FakeServiceClient client = new FakeServiceClient();;
+    private FakeServiceClient client = new FakeServiceClient();
 
     @Test
     public void oneToOneSuccess() {
diff --git a/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/supports/BlockingServerInterceptorTest.java b/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/supports/BlockingServerInterceptorTest.java
new file mode 100644
index 0000000000000..09ecb78a07158
--- /dev/null
+++ b/extensions/grpc/runtime/src/test/java/io/quarkus/grpc/runtime/supports/BlockingServerInterceptorTest.java
@@ -0,0 +1,92 @@
+package io.quarkus.grpc.runtime.supports;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import io.grpc.Context;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.vertx.core.Vertx;
+
+class BlockingServerInterceptorTest {
+    public static final Context.Key<String> USERNAME = Context.key("username");
+
+    BlockingServerInterceptor blockingServerInterceptor;
+    Vertx vertx;
+
+    @BeforeEach
+    void setup() {
+        vertx = Vertx.vertx();
+        blockingServerInterceptor = new BlockingServerInterceptor(vertx, Arrays.asList("blocking"));
+    }
+
+    @Test
+    @Timeout(10)
+    void testContextPropagation() throws Exception {
+        final ServerCall serverCall = mock(ServerCall.class);
+        final BlockingServerCallHandler serverCallHandler = new BlockingServerCallHandler();
+        final MethodDescriptor methodDescriptor = mock(MethodDescriptor.class);
+        when(methodDescriptor.getFullMethodName()).thenReturn("my-service/blocking");
+        when(serverCall.getMethodDescriptor()).thenReturn(methodDescriptor);
+
+        // setting grpc context
+        final Context context = Context.current().withValue(USERNAME, "my-user");
+
+        final ServerCall.Listener listener = blockingServerInterceptor.interceptCall(serverCall, null, serverCallHandler);
+        serverCallHandler.awaitSetup();
+
+        // simulate GRPC call
+        context.wrap(() -> listener.onMessage("hello")).run();
+
+        // await for the message to be received
+        serverCallHandler.await();
+
+        // check that the thread is a worker thread
+        assertThat(serverCallHandler.threadName).contains("vert.x").contains("worker");
+
+        // check that the context was propagated correctly
+        assertThat(serverCallHandler.contextUserName).isEqualTo("my-user");
+    }
+
+    static class BlockingServerCallHandler implements ServerCallHandler {
+        String threadName;
+        String contextUserName;
+        private CountDownLatch latch = new CountDownLatch(1);
+        private CountDownLatch setupLatch = new CountDownLatch(1);
+
+        @Override
+        public ServerCall.Listener startCall(ServerCall serverCall, Metadata metadata) {
+            final ServerCall.Listener listener = new ServerCall.Listener() {
+                @Override
+                public void onMessage(Object message) {
+                    threadName = Thread.currentThread().getName();
+                    contextUserName = USERNAME.get();
+                    super.onMessage(message);
+                    latch.countDown();
+                }
+            };
+            setupLatch.countDown();
+            return listener;
+        }
+
+        public void awaitSetup() throws InterruptedException {
+            setupLatch.await();
+            Thread.sleep(100);
+        }
+
+        public void await() throws InterruptedException {
+            latch.await();
+        }
+    }
+
+}
diff --git a/extensions/grpc/runtime/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/extensions/grpc/runtime/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000000..1f0955d450f0d
--- /dev/null
+++ b/extensions/grpc/runtime/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/extensions/grpc/stubs/pom.xml b/extensions/grpc/stubs/pom.xml
index 3fb9149d53bb0..6e3ef43a0e3f7 100644
--- a/extensions/grpc/stubs/pom.xml
+++ b/extensions/grpc/stubs/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-grpc-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-grpc-stubs</artifactId>
@@ -34,27 +33,47 @@
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
 
     <build>
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+            </extension>
+        </extensions>
+
         <plugins>
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
                 <configuration>
-                    <systemProperties>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    </systemProperties>
+                    <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
+                    <pluginId>grpc-java</pluginId>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+                    <protocPlugins>
+                        <protocPlugin>
+                            <id>quarkus-grpc-protoc-plugin</id>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-grpc-protoc-plugin</artifactId>
+                            <version>${project.version}</version>
+                            <mainClass>io.quarkus.grpc.protoc.plugin.MutinyGrpcGenerator</mainClass>
+                        </protocPlugin>
+                    </protocPlugins>
                 </configuration>
-            </plugin>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>compile</id>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>compile</goal>
+                            <goal>compile-custom</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java
new file mode 100644
index 0000000000000..2ad050de6bc24
--- /dev/null
+++ b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/HibernateEnversProcessor.java
@@ -0,0 +1,73 @@
+package io.quarkus.hibernate.envers.deployment;
+
+import java.util.Arrays;
+import java.util.List;
+
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
+import io.quarkus.hibernate.envers.HibernateEnversBuildTimeConfig;
+import io.quarkus.hibernate.envers.HibernateEnversRecorder;
+import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem;
+import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
+import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationStaticConfiguredBuildItem;
+
+public final class HibernateEnversProcessor {
+
+    private static final String HIBERNATE_ENVERS = "Hibernate Envers";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.HIBERNATE_ENVERS);
+    }
+
+    @BuildStep
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.HIBERNATE_ENVERS);
+    }
+
+    @BuildStep
+    List<AdditionalJpaModelBuildItem> addJpaModelClasses() {
+        return Arrays.asList(
+                new AdditionalJpaModelBuildItem(org.hibernate.envers.DefaultRevisionEntity.class),
+                new AdditionalJpaModelBuildItem(org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity.class));
+    }
+
+    @BuildStep
+    public void registerEnversReflections(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, "org.hibernate.envers.DefaultRevisionEntity"));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
+                "org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity"));
+        reflectiveClass
+                .produce(new ReflectiveClassBuildItem(false, false, "org.hibernate.tuple.entity.DynamicMapEntityTuplizer"));
+        reflectiveClass.produce(
+                new ReflectiveClassBuildItem(false, false, "org.hibernate.tuple.component.DynamicMapComponentTuplizer"));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    public void applyConfig(HibernateEnversRecorder recorder, HibernateEnversBuildTimeConfig buildTimeConfig,
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
+            BuildProducer<HibernateOrmIntegrationStaticConfiguredBuildItem> integrationProducer) {
+        for (PersistenceUnitDescriptorBuildItem puDescriptor : persistenceUnitDescriptorBuildItems) {
+            integrationProducer.produce(
+                    new HibernateOrmIntegrationStaticConfiguredBuildItem(HIBERNATE_ENVERS,
+                            puDescriptor.getPersistenceUnitName())
+                                    .setInitListener(recorder.createStaticInitListener(buildTimeConfig))
+                                    .setXmlMappingRequired(true));
+        }
+    }
+
+    @BuildStep
+    void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
+        filters.produce(new LogCleanupFilterBuildItem("org.hibernate.envers.boot.internal.EnversServiceImpl",
+                "Envers integration enabled"));
+    }
+}
diff --git a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/QuarkusHibernateEnversProcessor.java b/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/QuarkusHibernateEnversProcessor.java
deleted file mode 100644
index 458f0bf28a9bb..0000000000000
--- a/extensions/hibernate-envers/deployment/src/main/java/io/quarkus/hibernate/envers/deployment/QuarkusHibernateEnversProcessor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.hibernate.envers.deployment;
-
-import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-
-public final class QuarkusHibernateEnversProcessor {
-
-    @BuildStep
-    FeatureBuildItem feature() {
-        return new FeatureBuildItem(Feature.HIBERNATE_ENVERS);
-    }
-
-    @BuildStep
-    public void registerEnversReflections(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, "org.hibernate.envers.DefaultRevisionEntity"));
-        reflectiveClass
-                .produce(new ReflectiveClassBuildItem(false, false, "org.hibernate.tuple.entity.DynamicMapEntityTuplizer"));
-        reflectiveClass.produce(
-                new ReflectiveClassBuildItem(false, false, "org.hibernate.tuple.component.DynamicMapComponentTuplizer"));
-    }
-
-}
diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java
new file mode 100644
index 0000000000000..57dcc12149180
--- /dev/null
+++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversFastBootingTest.java
@@ -0,0 +1,42 @@
+package io.quarkus.hibernate.orm.envers;
+
+import javax.inject.Inject;
+
+import org.hibernate.Session;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.wildfly.common.Assert;
+
+import io.quarkus.bootstrap.classloading.ClassLoaderLimiter;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Let's run some checks to verify that the optimisations we have
+ * to actually boot efficiently are going to survive other patches.
+ */
+public class EnversFastBootingTest {
+
+    private static final ClassLoaderLimiter limitsChecker = ClassLoaderLimiter.builder()
+            .neverLoadedResource("org/hibernate/jpa/orm_2_1.xsd")
+            .neverLoadedResource("org/hibernate/jpa/orm_2_2.xsd")
+            .build();
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyAuditedEntity.class))
+            .withConfigurationResource("application.properties")
+            .addClassLoaderEventListener(limitsChecker);
+
+    @Inject
+    Session session;
+
+    @Test
+    public void testInjection() {
+        //Check that Hibernate actually started:
+        Assert.assertNotNull(session);
+    }
+
+}
diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java
new file mode 100644
index 0000000000000..b578d321972a5
--- /dev/null
+++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversStoreDataAtDeleteTestCase.java
@@ -0,0 +1,28 @@
+package io.quarkus.hibernate.orm.envers;
+
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class EnversStoreDataAtDeleteTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyAuditedEntity.class, MyRevisionEntity.class, MyRevisionListener.class,
+                            EnversTestStoreDataAtDeleteResource.class)
+                    .addAsResource("application-with-store-data-at-delete.properties", "application.properties"));
+
+    @Test
+    public void testStoreDataAtDelete() {
+        RestAssured.when().delete("/envers-store-data-at-delete").then()
+                .body(is("OK"));
+    }
+
+}
diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java
new file mode 100644
index 0000000000000..fead8b7164435
--- /dev/null
+++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java
@@ -0,0 +1,64 @@
+package io.quarkus.hibernate.orm.envers;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.resource.spi.IllegalStateException;
+import javax.transaction.UserTransaction;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
+
+import org.hibernate.envers.AuditReader;
+import org.hibernate.envers.AuditReaderFactory;
+
+@Path("/envers-store-data-at-delete")
+@ApplicationScoped
+public class EnversTestStoreDataAtDeleteResource {
+    private static final String NAME = "deleted";
+
+    @Inject
+    EntityManager em;
+
+    @Inject
+    UserTransaction transaction;
+
+    @DELETE
+    public String delete() {
+        try {
+            transaction.begin();
+            MyAuditedEntity entity = new MyAuditedEntity();
+            entity.setName(NAME);
+            em.persist(entity);
+            transaction.commit();
+
+            transaction.begin();
+            em.remove(em.find(MyAuditedEntity.class, entity.getId()));
+            em.flush();
+            transaction.commit();
+
+            AuditReader auditReader = AuditReaderFactory.get(em);
+            List<Number> revisions = auditReader.getRevisions(MyAuditedEntity.class, entity.getId());
+            if (revisions.size() != 2) {
+                throw new IllegalStateException(String.format("found {} revisions", revisions.size()));
+            }
+
+            for (Number revision : revisions) {
+                System.out.println(revision);
+                MyAuditedEntity revEntity = auditReader.find(MyAuditedEntity.class, MyAuditedEntity.class.getName(),
+                        entity.getId(), revision, true);
+                if (revEntity == null) {
+                    throw new IllegalStateException("failed to find delete revision");
+                }
+                if (!NAME.equals(revEntity.getName())) {
+                    throw new IllegalStateException("revision listener failed to persist data on delete");
+                }
+            }
+
+            return "OK";
+        } catch (Exception exception) {
+            return exception.getMessage();
+        }
+    }
+}
diff --git a/extensions/hibernate-envers/deployment/src/test/resources/application-with-store-data-at-delete.properties b/extensions/hibernate-envers/deployment/src/test/resources/application-with-store-data-at-delete.properties
new file mode 100644
index 0000000000000..721ddda002278
--- /dev/null
+++ b/extensions/hibernate-envers/deployment/src/test/resources/application-with-store-data-at-delete.properties
@@ -0,0 +1,5 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-envers.store-data-at-delete=true
diff --git a/extensions/hibernate-envers/pom.xml b/extensions/hibernate-envers/pom.xml
index 73e6b8b3cde32..b128399e509b6 100644
--- a/extensions/hibernate-envers/pom.xml
+++ b/extensions/hibernate-envers/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hibernate-envers-parent</artifactId>
diff --git a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java
new file mode 100644
index 0000000000000..da15823cfd519
--- /dev/null
+++ b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversBuildTimeConfig.java
@@ -0,0 +1,14 @@
+package io.quarkus.hibernate.envers;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class HibernateEnversBuildTimeConfig {
+    /**
+     * Enable store_data_at_delete feature.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean storeDataAtDelete;
+}
diff --git a/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java
new file mode 100644
index 0000000000000..29d9a3386adbd
--- /dev/null
+++ b/extensions/hibernate-envers/runtime/src/main/java/io/quarkus/hibernate/envers/HibernateEnversRecorder.java
@@ -0,0 +1,40 @@
+package io.quarkus.hibernate.envers;
+
+import java.util.function.BiConsumer;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.spi.BootstrapContext;
+import org.hibernate.envers.configuration.EnversSettings;
+
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class HibernateEnversRecorder {
+
+    public HibernateOrmIntegrationStaticInitListener createStaticInitListener(HibernateEnversBuildTimeConfig buildTimeConfig) {
+        return new HibernateEnversIntegrationListener(buildTimeConfig);
+    }
+
+    private static final class HibernateEnversIntegrationListener implements HibernateOrmIntegrationStaticInitListener {
+        private HibernateEnversBuildTimeConfig buildTimeConfig;
+
+        private HibernateEnversIntegrationListener(HibernateEnversBuildTimeConfig buildTimeConfig) {
+            this.buildTimeConfig = buildTimeConfig;
+        }
+
+        @Override
+        public void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
+            addConfig(propertyCollector, EnversSettings.STORE_DATA_AT_DELETE, buildTimeConfig.storeDataAtDelete);
+        }
+
+        public static <T> void addConfig(BiConsumer<String, Object> propertyCollector, String configPath, T value) {
+            propertyCollector.accept(configPath, value);
+        }
+
+        @Override
+        public void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
+                BiConsumer<String, Object> propertyCollector) {
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/pom.xml b/extensions/hibernate-orm/deployment/pom.xml
index 8e8f334a75725..8e60cdce048ba 100644
--- a/extensions/hibernate-orm/deployment/pom.xml
+++ b/extensions/hibernate-orm/deployment/pom.xml
@@ -21,10 +21,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-narayana-jta-deployment</artifactId>
@@ -41,6 +37,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-caffeine-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-hibernate-common-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -62,11 +62,6 @@
             <artifactId>quarkus-hibernate-validator-deployment</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2-deployment</artifactId>
@@ -77,6 +72,16 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -93,6 +98,10 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>de.thetaphi</groupId>
+                <artifactId>forbiddenapis</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java
index 01392e0f4789c..d9bf268161667 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateConfigUtil.java
@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig.HibernateOrmConfigCache;
+import io.quarkus.hibernate.orm.deployment.HibernateOrmConfigPersistenceUnit.HibernateOrmConfigPersistenceUnitCache;
 
 public class HibernateConfigUtil {
 
@@ -14,11 +14,11 @@ public class HibernateConfigUtil {
     private final static String MEMORY_OBJECT_COUNT = ".memory.object-count";
     private static final String HIBERNATE_CACHE_PREFIX = "hibernate.cache.";
 
-    public static Map<String, String> getCacheConfigEntries(HibernateOrmConfig config) {
+    public static Map<String, String> getCacheConfigEntries(HibernateOrmConfigPersistenceUnit config) {
         Map<String, String> cacheRegionsConfigEntries = new HashMap<>();
-        for (Map.Entry<String, HibernateOrmConfigCache> regionEntry : config.cache.entrySet()) {
+        for (Map.Entry<String, HibernateOrmConfigPersistenceUnitCache> regionEntry : config.cache.entrySet()) {
             String regionName = regionEntry.getKey();
-            HibernateOrmConfigCache cacheConfig = regionEntry.getValue();
+            HibernateOrmConfigPersistenceUnitCache cacheConfig = regionEntry.getValue();
 
             if (cacheConfig.expiration.maxIdle.isPresent()) {
                 cacheRegionsConfigEntries.put(getCacheConfigKey(regionName, EXPIRATION_MAX_IDLE),
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java
index a9359dffda89e..1310099e050c1 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEntityEnhancer.java
@@ -11,7 +11,8 @@
 import org.objectweb.asm.ClassWriter;
 
 import io.quarkus.deployment.QuarkusClassWriter;
-import net.bytebuddy.utility.OpenedClassReader;
+import io.quarkus.gizmo.Gizmo;
+import net.bytebuddy.ClassFileVersion;
 
 /**
  * Used to transform bytecode by registering to
@@ -27,7 +28,8 @@
  */
 public final class HibernateEntityEnhancer implements BiFunction<String, ClassVisitor, ClassVisitor> {
 
-    private static final BytecodeProvider PROVIDER = new org.hibernate.bytecode.internal.bytebuddy.BytecodeProviderImpl();
+    private static final BytecodeProvider PROVIDER = new org.hibernate.bytecode.internal.bytebuddy.BytecodeProviderImpl(
+            ClassFileVersion.JAVA_V8);
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
@@ -41,7 +43,9 @@ private static class HibernateEnhancingClassVisitor extends ClassVisitor {
         private final Enhancer enhancer;
 
         public HibernateEnhancingClassVisitor(String className, ClassVisitor outputClassVisitor) {
-            super(OpenedClassReader.ASM_API, new QuarkusClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+            //Careful: the ASM API version needs to match the ASM version of Gizmo, not the one from Byte Buddy.
+            //Most often these match - but occasionally they will diverge which is acceptable as Byte Buddy is shading ASM.
+            super(Gizmo.ASM_API_VERSION, new QuarkusClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
             this.className = className;
             this.outputClassVisitor = outputClassVisitor;
             //note that as getLoadingClassLoader is resolved immediately this can't be created until transform time
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
index 9a2e2db7f5f69..f30a4f579b6fa 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateLogFilterBuildStep.java
@@ -22,7 +22,7 @@ void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
                 new LogCleanupFilterBuildItem("org.hibernate.engine.jdbc.env.internal.LobCreatorBuilderImpl", "HHH000422"));
         filters.produce(new LogCleanupFilterBuildItem("org.hibernate.dialect.Dialect", "HHH000400"));
         filters.produce(new LogCleanupFilterBuildItem("org.hibernate.type.BasicTypeRegistry", "HHH000270"));
-        filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.beans", "HHH10005002"));
+        filters.produce(new LogCleanupFilterBuildItem("org.hibernate.orm.beans", "HHH10005002", "HHH10005004"));
         filters.produce(new LogCleanupFilterBuildItem("org.hibernate.tuple.PojoInstantiator", "HHH000182"));
         filters.produce(new LogCleanupFilterBuildItem("org.hibernate.tuple.entity.EntityMetamodel", "HHH000157"));
         filters.produce(new LogCleanupFilterBuildItem(
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java
new file mode 100644
index 0000000000000..45e00130cf9c9
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmAnnotations.java
@@ -0,0 +1,46 @@
+package io.quarkus.hibernate.orm.deployment;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.hibernate.annotations.AnyMetaDef;
+import org.hibernate.annotations.AnyMetaDefs;
+import org.hibernate.annotations.FetchProfile;
+import org.hibernate.annotations.FetchProfiles;
+import org.hibernate.annotations.FilterDef;
+import org.hibernate.annotations.FilterDefs;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.GenericGenerators;
+import org.hibernate.annotations.ListIndexBase;
+import org.hibernate.annotations.NamedNativeQueries;
+import org.hibernate.annotations.NamedNativeQuery;
+import org.hibernate.annotations.NamedQueries;
+import org.hibernate.annotations.NamedQuery;
+import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.TypeDefs;
+import org.jboss.jandex.DotName;
+
+public final class HibernateOrmAnnotations {
+
+    private HibernateOrmAnnotations() {
+    }
+
+    public static final List<DotName> PACKAGE_ANNOTATIONS = Collections.unmodifiableList(Arrays.asList(
+            DotName.createSimple(AnyMetaDef.class.getName()),
+            DotName.createSimple(AnyMetaDefs.class.getName()),
+            DotName.createSimple(FetchProfile.class.getName()),
+            DotName.createSimple(FetchProfile.FetchOverride.class.getName()),
+            DotName.createSimple(FetchProfiles.class.getName()),
+            DotName.createSimple(FilterDef.class.getName()),
+            DotName.createSimple(FilterDefs.class.getName()),
+            DotName.createSimple(GenericGenerator.class.getName()),
+            DotName.createSimple(GenericGenerators.class.getName()),
+            DotName.createSimple(ListIndexBase.class.getName()),
+            DotName.createSimple(NamedNativeQueries.class.getName()),
+            DotName.createSimple(NamedNativeQuery.class.getName()),
+            DotName.createSimple(NamedQueries.class.getName()),
+            DotName.createSimple(NamedQuery.class.getName()),
+            DotName.createSimple(TypeDef.class.getName()),
+            DotName.createSimple(TypeDefs.class.getName())));
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java
new file mode 100644
index 0000000000000..6f9de89b99520
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmCdiProcessor.java
@@ -0,0 +1,189 @@
+package io.quarkus.hibernate.orm.deployment;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Singleton;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.jboss.jandex.AnnotationTarget.Kind;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.arc.processor.Transformation;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+
+public class HibernateOrmCdiProcessor {
+
+    private static final List<DotName> SESSION_FACTORY_EXPOSED_TYPES = Arrays.asList(
+            DotName.createSimple(EntityManagerFactory.class.getName()),
+            DotName.createSimple(SessionFactory.class.getName()));
+    private static final List<DotName> SESSION_EXPOSED_TYPES = Arrays.asList(
+            DotName.createSimple(EntityManager.class.getName()),
+            DotName.createSimple(Session.class.getName()));
+
+    private static final DotName PERSISTENCE_UNIT_QUALIFIER = DotName.createSimple(PersistenceUnit.class.getName());
+
+    private static final DotName JPA_PERSISTENCE_UNIT = DotName.createSimple(javax.persistence.PersistenceUnit.class.getName());
+
+    private static final DotName JPA_PERSISTENCE_CONTEXT = DotName
+            .createSimple(javax.persistence.PersistenceContext.class.getName());
+
+    @BuildStep
+    AnnotationsTransformerBuildItem convertJpaResourceAnnotationsToQualifier(
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
+            ImpliedBlockingPersistenceUnitTypeBuildItem impliedBlockingPersistenceUnitType) {
+        AnnotationsTransformer transformer = new AnnotationsTransformer() {
+
+            @Override
+            public boolean appliesTo(Kind kind) {
+                // at some point we might want to support METHOD_PARAMETER too but for now getting annotations for them
+                // is cumbersome so let's wait for Jandex improvements
+                return kind == Kind.FIELD;
+            }
+
+            @Override
+            public void transform(TransformationContext transformationContext) {
+                FieldInfo field = transformationContext.getTarget().asField();
+
+                DotName fieldTypeName = field.type().name();
+                if (!SESSION_EXPOSED_TYPES.contains(fieldTypeName)
+                        && !SESSION_FACTORY_EXPOSED_TYPES.contains(fieldTypeName)) {
+                    return;
+                }
+
+                DotName jpaAnnotation;
+                if (field.hasAnnotation(JPA_PERSISTENCE_UNIT)) {
+                    jpaAnnotation = JPA_PERSISTENCE_UNIT;
+                } else if (field.hasAnnotation(JPA_PERSISTENCE_CONTEXT)) {
+                    jpaAnnotation = JPA_PERSISTENCE_CONTEXT;
+                } else {
+                    return;
+                }
+
+                AnnotationValue persistenceUnitNameAnnotationValue = field.annotation(jpaAnnotation).value("unitName");
+
+                Transformation transformation = transformationContext.transform()
+                        .add(DotNames.INJECT);
+                if (persistenceUnitNameAnnotationValue == null || persistenceUnitNameAnnotationValue.asString().isEmpty()) {
+                    transformation.add(DotNames.DEFAULT);
+                } else if (persistenceUnitDescriptors.size() == 1
+                        && !impliedBlockingPersistenceUnitType.shouldGenerateImpliedBlockingPersistenceUnit()
+                        && persistenceUnitDescriptors.get(0).getPersistenceUnitName()
+                                .equals(persistenceUnitNameAnnotationValue.asString())) {
+                    // we are in the case where we have only one persistence unit defined in a persistence.xml
+                    // in this case, we consider it the default too if the name matches
+                    transformation.add(DotNames.DEFAULT);
+                } else {
+                    transformation.add(PERSISTENCE_UNIT_QUALIFIER,
+                            AnnotationValue.createStringValue("value", persistenceUnitNameAnnotationValue.asString()));
+                }
+                transformation.done();
+            }
+        };
+
+        return new AnnotationsTransformerBuildItem(transformer);
+    }
+
+    @Record(ExecutionTime.STATIC_INIT)
+    @BuildStep
+    void generateDataSourceBeans(HibernateOrmRecorder recorder,
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
+            ImpliedBlockingPersistenceUnitTypeBuildItem impliedBlockingPersistenceUnitType,
+            List<JdbcDataSourceBuildItem> jdbcDataSources, // just make sure the datasources are initialized
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer) {
+        if (persistenceUnitDescriptors.isEmpty()) {
+            // No persistence units have been configured so bail out
+            return;
+        }
+
+        // add the @PersistenceUnit class otherwise it won't be registered as a qualifier
+        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(PersistenceUnit.class).build());
+
+        // we have only one persistence unit defined in a persistence.xml: we make it the default even if it has a name
+        if (persistenceUnitDescriptors.size() == 1
+                && !impliedBlockingPersistenceUnitType.shouldGenerateImpliedBlockingPersistenceUnit()) {
+
+            String persistenceUnitName = persistenceUnitDescriptors.get(0).getPersistenceUnitName();
+
+            syntheticBeanBuildItemBuildProducer
+                    .produce(createSyntheticBean(persistenceUnitName,
+                            true,
+                            SessionFactory.class, SESSION_FACTORY_EXPOSED_TYPES,
+                            recorder.sessionFactorySupplier(persistenceUnitName),
+                            true));
+
+            syntheticBeanBuildItemBuildProducer
+                    .produce(createSyntheticBean(persistenceUnitName,
+                            true,
+                            Session.class, SESSION_EXPOSED_TYPES,
+                            recorder.sessionSupplier(persistenceUnitName),
+                            false));
+
+            return;
+        }
+
+        for (PersistenceUnitDescriptorBuildItem persistenceUnitDescriptor : persistenceUnitDescriptors) {
+            String persistenceUnitName = persistenceUnitDescriptor.getPersistenceUnitName();
+
+            syntheticBeanBuildItemBuildProducer
+                    .produce(createSyntheticBean(persistenceUnitName,
+                            PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName),
+                            SessionFactory.class, SESSION_FACTORY_EXPOSED_TYPES,
+                            recorder.sessionFactorySupplier(persistenceUnitName),
+                            true));
+
+            syntheticBeanBuildItemBuildProducer
+                    .produce(createSyntheticBean(persistenceUnitName,
+                            PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName),
+                            Session.class, SESSION_EXPOSED_TYPES,
+                            recorder.sessionSupplier(persistenceUnitName),
+                            false));
+        }
+    }
+
+    private static <T> SyntheticBeanBuildItem createSyntheticBean(String persistenceUnitName, boolean isDefaultPersistenceUnit,
+            Class<T> type, List<DotName> allExposedTypes, Supplier<T> supplier, boolean defaultBean) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(type)
+                .scope(Singleton.class)
+                .unremovable()
+                .supplier(supplier);
+
+        for (DotName exposedType : allExposedTypes) {
+            configurator.addType(exposedType);
+        }
+
+        if (defaultBean) {
+            configurator.defaultBean();
+        }
+
+        if (isDefaultPersistenceUnit) {
+            configurator.addQualifier(Default.class);
+        } else {
+            configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", persistenceUnitName).done();
+            configurator.addQualifier().annotation(PersistenceUnit.class).addValue("value", persistenceUnitName).done();
+        }
+
+        return configurator.done();
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
index 2a2fb3e6f6fdb..4b94b02bde61a 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
@@ -1,12 +1,9 @@
 package io.quarkus.hibernate.orm.deployment;
 
-import java.nio.charset.Charset;
-import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.OptionalLong;
 
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -14,133 +11,20 @@
 
 @ConfigRoot
 public class HibernateOrmConfig {
-    /**
-     * Class name of the Hibernate ORM dialect. The complete list of bundled dialects is available in the
-     * https://docs.jboss.org/hibernate/stable/orm/javadocs/org/hibernate/dialect/package-summary.html[Hibernate ORM JavaDoc].
-     *
-     * [NOTE]
-     * ====
-     * Not all the dialects are supported in GraalVM native executables: we currently provide driver extensions for PostgreSQL,
-     * MariaDB, Microsoft SQL Server and H2.
-     * ====
-     *
-     * @asciidoclet
-     */
-    // TODO should it be dialects
-    //TODO should it be shortcuts like "postgresql" "h2" etc
-    @ConfigItem
-    public Optional<String> dialect;
-
-    /**
-     * The storage engine to use when the dialect supports multiple storage engines.
-     *
-     * E.g. `MyISAM` or `InnoDB` for MySQL.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(name = "dialect.storage-engine")
-    public Optional<String> dialectStorageEngine;
-
-    // @formatter:off
-    /**
-     * Name of the file containing the SQL statements to execute when Hibernate ORM starts.
-     * Its default value differs depending on the Quarkus launch mode:
-     *
-     * * In dev and test modes, it defaults to `import.sql`.
-     *   Simply add an `import.sql` file in the root of your resources directory
-     *   and it will be picked up without having to set this property.
-     *   Pass `no-file` to force Hibernate ORM to ignore the SQL import file.
-     * * In production mode, it defaults to `no-file`.
-     *   It means Hibernate ORM won't try to execute any SQL import file by default.
-     *   Pass an explicit value to force Hibernate ORM to execute the SQL import file.
-     *
-     * If you need different SQL statements between dev mode, test (`@QuarkusTest`) and in production, use Quarkus
-     * https://quarkus.io/guides/config#configuration-profiles[configuration profiles facility].
-     *
-     * [source,property]
-     * .application.properties
-     * ----
-     * %dev.quarkus.hibernate-orm.sql-load-script = import-dev.sql
-     * %test.quarkus.hibernate-orm.sql-load-script = import-test.sql
-     * %prod.quarkus.hibernate-orm.sql-load-script = no-file
-     * ----
-     *
-     * [NOTE]
-     * ====
-     * Quarkus supports `.sql` file with SQL statements or comments spread over multiple lines.
-     * Each SQL statement must be terminated by a semicolon.
-     * ====
-     *
-     * @asciidoclet
-     */
-    // @formatter:on
-    @ConfigItem(defaultValueDocumentation = "import.sql in DEV, TEST ; no-file otherwise")
-    public Optional<String> sqlLoadScript;
-
-    /**
-     * The size of the batches used when loading entities and collections.
-     *
-     * `-1` means batch loading is disabled. This is the default.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(defaultValue = "-1")
-    public int batchFetchSize;
-
-    /**
-     * Pluggable strategy contract for applying physical naming rules for database object names.
-     *
-     * Class name of the Hibernate PhysicalNamingStrategy implementation
-     */
-    @ConfigItem
-    public Optional<String> physicalNamingStrategy;
-
-    /**
-     * Pluggable strategy for applying implicit naming rules when an explicit name is not given.
-     *
-     * Class name of the Hibernate ImplicitNamingStrategy implementation
-     */
-    @ConfigItem
-    public Optional<String> implicitNamingStrategy;
 
     /**
-     * Defines the method for multi-tenancy (DATABASE, NONE, SCHEMA). The complete list of allowed values is available in the
-     * https://docs.jboss.org/hibernate/stable/orm/javadocs/org/hibernate/MultiTenancyStrategy.html[Hibernate ORM JavaDoc].
-     * The type DISCRIMINATOR is currently not supported. The default value is NONE (no multi-tenancy).
-     *
-     * @asciidoclet
+     * Configuration for the default persistence unit.
      */
-    @ConfigItem
-    public Optional<String> multitenant;
-
-    /**
-     * Defines the name of the data source to use in case of SCHEMA approach. The default data source will be used if not set.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem
-    public Optional<String> multitenantSchemaDatasource;
-
-    /**
-     * Query related configuration.
-     */
-    @ConfigItem
-    @ConfigDocSection
-    public HibernateOrmConfigQuery query;
-
-    /**
-     * Database related configuration.
-     */
-    @ConfigItem
-    @ConfigDocSection
-    public HibernateOrmConfigDatabase database;
+    @ConfigItem(name = ConfigItem.PARENT)
+    public HibernateOrmConfigPersistenceUnit defaultPersistenceUnit;
 
     /**
-     * JDBC related configuration.
+     * Additional named persistence units.
      */
-    @ConfigItem
     @ConfigDocSection
-    public HibernateOrmConfigJdbc jdbc;
+    @ConfigDocMapKey("persistence-unit-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, HibernateOrmConfigPersistenceUnit> persistenceUnits;
 
     /**
      * Logging configuration.
@@ -149,12 +33,6 @@ public class HibernateOrmConfig {
     @ConfigDocSection
     public HibernateOrmConfigLog log;
 
-    /**
-     * Caching configuration
-     */
-    @ConfigDocSection
-    public Map<String, HibernateOrmConfigCache> cache;
-
     /**
      * Whether statistics collection is enabled. If 'metrics.enabled' is true, then the default here is
      * considered true, otherwise the default is false.
@@ -163,202 +41,41 @@ public class HibernateOrmConfig {
     public Optional<Boolean> statistics;
 
     /**
-     * Whether or not metrics are published in case the smallrye-metrics extension is present (default to false).
+     * Whether or not metrics are published if a metrics extension is enabled.
      */
     @ConfigItem(name = "metrics.enabled")
     public boolean metricsEnabled;
 
-    /**
-     * The default in Quarkus is for 2nd level caching to be enabled,
-     * and a good implementation is already integrated for you.
-     * <p>
-     * Just cherry-pick which entities should be using the cache.
-     * <p>
-     * Set this to false to disable all 2nd level caches.
-     */
-    @ConfigItem(defaultValue = "true")
-    public boolean secondLevelCachingEnabled;
-
     public boolean isAnyPropertySet() {
-        return dialect.isPresent() ||
-                dialectStorageEngine.isPresent() ||
-                sqlLoadScript.isPresent() ||
-                batchFetchSize > 0 ||
-                statistics.isPresent() ||
-                query.isAnyPropertySet() ||
-                database.isAnyPropertySet() ||
-                jdbc.isAnyPropertySet() ||
+        return defaultPersistenceUnit.isAnyPropertySet() ||
+                !persistenceUnits.isEmpty() ||
                 log.isAnyPropertySet() ||
-                multitenant.isPresent() ||
-                multitenantSchemaDatasource.isPresent() ||
-                !cache.isEmpty();
-    }
-
-    @ConfigGroup
-    public static class HibernateOrmConfigQuery {
-
-        /**
-         * The maximum size of the query plan cache.
-         */
-        @ConfigItem
-        public Optional<String> queryPlanCacheMaxSize;
-
-        /**
-         * Default precedence of null values in `ORDER BY` clauses.
-         *
-         * Valid values are: `none`, `first`, `last`.
-         *
-         * @asciidoclet
-         */
-        @ConfigItem
-        public Optional<String> defaultNullOrdering;
-
-        public boolean isAnyPropertySet() {
-            return queryPlanCacheMaxSize.isPresent() || defaultNullOrdering.isPresent();
-        }
-    }
-
-    @ConfigGroup
-    public static class HibernateOrmConfigDatabase {
-
-        private static final String DEFAULT_CHARSET = "UTF-8";
-
-        /**
-         * Select whether the database schema is generated or not.
-         *
-         * `drop-and-create` is awesome in development mode.
-         *
-         * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`.
-         */
-        @ConfigItem(defaultValue = "none")
-        public String generation;
-
-        /**
-         * Whether we should stop on the first error when applying the schema.
-         */
-        @ConfigItem(name = "generation.halt-on-error")
-        public boolean generationHaltOnError;
-
-        /**
-         * The default catalog to use for the database objects.
-         */
-        @ConfigItem
-        public Optional<String> defaultCatalog;
-
-        /**
-         * The default schema to use for the database objects.
-         */
-        @ConfigItem
-        public Optional<String> defaultSchema;
-
-        /**
-         * The charset of the database.
-         * <p>
-         * Used for DDL generation and also for the SQL import scripts.
-         */
-        @ConfigItem(defaultValue = "UTF-8")
-        public Charset charset;
-
-        /**
-         * Whether Hibernate should quote all identifiers.
-         */
-        @ConfigItem
-        public boolean globallyQuotedIdentifiers;
-
-        public boolean isAnyPropertySet() {
-            return !"none".equals(generation) || defaultCatalog.isPresent() || defaultSchema.isPresent()
-                    || generationHaltOnError
-                    || !DEFAULT_CHARSET.equals(charset.name())
-                    || globallyQuotedIdentifiers;
-        }
-    }
-
-    @ConfigGroup
-    public static class HibernateOrmConfigJdbc {
-
-        /**
-         * The time zone pushed to the JDBC driver.
-         */
-        @ConfigItem
-        public Optional<String> timezone;
-
-        /**
-         * How many rows are fetched at a time by the JDBC driver.
-         */
-        @ConfigItem
-        public OptionalInt statementFetchSize;
-
-        /**
-         * The number of updates (inserts, updates and deletes) that are sent by the JDBC driver at one time for execution.
-         */
-        @ConfigItem
-        public OptionalInt statementBatchSize;
-
-        public boolean isAnyPropertySet() {
-            return timezone.isPresent() || statementFetchSize.isPresent() || statementBatchSize.isPresent();
-        }
+                statistics.isPresent() ||
+                metricsEnabled;
     }
 
     @ConfigGroup
     public static class HibernateOrmConfigLog {
 
         /**
-         * Show SQL logs and format them nicely.
+         * Logs SQL bind parameter.
          * <p>
          * Setting it to true is obviously not recommended in production.
          */
         @ConfigItem
-        public boolean sql;
+        @Deprecated
+        public boolean bindParam;
 
         /**
-         * Logs SQL bind parameter.
+         * Logs SQL bind parameters.
          * <p>
          * Setting it to true is obviously not recommended in production.
          */
         @ConfigItem
-        public boolean bindParam;
-
-        /**
-         * Whether JDBC warnings should be collected and logged.
-         */
-        @ConfigItem(defaultValueDocumentation = "depends on dialect")
-        public Optional<Boolean> jdbcWarnings;
+        public boolean bindParameters;
 
         public boolean isAnyPropertySet() {
-            return sql || bindParam || jdbcWarnings.isPresent();
+            return bindParam || bindParameters;
         }
     }
-
-    @ConfigGroup
-    public static class HibernateOrmConfigCache {
-        /**
-         * The cache expiration configuration.
-         */
-        @ConfigItem
-        public HibernateOrmConfigCacheExpiration expiration;
-
-        /**
-         * The cache memory storage configuration.
-         */
-        @ConfigItem
-        public HibernateOrmConfigCacheMemory memory;
-    }
-
-    @ConfigGroup
-    public static class HibernateOrmConfigCacheExpiration {
-        /**
-         * The maximum time before an object of the cache is considered expired.
-         */
-        @ConfigItem
-        public Optional<Duration> maxIdle;
-    }
-
-    @ConfigGroup
-    public static class HibernateOrmConfigCacheMemory {
-        /**
-         * The maximum number of objects kept in memory in the cache.
-         */
-        @ConfigItem
-        public OptionalLong objectCount;
-    }
 }
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java
new file mode 100644
index 0000000000000..891c406ff01b7
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java
@@ -0,0 +1,420 @@
+package io.quarkus.hibernate.orm.deployment;
+
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.Set;
+
+import org.hibernate.engine.query.spi.QueryPlanCache;
+
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class HibernateOrmConfigPersistenceUnit {
+
+    /**
+     * The name of the datasource which this persistence unit uses.
+     * <p>
+     * If undefined, it will use the default datasource.
+     */
+    public Optional<String> datasource;
+
+    /**
+     * The packages in which the entities affected to this persistence unit are located.
+     */
+    public Optional<Set<String>> packages;
+
+    /**
+     * Dialect related configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitDialect dialect;
+
+    // @formatter:off
+    /**
+     * Name of the file containing the SQL statements to execute when Hibernate ORM starts.
+     * Its default value differs depending on the Quarkus launch mode:
+     *
+     * * In dev and test modes, it defaults to `import.sql`.
+     *   Simply add an `import.sql` file in the root of your resources directory
+     *   and it will be picked up without having to set this property.
+     *   Pass `no-file` to force Hibernate ORM to ignore the SQL import file.
+     * * In production mode, it defaults to `no-file`.
+     *   It means Hibernate ORM won't try to execute any SQL import file by default.
+     *   Pass an explicit value to force Hibernate ORM to execute the SQL import file.
+     *
+     * If you need different SQL statements between dev mode, test (`@QuarkusTest`) and in production, use Quarkus
+     * https://quarkus.io/guides/config#configuration-profiles[configuration profiles facility].
+     *
+     * [source,property]
+     * .application.properties
+     * ----
+     * %dev.quarkus.hibernate-orm.sql-load-script = import-dev.sql
+     * %test.quarkus.hibernate-orm.sql-load-script = import-test.sql
+     * %prod.quarkus.hibernate-orm.sql-load-script = no-file
+     * ----
+     *
+     * [NOTE]
+     * ====
+     * Quarkus supports `.sql` file with SQL statements or comments spread over multiple lines.
+     * Each SQL statement must be terminated by a semicolon.
+     * ====
+     *
+     * @asciidoclet
+     */
+    // @formatter:on
+    @ConfigItem(defaultValueDocumentation = "import.sql in DEV, TEST ; no-file otherwise")
+    public Optional<String> sqlLoadScript;
+
+    /**
+     * The size of the batches used when loading entities and collections.
+     *
+     * `-1` means batch loading is disabled. This is the default.
+     *
+     * @deprecated {@link #fetch} should be used to configure fetching properties.
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = "-1")
+    @Deprecated
+    public int batchFetchSize;
+
+    /**
+     * The maximum depth of outer join fetch tree for single-ended associations (one-to-one, many-to-one).
+     *
+     * A `0` disables default outer join fetching.
+     *
+     * @deprecated {@link #fetch} should be used to configure fetching properties.
+     * @asciidoclet
+     */
+    @ConfigItem
+    @Deprecated
+    public OptionalInt maxFetchDepth;
+
+    /**
+     * Pluggable strategy contract for applying physical naming rules for database object names.
+     *
+     * Class name of the Hibernate PhysicalNamingStrategy implementation
+     */
+    @ConfigItem
+    public Optional<String> physicalNamingStrategy;
+
+    /**
+     * Pluggable strategy for applying implicit naming rules when an explicit name is not given.
+     *
+     * Class name of the Hibernate ImplicitNamingStrategy implementation
+     */
+    @ConfigItem
+    public Optional<String> implicitNamingStrategy;
+
+    /**
+     * Query related configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitQuery query;
+
+    /**
+     * Database related configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitDatabase database;
+
+    /**
+     * JDBC related configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitJdbc jdbc;
+
+    /**
+     * Fetching logic configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitFetch fetch;
+
+    /**
+     * Caching configuration
+     */
+    @ConfigDocSection
+    public Map<String, HibernateOrmConfigPersistenceUnitCache> cache;
+
+    /**
+     * The default in Quarkus is for 2nd level caching to be enabled,
+     * and a good implementation is already integrated for you.
+     * <p>
+     * Just cherry-pick which entities should be using the cache.
+     * <p>
+     * Set this to false to disable all 2nd level caches.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean secondLevelCachingEnabled;
+
+    /**
+     * Defines the method for multi-tenancy (DATABASE, NONE, SCHEMA). The complete list of allowed values is available in the
+     * https://docs.jboss.org/hibernate/stable/orm/javadocs/org/hibernate/MultiTenancyStrategy.html[Hibernate ORM JavaDoc].
+     * The type DISCRIMINATOR is currently not supported. The default value is NONE (no multi-tenancy).
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Optional<String> multitenant;
+
+    /**
+     * Defines the name of the datasource to use in case of SCHEMA approach. The datasource of the persistence unit will be used
+     * if not set.
+     */
+    @ConfigItem
+    public Optional<String> multitenantSchemaDatasource;
+
+    public boolean isAnyPropertySet() {
+        return datasource.isPresent() ||
+                packages.isPresent() ||
+                dialect.isAnyPropertySet() ||
+                sqlLoadScript.isPresent() ||
+                batchFetchSize > 0 ||
+                maxFetchDepth.isPresent() ||
+                physicalNamingStrategy.isPresent() ||
+                implicitNamingStrategy.isPresent() ||
+                query.isAnyPropertySet() ||
+                database.isAnyPropertySet() ||
+                jdbc.isAnyPropertySet() ||
+                !cache.isEmpty() ||
+                !secondLevelCachingEnabled ||
+                multitenant.isPresent() ||
+                multitenantSchemaDatasource.isPresent() ||
+                fetch.isAnyPropertySet();
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitDialect {
+
+        /**
+         * Class name of the Hibernate ORM dialect. The complete list of bundled dialects is available in the
+         * https://docs.jboss.org/hibernate/stable/orm/javadocs/org/hibernate/dialect/package-summary.html[Hibernate ORM
+         * JavaDoc].
+         *
+         * [NOTE]
+         * ====
+         * Not all the dialects are supported in GraalVM native executables: we currently provide driver extensions for
+         * PostgreSQL,
+         * MariaDB, Microsoft SQL Server and H2.
+         * ====
+         *
+         * @asciidoclet
+         */
+        // TODO should it be dialects
+        //TODO should it be shortcuts like "postgresql" "h2" etc
+        @ConfigItem(name = ConfigItem.PARENT)
+        public Optional<String> dialect;
+
+        /**
+         * The storage engine to use when the dialect supports multiple storage engines.
+         *
+         * E.g. `MyISAM` or `InnoDB` for MySQL.
+         *
+         * @asciidoclet
+         */
+        @ConfigItem
+        public Optional<String> storageEngine;
+
+        public boolean isAnyPropertySet() {
+            return dialect.isPresent() || storageEngine.isPresent();
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitQuery {
+
+        private static final int DEFAULT_QUERY_PLAN_CACHE_MAX_SIZE = 2048;
+
+        public enum NullOrdering {
+            NONE,
+            FIRST,
+            LAST
+        }
+
+        /**
+         * The maximum size of the query plan cache.
+         * see #{@value QueryPlanCache#DEFAULT_QUERY_PLAN_MAX_COUNT}
+         */
+        @ConfigItem(defaultValue = "2048")
+        public int queryPlanCacheMaxSize;
+
+        /**
+         * Default precedence of null values in `ORDER BY` clauses.
+         *
+         * Valid values are: `none`, `first`, `last`.
+         *
+         * @asciidoclet
+         */
+        @ConfigItem(defaultValue = "none")
+        public NullOrdering defaultNullOrdering;
+
+        public boolean isAnyPropertySet() {
+            return queryPlanCacheMaxSize != DEFAULT_QUERY_PLAN_CACHE_MAX_SIZE
+                    || defaultNullOrdering != NullOrdering.NONE;
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitDatabase {
+
+        private static final String DEFAULT_CHARSET = "UTF-8";
+
+        /**
+         * The default catalog to use for the database objects.
+         */
+        @ConfigItem
+        public Optional<String> defaultCatalog;
+
+        /**
+         * The default schema to use for the database objects.
+         */
+        @ConfigItem
+        public Optional<String> defaultSchema;
+
+        /**
+         * The charset of the database.
+         * <p>
+         * Used for DDL generation and also for the SQL import scripts.
+         */
+        @ConfigItem(defaultValue = DEFAULT_CHARSET)
+        public Charset charset;
+
+        /**
+         * Whether Hibernate should quote all identifiers.
+         */
+        @ConfigItem
+        public boolean globallyQuotedIdentifiers;
+
+        public boolean isAnyPropertySet() {
+            return defaultCatalog.isPresent()
+                    || defaultSchema.isPresent()
+                    || !DEFAULT_CHARSET.equals(charset.name())
+                    || globallyQuotedIdentifiers;
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitJdbc {
+
+        /**
+         * The time zone pushed to the JDBC driver.
+         */
+        @ConfigItem
+        public Optional<String> timezone;
+
+        /**
+         * How many rows are fetched at a time by the JDBC driver.
+         */
+        @ConfigItem
+        public OptionalInt statementFetchSize;
+
+        /**
+         * The number of updates (inserts, updates and deletes) that are sent by the JDBC driver at one time for execution.
+         */
+        @ConfigItem
+        public OptionalInt statementBatchSize;
+
+        public boolean isAnyPropertySet() {
+            return timezone.isPresent() || statementFetchSize.isPresent() || statementBatchSize.isPresent();
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitLog {
+
+        /**
+         * Show SQL logs and format them nicely.
+         * <p>
+         * Setting it to true is obviously not recommended in production.
+         */
+        @ConfigItem
+        public boolean sql;
+
+        /**
+         * Format the SQL logs if SQL log is enabled
+         */
+        @ConfigItem(defaultValue = "true")
+        public boolean formatSql;
+
+        /**
+         * Whether JDBC warnings should be collected and logged.
+         */
+        @ConfigItem(defaultValueDocumentation = "depends on dialect")
+        public Optional<Boolean> jdbcWarnings;
+
+        public boolean isAnyPropertySet() {
+            return sql || !formatSql || jdbcWarnings.isPresent();
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitCache {
+        /**
+         * The cache expiration configuration.
+         */
+        @ConfigItem
+        public HibernateOrmConfigPersistenceUnitCacheExpiration expiration;
+
+        /**
+         * The cache memory storage configuration.
+         */
+        @ConfigItem
+        public HibernateOrmConfigPersistenceUnitCacheMemory memory;
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitCacheExpiration {
+        /**
+         * The maximum time before an object of the cache is considered expired.
+         */
+        @ConfigItem
+        public Optional<Duration> maxIdle;
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitCacheMemory {
+        /**
+         * The maximum number of objects kept in memory in the cache.
+         */
+        @ConfigItem
+        public OptionalLong objectCount;
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitFetch {
+        /**
+         * The size of the batches used when loading entities and collections.
+         *
+         * `-1` means batch loading is disabled. This is the default.
+         *
+         * @asciidoclet
+         */
+        @ConfigItem(defaultValue = "-1")
+        public int batchSize;
+
+        /**
+         * The maximum depth of outer join fetch tree for single-ended associations (one-to-one, many-to-one).
+         *
+         * A `0` disables default outer join fetching.
+         *
+         * @asciidoclet
+         */
+        @ConfigItem
+        public OptionalInt maxDepth;
+
+        public boolean isAnyPropertySet() {
+            return batchSize > 0 || maxDepth.isPresent();
+        }
+
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
index a22d50ad96535..9f0434465e4d9 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -8,7 +8,6 @@
 import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -18,17 +17,24 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.Properties;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import javax.enterprise.inject.Produces;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Default;
+import javax.inject.Singleton;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
 import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
 import javax.persistence.metamodel.StaticMetamodel;
 import javax.persistence.spi.PersistenceUnitTransactionType;
 import javax.transaction.TransactionManager;
@@ -36,7 +42,9 @@
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.annotations.Proxy;
 import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
+import org.hibernate.boot.archive.scan.spi.PackageDescriptor;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator;
 import org.hibernate.dialect.DB297Dialect;
 import org.hibernate.dialect.DerbyTenSevenDialect;
 import org.hibernate.dialect.MariaDB103Dialect;
@@ -47,24 +55,29 @@
 import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
 import org.hibernate.loader.BatchFetchStyle;
 import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
 import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationTarget.Kind;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.CompositeIndex;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
+import org.jboss.logging.Logger;
 import org.jboss.logmanager.Level;
 
-import io.quarkus.agroal.deployment.JdbcDataSourceBuildItem;
-import io.quarkus.agroal.deployment.JdbcDataSourceSchemaReadyBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
-import io.quarkus.arc.deployment.ResourceAnnotationBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem.ExtendedBeanConfigurator;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanTypeExclusion;
 import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
@@ -73,41 +86,52 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Consume;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
+import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
-import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.LogCategoryBuildItem;
+import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.configuration.ConfigurationError;
 import io.quarkus.deployment.index.IndexingUtil;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
+import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.deployment.util.IoUtil;
 import io.quarkus.deployment.util.ServiceUtil;
-import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationBuildItem;
+import io.quarkus.hibernate.orm.PersistenceUnit;
 import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem;
-import io.quarkus.hibernate.orm.runtime.DefaultEntityManagerFactoryProducer;
-import io.quarkus.hibernate.orm.runtime.DefaultEntityManagerProducer;
+import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationStaticConfiguredBuildItem;
 import io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder;
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
 import io.quarkus.hibernate.orm.runtime.JPAConfig;
-import io.quarkus.hibernate.orm.runtime.JPAResourceReferenceProvider;
-import io.quarkus.hibernate.orm.runtime.RequestScopedEntityManagerHolder;
-import io.quarkus.hibernate.orm.runtime.TransactionEntityManagers;
+import io.quarkus.hibernate.orm.runtime.JPAConfigSupport;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+import io.quarkus.hibernate.orm.runtime.RequestScopedSessionHolder;
+import io.quarkus.hibernate.orm.runtime.TransactionSessions;
 import io.quarkus.hibernate.orm.runtime.boot.QuarkusPersistenceUnitDefinition;
 import io.quarkus.hibernate.orm.runtime.boot.scan.QuarkusScanner;
+import io.quarkus.hibernate.orm.runtime.cdi.QuarkusArcBeanContainer;
 import io.quarkus.hibernate.orm.runtime.dialect.QuarkusH2Dialect;
 import io.quarkus.hibernate.orm.runtime.dialect.QuarkusPostgreSQL10Dialect;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
 import io.quarkus.hibernate.orm.runtime.proxies.PreGeneratedProxies;
 import io.quarkus.hibernate.orm.runtime.tenant.DataSourceTenantConnectionResolver;
+import io.quarkus.hibernate.orm.runtime.tenant.TenantConnectionResolver;
+import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
+import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.common.deployment.HibernateModelClassCandidatesForFieldAccessBuildItem;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.ConfigurationException;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.DynamicType;
 
@@ -125,23 +149,60 @@ public final class HibernateOrmProcessor {
     public static final String HIBERNATE_ORM_CONFIG_PREFIX = "quarkus.hibernate-orm.";
     public static final String NO_SQL_LOAD_SCRIPT_FILE = "no-file";
 
-    private static final DotName PERSISTENCE_CONTEXT = DotName.createSimple(PersistenceContext.class.getName());
-    private static final DotName PERSISTENCE_UNIT = DotName.createSimple(PersistenceUnit.class.getName());
-    private static final DotName PRODUCES = DotName.createSimple(Produces.class.getName());
+    private static final Logger LOG = Logger.getLogger(HibernateOrmProcessor.class);
+
+    private static final DotName TENANT_CONNECTION_RESOLVER = DotName.createSimple(TenantConnectionResolver.class.getName());
+    private static final DotName TENANT_RESOLVER = DotName.createSimple(TenantResolver.class.getName());
+
     private static final DotName STATIC_METAMODEL = DotName.createSimple(StaticMetamodel.class.getName());
+    private static final DotName PERSISTENCE_UNIT = DotName.createSimple(PersistenceUnit.class.getName());
+    private static final DotName PERSISTENCE_UNIT_REPEATABLE_CONTAINER = DotName
+            .createSimple(PersistenceUnit.List.class.getName());
+    private static final DotName JPA_ENTITY = DotName.createSimple(Entity.class.getName());
+    private static final DotName MAPPED_SUPERCLASS = DotName.createSimple(MappedSuperclass.class.getName());
 
     private static final String INTEGRATOR_SERVICE_FILE = "META-INF/services/org.hibernate.integrator.spi.Integrator";
 
-    /**
-     * Hibernate ORM configuration
-     */
-    HibernateOrmConfig hibernateConfig;
+    private static final String PROXY_CACHE = HibernateOrmProcessor.class.getName() + ".proxyCache";
 
     @BuildStep
     CapabilityBuildItem capability() {
         return new CapabilityBuildItem(Capability.HIBERNATE_ORM);
     }
 
+    @BuildStep
+    void checkTransactionsSupport(Capabilities capabilities) {
+        // JTA is necessary for blocking Hibernate ORM but not necessarily for Hibernate Reactive
+        if (capabilities.isMissing(Capability.TRANSACTIONS)
+                && capabilities.isMissing(Capability.HIBERNATE_REACTIVE)) {
+            throw new ConfigurationException("The Hibernate ORM extension is only functional in a JTA environment.");
+        }
+    }
+
+    @BuildStep
+    void includeArchivesHostingEntityPackagesInIndex(HibernateOrmConfig hibernateOrmConfig,
+            BuildProducer<AdditionalApplicationArchiveMarkerBuildItem> additionalApplicationArchiveMarkers) {
+        if (hibernateOrmConfig.defaultPersistenceUnit.packages.isPresent()) {
+            for (String pakkage : hibernateOrmConfig.defaultPersistenceUnit.packages.get()) {
+                additionalApplicationArchiveMarkers
+                        .produce(new AdditionalApplicationArchiveMarkerBuildItem(pakkage.replace('.', '/')));
+            }
+        }
+        for (HibernateOrmConfigPersistenceUnit persistenceUnit : hibernateOrmConfig.persistenceUnits.values()) {
+            if (persistenceUnit.packages.isPresent()) {
+                for (String pakkage : persistenceUnit.packages.get()) {
+                    additionalApplicationArchiveMarkers
+                            .produce(new AdditionalApplicationArchiveMarkerBuildItem(pakkage.replace('.', '/')));
+                }
+            }
+        }
+    }
+
+    @BuildStep
+    AdditionalIndexedClassesBuildItem addPersistenceUnitAnnotationToIndex() {
+        return new AdditionalIndexedClassesBuildItem(PersistenceUnit.class.getName());
+    }
+
     // We do our own enhancement during the compilation phase, so disable any
     // automatic entity enhancement by Hibernate ORM
     // This has to happen before Hibernate ORM classes are initialized: see
@@ -152,6 +213,17 @@ public SystemPropertyBuildItem enforceDisableRuntimeEnhancer() {
                 org.hibernate.cfg.Environment.BYTECODE_PROVIDER_NAME_NONE);
     }
 
+    @BuildStep
+    public void enrollBeanValidationTypeSafeActivatorForReflection(Capabilities capabilities,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+        if (capabilities.isPresent(Capability.HIBERNATE_VALIDATOR)) {
+            reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true,
+                    "org.hibernate.cfg.beanvalidation.TypeSafeActivator"));
+            reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, false,
+                    BeanValidationIntegrator.BV_CHECK_CLASS));
+        }
+    }
+
     @BuildStep
     List<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles(LaunchModeBuildItem launchMode) {
         List<HotDeploymentWatchedFileBuildItem> watchedFiles = new ArrayList<>();
@@ -160,21 +232,9 @@ List<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles(LaunchModeBuil
         }
         watchedFiles.add(new HotDeploymentWatchedFileBuildItem(INTEGRATOR_SERVICE_FILE));
 
-        getSqlLoadScript(launchMode.getLaunchMode()).ifPresent(script -> {
-            watchedFiles.add(new HotDeploymentWatchedFileBuildItem(script));
-        });
-        return watchedFiles;
-    }
+        // SQL load scripts are handled when assembling the Quarkus-configured persistence units
 
-    /**
-     * Undocumented feature: we allow setting the System property
-     * "SKIP_PARSE_PERSISTENCE_XML" to fully ignore any persistence.xml
-     * resource.
-     * 
-     * @return true if we're expected to ignore them
-     */
-    private boolean shouldIgnorePersistenceXmlResources() {
-        return Boolean.getBoolean("SKIP_PARSE_PERSISTENCE_XML");
+        return watchedFiles;
     }
 
     //Integration point: allow other extensions to define additional PersistenceXmlDescriptorBuildItem
@@ -193,7 +253,8 @@ public void parsePersistenceXmlDescriptors(
     @BuildStep
     public ImpliedBlockingPersistenceUnitTypeBuildItem defineTypeOfImpliedPU(
             List<JdbcDataSourceBuildItem> jdbcDataSourcesBuildItem, //This is from Agroal SPI: safe to use even for Hibernate Reactive
-            List<PersistenceXmlDescriptorBuildItem> actualXmlDescriptors) {
+            List<PersistenceXmlDescriptorBuildItem> actualXmlDescriptors,
+            Capabilities capabilities) {
 
         //We won't generate an implied PU if there are explicitly configured PUs
         if (actualXmlDescriptors.isEmpty() == false) {
@@ -201,46 +262,56 @@ public ImpliedBlockingPersistenceUnitTypeBuildItem defineTypeOfImpliedPU(
             return ImpliedBlockingPersistenceUnitTypeBuildItem.none();
         }
 
-        //The default implied PU requires to bind to the default JDBC datasource, so check that we have one:
-        Optional<JdbcDataSourceBuildItem> defaultJdbcDataSourceBuildItem = jdbcDataSourcesBuildItem.stream()
-                .filter(i -> i.isDefault())
-                .findFirst();
-        if (defaultJdbcDataSourceBuildItem.isPresent()) {
-            return ImpliedBlockingPersistenceUnitTypeBuildItem
-                    .generateImpliedPersistenceUnit(defaultJdbcDataSourceBuildItem.get());
-        } else {
+        // If we have some blocking datasources defined, we can have an implied PU
+        if (jdbcDataSourcesBuildItem.size() == 0 && capabilities.isPresent(Capability.HIBERNATE_REACTIVE)) {
+            // if we don't have any blocking datasources and Hibernate Reactive is present,
+            // we don't want a blocking persistence unit
             return ImpliedBlockingPersistenceUnitTypeBuildItem.none();
+        } else {
+            // even if we don't have any JDBC datasource, we trigger the implied blocking persistence unit
+            // to properly trigger error conditions and error messages to guide the user
+            return ImpliedBlockingPersistenceUnitTypeBuildItem.generateImpliedPersistenceUnit();
         }
     }
 
     @BuildStep
     public void configurationDescriptorBuilding(
+            HibernateOrmConfig hibernateOrmConfig,
+            CombinedIndexBuildItem index,
             ImpliedBlockingPersistenceUnitTypeBuildItem impliedPU,
             List<PersistenceXmlDescriptorBuildItem> persistenceXmlDescriptors,
-            BuildProducer<NativeImageResourceBuildItem> resourceProducer,
+            List<JdbcDataSourceBuildItem> jdbcDataSources,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
             LaunchModeBuildItem launchMode,
-            JpaEntitiesBuildItem domainObjects,
+            JpaEntitiesBuildItem jpaEntities,
             List<NonJpaModelBuildItem> nonJpaModelBuildItems,
-            BuildProducer<SystemPropertyBuildItem> systemPropertyProducer,
-            BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorProducer) {
+            Capabilities capabilities,
+            BuildProducer<SystemPropertyBuildItem> systemProperties,
+            BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
+            BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
+            BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors) {
 
-        if (!hasEntities(domainObjects, nonJpaModelBuildItems)) {
+        if (!hasEntities(jpaEntities, nonJpaModelBuildItems)) {
             // we can bail out early as there are no entities
             return;
         }
 
         // First produce the PUs having a persistence.xml: these are not reactive, as we don't allow using a persistence.xml for them.
         for (PersistenceXmlDescriptorBuildItem persistenceXmlDescriptorBuildItem : persistenceXmlDescriptors) {
-            persistenceUnitDescriptorProducer
+            persistenceUnitDescriptors
                     .produce(new PersistenceUnitDescriptorBuildItem(persistenceXmlDescriptorBuildItem.getDescriptor(),
-                            getMultiTenancyStrategy(), false));
+                            DataSourceUtil.DEFAULT_DATASOURCE_NAME,
+                            getMultiTenancyStrategy(Optional.ofNullable(persistenceXmlDescriptorBuildItem.getDescriptor()
+                                    .getProperties().getProperty(AvailableSettings.MULTI_TENANT))),
+                            null,
+                            false,
+                            true));
         }
 
         if (impliedPU.shouldGenerateImpliedBlockingPersistenceUnit()) {
-            handleHibernateORMWithNoPersistenceXml(persistenceXmlDescriptors, resourceProducer, systemPropertyProducer,
-                    impliedPU.getDatasourceBuildTimeConfiguration(), applicationArchivesBuildItem, launchMode.getLaunchMode(),
-                    persistenceUnitDescriptorProducer);
+            handleHibernateORMWithNoPersistenceXml(hibernateOrmConfig, index, persistenceXmlDescriptors,
+                    jdbcDataSources, applicationArchivesBuildItem, launchMode.getLaunchMode(), jpaEntities, capabilities,
+                    systemProperties, nativeImageResources, hotDeploymentWatchedFiles, persistenceUnitDescriptors);
         }
     }
 
@@ -266,6 +337,7 @@ public void defineJpaEntities(
             List<IgnorableNonIndexedClasses> ignorableNonIndexedClassesBuildItems,
             List<NonJpaModelBuildItem> nonJpaModelBuildItems,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBean,
             List<PersistenceXmlDescriptorBuildItem> persistenceXmlDescriptors) throws Exception {
 
         Set<String> nonJpaModelClasses = nonJpaModelBuildItems.stream()
@@ -292,13 +364,18 @@ public ProxyDefinitionsBuildItem pregenProxies(
             JpaEntitiesBuildItem domainObjects,
             JpaModelIndexBuildItem indexBuildItem,
             List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
-            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer) {
-        Set<String> entitiesToGenerateProxiesFor = new HashSet<>(domainObjects.getEntityClassNames());
+            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
+            LiveReloadBuildItem liveReloadBuildItem) {
+        Set<String> managedClassAndPackageNames = new HashSet<>(domainObjects.getEntityClassNames());
         for (PersistenceUnitDescriptorBuildItem pud : persistenceUnitDescriptorBuildItems) {
-            pud.addListedEntityClassNamesTo(entitiesToGenerateProxiesFor);
+            // Note: getManagedClassNames() can also return *package* names
+            // See the source code of Hibernate ORM for proof:
+            // org.hibernate.boot.archive.scan.internal.ScanResultCollector.isListedOrDetectable
+            // is used for packages too, and it relies (indirectly) on getManagedClassNames().
+            managedClassAndPackageNames.addAll(pud.getManagedClassNames());
         }
-        PreGeneratedProxies proxyDefinitions = generatedProxies(entitiesToGenerateProxiesFor, indexBuildItem.getIndex(),
-                generatedClassBuildItemBuildProducer);
+        PreGeneratedProxies proxyDefinitions = generatedProxies(managedClassAndPackageNames,
+                indexBuildItem.getIndex(), generatedClassBuildItemBuildProducer, liveReloadBuildItem);
         return new ProxyDefinitionsBuildItem(proxyDefinitions);
     }
 
@@ -310,7 +387,7 @@ public void build(RecorderContext recorderContext, HibernateOrmRecorder recorder
             JpaEntitiesBuildItem domainObjects,
             List<NonJpaModelBuildItem> nonJpaModelBuildItems,
             List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
-            List<HibernateOrmIntegrationBuildItem> integrations, //Used to make sure ORM integrations are performed before this item
+            List<HibernateOrmIntegrationStaticConfiguredBuildItem> integrationBuildItems,
             ProxyDefinitionsBuildItem proxyDefinitions,
             BuildProducer<FeatureBuildItem> feature,
             BuildProducer<BeanContainerListenerBuildItem> beanContainerListener) throws Exception {
@@ -344,9 +421,14 @@ public void build(RecorderContext recorderContext, HibernateOrmRecorder recorder
             integratorClasses.add((Class<? extends Integrator>) recorderContext.classProxy(integratorClassName));
         }
 
+        Map<String, List<HibernateOrmIntegrationStaticDescriptor>> integrationStaticDescriptors = HibernateOrmIntegrationStaticConfiguredBuildItem
+                .collectDescriptors(integrationBuildItems);
+
         List<QuarkusPersistenceUnitDefinition> finalStagePUDescriptors = new ArrayList<>();
         for (PersistenceUnitDescriptorBuildItem pud : persistenceUnitDescriptorBuildItems) {
-            finalStagePUDescriptors.add(pud.asOutputPersistenceUnitDefinition());
+            finalStagePUDescriptors.add(
+                    pud.asOutputPersistenceUnitDefinition(integrationStaticDescriptors
+                            .getOrDefault(pud.getPersistenceUnitName(), Collections.emptyList())));
         }
 
         //Make it possible to record the QuarkusPersistenceUnitDefinition as bytecode:
@@ -360,93 +442,6 @@ public void build(RecorderContext recorderContext, HibernateOrmRecorder recorder
                                 proxyDefinitions.getProxies())));
     }
 
-    /**
-     * Set up the scanner, as this scanning has already been done we need to just tell it about the classes we
-     * have discovered. This scanner is bytecode serializable and is passed directly into the recorder
-     * 
-     * @param domainObjects the previously discovered domain objects
-     * @return a new QuarkusScanner with all domainObjects registered
-     */
-    public static QuarkusScanner buildQuarkusScanner(JpaEntitiesBuildItem domainObjects) {
-        QuarkusScanner scanner = new QuarkusScanner();
-        Set<ClassDescriptor> classDescriptors = new HashSet<>();
-        for (String i : domainObjects.getAllModelClassNames()) {
-            QuarkusScanner.ClassDescriptorImpl desc = new QuarkusScanner.ClassDescriptorImpl(i,
-                    ClassDescriptor.Categorization.MODEL);
-            classDescriptors.add(desc);
-        }
-        scanner.setClassDescriptors(classDescriptors);
-        return scanner;
-    }
-
-    private MultiTenancyStrategy getMultiTenancyStrategy() {
-        final MultiTenancyStrategy multiTenancyStrategy = MultiTenancyStrategy
-                .valueOf(hibernateConfig.multitenant.orElse(MultiTenancyStrategy.NONE.name()));
-        if (multiTenancyStrategy == MultiTenancyStrategy.DISCRIMINATOR) {
-            // See https://hibernate.atlassian.net/browse/HHH-6054
-            throw new ConfigurationError("The Hibernate ORM multi tenancy strategy "
-                    + MultiTenancyStrategy.DISCRIMINATOR + " is currently not supported");
-        }
-        return multiTenancyStrategy;
-    }
-
-    private PreGeneratedProxies generatedProxies(Set<String> entityClassNames, IndexView combinedIndex,
-            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer) {
-        //create a map of entity to proxy type
-        PreGeneratedProxies preGeneratedProxies = new PreGeneratedProxies();
-        Map<String, String> proxyAnnotations = new HashMap<>();
-        for (AnnotationInstance i : combinedIndex.getAnnotations(DotName.createSimple(Proxy.class.getName()))) {
-            AnnotationValue proxyClass = i.value("proxyClass");
-            if (proxyClass == null) {
-                continue;
-            }
-            proxyAnnotations.put(i.target().asClass().name().toString(), proxyClass.asClass().name().toString());
-        }
-        try (ProxyBuildingHelper proxyHelper = new ProxyBuildingHelper(Thread.currentThread().getContextClassLoader())) {
-            for (String entity : entityClassNames) {
-                Set<Class<?>> proxyInterfaces = new HashSet<>();
-                proxyInterfaces.add(HibernateProxy.class); //always added
-                Class<?> mappedClass = proxyHelper.uninitializedClass(entity);
-                String proxy = proxyAnnotations.get(entity);
-                if (proxy != null) {
-                    proxyInterfaces.add(proxyHelper.uninitializedClass(proxy));
-                } else if (!proxyHelper.isProxiable(mappedClass)) {
-                    //if there is no @Proxy we need to make sure the actual class is proxiable
-                    continue;
-                }
-                for (ClassInfo subclass : combinedIndex.getAllKnownSubclasses(DotName.createSimple(entity))) {
-                    String subclassName = subclass.name().toString();
-                    if (!entityClassNames.contains(subclassName)) {
-                        //not an entity
-                        continue;
-                    }
-                    proxy = proxyAnnotations.get(subclassName);
-                    if (proxy != null) {
-                        proxyInterfaces.add(proxyHelper.uninitializedClass(proxy));
-                    }
-                }
-                DynamicType.Unloaded<?> proxyDef = proxyHelper.buildUnloadedProxy(mappedClass,
-                        toArray(proxyInterfaces));
-
-                for (Entry<TypeDescription, byte[]> i : proxyDef.getAllTypes().entrySet()) {
-                    generatedClassBuildItemBuildProducer
-                            .produce(new GeneratedClassBuildItem(true, i.getKey().getName(), i.getValue()));
-                }
-                preGeneratedProxies.getProxies().put(entity,
-                        new PreGeneratedProxies.ProxyClassDetailsHolder(proxyDef.getTypeDescription().getName(),
-                                proxyInterfaces.stream().map(Class::getName).collect(Collectors.toSet())));
-            }
-        }
-        return preGeneratedProxies;
-    }
-
-    private static Class[] toArray(final Set<Class<?>> interfaces) {
-        if (interfaces == null) {
-            return ArrayHelper.EMPTY_CLASS_ARRAY;
-        }
-        return interfaces.toArray(new Class[interfaces.size()]);
-    }
-
     @BuildStep
     void handleNativeImageImportSql(BuildProducer<NativeImageResourceBuildItem> resources,
             List<PersistenceUnitDescriptorBuildItem> descriptors,
@@ -460,30 +455,15 @@ void handleNativeImageImportSql(BuildProducer<NativeImageResourceBuildItem> reso
             String resourceName = i.getExplicitSqlImportScriptResourceName();
             if (resourceName != null) {
                 resources.produce(new NativeImageResourceBuildItem(resourceName));
-            } else {
-                getSqlLoadScript(launchMode.getLaunchMode()).ifPresent(script -> {
-                    resources.produce(new NativeImageResourceBuildItem(script));
-                });
             }
         }
     }
 
     @BuildStep
-    void setupResourceInjection(BuildProducer<ResourceAnnotationBuildItem> resourceAnnotations,
-            BuildProducer<GeneratedResourceBuildItem> resources,
-            JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBuildItem> nonJpaModels) {
-        if (!hasEntities(jpaEntities, nonJpaModels)) {
-            return;
-        }
-
-        resources.produce(new GeneratedResourceBuildItem("META-INF/services/io.quarkus.arc.ResourceReferenceProvider",
-                JPAResourceReferenceProvider.class.getName().getBytes(StandardCharsets.UTF_8)));
-        resourceAnnotations.produce(new ResourceAnnotationBuildItem(PERSISTENCE_CONTEXT));
-        resourceAnnotations.produce(new ResourceAnnotationBuildItem(PERSISTENCE_UNIT));
-    }
-
-    @BuildStep
-    void registerBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans, Capabilities capabilities,
+    void registerBeans(HibernateOrmConfig hibernateOrmConfig,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
+            Capabilities capabilities,
             CombinedIndexBuildItem combinedIndex,
             List<PersistenceUnitDescriptorBuildItem> descriptors,
             JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBuildItem> nonJpaModels) {
@@ -495,27 +475,17 @@ void registerBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans, Capab
         unremovableClasses.add(JPAConfig.class);
         if (capabilities.isPresent(Capability.TRANSACTIONS)) {
             unremovableClasses.add(TransactionManager.class);
-            unremovableClasses.add(TransactionEntityManagers.class);
-        }
-        unremovableClasses.add(RequestScopedEntityManagerHolder.class);
-        if (getMultiTenancyStrategy() != MultiTenancyStrategy.NONE) {
-            unremovableClasses.add(DataSourceTenantConnectionResolver.class);
+            unremovableClasses.add(TransactionSessions.class);
         }
+        unremovableClasses.add(RequestScopedSessionHolder.class);
+        unremovableClasses.add(QuarkusArcBeanContainer.class);
 
         additionalBeans.produce(AdditionalBeanBuildItem.builder().setUnremovable()
                 .addBeanClasses(unremovableClasses.toArray(new Class<?>[unremovableClasses.size()]))
                 .build());
 
-        if (descriptors.size() == 1) {
-            // There is only one persistence unit - register CDI beans for EM and EMF if no
-            // producers are defined
-            if (isUserDefinedProducerMissing(combinedIndex.getIndex(), PERSISTENCE_UNIT)) {
-                additionalBeans.produce(new AdditionalBeanBuildItem(DefaultEntityManagerFactoryProducer.class));
-            }
-            if (isUserDefinedProducerMissing(combinedIndex.getIndex(), PERSISTENCE_CONTEXT)) {
-                additionalBeans.produce(new AdditionalBeanBuildItem(DefaultEntityManagerProducer.class));
-            }
-        }
+        // Some user-injectable beans are retrieved programmatically and shouldn't be removed
+        unremovableBeans.produce(UnremovableBeanBuildItem.beanTypes(AttributeConverter.class));
     }
 
     @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class)
@@ -530,50 +500,146 @@ public HibernateEnhancersRegisteredBuildItem enhancerDomainObjects(JpaEntitiesBu
         return new HibernateEnhancersRegisteredBuildItem();
     }
 
+    @BuildStep
+    public HibernateModelClassCandidatesForFieldAccessBuildItem candidatesForFieldAccess(JpaEntitiesBuildItem domainObjects) {
+        // Ask Panache to replace direct access to public fields with calls to accessors for all model classes.
+        return new HibernateModelClassCandidatesForFieldAccessBuildItem(domainObjects.getAllModelClassNames());
+    }
+
     @BuildStep
     @Record(STATIC_INIT)
-    public void build(HibernateOrmRecorder recorder,
-            Capabilities capabilities, BuildProducer<BeanContainerListenerBuildItem> buildProducer,
+    public void build(HibernateOrmRecorder recorder, HibernateOrmConfig hibernateOrmConfig,
+            BuildProducer<JpaModelPersistenceUnitMappingBuildItem> jpaModelPersistenceUnitMapping,
+            BuildProducer<BeanContainerListenerBuildItem> buildProducer,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             List<PersistenceUnitDescriptorBuildItem> descriptors,
             JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBuildItem> nonJpaModels) throws Exception {
         if (!hasEntities(jpaEntities, nonJpaModels)) {
             return;
         }
-        MultiTenancyStrategy strategy = MultiTenancyStrategy
-                .valueOf(hibernateConfig.multitenant.orElse(MultiTenancyStrategy.NONE.name()));
-        buildProducer.produce(new BeanContainerListenerBuildItem(
-                recorder.initializeJpa(capabilities.isPresent(Capability.TRANSACTIONS), strategy,
-                        hibernateConfig.multitenantSchemaDatasource.orElse(null))));
 
-        // Bootstrap all persistence units
-        for (PersistenceUnitDescriptorBuildItem persistenceUnitDescriptor : descriptors) {
-            buildProducer.produce(new BeanContainerListenerBuildItem(
-                    recorder.registerPersistenceUnit(persistenceUnitDescriptor.getPersistenceUnitName())));
+        Set<String> persistenceUnitNames = new HashSet<>();
+
+        Map<String, Set<String>> entityPersistenceUnitMapping = new HashMap<>();
+        for (PersistenceUnitDescriptorBuildItem descriptor : descriptors) {
+            persistenceUnitNames.add(descriptor.getPersistenceUnitName());
+
+            for (String entityClass : descriptor.getManagedClassNames()) {
+                entityPersistenceUnitMapping.putIfAbsent(entityClass, new HashSet<>());
+                entityPersistenceUnitMapping.get(entityClass).add(descriptor.getPersistenceUnitName());
+            }
         }
-        buildProducer.produce(new BeanContainerListenerBuildItem(recorder.initDefaultPersistenceUnit()));
+
+        jpaModelPersistenceUnitMapping.produce(new JpaModelPersistenceUnitMappingBuildItem(entityPersistenceUnitMapping));
+
+        syntheticBeans.produce(SyntheticBeanBuildItem.configure(JPAConfigSupport.class)
+                .scope(Singleton.class)
+                .unremovable()
+                .supplier(recorder.jpaConfigSupportSupplier(
+                        new JPAConfigSupport(persistenceUnitNames, entityPersistenceUnitMapping)))
+                .done());
     }
 
     @BuildStep
     @Record(RUNTIME_INIT)
-    public void startPersistenceUnits(HibernateOrmRecorder recorder, BeanContainerBuildItem beanContainer,
+    public PersistenceProviderSetUpBuildItem setupPersistenceProvider(HibernateOrmRecorder recorder,
+            Capabilities capabilities, HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            List<HibernateOrmIntegrationRuntimeConfiguredBuildItem> integrationBuildItems) {
+        if (capabilities.isMissing(Capability.HIBERNATE_REACTIVE)) {
+            recorder.setupPersistenceProvider(hibernateOrmRuntimeConfig,
+                    HibernateOrmIntegrationRuntimeConfiguredBuildItem.collectDescriptors(integrationBuildItems));
+        }
+
+        return new PersistenceProviderSetUpBuildItem();
+    }
+
+    @BuildStep
+    @Record(RUNTIME_INIT)
+    public ServiceStartBuildItem startPersistenceUnits(HibernateOrmRecorder recorder, BeanContainerBuildItem beanContainer,
             List<JdbcDataSourceBuildItem> dataSourcesConfigured,
             JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBuildItem> nonJpaModels,
-            List<HibernateOrmIntegrationRuntimeConfiguredBuildItem> integrationsRuntimeConfigured,
-            List<JdbcDataSourceSchemaReadyBuildItem> schemaReadyBuildItem) throws Exception {
-        if (!hasEntities(jpaEntities, nonJpaModels)) {
-            return;
+            List<JdbcDataSourceSchemaReadyBuildItem> schemaReadyBuildItem,
+            List<PersistenceProviderSetUpBuildItem> persistenceProviderSetUp) throws Exception {
+        if (hasEntities(jpaEntities, nonJpaModels)) {
+            recorder.startAllPersistenceUnits(beanContainer.getValue());
         }
 
-        recorder.startAllPersistenceUnits(beanContainer.getValue());
+        return new ServiceStartBuildItem("Hibernate ORM");
+
     }
 
-    private Optional<String> getSqlLoadScript(LaunchMode launchMode) {
+    @BuildStep
+    @Record(RUNTIME_INIT)
+    public void multitenancy(HibernateOrmRecorder recorder,
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
+        boolean multitenancyEnabled = false;
+
+        for (PersistenceUnitDescriptorBuildItem persistenceUnitDescriptor : persistenceUnitDescriptors) {
+            if (persistenceUnitDescriptor.getMultiTenancyStrategy() == MultiTenancyStrategy.NONE) {
+                continue;
+            }
+
+            multitenancyEnabled = true;
+
+            ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem.configure(DataSourceTenantConnectionResolver.class)
+                    .scope(ApplicationScoped.class)
+                    .types(TenantConnectionResolver.class)
+                    .setRuntimeInit()
+                    .defaultBean()
+                    .unremovable()
+                    .supplier(recorder.dataSourceTenantConnectionResolver(persistenceUnitDescriptor.getPersistenceUnitName(),
+                            persistenceUnitDescriptor.getDataSource(), persistenceUnitDescriptor.getMultiTenancyStrategy(),
+                            persistenceUnitDescriptor.getMultiTenancySchemaDataSource()));
+
+            if (PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitDescriptor.getPersistenceUnitName())) {
+                configurator.addQualifier(Default.class);
+            } else {
+                configurator.addQualifier().annotation(DotNames.NAMED)
+                        .addValue("value", persistenceUnitDescriptor.getPersistenceUnitName()).done();
+                configurator.addQualifier().annotation(PersistenceUnit.class)
+                        .addValue("value", persistenceUnitDescriptor.getPersistenceUnitName()).done();
+            }
+
+            syntheticBeans.produce(configurator.done());
+        }
+
+        if (multitenancyEnabled) {
+            unremovableBeans.produce(new UnremovableBeanBuildItem(new BeanTypeExclusion(TENANT_CONNECTION_RESOLVER)));
+            unremovableBeans.produce(new UnremovableBeanBuildItem(new BeanTypeExclusion(TENANT_RESOLVER)));
+        }
+    }
+
+    @BuildStep
+    public void produceLoggingCategories(HibernateOrmConfig hibernateOrmConfig,
+            BuildProducer<LogCategoryBuildItem> categories) {
+        if (hibernateOrmConfig.log.bindParam || hibernateOrmConfig.log.bindParameters) {
+            categories.produce(new LogCategoryBuildItem("org.hibernate.type.descriptor.sql.BasicBinder", Level.TRACE));
+        }
+    }
+
+    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
+    public void registerStaticMetamodelClassesForReflection(CombinedIndexBuildItem index,
+            BuildProducer<ReflectiveClassBuildItem> reflective) {
+        Collection<AnnotationInstance> annotationInstances = index.getIndex().getAnnotations(STATIC_METAMODEL);
+        if (!annotationInstances.isEmpty()) {
+
+            String[] metamodel = annotationInstances.stream()
+                    .map(a -> a.target().asClass().name().toString())
+                    .toArray(String[]::new);
+
+            reflective.produce(new ReflectiveClassBuildItem(false, false, true, metamodel));
+        }
+    }
+
+    private static Optional<String> getSqlLoadScript(Optional<String> sqlLoadScript, LaunchMode launchMode) {
         // Explicit file or default Hibernate ORM file.
-        if (hibernateConfig.sqlLoadScript.isPresent()) {
-            if (NO_SQL_LOAD_SCRIPT_FILE.equalsIgnoreCase(hibernateConfig.sqlLoadScript.get())) {
+        if (sqlLoadScript.isPresent()) {
+            if (NO_SQL_LOAD_SCRIPT_FILE.equalsIgnoreCase(sqlLoadScript.get())) {
                 return Optional.empty();
             } else {
-                return Optional.of(hibernateConfig.sqlLoadScript.get());
+                return Optional.of(sqlLoadScript.get());
             }
         } else if (launchMode == LaunchMode.NORMAL) {
             return Optional.empty();
@@ -586,200 +652,290 @@ private boolean hasEntities(JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBu
         return !jpaEntities.getEntityClassNames().isEmpty() || !nonJpaModels.isEmpty();
     }
 
-    private boolean isUserDefinedProducerMissing(IndexView index, DotName annotationName) {
-        for (AnnotationInstance annotationInstance : index.getAnnotations(annotationName)) {
-            if (annotationInstance.target().kind() == AnnotationTarget.Kind.METHOD) {
-                if (annotationInstance.target().asMethod().hasAnnotation(PRODUCES)) {
-                    return false;
-                }
-            } else if (annotationInstance.target().kind() == AnnotationTarget.Kind.FIELD) {
-                for (AnnotationInstance i : annotationInstance.target().asField().annotations()) {
-                    if (i.name().equals(PRODUCES)) {
-                        return false;
-                    }
-                }
+    private void handleHibernateORMWithNoPersistenceXml(
+            HibernateOrmConfig hibernateOrmConfig,
+            CombinedIndexBuildItem index,
+            List<PersistenceXmlDescriptorBuildItem> descriptors,
+            List<JdbcDataSourceBuildItem> jdbcDataSources,
+            ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            LaunchMode launchMode,
+            JpaEntitiesBuildItem jpaEntities,
+            Capabilities capabilities,
+            BuildProducer<SystemPropertyBuildItem> systemProperties,
+            BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
+            BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
+            BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors) {
+        if (!descriptors.isEmpty()) {
+            if (hibernateOrmConfig.isAnyPropertySet() || !hibernateOrmConfig.persistenceUnits.isEmpty()) {
+                throw new ConfigurationError(
+                        "Hibernate ORM configuration present in persistence.xml and Quarkus config file at the same time\n"
+                                + "If you use persistence.xml remove all " + HIBERNATE_ORM_CONFIG_PREFIX
+                                + "* properties from the Quarkus config file.");
+            } else {
+                return;
             }
         }
-        return true;
+
+        Optional<JdbcDataSourceBuildItem> defaultJdbcDataSource = jdbcDataSources.stream()
+                .filter(i -> i.isDefault())
+                .findFirst();
+        boolean enableDefaultPersistenceUnit = (defaultJdbcDataSource.isPresent()
+                && hibernateOrmConfig.persistenceUnits.isEmpty())
+                || hibernateOrmConfig.defaultPersistenceUnit.isAnyPropertySet();
+
+        Map<String, Set<String>> modelClassesAndPackagesPerPersistencesUnits = getModelClassesAndPackagesPerPersistenceUnits(
+                hibernateOrmConfig, jpaEntities, index.getIndex(), enableDefaultPersistenceUnit);
+        Set<String> modelClassesAndPackagesForDefaultPersistenceUnit = modelClassesAndPackagesPerPersistencesUnits
+                .getOrDefault(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, Collections.emptySet());
+
+        Set<String> storageEngineCollector = new HashSet<>();
+
+        if (enableDefaultPersistenceUnit) {
+            producePersistenceUnitDescriptorFromConfig(
+                    hibernateOrmConfig, PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME,
+                    hibernateOrmConfig.defaultPersistenceUnit,
+                    modelClassesAndPackagesForDefaultPersistenceUnit,
+                    jdbcDataSources, applicationArchivesBuildItem, launchMode, capabilities,
+                    systemProperties, nativeImageResources, hotDeploymentWatchedFiles, persistenceUnitDescriptors,
+                    storageEngineCollector);
+        } else if (!modelClassesAndPackagesForDefaultPersistenceUnit.isEmpty()
+                && (!hibernateOrmConfig.defaultPersistenceUnit.datasource.isPresent()
+                        || DataSourceUtil.isDefault(hibernateOrmConfig.defaultPersistenceUnit.datasource.get()))
+                && !defaultJdbcDataSource.isPresent()) {
+            throw new ConfigurationException(
+                    "Model classes are defined for the default persistence unit, but no default datasource was found."
+                            + " The default EntityManagerFactory will not be created."
+                            + " To solve this, configure the default datasource."
+                            + " Refer to https://quarkus.io/guides/datasource for guidance.");
+        }
+
+        for (Entry<String, HibernateOrmConfigPersistenceUnit> persistenceUnitEntry : hibernateOrmConfig.persistenceUnits
+                .entrySet()) {
+            producePersistenceUnitDescriptorFromConfig(
+                    hibernateOrmConfig, persistenceUnitEntry.getKey(), persistenceUnitEntry.getValue(),
+                    modelClassesAndPackagesPerPersistencesUnits.getOrDefault(persistenceUnitEntry.getKey(),
+                            Collections.emptySet()),
+                    jdbcDataSources, applicationArchivesBuildItem, launchMode, capabilities,
+                    systemProperties, nativeImageResources, hotDeploymentWatchedFiles, persistenceUnitDescriptors,
+                    storageEngineCollector);
+        }
+
+        if (storageEngineCollector.size() > 1) {
+            throw new ConfigurationException(
+                    "The dialect storage engine is a global configuration property: it must be consistent across all persistence units.");
+        }
     }
 
-    private void handleHibernateORMWithNoPersistenceXml(
-            List<PersistenceXmlDescriptorBuildItem> descriptors,
-            BuildProducer<NativeImageResourceBuildItem> resourceProducer,
-            BuildProducer<SystemPropertyBuildItem> systemProperty,
-            JdbcDataSourceBuildItem driverBuildItem,
+    private static void producePersistenceUnitDescriptorFromConfig(
+            HibernateOrmConfig hibernateOrmConfig,
+            String persistenceUnitName,
+            HibernateOrmConfigPersistenceUnit persistenceUnitConfig,
+            Set<String> modelClassesAndPackages,
+            List<JdbcDataSourceBuildItem> jdbcDataSources,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
-            LaunchMode launchMode, BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorProducer) {
-        if (descriptors.isEmpty()) {
-            //we have no persistence.xml so we will create a default one
-            Optional<String> dialect = hibernateConfig.dialect;
-            if (!dialect.isPresent()) {
-                dialect = guessDialect(driverBuildItem.getDbKind());
+            LaunchMode launchMode,
+            Capabilities capabilities,
+            BuildProducer<SystemPropertyBuildItem> systemProperties,
+            BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
+            BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
+            BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
+            Set<String> storageEngineCollector) {
+        // Find the associated datasource
+        JdbcDataSourceBuildItem jdbcDataSource;
+        String dataSource;
+        if (persistenceUnitConfig.datasource.isPresent()) {
+            jdbcDataSource = jdbcDataSources.stream()
+                    .filter(i -> persistenceUnitConfig.datasource.get().equals(i.getName()))
+                    .findFirst()
+                    .orElseThrow(() -> new ConfigurationException(
+                            String.format(Locale.ROOT,
+                                    "The datasource '%1$s' is not configured but the persistence unit '%2$s' uses it."
+                                            + " To solve this, configure datasource '%1$s'."
+                                            + " Refer to https://quarkus.io/guides/datasource for guidance.",
+                                    persistenceUnitConfig.datasource.get(), persistenceUnitName)));
+            dataSource = persistenceUnitConfig.datasource.get();
+        } else {
+            if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
+                // if it's not the default persistence unit, we mandate a datasource to prevent common errors
+                throw new ConfigurationException(
+                        String.format(Locale.ROOT, "Datasource must be defined for persistence unit '%s'.",
+                                persistenceUnitName));
             }
-            dialect.ifPresent(s -> {
-                // we found one
-                ParsedPersistenceXmlDescriptor desc = new ParsedPersistenceXmlDescriptor(null); //todo URL
-                desc.setName("default");
-                desc.setTransactionType(PersistenceUnitTransactionType.JTA);
-                desc.getProperties().setProperty(AvailableSettings.DIALECT, s);
-
-                // The storage engine has to be set as a system property.
-                if (hibernateConfig.dialectStorageEngine.isPresent()) {
-                    systemProperty.produce(new SystemPropertyBuildItem(AvailableSettings.STORAGE_ENGINE,
-                            hibernateConfig.dialectStorageEngine.get()));
-                }
-                // Physical Naming Strategy
-                hibernateConfig.physicalNamingStrategy.ifPresent(
-                        namingStrategy -> desc.getProperties()
-                                .setProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY, namingStrategy));
-
-                // Implicit Naming Strategy
-                hibernateConfig.implicitNamingStrategy.ifPresent(
-                        namingStrategy -> desc.getProperties()
-                                .setProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY, namingStrategy));
-
-                // Database
-                desc.getProperties().setProperty(AvailableSettings.HBM2DDL_DATABASE_ACTION,
-                        hibernateConfig.database.generation);
-
-                if (hibernateConfig.database.generationHaltOnError) {
-                    desc.getProperties().setProperty(AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true");
-                }
 
-                //charset
-                desc.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
-                        hibernateConfig.database.charset.name());
+            jdbcDataSource = jdbcDataSources.stream()
+                    .filter(i -> i.isDefault())
+                    .findFirst()
+                    .orElseThrow(() -> new ConfigurationException(
+                            String.format(Locale.ROOT,
+                                    "The default datasource is not configured but the persistence unit '%s' uses it."
+                                            + " To solve this, configure the default datasource."
+                                            + " Refer to https://quarkus.io/guides/datasource for guidance.",
+                                    persistenceUnitName)));
+            dataSource = DataSourceUtil.DEFAULT_DATASOURCE_NAME;
+        }
 
-                hibernateConfig.database.defaultCatalog.ifPresent(
-                        catalog -> desc.getProperties().setProperty(AvailableSettings.DEFAULT_CATALOG, catalog));
+        Optional<String> dialect = persistenceUnitConfig.dialect.dialect;
+        if (!dialect.isPresent()) {
+            dialect = guessDialect(jdbcDataSource.getDbKind());
+        }
 
-                hibernateConfig.database.defaultSchema.ifPresent(
-                        schema -> desc.getProperties().setProperty(AvailableSettings.DEFAULT_SCHEMA, schema));
+        if (!dialect.isPresent()) {
+            return;
+        }
 
-                if (hibernateConfig.database.globallyQuotedIdentifiers) {
-                    desc.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
-                }
+        // we found one
+        ParsedPersistenceXmlDescriptor descriptor = new ParsedPersistenceXmlDescriptor(null); //todo URL
+        descriptor.setName(persistenceUnitName);
 
-                // Query
-                if (hibernateConfig.batchFetchSize > 0) {
-                    desc.getProperties().setProperty(AvailableSettings.DEFAULT_BATCH_FETCH_SIZE,
-                            Integer.toString(hibernateConfig.batchFetchSize));
-                    desc.getProperties().setProperty(AvailableSettings.BATCH_FETCH_STYLE, BatchFetchStyle.PADDED.toString());
-                }
+        descriptor.setExcludeUnlistedClasses(true);
+        if (modelClassesAndPackages.isEmpty()) {
+            LOG.warnf("Could not find any entities affected to the persistence unit '%s'.", persistenceUnitName);
+        } else {
+            // That's right, we're pushing both class names and package names
+            // to a method called "addClasses".
+            // It's a misnomer: while the method populates the set that backs getManagedClasses(),
+            // that method is also poorly named because it can actually return both class names
+            // and package names.
+            // See for proof:
+            // - how org.hibernate.boot.archive.scan.internal.ScanResultCollector.isListedOrDetectable
+            //   is used for packages too, even though it relies (indirectly) on getManagedClassNames().
+            // - the comment at org/hibernate/boot/model/process/internal/ScanningCoordinator.java:246:
+            //   "IMPL NOTE : "explicitlyListedClassNames" can contain class or package names..."
+            descriptor.addClasses(new ArrayList<>(modelClassesAndPackages));
+        }
 
-                hibernateConfig.query.queryPlanCacheMaxSize.ifPresent(
-                        maxSize -> desc.getProperties().setProperty(AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE, maxSize));
+        descriptor.setTransactionType(PersistenceUnitTransactionType.JTA);
+        descriptor.getProperties().setProperty(AvailableSettings.DIALECT, dialect.get());
 
-                hibernateConfig.query.defaultNullOrdering.ifPresent(
-                        defaultNullOrdering -> desc.getProperties().setProperty(AvailableSettings.DEFAULT_NULL_ORDERING,
-                                defaultNullOrdering));
+        // The storage engine has to be set as a system property.
+        if (persistenceUnitConfig.dialect.storageEngine.isPresent()) {
+            systemProperties.produce(new SystemPropertyBuildItem(AvailableSettings.STORAGE_ENGINE,
+                    persistenceUnitConfig.dialect.storageEngine.get()));
+        }
+        // Physical Naming Strategy
+        persistenceUnitConfig.physicalNamingStrategy.ifPresent(
+                namingStrategy -> descriptor.getProperties()
+                        .setProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY, namingStrategy));
 
-                // JDBC
-                hibernateConfig.jdbc.timezone.ifPresent(
-                        timezone -> desc.getProperties().setProperty(AvailableSettings.JDBC_TIME_ZONE, timezone));
+        // Implicit Naming Strategy
+        persistenceUnitConfig.implicitNamingStrategy.ifPresent(
+                namingStrategy -> descriptor.getProperties()
+                        .setProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY, namingStrategy));
 
-                hibernateConfig.jdbc.statementFetchSize.ifPresent(
-                        fetchSize -> desc.getProperties().setProperty(AvailableSettings.STATEMENT_FETCH_SIZE,
-                                String.valueOf(fetchSize)));
+        //charset
+        descriptor.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
+                persistenceUnitConfig.database.charset.name());
 
-                hibernateConfig.jdbc.statementBatchSize.ifPresent(
-                        fetchSize -> desc.getProperties().setProperty(AvailableSettings.STATEMENT_BATCH_SIZE,
-                                String.valueOf(fetchSize)));
+        persistenceUnitConfig.database.defaultCatalog.ifPresent(
+                catalog -> descriptor.getProperties().setProperty(AvailableSettings.DEFAULT_CATALOG, catalog));
 
-                // Logging
-                if (hibernateConfig.log.sql) {
-                    desc.getProperties().setProperty(AvailableSettings.SHOW_SQL, "true");
-                    desc.getProperties().setProperty(AvailableSettings.FORMAT_SQL, "true");
-                }
+        persistenceUnitConfig.database.defaultSchema.ifPresent(
+                schema -> descriptor.getProperties().setProperty(AvailableSettings.DEFAULT_SCHEMA, schema));
 
-                if (hibernateConfig.log.jdbcWarnings.isPresent()) {
-                    desc.getProperties().setProperty(AvailableSettings.LOG_JDBC_WARNINGS,
-                            hibernateConfig.log.jdbcWarnings.get().toString());
-                }
+        if (persistenceUnitConfig.database.globallyQuotedIdentifiers) {
+            descriptor.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
+        }
 
-                // Statistics
-                if (hibernateConfig.metricsEnabled
-                        || (hibernateConfig.statistics.isPresent() && hibernateConfig.statistics.get())) {
-                    desc.getProperties().setProperty(AvailableSettings.GENERATE_STATISTICS, "true");
-                }
+        // Query
+        if (persistenceUnitConfig.fetch.batchSize > 0) {
+            setBatchFetchSize(descriptor, persistenceUnitConfig.fetch.batchSize);
+        } else if (persistenceUnitConfig.batchFetchSize > 0) {
+            setBatchFetchSize(descriptor, persistenceUnitConfig.batchFetchSize);
+        }
 
-                // sql-load-script
-                Optional<String> importFile = getSqlLoadScript(launchMode);
+        if (persistenceUnitConfig.fetch.maxDepth.isPresent()) {
+            setMaxFetchDepth(descriptor, persistenceUnitConfig.fetch.maxDepth);
+        } else if (persistenceUnitConfig.maxFetchDepth.isPresent()) {
+            setMaxFetchDepth(descriptor, persistenceUnitConfig.maxFetchDepth);
+        }
 
-                if (!importFile.isPresent()) {
-                    // explicitly set a no file and ignore all other operations
-                    desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, NO_SQL_LOAD_SCRIPT_FILE);
-                } else {
-                    Path loadScriptPath = applicationArchivesBuildItem.getRootArchive().getChildPath(importFile.get());
-
-                    if (loadScriptPath != null && !Files.isDirectory(loadScriptPath)) {
-                        // enlist resource if present
-                        resourceProducer.produce(new NativeImageResourceBuildItem(importFile.get()));
-                        desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, importFile.get());
-                        desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR,
-                                MultipleLinesSqlCommandExtractor.class.getName());
-
-                    } else if (hibernateConfig.sqlLoadScript.isPresent()) {
-                        //raise exception if explicit file is not present (i.e. not the default)
-                        throw new ConfigurationError(
-                                "Unable to find file referenced in '" + HIBERNATE_ORM_CONFIG_PREFIX + "sql-load-script="
-                                        + hibernateConfig.sqlLoadScript.get() + "'. Remove property or add file to your path.");
-                    }
-                }
+        descriptor.getProperties().setProperty(AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE, Integer.toString(
+                persistenceUnitConfig.query.queryPlanCacheMaxSize));
 
-                // Caching
-                if (hibernateConfig.secondLevelCachingEnabled) {
-                    Properties p = desc.getProperties();
-                    //Only set these if the user isn't making an explicit choice:
-                    p.putIfAbsent(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.TRUE);
-                    p.putIfAbsent(USE_SECOND_LEVEL_CACHE, Boolean.TRUE);
-                    p.putIfAbsent(USE_QUERY_CACHE, Boolean.TRUE);
-                    p.putIfAbsent(JPA_SHARED_CACHE_MODE, SharedCacheMode.ENABLE_SELECTIVE);
-                    Map<String, String> cacheConfigEntries = HibernateConfigUtil.getCacheConfigEntries(hibernateConfig);
-                    for (Entry<String, String> entry : cacheConfigEntries.entrySet()) {
-                        desc.getProperties().setProperty(entry.getKey(), entry.getValue());
-                    }
-                } else {
-                    //Unless the global switch is explicitly set to off, in which case we disable all caching:
-                    Properties p = desc.getProperties();
-                    p.put(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.FALSE);
-                    p.put(USE_SECOND_LEVEL_CACHE, Boolean.FALSE);
-                    p.put(USE_QUERY_CACHE, Boolean.FALSE);
-                    p.put(JPA_SHARED_CACHE_MODE, SharedCacheMode.NONE);
-                }
+        descriptor.getProperties().setProperty(AvailableSettings.DEFAULT_NULL_ORDERING,
+                persistenceUnitConfig.query.defaultNullOrdering.name().toLowerCase(Locale.ROOT));
 
-                persistenceUnitDescriptorProducer
-                        .produce(new PersistenceUnitDescriptorBuildItem(desc, getMultiTenancyStrategy(), false));
-            });
-        } else {
-            if (hibernateConfig.isAnyPropertySet()) {
+        // JDBC
+        persistenceUnitConfig.jdbc.timezone.ifPresent(
+                timezone -> descriptor.getProperties().setProperty(AvailableSettings.JDBC_TIME_ZONE, timezone));
+
+        persistenceUnitConfig.jdbc.statementFetchSize.ifPresent(
+                fetchSize -> descriptor.getProperties().setProperty(AvailableSettings.STATEMENT_FETCH_SIZE,
+                        String.valueOf(fetchSize)));
+
+        persistenceUnitConfig.jdbc.statementBatchSize.ifPresent(
+                fetchSize -> descriptor.getProperties().setProperty(AvailableSettings.STATEMENT_BATCH_SIZE,
+                        String.valueOf(fetchSize)));
+
+        // Statistics
+        if (hibernateOrmConfig.metricsEnabled
+                || (hibernateOrmConfig.statistics.isPresent() && hibernateOrmConfig.statistics.get())) {
+            descriptor.getProperties().setProperty(AvailableSettings.GENERATE_STATISTICS, "true");
+        }
+
+        // sql-load-script
+        Optional<String> importFile = getSqlLoadScript(persistenceUnitConfig.sqlLoadScript, launchMode);
+
+        if (importFile.isPresent()) {
+            Path loadScriptPath = applicationArchivesBuildItem.getRootArchive().getChildPath(importFile.get());
+
+            if (loadScriptPath != null && !Files.isDirectory(loadScriptPath)) {
+                // enlist resource if present
+                nativeImageResources.produce(new NativeImageResourceBuildItem(importFile.get()));
+                descriptor.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, importFile.get());
+            } else if (persistenceUnitConfig.sqlLoadScript.isPresent()) {
+                //raise exception if explicit file is not present (i.e. not the default)
                 throw new ConfigurationError(
-                        "Hibernate ORM configuration present in persistence.xml and Quarkus config file at the same time\n"
-                                + "If you use persistence.xml remove all " + HIBERNATE_ORM_CONFIG_PREFIX
-                                + "* properties from the Quarkus config file.");
+                        "Unable to find file referenced in '" + HIBERNATE_ORM_CONFIG_PREFIX + "sql-load-script="
+                                + persistenceUnitConfig.sqlLoadScript.get() + "'. Remove property or add file to your path.");
             }
+            if (launchMode == LaunchMode.DEVELOPMENT) {
+                // in dev mode we want to make sure that we watch for changes to file even if it doesn't currently exist
+                // as a user could still add it after performing the initial configuration
+                hotDeploymentWatchedFiles.produce(new HotDeploymentWatchedFileBuildItem(importFile.get()));
+            }
+        } else {
+            //Disable implicit loading of the default import script (import.sql)
+            descriptor.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, "");
         }
-    }
 
-    @BuildStep
-    public void produceLoggingCategories(BuildProducer<LogCategoryBuildItem> categories) {
-        if (hibernateConfig.log.bindParam) {
-            categories.produce(new LogCategoryBuildItem("org.hibernate.type.descriptor.sql.BasicBinder", Level.TRACE));
+        // Caching
+        if (persistenceUnitConfig.secondLevelCachingEnabled) {
+            Properties p = descriptor.getProperties();
+            //Only set these if the user isn't making an explicit choice:
+            p.putIfAbsent(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.TRUE);
+            p.putIfAbsent(USE_SECOND_LEVEL_CACHE, Boolean.TRUE);
+            p.putIfAbsent(USE_QUERY_CACHE, Boolean.TRUE);
+            p.putIfAbsent(JPA_SHARED_CACHE_MODE, SharedCacheMode.ENABLE_SELECTIVE);
+            Map<String, String> cacheConfigEntries = HibernateConfigUtil.getCacheConfigEntries(persistenceUnitConfig);
+            for (Entry<String, String> entry : cacheConfigEntries.entrySet()) {
+                descriptor.getProperties().setProperty(entry.getKey(), entry.getValue());
+            }
+        } else {
+            //Unless the global switch is explicitly set to off, in which case we disable all caching:
+            Properties p = descriptor.getProperties();
+            p.put(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.FALSE);
+            p.put(USE_SECOND_LEVEL_CACHE, Boolean.FALSE);
+            p.put(USE_QUERY_CACHE, Boolean.FALSE);
+            p.put(JPA_SHARED_CACHE_MODE, SharedCacheMode.NONE);
         }
-    }
 
-    @BuildStep(onlyIf = NativeBuild.class)
-    public void test(CombinedIndexBuildItem index,
-            BuildProducer<ReflectiveClassBuildItem> reflective) {
-        Collection<AnnotationInstance> annotationInstances = index.getIndex().getAnnotations(STATIC_METAMODEL);
-        if (!annotationInstances.isEmpty()) {
-
-            String[] metamodel = annotationInstances.stream()
-                    .map(a -> a.target().asClass().name().toString())
-                    .toArray(String[]::new);
+        // Hibernate Validator integration: we force the callback mode to have bootstrap errors reported rather than validation ignored
+        // if there is any issue when bootstrapping Hibernate Validator.
+        if (capabilities.isPresent(Capability.HIBERNATE_VALIDATOR)) {
+            descriptor.getProperties().setProperty(AvailableSettings.JPA_VALIDATION_MODE, ValidationMode.CALLBACK.name());
+        }
 
-            reflective.produce(new ReflectiveClassBuildItem(false, false, true, metamodel));
+        // Collect the storage engines if MySQL or MariaDB
+        if (isMySQLOrMariaDB(dialect.get()) && persistenceUnitConfig.dialect.storageEngine.isPresent()) {
+            storageEngineCollector.add(persistenceUnitConfig.dialect.storageEngine.get());
         }
+
+        persistenceUnitDescriptors.produce(
+                new PersistenceUnitDescriptorBuildItem(descriptor, dataSource,
+                        getMultiTenancyStrategy(persistenceUnitConfig.multitenant),
+                        persistenceUnitConfig.multitenantSchemaDatasource.orElse(null),
+                        false, false));
     }
 
     public static Optional<String> guessDialect(String resolvedDbKind) {
@@ -813,13 +969,23 @@ public static Optional<String> guessDialect(String resolvedDbKind) {
         throw new ConfigurationError(error);
     }
 
+    private static void setMaxFetchDepth(ParsedPersistenceXmlDescriptor descriptor, OptionalInt maxFetchDepth) {
+        descriptor.getProperties().setProperty(AvailableSettings.MAX_FETCH_DEPTH, String.valueOf(maxFetchDepth.getAsInt()));
+    }
+
+    private static void setBatchFetchSize(ParsedPersistenceXmlDescriptor descriptor, int batchFetchSize) {
+        descriptor.getProperties().setProperty(AvailableSettings.DEFAULT_BATCH_FETCH_SIZE,
+                Integer.toString(batchFetchSize));
+        descriptor.getProperties().setProperty(AvailableSettings.BATCH_FETCH_STYLE, BatchFetchStyle.PADDED.toString());
+    }
+
     private void enhanceEntities(final JpaEntitiesBuildItem domainObjects,
             BuildProducer<BytecodeTransformerBuildItem> transformers,
             List<AdditionalJpaModelBuildItem> additionalJpaModelBuildItems,
             BuildProducer<GeneratedClassBuildItem> additionalClasses) {
         HibernateEntityEnhancer hibernateEntityEnhancer = new HibernateEntityEnhancer();
         for (String i : domainObjects.getAllModelClassNames()) {
-            transformers.produce(new BytecodeTransformerBuildItem(true, i, hibernateEntityEnhancer));
+            transformers.produce(new BytecodeTransformerBuildItem(true, i, hibernateEntityEnhancer, true));
         }
         for (AdditionalJpaModelBuildItem additionalJpaModel : additionalJpaModelBuildItems) {
             String className = additionalJpaModel.getClassName();
@@ -833,4 +999,371 @@ private void enhanceEntities(final JpaEntitiesBuildItem domainObjects,
         }
     }
 
+    private static Map<String, Set<String>> getModelClassesAndPackagesPerPersistenceUnits(HibernateOrmConfig hibernateOrmConfig,
+            JpaEntitiesBuildItem jpaEntities, IndexView index, boolean enableDefaultPersistenceUnit) {
+        if (hibernateOrmConfig.persistenceUnits.isEmpty()) {
+            // no named persistence units, all the entities will be associated with the default one
+            // so we don't need to split them
+            Set<String> allModelClassesAndPackages = new HashSet<>(jpaEntities.getAllModelClassNames());
+            allModelClassesAndPackages.addAll(jpaEntities.getAllModelPackageNames());
+            return Collections.singletonMap(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, allModelClassesAndPackages);
+        }
+
+        Map<String, Set<String>> modelClassesAndPackagesPerPersistenceUnits = new HashMap<>();
+
+        boolean hasPackagesInQuarkusConfig = hasPackagesInQuarkusConfig(hibernateOrmConfig);
+        Collection<AnnotationInstance> packageLevelPersistenceUnitAnnotations = getPackageLevelPersistenceUnitAnnotations(
+                index);
+
+        Map<String, Set<String>> packageRules = new HashMap<>();
+
+        if (hasPackagesInQuarkusConfig) {
+            // Config based packages have priorities over annotations.
+            // As long as there is one defined, annotations are ignored.
+            if (!packageLevelPersistenceUnitAnnotations.isEmpty()) {
+                LOG.warn(
+                        "Mixing Quarkus configuration and @PersistenceUnit annotations to define the persistence units is not supported. Ignoring the annotations.");
+            }
+
+            // handle the default persistence unit
+            if (enableDefaultPersistenceUnit) {
+                if (!hibernateOrmConfig.defaultPersistenceUnit.packages.isPresent()) {
+                    throw new ConfigurationException("Packages must be configured for the default persistence unit.");
+                }
+
+                for (String packageName : hibernateOrmConfig.defaultPersistenceUnit.packages.get()) {
+                    packageRules.computeIfAbsent(normalizePackage(packageName), p -> new HashSet<>())
+                            .add(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
+                }
+            }
+
+            // handle the named persistence units
+            for (Entry<String, HibernateOrmConfigPersistenceUnit> candidatePersistenceUnitEntry : hibernateOrmConfig.persistenceUnits
+                    .entrySet()) {
+                String candidatePersistenceUnitName = candidatePersistenceUnitEntry.getKey();
+
+                Set<String> candidatePersistenceUnitPackages = candidatePersistenceUnitEntry.getValue().packages
+                        .orElseThrow(() -> new ConfigurationException(String.format(Locale.ROOT,
+                                "Packages must be configured for persistence unit '%s'.", candidatePersistenceUnitName)));
+
+                for (String packageName : candidatePersistenceUnitPackages) {
+                    packageRules.computeIfAbsent(normalizePackage(packageName), p -> new HashSet<>())
+                            .add(candidatePersistenceUnitName);
+                }
+            }
+        } else if (!packageLevelPersistenceUnitAnnotations.isEmpty()) {
+            for (AnnotationInstance packageLevelPersistenceUnitAnnotation : packageLevelPersistenceUnitAnnotations) {
+                String className = packageLevelPersistenceUnitAnnotation.target().asClass().name().toString();
+                String packageName;
+                if (className == null || className.isEmpty() || className.indexOf('.') == -1) {
+                    packageName = "";
+                } else {
+                    packageName = normalizePackage(className.substring(0, className.lastIndexOf('.')));
+                }
+
+                String persistenceUnitName = packageLevelPersistenceUnitAnnotation.value().asString();
+                if (persistenceUnitName != null && !persistenceUnitName.isEmpty()) {
+                    packageRules.computeIfAbsent(packageName, p -> new HashSet<>())
+                            .add(persistenceUnitName);
+                }
+            }
+        } else {
+            throw new ConfigurationException(
+                    "Multiple persistence units are defined but the entities are not mapped to them. You should either use the .packages Quarkus configuration property or package-level @PersistenceUnit annotations.");
+        }
+
+        Set<String> modelClassesWithPersistenceUnitAnnotations = new TreeSet<>();
+
+        for (String modelClassName : jpaEntities.getAllModelClassNames()) {
+            ClassInfo modelClassInfo = index.getClassByName(DotName.createSimple(modelClassName));
+            Set<String> relatedModelClassNames = getRelatedModelClassNames(index, jpaEntities.getAllModelClassNames(),
+                    modelClassInfo);
+
+            if (modelClassInfo != null && (modelClassInfo.classAnnotation(PERSISTENCE_UNIT) != null
+                    || modelClassInfo.classAnnotation(PERSISTENCE_UNIT_REPEATABLE_CONTAINER) != null)) {
+                modelClassesWithPersistenceUnitAnnotations.add(modelClassInfo.name().toString());
+            }
+
+            for (Entry<String, Set<String>> packageRuleEntry : packageRules.entrySet()) {
+                if (modelClassName.startsWith(packageRuleEntry.getKey())) {
+                    for (String persistenceUnitName : packageRuleEntry.getValue()) {
+                        modelClassesAndPackagesPerPersistenceUnits.putIfAbsent(persistenceUnitName, new HashSet<>());
+                        modelClassesAndPackagesPerPersistenceUnits.get(persistenceUnitName).add(modelClassName);
+
+                        // also add the hierarchy to the persistence unit
+                        // we would need to add all the underlying model to it but adding the hierarchy
+                        // is necessary for Panache as we need to add PanacheEntity to the PU
+                        for (String relatedModelClassName : relatedModelClassNames) {
+                            modelClassesAndPackagesPerPersistenceUnits.get(persistenceUnitName).add(relatedModelClassName);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!modelClassesWithPersistenceUnitAnnotations.isEmpty()) {
+            throw new IllegalStateException(String.format(Locale.ROOT,
+                    "@PersistenceUnit annotations are not supported at the class level on model classes:\n\t- %s\nUse the `.packages` configuration property or package-level annotations instead.",
+                    String.join("\n\t- ", modelClassesWithPersistenceUnitAnnotations)));
+        }
+
+        Set<String> affectedModelClasses = modelClassesAndPackagesPerPersistenceUnits.values().stream().flatMap(Set::stream)
+                .collect(Collectors.toSet());
+        Set<String> unaffectedModelClasses = jpaEntities.getAllModelClassNames().stream()
+                .filter(c -> !affectedModelClasses.contains(c))
+                .collect(Collectors.toCollection(TreeSet::new));
+        if (!unaffectedModelClasses.isEmpty()) {
+            LOG.warnf("Could not find a suitable persistence unit for model classes:\n\t- %s",
+                    String.join("\n\t- ", unaffectedModelClasses));
+        }
+
+        for (String modelPackageName : jpaEntities.getAllModelPackageNames()) {
+            Set<String> persistenceUnitNames = packageRules.get(modelPackageName);
+            if (persistenceUnitNames == null) {
+                continue;
+            }
+            for (String persistenceUnitName : persistenceUnitNames) {
+                modelClassesAndPackagesPerPersistenceUnits.putIfAbsent(persistenceUnitName, new HashSet<>());
+                modelClassesAndPackagesPerPersistenceUnits.get(persistenceUnitName).add(modelPackageName);
+            }
+        }
+
+        return modelClassesAndPackagesPerPersistenceUnits;
+    }
+
+    private static Set<String> getRelatedModelClassNames(IndexView index, Set<String> knownModelClassNames,
+            ClassInfo modelClassInfo) {
+        if (modelClassInfo == null) {
+            return Collections.emptySet();
+        }
+
+        Set<String> relatedModelClassNames = new HashSet<>();
+
+        // for now we only deal with entities and mapped super classes
+        if (modelClassInfo.classAnnotation(JPA_ENTITY) == null &&
+                modelClassInfo.classAnnotation(MAPPED_SUPERCLASS) == null) {
+            return Collections.emptySet();
+        }
+
+        modelClassInfo = index.getClassByName(modelClassInfo.superName());
+
+        while (modelClassInfo != null && !modelClassInfo.name().equals(DotNames.OBJECT)) {
+            String modelSuperClassName = modelClassInfo.name().toString();
+            if (knownModelClassNames.contains(modelSuperClassName)) {
+                relatedModelClassNames.add(modelSuperClassName);
+            }
+            modelClassInfo = index.getClassByName(modelClassInfo.superName());
+        }
+
+        return relatedModelClassNames;
+    }
+
+    private static String normalizePackage(String pakkage) {
+        if (pakkage.endsWith(".")) {
+            return pakkage;
+        }
+        return pakkage + ".";
+    }
+
+    private static boolean hasPackagesInQuarkusConfig(HibernateOrmConfig hibernateOrmConfig) {
+        if (hibernateOrmConfig.defaultPersistenceUnit.packages.isPresent()) {
+            return true;
+        }
+
+        for (HibernateOrmConfigPersistenceUnit persistenceUnitConfig : hibernateOrmConfig.persistenceUnits.values()) {
+            if (persistenceUnitConfig.packages.isPresent()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static Collection<AnnotationInstance> getPackageLevelPersistenceUnitAnnotations(IndexView index) {
+        Collection<AnnotationInstance> persistenceUnitAnnotations = index.getAnnotationsWithRepeatable(PERSISTENCE_UNIT, index);
+        Collection<AnnotationInstance> packageLevelPersistenceUnitAnnotations = new ArrayList<>();
+
+        for (AnnotationInstance persistenceUnitAnnotation : persistenceUnitAnnotations) {
+            if (persistenceUnitAnnotation.target().kind() != Kind.CLASS) {
+                continue;
+            }
+
+            if (!"package-info".equals(persistenceUnitAnnotation.target().asClass().simpleName())) {
+                continue;
+            }
+            packageLevelPersistenceUnitAnnotations.add(persistenceUnitAnnotation);
+        }
+
+        return packageLevelPersistenceUnitAnnotations;
+    }
+
+    /**
+     * Undocumented feature: we allow setting the System property
+     * "SKIP_PARSE_PERSISTENCE_XML" to fully ignore any persistence.xml
+     * resource.
+     *
+     * @return true if we're expected to ignore them
+     */
+    private boolean shouldIgnorePersistenceXmlResources() {
+        return Boolean.getBoolean("SKIP_PARSE_PERSISTENCE_XML");
+    }
+
+    /**
+     * Set up the scanner, as this scanning has already been done we need to just tell it about the classes we
+     * have discovered. This scanner is bytecode serializable and is passed directly into the recorder
+     *
+     * @param domainObjects the previously discovered domain objects
+     * @return a new QuarkusScanner with all domainObjects registered
+     */
+    public static QuarkusScanner buildQuarkusScanner(JpaEntitiesBuildItem domainObjects) {
+        QuarkusScanner scanner = new QuarkusScanner();
+        Set<PackageDescriptor> packageDescriptors = new HashSet<>();
+        for (String packageName : domainObjects.getAllModelPackageNames()) {
+            QuarkusScanner.PackageDescriptorImpl desc = new QuarkusScanner.PackageDescriptorImpl(packageName);
+            packageDescriptors.add(desc);
+        }
+        scanner.setPackageDescriptors(packageDescriptors);
+        Set<ClassDescriptor> classDescriptors = new HashSet<>();
+        for (String className : domainObjects.getEntityClassNames()) {
+            QuarkusScanner.ClassDescriptorImpl desc = new QuarkusScanner.ClassDescriptorImpl(className,
+                    ClassDescriptor.Categorization.MODEL);
+            classDescriptors.add(desc);
+        }
+        scanner.setClassDescriptors(classDescriptors);
+        return scanner;
+    }
+
+    private static MultiTenancyStrategy getMultiTenancyStrategy(Optional<String> multitenancyStrategy) {
+        final MultiTenancyStrategy multiTenancyStrategy = MultiTenancyStrategy
+                .valueOf(multitenancyStrategy.orElse(MultiTenancyStrategy.NONE.name())
+                        .toUpperCase(Locale.ROOT));
+        if (multiTenancyStrategy == MultiTenancyStrategy.DISCRIMINATOR) {
+            // See https://hibernate.atlassian.net/browse/HHH-6054
+            throw new ConfigurationError("The Hibernate ORM multitenancy strategy "
+                    + MultiTenancyStrategy.DISCRIMINATOR + " is currently not supported");
+        }
+        return multiTenancyStrategy;
+    }
+
+    private PreGeneratedProxies generatedProxies(Set<String> managedClassAndPackageNames, IndexView combinedIndex,
+            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
+            LiveReloadBuildItem liveReloadBuildItem) {
+        ProxyCache proxyCache = liveReloadBuildItem.getContextObject(ProxyCache.class);
+        if (proxyCache == null) {
+            proxyCache = new ProxyCache();
+            liveReloadBuildItem.setContextObject(ProxyCache.class, proxyCache);
+        }
+        Set<String> changedClasses = Collections.emptySet();
+        if (liveReloadBuildItem.getChangeInformation() != null) {
+            changedClasses = liveReloadBuildItem.getChangeInformation().getChangedClasses();
+        } else {
+            //we don't have class change info, invalidate the cache
+            proxyCache.cache.clear();
+        }
+        //create a map of entity to proxy type
+        PreGeneratedProxies preGeneratedProxies = new PreGeneratedProxies();
+        Map<String, String> proxyAnnotations = new HashMap<>();
+        for (AnnotationInstance i : combinedIndex.getAnnotations(DotName.createSimple(Proxy.class.getName()))) {
+            AnnotationValue proxyClass = i.value("proxyClass");
+            if (proxyClass == null) {
+                continue;
+            }
+            proxyAnnotations.put(i.target().asClass().name().toString(), proxyClass.asClass().name().toString());
+        }
+        try (ProxyBuildingHelper proxyHelper = new ProxyBuildingHelper(Thread.currentThread().getContextClassLoader())) {
+            for (String managedClassOrPackageName : managedClassAndPackageNames) {
+                CachedProxy result;
+                if (proxyCache.cache.containsKey(managedClassOrPackageName)
+                        && !isModified(managedClassOrPackageName, changedClasses, combinedIndex)) {
+                    result = proxyCache.cache.get(managedClassOrPackageName);
+                } else {
+                    Set<Class<?>> proxyInterfaces = new HashSet<>();
+                    proxyInterfaces.add(HibernateProxy.class); //always added
+                    String proxy = proxyAnnotations.get(managedClassOrPackageName);
+                    if (proxy == null) {
+                        if (!proxyHelper.isProxiable(managedClassOrPackageName)) {
+                            //if there is no @Proxy we need to make sure the actual class is proxiable
+                            continue;
+                        }
+                    } else {
+                        proxyInterfaces.add(proxyHelper.uninitializedClass(proxy));
+                    }
+                    Class<?> mappedClass = proxyHelper.uninitializedClass(managedClassOrPackageName);
+                    for (ClassInfo subclass : combinedIndex
+                            .getAllKnownSubclasses(DotName.createSimple(managedClassOrPackageName))) {
+                        String subclassName = subclass.name().toString();
+                        if (!managedClassAndPackageNames.contains(subclassName)) {
+                            //not an entity
+                            continue;
+                        }
+                        proxy = proxyAnnotations.get(subclassName);
+                        if (proxy != null) {
+                            proxyInterfaces.add(proxyHelper.uninitializedClass(proxy));
+                        }
+                    }
+                    DynamicType.Unloaded<?> unloaded = proxyHelper.buildUnloadedProxy(mappedClass,
+                            toArray(proxyInterfaces));
+                    result = new CachedProxy(unloaded,
+                            proxyInterfaces.stream().map(Class::getName).collect(Collectors.toSet()));
+                    proxyCache.cache.put(managedClassOrPackageName, result);
+                }
+                for (Entry<TypeDescription, byte[]> i : result.proxyDef.getAllTypes().entrySet()) {
+                    generatedClassBuildItemBuildProducer
+                            .produce(new GeneratedClassBuildItem(true, i.getKey().getName(), i.getValue()));
+                }
+                preGeneratedProxies.getProxies().put(managedClassOrPackageName,
+                        new PreGeneratedProxies.ProxyClassDetailsHolder(result.proxyDef.getTypeDescription().getName(),
+                                result.interfaces));
+            }
+        }
+        return preGeneratedProxies;
+    }
+
+    private boolean isModified(String entity, Set<String> changedClasses, IndexView index) {
+        if (changedClasses.contains(entity)) {
+            return true;
+        }
+        ClassInfo clazz = index.getClassByName(DotName.createSimple(entity));
+        if (clazz == null) {
+            //if it is not in the index, then it has not been modified
+            return false;
+        }
+        for (DotName i : clazz.interfaceNames()) {
+            if (isModified(i.toString(), changedClasses, index)) {
+                return true;
+            }
+        }
+        DotName superName = clazz.superName();
+        if (superName != null) {
+            return isModified(superName.toString(), changedClasses, index);
+        }
+        return false;
+    }
+
+    private static Class[] toArray(final Set<Class<?>> interfaces) {
+        if (interfaces == null) {
+            return ArrayHelper.EMPTY_CLASS_ARRAY;
+        }
+        return interfaces.toArray(new Class[interfaces.size()]);
+    }
+
+    private static boolean isMySQLOrMariaDB(String dialect) {
+        String lowercaseDialect = dialect.toLowerCase(Locale.ROOT);
+        return lowercaseDialect.contains("mysql") || lowercaseDialect.contains("mariadb");
+    }
+
+    private static final class ProxyCache {
+
+        Map<String, CachedProxy> cache = new HashMap<>();
+    }
+
+    static final class CachedProxy {
+        final DynamicType.Unloaded<?> proxyDef;
+        final Set<String> interfaces;
+
+        CachedProxy(DynamicType.Unloaded<?> proxyDef, Set<String> interfaces) {
+            this.proxyDef = proxyDef;
+            this.interfaces = interfaces;
+        }
+    }
 }
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ImpliedBlockingPersistenceUnitTypeBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ImpliedBlockingPersistenceUnitTypeBuildItem.java
index db655c194ebee..ec2d40778bd73 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ImpliedBlockingPersistenceUnitTypeBuildItem.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ImpliedBlockingPersistenceUnitTypeBuildItem.java
@@ -1,6 +1,5 @@
 package io.quarkus.hibernate.orm.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDataSourceBuildItem;
 import io.quarkus.builder.item.SimpleBuildItem;
 
 /**
@@ -13,29 +12,22 @@
 public final class ImpliedBlockingPersistenceUnitTypeBuildItem extends SimpleBuildItem {
 
     private static final ImpliedBlockingPersistenceUnitTypeBuildItem NONE = new ImpliedBlockingPersistenceUnitTypeBuildItem(
-            false, null);
+            false);
     private final boolean shouldGenerateOne;
-    private final JdbcDataSourceBuildItem datasourceConfig;
 
-    private ImpliedBlockingPersistenceUnitTypeBuildItem(boolean shouldGenerateOne, JdbcDataSourceBuildItem datasourceConfig) {
+    private ImpliedBlockingPersistenceUnitTypeBuildItem(boolean shouldGenerateOne) {
         this.shouldGenerateOne = shouldGenerateOne;
-        this.datasourceConfig = datasourceConfig;
     }
 
     public static ImpliedBlockingPersistenceUnitTypeBuildItem none() {
         return NONE;
     }
 
-    public static ImpliedBlockingPersistenceUnitTypeBuildItem generateImpliedPersistenceUnit(
-            JdbcDataSourceBuildItem datasourceConfig) {
-        return new ImpliedBlockingPersistenceUnitTypeBuildItem(true, datasourceConfig);
+    public static ImpliedBlockingPersistenceUnitTypeBuildItem generateImpliedPersistenceUnit() {
+        return new ImpliedBlockingPersistenceUnitTypeBuildItem(true);
     }
 
     public boolean shouldGenerateImpliedBlockingPersistenceUnit() {
         return shouldGenerateOne;
     }
-
-    public JdbcDataSourceBuildItem getDatasourceBuildTimeConfiguration() {
-        return datasourceConfig;
-    }
 }
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaEntitiesBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaEntitiesBuildItem.java
index 94e27eed18c6b..a0c70d17bbfc8 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaEntitiesBuildItem.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaEntitiesBuildItem.java
@@ -1,7 +1,7 @@
 package io.quarkus.hibernate.orm.deployment;
 
-import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import javax.persistence.Entity;
 
@@ -15,8 +15,13 @@
  */
 public final class JpaEntitiesBuildItem extends SimpleBuildItem {
 
-    private final Set<String> entityClassNames = new HashSet<String>();
-    private final Set<String> allModelClassNames = new HashSet<String>();
+    private final Set<String> allModelPackageNames = new TreeSet<>();
+    private final Set<String> entityClassNames = new TreeSet<>();
+    private final Set<String> allModelClassNames = new TreeSet<>();
+
+    public void addModelPackage(String packageName) {
+        allModelPackageNames.add(packageName);
+    }
 
     void addEntityClass(final String className) {
         entityClassNames.add(className);
@@ -33,6 +38,13 @@ void registerAllForReflection(final BuildProducer<ReflectiveClassBuildItem> refl
         }
     }
 
+    /**
+     * @return the list of packages annotated with a JPA annotation.
+     */
+    public Set<String> getAllModelPackageNames() {
+        return allModelPackageNames;
+    }
+
     /**
      * @return the list of entities (i.e. classes marked with {@link Entity})
      */
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java
index 98c4b55ea3178..1387ca6e17cc6 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaJandexScavenger.java
@@ -75,6 +75,9 @@ public JpaEntitiesBuildItem discoverModelAndRegisterForReflection() throws IOExc
         final Set<String> javaTypeCollector = new HashSet<>();
         final Set<DotName> unindexedClasses = new TreeSet<>();
 
+        for (DotName packageAnnotation : HibernateOrmAnnotations.PACKAGE_ANNOTATIONS) {
+            enlistJPAModelAnnotatedPackages(indexView, domainObjectCollector, packageAnnotation);
+        }
         enlistJPAModelClasses(indexView, domainObjectCollector, enumTypeCollector, javaTypeCollector, JPA_ENTITY,
                 unindexedClasses);
         enlistJPAModelClasses(indexView, domainObjectCollector, enumTypeCollector, javaTypeCollector, EMBEDDABLE,
@@ -170,6 +173,30 @@ private static void enlistEmbeddedsAndElementCollections(IndexView index, JpaEnt
         }
     }
 
+    private void enlistJPAModelAnnotatedPackages(IndexView index, JpaEntitiesBuildItem domainObjectCollector, DotName dotName) {
+        Collection<AnnotationInstance> jpaAnnotations = index.getAnnotations(dotName);
+
+        if (jpaAnnotations == null) {
+            return;
+        }
+
+        for (AnnotationInstance annotation : jpaAnnotations) {
+            if (annotation.target().kind() != AnnotationTarget.Kind.CLASS) {
+                continue; // Annotation on field, method, etc.
+            }
+            ClassInfo klass = annotation.target().asClass();
+            if (!klass.simpleName().equals("package-info")) {
+                continue; // Annotation on an actual class, not a package.
+            }
+            DotName targetDotName = klass.name();
+            // ignore non-jpa model classes that we think belong to JPA
+            if (nonJpaModelClasses.contains(targetDotName.toString())) {
+                continue;
+            }
+            collectPackage(domainObjectCollector, klass);
+        }
+    }
+
     private void enlistJPAModelClasses(IndexView index, JpaEntitiesBuildItem domainObjectCollector,
             Set<String> enumTypeCollector, Set<String> javaTypeCollector, DotName dotName, Set<DotName> unindexedClasses) {
         Collection<AnnotationInstance> jpaAnnotations = index.getAnnotations(dotName);
@@ -240,6 +267,12 @@ private static void addClassHierarchyToReflectiveList(IndexView index, JpaEntiti
         }
     }
 
+    private static void collectPackage(JpaEntitiesBuildItem domainObjectCollector, ClassInfo classOrPackageInfo) {
+        String classOrPackageInfoName = classOrPackageInfo.name().toString();
+        String packageName = classOrPackageInfoName.substring(0, classOrPackageInfoName.lastIndexOf('.'));
+        domainObjectCollector.addModelPackage(packageName);
+    }
+
     private static void collectDomainObject(JpaEntitiesBuildItem domainObjectCollector, ClassInfo modelClass) {
         if (modelClass.classAnnotation(JPA_ENTITY) != null) {
             domainObjectCollector.addEntityClass(modelClass.name().toString());
@@ -271,7 +304,8 @@ private static void collectEmbeddedTypes(Set<DotName> embeddedTypes, Type indexT
     private static boolean isIgnored(DotName classDotName) {
         String className = classDotName.toString();
         if (className.startsWith("java.util.") || className.startsWith("java.lang.")
-                || className.startsWith("org.hibernate.engine.spi.")) {
+                || className.startsWith("org.hibernate.engine.spi.")
+                || className.startsWith("javax.persistence.")) {
             return true;
         }
         return false;
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelPersistenceUnitMappingBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelPersistenceUnitMappingBuildItem.java
new file mode 100644
index 0000000000000..dbd4cb34fe53e
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/JpaModelPersistenceUnitMappingBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.orm.deployment;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Internal model to hold the mapping linking a JPA entity to its corresponding persistence units.
+ */
+public final class JpaModelPersistenceUnitMappingBuildItem extends SimpleBuildItem {
+
+    private final Map<String, Set<String>> entityToPersistenceUnits;
+
+    public JpaModelPersistenceUnitMappingBuildItem(Map<String, Set<String>> entityToPersistenceUnits) {
+        this.entityToPersistenceUnits = Collections.unmodifiableMap(entityToPersistenceUnits);
+    }
+
+    public Map<String, Set<String>> getEntityToPersistenceUnits() {
+        return entityToPersistenceUnits;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceProviderSetUpBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceProviderSetUpBuildItem.java
new file mode 100644
index 0000000000000..a11f869614f4d
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceProviderSetUpBuildItem.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.orm.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Indicates that the Hibernate ORM persistence units have been started.
+ */
+public final class PersistenceProviderSetUpBuildItem extends MultiBuildItem {
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceUnitDescriptorBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceUnitDescriptorBuildItem.java
index 1cfa6e623bda4..05c96af05bd39 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceUnitDescriptorBuildItem.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceUnitDescriptorBuildItem.java
@@ -1,12 +1,15 @@
 package io.quarkus.hibernate.orm.deployment;
 
-import java.util.Set;
+import java.util.Collection;
+import java.util.List;
 
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
 
 import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.hibernate.orm.runtime.boot.QuarkusPersistenceUnitDefinition;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
 
 /**
  * Not to be confused with PersistenceXmlDescriptorBuildItem, which holds
@@ -17,30 +20,35 @@
 public final class PersistenceUnitDescriptorBuildItem extends MultiBuildItem {
 
     private final ParsedPersistenceXmlDescriptor descriptor;
+    private final String dataSource;
     private final MultiTenancyStrategy multiTenancyStrategy;
+    private final String multiTenancySchemaDataSource;
     private final boolean isReactive;
+    private final boolean fromPersistenceXml;
 
-    public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descriptor, boolean isReactive) {
+    public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descriptor, boolean isReactive,
+            boolean fromPersistenceXml) {
         this.descriptor = descriptor;
+        this.dataSource = DataSourceUtil.DEFAULT_DATASOURCE_NAME;
         this.multiTenancyStrategy = MultiTenancyStrategy.NONE;
+        this.multiTenancySchemaDataSource = null;
         this.isReactive = isReactive;
+        this.fromPersistenceXml = fromPersistenceXml;
     }
 
-    public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descriptor,
-            MultiTenancyStrategy multiTenancyStrategy, boolean isReactive) {
+    public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descriptor, String dataSource,
+            MultiTenancyStrategy multiTenancyStrategy, String multiTenancySchemaDataSource, boolean isReactive,
+            boolean fromPersistenceXml) {
         this.descriptor = descriptor;
+        this.dataSource = dataSource;
         this.multiTenancyStrategy = multiTenancyStrategy;
+        this.multiTenancySchemaDataSource = multiTenancySchemaDataSource;
         this.isReactive = isReactive;
+        this.fromPersistenceXml = fromPersistenceXml;
     }
 
-    /**
-     * Modifies the passed set by adding all explicitly listed classnames from this PU
-     * into the set.
-     * 
-     * @param classNames the set to modify
-     */
-    public void addListedEntityClassNamesTo(Set<String> classNames) {
-        classNames.addAll(descriptor.getManagedClassNames());
+    public Collection<String> getManagedClassNames() {
+        return descriptor.getManagedClassNames();
     }
 
     public String getExplicitSqlImportScriptResourceName() {
@@ -51,7 +59,21 @@ public String getPersistenceUnitName() {
         return descriptor.getName();
     }
 
-    public QuarkusPersistenceUnitDefinition asOutputPersistenceUnitDefinition() {
-        return new QuarkusPersistenceUnitDefinition(descriptor, multiTenancyStrategy, isReactive);
+    public String getDataSource() {
+        return dataSource;
+    }
+
+    public MultiTenancyStrategy getMultiTenancyStrategy() {
+        return multiTenancyStrategy;
+    }
+
+    public String getMultiTenancySchemaDataSource() {
+        return multiTenancySchemaDataSource;
+    }
+
+    public QuarkusPersistenceUnitDefinition asOutputPersistenceUnitDefinition(
+            List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors) {
+        return new QuarkusPersistenceUnitDefinition(descriptor, dataSource, multiTenancyStrategy, isReactive,
+                fromPersistenceXml, integrationStaticDescriptors);
     }
 }
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ProxyBuildingHelper.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ProxyBuildingHelper.java
index bcdba4e5a0e34..63429b0969c46 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ProxyBuildingHelper.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/ProxyBuildingHelper.java
@@ -5,6 +5,7 @@
 import org.hibernate.bytecode.internal.bytebuddy.BytecodeProviderImpl;
 import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
 
+import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.dynamic.DynamicType;
 
 /**
@@ -29,7 +30,7 @@ private ByteBuddyProxyHelper getByteBuddyProxyHelper() {
         //Lazy initialization of Byte Buddy: we'll likely need it, but if we can avoid loading it
         //in some corner cases it's worth avoiding it.
         if (this.byteBuddyProxyHelper == null) {
-            bytecodeProvider = new BytecodeProviderImpl();
+            bytecodeProvider = new BytecodeProviderImpl(ClassFileVersion.JAVA_V8);
             this.byteBuddyProxyHelper = bytecodeProvider.getByteBuddyProxyHelper();
         }
         return this.byteBuddyProxyHelper;
@@ -43,7 +44,15 @@ public Class<?> uninitializedClass(String entity) {
         }
     }
 
-    public boolean isProxiable(Class<?> mappedClass) {
+    public boolean isProxiable(String managedClassOrPackageName) {
+        Class<?> mappedClass;
+        try {
+            mappedClass = Class.forName(managedClassOrPackageName, false, contextClassLoader);
+        } catch (ClassNotFoundException e) {
+            // Probably a package name - consider it's not proxiable.
+            return false;
+        }
+
         if (Modifier.isFinal(mappedClass.getModifiers())) {
             return false;
         }
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationBuildItem.java
deleted file mode 100644
index 1345a4454c760..0000000000000
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationBuildItem.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.hibernate.orm.deployment.integration;
-
-import io.quarkus.builder.item.MultiBuildItem;
-
-public final class HibernateOrmIntegrationBuildItem extends MultiBuildItem {
-
-    private final String name;
-
-    public HibernateOrmIntegrationBuildItem(String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("name cannot be null");
-        }
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String toString() {
-        return new StringBuilder().append(HibernateOrmIntegrationBuildItem.class.getSimpleName())
-                .append(" [").append(name).append("]")
-                .toString();
-    }
-}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationRuntimeConfiguredBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationRuntimeConfiguredBuildItem.java
index 508cb8e04ac51..991e953809971 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationRuntimeConfiguredBuildItem.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationRuntimeConfiguredBuildItem.java
@@ -1,26 +1,54 @@
 package io.quarkus.hibernate.orm.deployment.integration;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener;
 
 public final class HibernateOrmIntegrationRuntimeConfiguredBuildItem extends MultiBuildItem {
 
-    private final String name;
+    private final String integrationName;
+    private final String persistenceUnitName;
+    private HibernateOrmIntegrationRuntimeInitListener initListener;
 
-    public HibernateOrmIntegrationRuntimeConfiguredBuildItem(String name) {
-        if (name == null) {
+    public HibernateOrmIntegrationRuntimeConfiguredBuildItem(String integrationName, String persistenceUnitName) {
+        if (integrationName == null) {
             throw new IllegalArgumentException("name cannot be null");
         }
-        this.name = name;
+        this.integrationName = integrationName;
+        if (persistenceUnitName == null) {
+            throw new IllegalArgumentException("persistenceUnitName cannot be null");
+        }
+        this.persistenceUnitName = persistenceUnitName;
     }
 
-    public String getName() {
-        return name;
+    public HibernateOrmIntegrationRuntimeConfiguredBuildItem setInitListener(
+            HibernateOrmIntegrationRuntimeInitListener initListener) {
+        this.initListener = initListener;
+        return this;
     }
 
     @Override
     public String toString() {
-        return new StringBuilder().append(HibernateOrmIntegrationRuntimeConfiguredBuildItem.class.getSimpleName())
-                .append(" [").append(name).append("]")
-                .toString();
+        return HibernateOrmIntegrationRuntimeConfiguredBuildItem.class.getSimpleName() + " [" + integrationName + "]";
+    }
+
+    private HibernateOrmIntegrationRuntimeDescriptor toDescriptor() {
+        return new HibernateOrmIntegrationRuntimeDescriptor(integrationName, Optional.ofNullable(initListener));
+    }
+
+    public static Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> collectDescriptors(
+            List<HibernateOrmIntegrationRuntimeConfiguredBuildItem> items) {
+        Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> result = new HashMap<>();
+        for (HibernateOrmIntegrationRuntimeConfiguredBuildItem item : items) {
+            result.computeIfAbsent(item.persistenceUnitName, ignored -> new ArrayList<>())
+                    .add(item.toDescriptor());
+        }
+        return result;
     }
 }
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationStaticConfiguredBuildItem.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationStaticConfiguredBuildItem.java
new file mode 100644
index 0000000000000..1bc535fc35f91
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/integration/HibernateOrmIntegrationStaticConfiguredBuildItem.java
@@ -0,0 +1,61 @@
+package io.quarkus.hibernate.orm.deployment.integration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener;
+
+public final class HibernateOrmIntegrationStaticConfiguredBuildItem extends MultiBuildItem {
+
+    private final String integrationName;
+    private final String persistenceUnitName;
+    private HibernateOrmIntegrationStaticInitListener initListener;
+    private boolean xmlMappingRequired = false;
+
+    public HibernateOrmIntegrationStaticConfiguredBuildItem(String integrationName, String persistenceUnitName) {
+        if (integrationName == null) {
+            throw new IllegalArgumentException("name cannot be null");
+        }
+        this.integrationName = integrationName;
+        if (persistenceUnitName == null) {
+            throw new IllegalArgumentException("persistenceUnitName cannot be null");
+        }
+        this.persistenceUnitName = persistenceUnitName;
+    }
+
+    @Override
+    public String toString() {
+        return HibernateOrmIntegrationStaticConfiguredBuildItem.class.getSimpleName() + " [" + integrationName + "]";
+    }
+
+    public HibernateOrmIntegrationStaticConfiguredBuildItem setInitListener(
+            HibernateOrmIntegrationStaticInitListener initListener) {
+        this.initListener = initListener;
+        return this;
+    }
+
+    public HibernateOrmIntegrationStaticConfiguredBuildItem setXmlMappingRequired(boolean xmlMappingRequired) {
+        this.xmlMappingRequired = xmlMappingRequired;
+        return this;
+    }
+
+    private HibernateOrmIntegrationStaticDescriptor toDescriptor() {
+        return new HibernateOrmIntegrationStaticDescriptor(integrationName, Optional.ofNullable(initListener),
+                xmlMappingRequired);
+    }
+
+    public static Map<String, List<HibernateOrmIntegrationStaticDescriptor>> collectDescriptors(
+            List<HibernateOrmIntegrationStaticConfiguredBuildItem> items) {
+        Map<String, List<HibernateOrmIntegrationStaticDescriptor>> result = new HashMap<>();
+        for (HibernateOrmIntegrationStaticConfiguredBuildItem item : items) {
+            result.computeIfAbsent(item.persistenceUnitName, ignored -> new ArrayList<>())
+                    .add(item.toDescriptor());
+        }
+        return result;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetrics.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetrics.java
deleted file mode 100644
index 45705a69aad88..0000000000000
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetrics.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package io.quarkus.hibernate.orm.deployment.metrics;
-
-import org.eclipse.microprofile.metrics.Metadata;
-import org.eclipse.microprofile.metrics.MetricType;
-
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig;
-import io.quarkus.hibernate.orm.runtime.metrics.HibernateCounter;
-import io.quarkus.smallrye.metrics.deployment.spi.MetricBuildItem;
-
-/**
- * Responsible to produce all MetricBuildItem related to Hibernate ORM
- */
-public final class HibernateOrmMetrics {
-
-    @BuildStep
-    public void metrics(HibernateOrmConfig config,
-            BuildProducer<MetricBuildItem> metrics) {
-        // TODO: When multiple PUs are supported, create metrics for each PU. For now we only assume the "default" PU.
-        boolean metricsEnabled = config.metricsEnabled && config.statistics.orElse(true);
-        metrics.produce(createMetricBuildItem("hibernate-orm.sessions.open",
-                "Global number of sessions opened",
-                "sessionsOpened",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.sessions.closed",
-                "Global number of sessions closed",
-                "sessionsClosed",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.sessions.closed",
-                "Global number of sessions closed",
-                "sessionsClosed",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.transactions",
-                "The number of transactions we know to have completed",
-                "transactionCount",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.transactions.successful",
-                "The number of transactions we know to have been successful",
-                "successfulTransactions",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.optimistic.lock.failures",
-                "The number of Hibernate StaleObjectStateExceptions or JPA OptimisticLockExceptions that occurred.",
-                "optimisticLockFailures",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.flushes",
-                "Global number of flush operations executed (either manual or automatic).",
-                "flushes",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.connections.obtained",
-                "Get the global number of connections asked by the sessions " +
-                        "(the actual number of connections used may be much smaller depending " +
-                        "whether you use a connection pool or not)",
-                "connectionsObtained",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.statements.prepared",
-                "The number of prepared statements that were acquired",
-                "statementsPrepared",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.statements.closed",
-                "The number of prepared statements that were released",
-                "statementsClosed",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.second-level-cache.puts",
-                "Global number of cacheable entities/collections put in the cache",
-                "secondLevelCachePuts",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.second-level-cache.hits",
-                "Global number of cacheable entities/collections successfully retrieved from the cache",
-                "secondLevelCacheHits",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.second-level-cache.misses",
-                "Global number of cacheable entities/collections not found in the cache and loaded from the database.",
-                "secondLevelCacheMisses",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.entities.loaded",
-                "Global number of entity loads",
-                "entitiesLoaded",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.entities.updated",
-                "Global number of entity updates",
-                "entitiesUpdated",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.entities.inserted",
-                "Global number of entity inserts",
-                "entitiesInserted",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.entities.deleted",
-                "Global number of entity deletes",
-                "entitiesDeleted",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.entities.fetched",
-                "Global number of entity fetches",
-                "entitiesFetched",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.collections.loaded",
-                "Global number of collections loaded",
-                "collectionsLoaded",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.collections.updated",
-                "Global number of collections updated",
-                "collectionsUpdated",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.collections.removed",
-                "Global number of collections removed",
-                "collectionsRemoved",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.collections.recreated",
-                "Global number of collections recreated",
-                "collectionsRecreated",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.collections.fetched",
-                "Global number of collections fetched",
-                "collectionsFetched",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.natural-id.queries.executions",
-                "Global number of natural id queries executed against the database",
-                "naturalIdQueriesExecutedToDatabase",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.natural-id.cache.hits",
-                "Global number of cached natural id lookups successfully retrieved from cache",
-                "naturalIdCacheHits",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.natural-id.cache.puts",
-                "Global number of cacheable natural id lookups put in cache",
-                "naturalIdCachePuts",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.natural-id.cache.misses",
-                "Global number of cached natural id lookups *not* found in cache",
-                "naturalIdCacheMisses",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.queries.executed",
-                "Global number of executed queries",
-                "queriesExecutedToDatabase",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.query-cache.puts",
-                "Global number of cacheable queries put in cache",
-                "queryCachePuts",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.query-cache.hits",
-                "Global number of cached queries successfully retrieved from cache",
-                "queryCacheHits",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.query-cache.misses",
-                "Global number of cached queries *not* found in cache",
-                "queryCacheMisses",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.timestamps-cache.puts",
-                "Global number of timestamps put in cache",
-                "updateTimestampsCachePuts",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.timestamps-cache.hits",
-                "Global number of timestamps successfully retrieved from cache",
-                "updateTimestampsCacheHits",
-                metricsEnabled));
-        metrics.produce(createMetricBuildItem("hibernate-orm.timestamps-cache.misses",
-                "Global number of timestamp requests that were not found in the cache",
-                "updateTimestampsCacheMisses",
-                metricsEnabled));
-    }
-
-    private MetricBuildItem createMetricBuildItem(String metricName, String description, String metric,
-            boolean metricsEnabled) {
-        return new MetricBuildItem(Metadata.builder()
-                .withName(metricName)
-                .withDescription(description)
-                .withType(MetricType.COUNTER)
-                .build(),
-                new HibernateCounter("default", metric),
-                metricsEnabled,
-                "hibernate-orm");
-    }
-
-}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java
new file mode 100644
index 0000000000000..14eb9a3f0583a
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/metrics/HibernateOrmMetricsProcessor.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.deployment.metrics;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem;
+import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig;
+import io.quarkus.hibernate.orm.deployment.PersistenceProviderSetUpBuildItem;
+import io.quarkus.hibernate.orm.runtime.metrics.HibernateMetricsRecorder;
+
+/**
+ * Produce metrics for Hibernate ORM
+ * Avoid hard dependencies in main processor
+ */
+public final class HibernateOrmMetricsProcessor {
+
+    @BuildStep
+    @Record(RUNTIME_INIT)
+    public void metrics(HibernateOrmConfig config,
+            HibernateMetricsRecorder metricsRecorder,
+            List<PersistenceProviderSetUpBuildItem> persistenceUnitsStarted,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration,
+            BuildProducer<MetricsFactoryConsumerBuildItem> datasourceMetrics) {
+
+        // IF Hibernate metrics and Hibernate statistics are enabled
+        // then define a consumer. It will only be invoked if metrics is enabled
+        if (config.metricsEnabled && config.statistics.orElse(true) && metricsConfiguration.isPresent()) {
+            datasourceMetrics.produce(new MetricsFactoryConsumerBuildItem(metricsRecorder.consumeMetricsFactory()));
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java
new file mode 100644
index 0000000000000..96e8de319f2d3
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/test/HibernateTestTransactionCallback.java
@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.orm.deployment.test;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.persistence.EntityManager;
+
+import io.quarkus.narayana.jta.runtime.test.TestTransactionCallback;
+
+public class HibernateTestTransactionCallback implements TestTransactionCallback {
+    @Override
+    public void postBegin() {
+
+    }
+
+    @Override
+    public void preRollback() {
+        for (EntityManager i : CDI.current().select(EntityManager.class)) {
+            i.flush();
+        }
+
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/main/resources/META-INF/services/io.quarkus.narayana.jta.runtime.test.TestTransactionCallback b/extensions/hibernate-orm/deployment/src/main/resources/META-INF/services/io.quarkus.narayana.jta.runtime.test.TestTransactionCallback
new file mode 100644
index 0000000000000..a3f9d794d7a08
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/main/resources/META-INF/services/io.quarkus.narayana.jta.runtime.test.TestTransactionCallback
@@ -0,0 +1 @@
+io.quarkus.hibernate.orm.deployment.test.HibernateTestTransactionCallback
\ No newline at end of file
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java
index a9cc292dd495f..aec3b2a325234 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/ExcludePersistenceXmlConfigTest.java
@@ -12,6 +12,7 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.hibernate.orm.enhancer.Address;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class ExcludePersistenceXmlConfigTest {
@@ -43,7 +44,7 @@ public void testPersistenceAndConfigTest() {
         Arc.container().requestContext().activate();
         try {
             // it is the default entity manager from application.properties, not templatePU from the persistence.xml
-            Assertions.assertEquals("default",
+            Assertions.assertEquals(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME,
                     entityManager.getEntityManagerFactory().getProperties().get("hibernate.ejb.persistenceUnitName"));
         } finally {
             Arc.container().requestContext().deactivate();
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java
index de1625dd9f4e7..812aca9d8a665 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateMetricsTestCase.java
@@ -19,10 +19,11 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 import io.quarkus.test.QuarkusUnitTest;
 
 /**
- * Smoke test for metrics exposed by the smallrye-metrics extension and computed from Hibernate statistics objects.
+ * Smoke test for metrics exposed by a metrics extension and computed from Hibernate statistics objects.
  */
 public class HibernateMetricsTestCase {
 
@@ -56,8 +57,13 @@ public void setNumber(Long number) {
     @Test
     @Transactional
     public void testMetrics() {
-        assertEquals(0L, getCounterValueOrNull("hibernate-orm.queries.executed"));
-        assertEquals(0L, getCounterValueOrNull("hibernate-orm.entities.inserted"));
+        assertEquals(0L, getCounterValueOrNull("hibernate.query.executions",
+                new Tag("entityManagerFactory", PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)));
+        assertEquals(0L, getCounterValueOrNull("hibernate.entities.inserts",
+                new Tag("entityManagerFactory", PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)));
+        assertEquals(0L, getCounterValueOrNull("hibernate.cache.query.requests",
+                new Tag("entityManagerFactory", PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME),
+                new Tag("result", "miss")));
         Arc.container().requestContext().activate();
         try {
             DummyEntity entity = new DummyEntity();
@@ -65,8 +71,10 @@ public void testMetrics() {
             em.persist(entity);
             em.flush();
             em.createQuery("from DummyEntity e").getResultList();
-            assertEquals(1L, getCounterValueOrNull("hibernate-orm.queries.executed"));
-            assertEquals(1L, getCounterValueOrNull("hibernate-orm.entities.inserted"));
+            assertEquals(1L, getCounterValueOrNull("hibernate.query.executions",
+                    new Tag("entityManagerFactory", PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)));
+            assertEquals(1L, getCounterValueOrNull("hibernate.entities.inserts",
+                    new Tag("entityManagerFactory", PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME)));
         } finally {
             Arc.container().requestContext().terminate();
         }
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java
new file mode 100644
index 0000000000000..cade2c7e2eeee
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateOrmAnnotationsTest.java
@@ -0,0 +1,80 @@
+package io.quarkus.hibernate.orm;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.hibernate.Hibernate;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.deployment.index.IndexingUtil;
+import io.quarkus.hibernate.orm.deployment.HibernateOrmAnnotations;
+
+/**
+ * Test that hardcoded lists of Hibernate ORM annotations stay up-to-date.
+ */
+public class HibernateOrmAnnotationsTest {
+
+    private static final DotName RETENTION = DotName.createSimple(Retention.class.getName());
+    private static final DotName TARGET = DotName.createSimple(Target.class.getName());
+
+    @Test
+    public void testNoMissingPackageLevelAnnotation() throws IOException {
+        Index index = indexHibernateJar();
+
+        Set<DotName> packageLevelHibernateAnnotations = findRuntimeAnnotationsByTargetType(index, ElementType.PACKAGE);
+        packageLevelHibernateAnnotations.removeIf(name -> name.toString().contains(".internal."));
+
+        assertThat(HibernateOrmAnnotations.PACKAGE_ANNOTATIONS)
+                .containsExactlyInAnyOrderElementsOf(packageLevelHibernateAnnotations);
+    }
+
+    private Set<DotName> findRuntimeAnnotationsByTargetType(Index index, ElementType targetType) {
+        Set<DotName> annotations = new HashSet<>();
+        for (AnnotationInstance retentionAnnotation : index.getAnnotations(RETENTION)) {
+            ClassInfo annotation = retentionAnnotation.target().asClass();
+            if (RetentionPolicy.RUNTIME.name().equals(retentionAnnotation.value().asEnum())
+                    && allowsTargetType(annotation, targetType)) {
+                annotations.add(annotation.name());
+            }
+        }
+        return annotations;
+    }
+
+    private boolean allowsTargetType(ClassInfo annotation, ElementType targetType) {
+        AnnotationInstance targetAnnotation = annotation.classAnnotation(TARGET);
+        if (targetAnnotation == null) {
+            // Can target anything
+            return true;
+        }
+
+        List<String> allowedTargetTypes = Arrays.asList(targetAnnotation.value().asEnumArray());
+        return allowedTargetTypes.contains(targetType.name());
+    }
+
+    private Index indexHibernateJar() throws IOException {
+        return IndexingUtil.indexJar(determineHibernateJarLocation());
+    }
+
+    private File determineHibernateJarLocation() {
+        URL url = Hibernate.class.getProtectionDomain().getCodeSource().getLocation();
+        if (!url.getProtocol().equals("file")) {
+            throw new IllegalStateException("Hibernate JAR is not a local file? " + url);
+        }
+        return new File(url.getPath());
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HqlNodeScannerTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HqlNodeScannerTestCase.java
deleted file mode 100644
index 00ee688071c03..0000000000000
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HqlNodeScannerTestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.quarkus.hibernate.orm;
-
-import java.io.FileInputStream;
-import java.net.URL;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import org.hibernate.hql.internal.ast.tree.Node;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.Index;
-import org.jboss.jandex.Indexer;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-@Disabled("not a real test, but you can use it to get all not implementation that need to be added for reflection")
-public class HqlNodeScannerTestCase {
-
-    @Test
-    public void generateAllNodes() throws Exception {
-        URL url = Node.class.getResource("Node.class");
-        String jar = url.getPath().substring(5, url.getPath().lastIndexOf("!"));
-        System.out.println(jar);
-        Indexer indexer = new Indexer();
-        try (ZipInputStream in = new ZipInputStream(new FileInputStream(jar))) {
-            ZipEntry e = in.getNextEntry();
-            while (e != null) {
-                if (e.getName().endsWith(".class")) {
-                    indexer.index(in);
-                }
-                e = in.getNextEntry();
-            }
-        }
-        Index index = indexer.complete();
-        for (ClassInfo i : index.getAllKnownSubclasses(DotName.createSimple(Node.class.getName()))) {
-            System.out.println("simpleConstructor(" + i.name() + ".class);");
-        }
-    }
-
-}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java
new file mode 100644
index 0000000000000..e3ef14bb7c474
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPACacheDisabledTest.java
@@ -0,0 +1,38 @@
+package io.quarkus.hibernate.orm;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+import org.hibernate.Session;
+import org.hibernate.cache.spi.CacheImplementor;
+import org.hibernate.cache.spi.TimestampsCache;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.enhancer.Address;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JPACacheDisabledTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(Address.class))
+            .withConfigurationResource("application.properties")
+            .overrideConfigKey("quarkus.hibernate-orm.second-level-caching-enabled", "false");
+
+    @Inject
+    Session session;
+
+    @Test
+    @Transactional
+    public void testNTransaction() {
+        CacheImplementor cache = (CacheImplementor) session.getSessionFactory().getCache();
+        TimestampsCache timestampsCache = cache.getTimestampsCache();
+        Assertions.assertNull(timestampsCache);
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java
new file mode 100644
index 0000000000000..7654e019669a8
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/JPAFastBootingTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm;
+
+import javax.inject.Inject;
+
+import org.hibernate.Session;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.wildfly.common.Assert;
+
+import io.quarkus.bootstrap.classloading.ClassLoaderLimiter;
+import io.quarkus.hibernate.orm.enhancer.Address;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Let's run some checks to verify that the optimisations we have
+ * to actually boot efficiently are going to survive other patches.
+ */
+public class JPAFastBootingTest {
+
+    private static final ClassLoaderLimiter limitsChecker = ClassLoaderLimiter.builder()
+            .neverLoadedResource("org/hibernate/jpa/orm_2_1.xsd")
+            .neverLoadedResource("org/hibernate/jpa/orm_2_2.xsd")
+            .neverLoadedClassName("org.hibernate.boot.jaxb.internal.MappingBinder")
+            .build();
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(Address.class))
+            .withConfigurationResource("application.properties")
+            .addClassLoaderEventListener(limitsChecker);
+
+    @Inject
+    Session session;
+
+    @Test
+    public void testInjection() {
+        //Check that Hibernate actually started:
+        Assert.assertNotNull(session);
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoEntitiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoEntitiesTest.java
deleted file mode 100644
index dc2a4327af8c4..0000000000000
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/NoEntitiesTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.hibernate.orm;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-
-public class NoEntitiesTest {
-
-    @RegisterExtension
-    static QuarkusUnitTest runner = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
-
-    @Test
-    public void testNoEntities() {
-        // When having no entities, we should still be able to start the application.
-    }
-
-}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java
new file mode 100644
index 0000000000000..b88102e14bd4b
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/UseNamedDatasourceTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class UseNamedDatasourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyEntity.class)
+                    .addAsResource("application-named-datasource.properties", "application.properties"));
+
+    @Inject
+    EntityManager entityManager;
+
+    @Test
+    @Transactional
+    public void testPersistenceAndConfigTest() {
+        MyEntity entity = new MyEntity("name");
+        entityManager.persist(entity);
+
+        MyEntity savedEntity = entityManager.find(MyEntity.class, entity.getId());
+        assertEquals(entity.getName(), savedEntity.getName());
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java
new file mode 100644
index 0000000000000..4a4b3fb8b42bc
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class EntitiesInDefaultPUWithExplicitUnconfiguredDatasourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .assertException(t -> {
+                assertThat(t)
+                        .isInstanceOf(ConfigurationException.class)
+                        .hasMessageContainingAll(
+                                "The datasource 'ds-1' is not configured but the persistence unit '<default>' uses it.",
+                                "To solve this, configure datasource 'ds-1'.",
+                                "Refer to https://quarkus.io/guides/datasource for guidance.");
+            })
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyEntity.class)
+                    .addAsResource("application-default-pu-explicit-unconfigured-datasource.properties",
+                            "application.properties"));
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java
new file mode 100644
index 0000000000000..738e4d1e683a9
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.hibernate.orm.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class EntitiesInDefaultPUWithImplicitUnconfiguredDatasourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .assertException(t -> {
+                assertThat(t)
+                        .isInstanceOf(ConfigurationException.class)
+                        .hasMessageContainingAll(
+                                "Model classes are defined for the default persistence unit <default> but configured datasource <default> not found: the default EntityManagerFactory will not be created. To solve this, configure the default datasource. Refer to https://quarkus.io/guides/datasource for guidance.");
+            })
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyEntity.class))
+            .overrideConfigKey("quarkus.datasource.devservices", "false");
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java
new file mode 100644
index 0000000000000..f0bd91cbfcdd4
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/MyEntity.java
@@ -0,0 +1,31 @@
+package io.quarkus.hibernate.orm.config;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyEntity {
+    @Id
+    private long id;
+
+    private String name;
+
+    public MyEntity() {
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java
new file mode 100644
index 0000000000000..a449b0c486d10
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoEntitiesTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.orm.config;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoEntitiesTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void testNoEntities() {
+        // When having no entities, we should still be able to start the application.
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java
new file mode 100644
index 0000000000000..1839102cb82b5
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.config.namedpu;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class EntitiesInNamedPUWithExplicitUnconfiguredDatasourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .assertException(t -> {
+                assertThat(t)
+                        .isInstanceOf(ConfigurationException.class)
+                        .hasMessageContainingAll(
+                                "The datasource 'ds-1' is not configured but the persistence unit 'pu-1' uses it.",
+                                "To solve this, configure datasource 'ds-1'.",
+                                "Refer to https://quarkus.io/guides/datasource for guidance.");
+            })
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(MyEntity.class.getPackage().getName())
+                    .addAsResource("application-named-pu-explicit-unconfigured-datasource.properties",
+                            "application.properties"));
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java
new file mode 100644
index 0000000000000..0689ef85d4e43
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.hibernate.orm.config.namedpu;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class EntitiesInNamedPUWithoutDatasourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .assertException(t -> {
+                assertThat(t)
+                        .isInstanceOf(ConfigurationException.class)
+                        .hasMessageContainingAll("Datasource must be defined for persistence unit 'pu-1'.");
+            })
+            .overrideConfigKey("quarkus.datasource.devservices", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(MyEntity.class.getPackage().getName())
+                    .addAsResource("application-named-pu-no-datasource.properties",
+                            "application.properties"));
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java
new file mode 100644
index 0000000000000..448718117c48d
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/MyEntity.java
@@ -0,0 +1,31 @@
+package io.quarkus.hibernate.orm.config.namedpu;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyEntity {
+    @Id
+    private long id;
+
+    private String name;
+
+    public MyEntity() {
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/package-info.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/package-info.java
new file mode 100644
index 0000000000000..5ba81b4de3c7d
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/namedpu/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit("pu-1")
+package io.quarkus.hibernate.orm.config.namedpu;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java
new file mode 100644
index 0000000000000..44667eda47b16
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlDefaultValueTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.hibernate.orm.logsql;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.hibernate.orm.MyEntity;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LogSqlFormatSqlDefaultValueTest {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyEntity.class)
+                    .addAsResource("application-log-sql-format-sql-default.properties", "application.properties"));
+
+    @Inject
+    EntityManager em;
+
+    @BeforeEach
+    public void activateRequestContext() {
+        Arc.container().requestContext().activate();
+    }
+
+    @Test
+    public void testFormattedDefaultValue() {
+        Map<String, Object> properties = em.getEntityManagerFactory().getProperties();
+        assertEquals("true", properties.get(AvailableSettings.FORMAT_SQL));
+    }
+
+    @AfterEach
+    public void terminateRequestContext() {
+        Arc.container().requestContext().terminate();
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java
new file mode 100644
index 0000000000000..cd3fad14e232c
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/logsql/LogSqlFormatSqlFalseTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.hibernate.orm.logsql;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.hibernate.orm.MyEntity;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LogSqlFormatSqlFalseTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyEntity.class)
+                    .addAsResource("application-log-sql-format-sql-false.properties", "application.properties"));
+
+    @Inject
+    EntityManager em;
+
+    @BeforeEach
+    public void activateRequestContext() {
+        Arc.container().requestContext().activate();
+    }
+
+    @Test
+    public void testFormattedValue() {
+        Map<String, Object> properties = em.getEntityManagerFactory().getProperties();
+        assertNull(properties.get(AvailableSettings.FORMAT_SQL));
+    }
+
+    @AfterEach
+    public void terminateRequestContext() {
+        Arc.container().requestContext().terminate();
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java
new file mode 100644
index 0000000000000..947a7bb72b72b
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiEntityManagerTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.DefaultEntity;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsCdiEntityManagerTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addClass(User.class)
+                    .addClass(Plane.class)
+                    .addAsResource("application-multiple-persistence-units.properties", "application.properties"));
+
+    @Inject
+    EntityManager defaultEntityManager;
+
+    @Inject
+    @PersistenceUnit("users")
+    EntityManager usersEntityManager;
+
+    @Inject
+    @PersistenceUnit("inventory")
+    EntityManager inventoryEntityManager;
+
+    @Test
+    @Transactional
+    public void testDefault() {
+        DefaultEntity defaultEntity = new DefaultEntity("default");
+        defaultEntityManager.persist(defaultEntity);
+
+        DefaultEntity savedDefaultEntity = defaultEntityManager.find(DefaultEntity.class, defaultEntity.getId());
+        assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUser() {
+        User user = new User("gsmet");
+        usersEntityManager.persist(user);
+
+        User savedUser = usersEntityManager.find(User.class, user.getId());
+        assertEquals(user.getName(), savedUser.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testPlane() {
+        Plane plane = new Plane("Airbus A380");
+        inventoryEntityManager.persist(plane);
+
+        Plane savedPlane = inventoryEntityManager.find(Plane.class, plane.getId());
+        assertEquals(plane.getName(), savedPlane.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUserInInventoryEntityManager() {
+        User user = new User("gsmet");
+        assertThatThrownBy(() -> inventoryEntityManager.persist(user)).isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Unknown entity");
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java
new file mode 100644
index 0000000000000..92aeb61309f5d
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsCdiSessionTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+import org.hibernate.Session;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.DefaultEntity;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsCdiSessionTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addClass(User.class)
+                    .addClass(Plane.class)
+                    .addAsResource("application-multiple-persistence-units.properties", "application.properties"));
+
+    @Inject
+    Session defaultSession;
+
+    @Inject
+    @PersistenceUnit("users")
+    Session usersSession;
+
+    @Inject
+    @PersistenceUnit("inventory")
+    Session inventorySession;
+
+    @Test
+    @Transactional
+    public void testDefault() {
+        DefaultEntity defaultEntity = new DefaultEntity("default");
+        defaultSession.persist(defaultEntity);
+
+        DefaultEntity savedDefaultEntity = defaultSession.get(DefaultEntity.class, defaultEntity.getId());
+        assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUser() {
+        User user = new User("gsmet");
+        usersSession.persist(user);
+
+        User savedUser = usersSession.get(User.class, user.getId());
+        assertEquals(user.getName(), savedUser.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testPlane() {
+        Plane plane = new Plane("Airbus A380");
+        inventorySession.persist(plane);
+
+        Plane savedPlane = inventorySession.get(Plane.class, plane.getId());
+        assertEquals(plane.getName(), savedPlane.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUserInInventorySession() {
+        User user = new User("gsmet");
+        assertThatThrownBy(() -> inventorySession.persist(user)).isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Unknown entity");
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java
new file mode 100644
index 0000000000000..8b9be29bb75d1
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsClassLevelAnnotationTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsClassLevelAnnotationTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(IllegalStateException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(EntityWithClassLevelPersistenceUnit.class)
+                    .addAsResource("application-multiple-persistence-units.properties",
+                            "application.properties"));
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+
+    @Entity
+    @PersistenceUnit("inventory")
+    public class EntityWithClassLevelPersistenceUnit {
+
+        private long id;
+
+        private String name;
+
+        public EntityWithClassLevelPersistenceUnit() {
+        }
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "planeSeq")
+        public long getId() {
+            return id;
+        }
+
+        public void setId(long id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java
new file mode 100644
index 0000000000000..ecf568a277f67
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsImportSqlHotReloadScriptTest.java
@@ -0,0 +1,53 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.hamcrest.Matchers.is;
+
+import java.util.function.Function;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.shared.SharedEntity;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user.User;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user.subpackage.OtherUserInSubPackage;
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+/**
+ * See https://github.com/quarkusio/quarkus/issues/13722
+ */
+public class MultiplePersistenceUnitsImportSqlHotReloadScriptTest {
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(Plane.class.getPackage().getName())
+                    .addPackage(SharedEntity.class.getPackage().getName())
+                    .addPackage(User.class.getPackage().getName())
+                    .addPackage(OtherUserInSubPackage.class.getPackage().getName())
+                    .addClass(MultiplePersistenceUnitsSqlLoadScriptTestResource.class)
+                    .addAsResource("application-multiple-persistence-units-annotations.properties", "application.properties")
+                    .addAsResource("import-sharedentity.sql", "import.sql"));
+
+    @Test
+    public void testImportSqlScriptHotReload() {
+        String expectedName = "import.sql load script entity";
+        assertBodyIs(expectedName);
+
+        String hotReloadExpectedName = "modified import.sql load script entity";
+        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace(expectedName, hotReloadExpectedName);
+            }
+        });
+        assertBodyIs(hotReloadExpectedName);
+    }
+
+    private void assertBodyIs(String expectedBody) {
+        RestAssured.when().get("/multiple-persistence-units/orm-sql-load-script/2").then().body(is(expectedBody));
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java
new file mode 100644
index 0000000000000..04080ef8d7f23
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsInconsistentStorageEnginesTest.java
@@ -0,0 +1,40 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import org.hibernate.dialect.H2Dialect;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.DefaultEntity;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsInconsistentStorageEnginesTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(ConfigurationException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(User.class)
+                    .addClass(DefaultEntity.class)
+                    .addClass(User.class)
+                    .addClass(Plane.class)
+                    .addAsResource("application-multiple-persistence-units-inconsistent-storage-engines.properties",
+                            "application.properties"));
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+
+    /**
+     * This is just to have the dialect matching MySQL and trigger the MySQL + storage engines check.
+     */
+    public static class H2DialectWithMySQLInTheName extends H2Dialect {
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
new file mode 100644
index 0000000000000..3f3242315668d
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsPackageAnnotationsTest.java
@@ -0,0 +1,100 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.shared.SharedEntity;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user.User;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user.subpackage.OtherUserInSubPackage;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsPackageAnnotationsTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(Plane.class.getPackage().getName())
+                    .addPackage(SharedEntity.class.getPackage().getName())
+                    .addPackage(User.class.getPackage().getName())
+                    .addPackage(OtherUserInSubPackage.class.getPackage().getName())
+                    .addAsResource("application-multiple-persistence-units-annotations.properties", "application.properties"));
+
+    @Inject
+    EntityManager defaultEntityManager;
+
+    @Inject
+    @PersistenceUnit("users")
+    EntityManager usersEntityManager;
+
+    @Inject
+    @PersistenceUnit("inventory")
+    EntityManager inventoryEntityManager;
+
+    @Test
+    @Transactional
+    public void testDefault() {
+        SharedEntity defaultEntity = new SharedEntity("default");
+        defaultEntityManager.persist(defaultEntity);
+
+        SharedEntity savedDefaultEntity = defaultEntityManager.find(SharedEntity.class, defaultEntity.getId());
+        assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+
+        SharedEntity defaultEntity2 = new SharedEntity("default2");
+        usersEntityManager.persist(defaultEntity2);
+
+        SharedEntity savedDefaultEntity2 = usersEntityManager.find(SharedEntity.class, defaultEntity2.getId());
+        assertEquals(defaultEntity2.getName(), savedDefaultEntity2.getName());
+
+        SharedEntity defaultEntity3 = new SharedEntity("default3");
+        inventoryEntityManager.persist(defaultEntity3);
+
+        SharedEntity savedDefaultEntity3 = inventoryEntityManager.find(SharedEntity.class, defaultEntity3.getId());
+        assertEquals(defaultEntity3.getName(), savedDefaultEntity3.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUser() {
+        User user = new User("gsmet");
+        usersEntityManager.persist(user);
+
+        User savedUser = usersEntityManager.find(User.class, user.getId());
+        assertEquals(user.getName(), savedUser.getName());
+
+        OtherUserInSubPackage otherUserInSubPackage = new OtherUserInSubPackage("other-user");
+        usersEntityManager.persist(otherUserInSubPackage);
+
+        OtherUserInSubPackage savedOtherUserInSubPackage = usersEntityManager.find(OtherUserInSubPackage.class,
+                otherUserInSubPackage.getId());
+        assertEquals(savedOtherUserInSubPackage.getName(), savedOtherUserInSubPackage.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testPlane() {
+        Plane plane = new Plane("Airbus A380");
+        inventoryEntityManager.persist(plane);
+
+        Plane savedPlane = inventoryEntityManager.find(Plane.class, plane.getId());
+        assertEquals(plane.getName(), savedPlane.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUserInInventoryEntityManager() {
+        User user = new User("gsmet");
+        assertThatThrownBy(() -> inventoryEntityManager.persist(user)).isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Unknown entity");
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
new file mode 100644
index 0000000000000..b5de7c5613f60
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionEntityManagerTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsResourceInjectionEntityManagerTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(User.class)
+                    .addClass(Plane.class)
+                    .addAsResource("application-multiple-persistence-units.properties", "application.properties"));
+
+    @PersistenceContext(unitName = "users")
+    EntityManager usersEntityManager;
+
+    @PersistenceContext(unitName = "inventory")
+    EntityManager inventoryEntityManager;
+
+    @Test
+    @Transactional
+    public void testUser() {
+        User user = new User("gsmet");
+        usersEntityManager.persist(user);
+
+        User savedUser = usersEntityManager.find(User.class, user.getId());
+        assertEquals(user.getName(), savedUser.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testPlane() {
+        Plane plane = new Plane("Airbus A380");
+        inventoryEntityManager.persist(plane);
+
+        Plane savedPlane = inventoryEntityManager.find(Plane.class, plane.getId());
+        assertEquals(plane.getName(), savedPlane.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUserInInventoryEntityManager() {
+        User user = new User("gsmet");
+        assertThatThrownBy(() -> inventoryEntityManager.persist(user)).isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Unknown entity");
+    }
+
+    @Test
+    @Transactional
+    public void testAccessBothPersistenceUnits() {
+        testUser();
+        testPlane();
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
new file mode 100644
index 0000000000000..517bd845e485b
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsResourceInjectionSessionTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
+
+import org.hibernate.Session;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsResourceInjectionSessionTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(User.class)
+                    .addClass(Plane.class)
+                    .addAsResource("application-multiple-persistence-units.properties", "application.properties"));
+
+    @PersistenceContext(unitName = "users")
+    Session usersSession;
+
+    @PersistenceContext(unitName = "inventory")
+    Session inventorySession;
+
+    @Test
+    @Transactional
+    public void testUser() {
+        User user = new User("gsmet");
+        usersSession.persist(user);
+
+        User savedUser = usersSession.get(User.class, user.getId());
+        assertEquals(user.getName(), savedUser.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testPlane() {
+        Plane plane = new Plane("Airbus A380");
+        inventorySession.persist(plane);
+
+        Plane savedPlane = inventorySession.get(Plane.class, plane.getId());
+        assertEquals(plane.getName(), savedPlane.getName());
+    }
+
+    @Test
+    @Transactional
+    public void testUserInInventorySession() {
+        User user = new User("gsmet");
+        assertThatThrownBy(() -> inventorySession.persist(user)).isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("Unknown entity");
+    }
+
+    @Test
+    @Transactional
+    public void testAccessBothPersistenceUnits() {
+        testUser();
+        testPlane();
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java
new file mode 100644
index 0000000000000..3d6a2f7d73ed1
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsSqlLoadScriptTestResource.java
@@ -0,0 +1,32 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.shared.SharedEntity;
+
+@Path("/multiple-persistence-units/orm-sql-load-script")
+public class MultiplePersistenceUnitsSqlLoadScriptTestResource {
+
+    public static final String NO_ENTITY_MESSAGE = "no entity";
+
+    @Inject
+    EntityManager em;
+
+    @GET
+    @Path("/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String getName(@PathParam("id") long id) {
+        SharedEntity entity = em.find(SharedEntity.class, id);
+        if (entity != null) {
+            return entity.getName();
+        }
+
+        return NO_ENTITY_MESSAGE;
+    }
+}
\ No newline at end of file
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java
new file mode 100644
index 0000000000000..cc84cce4ec5bd
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUnaffectedEntitiesTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+import org.jboss.logmanager.formatters.PatternFormatter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.DefaultEntity;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory.Plane;
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsUnaffectedEntitiesTest {
+
+    private static final Formatter LOG_FORMATTER = new PatternFormatter("%s");
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addClass(User.class)
+                    .addClass(Plane.class)
+                    .addAsResource("application-multiple-persistence-units-unaffected-entities.properties",
+                            "application.properties"))
+            // Expect a warning on startup
+            .setLogRecordPredicate(
+                    record -> record.getMessage().contains("Could not find a suitable persistence unit for model classes"))
+            .assertLogRecords(records -> assertThat(records)
+                    .hasSize(1)
+                    .element(0).satisfies(record -> {
+                        assertThat(record.getLevel()).isEqualTo(Level.WARNING);
+                        assertThat(LOG_FORMATTER.formatMessage(record))
+                                .contains(DefaultEntity.class.getName())
+                                .contains(User.class.getName());
+                    }));
+
+    @Inject
+    @PersistenceUnit("inventory")
+    EntityManager inventoryEntityManager;
+
+    @Test
+    @Transactional
+    public void testPlane() {
+        Plane plane = new Plane("Airbus A380");
+        inventoryEntityManager.persist(plane);
+
+        Plane savedPlane = inventoryEntityManager.find(Plane.class, plane.getId());
+        assertEquals(plane.getName(), savedPlane.getName());
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java
new file mode 100644
index 0000000000000..06958381d8829
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/MultiplePersistenceUnitsUndefinedPackagesTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user.User;
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsUndefinedPackagesTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(ConfigurationException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(User.class)
+                    .addAsResource("application-multiple-persistence-units-undefined-packages.properties",
+                            "application.properties"));
+
+    @Test
+    public void testInvalidConfiguration() {
+        // deployment exception should happen first
+        Assertions.fail();
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java
new file mode 100644
index 0000000000000..0e30523433e30
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/Plane.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.inventory;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Plane {
+
+    private long id;
+
+    private String name;
+
+    public Plane() {
+    }
+
+    public Plane(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "planeSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Plane:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/package-info.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/package-info.java
new file mode 100644
index 0000000000000..095336c02b6b6
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/inventory/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit("inventory")
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.inventory;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java
new file mode 100644
index 0000000000000..3d6ce1d1fd7de
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/SharedEntity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.shared;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class SharedEntity {
+
+    private long id;
+
+    private String name;
+
+    public SharedEntity() {
+    }
+
+    public SharedEntity(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Plane:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/package-info.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/package-info.java
new file mode 100644
index 0000000000000..05cf20a37dace
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/shared/package-info.java
@@ -0,0 +1,6 @@
+@PersistenceUnit(PersistenceUnit.DEFAULT)
+@PersistenceUnit("users")
+@PersistenceUnit("inventory")
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.shared;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
\ No newline at end of file
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java
new file mode 100644
index 0000000000000..833bc4bc007e2
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/User.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+
+    private long id;
+
+    private String name;
+
+    public User() {
+    }
+
+    public User(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "userSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "User:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/package-info.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/package-info.java
new file mode 100644
index 0000000000000..5a03af94963ad
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit("users")
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java
new file mode 100644
index 0000000000000..23bbff849c261
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/annotation/user/subpackage/OtherUserInSubPackage.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.annotation.user.subpackage;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class OtherUserInSubPackage {
+
+    private long id;
+
+    private String name;
+
+    public OtherUserInSubPackage() {
+    }
+
+    public OtherUserInSubPackage(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "userSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "User:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java
new file mode 100644
index 0000000000000..2728a81561194
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/DefaultEntity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.config;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class DefaultEntity {
+
+    private long id;
+
+    private String name;
+
+    public DefaultEntity() {
+    }
+
+    public DefaultEntity(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Plane:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java
new file mode 100644
index 0000000000000..d750e05c35492
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/inventory/Plane.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Plane {
+
+    private long id;
+
+    private String name;
+
+    public Plane() {
+    }
+
+    public Plane(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "planeSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Plane:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java
new file mode 100644
index 0000000000000..bc14b159e90ed
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/multiplepersistenceunits/model/config/user/User.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+
+    private long id;
+
+    private String name;
+
+    public User() {
+    }
+
+    public User(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "userSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "User:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/CustomImplicitNamingStrategy.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/CustomImplicitNamingStrategy.java
index 7687491a12678..3b699303d271c 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/CustomImplicitNamingStrategy.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/naming/CustomImplicitNamingStrategy.java
@@ -1,5 +1,7 @@
 package io.quarkus.hibernate.orm.naming;
 
+import java.util.Locale;
+
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.ImplicitEntityNameSource;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
@@ -7,7 +9,7 @@
 public class CustomImplicitNamingStrategy extends ImplicitNamingStrategyJpaCompliantImpl {
     @Override
     public Identifier determinePrimaryTableName(ImplicitEntityNameSource source) {
-        return toIdentifier("TBL_" + source.getEntityNaming().getEntityName().replace('.', '_').toUpperCase(),
+        return toIdentifier("TBL_" + source.getEntityNaming().getEntityName().replace('.', '_').toUpperCase(Locale.ROOT),
                 source.getBuildingContext());
     }
 }
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java
new file mode 100644
index 0000000000000..9f83eee305db2
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity1.java
@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.orm.packages;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class ChildEntity1 {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    private String name;
+
+    public ChildEntity1() {
+    }
+
+    @Override
+    public String toString() {
+        return "ChildEntity1:" + name;
+    }
+
+    public ChildEntity1(String name) {
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java
new file mode 100644
index 0000000000000..665d572744948
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ChildEntity2.java
@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.orm.packages;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class ChildEntity2 {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    private String name;
+
+    public ChildEntity2() {
+    }
+
+    @Override
+    public String toString() {
+        return "ChildEntity1:" + name;
+    }
+
+    public ChildEntity2(String name) {
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java
new file mode 100644
index 0000000000000..8272eb753d774
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/PackageLevelAnnotationTest.java
@@ -0,0 +1,73 @@
+package io.quarkus.hibernate.orm.packages;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class PackageLevelAnnotationTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(PackageLevelAnnotationTest.class.getPackage())
+                    .addAsResource("application.properties"));
+
+    @Inject
+    EntityManager entityManager;
+
+    @Inject
+    UserTransaction transaction;
+
+    @Test
+    public void test() {
+        // If we get here, the package-level @AnyMetaDef was correctly detected:
+        // otherwise, we would have had a failure on ORM bootstrap.
+
+        ParentEntity parent1 = new ParentEntity("parent1");
+        ParentEntity parent2 = new ParentEntity("parent2");
+        ChildEntity1 child1 = new ChildEntity1("child1");
+        ChildEntity2 child2 = new ChildEntity2("child2");
+        parent1.setChild(child1);
+        parent2.setChild(child2);
+
+        inTransaction(() -> {
+            entityManager.persist(child1);
+            entityManager.persist(child2);
+            entityManager.persist(parent1);
+            entityManager.persist(parent2);
+        });
+
+        // Check that the @Any relation works correctly, just in case
+        inTransaction(() -> {
+            ParentEntity savedParent1 = entityManager.find(ParentEntity.class, parent1.getId());
+            assertThat(savedParent1.getChild()).isInstanceOf(ChildEntity1.class);
+            ParentEntity savedParent2 = entityManager.find(ParentEntity.class, parent2.getId());
+            assertThat(savedParent2.getChild()).isInstanceOf(ChildEntity2.class);
+        });
+    }
+
+    private void inTransaction(Runnable runnable) {
+        try {
+            transaction.begin();
+            try {
+                runnable.run();
+                transaction.commit();
+            } catch (Exception e) {
+                transaction.rollback();
+            }
+        } catch (SystemException | NotSupportedException e) {
+            throw new IllegalStateException("Transaction exception", e);
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java
new file mode 100644
index 0000000000000..747a825970d3a
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/ParentEntity.java
@@ -0,0 +1,59 @@
+package io.quarkus.hibernate.orm.packages;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+
+import org.hibernate.annotations.Any;
+
+@Entity
+public class ParentEntity {
+
+    @Id
+    @GeneratedValue
+    private long id;
+
+    private String name;
+
+    @Any(metaDef = "childrenAnyMetaDef", metaColumn = @Column(name = "child_type"))
+    @JoinColumn(name = "child_id")
+    private Object child;
+
+    public ParentEntity() {
+    }
+
+    public ParentEntity(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "ParentEntity:" + name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Object getChild() {
+        return child;
+    }
+
+    public void setChild(Object child) {
+        this.child = child;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/package-info.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/package-info.java
new file mode 100644
index 0000000000000..419886f36205b
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/packages/package-info.java
@@ -0,0 +1,8 @@
+@AnyMetaDef(name = "childrenAnyMetaDef", idType = "long", metaType = "string", metaValues = {
+        @MetaValue(targetEntity = ChildEntity1.class, value = "child1"),
+        @MetaValue(targetEntity = ChildEntity2.class, value = "child2")
+})
+package io.quarkus.hibernate.orm.packages;
+
+import org.hibernate.annotations.AnyMetaDef;
+import org.hibernate.annotations.MetaValue;
\ No newline at end of file
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java
new file mode 100644
index 0000000000000..406eb305b2d58
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessFieldTypesTest.java
@@ -0,0 +1,224 @@
+package io.quarkus.hibernate.orm.publicfields;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDate;
+
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.hibernate.Hibernate;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Checks that public field access is correctly replaced with getter/setter calls,
+ * regardless of the field type.
+ */
+public class PublicFieldAccessFieldTypesTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyEntity.class)
+                    .addClass(FieldAccessEnhancedDelegate.class))
+            .withConfigurationResource("application.properties");
+
+    @Inject
+    EntityManager em;
+
+    @Inject
+    UserTransaction transaction;
+
+    @Test
+    public void testFieldAccess()
+            throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException,
+            RollbackException {
+        // Ideally we'd write a @ParamaterizedTest and pass the delegates as parameters,
+        // but we cannot do that due to JUnit using a different classloader than the test.
+        for (FieldAccessEnhancedDelegate delegate : FieldAccessEnhancedDelegate.values()) {
+            doTestFieldAccess(delegate);
+        }
+    }
+
+    private void doTestFieldAccess(FieldAccessEnhancedDelegate delegate)
+            throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException,
+            RollbackException {
+        MyEntity entity = new MyEntity();
+
+        transaction.begin();
+        em.persist(entity);
+        transaction.commit();
+
+        transaction.begin();
+        entity = em.getReference(MyEntity.class, entity.id);
+        // Initially the assertion doesn't pass: the value was not set yet
+        AssertionError expected = null;
+        try {
+            delegate.assertValue(entity);
+        } catch (AssertionError e) {
+            expected = e;
+        }
+        if (expected == null) {
+            throw new IllegalStateException("This test is buggy: assertions should not pass at this point.");
+        }
+        transaction.rollback();
+
+        transaction.begin();
+        entity = em.getReference(MyEntity.class, entity.id);
+        // Since field access is replaced with accessor calls,
+        // we expect this change to be detected by dirty tracking and persisted.
+        delegate.setValue(entity);
+        transaction.commit();
+
+        transaction.begin();
+        entity = em.getReference(MyEntity.class, entity.id);
+        // We're working on an uninitialized proxy.
+        assertThat(entity).returns(false, Hibernate::isInitialized);
+        // The above should have persisted a value that passes the assertion.
+        delegate.assertValue(entity);
+        // Accessing the value should trigger initialization of the proxy.
+        assertThat(entity).returns(true, Hibernate::isInitialized);
+        transaction.rollback();
+    }
+
+    @Entity
+    public static class MyEntity {
+
+        @Id
+        @GeneratedValue
+        public long id;
+
+        public LocalDate object;
+        public boolean boolean_;
+        public int int_;
+        public long long_;
+        public float float_;
+        public double double_;
+        public short short_;
+        public char char_;
+        public byte byte_;
+
+    }
+
+    private enum FieldAccessEnhancedDelegate {
+
+        OBJECT {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.object = LocalDate.of(2017, 11, 7);
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.object).isEqualTo(LocalDate.of(2017, 11, 7));
+            }
+        },
+        BOOLEAN {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.boolean_ = true;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.boolean_).isTrue();
+            }
+        },
+        INTEGER {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.int_ = 42;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.int_).isEqualTo(42);
+            }
+        },
+        LONG {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.long_ = 42L;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.long_).isEqualTo(42L);
+            }
+        },
+        FLOAT {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.float_ = 42f;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.float_).isEqualTo(42f);
+            }
+        },
+        DOUBLE {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.double_ = 42d;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.double_).isEqualTo(42d);
+            }
+        },
+        SHORT {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.short_ = (short) 42;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.short_).isEqualTo((short) 42);
+            }
+        },
+        CHAR {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.char_ = 'a';
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.char_).isEqualTo('a');
+            }
+        },
+        BYTE {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.byte_ = (byte) 42;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.byte_).isEqualTo((byte) 42);
+            }
+        };
+
+        public abstract void setValue(MyEntity entity);
+
+        public abstract void assertValue(MyEntity entity);
+
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java
new file mode 100644
index 0000000000000..be03cf81d7ce4
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/publicfields/PublicFieldAccessInheritanceTest.java
@@ -0,0 +1,165 @@
+package io.quarkus.hibernate.orm.publicfields;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.hibernate.Hibernate;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Checks that public field access is correctly replaced with getter/setter calls,
+ * regardless of where the field is declared in the class hierarchy.
+ */
+public class PublicFieldAccessInheritanceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyMappedSuperclass.class)
+                    .addClass(MyAbstractEntity.class)
+                    .addClass(MyConcreteEntity.class)
+                    .addClass(FieldAccessEnhancedDelegate.class))
+            .withConfigurationResource("application.properties");
+
+    @Inject
+    EntityManager em;
+
+    @Inject
+    UserTransaction transaction;
+
+    @Test
+    public void testFieldAccess()
+            throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException,
+            RollbackException {
+        // Ideally we'd write a @ParamaterizedTest and pass the delegates as parameters,
+        // but we cannot do that due to JUnit using a different classloader than the test.
+        for (FieldAccessEnhancedDelegate delegate : FieldAccessEnhancedDelegate.values()) {
+            doTestFieldAccess(delegate);
+        }
+    }
+
+    private void doTestFieldAccess(FieldAccessEnhancedDelegate delegate)
+            throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException,
+            RollbackException {
+        MyConcreteEntity entity = new MyConcreteEntity();
+
+        transaction.begin();
+        em.persist(entity);
+        transaction.commit();
+
+        transaction.begin();
+        entity = em.getReference(MyConcreteEntity.class, entity.id);
+        // Initially the assertion doesn't pass: the value was not set yet
+        AssertionError expected = null;
+        try {
+            delegate.assertValue(entity);
+        } catch (AssertionError e) {
+            expected = e;
+        }
+        if (expected == null) {
+            throw new IllegalStateException("This test is buggy: assertions should not pass at this point.");
+        }
+        transaction.rollback();
+
+        transaction.begin();
+        entity = em.getReference(MyConcreteEntity.class, entity.id);
+        // Since field access is replaced with accessor calls,
+        // we expect this change to be detected by dirty tracking and persisted.
+        delegate.setValue(entity);
+        transaction.commit();
+
+        transaction.begin();
+        entity = em.getReference(MyConcreteEntity.class, entity.id);
+        // We're working on an uninitialized proxy.
+        assertThat(entity).returns(false, Hibernate::isInitialized);
+        // The above should have persisted a value that passes the assertion.
+        delegate.assertValue(entity);
+        // Accessing the value should trigger initialization of the proxy.
+        assertThat(entity).returns(true, Hibernate::isInitialized);
+        transaction.rollback();
+    }
+
+    @MappedSuperclass
+    public static class MyMappedSuperclass {
+
+        public Long mappedSuperclassField;
+
+    }
+
+    @Entity(name = "abstract")
+    public static abstract class MyAbstractEntity extends MyMappedSuperclass {
+
+        @Id
+        @GeneratedValue
+        public long id;
+
+        public Long abstractEntityField;
+
+    }
+
+    @Entity(name = "concrete")
+    public static class MyConcreteEntity extends MyAbstractEntity {
+
+        public Long concreteEntityField;
+
+    }
+
+    private enum FieldAccessEnhancedDelegate {
+
+        MAPPED_SUPERCLASS {
+            @Override
+            public void setValue(MyConcreteEntity entity) {
+                entity.mappedSuperclassField = 42L;
+            }
+
+            @Override
+            public void assertValue(MyConcreteEntity entity) {
+                assertThat(entity.mappedSuperclassField).isEqualTo(42L);
+            }
+        },
+        ABSTRACT_ENTITY {
+            @Override
+            public void setValue(MyConcreteEntity entity) {
+                entity.abstractEntityField = 42L;
+            }
+
+            @Override
+            public void assertValue(MyConcreteEntity entity) {
+                assertThat(entity.abstractEntityField).isEqualTo(42L);
+            }
+        },
+        CONCRETE_ENTITY {
+            @Override
+            public void setValue(MyConcreteEntity entity) {
+                entity.concreteEntityField = 42L;
+            }
+
+            @Override
+            public void assertValue(MyConcreteEntity entity) {
+                assertThat(entity.concreteEntityField).isEqualTo(42L);
+            }
+        };
+
+        public abstract void setValue(MyConcreteEntity entity);
+
+        public abstract void assertValue(MyConcreteEntity entity);
+
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java
new file mode 100644
index 0000000000000..2bf67932d09a7
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/DefaultEntity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.orm.singlepersistenceunit;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class DefaultEntity {
+
+    private long id;
+
+    private String name;
+
+    public DefaultEntity() {
+    }
+
+    public DefaultEntity(String name) {
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Plane:" + name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java
new file mode 100644
index 0000000000000..94a4d85c669ff
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiEntityManagerTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.singlepersistenceunit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitCdiEntityManagerTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Inject
+    EntityManager entityManager;
+
+    @Test
+    @Transactional
+    public void test() {
+        DefaultEntity defaultEntity = new DefaultEntity("default");
+        entityManager.persist(defaultEntity);
+
+        DefaultEntity savedDefaultEntity = entityManager.find(DefaultEntity.class, defaultEntity.getId());
+        assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java
new file mode 100644
index 0000000000000..6af04765baa90
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitCdiSessionTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.singlepersistenceunit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+import org.hibernate.Session;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitCdiSessionTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Inject
+    Session session;
+
+    @Test
+    @Transactional
+    public void test() {
+        DefaultEntity defaultEntity = new DefaultEntity("default");
+        session.persist(defaultEntity);
+
+        DefaultEntity savedDefaultEntity = session.get(DefaultEntity.class, defaultEntity.getId());
+        assertEquals(defaultEntity.getName(), savedDefaultEntity.getName());
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java
new file mode 100644
index 0000000000000..05d1541453089
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionEntityManagerTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.singlepersistenceunit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitResourceInjectionEntityManagerTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addAsResource("application.properties"));
+
+    @PersistenceContext
+    EntityManager entityManager;
+
+    @Test
+    @Transactional
+    public void test() {
+        DefaultEntity entity = new DefaultEntity("gsmet");
+        entityManager.persist(entity);
+
+        DefaultEntity savedEntity = entityManager.find(DefaultEntity.class, entity.getId());
+        assertEquals(entity.getName(), savedEntity.getName());
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java
new file mode 100644
index 0000000000000..278a49f7fd19f
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/singlepersistenceunit/SinglePersistenceUnitResourceInjectionSessionTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.singlepersistenceunit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.persistence.PersistenceContext;
+import javax.transaction.Transactional;
+
+import org.hibernate.Session;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitResourceInjectionSessionTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addAsResource("application.properties"));
+
+    @PersistenceContext
+    Session session;
+
+    @Test
+    @Transactional
+    public void test() {
+        DefaultEntity entity = new DefaultEntity("gsmet");
+        session.persist(entity);
+
+        DefaultEntity savedEntity = session.get(DefaultEntity.class, entity.getId());
+        assertEquals(entity.getName(), savedEntity.getName());
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java
new file mode 100644
index 0000000000000..ee56b96781249
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/IntroducingDefaultImportScriptTestCase.java
@@ -0,0 +1,30 @@
+package io.quarkus.hibernate.orm.sql_load_script;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.MyEntity;
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class IntroducingDefaultImportScriptTestCase {
+
+    @RegisterExtension
+    static QuarkusDevModeTest runner = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("application.properties")
+                    .addClasses(SqlLoadScriptTestResource.class, MyEntity.class));
+
+    @Test
+    public void testAddNewImportSql() {
+        RestAssured.when().get("/orm-sql-load-script/1").then().body(Matchers.is(SqlLoadScriptTestResource.NO_ENTITY_MESSAGE));
+
+        runner.addResourceFile("import.sql", "INSERT INTO MyEntity(id, name) VALUES(1, 'NEW SCRIPT');");
+
+        RestAssured.when().get("/orm-sql-load-script/1").then().body(Matchers.is("NEW SCRIPT"));
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java
index 62dc32d809fa5..2308e1d2072e2 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/sql_load_script/SqlLoadScriptTestResource.java
@@ -10,6 +10,8 @@
 @Path("/orm-sql-load-script")
 public class SqlLoadScriptTestResource {
 
+    public static final String NO_ENTITY_MESSAGE = "no entity";
+
     @Inject
     EntityManager em;
 
@@ -22,6 +24,6 @@ public String getName(@PathParam("id") long id) {
             return entity.getName();
         }
 
-        return "no entity";
+        return NO_ENTITY_MESSAGE;
     }
 }
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java
new file mode 100644
index 0000000000000..ff9843b490874
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/AbstractTransactionLifecycleTest.java
@@ -0,0 +1,238 @@
+package io.quarkus.hibernate.orm.transaction;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import javax.persistence.EntityManager;
+import javax.persistence.ParameterMode;
+import javax.persistence.StoredProcedureQuery;
+
+import org.hibernate.BaseSessionEventListener;
+import org.hibernate.Session;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.arc.Arc;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Check transaction lifecycle, including session flushes, the closing of the session,
+ * and the release of JDBC resources.
+ */
+public abstract class AbstractTransactionLifecycleTest {
+
+    private static final String INITIAL_NAME = "Initial name";
+    private static final String UPDATED_NAME = "Updated name";
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(SimpleEntity.class)
+                    .addAsResource("application.properties"))
+            // Expect no warnings (in particular from Agroal)
+            .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue()
+                    // Ignore this particular warning when building with Java 8: it's not relevant to this test.
+                    && !record.getMessage().contains("Using Java versions older than 11 to build Quarkus applications"))
+            .assertLogRecords(records -> assertThat(records)
+                    .extracting(LogRecord::getMessage) // This is just to get meaningful error messages, as LogRecord doesn't have a toString()
+                    .isEmpty());
+
+    @BeforeAll
+    public static void installStoredProcedure() throws SQLException {
+        AgroalDataSource dataSource = Arc.container().instance(AgroalDataSource.class).get();
+        try (Connection conn = dataSource.getConnection()) {
+            try (Statement st = conn.createStatement()) {
+                st.execute("CREATE ALIAS " + MyStoredProcedure.NAME
+                        + " FOR \"" + MyStoredProcedure.class.getName() + ".execute\"");
+            }
+        }
+    }
+
+    @Test
+    public void testLifecycle() {
+        long id = 1L;
+        TestCRUD crud = crud();
+
+        ValueAndExecutionMetadata<Void> created = crud.create(id, INITIAL_NAME);
+        checkPostConditions(created,
+                LifecycleOperation.FLUSH, LifecycleOperation.STATEMENT, // update
+                expectDoubleFlush() ? LifecycleOperation.FLUSH : null,
+                LifecycleOperation.TRANSACTION_COMPLETION);
+
+        ValueAndExecutionMetadata<String> retrieved = crud.retrieve(id);
+        checkPostConditions(retrieved,
+                LifecycleOperation.STATEMENT, // select
+                LifecycleOperation.FLUSH,
+                expectDoubleFlush() ? LifecycleOperation.FLUSH : null,
+                LifecycleOperation.TRANSACTION_COMPLETION);
+        assertThat(retrieved.value).isEqualTo(INITIAL_NAME);
+
+        ValueAndExecutionMetadata<Void> updated = crud.update(id, UPDATED_NAME);
+        checkPostConditions(updated,
+                LifecycleOperation.STATEMENT, // select
+                LifecycleOperation.FLUSH, LifecycleOperation.STATEMENT, // update
+                expectDoubleFlush() ? LifecycleOperation.FLUSH : null,
+                LifecycleOperation.TRANSACTION_COMPLETION);
+
+        retrieved = crud.retrieve(id);
+        checkPostConditions(retrieved,
+                LifecycleOperation.STATEMENT, // select
+                LifecycleOperation.FLUSH,
+                expectDoubleFlush() ? LifecycleOperation.FLUSH : null,
+                LifecycleOperation.TRANSACTION_COMPLETION);
+        assertThat(retrieved.value).isEqualTo(UPDATED_NAME);
+
+        // See https://github.com/quarkusio/quarkus/issues/13273
+        ValueAndExecutionMetadata<String> calledStoredProcedure = crud.callStoredProcedure(id);
+        checkPostConditions(calledStoredProcedure,
+                // Strangely, calling a stored procedure isn't considered as a statement for Hibernate ORM listeners
+                LifecycleOperation.TRANSACTION_COMPLETION);
+        assertThat(calledStoredProcedure.value).isEqualTo(MyStoredProcedure.execute(id));
+
+        ValueAndExecutionMetadata<Void> deleted = crud.delete(id);
+        checkPostConditions(deleted,
+                LifecycleOperation.STATEMENT, // select
+                LifecycleOperation.FLUSH, LifecycleOperation.STATEMENT, // delete
+                // No double flush here, since there's nothing in the session after the first flush.
+                LifecycleOperation.TRANSACTION_COMPLETION);
+
+        retrieved = crud.retrieve(id);
+        checkPostConditions(retrieved,
+                LifecycleOperation.STATEMENT, // select
+                LifecycleOperation.TRANSACTION_COMPLETION);
+        assertThat(retrieved.value).isNull();
+    }
+
+    protected abstract TestCRUD crud();
+
+    protected abstract boolean expectDoubleFlush();
+
+    private void checkPostConditions(ValueAndExecutionMetadata<?> result, LifecycleOperation... expectedOperationsArray) {
+        List<LifecycleOperation> expectedOperations = new ArrayList<>();
+        Collections.addAll(expectedOperations, expectedOperationsArray);
+        expectedOperations.removeIf(Objects::isNull);
+        // No extra statements or flushes
+        assertThat(result.listener.operations)
+                .containsExactlyElementsOf(expectedOperations);
+        // Session was closed automatically
+        assertThat(result.sessionImplementor).returns(true, SharedSessionContractImplementor::isClosed);
+    }
+
+    public abstract static class TestCRUD {
+        public ValueAndExecutionMetadata<Void> create(long id, String name) {
+            return inTransaction(entityManager -> {
+                SimpleEntity entity = new SimpleEntity(name);
+                entity.setId(id);
+                entityManager.persist(entity);
+                return null;
+            });
+        }
+
+        public ValueAndExecutionMetadata<String> retrieve(long id) {
+            return inTransaction(entityManager -> {
+                SimpleEntity entity = entityManager.find(SimpleEntity.class, id);
+                return entity == null ? null : entity.getName();
+            });
+        }
+
+        public ValueAndExecutionMetadata<String> callStoredProcedure(long id) {
+            return inTransaction(entityManager -> {
+                StoredProcedureQuery storedProcedure = entityManager.createStoredProcedureQuery(MyStoredProcedure.NAME);
+                storedProcedure.registerStoredProcedureParameter(0, Long.class, ParameterMode.IN);
+                storedProcedure.setParameter(0, id);
+                storedProcedure.execute();
+                return (String) storedProcedure.getSingleResult();
+            });
+        }
+
+        public ValueAndExecutionMetadata<Void> update(long id, String name) {
+            return inTransaction(entityManager -> {
+                SimpleEntity entity = entityManager.find(SimpleEntity.class, id);
+                entity.setName(name);
+                return null;
+            });
+        }
+
+        public ValueAndExecutionMetadata<Void> delete(long id) {
+            return inTransaction(entityManager -> {
+                SimpleEntity entity = entityManager.find(SimpleEntity.class, id);
+                entityManager.remove(entity);
+                return null;
+            });
+        }
+
+        public abstract <T> ValueAndExecutionMetadata<T> inTransaction(Function<EntityManager, T> action);
+    }
+
+    protected static class ValueAndExecutionMetadata<T> {
+
+        public static <T> ValueAndExecutionMetadata<T> run(EntityManager entityManager, Function<EntityManager, T> action) {
+            LifecycleListener listener = new LifecycleListener();
+            entityManager.unwrap(Session.class).addEventListeners(listener);
+            T result = action.apply(entityManager);
+            return new ValueAndExecutionMetadata<>(result, entityManager, listener);
+        }
+
+        final T value;
+        final SessionImplementor sessionImplementor;
+        final LifecycleListener listener;
+
+        private ValueAndExecutionMetadata(T value, EntityManager entityManager, LifecycleListener listener) {
+            this.value = value;
+            // Make sure we don't return a wrapper, but the actual implementation.
+            this.sessionImplementor = entityManager.unwrap(SessionImplementor.class);
+            this.listener = listener;
+        }
+    }
+
+    private static class LifecycleListener extends BaseSessionEventListener {
+        private final List<LifecycleOperation> operations = new ArrayList<>();
+
+        @Override
+        public void jdbcExecuteStatementStart() {
+            operations.add(LifecycleOperation.STATEMENT);
+        }
+
+        @Override
+        public void flushStart() {
+            operations.add(LifecycleOperation.FLUSH);
+        }
+
+        @Override
+        public void transactionCompletion(boolean successful) {
+            operations.add(LifecycleOperation.TRANSACTION_COMPLETION);
+        }
+    }
+
+    private enum LifecycleOperation {
+        STATEMENT,
+        FLUSH,
+        TRANSACTION_COMPLETION;
+    }
+
+    public static class MyStoredProcedure {
+        private static final String NAME = "myStoredProc";
+        private static final String RESULT_PREFIX = "StoredProcResult";
+
+        @SuppressWarnings("unused")
+        public static String execute(long id) {
+            return RESULT_PREFIX + id;
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java
new file mode 100644
index 0000000000000..125737565ac54
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/GetTransactionLifecycleTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.hibernate.orm.transaction;
+
+import java.util.function.Function;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+
+public class GetTransactionLifecycleTest extends AbstractTransactionLifecycleTest {
+
+    @Inject
+    GetTransactionCRUD getTransactionCRUD;
+
+    @Override
+    protected TestCRUD crud() {
+        return getTransactionCRUD;
+    }
+
+    @Override
+    protected boolean expectDoubleFlush() {
+        // We expect double flushes in this case because EntityTransaction.commit() triggers a flush,
+        // and then the transaction synchronization will also trigger a flush before transaction completion.
+        // This may be a bug in ORM, but in any case there's nothing we can do about it.
+        return true;
+    }
+
+    @ApplicationScoped
+    public static class GetTransactionCRUD extends TestCRUD {
+        @Inject
+        EntityManagerFactory entityManagerFactory;
+
+        @Override
+        public <T> ValueAndExecutionMetadata<T> inTransaction(Function<EntityManager, T> action) {
+            EntityManager entityManager = entityManagerFactory.createEntityManager();
+            try (AutoCloseable closeable = entityManager::close) {
+                EntityTransaction tx = entityManager.getTransaction();
+                tx.begin();
+                ValueAndExecutionMetadata<T> result;
+                try {
+                    result = ValueAndExecutionMetadata.run(entityManager, action);
+                } catch (Exception e) {
+                    try {
+                        tx.rollback();
+                    } catch (Exception e2) {
+                        e.addSuppressed(e2);
+                    }
+                    throw e;
+                }
+                tx.commit();
+                return result;
+            } catch (Exception e) {
+                throw new IllegalStateException("Unexpected exception: " + e.getMessage(), e);
+            }
+        }
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java
new file mode 100644
index 0000000000000..09c1209b553cd
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/SimpleEntity.java
@@ -0,0 +1,36 @@
+package io.quarkus.hibernate.orm.transaction;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class SimpleEntity {
+
+    @Id
+    private long id;
+
+    private String name;
+
+    public SimpleEntity() {
+    }
+
+    public SimpleEntity(String name) {
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java
new file mode 100644
index 0000000000000..c1e1c63b927da
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/TransactionAnnotationLifecycleTest.java
@@ -0,0 +1,70 @@
+package io.quarkus.hibernate.orm.transaction;
+
+import java.util.function.Function;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+/**
+ * Check transaction lifecycle, including session flushes and the closing of the session.
+ */
+public class TransactionAnnotationLifecycleTest extends AbstractTransactionLifecycleTest {
+
+    @Inject
+    TransactionAnnotationCRUD transactionAnnotationCRUD;
+
+    @Override
+    protected TestCRUD crud() {
+        return transactionAnnotationCRUD;
+    }
+
+    @Override
+    protected boolean expectDoubleFlush() {
+        return false;
+    }
+
+    @ApplicationScoped
+    public static class TransactionAnnotationCRUD extends TestCRUD {
+        @Inject
+        EntityManager entityManager;
+
+        @Override
+        @Transactional
+        public ValueAndExecutionMetadata<Void> create(long id, String name) {
+            return super.create(id, name);
+        }
+
+        @Override
+        @Transactional
+        public ValueAndExecutionMetadata<String> retrieve(long id) {
+            return super.retrieve(id);
+        }
+
+        @Override
+        @Transactional
+        public ValueAndExecutionMetadata<String> callStoredProcedure(long id) {
+            return super.callStoredProcedure(id);
+        }
+
+        @Override
+        @Transactional
+        public ValueAndExecutionMetadata<Void> update(long id, String name) {
+            return super.update(id, name);
+        }
+
+        @Override
+        @Transactional
+        public ValueAndExecutionMetadata<Void> delete(long id) {
+            return super.delete(id);
+        }
+
+        @Override
+        public <T> ValueAndExecutionMetadata<T> inTransaction(Function<EntityManager, T> action) {
+            // We should already be in a transaction
+            return ValueAndExecutionMetadata.run(entityManager, action);
+        }
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java
new file mode 100644
index 0000000000000..0aa6e612f07a1
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/transaction/UserTransactionLifecycleTest.java
@@ -0,0 +1,64 @@
+package io.quarkus.hibernate.orm.transaction;
+
+import java.util.function.Function;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+/**
+ * Check transaction lifecycle, including session flushes and the closing of the session.
+ */
+public class UserTransactionLifecycleTest extends AbstractTransactionLifecycleTest {
+
+    @Inject
+    UserTransactionCRUD userTransactionCRUD;
+
+    @Override
+    protected TestCRUD crud() {
+        return userTransactionCRUD;
+    }
+
+    @Override
+    protected boolean expectDoubleFlush() {
+        return false;
+    }
+
+    @ApplicationScoped
+    public static class UserTransactionCRUD extends TestCRUD {
+        @Inject
+        EntityManager entityManager;
+        @Inject
+        UserTransaction userTransaction;
+
+        @Override
+        public <T> ValueAndExecutionMetadata<T> inTransaction(Function<EntityManager, T> action) {
+            try {
+                userTransaction.begin();
+                ValueAndExecutionMetadata<T> result;
+                try {
+                    result = ValueAndExecutionMetadata.run(entityManager, action);
+                } catch (Exception e) {
+                    try {
+                        userTransaction.rollback();
+                    } catch (Exception e2) {
+                        e.addSuppressed(e2);
+                    }
+                    throw e;
+                }
+                userTransaction.commit();
+                return result;
+            } catch (NotSupportedException | SystemException | RollbackException | HeuristicMixedException
+                    | HeuristicRollbackException e) {
+                throw new IllegalStateException("Unexpected exception: " + e.getMessage(), e);
+            }
+        }
+    }
+
+}
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-default-pu-explicit-unconfigured-datasource.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-default-pu-explicit-unconfigured-datasource.properties
new file mode 100644
index 0000000000000..4e16f081d4e2d
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-default-pu-explicit-unconfigured-datasource.properties
@@ -0,0 +1,4 @@
+quarkus.hibernate-orm.datasource=ds-1
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-log-sql-format-sql-default.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-log-sql-format-sql-default.properties
new file mode 100644
index 0000000000000..3aa079f071a1a
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-log-sql-format-sql-default.properties
@@ -0,0 +1,5 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.log.sql=true
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-log-sql-format-sql-false.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-log-sql-format-sql-false.properties
new file mode 100644
index 0000000000000..c7659f7fd5aae
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-log-sql-format-sql-false.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.log.format-sql=false
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-annotations.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-annotations.properties
new file mode 100644
index 0000000000000..acd2e4a94dafe
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-annotations.properties
@@ -0,0 +1,19 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.users.db-kind=h2
+quarkus.datasource.users.jdbc.url=jdbc:h2:mem:users;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.inventory.db-kind=h2
+quarkus.datasource.inventory.jdbc.url=jdbc:h2:mem:inventory;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.hibernate-orm."users".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
+
+quarkus.hibernate-orm."inventory".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."inventory".database.generation=drop-and-create
+quarkus.hibernate-orm."inventory".datasource=inventory
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-inconsistent-storage-engines.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-inconsistent-storage-engines.properties
new file mode 100644
index 0000000000000..c96d09e31c934
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-inconsistent-storage-engines.properties
@@ -0,0 +1,24 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.users.db-kind=h2
+quarkus.datasource.users.jdbc.url=jdbc:h2:mem:users;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.inventory.db-kind=h2
+quarkus.datasource.inventory.jdbc.url=jdbc:h2:mem:inventory;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=io.quarkus.hibernate.orm.multiplepersistenceunits.MultiplePersistenceUnitsInconsistentStorageEnginesTest$H2DialectWithMySQLInTheName
+quarkus.hibernate-orm.dialect.storage-engine=engine1
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model
+
+quarkus.hibernate-orm."users".dialect=io.quarkus.hibernate.orm.multiplepersistenceunits.MultiplePersistenceUnitsInconsistentStorageEnginesTest$H2DialectWithMySQLInTheName
+quarkus.hibernate-orm."users".dialect.storage-engine=engine2
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
+quarkus.hibernate-orm."users".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.user
+
+quarkus.hibernate-orm."inventory".dialect=io.quarkus.hibernate.orm.multiplepersistenceunits.MultiplePersistenceUnitsInconsistentStorageEnginesTest$H2DialectWithMySQLInTheName
+quarkus.hibernate-orm."inventory".database.generation=drop-and-create
+quarkus.hibernate-orm."inventory".datasource=inventory
+quarkus.hibernate-orm."inventory".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.inventory
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-unaffected-entities.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-unaffected-entities.properties
new file mode 100644
index 0000000000000..d55cbceac4c15
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-unaffected-entities.properties
@@ -0,0 +1,7 @@
+quarkus.datasource.inventory.db-kind=h2
+quarkus.datasource.inventory.jdbc.url=jdbc:h2:mem:inventory;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm."inventory".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."inventory".database.generation=drop-and-create
+quarkus.hibernate-orm."inventory".datasource=inventory
+quarkus.hibernate-orm."inventory".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-undefined-packages.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-undefined-packages.properties
new file mode 100644
index 0000000000000..5cba71ebe5096
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units-undefined-packages.properties
@@ -0,0 +1,7 @@
+quarkus.datasource.users.db-kind=h2
+quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm."users".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."users".log.sql=true
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units.properties
new file mode 100644
index 0000000000000..ea111e80a93a7
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -0,0 +1,22 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.users.db-kind=h2
+quarkus.datasource.users.jdbc.url=jdbc:h2:mem:users;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.inventory.db-kind=h2
+quarkus.datasource.inventory.jdbc.url=jdbc:h2:mem:inventory;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.config
+
+quarkus.hibernate-orm."users".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
+quarkus.hibernate-orm."users".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.user
+
+quarkus.hibernate-orm."inventory".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."inventory".database.generation=drop-and-create
+quarkus.hibernate-orm."inventory".datasource=inventory
+quarkus.hibernate-orm."inventory".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.config.inventory
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-named-datasource.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-named-datasource.properties
new file mode 100644
index 0000000000000..8947721dad21f
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-named-datasource.properties
@@ -0,0 +1,7 @@
+quarkus.datasource.users.db-kind=h2
+quarkus.datasource.users.jdbc.url=jdbc:h2:mem:test
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.datasource=users
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-named-pu-explicit-unconfigured-datasource.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-named-pu-explicit-unconfigured-datasource.properties
new file mode 100644
index 0000000000000..863a0b51f6563
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-named-pu-explicit-unconfigured-datasource.properties
@@ -0,0 +1,4 @@
+quarkus.hibernate-orm.pu-1.datasource=ds-1
+quarkus.hibernate-orm.pu-1.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.pu-1.log.sql=true
+quarkus.hibernate-orm.pu-1.database.generation=drop-and-create
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/application-named-pu-no-datasource.properties b/extensions/hibernate-orm/deployment/src/test/resources/application-named-pu-no-datasource.properties
new file mode 100644
index 0000000000000..e66f6d4872a76
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/application-named-pu-no-datasource.properties
@@ -0,0 +1,3 @@
+quarkus.hibernate-orm.pu-1.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.pu-1.log.sql=true
+quarkus.hibernate-orm.pu-1.database.generation=drop-and-create
diff --git a/extensions/hibernate-orm/deployment/src/test/resources/import-sharedentity.sql b/extensions/hibernate-orm/deployment/src/test/resources/import-sharedentity.sql
new file mode 100644
index 0000000000000..c6efcf221b324
--- /dev/null
+++ b/extensions/hibernate-orm/deployment/src/test/resources/import-sharedentity.sql
@@ -0,0 +1,2 @@
+INSERT INTO SharedEntity(id, name) VALUES(1, 'default sql load script entity');
+INSERT INTO SharedEntity(id, name) VALUES(2, 'import.sql load script entity');
diff --git a/extensions/hibernate-orm/pom.xml b/extensions/hibernate-orm/pom.xml
index 4d391b77d5779..4a9abe84f6cb2 100644
--- a/extensions/hibernate-orm/pom.xml
+++ b/extensions/hibernate-orm/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,4 +18,91 @@
         <module>runtime</module>
     </modules>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>de.thetaphi</groupId>
+                    <artifactId>forbiddenapis</artifactId>
+                    <version>${forbiddenapis-maven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>verify-forbidden-apis</id>
+                            <configuration>
+                                <!-- if the used Java version is too new, don't fail, just do nothing: -->
+                                <failOnUnsupportedJava>false</failOnUnsupportedJava>
+                                <excludes>
+                                    <!-- JBoss Logger formats messages according to default Locale (bug or feature?) -->
+                                    <exclude>**/*_$logger.class</exclude>
+                                    <!-- JBoss message bundles format messages -->
+                                    <exclude>**/*_$bundle.class</exclude>
+                                </excludes>
+                                <bundledSignatures>
+                                    <!-- These signatures on the top are not specific to any JDK version -->
+                                    <bundledSignature>jdk-system-out</bundledSignature>
+                                    <bundledSignature>jdk-non-portable</bundledSignature>
+                                    <!-- The jdk-reflection is not yet something we can avoid -->
+                                    <!--<bundledSignature>jdk-reflection</bundledSignature>-->
+
+                                    <!-- All following signatures should be replicated for each target JDK version we intend to support -->
+                                    <bundledSignature>jdk-unsafe-1.8</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-9</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-10</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-11</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-12</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-13</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-14</bundledSignature>
+                                    <bundledSignature>jdk-unsafe-15</bundledSignature>
+
+                                    <bundledSignature>jdk-deprecated-1.8</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-9</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-10</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-11</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-12</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-13</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-14</bundledSignature>
+                                    <bundledSignature>jdk-deprecated-15</bundledSignature>
+
+                                    <bundledSignature>jdk-internal-1.8</bundledSignature>
+                                    <bundledSignature>jdk-internal-9</bundledSignature>
+                                    <bundledSignature>jdk-internal-10</bundledSignature>
+                                    <bundledSignature>jdk-internal-11</bundledSignature>
+                                    <bundledSignature>jdk-internal-12</bundledSignature>
+                                    <bundledSignature>jdk-internal-13</bundledSignature>
+                                    <bundledSignature>jdk-internal-14</bundledSignature>
+                                    <bundledSignature>jdk-internal-15</bundledSignature>
+                                </bundledSignatures>
+                                <failOnMissingClasses>false</failOnMissingClasses>
+                                <ignoreSignaturesOfMissingClasses>true</ignoreSignaturesOfMissingClasses>
+                            </configuration>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>verify-forbidden-test-apis</id>
+                            <configuration>
+                                <!-- if the used Java version is too new, don't fail, just do nothing: -->
+                                <failOnUnsupportedJava>false</failOnUnsupportedJava>
+                                <ignoreSignaturesOfMissingClasses>true</ignoreSignaturesOfMissingClasses>
+                                <bundledSignatures>
+                                    <!-- This will automatically choose the right signatures based on 'targetVersion': -->
+                                    <bundledSignature>jdk-unsafe</bundledSignature>
+                                    <bundledSignature>jdk-deprecated</bundledSignature>
+                                    <bundledSignature>jdk-non-portable</bundledSignature>
+                                    <bundledSignature>jdk-internal</bundledSignature>
+                                </bundledSignatures>
+                            </configuration>
+                            <phase>test-compile</phase>
+                            <goals>
+                                <goal>testCheck</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>
diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml
index 49ab1beb973a4..8b316a298ebc9 100644
--- a/extensions/hibernate-orm/runtime/pom.xml
+++ b/extensions/hibernate-orm/runtime/pom.xml
@@ -26,6 +26,11 @@
             <artifactId>quarkus-smallrye-metrics</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
@@ -110,6 +115,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -148,6 +154,10 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>de.thetaphi</groupId>
+                <artifactId>forbiddenapis</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java
new file mode 100644
index 0000000000000..0733ee479973c
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/PersistenceUnit.java
@@ -0,0 +1,63 @@
+package io.quarkus.hibernate.orm;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import io.quarkus.hibernate.orm.PersistenceUnit.List;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+
+/**
+ * This annotation has two different purposes.
+ * It is a qualifier used to specify to which persistence unit the injected {@link EntityManagerFactory} or
+ * {@link EntityManager} belongs.
+ * <p>
+ * This allows for regular CDI bean injection of both interfaces.
+ * <p>
+ * It is also used to mark packages as part of a given persistence unit.
+ */
+@Target({ TYPE, FIELD, PARAMETER, PACKAGE })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+@Repeatable(List.class)
+public @interface PersistenceUnit {
+
+    String DEFAULT = PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME;
+
+    String value();
+
+    public class PersistenceUnitLiteral extends AnnotationLiteral<PersistenceUnit> implements PersistenceUnit {
+
+        private String name;
+
+        public PersistenceUnitLiteral(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String value() {
+            return name;
+        }
+    }
+
+    @Target(PACKAGE)
+    @Retention(RUNTIME)
+    @Documented
+    @interface List {
+
+        PersistenceUnit[] value();
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/BuildTimeSettings.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/BuildTimeSettings.java
index f3c7e8c014fd6..1683c59033538 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/BuildTimeSettings.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/BuildTimeSettings.java
@@ -29,4 +29,8 @@ public Map<String, Object> getSettings() {
         return settings;
     }
 
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + " {" + settings.toString() + "}";
+    }
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java
deleted file mode 100644
index 02e03e59f8755..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.quarkus.hibernate.orm.runtime;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-
-public class DefaultEntityManagerFactoryProducer {
-
-    @Produces
-    @PersistenceUnit
-    @Singleton
-    EntityManagerFactory entityManagerFactory;
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/DefaultEntityManagerProducer.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/DefaultEntityManagerProducer.java
deleted file mode 100644
index 3e3efcd2ba47f..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/DefaultEntityManagerProducer.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.quarkus.hibernate.orm.runtime;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public class DefaultEntityManagerProducer {
-
-    @Produces
-    @PersistenceContext
-    @Singleton
-    EntityManager entityManager;
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java
index f699b2c6d9fc8..aba131e7684a6 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java
@@ -3,13 +3,12 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
-import javax.persistence.spi.LoadState;
 import javax.persistence.spi.PersistenceProvider;
 import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.ProviderUtil;
 import javax.sql.DataSource;
 
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -17,17 +16,22 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
-import org.hibernate.jpa.internal.util.PersistenceUtilHelper;
 import org.hibernate.service.internal.ProvidedService;
 import org.jboss.logging.Logger;
 
+import io.quarkus.agroal.DataSource.DataSourceLiteral;
+import io.quarkus.agroal.runtime.UnconfiguredDataSource;
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.hibernate.orm.runtime.RuntimeSettings.Builder;
 import io.quarkus.hibernate.orm.runtime.boot.FastBootEntityManagerFactoryBuilder;
 import io.quarkus.hibernate.orm.runtime.boot.registry.PreconfiguredServiceRegistryBuilder;
-import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrations;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener;
 import io.quarkus.hibernate.orm.runtime.recording.PrevalidatedQuarkusMetadata;
 import io.quarkus.hibernate.orm.runtime.recording.RecordedState;
+import io.quarkus.runtime.configuration.ConfigurationException;
 
 /**
  * This can not inherit from HibernatePersistenceProvider as that would force
@@ -39,7 +43,16 @@ public final class FastBootHibernatePersistenceProvider implements PersistencePr
 
     private static final Logger log = Logger.getLogger(FastBootHibernatePersistenceProvider.class);
 
-    private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
+    private final ProviderUtil providerUtil = new ProviderUtil();
+
+    private final HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig;
+    private final Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors;
+
+    public FastBootHibernatePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors) {
+        this.hibernateOrmRuntimeConfig = hibernateOrmRuntimeConfig;
+        this.integrationRuntimeDescriptors = integrationRuntimeDescriptors;
+    }
 
     @SuppressWarnings("rawtypes")
     @Override
@@ -147,7 +160,7 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
                 continue;
             }
 
-            RecordedState recordedState = PersistenceUnitsHolder.getRecordedState(persistenceUnitName);
+            RecordedState recordedState = PersistenceUnitsHolder.popRecordedState(persistenceUnitName);
 
             if (recordedState.isReactive()) {
                 throw new IllegalStateException(
@@ -160,9 +173,23 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
                     integrationSettings);
 
             // Inject the datasource
-            injectDataSource(persistenceUnitName, runtimeSettingsBuilder);
+            injectDataSource(persistenceUnitName, recordedState.getDataSource(), runtimeSettingsBuilder);
+
+            // Inject runtime configuration if the persistence unit was defined by Quarkus configuration
+            if (!recordedState.isFromPersistenceXml()) {
+                injectRuntimeConfiguration(persistenceUnitName, hibernateOrmRuntimeConfig, runtimeSettingsBuilder);
+            }
 
-            HibernateOrmIntegrations.contributeRuntimeProperties((k, v) -> runtimeSettingsBuilder.put(k, v));
+            for (HibernateOrmIntegrationRuntimeDescriptor descriptor : integrationRuntimeDescriptors
+                    .getOrDefault(persistenceUnitName, Collections.emptyList())) {
+                Optional<HibernateOrmIntegrationRuntimeInitListener> listenerOptional = descriptor.getInitListener();
+                if (listenerOptional.isPresent()) {
+                    listenerOptional.get().contributeRuntimeProperties(runtimeSettingsBuilder::put);
+                }
+            }
+
+            // Allow detection of driver/database capabilities on runtime init (was disabled during static init)
+            runtimeSettingsBuilder.put("hibernate.temp.use_jdbc_metadata_defaults", "true");
 
             RuntimeSettings runtimeSettings = runtimeSettingsBuilder.build();
 
@@ -258,7 +285,8 @@ private void verifyProperties(Map properties) {
         }
     }
 
-    private void injectDataSource(String persistenceUnitName, RuntimeSettings.Builder runtimeSettingsBuilder) {
+    private static void injectDataSource(String persistenceUnitName, String dataSource,
+            RuntimeSettings.Builder runtimeSettingsBuilder) {
         // first convert
 
         if (runtimeSettingsBuilder.isConfigured(AvailableSettings.URL) ||
@@ -269,30 +297,62 @@ private void injectDataSource(String persistenceUnitName, RuntimeSettings.Builde
             return;
         }
 
-        // for now we only support one datasource but this will change
-        InstanceHandle<DataSource> dataSourceHandle = Arc.container().instance(DataSource.class);
+        InstanceHandle<DataSource> dataSourceHandle;
+        if (DataSourceUtil.isDefault(dataSource)) {
+            dataSourceHandle = Arc.container().instance(DataSource.class);
+        } else {
+            dataSourceHandle = Arc.container().instance(DataSource.class, new DataSourceLiteral(dataSource));
+        }
+
         if (!dataSourceHandle.isAvailable()) {
-            throw new IllegalStateException("No datasource has been defined for persistence unit " + persistenceUnitName);
+            throw new IllegalStateException(
+                    "No datasource " + dataSource + " has been defined for persistence unit " + persistenceUnitName);
         }
 
-        runtimeSettingsBuilder.put(AvailableSettings.DATASOURCE, Arc.container().instance(DataSource.class).get());
+        DataSource ds = dataSourceHandle.get();
+        if (ds instanceof UnconfiguredDataSource) {
+            throw new ConfigurationException(
+                    "Model classes are defined for the default persistence unit " + persistenceUnitName
+                            + " but configured datasource " + dataSource
+                            + " not found: the default EntityManagerFactory will not be created. To solve this, configure the default datasource. Refer to https://quarkus.io/guides/datasource for guidance.");
+        }
+        runtimeSettingsBuilder.put(AvailableSettings.DATASOURCE, ds);
     }
 
-    private final ProviderUtil providerUtil = new ProviderUtil() {
-        @Override
-        public LoadState isLoadedWithoutReference(Object proxy, String property) {
-            return PersistenceUtilHelper.isLoadedWithoutReference(proxy, property, cache);
+    private static void injectRuntimeConfiguration(String persistenceUnitName,
+            HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig, Builder runtimeSettingsBuilder) {
+        HibernateOrmRuntimeConfigPersistenceUnit persistenceUnitConfig;
+        if (PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
+            persistenceUnitConfig = hibernateOrmRuntimeConfig.defaultPersistenceUnit;
+        } else {
+            persistenceUnitConfig = hibernateOrmRuntimeConfig.persistenceUnits.getOrDefault(persistenceUnitName,
+                    new HibernateOrmRuntimeConfigPersistenceUnit());
         }
 
-        @Override
-        public LoadState isLoadedWithReference(Object proxy, String property) {
-            return PersistenceUtilHelper.isLoadedWithReference(proxy, property, cache);
+        // Database
+        runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_DATABASE_ACTION,
+                persistenceUnitConfig.database.generation.generation);
+
+        runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_CREATE_SCHEMAS,
+                String.valueOf(persistenceUnitConfig.database.generation.createSchemas));
+
+        if (persistenceUnitConfig.database.generation.haltOnError) {
+            runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true");
         }
 
-        @Override
-        public LoadState isLoaded(Object o) {
-            return PersistenceUtilHelper.isLoaded(o);
+        // Logging
+        if (persistenceUnitConfig.log.sql) {
+            runtimeSettingsBuilder.put(AvailableSettings.SHOW_SQL, "true");
+
+            if (persistenceUnitConfig.log.formatSql) {
+                runtimeSettingsBuilder.put(AvailableSettings.FORMAT_SQL, "true");
+            }
+        }
+
+        if (persistenceUnitConfig.log.jdbcWarnings.isPresent()) {
+            runtimeSettingsBuilder.put(AvailableSettings.LOG_JDBC_WARNINGS,
+                    persistenceUnitConfig.log.jdbcWarnings.get().toString());
         }
-    };
+    }
 
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java
deleted file mode 100644
index 73fccddda1f22..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.orm.runtime;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceProviderResolver;
-
-final class FastBootHibernatePersistenceProviderResolver implements PersistenceProviderResolver {
-
-    private static final List<PersistenceProvider> HARDCODED_PROVIDER_LIST = Collections
-            .<PersistenceProvider> singletonList(new FastBootHibernatePersistenceProvider());
-
-    @Override
-    public List<PersistenceProvider> getPersistenceProviders() {
-        return HARDCODED_PROVIDER_LIST;
-    }
-
-    @Override
-    public void clearCachedProviders() {
-        // done!
-    }
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/Hibernate.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/Hibernate.java
index 925b7defca855..a3643d67ee692 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/Hibernate.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/Hibernate.java
@@ -4,13 +4,11 @@
 
 public class Hibernate {
 
-    static {
+    public static void featureInit(boolean enabled) {
         // Override the JPA persistence unit resolver so to use our custom boot
         // strategy:
-        PersistenceProviderSetup.registerPersistenceProvider();
-    }
+        PersistenceProviderSetup.registerStaticInitPersistenceProvider();
 
-    public static void featureInit(boolean enabled) {
         if (enabled) {
             Logger.getLogger("org.hibernate.quarkus.feature").debug("Hibernate Features Enabled");
         }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java
index b2dc0ca12ea0c..d67bc84a504f6 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRecorder.java
@@ -3,17 +3,25 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import org.hibernate.MultiTenancyStrategy;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.integrator.spi.Integrator;
 import org.jboss.logging.Logger;
 
+import io.quarkus.arc.Arc;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.arc.runtime.BeanContainerListener;
 import io.quarkus.hibernate.orm.runtime.boot.QuarkusPersistenceUnitDefinition;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
 import io.quarkus.hibernate.orm.runtime.proxies.PreGeneratedProxies;
+import io.quarkus.hibernate.orm.runtime.session.ForwardingSession;
+import io.quarkus.hibernate.orm.runtime.tenant.DataSourceTenantConnectionResolver;
 import io.quarkus.runtime.annotations.Recorder;
 
 /**
@@ -38,60 +46,77 @@ public void callHibernateFeatureInit(boolean enabled) {
         Hibernate.featureInit(enabled);
     }
 
-    /**
-     * Initializes the JPA configuration to be used at runtime.
-     * 
-     * @param jtaEnabled Should JTA be enabled?
-     * @param strategy Multitenancy strategy to use.
-     * @param multiTenancySchemaDataSource Data source to use in case of {@link MultiTenancyStrategy#SCHEMA} approach or
-     *        {@link null} in case the default data source.
-     * 
-     * @return
-     */
-    public BeanContainerListener initializeJpa(boolean jtaEnabled, MultiTenancyStrategy strategy,
-            String multiTenancySchemaDataSource) {
+    public void setupPersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors) {
+        PersistenceProviderSetup.registerRuntimePersistenceProvider(hibernateOrmRuntimeConfig, integrationRuntimeDescriptors);
+    }
+
+    public BeanContainerListener initMetadata(List<QuarkusPersistenceUnitDefinition> parsedPersistenceXmlDescriptors,
+            Scanner scanner, Collection<Class<? extends Integrator>> additionalIntegrators,
+            PreGeneratedProxies proxyDefinitions) {
         return new BeanContainerListener() {
             @Override
             public void created(BeanContainer beanContainer) {
-                JPAConfig instance = beanContainer.instance(JPAConfig.class);
-                instance.setJtaEnabled(jtaEnabled);
-                instance.setMultiTenancyStrategy(strategy);
-                instance.setMultiTenancySchemaDataSource(multiTenancySchemaDataSource);
+                PersistenceUnitsHolder.initializeJpa(parsedPersistenceXmlDescriptors, scanner, additionalIntegrators,
+                        proxyDefinitions);
             }
         };
     }
 
-    public BeanContainerListener registerPersistenceUnit(String unitName) {
-        return new BeanContainerListener() {
+    public Supplier<JPAConfigSupport> jpaConfigSupportSupplier(JPAConfigSupport jpaConfigSupport) {
+        return new Supplier<JPAConfigSupport>() {
             @Override
-            public void created(BeanContainer beanContainer) {
-                beanContainer.instance(JPAConfig.class).registerPersistenceUnit(unitName);
+            public JPAConfigSupport get() {
+                return jpaConfigSupport;
             }
         };
     }
 
-    public BeanContainerListener initDefaultPersistenceUnit() {
-        return new BeanContainerListener() {
+    public Supplier<DataSourceTenantConnectionResolver> dataSourceTenantConnectionResolver(String persistenceUnitName,
+            String dataSourceName,
+            MultiTenancyStrategy multiTenancyStrategy, String multiTenancySchemaDataSourceName) {
+        return new Supplier<DataSourceTenantConnectionResolver>() {
             @Override
-            public void created(BeanContainer beanContainer) {
-                beanContainer.instance(JPAConfig.class).initDefaultPersistenceUnit();
+            public DataSourceTenantConnectionResolver get() {
+                return new DataSourceTenantConnectionResolver(persistenceUnitName, dataSourceName, multiTenancyStrategy,
+                        multiTenancySchemaDataSourceName);
             }
         };
     }
 
-    public BeanContainerListener initMetadata(List<QuarkusPersistenceUnitDefinition> parsedPersistenceXmlDescriptors,
-            Scanner scanner, Collection<Class<? extends Integrator>> additionalIntegrators,
-            PreGeneratedProxies proxyDefinitions) {
-        return new BeanContainerListener() {
+    public void startAllPersistenceUnits(BeanContainer beanContainer) {
+        beanContainer.instance(JPAConfig.class).startAll();
+    }
+
+    public Supplier<SessionFactory> sessionFactorySupplier(String persistenceUnitName) {
+        return new Supplier<SessionFactory>() {
             @Override
-            public void created(BeanContainer beanContainer) {
-                PersistenceUnitsHolder.initializeJpa(parsedPersistenceXmlDescriptors, scanner, additionalIntegrators,
-                        proxyDefinitions);
+            public SessionFactory get() {
+                SessionFactory sessionFactory = Arc.container().instance(JPAConfig.class).get()
+                        .getEntityManagerFactory(persistenceUnitName)
+                        .unwrap(SessionFactory.class);
+
+                return sessionFactory;
             }
         };
     }
 
-    public void startAllPersistenceUnits(BeanContainer beanContainer) {
-        beanContainer.instance(JPAConfig.class).startAll();
+    public Supplier<Session> sessionSupplier(String persistenceUnitName) {
+        return new Supplier<Session>() {
+            @Override
+            public Session get() {
+                TransactionSessions transactionSessions = Arc.container()
+                        .instance(TransactionSessions.class).get();
+                ForwardingSession session = new ForwardingSession() {
+
+                    @Override
+                    protected Session delegate() {
+                        return transactionSessions.getSession(persistenceUnitName);
+                    }
+                };
+                return session;
+            }
+        };
     }
+
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java
new file mode 100644
index 0000000000000..dedeb8db65745
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfig.java
@@ -0,0 +1,32 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.RUN_TIME)
+public class HibernateOrmRuntimeConfig {
+
+    /**
+     * Configuration for the default persistence unit.
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    public HibernateOrmRuntimeConfigPersistenceUnit defaultPersistenceUnit;
+
+    /**
+     * Additional named persistence units.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("persistence-unit-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, HibernateOrmRuntimeConfigPersistenceUnit> persistenceUnits;
+
+    public boolean isAnyPropertySet() {
+        return defaultPersistenceUnit.isAnyPropertySet() ||
+                !persistenceUnits.isEmpty();
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
new file mode 100644
index 0000000000000..3099f8a407b7f
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
@@ -0,0 +1,105 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class HibernateOrmRuntimeConfigPersistenceUnit {
+
+    /**
+     * Database related configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitDatabase database = new HibernateOrmConfigPersistenceUnitDatabase();
+
+    /**
+     * Logging configuration.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public HibernateOrmConfigPersistenceUnitLog log = new HibernateOrmConfigPersistenceUnitLog();
+
+    public boolean isAnyPropertySet() {
+        return database.isAnyPropertySet() ||
+                log.isAnyPropertySet();
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitDatabase {
+
+        /**
+         * Schema generation configuration.
+         */
+        @ConfigItem
+        public HibernateOrmConfigPersistenceUnitDatabaseGeneration generation = new HibernateOrmConfigPersistenceUnitDatabaseGeneration();
+
+        public boolean isAnyPropertySet() {
+            return generation.isAnyPropertySet();
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitDatabaseGeneration {
+
+        /**
+         * Select whether the database schema is generated or not.
+         *
+         * `drop-and-create` is awesome in development mode.
+         *
+         * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`.
+         */
+        @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none")
+        public String generation = "none";
+
+        /**
+         * If Hibernate ORM should create the schemas automatically (for databases supporting them).
+         */
+        @ConfigItem
+        public boolean createSchemas = false;
+
+        /**
+         * Whether we should stop on the first error when applying the schema.
+         */
+        @ConfigItem
+        public boolean haltOnError = false;
+
+        public boolean isAnyPropertySet() {
+            return !"none".equals(generation)
+                    || createSchemas
+                    || haltOnError;
+        }
+    }
+
+    @ConfigGroup
+    public static class HibernateOrmConfigPersistenceUnitLog {
+
+        /**
+         * Show SQL logs and format them nicely.
+         * <p>
+         * Setting it to true is obviously not recommended in production.
+         */
+        @ConfigItem
+        public boolean sql = false;
+
+        /**
+         * Format the SQL logs if SQL log is enabled
+         */
+        @ConfigItem(defaultValue = "true")
+        public boolean formatSql = true;
+
+        /**
+         * Whether JDBC warnings should be collected and logged.
+         */
+        @ConfigItem(defaultValueDocumentation = "depends on dialect")
+        public Optional<Boolean> jdbcWarnings = Optional.empty();
+
+        public boolean isAnyPropertySet() {
+            return sql || !formatSql || jdbcWarnings.isPresent();
+        }
+    }
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
index 7342423e7c2e9..a905ebda8648a 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfig.java
@@ -1,20 +1,20 @@
 package io.quarkus.hibernate.orm.runtime;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.BeforeDestroyed;
 import javax.enterprise.event.Observes;
+import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.hibernate.MultiTenancyStrategy;
 import org.jboss.logging.Logger;
 
 @Singleton
@@ -22,61 +22,19 @@ public class JPAConfig {
 
     private static final Logger LOGGER = Logger.getLogger(JPAConfig.class.getName());
 
-    private final AtomicBoolean jtaEnabled;
-
-    private final AtomicReference<MultiTenancyStrategy> multiTenancyStrategy;
-
-    private final AtomicReference<String> multiTenancySchemaDataSource;
+    private final Map<String, Set<String>> entityPersistenceUnitMapping;
 
     private final Map<String, LazyPersistenceUnit> persistenceUnits;
 
-    private final AtomicReference<String> defaultPersistenceUnitName;
-
-    public JPAConfig() {
-        this.jtaEnabled = new AtomicBoolean();
-        this.multiTenancyStrategy = new AtomicReference<MultiTenancyStrategy>();
-        this.multiTenancySchemaDataSource = new AtomicReference<String>();
-        this.persistenceUnits = new ConcurrentHashMap<>();
-        this.defaultPersistenceUnitName = new AtomicReference<String>();
-    }
-
-    void setJtaEnabled(boolean value) {
-        jtaEnabled.set(value);
-    }
+    @Inject
+    public JPAConfig(JPAConfigSupport jpaConfigSupport) {
+        this.entityPersistenceUnitMapping = Collections.unmodifiableMap(jpaConfigSupport.entityPersistenceUnitMapping);
 
-    /**
-     * Sets the strategy for multitenancy.
-     * 
-     * @param strategy Strategy to use.
-     */
-    void setMultiTenancyStrategy(MultiTenancyStrategy strategy) {
-        multiTenancyStrategy.set(strategy);
-    }
-
-    /**
-     * Sets the name of the data source that should be used in case of {@link MultiTenancyStrategy#SCHEMA} approach.
-     * 
-     * @param dataSourceName Name to use or {@literal null} for the default data source.
-     */
-    void setMultiTenancySchemaDataSource(String dataSourceName) {
-        multiTenancySchemaDataSource.set(dataSourceName);
-    }
-
-    public EntityManagerFactory getEntityManagerFactory(String unitName) {
-        if (unitName == null || unitName.isEmpty()) {
-            if (persistenceUnits.size() == 1) {
-                String defaultUnitName = defaultPersistenceUnitName.get();
-                return defaultUnitName != null ? persistenceUnits.get(defaultUnitName).get()
-                        : persistenceUnits.values().iterator().next().get();
-            } else {
-                throw new IllegalStateException("Unable to identify the default PU: " + persistenceUnits);
-            }
+        Map<String, LazyPersistenceUnit> persistenceUnitsBuilder = new HashMap<>();
+        for (String persistenceUnitName : jpaConfigSupport.persistenceUnitNames) {
+            persistenceUnitsBuilder.put(persistenceUnitName, new LazyPersistenceUnit(persistenceUnitName));
         }
-        return persistenceUnits.get(unitName).get();
-    }
-
-    void registerPersistenceUnit(String unitName) {
-        persistenceUnits.put(unitName, new LazyPersistenceUnit(unitName));
+        this.persistenceUnits = persistenceUnitsBuilder;
     }
 
     void startAll() {
@@ -85,14 +43,22 @@ void startAll() {
         }
     }
 
-    void initDefaultPersistenceUnit() {
-        if (persistenceUnits.size() == 1) {
-            defaultPersistenceUnitName.set(persistenceUnits.keySet().iterator().next());
+    public EntityManagerFactory getEntityManagerFactory(String unitName) {
+        LazyPersistenceUnit lazyPersistenceUnit = null;
+        if (unitName == null) {
+            if (persistenceUnits.size() == 1) {
+                lazyPersistenceUnit = persistenceUnits.values().iterator().next();
+            }
+        } else {
+            lazyPersistenceUnit = persistenceUnits.get(unitName);
+        }
+
+        if (lazyPersistenceUnit == null) {
+            throw new IllegalArgumentException(
+                    String.format(Locale.ROOT, "Unable to find an EntityManagerFactory for persistence unit '%s'", unitName));
         }
-    }
 
-    boolean isJtaEnabled() {
-        return jtaEnabled.get();
+        return lazyPersistenceUnit.get();
     }
 
     /**
@@ -105,21 +71,10 @@ public Set<String> getPersistenceUnits() {
     }
 
     /**
-     * Returns the selected multitenancy strategy.
-     * 
-     * @return Strategy to use.
-     */
-    public MultiTenancyStrategy getMultiTenancyStrategy() {
-        return multiTenancyStrategy.get();
-    }
-
-    /**
-     * Determines which data source should be used in case of {@link MultiTenancyStrategy#SCHEMA} approach.
-     * 
-     * @return Data source name or {@link null} in case the default data source should be used.
+     * Returns the set of persistence units an entity is attached to.
      */
-    public String getMultiTenancySchemaDataSource() {
-        return multiTenancySchemaDataSource.get();
+    public Set<String> getPersistenceUnitsForEntity(String entityClass) {
+        return entityPersistenceUnitMapping.getOrDefault(entityClass, Collections.emptySet());
     }
 
     /**
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfigSupport.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfigSupport.java
new file mode 100644
index 0000000000000..b0a04a21a1f46
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAConfigSupport.java
@@ -0,0 +1,19 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.Map;
+import java.util.Set;
+
+public class JPAConfigSupport {
+
+    public Set<String> persistenceUnitNames;
+    public Map<String, Set<String>> entityPersistenceUnitMapping;
+
+    public JPAConfigSupport() {
+    }
+
+    public JPAConfigSupport(Set<String> persistenceUnitNames,
+            Map<String, Set<String>> entityPersistenceUnitMapping) {
+        this.persistenceUnitNames = persistenceUnitNames;
+        this.entityPersistenceUnitMapping = entityPersistenceUnitMapping;
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAResourceReferenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAResourceReferenceProvider.java
deleted file mode 100644
index 3d0a3142f3c0e..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/JPAResourceReferenceProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.quarkus.hibernate.orm.runtime;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
-import io.quarkus.arc.Arc;
-import io.quarkus.arc.InstanceHandle;
-import io.quarkus.arc.ResourceReferenceProvider;
-import io.quarkus.hibernate.orm.runtime.entitymanager.ForwardingEntityManager;
-
-public class JPAResourceReferenceProvider implements ResourceReferenceProvider {
-
-    @Override
-    public InstanceHandle<Object> get(Type type, Set<Annotation> annotations) {
-        JPAConfig jpaConfig = Arc.container().instance(JPAConfig.class).get();
-
-        if (EntityManagerFactory.class.equals(type)) {
-            PersistenceUnit pu = getAnnotation(annotations, PersistenceUnit.class);
-            if (pu != null) {
-                return () -> jpaConfig.getEntityManagerFactory(pu.unitName());
-            }
-        } else if (EntityManager.class.equals(type)) {
-            PersistenceContext pc = getAnnotation(annotations, PersistenceContext.class);
-            if (pc != null) {
-                if (jpaConfig.isJtaEnabled()) {
-                    TransactionEntityManagers transactionEntityManagers = Arc.container()
-                            .instance(TransactionEntityManagers.class).get();
-                    ForwardingEntityManager entityManager = new ForwardingEntityManager() {
-
-                        @Override
-                        protected EntityManager delegate() {
-                            return transactionEntityManagers.getEntityManager(pc.unitName());
-                        }
-                    };
-                    return () -> entityManager;
-                } else {
-                    EntityManagerFactory entityManagerFactory = jpaConfig.getEntityManagerFactory(pc.unitName());
-                    EntityManager entityManager = entityManagerFactory.createEntityManager();
-                    return new InstanceHandle<Object>() {
-
-                        @Override
-                        public Object get() {
-                            return entityManager;
-                        }
-
-                        @Override
-                        public void destroy() {
-                            entityManager.close();
-                        }
-                    };
-                }
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java
index 0ad72b53c39ed..52e1ff92a0e29 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceProviderSetup.java
@@ -1,14 +1,25 @@
 package io.quarkus.hibernate.orm.runtime;
 
+import java.util.List;
+import java.util.Map;
+
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
+
 public final class PersistenceProviderSetup {
 
     private PersistenceProviderSetup() {
         // not to be constructed
     }
 
-    public static void registerPersistenceProvider() {
+    public static void registerStaticInitPersistenceProvider() {
         javax.persistence.spi.PersistenceProviderResolverHolder
-                .setPersistenceProviderResolver(new FastBootHibernatePersistenceProviderResolver());
+                .setPersistenceProviderResolver(new StaticInitHibernatePersistenceProviderResolver());
     }
 
+    public static void registerRuntimePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors) {
+        javax.persistence.spi.PersistenceProviderResolverHolder.setPersistenceProviderResolver(
+                new SingletonPersistenceProviderResolver(
+                        new FastBootHibernatePersistenceProvider(hibernateOrmRuntimeConfig, integrationRuntimeDescriptors)));
+    }
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java
new file mode 100644
index 0000000000000..09b42eea3f231
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitUtil.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.orm.runtime;
+
+public class PersistenceUnitUtil {
+
+    public static final String DEFAULT_PERSISTENCE_UNIT_NAME = "<default>";
+
+    public static boolean isDefaultPersistenceUnit(String name) {
+        return DEFAULT_PERSISTENCE_UNIT_NAME.equals(name);
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitsHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitsHolder.java
index a25a64a14e854..fb9ba1c76f156 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitsHolder.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/PersistenceUnitsHolder.java
@@ -48,13 +48,13 @@ public static List<PersistenceUnitDescriptor> getPersistenceUnitDescriptors() {
         return persistenceUnits.units;
     }
 
-    public static RecordedState getRecordedState(String persistenceUnitName) {
+    public static RecordedState popRecordedState(String persistenceUnitName) {
         checkJPAInitialization();
         Object key = persistenceUnitName;
         if (persistenceUnitName == null) {
             key = NO_NAME_TOKEN;
         }
-        return persistenceUnits.recordedStates.get(key);
+        return persistenceUnits.recordedStates.remove(key);
     }
 
     private static List<PersistenceUnitDescriptor> convertPersistenceUnits(
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java
new file mode 100644
index 0000000000000..7ef88ce9ad1ad
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/ProviderUtil.java
@@ -0,0 +1,25 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import javax.persistence.spi.LoadState;
+
+import org.hibernate.jpa.internal.util.PersistenceUtilHelper;
+
+public final class ProviderUtil implements javax.persistence.spi.ProviderUtil {
+
+    private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
+
+    @Override
+    public LoadState isLoadedWithoutReference(Object proxy, String property) {
+        return PersistenceUtilHelper.isLoadedWithoutReference(proxy, property, cache);
+    }
+
+    @Override
+    public LoadState isLoadedWithReference(Object proxy, String property) {
+        return PersistenceUtilHelper.isLoadedWithReference(proxy, property, cache);
+    }
+
+    @Override
+    public LoadState isLoaded(Object o) {
+        return PersistenceUtilHelper.isLoaded(o);
+    }
+}
\ No newline at end of file
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java
deleted file mode 100644
index 83bad4d47ab86..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.quarkus.hibernate.orm.runtime;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.RequestScoped;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-/**
- * Bean that is used to manage request scoped entity managers
- */
-@RequestScoped
-public class RequestScopedEntityManagerHolder {
-
-    private final Map<String, EntityManager> entityManagers = new HashMap<>();
-
-    public EntityManager getOrCreateEntityManager(String name, EntityManagerFactory factory) {
-        return entityManagers.computeIfAbsent(name, (n) -> factory.createEntityManager());
-    }
-
-    @PreDestroy
-    public void destroy() {
-        for (Map.Entry<String, EntityManager> entry : entityManagers.entrySet()) {
-            entry.getValue().close();
-        }
-    }
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java
new file mode 100644
index 0000000000000..726c8c788830f
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RequestScopedSessionHolder.java
@@ -0,0 +1,31 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.RequestScoped;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+/**
+ * Bean that is used to manage request scoped sessions
+ */
+@RequestScoped
+public class RequestScopedSessionHolder {
+
+    private final Map<String, Session> sessions = new HashMap<>();
+
+    public Session getOrCreateSession(String name, SessionFactory factory) {
+        return sessions.computeIfAbsent(name, (n) -> factory.openSession());
+    }
+
+    @PreDestroy
+    public void destroy() {
+        for (Map.Entry<String, Session> entry : sessions.entrySet()) {
+            entry.getValue().close();
+        }
+    }
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RuntimeSettings.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RuntimeSettings.java
index 4e7778fbfd291..34937dfaad008 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RuntimeSettings.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/RuntimeSettings.java
@@ -29,6 +29,11 @@ public boolean isConfigured(String key) {
         return settings.containsKey(key);
     }
 
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + " {" + settings.toString() + "}";
+    }
+
     public static class Builder {
 
         private final Map<String, Object> settings;
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java
new file mode 100644
index 0000000000000..2deb6703713f7
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/SingletonPersistenceProviderResolver.java
@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceProviderResolver;
+
+public final class SingletonPersistenceProviderResolver implements PersistenceProviderResolver {
+
+    private final List<PersistenceProvider> persistenceProviders;
+
+    public SingletonPersistenceProviderResolver(PersistenceProvider singleton) {
+        persistenceProviders = Collections.singletonList(singleton);
+    }
+
+    @Override
+    public List<PersistenceProvider> getPersistenceProviders() {
+        return persistenceProviders;
+    }
+
+    @Override
+    public void clearCachedProviders() {
+        // done!
+    }
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java
new file mode 100644
index 0000000000000..0a584f45d1f2b
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/StaticInitHibernatePersistenceProviderResolver.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.List;
+
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceProviderResolver;
+
+/**
+ * During the static init phase, we don't access the PersistenceProviderResolver.
+ */
+final class StaticInitHibernatePersistenceProviderResolver implements PersistenceProviderResolver {
+
+    @Override
+    public List<PersistenceProvider> getPersistenceProviders() {
+        throw new IllegalStateException("Persistence providers are not available during the static init phase.");
+    }
+
+    @Override
+    public void clearCachedProviders() {
+        throw new IllegalStateException("Persistence providers are not available during the static init phase.");
+    }
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionEntityManagers.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionEntityManagers.java
deleted file mode 100644
index bfdd53d23ec45..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionEntityManagers.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.quarkus.hibernate.orm.runtime;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
-
-import io.quarkus.arc.Arc;
-import io.quarkus.hibernate.orm.runtime.entitymanager.TransactionScopedEntityManager;
-
-@ApplicationScoped
-public class TransactionEntityManagers {
-
-    @Inject
-    JPAConfig jpaConfig;
-
-    @Inject
-    Instance<RequestScopedEntityManagerHolder> requestScopedEntityManagers;
-
-    private final ConcurrentMap<String, TransactionScopedEntityManager> managers;
-
-    public TransactionEntityManagers() {
-        this.managers = new ConcurrentHashMap<>();
-    }
-
-    public EntityManager getEntityManager(String unitName) {
-        TransactionScopedEntityManager entityManager = managers.get(unitName);
-        if (entityManager != null) {
-            return entityManager;
-        }
-        return managers.computeIfAbsent(unitName, (un) -> new TransactionScopedEntityManager(
-                getTransactionManager(), getTransactionSynchronizationRegistry(), jpaConfig.getEntityManagerFactory(un), un,
-                requestScopedEntityManagers));
-    }
-
-    private TransactionManager getTransactionManager() {
-        return Arc.container()
-                .instance(TransactionManager.class).get();
-    }
-
-    private TransactionSynchronizationRegistry getTransactionSynchronizationRegistry() {
-        return Arc.container()
-                .instance(TransactionSynchronizationRegistry.class).get();
-    }
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java
new file mode 100644
index 0000000000000..621a1c15e88f6
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/TransactionSessions.java
@@ -0,0 +1,54 @@
+package io.quarkus.hibernate.orm.runtime;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.hibernate.orm.runtime.session.TransactionScopedSession;
+
+@ApplicationScoped
+public class TransactionSessions {
+
+    @Inject
+    JPAConfig jpaConfig;
+
+    @Inject
+    Instance<RequestScopedSessionHolder> requestScopedSession;
+
+    private final ConcurrentMap<String, TransactionScopedSession> sessions;
+
+    public TransactionSessions() {
+        this.sessions = new ConcurrentHashMap<>();
+    }
+
+    public Session getSession(String unitName) {
+        TransactionScopedSession session = sessions.get(unitName);
+        if (session != null) {
+            return session;
+        }
+        return sessions.computeIfAbsent(unitName, (un) -> new TransactionScopedSession(
+                getTransactionManager(), getTransactionSynchronizationRegistry(),
+                jpaConfig.getEntityManagerFactory(un).unwrap(SessionFactory.class), un,
+                requestScopedSession));
+    }
+
+    private TransactionManager getTransactionManager() {
+        return Arc.container()
+                .instance(TransactionManager.class).get();
+    }
+
+    private TransactionSynchronizationRegistry getTransactionSynchronizationRegistry() {
+        return Arc.container()
+                .instance(TransactionSynchronizationRegistry.class).get();
+    }
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java
index 5e287a5cb4cb7..7490a4067dc6d 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java
@@ -69,8 +69,8 @@ public EntityManagerFactoryBuilder withDataSource(DataSource dataSource) {
     public EntityManagerFactory build() {
         try {
             final SessionFactoryOptionsBuilder optionsBuilder = metadata.buildSessionFactoryOptionsBuilder();
-            populate(optionsBuilder, standardServiceRegistry, multiTenancyStrategy);
-            return new SessionFactoryImpl(metadata.getOriginalMetadata(), optionsBuilder.buildOptions(), HQLQueryPlan::new);
+            populate(persistenceUnitName, optionsBuilder, standardServiceRegistry, multiTenancyStrategy);
+            return new SessionFactoryImpl(metadata, optionsBuilder.buildOptions(), HQLQueryPlan::new);
         } catch (Exception e) {
             throw persistenceException("Unable to build Hibernate SessionFactory", e);
         }
@@ -119,7 +119,8 @@ private String getExceptionHeader() {
         return "[PersistenceUnit: " + persistenceUnitName + "] ";
     }
 
-    protected void populate(SessionFactoryOptionsBuilder options, StandardServiceRegistry ssr, MultiTenancyStrategy strategy) {
+    protected void populate(String persistenceUnitName, SessionFactoryOptionsBuilder options, StandardServiceRegistry ssr,
+            MultiTenancyStrategy strategy) {
 
         // will use user override value or default to false if not supplied to follow
         // JPA spec.
@@ -164,7 +165,7 @@ protected void populate(SessionFactoryOptionsBuilder options, StandardServiceReg
 
         if (strategy != null && strategy != MultiTenancyStrategy.NONE) {
             options.applyMultiTenancyStrategy(strategy);
-            options.applyCurrentTenantIdentifierResolver(new HibernateCurrentTenantIdentifierResolver());
+            options.applyCurrentTenantIdentifierResolver(new HibernateCurrentTenantIdentifierResolver(persistenceUnitName));
         }
 
     }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java
index 02050ec244bf6..05353c01bffe4 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java
@@ -19,14 +19,17 @@
 import static org.hibernate.jpa.AvailableSettings.COLLECTION_CACHE_PREFIX;
 import static org.hibernate.jpa.AvailableSettings.PERSISTENCE_UNIT_NAME;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 import javax.persistence.PersistenceException;
 import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -62,6 +65,7 @@
 import org.hibernate.jpa.internal.util.LogHelper;
 import org.hibernate.jpa.internal.util.PersistenceUnitTransactionTypeHelper;
 import org.hibernate.jpa.spi.IdentifierGeneratorStrategyProvider;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
 import org.hibernate.service.Service;
@@ -71,7 +75,8 @@
 
 import io.quarkus.hibernate.orm.runtime.BuildTimeSettings;
 import io.quarkus.hibernate.orm.runtime.IntegrationSettings;
-import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrations;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener;
 import io.quarkus.hibernate.orm.runtime.proxies.PreGeneratedProxies;
 import io.quarkus.hibernate.orm.runtime.proxies.ProxyDefinitions;
 import io.quarkus.hibernate.orm.runtime.recording.PrevalidatedQuarkusMetadata;
@@ -96,16 +101,22 @@ public class FastBootMetadataBuilder {
     private final Collection<Class<? extends Integrator>> additionalIntegrators;
     private final Collection<ProvidedService> providedServices;
     private final PreGeneratedProxies preGeneratedProxies;
+    private final String dataSource;
     private final MultiTenancyStrategy multiTenancyStrategy;
     private final boolean isReactive;
+    private final boolean fromPersistenceXml;
+    private final List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors;
 
     @SuppressWarnings("unchecked")
     public FastBootMetadataBuilder(final QuarkusPersistenceUnitDefinition puDefinition, Scanner scanner,
             Collection<Class<? extends Integrator>> additionalIntegrators, PreGeneratedProxies preGeneratedProxies) {
         this.persistenceUnit = puDefinition.getActualHibernateDescriptor();
+        this.dataSource = puDefinition.getDataSource();
         this.isReactive = puDefinition.isReactive();
+        this.fromPersistenceXml = puDefinition.isFromPersistenceXml();
         this.additionalIntegrators = additionalIntegrators;
         this.preGeneratedProxies = preGeneratedProxies;
+        this.integrationStaticDescriptors = puDefinition.getIntegrationStaticDescriptors();
 
         // Copying semantics from: new EntityManagerFactoryBuilderImpl( unit,
         // integration, instance );
@@ -148,7 +159,7 @@ public FastBootMetadataBuilder(final QuarkusPersistenceUnitDefinition puDefiniti
         }
 
         final MetadataSources metadataSources = new MetadataSources(ssrBuilder.getBootstrapServiceRegistry());
-        addPUManagedClassNamesToMetadataSources(persistenceUnit, metadataSources);
+        // No need to populate annotatedClassNames/annotatedPackages: they are populated through scanning
 
         this.metamodelBuilder = (MetadataBuilderImplementor) metadataSources
                 .getMetadataBuilder(standardServiceRegistry);
@@ -173,19 +184,13 @@ public FastBootMetadataBuilder(final QuarkusPersistenceUnitDefinition puDefiniti
 
         final MultiTenancyStrategy strategy = puDefinition.getMultitenancyStrategy();
         if (strategy != null && strategy != MultiTenancyStrategy.NONE) {
-            ssrBuilder.addService(MultiTenantConnectionProvider.class, new HibernateMultiTenantConnectionProvider());
+            ssrBuilder.addService(MultiTenantConnectionProvider.class,
+                    new HibernateMultiTenantConnectionProvider(puDefinition.getName()));
         }
         this.multiTenancyStrategy = strategy;
 
     }
 
-    private void addPUManagedClassNamesToMetadataSources(PersistenceUnitDescriptor persistenceUnit,
-            MetadataSources metadataSources) {
-        for (String className : persistenceUnit.getManagedClassNames()) {
-            metadataSources.addAnnotatedClassName(className);
-        }
-    }
-
     /**
      * Simplified copy of
      * org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl#mergeSettings(org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor,
@@ -238,15 +243,41 @@ private MergedSettings mergeSettings(PersistenceUnitDescriptor persistenceUnit)
         //Agroal already does disable auto-commit, so Hibernate ORM should trust that:
         cfg.put(AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, Boolean.TRUE.toString());
 
+        /*
+         * Set CONNECTION_HANDLING to DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION
+         * as it generally performs better, at no known drawbacks.
+         * This is a new mode in Hibernate ORM, it might become the default in the future.
+         *
+         * Note: other connection handling modes lead to leaked resources, statements in particular.
+         * See https://github.com/quarkusio/quarkus/issues/7242, https://github.com/quarkusio/quarkus/issues/13273
+         *
+         * @see org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode
+         */
+        cfg.putIfAbsent(AvailableSettings.CONNECTION_HANDLING,
+                PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION);
+
         if (readBooleanConfigurationValue(cfg, WRAP_RESULT_SETS)) {
             LOG.warn("Wrapping result sets is not supported. Setting " + WRAP_RESULT_SETS + " to false.");
         }
         cfg.put(WRAP_RESULT_SETS, "false");
 
-        if (readBooleanConfigurationValue(cfg, XML_MAPPING_ENABLED)) {
-            LOG.warn("XML mapping is not supported. Setting " + XML_MAPPING_ENABLED + " to false.");
+        // Hibernate Envers (and others) require XML_MAPPING_ENABLED to be activated,
+        // but we don't want to enable this for any other use:
+        List<String> integrationsRequiringXmlMapping = integrationStaticDescriptors.stream()
+                .filter(HibernateOrmIntegrationStaticDescriptor::isXmlMappingRequired)
+                .map(HibernateOrmIntegrationStaticDescriptor::getIntegrationName).collect(Collectors.toList());
+        if (integrationStaticDescriptors.stream().anyMatch(HibernateOrmIntegrationStaticDescriptor::isXmlMappingRequired)) {
+            if (readBooleanConfigurationValue(cfg, XML_MAPPING_ENABLED)) {
+                LOG.warnf(
+                        "XML mapping is not supported. It will be partially activated to allow compatibility with %s, but this support is temporary",
+                        integrationsRequiringXmlMapping);
+            }
+        } else {
+            if (readBooleanConfigurationValue(cfg, XML_MAPPING_ENABLED)) {
+                LOG.warn("XML mapping is not supported. Setting " + XML_MAPPING_ENABLED + " to false.");
+            }
+            cfg.put(XML_MAPPING_ENABLED, "false");
         }
-        cfg.put(XML_MAPPING_ENABLED, "false");
 
         // Note: this one is not a boolean, just having the property enables it
         if (cfg.containsKey(JACC_ENABLED)) {
@@ -290,7 +321,12 @@ private MergedSettings mergeSettings(PersistenceUnitDescriptor persistenceUnit)
         cfg.put(org.hibernate.cfg.AvailableSettings.CACHE_REGION_FACTORY,
                 QuarkusInfinispanRegionFactory.class.getName());
 
-        HibernateOrmIntegrations.contributeBootProperties((k, v) -> cfg.put(k, v));
+        for (HibernateOrmIntegrationStaticDescriptor descriptor : integrationStaticDescriptors) {
+            Optional<HibernateOrmIntegrationStaticInitListener> listenerOptional = descriptor.getInitListener();
+            if (listenerOptional.isPresent()) {
+                listenerOptional.get().contributeBootProperties(cfg::put);
+            }
+        }
 
         return mergedSettings;
     }
@@ -303,8 +339,14 @@ public RecordedState build() {
         );
 
         IntegrationSettings.Builder integrationSettingsBuilder = new IntegrationSettings.Builder();
-        HibernateOrmIntegrations.onMetadataInitialized(fullMeta, metamodelBuilder.getBootstrapContext(),
-                (k, v) -> integrationSettingsBuilder.put(k, v));
+
+        for (HibernateOrmIntegrationStaticDescriptor descriptor : integrationStaticDescriptors) {
+            Optional<HibernateOrmIntegrationStaticInitListener> listenerOptional = descriptor.getInitListener();
+            if (listenerOptional.isPresent()) {
+                listenerOptional.get().onMetadataInitialized(fullMeta, metamodelBuilder.getBootstrapContext(),
+                        integrationSettingsBuilder::put);
+            }
+        }
 
         Dialect dialect = extractDialect();
         PrevalidatedQuarkusMetadata storeableMetadata = trimBootstrapMetadata(fullMeta);
@@ -312,7 +354,8 @@ public RecordedState build() {
         destroyServiceRegistry();
         ProxyDefinitions proxyClassDefinitions = ProxyDefinitions.createFromMetadata(storeableMetadata, preGeneratedProxies);
         return new RecordedState(dialect, storeableMetadata, buildTimeSettings, getIntegrators(),
-                providedServices, integrationSettingsBuilder.build(), proxyClassDefinitions, multiTenancyStrategy, isReactive);
+                providedServices, integrationSettingsBuilder.build(), proxyClassDefinitions, dataSource, multiTenancyStrategy,
+                isReactive, fromPersistenceXml);
     }
 
     private void destroyServiceRegistry() {
@@ -561,8 +604,8 @@ private void applyMetadataBuilderContributor() {
 
         if (metadataBuilderContributorImplClass != null) {
             try {
-                metadataBuilderContributor = metadataBuilderContributorImplClass.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                metadataBuilderContributor = metadataBuilderContributorImplClass.getDeclaredConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
                 throw new IllegalArgumentException("The MetadataBuilderContributor class ["
                         + metadataBuilderContributorImplClass + "] could not be instantiated!", e);
             }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/QuarkusPersistenceUnitDefinition.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/QuarkusPersistenceUnitDefinition.java
index 5ce1b1af20026..2f4e1de7fec17 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/QuarkusPersistenceUnitDefinition.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/QuarkusPersistenceUnitDefinition.java
@@ -11,6 +11,7 @@
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
 
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticDescriptor;
 import io.quarkus.runtime.ObjectSubstitution;
 
 /**
@@ -20,29 +21,43 @@
 public final class QuarkusPersistenceUnitDefinition {
 
     private final LightPersistenceXmlDescriptor actualHibernateDescriptor;
-    private final MultiTenancyStrategy strategy;
+    private final String dataSource;
+    private final MultiTenancyStrategy multitenancyStrategy;
     private final boolean isReactive;
+    private final boolean fromPersistenceXml;
+    private final List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors;
 
-    public QuarkusPersistenceUnitDefinition(PersistenceUnitDescriptor persistenceUnitDescriptor, MultiTenancyStrategy strategy,
-            boolean isReactive) {
+    public QuarkusPersistenceUnitDefinition(PersistenceUnitDescriptor persistenceUnitDescriptor, String dataSource,
+            MultiTenancyStrategy multitenancyStrategy, boolean isReactive, boolean fromPersistenceXml,
+            List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors) {
         Objects.requireNonNull(persistenceUnitDescriptor);
-        Objects.requireNonNull(strategy);
+        Objects.requireNonNull(multitenancyStrategy);
         this.actualHibernateDescriptor = LightPersistenceXmlDescriptor.validateAndReadFrom(persistenceUnitDescriptor);
-        this.strategy = strategy;
+        this.dataSource = dataSource;
+        this.multitenancyStrategy = multitenancyStrategy;
         this.isReactive = isReactive;
+        this.fromPersistenceXml = fromPersistenceXml;
+        this.integrationStaticDescriptors = integrationStaticDescriptors;
     }
 
     /**
      * For bytecode deserialization
      */
     private QuarkusPersistenceUnitDefinition(LightPersistenceXmlDescriptor persistenceUnitDescriptor,
-            MultiTenancyStrategy strategy,
-            boolean isReactive) {
+            String dataSource,
+            MultiTenancyStrategy multitenancyStrategy,
+            boolean isReactive,
+            boolean fromPersistenceXml,
+            List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors) {
         Objects.requireNonNull(persistenceUnitDescriptor);
-        Objects.requireNonNull(strategy);
+        Objects.requireNonNull(dataSource);
+        Objects.requireNonNull(multitenancyStrategy);
         this.actualHibernateDescriptor = persistenceUnitDescriptor;
-        this.strategy = strategy;
+        this.dataSource = dataSource;
+        this.multitenancyStrategy = multitenancyStrategy;
         this.isReactive = isReactive;
+        this.fromPersistenceXml = fromPersistenceXml;
+        this.integrationStaticDescriptors = integrationStaticDescriptors;
     }
 
     public PersistenceUnitDescriptor getActualHibernateDescriptor() {
@@ -53,8 +68,12 @@ public String getName() {
         return actualHibernateDescriptor.getName();
     }
 
+    public String getDataSource() {
+        return dataSource;
+    }
+
     public MultiTenancyStrategy getMultitenancyStrategy() {
-        return strategy;
+        return multitenancyStrategy;
     }
 
     //TODO assert that we match the right type of ORM!
@@ -62,14 +81,24 @@ public boolean isReactive() {
         return isReactive;
     }
 
+    public boolean isFromPersistenceXml() {
+        return fromPersistenceXml;
+    }
+
+    public List<HibernateOrmIntegrationStaticDescriptor> getIntegrationStaticDescriptors() {
+        return integrationStaticDescriptors;
+    }
+
     /**
      * This includes the state of both the QuarkusPersistenceUnitDefinition
      * and its more complex field of type LightPersistenceXmlDescriptor
      */
     public static class Serialized {
 
-        private MultiTenancyStrategy strategy;
+        private String dataSource;
+        private MultiTenancyStrategy multitenancyStrategy;
         private boolean isReactive;
+        private boolean fromPersistenceXml;
         private String puName;
         private String puProviderClassName;
         private boolean puUseQuotedIdentifiers;
@@ -78,9 +107,18 @@ public static class Serialized {
         private SharedCacheMode puSharedCachemode;
         private List<String> puManagedClassNames;
         private Properties puProperties;
+        private List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors;
 
         //All standard getters and setters generated by IDE:
 
+        public String getDataSource() {
+            return dataSource;
+        }
+
+        public void setDataSource(String dataSource) {
+            this.dataSource = dataSource;
+        }
+
         public String getPuName() {
             return puName;
         }
@@ -89,12 +127,12 @@ public void setPuName(String puName) {
             this.puName = puName;
         }
 
-        public MultiTenancyStrategy getStrategy() {
-            return strategy;
+        public MultiTenancyStrategy getMultitenancyStrategy() {
+            return multitenancyStrategy;
         }
 
-        public void setStrategy(MultiTenancyStrategy strategy) {
-            this.strategy = strategy;
+        public void setMultitenancyStrategy(MultiTenancyStrategy multitenancyStrategy) {
+            this.multitenancyStrategy = multitenancyStrategy;
         }
 
         public boolean isReactive() {
@@ -105,6 +143,14 @@ public void setReactive(boolean reactive) {
             isReactive = reactive;
         }
 
+        public boolean isFromPersistenceXml() {
+            return fromPersistenceXml;
+        }
+
+        public void setFromPersistenceXml(boolean fromPersistenceXml) {
+            this.fromPersistenceXml = fromPersistenceXml;
+        }
+
         public String getPuProviderClassName() {
             return puProviderClassName;
         }
@@ -160,6 +206,15 @@ public Properties getPuProperties() {
         public void setPuProperties(Properties puProperties) {
             this.puProperties = puProperties;
         }
+
+        public List<HibernateOrmIntegrationStaticDescriptor> getIntegrationStaticDescriptors() {
+            return integrationStaticDescriptors;
+        }
+
+        public void setIntegrationStaticDescriptors(
+                List<HibernateOrmIntegrationStaticDescriptor> integrationStaticDescriptors) {
+            this.integrationStaticDescriptors = integrationStaticDescriptors;
+        }
     }
 
     public static final class Substitution implements ObjectSubstitution<QuarkusPersistenceUnitDefinition, Serialized> {
@@ -177,8 +232,11 @@ public Serialized serialize(final QuarkusPersistenceUnitDefinition obj) {
             s.setPuManagedClassNames(obj.actualHibernateDescriptor.getManagedClassNames());
             s.setPuProperties(obj.actualHibernateDescriptor.getProperties());
             //Remaining fields of QuarkusPersistenceUnitDefinition
-            s.setStrategy(obj.getMultitenancyStrategy());
+            s.setDataSource(obj.getDataSource());
+            s.setMultitenancyStrategy(obj.getMultitenancyStrategy());
             s.setReactive(obj.isReactive);
+            s.setFromPersistenceXml(obj.isFromPersistenceXml());
+            s.setIntegrationStaticDescriptors(obj.getIntegrationStaticDescriptors());
             return s;
         }
 
@@ -188,7 +246,8 @@ public QuarkusPersistenceUnitDefinition deserialize(Serialized obj) {
                     obj.puName, obj.puProviderClassName, obj.puUseQuotedIdentifiers, obj.puTransactionType,
                     obj.puValidationMode, obj.puSharedCachemode, obj.puManagedClassNames, obj.puProperties);
 
-            return new QuarkusPersistenceUnitDefinition(xmlDescriptor, obj.getStrategy(), obj.isReactive());
+            return new QuarkusPersistenceUnitDefinition(xmlDescriptor, obj.getDataSource(), obj.getMultitenancyStrategy(),
+                    obj.isReactive(), obj.isFromPersistenceXml(), obj.getIntegrationStaticDescriptors());
         }
     }
 
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RecordableBootstrapFactory.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RecordableBootstrapFactory.java
index 26ddc5648c327..13dce20f0ac6b 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RecordableBootstrapFactory.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/RecordableBootstrapFactory.java
@@ -1,5 +1,7 @@
 package io.quarkus.hibernate.orm.runtime.boot;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
@@ -51,9 +53,10 @@ private static InitialInitiatorListProvider initReactiveListProviderMaybe() {
             //Use reflection as we don't want the Hibernate ORM extension to depend on the Hibernate Reactive extension:
             final Class<?> forName = Class
                     .forName("io.quarkus.hibernate.reactive.runtime.boot.registry.ReactiveHibernateInitiatorListProvider");
-            final Object o = forName.newInstance();
+            final Object o = forName.getDeclaredConstructor().newInstance();
             return (InitialInitiatorListProvider) o;
-        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException
+                | InvocationTargetException e) {
             //Be silent as this is a static initializer: most likely the Hibernate Reactive extension is
             //not on the classpath, which implies we won't need this.
             return null;
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java
index 8566719f2e4b7..c90ac314b263a 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java
@@ -15,6 +15,7 @@
 import org.hibernate.engine.jdbc.batch.internal.BatchBuilderInitiator;
 import org.hibernate.engine.jdbc.connections.internal.MultiTenantConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.cursor.internal.RefCursorSupportInitiator;
+import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
 import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator;
 import org.hibernate.event.internal.EntityCopyObserverFactoryInitiator;
 import org.hibernate.hql.internal.QueryTranslatorFactoryInitiator;
@@ -22,13 +23,12 @@
 import org.hibernate.persister.internal.PersisterClassResolverInitiator;
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
-import org.hibernate.resource.beans.spi.ManagedBeanRegistryInitiator;
 import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
 import org.hibernate.service.internal.ProvidedService;
 import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
-import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator;
 import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
 
+import io.quarkus.hibernate.orm.runtime.cdi.QuarkusManagedBeanRegistryInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.DisabledBytecodeProviderInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProviderInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusJndiServiceInitiator;
@@ -38,8 +38,9 @@
 import io.quarkus.hibernate.orm.runtime.service.CfgXmlAccessServiceInitiatorQuarkus;
 import io.quarkus.hibernate.orm.runtime.service.DisabledJMXInitiator;
 import io.quarkus.hibernate.orm.runtime.service.FlatClassLoaderService;
-import io.quarkus.hibernate.orm.runtime.service.QuarkusJdbcEnvironmentInitiator;
+import io.quarkus.hibernate.orm.runtime.service.QuarkusImportSqlCommandExtractorInitiator;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusRegionFactoryInitiator;
+import io.quarkus.hibernate.orm.runtime.service.QuarkusStaticDialectFactoryInitiator;
 
 /**
  * Helps to instantiate a ServiceRegistryBuilder from a previous state. This
@@ -62,7 +63,7 @@ public PreconfiguredServiceRegistryBuilder(RecordedState rs) {
         checkIsNotReactive(rs);
         this.initiators = buildQuarkusServiceInitiatorList(rs);
         this.integrators = rs.getIntegrators();
-        this.destroyedRegistry = (StandardServiceRegistryImpl) rs.getMetadata().getOriginalMetadata()
+        this.destroyedRegistry = (StandardServiceRegistryImpl) rs.getMetadata()
                 .getMetadataBuildingOptions()
                 .getServiceRegistry();
     }
@@ -135,7 +136,7 @@ private BootstrapServiceRegistry buildEmptyBootstrapServiceRegistry() {
     /**
      * Modified copy from
      * org.hibernate.service.StandardServiceInitiators#buildStandardServiceInitiatorList
-     *
+     * <p>
      * N.B. not to be confused with
      * org.hibernate.service.internal.StandardSessionFactoryServiceInitiators#buildStandardServiceInitiatorList()
      *
@@ -161,14 +162,14 @@ private static List<StandardServiceInitiator> buildQuarkusServiceInitiatorList(R
         // TODO (optional): assume entities are already enhanced?
         serviceInitiators.add(PropertyAccessStrategyResolverInitiator.INSTANCE);
 
-        // TODO (optional): not a priority
-        serviceInitiators.add(ImportSqlCommandExtractorInitiator.INSTANCE);
+        // Custom one!
+        serviceInitiators.add(QuarkusImportSqlCommandExtractorInitiator.INSTANCE);
 
         // TODO disable?
         serviceInitiators.add(SchemaManagementToolInitiator.INSTANCE);
 
-        // Replaces JdbcEnvironmentInitiator.INSTANCE :
-        serviceInitiators.add(new QuarkusJdbcEnvironmentInitiator(rs.getDialect()));
+        // Useful as-is: it performs detection of driver capabilities in particular
+        serviceInitiators.add(JdbcEnvironmentInitiator.INSTANCE);
 
         // Custom one!
         serviceInitiators.add(QuarkusJndiServiceInitiator.INSTANCE);
@@ -186,8 +187,8 @@ private static List<StandardServiceInitiator> buildQuarkusServiceInitiatorList(R
         // Disabled: Dialect is injected explicitly
         // serviceInitiators.add( DialectResolverInitiator.INSTANCE );
 
-        // Disabled: Dialect is injected explicitly
-        // serviceInitiators.add( DialectFactoryInitiator.INSTANCE );
+        // Custom one: Dialect is injected explicitly
+        serviceInitiators.add(new QuarkusStaticDialectFactoryInitiator(rs.getDialect()));
 
         serviceInitiators.add(BatchBuilderInitiator.INSTANCE);
         serviceInitiators.add(JdbcServicesInitiator.INSTANCE);
@@ -207,7 +208,8 @@ private static List<StandardServiceInitiator> buildQuarkusServiceInitiatorList(R
 
         serviceInitiators.add(TransactionCoordinatorBuilderInitiator.INSTANCE);
 
-        serviceInitiators.add(ManagedBeanRegistryInitiator.INSTANCE);
+        // Replaces ManagedBeanRegistryInitiator.INSTANCE
+        serviceInitiators.add(QuarkusManagedBeanRegistryInitiator.INSTANCE);
 
         serviceInitiators.add(EntityCopyObserverFactoryInitiator.INSTANCE);
 
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java
index 41c26590e4073..b00343709b9ad 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/scan/QuarkusScanner.java
@@ -1,6 +1,7 @@
 package io.quarkus.hibernate.orm.runtime.boot.scan;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.hibernate.boot.archive.internal.UrlInputStreamAccess;
@@ -22,11 +23,20 @@
  */
 public class QuarkusScanner implements Scanner {
 
+    private Set<PackageDescriptor> packageDescriptors;
     private Set<ClassDescriptor> classDescriptors;
 
     @Override
     public ScanResult scan(ScanEnvironment scanEnvironment, ScanOptions scanOptions, ScanParameters scanParameters) {
-        return new Result();
+        return new Result(packageDescriptors, classDescriptors, scanEnvironment, scanOptions);
+    }
+
+    public Set<PackageDescriptor> getPackageDescriptors() {
+        return packageDescriptors;
+    }
+
+    public void setPackageDescriptors(Set<PackageDescriptor> packageDescriptors) {
+        this.packageDescriptors = packageDescriptors;
     }
 
     public Set<ClassDescriptor> getClassDescriptors() {
@@ -37,17 +47,39 @@ public void setClassDescriptors(Set<ClassDescriptor> classDescriptors) {
         this.classDescriptors = classDescriptors;
     }
 
-    public class Result implements ScanResult {
+    public static class Result implements ScanResult {
+
+        private final Set<PackageDescriptor> selectedPackageDescriptors;
+        private final Set<ClassDescriptor> selectedClassDescriptors;
+
+        Result(Set<PackageDescriptor> packageDescriptors, Set<ClassDescriptor> classDescriptors,
+                ScanEnvironment scanEnvironment, ScanOptions scanOptions) {
+            this.selectedPackageDescriptors = new HashSet<>();
+            this.selectedClassDescriptors = new HashSet<>();
+
+            for (PackageDescriptor packageDescriptor : packageDescriptors) {
+                if (scanOptions.canDetectUnlistedClassesInRoot() ||
+                        scanEnvironment.getExplicitlyListedClassNames().contains(packageDescriptor.getName())) {
+                    this.selectedPackageDescriptors.add(packageDescriptor);
+                }
+            }
+
+            for (ClassDescriptor classDescriptor : classDescriptors) {
+                if (scanOptions.canDetectUnlistedClassesInRoot() ||
+                        scanEnvironment.getExplicitlyListedClassNames().contains(classDescriptor.getName())) {
+                    this.selectedClassDescriptors.add(classDescriptor);
+                }
+            }
+        }
 
         @Override
         public Set<PackageDescriptor> getLocatedPackages() {
-            //todo: handle packages
-            return Collections.emptySet();
+            return selectedPackageDescriptors;
         }
 
         @Override
         public Set<ClassDescriptor> getLocatedClasses() {
-            return classDescriptors;
+            return selectedClassDescriptors;
         }
 
         @Override
@@ -57,6 +89,33 @@ public Set<MappingFileDescriptor> getLocatedMappingFiles() {
         }
     }
 
+    public static class PackageDescriptorImpl implements PackageDescriptor {
+
+        private String name;
+
+        public PackageDescriptorImpl(String name) {
+            this.name = name;
+        }
+
+        public PackageDescriptorImpl() {
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public InputStreamAccess getStreamAccess() {
+            return new UrlInputStreamAccess(
+                    Thread.currentThread().getContextClassLoader().getResource(name.replace('.', '/') + "/package-info.class"));
+        }
+    }
+
     public static class ClassDescriptorImpl implements ClassDescriptor {
 
         private String name;
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java
new file mode 100644
index 0000000000000..7271dba47d473
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusArcBeanContainer.java
@@ -0,0 +1,55 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package io.quarkus.hibernate.orm.runtime.cdi;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.resource.beans.container.spi.AbstractCdiBeanContainer;
+import org.hibernate.resource.beans.container.spi.BeanLifecycleStrategy;
+import org.hibernate.resource.beans.container.spi.ContainedBeanImplementor;
+import org.hibernate.resource.beans.spi.BeanInstanceProducer;
+
+@Singleton
+public class QuarkusArcBeanContainer extends AbstractCdiBeanContainer {
+
+    @Inject
+    BeanManager beanManager;
+
+    @Override
+    public BeanManager getUsableBeanManager() {
+        return beanManager;
+    }
+
+    @Override
+    protected <B> ContainedBeanImplementor<B> createBean(Class<B> beanType,
+            BeanLifecycleStrategy lifecycleStrategy, BeanInstanceProducer fallbackProducer) {
+        ContainedBeanImplementor<B> bean = lifecycleStrategy.createBean(beanType, fallbackProducer, this);
+        bean.initialize();
+        return bean;
+    }
+
+    @Override
+    protected <B> ContainedBeanImplementor<B> createBean(String name, Class<B> beanType,
+            BeanLifecycleStrategy lifecycleStrategy, BeanInstanceProducer fallbackProducer) {
+        ContainedBeanImplementor<B> bean = lifecycleStrategy.createBean(name, beanType,
+                fallbackProducer, this);
+        bean.initialize();
+        return bean;
+    }
+
+    /**
+     * This will happen after Hibernate ORM is stopped;
+     * see io.quarkus.hibernate.orm.runtime.JPAConfig#destroy(java.lang.Object).
+     */
+    @PreDestroy
+    public void destroy() {
+        stop();
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusManagedBeanRegistry.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusManagedBeanRegistry.java
new file mode 100644
index 0000000000000..b7043f59ad7fb
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusManagedBeanRegistry.java
@@ -0,0 +1,91 @@
+package io.quarkus.hibernate.orm.runtime.cdi;
+
+import org.hibernate.resource.beans.container.spi.BeanContainer;
+import org.hibernate.resource.beans.container.spi.ContainedBean;
+import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
+import org.hibernate.resource.beans.spi.ManagedBean;
+import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
+
+import io.quarkus.arc.Arc;
+
+/**
+ * A replacement for ManagedBeanRegistryImpl that:
+ * <ul>
+ * <li>forces the use of QuarkusManagedBeanRegistry,
+ * which works with Arc and respects configured scopes when instantiating CDI beans.</li>
+ * <li>is not stoppable and leaves the release of beans to {@link QuarkusArcBeanContainer},
+ * so that the bean container and its beans can be reused between static init and runtime init,
+ * even though we stop Hibernate ORM services after the end of static init.</li>
+ * </ul>
+ *
+ * @see QuarkusArcBeanContainer
+ */
+public class QuarkusManagedBeanRegistry implements ManagedBeanRegistry {
+
+    private final QuarkusArcBeanContainer beanContainer;
+
+    public QuarkusManagedBeanRegistry() {
+        this.beanContainer = Arc.container().instance(QuarkusArcBeanContainer.class).get();
+    }
+
+    @Override
+    public <T> ManagedBean<T> getBean(Class<T> beanClass) {
+        return new ContainedBeanManagedBeanAdapter<>(beanClass,
+                beanContainer.getBean(beanClass, QuarkusBeanContainerLifecycleOptions.INSTANCE,
+                        FallbackBeanInstanceProducer.INSTANCE));
+    }
+
+    @Override
+    public <T> ManagedBean<T> getBean(String beanName, Class<T> beanContract) {
+        return new ContainedBeanManagedBeanAdapter<>(beanContract,
+                beanContainer.getBean(beanName, beanContract, QuarkusBeanContainerLifecycleOptions.INSTANCE,
+                        FallbackBeanInstanceProducer.INSTANCE));
+    }
+
+    @Override
+    public BeanContainer getBeanContainer() {
+        return beanContainer;
+    }
+
+    private static class ContainedBeanManagedBeanAdapter<B> implements ManagedBean<B> {
+        private final Class<B> beanClass;
+        private final ContainedBean<B> containedBean;
+
+        private ContainedBeanManagedBeanAdapter(Class<B> beanClass, ContainedBean<B> containedBean) {
+            this.beanClass = beanClass;
+            this.containedBean = containedBean;
+        }
+
+        @Override
+        public Class<B> getBeanClass() {
+            return beanClass;
+        }
+
+        @Override
+        public B getBeanInstance() {
+            return containedBean.getBeanInstance();
+        }
+    }
+
+    private static final class QuarkusBeanContainerLifecycleOptions implements BeanContainer.LifecycleOptions {
+        private static final QuarkusBeanContainerLifecycleOptions INSTANCE = new QuarkusBeanContainerLifecycleOptions();
+
+        private QuarkusBeanContainerLifecycleOptions() {
+        }
+
+        @Override
+        public boolean useJpaCompliantCreation() {
+            // Arc doesn't support all the BeanManager methods required to implement JPA-compliant bean creation.
+            // Anyway, JPA-compliant bean creation means we completely disregard the scope of beans
+            // (e.g. @Dependent, @ApplicationScoped), which doesn't seem wise.
+            // So we're probably better off this way.
+            return false;
+        }
+
+        @Override
+        public boolean canUseCachedReferences() {
+            // Let Arc do the caching based on scopes
+            return false;
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusManagedBeanRegistryInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusManagedBeanRegistryInitiator.java
new file mode 100644
index 0000000000000..b40b98e19067e
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/cdi/QuarkusManagedBeanRegistryInitiator.java
@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.orm.runtime.cdi;
+
+import java.util.Map;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+
+public class QuarkusManagedBeanRegistryInitiator implements StandardServiceInitiator<ManagedBeanRegistry> {
+    public static final QuarkusManagedBeanRegistryInitiator INSTANCE = new QuarkusManagedBeanRegistryInitiator();
+
+    @Override
+    public Class<ManagedBeanRegistry> getServiceInitiated() {
+        return ManagedBeanRegistry.class;
+    }
+
+    @Override
+    public ManagedBeanRegistry initiateService(Map configurationValues, ServiceRegistryImplementor serviceRegistry) {
+        return new QuarkusManagedBeanRegistry();
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/BootstrapOnlyProxyFactoryFactoryInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/BootstrapOnlyProxyFactoryFactoryInitiator.java
index 45d565aa06f98..f58b947e41f96 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/BootstrapOnlyProxyFactoryFactoryInitiator.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/BootstrapOnlyProxyFactoryFactoryInitiator.java
@@ -7,6 +7,8 @@
 import org.hibernate.bytecode.spi.ProxyFactoryFactory;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
+import net.bytebuddy.ClassFileVersion;
+
 /**
  * We need a different implementation of ProxyFactoryFactory during the build than at runtime,
  * so to allow metadata validation. This implementation is then swapped after the metadata has been recorded.
@@ -22,7 +24,7 @@ public final class BootstrapOnlyProxyFactoryFactoryInitiator implements Standard
 
     @Override
     public ProxyFactoryFactory initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
-        BytecodeProviderImpl bbProvider = new BytecodeProviderImpl();
+        BytecodeProviderImpl bbProvider = new BytecodeProviderImpl(ClassFileVersion.JAVA_V8);
         return bbProvider.getProxyFactoryFactory();
     }
 
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java
index 66c60a703ffc9..bcef7173c4010 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/customized/QuarkusJtaPlatform.java
@@ -1,26 +1,72 @@
 package io.quarkus.hibernate.orm.runtime.customized;
 
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform;
+import org.hibernate.engine.transaction.jta.platform.internal.JtaSynchronizationStrategy;
+import org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerAccess;
+import org.hibernate.engine.transaction.jta.platform.internal.TransactionManagerBasedSynchronizationStrategy;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 
-public final class QuarkusJtaPlatform extends AbstractJtaPlatform {
+public final class QuarkusJtaPlatform implements JtaPlatform, TransactionManagerAccess {
 
     public static final QuarkusJtaPlatform INSTANCE = new QuarkusJtaPlatform();
 
+    private final JtaSynchronizationStrategy tmSynchronizationStrategy = new TransactionManagerBasedSynchronizationStrategy(
+            this);
+    private volatile TransactionManager transactionManager;
+    private volatile UserTransaction userTransaction;
+
     private QuarkusJtaPlatform() {
         //nothing
     }
 
     @Override
-    protected TransactionManager locateTransactionManager() {
-        return com.arjuna.ats.jta.TransactionManager.transactionManager();
+    public TransactionManager retrieveTransactionManager() {
+        TransactionManager transactionManager = this.transactionManager;
+        if (transactionManager == null) {
+            transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager();
+            this.transactionManager = transactionManager;
+        }
+        return transactionManager;
+    }
+
+    @Override
+    public TransactionManager getTransactionManager() {
+        return retrieveTransactionManager();
+    }
+
+    @Override
+    public UserTransaction retrieveUserTransaction() {
+        UserTransaction userTransaction = this.userTransaction;
+        if (this.userTransaction == null) {
+            userTransaction = com.arjuna.ats.jta.UserTransaction.userTransaction();
+            this.userTransaction = userTransaction;
+        }
+        return userTransaction;
+    }
+
+    @Override
+    public Object getTransactionIdentifier(final Transaction transaction) {
+        return transaction;
+    }
+
+    @Override
+    public void registerSynchronization(Synchronization synchronization) {
+        this.tmSynchronizationStrategy.registerSynchronization(synchronization);
+    }
+
+    @Override
+    public boolean canRegisterSynchronization() {
+        return this.tmSynchronizationStrategy.canRegisterSynchronization();
     }
 
     @Override
-    protected UserTransaction locateUserTransaction() {
-        return com.arjuna.ats.jta.UserTransaction.userTransaction();
+    public int getCurrentStatus() throws SystemException {
+        return this.retrieveTransactionManager().getStatus();
     }
 
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java
deleted file mode 100644
index 426c6cad11ea6..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package io.quarkus.hibernate.orm.runtime.entitymanager;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.metamodel.Metamodel;
-
-public abstract class ForwardingEntityManager implements EntityManager {
-
-    protected abstract EntityManager delegate();
-
-    @Override
-    public void persist(Object entity) {
-        delegate().persist(entity);
-    }
-
-    @Override
-    public <T> T merge(T entity) {
-        return delegate().merge(entity);
-    }
-
-    @Override
-    public void remove(Object entity) {
-        delegate().remove(entity);
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey) {
-        return delegate().find(entityClass, primaryKey);
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
-        return delegate().find(entityClass, primaryKey, properties);
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
-        return delegate().find(entityClass, primaryKey, lockMode);
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
-        return delegate().find(entityClass, primaryKey, lockMode, properties);
-    }
-
-    @Override
-    public <T> T getReference(Class<T> entityClass, Object primaryKey) {
-        return delegate().getReference(entityClass, primaryKey);
-    }
-
-    @Override
-    public void flush() {
-        delegate().flush();
-    }
-
-    @Override
-    public void setFlushMode(FlushModeType flushMode) {
-        delegate().setFlushMode(flushMode);
-    }
-
-    @Override
-    public FlushModeType getFlushMode() {
-        return delegate().getFlushMode();
-    }
-
-    @Override
-    public void lock(Object entity, LockModeType lockMode) {
-        delegate().lock(entity, lockMode);
-    }
-
-    @Override
-    public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-        delegate().lock(entity, lockMode, properties);
-    }
-
-    @Override
-    public void refresh(Object entity) {
-        delegate().refresh(entity);
-    }
-
-    @Override
-    public void refresh(Object entity, Map<String, Object> properties) {
-        delegate().refresh(entity, properties);
-    }
-
-    @Override
-    public void refresh(Object entity, LockModeType lockMode) {
-        delegate().refresh(entity, lockMode);
-    }
-
-    @Override
-    public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-        delegate().refresh(entity, lockMode, properties);
-    }
-
-    @Override
-    public void clear() {
-        delegate().clear();
-    }
-
-    @Override
-    public void detach(Object entity) {
-        delegate().detach(entity);
-    }
-
-    @Override
-    public boolean contains(Object entity) {
-        return delegate().contains(entity);
-    }
-
-    @Override
-    public LockModeType getLockMode(Object entity) {
-        return delegate().getLockMode(entity);
-    }
-
-    @Override
-    public void setProperty(String propertyName, Object value) {
-        delegate().setProperty(propertyName, value);
-    }
-
-    @Override
-    public Map<String, Object> getProperties() {
-        return delegate().getProperties();
-    }
-
-    @Override
-    public Query createQuery(String qlString) {
-        return delegate().createQuery(qlString);
-    }
-
-    @Override
-    public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
-        return delegate().createQuery(criteriaQuery);
-    }
-
-    @Override
-    public Query createQuery(CriteriaUpdate updateQuery) {
-        return delegate().createQuery(updateQuery);
-    }
-
-    @Override
-    public Query createQuery(CriteriaDelete deleteQuery) {
-        return delegate().createQuery(deleteQuery);
-    }
-
-    @Override
-    public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-        return delegate().createQuery(qlString, resultClass);
-    }
-
-    @Override
-    public Query createNamedQuery(String name) {
-        return delegate().createNamedQuery(name);
-    }
-
-    @Override
-    public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-        return delegate().createNamedQuery(name, resultClass);
-    }
-
-    @Override
-    public Query createNativeQuery(String sqlString) {
-        return delegate().createNativeQuery(sqlString);
-    }
-
-    @Override
-    public Query createNativeQuery(String sqlString, Class resultClass) {
-        return delegate().createNativeQuery(sqlString, resultClass);
-    }
-
-    @Override
-    public Query createNativeQuery(String sqlString, String resultSetMapping) {
-        return delegate().createNativeQuery(sqlString, resultSetMapping);
-    }
-
-    @Override
-    public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-        return delegate().createNamedStoredProcedureQuery(name);
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-        return delegate().createStoredProcedureQuery(procedureName);
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-        return delegate().createStoredProcedureQuery(procedureName, resultClasses);
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-        return delegate().createStoredProcedureQuery(procedureName, resultSetMappings);
-    }
-
-    @Override
-    public void joinTransaction() {
-        delegate().joinTransaction();
-    }
-
-    @Override
-    public boolean isJoinedToTransaction() {
-        return delegate().isJoinedToTransaction();
-    }
-
-    @Override
-    public <T> T unwrap(Class<T> cls) {
-        return delegate().unwrap(cls);
-    }
-
-    @Override
-    public Object getDelegate() {
-        return delegate().getDelegate();
-    }
-
-    @Override
-    public void close() {
-        delegate().close();
-    }
-
-    @Override
-    public boolean isOpen() {
-        return delegate().isOpen();
-    }
-
-    @Override
-    public EntityTransaction getTransaction() {
-        return delegate().getTransaction();
-    }
-
-    @Override
-    public EntityManagerFactory getEntityManagerFactory() {
-        return delegate().getEntityManagerFactory();
-    }
-
-    @Override
-    public CriteriaBuilder getCriteriaBuilder() {
-        return delegate().getCriteriaBuilder();
-    }
-
-    @Override
-    public Metamodel getMetamodel() {
-        return delegate().getMetamodel();
-    }
-
-    @Override
-    public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-        return delegate().createEntityGraph(rootType);
-    }
-
-    @Override
-    public EntityGraph<?> createEntityGraph(String graphName) {
-        return delegate().createEntityGraph(graphName);
-    }
-
-    @Override
-    public EntityGraph<?> getEntityGraph(String graphName) {
-        return delegate().getEntityGraph(graphName);
-    }
-
-    @Override
-    public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-        return delegate().getEntityGraphs(entityClass);
-    }
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java
deleted file mode 100644
index 46652e3f4c23f..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java
+++ /dev/null
@@ -1,538 +0,0 @@
-package io.quarkus.hibernate.orm.runtime.entitymanager;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.enterprise.inject.Instance;
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.StoredProcedureQuery;
-import javax.persistence.TransactionRequiredException;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.metamodel.Metamodel;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
-
-import io.quarkus.hibernate.orm.runtime.RequestScopedEntityManagerHolder;
-import io.quarkus.runtime.BlockingOperationControl;
-
-public class TransactionScopedEntityManager implements EntityManager {
-
-    protected static final String TRANSACTION_IS_NOT_ACTIVE = "Transaction is not active, consider adding @Transactional to your method to automatically activate one.";
-    private final TransactionManager transactionManager;
-    private final TransactionSynchronizationRegistry tsr;
-    private final EntityManagerFactory emf;
-    private final String unitName;
-    private static final Object transactionKey = new Object();
-    private final Instance<RequestScopedEntityManagerHolder> requestScopedEms;
-
-    public TransactionScopedEntityManager(TransactionManager transactionManager,
-            TransactionSynchronizationRegistry tsr,
-            EntityManagerFactory emf,
-            String unitName, Instance<RequestScopedEntityManagerHolder> requestScopedEms) {
-        this.transactionManager = transactionManager;
-        this.tsr = tsr;
-        this.emf = emf;
-        this.unitName = unitName;
-        this.requestScopedEms = requestScopedEms;
-    }
-
-    EntityManagerResult getEntityManager() {
-        if (isInTransaction()) {
-            EntityManager em = (EntityManager) tsr.getResource(transactionKey);
-            if (em != null) {
-                return new EntityManagerResult(em, false, true);
-            }
-            EntityManager newEm = emf.createEntityManager();
-            newEm.joinTransaction();
-            tsr.putResource(transactionKey, newEm);
-            tsr.registerInterposedSynchronization(new Synchronization() {
-                @Override
-                public void beforeCompletion() {
-                    newEm.flush();
-                }
-
-                @Override
-                public void afterCompletion(int i) {
-                    newEm.close();
-                }
-            });
-            return new EntityManagerResult(newEm, false, true);
-        } else {
-            //this will throw an exception if the request scope is not active
-            //this is expected as either the request scope or an active transaction
-            //is required to properly managed the EM lifecycle
-            RequestScopedEntityManagerHolder requestScopedEms = this.requestScopedEms.get();
-            return new EntityManagerResult(requestScopedEms.getOrCreateEntityManager(unitName, emf), false, false);
-        }
-    }
-
-    private void checkBlocking() {
-        if (!BlockingOperationControl.isBlockingAllowed()) {
-            throw new IllegalStateException(
-                    "You have attempted to perform a blocking operation on a IO thread. This is not allowed, as blocking the IO thread will cause major performance issues with your application. If you want to perform blocking EntityManager operations make sure you are doing it from a worker thread.");
-        }
-    }
-
-    private boolean isInTransaction() {
-        try {
-            switch (transactionManager.getStatus()) {
-                case Status.STATUS_ACTIVE:
-                case Status.STATUS_COMMITTING:
-                case Status.STATUS_MARKED_ROLLBACK:
-                case Status.STATUS_PREPARED:
-                case Status.STATUS_PREPARING:
-                    return true;
-                default:
-                    return false;
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void persist(Object entity) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.persist(entity);
-        }
-    }
-
-    @Override
-    public <T> T merge(T entity) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            return emr.em.merge(entity);
-        }
-    }
-
-    @Override
-    public void remove(Object entity) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.remove(entity);
-        }
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.find(entityClass, primaryKey);
-        }
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.find(entityClass, primaryKey, properties);
-        }
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.find(entityClass, primaryKey, lockMode);
-        }
-    }
-
-    @Override
-    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.find(entityClass, primaryKey, lockMode, properties);
-        }
-    }
-
-    @Override
-    public <T> T getReference(Class<T> entityClass, Object primaryKey) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getReference(entityClass, primaryKey);
-        }
-    }
-
-    @Override
-    public void flush() {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.flush();
-        }
-    }
-
-    @Override
-    public void setFlushMode(FlushModeType flushMode) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            emr.em.setFlushMode(flushMode);
-        }
-    }
-
-    @Override
-    public FlushModeType getFlushMode() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getFlushMode();
-        }
-    }
-
-    @Override
-    public void lock(Object entity, LockModeType lockMode) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.lock(entity, lockMode);
-        }
-    }
-
-    @Override
-    public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.lock(entity, lockMode, properties);
-        }
-    }
-
-    @Override
-    public void refresh(Object entity) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.refresh(entity);
-        }
-    }
-
-    @Override
-    public void refresh(Object entity, Map<String, Object> properties) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.refresh(entity, properties);
-        }
-    }
-
-    @Override
-    public void refresh(Object entity, LockModeType lockMode) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.refresh(entity, lockMode);
-        }
-    }
-
-    @Override
-    public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            if (!emr.allowModification) {
-                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
-            }
-            emr.em.refresh(entity, lockMode, properties);
-        }
-    }
-
-    @Override
-    public void clear() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            emr.em.clear();
-        }
-    }
-
-    @Override
-    public void detach(Object entity) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            emr.em.detach(entity);
-        }
-    }
-
-    @Override
-    public boolean contains(Object entity) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.contains(entity);
-        }
-    }
-
-    @Override
-    public LockModeType getLockMode(Object entity) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getLockMode(entity);
-        }
-    }
-
-    @Override
-    public void setProperty(String propertyName, Object value) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            emr.em.setProperty(propertyName, value);
-        }
-    }
-
-    @Override
-    public Map<String, Object> getProperties() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getProperties();
-        }
-    }
-
-    @Override
-    public Query createQuery(String qlString) {
-        checkBlocking();
-        //TODO: this needs some thought for how it works outside a tx
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createQuery(qlString);
-        }
-    }
-
-    @Override
-    public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createQuery(criteriaQuery);
-        }
-    }
-
-    @Override
-    public Query createQuery(CriteriaUpdate updateQuery) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createQuery(updateQuery);
-        }
-    }
-
-    @Override
-    public Query createQuery(CriteriaDelete deleteQuery) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createQuery(deleteQuery);
-        }
-    }
-
-    @Override
-    public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createQuery(qlString, resultClass);
-        }
-    }
-
-    @Override
-    public Query createNamedQuery(String name) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createNamedQuery(name);
-        }
-    }
-
-    @Override
-    public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createNamedQuery(name, resultClass);
-        }
-    }
-
-    @Override
-    public Query createNativeQuery(String sqlString) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createNativeQuery(sqlString);
-        }
-    }
-
-    @Override
-    public Query createNativeQuery(String sqlString, Class resultClass) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createNativeQuery(sqlString, resultClass);
-        }
-    }
-
-    @Override
-    public Query createNativeQuery(String sqlString, String resultSetMapping) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createNativeQuery(sqlString, resultSetMapping);
-        }
-    }
-
-    @Override
-    public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createNamedStoredProcedureQuery(name);
-        }
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createStoredProcedureQuery(procedureName);
-        }
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createStoredProcedureQuery(procedureName, resultClasses);
-        }
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createStoredProcedureQuery(procedureName, resultSetMappings);
-        }
-    }
-
-    @Override
-    public void joinTransaction() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            emr.em.joinTransaction();
-        }
-    }
-
-    @Override
-    public boolean isJoinedToTransaction() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.isJoinedToTransaction();
-        }
-    }
-
-    @Override
-    public <T> T unwrap(Class<T> cls) {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.unwrap(cls);
-        }
-    }
-
-    @Override
-    public Object getDelegate() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getDelegate();
-        }
-    }
-
-    @Override
-    public void close() {
-        throw new IllegalStateException("Not supported for transaction scoped entity managers");
-    }
-
-    @Override
-    public boolean isOpen() {
-        return true;
-    }
-
-    @Override
-    public EntityTransaction getTransaction() {
-        throw new IllegalStateException("Not supported for JTA entity managers");
-    }
-
-    @Override
-    public EntityManagerFactory getEntityManagerFactory() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getEntityManagerFactory();
-        }
-    }
-
-    @Override
-    public CriteriaBuilder getCriteriaBuilder() {
-        checkBlocking();
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getCriteriaBuilder();
-        }
-    }
-
-    @Override
-    public Metamodel getMetamodel() {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getMetamodel();
-        }
-    }
-
-    @Override
-    public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createEntityGraph(rootType);
-        }
-    }
-
-    @Override
-    public EntityGraph<?> createEntityGraph(String graphName) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.createEntityGraph(graphName);
-        }
-    }
-
-    @Override
-    public EntityGraph<?> getEntityGraph(String graphName) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getEntityGraph(graphName);
-        }
-    }
-
-    @Override
-    public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-        try (EntityManagerResult emr = getEntityManager()) {
-            return emr.em.getEntityGraphs(entityClass);
-        }
-    }
-
-    static class EntityManagerResult implements AutoCloseable {
-
-        final EntityManager em;
-        final boolean closeOnEnd;
-        final boolean allowModification;
-
-        EntityManagerResult(EntityManager em, boolean closeOnEnd, boolean allowModification) {
-            this.em = em;
-            this.closeOnEnd = closeOnEnd;
-            this.allowModification = allowModification;
-        }
-
-        @Override
-        public void close() {
-            if (closeOnEnd) {
-                em.close();
-            }
-        }
-    }
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java
new file mode 100644
index 0000000000000..91f8f238f0875
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/graal/Substitute_PersistenceProviderResolverHolder.java
@@ -0,0 +1,16 @@
+package io.quarkus.hibernate.orm.runtime.graal;
+
+import javax.persistence.spi.PersistenceProviderResolver;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "javax.persistence.spi.PersistenceProviderResolverHolder")
+public final class Substitute_PersistenceProviderResolverHolder {
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.Reset)
+    private static PersistenceProviderResolver singleton;
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationListener.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationListener.java
deleted file mode 100644
index 94ede2a244536..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.quarkus.hibernate.orm.runtime.integration;
-
-import java.util.function.BiConsumer;
-
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.spi.BootstrapContext;
-
-public interface HibernateOrmIntegrationListener {
-
-    void contributeBootProperties(BiConsumer<String, Object> propertyCollector);
-
-    void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
-            BiConsumer<String, Object> propertyCollector);
-
-    void contributeRuntimeProperties(BiConsumer<String, Object> propertyCollector);
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationRuntimeDescriptor.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationRuntimeDescriptor.java
new file mode 100644
index 0000000000000..4190862320774
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationRuntimeDescriptor.java
@@ -0,0 +1,30 @@
+package io.quarkus.hibernate.orm.runtime.integration;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.RecordableConstructor;
+
+public final class HibernateOrmIntegrationRuntimeDescriptor {
+    private final String integrationName;
+    private final Optional<HibernateOrmIntegrationRuntimeInitListener> initListener;
+
+    @RecordableConstructor
+    public HibernateOrmIntegrationRuntimeDescriptor(String integrationName,
+            Optional<HibernateOrmIntegrationRuntimeInitListener> initListener) {
+        this.integrationName = integrationName;
+        this.initListener = initListener;
+    }
+
+    @Override
+    public String toString() {
+        return HibernateOrmIntegrationRuntimeDescriptor.class.getSimpleName() + " [" + integrationName + "]";
+    }
+
+    public String getIntegrationName() {
+        return integrationName;
+    }
+
+    public Optional<HibernateOrmIntegrationRuntimeInitListener> getInitListener() {
+        return initListener;
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationRuntimeInitListener.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationRuntimeInitListener.java
new file mode 100644
index 0000000000000..c870dd8885bf8
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationRuntimeInitListener.java
@@ -0,0 +1,9 @@
+package io.quarkus.hibernate.orm.runtime.integration;
+
+import java.util.function.BiConsumer;
+
+public interface HibernateOrmIntegrationRuntimeInitListener {
+
+    void contributeRuntimeProperties(BiConsumer<String, Object> propertyCollector);
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationStaticDescriptor.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationStaticDescriptor.java
new file mode 100644
index 0000000000000..00bfd3e904b83
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationStaticDescriptor.java
@@ -0,0 +1,36 @@
+package io.quarkus.hibernate.orm.runtime.integration;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.RecordableConstructor;
+
+public final class HibernateOrmIntegrationStaticDescriptor {
+    private final String integrationName;
+    private final Optional<HibernateOrmIntegrationStaticInitListener> initListener;
+    private final boolean xmlMappingRequired;
+
+    @RecordableConstructor
+    public HibernateOrmIntegrationStaticDescriptor(String integrationName,
+            Optional<HibernateOrmIntegrationStaticInitListener> initListener, boolean xmlMappingRequired) {
+        this.integrationName = integrationName;
+        this.initListener = initListener;
+        this.xmlMappingRequired = xmlMappingRequired;
+    }
+
+    @Override
+    public String toString() {
+        return HibernateOrmIntegrationStaticDescriptor.class.getSimpleName() + " [" + integrationName + "]";
+    }
+
+    public String getIntegrationName() {
+        return integrationName;
+    }
+
+    public Optional<HibernateOrmIntegrationStaticInitListener> getInitListener() {
+        return initListener;
+    }
+
+    public boolean isXmlMappingRequired() {
+        return xmlMappingRequired;
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationStaticInitListener.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationStaticInitListener.java
new file mode 100644
index 0000000000000..ec63842decc48
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrationStaticInitListener.java
@@ -0,0 +1,15 @@
+package io.quarkus.hibernate.orm.runtime.integration;
+
+import java.util.function.BiConsumer;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.spi.BootstrapContext;
+
+public interface HibernateOrmIntegrationStaticInitListener {
+
+    void contributeBootProperties(BiConsumer<String, Object> propertyCollector);
+
+    void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
+            BiConsumer<String, Object> propertyCollector);
+
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrations.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrations.java
deleted file mode 100644
index f7b9c23e7af14..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/integration/HibernateOrmIntegrations.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.quarkus.hibernate.orm.runtime.integration;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.BiConsumer;
-
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.spi.BootstrapContext;
-
-public class HibernateOrmIntegrations {
-
-    private static final List<HibernateOrmIntegrationListener> LISTENERS = new ArrayList<>();
-
-    public static void registerListener(HibernateOrmIntegrationListener listener) {
-        LISTENERS.add(listener);
-    }
-
-    public static void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
-        for (HibernateOrmIntegrationListener listener : LISTENERS) {
-            listener.contributeBootProperties(propertyCollector);
-        }
-    }
-
-    public static void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
-            BiConsumer<String, Object> propertyCollector) {
-        for (HibernateOrmIntegrationListener listener : LISTENERS) {
-            listener.onMetadataInitialized(metadata, bootstrapContext, propertyCollector);
-        }
-    }
-
-    public static void contributeRuntimeProperties(BiConsumer<String, Object> propertyCollector) {
-        for (HibernateOrmIntegrationListener listener : LISTENERS) {
-            listener.contributeRuntimeProperties(propertyCollector);
-        }
-    }
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/metrics/HibernateCounter.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/metrics/HibernateCounter.java
deleted file mode 100644
index 277ab689576dd..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/metrics/HibernateCounter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package io.quarkus.hibernate.orm.runtime.metrics;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.stat.Statistics;
-
-import io.quarkus.arc.Arc;
-import io.quarkus.hibernate.orm.runtime.JPAConfig;
-
-public class HibernateCounter implements org.eclipse.microprofile.metrics.Counter {
-
-    private volatile SessionFactory sessionFactory;
-    private String persistenceUnitName;
-    private String metric;
-
-    public HibernateCounter() {
-    }
-
-    public HibernateCounter(String persistenceUnitName, String metric) {
-        this.persistenceUnitName = persistenceUnitName;
-        this.metric = metric;
-    }
-
-    public String getPersistenceUnitName() {
-        return persistenceUnitName;
-    }
-
-    public void setPersistenceUnitName(String persistenceUnitName) {
-        this.persistenceUnitName = persistenceUnitName;
-    }
-
-    public String getMetric() {
-        return metric;
-    }
-
-    public void setMetric(String metric) {
-        this.metric = metric;
-    }
-
-    @Override
-    public long getCount() {
-        Statistics statistics = getSessionFactory().getStatistics();
-        switch (metric) {
-            case "sessionsOpened":
-                return statistics.getSessionOpenCount();
-            case "sessionsClosed":
-                return statistics.getSessionCloseCount();
-            case "transactionCount":
-                return statistics.getTransactionCount();
-            case "successfulTransactions":
-                return statistics.getSuccessfulTransactionCount();
-            case "optimisticLockFailures":
-                return statistics.getOptimisticFailureCount();
-            case "flushes":
-                return statistics.getFlushCount();
-            case "connectionsObtained":
-                return statistics.getConnectCount();
-            case "statementsPrepared":
-                return statistics.getPrepareStatementCount();
-            case "statementsClosed":
-                return statistics.getCloseStatementCount();
-            case "secondLevelCachePuts":
-                return statistics.getSecondLevelCachePutCount();
-            case "secondLevelCacheHits":
-                return statistics.getSecondLevelCacheHitCount();
-            case "secondLevelCacheMisses":
-                return statistics.getSecondLevelCacheMissCount();
-            case "entitiesLoaded":
-                return statistics.getEntityLoadCount();
-            case "entitiesUpdated":
-                return statistics.getEntityUpdateCount();
-            case "entitiesInserted":
-                return statistics.getEntityInsertCount();
-            case "entitiesDeleted":
-                return statistics.getEntityDeleteCount();
-            case "entitiesFetched":
-                return statistics.getEntityFetchCount();
-            case "collectionsLoaded":
-                return statistics.getCollectionLoadCount();
-            case "collectionsUpdated":
-                return statistics.getCollectionUpdateCount();
-            case "collectionsRemoved":
-                return statistics.getCollectionRemoveCount();
-            case "collectionsRecreated":
-                return statistics.getCollectionRecreateCount();
-            case "collectionsFetched":
-                return statistics.getCollectionFetchCount();
-            case "naturalIdQueriesExecutedToDatabase":
-                return statistics.getNaturalIdQueryExecutionCount();
-            case "naturalIdCachePuts":
-                return statistics.getNaturalIdCachePutCount();
-            case "naturalIdCacheHits":
-                return statistics.getNaturalIdCacheHitCount();
-            case "naturalIdCacheMisses":
-                return statistics.getNaturalIdCacheMissCount();
-            case "queriesExecutedToDatabase":
-                return statistics.getQueryExecutionCount();
-            case "queryCachePuts":
-                return statistics.getQueryCachePutCount();
-            case "queryCacheHits":
-                return statistics.getQueryCacheHitCount();
-            case "queryCacheMisses":
-                return statistics.getQueryCacheMissCount();
-            case "updateTimestampsCachePuts":
-                return statistics.getUpdateTimestampsCachePutCount();
-            case "updateTimestampsCacheHits":
-                return statistics.getUpdateTimestampsCacheHitCount();
-            case "updateTimestampsCacheMisses":
-                return statistics.getUpdateTimestampsCacheMissCount();
-            default:
-                throw new IllegalArgumentException("Unknown data source metric");
-        }
-    }
-
-    @Override
-    public void inc() {
-        throw new IllegalStateException(
-                "Hibernate metrics values are computed from Hibernate statistics objects and should not be updated manually");
-    }
-
-    @Override
-    public void inc(long n) {
-        throw new IllegalStateException(
-                "Hibernate metrics values are computed from Hibernate statistics objects and should not be updated manually");
-    }
-
-    private SessionFactory getSessionFactory() {
-        SessionFactory sfLocal = sessionFactory;
-        if (sfLocal == null) {
-            synchronized (this) {
-                sfLocal = sessionFactory;
-                if (sfLocal == null) {
-                    sessionFactory = sfLocal = Arc.container().instance(JPAConfig.class).get()
-                            .getEntityManagerFactory(persistenceUnitName != null ? persistenceUnitName : "default")
-                            .unwrap(SessionFactory.class);
-                }
-            }
-        }
-        return sfLocal;
-    }
-
-}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/metrics/HibernateMetricsRecorder.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/metrics/HibernateMetricsRecorder.java
new file mode 100644
index 0000000000000..44d501fc6aa2a
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/metrics/HibernateMetricsRecorder.java
@@ -0,0 +1,245 @@
+package io.quarkus.hibernate.orm.runtime.metrics;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.stat.CacheRegionStatistics;
+import org.hibernate.stat.Statistics;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.hibernate.orm.runtime.JPAConfig;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+/**
+ * This recorder is invoked IFF Hibernate metrics and Hibernate statistics are enabled
+ */
+@Recorder
+public class HibernateMetricsRecorder {
+    private static final String SESSION_FACTORY_TAG_NAME = "entityManagerFactory";
+
+    /* RUNTIME_INIT for metrics */
+    public Consumer<MetricsFactory> consumeMetricsFactory() {
+        return new Consumer<MetricsFactory>() {
+            @Override
+            public void accept(MetricsFactory metricsFactory) {
+                JPAConfig jpaConfig = Arc.container().instance(JPAConfig.class).get();
+                for (String puName : jpaConfig.getPersistenceUnits()) {
+                    SessionFactory sessionFactory = jpaConfig.getEntityManagerFactory(puName).unwrap(SessionFactory.class);
+                    if (sessionFactory != null) {
+                        registerMetrics(metricsFactory, puName, sessionFactory.getStatistics());
+                    }
+                }
+            }
+        };
+    }
+
+    /**
+     * Register MP Metrics
+     * 
+     * @param metricsFactory Quarkus MetricsFactory for generic metrics registration
+     * @param puName Name of persistence unit
+     * @param statistics Statistics MXBean for persistence unit
+     */
+    void registerMetrics(MetricsFactory metricsFactory, String puName, Statistics statistics) {
+
+        // Session statistics
+        createStatisticsCounter(metricsFactory, "hibernate.sessions.open",
+                "Global number of sessions opened",
+                puName, statistics, Statistics::getSessionOpenCount);
+        createStatisticsCounter(metricsFactory, "hibernate.sessions.closed",
+                "Global number of sessions closed",
+                puName, statistics, Statistics::getSessionCloseCount);
+
+        // Transaction statistics
+        createStatisticsCounter(metricsFactory, "hibernate.transactions",
+                "The number of transactions (see result for success or failure)",
+                puName, statistics, Statistics::getSuccessfulTransactionCount,
+                "result", "success");
+        createStatisticsCounter(metricsFactory, "hibernate.transactions",
+                "The number of transactions (see result for success or failure)",
+                puName, statistics, s -> s.getTransactionCount() - s.getSuccessfulTransactionCount(),
+                "result", "failure");
+        createStatisticsCounter(metricsFactory, "hibernate.optimistic.failures",
+                "The number of Hibernate StaleObjectStateExceptions or JPA OptimisticLockExceptions that occurred.",
+                puName, statistics, Statistics::getOptimisticFailureCount);
+
+        createStatisticsCounter(metricsFactory, "hibernate.flushes",
+                "Global number of flush operations executed (either manual or automatic).",
+                puName, statistics, Statistics::getFlushCount);
+        createStatisticsCounter(metricsFactory, "hibernate.connections.obtained",
+                "Get the global number of connections asked by the sessions " +
+                        "(the actual number of connections used may be much smaller depending " +
+                        "whether you use a connection pool or not)",
+                puName, statistics, Statistics::getConnectCount);
+
+        // Statements
+        createStatisticsCounter(metricsFactory, "hibernate.statements",
+                "The number of prepared statements (see status for prepared or closed)",
+                puName, statistics, Statistics::getPrepareStatementCount,
+                "status", "prepared");
+        createStatisticsCounter(metricsFactory, "hibernate.statements",
+                "The number of prepared statements (see status for prepared or closed)",
+                puName, statistics, Statistics::getCloseStatementCount,
+                "status", "closed");
+
+        // Second Level Caching
+        Arrays.stream(statistics.getSecondLevelCacheRegionNames())
+                .filter(regionName -> this.hasDomainDataRegionStatistics(statistics, regionName))
+                .forEach(regionName -> {
+                    CacheRegionStatistics regionStatistics = statistics.getDomainDataRegionStatistics(regionName);
+                    createStatisticsCounter(metricsFactory, "hibernate.second.level.cache.requests",
+                            "The number of requests made to second level cache (see result for hit or miss)",
+                            puName, regionStatistics, CacheRegionStatistics::getHitCount,
+                            "result", "hit", "region", regionName);
+                    createStatisticsCounter(metricsFactory, "hibernate.second.level.cache.requests",
+                            "The number of requests made to second level cache (see result for hit or miss)",
+                            puName, regionStatistics, CacheRegionStatistics::getMissCount,
+                            "result", "miss", "region", regionName);
+                    createStatisticsCounter(metricsFactory, "hibernate.second.level.cache.puts",
+                            "The number of entities/collections put in the second level cache",
+                            puName, regionStatistics, CacheRegionStatistics::getPutCount,
+                            "region", regionName);
+                });
+
+        // Entity Information
+        createStatisticsCounter(metricsFactory, "hibernate.entities.loads",
+                "Global number of entity loads",
+                puName, statistics, Statistics::getEntityLoadCount);
+        createStatisticsCounter(metricsFactory, "hibernate.entities.updates",
+                "Global number of entity updates",
+                puName, statistics, Statistics::getEntityUpdateCount);
+        createStatisticsCounter(metricsFactory, "hibernate.entities.inserts",
+                "Global number of entity inserts",
+                puName, statistics, Statistics::getEntityInsertCount);
+        createStatisticsCounter(metricsFactory, "hibernate.entities.deletes",
+                "Global number of entity deletes",
+                puName, statistics, Statistics::getEntityDeleteCount);
+        createStatisticsCounter(metricsFactory, "hibernate.entities.fetches",
+                "Global number of entity fetches",
+                puName, statistics, Statistics::getEntityFetchCount);
+
+        // Collections
+        createStatisticsCounter(metricsFactory, "hibernate.collections.loads",
+                "Global number of collections loaded",
+                puName, statistics, Statistics::getCollectionLoadCount);
+        createStatisticsCounter(metricsFactory, "hibernate.collections.updates",
+                "Global number of collections updated",
+                puName, statistics, Statistics::getCollectionUpdateCount);
+        createStatisticsCounter(metricsFactory, "hibernate.collections.deletes",
+                "Global number of collections removed",
+                puName, statistics, Statistics::getCollectionRemoveCount);
+        createStatisticsCounter(metricsFactory, "hibernate.collections.recreates",
+                "Global number of collections recreated",
+                puName, statistics, Statistics::getCollectionRecreateCount);
+        createStatisticsCounter(metricsFactory, "hibernate.collections.fetches",
+                "Global number of collections fetched",
+                puName, statistics, Statistics::getCollectionFetchCount);
+
+        // Natural Id cache
+        createStatisticsCounter(metricsFactory, "hibernate.natural.id.requests",
+                "The number of natural id cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getNaturalIdCacheHitCount,
+                "result", "hit");
+        createStatisticsCounter(metricsFactory, "hibernate.natural.id.cache.puts",
+                "The number of cacheable natural id requests put in cache",
+                puName, statistics, Statistics::getNaturalIdCachePutCount);
+        createStatisticsCounter(metricsFactory, "hibernate.natural.id.requests",
+                "The number of natural id cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getNaturalIdCacheMissCount,
+                "result", "miss");
+
+        // Natural Id statistics
+        createStatisticsCounter(metricsFactory, "hibernate.natural.id.executions",
+                "The number of natural id query executions",
+                puName, statistics, Statistics::getNaturalIdQueryExecutionCount);
+        createTimeGauge(metricsFactory, "hibernate.query.natural.id.executions.max",
+                "The maximum query time for natural id queries executed against the database",
+                puName, statistics, Statistics::getNaturalIdQueryExecutionMaxTime);
+
+        // Query statistics
+        createStatisticsCounter(metricsFactory, "hibernate.query.executions",
+                "The number of query executions",
+                puName, statistics, Statistics::getQueryExecutionCount);
+        createTimeGauge(metricsFactory, "hibernate.query.executions.max",
+                "The maximum query time for queries executed against the database",
+                puName, statistics, Statistics::getQueryExecutionMaxTime);
+
+        // Query Cache
+        createStatisticsCounter(metricsFactory, "hibernate.cache.query.requests",
+                "The number of query cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getQueryCacheHitCount,
+                "result", "hit");
+        createStatisticsCounter(metricsFactory, "hibernate.cache.query.requests",
+                "The number of query cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getQueryCacheMissCount,
+                "result", "miss");
+        createStatisticsCounter(metricsFactory, "hibernate.cache.query.puts",
+                "The number of cacheable queries put in cache",
+                puName, statistics, Statistics::getQueryCachePutCount);
+        createStatisticsCounter(metricsFactory, "hibernate.cache.query.plan",
+                "The number of query plan cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getQueryPlanCacheHitCount,
+                "result", "hit");
+        createStatisticsCounter(metricsFactory, "hibernate.cache.query.plan",
+                "The number of query plan cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getQueryPlanCacheMissCount,
+                "result", "miss");
+
+        // Timestamp cache
+        createStatisticsCounter(metricsFactory, "hibernate.cache.update.timestamps.requests",
+                "The number of update timestamps cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getUpdateTimestampsCacheHitCount,
+                "result", "hit");
+        createStatisticsCounter(metricsFactory, "hibernate.cache.update.timestamps.requests",
+                "The number of update timestamps cache requests (see result for hit or miss)",
+                puName, statistics, Statistics::getUpdateTimestampsCacheMissCount,
+                "result", "miss");
+        createStatisticsCounter(metricsFactory, "hibernate.cache.update.timestamps.puts",
+                "The number of update timestamps put in cache",
+                puName, statistics, Statistics::getUpdateTimestampsCachePutCount);
+    }
+
+    <T> void createStatisticsCounter(MetricsFactory metricsFactory, String metricName, String description,
+            String puName, T statistics, Function<T, Long> f, String... tags) {
+
+        createBuilder(metricsFactory, metricName, description, puName, tags)
+                .buildCounter(statistics, f);
+    }
+
+    void createTimeGauge(MetricsFactory metricsFactory, String metricName, String description,
+            String puName, Statistics statistics, Function<Statistics, Long> f, String... tags) {
+
+        createBuilder(metricsFactory, metricName, description, puName, tags)
+                .unit(TimeUnit.MILLISECONDS.toString())
+                .buildGauge(statistics, f);
+    }
+
+    MetricsFactory.MetricBuilder createBuilder(MetricsFactory metricsFactory, String metricName, String description,
+            String puName, String... tags) {
+        MetricsFactory.MetricBuilder builder = metricsFactory.builder(metricName)
+                .description(description)
+                .tag(SESSION_FACTORY_TAG_NAME, puName);
+        // Add (optional) additional tags
+        if (tags.length > 0 && tags.length % 2 == 0) {
+            for (int i = 0; i < tags.length; i = i + 2) {
+                builder.tag(tags[i], tags[i + 1]);
+            }
+        }
+        return builder;
+    }
+
+    private boolean hasDomainDataRegionStatistics(Statistics statistics, String regionName) {
+        // In 5.1/5.2, getSecondLevelCacheStatistics returns null if the region can't be resolved.
+        // In 5.3, getDomainDataRegionStatistics (a new method) will throw an IllegalArgumentException
+        // if the region can't be resolved.
+        try {
+            return statistics.getDomainDataRegionStatistics(regionName) != null;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/proxies/ProxyDefinitions.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/proxies/ProxyDefinitions.java
index ca7b1197b8e98..b44d9cb114afb 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/proxies/ProxyDefinitions.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/proxies/ProxyDefinitions.java
@@ -1,8 +1,7 @@
 package io.quarkus.hibernate.orm.runtime.proxies;
 
-import static org.objectweb.asm.Opcodes.ACC_FINAL;
-
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +18,8 @@
 import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
 import org.jboss.logging.Logger;
 
+import net.bytebuddy.ClassFileVersion;
+
 /**
  * Runtime proxies are used by Hibernate ORM to handle a number of corner cases;
  * in particular Enhanced Proxies need special consideration in Quarkus as
@@ -102,7 +103,7 @@ private static Class<?> generateProxyClass(PersistentClass persistentClass,
             PreGeneratedProxies preGeneratedProxies) {
         final String entityName = persistentClass.getEntityName();
         final Class mappedClass = persistentClass.getMappedClass();
-        if ((mappedClass.getModifiers() & ACC_FINAL) == ACC_FINAL) {
+        if (Modifier.isFinal(mappedClass.getModifiers())) {
             LOGGER.warn("Could not generate an enhanced proxy for entity '" + entityName + "' (class='"
                     + mappedClass.getCanonicalName()
                     + "') as it's final. Your application might perform better if we're allowed to extend it.");
@@ -192,7 +193,7 @@ private static final class LazyBytecode implements Supplier<ByteBuddyProxyHelper
         @Override
         public ByteBuddyProxyHelper get() {
             if (helper == null) {
-                bytecodeProvider = new BytecodeProviderImpl();
+                bytecodeProvider = new BytecodeProviderImpl(ClassFileVersion.JAVA_V8);
                 helper = bytecodeProvider.getByteBuddyProxyHelper();
             }
             return helper;
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java
index 2b73cf92b5e96..4cbb4d052b168 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/PrevalidatedQuarkusMetadata.java
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 import org.hibernate.MappingException;
@@ -13,6 +14,7 @@
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.model.TypeDefinition;
 import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.annotations.NamedEntityGraphDefinition;
 import org.hibernate.cfg.annotations.NamedProcedureCallDefinition;
@@ -21,11 +23,17 @@
 import org.hibernate.engine.spi.FilterDefinition;
 import org.hibernate.engine.spi.NamedQueryDefinition;
 import org.hibernate.engine.spi.NamedSQLQueryDefinition;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.id.factory.IdentifierGeneratorFactory;
+import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.mapping.FetchProfile;
+import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
+import org.hibernate.query.spi.NamedQueryRepository;
 import org.hibernate.type.Type;
+import org.hibernate.type.TypeResolver;
+import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * This is a Quarkus custom implementation of Metadata wrapping the original
@@ -39,7 +47,7 @@
  * are unavailable, as these would normally trigger an additional validation phase:
  * we can actually boot Quarkus in a simpler way.
  */
-public final class PrevalidatedQuarkusMetadata implements Metadata {
+public final class PrevalidatedQuarkusMetadata implements MetadataImplementor {
 
     private final MetadataImpl metadata;
 
@@ -49,6 +57,7 @@ private PrevalidatedQuarkusMetadata(final MetadataImpl metadata) {
 
     public static PrevalidatedQuarkusMetadata validateAndWrap(final MetadataImpl original) {
         original.validate();
+        original.getBootstrapContext().getReflectionManager().reset();
         return new PrevalidatedQuarkusMetadata(original);
     }
 
@@ -60,10 +69,6 @@ public SessionFactoryOptionsBuilder buildSessionFactoryOptionsBuilder() {
                 metadata.getBootstrapContext());
     }
 
-    public MetadataImplementor getOriginalMetadata() {
-        return metadata;
-    }
-
     //Relevant overrides:
 
     @Override
@@ -78,6 +83,11 @@ public SessionFactory buildSessionFactory() {
         throw new IllegalStateException("This method is not supposed to be used in Quarkus");
     }
 
+    @Override
+    public void validate() throws MappingException {
+        //Intentional no-op
+    }
+
     //All other contracts from Metadata delegating:
 
     @Override
@@ -223,4 +233,36 @@ public Type getReferencedPropertyType(final String className, final String prope
         return metadata.getReferencedPropertyType(className, propertyName);
     }
 
+    // Delegates for MetadataImplementor:
+
+    @Override
+    public MetadataBuildingOptions getMetadataBuildingOptions() {
+        return metadata.getMetadataBuildingOptions();
+    }
+
+    @Override
+    public TypeConfiguration getTypeConfiguration() {
+        return metadata.getTypeConfiguration();
+    }
+
+    @Override
+    public TypeResolver getTypeResolver() {
+        return metadata.getTypeResolver();
+    }
+
+    @Override
+    public NamedQueryRepository buildNamedQueryRepository(SessionFactoryImpl sessionFactory) {
+        return metadata.buildNamedQueryRepository(sessionFactory);
+    }
+
+    @Override
+    public Set<MappedSuperclass> getMappedSuperclassMappingsCopy() {
+        return metadata.getMappedSuperclassMappingsCopy();
+    }
+
+    @Override
+    public void initSessionFactory(SessionFactoryImplementor sessionFactoryImplementor) {
+        metadata.initSessionFactory(sessionFactoryImplementor);
+    }
+
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordedState.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordedState.java
index b25cf0164b299..fb060fa3a2c33 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordedState.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/recording/RecordedState.java
@@ -14,6 +14,7 @@
 public final class RecordedState {
 
     private final Dialect dialect;
+    private final String dataSource;
     private final PrevalidatedQuarkusMetadata metadata;
     private final BuildTimeSettings settings;
     private final Collection<Integrator> integrators;
@@ -22,11 +23,13 @@ public final class RecordedState {
     private final ProxyDefinitions proxyClassDefinitions;
     private final MultiTenancyStrategy multiTenancyStrategy;
     private final boolean isReactive;
+    private final boolean fromPersistenceXml;
 
     public RecordedState(Dialect dialect, PrevalidatedQuarkusMetadata metadata,
             BuildTimeSettings settings, Collection<Integrator> integrators,
             Collection<ProvidedService> providedServices, IntegrationSettings integrationSettings,
-            ProxyDefinitions classDefinitions, MultiTenancyStrategy strategy, boolean isReactive) {
+            ProxyDefinitions classDefinitions, String dataSource, MultiTenancyStrategy strategy, boolean isReactive,
+            boolean fromPersistenceXml) {
         this.dialect = dialect;
         this.metadata = metadata;
         this.settings = settings;
@@ -34,8 +37,10 @@ public RecordedState(Dialect dialect, PrevalidatedQuarkusMetadata metadata,
         this.providedServices = providedServices;
         this.integrationSettings = integrationSettings;
         this.proxyClassDefinitions = classDefinitions;
+        this.dataSource = dataSource;
         this.multiTenancyStrategy = strategy;
         this.isReactive = isReactive;
+        this.fromPersistenceXml = fromPersistenceXml;
     }
 
     public Dialect getDialect() {
@@ -66,6 +71,10 @@ public ProxyDefinitions getProxyClassDefinitions() {
         return proxyClassDefinitions;
     }
 
+    public String getDataSource() {
+        return dataSource;
+    }
+
     public MultiTenancyStrategy getMultiTenancyStrategy() {
         return multiTenancyStrategy;
     }
@@ -73,4 +82,8 @@ public MultiTenancyStrategy getMultiTenancyStrategy() {
     public boolean isReactive() {
         return isReactive;
     }
+
+    public boolean isFromPersistenceXml() {
+        return fromPersistenceXml;
+    }
 }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/FlatClassLoaderService.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/FlatClassLoaderService.java
index b4109a1518244..c15ac900d249c 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/FlatClassLoaderService.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/FlatClassLoaderService.java
@@ -98,6 +98,20 @@ public <T> T generateProxy(InvocationHandler handler, Class... interfaces) {
         throw new AssertionFailure("Not implemented! generateProxy(InvocationHandler handler, Class... interfaces)");
     }
 
+    @Override
+    public Package packageForNameOrNull(String packageName) {
+        try {
+            Class<?> aClass = Class.forName(packageName + ".package-info", false, getClassLoader());
+            return aClass == null ? null : aClass.getPackage();
+        } catch (ClassNotFoundException e) {
+            log.packageNotFound(packageName);
+            return null;
+        } catch (LinkageError e) {
+            log.warn("LinkageError while attempting to load Package named " + packageName, e);
+            return null;
+        }
+    }
+
     @Override
     public <T> T workWithClassLoader(Work<T> work) {
         ClassLoader systemClassLoader = getClassLoader();
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusImportSqlCommandExtractorInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusImportSqlCommandExtractorInitiator.java
new file mode 100644
index 0000000000000..616208755b8f3
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusImportSqlCommandExtractorInitiator.java
@@ -0,0 +1,25 @@
+package io.quarkus.hibernate.orm.runtime.service;
+
+import java.util.Map;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractor;
+import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
+
+public final class QuarkusImportSqlCommandExtractorInitiator implements StandardServiceInitiator<ImportSqlCommandExtractor> {
+
+    public static final QuarkusImportSqlCommandExtractorInitiator INSTANCE = new QuarkusImportSqlCommandExtractorInitiator();
+
+    private static final MultipleLinesSqlCommandExtractor SERVICE_INSTANCE = new MultipleLinesSqlCommandExtractor();
+
+    @Override
+    public ImportSqlCommandExtractor initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
+        return SERVICE_INSTANCE;
+    }
+
+    @Override
+    public Class<ImportSqlCommandExtractor> getServiceInitiated() {
+        return ImportSqlCommandExtractor.class;
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusJdbcEnvironmentInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusJdbcEnvironmentInitiator.java
deleted file mode 100644
index b7f82a13716a9..0000000000000
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusJdbcEnvironmentInitiator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.quarkus.hibernate.orm.runtime.service;
-
-import java.util.Map;
-
-import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl;
-import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-
-public final class QuarkusJdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEnvironment> {
-
-    private final Dialect dialect;
-
-    public QuarkusJdbcEnvironmentInitiator(Dialect dialect) {
-        this.dialect = dialect;
-    }
-
-    @Override
-    public Class<JdbcEnvironment> getServiceInitiated() {
-        return JdbcEnvironment.class;
-    }
-
-    @Override
-    public JdbcEnvironment initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
-        return new JdbcEnvironmentImpl(registry, dialect);
-    }
-
-}
\ No newline at end of file
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusStaticDialectFactory.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusStaticDialectFactory.java
new file mode 100644
index 0000000000000..8c2e3a4a64abb
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusStaticDialectFactory.java
@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.orm.runtime.service;
+
+import java.util.Map;
+
+import org.hibernate.HibernateException;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
+import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource;
+
+public class QuarkusStaticDialectFactory implements DialectFactory {
+    private final Dialect dialect;
+
+    public QuarkusStaticDialectFactory(Dialect dialect) {
+        this.dialect = dialect;
+    }
+
+    @Override
+    public Dialect buildDialect(Map configValues, DialectResolutionInfoSource resolutionInfoSource) throws HibernateException {
+        return dialect;
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusStaticDialectFactoryInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusStaticDialectFactoryInitiator.java
new file mode 100644
index 0000000000000..f3ebe844febc8
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusStaticDialectFactoryInitiator.java
@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.orm.runtime.service;
+
+import java.util.Map;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.dialect.spi.DialectFactory;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+
+public class QuarkusStaticDialectFactoryInitiator implements StandardServiceInitiator<DialectFactory> {
+
+    private final Dialect dialect;
+
+    public QuarkusStaticDialectFactoryInitiator(Dialect dialect) {
+        this.dialect = dialect;
+    }
+
+    @Override
+    public Class<DialectFactory> getServiceInitiated() {
+        return DialectFactory.class;
+    }
+
+    @Override
+    public DialectFactory initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
+        return new QuarkusStaticDialectFactory(dialect);
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/StandardHibernateORMInitiatorListProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/StandardHibernateORMInitiatorListProvider.java
index 8ebdaa2645bc7..8f1cf44e46ce6 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/StandardHibernateORMInitiatorListProvider.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/StandardHibernateORMInitiatorListProvider.java
@@ -17,12 +17,11 @@
 import org.hibernate.persister.internal.PersisterClassResolverInitiator;
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
-import org.hibernate.resource.beans.spi.ManagedBeanRegistryInitiator;
 import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
 import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
-import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator;
 import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
 
+import io.quarkus.hibernate.orm.runtime.cdi.QuarkusManagedBeanRegistryInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.BootstrapOnlyProxyFactoryFactoryInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProviderInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusJndiServiceInitiator;
@@ -39,6 +38,11 @@ public final class StandardHibernateORMInitiatorListProvider implements InitialI
 
     @Override
     public List<StandardServiceInitiator> initialInitiatorList() {
+
+        // Note to maintainers: always remember to check for consistency needs with both:
+        // io.quarkus.hibernate.orm.runtime.boot.registry.PreconfiguredServiceRegistryBuilder#buildQuarkusServiceInitiatorList(RecordedState)
+        // and ReactiveHibernateInitiatorListProvider
+
         final ArrayList<StandardServiceInitiator> serviceInitiators = new ArrayList<StandardServiceInitiator>();
 
         //This one needs to be replaced after Metadata has been recorded:
@@ -48,7 +52,9 @@ public List<StandardServiceInitiator> initialInitiatorList() {
         serviceInitiators.add(ConfigurationServiceInitiator.INSTANCE);
         serviceInitiators.add(PropertyAccessStrategyResolverInitiator.INSTANCE);
 
-        serviceInitiators.add(ImportSqlCommandExtractorInitiator.INSTANCE);
+        // Custom one!
+        serviceInitiators.add(QuarkusImportSqlCommandExtractorInitiator.INSTANCE);
+
         serviceInitiators.add(SchemaManagementToolInitiator.INSTANCE);
 
         serviceInitiators.add(JdbcEnvironmentInitiator.INSTANCE);
@@ -86,7 +92,8 @@ public List<StandardServiceInitiator> initialInitiatorList() {
 
         serviceInitiators.add(TransactionCoordinatorBuilderInitiator.INSTANCE);
 
-        serviceInitiators.add(ManagedBeanRegistryInitiator.INSTANCE);
+        // Replaces ManagedBeanRegistryInitiator.INSTANCE
+        serviceInitiators.add(QuarkusManagedBeanRegistryInitiator.INSTANCE);
 
         serviceInitiators.add(EntityCopyObserverFactoryInitiator.INSTANCE);
 
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/ForwardingSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/ForwardingSession.java
new file mode 100644
index 0000000000000..1983088c00e3f
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/ForwardingSession.java
@@ -0,0 +1,771 @@
+package io.quarkus.hibernate.orm.runtime.session;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.EntityGraph;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.StoredProcedureQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.CriteriaUpdate;
+import javax.persistence.metamodel.Metamodel;
+
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.IdentifierLoadAccess;
+import org.hibernate.LobHelper;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.MultiIdentifierLoadAccess;
+import org.hibernate.NaturalIdLoadAccess;
+import org.hibernate.ReplicationMode;
+import org.hibernate.Session;
+import org.hibernate.SessionEventListener;
+import org.hibernate.SessionFactory;
+import org.hibernate.SharedSessionBuilder;
+import org.hibernate.SimpleNaturalIdLoadAccess;
+import org.hibernate.Transaction;
+import org.hibernate.TypeHelper;
+import org.hibernate.UnknownProfileException;
+import org.hibernate.graph.RootGraph;
+import org.hibernate.jdbc.ReturningWork;
+import org.hibernate.jdbc.Work;
+import org.hibernate.procedure.ProcedureCall;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.query.Query;
+import org.hibernate.stat.SessionStatistics;
+
+public abstract class ForwardingSession implements Session {
+
+    protected abstract Session delegate();
+
+    @Override
+    public void persist(Object entity) {
+        delegate().persist(entity);
+    }
+
+    @Override
+    public Object merge(Object entity) {
+        return delegate().merge(entity);
+    }
+
+    @Override
+    public void remove(Object entity) {
+        delegate().remove(entity);
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey) {
+        return delegate().find(entityClass, primaryKey);
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
+        return delegate().find(entityClass, primaryKey, properties);
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
+        return delegate().find(entityClass, primaryKey, lockMode);
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
+        return delegate().find(entityClass, primaryKey, lockMode, properties);
+    }
+
+    @Override
+    public <T> T getReference(Class<T> entityClass, Object primaryKey) {
+        return delegate().getReference(entityClass, primaryKey);
+    }
+
+    @Override
+    public void flush() {
+        delegate().flush();
+    }
+
+    @Override
+    public void setFlushMode(FlushModeType flushMode) {
+        delegate().setFlushMode(flushMode);
+    }
+
+    @Override
+    public FlushModeType getFlushMode() {
+        return delegate().getFlushMode();
+    }
+
+    @Override
+    public void lock(Object entity, LockModeType lockMode) {
+        delegate().lock(entity, lockMode);
+    }
+
+    @Override
+    public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+        delegate().lock(entity, lockMode, properties);
+    }
+
+    @Override
+    public void refresh(Object entity) {
+        delegate().refresh(entity);
+    }
+
+    @Override
+    public void refresh(Object entity, Map<String, Object> properties) {
+        delegate().refresh(entity, properties);
+    }
+
+    @Override
+    public void refresh(Object entity, LockModeType lockMode) {
+        delegate().refresh(entity, lockMode);
+    }
+
+    @Override
+    public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+        delegate().refresh(entity, lockMode, properties);
+    }
+
+    @Override
+    public void clear() {
+        delegate().clear();
+    }
+
+    @Override
+    public void detach(Object entity) {
+        delegate().detach(entity);
+    }
+
+    @Override
+    public boolean contains(Object entity) {
+        return delegate().contains(entity);
+    }
+
+    @Override
+    public LockModeType getLockMode(Object entity) {
+        return delegate().getLockMode(entity);
+    }
+
+    @Override
+    public void setProperty(String propertyName, Object value) {
+        delegate().setProperty(propertyName, value);
+    }
+
+    @Override
+    public Map<String, Object> getProperties() {
+        return delegate().getProperties();
+    }
+
+    @Override
+    public Query createQuery(String qlString) {
+        return delegate().createQuery(qlString);
+    }
+
+    @Override
+    public <T> Query<T> createQuery(CriteriaQuery<T> criteriaQuery) {
+        return delegate().createQuery(criteriaQuery);
+    }
+
+    @Override
+    public Query createQuery(CriteriaUpdate updateQuery) {
+        return delegate().createQuery(updateQuery);
+    }
+
+    @Override
+    public Query createQuery(CriteriaDelete deleteQuery) {
+        return delegate().createQuery(deleteQuery);
+    }
+
+    @Override
+    public <T> Query<T> createQuery(String qlString, Class<T> resultClass) {
+        return delegate().createQuery(qlString, resultClass);
+    }
+
+    @Override
+    public Query createNamedQuery(String name) {
+        return delegate().createNamedQuery(name);
+    }
+
+    @Override
+    public <T> Query<T> createNamedQuery(String name, Class<T> resultClass) {
+        return delegate().createNamedQuery(name, resultClass);
+    }
+
+    @Override
+    public NativeQuery createNativeQuery(String sqlString) {
+        return delegate().createNativeQuery(sqlString);
+    }
+
+    @Override
+    public NativeQuery createNativeQuery(String sqlString, Class resultClass) {
+        return delegate().createNativeQuery(sqlString, resultClass);
+    }
+
+    @Override
+    public NativeQuery createNativeQuery(String sqlString, String resultSetMapping) {
+        return delegate().createNativeQuery(sqlString, resultSetMapping);
+    }
+
+    @Override
+    public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+        return delegate().createNamedStoredProcedureQuery(name);
+    }
+
+    @Override
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+        return delegate().createStoredProcedureQuery(procedureName);
+    }
+
+    @Override
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
+        return delegate().createStoredProcedureQuery(procedureName, resultClasses);
+    }
+
+    @Override
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
+        return delegate().createStoredProcedureQuery(procedureName, resultSetMappings);
+    }
+
+    @Override
+    public void joinTransaction() {
+        delegate().joinTransaction();
+    }
+
+    @Override
+    public boolean isJoinedToTransaction() {
+        return delegate().isJoinedToTransaction();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T unwrap(Class<T> cls) {
+        if (cls.isAssignableFrom(Session.class)) {
+            return (T) this;
+        }
+        return delegate().unwrap(cls);
+    }
+
+    @Override
+    public Object getDelegate() {
+        return delegate().getDelegate();
+    }
+
+    @Override
+    public void close() {
+        delegate().close();
+    }
+
+    @Override
+    public boolean isOpen() {
+        return delegate().isOpen();
+    }
+
+    @Override
+    public Transaction getTransaction() {
+        return delegate().getTransaction();
+    }
+
+    @Override
+    public EntityManagerFactory getEntityManagerFactory() {
+        return delegate().getEntityManagerFactory();
+    }
+
+    @Override
+    public CriteriaBuilder getCriteriaBuilder() {
+        return delegate().getCriteriaBuilder();
+    }
+
+    @Override
+    public Metamodel getMetamodel() {
+        return delegate().getMetamodel();
+    }
+
+    @Override
+    public <T> RootGraph<T> createEntityGraph(Class<T> rootType) {
+        return delegate().createEntityGraph(rootType);
+    }
+
+    @Override
+    public RootGraph<?> createEntityGraph(String graphName) {
+        return delegate().createEntityGraph(graphName);
+    }
+
+    @Override
+    public RootGraph<?> getEntityGraph(String graphName) {
+        return delegate().getEntityGraph(graphName);
+    }
+
+    @Override
+    public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+        return delegate().getEntityGraphs(entityClass);
+    }
+
+    @Override
+    public SharedSessionBuilder sessionWithOptions() {
+        return delegate().sessionWithOptions();
+    }
+
+    @Override
+    @Deprecated
+    public void setFlushMode(FlushMode flushMode) {
+        delegate().setFlushMode(flushMode);
+    }
+
+    @Override
+    public void setHibernateFlushMode(FlushMode flushMode) {
+        delegate().setHibernateFlushMode(flushMode);
+    }
+
+    @Override
+    public FlushMode getHibernateFlushMode() {
+        return delegate().getHibernateFlushMode();
+    }
+
+    @Override
+    public void setCacheMode(CacheMode cacheMode) {
+        delegate().setCacheMode(cacheMode);
+    }
+
+    @Override
+    public CacheMode getCacheMode() {
+        return delegate().getCacheMode();
+    }
+
+    @Override
+    public SessionFactory getSessionFactory() {
+        return delegate().getSessionFactory();
+    }
+
+    @Override
+    public void cancelQuery() throws HibernateException {
+        delegate().cancelQuery();
+    }
+
+    @Override
+    public boolean isDirty() throws HibernateException {
+        return delegate().isDirty();
+    }
+
+    @Override
+    public boolean isDefaultReadOnly() {
+        return delegate().isDefaultReadOnly();
+    }
+
+    @Override
+    public void setDefaultReadOnly(boolean readOnly) {
+        delegate().setDefaultReadOnly(readOnly);
+    }
+
+    @Override
+    public Serializable getIdentifier(Object object) {
+        return delegate().getIdentifier(object);
+    }
+
+    @Override
+    public boolean contains(String entityName, Object object) {
+        return delegate().contains(entityName, object);
+    }
+
+    @Override
+    public void evict(Object object) {
+        delegate().evict(object);
+    }
+
+    @Override
+    public <T> T load(Class<T> theClass, Serializable id, LockMode lockMode) {
+        return delegate().load(theClass, id, lockMode);
+    }
+
+    @Override
+    public <T> T load(Class<T> theClass, Serializable id, LockOptions lockOptions) {
+        return delegate().load(theClass, id, lockOptions);
+    }
+
+    @Override
+    public Object load(String entityName, Serializable id, LockMode lockMode) {
+        return delegate().load(entityName, id, lockMode);
+    }
+
+    @Override
+    public Object load(String entityName, Serializable id, LockOptions lockOptions) {
+        return delegate().load(entityName, id, lockOptions);
+    }
+
+    @Override
+    public <T> T load(Class<T> theClass, Serializable id) {
+        return delegate().load(theClass, id);
+    }
+
+    @Override
+    public Object load(String entityName, Serializable id) {
+        return delegate().load(entityName, id);
+    }
+
+    @Override
+    public void load(Object object, Serializable id) {
+        delegate().load(object, id);
+    }
+
+    @Override
+    public void replicate(Object object, ReplicationMode replicationMode) {
+        delegate().replicate(object, replicationMode);
+    }
+
+    @Override
+    public void replicate(String entityName, Object object, ReplicationMode replicationMode) {
+        delegate().replicate(entityName, object, replicationMode);
+    }
+
+    @Override
+    public Serializable save(Object object) {
+        return delegate().save(object);
+    }
+
+    @Override
+    public Serializable save(String entityName, Object object) {
+        return delegate().save(entityName, object);
+    }
+
+    @Override
+    public void saveOrUpdate(Object object) {
+        delegate().saveOrUpdate(object);
+    }
+
+    @Override
+    public void saveOrUpdate(String entityName, Object object) {
+        delegate().saveOrUpdate(entityName, object);
+    }
+
+    @Override
+    public void update(Object object) {
+        delegate().update(object);
+    }
+
+    @Override
+    public void update(String entityName, Object object) {
+        delegate().update(entityName, object);
+    }
+
+    @Override
+    public Object merge(String entityName, Object object) {
+        return delegate().merge(entityName, object);
+    }
+
+    @Override
+    public void persist(String entityName, Object object) {
+        delegate().persist(entityName, object);
+    }
+
+    @Override
+    public void delete(Object object) {
+        delegate().delete(object);
+    }
+
+    @Override
+    public void delete(String entityName, Object object) {
+        delegate().delete(entityName, object);
+    }
+
+    @Override
+    public void lock(Object object, LockMode lockMode) {
+        delegate().lock(object, lockMode);
+    }
+
+    @Override
+    public void lock(String entityName, Object object, LockMode lockMode) {
+        delegate().lock(entityName, object, lockMode);
+    }
+
+    @Override
+    public LockRequest buildLockRequest(LockOptions lockOptions) {
+        return delegate().buildLockRequest(lockOptions);
+    }
+
+    @Override
+    public void refresh(String entityName, Object object) {
+        delegate().refresh(entityName, object);
+    }
+
+    @Override
+    public void refresh(Object object, LockMode lockMode) {
+        delegate().refresh(object, lockMode);
+    }
+
+    @Override
+    public void refresh(Object object, LockOptions lockOptions) {
+        delegate().refresh(object, lockOptions);
+    }
+
+    @Override
+    public void refresh(String entityName, Object object, LockOptions lockOptions) {
+        delegate().refresh(entityName, object, lockOptions);
+    }
+
+    @Override
+    public LockMode getCurrentLockMode(Object object) {
+        return delegate().getCurrentLockMode(object);
+    }
+
+    @Override
+    @Deprecated
+    public org.hibernate.Query createFilter(Object collection, String queryString) {
+        return delegate().createFilter(collection, queryString);
+    }
+
+    @Override
+    public <T> T get(Class<T> entityType, Serializable id) {
+        return delegate().get(entityType, id);
+    }
+
+    @Override
+    public <T> T get(Class<T> entityType, Serializable id, LockMode lockMode) {
+        return delegate().get(entityType, id, lockMode);
+    }
+
+    @Override
+    public <T> T get(Class<T> entityType, Serializable id, LockOptions lockOptions) {
+        return delegate().get(entityType, id, lockOptions);
+    }
+
+    @Override
+    public Object get(String entityName, Serializable id) {
+        return delegate().get(entityName, id);
+    }
+
+    @Override
+    public Object get(String entityName, Serializable id, LockMode lockMode) {
+        return delegate().get(entityName, id, lockMode);
+    }
+
+    @Override
+    public Object get(String entityName, Serializable id, LockOptions lockOptions) {
+        return delegate().get(entityName, id, lockOptions);
+    }
+
+    @Override
+    public String getEntityName(Object object) {
+        return delegate().getEntityName(object);
+    }
+
+    @Override
+    public IdentifierLoadAccess byId(String entityName) {
+        return delegate().byId(entityName);
+    }
+
+    @Override
+    public <T> MultiIdentifierLoadAccess<T> byMultipleIds(Class<T> entityClass) {
+        return delegate().byMultipleIds(entityClass);
+    }
+
+    @Override
+    public MultiIdentifierLoadAccess byMultipleIds(String entityName) {
+        return delegate().byMultipleIds(entityName);
+    }
+
+    @Override
+    public <T> IdentifierLoadAccess<T> byId(Class<T> entityClass) {
+        return delegate().byId(entityClass);
+    }
+
+    @Override
+    public NaturalIdLoadAccess byNaturalId(String entityName) {
+        return delegate().byNaturalId(entityName);
+    }
+
+    @Override
+    public <T> NaturalIdLoadAccess<T> byNaturalId(Class<T> entityClass) {
+        return delegate().byNaturalId(entityClass);
+    }
+
+    @Override
+    public SimpleNaturalIdLoadAccess bySimpleNaturalId(String entityName) {
+        return delegate().bySimpleNaturalId(entityName);
+    }
+
+    @Override
+    public <T> SimpleNaturalIdLoadAccess<T> bySimpleNaturalId(Class<T> entityClass) {
+        return delegate().bySimpleNaturalId(entityClass);
+    }
+
+    @Override
+    public Filter enableFilter(String filterName) {
+        return delegate().enableFilter(filterName);
+    }
+
+    @Override
+    public Filter getEnabledFilter(String filterName) {
+        return delegate().getEnabledFilter(filterName);
+    }
+
+    @Override
+    public void disableFilter(String filterName) {
+        delegate().disableFilter(filterName);
+    }
+
+    @Override
+    public SessionStatistics getStatistics() {
+        return delegate().getStatistics();
+    }
+
+    @Override
+    public boolean isReadOnly(Object entityOrProxy) {
+        return delegate().isReadOnly(entityOrProxy);
+    }
+
+    @Override
+    public void setReadOnly(Object entityOrProxy, boolean readOnly) {
+        delegate().setReadOnly(entityOrProxy, readOnly);
+    }
+
+    @Override
+    public Connection disconnect() {
+        return delegate().disconnect();
+    }
+
+    @Override
+    public void reconnect(Connection connection) {
+        delegate().reconnect(connection);
+    }
+
+    @Override
+    public boolean isFetchProfileEnabled(String name) throws UnknownProfileException {
+        return delegate().isFetchProfileEnabled(name);
+    }
+
+    @Override
+    public void enableFetchProfile(String name) throws UnknownProfileException {
+        delegate().enableFetchProfile(name);
+    }
+
+    @Override
+    public void disableFetchProfile(String name) throws UnknownProfileException {
+        delegate().disableFetchProfile(name);
+    }
+
+    @Override
+    public TypeHelper getTypeHelper() {
+        return delegate().getTypeHelper();
+    }
+
+    @Override
+    public LobHelper getLobHelper() {
+        return delegate().getLobHelper();
+    }
+
+    @Override
+    public void addEventListeners(SessionEventListener... listeners) {
+        delegate().addEventListeners(listeners);
+    }
+
+    @Override
+    public NativeQuery createSQLQuery(String queryString) {
+        return delegate().createSQLQuery(queryString);
+    }
+
+    @Override
+    public String getTenantIdentifier() {
+        return delegate().getTenantIdentifier();
+    }
+
+    @Override
+    public boolean isConnected() {
+        return delegate().isConnected();
+    }
+
+    @Override
+    public Transaction beginTransaction() {
+        return delegate().beginTransaction();
+    }
+
+    @Override
+    public Query getNamedQuery(String queryName) {
+        return delegate().getNamedQuery(queryName);
+    }
+
+    @Override
+    public ProcedureCall getNamedProcedureCall(String name) {
+        return delegate().getNamedProcedureCall(name);
+    }
+
+    @Override
+    public ProcedureCall createStoredProcedureCall(String procedureName) {
+        return delegate().createStoredProcedureCall(procedureName);
+    }
+
+    @Override
+    public ProcedureCall createStoredProcedureCall(String procedureName, Class... resultClasses) {
+        return delegate().createStoredProcedureCall(procedureName, resultClasses);
+    }
+
+    @Override
+    public ProcedureCall createStoredProcedureCall(String procedureName, String... resultSetMappings) {
+        return delegate().createStoredProcedureCall(procedureName, resultSetMappings);
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(Class persistentClass) {
+        return delegate().createCriteria(persistentClass);
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(Class persistentClass, String alias) {
+        return delegate().createCriteria(persistentClass, alias);
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(String entityName) {
+        return delegate().createCriteria(entityName);
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(String entityName, String alias) {
+        return delegate().createCriteria(entityName, alias);
+    }
+
+    @Override
+    public Integer getJdbcBatchSize() {
+        return delegate().getJdbcBatchSize();
+    }
+
+    @Override
+    public void setJdbcBatchSize(Integer jdbcBatchSize) {
+        delegate().setJdbcBatchSize(jdbcBatchSize);
+    }
+
+    @Override
+    public void doWork(Work work) throws HibernateException {
+        delegate().doWork(work);
+    }
+
+    @Override
+    public <T> T doReturningWork(ReturningWork<T> work) throws HibernateException {
+        return delegate().doReturningWork(work);
+    }
+
+    @Override
+    @Deprecated
+    public org.hibernate.Query getNamedSQLQuery(String name) {
+        return delegate().getNamedSQLQuery(name);
+    }
+
+    @Override
+    public NativeQuery getNamedNativeQuery(String name) {
+        return delegate().getNamedNativeQuery(name);
+    }
+
+    @Override
+    public Session getSession() {
+        return delegate().getSession();
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java
new file mode 100644
index 0000000000000..a9e22a266849e
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/JTASessionOpener.java
@@ -0,0 +1,50 @@
+package io.quarkus.hibernate.orm.runtime.session;
+
+import org.hibernate.FlushMode;
+import org.hibernate.Session;
+import org.hibernate.SessionBuilder;
+import org.hibernate.SessionFactory;
+import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
+
+/**
+ * A delegate for opening a JTA-enabled Hibernate ORM session.
+ * <p>
+ * The main purpose of this class is to cache session options when possible;
+ * if we didn't care about caching, we could just replace any call to
+ */
+public class JTASessionOpener {
+    public static JTASessionOpener create(SessionFactory sessionFactory) {
+        final CurrentTenantIdentifierResolver currentTenantIdentifierResolver = sessionFactory
+                .unwrap(SessionFactoryImplementor.class).getCurrentTenantIdentifierResolver();
+        if (currentTenantIdentifierResolver == null) {
+            // No tenant ID resolver: we can cache the options.
+            return new JTASessionOpener(sessionFactory, createOptions(sessionFactory));
+        } else {
+            // There is a tenant ID resolver: we cannot cache the options.
+            return new JTASessionOpener(sessionFactory, null);
+        }
+    }
+
+    private static SessionBuilder<?> createOptions(SessionFactory sessionFactory) {
+        return sessionFactory.withOptions()
+                .autoClose(true) // .owner() is deprecated as well, so it looks like we need to rely on deprecated code...
+                .connectionHandlingMode(
+                        PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_BEFORE_TRANSACTION_COMPLETION)
+                .flushMode(FlushMode.ALWAYS);
+    }
+
+    private final SessionFactory sessionFactory;
+    private final SessionBuilder<?> cachedOptions;
+
+    public JTASessionOpener(SessionFactory sessionFactory, SessionBuilder<?> cachedOptions) {
+        this.sessionFactory = sessionFactory;
+        this.cachedOptions = cachedOptions;
+    }
+
+    public Session openSession() {
+        SessionBuilder<?> options = cachedOptions != null ? cachedOptions : createOptions(sessionFactory);
+        return options.openSession();
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java
new file mode 100644
index 0000000000000..87661331c38c9
--- /dev/null
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/session/TransactionScopedSession.java
@@ -0,0 +1,1275 @@
+package io.quarkus.hibernate.orm.runtime.session;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.Instance;
+import javax.persistence.EntityGraph;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.StoredProcedureQuery;
+import javax.persistence.TransactionRequiredException;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.CriteriaUpdate;
+import javax.persistence.metamodel.Metamodel;
+import javax.transaction.Status;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.IdentifierLoadAccess;
+import org.hibernate.LobHelper;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.MultiIdentifierLoadAccess;
+import org.hibernate.NaturalIdLoadAccess;
+import org.hibernate.ReplicationMode;
+import org.hibernate.Session;
+import org.hibernate.SessionEventListener;
+import org.hibernate.SessionFactory;
+import org.hibernate.SharedSessionBuilder;
+import org.hibernate.SimpleNaturalIdLoadAccess;
+import org.hibernate.Transaction;
+import org.hibernate.TypeHelper;
+import org.hibernate.UnknownProfileException;
+import org.hibernate.graph.RootGraph;
+import org.hibernate.jdbc.ReturningWork;
+import org.hibernate.jdbc.Work;
+import org.hibernate.procedure.ProcedureCall;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.query.Query;
+import org.hibernate.stat.SessionStatistics;
+
+import io.quarkus.hibernate.orm.runtime.RequestScopedSessionHolder;
+import io.quarkus.runtime.BlockingOperationControl;
+
+public class TransactionScopedSession implements Session {
+
+    protected static final String TRANSACTION_IS_NOT_ACTIVE = "Transaction is not active, consider adding @Transactional to your method to automatically activate one.";
+
+    private final TransactionManager transactionManager;
+    private final TransactionSynchronizationRegistry transactionSynchronizationRegistry;
+    private final SessionFactory sessionFactory;
+    private final JTASessionOpener jtaSessionOpener;
+    private final String unitName;
+    private final String sessionKey;
+    private final Instance<RequestScopedSessionHolder> requestScopedSessions;
+
+    public TransactionScopedSession(TransactionManager transactionManager,
+            TransactionSynchronizationRegistry transactionSynchronizationRegistry,
+            SessionFactory sessionFactory,
+            String unitName,
+            Instance<RequestScopedSessionHolder> requestScopedSessions) {
+        this.transactionManager = transactionManager;
+        this.transactionSynchronizationRegistry = transactionSynchronizationRegistry;
+        this.sessionFactory = sessionFactory;
+        this.jtaSessionOpener = JTASessionOpener.create(sessionFactory);
+        this.unitName = unitName;
+        this.sessionKey = this.getClass().getSimpleName() + "-" + unitName;
+        this.requestScopedSessions = requestScopedSessions;
+    }
+
+    SessionResult acquireSession() {
+        if (isInTransaction()) {
+            Session session = (Session) transactionSynchronizationRegistry.getResource(sessionKey);
+            if (session != null) {
+                return new SessionResult(session, false, true);
+            }
+            Session newSession = jtaSessionOpener.openSession();
+            // The session has automatically joined the JTA transaction when it was constructed.
+            transactionSynchronizationRegistry.putResource(sessionKey, newSession);
+            // No need to flush or close the session upon transaction completion:
+            // Hibernate ORM itself registers a transaction that does just that.
+            // See:
+            // - io.quarkus.hibernate.orm.runtime.boot.FastBootMetadataBuilder.mergeSettings
+            // - org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl.joinJtaTransaction
+            // - org.hibernate.internal.SessionImpl.beforeTransactionCompletion
+            // - org.hibernate.internal.SessionImpl.afterTransactionCompletion
+            return new SessionResult(newSession, false, true);
+        } else {
+            //this will throw an exception if the request scope is not active
+            //this is expected as either the request scope or an active transaction
+            //is required to properly managed the EM lifecycle
+            RequestScopedSessionHolder requestScopedSessions = this.requestScopedSessions.get();
+            return new SessionResult(requestScopedSessions.getOrCreateSession(unitName, sessionFactory),
+                    false, false);
+        }
+    }
+
+    private void checkBlocking() {
+        if (!BlockingOperationControl.isBlockingAllowed()) {
+            throw new IllegalStateException(
+                    "You have attempted to perform a blocking operation on a IO thread. This is not allowed, as blocking the IO thread will cause major performance issues with your application. If you want to perform blocking EntityManager operations make sure you are doing it from a worker thread.");
+        }
+    }
+
+    private boolean isInTransaction() {
+        try {
+            switch (transactionManager.getStatus()) {
+                case Status.STATUS_ACTIVE:
+                case Status.STATUS_COMMITTING:
+                case Status.STATUS_MARKED_ROLLBACK:
+                case Status.STATUS_PREPARED:
+                case Status.STATUS_PREPARING:
+                    return true;
+                default:
+                    return false;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void persist(Object entity) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.persist(entity);
+        }
+    }
+
+    @Override
+    public Object merge(Object entity) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            return emr.session.merge(entity);
+        }
+    }
+
+    @Override
+    public void remove(Object entity) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.remove(entity);
+        }
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.find(entityClass, primaryKey);
+        }
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.find(entityClass, primaryKey, properties);
+        }
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.find(entityClass, primaryKey, lockMode);
+        }
+    }
+
+    @Override
+    public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.find(entityClass, primaryKey, lockMode, properties);
+        }
+    }
+
+    @Override
+    public <T> T getReference(Class<T> entityClass, Object primaryKey) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getReference(entityClass, primaryKey);
+        }
+    }
+
+    @Override
+    public void flush() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.flush();
+        }
+    }
+
+    @Override
+    public void setFlushMode(FlushModeType flushMode) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setFlushMode(flushMode);
+        }
+    }
+
+    @Override
+    public FlushModeType getFlushMode() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getFlushMode();
+        }
+    }
+
+    @Override
+    public void lock(Object entity, LockModeType lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.lock(entity, lockMode);
+        }
+    }
+
+    @Override
+    public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.lock(entity, lockMode, properties);
+        }
+    }
+
+    @Override
+    public void refresh(Object entity) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.refresh(entity);
+        }
+    }
+
+    @Override
+    public void refresh(Object entity, Map<String, Object> properties) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.refresh(entity, properties);
+        }
+    }
+
+    @Override
+    public void refresh(Object entity, LockModeType lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.refresh(entity, lockMode);
+        }
+    }
+
+    @Override
+    public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            if (!emr.allowModification) {
+                throw new TransactionRequiredException(TRANSACTION_IS_NOT_ACTIVE);
+            }
+            emr.session.refresh(entity, lockMode, properties);
+        }
+    }
+
+    @Override
+    public void clear() {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.clear();
+        }
+    }
+
+    @Override
+    public void detach(Object entity) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.detach(entity);
+        }
+    }
+
+    @Override
+    public boolean contains(Object entity) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.contains(entity);
+        }
+    }
+
+    @Override
+    public LockModeType getLockMode(Object entity) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getLockMode(entity);
+        }
+    }
+
+    @Override
+    public void setProperty(String propertyName, Object value) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setProperty(propertyName, value);
+        }
+    }
+
+    @Override
+    public Map<String, Object> getProperties() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getProperties();
+        }
+    }
+
+    @Override
+    public Query createQuery(String qlString) {
+        checkBlocking();
+        //TODO: this needs some thought for how it works outside a tx
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createQuery(qlString);
+        }
+    }
+
+    @Override
+    public <T> Query<T> createQuery(CriteriaQuery<T> criteriaQuery) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createQuery(criteriaQuery);
+        }
+    }
+
+    @Override
+    public Query createQuery(CriteriaUpdate updateQuery) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createQuery(updateQuery);
+        }
+    }
+
+    @Override
+    public Query createQuery(CriteriaDelete deleteQuery) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createQuery(deleteQuery);
+        }
+    }
+
+    @Override
+    public <T> Query<T> createQuery(String qlString, Class<T> resultClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createQuery(qlString, resultClass);
+        }
+    }
+
+    @Override
+    public Query createNamedQuery(String name) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createNamedQuery(name);
+        }
+    }
+
+    @Override
+    public <T> Query<T> createNamedQuery(String name, Class<T> resultClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createNamedQuery(name, resultClass);
+        }
+    }
+
+    @Override
+    public NativeQuery createNativeQuery(String sqlString) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createNativeQuery(sqlString);
+        }
+    }
+
+    @Override
+    public NativeQuery createNativeQuery(String sqlString, Class resultClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createNativeQuery(sqlString, resultClass);
+        }
+    }
+
+    @Override
+    public NativeQuery createNativeQuery(String sqlString, String resultSetMapping) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createNativeQuery(sqlString, resultSetMapping);
+        }
+    }
+
+    @Override
+    public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createNamedStoredProcedureQuery(name);
+        }
+    }
+
+    @Override
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createStoredProcedureQuery(procedureName);
+        }
+    }
+
+    @Override
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createStoredProcedureQuery(procedureName, resultClasses);
+        }
+    }
+
+    @Override
+    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createStoredProcedureQuery(procedureName, resultSetMappings);
+        }
+    }
+
+    @Override
+    public void joinTransaction() {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.joinTransaction();
+        }
+    }
+
+    @Override
+    public boolean isJoinedToTransaction() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.isJoinedToTransaction();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T unwrap(Class<T> cls) {
+        if (cls.isAssignableFrom(Session.class)) {
+            return (T) this;
+        }
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.unwrap(cls);
+        }
+    }
+
+    @Override
+    public Object getDelegate() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getDelegate();
+        }
+    }
+
+    @Override
+    public void close() {
+        throw new IllegalStateException("Not supported for transaction scoped entity managers");
+    }
+
+    @Override
+    public boolean isOpen() {
+        return true;
+    }
+
+    @Override
+    public Transaction getTransaction() {
+        throw new IllegalStateException("Not supported for JTA entity managers");
+    }
+
+    @Override
+    public EntityManagerFactory getEntityManagerFactory() {
+        return sessionFactory;
+    }
+
+    @Override
+    public CriteriaBuilder getCriteriaBuilder() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getCriteriaBuilder();
+        }
+    }
+
+    @Override
+    public Metamodel getMetamodel() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getMetamodel();
+        }
+    }
+
+    @Override
+    public <T> RootGraph<T> createEntityGraph(Class<T> rootType) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createEntityGraph(rootType);
+        }
+    }
+
+    @Override
+    public RootGraph<?> createEntityGraph(String graphName) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createEntityGraph(graphName);
+        }
+    }
+
+    @Override
+    public RootGraph<?> getEntityGraph(String graphName) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getEntityGraph(graphName);
+        }
+    }
+
+    @Override
+    public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getEntityGraphs(entityClass);
+        }
+    }
+
+    @Override
+    public SharedSessionBuilder sessionWithOptions() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.sessionWithOptions();
+        }
+    }
+
+    @Override
+    @Deprecated
+    public void setFlushMode(FlushMode flushMode) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setFlushMode(flushMode);
+        }
+    }
+
+    @Override
+    public void setHibernateFlushMode(FlushMode flushMode) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setHibernateFlushMode(flushMode);
+        }
+    }
+
+    @Override
+    public FlushMode getHibernateFlushMode() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getHibernateFlushMode();
+        }
+    }
+
+    @Override
+    public void setCacheMode(CacheMode cacheMode) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setCacheMode(cacheMode);
+        }
+    }
+
+    @Override
+    public CacheMode getCacheMode() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getCacheMode();
+        }
+    }
+
+    @Override
+    public SessionFactory getSessionFactory() {
+        return sessionFactory;
+    }
+
+    @Override
+    public void cancelQuery() throws HibernateException {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.cancelQuery();
+        }
+    }
+
+    @Override
+    public boolean isDirty() throws HibernateException {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.isDirty();
+        }
+    }
+
+    @Override
+    public boolean isDefaultReadOnly() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.isDefaultReadOnly();
+        }
+    }
+
+    @Override
+    public void setDefaultReadOnly(boolean readOnly) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setDefaultReadOnly(readOnly);
+        }
+    }
+
+    @Override
+    public Serializable getIdentifier(Object object) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getIdentifier(object);
+        }
+    }
+
+    @Override
+    public boolean contains(String entityName, Object object) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.contains(entityName, object);
+        }
+    }
+
+    @Override
+    public void evict(Object object) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.evict(object);
+        }
+    }
+
+    @Override
+    public <T> T load(Class<T> theClass, Serializable id, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.load(theClass, id, lockMode);
+        }
+    }
+
+    @Override
+    public <T> T load(Class<T> theClass, Serializable id, LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.load(theClass, id, lockOptions);
+        }
+    }
+
+    @Override
+    public Object load(String entityName, Serializable id, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.load(entityName, id, lockMode);
+        }
+    }
+
+    @Override
+    public Object load(String entityName, Serializable id, LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.load(entityName, id, lockOptions);
+        }
+    }
+
+    @Override
+    public <T> T load(Class<T> theClass, Serializable id) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.load(theClass, id);
+        }
+    }
+
+    @Override
+    public Object load(String entityName, Serializable id) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.load(entityName, id);
+        }
+    }
+
+    @Override
+    public void load(Object object, Serializable id) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.load(object, id);
+        }
+    }
+
+    @Override
+    public void replicate(Object object, ReplicationMode replicationMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.replicate(object, replicationMode);
+        }
+    }
+
+    @Override
+    public void replicate(String entityName, Object object, ReplicationMode replicationMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.replicate(entityName, object, replicationMode);
+        }
+    }
+
+    @Override
+    public Serializable save(Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.save(object);
+        }
+    }
+
+    @Override
+    public Serializable save(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.save(entityName, object);
+        }
+    }
+
+    @Override
+    public void saveOrUpdate(Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.saveOrUpdate(object);
+        }
+    }
+
+    @Override
+    public void saveOrUpdate(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.saveOrUpdate(entityName, object);
+        }
+    }
+
+    @Override
+    public void update(Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.update(object);
+        }
+    }
+
+    @Override
+    public void update(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.update(entityName, object);
+        }
+    }
+
+    @Override
+    public Object merge(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.merge(entityName, object);
+        }
+    }
+
+    @Override
+    public void persist(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.persist(entityName, object);
+        }
+    }
+
+    @Override
+    public void delete(Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.delete(object);
+        }
+    }
+
+    @Override
+    public void delete(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.delete(entityName, object);
+        }
+    }
+
+    @Override
+    public void lock(Object object, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.lock(object, lockMode);
+        }
+    }
+
+    @Override
+    public void lock(String entityName, Object object, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.lock(entityName, object, lockMode);
+        }
+    }
+
+    @Override
+    public LockRequest buildLockRequest(LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.buildLockRequest(lockOptions);
+        }
+    }
+
+    @Override
+    public void refresh(String entityName, Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.refresh(entityName, object);
+        }
+    }
+
+    @Override
+    public void refresh(Object object, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.refresh(object, lockMode);
+        }
+    }
+
+    @Override
+    public void refresh(Object object, LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.refresh(object, lockOptions);
+        }
+    }
+
+    @Override
+    public void refresh(String entityName, Object object, LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.refresh(entityName, object, lockOptions);
+        }
+    }
+
+    @Override
+    public LockMode getCurrentLockMode(Object object) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getCurrentLockMode(object);
+        }
+    }
+
+    @Override
+    @Deprecated
+    public org.hibernate.Query createFilter(Object collection, String queryString) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createFilter(collection, queryString);
+        }
+    }
+
+    @Override
+    public <T> T get(Class<T> entityType, Serializable id) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.get(entityType, id);
+        }
+    }
+
+    @Override
+    public <T> T get(Class<T> entityType, Serializable id, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.get(entityType, id, lockMode);
+        }
+    }
+
+    @Override
+    public <T> T get(Class<T> entityType, Serializable id, LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.get(entityType, id, lockOptions);
+        }
+    }
+
+    @Override
+    public Object get(String entityName, Serializable id) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.get(entityName, id);
+        }
+    }
+
+    @Override
+    public Object get(String entityName, Serializable id, LockMode lockMode) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.get(entityName, id, lockMode);
+        }
+    }
+
+    @Override
+    public Object get(String entityName, Serializable id, LockOptions lockOptions) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.get(entityName, id, lockOptions);
+        }
+    }
+
+    @Override
+    public String getEntityName(Object object) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getEntityName(object);
+        }
+    }
+
+    @Override
+    public IdentifierLoadAccess byId(String entityName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.byId(entityName);
+        }
+    }
+
+    @Override
+    public <T> MultiIdentifierLoadAccess<T> byMultipleIds(Class<T> entityClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.byMultipleIds(entityClass);
+        }
+    }
+
+    @Override
+    public MultiIdentifierLoadAccess byMultipleIds(String entityName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.byMultipleIds(entityName);
+        }
+    }
+
+    @Override
+    public <T> IdentifierLoadAccess<T> byId(Class<T> entityClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.byId(entityClass);
+        }
+    }
+
+    @Override
+    public NaturalIdLoadAccess byNaturalId(String entityName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.byNaturalId(entityName);
+        }
+    }
+
+    @Override
+    public <T> NaturalIdLoadAccess<T> byNaturalId(Class<T> entityClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.byNaturalId(entityClass);
+        }
+    }
+
+    @Override
+    public SimpleNaturalIdLoadAccess bySimpleNaturalId(String entityName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.bySimpleNaturalId(entityName);
+        }
+    }
+
+    @Override
+    public <T> SimpleNaturalIdLoadAccess<T> bySimpleNaturalId(Class<T> entityClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.bySimpleNaturalId(entityClass);
+        }
+    }
+
+    @Override
+    public Filter enableFilter(String filterName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.enableFilter(filterName);
+        }
+    }
+
+    @Override
+    public Filter getEnabledFilter(String filterName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getEnabledFilter(filterName);
+        }
+    }
+
+    @Override
+    public void disableFilter(String filterName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.disableFilter(filterName);
+        }
+    }
+
+    @Override
+    public SessionStatistics getStatistics() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getStatistics();
+        }
+    }
+
+    @Override
+    public boolean isReadOnly(Object entityOrProxy) {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.isReadOnly(entityOrProxy);
+        }
+    }
+
+    @Override
+    public void setReadOnly(Object entityOrProxy, boolean readOnly) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setReadOnly(entityOrProxy, readOnly);
+        }
+    }
+
+    @Override
+    public Connection disconnect() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.disconnect();
+        }
+    }
+
+    @Override
+    public void reconnect(Connection connection) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.reconnect(connection);
+        }
+    }
+
+    @Override
+    public boolean isFetchProfileEnabled(String name) throws UnknownProfileException {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.isFetchProfileEnabled(name);
+        }
+    }
+
+    @Override
+    public void enableFetchProfile(String name) throws UnknownProfileException {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.enableFetchProfile(name);
+        }
+    }
+
+    @Override
+    public void disableFetchProfile(String name) throws UnknownProfileException {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.disableFetchProfile(name);
+        }
+    }
+
+    @Override
+    public TypeHelper getTypeHelper() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getTypeHelper();
+        }
+    }
+
+    @Override
+    public LobHelper getLobHelper() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getLobHelper();
+        }
+    }
+
+    @Override
+    public void addEventListeners(SessionEventListener... listeners) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.addEventListeners(listeners);
+        }
+    }
+
+    @Override
+    public NativeQuery createSQLQuery(String queryString) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createSQLQuery(queryString);
+        }
+    }
+
+    @Override
+    public String getTenantIdentifier() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getTenantIdentifier();
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.isConnected();
+        }
+    }
+
+    @Override
+    public Transaction beginTransaction() {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.beginTransaction();
+        }
+    }
+
+    @Override
+    public Query getNamedQuery(String queryName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getNamedQuery(queryName);
+        }
+    }
+
+    @Override
+    public ProcedureCall getNamedProcedureCall(String name) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getNamedProcedureCall(name);
+        }
+    }
+
+    @Override
+    public ProcedureCall createStoredProcedureCall(String procedureName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createStoredProcedureCall(procedureName);
+        }
+    }
+
+    @Override
+    public ProcedureCall createStoredProcedureCall(String procedureName, Class... resultClasses) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createStoredProcedureCall(procedureName, resultClasses);
+        }
+    }
+
+    @Override
+    public ProcedureCall createStoredProcedureCall(String procedureName, String... resultSetMappings) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createStoredProcedureCall(procedureName, resultSetMappings);
+        }
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(Class persistentClass) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createCriteria(persistentClass);
+        }
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(Class persistentClass, String alias) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createCriteria(persistentClass, alias);
+        }
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(String entityName) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createCriteria(entityName);
+        }
+    }
+
+    @Override
+    @Deprecated
+    public Criteria createCriteria(String entityName, String alias) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.createCriteria(entityName, alias);
+        }
+    }
+
+    @Override
+    public Integer getJdbcBatchSize() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getJdbcBatchSize();
+        }
+    }
+
+    @Override
+    public void setJdbcBatchSize(Integer jdbcBatchSize) {
+        try (SessionResult emr = acquireSession()) {
+            emr.session.setJdbcBatchSize(jdbcBatchSize);
+        }
+    }
+
+    @Override
+    public void doWork(Work work) throws HibernateException {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            emr.session.doWork(work);
+        }
+    }
+
+    @Override
+    public <T> T doReturningWork(ReturningWork<T> work) throws HibernateException {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.doReturningWork(work);
+        }
+    }
+
+    @Override
+    @Deprecated
+    public org.hibernate.Query getNamedSQLQuery(String name) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getNamedSQLQuery(name);
+        }
+    }
+
+    @Override
+    public NativeQuery getNamedNativeQuery(String name) {
+        checkBlocking();
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getNamedNativeQuery(name);
+        }
+    }
+
+    @Override
+    public Session getSession() {
+        try (SessionResult emr = acquireSession()) {
+            return emr.session.getSession();
+        }
+    }
+
+    static class SessionResult implements AutoCloseable {
+
+        final Session session;
+        final boolean closeOnEnd;
+        final boolean allowModification;
+
+        SessionResult(Session session, boolean closeOnEnd, boolean allowModification) {
+            this.session = session;
+            this.closeOnEnd = closeOnEnd;
+            this.allowModification = allowModification;
+        }
+
+        @Override
+        public void close() {
+            if (closeOnEnd) {
+                session.close();
+            }
+        }
+    }
+}
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java
index 357615c0bbe05..0fa9b0114e041 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/DataSourceTenantConnectionResolver.java
@@ -2,9 +2,9 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Locale;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import javax.enterprise.inject.Default;
 
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
@@ -14,8 +14,7 @@
 import io.agroal.api.configuration.AgroalDataSourceConfiguration;
 import io.quarkus.agroal.DataSource;
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.DefaultBean;
-import io.quarkus.hibernate.orm.runtime.JPAConfig;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProvider;
 
 /**
@@ -25,73 +24,90 @@
  * @author Michael Schnell
  *
  */
-@DefaultBean
-@ApplicationScoped
 public class DataSourceTenantConnectionResolver implements TenantConnectionResolver {
 
     private static final Logger LOG = Logger.getLogger(DataSourceTenantConnectionResolver.class);
 
-    @Inject
-    JPAConfig jpaConfig;
+    private String persistenceUnitName;
+
+    private String dataSourceName;
+
+    private MultiTenancyStrategy multiTenancyStrategy;
+
+    private String multiTenancySchemaDataSourceName;
+
+    public DataSourceTenantConnectionResolver() {
+    }
+
+    public DataSourceTenantConnectionResolver(String persistenceUnitName, String dataSourceName,
+            MultiTenancyStrategy multiTenancyStrategy, String multiTenancySchemaDataSourceName) {
+        this.persistenceUnitName = persistenceUnitName;
+        this.dataSourceName = dataSourceName;
+        this.multiTenancyStrategy = multiTenancyStrategy;
+        this.multiTenancySchemaDataSourceName = multiTenancySchemaDataSourceName;
+    }
 
     @Override
     public ConnectionProvider resolve(String tenantId) {
+        LOG.debugv("resolve((persistenceUnitName={0}, tenantIdentifier={1})", persistenceUnitName, tenantId);
+        LOG.debugv("multitenancy strategy: {0}", multiTenancyStrategy);
 
-        LOG.debugv("resolve({0})", tenantId);
-
-        final MultiTenancyStrategy strategy = jpaConfig.getMultiTenancyStrategy();
-        LOG.debugv("multitenancy strategy: {0}", strategy);
-        AgroalDataSource dataSource = tenantDataSource(jpaConfig, tenantId, strategy);
+        AgroalDataSource dataSource = tenantDataSource(dataSourceName, tenantId, multiTenancyStrategy,
+                multiTenancySchemaDataSourceName);
         if (dataSource == null) {
-            throw new IllegalStateException("No instance of datasource found for tenant: " + tenantId);
+            throw new IllegalStateException(
+                    String.format(Locale.ROOT, "No instance of datasource found for persistence unit '%1$s' and tenant '%2$s'",
+                            persistenceUnitName, tenantId));
         }
-        if (strategy == MultiTenancyStrategy.SCHEMA) {
-            return new TenantConnectionProvider(tenantId, dataSource);
+        if (multiTenancyStrategy == MultiTenancyStrategy.SCHEMA) {
+            return new SchemaTenantConnectionProvider(tenantId, dataSource);
         }
         return new QuarkusConnectionProvider(dataSource);
     }
 
     /**
      * Create a new data source from the given configuration.
-     * 
+     *
      * @param config Configuration to use.
-     * 
+     *
      * @return New data source instance.
      */
     private static AgroalDataSource createFrom(AgroalDataSourceConfiguration config) {
         try {
             return AgroalDataSource.from(config);
         } catch (SQLException ex) {
-            throw new IllegalStateException("Failed to create a new data source based on the default config", ex);
+            throw new IllegalStateException("Failed to create a new data source based on the existing datasource configuration",
+                    ex);
         }
     }
 
-    /**
-     * Returns either the default data source or the tenant specific one.
-     * 
-     * @param tenantId Tenant identifier. The value is required (non-{@literal null}) in case of
-     *        {@link MultiTenancyStrategy#DATABASE}.
-     * @param strategy Current multitenancy strategy Required value that cannot be {@literal null}.
-     * 
-     * @return Data source.
-     */
-    private static AgroalDataSource tenantDataSource(JPAConfig jpaConfig, String tenantId, MultiTenancyStrategy strategy) {
+    private static AgroalDataSource tenantDataSource(String dataSourceName, String tenantId, MultiTenancyStrategy strategy,
+            String multiTenancySchemaDataSourceName) {
         if (strategy != MultiTenancyStrategy.SCHEMA) {
             return Arc.container().instance(AgroalDataSource.class, new DataSource.DataSourceLiteral(tenantId)).get();
         }
-        String dataSourceName = jpaConfig.getMultiTenancySchemaDataSource();
-        if (dataSourceName == null) {
-            AgroalDataSource dataSource = Arc.container().instance(AgroalDataSource.class).get();
+
+        if (multiTenancySchemaDataSourceName == null) {
+            AgroalDataSource dataSource = getDataSource(dataSourceName);
             return createFrom(dataSource.getConfiguration());
         }
-        return Arc.container().instance(AgroalDataSource.class, new DataSource.DataSourceLiteral(dataSourceName)).get();
+
+        return getDataSource(multiTenancySchemaDataSourceName);
+    }
+
+    private static AgroalDataSource getDataSource(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return Arc.container().instance(AgroalDataSource.class, Default.Literal.INSTANCE).get();
+        } else {
+            return Arc.container().instance(AgroalDataSource.class, new DataSource.DataSourceLiteral(dataSourceName)).get();
+        }
     }
 
-    private static class TenantConnectionProvider extends QuarkusConnectionProvider {
+    private static class SchemaTenantConnectionProvider extends QuarkusConnectionProvider {
 
         private final String tenantId;
 
-        public TenantConnectionProvider(String tenantId, AgroalDataSource dataSource) {
+        public SchemaTenantConnectionProvider(String tenantId, AgroalDataSource dataSource) {
             super(dataSource);
             this.tenantId = tenantId;
         }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java
index 03e414fd90655..195eafbd21f04 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateCurrentTenantIdentifierResolver.java
@@ -1,14 +1,20 @@
 package io.quarkus.hibernate.orm.runtime.tenant;
 
+import java.util.Locale;
+
+import javax.enterprise.inject.Default;
+
 import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
+import io.quarkus.hibernate.orm.PersistenceUnit.PersistenceUnitLiteral;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 
 /**
  * Maps from the Quarkus {@link TenantResolver} to the Hibernate {@link CurrentTenantIdentifierResolver} model.
- * 
+ *
  * @author Michael Schnell
  *
  */
@@ -16,6 +22,12 @@ public final class HibernateCurrentTenantIdentifierResolver implements CurrentTe
 
     private static final Logger LOG = Logger.getLogger(HibernateCurrentTenantIdentifierResolver.class);
 
+    private final String persistenceUnitName;
+
+    public HibernateCurrentTenantIdentifierResolver(String persistenceUnitName) {
+        this.persistenceUnitName = persistenceUnitName;
+    }
+
     @Override
     public String resolveCurrentTenantIdentifier() {
 
@@ -24,7 +36,7 @@ public String resolveCurrentTenantIdentifier() {
             return null;
         }
 
-        TenantResolver resolver = tenantResolver();
+        TenantResolver resolver = tenantResolver(persistenceUnitName);
         String tenantId = resolver.resolveTenantId();
         if (tenantId == null) {
             throw new IllegalStateException("Method 'TenantResolver.resolveTenantId()' returned a null value. "
@@ -41,16 +53,19 @@ public boolean validateExistingCurrentSessions() {
         return false;
     }
 
-    /**
-     * Retrieves the tenant resolver or fails if it is not available.
-     * 
-     * @return Current tenant resolver.
-     */
-    private static TenantResolver tenantResolver() {
-        InstanceHandle<TenantResolver> resolverInstance = Arc.container().instance(TenantResolver.class);
+    private static TenantResolver tenantResolver(String persistenceUnitName) {
+        InstanceHandle<TenantResolver> resolverInstance;
+        if (PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
+            resolverInstance = Arc.container().instance(TenantResolver.class, Default.Literal.INSTANCE);
+        } else {
+            resolverInstance = Arc.container().instance(TenantResolver.class,
+                    new PersistenceUnitLiteral(persistenceUnitName));
+        }
         if (!resolverInstance.isAvailable()) {
-            throw new IllegalStateException("No instance of " + TenantResolver.class.getName() + " was found. "
-                    + "You need to create an implementation for this interface to allow resolving the current tenant identifier.");
+            throw new IllegalStateException(String.format(Locale.ROOT,
+                    "No instance of %1$s was found for persistence unit %2$s. "
+                            + "You need to create an implementation for this interface to allow resolving the current tenant identifier.",
+                    TenantResolver.class.getSimpleName(), persistenceUnitName));
         }
         return resolverInstance.get();
     }
diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java
index 5c56ea09f3caf..ddf8000db0f69 100644
--- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java
+++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/tenant/HibernateMultiTenantConnectionProvider.java
@@ -1,18 +1,23 @@
 package io.quarkus.hibernate.orm.runtime.tenant;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.enterprise.inject.Default;
+
 import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
+import io.quarkus.hibernate.orm.PersistenceUnit.PersistenceUnitLiteral;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 
 /**
  * Maps from the Quarkus {@link TenantConnectionResolver} to the {@link HibernateMultiTenantConnectionProvider} model.
- * 
+ *
  * @author Michael Schnell
  *
  */
@@ -20,11 +25,16 @@ public final class HibernateMultiTenantConnectionProvider extends AbstractMultiT
 
     private static final Logger LOG = Logger.getLogger(HibernateMultiTenantConnectionProvider.class);
 
+    private final String persistenceUnitName;
     private final Map<String, ConnectionProvider> providerMap = new ConcurrentHashMap<>();
 
+    public HibernateMultiTenantConnectionProvider(String persistenceUnitName) {
+        this.persistenceUnitName = persistenceUnitName;
+    }
+
     @Override
     protected ConnectionProvider getAnyConnectionProvider() {
-        String tenantId = tenantResolver().getDefaultTenantId();
+        String tenantId = tenantResolver(persistenceUnitName).getDefaultTenantId();
         if (tenantId == null) {
             throw new IllegalStateException("Method 'TenantResolver.getDefaultTenantId()' returned a null value. "
                     + "This violates the contract of the interface!");
@@ -34,11 +44,12 @@ protected ConnectionProvider getAnyConnectionProvider() {
 
     @Override
     protected ConnectionProvider selectConnectionProvider(final String tenantIdentifier) {
-        LOG.debugv("selectConnectionProvider({0})", tenantIdentifier);
+        LOG.debugv("selectConnectionProvider(persistenceUnitName={0}, tenantIdentifier={1})", persistenceUnitName,
+                tenantIdentifier);
 
         ConnectionProvider provider = providerMap.get(tenantIdentifier);
         if (provider == null) {
-            final ConnectionProvider connectionProvider = resolveConnectionProvider(tenantIdentifier);
+            final ConnectionProvider connectionProvider = resolveConnectionProvider(persistenceUnitName, tenantIdentifier);
             providerMap.put(tenantIdentifier, connectionProvider);
             return connectionProvider;
         }
@@ -46,13 +57,22 @@ protected ConnectionProvider selectConnectionProvider(final String tenantIdentif
 
     }
 
-    private static ConnectionProvider resolveConnectionProvider(String tenantIdentifier) {
-        LOG.debugv("resolveConnectionProvider({0})", tenantIdentifier);
-        InstanceHandle<TenantConnectionResolver> instance = Arc.container().instance(TenantConnectionResolver.class);
+    private static ConnectionProvider resolveConnectionProvider(String persistenceUnitName, String tenantIdentifier) {
+        LOG.debugv("resolveConnectionProvider(persistenceUnitName={0}, tenantIdentifier={1})", persistenceUnitName,
+                tenantIdentifier);
+        InstanceHandle<TenantConnectionResolver> instance;
+        if (PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
+            instance = Arc.container().instance(TenantConnectionResolver.class, Default.Literal.INSTANCE);
+        } else {
+            instance = Arc.container().instance(TenantConnectionResolver.class,
+                    new PersistenceUnitLiteral(persistenceUnitName));
+        }
         if (!instance.isAvailable()) {
             throw new IllegalStateException(
-                    "No instance of " + TenantConnectionResolver.class.getSimpleName() + " was found. "
-                            + "You need to create an implementation for this interface to allow resolving the current tenant connection.");
+                    String.format(
+                            Locale.ROOT, "No instance of %1$s was found for persistence unit %2$s. "
+                                    + "You need to create an implementation for this interface to allow resolving the current tenant connection.",
+                            TenantConnectionResolver.class.getSimpleName(), persistenceUnitName));
         }
         TenantConnectionResolver resolver = instance.get();
         ConnectionProvider cp = resolver.resolve(tenantIdentifier);
@@ -65,14 +85,22 @@ private static ConnectionProvider resolveConnectionProvider(String tenantIdentif
 
     /**
      * Retrieves the tenant resolver or fails if it is not available.
-     * 
+     *
      * @return Current tenant resolver.
      */
-    private static TenantResolver tenantResolver() {
-        InstanceHandle<TenantResolver> resolverInstance = Arc.container().instance(TenantResolver.class);
+    private static TenantResolver tenantResolver(String persistenceUnitName) {
+        InstanceHandle<TenantResolver> resolverInstance;
+        if (PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
+            resolverInstance = Arc.container().instance(TenantResolver.class, Default.Literal.INSTANCE);
+        } else {
+            resolverInstance = Arc.container().instance(TenantResolver.class,
+                    new PersistenceUnitLiteral(persistenceUnitName));
+        }
         if (!resolverInstance.isAvailable()) {
-            throw new IllegalStateException("No instance of " + TenantResolver.class.getName() + " was found. "
-                    + "You need to create an implementation for this interface to allow resolving the current tenant identifier.");
+            throw new IllegalStateException(String.format(Locale.ROOT,
+                    "No instance of %1$s was found for persistence unit %2$s. "
+                            + "You need to create an implementation for this interface to allow resolving the current tenant identifier.",
+                    TenantResolver.class.getSimpleName(), persistenceUnitName));
         }
         return resolverInstance.get();
     }
diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml
index 566919f5fb63f..b8c700ab088bd 100644
--- a/extensions/hibernate-reactive/deployment/pom.xml
+++ b/extensions/hibernate-reactive/deployment/pom.xml
@@ -51,14 +51,49 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-reactive</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -72,6 +107,117 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>test-postgresql</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-postgresql</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <postgres.image>postgres:13.1</postgres.image>
+                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${postgres.image}</name>
+                                    <alias>postgresql</alias>
+                                    <run>
+                                        <env>
+                                            <POSTGRES_USER>hibernate_orm_test</POSTGRES_USER>
+                                            <POSTGRES_PASSWORD>hibernate_orm_test</POSTGRES_PASSWORD>
+                                            <POSTGRES_DB>hibernate_orm_test</POSTGRES_DB>
+                                        </env>
+                                        <ports>
+                                            <port>5431:5432</port>
+                                        </ports>
+                                        <wait>
+                                            <tcp>
+                                                <mode>mapped</mode>
+                                                <ports>
+                                                    <port>5432</port>
+                                                </ports>
+                                            </tcp>
+                                            <time>10000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <!--Stops all postgres images currently running, not just those we just started.
+                              Useful to stop processes still running from a previously failed integration test run -->
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${docker-prune.location}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
index 9362c3997371c..36694f7f8cd6b 100644
--- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
+++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
@@ -1,5 +1,6 @@
 package io.quarkus.hibernate.reactive.deployment;
 
+import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 import static org.hibernate.cfg.AvailableSettings.JPA_SHARED_CACHE_MODE;
 import static org.hibernate.cfg.AvailableSettings.USE_DIRECT_REFERENCE_CACHE_ENTRIES;
@@ -8,6 +9,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -20,9 +22,9 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
 import org.hibernate.loader.BatchFetchStyle;
-import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -31,21 +33,27 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.hibernate.orm.deployment.HibernateConfigUtil;
 import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig;
+import io.quarkus.hibernate.orm.deployment.HibernateOrmConfigPersistenceUnit;
 import io.quarkus.hibernate.orm.deployment.HibernateOrmProcessor;
 import io.quarkus.hibernate.orm.deployment.JpaEntitiesBuildItem;
 import io.quarkus.hibernate.orm.deployment.NonJpaModelBuildItem;
+import io.quarkus.hibernate.orm.deployment.PersistenceProviderSetUpBuildItem;
 import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
 import io.quarkus.hibernate.orm.deployment.PersistenceXmlDescriptorBuildItem;
 import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem;
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
 import io.quarkus.hibernate.reactive.runtime.FastBootHibernateReactivePersistenceProvider;
 import io.quarkus.hibernate.reactive.runtime.HibernateReactiveRecorder;
 import io.quarkus.hibernate.reactive.runtime.ReactiveSessionFactoryProducer;
@@ -57,11 +65,6 @@ public final class HibernateReactiveProcessor {
 
     private static final String HIBERNATE_REACTIVE = "Hibernate Reactive";
 
-    /**
-     * Hibernate ORM configuration
-     */
-    HibernateOrmConfig hibernateConfig;
-
     @BuildStep
     FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.HIBERNATE_REACTIVE);
@@ -73,17 +76,25 @@ CapabilityBuildItem capability() {
     }
 
     @BuildStep
-    void registerBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
-        additionalBeans.produce(AdditionalBeanBuildItem.builder()
-                .addBeanClass(ReactiveSessionFactoryProducer.class)
-                .addBeanClass(ReactiveSessionProducer.class)
-                .build());
+    void registerBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans, CombinedIndexBuildItem combinedIndex,
+            List<PersistenceUnitDescriptorBuildItem> descriptors,
+            JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBuildItem> nonJpaModels) {
+        if (!hasEntities(jpaEntities, nonJpaModels)) {
+            return;
+        }
+
+        if (descriptors.size() == 1) {
+            // Only register those beans if their EMF dependency is also available, so use the same guard as the ORM extension
+            additionalBeans.produce(new AdditionalBeanBuildItem(ReactiveSessionFactoryProducer.class));
+            additionalBeans.produce(new AdditionalBeanBuildItem(ReactiveSessionProducer.class));
+        }
     }
 
     @BuildStep
     void reflections(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         String[] classes = {
-                "org.hibernate.reactive.persister.entity.impl.ReactiveSingleTableEntityPersister"
+                "org.hibernate.reactive.persister.entity.impl.ReactiveSingleTableEntityPersister",
+                "org.hibernate.reactive.persister.collection.impl.ReactiveOneToManyPersister"
         };
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, classes));
     }
@@ -100,15 +111,19 @@ public void build(RecorderContext recorderContext,
 
     @BuildStep
     public void buildReactivePersistenceUnit(
+            HibernateOrmConfig hibernateOrmConfig,
             DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
             List<PersistenceXmlDescriptorBuildItem> persistenceXmlDescriptors,
-            BuildProducer<NativeImageResourceBuildItem> resourceProducer,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
             LaunchModeBuildItem launchMode,
             JpaEntitiesBuildItem domainObjects,
             List<NonJpaModelBuildItem> nonJpaModelBuildItems,
-            BuildProducer<SystemPropertyBuildItem> systemPropertyProducer,
-            BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorProducer) {
+            BuildProducer<SystemPropertyBuildItem> systemProperties,
+            BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
+            BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
+            BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
 
         final boolean enableHR = hasEntities(domainObjects, nonJpaModelBuildItems);
         if (!enableHR) {
@@ -128,35 +143,68 @@ public void buildReactivePersistenceUnit(
         }
 
         // we only support the default pool for now
-        Optional<String> dbKindOptional = dataSourcesBuildTimeConfig.defaultDataSource.dbKind;
+        Optional<String> dbKindOptional = DefaultDataSourceDbKindBuildItem.resolve(
+                dataSourcesBuildTimeConfig.defaultDataSource.dbKind, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
         if (dbKindOptional.isPresent()) {
             final String dbKind = dbKindOptional.get();
-            ParsedPersistenceXmlDescriptor reactivePU = generateReactivePersistenceUnit(resourceProducer,
-                    systemPropertyProducer,
-                    dbKind, applicationArchivesBuildItem, launchMode.getLaunchMode());
+            ParsedPersistenceXmlDescriptor reactivePU = generateReactivePersistenceUnit(
+                    hibernateOrmConfig, domainObjects,
+                    dbKind, applicationArchivesBuildItem, launchMode.getLaunchMode(),
+                    systemProperties, nativeImageResources, hotDeploymentWatchedFiles);
+
+            //Some constant arguments to the following method:
+            // - this is Reactive
+            // - we don't support starting Hibernate Reactive from a persistence.xml
+            // - we don't support Hibernate Envers with Hibernate Reactive
+            persistenceUnitDescriptors.produce(new PersistenceUnitDescriptorBuildItem(reactivePU, true, false));
+        }
+
+    }
 
-            persistenceUnitDescriptorProducer.produce(new PersistenceUnitDescriptorBuildItem(reactivePU, true));
+    @BuildStep
+    void waitForVertxPool(List<VertxPoolBuildItem> vertxPool,
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
+            BuildProducer<HibernateOrmIntegrationRuntimeConfiguredBuildItem> runtimeConfigured) {
+        for (PersistenceUnitDescriptorBuildItem puDescriptor : persistenceUnitDescriptorBuildItems) {
+            // Define a dependency on VertxPoolBuildItem to ensure that any Pool instances are available
+            // when HibernateORM starts its persistence units
+            runtimeConfigured.produce(new HibernateOrmIntegrationRuntimeConfiguredBuildItem(HIBERNATE_REACTIVE,
+                    puDescriptor.getPersistenceUnitName()));
         }
+    }
 
+    @BuildStep
+    @Record(RUNTIME_INIT)
+    PersistenceProviderSetUpBuildItem setUpPersistenceProviderAndWaitForVertxPool(HibernateReactiveRecorder recorder,
+            HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            List<HibernateOrmIntegrationRuntimeConfiguredBuildItem> integrationBuildItems) {
+        recorder.initializePersistenceProvider(hibernateOrmRuntimeConfig,
+                HibernateOrmIntegrationRuntimeConfiguredBuildItem.collectDescriptors(integrationBuildItems));
+        return new PersistenceProviderSetUpBuildItem();
     }
 
     /**
      * This is mostly copied from
-     * {@link io.quarkus.hibernate.orm.deployment.HibernateOrmProcessor#handleHibernateORMWithNoPersistenceXml}
+     * io.quarkus.hibernate.orm.deployment.HibernateOrmProcessor#handleHibernateORMWithNoPersistenceXml
      * Key differences are:
      * - Always produces a persistence unit descriptor, since we assume there always 1 reactive persistence unit
      * - Any JDBC-only configuration settings are removed
      * - If we ever add any Reactive-only config settings, they can be set here
      */
-    private ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
-            BuildProducer<NativeImageResourceBuildItem> resourceProducer,
-            BuildProducer<SystemPropertyBuildItem> systemProperty,
+    private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
+            HibernateOrmConfig hibernateOrmConfig,
+            JpaEntitiesBuildItem domainObjects,
             String dbKind,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
-            LaunchMode launchMode) {
+            LaunchMode launchMode,
+            BuildProducer<SystemPropertyBuildItem> systemProperties,
+            BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
+            BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles) {
+
+        HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit;
 
         //we have no persistence.xml so we will create a default one
-        Optional<String> dialect = hibernateConfig.dialect;
+        Optional<String> dialect = persistenceUnitConfig.dialect.dialect;
         if (!dialect.isPresent()) {
             dialect = HibernateOrmProcessor.guessDialect(dbKind);
         }
@@ -165,107 +213,94 @@ private ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
         // we found one
         ParsedPersistenceXmlDescriptor desc = new ParsedPersistenceXmlDescriptor(null); //todo URL
         desc.setName("default-reactive");
-        desc.setTransactionType(PersistenceUnitTransactionType.JTA);
+        desc.setTransactionType(PersistenceUnitTransactionType.RESOURCE_LOCAL);
         desc.getProperties().setProperty(AvailableSettings.DIALECT, dialectClassName);
+        desc.setExcludeUnlistedClasses(true);
+        desc.addClasses(new ArrayList<>(domainObjects.getAllModelClassNames()));
 
         // The storage engine has to be set as a system property.
-        if (hibernateConfig.dialectStorageEngine.isPresent()) {
-            systemProperty.produce(new SystemPropertyBuildItem(AvailableSettings.STORAGE_ENGINE,
-                    hibernateConfig.dialectStorageEngine.get()));
+        if (persistenceUnitConfig.dialect.storageEngine.isPresent()) {
+            systemProperties.produce(new SystemPropertyBuildItem(AvailableSettings.STORAGE_ENGINE,
+                    persistenceUnitConfig.dialect.storageEngine.get()));
         }
         // Physical Naming Strategy
-        hibernateConfig.physicalNamingStrategy.ifPresent(
+        persistenceUnitConfig.physicalNamingStrategy.ifPresent(
                 namingStrategy -> desc.getProperties()
                         .setProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY, namingStrategy));
 
         // Implicit Naming Strategy
-        hibernateConfig.implicitNamingStrategy.ifPresent(
+        persistenceUnitConfig.implicitNamingStrategy.ifPresent(
                 namingStrategy -> desc.getProperties()
                         .setProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY, namingStrategy));
 
-        // Database
-        desc.getProperties().setProperty(AvailableSettings.HBM2DDL_DATABASE_ACTION,
-                hibernateConfig.database.generation);
-
-        if (hibernateConfig.database.generationHaltOnError) {
-            desc.getProperties().setProperty(AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true");
-        }
-
         //charset
         desc.getProperties().setProperty(AvailableSettings.HBM2DDL_CHARSET_NAME,
-                hibernateConfig.database.charset.name());
+                persistenceUnitConfig.database.charset.name());
 
-        hibernateConfig.database.defaultCatalog.ifPresent(
+        persistenceUnitConfig.database.defaultCatalog.ifPresent(
                 catalog -> desc.getProperties().setProperty(AvailableSettings.DEFAULT_CATALOG, catalog));
 
-        hibernateConfig.database.defaultSchema.ifPresent(
+        persistenceUnitConfig.database.defaultSchema.ifPresent(
                 schema -> desc.getProperties().setProperty(AvailableSettings.DEFAULT_SCHEMA, schema));
 
-        if (hibernateConfig.database.globallyQuotedIdentifiers) {
+        if (persistenceUnitConfig.database.globallyQuotedIdentifiers) {
             desc.getProperties().setProperty(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, "true");
         }
 
         // Query
-        if (hibernateConfig.batchFetchSize > 0) {
+        if (persistenceUnitConfig.batchFetchSize > 0) {
             desc.getProperties().setProperty(AvailableSettings.DEFAULT_BATCH_FETCH_SIZE,
-                    Integer.toString(hibernateConfig.batchFetchSize));
+                    Integer.toString(persistenceUnitConfig.batchFetchSize));
             desc.getProperties().setProperty(AvailableSettings.BATCH_FETCH_STYLE, BatchFetchStyle.PADDED.toString());
         }
 
-        hibernateConfig.query.queryPlanCacheMaxSize.ifPresent(
-                maxSize -> desc.getProperties().setProperty(AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE, maxSize));
+        persistenceUnitConfig.maxFetchDepth.ifPresent(
+                depth -> desc.getProperties().setProperty(AvailableSettings.MAX_FETCH_DEPTH, String.valueOf(depth)));
 
-        hibernateConfig.query.defaultNullOrdering.ifPresent(
-                defaultNullOrdering -> desc.getProperties().setProperty(AvailableSettings.DEFAULT_NULL_ORDERING,
-                        defaultNullOrdering));
+        desc.getProperties().setProperty(AvailableSettings.QUERY_PLAN_CACHE_MAX_SIZE, Integer.toString(
+                persistenceUnitConfig.query.queryPlanCacheMaxSize));
 
-        // Logging
-        if (hibernateConfig.log.sql) {
-            desc.getProperties().setProperty(AvailableSettings.SHOW_SQL, "true");
-            desc.getProperties().setProperty(AvailableSettings.FORMAT_SQL, "true");
-        }
+        desc.getProperties().setProperty(AvailableSettings.DEFAULT_NULL_ORDERING,
+                persistenceUnitConfig.query.defaultNullOrdering.name().toLowerCase());
 
         // Statistics
-        if (hibernateConfig.metricsEnabled
-                || (hibernateConfig.statistics.isPresent() && hibernateConfig.statistics.get())) {
+        if (hibernateOrmConfig.metricsEnabled
+                || (hibernateOrmConfig.statistics.isPresent() && hibernateOrmConfig.statistics.get())) {
             desc.getProperties().setProperty(AvailableSettings.GENERATE_STATISTICS, "true");
         }
 
         // sql-load-script
-        Optional<String> importFile = getSqlLoadScript(launchMode);
+        Optional<String> importFile = getSqlLoadScript(persistenceUnitConfig.sqlLoadScript, launchMode);
 
-        if (!importFile.isPresent()) {
-            // explicitly set a no file and ignore all other operations
-            desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES,
-                    HibernateOrmProcessor.NO_SQL_LOAD_SCRIPT_FILE);
-        } else {
+        if (importFile.isPresent()) {
             Path loadScriptPath = applicationArchivesBuildItem.getRootArchive().getChildPath(importFile.get());
 
             if (loadScriptPath != null && !Files.isDirectory(loadScriptPath)) {
                 // enlist resource if present
-                resourceProducer.produce(new NativeImageResourceBuildItem(importFile.get()));
+                nativeImageResources.produce(new NativeImageResourceBuildItem(importFile.get()));
+                hotDeploymentWatchedFiles.produce(new HotDeploymentWatchedFileBuildItem(importFile.get()));
                 desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, importFile.get());
-                desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR,
-                        MultipleLinesSqlCommandExtractor.class.getName());
-
-            } else if (hibernateConfig.sqlLoadScript.isPresent()) {
+            } else if (persistenceUnitConfig.sqlLoadScript.isPresent()) {
                 //raise exception if explicit file is not present (i.e. not the default)
                 throw new ConfigurationError(
                         "Unable to find file referenced in '" + HibernateOrmProcessor.HIBERNATE_ORM_CONFIG_PREFIX
                                 + "sql-load-script="
-                                + hibernateConfig.sqlLoadScript.get() + "'. Remove property or add file to your path.");
+                                + persistenceUnitConfig.sqlLoadScript.get() + "'. Remove property or add file to your path.");
             }
+        } else {
+            //Disable implicit loading of the default import script (import.sql)
+            desc.getProperties().setProperty(AvailableSettings.HBM2DDL_IMPORT_FILES, "");
         }
 
         // Caching
-        if (hibernateConfig.secondLevelCachingEnabled) {
+        if (persistenceUnitConfig.secondLevelCachingEnabled) {
             Properties p = desc.getProperties();
             //Only set these if the user isn't making an explicit choice:
             p.putIfAbsent(USE_DIRECT_REFERENCE_CACHE_ENTRIES, Boolean.TRUE);
             p.putIfAbsent(USE_SECOND_LEVEL_CACHE, Boolean.TRUE);
             p.putIfAbsent(USE_QUERY_CACHE, Boolean.TRUE);
             p.putIfAbsent(JPA_SHARED_CACHE_MODE, SharedCacheMode.ENABLE_SELECTIVE);
-            Map<String, String> cacheConfigEntries = HibernateConfigUtil.getCacheConfigEntries(hibernateConfig);
+            Map<String, String> cacheConfigEntries = HibernateConfigUtil.getCacheConfigEntries(persistenceUnitConfig);
             for (Entry<String, String> entry : cacheConfigEntries.entrySet()) {
                 desc.getProperties().setProperty(entry.getKey(), entry.getValue());
             }
@@ -281,13 +316,13 @@ private ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
         return desc;
     }
 
-    private Optional<String> getSqlLoadScript(LaunchMode launchMode) {
+    private static Optional<String> getSqlLoadScript(Optional<String> sqlLoadScript, LaunchMode launchMode) {
         // Explicit file or default Hibernate ORM file.
-        if (hibernateConfig.sqlLoadScript.isPresent()) {
-            if (HibernateOrmProcessor.NO_SQL_LOAD_SCRIPT_FILE.equalsIgnoreCase(hibernateConfig.sqlLoadScript.get())) {
+        if (sqlLoadScript.isPresent()) {
+            if (HibernateOrmProcessor.NO_SQL_LOAD_SCRIPT_FILE.equalsIgnoreCase(sqlLoadScript.get())) {
                 return Optional.empty();
             } else {
-                return Optional.of(hibernateConfig.sqlLoadScript.get());
+                return Optional.of(sqlLoadScript.get());
             }
         } else if (launchMode == LaunchMode.NORMAL) {
             return Optional.empty();
@@ -296,15 +331,6 @@ private Optional<String> getSqlLoadScript(LaunchMode launchMode) {
         }
     }
 
-    @BuildStep
-    void waitForVertxPool(
-            List<VertxPoolBuildItem> vertxPool,
-            BuildProducer<HibernateOrmIntegrationRuntimeConfiguredBuildItem> runtimeConfigured) {
-        // Define a dependency on VertxPoolBuildItem to ensure that any Pool instances are available
-        // when HibernateORM starts its persistence units
-        runtimeConfigured.produce(new HibernateOrmIntegrationRuntimeConfiguredBuildItem(HIBERNATE_REACTIVE));
-    }
-
     private boolean hasEntities(JpaEntitiesBuildItem jpaEntities, List<NonJpaModelBuildItem> nonJpaModels) {
         return !jpaEntities.getEntityClassNames().isEmpty() || !nonJpaModels.isEmpty();
     }
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java
new file mode 100644
index 0000000000000..b1434d0492996
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoEntitiesTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.reactive;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoEntitiesTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void testNoEntities() {
+        // When having no entities, we should still be able to start the application.
+    }
+
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java
new file mode 100644
index 0000000000000..d8f65d7ff518c
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/NoJtaTest.java
@@ -0,0 +1,96 @@
+package io.quarkus.hibernate.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
+import org.hibernate.reactive.mutiny.Mutiny;
+import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoJtaTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Inject
+    SessionFactory sessionFactory; // This is an ORM SessionFactory, but it's backing Hibernate Reactive.
+
+    @Inject
+    Mutiny.Session session;
+
+    @Test
+    @ActivateRequestContext
+    public void test() {
+        ServiceRegistryImplementor serviceRegistry = sessionFactory.unwrap(SessionFactoryImplementor.class)
+                .getServiceRegistry();
+
+        // Two assertions are necessary, because these values are influenced by separate configuration
+        assertThat(serviceRegistry.getService(JtaPlatform.class).retrieveTransactionManager()).isNull();
+        assertThat(serviceRegistry.getService(TransactionCoordinatorBuilder.class).isJta()).isFalse();
+
+        // Quick test to make sure HRX works
+        MyEntity entity = new MyEntity("default");
+        MyEntity retrievedEntity = session.withTransaction(tx -> session.persist(entity))
+                .chain(() -> session.withTransaction(tx -> session.clear().find(MyEntity.class, entity.getId())))
+                .await().indefinitely();
+        assertThat(retrievedEntity)
+                .isNotSameAs(entity)
+                .returns(entity.getName(), MyEntity::getName);
+    }
+
+    @Entity
+    public static class MyEntity {
+
+        private long id;
+
+        private String name;
+
+        public MyEntity() {
+        }
+
+        public MyEntity(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return getClass().getSimpleName() + ":" + name;
+        }
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultSeq")
+        public long getId() {
+            return id;
+        }
+
+        public void setId(long id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java
new file mode 100644
index 0000000000000..08e46e0a94666
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessFieldTypesTest.java
@@ -0,0 +1,209 @@
+package io.quarkus.hibernate.reactive.publicfields;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDate;
+
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Checks that public field access is correctly replaced with getter/setter calls,
+ * regardless of the field type.
+ */
+public class PublicFieldAccessFieldTypesTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyEntity.class)
+                    .addClass(FieldAccessEnhancedDelegate.class))
+            .withConfigurationResource("application.properties");
+
+    @Inject
+    Mutiny.SessionFactory sessionFactory;
+
+    @Test
+    public void testFieldAccess()
+            throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException,
+            RollbackException {
+        // Ideally we'd write a @ParamaterizedTest and pass the delegates as parameters,
+        // but we cannot do that due to JUnit using a different classloader than the test.
+        for (FieldAccessEnhancedDelegate delegate : FieldAccessEnhancedDelegate.values()) {
+            doTestFieldAccess(delegate);
+        }
+    }
+
+    private void doTestFieldAccess(FieldAccessEnhancedDelegate delegate) {
+        long id = sessionFactory.withTransaction((session, tx) -> {
+            MyEntity entity = new MyEntity();
+            return session.persist(entity).replaceWith(() -> entity.id);
+        }).await().indefinitely();
+
+        MyEntity entity = sessionFactory.withTransaction((session, tx) -> session.find(MyEntity.class, id))
+                .await().indefinitely();
+        // Initially the assertion doesn't pass: the value was not set yet
+        AssertionError expected = null;
+        try {
+            delegate.assertValue(entity);
+        } catch (AssertionError e) {
+            expected = e;
+        }
+        if (expected == null) {
+            throw new IllegalStateException("This test is buggy: assertions should not pass at this point.");
+        }
+
+        sessionFactory.withTransaction((session, tx) -> session.find(MyEntity.class, id)
+                // Since field access is replaced with accessor calls,
+                // we expect this change to be detected by dirty tracking and persisted.
+                .invoke(delegate::setValue))
+                .await().indefinitely();
+
+        entity = sessionFactory.withTransaction((session, tx) -> session.find(MyEntity.class, id))
+                .await().indefinitely();
+        // The above should have persisted a value that passes the assertion.
+        delegate.assertValue(entity);
+    }
+
+    @Entity
+    public static class MyEntity {
+
+        @Id
+        @GeneratedValue
+        public long id;
+
+        public LocalDate object;
+        public boolean boolean_;
+        public int int_;
+        public long long_;
+        public float float_;
+        public double double_;
+        public short short_;
+        public char char_ = '\n'; // The Reactive postgresql driver doesn't like the zero char, for some reason
+        public byte byte_;
+
+    }
+
+    private enum FieldAccessEnhancedDelegate {
+
+        OBJECT {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.object = LocalDate.of(2017, 11, 7);
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.object).isEqualTo(LocalDate.of(2017, 11, 7));
+            }
+        },
+        BOOLEAN {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.boolean_ = true;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.boolean_).isTrue();
+            }
+        },
+        INTEGER {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.int_ = 42;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.int_).isEqualTo(42);
+            }
+        },
+        LONG {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.long_ = 42L;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.long_).isEqualTo(42L);
+            }
+        },
+        FLOAT {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.float_ = 42f;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.float_).isEqualTo(42f);
+            }
+        },
+        DOUBLE {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.double_ = 42d;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.double_).isEqualTo(42d);
+            }
+        },
+        SHORT {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.short_ = (short) 42;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.short_).isEqualTo((short) 42);
+            }
+        },
+        CHAR {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.char_ = 'a';
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.char_).isEqualTo('a');
+            }
+        },
+        BYTE {
+            @Override
+            public void setValue(MyEntity entity) {
+                entity.byte_ = (byte) 42;
+            }
+
+            @Override
+            public void assertValue(MyEntity entity) {
+                assertThat(entity.byte_).isEqualTo((byte) 42);
+            }
+        };
+
+        public abstract void setValue(MyEntity entity);
+
+        public abstract void assertValue(MyEntity entity);
+
+    }
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java
new file mode 100644
index 0000000000000..798d3f6d1acfe
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/publicfields/PublicFieldAccessInheritanceTest.java
@@ -0,0 +1,151 @@
+package io.quarkus.hibernate.reactive.publicfields;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Checks that public field access is correctly replaced with getter/setter calls,
+ * regardless of where the field is declared in the class hierarchy.
+ */
+public class PublicFieldAccessInheritanceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MyMappedSuperclass.class)
+                    .addClass(MyAbstractEntity.class)
+                    .addClass(MyConcreteEntity.class)
+                    .addClass(FieldAccessEnhancedDelegate.class))
+            .withConfigurationResource("application.properties");
+
+    @Inject
+    Mutiny.SessionFactory sessionFactory;
+
+    @Test
+    public void testFieldAccess()
+            throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException,
+            RollbackException {
+        // Ideally we'd write a @ParamaterizedTest and pass the delegates as parameters,
+        // but we cannot do that due to JUnit using a different classloader than the test.
+        for (FieldAccessEnhancedDelegate delegate : FieldAccessEnhancedDelegate
+                .values()) {
+            doTestFieldAccess(delegate);
+        }
+    }
+
+    private void doTestFieldAccess(FieldAccessEnhancedDelegate delegate) {
+        long id = sessionFactory.withTransaction((session, tx) -> {
+            MyConcreteEntity entity = new MyConcreteEntity();
+            return session.persist(entity).replaceWith(() -> entity.id);
+        }).await().indefinitely();
+
+        MyConcreteEntity entity = sessionFactory.withTransaction((session, tx) -> session.find(MyConcreteEntity.class, id))
+                .await().indefinitely();
+        // Initially the assertion doesn't pass: the value was not set yet
+        AssertionError expected = null;
+        try {
+            delegate.assertValue(entity);
+        } catch (AssertionError e) {
+            expected = e;
+        }
+        if (expected == null) {
+            throw new IllegalStateException("This test is buggy: assertions should not pass at this point.");
+        }
+
+        sessionFactory.withTransaction((session, tx) -> session.find(MyConcreteEntity.class, id)
+                // Since field access is replaced with accessor calls,
+                // we expect this change to be detected by dirty tracking and persisted.
+                .invoke(delegate::setValue))
+                .await().indefinitely();
+
+        entity = sessionFactory.withTransaction((session, tx) -> session.find(MyConcreteEntity.class, id))
+                .await().indefinitely();
+        // The above should have persisted a value that passes the assertion.
+        delegate.assertValue(entity);
+    }
+
+    @MappedSuperclass
+    public static class MyMappedSuperclass {
+
+        public Long mappedSuperclassField;
+
+    }
+
+    @Entity(name = "abstract")
+    public static abstract class MyAbstractEntity extends MyMappedSuperclass {
+
+        @Id
+        @GeneratedValue
+        public long id;
+
+        public Long abstractEntityField;
+
+    }
+
+    @Entity(name = "concrete")
+    public static class MyConcreteEntity extends MyAbstractEntity {
+
+        public Long concreteEntityField;
+
+    }
+
+    private enum FieldAccessEnhancedDelegate {
+
+        MAPPED_SUPERCLASS {
+            @Override
+            public void setValue(MyConcreteEntity entity) {
+                entity.mappedSuperclassField = 42L;
+            }
+
+            @Override
+            public void assertValue(MyConcreteEntity entity) {
+                assertThat(entity.mappedSuperclassField).isEqualTo(42L);
+            }
+        },
+        ABSTRACT_ENTITY {
+            @Override
+            public void setValue(MyConcreteEntity entity) {
+                entity.abstractEntityField = 42L;
+            }
+
+            @Override
+            public void assertValue(MyConcreteEntity entity) {
+                assertThat(entity.abstractEntityField).isEqualTo(42L);
+            }
+        },
+        CONCRETE_ENTITY {
+            @Override
+            public void setValue(MyConcreteEntity entity) {
+                entity.concreteEntityField = 42L;
+            }
+
+            @Override
+            public void assertValue(MyConcreteEntity entity) {
+                assertThat(entity.concreteEntityField).isEqualTo(42L);
+            }
+        };
+
+        public abstract void setValue(MyConcreteEntity entity);
+
+        public abstract void assertValue(MyConcreteEntity entity);
+
+    }
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java
new file mode 100644
index 0000000000000..063bbf4d71433
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/DefaultEntity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.reactive.singlepersistenceunit;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class DefaultEntity {
+
+    private long id;
+
+    private String name;
+
+    public DefaultEntity() {
+    }
+
+    public DefaultEntity(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ":" + name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultSeq")
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java
new file mode 100644
index 0000000000000..606c5d32717d7
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiMutinySessionTest.java
@@ -0,0 +1,41 @@
+package io.quarkus.hibernate.reactive.singlepersistenceunit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitCdiMutinySessionTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Inject
+    Mutiny.Session session;
+
+    @Test
+    @ActivateRequestContext
+    public void test() {
+        DefaultEntity entity = new DefaultEntity("default");
+
+        DefaultEntity retrievedEntity = session.withTransaction(tx -> session.persist(entity))
+                .chain(() -> session.withTransaction(tx -> session.clear().find(DefaultEntity.class, entity.getId())))
+                .await().indefinitely();
+
+        assertThat(retrievedEntity)
+                .isNotSameAs(entity)
+                .returns(entity.getName(), DefaultEntity::getName);
+    }
+
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java
new file mode 100644
index 0000000000000..4e529b03c39f7
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/singlepersistenceunit/SinglePersistenceUnitCdiStageSessionTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.reactive.singlepersistenceunit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import org.hibernate.reactive.stage.Stage;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitCdiStageSessionTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Inject
+    Stage.Session session;
+
+    @Test
+    @Disabled("#14812: We're getting a ContextNotActiveException for some (unknown) reason")
+    @ActivateRequestContext
+    public void test() {
+        DefaultEntity entity = new DefaultEntity("default");
+
+        DefaultEntity retrievedEntity = session.withTransaction(tx -> session.persist(entity))
+                .thenCompose($ -> session.withTransaction(tx -> session.clear().find(DefaultEntity.class, entity.getId())))
+                .toCompletableFuture().join();
+
+        assertThat(retrievedEntity)
+                .isNotSameAs(entity)
+                .returns(entity.getName(), DefaultEntity::getName);
+    }
+
+}
diff --git a/extensions/hibernate-reactive/deployment/src/test/resources/application.properties b/extensions/hibernate-reactive/deployment/src/test/resources/application.properties
new file mode 100644
index 0000000000000..0dbe5be427df9
--- /dev/null
+++ b/extensions/hibernate-reactive/deployment/src/test/resources/application.properties
@@ -0,0 +1,9 @@
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=hibernate_orm_test
+quarkus.datasource.password=hibernate_orm_test
+quarkus.datasource.reactive=true
+quarkus.datasource.reactive.url=${postgres.reactive.url}
+
+# Hibernate config
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/hibernate-reactive/pom.xml b/extensions/hibernate-reactive/pom.xml
index f02876e5143da..b2d57035e37a7 100644
--- a/extensions/hibernate-reactive/pom.xml
+++ b/extensions/hibernate-reactive/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/hibernate-reactive/runtime/pom.xml b/extensions/hibernate-reactive/runtime/pom.xml
index d101d01dcbbb4..7dc49dc0f1429 100644
--- a/extensions/hibernate-reactive/runtime/pom.xml
+++ b/extensions/hibernate-reactive/runtime/pom.xml
@@ -34,6 +34,22 @@
         <dependency>
             <groupId>org.hibernate.reactive</groupId>
             <artifactId>hibernate-reactive-core</artifactId>
+            <exclusions>
+                <!-- Make sure Quarkus can manage Mutiny via quarkus-mutiny -->
+                <exclusion>
+                    <groupId>io.smallrye.reactive</groupId>
+                    <artifactId>mutiny</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java
index fb0889aad765e..91342aca1fd1c 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
@@ -25,15 +26,21 @@
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.hibernate.orm.runtime.BuildTimeSettings;
 import io.quarkus.hibernate.orm.runtime.FastBootHibernatePersistenceProvider;
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfigPersistenceUnit;
 import io.quarkus.hibernate.orm.runtime.IntegrationSettings;
 import io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder;
 import io.quarkus.hibernate.orm.runtime.RuntimeSettings;
-import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrations;
+import io.quarkus.hibernate.orm.runtime.RuntimeSettings.Builder;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener;
 import io.quarkus.hibernate.orm.runtime.recording.PrevalidatedQuarkusMetadata;
 import io.quarkus.hibernate.orm.runtime.recording.RecordedState;
 import io.quarkus.hibernate.reactive.runtime.boot.FastBootReactiveEntityManagerFactoryBuilder;
 import io.quarkus.hibernate.reactive.runtime.boot.registry.PreconfiguredReactiveServiceRegistryBuilder;
 import io.quarkus.hibernate.reactive.runtime.customized.QuarkusReactiveConnectionPoolInitiator;
+import io.quarkus.hibernate.reactive.runtime.customized.VertxInstanceInitiator;
+import io.vertx.core.Vertx;
 import io.vertx.sqlclient.Pool;
 
 /**
@@ -47,7 +54,18 @@ public final class FastBootHibernateReactivePersistenceProvider implements Persi
 
     public static final String IMPLEMENTATION_NAME = "org.hibernate.reactive.provider.ReactivePersistenceProvider";
 
-    private final FastBootHibernatePersistenceProvider delegate = new FastBootHibernatePersistenceProvider();
+    private final ProviderUtil providerUtil = new io.quarkus.hibernate.orm.runtime.ProviderUtil();
+
+    private volatile FastBootHibernatePersistenceProvider delegate;
+
+    private final HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig;
+    private final Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors;
+
+    public FastBootHibernateReactivePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors) {
+        this.hibernateOrmRuntimeConfig = hibernateOrmRuntimeConfig;
+        this.integrationRuntimeDescriptors = integrationRuntimeDescriptors;
+    }
 
     @Override
     public EntityManagerFactory createEntityManagerFactory(String emName, Map properties) {
@@ -112,7 +130,7 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
                 continue;
             }
 
-            RecordedState recordedState = PersistenceUnitsHolder.getRecordedState(persistenceUnitName);
+            RecordedState recordedState = PersistenceUnitsHolder.popRecordedState(persistenceUnitName);
 
             final PrevalidatedQuarkusMetadata metadata = recordedState.getMetadata();
             final BuildTimeSettings buildTimeSettings = recordedState.getBuildTimeSettings();
@@ -120,7 +138,18 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
             RuntimeSettings.Builder runtimeSettingsBuilder = new RuntimeSettings.Builder(buildTimeSettings,
                     integrationSettings);
 
-            HibernateOrmIntegrations.contributeRuntimeProperties((k, v) -> runtimeSettingsBuilder.put(k, v));
+            // Inject runtime configuration if the persistence unit was defined by Quarkus configuration
+            if (!recordedState.isFromPersistenceXml()) {
+                injectRuntimeConfiguration(persistenceUnitName, hibernateOrmRuntimeConfig, runtimeSettingsBuilder);
+            }
+
+            for (HibernateOrmIntegrationRuntimeDescriptor descriptor : integrationRuntimeDescriptors
+                    .getOrDefault(persistenceUnitName, Collections.emptyList())) {
+                Optional<HibernateOrmIntegrationRuntimeInitListener> listenerOptional = descriptor.getInitListener();
+                if (listenerOptional.isPresent()) {
+                    listenerOptional.get().contributeRuntimeProperties(runtimeSettingsBuilder::put);
+                }
+            }
 
             RuntimeSettings runtimeSettings = runtimeSettingsBuilder.build();
 
@@ -148,7 +177,7 @@ private StandardServiceRegistry rewireMetadataAndExtractServiceRegistry(RuntimeS
         PreconfiguredReactiveServiceRegistryBuilder serviceRegistryBuilder = new PreconfiguredReactiveServiceRegistryBuilder(
                 rs);
 
-        registerVertxPool(persistenceUnitName, runtimeSettings, serviceRegistryBuilder);
+        registerVertxAndPool(persistenceUnitName, runtimeSettings, serviceRegistryBuilder);
 
         runtimeSettings.getSettings().forEach((key, value) -> {
             serviceRegistryBuilder.applySetting(key, value);
@@ -190,7 +219,7 @@ private boolean isProvider(PersistenceUnitDescriptor persistenceUnit) {
                 || "org.hibernate.jpa.HibernatePersistenceProvider".equals(requestedProviderName);
     }
 
-    private void registerVertxPool(String persistenceUnitName,
+    private void registerVertxAndPool(String persistenceUnitName,
             RuntimeSettings runtimeSettings,
             PreconfiguredReactiveServiceRegistryBuilder serviceRegistry) {
         if (runtimeSettings.isConfigured(AvailableSettings.URL)) {
@@ -205,28 +234,78 @@ private void registerVertxPool(String persistenceUnitName,
         }
 
         serviceRegistry.addInitiator(new QuarkusReactiveConnectionPoolInitiator(poolHandle.get()));
+
+        InstanceHandle<Vertx> vertxHandle = Arc.container().instance(Vertx.class);
+        if (!vertxHandle.isAvailable()) {
+            throw new IllegalStateException("No Vert.x instance has been registered in ArC ?");
+        }
+        serviceRegistry.addInitiator(new VertxInstanceInitiator(vertxHandle.get()));
     }
 
-    @Override
-    public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map) {
-        //Not supported by Hibernate Reactive: this should always delegate to Hibernate ORM, which will do its own
-        //persistence provider name checks and possibly reject if it's not a suitable.
-        return delegate.createContainerEntityManagerFactory(info, map);
+    private static void injectRuntimeConfiguration(String persistenceUnitName,
+            HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig, Builder runtimeSettingsBuilder) {
+        HibernateOrmRuntimeConfigPersistenceUnit persistenceUnitConfig = hibernateOrmRuntimeConfig.defaultPersistenceUnit;
+
+        // Database
+        runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_DATABASE_ACTION,
+                persistenceUnitConfig.database.generation.generation);
+
+        runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_CREATE_SCHEMAS,
+                String.valueOf(persistenceUnitConfig.database.generation.createSchemas));
+
+        if (persistenceUnitConfig.database.generation.haltOnError) {
+            runtimeSettingsBuilder.put(AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true");
+        }
+
+        // Logging
+        if (persistenceUnitConfig.log.sql) {
+            runtimeSettingsBuilder.put(AvailableSettings.SHOW_SQL, "true");
+
+            if (persistenceUnitConfig.log.formatSql) {
+                runtimeSettingsBuilder.put(AvailableSettings.FORMAT_SQL, "true");
+            }
+        }
+
+        if (persistenceUnitConfig.log.jdbcWarnings.isPresent()) {
+            runtimeSettingsBuilder.put(AvailableSettings.LOG_JDBC_WARNINGS,
+                    persistenceUnitConfig.log.jdbcWarnings.get().toString());
+        }
     }
 
     @Override
     public ProviderUtil getProviderUtil() {
-        return delegate.getProviderUtil();
+        return providerUtil;
+    }
+
+    @Override
+    public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map) {
+        //Not supported by Hibernate Reactive: this should always delegate to Hibernate ORM, which will do its own
+        //persistence provider name checks and possibly reject if it's not a suitable.
+        return getJdbcHibernatePersistenceProviderDelegate().createContainerEntityManagerFactory(info, map);
     }
 
     @Override
     public void generateSchema(PersistenceUnitInfo info, Map map) {
-        delegate.generateSchema(info, map);
+        getJdbcHibernatePersistenceProviderDelegate().generateSchema(info, map);
     }
 
     @Override
     public boolean generateSchema(String persistenceUnitName, Map map) {
-        return delegate.generateSchema(persistenceUnitName, map);
+        return getJdbcHibernatePersistenceProviderDelegate().generateSchema(persistenceUnitName, map);
+    }
+
+    private FastBootHibernatePersistenceProvider getJdbcHibernatePersistenceProviderDelegate() {
+        FastBootHibernatePersistenceProvider localDelegate = this.delegate;
+        if (localDelegate == null) {
+            synchronized (this) {
+                localDelegate = this.delegate;
+                if (localDelegate == null) {
+                    this.delegate = localDelegate = new FastBootHibernatePersistenceProvider(hibernateOrmRuntimeConfig,
+                            integrationRuntimeDescriptors);
+                }
+            }
+        }
+        return localDelegate;
     }
 
 }
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProviderResolver.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProviderResolver.java
deleted file mode 100644
index 30bb64a560134..0000000000000
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProviderResolver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.reactive.runtime;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceProviderResolver;
-
-final class FastBootHibernateReactivePersistenceProviderResolver implements PersistenceProviderResolver {
-
-    private static final List<PersistenceProvider> HARDCODED_PROVIDER_LIST = Collections
-            .singletonList(new FastBootHibernateReactivePersistenceProvider());
-
-    @Override
-    public List<PersistenceProvider> getPersistenceProviders() {
-        return HARDCODED_PROVIDER_LIST;
-    }
-
-    @Override
-    public void clearCachedProviders() {
-        // done!
-    }
-
-}
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactive.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactive.java
index 04c6410b618c2..62b98e65a7932 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactive.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactive.java
@@ -4,13 +4,11 @@
 
 public class HibernateReactive {
 
-    static {
+    public static void featureInit(boolean enabled) {
         // Override the JPA persistence unit resolver so to use our custom boot
         // strategy:
-        ReactivePersistenceProviderSetup.registerPersistenceProvider();
-    }
+        ReactivePersistenceProviderSetup.registerStaticInitPersistenceProvider();
 
-    public static void featureInit(boolean enabled) {
         if (enabled) {
             Logger.getLogger("org.hibernate.quarkus.feature").debug("Hibernate Reactive Features Enabled");
         }
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactiveRecorder.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactiveRecorder.java
index 4f7cdac896302..cfec299506223 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactiveRecorder.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/HibernateReactiveRecorder.java
@@ -1,5 +1,10 @@
 package io.quarkus.hibernate.reactive.runtime;
 
+import java.util.List;
+import java.util.Map;
+
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
 import io.quarkus.runtime.annotations.Recorder;
 
 @Recorder
@@ -14,4 +19,10 @@ public void callHibernateReactiveFeatureInit(boolean enabled) {
         HibernateReactive.featureInit(enabled);
     }
 
+    public void initializePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors) {
+        ReactivePersistenceProviderSetup.registerRuntimePersistenceProvider(hibernateOrmRuntimeConfig,
+                integrationRuntimeDescriptors);
+    }
+
 }
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java
index 531f09a605fba..56585250e4a1f 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactivePersistenceProviderSetup.java
@@ -1,14 +1,30 @@
 package io.quarkus.hibernate.reactive.runtime;
 
+import java.util.List;
+import java.util.Map;
+
+import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
+import io.quarkus.hibernate.orm.runtime.SingletonPersistenceProviderResolver;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeDescriptor;
+
 public final class ReactivePersistenceProviderSetup {
 
     private ReactivePersistenceProviderSetup() {
         // not to be constructed
     }
 
-    public static void registerPersistenceProvider() {
+    public static void registerStaticInitPersistenceProvider() {
+        javax.persistence.spi.PersistenceProviderResolverHolder
+                .setPersistenceProviderResolver(new StaticInitHibernateReactivePersistenceProviderResolver());
+    }
+
+    public static void registerRuntimePersistenceProvider(HibernateOrmRuntimeConfig hibernateOrmRuntimeConfig,
+            Map<String, List<HibernateOrmIntegrationRuntimeDescriptor>> integrationRuntimeDescriptors) {
         javax.persistence.spi.PersistenceProviderResolverHolder
-                .setPersistenceProviderResolver(new FastBootHibernateReactivePersistenceProviderResolver());
+                .setPersistenceProviderResolver(
+                        new SingletonPersistenceProviderResolver(
+                                new FastBootHibernateReactivePersistenceProvider(hibernateOrmRuntimeConfig,
+                                        integrationRuntimeDescriptors)));
     }
 
 }
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java
index 93c327e11dc21..e51781acd7097 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionFactoryProducer.java
@@ -1,6 +1,5 @@
 package io.quarkus.hibernate.reactive.runtime;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
@@ -13,7 +12,6 @@
 
 import io.quarkus.arc.DefaultBean;
 
-@ApplicationScoped
 public class ReactiveSessionFactoryProducer {
 
     @Inject
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java
index 2ba09e383ec50..acf9dfd4ced30 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/ReactiveSessionProducer.java
@@ -1,8 +1,5 @@
 package io.quarkus.hibernate.reactive.runtime;
 
-import java.util.concurrent.CompletionStage;
-
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
@@ -12,54 +9,27 @@
 import org.hibernate.reactive.stage.Stage;
 
 import io.quarkus.arc.DefaultBean;
-import io.smallrye.mutiny.Uni;
 
-@ApplicationScoped
 public class ReactiveSessionProducer {
 
     @Inject
-    private Stage.SessionFactory reactiveSessionFactory;
+    Stage.SessionFactory reactiveSessionFactory;
 
     @Inject
-    private Mutiny.SessionFactory mutinySessionFactory;
-
-    @Produces
-    @RequestScoped
-    @DefaultBean
-    public CompletionStage<Stage.Session> stageSession() {
-        return reactiveSessionFactory.openSession();
-    }
-
-    @Produces
-    @RequestScoped
-    @DefaultBean
-    public Uni<Mutiny.Session> mutinySession() {
-        return mutinySessionFactory.openSession().cache();
-    }
-
-    public void disposeStageSession(@Disposes CompletionStage<Stage.Session> reactiveSession) {
-        reactiveSession.whenComplete((s, t) -> {
-            if (s != null)
-                s.close();
-        });
-    }
-
-    public void disposeMutinySession(@Disposes Uni<Mutiny.Session> reactiveSession) {
-        reactiveSession.subscribe().with(Mutiny.Session::close);
-    }
+    Mutiny.SessionFactory mutinySessionFactory;
 
     @Produces
     @RequestScoped
     @DefaultBean
     public Stage.Session createStageSession() {
-        return reactiveSessionFactory.createSession();
+        return reactiveSessionFactory.openSession();
     }
 
     @Produces
     @RequestScoped
     @DefaultBean
     public Mutiny.Session createMutinySession() {
-        return mutinySessionFactory.createSession();
+        return mutinySessionFactory.openSession();
     }
 
     public void disposeStageSession(@Disposes Stage.Session reactiveSession) {
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java
new file mode 100644
index 0000000000000..0b47e1a334762
--- /dev/null
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/StaticInitHibernateReactivePersistenceProviderResolver.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.reactive.runtime;
+
+import java.util.List;
+
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceProviderResolver;
+
+/**
+ * During the static init phase, we don't access the PersistenceProviderResolver.
+ */
+final class StaticInitHibernateReactivePersistenceProviderResolver implements PersistenceProviderResolver {
+
+    @Override
+    public List<PersistenceProvider> getPersistenceProviders() {
+        throw new IllegalStateException("Persistence providers are not available during the static init phase.");
+    }
+
+    @Override
+    public void clearCachedProviders() {
+        throw new IllegalStateException("Persistence providers are not available during the static init phase.");
+    }
+
+}
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java
index cfae8f993ba37..68cd314d36e7a 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/FastBootReactiveEntityManagerFactoryBuilder.java
@@ -8,6 +8,7 @@
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.reactive.session.impl.ReactiveSessionFactoryImpl;
 
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 import io.quarkus.hibernate.orm.runtime.RuntimeSettings;
 import io.quarkus.hibernate.orm.runtime.boot.FastBootEntityManagerFactoryBuilder;
 import io.quarkus.hibernate.orm.runtime.recording.PrevalidatedQuarkusMetadata;
@@ -24,8 +25,9 @@ public FastBootReactiveEntityManagerFactoryBuilder(PrevalidatedQuarkusMetadata m
     @Override
     public EntityManagerFactory build() {
         final SessionFactoryOptionsBuilder optionsBuilder = metadata.buildSessionFactoryOptionsBuilder();
-        populate(optionsBuilder, standardServiceRegistry, multiTenancyStrategy);
+        populate(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME, optionsBuilder, standardServiceRegistry,
+                multiTenancyStrategy);
         SessionFactoryOptions options = optionsBuilder.buildOptions();
-        return new ReactiveSessionFactoryImpl(metadata.getOriginalMetadata(), options);
+        return new ReactiveSessionFactoryImpl(metadata, options);
     }
 }
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java
index fcfc5b82fff81..037e1b5340f24 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java
@@ -21,13 +21,11 @@
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
 import org.hibernate.reactive.id.impl.ReactiveIdentifierGeneratorFactoryInitiator;
-import org.hibernate.reactive.provider.service.NoJdbcConnectionProviderInitiator;
 import org.hibernate.reactive.provider.service.NoJtaPlatformInitiator;
 import org.hibernate.reactive.provider.service.ReactiveMarkerServiceInitiator;
 import org.hibernate.reactive.provider.service.ReactivePersisterClassResolverInitiator;
 import org.hibernate.reactive.provider.service.ReactiveQueryTranslatorFactoryInitiator;
 import org.hibernate.reactive.provider.service.ReactiveSessionFactoryBuilderInitiator;
-import org.hibernate.resource.beans.spi.ManagedBeanRegistryInitiator;
 import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
 import org.hibernate.service.internal.ProvidedService;
 import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
@@ -35,6 +33,7 @@
 import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
 
 import io.quarkus.hibernate.orm.runtime.boot.registry.MirroringIntegratorService;
+import io.quarkus.hibernate.orm.runtime.cdi.QuarkusManagedBeanRegistryInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.DisabledBytecodeProviderInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusJndiServiceInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusRuntimeProxyFactoryFactoryInitiator;
@@ -43,6 +42,7 @@
 import io.quarkus.hibernate.orm.runtime.service.DisabledJMXInitiator;
 import io.quarkus.hibernate.orm.runtime.service.FlatClassLoaderService;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusRegionFactoryInitiator;
+import io.quarkus.hibernate.reactive.runtime.customized.QuarkusNoJdbcConnectionProviderInitiator;
 import io.quarkus.hibernate.reactive.runtime.customized.QuarkusNoJdbcEnvironmentInitiator;
 
 /**
@@ -66,7 +66,7 @@ public PreconfiguredReactiveServiceRegistryBuilder(RecordedState rs) {
         checkIsReactive(rs);
         this.initiators = buildQuarkusServiceInitiatorList(rs);
         this.integrators = rs.getIntegrators();
-        this.destroyedRegistry = (StandardServiceRegistryImpl) rs.getMetadata().getOriginalMetadata()
+        this.destroyedRegistry = (StandardServiceRegistryImpl) rs.getMetadata()
                 .getMetadataBuildingOptions()
                 .getServiceRegistry();
     }
@@ -178,8 +178,7 @@ private static List<StandardServiceInitiator> buildQuarkusServiceInitiatorList(R
         serviceInitiators.add(PersisterFactoryInitiator.INSTANCE);
 
         //Custom for Hibernate Reactive:
-        serviceInitiators.add(NoJdbcConnectionProviderInitiator.INSTANCE);
-        //serviceInitiators.add(QuarkusConnectionProviderInitiator.INSTANCE);
+        serviceInitiators.add(QuarkusNoJdbcConnectionProviderInitiator.INSTANCE);
         serviceInitiators.add(MultiTenantConnectionProviderInitiator.INSTANCE);
 
         // Disabled: Dialect is injected explicitly
@@ -209,7 +208,8 @@ private static List<StandardServiceInitiator> buildQuarkusServiceInitiatorList(R
 
         serviceInitiators.add(TransactionCoordinatorBuilderInitiator.INSTANCE);
 
-        serviceInitiators.add(ManagedBeanRegistryInitiator.INSTANCE);
+        // Replaces ManagedBeanRegistryInitiator.INSTANCE
+        serviceInitiators.add(QuarkusManagedBeanRegistryInitiator.INSTANCE);
 
         serviceInitiators.add(EntityCopyObserverFactoryInitiator.INSTANCE);
 
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/ReactiveHibernateInitiatorListProvider.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/ReactiveHibernateInitiatorListProvider.java
index 2ff01d65a70cc..a1ffcaeaa4f2c 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/ReactiveHibernateInitiatorListProvider.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/ReactiveHibernateInitiatorListProvider.java
@@ -16,26 +16,26 @@
 import org.hibernate.persister.internal.PersisterFactoryInitiator;
 import org.hibernate.property.access.internal.PropertyAccessStrategyResolverInitiator;
 import org.hibernate.reactive.id.impl.ReactiveIdentifierGeneratorFactoryInitiator;
-import org.hibernate.reactive.provider.service.NoJdbcConnectionProviderInitiator;
 import org.hibernate.reactive.provider.service.NoJtaPlatformInitiator;
 import org.hibernate.reactive.provider.service.ReactiveMarkerServiceInitiator;
 import org.hibernate.reactive.provider.service.ReactivePersisterClassResolverInitiator;
 import org.hibernate.reactive.provider.service.ReactiveQueryTranslatorFactoryInitiator;
 import org.hibernate.reactive.provider.service.ReactiveSessionFactoryBuilderInitiator;
-import org.hibernate.resource.beans.spi.ManagedBeanRegistryInitiator;
 import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
 import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
-import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator;
 import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
 
+import io.quarkus.hibernate.orm.runtime.cdi.QuarkusManagedBeanRegistryInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.BootstrapOnlyProxyFactoryFactoryInitiator;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusJndiServiceInitiator;
 import io.quarkus.hibernate.orm.runtime.service.DialectFactoryInitiator;
 import io.quarkus.hibernate.orm.runtime.service.DisabledJMXInitiator;
 import io.quarkus.hibernate.orm.runtime.service.InitialInitiatorListProvider;
+import io.quarkus.hibernate.orm.runtime.service.QuarkusImportSqlCommandExtractorInitiator;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusMutableIdentifierGeneratorFactoryInitiator;
 import io.quarkus.hibernate.orm.runtime.service.QuarkusRegionFactoryInitiator;
 import io.quarkus.hibernate.orm.runtime.service.StandardHibernateORMInitiatorListProvider;
+import io.quarkus.hibernate.reactive.runtime.customized.QuarkusNoJdbcConnectionProviderInitiator;
 
 /**
  * Defines the initial list of StandardServiceInitiator instances used to initialize the
@@ -64,7 +64,7 @@ public List<StandardServiceInitiator> initialInitiatorList() {
         serviceInitiators.add(ConfigurationServiceInitiator.INSTANCE);
         serviceInitiators.add(PropertyAccessStrategyResolverInitiator.INSTANCE);
 
-        serviceInitiators.add(ImportSqlCommandExtractorInitiator.INSTANCE);
+        serviceInitiators.add(QuarkusImportSqlCommandExtractorInitiator.INSTANCE);
         serviceInitiators.add(SchemaManagementToolInitiator.INSTANCE);
 
         serviceInitiators.add(JdbcEnvironmentInitiator.INSTANCE);
@@ -80,8 +80,7 @@ public List<StandardServiceInitiator> initialInitiatorList() {
         serviceInitiators.add(PersisterFactoryInitiator.INSTANCE);
 
         //Custom for Hibernate Reactive:
-        serviceInitiators.add(NoJdbcConnectionProviderInitiator.INSTANCE);
-        //serviceInitiators.add(QuarkusConnectionProviderInitiator.INSTANCE);
+        serviceInitiators.add(QuarkusNoJdbcConnectionProviderInitiator.INSTANCE);
         serviceInitiators.add(MultiTenantConnectionProviderInitiator.INSTANCE);
         serviceInitiators.add(DialectResolverInitiator.INSTANCE);
 
@@ -108,7 +107,8 @@ public List<StandardServiceInitiator> initialInitiatorList() {
 
         serviceInitiators.add(TransactionCoordinatorBuilderInitiator.INSTANCE);
 
-        serviceInitiators.add(ManagedBeanRegistryInitiator.INSTANCE);
+        // Replaces ManagedBeanRegistryInitiator.INSTANCE
+        serviceInitiators.add(QuarkusManagedBeanRegistryInitiator.INSTANCE);
 
         serviceInitiators.add(EntityCopyObserverFactoryInitiator.INSTANCE);
 
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusNoJdbcConnectionProviderInitiator.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusNoJdbcConnectionProviderInitiator.java
new file mode 100644
index 0000000000000..6cc4af179330f
--- /dev/null
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusNoJdbcConnectionProviderInitiator.java
@@ -0,0 +1,25 @@
+package io.quarkus.hibernate.reactive.runtime.customized;
+
+import java.util.Map;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.reactive.provider.service.NoJdbcConnectionProvider;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+
+public class QuarkusNoJdbcConnectionProviderInitiator implements StandardServiceInitiator<ConnectionProvider> {
+    public static final QuarkusNoJdbcConnectionProviderInitiator INSTANCE = new QuarkusNoJdbcConnectionProviderInitiator();
+
+    private QuarkusNoJdbcConnectionProviderInitiator() {
+    }
+
+    @Override
+    public ConnectionProvider initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
+        return NoJdbcConnectionProvider.INSTANCE;
+    }
+
+    @Override
+    public Class<ConnectionProvider> getServiceInitiated() {
+        return ConnectionProvider.class;
+    }
+}
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPool.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPool.java
deleted file mode 100644
index 0afaed21410f4..0000000000000
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPool.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.hibernate.reactive.runtime.customized;
-
-import java.util.Map;
-
-import org.hibernate.reactive.pool.impl.SqlClientPool;
-
-import io.vertx.sqlclient.Pool;
-
-@SuppressWarnings("serial")
-public class QuarkusReactiveConnectionPool extends SqlClientPool {
-
-    private final Pool pool;
-
-    public QuarkusReactiveConnectionPool(Pool pool) {
-        this.pool = pool;
-    }
-
-    protected Pool createPool(Map configurationValues) {
-        return pool;
-    }
-
-    @Override
-    public void stop() {
-    }
-
-}
\ No newline at end of file
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPoolInitiator.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPoolInitiator.java
index 7cfc3c3d5aba3..590d0f434b06a 100644
--- a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPoolInitiator.java
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPoolInitiator.java
@@ -4,7 +4,12 @@
 
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.dialect.PostgreSQL9Dialect;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.reactive.pool.ReactiveConnectionPool;
+import org.hibernate.reactive.pool.impl.ExternalSqlClientPool;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import io.vertx.sqlclient.Pool;
@@ -31,8 +36,12 @@ public ReactiveConnectionPool initiateService(Map configurationValues, ServiceRe
             // nothing to do, but given the separate hierarchies have to handle this here.
             return null;
         }
+        boolean usePostgresStyleParameters = registry.getService(JdbcEnvironment.class)
+                .getDialect() instanceof PostgreSQL9Dialect;
 
-        return new QuarkusReactiveConnectionPool(pool);
+        SqlStatementLogger sqlStatementLogger = registry.getService(JdbcServices.class).getSqlStatementLogger();
+
+        return new ExternalSqlClientPool(pool, sqlStatementLogger, usePostgresStyleParameters);
     }
 
 }
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/VertxInstanceInitiator.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/VertxInstanceInitiator.java
new file mode 100644
index 0000000000000..dd31acb0fac49
--- /dev/null
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/VertxInstanceInitiator.java
@@ -0,0 +1,29 @@
+package io.quarkus.hibernate.reactive.runtime.customized;
+
+import java.util.Map;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.reactive.vertx.VertxInstance;
+import org.hibernate.reactive.vertx.impl.ProvidedVertxInstance;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+
+import io.vertx.core.Vertx;
+
+public class VertxInstanceInitiator implements StandardServiceInitiator<VertxInstance> {
+
+    private final Vertx vertx;
+
+    public VertxInstanceInitiator(Vertx vertx) {
+        this.vertx = vertx;
+    }
+
+    @Override
+    public VertxInstance initiateService(Map map, ServiceRegistryImplementor serviceRegistryImplementor) {
+        return new ProvidedVertxInstance(vertx);
+    }
+
+    @Override
+    public Class<VertxInstance> getServiceInitiated() {
+        return VertxInstance.class;
+    }
+}
diff --git a/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java
new file mode 100644
index 0000000000000..a1c94be01f6bd
--- /dev/null
+++ b/extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/graal/Substitute_FastBootHibernateReactivePersistenceProvider.java
@@ -0,0 +1,63 @@
+package io.quarkus.hibernate.reactive.runtime.graal;
+
+import java.util.Map;
+import java.util.function.BooleanSupplier;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceUnitInfo;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+import io.quarkus.hibernate.orm.runtime.FastBootHibernatePersistenceProvider;
+import io.quarkus.hibernate.reactive.runtime.graal.Substitute_FastBootHibernateReactivePersistenceProvider.IsAgroalAbsent;
+
+@TargetClass(className = "io.quarkus.hibernate.reactive.runtime.FastBootHibernateReactivePersistenceProvider", onlyWith = IsAgroalAbsent.class)
+public final class Substitute_FastBootHibernateReactivePersistenceProvider {
+
+    @Substitute
+    @SuppressWarnings("rawtypes")
+    public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map) {
+        throw new IllegalStateException(
+                "This method should not be used if we don't have a JDBC datasource to start a regular JDBC-based Hibernate ORM EntityManager.");
+    }
+
+    @Substitute
+    @SuppressWarnings("rawtypes")
+    public void generateSchema(PersistenceUnitInfo info, Map map) {
+        throw new IllegalStateException(
+                "This method should not be used if we don't have a JDBC datasource to start a regular JDBC-based Hibernate ORM EntityManager.");
+    }
+
+    @Substitute
+    @SuppressWarnings("rawtypes")
+    public boolean generateSchema(String persistenceUnitName, Map map) {
+        throw new IllegalStateException(
+                "This method should not be used if we don't have a JDBC datasource to start a regular JDBC-based Hibernate ORM EntityManager.");
+    }
+
+    @Substitute
+    private FastBootHibernatePersistenceProvider getJdbcHibernatePersistenceProviderDelegate() {
+        throw new IllegalStateException(
+                "This method should not be used if we don't have a JDBC datasource to start a regular JDBC-based Hibernate ORM EntityManager.");
+    }
+
+    public static class IsAgroalAbsent implements BooleanSupplier {
+
+        private boolean agroalAbsent;
+
+        public IsAgroalAbsent() {
+            try {
+                Class.forName("io.quarkus.agroal.DataSource");
+                agroalAbsent = false;
+            } catch (ClassNotFoundException e) {
+                agroalAbsent = true;
+            }
+        }
+
+        @Override
+        public boolean getAsBoolean() {
+            return agroalAbsent;
+        }
+    }
+}
diff --git a/extensions/hibernate-search-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-elasticsearch/deployment/pom.xml
deleted file mode 100644
index 6b1c4cfc95e09..0000000000000
--- a/extensions/hibernate-search-elasticsearch/deployment/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-hibernate-search-elasticsearch-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-hibernate-search-elasticsearch-deployment</artifactId>
-    <name>Quarkus - Hibernate Search - Elasticsearch - Deployment</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elasticsearch-rest-client-common-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${project.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchClasses.java b/extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchClasses.java
deleted file mode 100644
index 6d8256bdf6ff7..0000000000000
--- a/extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchClasses.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.aliases.impl.IndexAliasDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.aliases.impl.IndexAliasDefinitionJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalysisDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalysisDefinitionJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalyzerDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalyzerDefinitionJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.CharFilterDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.NormalizerDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.NormalizerDefinitionJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.TokenFilterDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.TokenizerDefinition;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.AbstractTypeMapping;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.DynamicTemplate;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.DynamicTemplateJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.DynamicType;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.FormatJsonAdapter;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.NamedDynamicTemplate;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.NamedDynamicTemplateJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.PropertyMapping;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.PropertyMappingJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.RootTypeMapping;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.RootTypeMappingJsonAdapterFactory;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.RoutingType;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.mapping.impl.RoutingTypeJsonAdapter;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.settings.impl.Analysis;
-import org.hibernate.search.backend.elasticsearch.lowlevel.index.settings.impl.IndexSettings;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.TypeMapping;
-import org.jboss.jandex.DotName;
-
-class HibernateSearchClasses {
-
-    static final DotName INDEXED = DotName.createSimple(Indexed.class.getName());
-
-    static final DotName PROPERTY_MAPPING_META_ANNOTATION = DotName.createSimple(
-            org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping.class.getName());
-    static final DotName TYPE_MAPPING_META_ANNOTATION = DotName.createSimple(TypeMapping.class.getName());
-
-    static final List<DotName> GSON_CLASSES = new ArrayList<>();
-    static {
-        List<Class<?>> publicGsonClasses = Arrays.asList(
-                AbstractTypeMapping.class,
-                DynamicType.class,
-                FormatJsonAdapter.class,
-                RoutingTypeJsonAdapter.class,
-                PropertyMapping.class,
-                PropertyMappingJsonAdapterFactory.class,
-                RootTypeMapping.class,
-                RootTypeMappingJsonAdapterFactory.class,
-                RoutingType.class,
-                IndexSettings.class,
-                Analysis.class,
-                AnalysisDefinition.class,
-                AnalyzerDefinition.class,
-                AnalyzerDefinitionJsonAdapterFactory.class,
-                NormalizerDefinition.class,
-                NormalizerDefinitionJsonAdapterFactory.class,
-                TokenizerDefinition.class,
-                TokenFilterDefinition.class,
-                CharFilterDefinition.class,
-                AnalysisDefinitionJsonAdapterFactory.class,
-                IndexAliasDefinition.class,
-                IndexAliasDefinitionJsonAdapterFactory.class,
-                DynamicTemplate.class,
-                DynamicTemplateJsonAdapterFactory.class,
-                NamedDynamicTemplate.class,
-                NamedDynamicTemplateJsonAdapterFactory.class);
-        for (Class<?> publicGsonClass : publicGsonClasses) {
-            Class<?> currentClass = publicGsonClass;
-            while (currentClass != Object.class) {
-                GSON_CLASSES.add(DotName.createSimple(currentClass.getName()));
-                currentClass = currentClass.getSuperclass();
-            }
-        }
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java b/extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java
deleted file mode 100644
index e26c96414677c..0000000000000
--- a/extensions/hibernate-search-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/elasticsearch/HibernateSearchElasticsearchProcessor.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch;
-
-import static io.quarkus.hibernate.search.elasticsearch.HibernateSearchClasses.GSON_CLASSES;
-import static io.quarkus.hibernate.search.elasticsearch.HibernateSearchClasses.INDEXED;
-import static io.quarkus.hibernate.search.elasticsearch.HibernateSearchClasses.PROPERTY_MAPPING_META_ANNOTATION;
-import static io.quarkus.hibernate.search.elasticsearch.HibernateSearchClasses.TYPE_MAPPING_META_ANNOTATION;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationTarget;
-import org.jboss.jandex.AnnotationTarget.Kind;
-import org.jboss.jandex.ArrayType;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.ClassType;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.ParameterizedType;
-import org.jboss.jandex.PrimitiveType;
-import org.jboss.jandex.Type;
-import org.jboss.jandex.UnresolvedTypeVariable;
-import org.jboss.jandex.VoidType;
-
-import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
-import io.quarkus.deployment.configuration.ConfigurationError;
-import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
-import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationBuildItem;
-import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfig;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfig.ElasticsearchBackendBuildTimeConfig;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchRecorder;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig;
-
-class HibernateSearchElasticsearchProcessor {
-
-    private static final String HIBERNATE_SEARCH_ELASTICSEARCH = "Hibernate Search Elasticsearch";
-
-    HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig;
-
-    @BuildStep
-    void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
-        filters.produce(new LogCleanupFilterBuildItem(
-                "org.hibernate.search.mapper.orm.bootstrap.impl.HibernateSearchIntegrator", "HSEARCH000034"));
-    }
-
-    @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    public void build(HibernateSearchElasticsearchRecorder recorder,
-            CombinedIndexBuildItem combinedIndexBuildItem,
-            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
-            BuildProducer<HibernateOrmIntegrationBuildItem> integrations,
-            BuildProducer<FeatureBuildItem> feature) throws Exception {
-        feature.produce(new FeatureBuildItem(Feature.HIBERNATE_SEARCH_ELASTICSEARCH));
-
-        IndexView index = combinedIndexBuildItem.getIndex();
-
-        if (index.getAnnotations(INDEXED).isEmpty()) {
-            // we don't have any indexed entity, we can bail out
-            return;
-        }
-
-        checkConfig(buildTimeConfig);
-
-        // Register the Hibernate Search integration
-        integrations.produce(new HibernateOrmIntegrationBuildItem(HIBERNATE_SEARCH_ELASTICSEARCH));
-
-        // Register the required reflection declarations
-        registerReflection(index, reflectiveClass, reflectiveHierarchy);
-
-        // Register the Hibernate Search integration listener
-        recorder.registerHibernateSearchIntegration(buildTimeConfig);
-    }
-
-    @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    void setRuntimeConfig(HibernateSearchElasticsearchRecorder recorder,
-            HibernateSearchElasticsearchRuntimeConfig runtimeConfig,
-            BuildProducer<HibernateOrmIntegrationRuntimeConfiguredBuildItem> runtimeConfigured) {
-        recorder.setRuntimeConfig(runtimeConfig);
-
-        runtimeConfigured.produce(new HibernateOrmIntegrationRuntimeConfiguredBuildItem(HIBERNATE_SEARCH_ELASTICSEARCH));
-    }
-
-    private static void checkConfig(HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig) {
-        if (buildTimeConfig.additionalBackends.defaultBackend.isPresent()) {
-            String defaultBackend = buildTimeConfig.additionalBackends.defaultBackend.get();
-            // we have a default named backend
-            if (buildTimeConfig.defaultBackend.version.isPresent()) {
-                throw new ConfigurationError(
-                        "quarkus.hibernate-search.elasticsearch.default-backend cannot be used in conjunction with a default backend configuration.");
-            }
-            if (!buildTimeConfig.additionalBackends.backends.containsKey(defaultBackend)) {
-                throw new ConfigurationError(
-                        "The default backend defined does not exist: " + defaultBackend);
-            }
-        } else {
-            // we are in the default backend case
-            if (!buildTimeConfig.defaultBackend.version.isPresent()) {
-                throw new ConfigurationError(
-                        "The Elasticsearch version needs to be defined via the quarkus.hibernate-search.elasticsearch.version property.");
-            }
-        }
-
-        // we validate that the version is present for all the additional backends
-        if (!buildTimeConfig.additionalBackends.backends.isEmpty()) {
-            List<String> additionalBackendsWithNoVersion = new ArrayList<>();
-            for (Entry<String, ElasticsearchBackendBuildTimeConfig> additionalBackendEntry : buildTimeConfig.additionalBackends.backends
-                    .entrySet()) {
-                if (!additionalBackendEntry.getValue().version.isPresent()) {
-                    additionalBackendsWithNoVersion.add(additionalBackendEntry.getKey());
-                }
-            }
-            if (!additionalBackendsWithNoVersion.isEmpty()) {
-                throw new ConfigurationError("The Elasticsearch version property needs to be defined for backends "
-                        + String.join(", ", additionalBackendsWithNoVersion));
-            }
-        }
-    }
-
-    private void registerReflection(IndexView index, BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
-        Set<DotName> reflectiveClassCollector = new HashSet<>();
-
-        if (buildTimeConfig.defaultBackend.analysis.configurer.isPresent()) {
-            reflectiveClass.produce(
-                    new ReflectiveClassBuildItem(true, false, buildTimeConfig.defaultBackend.analysis.configurer.get()));
-        }
-
-        if (buildTimeConfig.defaultBackend.layout.strategy.isPresent()) {
-            reflectiveClass.produce(
-                    new ReflectiveClassBuildItem(true, false, buildTimeConfig.defaultBackend.layout.strategy.get()));
-        }
-
-        if (buildTimeConfig.backgroundFailureHandler.isPresent()) {
-            reflectiveClass.produce(
-                    new ReflectiveClassBuildItem(true, false, buildTimeConfig.backgroundFailureHandler.get()));
-        }
-
-        Set<Type> reflectiveHierarchyCollector = new HashSet<>();
-
-        for (AnnotationInstance propertyMappingMetaAnnotationInstance : index
-                .getAnnotations(PROPERTY_MAPPING_META_ANNOTATION)) {
-            for (AnnotationInstance propertyMappingAnnotationInstance : index
-                    .getAnnotations(propertyMappingMetaAnnotationInstance.name())) {
-                AnnotationTarget annotationTarget = propertyMappingAnnotationInstance.target();
-                if (annotationTarget.kind() == Kind.FIELD) {
-                    FieldInfo fieldInfo = annotationTarget.asField();
-                    addReflectiveClass(index, reflectiveClassCollector, reflectiveHierarchyCollector,
-                            fieldInfo.declaringClass());
-                    addReflectiveType(index, reflectiveClassCollector, reflectiveHierarchyCollector,
-                            fieldInfo.type());
-                } else if (annotationTarget.kind() == Kind.METHOD) {
-                    MethodInfo methodInfo = annotationTarget.asMethod();
-                    addReflectiveClass(index, reflectiveClassCollector, reflectiveHierarchyCollector,
-                            methodInfo.declaringClass());
-                    addReflectiveType(index, reflectiveClassCollector, reflectiveHierarchyCollector,
-                            methodInfo.returnType());
-                }
-            }
-        }
-
-        for (AnnotationInstance typeBridgeMappingInstance : index.getAnnotations(TYPE_MAPPING_META_ANNOTATION)) {
-            for (AnnotationInstance typeBridgeInstance : index.getAnnotations(typeBridgeMappingInstance.name())) {
-                addReflectiveClass(index, reflectiveClassCollector, reflectiveHierarchyCollector,
-                        typeBridgeInstance.target().asClass());
-            }
-        }
-
-        reflectiveClassCollector.addAll(GSON_CLASSES);
-
-        String[] reflectiveClasses = reflectiveClassCollector.stream().map(DotName::toString).toArray(String[]::new);
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, reflectiveClasses));
-
-        for (Type reflectiveHierarchyType : reflectiveHierarchyCollector) {
-            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(reflectiveHierarchyType));
-        }
-    }
-
-    private static void addReflectiveClass(IndexView index, Set<DotName> reflectiveClassCollector,
-            Set<Type> reflectiveTypeCollector, ClassInfo classInfo) {
-        if (skipClass(classInfo.name(), reflectiveClassCollector)) {
-            return;
-        }
-
-        reflectiveClassCollector.add(classInfo.name());
-
-        for (ClassInfo subclass : index.getAllKnownSubclasses(classInfo.name())) {
-            reflectiveClassCollector.add(subclass.name());
-        }
-        for (ClassInfo implementor : index.getAllKnownImplementors(classInfo.name())) {
-            reflectiveClassCollector.add(implementor.name());
-        }
-
-        Type superClassType = classInfo.superClassType();
-        while (superClassType != null && !superClassType.name().toString().equals("java.lang.Object")) {
-            reflectiveClassCollector.add(superClassType.name());
-            if (superClassType instanceof ClassType) {
-                superClassType = index.getClassByName(superClassType.name()).superClassType();
-            } else if (superClassType instanceof ParameterizedType) {
-                ParameterizedType parameterizedType = superClassType.asParameterizedType();
-                for (Type typeArgument : parameterizedType.arguments()) {
-                    addReflectiveType(index, reflectiveClassCollector, reflectiveTypeCollector, typeArgument);
-                }
-                superClassType = parameterizedType.owner();
-            }
-        }
-    }
-
-    private static void addReflectiveType(IndexView index, Set<DotName> reflectiveClassCollector,
-            Set<Type> reflectiveTypeCollector, Type type) {
-        if (type instanceof VoidType || type instanceof PrimitiveType || type instanceof UnresolvedTypeVariable) {
-            return;
-        } else if (type instanceof ClassType) {
-            ClassInfo classInfo = index.getClassByName(type.name());
-            addReflectiveClass(index, reflectiveClassCollector, reflectiveTypeCollector, classInfo);
-        } else if (type instanceof ArrayType) {
-            addReflectiveType(index, reflectiveClassCollector, reflectiveTypeCollector, type.asArrayType().component());
-        } else if (type instanceof ParameterizedType) {
-            ParameterizedType parameterizedType = type.asParameterizedType();
-            addReflectiveType(index, reflectiveClassCollector, reflectiveTypeCollector, parameterizedType.owner());
-            for (Type typeArgument : parameterizedType.arguments()) {
-                addReflectiveType(index, reflectiveClassCollector, reflectiveTypeCollector, typeArgument);
-            }
-        }
-    }
-
-    private static boolean skipClass(DotName name, Set<DotName> processedClasses) {
-        return name.toString().startsWith("java.") || processedClasses.contains(name);
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/IndexedNonEntity.java b/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/IndexedNonEntity.java
deleted file mode 100644
index cff2977a7a8bc..0000000000000
--- a/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/IndexedNonEntity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.test;
-
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
-
-/**
- * This particular class is not a valid entity as it is not marked with @Entity.
- * <p>
- * It is done this way just for the sake of testing the extension bootstrap.
- */
-@Indexed
-public class IndexedNonEntity {
-
-}
diff --git a/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/NoConfigIndexedNonEntityTest.java b/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/NoConfigIndexedNonEntityTest.java
deleted file mode 100644
index 10eaa75edfb29..0000000000000
--- a/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/NoConfigIndexedNonEntityTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.test;
-
-import java.sql.SQLException;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.deployment.configuration.ConfigurationError;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class NoConfigIndexedNonEntityTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
-            () -> ShrinkWrap.create(JavaArchive.class).addClass(IndexedNonEntity.class))
-            .setExpectedException(ConfigurationError.class);
-
-    @Test
-    public void testNoConfig() throws SQLException {
-        // an exception should be thrown
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/NoConfigNoIndexedEntityTest.java b/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/NoConfigNoIndexedEntityTest.java
deleted file mode 100644
index 9b2b7c0e60267..0000000000000
--- a/extensions/hibernate-search-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/NoConfigNoIndexedEntityTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.test;
-
-import java.sql.SQLException;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-
-public class NoConfigNoIndexedEntityTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
-            () -> ShrinkWrap.create(JavaArchive.class));
-
-    @Test
-    public void testNoConfig() throws SQLException {
-        // we should be able to start the application, even with no configuration at all nor indexed entities
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/pom.xml b/extensions/hibernate-search-elasticsearch/pom.xml
deleted file mode 100644
index e051ff027912c..0000000000000
--- a/extensions/hibernate-search-elasticsearch/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-build-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-hibernate-search-elasticsearch-parent</artifactId>
-    <name>Quarkus - Hibernate Search - Elasticsearch</name>
-    <packaging>pom</packaging>
-    <modules>
-        <module>deployment</module>
-        <module>runtime</module>
-    </modules>
-</project>
diff --git a/extensions/hibernate-search-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-elasticsearch/runtime/pom.xml
deleted file mode 100644
index b7659ba3c09e8..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-hibernate-search-elasticsearch-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
-    <name>Quarkus - Hibernate Search - Elasticsearch - Runtime</name>
-    <description>Automatically index your Hibernate entities in Elasticsearch</description>
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elasticsearch-rest-client-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-backend-elasticsearch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.search</groupId>
-            <artifactId>hibernate-search-mapper-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${project.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchConfigUtil.java b/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchConfigUtil.java
deleted file mode 100644
index 961658b0b48c2..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchConfigUtil.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.runtime;
-
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
-import org.hibernate.search.engine.cfg.BackendSettings;
-import org.hibernate.search.engine.cfg.EngineSettings;
-
-public class HibernateSearchConfigUtil {
-
-    public static <T> void addConfig(BiConsumer<String, Object> propertyCollector, String configPath, T value) {
-        propertyCollector.accept(configPath, value);
-    }
-
-    public static void addConfig(BiConsumer<String, Object> propertyCollector, String configPath, Optional<?> value) {
-        if (value.isPresent()) {
-            propertyCollector.accept(configPath, value.get());
-        }
-    }
-
-    public static <T> void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
-            T value) {
-        propertyCollector.accept(backendConfigKey(backendName, configPath), value);
-    }
-
-    public static void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
-            Optional<?> value) {
-        addBackendConfig(propertyCollector, backendName, configPath, value, Optional::isPresent, Optional::get);
-    }
-
-    public static void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
-            OptionalInt value) {
-        addBackendConfig(propertyCollector, backendName, configPath, value, OptionalInt::isPresent, OptionalInt::getAsInt);
-    }
-
-    public static <T> void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
-            T value,
-            Function<T, Boolean> shouldBeAdded, Function<T, ?> getValue) {
-        if (shouldBeAdded.apply(value)) {
-            propertyCollector.accept(backendConfigKey(backendName, configPath), getValue.apply(value));
-        }
-    }
-
-    public static void addBackendDefaultIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
-            String configPath, Optional<?> value) {
-        addBackendDefaultIndexConfig(propertyCollector, backendName, configPath, value, Optional::isPresent, Optional::get);
-    }
-
-    public static void addBackendDefaultIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
-            String configPath, OptionalInt value) {
-        addBackendDefaultIndexConfig(propertyCollector, backendName, configPath, value, OptionalInt::isPresent,
-                OptionalInt::getAsInt);
-    }
-
-    public static <T> void addBackendDefaultIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
-            String configPath, T value,
-            Function<T, Boolean> shouldBeAdded, Function<T, ?> getValue) {
-        addBackendConfig(propertyCollector, backendName, BackendSettings.INDEX_DEFAULTS + "." + configPath, value,
-                shouldBeAdded, getValue);
-    }
-
-    public static void addBackendIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
-            String indexName, String configPath, Optional<?> value) {
-        addBackendIndexConfig(propertyCollector, backendName, indexName, configPath, value, Optional::isPresent, Optional::get);
-    }
-
-    public static void addBackendIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
-            String indexName, String configPath, OptionalInt value) {
-        addBackendIndexConfig(propertyCollector, backendName, indexName, configPath, value, OptionalInt::isPresent,
-                OptionalInt::getAsInt);
-    }
-
-    public static <T> void addBackendIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
-            String indexName, String configPath, T value,
-            Function<T, Boolean> shouldBeAdded, Function<T, ?> getValue) {
-        addBackendConfig(propertyCollector, backendName, BackendSettings.INDEXES + "." + indexName + "." + configPath, value,
-                shouldBeAdded, getValue);
-    }
-
-    private static String backendConfigKey(String backendName, String configPath) {
-        return EngineSettings.BACKENDS + "." + backendName + "." + configPath;
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java b/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java
deleted file mode 100644
index 9efdb96a5d0d5..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.runtime;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
-
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-@ConfigRoot(name = "hibernate-search", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
-public class HibernateSearchElasticsearchBuildTimeConfig {
-
-    /**
-     * Default backend
-     */
-    @ConfigItem(name = "elasticsearch")
-    @ConfigDocSection
-    public ElasticsearchBackendBuildTimeConfig defaultBackend;
-
-    /**
-     * Additional backends
-     */
-    @ConfigItem(name = "elasticsearch")
-    @ConfigDocSection
-    public ElasticsearchAdditionalBackendsBuildTimeConfig additionalBackends;
-
-    /**
-     * The class or the name of the bean that should be notified of any failure occurring in a background process
-     * (mainly index operations).
-     * <p>
-     * Must implement {@link org.hibernate.search.engine.reporting.FailureHandler}.
-     */
-    @ConfigItem
-    public Optional<Class<?>> backgroundFailureHandler;
-
-    @ConfigGroup
-    public static class ElasticsearchAdditionalBackendsBuildTimeConfig {
-
-        /**
-         * Only useful when defining {@link #backends additional backends}:
-         * the name of the default backend,
-         * i.e. the backend that will be assigned to {@code @Indexed} entities
-         * that do not specify a backend explicitly through {@code @Indexed(backend = ...)}.
-         */
-        @ConfigItem
-        public Optional<String> defaultBackend;
-
-        /**
-         * Additional backends
-         */
-        @ConfigDocMapKey("backend-name")
-        public Map<String, ElasticsearchBackendBuildTimeConfig> backends;
-
-    }
-
-    @ConfigGroup
-    public static class ElasticsearchBackendBuildTimeConfig {
-        /**
-         * The version of Elasticsearch used in the cluster.
-         * <p>
-         * As the schema is generated without a connection to the server, this item is mandatory.
-         * <p>
-         * It doesn't have to be the exact version (it can be 7 or 7.1 for instance) but it has to be sufficiently precise to
-         * choose a model dialect (the one used to generate the schema) compatible with the protocol dialect (the one used to
-         * communicate with Elasticsearch).
-         * <p>
-         * There's no rule of thumb here as it depends on the schema incompatibilities introduced by Elasticsearch versions. In
-         * any case, if there is a problem, you will have an error when Hibernate Search tries to connect to the cluster.
-         */
-        @ConfigItem
-        public Optional<ElasticsearchVersion> version;
-
-        /**
-         * Configuration for full-text analysis.
-         */
-        @ConfigItem
-        public AnalysisConfig analysis;
-
-        /**
-         * Configuration for the index layout.
-         */
-        @ConfigItem
-        public LayoutConfig layout;
-    }
-
-    @ConfigGroup
-    public static class AnalysisConfig {
-        /**
-         * The class or the name of the bean used to configure full text analysis (e.g. analyzers, normalizers).
-         */
-        @ConfigItem
-        public Optional<Class<?>> configurer;
-    }
-
-    @ConfigGroup
-    public static class LayoutConfig {
-        /**
-         * The class or the name of the bean used to configure layout (e.g. index names, index aliases).
-         */
-        @ConfigItem
-        public Optional<Class<?>> strategy;
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
deleted file mode 100644
index a28bd67c16498..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.runtime;
-
-import static io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendConfig;
-import static io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendDefaultIndexConfig;
-import static io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendIndexConfig;
-import static io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchConfigUtil.addConfig;
-
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.function.BiConsumer;
-
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.spi.BootstrapContext;
-import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
-import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings;
-import org.hibernate.search.engine.cfg.BackendSettings;
-import org.hibernate.search.engine.cfg.EngineSettings;
-import org.hibernate.search.mapper.orm.bootstrap.spi.HibernateOrmIntegrationBooter;
-import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
-import org.hibernate.search.mapper.orm.cfg.spi.HibernateOrmMapperSpiSettings;
-import org.hibernate.search.mapper.orm.cfg.spi.HibernateOrmReflectionStrategyName;
-
-import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationListener;
-import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrations;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfig.ElasticsearchBackendBuildTimeConfig;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig.ElasticsearchBackendRuntimeConfig;
-import io.quarkus.hibernate.search.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig.ElasticsearchIndexConfig;
-import io.quarkus.runtime.annotations.Recorder;
-
-@Recorder
-public class HibernateSearchElasticsearchRecorder {
-
-    public static final String DEFAULT_BACKEND = "_quarkus_";
-
-    private static HibernateSearchElasticsearchRuntimeConfig runtimeConfig;
-
-    public void registerHibernateSearchIntegration(HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig) {
-        HibernateOrmIntegrations.registerListener(new HibernateSearchIntegrationListener(buildTimeConfig));
-    }
-
-    public void setRuntimeConfig(HibernateSearchElasticsearchRuntimeConfig runtimeConfig) {
-        HibernateSearchElasticsearchRecorder.runtimeConfig = runtimeConfig;
-    }
-
-    private static final class HibernateSearchIntegrationListener implements HibernateOrmIntegrationListener {
-
-        private HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig;
-
-        private HibernateSearchIntegrationListener(HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig) {
-            this.buildTimeConfig = buildTimeConfig;
-        }
-
-        @Override
-        public void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
-            addConfig(propertyCollector, HibernateOrmMapperSpiSettings.REFLECTION_STRATEGY,
-                    HibernateOrmReflectionStrategyName.JAVA_LANG_REFLECT);
-
-            addConfig(propertyCollector,
-                    EngineSettings.BACKGROUND_FAILURE_HANDLER,
-                    buildTimeConfig.backgroundFailureHandler);
-
-            if (buildTimeConfig.additionalBackends.defaultBackend.isPresent()) {
-                // we have a named default backend
-                addConfig(propertyCollector, EngineSettings.DEFAULT_BACKEND,
-                        buildTimeConfig.additionalBackends.defaultBackend.get());
-            } else if (buildTimeConfig.defaultBackend.version.isPresent()) {
-                // we use the default backend configuration
-                addConfig(propertyCollector, EngineSettings.DEFAULT_BACKEND,
-                        HibernateSearchElasticsearchRecorder.DEFAULT_BACKEND);
-            }
-
-            contributeBackendBuildTimeProperties(propertyCollector, HibernateSearchElasticsearchRecorder.DEFAULT_BACKEND,
-                    buildTimeConfig.defaultBackend);
-
-            for (Entry<String, ElasticsearchBackendBuildTimeConfig> backendEntry : buildTimeConfig.additionalBackends.backends
-                    .entrySet()) {
-                contributeBackendBuildTimeProperties(propertyCollector, backendEntry.getKey(), backendEntry.getValue());
-            }
-        }
-
-        @Override
-        public void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
-                BiConsumer<String, Object> propertyCollector) {
-            HibernateOrmIntegrationBooter booter = HibernateOrmIntegrationBooter.create(metadata, bootstrapContext);
-            booter.preBoot(propertyCollector);
-        }
-
-        @Override
-        public void contributeRuntimeProperties(BiConsumer<String, Object> propertyCollector) {
-            addConfig(propertyCollector,
-                    HibernateOrmMapperSettings.SCHEMA_MANAGEMENT_STRATEGY,
-                    runtimeConfig.schemaManagement.strategy);
-            addConfig(propertyCollector,
-                    HibernateOrmMapperSettings.AUTOMATIC_INDEXING_SYNCHRONIZATION_STRATEGY,
-                    runtimeConfig.automaticIndexing.synchronization.strategy);
-            addConfig(propertyCollector,
-                    HibernateOrmMapperSettings.AUTOMATIC_INDEXING_ENABLE_DIRTY_CHECK,
-                    runtimeConfig.automaticIndexing.enableDirtyCheck);
-            addConfig(propertyCollector,
-                    HibernateOrmMapperSettings.QUERY_LOADING_CACHE_LOOKUP_STRATEGY,
-                    runtimeConfig.queryLoading.cacheLookup.strategy);
-            addConfig(propertyCollector,
-                    HibernateOrmMapperSettings.QUERY_LOADING_FETCH_SIZE,
-                    runtimeConfig.queryLoading.fetchSize);
-
-            contributeBackendRuntimeProperties(propertyCollector, DEFAULT_BACKEND, runtimeConfig.defaultBackend);
-
-            for (Entry<String, ElasticsearchBackendRuntimeConfig> backendEntry : runtimeConfig.additionalBackends.backends
-                    .entrySet()) {
-                contributeBackendRuntimeProperties(propertyCollector, backendEntry.getKey(), backendEntry.getValue());
-            }
-        }
-
-        private void contributeBackendBuildTimeProperties(BiConsumer<String, Object> propertyCollector, String backendName,
-                ElasticsearchBackendBuildTimeConfig elasticsearchBackendConfig) {
-            addBackendConfig(propertyCollector, backendName, BackendSettings.TYPE,
-                    ElasticsearchBackendSettings.TYPE_NAME);
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.VERSION,
-                    elasticsearchBackendConfig.version);
-            addBackendConfig(propertyCollector, backendName,
-                    ElasticsearchBackendSettings.ANALYSIS_CONFIGURER,
-                    elasticsearchBackendConfig.analysis.configurer,
-                    Optional::isPresent, c -> c.get().getName());
-            addBackendConfig(propertyCollector, backendName,
-                    ElasticsearchBackendSettings.LAYOUT_STRATEGY,
-                    elasticsearchBackendConfig.layout.strategy,
-                    Optional::isPresent, c -> c.get().getName());
-        }
-
-        private void contributeBackendRuntimeProperties(BiConsumer<String, Object> propertyCollector, String backendName,
-                ElasticsearchBackendRuntimeConfig elasticsearchBackendConfig) {
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.HOSTS,
-                    elasticsearchBackendConfig.hosts);
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.PROTOCOL,
-                    elasticsearchBackendConfig.protocol.getHibernateSearchString());
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.USERNAME,
-                    elasticsearchBackendConfig.username);
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.PASSWORD,
-                    elasticsearchBackendConfig.password);
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.CONNECTION_TIMEOUT,
-                    elasticsearchBackendConfig.connectionTimeout.toMillis());
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.MAX_CONNECTIONS,
-                    elasticsearchBackendConfig.maxConnections);
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.MAX_CONNECTIONS_PER_ROUTE,
-                    elasticsearchBackendConfig.maxConnectionsPerRoute);
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.THREAD_POOL_SIZE,
-                    elasticsearchBackendConfig.threadPool.size);
-
-            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.DISCOVERY_ENABLED,
-                    elasticsearchBackendConfig.discovery.enabled);
-            if (elasticsearchBackendConfig.discovery.enabled) {
-                addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.DISCOVERY_REFRESH_INTERVAL,
-                        elasticsearchBackendConfig.discovery.refreshInterval.getSeconds());
-            }
-
-            addBackendDefaultIndexConfig(propertyCollector, backendName,
-                    ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS,
-                    elasticsearchBackendConfig.indexDefaults.schemaManagement.requiredStatus);
-            addBackendDefaultIndexConfig(propertyCollector, backendName,
-                    ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS_WAIT_TIMEOUT,
-                    elasticsearchBackendConfig.indexDefaults.schemaManagement.requiredStatusWaitTimeout, Optional::isPresent,
-                    d -> d.get().toMillis());
-            addBackendDefaultIndexConfig(propertyCollector, backendName,
-                    ElasticsearchIndexSettings.INDEXING_QUEUE_COUNT,
-                    elasticsearchBackendConfig.indexDefaults.indexing.queueCount);
-            addBackendDefaultIndexConfig(propertyCollector, backendName,
-                    ElasticsearchIndexSettings.INDEXING_QUEUE_SIZE,
-                    elasticsearchBackendConfig.indexDefaults.indexing.queueSize);
-            addBackendDefaultIndexConfig(propertyCollector, backendName,
-                    ElasticsearchIndexSettings.INDEXING_MAX_BULK_SIZE,
-                    elasticsearchBackendConfig.indexDefaults.indexing.maxBulkSize);
-
-            for (Entry<String, ElasticsearchIndexConfig> indexConfigEntry : runtimeConfig.defaultBackend.indexes.entrySet()) {
-                String indexName = indexConfigEntry.getKey();
-                ElasticsearchIndexConfig indexConfig = indexConfigEntry.getValue();
-
-                addBackendIndexConfig(propertyCollector, backendName, indexName,
-                        ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS,
-                        indexConfig.schemaManagement.requiredStatus);
-                addBackendIndexConfig(propertyCollector, backendName, indexName,
-                        ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS_WAIT_TIMEOUT,
-                        indexConfig.schemaManagement.requiredStatusWaitTimeout, Optional::isPresent,
-                        d -> d.get().toMillis());
-                addBackendIndexConfig(propertyCollector, backendName, indexName,
-                        ElasticsearchIndexSettings.INDEXING_QUEUE_COUNT,
-                        indexConfig.indexing.queueCount);
-                addBackendIndexConfig(propertyCollector, backendName, indexName,
-                        ElasticsearchIndexSettings.INDEXING_QUEUE_SIZE,
-                        indexConfig.indexing.queueSize);
-                addBackendIndexConfig(propertyCollector, backendName, indexName,
-                        ElasticsearchIndexSettings.INDEXING_MAX_BULK_SIZE,
-                        indexConfig.indexing.maxBulkSize);
-            }
-        }
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java b/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java
deleted file mode 100644
index ac3eff4f2852d..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java
+++ /dev/null
@@ -1,413 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.runtime;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.OptionalInt;
-
-import org.hibernate.search.backend.elasticsearch.index.IndexStatus;
-import org.hibernate.search.mapper.orm.automaticindexing.session.AutomaticIndexingSynchronizationStrategyNames;
-import org.hibernate.search.mapper.orm.schema.management.SchemaManagementStrategyName;
-import org.hibernate.search.mapper.orm.search.loading.EntityLoadingCacheLookupStrategy;
-import org.hibernate.search.util.common.SearchException;
-import org.hibernate.search.util.common.impl.StringHelper;
-
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-@ConfigRoot(name = "hibernate-search", phase = ConfigPhase.RUN_TIME)
-public class HibernateSearchElasticsearchRuntimeConfig {
-
-    /**
-     * Default backend
-     */
-    @ConfigItem(name = "elasticsearch")
-    @ConfigDocSection
-    ElasticsearchBackendRuntimeConfig defaultBackend;
-
-    /**
-     * Additional backends
-     */
-    @ConfigItem(name = "elasticsearch")
-    @ConfigDocSection
-    public ElasticsearchAdditionalBackendsRuntimeConfig additionalBackends;
-
-    /**
-     * Configuration for automatic creation and validation of the Elasticsearch schema:
-     * indexes, their mapping, their settings.
-     */
-    @ConfigItem
-    SchemaManagementConfig schemaManagement;
-
-    /**
-     * Configuration for how entities are loaded by a search query.
-     */
-    @ConfigItem(name = "query.loading")
-    SearchQueryLoadingConfig queryLoading;
-
-    /**
-     * Configuration for the automatic indexing.
-     */
-    @ConfigItem
-    AutomaticIndexingConfig automaticIndexing;
-
-    @ConfigGroup
-    public static class ElasticsearchAdditionalBackendsRuntimeConfig {
-
-        /**
-         * Additional backends
-         */
-        @ConfigDocMapKey("backend-name")
-        public Map<String, ElasticsearchBackendRuntimeConfig> backends;
-
-    }
-
-    @ConfigGroup
-    public static class ElasticsearchBackendRuntimeConfig {
-        /**
-         * The list of hosts of the Elasticsearch servers.
-         */
-        @ConfigItem(defaultValue = "localhost:9200")
-        List<String> hosts;
-
-        /**
-         * The protocol to use when contacting Elasticsearch servers.
-         * Set to "https" to enable SSL/TLS.
-         */
-        @ConfigItem(defaultValue = "http")
-        ElasticsearchClientProtocol protocol;
-
-        /**
-         * The username used for authentication.
-         */
-        @ConfigItem
-        Optional<String> username;
-
-        /**
-         * The password used for authentication.
-         */
-        @ConfigItem
-        Optional<String> password;
-
-        /**
-         * The connection timeout.
-         */
-        @ConfigItem(defaultValue = "3S")
-        Duration connectionTimeout;
-
-        /**
-         * The maximum number of connections to all the Elasticsearch servers.
-         */
-        @ConfigItem(defaultValue = "20")
-        int maxConnections;
-
-        /**
-         * The maximum number of connections per Elasticsearch server.
-         */
-        @ConfigItem(defaultValue = "10")
-        int maxConnectionsPerRoute;
-
-        /**
-         * Configuration for the automatic discovery of new Elasticsearch nodes.
-         */
-        @ConfigItem
-        DiscoveryConfig discovery;
-
-        /**
-         * Configuration for the thread pool assigned to the backend.
-         */
-        @ConfigItem
-        ThreadPoolConfig threadPool;
-
-        /**
-         * The default configuration for the Elasticsearch indexes.
-         */
-        @ConfigItem
-        ElasticsearchIndexConfig indexDefaults;
-
-        /**
-         * Per-index specific configuration.
-         */
-        @ConfigItem
-        @ConfigDocMapKey("index-name")
-        Map<String, ElasticsearchIndexConfig> indexes;
-    }
-
-    public enum ElasticsearchClientProtocol {
-        /**
-         * Use clear-text HTTP, with SSL/TLS disabled.
-         */
-        HTTP("http"),
-        /**
-         * Use HTTPS, with SSL/TLS enabled.
-         */
-        HTTPS("https");
-
-        public static ElasticsearchClientProtocol of(String value) {
-            return StringHelper.parseDiscreteValues(
-                    values(),
-                    ElasticsearchClientProtocol::getHibernateSearchString,
-                    (invalidValue, validValues) -> new SearchException(
-                            String.format(
-                                    Locale.ROOT,
-                                    "Invalid protocol: '%1$s'. Valid protocols are: %2$s.",
-                                    invalidValue,
-                                    validValues)),
-                    value);
-        }
-
-        private final String hibernateSearchString;
-
-        ElasticsearchClientProtocol(String hibernateSearchString) {
-            this.hibernateSearchString = hibernateSearchString;
-        }
-
-        public String getHibernateSearchString() {
-            return hibernateSearchString;
-        }
-    }
-
-    @ConfigGroup
-    public static class ElasticsearchIndexConfig {
-        /**
-         * Configuration for the schema management of the indexes.
-         */
-        @ConfigItem
-        ElasticsearchIndexSchemaManagementConfig schemaManagement;
-
-        /**
-         * Configuration for the indexing process that creates, updates and deletes documents.
-         */
-        @ConfigItem
-        ElasticsearchIndexIndexingConfig indexing;
-    }
-
-    @ConfigGroup
-    public static class DiscoveryConfig {
-
-        /**
-         * Defines if automatic discovery is enabled.
-         */
-        @ConfigItem
-        boolean enabled;
-
-        /**
-         * Refresh interval of the node list.
-         */
-        @ConfigItem(defaultValue = "10S")
-        Duration refreshInterval;
-
-    }
-
-    @ConfigGroup
-    public static class AutomaticIndexingConfig {
-
-        /**
-         * Configuration for synchronization with the index when indexing automatically.
-         */
-        @ConfigItem
-        AutomaticIndexingSynchronizationConfig synchronization;
-
-        /**
-         * Whether to check if dirty properties are relevant to indexing before actually reindexing an entity.
-         * <p>
-         * When enabled, re-indexing of an entity is skipped if the only changes are on properties that are not used when
-         * indexing.
-         */
-        @ConfigItem(defaultValue = "true")
-        boolean enableDirtyCheck;
-    }
-
-    @ConfigGroup
-    public static class AutomaticIndexingSynchronizationConfig {
-
-        // @formatter:off
-        /**
-         * The synchronization strategy to use when indexing automatically.
-         *
-         * Defines how complete indexing should be before resuming the application thread
-         * after a database transaction is committed.
-         *
-         * Available values:
-         *
-         * [cols=5]
-         * !===
-         * .2+h!Strategy
-         * .2+h!Throughput
-         * 3+^h!Guarantees when the application thread resumes
-         *
-         * h!Changes applied
-         * h!Changes safe from crash/power loss
-         * h!Changes visible on search
-         *
-         * !async
-         * !Best
-         * ^!icon:times[role=red]
-         * ^!icon:times[role=red]
-         * ^!icon:times[role=red]
-         *
-         * !write-sync (**default**)
-         * !Medium
-         * ^!icon:check[role=lime]
-         * ^!icon:check[role=lime]
-         * ^!icon:times[role=red]
-         *
-         * !read-sync
-         * !Medium to worst
-         * ^!icon:check[role=lime]
-         * ^!icon:times[role=red]
-         * ^!icon:check[role=lime]
-         *
-         * !sync
-         * !Worst
-         * ^!icon:check[role=lime]
-         * ^!icon:check[role=lime]
-         * ^!icon:check[role=lime]
-         * !===
-         *
-         * See
-         * https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#mapper-orm-indexing-automatic-synchronization[this
-         * section of the reference documentation]
-         * for more information.
-         *
-         * @asciidoclet
-         */
-        // @formatter:on
-        @ConfigItem(defaultValue = AutomaticIndexingSynchronizationStrategyNames.WRITE_SYNC)
-        String strategy;
-    }
-
-    @ConfigGroup
-    public static class SearchQueryLoadingConfig {
-
-        /**
-         * Configuration for cache lookup when loading entities during the execution of a search query.
-         */
-        @ConfigItem
-        SearchQueryLoadingCacheLookupConfig cacheLookup;
-
-        /**
-         * The fetch size to use when loading entities during the execution of a search query.
-         */
-        @ConfigItem(defaultValue = "100")
-        int fetchSize;
-    }
-
-    @ConfigGroup
-    public static class SearchQueryLoadingCacheLookupConfig {
-
-        /**
-         * The strategy to use when loading entities during the execution of a search query.
-         */
-        @ConfigItem(defaultValue = "skip")
-        EntityLoadingCacheLookupStrategy strategy;
-    }
-
-    @ConfigGroup
-    public static class SchemaManagementConfig {
-
-        /**
-         * The strategy used for index lifecycle.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem(defaultValue = "create-or-validate")
-        SchemaManagementStrategyName strategy;
-
-    }
-
-    @ConfigGroup
-    public static class ThreadPoolConfig {
-        /**
-         * The size of the thread pool assigned to the backend.
-         * <p>
-         * Note that number is <em>per backend</em>, not per index.
-         * Adding more indexes will not add more threads.
-         * <p>
-         * As all operations happening in this thread-pool are non-blocking,
-         * raising its size above the number of processor cores available to the JVM will not bring noticeable performance
-         * benefit.
-         * The only reason to alter this setting would be to reduce the number of threads;
-         * for example, in an application with a single index with a single indexing queue,
-         * running on a machine with 64 processor cores,
-         * you might want to bring down the number of threads.
-         * <p>
-         * Defaults to the number of processor cores available to the JVM on startup.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem
-        OptionalInt size;
-    }
-
-    // We can't set actual default values in this section,
-    // otherwise "quarkus.hibernate-search.elasticsearch.index-defaults" will be ignored.
-    @ConfigGroup
-    public static class ElasticsearchIndexSchemaManagementConfig {
-        /**
-         * The minimal cluster status required.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem(defaultValueDocumentation = "green")
-        Optional<IndexStatus> requiredStatus;
-
-        /**
-         * How long we should wait for the status before failing the bootstrap.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem(defaultValueDocumentation = "10S")
-        Optional<Duration> requiredStatusWaitTimeout;
-    }
-
-    // We can't set actual default values in this section,
-    // otherwise "quarkus.hibernate-search.elasticsearch.index-defaults" will be ignored.
-    @ConfigGroup
-    public static class ElasticsearchIndexIndexingConfig {
-        /**
-         * The number of indexing queues assigned to each index.
-         * <p>
-         * Higher values will lead to more connections being used in parallel,
-         * which may lead to higher indexing throughput,
-         * but incurs a risk of overloading Elasticsearch,
-         * i.e. of overflowing its HTTP request buffers and tripping
-         * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/7.7/circuit-breaker.html">circuit breakers</a>,
-         * leading to Elasticsearch giving up on some request and resulting in indexing failures.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem(defaultValueDocumentation = "10")
-        OptionalInt queueCount;
-
-        /**
-         * The size of indexing queues.
-         * <p>
-         * Lower values may lead to lower memory usage, especially if there are many queues,
-         * but values that are too low will reduce the likeliness of reaching the max bulk size
-         * and increase the likeliness of application threads blocking because the queue is full,
-         * which may lead to lower indexing throughput.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem(defaultValueDocumentation = "1000")
-        OptionalInt queueSize;
-
-        /**
-         * The maximum size of bulk requests created when processing indexing queues.
-         * <p>
-         * Higher values will lead to more documents being sent in each HTTP request sent to Elasticsearch,
-         * which may lead to higher indexing throughput,
-         * but incurs a risk of overloading Elasticsearch,
-         * i.e. of overflowing its HTTP request buffers and tripping
-         * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/7.7/circuit-breaker.html">circuit breakers</a>,
-         * leading to Elasticsearch giving up on some request and resulting in indexing failures.
-         * <p>
-         * Note that raising this number above the queue size has no effect,
-         * as bulks cannot include more requests than are contained in the queue.
-         */
-        // We can't set an actual default value here: see comment on this class.
-        @ConfigItem(defaultValueDocumentation = "100")
-        OptionalInt maxBulkSize;
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/graal/Substitute_HibernateOrmIntegrationBooterImpl.java b/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/graal/Substitute_HibernateOrmIntegrationBooterImpl.java
deleted file mode 100644
index 32334b271c9a7..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/graal/Substitute_HibernateOrmIntegrationBooterImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.hibernate.search.elasticsearch.runtime.graal;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-/**
- * Force two phase-boot so that bootstrap code can be DCEd.
- */
-@TargetClass(className = "org.hibernate.search.mapper.orm.bootstrap.impl.HibernateOrmIntegrationBooterImpl")
-final class Substitute_HibernateOrmIntegrationBooterImpl {
-
-    @Substitute
-    private HibernateOrmIntegrationPartialBuildState doBootFirstPhase() {
-        throw new IllegalStateException("Partial build state should have been generated during the static init phase.");
-    }
-
-    @TargetClass(className = "org.hibernate.search.mapper.orm.bootstrap.impl.HibernateOrmIntegrationBooterImpl", innerClass = "HibernateOrmIntegrationPartialBuildState")
-    final static class HibernateOrmIntegrationPartialBuildState {
-
-    }
-}
diff --git a/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
deleted file mode 100644
index ab89f2e29c718..0000000000000
--- a/extensions/hibernate-search-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: "Hibernate Search + Elasticsearch"
-metadata:
-  keywords:
-  - "hibernate-search-elasticsearch"
-  - "search"
-  - "full-text"
-  - "hibernate"
-  - "elasticsearch"
-  guide: "https://quarkus.io/guides/hibernate-search-elasticsearch"
-  categories:
-  - "data"
-  status: "preview"
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml
new file mode 100644
index 0000000000000..f6cac53c1de58
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-search-orm-elasticsearch-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
+    <name>Quarkus - Hibernate Search - ORM + Elasticsearch - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-client-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>test-elasticsearch</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-elasticsearch</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
+                <elasticsearch.protocol>http</elasticsearch.protocol>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${elasticsearch.image}</name>
+                                    <alias>elasticsearch</alias>
+                                    <run>
+                                        <env>
+                                            <discovery.type>single-node</discovery.type>
+                                        </env>
+                                        <ports>
+                                            <port>9200:9200</port>
+                                        </ports>
+                                        <log>
+                                            <prefix>Elasticsearch: </prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <http>
+                                                <url>http://localhost:9200</url>
+                                                <method>GET</method>
+                                                <status>200</status>
+                                            </http>
+                                            <time>20000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${docker-prune.location}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchClasses.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchClasses.java
new file mode 100644
index 0000000000000..2ab71b6c6b2b6
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchClasses.java
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.search.orm.elasticsearch;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.search.backend.elasticsearch.gson.spi.GsonClasses;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.jboss.jandex.DotName;
+
+class HibernateSearchClasses {
+
+    static final DotName INDEXED = DotName.createSimple(Indexed.class.getName());
+
+    static final List<DotName> GSON_CLASSES = new ArrayList<>();
+    static {
+        for (Class<?> gsonClass : GsonClasses.typesRequiringReflection()) {
+            GSON_CLASSES.add(DotName.createSimple(gsonClass.getName()));
+        }
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchCdiProcessor.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchCdiProcessor.java
new file mode 100644
index 0000000000000..ac67fc7ea0e44
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchCdiProcessor.java
@@ -0,0 +1,64 @@
+package io.quarkus.hibernate.search.orm.elasticsearch;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Singleton;
+
+import org.hibernate.search.mapper.orm.mapping.SearchMapping;
+import org.hibernate.search.mapper.orm.session.SearchSession;
+
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRecorder;
+
+public class HibernateSearchElasticsearchCdiProcessor {
+
+    @Record(ExecutionTime.STATIC_INIT)
+    @BuildStep
+    void generateSearchBeans(HibernateSearchElasticsearchRecorder recorder,
+            List<HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem> configuredPersistenceUnits,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer) {
+        for (HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem persistenceUnit : configuredPersistenceUnits) {
+            String persistenceUnitName = persistenceUnit.getPersistenceUnitName();
+
+            boolean isDefaultPersistenceUnit = PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName);
+            syntheticBeanBuildItemBuildProducer
+                    .produce(createSyntheticBean(persistenceUnitName,
+                            isDefaultPersistenceUnit,
+                            SearchMapping.class,
+                            recorder.searchMappingSupplier(persistenceUnitName, isDefaultPersistenceUnit)));
+
+            syntheticBeanBuildItemBuildProducer
+                    .produce(createSyntheticBean(persistenceUnitName,
+                            PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName),
+                            SearchSession.class,
+                            recorder.searchSessionSupplier(persistenceUnitName, isDefaultPersistenceUnit)));
+        }
+    }
+
+    private static <T> SyntheticBeanBuildItem createSyntheticBean(String persistenceUnitName, boolean isDefaultPersistenceUnit,
+            Class<T> type, Supplier<T> supplier) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(type)
+                .scope(Singleton.class)
+                .unremovable()
+                .supplier(supplier);
+
+        if (isDefaultPersistenceUnit) {
+            configurator.addQualifier(Default.class);
+        }
+
+        configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", persistenceUnitName).done();
+        configurator.addQualifier().annotation(PersistenceUnit.class).addValue("value", persistenceUnitName).done();
+
+        return configurator.done();
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem.java
new file mode 100644
index 0000000000000..e2328942be340
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.search.orm.elasticsearch;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem extends MultiBuildItem {
+
+    private final String persistenceUnitName;
+
+    public HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem(String persistenceUnitName) {
+        if (persistenceUnitName == null) {
+            throw new IllegalArgumentException("persistenceUnitName cannot be null");
+        }
+        this.persistenceUnitName = persistenceUnitName;
+    }
+
+    public String getPersistenceUnitName() {
+        return persistenceUnitName;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" + persistenceUnitName + "]";
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchProcessor.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchProcessor.java
new file mode 100644
index 0000000000000..832674d4d561d
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/HibernateSearchElasticsearchProcessor.java
@@ -0,0 +1,198 @@
+package io.quarkus.hibernate.search.orm.elasticsearch;
+
+import static io.quarkus.hibernate.search.orm.elasticsearch.HibernateSearchClasses.GSON_CLASSES;
+import static io.quarkus.hibernate.search.orm.elasticsearch.HibernateSearchClasses.INDEXED;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+import org.hibernate.search.backend.elasticsearch.index.layout.IndexLayoutStrategy;
+import org.hibernate.search.engine.reporting.FailureHandler;
+import org.hibernate.search.mapper.orm.automaticindexing.session.AutomaticIndexingSynchronizationStrategy;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
+import io.quarkus.deployment.recording.RecorderContext;
+import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
+import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem;
+import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationStaticConfiguredBuildItem;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.ElasticsearchVersionSubstitution;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfig;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.ElasticsearchBackendBuildTimeConfig;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRecorder;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfig;
+
+class HibernateSearchElasticsearchProcessor {
+
+    private static final String HIBERNATE_SEARCH_ELASTICSEARCH = "Hibernate Search ORM + Elasticsearch";
+
+    HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig;
+
+    @BuildStep
+    void setupLogFilters(BuildProducer<LogCleanupFilterBuildItem> filters) {
+        filters.produce(new LogCleanupFilterBuildItem(
+                "org.hibernate.search.mapper.orm.bootstrap.impl.HibernateSearchIntegrator", "HSEARCH000034"));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    public void build(RecorderContext recorderContext, HibernateSearchElasticsearchRecorder recorder,
+            CombinedIndexBuildItem combinedIndexBuildItem,
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem> configuredPersistenceUnits,
+            BuildProducer<HibernateOrmIntegrationStaticConfiguredBuildItem> integrations,
+            BuildProducer<FeatureBuildItem> feature) {
+        feature.produce(new FeatureBuildItem(Feature.HIBERNATE_SEARCH_ELASTICSEARCH));
+
+        IndexView index = combinedIndexBuildItem.getIndex();
+        Collection<AnnotationInstance> indexedAnnotations = index.getAnnotations(INDEXED);
+
+        // Make it possible to record the ElasticsearchVersion as bytecode:
+        recorderContext.registerSubstitution(ElasticsearchVersion.class,
+                String.class, ElasticsearchVersionSubstitution.class);
+
+        for (PersistenceUnitDescriptorBuildItem puDescriptor : persistenceUnitDescriptorBuildItems) {
+            Collection<AnnotationInstance> indexedAnnotationsForPU = new ArrayList<>();
+            for (AnnotationInstance indexedAnnotation : indexedAnnotations) {
+                String targetName = indexedAnnotation.target().asClass().name().toString();
+                if (puDescriptor.getManagedClassNames().contains(targetName)) {
+                    indexedAnnotationsForPU.add(indexedAnnotation);
+                }
+            }
+            buildForPersistenceUnit(recorder, indexedAnnotationsForPU, puDescriptor.getPersistenceUnitName(),
+                    configuredPersistenceUnits, integrations);
+        }
+
+        registerReflectionForGson(reflectiveClass);
+    }
+
+    private void buildForPersistenceUnit(HibernateSearchElasticsearchRecorder recorder,
+            Collection<AnnotationInstance> indexedAnnotationsForPU, String persistenceUnitName,
+            BuildProducer<HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem> configuredPersistenceUnits,
+            BuildProducer<HibernateOrmIntegrationStaticConfiguredBuildItem> integrations) {
+        if (indexedAnnotationsForPU.isEmpty()) {
+            // we don't have any indexed entity, we can disable Hibernate Search
+            integrations.produce(new HibernateOrmIntegrationStaticConfiguredBuildItem(HIBERNATE_SEARCH_ELASTICSEARCH,
+                    persistenceUnitName).setInitListener(recorder.createDisabledListener()));
+            return;
+        }
+
+        HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit puConfig = PersistenceUnitUtil
+                .isDefaultPersistenceUnit(persistenceUnitName)
+                        ? buildTimeConfig.defaultPersistenceUnit
+                        : buildTimeConfig.persistenceUnits.get(persistenceUnitName);
+
+        boolean defaultBackendIsUsed = false;
+        for (AnnotationInstance indexedAnnotation : indexedAnnotationsForPU) {
+            if (indexedAnnotation.value("backend") == null) {
+                defaultBackendIsUsed = true;
+                break;
+            }
+        }
+
+        checkConfig(persistenceUnitName, puConfig, defaultBackendIsUsed);
+
+        configuredPersistenceUnits
+                .produce(new HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem(persistenceUnitName));
+
+        if (puConfig == null) {
+            return;
+        }
+
+        integrations.produce(new HibernateOrmIntegrationStaticConfiguredBuildItem(HIBERNATE_SEARCH_ELASTICSEARCH,
+                persistenceUnitName).setInitListener(recorder.createStaticInitListener(puConfig)));
+    }
+
+    @BuildStep
+    void registerBeans(List<HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem> searchEnabledPUs,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBean) {
+        if (searchEnabledPUs.isEmpty()) {
+            return;
+        }
+
+        // Some user-injectable beans are retrieved programmatically and shouldn't be removed
+        unremovableBean.produce(UnremovableBeanBuildItem.beanTypes(FailureHandler.class,
+                AutomaticIndexingSynchronizationStrategy.class,
+                ElasticsearchAnalysisConfigurer.class, IndexLayoutStrategy.class));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void setRuntimeConfig(HibernateSearchElasticsearchRecorder recorder,
+            HibernateSearchElasticsearchRuntimeConfig runtimeConfig,
+            List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
+            BuildProducer<HibernateOrmIntegrationRuntimeConfiguredBuildItem> runtimeConfigured) {
+        for (PersistenceUnitDescriptorBuildItem puDescriptor : persistenceUnitDescriptorBuildItems) {
+            runtimeConfigured.produce(new HibernateOrmIntegrationRuntimeConfiguredBuildItem(HIBERNATE_SEARCH_ELASTICSEARCH,
+                    puDescriptor.getPersistenceUnitName())
+                            .setInitListener(
+                                    recorder.createRuntimeInitListener(runtimeConfig, puDescriptor.getPersistenceUnitName())));
+        }
+    }
+
+    private static void checkConfig(String persistenceUnitName,
+            HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit buildTimeConfig, boolean defaultBackendIsUsed) {
+        List<String> propertyKeysWithNoVersion = new ArrayList<>();
+        if (defaultBackendIsUsed) {
+            // we validate that the version is present for the default backend
+            if (buildTimeConfig == null || !buildTimeConfig.defaultBackend.version.isPresent()) {
+                propertyKeysWithNoVersion.add(elasticsearchVersionPropertyKey(persistenceUnitName, null));
+            }
+        }
+
+        // we validate that the version is present for all the named backends
+        Map<String, ElasticsearchBackendBuildTimeConfig> backends = buildTimeConfig != null
+                ? buildTimeConfig.namedBackends.backends
+                : Collections.emptyMap();
+        for (Entry<String, ElasticsearchBackendBuildTimeConfig> additionalBackendEntry : backends.entrySet()) {
+            if (!additionalBackendEntry.getValue().version.isPresent()) {
+                propertyKeysWithNoVersion
+                        .add(elasticsearchVersionPropertyKey(persistenceUnitName, additionalBackendEntry.getKey()));
+            }
+        }
+        if (!propertyKeysWithNoVersion.isEmpty()) {
+            throw new ConfigurationError(
+                    "The Elasticsearch version needs to be defined via properties: "
+                            + String.join(", ", propertyKeysWithNoVersion) + ".");
+        }
+    }
+
+    private static String elasticsearchVersionPropertyKey(String persistenceUnitName, String backendName) {
+        StringBuilder keyBuilder = new StringBuilder("quarkus.hibernate-search-orm.");
+        if (!PersistenceUnitUtil.isDefaultPersistenceUnit(persistenceUnitName)) {
+            keyBuilder.append(persistenceUnitName).append(".");
+        }
+        keyBuilder.append("elasticsearch.");
+        if (backendName != null) {
+            keyBuilder.append(backendName).append(".");
+        }
+        keyBuilder.append("version");
+        return keyBuilder.toString();
+    }
+
+    private void registerReflectionForGson(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        String[] reflectiveClasses = GSON_CLASSES.stream().map(DotName::toString).toArray(String[]::new);
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, reflectiveClasses));
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/devconsole/DevConsoleProcessor.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..a4e2f90932ed4
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,25 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.devconsole;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.devconsole.HibernateSearchDevConsoleRecorder;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.devconsole.HibernateSearchSupplier;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleRuntimeTemplateInfoBuildItem collectBeanInfo() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("entityTypes", new HibernateSearchSupplier());
+    }
+
+    @BuildStep
+    @Record(value = STATIC_INIT, optional = true)
+    DevConsoleRouteBuildItem invokeEndpoint(HibernateSearchDevConsoleRecorder recorder) {
+        return new DevConsoleRouteBuildItem("entity-types", "POST", recorder.indexEntity());
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/resources/dev-templates/embedded.html b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..7f7027a3cb8cc
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,4 @@
+<a href="{urlbase}/entity-types" class="badge badge-light">
+    <i class="fa fa-search fa-fw"></i>
+    Indexed entity types <span class="badge badge-light">{info:entityTypes.size()}</span></a>
+<br>
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/resources/dev-templates/entity-types.html b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/resources/dev-templates/entity-types.html
new file mode 100644
index 0000000000000..a257afacb8225
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/main/resources/dev-templates/entity-types.html
@@ -0,0 +1,41 @@
+{#include main}
+{#title}Index Entities{/title}
+{#body}
+<form method="post" enctype="application/x-www-form-urlencoded">
+    <input id="index" type="submit" class="btn btn-primary mb-2" value="Reindex Entities" >
+    <table id="table" class="table table-striped">
+        <thead class="thead-dark">
+        <tr>
+            <th scope="col">
+                <div class="custom-control">
+                    <input type="checkbox" class="form-check-input" id="check-all">
+                </div>
+            </th>
+            <th scope="col">Entity type</th>
+        </tr>
+        </thead>
+        <tbody>
+        {#for entityType in info:entityTypes}
+        <tr>
+            <td>
+                <div class="custom-control">
+                    <input type="checkbox" class="form-check-input checkbox" name="{entityType}" id="{entityType}">
+                </div>
+            </td>
+            <td>{entityType}</td>
+        </tr>
+        {/for}
+        </tbody>
+    </table>
+</form>
+<script type="text/javascript">
+    jQuery('#check-all').change(function() {
+        if (this.checked) {
+            jQuery('.checkbox').prop('checked', true);
+        } else {
+            jQuery('.checkbox').prop('checked', false);
+        }
+    });
+</script>
+{/body}
+{/include}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/IndexedEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/IndexedEntity.java
new file mode 100644
index 0000000000000..af2b7832378d4
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/IndexedEntity.java
@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.search.elasticsearch.test.configuration;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+/**
+ * An indexed entity.
+ */
+@Entity
+@Indexed
+public class IndexedEntity {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/NoConfigIndexedEntityTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/NoConfigIndexedEntityTest.java
new file mode 100644
index 0000000000000..4acb20724fbab
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/NoConfigIndexedEntityTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.hibernate.search.elasticsearch.test.configuration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.sql.SQLException;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoConfigIndexedEntityTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class).addClass(IndexedEntity.class)
+                    .addAsResource("application-nohsearchconfig.properties", "application.properties"))
+            .assertException(throwable -> assertThat(throwable)
+                    .isInstanceOf(ConfigurationError.class)
+                    .hasMessageContaining("The Elasticsearch version needs to be defined via properties:"
+                            + " quarkus.hibernate-search-orm.elasticsearch.version"));
+
+    @Test
+    public void testNoConfig() throws SQLException {
+        // an exception should be thrown
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/NoConfigNoIndexedEntityTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/NoConfigNoIndexedEntityTest.java
new file mode 100644
index 0000000000000..9aea0ebb75788
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/configuration/NoConfigNoIndexedEntityTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.search.elasticsearch.test.configuration;
+
+import java.sql.SQLException;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoConfigNoIndexedEntityTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("application-nohsearchconfig.properties", "application.properties"));
+
+    @Test
+    public void testNoConfig() throws SQLException {
+        // we should be able to start the application, even with no configuration at all nor indexed entities
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java
new file mode 100644
index 0000000000000..c42bec47d34ce
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/MultiplePersistenceUnitsCdiTest.java
@@ -0,0 +1,175 @@
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.CDI;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.hibernate.search.mapper.orm.Search;
+import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity;
+import org.hibernate.search.mapper.orm.mapping.SearchMapping;
+import org.hibernate.search.mapper.orm.session.SearchSession;
+import org.hibernate.search.util.common.SearchException;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.defaultpu.DefaultPUEntity;
+import io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu1.PU1Entity;
+import io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu2.PU2Entity;
+import io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu3.PU3Entity;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultiplePersistenceUnitsCdiTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addPackage(DefaultPUEntity.class.getPackage())
+                    .addPackage(PU1Entity.class.getPackage())
+                    .addPackage(PU2Entity.class.getPackage())
+                    .addPackage(PU3Entity.class.getPackage())
+                    .addAsResource("application-multiple-persistence-units.properties", "application.properties"));
+
+    @Inject
+    SearchMapping defaultPUMapping;
+
+    @Inject
+    SearchSession defaultPUSession;
+
+    @Inject
+    @PersistenceUnit("pu1")
+    SearchMapping pu1Mapping;
+
+    @Inject
+    @PersistenceUnit("pu1")
+    SearchSession pu1Session;
+
+    @Inject
+    @PersistenceUnit("pu2")
+    SearchMapping pu2Mapping;
+
+    @Inject
+    @PersistenceUnit("pu2")
+    SearchSession pu2Session;
+
+    @Inject
+    @PersistenceUnit("pu3")
+    EntityManager pu3EntityManager;
+
+    @Inject
+    UserTransaction transaction;
+
+    @Test
+    public void testDefaultMapping() {
+        assertThat(defaultPUMapping.allIndexedEntities())
+                .hasSize(1)
+                .element(0)
+                .returns(DefaultPUEntity.class, SearchIndexedEntity::javaClass);
+    }
+
+    @Test
+    @ActivateRequestContext
+    public void testDefaultSession() {
+        DefaultPUEntity entity = new DefaultPUEntity("someText");
+        inTransaction(() -> defaultPUSession.toEntityManager().persist(entity));
+        inTransaction(() -> assertThat(defaultPUSession.search(DefaultPUEntity.class)
+                .where(f -> f.matchAll())
+                .fetchHits(20))
+                        .hasSize(1)
+                        .element(0)
+                        .returns(entity.getId(), DefaultPUEntity::getId));
+    }
+
+    @Test
+    public void testPU1Mapping() {
+        assertThat(pu1Mapping.allIndexedEntities())
+                .hasSize(1)
+                .element(0)
+                .returns(PU1Entity.class, SearchIndexedEntity::javaClass);
+    }
+
+    @Test
+    @ActivateRequestContext
+    public void testPU1Session() {
+        PU1Entity entity = new PU1Entity("someText");
+        inTransaction(() -> pu1Session.toEntityManager().persist(entity));
+        inTransaction(() -> assertThat(pu1Session.search(PU1Entity.class)
+                .where(f -> f.matchAll())
+                .fetchHits(20))
+                        .hasSize(1)
+                        .element(0)
+                        .returns(entity.getId(), PU1Entity::getId));
+    }
+
+    @Test
+    public void testPU2Mapping() {
+        assertThat(pu2Mapping.allIndexedEntities())
+                .hasSize(1)
+                .element(0)
+                .returns(PU2Entity.class, SearchIndexedEntity::javaClass);
+    }
+
+    @Test
+    @ActivateRequestContext
+    public void testPU2Session() {
+        PU2Entity entity = new PU2Entity("someText");
+        inTransaction(() -> pu1Session.toEntityManager().persist(entity));
+        inTransaction(() -> assertThat(pu1Session.search(PU2Entity.class)
+                .where(f -> f.matchAll())
+                .fetchHits(20))
+                        .hasSize(1)
+                        .element(0)
+                        .returns(entity.getId(), PU2Entity::getId));
+    }
+
+    @Test
+    public void testPU3Mapping() {
+        // There are no indexed entities in PU3: Hibernate Search should be disabled
+
+        Instance<SearchMapping> pu3MappingInstance = CDI.current().getBeanManager().createInstance()
+                .select(SearchMapping.class, new PersistenceUnit.PersistenceUnitLiteral("pu3"));
+        assertThat(pu3MappingInstance.isUnsatisfied()).isTrue();
+
+        assertThatThrownBy(() -> Search.mapping(pu3EntityManager.getEntityManagerFactory()))
+                .isInstanceOf(SearchException.class)
+                .hasMessageContaining("Hibernate Search was not initialized");
+    }
+
+    @Test
+    @ActivateRequestContext
+    public void testPU3Session() {
+        // There are no indexed entities in PU3: Hibernate Search should be disabled
+
+        Instance<SearchSession> pu3SessionInstance = CDI.current().getBeanManager().createInstance()
+                .select(SearchSession.class, new PersistenceUnit.PersistenceUnitLiteral("pu3"));
+        assertThat(pu3SessionInstance.isUnsatisfied()).isTrue();
+
+        inTransaction(() -> assertThatThrownBy(() -> Search.session(pu3EntityManager).search(PU3Entity.class))
+                .isInstanceOf(SearchException.class)
+                .hasMessageContaining("Hibernate Search was not initialized"));
+    }
+
+    private void inTransaction(Runnable runnable) {
+        try {
+            transaction.begin();
+            try {
+                runnable.run();
+                transaction.commit();
+            } catch (Exception e) {
+                transaction.rollback();
+            }
+        } catch (SystemException | NotSupportedException e) {
+            throw new IllegalStateException("Transaction exception", e);
+        }
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java
new file mode 100644
index 0000000000000..0b0759c2083a8
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/defaultpu/DefaultPUEntity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.defaultpu;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class DefaultPUEntity {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @FullTextField
+    private String text;
+
+    public DefaultPUEntity() {
+    }
+
+    public DefaultPUEntity(String text) {
+        this.text = text;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/defaultpu/package-info.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/defaultpu/package-info.java
new file mode 100644
index 0000000000000..105b3e163bff9
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/defaultpu/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit(PersistenceUnit.DEFAULT)
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.defaultpu;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
\ No newline at end of file
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java
new file mode 100644
index 0000000000000..33d616cf496d6
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu1/PU1Entity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu1;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class PU1Entity {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @FullTextField
+    private String text;
+
+    public PU1Entity() {
+    }
+
+    public PU1Entity(String text) {
+        this.text = text;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu1/package-info.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu1/package-info.java
new file mode 100644
index 0000000000000..016f495b4ad12
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu1/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit("pu1")
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu1;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
\ No newline at end of file
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java
new file mode 100644
index 0000000000000..4190cae65e99b
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu2/PU2Entity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu2;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class PU2Entity {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @FullTextField
+    private String text;
+
+    public PU2Entity() {
+    }
+
+    public PU2Entity(String text) {
+        this.text = text;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu2/package-info.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu2/package-info.java
new file mode 100644
index 0000000000000..531d722d65436
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu2/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit("pu2")
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu2;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
\ No newline at end of file
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java
new file mode 100644
index 0000000000000..1ae6751ca329f
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu3/PU3Entity.java
@@ -0,0 +1,39 @@
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu3;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class PU3Entity {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String text;
+
+    public PU3Entity() {
+    }
+
+    public PU3Entity(String text) {
+        this.text = text;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu3/package-info.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu3/package-info.java
new file mode 100644
index 0000000000000..a622544cbad3b
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/multiplepersistenceunits/pu3/package-info.java
@@ -0,0 +1,4 @@
+@PersistenceUnit("pu3")
+package io.quarkus.hibernate.search.elasticsearch.test.multiplepersistenceunits.pu3;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
\ No newline at end of file
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java
new file mode 100644
index 0000000000000..0cc0bdeb88903
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/DefaultPUEntity.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.search.elasticsearch.test.singlepersistenceunit;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class DefaultPUEntity {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @FullTextField
+    private String text;
+
+    public DefaultPUEntity() {
+    }
+
+    public DefaultPUEntity(String text) {
+        this.text = text;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java
new file mode 100644
index 0000000000000..bf78afc959764
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/java/io/quarkus/hibernate/search/elasticsearch/test/singlepersistenceunit/SinglePersistenceUnitsCdiTest.java
@@ -0,0 +1,72 @@
+package io.quarkus.hibernate.search.elasticsearch.test.singlepersistenceunit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity;
+import org.hibernate.search.mapper.orm.mapping.SearchMapping;
+import org.hibernate.search.mapper.orm.session.SearchSession;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SinglePersistenceUnitsCdiTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(DefaultPUEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Inject
+    SearchMapping defaultPUMapping;
+
+    @Inject
+    SearchSession defaultPUSession;
+
+    @Inject
+    UserTransaction transaction;
+
+    @Test
+    public void testDefaultMapping() {
+        assertThat(defaultPUMapping.allIndexedEntities())
+                .hasSize(1)
+                .element(0)
+                .returns(DefaultPUEntity.class, SearchIndexedEntity::javaClass);
+    }
+
+    @Test
+    @ActivateRequestContext
+    public void testDefaultSession() {
+        DefaultPUEntity entity = new DefaultPUEntity("someText");
+        inTransaction(() -> defaultPUSession.toEntityManager().persist(entity));
+        inTransaction(() -> assertThat(defaultPUSession.search(DefaultPUEntity.class)
+                .where(f -> f.matchAll())
+                .fetchHits(20))
+                        .hasSize(1)
+                        .element(0)
+                        .returns(entity.getId(), DefaultPUEntity::getId));
+    }
+
+    private void inTransaction(Runnable runnable) {
+        try {
+            transaction.begin();
+            try {
+                runnable.run();
+                transaction.commit();
+            } catch (Exception e) {
+                transaction.rollback();
+            }
+        } catch (SystemException | NotSupportedException e) {
+            throw new IllegalStateException("Transaction exception", e);
+        }
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties
new file mode 100644
index 0000000000000..7b9b1ea054372
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -0,0 +1,46 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.data1.db-kind=h2
+quarkus.datasource.data1.jdbc.url=jdbc:h2:mem:data1;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.data2.db-kind=h2
+quarkus.datasource.data2.jdbc.url=jdbc:h2:mem:data2;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.data3.db-kind=h2
+quarkus.datasource.data3.jdbc.url=jdbc:h2:mem:data3;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
+quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
+quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=sync
+
+quarkus.hibernate-orm."pu1".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."pu1".database.generation=drop-and-create
+quarkus.hibernate-orm."pu1".datasource=data1
+
+quarkus.hibernate-search-orm."pu1".elasticsearch.version=7
+quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http}
+quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop
+quarkus.hibernate-search-orm."pu1".automatic-indexing.synchronization.strategy=sync
+
+quarkus.hibernate-orm."pu2".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."pu2".database.generation=drop-and-create
+quarkus.hibernate-orm."pu2".datasource=data2
+
+quarkus.hibernate-search-orm."pu2".elasticsearch.version=7
+quarkus.hibernate-search-orm."pu2".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.hibernate-search-orm."pu2".elasticsearch.protocol=${elasticsearch.protocol:http}
+quarkus.hibernate-search-orm."pu2".schema-management.strategy=drop-and-create-and-drop
+quarkus.hibernate-search-orm."pu2".automatic-indexing.synchronization.strategy=sync
+
+quarkus.hibernate-orm."pu3".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."pu3".database.generation=drop-and-create
+quarkus.hibernate-orm."pu3".datasource=data3
+
+# No indexed entity in PU3
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-nohsearchconfig.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-nohsearchconfig.properties
new file mode 100644
index 0000000000000..0cb2f82a307a0
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-nohsearchconfig.properties
@@ -0,0 +1,5 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties
new file mode 100644
index 0000000000000..6c481c1983deb
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties
@@ -0,0 +1,11 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
+quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
+quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=sync
diff --git a/extensions/hibernate-search-orm-elasticsearch/pom.xml b/extensions/hibernate-search-orm-elasticsearch/pom.xml
new file mode 100644
index 0000000000000..dc01d91759cc0
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch-parent</artifactId>
+    <name>Quarkus - Hibernate Search - ORM + Elasticsearch</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml
new file mode 100644
index 0000000000000..55696ce4d6f35
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-search-orm-elasticsearch-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
+    <name>Quarkus - Hibernate Search - ORM + Elasticsearch - Runtime</name>
+    <description>Automatically index your Hibernate entities in Elasticsearch</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-client-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-backend-elasticsearch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-mapper-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/ElasticsearchVersionSubstitution.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/ElasticsearchVersionSubstitution.java
new file mode 100644
index 0000000000000..1bd9dfd6e900d
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/ElasticsearchVersionSubstitution.java
@@ -0,0 +1,17 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
+
+import io.quarkus.runtime.ObjectSubstitution;
+
+public class ElasticsearchVersionSubstitution implements ObjectSubstitution<ElasticsearchVersion, String> {
+    @Override
+    public String serialize(ElasticsearchVersion obj) {
+        return obj.toString();
+    }
+
+    @Override
+    public ElasticsearchVersion deserialize(String obj) {
+        return ElasticsearchVersion.of(obj);
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java
new file mode 100644
index 0000000000000..6a1abef467f86
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchConfigUtil.java
@@ -0,0 +1,70 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import org.hibernate.search.engine.cfg.BackendSettings;
+import org.hibernate.search.engine.cfg.IndexSettings;
+
+public class HibernateSearchConfigUtil {
+
+    public static <T> void addConfig(BiConsumer<String, Object> propertyCollector, String configPath, T value) {
+        propertyCollector.accept(configPath, value);
+    }
+
+    public static void addConfig(BiConsumer<String, Object> propertyCollector, String configPath, Optional<?> value) {
+        if (value.isPresent()) {
+            propertyCollector.accept(configPath, value.get());
+        }
+    }
+
+    public static <T> void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
+            T value) {
+        propertyCollector.accept(BackendSettings.backendKey(backendName, configPath), value);
+    }
+
+    public static void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
+            Optional<?> value) {
+        addBackendConfig(propertyCollector, backendName, configPath, value, Optional::isPresent, Optional::get);
+    }
+
+    public static void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
+            OptionalInt value) {
+        addBackendConfig(propertyCollector, backendName, configPath, value, OptionalInt::isPresent, OptionalInt::getAsInt);
+    }
+
+    public static <T> void addBackendConfig(BiConsumer<String, Object> propertyCollector, String backendName, String configPath,
+            T value,
+            Function<T, Boolean> shouldBeAdded, Function<T, ?> getValue) {
+        if (shouldBeAdded.apply(value)) {
+            propertyCollector.accept(BackendSettings.backendKey(backendName, configPath), getValue.apply(value));
+        }
+    }
+
+    public static void addBackendIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
+            String indexName, String configPath, Optional<?> value) {
+        addBackendIndexConfig(propertyCollector, backendName, indexName, configPath, value, Optional::isPresent, Optional::get);
+    }
+
+    public static void addBackendIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
+            String indexName, String configPath, OptionalInt value) {
+        addBackendIndexConfig(propertyCollector, backendName, indexName, configPath, value, OptionalInt::isPresent,
+                OptionalInt::getAsInt);
+    }
+
+    public static <T> void addBackendIndexConfig(BiConsumer<String, Object> propertyCollector, String backendName,
+            String indexName, String configPath, T value,
+            Function<T, Boolean> shouldBeAdded, Function<T, ?> getValue) {
+        if (shouldBeAdded.apply(value)) {
+            if (indexName != null) {
+                propertyCollector.accept(
+                        IndexSettings.indexKey(backendName, indexName, configPath), getValue.apply(value));
+            } else {
+                propertyCollector.accept(
+                        BackendSettings.backendKey(backendName, configPath), getValue.apply(value));
+            }
+        }
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java
new file mode 100644
index 0000000000000..f412d7ed0f5a4
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfig.java
@@ -0,0 +1,28 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "hibernate-search-orm", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class HibernateSearchElasticsearchBuildTimeConfig {
+
+    /**
+     * Configuration for the default persistence unit.
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    public HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit defaultPersistenceUnit;
+
+    /**
+     * Configuration for additional named persistence units.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("persistence-unit-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit> persistenceUnits;
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java
new file mode 100644
index 0000000000000..11f847315c442
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.java
@@ -0,0 +1,143 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import java.util.Map;
+import java.util.Optional;
+
+import org.hibernate.search.backend.elasticsearch.ElasticsearchVersion;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit {
+
+    /**
+     * Default backend
+     */
+    @ConfigItem(name = "elasticsearch")
+    @ConfigDocSection
+    public ElasticsearchBackendBuildTimeConfig defaultBackend;
+
+    /**
+     * Named backends
+     */
+    @ConfigItem(name = "elasticsearch")
+    @ConfigDocSection
+    public ElasticsearchNamedBackendsBuildTimeConfig namedBackends;
+
+    /**
+     * A <<bean-reference-note-anchor,bean reference>> to a component
+     * that should be notified of any failure occurring in a background process
+     * (mainly index operations).
+     *
+     * The referenced bean must implement `FailureHandler`.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Optional<String> backgroundFailureHandler;
+
+    @ConfigGroup
+    public static class ElasticsearchNamedBackendsBuildTimeConfig {
+
+        /**
+         * Named backends
+         */
+        @ConfigDocMapKey("backend-name")
+        public Map<String, ElasticsearchBackendBuildTimeConfig> backends;
+
+    }
+
+    @ConfigGroup
+    public static class ElasticsearchBackendBuildTimeConfig {
+        /**
+         * The version of Elasticsearch used in the cluster.
+         * <p>
+         * As the schema is generated without a connection to the server, this item is mandatory.
+         * <p>
+         * It doesn't have to be the exact version (it can be 7 or 7.1 for instance) but it has to be sufficiently precise to
+         * choose a model dialect (the one used to generate the schema) compatible with the protocol dialect (the one used to
+         * communicate with Elasticsearch).
+         * <p>
+         * There's no rule of thumb here as it depends on the schema incompatibilities introduced by Elasticsearch versions. In
+         * any case, if there is a problem, you will have an error when Hibernate Search tries to connect to the cluster.
+         */
+        @ConfigItem
+        public Optional<ElasticsearchVersion> version;
+
+        /**
+         * Configuration for the index layout.
+         */
+        @ConfigItem
+        public LayoutConfig layout;
+
+        /**
+         * The default configuration for the Elasticsearch indexes.
+         */
+        @ConfigItem(name = ConfigItem.PARENT)
+        public ElasticsearchIndexBuildTimeConfig indexDefaults;
+
+        /**
+         * Per-index specific configuration.
+         */
+        @ConfigItem
+        @ConfigDocMapKey("index-name")
+        public Map<String, ElasticsearchIndexBuildTimeConfig> indexes;
+    }
+
+    @ConfigGroup
+    public static class ElasticsearchIndexBuildTimeConfig {
+        /**
+         * Configuration for full-text analysis.
+         */
+        @ConfigItem
+        public AnalysisConfig analysis;
+    }
+
+    @ConfigGroup
+    public static class AnalysisConfig {
+        /**
+         * A <<bean-reference-note-anchor,bean reference>> to the component
+         * used to configure full text analysis (e.g. analyzers, normalizers).
+         *
+         * The referenced bean must implement `ElasticsearchAnalysisConfigurer`.
+         *
+         * See <<analysis-configurer>> for more information.
+         *
+         * @asciidoclet
+         */
+        @ConfigItem
+        public Optional<String> configurer;
+    }
+
+    @ConfigGroup
+    public static class LayoutConfig {
+        /**
+         * A <<bean-reference-note-anchor,bean reference>> to the component
+         * used to configure layout (e.g. index names, index aliases).
+         *
+         * The referenced bean must implement `IndexLayoutStrategy`.
+         *
+         * Available built-in implementations:
+         *
+         * `simple`::
+         * The default, future-proof strategy: if the index name in Hibernate Search is `myIndex`,
+         * this strategy will create an index named `myindex-000001`, an alias for write operations named `myindex-write`,
+         * and an alias for read operations named `myindex-read`.
+         * `no-alias`::
+         * A strategy without index aliases, mostly useful on legacy clusters:
+         * if the index name in Hibernate Search is `myIndex`,
+         * this strategy will create an index named `myindex`, and will not use any alias.
+         *
+         * See
+         * link:{hibernate-search-doc-prefix}#backend-elasticsearch-indexlayout[this section of the reference documentation]
+         * for more information.
+         *
+         * @asciidoclet
+         */
+        @ConfigItem
+        public Optional<String> strategy;
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
new file mode 100644
index 0000000000000..fc6c5dc3b64ba
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
@@ -0,0 +1,285 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import static io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendConfig;
+import static io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchConfigUtil.addBackendIndexConfig;
+import static io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchConfigUtil.addConfig;
+
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.literal.NamedLiteral;
+
+import org.graalvm.home.Version;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.spi.BootstrapContext;
+import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings;
+import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings;
+import org.hibernate.search.engine.cfg.BackendSettings;
+import org.hibernate.search.engine.cfg.EngineSettings;
+import org.hibernate.search.mapper.orm.Search;
+import org.hibernate.search.mapper.orm.bootstrap.spi.HibernateOrmIntegrationBooter;
+import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings;
+import org.hibernate.search.mapper.orm.mapping.SearchMapping;
+import org.hibernate.search.mapper.orm.session.SearchSession;
+import org.hibernate.search.util.common.reflect.spi.ValueReadHandleFactory;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener;
+import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationStaticInitListener;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.ElasticsearchBackendBuildTimeConfig;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit.ElasticsearchIndexBuildTimeConfig;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.ElasticsearchBackendRuntimeConfig;
+import io.quarkus.hibernate.search.orm.elasticsearch.runtime.HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.ElasticsearchIndexRuntimeConfig;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class HibernateSearchElasticsearchRecorder {
+
+    public HibernateOrmIntegrationStaticInitListener createStaticInitListener(
+            HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit buildTimeConfig) {
+        return new HibernateSearchIntegrationStaticInitListener(buildTimeConfig);
+    }
+
+    public HibernateOrmIntegrationStaticInitListener createDisabledListener() {
+        return new HibernateSearchIntegrationDisabledListener();
+    }
+
+    public HibernateOrmIntegrationRuntimeInitListener createRuntimeInitListener(
+            HibernateSearchElasticsearchRuntimeConfig runtimeConfig, String persistenceUnitName) {
+        HibernateSearchElasticsearchRuntimeConfigPersistenceUnit puConfig = PersistenceUnitUtil
+                .isDefaultPersistenceUnit(persistenceUnitName)
+                        ? runtimeConfig.defaultPersistenceUnit
+                        : runtimeConfig.persistenceUnits.get(persistenceUnitName);
+        if (puConfig == null) {
+            return null;
+        }
+        return new HibernateSearchIntegrationRuntimeInitListener(puConfig);
+    }
+
+    public Supplier<SearchMapping> searchMappingSupplier(String persistenceUnitName, boolean isDefaultPersistenceUnit) {
+        return new Supplier<SearchMapping>() {
+            @Override
+            public SearchMapping get() {
+                SessionFactory sessionFactory;
+                if (isDefaultPersistenceUnit) {
+                    sessionFactory = Arc.container().instance(SessionFactory.class).get();
+                } else {
+                    sessionFactory = Arc.container().instance(
+                            SessionFactory.class, NamedLiteral.of(persistenceUnitName)).get();
+                }
+                return Search.mapping(sessionFactory);
+            }
+        };
+    }
+
+    public Supplier<SearchSession> searchSessionSupplier(String persistenceUnitName, boolean isDefaultPersistenceUnit) {
+        return new Supplier<SearchSession>() {
+            @Override
+            public SearchSession get() {
+                Session session;
+                if (isDefaultPersistenceUnit) {
+                    session = Arc.container().instance(Session.class).get();
+                } else {
+                    session = Arc.container().instance(
+                            Session.class, NamedLiteral.of(persistenceUnitName)).get();
+                }
+                return Search.session(session);
+            }
+        };
+    }
+
+    private static final class HibernateSearchIntegrationDisabledListener
+            implements HibernateOrmIntegrationStaticInitListener {
+        private HibernateSearchIntegrationDisabledListener() {
+        }
+
+        @Override
+        public void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
+            propertyCollector.accept(HibernateOrmMapperSettings.ENABLED, false);
+        }
+
+        @Override
+        public void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
+                BiConsumer<String, Object> propertyCollector) {
+        }
+    }
+
+    private static final class HibernateSearchIntegrationStaticInitListener
+            implements HibernateOrmIntegrationStaticInitListener {
+
+        private static final Version GRAAL_VM_VERSION_21 = Version.create(21);
+
+        private final HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit buildTimeConfig;
+
+        private HibernateSearchIntegrationStaticInitListener(
+                HibernateSearchElasticsearchBuildTimeConfigPersistenceUnit buildTimeConfig) {
+            this.buildTimeConfig = buildTimeConfig;
+        }
+
+        @Override
+        public void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
+            addConfig(propertyCollector,
+                    EngineSettings.BACKGROUND_FAILURE_HANDLER,
+                    buildTimeConfig.backgroundFailureHandler);
+
+            contributeBackendBuildTimeProperties(propertyCollector, null, buildTimeConfig.defaultBackend);
+
+            for (Entry<String, ElasticsearchBackendBuildTimeConfig> backendEntry : buildTimeConfig.namedBackends.backends
+                    .entrySet()) {
+                contributeBackendBuildTimeProperties(propertyCollector, backendEntry.getKey(), backendEntry.getValue());
+            }
+        }
+
+        @Override
+        public void onMetadataInitialized(Metadata metadata, BootstrapContext bootstrapContext,
+                BiConsumer<String, Object> propertyCollector) {
+            Version graalVMVersion = Version.getCurrent();
+            boolean isGraalVM20OrBelow = !graalVMVersion.isSnapshot() // isSnapshot() will be true on OpenJDK
+                    && graalVMVersion.compareTo(GRAAL_VM_VERSION_21) < 0;
+            HibernateOrmIntegrationBooter booter = HibernateOrmIntegrationBooter.builder(metadata, bootstrapContext)
+                    .valueReadHandleFactory(
+                            // GraalVM 20 or below doesn't support method handles
+                            isGraalVM20OrBelow ? ValueReadHandleFactory.usingJavaLangReflect()
+                                    // GraalVM 21+ and OpenJDK can handle the default (method handles)
+                                    : null)
+                    .build();
+            booter.preBoot(propertyCollector);
+        }
+
+        private void contributeBackendBuildTimeProperties(BiConsumer<String, Object> propertyCollector, String backendName,
+                ElasticsearchBackendBuildTimeConfig elasticsearchBackendConfig) {
+            addBackendConfig(propertyCollector, backendName, BackendSettings.TYPE,
+                    ElasticsearchBackendSettings.TYPE_NAME);
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.VERSION,
+                    elasticsearchBackendConfig.version);
+            addBackendConfig(propertyCollector, backendName,
+                    ElasticsearchBackendSettings.LAYOUT_STRATEGY,
+                    elasticsearchBackendConfig.layout.strategy);
+
+            // Index defaults at the backend level
+            contributeBackendIndexBuildTimeProperties(propertyCollector, backendName, null,
+                    elasticsearchBackendConfig.indexDefaults);
+
+            // Per-index properties
+            for (Entry<String, ElasticsearchIndexBuildTimeConfig> indexConfigEntry : elasticsearchBackendConfig.indexes
+                    .entrySet()) {
+                String indexName = indexConfigEntry.getKey();
+                ElasticsearchIndexBuildTimeConfig indexConfig = indexConfigEntry.getValue();
+                contributeBackendIndexBuildTimeProperties(propertyCollector, backendName, indexName, indexConfig);
+            }
+        }
+
+        private void contributeBackendIndexBuildTimeProperties(BiConsumer<String, Object> propertyCollector,
+                String backendName, String indexName, ElasticsearchIndexBuildTimeConfig indexConfig) {
+            addBackendIndexConfig(propertyCollector, backendName, indexName,
+                    ElasticsearchIndexSettings.ANALYSIS_CONFIGURER,
+                    indexConfig.analysis.configurer);
+        }
+    }
+
+    private static final class HibernateSearchIntegrationRuntimeInitListener
+            implements HibernateOrmIntegrationRuntimeInitListener {
+
+        private final HibernateSearchElasticsearchRuntimeConfigPersistenceUnit runtimeConfig;
+
+        private HibernateSearchIntegrationRuntimeInitListener(
+                HibernateSearchElasticsearchRuntimeConfigPersistenceUnit runtimeConfig) {
+            this.runtimeConfig = runtimeConfig;
+        }
+
+        @Override
+        public void contributeRuntimeProperties(BiConsumer<String, Object> propertyCollector) {
+            addConfig(propertyCollector,
+                    HibernateOrmMapperSettings.SCHEMA_MANAGEMENT_STRATEGY,
+                    runtimeConfig.schemaManagement.strategy);
+            addConfig(propertyCollector,
+                    HibernateOrmMapperSettings.AUTOMATIC_INDEXING_SYNCHRONIZATION_STRATEGY,
+                    runtimeConfig.automaticIndexing.synchronization.strategy);
+            addConfig(propertyCollector,
+                    HibernateOrmMapperSettings.AUTOMATIC_INDEXING_ENABLE_DIRTY_CHECK,
+                    runtimeConfig.automaticIndexing.enableDirtyCheck);
+            addConfig(propertyCollector,
+                    HibernateOrmMapperSettings.QUERY_LOADING_CACHE_LOOKUP_STRATEGY,
+                    runtimeConfig.queryLoading.cacheLookup.strategy);
+            addConfig(propertyCollector,
+                    HibernateOrmMapperSettings.QUERY_LOADING_FETCH_SIZE,
+                    runtimeConfig.queryLoading.fetchSize);
+
+            contributeBackendRuntimeProperties(propertyCollector, null,
+                    runtimeConfig.defaultBackend);
+
+            for (Entry<String, ElasticsearchBackendRuntimeConfig> backendEntry : runtimeConfig.namedBackends.backends
+                    .entrySet()) {
+                contributeBackendRuntimeProperties(propertyCollector, backendEntry.getKey(), backendEntry.getValue());
+            }
+        }
+
+        private void contributeBackendRuntimeProperties(BiConsumer<String, Object> propertyCollector, String backendName,
+                ElasticsearchBackendRuntimeConfig elasticsearchBackendConfig) {
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.HOSTS,
+                    elasticsearchBackendConfig.hosts);
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.PROTOCOL,
+                    elasticsearchBackendConfig.protocol.getHibernateSearchString());
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.USERNAME,
+                    elasticsearchBackendConfig.username);
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.PASSWORD,
+                    elasticsearchBackendConfig.password);
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.CONNECTION_TIMEOUT,
+                    elasticsearchBackendConfig.connectionTimeout.toMillis());
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.READ_TIMEOUT,
+                    elasticsearchBackendConfig.readTimeout.toMillis());
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.REQUEST_TIMEOUT,
+                    elasticsearchBackendConfig.requestTimeout, Optional::isPresent, d -> d.get().toMillis());
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.MAX_CONNECTIONS,
+                    elasticsearchBackendConfig.maxConnections);
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.MAX_CONNECTIONS_PER_ROUTE,
+                    elasticsearchBackendConfig.maxConnectionsPerRoute);
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.THREAD_POOL_SIZE,
+                    elasticsearchBackendConfig.threadPool.size);
+
+            addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.DISCOVERY_ENABLED,
+                    elasticsearchBackendConfig.discovery.enabled);
+            if (elasticsearchBackendConfig.discovery.enabled) {
+                addBackendConfig(propertyCollector, backendName, ElasticsearchBackendSettings.DISCOVERY_REFRESH_INTERVAL,
+                        elasticsearchBackendConfig.discovery.refreshInterval.getSeconds());
+            }
+
+            // Index defaults at the backend level
+            contributeBackendIndexRuntimeProperties(propertyCollector, backendName, null,
+                    elasticsearchBackendConfig.indexDefaults);
+
+            // Per-index properties
+            for (Entry<String, ElasticsearchIndexRuntimeConfig> indexConfigEntry : runtimeConfig.defaultBackend.indexes
+                    .entrySet()) {
+                String indexName = indexConfigEntry.getKey();
+                ElasticsearchIndexRuntimeConfig indexConfig = indexConfigEntry.getValue();
+                contributeBackendIndexRuntimeProperties(propertyCollector, backendName, indexName, indexConfig);
+            }
+        }
+
+        private void contributeBackendIndexRuntimeProperties(BiConsumer<String, Object> propertyCollector,
+                String backendName, String indexName, ElasticsearchIndexRuntimeConfig indexConfig) {
+            addBackendIndexConfig(propertyCollector, backendName, indexName,
+                    ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS,
+                    indexConfig.schemaManagement.requiredStatus);
+            addBackendIndexConfig(propertyCollector, backendName, indexName,
+                    ElasticsearchIndexSettings.SCHEMA_MANAGEMENT_MINIMAL_REQUIRED_STATUS_WAIT_TIMEOUT,
+                    indexConfig.schemaManagement.requiredStatusWaitTimeout, Optional::isPresent,
+                    d -> d.get().toMillis());
+            addBackendIndexConfig(propertyCollector, backendName, indexName,
+                    ElasticsearchIndexSettings.INDEXING_QUEUE_COUNT,
+                    indexConfig.indexing.queueCount);
+            addBackendIndexConfig(propertyCollector, backendName, indexName,
+                    ElasticsearchIndexSettings.INDEXING_QUEUE_SIZE,
+                    indexConfig.indexing.queueSize);
+            addBackendIndexConfig(propertyCollector, backendName, indexName,
+                    ElasticsearchIndexSettings.INDEXING_MAX_BULK_SIZE,
+                    indexConfig.indexing.maxBulkSize);
+        }
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java
new file mode 100644
index 0000000000000..759e885b4a83b
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfig.java
@@ -0,0 +1,28 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "hibernate-search-orm", phase = ConfigPhase.RUN_TIME)
+public class HibernateSearchElasticsearchRuntimeConfig {
+
+    /**
+     * Configuration for the default persistence unit.
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    public HibernateSearchElasticsearchRuntimeConfigPersistenceUnit defaultPersistenceUnit;
+
+    /**
+     * Configuration for additional named persistence units.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("persistence-unit-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, HibernateSearchElasticsearchRuntimeConfigPersistenceUnit> persistenceUnits;
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java
new file mode 100644
index 0000000000000..fe3d73e262eda
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRuntimeConfigPersistenceUnit.java
@@ -0,0 +1,428 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import org.hibernate.search.backend.elasticsearch.index.IndexStatus;
+import org.hibernate.search.engine.cfg.spi.ParseUtils;
+import org.hibernate.search.mapper.orm.automaticindexing.session.AutomaticIndexingSynchronizationStrategyNames;
+import org.hibernate.search.mapper.orm.schema.management.SchemaManagementStrategyName;
+import org.hibernate.search.mapper.orm.search.loading.EntityLoadingCacheLookupStrategy;
+import org.hibernate.search.util.common.SearchException;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class HibernateSearchElasticsearchRuntimeConfigPersistenceUnit {
+
+    /**
+     * Default backend
+     */
+    @ConfigItem(name = "elasticsearch")
+    @ConfigDocSection
+    ElasticsearchBackendRuntimeConfig defaultBackend;
+
+    /**
+     * Named backends
+     */
+    @ConfigItem(name = "elasticsearch")
+    @ConfigDocSection
+    public ElasticsearchNamedBackendsRuntimeConfig namedBackends;
+
+    /**
+     * Configuration for automatic creation and validation of the Elasticsearch schema:
+     * indexes, their mapping, their settings.
+     */
+    @ConfigItem
+    SchemaManagementConfig schemaManagement;
+
+    /**
+     * Configuration for how entities are loaded by a search query.
+     */
+    @ConfigItem(name = "query.loading")
+    SearchQueryLoadingConfig queryLoading;
+
+    /**
+     * Configuration for the automatic indexing.
+     */
+    @ConfigItem
+    AutomaticIndexingConfig automaticIndexing;
+
+    @ConfigGroup
+    public static class ElasticsearchNamedBackendsRuntimeConfig {
+
+        /**
+         * Named backends
+         */
+        @ConfigDocMapKey("backend-name")
+        public Map<String, ElasticsearchBackendRuntimeConfig> backends;
+
+    }
+
+    @ConfigGroup
+    public static class ElasticsearchBackendRuntimeConfig {
+        /**
+         * The list of hosts of the Elasticsearch servers.
+         */
+        @ConfigItem(defaultValue = "localhost:9200")
+        List<String> hosts;
+
+        /**
+         * The protocol to use when contacting Elasticsearch servers.
+         * Set to "https" to enable SSL/TLS.
+         */
+        @ConfigItem(defaultValue = "http")
+        ElasticsearchClientProtocol protocol;
+
+        /**
+         * The username used for authentication.
+         */
+        @ConfigItem
+        Optional<String> username;
+
+        /**
+         * The password used for authentication.
+         */
+        @ConfigItem
+        Optional<String> password;
+
+        /**
+         * The timeout when establishing a connection to an Elasticsearch server.
+         */
+        @ConfigItem(defaultValue = "1S")
+        Duration connectionTimeout;
+
+        /**
+         * The timeout when reading responses from an Elasticsearch server.
+         */
+        @ConfigItem(defaultValue = "30S")
+        Duration readTimeout;
+
+        /**
+         * The timeout when executing a request to an Elasticsearch server.
+         * <p>
+         * This includes the time needed to wait for a connection to be available,
+         * send the request and read the response.
+         */
+        @ConfigItem
+        Optional<Duration> requestTimeout;
+
+        /**
+         * The maximum number of connections to all the Elasticsearch servers.
+         */
+        @ConfigItem(defaultValue = "20")
+        int maxConnections;
+
+        /**
+         * The maximum number of connections per Elasticsearch server.
+         */
+        @ConfigItem(defaultValue = "10")
+        int maxConnectionsPerRoute;
+
+        /**
+         * Configuration for the automatic discovery of new Elasticsearch nodes.
+         */
+        @ConfigItem
+        DiscoveryConfig discovery;
+
+        /**
+         * Configuration for the thread pool assigned to the backend.
+         */
+        @ConfigItem
+        ThreadPoolConfig threadPool;
+
+        /**
+         * The default configuration for the Elasticsearch indexes.
+         */
+        @ConfigItem(name = ConfigItem.PARENT)
+        ElasticsearchIndexRuntimeConfig indexDefaults;
+
+        /**
+         * Per-index specific configuration.
+         */
+        @ConfigItem
+        @ConfigDocMapKey("index-name")
+        Map<String, ElasticsearchIndexRuntimeConfig> indexes;
+    }
+
+    public enum ElasticsearchClientProtocol {
+        /**
+         * Use clear-text HTTP, with SSL/TLS disabled.
+         */
+        HTTP("http"),
+        /**
+         * Use HTTPS, with SSL/TLS enabled.
+         */
+        HTTPS("https");
+
+        public static ElasticsearchClientProtocol of(String value) {
+            return ParseUtils.parseDiscreteValues(
+                    values(),
+                    ElasticsearchClientProtocol::getHibernateSearchString,
+                    (invalidValue, validValues) -> new SearchException(
+                            String.format(
+                                    Locale.ROOT,
+                                    "Invalid protocol: '%1$s'. Valid protocols are: %2$s.",
+                                    invalidValue,
+                                    validValues)),
+                    value);
+        }
+
+        private final String hibernateSearchString;
+
+        ElasticsearchClientProtocol(String hibernateSearchString) {
+            this.hibernateSearchString = hibernateSearchString;
+        }
+
+        public String getHibernateSearchString() {
+            return hibernateSearchString;
+        }
+    }
+
+    @ConfigGroup
+    public static class ElasticsearchIndexRuntimeConfig {
+        /**
+         * Configuration for the schema management of the indexes.
+         */
+        @ConfigItem
+        ElasticsearchIndexSchemaManagementConfig schemaManagement;
+
+        /**
+         * Configuration for the indexing process that creates, updates and deletes documents.
+         */
+        @ConfigItem
+        ElasticsearchIndexIndexingConfig indexing;
+    }
+
+    @ConfigGroup
+    public static class DiscoveryConfig {
+
+        /**
+         * Defines if automatic discovery is enabled.
+         */
+        @ConfigItem
+        boolean enabled;
+
+        /**
+         * Refresh interval of the node list.
+         */
+        @ConfigItem(defaultValue = "10S")
+        Duration refreshInterval;
+
+    }
+
+    @ConfigGroup
+    public static class AutomaticIndexingConfig {
+
+        /**
+         * Configuration for synchronization with the index when indexing automatically.
+         */
+        @ConfigItem
+        AutomaticIndexingSynchronizationConfig synchronization;
+
+        /**
+         * Whether to check if dirty properties are relevant to indexing before actually reindexing an entity.
+         * <p>
+         * When enabled, re-indexing of an entity is skipped if the only changes are on properties that are not used when
+         * indexing.
+         */
+        @ConfigItem(defaultValue = "true")
+        boolean enableDirtyCheck;
+    }
+
+    @ConfigGroup
+    public static class AutomaticIndexingSynchronizationConfig {
+
+        // @formatter:off
+        /**
+         * The synchronization strategy to use when indexing automatically.
+         *
+         * Defines how complete indexing should be before resuming the application thread
+         * after a database transaction is committed.
+         *
+         * Available values:
+         *
+         * [cols=5]
+         * !===
+         * .2+h!Strategy
+         * .2+h!Throughput
+         * 3+^h!Guarantees when the application thread resumes
+         *
+         * h!Changes applied
+         * h!Changes safe from crash/power loss
+         * h!Changes visible on search
+         *
+         * !async
+         * !Best
+         * ^!icon:times[role=red]
+         * ^!icon:times[role=red]
+         * ^!icon:times[role=red]
+         *
+         * !write-sync (**default**)
+         * !Medium
+         * ^!icon:check[role=lime]
+         * ^!icon:check[role=lime]
+         * ^!icon:times[role=red]
+         *
+         * !read-sync
+         * !Medium to worst
+         * ^!icon:check[role=lime]
+         * ^!icon:times[role=red]
+         * ^!icon:check[role=lime]
+         *
+         * !sync
+         * !Worst
+         * ^!icon:check[role=lime]
+         * ^!icon:check[role=lime]
+         * ^!icon:check[role=lime]
+         * !===
+         *
+         * This property also accepts a <<bean-reference-note-anchor,bean reference>>
+         * to a custom implementations of `AutomaticIndexingSynchronizationStrategy`.
+         *
+         * See
+         * link:{hibernate-search-doc-prefix}#mapper-orm-indexing-automatic-synchronization[this section of the reference documentation]
+         * for more information.
+         *
+         * @asciidoclet
+         */
+        // @formatter:on
+        @ConfigItem(defaultValue = AutomaticIndexingSynchronizationStrategyNames.WRITE_SYNC)
+        String strategy;
+    }
+
+    @ConfigGroup
+    public static class SearchQueryLoadingConfig {
+
+        /**
+         * Configuration for cache lookup when loading entities during the execution of a search query.
+         */
+        @ConfigItem
+        SearchQueryLoadingCacheLookupConfig cacheLookup;
+
+        /**
+         * The fetch size to use when loading entities during the execution of a search query.
+         */
+        @ConfigItem(defaultValue = "100")
+        int fetchSize;
+    }
+
+    @ConfigGroup
+    public static class SearchQueryLoadingCacheLookupConfig {
+
+        /**
+         * The strategy to use when loading entities during the execution of a search query.
+         */
+        @ConfigItem(defaultValue = "skip")
+        EntityLoadingCacheLookupStrategy strategy;
+    }
+
+    @ConfigGroup
+    public static class SchemaManagementConfig {
+
+        /**
+         * The strategy used for index lifecycle.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValue = "create-or-validate")
+        SchemaManagementStrategyName strategy;
+
+    }
+
+    @ConfigGroup
+    public static class ThreadPoolConfig {
+        /**
+         * The size of the thread pool assigned to the backend.
+         * <p>
+         * Note that number is <em>per backend</em>, not per index.
+         * Adding more indexes will not add more threads.
+         * <p>
+         * As all operations happening in this thread-pool are non-blocking,
+         * raising its size above the number of processor cores available to the JVM will not bring noticeable performance
+         * benefit.
+         * The only reason to alter this setting would be to reduce the number of threads;
+         * for example, in an application with a single index with a single indexing queue,
+         * running on a machine with 64 processor cores,
+         * you might want to bring down the number of threads.
+         * <p>
+         * Defaults to the number of processor cores available to the JVM on startup.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem
+        OptionalInt size;
+    }
+
+    // We can't set actual default values in this section,
+    // otherwise "quarkus.hibernate-search-orm.elasticsearch.index-defaults" will be ignored.
+    @ConfigGroup
+    public static class ElasticsearchIndexSchemaManagementConfig {
+        /**
+         * The minimal cluster status required.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "yellow")
+        Optional<IndexStatus> requiredStatus;
+
+        /**
+         * How long we should wait for the status before failing the bootstrap.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "10S")
+        Optional<Duration> requiredStatusWaitTimeout;
+    }
+
+    // We can't set actual default values in this section,
+    // otherwise "quarkus.hibernate-search-orm.elasticsearch.index-defaults" will be ignored.
+    @ConfigGroup
+    public static class ElasticsearchIndexIndexingConfig {
+        /**
+         * The number of indexing queues assigned to each index.
+         * <p>
+         * Higher values will lead to more connections being used in parallel,
+         * which may lead to higher indexing throughput,
+         * but incurs a risk of overloading Elasticsearch,
+         * i.e. of overflowing its HTTP request buffers and tripping
+         * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/7.9/circuit-breaker.html">circuit breakers</a>,
+         * leading to Elasticsearch giving up on some request and resulting in indexing failures.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "10")
+        OptionalInt queueCount;
+
+        /**
+         * The size of indexing queues.
+         * <p>
+         * Lower values may lead to lower memory usage, especially if there are many queues,
+         * but values that are too low will reduce the likeliness of reaching the max bulk size
+         * and increase the likeliness of application threads blocking because the queue is full,
+         * which may lead to lower indexing throughput.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "1000")
+        OptionalInt queueSize;
+
+        /**
+         * The maximum size of bulk requests created when processing indexing queues.
+         * <p>
+         * Higher values will lead to more documents being sent in each HTTP request sent to Elasticsearch,
+         * which may lead to higher indexing throughput,
+         * but incurs a risk of overloading Elasticsearch,
+         * i.e. of overflowing its HTTP request buffers and tripping
+         * <a href="https://www.elastic.co/guide/en/elasticsearch/reference/7.9/circuit-breaker.html">circuit breakers</a>,
+         * leading to Elasticsearch giving up on some request and resulting in indexing failures.
+         * <p>
+         * Note that raising this number above the queue size has no effect,
+         * as bulks cannot include more requests than are contained in the queue.
+         */
+        // We can't set an actual default value here: see comment on this class.
+        @ConfigItem(defaultValueDocumentation = "100")
+        OptionalInt maxBulkSize;
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java
new file mode 100644
index 0000000000000..c472dac77e565
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchDevConsoleRecorder.java
@@ -0,0 +1,42 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime.devconsole;
+
+import java.time.Duration;
+import java.util.stream.Collectors;
+
+import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity;
+import org.hibernate.search.mapper.orm.mapping.SearchMapping;
+
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class HibernateSearchDevConsoleRecorder {
+
+    public Handler<RoutingContext> indexEntity() {
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception {
+                if (form.isEmpty()) {
+                    return;
+                }
+                SearchMapping mapping = HibernateSearchSupplier.searchMapping();
+                if (mapping == null) {
+                    flashMessage(event, "There aren't any indexed entity types!", FlashScopeUtil.FlashMessageStatus.ERROR);
+                    return;
+                }
+                mapping.scope(Object.class,
+                        mapping.allIndexedEntities().stream()
+                                .map(SearchIndexedEntity::jpaName)
+                                .filter(form::contains)
+                                .collect(Collectors.toList()))
+                        .massIndexer()
+                        .startAndWait();
+                flashMessage(event, "Entities successfully reindexed", Duration.ofSeconds(10));
+            }
+        };
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchSupplier.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchSupplier.java
new file mode 100644
index 0000000000000..1f6cb8579a691
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/devconsole/HibernateSearchSupplier.java
@@ -0,0 +1,28 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime.devconsole;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.hibernate.search.mapper.orm.entity.SearchIndexedEntity;
+import org.hibernate.search.mapper.orm.mapping.SearchMapping;
+
+import io.quarkus.arc.Arc;
+
+public class HibernateSearchSupplier implements Supplier<List<String>> {
+    @Override
+    public List<String> get() {
+        SearchMapping mapping = searchMapping();
+        if (mapping == null) {
+            return Collections.emptyList();
+        }
+        return mapping.allIndexedEntities().stream().map(SearchIndexedEntity::jpaName).sorted()
+                .collect(Collectors.toList());
+
+    }
+
+    public static SearchMapping searchMapping() {
+        return Arc.container().instance(SearchMapping.class).get();
+    }
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/graal/Substitute_HibernateOrmIntegrationBooterBehavior.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/graal/Substitute_HibernateOrmIntegrationBooterBehavior.java
new file mode 100644
index 0000000000000..28782cee1b881
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/runtime/graal/Substitute_HibernateOrmIntegrationBooterBehavior.java
@@ -0,0 +1,19 @@
+package io.quarkus.hibernate.search.orm.elasticsearch.runtime.graal;
+
+import org.hibernate.search.mapper.orm.bootstrap.spi.HibernateOrmIntegrationBooterBehavior;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+/**
+ * Disallow the first phase of boot during runtime init so that bootstrap code can be DCEd.
+ */
+@TargetClass(className = "org.hibernate.search.mapper.orm.bootstrap.spi.HibernateOrmIntegrationBooterBehavior")
+final class Substitute_HibernateOrmIntegrationBooterBehavior {
+
+    @Substitute
+    public static <T> T bootFirstPhase(HibernateOrmIntegrationBooterBehavior.BootPhase<T> phase) {
+        throw new IllegalStateException("The first phase of Hibernate Search's boot should have occurred during static init.");
+    }
+
+}
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..961e0a436f6f4
--- /dev/null
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,17 @@
+---
+name: "Hibernate Search + Elasticsearch"
+metadata:
+  keywords:
+  - "hibernate-search-orm-elasticsearch"
+  - "hibernate-search-elasticsearch"
+  - "search"
+  - "full-text"
+  - "hibernate"
+  - "orm"
+  - "hibernate-orm"
+  - "hibernate-search-orm"
+  - "elasticsearch"
+  guide: "https://quarkus.io/guides/hibernate-search-orm-elasticsearch"
+  categories:
+  - "data"
+  status: "stable"
diff --git a/extensions/hibernate-validator/deployment/pom.xml b/extensions/hibernate-validator/deployment/pom.xml
index cff48f5307cc2..c70a8da754726 100644
--- a/extensions/hibernate-validator/deployment/pom.xml
+++ b/extensions/hibernate-validator/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-hibernate-validator-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,14 +21,26 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-common-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-server-common-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-validator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java
index 40fd3e577705c..df559c92d389e 100644
--- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java
+++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java
@@ -4,15 +4,18 @@
 
 import java.lang.annotation.Repeatable;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
+import javax.inject.Singleton;
 import javax.validation.ClockProvider;
 import javax.validation.Constraint;
 import javax.validation.ConstraintValidator;
@@ -21,8 +24,10 @@
 import javax.validation.ParameterNameProvider;
 import javax.validation.TraversableResolver;
 import javax.validation.Valid;
+import javax.validation.ValidationException;
 import javax.validation.executable.ValidateOnExecution;
 import javax.validation.valueextraction.ValueExtractor;
+import javax.ws.rs.Priorities;
 
 import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
 import org.hibernate.validator.messageinterpolation.AbstractMessageInterpolator;
@@ -40,16 +45,22 @@
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.AutoAddScopeBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
@@ -63,6 +74,12 @@
 import io.quarkus.hibernate.validator.runtime.HibernateValidatorRecorder;
 import io.quarkus.hibernate.validator.runtime.ValidatorProvider;
 import io.quarkus.hibernate.validator.runtime.interceptor.MethodValidationInterceptor;
+import io.quarkus.hibernate.validator.runtime.jaxrs.QuarkusRestViolationExceptionMapper;
+import io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyConfigSupport;
+import io.quarkus.hibernate.validator.spi.BeanValidationAnnotationsBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyConfigBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyDotNames;
+import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceMethodAnnotationsBuildItem;
 import io.quarkus.runtime.LocalesBuildTimeConfig;
 
@@ -93,6 +110,11 @@ class HibernateValidatorProcessor {
 
     private static final Pattern BUILT_IN_CONSTRAINT_REPEATABLE_CONTAINER_PATTERN = Pattern.compile("\\$List$");
 
+    @BuildStep
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.HIBERNATE_VALIDATOR);
+    }
+
     @BuildStep
     HotDeploymentWatchedFileBuildItem configFile() {
         return new HotDeploymentWatchedFileBuildItem(META_INF_VALIDATION_XML);
@@ -104,8 +126,13 @@ LogCleanupFilterBuildItem logCleanup() {
     }
 
     @BuildStep
-    void registerAdditionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+    @Record(ExecutionTime.STATIC_INIT)
+    void registerAdditionalBeans(HibernateValidatorRecorder hibernateValidatorRecorder,
+            Optional<ResteasyConfigBuildItem> resteasyConfigBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             BuildProducer<UnremovableBeanBuildItem> unremovableBean,
+            BuildProducer<AutoAddScopeBuildItem> autoScopes,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItems,
             Capabilities capabilities) {
         // The bean encapsulating the Validator and ValidatorFactory
         additionalBeans.produce(new AdditionalBeanBuildItem(ValidatorProvider.class));
@@ -119,8 +146,22 @@ void registerAdditionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBe
                     "io.quarkus.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidationInterceptor"));
             additionalBeans.produce(new AdditionalBeanBuildItem(
                     "io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyContextLocaleResolver"));
+            syntheticBeanBuildItems.produce(SyntheticBeanBuildItem.configure(ResteasyConfigSupport.class)
+                    .scope(Singleton.class)
+                    .unremovable()
+                    .supplier(hibernateValidatorRecorder.resteasyConfigSupportSupplier(
+                            resteasyConfigBuildItem.isPresent() ? resteasyConfigBuildItem.get().isJsonDefault() : false))
+                    .done());
+        } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
+            // The CDI interceptor which will validate the methods annotated with @JaxrsEndPointValidated
+            additionalBeans.produce(new AdditionalBeanBuildItem(
+                    "io.quarkus.hibernate.validator.runtime.jaxrs.QuarkusRestEndPointValidationInterceptor"));
         }
 
+        // A constraint validator with an injection point but no scope is added as @Singleton
+        autoScopes.produce(AutoAddScopeBuildItem.builder().implementsInterface(CONSTRAINT_VALIDATOR).requiresContainerServices()
+                .defaultScope(BuiltinScope.SINGLETON).build());
+
         // Do not remove the Bean Validation beans
         unremovableBean.produce(new UnremovableBeanBuildItem(new Predicate<BeanInfo>() {
             @Override
@@ -145,6 +186,7 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC
             CombinedIndexBuildItem combinedIndexBuildItem,
             BuildProducer<FeatureBuildItem> feature,
             BuildProducer<BeanContainerListenerBuildItem> beanContainerListener,
+            BuildProducer<BeanValidationAnnotationsBuildItem> beanValidationAnnotations,
             ShutdownContextBuildItem shutdownContext,
             List<AdditionalJaxRsResourceMethodAnnotationsBuildItem> additionalJaxRsResourceMethodAnnotations,
             Capabilities capabilities,
@@ -156,36 +198,44 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC
         // we use both indexes to support both generated beans and jars that contain no CDI beans but only Validation annotations
         IndexView indexView = CompositeIndex.create(beanArchiveIndexBuildItem.getIndex(), combinedIndexBuildItem.getIndex());
 
-        Set<DotName> consideredAnnotations = new HashSet<>();
+        Set<DotName> constraints = new HashSet<>();
 
         Set<String> builtinConstraints = ConstraintHelper.getBuiltinConstraints();
 
         // Collect the constraint annotations provided by Hibernate Validator and Bean Validation
-        contributeBuiltinConstraints(builtinConstraints, consideredAnnotations);
+        contributeBuiltinConstraints(builtinConstraints, constraints);
 
         // Add the constraint annotations present in the application itself
         for (AnnotationInstance constraint : indexView.getAnnotations(DotName.createSimple(Constraint.class.getName()))) {
-            consideredAnnotations.add(constraint.target().asClass().name());
+            constraints.add(constraint.target().asClass().name());
 
             if (constraint.target().asClass().annotations().containsKey(REPEATABLE)) {
                 for (AnnotationInstance repeatableConstraint : constraint.target().asClass().annotations()
                         .get(REPEATABLE)) {
-                    consideredAnnotations.add(repeatableConstraint.value().asClass().name());
+                    constraints.add(repeatableConstraint.value().asClass().name());
                 }
             }
         }
 
+        Set<DotName> allConsideredAnnotations = new HashSet<>();
+        allConsideredAnnotations.addAll(constraints);
+
         // Also consider elements that are marked with @Valid
-        consideredAnnotations.add(VALID);
+        allConsideredAnnotations.add(VALID);
 
         // Also consider elements that are marked with @ValidateOnExecution
-        consideredAnnotations.add(VALIDATE_ON_EXECUTION);
+        allConsideredAnnotations.add(VALIDATE_ON_EXECUTION);
+
+        beanValidationAnnotations.produce(new BeanValidationAnnotationsBuildItem(
+                VALID,
+                constraints,
+                allConsideredAnnotations));
 
         Set<DotName> classNamesToBeValidated = new HashSet<>();
-        Map<DotName, Set<String>> inheritedAnnotationsToBeValidated = new HashMap<>();
+        Map<DotName, Set<SimpleMethodSignatureKey>> methodsWithInheritedValidation = new HashMap<>();
         Set<String> detectedBuiltinConstraints = new HashSet<>();
 
-        for (DotName consideredAnnotation : consideredAnnotations) {
+        for (DotName consideredAnnotation : allConsideredAnnotations) {
             Collection<AnnotationInstance> annotationInstances = indexView.getAnnotations(consideredAnnotation);
 
             if (annotationInstances.isEmpty()) {
@@ -211,7 +261,7 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC
                     reflectiveMethods.produce(new ReflectiveMethodBuildItem(annotation.target().asMethod()));
                     contributeClassMarkedForCascadingValidation(classNamesToBeValidated, indexView, consideredAnnotation,
                             annotation.target().asMethod().returnType());
-                    contributeMethodsWithInheritedValidation(inheritedAnnotationsToBeValidated, indexView,
+                    contributeMethodsWithInheritedValidation(methodsWithInheritedValidation, indexView,
                             annotation.target().asMethod());
                 } else if (annotation.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER) {
                     contributeClass(classNamesToBeValidated, indexView,
@@ -221,7 +271,7 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC
                             // FIXME this won't work in the case of synthetic parameters
                             annotation.target().asMethodParameter().method().parameters()
                                     .get(annotation.target().asMethodParameter().position()));
-                    contributeMethodsWithInheritedValidation(inheritedAnnotationsToBeValidated, indexView,
+                    contributeMethodsWithInheritedValidation(methodsWithInheritedValidation, indexView,
                             annotation.target().asMethodParameter().method());
                 } else if (annotation.target().kind() == AnnotationTarget.Kind.CLASS) {
                     contributeClass(classNamesToBeValidated, indexView, annotation.target().asClass().name());
@@ -230,16 +280,19 @@ public void build(HibernateValidatorRecorder recorder, RecorderContext recorderC
             }
         }
 
+        // JAX-RS methods are handled differently by the transformer so those need to be gathered here.
+        // Note: The focus only on methods is basically an incomplete solution, since there could also be
+        // class-level JAX-RS annotations but currently the transformer only looks at methods.
+        Map<DotName, Set<SimpleMethodSignatureKey>> jaxRsMethods = gatherJaxRsMethods(additionalJaxRsResourceMethodAnnotations,
+                indexView);
+
         // Add the annotations transformer to add @MethodValidated annotations on the methods requiring validation
-        Set<DotName> additionalJaxRsMethodAnnotationsDotNames = new HashSet<>(additionalJaxRsResourceMethodAnnotations.size());
-        for (AdditionalJaxRsResourceMethodAnnotationsBuildItem additionalJaxRsResourceMethodAnnotation : additionalJaxRsResourceMethodAnnotations) {
-            additionalJaxRsMethodAnnotationsDotNames.addAll(additionalJaxRsResourceMethodAnnotation.getAnnotationClasses());
-        }
+
         annotationsTransformers
                 .produce(new AnnotationsTransformerBuildItem(
-                        new MethodValidatedAnnotationsTransformer(consideredAnnotations,
-                                additionalJaxRsMethodAnnotationsDotNames,
-                                inheritedAnnotationsToBeValidated)));
+                        new MethodValidatedAnnotationsTransformer(allConsideredAnnotations,
+                                jaxRsMethods,
+                                methodsWithInheritedValidation)));
 
         Set<Class<?>> classesToBeValidated = new HashSet<>();
         for (DotName className : classNamesToBeValidated) {
@@ -265,6 +318,12 @@ NativeImageConfigBuildItem nativeImageConfig() {
                 .build();
     }
 
+    @BuildStep
+    ExceptionMapperBuildItem mapper() {
+        return new ExceptionMapperBuildItem(QuarkusRestViolationExceptionMapper.class.getName(),
+                ValidationException.class.getName(), Priorities.USER + 1, true);
+    }
+
     private static void contributeBuiltinConstraints(Set<String> builtinConstraints,
             Set<DotName> consideredAnnotationsCollector) {
         for (String builtinConstraint : builtinConstraints) {
@@ -279,6 +338,11 @@ private static void contributeBuiltinConstraints(Set<String> builtinConstraints,
 
     private static void contributeClass(Set<DotName> classNamesCollector, IndexView indexView, DotName className) {
         classNamesCollector.add(className);
+
+        if (DotNames.OBJECT.equals(className)) {
+            return;
+        }
+
         for (ClassInfo subclass : indexView.getAllKnownSubclasses(className)) {
             if (Modifier.isAbstract(subclass.flags())) {
                 // we can avoid adding the abstract classes here: either they are parent classes
@@ -311,14 +375,67 @@ private static void contributeClassMarkedForCascadingValidation(Set<DotName> cla
         }
     }
 
-    private static void contributeMethodsWithInheritedValidation(Map<DotName, Set<String>> inheritedAnnotationsToBeValidated,
+    private static void contributeMethodsWithInheritedValidation(
+            Map<DotName, Set<SimpleMethodSignatureKey>> methodsWithInheritedValidation,
             IndexView indexView, MethodInfo method) {
         ClassInfo clazz = method.declaringClass();
+
+        methodsWithInheritedValidation.computeIfAbsent(clazz.name(), k -> new HashSet<>())
+                .add(new SimpleMethodSignatureKey(method));
+
         if (Modifier.isInterface(clazz.flags())) {
-            // Remember annotated interface methods that must be validated
-            inheritedAnnotationsToBeValidated.computeIfAbsent(clazz.name(), k -> new HashSet<String>())
-                    .add(method.name().toString());
+            for (ClassInfo implementor : indexView.getAllKnownImplementors(clazz.name())) {
+                methodsWithInheritedValidation.computeIfAbsent(implementor.name(), k -> new HashSet<>())
+                        .add(new SimpleMethodSignatureKey(method));
+            }
+        } else {
+            for (ClassInfo subclass : indexView.getAllKnownSubclasses(clazz.name())) {
+                methodsWithInheritedValidation.computeIfAbsent(subclass.name(), k -> new HashSet<>())
+                        .add(new SimpleMethodSignatureKey(method));
+            }
+        }
+    }
+
+    private static Map<DotName, Set<SimpleMethodSignatureKey>> gatherJaxRsMethods(
+            List<AdditionalJaxRsResourceMethodAnnotationsBuildItem> additionalJaxRsResourceMethodAnnotations,
+            IndexView indexView) {
+        Map<DotName, Set<SimpleMethodSignatureKey>> jaxRsMethods = new HashMap<>();
+
+        Collection<DotName> jaxRsMethodDefiningAnnotations = new ArrayList<>(
+                ResteasyDotNames.JAXRS_METHOD_ANNOTATIONS.size() + additionalJaxRsResourceMethodAnnotations.size());
+        jaxRsMethodDefiningAnnotations.addAll(ResteasyDotNames.JAXRS_METHOD_ANNOTATIONS);
+        for (AdditionalJaxRsResourceMethodAnnotationsBuildItem additionalJaxRsResourceMethodAnnotation : additionalJaxRsResourceMethodAnnotations) {
+            jaxRsMethodDefiningAnnotations.addAll(additionalJaxRsResourceMethodAnnotation.getAnnotationClasses());
+        }
+
+        for (DotName jaxRsAnnotation : jaxRsMethodDefiningAnnotations) {
+            Collection<AnnotationInstance> annotationInstances = indexView.getAnnotations(jaxRsAnnotation);
+
+            if (annotationInstances.isEmpty()) {
+                continue;
+            }
+
+            for (AnnotationInstance annotation : annotationInstances) {
+                if (annotation.target().kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo method = annotation.target().asMethod();
+                    jaxRsMethods.computeIfAbsent(method.declaringClass().name(), k -> new HashSet<>())
+                            .add(new SimpleMethodSignatureKey(method));
+
+                    if (Modifier.isInterface(method.declaringClass().flags())) {
+                        for (ClassInfo implementor : indexView.getAllKnownImplementors(method.declaringClass().name())) {
+                            jaxRsMethods.computeIfAbsent(implementor.name(), k -> new HashSet<>())
+                                    .add(new SimpleMethodSignatureKey(method));
+                        }
+                    } else {
+                        for (ClassInfo subclass : indexView.getAllKnownSubclasses(method.declaringClass().name())) {
+                            jaxRsMethods.computeIfAbsent(subclass.name(), k -> new HashSet<>())
+                                    .add(new SimpleMethodSignatureKey(method));
+                        }
+                    }
+                }
+            }
         }
+        return jaxRsMethods;
     }
 
     private static DotName getClassName(Type type) {
@@ -336,4 +453,5 @@ private static DotName getClassName(Type type) {
     private static boolean hasXmlConfiguration() {
         return Thread.currentThread().getContextClassLoader().getResource(META_INF_VALIDATION_XML) != null;
     }
+
 }
diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/MethodValidatedAnnotationsTransformer.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/MethodValidatedAnnotationsTransformer.java
index d9751e1c4bd90..325ee3ef7b080 100644
--- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/MethodValidatedAnnotationsTransformer.java
+++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/MethodValidatedAnnotationsTransformer.java
@@ -1,9 +1,6 @@
 package io.quarkus.hibernate.validator.deployment;
 
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
@@ -14,6 +11,7 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.deployment.index.IndexingUtil;
 import io.quarkus.hibernate.validator.runtime.interceptor.MethodValidated;
 import io.quarkus.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidated;
 
@@ -24,30 +22,16 @@ public class MethodValidatedAnnotationsTransformer implements AnnotationsTransfo
 
     private static final Logger LOGGER = Logger.getLogger(MethodValidatedAnnotationsTransformer.class.getPackage().getName());
 
-    private static final DotName[] JAXRS_METHOD_ANNOTATIONS = {
-            DotName.createSimple("javax.ws.rs.GET"),
-            DotName.createSimple("javax.ws.rs.HEAD"),
-            DotName.createSimple("javax.ws.rs.DELETE"),
-            DotName.createSimple("javax.ws.rs.OPTIONS"),
-            DotName.createSimple("javax.ws.rs.PATCH"),
-            DotName.createSimple("javax.ws.rs.POST"),
-            DotName.createSimple("javax.ws.rs.PUT"),
-    };
-
     private final Set<DotName> consideredAnnotations;
-    private final Collection<DotName> effectiveJaxRsMethodDefiningAnnotations;
-    private final Map<DotName, Set<String>> inheritedAnnotationsToBeValidated;
+    private final Map<DotName, Set<SimpleMethodSignatureKey>> methodsWithInheritedValidation;
+    private final Map<DotName, Set<SimpleMethodSignatureKey>> jaxRsMethods;
 
     MethodValidatedAnnotationsTransformer(Set<DotName> consideredAnnotations,
-            Collection<DotName> additionalJaxRsMethodAnnotationsDotNames,
-            Map<DotName, Set<String>> inheritedAnnotationsToBeValidated) {
+            Map<DotName, Set<SimpleMethodSignatureKey>> jaxRsMethods,
+            Map<DotName, Set<SimpleMethodSignatureKey>> methodsWithInheritedValidation) {
         this.consideredAnnotations = consideredAnnotations;
-        this.inheritedAnnotationsToBeValidated = inheritedAnnotationsToBeValidated;
-
-        this.effectiveJaxRsMethodDefiningAnnotations = new ArrayList<>(
-                JAXRS_METHOD_ANNOTATIONS.length + additionalJaxRsMethodAnnotationsDotNames.size());
-        effectiveJaxRsMethodDefiningAnnotations.addAll(Arrays.asList(JAXRS_METHOD_ANNOTATIONS));
-        effectiveJaxRsMethodDefiningAnnotations.addAll(additionalJaxRsMethodAnnotationsDotNames);
+        this.jaxRsMethods = jaxRsMethods;
+        this.methodsWithInheritedValidation = methodsWithInheritedValidation;
     }
 
     @Override
@@ -78,34 +62,49 @@ public void transform(TransformationContext transformationContext) {
     }
 
     private boolean requiresValidation(MethodInfo method) {
-        if (method.annotations().isEmpty()) {
-            // This method has no annotations of its own: look for inherited annotations
-            ClassInfo clazz = method.declaringClass();
-            String methodName = method.name().toString();
-            for (Map.Entry<DotName, Set<String>> validatedMethod : inheritedAnnotationsToBeValidated.entrySet()) {
-                if (clazz.interfaceNames().contains(validatedMethod.getKey())
-                        && validatedMethod.getValue().contains(methodName)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         for (DotName consideredAnnotation : consideredAnnotations) {
             if (method.hasAnnotation(consideredAnnotation)) {
                 return true;
             }
         }
 
-        return false;
+        // This method has no annotations of its own: look for inherited annotations
+
+        Set<SimpleMethodSignatureKey> validatedMethods = methodsWithInheritedValidation.get(method.declaringClass().name());
+        if (validatedMethods == null || validatedMethods.isEmpty()) {
+            return false;
+        }
+
+        return validatedMethods.contains(new SimpleMethodSignatureKey(method));
     }
 
     private boolean isJaxrsMethod(MethodInfo method) {
-        for (DotName jaxrsMethodAnnotation : effectiveJaxRsMethodDefiningAnnotations) {
-            if (method.hasAnnotation(jaxrsMethodAnnotation)) {
+        ClassInfo clazz = method.declaringClass();
+        SimpleMethodSignatureKey signatureKey = new SimpleMethodSignatureKey(method);
+
+        if (isJaxrsMethod(signatureKey, clazz.name())) {
+            return true;
+        }
+
+        // check interfaces
+        for (DotName iface : clazz.interfaceNames()) {
+            if (isJaxrsMethod(signatureKey, iface)) {
+                return true;
+            }
+        }
+
+        // check superclass, but only the direct one since we do not (yet) have the entire ClassInfo hierarchy here
+        DotName superClass = clazz.superName();
+        if (!superClass.equals(IndexingUtil.OBJECT)) {
+            if (isJaxrsMethod(signatureKey, superClass)) {
                 return true;
             }
         }
         return false;
     }
+
+    private boolean isJaxrsMethod(SimpleMethodSignatureKey signatureKey, DotName dotName) {
+        Set<SimpleMethodSignatureKey> signatureKeys = jaxRsMethods.get(dotName);
+        return signatureKeys != null && signatureKeys.contains(signatureKey);
+    }
 }
diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/SimpleMethodSignatureKey.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/SimpleMethodSignatureKey.java
new file mode 100644
index 0000000000000..87c35c57b3cb9
--- /dev/null
+++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/SimpleMethodSignatureKey.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.validator.deployment;
+
+import java.util.stream.Collectors;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+class SimpleMethodSignatureKey {
+
+    private final String key;
+
+    SimpleMethodSignatureKey(MethodInfo method) {
+        // Notes:
+        // - MethodInfo.toString() is not usable here because it includes the declaring class
+        // - just parameters() for the second part would include annotations (see Type.toString())
+        key = method.name() + method.parameters().stream()
+                .map(Type::name)
+                .map(DotName::toString)
+                .collect(Collectors.joining(", ", "(", ")"));
+    }
+
+    @Override
+    public int hashCode() {
+        return key.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        SimpleMethodSignatureKey other = (SimpleMethodSignatureKey) obj;
+        return key.equals(other.key);
+    }
+
+    @Override
+    public String toString() {
+        return key;
+    }
+}
diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java
new file mode 100644
index 0000000000000..0abec442499b2
--- /dev/null
+++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ValidatorBeanInjectionTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.hibernate.validator.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.validator.test.injection.TestBean;
+import io.quarkus.hibernate.validator.test.injection.TestConstraint;
+import io.quarkus.hibernate.validator.test.injection.TestInjectedBean;
+import io.quarkus.hibernate.validator.test.injection.TestInjectionValidator;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ValidatorBeanInjectionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap
+            .create(JavaArchive.class)
+            .addClasses(TestBean.class, TestConstraint.class, TestInjectedBean.class, TestInjectionValidator.class));
+
+    @Inject
+    Validator validator;
+
+    @Test
+    public void testValidationWithInjection() {
+        Set<ConstraintViolation<TestBean>> constraintViolations = validator.validate(new TestBean());
+
+        assertThat(constraintViolations).isNotEmpty();
+
+        TestBean bean = new TestBean();
+        bean.name = "Alpha";
+        constraintViolations = validator.validate(bean);
+        assertThat(constraintViolations).isEmpty();
+    }
+
+}
diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestBean.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestBean.java
new file mode 100644
index 0000000000000..0dfee727d9957
--- /dev/null
+++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestBean.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.validator.test.injection;
+
+public class TestBean {
+
+    @TestConstraint
+    public String name;
+
+}
\ No newline at end of file
diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java
new file mode 100644
index 0000000000000..a60a0d7dd803d
--- /dev/null
+++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestConstraint.java
@@ -0,0 +1,30 @@
+package io.quarkus.hibernate.validator.test.injection;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.constraints.NotNull;
+
+@Retention(RUNTIME)
+@Target({ FIELD, METHOD, ANNOTATION_TYPE, PARAMETER })
+@NotNull
+@Constraint(validatedBy = TestInjectionValidator.class)
+@Documented
+public @interface TestConstraint {
+
+    String message() default "";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java
new file mode 100644
index 0000000000000..e2b62c73eef6d
--- /dev/null
+++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectedBean.java
@@ -0,0 +1,15 @@
+package io.quarkus.hibernate.validator.test.injection;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class TestInjectedBean {
+
+    public List<String> allowedStrings() {
+        return Collections.singletonList("Alpha");
+    }
+
+}
diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java
new file mode 100644
index 0000000000000..208111599efb5
--- /dev/null
+++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/injection/TestInjectionValidator.java
@@ -0,0 +1,17 @@
+package io.quarkus.hibernate.validator.test.injection;
+
+import javax.inject.Inject;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class TestInjectionValidator implements ConstraintValidator<TestConstraint, String> {
+
+    @Inject
+    TestInjectedBean testInjectedBean;
+
+    @Override
+    public boolean isValid(String string, ConstraintValidatorContext context) {
+        return testInjectedBean.allowedStrings().contains(string);
+    }
+
+}
diff --git a/extensions/hibernate-validator/pom.xml b/extensions/hibernate-validator/pom.xml
index ab3c56ef23280..75167f43bc85b 100644
--- a/extensions/hibernate-validator/pom.xml
+++ b/extensions/hibernate-validator/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,6 +14,7 @@
     <name>Quarkus - Hibernate Validator</name>
     <packaging>pom</packaging>
     <modules>
+        <module>spi</module>
         <module>deployment</module>
         <module>runtime</module>
     </modules>
diff --git a/extensions/hibernate-validator/runtime/pom.xml b/extensions/hibernate-validator/runtime/pom.xml
index 8d8c2daf8c253..6603688efaa46 100644
--- a/extensions/hibernate-validator/runtime/pom.xml
+++ b/extensions/hibernate-validator/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-hibernate-validator-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -65,6 +64,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java
index 47efa224d3f65..43a3acb82b4be 100644
--- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/HibernateValidatorRecorder.java
@@ -1,6 +1,7 @@
 package io.quarkus.hibernate.validator.runtime;
 
 import java.util.Set;
+import java.util.function.Supplier;
 
 import javax.validation.ClockProvider;
 import javax.validation.ConstraintValidatorFactory;
@@ -22,6 +23,7 @@
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.arc.runtime.BeanContainerListener;
+import io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyConfigSupport;
 import io.quarkus.runtime.LocalesBuildTimeConfig;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
@@ -142,4 +144,14 @@ public void run() {
 
         return beanContainerListener;
     }
+
+    public Supplier<ResteasyConfigSupport> resteasyConfigSupportSupplier(boolean jsonDefault) {
+        return new Supplier<ResteasyConfigSupport>() {
+
+            @Override
+            public ResteasyConfigSupport get() {
+                return new ResteasyConfigSupport(jsonDefault);
+            }
+        };
+    }
 }
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java
index bb7771be9239a..616b26a424fb6 100644
--- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java
@@ -46,7 +46,6 @@ public abstract class AbstractMethodValidationInterceptor implements Serializabl
      * return value of the intercepted method.
      *
      * @param ctx The context of the intercepted method invocation.
-     * @param customValidator Custom Validator
      *
      * @return The result of the method invocation.
      *
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java
index 9b1aeb0572cdd..b567ddc615023 100644
--- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java
@@ -6,6 +6,7 @@
 import java.util.List;
 
 import javax.annotation.Priority;
+import javax.inject.Inject;
 import javax.interceptor.AroundConstruct;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
@@ -13,7 +14,6 @@
 import javax.validation.ConstraintViolationException;
 import javax.ws.rs.core.MediaType;
 
-import org.jboss.logging.Logger;
 import org.jboss.resteasy.util.MediaTypeHelper;
 
 import io.quarkus.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor;
@@ -23,7 +23,10 @@
 @Priority(Interceptor.Priority.PLATFORM_AFTER + 800)
 public class JaxrsEndPointValidationInterceptor extends AbstractMethodValidationInterceptor {
 
-    private static final Logger LOGGER = Logger.getLogger(JaxrsEndPointValidationInterceptor.class);
+    private static final List<MediaType> JSON_MEDIA_TYPE_LIST = Collections.singletonList(MediaType.APPLICATION_JSON_TYPE);
+
+    @Inject
+    ResteasyConfigSupport resteasyConfigSupport;
 
     @AroundInvoke
     @Override
@@ -45,6 +48,10 @@ private List<MediaType> getAccept(Method method) {
         MediaType[] producedMediaTypes = MediaTypeHelper.getProduces(method.getDeclaringClass(), method);
 
         if (producedMediaTypes == null) {
+            if (resteasyConfigSupport.isJsonDefault()) {
+                return JSON_MEDIA_TYPE_LIST;
+            }
+
             return Collections.emptyList();
         }
 
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/QuarkusRestEndPointValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/QuarkusRestEndPointValidationInterceptor.java
new file mode 100644
index 0000000000000..c5d023e462043
--- /dev/null
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/QuarkusRestEndPointValidationInterceptor.java
@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.validator.runtime.jaxrs;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import io.quarkus.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor;
+
+@JaxrsEndPointValidated
+@Interceptor
+@Priority(Interceptor.Priority.PLATFORM_AFTER + 800)
+public class QuarkusRestEndPointValidationInterceptor extends AbstractMethodValidationInterceptor {
+
+    @AroundInvoke
+    @Override
+    public Object validateMethodInvocation(InvocationContext ctx) throws Exception {
+        return super.validateMethodInvocation(ctx);
+    }
+
+    @AroundConstruct
+    @Override
+    public void validateConstructorInvocation(InvocationContext ctx) throws Exception {
+        super.validateConstructorInvocation(ctx);
+    }
+}
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/QuarkusRestViolationExceptionMapper.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/QuarkusRestViolationExceptionMapper.java
new file mode 100644
index 0000000000000..49df29c1cbc7c
--- /dev/null
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/QuarkusRestViolationExceptionMapper.java
@@ -0,0 +1,107 @@
+package io.quarkus.hibernate.validator.runtime.jaxrs;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.ValidationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class QuarkusRestViolationExceptionMapper implements ExceptionMapper<ValidationException> {
+
+    @Override
+    public Response toResponse(ValidationException exception) {
+        if (exception instanceof ConstraintViolationException) {
+            return buildConstrainViolationResponse((ConstraintViolationException) exception);
+        }
+        return buildResponse(unwrapException(exception), Status.INTERNAL_SERVER_ERROR);
+    }
+
+    protected Response buildResponse(Object entity, Status status) {
+        return Response.status(status).entity(entity).build();
+    }
+
+    protected String unwrapException(Throwable t) {
+        StringBuffer sb = new StringBuffer();
+        doUnwrapException(sb, t);
+        return sb.toString();
+    }
+
+    private void doUnwrapException(StringBuffer sb, Throwable t) {
+        if (t == null) {
+            return;
+        }
+        sb.append(t.toString());
+        if (t.getCause() != null && t != t.getCause()) {
+            sb.append('[');
+            doUnwrapException(sb, t.getCause());
+            sb.append(']');
+        }
+    }
+
+    private Response buildConstrainViolationResponse(ConstraintViolationException cve) {
+        boolean hasReturnValueViolation = false;
+        List<ViolationReport.Violation> violationsInReport = new ArrayList<>(cve.getConstraintViolations().size());
+        for (ConstraintViolation<?> cv : cve.getConstraintViolations()) {
+            if (cv.getExecutableReturnValue() != null) {
+                hasReturnValueViolation = true;
+            }
+            violationsInReport.add(new ViolationReport.Violation(cv.getPropertyPath().toString(), cv.getMessage()));
+        }
+        // spec says that if there is a violation in the return value, the response status is 500, otherwise 400
+        Status status = hasReturnValueViolation ? Status.INTERNAL_SERVER_ERROR : Status.BAD_REQUEST;
+        return buildResponse(new ViolationReport("Constraint Violation", status, violationsInReport), status);
+    }
+
+    /**
+     * As spec doesn't say anything about the report format,
+     * we just use https://opensource.zalando.com/problem/constraint-violation
+     * This also what Reactive Routes uses
+     */
+    public static class ViolationReport {
+        private final String title;
+        private final int status;
+        private final List<Violation> violations;
+
+        public ViolationReport(String title, Status status, List<Violation> violations) {
+            this.title = title;
+            this.status = status.getStatusCode();
+            this.violations = violations;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public List<Violation> getViolations() {
+            return violations;
+        }
+
+        public static class Violation {
+            private final String field;
+            private final String message;
+
+            public Violation(String field, String message) {
+                this.field = field;
+                this.message = message;
+            }
+
+            public String getField() {
+                return field;
+            }
+
+            public String getMessage() {
+                return message;
+            }
+        }
+    }
+}
diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyConfigSupport.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyConfigSupport.java
new file mode 100644
index 0000000000000..1872f4807a090
--- /dev/null
+++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyConfigSupport.java
@@ -0,0 +1,17 @@
+package io.quarkus.hibernate.validator.runtime.jaxrs;
+
+public class ResteasyConfigSupport {
+
+    private boolean jsonDefault;
+
+    public ResteasyConfigSupport() {
+    }
+
+    public ResteasyConfigSupport(boolean jsonDefault) {
+        this.jsonDefault = jsonDefault;
+    }
+
+    public boolean isJsonDefault() {
+        return jsonDefault;
+    }
+}
diff --git a/extensions/hibernate-validator/spi/pom.xml b/extensions/hibernate-validator/spi/pom.xml
new file mode 100644
index 0000000000000..d9e7a1fb83eb0
--- /dev/null
+++ b/extensions/hibernate-validator/spi/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-validator-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-validator-spi</artifactId>
+    <name>Quarkus - Hibernate Validator - SPI</name>
+    <description>Artifact that provides BuildItems specific to Hibernate Validator</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java b/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java
new file mode 100644
index 0000000000000..288122a89307d
--- /dev/null
+++ b/extensions/hibernate-validator/spi/src/main/java/io/quarkus/hibernate/validator/spi/BeanValidationAnnotationsBuildItem.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.validator.spi;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * BuildItem used to publish the list of detected Bean Validation annotations
+ * for consumption by other extensions.
+ */
+public final class BeanValidationAnnotationsBuildItem extends SimpleBuildItem {
+
+    private final DotName valid;
+    private final Set<DotName> constraints;
+    private final Set<DotName> all;
+
+    public BeanValidationAnnotationsBuildItem(DotName valid, Set<DotName> constraints, Set<DotName> all) {
+        this.valid = valid;
+        this.constraints = Collections.unmodifiableSet(constraints);
+        this.all = Collections.unmodifiableSet(all);
+    }
+
+    public DotName getValidAnnotation() {
+        return valid;
+    }
+
+    public Set<DotName> getConstraintAnnotations() {
+        return constraints;
+    }
+
+    public Set<DotName> getAllAnnotations() {
+        return all;
+    }
+}
diff --git a/extensions/infinispan-client/README.MD b/extensions/infinispan-client/README.MD
index fccab46151eaf..60855bd0fcea1 100644
--- a/extensions/infinispan-client/README.MD
+++ b/extensions/infinispan-client/README.MD
@@ -85,7 +85,7 @@ The keystore is configured via hotrod-client.properties file located in META-INF
 #### Configure your project to allow security services
 
 You (currently) need to enable all security services in Substrate
-(https://github.com/oracle/graal/blob/master/substratevm/JCA-SECURITY-SERVICES.md). This can be done by adding
+(https://github.com/oracle/graal/blob/master/substratevm/JCASecurityServices.md). This can be done by adding
 `<enableAllSecurityServices>true</enableAllSecurityServices>` to the quarkus-maven-plugin configuration values.
 
 ### Authentication
diff --git a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
index b961c6c5bdbcc..39b0be96002ec 100644
--- a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
+++ b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
@@ -20,7 +20,7 @@
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
-import org.infinispan.client.hotrod.marshall.ProtoStreamMarshaller;
+import org.infinispan.commons.marshall.ProtoStreamMarshaller;
 import org.infinispan.commons.util.Util;
 import org.infinispan.protostream.BaseMarshaller;
 import org.infinispan.protostream.EnumMarshaller;
@@ -59,7 +59,7 @@ class InfinispanClientProcessor {
     private static final Log log = LogFactory.getLog(InfinispanClientProcessor.class);
 
     private static final String META_INF = "META-INF";
-    private static final String HOTROD_CLIENT_PROPERTIES = META_INF + File.separator + "/hotrod-client.properties";
+    private static final String HOTROD_CLIENT_PROPERTIES = META_INF + File.separator + "hotrod-client.properties";
     private static final String PROTO_EXTENSION = ".proto";
 
     /**
diff --git a/extensions/infinispan-client/pom.xml b/extensions/infinispan-client/pom.xml
index 163f8468bd985..098c9701f3126 100644
--- a/extensions/infinispan-client/pom.xml
+++ b/extensions/infinispan-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
index 3072d67d55247..97b58547628af 100644
--- a/extensions/infinispan-client/runtime/pom.xml
+++ b/extensions/infinispan-client/runtime/pom.xml
@@ -91,10 +91,21 @@
         <dependency>
             <groupId>org.infinispan.protostream</groupId>
             <artifactId>protostream-processor</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
index 8a59a3410fbaa..27db928910843 100644
--- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
+++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
@@ -25,8 +25,8 @@
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
-import org.infinispan.client.hotrod.marshall.ProtoStreamMarshaller;
 import org.infinispan.commons.marshall.Marshaller;
+import org.infinispan.commons.marshall.ProtoStreamMarshaller;
 import org.infinispan.commons.util.Util;
 import org.infinispan.counter.api.CounterManager;
 import org.infinispan.protostream.BaseMarshaller;
@@ -107,7 +107,8 @@ public static void replaceProperties(Properties properties) throws ClassNotFound
         // If you are changing this method, you will most likely have to change builderFromProperties as well
         String marshallerClassName = (String) properties.get(ConfigurationProperties.MARSHALLER);
         if (marshallerClassName != null) {
-            Class<?> marshallerClass = Class.forName(marshallerClassName);
+            Class<?> marshallerClass = Class.forName(marshallerClassName, false,
+                    Thread.currentThread().getContextClassLoader());
             properties.put(ConfigurationProperties.MARSHALLER, Util.getInstance(marshallerClass));
         } else {
             // Default to proto stream marshaller if one is not provided
@@ -309,10 +310,10 @@ void configure(Properties properties) {
     }
 
     /**
-     * Retrieves the deprecated {@link Remote} annotation instance from the set
+     * Retrieves the deprecated {@link io.quarkus.infinispan.client.Remote} annotation instance from the set
      *
      * @param annotationSet the annotation set.
-     * @return the {@link Remote} annotation instance or {@code null} if not found.
+     * @return the {@link io.quarkus.infinispan.client.Remote} annotation instance or {@code null} if not found.
      */
     private io.quarkus.infinispan.client.Remote getRemoteAnnotation(Set<Annotation> annotationSet) {
         for (Annotation annotation : annotationSet) {
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanRecorder.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanRecorder.java
index 8aa1e29f62576..49f4466156a26 100644
--- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanRecorder.java
+++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanRecorder.java
@@ -4,11 +4,12 @@
 
 import io.quarkus.arc.runtime.BeanContainerListener;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.annotations.RelaxedValidation;
 
 @Recorder
 public class InfinispanRecorder {
 
-    public BeanContainerListener configureInfinispan(Properties properties) {
+    public BeanContainerListener configureInfinispan(@RelaxedValidation Properties properties) {
         return container -> {
             InfinispanClientProducer instance = container.instance(InfinispanClientProducer.class);
             instance.configure(properties);
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteConfigurationBuilder.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteConfigurationBuilder.java
index be0d8b24464cd..029f1f4ade0f8 100644
--- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteConfigurationBuilder.java
+++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteConfigurationBuilder.java
@@ -4,7 +4,6 @@
 import org.infinispan.client.hotrod.marshall.BytesOnlyMarshaller;
 import org.infinispan.commons.marshall.Marshaller;
 
-import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
@@ -15,11 +14,9 @@
  */
 @TargetClass(ConfigurationBuilder.class)
 public final class SubstituteConfigurationBuilder {
-    @Alias
-    private Marshaller marshaller;
 
     @Substitute
-    private void handleNullMarshaller() {
-        marshaller = BytesOnlyMarshaller.INSTANCE;
+    private Marshaller handleNullMarshaller() {
+        return BytesOnlyMarshaller.INSTANCE;
     }
 }
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java
index 363f2211385af..ecec2b9261992 100644
--- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java
+++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java
@@ -2,6 +2,7 @@
 
 import javax.management.ObjectName;
 
+import org.infinispan.client.hotrod.configuration.Configuration;
 import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
 import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
 import org.infinispan.commons.marshall.Marshaller;
@@ -31,7 +32,7 @@ private void unregisterMBean() {
     // Sadly this method is public, so technically a user could get a Runtime error if they were referencing
     // it before - but it is the only way to make graal happy
     @Delete
-    public void init(Marshaller marshaller, OperationsFactory operationsFactory, int estimateKeySize,
-            int estimateValueSize, int batchSize, ObjectName jmxParent) {
+    public void init(Marshaller marshaller, OperationsFactory operationsFactory,
+            Configuration configuration, ObjectName jmxParent) {
     }
 }
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java
index 79470706b5109..26625d6656b9f 100644
--- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java
+++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java
@@ -2,7 +2,7 @@
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.infinispan.client.hotrod.configuration.Configuration;
-import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
+import org.infinispan.client.hotrod.impl.InternalRemoteCache;
 import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
 import org.infinispan.commons.marshall.Marshaller;
 
@@ -23,10 +23,9 @@ public final class SubstituteRemoteCacheManager {
     private Configuration configuration;
 
     @Substitute
-    private void initRemoteCache(RemoteCacheImpl remoteCache, OperationsFactory operationsFactory) {
+    private void initRemoteCache(InternalRemoteCache<?, ?> remoteCache, OperationsFactory operationsFactory) {
         // Invoke the init method that doesn't have the JMX ObjectName argument
-        remoteCache.init(marshaller, operationsFactory, configuration.keySizeEstimate(),
-                configuration.valueSizeEstimate(), configuration.batchSize());
+        remoteCache.init(marshaller, operationsFactory, configuration);
     }
 
     @Substitute
diff --git a/extensions/jackson/deployment/pom.xml b/extensions/jackson/deployment/pom.xml
index ad626f20c32d2..68597280eeabb 100644
--- a/extensions/jackson/deployment/pom.xml
+++ b/extensions/jackson/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jackson-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,6 +29,16 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java
index d76cbd354496f..03f7a9c89caeb 100755
--- a/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java
+++ b/extensions/jackson/deployment/src/main/java/io/quarkus/jackson/deployment/JacksonProcessor.java
@@ -1,7 +1,6 @@
 package io.quarkus.jackson.deployment;
 
 import static org.jboss.jandex.AnnotationTarget.Kind.CLASS;
-import static org.jboss.jandex.AnnotationTarget.Kind.FIELD;
 import static org.jboss.jandex.AnnotationTarget.Kind.METHOD;
 
 import java.util.Arrays;
@@ -19,6 +18,7 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Type;
 
+import com.fasterxml.jackson.annotation.SimpleObjectIdResolver;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.Module;
@@ -30,9 +30,12 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
@@ -44,7 +47,10 @@
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.jackson.ObjectMapperCustomizer;
-import io.quarkus.jackson.ObjectMapperProducer;
+import io.quarkus.jackson.runtime.JacksonBuildTimeConfig;
+import io.quarkus.jackson.runtime.JacksonConfigSupport;
+import io.quarkus.jackson.runtime.JacksonRecorder;
+import io.quarkus.jackson.runtime.ObjectMapperProducer;
 import io.quarkus.jackson.spi.ClassPathJacksonModuleBuildItem;
 import io.quarkus.jackson.spi.JacksonModuleBuildItem;
 
@@ -53,6 +59,8 @@ public class JacksonProcessor {
     private static final DotName JSON_DESERIALIZE = DotName.createSimple(JsonDeserialize.class.getName());
     private static final DotName JSON_SERIALIZE = DotName.createSimple(JsonSerialize.class.getName());
     private static final DotName JSON_CREATOR = DotName.createSimple("com.fasterxml.jackson.annotation.JsonCreator");
+    private static final DotName JSON_NAMING = DotName.createSimple("com.fasterxml.jackson.databind.annotation.JsonNaming");
+    private static final DotName JSON_IDENTITY_INFO = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIdentityInfo");
     private static final DotName BUILDER_VOID = DotName.createSimple(Void.class.getName());
 
     private static final String TIME_MODULE = "com.fasterxml.jackson.datatype.jsr310.JavaTimeModule";
@@ -63,18 +71,6 @@ public class JacksonProcessor {
     private static final List<String> MODULES_NAMES_TO_AUTO_REGISTER = Arrays.asList(TIME_MODULE, JDK8_MODULE,
             PARAMETER_NAMES_MODULE);
 
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-
-    @Inject
-    BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchyClass;
-
-    @Inject
-    BuildProducer<ReflectiveMethodBuildItem> reflectiveMethod;
-
-    @Inject
-    BuildProducer<AdditionalBeanBuildItem> additionalBeans;
-
     @Inject
     CombinedIndexBuildItem combinedIndexBuildItem;
 
@@ -82,11 +78,15 @@ public class JacksonProcessor {
     List<IgnoreJsonDeserializeClassBuildItem> ignoreJsonDeserializeClassBuildItems;
 
     @BuildStep
-    CapabilityBuildItem register() {
-        addReflectiveClass(true, false,
-                "com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector",
-                "com.fasterxml.jackson.databind.ser.std.SqlDateSerializer",
-                "com.fasterxml.jackson.databind.ser.std.SqlTimeSerializer");
+    CapabilityBuildItem register(
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchyClass,
+            BuildProducer<ReflectiveMethodBuildItem> reflectiveMethod,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        reflectiveClass.produce(
+                new ReflectiveClassBuildItem(true, false, "com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector",
+                        "com.fasterxml.jackson.databind.ser.std.SqlDateSerializer",
+                        "com.fasterxml.jackson.databind.ser.std.SqlTimeSerializer"));
 
         IndexView index = combinedIndexBuildItem.getIndex();
 
@@ -103,33 +103,30 @@ CapabilityBuildItem register() {
             if (CLASS.equals(annotationTarget.kind())) {
                 DotName dotName = annotationTarget.asClass().name();
                 if (!ignoredDotNames.contains(dotName)) {
-                    addReflectiveHierarchyClass(dotName);
+                    addReflectiveHierarchyClass(dotName, reflectiveHierarchyClass);
                 }
 
                 AnnotationValue annotationValue = deserializeInstance.value("builder");
                 if (null != annotationValue && AnnotationValue.Kind.CLASS.equals(annotationValue.kind())) {
                     DotName builderClassName = annotationValue.asClass().name();
                     if (!BUILDER_VOID.equals(builderClassName)) {
-                        addReflectiveHierarchyClass(builderClassName);
+                        addReflectiveHierarchyClass(builderClassName, reflectiveHierarchyClass);
                     }
                 }
             }
             AnnotationValue usingValue = deserializeInstance.value("using");
             if (usingValue != null) {
                 // the Deserializers are constructed internally by Jackson using a no-args constructor
-                reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, usingValue.asClass().toString()));
+                reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, usingValue.asClass().name().toString()));
             }
         }
 
         // handle the various @JsonSerialize cases
         for (AnnotationInstance serializeInstance : index.getAnnotations(JSON_SERIALIZE)) {
-            AnnotationTarget annotationTarget = serializeInstance.target();
-            if (FIELD.equals(annotationTarget.kind()) || METHOD.equals(annotationTarget.kind())) {
-                AnnotationValue usingValue = serializeInstance.value("using");
-                if (usingValue != null) {
-                    // the Deserializers are constructed internally by Jackson using a no-args constructor
-                    reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, usingValue.asClass().toString()));
-                }
+            AnnotationValue usingValue = serializeInstance.value("using");
+            if (usingValue != null) {
+                // the Serializers are constructed internally by Jackson using a no-args constructor
+                reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, usingValue.asClass().name().toString()));
             }
         }
 
@@ -140,19 +137,42 @@ CapabilityBuildItem register() {
             }
         }
 
+        // register @JsonNaming strategy implementations for reflection
+        for (AnnotationInstance jsonNamingInstance : index.getAnnotations(JSON_NAMING)) {
+            AnnotationValue strategyValue = jsonNamingInstance.value("value");
+            if (strategyValue != null) {
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, strategyValue.asClass().name().toString()));
+            }
+        }
+
+        // register @JsonIdentityInfo strategy implementations for reflection
+        for (AnnotationInstance jsonIdentityInfoInstance : index.getAnnotations(JSON_IDENTITY_INFO)) {
+            AnnotationValue generatorValue = jsonIdentityInfoInstance.value("generator");
+            AnnotationValue resolverValue = jsonIdentityInfoInstance.value("resolver");
+            if (generatorValue != null) {
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, generatorValue.asClass().name().toString()));
+            }
+            if (resolverValue != null) {
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, resolverValue.asClass().name().toString()));
+            } else {
+                // Registering since SimpleObjectIdResolver is the default value of @JsonIdentityInfo.resolver
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, SimpleObjectIdResolver.class));
+            }
+        }
+
         // this needs to be registered manually since the runtime module is not indexed by Jandex
         additionalBeans.produce(new AdditionalBeanBuildItem(ObjectMapperProducer.class));
 
         return new CapabilityBuildItem(Capability.JACKSON);
     }
 
-    private void addReflectiveHierarchyClass(DotName className) {
+    private void addReflectiveHierarchyClass(DotName className,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchyClass) {
         Type jandexType = Type.create(className, Type.Kind.CLASS);
-        reflectiveHierarchyClass.produce(new ReflectiveHierarchyBuildItem(jandexType));
-    }
-
-    private void addReflectiveClass(boolean methods, boolean fields, String... className) {
-        reflectiveClass.produce(new ReflectiveClassBuildItem(methods, fields, className));
+        reflectiveHierarchyClass.produce(new ReflectiveHierarchyBuildItem.Builder()
+                .type(jandexType)
+                .source(getClass().getSimpleName() + " > " + jandexType.name().toString())
+                .build());
     }
 
     @BuildStep
@@ -171,6 +191,16 @@ private void registerModuleIfOnClassPath(String moduleClassName,
         }
     }
 
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    SyntheticBeanBuildItem pushConfigurationBean(JacksonRecorder jacksonRecorder,
+            JacksonBuildTimeConfig jacksonBuildTimeConfig) {
+        return SyntheticBeanBuildItem.configure(JacksonConfigSupport.class)
+                .scope(Singleton.class)
+                .supplier(jacksonRecorder.jacksonConfigSupport(jacksonBuildTimeConfig))
+                .done();
+    }
+
     // Generate a ObjectMapperCustomizer bean that registers each serializer / deserializer as well as detected modules with the ObjectMapper
     @BuildStep
     void generateCustomizer(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
@@ -250,7 +280,7 @@ void generateCustomizer(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
 
             // ensure that the things we auto-register have the lower priority - this ensures that user registered modules take priority
             try (MethodCreator priority = classCreator.getMethodCreator("priority", int.class)) {
-                priority.returnValue(priority.load(ObjectMapperCustomizer.MINIMUM_PRIORITY));
+                priority.returnValue(priority.load(ObjectMapperCustomizer.QUARKUS_CUSTOMIZER_PRIORITY));
             }
         }
     }
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java
new file mode 100644
index 0000000000000..2ec4130b7f05c
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDontWriteDatesAsTimestampsTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.jackson.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JacksonDontWriteDatesAsTimestampsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest();
+
+    @Inject
+    ObjectMapper objectMapper;
+
+    @Test
+    public void testDateWrittenAsString() throws JsonMappingException, JsonProcessingException {
+        Pojo pojo = new Pojo();
+        pojo.zonedDateTime = ZonedDateTime.of(1988, 11, 17, 0, 0, 0, 0, ZoneId.of("GMT"));
+
+        assertThat(objectMapper.writeValueAsString(pojo)).contains("1988-11-17T00:00:00Z");
+    }
+
+    public static class Pojo {
+
+        public ZonedDateTime zonedDateTime;
+    }
+}
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java
new file mode 100644
index 0000000000000..68cee40b3f303
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonErroneousTimeZonePropertiesTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.jackson.deployment;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.time.zone.ZoneRulesException;
+import java.util.Date;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JacksonErroneousTimeZonePropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Pojo.class, SomeBean.class))
+            .withConfigurationResource("application-erroneous-timezone-properties.properties")
+            .setExpectedException(ZoneRulesException.class);
+
+    @Test
+    public void test() {
+        fail("Should never have been called");
+    }
+
+    @Singleton
+    public static class SomeBean {
+
+        @Inject
+        ObjectMapper objectMapper;
+
+        public String write(Pojo pojo) throws JsonProcessingException {
+            return objectMapper.writeValueAsString(pojo);
+        }
+
+    }
+
+    public static class Pojo {
+
+        private final Date date;
+
+        public Pojo(Date date) {
+            this.date = date;
+        }
+
+        public Date getDate() {
+            return date;
+        }
+    }
+
+}
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java
new file mode 100644
index 0000000000000..039fbb0d9dcd9
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonFailOnUnknownPropertiesTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.jackson.deployment;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JacksonFailOnUnknownPropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-fail-on-unknown-properties.properties");
+
+    @Inject
+    ObjectMapper objectMapper;
+
+    @Test
+    public void testFailOnUnknownProperties() throws JsonMappingException, JsonProcessingException {
+        Assertions.assertThrows(UnrecognizedPropertyException.class,
+                () -> objectMapper.readValue("{\"property\": \"name\", \"unknownProperty\": \"unknown\"}", Pojo.class));
+    }
+
+    public static class Pojo {
+
+        public String property;
+    }
+}
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.java
new file mode 100644
index 0000000000000..b99971101e37f
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonIgnoreUnknownPropertiesTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.jackson.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JacksonIgnoreUnknownPropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest();
+
+    @Inject
+    ObjectMapper objectMapper;
+
+    @Test
+    public void testIgnoreUnknownProperties() throws JsonMappingException, JsonProcessingException {
+        Pojo pojo = objectMapper.readValue("{\"property\": \"name\", \"unknownProperty\": \"unknown\"}", Pojo.class);
+        assertEquals("name", pojo.property);
+    }
+
+    public static class Pojo {
+
+        public String property;
+    }
+}
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java
new file mode 100644
index 0000000000000..6bf7c7622e334
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonTimeZonePropertiesTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.jackson.deployment;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import javax.inject.Inject;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JacksonTimeZonePropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-timezone-properties.properties");
+
+    @Inject
+    ObjectMapper objectMapper;
+
+    @Test
+    public void testTimezone() throws JsonProcessingException {
+        Assertions.assertThat(objectMapper.writeValueAsString(new Pojo(new Date(2021, Calendar.MARCH, 3, 11, 5))))
+                .contains("+07");
+    }
+
+    public static class Pojo {
+
+        private final Date date;
+
+        public Pojo(Date date) {
+            this.date = date;
+        }
+
+        public Date getDate() {
+            return date;
+        }
+    }
+}
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java
new file mode 100644
index 0000000000000..c31a62a3bffec
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonWriteDatesAsTimestampsTest.java
@@ -0,0 +1,40 @@
+package io.quarkus.jackson.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JacksonWriteDatesAsTimestampsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-write-dates-as-timestamps.properties");
+
+    @Inject
+    ObjectMapper objectMapper;
+
+    @Test
+    public void testDateWrittenAsNumericValue() throws JsonMappingException, JsonProcessingException {
+        Pojo pojo = new Pojo();
+        pojo.zonedDateTime = ZonedDateTime.of(1988, 11, 17, 0, 0, 0, 0, ZoneId.of("GMT"));
+
+        assertThat(objectMapper.writeValueAsString(pojo)).contains("595728000");
+    }
+
+    public static class Pojo {
+
+        public ZonedDateTime zonedDateTime;
+    }
+}
diff --git a/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java
new file mode 100644
index 0000000000000..72e127e687f00
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/java/io/quarkus/jackson/deployment/OverrideZonedDateTimeSerializerTest.java
@@ -0,0 +1,61 @@
+package io.quarkus.jackson.deployment;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.io.IOException;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import io.quarkus.jackson.ObjectMapperCustomizer;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class OverrideZonedDateTimeSerializerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest();
+
+    @Inject
+    ObjectMapper objectMapper;
+
+    @Test
+    public void test() throws JsonProcessingException {
+        assertThat(new ArrayList<>(objectMapper.getRegisteredModuleIds())).asList()
+                .contains("com.fasterxml.jackson.datatype.jsr310.JavaTimeModule");
+        assertThat(objectMapper.writeValueAsString(ZonedDateTime.now())).isEqualTo("\"dummy\"");
+    }
+
+    @Singleton
+    static class TestCustomizer implements ObjectMapperCustomizer {
+
+        @Override
+        public int priority() {
+            return ObjectMapperCustomizer.MINIMUM_PRIORITY;
+        }
+
+        @Override
+        public void customize(ObjectMapper objectMapper) {
+            SimpleModule module = new SimpleModule();
+            module.addSerializer(ZonedDateTime.class, new JsonSerializer<ZonedDateTime>() {
+                @Override
+                public void serialize(ZonedDateTime t, JsonGenerator jg, SerializerProvider sp) throws IOException {
+                    jg.writeString("dummy");
+                }
+
+            });
+            objectMapper.registerModule(module);
+        }
+    }
+}
diff --git a/extensions/jackson/deployment/src/test/resources/application-erroneous-timezone-properties.properties b/extensions/jackson/deployment/src/test/resources/application-erroneous-timezone-properties.properties
new file mode 100644
index 0000000000000..f894a15f9a6f8
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/resources/application-erroneous-timezone-properties.properties
@@ -0,0 +1 @@
+quarkus.jackson.timezone=dummy
diff --git a/extensions/jackson/deployment/src/test/resources/application-fail-on-unknown-properties.properties b/extensions/jackson/deployment/src/test/resources/application-fail-on-unknown-properties.properties
new file mode 100644
index 0000000000000..7fc657a94830f
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/resources/application-fail-on-unknown-properties.properties
@@ -0,0 +1 @@
+quarkus.jackson.fail-on-unknown-properties=true
\ No newline at end of file
diff --git a/extensions/jackson/deployment/src/test/resources/application-timezone-properties.properties b/extensions/jackson/deployment/src/test/resources/application-timezone-properties.properties
new file mode 100644
index 0000000000000..03b828dc8352f
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/resources/application-timezone-properties.properties
@@ -0,0 +1 @@
+quarkus.jackson.timezone=Asia/Jakarta
diff --git a/extensions/jackson/deployment/src/test/resources/application-write-dates-as-timestamps.properties b/extensions/jackson/deployment/src/test/resources/application-write-dates-as-timestamps.properties
new file mode 100644
index 0000000000000..f6599ae39e57a
--- /dev/null
+++ b/extensions/jackson/deployment/src/test/resources/application-write-dates-as-timestamps.properties
@@ -0,0 +1 @@
+quarkus.jackson.write-dates-as-timestamps=true
\ No newline at end of file
diff --git a/extensions/jackson/pom.xml b/extensions/jackson/pom.xml
index b9ce67309e92f..33ce8716c92e7 100644
--- a/extensions/jackson/pom.xml
+++ b/extensions/jackson/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jackson/runtime/pom.xml b/extensions/jackson/runtime/pom.xml
index cb5bdb27d7977..ad3d7544285bd 100644
--- a/extensions/jackson/runtime/pom.xml
+++ b/extensions/jackson/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jackson-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperCustomizer.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperCustomizer.java
index 0aac835a05b52..d02ba0835d34d 100644
--- a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperCustomizer.java
+++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperCustomizer.java
@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.quarkus.jackson.runtime.ObjectMapperProducer;
+
 /**
  * Meant to be implemented by a CDI bean that provides arbitrary customization for the default {@link ObjectMapper}.
  * <p>
@@ -13,6 +15,11 @@
 public interface ObjectMapperCustomizer extends Comparable<ObjectMapperCustomizer> {
 
     int MINIMUM_PRIORITY = Integer.MIN_VALUE;
+    // we use this priority to give a chance to other customizers to override serializers / deserializers
+    // that might have been added by the modules that Quarkus registers automatically
+    // (Jackson will keep the last registered serializer / deserializer for a given type
+    // if multiple are registered)
+    int QUARKUS_CUSTOMIZER_PRIORITY = MINIMUM_PRIORITY + 100;
     int DEFAULT_PRIORITY = 0;
 
     void customize(ObjectMapper objectMapper);
diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperProducer.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperProducer.java
deleted file mode 100644
index c017ba5e796ad..0000000000000
--- a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/ObjectMapperProducer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.quarkus.jackson;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.quarkus.arc.DefaultBean;
-
-@ApplicationScoped
-public class ObjectMapperProducer {
-
-    @DefaultBean
-    @Singleton
-    @Produces
-    public ObjectMapper objectMapper(Instance<ObjectMapperCustomizer> customizers) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        List<ObjectMapperCustomizer> sortedCustomizers = sortCustomizersInDescendingPriorityOrder(customizers);
-        for (ObjectMapperCustomizer customizer : sortedCustomizers) {
-            customizer.customize(objectMapper);
-        }
-        return objectMapper;
-    }
-
-    private List<ObjectMapperCustomizer> sortCustomizersInDescendingPriorityOrder(
-            Instance<ObjectMapperCustomizer> customizers) {
-        List<ObjectMapperCustomizer> sortedCustomizers = new ArrayList<>();
-        for (ObjectMapperCustomizer customizer : customizers) {
-            sortedCustomizers.add(customizer);
-        }
-        Collections.sort(sortedCustomizers);
-        return sortedCustomizers;
-    }
-}
diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonBuildTimeConfig.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonBuildTimeConfig.java
new file mode 100644
index 0000000000000..5ff4cd869cc2e
--- /dev/null
+++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonBuildTimeConfig.java
@@ -0,0 +1,33 @@
+package io.quarkus.jackson.runtime;
+
+import java.time.ZoneId;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot
+public class JacksonBuildTimeConfig {
+
+    /**
+     * If enabled, Jackson will fail when encountering unknown properties.
+     * <p>
+     * You can still override it locally with {@code @JsonIgnoreProperties(ignoreUnknown = false)}.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean failOnUnknownProperties;
+
+    /**
+     * If enabled, Jackson will serialize dates as numeric value(s).
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean writeDatesAsTimestamps;
+
+    /**
+     * If set, Jackson will default to using the specified timezone when formatting dates.
+     * Some examples values are "Asia/Jakarta" and "GMT+3".
+     * If not set, Jackson will use its own default.
+     */
+    @ConfigItem(defaultValue = "UTC")
+    public Optional<ZoneId> timezone;
+}
diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonConfigSupport.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonConfigSupport.java
new file mode 100644
index 0000000000000..82ba9ffcbe55a
--- /dev/null
+++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonConfigSupport.java
@@ -0,0 +1,30 @@
+package io.quarkus.jackson.runtime;
+
+import java.time.ZoneId;
+
+public class JacksonConfigSupport {
+
+    private final boolean failOnUnknownProperties;
+
+    private final boolean writeDatesAsTimestamps;
+
+    private final ZoneId timeZone;
+
+    public JacksonConfigSupport(boolean failOnUnknownProperties, boolean writeDatesAsTimestamps, ZoneId timeZone) {
+        this.failOnUnknownProperties = failOnUnknownProperties;
+        this.writeDatesAsTimestamps = writeDatesAsTimestamps;
+        this.timeZone = timeZone;
+    }
+
+    public boolean isFailOnUnknownProperties() {
+        return failOnUnknownProperties;
+    }
+
+    public boolean isWriteDatesAsTimestamps() {
+        return writeDatesAsTimestamps;
+    }
+
+    public ZoneId getTimeZone() {
+        return timeZone;
+    }
+}
diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonRecorder.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonRecorder.java
new file mode 100644
index 0000000000000..3784284982632
--- /dev/null
+++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/JacksonRecorder.java
@@ -0,0 +1,20 @@
+package io.quarkus.jackson.runtime;
+
+import java.util.function.Supplier;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class JacksonRecorder {
+
+    public Supplier<JacksonConfigSupport> jacksonConfigSupport(JacksonBuildTimeConfig jacksonBuildTimeConfig) {
+        return new Supplier<JacksonConfigSupport>() {
+
+            @Override
+            public JacksonConfigSupport get() {
+                return new JacksonConfigSupport(jacksonBuildTimeConfig.failOnUnknownProperties,
+                        jacksonBuildTimeConfig.writeDatesAsTimestamps, jacksonBuildTimeConfig.timezone.orElse(null));
+            }
+        };
+    }
+}
diff --git a/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java
new file mode 100644
index 0000000000000..4d9b3cd4f5e5a
--- /dev/null
+++ b/extensions/jackson/runtime/src/main/java/io/quarkus/jackson/runtime/ObjectMapperProducer.java
@@ -0,0 +1,58 @@
+package io.quarkus.jackson.runtime;
+
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TimeZone;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import io.quarkus.arc.DefaultBean;
+import io.quarkus.jackson.ObjectMapperCustomizer;
+
+@ApplicationScoped
+public class ObjectMapperProducer {
+
+    @DefaultBean
+    @Singleton
+    @Produces
+    public ObjectMapper objectMapper(Instance<ObjectMapperCustomizer> customizers,
+            JacksonConfigSupport jacksonConfigSupport) {
+        ObjectMapper objectMapper = new ObjectMapper();
+        if (!jacksonConfigSupport.isFailOnUnknownProperties()) {
+            // this feature is enabled by default, so we disable it
+            objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        }
+        if (!jacksonConfigSupport.isWriteDatesAsTimestamps()) {
+            // this feature is enabled by default, so we disable it
+            objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        }
+        ZoneId zoneId = jacksonConfigSupport.getTimeZone();
+        if ((zoneId != null) && !zoneId.getId().equals("UTC")) { // Jackson uses UTC as the default, so let's not reset it
+            objectMapper.setTimeZone(TimeZone.getTimeZone(zoneId));
+        }
+        List<ObjectMapperCustomizer> sortedCustomizers = sortCustomizersInDescendingPriorityOrder(customizers);
+        for (ObjectMapperCustomizer customizer : sortedCustomizers) {
+            customizer.customize(objectMapper);
+        }
+        return objectMapper;
+    }
+
+    private List<ObjectMapperCustomizer> sortCustomizersInDescendingPriorityOrder(
+            Instance<ObjectMapperCustomizer> customizers) {
+        List<ObjectMapperCustomizer> sortedCustomizers = new ArrayList<>();
+        for (ObjectMapperCustomizer customizer : customizers) {
+            sortedCustomizers.add(customizer);
+        }
+        Collections.sort(sortedCustomizers);
+        return sortedCustomizers;
+    }
+}
diff --git a/extensions/jaeger/deployment/pom.xml b/extensions/jaeger/deployment/pom.xml
index 3ee16239ec271..d016032ea322d 100644
--- a/extensions/jaeger/deployment/pom.xml
+++ b/extensions/jaeger/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jaeger-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,10 +21,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jaeger</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -43,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/jaeger/deployment/src/main/java/io/quarkus/jaeger/deployment/JaegerProcessor.java b/extensions/jaeger/deployment/src/main/java/io/quarkus/jaeger/deployment/JaegerProcessor.java
index b068d3e969832..7d47218d0311b 100644
--- a/extensions/jaeger/deployment/src/main/java/io/quarkus/jaeger/deployment/JaegerProcessor.java
+++ b/extensions/jaeger/deployment/src/main/java/io/quarkus/jaeger/deployment/JaegerProcessor.java
@@ -1,36 +1,29 @@
 package io.quarkus.jaeger.deployment;
 
-import javax.inject.Inject;
-
-import org.eclipse.microprofile.metrics.Metadata;
-import org.eclipse.microprofile.metrics.MetricType;
-import org.eclipse.microprofile.metrics.Tag;
+import java.util.Optional;
 
 import io.jaegertracing.internal.JaegerTracer;
-import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 import io.quarkus.jaeger.runtime.JaegerBuildTimeConfig;
 import io.quarkus.jaeger.runtime.JaegerConfig;
 import io.quarkus.jaeger.runtime.JaegerDeploymentRecorder;
-import io.quarkus.jaeger.runtime.QuarkusJaegerMetricsFactory;
 import io.quarkus.runtime.ApplicationConfig;
-import io.quarkus.smallrye.metrics.deployment.spi.MetricBuildItem;
+import io.quarkus.runtime.metrics.MetricsFactory;
 
 public class JaegerProcessor {
 
-    @Inject
-    BuildProducer<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport;
-
-    @BuildStep(onlyIf = NativeBuild.class)
+    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
     @Record(ExecutionTime.STATIC_INIT)
     void setVersion(JaegerDeploymentRecorder jdr) {
         jdr.setJaegerVersion(JaegerTracer.getVersionFromProperties());
@@ -38,83 +31,45 @@ void setVersion(JaegerDeploymentRecorder jdr) {
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void setupTracer(JaegerDeploymentRecorder jdr, JaegerBuildTimeConfig buildTimeConfig, JaegerConfig jaeger,
-            ApplicationConfig appConfig, Capabilities capabilities, BuildProducer<MetricBuildItem> metricProducer) {
-
-        // Indicates that this extension would like the SSL support to be enabled
-        extensionSslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.JAEGER.getName()));
+    ExtensionSslNativeSupportBuildItem setupTracer(JaegerDeploymentRecorder jdr, JaegerBuildTimeConfig buildTimeConfig,
+            JaegerConfig jaeger,
+            ApplicationConfig appConfig, Optional<MetricsCapabilityBuildItem> metricsCapability) {
 
         if (buildTimeConfig.enabled) {
-            boolean metricsEnabled = capabilities.isPresent(Capability.METRICS)
-                    && buildTimeConfig.metricsEnabled;
-            if (metricsEnabled) {
-                produceMetrics(metricProducer);
-                jdr.registerTracerWithMetrics(jaeger, appConfig);
+            if (buildTimeConfig.metricsEnabled && metricsCapability.isPresent()) {
+                if (metricsCapability.get().metricsSupported(MetricsFactory.MICROMETER)) {
+                    jdr.registerTracerWithMicrometerMetrics(jaeger, appConfig);
+                } else {
+                    jdr.registerTracerWithMpMetrics(jaeger, appConfig);
+                }
             } else {
                 jdr.registerTracerWithoutMetrics(jaeger, appConfig);
             }
         }
+
+        // Indicates that this extension would like the SSL support to be enabled
+        return new ExtensionSslNativeSupportBuildItem(Feature.JAEGER.getName());
     }
 
     @BuildStep
-    public void build(BuildProducer<FeatureBuildItem> feature) {
-        feature.produce(new FeatureBuildItem(Feature.JAEGER));
+    public FeatureBuildItem build() {
+        return new FeatureBuildItem(Feature.JAEGER);
     }
 
     @BuildStep
-    public void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
-        reflectiveClasses.produce(ReflectiveClassBuildItem
+    public void capability(JaegerBuildTimeConfig buildTimeConfig,
+            BuildProducer<CapabilityBuildItem> capability) {
+        if (buildTimeConfig.enabled) {
+            capability.produce(new CapabilityBuildItem(Capability.OPENTRACING));
+        }
+    }
+
+    @BuildStep
+    public ReflectiveClassBuildItem reflectiveClasses() {
+        return ReflectiveClassBuildItem
                 .builder("io.jaegertracing.internal.samplers.http.SamplingStrategyResponse",
                         "io.jaegertracing.internal.samplers.http.ProbabilisticSamplingStrategy")
                 .finalFieldsWritable(true)
-                .build());
-    }
-
-    private void produceMetrics(BuildProducer<MetricBuildItem> producer) {
-        producer.produce(
-                metric("jaeger_tracer_baggage_restrictions_updates", MetricType.COUNTER, null, new Tag("result", "err")));
-        producer.produce(
-                metric("jaeger_tracer_baggage_restrictions_updates", MetricType.COUNTER, null, new Tag("result", "ok")));
-        producer.produce(metric("jaeger_tracer_baggage_truncations", MetricType.COUNTER, null));
-        producer.produce(metric("jaeger_tracer_baggage_updates", MetricType.COUNTER, null, new Tag("result", "err")));
-        producer.produce(metric("jaeger_tracer_baggage_updates", MetricType.COUNTER, null, new Tag("result", "ok")));
-        producer.produce(metric("jaeger_tracer_finished_spans", MetricType.COUNTER, null));
-        producer.produce(metric("jaeger_tracer_reporter_spans", MetricType.COUNTER, null, new Tag("result", "dropped")));
-        producer.produce(metric("jaeger_tracer_reporter_spans", MetricType.COUNTER, null, new Tag("result", "err")));
-        producer.produce(metric("jaeger_tracer_reporter_spans", MetricType.COUNTER, null, new Tag("result", "ok")));
-        producer.produce(metric("jaeger_tracer_sampler_queries", MetricType.COUNTER, null, new Tag("result", "err")));
-        producer.produce(metric("jaeger_tracer_sampler_queries", MetricType.COUNTER, null, new Tag("result", "ok")));
-        producer.produce(metric("jaeger_tracer_sampler_updates", MetricType.COUNTER, null, new Tag("result", "ok")));
-        producer.produce(metric("jaeger_tracer_sampler_updates", MetricType.COUNTER, null, new Tag("result", "err")));
-        producer.produce(metric("jaeger_tracer_span_context_decoding_errors", MetricType.COUNTER, null));
-        producer.produce(metric("jaeger_tracer_started_spans", MetricType.COUNTER, null, new Tag("sampled", "n")));
-        producer.produce(metric("jaeger_tracer_started_spans", MetricType.COUNTER, null, new Tag("sampled", "y")));
-        producer.produce(metric("jaeger_tracer_traces", MetricType.COUNTER, null,
-                new Tag("sampled", "y"), new Tag("state", "joined")));
-        producer.produce(metric("jaeger_tracer_traces", MetricType.COUNTER, null,
-                new Tag("sampled", "y"), new Tag("state", "started")));
-        producer.produce(metric("jaeger_tracer_traces", MetricType.COUNTER, null,
-                new Tag("sampled", "n"), new Tag("state", "joined")));
-        producer.produce(metric("jaeger_tracer_traces", MetricType.COUNTER, null,
-                new Tag("sampled", "n"), new Tag("state", "started")));
-        producer.produce(
-                metric("jaeger_tracer_reporter_queue_length", MetricType.GAUGE, new QuarkusJaegerMetricsFactory.JaegerGauge()));
-    }
-
-    private MetricBuildItem metric(String name, MetricType type, Object implementor, Tag... tags) {
-        Metadata metadata = Metadata.builder()
-                .withName(name)
-                .withDisplayName(name)
-                .withType(type)
-                .withUnit("none")
-                .withDescription(name)
-                .reusable()
                 .build();
-        if (implementor == null) {
-            return new MetricBuildItem(metadata, true, "jaeger", tags);
-        } else {
-            return new MetricBuildItem(metadata, implementor, true, "jaeger", tags);
-        }
     }
-
 }
diff --git a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/NestedMdcScopesTest.java b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/NestedMdcScopesTest.java
index 861c44da57484..26e51b915a2b3 100644
--- a/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/NestedMdcScopesTest.java
+++ b/extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/NestedMdcScopesTest.java
@@ -25,27 +25,32 @@ public void mdcIsRestoredCorrectly() {
         assertNull(mdcScopeManager.active());
         assertNull(threadLocalScopeManager.active());
         assertNull(MDC.get("traceId"));
+        assertNull(MDC.get("parentId"));
 
-        JaegerSpanContext span = new JaegerSpanContext(1, 1, 1, 1, Byte.valueOf("0"));
+        JaegerSpanContext span = new JaegerSpanContext(1, 1, 1, 0, Byte.valueOf("0"));
         Scope scope = mdcScopeManager.activate(new TestSpan(span), true);
         assertSame(span, threadLocalScopeManager.active().span().context());
         assertEquals("10000000000000001", MDC.get("traceId"));
+        assertEquals("0", MDC.get("parentId"));
 
         JaegerSpanContext subSpan = new JaegerSpanContext(2, 2, 2, 1, Byte.valueOf("0"));
         Scope subScope = mdcScopeManager.activate(new TestSpan(subSpan), true);
         assertSame(subSpan, threadLocalScopeManager.active().span().context());
         assertEquals("20000000000000002", MDC.get("traceId"));
+        assertEquals("1", MDC.get("parentId"));
 
         subScope.close();
 
         assertSame(span, threadLocalScopeManager.active().span().context());
         assertEquals("10000000000000001", MDC.get("traceId"));
+        assertEquals("0", MDC.get("parentId"));
 
         scope.close();
 
         assertNull(mdcScopeManager.active());
         assertNull(threadLocalScopeManager.active());
         assertNull(MDC.get("traceId"));
+        assertNull(MDC.get("parentId"));
     }
 
     static class TestSpan implements Span {
diff --git a/extensions/jaeger/pom.xml b/extensions/jaeger/pom.xml
index ec6a85dad722f..ce8b0cf8de313 100644
--- a/extensions/jaeger/pom.xml
+++ b/extensions/jaeger/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jaeger/runtime/pom.xml b/extensions/jaeger/runtime/pom.xml
index 49e11209bcbac..763d2aba9e393 100644
--- a/extensions/jaeger/runtime/pom.xml
+++ b/extensions/jaeger/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jaeger-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,12 +40,18 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-metrics</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerBuildTimeConfig.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerBuildTimeConfig.java
index 546f9cea76982..62b66a53d21f3 100644
--- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerBuildTimeConfig.java
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerBuildTimeConfig.java
@@ -15,7 +15,7 @@ public class JaegerBuildTimeConfig {
     public boolean enabled;
 
     /**
-     * Whether or not metrics are published in case the smallrye-metrics extension is present.
+     * Whether or not metrics are published in case a metrics extension is present.
      */
     @ConfigItem(name = "metrics.enabled", defaultValue = "false")
     public boolean metricsEnabled;
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java
index 46e89d0a7eece..7140d386f2219 100644
--- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/JaegerDeploymentRecorder.java
@@ -24,15 +24,22 @@ public void setJaegerVersion(String version) {
         jaegerVersion = version;
     }
 
-    synchronized public void registerTracerWithoutMetrics(JaegerConfig jaeger, ApplicationConfig appConfig) {
+    /* RUNTIME_INIT */
+    public void registerTracerWithoutMetrics(JaegerConfig jaeger, ApplicationConfig appConfig) {
         registerTracer(jaeger, appConfig, new NoopMetricsFactory());
     }
 
-    synchronized public void registerTracerWithMetrics(JaegerConfig jaeger, ApplicationConfig appConfig) {
-        registerTracer(jaeger, appConfig, new QuarkusJaegerMetricsFactory());
+    /* RUNTIME_INIT */
+    public void registerTracerWithMpMetrics(JaegerConfig jaeger, ApplicationConfig appConfig) {
+        registerTracer(jaeger, appConfig, new QuarkusJaegerMpMetricsFactory());
     }
 
-    private void registerTracer(JaegerConfig jaeger, ApplicationConfig appConfig, MetricsFactory metricsFactory) {
+    /* RUNTIME_INIT */
+    public void registerTracerWithMicrometerMetrics(JaegerConfig jaeger, ApplicationConfig appConfig) {
+        registerTracer(jaeger, appConfig, new QuarkusJaegerMicrometerFactory());
+    }
+
+    private synchronized void registerTracer(JaegerConfig jaeger, ApplicationConfig appConfig, MetricsFactory metricsFactory) {
         if (!jaeger.serviceName.isPresent()) {
             if (appConfig.name.isPresent()) {
                 jaeger.serviceName = appConfig.name;
@@ -58,7 +65,7 @@ private void initTracerConfig(JaegerConfig jaeger) {
         initTracerProperty("JAEGER_AUTH_TOKEN", jaeger.authToken, token -> token);
         initTracerProperty("JAEGER_USER", jaeger.user, user -> user);
         initTracerProperty("JAEGER_PASSWORD", jaeger.password, pw -> pw);
-        initTracerProperty("JAEGER_AGENT_HOST", jaeger.agentHostPort, address -> address.getHostName());
+        initTracerProperty("JAEGER_AGENT_HOST", jaeger.agentHostPort, address -> address.getHostString());
         initTracerProperty("JAEGER_AGENT_PORT", jaeger.agentHostPort, address -> String.valueOf(address.getPort()));
         initTracerProperty("JAEGER_REPORTER_LOG_SPANS", jaeger.reporterLogSpans, log -> log.toString());
         initTracerProperty("JAEGER_REPORTER_MAX_QUEUE_SIZE", jaeger.reporterMaxQueueSize, size -> size.toString());
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
index 8e8ae138f46e7..db54cbbb2c84c 100644
--- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
@@ -16,17 +16,20 @@ public class MDCScope implements Scope {
      */
     private static final String TRACE_ID = "traceId";
     private static final String SPAN_ID = "spanId";
+    private static final String PARENT_ID = "parentId";
     private static final String SAMPLED = "sampled";
 
     private final Scope wrapped;
     private final Object originalTraceId;
     private final Object originalSpanId;
+    private final Object originalParentId;
     private final Object originalSampled;
 
     public MDCScope(Scope scope) {
         this.wrapped = scope;
         this.originalTraceId = MDC.get(TRACE_ID);
         this.originalSpanId = MDC.get(SPAN_ID);
+        this.originalParentId = MDC.get(PARENT_ID);
         this.originalSampled = MDC.get(SAMPLED);
         if (scope.span().context() instanceof JaegerSpanContext) {
             putContext((JaegerSpanContext) scope.span().context());
@@ -38,6 +41,7 @@ public void close() {
         wrapped.close();
         MDC.remove(TRACE_ID);
         MDC.remove(SPAN_ID);
+        MDC.remove(PARENT_ID);
         MDC.remove(SAMPLED);
 
         if (originalTraceId != null) {
@@ -46,6 +50,9 @@ public void close() {
         if (originalSpanId != null) {
             MDC.put(SPAN_ID, originalSpanId);
         }
+        if (originalParentId != null) {
+            MDC.put(PARENT_ID, originalParentId);
+        }
         if (originalSampled != null) {
             MDC.put(SAMPLED, originalSampled);
         }
@@ -58,7 +65,8 @@ public Span span() {
 
     protected void putContext(JaegerSpanContext spanContext) {
         MDC.put(TRACE_ID, spanContext.getTraceId());
-        MDC.put(SPAN_ID, String.format("%16x", spanContext.getSpanId()));
+        MDC.put(SPAN_ID, Long.toHexString(spanContext.getSpanId()));
+        MDC.put(PARENT_ID, Long.toHexString(spanContext.getParentId()));
         MDC.put(SAMPLED, Boolean.toString(spanContext.isSampled()));
     }
 }
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java
deleted file mode 100644
index 8280344c31544..0000000000000
--- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMetricsFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.quarkus.jaeger.runtime;
-
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.eclipse.microprofile.metrics.Metadata;
-import org.eclipse.microprofile.metrics.MetricID;
-import org.eclipse.microprofile.metrics.MetricRegistry;
-import org.eclipse.microprofile.metrics.MetricType;
-import org.eclipse.microprofile.metrics.Tag;
-
-import io.jaegertracing.internal.metrics.Counter;
-import io.jaegertracing.internal.metrics.Gauge;
-import io.jaegertracing.internal.metrics.Timer;
-import io.jaegertracing.spi.MetricsFactory;
-import io.smallrye.metrics.MetricRegistries;
-
-public class QuarkusJaegerMetricsFactory implements MetricsFactory {
-
-    MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.VENDOR);
-
-    @Override
-    public Counter createCounter(final String name, final Map<String, String> tags) {
-        org.eclipse.microprofile.metrics.Counter counter = registry.counter(name, toTagArray(tags));
-
-        return new Counter() {
-            @Override
-            public void inc(long delta) {
-                counter.inc(delta);
-            }
-        };
-    }
-
-    @Override
-    public Timer createTimer(final String name, final Map<String, String> tags) {
-        org.eclipse.microprofile.metrics.Timer timer = registry.timer(name, toTagArray(tags));
-
-        return new Timer() {
-            @Override
-            public void durationMicros(long time) {
-                timer.update(time, TimeUnit.MICROSECONDS);
-            }
-        };
-    }
-
-    @Override
-    public Gauge createGauge(final String name, final Map<String, String> tags) {
-        JaegerGauge gauge = (JaegerGauge) registry.getGauges().get(new MetricID(name, toTagArray(tags)));
-
-        return new Gauge() {
-            @Override
-            public void update(long amount) {
-                gauge.update(amount);
-            }
-        };
-    }
-
-    private Tag[] toTagArray(Map<String, String> tags) {
-        return tags.entrySet().stream()
-                .map(entry -> new Tag(entry.getKey(), entry.getValue()))
-                .toArray(Tag[]::new);
-    }
-
-    static Metadata meta(String name, MetricType type) {
-        return Metadata.builder()
-                .withName(name)
-                .withDisplayName(name)
-                .withType(type)
-                .withUnit("none")
-                .withDescription(name)
-                .reusable()
-                .build();
-    }
-
-    public static class JaegerGauge implements org.eclipse.microprofile.metrics.Gauge<Long> {
-        private AtomicLong value = new AtomicLong();
-
-        public void update(long value) {
-            this.value.set(value);
-        }
-
-        @Override
-        public Long getValue() {
-            return value.get();
-        }
-    }
-}
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMicrometerFactory.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMicrometerFactory.java
new file mode 100644
index 0000000000000..43d2c2843ee67
--- /dev/null
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMicrometerFactory.java
@@ -0,0 +1,62 @@
+package io.quarkus.jaeger.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import io.jaegertracing.internal.metrics.Counter;
+import io.jaegertracing.internal.metrics.Gauge;
+import io.jaegertracing.internal.metrics.Timer;
+import io.jaegertracing.spi.MetricsFactory;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tag;
+
+public class QuarkusJaegerMicrometerFactory implements MetricsFactory {
+    MeterRegistry registry = Metrics.globalRegistry;
+
+    @Override
+    public Counter createCounter(String name, Map<String, String> tags) {
+        return new Counter() {
+            private final io.micrometer.core.instrument.Counter counter = registry.counter(name, translateTags(tags));
+
+            @Override
+            public void inc(long amount) {
+                counter.increment(amount);
+            }
+        };
+    }
+
+    @Override
+    public Timer createTimer(String name, Map<String, String> tags) {
+        return new Timer() {
+            private final io.micrometer.core.instrument.Timer timer = registry.timer(name, translateTags(tags));
+
+            @Override
+            public void durationMicros(long amount) {
+                timer.record(amount, TimeUnit.MICROSECONDS);
+            }
+        };
+    }
+
+    @Override
+    public Gauge createGauge(String name, Map<String, String> tags) {
+        return new Gauge() {
+            private final Iterable<Tag> tagList = translateTags(tags);
+
+            @Override
+            public void update(long amount) {
+                registry.gauge(name, tagList, amount);
+            }
+        };
+    }
+
+    private Iterable<Tag> translateTags(Map<String, String> tags) {
+        final List<Tag> tagList = new ArrayList<Tag>(tags.size());
+        for (Map.Entry<String, String> tag : tags.entrySet()) {
+            tagList.add(Tag.of(tag.getKey(), tag.getValue()));
+        }
+        return tagList;
+    }
+}
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMpMetricsFactory.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMpMetricsFactory.java
new file mode 100644
index 0000000000000..f5b13f391a8cf
--- /dev/null
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerMpMetricsFactory.java
@@ -0,0 +1,137 @@
+package io.quarkus.jaeger.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.eclipse.microprofile.metrics.Metadata;
+import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry;
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.Tag;
+
+import io.jaegertracing.internal.metrics.Counter;
+import io.jaegertracing.internal.metrics.Gauge;
+import io.jaegertracing.internal.metrics.Timer;
+import io.jaegertracing.spi.MetricsFactory;
+import io.smallrye.metrics.MetricRegistries;
+
+public class QuarkusJaegerMpMetricsFactory implements MetricsFactory {
+
+    Map<MetricID, JaegerGauge> map = new HashMap<>();
+    MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.VENDOR);
+
+    /** RUNTIME_INIT from JaegerProcessor */
+    QuarkusJaegerMpMetricsFactory() {
+        registry.counter(meta("jaeger_tracer_baggage_restrictions_updates", MetricType.COUNTER),
+                new Tag("result", "err"));
+        registry.counter(meta("jaeger_tracer_baggage_restrictions_updates", MetricType.COUNTER),
+                new Tag("result", "ok"));
+        registry.counter(meta("jaeger_tracer_baggage_truncations", MetricType.COUNTER));
+        registry.counter(meta("jaeger_tracer_baggage_updates", MetricType.COUNTER),
+                new Tag("result", "err"));
+        registry.counter(meta("jaeger_tracer_baggage_updates", MetricType.COUNTER),
+                new Tag("result", "ok"));
+        registry.counter(meta("jaeger_tracer_finished_spans", MetricType.COUNTER));
+        registry.counter(meta("jaeger_tracer_reporter_spans", MetricType.COUNTER),
+                new Tag("result", "dropped"));
+        registry.counter(meta("jaeger_tracer_reporter_spans", MetricType.COUNTER),
+                new Tag("result", "err"));
+        registry.counter(meta("jaeger_tracer_reporter_spans", MetricType.COUNTER),
+                new Tag("result", "ok"));
+        registry.counter(meta("jaeger_tracer_sampler_queries", MetricType.COUNTER),
+                new Tag("result", "err"));
+        registry.counter(meta("jaeger_tracer_sampler_queries", MetricType.COUNTER),
+                new Tag("result", "ok"));
+        registry.counter(meta("jaeger_tracer_sampler_updates", MetricType.COUNTER),
+                new Tag("result", "ok"));
+        registry.counter(meta("jaeger_tracer_sampler_updates", MetricType.COUNTER),
+                new Tag("result", "err"));
+        registry.counter(meta("jaeger_tracer_span_context_decoding_errors", MetricType.COUNTER));
+        registry.counter(meta("jaeger_tracer_started_spans", MetricType.COUNTER),
+                new Tag("sampled", "n"));
+        registry.counter(meta("jaeger_tracer_started_spans", MetricType.COUNTER),
+                new Tag("sampled", "y"));
+        registry.counter(meta("jaeger_tracer_traces", MetricType.COUNTER),
+                new Tag("sampled", "y"), new Tag("state", "joined"));
+        registry.counter(meta("jaeger_tracer_traces", MetricType.COUNTER),
+                new Tag("sampled", "y"), new Tag("state", "started"));
+        registry.counter(meta("jaeger_tracer_traces", MetricType.COUNTER),
+                new Tag("sampled", "n"), new Tag("state", "joined"));
+        registry.counter(meta("jaeger_tracer_traces", MetricType.COUNTER),
+                new Tag("sampled", "n"), new Tag("state", "started"));
+
+        registry.register(meta("jaeger_tracer_reporter_queue_length", MetricType.GAUGE),
+                new JaegerGauge());
+    }
+
+    @Override
+    public Counter createCounter(final String name, final Map<String, String> tags) {
+        org.eclipse.microprofile.metrics.Counter counter = registry.counter(name, toTagArray(tags));
+
+        return new Counter() {
+            @Override
+            public void inc(long delta) {
+                counter.inc(delta);
+            }
+        };
+    }
+
+    @Override
+    public Timer createTimer(final String name, final Map<String, String> tags) {
+        org.eclipse.microprofile.metrics.Timer timer = registry.timer(name, toTagArray(tags));
+        return new Timer() {
+            @Override
+            public void durationMicros(long time) {
+                timer.update(time, TimeUnit.MICROSECONDS);
+            }
+        };
+    }
+
+    @Override
+    public Gauge createGauge(final String name, final Map<String, String> tags) {
+        JaegerGauge gauge = getGauge(name, tags);
+        return new Gauge() {
+            @Override
+            public void update(long amount) {
+                gauge.update(amount);
+            }
+        };
+    }
+
+    JaegerGauge getGauge(final String name, final Map<String, String> tags) {
+        MetricID id = new MetricID(name, toTagArray(tags));
+        return map.computeIfAbsent(id, x -> new JaegerGauge());
+    }
+
+    private Tag[] toTagArray(Map<String, String> tags) {
+        return tags.entrySet().stream()
+                .map(entry -> new Tag(entry.getKey(), entry.getValue()))
+                .toArray(Tag[]::new);
+    }
+
+    static Metadata meta(String name, MetricType type) {
+        return Metadata.builder()
+                .withName(name)
+                .withDisplayName(name)
+                .withType(type)
+                .withUnit("none")
+                .withDescription(name)
+                .reusable()
+                .build();
+    }
+
+    public static class JaegerGauge implements org.eclipse.microprofile.metrics.Gauge<Long> {
+        private AtomicLong value = new AtomicLong();
+
+        public void update(long value) {
+            this.value.set(value);
+        }
+
+        @Override
+        public Long getValue() {
+            return value.get();
+        }
+    }
+}
diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java
index 3a67636bf2b7b..ef1db1aba89c8 100644
--- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/QuarkusJaegerTracer.java
@@ -3,6 +3,7 @@
 import io.jaegertracing.Configuration;
 import io.jaegertracing.internal.JaegerTracer;
 import io.jaegertracing.spi.MetricsFactory;
+import io.opentracing.Scope;
 import io.opentracing.ScopeManager;
 import io.opentracing.Span;
 import io.opentracing.SpanContext;
@@ -17,6 +18,35 @@ public class QuarkusJaegerTracer implements Tracer {
     private boolean logTraceContext;
     private MetricsFactory metricsFactory;
 
+    private final ScopeManager scopeManager = new ScopeManager() {
+
+        volatile ScopeManager delegate;
+
+        @Override
+        public Scope activate(Span span, boolean b) {
+            return sm().activate(span, b);
+        }
+
+        @Override
+        public Scope active() {
+            if (delegate == null) {
+                return null;
+            }
+            return sm().active();
+        }
+
+        ScopeManager sm() {
+            if (delegate == null) {
+                synchronized (this) {
+                    if (delegate == null) {
+                        delegate = getScopeManager();
+                    }
+                }
+            }
+            return delegate;
+        }
+    };
+
     void setLogTraceContext(boolean logTraceContext) {
         this.logTraceContext = logTraceContext;
     }
@@ -44,7 +74,7 @@ private Tracer tracer() {
                     tracer = Configuration.fromEnv()
                             .withMetricsFactory(metricsFactory)
                             .getTracerBuilder()
-                            .withScopeManager(getScopeManager())
+                            .withScopeManager(scopeManager)
                             .build();
                 }
             }
@@ -77,7 +107,7 @@ public <C> SpanContext extract(Format<C> format, C carrier) {
 
     @Override
     public ScopeManager scopeManager() {
-        return tracer().scopeManager();
+        return scopeManager;
     }
 
     @Override
diff --git a/extensions/jaxb/deployment/pom.xml b/extensions/jaxb/deployment/pom.xml
index 93bd082fc80f2..3bfb4cd06e756 100644
--- a/extensions/jaxb/deployment/pom.xml
+++ b/extensions/jaxb/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jaxb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,6 +17,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxp-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jaxb</artifactId>
diff --git a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java
index 60335cadd8991..9b36faf67617a 100644
--- a/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java
+++ b/extensions/jaxb/deployment/src/main/java/io/quarkus/jaxb/deployment/JaxbProcessor.java
@@ -6,6 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -60,6 +61,7 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 
@@ -98,14 +100,7 @@ class JaxbProcessor {
             XmlJavaTypeAdapter.class,
             XmlJavaTypeAdapters.class);
 
-    private static final List<Class<?>> JAXB_REFLECTIVE_CLASSES = Arrays.asList(
-            XmlAccessOrder.class);
-
-    private static final List<String> JAXB_SERIALIZERS = Arrays.asList(
-            "html",
-            "text",
-            "xml",
-            "unknown");
+    private static final List<Class<?>> JAXB_REFLECTIVE_CLASSES = Collections.singletonList(XmlAccessOrder.class);
 
     private static final DotName XML_ROOT_ELEMENT = DotName.createSimple(XmlRootElement.class.getName());
     private static final DotName XML_TYPE = DotName.createSimple(XmlType.class.getName());
@@ -116,14 +111,9 @@ class JaxbProcessor {
 
     private static final List<DotName> JAXB_ROOT_ANNOTATIONS = Arrays.asList(XML_ROOT_ELEMENT, XML_TYPE, XML_REGISTRY);
 
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-    @Inject
-    BuildProducer<NativeImageResourceBuildItem> resource;
-    @Inject
-    BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle;
-    @Inject
-    BuildProducer<RuntimeInitializedClassBuildItem> runtimeClasses;
+    private static final List<DotName> IGNORE_TYPES = Collections
+            .singletonList(DotName.createSimple("javax.xml.datatype.XMLGregorianCalendar"));
+
     @Inject
     ApplicationArchivesBuildItem applicationArchivesBuildItem;
 
@@ -133,7 +123,11 @@ void processAnnotationsAndIndexFiles(
             BuildProducer<ServiceProviderBuildItem> providerItem,
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxyDefinitions,
             CombinedIndexBuildItem combinedIndexBuildItem,
-            List<JaxbFileRootBuildItem> fileRoots) {
+            List<JaxbFileRootBuildItem> fileRoots,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<NativeImageResourceBuildItem> resource,
+            BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle,
+            BuildProducer<RuntimeInitializedClassBuildItem> runtimeClasses) {
 
         IndexView index = combinedIndexBuildItem.getIndex();
 
@@ -144,7 +138,7 @@ void processAnnotationsAndIndexFiles(
             for (AnnotationInstance jaxbRootAnnotationInstance : index
                     .getAnnotations(jaxbRootAnnotation)) {
                 if (jaxbRootAnnotationInstance.target().kind() == Kind.CLASS) {
-                    addReflectiveClass(true, true,
+                    addReflectiveClass(reflectiveClass, true, true,
                             jaxbRootAnnotationInstance.target().asClass().name().toString());
                     jaxbRootAnnotationsDetected = true;
                 }
@@ -170,79 +164,75 @@ void processAnnotationsAndIndexFiles(
         }
 
         if (!index.getAnnotations(XML_ANY_ELEMENT).isEmpty()) {
-            addReflectiveClass(false, false, "javax.xml.bind.annotation.W3CDomHandler");
+            addReflectiveClass(reflectiveClass, false, false, "javax.xml.bind.annotation.W3CDomHandler");
         }
 
         JAXB_ANNOTATIONS.stream()
                 .map(Class::getName)
                 .forEach(className -> {
                     proxyDefinitions.produce(new NativeImageProxyDefinitionBuildItem(className, Locatable.class.getName()));
-                    addReflectiveClass(true, false, className);
+                    addReflectiveClass(reflectiveClass, true, false, className);
                 });
 
         for (JaxbFileRootBuildItem i : fileRoots) {
             try (Stream<Path> stream = iterateResources(i.getFileRoot())) {
                 stream.filter(p -> p.getFileName().toString().equals("jaxb.index"))
-                        .forEach(this::handleJaxbFile);
+                        .forEach(p1 -> handleJaxbFile(p1, resource, reflectiveClass));
             }
         }
     }
 
+    @BuildStep
+    void ignoreWarnings(BuildProducer<ReflectiveHierarchyIgnoreWarningBuildItem> ignoreWarningProducer) {
+        for (DotName type : IGNORE_TYPES) {
+            ignoreWarningProducer.produce(new ReflectiveHierarchyIgnoreWarningBuildItem(type));
+        }
+    }
+
     @BuildStep
     void registerClasses(
             BuildProducer<NativeImageSystemPropertyBuildItem> nativeImageProps,
-            BuildProducer<ServiceProviderBuildItem> providerItem) {
-
-        addReflectiveClass(false, false, "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
-        addReflectiveClass(false, false, "com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl");
-        addReflectiveClass(false, false, "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
-        addReflectiveClass(false, false, "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl");
-        addReflectiveClass(true, false, "com.sun.xml.bind.v2.ContextFactory");
-        addReflectiveClass(true, false, "com.sun.xml.internal.bind.v2.ContextFactory");
-
-        addReflectiveClass(true, false, "com.sun.xml.internal.stream.XMLInputFactoryImpl");
-        addReflectiveClass(true, false, "com.sun.xml.internal.stream.XMLOutputFactoryImpl");
-        addReflectiveClass(true, false, "com.sun.org.apache.xpath.internal.functions.FuncNot");
-        addReflectiveClass(true, false, "com.sun.org.apache.xerces.internal.impl.dv.xs.SchemaDVFactoryImpl");
-
-        addResourceBundle("javax.xml.bind.Messages");
-        addResourceBundle("javax.xml.bind.helpers.Messages");
-        addResourceBundle("com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages");
-        addResourceBundle("com.sun.org.apache.xml.internal.res.XMLErrorResources");
-        addResourceBundle("com.sun.org.apache.xerces.internal.impl.msg.XMLMessages");
-        addResourceBundle("com.sun.org.apache.xerces.internal.impl.msg.XMLSchemaMessages");
-        addResourceBundle("com.sun.org.apache.xerces.internal.impl.xpath.regex.message");
+            BuildProducer<ServiceProviderBuildItem> providerItem, final BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            final BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle) {
+
+        addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.bind.v2.ContextFactory");
+        addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.internal.bind.v2.ContextFactory");
+
+        addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.internal.stream.XMLInputFactoryImpl");
+        addReflectiveClass(reflectiveClass, true, false, "com.sun.xml.internal.stream.XMLOutputFactoryImpl");
+        addReflectiveClass(reflectiveClass, true, false, "com.sun.org.apache.xpath.internal.functions.FuncNot");
+        addReflectiveClass(reflectiveClass, true, false, "com.sun.org.apache.xerces.internal.impl.dv.xs.SchemaDVFactoryImpl");
+
+        addResourceBundle(resourceBundle, "javax.xml.bind.Messages");
+        addResourceBundle(resourceBundle, "javax.xml.bind.helpers.Messages");
 
         nativeImageProps
                 .produce(new NativeImageSystemPropertyBuildItem("com.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize", "true"));
 
         JAXB_REFLECTIVE_CLASSES.stream()
                 .map(Class::getName)
-                .forEach(className -> addReflectiveClass(true, false, className));
-
-        JAXB_SERIALIZERS.stream()
-                .map(s -> "com/sun/org/apache/xml/internal/serializer/output_" + s + ".properties")
-                .forEach(this::addResource);
+                .forEach(className -> addReflectiveClass(reflectiveClass, true, false, className));
 
         providerItem
                 .produce(new ServiceProviderBuildItem(JAXBContext.class.getName(), "com.sun.xml.bind.v2.ContextFactory"));
     }
 
-    private void handleJaxbFile(Path p) {
+    private void handleJaxbFile(Path p, BuildProducer<NativeImageResourceBuildItem> resource,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         try {
             String path = p.toAbsolutePath().toString().substring(1);
             String pkg = p.toAbsolutePath().getParent().toString().substring(1).replace("/", ".") + ".";
 
-            addResource(path);
+            resource.produce(new NativeImageResourceBuildItem(path));
 
             for (String line : Files.readAllLines(p)) {
                 line = line.trim();
                 if (!line.isEmpty() && !line.startsWith("#")) {
                     String clazz = pkg + line;
-                    Class<?> cl = Class.forName(clazz);
+                    Class<?> cl = Class.forName(clazz, false, Thread.currentThread().getContextClassLoader());
 
                     while (cl != Object.class) {
-                        addReflectiveClass(true, true, cl.getName());
+                        addReflectiveClass(reflectiveClass, true, true, cl.getName());
                         cl = cl.getSuperclass();
                     }
                 }
@@ -268,15 +258,12 @@ public static Stream<Path> safeWalk(Path p) {
         }
     }
 
-    private void addResource(String r) {
-        resource.produce(new NativeImageResourceBuildItem(r));
-    }
-
-    private void addReflectiveClass(boolean methods, boolean fields, String... className) {
+    private void addReflectiveClass(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, boolean methods, boolean fields,
+            String... className) {
         reflectiveClass.produce(new ReflectiveClassBuildItem(methods, fields, className));
     }
 
-    private void addResourceBundle(String bundle) {
+    private void addResourceBundle(BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle, String bundle) {
         resourceBundle.produce(new NativeImageResourceBundleBuildItem(bundle));
     }
 }
diff --git a/extensions/jaxb/pom.xml b/extensions/jaxb/pom.xml
index 8724e96aaad8d..d46bc6c7af1e2 100644
--- a/extensions/jaxb/pom.xml
+++ b/extensions/jaxb/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jaxb/runtime/pom.xml b/extensions/jaxb/runtime/pom.xml
index 5a6c950382cd6..40254dcda7176 100644
--- a/extensions/jaxb/runtime/pom.xml
+++ b/extensions/jaxb/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jaxb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,11 +16,16 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxp</artifactId>
+        </dependency>
         <!-- Don't rely on the JDK impl to be present as it's not present in JDK 11+ -->
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
diff --git a/extensions/jaxp/deployment/pom.xml b/extensions/jaxp/deployment/pom.xml
new file mode 100644
index 0000000000000..7d03c794aa535
--- /dev/null
+++ b/extensions/jaxp/deployment/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-jaxp-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jaxp-deployment</artifactId>
+    <name>Quarkus - JAXP - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxp</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/jaxp/deployment/src/main/java/io/quarkus/jaxp/deployment/JaxpProcessor.java b/extensions/jaxp/deployment/src/main/java/io/quarkus/jaxp/deployment/JaxpProcessor.java
new file mode 100644
index 0000000000000..152b93015fef6
--- /dev/null
+++ b/extensions/jaxp/deployment/src/main/java/io/quarkus/jaxp/deployment/JaxpProcessor.java
@@ -0,0 +1,58 @@
+package io.quarkus.jaxp.deployment;
+
+import java.util.stream.Stream;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+
+class JaxpProcessor {
+
+    @BuildStep
+    void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false,
+                "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
+                "com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl",
+                "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl",
+                "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
+                "com.sun.org.apache.xerces.internal.parsers.SAXParser",
+                "com.sun.org.apache.xml.internal.utils.FastStringBuffer"));
+
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
+                "com.sun.xml.internal.stream.XMLInputFactoryImpl",
+                "com.sun.xml.internal.stream.XMLOutputFactoryImpl",
+                "com.sun.org.apache.xpath.internal.functions.FuncNot",
+                "com.sun.org.apache.xerces.internal.impl.dv.xs.SchemaDVFactoryImpl",
+                "javax.xml.namespace.QName"));
+    }
+
+    @BuildStep
+    void resourceBundles(BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle) {
+        Stream.of(
+                "com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages",
+                "com.sun.org.apache.xml.internal.res.XMLErrorResources",
+                "com.sun.org.apache.xerces.internal.impl.msg.SAXMessages",
+                "com.sun.org.apache.xerces.internal.impl.msg.XMLMessages",
+                "com.sun.org.apache.xerces.internal.impl.msg.XMLSchemaMessages",
+                "com.sun.org.apache.xerces.internal.impl.xpath.regex.message")
+                .map(NativeImageResourceBundleBuildItem::new)
+                .forEach(resourceBundle::produce);
+    }
+
+    @BuildStep
+    void resources(BuildProducer<NativeImageResourceBuildItem> resource) {
+
+        Stream.of(
+                "html",
+                "text",
+                "xml",
+                "unknown")
+                .map(s -> "com/sun/org/apache/xml/internal/serializer/output_" + s + ".properties")
+                .map(NativeImageResourceBuildItem::new)
+                .forEach(resource::produce);
+
+    }
+
+}
diff --git a/extensions/jaxp/pom.xml b/extensions/jaxp/pom.xml
new file mode 100644
index 0000000000000..56fdebd5b7be1
--- /dev/null
+++ b/extensions/jaxp/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jaxp-parent</artifactId>
+    <name>Quarkus - JAXP</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/jaxp/runtime/pom.xml b/extensions/jaxp/runtime/pom.xml
new file mode 100644
index 0000000000000..25bdd274b7d86
--- /dev/null
+++ b/extensions/jaxp/runtime/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-jaxp-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jaxp</artifactId>
+    <name>Quarkus - JAXP - Runtime</name>
+    <description>Java API for XML Processing</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..f92a9c73b94b6
--- /dev/null
+++ b/extensions/jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,10 @@
+---
+name: "JAXP"
+metadata:
+  keywords:
+  - "jaxp"
+  - "xml"
+  categories:
+  - "serialization"
+  status: "stable"
+  unlisted: true
diff --git a/extensions/jdbc/jdbc-db2/deployment/pom.xml b/extensions/jdbc/jdbc-db2/deployment/pom.xml
index 9bfe433e2ca74..9e3d5bc84c245 100644
--- a/extensions/jdbc/jdbc-db2/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-db2/deployment/pom.xml
@@ -15,20 +15,24 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
+            <artifactId>quarkus-agroal-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-agroal-spi</artifactId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-db2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-db2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JDBCDB2Processor.java b/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JDBCDB2Processor.java
index 6d75ad8c51242..aed66cdfac0b5 100644
--- a/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JDBCDB2Processor.java
+++ b/extensions/jdbc/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JDBCDB2Processor.java
@@ -1,9 +1,11 @@
 package io.quarkus.jdbc.db2.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -13,7 +15,9 @@
 import io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.jdbc.db2.runtime.DB2AgroalConnectionConfigurer;
+import io.quarkus.jdbc.db2.runtime.DB2ServiceBindingConverter;
 
 public class JDBCDB2Processor {
 
@@ -29,6 +33,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 "com.ibm.db2.jcc.DB2XADataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.DB2);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -56,4 +65,16 @@ NativeImageEnableAllCharsetsBuildItem enableAllCharsets() {
         // When connecting to DB2 on z/OS the Cp037 charset is required
         return new NativeImageEnableAllCharsetsBuildItem();
     }
+
+    @BuildStep
+    void registerServiceBinding(Capabilities capabilities,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider,
+            BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        if (capabilities.isPresent(Capability.KUBERNETES_SERVICE_BINDING)) {
+            serviceProvider.produce(
+                    new ServiceProviderBuildItem("io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter",
+                            DB2ServiceBindingConverter.class.getName()));
+        }
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.DB2));
+    }
 }
diff --git a/extensions/jdbc/jdbc-db2/runtime/pom.xml b/extensions/jdbc/jdbc-db2/runtime/pom.xml
index c3f92096be0df..249f8e505b591 100644
--- a/extensions/jdbc/jdbc-db2/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-db2/runtime/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>quarkus-jdbc-db2</artifactId>
     <name>Quarkus - JDBC - DB2 - Runtime</name>
 	<description>Connect to the DB2 database via JDBC</description>
-	
+
     <dependencies>
         <dependency>
             <groupId>com.ibm.db2</groupId>
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -30,6 +30,12 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -38,6 +44,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>com.ibm.db2:jcc</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-db2/runtime/src/main/java/io/quarkus/jdbc/db2/runtime/DB2ServiceBindingConverter.java b/extensions/jdbc/jdbc-db2/runtime/src/main/java/io/quarkus/jdbc/db2/runtime/DB2ServiceBindingConverter.java
new file mode 100644
index 0000000000000..85fb7cfcec8e6
--- /dev/null
+++ b/extensions/jdbc/jdbc-db2/runtime/src/main/java/io/quarkus/jdbc/db2/runtime/DB2ServiceBindingConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.jdbc.db2.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.kubernetes.service.binding.runtime.JdbcDatasourceUtil;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBinding;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConfigSource;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter;
+
+public class DB2ServiceBindingConverter implements ServiceBindingConverter {
+
+    @Override
+    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+        return JdbcDatasourceUtil.convert(serviceBindings, "db2");
+    }
+}
diff --git a/extensions/jdbc/jdbc-db2/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/extensions/jdbc/jdbc-db2/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
new file mode 100644
index 0000000000000..7f6f81b0fdf36
--- /dev/null
+++ b/extensions/jdbc/jdbc-db2/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.jdbc.db2.runtime.DB2ServiceBindingConverter
diff --git a/extensions/jdbc/jdbc-derby/deployment/pom.xml b/extensions/jdbc/jdbc-derby/deployment/pom.xml
index 60ac6c285bfa8..3b3576eff2d05 100644
--- a/extensions/jdbc/jdbc-derby/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-derby/deployment/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -29,6 +29,20 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-derby</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-derby</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jdbc/jdbc-derby/deployment/src/main/java/io/quarkus/jdbc/derby/deployment/JDBCDerbyProcessor.java b/extensions/jdbc/jdbc-derby/deployment/src/main/java/io/quarkus/jdbc/derby/deployment/JDBCDerbyProcessor.java
index ab25e8f710528..4a190b2c73c75 100644
--- a/extensions/jdbc/jdbc-derby/deployment/src/main/java/io/quarkus/jdbc/derby/deployment/JDBCDerbyProcessor.java
+++ b/extensions/jdbc/jdbc-derby/deployment/src/main/java/io/quarkus/jdbc/derby/deployment/JDBCDerbyProcessor.java
@@ -1,9 +1,11 @@
 package io.quarkus.jdbc.derby.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -28,6 +30,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 "org.apache.derby.jdbc.ClientXADataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.DERBY);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -47,4 +54,8 @@ void registerDriverForReflection(BuildProducer<ReflectiveClassBuildItem> reflect
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, org.apache.derby.jdbc.ClientDriver.class.getName()));
     }
 
+    @BuildStep
+    void registerDefaultDbType(BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.DERBY));
+    }
 }
diff --git a/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java b/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java
new file mode 100644
index 0000000000000..b57cf9cdcba68
--- /dev/null
+++ b/extensions/jdbc/jdbc-derby/deployment/src/test/java/io/quarkus/jdbc/derby/deployment/DevServicesDerbyDatasourceTestCase.java
@@ -0,0 +1,51 @@
+package io.quarkus.jdbc.derby.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DevServicesDerbyDatasourceTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class);
+                }
+            });
+
+    @Inject
+    AgroalDataSource dataSource;
+
+    @Test
+    public void testDatasource() throws Exception {
+        AgroalConnectionPoolConfiguration configuration = null;
+
+        try {
+            configuration = dataSource.getConfiguration().connectionPoolConfiguration();
+        } catch (NullPointerException e) {
+            // we catch the NPE here as we have a proxycd  and we can't test dataSource directly
+            fail("Datasource should not be null");
+        }
+        assertTrue(configuration.connectionFactoryConfiguration().jdbcUrl().contains("jdbc:derby:"));
+        assertEquals(20, configuration.maxSize());
+
+        try (Connection connection = dataSource.getConnection()) {
+        }
+    }
+}
diff --git a/extensions/jdbc/jdbc-derby/runtime/pom.xml b/extensions/jdbc/jdbc-derby/runtime/pom.xml
index 4e6ca6c216488..98aea400d68e2 100644
--- a/extensions/jdbc/jdbc-derby/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-derby/runtime/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -29,6 +29,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -37,6 +38,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.apache.derby:derbyclient</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-h2/deployment/pom.xml b/extensions/jdbc/jdbc-h2/deployment/pom.xml
index 96eb9b55fb9cd..b40927eefcb7f 100644
--- a/extensions/jdbc/jdbc-h2/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-h2/deployment/pom.xml
@@ -15,11 +15,15 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-h2</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java b/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
index 267e60034311b..6b942aa719835 100644
--- a/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
+++ b/extensions/jdbc/jdbc-h2/deployment/src/main/java/io/quarkus/jdbc/h2/deployment/JDBCH2Processor.java
@@ -1,9 +1,11 @@
 package io.quarkus.jdbc.h2.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -27,6 +29,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 .produce(new JdbcDriverBuildItem(DatabaseKind.H2, "org.h2.Driver", "org.h2.jdbcx.JdbcDataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.H2);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -37,4 +44,9 @@ void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additional
                     .build());
         }
     }
+
+    @BuildStep
+    void registerDefaultDbType(BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.H2));
+    }
 }
diff --git a/extensions/jdbc/jdbc-h2/runtime/pom.xml b/extensions/jdbc/jdbc-h2/runtime/pom.xml
index 9a58c0ae68d46..2d9da9183b185 100644
--- a/extensions/jdbc/jdbc-h2/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-h2/runtime/pom.xml
@@ -13,6 +13,10 @@
     <name>Quarkus - JDBC - H2 - Runtime</name>
     <description>Connect to the H2 database via JDBC</description>
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -35,6 +39,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -43,6 +48,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>com.h2database:h2</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mariadb/deployment/pom.xml b/extensions/jdbc/jdbc-mariadb/deployment/pom.xml
index 20e38330aa127..60f430220ca28 100644
--- a/extensions/jdbc/jdbc-mariadb/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-mariadb/deployment/pom.xml
@@ -15,11 +15,11 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -29,6 +29,20 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-mariadb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-mariadb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -45,6 +59,36 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+
+
+    <profiles>
+        <profile>
+            <id>test-devservices</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java b/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java
index b79f5fb0be7aa..301e106f5afb2 100644
--- a/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java
+++ b/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java
@@ -1,9 +1,11 @@
 package io.quarkus.jdbc.mariadb.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -11,7 +13,9 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.jdbc.mariadb.runtime.MariaDBAgroalConnectionConfigurer;
+import io.quarkus.jdbc.mariadb.runtime.MariaDBServiceBindingConverter;
 
 public class JDBCMariaDBProcessor {
 
@@ -27,6 +31,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 "org.mariadb.jdbc.MySQLDataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.MARIADB);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -37,4 +46,16 @@ void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additional
                     .build());
         }
     }
+
+    @BuildStep
+    void registerServiceBinding(Capabilities capabilities,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider,
+            BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        if (capabilities.isPresent(Capability.KUBERNETES_SERVICE_BINDING)) {
+            serviceProvider.produce(
+                    new ServiceProviderBuildItem("io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter",
+                            MariaDBServiceBindingConverter.class.getName()));
+        }
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.MARIADB));
+    }
 }
diff --git a/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/MariaDBJDBCReflections.java b/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/MariaDBJDBCReflections.java
index 4e9d5fdea0703..fe6934edd6c24 100644
--- a/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/MariaDBJDBCReflections.java
+++ b/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/MariaDBJDBCReflections.java
@@ -23,6 +23,7 @@ void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
     void runtimeInit(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized) {
         //MastersSlavesListener starts threads in DynamicSizedSchedulerImpl which is disallowed during build time in GraalVM
         runtimeInitialized
-                .produce(new RuntimeInitializedClassBuildItem("org.mariadb.jdbc.internal.failover.impl.MastersSlavesListener"));
+                .produce(new RuntimeInitializedClassBuildItem(
+                        "org.mariadb.jdbc.internal.failover.impl.MastersReplicasListener"));
     }
 }
diff --git a/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java b/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java
new file mode 100644
index 0000000000000..ebf9a26b1a578
--- /dev/null
+++ b/extensions/jdbc/jdbc-mariadb/deployment/src/test/java/io/quarkus/jdbc/mariadb/deployment/DevServicesMariaDBDatasourceTestCase.java
@@ -0,0 +1,52 @@
+package io.quarkus.jdbc.mariadb.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DevServicesMariaDBDatasourceTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class);
+                }
+            });
+
+    @Inject
+    AgroalDataSource dataSource;
+
+    @Test
+    public void testDatasource() throws Exception {
+        AgroalConnectionPoolConfiguration configuration = null;
+
+        try {
+            configuration = dataSource.getConfiguration().connectionPoolConfiguration();
+        } catch (NullPointerException e) {
+            // we catch the NPE here as we have a proxycd  and we can't test dataSource directly
+            fail("Datasource should not be null");
+        }
+        assertTrue(configuration.connectionFactoryConfiguration().jdbcUrl().contains("jdbc:mariadb:"));
+        assertEquals("quarkus", configuration.connectionFactoryConfiguration().principal().getName());
+        assertEquals(20, configuration.maxSize());
+
+        try (Connection connection = dataSource.getConnection()) {
+        }
+    }
+}
diff --git a/extensions/jdbc/jdbc-mariadb/runtime/pom.xml b/extensions/jdbc/jdbc-mariadb/runtime/pom.xml
index 9eb9ed6a362b5..774d6df57e8cd 100644
--- a/extensions/jdbc/jdbc-mariadb/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-mariadb/runtime/pom.xml
@@ -13,6 +13,10 @@
     <name>Quarkus - JDBC - MariaDB - Runtime</name>
     <description>Connect to the MariaDB database via JDBC</description>
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>
@@ -25,6 +29,12 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -33,6 +43,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.mariadb.jdbc:mariadb-java-client</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mariadb/runtime/src/main/java/io/quarkus/jdbc/mariadb/runtime/MariaDBServiceBindingConverter.java b/extensions/jdbc/jdbc-mariadb/runtime/src/main/java/io/quarkus/jdbc/mariadb/runtime/MariaDBServiceBindingConverter.java
new file mode 100644
index 0000000000000..e470fc358d971
--- /dev/null
+++ b/extensions/jdbc/jdbc-mariadb/runtime/src/main/java/io/quarkus/jdbc/mariadb/runtime/MariaDBServiceBindingConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.jdbc.mariadb.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.kubernetes.service.binding.runtime.JdbcDatasourceUtil;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBinding;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConfigSource;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter;
+
+public class MariaDBServiceBindingConverter implements ServiceBindingConverter {
+
+    @Override
+    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+        return JdbcDatasourceUtil.convert(serviceBindings, "mysql", "mariadb");
+    }
+}
diff --git a/extensions/jdbc/jdbc-mariadb/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/extensions/jdbc/jdbc-mariadb/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
new file mode 100644
index 0000000000000..0eef55d7b48d7
--- /dev/null
+++ b/extensions/jdbc/jdbc-mariadb/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.jdbc.mariadb.runtime.MariaDBServiceBindingConverter
diff --git a/extensions/jdbc/jdbc-mssql/deployment/pom.xml b/extensions/jdbc/jdbc-mssql/deployment/pom.xml
index 091ecb2a6fbb6..d156151ecaf9e 100644
--- a/extensions/jdbc/jdbc-mssql/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-mssql/deployment/pom.xml
@@ -15,20 +15,24 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
+            <artifactId>quarkus-agroal-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-agroal-spi</artifactId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-mssql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-mssql</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jdbc/jdbc-mssql/deployment/src/main/java/io/quarkus/jdbc/mssql/deployment/MsSQLProcessor.java b/extensions/jdbc/jdbc-mssql/deployment/src/main/java/io/quarkus/jdbc/mssql/deployment/MsSQLProcessor.java
index 60d5b05f79ebf..0c00c19eb2956 100644
--- a/extensions/jdbc/jdbc-mssql/deployment/src/main/java/io/quarkus/jdbc/mssql/deployment/MsSQLProcessor.java
+++ b/extensions/jdbc/jdbc-mssql/deployment/src/main/java/io/quarkus/jdbc/mssql/deployment/MsSQLProcessor.java
@@ -1,9 +1,11 @@
 package io.quarkus.jdbc.mssql.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -14,7 +16,9 @@
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.jdbc.mssql.runtime.MsSQLAgroalConnectionConfigurer;
+import io.quarkus.jdbc.mssql.runtime.MsSQLServiceBindingConverter;
 
 public class MsSQLProcessor {
 
@@ -30,6 +34,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 "com.microsoft.sqlserver.jdbc.SQLServerXADataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.MSSQL);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -52,4 +61,16 @@ void nativeResources(BuildProducer<NativeImageResourceBundleBuildItem> resources
     public RuntimeInitializedClassBuildItem runtimeInitializedClass() {
         return new RuntimeInitializedClassBuildItem("com.microsoft.sqlserver.jdbc.KerbAuthentication");
     }
+
+    @BuildStep
+    void registerServiceBinding(Capabilities capabilities,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider,
+            BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        if (capabilities.isPresent(Capability.KUBERNETES_SERVICE_BINDING)) {
+            serviceProvider.produce(
+                    new ServiceProviderBuildItem("io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter",
+                            MsSQLServiceBindingConverter.class.getName()));
+        }
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.MSSQL));
+    }
 }
diff --git a/extensions/jdbc/jdbc-mssql/runtime/pom.xml b/extensions/jdbc/jdbc-mssql/runtime/pom.xml
index 6bdd261d734ad..ee5361d3406a0 100644
--- a/extensions/jdbc/jdbc-mssql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-mssql/runtime/pom.xml
@@ -14,6 +14,10 @@
     <description>Connect to the Microsoft SQL Server database via JDBC</description>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>
@@ -30,7 +34,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>adal4j</artifactId>
-            <version>1.6.3</version>
+            <version>1.6.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.commons</groupId>
@@ -73,15 +77,25 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
     <build>
-        <!-- Mark this as a runtime dependency, so to make sure it's included on the final classpath during native-image -->
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>com.microsoft.sqlserver:mssql-jdbc</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/MsSQLServiceBindingConverter.java b/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/MsSQLServiceBindingConverter.java
new file mode 100644
index 0000000000000..fca6c6a2626a4
--- /dev/null
+++ b/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/MsSQLServiceBindingConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.jdbc.mssql.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.kubernetes.service.binding.runtime.JdbcDatasourceUtil;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBinding;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConfigSource;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter;
+
+public class MsSQLServiceBindingConverter implements ServiceBindingConverter {
+
+    @Override
+    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+        return JdbcDatasourceUtil.convert(serviceBindings, "sqlserver");
+    }
+}
diff --git a/extensions/jdbc/jdbc-mssql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/extensions/jdbc/jdbc-mssql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
new file mode 100644
index 0000000000000..d6ea872a301a0
--- /dev/null
+++ b/extensions/jdbc/jdbc-mssql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.jdbc.mssql.runtime.MsSQLServiceBindingConverter
diff --git a/extensions/jdbc/jdbc-mysql/deployment/pom.xml b/extensions/jdbc/jdbc-mysql/deployment/pom.xml
index fe4f807e89723..da17a8b1e41f1 100644
--- a/extensions/jdbc/jdbc-mysql/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-mysql/deployment/pom.xml
@@ -15,20 +15,34 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
+            <artifactId>quarkus-agroal-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-agroal-spi</artifactId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-mysql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-mysql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -45,6 +59,35 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>test-devservices</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/JDBCMySQLProcessor.java b/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/JDBCMySQLProcessor.java
index 9947e8b332499..b11b7945f97e2 100644
--- a/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/JDBCMySQLProcessor.java
+++ b/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/JDBCMySQLProcessor.java
@@ -19,25 +19,29 @@
 import com.mysql.cj.jdbc.result.ResultSetInternalMethods;
 import com.mysql.cj.protocol.Resultset;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem;
 import io.quarkus.deployment.builditem.NativeImageEnableAllTimeZonesBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 import io.quarkus.jdbc.mysql.runtime.MySQLAgroalConnectionConfigurer;
-import io.quarkus.jdbc.mysql.runtime.MySQLRecorder;
+import io.quarkus.jdbc.mysql.runtime.MySQLServiceBindingConverter;
 
 public class JDBCMySQLProcessor {
 
@@ -53,6 +57,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 "com.mysql.cj.jdbc.MysqlXADataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.MYSQL);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -64,12 +73,6 @@ void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additional
         }
     }
 
-    @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    void abandonedConnectionCleanUp(MySQLRecorder recorder) {
-        recorder.startAbandonedConnectionCleanup();
-    }
-
     @BuildStep
     NativeImageResourceBuildItem resource() {
         return new NativeImageResourceBuildItem("com/mysql/cj/util/TimeZoneMapping.properties");
@@ -85,6 +88,16 @@ NativeImageEnableAllTimeZonesBuildItem enableAllTimeZones() {
         return new NativeImageEnableAllTimeZonesBuildItem();
     }
 
+    @BuildStep
+    NativeImageSystemPropertyBuildItem disableAbandonedConnectionCleanUpInNativeMode() {
+        return new NativeImageSystemPropertyBuildItem("com.mysql.cj.disableAbandonedConnectionCleanup", "true");
+    }
+
+    @BuildStep(onlyIfNot = NativeOrNativeSourcesBuild.class)
+    SystemPropertyBuildItem disableAbandonedConnectionCleanUpInJVMMode() {
+        return new SystemPropertyBuildItem("com.mysql.cj.disableAbandonedConnectionCleanup", "true");
+    }
+
     @BuildStep
     List<NativeImageProxyDefinitionBuildItem> registerProxies() {
         List<NativeImageProxyDefinitionBuildItem> proxies = new ArrayList<>();
@@ -110,4 +123,16 @@ List<NativeImageProxyDefinitionBuildItem> registerProxies() {
                         WarningListener.class.getName(), Resultset.class.getName()));
         return proxies;
     }
+
+    @BuildStep
+    void registerServiceBinding(Capabilities capabilities,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider,
+            BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        if (capabilities.isPresent(Capability.KUBERNETES_SERVICE_BINDING)) {
+            serviceProvider.produce(
+                    new ServiceProviderBuildItem("io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter",
+                            MySQLServiceBindingConverter.class.getName()));
+        }
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.MYSQL));
+    }
 }
diff --git a/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/MySQLJDBCReflections.java b/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/MySQLJDBCReflections.java
index 4dab5c595276c..073e979d9995c 100644
--- a/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/MySQLJDBCReflections.java
+++ b/extensions/jdbc/jdbc-mysql/deployment/src/main/java/io/quarkus/jdbc/mysql/deployment/MySQLJDBCReflections.java
@@ -41,7 +41,6 @@
 import com.mysql.cj.jdbc.ha.NdbLoadBalanceExceptionChecker;
 import com.mysql.cj.jdbc.ha.StandardLoadBalanceExceptionChecker;
 import com.mysql.cj.log.StandardLogger;
-import com.mysql.cj.protocol.AsyncSocketFactory;
 import com.mysql.cj.protocol.NamedPipeSocketFactory;
 import com.mysql.cj.protocol.SocksProxySocketFactory;
 import com.mysql.cj.protocol.StandardSocketFactory;
@@ -78,6 +77,7 @@ void registerDriverForReflection(BuildProducer<ReflectiveClassBuildItem> reflect
                 com.mysql.cj.jdbc.ha.LoadBalancedAutoCommitInterceptor.class.getName()));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, StandardLogger.class.getName()));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, Wrapper.class.getName()));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, com.mysql.cj.jdbc.MysqlDataSource.class.getName()));
     }
 
     @BuildStep
@@ -85,7 +85,6 @@ void registerSocketFactoryForReflection(BuildProducer<ReflectiveClassBuildItem>
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, NamedPipeSocketFactory.class.getName()));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, StandardSocketFactory.class.getName()));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, SocksProxySocketFactory.class.getName()));
-        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, AsyncSocketFactory.class.getName()));
     }
 
     @BuildStep
diff --git a/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java b/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java
new file mode 100644
index 0000000000000..1a7e3bf73b07b
--- /dev/null
+++ b/extensions/jdbc/jdbc-mysql/deployment/src/test/java/io/quarkus/jdbc/mysql/deployment/DevServicesMySQLDatasourceTestCase.java
@@ -0,0 +1,52 @@
+package io.quarkus.jdbc.mysql.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DevServicesMySQLDatasourceTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class);
+                }
+            });
+
+    @Inject
+    AgroalDataSource dataSource;
+
+    @Test
+    public void testDatasource() throws Exception {
+        AgroalConnectionPoolConfiguration configuration = null;
+
+        try {
+            configuration = dataSource.getConfiguration().connectionPoolConfiguration();
+        } catch (NullPointerException e) {
+            // we catch the NPE here as we have a proxycd  and we can't test dataSource directly
+            fail("Datasource should not be null");
+        }
+        assertTrue(configuration.connectionFactoryConfiguration().jdbcUrl().contains("jdbc:mysql:"));
+        assertEquals("quarkus", configuration.connectionFactoryConfiguration().principal().getName());
+        assertEquals(20, configuration.maxSize());
+
+        try (Connection connection = dataSource.getConnection()) {
+        }
+    }
+}
diff --git a/extensions/jdbc/jdbc-mysql/runtime/pom.xml b/extensions/jdbc/jdbc-mysql/runtime/pom.xml
index eb47accc4dc16..eb5c1df9754ab 100644
--- a/extensions/jdbc/jdbc-mysql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-mysql/runtime/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -29,6 +29,12 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -37,6 +43,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>mysql:mysql-connector-java</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/MySQLRecorder.java b/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/MySQLRecorder.java
deleted file mode 100644
index 42f6872c0ef97..0000000000000
--- a/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/MySQLRecorder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.quarkus.jdbc.mysql.runtime;
-
-import org.graalvm.nativeimage.ImageInfo;
-
-import io.quarkus.jdbc.mysql.runtime.graal.AbandonedConnectionCleanupThreadSubstitutions;
-import io.quarkus.runtime.annotations.Recorder;
-
-@Recorder
-public class MySQLRecorder {
-
-    public void startAbandonedConnectionCleanup() {
-        if (ImageInfo.inImageRuntimeCode()) {
-            AbandonedConnectionCleanupThreadSubstitutions.startCleanUp();
-        }
-    }
-}
diff --git a/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/MySQLServiceBindingConverter.java b/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/MySQLServiceBindingConverter.java
new file mode 100644
index 0000000000000..d50d8b5bc2de8
--- /dev/null
+++ b/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/MySQLServiceBindingConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.jdbc.mysql.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.kubernetes.service.binding.runtime.JdbcDatasourceUtil;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBinding;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConfigSource;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter;
+
+public class MySQLServiceBindingConverter implements ServiceBindingConverter {
+
+    @Override
+    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+        return JdbcDatasourceUtil.convert(serviceBindings, "mysql");
+    }
+}
diff --git a/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/graal/AbandonedConnectionCleanupThreadSubstitutions.java b/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/graal/AbandonedConnectionCleanupThreadSubstitutions.java
deleted file mode 100644
index 688b6b2ee8f93..0000000000000
--- a/extensions/jdbc/jdbc-mysql/runtime/src/main/java/io/quarkus/jdbc/mysql/runtime/graal/AbandonedConnectionCleanupThreadSubstitutions.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package io.quarkus.jdbc.mysql.runtime.graal;
-
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import com.mysql.cj.MysqlConnection;
-import com.mysql.cj.jdbc.AbandonedConnectionCleanupThread;
-import com.mysql.cj.protocol.NetworkResources;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-/**
- * This is to disable connection clean up thread {@link AbandonedConnectionCleanupThread} which launches a thread on a static
- * block.
- * GraalVM is not happy about that. The issue might have been fixed with https://github.com/oracle/graal/pull/1542 but we have
- * to wait for a proper GraalVM release, so we substitute the class and start the clean up thread manually when running in
- * native image.
- */
-@Substitute
-@TargetClass(AbandonedConnectionCleanupThread.class)
-final public class AbandonedConnectionCleanupThreadSubstitutions implements Runnable {
-
-    private static Set<ConnectionFinalizerPhantomReference> connectionFinalizerPhantomReferences;
-    private static ReferenceQueue<MysqlConnection> mysqlConnectionReferenceQueue;
-
-    private static ExecutorService executorService;
-
-    @Substitute
-    private AbandonedConnectionCleanupThreadSubstitutions() {
-    }
-
-    public static void startCleanUp() {
-        connectionFinalizerPhantomReferences = ConcurrentHashMap.newKeySet();
-        mysqlConnectionReferenceQueue = new ReferenceQueue<>();
-        executorService = Executors.newSingleThreadScheduledExecutor();
-        executorService.execute(new AbandonedConnectionCleanupThreadSubstitutions());
-    }
-
-    @Substitute
-    public void run() {
-        for (;;) {
-            try {
-                Reference<? extends MysqlConnection> reference = mysqlConnectionReferenceQueue.remove(5000);
-                if (reference != null) {
-                    finalizeResourceAndRemoveReference((ConnectionFinalizerPhantomReference) reference);
-                }
-            } catch (InterruptedException e) {
-                synchronized (mysqlConnectionReferenceQueue) {
-                    Reference<? extends MysqlConnection> reference;
-                    while ((reference = mysqlConnectionReferenceQueue.poll()) != null) {
-                        finalizeResourceAndRemoveReference((ConnectionFinalizerPhantomReference) reference);
-                    }
-                    connectionFinalizerPhantomReferences.clear();
-                }
-
-                return;
-            } catch (Exception ex) {
-            }
-        }
-    }
-
-    @Substitute
-    protected static void trackConnection(MysqlConnection conn, NetworkResources io) {
-        synchronized (mysqlConnectionReferenceQueue) {
-            ConnectionFinalizerPhantomReference reference = new ConnectionFinalizerPhantomReference(conn, io,
-                    mysqlConnectionReferenceQueue);
-            connectionFinalizerPhantomReferences.add(reference);
-        }
-    }
-
-    private static void finalizeResourceAndRemoveReference(ConnectionFinalizerPhantomReference reference) {
-        try {
-            reference.finalizeResources();
-            reference.clear();
-        } finally {
-            connectionFinalizerPhantomReferences.remove(reference);
-        }
-    }
-
-    private static class ConnectionFinalizerPhantomReference extends PhantomReference<MysqlConnection> {
-        private NetworkResources networkResources;
-
-        ConnectionFinalizerPhantomReference(MysqlConnection conn, NetworkResources networkResources,
-                ReferenceQueue<? super MysqlConnection> refQueue) {
-            super(conn, refQueue);
-            this.networkResources = networkResources;
-        }
-
-        void finalizeResources() {
-            if (this.networkResources != null) {
-                try {
-                    this.networkResources.forceClose();
-                } finally {
-                    this.networkResources = null;
-                }
-            }
-        }
-    }
-}
diff --git a/extensions/jdbc/jdbc-mysql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/extensions/jdbc/jdbc-mysql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
new file mode 100644
index 0000000000000..57a8c8af42a30
--- /dev/null
+++ b/extensions/jdbc/jdbc-mysql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.jdbc.mysql.runtime.MySQLServiceBindingConverter
diff --git a/extensions/jdbc/jdbc-postgresql/deployment/pom.xml b/extensions/jdbc/jdbc-postgresql/deployment/pom.xml
index 6f4c0e9adcc11..6c9f2a13cc00c 100644
--- a/extensions/jdbc/jdbc-postgresql/deployment/pom.xml
+++ b/extensions/jdbc/jdbc-postgresql/deployment/pom.xml
@@ -14,8 +14,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -25,10 +25,28 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-postgresql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -45,6 +63,35 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>test-devservices</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/main/java/io/quarkus/jdbc/postgresql/deployment/JDBCPostgreSQLProcessor.java b/extensions/jdbc/jdbc-postgresql/deployment/src/main/java/io/quarkus/jdbc/postgresql/deployment/JDBCPostgreSQLProcessor.java
index ae4e00e31e97e..83fa86deb7b6a 100644
--- a/extensions/jdbc/jdbc-postgresql/deployment/src/main/java/io/quarkus/jdbc/postgresql/deployment/JDBCPostgreSQLProcessor.java
+++ b/extensions/jdbc/jdbc-postgresql/deployment/src/main/java/io/quarkus/jdbc/postgresql/deployment/JDBCPostgreSQLProcessor.java
@@ -1,9 +1,11 @@
 package io.quarkus.jdbc.postgresql.deployment;
 
-import io.quarkus.agroal.deployment.JdbcDriverBuildItem;
+import io.quarkus.agroal.spi.JdbcDriverBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -11,7 +13,9 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.jdbc.postgresql.runtime.PostgreSQLAgroalConnectionConfigurer;
+import io.quarkus.jdbc.postgresql.runtime.PostgreSqlServiceBindingConverter;
 
 public class JDBCPostgreSQLProcessor {
 
@@ -27,6 +31,11 @@ void registerDriver(BuildProducer<JdbcDriverBuildItem> jdbcDriver,
                 "org.postgresql.xa.PGXADataSource"));
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.jdbc(DatabaseKind.POSTGRESQL);
+    }
+
     @BuildStep
     void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             Capabilities capabilities) {
@@ -38,4 +47,16 @@ void configureAgroalConnection(BuildProducer<AdditionalBeanBuildItem> additional
                             .build());
         }
     }
+
+    @BuildStep
+    void registerServiceBinding(Capabilities capabilities,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider,
+            BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        if (capabilities.isPresent(Capability.KUBERNETES_SERVICE_BINDING)) {
+            serviceProvider.produce(
+                    new ServiceProviderBuildItem("io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter",
+                            PostgreSqlServiceBindingConverter.class.getName()));
+        }
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.POSTGRESQL));
+    }
 }
diff --git a/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java
new file mode 100644
index 0000000000000..948002278a19e
--- /dev/null
+++ b/extensions/jdbc/jdbc-postgresql/deployment/src/test/java/io/quarkus/jdbc/postgresql/deployment/DevServicesPostgresqlDatasourceTestCase.java
@@ -0,0 +1,52 @@
+package io.quarkus.jdbc.postgresql.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.sql.Connection;
+import java.util.function.Supplier;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.AgroalConnectionPoolConfiguration;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DevServicesPostgresqlDatasourceTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class);
+                }
+            });
+
+    @Inject
+    AgroalDataSource dataSource;
+
+    @Test
+    public void testDatasource() throws Exception {
+        AgroalConnectionPoolConfiguration configuration = null;
+
+        try {
+            configuration = dataSource.getConfiguration().connectionPoolConfiguration();
+        } catch (NullPointerException e) {
+            // we catch the NPE here as we have a proxycd  and we can't test dataSource directly
+            fail("Datasource should not be null");
+        }
+        assertTrue(configuration.connectionFactoryConfiguration().jdbcUrl().contains("jdbc:postgresql:"));
+        assertEquals("quarkus", configuration.connectionFactoryConfiguration().principal().getName());
+        assertEquals(20, configuration.maxSize());
+
+        try (Connection connection = dataSource.getConnection()) {
+        }
+    }
+}
diff --git a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
index 5d08cd3a5e147..168982f874810 100644
--- a/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
+++ b/extensions/jdbc/jdbc-postgresql/runtime/pom.xml
@@ -13,6 +13,10 @@
     <name>Quarkus - JDBC - PostgreSQL - Runtime</name>
     <description>Connect to the PostgreSQL database via JDBC</description>
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>
@@ -25,6 +29,12 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -33,6 +43,11 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.postgresql:postgresql</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/jdbc/jdbc-postgresql/runtime/src/main/java/io/quarkus/jdbc/postgresql/runtime/PostgreSqlServiceBindingConverter.java b/extensions/jdbc/jdbc-postgresql/runtime/src/main/java/io/quarkus/jdbc/postgresql/runtime/PostgreSqlServiceBindingConverter.java
new file mode 100644
index 0000000000000..b32bd0bb31052
--- /dev/null
+++ b/extensions/jdbc/jdbc-postgresql/runtime/src/main/java/io/quarkus/jdbc/postgresql/runtime/PostgreSqlServiceBindingConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.jdbc.postgresql.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.kubernetes.service.binding.runtime.JdbcDatasourceUtil;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBinding;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConfigSource;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter;
+
+public class PostgreSqlServiceBindingConverter implements ServiceBindingConverter {
+
+    @Override
+    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+        return JdbcDatasourceUtil.convert(serviceBindings, "postgresql");
+    }
+}
diff --git a/extensions/jdbc/jdbc-postgresql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/extensions/jdbc/jdbc-postgresql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
new file mode 100644
index 0000000000000..777d262cb4fac
--- /dev/null
+++ b/extensions/jdbc/jdbc-postgresql/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.jdbc.postgresql.runtime.PostgreSqlServiceBindingConverter
diff --git a/extensions/jdbc/pom.xml b/extensions/jdbc/pom.xml
index a9e4512de15b5..ddaaf064b5f87 100644
--- a/extensions/jdbc/pom.xml
+++ b/extensions/jdbc/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jgit/deployment/pom.xml b/extensions/jgit/deployment/pom.xml
index 41a10a380abf8..f17d38a0f3572 100644
--- a/extensions/jgit/deployment/pom.xml
+++ b/extensions/jgit/deployment/pom.xml
@@ -7,7 +7,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-jgit-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-jgit-deployment</artifactId>
diff --git a/extensions/jgit/pom.xml b/extensions/jgit/pom.xml
index d0f81cfdca630..71dc65868b901 100644
--- a/extensions/jgit/pom.xml
+++ b/extensions/jgit/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-jgit-parent</artifactId>
diff --git a/extensions/jgit/runtime/pom.xml b/extensions/jgit/runtime/pom.xml
index 8c66e7f6ac2df..36cc9bb65fe74 100644
--- a/extensions/jgit/runtime/pom.xml
+++ b/extensions/jgit/runtime/pom.xml
@@ -7,7 +7,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-jgit-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-jgit</artifactId>
@@ -17,6 +16,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/jsch/pom.xml b/extensions/jsch/pom.xml
index 466799cd8c61f..72bb709f87357 100644
--- a/extensions/jsch/pom.xml
+++ b/extensions/jsch/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-jsch-parent</artifactId>
diff --git a/extensions/jsch/runtime/pom.xml b/extensions/jsch/runtime/pom.xml
index ec901fb9cef53..eb1bbd68e1b82 100644
--- a/extensions/jsch/runtime/pom.xml
+++ b/extensions/jsch/runtime/pom.xml
@@ -15,9 +15,14 @@
     <description>JSch is a pure Java implementation of SSH2 and allows you to connect to an sshd server and use port forwarding, X11 forwarding, file transfer, etc.</description>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
diff --git a/extensions/jsonb/deployment/pom.xml b/extensions/jsonb/deployment/pom.xml
index 52a02e4004f80..e9e1ed14ace61 100644
--- a/extensions/jsonb/deployment/pom.xml
+++ b/extensions/jsonb/deployment/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>quarkus-jsonb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +33,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jsonb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java
index 6c184a9be95b1..dde9bad3c475c 100755
--- a/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java
+++ b/extensions/jsonb/deployment/src/main/java/io/quarkus/jsonb/deployment/JsonbProcessor.java
@@ -25,11 +25,12 @@
 import org.jboss.jandex.IndexView;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
+import io.quarkus.arc.deployment.AutoAddScopeBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -89,6 +90,10 @@ void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
         for (AnnotationInstance deserializeInstance : index.getAnnotations(JSONB_TYPE_DESERIALIZER)) {
             registerInstance(reflectiveClass, deserializeInstance);
         }
+
+        // register String constructors for reflection as they may not have been properly registered by default
+        // see https://github.com/quarkusio/quarkus/issues/10873
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "java.lang.String"));
     }
 
     private void registerInstance(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, AnnotationInstance instance) {
@@ -103,8 +108,14 @@ private void registerInstance(BuildProducer<ReflectiveClassBuildItem> reflective
     }
 
     @BuildStep
-    void unremovableJsonbAdapters(BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
-            BeanArchiveIndexBuildItem beanArchiveIndex) {
+    void processJsonbAdapters(BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
+            BuildProducer<AutoAddScopeBuildItem> autoScopes) {
+
+        // An adapter with an injection point but no scope is @Singleton
+        autoScopes.produce(AutoAddScopeBuildItem.builder().implementsInterface(JSONB_ADAPTER_NAME).requiresContainerServices()
+                .defaultScope(BuiltinScope.SINGLETON).build());
+
+        // Make all adapters unremovable
         unremovableBeans.produce(new UnremovableBeanBuildItem(new Predicate<BeanInfo>() {
 
             @Override
diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java
new file mode 100644
index 0000000000000..b33b2c99dd67e
--- /dev/null
+++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Alpha.java
@@ -0,0 +1,22 @@
+package io.quarkus.jsonb.deployment;
+
+import javax.json.bind.annotation.JsonbTypeAdapter;
+
+@JsonbTypeAdapter(AlphaAdapter.class)
+public class Alpha {
+
+    private String name;
+
+    public Alpha(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java
new file mode 100644
index 0000000000000..f76518f977e29
--- /dev/null
+++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/AlphaAdapter.java
@@ -0,0 +1,22 @@
+package io.quarkus.jsonb.deployment;
+
+import javax.inject.Inject;
+import javax.json.bind.adapter.JsonbAdapter;
+
+// scope annotation is added automatically
+public class AlphaAdapter implements JsonbAdapter<Alpha, String> {
+
+    @Inject
+    Bravo bravo;
+
+    @Override
+    public String adaptToJson(Alpha obj) throws Exception {
+        return bravo.getVal(obj);
+    }
+
+    @Override
+    public Alpha adaptFromJson(String obj) throws Exception {
+        return new Alpha(bravo.getVal(obj));
+    }
+
+}
diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java
new file mode 100644
index 0000000000000..57b7f47278d24
--- /dev/null
+++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/Bravo.java
@@ -0,0 +1,16 @@
+package io.quarkus.jsonb.deployment;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class Bravo {
+
+    String getVal(Alpha alpha) {
+        return getVal(alpha.getName());
+    }
+
+    String getVal(String name) {
+        return name + "_bravo";
+    }
+
+}
diff --git a/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java
new file mode 100644
index 0000000000000..90e03d07fd21f
--- /dev/null
+++ b/extensions/jsonb/deployment/src/test/java/io/quarkus/jsonb/deployment/JsonbAdapterTest.java
@@ -0,0 +1,38 @@
+package io.quarkus.jsonb.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.json.bind.Jsonb;
+import javax.json.bind.adapter.JsonbAdapter;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class JsonbAdapterTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Alpha.class, AlphaAdapter.class, Bravo.class));
+
+    @Inject
+    Jsonb jsonb;
+
+    @Inject
+    Instance<JsonbAdapter<?, ?>> adapters;
+
+    @Test
+    public void testAdapterInjection() {
+        assertFalse(adapters.isUnsatisfied());
+        assertEquals("\"foo_bravo\"", jsonb.toJson(new Alpha("foo")));
+        assertEquals("bar_bravo", jsonb.fromJson("\"bar\"", Alpha.class).getName());
+    }
+
+}
diff --git a/extensions/jsonb/pom.xml b/extensions/jsonb/pom.xml
index f1f41e9335979..63e947d2feb33 100644
--- a/extensions/jsonb/pom.xml
+++ b/extensions/jsonb/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jsonb/runtime/pom.xml b/extensions/jsonb/runtime/pom.xml
index b0839265265d4..3d90bad5dcf72 100644
--- a/extensions/jsonb/runtime/pom.xml
+++ b/extensions/jsonb/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jsonb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jsonp/deployment/pom.xml b/extensions/jsonp/deployment/pom.xml
index 0e06ea0d1fa2c..6aa5775e3f5b9 100644
--- a/extensions/jsonp/deployment/pom.xml
+++ b/extensions/jsonp/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jsonp-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jsonp/pom.xml b/extensions/jsonp/pom.xml
index 0f727c69531c9..0ff9375ed2a9a 100644
--- a/extensions/jsonp/pom.xml
+++ b/extensions/jsonp/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/jsonp/runtime/pom.xml b/extensions/jsonp/runtime/pom.xml
index 6dd4393e59baf..25796f087106c 100644
--- a/extensions/jsonp/runtime/pom.xml
+++ b/extensions/jsonp/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-jsonp-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kafka-client/deployment/pom.xml b/extensions/kafka-client/deployment/pom.xml
index 059d3dd86ea49..b8230b918680f 100644
--- a/extensions/kafka-client/deployment/pom.xml
+++ b/extensions/kafka-client/deployment/pom.xml
@@ -14,10 +14,6 @@
     <name>Quarkus - Kafka - Client - Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kafka-client</artifactId>
@@ -35,6 +31,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-caffeine-deployment</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaBuildTimeConfig.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaBuildTimeConfig.java
index 58e07f1558acd..00b5ef429c662 100644
--- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaBuildTimeConfig.java
+++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaBuildTimeConfig.java
@@ -13,4 +13,13 @@ public class KafkaBuildTimeConfig {
      */
     @ConfigItem(name = "health.enabled", defaultValue = "false")
     public boolean healthEnabled;
+
+    /**
+     * Whether or not to enable Snappy in native mode.
+     * <p>
+     * Note that Snappy requires GraalVM 21+ and embeds a native library in the native executable.
+     * This library is unpacked and loaded when the application starts.
+     */
+    @ConfigItem(name = "snappy.enabled", defaultValue = "false")
+    public boolean snappyEnabled;
 }
diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java
index c6ad05ead9d0a..77cdf9fbd5ad6 100644
--- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java
+++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java
@@ -7,16 +7,21 @@
 
 import javax.security.auth.spi.LoginModule;
 
+import org.apache.kafka.clients.consumer.ConsumerInterceptor;
 import org.apache.kafka.clients.consumer.ConsumerPartitionAssignor;
 import org.apache.kafka.clients.consumer.RangeAssignor;
 import org.apache.kafka.clients.consumer.RoundRobinAssignor;
 import org.apache.kafka.clients.consumer.StickyAssignor;
 import org.apache.kafka.clients.consumer.internals.PartitionAssignor;
 import org.apache.kafka.clients.producer.Partitioner;
+import org.apache.kafka.clients.producer.ProducerInterceptor;
 import org.apache.kafka.clients.producer.internals.DefaultPartitioner;
 import org.apache.kafka.common.security.authenticator.AbstractLogin;
 import org.apache.kafka.common.security.authenticator.DefaultLogin;
 import org.apache.kafka.common.security.authenticator.SaslClientCallbackHandler;
+import org.apache.kafka.common.security.oauthbearer.OAuthBearerToken;
+import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerRefreshingLogin;
+import org.apache.kafka.common.security.oauthbearer.internals.OAuthBearerSaslClient;
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.kafka.common.serialization.ByteBufferDeserializer;
@@ -43,15 +48,24 @@
 import org.jboss.jandex.Type.Kind;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.pkg.NativeConfig;
+import io.quarkus.kafka.client.runtime.KafkaBindingConverter;
+import io.quarkus.kafka.client.runtime.KafkaRecorder;
 import io.quarkus.kafka.client.runtime.KafkaRuntimeConfigProducer;
 import io.quarkus.kafka.client.serialization.JsonbDeserializer;
 import io.quarkus.kafka.client.serialization.JsonbSerializer;
@@ -61,7 +75,7 @@
 
 public class KafkaProcessor {
 
-    static final Class[] BUILT_INS = {
+    static final Class<?>[] BUILT_INS = {
             //serializers
             ShortSerializer.class,
             DoubleSerializer.class,
@@ -85,6 +99,8 @@ public class KafkaProcessor {
             FloatDeserializer.class
     };
 
+    static final DotName OBJECT_MAPPER = DotName.createSimple("com.fasterxml.jackson.databind.ObjectMapper");
+
     @BuildStep
     void contributeClassesToIndex(BuildProducer<AdditionalIndexedClassesBuildItem> additionalIndexedClasses,
             BuildProducer<IndexDependencyBuildItem> indexDependency) {
@@ -100,9 +116,13 @@ void contributeClassesToIndex(BuildProducer<AdditionalIndexedClassesBuildItem> a
     }
 
     @BuildStep
-    public void build(CombinedIndexBuildItem indexBuildItem, BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+    public void build(
+            KafkaBuildTimeConfig config,
+            CombinedIndexBuildItem indexBuildItem, BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ServiceProviderBuildItem> serviceProviders,
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxies,
-            Capabilities capabilities) {
+            Capabilities capabilities, BuildProducer<UnremovableBeanBuildItem> beans,
+            BuildProducer<NativeImageResourceBuildItem> nativeLibs, NativeConfig nativeConfig) {
         final Set<DotName> toRegister = new HashSet<>();
 
         collectImplementors(toRegister, indexBuildItem, Serializer.class);
@@ -111,21 +131,34 @@ public void build(CombinedIndexBuildItem indexBuildItem, BuildProducer<Reflectiv
         // PartitionAssignor is now deprecated, replaced by ConsumerPartitionAssignor
         collectImplementors(toRegister, indexBuildItem, PartitionAssignor.class);
         collectImplementors(toRegister, indexBuildItem, ConsumerPartitionAssignor.class);
+        collectImplementors(toRegister, indexBuildItem, ConsumerInterceptor.class);
+        collectImplementors(toRegister, indexBuildItem, ProducerInterceptor.class);
+
+        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false,
+                OAuthBearerSaslClient.class,
+                OAuthBearerSaslClient.OAuthBearerSaslClientFactory.class,
+                OAuthBearerToken.class,
+                OAuthBearerRefreshingLogin.class));
 
         for (Class<?> i : BUILT_INS) {
             reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, i.getName()));
             collectSubclasses(toRegister, indexBuildItem, i);
         }
-        if (capabilities.isCapabilityPresent(Capabilities.JSONB)) {
-            reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, JsonbSerializer.class, JsonbDeserializer.class));
+        if (capabilities.isPresent(Capability.JSONB)) {
+            reflectiveClass.produce(
+                    new ReflectiveClassBuildItem(false, false, JsonbSerializer.class, JsonbDeserializer.class));
             collectSubclasses(toRegister, indexBuildItem, JsonbSerializer.class);
             collectSubclasses(toRegister, indexBuildItem, JsonbDeserializer.class);
         }
-        if (capabilities.isCapabilityPresent(Capabilities.JACKSON)) {
+        if (capabilities.isPresent(Capability.JACKSON)) {
             reflectiveClass.produce(
-                    new ReflectiveClassBuildItem(false, false, ObjectMapperSerializer.class, ObjectMapperDeserializer.class));
+                    new ReflectiveClassBuildItem(false, false, ObjectMapperSerializer.class,
+                            ObjectMapperDeserializer.class));
             collectSubclasses(toRegister, indexBuildItem, ObjectMapperSerializer.class);
             collectSubclasses(toRegister, indexBuildItem, ObjectMapperDeserializer.class);
+
+            // Make the `io.quarkus.jackson.runtime.ObjectMapperProducer` bean cannot be removed.
+            beans.produce(UnremovableBeanBuildItem.beanTypes(OBJECT_MAPPER));
         }
 
         for (DotName s : toRegister) {
@@ -142,9 +175,93 @@ public void build(CombinedIndexBuildItem indexBuildItem, BuildProducer<Reflectiv
         reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, "java.nio.DirectByteBuffer"));
         reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, "sun.misc.Cleaner"));
 
+        handleAvro(reflectiveClass, proxies, serviceProviders);
+        handleOpenTracing(reflectiveClass, capabilities);
+        handleStrimziOAuth(reflectiveClass);
+        if (config.snappyEnabled) {
+            handleSnappy(reflectiveClass, nativeLibs, nativeConfig);
+        }
+
+    }
+
+    private void handleSnappy(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<NativeImageResourceBuildItem> nativeLibs, NativeConfig nativeConfig) {
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
+                "org.xerial.snappy.SnappyInputStream",
+                "org.xerial.snappy.SnappyOutputStream"));
+
+        String root = "org/xerial/snappy/native/";
+        // add linux64 native lib when targeting containers
+        if (nativeConfig.containerRuntime.isPresent() || nativeConfig.containerBuild) {
+            String dir = "Linux/x86_64";
+            String snappyNativeLibraryName = "libsnappyjava.so";
+            String path = root + dir + "/" + snappyNativeLibraryName;
+            nativeLibs.produce(new NativeImageResourceBuildItem(path));
+        } else { // otherwise the native lib of the platform this build runs on
+            String dir = getOs() + "/" + getArch();
+            String snappyNativeLibraryName = System.mapLibraryName("snappyjava");
+            if (snappyNativeLibraryName.toLowerCase().endsWith(".dylib")) {
+                snappyNativeLibraryName = snappyNativeLibraryName.replace(".dylib", ".jnilib");
+            }
+            String path = root + dir + "/" + snappyNativeLibraryName;
+            nativeLibs.produce(new NativeImageResourceBuildItem(path));
+        }
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void loadSnappyIfEnabled(KafkaRecorder recorder, KafkaBuildTimeConfig config) {
+        if (config.snappyEnabled) {
+            recorder.loadSnappy();
+        }
+    }
+
+    private void handleOpenTracing(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, Capabilities capabilities) {
+        //opentracing contrib kafka interceptors: https://github.com/opentracing-contrib/java-kafka-client
+        if (capabilities.isPresent(Capability.OPENTRACING)) {
+            try {
+                Class.forName("io.opentracing.contrib.kafka.TracingProducerInterceptor", false,
+                        Thread.currentThread().getContextClassLoader());
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false,
+                        "io.opentracing.contrib.kafka.TracingProducerInterceptor",
+                        "io.opentracing.contrib.kafka.TracingConsumerInterceptor"));
+            } catch (ClassNotFoundException e) {
+                //ignore, opentracing contrib kafka is not in the classpath
+            }
+        }
+    }
+
+    private void handleStrimziOAuth(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        try {
+            Class.forName("io.strimzi.kafka.oauth.client.JaasClientOauthLoginCallbackHandler", false,
+                    Thread.currentThread().getContextClassLoader());
+
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
+                    "io.strimzi.kafka.oauth.client.JaasClientOauthLoginCallbackHandler"));
+
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
+                    "org.keycloak.jose.jws.JWSHeader",
+                    "org.keycloak.representations.AccessToken",
+                    "org.keycloak.representations.AccessToken$Access",
+                    "org.keycloak.representations.AccessTokenResponse",
+                    "org.keycloak.representations.IDToken",
+                    "org.keycloak.representations.JsonWebToken",
+                    "org.keycloak.jose.jwk.JSONWebKeySet",
+                    "org.keycloak.jose.jwk.JWK",
+                    "org.keycloak.json.StringOrArrayDeserializer",
+                    "org.keycloak.json.StringListMapDeserializer"));
+        } catch (ClassNotFoundException e) {
+            //ignore, Strimzi OAuth Client is not on the classpath
+        }
+    }
+
+    private void handleAvro(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<NativeImageProxyDefinitionBuildItem> proxies,
+            BuildProducer<ServiceProviderBuildItem> serviceProviders) {
         // Avro - for both Confluent and Apicurio
         try {
-            Class.forName("io.confluent.kafka.serializers.KafkaAvroDeserializer");
+            Class.forName("io.confluent.kafka.serializers.KafkaAvroDeserializer", false,
+                    Thread.currentThread().getContextClassLoader());
             reflectiveClass
                     .produce(new ReflectiveClassBuildItem(true, false,
                             "io.confluent.kafka.serializers.KafkaAvroDeserializer",
@@ -180,7 +297,20 @@ public void build(CombinedIndexBuildItem indexBuildItem, BuildProducer<Reflectiv
         }
 
         try {
-            Class.forName("io.apicurio.registry.utils.serde.AvroKafkaDeserializer");
+            Class.forName("io.confluent.kafka.schemaregistry.client.security.basicauth.BasicAuthCredentialProvider", false,
+                    Thread.currentThread().getContextClassLoader());
+            serviceProviders
+                    .produce(new ServiceProviderBuildItem(
+                            "io.confluent.kafka.schemaregistry.client.security.basicauth.BasicAuthCredentialProvider",
+                            "io.confluent.kafka.schemaregistry.client.security.basicauth.SaslBasicAuthCredentialProvider",
+                            "io.confluent.kafka.schemaregistry.client.security.basicauth.UrlBasicAuthCredentialProvider",
+                            "io.confluent.kafka.schemaregistry.client.security.basicauth.UserInfoCredentialProvider"));
+        } catch (ClassNotFoundException e) {
+            // ignore, Confluent schema registry client not in the classpath
+        }
+        try {
+            Class.forName("io.apicurio.registry.utils.serde.AvroKafkaDeserializer", false,
+                    Thread.currentThread().getContextClassLoader());
             reflectiveClass.produce(
                     new ReflectiveClassBuildItem(true, true, false,
                             "io.apicurio.registry.utils.serde.AvroKafkaDeserializer",
@@ -205,7 +335,6 @@ public void build(CombinedIndexBuildItem indexBuildItem, BuildProducer<Reflectiv
         } catch (ClassNotFoundException e) {
             //ignore, Apicurio Avro is not in the classpath
         }
-
     }
 
     @BuildStep
@@ -220,14 +349,18 @@ public AdditionalBeanBuildItem runtimeConfig() {
     public void withSasl(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
 
-        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, AbstractLogin.DefaultLoginCallbackHandler.class));
+        reflectiveClass
+                .produce(new ReflectiveClassBuildItem(false, false, AbstractLogin.DefaultLoginCallbackHandler.class));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, SaslClientCallbackHandler.class));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, DefaultLogin.class));
 
         final Type loginModuleType = Type
                 .create(DotName.createSimple(LoginModule.class.getName()), Kind.CLASS);
 
-        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(loginModuleType));
+        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                .type(loginModuleType)
+                .source(getClass().getSimpleName() + " > " + loginModuleType.name().toString())
+                .build());
     }
 
     private static void collectImplementors(Set<DotName> set, CombinedIndexBuildItem indexBuildItem, Class<?> cls) {
@@ -252,4 +385,42 @@ HealthBuildItem addHealthCheck(KafkaBuildTimeConfig buildTimeConfig) {
         return new HealthBuildItem("io.quarkus.kafka.client.health.KafkaHealthCheck",
                 buildTimeConfig.healthEnabled);
     }
+
+    @BuildStep
+    UnremovableBeanBuildItem ensureJsonParserAvailable() {
+        return UnremovableBeanBuildItem.beanClassNames(
+                "io.quarkus.jackson.ObjectMapperProducer",
+                "com.fasterxml.jackson.databind.ObjectMapper",
+                "io.quarkus.jsonb.JsonbProducer",
+                "javax.json.bind.Jsonb");
+    }
+
+    @BuildStep
+    void registerServiceBinding(Capabilities capabilities,
+            BuildProducer<ServiceProviderBuildItem> serviceProvider) {
+        if (capabilities.isPresent(Capability.KUBERNETES_SERVICE_BINDING)) {
+            serviceProvider.produce(
+                    new ServiceProviderBuildItem("io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter",
+                            KafkaBindingConverter.class.getName()));
+        }
+    }
+
+    public static String getArch() {
+        String osArch = System.getProperty("os.arch");
+        return osArch.replaceAll("\\W", "");
+    }
+
+    static String getOs() {
+        String osName = System.getProperty("os.name");
+
+        if (osName.contains("Windows")) {
+            return "Windows";
+        } else if (osName.contains("Mac")) {
+            return "Mac";
+        } else if (osName.contains("Linux")) {
+            return "Linux";
+        } else {
+            return osName.replaceAll("\\W", "");
+        }
+    }
 }
diff --git a/extensions/kafka-client/pom.xml b/extensions/kafka-client/pom.xml
index 9b5bf970a6e31..a0e0885d2b170 100644
--- a/extensions/kafka-client/pom.xml
+++ b/extensions/kafka-client/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/kafka-client/runtime/pom.xml b/extensions/kafka-client/runtime/pom.xml
index bddd530d9ea6e..0aadb02763414 100644
--- a/extensions/kafka-client/runtime/pom.xml
+++ b/extensions/kafka-client/runtime/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -33,6 +33,16 @@
             <artifactId>quarkus-smallrye-health</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-caffeine</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -42,6 +52,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaBindingConverter.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaBindingConverter.java
new file mode 100644
index 0000000000000..dbbf3bd4bbec4
--- /dev/null
+++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaBindingConverter.java
@@ -0,0 +1,50 @@
+package io.quarkus.kafka.client.runtime;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBinding;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConfigSource;
+import io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter;
+
+public class KafkaBindingConverter implements ServiceBindingConverter {
+
+    @Override
+    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+        Optional<ServiceBinding> matchingByType = ServiceBinding.singleMatchingByType("kafka", serviceBindings);
+        if (!matchingByType.isPresent()) {
+            return Optional.empty();
+        }
+
+        Map<String, String> properties = new HashMap<>();
+        ServiceBinding binding = matchingByType.get();
+
+        String bootstrapServers = binding.getProperties().get("bootstrapServers");
+        if (bootstrapServers == null) {
+            bootstrapServers = binding.getProperties().get("bootstrap-servers");
+        }
+        if (bootstrapServers != null) {
+            properties.put("kafka.bootstrap.servers", bootstrapServers);
+        }
+
+        String securityProtocol = binding.getProperties().get("securityprotocol");
+        if (securityProtocol != null) {
+            properties.put("kafka.security.protocol", securityProtocol);
+        }
+
+        String saslMechanism = binding.getProperties().get("saslmechanism");
+        if (saslMechanism != null) {
+            properties.put("kafka.sasl.mechanism", saslMechanism);
+        }
+        String user = binding.getProperties().get("user");
+        String password = binding.getProperties().get("password");
+        if ("PLAIN".equals(saslMechanism) && (user != null) && (password != null)) {
+            properties.put("kafka.sasl.jaas.config",
+                    String.format("org.apache.kafka.common.security.plain.PlainLoginModule required %s %s", user, password));
+        }
+
+        return Optional.of(new ServiceBindingConfigSource("kafka-k8s-service-binding-source", properties));
+    }
+}
diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRecorder.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRecorder.java
new file mode 100644
index 0000000000000..7f839081a2511
--- /dev/null
+++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRecorder.java
@@ -0,0 +1,74 @@
+package io.quarkus.kafka.client.runtime;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
+
+import org.xerial.snappy.OSInfo;
+import org.xerial.snappy.SnappyError;
+import org.xerial.snappy.SnappyErrorCode;
+import org.xerial.snappy.SnappyLoader;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class KafkaRecorder {
+
+    public void loadSnappy() {
+        // Resolve the library file name with a suffix (e.g., dll, .so, etc.)
+        String snappyNativeLibraryName = System.mapLibraryName("snappyjava");
+        String snappyNativeLibraryPath = "/org/xerial/snappy/native/" + OSInfo.getNativeLibFolderPathForCurrentOS();
+        boolean hasNativeLib = hasResource(snappyNativeLibraryPath + "/" + snappyNativeLibraryName);
+        if (!hasNativeLib) {
+            if (OSInfo.getOSName().equals("Mac")) {
+                // Fix for openjdk7 for Mac
+                String altName = "libsnappyjava.jnilib";
+                if (hasResource(snappyNativeLibraryPath + "/" + altName)) {
+                    snappyNativeLibraryName = altName;
+                    hasNativeLib = true;
+                }
+            }
+        }
+
+        if (!hasNativeLib) {
+            String errorMessage = String.format("no native library is found for os.name=%s and os.arch=%s", OSInfo.getOSName(),
+                    OSInfo.getArchName());
+            throw new SnappyError(SnappyErrorCode.FAILED_TO_LOAD_NATIVE_LIBRARY, errorMessage);
+        }
+
+        File out = extractLibraryFile(
+                SnappyLoader.class.getResource(snappyNativeLibraryPath + "/" + snappyNativeLibraryName),
+                snappyNativeLibraryName);
+
+        System.load(out.getAbsolutePath());
+    }
+
+    private static boolean hasResource(String path) {
+        return SnappyLoader.class.getResource(path) != null;
+    }
+
+    private static File extractLibraryFile(URL library, String name) {
+        String tmp = System.getProperty("java.io.tmpdir");
+        File extractedLibFile = new File(tmp, name);
+
+        try (BufferedInputStream inputStream = new BufferedInputStream(library.openStream());
+                FileOutputStream fileOS = new FileOutputStream(extractedLibFile)) {
+            byte[] data = new byte[8192];
+            int byteContent;
+            while ((byteContent = inputStream.read(data, 0, 8192)) != -1) {
+                fileOS.write(data, 0, byteContent);
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                    "Unable to extract native library " + name + " to " + extractedLibFile.getAbsolutePath(), e);
+        }
+
+        extractedLibFile.deleteOnExit();
+
+        return extractedLibFile;
+    }
+
+}
diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java
index 933c318849f7d..bdd892cd71b14 100644
--- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java
+++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaRuntimeConfigProducer.java
@@ -2,44 +2,47 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.StreamSupport;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Produces;
 import javax.inject.Named;
+import javax.inject.Singleton;
 
 import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
 
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.runtime.ApplicationConfig;
 
-@Dependent
+@Singleton
 public class KafkaRuntimeConfigProducer {
 
-    private String configPrefix = "kafka";
+    // not "kafka.", because we also inspect env vars, which start with "KAFKA_"
+    private static final String CONFIG_PREFIX = "kafka";
+
+    private static final String GROUP_ID = "group.id";
 
     @Produces
     @DefaultBean
-    @ApplicationScoped
+    @Singleton
     @Named("default-kafka-broker")
-    public Map<String, Object> createKafkaRuntimeConfig() {
-        Map<String, Object> properties = new HashMap<>();
-        final Config config = ConfigProvider.getConfig();
-
-        StreamSupport
-                .stream(config.getPropertyNames().spliterator(), false)
-                .map(String::toLowerCase)
-                .filter(name -> name.startsWith(configPrefix))
-                .distinct()
-                .sorted()
-                .forEach(name -> {
-                    final String key = name.substring(configPrefix.length() + 1).toLowerCase().replaceAll("[^a-z0-9.]", ".");
-                    final String value = config.getOptionalValue(name, String.class).orElse("");
-                    properties.put(key, value);
-                });
-
-        return properties;
+    public Map<String, Object> createKafkaRuntimeConfig(Config config, ApplicationConfig app) {
+        Map<String, Object> result = new HashMap<>();
+
+        for (String propertyName : config.getPropertyNames()) {
+            String propertyNameLowerCase = propertyName.toLowerCase();
+            if (!propertyNameLowerCase.startsWith(CONFIG_PREFIX)) {
+                continue;
+            }
+            String effectivePropertyName = propertyNameLowerCase.substring(CONFIG_PREFIX.length() + 1).toLowerCase()
+                    .replaceAll("[^a-z0-9.]", ".");
+            String value = config.getOptionalValue(propertyName, String.class).orElse("");
+            result.put(effectivePropertyName, value);
+        }
+
+        if (!result.containsKey(GROUP_ID) && app.name.isPresent()) {
+            result.put(GROUP_ID, app.name.get());
+        }
+
+        return result;
     }
 
 }
diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubjectSubstitution.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubjectSubstitution.java
new file mode 100644
index 0000000000000..bd32e339dbc5c
--- /dev/null
+++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubjectSubstitution.java
@@ -0,0 +1,99 @@
+package io.quarkus.kafka.client.runtime.graal;
+
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.util.concurrent.TimeUnit;
+
+import javax.security.auth.AuthPermission;
+import javax.security.auth.Subject;
+import javax.security.auth.SubjectDomainCombiner;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "javax.security.auth.Subject")
+final class Target_javax_security_auth_Subject {
+
+    @Substitute
+    public static <T> T doAs(final Subject subject,
+            final java.security.PrivilegedExceptionAction<T> action)
+            throws java.security.PrivilegedActionException {
+
+        java.lang.SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(AuthPermissionHolder.DO_AS_PERMISSION);
+        }
+        if (action == null) {
+            throw new NullPointerException("Invalid null action provided");
+        }
+
+        final AccessControlContext currentAcc = AccessController.getContext();
+
+        SubjectHolder.subjects.put(currentAcc, subject);
+
+        return java.security.AccessController.doPrivileged(action,
+                createContext(subject, currentAcc));
+    }
+
+    @Substitute
+    public static Subject getSubject(final AccessControlContext acc) {
+
+        java.lang.SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(AuthPermissionHolder.GET_SUBJECT_PERMISSION);
+        }
+
+        if (acc == null) {
+            throw new NullPointerException("Invalid null AccessControlContext provided");
+        }
+
+        // return the Subject from the DomainCombiner of the provided context
+        return AccessController.doPrivileged(new java.security.PrivilegedAction<Subject>() {
+            public Subject run() {
+                return SubjectHolder.subjects.getIfPresent(acc);
+            }
+        });
+    }
+
+    @Substitute
+    private static AccessControlContext createContext(final Subject subject,
+            final AccessControlContext acc) {
+
+        return java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<AccessControlContext>() {
+            public AccessControlContext run() {
+                if (subject == null)
+                    return new AccessControlContext(acc, null);
+                else
+                    return new AccessControlContext(acc,
+                            new SubjectDomainCombiner(subject));
+            }
+        });
+    }
+
+    final static class AuthPermissionHolder {
+        static final AuthPermission DO_AS_PERMISSION = new AuthPermission("doAs");
+
+        static final AuthPermission DO_AS_PRIVILEGED_PERMISSION = new AuthPermission("doAsPrivileged");
+
+        static final AuthPermission SET_READ_ONLY_PERMISSION = new AuthPermission("setReadOnly");
+
+        static final AuthPermission GET_SUBJECT_PERMISSION = new AuthPermission("getSubject");
+
+        static final AuthPermission MODIFY_PRINCIPALS_PERMISSION = new AuthPermission("modifyPrincipals");
+
+        static final AuthPermission MODIFY_PUBLIC_CREDENTIALS_PERMISSION = new AuthPermission("modifyPublicCredentials");
+
+        static final AuthPermission MODIFY_PRIVATE_CREDENTIALS_PERMISSION = new AuthPermission("modifyPrivateCredentials");
+    }
+
+    final static class SubjectHolder {
+        static final Cache<AccessControlContext, Subject> subjects = Caffeine.newBuilder()
+                .initialCapacity(20)
+                .maximumSize(1000)
+                .expireAfterWrite(1, TimeUnit.MINUTES)
+                .expireAfterAccess(1, TimeUnit.SECONDS)
+                .build();
+    }
+}
diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java
index ca0d6d2410424..8dbe699c09665 100644
--- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java
+++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java
@@ -5,12 +5,14 @@
 
 import java.lang.invoke.MethodHandle;
 import java.util.List;
+import java.util.function.BooleanSupplier;
 
 import org.apache.kafka.common.metrics.JmxReporter;
 import org.apache.kafka.common.metrics.KafkaMetric;
 import org.apache.kafka.common.metrics.Metrics;
 import org.apache.kafka.common.record.CompressionType;
 import org.apache.kafka.common.utils.AppInfoParser;
+import org.graalvm.home.Version;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
@@ -19,11 +21,11 @@
 
 /**
  * Here is where surgery happens
- * * Remove Snappy
+ * * Remove Snappy if not available (require GraalVM 21+).
  * * Remove JMX
  */
 
-@TargetClass(value = CompressionType.class, innerClass = "SnappyConstructors")
+@TargetClass(value = CompressionType.class, innerClass = "SnappyConstructors", onlyWith = GraalVM20OrEarlier.class)
 final class SubstituteSnappy {
 
     @Alias
@@ -36,7 +38,15 @@ final class SubstituteSnappy {
 
 }
 
-@TargetClass(value = CompressionType.class)
+final class GraalVM20OrEarlier implements BooleanSupplier {
+
+    @Override
+    public boolean getAsBoolean() {
+        return Version.getCurrent().compareTo(21) < 0;
+    }
+}
+
+@TargetClass(value = CompressionType.class, onlyWith = GraalVM20OrEarlier.class)
 final class FixEnumAccess {
 
     @Substitute
diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java
index 41d7d9ae93fa8..cff85c1860f20 100644
--- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java
+++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/serialization/JsonbDeserializer.java
@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import javax.json.bind.Jsonb;
@@ -15,18 +16,32 @@
 public class JsonbDeserializer<T> implements Deserializer<T> {
 
     private final Jsonb jsonb;
-    private final Class<T> type;
+    private final Type type;
     private final boolean jsonbNeedsClosing;
 
-    public JsonbDeserializer(Class<T> type) {
+    public JsonbDeserializer(Class<T> clazz) {
+        this(clazz, JsonbProducer.get(), true);
+    }
+
+    public JsonbDeserializer(Class<T> clazz, Jsonb jsonb) {
+        this(clazz, jsonb, false);
+    }
+
+    private JsonbDeserializer(Class<T> clazz, Jsonb jsonb, boolean jsonbNeedsClosing) {
+        this.type = clazz;
+        this.jsonb = jsonb;
+        this.jsonbNeedsClosing = jsonbNeedsClosing;
+    }
+
+    public JsonbDeserializer(Type type) {
         this(type, JsonbProducer.get(), true);
     }
 
-    public JsonbDeserializer(Class<T> type, Jsonb jsonb) {
+    public JsonbDeserializer(Type type, Jsonb jsonb) {
         this(type, jsonb, false);
     }
 
-    private JsonbDeserializer(Class<T> type, Jsonb jsonb, boolean jsonbNeedsClosing) {
+    private JsonbDeserializer(Type type, Jsonb jsonb, boolean jsonbNeedsClosing) {
         this.type = type;
         this.jsonb = jsonb;
         this.jsonbNeedsClosing = jsonbNeedsClosing;
diff --git a/extensions/kafka-client/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/extensions/kafka-client/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
new file mode 100644
index 0000000000000..ee0d812fa8350
--- /dev/null
+++ b/extensions/kafka-client/runtime/src/main/resources/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.kafka.client.runtime.KafkaBindingConverter
diff --git a/extensions/kafka-streams/deployment/pom.xml b/extensions/kafka-streams/deployment/pom.xml
index c16c22be182ba..c2d06a888827a 100644
--- a/extensions/kafka-streams/deployment/pom.xml
+++ b/extensions/kafka-streams/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-kafka-streams-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java
index 68ccf8c335302..8726e68929429 100644
--- a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java
+++ b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java
@@ -32,6 +32,7 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.deployment.pkg.NativeConfig;
+import io.quarkus.deployment.pkg.steps.NativeImageBuildStep;
 import io.quarkus.kafka.streams.runtime.KafkaStreamsProducer;
 import io.quarkus.kafka.streams.runtime.KafkaStreamsRecorder;
 import io.quarkus.kafka.streams.runtime.KafkaStreamsRuntimeConfig;
@@ -68,6 +69,12 @@ private void registerCompulsoryClasses(BuildProducer<ReflectiveClassBuildItem> r
         reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, DefaultPartitionGrouper.class));
         reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, DefaultProductionExceptionHandler.class));
         reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, false, FailOnInvalidTimestamp.class));
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, true,
+                org.apache.kafka.streams.processor.internals.assignment.HighAvailabilityTaskAssignor.class));
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, true,
+                org.apache.kafka.streams.processor.internals.assignment.StickyTaskAssignor.class));
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, true,
+                org.apache.kafka.streams.processor.internals.assignment.FallbackPriorTaskAssignor.class));
     }
 
     private void registerClassesThatClientMaySpecify(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
@@ -116,7 +123,7 @@ private void registerClassesThatAreAccessedViaJni(BuildProducer<JniRuntimeAccess
 
     private void addSupportForRocksDbLib(BuildProducer<NativeImageResourceBuildItem> nativeLibs, NativeConfig nativeConfig) {
         // for RocksDB, either add linux64 native lib when targeting containers
-        if (nativeConfig.containerRuntime.isPresent() || nativeConfig.containerBuild) {
+        if (NativeImageBuildStep.isContainerBuild(nativeConfig)) {
             nativeLibs.produce(new NativeImageResourceBuildItem("librocksdbjni-linux64.so"));
         }
         // otherwise the native lib of the platform this build runs on
diff --git a/extensions/kafka-streams/pom.xml b/extensions/kafka-streams/pom.xml
index 5bd4bb6a72f4c..a354d5475a7b8 100644
--- a/extensions/kafka-streams/pom.xml
+++ b/extensions/kafka-streams/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kafka-streams/runtime/pom.xml b/extensions/kafka-streams/runtime/pom.xml
index 83d3d4e8a58ef..0aa65482b29a5 100644
--- a/extensions/kafka-streams/runtime/pom.xml
+++ b/extensions/kafka-streams/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-kafka-streams-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,6 +32,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java
index 8b76e09f2c7af..0da408c03c29d 100644
--- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java
+++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsProducer.java
@@ -1,5 +1,7 @@
 package io.quarkus.kafka.streams.runtime;
 
+import static io.quarkus.kafka.streams.runtime.KafkaStreamsRuntimeConfig.DEFAULT_KAFKA_BROKER;
+
 import java.net.InetSocketAddress;
 import java.time.Duration;
 import java.util.Collection;
@@ -17,14 +19,15 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.annotation.PreDestroy;
+import javax.annotation.PostConstruct;
+import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.kafka.clients.CommonClientConfigs;
-import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.ListTopicsResult;
 import org.apache.kafka.common.config.SaslConfigs;
@@ -35,9 +38,12 @@
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.Topology;
 import org.apache.kafka.streams.processor.StateRestoreListener;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
+import io.quarkus.arc.Arc;
 import io.quarkus.arc.Unremovable;
+import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.Startup;
 
 /**
@@ -51,35 +57,51 @@
 public class KafkaStreamsProducer {
 
     private static final Logger LOGGER = Logger.getLogger(KafkaStreamsProducer.class.getName());
+    private static volatile boolean shutdown = false;
 
     private final ExecutorService executorService;
     private final KafkaStreams kafkaStreams;
     private final KafkaStreamsTopologyManager kafkaStreamsTopologyManager;
+    private final Admin kafkaAdminClient;
 
     @Inject
     public KafkaStreamsProducer(KafkaStreamsSupport kafkaStreamsSupport, KafkaStreamsRuntimeConfig runtimeConfig,
             Instance<Topology> topology, Instance<KafkaClientSupplier> kafkaClientSupplier,
             Instance<StateListener> stateListener, Instance<StateRestoreListener> globalStateRestoreListener) {
+        shutdown = false;
         // No producer for Topology -> nothing to do
         if (topology.isUnsatisfied()) {
             LOGGER.debug("No Topology producer; Kafka Streams will not be started");
             this.executorService = null;
             this.kafkaStreams = null;
             this.kafkaStreamsTopologyManager = null;
+            this.kafkaAdminClient = null;
             return;
         }
 
         Properties buildTimeProperties = kafkaStreamsSupport.getProperties();
 
         String bootstrapServersConfig = asString(runtimeConfig.bootstrapServers);
+        if (DEFAULT_KAFKA_BROKER.equalsIgnoreCase(bootstrapServersConfig)) {
+            // Try to see if kafka.bootstrap.servers is set, if so, use that value, if not, keep localhost:9092
+            bootstrapServersConfig = ConfigProvider.getConfig().getOptionalValue("kafka.bootstrap.servers", String.class)
+                    .orElse(bootstrapServersConfig);
+        }
         Properties kafkaStreamsProperties = getStreamsProperties(buildTimeProperties, bootstrapServersConfig, runtimeConfig);
-        Properties adminClientConfig = getAdminClientConfig(kafkaStreamsProperties);
+        this.kafkaAdminClient = Admin.create(getAdminClientConfig(kafkaStreamsProperties));
 
         this.executorService = Executors.newSingleThreadExecutor();
 
-        this.kafkaStreams = initializeKafkaStreams(kafkaStreamsProperties, runtimeConfig, adminClientConfig, topology.get(),
+        this.kafkaStreams = initializeKafkaStreams(kafkaStreamsProperties, runtimeConfig, kafkaAdminClient, topology.get(),
                 kafkaClientSupplier, stateListener, globalStateRestoreListener, executorService);
-        this.kafkaStreamsTopologyManager = new KafkaStreamsTopologyManager(adminClientConfig);
+        this.kafkaStreamsTopologyManager = new KafkaStreamsTopologyManager(kafkaAdminClient);
+    }
+
+    @PostConstruct
+    public void postConstruct() {
+        if (kafkaStreams != null) {
+            Arc.container().beanManager().getEvent().select(KafkaStreams.class).fire(kafkaStreams);
+        }
     }
 
     @Produces
@@ -98,8 +120,8 @@ public KafkaStreamsTopologyManager kafkaStreamsTopologyManager() {
         return kafkaStreamsTopologyManager;
     }
 
-    @PreDestroy
-    void close() {
+    void onStop(@Observes ShutdownEvent event) {
+        shutdown = true;
         if (executorService != null) {
             executorService.shutdown();
         }
@@ -107,11 +129,14 @@ void close() {
             LOGGER.debug("Stopping Kafka Streams pipeline");
             kafkaStreams.close();
         }
+        if (kafkaAdminClient != null) {
+            kafkaAdminClient.close(Duration.ZERO);
+        }
     }
 
     private static KafkaStreams initializeKafkaStreams(Properties kafkaStreamsProperties,
-            KafkaStreamsRuntimeConfig runtimeConfig,
-            Properties adminClientConfig, Topology topology, Instance<KafkaClientSupplier> kafkaClientSupplier,
+            KafkaStreamsRuntimeConfig runtimeConfig, Admin adminClient, Topology topology,
+            Instance<KafkaClientSupplier> kafkaClientSupplier,
             Instance<StateListener> stateListener, Instance<StateRestoreListener> globalStateRestoreListener,
             ExecutorService executorService) {
         KafkaStreams kafkaStreams;
@@ -133,13 +158,15 @@ private static KafkaStreams initializeKafkaStreams(Properties kafkaStreamsProper
             @Override
             public void run() {
                 try {
-                    waitForTopicsToBeCreated(adminClientConfig, runtimeConfig.getTrimmedTopics());
+                    waitForTopicsToBeCreated(adminClient, runtimeConfig.getTrimmedTopics());
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                     return;
                 }
-                LOGGER.debug("Starting Kafka Streams pipeline");
-                kafkaStreams.start();
+                if (!shutdown) {
+                    LOGGER.debug("Starting Kafka Streams pipeline");
+                    kafkaStreams.start();
+                }
             }
         });
 
@@ -180,6 +207,8 @@ private static Properties getStreamsProperties(Properties properties, String boo
         // sasl
         SaslConfig sc = runtimeConfig.sasl;
         if (sc != null) {
+            setProperty(sc.mechanism, streamsProperties, SaslConfigs.SASL_MECHANISM);
+
             setProperty(sc.jaasConfig, streamsProperties, SaslConfigs.SASL_JAAS_CONFIG);
 
             setProperty(sc.clientCallbackHandlerClass, streamsProperties, SaslConfigs.SASL_CLIENT_CALLBACK_HANDLER_CLASS);
@@ -245,39 +274,41 @@ private static <T> void setProperty(Optional<T> property, Properties properties,
 
     private static String asString(List<InetSocketAddress> addresses) {
         return addresses.stream()
-                .map(InetSocketAddress::toString)
+                .map(KafkaStreamsProducer::toHostPort)
                 .collect(Collectors.joining(","));
     }
 
-    private static void waitForTopicsToBeCreated(Properties adminClientConfig, Collection<String> topicsToAwait)
+    private static String toHostPort(InetSocketAddress inetSocketAddress) {
+        return inetSocketAddress.getHostString() + ":" + inetSocketAddress.getPort();
+    }
+
+    private static void waitForTopicsToBeCreated(Admin adminClient, Collection<String> topicsToAwait)
             throws InterruptedException {
-        try (AdminClient adminClient = AdminClient.create(adminClientConfig)) {
-            Set<String> lastMissingTopics = null;
-            while (true) {
-                try {
-                    ListTopicsResult topics = adminClient.listTopics();
-                    Set<String> existingTopics = topics.names().get(10, TimeUnit.SECONDS);
+        Set<String> lastMissingTopics = null;
+        while (!shutdown) {
+            try {
+                ListTopicsResult topics = adminClient.listTopics();
+                Set<String> existingTopics = topics.names().get(10, TimeUnit.SECONDS);
+
+                if (existingTopics.containsAll(topicsToAwait)) {
+                    LOGGER.debug("All expected topics created: " + topicsToAwait);
+                    return;
+                } else {
+                    Set<String> missingTopics = new HashSet<>(topicsToAwait);
+                    missingTopics.removeAll(existingTopics);
 
-                    if (existingTopics.containsAll(topicsToAwait)) {
-                        LOGGER.debug("All expected topics created: " + topicsToAwait);
-                        return;
+                    // Do not spam warnings - topics may take time to be created by an operator like Strimzi
+                    if (missingTopics.equals(lastMissingTopics)) {
+                        LOGGER.debug("Waiting for topic(s) to be created: " + missingTopics);
                     } else {
-                        Set<String> missingTopics = new HashSet<>(topicsToAwait);
-                        missingTopics.removeAll(existingTopics);
-
-                        // Do not spam warnings - topics may take time to be created by an operator like Strimzi
-                        if (missingTopics.equals(lastMissingTopics)) {
-                            LOGGER.debug("Waiting for topic(s) to be created: " + missingTopics);
-                        } else {
-                            LOGGER.warn("Waiting for topic(s) to be created: " + missingTopics);
-                            lastMissingTopics = missingTopics;
-                        }
+                        LOGGER.warn("Waiting for topic(s) to be created: " + missingTopics);
+                        lastMissingTopics = missingTopics;
                     }
-
-                    Thread.sleep(1_000);
-                } catch (ExecutionException | TimeoutException e) {
-                    LOGGER.error("Failed to get topic names from broker", e);
                 }
+            } catch (ExecutionException | TimeoutException e) {
+                LOGGER.error("Failed to get topic names from broker", e);
+            } finally {
+                Thread.sleep(1_000);
             }
         }
     }
diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsRuntimeConfig.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsRuntimeConfig.java
index 3fe3264717734..c42fc5a58f488 100644
--- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsRuntimeConfig.java
+++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsRuntimeConfig.java
@@ -12,6 +12,11 @@
 @ConfigRoot(name = "kafka-streams", phase = ConfigPhase.RUN_TIME)
 public class KafkaStreamsRuntimeConfig {
 
+    /**
+     * Default Kafka bootstrap server.
+     */
+    public static final String DEFAULT_KAFKA_BROKER = "localhost:9012";
+
     /**
      * A unique identifier for this Kafka Streams application.
      * If not set, defaults to quarkus.application.name.
@@ -20,9 +25,10 @@ public class KafkaStreamsRuntimeConfig {
     public String applicationId;
 
     /**
-     * A comma-separated list of host:port pairs identifying the Kafka bootstrap server(s)
+     * A comma-separated list of host:port pairs identifying the Kafka bootstrap server(s).
+     * If not set, fallback to {@code kafka.bootstrap.servers}, and if not set either use {@code localhost:9012}.
      */
-    @ConfigItem(defaultValue = "localhost:9012")
+    @ConfigItem(defaultValue = DEFAULT_KAFKA_BROKER)
     public List<InetSocketAddress> bootstrapServers;
 
     /**
diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsTopologyManager.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsTopologyManager.java
index ac696df956abb..c33539397edea 100644
--- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsTopologyManager.java
+++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/KafkaStreamsTopologyManager.java
@@ -3,13 +3,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.Admin;
 import org.apache.kafka.clients.admin.ListTopicsResult;
 import org.jboss.logging.Logger;
 
@@ -17,16 +16,16 @@ public class KafkaStreamsTopologyManager {
 
     private static final Logger LOGGER = Logger.getLogger(KafkaStreamsTopologyManager.class.getName());
 
-    private final Properties adminClientConfig;
+    private final Admin adminClient;
 
-    public KafkaStreamsTopologyManager(Properties adminClientConfig) {
-        this.adminClientConfig = adminClientConfig;
+    public KafkaStreamsTopologyManager(Admin adminClient) {
+        this.adminClient = adminClient;
     }
 
     public Set<String> getMissingTopics(Collection<String> topicsToCheck) throws InterruptedException {
         HashSet<String> missing = new HashSet<>(topicsToCheck);
 
-        try (AdminClient adminClient = AdminClient.create(adminClientConfig)) {
+        try {
             ListTopicsResult topics = adminClient.listTopics();
             Set<String> topicNames = topics.names().get(10, TimeUnit.SECONDS);
 
diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/SaslConfig.java b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/SaslConfig.java
index 66666957dff84..79dd6ac72efe5 100644
--- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/SaslConfig.java
+++ b/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/SaslConfig.java
@@ -9,6 +9,12 @@
 @ConfigGroup
 public class SaslConfig {
 
+    /**
+     * SASL mechanism used for client connections
+     */
+    @ConfigItem
+    public Optional<String> mechanism;
+
     /**
      * JAAS login context parameters for SASL connections in the format used by JAAS configuration files
      */
diff --git a/extensions/keycloak-admin-client/deployment/pom.xml b/extensions/keycloak-admin-client/deployment/pom.xml
index cc340e45bec9b..2a1e0bcc53b83 100644
--- a/extensions/keycloak-admin-client/deployment/pom.xml
+++ b/extensions/keycloak-admin-client/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-keycloak-admin-client-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Keycloak Admin Client - Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-keycloak-admin-client</artifactId>
diff --git a/extensions/keycloak-admin-client/pom.xml b/extensions/keycloak-admin-client/pom.xml
index 9a50c88c021b8..4edf453c5fb86 100644
--- a/extensions/keycloak-admin-client/pom.xml
+++ b/extensions/keycloak-admin-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/keycloak-admin-client/runtime/pom.xml b/extensions/keycloak-admin-client/runtime/pom.xml
index fc18926b83f68..9d4195d3bd266 100644
--- a/extensions/keycloak-admin-client/runtime/pom.xml
+++ b/extensions/keycloak-admin-client/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-keycloak-admin-client-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,10 +14,6 @@
     <description>Administer a Keycloak Instance</description>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-client</artifactId>
@@ -63,11 +58,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
         </dependency>
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-             <scope>test</scope>
-         </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/keycloak-authorization/deployment/pom.xml b/extensions/keycloak-authorization/deployment/pom.xml
index 773de1358d669..4425aef6ad5f4 100644
--- a/extensions/keycloak-authorization/deployment/pom.xml
+++ b/extensions/keycloak-authorization/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-keycloak-authorization-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -87,7 +86,7 @@
             <id>test-keycloak</id>
             <activation>
                 <property>
-                    <name>test-keycloak</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -109,7 +108,7 @@
             <id>docker-keycloak</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -132,6 +131,7 @@
                                         <env>
                                             <KEYCLOAK_USER>admin</KEYCLOAK_USER>
                                             <KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
+                                            <JAVA_OPTS>-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dkeycloak.profile.feature.upload_scripts=enabled</JAVA_OPTS>
                                         </env>
                                         <log>
                                             <prefix>Keycloak:</prefix>
@@ -179,7 +179,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java
index d28864b8e5448..b7d852a95d5c0 100644
--- a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java
+++ b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java
@@ -8,13 +8,14 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.EnableAllSecurityServicesBuildItem;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.keycloak.pep.runtime.KeycloakPolicyEnforcerAuthorizer;
 import io.quarkus.keycloak.pep.runtime.KeycloakPolicyEnforcerConfig;
 import io.quarkus.keycloak.pep.runtime.KeycloakPolicyEnforcerRecorder;
 import io.quarkus.oidc.runtime.OidcBuildTimeConfig;
 import io.quarkus.oidc.runtime.OidcConfig;
+import io.quarkus.runtime.TlsConfig;
 import io.quarkus.vertx.http.deployment.RequireBodyHandlerBuildItem;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
 
@@ -65,17 +66,17 @@ public AdditionalBeanBuildItem beans(KeycloakPolicyEnforcerConfig config) {
     }
 
     @BuildStep
-    EnableAllSecurityServicesBuildItem security() {
-        return new EnableAllSecurityServicesBuildItem();
+    ExtensionSslNativeSupportBuildItem enableSslInNative() {
+        return new ExtensionSslNativeSupportBuildItem(Feature.KEYCLOAK_AUTHORIZATION);
     }
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    public void setup(OidcBuildTimeConfig oidcBuildTimeConfig, OidcConfig oidcRunTimeConfig,
+    public void setup(OidcBuildTimeConfig oidcBuildTimeConfig, OidcConfig oidcRunTimeConfig, TlsConfig tlsConfig,
             KeycloakPolicyEnforcerConfig keycloakConfig, KeycloakPolicyEnforcerRecorder recorder, BeanContainerBuildItem bc,
             HttpConfiguration httpConfiguration) {
         if (oidcBuildTimeConfig.enabled && keycloakConfig.policyEnforcer.enable) {
-            recorder.setup(oidcRunTimeConfig, keycloakConfig, bc.getValue(), httpConfiguration);
+            recorder.setup(oidcRunTimeConfig, keycloakConfig, tlsConfig, bc.getValue(), httpConfiguration);
         }
     }
 }
diff --git a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
index 584b3fd9e79a2..ba4cb1ac6fc27 100644
--- a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
+++ b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
@@ -85,6 +85,5 @@ public void runtimeInit(BuildProducer<RuntimeInitializedClassBuildItem> runtimeI
         runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.DerUtils"));
         runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.KeystoreUtil"));
         runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.CertificateUtils"));
-        runtimeInit.produce(new RuntimeInitializedClassBuildItem("org.keycloak.common.util.OCSPUtils"));
     }
 }
diff --git a/extensions/keycloak-authorization/deployment/src/test/java/io/quarkus/keycloak/pep/test/PolicyEnforcerTest.java b/extensions/keycloak-authorization/deployment/src/test/java/io/quarkus/keycloak/pep/test/PolicyEnforcerTest.java
index 128c84098037d..baa95d35eb6f2 100644
--- a/extensions/keycloak-authorization/deployment/src/test/java/io/quarkus/keycloak/pep/test/PolicyEnforcerTest.java
+++ b/extensions/keycloak-authorization/deployment/src/test/java/io/quarkus/keycloak/pep/test/PolicyEnforcerTest.java
@@ -108,7 +108,7 @@ public void testPublicResource() {
     @Test
     public void testHealthCheck() {
         RestAssured.given()
-                .when().get("/health/live")
+                .when().get("/q/health/live")
                 .then()
                 .statusCode(200);
     }
diff --git a/extensions/keycloak-authorization/pom.xml b/extensions/keycloak-authorization/pom.xml
index 6ad0d150cc658..0fb78fa78d2f0 100644
--- a/extensions/keycloak-authorization/pom.xml
+++ b/extensions/keycloak-authorization/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/keycloak-authorization/runtime/pom.xml b/extensions/keycloak-authorization/runtime/pom.xml
index a6123184f6925..1e0a125c44d15 100644
--- a/extensions/keycloak-authorization/runtime/pom.xml
+++ b/extensions/keycloak-authorization/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-keycloak-authorization-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,11 +44,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
         </dependency>
-         <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-             <scope>test</scope>
-         </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java b/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java
index ccf41ce2c321b..e3b14e7787cc4 100644
--- a/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java
+++ b/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerAuthorizer.java
@@ -18,7 +18,9 @@
 import org.keycloak.representations.adapters.config.PolicyEnforcerConfig;
 
 import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.common.runtime.OidcCommonConfig.Tls.Verification;
 import io.quarkus.oidc.runtime.OidcConfig;
+import io.quarkus.runtime.TlsConfig;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
@@ -71,7 +73,7 @@ public Uni<Boolean> apply(Permission permission) {
                         if (context != null) {
                             String scopes = permission.getActions();
 
-                            if (scopes == null || "".equals(scopes)) {
+                            if (scopes == null || scopes.isEmpty()) {
                                 return Uni.createFrom().item(context.hasResourcePermission(permission.getName()));
                             }
 
@@ -89,7 +91,8 @@ public Uni<Boolean> apply(Permission permission) {
                 }).build();
     }
 
-    public void init(OidcConfig oidcConfig, KeycloakPolicyEnforcerConfig config, HttpConfiguration httpConfiguration) {
+    public void init(OidcConfig oidcConfig, KeycloakPolicyEnforcerConfig config, TlsConfig tlsConfig,
+            HttpConfiguration httpConfiguration) {
         AdapterConfig adapterConfig = new AdapterConfig();
         String authServerUrl = oidcConfig.defaultTenant.getAuthServerUrl().get();
 
@@ -103,6 +106,18 @@ public void init(OidcConfig oidcConfig, KeycloakPolicyEnforcerConfig config, Htt
         adapterConfig.setResource(oidcConfig.defaultTenant.getClientId().get());
         adapterConfig.setCredentials(getCredentials(oidcConfig.defaultTenant));
 
+        boolean trustAll = oidcConfig.defaultTenant.tls.getVerification().isPresent()
+                ? oidcConfig.defaultTenant.tls.getVerification().get() == Verification.NONE
+                : tlsConfig.trustAll;
+        if (trustAll) {
+            adapterConfig.setDisableTrustManager(true);
+            adapterConfig.setAllowAnyHostname(true);
+        }
+
+        if (oidcConfig.defaultTenant.proxy.host.isPresent()) {
+            adapterConfig.setProxyUrl(oidcConfig.defaultTenant.proxy.host.get() + ":" + oidcConfig.defaultTenant.proxy.port);
+        }
+
         PolicyEnforcerConfig enforcerConfig = getPolicyEnforcerConfig(config, adapterConfig);
 
         if (enforcerConfig == null) {
diff --git a/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerRecorder.java b/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerRecorder.java
index 13481c193a622..23037ec5bc072 100644
--- a/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerRecorder.java
+++ b/extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerRecorder.java
@@ -4,17 +4,19 @@
 import io.quarkus.oidc.OIDCException;
 import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.runtime.OidcConfig;
+import io.quarkus.runtime.TlsConfig;
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
 
 @Recorder
 public class KeycloakPolicyEnforcerRecorder {
 
-    public void setup(OidcConfig oidcConfig, KeycloakPolicyEnforcerConfig config, BeanContainer beanContainer,
+    public void setup(OidcConfig oidcConfig, KeycloakPolicyEnforcerConfig config, TlsConfig tlsConfig,
+            BeanContainer beanContainer,
             HttpConfiguration httpConfiguration) {
         if (oidcConfig.defaultTenant.applicationType == OidcTenantConfig.ApplicationType.WEB_APP) {
             throw new OIDCException("Application type [" + oidcConfig.defaultTenant.applicationType + "] is not supported");
         }
-        beanContainer.instance(KeycloakPolicyEnforcerAuthorizer.class).init(oidcConfig, config, httpConfiguration);
+        beanContainer.instance(KeycloakPolicyEnforcerAuthorizer.class).init(oidcConfig, config, tlsConfig, httpConfiguration);
     }
 }
diff --git a/extensions/kotlin/deployment/pom.xml b/extensions/kotlin/deployment/pom.xml
index 601e57793db46..6e931d801d627 100644
--- a/extensions/kotlin/deployment/pom.xml
+++ b/extensions/kotlin/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-kotlin-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java b/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java
index a9c8b01f1eb66..ea7340edf98de 100644
--- a/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java
+++ b/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java
@@ -11,10 +11,13 @@
 import java.util.stream.Collectors;
 
 import org.jboss.logging.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.common.ExitCode;
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation;
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity;
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation;
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.config.Services;
@@ -102,7 +105,7 @@ public boolean hasErrors() {
             return !errors.isEmpty();
         }
 
-        @Override
+        //kotlin 1.3 version
         public void report(CompilerMessageSeverity severity, String s, CompilerMessageLocation location) {
             if (severity.isError()) {
                 if ((location != null) && (location.getLineContent() != null)) {
@@ -118,5 +121,19 @@ public void report(CompilerMessageSeverity severity, String s, CompilerMessageLo
         public List<String> getErrors() {
             return errors;
         }
+
+        @Override
+        public void report(@NotNull CompilerMessageSeverity severity, @NotNull String s,
+                @Nullable CompilerMessageSourceLocation location) {
+            if (severity.isError()) {
+                if ((location != null) && (location.getLineContent() != null)) {
+                    errors.add(String.format("%s%n%s:%d:%d%nReason: %s", location.getLineContent(), location.getPath(),
+                            location.getLine(),
+                            location.getColumn(), s));
+                } else {
+                    errors.add(s);
+                }
+            }
+        }
     }
 }
diff --git a/extensions/kotlin/pom.xml b/extensions/kotlin/pom.xml
index e5a690c179749..bd3e30428ea3b 100644
--- a/extensions/kotlin/pom.xml
+++ b/extensions/kotlin/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kotlin/runtime/pom.xml b/extensions/kotlin/runtime/pom.xml
index b4bef96a6938b..6feb99738fdb0 100644
--- a/extensions/kotlin/runtime/pom.xml
+++ b/extensions/kotlin/runtime/pom.xml
@@ -19,6 +19,20 @@
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
                 <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib-jdk8</parentFirstArtifact>
+                        <parentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib-jdk7</parentFirstArtifact>
+                        <parentFirstArtifact>org.jetbrains.kotlin:kotlin-reflect</parentFirstArtifact>
+                        <parentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib</parentFirstArtifact>
+                        <parentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib-common</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                    <runnerParentFirstArtifacts>
+                        <runnerParentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib-jdk8</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib-jdk7</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>org.jetbrains.kotlin:kotlin-reflect</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>org.jetbrains.kotlin:kotlin-stdlib-common</runnerParentFirstArtifact>
+                    </runnerParentFirstArtifacts>
                     <lesserPriorityArtifacts>
                         <!--
                         see https://github.com/quarkusio/quarkus/issues/8405
@@ -29,4 +43,18 @@
             </plugin>
         </plugins>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 0d3399729f86f..9671121f1d978 100644
--- a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Kotlin"
 metadata:
   keywords:
@@ -7,3 +6,7 @@ metadata:
   categories:
   - "alt-languages"
   status: "preview"
+  codestart:
+    name: "kotlin"
+    kind: "core"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/kubernetes-client/deployment-internal/pom.xml b/extensions/kubernetes-client/deployment-internal/pom.xml
index dcef404c50740..0bbcb33d6643f 100644
--- a/extensions/kubernetes-client/deployment-internal/pom.xml
+++ b/extensions/kubernetes-client/deployment-internal/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-kubernetes-client</artifactId>
+            <artifactId>quarkus-kubernetes-client-internal</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -30,6 +30,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java
index 202cbab8a0480..a65b82da207ae 100644
--- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java
+++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientBuildStep.java
@@ -5,13 +5,14 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig;
 import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem;
+import io.quarkus.runtime.TlsConfig;
 
 public class KubernetesClientBuildStep {
 
     private KubernetesClientBuildConfig buildConfig;
 
     @BuildStep
-    public KubernetesClientBuildItem process() {
-        return new KubernetesClientBuildItem(createClient(buildConfig));
+    public KubernetesClientBuildItem process(TlsConfig tlsConfig) {
+        return new KubernetesClientBuildItem(createClient(buildConfig, tlsConfig));
     }
 }
diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHanlder.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHanlder.java
index e3c4a3c130660..960c0b50fc5ef 100644
--- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHanlder.java
+++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHanlder.java
@@ -11,7 +11,7 @@ public class KubernetesClientErrorHanlder {
     public static void handle(Exception e) {
         if (e.getCause() instanceof SSLHandshakeException) {
             LOG.error(
-                    "The application could not be deployed to the cluster because the Kubernetes API Server certificates are not trusted. The certificates can be configured using the relevant configuration propertiers under the 'quarkus.kubernetes-client' config root, or \"quarkus.kubernetes-client.trust-certs=true\" can be set to explicitly trust the certificates (not recommended)");
+                    "The application could not be deployed to the cluster because the Kubernetes API Server certificates are not trusted. The certificates can be configured using the relevant configuration properties under the 'quarkus.kubernetes-client' config root, or \"quarkus.kubernetes-client.trust-certs=true\" can be set to explicitly trust the certificates (not recommended)");
             if (e instanceof RuntimeException) {
                 throw (RuntimeException) e;
             } else {
diff --git a/extensions/kubernetes-client/deployment/pom.xml b/extensions/kubernetes-client/deployment/pom.xml
index e2d1019589a0d..d05dfe39a7025 100644
--- a/extensions/kubernetes-client/deployment/pom.xml
+++ b/extensions/kubernetes-client/deployment/pom.xml
@@ -13,6 +13,10 @@
     <name>Quarkus - Kubernetes Client - Deployment</name>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java
index b004defffbf94..cbefa1138ca5b 100644
--- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java
+++ b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java
@@ -6,14 +6,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -26,7 +26,8 @@
 import io.quarkus.deployment.util.JandexUtil;
 import io.quarkus.jackson.deployment.IgnoreJsonDeserializeClassBuildItem;
 import io.quarkus.kubernetes.client.runtime.KubernetesClientProducer;
-import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+import io.quarkus.kubernetes.client.runtime.KubernetesConfigProducer;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
 
 public class KubernetesClientProcessor {
 
@@ -40,28 +41,29 @@ public class KubernetesClientProcessor {
 
     private static final Logger log = Logger.getLogger(KubernetesClientProcessor.class.getName());
 
-    @Inject
-    BuildProducer<FeatureBuildItem> featureProducer;
-
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClasses;
-
-    @Inject
-    BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchies;
-
-    @Inject
-    BuildProducer<IgnoreJsonDeserializeClassBuildItem> ignoredJsonDeserializationClasses;
-
-    @Inject
-    BuildProducer<KubernetesRoleBuildItem> roleProducer;
+    @BuildStep
+    public void registerBeanProducers(BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildItem,
+            Capabilities capabilities) {
+        // wire up the Config bean support
+        additionalBeanBuildItemBuildItem.produce(AdditionalBeanBuildItem.unremovableOf(KubernetesConfigProducer.class));
+        // do not register our client producer if the openshift client is present, because it provides it too
+        if (capabilities.isMissing(Capability.OPENSHIFT_CLIENT)) {
+            // wire up the KubernetesClient bean support
+            additionalBeanBuildItemBuildItem.produce(AdditionalBeanBuildItem.unremovableOf(KubernetesClientProducer.class));
+        }
+    }
 
     @BuildStep
     public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBuildItem combinedIndexBuildItem,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport,
-            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildItem) {
+            BuildProducer<FeatureBuildItem> featureProducer,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchies,
+            BuildProducer<IgnoreJsonDeserializeClassBuildItem> ignoredJsonDeserializationClasses,
+            BuildProducer<KubernetesRoleBindingBuildItem> roleBindingProducer) {
 
         featureProducer.produce(new FeatureBuildItem(Feature.KUBERNETES_CLIENT));
-        roleProducer.produce(new KubernetesRoleBuildItem("view"));
+        roleBindingProducer.produce(new KubernetesRoleBindingBuildItem("view", true));
 
         // make sure the watchers fully (and not weakly) register Kubernetes classes for reflection
         final Set<DotName> watchedClasses = new HashSet<>();
@@ -74,7 +76,10 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
                 log.warnv("Unable to lookup class: {0}", className);
             } else {
                 reflectiveHierarchies
-                        .produce(new ReflectiveHierarchyBuildItem(Type.create(watchedClass.name(), Type.Kind.CLASS)));
+                        .produce(new ReflectiveHierarchyBuildItem.Builder()
+                                .type(Type.create(watchedClass.name(), Type.Kind.CLASS))
+                                .source(getClass().getSimpleName() + " > " + watchedClass.name())
+                                .build());
             }
         }
 
@@ -101,13 +106,6 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
                         DotName.createSimple("io.fabric8.kubernetes.api.model.KubernetesResourceList")));
         ignoredJsonDeserializationClasses.produce(new IgnoreJsonDeserializeClassBuildItem(KUBERNETES_RESOURCE));
 
-        final String[] doneables = combinedIndexBuildItem.getIndex()
-                .getAllKnownImplementors(DotName.createSimple("io.fabric8.kubernetes.api.model.Doneable"))
-                .stream()
-                .map(c -> c.name().toString())
-                .toArray(String[]::new);
-        reflectiveClasses.produce(ReflectiveClassBuildItem.weakClass(doneables));
-
         final String[] deserializerClasses = combinedIndexBuildItem.getIndex()
                 .getAllKnownSubclasses(DotName.createSimple("com.fasterxml.jackson.databind.JsonDeserializer"))
                 .stream()
@@ -141,9 +139,6 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
 
         // Enable SSL support by default
         sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.KUBERNETES_CLIENT));
-
-        // wire up the KubernetesClient bean support
-        additionalBeanBuildItemBuildItem.produce(AdditionalBeanBuildItem.unremovableOf(KubernetesClientProducer.class));
     }
 
     private void findWatchedClasses(final DotName implementor, final ApplicationIndexBuildItem applicationIndex,
diff --git a/extensions/kubernetes-client/pom.xml b/extensions/kubernetes-client/pom.xml
index 59847509edbba..98d813a6b3f80 100644
--- a/extensions/kubernetes-client/pom.xml
+++ b/extensions/kubernetes-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kubernetes-client/runtime-internal/pom.xml b/extensions/kubernetes-client/runtime-internal/pom.xml
index c4e214b58e722..104fdb101e44c 100644
--- a/extensions/kubernetes-client/runtime-internal/pom.xml
+++ b/extensions/kubernetes-client/runtime-internal/pom.xml
@@ -13,11 +13,16 @@
     <artifactId>quarkus-kubernetes-client-internal</artifactId>
     <name>Quarkus - Kubernetes Client - Runtime - Internal</name>
     <description>This module only exists as a separate module to house the configuration that needs to be present on the runtime classpath when the kubernetes extension is used</description>
-    
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+            <scope>provided</scope> <!-- we don't want this ending up on the runtime classpath -->
         </dependency>
     </dependencies>
 
diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java
index a5512d5d1f28c..a8f6c41fe780b 100644
--- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java
+++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java
@@ -14,7 +14,7 @@ public class KubernetesClientBuildConfig {
      * Whether or not the client should trust a self signed certificate if so presented by the API server
      */
     @ConfigItem
-    public boolean trustCerts;
+    public Optional<Boolean> trustCerts = Optional.empty();
 
     /**
      * URL of the Kubernetes API server
@@ -88,6 +88,12 @@ public class KubernetesClientBuildConfig {
     @ConfigItem
     public Optional<String> password;
 
+    /**
+     * Kubernetes oauth token
+     */
+    @ConfigItem
+    public Optional<String> token;
+
     /**
      * Watch reconnect interval
      */
diff --git a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
similarity index 91%
rename from extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
rename to extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
index c5b378808d92e..ed908c62b17f6 100644
--- a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
+++ b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
@@ -8,15 +8,17 @@
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.quarkus.runtime.TlsConfig;
 
 public class KubernetesClientUtils {
 
     private static final String PREFIX = "quarkus.kubernetes-client.";
 
-    public static Config createConfig(KubernetesClientBuildConfig buildConfig) {
-        Config base = new Config();
+    public static Config createConfig(KubernetesClientBuildConfig buildConfig, TlsConfig tlsConfig) {
+        Config base = Config.autoConfigure(null);
+        boolean trustAll = buildConfig.trustCerts.isPresent() ? buildConfig.trustCerts.get() : tlsConfig.trustAll;
         return new ConfigBuilder()
-                .withTrustCerts(buildConfig.trustCerts)
+                .withTrustCerts(trustAll)
                 .withWatchReconnectInterval((int) buildConfig.watchReconnectInterval.toMillis())
                 .withWatchReconnectLimit(buildConfig.watchReconnectLimit)
                 .withConnectionTimeout((int) buildConfig.connectionTimeout.toMillis())
@@ -26,6 +28,7 @@ public static Config createConfig(KubernetesClientBuildConfig buildConfig) {
                 .withNamespace(buildConfig.namespace.orElse(base.getNamespace()))
                 .withUsername(buildConfig.username.orElse(base.getUsername()))
                 .withPassword(buildConfig.password.orElse(base.getPassword()))
+                .withOauthToken(buildConfig.token.orElse(base.getOauthToken()))
                 .withCaCertFile(buildConfig.caCertFile.orElse(base.getCaCertFile()))
                 .withCaCertData(buildConfig.caCertData.orElse(base.getCaCertData()))
                 .withClientCertFile(buildConfig.clientCertFile.orElse(base.getClientCertFile()))
@@ -38,17 +41,17 @@ public static Config createConfig(KubernetesClientBuildConfig buildConfig) {
                 .withHttpsProxy(buildConfig.httpsProxy.orElse(base.getHttpsProxy()))
                 .withProxyUsername(buildConfig.proxyUsername.orElse(base.getProxyUsername()))
                 .withProxyPassword(buildConfig.proxyPassword.orElse(base.getProxyPassword()))
-                .withNoProxy(buildConfig.noProxy.isPresent() ? buildConfig.noProxy.get() : base.getNoProxy())
+                .withNoProxy(buildConfig.noProxy.orElse(base.getNoProxy()))
                 .build();
     }
 
-    public static KubernetesClient createClient(KubernetesClientBuildConfig buildConfig) {
-        return new DefaultKubernetesClient(createConfig(buildConfig));
+    public static KubernetesClient createClient(KubernetesClientBuildConfig buildConfig, TlsConfig tlsConfig) {
+        return new DefaultKubernetesClient(createConfig(buildConfig, tlsConfig));
     }
 
     public static KubernetesClient createClient() {
         org.eclipse.microprofile.config.Config config = ConfigProvider.getConfig();
-        Config base = new Config();
+        Config base = Config.autoConfigure(null);
         return new DefaultKubernetesClient(new ConfigBuilder()
                 .withTrustCerts(config.getOptionalValue(PREFIX + "trust-certs", Boolean.class).orElse(base.isTrustCerts()))
                 .withWatchReconnectLimit(config.getOptionalValue(PREFIX + "watch-reconnect-limit", Integer.class)
diff --git a/extensions/kubernetes-client/runtime/pom.xml b/extensions/kubernetes-client/runtime/pom.xml
index 25d198ac4421c..7b6fb3849551e 100644
--- a/extensions/kubernetes-client/runtime/pom.xml
+++ b/extensions/kubernetes-client/runtime/pom.xml
@@ -26,31 +26,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -68,6 +51,11 @@
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config-source-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientProducer.java b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientProducer.java
index e1627520d5981..e459973e3e10e 100644
--- a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientProducer.java
+++ b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientProducer.java
@@ -1,6 +1,6 @@
 package io.quarkus.kubernetes.client.runtime;
 
-import javax.enterprise.context.ApplicationScoped;
+import javax.annotation.PreDestroy;
 import javax.enterprise.inject.Produces;
 import javax.inject.Singleton;
 
@@ -9,20 +9,23 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.quarkus.arc.DefaultBean;
 
-@ApplicationScoped
+@Singleton
 public class KubernetesClientProducer {
 
-    @DefaultBean
-    @Singleton
-    @Produces
-    public Config config(KubernetesClientBuildConfig buildConfig) {
-        return KubernetesClientUtils.createConfig(buildConfig);
-    }
+    private KubernetesClient client;
 
     @DefaultBean
     @Singleton
     @Produces
     public KubernetesClient kubernetesClient(Config config) {
-        return new DefaultKubernetesClient(config);
+        client = new DefaultKubernetesClient(config);
+        return client;
+    }
+
+    @PreDestroy
+    public void destroy() {
+        if (client != null) {
+            client.close();
+        }
     }
 }
diff --git a/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java
new file mode 100644
index 0000000000000..c188734bf1b9e
--- /dev/null
+++ b/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigProducer.java
@@ -0,0 +1,19 @@
+package io.quarkus.kubernetes.client.runtime;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.fabric8.kubernetes.client.Config;
+import io.quarkus.arc.DefaultBean;
+import io.quarkus.runtime.TlsConfig;
+
+@Singleton
+public class KubernetesConfigProducer {
+
+    @DefaultBean
+    @Singleton
+    @Produces
+    public Config config(KubernetesClientBuildConfig buildConfig, TlsConfig tlsConfig) {
+        return KubernetesClientUtils.createConfig(buildConfig, tlsConfig);
+    }
+}
diff --git a/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java b/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java
new file mode 100644
index 0000000000000..b1f709a44901a
--- /dev/null
+++ b/extensions/kubernetes-client/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtilsTest.java
@@ -0,0 +1,39 @@
+
+package io.quarkus.kubernetes.client.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.KubernetesClient;
+
+class KubernetesClientUtilsTest {
+
+    @BeforeEach
+    public void setUp() {
+        System.getProperties().remove(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY);
+        System.getProperties().remove(Config.KUBERNETES_DISABLE_HOSTNAME_VERIFICATION_SYSTEM_PROPERTY);
+        System.getProperties().remove(Config.KUBERNETES_KUBECONFIG_FILE);
+    }
+
+    @Test
+    void shouldGetConfigWithTrustCerts() throws Exception {
+        System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE,
+                new File(getClass().getResource("/test-kubeconfig").toURI()).getAbsolutePath());
+        Config config = Config.autoConfigure(null);
+        assertTrue(config.isTrustCerts());
+    }
+
+    @Test
+    void shouldGetClientWithTrustCerts() throws Exception {
+        System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE,
+                new File(getClass().getResource("/test-kubeconfig").toURI()).getAbsolutePath());
+        try (KubernetesClient client = KubernetesClientUtils.createClient()) {
+            assertTrue(client.getConfiguration().isTrustCerts());
+        }
+    }
+}
diff --git a/extensions/kubernetes-client/runtime/src/test/resources/test-kubeconfig b/extensions/kubernetes-client/runtime/src/test/resources/test-kubeconfig
new file mode 100644
index 0000000000000..79ad054744f39
--- /dev/null
+++ b/extensions/kubernetes-client/runtime/src/test/resources/test-kubeconfig
@@ -0,0 +1,44 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority: testns/ca.pem
+    insecure-skip-tls-verify: true
+    server: https://172.28.128.4:8443
+  name: 172-28-128-4:8443
+contexts:
+- context:
+    cluster: 172-28-128-4:8443
+    namespace: testns
+    user: user/172-28-128-4:8443
+  name: testns/172-28-128-4:8443/user
+- context:
+    cluster: 172-28-128-4:8443
+    namespace: production
+    user: root/172-28-128-4:8443
+  name: production/172-28-128-4:8443/root
+- context:
+    cluster: 172-28-128-4:8443
+    namespace: production
+    user: mmosley
+  name: production/172-28-128-4:8443/mmosley
+current-context: testns/172-28-128-4:8443/user
+kind: Config
+preferences: {}
+users:
+- name: user/172-28-128-4:8443
+  user:
+    token: token
+- name: root/172-28-128-4:8443
+  user:
+    token: supertoken
+- name: mmosley
+  user:
+    auth-provider:
+      config:
+        client-id: kubernetes
+        client-secret: 1db158f6-177d-4d9c-8a8b-d36869918ec5
+        id-token: eyJraWQiOiJDTj1vaWRjaWRwLnRyZW1vbG8ubGFuLCBPVT1EZW1vLCBPPVRybWVvbG8gU2VjdXJpdHksIEw9QXJsaW5ndG9uLCBTVD1WaXJnaW5pYSwgQz1VUy1DTj1rdWJlLWNhLTEyMDIxNDc5MjEwMzYwNzMyMTUyIiwiYWxnIjoiUlMyNTYifQ.eyJpc3MiOiJodHRwczovL29pZGNpZHAudHJlbW9sby5sYW46ODQ0My9hdXRoL2lkcC9PaWRjSWRQIiwiYXVkIjoia3ViZXJuZXRlcyIsImV4cCI6MTQ4MzU0OTUxMSwianRpIjoiMm96US15TXdFcHV4WDlHZUhQdy1hZyIsImlhdCI6MTQ4MzU0OTQ1MSwibmJmIjoxNDgzNTQ5MzMxLCJzdWIiOiI0YWViMzdiYS1iNjQ1LTQ4ZmQtYWIzMC0xYTAxZWU0MWUyMTgifQ.w6p4J_6qQ1HzTG9nrEOrubxIMb9K5hzcMPxc9IxPx2K4xO9l-oFiUw93daH3m5pluP6K7eOE6txBuRVfEcpJSwlelsOsW8gb8VJcnzMS9EnZpeA0tW_p-mnkFc3VcfyXuhe5R3G7aa5d8uHv70yJ9Y3-UhjiN9EhpMdfPAoEB9fYKKkJRzF7utTTIPGrSaSU6d2pcpfYKaxIwePzEkT4DfcQthoZdy9ucNvvLoi1DIC-UocFD8HLs8LYKEqSxQvOcvnThbObJ9af71EwmuE21fO5KzMW20KtAeget1gnldOosPtz1G5EwvaQ401-RPQzPGMVBld0_zMCAwZttJ4knw
+        idp-certificate-authority: /root/ca.pem
+        idp-issuer-url: https://oidcidp.tremolo.lan:8443/auth/idp/OidcIdP
+        refresh-token: q1bKLFOyUiosTfawzA93TzZIDzH2TNa2SMm0zEiPKTUwME6BkEo6Sql5yUWVBSWpKUGphaWpxSVAfekBOZbBhaEW+VlFUeVRGcluyVF5JT4+haZmPsluFoFu5XkpXk5BXq
+      name: oidc
diff --git a/extensions/kubernetes-config/deployment/src/main/java/io/quarkus/kubernetes/config/deployment/KubernetesConfigProcessor.java b/extensions/kubernetes-config/deployment/src/main/java/io/quarkus/kubernetes/config/deployment/KubernetesConfigProcessor.java
index 648179f3f878b..370a877351877 100644
--- a/extensions/kubernetes-config/deployment/src/main/java/io/quarkus/kubernetes/config/deployment/KubernetesConfigProcessor.java
+++ b/extensions/kubernetes-config/deployment/src/main/java/io/quarkus/kubernetes/config/deployment/KubernetesConfigProcessor.java
@@ -1,5 +1,8 @@
 package io.quarkus.kubernetes.config.deployment;
 
+import java.util.Arrays;
+import java.util.Collections;
+
 import org.jboss.logmanager.Level;
 
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -9,17 +12,42 @@
 import io.quarkus.deployment.builditem.LogCategoryBuildItem;
 import io.quarkus.deployment.builditem.RunTimeConfigurationSourceValueBuildItem;
 import io.quarkus.kubernetes.client.runtime.KubernetesClientBuildConfig;
+import io.quarkus.kubernetes.client.runtime.KubernetesConfigBuildTimeConfig;
 import io.quarkus.kubernetes.client.runtime.KubernetesConfigRecorder;
 import io.quarkus.kubernetes.client.runtime.KubernetesConfigSourceConfig;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+import io.quarkus.runtime.TlsConfig;
 
 public class KubernetesConfigProcessor {
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     public RunTimeConfigurationSourceValueBuildItem configure(KubernetesConfigRecorder recorder,
-            KubernetesConfigSourceConfig config, KubernetesClientBuildConfig clientConfig) {
+            KubernetesConfigSourceConfig config, KubernetesConfigBuildTimeConfig buildTimeConfig,
+            KubernetesClientBuildConfig clientConfig,
+            TlsConfig tlsConfig) {
         return new RunTimeConfigurationSourceValueBuildItem(
-                recorder.configSources(config, clientConfig));
+                recorder.configSources(config, buildTimeConfig, clientConfig, tlsConfig));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public void handleAccessToSecrets(KubernetesConfigSourceConfig config,
+            KubernetesConfigBuildTimeConfig buildTimeConfig,
+            BuildProducer<KubernetesRoleBuildItem> roleProducer,
+            BuildProducer<KubernetesRoleBindingBuildItem> roleBindingProducer,
+            KubernetesConfigRecorder recorder) {
+        if (buildTimeConfig.secretsEnabled) {
+            roleProducer.produce(new KubernetesRoleBuildItem("view-secrets", Collections.singletonList(
+                    new KubernetesRoleBuildItem.PolicyRule(
+                            Collections.singletonList(""),
+                            Collections.singletonList("secrets"),
+                            Arrays.asList("get")))));
+            roleBindingProducer.produce(new KubernetesRoleBindingBuildItem("view-secrets", false));
+        }
+
+        recorder.warnAboutSecrets(config, buildTimeConfig);
     }
 
     // done in order to ensure that http logs aren't shown by default which happens because of the interplay between
diff --git a/extensions/kubernetes-config/pom.xml b/extensions/kubernetes-config/pom.xml
index 6941dbc222213..af037a643fca5 100644
--- a/extensions/kubernetes-config/pom.xml
+++ b/extensions/kubernetes-config/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java
index c5d9fcf2524cc..6f7632b81694e 100644
--- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/AbstractKubernetesConfigSourceUtil.java
@@ -9,6 +9,8 @@
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.jboss.logging.Logger;
 
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+
 abstract class AbstractKubernetesConfigSourceUtil {
 
     private static final Logger log = Logger.getLogger(AbstractKubernetesConfigSourceUtil.class);
@@ -17,10 +19,10 @@ abstract class AbstractKubernetesConfigSourceUtil {
     private static final String APPLICATION_YAML = "application.yaml";
     private static final String APPLICATION_PROPERTIES = "application.properties";
 
-    private static final int ORDINAL = 270; // this is higher than the file system or jar ordinals, but lower than env vars
-
     abstract String getType();
 
+    abstract OrdinalData ordinalData();
+
     abstract ConfigSource createLiteralDataConfigSource(String kubernetesConfigSourceName, Map<String, String> propertyMap,
             int ordinal);
 
@@ -30,13 +32,20 @@ abstract ConfigSource createPropertiesConfigSource(String kubernetesConfigSource
     abstract ConfigSource createYamlConfigSource(String kubernetesConfigSourceName, String fileName, String input, int ordinal);
 
     /**
-     * Returns a list of {@code ConfigSource} for the literal data that is contained in the ConfigMap
+     * Returns a list of {@code ConfigSource} for the literal data that is contained in the ConfigMap/Secret
      * and for the application.{properties|yaml|yml} files that might be contained in it as well
      *
      * All the {@code ConfigSource} objects use the same ordinal which is higher than the ordinal
      * of normal configuration files, but lower than that of environment variables
      */
-    List<ConfigSource> toConfigSources(String kubernetesConfigSourceName, Map<String, String> kubernetesConfigSourceDataMap) {
+    List<ConfigSource> toConfigSources(ObjectMeta metadata, Map<String, String> kubernetesConfigSourceDataMap,
+            int ordinalOffset) {
+        /*
+         * use a name that uniquely identifies the secret/configmap - which can be used an application
+         * to fully report its startup state or even respond to secret/configmap changes
+         */
+        String kubernetesConfigSourceName = metadata.getNamespace() + "/" + metadata.getName() + "/" + metadata.getUid() + "/"
+                + metadata.getResourceVersion();
         if (log.isDebugEnabled()) {
             log.debug("Attempting to convert data in " + getType() + " '" + kubernetesConfigSourceName
                     + "' to a list of ConfigSource objects");
@@ -45,14 +54,15 @@ List<ConfigSource> toConfigSources(String kubernetesConfigSourceName, Map<String
         CategorizedConfigSourceData categorizedConfigSourceData = categorize(kubernetesConfigSourceDataMap);
         List<ConfigSource> result = new ArrayList<>(categorizedConfigSourceData.fileData.size() + 1);
 
+        int ordinal = getOrdinal(ordinalOffset);
+
         if (!categorizedConfigSourceData.literalData.isEmpty()) {
             if (log.isDebugEnabled()) {
                 log.debug(
                         "Adding a ConfigSource for the literal data of " + getType() + " '" + kubernetesConfigSourceName + "'");
             }
-            result.add(createLiteralDataConfigSource(kubernetesConfigSourceName + "-literalData",
-                    categorizedConfigSourceData.literalData,
-                    ORDINAL));
+            result.add(createLiteralDataConfigSource(kubernetesConfigSourceName,
+                    categorizedConfigSourceData.literalData, ordinal));
         }
         for (Map.Entry<String, String> entry : categorizedConfigSourceData.fileData) {
             String fileName = entry.getKey();
@@ -62,13 +72,13 @@ List<ConfigSource> toConfigSources(String kubernetesConfigSourceName, Map<String
                     log.debug("Adding a Properties ConfigSource for file '" + fileName + "' of " + getType()
                             + " '" + kubernetesConfigSourceName + "'");
                 }
-                result.add(createPropertiesConfigSource(kubernetesConfigSourceName, fileName, rawFileData, ORDINAL));
+                result.add(createPropertiesConfigSource(kubernetesConfigSourceName, fileName, rawFileData, ordinal));
             } else if (APPLICATION_YAML.equals(fileName) || APPLICATION_YML.equals(fileName)) {
                 if (log.isDebugEnabled()) {
                     log.debug("Adding a YAML ConfigSource for file '" + fileName + "' of " + getType()
                             + " '" + kubernetesConfigSourceName + "'");
                 }
-                result.add(createYamlConfigSource(kubernetesConfigSourceName, fileName, rawFileData, ORDINAL));
+                result.add(createYamlConfigSource(kubernetesConfigSourceName, fileName, rawFileData, ordinal));
             }
         }
 
@@ -79,6 +89,17 @@ List<ConfigSource> toConfigSources(String kubernetesConfigSourceName, Map<String
         return result;
     }
 
+    private int getOrdinal(int ordinalOffset) {
+        final OrdinalData ordinalData = ordinalData();
+        /*
+         * We don't want a large list of sources to cause an "overflow" into an Ordinal of another ConfigSource
+         * so we just let the last ones all use the max ordinal
+         * this is not fool proof, but it's very unlikely that an application will need to define
+         * a list with 10+ sources...
+         */
+        return Math.min(ordinalData.getBase() + ordinalOffset, ordinalData.getMax());
+    }
+
     private static CategorizedConfigSourceData categorize(Map<String, String> data) {
         if ((data == null) || data.isEmpty()) {
             return new CategorizedConfigSourceData(Collections.emptyMap(), Collections.emptyList());
@@ -88,7 +109,8 @@ private static CategorizedConfigSourceData categorize(Map<String, String> data)
         List<Map.Entry<String, String>> fileData = new ArrayList<>();
         for (Map.Entry<String, String> entry : data.entrySet()) {
             String key = entry.getKey();
-            if (key.endsWith(".yml") || key.endsWith(".yaml") || key.endsWith(".properties")) {
+            if ((key.startsWith("application")) &&
+                    ((key.endsWith(".yml") || key.endsWith(".yaml") || key.endsWith(".properties")))) {
                 fileData.add(entry);
             } else {
                 literalData.put(key, entry.getValue());
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtil.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtil.java
index 384db2197a15e..8829317697a32 100644
--- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtil.java
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtil.java
@@ -18,6 +18,11 @@ String getType() {
         return "ConfigMap";
     }
 
+    @Override
+    OrdinalData ordinalData() {
+        return OrdinalData.CONFIG_MAP;
+    }
+
     @Override
     ConfigSource createLiteralDataConfigSource(String kubernetesConfigSourceName, Map<String, String> propertyMap,
             int ordinal) {
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigBuildTimeConfig.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigBuildTimeConfig.java
new file mode 100644
index 0000000000000..c854100bb3247
--- /dev/null
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigBuildTimeConfig.java
@@ -0,0 +1,15 @@
+package io.quarkus.kubernetes.client.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "kubernetes-config", phase = ConfigPhase.BUILD_TIME)
+public class KubernetesConfigBuildTimeConfig {
+    /**
+     * Whether or not configuration can be read from secrets.
+     * If set to {@code true}, Kubernetes resources allowing access to secrets (role and role binding) will be generated.
+     */
+    @ConfigItem(name = "secrets.enabled", defaultValue = "false")
+    public boolean secretsEnabled;
+}
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigRecorder.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigRecorder.java
index 648d5c841670f..294bc56564e47 100644
--- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigRecorder.java
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigRecorder.java
@@ -2,28 +2,68 @@
 
 import java.util.Collections;
 
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
 import org.jboss.logging.Logger;
 
 import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.TlsConfig;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.configuration.AbstractRawDefaultConfigSource;
 
 @Recorder
 public class KubernetesConfigRecorder {
 
     private static final Logger log = Logger.getLogger(KubernetesConfigRecorder.class);
 
+    private static final String CONFIG_ENABLED_PROPERTY_NAME = "quarkus.kubernetes-config.enabled";
+
     public RuntimeValue<ConfigSourceProvider> configSources(KubernetesConfigSourceConfig kubernetesConfigSourceConfig,
-            KubernetesClientBuildConfig clientConfig) {
-        if (!kubernetesConfigSourceConfig.enabled) {
+            KubernetesConfigBuildTimeConfig buildTimeConfig,
+            KubernetesClientBuildConfig clientConfig,
+            TlsConfig tlsConfig) {
+        if ((!kubernetesConfigSourceConfig.enabled && !buildTimeConfig.secretsEnabled) || isExplicitlyDisabled()) {
             log.debug(
                     "No attempt will be made to obtain configuration from the Kubernetes API server because the functionality has been disabled via configuration");
             return emptyRuntimeValue();
         }
 
-        return new RuntimeValue<>(new KubernetesConfigSourceProvider(kubernetesConfigSourceConfig,
-                KubernetesClientUtils.createClient(clientConfig)));
+        return new RuntimeValue<>(new KubernetesConfigSourceProvider(kubernetesConfigSourceConfig, buildTimeConfig,
+                KubernetesClientUtils.createClient(clientConfig, tlsConfig)));
+    }
+
+    // We don't want to enable the reading of anything if 'quarkus.kubernetes-config.enabled' is EXPLICITLY set to false
+    // In order to figure out whether the user has actually set the property, we take advantage of the fact that Smallrye
+    // Config returns the ConfigSources by descending order - we thus check each ConfigSource to see if the value has been set
+    private boolean isExplicitlyDisabled() {
+        Config config = ConfigProvider.getConfig();
+        Iterable<ConfigSource> configSources = config.getConfigSources();
+        for (ConfigSource configSource : configSources) {
+            // this is the ConfigSource that Quarkus Config creates and if we've reached this point, then we know that the
+            // use has not explicitly configured the value
+            if (configSource instanceof AbstractRawDefaultConfigSource) {
+                return false;
+            }
+            // don't use configSource.getPropertyNames() as it returns an empty list for env vars
+            String strValue = configSource.getValue(CONFIG_ENABLED_PROPERTY_NAME);
+            if ((strValue != null) && !strValue.isEmpty()) {
+                // TODO: should probably use converter here
+                return !Boolean.parseBoolean(strValue);
+            }
+        }
+        return false;
+    }
+
+    public void warnAboutSecrets(KubernetesConfigSourceConfig config, KubernetesConfigBuildTimeConfig buildTimeConfig) {
+        if (config.secrets.isPresent()
+                && !config.secrets.get().isEmpty()
+                && !buildTimeConfig.secretsEnabled) {
+            log.warn("Configuration is read from Secrets " + config.secrets.get()
+                    + ", but quarkus.kubernetes-config.secrets.enabled is false."
+                    + " Check if your application's service account has enough permissions to read secrets.");
+        }
     }
 
     private RuntimeValue<ConfigSourceProvider> emptyRuntimeValue() {
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceConfig.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceConfig.java
index df28e831fa57c..6941174c61bcb 100644
--- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceConfig.java
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceConfig.java
@@ -23,14 +23,27 @@ public class KubernetesConfigSourceConfig {
     public boolean failOnMissingConfig;
 
     /**
-     * ConfigMaps to look for in the namespace that the Kubernetes Client has been configured for
+     * ConfigMaps to look for in the namespace that the Kubernetes Client has been configured for.
+     * ConfigMaps defined later in this list have a higher priority that ConfigMaps defined earlier
+     * in this list.
+     * Furthermore any Secrets defined in {@code secrets}, will have higher priorities than all ConfigMaps.
      */
     @ConfigItem
     public Optional<List<String>> configMaps;
 
     /**
-     * Namespace to look for config maps. If this is not specified, then the namespace configured in the kubectl config context
-     * is used. If the value is specified and the namespace doesn't exist, the application will fail to start.
+     * Secrets to look for in the namespace that the Kubernetes Client has been configured for.
+     * If you use this, you probably want to enable {@code quarkus.kubernetes-config.secrets.enabled}.
+     * Secrets defined later in this list have a higher priority that ConfigMaps defined earlier
+     * in this list.
+     * Furthermore these Secrets have a higher priorities than all ConfigMaps defined in {@code configMaps}.
+     */
+    @ConfigItem
+    public Optional<List<String>> secrets;
+
+    /**
+     * Namespace to look for config maps and secrets. If this is not specified, then the namespace configured in the kubectl
+     * config context is used. If the value is specified and the namespace doesn't exist, the application will fail to start.
      */
     @ConfigItem
     public Optional<String> namespace;
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProvider.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProvider.java
index 53a28645fc357..582218d5db8e5 100644
--- a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProvider.java
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProvider.java
@@ -9,6 +9,7 @@
 import org.jboss.logging.Logger;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.KubernetesClient;
 
 class KubernetesConfigSourceProvider implements ConfigSourceProvider {
@@ -16,28 +17,36 @@ class KubernetesConfigSourceProvider implements ConfigSourceProvider {
     private static final Logger log = Logger.getLogger(KubernetesConfigSourceProvider.class);
 
     private final KubernetesConfigSourceConfig config;
+    private final KubernetesConfigBuildTimeConfig buildTimeConfig;
     private final KubernetesClient client;
 
     private final ConfigMapConfigSourceUtil configMapConfigSourceUtil;
+    private final SecretConfigSourceUtil secretConfigSourceUtil;
 
-    public KubernetesConfigSourceProvider(KubernetesConfigSourceConfig config, KubernetesClient client) {
+    public KubernetesConfigSourceProvider(KubernetesConfigSourceConfig config, KubernetesConfigBuildTimeConfig buildTimeConfig,
+            KubernetesClient client) {
         this.config = config;
+        this.buildTimeConfig = buildTimeConfig;
         this.client = client;
 
         this.configMapConfigSourceUtil = new ConfigMapConfigSourceUtil();
+        this.secretConfigSourceUtil = new SecretConfigSourceUtil();
     }
 
     @Override
     public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
-        if (!config.configMaps.isPresent()) {
-            log.debug("No ConfigMaps were configured for config source lookup");
+        if (!config.configMaps.isPresent() && !config.secrets.isPresent()) {
+            log.debug("No ConfigMaps or Secrets were configured for config source lookup");
             return Collections.emptyList();
         }
 
         List<ConfigSource> result = new ArrayList<>();
-        if (config.configMaps.isPresent()) {
+        if (config.enabled && config.configMaps.isPresent()) {
             result.addAll(getConfigMapConfigSources(config.configMaps.get()));
         }
+        if (buildTimeConfig.secretsEnabled && config.secrets.isPresent()) {
+            result.addAll(getSecretConfigSources(config.secrets.get()));
+        }
         return result;
     }
 
@@ -45,7 +54,8 @@ private List<ConfigSource> getConfigMapConfigSources(List<String> configMapNames
         List<ConfigSource> result = new ArrayList<>(configMapNames.size());
 
         try {
-            for (String configMapName : configMapNames) {
+            for (int i = 0; i < configMapNames.size(); i++) {
+                String configMapName = configMapNames.get(i);
                 if (log.isDebugEnabled()) {
                     log.debug("Attempting to read ConfigMap " + configMapName);
                 }
@@ -62,15 +72,50 @@ private List<ConfigSource> getConfigMapConfigSources(List<String> configMapNames
                     logMissingOrFail(configMapName, namespace, "ConfigMap", config.failOnMissingConfig);
                 } else {
                     result.addAll(
-                            configMapConfigSourceUtil.toConfigSources(configMap.getMetadata().getName(), configMap.getData()));
+                            configMapConfigSourceUtil.toConfigSources(configMap.getMetadata(), configMap.getData(),
+                                    i));
+                    if (log.isDebugEnabled()) {
+                        log.debug("Done reading ConfigMap " + configMap.getMetadata().getName());
+                    }
+                }
+            }
+            return result;
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to obtain configuration for ConfigMap objects from Kubernetes API Server at: "
+                    + client.getConfiguration().getMasterUrl(), e);
+        }
+    }
+
+    private List<ConfigSource> getSecretConfigSources(List<String> secretNames) {
+        List<ConfigSource> result = new ArrayList<>(secretNames.size());
+
+        try {
+            for (int i = 0; i < secretNames.size(); i++) {
+                String secretName = secretNames.get(i);
+                if (log.isDebugEnabled()) {
+                    log.debug("Attempting to read Secret " + secretName);
+                }
+                Secret secret;
+                String namespace;
+                if (config.namespace.isPresent()) {
+                    namespace = config.namespace.get();
+                    secret = client.secrets().inNamespace(namespace).withName(secretName).get();
+                } else {
+                    namespace = client.getNamespace();
+                    secret = client.secrets().withName(secretName).get();
+                }
+                if (secret == null) {
+                    logMissingOrFail(secretName, namespace, "Secret", config.failOnMissingConfig);
+                } else {
+                    result.addAll(secretConfigSourceUtil.toConfigSources(secret.getMetadata(), secret.getData(), i));
                     if (log.isDebugEnabled()) {
-                        log.debug("Done reading ConfigMap " + configMap);
+                        log.debug("Done reading Secret " + secret.getMetadata().getName());
                     }
                 }
             }
             return result;
         } catch (Exception e) {
-            throw new RuntimeException("Unable to obtain configuration for ConfigMap objects for Kubernetes API Server at: "
+            throw new RuntimeException("Unable to obtain configuration for Secret objects from Kubernetes API Server at: "
                     + client.getConfiguration().getMasterUrl(), e);
         }
     }
@@ -79,7 +124,8 @@ private void logMissingOrFail(String name, String namespace, String type, boolea
         String message = type + " '" + name + "' not found";
         if (namespace == null) {
             message = message
-                    + ". No Kubernetes namespace was set (most likely because the application is running outside the Kubernetes cluster). Consider setting 'quarkus.kubernetes-client.namespace=my-namespace' to specify the namespace in which to look up the ConfigMap";
+                    + ". No Kubernetes namespace was set (most likely because the application is running outside the Kubernetes cluster). Consider setting 'quarkus.kubernetes-client.namespace=my-namespace' to specify the namespace in which to look up the "
+                    + type;
         } else {
             message = message + " in namespace '" + namespace + "'";
         }
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/OrdinalData.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/OrdinalData.java
new file mode 100644
index 0000000000000..3138733919e81
--- /dev/null
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/OrdinalData.java
@@ -0,0 +1,30 @@
+package io.quarkus.kubernetes.client.runtime;
+
+enum OrdinalData {
+
+    CONFIG_MAP(
+            270, // this is higher than the file system or jar ordinals, but lower than env vars
+            284 // this is one less than the ordinal of Secret
+    ),
+
+    SECRET(
+            285, // this is one less than the ordinal of ConfigMap
+            299 // this is one less than env vars
+    );
+
+    private final int base;
+    private final int max;
+
+    OrdinalData(int base, int max) {
+        this.base = base;
+        this.max = max;
+    }
+
+    public int getBase() {
+        return base;
+    }
+
+    public int getMax() {
+        return max;
+    }
+}
diff --git a/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtil.java b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtil.java
new file mode 100644
index 0000000000000..4786dc5008ba2
--- /dev/null
+++ b/extensions/kubernetes-config/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtil.java
@@ -0,0 +1,93 @@
+package io.quarkus.kubernetes.client.runtime;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.UncheckedIOException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
+import io.smallrye.config.common.MapBackedConfigSource;
+import io.smallrye.config.source.yaml.YamlConfigSource;
+
+public class SecretConfigSourceUtil extends AbstractKubernetesConfigSourceUtil {
+
+    @Override
+    String getType() {
+        return "Secret";
+    }
+
+    @Override
+    OrdinalData ordinalData() {
+        return OrdinalData.SECRET;
+    }
+
+    @Override
+    ConfigSource createLiteralDataConfigSource(String kubernetesConfigSourceName, Map<String, String> propertyMap,
+            int ordinal) {
+        return new SecretLiteralDataPropertiesConfigSource(kubernetesConfigSourceName, propertyMap, ordinal);
+    }
+
+    @Override
+    ConfigSource createPropertiesConfigSource(String kubernetesConfigSourceName, String fileName, String input, int ordinal) {
+        return new SecretStringInputPropertiesConfigSource(kubernetesConfigSourceName, fileName, input, ordinal);
+    }
+
+    @Override
+    ConfigSource createYamlConfigSource(String kubernetesConfigSourceName, String fileName, String input, int ordinal) {
+        return new SecretStringInputYamlConfigSource(kubernetesConfigSourceName, fileName, input, ordinal);
+    }
+
+    static String decodeValue(String value) {
+        return new String(Base64.getDecoder().decode(value));
+    }
+
+    static Map<String, String> decodeMapValues(Map<String, String> input) {
+        Map<String, String> decodedMap = new HashMap<>();
+        for (Map.Entry<String, String> entry : input.entrySet()) {
+            decodedMap.put(entry.getKey(), decodeValue(entry.getValue()));
+        }
+        return decodedMap;
+    }
+
+    private static final class SecretLiteralDataPropertiesConfigSource extends MapBackedConfigSource {
+
+        private static final String NAME_PREFIX = "SecretLiteralDataPropertiesConfigSource[secret=";
+
+        public SecretLiteralDataPropertiesConfigSource(String secretName, Map<String, String> propertyMap, int ordinal) {
+            super(NAME_PREFIX + secretName + "]", decodeMapValues(propertyMap), ordinal);
+        }
+    }
+
+    private static class SecretStringInputPropertiesConfigSource extends MapBackedConfigSource {
+
+        private static final String NAME_FORMAT = "SecretStringInputPropertiesConfigSource[secret=%s,file=%s]";
+
+        SecretStringInputPropertiesConfigSource(String secretName, String fileName, String input, int ordinal) {
+            super(String.format(NAME_FORMAT, secretName, fileName), readProperties(decodeValue(input)), ordinal);
+        }
+
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        private static Map<String, String> readProperties(String rawData) {
+            try (StringReader br = new StringReader(rawData)) {
+                final Properties properties = new Properties();
+                properties.load(br);
+                return (Map<String, String>) (Map) properties;
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+    }
+
+    private static class SecretStringInputYamlConfigSource extends YamlConfigSource {
+
+        private static final String NAME_FORMAT = "SecretStringInputYamlConfigSource[secret=%s,file=%s]";
+
+        public SecretStringInputYamlConfigSource(String secretName, String fileName, String input, int ordinal) {
+            super(String.format(NAME_FORMAT, secretName, fileName), decodeValue(input), ordinal);
+        }
+    }
+}
diff --git a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java
index 43dcbb657c5f2..200e05a0da675 100644
--- a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java
+++ b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/ConfigMapConfigSourceUtilTest.java
@@ -19,7 +19,7 @@ class ConfigMapConfigSourceUtilTest {
     void testEmptyData() {
         ConfigMap configMap = configMapBuilder("testEmptyData").build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
         assertThat(configSources).isEmpty();
     }
@@ -29,12 +29,14 @@ void testOnlyLiteralData() {
         ConfigMap configMap = configMapBuilder("testOnlyLiteralData")
                 .addToData("some.key", "someValue").addToData("some.other", "someOtherValue").build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"),
                     entry("some.other", "someOtherValue"));
             assertThat(c.getName()).contains("testOnlyLiteralData");
+            assertThat(c.getName()).isEqualTo(
+                    "ConfigMapLiteralDataPropertiesConfigSource[configMap=namespace/testOnlyLiteralData/uid/version]");
         });
     }
 
@@ -43,12 +45,13 @@ void testOnlySingleMatchingPropertiesData() {
         ConfigMap configMap = configMapBuilder("testOnlySingleMatchingPropertiesData")
                 .addToData("application.properties", "key1=value1\nkey2=value2\nsome.key=someValue").build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
                     entry("some.key", "someValue"));
             assertThat(c.getName()).contains("testOnlySingleMatchingPropertiesData");
+            assertThat(c.getOrdinal()).isEqualTo(270);
         });
     }
 
@@ -57,9 +60,9 @@ void testOnlySingleNonMatchingPropertiesData() {
         ConfigMap configMap = configMapBuilder("testOnlySingleMatchingPropertiesData")
                 .addToData("app.properties", "key1=value1\nkey2=value2\nsome.key=someValue").build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
-        assertThat(configSources).isEmpty();
+        assertThat(configSources).isNotEmpty();
     }
 
     @Test
@@ -67,9 +70,9 @@ void testOnlySingleMatchingYamlData() {
         ConfigMap configMap = configMapBuilder("testOnlySingleMatchingYamlData")
                 .addToData("application.yaml", "key1: value1\nkey2: value2\nsome:\n  key: someValue").build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
-        assertThat(configSources).hasOnlyOneElementSatisfying(c -> {
+        assertThat(configSources).singleElement().satisfies(c -> {
             assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
                     entry("some.key", "someValue"));
             assertThat(c.getName()).contains("testOnlySingleMatchingYamlData");
@@ -81,9 +84,9 @@ void testOnlySingleNonMatchingYamlData() {
         ConfigMap configMap = configMapBuilder("testOnlySingleMatchingPropertiesData")
                 .addToData("app.yaml", "key1: value1\nkey2: value2\nsome:\n  key: someValue").build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
-        assertThat(configSources).isEmpty();
+        assertThat(configSources).isNotEmpty();
     }
 
     @Test
@@ -98,31 +101,40 @@ void testWithAllKindsOfData() {
                 .addToData("app.yml", "ignored3: ignoredValue3")
                 .build();
 
-        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata().getName(), configMap.getData());
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
 
         assertThat(configSources).hasSize(4);
-        assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("literal"))
+
+        assertThat(configSources.get(0).getClass().getName().contains("ConfigMapLiteralDataPropertiesConfigSource")).isTrue();
+
+        assertThat(configSources).filteredOn(c -> !c.getName().toLowerCase().contains("application"))
                 .hasOnlyOneElementSatisfying(c -> {
-                    assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"));
+                    assertThat(c.getProperties()).containsOnly(
+                            entry("some.key", "someValue"),
+                            entry("app.properties", "ignored1=ignoredValue1"),
+                            entry("app.yaml", "ignored2: ignoredValue2"),
+                            entry("app.yml", "ignored3: ignoredValue3"));
                 });
+
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.properties"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("app.key", "val"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yaml"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key2", "value2"),
                             entry("some.otherKey", "someOtherValue"));
                 });
         assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yml"))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getProperties()).containsOnly(entry("key3", "value3"));
                 });
     }
 
     private ConfigMapBuilder configMapBuilder(String name) {
         return new ConfigMapBuilder().withNewMetadata()
-                .withName(name).endMetadata();
+                .withName(name).withNamespace("namespace").withUid("uid")
+                .withResourceVersion("version").endMetadata();
     }
 
 }
diff --git a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProviderTest.java b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProviderTest.java
index f0c075ab490ad..69790a5ac441e 100644
--- a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProviderTest.java
+++ b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/KubernetesConfigSourceProviderTest.java
@@ -5,6 +5,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 
@@ -16,7 +17,9 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
+import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.api.model.SecretBuilder;
+import io.fabric8.kubernetes.api.model.SecretList;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -28,8 +31,11 @@ public class KubernetesConfigSourceProviderTest {
     @Test
     public void testEmptyConfigSources() {
         KubernetesConfigSourceConfig config = defaultConfig();
+        config.enabled = true;
         KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
-        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, kubernetesClient);
+        KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+        buildTimeConfig.secretsEnabled = true;
+        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
         Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
         assertThat(configSources).isEmpty();
     }
@@ -37,17 +43,20 @@ public void testEmptyConfigSources() {
     @Test
     public void testRetrieveNamespacedConfigSources() {
         KubernetesConfigSourceConfig config = defaultConfig();
+        config.enabled = true;
         config.namespace = Optional.of("demo");
         List<String> configMaps = Lists.list("cm1");
         config.configMaps = Optional.of(configMaps);
 
+        KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+
         ConfigMap configMap = configMapBuilder("cm1")
                 .addToData("some.key", "someValue").addToData("some.other", "someOtherValue").build();
 
         KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
         stubNamespacedConfigMap(kubernetesClient, configMap, "cm1");
 
-        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, kubernetesClient);
+        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
         Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
         assertThat(configSources).isNotEmpty();
         ConfigSource next = configSources.iterator().next();
@@ -57,14 +66,17 @@ public void testRetrieveNamespacedConfigSources() {
     @Test
     public void testNamespacedConfigSourcesAbsents() {
         KubernetesConfigSourceConfig config = defaultConfig();
+        config.enabled = true;
         config.namespace = Optional.of("demo");
         List<String> configMaps = Lists.list("cm2");
         config.configMaps = Optional.of(configMaps);
 
+        KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+
         KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
         stubNamespacedConfigMap(kubernetesClient, null, "cm2");
 
-        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, kubernetesClient);
+        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
         Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
         assertThat(configSources).isEmpty();
     }
@@ -72,32 +84,59 @@ public void testNamespacedConfigSourcesAbsents() {
     @Test
     public void testRetrieveConfigSources() {
         KubernetesConfigSourceConfig config = defaultConfig();
+        config.enabled = true;
         List<String> configMaps = Lists.list("cm1");
         config.configMaps = Optional.of(configMaps);
 
+        KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+
         ConfigMap configMap = configMapBuilder("cm1")
                 .addToData("some.key", "someValue").addToData("some.other", "someOtherValue").build();
 
         KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
         stubConfigMap(kubernetesClient, configMap, "cm1");
 
-        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, kubernetesClient);
+        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
         Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
         assertThat(configSources).isNotEmpty();
         ConfigSource next = configSources.iterator().next();
         assertThat(next.getProperties()).containsKeys("some.key", "some.other");
     }
 
+    @Test
+    public void testRetrieveSecretsWithoutConfigEnable() {
+        KubernetesConfigSourceConfig config = defaultConfig();
+        KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+        buildTimeConfig.secretsEnabled = true;
+
+        Secret secret = secretMapBuilder("testOnlySingleMatchingPropertiesData")
+                .addToData("application.properties", encodeValue("key1=value1\nsome.key=someValue")).build();
+        List<String> secrets = Lists.list("cm1");
+        config.secrets = Optional.of(secrets);
+
+        KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
+        stubSecrets(kubernetesClient, secret, "cm1");
+
+        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
+        Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
+        assertThat(configSources).isNotEmpty();
+        ConfigSource next = configSources.iterator().next();
+        assertThat(next.getProperties()).containsKeys("key1", "some.key");
+    }
+
     @Test
     public void testConfigSourcesAbsent() {
         KubernetesConfigSourceConfig config = defaultConfig();
+        config.enabled = true;
         List<String> configMaps = Lists.list("cm2");
         config.configMaps = Optional.of(configMaps);
 
+        KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+
         KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
         stubConfigMap(kubernetesClient, null, "cm2");
 
-        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, kubernetesClient);
+        KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
         Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
         assertThat(configSources).isEmpty();
     }
@@ -106,15 +145,18 @@ public void testConfigSourcesAbsent() {
     public void testConfigSourcesAbsentFailOnMissing() {
         try {
             KubernetesConfigSourceConfig config = defaultConfig();
+            config.enabled = true;
             config.namespace = Optional.of("demo");
             List<String> configMaps = Lists.list("cm2");
             config.configMaps = Optional.of(configMaps);
             config.failOnMissingConfig = true;
 
+            KubernetesConfigBuildTimeConfig buildTimeConfig = new KubernetesConfigBuildTimeConfig();
+
             KubernetesClient kubernetesClient = Mockito.mock(KubernetesClient.class);
             stubNamespacedConfigMap(kubernetesClient, null, "cm2");
 
-            KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, kubernetesClient);
+            KubernetesConfigSourceProvider kcsp = new KubernetesConfigSourceProvider(config, buildTimeConfig, kubernetesClient);
             Iterable<ConfigSource> configSources = kcsp.getConfigSources(null);
             fail("an exception should be raised");
         } catch (RuntimeException expected) {
@@ -122,11 +164,11 @@ public void testConfigSourcesAbsentFailOnMissing() {
     }
 
     private void stubNamespacedConfigMap(KubernetesClient kubernetesClient, ConfigMap configMap, String configMapName) {
-        MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> mixedOperation = (MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>>) mock(
+        MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> mixedOperation = (MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>>) mock(
                 MixedOperation.class);
         when(kubernetesClient.configMaps()).thenReturn(mixedOperation);
-        Resource<ConfigMap, DoneableConfigMap> resource = (Resource<ConfigMap, DoneableConfigMap>) mock(Resource.class);
-        NonNamespaceOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> nsClient = (NonNamespaceOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>>) mock(
+        Resource<ConfigMap> resource = (Resource<ConfigMap>) mock(Resource.class);
+        NonNamespaceOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> nsClient = (NonNamespaceOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>>) mock(
                 NonNamespaceOperation.class);
         when(mixedOperation.inNamespace("demo")).thenReturn(nsClient);
         when(nsClient.withName(configMapName)).thenReturn(resource);
@@ -139,10 +181,10 @@ private void stubNamespacedConfigMap(KubernetesClient kubernetesClient, ConfigMa
     }
 
     private void stubConfigMap(KubernetesClient kubernetesClient, ConfigMap configMap, String configMapName) {
-        MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> mixedOperation = (MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>>) mock(
+        MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> mixedOperation = (MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>>) mock(
                 MixedOperation.class);
         when(kubernetesClient.configMaps()).thenReturn(mixedOperation);
-        Resource<ConfigMap, DoneableConfigMap> resource = (Resource<ConfigMap, DoneableConfigMap>) mock(Resource.class);
+        Resource<ConfigMap> resource = (Resource<ConfigMap>) mock(Resource.class);
         when(mixedOperation.withName(configMapName)).thenReturn(resource);
         when(resource.get()).thenReturn(configMap);
         Config kubernetesConfig = mock(Config.class);
@@ -151,10 +193,33 @@ private void stubConfigMap(KubernetesClient kubernetesClient, ConfigMap configMa
 
     }
 
+    private void stubSecrets(KubernetesClient kubernetesClient, Secret secret, String secretName) {
+        MixedOperation<Secret, SecretList, Resource<Secret>> mixedOperation = (MixedOperation<Secret, SecretList, Resource<Secret>>) mock(
+                MixedOperation.class);
+        when(kubernetesClient.secrets()).thenReturn(mixedOperation);
+        Resource<Secret> resource = (Resource<Secret>) mock(Resource.class);
+        when(mixedOperation.withName(secretName)).thenReturn(resource);
+        when(resource.get()).thenReturn(secret);
+        Config kubernetesConfig = mock(Config.class);
+        when(kubernetesClient.getConfiguration()).thenReturn(kubernetesConfig);
+        when(kubernetesConfig.getMasterUrl()).thenReturn("url");
+
+    }
+
+    private SecretBuilder secretMapBuilder(String name) {
+        return new SecretBuilder().withNewMetadata()
+                .withName(name).endMetadata();
+    }
+
+    private String encodeValue(String value) {
+        return Base64.getEncoder().encodeToString(value.getBytes());
+    }
+
     private KubernetesConfigSourceConfig defaultConfig() {
         KubernetesConfigSourceConfig config = new KubernetesConfigSourceConfig();
         config.namespace = Optional.empty();
         config.configMaps = Optional.empty();
+        config.secrets = Optional.empty();
         return config;
     }
 
diff --git a/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java
new file mode 100644
index 0000000000000..0e1988063b660
--- /dev/null
+++ b/extensions/kubernetes-config/runtime/src/test/java/io/quarkus/kubernetes/client/runtime/SecretConfigSourceUtilTest.java
@@ -0,0 +1,145 @@
+package io.quarkus.kubernetes.client.runtime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.util.Base64;
+import java.util.List;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.api.model.SecretBuilder;
+
+class SecretConfigSourceUtilTest {
+
+    SecretConfigSourceUtil sut = new SecretConfigSourceUtil();
+
+    @Test
+    void testEmptyData() {
+        Secret secret = secretMapBuilder("testEmptyData").build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata(), secret.getData(), 0);
+
+        assertThat(configSources).isEmpty();
+    }
+
+    @Test
+    void testOnlyLiteralData() {
+        Secret configMap = secretMapBuilder("testOnlyLiteralData")
+                .addToData("some.key", encodeValue("someValue")).addToData("some.other", encodeValue("someOtherValue")).build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
+
+        assertThat(configSources).singleElement().satisfies(c -> {
+            assertThat(c.getProperties()).containsOnly(entry("some.key", "someValue"),
+                    entry("some.other", "someOtherValue"));
+            assertThat(c.getName()).contains("testOnlyLiteralData");
+            assertThat(c.getOrdinal()).isEqualTo(285);
+            assertThat(c.getName())
+                    .isEqualTo("SecretLiteralDataPropertiesConfigSource[secret=namespace/testOnlyLiteralData/uid/version]");
+        });
+    }
+
+    @Test
+    void testOnlySingleMatchingPropertiesData() {
+        Secret secret = secretMapBuilder("testOnlySingleMatchingPropertiesData")
+                .addToData("application.properties", encodeValue("key1=value1\nkey2=value2\nsome.key=someValue")).build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata(), secret.getData(), 0);
+
+        assertThat(configSources).singleElement().satisfies(c -> {
+            assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
+                    entry("some.key", "someValue"));
+            assertThat(c.getName()).contains("testOnlySingleMatchingPropertiesData");
+        });
+    }
+
+    @Test
+    void testOnlySingleNonMatchingPropertiesData() {
+        Secret secret = secretMapBuilder("testOnlySingleMatchingPropertiesData")
+                .addToData("app.properties", encodeValue("key1=value1\nkey2=value2\nsome.key=someValue")).build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata(), secret.getData(), 0);
+
+        assertThat(configSources).isNotEmpty();
+    }
+
+    @Test
+    void testOnlySingleMatchingYamlData() {
+        Secret configMap = secretMapBuilder("testOnlySingleMatchingYamlData")
+                .addToData("application.yaml", encodeValue("key1: value1\nkey2: value2\nsome:\n  key: someValue")).build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(configMap.getMetadata(), configMap.getData(), 0);
+
+        assertThat(configSources).singleElement().satisfies(c -> {
+            assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("key2", "value2"),
+                    entry("some.key", "someValue"));
+            assertThat(c.getName()).contains("testOnlySingleMatchingYamlData");
+        });
+    }
+
+    @Test
+    void testOnlySingleNonMatchingYamlData() {
+        Secret secret = secretMapBuilder("testOnlySingleMatchingPropertiesData")
+                .addToData("app.yaml", encodeValue("key1: value1\nkey2: value2\nsome:\n  key: someValue")).build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata(), secret.getData(), 0);
+
+        assertThat(configSources).isNotEmpty();
+    }
+
+    @Test
+    void testWithAllKindsOfData() {
+        Secret secret = secretMapBuilder("testWithAllKindsOfData")
+                .addToData("some.key", encodeValue("someValue"))
+                .addToData("application.properties", encodeValue("key1=value1\napp.key=val"))
+                .addToData("app.properties", encodeValue("ignored1=ignoredValue1"))
+                .addToData("application.yaml", encodeValue("key2: value2\nsome:\n  otherKey: someOtherValue"))
+                .addToData("app.yaml", encodeValue("ignored2: ignoredValue2"))
+                .addToData("application.yml", encodeValue("key3: value3"))
+                .addToData("app.yml", encodeValue("ignored3: ignoredValue3"))
+                .build();
+
+        List<ConfigSource> configSources = sut.toConfigSources(secret.getMetadata(), secret.getData(), 0);
+
+        assertThat(configSources).hasSize(4);
+        assertThat(configSources.get(0).getClass().getName().contains("SecretLiteralDataPropertiesConfigSource")).isTrue();
+
+        assertThat(configSources).filteredOn(c -> !c.getName().toLowerCase().contains("application"))
+                .hasOnlyOneElementSatisfying(c -> {
+                    assertThat(c.getProperties()).containsOnly(
+                            entry("some.key", "someValue"),
+                            entry("app.properties", "ignored1=ignoredValue1"),
+                            entry("app.yaml", "ignored2: ignoredValue2"),
+                            entry("app.yml", "ignored3: ignoredValue3"));
+                });
+
+        assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.properties"))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getProperties()).containsOnly(entry("key1", "value1"), entry("app.key", "val"));
+                });
+
+        assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yaml"))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getProperties()).containsOnly(entry("key2", "value2"),
+                            entry("some.otherKey", "someOtherValue"));
+                });
+        assertThat(configSources).filteredOn(c -> c.getName().toLowerCase().contains("application.yml"))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getProperties()).containsOnly(entry("key3", "value3"));
+                });
+    }
+
+    private SecretBuilder secretMapBuilder(String name) {
+        return new SecretBuilder().withNewMetadata()
+                .withName(name).withNamespace("namespace").withUid("uid")
+                .withResourceVersion("version").endMetadata();
+    }
+
+    private String encodeValue(String value) {
+        return Base64.getEncoder().encodeToString(value.getBytes());
+    }
+
+}
diff --git a/extensions/kubernetes-service-binding/deployment/pom.xml b/extensions/kubernetes-service-binding/deployment/pom.xml
new file mode 100644
index 0000000000000..4a9c91b41925f
--- /dev/null
+++ b/extensions/kubernetes-service-binding/deployment/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-kubernetes-service-binding-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-kubernetes-service-binding-deployment</artifactId>
+    <name>Quarkus - Kubernetes Service Binding - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/kubernetes-service-binding/deployment/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingProcessor.java b/extensions/kubernetes-service-binding/deployment/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingProcessor.java
new file mode 100644
index 0000000000000..43d3cdcecfa63
--- /dev/null
+++ b/extensions/kubernetes-service-binding/deployment/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingProcessor.java
@@ -0,0 +1,24 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.RunTimeConfigurationSourceValueBuildItem;
+
+public class KubernetesServiceBindingProcessor {
+
+    @BuildStep
+    void capabilities(BuildProducer<CapabilityBuildItem> capability) {
+        capability.produce(new CapabilityBuildItem(Capability.KUBERNETES_SERVICE_BINDING));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public RunTimeConfigurationSourceValueBuildItem configure(KubernetesServiceBindingRecorder recorder,
+            KubernetesServiceBindingConfig config) {
+        return new RunTimeConfigurationSourceValueBuildItem(recorder.configSources(config));
+    }
+}
diff --git a/extensions/kubernetes-service-binding/pom.xml b/extensions/kubernetes-service-binding/pom.xml
new file mode 100644
index 0000000000000..853422d7adf9a
--- /dev/null
+++ b/extensions/kubernetes-service-binding/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-kubernetes-service-binding-parent</artifactId>
+    <name>Quarkus - Kubernetes Service Binding</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/kubernetes-service-binding/runtime/pom.xml b/extensions/kubernetes-service-binding/runtime/pom.xml
new file mode 100644
index 0000000000000..1ac221790927b
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-kubernetes-service-binding-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-kubernetes-service-binding</artifactId>
+    <name>Quarkus - Kubernetes Service Binding - Runtime</name>
+    <description>Read runtime configuration based on the Kubernetes Service Binding Specification</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/JdbcDatasourceUtil.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/JdbcDatasourceUtil.java
new file mode 100644
index 0000000000000..822ae352c88c2
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/JdbcDatasourceUtil.java
@@ -0,0 +1,62 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jboss.logging.Logger;
+
+/**
+ * This utility collects the conversion of Service types that correspond to JDBC data-sources
+ * into a single place as the code for all is the same.
+ * This inevitably results in datasource related logic being places inside this (otherwise)
+ * service binding agnostic module, but it's a small price to pay compared to the alternative
+ * of copying and pasting the same code for all JDBC data-sources.
+ */
+public class JdbcDatasourceUtil {
+
+    private static final Logger log = Logger.getLogger(JdbcDatasourceUtil.class);
+
+    public static Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings, String type) {
+        return convert(serviceBindings, type, type);
+    }
+
+    public static Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings, String bindingType,
+            String urlType) {
+        Optional<ServiceBinding> matchingByType = ServiceBinding.singleMatchingByType(bindingType, serviceBindings);
+        if (!matchingByType.isPresent()) {
+            return Optional.empty();
+        }
+
+        Map<String, String> properties = new HashMap<>();
+        ServiceBinding binding = matchingByType.get();
+
+        String username = binding.getProperties().get("username");
+        if (username != null) {
+            properties.put("quarkus.datasource.username", username);
+        } else {
+            log.debug("Property 'username' was not found");
+        }
+        String password = binding.getProperties().get("password");
+        if (password != null) {
+            properties.put("quarkus.datasource.password", password);
+        } else {
+            log.debug("Property 'password' was not found");
+        }
+        String host = binding.getProperties().get("host");
+        String port = binding.getProperties().get("port");
+        String database = binding.getProperties().get("database");
+        if ((host != null) && (database != null)) {
+            String portPart = "";
+            if (port != null) {
+                portPart = ":" + port;
+            }
+            properties.put("quarkus.datasource.jdbc.url",
+                    String.format("jdbc:%s://%s%s/%s", urlType, host, portPart, database));
+        } else {
+            log.debug("One or more of 'host' or 'database' properties were not found");
+        }
+        return Optional.of(new ServiceBindingConfigSource(bindingType + "-k8s-service-binding-source", properties));
+    }
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfig.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfig.java
new file mode 100644
index 0000000000000..a024098c77230
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfig.java
@@ -0,0 +1,23 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "kubernetes-service-binding", phase = ConfigPhase.BOOTSTRAP)
+public class KubernetesServiceBindingConfig {
+
+    /**
+     * If enabled, Service Bindings will be looked in the file system
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enabled;
+
+    /**
+     * The bindings file system root. Specified by the Kubernetes Service ServiceBinding Specification.
+     */
+    @ConfigItem(defaultValue = "${SERVICE_BINDING_ROOT:}")
+    public Optional<String> root;
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceProvider.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceProvider.java
new file mode 100644
index 0000000000000..32e4708d73fb9
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceProvider.java
@@ -0,0 +1,107 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ServiceLoader;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+import org.jboss.logging.Logger;
+
+public class KubernetesServiceBindingConfigSourceProvider implements ConfigSourceProvider {
+
+    private static final Logger log = Logger.getLogger(KubernetesServiceBindingConfigSourceProvider.class);
+
+    private final List<ServiceBinding> serviceBindings;
+    private final List<ServiceBindingConverter> serviceBindingConverters;
+
+    public KubernetesServiceBindingConfigSourceProvider(String bindingRoot) {
+        this(bindingRoot, determineConverters());
+    }
+
+    //visible for testing
+    KubernetesServiceBindingConfigSourceProvider(String bindingRoot, List<ServiceBindingConverter> serviceBindingConverters) {
+        this.serviceBindingConverters = serviceBindingConverters;
+        Path p = Paths.get(bindingRoot);
+        if (!Files.exists(p)) {
+            log.warn("Service Binding root '" + p.toAbsolutePath().toString() + "' does not exist");
+            serviceBindings = Collections.emptyList();
+            return;
+        }
+        if (!Files.isDirectory(p)) {
+            throw new IllegalArgumentException("Service Binding root '" + p + "' is not a directory");
+        }
+
+        File[] files = p.toFile().listFiles();
+        if (files == null) {
+            log.warn("Service Binding root '" + p.toAbsolutePath().toString() + "' does not contain any sub-directories");
+            serviceBindings = Collections.emptyList();
+        } else {
+            log.debug("Found " + files.length + " potential Service Binding directories");
+            serviceBindings = new ArrayList<>(files.length);
+            for (File f : files) {
+                ServiceBinding sb = new ServiceBinding(f.toPath());
+                serviceBindings.add(sb);
+                if (log.isDebugEnabled()) {
+                    log.debug(String.format("Directory '%s' contains %d %s and will be used as Service Binding %s",
+                            f.toPath().toAbsolutePath(), sb.getProperties().size(),
+                            sb.getProperties().size() == 1 ? "property" : "properties", sb.toString()));
+                }
+            }
+            serviceBindings.sort(new Comparator<ServiceBinding>() {
+                @Override
+                public int compare(ServiceBinding o1, ServiceBinding o2) {
+                    if (!o1.getName().equals(o2.getName())) {
+                        return o1.getName().compareTo(o2.getName());
+                    }
+                    return o1.getProvider().compareTo(o2.getProvider());
+                }
+            });
+        }
+    }
+
+    private static List<ServiceBindingConverter> determineConverters() {
+        List<ServiceBindingConverter> result = new ArrayList<>();
+        ServiceLoader<ServiceBindingConverter> loader = ServiceLoader.load(ServiceBindingConverter.class,
+                Thread.currentThread().getContextClassLoader());
+        for (ServiceBindingConverter c : loader) {
+            result.add(c);
+        }
+        return result;
+    }
+
+    @Override
+    public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
+        if (serviceBindings.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<ConfigSource> result = new ArrayList<>();
+        for (ServiceBindingConverter converter : serviceBindingConverters) {
+            Optional<ServiceBindingConfigSource> optional = converter.convert(serviceBindings);
+            if (optional.isPresent()) {
+                result.add(optional.get());
+            }
+        }
+        for (ServiceBinding serviceBinding : serviceBindings) {
+            Map<String, String> serviceBindingProperties = serviceBinding.getProperties();
+            Map<String, String> rawConfigSourceProperties = new HashMap<>();
+            for (Map.Entry<String, String> entry : serviceBindingProperties.entrySet()) {
+                rawConfigSourceProperties.put("quarkus.service-binding." + serviceBinding.getName() + "." + entry.getKey(),
+                        entry.getValue());
+            }
+            result.add(new ServiceBindingConfigSource("service-binding-" + serviceBinding.getName() + "-raw",
+                    rawConfigSourceProperties));
+        }
+        return result;
+    }
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingRecorder.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingRecorder.java
new file mode 100644
index 0000000000000..2bf23b933f3d7
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingRecorder.java
@@ -0,0 +1,43 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.util.Collections;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+import org.jboss.logging.Logger;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class KubernetesServiceBindingRecorder {
+
+    private static final Logger log = Logger.getLogger(KubernetesServiceBindingRecorder.class);
+
+    public RuntimeValue<ConfigSourceProvider> configSources(KubernetesServiceBindingConfig kubernetesServiceBindingConfig) {
+        if (!kubernetesServiceBindingConfig.enabled) {
+            log.debug(
+                    "No attempt will be made to bind configuration based on Kubernetes ServiceBinding because the feature was not enabled.");
+            return emptyRuntimeValue();
+        }
+        if (!kubernetesServiceBindingConfig.root.isPresent()) {
+            log.debug(
+                    "No attempt will be made to bind configuration based on Kubernetes Service Binding because the binding root was not specified.");
+            return emptyRuntimeValue();
+        }
+
+        return new RuntimeValue<>(new KubernetesServiceBindingConfigSourceProvider(kubernetesServiceBindingConfig.root.get()));
+    }
+
+    private RuntimeValue<ConfigSourceProvider> emptyRuntimeValue() {
+        return new RuntimeValue<>(new EmptyConfigSourceProvider());
+    }
+
+    private static class EmptyConfigSourceProvider implements ConfigSourceProvider {
+
+        @Override
+        public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
+            return Collections.emptyList();
+        }
+    }
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBinding.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBinding.java
new file mode 100644
index 0000000000000..a9a12bdd00b1c
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBinding.java
@@ -0,0 +1,142 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Contains all the necessary information about a service binding
+ */
+public final class ServiceBinding {
+
+    private static final Logger log = Logger.getLogger(ServiceBinding.class);
+
+    private static final String PROVIDER = "provider";
+    private static final String TYPE = "type";
+
+    private final String name;
+    private final String provider;
+    private final Map<String, String> properties;
+    private final String type;
+
+    public ServiceBinding(Path bindingDirectory) {
+        this(bindingDirectory.getFileName().toString(), getFilenameToContentMap(bindingDirectory), bindingDirectory);
+    }
+
+    // visible for testing
+    ServiceBinding(String name, Map<String, String> filenameToContentMap, Path bindingDirectory) {
+        Map<String, String> properties = new HashMap<>();
+        String type = null;
+        String provider = null;
+        for (Map.Entry<String, String> entry : filenameToContentMap.entrySet()) {
+            if (TYPE.equals(entry.getKey())) {
+                type = entry.getValue();
+            } else if (PROVIDER.equals(entry.getKey())) {
+                provider = entry.getValue();
+            } else {
+                properties.put(entry.getKey(), entry.getValue());
+            }
+        }
+
+        if (type == null) {
+            throw new IllegalArgumentException("Directory '" + bindingDirectory
+                    + "' does not represent a valid Service ServiceBinding directory as it does specify a type");
+        }
+
+        this.name = name;
+        this.type = type;
+        this.provider = provider;
+        this.properties = Collections.unmodifiableMap(properties);
+    }
+
+    private static Map<String, String> getFilenameToContentMap(Path directory) {
+        if (!Files.exists(directory) || !Files.isDirectory(directory)) {
+            log.warn("File '" + directory + "' is not a proper service binding directory so it will skipped");
+            return Collections.emptyMap();
+        }
+
+        File[] files = directory.toFile().listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File f) {
+                try {
+                    return !Files.isHidden(f.toPath()) && !Files.isDirectory(f.toPath());
+                } catch (IOException e) {
+                    throw new IllegalStateException("Unable to determine if file '" + f + "' is a regular file", e);
+                }
+            }
+        });
+
+        Map<String, String> result = new HashMap<>();
+        if (files != null) {
+            for (File f : files) {
+                try {
+                    result.put(f.toPath().getFileName().toString(),
+                            new String(Files.readAllBytes(f.toPath()), StandardCharsets.UTF_8).trim());
+                } catch (IOException e) {
+                    throw new IllegalStateException("Unable to read file '" + f + "'", e);
+                }
+            }
+        }
+        return result;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getProvider() {
+        return provider;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceBinding{" +
+                "name='" + name + '\'' +
+                ", provider='" + provider + '\'' +
+                ", type='" + type + '\'' +
+                '}';
+    }
+
+    public static List<ServiceBinding> matchingByType(String type, List<ServiceBinding> all) {
+        Objects.requireNonNull(type, "Type must not be null");
+        List<ServiceBinding> result = new ArrayList<>();
+        for (ServiceBinding binding : all) {
+            if (type.equals(binding.getType())) {
+                result.add(binding);
+            }
+        }
+        return result;
+    }
+
+    public static Optional<ServiceBinding> singleMatchingByType(String type, List<ServiceBinding> all) {
+        List<ServiceBinding> allMatching = matchingByType(type, all);
+        if (allMatching.isEmpty()) {
+            return Optional.empty();
+        }
+        ServiceBinding first = allMatching.get(0);
+        if (allMatching.size() > 1) {
+            log.warn("More than one ServiceBinding matches type '" + type + "', but only " + first + " will be used");
+        }
+        return Optional.of(first);
+    }
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingConfigSource.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingConfigSource.java
new file mode 100644
index 0000000000000..de0bd14dabeaf
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingConfigSource.java
@@ -0,0 +1,12 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.util.Map;
+
+import io.smallrye.config.common.MapBackedConfigSource;
+
+public class ServiceBindingConfigSource extends MapBackedConfigSource {
+
+    public ServiceBindingConfigSource(String name, Map<String, String> propertyMap) {
+        super(name, propertyMap, 270, false);
+    }
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingConverter.java b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingConverter.java
new file mode 100644
index 0000000000000..861c3bcbd76cf
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingConverter.java
@@ -0,0 +1,9 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface ServiceBindingConverter {
+
+    Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings);
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kubernetes-service-binding/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..ec28e4874c408
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,8 @@
+---
+name: "Kubernetes Service Binding"
+metadata:
+  keywords:
+  - "kubernetes-service-binding"
+  categories:
+  - "cloud"
+  status: "preview"
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceProviderTest.java b/extensions/kubernetes-service-binding/runtime/src/test/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceProviderTest.java
new file mode 100644
index 0000000000000..587806ad1c56c
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/java/io/quarkus/kubernetes/service/binding/runtime/KubernetesServiceBindingConfigSourceProviderTest.java
@@ -0,0 +1,71 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.junit.jupiter.api.Test;
+
+class KubernetesServiceBindingConfigSourceProviderTest {
+
+    @Test
+    void testNonExistentDir() throws IOException {
+        Path path = Files.createTempDirectory("tmp");
+        KubernetesServiceBindingConfigSourceProvider configSourceProvider = new KubernetesServiceBindingConfigSourceProvider(
+                path.resolve("non-existent").toString(), Collections.emptyList());
+        Iterable<ConfigSource> configSources = configSourceProvider
+                .getConfigSources(Thread.currentThread().getContextClassLoader());
+        assertThat(configSources).isEmpty();
+    }
+
+    @Test
+    void testNotDir() throws IOException {
+        Path path = Files.createTempDirectory("tmp");
+        assertThatIllegalArgumentException().isThrownBy(() -> {
+            new KubernetesServiceBindingConfigSourceProvider(
+                    Files.createFile(path.resolve("file")).toString(), Collections.emptyList());
+        });
+    }
+
+    @Test
+    void test() {
+        Path path = Paths.get("src/test/resources/k8s");
+        KubernetesServiceBindingConfigSourceProvider configSourceProvider = new KubernetesServiceBindingConfigSourceProvider(
+                path.toString(), Collections.singletonList(new ServiceBindingConverter() {
+                    @Override
+                    public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
+                        for (ServiceBinding serviceBinding : serviceBindings) {
+                            if ("test-type-1".equals(serviceBinding.getType())) {
+                                return Optional.of(new ServiceBindingConfigSource("test", Collections.singletonMap("key",
+                                        serviceBinding.getProperties().get("test-secret-key"))));
+                            }
+                        }
+                        return Optional.of(new ServiceBindingConfigSource("test", Collections.singletonMap("key",
+                                ServiceBinding.matchingByType("test-type-1", serviceBindings).get(0).getProperties()
+                                        .get("test-secret-key"))));
+                    }
+                }));
+        Iterable<ConfigSource> configSources = configSourceProvider
+                .getConfigSources(Thread.currentThread().getContextClassLoader());
+        assertThat(configSources).hasSize(3).extracting("name").containsOnly("test", "service-binding-test-name-raw",
+                "service-binding-test-k8s-raw");
+        assertThat(configSources).filteredOn(c -> c.getName().equals("test")).singleElement().satisfies(c -> {
+            assertThat(c.getProperties()).containsExactly(entry("key", "test-secret-value"));
+        });
+        assertThat(configSources).filteredOn(c -> c.getName().equals("service-binding-test-name-raw")).singleElement()
+                .satisfies(c -> {
+                    assertThat(c.getProperties()).containsOnly(
+                            entry("quarkus.service-binding.test-name.test-secret-key", "test-secret-value-2"),
+                            entry("quarkus.service-binding.test-name.test-other-secret-key", "test-other-secret-value-2"));
+                });
+    }
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingTest.java b/extensions/kubernetes-service-binding/runtime/src/test/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingTest.java
new file mode 100644
index 0000000000000..32b2576979dd5
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/java/io/quarkus/kubernetes/service/binding/runtime/ServiceBindingTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.kubernetes.service.binding.runtime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Test;
+
+class ServiceBindingTest {
+
+    private final Path root = Paths.get("src/test/resources/k8s");
+
+    @Test
+    void testInvalid() throws IOException {
+        Path path = Files.createTempDirectory("invalid-binding");
+        assertThatIllegalArgumentException().isThrownBy(() -> new ServiceBinding(path));
+    }
+
+    @Test
+    void test() {
+        ServiceBinding binding = new ServiceBinding(root.resolve("test-name"));
+        assertThat(binding.getType()).isEqualTo("test-type-2");
+        assertThat(binding.getProvider()).isEqualTo("test-provider-2");
+        assertThat(binding.getProperties()).containsOnly(
+                entry("test-secret-key", "test-secret-value-2"),
+                entry("test-other-secret-key", "test-other-secret-value-2"));
+    }
+
+    @Test
+    void testK8s() {
+        //When bindings are provided as a k8s configmap secret pairs data files will be symlinks to hidden directories
+        ServiceBinding binding = new ServiceBinding(root.resolve("test-k8s"));
+        assertThat(binding.getType()).isEqualTo("test-type-1");
+        assertThat(binding.getProvider()).isEqualTo("test-provider-1");
+        assertThat(binding.getProperties()).containsExactly(entry("test-secret-key", "test-secret-value"));
+    }
+
+}
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/provider
new file mode 100644
index 0000000000000..0036389c3b873
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/provider
@@ -0,0 +1 @@
+test-provider-1
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/test-secret-key
new file mode 100644
index 0000000000000..fffe74ef7102e
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/test-secret-key
@@ -0,0 +1 @@
+test-secret-value
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/type
new file mode 100644
index 0000000000000..b3f16a9424d28
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-dir/type
@@ -0,0 +1 @@
+test-type-1
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir
new file mode 120000
index 0000000000000..bc3e42406cdad
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/.hidden-symlink-dir
@@ -0,0 +1 @@
+.hidden-dir/
\ No newline at end of file
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider
new file mode 120000
index 0000000000000..d093f1987eb5c
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/provider
@@ -0,0 +1 @@
+.hidden-symlink-dir/provider
\ No newline at end of file
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key
new file mode 120000
index 0000000000000..49eda851c572d
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/test-secret-key
@@ -0,0 +1 @@
+.hidden-symlink-dir/test-secret-key
\ No newline at end of file
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type
new file mode 120000
index 0000000000000..2df1652a93900
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-k8s/type
@@ -0,0 +1 @@
+.hidden-symlink-dir/type
\ No newline at end of file
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/provider b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/provider
new file mode 100644
index 0000000000000..a4f50455cb4c3
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/provider
@@ -0,0 +1 @@
+test-provider-2
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/test-other-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/test-other-secret-key
new file mode 100644
index 0000000000000..501d67d9c1b15
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/test-other-secret-key
@@ -0,0 +1 @@
+test-other-secret-value-2
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/test-secret-key b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/test-secret-key
new file mode 100644
index 0000000000000..97dfe840baa14
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/test-secret-key
@@ -0,0 +1 @@
+test-secret-value-2
diff --git a/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/type b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/type
new file mode 100644
index 0000000000000..b0c27fbe342da
--- /dev/null
+++ b/extensions/kubernetes-service-binding/runtime/src/test/resources/k8s/test-name/type
@@ -0,0 +1 @@
+test-type-2
diff --git a/extensions/kubernetes/minikube/deployment/src/main/java/io/quarkus/minikube/deployment/MinikubeProcessor.java b/extensions/kubernetes/minikube/deployment/src/main/java/io/quarkus/minikube/deployment/MinikubeProcessor.java
index 708663014f7e2..a4d541c5bb9a6 100644
--- a/extensions/kubernetes/minikube/deployment/src/main/java/io/quarkus/minikube/deployment/MinikubeProcessor.java
+++ b/extensions/kubernetes/minikube/deployment/src/main/java/io/quarkus/minikube/deployment/MinikubeProcessor.java
@@ -1,17 +1,171 @@
 package io.quarkus.minikube.deployment;
 
+import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_HTTP_PORT;
 import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT;
+import static io.quarkus.kubernetes.deployment.Constants.HTTP_PORT;
+import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES;
+import static io.quarkus.kubernetes.deployment.Constants.MAX_NODE_PORT_VALUE;
+import static io.quarkus.kubernetes.deployment.Constants.MAX_PORT_NUMBER;
 import static io.quarkus.kubernetes.deployment.Constants.MINIKUBE;
+import static io.quarkus.kubernetes.deployment.Constants.MIN_NODE_PORT_VALUE;
+import static io.quarkus.kubernetes.deployment.Constants.MIN_PORT_NUMBER;
+import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.DEFAULT_PRIORITY;
 
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import io.dekorate.kubernetes.annotation.ServiceType;
+import io.dekorate.kubernetes.config.EnvBuilder;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.kubernetes.decorator.ApplyImagePullPolicyDecorator;
+import io.dekorate.project.Project;
+import io.quarkus.container.spi.BaseImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageLabelBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.kubernetes.deployment.AddNodePortDecorator;
+import io.quarkus.kubernetes.deployment.ApplyContainerImageDecorator;
+import io.quarkus.kubernetes.deployment.ApplyHttpGetActionPortDecorator;
+import io.quarkus.kubernetes.deployment.ApplyServiceTypeDecorator;
+import io.quarkus.kubernetes.deployment.EnvConverter;
+import io.quarkus.kubernetes.deployment.KubernetesCommonHelper;
+import io.quarkus.kubernetes.deployment.KubernetesConfig;
+import io.quarkus.kubernetes.deployment.ResourceNameUtil;
+import io.quarkus.kubernetes.spi.ConfiguratorBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesAnnotationBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
 import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesEnvBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesLabelBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesPortBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
 
 public class MinikubeProcessor {
 
+    public static final String DEFAULT_HASH_ALGORITHM = "SHA-256";
+    private static final int MINIKUBE_PRIORITY = DEFAULT_PRIORITY + 20;
+
+    @BuildStep
+    public void checkMinikube(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
+        deploymentTargets.produce(new KubernetesDeploymentTargetBuildItem(MINIKUBE, DEPLOYMENT, MINIKUBE_PRIORITY, true));
+    }
+
+    @BuildStep
+    public void createAnnotations(KubernetesConfig config, BuildProducer<KubernetesAnnotationBuildItem> annotations) {
+        config.getAnnotations().forEach((k, v) -> {
+            annotations.produce(new KubernetesAnnotationBuildItem(k, v, MINIKUBE));
+        });
+    }
+
     @BuildStep
-    public void checkOpenshift(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
-        deploymentTargets
-                .produce(new KubernetesDeploymentTargetBuildItem(MINIKUBE, DEPLOYMENT, true));
+    public void createLabels(KubernetesConfig config, BuildProducer<KubernetesLabelBuildItem> labels,
+            BuildProducer<ContainerImageLabelBuildItem> imageLabels) {
+        config.getLabels().forEach((k, v) -> {
+            labels.produce(new KubernetesLabelBuildItem(k, v, MINIKUBE));
+            imageLabels.produce(new ContainerImageLabelBuildItem(k, v));
+        });
     }
+
+    @BuildStep
+    public List<ConfiguratorBuildItem> createConfigurators(KubernetesConfig config, List<KubernetesPortBuildItem> ports) {
+        List<ConfiguratorBuildItem> result = new ArrayList<>();
+        result.addAll(KubernetesCommonHelper.createPlatformConfigurators(config));
+        result.addAll(KubernetesCommonHelper.createGlobalConfigurators(ports));
+        return result;
+
+    }
+
+    @BuildStep
+    public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applicationInfo,
+            OutputTargetBuildItem outputTarget,
+            KubernetesConfig config,
+            PackageConfig packageConfig,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration,
+            List<KubernetesAnnotationBuildItem> annotations,
+            List<KubernetesLabelBuildItem> labels,
+            List<KubernetesEnvBuildItem> envs,
+            Optional<BaseImageInfoBuildItem> baseImage,
+            Optional<ContainerImageInfoBuildItem> image,
+            Optional<KubernetesCommandBuildItem> command,
+            List<KubernetesPortBuildItem> ports,
+            Optional<KubernetesHealthLivenessPathBuildItem> livenessPath,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessPath,
+            List<KubernetesRoleBuildItem> roles,
+            List<KubernetesRoleBindingBuildItem> roleBindings) {
+
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        String name = ResourceNameUtil.getResourceName(config, applicationInfo);
+
+        Optional<Project> project = KubernetesCommonHelper.createProject(applicationInfo, outputTarget, packageConfig);
+        result.addAll(KubernetesCommonHelper.createDecorators(project, MINIKUBE, name, config,
+                metricsConfiguration,
+                annotations, labels, command,
+                ports, livenessPath, readinessPath, roles, roleBindings));
+
+        image.ifPresent(i -> {
+            result.add(new DecoratorBuildItem(MINIKUBE, new ApplyContainerImageDecorator(name, i.getImage())));
+        });
+
+        Stream.concat(config.convertToBuildItems().stream(),
+                envs.stream().filter(e -> e.getTarget() == null || KUBERNETES.equals(e.getTarget()))).forEach(e -> {
+                    result.add(new DecoratorBuildItem(MINIKUBE,
+                            new AddEnvVarDecorator(ApplicationContainerDecorator.ANY, name, new EnvBuilder()
+                                    .withName(EnvConverter.convertName(e.getName()))
+                                    .withValue(e.getValue())
+                                    .withSecret(e.getSecret())
+                                    .withConfigmap(e.getConfigMap())
+                                    .withField(e.getField())
+                                    .build())));
+                });
+
+        result.add(new DecoratorBuildItem(MINIKUBE, new ApplyImagePullPolicyDecorator(name, "IfNotPresent")));
+
+        //Service handling
+        result.add(new DecoratorBuildItem(MINIKUBE, new ApplyServiceTypeDecorator(name, ServiceType.NodePort.name())));
+        result.add(new DecoratorBuildItem(MINIKUBE, new AddNodePortDecorator(name, config.getNodePort()
+                .orElseGet(() -> getStablePortNumberInRange(name, MIN_NODE_PORT_VALUE, MAX_NODE_PORT_VALUE)))));
+
+        //Probe port handling
+        Integer port = ports.stream().filter(p -> HTTP_PORT.equals(p.getName())).map(KubernetesPortBuildItem::getPort)
+                .findFirst().orElse(DEFAULT_HTTP_PORT);
+        result.add(new DecoratorBuildItem(MINIKUBE, new ApplyHttpGetActionPortDecorator(name, name, port)));
+
+        return result;
+    }
+
+    /**
+     * Given a string, generate a port number within the supplied range
+     * The output is always the same (between {@code min} and {@code max})
+     * given the same input and it's useful when we need to generate a port number
+     * which needs to stay the same but we don't care about the exact value
+     */
+    private int getStablePortNumberInRange(String input, int min, int max) {
+        if (min < MIN_PORT_NUMBER || max > MAX_PORT_NUMBER) {
+            throw new IllegalArgumentException(
+                    String.format("Port number range must be within [%d-%d]", MIN_PORT_NUMBER, MAX_PORT_NUMBER));
+        }
+
+        try {
+            byte[] hash = MessageDigest.getInstance(DEFAULT_HASH_ALGORITHM).digest(input.getBytes(StandardCharsets.UTF_8));
+            return min + new BigInteger(hash).mod(BigInteger.valueOf(max - min)).intValue();
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to generate stable port number from input string: '" + input + "'", e);
+        }
+    }
+
 }
diff --git a/extensions/kubernetes/minikube/runtime/pom.xml b/extensions/kubernetes/minikube/runtime/pom.xml
index f4e7b7b9223bf..22c554701e7f9 100644
--- a/extensions/kubernetes/minikube/runtime/pom.xml
+++ b/extensions/kubernetes/minikube/runtime/pom.xml
@@ -20,6 +20,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/kubernetes/openshift/deployment/pom.xml b/extensions/kubernetes/openshift/deployment/pom.xml
index 0f2f226cbf732..98a6583756a03 100644
--- a/extensions/kubernetes/openshift/deployment/pom.xml
+++ b/extensions/kubernetes/openshift/deployment/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-container-image-s2i-deployment</artifactId>
+            <artifactId>quarkus-container-image-openshift-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftDevConsoleProcessor.java b/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftDevConsoleProcessor.java
new file mode 100644
index 0000000000000..59a1bb6c1d7b3
--- /dev/null
+++ b/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftDevConsoleProcessor.java
@@ -0,0 +1,16 @@
+package io.quarkus.openshift.deployment;
+
+import java.util.Collections;
+
+import io.quarkus.container.image.deployment.devconsole.RebuildHandler;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+
+public class OpenshiftDevConsoleProcessor {
+
+    @BuildStep
+    DevConsoleRouteBuildItem builder() {
+        return new DevConsoleRouteBuildItem("deploy", "POST",
+                new RebuildHandler(Collections.singletonMap("quarkus.kubernetes.deploy", "true")));
+    }
+}
diff --git a/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftProcessor.java b/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftProcessor.java
index bad2da2061359..ac75dbdb7514c 100644
--- a/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftProcessor.java
+++ b/extensions/kubernetes/openshift/deployment/src/main/java/io/quarkus/openshift/deployment/OpenshiftProcessor.java
@@ -3,12 +3,20 @@
 import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_CONFIG;
 import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT;
 
+import io.quarkus.container.image.openshift.deployment.OpenshiftBuild;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
 
 public class OpenshiftProcessor {
 
+    @BuildStep(onlyIf = OpenshiftBuild.class)
+    public CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.CONTAINER_IMAGE_OPENSHIFT);
+    }
+
     @BuildStep
     public void checkOpenshift(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
         deploymentTargets
diff --git a/extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/deploy.html b/extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/deploy.html
new file mode 100644
index 0000000000000..3a7793ced1fe1
--- /dev/null
+++ b/extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/deploy.html
@@ -0,0 +1,26 @@
+{#include main}
+{#title}Deploy to OpenShift{/title}
+{#body}
+
+<form method="post" enctype="application/x-www-form-urlencoded">
+    <div class="form-group">
+        <label for="quarkus.build.package-type">Build Type</label>
+        <select name="quarkus.build.package-type" class="form-control">
+            <option value="">Default</option>
+            <option value="jar">Jar</option>
+            <option value="mutable-jar">Mutable Jar</option>
+            <option value="fast-jar">Fast Jar</option>
+            <option value="native">Native</option>
+        </select>
+    </div>
+    <div class="form-group">
+        <label for="quarkus.openshift.expose">Expose</label>
+        <select name="quarkus.openshift.expose" class="form-control">
+            <option value="true">Yes</option>
+            <option value="false">No</option>
+        </select>
+    </div>
+    <button type="submit" class="btn btn-primary">Deploy</button>
+</form>
+{/body}
+{/include}
diff --git a/extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/embedded.html b/extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..9ce3ee5cf5d18
--- /dev/null
+++ b/extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,3 @@
+<a href="{urlbase}/deploy" class="badge badge-light">
+    <i class="fa fa-rocket fa-fw"></i>
+    Deploy</a>
diff --git a/extensions/kubernetes/openshift/runtime/pom.xml b/extensions/kubernetes/openshift/runtime/pom.xml
index 97b5fdce4be85..2bdf75641494b 100644
--- a/extensions/kubernetes/openshift/runtime/pom.xml
+++ b/extensions/kubernetes/openshift/runtime/pom.xml
@@ -20,6 +20,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-openshift</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/kubernetes/pom.xml b/extensions/kubernetes/pom.xml
index 879223411eeae..a595eee77e7b1 100644
--- a/extensions/kubernetes/pom.xml
+++ b/extensions/kubernetes/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/ConfiguratorBuildItem.java b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/ConfiguratorBuildItem.java
new file mode 100644
index 0000000000000..8eb01d10b9645
--- /dev/null
+++ b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/ConfiguratorBuildItem.java
@@ -0,0 +1,38 @@
+package io.quarkus.kubernetes.spi;
+
+import java.util.Optional;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A build item that wraps around Configurator objects.
+ * The purpose of those build items is influence the configuration that will be feed to the generator process.
+ * Configurators are similar to decorators, but are applied to configuration instead of generated resources.
+ */
+public final class ConfiguratorBuildItem extends MultiBuildItem {
+
+    /**
+     * The configurator
+     */
+    private final Object configurator;
+
+    public ConfiguratorBuildItem(Object configurator) {
+        this.configurator = configurator;
+    }
+
+    public Object getConfigurator() {
+        return this.configurator;
+    }
+
+    public boolean matches(Class type) {
+        return type.isInstance(configurator);
+
+    }
+
+    public <C> Optional<C> getConfigurator(Class<C> type) {
+        if (matches(type)) {
+            return Optional.<C> of((C) configurator);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/DecoratorBuildItem.java b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/DecoratorBuildItem.java
new file mode 100644
index 0000000000000..c76bf15b64122
--- /dev/null
+++ b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/DecoratorBuildItem.java
@@ -0,0 +1,52 @@
+
+package io.quarkus.kubernetes.spi;
+
+import java.util.Optional;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * A build item that wraps around Decorator objects.
+ * The purpose of those build items is to perform modification on the generated resources.
+ */
+public final class DecoratorBuildItem extends MultiBuildItem {
+
+    /**
+     * The group the decorator will be applied to.
+     */
+    private final String group;
+
+    /**
+     * The decorator
+     */
+    private final Object decorator;
+
+    public DecoratorBuildItem(Object decorator) {
+        this(null, decorator);
+    }
+
+    public DecoratorBuildItem(String group, Object decorator) {
+        this.group = group;
+        this.decorator = decorator;
+    }
+
+    public String getGroup() {
+        return this.group;
+    }
+
+    public Object getDecorator() {
+        return this.decorator;
+    }
+
+    public boolean matches(Class type) {
+        return type.isInstance(decorator);
+
+    }
+
+    public <D> Optional<D> getDecorator(Class<D> type) {
+        if (matches(type)) {
+            return Optional.<D> of((D) decorator);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesDeploymentTargetBuildItem.java b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesDeploymentTargetBuildItem.java
index f481acb8ec380..15afc75f52c3d 100644
--- a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesDeploymentTargetBuildItem.java
+++ b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesDeploymentTargetBuildItem.java
@@ -15,7 +15,7 @@
 /**
  * Used to control which Kubernetes targets have their files generated and which get deployed
  * Since these can be generated by various locations, code that needs the "final"
- * set of items, should use the @{code mergeList} method to get a new list
+ * set of items, should use the {@code mergeList} method to get a new list
  * with merged items.
  * Furthermore, if priorities need to be taken into account, the merged list should
  * also be sorted
diff --git a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBindingBuildItem.java b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBindingBuildItem.java
new file mode 100644
index 0000000000000..6075a1204d7f2
--- /dev/null
+++ b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBindingBuildItem.java
@@ -0,0 +1,49 @@
+package io.quarkus.kubernetes.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Produce this build item to request the Kubernetes extension to generate
+ * a Kubernetes {@code RoleBinding} resource. The configuration here is limited;
+ * in particular, you can't specify subjects of the role binding. The role will always
+ * be bound to the application's service account.
+ * <p>
+ * Note that this can't be used to generate a {@code ClusterRoleBinding}.
+ */
+public final class KubernetesRoleBindingBuildItem extends MultiBuildItem {
+    /**
+     * Name of the generated {@code RoleBinding} resource.
+     * Can be {@code null}, in which case the resource name is autogenerated.
+     */
+    private final String name;
+    /**
+     * Name of the bound role.
+     */
+    private final String role;
+    /**
+     * If {@code true}, the binding refers to a {@code ClusterRole}, otherwise to a namespaced {@code Role}.
+     */
+    private final boolean clusterWide;
+
+    public KubernetesRoleBindingBuildItem(String role, boolean clusterWide) {
+        this(null, role, clusterWide);
+    }
+
+    public KubernetesRoleBindingBuildItem(String name, String role, boolean clusterWide) {
+        this.name = name;
+        this.role = role;
+        this.clusterWide = clusterWide;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getRole() {
+        return this.role;
+    }
+
+    public boolean isClusterWide() {
+        return clusterWide;
+    }
+}
diff --git a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBuildItem.java b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBuildItem.java
index 95d0f48532c87..52a7501837a36 100644
--- a/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBuildItem.java
+++ b/extensions/kubernetes/spi/src/main/java/io/quarkus/kubernetes/spi/KubernetesRoleBuildItem.java
@@ -1,16 +1,79 @@
 package io.quarkus.kubernetes.spi;
 
+import java.util.List;
+
 import io.quarkus.builder.item.MultiBuildItem;
 
+/**
+ * Produce this build item to request the Kubernetes extension to generate
+ * a Kubernetes {@code Role} resource.
+ * <p>
+ * Note that this can't be used to generate a {@code ClusterRole}.
+ */
 public final class KubernetesRoleBuildItem extends MultiBuildItem {
+    /**
+     * Name of the generated {@code Role} resource.
+     */
+    private final String name;
+    /**
+     * The {@code PolicyRule} resources for this {@code Role}.
+     */
+    private final List<PolicyRule> rules;
+
+    public KubernetesRoleBuildItem(String name, List<PolicyRule> rules) {
+        this.name = name;
+        this.rules = rules;
+    }
 
-    private final String role;
+    public String getName() {
+        return name;
+    }
 
-    public KubernetesRoleBuildItem(String role) {
-        this.role = role;
+    public List<PolicyRule> getRules() {
+        return rules;
     }
 
-    public String getRole() {
-        return this.role;
+    /**
+     * Corresponds directly to the Kubernetes {@code PolicyRule} resource.
+     */
+    public static final class PolicyRule {
+        private final List<String> apiGroups;
+        private final List<String> nonResourceURLs;
+        private final List<String> resourceNames;
+        private final List<String> resources;
+        private final List<String> verbs;
+
+        public PolicyRule(List<String> apiGroups, List<String> resources, List<String> verbs) {
+            this(apiGroups, null, null, resources, verbs);
+        }
+
+        public PolicyRule(List<String> apiGroups, List<String> nonResourceURLs, List<String> resourceNames,
+                List<String> resources, List<String> verbs) {
+            this.apiGroups = apiGroups;
+            this.nonResourceURLs = nonResourceURLs;
+            this.resourceNames = resourceNames;
+            this.resources = resources;
+            this.verbs = verbs;
+        }
+
+        public List<String> getApiGroups() {
+            return apiGroups;
+        }
+
+        public List<String> getNonResourceURLs() {
+            return nonResourceURLs;
+        }
+
+        public List<String> getResourceNames() {
+            return resourceNames;
+        }
+
+        public List<String> getResources() {
+            return resources;
+        }
+
+        public List<String> getVerbs() {
+            return verbs;
+        }
     }
 }
diff --git a/extensions/kubernetes/spi/src/test/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItemTest.java b/extensions/kubernetes/spi/src/test/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItemTest.java
index 106185fe5188a..b3f9f6f299c3e 100644
--- a/extensions/kubernetes/spi/src/test/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItemTest.java
+++ b/extensions/kubernetes/spi/src/test/java/io/quarkus/kubernetes/spi/KubernetesEnvBuildItemTest.java
@@ -5,7 +5,7 @@
  * 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
  * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * <p>
  * 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
diff --git a/extensions/kubernetes/vanilla/deployment/pom.xml b/extensions/kubernetes/vanilla/deployment/pom.xml
index b5d2048385d7a..73a0f7b24f3c2 100644
--- a/extensions/kubernetes/vanilla/deployment/pom.xml
+++ b/extensions/kubernetes/vanilla/deployment/pom.xml
@@ -29,10 +29,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.dekorate</groupId>
             <artifactId>kubernetes-annotations</artifactId>
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java
deleted file mode 100644
index 5e7aef114dc1b..0000000000000
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddContainerPortDecorator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.quarkus.kubernetes.deployment;
-
-import io.dekorate.deps.kubernetes.api.model.ContainerBuilder;
-import io.dekorate.kubernetes.annotation.Protocol;
-import io.dekorate.kubernetes.config.Port;
-import io.dekorate.kubernetes.decorator.AddSidecarDecorator;
-import io.dekorate.kubernetes.decorator.ContainerDecorator;
-import io.dekorate.kubernetes.decorator.Decorator;
-import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
-
-/**
- * Adapted from Dekorate's {@link io.dekorate.kubernetes.decorator.AddPortDecorator} in order to
- * address the limitation that the port was not being added (due to missing metadata)
- */
-class AddContainerPortDecorator extends Decorator<ContainerBuilder> {
-
-    private final Port port;
-
-    AddContainerPortDecorator(Port port) {
-        this.port = port;
-    }
-
-    @Override
-    public void visit(ContainerBuilder containerBuilder) {
-        containerBuilder.addNewPort()
-                .withName(port.getName())
-                .withHostPort(port.getHostPort() > 0 ? port.getHostPort() : null)
-                .withContainerPort(port.getContainerPort())
-                .withProtocol(port.getProtocol() != null ? port.getProtocol().name() : Protocol.TCP.name())
-                .endPort();
-    }
-
-    public Class<? extends Decorator>[] after() {
-        return new Class[] { ResourceProvidingDecorator.class, ContainerDecorator.class, AddSidecarDecorator.class };
-    }
-}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java
index 2ad6dbc99f468..ddf9433fc2c4f 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNamespaceDecorator.java
@@ -5,7 +5,6 @@
 import io.dekorate.deps.kubernetes.api.model.ObjectMeta;
 import io.dekorate.deps.kubernetes.api.model.ObjectMetaBuilder;
 import io.dekorate.kubernetes.decorator.AddSidecarDecorator;
-import io.dekorate.kubernetes.decorator.ContainerDecorator;
 import io.dekorate.kubernetes.decorator.Decorator;
 import io.dekorate.kubernetes.decorator.NamedResourceDecorator;
 import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
@@ -25,7 +24,7 @@ public void andThenVisit(ObjectMetaBuilder builder, ObjectMeta resourceMeta) {
 
     @Override
     public Class<? extends Decorator>[] after() {
-        return new Class[] { ResourceProvidingDecorator.class, ContainerDecorator.class, AddSidecarDecorator.class };
+        return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class };
     }
 
     @Override
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java
new file mode 100644
index 0000000000000..f173102360c78
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddRoleResourceDecorator.java
@@ -0,0 +1,43 @@
+package io.quarkus.kubernetes.deployment;
+
+import java.util.stream.Collectors;
+
+import io.dekorate.deps.kubernetes.api.model.KubernetesListBuilder;
+import io.dekorate.deps.kubernetes.api.model.ObjectMeta;
+import io.dekorate.deps.kubernetes.api.model.rbac.PolicyRuleBuilder;
+import io.dekorate.deps.kubernetes.api.model.rbac.RoleBuilder;
+import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+
+class AddRoleResourceDecorator extends ResourceProvidingDecorator<KubernetesListBuilder> {
+    private final KubernetesRoleBuildItem spec;
+
+    public AddRoleResourceDecorator(KubernetesRoleBuildItem buildItem) {
+        this.spec = buildItem;
+    }
+
+    public void visit(KubernetesListBuilder list) {
+        ObjectMeta meta = getMandatoryDeploymentMetadata(list);
+
+        if (contains(list, "rbac.authorization.k8s.io/v1", "Role", spec.getName())) {
+            return;
+        }
+
+        list.addToItems(new RoleBuilder()
+                .withNewMetadata()
+                .withName(spec.getName())
+                .withLabels(meta.getLabels())
+                .endMetadata()
+                .withRules(
+                        spec.getRules()
+                                .stream()
+                                .map(it -> new PolicyRuleBuilder()
+                                        .withApiGroups(it.getApiGroups())
+                                        .withNonResourceURLs(it.getNonResourceURLs())
+                                        .withResourceNames(it.getResourceNames())
+                                        .withResources(it.getResources())
+                                        .withVerbs(it.getVerbs())
+                                        .build())
+                                .collect(Collectors.toList())));
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Annotations.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Annotations.java
deleted file mode 100644
index 17b9b0c11acc1..0000000000000
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Annotations.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.quarkus.kubernetes.deployment;
-
-final class Annotations {
-
-    private Annotations() {
-    }
-
-    static final class Prometheus {
-
-        private Prometheus() {
-        }
-
-        private static final String PREFIX = "prometheus.io/";
-
-        static final String SCRAPE = PREFIX + "scrape";
-        static final String PATH = PREFIX + "path";
-        static final String PORT = PREFIX + "port";
-    }
-}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyExpositionConfigurator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyExpositionConfigurator.java
new file mode 100644
index 0000000000000..a5d033c96602b
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyExpositionConfigurator.java
@@ -0,0 +1,23 @@
+package io.quarkus.kubernetes.deployment;
+
+import io.dekorate.kubernetes.config.BaseConfigFluent;
+import io.dekorate.kubernetes.config.Configurator;
+
+public class ApplyExpositionConfigurator extends Configurator<BaseConfigFluent> {
+
+    private final ExpositionConfig expositionConfig;
+
+    public ApplyExpositionConfigurator(ExpositionConfig expositionConfig) {
+        this.expositionConfig = expositionConfig;
+    }
+
+    @Override
+    public void visit(BaseConfigFluent config) {
+        if (expositionConfig.expose) {
+            config.withExpose(true);
+            if (expositionConfig.host.isPresent()) {
+                config.withHost(expositionConfig.host.get());
+            }
+        }
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java
index d5ae0fb23b241..45b306d5b2b38 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java
@@ -6,27 +6,35 @@
 import io.dekorate.kubernetes.decorator.AddReadinessProbeDecorator;
 import io.dekorate.kubernetes.decorator.AddSidecarDecorator;
 import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
-import io.dekorate.kubernetes.decorator.ContainerDecorator;
 import io.dekorate.kubernetes.decorator.Decorator;
 import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
 
 public class ApplyHttpGetActionPortDecorator extends ApplicationContainerDecorator<HTTPGetActionFluent<?>> {
 
-    private final String port;
+    private final Integer port;
 
-    public ApplyHttpGetActionPortDecorator(String port) {
-        super(ANY, ANY); //We need to apply this to all deployments and all containers.
+    public ApplyHttpGetActionPortDecorator(Integer port) {
+        this(ANY, ANY, port);
+    }
+
+    public ApplyHttpGetActionPortDecorator(String deployment, String container, Integer port) {
+        super(deployment, container);
         this.port = port;
     }
 
     @Override
     public void andThenVisit(HTTPGetActionFluent<?> action) {
-        action.withNewPort(port);
+        if (port == null) {
+            // workaround to make sure we don't get a NPE
+            action.withNewPort((String) null);
+        } else {
+            action.withNewPort(port);
+        }
     }
 
     @Override
     public Class<? extends Decorator>[] after() {
-        return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class, ContainerDecorator.class,
+        return new Class[] { ResourceProvidingDecorator.class, AddSidecarDecorator.class,
                 AddLivenessProbeDecorator.class, AddReadinessProbeDecorator.class };
     }
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyImageGroupConfigurator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyImageGroupConfigurator.java
new file mode 100644
index 0000000000000..155961cf6c2cb
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyImageGroupConfigurator.java
@@ -0,0 +1,20 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import io.dekorate.kubernetes.config.Configurator;
+import io.dekorate.kubernetes.config.ImageConfigurationFluent;
+
+public class ApplyImageGroupConfigurator extends Configurator<ImageConfigurationFluent<?>> {
+
+    private final String group;
+
+    public ApplyImageGroupConfigurator(String group) {
+        this.group = group;
+    }
+
+    @Override
+    public void visit(ImageConfigurationFluent<?> config) {
+        config.withGroup(group);
+    }
+
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyImageRegistryConfigurator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyImageRegistryConfigurator.java
new file mode 100644
index 0000000000000..1d4106eaa3a0d
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyImageRegistryConfigurator.java
@@ -0,0 +1,19 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import io.dekorate.kubernetes.config.Configurator;
+import io.dekorate.kubernetes.config.ImageConfigurationFluent;
+
+public class ApplyImageRegistryConfigurator extends Configurator<ImageConfigurationFluent<?>> {
+
+    private final String registry;
+
+    public ApplyImageRegistryConfigurator(String registry) {
+        this.registry = registry;
+    }
+
+    @Override
+    public void visit(ImageConfigurationFluent<?> config) {
+        config.withRegistry(registry);
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java
index d6f828ab6e9be..db619fd12f565 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java
@@ -2,13 +2,15 @@
 
 public final class Constants {
 
-    static final String KUBERNETES = "kubernetes";
+    public static final String KUBERNETES = "kubernetes";
     public static final String MINIKUBE = "minikube";
     public static final String DEPLOYMENT = "Deployment";
     static final String DOCKER = "docker";
 
     public static final String OPENSHIFT = "openshift";
     public static final String DEPLOYMENT_CONFIG = "DeploymentConfig";
+    public static final String ROUTE = "Route";
+    public static final String ROUTE_API_GROUP = "route.openshift.io/v1";
     static final String OPENSHIFT_APP_RUNTIME = "app.openshift.io/runtime";
     static final String S2I = "s2i";
     static final String DEFAULT_S2I_IMAGE_NAME = "s2i-java"; //refers to the Dekorate default image.
@@ -26,13 +28,13 @@ public final class Constants {
     static final String QUARKUS_ANNOTATIONS_VCS_URL = "app.quarkus.io/vcs-url";
     static final String QUARKUS_ANNOTATIONS_BUILD_TIMESTAMP = "app.quarkus.io/build-timestamp";
 
-    static final String HTTP_PORT = "http";
-    static final int DEFAULT_HTTP_PORT = 8080;
+    public static final String HTTP_PORT = "http";
+    public static final int DEFAULT_HTTP_PORT = 8080;
 
-    static final int MIN_PORT_NUMBER = 1;
-    static final int MAX_PORT_NUMBER = 65535;
-    static final int MIN_NODE_PORT_VALUE = 30000;
-    static final int MAX_NODE_PORT_VALUE = 31999;
+    public static final int MIN_PORT_NUMBER = 1;
+    public static final int MAX_PORT_NUMBER = 65535;
+    public static final int MIN_NODE_PORT_VALUE = 30000;
+    public static final int MAX_NODE_PORT_VALUE = 31999;
 
     private Constants() {
     }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerAdapter.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerAdapter.java
index 137b4ad42dbe2..70b254d16881c 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerAdapter.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerAdapter.java
@@ -8,6 +8,7 @@
 import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
 import io.dekorate.kubernetes.decorator.AddLivenessProbeDecorator;
 import io.dekorate.kubernetes.decorator.AddMountDecorator;
+import io.dekorate.kubernetes.decorator.AddPortDecorator;
 import io.dekorate.kubernetes.decorator.AddReadinessProbeDecorator;
 import io.dekorate.kubernetes.decorator.ApplyImagePullPolicyDecorator;
 import io.dekorate.utils.Images;
@@ -37,14 +38,13 @@ public static Container adapt(io.dekorate.kubernetes.config.Container container)
         }
         for (Port port : container.getPorts()) {
             // this was changed to use our patched port decorator
-            builder.accept(new AddContainerPortDecorator(port));
+            builder.accept(new AddPortDecorator(port));
         }
         for (Mount mount : container.getMounts()) {
             builder.accept(new AddMountDecorator(mount));
         }
 
-        builder.accept(new ApplyImagePullPolicyDecorator(container.getImagePullPolicy()));
-
+        builder.accept(new ApplyImagePullPolicyDecorator(name, container.getImagePullPolicy()));
         builder.accept(new AddLivenessProbeDecorator(name, container.getLivenessProbe()));
         builder.accept(new AddReadinessProbeDecorator(name, container.getReadinessProbe()));
         return builder.build();
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConfig.java
index 0a126d7d26fcf..dc94d5dd856bb 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConfig.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConfig.java
@@ -76,13 +76,13 @@ public class ContainerConfig implements EnvVarHolder {
      * The liveness probe.
      */
     @ConfigItem
-    Optional<ProbeConfig> livenessProbe;
+    ProbeConfig livenessProbe;
 
     /**
      * The readiness probe.
      */
     @ConfigItem
-    Optional<ProbeConfig> readinessProbe;
+    ProbeConfig readinessProbe;
 
     /**
      * Volume mounts.
@@ -137,7 +137,8 @@ public String getTargetPlatformName() {
 
     public Collection<Env> convertToEnvs() {
         return convertToBuildItems().stream()
-                .map(kebi -> new Env(kebi.getName(), kebi.getValue(), kebi.getSecret(), kebi.getConfigMap(), kebi.getField()))
+                .map(kebi -> new Env(EnvConverter.convertName(kebi.getName()), kebi.getValue(), kebi.getSecret(),
+                        kebi.getConfigMap(), kebi.getField()))
                 .collect(Collectors.toList());
     }
 
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConverter.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConverter.java
index fdee980d1087f..e7e56816dd661 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConverter.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerConverter.java
@@ -18,8 +18,12 @@ private static ContainerBuilder convert(ContainerConfig c) {
         c.workingDir.ifPresent(b::withWorkingDir);
         c.command.ifPresent(w -> b.withCommand(w.toArray(new String[0])));
         c.arguments.ifPresent(w -> b.withArguments(w.toArray(new String[0])));
-        c.readinessProbe.ifPresent(p -> b.withReadinessProbe(ProbeConverter.convert(p)));
-        c.livenessProbe.ifPresent(p -> b.withLivenessProbe(ProbeConverter.convert(p)));
+        if (c.readinessProbe != null && c.readinessProbe.hasUserSuppliedAction()) {
+            b.withReadinessProbe(ProbeConverter.convert(c.readinessProbe));
+        }
+        if (c.livenessProbe != null && c.livenessProbe.hasUserSuppliedAction()) {
+            b.withLivenessProbe(ProbeConverter.convert(c.livenessProbe));
+        }
         b.addAllToEnvVars(c.convertToEnvs());
         c.ports.entrySet().forEach(e -> b.addToPorts(PortConverter.convert(e)));
         c.mounts.entrySet().forEach(e -> b.addToMounts(MountConverter.convert(e)));
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerImageUtil.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerImageUtil.java
index 647feeb9301ec..d014f45f9e33b 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerImageUtil.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerImageUtil.java
@@ -1,7 +1,5 @@
 package io.quarkus.kubernetes.deployment;
 
-import static io.quarkus.container.image.deployment.util.ImageUtil.hasRegistry;
-
 import java.util.Optional;
 
 import io.quarkus.container.image.deployment.ContainerImageCapabilitiesUtil;
@@ -21,7 +19,7 @@ static boolean isRegistryMissingAndNotS2I(Capabilities capabilities, ContainerIm
             return false;
         }
 
-        return !hasRegistry(containerImageInfo.getImage())
-                && !Capability.CONTAINER_IMAGE_S2I.equals(activeContainerImageCapability.get());
+        return !containerImageInfo.getRegistry().isPresent()
+                && !Capability.CONTAINER_IMAGE_S2I.getName().equals(activeContainerImageCapability.get());
     }
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DisableS2iConfigurator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DisableS2iConfigurator.java
new file mode 100644
index 0000000000000..a3d0c1e048387
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/DisableS2iConfigurator.java
@@ -0,0 +1,13 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import io.dekorate.kubernetes.config.Configurator;
+import io.dekorate.s2i.config.S2iBuildConfigFluent;
+
+public class DisableS2iConfigurator extends Configurator<S2iBuildConfigFluent<?>> {
+
+    @Override
+    public void visit(S2iBuildConfigFluent<?> s2i) {
+        s2i.withEnabled(false);
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java
index 2c46fcc763b14..412c5a8152963 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvConverter.java
@@ -41,6 +41,6 @@ public static List<Env> convert(EnvVarsConfig e) {
     }
 
     public static String convertName(String name) {
-        return name != null ? name.toUpperCase().replace("-", "_") : null;
+        return name != null ? name.toUpperCase().replace('-', '_').replace('.', '_').replace('/', '_') : null;
     }
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromConfigMapKeyConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromConfigMapKeyConfig.java
index 3d7093a2fe1ab..8ec9998c36ae8 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromConfigMapKeyConfig.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromConfigMapKeyConfig.java
@@ -5,7 +5,7 @@
  * 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
  * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * <p>
  * 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
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromKeyConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromKeyConfig.java
index 010d27b8295c5..c307d834f81e0 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromKeyConfig.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/EnvVarFromKeyConfig.java
@@ -5,7 +5,7 @@
  * 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
  * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  * <p>
  * 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
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ExpositionConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ExpositionConfig.java
new file mode 100644
index 0000000000000..e7516132e61f1
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ExpositionConfig.java
@@ -0,0 +1,30 @@
+package io.quarkus.kubernetes.deployment;
+
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class ExpositionConfig {
+
+    /**
+     * If true, the service will be exposed
+     */
+    @ConfigItem
+    boolean expose;
+
+    /**
+     * The host under which the application is going to be exposed
+     */
+    @ConfigItem
+    Optional<String> host;
+
+    /**
+     * Custom annotations to add to exposition (route or ingress) resources
+     */
+    @ConfigItem
+    Map<String, String> annotations;
+
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/HostAliasConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/HostAliasConfig.java
new file mode 100644
index 0000000000000..e13dd9e006129
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/HostAliasConfig.java
@@ -0,0 +1,28 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class HostAliasConfig {
+
+    /**
+     * The ip address
+     *
+     * @return The ip.
+     */
+    @ConfigItem
+    Optional<String> ip;
+
+    /**
+     * The hostnames to resolve to the ip
+     *
+     * @return The path.
+     */
+    @ConfigItem
+    Optional<List<String>> hostnames;
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/HostAliasConverter.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/HostAliasConverter.java
new file mode 100644
index 0000000000000..e2283fe4abb7d
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/HostAliasConverter.java
@@ -0,0 +1,22 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import java.util.Map;
+
+import io.dekorate.kubernetes.config.HostAlias;
+import io.dekorate.kubernetes.config.HostAliasBuilder;
+
+public class HostAliasConverter {
+
+    public static HostAlias convert(Map.Entry<String, HostAliasConfig> e) {
+        return convert(e.getValue()).withIp(e.getKey()).build();
+    }
+
+    public static HostAliasBuilder convert(HostAliasConfig hostAlias) {
+        HostAliasBuilder b = new HostAliasBuilder();
+        hostAlias.hostnames.ifPresent(h -> b.withHostnames(String.join(",", h)));
+
+        return b;
+    }
+
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeConfig.java
index d5561a8b98ce6..d686dfdfee434 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeConfig.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeConfig.java
@@ -91,6 +91,7 @@ public class KnativeConfig implements PlatformConfiguration {
 
     /**
      * The host under which the application is going to be exposed
+     *
      */
     @ConfigItem
     Optional<String> host;
@@ -131,6 +132,12 @@ public class KnativeConfig implements PlatformConfiguration {
     @ConfigItem
     ProbeConfig readinessProbe;
 
+    /**
+     * Prometheus configuration
+     */
+    @ConfigItem
+    PrometheusConfig prometheus;
+
     /**
      * Volume mounts
      */
@@ -191,6 +198,18 @@ public class KnativeConfig implements PlatformConfiguration {
     @ConfigItem
     Map<String, ContainerConfig> containers;
 
+    /**
+     * The host aliases
+     */
+    @ConfigItem
+    Map<String, HostAliasConfig> hostAliases;
+
+    /**
+     * Resources requirements
+     */
+    @ConfigItem
+    ResourcesConfig resources;
+
     public Optional<String> getPartOf() {
         return partOf;
     }
@@ -269,6 +288,10 @@ public ProbeConfig getReadinessProbe() {
         return readinessProbe;
     }
 
+    public PrometheusConfig getPrometheusConfig() {
+        return prometheus;
+    }
+
     public Map<String, MountConfig> getMounts() {
         return mounts;
     }
@@ -309,6 +332,14 @@ public Map<String, ContainerConfig> getSidecars() {
         return containers;
     }
 
+    public Map<String, HostAliasConfig> getHostAliases() {
+        return hostAliases;
+    }
+
+    public ResourcesConfig getResources() {
+        return resources;
+    }
+
     /**
      * Environment variables to add to all containers using the old syntax.
      *
@@ -380,4 +411,35 @@ public EnvVarsConfig getEnv() {
      * Global autoscaling configuration.
      */
     GlobalAutoScalingConfig globalAutoScaling;
+
+    /**
+     * The name of the revision.
+     */
+    Optional<String> revisionName;
+
+    /**
+     * Traffic configuration.
+     */
+    Map<String, TrafficConfig> traffic;
+
+    /**
+     * If set, the secret will mounted to the application container and its contents will be used for application configuration.
+     */
+    @ConfigItem
+    Optional<String> appSecret;
+
+    /**
+     * If set, the config amp will mounted to the application container and its contents will be used for application
+     * configuration.
+     */
+    @ConfigItem
+    Optional<String> appConfigMap;
+
+    public Optional<String> getAppSecret() {
+        return this.appSecret;
+    }
+
+    public Optional<String> getAppConfigMap() {
+        return this.appConfigMap;
+    }
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeProcessor.java
new file mode 100644
index 0000000000000..7609d7d0ceeeb
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KnativeProcessor.java
@@ -0,0 +1,270 @@
+package io.quarkus.kubernetes.deployment;
+
+import static io.quarkus.kubernetes.deployment.Constants.KNATIVE;
+import static io.quarkus.kubernetes.deployment.Constants.SERVICE;
+import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.DEFAULT_PRIORITY;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import io.dekorate.knative.decorator.AddAwsElasticBlockStoreVolumeToRevisionDecorator;
+import io.dekorate.knative.decorator.AddAzureDiskVolumeToRevisionDecorator;
+import io.dekorate.knative.decorator.AddAzureFileVolumeToRevisionDecorator;
+import io.dekorate.knative.decorator.AddConfigMapVolumeToRevisionDecorator;
+import io.dekorate.knative.decorator.AddHostAliasesToRevisionDecorator;
+import io.dekorate.knative.decorator.AddPvcVolumeToRevisionDecorator;
+import io.dekorate.knative.decorator.AddSecretVolumeToRevisionDecorator;
+import io.dekorate.knative.decorator.AddSidecarToRevisionDecorator;
+import io.dekorate.knative.decorator.ApplyGlobalAutoscalingClassDecorator;
+import io.dekorate.knative.decorator.ApplyGlobalContainerConcurrencyDecorator;
+import io.dekorate.knative.decorator.ApplyGlobalRequestsPerSecondTargetDecorator;
+import io.dekorate.knative.decorator.ApplyGlobalTargetUtilizationDecorator;
+import io.dekorate.knative.decorator.ApplyLocalAutoscalingClassDecorator;
+import io.dekorate.knative.decorator.ApplyLocalAutoscalingMetricDecorator;
+import io.dekorate.knative.decorator.ApplyLocalAutoscalingTargetDecorator;
+import io.dekorate.knative.decorator.ApplyLocalContainerConcurrencyDecorator;
+import io.dekorate.knative.decorator.ApplyLocalTargetUtilizationPercentageDecorator;
+import io.dekorate.knative.decorator.ApplyMaxScaleDecorator;
+import io.dekorate.knative.decorator.ApplyMinScaleDecorator;
+import io.dekorate.knative.decorator.ApplyRevisionNameDecorator;
+import io.dekorate.knative.decorator.ApplyTrafficDecorator;
+import io.dekorate.kubernetes.config.EnvBuilder;
+import io.dekorate.kubernetes.decorator.AddConfigMapDataDecorator;
+import io.dekorate.kubernetes.decorator.AddConfigMapResourceProvidingDecorator;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.AddLabelDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.project.Project;
+import io.quarkus.container.spi.BaseImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageLabelBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.kubernetes.spi.ConfiguratorBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesAnnotationBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesEnvBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesLabelBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesPortBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+
+public class KnativeProcessor {
+
+    private static final int KNATIVE_PRIORITY = DEFAULT_PRIORITY;
+    private static final String LATEST_REVISION = "latest";
+
+    @BuildStep
+    public void checkKnative(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
+        List<String> targets = KubernetesConfigUtil.getUserSpecifiedDeploymentTargets();
+        deploymentTargets.produce(
+                new KubernetesDeploymentTargetBuildItem(KNATIVE, SERVICE, KNATIVE_PRIORITY, targets.contains(KNATIVE)));
+    }
+
+    @BuildStep
+    public void createAnnotations(KnativeConfig config, BuildProducer<KubernetesAnnotationBuildItem> annotations) {
+        config.getAnnotations().forEach((k, v) -> {
+            annotations.produce(new KubernetesAnnotationBuildItem(k, v, KNATIVE));
+        });
+    }
+
+    @BuildStep
+    public void createLabels(KnativeConfig config, BuildProducer<KubernetesLabelBuildItem> labels,
+            BuildProducer<ContainerImageLabelBuildItem> imageLabels) {
+        config.getLabels().forEach((k, v) -> {
+            labels.produce(new KubernetesLabelBuildItem(k, v, KNATIVE));
+            imageLabels.produce(new ContainerImageLabelBuildItem(k, v));
+        });
+    }
+
+    @BuildStep
+    public List<ConfiguratorBuildItem> createConfigurators(KnativeConfig config, List<KubernetesPortBuildItem> ports) {
+        List<ConfiguratorBuildItem> result = new ArrayList<>();
+        result.addAll(KubernetesCommonHelper.createPlatformConfigurators(config));
+        result.addAll(KubernetesCommonHelper.createGlobalConfigurators(ports));
+        return result;
+
+    }
+
+    @BuildStep
+    public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applicationInfo,
+            OutputTargetBuildItem outputTarget,
+            KnativeConfig config,
+            PackageConfig packageConfig,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration,
+            List<KubernetesAnnotationBuildItem> annotations,
+            List<KubernetesLabelBuildItem> labels,
+            List<KubernetesEnvBuildItem> envs,
+            Optional<BaseImageInfoBuildItem> baseImage,
+            Optional<ContainerImageInfoBuildItem> image,
+            Optional<KubernetesCommandBuildItem> command,
+            List<KubernetesPortBuildItem> ports,
+            Optional<KubernetesHealthLivenessPathBuildItem> livenessPath,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessPath,
+            List<KubernetesRoleBuildItem> roles,
+            List<KubernetesRoleBindingBuildItem> roleBindings) {
+
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        String name = ResourceNameUtil.getResourceName(config, applicationInfo);
+
+        Optional<Project> project = KubernetesCommonHelper.createProject(applicationInfo, outputTarget, packageConfig);
+        result.addAll(KubernetesCommonHelper.createDecorators(project, KNATIVE, name, config,
+                metricsConfiguration, annotations,
+                labels, command,
+                ports, livenessPath, readinessPath, roles, roleBindings));
+
+        image.ifPresent(i -> {
+            result.add(new DecoratorBuildItem(KNATIVE, new ApplyContainerImageDecorator(name, i.getImage())));
+        });
+
+        Stream.concat(config.convertToBuildItems().stream(),
+                envs.stream().filter(e -> e.getTarget() == null || KNATIVE.equals(e.getTarget()))).forEach(e -> {
+                    result.add(new DecoratorBuildItem(KNATIVE,
+                            new AddEnvVarDecorator(ApplicationContainerDecorator.ANY, name, new EnvBuilder()
+                                    .withName(EnvConverter.convertName(e.getName()))
+                                    .withValue(e.getValue())
+                                    .withSecret(e.getSecret())
+                                    .withConfigmap(e.getConfigMap())
+                                    .withField(e.getField())
+                                    .build())));
+                });
+
+        if (config.clusterLocal) {
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new AddLabelDecorator(name, "serving.knative.dev/visibility", "cluster-local")));
+        }
+
+        config.minScale.ifPresent(min -> result.add(new DecoratorBuildItem(KNATIVE, new ApplyMinScaleDecorator(name, min))));
+
+        config.maxScale.ifPresent(max -> result.add(new DecoratorBuildItem(KNATIVE, new ApplyMaxScaleDecorator(name, max))));
+
+        config.revisionAutoScaling.autoScalerClass.map(AutoScalerClassConverter::convert)
+                .ifPresent(a -> result.add(new DecoratorBuildItem(KNATIVE, new ApplyLocalAutoscalingClassDecorator(name, a))));
+
+        config.revisionAutoScaling.metric.map(AutoScalingMetricConverter::convert)
+                .ifPresent(m -> result.add(new DecoratorBuildItem(KNATIVE, new ApplyLocalAutoscalingMetricDecorator(name, m))));
+
+        config.revisionAutoScaling.containerConcurrency
+                .ifPresent(
+                        c -> result.add(new DecoratorBuildItem(KNATIVE, new ApplyLocalContainerConcurrencyDecorator(name, c))));
+
+        config.revisionAutoScaling.targetUtilizationPercentage
+                .ifPresent(t -> result
+                        .add(new DecoratorBuildItem(KNATIVE, new ApplyLocalTargetUtilizationPercentageDecorator(name, t))));
+        config.revisionAutoScaling.target
+                .ifPresent(t -> result.add(new DecoratorBuildItem(KNATIVE, new ApplyLocalAutoscalingTargetDecorator(name, t))));
+
+        config.globalAutoScaling.autoScalerClass
+                .map(AutoScalerClassConverter::convert)
+                .ifPresent(a -> {
+                    result.add(
+                            new DecoratorBuildItem(KNATIVE, new AddConfigMapResourceProvidingDecorator("config-autoscaler")));
+                    result.add(new DecoratorBuildItem(KNATIVE, new ApplyGlobalAutoscalingClassDecorator(a)));
+                });
+
+        config.globalAutoScaling.containerConcurrency
+                .ifPresent(c -> {
+                    result.add(new DecoratorBuildItem(KNATIVE, new AddConfigMapResourceProvidingDecorator("config-defaults")));
+                    result.add(new DecoratorBuildItem(KNATIVE, new ApplyGlobalContainerConcurrencyDecorator(c)));
+                });
+
+        config.globalAutoScaling.requestsPerSecond
+                .ifPresent(r -> {
+                    result.add(
+                            new DecoratorBuildItem(KNATIVE, new AddConfigMapResourceProvidingDecorator("config-autoscaler")));
+                    result.add(new DecoratorBuildItem(KNATIVE, new ApplyGlobalRequestsPerSecondTargetDecorator(r)));
+                });
+
+        config.globalAutoScaling.targetUtilizationPercentage
+                .ifPresent(t -> {
+                    result.add(
+                            new DecoratorBuildItem(KNATIVE, new AddConfigMapResourceProvidingDecorator("config-autoscaler")));
+                    result.add(new DecoratorBuildItem(KNATIVE, new ApplyGlobalTargetUtilizationDecorator(t)));
+                });
+
+        if (!config.scaleToZeroEnabled) {
+            result.add(new DecoratorBuildItem(KNATIVE, new AddConfigMapResourceProvidingDecorator("config-autoscaler")));
+            result.add(
+                    new DecoratorBuildItem(KNATIVE, new AddConfigMapDataDecorator("config-autoscaler", "enable-scale-to-zero",
+                            String.valueOf(config.scaleToZeroEnabled))));
+        }
+
+        result.add(new DecoratorBuildItem(KNATIVE, new ApplyServiceTypeDecorator(name, config.getServiceType().name())));
+
+        //In Knative its expected that all http ports in probe are ommitted (so we set them to null).
+        result.add(new DecoratorBuildItem(KNATIVE, new ApplyHttpGetActionPortDecorator(null)));
+
+        //Traffic Splitting
+        config.revisionName.ifPresent(r -> {
+            result.add(new DecoratorBuildItem(KNATIVE, new ApplyRevisionNameDecorator(name, r)));
+        });
+
+        config.traffic.forEach((k, v) -> {
+            TrafficConfig traffic = v;
+            //Revision name is K unless we have the edge name of a revision named 'latest' which is not really the latest (in which case use null).
+            boolean latestRevision = traffic.latestRevision.get();
+            String revisionName = !latestRevision && LATEST_REVISION.equals(k) ? null : k;
+            String tag = traffic.tag.orElse(null);
+            long percent = traffic.percent.orElse(100L);
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new ApplyTrafficDecorator(name, revisionName, latestRevision, percent, tag)));
+        });
+
+        //Add revision decorators
+        result.addAll(createVolumeDecorators(project, name, config));
+        config.getHostAliases().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new AddHostAliasesToRevisionDecorator(name, HostAliasConverter.convert(e))));
+        });
+        config.getSidecars().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE, new AddSidecarToRevisionDecorator(name, ContainerConverter.convert(e))));
+        });
+
+        return result;
+    }
+
+    private static List<DecoratorBuildItem> createVolumeDecorators(Optional<Project> project, String name,
+            PlatformConfiguration config) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+
+        config.getSecretVolumes().entrySet().forEach(e -> {
+            result.add(
+                    new DecoratorBuildItem(KNATIVE, new AddSecretVolumeToRevisionDecorator(SecretVolumeConverter.convert(e))));
+        });
+
+        config.getConfigMapVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new AddConfigMapVolumeToRevisionDecorator(ConfigMapVolumeConverter.convert(e))));
+        });
+
+        config.getPvcVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE, new AddPvcVolumeToRevisionDecorator(PvcVolumeConverter.convert(e))));
+        });
+
+        config.getAwsElasticBlockStoreVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new AddAwsElasticBlockStoreVolumeToRevisionDecorator(AwsElasticBlockStoreVolumeConverter.convert(e))));
+        });
+
+        config.getAzureFileVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new AddAzureFileVolumeToRevisionDecorator(AzureFileVolumeConverter.convert(e))));
+        });
+
+        config.getAzureDiskVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(KNATIVE,
+                    new AddAzureDiskVolumeToRevisionDecorator(AzureDiskVolumeConverter.convert(e))));
+        });
+        return result;
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java
new file mode 100644
index 0000000000000..07dadc7b8d506
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesCommonHelper.java
@@ -0,0 +1,455 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT;
+import static io.quarkus.kubernetes.deployment.Constants.QUARKUS_ANNOTATIONS_BUILD_TIMESTAMP;
+import static io.quarkus.kubernetes.deployment.Constants.QUARKUS_ANNOTATIONS_COMMIT_ID;
+import static io.quarkus.kubernetes.deployment.Constants.QUARKUS_ANNOTATIONS_VCS_URL;
+
+import java.nio.file.Path;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import io.dekorate.kubernetes.config.Annotation;
+import io.dekorate.kubernetes.config.ConfigMapVolumeBuilder;
+import io.dekorate.kubernetes.config.EnvBuilder;
+import io.dekorate.kubernetes.config.MountBuilder;
+import io.dekorate.kubernetes.config.PortBuilder;
+import io.dekorate.kubernetes.config.SecretVolumeBuilder;
+import io.dekorate.kubernetes.configurator.AddPort;
+import io.dekorate.kubernetes.decorator.AddAnnotationDecorator;
+import io.dekorate.kubernetes.decorator.AddAwsElasticBlockStoreVolumeDecorator;
+import io.dekorate.kubernetes.decorator.AddAzureDiskVolumeDecorator;
+import io.dekorate.kubernetes.decorator.AddAzureFileVolumeDecorator;
+import io.dekorate.kubernetes.decorator.AddConfigMapVolumeDecorator;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.AddHostAliasesDecorator;
+import io.dekorate.kubernetes.decorator.AddImagePullSecretDecorator;
+import io.dekorate.kubernetes.decorator.AddInitContainerDecorator;
+import io.dekorate.kubernetes.decorator.AddLabelDecorator;
+import io.dekorate.kubernetes.decorator.AddLivenessProbeDecorator;
+import io.dekorate.kubernetes.decorator.AddMountDecorator;
+import io.dekorate.kubernetes.decorator.AddPvcVolumeDecorator;
+import io.dekorate.kubernetes.decorator.AddReadinessProbeDecorator;
+import io.dekorate.kubernetes.decorator.AddRoleBindingResourceDecorator;
+import io.dekorate.kubernetes.decorator.AddSecretVolumeDecorator;
+import io.dekorate.kubernetes.decorator.AddServiceAccountResourceDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.kubernetes.decorator.ApplyArgsDecorator;
+import io.dekorate.kubernetes.decorator.ApplyCommandDecorator;
+import io.dekorate.kubernetes.decorator.ApplyLimitsCpuDecorator;
+import io.dekorate.kubernetes.decorator.ApplyLimitsMemoryDecorator;
+import io.dekorate.kubernetes.decorator.ApplyRequestsCpuDecorator;
+import io.dekorate.kubernetes.decorator.ApplyRequestsMemoryDecorator;
+import io.dekorate.kubernetes.decorator.ApplyServiceAccountNamedDecorator;
+import io.dekorate.kubernetes.decorator.ApplyWorkingDirDecorator;
+import io.dekorate.kubernetes.decorator.RemoveAnnotationDecorator;
+import io.dekorate.project.BuildInfo;
+import io.dekorate.project.FileProjectFactory;
+import io.dekorate.project.Project;
+import io.dekorate.project.ScmInfo;
+import io.dekorate.utils.Annotations;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.kubernetes.spi.ConfiguratorBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesAnnotationBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesLabelBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesPortBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+
+public class KubernetesCommonHelper {
+
+    private static final String OUTPUT_ARTIFACT_FORMAT = "%s%s.jar";
+
+    public static Optional<Project> createProject(ApplicationInfoBuildItem app, OutputTargetBuildItem outputTarget,
+            PackageConfig packageConfig) {
+        return createProject(app, outputTarget.getOutputDirectory()
+                .resolve(String.format(OUTPUT_ARTIFACT_FORMAT, outputTarget.getBaseName(), packageConfig.runnerSuffix)));
+    }
+
+    public static Optional<Project> createProject(ApplicationInfoBuildItem app, Path artifactPath) {
+        //Let dekorate create a Project instance and then override with what is found in ApplicationInfoBuildItem.
+        try {
+            Project project = FileProjectFactory.create(artifactPath.toFile());
+            BuildInfo buildInfo = new BuildInfo(app.getName(), app.getVersion(),
+                    "jar", project.getBuildInfo().getBuildTool(),
+                    project.getBuildInfo().getBuildToolVersion(),
+                    artifactPath.toAbsolutePath(),
+                    project.getBuildInfo().getClassOutputDir(),
+                    project.getBuildInfo().getResourceDir());
+
+            return Optional.of(new Project(project.getRoot(), buildInfo, project.getScmInfo()));
+
+        } catch (Exception e) {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Creates the common configurator build items.
+     */
+    public static List<ConfiguratorBuildItem> createGlobalConfigurators(List<KubernetesPortBuildItem> ports) {
+        List<ConfiguratorBuildItem> result = new ArrayList<>();
+        verifyPorts(ports).entrySet().stream()
+                .map(e -> new PortBuilder().withName(e.getKey()).withContainerPort(e.getValue()).build())
+                .forEach(p -> result.add(new ConfiguratorBuildItem(new AddPort(p))));
+        return result;
+    }
+
+    /**
+     * Creates the common configurator build items.
+     */
+    public static List<ConfiguratorBuildItem> createPlatformConfigurators(PlatformConfiguration config) {
+        List<ConfiguratorBuildItem> result = new ArrayList<>();
+        config.getPorts().entrySet().forEach(e -> result.add(new ConfiguratorBuildItem(new AddPort(PortConverter.convert(e)))));
+        return result;
+    }
+
+    /**
+     * Creates the common decorator build items.
+     */
+    public static List<DecoratorBuildItem> createDecorators(Optional<Project> project, String target, String name,
+            PlatformConfiguration config,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration,
+            List<KubernetesAnnotationBuildItem> annotations,
+            List<KubernetesLabelBuildItem> labels,
+            Optional<KubernetesCommandBuildItem> command,
+            List<KubernetesPortBuildItem> ports,
+            Optional<KubernetesHealthLivenessPathBuildItem> livenessProbePath,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessProbePath,
+            List<KubernetesRoleBuildItem> roles,
+            List<KubernetesRoleBindingBuildItem> roleBindings) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+
+        annotations.forEach(a -> {
+            result.add(new DecoratorBuildItem(a.getTarget(),
+                    new AddAnnotationDecorator(name, a.getKey(), a.getValue())));
+        });
+
+        labels.forEach(l -> {
+            result.add(new DecoratorBuildItem(l.getTarget(),
+                    new AddLabelDecorator(name, l.getKey(), l.getValue())));
+        });
+
+        result.addAll(createAnnotationDecorators(project, target, name, config, metricsConfiguration, ports));
+        result.addAll(createPodDecorators(project, target, name, config));
+        result.addAll(createContainerDecorators(project, target, name, config));
+        result.addAll(createMountAndVolumeDecorators(project, target, name, config));
+        result.addAll(createAppConfigVolumeAndEnvDecorators(project, target, name, config));
+
+        //Handle Command and arguments
+        command.ifPresent(c -> {
+            result.add(new DecoratorBuildItem(new ApplyCommandDecorator(name, new String[] { c.getCommand() })));
+            result.add(new DecoratorBuildItem(new ApplyArgsDecorator(name, c.getArgs())));
+        });
+
+        //Handle Probes
+        result.addAll(createProbeDecorators(name, target, config.getLivenessProbe(), config.getReadinessProbe(),
+                livenessProbePath, readinessProbePath));
+
+        //Handle RBAC
+        if (!roleBindings.isEmpty()) {
+            result.add(new DecoratorBuildItem(new ApplyServiceAccountNamedDecorator()));
+            result.add(new DecoratorBuildItem(new AddServiceAccountResourceDecorator()));
+            roles.forEach(r -> result.add(new DecoratorBuildItem(new AddRoleResourceDecorator(r))));
+            roleBindings.forEach(rb -> result.add(new DecoratorBuildItem(
+                    new AddRoleBindingResourceDecorator(rb.getName(), null, rb.getRole(), rb.isClusterWide()
+                            ? AddRoleBindingResourceDecorator.RoleKind.ClusterRole
+                            : AddRoleBindingResourceDecorator.RoleKind.Role))));
+        }
+
+        return result;
+    }
+
+    /**
+     * Creates container decorator build items.
+     *
+     * @param target The deployment target (e.g. kubernetes, openshift, knative)
+     * @param name The name of the resource to accept the configuration
+     * @param config The {@link PlatformConfiguration} instance
+     */
+    private static List<DecoratorBuildItem> createContainerDecorators(Optional<Project> project, String target, String name,
+            PlatformConfiguration config) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        if (config.getNamespace().isPresent()) {
+            result.add(new DecoratorBuildItem(target, new AddNamespaceDecorator(config.getNamespace().get())));
+        }
+
+        config.getWorkingDir().ifPresent(w -> {
+            result.add(new DecoratorBuildItem(target, new ApplyWorkingDirDecorator(name, w)));
+        });
+
+        config.getCommand().ifPresent(c -> {
+            result.add(new DecoratorBuildItem(target, new ApplyCommandDecorator(name, c.toArray(new String[0]))));
+        });
+
+        config.getArguments().ifPresent(a -> {
+            result.add(new DecoratorBuildItem(target, new ApplyArgsDecorator(name, a.toArray(new String[0]))));
+        });
+
+        return result;
+    }
+
+    /**
+     * Creates pod decorator build items.
+     *
+     * @param target The deployment target (e.g. kubernetes, openshift, knative)
+     * @param name The name of the resource to accept the configuration
+     * @param config The {@link PlatformConfiguration} instance
+     */
+    private static List<DecoratorBuildItem> createPodDecorators(Optional<Project> project, String target, String name,
+            PlatformConfiguration config) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        config.getImagePullSecrets().ifPresent(l -> {
+            l.forEach(s -> result.add(new DecoratorBuildItem(target, new AddImagePullSecretDecorator(name, s))));
+        });
+
+        config.getHostAliases().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddHostAliasesDecorator(name, HostAliasConverter.convert(e))));
+        });
+
+        config.getServiceAccount().ifPresent(s -> {
+            result.add(new DecoratorBuildItem(target, new ApplyServiceAccountNamedDecorator(name, s)));
+        });
+
+        config.getInitContainers().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddInitContainerDecorator(name, ContainerConverter.convert(e))));
+        });
+
+        config.getSidecars().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddSidecarDecorator(name, ContainerConverter.convert(e))));
+        });
+
+        config.getResources().limits.cpu.ifPresent(c -> {
+            result.add(new DecoratorBuildItem(target, new ApplyLimitsCpuDecorator(name, c)));
+        });
+
+        config.getResources().limits.memory.ifPresent(m -> {
+            result.add(new DecoratorBuildItem(target, new ApplyLimitsMemoryDecorator(name, m)));
+        });
+
+        config.getResources().requests.cpu.ifPresent(c -> {
+            result.add(new DecoratorBuildItem(target, new ApplyRequestsCpuDecorator(name, c)));
+        });
+
+        config.getResources().requests.memory.ifPresent(m -> {
+            result.add(new DecoratorBuildItem(target, new ApplyRequestsMemoryDecorator(name, m)));
+        });
+
+        return result;
+    }
+
+    private static List<DecoratorBuildItem> createAppConfigVolumeAndEnvDecorators(Optional<Project> project, String target,
+            String name,
+            PlatformConfiguration config) {
+
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        Set<String> paths = new HashSet<>();
+
+        config.getAppSecret().ifPresent(s -> {
+            result.add(new DecoratorBuildItem(target, new AddSecretVolumeDecorator(new SecretVolumeBuilder()
+                    .withSecretName(s)
+                    .withNewVolumeName("app-secret")
+                    .build())));
+            result.add(new DecoratorBuildItem(target, new AddMountDecorator(new MountBuilder()
+                    .withName("app-secret")
+                    .withPath("/mnt/app-secret")
+                    .build())));
+            paths.add("/mnt/app-secret");
+        });
+
+        config.getAppConfigMap().ifPresent(s -> {
+            result.add(new DecoratorBuildItem(target, new AddConfigMapVolumeDecorator(new ConfigMapVolumeBuilder()
+                    .withConfigMapName(s)
+                    .withNewVolumeName("app-config-map")
+                    .build())));
+            result.add(new DecoratorBuildItem(target, new AddMountDecorator(new MountBuilder()
+                    .withName("app-config-map")
+                    .withPath("/mnt/app-config-map")
+                    .build())));
+            paths.add("/mnt/app-config-map");
+        });
+
+        if (!paths.isEmpty()) {
+            result.add(new DecoratorBuildItem(target,
+                    new AddEnvVarDecorator(ApplicationContainerDecorator.ANY, name, new EnvBuilder()
+                            .withName("SMALLRYE_CONFIG_LOCATIONS")
+                            .withValue(paths.stream().collect(Collectors.joining(",")))
+                            .build())));
+        }
+        return result;
+    }
+
+    private static List<DecoratorBuildItem> createMountAndVolumeDecorators(Optional<Project> project, String target,
+            String name,
+            PlatformConfiguration config) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+
+        config.getMounts().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddMountDecorator(MountConverter.convert(e))));
+        });
+
+        config.getSecretVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddSecretVolumeDecorator(SecretVolumeConverter.convert(e))));
+        });
+
+        config.getConfigMapVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddConfigMapVolumeDecorator(ConfigMapVolumeConverter.convert(e))));
+        });
+
+        config.getPvcVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddPvcVolumeDecorator(PvcVolumeConverter.convert(e))));
+        });
+
+        config.getAwsElasticBlockStoreVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target,
+                    new AddAwsElasticBlockStoreVolumeDecorator(AwsElasticBlockStoreVolumeConverter.convert(e))));
+        });
+
+        config.getAzureFileVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddAzureFileVolumeDecorator(AzureFileVolumeConverter.convert(e))));
+        });
+
+        config.getAzureDiskVolumes().entrySet().forEach(e -> {
+            result.add(new DecoratorBuildItem(target, new AddAzureDiskVolumeDecorator(AzureDiskVolumeConverter.convert(e))));
+        });
+        return result;
+    }
+
+    private static List<DecoratorBuildItem> createAnnotationDecorators(Optional<Project> project, String target, String name,
+            PlatformConfiguration config,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration,
+            List<KubernetesPortBuildItem> ports) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
+
+        project.ifPresent(p -> {
+            ScmInfo scm = p.getScmInfo();
+            String vcsUrl = scm != null ? scm.getUrl() : null;
+            String commitId = scm != null ? scm.getCommit() : null;
+
+            //Dekorate uses its own annotations. Let's replace them with the quarkus ones.
+            result.add(new DecoratorBuildItem(target, new RemoveAnnotationDecorator(Annotations.VCS_URL)));
+            result.add(new DecoratorBuildItem(target, new RemoveAnnotationDecorator(Annotations.COMMIT_ID)));
+
+            //Add quarkus vcs annotations
+            if (commitId != null) {
+                result.add(new DecoratorBuildItem(target, new AddAnnotationDecorator(name,
+                        new Annotation(QUARKUS_ANNOTATIONS_COMMIT_ID, commitId, new String[0]))));
+            }
+            if (vcsUrl != null) {
+                result.add(new DecoratorBuildItem(target,
+                        new AddAnnotationDecorator(name, new Annotation(QUARKUS_ANNOTATIONS_VCS_URL, vcsUrl, new String[0]))));
+            }
+        });
+
+        if (config.isAddBuildTimestamp()) {
+            result.add(new DecoratorBuildItem(target,
+                    new AddAnnotationDecorator(name, new Annotation(QUARKUS_ANNOTATIONS_BUILD_TIMESTAMP,
+                            now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd - HH:mm:ss Z")), new String[0]))));
+        }
+
+        if (config.getExposition().isPresent() && config.getExposition().get().expose) {
+            Map<String, String> expostionAnnotations = config.getExposition().get().annotations;
+            String kind = "Ingress";
+            if (config.getTargetPlatformName().equals(OPENSHIFT)) {
+                kind = "Route";
+            }
+            for (Map.Entry<String, String> annotation : expostionAnnotations.entrySet()) {
+                result.add(new DecoratorBuildItem(target,
+                        new AddAnnotationDecorator(name, annotation.getKey(), annotation.getValue(), kind)));
+            }
+        }
+
+        if (config.getPrometheusConfig().annotations) {
+            // Add metrics annotations
+            metricsConfiguration.ifPresent(m -> {
+                String path = m.metricsEndpoint();
+                String prefix = config.getPrometheusConfig().prefix;
+                if (!ports.isEmpty() && path != null) {
+                    result.add(new DecoratorBuildItem(target, new AddAnnotationDecorator(name,
+                            config.getPrometheusConfig().scrape.orElse(prefix + "/scrape"), "true")));
+                    result.add(new DecoratorBuildItem(target, new AddAnnotationDecorator(name,
+                            config.getPrometheusConfig().path.orElse(prefix + "/path"), path)));
+                    result.add(new DecoratorBuildItem(target, new AddAnnotationDecorator(name,
+                            config.getPrometheusConfig().port.orElse(prefix + "/port"), "" + ports.get(0).getPort())));
+                    result.add(new DecoratorBuildItem(target, new AddAnnotationDecorator(name,
+                            config.getPrometheusConfig().scheme.orElse(prefix + "/scheme"), "http")));
+                }
+            });
+        }
+
+        //Add metrics annotations
+        return result;
+    }
+
+    private static List<DecoratorBuildItem> createProbeDecorators(String name, String target, ProbeConfig livenessProbe,
+            ProbeConfig readinessProbe,
+            Optional<KubernetesHealthLivenessPathBuildItem> livenessPath,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessPath) {
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        createLivenessProbe(name, target, livenessProbe, livenessPath).ifPresent(d -> result.add(d));
+        createReadinessProbe(name, target, readinessProbe, readinessPath).ifPresent(d -> result.add(d));
+        return result;
+    }
+
+    private static Optional<DecoratorBuildItem> createLivenessProbe(String name, String target, ProbeConfig livenessProbe,
+            Optional<KubernetesHealthLivenessPathBuildItem> livenessPath) {
+        if (livenessProbe.hasUserSuppliedAction()) {
+            return Optional.of(
+                    new DecoratorBuildItem(target, new AddLivenessProbeDecorator(name, ProbeConverter.convert(livenessProbe))));
+        } else if (livenessPath.isPresent()) {
+            return Optional.of(new DecoratorBuildItem(target, new AddLivenessProbeDecorator(name,
+                    ProbeConverter.builder(livenessProbe).withHttpActionPath(livenessPath.get().getPath()).build())));
+        }
+        return Optional.empty();
+    }
+
+    private static Optional<DecoratorBuildItem> createReadinessProbe(String name, String target, ProbeConfig readinessProbe,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessPath) {
+        if (readinessProbe.hasUserSuppliedAction()) {
+            return Optional.of(new DecoratorBuildItem(target,
+                    new AddReadinessProbeDecorator(name, ProbeConverter.convert(readinessProbe))));
+        } else if (readinessPath.isPresent()) {
+            return Optional.of(new DecoratorBuildItem(target, new AddReadinessProbeDecorator(name,
+                    ProbeConverter.builder(readinessProbe).withHttpActionPath(readinessPath.get().getPath()).build())));
+        }
+        return Optional.empty();
+    }
+
+    private static Map<String, Integer> verifyPorts(List<KubernetesPortBuildItem> kubernetesPortBuildItems) {
+        final Map<String, Integer> result = new HashMap<>();
+        final Set<Integer> usedPorts = new HashSet<>();
+        for (KubernetesPortBuildItem entry : kubernetesPortBuildItems) {
+            final String name = entry.getName();
+            if (result.containsKey(name)) {
+                throw new IllegalArgumentException(
+                        "All Kubernetes ports must have unique names - " + name + "has been used multiple times");
+            }
+            final Integer port = entry.getPort();
+            if (usedPorts.contains(port)) {
+                throw new IllegalArgumentException(
+                        "All Kubernetes ports must be unique - " + port + "has been used multiple times");
+            }
+            result.put(name, port);
+            usedPorts.add(port);
+        }
+        return result;
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfig.java
index 1d866719c9f72..aba23a839d6f7 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfig.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfig.java
@@ -92,6 +92,8 @@ public class KubernetesConfig implements PlatformConfiguration {
 
     /**
      * The host under which the application is going to be exposed
+     * 
+     * @deprecated Use the {@code quarkus.kubernetes.ingress.host} instead
      */
     @ConfigItem
     Optional<String> host;
@@ -144,6 +146,12 @@ public class KubernetesConfig implements PlatformConfiguration {
     @ConfigItem
     ProbeConfig readinessProbe;
 
+    /**
+     * Prometheus configuration
+     */
+    @ConfigItem
+    PrometheusConfig prometheus;
+
     /**
      * Volume mounts
      */
@@ -213,12 +221,56 @@ public class KubernetesConfig implements PlatformConfiguration {
     @ConfigItem
     Optional<List<String>> deploymentTarget;
 
+    /**
+     * The host aliases
+     */
+    @ConfigItem(name = "hostaliases")
+    Map<String, HostAliasConfig> hostAliases;
+
+    /**
+     * Resources requirements
+     */
+    @ConfigItem
+    ResourcesConfig resources;
+
     /**
      * If true, a Kubernetes Ingress will be created
+     * 
+     * @deprecated Use the {@code quarkus.kubernetes.ingress.expose} instead
      */
     @ConfigItem
     boolean expose;
 
+    /**
+     * Ingress configuration
+     */
+    ExpositionConfig ingress;
+
+    /**
+     * If true, the 'app.kubernetes.io/version' label will be part of the selectors of Service and Deployment
+     */
+    @ConfigItem(defaultValue = "true")
+    boolean addVersionToLabelSelectors;
+
+    /**
+     * If set to true, Quarkus will attempt to deploy the application to the target Kubernetes cluster
+     */
+    @ConfigItem(defaultValue = "false")
+    boolean deploy;
+
+    /**
+     * If set, the secret will mounted to the application container and its contents will be used for application configuration.
+     */
+    @ConfigItem
+    Optional<String> appSecret;
+
+    /**
+     * If set, the config amp will mounted to the application container and its contents will be used for application
+     * configuration.
+     */
+    @ConfigItem
+    Optional<String> appConfigMap;
+
     public Optional<String> getPartOf() {
         return partOf;
     }
@@ -319,6 +371,10 @@ public ServiceType getServiceType() {
         return serviceType;
     }
 
+    public OptionalInt getNodePort() {
+        return this.nodePort;
+    }
+
     public ImagePullPolicy getImagePullPolicy() {
         return imagePullPolicy;
     }
@@ -335,6 +391,10 @@ public ProbeConfig getReadinessProbe() {
         return readinessProbe;
     }
 
+    public PrometheusConfig getPrometheusConfig() {
+        return prometheus;
+    }
+
     public Map<String, MountConfig> getMounts() {
         return mounts;
     }
@@ -375,8 +435,29 @@ public Map<String, ContainerConfig> getSidecars() {
         return sidecars;
     }
 
+    public Map<String, HostAliasConfig> getHostAliases() {
+        return hostAliases;
+    }
+
+    public ResourcesConfig getResources() {
+        return resources;
+    }
+
     @Override
     public boolean isExpose() {
         return expose;
     }
+
+    public Optional<String> getAppSecret() {
+        return appSecret;
+    }
+
+    public Optional<String> getAppConfigMap() {
+        return appConfigMap;
+    }
+
+    @Override
+    public Optional<ExpositionConfig> getExposition() {
+        return Optional.of(ingress);
+    }
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfigUtil.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfigUtil.java
index 78cbd30dec5aa..e2a4349b4713e 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfigUtil.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfigUtil.java
@@ -20,6 +20,7 @@
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
 
 import io.dekorate.utils.Strings;
 
@@ -34,6 +35,8 @@ public class KubernetesConfigUtil {
     private static final String EXPOSE_PROPERTY_NAME = "expose";
     private static final String[] EXPOSABLE_GENERATORS = { OPENSHIFT, KUBERNETES };
 
+    private static final Logger log = Logger.getLogger(KubernetesConfigUtil.class);
+
     public static List<String> getUserSpecifiedDeploymentTargets() {
         Config config = ConfigProvider.getConfig();
         String configValue = config.getOptionalValue(DEPLOYMENT_TARGET, String.class)
@@ -83,7 +86,6 @@ public static Map<String, Object> toMap(PlatformConfiguration... platformConfigu
             }
         }
 
-        // hard-coded support for exposed
         handleExpose(config, unPrefixed, platformConfigurations);
 
         result.putAll(unPrefixed);
@@ -92,6 +94,7 @@ public static Map<String, Object> toMap(PlatformConfiguration... platformConfigu
         return result;
     }
 
+    @Deprecated
     private static void handleExpose(Config config, Map<String, Object> unPrefixed,
             PlatformConfiguration... platformConfigurations) {
         for (String generator : EXPOSABLE_GENERATORS) {
@@ -101,11 +104,25 @@ private static void handleExpose(Config config, Map<String, Object> unPrefixed,
                     .getOptionalValue(QUARKUS_PREFIX + generator + "." + EXPOSE_PROPERTY_NAME, Boolean.class)
                     .orElse(false);
             if (unprefixedExpose || prefixedExpose) {
+                if (generator == KUBERNETES) {
+                    log.warn("Usage of quarkus.kubernetes.expose is deprecated in favor of quarkus.kubernetes.ingress.expose");
+                } else {
+                    log.warn("Usage of quarkus.openshift.expose is deprecated in favor of quarkus.openshift.route.expose");
+                }
                 unPrefixed.put(DEKORATE_PREFIX + generator + "." + EXPOSE_PROPERTY_NAME, true);
                 for (PlatformConfiguration platformConfiguration : platformConfigurations) {
                     if (platformConfiguration.getConfigName().equals(generator)) {
                         platformConfiguration.getHost()
-                                .ifPresent(h -> unPrefixed.put(DEKORATE_PREFIX + generator + ".host", h));
+                                .ifPresent(h -> {
+                                    unPrefixed.put(DEKORATE_PREFIX + generator + ".host", h);
+                                    if (generator == KUBERNETES) {
+                                        log.warn(
+                                                "Usage of quarkus.kubernetes.host is deprecated in favor of quarkus.kubernetes.ingress.host");
+                                    } else {
+                                        log.warn(
+                                                "Usage of quarkus.openshift.host is deprecated in favor of quarkus.openshift.route.host");
+                                    }
+                                });
                         break;
                     }
                 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java
index d8daee6e3a2a7..59f0bc43ac169 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java
@@ -1,7 +1,6 @@
 
 package io.quarkus.kubernetes.deployment;
 
-import static io.quarkus.container.image.deployment.util.ImageUtil.hasRegistry;
 import static io.quarkus.kubernetes.deployment.Constants.KNATIVE;
 import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES;
 import static io.quarkus.kubernetes.deployment.Constants.MINIKUBE;
@@ -26,15 +25,18 @@
 import io.dekorate.deps.kubernetes.api.model.KubernetesList;
 import io.dekorate.deps.kubernetes.client.KubernetesClient;
 import io.dekorate.deps.kubernetes.client.KubernetesClientException;
+import io.dekorate.deps.openshift.api.model.Route;
+import io.dekorate.deps.openshift.client.OpenShiftClient;
 import io.dekorate.utils.Clients;
 import io.dekorate.utils.Serialization;
 import io.quarkus.container.image.deployment.ContainerImageCapabilitiesUtil;
 import io.quarkus.container.spi.ContainerImageInfoBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsNormalNotRemoteDev;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
 import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.DeploymentResultBuildItem;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
@@ -49,7 +51,7 @@ public class KubernetesDeployer {
             .values().stream()
             .map(s -> "\"" + s + "\"").collect(Collectors.joining(", "));
 
-    @BuildStep(onlyIf = IsNormal.class)
+    @BuildStep(onlyIf = IsNormalNotRemoteDev.class)
     public void selectDeploymentTarget(ContainerImageInfoBuildItem containerImageInfo,
             EnabledKubernetesDeploymentTargetsBuildItem targets,
             Capabilities capabilities,
@@ -68,11 +70,13 @@ public void selectDeploymentTarget(ContainerImageInfoBuildItem containerImageInf
         selectedDeploymentTarget.produce(new SelectedKubernetesDeploymentTargetBuildItem(selectedTarget));
     }
 
-    @BuildStep(onlyIf = IsNormal.class)
+    @BuildStep(onlyIf = IsNormalNotRemoteDev.class)
     public void deploy(KubernetesClientBuildItem kubernetesClient,
             Capabilities capabilities,
             Optional<SelectedKubernetesDeploymentTargetBuildItem> selectedDeploymentTarget,
             OutputTargetBuildItem outputTarget,
+            OpenshiftConfig openshiftConfig,
+            ApplicationInfoBuildItem applicationInfo,
             BuildProducer<DeploymentResultBuildItem> deploymentResult,
             // needed to ensure that this step runs after the container image has been built
             @SuppressWarnings("unused") List<ArtifactResultBuildItem> artifactResults) {
@@ -95,7 +99,8 @@ public void deploy(KubernetesClientBuildItem kubernetesClient,
 
         final KubernetesClient client = Clients.fromConfig(kubernetesClient.getClient().getConfiguration());
         deploymentResult
-                .produce(deploy(selectedDeploymentTarget.get().getEntry(), client, outputTarget.getOutputDirectory()));
+                .produce(deploy(selectedDeploymentTarget.get().getEntry(), client, outputTarget.getOutputDirectory(),
+                        openshiftConfig, applicationInfo));
     }
 
     /**
@@ -119,7 +124,7 @@ private DeploymentTargetEntry determineDeploymentTarget(
         if (userSpecifiedDeploymentTargets.isEmpty()) {
             selectedTarget = targets.getEntriesSortedByPriority().get(0);
             if (targets.getEntriesSortedByPriority().size() > 1) {
-                log.info("Deploying target '" + selectedTarget.getName()
+                log.info("Selecting target '" + selectedTarget.getName()
                         + "' since it has the highest priority among the implicitly enabled deployment targets");
             }
         } else {
@@ -139,12 +144,12 @@ private DeploymentTargetEntry determineDeploymentTarget(
         }
 
         if (OPENSHIFT.equals(selectedTarget.getName())) {
-            checkForMissingRegistry = Capability.CONTAINER_IMAGE_S2I.equals(activeContainerImageCapability);
+            checkForMissingRegistry = Capability.CONTAINER_IMAGE_S2I.getName().equals(activeContainerImageCapability);
         } else if (MINIKUBE.equals(selectedTarget.getName())) {
             checkForMissingRegistry = false;
         }
 
-        if (checkForMissingRegistry && !hasRegistry(containerImageInfo.getImage())) {
+        if (checkForMissingRegistry && !containerImageInfo.getRegistry().isPresent()) {
             log.warn(
                     "A Kubernetes deployment was requested, but the container image to be built will not be pushed to any registry"
                             + " because \"quarkus.container-image.registry\" has not been set. The Kubernetes deployment will only work properly"
@@ -159,7 +164,8 @@ private Optional<KubernetesDeploymentTargetBuildItem> getOptionalDeploymentTarge
     }
 
     private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget,
-            KubernetesClient client, Path outputDir) {
+            KubernetesClient client, Path outputDir,
+            OpenshiftConfig openshiftConfig, ApplicationInfoBuildItem applicationInfo) {
         String namespace = Optional.ofNullable(client.getNamespace()).orElse("default");
         log.info("Deploying to " + deploymentTarget.getName().toLowerCase() + " server: " + client.getMasterUrl()
                 + " in namespace: " + namespace + ".");
@@ -177,6 +183,8 @@ private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget,
                 log.info("Applied: " + i.getKind() + " " + i.getMetadata().getName() + ".");
             });
 
+            printExposeInformation(client, list, openshiftConfig, applicationInfo);
+
             HasMetadata m = list.getItems().stream().filter(r -> r.getKind().equals(deploymentTarget.getKind()))
                     .findFirst().orElseThrow(() -> new IllegalStateException(
                             "No " + deploymentTarget.getKind() + " found under: " + manifest.getAbsolutePath()));
@@ -192,6 +200,27 @@ private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget,
 
     }
 
+    private void printExposeInformation(KubernetesClient client, KubernetesList list, OpenshiftConfig openshiftConfig,
+            ApplicationInfoBuildItem applicationInfo) {
+        String generatedRouteName = ResourceNameUtil.getResourceName(openshiftConfig, applicationInfo);
+        List<HasMetadata> items = list.getItems();
+        for (HasMetadata item : items) {
+            if (Constants.ROUTE_API_GROUP.equals(item.getApiVersion()) && Constants.ROUTE.equals(item.getKind())
+                    && generatedRouteName.equals(item.getMetadata().getName())) {
+                try {
+                    OpenShiftClient openShiftClient = client.adapt(OpenShiftClient.class);
+                    Route route = openShiftClient.routes().withName(generatedRouteName).get();
+                    boolean isTLS = (route.getSpec().getTls() != null);
+                    String host = route.getSpec().getHost();
+                    log.infov("The deployed application can be accessed at: http{0}://{1}", isTLS ? "s" : "", host);
+                } catch (KubernetesClientException ignored) {
+
+                }
+                break;
+            }
+        }
+    }
+
     public static Predicate<HasMetadata> distictByResourceKey() {
         Map<Object, Boolean> seen = new ConcurrentHashMap<>();
         return t -> seen.putIfAbsent(t.getApiVersion() + "/" + t.getKind() + ":" + t.getMetadata().getName(),
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java
index 3cb7f58f24348..162ed8a70883e 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployerPrerequisite.java
@@ -5,13 +5,13 @@
 import io.quarkus.container.spi.ContainerImageBuildRequestBuildItem;
 import io.quarkus.container.spi.ContainerImageInfoBuildItem;
 import io.quarkus.container.spi.ContainerImagePushRequestBuildItem;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsNormalNotRemoteDev;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 
 public class KubernetesDeployerPrerequisite {
 
-    @BuildStep(onlyIf = IsNormal.class)
+    @BuildStep(onlyIf = IsNormalNotRemoteDev.class)
     public void prepare(ContainerImageInfoBuildItem containerImage,
             Optional<SelectedKubernetesDeploymentTargetBuildItem> selectedDeploymentTarget,
             BuildProducer<ContainerImageBuildRequestBuildItem> buildRequestProducer,
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java
index c3ebace490e54..c1c3bbf1e90ea 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java
@@ -1,44 +1,16 @@
 package io.quarkus.kubernetes.deployment;
 
-import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_HTTP_PORT;
-import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_S2I_IMAGE_NAME;
-import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT;
-import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_CONFIG;
-import static io.quarkus.kubernetes.deployment.Constants.HTTP_PORT;
-import static io.quarkus.kubernetes.deployment.Constants.KNATIVE;
 import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES;
-import static io.quarkus.kubernetes.deployment.Constants.MAX_NODE_PORT_VALUE;
-import static io.quarkus.kubernetes.deployment.Constants.MAX_PORT_NUMBER;
-import static io.quarkus.kubernetes.deployment.Constants.MINIKUBE;
-import static io.quarkus.kubernetes.deployment.Constants.MIN_NODE_PORT_VALUE;
-import static io.quarkus.kubernetes.deployment.Constants.MIN_PORT_NUMBER;
-import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT;
-import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT_APP_RUNTIME;
-import static io.quarkus.kubernetes.deployment.Constants.QUARKUS;
-import static io.quarkus.kubernetes.deployment.Constants.QUARKUS_ANNOTATIONS_BUILD_TIMESTAMP;
-import static io.quarkus.kubernetes.deployment.Constants.QUARKUS_ANNOTATIONS_COMMIT_ID;
-import static io.quarkus.kubernetes.deployment.Constants.QUARKUS_ANNOTATIONS_VCS_URL;
-import static io.quarkus.kubernetes.deployment.Constants.SERVICE;
-import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.DEFAULT_PRIORITY;
-import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.VANILLA_KUBERNETES_PRIORITY;
 import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.mergeList;
 
 import java.io.File;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.MessageDigest;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -50,70 +22,17 @@
 import io.dekorate.Session;
 import io.dekorate.SessionReader;
 import io.dekorate.SessionWriter;
-import io.dekorate.knative.decorator.ApplyGlobalAutoscalingClassDecorator;
-import io.dekorate.knative.decorator.ApplyGlobalContainerConcurrencyDecorator;
-import io.dekorate.knative.decorator.ApplyGlobalRequestsPerSecondTargetDecorator;
-import io.dekorate.knative.decorator.ApplyGlobalTargetUtilizationDecorator;
-import io.dekorate.knative.decorator.ApplyLocalAutoscalingClassDecorator;
-import io.dekorate.knative.decorator.ApplyLocalAutoscalingMetricDecorator;
-import io.dekorate.knative.decorator.ApplyLocalAutoscalingTargetDecorator;
-import io.dekorate.knative.decorator.ApplyLocalContainerConcurrencyDecorator;
-import io.dekorate.knative.decorator.ApplyLocalTargetUtilizationPercentageDecorator;
-import io.dekorate.knative.decorator.ApplyMaxScaleDecorator;
-import io.dekorate.knative.decorator.ApplyMinScaleDecorator;
-import io.dekorate.kubernetes.annotation.ImagePullPolicy;
-import io.dekorate.kubernetes.annotation.ServiceType;
-import io.dekorate.kubernetes.config.Annotation;
 import io.dekorate.kubernetes.config.Configurator;
-import io.dekorate.kubernetes.config.EnvBuilder;
-import io.dekorate.kubernetes.config.ImageConfigurationFluent;
-import io.dekorate.kubernetes.config.Label;
-import io.dekorate.kubernetes.config.LabelBuilder;
-import io.dekorate.kubernetes.config.PortBuilder;
-import io.dekorate.kubernetes.configurator.AddPort;
-import io.dekorate.kubernetes.decorator.AddAnnotationDecorator;
-import io.dekorate.kubernetes.decorator.AddAwsElasticBlockStoreVolumeDecorator;
-import io.dekorate.kubernetes.decorator.AddAzureDiskVolumeDecorator;
-import io.dekorate.kubernetes.decorator.AddAzureFileVolumeDecorator;
-import io.dekorate.kubernetes.decorator.AddConfigMapDataDecorator;
-import io.dekorate.kubernetes.decorator.AddConfigMapResourceProvidingDecorator;
-import io.dekorate.kubernetes.decorator.AddConfigMapVolumeDecorator;
-import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
-import io.dekorate.kubernetes.decorator.AddImagePullSecretDecorator;
-import io.dekorate.kubernetes.decorator.AddInitContainerDecorator;
-import io.dekorate.kubernetes.decorator.AddLabelDecorator;
-import io.dekorate.kubernetes.decorator.AddLivenessProbeDecorator;
-import io.dekorate.kubernetes.decorator.AddMountDecorator;
-import io.dekorate.kubernetes.decorator.AddPvcVolumeDecorator;
-import io.dekorate.kubernetes.decorator.AddReadinessProbeDecorator;
-import io.dekorate.kubernetes.decorator.AddRoleBindingResourceDecorator;
-import io.dekorate.kubernetes.decorator.AddSecretVolumeDecorator;
-import io.dekorate.kubernetes.decorator.AddServiceAccountResourceDecorator;
-import io.dekorate.kubernetes.decorator.ApplyArgsDecorator;
-import io.dekorate.kubernetes.decorator.ApplyCommandDecorator;
-import io.dekorate.kubernetes.decorator.ApplyImagePullPolicyDecorator;
-import io.dekorate.kubernetes.decorator.ApplyServiceAccountNamedDecorator;
-import io.dekorate.kubernetes.decorator.ApplyWorkingDirDecorator;
-import io.dekorate.kubernetes.decorator.RemoveAnnotationDecorator;
+import io.dekorate.kubernetes.decorator.Decorator;
 import io.dekorate.logger.NoopLogger;
 import io.dekorate.processor.SimpleFileReader;
 import io.dekorate.processor.SimpleFileWriter;
-import io.dekorate.project.BuildInfo;
-import io.dekorate.project.FileProjectFactory;
 import io.dekorate.project.Project;
-import io.dekorate.project.ScmInfo;
-import io.dekorate.s2i.config.S2iBuildConfig;
-import io.dekorate.s2i.config.S2iBuildConfigBuilder;
-import io.dekorate.s2i.config.S2iBuildConfigFluent;
-import io.dekorate.s2i.decorator.AddBuilderImageStreamResourceDecorator;
-import io.dekorate.utils.Annotations;
 import io.dekorate.utils.Maps;
-import io.quarkus.container.image.deployment.util.ImageUtil;
-import io.quarkus.container.spi.BaseImageInfoBuildItem;
-import io.quarkus.container.spi.ContainerImageInfoBuildItem;
-import io.quarkus.container.spi.ContainerImageLabelBuildItem;
+import io.dekorate.utils.Strings;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.IsTest;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
@@ -123,18 +42,11 @@
 import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
 import io.quarkus.deployment.util.FileUtil;
-import io.quarkus.kubernetes.deployment.Annotations.Prometheus;
-import io.quarkus.kubernetes.spi.KubernetesAnnotationBuildItem;
-import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
+import io.quarkus.kubernetes.spi.ConfiguratorBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
 import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
-import io.quarkus.kubernetes.spi.KubernetesEnvBuildItem;
-import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
-import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
-import io.quarkus.kubernetes.spi.KubernetesLabelBuildItem;
 import io.quarkus.kubernetes.spi.KubernetesPortBuildItem;
-import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
 import io.quarkus.runtime.LaunchMode;
-import io.quarkus.smallrye.metrics.deployment.spi.MetricsConfigurationBuildItem;
 
 class KubernetesProcessor {
 
@@ -143,42 +55,11 @@ class KubernetesProcessor {
     private static final String OUTPUT_ARTIFACT_FORMAT = "%s%s.jar";
     public static final String DEFAULT_HASH_ALGORITHM = "SHA-256";
 
-    private static final int MINIKUBE_PRIORITY = DEFAULT_PRIORITY + 20;
-    private static final int OPENSHIFT_PRIORITY = DEFAULT_PRIORITY + 10;
-    private static final int KNATIVE_PRIORITY = DEFAULT_PRIORITY;
-
     @BuildStep
     FeatureBuildItem produceFeature() {
         return new FeatureBuildItem(Feature.KUBERNETES);
     }
 
-    @BuildStep
-    public void deploymentTargets(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
-        List<String> userSpecifiedDeploymentTargets = KubernetesConfigUtil.getUserSpecifiedDeploymentTargets();
-        if (userSpecifiedDeploymentTargets.isEmpty()) {
-            // when nothing was selected by the user, we enable vanilla Kubernetes by default
-            deploymentTargets.produce(
-                    new KubernetesDeploymentTargetBuildItem(KUBERNETES, DEPLOYMENT, VANILLA_KUBERNETES_PRIORITY, true));
-        }
-
-        // even if these are disabled, they serve the purpose of setting the proper priorities
-
-        deploymentTargets
-                .produce(new KubernetesDeploymentTargetBuildItem(MINIKUBE, DEPLOYMENT, MINIKUBE_PRIORITY,
-                        userSpecifiedDeploymentTargets.contains(MINIKUBE)));
-
-        deploymentTargets
-                .produce(new KubernetesDeploymentTargetBuildItem(OPENSHIFT, DEPLOYMENT_CONFIG, OPENSHIFT_PRIORITY,
-                        userSpecifiedDeploymentTargets.contains(OPENSHIFT)));
-
-        deploymentTargets.produce(new KubernetesDeploymentTargetBuildItem(KNATIVE, SERVICE, KNATIVE_PRIORITY,
-                userSpecifiedDeploymentTargets.contains(KNATIVE)));
-
-        deploymentTargets.produce(
-                new KubernetesDeploymentTargetBuildItem(KUBERNETES, DEPLOYMENT, VANILLA_KUBERNETES_PRIORITY,
-                        userSpecifiedDeploymentTargets.contains(KUBERNETES)));
-    }
-
     @BuildStep
     public EnabledKubernetesDeploymentTargetsBuildItem enabledKubernetesDeploymentTargets(
             List<KubernetesDeploymentTargetBuildItem> allDeploymentTargets) {
@@ -195,68 +76,7 @@ public EnabledKubernetesDeploymentTargetsBuildItem enabledKubernetesDeploymentTa
         return new EnabledKubernetesDeploymentTargetsBuildItem(entries);
     }
 
-    @BuildStep
-    public List<KubernetesAnnotationBuildItem> createAnnotations(KubernetesConfig kubernetesConfig,
-            OpenshiftConfig openshiftConfig, KnativeConfig knativeConfig,
-            Optional<MetricsConfigurationBuildItem> metricsConfiguration, List<KubernetesPortBuildItem> kubernetesPorts) {
-        List<KubernetesAnnotationBuildItem> result = new ArrayList<KubernetesAnnotationBuildItem>();
-        addAnnotations(kubernetesConfig, KUBERNETES, metricsConfiguration, kubernetesPorts, result);
-        addAnnotations(kubernetesConfig, MINIKUBE, metricsConfiguration, kubernetesPorts, result);
-        addAnnotations(openshiftConfig, OPENSHIFT, metricsConfiguration, kubernetesPorts, result);
-        addAnnotations(knativeConfig, KNATIVE, metricsConfiguration, kubernetesPorts, result);
-        return result;
-    }
-
-    private void addAnnotations(PlatformConfiguration config, String target,
-            Optional<MetricsConfigurationBuildItem> metricsConfigurationBuildItem,
-            List<KubernetesPortBuildItem> kubernetesPorts,
-            List<KubernetesAnnotationBuildItem> result) {
-        for (Map.Entry<String, String> entry : config.getAnnotations().entrySet()) {
-            result.add(new KubernetesAnnotationBuildItem(entry.getKey(), entry.getValue(), target));
-        }
-        if (metricsConfigurationBuildItem.isPresent() && !kubernetesPorts.isEmpty()) {
-            result.add(new KubernetesAnnotationBuildItem(Prometheus.SCRAPE, "true", target));
-            result.add(new KubernetesAnnotationBuildItem(Prometheus.PATH, metricsConfigurationBuildItem.get().getPath(),
-                    target));
-            result.add(new KubernetesAnnotationBuildItem(Prometheus.PORT, "" + kubernetesPorts.get(0).getPort(), target));
-        }
-    }
-
-    @BuildStep
-    public void createLabels(KubernetesConfig kubernetesConfig, OpenshiftConfig openshiftConfig,
-            KnativeConfig knativeConfig,
-            BuildProducer<KubernetesLabelBuildItem> kubernetesLabelsProducer,
-            BuildProducer<ContainerImageLabelBuildItem> containerImageLabelsProducer) {
-        kubernetesConfig.labels.forEach((k, v) -> {
-            kubernetesLabelsProducer.produce(new KubernetesLabelBuildItem(k, v, KUBERNETES));
-            kubernetesLabelsProducer.produce(new KubernetesLabelBuildItem(k, v, MINIKUBE));
-            containerImageLabelsProducer.produce(new ContainerImageLabelBuildItem(k, v));
-        });
-        openshiftConfig.labels.forEach((k, v) -> {
-            kubernetesLabelsProducer.produce(new KubernetesLabelBuildItem(k, v, OPENSHIFT));
-            containerImageLabelsProducer.produce(new ContainerImageLabelBuildItem(k, v));
-        });
-        knativeConfig.labels.forEach((k, v) -> {
-            kubernetesLabelsProducer.produce(new KubernetesLabelBuildItem(k, v, KNATIVE));
-            containerImageLabelsProducer.produce(new ContainerImageLabelBuildItem(k, v));
-        });
-    }
-
-    @BuildStep
-    public List<KubernetesEnvBuildItem> createEnv(KubernetesConfig kubernetesConfig, OpenshiftConfig openshiftConfig,
-            KnativeConfig knativeConfig) {
-
-        Collection<KubernetesEnvBuildItem> kubernetesEnvBuildItems = kubernetesConfig.convertToBuildItems();
-        List<KubernetesEnvBuildItem> items = new ArrayList<>(kubernetesEnvBuildItems);
-        for (KubernetesEnvBuildItem kubernetesEnvBuildItem : kubernetesEnvBuildItems) {
-            items.add(kubernetesEnvBuildItem.newWithTarget(MINIKUBE));
-        }
-        items.addAll(openshiftConfig.convertToBuildItems());
-        items.addAll(knativeConfig.convertToBuildItems());
-        return items;
-    }
-
-    @BuildStep
+    @BuildStep(onlyIfNot = IsTest.class)
     public void build(ApplicationInfoBuildItem applicationInfo,
             OutputTargetBuildItem outputTarget,
             PackageConfig packageConfig,
@@ -265,22 +85,14 @@ public void build(ApplicationInfoBuildItem applicationInfo,
             KnativeConfig knativeConfig,
             Capabilities capabilities,
             LaunchModeBuildItem launchMode,
-            List<KubernetesAnnotationBuildItem> kubernetesAnnotations,
-            List<KubernetesLabelBuildItem> kubernetesLabels,
-            List<KubernetesEnvBuildItem> kubernetesEnvs,
-            List<KubernetesRoleBuildItem> kubernetesRoles,
             List<KubernetesPortBuildItem> kubernetesPorts,
             EnabledKubernetesDeploymentTargetsBuildItem kubernetesDeploymentTargets,
-            Optional<BaseImageInfoBuildItem> baseImage,
-            Optional<ContainerImageInfoBuildItem> containerImage,
-            Optional<KubernetesCommandBuildItem> command,
-            Optional<KubernetesHealthLivenessPathBuildItem> kubernetesHealthLivenessPath,
-            Optional<KubernetesHealthReadinessPathBuildItem> kubernetesHealthReadinessPath,
+            List<ConfiguratorBuildItem> configurators,
+            List<DecoratorBuildItem> decorators,
             BuildProducer<GeneratedFileSystemResourceBuildItem> generatedResourceProducer) {
 
-        if (launchMode.getLaunchMode() == LaunchMode.TEST) {
-            return;
-        }
+        List<ConfiguratorBuildItem> allConfigurators = new ArrayList<>(configurators);
+        List<DecoratorBuildItem> allDecorators = new ArrayList<>(decorators);
 
         if (kubernetesPorts.isEmpty()) {
             log.debug("The service is not an HTTP service so no Kubernetes manifests will be generated");
@@ -299,134 +111,99 @@ public void build(ApplicationInfoBuildItem applicationInfo,
                 .map(DeploymentTargetEntry::getName)
                 .collect(Collectors.toSet());
 
-        Path artifactPath = outputTarget.getOutputDirectory().resolve(
-                String.format(OUTPUT_ARTIFACT_FORMAT, outputTarget.getBaseName(), packageConfig.runnerSuffix));
+        Path artifactPath = outputTarget.getOutputDirectory()
+                .resolve(String.format(OUTPUT_ARTIFACT_FORMAT, outputTarget.getBaseName(), packageConfig.runnerSuffix));
 
         try {
-            final Map<String, String> generatedResourcesMap;
             // by passing false to SimpleFileWriter, we ensure that no files are actually written during this phase
-            Project project = createProject(applicationInfo, artifactPath);
-            final SessionWriter sessionWriter = new SimpleFileWriter(project, false);
-            final SessionReader sessionReader = new SimpleFileReader(
-                    project.getRoot().resolve("src").resolve("main").resolve("kubernetes"), kubernetesDeploymentTargets
-                            .getEntriesSortedByPriority().stream()
-                            .map(DeploymentTargetEntry::getName).collect(Collectors.toSet()));
-            sessionWriter.setProject(project);
-
-            if (launchMode.getLaunchMode() != LaunchMode.NORMAL) {
-                // needed for a fresh run
-                Session.clearSession();
-            }
+            Optional<Project> optionalProject = KubernetesCommonHelper.createProject(applicationInfo, artifactPath);
+            optionalProject.ifPresent(project -> {
+
+                final Map<String, String> generatedResourcesMap;
+                final SessionWriter sessionWriter = new SimpleFileWriter(project, false);
+                final SessionReader sessionReader = new SimpleFileReader(
+                        project.getRoot().resolve("src").resolve("main").resolve("kubernetes"), kubernetesDeploymentTargets
+                                .getEntriesSortedByPriority().stream()
+                                .map(DeploymentTargetEntry::getName).collect(Collectors.toSet()));
+                sessionWriter.setProject(project);
+
+                if (launchMode.getLaunchMode() != LaunchMode.NORMAL) {
+                    // needed for a fresh run
+                    Session.clearSession();
+                }
 
-            final Session session = Session.getSession(new NoopLogger());
-
-            session.setWriter(sessionWriter);
-            session.setReader(sessionReader);
-
-            session.feed(Maps.fromProperties(config));
-
-            //Apply configuration
-            applyGlobalConfig(session, kubernetesConfig);
-
-            ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
-
-            boolean needToForceUpdateImagePullPolicy = needToForceUpdateImagePullPolicy(deploymentTargets, containerImage,
-                    capabilities);
-            applyConfig(session, project, KUBERNETES, getResourceName(kubernetesConfig, applicationInfo), kubernetesConfig,
-                    now, determineImagePullPolicy(kubernetesConfig, needToForceUpdateImagePullPolicy));
-            applyConfig(session, project, MINIKUBE, getResourceName(kubernetesConfig, applicationInfo), kubernetesConfig,
-                    now, ImagePullPolicy.IfNotPresent);
-            applyConfig(session, project, OPENSHIFT, getResourceName(openshiftConfig, applicationInfo), openshiftConfig, now,
-                    determineImagePullPolicy(openshiftConfig, needToForceUpdateImagePullPolicy));
-            applyConfig(session, project, KNATIVE, getResourceName(knativeConfig, applicationInfo), knativeConfig, now,
-                    determineImagePullPolicy(knativeConfig, needToForceUpdateImagePullPolicy));
-
-            applyKnativeConfig(session, project, getResourceName(knativeConfig, applicationInfo), knativeConfig);
-            //When S2i is disabled we need to pass that information to dekorate.
-            //Also we need to make sure that the alternatives (instances of ImageConfiguration)
-            //are properly configured.
-            if (!capabilities.isCapabilityPresent(Capabilities.CONTAINER_IMAGE_S2I)) {
-                session.configurators().add(new Configurator<ImageConfigurationFluent<?>>() {
-                    @Override
-                    public void visit(ImageConfigurationFluent<?> image) {
-                        containerImage.ifPresent(i -> {
-                            String group = ImageUtil.getRepository(i.getImage()).split("/")[0];
-                            image.withGroup(group);
-                            i.getRegistry().ifPresent(r -> {
-                                image.withRegistry(r);
-                            });
-                        });
-                    }
+                final Session session = Session.getSession(new NoopLogger());
+
+                session.setWriter(sessionWriter);
+                session.setReader(sessionReader);
+
+                session.feed(Maps.fromProperties(config));
+
+                //We need to verify to filter out anything that doesn't extend the Configurator class.
+                //The ConfiguratorBuildItem is a wrapper to Object.
+                allConfigurators.stream().filter(d -> d.matches(Configurator.class)).forEach(i -> {
+                    Configurator configurator = (Configurator) i.getConfigurator();
+                    session.configurators().add(configurator);
                 });
 
-                //JAVA_APP_JAR value is not compatible with our Dockerfiles, so its causing problems
-                session.resources().decorate(OPENSHIFT, new RemoveEnvVarDecorator("JAVA_APP_JAR"));
-                session.configurators().add(new Configurator<S2iBuildConfigFluent<?>>() {
-                    @Override
-                    public void visit(S2iBuildConfigFluent<?> s2i) {
-                        s2i.withEnabled(false);
+                //We need to verify to filter out anything that doesn't extend the Decorator class.
+                //The DecoratorBuildItem is a wrapper to Object.
+                allDecorators.stream().filter(d -> d.matches(Decorator.class)).forEach(i -> {
+                    String group = i.getGroup();
+                    Decorator decorator = (Decorator) i.getDecorator();
+                    if (Strings.isNullOrEmpty(group)) {
+                        session.resources().decorate(decorator);
+                    } else {
+                        session.resources().decorate(group, decorator);
                     }
                 });
-            }
-            //apply build item configurations to the dekorate session.
-            applyBuildItems(session,
-                    applicationInfo,
-                    kubernetesConfig,
-                    openshiftConfig,
-                    knativeConfig,
-                    deploymentTargets,
-                    kubernetesAnnotations,
-                    kubernetesLabels,
-                    kubernetesEnvs,
-                    kubernetesRoles,
-                    kubernetesPorts,
-                    baseImage,
-                    containerImage,
-                    command,
-                    kubernetesHealthLivenessPath,
-                    kubernetesHealthReadinessPath);
-
-            // write the generated resources to the filesystem
-            generatedResourcesMap = session.close();
-
-            List<String> generatedFileNames = new ArrayList<>(generatedResourcesMap.size());
-            for (Map.Entry<String, String> resourceEntry : generatedResourcesMap.entrySet()) {
-                Path path = Paths.get(resourceEntry.getKey());
-                //We need to ignore the config yml
-                if (!path.toFile().getParentFile().getName().equals("dekorate")) {
-                    continue;
-                }
-                String fileName = path.toFile().getName();
-                Path targetPath = outputTarget.getOutputDirectory().resolve(KUBERNETES).resolve(fileName);
-                String relativePath = targetPath.toAbsolutePath().toString().replace(root.toAbsolutePath().toString(), "");
-
-                resourceEntry.getKey().replace(root.toAbsolutePath().toString(), KUBERNETES);
-                if (fileName.endsWith(".yml") || fileName.endsWith(".json")) {
-                    String target = fileName.substring(0, fileName.lastIndexOf("."));
-                    if (!deploymentTargets.contains(target)) {
+
+                // write the generated resources to the filesystem
+                generatedResourcesMap = session.close();
+                List<String> generatedFileNames = new ArrayList<>(generatedResourcesMap.size());
+                for (Map.Entry<String, String> resourceEntry : generatedResourcesMap.entrySet()) {
+                    Path path = Paths.get(resourceEntry.getKey());
+                    //We need to ignore the config yml
+                    if (!path.toFile().getParentFile().getName().equals("dekorate")) {
                         continue;
                     }
-                }
+                    String fileName = path.toFile().getName();
+                    Path targetPath = outputTarget.getOutputDirectory().resolve(KUBERNETES).resolve(fileName);
+                    String relativePath = targetPath.toAbsolutePath().toString().replace(root.toAbsolutePath().toString(), "");
+
+                    resourceEntry.getKey().replace(root.toAbsolutePath().toString(), KUBERNETES);
+                    if (fileName.endsWith(".yml") || fileName.endsWith(".json")) {
+                        String target = fileName.substring(0, fileName.lastIndexOf("."));
+                        if (!deploymentTargets.contains(target)) {
+                            continue;
+                        }
+                    }
 
-                generatedFileNames.add(fileName);
-                generatedResourceProducer.produce(
-                        new GeneratedFileSystemResourceBuildItem(
-                                // we need to make sure we are only passing the relative path to the build item
-                                relativePath,
-                                resourceEntry.getValue().getBytes(StandardCharsets.UTF_8)));
-            }
+                    generatedFileNames.add(fileName);
+                    generatedResourceProducer.produce(
+                            new GeneratedFileSystemResourceBuildItem(
+                                    // we need to make sure we are only passing the relative path to the build item
+                                    relativePath,
+                                    resourceEntry.getValue().getBytes(StandardCharsets.UTF_8)));
+                }
 
-            if (!generatedFileNames.isEmpty()) {
-                log.infof("Generated the Kubernetes manifests: '%s' in '%s'", String.join(",", generatedFileNames),
-                        outputTarget.getOutputDirectory() + File.separator + KUBERNETES);
-            }
+                if (!generatedFileNames.isEmpty()) {
+                    log.debugf("Generated the Kubernetes manifests: '%s' in '%s'", String.join(",", generatedFileNames),
+                            outputTarget.getOutputDirectory() + File.separator + KUBERNETES);
+                }
 
-            try {
-                if (root != null && root.toFile().exists()) {
-                    FileUtil.deleteDirectory(root);
+                try {
+                    if (root != null && root.toFile().exists()) {
+                        FileUtil.deleteDirectory(root);
+                    }
+                } catch (IOException e) {
+                    log.debug("Unable to delete temporary directory " + root, e);
                 }
-            } catch (IOException e) {
-                log.debug("Unable to delete temporary directory " + root, e);
+
+            });
+
+            if (!optionalProject.isPresent()) {
+                log.warn("No project was detected, skipping generation of kubernetes manifests!");
             }
         } catch (Exception e) {
             if (launchMode.getLaunchMode() == LaunchMode.NORMAL) {
@@ -435,484 +212,6 @@ public void visit(S2iBuildConfigFluent<?> s2i) {
 
             log.warn("Failed to generate Kubernetes resources", e);
         }
-    }
-
-    private String getResourceName(PlatformConfiguration platformConfiguration, ApplicationInfoBuildItem applicationInfo) {
-        return platformConfiguration.getName().orElse(applicationInfo.getName());
-    }
 
-    /**
-     * Apply global changes
-     *
-     * @param session The session to apply the changes
-     * @param config The {@link KubernetesConfig} instance
-     */
-    private void applyGlobalConfig(Session session, KubernetesConfig config) {
-        //Ports
-        config.ports.entrySet().forEach(e -> session.configurators().add(new AddPort(PortConverter.convert(e))));
     }
-
-    /**
-     * Apply changes to the target resource group
-     *
-     * @param session The session to apply the changes
-     * @param target The deployment target (e.g. kubernetes, openshift, knative)
-     * @param name The name of the resource to accept the configuration
-     * @param config The {@link PlatformConfiguration} instance
-     * @param now ZonedDateTime indicating the current time
-     * @param imagePullPolicy Kubernetes ImagePullPolicy to be used
-     */
-    private void applyConfig(Session session, Project project, String target, String name, PlatformConfiguration config,
-            ZonedDateTime now, ImagePullPolicy imagePullPolicy) {
-        if (OPENSHIFT.equals(target)) {
-            session.resources().decorate(OPENSHIFT, new AddLabelDecorator(new Label(OPENSHIFT_APP_RUNTIME, QUARKUS)));
-        }
-
-        if (config.getNamespace().isPresent()) {
-            session.resources().decorate(target, new AddNamespaceDecorator(config.getNamespace().get()));
-        }
-
-        applyAnnotations(session, project, target, config, now);
-
-        config.getWorkingDir().ifPresent(w -> {
-            session.resources().decorate(target, new ApplyWorkingDirDecorator(name, w));
-        });
-
-        config.getCommand().ifPresent(c -> {
-            session.resources().decorate(target, new ApplyCommandDecorator(name, c.toArray(new String[0])));
-        });
-
-        config.getArguments().ifPresent(a -> {
-            session.resources().decorate(target, new ApplyArgsDecorator(name, a.toArray(new String[0])));
-        });
-
-        config.getServiceAccount().ifPresent(s -> {
-            session.resources().decorate(target, new ApplyServiceAccountNamedDecorator(name, s));
-        });
-
-        //Image Pull
-        session.resources().decorate(target, new ApplyImagePullPolicyDecorator(imagePullPolicy));
-        config.getImagePullSecrets().ifPresent(l -> {
-            l.forEach(s -> session.resources().decorate(target, new AddImagePullSecretDecorator(name, s)));
-        });
-
-        // Mounts and Volumes
-        config.getMounts().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddMountDecorator(MountConverter.convert(e)));
-        });
-
-        config.getSecretVolumes().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddSecretVolumeDecorator(SecretVolumeConverter.convert(e)));
-        });
-
-        config.getConfigMapVolumes().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddConfigMapVolumeDecorator(ConfigMapVolumeConverter.convert(e)));
-        });
-
-        config.getPvcVolumes().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddPvcVolumeDecorator(PvcVolumeConverter.convert(e)));
-        });
-
-        config.getAwsElasticBlockStoreVolumes().entrySet().forEach(e -> {
-            session.resources().decorate(target,
-                    new AddAwsElasticBlockStoreVolumeDecorator(AwsElasticBlockStoreVolumeConverter.convert(e)));
-        });
-
-        config.getAzureFileVolumes().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddAzureFileVolumeDecorator(AzureFileVolumeConverter.convert(e)));
-        });
-
-        config.getAzureDiskVolumes().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddAzureDiskVolumeDecorator(AzureDiskVolumeConverter.convert(e)));
-        });
-
-        config.getInitContainers().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddInitContainerDecorator(name, ContainerConverter.convert(e)));
-        });
-
-        config.getSidecars().entrySet().forEach(e -> {
-            session.resources().decorate(target, new AddSidecarDecorator(name, ContainerConverter.convert(e)));
-        });
-
-        // The presence of optional is causing issues in OCP 3.11, so we better remove them.
-        // The following 4 decorator will set the optional property to null, so that it won't make it into the file.
-        session.resources().decorate(target, new RemoveOptionalFromSecretEnvSourceDecorator());
-        session.resources().decorate(target, new RemoveOptionalFromConfigMapEnvSourceDecorator());
-        session.resources().decorate(target, new RemoveOptionalFromSecretKeySelectorDecorator());
-        session.resources().decorate(target, new RemoveOptionalFromConfigMapKeySelectorDecorator());
-    }
-
-    private void applyAnnotations(Session session, Project project, String target, PlatformConfiguration config,
-            ZonedDateTime now) {
-        ScmInfo scm = project.getScmInfo();
-        String vcsUrl = scm != null ? scm.getUrl() : null;
-        String commitId = scm != null ? scm.getCommit() : null;
-
-        //Dekorate uses its own annotations. Let's replace them with the quarkus ones.
-        session.resources().decorate(target, new RemoveAnnotationDecorator(Annotations.VCS_URL));
-        session.resources().decorate(target, new RemoveAnnotationDecorator(Annotations.COMMIT_ID));
-        //Add quarkus vcs annotations
-        if (commitId != null) {
-            session.resources().decorate(target,
-                    new AddAnnotationDecorator(new Annotation(QUARKUS_ANNOTATIONS_COMMIT_ID, commitId)));
-        }
-        if (vcsUrl != null) {
-            session.resources().decorate(target,
-                    new AddAnnotationDecorator(new Annotation(QUARKUS_ANNOTATIONS_VCS_URL, vcsUrl)));
-        }
-
-        if (config.isAddBuildTimestamp()) {
-            session.resources().decorate(target, new AddAnnotationDecorator(new Annotation(QUARKUS_ANNOTATIONS_BUILD_TIMESTAMP,
-                    now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd - HH:mm:ss Z")))));
-        }
-    }
-
-    private void applyKnativeConfig(Session session, Project project, String name, KnativeConfig config) {
-        if (config.clusterLocal) {
-            session.resources().decorate(KNATIVE, new AddLabelDecorator(name,
-                    new LabelBuilder()
-                            .withKey("serving.knative.dev/visibility")
-                            .withValue("cluster-local")
-                            .build()));
-        }
-
-        config.minScale.ifPresent(min -> session.resources().decorate(KNATIVE, new ApplyMinScaleDecorator(name, min)));
-
-        config.maxScale.ifPresent(max -> session.resources().decorate(KNATIVE, new ApplyMaxScaleDecorator(name, max)));
-
-        config.revisionAutoScaling.autoScalerClass.map(AutoScalerClassConverter::convert)
-                .ifPresent(a -> session.resources().decorate(KNATIVE, new ApplyLocalAutoscalingClassDecorator(name, a)));
-
-        config.revisionAutoScaling.metric.map(AutoScalingMetricConverter::convert)
-                .ifPresent(m -> session.resources().decorate(KNATIVE, new ApplyLocalAutoscalingMetricDecorator(name, m)));
-
-        config.revisionAutoScaling.containerConcurrency
-                .ifPresent(c -> session.resources().decorate(KNATIVE, new ApplyLocalContainerConcurrencyDecorator(name, c)));
-
-        config.revisionAutoScaling.targetUtilizationPercentage
-                .ifPresent(t -> session.resources().decorate(KNATIVE,
-                        new ApplyLocalTargetUtilizationPercentageDecorator(name, t)));
-        config.revisionAutoScaling.target
-                .ifPresent(t -> session.resources().decorate(KNATIVE, new ApplyLocalAutoscalingTargetDecorator(name, t)));
-
-        config.globalAutoScaling.autoScalerClass
-                .map(AutoScalerClassConverter::convert)
-                .ifPresent(a -> {
-                    session.resources().decorate(new AddConfigMapResourceProvidingDecorator("config-autoscaler"));
-                    session.resources().decorate(new ApplyGlobalAutoscalingClassDecorator(a));
-                });
-
-        config.globalAutoScaling.containerConcurrency
-                .ifPresent(c -> {
-                    session.resources().decorate(new AddConfigMapResourceProvidingDecorator("config-defaults"));
-                    session.resources().decorate(new ApplyGlobalContainerConcurrencyDecorator(c));
-                });
-
-        config.globalAutoScaling.requestsPerSecond
-                .ifPresent(r -> {
-                    session.resources().decorate(new AddConfigMapResourceProvidingDecorator("config-autoscaler"));
-                    session.resources().decorate(new ApplyGlobalRequestsPerSecondTargetDecorator(r));
-                });
-
-        config.globalAutoScaling.targetUtilizationPercentage
-                .ifPresent(t -> {
-                    session.resources().decorate(new AddConfigMapResourceProvidingDecorator("config-autoscaler"));
-                    session.resources().decorate(new ApplyGlobalTargetUtilizationDecorator(t));
-                });
-
-        if (!config.scaleToZeroEnabled) {
-            session.resources().decorate(new AddConfigMapResourceProvidingDecorator("config-autoscaler"));
-            session.resources().decorate(new AddConfigMapDataDecorator("config-autoscaler", "enable-scale-to-zero",
-                    String.valueOf(config.scaleToZeroEnabled)));
-        }
-    }
-
-    /**
-     * When there is no registry defined and s2i isn't being used, the only ImagePullPolicy that can work is 'IfNotPresent'.
-     * This case comes up when users want to deploy their application to a cluster like Minikube where no registry is used
-     * and instead they rely on the image being built directly into the docker daemon that the cluster uses.
-     */
-    private boolean needToForceUpdateImagePullPolicy(Collection<String> deploymentTargets,
-            Optional<ContainerImageInfoBuildItem> containerImage,
-            Capabilities capabilities) {
-
-        // no need to change when we use Minikube only
-        if ((deploymentTargets.size() == 1) && deploymentTargets.contains(MINIKUBE)) {
-            return false;
-        }
-
-        boolean result = containerImage.isPresent()
-                && ContainerImageUtil.isRegistryMissingAndNotS2I(capabilities, containerImage.get());
-        if (result) {
-            log.warn("No registry was set for the container image, so 'ImagePullPolicy' is being force-set to 'IfNotPresent'.");
-            return true;
-        }
-        return false;
-    }
-
-    private ImagePullPolicy determineImagePullPolicy(PlatformConfiguration config, boolean needToForceUpdateImagePullPolicy) {
-        if (needToForceUpdateImagePullPolicy) {
-            return ImagePullPolicy.IfNotPresent;
-        }
-        return config.getImagePullPolicy();
-    }
-
-    private void applyBuildItems(Session session,
-            ApplicationInfoBuildItem applicationInfo,
-            KubernetesConfig kubernetesConfig,
-            OpenshiftConfig openshiftConfig,
-            KnativeConfig knativeConfig,
-            Set<String> deploymentTargets,
-            List<KubernetesAnnotationBuildItem> kubernetesAnnotations,
-            List<KubernetesLabelBuildItem> kubernetesLabels,
-            List<KubernetesEnvBuildItem> kubernetesEnvs,
-            List<KubernetesRoleBuildItem> kubernetesRoles,
-            List<KubernetesPortBuildItem> kubernetesPorts,
-            Optional<BaseImageInfoBuildItem> baseImage,
-            Optional<ContainerImageInfoBuildItem> containerImage,
-            Optional<KubernetesCommandBuildItem> command,
-            Optional<KubernetesHealthLivenessPathBuildItem> kubernetesHealthLivenessPath,
-            Optional<KubernetesHealthReadinessPathBuildItem> kubernetesHealthReadinessPath) {
-
-        String kubernetesName = getResourceName(kubernetesConfig, applicationInfo);
-        String openshiftName = getResourceName(openshiftConfig, applicationInfo);
-        String knativeName = getResourceName(knativeConfig, applicationInfo);
-
-        Map<String, PlatformConfiguration> configMap = new HashMap<>();
-        configMap.put(KUBERNETES, kubernetesConfig);
-        configMap.put(MINIKUBE, kubernetesConfig);
-        configMap.put(OPENSHIFT, openshiftConfig);
-        configMap.put(KNATIVE, knativeConfig);
-
-        //Replicas
-        if (kubernetesConfig.getReplicas() != 1) {
-            session.resources().decorate(new io.dekorate.kubernetes.decorator.ApplyReplicasDecorator(kubernetesName,
-                    kubernetesConfig.getReplicas()));
-        }
-        if (openshiftConfig.getReplicas() != 1) {
-            session.resources()
-                    .decorate(new io.dekorate.openshift.decorator.ApplyReplicasDecorator(openshiftName,
-                            openshiftConfig.getReplicas()));
-        }
-
-        kubernetesAnnotations.forEach(a -> {
-            session.resources().decorate(a.getTarget(), new AddAnnotationDecorator(new Annotation(a.getKey(), a.getValue())));
-        });
-
-        kubernetesLabels.forEach(l -> {
-            session.resources().decorate(l.getTarget(), new AddLabelDecorator(new Label(l.getKey(), l.getValue())));
-        });
-
-        containerImage.ifPresent(c -> {
-            session.resources().decorate(OPENSHIFT, new ApplyContainerImageDecorator(openshiftName, c.getImage()));
-            session.resources().decorate(KUBERNETES, new ApplyContainerImageDecorator(kubernetesName, c.getImage()));
-            session.resources().decorate(MINIKUBE, new ApplyContainerImageDecorator(kubernetesName, c.getImage()));
-            session.resources().decorate(KNATIVE, new ApplyContainerImageDecorator(knativeName, c.getImage()));
-        });
-
-        kubernetesEnvs.forEach(e -> {
-            session.resources().decorate(e.getTarget(), new AddEnvVarDecorator(new EnvBuilder()
-                    .withName(EnvConverter.convertName(e.getName()))
-                    .withValue(e.getValue())
-                    .withSecret(e.getSecret())
-                    .withConfigmap(e.getConfigMap())
-                    .withField(e.getField())
-                    .build()));
-        });
-
-        //Handle Command and arguments
-        command.ifPresent(c -> {
-            session.resources().decorate(new ApplyCommandDecorator(kubernetesName, new String[] { c.getCommand() }));
-            session.resources().decorate(KUBERNETES, new ApplyArgsDecorator(kubernetesName, c.getArgs()));
-            session.resources().decorate(MINIKUBE, new ApplyArgsDecorator(kubernetesName, c.getArgs()));
-
-            session.resources().decorate(new ApplyCommandDecorator(openshiftName, new String[] { c.getCommand() }));
-            session.resources().decorate(OPENSHIFT, new ApplyArgsDecorator(openshiftName, c.getArgs()));
-
-            session.resources().decorate(new ApplyCommandDecorator(knativeName, new String[] { c.getCommand() }));
-            session.resources().decorate(KNATIVE, new ApplyArgsDecorator(knativeName, c.getArgs()));
-        });
-
-        //Handle ports
-        final Map<String, Integer> ports = verifyPorts(kubernetesPorts);
-        ports.entrySet().stream()
-                .map(e -> new PortBuilder().withName(e.getKey()).withContainerPort(e.getValue()).build())
-                .forEach(p -> session.configurators().add(new AddPort(p)));
-
-        //Handle RBAC
-        if (!kubernetesPorts.isEmpty()) {
-            session.resources().decorate(new ApplyServiceAccountNamedDecorator());
-            session.resources().decorate(new AddServiceAccountResourceDecorator());
-            kubernetesRoles
-                    .forEach(r -> session.resources().decorate(new AddRoleBindingResourceDecorator(r.getRole())));
-        }
-
-        handleServices(session, kubernetesConfig, openshiftConfig, knativeConfig, kubernetesName, openshiftName, knativeName);
-
-        //Handle custom s2i builder images
-        if (deploymentTargets.contains(OPENSHIFT)) {
-            baseImage.map(BaseImageInfoBuildItem::getImage).ifPresent(builderImage -> {
-                String builderImageName = ImageUtil.getName(builderImage);
-                S2iBuildConfig s2iBuildConfig = new S2iBuildConfigBuilder().withBuilderImage(builderImage).build();
-                if (!DEFAULT_S2I_IMAGE_NAME.equals(builderImageName)) {
-                    session.resources().decorate(OPENSHIFT, new RemoveBuilderImageResourceDecorator(DEFAULT_S2I_IMAGE_NAME));
-                }
-                session.resources().decorate(OPENSHIFT, new AddBuilderImageStreamResourceDecorator(s2iBuildConfig));
-                session.resources().decorate(OPENSHIFT, new ApplyBuilderImageDecorator(openshiftName, builderImage));
-            });
-        }
-
-        // only use the probe config
-        handleProbes(applicationInfo, kubernetesConfig, openshiftConfig, knativeConfig, deploymentTargets, ports,
-                kubernetesHealthLivenessPath,
-                kubernetesHealthReadinessPath, session);
-    }
-
-    private void handleServices(Session session, KubernetesConfig kubernetesConfig, OpenshiftConfig openshiftConfig,
-            KnativeConfig knativeConfig, String kubernetesName, String openshiftName, String knativeName) {
-        session.resources().decorate(KUBERNETES,
-                new ApplyServiceTypeDecorator(kubernetesName, kubernetesConfig.getServiceType().name()));
-        if ((kubernetesConfig.getServiceType() == ServiceType.NodePort) && kubernetesConfig.nodePort.isPresent()) {
-            session.resources().decorate(KUBERNETES,
-                    new AddNodePortDecorator(openshiftName, kubernetesConfig.nodePort.getAsInt()));
-        }
-        session.resources().decorate(MINIKUBE,
-                new ApplyServiceTypeDecorator(kubernetesName, ServiceType.NodePort.name()));
-        session.resources().decorate(MINIKUBE, new AddNodePortDecorator(kubernetesName, kubernetesConfig.nodePort
-                .orElseGet(() -> getStablePortNumberInRange(kubernetesName, MIN_NODE_PORT_VALUE, MAX_NODE_PORT_VALUE))));
-
-        session.resources().decorate(OPENSHIFT,
-                new ApplyServiceTypeDecorator(openshiftName, openshiftConfig.getServiceType().name()));
-        if ((openshiftConfig.getServiceType() == ServiceType.NodePort) && openshiftConfig.nodePort.isPresent()) {
-            session.resources().decorate(OPENSHIFT,
-                    new AddNodePortDecorator(openshiftName, openshiftConfig.nodePort.getAsInt()));
-        }
-
-        session.resources().decorate(KNATIVE,
-                new ApplyServiceTypeDecorator(knativeName, knativeConfig.getServiceType().name()));
-    }
-
-    /**
-     * Given a string, generate a port number within the supplied range
-     * The output is always the same (between {@code min} and {@code max})
-     * given the same input and it's useful when we need to generate a port number
-     * which needs to stay the same but we don't care about the exact value
-     */
-    private int getStablePortNumberInRange(String input, int min, int max) {
-        if (min < MIN_PORT_NUMBER || max > MAX_PORT_NUMBER) {
-            throw new IllegalArgumentException(
-                    String.format("Port number range must be within [%d-%d]", MIN_PORT_NUMBER, MAX_PORT_NUMBER));
-        }
-
-        try {
-            byte[] hash = MessageDigest.getInstance(DEFAULT_HASH_ALGORITHM).digest(input.getBytes(StandardCharsets.UTF_8));
-            return min + new BigInteger(hash).mod(BigInteger.valueOf(max - min)).intValue();
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to generate stable port number from input string: '" + input + "'", e);
-        }
-    }
-
-    private void handleProbes(ApplicationInfoBuildItem applicationInfo, KubernetesConfig kubernetesConfig,
-            OpenshiftConfig openshiftConfig,
-            KnativeConfig knativeConfig,
-            Set<String> deploymentTargets, Map<String, Integer> ports,
-            Optional<KubernetesHealthLivenessPathBuildItem> kubernetesHealthLivenessPathBuildItem,
-            Optional<KubernetesHealthReadinessPathBuildItem> kubernetesHealthReadinessPathBuildItem,
-            Session session) {
-        if (deploymentTargets.contains(KUBERNETES)) {
-            doHandleProbes(getResourceName(kubernetesConfig, applicationInfo), KUBERNETES, ports,
-                    kubernetesConfig.livenessProbe, kubernetesConfig.readinessProbe, kubernetesHealthLivenessPathBuildItem,
-                    kubernetesHealthReadinessPathBuildItem, session);
-        }
-        if (deploymentTargets.contains(MINIKUBE)) {
-            doHandleProbes(getResourceName(kubernetesConfig, applicationInfo), MINIKUBE, ports,
-                    kubernetesConfig.livenessProbe, kubernetesConfig.readinessProbe, kubernetesHealthLivenessPathBuildItem,
-                    kubernetesHealthReadinessPathBuildItem, session);
-        }
-        if (deploymentTargets.contains(OPENSHIFT)) {
-            doHandleProbes(getResourceName(kubernetesConfig, applicationInfo), OPENSHIFT, ports, openshiftConfig.livenessProbe,
-                    openshiftConfig.readinessProbe, kubernetesHealthLivenessPathBuildItem,
-                    kubernetesHealthReadinessPathBuildItem, session);
-        }
-        if (deploymentTargets.contains(KNATIVE)) {
-            doHandleProbes(getResourceName(kubernetesConfig, applicationInfo), KNATIVE, ports, knativeConfig.livenessProbe,
-                    knativeConfig.readinessProbe, kubernetesHealthLivenessPathBuildItem, kubernetesHealthReadinessPathBuildItem,
-                    session);
-        }
-    }
-
-    private void doHandleProbes(String name, String target, Map<String, Integer> ports, ProbeConfig livenessProbe,
-            ProbeConfig readinessProbe, Optional<KubernetesHealthLivenessPathBuildItem> kubernetesHealthLivenessPathBuildItem,
-            Optional<KubernetesHealthReadinessPathBuildItem> kubernetesHealthReadinessPathBuildItem, Session session) {
-        handleLivenessProbe(name, target, livenessProbe, kubernetesHealthLivenessPathBuildItem, session);
-        handleReadinessProbe(name, target, readinessProbe, kubernetesHealthReadinessPathBuildItem,
-                session);
-
-        //For knative we want the port to be null
-        String port = KNATIVE.equals(target) ? null : String.valueOf(ports.getOrDefault(HTTP_PORT, DEFAULT_HTTP_PORT));
-        session.resources().decorate(target, new ApplyHttpGetActionPortDecorator(port));
-    }
-
-    private void handleLivenessProbe(String name, String target, ProbeConfig livenessProbe,
-            Optional<KubernetesHealthLivenessPathBuildItem> kubernetesHealthLivenessPathBuildItem, Session session) {
-        AddLivenessProbeDecorator livenessProbeDecorator = null;
-        if (livenessProbe.hasUserSuppliedAction()) {
-            livenessProbeDecorator = new AddLivenessProbeDecorator(name,
-                    ProbeConverter.convert(livenessProbe));
-        } else if (kubernetesHealthLivenessPathBuildItem.isPresent()) {
-            livenessProbeDecorator = new AddLivenessProbeDecorator(name,
-                    ProbeConverter.builder(livenessProbe)
-                            .withHttpActionPath(kubernetesHealthLivenessPathBuildItem.get().getPath()).build());
-        }
-        if (livenessProbeDecorator != null) {
-            session.resources().decorate(target, livenessProbeDecorator);
-        }
-    }
-
-    private void handleReadinessProbe(String name, String target, ProbeConfig readinessProbe,
-            Optional<KubernetesHealthReadinessPathBuildItem> healthReadinessPathBuildItem, Session session) {
-        AddReadinessProbeDecorator readinessProbeDecorator = null;
-        if (readinessProbe.hasUserSuppliedAction()) {
-            readinessProbeDecorator = new AddReadinessProbeDecorator(name, ProbeConverter.convert(readinessProbe));
-        } else if (healthReadinessPathBuildItem.isPresent()) {
-            readinessProbeDecorator = new AddReadinessProbeDecorator(name, ProbeConverter.builder(readinessProbe)
-                    .withHttpActionPath(healthReadinessPathBuildItem.get().getPath()).build());
-        }
-        if (readinessProbeDecorator != null) {
-            session.resources().decorate(target, readinessProbeDecorator);
-        }
-    }
-
-    private Map<String, Integer> verifyPorts(List<KubernetesPortBuildItem> kubernetesPortBuildItems) {
-        final Map<String, Integer> result = new HashMap<>();
-        final Set<Integer> usedPorts = new HashSet<>();
-        for (KubernetesPortBuildItem entry : kubernetesPortBuildItems) {
-            final String name = entry.getName();
-            if (result.containsKey(name)) {
-                throw new IllegalArgumentException(
-                        "All Kubernetes ports must have unique names - " + name + "has been used multiple times");
-            }
-            final Integer port = entry.getPort();
-            if (usedPorts.contains(port)) {
-                throw new IllegalArgumentException(
-                        "All Kubernetes ports must be unique - " + port + "has been used multiple times");
-            }
-            result.put(name, port);
-            usedPorts.add(port);
-        }
-        return result;
-    }
-
-    private Project createProject(ApplicationInfoBuildItem app, Path artifactPath) {
-        //Let dekorate create a Project instance and then override with what is found in ApplicationInfoBuildItem.
-        Project project = FileProjectFactory.create(artifactPath.toFile());
-        BuildInfo buildInfo = new BuildInfo(app.getName(), app.getVersion(),
-                "jar", project.getBuildInfo().getBuildTool(),
-                artifactPath.toAbsolutePath().toString(),
-                artifactPath,
-                project.getBuildInfo().getResourceDir());
-
-        return new Project(project.getRoot(), buildInfo, project.getScmInfo());
-    }
-
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/MinikubeHandler.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/MinikubeHandler.java
index 403805f96d679..e185107b41458 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/MinikubeHandler.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/MinikubeHandler.java
@@ -1,6 +1,5 @@
 package io.quarkus.kubernetes.deployment;
 
-import static io.dekorate.utils.Labels.createLabels;
 import static io.quarkus.kubernetes.deployment.Constants.MINIKUBE;
 
 import java.util.Optional;
@@ -35,7 +34,6 @@
 import io.dekorate.kubernetes.decorator.AddServiceResourceDecorator;
 import io.dekorate.kubernetes.decorator.ApplyHeadlessDecorator;
 import io.dekorate.kubernetes.decorator.ApplyImageDecorator;
-import io.dekorate.kubernetes.decorator.ApplyLabelSelectorDecorator;
 import io.dekorate.kubernetes.decorator.ApplyReplicasDecorator;
 import io.dekorate.project.ApplyProjectInfo;
 import io.dekorate.project.Project;
@@ -125,8 +123,7 @@ protected void addDecorators(String group, KubernetesConfig config) {
             resources.decorate(group, new AddServiceResourceDecorator(config));
         }
 
-        resources.decorate(group, new AddIngressDecorator(config, Labels.createLabels(config)));
-        resources.decorate(group, new ApplyLabelSelectorDecorator(createSelector(config)));
+        resources.decorate(group, new AddIngressDecorator(config, Labels.createLabelsAsMap(config, "Ingress")));
     }
 
     /**
@@ -139,7 +136,7 @@ public Deployment createDeployment(KubernetesConfig appConfig, ImageConfiguratio
         return new DeploymentBuilder()
                 .withNewMetadata()
                 .withName(appConfig.getName())
-                .withLabels(Labels.createLabels(appConfig))
+                .withLabels(Labels.createLabelsAsMap(appConfig, "Deployment"))
                 .endMetadata()
                 .withNewSpec()
                 .withReplicas(1)
@@ -156,7 +153,7 @@ public Deployment createDeployment(KubernetesConfig appConfig, ImageConfiguratio
      */
     public LabelSelector createSelector(KubernetesConfig config) {
         return new LabelSelectorBuilder()
-                .withMatchLabels(Labels.createLabels(config))
+                .withMatchLabels(Labels.createLabelsAsMap(config, "Deployment"))
                 .build();
     }
 
@@ -170,7 +167,7 @@ public static PodTemplateSpec createPodTemplateSpec(KubernetesConfig appConfig,
         return new PodTemplateSpecBuilder()
                 .withSpec(createPodSpec(appConfig, imageConfig))
                 .withNewMetadata()
-                .withLabels(createLabels(appConfig))
+                .withLabels(Labels.createLabelsAsMap(appConfig, "Deployment"))
                 .endMetadata()
                 .build();
     }
@@ -214,8 +211,6 @@ public ConfigurationSupplier<KubernetesConfig> getFallbackConfig() {
 
     private static ImageConfiguration getImageConfiguration(Project project, KubernetesConfig appConfig,
             Configurators configurators) {
-        Optional<ImageConfiguration> origin = configurators.getImageConfig(BuildServiceFactories.supplierMatches(project));
-
         return configurators.getImageConfig(BuildServiceFactories.supplierMatches(project)).map(i -> merge(appConfig, i))
                 .orElse(ImageConfiguration.from(appConfig));
     }
@@ -238,4 +233,5 @@ private static ImageConfiguration merge(KubernetesConfig appConfig, ImageConfigu
                 .withAutoPushEnabled(imageConfig.isAutoPushEnabled() ? imageConfig.isAutoPushEnabled() : false)
                 .build();
     }
+
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java
index 4b0832cfb690b..0e292d6235ed2 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java
@@ -14,6 +14,19 @@
 @ConfigRoot
 public class OpenshiftConfig implements PlatformConfiguration {
 
+    public static enum OpenshiftFlavor {
+        v3,
+        v4;
+    }
+
+    /**
+     * The OpenShift flavor / version to use.
+     * Older versions of OpenShift have minor differrences in the labels and fields they support.
+     * This option allows users to have their manifests automatically aligned to the OpenShift 'flavor' they use.
+     */
+    @ConfigItem(defaultValue = "v4")
+    OpenshiftFlavor flavor;
+
     /**
      * The name of the group this component belongs too
      */
@@ -93,6 +106,8 @@ public class OpenshiftConfig implements PlatformConfiguration {
 
     /**
      * The host under which the application is going to be exposed
+     * 
+     * @deprecated Use the {@code quarkus.openshift.route.host} instead
      */
     @ConfigItem
     Optional<String> host;
@@ -145,6 +160,12 @@ public class OpenshiftConfig implements PlatformConfiguration {
     @ConfigItem
     ProbeConfig readinessProbe;
 
+    /**
+     * Prometheus configuration
+     */
+    @ConfigItem
+    PrometheusConfig prometheus;
+
     /**
      * Volume mounts
      */
@@ -201,16 +222,50 @@ public class OpenshiftConfig implements PlatformConfiguration {
 
     /**
      * Sidecar containers
+     *
+     * @deprecated Use the {@code sidecars} property instead
      */
     @ConfigItem
+    @Deprecated
     Map<String, ContainerConfig> containers;
 
+    /**
+     * Sidecar containers
+     */
+    @ConfigItem
+    Map<String, ContainerConfig> sidecars;
+
+    /**
+     * The host aliases
+     */
+    @ConfigItem
+    Map<String, HostAliasConfig> hostAliases;
+
+    /**
+     * Resources requirements
+     */
+    @ConfigItem
+    ResourcesConfig resources;
+
     /**
      * If true, an Openshift Route will be created
+     * 
+     * @deprecated Use the {@code quarkus.openshift.route.exposition} instead
      */
     @ConfigItem
     boolean expose;
 
+    /**
+     * Openshift route configuration
+     */
+    ExpositionConfig route;
+
+    /**
+     * If true, the 'app.kubernetes.io/version' label will be part of the selectors of Service and DeploymentConfig
+     */
+    @ConfigItem(defaultValue = "true")
+    boolean addVersionToLabelSelectors;
+
     public Optional<String> getPartOf() {
         return partOf;
     }
@@ -288,6 +343,10 @@ public ProbeConfig getReadinessProbe() {
         return readinessProbe;
     }
 
+    public PrometheusConfig getPrometheusConfig() {
+        return prometheus;
+    }
+
     public Map<String, MountConfig> getMounts() {
         return mounts;
     }
@@ -320,12 +379,29 @@ public Map<String, AzureDiskVolumeConfig> getAzureDiskVolumes() {
         return azureDiskVolumes;
     }
 
+    public Map<String, HostAliasConfig> getHostAliases() {
+        return hostAliases;
+    }
+
+    public ResourcesConfig getResources() {
+        return resources;
+    }
+
     public Map<String, ContainerConfig> getInitContainers() {
         return initContainers;
     }
 
     public Map<String, ContainerConfig> getSidecars() {
-        return containers;
+        if (!containers.isEmpty() && !sidecars.isEmpty()) {
+            // done in order to make migration to the new property straight-forward
+            throw new IllegalStateException(
+                    "'quarkus.openshift.sidecars' and 'quarkus.openshift.containers' cannot be used together. Please use the former as the latter has been deprecated");
+        }
+        if (!containers.isEmpty()) {
+            return containers;
+        }
+
+        return sidecars;
     }
 
     @Override
@@ -371,4 +447,30 @@ public Map<String, EnvConfig> getEnvVars() {
     public EnvVarsConfig getEnv() {
         return env;
     }
+
+    /**
+     * If set, the secret will mounted to the application container and its contents will be used for application configuration.
+     */
+    @ConfigItem
+    Optional<String> appSecret;
+
+    /**
+     * If set, the config amp will mounted to the application container and its contents will be used for application
+     * configuration.
+     */
+    @ConfigItem
+    Optional<String> appConfigMap;
+
+    public Optional<String> getAppSecret() {
+        return this.appSecret;
+    }
+
+    public Optional<String> getAppConfigMap() {
+        return this.appConfigMap;
+    }
+
+    @Override
+    public Optional<ExpositionConfig> getExposition() {
+        return Optional.of(route);
+    }
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java
new file mode 100644
index 0000000000000..f4528cf7d5606
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java
@@ -0,0 +1,203 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_HTTP_PORT;
+import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_S2I_IMAGE_NAME;
+import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_CONFIG;
+import static io.quarkus.kubernetes.deployment.Constants.HTTP_PORT;
+import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT;
+import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT_APP_RUNTIME;
+import static io.quarkus.kubernetes.deployment.Constants.QUARKUS;
+import static io.quarkus.kubernetes.deployment.OpenshiftConfig.OpenshiftFlavor.v3;
+import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.DEFAULT_PRIORITY;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import io.dekorate.kubernetes.annotation.ServiceType;
+import io.dekorate.kubernetes.config.EnvBuilder;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.AddLabelDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.kubernetes.decorator.RemoveFromSelectorDecorator;
+import io.dekorate.kubernetes.decorator.RemoveLabelDecorator;
+import io.dekorate.openshift.decorator.ApplyReplicasDecorator;
+import io.dekorate.project.Project;
+import io.dekorate.s2i.config.S2iBuildConfig;
+import io.dekorate.s2i.config.S2iBuildConfigBuilder;
+import io.dekorate.s2i.decorator.AddBuilderImageStreamResourceDecorator;
+import io.dekorate.utils.Labels;
+import io.quarkus.container.image.deployment.util.ImageUtil;
+import io.quarkus.container.spi.BaseImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageLabelBuildItem;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.kubernetes.spi.ConfiguratorBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesAnnotationBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesEnvBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesLabelBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesPortBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+
+public class OpenshiftProcessor {
+
+    private static final int OPENSHIFT_PRIORITY = DEFAULT_PRIORITY;
+
+    @BuildStep
+    public void checkOpenshift(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
+        List<String> targets = KubernetesConfigUtil.getUserSpecifiedDeploymentTargets();
+        deploymentTargets.produce(new KubernetesDeploymentTargetBuildItem(OPENSHIFT, DEPLOYMENT_CONFIG, OPENSHIFT_PRIORITY,
+                targets.contains(OPENSHIFT)));
+    }
+
+    @BuildStep
+    public void createAnnotations(OpenshiftConfig config, BuildProducer<KubernetesAnnotationBuildItem> annotations) {
+        config.getAnnotations().forEach((k, v) -> {
+            annotations.produce(new KubernetesAnnotationBuildItem(k, v, OPENSHIFT));
+        });
+    }
+
+    @BuildStep
+    public void createLabels(OpenshiftConfig config, BuildProducer<KubernetesLabelBuildItem> labels,
+            BuildProducer<ContainerImageLabelBuildItem> imageLabels) {
+        config.getLabels().forEach((k, v) -> {
+            labels.produce(new KubernetesLabelBuildItem(k, v, OPENSHIFT));
+            imageLabels.produce(new ContainerImageLabelBuildItem(k, v));
+        });
+    }
+
+    @BuildStep
+    public List<ConfiguratorBuildItem> createConfigurators(ApplicationInfoBuildItem applicationInfo,
+            OpenshiftConfig config, Capabilities capabilities, Optional<ContainerImageInfoBuildItem> image,
+            List<KubernetesPortBuildItem> ports) {
+
+        List<ConfiguratorBuildItem> result = new ArrayList<>();
+        result.addAll(KubernetesCommonHelper.createPlatformConfigurators(config));
+        result.addAll(KubernetesCommonHelper.createGlobalConfigurators(ports));
+        result.add(new ConfiguratorBuildItem(new ApplyExpositionConfigurator(config.route)));
+
+        if (!capabilities.isPresent(Capability.CONTAINER_IMAGE_S2I)
+                && !capabilities.isPresent(Capability.CONTAINER_IMAGE_OPENSHIFT)) {
+            result.add(new ConfiguratorBuildItem(new DisableS2iConfigurator()));
+
+            image.flatMap(ContainerImageInfoBuildItem::getRegistry).ifPresent(r -> {
+                result.add(new ConfiguratorBuildItem(new ApplyImageRegistryConfigurator(r)));
+            });
+
+            image.map(ContainerImageInfoBuildItem::getGroup).ifPresent(g -> {
+                result.add(new ConfiguratorBuildItem(new ApplyImageGroupConfigurator(g)));
+            });
+        }
+        return result;
+    }
+
+    @BuildStep
+    public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applicationInfo,
+            OutputTargetBuildItem outputTarget,
+            OpenshiftConfig config,
+            PackageConfig packageConfig,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration,
+            Capabilities capabilities,
+            List<KubernetesAnnotationBuildItem> annotations,
+            List<KubernetesLabelBuildItem> labels,
+            List<KubernetesEnvBuildItem> envs,
+            Optional<BaseImageInfoBuildItem> baseImage,
+            Optional<ContainerImageInfoBuildItem> image,
+            Optional<KubernetesCommandBuildItem> command,
+            List<KubernetesPortBuildItem> ports,
+            Optional<KubernetesHealthLivenessPathBuildItem> livenessPath,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessPath,
+            List<KubernetesRoleBuildItem> roles,
+            List<KubernetesRoleBindingBuildItem> roleBindings) {
+
+        List<DecoratorBuildItem> result = new ArrayList<>();
+        String name = ResourceNameUtil.getResourceName(config, applicationInfo);
+
+        Optional<Project> project = KubernetesCommonHelper.createProject(applicationInfo, outputTarget, packageConfig);
+        result.addAll(KubernetesCommonHelper.createDecorators(project, OPENSHIFT, name, config,
+                metricsConfiguration,
+                annotations, labels, command,
+                ports, livenessPath, readinessPath, roles, roleBindings));
+
+        if (config.flavor == v3) {
+            //Openshift 3.x doesn't recognize 'app.kubernetes.io/name', it uses 'app' instead.
+            //The decorator will be applied even on non-openshift resources is it may affect for example: knative
+            result.add(new DecoratorBuildItem(new AddLabelDecorator(name, "app", name)));
+
+            // The presence of optional is causing issues in OCP 3.11, so we better remove them.
+            // The following 4 decorator will set the optional property to null, so that it won't make it into the file.
+            //The decorators will be applied even on non-openshift resources is they may affect for example: knative
+            result.add(new DecoratorBuildItem(new RemoveOptionalFromSecretEnvSourceDecorator()));
+            result.add(new DecoratorBuildItem(new RemoveOptionalFromConfigMapEnvSourceDecorator()));
+            result.add(new DecoratorBuildItem(new RemoveOptionalFromSecretKeySelectorDecorator()));
+            result.add(new DecoratorBuildItem(new RemoveOptionalFromConfigMapKeySelectorDecorator()));
+        }
+
+        if (config.getReplicas() != 1) {
+            result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyReplicasDecorator(name, config.getReplicas())));
+        }
+        image.ifPresent(i -> {
+            result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyContainerImageDecorator(name, i.getImage())));
+        });
+        result.add(new DecoratorBuildItem(OPENSHIFT, new AddLabelDecorator(name, OPENSHIFT_APP_RUNTIME, QUARKUS)));
+
+        Stream.concat(config.convertToBuildItems().stream(),
+                envs.stream().filter(e -> e.getTarget() == null || OPENSHIFT.equals(e.getTarget()))).forEach(e -> {
+                    result.add(new DecoratorBuildItem(OPENSHIFT,
+                            new AddEnvVarDecorator(ApplicationContainerDecorator.ANY, name,
+                                    new EnvBuilder().withName(EnvConverter.convertName(e.getName())).withValue(e.getValue())
+                                            .withSecret(e.getSecret()).withConfigmap(e.getConfigMap()).withField(e.getField())
+                                            .build())));
+                });
+
+        // Handle custom s2i builder images
+        baseImage.map(BaseImageInfoBuildItem::getImage).ifPresent(builderImage -> {
+            String builderImageName = ImageUtil.getName(builderImage);
+            S2iBuildConfig s2iBuildConfig = new S2iBuildConfigBuilder().withBuilderImage(builderImage).build();
+            if (!DEFAULT_S2I_IMAGE_NAME.equals(builderImageName)) {
+                result.add(new DecoratorBuildItem(OPENSHIFT, new RemoveBuilderImageResourceDecorator(DEFAULT_S2I_IMAGE_NAME)));
+            }
+            result.add(new DecoratorBuildItem(OPENSHIFT, new AddBuilderImageStreamResourceDecorator(s2iBuildConfig)));
+            result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyBuilderImageDecorator(name, builderImage)));
+        });
+
+        if (!config.addVersionToLabelSelectors) {
+            result.add(new DecoratorBuildItem(OPENSHIFT, new RemoveLabelDecorator(name, Labels.VERSION)));
+            result.add(new DecoratorBuildItem(OPENSHIFT, new RemoveFromSelectorDecorator(name, Labels.VERSION)));
+        }
+
+        // Service handling
+        result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyServiceTypeDecorator(name, config.getServiceType().name())));
+        if ((config.getServiceType() == ServiceType.NodePort) && config.nodePort.isPresent()) {
+            result.add(new DecoratorBuildItem(OPENSHIFT, new AddNodePortDecorator(name, config.nodePort.getAsInt())));
+        }
+
+        // Probe port handling
+        Integer port = ports.stream().filter(p -> HTTP_PORT.equals(p.getName())).map(KubernetesPortBuildItem::getPort)
+                .findFirst().orElse(DEFAULT_HTTP_PORT);
+        result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyHttpGetActionPortDecorator(name, name, port)));
+
+        // Hanlde non-s2i
+        if (!capabilities.isPresent(Capability.CONTAINER_IMAGE_S2I)
+                && !capabilities.isPresent(Capability.CONTAINER_IMAGE_OPENSHIFT)) {
+            result.add(new DecoratorBuildItem(OPENSHIFT, new RemoveDeploymentTriggerDecorator()));
+        }
+
+        return result;
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PlatformConfiguration.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PlatformConfiguration.java
index 208e8ccde182b..f761be37836a8 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PlatformConfiguration.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PlatformConfiguration.java
@@ -46,6 +46,8 @@ public interface PlatformConfiguration extends EnvVarHolder {
 
     ProbeConfig getReadinessProbe();
 
+    PrometheusConfig getPrometheusConfig();
+
     Map<String, MountConfig> getMounts();
 
     Map<String, SecretVolumeConfig> getSecretVolumes();
@@ -66,6 +68,14 @@ public interface PlatformConfiguration extends EnvVarHolder {
 
     Map<String, ContainerConfig> getSidecars();
 
+    Map<String, HostAliasConfig> getHostAliases();
+
+    ResourcesConfig getResources();
+
+    default Optional<ExpositionConfig> getExposition() {
+        return Optional.empty();
+    }
+
     default boolean isExpose() {
         return false;
     }
@@ -73,4 +83,9 @@ default boolean isExpose() {
     default String getConfigName() {
         return getClass().getSimpleName().replaceAll("Config$", "").toLowerCase();
     }
+
+    public Optional<String> getAppSecret();
+
+    public Optional<String> getAppConfigMap();
+
 }
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PrometheusConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PrometheusConfig.java
new file mode 100644
index 0000000000000..4c41dbba788f8
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/PrometheusConfig.java
@@ -0,0 +1,67 @@
+package io.quarkus.kubernetes.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class PrometheusConfig {
+
+    // Note that using "prometheus.io/..." annotations is now discouraged by Prometheus,
+    // but usage of said annotations is still common.
+    // Removal of prometheus.io from example:
+    // https://github.com/prometheus/prometheus/commit/03a9e7f72e072c6d29f422425d8acd91a957836b
+    // Current example of relabeling using non-prometheus.io-based strings:
+    // https://github.com/prometheus/prometheus/blob/main/documentation/examples/prometheus-kubernetes.yml#L139
+
+    /**
+     * When true (the default), emit a set of annotations to identify
+     * services that should be scraped by prometheus for metrics.
+     *
+     * In configurations that use the Prometheus operator with ServiceMonitor,
+     * annotations may not be necessary.
+     */
+    @ConfigItem(defaultValue = "true")
+    boolean annotations;
+
+    /**
+     * Define the annotation prefix used for scrape values, this value will be used
+     * as the base for other annotation name defaults. Altering the base for generated
+     * annotations can make it easier to define re-labeling rules and avoid unexpected
+     * knock-on effects. The default value is {@code prometheus.io}
+     *
+     * See Prometheus example:
+     * https://github.com/prometheus/prometheus/blob/main/documentation/examples/prometheus-kubernetes.yml
+     */
+    @ConfigItem(defaultValue = "prometheus.io")
+    String prefix;
+
+    /**
+     * Define the annotation used to indicate services that should be scraped.
+     * By default, {@code /scrape} will be appended to the defined prefix.
+     */
+    @ConfigItem
+    Optional<String> scrape;
+
+    /**
+     * Define the annotation used to indicate the path to scrape.
+     * By default, {@code /path} will be appended to the defined prefix.
+     */
+    @ConfigItem
+    Optional<String> path;
+
+    /**
+     * Define the annotation used to indicate the port to scrape.
+     * By default, {@code /port} will be appended to the defined prefix.
+     */
+    @ConfigItem
+    Optional<String> port;
+
+    /**
+     * Define the annotation used to indicate the scheme to use for scraping
+     * By default, {@code /scheme} will be appended to the defined prefix.
+     */
+    @ConfigItem
+    Optional<String> scheme;
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveCommandDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveCommandDecorator.java
new file mode 100644
index 0000000000000..faac14d727318
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveCommandDecorator.java
@@ -0,0 +1,20 @@
+package io.quarkus.kubernetes.deployment;
+
+import java.util.List;
+
+import io.dekorate.deps.kubernetes.api.model.ContainerFluent;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+
+public class RemoveCommandDecorator extends ApplicationContainerDecorator<ContainerFluent<?>> {
+
+    public RemoveCommandDecorator(String deploymentName, String containerName) {
+        super(deploymentName, containerName);
+    }
+
+    @Override
+    public void andThenVisit(ContainerFluent<?> container) {
+        container.withCommand((List) null);
+        container.withArgs((List) null);
+    }
+
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveDeploymentTriggerDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveDeploymentTriggerDecorator.java
new file mode 100644
index 0000000000000..23c057166e384
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveDeploymentTriggerDecorator.java
@@ -0,0 +1,22 @@
+package io.quarkus.kubernetes.deployment;
+
+import java.util.Collections;
+
+import io.dekorate.deps.kubernetes.api.model.ObjectMeta;
+import io.dekorate.deps.openshift.api.model.DeploymentConfigSpecFluent;
+import io.dekorate.kubernetes.decorator.Decorator;
+import io.dekorate.kubernetes.decorator.NamedResourceDecorator;
+import io.dekorate.openshift.decorator.ApplyDeploymentTriggerDecorator;
+
+public class RemoveDeploymentTriggerDecorator extends NamedResourceDecorator<DeploymentConfigSpecFluent<?>> {
+
+    @Override
+    public void andThenVisit(DeploymentConfigSpecFluent<?> deploymentConfigSpec, ObjectMeta objectMeta) {
+        deploymentConfigSpec.withTriggers(Collections.emptyList());
+    }
+
+    @Override
+    public Class<? extends Decorator>[] after() {
+        return new Class[] { ApplyDeploymentTriggerDecorator.class };
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveEnvVarDecorator.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveEnvVarDecorator.java
deleted file mode 100644
index 8e224f58f050b..0000000000000
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveEnvVarDecorator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.quarkus.kubernetes.deployment;
-
-import io.dekorate.deps.kubernetes.api.model.ContainerFluent;
-import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
-import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
-import io.dekorate.kubernetes.decorator.Decorator;
-import io.dekorate.kubernetes.decorator.ResourceProvidingDecorator;
-
-public class RemoveEnvVarDecorator extends ApplicationContainerDecorator<ContainerFluent<?>> {
-
-    private final String envVarName;
-
-    public RemoveEnvVarDecorator(String envVarName) {
-        this(ANY, envVarName);
-    }
-
-    public RemoveEnvVarDecorator(String name, String envVarName) {
-        super(name);
-        this.envVarName = envVarName;
-    }
-
-    public void andThenVisit(ContainerFluent<?> container) {
-        container.removeMatchingFromEnv(e -> e.getName().equals(envVarName));
-    }
-
-    public String getEnvVarKey() {
-        return this.envVarName;
-    }
-
-    public Class<? extends Decorator>[] after() {
-        return new Class[] { ResourceProvidingDecorator.class, AddEnvVarDecorator.class };
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((envVarName == null) ? 0 : envVarName.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        RemoveEnvVarDecorator other = (RemoveEnvVarDecorator) obj;
-        if (envVarName == null) {
-            if (other.envVarName != null)
-                return false;
-        } else if (!envVarName.equals(other.envVarName))
-            return false;
-        return true;
-    }
-}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ResourceNameUtil.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ResourceNameUtil.java
new file mode 100644
index 0000000000000..afd565d71b3ff
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ResourceNameUtil.java
@@ -0,0 +1,19 @@
+package io.quarkus.kubernetes.deployment;
+
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+
+public final class ResourceNameUtil {
+
+    private ResourceNameUtil() {
+    }
+
+    /**
+     * Provides the name of a generated Kubernetes resource.
+     * Uses the value from the configuration object if it exists, otherwise falls back to
+     * the application name
+     */
+    public static String getResourceName(PlatformConfiguration platformConfiguration,
+            ApplicationInfoBuildItem applicationInfo) {
+        return platformConfiguration.getName().orElse(applicationInfo.getName());
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ResourcesConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ResourcesConfig.java
new file mode 100644
index 0000000000000..89d38d644e452
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ResourcesConfig.java
@@ -0,0 +1,37 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class ResourcesConfig {
+
+    /**
+     * Limits Requirements
+     */
+    ResourcesRequirementsConfig limits;
+
+    /**
+     * Requests Requirements
+     */
+    ResourcesRequirementsConfig requests;
+
+    @ConfigGroup
+    public static class ResourcesRequirementsConfig {
+
+        /**
+         * CPU Requirements
+         */
+        @ConfigItem
+        Optional<String> cpu;
+
+        /**
+         * Memory Requirements
+         */
+        @ConfigItem
+        Optional<String> memory;
+    }
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/TrafficConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/TrafficConfig.java
new file mode 100644
index 0000000000000..676c54c2e4265
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/TrafficConfig.java
@@ -0,0 +1,41 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class TrafficConfig {
+    /**
+     * Tag is optionally used to expose a dedicated url for referencing
+     * this target exclusively.
+     */
+    @ConfigItem
+    Optional<String> tag;
+
+    /**
+     * RevisionName of a specific revision to which to send this portion of traffic.
+     */
+    @ConfigItem
+    Optional<String> revisionName;
+
+    /**
+     * LatestRevision may be optionally provided to indicate that the latest
+     * ready Revision of the Configuration should be used for this traffic
+     * target. When provided LatestRevision must be true if RevisionName is
+     * empty.
+     */
+    @ConfigItem(defaultValue = "false")
+    Optional<Boolean> latestRevision;
+
+    /**
+     * Percent indicates that percentage based routing should be used and
+     * the value indicates the percent of traffic that is be routed to this
+     * Revision or Configuration. `0` (zero) mean no traffic, `100` means all
+     * traffic.
+     */
+    @ConfigItem(defaultValue = "100")
+    Optional<Long> percent;
+}
diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java
new file mode 100644
index 0000000000000..fa594dae2a732
--- /dev/null
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/VanillaKubernetesProcessor.java
@@ -0,0 +1,147 @@
+
+package io.quarkus.kubernetes.deployment;
+
+import static io.quarkus.kubernetes.deployment.Constants.DEFAULT_HTTP_PORT;
+import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT;
+import static io.quarkus.kubernetes.deployment.Constants.HTTP_PORT;
+import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES;
+import static io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem.VANILLA_KUBERNETES_PRIORITY;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import io.dekorate.kubernetes.annotation.ServiceType;
+import io.dekorate.kubernetes.config.EnvBuilder;
+import io.dekorate.kubernetes.decorator.AddEnvVarDecorator;
+import io.dekorate.kubernetes.decorator.ApplicationContainerDecorator;
+import io.dekorate.kubernetes.decorator.ApplyImagePullPolicyDecorator;
+import io.dekorate.kubernetes.decorator.ApplyReplicasDecorator;
+import io.dekorate.kubernetes.decorator.RemoveFromMatchingLabelsDecorator;
+import io.dekorate.kubernetes.decorator.RemoveFromSelectorDecorator;
+import io.dekorate.kubernetes.decorator.RemoveLabelDecorator;
+import io.dekorate.project.Project;
+import io.dekorate.utils.Labels;
+import io.quarkus.container.spi.ContainerImageInfoBuildItem;
+import io.quarkus.container.spi.ContainerImageLabelBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.kubernetes.spi.ConfiguratorBuildItem;
+import io.quarkus.kubernetes.spi.DecoratorBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesAnnotationBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesCommandBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesEnvBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesLabelBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesPortBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBindingBuildItem;
+import io.quarkus.kubernetes.spi.KubernetesRoleBuildItem;
+
+public class VanillaKubernetesProcessor {
+
+    @BuildStep
+    public void checkVanillaKubernetes(BuildProducer<KubernetesDeploymentTargetBuildItem> deploymentTargets) {
+        List<String> userSpecifiedDeploymentTargets = KubernetesConfigUtil.getUserSpecifiedDeploymentTargets();
+        if (userSpecifiedDeploymentTargets.isEmpty()) {
+            // when nothing was selected by the user, we enable vanilla Kubernetes by
+            // default
+            deploymentTargets
+                    .produce(
+                            new KubernetesDeploymentTargetBuildItem(KUBERNETES, DEPLOYMENT, VANILLA_KUBERNETES_PRIORITY, true));
+        }
+
+        deploymentTargets.produce(new KubernetesDeploymentTargetBuildItem(KUBERNETES, DEPLOYMENT,
+                VANILLA_KUBERNETES_PRIORITY, userSpecifiedDeploymentTargets.contains(KUBERNETES)));
+    }
+
+    @BuildStep
+    public void createAnnotations(KubernetesConfig config, BuildProducer<KubernetesAnnotationBuildItem> annotations) {
+        config.annotations.forEach((k, v) -> {
+            annotations.produce(new KubernetesAnnotationBuildItem(k, v, KUBERNETES));
+        });
+    }
+
+    @BuildStep
+    public void createLabels(KubernetesConfig config, BuildProducer<KubernetesLabelBuildItem> labels,
+            BuildProducer<ContainerImageLabelBuildItem> imageLabels) {
+        config.labels.forEach((k, v) -> {
+            labels.produce(new KubernetesLabelBuildItem(k, v, KUBERNETES));
+            imageLabels.produce(new ContainerImageLabelBuildItem(k, v));
+        });
+    }
+
+    @BuildStep
+    public List<ConfiguratorBuildItem> createConfigurators(KubernetesConfig config, List<KubernetesPortBuildItem> ports) {
+        List<ConfiguratorBuildItem> result = new ArrayList<>();
+        result.addAll(KubernetesCommonHelper.createPlatformConfigurators(config));
+        result.addAll(KubernetesCommonHelper.createGlobalConfigurators(ports));
+        result.add(new ConfiguratorBuildItem(new ApplyExpositionConfigurator((config.ingress))));
+        return result;
+
+    }
+
+    @BuildStep
+    public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applicationInfo,
+            OutputTargetBuildItem outputTarget, KubernetesConfig config, PackageConfig packageConfig,
+            Optional<MetricsCapabilityBuildItem> metricsConfiguration, List<KubernetesAnnotationBuildItem> annotations,
+            List<KubernetesLabelBuildItem> labels, List<KubernetesEnvBuildItem> envs,
+            Optional<ContainerImageInfoBuildItem> image, Optional<KubernetesCommandBuildItem> command,
+            List<KubernetesPortBuildItem> ports, Optional<KubernetesHealthLivenessPathBuildItem> livenessPath,
+            Optional<KubernetesHealthReadinessPathBuildItem> readinessPath, List<KubernetesRoleBuildItem> roles,
+            List<KubernetesRoleBindingBuildItem> roleBindings) {
+
+        final List<DecoratorBuildItem> result = new ArrayList<>();
+        final String name = ResourceNameUtil.getResourceName(config, applicationInfo);
+
+        Optional<Project> project = KubernetesCommonHelper.createProject(applicationInfo, outputTarget, packageConfig);
+        result.addAll(KubernetesCommonHelper.createDecorators(project, KUBERNETES, name, config,
+                metricsConfiguration,
+                annotations, labels, command, ports, livenessPath, readinessPath, roles, roleBindings));
+        if (config.getReplicas() != 1) {
+            result.add(new DecoratorBuildItem(KUBERNETES, new ApplyReplicasDecorator(name, config.getReplicas())));
+        }
+
+        image.ifPresent(i -> {
+            result.add(new DecoratorBuildItem(KUBERNETES, new ApplyContainerImageDecorator(name, i.getImage())));
+        });
+
+        result
+                .add(new DecoratorBuildItem(KUBERNETES, new ApplyImagePullPolicyDecorator(name, config.getImagePullPolicy())));
+
+        Stream.concat(config.convertToBuildItems().stream(),
+                envs.stream().filter(e -> e.getTarget() == null || KUBERNETES.equals(e.getTarget()))).forEach(e -> {
+                    result.add(new DecoratorBuildItem(KUBERNETES,
+                            new AddEnvVarDecorator(ApplicationContainerDecorator.ANY, name,
+                                    new EnvBuilder().withName(EnvConverter.convertName(e.getName())).withValue(e.getValue())
+                                            .withSecret(e.getSecret()).withConfigmap(e.getConfigMap()).withField(e.getField())
+                                            .build())));
+                });
+
+        if (!config.addVersionToLabelSelectors) {
+            result.add(new DecoratorBuildItem(KUBERNETES, new RemoveLabelDecorator(name, Labels.VERSION)));
+            result.add(new DecoratorBuildItem(KUBERNETES, new RemoveFromSelectorDecorator(name, Labels.VERSION)));
+            result.add(new DecoratorBuildItem(KUBERNETES, new RemoveFromMatchingLabelsDecorator(name, Labels.VERSION)));
+        }
+
+        // Service handling
+        result.add(new DecoratorBuildItem(KUBERNETES, new ApplyServiceTypeDecorator(name, config.getServiceType().name())));
+        if ((config.getServiceType() == ServiceType.NodePort) && config.nodePort.isPresent()) {
+            result.add(new DecoratorBuildItem(KUBERNETES, new AddNodePortDecorator(name, config.nodePort.getAsInt())));
+        }
+
+        // Probe port handling
+        Integer port = ports.stream().filter(p -> HTTP_PORT.equals(p.getName())).map(KubernetesPortBuildItem::getPort)
+                .findFirst().orElse(DEFAULT_HTTP_PORT);
+        result.add(new DecoratorBuildItem(KUBERNETES, new ApplyHttpGetActionPortDecorator(name, name, port)));
+
+        return result;
+    }
+
+}
diff --git a/extensions/kubernetes/vanilla/runtime/pom.xml b/extensions/kubernetes/vanilla/runtime/pom.xml
index 660bd7ca31776..3417712946a37 100644
--- a/extensions/kubernetes/vanilla/runtime/pom.xml
+++ b/extensions/kubernetes/vanilla/runtime/pom.xml
@@ -20,6 +20,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/liquibase/deployment/pom.xml b/extensions/liquibase/deployment/pom.xml
index 069833787db11..204165e919458 100644
--- a/extensions/liquibase/deployment/pom.xml
+++ b/extensions/liquibase/deployment/pom.xml
@@ -64,72 +64,6 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>extract-liquibase-for-indexing</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeGroupIds>org.liquibase</includeGroupIds>
-                            <outputDirectory>${project.build.directory}/liquibase-extracted</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                        <goals>
-                            <goal>jandex</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <indexName>liquibase.idx</indexName>
-                            <processDefaultFileSet>false</processDefaultFileSet>
-                            <fileSets>
-                                <fileSet>
-                                    <directory>${project.build.directory}/liquibase-extracted</directory>
-                                </fileSet>
-                            </fileSets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-liquibase-index</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/classes/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.build.directory}/liquibase-extracted</directory>
-                                    <includes>
-                                        <include>META-INF/liquibase.idx</include>
-                                    </includes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/LiquibaseProcessor.java b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/LiquibaseProcessor.java
deleted file mode 100644
index 854852cf1e0f7..0000000000000
--- a/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/LiquibaseProcessor.java
+++ /dev/null
@@ -1,428 +0,0 @@
-package io.quarkus.liquibase;
-
-import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Default;
-
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.Index;
-import org.jboss.jandex.IndexReader;
-import org.jboss.logging.Logger;
-
-import io.quarkus.agroal.deployment.JdbcDataSourceBuildItem;
-import io.quarkus.agroal.deployment.JdbcDataSourceSchemaReadyBuildItem;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
-import io.quarkus.arc.processor.DotNames;
-import io.quarkus.datasource.common.runtime.DataSourceUtil;
-import io.quarkus.datasource.common.runtime.DatabaseKind;
-import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
-import io.quarkus.deployment.builditem.ServiceStartBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
-import io.quarkus.liquibase.runtime.LiquibaseBuildTimeConfig;
-import io.quarkus.liquibase.runtime.LiquibaseContainerProducer;
-import io.quarkus.liquibase.runtime.LiquibaseRecorder;
-import io.quarkus.liquibase.runtime.graal.LiquibaseServiceLoader;
-import liquibase.changelog.ChangeLogParameters;
-import liquibase.changelog.ChangeSet;
-import liquibase.changelog.DatabaseChangeLog;
-import liquibase.database.Database;
-import liquibase.database.core.DerbyDatabase;
-import liquibase.database.core.H2Database;
-import liquibase.database.core.MSSQLDatabase;
-import liquibase.database.core.MariaDBDatabase;
-import liquibase.database.core.MySQLDatabase;
-import liquibase.database.core.PostgresDatabase;
-import liquibase.exception.LiquibaseException;
-import liquibase.parser.ChangeLogParser;
-import liquibase.parser.ChangeLogParserFactory;
-import liquibase.resource.ClassLoaderResourceAccessor;
-import liquibase.servicelocator.LiquibaseService;
-import liquibase.servicelocator.ServiceLocator;
-
-class LiquibaseProcessor {
-
-    private static final Logger LOGGER = Logger.getLogger(LiquibaseServiceLoader.class);
-
-    private static final String LIQUIBASE_BEAN_NAME_PREFIX = "liquibase_";
-
-    private static final Map<String, String> KIND_TO_IMPL;
-
-    static {
-        Map<String, String> knownKindsToImpl = new HashMap<>();
-        knownKindsToImpl.put(DatabaseKind.DERBY, DerbyDatabase.class.getName());
-        knownKindsToImpl.put(DatabaseKind.H2, H2Database.class.getName());
-        knownKindsToImpl.put(DatabaseKind.MARIADB, MariaDBDatabase.class.getName());
-        knownKindsToImpl.put(DatabaseKind.MSSQL, MSSQLDatabase.class.getName());
-        knownKindsToImpl.put(DatabaseKind.MYSQL, MySQLDatabase.class.getName());
-        knownKindsToImpl.put(DatabaseKind.POSTGRESQL, PostgresDatabase.class.getName());
-        KIND_TO_IMPL = Collections.unmodifiableMap(knownKindsToImpl);
-    }
-
-    @BuildStep
-    CapabilityBuildItem capability() {
-        return new CapabilityBuildItem(Capability.LIQUIBASE);
-    }
-
-    /**
-     * The default service loader is super slow
-     *
-     * As part of the extension build we index liquibase, then we use this index to find all implementations of services
-     */
-    @BuildStep(onlyIfNot = NativeBuild.class)
-    @Record(STATIC_INIT)
-    public void fastServiceLoader(LiquibaseRecorder recorder,
-            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems) throws IOException {
-        DotName liquibaseServiceName = DotName.createSimple(LiquibaseService.class.getName());
-        try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("META-INF/liquibase.idx")) {
-            IndexReader reader = new IndexReader(in);
-            Index index = reader.read();
-            Map<String, List<String>> services = new HashMap<>();
-            for (Class<?> c : Arrays.asList(liquibase.diff.compare.DatabaseObjectComparator.class,
-                    liquibase.command.LiquibaseCommand.class,
-                    liquibase.parser.NamespaceDetails.class,
-                    liquibase.precondition.Precondition.class,
-                    liquibase.database.Database.class,
-                    liquibase.parser.ChangeLogParser.class,
-                    liquibase.change.Change.class,
-                    liquibase.snapshot.SnapshotGenerator.class,
-                    liquibase.changelog.ChangeLogHistoryService.class,
-                    liquibase.datatype.LiquibaseDataType.class,
-                    liquibase.executor.Executor.class,
-                    liquibase.lockservice.LockService.class,
-                    liquibase.sqlgenerator.SqlGenerator.class)) {
-                List<String> impls = new ArrayList<>();
-                services.put(c.getName(), impls);
-                Set<ClassInfo> classes = new HashSet<>();
-                if (c.isInterface()) {
-                    classes.addAll(index.getAllKnownImplementors(DotName.createSimple(c.getName())));
-                } else {
-                    classes.addAll(index.getAllKnownSubclasses(DotName.createSimple(c.getName())));
-                }
-                for (ClassInfo found : classes) {
-                    if (Modifier.isAbstract(found.flags()) ||
-                            Modifier.isInterface(found.flags()) ||
-                            !found.hasNoArgsConstructor() ||
-                            !Modifier.isPublic(found.flags())) {
-                        continue;
-                    }
-                    AnnotationInstance annotationInstance = found.classAnnotation(liquibaseServiceName);
-                    if (annotationInstance == null || !annotationInstance.value("skip").asBoolean()) {
-                        impls.add(found.name().toString());
-                    }
-                }
-            }
-            // add license service manually. Index file for windows/jdk11 does not contain
-            // implementation 'liquibase.pro.packaged.kp' class for interface 'liquibase.license.LicenseService'
-            services.put(liquibase.license.LicenseService.class.getName(),
-                    Collections.singletonList("liquibase.pro.packaged.kp"));
-
-            //if we know what DB types are in use we limit them
-            //this gives a huge startup time boost
-            //otherwise it generates SQL for every DB
-            boolean allKnown = true;
-            Set<String> databases = new HashSet<>();
-            for (JdbcDataSourceBuildItem i : jdbcDataSourceBuildItems) {
-                String known = KIND_TO_IMPL.get(i.getDbKind());
-                if (known == null) {
-                    allKnown = false;
-                } else {
-                    databases.add(known);
-                }
-            }
-            if (allKnown) {
-                services.put(Database.class.getName(), new ArrayList<>(databases));
-            }
-            recorder.setJvmServiceImplementations(services);
-        }
-    }
-
-    @BuildStep(onlyIf = NativeBuild.class)
-    @Record(STATIC_INIT)
-    void nativeImageConfiguration(
-            LiquibaseRecorder recorder,
-            LiquibaseBuildTimeConfig liquibaseBuildConfig,
-            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
-            BuildProducer<ReflectiveClassBuildItem> reflective,
-            BuildProducer<NativeImageResourceBuildItem> resource,
-            BuildProducer<GeneratedResourceBuildItem> generatedResource,
-            BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized,
-            BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle) {
-
-        runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("liquibase.diff.compare.CompareControl"));
-
-        reflective.produce(new ReflectiveClassBuildItem(false, true, false,
-                "liquibase.change.AbstractSQLChange",
-                "liquibase.database.jvm.JdbcConnection"));
-
-        reflective.produce(new ReflectiveClassBuildItem(true, true, true,
-                "liquibase.change.ColumnConfig",
-                "liquibase.change.AddColumnConfig"));
-
-        reflective.produce(new ReflectiveClassBuildItem(false, false, true,
-                "liquibase.change.ConstraintsConfig"));
-
-        addReflection(reflective, true, liquibase.change.Change.class);
-
-        // add all implementation of these classes to the reflection process
-        addReflection(reflective, false,
-                liquibase.configuration.ConfigurationContainer.class,
-                liquibase.parser.LiquibaseParser.class,
-                liquibase.structure.DatabaseObject.class,
-                liquibase.sql.visitor.SqlVisitor.class);
-
-        // load the liquibase services
-        Map<String, List<String>> serviceClassesImplementationRegistry = new HashMap<>();
-
-        Stream.of(liquibase.diff.compare.DatabaseObjectComparator.class,
-                liquibase.parser.NamespaceDetails.class,
-                liquibase.precondition.Precondition.class,
-                liquibase.database.Database.class,
-                liquibase.parser.ChangeLogParser.class,
-                liquibase.change.Change.class,
-                liquibase.snapshot.SnapshotGenerator.class,
-                liquibase.changelog.ChangeLogHistoryService.class,
-                liquibase.datatype.LiquibaseDataType.class,
-                liquibase.executor.Executor.class,
-                liquibase.lockservice.LockService.class,
-                liquibase.sqlgenerator.SqlGenerator.class,
-                liquibase.command.LiquibaseCommand.class,
-                liquibase.structure.DatabaseObject.class,
-                liquibase.diff.output.changelog.ChangeGenerator.class,
-                liquibase.diff.DiffGenerator.class)
-                .forEach(t -> addService(reflective, t, true, serviceClassesImplementationRegistry));
-
-        addService(reflective, liquibase.license.LicenseService.class, false, serviceClassesImplementationRegistry);
-
-        recorder.setServicesImplementations(serviceClassesImplementationRegistry);
-
-        Collection<String> dataSourceNames = jdbcDataSourceBuildItems.stream()
-                .map(i -> i.getName())
-                .collect(Collectors.toSet());
-
-        resource.produce(
-                new NativeImageResourceBuildItem(getChangeLogs(dataSourceNames, liquibaseBuildConfig).toArray(new String[0])));
-
-        // liquibase XSD
-        resource.produce(new NativeImageResourceBuildItem(
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd",
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd",
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.7.xsd",
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd",
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd",
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.10.xsd",
-                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd",
-                "www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd",
-                "www.liquibase.org/xml/ns/pro/liquibase-pro-3.9.xsd",
-                "www.liquibase.org/xml/ns/pro/liquibase-pro-3.10.xsd",
-                "liquibase.build.properties"));
-
-        // liquibase resource bundles
-        resourceBundle.produce(new NativeImageResourceBundleBuildItem("liquibase/i18n/liquibase-core"));
-    }
-
-    @BuildStep
-    FeatureBuildItem feature() {
-        return new FeatureBuildItem(Feature.LIQUIBASE);
-    }
-
-    @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    ServiceStartBuildItem createBeansAndStartActions(LiquibaseRecorder recorder,
-            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
-            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
-            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
-            BuildProducer<JdbcDataSourceSchemaReadyBuildItem> schemaReadyBuildItem) {
-
-        // make a LiquibaseContainerProducer bean
-        additionalBeans
-                .produce(AdditionalBeanBuildItem.builder().addBeanClasses(LiquibaseContainerProducer.class).setUnremovable()
-                        .setDefaultScope(DotNames.SINGLETON).build());
-        // add the @LiquibaseDataSource class otherwise it won't registered as a qualifier
-        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(LiquibaseDataSource.class).build());
-
-        Collection<String> dataSourceNames = getDataSourceNames(jdbcDataSourceBuildItems);
-
-        for (String dataSourceName : dataSourceNames) {
-            SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
-                    .configure(LiquibaseFactory.class)
-                    .scope(Dependent.class) // this is what the existing code does, but it doesn't seem reasonable
-                    .setRuntimeInit()
-                    .unremovable()
-                    .supplier(recorder.liquibaseSupplier(dataSourceName));
-
-            if (DataSourceUtil.isDefault(dataSourceName)) {
-                configurator.addQualifier(Default.class);
-            } else {
-                String beanName = LIQUIBASE_BEAN_NAME_PREFIX + dataSourceName;
-                configurator.name(beanName);
-
-                configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", beanName).done();
-                configurator.addQualifier().annotation(LiquibaseDataSource.class).addValue("value", dataSourceName).done();
-            }
-
-            syntheticBeanBuildItemBuildProducer.produce(configurator.done());
-        }
-
-        // will actually run the actions at runtime
-        recorder.doStartActions();
-
-        // once we are done running the migrations, we produce a build item indicating that the
-        // schema is "ready"
-        schemaReadyBuildItem.produce(new JdbcDataSourceSchemaReadyBuildItem(dataSourceNames));
-
-        return new ServiceStartBuildItem("liquibase");
-    }
-
-    private Set<String> getDataSourceNames(List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems) {
-        Set<String> result = new HashSet<>(jdbcDataSourceBuildItems.size());
-        for (JdbcDataSourceBuildItem item : jdbcDataSourceBuildItems) {
-            result.add(item.getName());
-        }
-        return result;
-    }
-
-    /**
-     * Search for all implementation of the interface {@code className}.
-     * <p>
-     * Each implementation is added to the reflection configuration and recorded
-     * in a map which used to load the implementations of the service in native image.
-     */
-    private void addService(BuildProducer<ReflectiveClassBuildItem> reflective, Class<?> className, boolean methods,
-            Map<String, List<String>> serviceClassesImplementationRegistry) {
-
-        Class<?>[] classImplementations = ServiceLocator.getInstance().findClasses(className);
-
-        if (classImplementations != null && classImplementations.length > 0) {
-            reflective.produce(new ReflectiveClassBuildItem(true, methods, false, classImplementations));
-            List<String> serviceImplementations = new ArrayList<>();
-
-            for (Class<?> classImpl : classImplementations) {
-                serviceImplementations.add(classImpl.getName());
-            }
-
-            serviceClassesImplementationRegistry.put(className.getName(), serviceImplementations);
-        }
-
-        reflective.produce(new ReflectiveClassBuildItem(false, false, false, className.getName()));
-        reflective.produce(new ReflectiveClassBuildItem(false, false, false, className.getName()));
-    }
-
-    /**
-     * Add the reflection for the liquibase class interface and all the implementations of the interface
-     */
-    private void addReflection(BuildProducer<ReflectiveClassBuildItem> reflective, boolean methods, Class<?>... className) {
-        for (Class<?> clazz : className) {
-            Class<?>[] impl = ServiceLocator.getInstance().findClasses(clazz);
-            if (impl != null && impl.length > 0) {
-                reflective.produce(new ReflectiveClassBuildItem(true, methods, false, impl));
-            }
-        }
-    }
-
-    /**
-     * Collect the configured changeLog file for the default and all named datasources.
-     * <p>
-     * A {@link LinkedHashSet} is used to avoid duplications.
-     */
-    private List<String> getChangeLogs(Collection<String> dataSourceNames, LiquibaseBuildTimeConfig liquibaseBuildConfig) {
-        if (dataSourceNames.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        ChangeLogParameters changeLogParameters = new ChangeLogParameters();
-        ClassLoaderResourceAccessor classLoaderResourceAccessor = new ClassLoaderResourceAccessor(
-                Thread.currentThread().getContextClassLoader());
-
-        ChangeLogParserFactory changeLogParserFactory = ChangeLogParserFactory.getInstance();
-
-        Set<String> resources = new LinkedHashSet<>();
-
-        // default datasource
-        if (DataSourceUtil.hasDefault(dataSourceNames)) {
-            resources.addAll(findAllChangeLogs(liquibaseBuildConfig.defaultDataSource.changeLog, changeLogParserFactory,
-                    classLoaderResourceAccessor, changeLogParameters));
-        }
-
-        // named datasources
-        Collection<String> namedDataSourceChangeLogs = dataSourceNames.stream()
-                .filter(n -> !DataSourceUtil.isDefault(n))
-                .map(liquibaseBuildConfig::getConfigForDataSourceName)
-                .map(c -> c.changeLog)
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-
-        for (String namedDataSourceChangeLog : namedDataSourceChangeLogs) {
-            resources.addAll(
-                    findAllChangeLogs(namedDataSourceChangeLog, changeLogParserFactory, classLoaderResourceAccessor,
-                            changeLogParameters));
-        }
-
-        LOGGER.debugf("Liquibase changeLogs: %s", resources);
-
-        return new ArrayList<>(resources);
-    }
-
-    /**
-     * Finds all resource files for the given change log file
-     */
-    private Set<String> findAllChangeLogs(String file, ChangeLogParserFactory changeLogParserFactory,
-            ClassLoaderResourceAccessor classLoaderResourceAccessor,
-            ChangeLogParameters changeLogParameters) {
-        try {
-            ChangeLogParser parser = changeLogParserFactory.getParser(file, classLoaderResourceAccessor);
-            DatabaseChangeLog changelog = parser.parse(file, changeLogParameters, classLoaderResourceAccessor);
-
-            if (changelog != null) {
-                Set<String> result = new LinkedHashSet<>();
-                // get all changeSet files
-                for (ChangeSet changeSet : changelog.getChangeSets()) {
-                    result.add(changeSet.getFilePath());
-
-                    // get all parents of the changeSet
-                    DatabaseChangeLog parent = changeSet.getChangeLog();
-                    while (parent != null) {
-                        result.add(parent.getFilePath());
-                        parent = parent.getParentChangeLog();
-                    }
-                }
-                result.add(changelog.getFilePath());
-                return result;
-            }
-        } catch (LiquibaseException ex) {
-            throw new IllegalStateException(ex);
-        }
-        return Collections.emptySet();
-    }
-
-}
diff --git a/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java
new file mode 100644
index 0000000000000..eb22ef206c481
--- /dev/null
+++ b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java
@@ -0,0 +1,378 @@
+package io.quarkus.liquibase.deployment;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Default;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.ServiceStartBuildItem;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
+import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.liquibase.LiquibaseDataSource;
+import io.quarkus.liquibase.LiquibaseFactory;
+import io.quarkus.liquibase.runtime.LiquibaseBuildTimeConfig;
+import io.quarkus.liquibase.runtime.LiquibaseFactoryProducer;
+import io.quarkus.liquibase.runtime.LiquibaseRecorder;
+import liquibase.change.Change;
+import liquibase.change.core.CreateProcedureChange;
+import liquibase.change.core.CreateViewChange;
+import liquibase.change.core.LoadDataChange;
+import liquibase.change.core.SQLFileChange;
+import liquibase.changelog.ChangeLogParameters;
+import liquibase.changelog.ChangeSet;
+import liquibase.changelog.DatabaseChangeLog;
+import liquibase.exception.LiquibaseException;
+import liquibase.parser.ChangeLogParser;
+import liquibase.parser.ChangeLogParserFactory;
+import liquibase.resource.ClassLoaderResourceAccessor;
+
+class LiquibaseProcessor {
+
+    private static final Logger LOGGER = Logger.getLogger(LiquibaseProcessor.class);
+
+    private static final String LIQUIBASE_BEAN_NAME_PREFIX = "liquibase_";
+
+    @BuildStep
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.LIQUIBASE);
+    }
+
+    @BuildStep
+    public SystemPropertyBuildItem disableHub() {
+        // Don't block app startup with prompt:
+        // Do you want to see this operation's report in Liquibase Hub, which improves team collaboration?
+        // If so, enter your email. If not, enter [N] to no longer be prompted, or [S] to skip for now, but ask again next time (default "S"):
+        return new SystemPropertyBuildItem("liquibase.hub.mode", "off");
+    }
+
+    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
+    @Record(STATIC_INIT)
+    void nativeImageConfiguration(
+            LiquibaseRecorder recorder,
+            LiquibaseBuildTimeConfig liquibaseBuildConfig,
+            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
+            BuildProducer<ReflectiveClassBuildItem> reflective,
+            BuildProducer<NativeImageResourceBuildItem> resource,
+            BuildProducer<ServiceProviderBuildItem> services,
+            BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized,
+            BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle) {
+
+        runtimeInitialized.produce(new RuntimeInitializedClassBuildItem(liquibase.diff.compare.CompareControl.class.getName()));
+
+        reflective.produce(new ReflectiveClassBuildItem(false, true, false,
+                liquibase.change.AbstractSQLChange.class.getName(),
+                liquibase.database.jvm.JdbcConnection.class.getName()));
+
+        reflective.produce(new ReflectiveClassBuildItem(true, true, true,
+                liquibase.parser.ChangeLogParserCofiguration.class.getName(),
+                liquibase.hub.HubServiceFactory.class.getName(),
+                liquibase.logging.core.DefaultLoggerConfiguration.class.getName(),
+                liquibase.configuration.GlobalConfiguration.class.getName(),
+                com.datical.liquibase.ext.config.LiquibaseProConfiguration.class.getName(),
+                liquibase.license.LicenseServiceFactory.class.getName(),
+                liquibase.executor.ExecutorService.class.getName(),
+                liquibase.change.ChangeFactory.class.getName(),
+                liquibase.logging.core.LogServiceFactory.class.getName(),
+                liquibase.logging.LogFactory.class.getName(),
+                liquibase.change.ColumnConfig.class.getName(),
+                liquibase.change.AddColumnConfig.class.getName(),
+                liquibase.change.core.LoadDataColumnConfig.class.getName(),
+                liquibase.sql.visitor.PrependSqlVisitor.class.getName(),
+                liquibase.sql.visitor.ReplaceSqlVisitor.class.getName(),
+                liquibase.sql.visitor.AppendSqlVisitor.class.getName(),
+                liquibase.sql.visitor.RegExpReplaceSqlVisitor.class.getName()));
+
+        reflective.produce(new ReflectiveClassBuildItem(false, false, true,
+                liquibase.change.ConstraintsConfig.class.getName()));
+
+        Collection<String> dataSourceNames = jdbcDataSourceBuildItems.stream()
+                .map(i -> i.getName())
+                .collect(Collectors.toSet());
+
+        resource.produce(
+                new NativeImageResourceBuildItem(getChangeLogs(dataSourceNames, liquibaseBuildConfig).toArray(new String[0])));
+
+        Stream.of(liquibase.change.Change.class,
+                liquibase.changelog.ChangeLogHistoryService.class,
+                liquibase.command.LiquibaseCommand.class,
+                liquibase.database.Database.class,
+                liquibase.database.DatabaseConnection.class,
+                liquibase.datatype.LiquibaseDataType.class,
+                liquibase.diff.compare.DatabaseObjectComparator.class,
+                liquibase.diff.DiffGenerator.class,
+                liquibase.diff.output.changelog.ChangeGenerator.class,
+                liquibase.executor.Executor.class,
+                liquibase.license.LicenseService.class,
+                liquibase.lockservice.LockService.class,
+                liquibase.logging.LogService.class,
+                liquibase.parser.ChangeLogParser.class,
+                liquibase.parser.NamespaceDetails.class,
+                liquibase.parser.SnapshotParser.class,
+                liquibase.precondition.Precondition.class,
+                liquibase.serializer.ChangeLogSerializer.class,
+                liquibase.serializer.SnapshotSerializer.class,
+                liquibase.servicelocator.ServiceLocator.class,
+                liquibase.snapshot.SnapshotGenerator.class,
+                liquibase.sqlgenerator.SqlGenerator.class,
+                liquibase.structure.DatabaseObject.class,
+                liquibase.hub.HubService.class)
+                .forEach(t -> addService(services, reflective, t, false));
+
+        // Register Precondition services, and the implementation class for reflection while also registering fields for reflection
+        addService(services, reflective, liquibase.precondition.Precondition.class, true);
+
+        // liquibase XSD
+        resource.produce(new NativeImageResourceBuildItem(
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.7.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.10.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.0.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd",
+                "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd",
+                "www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd",
+                "www.liquibase.org/xml/ns/pro/liquibase-pro-3.9.xsd",
+                "www.liquibase.org/xml/ns/pro/liquibase-pro-3.10.xsd",
+                "www.liquibase.org/xml/ns/pro/liquibase-pro-4.0.xsd",
+                "www.liquibase.org/xml/ns/pro/liquibase-pro-4.1.xsd",
+                "liquibase.build.properties"));
+
+        // liquibase resource bundles
+        resourceBundle.produce(new NativeImageResourceBundleBuildItem("liquibase/i18n/liquibase-core"));
+    }
+
+    private void addService(BuildProducer<ServiceProviderBuildItem> services,
+            BuildProducer<ReflectiveClassBuildItem> reflective, Class<?> serviceClass,
+            boolean shouldRegisterFieldForReflection) {
+        try {
+            String service = "META-INF/services/" + serviceClass.getName();
+            Set<String> implementations = ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(),
+                    service);
+            services.produce(new ServiceProviderBuildItem(serviceClass.getName(), implementations.toArray(new String[0])));
+
+            reflective.produce(new ReflectiveClassBuildItem(true, true, shouldRegisterFieldForReflection,
+                    implementations.toArray(new String[0])));
+        } catch (IOException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.LIQUIBASE);
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void createBeans(LiquibaseRecorder recorder,
+            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer) {
+
+        // make a LiquibaseContainerProducer bean
+        additionalBeans
+                .produce(AdditionalBeanBuildItem.builder().addBeanClasses(LiquibaseFactoryProducer.class).setUnremovable()
+                        .setDefaultScope(DotNames.SINGLETON).build());
+        // add the @LiquibaseDataSource class otherwise it won't registered as a qualifier
+        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(LiquibaseDataSource.class).build());
+
+        Collection<String> dataSourceNames = getDataSourceNames(jdbcDataSourceBuildItems);
+
+        for (String dataSourceName : dataSourceNames) {
+            SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                    .configure(LiquibaseFactory.class)
+                    .scope(ApplicationScoped.class) // this is what the existing code does, but it doesn't seem reasonable
+                    .setRuntimeInit()
+                    .unremovable()
+                    .supplier(recorder.liquibaseSupplier(dataSourceName));
+
+            if (DataSourceUtil.isDefault(dataSourceName)) {
+                configurator.addQualifier(Default.class);
+            } else {
+                String beanName = LIQUIBASE_BEAN_NAME_PREFIX + dataSourceName;
+                configurator.name(beanName);
+
+                configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", beanName).done();
+                configurator.addQualifier().annotation(LiquibaseDataSource.class).addValue("value", dataSourceName).done();
+            }
+
+            syntheticBeanBuildItemBuildProducer.produce(configurator.done());
+        }
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    @Consume(SyntheticBeansRuntimeInitBuildItem.class)
+    ServiceStartBuildItem startLiquibase(LiquibaseRecorder recorder,
+            List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
+            BuildProducer<JdbcDataSourceSchemaReadyBuildItem> schemaReadyBuildItem) {
+        // will actually run the actions at runtime
+        recorder.doStartActions();
+
+        // once we are done running the migrations, we produce a build item indicating that the
+        // schema is "ready"
+        schemaReadyBuildItem.produce(new JdbcDataSourceSchemaReadyBuildItem(getDataSourceNames(jdbcDataSourceBuildItems)));
+
+        return new ServiceStartBuildItem("liquibase");
+    }
+
+    private Set<String> getDataSourceNames(List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems) {
+        Set<String> result = new HashSet<>(jdbcDataSourceBuildItems.size());
+        for (JdbcDataSourceBuildItem item : jdbcDataSourceBuildItems) {
+            result.add(item.getName());
+        }
+        return result;
+    }
+
+    /**
+     * Collect the configured changeLog file for the default and all named datasources.
+     * <p>
+     * A {@link LinkedHashSet} is used to avoid duplications.
+     */
+    private List<String> getChangeLogs(Collection<String> dataSourceNames, LiquibaseBuildTimeConfig liquibaseBuildConfig) {
+        if (dataSourceNames.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        ChangeLogParameters changeLogParameters = new ChangeLogParameters();
+        ClassLoaderResourceAccessor classLoaderResourceAccessor = new ClassLoaderResourceAccessor(
+                Thread.currentThread().getContextClassLoader());
+
+        ChangeLogParserFactory changeLogParserFactory = ChangeLogParserFactory.getInstance();
+
+        Set<String> resources = new LinkedHashSet<>();
+
+        // default datasource
+        if (DataSourceUtil.hasDefault(dataSourceNames)) {
+            resources.addAll(findAllChangeLogFiles(liquibaseBuildConfig.defaultDataSource.changeLog, changeLogParserFactory,
+                    classLoaderResourceAccessor, changeLogParameters));
+        }
+
+        // named datasources
+        Collection<String> namedDataSourceChangeLogs = dataSourceNames.stream()
+                .filter(n -> !DataSourceUtil.isDefault(n))
+                .map(liquibaseBuildConfig::getConfigForDataSourceName)
+                .map(c -> c.changeLog)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        for (String namedDataSourceChangeLog : namedDataSourceChangeLogs) {
+            resources.addAll(
+                    findAllChangeLogFiles(namedDataSourceChangeLog, changeLogParserFactory, classLoaderResourceAccessor,
+                            changeLogParameters));
+        }
+
+        LOGGER.debugf("Liquibase changeLogs: %s", resources);
+
+        return new ArrayList<>(resources);
+    }
+
+    /**
+     * Finds all resource files for the given change log file
+     */
+    private Set<String> findAllChangeLogFiles(String file, ChangeLogParserFactory changeLogParserFactory,
+            ClassLoaderResourceAccessor classLoaderResourceAccessor,
+            ChangeLogParameters changeLogParameters) {
+        try {
+            ChangeLogParser parser = changeLogParserFactory.getParser(file, classLoaderResourceAccessor);
+            DatabaseChangeLog changelog = parser.parse(file, changeLogParameters, classLoaderResourceAccessor);
+
+            if (changelog != null) {
+                Set<String> result = new LinkedHashSet<>();
+                // get all changeSet files
+                for (ChangeSet changeSet : changelog.getChangeSets()) {
+                    result.add(changeSet.getFilePath());
+
+                    changeSet.getChanges().stream()
+                            .map(change -> extractChangeFile(change, changeSet.getFilePath()))
+                            .forEach(changeFile -> changeFile.ifPresent(result::add));
+
+                    // get all parents of the changeSet
+                    DatabaseChangeLog parent = changeSet.getChangeLog();
+                    while (parent != null) {
+                        result.add(parent.getFilePath());
+                        parent = parent.getParentChangeLog();
+                    }
+                }
+                result.add(changelog.getFilePath());
+                return result;
+            }
+        } catch (LiquibaseException ex) {
+            throw new IllegalStateException(ex);
+        }
+        return Collections.emptySet();
+    }
+
+    private Optional<String> extractChangeFile(Change change, String changeSetFilePath) {
+        String path = null;
+        Boolean relative = null;
+        if (change instanceof LoadDataChange) {
+            LoadDataChange loadDataChange = (LoadDataChange) change;
+            path = loadDataChange.getFile();
+            relative = loadDataChange.isRelativeToChangelogFile();
+        } else if (change instanceof SQLFileChange) {
+            SQLFileChange sqlFileChange = (SQLFileChange) change;
+            path = sqlFileChange.getPath();
+            relative = sqlFileChange.isRelativeToChangelogFile();
+        } else if (change instanceof CreateProcedureChange) {
+            CreateProcedureChange createProcedureChange = (CreateProcedureChange) change;
+            path = createProcedureChange.getPath();
+            relative = createProcedureChange.isRelativeToChangelogFile();
+        } else if (change instanceof CreateViewChange) {
+            CreateViewChange createViewChange = (CreateViewChange) change;
+            path = createViewChange.getPath();
+            relative = createViewChange.getRelativeToChangelogFile();
+        }
+
+        // unrelated change or change does not reference a file (e.g. inline view)
+        if (path == null) {
+            return Optional.empty();
+        }
+        // absolute file path or changeSet has no file path
+        if (relative == null || !relative || changeSetFilePath == null) {
+            return Optional.of(path);
+        }
+
+        // relative file path needs to be resolved against changeSetFilePath
+        // notes: ClassLoaderResourceAccessor does not provide a suitable method and CLRA.getFinalPath() is not visible
+        return Optional.of(Paths.get(changeSetFilePath).resolveSibling(path).toString().replace('\\', '/'));
+    }
+}
diff --git a/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devconsole/DevConsoleProcessor.java b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..c585116d19993
--- /dev/null
+++ b/extensions/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,25 @@
+package io.quarkus.liquibase.deployment.devconsole;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.liquibase.runtime.devconsole.LiquibaseDevConsoleRecorder;
+import io.quarkus.liquibase.runtime.devconsole.LiquibaseFactoriesSupplier;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleRuntimeTemplateInfoBuildItem collectBeanInfo() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("liquibaseFactories", new LiquibaseFactoriesSupplier());
+    }
+
+    @BuildStep
+    @Record(value = RUNTIME_INIT, optional = true)
+    DevConsoleRouteBuildItem invokeEndpoint(LiquibaseDevConsoleRecorder recorder) {
+        return new DevConsoleRouteBuildItem("datasources", "POST", recorder.handler());
+    }
+}
diff --git a/extensions/liquibase/deployment/src/main/resources/dev-templates/datasources.html b/extensions/liquibase/deployment/src/main/resources/dev-templates/datasources.html
new file mode 100644
index 0000000000000..fe82b15924087
--- /dev/null
+++ b/extensions/liquibase/deployment/src/main/resources/dev-templates/datasources.html
@@ -0,0 +1,36 @@
+{#include main}
+{#title}Managed datasources{/title}
+{#body}
+<table class="table table-striped">
+    <thead class="thead-dark">
+    <tr>
+        <th scope="col">Name</th>
+        <th scope="col">Actions</th>
+    </tr>
+    </thead>
+    <tbody>
+    {#for liquibaseFactory in info:liquibaseFactories}
+    <tr>
+        <td>
+            {liquibaseFactory.dataSourceName}
+        </td>
+        <td>
+            <div class="btn-group">
+                <form method="post" enctype="application/x-www-form-urlencoded">
+                    <input type="hidden" name="datasource" value="{liquibaseFactory.dataSourceName}">
+                    <input type="hidden" name="operation" value="clean">
+                    <input id="clear" type="submit" class="btn btn-primary btn-sm" value="Clean" >
+                </form>
+                &nbsp;
+                <form method="post" enctype="application/x-www-form-urlencoded">
+                    <input type="hidden" name="datasource" value="{liquibaseFactory.dataSourceName}">
+                    <input type="hidden" name="operation" value="migrate">
+                    <input id="migrate" type="submit" class="btn btn-primary btn-sm" value="Migrate" >
+                </form>
+            </div>
+        </td>
+    {/for}
+    </tbody>
+</table>
+{/body}
+{/include}
diff --git a/extensions/liquibase/deployment/src/main/resources/dev-templates/embedded.html b/extensions/liquibase/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..921d41ecd6e5f
--- /dev/null
+++ b/extensions/liquibase/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,3 @@
+<a href="{urlbase}/datasources" class="badge badge-light">
+  <i class="fa fa-database fa-fw"></i>
+  Datasources <span class="badge badge-light">{info:liquibaseFactories.size()}</span></a>
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java
index 232a86c11b236..49efc2f8804a1 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionBaselineOnMigrateTest.java
@@ -2,9 +2,11 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.sql.ResultSet;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.sql.DataSource;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -22,6 +24,9 @@ public class LiquibaseExtensionBaselineOnMigrateTest {
     @Inject
     LiquibaseFactory liquibaseFactory;
 
+    @Inject
+    DataSource dataSource;
+
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
@@ -37,6 +42,11 @@ public void testLiquibaseInitialBaselineInfo() throws Exception {
             assertNotNull(status, "Status is null");
             assertEquals(1, status.size(), "The set of changes is not null");
             assertFalse(status.get(0).getWillRun());
+
+            // make sure we have the properly named table
+            ResultSet tables = dataSource.getConnection().getMetaData()
+                    .getTables(liquibase.getDatabase().getConnection().getCatalog(), null, "MY_CUSTOM_PREFIX_%", null);
+            assertTrue(tables.next());
         }
     }
 }
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java
index 19ba4509a685d..c67a37a3baede 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigDefaultDataSourceTest.java
@@ -27,6 +27,7 @@ public class LiquibaseExtensionConfigDefaultDataSourceTest {
                     .addClass(LiquibaseExtensionConfigFixture.class)
                     .addAsResource("db/xml/changeLog.xml")
                     .addAsResource("db/xml/create-tables.xml")
+                    .addAsResource("db/xml/create-views.xml")
                     .addAsResource("db/xml/test/test.xml")
                     .addAsResource("config-for-default-datasource.properties", "application.properties"));
 
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java
index 8856533f82ce2..f3b852d6d5fa1 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigEmptyTest.java
@@ -33,6 +33,6 @@ public class LiquibaseExtensionConfigEmptyTest {
     @Test
     @DisplayName("Injecting (default) liquibase should fail if there is no datasource configured")
     public void testLiquibaseNotAvailableWithoutDataSource() {
-        assertThrows(UnsatisfiedResolutionException.class, liquibase::get);
+        assertThrows(UnsatisfiedResolutionException.class, () -> liquibase.get().getConfiguration());
     }
 }
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java
index 82afa3ce9d0c0..7853dcea6b193 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigFixture.java
@@ -2,7 +2,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Consumer;
+import java.util.stream.StreamSupport;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -40,6 +44,7 @@ public void assertAllConfigurationSettings(LiquibaseConfig configuration, String
         assertEquals(configuration.databaseChangeLogLockTableName, databaseChangeLogLockTableName(dataSourceName));
         assertEquals(labels(configuration), labels(dataSourceName));
         assertEquals(contexts(configuration), contexts(dataSourceName));
+        assertEquals(changeLogParameters(configuration), changeLogParameters(dataSourceName));
     }
 
     public void assertDefaultConfigurationSettings(LiquibaseConfig configuration) {
@@ -58,6 +63,30 @@ public void assertDefaultConfigurationSettings(LiquibaseConfig configuration) {
 
     }
 
+    public Map<String, String> changeLogParameters(LiquibaseConfig configuration) {
+        if (configuration.changeLogParameters == null) {
+            return Collections.emptyMap();
+        }
+        return configuration.changeLogParameters;
+    }
+
+    public Map<String, String> changeLogParameters(String datasourceName) {
+        String propertyName = fillin("quarkus.liquibase.%s.change-log-parameters", datasourceName);
+        Map<String, String> map = new HashMap<>();
+        StreamSupport.stream(config.getPropertyNames().spliterator(), false).filter(p -> p.startsWith(propertyName))
+                .forEach(p -> map.put(unquote(p.substring(propertyName.length() + 1)), config.getValue(p, String.class)));
+
+        return map;
+    }
+
+    private String unquote(String s) {
+        if (s.startsWith("\"") && s.endsWith("\"")) {
+            return s.substring(1, s.length() - 1);
+        } else {
+            return s;
+        }
+    }
+
     public String contexts(LiquibaseConfig configuration) {
         if (configuration.contexts == null) {
             return null;
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java
index 588913628f0ef..6edfc0aeb42fa 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigMultiDataSourcesTest.java
@@ -46,6 +46,7 @@ public class LiquibaseExtensionConfigMultiDataSourcesTest {
                     .addAsResource("db/users/changeLog.xml")
                     .addAsResource("db/xml/changeLog.xml")
                     .addAsResource("db/xml/create-tables.xml")
+                    .addAsResource("db/xml/create-views.xml")
                     .addAsResource("db/xml/test/test.xml")
                     .addAsResource("config-for-multiple-datasources.properties", "application.properties"));
 
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java
index 1321644a0d33d..ad2ee5a7bc1ad 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest.java
@@ -32,6 +32,7 @@ public class LiquibaseExtensionConfigNamedDataSourceWithoutDefaultTest {
                     .addClass(LiquibaseExtensionConfigFixture.class)
                     .addAsResource("db/xml/changeLog.xml")
                     .addAsResource("db/xml/create-tables.xml")
+                    .addAsResource("db/xml/create-views.xml")
                     .addAsResource("db/xml/test/test.xml")
                     .addAsResource("config-for-named-datasource-without-default.properties", "application.properties"));
 
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java
index e5d149819f8f7..8cd6af6e5e6b4 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionLoadChangeLogTest.java
@@ -25,6 +25,7 @@ public class LiquibaseExtensionLoadChangeLogTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource("db/xml/changeLog.xml")
                     .addAsResource("db/xml/create-tables.xml")
+                    .addAsResource("db/xml/create-views.xml")
                     .addAsResource("db/xml/test/test.xml")
                     .addAsResource("load-change-log-config.properties", "application.properties"));
 
@@ -36,7 +37,8 @@ public void testLiquibaseConfigInjection() throws Exception {
             assertEquals("db/xml/changeLog.xml", changelog.getFilePath());
             assertNotNull(changelog.getChangeSets());
             assertEquals("db/xml/create-tables.xml", changelog.getChangeSets().get(0).getFilePath());
-            assertEquals("db/xml/test/test.xml", changelog.getChangeSets().get(1).getFilePath());
+            assertEquals("db/xml/create-views.xml", changelog.getChangeSets().get(1).getFilePath());
+            assertEquals("db/xml/test/test.xml", changelog.getChangeSets().get(2).getFilePath());
         }
     }
 
diff --git a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java
index da7c9f1fe6f41..fc190e63e5460 100644
--- a/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java
+++ b/extensions/liquibase/deployment/src/test/java/io/quarkus/liquibase/test/LiquibaseExtensionMigrateAtStartXmlChangeLogTest.java
@@ -27,6 +27,7 @@ public class LiquibaseExtensionMigrateAtStartXmlChangeLogTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource("db/xml/changeLog.xml")
                     .addAsResource("db/xml/create-tables.xml")
+                    .addAsResource("db/xml/create-views.xml")
                     .addAsResource("db/xml/test/test.xml")
                     .addAsResource("migrate-at-start-xml-config.properties", "application.properties"));
 
@@ -37,9 +38,10 @@ public void testLiquibaseXmlChangeLog() throws Exception {
             List<ChangeSetStatus> status = liquibase.getChangeSetStatuses(liquibaseFactory.createContexts(),
                     liquibaseFactory.createLabels());
             assertNotNull(status);
-            assertEquals(2, status.size());
+            assertEquals(3, status.size());
             assertFalse(status.get(0).getWillRun());
             assertFalse(status.get(1).getWillRun());
+            assertFalse(status.get(2).getWillRun());
         }
     }
 }
diff --git a/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties b/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties
index f5f7b003d7927..b9bf509298aba 100644
--- a/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties
+++ b/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate-named-datasource.properties
@@ -7,3 +7,4 @@ quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-basel
 quarkus.liquibase.users.migrate-at-start=true
 quarkus.liquibase.users.database-change-log-lock-table-name=TEST_LOCK
 quarkus.liquibase.users.database-change-log-table-name=TEST_LOG
+quarkus.liquibase.users.change-log-parameters."table.prefix"=MY_CUSTOM_PREFIX
diff --git a/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate.properties b/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate.properties
index f1e858f8f1b94..df2c20916e970 100644
--- a/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate.properties
+++ b/extensions/liquibase/deployment/src/test/resources/baseline-on-migrate.properties
@@ -7,4 +7,5 @@ quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-baseline-on
 quarkus.liquibase.migrate-at-start=true
 quarkus.liquibase.database-change-log-lock-table-name=TEST_LOCK
 quarkus.liquibase.database-change-log-table-name=TEST_LOG
+quarkus.liquibase.change-log-parameters."table.prefix"=MY_CUSTOM_PREFIX
 
diff --git a/extensions/liquibase/deployment/src/test/resources/config-empty.properties b/extensions/liquibase/deployment/src/test/resources/config-empty.properties
index e69de29bb2d1d..f032a4af991ee 100644
--- a/extensions/liquibase/deployment/src/test/resources/config-empty.properties
+++ b/extensions/liquibase/deployment/src/test/resources/config-empty.properties
@@ -0,0 +1 @@
+quarkus.datasource.devservices=false
\ No newline at end of file
diff --git a/extensions/liquibase/deployment/src/test/resources/config-for-default-datasource.properties b/extensions/liquibase/deployment/src/test/resources/config-for-default-datasource.properties
index 05fde33b13493..df35166543681 100644
--- a/extensions/liquibase/deployment/src/test/resources/config-for-default-datasource.properties
+++ b/extensions/liquibase/deployment/src/test/resources/config-for-default-datasource.properties
@@ -13,6 +13,8 @@ quarkus.liquibase.database-change-log-lock-table-name=TEST_LOCK
 quarkus.liquibase.database-change-log-table-name=TEST_LOG
 quarkus.liquibase.contexts=C1,C2
 quarkus.liquibase.labels=L1,L2
+quarkus.liquibase.change-log-parameters.param1=P1
+quarkus.liquibase.change-log-parameters."param2.has.dots"=P2
 quarkus.liquibase.default-catalog-name=catalog
 quarkus.liquibase.default-schema-name=schema
 quarkus.liquibase.liquibase-catalog-name=liquibaseCatalog
diff --git a/extensions/liquibase/deployment/src/test/resources/config-for-missing-named-datasource.properties b/extensions/liquibase/deployment/src/test/resources/config-for-missing-named-datasource.properties
index 9ec3013296838..cbf131be8aaa5 100644
--- a/extensions/liquibase/deployment/src/test/resources/config-for-missing-named-datasource.properties
+++ b/extensions/liquibase/deployment/src/test/resources/config-for-missing-named-datasource.properties
@@ -2,7 +2,6 @@
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 quarkus.datasource.inventory.jdbc.xa=true
 
diff --git a/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties b/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties
index 828735511e0ce..6f5b696703b11 100644
--- a/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties
+++ b/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources-without-default.properties
@@ -2,14 +2,12 @@
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 # Datasource for "inventory"
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 quarkus.datasource.inventory.jdbc.xa=true
 
diff --git a/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources.properties b/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources.properties
index 665afff98e158..cdfe59a104693 100644
--- a/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources.properties
+++ b/extensions/liquibase/deployment/src/test/resources/config-for-multiple-datasources.properties
@@ -8,14 +8,12 @@ quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test_quarkus;DB_CLOSE_DE
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 # Datasource for "inventory"
 quarkus.datasource.inventory.db-kind=h2
 quarkus.datasource.inventory.username=username2
 quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:inventory
-quarkus.datasource.inventory.jdbc.min-size=2
 quarkus.datasource.inventory.jdbc.max-size=12
 quarkus.datasource.inventory.jdbc.xa=true
 
diff --git a/extensions/liquibase/deployment/src/test/resources/config-for-named-datasource-without-default.properties b/extensions/liquibase/deployment/src/test/resources/config-for-named-datasource-without-default.properties
index 39f9f1754e52d..af75b69e006cf 100644
--- a/extensions/liquibase/deployment/src/test/resources/config-for-named-datasource-without-default.properties
+++ b/extensions/liquibase/deployment/src/test/resources/config-for-named-datasource-without-default.properties
@@ -2,7 +2,6 @@
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.username=username1
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users
-quarkus.datasource.users.jdbc.min-size=1
 quarkus.datasource.users.jdbc.max-size=11
 
 # Liquibase configuration for "users" datasource
diff --git a/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml
index 9a443531f95d0..32e3238c9b53f 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/changeLog.xml
@@ -4,8 +4,10 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
+    <property name="table.prefix" value="TBL_"/>
+
     <changeSet author="dev (generated)" id="id-1">
-        <createTable tableName="TEST">
+        <createTable tableName="${table.prefix}TEST">
             <column name="ID" type="VARCHAR(255)">
                 <constraints nullable="false"/>
             </column>
diff --git a/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml b/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml
index 7198339ed51fe..b6d9a6c0ee02a 100644
--- a/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml
+++ b/extensions/liquibase/deployment/src/test/resources/db/xml/changeLog.xml
@@ -6,5 +6,7 @@
 
     <include relativeToChangelogFile="true" file="create-tables.xml" />
 
+    <include relativeToChangelogFile="true" file="create-views.xml" />
+
     <include relativeToChangelogFile="true" file="test/test.xml" />
 </databaseChangeLog>
diff --git a/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml b/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml
new file mode 100644
index 0000000000000..bf01986e3842e
--- /dev/null
+++ b/extensions/liquibase/deployment/src/test/resources/db/xml/create-views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet author="dev (generated)" id="create-view-1">
+        <createView viewName="LIQUIBASE_VIEW">
+            SELECT DISTINCT NAME
+            FROM LIQUIBASE;
+        </createView>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/extensions/liquibase/pom.xml b/extensions/liquibase/pom.xml
index 42ecc43a5b19c..4b3fbd9aecf19 100644
--- a/extensions/liquibase/pom.xml
+++ b/extensions/liquibase/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/liquibase/runtime/pom.xml b/extensions/liquibase/runtime/pom.xml
index 675eb78088b28..164d27c0e4d79 100644
--- a/extensions/liquibase/runtime/pom.xml
+++ b/extensions/liquibase/runtime/pom.xml
@@ -33,6 +33,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-narayana-jta</artifactId>
@@ -40,10 +44,17 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <!-- test dependencies -->
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java
index f7c5716e87f1b..9437f61df23b7 100644
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/LiquibaseFactory.java
@@ -1,5 +1,7 @@
 package io.quarkus.liquibase;
 
+import java.util.Map;
+
 import javax.sql.DataSource;
 
 import io.quarkus.liquibase.runtime.LiquibaseConfig;
@@ -12,37 +14,20 @@
 import liquibase.resource.ClassLoaderResourceAccessor;
 import liquibase.resource.ResourceAccessor;
 
-/**
- * The quarkus liquibase factory
- */
 public class LiquibaseFactory {
 
-    /**
-     * The datasource
-     */
     private final DataSource dataSource;
 
-    /**
-     * The liquibase configuration
-     */
+    private final String dataSourceName;
+
     private final LiquibaseConfig config;
 
-    /**
-     * The default constructor
-     *
-     * @param config the liquibase configuration
-     * @param datasource the datasource for this liquibase bean
-     */
-    public LiquibaseFactory(LiquibaseConfig config, DataSource datasource) {
-        this.dataSource = datasource;
+    public LiquibaseFactory(LiquibaseConfig config, DataSource datasource, String dataSourceName) {
         this.config = config;
+        this.dataSource = datasource;
+        this.dataSourceName = dataSourceName;
     }
 
-    /**
-     * Creates the liquibase instance.
-     * 
-     * @return the liquibase.
-     */
     public Liquibase createLiquibase() {
         try {
             ResourceAccessor resourceAccessor = new ClassLoaderResourceAccessor(Thread.currentThread().getContextClassLoader());
@@ -64,18 +49,19 @@ public Liquibase createLiquibase() {
                     database.setDefaultSchemaName(config.defaultSchemaName.get());
                 }
             }
-            return new Liquibase(config.changeLog, resourceAccessor, database);
+            Liquibase liquibase = new Liquibase(config.changeLog, resourceAccessor, database);
+
+            for (Map.Entry<String, String> entry : config.changeLogParameters.entrySet()) {
+                liquibase.getChangeLogParameters().set(entry.getKey(), entry.getValue());
+            }
+
+            return liquibase;
 
         } catch (Exception ex) {
             throw new IllegalStateException(ex);
         }
     }
 
-    /**
-     * Gets the liquibase configuration
-     *
-     * @return the liquibase configuration
-     */
     public LiquibaseConfig getConfiguration() {
         return config;
     }
@@ -97,4 +83,8 @@ public LabelExpression createLabels() {
     public Contexts createContexts() {
         return new Contexts(config.contexts);
     }
+
+    public String getDataSourceName() {
+        return dataSourceName;
+    }
 }
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseConfig.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseConfig.java
index 5d26f06499e1f..39923b207f611 100644
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseConfig.java
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseConfig.java
@@ -5,6 +5,7 @@
 import static io.quarkus.liquibase.runtime.LiquibaseDataSourceRuntimeConfig.DEFAULT_LOG_TABLE;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -42,6 +43,8 @@ public class LiquibaseConfig {
      */
     public List<String> labels = null;
 
+    public Map<String, String> changeLogParameters = null;
+
     /**
      * The database change log lock table name
      */
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseContainer.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseContainer.java
deleted file mode 100644
index 788a1e4c74572..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseContainer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.quarkus.liquibase.runtime;
-
-import io.quarkus.liquibase.LiquibaseFactory;
-
-public class LiquibaseContainer {
-
-    private final LiquibaseFactory liquibaseFactory;
-    private final boolean cleanAtStart;
-    private final boolean migrateAtStart;
-    private final boolean validateOnMigrate;
-
-    public LiquibaseContainer(LiquibaseFactory liquibaseFactory, boolean cleanAtStart, boolean migrateAtStart,
-            boolean validateOnMigrate) {
-        this.liquibaseFactory = liquibaseFactory;
-        this.cleanAtStart = cleanAtStart;
-        this.migrateAtStart = migrateAtStart;
-        this.validateOnMigrate = validateOnMigrate;
-    }
-
-    public LiquibaseFactory getLiquibaseFactory() {
-        return liquibaseFactory;
-    }
-
-    public boolean isCleanAtStart() {
-        return cleanAtStart;
-    }
-
-    public boolean isMigrateAtStart() {
-        return migrateAtStart;
-    }
-
-    public boolean isValidateOnMigrate() {
-        return validateOnMigrate;
-    }
-}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseContainerProducer.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseContainerProducer.java
deleted file mode 100644
index 014f830c3bd7e..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseContainerProducer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.quarkus.liquibase.runtime;
-
-import javax.sql.DataSource;
-
-import io.quarkus.datasource.common.runtime.DataSourceUtil;
-import io.quarkus.liquibase.LiquibaseFactory;
-
-/**
- * This class is sort of a producer for {@link LiquibaseFactory}.
- *
- * It isn't a CDI producer in the literal sense, but it is marked as a bean
- * and it's {@code createLiquibaseFactory} method is called at runtime in order to produce
- * the actual {@code LiquibaseFactory} objects.
- *
- * CDI scopes and qualifiers are setup at build-time, which is why this class is devoid of
- * any CDI annotations
- *
- */
-public class LiquibaseContainerProducer {
-
-    private final LiquibaseBuildTimeConfig liquibaseBuildTimeConfig;
-    private final LiquibaseRuntimeConfig liquibaseRuntimeConfig;
-
-    public LiquibaseContainerProducer(LiquibaseBuildTimeConfig liquibaseBuildTimeConfig,
-            LiquibaseRuntimeConfig liquibaseRuntimeConfig) {
-        this.liquibaseBuildTimeConfig = liquibaseBuildTimeConfig;
-        this.liquibaseRuntimeConfig = liquibaseRuntimeConfig;
-    }
-
-    public LiquibaseContainer createLiquibaseFactory(DataSource dataSource, String dataSourceName) {
-        LiquibaseDataSourceBuildTimeConfig matchingBuildTimeConfig = DataSourceUtil.isDefault(dataSourceName)
-                ? liquibaseBuildTimeConfig.defaultDataSource
-                : liquibaseBuildTimeConfig.getConfigForDataSourceName(dataSourceName);
-        LiquibaseDataSourceRuntimeConfig matchingRuntimeConfig = DataSourceUtil.isDefault(dataSourceName)
-                ? liquibaseRuntimeConfig.defaultDataSource
-                : liquibaseRuntimeConfig.getConfigForDataSourceName(dataSourceName);
-        LiquibaseFactory liquibaseFactory = new LiquibaseCreator(matchingRuntimeConfig, matchingBuildTimeConfig)
-                .createLiquibase(dataSource);
-        return new LiquibaseContainer(liquibaseFactory, matchingRuntimeConfig.cleanAtStart,
-                matchingRuntimeConfig.migrateAtStart, matchingRuntimeConfig.validateOnMigrate);
-    }
-}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseCreator.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseCreator.java
index 57b96c9eda8b6..785425e30b1cd 100644
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseCreator.java
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseCreator.java
@@ -4,40 +4,22 @@
 
 import io.quarkus.liquibase.LiquibaseFactory;
 
-/**
- * The quarkus liquibase creator
- */
 class LiquibaseCreator {
-    /**
-     * The liquibase runtime configuration
-     */
+
     private final LiquibaseDataSourceRuntimeConfig liquibaseRuntimeConfig;
-    /**
-     * The liquibase build time configuration
-     */
     private final LiquibaseDataSourceBuildTimeConfig liquibaseBuildTimeConfig;
 
-    /**
-     * The default constructor
-     * 
-     * @param liquibaseRuntimeConfig the liquibase runtime configuration
-     * @param liquibaseBuildTimeConfig the liquibase build time configuration
-     */
     public LiquibaseCreator(LiquibaseDataSourceRuntimeConfig liquibaseRuntimeConfig,
             LiquibaseDataSourceBuildTimeConfig liquibaseBuildTimeConfig) {
         this.liquibaseRuntimeConfig = liquibaseRuntimeConfig;
         this.liquibaseBuildTimeConfig = liquibaseBuildTimeConfig;
     }
 
-    /**
-     * Creates the quarkus liquibase instance
-     * 
-     * @param dataSource the liquibase datasource
-     * @return the corresponding quarkus liquibase instance.
-     */
-    public LiquibaseFactory createLiquibase(DataSource dataSource) {
+    public LiquibaseFactory createLiquibaseFactory(DataSource dataSource, String dataSourceName) {
         LiquibaseConfig config = new LiquibaseConfig();
         config.changeLog = liquibaseBuildTimeConfig.changeLog;
+        config.changeLogParameters = liquibaseRuntimeConfig.changeLogParameters;
+
         if (liquibaseRuntimeConfig.labels.isPresent()) {
             config.labels = liquibaseRuntimeConfig.labels.get();
         }
@@ -58,6 +40,6 @@ public LiquibaseFactory createLiquibase(DataSource dataSource) {
         config.migrateAtStart = liquibaseRuntimeConfig.migrateAtStart;
         config.cleanAtStart = liquibaseRuntimeConfig.cleanAtStart;
         config.validateOnMigrate = liquibaseRuntimeConfig.validateOnMigrate;
-        return new LiquibaseFactory(config, dataSource);
+        return new LiquibaseFactory(config, dataSource, dataSourceName);
     }
 }
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseDataSourceRuntimeConfig.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseDataSourceRuntimeConfig.java
index c853d6a1fbf42..639590f5d5b58 100644
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseDataSourceRuntimeConfig.java
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseDataSourceRuntimeConfig.java
@@ -1,6 +1,8 @@
 package io.quarkus.liquibase.runtime;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigGroup;
@@ -68,6 +70,12 @@ public static final LiquibaseDataSourceRuntimeConfig defaultConfig() {
     @ConfigItem
     public Optional<List<String>> labels = Optional.empty();
 
+    /**
+     * Map of parameters that can be used inside Liquibase changeLog files.
+     */
+    @ConfigItem
+    public Map<String, String> changeLogParameters = new HashMap<>();
+
     /**
      * The liquibase change log lock table name. Name of table to use for tracking concurrent Liquibase usage.
      */
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseFactoryProducer.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseFactoryProducer.java
new file mode 100644
index 0000000000000..5984c98c90aed
--- /dev/null
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseFactoryProducer.java
@@ -0,0 +1,40 @@
+package io.quarkus.liquibase.runtime;
+
+import javax.sql.DataSource;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.liquibase.LiquibaseFactory;
+
+/**
+ * This class is sort of a producer for {@link LiquibaseFactory}.
+ *
+ * It isn't a CDI producer in the literal sense, but it is marked as a bean
+ * and it's {@code createLiquibaseFactory} method is called at runtime in order to produce
+ * the actual {@code LiquibaseFactory} objects.
+ *
+ * CDI scopes and qualifiers are setup at build-time, which is why this class is devoid of
+ * any CDI annotations
+ *
+ */
+public class LiquibaseFactoryProducer {
+
+    private final LiquibaseBuildTimeConfig liquibaseBuildTimeConfig;
+    private final LiquibaseRuntimeConfig liquibaseRuntimeConfig;
+
+    public LiquibaseFactoryProducer(LiquibaseBuildTimeConfig liquibaseBuildTimeConfig,
+            LiquibaseRuntimeConfig liquibaseRuntimeConfig) {
+        this.liquibaseBuildTimeConfig = liquibaseBuildTimeConfig;
+        this.liquibaseRuntimeConfig = liquibaseRuntimeConfig;
+    }
+
+    public LiquibaseFactory createLiquibaseFactory(DataSource dataSource, String dataSourceName) {
+        LiquibaseDataSourceBuildTimeConfig matchingBuildTimeConfig = DataSourceUtil.isDefault(dataSourceName)
+                ? liquibaseBuildTimeConfig.defaultDataSource
+                : liquibaseBuildTimeConfig.getConfigForDataSourceName(dataSourceName);
+        LiquibaseDataSourceRuntimeConfig matchingRuntimeConfig = DataSourceUtil.isDefault(dataSourceName)
+                ? liquibaseRuntimeConfig.defaultDataSource
+                : liquibaseRuntimeConfig.getConfigForDataSourceName(dataSourceName);
+        return new LiquibaseCreator(matchingRuntimeConfig, matchingBuildTimeConfig)
+                .createLiquibaseFactory(dataSource, dataSourceName);
+    }
+}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseRecorder.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseRecorder.java
index febcdc81f289f..033c84a2a8d2a 100644
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseRecorder.java
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseRecorder.java
@@ -1,96 +1,75 @@
 package io.quarkus.liquibase.runtime;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Supplier;
 
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.sql.DataSource;
 
-import org.jboss.logging.Logger;
-
 import io.quarkus.agroal.runtime.DataSources;
+import io.quarkus.agroal.runtime.UnconfiguredDataSource;
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableInstance;
+import io.quarkus.arc.InstanceHandle;
 import io.quarkus.liquibase.LiquibaseFactory;
-import io.quarkus.liquibase.runtime.graal.LiquibaseServiceLoader;
 import io.quarkus.runtime.annotations.Recorder;
 import liquibase.Liquibase;
-import liquibase.exception.ServiceNotFoundException;
-import liquibase.servicelocator.ServiceLocator;
 
-/**
- * The liquibase recorder
- */
 @Recorder
 public class LiquibaseRecorder {
 
-    private static final Logger log = Logger.getLogger(LiquibaseRecorder.class);
-
-    private final List<LiquibaseContainer> liquibaseContainers = new ArrayList<>(2);
-
-    public void setServicesImplementations(Map<String, List<String>> serviceLoader) {
-        LiquibaseServiceLoader.setServicesImplementations(serviceLoader);
-    }
-
     public Supplier<LiquibaseFactory> liquibaseSupplier(String dataSourceName) {
         DataSource dataSource = DataSources.fromName(dataSourceName);
-        LiquibaseContainerProducer liquibaseProducer = Arc.container().instance(LiquibaseContainerProducer.class).get();
-        LiquibaseContainer liquibaseContainer = liquibaseProducer.createLiquibaseFactory(dataSource, dataSourceName);
-        liquibaseContainers.add(liquibaseContainer);
+        if (dataSource instanceof UnconfiguredDataSource) {
+            return new Supplier<LiquibaseFactory>() {
+                @Override
+                public LiquibaseFactory get() {
+                    throw new UnsatisfiedResolutionException("No datasource has been configured");
+                }
+            };
+        }
+        LiquibaseFactoryProducer liquibaseProducer = Arc.container().instance(LiquibaseFactoryProducer.class).get();
+        LiquibaseFactory liquibaseFactory = liquibaseProducer.createLiquibaseFactory(dataSource, dataSourceName);
         return new Supplier<LiquibaseFactory>() {
             @Override
             public LiquibaseFactory get() {
-                return liquibaseContainer.getLiquibaseFactory();
+                return liquibaseFactory;
             }
         };
     }
 
     public void doStartActions() {
         try {
-            for (LiquibaseContainer liquibaseContainer : liquibaseContainers) {
-                LiquibaseFactory liquibaseFactory = liquibaseContainer.getLiquibaseFactory();
-                if (liquibaseContainer.isCleanAtStart()) {
-                    try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
-                        liquibase.dropAll();
-                    }
-                }
-                if (liquibaseContainer.isMigrateAtStart()) {
-                    if (liquibaseContainer.isValidateOnMigrate()) {
+            InjectableInstance<LiquibaseFactory> liquibaseFactoryInstance = Arc.container()
+                    .select(LiquibaseFactory.class, Any.Literal.INSTANCE);
+            if (liquibaseFactoryInstance.isUnsatisfied()) {
+                return;
+            }
+
+            for (InstanceHandle<LiquibaseFactory> liquibaseFactoryHandle : liquibaseFactoryInstance.handles()) {
+                try {
+                    LiquibaseFactory liquibaseFactory = liquibaseFactoryHandle.get();
+                    if (liquibaseFactory.getConfiguration().cleanAtStart) {
                         try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
-                            liquibase.validate();
+                            liquibase.dropAll();
                         }
                     }
-                    try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
-                        liquibase.update(liquibaseFactory.createContexts(), liquibaseFactory.createLabels());
+                    if (liquibaseFactory.getConfiguration().migrateAtStart) {
+                        if (liquibaseFactory.getConfiguration().validateOnMigrate) {
+                            try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
+                                liquibase.validate();
+                            }
+                        }
+                        try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
+                            liquibase.update(liquibaseFactory.createContexts(), liquibaseFactory.createLabels());
+                        }
                     }
+                } catch (UnsatisfiedResolutionException e) {
+                    //ignore, the DS is not configured
                 }
             }
         } catch (Exception e) {
-            throw new IllegalStateException(e);
+            throw new IllegalStateException("Error starting Liquibase", e);
         }
     }
-
-    public void setJvmServiceImplementations(Map<String, List<String>> services) {
-        ServiceLocator.setInstance(new ServiceLocator() {
-
-            @Override
-            public <T> Class<? extends T>[] findClasses(Class<T> requiredInterface) throws ServiceNotFoundException {
-                List<String> found = services.get(requiredInterface.getName());
-                if (found == null) {
-                    log.warnf("Failed to find pre-indexed service %s, falling back to slow classpath scanning",
-                            requiredInterface);
-                    return super.findClasses(requiredInterface);
-                }
-                List<Class<? extends T>> ret = new ArrayList<>();
-                for (String i : found) {
-                    try {
-                        ret.add((Class<? extends T>) Class.forName(i, false, Thread.currentThread().getContextClassLoader()));
-                    } catch (ClassNotFoundException e) {
-                        log.error("Failed to load Liquibase service", e);
-                    }
-                }
-                return ret.toArray(new Class[0]);
-            }
-        });
-    }
 }
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devconsole/LiquibaseDevConsoleRecorder.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devconsole/LiquibaseDevConsoleRecorder.java
new file mode 100644
index 0000000000000..3b7d916c21fc0
--- /dev/null
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devconsole/LiquibaseDevConsoleRecorder.java
@@ -0,0 +1,70 @@
+package io.quarkus.liquibase.runtime.devconsole;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.inject.Default;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableInstance;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil.FlashMessageStatus;
+import io.quarkus.liquibase.LiquibaseDataSource.LiquibaseDataSourceLiteral;
+import io.quarkus.liquibase.LiquibaseFactory;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+import liquibase.Liquibase;
+
+@Recorder
+public class LiquibaseDevConsoleRecorder {
+
+    public Handler<RoutingContext> handler() {
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form) throws Exception {
+                String datasource = form.get("datasource");
+                String operation = form.get("operation");
+
+                InjectableInstance<LiquibaseFactory> liquibaseFactoryInstance = Arc.container().select(LiquibaseFactory.class);
+                if (liquibaseFactoryInstance.isUnsatisfied()) {
+                    return;
+                }
+
+                Annotation qualifier;
+                if (DataSourceUtil.isDefault(datasource)) {
+                    qualifier = Default.Literal.INSTANCE;
+                } else {
+                    qualifier = LiquibaseDataSourceLiteral.of(datasource);
+                }
+
+                InstanceHandle<LiquibaseFactory> liquibaseFactoryHandle = Arc.container().instance(LiquibaseFactory.class,
+                        qualifier);
+                if (!liquibaseFactoryHandle.isAvailable()) {
+                    flashMessage(event, "Unknown datasource: " + datasource, FlashMessageStatus.ERROR);
+                }
+
+                LiquibaseFactory liquibaseFactory = liquibaseFactoryHandle.get();
+                if ("clean".equals(operation)) {
+                    try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
+                        liquibase.dropAll();
+                    }
+                    flashMessage(event, "Datasource " + datasource + " cleaned");
+                    return;
+                } else if ("migrate".equals(operation)) {
+                    try (Liquibase liquibase = liquibaseFactory.createLiquibase()) {
+                        liquibase.update(liquibaseFactory.createContexts(),
+                                liquibaseFactory.createLabels());
+                    }
+                    flashMessage(event, "Datasource " + datasource + " migrated");
+                    return;
+                } else {
+                    flashMessage(event, "Invalid operation: " + operation, FlashMessageStatus.ERROR);
+                    return;
+                }
+            }
+        };
+    }
+}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devconsole/LiquibaseFactoriesSupplier.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devconsole/LiquibaseFactoriesSupplier.java
new file mode 100644
index 0000000000000..aad2291d5c213
--- /dev/null
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devconsole/LiquibaseFactoriesSupplier.java
@@ -0,0 +1,53 @@
+package io.quarkus.liquibase.runtime.devconsole;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.Any;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableInstance;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.liquibase.LiquibaseFactory;
+
+public class LiquibaseFactoriesSupplier implements Supplier<Collection<LiquibaseFactory>> {
+
+    @Override
+    public Collection<LiquibaseFactory> get() {
+        InjectableInstance<LiquibaseFactory> liquibaseFactoryInstance = Arc.container().select(LiquibaseFactory.class,
+                Any.Literal.INSTANCE);
+        if (liquibaseFactoryInstance.isUnsatisfied()) {
+            return Collections.emptySet();
+        }
+
+        Set<LiquibaseFactory> liquibaseFactories = new TreeSet<>(LiquibaseFactoryComparator.INSTANCE);
+        for (InstanceHandle<LiquibaseFactory> liquibaseFactoryHandle : liquibaseFactoryInstance.handles()) {
+            liquibaseFactories.add(liquibaseFactoryHandle.get());
+        }
+        return liquibaseFactories;
+    }
+
+    private static class LiquibaseFactoryComparator implements Comparator<LiquibaseFactory> {
+
+        private static final LiquibaseFactoryComparator INSTANCE = new LiquibaseFactoryComparator();
+
+        @Override
+        public int compare(LiquibaseFactory o1, LiquibaseFactory o2) {
+            String dataSourceName1 = o1.getDataSourceName();
+            String dataSourceName2 = o2.getDataSourceName();
+            if (DataSourceUtil.isDefault(dataSourceName1)) {
+                return -1;
+            }
+            if (DataSourceUtil.isDefault(dataSourceName2)) {
+                return 1;
+            }
+            return dataSourceName1.compareTo(dataSourceName2);
+        }
+
+    }
+}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/LiquibaseServiceLoader.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/LiquibaseServiceLoader.java
deleted file mode 100644
index feca066babf7c..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/LiquibaseServiceLoader.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.quarkus.liquibase.runtime.graal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The liquibase service class loader for native image.
- *
- * The liquibase extension has its own implementation of the class-path scanner to load the Services (Interface implementation).
- */
-public class LiquibaseServiceLoader {
-
-    private static Map<String, List<String>> servicesImplementations;
-
-    /**
-     * Finds all classes for the required interface.
-     *
-     * @param requiredInterface the required interface
-     * @return the list of the classes that implements the required interface
-     */
-    public static List<Class<?>> findClassesImpl(Class<?> requiredInterface) {
-        List<String> classesImplementationNames = servicesImplementations.get(requiredInterface.getName());
-
-        if (classesImplementationNames == null || classesImplementationNames.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        List<Class<?>> classImplementations = new ArrayList<>();
-
-        for (String classImplementation : classesImplementationNames) {
-            try {
-                classImplementations.add(Class.forName(classImplementation));
-            } catch (ClassNotFoundException exception) {
-                throw new IllegalStateException(exception);
-            }
-        }
-
-        return classImplementations;
-    }
-
-    public static void setServicesImplementations(Map<String, List<String>> servicesImplementations) {
-        LiquibaseServiceLoader.servicesImplementations = servicesImplementations;
-    }
-}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteKp.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteKp.java
deleted file mode 100644
index 5eb7535ff7a9c..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteKp.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.quarkus.liquibase.runtime.graal;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-/**
- * The liquibase license service for the commercial liquibase license
- * throws UnsupportedFeatureException: Non-reducible loop for the liquibase.pro.packaged.aO.parseNumberText2(boolean):
- *
- * With this substitute the liquibase license service will be disabled.
- */
-@TargetClass(className = "liquibase.pro.packaged.kp")
-final class SubstituteKp {
-
-    @Substitute
-    public boolean licenseIsValid(String license) {
-        return false;
-    }
-}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteServiceLocator.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteServiceLocator.java
deleted file mode 100644
index bbcea61c38d01..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteServiceLocator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.quarkus.liquibase.runtime.graal;
-
-import java.util.List;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-import liquibase.servicelocator.ServiceLocator;
-
-/**
- * The liquibase service locator substitute replaces liquibase classpath scanner method
- * {@link liquibase.servicelocator.ServiceLocator#findClasses(Class)} with a custom implementation
- * {@link LiquibaseServiceLoader#findClassesImpl(Class)}.
- */
-@TargetClass(className = "liquibase.servicelocator.ServiceLocator")
-final class SubstituteServiceLocator {
-
-    @Substitute
-    private List<Class<?>> findClassesImpl(Class<?> requiredInterface) {
-        return LiquibaseServiceLoader.findClassesImpl(requiredInterface);
-    }
-
-}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java
new file mode 100644
index 0000000000000..d4f28a00e8464
--- /dev/null
+++ b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java
@@ -0,0 +1,37 @@
+package io.quarkus.liquibase.runtime.graal;
+
+import java.security.SecureRandom;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.InjectAccessors;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "liquibase.util.StringUtil")
+final class SubstituteStringUtil {
+
+    @Alias
+    @InjectAccessors(SecureRandomAccessors.class)
+    private static SecureRandom rnd;
+
+    public static final class SecureRandomAccessors {
+
+        private static volatile SecureRandom volatileRandom;
+
+        public static SecureRandom get() {
+            SecureRandom localVolatileRandom = volatileRandom;
+            if (localVolatileRandom == null) {
+                synchronized (SecureRandomAccessors.class) {
+                    localVolatileRandom = volatileRandom;
+                    if (localVolatileRandom == null) {
+                        volatileRandom = localVolatileRandom = new SecureRandom();
+                    }
+                }
+            }
+            return localVolatileRandom;
+        }
+
+        public static void set(SecureRandom rnd) {
+            throw new IllegalStateException("The setter for liquibase.util.StringUtil#rnd shouldn't be called.");
+        }
+    }
+}
diff --git a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtils.java b/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtils.java
deleted file mode 100644
index 344afdc39b81e..0000000000000
--- a/extensions/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.quarkus.liquibase.runtime.graal;
-
-import java.security.SecureRandom;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.TargetClass;
-
-@TargetClass(className = "liquibase.util.StringUtils")
-final class SubstituteStringUtils {
-
-    @Alias
-    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
-    private static SecureRandom rnd;
-
-}
diff --git a/extensions/liquibase/runtime/src/test/java/io/quarkus/liquibase/runtime/LiquibaseCreatorTest.java b/extensions/liquibase/runtime/src/test/java/io/quarkus/liquibase/runtime/LiquibaseCreatorTest.java
index cbcf190daf541..e0b841d0a2e4a 100644
--- a/extensions/liquibase/runtime/src/test/java/io/quarkus/liquibase/runtime/LiquibaseCreatorTest.java
+++ b/extensions/liquibase/runtime/src/test/java/io/quarkus/liquibase/runtime/LiquibaseCreatorTest.java
@@ -8,6 +8,8 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+
 class LiquibaseCreatorTest {
 
     private LiquibaseDataSourceRuntimeConfig runtimeConfig = LiquibaseDataSourceRuntimeConfig.defaultConfig();
@@ -201,6 +203,6 @@ void testLiquibaseTablespaceNameOverridden() {
     }
 
     private LiquibaseConfig createdLiquibaseConfig() {
-        return creator.createLiquibase(null).getConfiguration();
+        return creator.createLiquibaseFactory(null, DataSourceUtil.DEFAULT_DATASOURCE_NAME).getConfiguration();
     }
 }
diff --git a/extensions/logging-gelf/runtime/pom.xml b/extensions/logging-gelf/runtime/pom.xml
index fe63a2bed374c..5be7c45ca4736 100644
--- a/extensions/logging-gelf/runtime/pom.xml
+++ b/extensions/logging-gelf/runtime/pom.xml
@@ -22,6 +22,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfConfig.java b/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfConfig.java
index acd10968d4af2..12d55385334ae 100644
--- a/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfConfig.java
+++ b/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfConfig.java
@@ -105,4 +105,16 @@ public class GelfConfig {
      */
     @ConfigItem(defaultValue = "8192")
     public int maximumMessageSize;
+
+    /**
+     * Include message parameters from the log event
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean includeLogMessageParameters;
+
+    /**
+     * Include source code location
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean includeLocation;
 }
diff --git a/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfLogHandlerRecorder.java b/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfLogHandlerRecorder.java
index 97c1ac6e3cf13..66947c6d26886 100644
--- a/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfLogHandlerRecorder.java
+++ b/extensions/logging-gelf/runtime/src/main/java/io/quarkus/logging/gelf/GelfLogHandlerRecorder.java
@@ -30,6 +30,8 @@ public RuntimeValue<Optional<Handler>> initializeHandler(final GelfConfig config
         handler.setPort(config.port);
         handler.setLevel(config.level);
         handler.setMaximumMessageSize(config.maximumMessageSize);
+        handler.setIncludeLocation(config.includeLocation);
+        handler.setIncludeLogMessageParameters(config.includeLogMessageParameters);
 
         // handle additional fields
         if (!config.additionalField.isEmpty()) {
diff --git a/extensions/logging-json/deployment/pom.xml b/extensions/logging-json/deployment/pom.xml
index 32b5b99115f97..632166d505ee3 100644
--- a/extensions/logging-json/deployment/pom.xml
+++ b/extensions/logging-json/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-logging-json-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-logging-json-deployment</artifactId>
diff --git a/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterDefaultConfigTest.java b/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterDefaultConfigTest.java
index a13945bd909cd..7df4ae1110bcf 100644
--- a/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterDefaultConfigTest.java
+++ b/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterDefaultConfigTest.java
@@ -14,11 +14,11 @@
 import org.jboss.logmanager.formatters.JsonFormatter;
 import org.jboss.logmanager.formatters.StructuredFormatter;
 import org.jboss.logmanager.handlers.ConsoleHandler;
-import org.jboss.logmanager.handlers.DelayedHandler;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class JsonFormatterDefaultConfigTest {
@@ -43,7 +43,7 @@ public static JsonFormatter getJsonFormatter() {
         LogManager logManager = LogManager.getLogManager();
         assertThat(logManager).isInstanceOf(org.jboss.logmanager.LogManager.class);
 
-        DelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
+        QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
         assertThat(Logger.getLogger("").getHandlers()).contains(delayedHandler);
         assertThat(delayedHandler.getLevel()).isEqualTo(Level.ALL);
 
diff --git a/extensions/logging-json/pom.xml b/extensions/logging-json/pom.xml
index 19699069e4d96..e7214a5aefa2e 100644
--- a/extensions/logging-json/pom.xml
+++ b/extensions/logging-json/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/logging-json/runtime/pom.xml b/extensions/logging-json/runtime/pom.xml
index 5dda99d674c27..f7c2adecc25d1 100644
--- a/extensions/logging-json/runtime/pom.xml
+++ b/extensions/logging-json/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-logging-json-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-logging-json</artifactId>
@@ -38,6 +37,12 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <runnerParentFirstArtifacts>
+                        <!-- Needed because org.jboss.logmanager.formatters.JsonFormatter loads javax.json.Json in its constructor -->
+                        <runnerParentFirstArtifact>org.glassfish:jakarta.json</runnerParentFirstArtifact>
+                    </runnerParentFirstArtifacts>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -54,4 +59,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/extensions/logging-json/runtime/src/main/java/io/quarkus/logging/json/runtime/JsonConfig.java b/extensions/logging-json/runtime/src/main/java/io/quarkus/logging/json/runtime/JsonConfig.java
index 31e50df91d66c..677c16573df25 100644
--- a/extensions/logging-json/runtime/src/main/java/io/quarkus/logging/json/runtime/JsonConfig.java
+++ b/extensions/logging-json/runtime/src/main/java/io/quarkus/logging/json/runtime/JsonConfig.java
@@ -29,7 +29,7 @@ public class JsonConfig {
     @ConfigItem(defaultValue = "default")
     String dateFormat;
     /**
-     * The special end-of-record delimiter to be used. By default, no delimiter is used.
+     * The special end-of-record delimiter to be used. By default, newline is used as delimiter.
      */
     @ConfigItem
     Optional<String> recordDelimiter;
diff --git a/extensions/logging-json/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/logging-json/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 01d0cd843ec6c..52d5bb37bc5db 100644
--- a/extensions/logging-json/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/logging-json/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -8,4 +8,11 @@ metadata:
   categories:
   - "core"
   status: "preview"
-  guide: "https://quarkus.io/guides/logging#json-logging"
\ No newline at end of file
+  guide: "https://quarkus.io/guides/logging#json-logging"
+  codestart:
+    name: "logging-json"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+    artifact: "io.quarkus:quarkus-descriptor-json"
\ No newline at end of file
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java
index 2e08152968c12..c3a71ba837f73 100644
--- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java
+++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java
@@ -1,17 +1,18 @@
 package io.quarkus.logging.sentry;
 
 import static io.quarkus.logging.sentry.SentryLoggerTest.getSentryHandler;
-import static io.sentry.jvmti.ResetFrameCache.resetFrameCache;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
+import java.util.logging.Handler;
+
+import org.jboss.logmanager.Level;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
+import io.sentry.HubAdapter;
 import io.sentry.Sentry;
-import io.sentry.jul.SentryHandler;
-import io.sentry.jvmti.FrameCache;
+import io.sentry.SentryOptions;
 
 public class SentryLoggerCustomTest {
 
@@ -22,16 +23,14 @@ public class SentryLoggerCustomTest {
 
     @Test
     public void sentryLoggerCustomTest() {
-        final SentryHandler sentryHandler = getSentryHandler();
+        final Handler sentryHandler = getSentryHandler();
+        final SentryOptions options = HubAdapter.getInstance().getOptions();
         assertThat(sentryHandler).isNotNull();
         assertThat(sentryHandler.getLevel()).isEqualTo(org.jboss.logmanager.Level.TRACE);
-        assertThat(FrameCache.shouldCacheThrowable(new IllegalStateException("Test frame"), 1)).isTrue();
-        assertThat(Sentry.getStoredClient()).isNotNull();
-        assertThat(Sentry.isInitialized()).isTrue();
-    }
-
-    @AfterAll
-    public static void reset() {
-        resetFrameCache();
+        assertThat(options.getInAppIncludes()).contains("io.quarkus.logging.sentry").contains("org.test");
+        assertThat(options.getDsn()).isEqualTo("https://123@example.com/22222");
+        assertThat(sentryHandler).extracting("minimumEventLevel").isEqualTo(Level.INFO);
+        assertThat(sentryHandler).extracting("minimumBreadcrumbLevel").isEqualTo(Level.DEBUG);
+        assertThat(Sentry.isEnabled()).isTrue();
     }
 }
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java
index 4601dfda60c70..9505f06b2e4c4 100644
--- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java
+++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java
@@ -1,16 +1,15 @@
 package io.quarkus.logging.sentry;
 
 import static io.quarkus.logging.sentry.SentryLoggerTest.getSentryHandler;
-import static io.sentry.jvmti.ResetFrameCache.resetFrameCache;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
+import java.util.logging.Handler;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
 import io.sentry.Sentry;
-import io.sentry.jul.SentryHandler;
 
 public class SentryLoggerDisabledTest {
 
@@ -21,14 +20,9 @@ public class SentryLoggerDisabledTest {
 
     @Test
     public void sentryLoggerDisabledTest() {
-        final SentryHandler sentryHandler = getSentryHandler();
+        final Handler sentryHandler = getSentryHandler();
         assertThat(sentryHandler).isNull();
-        assertThat(Sentry.getStoredClient()).isNotNull();
-        assertThat(Sentry.isInitialized()).isTrue();
+        assertThat(Sentry.isEnabled()).isFalse();
     }
 
-    @AfterAll
-    static void reset() {
-        resetFrameCache();
-    }
 }
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerEnvironmentOptionTests.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerEnvironmentOptionTests.java
index ec01c9ac85a19..44d665a7fca43 100644
--- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerEnvironmentOptionTests.java
+++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerEnvironmentOptionTests.java
@@ -1,16 +1,17 @@
 package io.quarkus.logging.sentry;
 
 import static io.quarkus.logging.sentry.SentryLoggerTest.getSentryHandler;
-import static io.sentry.jvmti.ResetFrameCache.resetFrameCache;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
+import java.util.logging.Handler;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
+import io.sentry.HubAdapter;
 import io.sentry.Sentry;
-import io.sentry.jul.SentryHandler;
+import io.sentry.SentryOptions;
 
 public class SentryLoggerEnvironmentOptionTests {
 
@@ -21,15 +22,11 @@ public class SentryLoggerEnvironmentOptionTests {
 
     @Test
     public void sentryLoggerEnvironmentOptionTest() {
-        final SentryHandler sentryHandler = getSentryHandler();
+        final Handler sentryHandler = getSentryHandler();
+        final SentryOptions options = HubAdapter.getInstance().getOptions();
         assertThat(sentryHandler).isNotNull();
-        assertThat(Sentry.getStoredClient()).isNotNull();
-        assertThat(Sentry.getStoredClient().getEnvironment()).isEqualTo("test-environment");
-        assertThat(Sentry.isInitialized()).isTrue();
+        assertThat(options.getEnvironment()).isEqualTo("test-environment");
+        assertThat(Sentry.isEnabled()).isTrue();
     }
 
-    @AfterAll
-    public static void reset() {
-        resetFrameCache();
-    }
 }
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerReleaseOptionTests.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerReleaseOptionTests.java
index a613695c1a076..0251b31e8b60d 100644
--- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerReleaseOptionTests.java
+++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerReleaseOptionTests.java
@@ -1,16 +1,17 @@
 package io.quarkus.logging.sentry;
 
 import static io.quarkus.logging.sentry.SentryLoggerTest.getSentryHandler;
-import static io.sentry.jvmti.ResetFrameCache.resetFrameCache;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.AfterAll;
+import java.util.logging.Handler;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
+import io.sentry.HubAdapter;
 import io.sentry.Sentry;
-import io.sentry.jul.SentryHandler;
+import io.sentry.SentryOptions;
 
 public class SentryLoggerReleaseOptionTests {
 
@@ -21,15 +22,11 @@ public class SentryLoggerReleaseOptionTests {
 
     @Test
     public void sentryLoggerEnvironmentOptionTest() {
-        final SentryHandler sentryHandler = getSentryHandler();
+        final Handler sentryHandler = getSentryHandler();
+        final SentryOptions options = HubAdapter.getInstance().getOptions();
         assertThat(sentryHandler).isNotNull();
-        assertThat(Sentry.getStoredClient()).isNotNull();
-        assertThat(Sentry.getStoredClient().getRelease()).isEqualTo("releaseABC");
-        assertThat(Sentry.isInitialized()).isTrue();
+        assertThat(options.getRelease()).isEqualTo("releaseABC");
+        assertThat(Sentry.isEnabled()).isTrue();
     }
 
-    @AfterAll
-    public static void reset() {
-        resetFrameCache();
-    }
 }
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java
index c24d324280184..05295b617bb29 100644
--- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java
+++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java
@@ -1,6 +1,5 @@
 package io.quarkus.logging.sentry;
 
-import static io.sentry.jvmti.ResetFrameCache.resetFrameCache;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
@@ -9,16 +8,16 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import org.jboss.logmanager.handlers.DelayedHandler;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.bootstrap.logging.InitialConfigurator;
+import io.quarkus.bootstrap.logging.QuarkusDelayedHandler;
 import io.quarkus.test.QuarkusUnitTest;
+import io.sentry.HubAdapter;
 import io.sentry.Sentry;
+import io.sentry.SentryOptions;
 import io.sentry.jul.SentryHandler;
-import io.sentry.jvmti.FrameCache;
 
 public class SentryLoggerTest {
 
@@ -29,30 +28,27 @@ public class SentryLoggerTest {
 
     @Test
     public void sentryLoggerDefaultTest() {
-        final SentryHandler sentryHandler = getSentryHandler();
+        final Handler sentryHandler = getSentryHandler();
+        final SentryOptions options = HubAdapter.getInstance().getOptions();
         assertThat(sentryHandler).isNotNull();
+        assertThat(options.getInAppIncludes()).isEmpty();
+        assertThat(options.getDsn()).isEqualTo("https://123@default.com/22222");
         assertThat(sentryHandler.getLevel()).isEqualTo(org.jboss.logmanager.Level.WARN);
-        assertThat(FrameCache.shouldCacheThrowable(new IllegalStateException("Test frame"), 1)).isFalse();
-        assertThat(Sentry.getStoredClient()).isNotNull();
-        assertThat(Sentry.isInitialized()).isTrue();
+        assertThat(Sentry.isEnabled()).isTrue();
     }
 
-    public static SentryHandler getSentryHandler() {
+    public static Handler getSentryHandler() {
         LogManager logManager = LogManager.getLogManager();
         assertThat(logManager).isInstanceOf(org.jboss.logmanager.LogManager.class);
 
-        DelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
+        QuarkusDelayedHandler delayedHandler = InitialConfigurator.DELAYED_HANDLER;
         assertThat(Logger.getLogger("").getHandlers()).contains(delayedHandler);
         assertThat(delayedHandler.getLevel()).isEqualTo(Level.ALL);
 
         Handler handler = Arrays.stream(delayedHandler.getHandlers())
-                .filter(h -> (h instanceof SentryHandler))
+                .filter(h -> SentryHandler.class.getName().equals(h.getClass().getName()))
                 .findFirst().orElse(null);
-        return (SentryHandler) handler;
+        return handler;
     }
 
-    @AfterAll
-    public static void reset() {
-        resetFrameCache();
-    }
 }
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java
index 79587d2f2f77d..4f20b680ce416 100644
--- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java
+++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java
@@ -1,8 +1,5 @@
 package io.quarkus.logging.sentry;
 
-import static io.sentry.jvmti.ResetFrameCache.resetFrameCache;
-
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -22,8 +19,4 @@ public void sentryLoggerWrongTest() {
         //Exception is expected
     }
 
-    @AfterAll
-    static void reset() {
-        resetFrameCache();
-    }
 }
diff --git a/extensions/logging-sentry/deployment/src/test/java/io/sentry/jvmti/ResetFrameCache.java b/extensions/logging-sentry/deployment/src/test/java/io/sentry/jvmti/ResetFrameCache.java
deleted file mode 100644
index 5b8156ddf6f33..0000000000000
--- a/extensions/logging-sentry/deployment/src/test/java/io/sentry/jvmti/ResetFrameCache.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.sentry.jvmti;
-
-public class ResetFrameCache {
-
-    public static void resetFrameCache() {
-        FrameCache.reset();
-    }
-}
diff --git a/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-custom.properties b/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-custom.properties
index 29bb3b0bbe86a..c99e193b71161 100644
--- a/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-custom.properties
+++ b/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-custom.properties
@@ -2,3 +2,5 @@ quarkus.log.sentry=true
 quarkus.log.sentry.dsn=https://123@example.com/22222
 quarkus.log.sentry.level=TRACE
 quarkus.log.sentry.in-app-packages=io.quarkus.logging.sentry,org.test
+quarkus.log.sentry.minimum-event-level=INFO
+quarkus.log.sentry.minimum-breadcrumb-level=DEBUG
diff --git a/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-default.properties b/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-default.properties
index 39311fca21c6b..635bae5ae8cc9 100644
--- a/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-default.properties
+++ b/extensions/logging-sentry/deployment/src/test/resources/application-sentry-logger-default.properties
@@ -1,3 +1,3 @@
 quarkus.log.sentry=true
-quarkus.log.sentry.dsn=https://123@example.com/22222
+quarkus.log.sentry.dsn=https://123@default.com/22222
 quarkus.log.sentry.in-app-packages=*
diff --git a/extensions/logging-sentry/pom.xml b/extensions/logging-sentry/pom.xml
index 7d6b53c20965b..36c59d2dda8db 100644
--- a/extensions/logging-sentry/pom.xml
+++ b/extensions/logging-sentry/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>quarkus-logging-sentry-parent</artifactId>
     <name>Quarkus - Logging - Sentry</name>
diff --git a/extensions/logging-sentry/runtime/pom.xml b/extensions/logging-sentry/runtime/pom.xml
index ad719c489a48d..2fb76b30e6bb0 100644
--- a/extensions/logging-sentry/runtime/pom.xml
+++ b/extensions/logging-sentry/runtime/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.sentry</groupId>
-            <artifactId>sentry</artifactId>
+            <artifactId>sentry-jul</artifactId>
         </dependency>
     </dependencies>
 
@@ -30,11 +30,6 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-                <configuration>
-                    <parentFirstArtifacts>
-                        <parentFirstArtifact>io.sentry:sentry</parentFirstArtifact>
-                    </parentFirstArtifacts>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfig.java b/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfig.java
index 3b2eefdfbac98..84c0ab13569d4 100644
--- a/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfig.java
+++ b/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfig.java
@@ -35,6 +35,23 @@ public class SentryConfig {
     @ConfigItem(defaultValue = "WARN")
     public Level level;
 
+    /**
+     * The minimum event level.
+     *
+     * Every log statement that is greater than minimum event level is turned into Sentry event.
+     */
+    @ConfigItem(defaultValue = "WARN")
+    public Level minimumEventLevel;
+
+    /**
+     * The minimum breadcrumb level.
+     *
+     * Every log statement that is greater than minimum breadcrumb level is added to Sentry scope as a breadcrumb,
+     * which can be later attached to SentryEvent if one is triggered.
+     */
+    @ConfigItem(defaultValue = "INFO")
+    public Level minimumBreadcrumbLevel;
+
     /**
      * Sentry differentiates stack frames that are directly related to your application (“in application”) from stack frames
      * that come from other packages such as the standard library, frameworks, or other dependencies. The difference is visible
@@ -76,4 +93,20 @@ public class SentryConfig {
      */
     @ConfigItem
     public Optional<String> release;
+
+    /**
+     * Server name
+     *
+     * Sets the server name that will be sent with each event.
+     */
+    @ConfigItem
+    public Optional<String> serverName;
+
+    /**
+     * Debug
+     *
+     * Enables Sentry debug mode.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean debug;
 }
diff --git a/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfigProvider.java b/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfigProvider.java
deleted file mode 100644
index 1d0773a97c550..0000000000000
--- a/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryConfigProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.quarkus.logging.sentry;
-
-import static java.lang.String.join;
-
-import java.util.Objects;
-
-import io.sentry.DefaultSentryClientFactory;
-import io.sentry.config.provider.ConfigurationProvider;
-
-/**
- * Mapping between the SentryConfig and the Sentry options {@link io.sentry.DefaultSentryClientFactory}
- */
-class SentryConfigProvider implements ConfigurationProvider {
-
-    private final SentryConfig config;
-
-    SentryConfigProvider(SentryConfig config) {
-        this.config = config;
-    }
-
-    @Override
-    public String getProperty(String key) {
-        switch (key) {
-            case DefaultSentryClientFactory.IN_APP_FRAMES_OPTION:
-                return config.inAppPackages.map(p -> join(",", p))
-                        .filter(s -> !Objects.equals(s, "*"))
-                        .orElse("");
-            case DefaultSentryClientFactory.ENVIRONMENT_OPTION:
-                return config.environment.orElse(null);
-            case DefaultSentryClientFactory.RELEASE_OPTION:
-                return config.release.orElse(null);
-            // New SentryConfig options should be mapped here
-            default:
-                return null;
-        }
-    }
-}
diff --git a/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryHandlerValueFactory.java b/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryHandlerValueFactory.java
index c0a8243bb2df6..b2abd8f589b15 100644
--- a/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryHandlerValueFactory.java
+++ b/extensions/logging-sentry/runtime/src/main/java/io/quarkus/logging/sentry/SentryHandlerValueFactory.java
@@ -1,5 +1,7 @@
 package io.quarkus.logging.sentry;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.logging.Handler;
 
@@ -10,36 +12,50 @@
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.sentry.Sentry;
 import io.sentry.SentryOptions;
-import io.sentry.config.Lookup;
-import io.sentry.dsn.Dsn;
 import io.sentry.jul.SentryHandler;
 
 @Recorder
 public class SentryHandlerValueFactory {
-    private static final Logger LOG = Logger.getLogger(SentryConfigProvider.class);
+    private static final Logger LOG = Logger.getLogger(SentryHandlerValueFactory.class);
 
     public RuntimeValue<Optional<Handler>> create(final SentryConfig config) {
-        final SentryConfigProvider provider = new SentryConfigProvider(config);
-        final Lookup lookup = new Lookup(provider, provider);
 
         if (!config.enable) {
-            // Disable Sentry
-            Sentry.init(SentryOptions.from(lookup, Dsn.DEFAULT_DSN));
             return new RuntimeValue<>(Optional.empty());
         }
-        if (!config.dsn.isPresent()) {
+
+        // Init Sentry
+        final SentryOptions options = toSentryOptions(config);
+        Sentry.init(options);
+        SentryHandler handler = new SentryHandler(options);
+        handler.setLevel(config.level);
+        handler.setPrintfStyle(true);
+        handler.setMinimumEventLevel(config.minimumEventLevel != null ? config.minimumEventLevel : config.level);
+        handler.setMinimumBreadcrumbLevel(config.minimumBreadcrumbLevel);
+        return new RuntimeValue<>(Optional.of(handler));
+    }
+
+    public static SentryOptions toSentryOptions(SentryConfig sentryConfig) {
+        if (!sentryConfig.dsn.isPresent()) {
             throw new ConfigurationException(
                     "Configuration key \"quarkus.log.sentry.dsn\" is required when Sentry is enabled, but its value is empty/missing");
         }
-        if (!config.inAppPackages.isPresent()) {
+        final SentryOptions options = new SentryOptions();
+
+        if (!sentryConfig.inAppPackages.isPresent()) {
             LOG.warn(
                     "No 'quarkus.sentry.in-app-packages' was configured, this option is highly recommended as it affects stacktrace grouping and display on Sentry. See https://quarkus.io/guides/logging-sentry#in-app-packages");
+        } else {
+            List<String> inAppPackages = sentryConfig.inAppPackages.get();
+            if (inAppPackages.size() != 1 || !Objects.equals(inAppPackages.get(0), "*")) {
+                inAppPackages.forEach(options::addInAppInclude);
+            }
         }
-
-        // Init Sentry
-        Sentry.init(SentryOptions.from(lookup, config.dsn.get()));
-        SentryHandler handler = new SentryHandler();
-        handler.setLevel(config.level);
-        return new RuntimeValue<>(Optional.of(handler));
+        options.setDsn(sentryConfig.dsn.get());
+        sentryConfig.environment.ifPresent(options::setEnvironment);
+        sentryConfig.release.ifPresent(options::setRelease);
+        sentryConfig.serverName.ifPresent(options::setServerName);
+        options.setDebug(sentryConfig.debug);
+        return options;
     }
 }
diff --git a/extensions/mailer/deployment/pom.xml b/extensions/mailer/deployment/pom.xml
index 1a74549c8fb2e..faa457af84ff9 100644
--- a/extensions/mailer/deployment/pom.xml
+++ b/extensions/mailer/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-mailer-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-mailer-deployment</artifactId>
@@ -46,7 +45,6 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <parameters>true</parameters>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>io.quarkus</groupId>
diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java
index b4c5c64e278c1..76b0bb49ddf26 100644
--- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java
+++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/InjectionTest.java
@@ -17,6 +17,7 @@
 import io.quarkus.qute.api.CheckedTemplate;
 import io.quarkus.qute.api.ResourcePath;
 import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Uni;
 import io.vertx.ext.mail.MailClient;
 
 @SuppressWarnings("WeakerAccess")
@@ -26,9 +27,8 @@ public class InjectionTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(BeanUsingAxleMailClient.class, BeanUsingBareMailClient.class, BeanUsingRxClient.class)
-                    .addClasses(BeanUsingBlockingMailer.class, BeanUsingReactiveMailer.class)
-                    .addClasses(MailTemplates.class)
+                    .addClasses(BeanUsingBareMailClient.class, BeanUsingBlockingMailer.class,
+                            BeanUsingReactiveMailer.class, MailTemplates.class)
                     .addAsResource("mock-config.properties", "application.properties")
                     .addAsResource(new StringAsset(""
                             + "<html>{name}</html>"), "templates/test1.html")
@@ -42,13 +42,7 @@ public class InjectionTest {
                             + "<html>{name}</html>"), "templates/mails/test2.html"));
 
     @Inject
-    BeanUsingAxleMailClient beanUsingBare;
-
-    @Inject
-    BeanUsingBareMailClient beanUsingAxle;
-
-    @Inject
-    BeanUsingRxClient beanUsingRx;
+    BeanUsingBareMailClient beanUsingBare;
 
     @Inject
     BeanUsingMutinyClient beanUsingMutiny;
@@ -68,15 +62,13 @@ public class InjectionTest {
     @Test
     public void testInjection() {
         beanUsingMutiny.verify();
-        beanUsingAxle.verify();
         beanUsingBare.verify();
-        beanUsingRx.verify();
         beanUsingBlockingMailer.verify();
         beanUsingReactiveMailer.verify().toCompletableFuture().join();
         beanUsingLegacyReactiveMailer.verify().toCompletableFuture().join();
         templates.send1();
-        templates.send2().toCompletableFuture().join();
-        templates.sendNative().toCompletableFuture().join();
+        templates.send2().await();
+        templates.sendNative().await();
     }
 
     @ApplicationScoped
@@ -90,28 +82,6 @@ void verify() {
         }
     }
 
-    @ApplicationScoped
-    static class BeanUsingAxleMailClient {
-
-        @Inject
-        io.vertx.axle.ext.mail.MailClient client;
-
-        void verify() {
-            Assertions.assertNotNull(client);
-        }
-    }
-
-    @ApplicationScoped
-    static class BeanUsingRxClient {
-
-        @Inject
-        io.vertx.reactivex.ext.mail.MailClient client;
-
-        void verify() {
-            Assertions.assertNotNull(client);
-        }
-    }
-
     @ApplicationScoped
     static class BeanUsingMutinyClient {
 
@@ -171,15 +141,15 @@ static class Templates {
         @ResourcePath("mails/test2")
         MailTemplate testMail;
 
-        CompletionStage<Void> send1() {
+        Uni<Void> send1() {
             return test1.to("quarkus@quarkus.io").subject("Test").data("name", "John").send();
         }
 
-        CompletionStage<Void> send2() {
+        Uni<Void> send2() {
             return testMail.to("quarkus@quarkus.io").subject("Test").data("name", "Lu").send();
         }
 
-        CompletionStage<Void> sendNative() {
+        Uni<Void> sendNative() {
             return Templates.testNative("John").to("quarkus@quarkus.io").subject("Test").send();
         }
     }
diff --git a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java
index 4d58136a273d3..20882c49cc874 100644
--- a/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java
+++ b/extensions/mailer/deployment/src/test/java/io/quarkus/mailer/MailTemplateValidationTest.java
@@ -1,7 +1,5 @@
 package io.quarkus.mailer;
 
-import java.util.concurrent.CompletionStage;
-
 import javax.enterprise.inject.spi.DeploymentException;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -14,6 +12,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Uni;
 
 public class MailTemplateValidationTest {
 
@@ -38,7 +37,7 @@ static class MailTemplates {
         @Inject
         MailTemplate doesNotExist;
 
-        CompletionStage<Void> send() {
+        Uni<Void> send() {
             return doesNotExist.to("quarkus@quarkus.io").subject("Test").data("name", "Foo").send();
         }
 
diff --git a/extensions/mailer/pom.xml b/extensions/mailer/pom.xml
index bbabcc6154375..bd921d386a735 100644
--- a/extensions/mailer/pom.xml
+++ b/extensions/mailer/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-mailer-parent</artifactId>
diff --git a/extensions/mailer/runtime/pom.xml b/extensions/mailer/runtime/pom.xml
index ec457a062a6f3..adfec922ecff5 100644
--- a/extensions/mailer/runtime/pom.xml
+++ b/extensions/mailer/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-mailer-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-mailer</artifactId>
@@ -32,10 +31,6 @@
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>smallrye-mutiny-vertx-mail-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>smallrye-axle-mail-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.subethamail</groupId>
             <artifactId>subethasmtp</artifactId>
diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/MailTemplate.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/MailTemplate.java
index a849b7c151872..cac9314220909 100644
--- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/MailTemplate.java
+++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/MailTemplate.java
@@ -1,6 +1,8 @@
 package io.quarkus.mailer;
 
-import java.util.concurrent.CompletionStage;
+import java.io.File;
+
+import io.smallrye.mutiny.Uni;
 
 /**
  * Represents an e-mail definition based on a template.
@@ -48,10 +50,11 @@ interface MailTemplateInstance {
 
         MailTemplateInstance bounceAddress(String bounceAddress);
 
-        MailTemplateInstance data(String key, Object value);
+        MailTemplateInstance addInlineAttachment(String name, File file, String contentType, String contentId);
 
-        CompletionStage<Void> send();
+        MailTemplateInstance data(String key, Object value);
 
+        Uni<Void> send();
     }
 
 }
diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java
index c588e8fd00590..12ea98154d397 100644
--- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java
+++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailClientProducer.java
@@ -7,6 +7,7 @@
 
 import org.jboss.logging.Logger;
 
+import io.quarkus.runtime.TlsConfig;
 import io.vertx.core.Vertx;
 import io.vertx.ext.mail.LoginOption;
 import io.vertx.ext.mail.MailClient;
@@ -23,8 +24,8 @@ public class MailClientProducer {
     private final io.vertx.mutiny.ext.mail.MailClient mutinyClient;
     private final MailClient client;
 
-    public MailClientProducer(Vertx vertx, MailConfig config) {
-        this.client = mailClient(vertx, config);
+    public MailClientProducer(Vertx vertx, MailConfig config, TlsConfig tlsConfig) {
+        this.client = mailClient(vertx, config, tlsConfig);
         this.mutinyClient = io.vertx.mutiny.ext.mail.MailClient.newInstance(this.client);
     }
 
@@ -40,37 +41,17 @@ public io.vertx.mutiny.ext.mail.MailClient mutinyClient() {
         return mutinyClient;
     }
 
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.axle.ext.mail.MailClient axleMailClient() {
-        LOGGER.warn(
-                "`io.vertx.axle.ext.mail.MailClient` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.ext.mail.MailClient`");
-        return io.vertx.axle.ext.mail.MailClient.newInstance(client);
-    }
-
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.reactivex.ext.mail.MailClient rxMailClient() {
-        LOGGER.warn(
-                "`io.vertx.reactivex.ext.mail.MailClient` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.ext.mail.MailClient`");
-        return io.vertx.reactivex.ext.mail.MailClient.newInstance(client);
-    }
-
     @PreDestroy
     public void stop() {
         client.close();
     }
 
-    private MailClient mailClient(Vertx vertx, MailConfig config) {
-        io.vertx.ext.mail.MailConfig cfg = toVertxMailConfig(config);
+    private MailClient mailClient(Vertx vertx, MailConfig config, TlsConfig tlsConfig) {
+        io.vertx.ext.mail.MailConfig cfg = toVertxMailConfig(config, tlsConfig);
         return MailClient.createShared(vertx, cfg);
     }
 
-    private io.vertx.ext.mail.MailConfig toVertxMailConfig(MailConfig config) {
+    private io.vertx.ext.mail.MailConfig toVertxMailConfig(MailConfig config, TlsConfig tlsConfig) {
         io.vertx.ext.mail.MailConfig cfg = new io.vertx.ext.mail.MailConfig();
         if (config.authMethods.isPresent()) {
             cfg.setAuthMethods(config.authMethods.get());
@@ -106,7 +87,8 @@ private io.vertx.ext.mail.MailConfig toVertxMailConfig(MailConfig config) {
         if (config.startTLS.isPresent()) {
             cfg.setStarttls(StartTLSOptions.valueOf(config.startTLS.get().toUpperCase()));
         }
-        cfg.setTrustAll(config.trustAll);
+        boolean trustAll = config.trustAll.isPresent() ? config.trustAll.get() : tlsConfig.trustAll;
+        cfg.setTrustAll(trustAll);
         return cfg;
     }
 
diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailConfig.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailConfig.java
index 6a12c598d04d3..d4d31b434518a 100644
--- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailConfig.java
+++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailConfig.java
@@ -65,10 +65,10 @@ public class MailConfig {
 
     /**
      * Set whether to trust all certificates on ssl connect the option is also
-     * applied to {@code STARTTLS} operation. {@code false} by default.
+     * applied to {@code STARTTLS} operation. Disabled by default.
      */
     @ConfigItem
-    public boolean trustAll;
+    public Optional<Boolean> trustAll = Optional.empty();
 
     /**
      * Configures the maximum allowed number of open connections to the mail server
diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateInstanceImpl.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateInstanceImpl.java
index 37b6863d6062e..469a53a9c3ddc 100644
--- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateInstanceImpl.java
+++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MailTemplateInstanceImpl.java
@@ -1,5 +1,6 @@
 package io.quarkus.mailer.runtime;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -78,6 +79,12 @@ public MailTemplateInstance bounceAddress(String bounceAddress) {
         return this;
     }
 
+    @Override
+    public MailTemplateInstance addInlineAttachment(String name, File file, String contentType, String contentId) {
+        this.mail.addInlineAttachment(name, file, contentType, contentId);
+        return this;
+    }
+
     @Override
     public MailTemplateInstance data(String key, Object value) {
         this.data.put(key, value);
@@ -85,14 +92,14 @@ public MailTemplateInstance data(String key, Object value) {
     }
 
     @Override
-    public CompletionStage<Void> send() {
+    public Uni<Void> send() {
         Object variantsAttr = templateInstance.getAttribute(TemplateInstance.VARIANTS);
         if (variantsAttr != null) {
             List<Result> results = new ArrayList<>();
             @SuppressWarnings("unchecked")
             List<Variant> variants = (List<Variant>) variantsAttr;
             for (Variant variant : variants) {
-                if (variant.mediaType.equals(Variant.TEXT_HTML) || variant.mediaType.equals(Variant.TEXT_PLAIN)) {
+                if (variant.getContentType().equals(Variant.TEXT_HTML) || variant.getContentType().equals(Variant.TEXT_PLAIN)) {
                     results.add(new Result(variant,
                             Uni.createFrom().completionStage(
                                     new Supplier<CompletionStage<? extends String>>() {
@@ -108,7 +115,7 @@ public CompletionStage<? extends String> get() {
             if (results.isEmpty()) {
                 throw new IllegalStateException("No suitable template variant found");
             }
-            List<Uni<String>> unis = results.stream().map(Result::getValue).collect(Collectors.toList());
+            List<Uni<String>> unis = results.stream().map(Result::resolve).collect(Collectors.toList());
             return Uni.combine().all().unis(unis)
                     .combinedWith(combine(results))
                     .chain(new Function<Mail, Uni<? extends Void>>() {
@@ -116,8 +123,7 @@ public CompletionStage<? extends String> get() {
                         public Uni<? extends Void> apply(Mail m) {
                             return mailer.send(m);
                         }
-                    })
-                    .subscribeAsCompletionStage();
+                    });
         } else {
             throw new IllegalStateException("No template variant found");
         }
@@ -126,13 +132,14 @@ public Uni<? extends Void> apply(Mail m) {
     private Function<List<?>, Mail> combine(List<Result> results) {
         return new Function<List<?>, Mail>() {
             @Override
-            public Mail apply(List<?> ignored) {
-                for (Result res : results) {
-                    // We can safely access the content here: 1. it has been resolved, 2. it's cached.
-                    String content = res.value.await().indefinitely();
-                    if (res.variant.mediaType.equals(Variant.TEXT_HTML)) {
+            public Mail apply(List<?> resolved) {
+                for (int i = 0; i < resolved.size(); i++) {
+                    Result result = results.get(i);
+                    // We can safely cast, as we know that the results are Strings.
+                    String content = (String) resolved.get(i);
+                    if (result.variant.getContentType().equals(Variant.TEXT_HTML)) {
                         mail.setHtml(content);
-                    } else if (res.variant.mediaType.equals(Variant.TEXT_PLAIN)) {
+                    } else if (result.variant.getContentType().equals(Variant.TEXT_PLAIN)) {
                         mail.setText(content);
                     }
                 }
@@ -148,10 +155,10 @@ static class Result {
 
         public Result(Variant variant, Uni<String> result) {
             this.variant = variant;
-            this.value = result.cache();
+            this.value = result;
         }
 
-        Uni<String> getValue() {
+        Uni<String> resolve() {
             return value;
         }
     }
diff --git a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java
index 213a1594c7073..38aeb241638a1 100644
--- a/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java
+++ b/extensions/mailer/runtime/src/main/java/io/quarkus/mailer/runtime/MutinyMailerImpl.java
@@ -51,7 +51,7 @@ public class MutinyMailerImpl implements ReactiveMailer {
         public Void apply(List<?> results) {
             return null;
         }
-    };;
+    };
 
     @Override
     public Uni<Void> send(Mail... mails) {
diff --git a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/MailTest.java b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/MailTest.java
index 256e5f2274ae9..6a8226dc37074 100644
--- a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/MailTest.java
+++ b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/MailTest.java
@@ -10,12 +10,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import io.smallrye.mutiny.Multi;
-import io.vertx.axle.core.Vertx;
 
 class MailTest {
 
@@ -24,17 +21,6 @@ class MailTest {
     private static final String DESCRIPTION = "my lorem ipsum";
     private static final String TO_ADDRESS = "quarkus@quarkus.io";
     private static final String TEXT_PLAIN = "text/plain";
-    private static Vertx vertx;
-
-    @BeforeAll
-    static void init() {
-        vertx = Vertx.vertx();
-    }
-
-    @AfterAll
-    static void closing() {
-        vertx.close().toCompletableFuture().join();
-    }
 
     @Test
     void testSimpleTextEmail() {
diff --git a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java
index b5add2d0ad9d2..06bf4c4a37e2a 100644
--- a/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java
+++ b/extensions/mailer/runtime/src/test/java/io/quarkus/mailer/runtime/MailerImplTest.java
@@ -25,7 +25,7 @@
 import org.subethamail.wiser.WiserMessage;
 
 import io.quarkus.mailer.Mail;
-import io.reactivex.Flowable;
+import io.smallrye.mutiny.Multi;
 import io.vertx.ext.mail.MailConfig;
 import io.vertx.mutiny.core.Vertx;
 import io.vertx.mutiny.ext.mail.MailClient;
@@ -229,7 +229,7 @@ public Byte next() {
         };
 
         mailer.send(Mail.withText(TO, "Test", "testAttachmentAsStream")
-                .addAttachment("my-file.txt", Flowable.fromIterable(iterable), TEXT_CONTENT_TYPE))
+                .addAttachment("my-file.txt", Multi.createFrom().iterable(iterable), TEXT_CONTENT_TYPE))
                 .await().indefinitely();
         assertThat(wiser.getMessages()).hasSize(1);
         WiserMessage actual = wiser.getMessages().get(0);
@@ -260,7 +260,7 @@ public Byte next() {
         };
 
         legacyMailer.send(Mail.withText(TO, "Test", "testAttachmentAsStream")
-                .addAttachment("my-file.txt", Flowable.fromIterable(iterable), TEXT_CONTENT_TYPE))
+                .addAttachment("my-file.txt", Multi.createFrom().iterable(iterable), TEXT_CONTENT_TYPE))
                 .toCompletableFuture().join();
         assertThat(wiser.getMessages()).hasSize(1);
         WiserMessage actual = wiser.getMessages().get(0);
diff --git a/extensions/micrometer-registry-prometheus/deployment/pom.xml b/extensions/micrometer-registry-prometheus/deployment/pom.xml
new file mode 100644
index 0000000000000..564787cd0eea2
--- /dev/null
+++ b/extensions/micrometer-registry-prometheus/deployment/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-micrometer-registry-prometheus-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+    <name>Quarkus - Micrometer Registry - Prometheus Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <quarkus.log.level>INFO</quarkus.log.level>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/micrometer-registry-prometheus/pom.xml b/extensions/micrometer-registry-prometheus/pom.xml
new file mode 100644
index 0000000000000..0b3263e876931
--- /dev/null
+++ b/extensions/micrometer-registry-prometheus/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <!-- This is a simple extension that enables required dependencies:
+         Micrometer Extension AND the Micrometer Prometheus Registry library. -->
+
+    <artifactId>quarkus-micrometer-registry-prometheus-parent</artifactId>
+    <name>Quarkus - Micrometer Registry - Prometheus - Parent</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/extensions/micrometer-registry-prometheus/runtime/pom.xml b/extensions/micrometer-registry-prometheus/runtime/pom.xml
new file mode 100644
index 0000000000000..a50b11092e6cb
--- /dev/null
+++ b/extensions/micrometer-registry-prometheus/runtime/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-micrometer-registry-prometheus-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+    <name>Quarkus - Micrometer Registry - Prometheus Runtime</name>
+    <description>Enable Prometheus support for Micrometer</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/micrometer-registry-prometheus/runtime/src/main/resources/quarkus-extension.yaml b/extensions/micrometer-registry-prometheus/runtime/src/main/resources/quarkus-extension.yaml
new file mode 100644
index 0000000000000..2ddbe307c0e55
--- /dev/null
+++ b/extensions/micrometer-registry-prometheus/runtime/src/main/resources/quarkus-extension.yaml
@@ -0,0 +1,12 @@
+name: "Micrometer registry: Prometheus"
+metadata:
+  keywords:
+  - "micrometer"
+  - "metrics"
+  - "metric"
+  - "prometheus"
+  - "monitoring"
+  guide: "https://quarkus.io/guides/micrometer-metrics"
+  categories:
+  - "observability"
+  status: "stable"
diff --git a/extensions/micrometer/deployment/pom.xml b/extensions/micrometer/deployment/pom.xml
new file mode 100644
index 0000000000000..0015afe491e43
--- /dev/null
+++ b/extensions/micrometer/deployment/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-micrometer-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-micrometer-deployment</artifactId>
+    <name>Quarkus - Micrometer - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-common-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+        </dependency>
+
+        <!-- test -->
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <quarkus.log.level>INFO</quarkus.log.level>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerProcessor.java
new file mode 100644
index 0000000000000..aeb2e8fae7c49
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerProcessor.java
@@ -0,0 +1,334 @@
+package io.quarkus.micrometer.deployment;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.BooleanSupplier;
+
+import javax.inject.Singleton;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+import io.micrometer.core.annotation.Counted;
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.MeterBinder;
+import io.micrometer.core.instrument.config.MeterFilter;
+import io.micrometer.core.instrument.config.NamingConvention;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem;
+import io.quarkus.micrometer.deployment.export.PrometheusRegistryProcessor;
+import io.quarkus.micrometer.runtime.ClockProvider;
+import io.quarkus.micrometer.runtime.CompositeRegistryCreator;
+import io.quarkus.micrometer.runtime.MeterFilterConstraint;
+import io.quarkus.micrometer.runtime.MeterFilterConstraints;
+import io.quarkus.micrometer.runtime.MicrometerCounted;
+import io.quarkus.micrometer.runtime.MicrometerCountedInterceptor;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+import io.quarkus.micrometer.runtime.MicrometerTimed;
+import io.quarkus.micrometer.runtime.MicrometerTimedInterceptor;
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.HttpClientConfig;
+import io.quarkus.micrometer.runtime.config.runtime.HttpServerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.metrics.MetricsFactory;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+
+public class MicrometerProcessor {
+    private static final DotName METER_REGISTRY = DotName.createSimple(MeterRegistry.class.getName());
+    private static final DotName METER_BINDER = DotName.createSimple(MeterBinder.class.getName());
+    private static final DotName METER_FILTER = DotName.createSimple(MeterFilter.class.getName());
+    private static final DotName NAMING_CONVENTION = DotName.createSimple(NamingConvention.class.getName());
+
+    private static final DotName COUNTED_ANNOTATION = DotName.createSimple(Counted.class.getName());
+    private static final DotName COUNTED_BINDING = DotName.createSimple(MicrometerCounted.class.getName());
+    private static final DotName COUNTED_INTERCEPTOR = DotName.createSimple(MicrometerCountedInterceptor.class.getName());
+    private static final DotName TIMED_ANNOTATION = DotName.createSimple(Timed.class.getName());
+    private static final DotName TIMED_BINDING = DotName.createSimple(MicrometerTimed.class.getName());
+    private static final DotName TIMED_INTERCEPTOR = DotName.createSimple(MicrometerTimedInterceptor.class.getName());
+
+    static class MicrometerEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return mConfig.enabled;
+        }
+    }
+
+    public static class HttpBinderEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpServer) ||
+                    mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpClient);
+        }
+    }
+
+    public static class HttpServerBinderEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpServer);
+        }
+    }
+
+    public static class HttpClientBinderEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpClient);
+        }
+    }
+
+    MicrometerConfig mConfig;
+
+    @BuildStep(onlyIf = MicrometerEnabled.class)
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.MICROMETER);
+    }
+
+    @BuildStep(onlyIf = MicrometerEnabled.class, onlyIfNot = PrometheusRegistryProcessor.PrometheusEnabled.class)
+    MetricsCapabilityBuildItem metricsCapabilityBuildItem() {
+        return new MetricsCapabilityBuildItem(MetricsFactory.MICROMETER::equals,
+                null);
+    }
+
+    @BuildStep(onlyIf = { MicrometerEnabled.class, PrometheusRegistryProcessor.PrometheusEnabled.class })
+    MetricsCapabilityBuildItem metricsCapabilityPrometheusBuildItem(
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
+        return new MetricsCapabilityBuildItem(MetricsFactory.MICROMETER::equals,
+                nonApplicationRootPathBuildItem.resolvePath(mConfig.export.prometheus.path));
+    }
+
+    @BuildStep(onlyIf = MicrometerEnabled.class)
+    UnremovableBeanBuildItem registerAdditionalBeans(CombinedIndexBuildItem indexBuildItem,
+            BuildProducer<MicrometerRegistryProviderBuildItem> providerClasses,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+
+        // Create and keep some basic Providers
+        additionalBeans.produce(AdditionalBeanBuildItem.builder()
+                .setUnremovable()
+                .addBeanClass(ClockProvider.class)
+                .addBeanClass(CompositeRegistryCreator.class)
+                .build());
+
+        // Add annotations and associated interceptors
+        additionalBeans.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(MeterFilterConstraint.class)
+                .addBeanClass(MeterFilterConstraints.class)
+                .addBeanClass(TIMED_ANNOTATION.toString())
+                .addBeanClass(TIMED_BINDING.toString())
+                .addBeanClass(TIMED_INTERCEPTOR.toString())
+                .addBeanClass(COUNTED_ANNOTATION.toString())
+                .addBeanClass(COUNTED_BINDING.toString())
+                .addBeanClass(COUNTED_INTERCEPTOR.toString())
+                .build());
+
+        IndexView index = indexBuildItem.getIndex();
+
+        // Find classes that define MeterRegistries, MeterBinders, and MeterFilters
+        Collection<String> knownRegistries = new HashSet<>();
+        collectNames(index.getAllKnownSubclasses(METER_REGISTRY), knownRegistries);
+
+        Collection<String> knownClasses = new HashSet<>();
+        knownClasses.add(METER_BINDER.toString());
+        collectNames(index.getAllKnownImplementors(METER_BINDER), knownClasses);
+        knownClasses.add(METER_FILTER.toString());
+        collectNames(index.getAllKnownImplementors(METER_FILTER), knownClasses);
+        knownClasses.add(NAMING_CONVENTION.toString());
+        collectNames(index.getAllKnownImplementors(NAMING_CONVENTION), knownClasses);
+
+        Set<String> keepMe = new HashSet<>();
+
+        // Find and keep _producers_ of those MeterRegistries, MeterBinders, and
+        // MeterFilters
+        for (AnnotationInstance annotation : index.getAnnotations(DotNames.PRODUCES)) {
+            AnnotationTarget target = annotation.target();
+            switch (target.kind()) {
+                case METHOD:
+                    MethodInfo method = target.asMethod();
+                    String returnType = method.returnType().name().toString();
+                    if (knownRegistries.contains(returnType)) {
+                        providerClasses.produce(new MicrometerRegistryProviderBuildItem(returnType));
+                        keepMe.add(method.declaringClass().name().toString());
+                    } else if (knownClasses.contains(returnType)) {
+                        keepMe.add(method.declaringClass().name().toString());
+                    }
+                    break;
+                case FIELD:
+                    FieldInfo field = target.asField();
+                    String fieldType = field.type().name().toString();
+                    if (knownRegistries.contains(fieldType)) {
+                        providerClasses.produce(new MicrometerRegistryProviderBuildItem(fieldType));
+                        keepMe.add(field.declaringClass().name().toString());
+                    } else if (knownClasses.contains(fieldType)) {
+                        keepMe.add(field.declaringClass().name().toString());
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        reflectiveClasses.produce(createReflectiveBuildItem(COUNTED_ANNOTATION, index));
+        reflectiveClasses.produce(createReflectiveBuildItem(TIMED_ANNOTATION, index));
+        reflectiveClasses.produce(ReflectiveClassBuildItem
+                .builder("org.HdrHistogram.Histogram",
+                        "org.HdrHistogram.DoubleHistogram",
+                        "org.HdrHistogram.ConcurrentHistogram")
+                .constructors(true).build());
+
+        return new UnremovableBeanBuildItem(new UnremovableBeanBuildItem.BeanClassNamesExclusion(keepMe));
+    }
+
+    void collectNames(Collection<ClassInfo> classes, Collection<String> names) {
+        for (ClassInfo info : classes) {
+            names.add(info.name().toString());
+        }
+    }
+
+    @BuildStep(onlyIf = MicrometerEnabled.class)
+    void processAnnotatedMetrics(BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformers) {
+        annotationsTransformers.produce(createAnnotationTransformer(COUNTED_ANNOTATION, COUNTED_BINDING));
+        annotationsTransformers.produce(createAnnotationTransformer(TIMED_ANNOTATION, TIMED_BINDING));
+    }
+
+    @BuildStep(onlyIf = { MicrometerEnabled.class })
+    @Record(ExecutionTime.RUNTIME_INIT)
+    SyntheticBeanBuildItem enableHttpBinders(MicrometerRecorder recorder,
+            HttpServerConfig serverConfig,
+            HttpClientConfig clientConfig,
+            VertxConfig vertxConfig) {
+        return SyntheticBeanBuildItem
+                .configure(HttpBinderConfiguration.class)
+                .scope(Singleton.class)
+                .setRuntimeInit()
+                .unremovable()
+                .runtimeValue(recorder.configureHttpMetrics(
+                        mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpServer),
+                        mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpClient),
+                        serverConfig, clientConfig, vertxConfig))
+                .done();
+    }
+
+    @BuildStep(onlyIf = MicrometerEnabled.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    RootMeterRegistryBuildItem createRootRegistry(MicrometerRecorder recorder,
+            MicrometerConfig config,
+            BeanContainerBuildItem beanContainerBuildItem) {
+        // BeanContainerBuildItem is present to indicate we call this after Arc is initialized
+
+        RuntimeValue<MeterRegistry> registry = recorder.createRootRegistry(config);
+        return new RootMeterRegistryBuildItem(registry);
+    }
+
+    @BuildStep(onlyIf = MicrometerEnabled.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    void registerExtensionMetrics(MicrometerRecorder recorder,
+            RootMeterRegistryBuildItem rootMeterRegistryBuildItem,
+            List<MetricsFactoryConsumerBuildItem> metricsFactoryConsumerBuildItems) {
+        // RootMeterRegistryBuildItem is present to indicate we call this after the root registry has been initialized
+
+        for (MetricsFactoryConsumerBuildItem item : metricsFactoryConsumerBuildItems) {
+            if (item.executionTime() == ExecutionTime.STATIC_INIT) {
+                recorder.registerMetrics(item.getConsumer());
+            }
+        }
+    }
+
+    @BuildStep(onlyIf = MicrometerEnabled.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void configureRegistry(MicrometerRecorder recorder,
+            MicrometerConfig config,
+            RootMeterRegistryBuildItem rootMeterRegistryBuildItem,
+            List<MicrometerRegistryProviderBuildItem> providerClassItems,
+            List<MetricsFactoryConsumerBuildItem> metricsFactoryConsumerBuildItems,
+            List<MicrometerRegistryProviderBuildItem> providerClasses,
+            ShutdownContextBuildItem shutdownContextBuildItem) {
+        // RootMeterRegistryBuildItem is present to indicate we call this after the root registry has been initialized
+
+        Set<Class<? extends MeterRegistry>> typeClasses = new HashSet<>();
+        for (MicrometerRegistryProviderBuildItem item : providerClassItems) {
+            typeClasses.add(item.getRegistryClass());
+        }
+
+        // Runtime config at play here: host+port, API keys, etc.
+        recorder.configureRegistries(config, typeClasses, shutdownContextBuildItem);
+
+        for (MetricsFactoryConsumerBuildItem item : metricsFactoryConsumerBuildItems) {
+            if (item.executionTime() == ExecutionTime.RUNTIME_INIT) {
+                recorder.registerMetrics(item.getConsumer());
+            }
+        }
+    }
+
+    public static AnnotationInstance findAnnotation(Collection<AnnotationInstance> annotations, DotName annotationClass) {
+        for (AnnotationInstance a : annotations) {
+            if (annotationClass.equals(a.name())) {
+                return a;
+            }
+        }
+        return null;
+    }
+
+    ReflectiveClassBuildItem createReflectiveBuildItem(DotName sourceAnnotation, IndexView index) {
+        Set<String> classes = new HashSet<>();
+
+        for (AnnotationInstance annotation : index.getAnnotations(sourceAnnotation)) {
+            AnnotationTarget target = annotation.target();
+            switch (target.kind()) {
+                case METHOD:
+                    MethodInfo method = target.asMethod();
+                    classes.add(method.declaringClass().name().toString());
+                    break;
+                case TYPE:
+                    classes.add(target.asClass().name().toString());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return ReflectiveClassBuildItem.builder(classes.toArray(new String[0])).build();
+    }
+
+    AnnotationsTransformerBuildItem createAnnotationTransformer(DotName sourceAnnotation, DotName bindingAnnotation) {
+        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
+            @Override
+            public void transform(TransformationContext ctx) {
+                final Collection<AnnotationInstance> annotations = ctx.getAnnotations();
+                AnnotationInstance annotation = MicrometerProcessor.findAnnotation(annotations, sourceAnnotation);
+                if (annotation == null) {
+                    return;
+                }
+                ctx.transform().add(bindingAnnotation).done();
+            }
+        });
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerRegistryProviderBuildItem.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerRegistryProviderBuildItem.java
new file mode 100644
index 0000000000000..a5bddb2ae5b7d
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerRegistryProviderBuildItem.java
@@ -0,0 +1,30 @@
+package io.quarkus.micrometer.deployment;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+
+@SuppressWarnings("unchecked")
+public final class MicrometerRegistryProviderBuildItem extends MultiBuildItem {
+
+    final Class<? extends MeterRegistry> clazz;
+
+    public MicrometerRegistryProviderBuildItem(Class<?> providedRegistryClass) {
+        this.clazz = (Class<? extends MeterRegistry>) providedRegistryClass;
+    }
+
+    public MicrometerRegistryProviderBuildItem(String registryClassName) {
+        this.clazz = (Class<? extends MeterRegistry>) MicrometerRecorder.getClassForName(registryClassName);
+    }
+
+    public Class<? extends MeterRegistry> getRegistryClass() {
+        return clazz;
+    }
+
+    @Override
+    public String toString() {
+        return "MicrometerRegistryProviderBuildItem{"
+                + clazz
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/RootMeterRegistryBuildItem.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/RootMeterRegistryBuildItem.java
new file mode 100644
index 0000000000000..d8fd69177a335
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/RootMeterRegistryBuildItem.java
@@ -0,0 +1,17 @@
+package io.quarkus.micrometer.deployment;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+
+public final class RootMeterRegistryBuildItem extends SimpleBuildItem {
+    private final RuntimeValue<MeterRegistry> value;
+
+    public RootMeterRegistryBuildItem(RuntimeValue<MeterRegistry> value) {
+        this.value = value;
+    }
+
+    public RuntimeValue<MeterRegistry> getValue() {
+        return value;
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/KafkaBinderProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/KafkaBinderProcessor.java
new file mode 100644
index 0000000000000..34e16a373375d
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/KafkaBinderProcessor.java
@@ -0,0 +1,55 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+
+/**
+ * Add support for Kafka Producer, Consumer and Streams instrumentation. Note that
+ * various bits of support may not be present at deploy time. Avoid referencing
+ * classes that in turn import optional dependencies.
+ */
+public class KafkaBinderProcessor {
+    static final String KAFKA_CONSUMER_CLASS_NAME = "org.apache.kafka.clients.consumer.Consumer";
+    static final Class<?> KAFKA_CONSUMER_CLASS_CLASS = MicrometerRecorder.getClassForName(KAFKA_CONSUMER_CLASS_NAME);
+
+    static final String KAFKA_STREAMS_CLASS_NAME = "org.apache.kafka.streams.KafkaStreams";
+    static final Class<?> KAFKA_STREAMS_CLASS_CLASS = MicrometerRecorder.getClassForName(KAFKA_STREAMS_CLASS_NAME);
+
+    static final String KAFKA_EVENT_CONSUMER_CLASS_NAME = "io.quarkus.micrometer.runtime.binder.kafka.KafkaEventObserver";
+
+    static final String KAFKA_STREAMS_METRICS_PRODUCER_CLASS_NAME = "io.quarkus.micrometer.runtime.binder.kafka.KafkaStreamsEventObserver";
+
+    static class KafkaSupportEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return KAFKA_CONSUMER_CLASS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder.kafka);
+        }
+    }
+
+    static class KafkaStreamsSupportEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return KAFKA_STREAMS_CLASS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder.kafka);
+        }
+    }
+
+    @BuildStep(onlyIf = KafkaSupportEnabled.class)
+    AdditionalBeanBuildItem createCDIEventConsumer() {
+        return AdditionalBeanBuildItem.builder()
+                .addBeanClass(KAFKA_EVENT_CONSUMER_CLASS_NAME)
+                .setUnremovable().build();
+    }
+
+    @BuildStep(onlyIf = KafkaStreamsSupportEnabled.class)
+    AdditionalBeanBuildItem createKafkaStreamsEventObserver() {
+        return AdditionalBeanBuildItem.builder()
+                .addBeanClass(KAFKA_STREAMS_METRICS_PRODUCER_CLASS_NAME)
+                .setUnremovable().build();
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/RestClientProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/RestClientProcessor.java
new file mode 100644
index 0000000000000..6b7ac60fa4336
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/RestClientProcessor.java
@@ -0,0 +1,45 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.micrometer.deployment.MicrometerProcessor;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+
+public class RestClientProcessor {
+    // Avoid referencing optional dependencies
+
+    // Rest client listener SPI
+    private static final String REST_CLIENT_LISTENER_CLASS_NAME = "org.eclipse.microprofile.rest.client.spi.RestClientListener";
+    private static final Class<?> REST_CLIENT_LISTENER_CLASS = MicrometerRecorder
+            .getClassForName(REST_CLIENT_LISTENER_CLASS_NAME);
+
+    // Rest Client listener
+    private static final String REST_CLIENT_METRICS_LISTENER = "io.quarkus.micrometer.runtime.binder.RestClientMetrics";
+    // Http Client runtime config (injected programmatically)
+    private static final String REST_CLIENT_HTTP_CONFIG = "io.quarkus.micrometer.runtime.config.runtime.HttpClientConfig";
+
+    static class RestClientEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return REST_CLIENT_LISTENER_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder.httpClient);
+        }
+    }
+
+    @BuildStep(onlyIf = { RestClientEnabled.class, MicrometerProcessor.HttpClientBinderEnabled.class })
+    UnremovableBeanBuildItem registerRestClientListener(BuildProducer<NativeImageResourceBuildItem> resource,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        resource.produce(new NativeImageResourceBuildItem(
+                "META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener"));
+        reflectiveClass
+                .produce(new ReflectiveClassBuildItem(true, true, REST_CLIENT_METRICS_LISTENER));
+
+        return new UnremovableBeanBuildItem(new UnremovableBeanBuildItem.BeanClassNameExclusion(REST_CLIENT_HTTP_CONFIG));
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java
new file mode 100644
index 0000000000000..269b1ff72b8e1
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java
@@ -0,0 +1,99 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import java.util.function.BooleanSupplier;
+
+import javax.interceptor.Interceptor;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.micrometer.deployment.MicrometerProcessor;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter;
+import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderRecorder;
+import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterFilter;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.reactive.spi.CustomContainerRequestFilterBuildItem;
+import io.quarkus.vertx.core.deployment.VertxOptionsConsumerBuildItem;
+import io.quarkus.vertx.http.deployment.FilterBuildItem;
+
+/**
+ * Add support for the Vert.x and other http instrumentation.
+ * Note that various bits of support may not be present at deploy time,
+ * e.g. Vert.x can be present while resteasy is not.
+ * 
+ * Avoid referencing classes that in turn import optional dependencies.
+ */
+public class VertxBinderProcessor {
+    static final String METRIC_OPTIONS_CLASS_NAME = "io.vertx.core.metrics.MetricsOptions";
+    static final Class<?> METRIC_OPTIONS_CLASS = MicrometerRecorder.getClassForName(METRIC_OPTIONS_CLASS_NAME);
+
+    static class VertxBinderEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return METRIC_OPTIONS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder.vertx);
+        }
+    }
+
+    // avoid imports due to related deps not being there
+    static final String RESTEASY_CONTAINER_FILTER_CLASS_NAME = "io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderRestEasyContainerFilter";
+    static final String QUARKUS_REST_CONTAINER_FILTER_CLASS_NAME = "io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderQuarkusRestContainerFilter";
+
+    @BuildStep(onlyIf = { VertxBinderEnabled.class, MicrometerProcessor.HttpServerBinderEnabled.class })
+    void enableJaxRsSupport(Capabilities capabilities,
+            BuildProducer<ResteasyJaxrsProviderBuildItem> resteasyJaxrsProviders,
+            BuildProducer<CustomContainerRequestFilterBuildItem> customContainerRequestFilter,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+
+        if (capabilities.isPresent(Capability.RESTEASY)) {
+            resteasyJaxrsProviders.produce(new ResteasyJaxrsProviderBuildItem(RESTEASY_CONTAINER_FILTER_CLASS_NAME));
+            turnVertxBinderFilterIntoBean(additionalBeans, RESTEASY_CONTAINER_FILTER_CLASS_NAME);
+        } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
+            customContainerRequestFilter
+                    .produce(new CustomContainerRequestFilterBuildItem(QUARKUS_REST_CONTAINER_FILTER_CLASS_NAME));
+            turnVertxBinderFilterIntoBean(additionalBeans, QUARKUS_REST_CONTAINER_FILTER_CLASS_NAME);
+        }
+    }
+
+    private void turnVertxBinderFilterIntoBean(BuildProducer<AdditionalBeanBuildItem> additionalBeans, String className) {
+        additionalBeans.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(className)
+                .setUnremovable().build());
+    }
+
+    @BuildStep(onlyIf = VertxBinderEnabled.class)
+    AdditionalBeanBuildItem createVertxAdapters() {
+        // Add Vertx meter adapters
+        return AdditionalBeanBuildItem.builder()
+                .addBeanClass(VertxMeterBinderAdapter.class)
+                .setUnremovable().build();
+    }
+
+    @BuildStep(onlyIf = { VertxBinderEnabled.class, MicrometerProcessor.HttpServerBinderEnabled.class })
+    FilterBuildItem addVertxMeterFilter() {
+        return new FilterBuildItem(new VertxMeterFilter(), Integer.MAX_VALUE);
+    }
+
+    @BuildStep(onlyIf = VertxBinderEnabled.class)
+    @Record(value = ExecutionTime.STATIC_INIT)
+    VertxOptionsConsumerBuildItem build(VertxMeterBinderRecorder recorder) {
+        return new VertxOptionsConsumerBuildItem(recorder.configureMetricsAdapter(), Interceptor.Priority.LIBRARY_AFTER);
+    }
+
+    @BuildStep(onlyIf = VertxBinderEnabled.class)
+    @Record(value = ExecutionTime.RUNTIME_INIT)
+    @Consume(SyntheticBeansRuntimeInitBuildItem.class)
+    void setVertxConfig(VertxMeterBinderRecorder recorder,
+            VertxConfig config) {
+        recorder.setVertxConfig(config);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java
new file mode 100644
index 0000000000000..bd4490c904b2d
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/AnnotationHandler.java
@@ -0,0 +1,120 @@
+package io.quarkus.micrometer.deployment.binder.mpmetrics;
+
+import java.util.Collection;
+
+import org.jboss.jandex.*;
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.micrometer.deployment.MicrometerProcessor;
+
+/**
+ * Create beans to handle MP Metrics API annotations.
+ *
+ * It is ok to import and use classes that reference MP Metrics classes.
+ */
+public class AnnotationHandler {
+    private static final Logger log = Logger.getLogger(AnnotationHandler.class);
+
+    static AnnotationsTransformerBuildItem transformAnnotations(final IndexView index, DotName meterAnnotation) {
+        return transformAnnotations(index, meterAnnotation, meterAnnotation);
+    }
+
+    static AnnotationsTransformerBuildItem transformAnnotations(final IndexView index,
+            DotName sourceAnnotation, DotName targetAnnotation) {
+        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
+            @Override
+            public void transform(TransformationContext ctx) {
+                final Collection<AnnotationInstance> annotations = ctx.getAnnotations();
+                AnnotationInstance annotation = MicrometerProcessor.findAnnotation(annotations, sourceAnnotation);
+                if (annotation == null) {
+                    return;
+                }
+                AnnotationTarget target = ctx.getTarget();
+
+                ClassInfo classInfo = null;
+                MethodInfo methodInfo = null;
+                FieldInfo fieldInfo = null;
+                if (ctx.isMethod()) {
+                    methodInfo = target.asMethod();
+                    classInfo = methodInfo.declaringClass();
+                } else if (ctx.isField()) {
+                    fieldInfo = target.asField();
+                    classInfo = fieldInfo.declaringClass();
+                } else if (ctx.isClass()) {
+                    classInfo = target.asClass();
+                    // skip @Interceptor
+                    if (target.asClass().classAnnotation(DotNames.INTERCEPTOR) != null) {
+                        return;
+                    }
+                }
+
+                // Remove the @Counted annotation when both @Counted & @Timed/SimplyTimed
+                // Ignore @Metric with @Produces
+                if (removeCountedWhenTimed(sourceAnnotation, target, classInfo, methodInfo) ||
+                        removeMetricWhenProduces(sourceAnnotation, target, methodInfo, fieldInfo)) {
+                    ctx.transform()
+                            .remove(x -> x == annotation)
+                            .done();
+                    return;
+                }
+
+                // Make sure all attributes exist:
+                MetricAnnotationInfo annotationInfo = new MetricAnnotationInfo(annotation, index,
+                        classInfo, methodInfo, fieldInfo);
+
+                // Remove the existing annotation, and add a new one with all the fields
+                ctx.transform()
+                        .remove(x -> x == annotation)
+                        .add(targetAnnotation, annotationInfo.getAnnotationValues())
+                        .done();
+            }
+        });
+    }
+
+    static boolean removeCountedWhenTimed(DotName sourceAnnotation, AnnotationTarget target, ClassInfo classInfo,
+            MethodInfo methodInfo) {
+        if (MetricDotNames.COUNTED_ANNOTATION.equals(sourceAnnotation)) {
+            if (methodInfo == null) {
+                if (MicrometerProcessor.findAnnotation(classInfo.classAnnotations(), MetricDotNames.TIMED_ANNOTATION) == null &&
+                        MicrometerProcessor.findAnnotation(classInfo.classAnnotations(),
+                                MetricDotNames.SIMPLY_TIMED_ANNOTATION) == null) {
+                    return false;
+                }
+                log.warnf("Bean %s is both counted and timed. The @Counted annotation " +
+                        "will be suppressed in favor of the count emitted by the timer.",
+                        classInfo.name().toString());
+                return true;
+            } else {
+                if (!methodInfo.hasAnnotation(MetricDotNames.SIMPLY_TIMED_ANNOTATION) &&
+                        !methodInfo.hasAnnotation(MetricDotNames.TIMED_ANNOTATION)) {
+                    return false;
+                }
+                log.warnf("Method %s of bean %s is both counted and timed. The @Counted " +
+                        "annotation will be suppressed in favor of the count emitted by the timer.",
+                        methodInfo.name(),
+                        classInfo.name().toString());
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean removeMetricWhenProduces(DotName sourceAnnotation,
+            AnnotationTarget target, MethodInfo methodInfo, FieldInfo fieldInfo) {
+        if (MetricDotNames.METRIC_ANNOTATION.equals(sourceAnnotation)) {
+            if ((methodInfo != null && !methodInfo.hasAnnotation(DotNames.PRODUCES)) ||
+                    (fieldInfo != null && !fieldInfo.hasAnnotation(DotNames.PRODUCES))) {
+                return false;
+            }
+            log.errorf("A declared bean uses the @Metric annotation with a @Producer " +
+                    "field or method, which is not compatible with micrometer support. " +
+                    "The annotation target will be ignored. (%s - %s)", target, System.identityHashCode(target));
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java
new file mode 100644
index 0000000000000..0734d09f56342
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/GaugeAnnotationHandler.java
@@ -0,0 +1,184 @@
+package io.quarkus.micrometer.deployment.binder.mpmetrics;
+
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.logging.Logger;
+
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.micrometer.runtime.binder.mpmetrics.AnnotatedGaugeAdapter;
+
+/**
+ * Create beans to handle <code>@Gauge</code> annotations.
+ * This is a static utility class, it stores no state. It is ok to import and use
+ * classes that reference MP Metrics classes.
+ */
+public class GaugeAnnotationHandler {
+    private static final Logger log = Logger.getLogger(GaugeAnnotationHandler.class);
+
+    static void processAnnotatedGauges(IndexView index, ClassOutput classOutput) {
+
+        Set<String> createdClasses = new HashSet<>();
+
+        // @Gauge applies to methods
+        // It creates a callback the method or field on single object instance
+        for (AnnotationInstance annotation : index.getAnnotations(MetricDotNames.GAUGE_ANNOTATION)) {
+            AnnotationTarget target = annotation.target();
+            MethodInfo methodInfo = target.asMethod();
+            ClassInfo classInfo = methodInfo.declaringClass();
+
+            // Annotated Gauges can only be used on single-instance beans
+            verifyGaugeScope(target, classInfo);
+
+            // Create a GaugeAdapter bean that uses the instance of the bean and invokes the callback
+            final String generatedClassName = classInfo.name().toString() + "_GaugeAdapter";
+            if (createdClasses.add(generatedClassName)) {
+                createClass(index, classOutput, generatedClassName, annotation, target, classInfo, methodInfo);
+            }
+        }
+    }
+
+    /**
+     * Given this Widget class:
+     *
+     * <pre>
+     * public class Widget  {
+     *     private LongAccumulator highestValue = new LongAccumulator(Long::max, 0);
+     *
+     *     // ... some other things that change the value in the accumulator ...
+     *
+     *     &#64;Gauge(name = "highestValue", unit = MetricUnits.NONE, description = "Highest observed value.")
+     *     public Long highestValue() {
+     *         return highestValue.get();
+     *     }
+     * }
+     * <pre>
+     *
+     * This method will generate a GaugeAdapter to call the annotated method:
+     *
+     * <pre>
+     * public class Widget_GaugeAdapter extends GaugeAdapter.GaugeAdapterImpl implements GaugeAdapter {
+     *
+     *     &#64;Inject
+     *     Widget target;
+     *
+     *     public Widget_GaugeAdapter() {
+     *         // name, description, and tags are created from annotation attributes
+     *         // init is a method on the superclass
+     *         super(name, description, tags);
+     *     }
+     *
+     *     Number getValue() {
+     *         return target.highestValue;
+     *     }
+     *
+     *     Object getValue() {
+     *         return getValue();
+     *     }
+     * }
+     * </pre>
+     */
+    static void createClass(IndexView index, ClassOutput classOutput, String generatedClassName,
+            AnnotationInstance annotation, AnnotationTarget target,
+            ClassInfo classInfo, MethodInfo methodInfo) {
+        final Class<?> gaugeAdapter = AnnotatedGaugeAdapter.class;
+        final Class<?> gaugeAdapterImpl = AnnotatedGaugeAdapter.GaugeAdapterImpl.class;
+
+        final MethodDescriptor superInit = MethodDescriptor.ofConstructor(gaugeAdapterImpl,
+                String.class, String.class, String.class, String[].class);
+
+        final MethodDescriptor superInitUnit = MethodDescriptor.ofConstructor(gaugeAdapterImpl,
+                String.class, String.class, String.class, String.class, String[].class);
+
+        try (ClassCreator classCreator = ClassCreator.builder().classOutput(classOutput)
+                .className(generatedClassName)
+                .superClass(gaugeAdapterImpl)
+                .interfaces(gaugeAdapter)
+                .build()) {
+            if (classInfo.annotations().containsKey("Singleton")) {
+                classCreator.addAnnotation(Singleton.class);
+            } else {
+                classCreator.addAnnotation(ApplicationScoped.class);
+            }
+            MetricAnnotationInfo gaugeInfo = new MetricAnnotationInfo(annotation, index, classInfo, methodInfo, null);
+
+            FieldCreator fieldCreator = classCreator
+                    .getFieldCreator("target", classInfo.name().toString())
+                    .setModifiers(0); // package private
+            fieldCreator.addAnnotation(Inject.class);
+
+            // Create the constructor
+            try (MethodCreator mc = classCreator.getMethodCreator("<init>", void.class)) {
+                mc.setModifiers(Modifier.PUBLIC);
+
+                ResultHandle tagsHandle = mc.newArray(String.class, gaugeInfo.tags.length);
+                for (int i = 0; i < gaugeInfo.tags.length; i++) {
+                    mc.writeArrayValue(tagsHandle, i, mc.load(gaugeInfo.tags[i]));
+                }
+
+                if (gaugeInfo.unit == null) {
+                    // super(name, description, targetName, tags)
+                    mc.invokeSpecialMethod(superInit, mc.getThis(),
+                            mc.load(gaugeInfo.name),
+                            mc.load(gaugeInfo.description),
+                            mc.load(methodInfo.toString()),
+                            tagsHandle);
+                } else {
+                    // super(name, description, targetName. unit, tags)
+                    mc.invokeSpecialMethod(superInitUnit, mc.getThis(),
+                            mc.load(gaugeInfo.name),
+                            mc.load(gaugeInfo.description),
+                            mc.load(methodInfo.toString()),
+                            mc.load(gaugeInfo.unit),
+                            tagsHandle);
+                }
+                mc.returnValue(null);
+            }
+
+            // This is the magic: this is the method that forwards to the target object instance
+            MethodDescriptor getNumberValue = null;
+            try (MethodCreator mc = classCreator.getMethodCreator("getValue", Number.class)) {
+                mc.setModifiers(Modifier.PUBLIC);
+                ResultHandle targetInstance = mc.readInstanceField(fieldCreator.getFieldDescriptor(), mc.getThis());
+                mc.returnValue(mc.invokeVirtualMethod(target.asMethod(), targetInstance));
+                getNumberValue = mc.getMethodDescriptor();
+            }
+
+            // This is the unresolved-generic form of this argument (from the original templated interface)
+            try (MethodCreator generic = classCreator.getMethodCreator("getValue", Object.class)) {
+                generic.setModifiers(Modifier.PUBLIC);
+                generic.returnValue(generic.invokeVirtualMethod(getNumberValue, generic.getThis()));
+                generic.getMethodDescriptor();
+            }
+        }
+    }
+
+    static private void verifyGaugeScope(AnnotationTarget target, ClassInfo classInfo) {
+        if (!MetricDotNames.isSingleInstance(classInfo)) {
+            log.errorf("Bean %s declares a org.eclipse.microprofile.metrics.annotation.Gauge " +
+                    "but is of a scope that may create multiple instances of a bean. " +
+                    "@Gauge annotations establish a callback to a single instance. Only use " +
+                    "the @Gauge annotation on @ApplicationScoped or @Singleton beans, " +
+                    "or in JAX-RS endpoints.",
+                    classInfo.name().toString());
+            throw new DeploymentException(classInfo.name().toString() +
+                    " uses a @Gauge annotation, but is not @ApplicationScoped, a @Singleton, or a REST endpoint");
+        }
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricAnnotationInfo.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricAnnotationInfo.java
new file mode 100644
index 0000000000000..420fc9e82d8d9
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricAnnotationInfo.java
@@ -0,0 +1,125 @@
+package io.quarkus.micrometer.deployment.binder.mpmetrics;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.jandex.*;
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.processor.DotNames;
+
+public class MetricAnnotationInfo {
+    private static final Logger log = Logger.getLogger(MetricAnnotationInfo.class);
+
+    List<AnnotationValue> output = new ArrayList<>();
+
+    String name;
+    String description;
+    String unit;
+    String[] tags;
+
+    MetricAnnotationInfo(AnnotationInstance input, IndexView index, ClassInfo classInfo, MethodInfo method,
+            FieldInfo fieldInfo) {
+        output.add(input.valueWithDefault(index, "displayName"));
+
+        // Remember the unit
+        AnnotationValue value = input.value("unit");
+        if (value != null) {
+            output.add(value);
+            if (!"none".equals(value.asString())) {
+                unit = value.asString();
+            }
+        }
+
+        // Remember absolute
+        value = input.valueWithDefault(index, "absolute");
+        output.add(value);
+        boolean absolute = value.asBoolean();
+
+        // Assign a name. Start with the name in the annotation...
+        name = input.valueWithDefault(index, "name").asString();
+        if (input.target().kind() == AnnotationTarget.Kind.FIELD) {
+            String fieldName = fieldInfo.name();
+            if (absolute) {
+                name = name.isEmpty() ? fieldName : name;
+            } else {
+                name = append(classInfo.name().toString(), name.isEmpty() ? fieldName : name);
+            }
+        }
+        if (input.target().kind() == AnnotationTarget.Kind.METHOD) {
+            String methodName = method.name().replace("<init>", classInfo.simpleName());
+            if (absolute) {
+                name = name.isEmpty() ? methodName : name;
+            } else {
+                name = append(classInfo.name().toString(), name.isEmpty() ? methodName : name);
+            }
+        }
+        if (input.target().kind() == AnnotationTarget.Kind.CLASS) {
+            String methodName = method == null ? "<method>" : method.name();
+            if (absolute) {
+                name = append(name.isEmpty() ? classInfo.simpleName() : name, methodName);
+            } else {
+                DotName className = classInfo.name();
+                if (name.isEmpty()) {
+                    name = append(className.toString(), methodName);
+                } else {
+                    name = append(DotNames.packageName(className), name, methodName);
+                }
+            }
+        }
+
+        output.add(AnnotationValue.createStringValue("name", name));
+
+        description = input.valueWithDefault(index, "description").asString();
+        output.add(AnnotationValue.createStringValue("description", description));
+
+        tags = createTags(input, index);
+        AnnotationValue[] tagValues = new AnnotationValue[tags.length];
+        for (int i = 0; i < tags.length; i++) {
+            tagValues[i] = AnnotationValue.createStringValue("tags", tags[i]);
+        }
+        output.add(AnnotationValue.createArrayValue("tags", tagValues));
+
+        log.debugf("%s --> name='%s', description='%s', unit='%s', tags='%s'",
+                input, name, description,
+                unit == null ? "none" : unit,
+                Arrays.asList(tags));
+    }
+
+    static String append(String... values) {
+        StringBuilder b = new StringBuilder();
+        for (String s : values) {
+            if (b.length() > 0 && !s.isEmpty()) {
+                b.append('.');
+            }
+            b.append(s);
+        }
+        return b.toString();
+    }
+
+    static String[] createTags(AnnotationInstance annotation, IndexView index) {
+        List<String> tags = new ArrayList<>();
+        tags.add("scope");
+        tags.add("application");
+
+        for (String s : annotation.valueWithDefault(index, "tags").asStringArray()) {
+            // separate key=value strings into two parts
+            int pos = s.indexOf('=');
+            if (pos > 0 && s.length() > 2) {
+                tags.add(s.substring(0, pos));
+                tags.add(s.substring(pos + 1));
+            } else {
+                tags.add(s);
+            }
+        }
+        if (tags.size() % 2 == 1) {
+            log.warnf("Problem parsing tag values from %s", annotation);
+        }
+        return tags.toArray(new String[tags.size()]);
+    }
+
+    public AnnotationValue[] getAnnotationValues() {
+        return output.toArray(new AnnotationValue[0]);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java
new file mode 100644
index 0000000000000..7d597e426c63d
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MetricDotNames.java
@@ -0,0 +1,100 @@
+package io.quarkus.micrometer.deployment.binder.mpmetrics;
+
+import java.util.*;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+import io.quarkus.arc.processor.BuiltinScope;
+
+/**
+ * The microprofile API must remain optional.
+ *
+ * Avoid importing classes that import MP Metrics API classes.
+ */
+public class MetricDotNames {
+    static final String MICROMETER_EXTENSION_PKG = "io.quarkus.micrometer.runtime.binder.mpmetrics";
+
+    // Use string class names: do not force-load a class that pulls in microprofile dependencies
+    static final DotName MP_METRICS_BINDER = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.MpMetricsBinder");
+    static final DotName CONCURRENT_GAUGE_ANNOTATION = DotName
+            .createSimple("org.eclipse.microprofile.metrics.annotation.ConcurrentGauge");
+    static final DotName COUNTED_ANNOTATION = DotName.createSimple("org.eclipse.microprofile.metrics.annotation.Counted");
+    static final DotName GAUGE_ANNOTATION = DotName.createSimple("org.eclipse.microprofile.metrics.annotation.Gauge");
+    static final DotName METERED_ANNOTATION = DotName.createSimple("org.eclipse.microprofile.metrics.annotation.Metered");
+    static final DotName SIMPLY_TIMED_ANNOTATION = DotName
+            .createSimple("org.eclipse.microprofile.metrics.annotation.SimplyTimed");
+    static final DotName TIMED_ANNOTATION = DotName.createSimple("org.eclipse.microprofile.metrics.annotation.Timed");
+
+    static final Set<DotName> individualMetrics = new HashSet<>(Arrays.asList(
+            CONCURRENT_GAUGE_ANNOTATION,
+            COUNTED_ANNOTATION,
+            GAUGE_ANNOTATION,
+            METERED_ANNOTATION,
+            SIMPLY_TIMED_ANNOTATION,
+            TIMED_ANNOTATION));
+
+    static final DotName METRIC_REGISTRY = DotName.createSimple("org.eclipse.microprofile.metrics.MetricRegistry");
+
+    static final DotName METRIC_ANNOTATION = DotName
+            .createSimple("org.eclipse.microprofile.metrics.annotation.Metric");
+    static final DotName ANNOTATED_GAUGE_ADAPTER = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.AnnotatedGaugeAdapter");
+
+    static final DotName METRIC = DotName
+            .createSimple("org.eclipse.microprofile.metrics.Metric");
+
+    // these are needed for determining whether a class is a REST endpoint or JAX-RS provider
+    static final DotName JAXRS_PATH = DotName.createSimple("javax.ws.rs.Path");
+    static final DotName REST_CONTROLLER = DotName
+            .createSimple("org.springframework.web.bind.annotation.RestController");
+
+    // Interceptors and producers
+    static final DotName CONCURRENT_GAUGE_INTERCEPTOR = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.ConcurrentGaugeInterceptor");
+    static final DotName COUNTED_INTERCEPTOR = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.CountedInterceptor");
+    static final DotName INJECTED_METRIC_PRODUCER = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.InjectedMetricProducer");
+    static final DotName TIMED_INTERCEPTOR = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.TimedInterceptor");
+    static final DotName MP_METRICS_REGISTRY_PRODUCER = DotName
+            .createSimple("io.quarkus.micrometer.runtime.binder.mpmetrics.MpMetricsRegistryProducer");
+
+    /**
+     * @param annotations
+     * @return true if the map of all annotations contains any MP Metrics
+     *         annotations
+     */
+    static boolean containsMetricAnnotation(Map<DotName, List<AnnotationInstance>> annotations) {
+        for (DotName name : individualMetrics) {
+            if (annotations.containsKey(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return true for known metrics subsystem classes that should not
+     *         be inspected for lifecycle constraints, etc.
+     */
+    static boolean knownClass(ClassInfo classInfo) {
+        return classInfo.name().toString().startsWith(MICROMETER_EXTENSION_PKG);
+    }
+
+    /**
+     * @param classInfo
+     * @return true if the specified class is either a REST endpoint or
+     *         has a singleton/application scope.
+     */
+    static boolean isSingleInstance(ClassInfo classInfo) {
+        BuiltinScope beanScope = BuiltinScope.from(classInfo);
+        return classInfo.annotations().containsKey(REST_CONTROLLER) ||
+                classInfo.annotations().containsKey(JAXRS_PATH) ||
+                BuiltinScope.APPLICATION.equals(beanScope) ||
+                BuiltinScope.SINGLETON.equals(beanScope);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java
new file mode 100644
index 0000000000000..380519f593096
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java
@@ -0,0 +1,193 @@
+package io.quarkus.micrometer.deployment.binder.mpmetrics;
+
+import java.util.function.BooleanSupplier;
+import java.util.function.Predicate;
+
+import javax.enterprise.context.Dependent;
+
+import org.jboss.jandex.*;
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.deployment.*;
+import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem;
+import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.BuildExtension;
+import io.quarkus.arc.processor.InjectionPointInfo;
+import io.quarkus.deployment.annotations.*;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.micrometer.deployment.RootMeterRegistryBuildItem;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+import io.quarkus.micrometer.runtime.binder.mpmetrics.MpMetricsRecorder;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+
+/**
+ * The microprofile API must remain optional.
+ *
+ * Avoid importing classes that import MP Metrics API classes.
+ */
+public class MicroprofileMetricsProcessor {
+    private static final Logger log = Logger.getLogger(MicroprofileMetricsProcessor.class);
+    static final Class<?> METRIC_ANNOTATION_CLASS = MicrometerRecorder
+            .getClassForName(MetricDotNames.METRIC_ANNOTATION.toString());
+
+    static class MicroprofileMetricsEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return METRIC_ANNOTATION_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder.mpMetrics);
+        }
+    }
+
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    IndexDependencyBuildItem addDependencies() {
+        return new IndexDependencyBuildItem("org.eclipse.microprofile.metrics", "microprofile-metrics-api");
+    }
+
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    AutoInjectAnnotationBuildItem autoInjectMetric() {
+        return new AutoInjectAnnotationBuildItem(MetricDotNames.METRIC);
+    }
+
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    AdditionalBeanBuildItem registerBeanClasses() {
+        return AdditionalBeanBuildItem.builder()
+                .setUnremovable()
+                .addBeanClass(MetricDotNames.MP_METRICS_BINDER.toString())
+                .addBeanClass(MetricDotNames.CONCURRENT_GAUGE_INTERCEPTOR.toString())
+                .addBeanClass(MetricDotNames.COUNTED_INTERCEPTOR.toString())
+                .addBeanClass(MetricDotNames.INJECTED_METRIC_PRODUCER.toString())
+                .addBeanClass(MetricDotNames.TIMED_INTERCEPTOR.toString())
+                .addBeanClass(MetricDotNames.MP_METRICS_REGISTRY_PRODUCER.toString())
+                .build();
+    }
+
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    void logWarningForMpMetricsUsage(CombinedIndexBuildItem combinedIndexBuildItem,
+            BeanRegistrationPhaseBuildItem beanRegistrationPhase,
+            BuildProducer<BeanConfiguratorBuildItem> errors) {
+        IndexView index = combinedIndexBuildItem.getIndex();
+        boolean mpMetricsPresent = false;
+
+        // Find usage of MP Metrics annotations
+        for (DotName annotation : MetricDotNames.individualMetrics) {
+            if (index.getAnnotations(annotation).size() > 0) {
+                mpMetricsPresent = true;
+                break;
+            }
+        }
+
+        if (!mpMetricsPresent) {
+            if (index.getAnnotations(MetricDotNames.METRIC_ANNOTATION).size() > 0) {
+                mpMetricsPresent = true;
+            }
+        }
+
+        if (!mpMetricsPresent) {
+            for (InjectionPointInfo injectionPoint : beanRegistrationPhase.getInjectionPoints()) {
+                if (injectionPoint.getRequiredType().name().equals(MetricDotNames.METRIC_REGISTRY)) {
+                    mpMetricsPresent = true;
+                    break;
+                }
+            }
+        }
+
+        if (mpMetricsPresent) {
+            log.warn("This application uses the MP Metrics API. " +
+                    "The micrometer extension currently provides a compatibility layer that supports the MP Metrics API, " +
+                    "but metric names and recorded values will be different. " +
+                    "Note that the MP Metrics compatibility layer will move to a different extension in the future.");
+        }
+    }
+
+    /**
+     * Make sure all classes containing metrics annotations have a bean scope.
+     */
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    AnnotationsTransformerBuildItem transformBeanScope(BeanArchiveIndexBuildItem index,
+            CustomScopeAnnotationsBuildItem scopes) {
+        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
+            @Override
+            public int getPriority() {
+                // this specifically should run after the JAX-RS AnnotationTransformers
+                return BuildExtension.DEFAULT_PRIORITY - 100;
+            }
+
+            @Override
+            public boolean appliesTo(AnnotationTarget.Kind kind) {
+                return kind == AnnotationTarget.Kind.CLASS;
+            }
+
+            @Override
+            public void transform(TransformationContext ctx) {
+                if (scopes.isScopeIn(ctx.getAnnotations())) {
+                    return;
+                }
+                ClassInfo clazz = ctx.getTarget().asClass();
+                if (!MetricDotNames.isSingleInstance(clazz)) {
+                    while (clazz != null && clazz.superName() != null) {
+                        if (!MetricDotNames.knownClass(clazz)
+                                && MetricDotNames.containsMetricAnnotation(clazz.annotations())) {
+                            log.debugf(
+                                    "Found metrics business methods on a class %s with no scope defined - adding @Dependent",
+                                    ctx.getTarget());
+                            ctx.transform().add(Dependent.class).done();
+                            break;
+                        }
+                        clazz = index.getIndex().getClassByName(clazz.superName());
+                    }
+                }
+            }
+        });
+    }
+
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    UnremovableBeanBuildItem processAnnotatedMetrics(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
+            BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformers,
+            CombinedIndexBuildItem indexBuildItem) {
+        IndexView index = indexBuildItem.getIndex();
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
+
+        // Gauges.
+        GaugeAnnotationHandler.processAnnotatedGauges(index, classOutput);
+        annotationsTransformers.produce(AnnotationHandler.transformAnnotations(index,
+                MetricDotNames.CONCURRENT_GAUGE_ANNOTATION));
+
+        // Invocation counters
+        annotationsTransformers.produce(AnnotationHandler.transformAnnotations(index,
+                MetricDotNames.COUNTED_ANNOTATION));
+        annotationsTransformers.produce(AnnotationHandler.transformAnnotations(index,
+                MetricDotNames.METERED_ANNOTATION, MetricDotNames.COUNTED_ANNOTATION));
+
+        // Timed annotations. SimplyTimed --> Timed
+        annotationsTransformers.produce(AnnotationHandler.transformAnnotations(index,
+                MetricDotNames.TIMED_ANNOTATION));
+        annotationsTransformers.produce(AnnotationHandler.transformAnnotations(index,
+                MetricDotNames.SIMPLY_TIMED_ANNOTATION, MetricDotNames.TIMED_ANNOTATION));
+
+        // @Metric
+        annotationsTransformers.produce(AnnotationHandler.transformAnnotations(index,
+                MetricDotNames.METRIC_ANNOTATION));
+
+        return new UnremovableBeanBuildItem(new Predicate<BeanInfo>() {
+            @Override
+            public boolean test(io.quarkus.arc.processor.BeanInfo beanInfo) {
+                if (beanInfo.hasType(MetricDotNames.METRIC) ||
+                        beanInfo.hasType(MetricDotNames.ANNOTATED_GAUGE_ADAPTER)) {
+                    return true;
+                }
+                return false;
+            }
+        });
+    }
+
+    @BuildStep(onlyIf = MicroprofileMetricsEnabled.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    void configureRegistry(MpMetricsRecorder recorder,
+            RootMeterRegistryBuildItem rootMeterRegistryBuildItem) {
+        recorder.configureRegistryAdapter(rootMeterRegistryBuildItem.getValue());
+
+    }
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java
new file mode 100644
index 0000000000000..9f4da05b43992
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java
@@ -0,0 +1,55 @@
+package io.quarkus.micrometer.deployment.export;
+
+import java.util.function.BooleanSupplier;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.micrometer.deployment.MicrometerRegistryProviderBuildItem;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.micrometer.runtime.export.JsonMeterRegistryProvider;
+import io.quarkus.micrometer.runtime.export.JsonRecorder;
+import io.quarkus.micrometer.runtime.registry.json.JsonMeterRegistry;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+
+public class JsonRegistryProcessor {
+
+    private static final Logger log = Logger.getLogger(JsonRegistryProcessor.class);
+
+    public static class JsonRegistryEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return mConfig.checkRegistryEnabledWithDefault(mConfig.export.json);
+        }
+    }
+
+    @BuildStep(onlyIf = JsonRegistryEnabled.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    public void initializeJsonRegistry(MicrometerConfig config,
+            BuildProducer<MicrometerRegistryProviderBuildItem> registryProviders,
+            BuildProducer<RouteBuildItem> routes,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            JsonRecorder recorder) {
+        additionalBeans.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(JsonMeterRegistryProvider.class)
+                .setUnremovable().build());
+        registryProviders.produce(new MicrometerRegistryProviderBuildItem(JsonMeterRegistry.class));
+
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .routeFunction(config.export.json.path, recorder.route())
+                .handler(recorder.getHandler())
+                .requiresLegacyRedirect()
+                .build());
+
+        log.debug("Initialized a JSON meter registry on path="
+                + nonApplicationRootPathBuildItem.resolvePath(config.export.json.path));
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/PrometheusRegistryProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/PrometheusRegistryProcessor.java
new file mode 100644
index 0000000000000..19d0bd12d5e04
--- /dev/null
+++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/PrometheusRegistryProcessor.java
@@ -0,0 +1,78 @@
+package io.quarkus.micrometer.deployment.export;
+
+import java.util.function.BooleanSupplier;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.micrometer.deployment.MicrometerRegistryProviderBuildItem;
+import io.quarkus.micrometer.runtime.MicrometerRecorder;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.micrometer.runtime.config.PrometheusConfigGroup;
+import io.quarkus.micrometer.runtime.export.PrometheusMeterRegistryProvider;
+import io.quarkus.micrometer.runtime.export.PrometheusRecorder;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+
+/**
+ * Add support for the Prometheus Meter Registry. Note that the registry may not
+ * be available at deployment time for some projects: Avoid direct class
+ * references.
+ */
+public class PrometheusRegistryProcessor {
+    private static final Logger log = Logger.getLogger(PrometheusRegistryProcessor.class);
+
+    static final String REGISTRY_CLASS_NAME = "io.micrometer.prometheus.PrometheusMeterRegistry";
+    static final Class<?> REGISTRY_CLASS = MicrometerRecorder.getClassForName(REGISTRY_CLASS_NAME);
+
+    public static class PrometheusEnabled implements BooleanSupplier {
+        MicrometerConfig mConfig;
+
+        public boolean getAsBoolean() {
+            return REGISTRY_CLASS != null && mConfig.checkRegistryEnabledWithDefault(mConfig.export.prometheus);
+        }
+    }
+
+    @BuildStep(onlyIf = PrometheusEnabled.class)
+    MicrometerRegistryProviderBuildItem createPrometheusRegistry(
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+
+        // Add the Prometheus Registry Producer
+        additionalBeans.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(PrometheusMeterRegistryProvider.class)
+                .setUnremovable().build());
+
+        // Include the PrometheusMeterRegistry in a possible CompositeMeterRegistry
+        return new MicrometerRegistryProviderBuildItem(REGISTRY_CLASS);
+    }
+
+    @BuildStep(onlyIf = PrometheusEnabled.class)
+    @Record(value = ExecutionTime.STATIC_INIT)
+    void createPrometheusRoute(BuildProducer<RouteBuildItem> routes,
+            MicrometerConfig mConfig,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            PrometheusRecorder recorder) {
+
+        PrometheusConfigGroup pConfig = mConfig.export.prometheus;
+        log.debug("PROMETHEUS CONFIG: " + pConfig);
+
+        // Exact match for resources matched to the root path
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .routeFunction(pConfig.path, recorder.route())
+                .handler(recorder.getHandler())
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage("Metrics")
+                .build());
+
+        // Match paths that begin with the deployment path
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .routeFunction(pConfig.path + (pConfig.path.endsWith("/") ? "*" : "/*"), recorder.route())
+                .handler(recorder.getHandler())
+                .requiresLegacyRedirect()
+                .build());
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java
new file mode 100644
index 0000000000000..1f311fabe1f45
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/GlobalDefaultDisabledTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.micrometer.deployment;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * Should not have any registered MeterRegistry objects when micrometer is disabled
+ */
+public class GlobalDefaultDisabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Test
+    public void testMeterRegistryPresent() {
+        // Composite Meter Registry
+        Assertions.assertNotNull(registry, "A registry should be configured");
+        Assertions.assertTrue(registry instanceof CompositeMeterRegistry,
+                "Injected registry should be a CompositeMeterRegistry, was " + registry.getClass().getName());
+    }
+
+    @Test
+    public void testNoPrometheusEndpoint() {
+        // Micrometer is enabled, prometheus is not.
+        RestAssured.when().get("/prometheus").then().statusCode(404);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java
new file mode 100644
index 0000000000000..d9f41b2deb4a3
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MetricsFromMetricsFactoryTestCase.java
@@ -0,0 +1,82 @@
+package io.quarkus.micrometer.deployment;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.FunctionCounter;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import io.micrometer.core.instrument.search.Search;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.quarkus.micrometer.runtime.MicrometerMetricsFactory;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.micrometer.test.MeasureThis;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MetricsFromMetricsFactoryTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MeasureThis.class));
+
+    @Inject
+    MeterRegistry meterRegistry;
+
+    @Inject
+    MicrometerConfig config;
+
+    @Test
+    public void testMetricFactoryCreatedMetrics() throws Exception {
+        ((CompositeMeterRegistry) meterRegistry).add(new SimpleMeterRegistry());
+        MicrometerMetricsFactory factory = new MicrometerMetricsFactory(config, meterRegistry);
+        MeasureThis.registerMetrics().accept(factory);
+
+        Meter count_me = Search.in(meterRegistry).name("count.me").meter();
+        Assertions.assertTrue(FunctionCounter.class.isInstance(count_me));
+        MeasureThis.counter.increment();
+        Assertions.assertEquals(MeasureThis.counter.doubleValue(), ((FunctionCounter) count_me).count());
+
+        Meter gauge_me = Search.in(meterRegistry).name("gauge.supplier").meter();
+        Assertions.assertTrue(Gauge.class.isInstance(gauge_me));
+        MeasureThis.gauge.increment();
+        Assertions.assertEquals(MeasureThis.gauge.doubleValue(), ((Gauge) gauge_me).value());
+
+        Meter runnable = Search.in(meterRegistry).name("time.runnable").meter();
+        Assertions.assertTrue(Timer.class.isInstance(runnable));
+        MeasureThis.wrappedRunnable.run();
+        Assertions.assertEquals(MeasureThis.runnableCount.longValue(), ((Timer) runnable).count(),
+                "Runnable invocation count should match");
+
+        Meter callable = Search.in(meterRegistry).name("time.callable").meter();
+        Assertions.assertTrue(Timer.class.isInstance(callable));
+        MeasureThis.wrappedCallable.call();
+        Assertions.assertEquals(MeasureThis.callableCount.longValue(), ((Timer) callable).count(),
+                "Callable invocation count should match");
+
+        Meter supplier = Search.in(meterRegistry).name("time.supplier").meter();
+        Assertions.assertTrue(Timer.class.isInstance(supplier));
+        MeasureThis.wrappedSupplier.get();
+        Assertions.assertEquals(MeasureThis.supplierCount.longValue(), ((Timer) supplier).count(),
+                "Supplier invocation count should match");
+
+        Meter recorder = Search.in(meterRegistry).name("time.recorder").meter();
+        Assertions.assertTrue(Timer.class.isInstance(recorder));
+        MeasureThis.timeRecorder.update(10, TimeUnit.MINUTES);
+        Assertions.assertEquals(1L, ((Timer) recorder).count(),
+                "Recorder invocation count should match");
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java
new file mode 100644
index 0000000000000..899ac69aafa91
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/MicrometerDisabledTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.micrometer.deployment;
+
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Should not have any registered MeterRegistry objects when micrometer is disabled
+ */
+public class MicrometerDisabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("quarkus.micrometer.enabled=false"), "application.properties"))
+            .assertException(t -> {
+                Assertions.assertEquals(DeploymentException.class, t.getClass());
+            });
+
+    @Inject
+    MeterRegistry registry;
+
+    @Test
+    public void testNoMeterRegistry() {
+        //Should not be reached: dump what was injected if it somehow passed
+        Assertions.assertNull(registry, "A MeterRegistry should not be found/injected when micrometer is disabled");
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java
new file mode 100644
index 0000000000000..66d64a110c168
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaClientMetricsDisabledTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.micrometer.runtime.binder.kafka.KafkaEventObserver;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class KafkaClientMetricsDisabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder.kafka.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    Instance<KafkaEventObserver> kafkaEventObservers;
+
+    @Test
+    void testNoInstancePresentIfNoKafkaClientsClass() {
+        assertTrue(kafkaEventObservers.isUnsatisfied(),
+                "No kafkaEventObservers expected, because we don't have dependency to kafka-clients");
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java
new file mode 100644
index 0000000000000..a61b46935c824
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/KafkaStreamsMetricsDisabledTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.micrometer.runtime.binder.kafka.KafkaStreamsEventObserver;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class KafkaStreamsMetricsDisabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder.kafka.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    Instance<KafkaStreamsEventObserver> kafkaStreamEventObservers;
+
+    @Test
+    void testNoInstancePresentIfNoKafkaStreamsClass() {
+        assertTrue(kafkaStreamEventObservers.isUnsatisfied(),
+                "No kafkaStreamEventObservers expected, because we don't have dependency to kafka-streams");
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java
new file mode 100644
index 0000000000000..6c82c3b0d2827
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpDisabledTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter;
+import io.quarkus.test.QuarkusUnitTest;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.net.SocketAddress;
+
+public class VertxWithHttpDisabledTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    Instance<VertxMeterBinderAdapter> vertxMeterBinderAdapterInstance;
+
+    @Inject
+    HttpBinderConfiguration httpBinderConfiguration;
+
+    @Test
+    public void testVertxMetricsWithoutHttp() throws Exception {
+        Assertions.assertTrue(vertxMeterBinderAdapterInstance.isResolvable());
+        VertxMeterBinderAdapter adapter = vertxMeterBinderAdapterInstance.get();
+
+        // HttpServerMetrics should not be created (null returned) because
+        // Http server metrics are disabled
+        Assertions.assertNull(adapter.createHttpServerMetrics(new HttpServerOptions(), new SocketAddress() {
+            @Override
+            public String host() {
+                return "a.b.c";
+            }
+
+            @Override
+            public int port() {
+                return 0;
+            }
+
+            @Override
+            public String path() {
+                return null;
+            }
+        }));
+
+        Assertions.assertFalse(httpBinderConfiguration.isServerEnabled());
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java
new file mode 100644
index 0000000000000..2d0dc316698ed
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/binder/VertxWithHttpEnabledTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.micrometer.deployment.binder;
+
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter;
+import io.quarkus.test.QuarkusUnitTest;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.core.spi.metrics.HttpServerMetrics;
+
+public class VertxWithHttpEnabledTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.binder.http-server.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.binder.http-server.ignore-patterns", "/http")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.match-patterns", "/one=/two")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.ignore-patterns", "/two")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    Instance<VertxMeterBinderAdapter> vertxMeterBinderAdapterInstance;
+
+    @Inject
+    HttpBinderConfiguration httpBinderConfiguration;
+
+    @Test
+    public void testMetricFactoryCreatedMetrics() throws Exception {
+        Assertions.assertTrue(vertxMeterBinderAdapterInstance.isResolvable());
+        VertxMeterBinderAdapter adapter = vertxMeterBinderAdapterInstance.get();
+
+        HttpServerMetrics metrics = adapter.createHttpServerMetrics(new HttpServerOptions(), new SocketAddress() {
+            @Override
+            public String host() {
+                return "a.b.c";
+            }
+
+            @Override
+            public int port() {
+                return 0;
+            }
+
+            @Override
+            public String path() {
+                return null;
+            }
+        });
+
+        Assertions.assertNotNull(metrics);
+        Assertions.assertTrue(httpBinderConfiguration.isServerEnabled());
+
+        // prefer http-server.ignore-patterns
+        Assertions.assertEquals(1, httpBinderConfiguration.getServerIgnorePatterns().size());
+        Pattern p = httpBinderConfiguration.getServerIgnorePatterns().get(0);
+        Assertions.assertTrue(p.matcher("/http").matches());
+
+        // Use vertx.match-patterns (http-server version is missing)
+        Assertions.assertEquals(1, httpBinderConfiguration.getServerMatchPatterns().size());
+        Map.Entry<Pattern, String> entry = httpBinderConfiguration.getServerMatchPatterns().entrySet().iterator().next();
+        Assertions.assertTrue(entry.getKey().matcher("/one").matches());
+        Assertions.assertEquals("/two", entry.getValue());
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java
new file mode 100644
index 0000000000000..0df9cde323bff
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/AllRegistriesDisabledTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.micrometer.deployment.export;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * Should not have any registered MeterRegistry objects when micrometer is disabled
+ */
+public class AllRegistriesDisabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.export.json.enabled", "false")
+            .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Test
+    public void testMeterRegistryPresent() {
+        // Composite Meter Registry
+        Assertions.assertNotNull(registry, "A registry should be configured");
+        Assertions.assertEquals(CompositeMeterRegistry.class, registry.getClass(), "Should be CompositeMeterRegistry");
+    }
+
+    @Test
+    public void testNoPrometheusEndpoint() {
+        // Micrometer is enabled, prometheus is not.
+        RestAssured.when().get("/q/metrics").then().statusCode(404);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java
new file mode 100644
index 0000000000000..3c2d574940bbc
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/JsonRegistryEnabledTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.micrometer.deployment.export;
+
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import io.quarkus.micrometer.runtime.registry.json.JsonMeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class JsonRegistryEnabledTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.http.root-path", "/app")
+            .overrideConfigKey("quarkus.http.non-application-root-path", "relative")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.export.json.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(PrometheusRegistryProcessor.REGISTRY_CLASS));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Inject
+    JsonMeterRegistry jsonMeterRegistry;
+
+    @Test
+    public void testMeterRegistryPresent() {
+        // Prometheus is enabled (only registry)
+        Assertions.assertNotNull(registry, "A registry should be configured");
+        Set<MeterRegistry> subRegistries = ((CompositeMeterRegistry) registry).getRegistries();
+        JsonMeterRegistry subPromRegistry = (JsonMeterRegistry) subRegistries.iterator().next();
+        Assertions.assertEquals(JsonMeterRegistry.class, subPromRegistry.getClass(), "Should be JsonMeterRegistry");
+        Assertions.assertEquals(subPromRegistry, jsonMeterRegistry,
+                "The only MeterRegistry should be the same bean as the JsonMeterRegistry");
+    }
+
+    @Test
+    public void metricsEndpoint() {
+        // RestAssured prepends /app for us
+        RestAssured.given()
+                .contentType("application/json")
+                .get("/relative/metrics")
+                .then()
+                .statusCode(200);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java
new file mode 100644
index 0000000000000..e4801a95c5b92
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/PrometheusEnabledTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.micrometer.deployment.export;
+
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class PrometheusEnabledTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(PrometheusRegistryProcessor.REGISTRY_CLASS));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Inject
+    PrometheusMeterRegistry promRegistry;
+
+    @Test
+    public void testMeterRegistryPresent() {
+        // Prometheus is enabled (only registry)
+        Assertions.assertNotNull(registry, "A registry should be configured");
+        Set<MeterRegistry> subRegistries = ((CompositeMeterRegistry) registry).getRegistries();
+        PrometheusMeterRegistry subPromRegistry = (PrometheusMeterRegistry) subRegistries.iterator().next();
+        Assertions.assertEquals(PrometheusMeterRegistry.class, subPromRegistry.getClass(), "Should be PrometheusMeterRegistry");
+        Assertions.assertEquals(subPromRegistry, promRegistry,
+                "The only MeterRegistry should be the same bean as the PrometheusMeterRegistry");
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java
new file mode 100644
index 0000000000000..1c546fb664d5f
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusProvider.java
@@ -0,0 +1,18 @@
+package io.quarkus.micrometer.deployment.export;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.prometheus.client.CollectorRegistry;
+
+@Singleton
+public class SecondPrometheusProvider {
+    @Produces
+    @Singleton
+    public PrometheusMeterRegistry registry(CollectorRegistry collectorRegistry, Clock clock) {
+        return new PrometheusMeterRegistry(PrometheusConfig.DEFAULT, collectorRegistry, clock);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java
new file mode 100644
index 0000000000000..3baa7f0d7c543
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/deployment/export/SecondPrometheusTest.java
@@ -0,0 +1,38 @@
+package io.quarkus.micrometer.deployment.export;
+
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SecondPrometheusTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.export.prometheus.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(PrometheusRegistryProcessor.REGISTRY_CLASS)
+                    .addClass(SecondPrometheusProvider.class));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Test
+    public void testMeterRegistryPresent() {
+        // We want a composite that contains both registries.
+        Assertions.assertNotNull(registry, "A registry should be configured");
+        Set<MeterRegistry> subRegistries = ((CompositeMeterRegistry) registry).getRegistries();
+        Assertions.assertEquals(2, subRegistries.size(), "Should be two sub registries");
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java
new file mode 100644
index 0000000000000..1d10e15e7f032
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerCounterInterceptorTest.java
@@ -0,0 +1,182 @@
+package io.quarkus.micrometer.runtime;
+
+import java.util.concurrent.CompletableFuture;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.search.MeterNotFoundException;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.quarkus.micrometer.test.CountedResource;
+import io.quarkus.micrometer.test.GuardedResult;
+import io.quarkus.micrometer.test.TimedResource;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MicrometerCounterInterceptorTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "false")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "false")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(CountedResource.class)
+                    .addClass(TimedResource.class)
+                    .addClass(GuardedResult.class));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Inject
+    CountedResource counted;
+
+    @BeforeAll
+    static void addSimpleRegistry() {
+        Metrics.globalRegistry.add(new SimpleMeterRegistry());
+    }
+
+    @Test
+    void testCountFailuresOnly_NoMetricsOnSuccess() {
+        counted.onlyCountFailures();
+        Assertions.assertThrows(MeterNotFoundException.class, () -> registry.get("metric.none").counter());
+    }
+
+    @Test
+    void testCountAllMetrics_MetricsOnSuccess() {
+        counted.countAllInvocations(false);
+        Counter counter = registry.get("metric.all")
+                .tag("method", "countAllInvocations")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("extra", "tag")
+                .tag("exception", "none")
+                .tag("result", "success").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+    }
+
+    @Test
+    void testCountAllMetrics_MetricsOnFailure() {
+        Assertions.assertThrows(NullPointerException.class, () -> counted.countAllInvocations(true));
+        Counter counter = registry.get("metric.all")
+                .tag("method", "countAllInvocations")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("extra", "tag")
+                .tag("exception", "NullPointerException")
+                .tag("result", "failure").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+        Assertions.assertNull(counter.getId().getDescription());
+    }
+
+    @Test
+    void testCountEmptyMetricName_Success() {
+        counted.emptyMetricName(false);
+        Counter counter = registry.get("method.counted")
+                .tag("method", "emptyMetricName")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("exception", "none")
+                .tag("result", "success").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+        Assertions.assertEquals("nice description", counter.getId().getDescription());
+    }
+
+    @Test
+    void testCountEmptyMetricName_Failure() {
+        Assertions.assertThrows(NullPointerException.class, () -> counted.emptyMetricName(true));
+        Counter counter = registry.get("method.counted")
+                .tag("method", "emptyMetricName")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("exception", "NullPointerException")
+                .tag("result", "failure").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+    }
+
+    @Test
+    void testCountAsyncFailuresOnly_NoMetricsOnSuccess() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = counted.onlyCountAsyncFailures(guardedResult);
+        guardedResult.complete();
+        completableFuture.join();
+
+        Assertions.assertThrows(MeterNotFoundException.class, () -> registry.get("async.none").counter());
+    }
+
+    @Test
+    void testCountAsyncAllMetrics_MetricsOnSuccess() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = counted.countAllAsyncInvocations(guardedResult);
+        guardedResult.complete();
+        completableFuture.join();
+
+        Counter counter = registry.get("async.all")
+                .tag("method", "countAllAsyncInvocations")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("extra", "tag")
+                .tag("exception", "none")
+                .tag("result", "success").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+    }
+
+    @Test
+    void testCountAsyncAllMetrics_MetricsOnFailure() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = counted.countAllAsyncInvocations(guardedResult);
+        guardedResult.complete(new NullPointerException());
+        Assertions.assertThrows(java.util.concurrent.CompletionException.class, () -> completableFuture.join());
+
+        Counter counter = registry.get("async.all")
+                .tag("method", "countAllAsyncInvocations")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("extra", "tag")
+                .tag("exception", "NullPointerException")
+                .tag("result", "failure").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+        Assertions.assertNull(counter.getId().getDescription());
+    }
+
+    @Test
+    void testCountAsyncEmptyMetricName_Success() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = counted.emptyAsyncMetricName(guardedResult);
+        guardedResult.complete();
+        completableFuture.join();
+
+        Counter counter = registry.get("method.counted")
+                .tag("method", "emptyAsyncMetricName")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("exception", "none")
+                .tag("result", "success").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+    }
+
+    @Test
+    void testCountAsyncEmptyMetricName_Failure() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = counted.emptyAsyncMetricName(guardedResult);
+        guardedResult.complete(new NullPointerException());
+        Assertions.assertThrows(java.util.concurrent.CompletionException.class, () -> completableFuture.join());
+
+        Counter counter = registry.get("method.counted")
+                .tag("method", "emptyMetricName")
+                .tag("class", "io.quarkus.micrometer.test.CountedResource")
+                .tag("exception", "NullPointerException")
+                .tag("result", "failure").counter();
+        Assertions.assertNotNull(counter);
+        Assertions.assertEquals(1, counter.count());
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java
new file mode 100644
index 0000000000000..02d4d84684815
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptorTest.java
@@ -0,0 +1,157 @@
+package io.quarkus.micrometer.runtime;
+
+import java.util.concurrent.CompletableFuture;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.quarkus.micrometer.test.CountedResource;
+import io.quarkus.micrometer.test.GuardedResult;
+import io.quarkus.micrometer.test.TimedResource;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MicrometerTimedInterceptorTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "false")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "false")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(CountedResource.class)
+                    .addClass(TimedResource.class)
+                    .addClass(GuardedResult.class));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Inject
+    TimedResource timed;
+
+    @BeforeAll
+    static void addSimpleRegistry() {
+        Metrics.globalRegistry.add(new SimpleMeterRegistry());
+    }
+
+    @Test
+    void testTimeMethod() {
+        timed.call(false);
+        Timer timer = registry.get("call")
+                .tag("method", "call")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("exception", "none")
+                .tag("extra", "tag").timer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(1, timer.count());
+    }
+
+    @Test
+    void testTimeMethod_Failed() {
+        Assertions.assertThrows(NullPointerException.class, () -> timed.call(true));
+
+        Timer timer = registry.get("call")
+                .tag("method", "call")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("exception", "NullPointerException")
+                .tag("extra", "tag").timer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(1, timer.count());
+    }
+
+    @Test
+    void testTimeMethod_Async() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = timed.asyncCall(guardedResult);
+        guardedResult.complete();
+        completableFuture.join();
+
+        Timer timer = registry.get("async.call")
+                .tag("method", "asyncCall")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("exception", "none")
+                .tag("extra", "tag").timer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(1, timer.count());
+    }
+
+    @Test
+    void testTimeMethod_AsyncFailed() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = timed.asyncCall(guardedResult);
+        guardedResult.complete(new NullPointerException());
+        Assertions.assertThrows(java.util.concurrent.CompletionException.class, () -> completableFuture.join());
+
+        Timer timer = registry.get("async.call")
+                .tag("method", "asyncCall")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("exception", "NullPointerException")
+                .tag("extra", "tag").timer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(1, timer.count());
+    }
+
+    @Test
+    void testTimeMethod_LongTaskTimer() {
+        timed.longCall(false);
+        LongTaskTimer timer = registry.get("longCall")
+                .tag("method", "longCall")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("extra", "tag").longTaskTimer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(0, timer.activeTasks());
+    }
+
+    @Test
+    void testTimeMethod_LongTaskTimer_Failed() {
+        Assertions.assertThrows(NullPointerException.class, () -> timed.longCall(true));
+
+        LongTaskTimer timer = registry.get("longCall")
+                .tag("method", "longCall")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("extra", "tag").longTaskTimer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(0, timer.activeTasks());
+    }
+
+    @Test
+    void testTimeMethod_LongTaskTimer_Async() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = timed.longAsyncCall(guardedResult);
+        guardedResult.complete();
+        completableFuture.join();
+
+        LongTaskTimer timer = registry.get("async.longCall")
+                .tag("method", "longAsyncCall")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("extra", "tag").longTaskTimer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(0, timer.activeTasks());
+    }
+
+    @Test
+    void testTimeMethod_LongTaskTimer_AsyncFailed() {
+        GuardedResult guardedResult = new GuardedResult();
+        CompletableFuture<?> completableFuture = timed.longAsyncCall(guardedResult);
+        guardedResult.complete(new NullPointerException());
+        Assertions.assertThrows(java.util.concurrent.CompletionException.class, () -> completableFuture.join());
+
+        LongTaskTimer timer = registry.get("async.longCall")
+                .tag("method", "longAsyncCall")
+                .tag("class", "io.quarkus.micrometer.test.TimedResource")
+                .tag("extra", "tag").longTaskTimer();
+        Assertions.assertNotNull(timer);
+        Assertions.assertEquals(0, timer.activeTasks());
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java
new file mode 100644
index 0000000000000..c80762dc59c1a
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricNamingTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.micrometer.test.MpColorResource;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MpMetricNamingTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.binder.vertx.enabled", "false")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MpColorResource.class));
+
+    @Inject
+    MeterRegistry registry;
+
+    @Inject
+    MpColorResource colors;
+
+    @Test
+    public void testAnnotatedMeterNames() {
+        colors.blue();
+        colors.red();
+        colors.green();
+        colors.yellow();
+
+        Assertions.assertNotNull(
+                registry.find("io.quarkus.micrometer.test.MpColorResource.red").counter());
+        Assertions.assertNotNull(
+                registry.find("io.quarkus.micrometer.test.MpColorResource.blueCount").counter());
+        Assertions.assertNotNull(
+                registry.find("greenCount").counter());
+        Assertions.assertNotNull(
+                registry.find("yellow").gauge());
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java
new file mode 100644
index 0000000000000..9cfb7a5b21b75
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricRegistrationTest.java
@@ -0,0 +1,104 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.metrics.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MpMetricRegistrationTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("test-logging.properties")
+            .overrideConfigKey("quarkus.micrometer.binder.mp-metrics.enabled", "true")
+            .overrideConfigKey("quarkus.micrometer.binder-enabled-default", "false")
+            .overrideConfigKey("quarkus.micrometer.registry-enabled-default", "false");
+
+    @Inject
+    MetricRegistryAdapter mpRegistry;
+
+    @Inject
+    MeterRegistry registry;
+
+    @Test
+    public void metricsWithSameMetadata() {
+        Metadata metadata1 = Metadata.builder().withName("meter").withDescription("description1").build();
+        Metadata metadata2 = Metadata.builder().withName("meter").withDescription("description1").build();
+
+        MeterAdapter meter1 = (MeterAdapter) mpRegistry.meter(metadata1);
+        MeterAdapter meter2 = (MeterAdapter) mpRegistry.meter(metadata2);
+
+        Assertions.assertSame(meter1, meter2);
+    }
+
+    @Test
+    public void metricsWithDifferentType() {
+        Metadata metadata1 = Metadata.builder().withName("metric1")
+                .withDescription("description1").build();
+        Metadata metadata2 = Metadata.builder().withName("metric1")
+                .withDescription("description2").build();
+
+        mpRegistry.histogram(metadata1);
+
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            mpRegistry.meter(metadata2);
+        });
+    }
+
+    @Test
+    public void wrongTypeInMetadata() {
+        Metadata metadata1 = Metadata.builder().withName("metric1")
+                .withDescription("description1").build();
+
+        Metadata metadata2 = Metadata.builder()
+                .withName("metric1")
+                .withType(MetricType.COUNTER)
+                .build();
+
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            mpRegistry.histogram(metadata2);
+        });
+    }
+
+    @Test
+    public void descriptionChanged() {
+        Metadata metadata1 = Metadata.builder().withName("metric1")
+                .withDescription("description1").build();
+        Metadata metadata2 = Metadata.builder().withName("metric1")
+                .withDescription("description2").build();
+
+        // harmless re-registration
+        mpRegistry.histogram(metadata1);
+        HistogramAdapter histogram = (HistogramAdapter) mpRegistry.histogram(metadata1);
+
+        Assertions.assertEquals("description1", histogram.getMeter().getId().getDescription(),
+                "Description should match first set value");
+    }
+
+    @Test
+    public void metricsWithSameName() {
+        int cmSize = mpRegistry.constructedMeters.size();
+        int mdSize = mpRegistry.metadataMap.size();
+        Metadata metadata1 = Metadata.builder().withName("mycounter").withDescription("description1").build();
+
+        CounterAdapter counter1 = (CounterAdapter) mpRegistry.counter(metadata1);
+        CounterAdapter counter2 = (CounterAdapter) mpRegistry.counter("mycounter", new Tag("color", "blue"));
+
+        Assertions.assertNotEquals(counter1, counter2);
+        Assertions.assertEquals("description1", counter1.getMeter().getId().getDescription(),
+                "Description should match shared value");
+        Assertions.assertEquals("description1", counter2.getMeter().getId().getDescription(),
+                "Description should match shared value");
+
+        mpRegistry.remove("mycounter");
+
+        Assertions.assertEquals(cmSize, mpRegistry.constructedMeters.size(),
+                "Both counters should have been removed");
+        Assertions.assertEquals(mdSize, mpRegistry.metadataMap.size(),
+                "mycounter metadata should have been removed");
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java
new file mode 100644
index 0000000000000..f50ab2d7a8f0f
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/CountedResource.java
@@ -0,0 +1,46 @@
+package io.quarkus.micrometer.test;
+
+import static java.util.concurrent.CompletableFuture.supplyAsync;
+
+import java.util.concurrent.CompletableFuture;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.micrometer.core.annotation.Counted;
+
+@ApplicationScoped
+public class CountedResource {
+    @Counted(value = "metric.none", recordFailuresOnly = true)
+    public void onlyCountFailures() {
+    }
+
+    @Counted(value = "metric.all", extraTags = { "extra", "tag" })
+    public void countAllInvocations(boolean fail) {
+        if (fail) {
+            throw new NullPointerException("Failed on purpose");
+        }
+    }
+
+    @Counted(description = "nice description")
+    public void emptyMetricName(boolean fail) {
+        if (fail) {
+            throw new NullPointerException("Failed on purpose");
+        }
+    }
+
+    @Counted(value = "async.none", recordFailuresOnly = true)
+    public CompletableFuture<?> onlyCountAsyncFailures(GuardedResult guardedResult) {
+        return supplyAsync(guardedResult::get);
+    }
+
+    @Counted(value = "async.all", extraTags = { "extra", "tag" })
+    public CompletableFuture<?> countAllAsyncInvocations(GuardedResult guardedResult) {
+        return supplyAsync(guardedResult::get);
+    }
+
+    @Counted
+    public CompletableFuture<?> emptyAsyncMetricName(GuardedResult guardedResult) {
+        return supplyAsync(guardedResult::get);
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/GuardedResult.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/GuardedResult.java
new file mode 100644
index 0000000000000..550820cc845f1
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/GuardedResult.java
@@ -0,0 +1,34 @@
+package io.quarkus.micrometer.test;
+
+public class GuardedResult {
+
+    private boolean complete;
+    private NullPointerException withException;
+
+    public synchronized Object get() {
+        while (!complete) {
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                // Intentionally empty
+            }
+        }
+
+        if (withException == null) {
+            return new Object();
+        }
+
+        throw withException;
+    }
+
+    public synchronized void complete() {
+        complete(null);
+    }
+
+    public synchronized void complete(NullPointerException withException) {
+        this.complete = true;
+        this.withException = withException;
+        notifyAll();
+    }
+
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeasureThis.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeasureThis.java
new file mode 100644
index 0000000000000..4693879c502c7
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MeasureThis.java
@@ -0,0 +1,65 @@
+package io.quarkus.micrometer.test;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+public class MeasureThis {
+    public static LongAdder counter = new LongAdder();
+    public static LongAdder gauge = new LongAdder();
+
+    public static LongAdder runnableCount = new LongAdder();
+    public static LongAdder callableCount = new LongAdder();
+    public static LongAdder supplierCount = new LongAdder();
+
+    public static Runnable wrappedRunnable;
+    public static Callable<Long> wrappedCallable;
+    public static Supplier<Long> wrappedSupplier;
+
+    public static MetricsFactory.TimeRecorder timeRecorder;
+
+    public static Consumer<MetricsFactory> registerMetrics() {
+        MeasureThis mt = new MeasureThis();
+        return new Consumer<MetricsFactory>() {
+            @Override
+            public void accept(MetricsFactory metricsFactory) {
+                metricsFactory.builder("count.me")
+                        .buildCounter(MeasureThis.counter::longValue);
+                metricsFactory.builder("gauge.supplier")
+                        .buildGauge(MeasureThis.gauge::doubleValue);
+
+                MeasureThis.wrappedRunnable = metricsFactory.builder("time.runnable")
+                        .buildTimer(new Runnable() {
+                            @Override
+                            public void run() {
+                                runnableCount.increment();
+                            }
+                        });
+
+                MeasureThis.wrappedCallable = metricsFactory.builder("time.callable")
+                        .buildTimer(new Callable<Long>() {
+                            @Override
+                            public Long call() throws Exception {
+                                callableCount.increment();
+                                return callableCount.sum();
+                            }
+                        });
+
+                MeasureThis.wrappedSupplier = metricsFactory.builder("time.supplier")
+                        .buildTimer(new Supplier<Long>() {
+                            @Override
+                            public Long get() {
+                                supplierCount.increment();
+                                return supplierCount.sum();
+                            }
+                        });
+
+                MeasureThis.timeRecorder = metricsFactory.builder("time.recorder")
+                        .buildTimer();
+            }
+        };
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java
new file mode 100644
index 0000000000000..784ca78f3fdf0
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/MpColorResource.java
@@ -0,0 +1,29 @@
+package io.quarkus.micrometer.test;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.metrics.annotation.Counted;
+import org.eclipse.microprofile.metrics.annotation.Gauge;
+
+@ApplicationScoped
+public class MpColorResource {
+    @Counted
+    public void red() {
+        // ...
+    }
+
+    @Counted(name = "blueCount")
+    public void blue() {
+        // ...
+    }
+
+    @Counted(name = "greenCount", absolute = true)
+    public void green() {
+        // ...
+    }
+
+    @Gauge(absolute = true, unit = "jellybeans")
+    public long yellow() {
+        return 0L;
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java
new file mode 100644
index 0000000000000..d4856e8bc600b
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/TimedResource.java
@@ -0,0 +1,45 @@
+package io.quarkus.micrometer.test;
+
+import static java.util.concurrent.CompletableFuture.supplyAsync;
+
+import java.util.concurrent.CompletableFuture;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.micrometer.core.annotation.Timed;
+
+@ApplicationScoped
+public class TimedResource {
+    @Timed(value = "call", extraTags = { "extra", "tag" })
+    public void call(boolean fail) {
+        if (fail) {
+            throw new NullPointerException("Failed on purpose");
+        }
+
+    }
+
+    @Timed(value = "longCall", extraTags = { "extra", "tag" }, longTask = true)
+    public void longCall(boolean fail) {
+        try {
+            Thread.sleep(3);
+        } catch (InterruptedException e) {
+        }
+        if (fail) {
+            throw new NullPointerException("Failed on purpose");
+        }
+    }
+
+    @Timed(value = "async.call", extraTags = { "extra", "tag" })
+    public CompletableFuture<?> asyncCall(GuardedResult guardedResult) {
+        return supplyAsync(guardedResult::get);
+    }
+
+    @Timed(value = "async.longCall", extraTags = { "extra", "tag" }, longTask = true)
+    public CompletableFuture<?> longAsyncCall(GuardedResult guardedResult) {
+        try {
+            Thread.sleep(3);
+        } catch (InterruptedException e) {
+        }
+        return supplyAsync(guardedResult::get);
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/Util.java b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/Util.java
new file mode 100644
index 0000000000000..5d646d37c8b87
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/java/io/quarkus/micrometer/test/Util.java
@@ -0,0 +1,29 @@
+package io.quarkus.micrometer.test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.LogRecord;
+
+import org.junit.jupiter.api.Assertions;
+
+public class Util {
+    private Util() {
+    }
+
+    static void assertMessage(String attribute, List<LogRecord> records) {
+        // look through log records and make sure there is a message about the specific attribute
+        long i = records.stream().filter(x -> Arrays.stream(x.getParameters()).anyMatch(y -> y.equals(attribute)))
+                .count();
+        Assertions.assertEquals(1, i);
+    }
+
+    static String stackToString(Throwable t) {
+        StringBuilder sb = new StringBuilder().append("\n");
+        while (t.getCause() != null) {
+            t = t.getCause();
+        }
+        sb.append(t.getClass()).append(": ").append(t.getMessage()).append("\n");
+        Arrays.asList(t.getStackTrace()).forEach(x -> sb.append("\t").append(x.toString()).append("\n"));
+        return sb.toString();
+    }
+}
diff --git a/extensions/micrometer/deployment/src/test/resources/test-logging.properties b/extensions/micrometer/deployment/src/test/resources/test-logging.properties
new file mode 100644
index 0000000000000..6eed6ab2596da
--- /dev/null
+++ b/extensions/micrometer/deployment/src/test/resources/test-logging.properties
@@ -0,0 +1,4 @@
+#quarkus.log.category."io.quarkus.micrometer".level=DEBUG
+quarkus.log.category."io.quarkus.bootstrap".level=INFO
+#quarkus.log.category."io.quarkus.arc".level=DEBUG
+quarkus.log.category."io.netty".level=INFO
diff --git a/extensions/micrometer/pom.xml b/extensions/micrometer/pom.xml
new file mode 100644
index 0000000000000..79267966c69c8
--- /dev/null
+++ b/extensions/micrometer/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2020 the original author or authors.
+
+  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
+
+    https://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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-micrometer-parent</artifactId>
+    <name>Quarkus - Micrometer</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+</project>
diff --git a/extensions/micrometer/runtime/pom.xml b/extensions/micrometer/runtime/pom.xml
new file mode 100644
index 0000000000000..0d3714cfe7a5a
--- /dev/null
+++ b/extensions/micrometer/runtime/pom.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-micrometer-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-micrometer</artifactId>
+    <name>Quarkus - Micrometer - Runtime</name>
+    <description>Instrument the runtime and your application with dimensional metrics using Micrometer.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
+        </dependency>
+
+        <!-- Needed for the JSON meter registry -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+        </dependency>
+
+
+        <!-- Registry providers (optional) -->
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Dependencies for Binding (optional) -->
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-streams</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Test -->
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java
new file mode 100644
index 0000000000000..354d21235b089
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/ClockProvider.java
@@ -0,0 +1,17 @@
+package io.quarkus.micrometer.runtime;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.micrometer.core.instrument.Clock;
+import io.quarkus.arc.DefaultBean;
+
+@Singleton
+public class ClockProvider {
+    @Produces
+    @Singleton
+    @DefaultBean
+    public Clock clock() {
+        return Clock.SYSTEM;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java
new file mode 100644
index 0000000000000..abfd7896af0a0
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/CompositeRegistryCreator.java
@@ -0,0 +1,22 @@
+package io.quarkus.micrometer.runtime;
+
+import static javax.interceptor.Interceptor.Priority.PLATFORM_AFTER;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.quarkus.arc.AlternativePriority;
+
+/**
+ * @return the single resolveable "root" MeterRegistry
+ */
+public class CompositeRegistryCreator {
+    @Produces
+    @Singleton
+    @AlternativePriority(PLATFORM_AFTER)
+    public MeterRegistry produceRootRegistry() {
+        return Metrics.globalRegistry;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java
new file mode 100644
index 0000000000000..f8780dc87ecdc
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraint.java
@@ -0,0 +1,32 @@
+package io.quarkus.micrometer.runtime;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER, ElementType.FIELD })
+@Repeatable(MeterFilterConstraints.class)
+public @interface MeterFilterConstraint {
+    Class<?> applyTo();
+
+    final class Literal extends AnnotationLiteral<MeterFilterConstraint> implements MeterFilterConstraint {
+        private static final long serialVersionUID = 1L;
+        private final Class<?> clazz;
+
+        public Literal(Class<?> clazz) {
+            this.clazz = clazz;
+        }
+
+        @Override
+        public Class<?> applyTo() {
+            return clazz;
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraints.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraints.java
new file mode 100644
index 0000000000000..471755e019b42
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterFilterConstraints.java
@@ -0,0 +1,12 @@
+package io.quarkus.micrometer.runtime;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER, ElementType.FIELD })
+public @interface MeterFilterConstraints {
+    MeterFilterConstraint[] value();
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java
new file mode 100644
index 0000000000000..7cad4a9914812
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCounted.java
@@ -0,0 +1,16 @@
+package io.quarkus.micrometer.runtime;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Inherited
+@InterceptorBinding
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MicrometerCounted {
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java
new file mode 100644
index 0000000000000..82968c20efe16
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerCountedInterceptor.java
@@ -0,0 +1,111 @@
+package io.quarkus.micrometer.runtime;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.CompletionStage;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import io.micrometer.core.annotation.Counted;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+
+/**
+ * Quarkus declared interceptor responsible for intercepting all methods
+ * annotated with the {@link Counted} annotation to record a few counter
+ * metrics about their execution status.
+ *
+ * @see Counted
+ */
+@Interceptor
+@MicrometerCounted
+@Priority(Interceptor.Priority.LIBRARY_BEFORE + 10)
+public class MicrometerCountedInterceptor {
+
+    public final String RESULT_TAG_FAILURE_VALUE = "failure";
+    public final String RESULT_TAG_SUCCESS_VALUE = "success";
+
+    private final MeterRegistry meterRegistry;
+
+    public MicrometerCountedInterceptor(MeterRegistry meterRegistry) {
+        this.meterRegistry = meterRegistry;
+    }
+
+    /**
+     * Intercept methods annotated with the {@link Counted} annotation and expose a few counters about
+     * their execution status. By default, record both failed and successful attempts. If the
+     * {@link Counted#recordFailuresOnly()} is set to {@code true}, then record only
+     * failed attempts. In case of a failure, tags the counter with the simple name of the thrown
+     * exception.
+     *
+     * <p>
+     * When the annotated method returns a {@link CompletionStage} or any of its subclasses,
+     * the counters will be incremented only when the {@link CompletionStage} is completed.
+     * If completed exceptionally a failure is recorded, otherwise if
+     * {@link Counted#recordFailuresOnly()} is set to {@code false}, a success is recorded.
+     *
+     * @return Whatever the intercepted method returns.
+     * @throws Throwable When the intercepted method throws one.
+     */
+    @AroundInvoke
+    Object countedMethod(InvocationContext context) throws Exception {
+        Method method = context.getMethod();
+        Counted counted = method.getAnnotation(Counted.class);
+        if (counted == null) {
+            return context.proceed();
+        }
+
+        Tags commonTags = getCommonTags(method.getDeclaringClass().getName(), method.getName());
+
+        // If we're working with a CompletionStage
+        final boolean stopWhenCompleted = CompletionStage.class.isAssignableFrom(method.getReturnType());
+        if (stopWhenCompleted) {
+            try {
+                return ((CompletionStage<?>) context.proceed()).whenComplete((result, throwable) -> {
+                    recordCompletionResult(counted, commonTags, throwable);
+                });
+            } catch (Throwable e) {
+                record(counted, commonTags, e);
+            }
+        }
+
+        try {
+            Object result = context.proceed();
+            if (!counted.recordFailuresOnly()) {
+                record(counted, commonTags, null);
+            }
+            return result;
+        } catch (Throwable e) {
+            record(counted, commonTags, e);
+            throw e;
+        }
+    }
+
+    private void recordCompletionResult(Counted counted, Tags commonTags, Throwable throwable) {
+        if (throwable != null) {
+            record(counted, commonTags, throwable);
+        } else if (!counted.recordFailuresOnly()) {
+            record(counted, commonTags, null);
+        }
+    }
+
+    private void record(Counted counted, Tags commonTags, Throwable throwable) {
+        Counter.Builder builder = Counter.builder(counted.value())
+                .tags(commonTags)
+                .tags(counted.extraTags())
+                .tag("exception", MicrometerRecorder.getExceptionTag(throwable))
+                .tag("result", throwable == null ? RESULT_TAG_SUCCESS_VALUE : RESULT_TAG_FAILURE_VALUE);
+        String description = counted.description();
+        if (!description.isEmpty()) {
+            builder.description(description);
+        }
+        builder.register(meterRegistry).increment();
+    }
+
+    private Tags getCommonTags(String className, String methodName) {
+        return Tags.of("class", className, "method", methodName);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerMetricsFactory.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerMetricsFactory.java
new file mode 100644
index 0000000000000..c584234891685
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerMetricsFactory.java
@@ -0,0 +1,160 @@
+package io.quarkus.micrometer.runtime;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import io.micrometer.core.instrument.FunctionCounter;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+public class MicrometerMetricsFactory implements MetricsFactory {
+    final MeterRegistry globalRegistry;
+    final MicrometerConfig config;
+
+    public MicrometerMetricsFactory(MicrometerConfig config, MeterRegistry globalRegistry) {
+        this.globalRegistry = globalRegistry;
+        this.config = config;
+    }
+
+    @Override
+    public boolean metricsSystemSupported(String name) {
+        return MetricsFactory.MICROMETER.equals(name) ||
+                (MetricsFactory.MP_METRICS.equals(name) && config.binder.mpMetrics.enabled.orElse(false));
+    }
+
+    /**
+     * @param name The name of the metric (required)
+     * @param type The scope or type of the metric (ignored)
+     * @return a fluid builder for registering metrics.
+     */
+    @Override
+    public MetricBuilder builder(String name, MetricsFactory.Type type) {
+        return new MicrometerMetricsBuilder(name);
+    }
+
+    class MicrometerMetricsBuilder implements MetricBuilder {
+        String name;
+        String description;
+        String unit;
+        Tags tags = Tags.empty();
+
+        public MicrometerMetricsBuilder(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public MetricBuilder description(String description) {
+            this.description = description;
+            return this;
+        }
+
+        @Override
+        public MetricBuilder tag(String key, String value) {
+            this.tags = tags.and(key, value);
+            return this;
+        }
+
+        @Override
+        public MetricBuilder unit(String unit) {
+            this.unit = unit;
+            return this;
+        }
+
+        @Override
+        public void buildCounter(Supplier<Number> countFunction) {
+            FunctionCounter.builder(name, countFunction, x -> countFunction.get().doubleValue())
+                    .description(description)
+                    .baseUnit(unit)
+                    .tags(tags)
+                    .register(globalRegistry);
+        }
+
+        @Override
+        public <T, R extends Number> void buildCounter(T obj, Function<T, R> countFunction) {
+            FunctionCounter.builder(name, obj, x -> countFunction.apply(x).doubleValue())
+                    .description(description)
+                    .baseUnit(unit)
+                    .tags(tags)
+                    .register(globalRegistry);
+        }
+
+        @Override
+        public void buildGauge(Supplier<Number> gaugeFunction) {
+            Gauge.builder(name, gaugeFunction)
+                    .description(description)
+                    .baseUnit(unit)
+                    .tags(tags)
+                    .strongReference(true)
+                    .register(globalRegistry);
+        }
+
+        @Override
+        public <T, R extends Number> void buildGauge(T obj, Function<T, R> gaugeFunction) {
+            Gauge.builder(name, obj, x -> gaugeFunction.apply(obj).doubleValue())
+                    .description(description)
+                    .baseUnit(unit)
+                    .tags(tags)
+                    .strongReference(true)
+                    .register(globalRegistry);
+        }
+
+        @Override
+        public TimeRecorder buildTimer() {
+            Timer timer = Timer.builder(name)
+                    .description(description)
+                    .tags(tags)
+                    .register(globalRegistry);
+
+            return new MicrometerTimeRecorder(timer);
+        }
+
+        @Override
+        public Runnable buildTimer(Runnable f) {
+            Timer timer = Timer.builder(name)
+                    .description(description)
+                    .tags(tags)
+                    .register(globalRegistry);
+
+            return timer.wrap(f);
+        }
+
+        @Override
+        public <T> Callable<T> buildTimer(Callable<T> f) {
+            Timer timer = Timer.builder(name)
+                    .description(description)
+                    .tags(tags)
+                    .register(globalRegistry);
+
+            return timer.wrap(f);
+        }
+
+        @Override
+        public <T> Supplier<T> buildTimer(Supplier<T> f) {
+            Timer timer = Timer.builder(name)
+                    .description(description)
+                    .tags(tags)
+                    .register(globalRegistry);
+
+            return timer.wrap(f);
+        }
+    }
+
+    class MicrometerTimeRecorder implements TimeRecorder {
+        Timer timer;
+
+        MicrometerTimeRecorder(Timer timer) {
+            this.timer = timer;
+        }
+
+        @Override
+        public void update(long amount, TimeUnit unit) {
+            timer.record(amount, unit);
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java
new file mode 100644
index 0000000000000..479777b793128
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java
@@ -0,0 +1,191 @@
+package io.quarkus.micrometer.runtime;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.graalvm.nativeimage.ImageInfo;
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.binder.MeterBinder;
+import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
+import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
+import io.micrometer.core.instrument.binder.system.UptimeMetrics;
+import io.micrometer.core.instrument.config.MeterFilter;
+import io.quarkus.arc.Arc;
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.binder.JVMInfoBinder;
+import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.HttpClientConfig;
+import io.quarkus.micrometer.runtime.config.runtime.HttpServerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.ShutdownContext;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+@Recorder
+public class MicrometerRecorder {
+    private static final Logger log = Logger.getLogger(MicrometerRecorder.class);
+    static final String DEFAULT_EXCEPTION_TAG_VALUE = "none";
+    static MicrometerMetricsFactory factory;
+
+    /* STATIC_INIT */
+    public RuntimeValue<MeterRegistry> createRootRegistry(MicrometerConfig config) {
+        VertxMeterBinderAdapter.setMeterRegistry(Metrics.globalRegistry);
+        factory = new MicrometerMetricsFactory(config, Metrics.globalRegistry);
+        return new RuntimeValue<>(Metrics.globalRegistry);
+    }
+
+    /* RUNTIME_INIT */
+    public void configureRegistries(MicrometerConfig config,
+            Set<Class<? extends MeterRegistry>> registryClasses,
+            ShutdownContext context) {
+        BeanManager beanManager = Arc.container().beanManager();
+
+        List<MeterRegistry> allRegistries = new ArrayList<>();
+        Map<Class<? extends MeterRegistry>, List<MeterFilter>> classMeterFilters = new HashMap<>(registryClasses.size());
+
+        // Find global/common registry configuration
+        Instance<MeterFilter> globalFilters = beanManager.createInstance()
+                .select(MeterFilter.class, Default.Literal.INSTANCE);
+
+        // Find MeterFilters for specific registry classes, i.e.:
+        // @MeterFilterConstraint(applyTo = DatadogMeterRegistry.class) Instance<MeterFilter> filters
+        log.debugf("Configuring Micrometer registries : %s", registryClasses);
+        for (Class<? extends MeterRegistry> typeClass : registryClasses) {
+            Instance<MeterFilter> classFilters = beanManager.createInstance()
+                    .select(MeterFilter.class, new MeterFilterConstraint.Literal(typeClass));
+            if (!classFilters.isUnsatisfied()) {
+                log.debugf("MeterFilter discovered for %s", typeClass);
+                classMeterFilters.computeIfAbsent(typeClass, k -> new ArrayList<>()).add(classFilters.get());
+            }
+        }
+
+        // Find and configure MeterRegistry beans (includes runtime config)
+        Set<Bean<?>> beans = new HashSet<>(beanManager.getBeans(MeterRegistry.class, Any.Literal.INSTANCE));
+        beans.removeIf(bean -> bean.getBeanClass().equals(CompositeRegistryCreator.class));
+
+        for (Bean<?> i : beans) {
+            MeterRegistry registry = (MeterRegistry) beanManager
+                    .getReference(i, MeterRegistry.class, beanManager.createCreationalContext(i));
+
+            // Add & configure non-root registries
+            if (registry != Metrics.globalRegistry) {
+                applyMeterFilters(registry, globalFilters, classMeterFilters.get(registry.getClass()));
+                log.debugf("Adding configured registry %s", registry.getClass(), registry);
+                Metrics.globalRegistry.add(registry);
+                allRegistries.add(registry);
+            }
+        }
+
+        // Base JVM Metrics
+        if (config.binder.jvm) {
+            new ClassLoaderMetrics().bindTo(Metrics.globalRegistry);
+            new JvmHeapPressureMetrics().bindTo(Metrics.globalRegistry);
+            new JvmMemoryMetrics().bindTo(Metrics.globalRegistry);
+            new JvmThreadMetrics().bindTo(Metrics.globalRegistry);
+            new JVMInfoBinder().bindTo(Metrics.globalRegistry);
+            if (!ImageInfo.inImageCode()) {
+                new JvmGcMetrics().bindTo(Metrics.globalRegistry);
+            }
+        }
+
+        // System
+        if (config.binder.system) {
+            new UptimeMetrics().bindTo(Metrics.globalRegistry);
+            new ProcessorMetrics().bindTo(Metrics.globalRegistry);
+            new FileDescriptorMetrics().bindTo(Metrics.globalRegistry);
+        }
+
+        // Discover and bind MeterBinders (includes annotated gauges, etc)
+        // This must be done at runtime. If done before backend registries are
+        // configured, some measurements may be missed.
+        Instance<MeterBinder> allBinders = beanManager.createInstance()
+                .select(MeterBinder.class, Any.Literal.INSTANCE);
+        allBinders.forEach(x -> x.bindTo(Metrics.globalRegistry));
+
+        context.addShutdownTask(new Runnable() {
+            @Override
+            public void run() {
+                Collection<MeterRegistry> cleanup = new ArrayList<>(Metrics.globalRegistry.getRegistries());
+                cleanup.forEach(x -> {
+                    x.close();
+                    Metrics.removeRegistry(x);
+                });
+            }
+        });
+    }
+
+    void applyMeterFilters(MeterRegistry registry, Instance<MeterFilter> globalFilters, List<MeterFilter> classFilters) {
+        // Apply global filters to the registry
+        if (!globalFilters.isUnsatisfied()) {
+            for (MeterFilter generalFilter : globalFilters) {
+                registry.config().meterFilter(generalFilter);
+            }
+        }
+
+        // Apply type/class-specific MeterFilters, if any
+        if (classFilters != null) {
+            for (MeterFilter meterFilter : classFilters) {
+                registry.config().meterFilter(meterFilter);
+            }
+        }
+    }
+
+    public void registerMetrics(Consumer<MetricsFactory> consumer) {
+        consumer.accept(factory);
+    }
+
+    public static Class<?> getClassForName(String classname) {
+        Class<?> clazz = null;
+        try {
+            clazz = Class.forName(classname, false, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
+        log.debugf("getClass: TCCL: %s ## %s : %s", Thread.currentThread().getContextClassLoader(), classname, (clazz != null));
+        return clazz;
+    }
+
+    static String getExceptionTag(Throwable throwable) {
+        if (throwable == null) {
+            return DEFAULT_EXCEPTION_TAG_VALUE;
+        }
+        if (throwable.getCause() == null) {
+            return throwable.getClass().getSimpleName();
+        }
+        return throwable.getCause().getClass().getSimpleName();
+    }
+
+    /* RUNTIME_INIT */
+    public RuntimeValue<HttpBinderConfiguration> configureHttpMetrics(
+            boolean httpServerMetricsEnabled,
+            boolean httpClientMetricsEnabled,
+            HttpServerConfig serverConfig,
+            HttpClientConfig clientConfig,
+            VertxConfig vertxConfig) {
+        return new RuntimeValue<HttpBinderConfiguration>(
+                new HttpBinderConfiguration(httpServerMetricsEnabled,
+                        httpClientMetricsEnabled,
+                        serverConfig, clientConfig, vertxConfig));
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimed.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimed.java
new file mode 100644
index 0000000000000..2e90821cea451
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimed.java
@@ -0,0 +1,16 @@
+package io.quarkus.micrometer.runtime;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@Inherited
+@InterceptorBinding
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MicrometerTimed {
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java
new file mode 100644
index 0000000000000..7f843fc6aa804
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerTimedInterceptor.java
@@ -0,0 +1,159 @@
+package io.quarkus.micrometer.runtime;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.CompletionStage;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+
+/**
+ * Quarkus defined interceptor for types or methods annotated with {@link Timed @Timed}.
+ *
+ * @see Timed
+ */
+@Interceptor
+@MicrometerTimed
+@Priority(Interceptor.Priority.LIBRARY_BEFORE + 10)
+public class MicrometerTimedInterceptor {
+    private static final Logger log = Logger.getLogger(MicrometerTimedInterceptor.class);
+    public static final String DEFAULT_METRIC_NAME = "method.timed";
+
+    private final MeterRegistry meterRegistry;
+
+    public MicrometerTimedInterceptor(MeterRegistry meterRegistry) {
+        this.meterRegistry = meterRegistry;
+    }
+
+    @AroundInvoke
+    Object timedMethod(InvocationContext context) throws Exception {
+        Method method = context.getMethod();
+        Timed timed = method.getAnnotation(Timed.class);
+        if (timed == null) {
+            return context.proceed();
+        }
+
+        Tags commonTags = getCommonTags(method.getDeclaringClass().getName(), method.getName());
+        final boolean stopWhenCompleted = CompletionStage.class.isAssignableFrom(method.getReturnType());
+
+        return time(context, timed, commonTags, stopWhenCompleted);
+    }
+
+    Object time(InvocationContext context, Timed timed, Tags commonTags, boolean stopWhenCompleted) throws Exception {
+        final String metricName = timed.value().isEmpty() ? DEFAULT_METRIC_NAME : timed.value();
+
+        if (timed.longTask()) {
+            return processWithLongTaskTimer(context, timed, commonTags, metricName, stopWhenCompleted);
+        } else {
+            return processWithTimer(context, timed, commonTags, metricName, stopWhenCompleted);
+        }
+    }
+
+    private Object processWithTimer(InvocationContext context, Timed timed, Tags commonTags, String metricName,
+            boolean stopWhenCompleted) throws Exception {
+
+        Timer.Sample sample = Timer.start(meterRegistry);
+        Tags timerTags = Tags.concat(commonTags, timed.extraTags());
+
+        if (stopWhenCompleted) {
+            try {
+                return ((CompletionStage<?>) context.proceed()).whenComplete((result, throwable) -> {
+                    record(timed, metricName, sample, MicrometerRecorder.getExceptionTag(throwable), timerTags);
+                });
+            } catch (Exception ex) {
+                record(timed, metricName, sample, MicrometerRecorder.getExceptionTag(ex), timerTags);
+                throw ex;
+            }
+        }
+
+        String exceptionClass = MicrometerRecorder.getExceptionTag(null);
+        try {
+            return context.proceed();
+        } catch (Exception ex) {
+            exceptionClass = MicrometerRecorder.getExceptionTag(ex);
+            throw ex;
+        } finally {
+            record(timed, metricName, sample, exceptionClass, timerTags);
+        }
+    }
+
+    private void record(Timed timed, String metricName, Timer.Sample sample, String exceptionClass, Tags timerTags) {
+        try {
+            Timer.Builder builder = Timer.builder(metricName)
+                    .description(timed.description().isEmpty() ? null : timed.description())
+                    .tags(timerTags)
+                    .tag("exception", exceptionClass)
+                    .publishPercentileHistogram(timed.histogram())
+                    .publishPercentiles(timed.percentiles().length == 0 ? null : timed.percentiles());
+
+            sample.stop(builder.register(meterRegistry));
+        } catch (Exception e) {
+            // ignoring on purpose: possible meter registration error should not interrupt main code flow.
+            log.warnf(e, "Unable to record observed timer value for %s with exceptionClass %s",
+                    metricName, exceptionClass);
+        }
+    }
+
+    private Object processWithLongTaskTimer(InvocationContext context, Timed timed, Tags commonTags, String metricName,
+            boolean stopWhenCompleted) throws Exception {
+        LongTaskTimer.Sample sample = startLongTaskTimer(timed, commonTags, metricName);
+        if (sample == null) {
+            return context.proceed();
+        }
+
+        if (stopWhenCompleted) {
+            try {
+                return ((CompletionStage<?>) context.proceed())
+                        .whenComplete((result, throwable) -> stopLongTaskTimer(metricName, sample));
+            } catch (Exception ex) {
+                stopLongTaskTimer(metricName, sample);
+                throw ex;
+            }
+        }
+
+        try {
+            return context.proceed();
+        } finally {
+            stopLongTaskTimer(metricName, sample);
+        }
+    }
+
+    LongTaskTimer.Sample startLongTaskTimer(Timed timed, Tags commonTags, String metricName) {
+        try {
+            // This will throw if the annotation is incorrect.
+            // Errors are checked for at build time, but ...
+            return LongTaskTimer.builder(metricName)
+                    .description(timed.description().isEmpty() ? null : timed.description())
+                    .tags(commonTags)
+                    .tags(timed.extraTags())
+                    .register(meterRegistry)
+                    .start();
+        } catch (Exception e) {
+            // ignoring on purpose: possible meter registration error should not interrupt main code flow.
+            log.warnf(e, "Unable to create long task timer named %s", metricName);
+            return null;
+        }
+    }
+
+    private void stopLongTaskTimer(String metricName, LongTaskTimer.Sample sample) {
+        try {
+            sample.stop();
+        } catch (Exception e) {
+            // ignoring on purpose
+            log.warnf(e, "Unable to update long task timer named %s", metricName);
+        }
+    }
+
+    private Tags getCommonTags(String className, String methodName) {
+        return Tags.of("class", className, "method", methodName);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpBinderConfiguration.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpBinderConfiguration.java
new file mode 100644
index 0000000000000..c32466d157c6b
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpBinderConfiguration.java
@@ -0,0 +1,117 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.micrometer.runtime.config.runtime.HttpClientConfig;
+import io.quarkus.micrometer.runtime.config.runtime.HttpServerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+
+/**
+ * Digest configuration options for http metrics once, so they can
+ * be used by different binders emitting http metrics (depending on
+ * other extension configuration).
+ *
+ * This is a synthetic bean created at runtime init (see MicrometerRecorder),
+ * it cannot be referenced during build or static initialization.
+ */
+public class HttpBinderConfiguration {
+    private static final Logger log = Logger.getLogger(HttpBinderConfiguration.class);
+
+    boolean serverEnabled = true;
+    boolean clientEnabled = true;
+
+    List<Pattern> serverIgnorePatterns = Collections.emptyList();
+    Map<Pattern, String> serverMatchPatterns = Collections.emptyMap();
+
+    List<Pattern> clientIgnorePatterns = Collections.emptyList();
+    Map<Pattern, String> clientMatchPatterns = Collections.emptyMap();
+
+    @SuppressWarnings("deprecation")
+    public HttpBinderConfiguration(boolean httpServerMetrics, boolean httpClientMetrics,
+            HttpServerConfig serverConfig, HttpClientConfig clientConfig, VertxConfig vertxConfig) {
+
+        serverEnabled = httpServerMetrics;
+        clientEnabled = httpClientMetrics;
+
+        if (serverEnabled) {
+            // Handle deprecated/previous vertx properties as well
+            serverIgnorePatterns = getIgnorePatterns(
+                    serverConfig.ignorePatterns.isPresent() ? serverConfig.ignorePatterns : vertxConfig.ignorePatterns);
+            serverMatchPatterns = getMatchPatterns(
+                    serverConfig.matchPatterns.isPresent() ? serverConfig.matchPatterns : vertxConfig.matchPatterns);
+        }
+
+        if (clientEnabled) {
+            clientIgnorePatterns = getIgnorePatterns(clientConfig.ignorePatterns);
+            clientMatchPatterns = getMatchPatterns(clientConfig.matchPatterns);
+        }
+    }
+
+    public boolean isServerEnabled() {
+        return serverEnabled;
+    }
+
+    public List<Pattern> getServerIgnorePatterns() {
+        return serverIgnorePatterns;
+    }
+
+    public Map<Pattern, String> getServerMatchPatterns() {
+        return serverMatchPatterns;
+    }
+
+    public boolean isClientEnabled() {
+        return clientEnabled;
+    }
+
+    public List<Pattern> getClientIgnorePatterns() {
+        return clientIgnorePatterns;
+    }
+
+    public Map<Pattern, String> getClientMatchPatterns() {
+        return clientMatchPatterns;
+    }
+
+    List<Pattern> getIgnorePatterns(Optional<List<String>> configInput) {
+        if (configInput.isPresent()) {
+            List<String> input = configInput.get();
+            List<Pattern> ignorePatterns = new ArrayList<>(input.size());
+            for (String s : input) {
+                ignorePatterns.add(Pattern.compile(s));
+            }
+            return ignorePatterns;
+        }
+        return Collections.emptyList();
+    }
+
+    Map<Pattern, String> getMatchPatterns(Optional<List<String>> configInput) {
+        if (configInput.isPresent()) {
+            List<String> input = configInput.get();
+            Map<Pattern, String> matchPatterns = new LinkedHashMap<>(input.size());
+            for (String s : input) {
+                int pos = s.indexOf("=");
+                if (pos > 0 && s.length() > 2) {
+                    String pattern = s.substring(0, pos);
+                    String replacement = s.substring(pos + 1);
+                    try {
+                        matchPatterns.put(Pattern.compile(pattern), replacement);
+                    } catch (PatternSyntaxException pse) {
+                        log.errorf("Invalid pattern in replacement string (%s=%s): %s", pattern, replacement, pse);
+                    }
+                } else {
+                    log.errorf("Invalid pattern in replacement string (%s). Should be pattern=replacement", s);
+                }
+            }
+            return matchPatterns;
+        }
+        return Collections.emptyMap();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMetricsCommon.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMetricsCommon.java
new file mode 100644
index 0000000000000..ca6428974e870
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpMetricsCommon.java
@@ -0,0 +1,81 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import java.util.regex.Pattern;
+
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.binder.http.Outcome;
+
+public class HttpMetricsCommon {
+    public static final Tag URI_NOT_FOUND = Tag.of("uri", "NOT_FOUND");
+    public static final Tag URI_REDIRECTION = Tag.of("uri", "REDIRECTION");
+    public static final Tag URI_ROOT = Tag.of("uri", "root");
+    static final Tag URI_UNKNOWN = Tag.of("uri", "UNKNOWN");
+
+    static final Tag STATUS_UNKNOWN = Tag.of("status", "UNKNOWN");
+    public static final Tag STATUS_RESET = Tag.of("status", "RESET");
+
+    public static final Tag METHOD_UNKNOWN = Tag.of("method", "UNKNOWN");
+
+    public static final Pattern TRAILING_SLASH_PATTERN = Pattern.compile("/$");
+    public static final Pattern MULTIPLE_SLASH_PATTERN = Pattern.compile("//+");
+
+    /**
+     * Creates an {@code method} {@code Tag} derived from the given {@code HTTP method}.
+     *
+     * @param method the HTTP method
+     * @return the outcome tag
+     */
+    public static Tag method(String method) {
+        return method == null ? METHOD_UNKNOWN : Tag.of("method", method);
+    }
+
+    /**
+     * Creates a {@code status} tag based on the status of the given {@code response code}.
+     *
+     * @param statusCode the HTTP response code
+     * @return the status tag derived from the status of the response
+     */
+    public static Tag status(int statusCode) {
+        return (statusCode > 0) ? Tag.of("status", Integer.toString(statusCode)) : STATUS_UNKNOWN;
+    }
+
+    /**
+     * Creates an {@code outcome} {@code Tag} derived from the given {@code response code}.
+     *
+     * @param statusCode the HTTP response code
+     * @return the outcome tag
+     */
+    public static Tag outcome(int statusCode) {
+        return Outcome.forStatus(statusCode).asTag();
+    }
+
+    /**
+     * Creates a {@code uri} tag based on the URI of the given {@code request}.
+     * Falling back to {@code REDIRECTION} for 3xx responses, {@code NOT_FOUND}
+     * for 404 responses, {@code root} for requests with no path info, and {@code UNKNOWN}
+     * for all other requests.
+     *
+     *
+     * @param pathInfo
+     * @param code status code of the response
+     * @return the uri tag derived from the request
+     */
+    public static Tag uri(String pathInfo, int code) {
+        if (code > 0) {
+            if (code / 100 == 3) {
+                return URI_REDIRECTION;
+            } else if (code == 404) {
+                return URI_NOT_FOUND;
+            }
+        }
+        if (pathInfo == null) {
+            return URI_UNKNOWN;
+        }
+        if (pathInfo.isEmpty() || "/".equals(pathInfo)) {
+            return URI_ROOT;
+        }
+
+        // Use first segment of request path
+        return Tag.of("uri", pathInfo);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpRequestMetric.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpRequestMetric.java
new file mode 100644
index 0000000000000..8815a6bfbabcf
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/HttpRequestMetric.java
@@ -0,0 +1,195 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.vertx.ext.web.RoutingContext;
+
+public class HttpRequestMetric {
+    static final Logger log = Logger.getLogger(HttpRequestMetric.class);
+
+    public static final String HTTP_REQUEST_PATH = "HTTP_REQUEST_PATH";
+    public static final String HTTP_REQUEST_PATH_MATCHED = "HTTP_REQUEST_MATCHED_PATH";
+    public static final Pattern VERTX_ROUTE_PARAM = Pattern.compile("^:(.*)$");
+
+    /** Cache of vert.x resolved paths: /item/:id --> /item/{id} */
+    final static ConcurrentHashMap<String, String> templatePath = new ConcurrentHashMap<>();
+
+    volatile RoutingContext routingContext;
+
+    /** Do not measure requests until/unless a uri path is set */
+    final boolean measure;
+
+    /** URI path used as a tag value for non-error requests */
+    final String path;
+
+    /** True IFF the path was revised by a matcher expression */
+    final boolean pathMatched;
+
+    /** Store the sample used to measure the request */
+    Timer.Sample sample;
+
+    /**
+     * Store the tags associated with the request (change 1.6.0).
+     * Default is empty, value assigned @ requestBegin
+     */
+    Tags tags = Tags.empty();
+
+    /**
+     * Extract the path out of the uri. Return null if the path should be
+     * ignored.
+     */
+    public HttpRequestMetric(Map<Pattern, String> matchPattern, List<Pattern> ignorePatterns,
+            String uri) {
+        if (uri == null) {
+            this.measure = false;
+            this.pathMatched = false;
+            this.path = null;
+            return;
+        }
+
+        boolean matched = false;
+        String workingPath = extractPath(uri);
+        String finalPath = workingPath;
+        if ("/".equals(workingPath) || workingPath.isEmpty()) {
+            finalPath = "/";
+        } else {
+            // Label value consistency: result should begin with a '/' and should not end with one
+            workingPath = HttpMetricsCommon.MULTIPLE_SLASH_PATTERN.matcher('/' + workingPath).replaceAll("/");
+            workingPath = HttpMetricsCommon.TRAILING_SLASH_PATTERN.matcher(workingPath).replaceAll("");
+            if (workingPath.isEmpty()) {
+                finalPath = "/";
+            } else {
+                finalPath = workingPath;
+                // test path against configured patterns (whole path)
+                for (Map.Entry<Pattern, String> mp : matchPattern.entrySet()) {
+                    if (mp.getKey().matcher(workingPath).matches()) {
+                        finalPath = mp.getValue();
+                        matched = true;
+                        break;
+                    }
+                }
+            }
+        }
+        this.path = finalPath;
+        this.pathMatched = matched;
+
+        // Compare path against "ignore this path" patterns
+        for (Pattern p : ignorePatterns) {
+            if (p.matcher(this.path).matches()) {
+                log.debugf("Path %s ignored; matches pattern %s", uri, p.pattern());
+                this.measure = false;
+                return;
+            }
+        }
+        this.measure = true;
+    }
+
+    public Timer.Sample getSample() {
+        return sample;
+    }
+
+    public void setSample(Timer.Sample sample) {
+        this.sample = sample;
+    }
+
+    public Tags getTags() {
+        return tags;
+    }
+
+    public void setTags(Tags tags) {
+        this.tags = tags;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public boolean isMeasure() {
+        return measure;
+    }
+
+    public boolean isPathMatched() {
+        return pathMatched;
+    }
+
+    private static String extractPath(String uri) {
+        if (uri.isEmpty()) {
+            return uri;
+        }
+        int i;
+        if (uri.charAt(0) == '/') {
+            i = 0;
+        } else {
+            i = uri.indexOf("://");
+            if (i == -1) {
+                i = 0;
+            } else {
+                i = uri.indexOf('/', i + 3);
+                if (i == -1) {
+                    // contains no /
+                    return "/";
+                }
+            }
+        }
+
+        int queryStart = uri.indexOf('?', i);
+        if (queryStart == -1) {
+            queryStart = uri.length();
+        }
+        return uri.substring(i, queryStart);
+    }
+
+    public String getHttpRequestPath() {
+        // Vertx binder configuration, see VertxMetricsTags
+        if (pathMatched) {
+            return path;
+        }
+        if (routingContext != null) {
+            // JAX-RS or Servlet container filter
+            String rcPath = routingContext.get(HTTP_REQUEST_PATH);
+            if (rcPath != null) {
+                return rcPath;
+            }
+            // vertx-web or reactive route
+            String matchedPath = routingContext.currentRoute().getPath();
+            if (matchedPath != null) {
+                if (matchedPath.contains(":")) {
+                    // Convert /item/:id to /item/{id} and save it for next time
+                    matchedPath = templatePath.computeIfAbsent(matchedPath, k -> {
+                        String segments[] = k.split("/");
+                        for (int i = 0; i < segments.length; i++) {
+                            segments[i] = VERTX_ROUTE_PARAM.matcher(segments[i]).replaceAll("{$1}");
+                        }
+                        return String.join("/", segments);
+                    });
+                }
+                return matchedPath;
+            }
+        }
+        return path;
+    }
+
+    public RoutingContext getRoutingContext() {
+        return routingContext;
+    }
+
+    public void setRoutingContext(RoutingContext routingContext) {
+        this.routingContext = routingContext;
+    }
+
+    @Override
+    public String toString() {
+        return "HttpRequestMetric{path=" + path
+                + ",pathMatched=" + pathMatched
+                + ",measure=" + measure
+                + ",tags=" + tags
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/JVMInfoBinder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/JVMInfoBinder.java
new file mode 100644
index 0000000000000..253bfabda4c3f
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/JVMInfoBinder.java
@@ -0,0 +1,19 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.MeterBinder;
+
+public class JVMInfoBinder implements MeterBinder {
+
+    @Override
+    public void bindTo(MeterRegistry registry) {
+        Counter.builder("jvm.info")
+                .description("JVM version info")
+                .tags("version", System.getProperty("java.runtime.version", "unknown"),
+                        "vendor", System.getProperty("java.vm.vendor", "unknown"),
+                        "runtime", System.getProperty("java.runtime.name", "unknown"))
+                .register(registry)
+                .increment();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetrics.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetrics.java
new file mode 100644
index 0000000000000..4e36d76d2da85
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetrics.java
@@ -0,0 +1,109 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import java.io.IOException;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.spi.RestClientListener;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.quarkus.arc.Arc;
+
+/**
+ * This is initialized via ServiceFactory (static/non-CDI initialization)
+ */
+public class RestClientMetrics implements RestClientListener {
+    private static final String HTTP_CLIENT_METRIC_NAME = "http.client.requests";
+    private final static String REQUEST_METRIC_PROPERTY = "restClientMetrics";
+
+    final MeterRegistry registry = Metrics.globalRegistry;
+    MetricsClientRequestFilter clientRequestFilter;
+    MetricsClientResponseFilter clientResponseFilter;
+
+    @Override
+    public void onNewClient(Class<?> serviceInterface, RestClientBuilder builder) {
+        builder.register(getClientRequestFilter());
+        builder.register(getClientResponseFilter());
+    }
+
+    // Lazy init: multiple instances aren't harmful, synchronization not necessary
+    MetricsClientRequestFilter getClientRequestFilter() {
+        MetricsClientRequestFilter clientFilter = this.clientRequestFilter;
+        if (clientFilter == null) {
+            HttpBinderConfiguration httpMetricsConfig = Arc.container().instance(HttpBinderConfiguration.class).get();
+            clientFilter = this.clientRequestFilter = new MetricsClientRequestFilter(httpMetricsConfig);
+        }
+        return clientFilter;
+    }
+
+    // Lazy init: multiple instances aren't harmful, synchronization not necessary
+    MetricsClientResponseFilter getClientResponseFilter() {
+        MetricsClientResponseFilter clientFilter = this.clientResponseFilter;
+        if (clientFilter == null) {
+            clientFilter = this.clientResponseFilter = new MetricsClientResponseFilter();
+        }
+        return clientFilter;
+    }
+
+    class MetricsClientRequestFilter implements ClientRequestFilter {
+        HttpBinderConfiguration binderConfiguration;
+
+        MetricsClientRequestFilter(HttpBinderConfiguration binderConfiguration) {
+            this.binderConfiguration = binderConfiguration;
+        }
+
+        @Override
+        public void filter(ClientRequestContext requestContext) throws IOException {
+            HttpRequestMetric requestMetric = new HttpRequestMetric(
+                    binderConfiguration.getClientMatchPatterns(),
+                    binderConfiguration.getClientIgnorePatterns(),
+                    requestContext.getUri().getPath());
+
+            if (requestMetric.isMeasure()) {
+                requestMetric.setSample(Timer.start(registry));
+                requestContext.setProperty(REQUEST_METRIC_PROPERTY, requestMetric);
+            }
+        }
+    }
+
+    class MetricsClientResponseFilter implements ClientResponseFilter {
+        @Override
+        public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
+            HttpRequestMetric requestMetric = getRequestMetric(requestContext);
+            if (requestMetric != null) {
+                Timer.Sample sample = requestMetric.sample;
+                String requestPath = requestMetric.getHttpRequestPath();
+                int statusCode = responseContext.getStatus();
+                Timer.Builder builder = Timer.builder(HTTP_CLIENT_METRIC_NAME)
+                        .tags(Tags.of(
+                                HttpMetricsCommon.method(requestContext.getMethod()),
+                                HttpMetricsCommon.uri(requestPath, statusCode),
+                                HttpMetricsCommon.outcome(statusCode),
+                                HttpMetricsCommon.status(statusCode),
+                                clientName(requestContext)));
+
+                sample.stop(builder.register(registry));
+            }
+        }
+
+        private HttpRequestMetric getRequestMetric(ClientRequestContext requestContext) {
+            return (HttpRequestMetric) requestContext.getProperty(REQUEST_METRIC_PROPERTY);
+        }
+
+        private Tag clientName(ClientRequestContext requestContext) {
+            String host = requestContext.getUri().getHost();
+            if (host == null) {
+                host = "none";
+            }
+            return Tag.of("clientName", host);
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java
new file mode 100644
index 0000000000000..919af664de533
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserver.java
@@ -0,0 +1,92 @@
+package io.quarkus.micrometer.runtime.binder.kafka;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+import io.quarkus.runtime.ShutdownEvent;
+
+/**
+ * Observer to create and register KafkaClientMetrics.
+ *
+ * This observer uses only classes from "kafka-clients" and none from "kafka-streams".
+ *
+ * Must be separated from KafkaStreamsEventObserver, because they use different dependencies and if only kafka-client is used,
+ * the classes from kafka-streams aren't loaded.
+ */
+@ApplicationScoped
+public class KafkaEventObserver {
+    private static final Logger log = Logger.getLogger(KafkaEventObserver.class);
+
+    final MeterRegistry registry = Metrics.globalRegistry;
+    Map<Object, KafkaClientMetrics> clientMetrics = new HashMap<>();
+
+    /**
+     * Manage bind/close of KafkaClientMetrics for the specified Consumer.
+     * If the consumer has not been seen before, it will be bound to the
+     * Micrometer registry and instrumented using a Kafka MeterBinder.
+     * If the consumer has been seen before, the MeterBinder will be closed.
+     * 
+     * @param consumer Observed Kafka Consumer
+     */
+    public synchronized void consumerCreated(@Observes Consumer<?, ?> consumer) {
+        KafkaClientMetrics metrics = clientMetrics.remove(consumer);
+        if (metrics == null) {
+            metrics = new KafkaClientMetrics(consumer);
+            try {
+                metrics.bindTo(registry);
+                clientMetrics.put(consumer, metrics);
+            } catch (Throwable t) {
+                log.warnf(t, "Unable to register metrics for Kafka consumer %s", consumer);
+                tryToClose(metrics);
+            }
+        } else {
+            tryToClose(metrics);
+        }
+    }
+
+    /**
+     * Manage bind/close of KafkaClientMetrics for the specified Producer.
+     * If the producer has not been seen before, it will be bound to the
+     * Micrometer registry and instrumented using a Kafka MeterBinder.
+     * If the producer has been seen before, the MeterBinder will be closed.
+     * 
+     * @param producer Observed Kafka Producer
+     */
+    public synchronized void producerCreated(@Observes Producer<?, ?> producer) {
+        KafkaClientMetrics metrics = clientMetrics.remove(producer);
+        if (metrics == null) {
+            metrics = new KafkaClientMetrics(producer);
+            try {
+                metrics.bindTo(registry);
+                clientMetrics.put(producer, metrics);
+            } catch (Throwable t) {
+                log.warnf(t, "Unable to register metrics for Kafka producer %s", producer);
+                tryToClose(metrics);
+            }
+        } else {
+            tryToClose(metrics);
+        }
+    }
+
+    void onStop(@Observes ShutdownEvent event) {
+        clientMetrics.values().forEach(this::tryToClose);
+    }
+
+    void tryToClose(AutoCloseable c) {
+        try {
+            c.close();
+        } catch (Exception e) {
+            // intentionally empty
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java
new file mode 100644
index 0000000000000..8d4de7f7023ca
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserver.java
@@ -0,0 +1,61 @@
+package io.quarkus.micrometer.runtime.binder.kafka;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.apache.kafka.streams.KafkaStreams;
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
+import io.quarkus.runtime.ShutdownEvent;
+
+/**
+ * Observer to create and register KafkaStreamsMetrics.
+ * 
+ * Must be separated from KafkaEventObserver, because they use different dependencies and if only "kafka-client" is used, the
+ * classes from "kafka-streams" aren't loaded.
+ */
+@ApplicationScoped
+public class KafkaStreamsEventObserver {
+    private static final Logger log = Logger.getLogger(KafkaStreamsEventObserver.class);
+
+    final MeterRegistry registry = Metrics.globalRegistry;
+    KafkaStreamsMetrics kafkaStreamsMetrics;
+
+    /**
+     * Manage bind/close of KafkaStreamsMetrics for the specified KafkaStreams client.
+     * If the kafkaStreams has not been seen before, it will be bound to the
+     * Micrometer registry and instrumented using a Kafka MeterBinder.
+     * If the kafkaStreams has been seen before, the MeterBinder will be closed.
+     *
+     * @param kafkaStreams Observed KafkaStreams instance
+     */
+    public synchronized void kafkaStreamsCreated(@Observes KafkaStreams kafkaStreams) {
+        if (kafkaStreamsMetrics == null) {
+            kafkaStreamsMetrics = new KafkaStreamsMetrics(kafkaStreams);
+            try {
+                kafkaStreamsMetrics.bindTo(registry);
+            } catch (Throwable t) {
+                log.warnf(t, "Unable to register metrics for KafkaStreams %s", kafkaStreams);
+                tryToClose(kafkaStreamsMetrics);
+            }
+        } else {
+            tryToClose(kafkaStreamsMetrics);
+        }
+    }
+
+    void onStop(@Observes ShutdownEvent event) {
+        tryToClose(kafkaStreamsMetrics);
+    }
+
+    void tryToClose(AutoCloseable c) {
+        try {
+            c.close();
+        } catch (Exception e) {
+            // intentionally empty
+        }
+    }
+
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/AnnotatedGaugeAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/AnnotatedGaugeAdapter.java
new file mode 100644
index 0000000000000..67a2cf881029d
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/AnnotatedGaugeAdapter.java
@@ -0,0 +1,109 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.Arrays;
+
+import org.eclipse.microprofile.metrics.MetricType;
+
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+public interface AnnotatedGaugeAdapter extends org.eclipse.microprofile.metrics.Gauge<Number>, MeterHolder {
+    String name();
+
+    String description();
+
+    String[] tags();
+
+    String baseUnit();
+
+    /** Called by MpRegistryAdapter to register the gauge */
+    AnnotatedGaugeAdapter register(MetricDescriptor id, MeterRegistry registry);
+
+    MetricDescriptor getId();
+
+    MpMetadata getMetadata();
+
+    String getTargetName();
+
+    /**
+     * Generic base instance of an AnnotatedGaugeAdapter.
+     * Generated beans extend this base.
+     */
+    public static abstract class GaugeAdapterImpl implements AnnotatedGaugeAdapter {
+        final MpMetadata metadata;
+        final String targetName;
+        final String[] tags;
+
+        MetricDescriptor id;
+        Gauge gauge;
+
+        public GaugeAdapterImpl(String name, String description, String targetName, String[] tags) {
+            this(name, description, targetName, null, tags);
+        }
+
+        public GaugeAdapterImpl(String name, String description, String targetName, String baseUnit, String[] tags) {
+            this.metadata = new MpMetadata(name, description, baseUnit, MetricType.GAUGE);
+            this.targetName = name;
+            this.tags = tags;
+        }
+
+        /** Called by MpRegistryAdapter to register the gauge */
+        public GaugeAdapterImpl register(MetricDescriptor id, MeterRegistry registry) {
+            this.id = id;
+            if (gauge == null || metadata.cleanDirtyMetadata()) {
+                gauge = io.micrometer.core.instrument.Gauge.builder(metadata.name, this, g -> g.getValue().doubleValue())
+                        .description(metadata.description())
+                        .tags(id.tags())
+                        .baseUnit(metadata.unit())
+                        .strongReference(true)
+                        .register(registry);
+            }
+            return this;
+        }
+
+        public String name() {
+            return metadata.name;
+        }
+
+        public String description() {
+            return metadata.description;
+        }
+
+        public String baseUnit() {
+            return metadata.unit;
+        }
+
+        public String[] tags() {
+            return tags;
+        }
+
+        public Meter getMeter() {
+            return gauge;
+        }
+
+        public MetricDescriptor getId() {
+            return id;
+        }
+
+        public MpMetadata getMetadata() {
+            return metadata;
+        }
+
+        public MetricType getType() {
+            return MetricType.GAUGE;
+        }
+
+        public String getTargetName() {
+            return targetName;
+        }
+
+        public String toString() {
+            return this.getClass().getName()
+                    + "[ name=" + id.name
+                    + ", tags=" + Arrays.asList(id.tags)
+                    + ", target=" + targetName
+                    + "]";
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeImpl.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeImpl.java
new file mode 100644
index 0000000000000..0969e7eb203ae
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeImpl.java
@@ -0,0 +1,68 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.concurrent.atomic.LongAdder;
+
+import org.eclipse.microprofile.metrics.ConcurrentGauge;
+import org.eclipse.microprofile.metrics.MetricType;
+
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+class ConcurrentGaugeImpl implements ConcurrentGauge, MeterHolder {
+    final LongAdder longAdder = new LongAdder();
+    Gauge gauge;
+
+    ConcurrentGaugeImpl register(MpMetadata metadata, MetricDescriptor metricInfo, MeterRegistry registry) {
+        gauge = io.micrometer.core.instrument.Gauge.builder(metricInfo.name(), longAdder, LongAdder::doubleValue)
+                .description(metadata.description())
+                .baseUnit(metadata.unit())
+                .tags(metricInfo.tags())
+                .strongReference(true)
+                .register(registry);
+        return this;
+    }
+
+    @Override
+    public long getCount() {
+        return longAdder.longValue();
+    }
+
+    /**
+     * Not supported for micrometer. Min/max values per dropwizard
+     * would be provided by dropwizard capabilities if enabled.
+     */
+    @Override
+    public long getMax() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    /**
+     * Not supported for micrometer. Min/max values per dropwizard
+     * would be provided by dropwizard capabilities if enabled.
+     */
+    @Override
+    public long getMin() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public void inc() {
+        longAdder.increment();
+    }
+
+    @Override
+    public void dec() {
+        longAdder.decrement();
+    }
+
+    @Override
+    public Meter getMeter() {
+        return gauge;
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.CONCURRENT_GAUGE;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java
new file mode 100644
index 0000000000000..0234514388fa0
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/ConcurrentGaugeInterceptor.java
@@ -0,0 +1,58 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.AroundTimeout;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
+
+@ConcurrentGauge
+@Interceptor
+@Priority(Interceptor.Priority.LIBRARY_BEFORE + 10)
+class ConcurrentGaugeInterceptor {
+
+    // Micrometer meter registry
+    final MetricRegistryAdapter mpRegistry;
+
+    ConcurrentGaugeInterceptor(MetricRegistryAdapter mpRegistry) {
+        this.mpRegistry = mpRegistry;
+    }
+
+    @AroundConstruct
+    Object cGaugeConstructor(InvocationContext context) throws Exception {
+        return cGauge(context, context.getConstructor().getDeclaringClass().getSimpleName());
+    }
+
+    @AroundInvoke
+    Object cGaugeMethod(InvocationContext context) throws Exception {
+        return cGauge(context, context.getMethod().getName());
+    }
+
+    @AroundTimeout
+    Object cGaugeTimeout(InvocationContext context) throws Exception {
+        return cGauge(context, context.getMethod().getName());
+    }
+
+    Object cGauge(InvocationContext context, String methodName) throws Exception {
+        ConcurrentGauge annotation = MpMetricsRegistryProducer.getAnnotation(context, ConcurrentGauge.class);
+        if (annotation != null) {
+            MpMetadata metadata = new MpMetadata(annotation.name().replace("<method>", methodName),
+                    annotation.description().replace("<method>", methodName),
+                    annotation.unit(),
+                    MetricType.CONCURRENT_GAUGE);
+
+            ConcurrentGaugeImpl impl = mpRegistry.interceptorConcurrentGauge(metadata, annotation.tags());
+            try {
+                impl.inc();
+                return context.proceed();
+            } finally {
+                impl.dec();
+            }
+        }
+        return context.proceed();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java
new file mode 100644
index 0000000000000..96e456bacd5fe
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CountedInterceptor.java
@@ -0,0 +1,53 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.AroundTimeout;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.annotation.Counted;
+
+@SuppressWarnings("unused")
+@Counted
+@Interceptor
+@Priority(Interceptor.Priority.LIBRARY_BEFORE + 10)
+class CountedInterceptor {
+
+    // Micrometer meter registry
+    final MetricRegistryAdapter mpRegistry;
+
+    CountedInterceptor(MetricRegistryAdapter mpRegistry) {
+        this.mpRegistry = mpRegistry;
+    }
+
+    @AroundConstruct
+    Object countedConstructor(InvocationContext context) throws Exception {
+        return increment(context, context.getConstructor().getDeclaringClass().getSimpleName());
+    }
+
+    @AroundInvoke
+    Object countedMethod(InvocationContext context) throws Exception {
+        return increment(context, context.getMethod().getName());
+    }
+
+    @AroundTimeout
+    Object countedTimeout(InvocationContext context) throws Exception {
+        return increment(context, context.getMethod().getName());
+    }
+
+    Object increment(InvocationContext context, String methodName) throws Exception {
+        Counted annotation = MpMetricsRegistryProducer.getAnnotation(context, Counted.class);
+        if (annotation != null) {
+            MpMetadata metadata = new MpMetadata(annotation.name().replace("<method>", methodName),
+                    annotation.description().replace("<method>", methodName),
+                    annotation.unit(),
+                    MetricType.COUNTER);
+
+            mpRegistry.interceptorCounter(metadata, annotation.tags()).inc();
+        }
+        return context.proceed();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CounterAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CounterAdapter.java
new file mode 100644
index 0000000000000..3b22e5e8d0d98
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/CounterAdapter.java
@@ -0,0 +1,49 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import org.eclipse.microprofile.metrics.MetricType;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+class CounterAdapter implements org.eclipse.microprofile.metrics.Counter, MeterHolder {
+
+    Counter counter;
+
+    public CounterAdapter register(MpMetadata metadata, MetricDescriptor descriptor, MeterRegistry registry) {
+        if (counter == null || metadata.cleanDirtyMetadata()) {
+            counter = io.micrometer.core.instrument.Counter.builder(descriptor.name())
+                    .description(metadata.description())
+                    .baseUnit(metadata.unit())
+                    .tags(descriptor.tags())
+                    .register(registry);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void inc() {
+        counter.increment();
+    }
+
+    @Override
+    public void inc(long l) {
+        counter.increment((double) l);
+    }
+
+    @Override
+    public long getCount() {
+        return (long) counter.count();
+    }
+
+    @Override
+    public Meter getMeter() {
+        return counter;
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.COUNTER;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/GaugeAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/GaugeAdapter.java
new file mode 100644
index 0000000000000..72a2cfc067cdc
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/GaugeAdapter.java
@@ -0,0 +1,89 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.function.Supplier;
+import java.util.function.ToDoubleFunction;
+
+import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.MetricType;
+
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+interface GaugeAdapter<T> extends Gauge<T>, MeterHolder {
+
+    GaugeAdapter<T> register(MpMetadata metadata, MetricDescriptor metricInfo, MeterRegistry registry);
+
+    static class DoubleFunctionGauge<S> implements GaugeAdapter<Double> {
+        io.micrometer.core.instrument.Gauge gauge;
+
+        final S obj;
+        final ToDoubleFunction<S> f;
+
+        DoubleFunctionGauge(S obj, ToDoubleFunction<S> f) {
+            this.obj = obj;
+            this.f = f;
+        }
+
+        public GaugeAdapter<Double> register(MpMetadata metadata, MetricDescriptor metricInfo, MeterRegistry registry) {
+            gauge = io.micrometer.core.instrument.Gauge.builder(metricInfo.name(), obj, f)
+                    .description(metadata.description())
+                    .tags(metricInfo.tags())
+                    .baseUnit(metadata.unit())
+                    .strongReference(true)
+                    .register(registry);
+            return this;
+        }
+
+        @Override
+        public Meter getMeter() {
+            return gauge;
+        }
+
+        @Override
+        public Double getValue() {
+            return gauge.value();
+        }
+
+        @Override
+        public MetricType getType() {
+            return MetricType.GAUGE;
+        }
+    }
+
+    static class NumberSupplierGauge<T extends Number> implements GaugeAdapter<T> {
+        io.micrometer.core.instrument.Gauge gauge;
+        final Supplier<T> supplier;
+
+        NumberSupplierGauge(Supplier<T> supplier) {
+            this.supplier = supplier;
+        }
+
+        @Override
+        public GaugeAdapter<T> register(MpMetadata metadata, MetricDescriptor metricInfo, MeterRegistry registry) {
+            if (gauge == null || metadata.cleanDirtyMetadata()) {
+                gauge = io.micrometer.core.instrument.Gauge.builder(metricInfo.name(), (Supplier<Number>) supplier)
+                        .description(metadata.description())
+                        .tags(metricInfo.tags())
+                        .baseUnit(metadata.unit())
+                        .strongReference(true).register(registry);
+            }
+
+            return this;
+        }
+
+        @Override
+        public Meter getMeter() {
+            return gauge;
+        }
+
+        @Override
+        public T getValue() {
+            return supplier.get();
+        }
+
+        @Override
+        public MetricType getType() {
+            return MetricType.GAUGE;
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/HistogramAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/HistogramAdapter.java
new file mode 100644
index 0000000000000..adb7059a6123d
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/HistogramAdapter.java
@@ -0,0 +1,56 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import org.eclipse.microprofile.metrics.Histogram;
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.Snapshot;
+
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+class HistogramAdapter implements Histogram, MeterHolder {
+    DistributionSummary summary;
+
+    HistogramAdapter register(MpMetadata metadata, MetricDescriptor metricInfo, MeterRegistry registry) {
+        if (summary == null || metadata.cleanDirtyMetadata()) {
+            summary = io.micrometer.core.instrument.DistributionSummary.builder(metricInfo.name())
+                    .description(metadata.description())
+                    .baseUnit(metadata.unit())
+                    .tags(metricInfo.tags())
+                    .register(registry);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void update(int i) {
+        summary.record(i);
+    }
+
+    @Override
+    public void update(long l) {
+        summary.record(l);
+    }
+
+    @Override
+    public long getCount() {
+        return summary.count();
+    }
+
+    /** Not supported. */
+    @Override
+    public Snapshot getSnapshot() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public Meter getMeter() {
+        return summary;
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.HISTOGRAM;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java
new file mode 100644
index 0000000000000..ee9bd89432026
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/InjectedMetricProducer.java
@@ -0,0 +1,74 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.metrics.*;
+import org.eclipse.microprofile.metrics.annotation.Metric;
+import org.jboss.logging.Logger;
+
+/**
+ * Create default producer methods for {literal @}Inject {literal @}Metric
+ * annotations requiring {@code Meter}, {@code Timer}, {@code Counter},
+ * and {@code Histogram}.
+ *
+ * Due to build-time processing, {literal @}Metric annotations always have
+ * a name value that has been resolved according to MP Metrics naming conventions.
+ */
+@SuppressWarnings("unused")
+@Singleton
+class InjectedMetricProducer {
+    private static final Logger log = Logger.getLogger(InjectedMetricProducer.class);
+
+    // Micrometer meter registry
+    final MetricRegistryAdapter mpRegistry;
+
+    InjectedMetricProducer(MetricRegistryAdapter mpRegistry) {
+        this.mpRegistry = mpRegistry;
+    }
+
+    @Produces
+    Counter getCounter(InjectionPoint ip) {
+        Metric metricInfo = ip.getAnnotated().getAnnotation(Metric.class);
+        return mpRegistry.injectedCounter(metricInfo);
+    }
+
+    /**
+     * For a programmatic concurrent gauge, create a gauge around
+     * a simple implementation that uses a {@code LongAdder}.
+     * The metrics gathered this way will not be as rich as with the
+     * {@code LongTimerTask}-based metrics used with the
+     * {literal @}ConcurrentGauge annotation, but is the best the API
+     * semantics allow (decrement/increment).
+     */
+    @Produces
+    ConcurrentGauge getConcurrentGauge(InjectionPoint ip) {
+        Metric metricInfo = ip.getAnnotated().getAnnotation(Metric.class);
+        return mpRegistry.injectedConcurrentGauge(metricInfo);
+    }
+
+    @Produces
+    Histogram getHistogram(InjectionPoint ip) {
+        Metric metricInfo = ip.getAnnotated().getAnnotation(Metric.class);
+        return mpRegistry.injectedHistogram(metricInfo);
+    }
+
+    @Produces
+    Meter getMeter(InjectionPoint ip) {
+        Metric metricInfo = ip.getAnnotated().getAnnotation(Metric.class);
+        return mpRegistry.injectedMeter(metricInfo);
+    }
+
+    @Produces
+    SimpleTimer getSimpleTimer(InjectionPoint ip) {
+        Metric metricInfo = ip.getAnnotated().getAnnotation(Metric.class);
+        return mpRegistry.injectedSimpleTimer(metricInfo);
+    }
+
+    @Produces
+    Timer getTimer(InjectionPoint ip) {
+        Metric metricInfo = ip.getAnnotated().getAnnotation(Metric.class);
+        return mpRegistry.injectedTimer(metricInfo);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MeterAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MeterAdapter.java
new file mode 100644
index 0000000000000..b657763f86de2
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MeterAdapter.java
@@ -0,0 +1,68 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import org.eclipse.microprofile.metrics.Meter;
+import org.eclipse.microprofile.metrics.MetricType;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+
+class MeterAdapter implements Meter, MeterHolder {
+    Counter counter;
+
+    public MeterAdapter register(MpMetadata metadata, MetricDescriptor descriptor, MeterRegistry registry) {
+        if (counter == null || metadata.cleanDirtyMetadata()) {
+            counter = io.micrometer.core.instrument.Counter.builder(descriptor.name())
+                    .description(metadata.description())
+                    .baseUnit(metadata.unit())
+                    .tags(descriptor.tags())
+                    .register(registry);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void mark() {
+        counter.increment();
+    }
+
+    @Override
+    public void mark(long l) {
+        counter.increment(l);
+    }
+
+    @Override
+    public long getCount() {
+        return (long) counter.count();
+    }
+
+    @Override
+    public double getFifteenMinuteRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public double getFiveMinuteRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public double getMeanRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public double getOneMinuteRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public io.micrometer.core.instrument.Meter getMeter() {
+        return counter;
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.METERED;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MeterHolder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MeterHolder.java
new file mode 100644
index 0000000000000..6eb7f90d244a7
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MeterHolder.java
@@ -0,0 +1,12 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import org.eclipse.microprofile.metrics.Metric;
+import org.eclipse.microprofile.metrics.MetricType;
+
+import io.micrometer.core.instrument.Meter;
+
+interface MeterHolder extends Metric {
+    Meter getMeter();
+
+    MetricType getType();
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java
new file mode 100644
index 0000000000000..692397d451dce
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java
@@ -0,0 +1,136 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.Tag;
+import org.eclipse.microprofile.metrics.annotation.Metric;
+
+import io.micrometer.core.instrument.Tags;
+
+class MetricDescriptor {
+    final String name;
+    final Tags tags;
+    ExtendedMetricID metricId = null;
+
+    MetricDescriptor(String name, Tags tags) {
+        this.name = name;
+        this.tags = tags;
+    }
+
+    MetricDescriptor(String name, String... tags) {
+        this.name = name;
+        this.tags = Tags.of(tags);
+    }
+
+    public MetricDescriptor(Metric annotation) {
+        this.name = annotation.name();
+        this.tags = Tags.of(annotation.tags());
+    }
+
+    public MetricDescriptor(AnnotatedGaugeAdapter adapter) {
+        this.name = adapter.name();
+        this.tags = Tags.of(adapter.tags());
+    }
+
+    public String name() {
+        return name;
+    }
+
+    public Tags tags() {
+        return tags;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        MetricDescriptor that = (MetricDescriptor) o;
+        return Objects.equals(name, that.name) && Objects.equals(tags, that.tags);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(name);
+        result = 31 * result + tags.hashCode();
+        return result;
+    }
+
+    Tag[] convertTags() {
+        List<Tag> mpTags = new ArrayList<>();
+        tags.stream().forEach(x -> mpTags.add(new Tag(x.getKey(), x.getValue())));
+        return mpTags.toArray(new Tag[0]);
+    }
+
+    public String toString() {
+        return name + Arrays.asList(tags);
+    }
+
+    // Deal with ubiquitous MetricID containing nefarious TreeSet and arbitrary
+    // dips into MP Config
+
+    public MetricDescriptor(MetricID metricID) {
+        this.name = metricID.getName();
+        this.tags = extractTags(metricID.getTagsAsList());
+        this.metricId = sanitizeMetricID(metricID, this);
+    }
+
+    private Tags extractTags(List<Tag> tagsAsList) {
+        List<io.micrometer.core.instrument.Tag> list = new ArrayList<>();
+        for (Tag t : tagsAsList) {
+            list.add(io.micrometer.core.instrument.Tag.of(t.getTagName(), t.getTagValue()));
+        }
+        return Tags.of(list);
+    }
+
+    public MetricID toMetricID() {
+        ExtendedMetricID result = metricId;
+        if (result == null) {
+            result = metricId = new ExtendedMetricID(this);
+        }
+        return result;
+    }
+
+    public static ExtendedMetricID sanitizeMetricID(MetricID metricID, MetricDescriptor metricDescriptor) {
+        if (metricID instanceof ExtendedMetricID) {
+            return (ExtendedMetricID) metricID;
+        } else {
+            return new ExtendedMetricID(metricDescriptor);
+        }
+    }
+
+    /**
+     * Ensure all hashcode/equals comparisons are against MetricDescriptor
+     * data (not ancillary MP Config additions).
+     */
+    static class ExtendedMetricID extends MetricID {
+        final MetricDescriptor source;
+
+        public ExtendedMetricID(MetricDescriptor source) {
+            super(source.name(), source.convertTags());
+            this.source = source;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+            if (!super.equals(o))
+                return false;
+            ExtendedMetricID that = (ExtendedMetricID) o;
+            return source.equals(that.source);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(super.hashCode(), source);
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricRegistryAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricRegistryAdapter.java
new file mode 100644
index 0000000000000..18adb21071f0a
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricRegistryAdapter.java
@@ -0,0 +1,529 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+import java.util.function.ToDoubleFunction;
+
+import org.eclipse.microprofile.metrics.ConcurrentGauge;
+import org.eclipse.microprofile.metrics.Counter;
+import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.Histogram;
+import org.eclipse.microprofile.metrics.Metadata;
+import org.eclipse.microprofile.metrics.Meter;
+import org.eclipse.microprofile.metrics.Metric;
+import org.eclipse.microprofile.metrics.MetricFilter;
+import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry;
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.SimpleTimer;
+import org.eclipse.microprofile.metrics.Tag;
+import org.eclipse.microprofile.metrics.Timer;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+import io.smallrye.metrics.api.FunctionGaugeSupport;
+
+class MetricRegistryAdapter extends MetricRegistry implements FunctionGaugeSupport {
+
+    final Type type;
+    final MeterRegistry registry;
+
+    Map<MetricDescriptor, MeterHolder> constructedMeters = new ConcurrentHashMap<>();
+    Map<String, MpMetadata> metadataMap = new ConcurrentHashMap<>();
+
+    public MetricRegistryAdapter(Type type, MeterRegistry registry) {
+        this.type = type;
+        this.registry = registry;
+    }
+
+    @Override
+    public <T extends Metric> T register(String name, T t) throws IllegalArgumentException {
+        throw new UnsupportedOperationException("Can not register a pre-constructed Metric with Micrometer");
+    }
+
+    @Override
+    public <T extends Metric> T register(Metadata metadata, T t) throws IllegalArgumentException {
+        throw new UnsupportedOperationException("Can not register a pre-constructed Metric with Micrometer");
+    }
+
+    @Override
+    public <T extends Metric> T register(Metadata metadata, T t, Tag... tags) throws IllegalArgumentException {
+        throw new UnsupportedOperationException("Can not register a pre-constructed Metric with Micrometer");
+    }
+
+    @Override
+    public Counter counter(String name) {
+        return internalCounter(internalGetMetadata(name, MetricType.COUNTER),
+                new MetricDescriptor(name, scopeTags()));
+    }
+
+    @Override
+    public Counter counter(String name, Tag... tags) {
+        return internalCounter(internalGetMetadata(name, MetricType.COUNTER),
+                new MetricDescriptor(name, scopeTags(tags)));
+    }
+
+    @Override
+    public Counter counter(Metadata metadata) {
+        return internalCounter(internalGetMetadata(metadata, MetricType.COUNTER),
+                new MetricDescriptor(metadata.getName(), scopeTags()));
+    }
+
+    @Override
+    public Counter counter(Metadata metadata, Tag... tags) {
+        return internalCounter(internalGetMetadata(metadata, MetricType.COUNTER),
+                new MetricDescriptor(metadata.getName(), scopeTags(tags)));
+    }
+
+    Counter interceptorCounter(Metadata metadata, String... tags) {
+        return internalCounter(internalGetMetadata(metadata, MetricType.COUNTER),
+                new MetricDescriptor(metadata.getName(), tags));
+    }
+
+    Counter injectedCounter(org.eclipse.microprofile.metrics.annotation.Metric annotation) {
+        return internalCounter(
+                internalGetMetadata(annotation.name(), MetricType.COUNTER).merge(annotation),
+                new MetricDescriptor(annotation.name(), annotation.tags()));
+    }
+
+    CounterAdapter internalCounter(MpMetadata metadata, MetricDescriptor id) {
+        CounterAdapter result = checkCast(CounterAdapter.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new CounterAdapter()));
+        return result.register(metadata, id, registry);
+    }
+
+    @Override
+    public ConcurrentGauge concurrentGauge(String name) {
+        return internalConcurrentGauge(internalGetMetadata(name, MetricType.CONCURRENT_GAUGE),
+                new MetricDescriptor(name, scopeTags()));
+    }
+
+    @Override
+    public ConcurrentGauge concurrentGauge(String name, Tag... tags) {
+        return internalConcurrentGauge(internalGetMetadata(name, MetricType.CONCURRENT_GAUGE),
+                new MetricDescriptor(name, scopeTags(tags)));
+    }
+
+    @Override
+    public ConcurrentGauge concurrentGauge(Metadata metadata) {
+        return internalConcurrentGauge(internalGetMetadata(metadata, MetricType.CONCURRENT_GAUGE),
+                new MetricDescriptor(metadata.getName(), scopeTags()));
+    }
+
+    @Override
+    public ConcurrentGauge concurrentGauge(Metadata metadata, Tag... tags) {
+        return internalConcurrentGauge(internalGetMetadata(metadata, MetricType.CONCURRENT_GAUGE),
+                new MetricDescriptor(metadata.getName(), scopeTags(tags)));
+    }
+
+    ConcurrentGaugeImpl interceptorConcurrentGauge(Metadata metadata, String... tags) {
+        return internalConcurrentGauge(internalGetMetadata(metadata, MetricType.CONCURRENT_GAUGE),
+                new MetricDescriptor(metadata.getName(), tags));
+    }
+
+    ConcurrentGaugeImpl injectedConcurrentGauge(org.eclipse.microprofile.metrics.annotation.Metric annotation) {
+        return internalConcurrentGauge(
+                internalGetMetadata(annotation.name(), MetricType.CONCURRENT_GAUGE).merge(annotation),
+                new MetricDescriptor(annotation.name(), annotation.tags()));
+    }
+
+    ConcurrentGaugeImpl internalConcurrentGauge(MpMetadata metadata, MetricDescriptor id) {
+        ConcurrentGaugeImpl result = checkCast(ConcurrentGaugeImpl.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new ConcurrentGaugeImpl()));
+        return result.register(metadata, id, registry);
+    }
+
+    public <T> Gauge<Double> gauge(String name, T o, ToDoubleFunction<T> f) {
+        return internalGauge(internalGetMetadata(name, MetricType.GAUGE),
+                new MetricDescriptor(name, scopeTags()), o, f);
+    }
+
+    public <T> Gauge<Double> gauge(String name, T o, ToDoubleFunction<T> f, Tag... tags) {
+        return internalGauge(internalGetMetadata(name, MetricType.GAUGE),
+                new MetricDescriptor(name, scopeTags(tags)), o, f);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> GaugeAdapter<Double> internalGauge(MpMetadata metadata, MetricDescriptor id, T obj, ToDoubleFunction<T> f) {
+        GaugeAdapter.DoubleFunctionGauge<T> result = checkCast(GaugeAdapter.DoubleFunctionGauge.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new GaugeAdapter.DoubleFunctionGauge<>(obj, f)));
+        return result.register(metadata, id, registry);
+    }
+
+    public <T extends Number> Gauge<T> gauge(String name, Supplier<T> f) {
+        return internalGauge(internalGetMetadata(name, MetricType.GAUGE),
+                new MetricDescriptor(name, scopeTags()), f);
+    }
+
+    public <T extends Number> Gauge<T> gauge(String name, Supplier<T> f, Tag... tags) {
+        return internalGauge(internalGetMetadata(name, MetricType.GAUGE),
+                new MetricDescriptor(name, scopeTags(tags)), f);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T extends Number> GaugeAdapter<T> internalGauge(MpMetadata metadata, MetricDescriptor id, Supplier<T> f) {
+        GaugeAdapter<T> result = checkCast(GaugeAdapter.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new GaugeAdapter.NumberSupplierGauge<>(f)));
+        return result.register(metadata, id, registry);
+    }
+
+    void bindAnnotatedGauge(AnnotatedGaugeAdapter adapter) {
+        MetricDescriptor id = new MetricDescriptor(adapter.name(), adapter.tags());
+        AnnotatedGaugeAdapter oops = checkCast(AnnotatedGaugeAdapter.class, adapter.getMetadata(),
+                constructedMeters.putIfAbsent(id, adapter));
+        if (oops == null) {
+            metadataMap.put(adapter.name(), adapter.getMetadata());
+            adapter.register(id, registry);
+        } else {
+            throw new IllegalArgumentException(
+                    String.format("Gauge %s already exists. (existing='%s', new='%s')",
+                            adapter.getId(), oops.getTargetName(), adapter.getTargetName()));
+        }
+    }
+
+    @Override
+    public Histogram histogram(String name) {
+        return internalHistogram(internalGetMetadata(name, MetricType.HISTOGRAM),
+                new MetricDescriptor(name, scopeTags()));
+    }
+
+    @Override
+    public Histogram histogram(String name, Tag... tags) {
+        return internalHistogram(internalGetMetadata(name, MetricType.HISTOGRAM),
+                new MetricDescriptor(name, scopeTags(tags)));
+    }
+
+    @Override
+    public Histogram histogram(Metadata metadata) {
+        return internalHistogram(internalGetMetadata(metadata, MetricType.HISTOGRAM),
+                new MetricDescriptor(metadata.getName(), scopeTags()));
+    }
+
+    @Override
+    public Histogram histogram(Metadata metadata, Tag... tags) {
+        return internalHistogram(internalGetMetadata(metadata, MetricType.HISTOGRAM),
+                new MetricDescriptor(metadata.getName(), scopeTags(tags)));
+    }
+
+    HistogramAdapter injectedHistogram(org.eclipse.microprofile.metrics.annotation.Metric annotation) {
+        return internalHistogram(
+                internalGetMetadata(annotation.name(), MetricType.HISTOGRAM).merge(annotation),
+                new MetricDescriptor(annotation.name(), annotation.tags()));
+    }
+
+    HistogramAdapter internalHistogram(MpMetadata metadata, MetricDescriptor id) {
+        HistogramAdapter result = checkCast(HistogramAdapter.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new HistogramAdapter()));
+        return result.register(metadata, id, registry);
+    }
+
+    @Override
+    public Meter meter(String name) {
+        return internalMeter(internalGetMetadata(name, MetricType.METERED),
+                new MetricDescriptor(name, scopeTags()));
+    }
+
+    @Override
+    public Meter meter(String name, Tag... tags) {
+        return internalMeter(internalGetMetadata(name, MetricType.METERED),
+                new MetricDescriptor(name, scopeTags(tags)));
+    }
+
+    @Override
+    public Meter meter(Metadata metadata) {
+        return internalMeter(internalGetMetadata(metadata, MetricType.METERED),
+                new MetricDescriptor(metadata.getName(), scopeTags()));
+    }
+
+    @Override
+    public Meter meter(Metadata metadata, Tag... tags) {
+        return internalMeter(internalGetMetadata(metadata, MetricType.METERED),
+                new MetricDescriptor(metadata.getName(), scopeTags(tags)));
+    }
+
+    MeterAdapter injectedMeter(org.eclipse.microprofile.metrics.annotation.Metric annotation) {
+        return internalMeter(
+                internalGetMetadata(annotation.name(), MetricType.METERED).merge(annotation),
+                new MetricDescriptor(annotation.name(), annotation.tags()));
+    }
+
+    MeterAdapter internalMeter(MpMetadata metadata, MetricDescriptor id) {
+        // MP Meter --> Micrometer Counter
+        MeterAdapter result = checkCast(MeterAdapter.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new MeterAdapter()));
+        return result.register(metadata, id, registry);
+    }
+
+    @Override
+    public Timer timer(String name) {
+        return internalTimer(internalGetMetadata(name, MetricType.TIMER),
+                new MetricDescriptor(name, scopeTags()));
+    }
+
+    @Override
+    public Timer timer(String name, Tag... tags) {
+        return internalTimer(internalGetMetadata(name, MetricType.TIMER),
+                new MetricDescriptor(name, scopeTags(tags)));
+    }
+
+    @Override
+    public Timer timer(Metadata metadata) {
+        return internalTimer(internalGetMetadata(metadata, MetricType.TIMER),
+                new MetricDescriptor(metadata.getName(), scopeTags()));
+    }
+
+    @Override
+    public Timer timer(Metadata metadata, Tag... tags) {
+        return internalTimer(internalGetMetadata(metadata, MetricType.TIMER),
+                new MetricDescriptor(metadata.getName(), scopeTags(tags)));
+    }
+
+    TimerAdapter injectedTimer(org.eclipse.microprofile.metrics.annotation.Metric annotation) {
+        return internalTimer(
+                internalGetMetadata(annotation.name(), MetricType.TIMER).merge(annotation),
+                new MetricDescriptor(annotation.name(), annotation.tags()));
+    }
+
+    TimerAdapter interceptorTimer(Metadata metadata, String... tags) {
+        return internalTimer(internalGetMetadata(metadata, MetricType.TIMER),
+                new MetricDescriptor(metadata.getName(), tags));
+    }
+
+    TimerAdapter internalTimer(MpMetadata metadata, MetricDescriptor id) {
+        TimerAdapter result = checkCast(TimerAdapter.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new TimerAdapter(registry)));
+        return result.register(metadata, id);
+    }
+
+    @Override
+    public SimpleTimer simpleTimer(String name) {
+        return internalSimpleTimer(internalGetMetadata(name, MetricType.SIMPLE_TIMER),
+                new MetricDescriptor(name, scopeTags()));
+    }
+
+    @Override
+    public SimpleTimer simpleTimer(String name, Tag... tags) {
+        return internalSimpleTimer(internalGetMetadata(name, MetricType.SIMPLE_TIMER),
+                new MetricDescriptor(name, scopeTags(tags)));
+    }
+
+    @Override
+    public SimpleTimer simpleTimer(Metadata metadata) {
+        return internalSimpleTimer(internalGetMetadata(metadata, MetricType.SIMPLE_TIMER),
+                new MetricDescriptor(metadata.getName(), scopeTags()));
+    }
+
+    @Override
+    public SimpleTimer simpleTimer(Metadata metadata, Tag... tags) {
+        return internalSimpleTimer(internalGetMetadata(metadata, MetricType.SIMPLE_TIMER),
+                new MetricDescriptor(metadata.getName(), scopeTags(tags)));
+    }
+
+    TimerAdapter injectedSimpleTimer(org.eclipse.microprofile.metrics.annotation.Metric annotation) {
+        return internalSimpleTimer(
+                internalGetMetadata(annotation.name(), MetricType.SIMPLE_TIMER).merge(annotation),
+                new MetricDescriptor(annotation.name(), annotation.tags()));
+    }
+
+    TimerAdapter internalSimpleTimer(MpMetadata metadata, MetricDescriptor id) {
+        // SimpleTimer --> Micrometer Timer
+        TimerAdapter result = checkCast(TimerAdapter.class, metadata,
+                constructedMeters.computeIfAbsent(id, k -> new TimerAdapter(registry)));
+        return result.register(metadata, id);
+    }
+
+    @Override
+    public boolean remove(String name) {
+        for (Map.Entry<MetricDescriptor, MeterHolder> e : constructedMeters.entrySet()) {
+            if (e.getKey().name().equals(name)) {
+                constructedMeters.remove(e.getKey());
+                registry.remove(e.getValue().getMeter());
+            }
+        }
+        return metadataMap.remove(name) != null;
+    }
+
+    @Override
+    public boolean remove(MetricID metricID) {
+        return internalRemove(new MetricDescriptor(metricID));
+    }
+
+    @Override
+    public void removeMatching(MetricFilter metricFilter) {
+        for (Map.Entry<MetricDescriptor, MeterHolder> e : constructedMeters.entrySet()) {
+            MetricID mid = e.getKey().toMetricID();
+            if (metricFilter.matches(mid, e.getValue())) {
+                internalRemove(e.getKey());
+            }
+        }
+    }
+
+    boolean internalRemove(MetricDescriptor match) {
+        MeterHolder holder = constructedMeters.remove(match);
+        if (holder != null) {
+            registry.remove(holder.getMeter());
+            // Remove associated metadata if this is the last MP Metric left with that name
+            if (constructedMeters.keySet().stream().noneMatch(id -> id.name.equals(match.name))) {
+                metadataMap.remove(match.name);
+            }
+        }
+        return holder != null;
+    }
+
+    @Override
+    public SortedSet<String> getNames() {
+        return new TreeSet<>(metadataMap.keySet());
+    }
+
+    @Override
+    public SortedSet<MetricID> getMetricIDs() {
+        SortedSet<MetricID> out = new TreeSet<>();
+        for (MetricDescriptor key : constructedMeters.keySet()) {
+            out.add(key.toMetricID());
+        }
+        return out;
+    }
+
+    @Override
+    public SortedMap<MetricID, Gauge> getGauges() {
+        return getGauges(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, Gauge> getGauges(MetricFilter metricFilter) {
+        return getMetrics(MetricType.GAUGE, metricFilter);
+    }
+
+    @Override
+    public SortedMap<MetricID, Counter> getCounters() {
+        return getCounters(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, Counter> getCounters(MetricFilter metricFilter) {
+        return getMetrics(MetricType.COUNTER, metricFilter);
+    }
+
+    @Override
+    public SortedMap<MetricID, ConcurrentGauge> getConcurrentGauges() {
+        return getConcurrentGauges(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, ConcurrentGauge> getConcurrentGauges(MetricFilter metricFilter) {
+        return getMetrics(MetricType.CONCURRENT_GAUGE, metricFilter);
+    }
+
+    @Override
+    public SortedMap<MetricID, Histogram> getHistograms() {
+        return getHistograms(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, Histogram> getHistograms(MetricFilter metricFilter) {
+        return getMetrics(MetricType.HISTOGRAM, metricFilter);
+    }
+
+    @Override
+    public SortedMap<MetricID, Meter> getMeters() {
+        return getMeters(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, Meter> getMeters(MetricFilter metricFilter) {
+        return getMetrics(MetricType.METERED, metricFilter);
+    }
+
+    @Override
+    public SortedMap<MetricID, Timer> getTimers() {
+        return getTimers(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, Timer> getTimers(MetricFilter metricFilter) {
+        return getMetrics(MetricType.TIMER, metricFilter);
+    }
+
+    @Override
+    public SortedMap<MetricID, SimpleTimer> getSimpleTimers() {
+        return getSimpleTimers(MetricFilter.ALL);
+    }
+
+    @Override
+    public SortedMap<MetricID, SimpleTimer> getSimpleTimers(MetricFilter metricFilter) {
+        return getMetrics(MetricType.SIMPLE_TIMER, metricFilter);
+    }
+
+    @Override
+    public Map<MetricID, Metric> getMetrics() {
+        SortedMap<MetricID, Metric> out = new TreeMap<>();
+        for (Map.Entry<MetricDescriptor, MeterHolder> e : constructedMeters.entrySet()) {
+            out.put(e.getKey().toMetricID(), e.getValue());
+        }
+        return out;
+    }
+
+    @SuppressWarnings("unchecked")
+    <T extends Metric> SortedMap<MetricID, T> getMetrics(MetricType type, MetricFilter filter) {
+        SortedMap<MetricID, T> out = new TreeMap<>();
+        for (Map.Entry<MetricDescriptor, MeterHolder> e : constructedMeters.entrySet()) {
+            if (e.getValue().getType() == type) {
+                MetricID mid = e.getKey().toMetricID();
+                if (filter.matches(mid, e.getValue())) {
+                    out.put(e.getKey().toMetricID(), (T) e.getValue());
+                }
+            }
+        }
+        return out;
+    }
+
+    @Override
+    public Map<String, Metadata> getMetadata() {
+        return Collections.unmodifiableMap(metadataMap);
+    }
+
+    Tags scopeTags(Tag... tags) {
+        Tags out = Tags.of("scope", this.type.getName());
+        for (Tag t : tags) {
+            out = out.and(t.getTagName(), t.getTagValue());
+        }
+        return out;
+    }
+
+    private MpMetadata internalGetMetadata(String name, MetricType type) {
+        MpMetadata result = metadataMap.computeIfAbsent(name, k -> new MpMetadata(name, type));
+        if (result.type != type) {
+            throw new IllegalArgumentException(
+                    String.format("Metric %s already defined using a different type (%s)",
+                            name, result.getType()));
+        }
+        return result;
+    }
+
+    private MpMetadata internalGetMetadata(Metadata metadata, MetricType type) {
+        MpMetadata result = metadataMap.computeIfAbsent(metadata.getName(), k -> MpMetadata.sanitize(metadata, type));
+        if (!result.mergeSameType(metadata)) {
+            throw new IllegalArgumentException(
+                    String.format("Metric %s already defined using a different type (%s)",
+                            metadata.getName(), result.getType()));
+        }
+        return result;
+    }
+
+    <T> T checkCast(Class<T> type, MpMetadata metadata, MeterHolder o) {
+        try {
+            return type.cast(o);
+        } catch (ClassCastException cce) {
+            throw new IllegalArgumentException(
+                    String.format("Metric %s already defined using a different type (%s)",
+                            metadata.name, o.getType().name()),
+                    cce);
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetadata.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetadata.java
new file mode 100644
index 0000000000000..8d5060acc799b
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetadata.java
@@ -0,0 +1,187 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.eclipse.microprofile.metrics.Metadata;
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.annotation.Metric;
+
+class MpMetadata implements Metadata {
+
+    public static MpMetadata sanitize(Metadata metadata, MetricType type) {
+        if (metadata instanceof MpMetadata) {
+            return (MpMetadata) metadata;
+        }
+        return new MpMetadata(metadata, type);
+    }
+
+    final String name;
+    final MetricType type;
+    String description;
+    String unit;
+    boolean dirty = false;
+
+    MpMetadata(String name, MetricType type) {
+        this.name = name;
+        this.type = type;
+    }
+
+    MpMetadata(Metric annotation, MetricType type) {
+        this.name = annotation.name();
+        this.description = stringOrNull(annotation.description());
+        this.unit = stringOrNull(annotation.unit());
+        this.type = type;
+    }
+
+    MpMetadata(String name, String description, String unit, MetricType type) {
+        this.name = name;
+        this.description = stringOrNull(description);
+        this.unit = stringOrNull(unit);
+        this.type = type;
+    }
+
+    MpMetadata(Metadata other, MetricType type) {
+        this.type = type;
+        this.name = other.getName();
+        this.description = other.getDescription().orElse(null);
+        this.unit = other.getUnit().orElse(null);
+    }
+
+    public boolean mergeSameType(MpMetadata metadata) {
+        if (this.type == metadata.type) {
+            if (description == null) {
+                dirty = true;
+                description = stringOrNull(metadata.description);
+            }
+            if (unit == null) {
+                dirty = true;
+                unit = stringOrNull(metadata.unit);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public boolean mergeSameType(Metadata metadata) {
+        if (metadata.getTypeRaw() == MetricType.INVALID || this.type == metadata.getTypeRaw()) {
+            if (description == null) {
+                dirty = true;
+                description = stringOrNull(metadata.getDescription().orElse(null));
+            }
+            if (unit == null) {
+                dirty = true;
+                unit = stringOrNull(metadata.getUnit().orElse(null));
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public boolean mergeSameType(AnnotatedGaugeAdapter annotation) {
+        if (this.type == MetricType.GAUGE) {
+            if (description == null) {
+                dirty = true;
+                description = stringOrNull(annotation.description());
+            }
+            if (unit == null) {
+                dirty = true;
+                unit = stringOrNull(annotation.baseUnit());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public MpMetadata merge(Metric annotation) {
+        if (description == null) {
+            dirty = true;
+            description = stringOrNull(annotation.description());
+        }
+        if (unit == null) {
+            dirty = true;
+            unit = stringOrNull(annotation.unit());
+        }
+        return this;
+    }
+
+    public String description() {
+        return description;
+    }
+
+    public String unit() {
+        return unit;
+    }
+
+    public boolean cleanDirtyMetadata() {
+        boolean precheck = dirty;
+        dirty = false;
+        return precheck;
+    }
+
+    String stringOrNull(String s) {
+        if (s == null || s.isEmpty() || "none".equals(s))
+            return null;
+        return s;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return name;
+    }
+
+    @Override
+    public Optional<String> getDescription() {
+        return Optional.ofNullable(description);
+    }
+
+    @Override
+    public String getType() {
+        return Optional.ofNullable(type).orElse(MetricType.INVALID).name();
+    }
+
+    @Override
+    public MetricType getTypeRaw() {
+        return Optional.ofNullable(type).orElse(MetricType.INVALID);
+    }
+
+    @Override
+    public Optional<String> getUnit() {
+        return Optional.ofNullable(unit);
+    }
+
+    @Override
+    public boolean isReusable() {
+        return true;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        MpMetadata that = (MpMetadata) o;
+        return Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name);
+    }
+
+    @Override
+    public String toString() {
+        return name
+                + "["
+                + (description == null ? "" : "description=" + description + " ")
+                + (unit == null ? "" : "unit=" + unit + " ")
+                + type
+                + "]";
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java
new file mode 100644
index 0000000000000..a497ff50ad612
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsBinder.java
@@ -0,0 +1,33 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.Iterator;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Singleton;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.MeterBinder;
+
+@Singleton
+class MpMetricsBinder implements MeterBinder {
+
+    final Instance<AnnotatedGaugeAdapter> allGaugeAdapters;
+
+    // Micrometer application meter registry
+    final MetricRegistryAdapter registry;
+
+    MpMetricsBinder(MetricRegistryAdapter registry,
+            Instance<AnnotatedGaugeAdapter> allGaugeAdapters) {
+        this.registry = registry;
+        this.allGaugeAdapters = allGaugeAdapters;
+    }
+
+    @Override
+    public void bindTo(MeterRegistry r) {
+        // register all annotation-declared gauges
+        // this needs to wait until associated/monitored objects can be created.
+        for (Iterator<AnnotatedGaugeAdapter> gauges = allGaugeAdapters.iterator(); gauges.hasNext();) {
+            registry.bindAnnotatedGauge(gauges.next());
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRecorder.java
new file mode 100644
index 0000000000000..6256b2153dafd
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRecorder.java
@@ -0,0 +1,29 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.microprofile.metrics.MetricRegistry;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class MpMetricsRecorder {
+
+    static Map<MetricRegistry.Type, MetricRegistryAdapter> registries = new HashMap<>(3);
+
+    /* STATIC INIT */
+    public void configureRegistryAdapter(RuntimeValue<MeterRegistry> registryRuntimeValue) {
+        MeterRegistry registry = registryRuntimeValue.getValue();
+
+        for (MetricRegistry.Type type : MetricRegistry.Type.values()) {
+            registries.put(type, new MetricRegistryAdapter(type, registry));
+        }
+    }
+
+    static MetricRegistryAdapter getRegistry(MetricRegistry.Type type) {
+        return registries.get(type);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java
new file mode 100644
index 0000000000000..32cc2ddfeac6e
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MpMetricsRegistryProducer.java
@@ -0,0 +1,57 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.lang.annotation.Annotation;
+import java.util.*;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+import javax.interceptor.InvocationContext;
+
+import org.eclipse.microprofile.metrics.*;
+import org.eclipse.microprofile.metrics.annotation.RegistryType;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.arc.ArcInvocationContext;
+
+@Singleton
+@SuppressWarnings("unused")
+class MpMetricsRegistryProducer {
+    @Produces
+    @Singleton
+    public MetricRegistryAdapter produceRegistry(MeterRegistry registry) {
+        return MpMetricsRecorder.getRegistry(MetricRegistry.Type.APPLICATION);
+    }
+
+    @Produces
+    @Singleton
+    @RegistryType(type = MetricRegistry.Type.APPLICATION)
+    public MetricRegistryAdapter produceApplicationRegistry(MeterRegistry registry) {
+        return MpMetricsRecorder.getRegistry(MetricRegistry.Type.APPLICATION);
+    }
+
+    @Produces
+    @Singleton
+    @RegistryType(type = MetricRegistry.Type.BASE)
+    public MetricRegistry produceBaseRegistry(MeterRegistry registry) {
+        return MpMetricsRecorder.getRegistry(MetricRegistry.Type.BASE);
+    }
+
+    @Produces
+    @Singleton
+    @RegistryType(type = MetricRegistry.Type.VENDOR)
+    public MetricRegistry produceVendorRegistry(MeterRegistry registry) {
+        return MpMetricsRecorder.getRegistry(MetricRegistry.Type.VENDOR);
+    }
+
+    public static <T> T getAnnotation(InvocationContext context, Class<T> annotationClass) {
+        Set<Annotation> annotations = (Set<Annotation>) context.getContextData()
+                .get(ArcInvocationContext.KEY_INTERCEPTOR_BINDINGS);
+
+        for (Annotation a : annotations) {
+            if (annotationClass.isInstance(a)) {
+                return annotationClass.cast(a);
+            }
+        }
+        return null;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java
new file mode 100644
index 0000000000000..c838455ef15c6
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimedInterceptor.java
@@ -0,0 +1,65 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.AroundTimeout;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.annotation.Timed;
+
+import io.micrometer.core.instrument.Timer;
+
+@SuppressWarnings("unused")
+@Timed
+@Interceptor
+@Priority(Interceptor.Priority.LIBRARY_BEFORE + 10)
+class TimedInterceptor {
+
+    // Micrometer meter registry
+    final MetricRegistryAdapter mpRegistry;
+
+    TimedInterceptor(MetricRegistryAdapter mpRegistry) {
+        this.mpRegistry = mpRegistry;
+    }
+
+    @AroundConstruct
+    Object timedConstructor(InvocationContext context) throws Exception {
+        return time(context, context.getConstructor().getDeclaringClass().getSimpleName());
+    }
+
+    @AroundInvoke
+    Object timedMethod(InvocationContext context) throws Exception {
+        return time(context, context.getMethod().getName());
+    }
+
+    @AroundTimeout
+    Object timedTimeout(InvocationContext context) throws Exception {
+        return time(context, context.getMethod().getName());
+    }
+
+    Object time(InvocationContext context, String methodName) throws Exception {
+        Timed annotation = MpMetricsRegistryProducer.getAnnotation(context, Timed.class);
+        if (annotation != null) {
+            MpMetadata metadata = new MpMetadata(annotation.name().replace("<method>", methodName),
+                    annotation.description().replace("<method>", methodName),
+                    annotation.unit(),
+                    MetricType.TIMER);
+            TimerAdapter impl = mpRegistry.interceptorTimer(metadata, annotation.tags());
+
+            Timer.Sample sample = impl.start();
+            try {
+                return context.proceed();
+            } finally {
+                try {
+                    impl.stop(sample);
+                } catch (Exception e) {
+                    // ignoring on purpose
+                }
+            }
+        }
+        return context.proceed();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimerAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimerAdapter.java
new file mode 100644
index 0000000000000..bc1adb9bba54b
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/TimerAdapter.java
@@ -0,0 +1,131 @@
+package io.quarkus.micrometer.runtime.binder.mpmetrics;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.SimpleTimer;
+import org.eclipse.microprofile.metrics.Snapshot;
+
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+
+class TimerAdapter
+        implements org.eclipse.microprofile.metrics.Timer, org.eclipse.microprofile.metrics.SimpleTimer, MeterHolder {
+    final MeterRegistry registry;
+    Timer timer;
+
+    TimerAdapter(MeterRegistry registry) {
+        this.registry = registry;
+    }
+
+    public TimerAdapter register(MpMetadata metadata, MetricDescriptor descriptor) {
+        if (timer == null || metadata.cleanDirtyMetadata()) {
+            timer = io.micrometer.core.instrument.Timer.builder(descriptor.name())
+                    .description(metadata.description())
+                    .tags(descriptor.tags())
+                    .register(registry);
+        }
+        return this;
+    }
+
+    @Override
+    public void update(long l, TimeUnit timeUnit) {
+        timer.record(l, timeUnit);
+    }
+
+    @Override
+    public void update(Duration duration) {
+        timer.record(duration);
+    }
+
+    @Override
+    public <T> T time(Callable<T> callable) throws Exception {
+        return timer.wrap(callable).call();
+    }
+
+    @Override
+    public void time(Runnable runnable) {
+        timer.wrap(runnable);
+    }
+
+    @Override
+    public SampleAdapter time() {
+        return new SampleAdapter(timer, Timer.start(registry));
+    }
+
+    @Override
+    public Duration getElapsedTime() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public long getCount() {
+        return timer.count();
+    }
+
+    @Override
+    public double getFifteenMinuteRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public double getFiveMinuteRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public double getMeanRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public double getOneMinuteRate() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public Snapshot getSnapshot() {
+        throw new UnsupportedOperationException("This operation is not supported when used with micrometer");
+    }
+
+    @Override
+    public Meter getMeter() {
+        return timer;
+    }
+
+    public Timer.Sample start() {
+        return Timer.start(registry);
+    }
+
+    public void stop(Timer.Sample sample) {
+        sample.stop(timer);
+    }
+
+    class SampleAdapter implements org.eclipse.microprofile.metrics.Timer.Context, SimpleTimer.Context {
+        final Timer timer;
+        final Timer.Sample sample;
+
+        SampleAdapter(Timer timer, Timer.Sample sample) {
+            this.sample = sample;
+            this.timer = timer;
+        }
+
+        @Override
+        public long stop() {
+            return sample.stop(timer);
+        }
+
+        @Override
+        public void close() {
+            sample.stop(timer);
+        }
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.TIMER;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetrics.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetrics.java
new file mode 100644
index 0000000000000..9fb601868e79c
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetrics.java
@@ -0,0 +1,229 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.binder.http.Outcome;
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.binder.HttpMetricsCommon;
+import io.quarkus.micrometer.runtime.binder.HttpRequestMetric;
+import io.vertx.core.Context;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.spi.metrics.HttpServerMetrics;
+
+/**
+ * HttpServerMetrics<R, W, S>
+ * <ul>
+ * <li>R for Request metric -- RequestMetricContext</li>
+ * <li>W for Websocket metric -- LongTaskTimer sample</li>
+ * <li>S for Socket metric -- Map<String, Object></li>
+ * </ul>
+ */
+public class VertxHttpServerMetrics extends VertxTcpMetrics
+        implements HttpServerMetrics<HttpRequestMetric, LongTaskTimer.Sample, Map<String, Object>> {
+    static final Logger log = Logger.getLogger(VertxHttpServerMetrics.class);
+    static final String METRICS_CONTEXT = "HTTP_REQUEST_METRICS_CONTEXT";
+
+    final List<Pattern> ignorePatterns;
+    final Map<Pattern, String> matchPatterns;
+
+    final String nameWebsocketConnections;
+    final String nameHttpServerPush;
+    final String nameHttpServerRequests;
+
+    VertxHttpServerMetrics(MeterRegistry registry, HttpBinderConfiguration config) {
+        super(registry, "http.server");
+        nameWebsocketConnections = "http.server.websocket.connections";
+        nameHttpServerPush = "http.server.push";
+        nameHttpServerRequests = "http.server.requests";
+
+        ignorePatterns = config.getServerIgnorePatterns();
+        matchPatterns = config.getServerMatchPatterns();
+    }
+
+    /**
+     * Stash the RequestMetric in the Vertx Context
+     *
+     * @param context Vertx context to store RequestMetric in
+     * @param requestMetric
+     * @see VertxMeterFilter
+     */
+    public static void setRequestMetric(Context context, HttpRequestMetric requestMetric) {
+        if (context != null) {
+            context.put(METRICS_CONTEXT, requestMetric);
+        }
+    }
+
+    /**
+     * Retrieve and remove the RequestMetric from the Vertx Context
+     *
+     * @param context
+     * @return the RequestMetricContext stored in the Vertx Context, or null
+     * @see VertxMeterFilter
+     */
+    public static HttpRequestMetric retrieveRequestMetric(Context context) {
+        if (context != null) {
+            HttpRequestMetric requestMetric = context.get(METRICS_CONTEXT);
+            context.remove(METRICS_CONTEXT);
+            return requestMetric;
+        }
+        return null;
+    }
+
+    /**
+     * Called when an http server response is pushed.
+     *
+     * @param socketMetric a Map for socket metric context or null
+     * @param method the pushed response method
+     * @param uri the pushed response uri
+     * @param response the http server response
+     * @return a RequestMetricContext
+     */
+    @Override
+    public HttpRequestMetric responsePushed(Map<String, Object> socketMetric, HttpMethod method, String uri,
+            HttpServerResponse response) {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(matchPatterns, ignorePatterns, uri);
+        if (requestMetric.isMeasure()) {
+            registry.counter(nameHttpServerPush, Tags.of(
+                    HttpMetricsCommon.uri(requestMetric.getPath(), response.getStatusCode()),
+                    VertxMetricsTags.method(method),
+                    VertxMetricsTags.outcome(response),
+                    HttpMetricsCommon.status(response.getStatusCode())))
+                    .increment();
+        }
+        log.debugf("responsePushed %s: %s, %s", uri, socketMetric, requestMetric);
+        return requestMetric;
+    }
+
+    /**
+     * Called when an http server request begins. Vert.x will invoke
+     * {@link #responseEnd} when the response has ended or {@link #requestReset} if
+     * the request/response has failed before.
+     *
+     * @param socketMetric a Map for socket metric context or null
+     * @param request the http server request
+     * @return a RequestMetricContext
+     */
+    @Override
+    public HttpRequestMetric requestBegin(Map<String, Object> socketMetric, HttpServerRequest request) {
+        // evaluate and remember the path to monitor for use later (maybe a 404 or redirect..)
+        HttpRequestMetric requestMetric = new HttpRequestMetric(matchPatterns, ignorePatterns, request.path());
+        setRequestMetric(Vertx.currentContext(), requestMetric);
+
+        if (requestMetric.isMeasure()) {
+            // If we're measuring this request, create/remember the sample
+            requestMetric.setSample(Timer.start(registry));
+            requestMetric.setTags(Tags.of(VertxMetricsTags.method(request.method())));
+
+            log.debugf("requestBegin %s: %s, %s", requestMetric.getPath(), socketMetric, requestMetric);
+        }
+
+        return requestMetric;
+    }
+
+    /**
+     * Called when the http server request couldn't complete successfully, for
+     * instance the connection was closed before the response was sent.
+     *
+     * @param requestMetric a RequestMetricContext or null
+     */
+    @Override
+    public void requestReset(HttpRequestMetric requestMetric) {
+        log.debugf("requestReset: %s", requestMetric);
+        Timer.Sample sample = getRequestSample(requestMetric);
+        if (sample != null) {
+            String requestPath = getServerRequestPath(requestMetric);
+            Timer.Builder builder = Timer.builder(nameHttpServerRequests)
+                    .tags(requestMetric.getTags())
+                    .tags(Tags.of(
+                            HttpMetricsCommon.uri(requestPath, 0),
+                            Outcome.CLIENT_ERROR.asTag(),
+                            HttpMetricsCommon.STATUS_RESET));
+            sample.stop(builder.register(registry));
+        }
+    }
+
+    /**
+     * Called when an http server response has ended.
+     *
+     * @param requestMetric a RequestMetricContext or null
+     * @param response the http server response
+     */
+    @Override
+    public void responseEnd(HttpRequestMetric requestMetric, HttpServerResponse response) {
+        log.debugf("responseEnd: %s, %s", requestMetric, response);
+
+        Timer.Sample sample = getRequestSample(requestMetric);
+        if (sample != null) {
+            String requestPath = getServerRequestPath(requestMetric);
+            Timer.Builder builder = Timer.builder(nameHttpServerRequests)
+                    .tags(requestMetric.getTags())
+                    .tags(Tags.of(
+                            HttpMetricsCommon.uri(requestPath, response.getStatusCode()),
+                            VertxMetricsTags.outcome(response),
+                            HttpMetricsCommon.status(response.getStatusCode())));
+
+            sample.stop(builder.register(registry));
+        }
+    }
+
+    /**
+     * Called when a server web socket connects.
+     *
+     * @param socketMetric a Map for socket metric context or null
+     * @param requestMetric a RequestMetricContext or null
+     * @param serverWebSocket the server web socket
+     * @return a LongTaskTimer.Sample or null
+     */
+    @Override
+    public LongTaskTimer.Sample connected(Map<String, Object> socketMetric, HttpRequestMetric requestMetric,
+            ServerWebSocket serverWebSocket) {
+        log.debugf("websocket connected: %s, %s, %s", socketMetric, requestMetric, serverWebSocket);
+        String path = getServerRequestPath(requestMetric);
+        if (path != null) {
+            return LongTaskTimer.builder(nameWebsocketConnections)
+                    .tags(Tags.of(HttpMetricsCommon.uri(path, 0)))
+                    .register(registry)
+                    .start();
+        }
+        return null;
+    }
+
+    /**
+     * Called when the server web socket has disconnected.
+     *
+     * @param websocketMetric a LongTaskTimer.Sample or null
+     */
+    @Override
+    public void disconnected(LongTaskTimer.Sample websocketMetric) {
+        log.debugf("websocket disconnected: %s", websocketMetric);
+        if (websocketMetric != null) {
+            websocketMetric.stop();
+        }
+    }
+
+    private Timer.Sample getRequestSample(HttpRequestMetric metricsContext) {
+        if (metricsContext == null) {
+            return null;
+        }
+        return metricsContext.getSample();
+    }
+
+    private String getServerRequestPath(HttpRequestMetric metricsContext) {
+        if (metricsContext == null) {
+            return null;
+        }
+        return metricsContext.getHttpRequestPath();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderAdapter.java
new file mode 100644
index 0000000000000..ab1b95d7e07cc
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderAdapter.java
@@ -0,0 +1,77 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.metrics.MetricsOptions;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.core.spi.VertxMetricsFactory;
+import io.vertx.core.spi.metrics.HttpServerMetrics;
+import io.vertx.core.spi.metrics.VertxMetrics;
+
+@Singleton
+public class VertxMeterBinderAdapter extends MetricsOptions implements VertxMetricsFactory, VertxMetrics {
+    private static final Logger log = Logger.getLogger(VertxMeterBinderAdapter.class);
+
+    private final static AtomicReference<MeterRegistry> meterRegistryRef = new AtomicReference<>();
+
+    private VertxConfig config;
+    private HttpBinderConfiguration httpBinderConfiguration;
+
+    public VertxMeterBinderAdapter() {
+    }
+
+    public void setVertxConfig(VertxConfig config, HttpBinderConfiguration httpBinderConfiguration) {
+        this.config = config;
+        this.httpBinderConfiguration = httpBinderConfiguration;
+    }
+
+    public static void setMeterRegistry(MeterRegistry meterRegistry) {
+        meterRegistryRef.set(meterRegistry);
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public VertxMetricsFactory getFactory() {
+        return this;
+    }
+
+    @Override
+    public VertxMetrics metrics(VertxOptions vertxOptions) {
+        return this;
+    }
+
+    @Override
+    public MetricsOptions newOptions() {
+        return this;
+    }
+
+    @Override
+    public HttpServerMetrics<?, ?, ?> createHttpServerMetrics(HttpServerOptions options, SocketAddress localAddress) {
+        log.debugf("Bind registry %s to Vertx Metrics", meterRegistryRef.get());
+        MeterRegistry registry = meterRegistryRef.get();
+        if (registry == null) {
+            throw new IllegalStateException("MeterRegistry was not resolved");
+        }
+        if (config == null) {
+            throw new IllegalStateException("VertxConfig was not found");
+        }
+        if (httpBinderConfiguration.isServerEnabled()) {
+            log.debugf("Create HttpServerMetrics with options %s and address %s", options, localAddress);
+            return new VertxHttpServerMetrics(registry, httpBinderConfiguration);
+        }
+        return null;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderContainerFilterUtil.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderContainerFilterUtil.java
new file mode 100644
index 0000000000000..9223378b946f8
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderContainerFilterUtil.java
@@ -0,0 +1,42 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.micrometer.runtime.binder.HttpRequestMetric;
+import io.vertx.ext.web.RoutingContext;
+
+final class VertxMeterBinderContainerFilterUtil {
+
+    private VertxMeterBinderContainerFilterUtil() {
+    }
+
+    private static final Logger log = Logger.getLogger(VertxMeterBinderRestEasyContainerFilter.class);
+
+    static void doFilter(RoutingContext routingContext, UriInfo info) {
+        // bail early if we have no routing context, or if path munging isn't necessary
+        if (routingContext == null || routingContext.get(HttpRequestMetric.HTTP_REQUEST_PATH_MATCHED) != null) {
+            return;
+        }
+
+        String path = info.getPath();
+
+        MultivaluedMap<String, String> pathParameters = info.getPathParameters();
+        if (!pathParameters.isEmpty()) {
+            // Replace parameter values in the URI with {key}: /items/123 -> /items/{id}
+            for (Map.Entry<String, List<String>> entry : pathParameters.entrySet()) {
+                for (String value : entry.getValue()) {
+                    path = path.replace(value, "{" + entry.getKey() + "}");
+                }
+            }
+            log.debugf("Saving parameterized path %s in %s", path, routingContext);
+        }
+
+        routingContext.put(HttpRequestMetric.HTTP_REQUEST_PATH, path);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderQuarkusRestContainerFilter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderQuarkusRestContainerFilter.java
new file mode 100644
index 0000000000000..d118e4dd42941
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderQuarkusRestContainerFilter.java
@@ -0,0 +1,15 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+import io.vertx.ext.web.RoutingContext;
+
+public class VertxMeterBinderQuarkusRestContainerFilter {
+
+    @ServerRequestFilter
+    public void filter(UriInfo uriInfo, RoutingContext routingContext) {
+        VertxMeterBinderContainerFilterUtil.doFilter(routingContext, uriInfo);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderRecorder.java
new file mode 100644
index 0000000000000..8899e3bb687da
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderRecorder.java
@@ -0,0 +1,35 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.function.Consumer;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.VertxOptions;
+
+@Recorder
+public class VertxMeterBinderRecorder {
+    private static final Logger log = Logger.getLogger(VertxMeterBinderRecorder.class);
+
+    /* STATIC_INIT */
+    public Consumer<VertxOptions> configureMetricsAdapter() {
+        return new Consumer<VertxOptions>() {
+            @Override
+            public void accept(VertxOptions vertxOptions) {
+                log.debug("Adding Micrometer MeterBinder to VertxOptions");
+                VertxMeterBinderAdapter binder = Arc.container().instance(VertxMeterBinderAdapter.class).get();
+                vertxOptions.setMetricsOptions(binder);
+            }
+        };
+    }
+
+    /* RUNTIME_INIT */
+    public void setVertxConfig(VertxConfig config) {
+        VertxMeterBinderAdapter binder = Arc.container().instance(VertxMeterBinderAdapter.class).get();
+        HttpBinderConfiguration httpConfig = Arc.container().instance(HttpBinderConfiguration.class).get();
+        binder.setVertxConfig(config, httpConfig);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderRestEasyContainerFilter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderRestEasyContainerFilter.java
new file mode 100644
index 0000000000000..2137332fb919a
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderRestEasyContainerFilter.java
@@ -0,0 +1,16 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+
+public class VertxMeterBinderRestEasyContainerFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(final ContainerRequestContext requestContext) {
+        VertxMeterBinderContainerFilterUtil.doFilter(CDI.current().select(CurrentVertxRequest.class).get().getCurrent(),
+                requestContext.getUriInfo());
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterFilter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterFilter.java
new file mode 100644
index 0000000000000..f73553ccb3236
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMeterFilter.java
@@ -0,0 +1,31 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import io.quarkus.micrometer.runtime.binder.HttpRequestMetric;
+import io.vertx.core.Context;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * High priority handler that sets the Vertx RouterContext
+ * attribute on the active RequestMetric.
+ * To quote Stuart, "YUCK".
+ * Reference: https://github.com/eclipse-vertx/vert.x/issues/3579
+ */
+public class VertxMeterFilter implements Handler<RoutingContext> {
+    @Override
+    public void handle(RoutingContext routingContext) {
+        final Context context = Vertx.currentContext();
+        HttpRequestMetric requestMetric = VertxHttpServerMetrics.retrieveRequestMetric(context);
+
+        if (requestMetric != null) {
+            requestMetric.setRoutingContext(routingContext);
+
+            // remember if we can skip path munging --> @see VertxMeterBinderRestEasyContainerFilter
+            if (requestMetric.isPathMatched()) {
+                routingContext.put(HttpRequestMetric.HTTP_REQUEST_PATH_MATCHED, true);
+            }
+        }
+        routingContext.next();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMetricsTags.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMetricsTags.java
new file mode 100644
index 0000000000000..76b576c969307
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxMetricsTags.java
@@ -0,0 +1,39 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.binder.http.Outcome;
+import io.quarkus.micrometer.runtime.binder.HttpMetricsCommon;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+
+public class VertxMetricsTags {
+    private static final Logger log = Logger.getLogger(VertxMetricsTags.class);
+
+    /**
+     * Creates a {@code method} tag based on the {@link HttpServerRequest#method()}
+     * method} of the given {@code request}.
+     *
+     * @param method the request method
+     * @return the method tag whose value is a capitalized method (e.g. GET).
+     */
+    public static Tag method(HttpMethod method) {
+        return (method != null) ? Tag.of("method", method.toString()) : HttpMetricsCommon.METHOD_UNKNOWN;
+    }
+
+    /**
+     * Creates an {@code outcome} {@code Tag} derived from the given {@code response}.
+     *
+     * @param response the response
+     * @return the outcome tag
+     */
+    public static Tag outcome(HttpServerResponse response) {
+        if (response != null) {
+            return Outcome.forStatus(response.getStatusCode()).asTag();
+        }
+        return Outcome.UNKNOWN.asTag();
+    }
+
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxNetworkMetrics.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxNetworkMetrics.java
new file mode 100644
index 0000000000000..93208bbe26cbe
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxNetworkMetrics.java
@@ -0,0 +1,66 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.Map;
+
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.core.spi.metrics.NetworkMetrics;
+
+/**
+ * NetworkMetrics<S>
+ * <ul>
+ * <li>S for Socket metric -- Vert.x Context</li>
+ * </ul>
+ */
+public class VertxNetworkMetrics implements NetworkMetrics<Map<String, Object>> {
+    final MeterRegistry registry;
+
+    final String nameBytesRead;
+    final String nameBytesWritten;
+    final String nameExceptionOccurred;
+
+    VertxNetworkMetrics(MeterRegistry registry, String prefix) {
+        this.registry = registry;
+        nameBytesRead = prefix + ".bytes.read";
+        nameBytesWritten = prefix + ".bytes.written";
+        nameExceptionOccurred = prefix + ".errors";
+    }
+
+    /**
+     * Called when bytes have been read
+     *
+     * @param socketMetric the socket metric, null for UDP
+     * @param remoteAddress the remote address which this socket received bytes from
+     * @param numberOfBytes the number of bytes read
+     */
+    @Override
+    public void bytesRead(Map<String, Object> socketMetric, SocketAddress remoteAddress, long numberOfBytes) {
+        DistributionSummary.builder(nameBytesRead).register(registry).record(numberOfBytes);
+    }
+
+    /**
+     * Called when bytes have been written
+     *
+     * @param socketMetric the socket metric, null for UDP
+     * @param remoteAddress the remote address which bytes are being written to
+     * @param numberOfBytes the number of bytes written
+     */
+    @Override
+    public void bytesWritten(Map<String, Object> socketMetric, SocketAddress remoteAddress, long numberOfBytes) {
+        DistributionSummary.builder(nameBytesWritten).register(registry).record(numberOfBytes);
+    }
+
+    /**
+     * Called when exceptions occur for a specific connection.
+     *
+     * @param socketMetric the socket metric, null for UDP
+     * @param remoteAddress the remote address of the connection or null if it's
+     *        datagram/udp
+     * @param t the exception that occurred
+     */
+    @Override
+    public void exceptionOccurred(Map<String, Object> socketMetric, SocketAddress remoteAddress, Throwable t) {
+        registry.counter(nameExceptionOccurred, "class", t.getClass().getName()).increment();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxTcpMetrics.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxTcpMetrics.java
new file mode 100644
index 0000000000000..b9bf30a35b56f
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/vertx/VertxTcpMetrics.java
@@ -0,0 +1,59 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.core.spi.metrics.TCPMetrics;
+
+public class VertxTcpMetrics extends VertxNetworkMetrics
+        implements TCPMetrics<Map<String, Object>> {
+
+    private static final String CONNECTED_SOCKET_SAMPLE = "CONNECTED_SOCKET_SAMPLE";
+
+    final String nameConnections;
+
+    VertxTcpMetrics(MeterRegistry registry, String prefix) {
+        super(registry, prefix);
+        nameConnections = prefix + ".connections";
+    }
+
+    /**
+     * Called when a client has connected, which is applicable for TCP connections.
+     * <p>
+     * The remote name of the client is a best effort to provide the name of the
+     * remote host, i.e if the name is specified at creation time, this name will be
+     * used otherwise it will be the remote address.
+     *
+     * @param remoteAddress the remote address of the client
+     * @param remoteName the remote name of the client
+     * @return a map for socket metric context
+     */
+    @Override
+    public Map<String, Object> connected(SocketAddress remoteAddress, String remoteName) {
+        Map<String, Object> socketMetric = new HashMap<>();
+        socketMetric.put(CONNECTED_SOCKET_SAMPLE,
+                LongTaskTimer.builder(nameConnections).register(registry).start());
+        return socketMetric;
+    }
+
+    /**
+     * Called when a client has disconnected, which is applicable for TCP
+     * connections.
+     *
+     * @param socketMetric a Map for socket metric context or null
+     * @param remoteAddress the remote address of the client
+     */
+    @Override
+    public void disconnected(Map<String, Object> socketMetric, SocketAddress remoteAddress) {
+        if (socketMetric == null) {
+            return;
+        }
+        LongTaskTimer.Sample sample = (LongTaskTimer.Sample) socketMetric.get(CONNECTED_SOCKET_SAMPLE);
+        if (sample != null) {
+            sample.stop();
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/HttpClientConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/HttpClientConfigGroup.java
new file mode 100644
index 0000000000000..e650df04f9712
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/HttpClientConfigGroup.java
@@ -0,0 +1,35 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+/**
+ * Build / static runtime config for outbound HTTP requests
+ */
+@ConfigGroup
+public class HttpClientConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    /**
+     * Outbound HTTP request metrics support.
+     * <p>
+     * Support for HTTP client metrics will be enabled if Micrometer
+     * support is enabled, the REST client feature is enabled,
+     * and either this value is true, or this value is unset and
+     * {@code quarkus.micrometer.binder-enabled-default} is true.
+     */
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/HttpServerConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/HttpServerConfigGroup.java
new file mode 100644
index 0000000000000..e63e50f2e6d06
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/HttpServerConfigGroup.java
@@ -0,0 +1,35 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+/**
+ * Build / static runtime config for inbound HTTP traffic
+ */
+@ConfigGroup
+public class HttpServerConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    /**
+     * Inbound HTTP metrics support.
+     * <p>
+     * Support for HTTP server metrics will be enabled if Micrometer
+     * support is enabled, an extension serving HTTP traffic is enabled,
+     * and either this value is true, or this value is unset and
+     * {@code quarkus.micrometer.binder-enabled-default} is true.
+     */
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/JsonConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/JsonConfigGroup.java
new file mode 100644
index 0000000000000..446ff3da2e25e
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/JsonConfigGroup.java
@@ -0,0 +1,52 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.time.Duration;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class JsonConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    /**
+     * Support for export to JSON format. Off by default.
+     */
+    @ConfigItem(defaultValue = "false")
+    public Optional<Boolean> enabled;
+
+    /**
+     * The path for the JSON metrics endpoint.
+     * The default value is {@code metrics}.
+     */
+    @ConfigItem(defaultValue = "metrics")
+    public String path;
+
+    /**
+     * Statistics like max, percentiles, and histogram counts decay over time to give greater weight to recent
+     * samples. Samples are accumulated to such statistics in ring buffers which rotate after
+     * the expiry, with this buffer length.
+     */
+    @ConfigItem(defaultValue = "1024")
+    public Integer bufferLength;
+
+    /**
+     * Statistics like max, percentiles, and histogram counts decay over time to give greater weight to recent
+     * samples. Samples are accumulated to such statistics in ring buffers which rotate after
+     * this expiry, with a particular buffer length.
+     */
+    @ConfigItem(defaultValue = "P3D")
+    public Duration expiry;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{path='" + path
+                + ",enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/KafkaConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/KafkaConfigGroup.java
new file mode 100644
index 0000000000000..46cb547a8f933
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/KafkaConfigGroup.java
@@ -0,0 +1,35 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+/**
+ * Build / static runtime config for Kafka Binders
+ */
+@ConfigGroup
+public class KafkaConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    /**
+     * Kafka metrics support.
+     * <p>
+     * Support for Kafka metrics will be enabled if Micrometer support is enabled,
+     * the Kafka Consumer or Producer interface is on the classpath
+     * and either this value is true, or this value is unset and
+     * {@code quarkus.micrometer.binder-enabled-default} is true.
+     */
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MPMetricsConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MPMetricsConfigGroup.java
new file mode 100644
index 0000000000000..a34b86e679f88
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MPMetricsConfigGroup.java
@@ -0,0 +1,49 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+/**
+ * Build / static runtime config for the Microprofile Metrics Binder
+ */
+@ConfigGroup
+public class MPMetricsConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    // @formatter:off
+    /**
+     * Eclipse MicroProfile Metrics support.
+     *
+     * Support for MicroProfile Metrics will be enabled if Micrometer
+     * support is enabled and the MicroProfile Metrics dependency is present:
+     *
+     * [source,xml]
+     * ----
+     * <dependency>
+     *   <groupId>org.eclipse.microprofile.metrics</groupId>
+     *   <artifactId>microprofile-metrics-api</artifactId>
+     * </dependency>
+     * ----
+     *
+     * The Micrometer extension currently provides a compatibility layer that supports the MP Metrics API,
+     * but metric names and recorded values will be different.
+     * Note that the MP Metrics compatibility layer will move to a different extension in the future.
+     *
+     * @asciidoclet
+     */
+    // @formatter:on
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MicrometerConfig.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MicrometerConfig.java
new file mode 100644
index 0000000000000..0ec10d0f95146
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MicrometerConfig.java
@@ -0,0 +1,129 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * Global configuration for the Micrometer extension
+ */
+@ConfigRoot(name = "micrometer", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public final class MicrometerConfig {
+
+    /**
+     * Micrometer metrics support.
+     * <p>
+     * Micrometer metrics support is enabled by default.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enabled;
+
+    /**
+     * Micrometer MeterRegistry discovery.
+     * <p>
+     * Micrometer MeterRegistry implementations discovered on the classpath
+     * will be enabled automatically by default.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean registryEnabledDefault;
+
+    /**
+     * Micrometer MeterBinder discovery.
+     * <p>
+     * Micrometer MeterBinder implementations discovered on the classpath
+     * will be enabled automatically by default.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean binderEnabledDefault;
+
+    /** Build / static runtime config for binders */
+    public BinderConfig binder;
+
+    /** Build / static runtime config for exporters */
+    public ExportConfig export;
+
+    /**
+     * For MeterRegistry configurations with optional 'enabled' attributes,
+     * determine whether or not the registry is enabled using {@link #registryEnabledDefault}
+     * as the default value.
+     */
+    public boolean checkRegistryEnabledWithDefault(CapabilityEnabled config) {
+        if (enabled) {
+            Optional<Boolean> configValue = config.getEnabled();
+            if (configValue.isPresent()) {
+                return configValue.get();
+            } else {
+                return registryEnabledDefault;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * For MeterBinder configurations with optional 'enabled' attributes,
+     * determine whether or not the binder is enabled using {@link #binderEnabledDefault}
+     * as the default value.
+     */
+    public boolean checkBinderEnabledWithDefault(CapabilityEnabled config) {
+        if (enabled) {
+            Optional<Boolean> configValue = config.getEnabled();
+            if (configValue.isPresent()) {
+                return configValue.get();
+            } else {
+                return binderEnabledDefault;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{enabled=" + enabled
+                + ",binderEnabledDefault=" + binderEnabledDefault
+                + ",registryEnabledDefault=" + registryEnabledDefault
+                + '}';
+    }
+
+    /** Build / static runtime config for binders */
+    @ConfigGroup
+    public static class BinderConfig {
+        public HttpClientConfigGroup httpClient;
+        public HttpServerConfigGroup httpServer;
+
+        /**
+         * Micrometer JVM metrics support.
+         * <p>
+         * Micrometer JVM metrics support is enabled by default.
+         */
+        @ConfigItem(defaultValue = "true")
+        public boolean jvm;
+
+        public KafkaConfigGroup kafka;
+        public MPMetricsConfigGroup mpMetrics;
+
+        /**
+         * Micrometer System metrics support.
+         * <p>
+         * Micrometer System metrics support is enabled by default.
+         */
+        @ConfigItem(defaultValue = "true")
+        public boolean system;
+
+        public VertxConfigGroup vertx;
+    }
+
+    /** Build / static runtime config for exporters */
+    @ConfigGroup
+    public static class ExportConfig {
+        public JsonConfigGroup json;
+        public PrometheusConfigGroup prometheus;
+    }
+
+    public static interface CapabilityEnabled {
+        Optional<Boolean> getEnabled();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/PrometheusConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/PrometheusConfigGroup.java
new file mode 100644
index 0000000000000..c8fccd1b65b8c
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/PrometheusConfigGroup.java
@@ -0,0 +1,40 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class PrometheusConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    /**
+     * Support for export to Prometheus.
+     * <p>
+     * Support for Prometheus will be enabled if Micrometer
+     * support is enabled, the PrometheusMeterRegistry is on the classpath
+     * and either this value is true, or this value is unset and
+     * {@code quarkus.micrometer.registry-enabled-default} is true.
+     */
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
+    /**
+     * The path for the prometheus metrics endpoint (produces text/plain).
+     * The default value is {@code metrics}.
+     */
+    @ConfigItem(defaultValue = "metrics")
+    public String path;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{path='" + path
+                + ",enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/VertxConfigGroup.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/VertxConfigGroup.java
new file mode 100644
index 0000000000000..11aa7b8f9cd55
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/VertxConfigGroup.java
@@ -0,0 +1,36 @@
+package io.quarkus.micrometer.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+/**
+ * Build / static runtime config for the Vert.x Binder
+ */
+@ConfigGroup
+public class VertxConfigGroup implements MicrometerConfig.CapabilityEnabled {
+    /**
+     * Vert.x metrics support.
+     * <p>
+     * Support for Vert.x metrics will be enabled if Micrometer
+     * support is enabled, Vert.x MetricsOptions is on the classpath
+     * and either this value is true, or this value is unset and
+     * {@code quarkus.micrometer.binder-enabled-default} is true.
+     *
+     */
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
+    @Override
+    public Optional<Boolean> getEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName()
+                + "{enabled=" + enabled
+                + '}';
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/HttpClientConfig.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/HttpClientConfig.java
new file mode 100644
index 0000000000000..04be00c380ece
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/HttpClientConfig.java
@@ -0,0 +1,40 @@
+package io.quarkus.micrometer.runtime.config.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "micrometer.binder.http-client", phase = ConfigPhase.RUN_TIME)
+public class HttpClientConfig {
+    /**
+     * Comma-separated list of regular expressions used to specify uri
+     * labels in http metrics.
+     *
+     * Outbount HTTP client instrumentation will attempt to transform parameterized
+     * resource paths, `/item/123`, into a generic form, `/item/{id}`,
+     * to reduce the cardinality of uri label values.
+     *
+     * Patterns specified here will take precedence over those computed
+     * values.
+     *
+     * For example, if `/item/\\\\d+=/item/custom` or
+     * `/item/[0-9]+=/item/custom` is specified in this list,
+     * a request to a matching path (`/item/123`) will use the specified
+     * replacement value (`/item/custom`) as the value for the uri label.
+     * Note that backslashes must be double escaped as {@code \\\\}.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Optional<List<String>> matchPatterns = Optional.empty();
+
+    /**
+     * Comma-separated list of regular expressions defining uri paths
+     * that should be ignored (not measured).
+     */
+    @ConfigItem
+    public Optional<List<String>> ignorePatterns = Optional.empty();
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/HttpServerConfig.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/HttpServerConfig.java
new file mode 100644
index 0000000000000..1c61560307d6f
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/HttpServerConfig.java
@@ -0,0 +1,49 @@
+package io.quarkus.micrometer.runtime.config.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "micrometer.binder.http-server", phase = ConfigPhase.RUN_TIME)
+public class HttpServerConfig {
+    /**
+     * Comma-separated list of regular expressions used to specify uri
+     * labels in http metrics.
+     *
+     * Vertx instrumentation will attempt to transform parameterized
+     * resource paths, `/item/123`, into a generic form, `/item/{id}`,
+     * to reduce the cardinality of uri label values.
+     *
+     * Patterns specified here will take precedence over those computed
+     * values.
+     *
+     * For example, if `/item/\\\\d+=/item/custom` or
+     * `/item/[0-9]+=/item/custom` is specified in this list,
+     * a request to a matching path (`/item/123`) will use the specified
+     * replacement value (`/item/custom`) as the value for the uri label.
+     * Note that backslashes must be double escaped as {@code \\\\}.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Optional<List<String>> matchPatterns = Optional.empty();
+
+    /**
+     * Comma-separated list of regular expressions defining uri paths
+     * that should be ignored (not measured).
+     */
+    @ConfigItem
+    public Optional<List<String>> ignorePatterns = Optional.empty();
+
+    public void mergeDeprecatedConfig(VertxConfig config) {
+        if (!ignorePatterns.isPresent()) {
+            ignorePatterns = config.ignorePatterns;
+        }
+        if (!matchPatterns.isPresent()) {
+            matchPatterns = config.matchPatterns;
+        }
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/PrometheusConfig.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/PrometheusConfig.java
new file mode 100644
index 0000000000000..c294a59da8bfb
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/PrometheusConfig.java
@@ -0,0 +1,27 @@
+package io.quarkus.micrometer.runtime.config.runtime;
+
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * Runtime configuration for Micrometer meter registries.
+ */
+@SuppressWarnings("unused")
+@ConfigRoot(name = "micrometer.export.prometheus", phase = ConfigPhase.RUN_TIME)
+public class PrometheusConfig {
+    // @formatter:off
+    /**
+     * Prometheus registry configuration properties.
+     *
+     * A property source for configuration of the Prometheus MeterRegistry,
+     * see https://micrometer.io/docs/registry/prometheus.
+     *
+     * @asciidoclet
+     */
+    // @formatter:on
+    @ConfigItem(name = ConfigItem.PARENT)
+    Map<String, String> prometheus;
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/VertxConfig.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/VertxConfig.java
new file mode 100644
index 0000000000000..9eb45f70b1142
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/runtime/VertxConfig.java
@@ -0,0 +1,28 @@
+package io.quarkus.micrometer.runtime.config.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "micrometer.binder.vertx", phase = ConfigPhase.RUN_TIME)
+public class VertxConfig {
+    /**
+     * @deprecated use {@code quarkus.micrometer.binder.http-server.match-patterns}
+     */
+    @Deprecated
+    @ConfigItem
+    public Optional<List<String>> matchPatterns = Optional.empty();
+
+    /**
+     * Comma-separated list of regular expressions defining uri paths
+     * that should be ignored (not measured).
+     * 
+     * @deprecated use {@code quarkus.micrometer.binder.http-server.ignore-patterns}
+     */
+    @Deprecated
+    @ConfigItem
+    public Optional<List<String>> ignorePatterns = Optional.empty();
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/ConfigAdapter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/ConfigAdapter.java
new file mode 100644
index 0000000000000..4e0977c077b4b
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/ConfigAdapter.java
@@ -0,0 +1,91 @@
+package io.quarkus.micrometer.runtime.export;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.microprofile.config.Config;
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.config.MeterRegistryConfig;
+import io.micrometer.core.instrument.config.validate.InvalidReason;
+import io.micrometer.core.instrument.config.validate.Validated;
+
+public class ConfigAdapter {
+    private static final Logger log = Logger.getLogger(ConfigAdapter.class);
+    static final String ROOT = "quarkus.micrometer.export.";
+    static final int TRIM_POS = ROOT.length();
+
+    private ConfigAdapter() {
+    }
+
+    public static Map<String, String> captureProperties(Config config, String prefix) {
+        final Map<String, String> properties = new HashMap<>();
+
+        // Rename and store properties
+        for (String name : config.getPropertyNames()) {
+            if (name.startsWith(prefix)) {
+                String key = convertKey(name);
+                String value = config.getValue(name, String.class);
+                properties.put(key, value);
+            }
+        }
+        return properties;
+    }
+
+    public static <T extends MeterRegistryConfig> T validate(T config) {
+        Validated validated = config.validate();
+        List<Validated.Invalid<T>> errors = validated.failures();
+        if (validated.isInvalid()) {
+            errors.stream().forEach(x -> {
+                String name = revertKey(x.getProperty());
+                if (x.getReason() == InvalidReason.MISSING) {
+                    log.errorf("%s is required", name);
+                } else {
+                    log.errorf(x.getException(), "%s is malformed", name);
+                }
+            });
+        }
+        return config;
+    }
+
+    static String convertKey(String name) {
+        String key = name.substring(TRIM_POS);
+        return camelHumpify(key);
+    }
+
+    static String revertKey(String name) {
+        return ROOT + dashify(name);
+    }
+
+    static String camelHumpify(String s) {
+        if (s.indexOf('-') >= 0) {
+            StringBuilder b = new StringBuilder();
+            for (int i = 0; i < s.length(); i++) {
+                if (s.charAt(i) == '-') {
+                    i++;
+                    if (i < s.length()) {
+                        b.append(Character.toUpperCase(s.charAt(i)));
+                    }
+                } else {
+                    b.append(s.charAt(i));
+                }
+            }
+            return b.toString();
+        }
+        return s;
+    }
+
+    static String dashify(String s) {
+        final StringBuilder ret = new StringBuilder();
+        final char[] chars = s.toCharArray();
+        for (int i = 0; i < chars.length; i++) {
+            final char c = chars[i];
+            if (i != 0 && i != (chars.length - 1) && c >= 'A' && c <= 'Z') {
+                ret.append('-');
+            }
+            ret.append(Character.toLowerCase(c));
+        }
+        return ret.toString();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java
new file mode 100644
index 0000000000000..012958f7d10cd
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonMeterRegistryProvider.java
@@ -0,0 +1,17 @@
+package io.quarkus.micrometer.runtime.export;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.micrometer.core.instrument.Clock;
+import io.quarkus.micrometer.runtime.registry.json.JsonMeterRegistry;
+
+@Singleton
+public class JsonMeterRegistryProvider {
+
+    @Produces
+    @Singleton
+    public JsonMeterRegistry registry(Clock clock, io.quarkus.micrometer.runtime.config.MicrometerConfig config) {
+        return new JsonMeterRegistry(clock, config.export.json.bufferLength, config.export.json.expiry);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonRecorder.java
new file mode 100644
index 0000000000000..9ab0a33fb7d90
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonRecorder.java
@@ -0,0 +1,29 @@
+package io.quarkus.micrometer.runtime.export;
+
+import java.util.function.Consumer;
+
+import io.quarkus.micrometer.runtime.export.handlers.JsonHandler;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.ext.web.Route;
+
+@Recorder
+public class JsonRecorder {
+    JsonHandler handler;
+
+    public JsonHandler getHandler() {
+        if (handler == null) {
+            handler = new JsonHandler();
+        }
+
+        return handler;
+    }
+
+    public Consumer<Route> route() {
+        return new Consumer<Route>() {
+            @Override
+            public void accept(Route route) {
+                route.order(2).produces("application/json");
+            }
+        };
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java
new file mode 100644
index 0000000000000..0994245804f75
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusMeterRegistryProvider.java
@@ -0,0 +1,65 @@
+package io.quarkus.micrometer.runtime.export;
+
+import java.util.Map;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+import javax.interceptor.Interceptor;
+
+import org.eclipse.microprofile.config.Config;
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheus.PrometheusDurationNamingConvention;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheus.PrometheusNamingConvention;
+import io.prometheus.client.CollectorRegistry;
+import io.quarkus.arc.AlternativePriority;
+import io.quarkus.arc.DefaultBean;
+
+@Singleton
+public class PrometheusMeterRegistryProvider {
+    private static final Logger log = Logger.getLogger(PrometheusMeterRegistryProvider.class);
+
+    static final String PREFIX = "quarkus.micrometer.export.prometheus.";
+
+    @Produces
+    @Singleton
+    @DefaultBean
+    public PrometheusConfig configure(Config config) {
+        final Map<String, String> properties = ConfigAdapter.captureProperties(config, PREFIX);
+
+        return ConfigAdapter.validate(new PrometheusConfig() {
+            @Override
+            public String get(String key) {
+                return properties.get(key);
+            }
+        });
+    }
+
+    @Produces
+    @DefaultBean
+    public PrometheusNamingConvention namingConvention() {
+        return new PrometheusNamingConvention();
+    }
+
+    @Produces
+    @DefaultBean
+    public PrometheusDurationNamingConvention durationNamingConvention() {
+        return new PrometheusDurationNamingConvention();
+    }
+
+    @Produces
+    @DefaultBean
+    public CollectorRegistry collectorRegistry() {
+        return new CollectorRegistry(true);
+    }
+
+    @Produces
+    @Singleton
+    @AlternativePriority(Interceptor.Priority.APPLICATION + 100)
+    public PrometheusMeterRegistry registry(PrometheusConfig config, CollectorRegistry collectorRegistry, Clock clock) {
+        return new PrometheusMeterRegistry(config, collectorRegistry, clock);
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusRecorder.java
new file mode 100644
index 0000000000000..998d3c2af4aab
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusRecorder.java
@@ -0,0 +1,29 @@
+package io.quarkus.micrometer.runtime.export;
+
+import java.util.function.Consumer;
+
+import io.quarkus.micrometer.runtime.export.handlers.PrometheusHandler;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.ext.web.Route;
+
+@Recorder
+public class PrometheusRecorder {
+    PrometheusHandler handler;
+
+    public PrometheusHandler getHandler() {
+        if (handler == null) {
+            handler = new PrometheusHandler();
+        }
+
+        return handler;
+    }
+
+    public Consumer<Route> route() {
+        return new Consumer<Route>() {
+            @Override
+            public void accept(Route route) {
+                route.order(1).produces("text/plain");
+            }
+        };
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java
new file mode 100644
index 0000000000000..b73e792c8a4a8
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/JsonHandler.java
@@ -0,0 +1,53 @@
+package io.quarkus.micrometer.runtime.export.handlers;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.CDI;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.micrometer.runtime.registry.json.JsonMeterRegistry;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.ext.web.RoutingContext;
+
+public class JsonHandler implements Handler<RoutingContext> {
+    private static final Logger log = Logger.getLogger(JsonHandler.class);
+
+    private JsonMeterRegistry registry;
+
+    private boolean setup = false;
+
+    @Override
+    public void handle(RoutingContext routingContext) {
+        if (!setup) {
+            setup();
+        }
+
+        HttpServerResponse response = routingContext.response();
+        if (registry == null) {
+            response.setStatusCode(500)
+                    .setStatusMessage("Unable to resolve JSON registry instance");
+        } else {
+            response.putHeader("Content-Type", "application/json")
+                    .end(Buffer.buffer(registry.scrape()));
+        }
+    }
+
+    private void setup() {
+        Instance<JsonMeterRegistry> registries = CDI.current().select(JsonMeterRegistry.class,
+                Default.Literal.INSTANCE);
+
+        if (registries.isUnsatisfied()) {
+            registry = null;
+        } else if (registries.isAmbiguous()) {
+            registry = registries.iterator().next();
+            log.warnf("Multiple JSON registries present. Using %s with the built in scrape endpoint", registry);
+        } else {
+            registry = registries.get();
+        }
+
+        setup = true;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java
new file mode 100644
index 0000000000000..1a3283734d26d
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/handlers/PrometheusHandler.java
@@ -0,0 +1,55 @@
+package io.quarkus.micrometer.runtime.export.handlers;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.CDI;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.prometheus.client.exporter.common.TextFormat;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.ext.web.RoutingContext;
+
+public class PrometheusHandler implements Handler<RoutingContext> {
+    private static final Logger log = Logger.getLogger(PrometheusHandler.class);
+
+    private PrometheusMeterRegistry registry;
+
+    private boolean setup = false;
+
+    @Override
+    public void handle(RoutingContext routingContext) {
+        if (!setup) {
+            setup();
+        }
+
+        HttpServerResponse response = routingContext.response();
+        if (registry == null) {
+            response.setStatusCode(500)
+                    .setStatusMessage("Unable to resolve Prometheus registry instance");
+        } else {
+            response.putHeader("Content-Type", TextFormat.CONTENT_TYPE_004)
+                    .end(Buffer.buffer(registry.scrape()));
+        }
+    }
+
+    private void setup() {
+        Instance<PrometheusMeterRegistry> registries = CDI.current().select(PrometheusMeterRegistry.class,
+                Default.Literal.INSTANCE);
+
+        if (registries.isUnsatisfied()) {
+            registry = null;
+        } else if (registries.isAmbiguous()) {
+            registry = registries.iterator().next();
+            log.warnf("Multiple prometheus registries present. Using %s with the built-in scrape endpoint",
+                    registry);
+        } else {
+            registry = registries.get();
+        }
+
+        setup = true;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonDistributionSummary.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonDistributionSummary.java
new file mode 100644
index 0000000000000..5875d691aed50
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonDistributionSummary.java
@@ -0,0 +1,64 @@
+package io.quarkus.micrometer.runtime.registry.json;
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.DoubleAdder;
+import java.util.concurrent.atomic.LongAdder;
+
+import io.micrometer.core.instrument.AbstractDistributionSummary;
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Measurement;
+import io.micrometer.core.instrument.Statistic;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.core.instrument.distribution.TimeWindowMax;
+
+public class JsonDistributionSummary extends AbstractDistributionSummary {
+
+    private final LongAdder count;
+    private final DoubleAdder total;
+    private final TimeWindowMax max;
+    private final TimeWindowMin min;
+
+    public JsonDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
+            double scale, boolean supportsAggregablePercentiles) {
+        super(id, clock, distributionStatisticConfig, scale, supportsAggregablePercentiles);
+        this.count = new LongAdder();
+        this.total = new DoubleAdder();
+        this.max = new TimeWindowMax(clock, distributionStatisticConfig);
+        this.min = new TimeWindowMin(clock, distributionStatisticConfig);
+    }
+
+    @Override
+    protected void recordNonNegative(double amount) {
+        count.increment();
+        total.add(amount);
+        max.record(amount);
+        min.record(amount);
+    }
+
+    @Override
+    public long count() {
+        return count.longValue();
+    }
+
+    @Override
+    public double totalAmount() {
+        return total.sum();
+    }
+
+    @Override
+    public double max() {
+        return max.poll();
+    }
+
+    public double min() {
+        return min.poll();
+    }
+
+    @Override
+    public Iterable<Measurement> measure() {
+        return Arrays.asList(
+                new Measurement(() -> (double) count(), Statistic.COUNT),
+                new Measurement(this::totalAmount, Statistic.TOTAL),
+                new Measurement(this::max, Statistic.MAX));
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java
new file mode 100644
index 0000000000000..3d4148eda2aed
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonExporter.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2017 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *    https://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 io.quarkus.micrometer.runtime.registry.json;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
+import javax.json.JsonWriter;
+import javax.json.spi.JsonProvider;
+import javax.json.stream.JsonGenerator;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.FunctionCounter;
+import io.micrometer.core.instrument.FunctionTimer;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.TimeGauge;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.distribution.HistogramSnapshot;
+import io.micrometer.core.instrument.distribution.ValueAtPercentile;
+
+public class JsonExporter {
+
+    private static final Map<String, ?> JSON_CONFIG = Collections.singletonMap(JsonGenerator.PRETTY_PRINTING, true);
+    private static final JsonProvider JSON_PROVIDER = JsonProvider.provider();
+
+    public JsonExporter() {
+    }
+
+    public StringBuilder exportEverything(JsonMeterRegistry meterRegistry) {
+        JsonObjectBuilder root = JSON_PROVIDER.createObjectBuilder();
+        List<Gauge> gauges = new ArrayList<>();
+        List<Counter> counters = new ArrayList<>();
+        List<TimeGauge> timeGauges = new ArrayList<>();
+        List<FunctionCounter> functionCounters = new ArrayList<>();
+        List<Timer> timers = new ArrayList<>();
+        List<LongTaskTimer> longTaskTimers = new ArrayList<>();
+        List<FunctionTimer> functionTimers = new ArrayList<>();
+        List<DistributionSummary> distributionSummaries = new ArrayList<>();
+        List<Meter> meters = new ArrayList<>();
+        meterRegistry.getMeters().forEach(meter -> meter.match(gauges::add,
+                counters::add,
+                timers::add,
+                distributionSummaries::add,
+                longTaskTimers::add,
+                timeGauges::add,
+                functionCounters::add,
+                functionTimers::add,
+                meters::add));
+        exportCounters(counters).forEach(root::add);
+        exportGauges(gauges).forEach(root::add);
+        exportTimeGauges(timeGauges).forEach(root::add);
+        exportFunctionCounters(functionCounters).forEach(root::add);
+        exportTimers(timers).forEach(root::add);
+        exportLongTaskTimers(longTaskTimers).forEach(root::add);
+        exportFunctionTimers(functionTimers).forEach(root::add);
+        exportDistributionSummaries(distributionSummaries).forEach(root::add);
+        return stringify(root.build());
+    }
+
+    private Map<String, JsonValue> exportGauges(Collection<Gauge> gauges) {
+        Map<String, JsonValue> result = new HashMap<String, JsonValue>(gauges.size());
+        for (Gauge g : gauges) {
+            double value = g.value();
+            if (Double.isFinite(value)) {
+                result.put(createExportKey(g.getId()), JSON_PROVIDER.createValue(value));
+            }
+        }
+        return result;
+    }
+
+    private Map<String, JsonValue> exportTimeGauges(Collection<TimeGauge> timeGauges) {
+        Map<String, JsonValue> result = new HashMap<String, JsonValue>(timeGauges.size());
+        for (TimeGauge g : timeGauges) {
+            double value = g.value();
+            if (Double.isFinite(value)) {
+                result.put(createExportKey(g.getId()), JSON_PROVIDER.createValue(value));
+            }
+        }
+        return result;
+    }
+
+    private Map<String, JsonValue> exportCounters(Collection<Counter> counters) {
+        return counters.stream()
+                .collect(Collectors.toMap(counter -> createExportKey(counter.getId()),
+                        counter -> JSON_PROVIDER.createValue(counter.count())));
+    }
+
+    private Map<String, JsonValue> exportFunctionCounters(Collection<FunctionCounter> counters) {
+        return counters.stream()
+                .collect(Collectors.toMap(counter -> createExportKey(counter.getId()),
+                        counter -> JSON_PROVIDER.createValue(counter.count())));
+    }
+
+    private Map<String, JsonValue> exportTimers(Collection<Timer> timers) {
+        Map<String, List<Timer>> groups = timers.stream().collect(Collectors.groupingBy(timer -> timer.getId().getName()));
+        Map<String, JsonValue> result = new HashMap<>();
+        for (Map.Entry<String, List<Timer>> group : groups.entrySet()) {
+            JsonObjectBuilder builder = JSON_PROVIDER.createObjectBuilder();
+            for (Timer timer : group.getValue()) {
+                builder.add(createExportKey("count", timer.getId()), timer.count());
+                builder.add(createExportKey("elapsedTime", timer.getId()), timer.totalTime(timer.baseTimeUnit()));
+            }
+            result.put(group.getKey(), builder.build());
+        }
+        return result;
+    }
+
+    private Map<String, JsonValue> exportLongTaskTimers(Collection<LongTaskTimer> timers) {
+        Map<String, List<LongTaskTimer>> groups = timers.stream()
+                .collect(Collectors.groupingBy(timer -> timer.getId().getName()));
+        Map<String, JsonValue> result = new HashMap<>();
+        for (Map.Entry<String, List<LongTaskTimer>> group : groups.entrySet()) {
+            JsonObjectBuilder builder = JSON_PROVIDER.createObjectBuilder();
+            for (LongTaskTimer timer : group.getValue()) {
+                builder.add(createExportKey("activeTasks", timer.getId()), timer.activeTasks());
+                builder.add(createExportKey("duration", timer.getId()), timer.duration(timer.baseTimeUnit()));
+                builder.add(createExportKey("max", timer.getId()), timer.max(timer.baseTimeUnit()));
+                builder.add(createExportKey("mean", timer.getId()), timer.mean(timer.baseTimeUnit()));
+            }
+            result.put(group.getKey(), builder.build());
+        }
+        return result;
+    }
+
+    private Map<String, JsonValue> exportFunctionTimers(Collection<FunctionTimer> timers) {
+        Map<String, List<FunctionTimer>> groups = timers.stream()
+                .collect(Collectors.groupingBy(timer -> timer.getId().getName()));
+        Map<String, JsonValue> result = new HashMap<>();
+        for (Map.Entry<String, List<FunctionTimer>> group : groups.entrySet()) {
+            JsonObjectBuilder builder = JSON_PROVIDER.createObjectBuilder();
+            for (FunctionTimer timer : group.getValue()) {
+                builder.add(createExportKey("count", timer.getId()), timer.count());
+                builder.add(createExportKey("elapsedTime", timer.getId()), timer.totalTime(timer.baseTimeUnit()));
+            }
+            result.put(group.getKey(), builder.build());
+        }
+        return result;
+    }
+
+    private Map<String, JsonValue> exportDistributionSummaries(Collection<DistributionSummary> distributionSummaries) {
+        Map<String, List<DistributionSummary>> groups = distributionSummaries.stream()
+                .collect(Collectors.groupingBy(summary -> summary.getId().getName()));
+        Map<String, JsonValue> result = new HashMap<>();
+        for (Map.Entry<String, List<DistributionSummary>> group : groups.entrySet()) {
+            JsonObjectBuilder builder = JSON_PROVIDER.createObjectBuilder();
+            for (DistributionSummary summary : group.getValue()) {
+                HistogramSnapshot snapshot = summary.takeSnapshot();
+                if (summary instanceof JsonDistributionSummary) {
+                    double min = ((JsonDistributionSummary) summary).min();
+                    // if there are no samples yet, show 0 as the min
+                    builder.add(createExportKey("min", summary.getId()), !Double.isNaN(min) ? min : 0);
+                }
+                builder.add(createExportKey("count", summary.getId()), snapshot.count());
+                builder.add(createExportKey("max", summary.getId()), snapshot.max());
+                builder.add(createExportKey("mean", summary.getId()), snapshot.mean());
+                for (ValueAtPercentile valueAtPercentile : snapshot.percentileValues()) {
+                    if (Math.abs(valueAtPercentile.percentile() - 0.999) < 0.000001) {
+                        builder.add(createExportKey("p999", summary.getId()),
+                                valueAtPercentile.value());
+                    } else {
+                        builder.add(
+                                createExportKey("p" + (int) Math.floor(valueAtPercentile.percentile() * 100), summary.getId()),
+                                valueAtPercentile.value());
+                    }
+                }
+            }
+            result.put(group.getKey(), builder.build());
+        }
+        return result;
+    }
+
+    private StringBuilder stringify(JsonObject obj) {
+        StringWriter out = new StringWriter();
+        try (JsonWriter writer = JSON_PROVIDER.createWriterFactory(JSON_CONFIG).createWriter(out)) {
+            writer.writeObject(obj);
+        }
+        return new StringBuilder(out.toString());
+    }
+
+    private String createExportKey(Meter.Id id) {
+        return id.getName() + createTagsString(id.getTags());
+    }
+
+    private String createExportKey(String componentKey, Meter.Id id) {
+        return componentKey + createTagsString(id.getTags());
+    }
+
+    private String createTagsString(List<Tag> tags) {
+        if (tags == null || tags.isEmpty()) {
+            return "";
+        } else {
+            return ";" + tags.stream()
+                    .map(tag -> tag.getKey() + "=" + tag.getValue()
+                            .replace(";", "_"))
+                    .collect(Collectors.joining(";"));
+        }
+    }
+
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonMeterRegistry.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonMeterRegistry.java
new file mode 100644
index 0000000000000..5f4ce1fbd70f4
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonMeterRegistry.java
@@ -0,0 +1,118 @@
+package io.quarkus.micrometer.runtime.registry.json;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToLongFunction;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.FunctionCounter;
+import io.micrometer.core.instrument.FunctionTimer;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.Measurement;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.cumulative.CumulativeCounter;
+import io.micrometer.core.instrument.cumulative.CumulativeFunctionCounter;
+import io.micrometer.core.instrument.cumulative.CumulativeFunctionTimer;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.core.instrument.distribution.pause.PauseDetector;
+import io.micrometer.core.instrument.internal.DefaultGauge;
+import io.micrometer.core.instrument.internal.DefaultMeter;
+import io.micrometer.core.instrument.noop.NoopLongTaskTimer;
+
+/**
+ * A registry that, when exported, mimics the JSON exporter from MP Metrics 3.0
+ * as closely as it is reasonable to attempt to.
+ */
+public class JsonMeterRegistry extends MeterRegistry {
+
+    private final JsonExporter jsonExporter;
+    private final Integer bufferLength;
+    private final Duration expiry;
+
+    public JsonMeterRegistry(Clock clock, Integer bufferLength, Duration expiry) {
+        super(clock);
+        this.jsonExporter = new JsonExporter();
+        this.bufferLength = bufferLength;
+        this.expiry = expiry;
+    }
+
+    @Override
+    protected <T> Gauge newGauge(Meter.Id id, T obj, ToDoubleFunction<T> valueFunction) {
+        return new DefaultGauge<>(id, obj, valueFunction);
+    }
+
+    @Override
+    protected Counter newCounter(Meter.Id id) {
+        return new CumulativeCounter(id);
+    }
+
+    @Override
+    protected Timer newTimer(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig,
+            PauseDetector pauseDetector) {
+        // turn off percentiles and histograms because we don't need them for the JSON export
+        distributionStatisticConfig = DistributionStatisticConfig.builder()
+                .percentilesHistogram(false)
+                .percentiles(new double[0])
+                .build()
+                .merge(distributionStatisticConfig);
+        return new JsonTimer(id, clock, distributionStatisticConfig, pauseDetector, getBaseTimeUnit());
+    }
+
+    @Override
+    protected DistributionSummary newDistributionSummary(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig,
+            double scale) {
+        return new JsonDistributionSummary(id, clock, distributionStatisticConfig, scale, false);
+    }
+
+    @Override
+    protected Meter newMeter(Meter.Id id, Meter.Type type, Iterable<Measurement> measurements) {
+        return new DefaultMeter(id, type, measurements);
+    }
+
+    @Override
+    protected <T> FunctionTimer newFunctionTimer(Meter.Id id, T obj, ToLongFunction<T> countFunction,
+            ToDoubleFunction<T> totalTimeFunction, TimeUnit totalTimeFunctionUnit) {
+        return new CumulativeFunctionTimer<>(id, obj, countFunction, totalTimeFunction,
+                totalTimeFunctionUnit, getBaseTimeUnit());
+    }
+
+    @Override
+    protected <T> FunctionCounter newFunctionCounter(Meter.Id id, T obj, ToDoubleFunction<T> countFunction) {
+        return new CumulativeFunctionCounter<>(id, obj, countFunction);
+    }
+
+    @Override
+    protected LongTaskTimer newLongTaskTimer(Meter.Id id, DistributionStatisticConfig distributionStatisticConfig) {
+        return new NoopLongTaskTimer(id);
+    }
+
+    @Override
+    protected TimeUnit getBaseTimeUnit() {
+        return TimeUnit.MILLISECONDS;
+    }
+
+    @Override
+    protected DistributionStatisticConfig defaultHistogramConfig() {
+        return DistributionStatisticConfig.builder()
+                .percentiles(0.5, 0.75, 0.95, 0.98, 0.99, 0.999)
+                .percentilePrecision(3)
+                .percentilesHistogram(false)
+                .minimumExpectedValue(Double.MIN_VALUE)
+                .maximumExpectedValue(Double.POSITIVE_INFINITY)
+                .bufferLength(bufferLength)
+                .expiry(expiry)
+                .build();
+    }
+
+    public String scrape() {
+        return jsonExporter
+                .exportEverything(this)
+                .toString();
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonTimer.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonTimer.java
new file mode 100644
index 0000000000000..f912ba8c0f0e7
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/JsonTimer.java
@@ -0,0 +1,45 @@
+package io.quarkus.micrometer.runtime.registry.json;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.LongAdder;
+
+import io.micrometer.core.instrument.AbstractTimer;
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.core.instrument.distribution.pause.PauseDetector;
+
+class JsonTimer extends AbstractTimer {
+
+    private static final TimeUnit INTERNAL_STORAGE_UNIT = TimeUnit.NANOSECONDS;
+
+    private final LongAdder elapsedTime; // in the internal storage unit
+    private final LongAdder count;
+
+    protected JsonTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
+            PauseDetector pauseDetector, TimeUnit baseTimeUnit) {
+        super(id, clock, distributionStatisticConfig, pauseDetector, baseTimeUnit, false);
+        this.count = new LongAdder();
+        this.elapsedTime = new LongAdder();
+    }
+
+    @Override
+    protected void recordNonNegative(long amount, TimeUnit unit) {
+        count.increment();
+        elapsedTime.add(INTERNAL_STORAGE_UNIT.convert(amount, unit));
+    }
+
+    @Override
+    public long count() {
+        return count.longValue();
+    }
+
+    @Override
+    public double totalTime(TimeUnit unit) {
+        return unit.convert(elapsedTime.longValue(), INTERNAL_STORAGE_UNIT);
+    }
+
+    @Override
+    public double max(TimeUnit unit) {
+        return 0;
+    }
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/TimeWindowMin.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/TimeWindowMin.java
new file mode 100644
index 0000000000000..d44b4fa1cb805
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/registry/json/TimeWindowMin.java
@@ -0,0 +1,116 @@
+package io.quarkus.micrometer.runtime.registry.json;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.DoubleSupplier;
+import java.util.function.LongSupplier;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.core.instrument.util.TimeUtils;
+
+class TimeWindowMin {
+    private static final AtomicIntegerFieldUpdater<TimeWindowMin> rotatingUpdater = AtomicIntegerFieldUpdater
+            .newUpdater(TimeWindowMin.class, "rotating");
+
+    private final Clock clock;
+    private final long durationBetweenRotatesMillis;
+    private AtomicLong[] ringBuffer;
+    private int currentBucket;
+    private volatile long lastRotateTimestampMillis;
+
+    @SuppressWarnings({ "unused", "FieldCanBeLocal" })
+    private volatile int rotating = 0; // 0 - not rotating, 1 - rotating
+
+    @SuppressWarnings("ConstantConditions")
+    public TimeWindowMin(Clock clock, DistributionStatisticConfig config) {
+        this(clock, config.getExpiry().toMillis(), config.getBufferLength());
+    }
+
+    public TimeWindowMin(Clock clock, long rotateFrequencyMillis, int bufferLength) {
+        this.clock = clock;
+        this.durationBetweenRotatesMillis = rotateFrequencyMillis;
+        this.lastRotateTimestampMillis = clock.wallTime();
+        this.currentBucket = 0;
+
+        this.ringBuffer = new AtomicLong[bufferLength];
+        for (int i = 0; i < bufferLength; i++) {
+            this.ringBuffer[i] = new AtomicLong(Long.MAX_VALUE);
+        }
+    }
+
+    /**
+     * For use by timer implementations.
+     *
+     * @param sample The value to record.
+     * @param timeUnit The unit of time of the incoming sample.
+     */
+    public void record(double sample, TimeUnit timeUnit) {
+        record(() -> (long) TimeUtils.convert(sample, timeUnit, TimeUnit.NANOSECONDS));
+    }
+
+    private void record(LongSupplier sampleSupplier) {
+        rotate();
+        long sample = sampleSupplier.getAsLong();
+        for (AtomicLong min : ringBuffer) {
+            updateMin(min, sample);
+        }
+    }
+
+    public double poll(TimeUnit timeUnit) {
+        return poll(() -> TimeUtils.nanosToUnit(ringBuffer[currentBucket].get(), timeUnit));
+    }
+
+    private double poll(DoubleSupplier minSupplier) {
+        rotate();
+        synchronized (this) {
+            return minSupplier.getAsDouble();
+        }
+    }
+
+    public double poll() {
+        return poll(() -> Double.longBitsToDouble(ringBuffer[currentBucket].get()));
+    }
+
+    public void record(double sample) {
+        record(() -> Double.doubleToLongBits(sample));
+    }
+
+    private void updateMin(AtomicLong min, long sample) {
+        long curMin;
+        do {
+            curMin = min.get();
+        } while (curMin > sample && !min.compareAndSet(curMin, sample));
+    }
+
+    private void rotate() {
+        long timeSinceLastRotateMillis = clock.wallTime() - lastRotateTimestampMillis;
+        if (timeSinceLastRotateMillis < durationBetweenRotatesMillis) {
+            // Need to wait more for next rotation.
+            return;
+        }
+
+        if (!rotatingUpdater.compareAndSet(this, 0, 1)) {
+            // Being rotated by other thread already.
+            return;
+        }
+
+        try {
+            int iterations = 0;
+            synchronized (this) {
+                do {
+                    ringBuffer[currentBucket].set(0);
+                    if (++currentBucket >= ringBuffer.length) {
+                        currentBucket = 0;
+                    }
+                    timeSinceLastRotateMillis -= durationBetweenRotatesMillis;
+                    lastRotateTimestampMillis += durationBetweenRotatesMillis;
+                } while (timeSinceLastRotateMillis >= durationBetweenRotatesMillis && ++iterations < ringBuffer.length);
+            }
+        } finally {
+            rotating = 0;
+        }
+    }
+
+}
diff --git a/extensions/micrometer/runtime/src/main/java/io/smallrye/metrics/api/FunctionGaugeSupport.java b/extensions/micrometer/runtime/src/main/java/io/smallrye/metrics/api/FunctionGaugeSupport.java
new file mode 100644
index 0000000000000..427a768776856
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/java/io/smallrye/metrics/api/FunctionGaugeSupport.java
@@ -0,0 +1,20 @@
+package io.smallrye.metrics.api;
+
+import java.util.function.Supplier;
+
+import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.Tag;
+
+import io.smallrye.common.annotation.Experimental;
+
+/**
+ * Temporary tool to support function gauges in 2.4.x even though they become part of the official API in 3.0.
+ * This is scheduled to be removed along with the upgrade to SmallRye Metrics 3.0.
+ */
+@Experimental("Temporarily backported API from Metrics 3.0 to support it in 2.4.x")
+@Deprecated
+public interface FunctionGaugeSupport {
+
+    <T extends Number> Gauge<T> gauge(String name, Supplier<T> supplier, Tag... tags);
+
+}
diff --git a/extensions/micrometer/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/micrometer/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..d551a9682ee90
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,11 @@
+name: "Micrometer metrics"
+metadata:
+  keywords:
+  - "micrometer"
+  - "metrics"
+  - "metric"
+  - "monitoring"
+  guide: "https://quarkus.io/guides/micrometer-metrics"
+  categories:
+  - "observability"
+  status: "stable"
diff --git a/extensions/micrometer/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener b/extensions/micrometer/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener
new file mode 100644
index 0000000000000..6abda62821d09
--- /dev/null
+++ b/extensions/micrometer/runtime/src/main/resources/META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener
@@ -0,0 +1 @@
+io.quarkus.micrometer.runtime.binder.RestClientMetrics
diff --git a/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/HttpMetricsCommonTest.java b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/HttpMetricsCommonTest.java
new file mode 100644
index 0000000000000..b9a8540dfdc41
--- /dev/null
+++ b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/HttpMetricsCommonTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.micrometer.core.instrument.Tag;
+
+/**
+ * Test tag creation
+ * Disabled on Java 8 because of Mocks
+ */
+public class HttpMetricsCommonTest {
+
+    @Test
+    public void testStatus() {
+        Assertions.assertEquals(Tag.of("status", "200"), HttpMetricsCommon.status(200));
+        Assertions.assertEquals(Tag.of("status", "301"), HttpMetricsCommon.status(301));
+        Assertions.assertEquals(Tag.of("status", "304"), HttpMetricsCommon.status(304));
+        Assertions.assertEquals(Tag.of("status", "404"), HttpMetricsCommon.status(404));
+    }
+
+    @Test
+    public void testUriRedirect() {
+        Assertions.assertEquals(HttpMetricsCommon.URI_REDIRECTION, HttpMetricsCommon.uri("/moved", 301));
+        Assertions.assertEquals(HttpMetricsCommon.URI_REDIRECTION, HttpMetricsCommon.uri("/moved", 302));
+        Assertions.assertEquals(HttpMetricsCommon.URI_REDIRECTION, HttpMetricsCommon.uri("/moved", 304));
+    }
+
+    @Test
+    public void testUriDefaults() {
+        Assertions.assertEquals(HttpMetricsCommon.URI_ROOT, HttpMetricsCommon.uri("/", 200));
+        Assertions.assertEquals(Tag.of("uri", "/known/ok"), HttpMetricsCommon.uri("/known/ok", 200));
+        Assertions.assertEquals(HttpMetricsCommon.URI_NOT_FOUND, HttpMetricsCommon.uri("/invalid", 404));
+        Assertions.assertEquals(Tag.of("uri", "/known/bad/request"), HttpMetricsCommon.uri("/known/bad/request", 400));
+        Assertions.assertEquals(Tag.of("uri", "/known/server/error"), HttpMetricsCommon.uri("/known/server/error", 500));
+    }
+}
diff --git a/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/HttpRequestMetricTest.java b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/HttpRequestMetricTest.java
new file mode 100644
index 0000000000000..0fb7436f0e06e
--- /dev/null
+++ b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/HttpRequestMetricTest.java
@@ -0,0 +1,140 @@
+package io.quarkus.micrometer.runtime.binder;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
+import org.mockito.Mockito;
+
+import io.vertx.ext.web.Route;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Disabled on Java 8 because of Mocks
+ */
+@DisabledOnJre(JRE.JAVA_8)
+public class HttpRequestMetricTest {
+
+    final List<Pattern> NO_IGNORE_PATTERNS = Collections.emptyList();
+    final List<Pattern> ignorePatterns = Arrays.asList(Pattern.compile("/ignore.*"));
+
+    final Map<Pattern, String> NO_MATCH_PATTERNS = Collections.emptyMap();
+
+    @Test
+    public void testReturnPathFromHttpRequestPath() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS, "/");
+        requestMetric.routingContext = Mockito.mock(RoutingContext.class);
+
+        Mockito.when(requestMetric.routingContext.get(HttpRequestMetric.HTTP_REQUEST_PATH))
+                .thenReturn("/item/{id}");
+
+        Assertions.assertEquals("/item/{id}", requestMetric.getHttpRequestPath());
+    }
+
+    @Test
+    public void testReturnPathFromRoutingContext() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS, "/");
+        requestMetric.routingContext = Mockito.mock(RoutingContext.class);
+        Route currentRoute = Mockito.mock(Route.class);
+
+        Mockito.when(requestMetric.routingContext.currentRoute()).thenReturn(currentRoute);
+        Mockito.when(currentRoute.getPath()).thenReturn("/item");
+
+        Assertions.assertEquals("/item", requestMetric.getHttpRequestPath());
+    }
+
+    @Test
+    public void testReturnGenericPathFromRoutingContext() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS, "/");
+        requestMetric.routingContext = Mockito.mock(RoutingContext.class);
+        Route currentRoute = Mockito.mock(Route.class);
+
+        Mockito.when(requestMetric.routingContext.currentRoute()).thenReturn(currentRoute);
+        Mockito.when(currentRoute.getPath()).thenReturn("/item/:id");
+
+        Assertions.assertEquals("/item/{id}", requestMetric.getHttpRequestPath());
+        // Make sure conversion is cached
+        Assertions.assertEquals("/item/{id}", HttpRequestMetric.templatePath.get("/item/:id"));
+    }
+
+    @Test
+    public void testParsePathDoubleSlash() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS, "//");
+        Assertions.assertEquals("/", requestMetric.path);
+        Assertions.assertTrue(requestMetric.measure, "Path should be measured");
+        Assertions.assertFalse(requestMetric.pathMatched, "Path should not be marked as matched");
+    }
+
+    @Test
+    public void testParseEmptyPath() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS, "");
+        Assertions.assertEquals("/", requestMetric.path);
+        Assertions.assertTrue(requestMetric.measure, "Path should be measured");
+        Assertions.assertFalse(requestMetric.pathMatched, "Path should not be marked as matched");
+    }
+
+    @Test
+    public void testParsePathNoLeadingSlash() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS,
+                "path/with/no/leading/slash");
+        Assertions.assertEquals("/path/with/no/leading/slash", requestMetric.path);
+        Assertions.assertTrue(requestMetric.measure, "Path should be measured");
+        Assertions.assertFalse(requestMetric.pathMatched, "Path should not be marked as matched");
+    }
+
+    @Test
+    public void testParsePathWithQueryString() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, NO_IGNORE_PATTERNS,
+                "/path/with/query/string?stuff");
+        Assertions.assertEquals("/path/with/query/string", requestMetric.path);
+        Assertions.assertTrue(requestMetric.measure, "Path should be measured");
+        Assertions.assertFalse(requestMetric.pathMatched, "Path should not be marked as matched");
+    }
+
+    @Test
+    public void testParsePathIgnoreNoLeadingSlash() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, ignorePatterns,
+                "ignore/me/with/no/leading/slash");
+        Assertions.assertEquals("/ignore/me/with/no/leading/slash", requestMetric.path);
+        Assertions.assertFalse(requestMetric.measure, "Path should be measured");
+        Assertions.assertFalse(requestMetric.pathMatched, "Path should not be marked as matched");
+    }
+
+    @Test
+    public void testParsePathIgnoreWithQueryString() {
+        HttpRequestMetric requestMetric = new HttpRequestMetric(NO_MATCH_PATTERNS, ignorePatterns,
+                "/ignore/me/with/query/string?stuff");
+        Assertions.assertEquals("/ignore/me/with/query/string", requestMetric.path);
+        Assertions.assertFalse(requestMetric.measure, "Path should be measured");
+        Assertions.assertFalse(requestMetric.pathMatched, "Path should not be marked as matched");
+    }
+
+    @Test
+    public void testParsePathMatchReplaceNoLeadingSlash() {
+        final Map<Pattern, String> matchPatterns = new HashMap<>();
+        matchPatterns.put(Pattern.compile("/item/\\d+"), "/item/{id}");
+
+        HttpRequestMetric requestMetric = new HttpRequestMetric(matchPatterns, NO_IGNORE_PATTERNS, "item/123");
+        Assertions.assertEquals("/item/{id}", requestMetric.path);
+        Assertions.assertTrue(requestMetric.measure, "Path should be measured");
+        Assertions.assertTrue(requestMetric.pathMatched, "Path should be marked as matched");
+    }
+
+    @Test
+    public void testParsePathMatchReplaceLeadingSlash() {
+        final Map<Pattern, String> matchPatterns = new HashMap<>();
+        matchPatterns.put(Pattern.compile("/item/\\d+"), "/item/{id}");
+
+        HttpRequestMetric requestMetric = new HttpRequestMetric(matchPatterns, NO_IGNORE_PATTERNS, "/item/123");
+        Assertions.assertEquals("/item/{id}", requestMetric.path);
+        Assertions.assertTrue(requestMetric.measure, "Path should be measured");
+        Assertions.assertTrue(requestMetric.pathMatched, "Path should be marked as matched");
+    }
+}
diff --git a/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserverTest.java b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserverTest.java
new file mode 100644
index 0000000000000..0a42d9e53506b
--- /dev/null
+++ b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaEventObserverTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.micrometer.runtime.binder.kafka;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+import io.quarkus.runtime.ShutdownEvent;
+
+class KafkaEventObserverTest {
+
+    @Test
+    void testAllKafkaClientMetricsClosed() {
+        KafkaEventObserver sut = new KafkaEventObserver();
+
+        KafkaClientMetrics firstClientMetrics = Mockito.mock(KafkaClientMetrics.class);
+        KafkaClientMetrics secondClientMetrics = Mockito.mock(KafkaClientMetrics.class);
+        sut.clientMetrics.put(firstClientMetrics, firstClientMetrics);
+        sut.clientMetrics.put(secondClientMetrics, secondClientMetrics);
+
+        sut.onStop(new ShutdownEvent());
+
+        Mockito.verify(firstClientMetrics).close();
+        Mockito.verify(secondClientMetrics).close();
+    }
+
+}
diff --git a/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserverTest.java b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserverTest.java
new file mode 100644
index 0000000000000..43ff1d5722c00
--- /dev/null
+++ b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/kafka/KafkaStreamsEventObserverTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.micrometer.runtime.binder.kafka;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
+import io.quarkus.runtime.ShutdownEvent;
+
+class KafkaStreamsEventObserverTest {
+
+    @Test
+    void testKafkaStreamsMetricsClosedAfterShutdownEvent() {
+        KafkaStreamsEventObserver sut = new KafkaStreamsEventObserver();
+        sut.kafkaStreamsMetrics = Mockito.mock(KafkaStreamsMetrics.class);
+
+        sut.onStop(new ShutdownEvent());
+
+        Mockito.verify(sut.kafkaStreamsMetrics).close();
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetricsTest.java b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetricsTest.java
new file mode 100644
index 0000000000000..cf237b51df113
--- /dev/null
+++ b/extensions/micrometer/runtime/src/test/java/io/quarkus/micrometer/runtime/binder/vertx/VertxHttpServerMetricsTest.java
@@ -0,0 +1,53 @@
+package io.quarkus.micrometer.runtime.binder.vertx;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
+import io.quarkus.micrometer.runtime.config.runtime.HttpClientConfig;
+import io.quarkus.micrometer.runtime.config.runtime.HttpServerConfig;
+import io.quarkus.micrometer.runtime.config.runtime.VertxConfig;
+
+public class VertxHttpServerMetricsTest {
+
+    @Test
+    public void testHttpServerMetricsIgnorePatterns() {
+        HttpServerConfig serverConfig = new HttpServerConfig();
+        serverConfig.ignorePatterns = Optional.of(new ArrayList<>(Arrays.asList("/item/.*")));
+
+        HttpBinderConfiguration binderConfig = new HttpBinderConfiguration(
+                true, false,
+                serverConfig, new HttpClientConfig(), new VertxConfig());
+
+        VertxHttpServerMetrics metrics = new VertxHttpServerMetrics(new SimpleMeterRegistry(), binderConfig);
+        Assertions.assertFalse(metrics.ignorePatterns.isEmpty());
+        Pattern p = metrics.ignorePatterns.get(0);
+        Assertions.assertEquals("/item/.*", p.pattern());
+        Assertions.assertTrue(p.matcher("/item/123").matches());
+    }
+
+    @Test
+    public void testHttpServerMetricsMatchPatterns() {
+        HttpServerConfig serverConfig = new HttpServerConfig();
+        serverConfig.matchPatterns = Optional.of(new ArrayList<>(Arrays.asList("/item/\\d+=/item/{id}")));
+
+        HttpBinderConfiguration binderConfig = new HttpBinderConfiguration(
+                true, false,
+                serverConfig, new HttpClientConfig(), new VertxConfig());
+
+        VertxHttpServerMetrics metrics = new VertxHttpServerMetrics(new SimpleMeterRegistry(), binderConfig);
+
+        Assertions.assertFalse(metrics.matchPatterns.isEmpty());
+        Map.Entry<Pattern, String> entry = metrics.matchPatterns.entrySet().iterator().next();
+        Assertions.assertEquals("/item/\\d+", entry.getKey().pattern());
+        Assertions.assertEquals("/item/{id}", entry.getValue());
+        Assertions.assertTrue(entry.getKey().matcher("/item/123").matches());
+    }
+}
diff --git a/extensions/mongodb-client/deployment/pom.xml b/extensions/mongodb-client/deployment/pom.xml
index f45ad5fd76ea0..9750bfa790fcd 100644
--- a/extensions/mongodb-client/deployment/pom.xml
+++ b/extensions/mongodb-client/deployment/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/BsonDiscriminatorBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/BsonDiscriminatorBuildItem.java
index dee6c429ac529..386d9f43501ff 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/BsonDiscriminatorBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/BsonDiscriminatorBuildItem.java
@@ -4,6 +4,9 @@
 
 import io.quarkus.builder.item.SimpleBuildItem;
 
+/**
+ * Register additional BsonDiscriminator's for the MongoDB clients.
+ */
 public final class BsonDiscriminatorBuildItem extends SimpleBuildItem {
 
     private List<String> bsonDiscriminatorClassNames;
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CodecProviderBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CodecProviderBuildItem.java
index 20079947bdd1e..46a4be300320c 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CodecProviderBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CodecProviderBuildItem.java
@@ -2,8 +2,13 @@
 
 import java.util.List;
 
+import org.bson.codecs.configuration.CodecProvider;
+
 import io.quarkus.builder.item.SimpleBuildItem;
 
+/**
+ * Register additional {@link CodecProvider}s for the MongoDB clients.
+ */
 public final class CodecProviderBuildItem extends SimpleBuildItem {
 
     private List<String> codecProviderClassNames;
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CommandListenerBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CommandListenerBuildItem.java
new file mode 100644
index 0000000000000..5dad5b89e0757
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/CommandListenerBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.mongodb.deployment;
+
+import java.util.List;
+
+import com.mongodb.event.CommandListener;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Register additional {@link CommandListener}s for the MongoDB clients.
+ */
+public final class CommandListenerBuildItem extends SimpleBuildItem {
+
+    private List<String> commandListenerClassNames;
+
+    public CommandListenerBuildItem(List<String> commandListenerClassNames) {
+        this.commandListenerClassNames = commandListenerClassNames;
+    }
+
+    public List<String> getCommandListenerClassNames() {
+        return commandListenerClassNames;
+    }
+}
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildItem.java
index 353eab886d24c..9cb7d0fd62a89 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildItem.java
@@ -6,6 +6,9 @@
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.runtime.RuntimeValue;
 
+/**
+ * Provide the MongoDB clients as RuntimeValue's.
+ */
 public final class MongoClientBuildItem extends MultiBuildItem {
     private final RuntimeValue<MongoClient> client;
     private final RuntimeValue<ReactiveMongoClient> reactive;
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildTimeConfig.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildTimeConfig.java
index e99aaaa59e030..166893f250f81 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildTimeConfig.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientBuildTimeConfig.java
@@ -13,8 +13,14 @@ public class MongoClientBuildTimeConfig {
     public boolean healthEnabled;
 
     /**
-     * Whether or not metrics are published in case the smallrye-metrics extension is present.
+     * Whether or not metrics are published in case a metrics extension is present.
      */
     @ConfigItem(name = "metrics.enabled")
     public boolean metricsEnabled;
+
+    /**
+     * If set to true, the default clients will always be created even if there are no injection points that use them
+     */
+    @ConfigItem(name = "force-default-clients")
+    public boolean forceDefaultClients;
 }
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientNameBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientNameBuildItem.java
index 06537b0259221..f6165bbf0e570 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientNameBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientNameBuildItem.java
@@ -1,20 +1,30 @@
 package io.quarkus.mongodb.deployment;
 
 import io.quarkus.builder.item.MultiBuildItem;
-import io.quarkus.mongodb.runtime.MongoClientName;
+import io.quarkus.mongodb.MongoClientName;
 
 /**
- * Represents the values of the {@link MongoClientName}
+ * Represents the values of the {@link MongoClientName}.
  */
-final class MongoClientNameBuildItem extends MultiBuildItem {
+public final class MongoClientNameBuildItem extends MultiBuildItem {
 
     private final String name;
+    private final boolean addQualifier;
 
     public MongoClientNameBuildItem(String name) {
+        this(name, true);
+    }
+
+    public MongoClientNameBuildItem(String name, boolean addQualifier) {
         this.name = name;
+        this.addQualifier = addQualifier;
     }
 
     public String getName() {
         return name;
     }
+
+    public boolean isAddQualifier() {
+        return addQualifier;
+    }
 }
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java
index 34688eee7c2d9..4d9bd542e92c6 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java
@@ -9,12 +9,15 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 import javax.inject.Singleton;
 
 import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.pojo.PropertyCodecProvider;
 import org.bson.codecs.pojo.annotations.BsonDiscriminator;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
@@ -22,44 +25,46 @@
 import org.jboss.jandex.IndexView;
 
 import com.mongodb.client.MongoClient;
+import com.mongodb.event.CommandListener;
 import com.mongodb.event.ConnectionPoolListener;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.DotNames;
-import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.Capability;
+import io.quarkus.arc.processor.InjectionPointInfo;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.annotations.Weak;
-import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.mongodb.metrics.MongoMetricsConnectionPoolListener;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.mongodb.MongoClientName;
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.mongodb.runtime.MongoClientBeanUtil;
-import io.quarkus.mongodb.runtime.MongoClientName;
 import io.quarkus.mongodb.runtime.MongoClientRecorder;
 import io.quarkus.mongodb.runtime.MongoClientSupport;
 import io.quarkus.mongodb.runtime.MongoClients;
 import io.quarkus.mongodb.runtime.MongodbConfig;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
 
 public class MongoClientProcessor {
-    private static final DotName MONGOCLIENT_ANNOTATION = DotName.createSimple(MongoClientName.class.getName());
+    private static final DotName LEGACY_MONGO_CLIENT_ANNOTATION = DotName
+            .createSimple(io.quarkus.mongodb.runtime.MongoClientName.class.getName());
+    private static final DotName MONGO_CLIENT_ANNOTATION = DotName.createSimple(MongoClientName.class.getName());
 
-    @BuildStep
-    BeanDefiningAnnotationBuildItem registerConnectionBean() {
-        return new BeanDefiningAnnotationBuildItem(MONGOCLIENT_ANNOTATION);
-    }
+    private static final DotName MONGO_CLIENT = DotName.createSimple(MongoClient.class.getName());
+    private static final DotName REACTIVE_MONGO_CLIENT = DotName.createSimple(ReactiveMongoClient.class.getName());
 
     @BuildStep
     CodecProviderBuildItem collectCodecProviders(CombinedIndexBuildItem indexBuildItem) {
@@ -69,6 +74,14 @@ CodecProviderBuildItem collectCodecProviders(CombinedIndexBuildItem indexBuildIt
         return new CodecProviderBuildItem(names);
     }
 
+    @BuildStep
+    PropertyCodecProviderBuildItem collectPropertyCodecProviders(CombinedIndexBuildItem indexBuildItem) {
+        Collection<ClassInfo> propertyCodecProviderClasses = indexBuildItem.getIndex()
+                .getAllKnownImplementors(DotName.createSimple(PropertyCodecProvider.class.getName()));
+        List<String> names = propertyCodecProviderClasses.stream().map(ci -> ci.name().toString()).collect(Collectors.toList());
+        return new PropertyCodecProviderBuildItem(names);
+    }
+
     @BuildStep
     BsonDiscriminatorBuildItem collectBsonDiscriminators(CombinedIndexBuildItem indexBuildItem) {
         List<String> names = new ArrayList<>();
@@ -80,11 +93,22 @@ BsonDiscriminatorBuildItem collectBsonDiscriminators(CombinedIndexBuildItem inde
     }
 
     @BuildStep
-    List<ReflectiveClassBuildItem> addCodecsAndDiscriminatorsToNative(CodecProviderBuildItem codecProviders,
-            BsonDiscriminatorBuildItem bsonDiscriminators) {
+    CommandListenerBuildItem collectCommandListeners(CombinedIndexBuildItem indexBuildItem) {
+        Collection<ClassInfo> commandListenerClasses = indexBuildItem.getIndex()
+                .getAllKnownImplementors(DotName.createSimple(CommandListener.class.getName()));
+        List<String> names = commandListenerClasses.stream().map(ci -> ci.name().toString()).collect(Collectors.toList());
+        return new CommandListenerBuildItem(names);
+    }
+
+    @BuildStep
+    List<ReflectiveClassBuildItem> addExtensionPointsToNative(CodecProviderBuildItem codecProviders,
+            PropertyCodecProviderBuildItem propertyCodecProviders, BsonDiscriminatorBuildItem bsonDiscriminators,
+            CommandListenerBuildItem commandListeners) {
         List<String> reflectiveClassNames = new ArrayList<>();
         reflectiveClassNames.addAll(codecProviders.getCodecProviderClassNames());
+        reflectiveClassNames.addAll(propertyCodecProviders.getPropertyCodecProviderClassNames());
         reflectiveClassNames.addAll(bsonDiscriminators.getBsonDiscriminatorClassNames());
+        reflectiveClassNames.addAll(commandListeners.getCommandListenerClassNames());
 
         return reflectiveClassNames.stream()
                 .map(s -> new ReflectiveClassBuildItem(true, true, false, s))
@@ -92,19 +116,24 @@ List<ReflectiveClassBuildItem> addCodecsAndDiscriminatorsToNative(CodecProviderB
     }
 
     @BuildStep
-    public void mongoClientNames(ApplicationArchivesBuildItem applicationArchivesBuildItem,
+    public void mongoClientNames(BeanArchiveIndexBuildItem indexBuildItem,
             BuildProducer<MongoClientNameBuildItem> mongoClientName) {
         Set<String> values = new HashSet<>();
-        IndexView indexView = applicationArchivesBuildItem.getRootArchive().getIndex();
-        Collection<AnnotationInstance> mongoClientAnnotations = indexView.getAnnotations(MONGOCLIENT_ANNOTATION);
-        for (AnnotationInstance annotation : mongoClientAnnotations) {
-            values.add(annotation.value().asString());
-        }
+        IndexView indexView = indexBuildItem.getIndex();
+        addMongoClientNameValues(LEGACY_MONGO_CLIENT_ANNOTATION, indexView, values);
+        addMongoClientNameValues(MONGO_CLIENT_ANNOTATION, indexView, values);
         for (String value : values) {
             mongoClientName.produce(new MongoClientNameBuildItem(value));
         }
     }
 
+    private void addMongoClientNameValues(DotName annotationName, IndexView indexView, Set<String> values) {
+        Collection<AnnotationInstance> mongoClientAnnotations = indexView.getAnnotations(annotationName);
+        for (AnnotationInstance annotation : mongoClientAnnotations) {
+            values.add(annotation.value().asString());
+        }
+    }
+
     @BuildStep
     FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.MONGODB_CLIENT);
@@ -115,6 +144,35 @@ ExtensionSslNativeSupportBuildItem ssl() {
         return new ExtensionSslNativeSupportBuildItem(Feature.MONGODB_CLIENT);
     }
 
+    @BuildStep
+    @Record(STATIC_INIT)
+    MongoConnectionPoolListenerBuildItem setupMetrics(
+            MongoClientBuildTimeConfig buildTimeConfig,
+            MongoClientRecorder recorder,
+            Optional<MetricsCapabilityBuildItem> metricsCapability) {
+
+        // Construction of MongoClient isn't compatible with the MetricsFactoryConsumer pattern.
+        // Use a supplier to defer construction of the pool listener for the supported metrics system
+        if (buildTimeConfig.metricsEnabled && metricsCapability.isPresent()) {
+            if (metricsCapability.get().metricsSupported(MetricsFactory.MICROMETER)) {
+                return new MongoConnectionPoolListenerBuildItem(recorder.createMicrometerConnectionPoolListener());
+            } else {
+                return new MongoConnectionPoolListenerBuildItem(recorder.createMPMetricsConnectionPoolListener());
+            }
+        }
+        return null;
+    }
+
+    @BuildStep
+    void additionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        // add the @MongoClientName class otherwise it won't registered as a qualifier
+        additionalBeans.produce(
+                AdditionalBeanBuildItem.builder().addBeanClass(io.quarkus.mongodb.runtime.MongoClientName.class).build());
+        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(MongoClientName.class).build());
+        // make MongoClients an unremoveable bean
+        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClasses(MongoClients.class).setUnremovable().build());
+    }
+
     @Record(STATIC_INIT)
     @BuildStep
     void build(
@@ -122,24 +180,24 @@ void build(
             MongoClientRecorder recorder,
             SslNativeConfigBuildItem sslNativeConfig,
             CodecProviderBuildItem codecProvider,
+            PropertyCodecProviderBuildItem propertyCodecProvider,
             BsonDiscriminatorBuildItem bsonDiscriminator,
+            CommandListenerBuildItem commandListener,
             List<MongoConnectionPoolListenerBuildItem> connectionPoolListenerProvider,
             BuildProducer<MongoConnectionNameBuildItem> mongoConnections,
-            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer,
-            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
-
-        List<ConnectionPoolListener> poolListenerList = connectionPoolListenerProvider.stream()
-                .map(MongoConnectionPoolListenerBuildItem::getConnectionPoolListener)
-                .collect(Collectors.toList());
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer) {
 
-        // make MongoClients an unremoveable bean
-        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClasses(MongoClients.class).setUnremovable().build());
+        List<Supplier<ConnectionPoolListener>> poolListenerList = new ArrayList<>(connectionPoolListenerProvider.size());
+        for (MongoConnectionPoolListenerBuildItem item : connectionPoolListenerProvider) {
+            poolListenerList.add(item.getConnectionPoolListener());
+        }
 
         // create MongoClientSupport as a synthetic bean as it's used in AbstractMongoClientProducer
         syntheticBeanBuildItemBuildProducer.produce(SyntheticBeanBuildItem.configure(MongoClientSupport.class)
                 .scope(Singleton.class)
                 .supplier(recorder.mongoClientSupportSupplier(codecProvider.getCodecProviderClassNames(),
-                        bsonDiscriminator.getBsonDiscriminatorClassNames(),
+                        propertyCodecProvider.getPropertyCodecProviderClassNames(),
+                        bsonDiscriminator.getBsonDiscriminatorClassNames(), commandListener.getCommandListenerClassNames(),
                         poolListenerList, sslNativeConfig.isExplicitlyDisabled()))
                 .done());
 
@@ -152,60 +210,90 @@ void build(
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
     void generateClientBeans(MongoClientRecorder recorder,
+            BeanRegistrationPhaseBuildItem registrationPhase,
             List<MongoClientNameBuildItem> mongoClientNames,
+            MongoClientBuildTimeConfig mongoClientBuildTimeConfig,
             MongodbConfig mongodbConfig,
-            Optional<MongoUnremovableClientsBuildItem> mongoUnremovableClientsBuildItem,
+            List<MongoUnremovableClientsBuildItem> mongoUnremovableClientsBuildItem,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeanBuildItemBuildProducer) {
 
-        boolean makeUnremovable = mongoUnremovableClientsBuildItem.isPresent();
+        boolean makeUnremovable = !mongoUnremovableClientsBuildItem.isEmpty();
+
+        boolean createDefaultBlockingMongoClient = false;
+        boolean createDefaultReactiveMongoClient = false;
+        if (makeUnremovable || mongoClientBuildTimeConfig.forceDefaultClients) {
+            // all clients are expected to exist in this case
+            createDefaultBlockingMongoClient = true;
+            createDefaultReactiveMongoClient = true;
+        } else {
+            // we only create the default client if they are actually used by injection points
+            for (InjectionPointInfo injectionPoint : registrationPhase.getContext().get(BuildExtension.Key.INJECTION_POINTS)) {
+                DotName injectionPointType = injectionPoint.getRequiredType().name();
+                if (injectionPointType.equals(MONGO_CLIENT) && injectionPoint.hasDefaultedQualifier()) {
+                    createDefaultBlockingMongoClient = true;
+                } else if (injectionPointType.equals(REACTIVE_MONGO_CLIENT) && injectionPoint.hasDefaultedQualifier()) {
+                    createDefaultReactiveMongoClient = true;
+                }
+
+                if (createDefaultBlockingMongoClient && createDefaultReactiveMongoClient) {
+                    break;
+                }
+            }
+        }
 
-        // default blocking client
-        syntheticBeanBuildItemBuildProducer.produce(createBlockingSyntheticBean(recorder, mongodbConfig, makeUnremovable,
-                MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME));
-        // default reactive client
-        syntheticBeanBuildItemBuildProducer.produce(createReactiveSyntheticBean(recorder, mongodbConfig, makeUnremovable,
-                MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME));
+        if (createDefaultBlockingMongoClient) {
+            syntheticBeanBuildItemBuildProducer.produce(createBlockingSyntheticBean(recorder, mongodbConfig,
+                    makeUnremovable || mongoClientBuildTimeConfig.forceDefaultClients,
+                    MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME, false));
+        }
+        if (createDefaultReactiveMongoClient) {
+            syntheticBeanBuildItemBuildProducer.produce(createReactiveSyntheticBean(recorder, mongodbConfig,
+                    makeUnremovable || mongoClientBuildTimeConfig.forceDefaultClients,
+                    MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME, false));
+        }
 
         for (MongoClientNameBuildItem mongoClientName : mongoClientNames) {
             // named blocking client
             syntheticBeanBuildItemBuildProducer
-                    .produce(createBlockingSyntheticBean(recorder, mongodbConfig, makeUnremovable, mongoClientName.getName()));
+                    .produce(createBlockingSyntheticBean(recorder, mongodbConfig, makeUnremovable, mongoClientName.getName(),
+                            mongoClientName.isAddQualifier()));
             // named reactive client
             syntheticBeanBuildItemBuildProducer
-                    .produce(createReactiveSyntheticBean(recorder, mongodbConfig, makeUnremovable, mongoClientName.getName()));
+                    .produce(createReactiveSyntheticBean(recorder, mongodbConfig, makeUnremovable, mongoClientName.getName(),
+                            mongoClientName.isAddQualifier()));
         }
     }
 
     private SyntheticBeanBuildItem createBlockingSyntheticBean(MongoClientRecorder recorder, MongodbConfig mongodbConfig,
-            boolean makeUnremovable, String clientName) {
+            boolean makeUnremovable, String clientName, boolean addMongoClientQualifier) {
 
         SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
                 .configure(MongoClient.class)
-                .scope(Singleton.class)
+                .scope(ApplicationScoped.class)
                 // pass the runtime config into the recorder to ensure that the DataSource related beans
                 // are created after runtime configuration has been setup
                 .supplier(recorder.mongoClientSupplier(clientName, mongodbConfig))
                 .setRuntimeInit();
 
-        return applyCommonBeanConfig(makeUnremovable, clientName, configurator);
+        return applyCommonBeanConfig(makeUnremovable, clientName, addMongoClientQualifier, configurator, false);
     }
 
     private SyntheticBeanBuildItem createReactiveSyntheticBean(MongoClientRecorder recorder, MongodbConfig mongodbConfig,
-            boolean makeUnremovable, String clientName) {
+            boolean makeUnremovable, String clientName, boolean addMongoClientQualifier) {
 
         SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
                 .configure(ReactiveMongoClient.class)
-                .scope(Singleton.class)
+                .scope(ApplicationScoped.class)
                 // pass the runtime config into the recorder to ensure that the DataSource related beans
                 // are created after runtime configuration has been setup
                 .supplier(recorder.reactiveMongoClientSupplier(clientName, mongodbConfig))
                 .setRuntimeInit();
 
-        return applyCommonBeanConfig(makeUnremovable, clientName, configurator);
+        return applyCommonBeanConfig(makeUnremovable, clientName, addMongoClientQualifier, configurator, true);
     }
 
     private SyntheticBeanBuildItem applyCommonBeanConfig(boolean makeUnremovable, String clientName,
-            SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator) {
+            boolean addMongoClientQualifier, SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator, boolean isReactive) {
         if (makeUnremovable) {
             configurator.unremovable();
         }
@@ -213,9 +301,12 @@ private SyntheticBeanBuildItem applyCommonBeanConfig(boolean makeUnremovable, St
         if (MongoClientBeanUtil.isDefault(clientName)) {
             configurator.addQualifier(Default.class);
         } else {
-            String namedQualifier = MongoClientBeanUtil.namedQualifier(clientName, false);
+            String namedQualifier = MongoClientBeanUtil.namedQualifier(clientName, isReactive);
             configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", namedQualifier).done();
-            configurator.addQualifier().annotation(MONGOCLIENT_ANNOTATION).addValue("value", clientName).done();
+            if (addMongoClientQualifier) {
+                configurator.addQualifier().annotation(MONGO_CLIENT_ANNOTATION).addValue("value", clientName).done();
+                configurator.addQualifier().annotation(LEGACY_MONGO_CLIENT_ANNOTATION).addValue("value", clientName).done();
+            }
         }
         return configurator.done();
     }
@@ -255,14 +346,4 @@ HealthBuildItem addHealthCheck(MongoClientBuildTimeConfig buildTimeConfig) {
         return new HealthBuildItem("io.quarkus.mongodb.health.MongoHealthCheck",
                 buildTimeConfig.healthEnabled);
     }
-
-    @BuildStep
-    void setupMetrics(
-            MongoClientBuildTimeConfig buildTimeConfig, Capabilities capabilities,
-            BuildProducer<MongoConnectionPoolListenerBuildItem> producer) {
-
-        if (buildTimeConfig.metricsEnabled && capabilities.isPresent(Capability.METRICS)) {
-            producer.produce(new MongoConnectionPoolListenerBuildItem(new MongoMetricsConnectionPoolListener()));
-        }
-    }
 }
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionNameBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionNameBuildItem.java
index 7cd1a3e9c7572..d144b88c65a52 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionNameBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionNameBuildItem.java
@@ -3,7 +3,7 @@
 import io.quarkus.builder.item.MultiBuildItem;
 
 /**
- * Holds a Mongo connection name
+ * Holds a MongoDB connection name.
  */
 final class MongoConnectionNameBuildItem extends MultiBuildItem {
 
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionPoolListenerBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionPoolListenerBuildItem.java
index f1d2322fbdb52..1f021cc242313 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionPoolListenerBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoConnectionPoolListenerBuildItem.java
@@ -1,17 +1,23 @@
 package io.quarkus.mongodb.deployment;
 
+import java.util.function.Supplier;
+
 import com.mongodb.event.ConnectionPoolListener;
 
 import io.quarkus.builder.item.MultiBuildItem;
 
+/**
+ * Register additional {@link ConnectionPoolListener}s.
+ */
 public final class MongoConnectionPoolListenerBuildItem extends MultiBuildItem {
-    private ConnectionPoolListener connectionPoolListener;
 
-    public MongoConnectionPoolListenerBuildItem(ConnectionPoolListener connectionPoolListener) {
+    private Supplier<ConnectionPoolListener> connectionPoolListener;
+
+    public MongoConnectionPoolListenerBuildItem(Supplier<ConnectionPoolListener> connectionPoolListener) {
         this.connectionPoolListener = connectionPoolListener;
     }
 
-    public ConnectionPoolListener getConnectionPoolListener() {
+    public Supplier<ConnectionPoolListener> getConnectionPoolListener() {
         return connectionPoolListener;
     }
 }
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoUnremovableClientsBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoUnremovableClientsBuildItem.java
index 063f3a0a4ec1b..287e9855e4d8b 100644
--- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoUnremovableClientsBuildItem.java
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoUnremovableClientsBuildItem.java
@@ -1,10 +1,10 @@
 package io.quarkus.mongodb.deployment;
 
-import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.builder.item.MultiBuildItem;
 
 /**
  * If generated, all the Mongo clients need to be unremovable
  */
-final class MongoUnremovableClientsBuildItem extends SimpleBuildItem {
+public final class MongoUnremovableClientsBuildItem extends MultiBuildItem {
 
 }
diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/PropertyCodecProviderBuildItem.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/PropertyCodecProviderBuildItem.java
new file mode 100644
index 0000000000000..0941f1e9e751e
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/PropertyCodecProviderBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.mongodb.deployment;
+
+import java.util.List;
+
+import org.bson.codecs.pojo.PropertyCodecProvider;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Register additional {@link PropertyCodecProvider}s for the MongoDB clients.
+ */
+public final class PropertyCodecProviderBuildItem extends SimpleBuildItem {
+
+    private List<String> propertyCodecProviderClassNames;
+
+    public PropertyCodecProviderBuildItem(List<String> codecProviderClassNames) {
+        this.propertyCodecProviderClassNames = codecProviderClassNames;
+    }
+
+    public List<String> getPropertyCodecProviderClassNames() {
+        return propertyCodecProviderClassNames;
+    }
+}
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java
new file mode 100644
index 0000000000000..80c5c879d9d1e
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/DefaultAndNamedMongoClientConfigTest.java
@@ -0,0 +1,70 @@
+package io.quarkus.mongodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.literal.NamedLiteral;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.internal.MongoClientImpl;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.runtime.ClientProxyUnwrapper;
+import io.quarkus.mongodb.runtime.MongoClientName;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DefaultAndNamedMongoClientConfigTest extends MongoWithReplicasTestBase {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class))
+            .withConfigurationResource("application-default-and-named-mongoclient.properties");
+
+    @Inject
+    MongoClient client;
+
+    @Inject
+    @MongoClientName("cluster2")
+    MongoClient client2;
+
+    private final ClientProxyUnwrapper unwrapper = new ClientProxyUnwrapper();
+
+    @AfterEach
+    void cleanup() {
+        if (client != null) {
+            client.close();
+        }
+        if (client2 != null) {
+            client2.close();
+        }
+    }
+
+    @Test
+    public void testNamedDataSourceInjection() {
+        assertProperConnection(client, 27018);
+        assertProperConnection(client2, 27019);
+
+        assertThat(client.listDatabases().first()).isNotEmpty();
+        assertThat(client2.listDatabases().first()).isNotEmpty();
+
+        assertThat(Arc.container().instance(MongoClient.class).get()).isNotNull();
+        assertThat(Arc.container().instance(MongoClient.class, Default.Literal.INSTANCE).get()).isNotNull();
+        assertThat(Arc.container().instance(MongoClient.class, NamedLiteral.of("cluster2")).get()).isNotNull();
+        assertThat(Arc.container().instance(MongoClient.class, NamedLiteral.of("cluster3")).get()).isNull();
+    }
+
+    private void assertProperConnection(MongoClient client, int expectedPort) {
+        assertThat(unwrapper.apply(client)).isInstanceOfSatisfying(MongoClientImpl.class, c -> {
+            assertThat(c.getCluster().getSettings().getHosts()).singleElement().satisfies(sa -> {
+                assertThat(sa.getPort()).isEqualTo(expectedPort);
+            });
+        });
+    }
+}
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/LegacyNamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/LegacyNamedMongoClientConfigTest.java
new file mode 100644
index 0000000000000..04400ecd33066
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/LegacyNamedMongoClientConfigTest.java
@@ -0,0 +1,71 @@
+package io.quarkus.mongodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.mongodb.client.MongoClient;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.mongodb.runtime.MongoClientName;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LegacyNamedMongoClientConfigTest extends MongoWithReplicasTestBase {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class))
+            .withConfigurationResource("application-named-mongoclient.properties");
+
+    @Inject
+    @MongoClientName("cluster1")
+    MongoClient client;
+
+    @Inject
+    @MongoClientName("cluster2")
+    MongoClient client2;
+
+    @AfterEach
+    void cleanup() {
+        if (client != null) {
+            client.close();
+        }
+        if (client2 != null) {
+            client2.close();
+        }
+    }
+
+    @Test
+    public void testNamedDataSourceInjection() {
+        assertThat(client.listDatabases().first()).isNotEmpty();
+        assertThat(client2.listDatabases().first()).isNotEmpty();
+
+        assertNoDefaultClient();
+    }
+
+    private void assertNoDefaultClient() {
+        boolean hasDefault = false;
+        for (InstanceHandle<MongoClient> handle : Arc.container().select(MongoClient.class).handles()) {
+            InjectableBean<MongoClient> bean = handle.getBean();
+            for (Annotation qualifier : bean.getQualifiers()) {
+                if (qualifier.annotationType().equals(Default.class)) {
+                    hasDefault = true;
+                }
+            }
+        }
+        Assertions.assertFalse(hasDefault,
+                "The default mongo client should not have been present as it is not used in any injection point");
+    }
+}
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/LegacyNamedReactiveMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/LegacyNamedReactiveMongoClientConfigTest.java
new file mode 100644
index 0000000000000..a62306f5d18d6
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/LegacyNamedReactiveMongoClientConfigTest.java
@@ -0,0 +1,102 @@
+package io.quarkus.mongodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.internal.MongoClientImpl;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.runtime.ClientProxyUnwrapper;
+import io.quarkus.mongodb.impl.ReactiveMongoClientImpl;
+import io.quarkus.mongodb.reactive.ReactiveMongoClient;
+import io.quarkus.mongodb.runtime.MongoClientName;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LegacyNamedReactiveMongoClientConfigTest extends MongoWithReplicasTestBase {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class))
+            .withConfigurationResource("application-named-mongoclient.properties");
+
+    @Inject
+    @MongoClientName("cluster1")
+    ReactiveMongoClient client;
+
+    @Inject
+    @MongoClientName("cluster2")
+    ReactiveMongoClient client2;
+
+    private final ClientProxyUnwrapper unwrapper = new ClientProxyUnwrapper();
+
+    @AfterEach
+    void cleanup() {
+        if (client != null) {
+            client.close();
+        }
+        if (client2 != null) {
+            client2.close();
+        }
+    }
+
+    @Test
+    public void testNamedDataSourceInjection() {
+        assertProperConnection(client, 27018);
+        assertProperConnection(client2, 27019);
+
+        assertThat(client.listDatabases().collectItems().first().await().indefinitely()).isNotEmpty();
+        assertThat(client2.listDatabases().collectItems().first().await().indefinitely()).isNotEmpty();
+
+        assertNoDefaultClient();
+    }
+
+    private void assertProperConnection(ReactiveMongoClient client, int expectedPort) {
+        assertThat(unwrapper.apply(client)).isInstanceOfSatisfying(ReactiveMongoClientImpl.class, rc -> {
+            Field mongoClientField;
+            try {
+                mongoClientField = ReactiveMongoClientImpl.class.getDeclaredField("client");
+            } catch (NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            }
+            mongoClientField.setAccessible(true);
+            MongoClient c;
+            try {
+                c = (MongoClientImpl) mongoClientField.get(rc);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+            assertThat(c.getClusterDescription().getClusterSettings().getHosts()).singleElement().satisfies(sa -> {
+                assertThat(sa.getPort()).isEqualTo(expectedPort);
+            });
+        });
+    }
+
+    private void assertNoDefaultClient() {
+        boolean hasDefault = false;
+        for (InstanceHandle<ReactiveMongoClient> handle : Arc.container().select(ReactiveMongoClient.class).handles()) {
+            InjectableBean<ReactiveMongoClient> bean = handle.getBean();
+            for (Annotation qualifier : bean.getQualifiers()) {
+                if (qualifier.annotationType().equals(Default.class)) {
+                    hasDefault = true;
+                }
+            }
+        }
+        Assertions.assertFalse(hasDefault,
+                "The default reactive mongo client should not have been present as it is not used in any injection point");
+    }
+}
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MockCommandListener.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MockCommandListener.java
new file mode 100644
index 0000000000000..5557bfd515a81
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MockCommandListener.java
@@ -0,0 +1,18 @@
+package io.quarkus.mongodb;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.CommandStartedEvent;
+
+public class MockCommandListener implements CommandListener {
+
+    public static final List<String> EVENTS = new ArrayList<>();
+
+    @Override
+    public void commandStarted(CommandStartedEvent startedEvent) {
+        EVENTS.add(startedEvent.getCommandName());
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java
new file mode 100644
index 0000000000000..cd0edff5a0a3f
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.mongodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasSize;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.mongodb.client.MongoClient;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MongoCommandListenerTest extends MongoTestBase {
+
+    @Inject
+    MongoClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(
+                    () -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class, MockCommandListener.class))
+            .withConfigurationResource("default-mongoclient.properties");
+
+    @AfterEach
+    void cleanup() {
+        if (client != null) {
+            client.close();
+        }
+    }
+
+    @Test
+    void testClientInitialization() {
+        assertThat(client.listDatabaseNames().first()).isNotEmpty();
+        assertThat(MockCommandListener.EVENTS, hasSize(1));
+        assertThat(MockCommandListener.EVENTS, hasItems(equalTo("listDatabases")));
+    }
+
+}
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java
index 6f53775fb871c..9a1d832199012 100644
--- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoMetricsTest.java
@@ -77,7 +77,7 @@ private Long getGaugeValueOrNull(String metricName, Tag[] tags) {
 
     private Tag[] getTags() {
         return new Tag[] {
-                new Tag("host", "localhost"),
+                new Tag("host", "127.0.0.1"),
                 new Tag("port", "27018"),
         };
     }
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java
new file mode 100644
index 0000000000000..fabf5e9317fa1
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoNamedClientClientBuildItemConsumerTest.java
@@ -0,0 +1,65 @@
+package io.quarkus.mongodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.literal.NamedLiteral;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.mongodb.client.MongoClient;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.mongodb.deployment.MongoClientBuildItem;
+import io.quarkus.mongodb.deployment.MongoClientNameBuildItem;
+import io.quarkus.mongodb.reactive.ReactiveMongoClient;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MongoNamedClientClientBuildItemConsumerTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(MongoTestBase.class))
+            .withConfigurationResource("named-mongoclient.properties")
+            .addBuildChainCustomizer(buildCustomizer());
+
+    @Test
+    public void testContainerHasBeans() {
+        assertThat(Arc.container().instance(MongoClient.class, Default.Literal.INSTANCE).get()).isNotNull();
+        assertThat(Arc.container().instance(MongoClient.class, NamedLiteral.of("second")).get()).isNotNull();
+        assertThat(Arc.container().instance(ReactiveMongoClient.class, Default.Literal.INSTANCE).get()).isNotNull();
+        assertThat(Arc.container().instance(ReactiveMongoClient.class, NamedLiteral.of("secondreactive")).get()).isNotNull();
+    }
+
+    protected static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+            // This represents the extension.
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(context -> {
+                    ApplicationArchivesBuildItem archive = context.consume(ApplicationArchivesBuildItem.class);
+                    context.produce(Collections.singletonList(new MongoClientNameBuildItem("second")));
+                }).consumes(ApplicationArchivesBuildItem.class)
+                        .produces(MongoClientNameBuildItem.class)
+                        .build();
+
+                builder.addBuildStep(context -> {
+                    List<MongoClientBuildItem> mongoClientBuildItems = context.consumeMulti(MongoClientBuildItem.class);
+                    context.produce(new FeatureBuildItem("dummy"));
+                }).consumes(MongoClientBuildItem.class)
+                        .produces(FeatureBuildItem.class)
+                        .build();
+            }
+        };
+    }
+}
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java
index 3ace12eb5a62a..b270158102873 100644
--- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoTestBase.java
@@ -6,13 +6,16 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.runtime.Network;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 
 public class MongoTestBase {
 
@@ -37,6 +40,13 @@ protected static String getProperty(String name) {
 
     @BeforeAll
     public static void startMongoDatabase() throws IOException {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
         String uri = getConfiguredConnectionString();
         // This switch allow testing against a running mongo database.
         if (uri == null) {
@@ -45,7 +55,7 @@ public static void startMongoDatabase() throws IOException {
             LOGGER.infof("Starting Mongo %s on port %s", version, port);
             IMongodConfig config = new MongodConfigBuilder()
                     .version(version)
-                    .net(new Net(port, Network.localhostIsIPv6()))
+                    .net(new Net("127.0.0.1", port, false))
                     .build();
             MONGO = getMongodExecutable(config);
             try {
@@ -80,7 +90,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java
index 6ff4bb1a45f2d..35fa25ba9941b 100644
--- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoWithReplicasTestBase.java
@@ -20,14 +20,17 @@
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongoCmdOptionsBuilder;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.runtime.Network;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 
 public class MongoWithReplicasTestBase {
 
@@ -42,7 +45,7 @@ public static void startMongoDatabase() throws IOException {
             List<IMongodConfig> configs = new ArrayList<>();
             for (int i = 0; i < 2; i++) {
                 int port = 27018 + i;
-                configs.add(buildMongodConfiguration("localhost", port, true));
+                configs.add(buildMongodConfiguration("127.0.0.1", port, true));
             }
             configs.forEach(config -> {
                 MongodExecutable exec = getMongodExecutable(config);
@@ -85,7 +88,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll
@@ -109,15 +116,15 @@ private static void initializeReplicaSet(final List<IMongodConfig> mongodConfigL
             final MongoDatabase mongoAdminDB = mongo.getDatabase("admin");
 
             Document cr = mongoAdminDB.runCommand(new Document("isMaster", 1));
-            LOGGER.infof("isMaster: %s", cr);
+            LOGGER.debugf("isMaster: %s", cr);
 
             // Build replica set configuration settings
             final Document rsConfiguration = buildReplicaSetConfiguration(mongodConfigList);
-            LOGGER.infof("replSetSettings: %s", rsConfiguration);
+            LOGGER.debugf("replSetSettings: %s", rsConfiguration);
 
             // Initialize replica set
             cr = mongoAdminDB.runCommand(new Document("replSetInitiate", rsConfiguration));
-            LOGGER.infof("replSetInitiate: %s", cr);
+            LOGGER.debugf("replSetInitiate: %s", cr);
 
             // Check replica set status before to proceed
             await()
@@ -167,9 +174,16 @@ private static boolean isReplicaSetStarted(final Document setting) {
 
     private static IMongodConfig buildMongodConfiguration(String url, int port, final boolean configureReplicaSet)
             throws IOException {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
         final MongodConfigBuilder builder = new MongodConfigBuilder()
                 .version(Version.Main.V4_0)
-                .net(new Net(url, port, Network.localhostIsIPv6()));
+                .net(new Net(url, port, false));
         if (configureReplicaSet) {
             builder.withLaunchArgument("--replSet", "test001");
             builder.cmdOptions(new MongoCmdOptionsBuilder()
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java
index 2cf2b17d5e86f..1700b5d8304d5 100644
--- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedMongoClientConfigTest.java
@@ -2,17 +2,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import com.mongodb.client.MongoClient;
 
-import io.quarkus.mongodb.runtime.MongoClientName;
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InstanceHandle;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class NamedMongoClientConfigTest extends MongoWithReplicasTestBase {
@@ -44,5 +50,21 @@ void cleanup() {
     public void testNamedDataSourceInjection() {
         assertThat(client.listDatabases().first()).isNotEmpty();
         assertThat(client2.listDatabases().first()).isNotEmpty();
+
+        assertNoDefaultClient();
+    }
+
+    private void assertNoDefaultClient() {
+        boolean hasDefault = false;
+        for (InstanceHandle<MongoClient> handle : Arc.container().select(MongoClient.class).handles()) {
+            InjectableBean<MongoClient> bean = handle.getBean();
+            for (Annotation qualifier : bean.getQualifiers()) {
+                if (qualifier.annotationType().equals(Default.class)) {
+                    hasDefault = true;
+                }
+            }
+        }
+        Assertions.assertFalse(hasDefault,
+                "The default mongo client should not have been present as it is not used in any injection point");
     }
 }
diff --git a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java
index e3d0a1fbaf86f..e450f7b015697 100644
--- a/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java
+++ b/extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NamedReactiveMongoClientConfigTest.java
@@ -2,16 +2,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+
+import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.internal.MongoClientImpl;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.runtime.ClientProxyUnwrapper;
+import io.quarkus.mongodb.impl.ReactiveMongoClientImpl;
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
-import io.quarkus.mongodb.runtime.MongoClientName;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class NamedReactiveMongoClientConfigTest extends MongoWithReplicasTestBase {
@@ -29,6 +41,8 @@ public class NamedReactiveMongoClientConfigTest extends MongoWithReplicasTestBas
     @MongoClientName("cluster2")
     ReactiveMongoClient client2;
 
+    private final ClientProxyUnwrapper unwrapper = new ClientProxyUnwrapper();
+
     @AfterEach
     void cleanup() {
         if (client != null) {
@@ -41,7 +55,47 @@ void cleanup() {
 
     @Test
     public void testNamedDataSourceInjection() {
+        assertProperConnection(client, 27018);
+        assertProperConnection(client2, 27019);
+
         assertThat(client.listDatabases().collectItems().first().await().indefinitely()).isNotEmpty();
         assertThat(client2.listDatabases().collectItems().first().await().indefinitely()).isNotEmpty();
+
+        assertNoDefaultClient();
+    }
+
+    private void assertProperConnection(ReactiveMongoClient client, int expectedPort) {
+        assertThat(unwrapper.apply(client)).isInstanceOfSatisfying(ReactiveMongoClientImpl.class, rc -> {
+            Field mongoClientField;
+            try {
+                mongoClientField = ReactiveMongoClientImpl.class.getDeclaredField("client");
+            } catch (NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            }
+            mongoClientField.setAccessible(true);
+            MongoClient c;
+            try {
+                c = (MongoClientImpl) mongoClientField.get(rc);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+            assertThat(c.getClusterDescription().getClusterSettings().getHosts()).singleElement().satisfies(sa -> {
+                assertThat(sa.getPort()).isEqualTo(expectedPort);
+            });
+        });
+    }
+
+    private void assertNoDefaultClient() {
+        boolean hasDefault = false;
+        for (InstanceHandle<ReactiveMongoClient> handle : Arc.container().select(ReactiveMongoClient.class).handles()) {
+            InjectableBean<ReactiveMongoClient> bean = handle.getBean();
+            for (Annotation qualifier : bean.getQualifiers()) {
+                if (qualifier.annotationType().equals(Default.class)) {
+                    hasDefault = true;
+                }
+            }
+        }
+        Assertions.assertFalse(hasDefault,
+                "The default reactive mongo client should not have been present as it is not used in any injection point");
     }
 }
diff --git a/extensions/mongodb-client/deployment/src/test/resources/application-default-and-named-mongoclient.properties b/extensions/mongodb-client/deployment/src/test/resources/application-default-and-named-mongoclient.properties
new file mode 100644
index 0000000000000..77ad8f34860eb
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/resources/application-default-and-named-mongoclient.properties
@@ -0,0 +1,2 @@
+quarkus.mongodb.connection-string=mongodb://127.0.0.1:27018
+quarkus.mongodb.cluster2.connection-string=mongodb://127.0.0.1:27019
diff --git a/extensions/mongodb-client/deployment/src/test/resources/application-metrics-mongo.properties b/extensions/mongodb-client/deployment/src/test/resources/application-metrics-mongo.properties
index 26c0c532fa11d..863555528dff5 100644
--- a/extensions/mongodb-client/deployment/src/test/resources/application-metrics-mongo.properties
+++ b/extensions/mongodb-client/deployment/src/test/resources/application-metrics-mongo.properties
@@ -1,2 +1,2 @@
-quarkus.mongodb.connection-string=mongodb://localhost:27018
+quarkus.mongodb.connection-string=mongodb://127.0.0.1:27018
 quarkus.mongodb.metrics.enabled=true
\ No newline at end of file
diff --git a/extensions/mongodb-client/deployment/src/test/resources/application-named-mongoclient.properties b/extensions/mongodb-client/deployment/src/test/resources/application-named-mongoclient.properties
index dcb0e5c6e9256..61118a98815b2 100644
--- a/extensions/mongodb-client/deployment/src/test/resources/application-named-mongoclient.properties
+++ b/extensions/mongodb-client/deployment/src/test/resources/application-named-mongoclient.properties
@@ -1,2 +1,2 @@
-quarkus.mongodb.cluster1.connection-string=mongodb://localhost:27018
-quarkus.mongodb.cluster2.connection-string=mongodb://localhost:27019
\ No newline at end of file
+quarkus.mongodb.cluster1.connection-string=mongodb://127.0.0.1:27018
+quarkus.mongodb.cluster2.connection-string=mongodb://127.0.0.1:27019
\ No newline at end of file
diff --git a/extensions/mongodb-client/deployment/src/test/resources/default-mongoclient.properties b/extensions/mongodb-client/deployment/src/test/resources/default-mongoclient.properties
index 70ada3169c56d..cb9c01f6f68bd 100644
--- a/extensions/mongodb-client/deployment/src/test/resources/default-mongoclient.properties
+++ b/extensions/mongodb-client/deployment/src/test/resources/default-mongoclient.properties
@@ -1 +1 @@
-quarkus.mongodb.connection-string=mongodb://localhost:27018
\ No newline at end of file
+quarkus.mongodb.connection-string=mongodb://127.0.0.1:27018
\ No newline at end of file
diff --git a/extensions/mongodb-client/deployment/src/test/resources/named-mongoclient.properties b/extensions/mongodb-client/deployment/src/test/resources/named-mongoclient.properties
new file mode 100644
index 0000000000000..e36264dbb22fa
--- /dev/null
+++ b/extensions/mongodb-client/deployment/src/test/resources/named-mongoclient.properties
@@ -0,0 +1,2 @@
+quarkus.mongodb.connection-string=mongodb://127.0.0.1:27018
+quarkus.mongodb.second.connection-string=mongodb://127.0.0.1:27018
diff --git a/extensions/mongodb-client/pom.xml b/extensions/mongodb-client/pom.xml
index 2417ee375b4e1..a3a4a96136345 100644
--- a/extensions/mongodb-client/pom.xml
+++ b/extensions/mongodb-client/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/mongodb-client/runtime/pom.xml b/extensions/mongodb-client/runtime/pom.xml
index 21a7d429d63c1..83005556aeebd 100644
--- a/extensions/mongodb-client/runtime/pom.xml
+++ b/extensions/mongodb-client/runtime/pom.xml
@@ -57,10 +57,16 @@
             <artifactId>quarkus-smallrye-metrics</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -94,7 +100,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/AggregateOptions.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/AggregateOptions.java
index 9d1c712264860..f9eb792cb300a 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/AggregateOptions.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/AggregateOptions.java
@@ -21,6 +21,7 @@ public class AggregateOptions {
     private boolean bypassDocumentValidation;
     private Collation collation;
     private String comment;
+    private int batchSize;
 
     /**
      * Enables writing to temporary files. A null value indicates that it's unspecified.
@@ -114,6 +115,23 @@ public AggregateOptions hint(Bson hint) {
         return this;
     }
 
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * <p>
+     * Overrides the {@link org.reactivestreams.Subscription#request(long)} value for setting the batch size, allowing for fine
+     * grained
+     * control over the underlying cursor.
+     * </p>
+     *
+     * @param size the batch size
+     * @return this
+     */
+    public AggregateOptions batchSize(int size) {
+        this.batchSize = size;
+        return this;
+    }
+
     public <T> AggregatePublisher<T> apply(AggregatePublisher<T> stream) {
         AggregatePublisher<T> publisher = stream;
 
@@ -134,6 +152,9 @@ public <T> AggregatePublisher<T> apply(AggregatePublisher<T> stream) {
         if (maxTime > 0) {
             publisher.maxAwaitTime(maxTime, maxTimeUnit);
         }
+        if (batchSize > 0) {
+            publisher.batchSize(batchSize);
+        }
         return publisher;
     }
 }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/FindOptions.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/FindOptions.java
index db4600ac17fa7..434fdf9c819e0 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/FindOptions.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/FindOptions.java
@@ -33,6 +33,7 @@ public class FindOptions {
     private boolean showRecordId;
     private long maxAwaitTime;
     private TimeUnit maxAwaitTimeUnit;
+    private int batchSize;
 
     /**
      * Sets the query filter to apply to the query.
@@ -250,6 +251,23 @@ public FindOptions showRecordId(boolean showRecordId) {
         return this;
     }
 
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * <p>
+     * Overrides the {@link org.reactivestreams.Subscription#request(long)} value for setting the batch size, allowing for fine
+     * grained
+     * control over the underlying cursor.
+     * </p>
+     *
+     * @param size the batch size
+     * @return this
+     */
+    public FindOptions batchSize(int size) {
+        this.batchSize = size;
+        return this;
+    }
+
     public <T> FindPublisher<T> apply(FindPublisher<T> stream) {
         FindPublisher<T> publisher = stream;
         if (filter != null) {
@@ -306,6 +324,9 @@ public <T> FindPublisher<T> apply(FindPublisher<T> stream) {
         if (showRecordId) {
             publisher = publisher.showRecordId(true);
         }
+        if (batchSize > 0) {
+            publisher.batchSize(batchSize);
+        }
         return publisher;
 
     }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java
new file mode 100644
index 0000000000000..0e28fa5e33581
--- /dev/null
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/MongoClientName.java
@@ -0,0 +1,41 @@
+package io.quarkus.mongodb;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * Marker annotation to select mongo connection of cluster configuration
+ * Use name parameter to select it
+ *
+ * For example, if a mongo connection is configured like so in {@code application.properties}:
+ *
+ * <pre>
+ * quarkus.mongodb.cluster1.connection-string=mongodb://localhost:27018
+ * </pre>
+ *
+ * Then to inject the proper {@code MongoClient}, you would need to use {@code MongoClientName} like so:
+ *
+ * <pre>
+ *     &#64Inject
+ *     &#64MongoClientName("cluster1")
+ *     MongoClient client;
+ * </pre>
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface MongoClientName {
+    /**
+     * Specify the cluster name of the connection.
+     *
+     * @return the value
+     */
+    String value() default "";
+}
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java
index 41aa9159daa05..62ab766b8b470 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java
@@ -2,10 +2,10 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
 import javax.enterprise.inject.spi.Bean;
 
 import org.bson.Document;
@@ -17,40 +17,69 @@
 import com.mongodb.client.MongoClient;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.mongodb.MongoClientName;
+import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 
 @Readiness
 @ApplicationScoped
 public class MongoHealthCheck implements HealthCheck {
-    private static final String DEFAULT_CLIENT = "__default__";
+
+    public static final String CLIENT_DEFAULT = "<default>";
+    public static final String CLIENT_DEFAULT_REACTIVE = "<default-reactive>";
+
     private Map<String, MongoClient> clients = new HashMap<>();
+    private Map<String, ReactiveMongoClient> reactiveClients = new HashMap<>();
 
     @PostConstruct
     protected void init() {
-        Set<Bean<?>> beans = Arc.container().beanManager().getBeans(MongoClient.class);
-        for (Bean<?> bean : beans) {
-            if (bean.getName() == null) {
-                // this is the default mongo client: retrieve it by type
-                MongoClient defaultClient = Arc.container().instance(MongoClient.class).get();
-                clients.put(DEFAULT_CLIENT, defaultClient);
-            } else {
-                MongoClient client = (MongoClient) Arc.container().instance(bean.getName()).get();
-                clients.put(bean.getName(), client);
+        for (InstanceHandle<MongoClient> handle : Arc.container().select(MongoClient.class, Any.Literal.INSTANCE).handles()) {
+            String clientName = getMongoClientName(handle.getBean());
+            clients.put(clientName == null ? CLIENT_DEFAULT : clientName, handle.get());
+        }
+        // reactive clients
+        for (InstanceHandle<ReactiveMongoClient> handle : Arc.container()
+                .select(ReactiveMongoClient.class, Any.Literal.INSTANCE).handles()) {
+            String clientName = getMongoClientName(handle.getBean());
+            reactiveClients.put(clientName == null ? CLIENT_DEFAULT_REACTIVE : clientName, handle.get());
+        }
+    }
+
+    /**
+     * Get mongoClient name if defined.
+     *
+     * @param bean
+     * @return mongoClient name or null if not defined
+     * @see MongoClientName
+     */
+    private String getMongoClientName(Bean bean) {
+        for (Object qualifier : bean.getQualifiers()) {
+            if (qualifier instanceof MongoClientName) {
+                return ((MongoClientName) qualifier).value();
             }
         }
+        return null;
     }
 
     @Override
     public HealthCheckResponse call() {
         HealthCheckResponseBuilder builder = HealthCheckResponse.named("MongoDB connection health check").up();
+        Document command = new Document("ping", 1);
         for (Map.Entry<String, MongoClient> client : clients.entrySet()) {
-            boolean isDefault = DEFAULT_CLIENT.equals(client.getKey());
-            MongoClient mongoClient = client.getValue();
             try {
-                Document document = mongoClient.getDatabase("admin").runCommand(new Document("ping", 1));
-                String mongoClientName = isDefault ? "default" : client.getKey();
-                builder.up().withData(mongoClientName, document.toJson());
+                Document document = client.getValue().getDatabase("admin").runCommand(command);
+                builder.up().withData(client.getKey(), document.toJson());
+            } catch (Exception e) {
+                return builder.down().withData("reason", "client [" + client.getKey() + "]: " + e.getMessage()).build();
+            }
+        }
+        for (Map.Entry<String, ReactiveMongoClient> client : reactiveClients.entrySet()) {
+            try {
+                Document document = client.getValue().getDatabase("admin").runCommand(command).await().indefinitely();
+                builder.up().withData(client.getKey(), document.toJson());
             } catch (Exception e) {
-                return builder.down().withData("reason", e.getMessage()).build();
+                return builder.down().withData("reason", "reactive client [" + client.getKey() + "]: " + e.getMessage())
+                        .build();
             }
         }
         return builder.build();
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java
index 69750ceb98c9c..1196ff7fc668e 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java
@@ -7,6 +7,7 @@
 import org.bson.conversions.Bson;
 
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.CountOptions;
@@ -825,4 +826,9 @@ public CodecRegistry getCodecRegistry() {
     public <NewTDocument> ReactiveMongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz) {
         return new ReactiveMongoCollectionImpl<>(this.collection.withDocumentClass(clazz));
     }
+
+    @Override
+    public ReactiveMongoCollectionImpl<T> withReadPreference(ReadPreference readPreference) {
+        return new ReactiveMongoCollectionImpl<>(this.collection.withReadPreference(readPreference));
+    }
 }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/metrics/MicrometerConnectionPoolListener.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/metrics/MicrometerConnectionPoolListener.java
new file mode 100644
index 0000000000000..b7c6ae26d110b
--- /dev/null
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/metrics/MicrometerConnectionPoolListener.java
@@ -0,0 +1,12 @@
+package io.quarkus.mongodb.metrics;
+
+import com.mongodb.event.ConnectionPoolListener;
+
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.binder.mongodb.MongoMetricsConnectionPoolListener;
+
+public class MicrometerConnectionPoolListener {
+    public static ConnectionPoolListener createMicrometerConnectionPool() {
+        return new MongoMetricsConnectionPoolListener(Metrics.globalRegistry);
+    }
+}
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/reactive/ReactiveMongoCollection.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/reactive/ReactiveMongoCollection.java
index 68947c52d8265..090aefe622987 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/reactive/ReactiveMongoCollection.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/reactive/ReactiveMongoCollection.java
@@ -7,8 +7,8 @@
 import org.bson.conversions.Bson;
 
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
 import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.CountOptions;
 import com.mongodb.client.model.CreateIndexOptions;
@@ -1497,7 +1497,15 @@ Uni<Void> renameCollection(ClientSession clientSession, MongoNamespace newCollec
      *
      * @param clazz the default class to cast any documents returned from the database into.
      * @param <NewTDocument> The type that the new collection will encode documents from and decode documents to
-     * @return a new MongoCollection instance with the different default class
+     * @return a new ReactiveMongoCollection instance with the different default class
      */
     <NewTDocument> ReactiveMongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz);
+
+    /**
+     * Create a new ReactiveMongoCollection instance with a different read preference.
+     *
+     * @param readPreference the new {@link com.mongodb.ReadPreference} for the collection
+     * @return a new ReactiveMongoCollection instance with the different readPreference
+     */
+    ReactiveMongoCollection<T> withReadPreference(ReadPreference readPreference);
 }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java
index a410976f65927..c65b6e2d4b34e 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java
@@ -1,5 +1,9 @@
 package io.quarkus.mongodb.runtime;
 
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.literal.NamedLiteral;
+import javax.enterprise.util.AnnotationLiteral;
+
 public final class MongoClientBeanUtil {
 
     public static final String DEFAULT_MONGOCLIENT_NAME = "<default>";
@@ -18,4 +22,12 @@ public static String namedQualifier(String clientName, boolean isReactive) {
         }
         return isReactive ? clientName + REACTIVE_CLIENT_NAME_SUFFIX : clientName;
     }
+
+    @SuppressWarnings("rawtypes")
+    public static AnnotationLiteral clientLiteral(String clientName, boolean isReactive) {
+        if (MongoClientBeanUtil.isDefault(clientName)) {
+            return Default.Literal.INSTANCE;
+        }
+        return NamedLiteral.of(namedQualifier(clientName, isReactive));
+    }
 }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientConfig.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientConfig.java
index 22ec4618bacb2..7f7479a69dba2 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientConfig.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientConfig.java
@@ -104,12 +104,6 @@ public class MongoClientConfig {
     @ConfigItem
     public Optional<Duration> maxConnectionLifeTime;
 
-    /**
-     * The maximum wait time that a thread may wait for a connection to become available.
-     */
-    @ConfigItem
-    public Optional<Duration> waitQueueTimeout;
-
     /**
      * Configures the time period between runs of the maintenance job.
      */
@@ -122,14 +116,6 @@ public class MongoClientConfig {
     @ConfigItem
     public Optional<Duration> maintenanceInitialDelay;
 
-    /**
-     * This multiplier, multiplied with the {@code maxPoolSize} setting, gives the maximum number of
-     * threads that may be waiting for a connection to become available from the pool. All further threads will get an
-     * exception right away.
-     */
-    @ConfigItem
-    public OptionalInt waitQueueMultiple;
-
     /**
      * How long a connection can take to be opened before timing out.
      */
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientName.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientName.java
index 49cf1818c9330..705669547eeba 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientName.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientName.java
@@ -12,11 +12,14 @@
 /**
  * Marker annotation to select mongo connection of cluster configuration
  * Use name parameter to select it
+ *
+ * @deprecated in favor of {@link io.quarkus.mongodb.MongoClientName}
  */
 @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RUNTIME)
 @Documented
 @Qualifier
+@Deprecated
 public @interface MongoClientName {
     /**
      * Specify the cluster name of the connection.
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java
index 871462329909f..cd604c36a1471 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java
@@ -1,5 +1,6 @@
 package io.quarkus.mongodb.runtime;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -11,6 +12,8 @@
 import com.mongodb.event.ConnectionPoolListener;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.mongodb.metrics.MicrometerConnectionPoolListener;
+import io.quarkus.mongodb.metrics.MongoMetricsConnectionPoolListener;
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
@@ -18,18 +21,27 @@
 @Recorder
 public class MongoClientRecorder {
 
-    public Supplier<MongoClientSupport> mongoClientSupportSupplier(List<String> codecProviders, List<String> bsonDiscriminators,
-            List<ConnectionPoolListener> connectionPoolListeners, boolean disableSslSupport) {
+    public Supplier<MongoClientSupport> mongoClientSupportSupplier(List<String> codecProviders,
+            List<String> propertyCodecProviders, List<String> bsonDiscriminators, List<String> commandListeners,
+            List<Supplier<ConnectionPoolListener>> connectionPoolListenerSuppliers, boolean disableSslSupport) {
+
         return new Supplier<MongoClientSupport>() {
             @Override
             public MongoClientSupport get() {
-                return new MongoClientSupport(codecProviders, bsonDiscriminators, connectionPoolListeners, disableSslSupport);
+
+                List<ConnectionPoolListener> connectionPoolListeners = new ArrayList<>(connectionPoolListenerSuppliers.size());
+                for (Supplier<ConnectionPoolListener> item : connectionPoolListenerSuppliers) {
+                    connectionPoolListeners.add(item.get());
+                }
+
+                return new MongoClientSupport(codecProviders, propertyCodecProviders, bsonDiscriminators, commandListeners,
+                        connectionPoolListeners, disableSslSupport);
             }
         };
     }
 
     public Supplier<MongoClient> mongoClientSupplier(String clientName,
-            @SuppressWarnings("usused") MongodbConfig mongodbConfig) {
+            @SuppressWarnings("unused") MongodbConfig mongodbConfig) {
         MongoClient mongoClient = Arc.container().instance(MongoClients.class).get().createMongoClient(clientName);
         return new Supplier<MongoClient>() {
             @Override
@@ -40,7 +52,7 @@ public MongoClient get() {
     }
 
     public Supplier<ReactiveMongoClient> reactiveMongoClientSupplier(String clientName,
-            @SuppressWarnings("usused") MongodbConfig mongodbConfig) {
+            @SuppressWarnings("unused") MongodbConfig mongodbConfig) {
         ReactiveMongoClient reactiveMongoClient = Arc.container().instance(MongoClients.class).get()
                 .createReactiveMongoClient(clientName);
         return new Supplier<ReactiveMongoClient>() {
@@ -69,4 +81,22 @@ private AnnotationLiteral literal(String name) {
         }
         return NamedLiteral.of(name);
     }
+
+    public Supplier<ConnectionPoolListener> createMicrometerConnectionPoolListener() {
+        return new Supplier<ConnectionPoolListener>() {
+            @Override
+            public ConnectionPoolListener get() {
+                return MicrometerConnectionPoolListener.createMicrometerConnectionPool();
+            }
+        };
+    }
+
+    public Supplier<ConnectionPoolListener> createMPMetricsConnectionPoolListener() {
+        return new Supplier<ConnectionPoolListener>() {
+            @Override
+            public ConnectionPoolListener get() {
+                return new MongoMetricsConnectionPoolListener();
+            }
+        };
+    }
 }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientSupport.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientSupport.java
index 77bd5ced1b1fb..ff27d2635c427 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientSupport.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientSupport.java
@@ -7,15 +7,19 @@
 public class MongoClientSupport {
 
     private final List<String> codecProviders;
+    private final List<String> propertyCodecProviders;
     private final List<String> bsonDiscriminators;
     private final List<ConnectionPoolListener> connectionPoolListeners;
+    private final List<String> commandListeners;
     private final boolean disableSslSupport;
 
-    public MongoClientSupport(List<String> codecProviders, List<String> bsonDiscriminators,
-            List<ConnectionPoolListener> connectionPoolListeners, boolean disableSslSupport) {
+    public MongoClientSupport(List<String> codecProviders, List<String> propertyCodecProviders, List<String> bsonDiscriminators,
+            List<String> commandListeners, List<ConnectionPoolListener> connectionPoolListeners, boolean disableSslSupport) {
         this.codecProviders = codecProviders;
+        this.propertyCodecProviders = propertyCodecProviders;
         this.bsonDiscriminators = bsonDiscriminators;
         this.connectionPoolListeners = connectionPoolListeners;
+        this.commandListeners = commandListeners;
         this.disableSslSupport = disableSslSupport;
     }
 
@@ -23,6 +27,10 @@ public List<String> getCodecProviders() {
         return codecProviders;
     }
 
+    public List<String> getPropertyCodecProviders() {
+        return propertyCodecProviders;
+    }
+
     public List<String> getBsonDiscriminators() {
         return bsonDiscriminators;
     }
@@ -31,6 +39,10 @@ public List<ConnectionPoolListener> getConnectionPoolListeners() {
         return connectionPoolListeners;
     }
 
+    public List<String> getCommandListeners() {
+        return commandListeners;
+    }
+
     public boolean isDisableSslSupport() {
         return disableSslSupport;
     }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java
index 67588d7739e1b..7fab33dcac95a 100644
--- a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java
+++ b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java
@@ -4,6 +4,8 @@
 import static com.mongodb.AuthenticationMechanism.MONGODB_X509;
 import static com.mongodb.AuthenticationMechanism.PLAIN;
 import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -21,11 +23,11 @@
 import javax.inject.Singleton;
 
 import org.bson.codecs.configuration.CodecProvider;
-import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.codecs.pojo.ClassModel;
 import org.bson.codecs.pojo.Conventions;
 import org.bson.codecs.pojo.PojoCodecProvider;
+import org.bson.codecs.pojo.PropertyCodecProvider;
 import org.jboss.logging.Logger;
 
 import com.mongodb.AuthenticationMechanism;
@@ -44,6 +46,7 @@
 import com.mongodb.connection.ServerSettings;
 import com.mongodb.connection.SocketSettings;
 import com.mongodb.connection.SslSettings;
+import com.mongodb.event.CommandListener;
 import com.mongodb.event.ConnectionPoolListener;
 
 import io.quarkus.mongodb.impl.ReactiveMongoClientImpl;
@@ -73,6 +76,14 @@ public class MongoClients {
     public MongoClients(MongodbConfig mongodbConfig, MongoClientSupport mongoClientSupport) {
         this.mongodbConfig = mongodbConfig;
         this.mongoClientSupport = mongoClientSupport;
+
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
     }
 
     public MongoClient createMongoClient(String clientName) throws MongoException {
@@ -92,7 +103,7 @@ public ReactiveMongoClient createReactiveMongoClient(String clientName)
         return reactive;
     }
 
-    private MongoClientConfig getMatchingMongoClientConfig(String clientName) {
+    public MongoClientConfig getMatchingMongoClientConfig(String clientName) {
         return MongoClientBeanUtil.isDefault(clientName) ? mongodbConfig.defaultMongoClientConfig
                 : mongodbConfig.mongoClientConfigs.get(clientName);
     }
@@ -224,30 +235,9 @@ private MongoClientSettings createMongoConfiguration(MongoClientConfig config) {
             settings.applyConnectionString(connectionString);
         }
 
-        List<CodecProvider> providers = new ArrayList<>();
-        if (!mongoClientSupport.getCodecProviders().isEmpty()) {
-            providers.addAll(getCodecProviders(mongoClientSupport.getCodecProviders()));
-        }
-        // add pojo codec provider with automatic capabilities
-        // it always needs to be the last codec provided
-        PojoCodecProvider.Builder pojoCodecProviderBuilder = PojoCodecProvider.builder()
-                .automatic(true)
-                .conventions(Conventions.DEFAULT_CONVENTIONS);
-        // register bson discriminators
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        for (String bsonDiscriminator : mongoClientSupport.getBsonDiscriminators()) {
-            try {
-                pojoCodecProviderBuilder
-                        .register(ClassModel.builder(Class.forName(bsonDiscriminator, true, classLoader))
-                                .enableDiscriminator(true).build());
-            } catch (ClassNotFoundException e) {
-                // Ignore
-            }
-        }
-        providers.add(pojoCodecProviderBuilder.build());
-        CodecRegistry registry = CodecRegistries.fromRegistries(defaultCodecRegistry,
-                CodecRegistries.fromProviders(providers));
-        settings.codecRegistry(registry);
+        configureCodecRegistry(defaultCodecRegistry, settings);
+
+        settings.commandListenerList(getCommandListeners(mongoClientSupport.getCommandListeners()));
 
         config.applicationName.ifPresent(settings::applicationName);
 
@@ -290,6 +280,38 @@ private MongoClientSettings createMongoConfiguration(MongoClientConfig config) {
         return settings.build();
     }
 
+    private void configureCodecRegistry(CodecRegistry defaultCodecRegistry, MongoClientSettings.Builder settings) {
+        List<CodecProvider> providers = new ArrayList<>();
+        if (!mongoClientSupport.getCodecProviders().isEmpty()) {
+            providers.addAll(getCodecProviders(mongoClientSupport.getCodecProviders()));
+        }
+        // add pojo codec provider with automatic capabilities
+        // it always needs to be the last codec provided
+        PojoCodecProvider.Builder pojoCodecProviderBuilder = PojoCodecProvider.builder()
+                .automatic(true)
+                .conventions(Conventions.DEFAULT_CONVENTIONS);
+        // register bson discriminators
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        for (String bsonDiscriminator : mongoClientSupport.getBsonDiscriminators()) {
+            try {
+                pojoCodecProviderBuilder
+                        .register(ClassModel.builder(Class.forName(bsonDiscriminator, true, classLoader))
+                                .enableDiscriminator(true).build());
+            } catch (ClassNotFoundException e) {
+                // Ignore
+            }
+        }
+        // register property codec provider
+        if (!mongoClientSupport.getPropertyCodecProviders().isEmpty()) {
+            pojoCodecProviderBuilder.register(getPropertyCodecProviders(mongoClientSupport.getPropertyCodecProviders())
+                    .toArray(new PropertyCodecProvider[0]));
+        }
+        CodecRegistry registry = !providers.isEmpty() ? fromRegistries(fromProviders(providers), defaultCodecRegistry,
+                fromProviders(pojoCodecProviderBuilder.build()))
+                : fromRegistries(defaultCodecRegistry, fromProviders(pojoCodecProviderBuilder.build()));
+        settings.codecRegistry(registry);
+    }
+
     private static List<ServerAddress> parseHosts(List<String> addresses) {
         if (addresses.isEmpty()) {
             return Collections.singletonList(new ServerAddress(ServerAddress.defaultHost(), ServerAddress.defaultPort()));
@@ -384,6 +406,36 @@ private List<CodecProvider> getCodecProviders(List<String> classNames) {
         return providers;
     }
 
+    private List<PropertyCodecProvider> getPropertyCodecProviders(List<String> classNames) {
+        List<PropertyCodecProvider> providers = new ArrayList<>();
+        for (String name : classNames) {
+            try {
+                Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(name);
+                Constructor clazzConstructor = clazz.getConstructor();
+                providers.add((PropertyCodecProvider) clazzConstructor.newInstance());
+            } catch (Exception e) {
+                LOGGER.warnf(e, "Unable to load the property codec provider class %s", name);
+            }
+        }
+
+        return providers;
+    }
+
+    private List<CommandListener> getCommandListeners(List<String> classNames) {
+        List<CommandListener> listeners = new ArrayList<>();
+        for (String name : classNames) {
+            try {
+                Class<?> clazz = Class.forName(name, true, Thread.currentThread().getContextClassLoader());
+                Constructor<?> clazzConstructor = clazz.getConstructor();
+                listeners.add((CommandListener) clazzConstructor.newInstance());
+            } catch (Exception e) {
+                LOGGER.warnf(e, "Unable to load the command listener class %s", name);
+            }
+        }
+
+        return listeners;
+    }
+
     @PreDestroy
     public void stop() {
         for (MongoClient client : mongoclients.values()) {
diff --git a/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java b/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java
index 8eda6918893fe..2888a888dbf18 100644
--- a/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java
+++ b/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoTestBase.java
@@ -16,12 +16,16 @@
 
 import com.mongodb.client.result.InsertOneResult;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 import io.smallrye.mutiny.Uni;
 
@@ -50,6 +54,13 @@ protected static String getProperty(String name) {
 
     @BeforeAll
     public static void startMongoDatabase() throws IOException {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
         String uri = getConfiguredConnectionString();
         // This switch allow testing against a running mongo database.
         if (uri == null) {
@@ -92,7 +103,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll
diff --git a/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java b/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java
index 23561d8a5c24c..4f804fc631977 100644
--- a/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java
+++ b/extensions/mongodb-client/runtime/src/test/java/io/quarkus/mongodb/reactive/MongoWithReplicasTestBase.java
@@ -20,13 +20,17 @@
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongoCmdOptionsBuilder;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 
 public class MongoWithReplicasTestBase {
@@ -85,7 +89,11 @@ private static MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private static MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @AfterAll
@@ -108,24 +116,24 @@ protected String getConnectionString() {
     }
 
     private static void initializeReplicaSet(final List<IMongodConfig> mongodConfigList) throws UnknownHostException {
-        final String arbitrerAddress = "mongodb://" + mongodConfigList.get(0).net().getServerAddress().getHostName() + ":"
+        final String arbiterAddress = "mongodb://" + mongodConfigList.get(0).net().getServerAddress().getHostName() + ":"
                 + mongodConfigList.get(0).net().getPort();
         final MongoClientSettings mo = MongoClientSettings.builder()
-                .applyConnectionString(new ConnectionString(arbitrerAddress)).build();
+                .applyConnectionString(new ConnectionString(arbiterAddress)).build();
 
         try (MongoClient mongo = MongoClients.create(mo)) {
             final MongoDatabase mongoAdminDB = mongo.getDatabase("admin");
 
             Document cr = mongoAdminDB.runCommand(new Document("isMaster", 1));
-            LOGGER.infof("isMaster: %s", cr);
+            LOGGER.debugf("isMaster: %s", cr);
 
             // Build replica set configuration settings
             final Document rsConfiguration = buildReplicaSetConfiguration(mongodConfigList);
-            LOGGER.infof("replSetSettings: %s", rsConfiguration);
+            LOGGER.debugf("replSetSettings: %s", rsConfiguration);
 
             // Initialize replica set
             cr = mongoAdminDB.runCommand(new Document("replSetInitiate", rsConfiguration));
-            LOGGER.infof("replSetInitiate: %s", cr);
+            LOGGER.debugf("replSetInitiate: %s", cr);
 
             // Check replica set status before to proceed
             await()
@@ -175,6 +183,13 @@ private static boolean isReplicaSetStarted(final Document setting) {
 
     private static IMongodConfig buildMongodConfiguration(String url, int port, final boolean configureReplicaSet)
             throws IOException {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
         final MongodConfigBuilder builder = new MongodConfigBuilder()
                 .version(Version.Main.V4_0)
                 .net(new Net(url, port, Network.localhostIsIPv6()));
diff --git a/extensions/mutiny/deployment/src/main/java/io/quarkus/mutiny/deployment/MutinyProcessor.java b/extensions/mutiny/deployment/src/main/java/io/quarkus/mutiny/deployment/MutinyProcessor.java
index acacbfae6da4d..6ebf91e351beb 100644
--- a/extensions/mutiny/deployment/src/main/java/io/quarkus/mutiny/deployment/MutinyProcessor.java
+++ b/extensions/mutiny/deployment/src/main/java/io/quarkus/mutiny/deployment/MutinyProcessor.java
@@ -23,4 +23,10 @@ public void initExecutor(ExecutorBuildItem executorBuildItem, MutinyInfrastructu
         ExecutorService executor = executorBuildItem.getExecutorProxy();
         recorder.configureMutinyInfrastructure(executor);
     }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    public void configureDroppedExceptionHandlerAndThreadBlockingChecker(MutinyInfrastructure recorder) {
+        recorder.configureDroppedExceptionHandlerAndThreadBlockingChecker();
+    }
 }
diff --git a/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java b/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java
index 119612bc42ec2..c94a0339f8d79 100644
--- a/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java
+++ b/extensions/mutiny/deployment/src/test/java/io/quarkus/mutiny/deployment/test/MutinyTest.java
@@ -1,6 +1,15 @@
 package io.quarkus.mutiny.deployment.test;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Handler;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -11,10 +20,12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.mutiny.runtime.MutinyInfrastructure;
 import io.quarkus.test.QuarkusUnitTest;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.subscription.Cancellable;
 
 public class MutinyTest {
 
@@ -39,6 +50,59 @@ public void testMulti() {
         Assertions.assertEquals(list.get(1), "world");
     }
 
+    @Test
+    public void testDroppedException() {
+        TestingJulHandler julHandler = new TestingJulHandler();
+        Logger logger = LogManager.getLogManager().getLogger("io.quarkus.mutiny.runtime.MutinyInfrastructure");
+        logger.addHandler(julHandler);
+
+        AtomicReference<String> item = new AtomicReference<>();
+        AtomicReference<Throwable> failure = new AtomicReference<>();
+        Cancellable cancellable = bean.droppedException().subscribe().with(item::set, failure::set);
+        cancellable.cancel();
+
+        Assertions.assertNull(item.get());
+        Assertions.assertNull(failure.get());
+
+        Assertions.assertEquals(1, julHandler.logRecords.size());
+        LogRecord logRecord = julHandler.logRecords.get(0);
+        Assertions.assertTrue(logRecord.getMessage().contains("Mutiny had to drop the following exception"));
+        Throwable thrown = logRecord.getThrown();
+        Assertions.assertTrue(thrown instanceof IOException);
+        Assertions.assertEquals("boom", thrown.getMessage());
+    }
+
+    @Test
+    public void testAllowedUniBlocking() {
+        String str = Uni.createFrom().item("ok").await().indefinitely();
+        Assertions.assertEquals("ok", str);
+    }
+
+    @Test
+    public void testForbiddenUniBlocking() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(1);
+        AtomicReference<String> item = new AtomicReference<>();
+        AtomicReference<Throwable> throwable = new AtomicReference<>();
+
+        new Thread(() -> {
+            try {
+                String str = Uni.createFrom().item("ok").await().indefinitely();
+                item.set(str);
+            } catch (Throwable err) {
+                throwable.set(err);
+            }
+            latch.countDown();
+        }, MutinyInfrastructure.VERTX_EVENT_LOOP_THREAD_PREFIX + "0").start();
+
+        Assertions.assertTrue(latch.await(5, TimeUnit.SECONDS));
+        Assertions.assertNull(item.get());
+
+        Throwable exception = throwable.get();
+        Assertions.assertNotNull(exception);
+        Assertions.assertTrue(exception instanceof IllegalStateException);
+        Assertions.assertTrue(exception.getMessage().contains("The current thread cannot be blocked"));
+    }
+
     @ApplicationScoped
     public static class BeanUsingMutiny {
 
@@ -52,5 +116,36 @@ public Multi<String> stream() {
                     .emitOn(Infrastructure.getDefaultExecutor());
         }
 
+        public Uni<String> droppedException() {
+            return Uni.createFrom()
+                    .<String> emitter(uniEmitter -> {
+                        // Do not emit anything
+                    })
+                    .onCancellation().call(() -> Uni.createFrom().failure(new IOException("boom")));
+        }
+    }
+
+    private static class TestingJulHandler extends Handler {
+
+        private final ArrayList<LogRecord> logRecords = new ArrayList<>();
+
+        public ArrayList<LogRecord> getLogRecords() {
+            return logRecords;
+        }
+
+        @Override
+        public void publish(LogRecord record) {
+            logRecords.add(record);
+        }
+
+        @Override
+        public void flush() {
+            // Do nothing
+        }
+
+        @Override
+        public void close() throws SecurityException {
+            // Do nothing
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/extensions/mutiny/pom.xml b/extensions/mutiny/pom.xml
index 0e4c1f8b743b2..c90334777f7e2 100644
--- a/extensions/mutiny/pom.xml
+++ b/extensions/mutiny/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/mutiny/runtime/pom.xml b/extensions/mutiny/runtime/pom.xml
index 0a3f16a34b394..de81bc53ff443 100644
--- a/extensions/mutiny/runtime/pom.xml
+++ b/extensions/mutiny/runtime/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
-            <artifactId>mutiny-context-propagation</artifactId>
+            <artifactId>mutiny-smallrye-context-propagation</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/MutinyInfrastructure.java b/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/MutinyInfrastructure.java
index ce46feecd91dd..1304b385f6c8b 100644
--- a/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/MutinyInfrastructure.java
+++ b/extensions/mutiny/runtime/src/main/java/io/quarkus/mutiny/runtime/MutinyInfrastructure.java
@@ -1,6 +1,10 @@
 package io.quarkus.mutiny.runtime;
 
 import java.util.concurrent.ExecutorService;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+
+import org.jboss.logging.Logger;
 
 import io.quarkus.runtime.annotations.Recorder;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
@@ -8,7 +12,34 @@
 @Recorder
 public class MutinyInfrastructure {
 
+    public static final String VERTX_EVENT_LOOP_THREAD_PREFIX = "vert.x-eventloop-thread-";
+
     public void configureMutinyInfrastructure(ExecutorService exec) {
         Infrastructure.setDefaultExecutor(exec);
     }
+
+    public void configureDroppedExceptionHandlerAndThreadBlockingChecker() {
+        Logger logger = Logger.getLogger(MutinyInfrastructure.class);
+        Infrastructure.setDroppedExceptionHandler(new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) {
+                logger.error("Mutiny had to drop the following exception", throwable);
+            }
+        });
+
+        Infrastructure.setCanCallerThreadBeBlockedSupplier(new BooleanSupplier() {
+            @Override
+            public boolean getAsBoolean() {
+                /*
+                 * So far all threads and Vert.x worker threads can block, but Vert.x event-loop threads must not block.
+                 * It is safe to detect Vert.x event-loop threads by naming convention.
+                 *
+                 * It also avoids adding a dependency of this extension on the Vert.x APIs to check if we are
+                 * calling from a Vert.x event-loop context / thread.
+                 */
+                String threadName = Thread.currentThread().getName();
+                return !threadName.startsWith(VERTX_EVENT_LOOP_THREAD_PREFIX);
+            }
+        });
+    }
 }
diff --git a/extensions/narayana-jta/deployment/pom.xml b/extensions/narayana-jta/deployment/pom.xml
index dee4e449c3309..b9818008a7973 100644
--- a/extensions/narayana-jta/deployment/pom.xml
+++ b/extensions/narayana-jta/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-narayana-jta-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java b/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java
index f535fbdc35369..9636f826fa5a5 100644
--- a/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java
+++ b/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java
@@ -4,11 +4,16 @@
 
 import java.util.Properties;
 
+import javax.annotation.Priority;
+import javax.interceptor.Interceptor;
 import javax.transaction.TransactionScoped;
 
 import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
 import com.arjuna.ats.internal.arjuna.coordinator.CheckedActionFactoryImple;
 import com.arjuna.ats.internal.arjuna.objectstore.ShadowNoFileLockStore;
+import com.arjuna.ats.internal.arjuna.utils.SocketProcessId;
+import com.arjuna.ats.internal.jta.recovery.arjunacore.CommitMarkableResourceRecordRecoveryModule;
+import com.arjuna.ats.internal.jta.recovery.arjunacore.RecoverConnectableAtomicAction;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple;
@@ -16,10 +21,15 @@
 import com.arjuna.common.util.propertyservice.PropertiesFactory;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.ContextRegistrarBuildItem;
-import io.quarkus.arc.processor.ContextRegistrar;
+import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem;
+import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem.ContextConfiguratorBuildItem;
+import io.quarkus.arc.deployment.CustomScopeBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.IsTest;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
@@ -28,20 +38,25 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.narayana.jta.runtime.CDIDelegatingTransactionManager;
 import io.quarkus.narayana.jta.runtime.NarayanaJtaProducers;
 import io.quarkus.narayana.jta.runtime.NarayanaJtaRecorder;
 import io.quarkus.narayana.jta.runtime.TransactionManagerConfiguration;
 import io.quarkus.narayana.jta.runtime.context.TransactionContext;
+import io.quarkus.narayana.jta.runtime.interceptor.TestTransactionInterceptor;
 import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorMandatory;
 import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorNever;
 import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorNotSupported;
 import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorRequired;
 import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorRequiresNew;
 import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorSupports;
+import io.smallrye.context.jta.context.propagation.JtaContextProvider;
 
 class NarayanaJtaProcessor {
 
+    private static final String TEST_TRANSACTION = "io.quarkus.test.TestTransaction";
+
     @BuildStep
     public NativeImageSystemPropertyBuildItem nativeImageSystemPropertyBuildItem() {
         return new NativeImageSystemPropertyBuildItem("CoordinatorEnvironmentBean.transactionStatusManagerEnable", "false");
@@ -63,15 +78,21 @@ public void build(NarayanaJtaRecorder recorder,
         feature.produce(new FeatureBuildItem(Feature.NARAYANA_JTA));
         additionalBeans.produce(new AdditionalBeanBuildItem(NarayanaJtaProducers.class));
         additionalBeans.produce(new AdditionalBeanBuildItem(CDIDelegatingTransactionManager.class));
+
         runtimeInit.produce(new RuntimeInitializedClassBuildItem(
                 "com.arjuna.ats.internal.jta.resources.arjunacore.CommitMarkableResourceRecord"));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem(SocketProcessId.class.getName()));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem(CommitMarkableResourceRecordRecoveryModule.class.getName()));
+        runtimeInit.produce(new RuntimeInitializedClassBuildItem(RecoverConnectableAtomicAction.class.getName()));
+
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, JTAEnvironmentBean.class.getName(),
                 UserTransactionImple.class.getName(),
                 CheckedActionFactoryImple.class.getName(),
                 TransactionManagerImple.class.getName(),
                 TransactionSynchronizationRegistryImple.class.getName(),
                 ObjectStoreEnvironmentBean.class.getName(),
-                ShadowNoFileLockStore.class.getName()));
+                ShadowNoFileLockStore.class.getName(),
+                SocketProcessId.class.getName()));
 
         AdditionalBeanBuildItem.Builder builder = AdditionalBeanBuildItem.builder();
         builder.addBeanClass(TransactionalInterceptorSupports.class);
@@ -94,18 +115,42 @@ public void build(NarayanaJtaRecorder recorder,
         recorder.disableTransactionStatusManager();
         recorder.setNodeName(transactions);
         recorder.setDefaultTimeout(transactions);
+        recorder.setConfig(transactions);
+    }
+
+    @BuildStep(onlyIf = IsTest.class)
+    void testTx(BuildProducer<GeneratedBeanBuildItem> generatedBeanBuildItemBuildProducer,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        //generate the annotated interceptor with gizmo
+        //all the logic is in the parent, but we don't have access to the
+        //binding annotation here
+        try (ClassCreator c = ClassCreator.builder()
+                .classOutput(new GeneratedBeanGizmoAdaptor(generatedBeanBuildItemBuildProducer)).className(
+                        TestTransactionInterceptor.class.getName() + "Generated")
+                .superClass(TestTransactionInterceptor.class).build()) {
+            c.addAnnotation(TEST_TRANSACTION);
+            c.addAnnotation(Interceptor.class.getName());
+            c.addAnnotation(Priority.class).addValue("value", Interceptor.Priority.PLATFORM_BEFORE + 200);
+        }
+        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(TestTransactionInterceptor.class)
+                .addBeanClass(TEST_TRANSACTION).build());
+    }
+
+    @BuildStep
+    public ContextConfiguratorBuildItem transactionContext(ContextRegistrationPhaseBuildItem contextRegistrationPhase) {
+        return new ContextConfiguratorBuildItem(contextRegistrationPhase.getContext()
+                .configure(TransactionScoped.class).normal().contextClass(TransactionContext.class));
+    }
+
+    @BuildStep
+    public CustomScopeBuildItem registerScope() {
+        return new CustomScopeBuildItem(TransactionScoped.class);
     }
 
     @BuildStep
-    public void transactionContext(
-            BuildProducer<ContextRegistrarBuildItem> contextRegistry) {
-
-        contextRegistry.produce(new ContextRegistrarBuildItem(new ContextRegistrar() {
-            @Override
-            public void register(RegistrationContext registrationContext) {
-                registrationContext.configure(TransactionScoped.class).normal().contextClass(TransactionContext.class).done();
-            }
-        }, TransactionScoped.class));
+    UnremovableBeanBuildItem unremovableBean() {
+        // LifecycleManager comes from smallrye-context-propagation-jta and is only used via programmatic lookup in JtaContextProvider
+        return UnremovableBeanBuildItem.beanClassNames(JtaContextProvider.LifecycleManager.class.getName());
     }
 
 }
diff --git a/extensions/narayana-jta/pom.xml b/extensions/narayana-jta/pom.xml
index 4fa914f5a747f..1391a5a3ebd55 100644
--- a/extensions/narayana-jta/pom.xml
+++ b/extensions/narayana-jta/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml
index 2358f1f8b0caf..e3579a28a6702 100644
--- a/extensions/narayana-jta/runtime/pom.xml
+++ b/extensions/narayana-jta/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-narayana-jta-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -51,6 +50,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.narayana.jta</groupId>
diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java
index bae975ce101e9..65fef0bd65b9f 100644
--- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java
+++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java
@@ -67,4 +67,8 @@ public void disableTransactionStatusManager() {
         arjPropertyManager.getCoordinatorEnvironmentBean()
                 .setTransactionStatusManagerEnable(false);
     }
+
+    public void setConfig(final TransactionManagerConfiguration transactions) {
+        arjPropertyManager.getObjectStoreEnvironmentBean().setObjectStoreDir(transactions.objectStoreDirectory);
+    }
 }
diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionManagerConfiguration.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionManagerConfiguration.java
index 28953f20b7080..949f00141da22 100644
--- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionManagerConfiguration.java
+++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/TransactionManagerConfiguration.java
@@ -23,4 +23,12 @@ public final class TransactionManagerConfiguration {
      */
     @ConfigItem(defaultValue = "60")
     public Optional<Duration> defaultTransactionTimeout;
+
+    /**
+     * The directory name of location of the transaction logs.
+     * If the value is not absolute then the directory is relative
+     * to the <em>user.dir</em> system property.
+     */
+    @ConfigItem(defaultValue = "ObjectStore")
+    public String objectStoreDirectory;
 }
diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java
index 990f5c8102c64..83c1c3f58fa8b 100644
--- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java
+++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/context/TransactionContext.java
@@ -9,7 +9,9 @@
 import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
+import javax.transaction.RollbackException;
 import javax.transaction.Status;
+import javax.transaction.Synchronization;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
@@ -70,7 +72,7 @@ public ContextState getState() {
         TransactionContextState contextState = (TransactionContextState) transactionSynchronizationRegistry
                 .getResource(TRANSACTION_CONTEXT_MARKER);
         if (contextState == null) {
-            result = new TransactionContextState();
+            result = new TransactionContextState(getCurrentTransaction());
         } else {
             result = contextState;
         }
@@ -97,7 +99,7 @@ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContex
                 .getResource(TRANSACTION_CONTEXT_MARKER);
 
         if (contextState == null) {
-            contextState = new TransactionContextState();
+            contextState = new TransactionContextState(getCurrentTransaction());
             transactionSynchronizationRegistry.putResource(TRANSACTION_CONTEXT_MARKER, contextState);
         }
 
@@ -158,10 +160,18 @@ private Transaction getCurrentTransaction() {
      * Representing of the context state. It's a container for all available beans in the context.
      * It's filled during bean usage and cleared on destroy.
      */
-    private static class TransactionContextState implements ContextState {
+    private static class TransactionContextState implements ContextState, Synchronization {
 
         private final ConcurrentMap<Contextual<?>, ContextInstanceHandle<?>> mapBeanToInstanceHandle = new ConcurrentHashMap<>();
 
+        TransactionContextState(Transaction transaction) {
+            try {
+                transaction.registerSynchronization(this);
+            } catch (RollbackException | SystemException e) {
+                throw new RuntimeException("Cannot register synchronization", e);
+            }
+        }
+
         /**
          * Put the contextual bean and its handle to the container.
          *
@@ -178,7 +188,10 @@ <T> void put(Contextual<T> bean, ContextInstanceHandle<T> handle) {
          * @param bean contextual bean instance
          */
         <T> void remove(Contextual<T> bean) {
-            mapBeanToInstanceHandle.remove(bean);
+            ContextInstanceHandle<?> instance = mapBeanToInstanceHandle.remove(bean);
+            if (instance != null) {
+                instance.destroy();
+            }
         }
 
         /**
@@ -212,5 +225,13 @@ public Map<InjectableBean<?>, Object> getContextualInstances() {
                     .collect(Collectors.toMap(ContextInstanceHandle::getBean, ContextInstanceHandle::get));
         }
 
+        @Override
+        public void beforeCompletion() {
+        }
+
+        @Override
+        public void afterCompletion(int status) {
+            this.destroy();
+        }
     }
 }
diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java
new file mode 100644
index 0000000000000..4e3b0f770b5db
--- /dev/null
+++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TestTransactionInterceptor.java
@@ -0,0 +1,46 @@
+package io.quarkus.narayana.jta.runtime.interceptor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
+
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+import javax.transaction.UserTransaction;
+
+import io.quarkus.narayana.jta.runtime.test.TestTransactionCallback;
+
+public class TestTransactionInterceptor {
+
+    static final List<TestTransactionCallback> CALLBACKS;
+
+    static {
+        List<TestTransactionCallback> callbacks = new ArrayList<>();
+        for (TestTransactionCallback i : ServiceLoader.load(TestTransactionCallback.class)) {
+            callbacks.add(i);
+        }
+        CALLBACKS = callbacks;
+    }
+
+    @Inject
+    UserTransaction userTransaction;
+
+    @AroundInvoke
+    public Object intercept(InvocationContext context) throws Exception {
+        try {
+            userTransaction.begin();
+            for (TestTransactionCallback i : CALLBACKS) {
+                i.postBegin();
+            }
+            Object result = context.proceed();
+            for (TestTransactionCallback i : CALLBACKS) {
+                i.preRollback();
+            }
+            return result;
+        } finally {
+            userTransaction.rollback();
+        }
+    }
+
+}
diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java
index ba67fde04a12a..24b599c3e6e32 100644
--- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java
+++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java
@@ -301,17 +301,19 @@ protected void handleException(InvocationContext ic, Exception e, Transaction tx
 
     protected void endTransaction(TransactionManager tm, Transaction tx, RunnableWithException afterEndTransaction)
             throws Exception {
-        if (tx != tm.getTransaction()) {
-            throw new RuntimeException(jtaLogger.i18NLogger.get_wrong_tx_on_thread());
-        }
+        try {
+            if (tx != tm.getTransaction()) {
+                throw new RuntimeException(jtaLogger.i18NLogger.get_wrong_tx_on_thread());
+            }
 
-        if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
-            tm.rollback();
-        } else {
-            tm.commit();
+            if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
+                tm.rollback();
+            } else {
+                tm.commit();
+            }
+        } finally {
+            afterEndTransaction.run();
         }
-
-        afterEndTransaction.run();
     }
 
     protected boolean setUserTransactionAvailable(boolean available) {
diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/test/TestTransactionCallback.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/test/TestTransactionCallback.java
new file mode 100644
index 0000000000000..411f3aad1e877
--- /dev/null
+++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/test/TestTransactionCallback.java
@@ -0,0 +1,9 @@
+package io.quarkus.narayana.jta.runtime.test;
+
+public interface TestTransactionCallback {
+
+    void postBegin();
+
+    void preRollback();
+
+}
diff --git a/extensions/narayana-stm/deployment/pom.xml b/extensions/narayana-stm/deployment/pom.xml
index 73191cd78faa6..acdb5d885726b 100644
--- a/extensions/narayana-stm/deployment/pom.xml
+++ b/extensions/narayana-stm/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-narayana-stm-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Narayana STM - Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
diff --git a/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java b/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java
index 4feec5bfea361..b23e3d0b602fa 100644
--- a/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java
+++ b/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java
@@ -38,12 +38,6 @@ class NarayanaSTMProcessor {
     @Inject
     CombinedIndexBuildItem combinedIndexBuildItem;
 
-    @Inject
-    BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchyClass;
-
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-
     // register classes in need of reflection
     @BuildStep
     ReflectiveClassBuildItem registerFeature(BuildProducer<FeatureBuildItem> feature) {
@@ -72,7 +66,9 @@ public void configureRuntimeProperties(NarayanaSTMRecorder recorder) {
 
     // register STM dynamic proxies
     @BuildStep
-    NativeImageProxyDefinitionBuildItem stmProxies() {
+    NativeImageProxyDefinitionBuildItem stmProxies(
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchyClass,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         final DotName TRANSACTIONAL = DotName.createSimple(Transactional.class.getName());
         IndexView index = combinedIndexBuildItem.getIndex();
         Collection<String> proxies = new ArrayList<>();
@@ -87,7 +83,10 @@ NativeImageProxyDefinitionBuildItem stmProxies() {
 
                 for (ClassInfo ci : index.getAllKnownImplementors(name)) {
                     reflectiveHierarchyClass.produce(
-                            new ReflectiveHierarchyBuildItem(Type.create(ci.name(), Type.Kind.CLASS)));
+                            new ReflectiveHierarchyBuildItem.Builder()
+                                    .type(Type.create(ci.name(), Type.Kind.CLASS))
+                                    .source(getClass().getSimpleName() + " > " + ci.name())
+                                    .build());
                 }
             }
         }
diff --git a/extensions/narayana-stm/pom.xml b/extensions/narayana-stm/pom.xml
index a27d6689b6837..83d7fa89bae84 100644
--- a/extensions/narayana-stm/pom.xml
+++ b/extensions/narayana-stm/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/narayana-stm/runtime/pom.xml b/extensions/narayana-stm/runtime/pom.xml
index 716bc04f977d1..c9553916c154c 100644
--- a/extensions/narayana-stm/runtime/pom.xml
+++ b/extensions/narayana-stm/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-narayana-stm-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,11 +19,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverBuildItem.java b/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverBuildItem.java
new file mode 100644
index 0000000000000..5e16b90a01950
--- /dev/null
+++ b/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverBuildItem.java
@@ -0,0 +1,22 @@
+package io.quarkus.neo4j.deployment;
+
+import org.neo4j.driver.Driver;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+
+/**
+ * Allows access to the Neo4j Driver instance from within other extensions.
+ */
+public final class Neo4jDriverBuildItem extends SimpleBuildItem {
+
+    private final RuntimeValue<Driver> value;
+
+    public Neo4jDriverBuildItem(RuntimeValue<Driver> value) {
+        this.value = value;
+    }
+
+    public RuntimeValue<Driver> getValue() {
+        return value;
+    }
+}
diff --git a/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java b/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java
index 82dfef663a3e5..ea9e3929f2653 100644
--- a/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java
+++ b/extensions/neo4j/deployment/src/main/java/io/quarkus/neo4j/deployment/Neo4jDriverProcessor.java
@@ -1,5 +1,9 @@
 package io.quarkus.neo4j.deployment;
 
+import java.util.function.Consumer;
+
+import org.neo4j.driver.Driver;
+
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.deployment.Feature;
@@ -10,9 +14,12 @@
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem;
 import io.quarkus.neo4j.runtime.Neo4jConfiguration;
 import io.quarkus.neo4j.runtime.Neo4jDriverProducer;
 import io.quarkus.neo4j.runtime.Neo4jDriverRecorder;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
 
 class Neo4jDriverProcessor {
@@ -33,11 +40,13 @@ AdditionalBeanBuildItem createDriverProducer() {
 
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
-    void configureDriverProducer(Neo4jDriverRecorder recorder, BeanContainerBuildItem beanContainerBuildItem,
+    Neo4jDriverBuildItem configureDriverProducer(Neo4jDriverRecorder recorder, BeanContainerBuildItem beanContainerBuildItem,
             Neo4jConfiguration configuration,
             ShutdownContextBuildItem shutdownContext) {
 
-        recorder.configureNeo4jProducer(beanContainerBuildItem.getValue(), configuration, shutdownContext);
+        RuntimeValue<Driver> driverHolder = recorder.initializeDriver(configuration, shutdownContext);
+        recorder.configureNeo4jProducer(beanContainerBuildItem.getValue(), driverHolder);
+        return new Neo4jDriverBuildItem(driverHolder);
     }
 
     @BuildStep
@@ -45,4 +54,17 @@ HealthBuildItem addHealthCheck(Neo4jBuildTimeConfig buildTimeConfig) {
         return new HealthBuildItem("io.quarkus.neo4j.runtime.health.Neo4jHealthCheck",
                 buildTimeConfig.healthEnabled);
     }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void metrics(Neo4jConfiguration configuration,
+            Neo4jDriverRecorder recorder,
+            BuildProducer<MetricsFactoryConsumerBuildItem> metrics) {
+        Consumer<MetricsFactory> metricsFactoryConsumer = recorder.registerMetrics(configuration);
+        // If metrics for neo4j are disabled, the returned consumer will be null,
+        // but in a processor we can't know that (it's controlled by a runtime config property)
+        // so the BuildItem might contain null and in that case will be ignored by the metrics recorder
+        metrics.produce(new MetricsFactoryConsumerBuildItem(metricsFactoryConsumer));
+    }
+
 }
diff --git a/extensions/neo4j/pom.xml b/extensions/neo4j/pom.xml
index 536f4cec97892..93d6941a35b2f 100644
--- a/extensions/neo4j/pom.xml
+++ b/extensions/neo4j/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/neo4j/runtime/pom.xml b/extensions/neo4j/runtime/pom.xml
index 9c686eabbda96..25af1e951ea79 100644
--- a/extensions/neo4j/runtime/pom.xml
+++ b/extensions/neo4j/runtime/pom.xml
@@ -26,15 +26,17 @@
             <artifactId>quarkus-smallrye-health</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.neo4j.driver</groupId>
             <artifactId>neo4j-java-driver</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jConfiguration.java b/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jConfiguration.java
index 0f317d79eb935..ecee639bdc1b2 100644
--- a/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jConfiguration.java
+++ b/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jConfiguration.java
@@ -1,6 +1,11 @@
 package io.quarkus.neo4j.runtime;
 
+import java.io.File;
+import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Optional;
+
+import org.neo4j.driver.Config;
 
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigGroup;
@@ -28,6 +33,19 @@ public class Neo4jConfiguration {
     @ConfigDocSection
     public Authentication authentication;
 
+    /**
+     * If the driver should use encrypted traffic.
+     */
+    @ConfigItem
+    public boolean encrypted;
+
+    /**
+     * Configure trust settings for encrypted traffic.
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public TrustSettings trustSettings;
+
     /**
      * Connection pool.
      */
@@ -54,7 +72,67 @@ static class Authentication {
          * Set this to true to disable authentication.
          */
         @ConfigItem
-        public boolean disabled = false;
+        public boolean disabled;
+    }
+
+    @ConfigGroup
+    static class TrustSettings {
+
+        public enum Strategy {
+
+            TRUST_ALL_CERTIFICATES,
+
+            TRUST_CUSTOM_CA_SIGNED_CERTIFICATES,
+
+            TRUST_SYSTEM_CA_SIGNED_CERTIFICATES
+        }
+
+        /**
+         * Configures which trust strategy to apply when using encrypted traffic.
+         */
+        @ConfigItem(defaultValue = "TRUST_SYSTEM_CA_SIGNED_CERTIFICATES")
+        public Strategy strategy;
+
+        /**
+         * The file of the certificate to use.
+         */
+        @ConfigItem
+        public Optional<Path> certFile = Optional.empty();
+
+        /**
+         * If hostname verification is used.
+         */
+        @ConfigItem
+        public boolean hostnameVerificationEnabled;
+
+        Config.TrustStrategy toInternalRepresentation() {
+
+            Config.TrustStrategy internalRepresentation;
+            Strategy nonNullStrategy = strategy == null ? Strategy.TRUST_SYSTEM_CA_SIGNED_CERTIFICATES : strategy;
+            switch (nonNullStrategy) {
+                case TRUST_ALL_CERTIFICATES:
+                    internalRepresentation = Config.TrustStrategy.trustAllCertificates();
+                    break;
+                case TRUST_SYSTEM_CA_SIGNED_CERTIFICATES:
+                    internalRepresentation = Config.TrustStrategy.trustSystemCertificates();
+                    break;
+                case TRUST_CUSTOM_CA_SIGNED_CERTIFICATES:
+
+                    File certFile = this.certFile.map(Path::toFile).filter(File::isFile)
+                            .orElseThrow(() -> new RuntimeException("Configured trust strategy requires a certificate file."));
+                    internalRepresentation = Config.TrustStrategy.trustCustomCertificateSignedBy(certFile);
+                    break;
+                default:
+                    throw new RuntimeException("Unknown trust strategy: " + this.strategy.name());
+            }
+
+            if (hostnameVerificationEnabled) {
+                internalRepresentation.withHostnameVerification();
+            } else {
+                internalRepresentation.withoutHostnameVerification();
+            }
+            return internalRepresentation;
+        }
     }
 
     @ConfigGroup
diff --git a/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jDriverRecorder.java b/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jDriverRecorder.java
index 6e7d4da72d5ba..f4a5fe1218da4 100644
--- a/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jDriverRecorder.java
+++ b/extensions/neo4j/runtime/src/main/java/io/quarkus/neo4j/runtime/Neo4jDriverRecorder.java
@@ -2,6 +2,8 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 
 import org.graalvm.nativeimage.ImageInfo;
@@ -9,13 +11,17 @@
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.AuthTokens;
 import org.neo4j.driver.Config;
+import org.neo4j.driver.ConnectionPoolMetrics;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.GraphDatabase;
 import org.neo4j.driver.Logging;
 
+import io.quarkus.arc.Arc;
 import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.quarkus.runtime.ssl.SslContextConfiguration;
 
 @Recorder
@@ -23,17 +29,7 @@ public class Neo4jDriverRecorder {
 
     private static final Logger log = Logger.getLogger(Neo4jDriverRecorder.class);
 
-    public void configureNeo4jProducer(BeanContainer beanContainer, Neo4jConfiguration configuration,
-            ShutdownContext shutdownContext) {
-
-        Driver driver = initializeDriver(configuration, shutdownContext);
-
-        Neo4jDriverProducer driverProducer = beanContainer.instance(Neo4jDriverProducer.class);
-        driverProducer.initialize(driver);
-    }
-
-    private Driver initializeDriver(Neo4jConfiguration configuration,
-            ShutdownContext shutdownContext) {
+    public RuntimeValue<Driver> initializeDriver(Neo4jConfiguration configuration, ShutdownContext shutdownContext) {
 
         String uri = configuration.uri;
         AuthToken authToken = AuthTokens.none();
@@ -42,12 +38,68 @@ private Driver initializeDriver(Neo4jConfiguration configuration,
         }
 
         Config.ConfigBuilder configBuilder = createBaseConfig();
-        configureSsl(configBuilder);
+        configureSsl(configBuilder, configuration);
         configurePoolSettings(configBuilder, configuration.pool);
 
         Driver driver = GraphDatabase.driver(uri, authToken, configBuilder.build());
         shutdownContext.addShutdownTask(driver::close);
-        return driver;
+        return new RuntimeValue<>(driver);
+    }
+
+    public void configureNeo4jProducer(BeanContainer beanContainer, RuntimeValue<Driver> driverHolder) {
+        Neo4jDriverProducer driverProducer = beanContainer.instance(Neo4jDriverProducer.class);
+        driverProducer.initialize(driverHolder.getValue());
+    }
+
+    public Consumer<MetricsFactory> registerMetrics(Neo4jConfiguration configuration) {
+        if (configuration.pool != null && configuration.pool.metricsEnabled) {
+            return new Consumer<MetricsFactory>() {
+                @Override
+                public void accept(MetricsFactory metricsFactory) {
+                    // if the pool hasn't been used yet, the ConnectionPoolMetrics object doesn't exist, so use zeros instead
+                    metricsFactory.builder("neo4j.acquired").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::acquired).orElse(0L));
+                    metricsFactory.builder("neo4j.acquiring").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::acquiring).orElse(0));
+                    metricsFactory.builder("neo4j.closed").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::closed).orElse(0L));
+                    metricsFactory.builder("neo4j.created").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::created).orElse(0L));
+                    metricsFactory.builder("neo4j.creating").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::creating).orElse(0));
+                    metricsFactory.builder("neo4j.failedToCreate").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::failedToCreate).orElse(0L));
+                    metricsFactory.builder("neo4j.timedOutToAcquire").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::timedOutToAcquire).orElse(0L));
+                    metricsFactory.builder("neo4j.totalAcquisitionTime").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::totalAcquisitionTime).orElse(0L));
+                    metricsFactory.builder("neo4j.totalConnectionTime").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::totalConnectionTime).orElse(0L));
+                    metricsFactory.builder("neo4j.totalInUseCount").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::totalInUseCount).orElse(0L));
+                    metricsFactory.builder("neo4j.totalInUseTime").buildCounter(
+                            () -> getConnectionPoolMetrics().map(ConnectionPoolMetrics::totalInUseCount).orElse(0L));
+                }
+            };
+        } else {
+            return null;
+        }
+    }
+
+    // Until the pool is actually used for the first time, the ConnectionPoolMetrics object does not exist,
+    // so this will be populated later
+    private static Optional<ConnectionPoolMetrics> connectionPoolMetrics = Optional.empty();
+
+    private synchronized Optional<ConnectionPoolMetrics> getConnectionPoolMetrics() {
+        if (!connectionPoolMetrics.isPresent()) {
+            connectionPoolMetrics = Arc.container().instance(Driver.class)
+                    .get()
+                    .metrics()
+                    .connectionPoolMetrics()
+                    .stream()
+                    .findFirst();
+        }
+        return connectionPoolMetrics;
     }
 
     private static Config.ConfigBuilder createBaseConfig() {
@@ -62,13 +114,21 @@ private static Config.ConfigBuilder createBaseConfig() {
         return configBuilder;
     }
 
-    private static void configureSsl(Config.ConfigBuilder configBuilder) {
+    private static void configureSsl(Config.ConfigBuilder configBuilder,
+            Neo4jConfiguration configuration) {
 
         // Disable encryption regardless of user configuration when ssl is not natively enabled.
         if (ImageInfo.inImageRuntimeCode() && !SslContextConfiguration.isSslNativeEnabled()) {
             log.warn(
-                    "Native SSL is disabled, communication between this client and the Neo4j server won't be encrypted.");
+                    "Native SSL is disabled, communication between this client and the Neo4j server cannot be encrypted.");
             configBuilder.withoutEncryption();
+        } else {
+            if (configuration.encrypted) {
+                configBuilder.withEncryption();
+                configBuilder.withTrustStrategy(configuration.trustSettings.toInternalRepresentation());
+            } else {
+                configBuilder.withoutEncryption();
+            }
         }
     }
 
diff --git a/extensions/neo4j/runtime/src/test/java/io/quarkus/neo4j/runtime/Neo4jConfigurationTest.java b/extensions/neo4j/runtime/src/test/java/io/quarkus/neo4j/runtime/Neo4jConfigurationTest.java
new file mode 100644
index 0000000000000..80d8e2c8ff674
--- /dev/null
+++ b/extensions/neo4j/runtime/src/test/java/io/quarkus/neo4j/runtime/Neo4jConfigurationTest.java
@@ -0,0 +1,90 @@
+package io.quarkus.neo4j.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.neo4j.driver.Config;
+
+import io.quarkus.neo4j.runtime.Neo4jConfiguration.TrustSettings;
+
+class Neo4jConfigurationTest {
+
+    @Nested
+    class TrustSettingsTest {
+
+        @Test
+        void defaultsShouldWork() {
+
+            TrustSettings trustSettings = new TrustSettings();
+
+            Config.TrustStrategy internalRepresentation = trustSettings.toInternalRepresentation();
+            assertFalse(internalRepresentation.isHostnameVerificationEnabled());
+            assertEquals(Config.TrustStrategy.Strategy.TRUST_SYSTEM_CA_SIGNED_CERTIFICATES,
+                    internalRepresentation.strategy());
+        }
+
+        @Test
+        void trustAllSettingShouldWork() {
+
+            TrustSettings trustSettings = new TrustSettings();
+            trustSettings.strategy = TrustSettings.Strategy.TRUST_ALL_CERTIFICATES;
+
+            Config.TrustStrategy internalRepresentation = trustSettings.toInternalRepresentation();
+            assertEquals(Config.TrustStrategy.Strategy.TRUST_ALL_CERTIFICATES, internalRepresentation.strategy());
+        }
+
+        @Test
+        void hostnameVerificationSettingShouldWork() {
+
+            TrustSettings trustSettings = new TrustSettings();
+            trustSettings.hostnameVerificationEnabled = true;
+
+            Config.TrustStrategy internalRepresentation = trustSettings.toInternalRepresentation();
+            assertTrue(internalRepresentation.isHostnameVerificationEnabled());
+        }
+
+        @Test
+        void customCaShouldRequireCertFile() {
+
+            TrustSettings trustSettings = new TrustSettings();
+            trustSettings.strategy = TrustSettings.Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES;
+
+            String msg = assertThrows(RuntimeException.class, () -> trustSettings.toInternalRepresentation())
+                    .getMessage();
+            assertEquals("Configured trust strategy requires a certificate file.", msg);
+        }
+
+        @Test
+        void customCaShouldRequireExistingCertFile() {
+
+            TrustSettings trustSettings = new TrustSettings();
+            trustSettings.strategy = TrustSettings.Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES;
+            trustSettings.certFile = Optional.of(Paths.get("na"));
+
+            String msg = assertThrows(RuntimeException.class, () -> trustSettings.toInternalRepresentation())
+                    .getMessage();
+            assertEquals("Configured trust strategy requires a certificate file.", msg);
+        }
+
+        @Test
+        void trustCustomCaSettingShouldWork() throws IOException {
+
+            TrustSettings trustSettings = new TrustSettings();
+            trustSettings.strategy = TrustSettings.Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES;
+            trustSettings.certFile = Optional.of(Files.createTempFile("quarkus-neo4j-test", ".cert"));
+
+            Config.TrustStrategy internalRepresentation = trustSettings.toInternalRepresentation();
+            assertEquals(Config.TrustStrategy.Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES,
+                    internalRepresentation.strategy());
+        }
+    }
+}
diff --git a/extensions/netty/deployment/pom.xml b/extensions/netty/deployment/pom.xml
index d767452c4da7f..52f243a900bfa 100644
--- a/extensions/netty/deployment/pom.xml
+++ b/extensions/netty/deployment/pom.xml
@@ -13,10 +13,6 @@
     <name>Quarkus - Netty - Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-netty</artifactId>
diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java
index 91aa1cc67eff3..302aa49f319bb 100644
--- a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java
+++ b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java
@@ -6,7 +6,6 @@
 import java.util.Random;
 import java.util.function.Supplier;
 
-import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.jboss.logging.Logger;
@@ -42,9 +41,6 @@ class NettyProcessor {
         InternalLoggerFactory.setDefaultFactory(new JBossNettyLoggerFactory());
     }
 
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-
     @BuildStep
     public NativeImageSystemPropertyBuildItem limitMem() {
         //in native mode we limit the size of the epoll array
@@ -74,11 +70,12 @@ public SystemPropertyBuildItem setNettyMachineId() {
     }
 
     @BuildStep
-    NativeImageConfigBuildItem build() {
+    NativeImageConfigBuildItem build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
 
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, "io.netty.channel.socket.nio.NioSocketChannel"));
         reflectiveClass
                 .produce(new ReflectiveClassBuildItem(false, false, "io.netty.channel.socket.nio.NioServerSocketChannel"));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, "io.netty.channel.socket.nio.NioDatagramChannel"));
         reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, "java.util.LinkedHashMap"));
         reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, "sun.nio.ch.SelectorImpl"));
 
diff --git a/extensions/netty/pom.xml b/extensions/netty/pom.xml
index e351a60c21362..d91ab1ed7b886 100644
--- a/extensions/netty/pom.xml
+++ b/extensions/netty/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/netty/runtime/pom.xml b/extensions/netty/runtime/pom.xml
index c64df1847650a..880977accf3a0 100644
--- a/extensions/netty/runtime/pom.xml
+++ b/extensions/netty/runtime/pom.xml
@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -38,6 +38,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java
index bb629e7d0c268..cd73b7fc2cb2b 100644
--- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java
+++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java
@@ -4,7 +4,10 @@
 import java.security.PrivateKey;
 import java.security.Provider;
 import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.List;
 import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingDeque;
 
 import javax.net.ssl.KeyManagerFactory;
@@ -14,6 +17,7 @@
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.JDK11OrLater;
@@ -53,6 +57,87 @@ private static InternalLoggerFactory newDefaultFactory(String name) {
 // SSL
 // This whole section is mostly about removing static analysis references to openssl/tcnative
 
+@TargetClass(className = "io.netty.handler.ssl.SslProvider")
+final class Target_io_netty_handler_ssl_SslProvider {
+    @Substitute
+    public static boolean isAlpnSupported(final SslProvider provider) {
+        switch (provider) {
+            case JDK:
+                return Target_io_netty_handler_ssl_JdkAlpnApplicationProtocolNegotiator.isAlpnSupported();
+            case OPENSSL:
+            case OPENSSL_REFCNT:
+                return false;
+            default:
+                throw new Error("SslProvider unsupported on Quarkus " + provider);
+        }
+    }
+}
+
+@TargetClass(className = "io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator")
+final class Target_io_netty_handler_ssl_JdkAlpnApplicationProtocolNegotiator {
+    @Alias
+    static boolean isAlpnSupported() {
+        return true;
+    }
+}
+
+/** Hardcode io.netty.handler.ssl.OpenSsl as non-available */
+@TargetClass(className = "io.netty.handler.ssl.OpenSsl")
+final class Target_io_netty_handler_ssl_OpenSsl {
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    private static Throwable UNAVAILABILITY_CAUSE = new RuntimeException("OpenSsl unsupported on Quarkus");
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    static List<String> DEFAULT_CIPHERS = Collections.emptyList();
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    static Set<String> AVAILABLE_CIPHER_SUITES = Collections.emptySet();
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    private static Set<String> AVAILABLE_OPENSSL_CIPHER_SUITES = Collections.emptySet();
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    private static Set<String> AVAILABLE_JAVA_CIPHER_SUITES = Collections.emptySet();
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    private static boolean SUPPORTS_KEYMANAGER_FACTORY = false;
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    private static boolean SUPPORTS_OCSP = false;
+
+    @Alias
+    @RecomputeFieldValue(kind = Kind.FromAlias)
+    static Set<String> SUPPORTED_PROTOCOLS_SET = Collections.emptySet();
+
+    @Substitute
+    public static boolean isAvailable() {
+        return false;
+    }
+
+    @Substitute
+    public static int version() {
+        return -1;
+    }
+
+    @Substitute
+    public static String versionString() {
+        return null;
+    }
+
+    @Substitute
+    public static boolean isCipherSuiteAvailable(String cipherSuite) {
+        return false;
+    }
+}
+
 @TargetClass(className = "io.netty.handler.ssl.JdkSslServerContext")
 final class Target_io_netty_handler_ssl_JdkSslServerContext {
 
diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualAddress.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualAddress.java
index 11dbac57eacf7..e2117e3244ffc 100644
--- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualAddress.java
+++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualAddress.java
@@ -5,7 +5,7 @@
  * 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
+ *   https://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
diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannel.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannel.java
index ae3038493172e..781abf7e07924 100644
--- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannel.java
+++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannel.java
@@ -5,7 +5,7 @@
  * 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
+ *   https://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
diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannelRegistry.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannelRegistry.java
index 6ee9f18ba1b2e..a15d6431ef232 100644
--- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannelRegistry.java
+++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualChannelRegistry.java
@@ -5,7 +5,7 @@
  * 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
+ *   https://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
diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualServerChannel.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualServerChannel.java
index 52a5c744c83a1..ce894e11cf7cb 100644
--- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualServerChannel.java
+++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/virtual/VirtualServerChannel.java
@@ -5,7 +5,7 @@
  * 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
+ *   https://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
diff --git a/extensions/oidc-client-filter/deployment/pom.xml b/extensions/oidc-client-filter/deployment/pom.xml
new file mode 100644
index 0000000000000..c6049c6a6fc4f
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/pom.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-client-filter-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-client-filter-deployment</artifactId>
+    <name>Quarkus - OpenID Connect Client Filter - Deployment</name>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+        </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>test-keycloak</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-keycloak</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <keycloak.url>http://localhost:8180/auth</keycloak.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${keycloak.docker.image}</name>
+                                    <alias>quarkus-test-keycloak</alias>
+                                    <run>
+                                        <ports>
+                                            <port>8180:8080</port>
+                                        </ports>
+                                        <env>
+                                            <KEYCLOAK_USER>admin</KEYCLOAK_USER>
+                                            <KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
+                                        </env>
+                                        <log>
+                                            <prefix>Keycloak:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
+                                            <http>
+                                                <url>http://localhost:8180</url>
+                                            </http>
+                                            <time>100000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${basedir}/../../../.github/docker-prune.sh</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+</project>
diff --git a/extensions/oidc-client-filter/deployment/src/main/java/io/quarkus/oidc/client/filter/deployment/OidcClientFilterBuildStep.java b/extensions/oidc-client-filter/deployment/src/main/java/io/quarkus/oidc/client/filter/deployment/OidcClientFilterBuildStep.java
new file mode 100644
index 0000000000000..14062716321f1
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/main/java/io/quarkus/oidc/client/filter/deployment/OidcClientFilterBuildStep.java
@@ -0,0 +1,49 @@
+package io.quarkus.oidc.client.filter.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.EnableAllSecurityServicesBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.oidc.client.deployment.OidcClientBuildStep.IsEnabled;
+import io.quarkus.oidc.client.filter.OidcClientFilter;
+import io.quarkus.oidc.client.filter.OidcClientRequestFilter;
+import io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfig;
+import io.quarkus.restclient.deployment.RestClientAnnotationProviderBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+
+public class OidcClientFilterBuildStep {
+
+    private static final DotName OIDC_CLIENT_FILTER = DotName.createSimple(OidcClientFilter.class.getName());
+
+    OidcClientFilterConfig config;
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.OIDC_CLIENT_FILTER);
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    EnableAllSecurityServicesBuildItem security() {
+        return new EnableAllSecurityServicesBuildItem();
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    void registerProvider(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ResteasyJaxrsProviderBuildItem> jaxrsProviders,
+            BuildProducer<RestClientAnnotationProviderBuildItem> restAnnotationProvider) {
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(OidcClientRequestFilter.class));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, OidcClientRequestFilter.class));
+        if (config.registerFilter) {
+            jaxrsProviders.produce(new ResteasyJaxrsProviderBuildItem(OidcClientRequestFilter.class.getName()));
+        } else {
+            restAnnotationProvider.produce(new RestClientAnnotationProviderBuildItem(OIDC_CLIENT_FILTER,
+                    OidcClientRequestFilter.class));
+        }
+    }
+}
diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java
new file mode 100644
index 0000000000000..36fc4cb8af1fd
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/FrontendResource.java
@@ -0,0 +1,41 @@
+package io.quarkus.oidc.client.filter;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendResource {
+
+    @Inject
+    @RestClient
+    ProtectedResourceService protectedResourceService;
+
+    @GET
+    @Path("user-before-registering-provider")
+    public String userBeforeRegisteringProvider() {
+        try {
+            protectedResourceService.getUserName();
+            throw new InternalServerErrorException("HTTP 401 error is expected");
+        } catch (WebApplicationException ex) {
+            if (ex.getResponse().getStatus() == 401) {
+                throw new NotAuthorizedException(
+                        Response.status(401).entity("ProtectedResourceService requires a token").build());
+            } else {
+                throw new InternalServerErrorException("HTTP 401 error is expected");
+            }
+        }
+    }
+
+    @GET
+    @Path("user-after-registering-provider")
+    public String userAfterRegisteringProvider() {
+        return protectedResourceService.getUserName();
+    }
+}
diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/KeycloakRealmResourceManager.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/KeycloakRealmResourceManager.java
new file mode 100644
index 0000000000000..fa3c7d92adb05
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/KeycloakRealmResourceManager.java
@@ -0,0 +1,141 @@
+package io.quarkus.oidc.client.filter;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RoleRepresentation;
+import org.keycloak.representations.idm.RolesRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus";
+
+    @Override
+    public Map<String, String> start() {
+
+        RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setAccessTokenLifespan(3);
+
+        realm.getClients().add(createClient("quarkus-app"));
+        realm.getUsers().add(createUser("alice", "user"));
+
+        try {
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setUsers(new ArrayList<>());
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+
+        RolesRepresentation roles = new RolesRepresentation();
+        List<RoleRepresentation> realmRoles = new ArrayList<>();
+
+        roles.setRealm(realmRoles);
+        realm.setRoles(roles);
+
+        realm.getRoles().getRealm().add(new RoleRepresentation("user", null, false));
+        realm.getRoles().getRealm().add(new RoleRepresentation("admin", null, false));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static UserRepresentation createUser(String username, String... realmRoles) {
+        UserRepresentation user = new UserRepresentation();
+
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setCredentials(new ArrayList<>());
+        user.setRealmRoles(Arrays.asList(realmRoles));
+        user.setEmail(username + "@gmail.com");
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+
+        credential.setType(CredentialRepresentation.PASSWORD);
+        credential.setValue(username);
+        credential.setTemporary(false);
+
+        user.getCredentials().add(credential);
+
+        return user;
+    }
+
+    @Override
+    public void stop() {
+
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).then().statusCode(204);
+    }
+
+    public static String getAccessToken(String userName) {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", userName)
+                .param("password", userName)
+                .param("client_id", "quarkus-app")
+                .param("client_secret", "secret")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/" + KEYCLOAK_REALM + "/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+}
diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java
new file mode 100644
index 0000000000000..57f661e37def4
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java
@@ -0,0 +1,96 @@
+package io.quarkus.oidc.client.filter;
+
+import static org.awaitility.Awaitility.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.core.ThrowingRunnable;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KeycloakRealmResourceManager.class)
+public class OidcClientFilterDevModeTest {
+
+    private static Class<?>[] testClasses = {
+            FrontendResource.class,
+            ProtectedResource.class,
+            ProtectedResourceService.class
+    };
+
+    @RegisterExtension
+    static final QuarkusDevModeTest test = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-filter.properties", "application.properties"));
+
+    @Test
+    public void testGetUserName() {
+        RestAssured.when().get("/frontend/user-before-registering-provider")
+                .then()
+                .statusCode(401)
+                .body(equalTo("ProtectedResourceService requires a token"));
+        test.modifyResourceFile("application.properties", s -> s.replace("#", ""));
+        // token lifespan (3 secs) is less than the auto-refresh interval so the token should be refreshed immediately 
+        RestAssured.when().get("/frontend/user-after-registering-provider")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+        checkLog();
+    }
+
+    private void checkLog() {
+        final Path logDirectory = Paths.get(".", "target");
+        given().await().pollInterval(100, TimeUnit.MILLISECONDS)
+                .atMost(10, TimeUnit.SECONDS)
+                .untilAsserted(new ThrowingRunnable() {
+                    @Override
+                    public void run() throws Throwable {
+                        Path accessLogFilePath = logDirectory.resolve("quarkus.log");
+                        boolean fileExists = Files.exists(accessLogFilePath);
+                        if (!fileExists) {
+                            accessLogFilePath = logDirectory.resolve("target/quarkus.log");
+                            fileExists = Files.exists(accessLogFilePath);
+                        }
+                        Assertions.assertTrue(Files.exists(accessLogFilePath),
+                                "quarkus log file " + accessLogFilePath + " is missing");
+
+                        int tokenAcquisitionCount = 0;
+                        int tokenRefreshedCount = 0;
+
+                        try (BufferedReader reader = new BufferedReader(
+                                new InputStreamReader(new ByteArrayInputStream(Files.readAllBytes(accessLogFilePath)),
+                                        StandardCharsets.UTF_8))) {
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                if (line.contains("Default OidcClient has refreshed the tokens")) {
+                                    tokenRefreshedCount++;
+                                } else if (line.contains("Default OidcClient has acquired the tokens")) {
+                                    tokenAcquisitionCount++;
+                                }
+
+                            }
+                        }
+                        assertEquals(1, tokenAcquisitionCount,
+                                "Log file must contain a single OidcClientImpl token acquisition confirmation");
+                        assertEquals(1, tokenRefreshedCount,
+                                "Log file must contain a single OidcClientImpl token refresh confirmation");
+                    }
+                });
+    }
+}
diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java
new file mode 100644
index 0000000000000..c30b039aec3be
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.oidc.client.filter;
+
+import java.security.Principal;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/protected")
+@Authenticated
+public class ProtectedResource {
+
+    @Inject
+    Principal principal;
+
+    @GET
+    @RolesAllowed("user")
+    public String principalName() {
+        return principal.getName();
+    }
+}
diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java
new file mode 100644
index 0000000000000..bb305bece578b
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/ProtectedResourceService.java
@@ -0,0 +1,14 @@
+package io.quarkus.oidc.client.filter;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
diff --git a/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties b/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties
new file mode 100644
index 0000000000000..b76713f2a8031
--- /dev/null
+++ b/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties
@@ -0,0 +1,20 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.client-secret.value=${quarkus.oidc.credentials.secret}
+quarkus.oidc-client.credentials.client-secret.method=POST
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=alice
+quarkus.oidc-client.grant-options.password.password=alice
+
+#quarkus.oidc-client-filter.register-filter=true
+quarkus.oidc-client.refresh-token-time-skew=5S
+
+io.quarkus.oidc.client.filter.ProtectedResourceService/mp-rest/url=http://localhost:8080/protected
+quarkus.log.category."io.quarkus.oidc.client.runtime.OidcClientImpl".min-level=TRACE
+quarkus.log.category."io.quarkus.oidc.client.runtime.OidcClientImpl".level=TRACE
+quarkus.log.file.enable=true
+quarkus.log.file.format=%C - %s%n
\ No newline at end of file
diff --git a/extensions/oidc-client-filter/pom.xml b/extensions/oidc-client-filter/pom.xml
new file mode 100644
index 0000000000000..85cafdf27bbef
--- /dev/null
+++ b/extensions/oidc-client-filter/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-client-filter-parent</artifactId>
+    <name>Quarkus - OpenID Connect Oidc Client Filter</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/oidc-client-filter/runtime/pom.xml b/extensions/oidc-client-filter/runtime/pom.xml
new file mode 100644
index 0000000000000..c590a6b40ca15
--- /dev/null
+++ b/extensions/oidc-client-filter/runtime/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-client-filter-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-client-filter</artifactId>
+    <name>Quarkus - OpenID Connect Client Filter - Runtime</name>
+    <description>Use JAX-RS client filter to get and refresh the access tokens and set them as HTTP Authorization Bearer values</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientFilter.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientFilter.java
new file mode 100644
index 0000000000000..65574b10e6f00
--- /dev/null
+++ b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientFilter.java
@@ -0,0 +1,13 @@
+package io.quarkus.oidc.client.filter;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface OidcClientFilter {
+}
diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java
new file mode 100644
index 0000000000000..add3285bb1244
--- /dev/null
+++ b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java
@@ -0,0 +1,41 @@
+package io.quarkus.oidc.client.filter;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.inject.Singleton;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.oidc.client.runtime.AbstractTokensProducer;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+
+@Provider
+@Singleton
+@Priority(Priorities.AUTHENTICATION)
+public class OidcClientRequestFilter extends AbstractTokensProducer implements ClientRequestFilter {
+    private static final Logger LOG = Logger.getLogger(OidcClientRequestFilter.class);
+    private static final String BEARER_SCHEME_WITH_SPACE = OidcConstants.BEARER_SCHEME + " ";
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        try {
+            final String accessToken = getAccessToken();
+            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, BEARER_SCHEME_WITH_SPACE + accessToken);
+        } catch (Exception ex) {
+            LOG.debugf("Access token is not available, aborting the request with HTTP 401 error: %s", ex.getMessage());
+            requestContext.abortWith(Response.status(401).build());
+        }
+    }
+
+    private String getAccessToken() {
+        // It should be reactive when run with Resteasy Reactive
+        return getTokens().await().indefinitely().getAccessToken();
+    }
+}
diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfig.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfig.java
new file mode 100644
index 0000000000000..8751fa885495d
--- /dev/null
+++ b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfig.java
@@ -0,0 +1,15 @@
+package io.quarkus.oidc.client.filter.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "oidc-client-filter", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class OidcClientFilterConfig {
+    /**
+     * Enable OidcClientRequestFilter for all the injected MP RestClient implementations.
+     * If this property is disabled then OidcClientRequestFilter has to be registered as an MP RestClient provider.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean registerFilter;
+}
diff --git a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..66db08ec05c48
--- /dev/null
+++ b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "OpenID Connect Client Filter"
+metadata:
+  keywords:
+  - "oauth2"
+  - "openid-connect"
+  - "oidc"
+  - "oidc-client"
+  - "oidc-client-filter"
+  guide: "https://quarkus.io/guides/security-openid-connect-client"
+  categories:
+  - "security"
+  status: "preview"
diff --git a/extensions/oidc-client/deployment/pom.xml b/extensions/oidc-client/deployment/pom.xml
new file mode 100644
index 0000000000000..971cb04347051
--- /dev/null
+++ b/extensions/oidc-client/deployment/pom.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-client-deployment</artifactId>
+    <name>Quarkus - OpenID Connect Client - Deployment</name>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+        </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                  <exclude>keystore.jks</exclude>
+                </excludes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                  <include>keystore.jks</include>
+                </includes>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>test-keycloak</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-keycloak</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <keycloak.url>http://localhost:8180/auth</keycloak.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${keycloak.docker.image}</name>
+                                    <alias>quarkus-test-keycloak</alias>
+                                    <run>
+                                        <ports>
+                                            <port>8180:8080</port>
+                                        </ports>
+                                        <env>
+                                            <KEYCLOAK_USER>admin</KEYCLOAK_USER>
+                                            <KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
+                                        </env>
+                                        <log>
+                                            <prefix>Keycloak:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
+                                            <http>
+                                                <url>http://localhost:8180</url>
+                                            </http>
+                                            <time>100000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${basedir}/../../../.github/docker-prune.sh</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+</project>
diff --git a/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java b/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java
new file mode 100644
index 0000000000000..054b028aa352e
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/main/java/io/quarkus/oidc/client/deployment/OidcClientBuildStep.java
@@ -0,0 +1,86 @@
+package io.quarkus.oidc.client.deployment;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.BooleanSupplier;
+
+import javax.inject.Singleton;
+
+import io.quarkus.arc.BeanDestroyer;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.EnableAllSecurityServicesBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClients;
+import io.quarkus.oidc.client.runtime.OidcClientBuildTimeConfig;
+import io.quarkus.oidc.client.runtime.OidcClientRecorder;
+import io.quarkus.oidc.client.runtime.OidcClientsConfig;
+import io.quarkus.oidc.client.runtime.TokensHelper;
+import io.quarkus.oidc.client.runtime.TokensProducer;
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
+
+public class OidcClientBuildStep {
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.OIDC_CLIENT);
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    EnableAllSecurityServicesBuildItem security() {
+        return new EnableAllSecurityServicesBuildItem();
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    void registerProvider(BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(TokensProducer.class));
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    void runtimeInitializeTokenHelper(BuildProducer<RuntimeInitializedClassBuildItem> runtime) {
+        runtime.produce(new RuntimeInitializedClassBuildItem(TokensHelper.class.getName()));
+    }
+
+    @Record(ExecutionTime.RUNTIME_INIT)
+    @BuildStep(onlyIf = IsEnabled.class)
+    public List<SyntheticBeanBuildItem> setup(
+            OidcClientsConfig oidcConfig,
+            TlsConfig tlsConfig,
+            OidcClientRecorder recorder,
+            CoreVertxBuildItem vertxBuildItem) {
+
+        OidcClients clients = recorder.setup(oidcConfig, tlsConfig, vertxBuildItem.getVertx());
+
+        SyntheticBeanBuildItem oidcClientBuildItem = SyntheticBeanBuildItem.configure(OidcClient.class).unremovable()
+                .types(OidcClient.class)
+                .supplier(recorder.createOidcClientBean(clients))
+                .scope(Singleton.class)
+                .setRuntimeInit()
+                .destroyer(BeanDestroyer.CloseableDestroyer.class)
+                .done();
+        SyntheticBeanBuildItem oidcClientsBuildItem = SyntheticBeanBuildItem.configure(OidcClients.class).unremovable()
+                .types(OidcClients.class)
+                .supplier(recorder.createOidcClientsBean(clients))
+                .scope(Singleton.class)
+                .setRuntimeInit()
+                .destroyer(BeanDestroyer.CloseableDestroyer.class)
+                .done();
+        return Arrays.asList(oidcClientBuildItem, oidcClientsBuildItem);
+    }
+
+    public static class IsEnabled implements BooleanSupplier {
+        OidcClientBuildTimeConfig config;
+
+        public boolean getAsBoolean() {
+            return config.enabled;
+        }
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java
new file mode 100644
index 0000000000000..575ff7d0125c1
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/FrontendResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.oidc.client;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendResource {
+
+    @Inject
+    @RestClient
+    ProtectedResourceService protectedResourceService;
+
+    @GET
+    @Path("user")
+    public String user() {
+        return protectedResourceService.getUserName();
+    }
+
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyManager.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyManager.java
new file mode 100644
index 0000000000000..fcf995e83c87d
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyManager.java
@@ -0,0 +1,97 @@
+package io.quarkus.oidc.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+import io.smallrye.jwt.util.KeyUtils;
+import io.smallrye.jwt.util.ResourceUtils;
+
+public class KeycloakRealmClientCredentialsJwtPrivateKeyManager implements QuarkusTestResourceLifecycleManager {
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus5";
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+
+            realm.getClients().add(createClient("quarkus-app"));
+
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setDefaultGroups(Arrays.asList("user"));
+        realm.setDefaultRoles(Arrays.asList("user"));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) throws Exception {
+        ClientRepresentation client = new ClientRepresentation();
+        String privateKey = KeyUtils.removePemKeyBeginEnd(ResourceUtils.readResource("/privateKey.pem"));
+        String publicKey = KeyUtils.removePemKeyBeginEnd(ResourceUtils.readResource("/publicKey.pem"));
+        Map<String, String> attributes = new HashMap<String, String>();
+        attributes.put("jwt.credential.public.key", publicKey);
+        attributes.put("jwt.credential.private.key", privateKey);
+        client.setAttributes(attributes);
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setClientAuthenticatorType("client-jwt");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    @Override
+    public void stop() {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).thenReturn().prettyPrint();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyStoreManager.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyStoreManager.java
new file mode 100644
index 0000000000000..58edf41acf436
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtPrivateKeyStoreManager.java
@@ -0,0 +1,106 @@
+package io.quarkus.oidc.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+import io.smallrye.jwt.util.KeyUtils;
+import io.smallrye.jwt.util.ResourceUtils;
+
+public class KeycloakRealmClientCredentialsJwtPrivateKeyStoreManager implements QuarkusTestResourceLifecycleManager {
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus6";
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+
+            realm.getClients().add(createClient("quarkus-app"));
+
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setDefaultGroups(Arrays.asList("user"));
+        realm.setDefaultRoles(Arrays.asList("user"));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) throws Exception {
+        ClientRepresentation client = new ClientRepresentation();
+        String privateKey = KeyUtils.removePemKeyBeginEnd(ResourceUtils.readResource("/exportedPrivateKey.pem"));
+        String publicCert = removeCertBeginEnd(ResourceUtils.readResource("/exportedCertificate.pem"));
+        Map<String, String> attributes = new HashMap<String, String>();
+        attributes.put("jwt.credential.certificate", publicCert);
+        attributes.put("jwt.credential.private.key", privateKey);
+        client.setAttributes(attributes);
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setClientAuthenticatorType("client-jwt");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static String removeCertBeginEnd(String pem) {
+        pem = pem.replaceAll("-----BEGIN(.*?)CERTIFICATE-----", "");
+        pem = pem.replaceAll("-----END(.*?)CERTIFICATE-----", "");
+        pem = pem.replaceAll("\r\n", "");
+        pem = pem.replaceAll("\n", "");
+        pem = pem.replaceAll("\\\\n", "");
+        return pem.trim();
+    }
+
+    @Override
+    public void stop() {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).thenReturn().prettyPrint();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtSecretManager.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtSecretManager.java
new file mode 100644
index 0000000000000..49b45cdfb3779
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsJwtSecretManager.java
@@ -0,0 +1,93 @@
+package io.quarkus.oidc.client;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmClientCredentialsJwtSecretManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus4";
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+
+            realm.getClients().add(createClient("quarkus-app"));
+
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+
+        realm.setDefaultGroups(Arrays.asList("user"));
+        realm.setDefaultRoles(Arrays.asList("user"));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setClientAuthenticatorType("client-secret-jwt");
+        client.setSecret("AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    @Override
+    public void stop() {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).thenReturn().prettyPrint();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsManager.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsManager.java
new file mode 100644
index 0000000000000..c0fdea0a25a17
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmClientCredentialsManager.java
@@ -0,0 +1,92 @@
+package io.quarkus.oidc.client;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmClientCredentialsManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus2";
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+
+            realm.getClients().add(createClient("quarkus-app"));
+
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+
+        realm.setDefaultGroups(Arrays.asList("user"));
+        realm.setDefaultRoles(Arrays.asList("user"));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    @Override
+    public void stop() {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).thenReturn().prettyPrint();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmUserPasswordCustomFilterManager.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmUserPasswordCustomFilterManager.java
new file mode 100644
index 0000000000000..bcbdd623a7b2d
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmUserPasswordCustomFilterManager.java
@@ -0,0 +1,124 @@
+package io.quarkus.oidc.client;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RoleRepresentation;
+import org.keycloak.representations.idm.RolesRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmUserPasswordCustomFilterManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus3";
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+
+            realm.getClients().add(createClient("quarkus-app"));
+            realm.getUsers().add(createUser("bob", "user"));
+
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setUsers(new ArrayList<>());
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setDefaultRoles(Arrays.asList("user"));
+
+        RolesRepresentation roles = new RolesRepresentation();
+        List<RoleRepresentation> realmRoles = new ArrayList<>();
+
+        roles.setRealm(realmRoles);
+        realm.setRoles(roles);
+
+        realm.getRoles().getRealm().add(new RoleRepresentation("user", null, false));
+        realm.getRoles().getRealm().add(new RoleRepresentation("admin", null, false));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static UserRepresentation createUser(String username, String... realmRoles) {
+        UserRepresentation user = new UserRepresentation();
+
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setCredentials(new ArrayList<>());
+        user.setRealmRoles(Arrays.asList(realmRoles));
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+
+        credential.setType(CredentialRepresentation.PASSWORD);
+        credential.setValue(username);
+        credential.setTemporary(false);
+
+        user.getCredentials().add(credential);
+
+        return user;
+    }
+
+    @Override
+    public void stop() {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).thenReturn().prettyPrint();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmUserPasswordManager.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmUserPasswordManager.java
new file mode 100644
index 0000000000000..3c07efd637923
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/KeycloakRealmUserPasswordManager.java
@@ -0,0 +1,124 @@
+package io.quarkus.oidc.client;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RoleRepresentation;
+import org.keycloak.representations.idm.RolesRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmUserPasswordManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus";
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+
+            realm.getClients().add(createClient("quarkus-app"));
+            realm.getUsers().add(createUser("alice", "user"));
+
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setUsers(new ArrayList<>());
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setDefaultRoles(Arrays.asList("user"));
+
+        RolesRepresentation roles = new RolesRepresentation();
+        List<RoleRepresentation> realmRoles = new ArrayList<>();
+
+        roles.setRealm(realmRoles);
+        realm.setRoles(roles);
+
+        realm.getRoles().getRealm().add(new RoleRepresentation("user", null, false));
+        realm.getRoles().getRealm().add(new RoleRepresentation("admin", null, false));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static UserRepresentation createUser(String username, String... realmRoles) {
+        UserRepresentation user = new UserRepresentation();
+
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setCredentials(new ArrayList<>());
+        user.setRealmRoles(Arrays.asList(realmRoles));
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+
+        credential.setType(CredentialRepresentation.PASSWORD);
+        credential.setValue(username);
+        credential.setTemporary(false);
+
+        user.getCredentials().add(credential);
+
+        return user;
+    }
+
+    @Override
+    public void stop() {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).thenReturn().prettyPrint();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java
new file mode 100644
index 0000000000000..92fcdbd07b7e3
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyStoreTestCase.java
@@ -0,0 +1,41 @@
+package io.quarkus.oidc.client;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KeycloakRealmClientCredentialsJwtPrivateKeyStoreManager.class)
+public class OidcClientCredentialsJwtPrivateKeyStoreTestCase {
+
+    private static Class<?>[] testClasses = {
+            OidcClientResource.class,
+            ProtectedResource.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-credentials-jwt-private-key-store.properties",
+                            "application.properties")
+                    .addAsResource("exportedCertificate.pem")
+                    .addAsResource("exportedPrivateKey.pem")
+                    .addAsResource("keystore.jks"));
+
+    @Test
+    public void testClientCredentialsToken() {
+        String token = RestAssured.when().get("/client/token").body().asString();
+        RestAssured.given().auth().oauth2(token)
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java
new file mode 100644
index 0000000000000..6d4604d8e6fbf
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtPrivateKeyTestCase.java
@@ -0,0 +1,39 @@
+package io.quarkus.oidc.client;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KeycloakRealmClientCredentialsJwtPrivateKeyManager.class)
+public class OidcClientCredentialsJwtPrivateKeyTestCase {
+
+    private static Class<?>[] testClasses = {
+            OidcClientResource.class,
+            ProtectedResource.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-credentials-jwt-private-key.properties", "application.properties")
+                    .addAsResource("publicKey.pem")
+                    .addAsResource("privateKey.pem"));
+
+    @Test
+    public void testClientCredentialsToken() {
+        String token = RestAssured.when().get("/client/token").body().asString();
+        RestAssured.given().auth().oauth2(token)
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java
new file mode 100644
index 0000000000000..a2fdfa558ad6a
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsJwtSecretTestCase.java
@@ -0,0 +1,57 @@
+package io.quarkus.oidc.client;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KeycloakRealmClientCredentialsJwtSecretManager.class)
+public class OidcClientCredentialsJwtSecretTestCase {
+
+    private static Class<?>[] testClasses = {
+            OidcClientsResource.class,
+            ProtectedResource.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-credentials-jwt-secret.properties", "application.properties"));
+
+    @Test
+    public void testGetTokenJwtClient() {
+        String token = RestAssured.when().get("/clients/token/jwt").body().asString();
+        RestAssured.given().auth().oauth2(token)
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+    }
+
+    @Test
+    public void testGetTokensJwtClient() {
+        String[] tokens = RestAssured.when().get("/clients/tokens/jwt").body().asString().split(" ");
+        assertTokensNotNull(tokens);
+
+        RestAssured.given().auth().oauth2(tokens[0])
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+    }
+
+    private static void assertTokensNotNull(String[] tokens) {
+        assertEquals(2, tokens.length);
+        assertNotNull(tokens[0]);
+        assertEquals("null", tokens[1]);
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java
new file mode 100644
index 0000000000000..4c071d98b7330
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientCredentialsTestCase.java
@@ -0,0 +1,78 @@
+package io.quarkus.oidc.client;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KeycloakRealmClientCredentialsManager.class)
+public class OidcClientCredentialsTestCase {
+
+    private static Class<?>[] testClasses = {
+            OidcClientsResource.class,
+            ProtectedResource.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-credentials.properties", "application.properties"));
+
+    @Test
+    public void testGetTokenDefaultClient() {
+        doTestGetTokenClient("default");
+    }
+
+    @Test
+    public void testGetTokensDefaultClient() {
+        doTestGetTokensClient("default");
+    }
+
+    @Test
+    public void testGetTokensOnDemand() {
+        String[] tokens = RestAssured.when().get("/clients/tokenOnDemand").body().asString().split(" ");
+        assertTokensNotNull(tokens);
+
+        RestAssured.given().auth().oauth2(tokens[0])
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+    }
+
+    private void doTestGetTokenClient(String clientId) {
+        String token = RestAssured.when().get("/clients/token/" + clientId).body().asString();
+        RestAssured.given().auth().oauth2(token)
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+
+    }
+
+    private void doTestGetTokensClient(String clientId) {
+        String[] tokens = RestAssured.when().get("/clients/tokens/" + clientId).body().asString().split(" ");
+        assertTokensNotNull(tokens);
+
+        RestAssured.given().auth().oauth2(tokens[0])
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("service-account-quarkus-app"));
+    }
+
+    private static void assertTokensNotNull(String[] tokens) {
+        assertEquals(2, tokens.length);
+        assertNotNull(tokens[0]);
+        assertEquals("null", tokens[1]);
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java
new file mode 100644
index 0000000000000..32d7309895149
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientRequestCustomFilter.java
@@ -0,0 +1,22 @@
+package io.quarkus.oidc.client;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.HttpHeaders;
+
+@Priority(Priorities.AUTHENTICATION)
+public class OidcClientRequestCustomFilter implements ClientRequestFilter {
+
+    @Inject
+    Tokens grantTokens;
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + grantTokens.getAccessToken());
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java
new file mode 100644
index 0000000000000..359aab2b6716e
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientResource.java
@@ -0,0 +1,43 @@
+package io.quarkus.oidc.client;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("/client")
+public class OidcClientResource {
+
+    @Inject
+    OidcClient client;
+
+    @GET
+    @Path("token")
+    public Uni<String> tokenUni() {
+        return client.getTokens().flatMap(tokens -> Uni.createFrom().item(tokens.getAccessToken()));
+    }
+
+    @GET
+    @Path("tokens")
+    public Uni<String> grantTokensUni() {
+        return client.getTokens().flatMap(tokens -> createTokensString(tokens));
+    }
+
+    @GET
+    @Path("refresh-tokens")
+    public Uni<String> refreshGrantTokens(@QueryParam("refreshToken") String refreshToken) {
+        return client.refreshTokens(refreshToken).flatMap(tokens -> createTokensString(tokens));
+    }
+
+    private Uni<String> createTokensString(Tokens tokens) {
+        return tokensAreInitialized(tokens) ? Uni.createFrom().item(tokens.getAccessToken() + " " + tokens.getRefreshToken())
+                : Uni.createFrom().failure(new InternalServerErrorException());
+    }
+
+    private boolean tokensAreInitialized(Tokens tokens) {
+        return tokens.getAccessToken() != null && tokens.getAccessTokenExpiresAt() != null && tokens.getRefreshToken() != null;
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java
new file mode 100644
index 0000000000000..7ef024eee6123
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordCustomFilterTestCase.java
@@ -0,0 +1,67 @@
+package io.quarkus.oidc.client;
+
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KeycloakRealmUserPasswordCustomFilterManager.class)
+public class OidcClientUserPasswordCustomFilterTestCase {
+
+    private static Class<?>[] testClasses = {
+            FrontendResource.class,
+            ProtectedResource.class,
+            ProtectedResourceService.class,
+            OidcClientRequestCustomFilter.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-custom-filter.properties", "application.properties"));
+
+    @Test
+    public void testGetUserName() {
+        RestAssured.when().get("/frontend/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("bob"));
+
+    }
+
+    @Test
+    public void testGetUserOidcClientNameAndRefreshTokens() {
+        RestAssured.when().get("/frontend/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("bob"));
+
+        // Wait until the access token has expired
+        long expiredTokenTime = System.currentTimeMillis() + 5000;
+        await().atMost(10, TimeUnit.SECONDS)
+                .pollInterval(Duration.ofSeconds(3))
+                .until(new Callable<Boolean>() {
+                    @Override
+                    public Boolean call() throws Exception {
+                        return System.currentTimeMillis() > expiredTokenTime;
+                    }
+                });
+
+        RestAssured.when().get("/frontend/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("bob"));
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java
new file mode 100644
index 0000000000000..feef0c12b8736
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientUserPasswordTestCase.java
@@ -0,0 +1,101 @@
+package io.quarkus.oidc.client;
+
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+@QuarkusTestResource(KeycloakRealmUserPasswordManager.class)
+public class OidcClientUserPasswordTestCase {
+
+    private static Class<?>[] testClasses = {
+            OidcClientResource.class,
+            ProtectedResource.class
+    };
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("application-oidc-client-user-password.properties", "application.properties"));
+
+    @Test
+    public void testPasswordGrantToken() {
+        String token = RestAssured.when().get("/client/token").body().asString();
+        RestAssured.given().auth().oauth2(token)
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+
+    }
+
+    @Test
+    public void testPasswordGrantTokens() {
+        String[] tokens = RestAssured.when().get("/client/tokens").body().asString().split(" ");
+        assertTokensNotNull(tokens);
+
+        RestAssured.given().auth().oauth2(tokens[0])
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+
+    }
+
+    @Test
+    public void testRefreshPasswordGrantTokens() {
+        String[] tokens = RestAssured.when().get("/client/tokens").body().asString().split(" ");
+        assertTokensNotNull(tokens);
+
+        RestAssured.given().auth().oauth2(tokens[0])
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+
+        // Wait until the access token has expired
+        await().atMost(5, TimeUnit.SECONDS)
+                .pollInterval(Duration.ofSeconds(1))
+                .until(new Callable<Boolean>() {
+                    @Override
+                    public Boolean call() throws Exception {
+                        Response r = RestAssured.given().auth().oauth2(tokens[0])
+                                .when().get("/protected").andReturn();
+                        return r.getStatusCode() == 401;
+                    }
+                });
+
+        String[] refreshedTokens = RestAssured.given().queryParam("refreshToken", tokens[1])
+                .when().get("/client/refresh-tokens").body().asString().split(" ");
+        assertTokensNotNull(refreshedTokens);
+        assertNotEquals(tokens[0], refreshedTokens[0]);
+
+        RestAssured.given().auth().oauth2(refreshedTokens[0])
+                .when().get("/protected")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+    }
+
+    private static void assertTokensNotNull(String[] tokens) {
+        assertEquals(2, tokens.length);
+        assertNotNull(tokens[0]);
+        assertNotNull(tokens[1]);
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java
new file mode 100644
index 0000000000000..1e7432342fde8
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/OidcClientsResource.java
@@ -0,0 +1,62 @@
+package io.quarkus.oidc.client;
+
+import java.util.function.Function;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("/clients")
+public class OidcClientsResource {
+
+    @Inject
+    OidcClients clients;
+
+    @GET
+    @Path("token/{id}")
+    public Uni<String> tokenUni(@PathParam("id") String oidcClientId) {
+        return getClient(oidcClientId).getTokens().flatMap(tokens -> Uni.createFrom().item(tokens.getAccessToken()));
+    }
+
+    @GET
+    @Path("tokens/{id}")
+    public Uni<String> grantTokensUni(@PathParam("id") String oidcClientId) {
+        return getClient(oidcClientId).getTokens().flatMap(tokens -> createTokensString(tokens));
+    }
+
+    @GET
+    @Path("tokenOnDemand")
+    public Uni<String> tokenOnDemand() {
+        OidcClientConfig cfg = new OidcClientConfig();
+        cfg.setId("dynamic");
+        cfg.setAuthServerUrl(ConfigProvider.getConfig().getValue("quarkus.oidc-client.auth-server-url", String.class));
+        cfg.setClientId(ConfigProvider.getConfig().getValue("quarkus.oidc-client.client-id", String.class));
+        cfg.getCredentials().setSecret("secret");
+        return clients.newClient(cfg).onItem().transformToUni(new Function<OidcClient, Uni<? extends String>>() {
+
+            @Override
+            public Uni<String> apply(OidcClient client) {
+                return client.getTokens().flatMap(tokens -> createTokensString(tokens));
+            }
+        });
+    }
+
+    private Uni<String> createTokensString(Tokens tokens) {
+        return tokensAreInitialized(tokens) ? Uni.createFrom().item(tokens.getAccessToken() + " " + tokens.getRefreshToken())
+                : Uni.createFrom().failure(new InternalServerErrorException());
+    }
+
+    private boolean tokensAreInitialized(Tokens tokens) {
+        return tokens.getAccessToken() != null && tokens.getAccessTokenExpiresAt() != null;
+    }
+
+    private OidcClient getClient(String id) {
+        return "default".equals(id) ? clients.getClient() : clients.getClient(id);
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java
new file mode 100644
index 0000000000000..64d109877d48e
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.oidc.client;
+
+import java.security.Principal;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/protected")
+@Authenticated
+public class ProtectedResource {
+
+    @Inject
+    Principal principal;
+
+    @GET
+    @RolesAllowed("user")
+    public String principalName() {
+        return principal.getName();
+    }
+}
diff --git a/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java
new file mode 100644
index 0000000000000..12e6f9eb12f81
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/java/io/quarkus/oidc/client/ProtectedResourceService.java
@@ -0,0 +1,16 @@
+package io.quarkus.oidc.client;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@RegisterProvider(OidcClientRequestCustomFilter.class)
+@Path("/")
+public interface ProtectedResourceService {
+
+    @GET
+    String getUserName();
+}
diff --git a/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-private-key-store.properties b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-private-key-store.properties
new file mode 100644
index 0000000000000..3a1248af6b726
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-private-key-store.properties
@@ -0,0 +1,7 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus6/
+quarkus.oidc.client-id=quarkus-app
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.jwt.key-store-file=keystore.jks
+quarkus.oidc-client.credentials.jwt.key-id=keycloak
diff --git a/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-private-key.properties b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-private-key.properties
new file mode 100644
index 0000000000000..593d2f8161cdf
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-private-key.properties
@@ -0,0 +1,6 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus5/
+quarkus.oidc.client-id=quarkus-app
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.jwt.key-file=/privateKey.pem
diff --git a/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-secret.properties b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-secret.properties
new file mode 100644
index 0000000000000..5ad7baebbc257
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials-jwt-secret.properties
@@ -0,0 +1,6 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus4/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc-client.client-enabled=false
+quarkus.oidc-client.jwt.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.jwt.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.jwt.credentials.jwt.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
\ No newline at end of file
diff --git a/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials.properties b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials.properties
new file mode 100644
index 0000000000000..b91efb8b579c8
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-credentials.properties
@@ -0,0 +1,7 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus2/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.secret=${quarkus.oidc.credentials.secret}
\ No newline at end of file
diff --git a/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-custom-filter.properties b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-custom-filter.properties
new file mode 100644
index 0000000000000..eeef7104ed655
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-custom-filter.properties
@@ -0,0 +1,14 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus3/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.secret=${quarkus.oidc.credentials.secret}
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=bob
+quarkus.oidc-client.grant-options.password.password=bob
+
+quarkus.oidc-client.early-tokens-acquisition=false
+
+io.quarkus.oidc.client.ProtectedResourceService/mp-rest/url=http://localhost:8081/protected
diff --git a/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-user-password.properties b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-user-password.properties
new file mode 100644
index 0000000000000..8f5a75d7b3658
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/application-oidc-client-user-password.properties
@@ -0,0 +1,10 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.secret=${quarkus.oidc.credentials.secret}
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=alice
+quarkus.oidc-client.grant-options.password.password=alice
\ No newline at end of file
diff --git a/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem b/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem
new file mode 100644
index 0000000000000..e69e9fe5bd1d1
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/exportedCertificate.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEHbJ+JjANBgkqhkiG9w0BAQsFADBsMRAwDgYDVQQGEwdV
+bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD
+VQQKEwdVbmtub3duMRAwDgYDVQQLEwdVbmtub3duMRAwDgYDVQQDEwdVbmtub3du
+MB4XDTIwMTIyNDE0MTMxOFoXDTIxMDMyNDE0MTMxOFowbDEQMA4GA1UEBhMHVW5r
+bm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjEQMA4GA1UE
+ChMHVW5rbm93bjEQMA4GA1UECxMHVW5rbm93bjEQMA4GA1UEAxMHVW5rbm93bjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJej16pv4CcIyE4QiHxe2F7F
+AJjfofnBzyx/woZ0wUpsALjW2JiMjPMtZbLWHqRfCJpvVg2lZ9Hza5wAU3xpNa0E
+pPCR54W4Ulf49G/X/Al9rPCqJJEtDJaD9FrAFPh+GiST4uXbhKwX2bITzkdDoQNG
+P1jEsif49m0FgU3Il0UEzr4jvXyTCQ02QM9ZWbQ7Og1pGXSqb0hC5PnzmPeQBhZq
+KuHQkrrjdvzziPmqnJoPMKdMRg3xjLV/tXZ+rgWpXCvUy+jl++QeBMVQm/wCyDVm
+ZkXqqrB8b3cvOoxlmbcS3OrNf2RAMNUN+GRBz/LCLk+n2u3lTVDM+7N0seiaMe8C
+AwEAAaMhMB8wHQYDVR0OBBYEFDt0Ip4Vtn/wqfhDvj4nYwTurpuPMA0GCSqGSIb3
+DQEBCwUAA4IBAQCSNhs0oaTQjGQbIVURamXE8YSnuWJQEqFnCWh2jcji0S4kvD+M
+VRNIiX5TGTeAoc9Yv6CltRAR5h8PRAhPzWCWKweCRibUqZF640TB2E7iE2YMFYbB
+tTH0MOkMoS0Yhoo/tSQsFmTQsFbU/d43nOoBWUDRuYclJv7lisHqc4nhe97dL/na
+IIJeD5XTTC82kn7hS2uZGdzMDpgQjwA9FYXR4nOt+gpx2TjWIi63zCWS92nyyLCd
++zb7LTgPuyX4o5q4yi+acztDitROA7b+2dcq+IAwZf8vliwbgT7VPcpEMJMnAYxo
+d5T2ko9LWvozen0sN9+L5OLVE82q3NHwJNm3
+-----END CERTIFICATE-----
diff --git a/extensions/oidc-client/deployment/src/test/resources/exportedPrivateKey.pem b/extensions/oidc-client/deployment/src/test/resources/exportedPrivateKey.pem
new file mode 100644
index 0000000000000..a1adab63fcdbf
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/exportedPrivateKey.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXo9eqb+AnCMhO
+EIh8XthexQCY36H5wc8sf8KGdMFKbAC41tiYjIzzLWWy1h6kXwiab1YNpWfR82uc
+AFN8aTWtBKTwkeeFuFJX+PRv1/wJfazwqiSRLQyWg/RawBT4fhokk+Ll24SsF9my
+E85HQ6EDRj9YxLIn+PZtBYFNyJdFBM6+I718kwkNNkDPWVm0OzoNaRl0qm9IQuT5
+85j3kAYWairh0JK643b884j5qpyaDzCnTEYN8Yy1f7V2fq4FqVwr1Mvo5fvkHgTF
+UJv8Asg1ZmZF6qqwfG93LzqMZZm3EtzqzX9kQDDVDfhkQc/ywi5Pp9rt5U1QzPuz
+dLHomjHvAgMBAAECggEAfPy9DGx+M25Xu5CBDxIWAbcbUOYzWetXWfRMYAroLvFq
+fvAHQ2XF38JxasB2LUFvk+tk4IaPVkvvTHwwVAFcDqofUXLRhDRzGrPGtlEuGpyN
+6Sg0T7zz/TPyOsLMBi3aWn/Sq2cOqdJWyyLsCW1Cz7IdEIu/1JaudxnshDJsDKQu
+gNX7vZD7xpwyLPovz4exV6Z+3SLwWXDc+i+BWkUgwbD6tcA+QkPvNwUcUDXHB0jV
+/sFouaGJNiR4c5UBG7COlXP3HE8AikVoSdgEgGpfPaLK+xG0ifd/IXu5RK5M4wVP
+ZI8CbRG4SJ+WhcAypWGlEOBVFIgFvSUK7l2AG3+/UQKBgQDQNItziQRhNGDWEiev
+5w3216+cIUiFLwk6siB4o0U3s6A9sM5GvRskuekmiHDNFB9vWQADcpVLoLXnav5H
++cAc643p0h/2wYdVUPN1fJqQjv1xA+12bsOfgKNbHPNfxMsFa38Kuc7hodXQ+9dA
+XWxAla/STMLBOO2d3J+0N6dcNQKBgQC6cyq3fCo1H5INAJojm9XDll3GXg5WSEUY
+Eo3jq0gvcKW3qfUTFMHNfpdgs5VHsZ0A10p4o0rgYBrEEGKuSXly77L2ODjTsxrW
+xjBTZPo2rucETO7sEkX1VNoEm353BLl5tb0SkwLyZW03traYFl9FqfGi1AJlPtzV
+4ouPZ/wyEwKBgH5N8e7zxullCf2zY8oNA+aj749qjYDmCNZHqvUkLuBcoq/p6yj0
+nVvJQEw05yExvOQifKSaxUDszI0H1hw5wTaKGzwmUWey/XNfOWIjZeyeIdeGh26a
+QSgotHCYfnexfWvbS2VpVLyCHaC6tlkAk6QWamPMVzU6YMOsTGHahTelAoGAPF37
+b6sI82hEXmdagLr87DWsKQTc+XyuukuPmy4i0hFT5nJlwgbPdNxO4OVkKPFN1y7d
+ks+z94/GOsLfYHSzmM4ZEHVFmO19fBpxHR8tkDTy4UaTeOW1tugBKsq5mIl0D/8S
+t4fXxWmngglrdzSPJjwO21xvZh6DW9DcxNKzKfcCgYAh75DdMOVvgqO2xLi3mqWc
+00NDaqpi2KDwQWLHlUeEmx+mveEVephghVgn+/6BBmoZPxe5lxtWUt/OdvjftA+3
+DRQ6hd7/sxdksKxD1+magpSHZ7Gz9/R+zJDOenJI+PT5Ny6wFvX4PlZ8F9oCeVI3
+CgzHCysZtvTHQJ7ygF65Tw==
+-----END PRIVATE KEY-----
diff --git a/extensions/oidc-client/deployment/src/test/resources/keystore.jks b/extensions/oidc-client/deployment/src/test/resources/keystore.jks
new file mode 100644
index 0000000000000..8148c0b2e859d
Binary files /dev/null and b/extensions/oidc-client/deployment/src/test/resources/keystore.jks differ
diff --git a/extensions/oidc-client/deployment/src/test/resources/privateKey.pem b/extensions/oidc-client/deployment/src/test/resources/privateKey.pem
new file mode 100644
index 0000000000000..6a16774c301c1
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/privateKey.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyXwKqKL/hQWDk
+urdHyRn/9aZqmrgpCfiT5+gQ7KZ9RvDjgTqkJT6IIrRFvIpeBMwSsw3dkUPGmgN1
+J4QOhLaR2VEXhc20UbxFbr6HXAskZGPuCL1tzRWDkLNMZaEO8jqhPbcq1Ro4GMha
+Sdm0sBHmcQnu8wAOrdAowdzGh/HUaaYBDY0OZVAm9N8zzBXTahna9frJCMHq3e9s
+zIiv6HYZTy1672/+hR/0D1HY+bqpQtJnzSrKjkFeXDAbYPgewYLEJ2Dk+oo6L1I6
+S+UTrl4FRHw1fHAd2i75JD+vL/8w/AtKkej0CCBUSZJiV+KDJWjnDUVRWjq5hQb9
+pu4qEJKhAgMBAAECggEAJvBs4X7B3MfsAiLszgQN4/3ZlZ4vI+5kUM2osMEo22J4
+RgI5Lgpfa1LALhUp07qSXmauWTdUJ3AJ3zKANrcsMAzUEiGItZu+UR4LA/vJBunP
+kvBfgi/qSW12ZvAsx9mDiR2y9evNrH9khalnmHVzgu4ccAimc43oSm1/5+tXlLoZ
+1QK/FohxBxAshtuDHGs8yKUL0jpv7dOrjhCj2ibmPYe6AUk9F61sVWO0/i0Q8UAO
+cYT3L5nCS5WnLhdCdYpIJJ7xl2PrVE/BAD+JEG5uCOYfVeYh+iCZVfpX17ryfNNU
+aBtyxKEGVtHbje3mO86mYN3noaS0w/zpUjBPgV+KEQKBgQDsp6VTmDIqHFTp2cC2
+yrDMxRznif92EGv7ccJDZtbTC37mAuf2J7x5b6AiE1EfxEXyGYzSk99sCns+GbL1
+EHABUt5pimDCl33b6XvuccQNpnJ0MfM5eRX9Ogyt/OKdDRnQsvrTPNCWOyJjvG01
+HQM4mfxaBBnxnvl5meH2pyG/ZQKBgQDA87DnyqEFhTDLX5c1TtwHSRj2xeTPGKG0
+GyxOJXcxR8nhtY9ee0kyLZ14RytnOxKarCFgYXeG4IoGEc/I42WbA4sq88tZcbe4
+IJkdX0WLMqOTdMrdx9hMU1ytKVUglUJZBVm7FaTQjA+ArMwqkXAA5HBMtArUsfJK
+Ut3l0hMIjQKBgQDS1vmAZJQs2Fj+jzYWpLaneOWrk1K5yR+rQUql6jVyiUdhfS1U
+LUrJlh3Avh0EhEUc0I6Z/YyMITpztUmu9BoV09K7jMFwHK/RAU+cvFbDIovN4cKk
+bbCdjt5FFIyBB278dLjrAb+EWOLmoLVbIKICB47AU+8ZSV1SbTrYGUcD0QKBgQCA
+liZv4na6sg9ZiUPAr+QsKserNSiN5zFkULOPBKLRQbFFbPS1l12pRgLqNCu1qQV1
+9H5tt6arSRpSfy5FB14gFxV4s23yFrnDyF2h2GsFH+MpEq1bbaI1A10AvUnQ5AeK
+QemRpxPmM2DldMK/H5tPzO0WAOoy4r/ATkc4sG4kxQKBgBL9neT0TmJtxlYGzjNc
+jdJXs3Q91+nZt3DRMGT9s0917SuP77+FdJYocDiH1rVa9sGG8rkh1jTdqliAxDXw
+Im5IGS/0OBnkaN1nnGDk5yTiYxOutC5NSj7ecI5Erud8swW6iGqgz2ioFpGxxIYq
+RlgTv/6mVt41KALfKrYIkVLw
+-----END PRIVATE KEY-----
diff --git a/extensions/oidc-client/deployment/src/test/resources/publicKey.pem b/extensions/oidc-client/deployment/src/test/resources/publicKey.pem
new file mode 100644
index 0000000000000..62da3494fcdd2
--- /dev/null
+++ b/extensions/oidc-client/deployment/src/test/resources/publicKey.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsl8Cqii/4UFg5Lq3R8kZ
+//Wmapq4KQn4k+foEOymfUbw44E6pCU+iCK0RbyKXgTMErMN3ZFDxpoDdSeEDoS2
+kdlRF4XNtFG8RW6+h1wLJGRj7gi9bc0Vg5CzTGWhDvI6oT23KtUaOBjIWknZtLAR
+5nEJ7vMADq3QKMHcxofx1GmmAQ2NDmVQJvTfM8wV02oZ2vX6yQjB6t3vbMyIr+h2
+GU8teu9v/oUf9A9R2Pm6qULSZ80qyo5BXlwwG2D4HsGCxCdg5PqKOi9SOkvlE65e
+BUR8NXxwHdou+SQ/ry//MPwLSpHo9AggVEmSYlfigyVo5w1FUVo6uYUG/abuKhCS
+oQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/extensions/oidc-client/pom.xml b/extensions/oidc-client/pom.xml
new file mode 100644
index 0000000000000..8a02c42688648
--- /dev/null
+++ b/extensions/oidc-client/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-client-parent</artifactId>
+    <name>Quarkus - OpenID Connect Client</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/oidc-client/runtime/pom.xml b/extensions/oidc-client/runtime/pom.xml
new file mode 100644
index 0000000000000..f79cd02ff1613
--- /dev/null
+++ b/extensions/oidc-client/runtime/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-client</artifactId>
+    <name>Quarkus - OpenID Connect Client - Runtime</name>
+    <description>Use OpenID Connect Client to get and refresh access tokens</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClient.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClient.java
new file mode 100644
index 0000000000000..83611756ec910
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClient.java
@@ -0,0 +1,21 @@
+package io.quarkus.oidc.client;
+
+import java.io.Closeable;
+
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Token grant client
+ */
+public interface OidcClient extends Closeable {
+
+    /**
+     * Returns the grant tokens
+     */
+    Uni<Tokens> getTokens();
+
+    /**
+     * Refreshes the grant tokens
+     */
+    Uni<Tokens> refreshTokens(String refreshToken);
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java
new file mode 100644
index 0000000000000..12b5dfaa92556
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientConfig.java
@@ -0,0 +1,127 @@
+package io.quarkus.oidc.client;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.oidc.common.runtime.OidcCommonConfig;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class OidcClientConfig extends OidcCommonConfig {
+
+    /**
+     * A unique OIDC client identifier. It must be set when OIDC clients are created dynamically
+     * and is optional in all other cases.
+     */
+    @ConfigItem
+    public Optional<String> id = Optional.empty();
+
+    /**
+     * If this client configuration is enabled.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean clientEnabled = true;
+
+    /**
+     * List of access token scopes
+     */
+    @ConfigItem
+    public Optional<List<String>> scopes = Optional.empty();
+
+    /**
+     * Refresh token time skew in seconds.
+     * If this property is enabled then the configured number of seconds is added to the current time
+     * when checking whether the access token should be refreshed. If the sum is greater than this access token's
+     * expiration time then a refresh is going to happen.
+     */
+    @ConfigItem
+    public Optional<Duration> refreshTokenTimeSkew = Optional.empty();
+
+    public Grant grant = new Grant();
+
+    @ConfigGroup
+    public static class Grant {
+        public static enum Type {
+            /**
+             * 'client_credentials' grant requiring an OIDC client authentication only
+             */
+            CLIENT,
+            /**
+             * 'password' grant requiring both OIDC client and user ('username' and 'password') authentications
+             */
+            PASSWORD
+        }
+
+        /**
+         * Grant type
+         */
+        @ConfigItem(defaultValue = "client")
+        public Type type = Type.CLIENT;
+
+        public Type getType() {
+            return type;
+        }
+
+        public void setType(Type type) {
+            this.type = type;
+        }
+    }
+
+    /**
+     * Grant options
+     */
+    @ConfigItem
+    public Map<String, Map<String, String>> grantOptions;
+
+    /**
+     * Requires that all filters which use 'OidcClient' acquire the tokens at the post-construct initialization time,
+     * possibly long before these tokens are used.
+     * This property should be disabled if the access token may expire before it is used for the first time and no refresh token
+     * is available.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean earlyTokensAcquisition = true;
+
+    public Optional<String> getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = Optional.of(id);
+    }
+
+    public Map<String, Map<String, String>> getGrantOptions() {
+        return grantOptions;
+    }
+
+    public void setGrantOptions(Map<String, Map<String, String>> grantOptions) {
+        this.grantOptions = grantOptions;
+    }
+
+    public boolean isClientEnabled() {
+        return clientEnabled;
+    }
+
+    public void setClientEnabled(boolean clientEnabled) {
+        this.clientEnabled = clientEnabled;
+    }
+
+    public Optional<List<String>> getScopes() {
+        return scopes;
+    }
+
+    public void setScopes(List<String> scopes) {
+        this.scopes = Optional.of(scopes);
+    }
+
+    public Optional<Duration> getRefreshTokenTimeSkew() {
+        return refreshTokenTimeSkew;
+    }
+
+    public void setRefreshTokenTimeSkew(Duration refreshTokenTimeSkew) {
+        this.refreshTokenTimeSkew = Optional.of(refreshTokenTimeSkew);
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientException.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientException.java
new file mode 100644
index 0000000000000..a56f43d15e0b6
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClientException.java
@@ -0,0 +1,20 @@
+package io.quarkus.oidc.client;
+
+@SuppressWarnings("serial")
+public class OidcClientException extends RuntimeException {
+    public OidcClientException() {
+
+    }
+
+    public OidcClientException(String errorMessage) {
+        this(errorMessage, null);
+    }
+
+    public OidcClientException(Throwable cause) {
+        this(null, cause);
+    }
+
+    public OidcClientException(String errorMessage, Throwable cause) {
+        super(errorMessage, cause);
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClients.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClients.java
new file mode 100644
index 0000000000000..4d8dec6815567
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/OidcClients.java
@@ -0,0 +1,34 @@
+package io.quarkus.oidc.client;
+
+import java.io.Closeable;
+
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Token grant clients
+ */
+public interface OidcClients extends Closeable {
+
+    /**
+     * Returns a default {@link OidcClient}.
+     * 
+     * @return {@link OidcClient}
+     */
+    OidcClient getClient();
+
+    /**
+     * Returns an {@link OidcClient} with a specific id.
+     * 
+     * @param id {@link OidcClient} id
+     * @return {@link OidcClient}
+     */
+    OidcClient getClient(String id);
+
+    /**
+     * Returns a new {@link OidcClient}.
+     *
+     * @param id {@link OidcClientConfig} new client configuration
+     * @return Uni<OidcClient>
+     */
+    Uni<OidcClient> newClient(OidcClientConfig clientConfig);
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java
new file mode 100644
index 0000000000000..31d91cf5b9136
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/Tokens.java
@@ -0,0 +1,52 @@
+package io.quarkus.oidc.client;
+
+import java.time.Duration;
+
+/**
+ * Access and Refresh tokens returned from a token grant request
+ */
+public class Tokens {
+    final private String accessToken;
+    final private Long accessTokenExpiresAt;
+    final private Long refreshTokenTimeSkew;
+    final private String refreshToken;
+
+    public Tokens(String accessToken, Long accessTokenExpiresAt, Duration refreshTokenTimeSkewDuration, String refreshToken) {
+        this.accessToken = accessToken;
+        this.accessTokenExpiresAt = accessTokenExpiresAt;
+        this.refreshTokenTimeSkew = refreshTokenTimeSkewDuration == null ? null : refreshTokenTimeSkewDuration.getSeconds();
+        this.refreshToken = refreshToken;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public Long getAccessTokenExpiresAt() {
+        return accessTokenExpiresAt;
+    }
+
+    public Long getRefreshTokenTimeSkew() {
+        return refreshTokenTimeSkew;
+    }
+
+    public boolean isAccessTokenExpired() {
+        if (accessTokenExpiresAt == null) {
+            return false;
+        }
+        final long nowSecs = System.currentTimeMillis() / 1000;
+        return nowSecs > accessTokenExpiresAt;
+    }
+
+    public boolean isAccessTokenWithinRefreshInterval() {
+        if (accessTokenExpiresAt == null || refreshTokenTimeSkew == null) {
+            return false;
+        }
+        final long nowSecs = System.currentTimeMillis() / 1000;
+        return nowSecs + refreshTokenTimeSkew > accessTokenExpiresAt;
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java
new file mode 100644
index 0000000000000..6ef4ec792aeed
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/AbstractTokensProducer.java
@@ -0,0 +1,33 @@
+package io.quarkus.oidc.client.runtime;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.Tokens;
+import io.smallrye.mutiny.Uni;
+
+public abstract class AbstractTokensProducer {
+
+    @Inject
+    OidcClient oidcClient;
+
+    @Inject
+    @ConfigProperty(name = "quarkus.oidc-client.early-tokens-acquisition")
+    boolean earlyTokenAcquisition;
+
+    TokensHelper tokensHelper = new TokensHelper();
+
+    @PostConstruct
+    public void initTokens() {
+        if (earlyTokenAcquisition) {
+            tokensHelper.initTokens(oidcClient);
+        }
+    }
+
+    public Uni<Tokens> getTokens() {
+        return tokensHelper.getTokens(oidcClient);
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientBuildTimeConfig.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientBuildTimeConfig.java
new file mode 100644
index 0000000000000..afb58c3e66801
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientBuildTimeConfig.java
@@ -0,0 +1,16 @@
+package io.quarkus.oidc.client.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * Build time configuration for OIDC.
+ */
+@ConfigRoot
+public class OidcClientBuildTimeConfig {
+    /**
+     * If the OIDC extension is enabled.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enabled;
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java
new file mode 100644
index 0000000000000..6120408d8cf61
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientImpl.java
@@ -0,0 +1,150 @@
+package io.quarkus.oidc.client.runtime;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
+import java.time.Instant;
+import java.util.Base64;
+import java.util.function.Supplier;
+
+import org.eclipse.microprofile.jwt.Claims;
+import org.jboss.logging.Logger;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClientConfig;
+import io.quarkus.oidc.client.OidcClientException;
+import io.quarkus.oidc.client.Tokens;
+import io.quarkus.oidc.common.runtime.OidcCommonUtils;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.json.JsonObject;
+import io.vertx.mutiny.core.MultiMap;
+import io.vertx.mutiny.core.buffer.Buffer;
+import io.vertx.mutiny.ext.web.client.HttpRequest;
+import io.vertx.mutiny.ext.web.client.HttpResponse;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+public class OidcClientImpl implements OidcClient {
+
+    private static final Logger LOG = Logger.getLogger(OidcClientImpl.class);
+
+    private static final String AUTHORIZATION_HEADER = String.valueOf(HttpHeaders.AUTHORIZATION);
+
+    private final WebClient client;
+    private final String tokenRequestUri;
+    private final MultiMap tokenGrantParams;
+    private final MultiMap commonRefreshGrantParams;
+    private final String grantType;
+    private final String clientSecretBasicAuthScheme;
+    private final Key clientJwtKey;
+    private final OidcClientConfig oidcConfig;
+
+    public OidcClientImpl(WebClient client, String tokenRequestUri, String grantType,
+            MultiMap tokenGrantParams, MultiMap commonRefreshGrantParams, OidcClientConfig oidcClientConfig) {
+        this.client = client;
+        this.tokenRequestUri = tokenRequestUri;
+        this.tokenGrantParams = tokenGrantParams;
+        this.commonRefreshGrantParams = commonRefreshGrantParams;
+        this.grantType = grantType;
+        this.oidcConfig = oidcClientConfig;
+        this.clientSecretBasicAuthScheme = OidcCommonUtils.initClientSecretBasicAuth(oidcClientConfig);
+        this.clientJwtKey = OidcCommonUtils.initClientJwtKey(oidcClientConfig);
+    }
+
+    @Override
+    public Uni<Tokens> getTokens() {
+        return getJsonResponse(tokenGrantParams, false);
+    }
+
+    @Override
+    public Uni<Tokens> refreshTokens(String refreshToken) {
+        if (refreshToken == null) {
+            throw new OidcClientException("Refresh token is null");
+        }
+        MultiMap refreshGrantParams = copyMultiMap(commonRefreshGrantParams);
+        refreshGrantParams.add(OidcConstants.REFRESH_TOKEN_VALUE, refreshToken);
+        return getJsonResponse(refreshGrantParams, true);
+    }
+
+    private Uni<Tokens> getJsonResponse(MultiMap reqBody, boolean refresh) {
+        //Uni needs to be lazy by default, we don't send the request unless
+        //something has subscribed to it. This is important for the CAS state
+        //management in TokensHelper
+        return Uni.createFrom().deferred(new Supplier<Uni<? extends Tokens>>() {
+            @Override
+            public Uni<Tokens> get() {
+                MultiMap body = reqBody;
+                HttpRequest<Buffer> request = client.postAbs(tokenRequestUri);
+                if (clientSecretBasicAuthScheme != null) {
+                    request.putHeader(AUTHORIZATION_HEADER, clientSecretBasicAuthScheme);
+                } else if (clientJwtKey != null) {
+                    // if it is a refresh then a map has already been copied
+                    body = !refresh ? copyMultiMap(body) : body;
+                    body.add(OidcConstants.CLIENT_ASSERTION_TYPE, OidcConstants.JWT_BEARER_CLIENT_ASSERTION_TYPE);
+                    body.add(OidcConstants.CLIENT_ASSERTION, OidcCommonUtils.signJwtWithKey(oidcConfig, clientJwtKey));
+                }
+                return request.sendForm(body).onItem()
+                        .transform(resp -> emitGrantTokens(resp, refresh));
+            }
+        });
+    }
+
+    private Tokens emitGrantTokens(HttpResponse<Buffer> resp, boolean refresh) {
+        if (resp.statusCode() == 200) {
+            LOG.debugf("%s OidcClient has %s the tokens", oidcConfig.getId().get(), (refresh ? "refreshed" : "acquired"));
+            JsonObject json = resp.bodyAsJsonObject();
+            final String accessToken = json.getString(OidcConstants.ACCESS_TOKEN_VALUE);
+            final String refreshToken = json.getString(OidcConstants.REFRESH_TOKEN_VALUE);
+            Long accessTokenExpiresAt;
+            Long accessTokenExpiresIn = json.getLong(OidcConstants.EXPIRES_IN);
+            if (accessTokenExpiresIn != null) {
+                accessTokenExpiresAt = Instant.now().getEpochSecond() + accessTokenExpiresIn;
+            } else {
+                accessTokenExpiresAt = getExpiresJwtClaim(accessToken);
+            }
+            return new Tokens(accessToken, accessTokenExpiresAt, oidcConfig.refreshTokenTimeSkew.orElse(null), refreshToken);
+        } else {
+            LOG.debugf("%s OidcClient has failed to complete the %s grant request: %s", oidcConfig.getId().get(),
+                    (refresh ? OidcConstants.REFRESH_TOKEN_GRANT : grantType), resp.bodyAsString());
+            throw new OidcClientException();
+        }
+    }
+
+    private static Long getExpiresJwtClaim(String accessToken) {
+        JsonObject claims = decodeJwtToken(accessToken);
+        if (claims != null) {
+            try {
+                return claims.getLong(Claims.exp.name());
+            } catch (IllegalArgumentException ex) {
+                LOG.debug("JWT expiry claim can not be converted to Long");
+            }
+        }
+        return null;
+    }
+
+    private static JsonObject decodeJwtToken(String accessToken) {
+        String[] parts = accessToken.split("\\.");
+        if (parts.length == 3) {
+            try {
+                return new JsonObject(new String(Base64.getUrlDecoder().decode(parts[1]), StandardCharsets.UTF_8));
+            } catch (IllegalArgumentException ex) {
+                LOG.debug("JWT token can not be decoded using the Base64Url encoding scheme");
+            }
+        } else {
+            LOG.debug("Access token is not formatted as the encoded JWT token");
+        }
+        return null;
+    }
+
+    private static MultiMap copyMultiMap(MultiMap oldMap) {
+        MultiMap newMap = new MultiMap(io.vertx.core.MultiMap.caseInsensitiveMultiMap());
+        newMap.addAll(oldMap);
+        return newMap;
+    }
+
+    @Override
+    public void close() throws IOException {
+        client.close();
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java
new file mode 100644
index 0000000000000..7ea0df89b5fcf
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java
@@ -0,0 +1,216 @@
+package io.quarkus.oidc.client.runtime;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.URI;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClientConfig;
+import io.quarkus.oidc.client.OidcClientConfig.Grant;
+import io.quarkus.oidc.client.OidcClientException;
+import io.quarkus.oidc.client.OidcClients;
+import io.quarkus.oidc.client.Tokens;
+import io.quarkus.oidc.common.runtime.OidcCommonConfig.Credentials;
+import io.quarkus.oidc.common.runtime.OidcCommonUtils;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.Vertx;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.core.MultiMap;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+@Recorder
+public class OidcClientRecorder {
+
+    private static final Logger LOG = Logger.getLogger(OidcClientRecorder.class);
+    private static final String DEFAULT_OIDC_CLIENT_ID = "Default";
+    private static final Duration CONNECTION_BACKOFF_DURATION = Duration.ofSeconds(2);
+
+    public OidcClients setup(OidcClientsConfig oidcClientsConfig, TlsConfig tlsConfig, Supplier<Vertx> vertx) {
+
+        String defaultClientId = oidcClientsConfig.defaultClient.getId().orElse(DEFAULT_OIDC_CLIENT_ID);
+        OidcClient defaultClient = createOidcClient(oidcClientsConfig.defaultClient, defaultClientId, tlsConfig, vertx);
+
+        Map<String, OidcClient> staticOidcClients = new HashMap<>();
+
+        for (Map.Entry<String, OidcClientConfig> config : oidcClientsConfig.namedClients.entrySet()) {
+            OidcCommonUtils.verifyConfigurationId(defaultClientId, config.getKey(), config.getValue().getId());
+            staticOidcClients.put(config.getKey(),
+                    createOidcClient(config.getValue(), config.getKey(), tlsConfig, vertx));
+        }
+
+        return new OidcClientsImpl(defaultClient, staticOidcClients,
+                new Function<OidcClientConfig, Uni<OidcClient>>() {
+                    @Override
+                    public Uni<OidcClient> apply(OidcClientConfig config) {
+                        return createOidcClientUni(config, config.getId().get(), tlsConfig, vertx);
+                    }
+                });
+    }
+
+    public Supplier<OidcClient> createOidcClientBean(OidcClients clients) {
+        return new Supplier<OidcClient>() {
+
+            @Override
+            public OidcClient get() {
+                return clients.getClient();
+            }
+        };
+    }
+
+    public Supplier<OidcClients> createOidcClientsBean(OidcClients clients) {
+        return new Supplier<OidcClients>() {
+
+            @Override
+            public OidcClients get() {
+                return clients;
+            }
+        };
+    }
+
+    protected static OidcClient createOidcClient(OidcClientConfig oidcConfig, String oidcClientId,
+            TlsConfig tlsConfig, Supplier<Vertx> vertx) {
+        return createOidcClientUni(oidcConfig, oidcClientId, tlsConfig, vertx).await().indefinitely();
+    }
+
+    protected static Uni<OidcClient> createOidcClientUni(OidcClientConfig oidcConfig, String oidcClientId,
+            TlsConfig tlsConfig, Supplier<Vertx> vertx) {
+        if (!oidcConfig.isClientEnabled()) {
+            String message = String.format("'%s' client configuration is disabled", oidcClientId);
+            LOG.debug(message);
+            return Uni.createFrom().item(new DisabledOidcClient(message));
+        }
+        if (!oidcConfig.getId().isPresent()) {
+            oidcConfig.setId(oidcClientId);
+        }
+
+        OidcCommonUtils.verifyCommonConfiguration(oidcConfig, false);
+
+        String authServerUriString = OidcCommonUtils.getAuthServerUrl(oidcConfig);
+
+        WebClientOptions options = new WebClientOptions();
+
+        URI authServerUri = URI.create(authServerUriString); // create uri for parse exception
+        OidcCommonUtils.setHttpClientOptions(oidcConfig, tlsConfig, options);
+
+        WebClient client = WebClient.create(new io.vertx.mutiny.core.Vertx(vertx.get()), options);
+
+        Uni<String> tokenRequestUriUni = null;
+        if (!oidcConfig.discoveryEnabled) {
+            tokenRequestUriUni = Uni.createFrom()
+                    .item(OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(), oidcConfig.tokenPath));
+        } else {
+            tokenRequestUriUni = discoverTokenRequestUri(client, authServerUri.toString(), oidcConfig);
+        }
+        return tokenRequestUriUni.onItemOrFailure()
+                .transform(new BiFunction<String, Throwable, OidcClient>() {
+
+                    @Override
+                    public OidcClient apply(String tokenRequestUri, Throwable t) {
+                        if (t != null) {
+                            throw toOidcClientException(authServerUri.toString(), t);
+                        }
+
+                        if (tokenRequestUri == null) {
+                            throw new ConfigurationException(
+                                    "OpenId Connect Provider token endpoint URL is not configured and can not be discovered");
+                        }
+                        MultiMap tokenGrantParams = new MultiMap(io.vertx.core.MultiMap.caseInsensitiveMultiMap());
+
+                        String grantType = oidcConfig.grant.getType() == Grant.Type.CLIENT
+                                ? OidcConstants.CLIENT_CREDENTIALS_GRANT
+                                : OidcConstants.PASSWORD_GRANT;
+                        setGrantClientParams(oidcConfig, tokenGrantParams, grantType);
+
+                        if (oidcConfig.grant.getType() == Grant.Type.PASSWORD) {
+                            Map<String, String> passwordGrantOptions = oidcConfig.getGrantOptions()
+                                    .get(OidcConstants.PASSWORD_GRANT);
+                            tokenGrantParams.add(OidcConstants.PASSWORD_GRANT_USERNAME,
+                                    passwordGrantOptions.get(OidcConstants.PASSWORD_GRANT_USERNAME));
+                            tokenGrantParams.add(OidcConstants.PASSWORD_GRANT_PASSWORD,
+                                    passwordGrantOptions.get(OidcConstants.PASSWORD_GRANT_PASSWORD));
+                        }
+
+                        MultiMap commonRefreshGrantParams = new MultiMap(io.vertx.core.MultiMap.caseInsensitiveMultiMap());
+                        setGrantClientParams(oidcConfig, commonRefreshGrantParams, OidcConstants.REFRESH_TOKEN_GRANT);
+
+                        return new OidcClientImpl(client, tokenRequestUri, grantType, tokenGrantParams,
+                                commonRefreshGrantParams,
+                                oidcConfig);
+                    }
+                });
+    }
+
+    private static void setGrantClientParams(OidcClientConfig oidcConfig, MultiMap grantParams, String grantType) {
+        grantParams.add(OidcConstants.GRANT_TYPE, grantType);
+        Credentials creds = oidcConfig.getCredentials();
+        if (OidcCommonUtils.isClientSecretPostAuthRequired(creds)) {
+            grantParams.add(OidcConstants.CLIENT_ID, oidcConfig.clientId.get());
+            grantParams.add(OidcConstants.CLIENT_SECRET, OidcCommonUtils.clientSecret(creds));
+        }
+        if (oidcConfig.getScopes().isPresent()) {
+            grantParams.add(OidcConstants.TOKEN_SCOPE, oidcConfig.getScopes().get().stream().collect(Collectors.joining(" ")));
+        }
+    }
+
+    private static Uni<String> discoverTokenRequestUri(WebClient client, String authServerUrl, OidcClientConfig oidcConfig) {
+        final String discoveryUrl = authServerUrl + "/.well-known/openid-configuration";
+        final long connectionRetryCount = OidcCommonUtils.getConnectionRetryCount(oidcConfig);
+        final long expireInDelay = OidcCommonUtils.getConnectionDelayInMillis(oidcConfig);
+        if (connectionRetryCount > 1) {
+            LOG.infof("Connecting to IDP for up to %d times every 2 seconds", connectionRetryCount);
+        }
+        return client.getAbs(discoveryUrl).send().onItem().transform(resp -> {
+            if (resp.statusCode() == 200) {
+                JsonObject json = resp.bodyAsJsonObject();
+                return json.getString("token_endpoint");
+            } else {
+                LOG.tracef("Discovery has failed, status code: %d", resp.statusCode());
+                return null;
+            }
+        }).onFailure(ConnectException.class)
+                .retry()
+                .withBackOff(CONNECTION_BACKOFF_DURATION, CONNECTION_BACKOFF_DURATION)
+                .expireIn(expireInDelay);
+    }
+
+    protected static OidcClientException toOidcClientException(String authServerUrlString, Throwable cause) {
+        return new OidcClientException(OidcCommonUtils.formatConnectionErrorMessage(authServerUrlString), cause);
+    }
+
+    private static class DisabledOidcClient implements OidcClient {
+        String message;
+
+        DisabledOidcClient(String message) {
+            this.message = message;
+        }
+
+        @Override
+        public Uni<Tokens> getTokens() {
+            throw new OidcClientException(message);
+        }
+
+        @Override
+        public Uni<Tokens> refreshTokens(String refreshToken) {
+            throw new OidcClientException(message);
+        }
+
+        @Override
+        public void close() throws IOException {
+            throw new OidcClientException(message);
+        }
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientsConfig.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientsConfig.java
new file mode 100644
index 0000000000000..abf4db230b5ab
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientsConfig.java
@@ -0,0 +1,28 @@
+package io.quarkus.oidc.client.runtime;
+
+import java.util.Map;
+
+import io.quarkus.oidc.client.OidcClientConfig;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "oidc-client", phase = ConfigPhase.RUN_TIME)
+public class OidcClientsConfig {
+
+    /**
+     * The default client.
+     */
+    @ConfigItem(name = ConfigItem.PARENT)
+    public OidcClientConfig defaultClient;
+
+    /**
+     * Additional named clients.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("id")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, OidcClientConfig> namedClients;
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientsImpl.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientsImpl.java
new file mode 100644
index 0000000000000..5116c03b0d30e
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientsImpl.java
@@ -0,0 +1,55 @@
+package io.quarkus.oidc.client.runtime;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.function.Function;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.OidcClientConfig;
+import io.quarkus.oidc.client.OidcClientException;
+import io.quarkus.oidc.client.OidcClients;
+import io.smallrye.mutiny.Uni;
+
+public class OidcClientsImpl implements OidcClients, Closeable {
+    private OidcClient defaultClient;
+    private Map<String, OidcClient> staticOidcClients;
+    private Function<OidcClientConfig, Uni<OidcClient>> dynamicOidcClients;
+
+    public OidcClientsImpl() {
+    }
+
+    public OidcClientsImpl(OidcClient defaultClient, Map<String, OidcClient> staticOidcClients,
+            Function<OidcClientConfig, Uni<OidcClient>> dynamicOidcClients) {
+        this.defaultClient = defaultClient;
+        this.staticOidcClients = staticOidcClients;
+        this.dynamicOidcClients = dynamicOidcClients;
+    }
+
+    @Override
+    public OidcClient getClient() {
+        return defaultClient;
+    }
+
+    @Override
+    public OidcClient getClient(String id) {
+        return staticOidcClients.get(id);
+    }
+
+    @Override
+    public void close() throws IOException {
+        defaultClient.close();
+        for (OidcClient client : staticOidcClients.values()) {
+            client.close();
+        }
+    }
+
+    @Override
+    public Uni<OidcClient> newClient(OidcClientConfig clientConfig) {
+        if (!clientConfig.getId().isPresent()) {
+            throw new OidcClientException("'id' property must be set");
+        }
+        return dynamicOidcClients.apply(clientConfig);
+    }
+
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java
new file mode 100644
index 0000000000000..67c0537598171
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensHelper.java
@@ -0,0 +1,86 @@
+package io.quarkus.oidc.client.runtime;
+
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.BiConsumer;
+
+import io.quarkus.oidc.client.OidcClient;
+import io.quarkus.oidc.client.Tokens;
+import io.smallrye.mutiny.Uni;
+
+public class TokensHelper {
+
+    @SuppressWarnings("unused")
+    private volatile TokenRequestState tokenRequestState;
+
+    private static final AtomicReferenceFieldUpdater<TokensHelper, TokenRequestState> tokenRequestStateUpdater = AtomicReferenceFieldUpdater
+            .newUpdater(TokensHelper.class, TokenRequestState.class, "tokenRequestState");
+
+    public void initTokens(OidcClient oidcClient) {
+        //init the tokens, this just happens in a blocking manner for now
+        tokenRequestStateUpdater.set(this, new TokenRequestState(oidcClient.getTokens().await().indefinitely()));
+    }
+
+    public Uni<Tokens> getTokens(OidcClient oidcClient) {
+        TokenRequestState currentState = null;
+        TokenRequestState newState = null;
+        //if the tokens are expired we refresh them in an async manner
+        //we use CAS to make sure we only make a single request
+        for (;;) {
+            currentState = tokenRequestStateUpdater.get(this);
+            if (currentState == null) {
+                //init the initial state
+                //note that this can still happen at runtime as if there is an error then the state will be null
+                newState = new TokenRequestState(prepareUni(oidcClient.getTokens()));
+                if (tokenRequestStateUpdater.compareAndSet(this, currentState, newState)) {
+                    return newState.tokenUni;
+                }
+                //rerun the CAS loop
+            } else if (currentState.tokenUni != null) {
+                return currentState.tokenUni;
+            } else {
+                Tokens tokens = currentState.tokens;
+                if (tokens.isAccessTokenExpired() || tokens.isAccessTokenWithinRefreshInterval()) {
+                    newState = new TokenRequestState(prepareUni(tokens.getRefreshToken() != null
+                            ? oidcClient.refreshTokens(tokens.getRefreshToken())
+                            : oidcClient.getTokens()));
+                    if (tokenRequestStateUpdater.compareAndSet(this, currentState, newState)) {
+                        return newState.tokenUni;
+                    }
+                    //rerun the CAS loop
+                } else {
+                    return Uni.createFrom().item(tokens);
+                }
+            }
+        }
+    }
+
+    private Uni<Tokens> prepareUni(Uni<Tokens> tokens) {
+        return tokens.onItemOrFailure().invoke(new BiConsumer<Tokens, Throwable>() {
+            @Override
+            public void accept(Tokens tokens, Throwable throwable) {
+                //we only have a single outstanding request
+                //so we don't need to CAS
+                if (tokens != null) {
+                    tokenRequestStateUpdater.set(TokensHelper.this, new TokenRequestState(tokens));
+                } else {
+                    tokenRequestStateUpdater.set(TokensHelper.this, null);
+                }
+            }
+        });
+    }
+
+    static class TokenRequestState {
+        final Tokens tokens;
+        final Uni<Tokens> tokenUni;
+
+        TokenRequestState(Tokens tokens) {
+            this.tokens = tokens;
+            this.tokenUni = null;
+        }
+
+        TokenRequestState(Uni<Tokens> tokensUni) {
+            this.tokens = null;
+            this.tokenUni = tokensUni;
+        }
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java
new file mode 100644
index 0000000000000..d9c7052701cbf
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/TokensProducer.java
@@ -0,0 +1,17 @@
+package io.quarkus.oidc.client.runtime;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.quarkus.oidc.client.Tokens;
+
+@Singleton
+public class TokensProducer extends AbstractTokensProducer {
+
+    @Produces
+    @RequestScoped
+    public Tokens produceTokens() {
+        return getTokens().await().indefinitely();
+    }
+}
diff --git a/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..740b361072ae0
--- /dev/null
+++ b/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,12 @@
+---
+name: "OpenID Connect Client"
+metadata:
+  keywords:
+  - "oauth2"
+  - "openid-connect"
+  - "oidc"
+  - "oidc-client"
+  guide: "https://quarkus.io/guides/security-openid-connect-client"
+  categories:
+  - "security"
+  status: "preview"
diff --git a/extensions/oidc-common/deployment/pom.xml b/extensions/oidc-common/deployment/pom.xml
new file mode 100644
index 0000000000000..0f3f3183de661
--- /dev/null
+++ b/extensions/oidc-common/deployment/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-common-deployment</artifactId>
+    <name>Quarkus - OpenID Connect Common - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-common</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/oidc-common/deployment/src/main/java/io/quarkus/oidc/common/deployment/DummyForJavadoc.java b/extensions/oidc-common/deployment/src/main/java/io/quarkus/oidc/common/deployment/DummyForJavadoc.java
new file mode 100644
index 0000000000000..9d8cdd8331058
--- /dev/null
+++ b/extensions/oidc-common/deployment/src/main/java/io/quarkus/oidc/common/deployment/DummyForJavadoc.java
@@ -0,0 +1,8 @@
+package io.quarkus.oidc.common.deployment;
+
+/**
+ * Quick workaround to have at least one public class and generate a Javadoc jar.
+ */
+public class DummyForJavadoc {
+
+}
diff --git a/extensions/oidc-common/pom.xml b/extensions/oidc-common/pom.xml
new file mode 100644
index 0000000000000..93ec3a981d41d
--- /dev/null
+++ b/extensions/oidc-common/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-common-parent</artifactId>
+    <name>Quarkus - OpenID Connect Common</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/oidc-common/runtime/pom.xml b/extensions/oidc-common/runtime/pom.xml
new file mode 100644
index 0000000000000..23d507919aa9d
--- /dev/null
+++ b/extensions/oidc-common/runtime/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-common</artifactId>
+    <name>Quarkus - OpenID Connect Common - Runtime</name>
+    <description>OpenID Connect Common - Runtime</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>io.smallrye.reactive</groupId>
+          <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
new file mode 100644
index 0000000000000..60d53bb4af2af
--- /dev/null
+++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
@@ -0,0 +1,360 @@
+package io.quarkus.oidc.common.runtime;
+
+import java.time.Duration;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class OidcCommonConfig {
+    /**
+     * The base URL of the OpenID Connect (OIDC) server, for example, `https://host:port/auth`.
+     * OIDC discovery endpoint will be called by default by appending a '.well-known/openid-configuration' path to this URL.
+     * Note if you work with Keycloak OIDC server, make sure the base URL is in the following format:
+     * `https://host:port/auth/realms/{realm}` where `{realm}` has to be replaced by the name of the Keycloak realm.
+     */
+    @ConfigItem
+    public Optional<String> authServerUrl = Optional.empty();
+
+    /**
+     * Enables OIDC discovery.
+     * If the discovery is disabled then the 'token-path' property must be configured.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean discoveryEnabled = true;
+
+    /**
+     * Relative path of the OIDC token endpoint which issues access and refresh tokens
+     * using either 'client_credentials' or 'password' grants
+     */
+    @ConfigItem
+    public Optional<String> tokenPath = Optional.empty();
+
+    /**
+     * The client-id of the application. Each application has a client-id that is used to identify the application
+     */
+    @ConfigItem
+    public Optional<String> clientId = Optional.empty();
+
+    /**
+     * The maximum amount of time connecting to the currently unavailable OIDC server will be attempted for.
+     * The number of times the connection request will be repeated is calculated by dividing the value of this property by 2.
+     * For example, setting it to `20S` will allow for requesting the connection up to 10 times with a 2 seconds delay between
+     * the retries.
+     * Note the `connection-timeout` property does not affect this amount of time.
+     */
+    @ConfigItem
+    public Optional<Duration> connectionDelay = Optional.empty();
+
+    /**
+     * The amount of time after which the connection request to the currently unavailable OIDC server will time out.
+     */
+    @ConfigItem(defaultValue = "10s")
+    public Duration connectionTimeout = Duration.ofSeconds(10);
+
+    /**
+     * Credentials which the OIDC adapter will use to authenticate to the OIDC server.
+     */
+    @ConfigItem
+    public Credentials credentials = new Credentials();
+
+    /**
+     * Options to configure a proxy that OIDC adapter will use for talking with OIDC server.
+     */
+    @ConfigItem
+    public Proxy proxy = new Proxy();
+
+    /**
+     * TLS configurations
+     */
+    @ConfigItem
+    public Tls tls = new Tls();
+
+    @ConfigGroup
+    public static class Credentials {
+
+        /**
+         * Client secret which is used for a `client_secret_basic` authentication method.
+         * Note that a 'client-secret.value' can be used instead but both properties are mutually exclusive.
+         */
+        @ConfigItem
+        public Optional<String> secret = Optional.empty();
+
+        /**
+         * Client secret which can be used for the `client_secret_basic` (default) and `client_secret_post`
+         * and 'client_secret_jwt' authentication methods.
+         * Note that a `secret.value` property can be used instead to support the `client_secret_basic` method
+         * but both properties are mutually exclusive.
+         */
+        @ConfigItem
+        public Secret clientSecret = new Secret();
+
+        /**
+         * Client JWT authentication methods
+         */
+        @ConfigItem
+        public Jwt jwt = new Jwt();
+
+        public Optional<String> getSecret() {
+            return secret;
+        }
+
+        public void setSecret(String secret) {
+            this.secret = Optional.of(secret);
+        }
+
+        public Secret getClientSecret() {
+            return clientSecret;
+        }
+
+        public void setClientSecret(Secret clientSecret) {
+            this.clientSecret = clientSecret;
+        }
+
+        /**
+         * Supports the client authentication methods which involve sending a client secret.
+         *
+         * @see <a href=
+         *      "https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication">https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication</a>
+         */
+        @ConfigGroup
+        public static class Secret {
+
+            public static enum Method {
+                /**
+                 * client_secret_basic (default): client id and secret are submitted with the HTTP Authorization Basic scheme
+                 */
+                BASIC,
+
+                /**
+                 * client_secret_post: client id and secret are submitted as the 'client_id' and 'client_secret' form
+                 * parameters.
+                 */
+                POST
+            }
+
+            /**
+             * The client secret
+             */
+            @ConfigItem
+            public Optional<String> value = Optional.empty();
+
+            /**
+             * Authentication method.
+             */
+            @ConfigItem
+            public Optional<Method> method = Optional.empty();
+
+            public Optional<String> getValue() {
+                return value;
+            }
+
+            public void setValue(String value) {
+                this.value = Optional.of(value);
+            }
+
+            public Optional<Method> getMethod() {
+                return method;
+            }
+
+            public void setMethod(Method method) {
+                this.method = Optional.of(method);
+            }
+        }
+
+        /**
+         * Supports the client authentication 'client_secret_jwt' and 'private_key_jwt' methods which involve sending a JWT
+         * token
+         * assertion signed with either a client secret or private key.
+         *
+         * @see <a href=
+         *      "https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication">https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication</a>
+         */
+        @ConfigGroup
+        public static class Jwt {
+            /**
+             * If provided, indicates that JWT is signed using a secret key
+             */
+            @ConfigItem
+            public Optional<String> secret = Optional.empty();
+
+            /**
+             * If provided, indicates that JWT is signed using a private key in PEM or JWK format
+             */
+            @ConfigItem
+            public Optional<String> keyFile = Optional.empty();
+
+            /**
+             * If provided, indicates that JWT is signed using a private key from a key store
+             */
+            @ConfigItem
+            public Optional<String> keyStoreFile = Optional.empty();
+
+            /**
+             * A parameter to specify the password of the key store file. If not given, the default ("password") is used.
+             */
+            @ConfigItem(defaultValue = "password")
+            public String keyStorePassword;
+
+            /**
+             * The private key id/alias
+             */
+            @ConfigItem
+            public Optional<String> keyId = Optional.empty();
+
+            /**
+             * The private key password
+             */
+            @ConfigItem(defaultValue = "password")
+            public String keyPassword;
+
+            /**
+             * JWT life-span in seconds. It will be added to the time it was issued at to calculate the expiration time.
+             */
+            @ConfigItem(defaultValue = "10")
+            public int lifespan = 10;
+
+            public Optional<String> getSecret() {
+                return secret;
+            }
+
+            public void setSecret(String secret) {
+                this.secret = Optional.of(secret);
+            }
+
+            public int getLifespan() {
+                return lifespan;
+            }
+
+            public void setLifespan(int lifespan) {
+                this.lifespan = lifespan;
+            }
+        }
+    }
+
+    @ConfigGroup
+    public static class Tls {
+        public enum Verification {
+            /**
+             * Certificates are validated and hostname verification is enabled. This is the default value.
+             */
+            REQUIRED,
+            /**
+             * All certificated are trusted and hostname verification is disabled.
+             */
+            NONE
+        }
+
+        /**
+         * Certificate validation and hostname verification, which can be one of the following values from enum
+         * {@link Verification}. Default is required.
+         */
+        @ConfigItem
+        public Optional<Verification> verification = Optional.empty();
+
+        public Optional<Verification> getVerification() {
+            return verification;
+        }
+
+        public void setVerification(Verification verification) {
+            this.verification = Optional.of(verification);
+        }
+
+    }
+
+    @ConfigGroup
+    public static class Proxy {
+
+        /**
+         * The host (name or IP address) of the Proxy.<br/>
+         * Note: If OIDC adapter needs to use a Proxy to talk with OIDC server (Provider),
+         * then at least the "host" config item must be configured to enable the usage of a Proxy.
+         */
+        @ConfigItem
+        public Optional<String> host = Optional.empty();
+
+        /**
+         * The port number of the Proxy. Default value is 80.
+         */
+        @ConfigItem(defaultValue = "80")
+        public int port = 80;
+
+        /**
+         * The username, if Proxy needs authentication.
+         */
+        @ConfigItem
+        public Optional<String> username = Optional.empty();
+
+        /**
+         * The password, if Proxy needs authentication.
+         */
+        @ConfigItem
+        public Optional<String> password = Optional.empty();
+
+    }
+
+    public Optional<Duration> getConnectionDelay() {
+        return connectionDelay;
+    }
+
+    public void setConnectionDelay(Duration connectionDelay) {
+        this.connectionDelay = Optional.of(connectionDelay);
+    }
+
+    public Optional<String> getAuthServerUrl() {
+        return authServerUrl;
+    }
+
+    public void setAuthServerUrl(String authServerUrl) {
+        this.authServerUrl = Optional.of(authServerUrl);
+    }
+
+    public Optional<String> getTokenPath() {
+        return tokenPath;
+    }
+
+    public void setTokenPath(String tokenPath) {
+        this.tokenPath = Optional.of(tokenPath);
+    }
+
+    public Optional<String> getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = Optional.of(clientId);
+    }
+
+    public Credentials getCredentials() {
+        return credentials;
+    }
+
+    public void setCredentials(Credentials credentials) {
+        this.credentials = credentials;
+    }
+
+    public boolean isDiscoveryEnabled() {
+        return discoveryEnabled;
+    }
+
+    public void setDiscoveryEnabled(boolean enabled) {
+        this.discoveryEnabled = enabled;
+    }
+
+    public Proxy getProxy() {
+        return proxy;
+    }
+
+    public void setProxy(Proxy proxy) {
+        this.proxy = proxy;
+    }
+
+    public Duration getConnectionTimeout() {
+        return connectionTimeout;
+    }
+
+    public void setConnectionTimeout(Duration connectionTimeout) {
+        this.connectionTimeout = connectionTimeout;
+    }
+}
diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
new file mode 100644
index 0000000000000..a694ad270cca7
--- /dev/null
+++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
@@ -0,0 +1,212 @@
+package io.quarkus.oidc.common.runtime;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.util.Base64;
+import java.util.Optional;
+
+import javax.crypto.SecretKey;
+
+import io.quarkus.oidc.common.runtime.OidcCommonConfig.Credentials;
+import io.quarkus.oidc.common.runtime.OidcCommonConfig.Credentials.Secret;
+import io.quarkus.oidc.common.runtime.OidcCommonConfig.Tls.Verification;
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.smallrye.jwt.build.Jwt;
+import io.smallrye.jwt.build.JwtClaimsBuilder;
+import io.smallrye.jwt.util.KeyUtils;
+import io.smallrye.jwt.util.ResourceUtils;
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.ProxyOptions;
+
+public class OidcCommonUtils {
+    private OidcCommonUtils() {
+
+    }
+
+    public static void verifyCommonConfiguration(OidcCommonConfig oidcConfig, boolean isServerConfig) {
+        final String configPrefix = isServerConfig ? "quarkus.oidc." : "quarkus.oidc-client.";
+        if (!oidcConfig.getAuthServerUrl().isPresent() || !oidcConfig.getClientId().isPresent()) {
+            throw new ConfigurationException(
+                    String.format("Both '%sauth-server-url' and '%sclient-id' properties must be configured", configPrefix));
+        }
+
+        Credentials creds = oidcConfig.getCredentials();
+        if (creds.secret.isPresent() && creds.clientSecret.value.isPresent()) {
+            throw new ConfigurationException(
+                    String.format("'%scredentials.secret' and '%scredentials.client-secret' properties are mutually exclusive",
+                            configPrefix));
+        }
+        if ((creds.secret.isPresent() || creds.clientSecret.value.isPresent()) && creds.jwt.secret.isPresent()) {
+            throw new ConfigurationException(
+                    String.format(
+                            "Use only '%scredentials.secret' or '%scredentials.client-secret' or '%scredentials.jwt.secret' property",
+                            configPrefix));
+        }
+    }
+
+    public static String prependSlash(String path) {
+        return !path.startsWith("/") ? "/" + path : path;
+    }
+
+    public static void setHttpClientOptions(OidcCommonConfig oidcConfig, TlsConfig tlsConfig, HttpClientOptions options) {
+        boolean trustAll = oidcConfig.tls.verification.isPresent() ? oidcConfig.tls.verification.get() == Verification.NONE
+                : tlsConfig.trustAll;
+        if (trustAll) {
+            options.setTrustAll(true);
+            options.setVerifyHost(false);
+        }
+        Optional<ProxyOptions> proxyOpt = toProxyOptions(oidcConfig.getProxy());
+        if (proxyOpt.isPresent()) {
+            options.setProxyOptions(proxyOpt.get());
+        }
+        options.setConnectTimeout((int) oidcConfig.getConnectionTimeout().toMillis());
+    }
+
+    public static String getAuthServerUrl(OidcCommonConfig oidcConfig) {
+        String authServerUrl = oidcConfig.getAuthServerUrl().get();
+        if (authServerUrl.endsWith("/")) {
+            authServerUrl = authServerUrl.substring(0, authServerUrl.length() - 1);
+        }
+        return authServerUrl;
+    }
+
+    public static String getOidcEndpointUrl(String authServerUrl, Optional<String> endpointPath) {
+        if (endpointPath.isPresent()) {
+            return authServerUrl + prependSlash(endpointPath.get());
+        } else {
+            return null;
+        }
+    }
+
+    public static long getConnectionRetryCount(OidcCommonConfig oidcConfig) {
+        final long connectionDelayInSecs = getConnectionDelay(oidcConfig);
+        return connectionDelayInSecs > 1 ? connectionDelayInSecs / 2 : 1;
+    }
+
+    private static long getConnectionDelay(OidcCommonConfig oidcConfig) {
+        return oidcConfig.getConnectionDelay().isPresent()
+                ? oidcConfig.getConnectionDelay().get().getSeconds()
+                : 0;
+    }
+
+    public static long getConnectionDelayInMillis(OidcCommonConfig oidcConfig) {
+        return getConnectionDelay(oidcConfig) * 1000;
+    }
+
+    public static Optional<ProxyOptions> toProxyOptions(OidcCommonConfig.Proxy proxyConfig) {
+        // Proxy is enabled if (at least) "host" is configured.
+        if (!proxyConfig.host.isPresent()) {
+            return Optional.empty();
+        }
+        JsonObject jsonOptions = new JsonObject();
+        jsonOptions.put("host", proxyConfig.host.get());
+        jsonOptions.put("port", proxyConfig.port);
+        if (proxyConfig.username.isPresent()) {
+            jsonOptions.put("username", proxyConfig.username.get());
+        }
+        if (proxyConfig.password.isPresent()) {
+            jsonOptions.put("password", proxyConfig.password.get());
+        }
+        return Optional.of(new ProxyOptions(jsonOptions));
+    }
+
+    public static String formatConnectionErrorMessage(String authServerUrlString) {
+        return String.format("OIDC server is not available at the '%s' URL. "
+                + "Please make sure it is correct. Note it has to end with a realm value if you work with Keycloak, for example:"
+                + " 'https://localhost:8180/auth/realms/quarkus'", authServerUrlString);
+    }
+
+    public static boolean isClientSecretBasicAuthRequired(Credentials creds) {
+        return creds.secret.isPresent() || creds.clientSecret.value.isPresent()
+                && creds.clientSecret.method.orElseGet(() -> Secret.Method.BASIC) == Secret.Method.BASIC;
+    }
+
+    public static boolean isClientJwtAuthRequired(Credentials creds) {
+        return creds.jwt.secret.isPresent() || creds.jwt.keyFile.isPresent() || creds.jwt.keyStoreFile.isPresent();
+    }
+
+    public static boolean isClientSecretPostAuthRequired(Credentials creds) {
+        return creds.clientSecret.value.isPresent()
+                && creds.clientSecret.method.orElseGet(() -> Secret.Method.BASIC) == Secret.Method.POST;
+    }
+
+    public static String clientSecret(Credentials creds) {
+        return creds.secret.orElseGet(() -> creds.clientSecret.value.get());
+    }
+
+    public static Key clientJwtKey(Credentials creds) {
+        if (creds.jwt.secret.isPresent()) {
+            return KeyUtils.createSecretKeyFromSecret(creds.jwt.secret.get());
+        } else {
+            Key key = null;
+            try {
+                if (creds.jwt.keyFile.isPresent()) {
+                    key = KeyUtils.readSigningKey(creds.jwt.keyFile.get(), creds.jwt.keyId.orElse(null));
+                } else if (creds.jwt.keyStoreFile.isPresent()) {
+                    KeyStore ks = KeyStore.getInstance("JKS");
+                    InputStream is = ResourceUtils.getResourceStream(creds.jwt.keyStoreFile.get());
+                    ks.load(is, creds.jwt.keyStorePassword.toCharArray());
+                    key = ks.getKey(creds.jwt.keyId.get(), creds.jwt.keyPassword.toCharArray());
+                }
+            } catch (Exception ex) {
+                throw new ConfigurationException("Key can not be loaded");
+            }
+            if (key == null) {
+                throw new ConfigurationException("Key is null");
+            }
+            return key;
+        }
+    }
+
+    public static String signJwt(OidcCommonConfig oidcConfig) {
+        return signJwtWithKey(oidcConfig, clientJwtKey(oidcConfig.credentials));
+    }
+
+    public static String signJwtWithKey(OidcCommonConfig oidcConfig, Key key) {
+        // 'jti' and 'iat' claim is created by default, iat - is set to the current time
+        JwtClaimsBuilder builder = Jwt
+                .issuer(oidcConfig.clientId.get())
+                .subject(oidcConfig.clientId.get())
+                .audience(getAuthServerUrl(oidcConfig))
+                .expiresIn(oidcConfig.credentials.jwt.lifespan);
+        if (key instanceof SecretKey) {
+            return builder.sign((SecretKey) key);
+        } else {
+            return builder.sign((PrivateKey) key);
+        }
+    }
+
+    public static void verifyConfigurationId(String defaultId, String configKey, Optional<String> configId) {
+        if (configKey.equals(defaultId)) {
+            throw new ConfigurationException("configuration id '" + configKey + "' duplicates the default configuration id");
+        }
+        if (configId.isPresent() && !configKey.equals(configId.get())) {
+            throw new ConfigurationException("Configuration has 2 different id values: '"
+                    + configKey + "' and '" + configId.get() + "'");
+        }
+
+    }
+
+    public static String initClientSecretBasicAuth(OidcCommonConfig oidcConfig) {
+        if (OidcCommonUtils.isClientSecretBasicAuthRequired(oidcConfig.credentials)) {
+            return OidcConstants.BASIC_SCHEME + " "
+                    + Base64.getEncoder().encodeToString(
+                            (oidcConfig.getClientId().get() + ":"
+                                    + OidcCommonUtils.clientSecret(oidcConfig.credentials))
+                                            .getBytes(StandardCharsets.UTF_8));
+        }
+        return null;
+    }
+
+    public static Key initClientJwtKey(OidcCommonConfig oidcConfig) {
+        if (OidcCommonUtils.isClientJwtAuthRequired(oidcConfig.credentials)) {
+            return OidcCommonUtils.clientJwtKey(oidcConfig.credentials);
+        }
+        return null;
+    }
+}
diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java
new file mode 100644
index 0000000000000..60c982b4ba0fb
--- /dev/null
+++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcConstants.java
@@ -0,0 +1,43 @@
+package io.quarkus.oidc.common.runtime;
+
+public final class OidcConstants {
+
+    public static final String CLIENT_ASSERTION = "client_assertion";
+    public static final String CLIENT_ASSERTION_TYPE = "client_assertion_type";
+    public static final String JWT_BEARER_CLIENT_ASSERTION_TYPE = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
+
+    public static final String CLIENT_CREDENTIALS_GRANT = "client_credentials";
+    public static final String PASSWORD_GRANT = "password";
+    public static final String REFRESH_TOKEN_GRANT = "refresh_token";
+    public static final String REFRESH_TOKEN_VALUE = "refresh_token";
+
+    public static final String ACCESS_TOKEN_VALUE = "access_token";
+    public static final String ID_TOKEN_VALUE = "id_token";
+
+    public static final String INTROSPECTION_TOKEN_TYPE_HINT = "token_type_hint";
+    public static final String INTROSPECTION_TOKEN = "token";
+    public static final String INTROSPECTION_TOKEN_ACTIVE = "active";
+    public static final String INTROSPECTION_TOKEN_EXP = "exp";
+    public static final String INTROSPECTION_TOKEN_USERNAME = "username";
+
+    public static final String PASSWORD_GRANT_USERNAME = "username";
+    public static final String PASSWORD_GRANT_PASSWORD = "password";
+
+    public static final String TOKEN_SCOPE = "scope";
+    public static final String GRANT_TYPE = "grant_type";
+
+    public static final String CLIENT_ID = "client_id";
+    public static final String CLIENT_SECRET = "client_secret";
+
+    public static final String BEARER_SCHEME = "Bearer";
+    public static final String BASIC_SCHEME = "Basic";
+
+    public static final String AUTHORIZATION_CODE = "authorization_code";
+    public static final String CODE_FLOW_RESPONSE_TYPE = "response_type";
+    public static final String CODE_FLOW_CODE = "code";
+    public static final String CODE_FLOW_STATE = "state";
+    public static final String CODE_FLOW_REDIRECT_URI = "redirect_uri";
+
+    public static final String EXPIRES_IN = "expires_in";
+
+}
diff --git a/extensions/oidc-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..af3f6c46792f0
--- /dev/null
+++ b/extensions/oidc-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,11 @@
+---
+name: "OpenID Connect Common"
+metadata:
+  keywords:
+  - "oauth2"
+  - "openid-connect"
+  - "oidc"
+  categories:
+  - "security"
+  status: "preview"
+  unlisted: true
diff --git a/extensions/oidc-token-propagation/deployment/pom.xml b/extensions/oidc-token-propagation/deployment/pom.xml
new file mode 100644
index 0000000000000..fea83659f5972
--- /dev/null
+++ b/extensions/oidc-token-propagation/deployment/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-token-propagation-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+    <name>Quarkus - OpenID Connect Token Propagation - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-token-propagation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/oidc-token-propagation/deployment/src/main/java/io/quarkus/oidc/token/propagation/deployment/OidcTokenPropagationBuildStep.java b/extensions/oidc-token-propagation/deployment/src/main/java/io/quarkus/oidc/token/propagation/deployment/OidcTokenPropagationBuildStep.java
new file mode 100644
index 0000000000000..d3511f4f1db79
--- /dev/null
+++ b/extensions/oidc-token-propagation/deployment/src/main/java/io/quarkus/oidc/token/propagation/deployment/OidcTokenPropagationBuildStep.java
@@ -0,0 +1,68 @@
+package io.quarkus.oidc.token.propagation.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.EnableAllSecurityServicesBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.oidc.token.propagation.AccessToken;
+import io.quarkus.oidc.token.propagation.AccessTokenRequestFilter;
+import io.quarkus.oidc.token.propagation.JsonWebToken;
+import io.quarkus.oidc.token.propagation.JsonWebTokenRequestFilter;
+import io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationBuildTimeConfig;
+import io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfig;
+import io.quarkus.restclient.deployment.RestClientAnnotationProviderBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+
+public class OidcTokenPropagationBuildStep {
+
+    private static final DotName ACCESS_TOKEN_CREDENTIAL = DotName.createSimple(AccessToken.class.getName());
+    private static final DotName JWT_ACCESS_TOKEN_CREDENTIAL = DotName.createSimple(JsonWebToken.class.getName());
+
+    OidcTokenPropagationConfig config;
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.OIDC_TOKEN_PROPAGATION);
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    EnableAllSecurityServicesBuildItem security() {
+        return new EnableAllSecurityServicesBuildItem();
+    }
+
+    @BuildStep(onlyIf = IsEnabled.class)
+    void registerProvider(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ResteasyJaxrsProviderBuildItem> jaxrsProviders,
+            BuildProducer<RestClientAnnotationProviderBuildItem> restAnnotationProvider) {
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(AccessTokenRequestFilter.class));
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(JsonWebTokenRequestFilter.class));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, AccessTokenRequestFilter.class));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, JsonWebTokenRequestFilter.class));
+
+        if (config.registerFilter) {
+            Class<?> filterClass = config.jsonWebToken ? JsonWebTokenRequestFilter.class : AccessTokenRequestFilter.class;
+            jaxrsProviders.produce(new ResteasyJaxrsProviderBuildItem(filterClass.getName()));
+        } else {
+            restAnnotationProvider.produce(new RestClientAnnotationProviderBuildItem(ACCESS_TOKEN_CREDENTIAL,
+                    AccessTokenRequestFilter.class));
+            restAnnotationProvider.produce(new RestClientAnnotationProviderBuildItem(JWT_ACCESS_TOKEN_CREDENTIAL,
+                    JsonWebTokenRequestFilter.class));
+        }
+    }
+
+    public static class IsEnabled implements BooleanSupplier {
+        OidcTokenPropagationBuildTimeConfig config;
+
+        public boolean getAsBoolean() {
+            return config.enabled;
+        }
+    }
+}
diff --git a/extensions/oidc-token-propagation/pom.xml b/extensions/oidc-token-propagation/pom.xml
new file mode 100644
index 0000000000000..998b2b62ee3b0
--- /dev/null
+++ b/extensions/oidc-token-propagation/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-token-propagation-parent</artifactId>
+    <name>Quarkus - OpenID Connect Token Propagation</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/oidc-token-propagation/runtime/pom.xml b/extensions/oidc-token-propagation/runtime/pom.xml
new file mode 100644
index 0000000000000..a3c575cf2e79b
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-oidc-token-propagation-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-oidc-token-propagation</artifactId>
+    <name>Quarkus - OpenID Connect Token Propagation - Runtime</name>
+    <description>Use JAX-RS client filter to propagate the current access token as HTTP Authorization Bearer value</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.jwt</groupId>
+            <artifactId>microprofile-jwt-auth-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java
new file mode 100644
index 0000000000000..a3075712a3bfe
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java
@@ -0,0 +1,13 @@
+package io.quarkus.oidc.token.propagation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface AccessToken {
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java
new file mode 100644
index 0000000000000..321573ed3c80c
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java
@@ -0,0 +1,23 @@
+package io.quarkus.oidc.token.propagation;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.ws.rs.client.ClientRequestContext;
+
+import io.quarkus.oidc.token.propagation.runtime.AbstractTokenRequestFilter;
+import io.quarkus.security.credential.TokenCredential;
+
+public class AccessTokenRequestFilter extends AbstractTokenRequestFilter {
+
+    @Inject
+    Instance<TokenCredential> accessToken;
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        if (verifyTokenInstance(requestContext, accessToken)) {
+            propagateToken(requestContext, accessToken.get().getToken());
+        }
+    }
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java
new file mode 100644
index 0000000000000..e7b8601602bd6
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java
@@ -0,0 +1,13 @@
+package io.quarkus.oidc.token.propagation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface JsonWebToken {
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java
new file mode 100644
index 0000000000000..4151e696ac946
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java
@@ -0,0 +1,36 @@
+package io.quarkus.oidc.token.propagation;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.ws.rs.client.ClientRequestContext;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import io.quarkus.oidc.token.propagation.runtime.AbstractTokenRequestFilter;
+import io.smallrye.jwt.build.Jwt;
+
+public class JsonWebTokenRequestFilter extends AbstractTokenRequestFilter {
+    @Inject
+    Instance<org.eclipse.microprofile.jwt.JsonWebToken> jwtAccessToken;
+
+    @Inject
+    @ConfigProperty(name = "quarkus.oidc-token-propagation.secure-json-web-token")
+    boolean resignToken;
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        if (verifyTokenInstance(requestContext, jwtAccessToken)) {
+            propagateToken(requestContext, getToken());
+        }
+    }
+
+    private String getToken() {
+        if (resignToken) {
+            return Jwt.claims(jwtAccessToken.get()).sign();
+        } else {
+            return jwtAccessToken.get().getRawToken();
+        }
+    }
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java
new file mode 100644
index 0000000000000..262ca3089b2d5
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/AbstractTokenRequestFilter.java
@@ -0,0 +1,51 @@
+package io.quarkus.oidc.token.propagation.runtime;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.enterprise.inject.Instance;
+import javax.inject.Singleton;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.logging.Logger;
+
+@Provider
+@Singleton
+@Priority(Priorities.AUTHENTICATION)
+public abstract class AbstractTokenRequestFilter implements ClientRequestFilter {
+    private static final Logger LOG = Logger.getLogger(AbstractTokenRequestFilter.class);
+    private static final String BEARER_SCHEME_WITH_SPACE = "Bearer ";
+
+    public void propagateToken(ClientRequestContext requestContext, String token) throws IOException {
+        if (token != null) {
+            requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, BEARER_SCHEME_WITH_SPACE + token);
+        } else {
+            LOG.debugf("Injected access token is null, aborting the request with HTTP 401 error");
+            abortRequest(requestContext);
+        }
+    }
+
+    protected boolean verifyTokenInstance(ClientRequestContext requestContext, Instance<?> instance) throws IOException {
+        if (!instance.isResolvable()) {
+            LOG.debugf("Access token is not injected, aborting the request with HTTP 401 error");
+            abortRequest(requestContext);
+            return false;
+        }
+        if (instance.isAmbiguous()) {
+            LOG.debugf("More than one access token instance is available, aborting the request with HTTP 401 error");
+            abortRequest(requestContext);
+            return false;
+        }
+
+        return true;
+    }
+
+    protected void abortRequest(ClientRequestContext requestContext) {
+        requestContext.abortWith(Response.status(401).build());
+    }
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationBuildTimeConfig.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationBuildTimeConfig.java
new file mode 100644
index 0000000000000..84c1feda61bae
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationBuildTimeConfig.java
@@ -0,0 +1,16 @@
+package io.quarkus.oidc.token.propagation.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * Build time configuration for OIDC Token Propagation.
+ */
+@ConfigRoot
+public class OidcTokenPropagationBuildTimeConfig {
+    /**
+     * If the OIDC Token Propagation is enabled.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enabled;
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfig.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfig.java
new file mode 100644
index 0000000000000..30db061614909
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfig.java
@@ -0,0 +1,41 @@
+package io.quarkus.oidc.token.propagation.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "oidc-token-propagation", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class OidcTokenPropagationConfig {
+    /**
+     * Enable either AccessTokenRequestFilter or JsonWebTokenRequestFilter for all the injected MP RestClient implementations.
+     *
+     * AccessTokenRequestFilter can propagate both opaque (binary) and JsonWebToken tokens but it can not modify
+     * and secure the updated JsonWebToken tokens.
+     * JsonWebTokenRequestFilter can only propagate JsonWebToken tokens but it can also modify and secure them again.
+     * Enable the 'jsonWebToken' property to have JsonWebTokenRequestFilter registered.
+     *
+     * Alternatively, instead of using this property for registering these filters with all the injected MP RestClient
+     * implementations, both filters can be registered as MP RestClient providers with the specific MP RestClient
+     * implementations.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean registerFilter;
+
+    /**
+     * Enable JsonWebTokenRequestFilter instead of AccessTokenRequestFilter for all the injected MP RestClient implementations.
+     * This filter can propagate as well as modify and secure the updated JsonWebToken tokens.
+     *
+     * Note this property is ignored unless the 'registerFilter' property is enabled.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean jsonWebToken;
+
+    /**
+     * Secure the injected and possibly modified JsonWebToken.
+     * For example, a JsonWebToken produced and signed by OpenId Connect provider can be re-signed using a new private key.
+     *
+     * Note this property is injected into JsonWebTokenRequestFilter.
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean secureJsonWebToken;
+}
diff --git a/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..f66fae8a8a4e7
--- /dev/null
+++ b/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "OpenID Connect Token Propagation"
+metadata:
+  keywords:
+  - "oauth2"
+  - "openid-connect"
+  - "oidc"
+  - "oidc-client"
+  - "oidc-token-propagation"
+  guide: "https://quarkus.io/guides/security-openid-connect-client"
+  categories:
+  - "security"
+  status: "preview"
diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml
index 38ee3d458fc58..951d1b8aa13d0 100644
--- a/extensions/oidc/deployment/pom.xml
+++ b/extensions/oidc/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-oidc-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +33,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-oidc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-common-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson-deployment</artifactId>
@@ -74,7 +77,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -112,7 +115,7 @@
             <id>test-keycloak</id>
             <activation>
                 <property>
-                    <name>test-keycloak</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -134,7 +137,7 @@
             <id>docker-keycloak</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -204,7 +207,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java
index 519a1236dcd67..780907c2d5b43 100644
--- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java
+++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java
@@ -1,13 +1,19 @@
 package io.quarkus.oidc.deployment;
 
+import java.util.Collection;
 import java.util.function.BooleanSupplier;
 
 import javax.inject.Singleton;
 
 import org.eclipse.microprofile.jwt.Claim;
+import org.jboss.jandex.DotName;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
+import io.quarkus.arc.processor.BuildExtension;
+import io.quarkus.arc.processor.ObserverInfo;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -18,24 +24,27 @@
 import io.quarkus.deployment.builditem.EnableAllSecurityServicesBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.oidc.SecurityEvent;
 import io.quarkus.oidc.runtime.DefaultTenantConfigResolver;
+import io.quarkus.oidc.runtime.DefaultTokenStateManager;
 import io.quarkus.oidc.runtime.OidcAuthenticationMechanism;
 import io.quarkus.oidc.runtime.OidcBuildTimeConfig;
 import io.quarkus.oidc.runtime.OidcConfig;
+import io.quarkus.oidc.runtime.OidcConfigurationMetadataProducer;
 import io.quarkus.oidc.runtime.OidcIdentityProvider;
 import io.quarkus.oidc.runtime.OidcJsonWebTokenProducer;
 import io.quarkus.oidc.runtime.OidcRecorder;
 import io.quarkus.oidc.runtime.OidcTokenCredentialProducer;
 import io.quarkus.oidc.runtime.TenantConfigBean;
+import io.quarkus.runtime.TlsConfig;
 import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
+import io.smallrye.jwt.auth.cdi.ClaimValueProducer;
 import io.smallrye.jwt.auth.cdi.CommonJwtProducer;
 import io.smallrye.jwt.auth.cdi.JsonValueProducer;
 import io.smallrye.jwt.auth.cdi.RawClaimTypeProducer;
-import io.smallrye.jwt.build.impl.JwtProviderImpl;
 
 public class OidcBuildStep {
-
-    OidcBuildTimeConfig buildTimeConfig;
+    public static final DotName DOTNAME_SECURITY_EVENT = DotName.createSimple(SecurityEvent.class.getName());
 
     @BuildStep(onlyIf = IsEnabled.class)
     FeatureBuildItem featureBuildItem() {
@@ -49,6 +58,7 @@ AdditionalBeanBuildItem jwtClaimIntegration(Capabilities capabilities) {
             removable.addBeanClass(CommonJwtProducer.class);
             removable.addBeanClass(RawClaimTypeProducer.class);
             removable.addBeanClass(JsonValueProducer.class);
+            removable.addBeanClass(ClaimValueProducer.class);
             removable.addBeanClass(Claim.class);
             return removable.build();
         }
@@ -63,11 +73,11 @@ public void additionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBea
         builder.addBeanClass(OidcAuthenticationMechanism.class)
                 .addBeanClass(OidcJsonWebTokenProducer.class)
                 .addBeanClass(OidcTokenCredentialProducer.class)
+                .addBeanClass(OidcConfigurationMetadataProducer.class)
                 .addBeanClass(OidcIdentityProvider.class)
-                .addBeanClass(DefaultTenantConfigResolver.class);
+                .addBeanClass(DefaultTenantConfigResolver.class)
+                .addBeanClass(DefaultTokenStateManager.class);
         additionalBeans.produce(builder.build());
-
-        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, JwtProviderImpl.class));
     }
 
     @BuildStep(onlyIf = IsEnabled.class)
@@ -80,15 +90,28 @@ EnableAllSecurityServicesBuildItem security() {
     public SyntheticBeanBuildItem setup(
             OidcConfig config,
             OidcRecorder recorder,
-            CoreVertxBuildItem vertxBuildItem) {
+            CoreVertxBuildItem vertxBuildItem,
+            TlsConfig tlsConfig) {
         return SyntheticBeanBuildItem.configure(TenantConfigBean.class).unremovable().types(TenantConfigBean.class)
-                .supplier(recorder.setup(config, vertxBuildItem.getVertx()))
-                .scope(Singleton.class)
+                .supplier(recorder.setup(config, vertxBuildItem.getVertx(), tlsConfig))
+                .scope(Singleton.class) // this should have been @ApplicationScoped but fails for some reason
                 .setRuntimeInit()
                 .done();
     }
 
-    static class IsEnabled implements BooleanSupplier {
+    @BuildStep(onlyIf = IsEnabled.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public ValidationErrorBuildItem findSecurityEventObservers(
+            OidcRecorder recorder,
+            ValidationPhaseBuildItem validationPhase) {
+        Collection<ObserverInfo> observers = validationPhase.getContext().get(BuildExtension.Key.OBSERVERS);
+        boolean isSecurityEventObserved = observers.stream()
+                .anyMatch(observer -> observer.asObserver().getObservedType().name().equals(DOTNAME_SECURITY_EVENT));
+        recorder.setSecurityEventObserved(isSecurityEventObserved);
+        return new ValidationErrorBuildItem();
+    }
+
+    public static class IsEnabled implements BooleanSupplier {
         OidcBuildTimeConfig config;
 
         public boolean getAsBoolean() {
diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java
index da5e5f7bb7e40..84cafdd50671c 100644
--- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java
+++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java
@@ -26,7 +26,8 @@ public class CodeFlowDevModeTestCase {
     private static Class<?>[] testClasses = {
             ProtectedResource.class,
             UnprotectedResource.class,
-            CustomTenantConfigResolver.class
+            CustomTenantConfigResolver.class,
+            CustomTokenStateManager.class
     };
 
     @RegisterExtension
@@ -71,7 +72,7 @@ public void testAccessAndRefreshTokenInjectionDevMode() throws IOException, Inte
 
             page = webClient.getPage("http://localhost:8080/protected");
 
-            assertEquals("Log in to devmode", page.getTitleText());
+            assertEquals("Sign in to devmode", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -81,6 +82,9 @@ public void testAccessAndRefreshTokenInjectionDevMode() throws IOException, Inte
             page = loginForm.getInputByName("login").click();
 
             assertEquals("alice-dev-mode", page.getBody().asText());
+
+            assertEquals("custom", page.getWebClient().getCookieManager().getCookie("q_session").getValue().split("\\|")[3]);
+
             webClient.getCookieManager().clearCookies();
         }
     }
@@ -89,7 +93,7 @@ private void useTenantConfigResolver() throws IOException, InterruptedException
         try (final WebClient webClient = createWebClient()) {
             HtmlPage page = webClient.getPage("http://localhost:8080/protected/tenant/tenant-config-resolver");
 
-            assertEquals("Log in to devmode", page.getTitleText());
+            assertEquals("Sign in to devmode", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java
new file mode 100644
index 0000000000000..220d89e1ff0ed
--- /dev/null
+++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java
@@ -0,0 +1,42 @@
+package io.quarkus.oidc.test;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import io.quarkus.arc.AlternativePriority;
+import io.quarkus.oidc.AuthorizationCodeTokens;
+import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.TokenStateManager;
+import io.quarkus.oidc.runtime.DefaultTokenStateManager;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+@AlternativePriority(1)
+public class CustomTokenStateManager implements TokenStateManager {
+
+    @Inject
+    DefaultTokenStateManager tokenStateManager;
+
+    @Override
+    public String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            AuthorizationCodeTokens sessionContent) {
+        return tokenStateManager.createTokenState(routingContext, oidcConfig, sessionContent) + "|custom";
+    }
+
+    @Override
+    public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            String tokenState) {
+        if (!tokenState.endsWith("|custom")) {
+            throw new IllegalStateException();
+        }
+        String defaultState = tokenState.substring(0, tokenState.length() - 7);
+        return tokenStateManager.getTokens(routingContext, oidcConfig, defaultState);
+    }
+
+    @Override
+    public void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+        if (!tokenState.endsWith("|custom")) {
+            throw new IllegalStateException();
+        }
+    }
+}
diff --git a/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties b/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties
index a851aa9636ba8..21891144d7155 100644
--- a/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties
+++ b/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties
@@ -3,3 +3,6 @@ quarkus.oidc.tenant-enabled=false
 # This is a wrong client-id, will be updated to 'client-dev-mode' in the dev mode test
 quarkus.oidc.client-id=client-dev
 quarkus.oidc.application-type=web-app
+
+quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL
+
diff --git a/extensions/oidc/pom.xml b/extensions/oidc/pom.xml
index e407904f74387..97b57b5ad32d7 100644
--- a/extensions/oidc/pom.xml
+++ b/extensions/oidc/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/oidc/runtime/pom.xml b/extensions/oidc/runtime/pom.xml
index 33e3c7c56ad9b..ea1929b6ee787 100644
--- a/extensions/oidc/runtime/pom.xml
+++ b/extensions/oidc/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-oidc-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,24 +33,18 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jsonp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-jwt</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-auth-oauth2</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AccessTokenCredential.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AccessTokenCredential.java
index 417512b0e5ff5..ae648106c1177 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AccessTokenCredential.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AccessTokenCredential.java
@@ -1,10 +1,9 @@
 package io.quarkus.oidc;
 
-import io.quarkus.oidc.runtime.ContextAwareTokenCredential;
 import io.quarkus.oidc.runtime.OidcUtils;
 import io.vertx.ext.web.RoutingContext;
 
-public class AccessTokenCredential extends ContextAwareTokenCredential {
+public class AccessTokenCredential extends OidcTokenCredential {
 
     private RefreshToken refreshToken;
     private boolean opaque;
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AuthorizationCodeTokens.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AuthorizationCodeTokens.java
new file mode 100644
index 0000000000000..f9e2a1b5d2f53
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/AuthorizationCodeTokens.java
@@ -0,0 +1,44 @@
+package io.quarkus.oidc;
+
+/**
+ * Authorization Code Flow Session State
+ */
+public class AuthorizationCodeTokens {
+
+    private String idToken;
+    private String accessToken;
+    private String refreshToken;
+
+    public AuthorizationCodeTokens() {
+    }
+
+    public AuthorizationCodeTokens(String idToken, String accessToken, String refreshToken) {
+        this.setIdToken(idToken);
+        this.setAccessToken(accessToken);
+        this.setRefreshToken(refreshToken);
+    }
+
+    public String getIdToken() {
+        return idToken;
+    }
+
+    public void setIdToken(String idToken) {
+        this.idToken = idToken;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdTokenCredential.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdTokenCredential.java
index 6f2846132c842..b0582d2da490f 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdTokenCredential.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/IdTokenCredential.java
@@ -1,9 +1,8 @@
 package io.quarkus.oidc;
 
-import io.quarkus.oidc.runtime.ContextAwareTokenCredential;
 import io.vertx.ext.web.RoutingContext;
 
-public class IdTokenCredential extends ContextAwareTokenCredential {
+public class IdTokenCredential extends OidcTokenCredential {
 
     public IdTokenCredential() {
         this(null, null);
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java
new file mode 100644
index 0000000000000..b458566d91b47
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java
@@ -0,0 +1,92 @@
+package io.quarkus.oidc;
+
+import java.util.Collections;
+import java.util.Set;
+
+import io.vertx.core.json.JsonObject;
+
+public class OidcConfigurationMetadata {
+    private static final String ISSUER = "issuer";
+    private static final String TOKEN_ENDPOINT = "token_endpoint";
+    private static final String INTROSPECTION_ENDPOINT = "introspection_endpoint";
+    private static final String AUTHORIZATION_ENDPOINT = "authorization_endpoint";
+    private static final String JWKS_ENDPOINT = "jwks_uri";
+    private static final String USERINFO_ENDPOINT = "userinfo_endpoint";
+    private static final String END_SESSION_ENDPOINT = "end_session_endpoint";
+
+    private final String tokenUri;
+    private final String introspectionUri;
+    private final String authorizationUri;
+    private final String jsonWebKeySetUri;
+    private final String userInfoUri;
+    private final String endSessionUri;
+    private final String issuer;
+    private JsonObject json;
+
+    public OidcConfigurationMetadata(String tokenUri,
+            String introspectionUri,
+            String authorizationUri,
+            String jsonWebKeySetUri,
+            String userInfoUri,
+            String endSessionUri,
+            String issuer) {
+        this.tokenUri = tokenUri;
+        this.introspectionUri = introspectionUri;
+        this.authorizationUri = authorizationUri;
+        this.jsonWebKeySetUri = jsonWebKeySetUri;
+        this.userInfoUri = userInfoUri;
+        this.endSessionUri = endSessionUri;
+        this.issuer = issuer;
+    }
+
+    public OidcConfigurationMetadata(JsonObject wellKnownConfig) {
+        this.tokenUri = wellKnownConfig.getString(TOKEN_ENDPOINT);
+        this.introspectionUri = wellKnownConfig.getString(INTROSPECTION_ENDPOINT);
+        this.authorizationUri = wellKnownConfig.getString(AUTHORIZATION_ENDPOINT);
+        this.jsonWebKeySetUri = wellKnownConfig.getString(JWKS_ENDPOINT);
+        this.userInfoUri = wellKnownConfig.getString(USERINFO_ENDPOINT);
+        this.endSessionUri = wellKnownConfig.getString(END_SESSION_ENDPOINT);
+        this.issuer = wellKnownConfig.getString(ISSUER);
+        this.json = wellKnownConfig;
+    }
+
+    public String getTokenUri() {
+        return tokenUri;
+    }
+
+    public String getIntrospectionUri() {
+        return introspectionUri;
+    }
+
+    public String getAuthorizationUri() {
+        return authorizationUri;
+    }
+
+    public String getJsonWebKeySetUri() {
+        return jsonWebKeySetUri;
+    }
+
+    public String getUserInfoUri() {
+        return userInfoUri;
+    }
+
+    public String getEndSessionUri() {
+        return endSessionUri;
+    }
+
+    public String getIssuer() {
+        return issuer;
+    }
+
+    public String get(String propertyName) {
+        return json != null ? null : json.getString(propertyName);
+    }
+
+    public boolean contains(String propertyName) {
+        return json.containsKey(propertyName);
+    }
+
+    public Set<String> getPropertyNames() {
+        return Collections.unmodifiableSet(json.fieldNames());
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java
index 2def4a0662abb..392c7470dfad1 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java
@@ -7,11 +7,12 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 
+import io.quarkus.oidc.common.runtime.OidcCommonConfig;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 
 @ConfigGroup
-public class OidcTenantConfig {
+public class OidcTenantConfig extends OidcCommonConfig {
 
     /**
      * A unique tenant identifier. It must be set by {@code TenantConfigResolver} providers which
@@ -30,27 +31,7 @@ public class OidcTenantConfig {
      * The application type, which can be one of the following values from enum {@link ApplicationType}.
      */
     @ConfigItem(defaultValue = "service")
-    public ApplicationType applicationType;
-
-    /**
-     * The base URL of the OpenID Connect (OIDC) server, for example, 'https://host:port/auth'.
-     * OIDC discovery endpoint will be called by default by appending a '.well-known/openid-configuration' path to this URL.
-     * Note if you work with Keycloak OIDC server, make sure the base URL is in the following format:
-     * 'https://host:port/auth/realms/{realm}' where '{realm}' has to be replaced by the name of the Keycloak realm.
-     */
-    @ConfigItem
-    public Optional<String> authServerUrl = Optional.empty();
-
-    /**
-     * Enables OIDC discovery.
-     * If the discovery is disabled then the following properties must be configured:
-     * - 'authorization-path' and 'token-path' for the 'web-app' applications
-     * - 'jwks-path' or 'introspection-path' for both the 'web-app' and 'service' applications
-     * <p>
-     * 'web-app' applications may also have 'user-info-path' and 'end-session-path' properties configured.
-     */
-    @ConfigItem(defaultValue = "true")
-    public boolean discoveryEnabled = true;
+    public ApplicationType applicationType = ApplicationType.SERVICE;
 
     /**
      * Relative path of the OIDC authorization endpoint which authenticates the users.
@@ -60,14 +41,6 @@ public class OidcTenantConfig {
     @ConfigItem
     public Optional<String> authorizationPath = Optional.empty();
 
-    /**
-     * Relative path of the OIDC token endpoint which issues ID, access and refresh tokens.
-     * This property must be set for the 'web-app' applications if OIDC discovery is disabled.
-     * This property will be ignored if the discovery is enabled.
-     */
-    @ConfigItem
-    public Optional<String> tokenPath = Optional.empty();
-
     /**
      * Relative path of the OIDC userinfo endpoint.
      * This property must only be set for the 'web-app' applications if OIDC discovery is disabled
@@ -103,13 +76,6 @@ public class OidcTenantConfig {
     @ConfigItem
     public Optional<String> endSessionPath = Optional.empty();
 
-    /**
-     * The maximum amount of time the adapter will try connecting to the currently unavailable OIDC server for.
-     * For example, setting it to '20S' will let the adapter keep requesting the connection for up to 20 seconds.
-     */
-    @ConfigItem
-    public Optional<Duration> connectionDelay = Optional.empty();
-
     /**
      * Public key for the local JWT token verification.
      * OIDC server connection will not be created when this property is set.
@@ -117,12 +83,6 @@ public class OidcTenantConfig {
     @ConfigItem
     public Optional<String> publicKey = Optional.empty();
 
-    /**
-     * The client-id of the application. Each application has a client-id that is used to identify the application
-     */
-    @ConfigItem
-    public Optional<String> clientId = Optional.empty();
-
     /**
      * Configuration to find and parse a custom claim containing the roles information.
      */
@@ -136,16 +96,10 @@ public class OidcTenantConfig {
     public Token token = new Token();
 
     /**
-     * Credentials which the OIDC adapter will use to authenticate to the OIDC server.
-     */
-    @ConfigItem
-    public Credentials credentials = new Credentials();
-
-    /**
-     * Options to configure a proxy that OIDC adapter will use for talking with OIDC server.
+     * Logout configuration
      */
     @ConfigItem
-    public Proxy proxy = new Proxy();
+    public Logout logout = new Logout();
 
     /**
      * Different options to configure authorization requests
@@ -153,46 +107,10 @@ public class OidcTenantConfig {
     public Authentication authentication = new Authentication();
 
     /**
-     * TLS configurations
-     */
-    @ConfigItem
-    public Tls tls = new Tls();
-
-    /**
-     * Logout configuration
+     * Default token state manager configuration
      */
     @ConfigItem
-    public Logout logout = new Logout();
-
-    @ConfigGroup
-    public static class Tls {
-        public enum Verification {
-            /**
-             * Certificates are validated and hostname verification is enabled. This is the default value.
-             */
-            REQUIRED,
-            /**
-             * All certificated are trusted and hostname verification is disabled.
-             */
-            NONE
-        }
-
-        /**
-         * Certificate validation and hostname verification, which can be one of the following values from enum
-         * {@link Verification}. Default is required.
-         */
-        @ConfigItem(defaultValue = "REQUIRED")
-        public Verification verification;
-
-        public Verification getVerification() {
-            return verification;
-        }
-
-        public void setVerification(Verification verification) {
-            this.verification = verification;
-        }
-
-    }
+    public TokenStateManager tokenStateManager = new TokenStateManager();
 
     @ConfigGroup
     public static class Logout {
@@ -229,20 +147,59 @@ public Optional<String> getPostLogoutPath() {
         }
     }
 
-    public Optional<Duration> getConnectionDelay() {
-        return connectionDelay;
-    }
+    /**
+     * Default Authorization Code token state manager configuration
+     */
+    @ConfigGroup
+    public static class TokenStateManager {
 
-    public void setConnectionDelay(Duration connectionDelay) {
-        this.connectionDelay = Optional.of(connectionDelay);
-    }
+        public enum Strategy {
+            /**
+             * Keep ID, access and refresh tokens.
+             */
+            KEEP_ALL_TOKENS,
 
-    public Optional<String> getAuthServerUrl() {
-        return authServerUrl;
-    }
+            /**
+             * Keep ID token only
+             */
+            ID_TOKEN,
 
-    public void setAuthServerUrl(String authServerUrl) {
-        this.authServerUrl = Optional.of(authServerUrl);
+            /**
+             * Keep ID and refresh tokens only
+             */
+            ID_REFRESH_TOKENS
+        }
+
+        /**
+         * Default TokenStateManager strategy.
+         */
+        @ConfigItem(defaultValue = "keep_all_tokens")
+        public Strategy strategy = Strategy.KEEP_ALL_TOKENS;
+
+        /**
+         * Default TokenStateManager keeps all tokens (ID, access and refresh)
+         * returned in the authorization code grant response in a single session cookie by default.
+         * 
+         * Enable this property to minimize a session cookie size
+         */
+        @ConfigItem(defaultValue = "false")
+        public boolean splitTokens;
+
+        public boolean isSplitTokens() {
+            return splitTokens;
+        }
+
+        public void setSplitTokens(boolean spliTokens) {
+            this.splitTokens = spliTokens;
+        }
+
+        public Strategy getStrategy() {
+            return strategy;
+        }
+
+        public void setStrategy(Strategy strategy) {
+            this.strategy = strategy;
+        }
     }
 
     public Optional<String> getAuthorizationPath() {
@@ -253,14 +210,6 @@ public void setAuthorizationPath(String authorizationPath) {
         this.authorizationPath = Optional.of(authorizationPath);
     }
 
-    public Optional<String> getTokenPath() {
-        return tokenPath;
-    }
-
-    public void setTokenPath(String tokenPath) {
-        this.tokenPath = Optional.of(tokenPath);
-    }
-
     public Optional<String> getUserInfoPath() {
         return userInfoPath;
     }
@@ -301,14 +250,6 @@ public void setPublicKey(String publicKey) {
         this.publicKey = Optional.of(publicKey);
     }
 
-    public Optional<String> getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = Optional.of(clientId);
-    }
-
     public Roles getRoles() {
         return roles;
     }
@@ -325,14 +266,6 @@ public void setToken(Token token) {
         this.token = token;
     }
 
-    public Credentials getCredentials() {
-        return credentials;
-    }
-
-    public void setCredentials(Credentials credentials) {
-        this.credentials = credentials;
-    }
-
     public Authentication getAuthentication() {
         return authentication;
     }
@@ -357,22 +290,6 @@ public void setTenantEnabled(boolean enabled) {
         this.tenantEnabled = enabled;
     }
 
-    public boolean isDiscoveryEnabled() {
-        return discoveryEnabled;
-    }
-
-    public void setDiscoveryEnabled(boolean enabled) {
-        this.discoveryEnabled = enabled;
-    }
-
-    public Proxy getProxy() {
-        return proxy;
-    }
-
-    public void setProxy(Proxy proxy) {
-        this.proxy = proxy;
-    }
-
     public void setLogout(Logout logout) {
         this.logout = logout;
     }
@@ -381,139 +298,6 @@ public Logout getLogout() {
         return logout;
     }
 
-    @ConfigGroup
-    public static class Credentials {
-
-        /**
-         * Client secret which is used for a 'client_secret_basic' authentication method.
-         * Note that a 'client-secret.value' can be used instead but both properties are mutually exclusive.
-         */
-        @ConfigItem
-        public Optional<String> secret = Optional.empty();
-
-        /**
-         * Client secret which can be used for the 'client_secret_basic' (default) and 'client_secret_post'
-         * and 'client_secret_jwt' authentication methods.
-         * Note that a 'secret.value' property can be used instead to support the 'client_secret_basic' method
-         * but both properties are mutually exclusive.
-         */
-        @ConfigItem
-        public Secret clientSecret = new Secret();
-
-        /**
-         * Client JWT authentication methods
-         */
-        @ConfigItem
-        public Jwt jwt = new Jwt();
-
-        public Optional<String> getSecret() {
-            return secret;
-        }
-
-        public void setSecret(String secret) {
-            this.secret = Optional.of(secret);
-        }
-
-        public Secret getClientSecret() {
-            return clientSecret;
-        }
-
-        public void setClientSecret(Secret clientSecret) {
-            this.clientSecret = clientSecret;
-        }
-
-        /**
-         * Supports the client authentication methods which involve sending a client secret.
-         *
-         * @see <a href=
-         *      "https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication">https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication</a>
-         */
-        @ConfigGroup
-        public static class Secret {
-
-            public static enum Method {
-                /**
-                 * client_secret_basic (default): client id and secret are submitted with the HTTP Authorization Basic scheme
-                 */
-                BASIC,
-
-                /**
-                 * client_secret_post: client id and secret are submitted as the 'client_id' and 'client_secret' form
-                 * parameters.
-                 */
-                POST
-            }
-
-            /**
-             * The client secret
-             */
-            @ConfigItem
-            public Optional<String> value = Optional.empty();
-
-            /**
-             * Authentication method.
-             */
-            @ConfigItem
-            public Optional<Method> method = Optional.empty();
-
-            public Optional<String> getValue() {
-                return value;
-            }
-
-            public void setValue(String value) {
-                this.value = Optional.of(value);
-            }
-
-            public Optional<Method> getMethod() {
-                return method;
-            }
-
-            public void setMethod(Method method) {
-                this.method = Optional.of(method);
-            }
-        }
-
-        /**
-         * Supports the client authentication methods which involve sending a signed JWT token.
-         * Currently only 'client_secret_jwt' is supported
-         *
-         * @see <a href=
-         *      "https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication">https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication</a>
-         */
-        @ConfigGroup
-        public static class Jwt {
-            /**
-             * client_secret_jwt: JWT which includes client id as one of its claims is signed by the client secret and is
-             * submitted as a 'client_assertion' form parameter, while 'client_assertion_type' parameter is set to
-             * "urn:ietf:params:oauth:client-assertion-type:jwt-bearer".
-             */
-            @ConfigItem
-            public Optional<String> secret = Optional.empty();
-
-            /**
-             * JWT life-span in seconds. It will be added to the time it was issued at to calculate the expiration time.
-             */
-            @ConfigItem(defaultValue = "10")
-            public int lifespan = 10;
-
-            public Optional<String> getSecret() {
-                return secret;
-            }
-
-            public void setSecret(String secret) {
-                this.secret = Optional.of(secret);
-            }
-
-            public int getLifespan() {
-                return lifespan;
-            }
-
-            public void setLifespan(int lifespan) {
-                this.lifespan = lifespan;
-            }
-        }
-    }
-
     @ConfigGroup
     public static class Roles {
 
@@ -582,13 +366,13 @@ public static enum Source {
             idtoken,
 
             /**
-             * Access Token - the default and only supported value for the 'service' applications;
+             * Access Token - the default value for the 'service' applications;
              * can also be used as the source of roles for the 'web-app' applications.
              */
             accesstoken,
 
             /**
-             * User Info - only supported for the "web-app" applications
+             * User Info
              */
             userinfo
         }
@@ -606,7 +390,8 @@ public static class Authentication {
          * For example, if the current request URI is 'https://localhost:8080/service' then a 'redirect_uri' parameter
          * will be set to 'https://localhost:8080/' if this property is set to '/' and be the same as the request URI
          * if this property has not been configured.
-         * Note the original request URI will be restored after the user has authenticated.
+         * Note the original request URI will be restored after the user has authenticated if 'restorePathAfterRedirect' is set
+         * to 'true'.
          */
         @ConfigItem
         public Optional<String> redirectPath = Optional.empty();
@@ -614,9 +399,12 @@ public static class Authentication {
         /**
          * If this property is set to 'true' then the original request URI which was used before
          * the authentication will be restored after the user has been redirected back to the application.
+         * 
+         * Note if `redirectPath` property is not set the the original request URI will be restored even if this property is
+         * disabled.
          */
-        @ConfigItem(defaultValue = "true")
-        public boolean restorePathAfterRedirect = true;
+        @ConfigItem(defaultValue = "false")
+        public boolean restorePathAfterRedirect;
 
         /**
          * Remove the query parameters such as 'code' and 'state' set by the OIDC server on the redirect URI
@@ -626,13 +414,20 @@ public static class Authentication {
         public boolean removeRedirectParameters = true;
 
         /**
-         * Both ID and access tokens are verified as part of the authorization code flow and every time
-         * these tokens are retrieved from the user session. One should disable the access token verification if
-         * it is only meant to be propagated to the downstream services.
-         * Note the ID token will always be verified.
+         * Both ID and access tokens are fetched from the OIDC provider as part of the authorization code flow.
+         * ID token is always verified on every user request as the primary token which is used
+         * to represent the principal and extract the roles.
+         * Access token is not verified by default since it is meant to be propagated to the downstream services.
+         * The verification of the access token should be enabled if it is injected as a JWT token.
+         *
+         * Access tokens obtained as part of the code flow will always be verified if `quarkus.oidc.roles.source`
+         * property is set to `accesstoken` which means the authorization decision will be based on the roles extracted from the
+         * access token.
+         * 
+         * Bearer access tokens are always verified.
          */
-        @ConfigItem(defaultValue = "true")
-        public boolean verifyAccessToken = true;
+        @ConfigItem(defaultValue = "false")
+        public boolean verifyAccessToken;
 
         /**
          * Force 'https' as the 'redirect_uri' parameter scheme when running behind an SSL terminating reverse proxy.
@@ -654,11 +449,34 @@ public static class Authentication {
         public Map<String, String> extraParams;
 
         /**
-         * Cookie path parameter value which, if set, will be used for the session and state cookies.
-         * It may need to be set when the redirect path has a root different to that of the original request URL.
+         * If enabled the state, session and post logout cookies will have their 'secure' parameter set to 'true'
+         * when HTTP is used. It may be necessary when running behind an SSL terminating reverse proxy.
+         * The cookies will always be secure if HTTPS is used even if this property is set to false.
+         */
+        @ConfigItem(defaultValue = "false")
+        public boolean cookieForceSecure;
+
+        /**
+         * Cookie path parameter value which, if set, will be used to set a path parameter for the session, state and post
+         * logout cookies.
+         * The `cookie-path-header` property, if set, will be checked first.
+         */
+        @ConfigItem(defaultValue = "/")
+        public String cookiePath = "/";
+
+        /**
+         * Cookie path header parameter value which, if set, identifies the incoming HTTP header
+         * whose value will be used to set a path parameter for the session, state and post logout cookies.
+         * If the header is missing then the `cookie-path` property will be checked.
+         */
+        @ConfigItem
+        public Optional<String> cookiePathHeader = Optional.empty();
+
+        /**
+         * Cookie domain parameter value which, if set, will be used for the session, state and post logout cookies.
          */
         @ConfigItem
-        public Optional<String> cookiePath = Optional.empty();
+        public Optional<String> cookieDomain = Optional.empty();
 
         /**
          * If this property is set to 'true' then an OIDC UserInfo endpoint will be called
@@ -666,24 +484,35 @@ public static class Authentication {
         @ConfigItem(defaultValue = "false")
         public boolean userInfoRequired;
 
+        /**
+         * Session age extension in minutes.
+         * The user session age property is set to the value of the ID token life-span by default and
+         * the user will be redirected to the OIDC provider to re-authenticate once the session has expired.
+         * If this property is set to a non-zero value then the expired ID token can be refreshed before
+         * the session has expired.
+         * This property will be ignored if the `token.refresh-expired` property has not been enabled.
+         */
+        @ConfigItem(defaultValue = "5M")
+        public Duration sessionAgeExtension = Duration.ofMinutes(5);
+
         /**
          * If this property is set to 'true' then a normal 302 redirect response will be returned
-         * if the request was initiated via XMLHttpRequest and the current user needs to be
+         * if the request was initiated via JavaScript API such as XMLHttpRequest or Fetch and the current user needs to be
          * (re)authenticated which may not be desirable for Single Page Applications since
-         * XMLHttpRequest automatically following the redirect may not work given that OIDC
-         * authorization endpoints typically do not support CORS.
+         * it automatically following the redirect may not work given that OIDC authorization endpoints typically do not support
+         * CORS.
          * If this property is set to `false` then a status code of '499' will be returned to allow
          * the client to handle the redirect manually
          */
         @ConfigItem(defaultValue = "true")
-        public boolean xhrAutoRedirect = true;
+        public boolean javaScriptAutoRedirect = true;
 
-        public boolean isXhrAutoRedirect() {
-            return xhrAutoRedirect;
+        public boolean isJavaScriptAutoRedirect() {
+            return javaScriptAutoRedirect;
         }
 
-        public void setXhrAutoredirect(boolean autoRedirect) {
-            this.xhrAutoRedirect = autoRedirect;
+        public void setJavaScriptAutoredirect(boolean autoRedirect) {
+            this.javaScriptAutoRedirect = autoRedirect;
         }
 
         public Optional<String> getRedirectPath() {
@@ -726,12 +555,28 @@ public void setRestorePathAfterRedirect(boolean restorePathAfterRedirect) {
             this.restorePathAfterRedirect = restorePathAfterRedirect;
         }
 
-        public Optional<String> getCookiePath() {
+        public boolean isCookieForceSecure() {
+            return cookieForceSecure;
+        }
+
+        public void setCookieForceSecure(boolean cookieForceSecure) {
+            this.cookieForceSecure = cookieForceSecure;
+        }
+
+        public String getCookiePath() {
             return cookiePath;
         }
 
         public void setCookiePath(String cookiePath) {
-            this.cookiePath = Optional.of(cookiePath);
+            this.cookiePath = cookiePath;
+        }
+
+        public Optional<String> getCookieDomain() {
+            return cookieDomain;
+        }
+
+        public void setCookieDomain(String cookieDomain) {
+            this.cookieDomain = Optional.of(cookieDomain);
         }
 
         public boolean isUserInfoRequired() {
@@ -757,6 +602,23 @@ public boolean isVerifyAccessToken() {
         public void setVerifyAccessToken(boolean verifyAccessToken) {
             this.verifyAccessToken = verifyAccessToken;
         }
+
+        public Duration getSessionAgeExtension() {
+            return sessionAgeExtension;
+        }
+
+        public void setSessionAgeExtension(Duration sessionAgeExtension) {
+            this.sessionAgeExtension = sessionAgeExtension;
+        }
+
+        public Optional<String> getCookiePathHeader() {
+            return cookiePathHeader;
+        }
+
+        public void setCookiePathHeader(String cookiePathHeader) {
+            this.cookiePathHeader = Optional.of(cookiePathHeader);
+        }
+
     }
 
     @ConfigGroup
@@ -813,21 +675,69 @@ public static Token fromAudience(String... audience) {
 
         /**
          * Refresh expired ID tokens.
-         * If this property is enabled then a refresh token request is performed and, if successful, the local session is
-         * updated with the new set of tokens.
-         * Otherwise, the local session is invalidated as an indication that the session at the OpenID Provider no longer
-         * exists.
-         * This option is only valid when the application is of type {@link ApplicationType#WEB_APP}}.
+         * If this property is enabled then a refresh token request will be performed if the ID token has expired
+         * and, if successful, the local session will be updated with the new set of tokens.
+         * Otherwise, the local session will be invalidated and the user redirected to the OpenID Provider to re-authenticate.
+         * In this case the user may not be challenged again if the OIDC provider session is still active.
+         *
+         * For this option be effective the `authentication.session-age-extension` property should also be set to a non-zero
+         * value since the refresh token is currently kept in the user session.
+         *
+         * This option is valid only when the application is of type {@link ApplicationType#WEB_APP}}.
          */
         @ConfigItem
         public boolean refreshExpired;
 
+        /**
+         * Token auto-refresh interval in seconds during the user re-authentication.
+         * If this option is set then the valid ID token will be refreshed if it will expire in less than a number of seconds
+         * set by this option. The user will still be authenticated if the ID token can no longer be refreshed but is still
+         * valid.
+         * This option will be ignored if the 'refresh-expired' property is not enabled.
+         *
+         * Note this property is deprecated and will be removed in one of the next releases.
+         * Please use 'quarkus.oidc.token.refresh-token-time-skew'
+         */
+        @ConfigItem
+        @Deprecated
+        public Optional<Duration> autoRefreshInterval = Optional.empty();
+
+        /**
+         * Refresh token time skew in seconds.
+         * If this property is enabled then the configured number of seconds is added to the current time
+         * when checking whether the access token should be refreshed. If the sum is greater than this access token's
+         * expiration time then a refresh is going to happen.
+         *
+         * This property will be ignored if the 'refresh-expired' property is not enabled.
+         */
+        @ConfigItem
+        public Optional<Duration> refreshTokenTimeSkew = Optional.empty();
+
         /**
          * Forced JWK set refresh interval in minutes.
          */
         @ConfigItem(defaultValue = "10M")
         public Duration forcedJwkRefreshInterval = Duration.ofMinutes(10);
 
+        /**
+         * Custom HTTP header that contains a bearer token.
+         * This option is valid only when the application is of type {@link ApplicationType#SERVICE}}.
+         */
+        @ConfigItem
+        public Optional<String> header = Optional.empty();
+
+        /**
+         * Allow the remote introspection of JWT tokens when no matching JWK key is available.
+         *
+         * Note this property is set to 'true' by default for backward-compatibility reasons and will be set to `false`
+         * instead in one of the next releases.
+         *
+         * Also note this property will be ignored if JWK endpoint URI is not available and introspecting the tokens is
+         * the only verification option.
+         */
+        @ConfigItem(defaultValue = "true")
+        public boolean allowJwtIntrospection = true;
+
         public Optional<String> getIssuer() {
             return issuer;
         }
@@ -836,6 +746,14 @@ public void setIssuer(String issuer) {
             this.issuer = Optional.of(issuer);
         }
 
+        public Optional<String> getHeader() {
+            return header;
+        }
+
+        public void setHeader(String header) {
+            this.header = Optional.of(header);
+        }
+
         public Optional<List<String>> getAudience() {
             return audience;
         }
@@ -883,44 +801,28 @@ public Optional<String> getTokenType() {
         public void setTokenType(String tokenType) {
             this.tokenType = Optional.of(tokenType);
         }
-    }
-
-    @ConfigGroup
-    public static class Proxy {
 
-        /**
-         * The host (name or IP address) of the Proxy.<br/>
-         * Note: If OIDC adapter needs to use a Proxy to talk with OIDC server (Provider),
-         * then at least the "host" config item must be configured to enable the usage of a Proxy.
-         */
-        @ConfigItem
-        public Optional<String> host = Optional.empty();
-
-        /**
-         * The port number of the Proxy. Default value is 80.
-         */
-        @ConfigItem(defaultValue = "80")
-        public int port = 80;
+        public Optional<Duration> getRefreshTokenTimeSkew() {
+            return refreshTokenTimeSkew;
+        }
 
-        /**
-         * The username, if Proxy needs authentication.
-         */
-        @ConfigItem
-        public Optional<String> username = Optional.empty();
+        public void setRefreshTokenTimeSkew(Duration refreshTokenTimeSkew) {
+            this.refreshTokenTimeSkew = Optional.of(refreshTokenTimeSkew);
+        }
 
-        /**
-         * The password, if Proxy needs authentication.
-         */
-        @ConfigItem
-        public Optional<String> password = Optional.empty();
+        public boolean isAllowJwtIntrospection() {
+            return allowJwtIntrospection;
+        }
 
+        public void setAllowJwtIntrospection(boolean allowJwtIntrospection) {
+            this.allowJwtIntrospection = allowJwtIntrospection;
+        }
     }
 
     public static enum ApplicationType {
         /**
-         * A {@code WEB_APP} is a client that server pages, usually a frontend application. For this type of client the
-         * Authorization Code Flow is
-         * defined as the preferred method for authenticating users.
+         * A {@code WEB_APP} is a client that serves pages, usually a frontend application. For this type of client the
+         * Authorization Code Flow is defined as the preferred method for authenticating users.
          */
         WEB_APP,
 
@@ -929,6 +831,21 @@ public static enum ApplicationType {
          * RESTful Architectural Design. For this type of client, the Bearer Authorization method is defined as the preferred
          * method for authenticating and authorizing users.
          */
-        SERVICE
+        SERVICE,
+
+        /**
+         * A combined {@code SERVICE} and {@code WEB_APP} client.
+         * For this type of client, the Bearer Authorization method will be used if the Authorization header is set
+         * and Authorization Code Flow - if not.
+         */
+        HYBRID
+    }
+
+    public ApplicationType getApplicationType() {
+        return applicationType;
+    }
+
+    public void setApplicationType(ApplicationType type) {
+        this.applicationType = type;
     }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTokenCredential.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTokenCredential.java
new file mode 100644
index 0000000000000..8f84d8c05a1e5
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTokenCredential.java
@@ -0,0 +1,18 @@
+package io.quarkus.oidc;
+
+import io.quarkus.security.credential.TokenCredential;
+import io.vertx.ext.web.RoutingContext;
+
+public class OidcTokenCredential extends TokenCredential {
+
+    private RoutingContext context;
+
+    protected OidcTokenCredential(String token, String type, RoutingContext context) {
+        super(token, type);
+        this.context = context;
+    }
+
+    public RoutingContext getRoutingContext() {
+        return context;
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/SecurityEvent.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/SecurityEvent.java
new file mode 100644
index 0000000000000..e03e47d4d4977
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/SecurityEvent.java
@@ -0,0 +1,47 @@
+package io.quarkus.oidc;
+
+import io.quarkus.security.identity.SecurityIdentity;
+
+/**
+ * Security event.
+ *
+ */
+public class SecurityEvent {
+    public enum Type {
+        /**
+         * OIDC Login event which is reported after the first user authentication but also when the user's session
+         * has expired and the user has re-authenticated at the OIDC provider site.
+         */
+        OIDC_LOGIN,
+        /**
+         * OIDC Session refreshed event is reported if it has been detected that an ID token will expire shortly and the session
+         * has been successfully auto-refreshed without the user having to re-authenticate again at the OIDC site.
+         */
+        OIDC_SESSION_REFRESHED,
+        /**
+         * OIDC Session expired and refreshed event is reported if a session has expired but been successfully refreshed
+         * without the user having to re-authenticate again at the OIDC site.
+         */
+        OIDC_SESSION_EXPIRED_AND_REFRESHED,
+        /**
+         * OIDC Logout event is reported when the current user has started an RP-initiated OIDC logout flow.
+         */
+        OIDC_LOGOUT_RP_INITIATED
+    }
+
+    private final Type eventType;
+    private final SecurityIdentity securityIdentity;
+
+    public SecurityEvent(Type eventType, SecurityIdentity securityIdentity) {
+        this.eventType = eventType;
+        this.securityIdentity = securityIdentity;
+    }
+
+    public Type getEventType() {
+        return eventType;
+    }
+
+    public SecurityIdentity getSecurityIdentity() {
+        return securityIdentity;
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java
new file mode 100644
index 0000000000000..94cf60539cc73
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java
@@ -0,0 +1,21 @@
+package io.quarkus.oidc;
+
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Authorization Code Flow Token State Manager.
+ * It converts the ID, access and refresh tokens returned in the authorization code grant response into a token state
+ * for OIDC Code AuthenticationMechanism to keep it as a session cookie.
+ * 
+ * For example, default TokenStateManager concatenates all 3 tokens into a single String but does not persist it.
+ * Custom TokenStateManager may choose to keep the tokens in the external storage (DB, file system, etc) and return
+ * a reference to this storage.
+ */
+public interface TokenStateManager {
+
+    String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, AuthorizationCodeTokens tokens);
+
+    AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState);
+
+    void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState);
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java
index 4cb8265438a8e..57fb7fd660dce 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/UserInfo.java
@@ -1,11 +1,15 @@
 package io.quarkus.oidc;
 
 import java.io.StringReader;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
 
 import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
+import javax.json.JsonValue;
 
 public class UserInfo {
 
@@ -34,6 +38,18 @@ public Object get(String name) {
         return json.get(name);
     }
 
+    public boolean contains(String propertyName) {
+        return json.containsKey(propertyName);
+    }
+
+    public Set<String> getPropertyNames() {
+        return Collections.unmodifiableSet(json.keySet());
+    }
+
+    public Set<Map.Entry<String, JsonValue>> getAllProperties() {
+        return Collections.unmodifiableSet(json.entrySet());
+    }
+
     private static JsonObject toJsonObject(String userInfoJson) {
         try (JsonReader jsonReader = Json.createReader(new StringReader(userInfoJson))) {
             return jsonReader.readObject();
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractOidcAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractOidcAuthenticationMechanism.java
index 6917e84b7857e..fcdae165d7520 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractOidcAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/AbstractOidcAuthenticationMechanism.java
@@ -7,8 +7,15 @@
 import io.smallrye.mutiny.Uni;
 
 abstract class AbstractOidcAuthenticationMechanism {
+    protected DefaultTenantConfigResolver resolver;
+
     protected Uni<SecurityIdentity> authenticate(IdentityProviderManager identityProviderManager,
             TokenCredential token) {
         return identityProviderManager.authenticate(new TokenAuthenticationRequest(token));
     }
+
+    void setResolver(DefaultTenantConfigResolver resolver) {
+        this.resolver = resolver;
+    }
+
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BearerAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BearerAuthenticationMechanism.java
index 921820a7a8f27..84746c29886c1 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BearerAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/BearerAuthenticationMechanism.java
@@ -2,6 +2,8 @@
 
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.quarkus.oidc.AccessTokenCredential;
+import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.common.runtime.OidcConstants;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.vertx.http.runtime.security.ChallengeData;
@@ -12,14 +14,12 @@
 
 public class BearerAuthenticationMechanism extends AbstractOidcAuthenticationMechanism {
 
-    private static final String BEARER = "Bearer";
     protected static final ChallengeData UNAUTHORIZED_CHALLENGE = new ChallengeData(HttpResponseStatus.UNAUTHORIZED.code(),
             null, null);
 
     public Uni<SecurityIdentity> authenticate(RoutingContext context,
-            IdentityProviderManager identityProviderManager,
-            DefaultTenantConfigResolver resolver) {
-        String token = extractBearerToken(context);
+            IdentityProviderManager identityProviderManager) {
+        String token = extractBearerToken(context, resolver.resolveConfig(context));
 
         // if a bearer token is provided try to authenticate
         if (token != null) {
@@ -28,24 +28,31 @@ public Uni<SecurityIdentity> authenticate(RoutingContext context,
         return Uni.createFrom().nullItem();
     }
 
-    public Uni<ChallengeData> getChallenge(RoutingContext context, DefaultTenantConfigResolver resolver) {
+    public Uni<ChallengeData> getChallenge(RoutingContext context) {
         return Uni.createFrom().item(UNAUTHORIZED_CHALLENGE);
     }
 
-    private String extractBearerToken(RoutingContext context) {
+    private String extractBearerToken(RoutingContext context, OidcTenantConfig oidcConfig) {
         final HttpServerRequest request = context.request();
-        final String authorization = request.headers().get(HttpHeaders.AUTHORIZATION);
+        String header = oidcConfig.token.header.isPresent() ? oidcConfig.token.header.get()
+                : HttpHeaders.AUTHORIZATION.toString();
+        final String headerValue = request.headers().get(header);
 
-        if (authorization == null) {
+        if (headerValue == null) {
             return null;
         }
 
-        int idx = authorization.indexOf(' ');
+        int idx = headerValue.indexOf(' ');
+        final String scheme = idx > 0 ? headerValue.substring(0, idx) : null;
 
-        if (idx <= 0 || !BEARER.equalsIgnoreCase(authorization.substring(0, idx))) {
+        if (scheme == null && !header.equalsIgnoreCase(HttpHeaders.AUTHORIZATION.toString())) {
+            return headerValue;
+        }
+
+        if (!OidcConstants.BEARER_SCHEME.equalsIgnoreCase(scheme)) {
             return null;
         }
 
-        return authorization.substring(idx + 1);
+        return headerValue.substring(idx + 1);
     }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
index ba91c1dd8e412..fa5aeba7b3e38 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
@@ -1,6 +1,10 @@
 package io.quarkus.oidc.runtime;
 
+import static io.quarkus.oidc.runtime.OidcIdentityProvider.NEW_AUTHENTICATION;
+import static io.quarkus.oidc.runtime.OidcIdentityProvider.REFRESH_TOKEN_GRANT_RESPONSE;
+
 import java.net.URI;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.security.Permission;
 import java.util.ArrayList;
@@ -8,55 +12,52 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.function.Consumer;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
 import org.jboss.logging.Logger;
+import org.jose4j.jwt.consumer.ErrorCodes;
+import org.jose4j.jwt.consumer.InvalidJwtException;
 
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.quarkus.oidc.AccessTokenCredential;
+import io.quarkus.oidc.AuthorizationCodeTokens;
 import io.quarkus.oidc.IdTokenCredential;
 import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.OidcTenantConfig.Authentication;
-import io.quarkus.oidc.OidcTenantConfig.Credentials;
-import io.quarkus.oidc.OidcTenantConfig.Credentials.Secret;
 import io.quarkus.oidc.RefreshToken;
+import io.quarkus.oidc.SecurityEvent;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.quarkus.runtime.BlockingOperationControl;
+import io.quarkus.security.AuthenticationCompletionException;
 import io.quarkus.security.AuthenticationFailedException;
+import io.quarkus.security.AuthenticationRedirectException;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
-import io.quarkus.vertx.http.runtime.security.AuthenticationCompletionException;
-import io.quarkus.vertx.http.runtime.security.AuthenticationRedirectException;
 import io.quarkus.vertx.http.runtime.security.ChallengeData;
-import io.smallrye.jwt.build.Jwt;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.subscription.UniEmitter;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
 import io.vertx.core.http.Cookie;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.impl.ServerCookie;
-import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.oauth2.AccessToken;
-import io.vertx.ext.auth.oauth2.impl.OAuth2AuthProviderImpl;
-import io.vertx.ext.auth.oauth2.impl.OAuth2TokenImpl;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.impl.CookieImpl;
 
 public class CodeAuthenticationMechanism extends AbstractOidcAuthenticationMechanism {
 
+    static final String AMP = "&";
+    static final String EQ = "=";
+    static final String COOKIE_DELIM = "|";
+    static final Pattern COOKIE_PATTERN = Pattern.compile("\\" + COOKIE_DELIM);
+    static final String SESSION_COOKIE_NAME = "q_session";
+    static final String SESSION_MAX_AGE_PARAM = "session-max-age";
+
     private static final Logger LOG = Logger.getLogger(CodeAuthenticationMechanism.class);
 
     private static final String STATE_COOKIE_NAME = "q_auth";
-    private static final String SESSION_COOKIE_NAME = "q_session";
     private static final String POST_LOGOUT_COOKIE_NAME = "q_post_logout";
-    private static final String COOKIE_DELIM = "|";
-    private static final Pattern COOKIE_PATTERN = Pattern.compile("\\" + COOKIE_DELIM);
 
     private static QuarkusSecurityIdentity augmentIdentity(SecurityIdentity securityIdentity,
             String accessToken,
@@ -80,66 +81,92 @@ public Uni<Boolean> apply(Permission permission) {
     }
 
     public Uni<SecurityIdentity> authenticate(RoutingContext context,
-            IdentityProviderManager identityProviderManager,
-            DefaultTenantConfigResolver resolver) {
+            IdentityProviderManager identityProviderManager) {
 
-        Cookie sessionCookie = context.request().getCookie(
-                getSessionCookieName(resolver.resolve(context, false)));
+        final Cookie sessionCookie = context.request().getCookie(getSessionCookieName(resolver.resolveConfig(context)));
 
         // if session already established, try to re-authenticate
         if (sessionCookie != null) {
-            String[] tokens = COOKIE_PATTERN.split(sessionCookie.getValue());
-            String idToken = tokens[0];
-            String accessToken = tokens[1];
-            String refreshToken = tokens[2];
-
-            TenantConfigContext configContext = resolver.resolve(context, true);
-            context.put("access_token", accessToken);
-            return authenticate(identityProviderManager, new IdTokenCredential(idToken, context))
-                    .map(new Function<SecurityIdentity, SecurityIdentity>() {
+            Uni<TenantConfigContext> resolvedContext = resolver.resolveContext(context);
+            return resolvedContext.onItem()
+                    .transformToUni(new Function<TenantConfigContext, Uni<? extends SecurityIdentity>>() {
                         @Override
-                        public SecurityIdentity apply(SecurityIdentity identity) {
-                            if (isLogout(context, configContext)) {
-                                throw redirectToLogoutEndpoint(context, configContext, idToken);
-                            }
+                        public Uni<SecurityIdentity> apply(TenantConfigContext tenantContext) {
+                            return reAuthenticate(sessionCookie, context, identityProviderManager, tenantContext);
+                        }
+                    });
+        }
+
+        final String code = context.request().getParam("code");
+        if (code == null) {
+            return Uni.createFrom().optional(Optional.empty());
+        }
+
+        // start a new session by starting the code flow dance
+        Uni<TenantConfigContext> resolvedContext = resolver.resolveContext(context);
+        return resolvedContext.onItem().transformToUni(new Function<TenantConfigContext, Uni<? extends SecurityIdentity>>() {
+            @Override
+            public Uni<SecurityIdentity> apply(TenantConfigContext tenantContext) {
+                return performCodeFlow(identityProviderManager, context, tenantContext, code);
+            }
+        });
+    }
+
+    private Uni<SecurityIdentity> reAuthenticate(Cookie sessionCookie,
+            RoutingContext context,
+            IdentityProviderManager identityProviderManager,
+            TenantConfigContext configContext) {
 
-                            return augmentIdentity(identity, accessToken, refreshToken, context);
+        AuthorizationCodeTokens session = resolver.getTokenStateManager().getTokens(context, configContext.oidcConfig,
+                sessionCookie.getValue());
+
+        context.put(OidcConstants.ACCESS_TOKEN_VALUE, session.getAccessToken());
+        return authenticate(identityProviderManager, new IdTokenCredential(session.getIdToken(), context))
+                .map(new Function<SecurityIdentity, SecurityIdentity>() {
+                    @Override
+                    public SecurityIdentity apply(SecurityIdentity identity) {
+                        if (isLogout(context, configContext)) {
+                            fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity);
+                            throw redirectToLogoutEndpoint(context, configContext, session.getIdToken());
                         }
-                    }).on().failure().recoverWithItem(new Function<Throwable, SecurityIdentity>() {
-                        @Override
-                        public SecurityIdentity apply(Throwable throwable) {
-                            if (throwable instanceof AuthenticationRedirectException) {
-                                throw AuthenticationRedirectException.class.cast(throwable);
-                            }
 
-                            Throwable cause = throwable.getCause();
+                        return augmentIdentity(identity, session.getAccessToken(), session.getRefreshToken(), context);
+                    }
+                }).onFailure().recoverWithUni(new Function<Throwable, Uni<? extends SecurityIdentity>>() {
+                    @Override
+                    public Uni<? extends SecurityIdentity> apply(Throwable t) {
+                        if (t instanceof AuthenticationRedirectException) {
+                            throw (AuthenticationRedirectException) t;
+                        }
+
+                        if (!(t instanceof TokenAutoRefreshException)) {
+                            boolean expired = (t.getCause() instanceof InvalidJwtException)
+                                    && ((InvalidJwtException) t.getCause()).hasErrorCode(ErrorCodes.EXPIRED);
 
-                            if (cause != null && !"expired token".equalsIgnoreCase(cause.getMessage())) {
-                                LOG.debugf("Authentication failure: %s", cause);
-                                throw new AuthenticationCompletionException(cause);
+                            if (!expired) {
+                                LOG.debugf("Authentication failure: %s", t.getCause());
+                                throw new AuthenticationCompletionException(t.getCause());
                             }
                             if (!configContext.oidcConfig.token.refreshExpired) {
                                 LOG.debug("Token has expired, token refresh is not allowed");
-                                throw new AuthenticationCompletionException(cause);
+                                throw new AuthenticationCompletionException(t.getCause());
                             }
                             LOG.debug("Token has expired, trying to refresh it");
-                            SecurityIdentity identity = trySilentRefresh(configContext,
-                                    refreshToken, context, identityProviderManager);
-                            if (identity == null) {
-                                LOG.debug("SecurityIdentity is null after a token refresh");
-                                throw new AuthenticationCompletionException();
-                            }
-                            return identity;
+                            return refreshSecurityIdentity(configContext, session.getRefreshToken(), context,
+                                    identityProviderManager, false, null);
+                        } else {
+                            return refreshSecurityIdentity(configContext, session.getRefreshToken(), context,
+                                    identityProviderManager, true,
+                                    ((TokenAutoRefreshException) t).getSecurityIdentity());
                         }
-                    });
-        }
+                    }
+                });
 
-        // start a new session by starting the code flow dance
-        return performCodeFlow(identityProviderManager, context, resolver);
     }
 
-    private boolean isXHR(RoutingContext context) {
-        return "XMLHttpRequest".equals(context.request().getHeader("X-Requested-With"));
+    private boolean isJavaScript(RoutingContext context) {
+        String value = context.request().getHeader("X-Requested-With");
+        return "JavaScript".equals(value) || "XMLHttpRequest".equals(value);
     }
 
     // This test determines if the default behavior of returning a 302 should go forward
@@ -147,13 +174,22 @@ private boolean isXHR(RoutingContext context) {
     // user has set the auto direct application property to false indicating that
     // the client application will manually handle the redirect to account for SPA behavior
     private boolean shouldAutoRedirect(TenantConfigContext configContext, RoutingContext context) {
-        return isXHR(context) ? configContext.oidcConfig.authentication.xhrAutoRedirect : true;
+        return isJavaScript(context) ? configContext.oidcConfig.authentication.javaScriptAutoRedirect : true;
     }
 
-    public Uni<ChallengeData> getChallenge(RoutingContext context, DefaultTenantConfigResolver resolver) {
+    public Uni<ChallengeData> getChallenge(RoutingContext context) {
 
-        TenantConfigContext configContext = resolver.resolve(context, true);
-        removeCookie(context, configContext, getSessionCookieName(configContext));
+        Uni<TenantConfigContext> tenantContext = resolver.resolveContext(context);
+        return tenantContext.onItem().transformToUni(new Function<TenantConfigContext, Uni<? extends ChallengeData>>() {
+            @Override
+            public Uni<ChallengeData> apply(TenantConfigContext tenantContext) {
+                return getChallengeInternal(context, tenantContext);
+            }
+        });
+    }
+
+    public Uni<ChallengeData> getChallengeInternal(RoutingContext context, TenantConfigContext configContext) {
+        removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig));
 
         if (!shouldAutoRedirect(configContext, context)) {
             // If the client (usually an SPA) wants to handle the redirect manually, then
@@ -161,46 +197,59 @@ public Uni<ChallengeData> getChallenge(RoutingContext context, DefaultTenantConf
             return Uni.createFrom().item(new ChallengeData(499, "WWW-Authenticate", "OIDC"));
         }
 
-        JsonObject params = new JsonObject();
+        StringBuilder codeFlowParams = new StringBuilder();
+
+        // response_type
+        codeFlowParams.append(OidcConstants.CODE_FLOW_RESPONSE_TYPE).append(EQ).append(OidcConstants.CODE_FLOW_CODE);
+
+        // client_id
+        codeFlowParams.append(AMP).append(OidcConstants.CLIENT_ID).append(EQ)
+                .append(urlEncode(configContext.oidcConfig.clientId.get()));
 
         // scope
-        List<Object> scopes = new ArrayList<>();
+        List<String> scopes = new ArrayList<>();
         scopes.add("openid");
         configContext.oidcConfig.getAuthentication().scopes.ifPresent(scopes::addAll);
-        params.put("scopes", new JsonArray(scopes));
+        codeFlowParams.append(AMP).append(OidcConstants.TOKEN_SCOPE).append(EQ).append(urlEncode(String.join(" ", scopes)));
 
         // redirect_uri
         String redirectPath = getRedirectPath(configContext, context);
         String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath);
         LOG.debugf("Authentication request redirect_uri parameter: %s", redirectUriParam);
-        params.put("redirect_uri", redirectUriParam);
+
+        codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_REDIRECT_URI).append(EQ).append(urlEncode(redirectUriParam));
 
         // state
-        params.put("state", generateCodeFlowState(context, configContext, redirectPath));
+        codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_STATE).append(EQ)
+                .append(generateCodeFlowState(context, configContext, redirectPath));
 
         // extra redirect parameters, see https://openid.net/specs/openid-connect-core-1_0.html#AuthRequests
         if (configContext.oidcConfig.authentication.getExtraParams() != null) {
             for (Map.Entry<String, String> entry : configContext.oidcConfig.authentication.getExtraParams().entrySet()) {
-                params.put(entry.getKey(), entry.getValue());
+                codeFlowParams.append(AMP).append(entry.getKey()).append(EQ).append(urlEncode(entry.getValue()));
             }
         }
 
+        String authorizationURL = configContext.provider.getMetadata().getAuthorizationUri() + "?" + codeFlowParams.toString();
+
         return Uni.createFrom().item(new ChallengeData(HttpResponseStatus.FOUND.code(), HttpHeaders.LOCATION,
-                configContext.auth.authorizeURL(params)));
+                authorizationURL));
     }
 
-    private Uni<SecurityIdentity> performCodeFlow(IdentityProviderManager identityProviderManager,
-            RoutingContext context, DefaultTenantConfigResolver resolver) {
-        JsonObject params = new JsonObject();
-
-        String code = context.request().getParam("code");
-        if (code == null) {
-            return Uni.createFrom().optional(Optional.empty());
+    private static String urlEncode(String value) {
+        try {
+            return URLEncoder.encode(value, StandardCharsets.UTF_8.name());
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
         }
+    }
+
+    private Uni<SecurityIdentity> performCodeFlow(IdentityProviderManager identityProviderManager,
+            RoutingContext context, TenantConfigContext configContext, String code) {
 
-        TenantConfigContext configContext = resolver.resolve(context, true);
         Cookie stateCookie = context.getCookie(getStateCookieName(configContext));
 
+        String userPath = null;
         String userQuery = null;
         if (stateCookie != null) {
             List<String> values = context.queryParam("state");
@@ -211,156 +260,127 @@ private Uni<SecurityIdentity> performCodeFlow(IdentityProviderManager identityPr
             } else if (!stateCookie.getValue().startsWith(values.get(0))) {
                 LOG.debug("State cookie value does not match the state query parameter value");
                 return Uni.createFrom().failure(new AuthenticationCompletionException());
-            } else if (context.queryParam("pathChecked").isEmpty()) {
-                // This is an original redirect from IDP, check if the request path needs to be updated
-                String[] pair = COOKIE_PATTERN.split(stateCookie.getValue());
-                if (pair.length == 2) {
-                    // The extra path that needs to be added to the current request path
-                    String extraPath = pair[1];
-
-                    // The original user query if any will be added to the final redirect URI
-                    // after the authentication has been complete
-
-                    int userQueryIndex = extraPath.indexOf("?");
-                    if (userQueryIndex != 0) {
-                        if (userQueryIndex > 0) {
-                            extraPath = extraPath.substring(0, userQueryIndex);
-                        }
-                        // Adding a query marker that the state cookie has already been used to restore the path
-                        // as deleting it now would increase the risk of CSRF
-                        String extraQuery = "?pathChecked=true";
-
-                        // The query parameters returned from IDP need to be included
-                        if (context.request().query() != null) {
-                            extraQuery += ("&" + context.request().query());
-                        }
-
-                        String localRedirectUri = buildUri(context, isForceHttps(configContext), extraPath + extraQuery);
-                        LOG.debugf("Local redirect URI: %s", localRedirectUri);
-                        return Uni.createFrom().failure(new AuthenticationRedirectException(localRedirectUri));
-                    } else if (userQueryIndex + 1 < extraPath.length()) {
-                        // only the user query needs to be restored, no need to redirect
-                        userQuery = extraPath.substring(userQueryIndex + 1);
-                    }
-                }
-                // The original request path does not have to be restored, the state cookie is no longer needed
-                removeCookie(context, configContext, getStateCookieName(configContext));
             } else {
+                // This is an original redirect from IDP, check if the original request path and query need to be restored
                 String[] pair = COOKIE_PATTERN.split(stateCookie.getValue());
                 if (pair.length == 2) {
                     int userQueryIndex = pair[1].indexOf("?");
-                    if (userQueryIndex >= 0 && userQueryIndex + 1 < pair[1].length()) {
-                        userQuery = pair[1].substring(userQueryIndex + 1);
+                    if (userQueryIndex >= 0) {
+                        userPath = pair[1].substring(0, userQueryIndex);
+                        if (userQueryIndex + 1 < pair[1].length()) {
+                            userQuery = pair[1].substring(userQueryIndex + 1);
+                        }
+                    } else {
+                        userPath = pair[1];
                     }
                 }
-                // Local redirect restoring the original request path, the state cookie is no longer needed
                 removeCookie(context, configContext, getStateCookieName(configContext));
             }
         } else {
             // State cookie must be available to minimize the risk of CSRF
-            LOG.debug("The state cookie is missing after a redirect from IDP");
+            LOG.debug("The state cookie is missing after a redirect from IDP, authentication has failed");
             return Uni.createFrom().failure(new AuthenticationCompletionException());
         }
 
-        // Code grant request
-        // 'code': the code grant value returned from IDP
-        params.put("code", code);
+        final String finalUserPath = userPath;
+        final String finalUserQuery = userQuery;
 
-        // 'redirect_uri': typically it must match the 'redirect_uri' query parameter which was used during the code request.
-        String redirectPath = getRedirectPath(configContext, context);
-        String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath);
-        LOG.debugf("Token request redirect_uri parameter: %s", redirectUriParam);
-        params.put("redirect_uri", redirectUriParam);
-
-        // Client secret has to be posted as a form parameter if OIDC requires the client_secret_post authentication
-        Credentials creds = configContext.oidcConfig.getCredentials();
-        if (creds.clientSecret.value.isPresent() && Secret.Method.POST == creds.clientSecret.method.orElse(null)) {
-            params.put("client_secret", creds.clientSecret.value.get());
-        } else if (creds.jwt.secret.isPresent()) {
-            params.put("client_assertion_type", "urn:ietf:params:oauth:client-assertion-type:jwt-bearer");
-            params.put("client_assertion", signJwtWithClientSecret(configContext.oidcConfig));
-        }
+        Uni<AuthorizationCodeTokens> codeFlowTokensUni = getCodeFlowTokensUni(context, configContext, code);
 
-        final String finalUserQuery = userQuery;
-        return Uni.createFrom().emitter(new Consumer<UniEmitter<? super SecurityIdentity>>() {
-            @Override
-            public void accept(UniEmitter<? super SecurityIdentity> uniEmitter) {
-                configContext.auth.authenticate(params, userAsyncResult -> {
-                    if (userAsyncResult.failed()) {
-                        if (userAsyncResult.cause() != null) {
-                            LOG.debugf("Exception during the code to token exchange: %s", userAsyncResult.cause().getMessage());
+        return codeFlowTokensUni
+                .onItemOrFailure()
+                .transformToUni(new BiFunction<AuthorizationCodeTokens, Throwable, Uni<? extends SecurityIdentity>>() {
+                    @Override
+                    public Uni<SecurityIdentity> apply(final AuthorizationCodeTokens tokens, final Throwable tOuter) {
+
+                        if (tOuter != null) {
+                            LOG.debugf("Exception during the code to token exchange: %s", tOuter.getMessage());
+                            return Uni.createFrom().failure(new AuthenticationCompletionException(tOuter));
                         }
-                        uniEmitter.fail(new AuthenticationCompletionException(userAsyncResult.cause()));
-                    } else {
-                        final AccessToken result = AccessToken.class.cast(userAsyncResult.result());
 
-                        context.put("access_token", result.opaqueAccessToken());
-                        authenticate(identityProviderManager, new IdTokenCredential(result.opaqueIdToken(), context))
-                                .subscribe().with(new Consumer<SecurityIdentity>() {
+                        context.put(NEW_AUTHENTICATION, Boolean.TRUE);
+                        context.put(OidcConstants.ACCESS_TOKEN_VALUE, tokens.getAccessToken());
+
+                        return authenticate(identityProviderManager, new IdTokenCredential(tokens.getIdToken(), context))
+                                .map(new Function<SecurityIdentity, SecurityIdentity>() {
                                     @Override
-                                    public void accept(SecurityIdentity identity) {
-                                        if (!result.idToken().containsKey("exp") || !result.idToken().containsKey("iat")) {
-                                            LOG.debug("ID Token is required to contain 'exp' and 'iat' claims");
-                                            uniEmitter.fail(new AuthenticationCompletionException());
-                                        }
-                                        processSuccessfulAuthentication(context, configContext, result,
-                                                result.opaqueRefreshToken(), identity);
+                                    public SecurityIdentity apply(SecurityIdentity identity) {
+                                        processSuccessfulAuthentication(context, configContext,
+                                                tokens, identity);
+
+                                        boolean removeRedirectParams = configContext.oidcConfig.authentication
+                                                .isRemoveRedirectParameters();
+                                        if (removeRedirectParams || finalUserPath != null
+                                                || finalUserQuery != null) {
+
+                                            URI absoluteUri = URI.create(context.request().absoluteURI());
+
+                                            StringBuilder finalUriWithoutQuery = new StringBuilder(buildUri(context,
+                                                    isForceHttps(configContext),
+                                                    absoluteUri.getAuthority(),
+                                                    (finalUserPath != null ? finalUserPath
+                                                            : absoluteUri.getRawPath())));
 
-                                        if (configContext.oidcConfig.authentication.isRemoveRedirectParameters()
-                                                && context.request().query() != null) {
-                                            String finalRedirectUri = buildUriWithoutQueryParams(context);
+                                            if (!removeRedirectParams) {
+                                                finalUriWithoutQuery.append('?').append(absoluteUri.getRawQuery());
+                                            }
                                             if (finalUserQuery != null) {
-                                                finalRedirectUri += ("?" + finalUserQuery);
+                                                finalUriWithoutQuery.append(!removeRedirectParams ? "" : "?");
+                                                finalUriWithoutQuery.append(finalUserQuery);
                                             }
+                                            String finalRedirectUri = finalUriWithoutQuery.toString();
                                             LOG.debugf("Final redirect URI: %s", finalRedirectUri);
-                                            uniEmitter.fail(new AuthenticationRedirectException(finalRedirectUri));
+                                            throw new AuthenticationRedirectException(finalRedirectUri);
                                         } else {
-                                            uniEmitter.complete(augmentIdentity(identity, result.opaqueAccessToken(),
-                                                    result.opaqueRefreshToken(), context));
+                                            return augmentIdentity(identity, tokens.getAccessToken(),
+                                                    tokens.getRefreshToken(), context);
                                         }
                                     }
-                                }, new Consumer<Throwable>() {
+                                }).onFailure().transform(new Function<Throwable, Throwable>() {
                                     @Override
-                                    public void accept(Throwable throwable) {
-                                        uniEmitter.fail(throwable);
+                                    public Throwable apply(Throwable tInner) {
+                                        if (tInner instanceof AuthenticationRedirectException) {
+                                            return tInner;
+                                        }
+                                        return new AuthenticationCompletionException(tInner);
                                     }
                                 });
                     }
                 });
-            }
-        });
-    }
 
-    private String signJwtWithClientSecret(OidcTenantConfig cfg) {
-        final byte[] keyBytes = cfg.credentials.jwt.secret.get().getBytes(StandardCharsets.UTF_8);
-        SecretKey key = new SecretKeySpec(keyBytes, 0, keyBytes.length, "HMACSHA256");
-
-        // 'jti' claim is created by default.
-        final long iat = (System.currentTimeMillis() / 1000);
-        final long exp = iat + cfg.credentials.jwt.lifespan;
-
-        return Jwt.claims()
-                .issuer(cfg.clientId.get())
-                .subject(cfg.clientId.get())
-                .audience(cfg.authServerUrl.get())
-                .issuedAt(iat)
-                .expiresAt(exp)
-                .sign(key);
     }
 
-    private void processSuccessfulAuthentication(RoutingContext context, TenantConfigContext configContext,
-            AccessToken result, String refreshToken, SecurityIdentity securityIdentity) {
-        removeCookie(context, configContext, getSessionCookieName(configContext));
+    private void processSuccessfulAuthentication(RoutingContext context,
+            TenantConfigContext configContext,
+            AuthorizationCodeTokens tokens,
+            SecurityIdentity securityIdentity) {
+        removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig));
 
-        String cookieValue = result.opaqueIdToken() + COOKIE_DELIM
-                + result.opaqueAccessToken() + COOKIE_DELIM
-                + refreshToken;
+        JsonObject idToken = OidcUtils.decodeJwtContent(tokens.getIdToken());
 
-        long maxAge = result.idToken().getLong("exp") - result.idToken().getLong("iat");
+        if (!idToken.containsKey("exp") || !idToken.containsKey("iat")) {
+            LOG.debug("ID Token is required to contain 'exp' and 'iat' claims");
+            throw new AuthenticationCompletionException();
+        }
+        long maxAge = idToken.getLong("exp") - idToken.getLong("iat");
         if (configContext.oidcConfig.token.lifespanGrace.isPresent()) {
             maxAge += configContext.oidcConfig.token.lifespanGrace.getAsInt();
         }
-        createCookie(context, configContext, getSessionCookieName(configContext), cookieValue, maxAge);
+        if (configContext.oidcConfig.token.refreshExpired) {
+            maxAge += configContext.oidcConfig.authentication.sessionAgeExtension.getSeconds();
+        }
+        context.put(SESSION_MAX_AGE_PARAM, maxAge);
+        String cookieValue = resolver.getTokenStateManager()
+                .createTokenState(context, configContext.oidcConfig, tokens);
+        createCookie(context, configContext.oidcConfig, getSessionCookieName(configContext.oidcConfig), cookieValue, maxAge);
+
+        fireEvent(SecurityEvent.Type.OIDC_LOGIN, securityIdentity);
+    }
+
+    private void fireEvent(SecurityEvent.Type eventType, SecurityIdentity securityIdentity) {
+        if (resolver.isSecurityEventObserved()) {
+            resolver.getSecurityEvent().fire(new SecurityEvent(eventType, securityIdentity));
+        }
     }
 
     private String getRedirectPath(TenantConfigContext configContext, RoutingContext context) {
@@ -374,64 +394,96 @@ private String generateCodeFlowState(RoutingContext context, TenantConfigContext
         String cookieValue = uuid;
 
         Authentication auth = configContext.oidcConfig.getAuthentication();
-        if (auth.isRestorePathAfterRedirect()) {
-            String requestPath = !redirectPath.equals(context.request().path()) ? context.request().path() : "";
-            if (context.request().query() != null) {
-                requestPath += ("?" + context.request().query());
+        boolean restorePath = auth.isRestorePathAfterRedirect() || !auth.redirectPath.isPresent();
+        if (restorePath) {
+            String requestQuery = context.request().query();
+            String requestPath = !redirectPath.equals(context.request().path()) || requestQuery != null
+                    ? context.request().path()
+                    : "";
+            if (requestQuery != null) {
+                requestPath += ("?" + requestQuery);
             }
             if (!requestPath.isEmpty()) {
                 cookieValue += (COOKIE_DELIM + requestPath);
             }
         }
-        createCookie(context, configContext, getStateCookieName(configContext), cookieValue, 60 * 30);
+        createCookie(context, configContext.oidcConfig, getStateCookieName(configContext), cookieValue, 60 * 30);
         return uuid;
     }
 
     private String generatePostLogoutState(RoutingContext context, TenantConfigContext configContext) {
         removeCookie(context, configContext, getPostLogoutCookieName(configContext));
-        return createCookie(context, configContext, getPostLogoutCookieName(configContext), UUID.randomUUID().toString(),
+        return createCookie(context, configContext.oidcConfig, getPostLogoutCookieName(configContext),
+                UUID.randomUUID().toString(),
                 60 * 30).getValue();
     }
 
-    private CookieImpl createCookie(RoutingContext context, TenantConfigContext configContext,
+    static ServerCookie createCookie(RoutingContext context, OidcTenantConfig oidcConfig,
             String name, String value, long maxAge) {
-        CookieImpl cookie = new CookieImpl(name, value);
+        ServerCookie cookie = new CookieImpl(name, value);
         cookie.setHttpOnly(true);
-        cookie.setSecure(context.request().isSSL());
+        cookie.setSecure(oidcConfig.authentication.cookieForceSecure || context.request().isSSL());
         cookie.setMaxAge(maxAge);
         LOG.debugf(name + " cookie 'max-age' parameter is set to %d", maxAge);
-        Authentication auth = configContext.oidcConfig.getAuthentication();
-        if (auth.cookiePath.isPresent()) {
-            cookie.setPath(auth.getCookiePath().get());
+        Authentication auth = oidcConfig.getAuthentication();
+        setCookiePath(context, auth, cookie);
+        if (auth.cookieDomain.isPresent()) {
+            cookie.setDomain(auth.getCookieDomain().get());
         }
         context.response().addCookie(cookie);
         return cookie;
     }
 
+    static void setCookiePath(RoutingContext context, Authentication auth, ServerCookie cookie) {
+        if (auth.cookiePathHeader.isPresent() && context.request().headers().contains(auth.cookiePathHeader.get())) {
+            cookie.setPath(context.request().getHeader(auth.cookiePathHeader.get()));
+        } else {
+            cookie.setPath(auth.getCookiePath());
+        }
+    }
+
     private String buildUri(RoutingContext context, boolean forceHttps, String path) {
+        String authority = URI.create(context.request().absoluteURI()).getAuthority();
+        return buildUri(context, forceHttps, authority, path);
+    }
+
+    private String buildUri(RoutingContext context, boolean forceHttps, String authority, String path) {
         final String scheme = forceHttps ? "https" : context.request().scheme();
+        String forwardedPrefix = "";
+        if (resolver.isEnableHttpForwardedPrefix()) {
+            String forwardedPrefixHeader = context.request().getHeader("X-Forwarded-Prefix");
+            if (forwardedPrefixHeader != null && !forwardedPrefixHeader.equals("/") && !forwardedPrefixHeader.equals("//")) {
+                forwardedPrefix = forwardedPrefixHeader;
+                if (forwardedPrefix.endsWith("/")) {
+                    forwardedPrefix = forwardedPrefix.substring(0, forwardedPrefix.length() - 1);
+                }
+            }
+        }
         return new StringBuilder(scheme).append("://")
-                .append(URI.create(context.request().absoluteURI()).getAuthority())
+                .append(authority)
+                .append(forwardedPrefix)
                 .append(path)
                 .toString();
     }
 
-    private String buildUriWithoutQueryParams(RoutingContext context) {
-        URI absoluteUri = URI.create(context.request().absoluteURI());
-        return new StringBuilder(context.request().scheme()).append("://")
-                .append(absoluteUri.getAuthority())
-                .append(absoluteUri.getRawPath())
-                .toString();
-    }
-
     private void removeCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) {
         ServerCookie cookie = (ServerCookie) context.cookieMap().get(cookieName);
+        if (cookie != null) {
+            if (SESSION_COOKIE_NAME.equals(cookieName)) {
+                resolver.getTokenStateManager().deleteTokens(context, configContext.oidcConfig, cookie.getValue());
+            }
+            removeCookie(context, cookie, configContext.oidcConfig);
+        }
+    }
+
+    static void removeCookie(RoutingContext context, ServerCookie cookie, OidcTenantConfig oidcConfig) {
         if (cookie != null) {
             cookie.setValue("");
             cookie.setMaxAge(0);
-            Authentication auth = configContext.oidcConfig.getAuthentication();
-            if (auth.cookiePath.isPresent()) {
-                cookie.setPath(auth.cookiePath.get());
+            Authentication auth = oidcConfig.getAuthentication();
+            setCookiePath(context, auth, cookie);
+            if (auth.cookieDomain.isPresent()) {
+                cookie.setDomain(auth.cookieDomain.get());
             }
         }
     }
@@ -447,60 +499,84 @@ private boolean isLogout(RoutingContext context, TenantConfigContext configConte
         return false;
     }
 
-    private SecurityIdentity trySilentRefresh(TenantConfigContext configContext, String refreshToken,
-            RoutingContext context, IdentityProviderManager identityProviderManager) {
+    private Uni<SecurityIdentity> refreshSecurityIdentity(TenantConfigContext configContext, String refreshToken,
+            RoutingContext context, IdentityProviderManager identityProviderManager, boolean autoRefresh,
+            SecurityIdentity fallback) {
 
-        Uni<SecurityIdentity> cf = Uni.createFrom().emitter(new Consumer<UniEmitter<? super SecurityIdentity>>() {
-            @Override
-            public void accept(UniEmitter<? super SecurityIdentity> emitter) {
-                OAuth2TokenImpl token = new OAuth2TokenImpl(configContext.auth, new JsonObject());
-
-                // always get the last token
-                token.principal().put("refresh_token", refreshToken);
+        Uni<AuthorizationCodeTokens> refreshedTokensUni = refreshTokensUni(configContext, refreshToken);
 
-                token.refresh(new Handler<AsyncResult<Void>>() {
+        return refreshedTokensUni
+                .onItemOrFailure()
+                .transformToUni(new BiFunction<AuthorizationCodeTokens, Throwable, Uni<? extends SecurityIdentity>>() {
                     @Override
-                    public void handle(AsyncResult<Void> result) {
-                        if (result.succeeded()) {
-                            context.put("access_token", token.opaqueAccessToken());
-                            authenticate(identityProviderManager,
-                                    new IdTokenCredential(token.opaqueIdToken(), context))
-                                            .subscribe().with(new Consumer<SecurityIdentity>() {
-                                                @Override
-                                                public void accept(SecurityIdentity identity) {
-                                                    // the refresh token might not have been send in the response again
-                                                    String refresh = token.opaqueRefreshToken() != null
-                                                            ? token.opaqueRefreshToken()
-                                                            : refreshToken;
-                                                    // after a successful refresh, rebuild the identity and update the cookie
-                                                    processSuccessfulAuthentication(context, configContext, token, refresh,
-                                                            identity);
-                                                    // update the token so that blocking threads get the latest one
-                                                    emitter.complete(
-                                                            augmentIdentity(identity, token.opaqueAccessToken(),
-                                                                    token.opaqueRefreshToken(),
-                                                                    context));
-                                                }
-                                            }, new Consumer<Throwable>() {
-                                                @Override
-                                                public void accept(Throwable throwable) {
-                                                    emitter.fail(throwable);
-                                                }
-                                            });
+                    public Uni<SecurityIdentity> apply(final AuthorizationCodeTokens tokens, final Throwable t) {
+                        if (t != null) {
+                            LOG.debugf("ID token refresh has failed: %s", t.getMessage());
+                            if (autoRefresh) {
+                                LOG.debug("Using the current SecurityIdentity since the ID token is still valid");
+                                return Uni.createFrom().item(((TokenAutoRefreshException) t).getSecurityIdentity());
+                            } else {
+                                return Uni.createFrom().failure(new AuthenticationFailedException(t));
+                            }
                         } else {
-                            emitter.fail(new AuthenticationFailedException(result.cause()));
+                            context.put(OidcConstants.ACCESS_TOKEN_VALUE, tokens.getAccessToken());
+                            context.put(REFRESH_TOKEN_GRANT_RESPONSE, Boolean.TRUE);
+
+                            return authenticate(identityProviderManager, new IdTokenCredential(tokens.getIdToken(), context))
+                                    .map(new Function<SecurityIdentity, SecurityIdentity>() {
+                                        @Override
+                                        public SecurityIdentity apply(SecurityIdentity identity) {
+                                            // after a successful refresh, rebuild the identity and update the cookie
+                                            processSuccessfulAuthentication(context, configContext,
+                                                    tokens, identity);
+                                            SecurityIdentity newSecurityIdentity = augmentIdentity(identity,
+                                                    tokens.getAccessToken(), tokens.getRefreshToken(), context);
+
+                                            fireEvent(autoRefresh ? SecurityEvent.Type.OIDC_SESSION_REFRESHED
+                                                    : SecurityEvent.Type.OIDC_SESSION_EXPIRED_AND_REFRESHED,
+                                                    newSecurityIdentity);
+
+                                            return newSecurityIdentity;
+                                        }
+                                    }).onFailure().transform(new Function<Throwable, Throwable>() {
+                                        @Override
+                                        public Throwable apply(Throwable tInner) {
+                                            return new AuthenticationFailedException(tInner);
+                                        }
+                                    });
                         }
                     }
                 });
+    }
+
+    private Uni<AuthorizationCodeTokens> refreshTokensUni(TenantConfigContext configContext, String refreshToken) {
+
+        return configContext.provider.refreshTokens(refreshToken).plug(u -> {
+            if (!BlockingOperationControl.isBlockingAllowed()) {
+                return u.runSubscriptionOn(resolver.getBlockingExecutor());
             }
+            return u;
         });
+    }
+
+    private Uni<AuthorizationCodeTokens> getCodeFlowTokensUni(RoutingContext context, TenantConfigContext configContext,
+            String code) {
+
+        // 'redirect_uri': typically it must match the 'redirect_uri' query parameter which was used during the code request.
+        String redirectPath = getRedirectPath(configContext, context);
+        String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath);
+        LOG.debugf("Token request redirect_uri parameter: %s", redirectUriParam);
 
-        return cf.await().indefinitely();
+        return configContext.provider.getCodeFlowTokens(code, redirectUriParam).plug(u -> {
+            if (!BlockingOperationControl.isBlockingAllowed()) {
+                return u.runSubscriptionOn(resolver.getBlockingExecutor());
+            }
+            return u;
+        });
     }
 
     private String buildLogoutRedirectUri(TenantConfigContext configContext, String idToken, RoutingContext context) {
-        String logoutPath = configContext.oidcConfig.getEndSessionPath()
-                .orElse(OAuth2AuthProviderImpl.class.cast(configContext.auth).getConfig().getLogoutPath());
+        String logoutPath = configContext.provider.getMetadata().getEndSessionUri();
         StringBuilder logoutUri = new StringBuilder(logoutPath).append("?").append("id_token_hint=").append(idToken);
 
         if (configContext.oidcConfig.logout.postLogoutPath.isPresent()) {
@@ -518,26 +594,27 @@ private boolean isForceHttps(TenantConfigContext configContext) {
 
     private AuthenticationRedirectException redirectToLogoutEndpoint(RoutingContext context, TenantConfigContext configContext,
             String idToken) {
-        removeCookie(context, configContext, getSessionCookieName(configContext));
+        removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig));
         return new AuthenticationRedirectException(buildLogoutRedirectUri(configContext, idToken, context));
     }
 
-    private static String getSessionCookieName(TenantConfigContext configContext) {
-        String cookieSuffix = getCookieSuffix(configContext);
-        return SESSION_COOKIE_NAME + cookieSuffix;
-    }
-
     private static String getStateCookieName(TenantConfigContext configContext) {
-        String cookieSuffix = getCookieSuffix(configContext);
+        String cookieSuffix = getCookieSuffix(configContext.oidcConfig.tenantId.get());
         return STATE_COOKIE_NAME + cookieSuffix;
     }
 
     private static String getPostLogoutCookieName(TenantConfigContext configContext) {
-        String cookieSuffix = getCookieSuffix(configContext);
+        String cookieSuffix = getCookieSuffix(configContext.oidcConfig.tenantId.get());
         return POST_LOGOUT_COOKIE_NAME + cookieSuffix;
     }
 
-    private static String getCookieSuffix(TenantConfigContext configContext) {
-        return !"Default".equals(configContext.oidcConfig.tenantId.get()) ? "_" + configContext.oidcConfig.tenantId.get() : "";
+    private static String getSessionCookieName(OidcTenantConfig oidcConfig) {
+        String cookieSuffix = getCookieSuffix(oidcConfig.tenantId.get());
+        return SESSION_COOKIE_NAME + cookieSuffix;
+    }
+
+    static String getCookieSuffix(String tenantId) {
+        return !"Default".equals(tenantId) ? "_" + tenantId : "";
     }
+
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/ContextAwareTokenCredential.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/ContextAwareTokenCredential.java
deleted file mode 100644
index 6588b24fa0273..0000000000000
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/ContextAwareTokenCredential.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.quarkus.oidc.runtime;
-
-import io.quarkus.security.credential.TokenCredential;
-import io.vertx.ext.web.RoutingContext;
-
-public class ContextAwareTokenCredential extends TokenCredential {
-
-    private RoutingContext context;
-
-    protected ContextAwareTokenCredential(String token, String type, RoutingContext context) {
-        super(token, type);
-        this.context = context;
-    }
-
-    RoutingContext getContext() {
-        return context;
-    }
-}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java
index 553ccb283528c..a0a8a361268fc 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTenantConfigResolver.java
@@ -1,26 +1,33 @@
 package io.quarkus.oidc.runtime;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 
 import io.quarkus.oidc.OIDCException;
 import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.SecurityEvent;
 import io.quarkus.oidc.TenantConfigResolver;
 import io.quarkus.oidc.TenantResolver;
+import io.quarkus.oidc.TokenStateManager;
+import io.smallrye.mutiny.Uni;
 import io.vertx.ext.web.RoutingContext;
 
 @ApplicationScoped
 public class DefaultTenantConfigResolver {
 
     private static final Logger LOG = Logger.getLogger(DefaultTenantConfigResolver.class);
-    private static final String CURRENT_TENANT_CONFIG = "io.quarkus.oidc.current.tenant.config";
+    private static final String CURRENT_STATIC_TENANT_ID = "static.tenant.id";
+    private static final String CURRENT_STATIC_TENANT_ID_NULL = "static.tenant.id.null";
+    private static final String CURRENT_DYNAMIC_TENANT_CONFIG = "dynamic.tenant.config";
+    private static final String CURRENT_DYNAMIC_TENANT_CONFIG_NULL = "dynamic.tenant.config.null";
 
     @Inject
     Instance<TenantResolver> tenantResolver;
@@ -28,50 +35,68 @@ public class DefaultTenantConfigResolver {
     @Inject
     Instance<TenantConfigResolver> tenantConfigResolver;
 
-    private final Map<String, TenantConfigContext> dynamicTenantsConfig = new ConcurrentHashMap<>();
-
     @Inject
     TenantConfigBean tenantConfigBean;
 
+    @Inject
+    Instance<TokenStateManager> tokenStateManager;
+
+    @Inject
+    Event<SecurityEvent> securityEvent;
+
+    @Inject
+    @ConfigProperty(name = "quarkus.http.proxy.enable-forwarded-prefix")
+    boolean enableHttpForwardedPrefix;
+
+    private volatile boolean securityEventObserved;
+
     @PostConstruct
     public void verifyResolvers() {
-        if (tenantConfigResolver.isResolvable()) {
-            if (tenantConfigResolver.isAmbiguous()) {
-                throw new IllegalStateException("Multiple " + TenantConfigResolver.class + " beans registered");
-            }
+        if (tenantConfigResolver.isResolvable() && tenantConfigResolver.isAmbiguous()) {
+            throw new IllegalStateException("Multiple " + TenantConfigResolver.class + " beans registered");
         }
-        if (tenantResolver.isAmbiguous()) {
+        if (tenantResolver.isResolvable() && tenantResolver.isAmbiguous()) {
             throw new IllegalStateException("Multiple " + TenantResolver.class + " beans registered");
         }
+        if (tokenStateManager.isAmbiguous()) {
+            throw new IllegalStateException("Multiple " + TokenStateManager.class + " beans registered");
+        }
     }
 
-    /**
-     * Resolve {@linkplain TenantConfigContext} which contains the tenant configuration and
-     * the active OIDC connection instance which may be null.
-     * 
-     * @param context the current request context
-     * @param create if true then the OIDC connection must be available or established
-     *        for the resolution to be successful
-     * @return
-     */
-    TenantConfigContext resolve(RoutingContext context, boolean create) {
-        TenantConfigContext config = getTenantConfigFromConfigResolver(context, create);
-
-        if (config == null) {
-            config = getTenantConfigFromTenantResolver(context);
-        } else if (create && config.auth == null && !config.oidcConfig.getPublicKey().isPresent()) {
-            throw new OIDCException("OIDC IDP connection must be available");
+    OidcTenantConfig resolveConfig(RoutingContext context) {
+        OidcTenantConfig tenantConfig = getDynamicTenantConfig(context);
+        if (tenantConfig == null) {
+            TenantConfigContext tenant = getStaticTenantContext(context);
+            if (tenant != null) {
+                tenantConfig = tenant.oidcConfig;
+            }
         }
+        return tenantConfig;
+    }
 
-        return config;
+    Uni<TenantConfigContext> resolveContext(RoutingContext context) {
+        Uni<TenantConfigContext> tenantContext = getDynamicTenantContext(context);
+
+        if (tenantContext == null) {
+            tenantContext = Uni.createFrom().item(getStaticTenantContext(context));
+        }
+        return tenantContext;
     }
 
-    private TenantConfigContext getTenantConfigFromTenantResolver(RoutingContext context) {
+    private TenantConfigContext getStaticTenantContext(RoutingContext context) {
 
         String tenantId = null;
 
         if (tenantResolver.isResolvable()) {
-            tenantId = tenantResolver.get().resolve(context);
+            tenantId = context.get(CURRENT_STATIC_TENANT_ID);
+            if (tenantId == null && context.get(CURRENT_STATIC_TENANT_ID_NULL) == null) {
+                tenantId = tenantResolver.get().resolve(context);
+                if (tenantId != null) {
+                    context.put(CURRENT_STATIC_TENANT_ID, tenantId);
+                } else {
+                    context.put(CURRENT_STATIC_TENANT_ID_NULL, true);
+                }
+            }
         }
 
         TenantConfigContext configContext = tenantId != null ? tenantConfigBean.getStaticTenantsConfig().get(tenantId) : null;
@@ -84,46 +109,61 @@ private TenantConfigContext getTenantConfigFromTenantResolver(RoutingContext con
         return configContext;
     }
 
-    boolean isBlocking(RoutingContext context) {
-        TenantConfigContext resolver = resolve(context, false);
-        return resolver != null
-                && (resolver.auth == null || resolver.oidcConfig.token.refreshExpired
-                        || resolver.oidcConfig.authentication.userInfoRequired);
+    boolean isSecurityEventObserved() {
+        return securityEventObserved;
     }
 
-    private TenantConfigContext getTenantConfigFromConfigResolver(RoutingContext context, boolean create) {
-        if (tenantConfigResolver.isResolvable()) {
-            OidcTenantConfig tenantConfig;
+    void setSecurityEventObserved(boolean securityEventObserved) {
+        this.securityEventObserved = securityEventObserved;
+    }
 
-            if (context.get(CURRENT_TENANT_CONFIG) != null) {
-                tenantConfig = context.get(CURRENT_TENANT_CONFIG);
-            } else {
-                tenantConfig = this.tenantConfigResolver.get().resolve(context);
-                if (tenantConfig != null) {
-                    context.put(CURRENT_TENANT_CONFIG, tenantConfig);
+    Event<SecurityEvent> getSecurityEvent() {
+        return securityEvent;
+    }
+
+    TokenStateManager getTokenStateManager() {
+        return tokenStateManager.get();
+    }
+
+    private OidcTenantConfig getDynamicTenantConfig(RoutingContext context) {
+        OidcTenantConfig oidcConfig = null;
+        if (tenantConfigResolver.isResolvable()) {
+            oidcConfig = context.get(CURRENT_DYNAMIC_TENANT_CONFIG);
+            if (oidcConfig == null && context.get(CURRENT_DYNAMIC_TENANT_CONFIG_NULL) == null) {
+                oidcConfig = tenantConfigResolver.get().resolve(context);
+                if (oidcConfig != null) {
+                    context.put(CURRENT_DYNAMIC_TENANT_CONFIG, oidcConfig);
+                } else {
+                    context.put(CURRENT_DYNAMIC_TENANT_CONFIG_NULL, true);
                 }
             }
+        }
+        return oidcConfig;
+    }
 
-            if (tenantConfig != null) {
-                String tenantId = tenantConfig.getTenantId()
-                        .orElseThrow(() -> new OIDCException("Tenant configuration must have tenant id"));
-                TenantConfigContext tenantContext = dynamicTenantsConfig.get(tenantId);
-
-                if (tenantContext == null) {
-                    if (create) {
-                        synchronized (dynamicTenantsConfig) {
-                            tenantContext = dynamicTenantsConfig.computeIfAbsent(tenantId,
-                                    clientId -> tenantConfigBean.getTenantConfigContextFactory().apply(tenantConfig));
-                        }
-                    } else {
-                        tenantContext = new TenantConfigContext(null, tenantConfig);
-                    }
-                }
+    private Uni<TenantConfigContext> getDynamicTenantContext(RoutingContext context) {
 
-                return tenantContext;
+        OidcTenantConfig tenantConfig = getDynamicTenantConfig(context);
+        if (tenantConfig != null) {
+            String tenantId = tenantConfig.getTenantId()
+                    .orElseThrow(() -> new OIDCException("Tenant configuration must have tenant id"));
+            TenantConfigContext tenantContext = tenantConfigBean.getDynamicTenantsConfig().get(tenantId);
+
+            if (tenantContext == null) {
+                return tenantConfigBean.getTenantConfigContextFactory().apply(tenantConfig);
+            } else {
+                return Uni.createFrom().item(tenantContext);
             }
         }
 
         return null;
     }
+
+    boolean isEnableHttpForwardedPrefix() {
+        return enableHttpForwardedPrefix;
+    }
+
+    public Executor getBlockingExecutor() {
+        return tenantConfigBean.getBlockingExecutor();
+    }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java
new file mode 100644
index 0000000000000..2b0a951258c24
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java
@@ -0,0 +1,124 @@
+package io.quarkus.oidc.runtime;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.oidc.AuthorizationCodeTokens;
+import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.TokenStateManager;
+import io.vertx.core.http.Cookie;
+import io.vertx.core.http.impl.ServerCookie;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class DefaultTokenStateManager implements TokenStateManager {
+
+    private static final String SESSION_AT_COOKIE_NAME = CodeAuthenticationMechanism.SESSION_COOKIE_NAME + "_at";
+    private static final String SESSION_RT_COOKIE_NAME = CodeAuthenticationMechanism.SESSION_COOKIE_NAME + "_rt";
+
+    @Override
+    public String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            AuthorizationCodeTokens tokens) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(tokens.getIdToken());
+        if (oidcConfig.tokenStateManager.strategy == OidcTenantConfig.TokenStateManager.Strategy.KEEP_ALL_TOKENS) {
+            if (!oidcConfig.tokenStateManager.splitTokens) {
+                sb.append(CodeAuthenticationMechanism.COOKIE_DELIM)
+                        .append(tokens.getAccessToken())
+                        .append(CodeAuthenticationMechanism.COOKIE_DELIM)
+                        .append(tokens.getRefreshToken());
+            } else {
+                CodeAuthenticationMechanism.createCookie(routingContext,
+                        oidcConfig,
+                        getAccessTokenCookieName(oidcConfig.getTenantId().get()),
+                        tokens.getAccessToken(),
+                        routingContext.get(CodeAuthenticationMechanism.SESSION_MAX_AGE_PARAM));
+                if (tokens.getRefreshToken() != null) {
+                    CodeAuthenticationMechanism.createCookie(routingContext,
+                            oidcConfig,
+                            getRefreshTokenCookieName(oidcConfig.getTenantId().get()),
+                            tokens.getRefreshToken(),
+                            routingContext.get(CodeAuthenticationMechanism.SESSION_MAX_AGE_PARAM));
+                }
+            }
+        } else if (oidcConfig.tokenStateManager.strategy == OidcTenantConfig.TokenStateManager.Strategy.ID_REFRESH_TOKENS) {
+            if (!oidcConfig.tokenStateManager.splitTokens) {
+                sb.append(CodeAuthenticationMechanism.COOKIE_DELIM)
+                        .append("")
+                        .append(CodeAuthenticationMechanism.COOKIE_DELIM)
+                        .append(tokens.getRefreshToken());
+            } else {
+                if (tokens.getRefreshToken() != null) {
+                    CodeAuthenticationMechanism.createCookie(routingContext,
+                            oidcConfig,
+                            getRefreshTokenCookieName(oidcConfig.getTenantId().get()),
+                            tokens.getRefreshToken(),
+                            routingContext.get(CodeAuthenticationMechanism.SESSION_MAX_AGE_PARAM));
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+        String[] tokens = CodeAuthenticationMechanism.COOKIE_PATTERN.split(tokenState);
+        String idToken = tokens[0];
+
+        String accessToken = null;
+        String refreshToken = null;
+        if (oidcConfig.tokenStateManager.strategy == OidcTenantConfig.TokenStateManager.Strategy.KEEP_ALL_TOKENS) {
+            if (!oidcConfig.tokenStateManager.splitTokens) {
+                accessToken = tokens[1];
+                refreshToken = tokens[2];
+            } else {
+                Cookie atCookie = getAccessTokenCookie(routingContext, oidcConfig);
+                if (atCookie != null) {
+                    accessToken = atCookie.getValue();
+                }
+                Cookie rtCookie = getRefreshTokenCookie(routingContext, oidcConfig);
+                if (rtCookie != null) {
+                    refreshToken = rtCookie.getValue();
+                }
+            }
+        } else if (oidcConfig.tokenStateManager.strategy == OidcTenantConfig.TokenStateManager.Strategy.ID_REFRESH_TOKENS) {
+            if (!oidcConfig.tokenStateManager.splitTokens) {
+                refreshToken = tokens[2];
+            } else {
+                Cookie rtCookie = getRefreshTokenCookie(routingContext, oidcConfig);
+                if (rtCookie != null) {
+                    refreshToken = rtCookie.getValue();
+                }
+            }
+        }
+
+        return new AuthorizationCodeTokens(idToken, accessToken, refreshToken);
+    }
+
+    @Override
+    public void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+        if (oidcConfig.tokenStateManager.splitTokens) {
+            CodeAuthenticationMechanism.removeCookie(routingContext, getAccessTokenCookie(routingContext, oidcConfig),
+                    oidcConfig);
+            CodeAuthenticationMechanism.removeCookie(routingContext, getRefreshTokenCookie(routingContext, oidcConfig),
+                    oidcConfig);
+        }
+    }
+
+    private static ServerCookie getAccessTokenCookie(RoutingContext routingContext, OidcTenantConfig oidcConfig) {
+        return (ServerCookie) routingContext.request().getCookie(getAccessTokenCookieName(oidcConfig.getTenantId().get()));
+    }
+
+    private static ServerCookie getRefreshTokenCookie(RoutingContext routingContext, OidcTenantConfig oidcConfig) {
+        return (ServerCookie) routingContext.request().getCookie(getRefreshTokenCookieName(oidcConfig.getTenantId().get()));
+    }
+
+    private static String getAccessTokenCookieName(String tenantId) {
+        String cookieSuffix = CodeAuthenticationMechanism.getCookieSuffix(tenantId);
+        return SESSION_AT_COOKIE_NAME + cookieSuffix;
+    }
+
+    private static String getRefreshTokenCookieName(String tenantId) {
+        String cookieSuffix = CodeAuthenticationMechanism.getCookieSuffix(tenantId);
+        return SESSION_RT_COOKIE_NAME + cookieSuffix;
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/JsonWebKeyCache.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/JsonWebKeyCache.java
new file mode 100644
index 0000000000000..adbe41b111aeb
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/JsonWebKeyCache.java
@@ -0,0 +1,48 @@
+package io.quarkus.oidc.runtime;
+
+import java.security.Key;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jose4j.jwk.JsonWebKey;
+import org.jose4j.jwk.JsonWebKeySet;
+import org.jose4j.lang.JoseException;
+
+import io.quarkus.oidc.OIDCException;
+
+public class JsonWebKeyCache {
+    private static final String RSA_KEY_TYPE = "RSA";
+    private static final String EC_KEY_TYPE = "EC";
+    private static final String SIGNATURE_USE = "sig";
+
+    private Map<String, Key> keys = new HashMap<>();
+
+    public JsonWebKeyCache(String json) {
+        initKeys(json);
+    }
+
+    private void initKeys(String json) {
+        try {
+            JsonWebKeySet jwkSet = new JsonWebKeySet(json);
+            for (JsonWebKey jwkKey : jwkSet.getJsonWebKeys()) {
+                if ((RSA_KEY_TYPE.equals(jwkKey.getKeyType()) || EC_KEY_TYPE.equals(jwkKey.getKeyType())
+                        || jwkKey.getKeyType() == null)
+                        && (SIGNATURE_USE.equals(jwkKey.getUse()) || jwkKey.getUse() == null)
+                        && jwkKey.getKeyId() != null) {
+                    keys.put(jwkKey.getKeyId(), jwkKey.getKey());
+                }
+            }
+        } catch (JoseException ex) {
+            throw new OIDCException(ex);
+        }
+    }
+
+    public Key getKey(String kid) {
+        return keys.get(kid);
+    }
+
+    Map<String, Key> getKeys() {
+        return Collections.unmodifiableMap(keys);
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/JwkSetRefreshHandler.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/JwkSetRefreshHandler.java
deleted file mode 100644
index b317338f233b7..0000000000000
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/JwkSetRefreshHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.quarkus.oidc.runtime;
-
-import java.time.Duration;
-
-import org.jboss.logging.Logger;
-
-import io.vertx.core.Handler;
-import io.vertx.ext.auth.oauth2.OAuth2Auth;
-
-public class JwkSetRefreshHandler implements Handler<String> {
-    private static final Logger LOG = Logger.getLogger(JwkSetRefreshHandler.class);
-    private OAuth2Auth auth;
-    private volatile long lastForcedRefreshTime;
-    private long forcedJwksRefreshIntervalMilliSecs;
-
-    public JwkSetRefreshHandler(OAuth2Auth auth, Duration forcedJwksRefreshInterval) {
-        this.auth = auth;
-        this.forcedJwksRefreshIntervalMilliSecs = forcedJwksRefreshInterval.toMillis();
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void handle(String kid) {
-        final long now = System.currentTimeMillis();
-        if (now > lastForcedRefreshTime + forcedJwksRefreshIntervalMilliSecs) {
-            lastForcedRefreshTime = now;
-            LOG.debugf("No JWK with %s key id is available, trying to refresh the JWK set", kid);
-            auth.loadJWK(res -> {
-                if (res.failed()) {
-                    LOG.debugf("Failed to refresh the JWK set: %s", res.cause());
-                }
-            });
-        }
-    }
-}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java
index 4d1111780850e..f3ec0c4282125 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcAuthenticationMechanism.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Set;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
@@ -23,40 +24,50 @@ public class OidcAuthenticationMechanism implements HttpAuthenticationMechanism
 
     @Inject
     DefaultTenantConfigResolver resolver;
+
     private BearerAuthenticationMechanism bearerAuth = new BearerAuthenticationMechanism();
     private CodeAuthenticationMechanism codeAuth = new CodeAuthenticationMechanism();
 
+    @PostConstruct
+    public void init() {
+        bearerAuth.setResolver(resolver);
+        codeAuth.setResolver(resolver);
+    }
+
     @Override
     public Uni<SecurityIdentity> authenticate(RoutingContext context,
             IdentityProviderManager identityProviderManager) {
-        TenantConfigContext tenantContext = resolve(context);
-        if (tenantContext.oidcConfig.tenantEnabled == false) {
+        OidcTenantConfig oidcConfig = resolve(context);
+        if (oidcConfig.tenantEnabled == false) {
             return Uni.createFrom().nullItem();
         }
-        return isWebApp(tenantContext) ? codeAuth.authenticate(context, identityProviderManager, resolver)
-                : bearerAuth.authenticate(context, identityProviderManager, resolver);
+        return isWebApp(context, oidcConfig) ? codeAuth.authenticate(context, identityProviderManager)
+                : bearerAuth.authenticate(context, identityProviderManager);
     }
 
     @Override
     public Uni<ChallengeData> getChallenge(RoutingContext context) {
-        TenantConfigContext tenantContext = resolve(context);
-        if (tenantContext.oidcConfig.tenantEnabled == false) {
+        OidcTenantConfig oidcConfig = resolve(context);
+        if (oidcConfig.tenantEnabled == false) {
             return Uni.createFrom().nullItem();
         }
-        return isWebApp(tenantContext) ? codeAuth.getChallenge(context, resolver)
-                : bearerAuth.getChallenge(context, resolver);
+        return isWebApp(context, oidcConfig) ? codeAuth.getChallenge(context)
+                : bearerAuth.getChallenge(context);
     }
 
-    private TenantConfigContext resolve(RoutingContext context) {
-        TenantConfigContext tenantContext = resolver.resolve(context, false);
-        if (tenantContext == null) {
-            throw new OIDCException("Tenant configuration context has not been resolved");
+    private OidcTenantConfig resolve(RoutingContext context) {
+        OidcTenantConfig oidcConfig = resolver.resolveConfig(context);
+        if (oidcConfig == null) {
+            throw new OIDCException("Tenant configuration has not been resolved");
         }
-        return tenantContext;
+        return oidcConfig;
     }
 
-    private boolean isWebApp(TenantConfigContext tenantContext) {
-        return OidcTenantConfig.ApplicationType.WEB_APP == tenantContext.oidcConfig.applicationType;
+    private boolean isWebApp(RoutingContext context, OidcTenantConfig oidcConfig) {
+        if (OidcTenantConfig.ApplicationType.HYBRID == oidcConfig.applicationType) {
+            return context.request().getHeader("Authorization") == null;
+        }
+        return OidcTenantConfig.ApplicationType.WEB_APP == oidcConfig.applicationType;
     }
 
     @Override
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java
new file mode 100644
index 0000000000000..5a0b8675b36eb
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcConfigurationMetadataProducer.java
@@ -0,0 +1,26 @@
+package io.quarkus.oidc.runtime;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import io.quarkus.oidc.OIDCException;
+import io.quarkus.oidc.OidcConfigurationMetadata;
+import io.quarkus.security.identity.SecurityIdentity;
+
+@RequestScoped
+public class OidcConfigurationMetadataProducer {
+    @Inject
+    SecurityIdentity identity;
+
+    @Produces
+    @RequestScoped
+    OidcConfigurationMetadata produce() {
+        OidcConfigurationMetadata configMetadata = (OidcConfigurationMetadata) identity
+                .getAttribute(OidcUtils.CONFIG_METADATA_ATTRIBUTE);
+        if (configMetadata == null) {
+            throw new OIDCException("OidcConfigurationMetadata can not be injected");
+        }
+        return configMetadata;
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java
index 1db029d876ca9..c81332c40a3f2 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java
@@ -3,15 +3,22 @@
 import static io.quarkus.oidc.runtime.OidcUtils.validateAndCreateIdentity;
 
 import java.security.Principal;
-import java.util.function.Consumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
+import org.jose4j.lang.UnresolvableKeyException;
+
 import io.quarkus.oidc.AccessTokenCredential;
 import io.quarkus.oidc.IdTokenCredential;
+import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.OidcTenantConfig.Roles.Source;
+import io.quarkus.oidc.OidcTokenCredential;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.quarkus.runtime.BlockingOperationControl;
 import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.credential.TokenCredential;
 import io.quarkus.security.identity.AuthenticationRequestContext;
@@ -20,17 +27,19 @@
 import io.quarkus.security.identity.request.TokenAuthenticationRequest;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.subscription.UniEmitter;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.oauth2.AccessToken;
-import io.vertx.ext.auth.oauth2.impl.OAuth2AuthProviderImpl;
-import io.vertx.ext.jwt.JWT;
 import io.vertx.ext.web.RoutingContext;
 
 @ApplicationScoped
 public class OidcIdentityProvider implements IdentityProvider<TokenAuthenticationRequest> {
+
+    static final String REFRESH_TOKEN_GRANT_RESPONSE = "refresh_token_grant_response";
+    static final String NEW_AUTHENTICATION = "new_authentication";
+
+    private static final Uni<TokenVerificationResult> NULL_CODE_ACCESS_TOKEN_UNI = Uni.createFrom().nullItem();
+    private static final Uni<JsonObject> NULL_USER_INFO_UNI = Uni.createFrom().nullItem();
+    private static final String CODE_ACCESS_TOKEN_RESULT = "code_flow_access_token_result";
+
     @Inject
     DefaultTenantConfigResolver tenantResolver;
 
@@ -42,208 +51,259 @@ public Class<TokenAuthenticationRequest> getRequestType() {
     @Override
     public Uni<SecurityIdentity> authenticate(TokenAuthenticationRequest request,
             AuthenticationRequestContext context) {
-        ContextAwareTokenCredential credential = (ContextAwareTokenCredential) request.getToken();
-        RoutingContext vertxContext = credential.getContext();
-        return Uni.createFrom().deferred(new Supplier<Uni<SecurityIdentity>>() {
-            @Override
-            public Uni<SecurityIdentity> get() {
-                if (tenantResolver.isBlocking(vertxContext)) {
-                    return context.runBlocking(new Supplier<SecurityIdentity>() {
-                        @Override
-                        public SecurityIdentity get() {
-                            return authenticate(request, vertxContext).await().indefinitely();
-                        }
-                    });
-                }
+        OidcTokenCredential credential = (OidcTokenCredential) request.getToken();
+        RoutingContext vertxContext = credential.getRoutingContext();
+        vertxContext.put(AuthenticationRequestContext.class.getName(), context);
 
-                return authenticate(request, vertxContext);
-            }
-        });
+        Uni<TenantConfigContext> tenantConfigContext = tenantResolver.resolveContext(vertxContext);
 
+        return tenantConfigContext.onItem()
+                .transformToUni(new Function<TenantConfigContext, Uni<? extends SecurityIdentity>>() {
+                    @Override
+                    public Uni<SecurityIdentity> apply(TenantConfigContext tenantConfigContext) {
+                        return Uni.createFrom().deferred(new Supplier<Uni<? extends SecurityIdentity>>() {
+                            @Override
+                            public Uni<SecurityIdentity> get() {
+                                return authenticate(request, vertxContext, tenantConfigContext);
+                            }
+                        });
+                    }
+                });
     }
 
     private Uni<SecurityIdentity> authenticate(TokenAuthenticationRequest request,
-            RoutingContext vertxContext) {
-        TenantConfigContext resolvedContext = tenantResolver.resolve(vertxContext, true);
-
+            RoutingContext vertxContext,
+            TenantConfigContext resolvedContext) {
         if (resolvedContext.oidcConfig.publicKey.isPresent()) {
             return validateTokenWithoutOidcServer(request, resolvedContext);
         } else {
-            return validateTokenWithOidcServer(vertxContext, request, resolvedContext);
+            return validateAllTokensWithOidcServer(vertxContext, request, resolvedContext);
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private Uni<SecurityIdentity> validateTokenWithOidcServer(RoutingContext vertxContext, TokenAuthenticationRequest request,
+    private Uni<SecurityIdentity> validateAllTokensWithOidcServer(RoutingContext vertxContext,
+            TokenAuthenticationRequest request,
             TenantConfigContext resolvedContext) {
 
-        if (request.getToken() instanceof IdTokenCredential
-                && (resolvedContext.oidcConfig.authentication.verifyAccessToken
-                        || resolvedContext.oidcConfig.roles.source.get() == Source.accesstoken)) {
-            vertxContext.put("code_flow_access_token_result",
-                    verifyCodeFlowAccessToken(vertxContext, request, resolvedContext));
+        Uni<TokenVerificationResult> codeAccessTokenUni = verifyCodeFlowAccessTokenUni(vertxContext, request, resolvedContext);
+
+        return codeAccessTokenUni.onItemOrFailure().transformToUni(
+                new BiFunction<TokenVerificationResult, Throwable, Uni<? extends SecurityIdentity>>() {
+                    @Override
+                    public Uni<SecurityIdentity> apply(TokenVerificationResult codeAccessToken, Throwable t) {
+                        if (t != null) {
+                            return Uni.createFrom().failure(new AuthenticationFailedException(t));
+                        }
+                        return validateTokenWithOidcServer(vertxContext, request, resolvedContext, codeAccessToken);
+                    }
+                });
+    }
+
+    private Uni<SecurityIdentity> validateTokenWithOidcServer(RoutingContext vertxContext, TokenAuthenticationRequest request,
+            TenantConfigContext resolvedContext, TokenVerificationResult codeAccessTokenResult) {
+
+        if (codeAccessTokenResult != null) {
+            vertxContext.put(CODE_ACCESS_TOKEN_RESULT, codeAccessTokenResult);
         }
-        return Uni.createFrom().emitter(new Consumer<UniEmitter<? super SecurityIdentity>>() {
-            @Override
-            public void accept(UniEmitter<? super SecurityIdentity> uniEmitter) {
 
-                resolvedContext.auth.decodeToken(request.getToken().getToken(),
-                        new Handler<AsyncResult<AccessToken>>() {
-                            @Override
-                            public void handle(AsyncResult<AccessToken> event) {
-                                if (event.failed()) {
-                                    uniEmitter.fail(new AuthenticationFailedException(event.cause()));
-                                    return;
-                                }
+        Uni<JsonObject> userInfo = getUserInfoUni(vertxContext, request, resolvedContext);
 
-                                // Token has been verified, as a JWT or an opaque token, possibly involving
-                                // an introspection request.
-                                final TokenCredential tokenCred = request.getToken();
+        return userInfo.onItemOrFailure().transformToUni(
+                new BiFunction<JsonObject, Throwable, Uni<? extends SecurityIdentity>>() {
+                    @Override
+                    public Uni<SecurityIdentity> apply(JsonObject userInfo, Throwable t) {
+                        if (t != null) {
+                            return Uni.createFrom().failure(new AuthenticationFailedException(t));
+                        }
+                        return createSecurityIdentityWithOidcServer(vertxContext, request, resolvedContext, userInfo);
+                    }
+                });
+    }
 
-                                JsonObject tokenJson = event.result().accessToken();
+    private Uni<SecurityIdentity> createSecurityIdentityWithOidcServer(RoutingContext vertxContext,
+            TokenAuthenticationRequest request, TenantConfigContext resolvedContext, final JsonObject userInfo) {
+        Uni<TokenVerificationResult> tokenUni = verifyTokenUni(resolvedContext,
+                request.getToken().getToken());
 
-                                if (tokenJson == null) {
-                                    // JSON token representation may be null not only if it is an opaque access token
-                                    // but also if it is JWT and no JWK with a matching kid is available, asynchronous
-                                    // JWK refresh has not finished yet, but the fallback introspection request has succeeded.
-                                    tokenJson = OidcUtils.decodeJwtContent(tokenCred.getToken());
-                                }
+        return tokenUni.onItemOrFailure()
+                .transformToUni(new BiFunction<TokenVerificationResult, Throwable, Uni<? extends SecurityIdentity>>() {
+                    @Override
+                    public Uni<SecurityIdentity> apply(TokenVerificationResult result, Throwable t) {
+                        if (t != null) {
+                            return Uni.createFrom().failure(new AuthenticationFailedException(t));
+                        }
+                        // Token has been verified, as a JWT or an opaque token, possibly involving
+                        // an introspection request.
+                        final TokenCredential tokenCred = request.getToken();
 
-                                JsonObject userInfo = null;
-                                if (resolvedContext.oidcConfig.authentication.isUserInfoRequired()) {
-                                    userInfo = getUserInfo(event.result(), (String) vertxContext.get("access_token"));
-                                }
-                                if (tokenJson != null) {
-                                    OidcUtils.validatePrimaryJwtTokenType(resolvedContext.oidcConfig.token, tokenJson);
-                                    JsonObject rolesJson = getRolesJson(vertxContext, resolvedContext, tokenCred, tokenJson,
-                                            userInfo);
-                                    try {
-                                        uniEmitter.complete(
-                                                validateAndCreateIdentity(vertxContext, tokenCred, resolvedContext.oidcConfig,
-                                                        tokenJson, rolesJson, userInfo));
-                                    } catch (Throwable ex) {
-                                        uniEmitter.fail(ex);
-                                    }
-                                } else if (tokenCred instanceof IdTokenCredential
-                                        || tokenCred instanceof AccessTokenCredential
-                                                && !((AccessTokenCredential) tokenCred).isOpaque()) {
-                                    uniEmitter
-                                            .fail(new AuthenticationFailedException("JWT token can not be converted to JSON"));
+                        JsonObject tokenJson = result.localVerificationResult;
+                        if (tokenJson == null) {
+                            // JSON token representation may be null not only if it is an opaque access token
+                            // but also if it is JWT and no JWK with a matching kid is available, asynchronous
+                            // JWK refresh has not finished yet, but the fallback introspection request has succeeded.
+                            tokenJson = OidcUtils.decodeJwtContent(tokenCred.getToken());
+                        }
+                        if (tokenJson != null) {
+                            try {
+                                OidcUtils.validatePrimaryJwtTokenType(resolvedContext.oidcConfig.token, tokenJson);
+                                JsonObject rolesJson = getRolesJson(vertxContext, resolvedContext, tokenCred, tokenJson,
+                                        userInfo);
+                                SecurityIdentity securityIdentity = validateAndCreateIdentity(vertxContext, tokenCred,
+                                        resolvedContext, tokenJson, rolesJson, userInfo);
+                                if (tokenAutoRefreshPrepared(tokenJson, vertxContext, resolvedContext.oidcConfig)) {
+                                    return Uni.createFrom().failure(new TokenAutoRefreshException(securityIdentity));
                                 } else {
-                                    // Opaque Bearer Access Token
-                                    QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder();
-                                    builder.addCredential(tokenCred);
-                                    OidcUtils.setSecurityIdentityUserInfo(builder, userInfo);
-                                    if (event.result().principal().containsKey("username")) {
-                                        final String userName = event.result().principal().getString("username");
-                                        builder.setPrincipal(new Principal() {
-                                            @Override
-                                            public String getName() {
-                                                return userName;
-                                            }
-                                        });
-                                    }
-                                    if (event.result().principal().containsKey("scope")) {
-                                        for (String role : event.result().principal().getString("scope").split(" ")) {
-                                            builder.addRole(role.trim());
-                                        }
+                                    return Uni.createFrom().item(securityIdentity);
+                                }
+                            } catch (Throwable ex) {
+                                return Uni.createFrom().failure(new AuthenticationFailedException(ex));
+                            }
+                        } else if (tokenCred instanceof IdTokenCredential
+                                || tokenCred instanceof AccessTokenCredential
+                                        && !((AccessTokenCredential) tokenCred).isOpaque()) {
+                            return Uni.createFrom()
+                                    .failure(new AuthenticationFailedException("JWT token can not be converted to JSON"));
+                        } else {
+                            // Opaque Bearer Access Token
+                            QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder();
+                            builder.addCredential(tokenCred);
+                            OidcUtils.setSecurityIdentityUserInfo(builder, userInfo);
+                            OidcUtils.setSecurityIdentityConfigMetadata(builder, resolvedContext);
+                            if (result.introspectionResult.containsKey(OidcConstants.INTROSPECTION_TOKEN_USERNAME)) {
+                                final String userName = result.introspectionResult
+                                        .getString(OidcConstants.INTROSPECTION_TOKEN_USERNAME);
+                                builder.setPrincipal(new Principal() {
+                                    @Override
+                                    public String getName() {
+                                        return userName;
                                     }
-                                    uniEmitter.complete(builder.build());
+                                });
+                            }
+                            if (result.introspectionResult.containsKey(OidcConstants.TOKEN_SCOPE)) {
+                                for (String role : result.introspectionResult.getString(OidcConstants.TOKEN_SCOPE).split(" ")) {
+                                    builder.addRole(role.trim());
                                 }
                             }
-                        });
-            }
-        });
+                            if (userInfo != null) {
+                                OidcUtils.setSecurityIdentityRoles(builder, resolvedContext.oidcConfig, userInfo);
+                            }
+                            OidcUtils.setBlockinApiAttribute(builder, vertxContext);
+                            OidcUtils.setTenantIdAttribute(builder, resolvedContext.oidcConfig);
+                            return Uni.createFrom().item(builder.build());
+                        }
+                    }
+                });
+    }
+
+    @Deprecated
+    private static boolean tokenAutoRefreshPrepared(JsonObject tokenJson, RoutingContext vertxContext,
+            OidcTenantConfig oidcConfig) {
+        if (tokenJson != null
+                && oidcConfig.token.refreshExpired
+                && (oidcConfig.token.getRefreshTokenTimeSkew().isPresent() || oidcConfig.token.autoRefreshInterval.isPresent())
+                && vertxContext.get(REFRESH_TOKEN_GRANT_RESPONSE) != Boolean.TRUE
+                && vertxContext.get(NEW_AUTHENTICATION) != Boolean.TRUE) {
+            final long refreshTokenTimeSkew = (oidcConfig.token.getRefreshTokenTimeSkew()
+                    .orElse(oidcConfig.token.autoRefreshInterval.get())).getSeconds();
+            final long expiry = tokenJson.getLong("exp");
+            final long now = System.currentTimeMillis() / 1000;
+            return now + refreshTokenTimeSkew > expiry;
+        }
+        return false;
     }
 
-    @SuppressWarnings("deprecation")
     private static JsonObject getRolesJson(RoutingContext vertxContext, TenantConfigContext resolvedContext,
             TokenCredential tokenCred,
             JsonObject tokenJson, JsonObject userInfo) {
         JsonObject rolesJson = tokenJson;
-        if (tokenCred instanceof IdTokenCredential && resolvedContext.oidcConfig.roles.source.isPresent()) {
+        if (resolvedContext.oidcConfig.roles.source.isPresent()) {
             if (resolvedContext.oidcConfig.roles.source.get() == Source.userinfo) {
                 rolesJson = userInfo;
-            } else if (resolvedContext.oidcConfig.roles.source.get() == Source.accesstoken) {
-                AccessToken result = (AccessToken) vertxContext.get("code_flow_access_token_result");
-                rolesJson = result.accessToken();
+            } else if (tokenCred instanceof IdTokenCredential
+                    && resolvedContext.oidcConfig.roles.source.get() == Source.accesstoken) {
+                rolesJson = ((TokenVerificationResult) vertxContext.get(CODE_ACCESS_TOKEN_RESULT)).localVerificationResult;
                 if (rolesJson == null) {
                     // JSON token representation may be null not only if it is an opaque access token
                     // but also if it is JWT and no JWK with a matching kid is available, asynchronous
                     // JWK refresh has not finished yet, but the fallback introspection request has succeeded.
-                    rolesJson = OidcUtils.decodeJwtContent((String) vertxContext.get("access_token"));
-                }
-                if (rolesJson == null) {
-                    // this is the introspection response which may contain a 'scope' property
-                    rolesJson = result.principal();
+                    rolesJson = OidcUtils.decodeJwtContent((String) vertxContext.get(OidcConstants.ACCESS_TOKEN_VALUE));
                 }
             }
         }
         return rolesJson;
     }
 
-    @SuppressWarnings("deprecation")
-    private static AccessToken verifyCodeFlowAccessToken(RoutingContext vertxContext, TokenAuthenticationRequest request,
+    private Uni<TokenVerificationResult> verifyCodeFlowAccessTokenUni(RoutingContext vertxContext,
+            TokenAuthenticationRequest request,
             TenantConfigContext resolvedContext) {
-        return Uni.createFrom().emitter(new Consumer<UniEmitter<? super AccessToken>>() {
-            @Override
-            public void accept(UniEmitter<? super AccessToken> uniEmitter) {
-                resolvedContext.auth.decodeToken((String) vertxContext.get("access_token"),
-                        new Handler<AsyncResult<AccessToken>>() {
-                            @Override
-                            public void handle(AsyncResult<AccessToken> event) {
-                                if (event.failed()) {
-                                    uniEmitter.fail(new AuthenticationFailedException(event.cause()));
-                                }
-                                uniEmitter.complete(event.result());
-                            }
-                        });
+        if (request.getToken() instanceof IdTokenCredential
+                && (resolvedContext.oidcConfig.authentication.verifyAccessToken
+                        || resolvedContext.oidcConfig.roles.source.orElse(null) == Source.accesstoken)) {
+            final String codeAccessToken = (String) vertxContext.get(OidcConstants.ACCESS_TOKEN_VALUE);
+            return verifyTokenUni(resolvedContext, codeAccessToken);
+        } else {
+            return NULL_CODE_ACCESS_TOKEN_UNI;
+        }
+    }
+
+    private Uni<TokenVerificationResult> verifyTokenUni(TenantConfigContext resolvedContext, String token) {
+        if (OidcUtils.isOpaqueToken(token) || resolvedContext.provider.getMetadata().getJsonWebKeySetUri() == null) {
+            return introspectTokenUni(resolvedContext, token);
+        } else {
+            try {
+                return Uni.createFrom().item(resolvedContext.provider.verifyJwtToken(token));
+            } catch (Throwable t) {
+                if (t.getCause() instanceof UnresolvableKeyException) {
+                    return refreshJwksAndVerifyTokenUni(resolvedContext, token);
+                } else {
+                    return Uni.createFrom().failure(t);
+                }
+            }
+        }
+    }
+
+    private Uni<TokenVerificationResult> refreshJwksAndVerifyTokenUni(TenantConfigContext resolvedContext, String token) {
+        return resolvedContext.provider.refreshJwksAndVerifyJwtToken(token)
+                .onFailure(f -> f.getCause() instanceof UnresolvableKeyException
+                        && resolvedContext.oidcConfig.token.allowJwtIntrospection)
+                .recoverWithUni(f -> introspectTokenUni(resolvedContext, token));
+    }
+
+    private Uni<TokenVerificationResult> introspectTokenUni(TenantConfigContext resolvedContext, String token) {
+        // remote introspection is required, a blocking call
+
+        return resolvedContext.provider.introspectToken(token).plug(u -> {
+            if (!BlockingOperationControl.isBlockingAllowed()) {
+                return u.runSubscriptionOn(tenantResolver.getBlockingExecutor());
             }
-        }).await().indefinitely();
+            return u;
+        });
     }
 
     private static Uni<SecurityIdentity> validateTokenWithoutOidcServer(TokenAuthenticationRequest request,
             TenantConfigContext resolvedContext) {
-        OAuth2AuthProviderImpl auth = ((OAuth2AuthProviderImpl) resolvedContext.auth);
-        JWT jwt = auth.getJWT();
-        JsonObject tokenJson = null;
+
         try {
-            tokenJson = jwt.decode(request.getToken().getToken());
-        } catch (Throwable ex) {
-            return Uni.createFrom().failure(new AuthenticationFailedException(ex));
+            TokenVerificationResult result = resolvedContext.provider.verifyJwtToken(request.getToken().getToken());
+            return Uni.createFrom()
+                    .item(validateAndCreateIdentity(null, request.getToken(), resolvedContext,
+                            result.localVerificationResult, result.localVerificationResult, null));
+        } catch (Throwable t) {
+            return Uni.createFrom().failure(new AuthenticationFailedException(t));
         }
-        if (jwt.isExpired(tokenJson, auth.getConfig().getJWTOptions())) {
-            return Uni.createFrom().failure(new AuthenticationFailedException());
-        } else {
-            try {
-                return Uni.createFrom()
-                        .item(validateAndCreateIdentity(null, request.getToken(), resolvedContext.oidcConfig, tokenJson,
-                                tokenJson,
-                                null));
-            } catch (Throwable ex) {
-                return Uni.createFrom().failure(ex);
+    }
+
+    private Uni<JsonObject> getUserInfoUni(RoutingContext vertxContext, TokenAuthenticationRequest request,
+            TenantConfigContext resolvedContext) {
+        if (resolvedContext.oidcConfig.authentication.isUserInfoRequired()) {
+            if (BlockingOperationControl.isBlockingAllowed()) {
+                return resolvedContext.provider.getUserInfo(vertxContext, request);
             }
+            return resolvedContext.provider.getUserInfo(vertxContext, request)
+                    .runSubscriptionOn(tenantResolver.getBlockingExecutor());
+        } else {
+            return NULL_USER_INFO_UNI;
         }
     }
 
-    @SuppressWarnings("deprecation")
-    private static JsonObject getUserInfo(AccessToken tokenImpl, String opaqueAccessToken) {
-        return Uni.createFrom().emitter(
-                new Consumer<UniEmitter<? super JsonObject>>() {
-                    @Override
-                    public void accept(UniEmitter<? super JsonObject> uniEmitter) {
-                        tokenImpl.principal().put("access_token", opaqueAccessToken);
-                        tokenImpl.userInfo(new Handler<AsyncResult<JsonObject>>() {
-                            @Override
-                            public void handle(AsyncResult<JsonObject> event) {
-                                if (event.failed()) {
-                                    uniEmitter.fail(event.cause());
-                                } else {
-                                    uniEmitter.complete(event.result());
-                                }
-                            }
-                        });
-                    }
-                }).await().indefinitely();
-    }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java
index 6df9def69bb99..2bff1c56b660a 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java
@@ -8,6 +8,7 @@
 
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
+import org.jboss.logging.Logger;
 import org.jose4j.jwt.JwtClaims;
 import org.jose4j.jwt.consumer.InvalidJwtException;
 import org.jose4j.jwt.consumer.JwtConsumerBuilder;
@@ -24,6 +25,7 @@
 @Alternative
 @RequestScoped
 public class OidcJsonWebTokenProducer {
+    private static final Logger LOG = Logger.getLogger(OidcJsonWebTokenProducer.class);
 
     @Inject
     SecurityIdentity identity;
@@ -60,7 +62,7 @@ private JsonWebToken getTokenCredential(Class<? extends TokenCredential> type) {
             return (JsonWebToken) identity.getPrincipal();
         }
         TokenCredential credential = identity.getCredential(type);
-        if (credential != null) {
+        if (credential != null && credential.getToken() != null) {
             if (credential instanceof AccessTokenCredential && ((AccessTokenCredential) credential).isOpaque()) {
                 throw new OIDCException("Opaque access token can not be converted to JsonWebToken");
             }
@@ -77,6 +79,7 @@ private JsonWebToken getTokenCredential(Class<? extends TokenCredential> type) {
             return new OidcJwtCallerPrincipal(jwtClaims, credential);
         }
         String tokenType = type == AccessTokenCredential.class ? "access" : "ID";
-        throw new OIDCException("Current identity is not associated with an " + tokenType + " token");
+        LOG.tracef("Current identity is not associated with an %s token", tokenType);
+        return new NullJsonWebToken();
     }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProvider.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProvider.java
new file mode 100644
index 0000000000000..dbf64bacd7c9f
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProvider.java
@@ -0,0 +1,230 @@
+package io.quarkus.oidc.runtime;
+
+import java.security.Key;
+import java.time.Duration;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.jboss.logging.Logger;
+import org.jose4j.jwa.AlgorithmConstraints;
+import org.jose4j.jws.JsonWebSignature;
+import org.jose4j.jwt.consumer.ErrorCodeValidator;
+import org.jose4j.jwt.consumer.InvalidJwtException;
+import org.jose4j.jwt.consumer.JwtConsumer;
+import org.jose4j.jwt.consumer.JwtConsumerBuilder;
+import org.jose4j.jwx.JsonWebStructure;
+import org.jose4j.keys.resolvers.VerificationKeyResolver;
+import org.jose4j.lang.UnresolvableKeyException;
+
+import io.quarkus.oidc.AuthorizationCodeTokens;
+import io.quarkus.oidc.OIDCException;
+import io.quarkus.oidc.OidcConfigurationMetadata;
+import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.quarkus.security.AuthenticationFailedException;
+import io.quarkus.security.identity.request.TokenAuthenticationRequest;
+import io.smallrye.jwt.algorithm.SignatureAlgorithm;
+import io.smallrye.jwt.util.KeyUtils;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+public class OidcProvider {
+
+    private static final Logger LOG = Logger.getLogger(OidcProvider.class);
+
+    final OidcProviderClient client;
+    final RefreshableVerificationKeyResolver keyResolver;
+    final OidcTenantConfig oidcConfig;
+
+    public OidcProvider(OidcProviderClient client, OidcTenantConfig oidcConfig, JsonWebKeyCache jwks) {
+        this.client = client;
+        this.oidcConfig = oidcConfig;
+        this.keyResolver = jwks == null ? null : new JsonWebKeyResolver(jwks, oidcConfig.token.forcedJwkRefreshInterval);
+    }
+
+    public OidcProvider(String publicKeyEnc, OidcTenantConfig oidcConfig) {
+        this.client = null;
+        this.oidcConfig = oidcConfig;
+        this.keyResolver = new LocalPublicKeyResolver(publicKeyEnc);
+    }
+
+    public TokenVerificationResult verifyJwtToken(String token) throws InvalidJwtException {
+        JwtConsumerBuilder builder = new JwtConsumerBuilder();
+
+        builder.setVerificationKeyResolver(keyResolver);
+
+        builder.setJwsAlgorithmConstraints(
+                new AlgorithmConstraints(AlgorithmConstraints.ConstraintType.PERMIT, SignatureAlgorithm.RS256.getAlgorithm()));
+
+        builder.setRequireExpirationTime();
+        builder.setRequireIssuedAt();
+
+        String issuer = oidcConfig.token.issuer.orElse(null);
+        if (issuer == null && client != null) {
+            issuer = client.getMetadata().getIssuer();
+        }
+        if (issuer != null) {
+            builder.setExpectedIssuer(issuer);
+        }
+        if (oidcConfig.token.audience.isPresent()) {
+            builder.setExpectedAudience(oidcConfig.token.audience.get().toArray(new String[] {}));
+        } else {
+            builder.setSkipDefaultAudienceValidation();
+        }
+
+        if (oidcConfig.token.lifespanGrace.isPresent()) {
+            final int lifespanGrace = oidcConfig.token.lifespanGrace.getAsInt();
+            builder.setAllowedClockSkewInSeconds(lifespanGrace);
+        }
+
+        builder.setRelaxVerificationKeyValidation();
+
+        try {
+            JwtConsumer jwtConsumer = builder.build();
+            jwtConsumer.processToClaims(token);
+        } catch (InvalidJwtException ex) {
+            String detail = "";
+            List<ErrorCodeValidator.Error> details = ex.getErrorDetails();
+            if (!details.isEmpty()) {
+                detail = details.get(0).getErrorMessage();
+            }
+            LOG.debugf("Token verification has failed: %s", detail);
+            throw ex;
+        }
+        return new TokenVerificationResult(OidcUtils.decodeJwtContent(token), null);
+    }
+
+    public Uni<TokenVerificationResult> refreshJwksAndVerifyJwtToken(String token) {
+        return keyResolver.refresh().onItem().transformToUni(new Function<Void, Uni<? extends TokenVerificationResult>>() {
+
+            @Override
+            public Uni<? extends TokenVerificationResult> apply(Void v) {
+                try {
+                    return Uni.createFrom().item(verifyJwtToken(token));
+                } catch (Throwable t) {
+                    return Uni.createFrom().failure(t);
+                }
+            }
+
+        });
+    }
+
+    public Uni<TokenVerificationResult> introspectToken(String token) {
+        return client.introspectToken(token).onItemOrFailure()
+                .transform(new BiFunction<JsonObject, Throwable, TokenVerificationResult>() {
+
+                    @Override
+                    public TokenVerificationResult apply(JsonObject jsonObject, Throwable t) {
+                        if (t != null) {
+                            throw new AuthenticationFailedException(t);
+                        }
+                        if (!Boolean.TRUE.equals(jsonObject.getBoolean(OidcConstants.INTROSPECTION_TOKEN_ACTIVE))) {
+                            throw new AuthenticationFailedException();
+                        }
+                        Long exp = jsonObject.getLong(OidcConstants.INTROSPECTION_TOKEN_EXP);
+                        if (exp != null) {
+                            final int lifespanGrace = client.getOidcConfig().token.lifespanGrace.isPresent()
+                                    ? client.getOidcConfig().token.lifespanGrace.getAsInt()
+                                    : 0;
+                            if (System.currentTimeMillis() / 1000 > exp + lifespanGrace) {
+                                throw new AuthenticationFailedException();
+                            }
+                        }
+
+                        return new TokenVerificationResult(null, jsonObject);
+                    }
+
+                });
+    }
+
+    public Uni<JsonObject> getUserInfo(RoutingContext vertxContext, TokenAuthenticationRequest request) {
+        String accessToken = vertxContext.get(OidcConstants.ACCESS_TOKEN_VALUE);
+        if (accessToken == null) {
+            accessToken = request.getToken().getToken();
+        }
+        return client.getUserInfo(accessToken);
+    }
+
+    public Uni<AuthorizationCodeTokens> getCodeFlowTokens(String code, String redirectUri) {
+        return client.getAuthorizationCodeTokens(code, redirectUri);
+    }
+
+    public Uni<AuthorizationCodeTokens> refreshTokens(String refreshToken) {
+        return client.refreshAuthorizationCodeTokens(refreshToken);
+    }
+
+    private class JsonWebKeyResolver implements RefreshableVerificationKeyResolver {
+        volatile JsonWebKeyCache jwks;
+        volatile long lastForcedRefreshTime;
+        volatile long forcedJwksRefreshIntervalMilliSecs;
+
+        JsonWebKeyResolver(JsonWebKeyCache jwks, Duration forcedJwksRefreshInterval) {
+            this.jwks = jwks;
+            this.forcedJwksRefreshIntervalMilliSecs = forcedJwksRefreshInterval.toMillis();
+        }
+
+        @Override
+        public Key resolveKey(JsonWebSignature jws, List<JsonWebStructure> nestingContext)
+                throws UnresolvableKeyException {
+            String kid = jws.getKeyIdHeaderValue();
+            if (kid == null) {
+                throw new UnresolvableKeyException("Token 'kid' header is not set");
+            }
+            Key key = jwks.getKey(kid);
+            if (key == null) {
+                throw new UnresolvableKeyException(String.format("JWK with kid '%s' is not available", kid));
+            }
+            return key;
+        }
+
+        public Uni<Void> refresh() {
+            final long now = System.currentTimeMillis();
+            if (now > lastForcedRefreshTime + forcedJwksRefreshIntervalMilliSecs) {
+                lastForcedRefreshTime = now;
+                return client.getJsonWebKeySet().onItem().transformToUni(new Function<JsonWebKeyCache, Uni<? extends Void>>() {
+
+                    @Override
+                    public Uni<? extends Void> apply(JsonWebKeyCache t) {
+                        jwks = t;
+                        return Uni.createFrom().voidItem();
+                    }
+
+                });
+            } else {
+                return Uni.createFrom().voidItem();
+            }
+        }
+
+    }
+
+    private static class LocalPublicKeyResolver implements RefreshableVerificationKeyResolver {
+        Key key;
+
+        LocalPublicKeyResolver(String publicKeyEnc) {
+            try {
+                key = KeyUtils.decodePublicKey(publicKeyEnc);
+            } catch (Exception ex) {
+                throw new OIDCException(ex);
+            }
+        }
+
+        @Override
+        public Key resolveKey(JsonWebSignature jws, List<JsonWebStructure> nestingContext)
+                throws UnresolvableKeyException {
+            return key;
+        }
+
+    }
+
+    public OidcConfigurationMetadata getMetadata() {
+        return client.getMetadata();
+    }
+
+    private static interface RefreshableVerificationKeyResolver extends VerificationKeyResolver {
+        default Uni<Void> refresh() {
+            return Uni.createFrom().voidItem();
+        }
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProviderClient.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProviderClient.java
new file mode 100644
index 0000000000000..e8a08f68037c0
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcProviderClient.java
@@ -0,0 +1,137 @@
+package io.quarkus.oidc.runtime;
+
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.oidc.AuthorizationCodeTokens;
+import io.quarkus.oidc.OIDCException;
+import io.quarkus.oidc.OidcConfigurationMetadata;
+import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.common.runtime.OidcCommonUtils;
+import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.groups.UniOnItem;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.json.JsonObject;
+import io.vertx.mutiny.core.MultiMap;
+import io.vertx.mutiny.core.buffer.Buffer;
+import io.vertx.mutiny.ext.web.client.HttpRequest;
+import io.vertx.mutiny.ext.web.client.HttpResponse;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+public class OidcProviderClient {
+    private static final Logger LOG = Logger.getLogger(OidcProviderClient.class);
+    private static final String AUTHORIZATION_HEADER = String.valueOf(HttpHeaders.AUTHORIZATION);
+
+    private final WebClient client;
+    private final OidcConfigurationMetadata metadata;
+    private final OidcTenantConfig oidcConfig;
+    private final String clientSecretBasicAuthScheme;
+    private final Key clientJwtKey;
+
+    public OidcProviderClient(WebClient client,
+            OidcConfigurationMetadata metadata,
+            OidcTenantConfig oidcConfig) {
+        this.client = client;
+        this.metadata = metadata;
+        this.oidcConfig = oidcConfig;
+        this.clientSecretBasicAuthScheme = OidcCommonUtils.initClientSecretBasicAuth(oidcConfig);
+        this.clientJwtKey = OidcCommonUtils.initClientJwtKey(oidcConfig);
+    }
+
+    public OidcConfigurationMetadata getMetadata() {
+        return metadata;
+    }
+
+    public Uni<JsonWebKeyCache> getJsonWebKeySet() {
+        return client.getAbs(metadata.getJsonWebKeySetUri()).send().onItem()
+                .transform(resp -> getJsonWebKeyCache(resp));
+    }
+
+    public Uni<JsonObject> getUserInfo(String token) {
+        return client.postAbs(metadata.getUserInfoUri())
+                .putHeader(AUTHORIZATION_HEADER, OidcConstants.BEARER_SCHEME + " " + token)
+                .send().onItem().transform(resp -> getUserInfo(resp));
+    }
+
+    public Uni<JsonObject> introspectToken(String token) {
+        MultiMap introspectionParams = new MultiMap(io.vertx.core.MultiMap.caseInsensitiveMultiMap());
+        introspectionParams.add(OidcConstants.INTROSPECTION_TOKEN, token);
+        introspectionParams.add(OidcConstants.INTROSPECTION_TOKEN_TYPE_HINT, OidcConstants.ACCESS_TOKEN_VALUE);
+        return getHttpResponse(metadata.getIntrospectionUri(), introspectionParams)
+                .transform(resp -> getTokenIntrospection(resp));
+    }
+
+    private JsonWebKeyCache getJsonWebKeyCache(HttpResponse<Buffer> resp) {
+        if (resp.statusCode() == 200) {
+            return new JsonWebKeyCache(resp.bodyAsString(StandardCharsets.UTF_8.name()));
+        } else {
+            throw new OIDCException();
+        }
+    }
+
+    public OidcTenantConfig getOidcConfig() {
+        return oidcConfig;
+    }
+
+    public Uni<AuthorizationCodeTokens> getAuthorizationCodeTokens(String code, String redirectUri) {
+        MultiMap codeGrantParams = new MultiMap(io.vertx.core.MultiMap.caseInsensitiveMultiMap());
+        codeGrantParams.add(OidcConstants.GRANT_TYPE, OidcConstants.AUTHORIZATION_CODE);
+        codeGrantParams.add(OidcConstants.CODE_FLOW_CODE, code);
+        codeGrantParams.add(OidcConstants.CODE_FLOW_REDIRECT_URI, redirectUri);
+        return getHttpResponse(metadata.getTokenUri(), codeGrantParams).transform(resp -> getAuthorizationCodeTokens(resp));
+    }
+
+    public Uni<AuthorizationCodeTokens> refreshAuthorizationCodeTokens(String refreshToken) {
+        MultiMap refreshGrantParams = new MultiMap(io.vertx.core.MultiMap.caseInsensitiveMultiMap());
+        refreshGrantParams.add(OidcConstants.GRANT_TYPE, OidcConstants.REFRESH_TOKEN_GRANT);
+        refreshGrantParams.add(OidcConstants.REFRESH_TOKEN_VALUE, refreshToken);
+        return getHttpResponse(metadata.getTokenUri(), refreshGrantParams).transform(resp -> getAuthorizationCodeTokens(resp));
+    }
+
+    private UniOnItem<HttpResponse<Buffer>> getHttpResponse(String uri, MultiMap reqBody) {
+        HttpRequest<Buffer> request = client.postAbs(uri);
+        if (clientSecretBasicAuthScheme != null) {
+            request.putHeader(AUTHORIZATION_HEADER, clientSecretBasicAuthScheme);
+        } else if (clientJwtKey != null) {
+            reqBody.add(OidcConstants.CLIENT_ASSERTION_TYPE, OidcConstants.JWT_BEARER_CLIENT_ASSERTION_TYPE);
+            reqBody.add(OidcConstants.CLIENT_ASSERTION, OidcCommonUtils.signJwtWithKey(oidcConfig, clientJwtKey));
+        } else if (OidcCommonUtils.isClientSecretPostAuthRequired(oidcConfig.credentials)) {
+            reqBody.add(OidcConstants.CLIENT_ID, oidcConfig.clientId.get());
+            reqBody.add(OidcConstants.CLIENT_SECRET, OidcCommonUtils.clientSecret(oidcConfig.credentials));
+        } else {
+            reqBody.add(OidcConstants.CLIENT_ID, oidcConfig.clientId.get());
+        }
+        return request.sendForm(reqBody).onItem();
+    }
+
+    private AuthorizationCodeTokens getAuthorizationCodeTokens(HttpResponse<Buffer> resp) {
+        JsonObject json = getJsonObject(resp);
+        final String idToken = json.getString(OidcConstants.ID_TOKEN_VALUE);
+        final String accessToken = json.getString(OidcConstants.ACCESS_TOKEN_VALUE);
+        final String refreshToken = json.getString(OidcConstants.REFRESH_TOKEN_VALUE);
+        return new AuthorizationCodeTokens(idToken, accessToken, refreshToken);
+    }
+
+    private JsonObject getUserInfo(HttpResponse<Buffer> resp) {
+        return getJsonObject(resp);
+    }
+
+    private JsonObject getTokenIntrospection(HttpResponse<Buffer> resp) {
+        return getJsonObject(resp);
+    }
+
+    private JsonObject getJsonObject(HttpResponse<Buffer> resp) {
+        if (resp.statusCode() == 200) {
+            return resp.bodyAsJsonObject();
+        } else {
+            String error = resp.bodyAsString();
+            if (error != null) {
+                LOG.debugf("Request has failed: %s", error);
+            }
+            throw new OIDCException();
+        }
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java
index b3d4c41f1d2bb..870965b1d1843 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java
@@ -1,330 +1,284 @@
 package io.quarkus.oidc.runtime;
 
+import java.net.ConnectException;
+import java.net.URI;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletionException;
-import java.util.function.Consumer;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.jboss.logging.Logger;
 
+import io.quarkus.arc.Arc;
 import io.quarkus.oidc.OIDCException;
+import io.quarkus.oidc.OidcConfigurationMetadata;
 import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.OidcTenantConfig.ApplicationType;
-import io.quarkus.oidc.OidcTenantConfig.Credentials;
-import io.quarkus.oidc.OidcTenantConfig.Credentials.Secret;
 import io.quarkus.oidc.OidcTenantConfig.Roles.Source;
-import io.quarkus.oidc.OidcTenantConfig.Tls.Verification;
+import io.quarkus.oidc.OidcTenantConfig.TokenStateManager.Strategy;
+import io.quarkus.oidc.common.runtime.OidcCommonConfig;
+import io.quarkus.oidc.common.runtime.OidcCommonUtils;
+import io.quarkus.runtime.BlockingOperationControl;
+import io.quarkus.runtime.ExecutorRecorder;
+import io.quarkus.runtime.TlsConfig;
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.subscription.UniEmitter;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.ProxyOptions;
-import io.vertx.ext.auth.PubSecKeyOptions;
-import io.vertx.ext.auth.oauth2.OAuth2Auth;
-import io.vertx.ext.auth.oauth2.OAuth2ClientOptions;
-import io.vertx.ext.auth.oauth2.impl.OAuth2AuthProviderImpl;
-import io.vertx.ext.auth.oauth2.providers.KeycloakAuth;
-import io.vertx.ext.jwt.JWTOptions;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.ext.web.client.WebClient;
 
 @Recorder
 public class OidcRecorder {
 
     private static final Logger LOG = Logger.getLogger(OidcRecorder.class);
+    private static final String DEFAULT_TENANT_ID = "Default";
+    private static final Duration CONNECTION_BACKOFF_DURATION = Duration.ofSeconds(2);
 
-    public Supplier<TenantConfigBean> setup(OidcConfig config, Supplier<Vertx> vertx) {
+    private static final Map<String, TenantConfigContext> dynamicTenantsConfig = new ConcurrentHashMap<>();
+
+    public Supplier<TenantConfigBean> setup(OidcConfig config, Supplier<Vertx> vertx, TlsConfig tlsConfig) {
         final Vertx vertxValue = vertx.get();
-        Map<String, TenantConfigContext> tenantsConfig = new HashMap<>();
 
+        String defaultTenantId = config.defaultTenant.getTenantId().orElse(DEFAULT_TENANT_ID);
+        TenantConfigContext defaultTenantContext = createStaticTenantContext(vertxValue, config.defaultTenant, tlsConfig,
+                defaultTenantId);
+
+        Map<String, TenantConfigContext> staticTenantsConfig = new HashMap<>();
         for (Map.Entry<String, OidcTenantConfig> tenant : config.namedTenants.entrySet()) {
-            if (config.defaultTenant.getTenantId().isPresent()
-                    && tenant.getKey().equals(config.defaultTenant.getTenantId().get())) {
-                throw new OIDCException("tenant-id '" + tenant.getKey() + "' duplicates the default tenant-id");
-            }
-            if (tenant.getValue().getTenantId().isPresent() && !tenant.getKey().equals(tenant.getValue().getTenantId().get())) {
-                throw new OIDCException("Configuration has 2 different tenant-id values: '"
-                        + tenant.getKey() + "' and '" + tenant.getValue().getTenantId().get() + "'");
-            }
-            tenantsConfig.put(tenant.getKey(), createTenantContext(vertxValue, tenant.getValue(), tenant.getKey()));
+            OidcCommonUtils.verifyConfigurationId(defaultTenantId, tenant.getKey(), tenant.getValue().getTenantId());
+            staticTenantsConfig.put(tenant.getKey(),
+                    createStaticTenantContext(vertxValue, tenant.getValue(), tlsConfig, tenant.getKey()));
         }
-        TenantConfigContext tenantContext = createTenantContext(vertxValue, config.defaultTenant, "Default");
+
         return new Supplier<TenantConfigBean>() {
             @Override
             public TenantConfigBean get() {
-                return new TenantConfigBean(tenantsConfig, tenantContext,
-                        new Function<OidcTenantConfig, TenantConfigContext>() {
+                return new TenantConfigBean(staticTenantsConfig, dynamicTenantsConfig, defaultTenantContext,
+                        new Function<OidcTenantConfig, Uni<TenantConfigContext>>() {
                             @Override
-                            public TenantConfigContext apply(OidcTenantConfig config) {
-                                // OidcTenantConfig resolved by TenantConfigResolver must have its optional tenantId
-                                // initialized which is also enforced by DefaultTenantConfigResolver
-                                return createTenantContext(vertxValue, config, config.getTenantId().get());
+                            public Uni<TenantConfigContext> apply(OidcTenantConfig config) {
+                                return createDynamicTenantContext(vertxValue, config, tlsConfig, config.getTenantId().get())
+                                        .plug(u -> {
+                                            if (!BlockingOperationControl.isBlockingAllowed()) {
+                                                return u.runSubscriptionOn(ExecutorRecorder.getCurrent());
+                                            }
+                                            return u;
+                                        });
                             }
-                        });
+                        },
+                        ExecutorRecorder.getCurrent());
             }
         };
     }
 
-    private TenantConfigContext createTenantContext(Vertx vertx, OidcTenantConfig oidcConfig, String tenantId) {
-        if (!oidcConfig.tenantId.isPresent()) {
-            oidcConfig.tenantId = Optional.of(tenantId);
-        }
-        if (!oidcConfig.tenantEnabled) {
-            LOG.debugf("%s tenant configuration is disabled", tenantId);
-            return new TenantConfigContext(null, oidcConfig);
+    private Uni<TenantConfigContext> createDynamicTenantContext(Vertx vertx,
+            OidcTenantConfig oidcConfig, TlsConfig tlsConfig, String tenantId) {
+
+        if (!dynamicTenantsConfig.containsKey(tenantId)) {
+            return createTenantContext(vertx, oidcConfig, tlsConfig, tenantId).onItem().transform(
+                    new Function<TenantConfigContext, TenantConfigContext>() {
+                        @Override
+                        public TenantConfigContext apply(TenantConfigContext t) {
+                            dynamicTenantsConfig.putIfAbsent(tenantId, t);
+                            return t;
+                        }
+                    });
+        } else {
+            return Uni.createFrom().item(dynamicTenantsConfig.get(tenantId));
         }
+    }
 
-        OAuth2ClientOptions options = new OAuth2ClientOptions();
+    private TenantConfigContext createStaticTenantContext(Vertx vertx,
+            OidcTenantConfig oidcConfig, TlsConfig tlsConfig, String tenantId) {
 
-        if (oidcConfig.getClientId().isPresent()) {
-            options.setClientID(oidcConfig.getClientId().get());
-        }
+        return createTenantContext(vertx, oidcConfig, tlsConfig, tenantId).await().indefinitely();
+    }
 
-        if (oidcConfig.getToken().issuer.isPresent()) {
-            options.setValidateIssuer(false);
+    private Uni<TenantConfigContext> createTenantContext(Vertx vertx, OidcTenantConfig oidcConfig, TlsConfig tlsConfig,
+            String tenantId) {
+        if (!oidcConfig.tenantId.isPresent()) {
+            oidcConfig.tenantId = Optional.of(tenantId);
         }
-
-        if (oidcConfig.getToken().getLifespanGrace().isPresent()) {
-            JWTOptions jwtOptions = new JWTOptions();
-            jwtOptions.setLeeway(oidcConfig.getToken().getLifespanGrace().getAsInt());
-            options.setJWTOptions(jwtOptions);
+        if (!oidcConfig.tenantEnabled) {
+            LOG.debugf("'%s' tenant configuration is disabled", tenantId);
+            Uni.createFrom().item(new TenantConfigContext(new OidcProvider(null, null, null), oidcConfig));
         }
 
         if (oidcConfig.getPublicKey().isPresent()) {
-            return createdTenantContextFromPublicKey(options, oidcConfig);
-        }
-
-        if (!oidcConfig.getAuthServerUrl().isPresent() || !oidcConfig.getClientId().isPresent()) {
-            throw new ConfigurationException(
-                    "Both 'auth-server-url' and 'client-id' or alterntively 'public-key' must be configured"
-                            + " when the quarkus-oidc extension is enabled");
+            return Uni.createFrom().item(createTenantContextFromPublicKey(oidcConfig));
         }
 
-        // Base IDP server URL
-        String authServerUrl = oidcConfig.getAuthServerUrl().get();
-        if (authServerUrl.endsWith("/")) {
-            authServerUrl = authServerUrl.substring(0, authServerUrl.length() - 1);
-        }
-        options.setSite(authServerUrl);
+        OidcCommonUtils.verifyCommonConfiguration(oidcConfig, true);
 
         if (!oidcConfig.discoveryEnabled) {
-            if (ApplicationType.WEB_APP.equals(oidcConfig.applicationType)) {
+            if (oidcConfig.applicationType != ApplicationType.SERVICE) {
                 if (!oidcConfig.authorizationPath.isPresent() || !oidcConfig.tokenPath.isPresent()) {
                     throw new OIDCException("'web-app' applications must have 'authorization-path' and 'token-path' properties "
                             + "set when the discovery is disabled.");
                 }
-                // These endpoints can only be used with the code flow
-                if (oidcConfig.getAuthorizationPath().isPresent()) {
-                    options.setAuthorizationPath(authServerUrl + prependSlash(oidcConfig.getAuthorizationPath().get()));
-                }
-
-                if (oidcConfig.getTokenPath().isPresent()) {
-                    options.setTokenPath(authServerUrl + prependSlash(oidcConfig.getTokenPath().get()));
-                }
-
-                if (oidcConfig.getUserInfoPath().isPresent()) {
-                    options.setUserInfoPath(authServerUrl + prependSlash(oidcConfig.getUserInfoPath().get()));
-                }
             }
-
             // JWK and introspection endpoints have to be set for both 'web-app' and 'service' applications  
             if (!oidcConfig.jwksPath.isPresent() && !oidcConfig.introspectionPath.isPresent()) {
                 throw new OIDCException(
                         "Either 'jwks-path' or 'introspection-path' properties must be set when the discovery is disabled.");
             }
-
-            if (oidcConfig.getIntrospectionPath().isPresent()) {
-                options.setIntrospectionPath(authServerUrl + prependSlash(oidcConfig.getIntrospectionPath().get()));
-            }
-
-            if (oidcConfig.getJwksPath().isPresent()) {
-                options.setJwkPath(authServerUrl + prependSlash(oidcConfig.getJwksPath().get()));
-            }
-
-        }
-
-        Credentials creds = oidcConfig.getCredentials();
-        if (creds.secret.isPresent() && creds.clientSecret.value.isPresent()) {
-            throw new ConfigurationException(
-                    "'credentials.secret' and 'credentials.client-secret' properties are mutually exclusive");
-        }
-        if ((creds.secret.isPresent() || creds.clientSecret.value.isPresent()) && creds.jwt.secret.isPresent()) {
-            throw new ConfigurationException(
-                    "Use only 'credentials.secret' or 'credentials.client-secret' or 'credentials.jwt.secret' property");
         }
 
         if (ApplicationType.SERVICE.equals(oidcConfig.applicationType)) {
             if (oidcConfig.token.refreshExpired) {
-                throw new RuntimeException(
+                throw new ConfigurationException(
                         "The 'token.refresh-expired' property can only be enabled for " + ApplicationType.WEB_APP
                                 + " application types");
             }
             if (oidcConfig.logout.path.isPresent()) {
-                throw new RuntimeException(
+                throw new ConfigurationException(
                         "The 'logout.path' property can only be enabled for " + ApplicationType.WEB_APP
                                 + " application types");
             }
-            if (oidcConfig.roles.source.isPresent() && oidcConfig.roles.source.get() != Source.accesstoken) {
-                throw new RuntimeException(
-                        "The 'roles.source' property can only be set to 'accesstoken' for " + ApplicationType.SERVICE
+            if (oidcConfig.roles.source.isPresent() && oidcConfig.roles.source.get() == Source.idtoken) {
+                throw new ConfigurationException(
+                        "The 'roles.source' property can only be set to 'idtoken' for " + ApplicationType.WEB_APP
                                 + " application types");
             }
         }
 
-        // TODO: The workaround to support client_secret_post is added below and have to be removed once
-        // it is supported again in VertX OAuth2.
-        if (creds.secret.isPresent() || creds.clientSecret.value.isPresent()
-                && creds.clientSecret.method.orElseGet(() -> Secret.Method.BASIC) == Secret.Method.BASIC) {
-            // If it is set for client_secret_post as well then VertX OAuth2 will only use client_secret_basic
-            options.setClientSecret(creds.secret.orElseGet(() -> creds.clientSecret.value.get()));
-        } else {
-            // Avoid VertX OAuth2 setting a null client_secret form parameter if it is client_secret_post or client_secret_jwt
-            options.setClientSecretParameterName(null);
-        }
-
-        Optional<ProxyOptions> proxyOpt = toProxyOptions(oidcConfig.getProxy());
-        if (proxyOpt.isPresent()) {
-            options.setProxyOptions(proxyOpt.get());
-        }
+        if (oidcConfig.tokenStateManager.strategy != Strategy.KEEP_ALL_TOKENS) {
 
-        if (oidcConfig.tls.verification == Verification.NONE) {
-            options.setTrustAll(true);
-            options.setVerifyHost(false);
-        }
-
-        final long connectionDelayInSecs = oidcConfig.getConnectionDelay().isPresent()
-                ? oidcConfig.getConnectionDelay().get().toMillis() / 1000
-                : 0;
-        final long connectionRetryCount = connectionDelayInSecs > 1 ? connectionDelayInSecs / 2 : 1;
-        if (connectionRetryCount > 1) {
-            LOG.infof("Connecting to IDP for up to %d times every 2 seconds", connectionRetryCount);
+            if (oidcConfig.authentication.userInfoRequired || oidcConfig.roles.source.orElse(null) == Source.userinfo) {
+                throw new ConfigurationException(
+                        "UserInfo is required but DefaultTokenStateManager is configured to not keep the access token");
+            }
+            if (oidcConfig.roles.source.orElse(null) == Source.accesstoken) {
+                throw new ConfigurationException(
+                        "Access token is required to check the roles but DefaultTokenStateManager is configured to not keep the access token");
+            }
         }
 
-        OAuth2Auth auth = null;
-        for (long i = 0; i < connectionRetryCount; i++) {
-            try {
-                if (oidcConfig.discoveryEnabled) {
-                    auth = discoverOidcEndpoints(vertx, options);
-                } else {
-                    auth = setOidcEndpoints(vertx, options);
-                }
+        return createOidcProvider(oidcConfig, tlsConfig, vertx)
+                .onItem().transform(p -> new TenantConfigContext(p, oidcConfig));
+    }
 
-                break;
-            } catch (Throwable throwable) {
-                while (throwable instanceof CompletionException && throwable.getCause() != null) {
-                    throwable = throwable.getCause();
-                }
-                if (throwable instanceof OIDCException) {
-                    if (i + 1 < connectionRetryCount) {
-                        try {
-                            Thread.sleep(2000);
-                        } catch (InterruptedException iex) {
-                            // continue connecting
-                        }
-                    } else {
-                        throw (OIDCException) throwable;
-                    }
-                } else {
-                    throw new OIDCException(throwable);
-                }
-            }
+    private static TenantConfigContext createTenantContextFromPublicKey(OidcTenantConfig oidcConfig) {
+        if (oidcConfig.applicationType != ApplicationType.SERVICE) {
+            throw new ConfigurationException("'public-key' property can only be used with the 'service' applications");
         }
+        LOG.debug("'public-key' property for the local token verification is set,"
+                + " no connection to the OIDC server will be created");
 
-        String endSessionEndpoint = OAuth2AuthProviderImpl.class.cast(auth).getConfig().getLogoutPath();
+        return new TenantConfigContext(new OidcProvider(oidcConfig.publicKey.get(), oidcConfig), oidcConfig);
+    }
 
-        if (oidcConfig.logout.path.isPresent()) {
-            if (!oidcConfig.endSessionPath.isPresent() && endSessionEndpoint == null) {
-                throw new RuntimeException(
-                        "The application supports RP-Initiated Logout but the OpenID Provider does not advertise the end_session_endpoint");
-            }
-        }
+    public void setSecurityEventObserved(boolean isSecurityEventObserved) {
+        DefaultTenantConfigResolver bean = Arc.container().instance(DefaultTenantConfigResolver.class).get();
+        bean.setSecurityEventObserved(isSecurityEventObserved);
+    }
 
-        auth.missingKeyHandler(new JwkSetRefreshHandler(auth, oidcConfig.token.forcedJwkRefreshInterval));
-        return new TenantConfigContext(auth, oidcConfig);
+    public static Optional<ProxyOptions> toProxyOptions(OidcCommonConfig.Proxy proxyConfig) {
+        return OidcCommonUtils.toProxyOptions(proxyConfig);
     }
 
-    private static String prependSlash(String path) {
-        return !path.startsWith("/") ? "/" + path : path;
+    protected static OIDCException toOidcException(Throwable cause, String authServerUrl) {
+        final String message = OidcCommonUtils.formatConnectionErrorMessage(authServerUrl);
+        return new OIDCException(message, cause);
     }
 
-    private static OAuth2Auth discoverOidcEndpoints(Vertx vertx, OAuth2ClientOptions options) {
-        return Uni.createFrom().emitter(new Consumer<UniEmitter<? super OAuth2Auth>>() {
-            public void accept(UniEmitter<? super OAuth2Auth> uniEmitter) {
-                KeycloakAuth.discover(vertx, options, new Handler<AsyncResult<OAuth2Auth>>() {
+    protected static Uni<OidcProvider> createOidcProvider(OidcTenantConfig oidcConfig, TlsConfig tlsConfig, Vertx vertx) {
+        return createOidcClientUni(oidcConfig, tlsConfig, vertx).onItem()
+                .transformToUni(new Function<OidcProviderClient, Uni<? extends OidcProvider>>() {
                     @Override
-                    public void handle(AsyncResult<OAuth2Auth> event) {
-                        if (event.failed()) {
-                            uniEmitter.fail(toOidcException(event.cause()));
+                    public Uni<OidcProvider> apply(OidcProviderClient client) {
+                        if (client.getMetadata().getJsonWebKeySetUri() != null) {
+                            return client.getJsonWebKeySet().onItem()
+                                    .transform(new Function<JsonWebKeyCache, OidcProvider>() {
+
+                                        @Override
+                                        public OidcProvider apply(JsonWebKeyCache jwks) {
+                                            return new OidcProvider(client, oidcConfig, jwks);
+                                        }
+
+                                    });
                         } else {
-                            uniEmitter.complete(event.result());
+                            return Uni.createFrom().item(new OidcProvider(client, oidcConfig, null));
                         }
                     }
                 });
-            }
-        }).await().indefinitely();
     }
 
-    private static OAuth2Auth setOidcEndpoints(Vertx vertx, OAuth2ClientOptions options) {
-        if (options.getJwkPath() != null) {
-            return Uni.createFrom().emitter(new Consumer<UniEmitter<? super OAuth2Auth>>() {
-                @SuppressWarnings("deprecation")
-                @Override
-                public void accept(UniEmitter<? super OAuth2Auth> uniEmitter) {
-                    OAuth2Auth auth = OAuth2Auth.create(vertx, options);
-                    auth.loadJWK(res -> {
-                        if (res.failed()) {
-                            uniEmitter.fail(toOidcException(res.cause()));
-                        }
-                        uniEmitter.complete(auth);
-                    });
-                }
-            }).await().indefinitely();
-        } else {
-            return OAuth2Auth.create(vertx, options);
-        }
-    }
+    protected static Uni<OidcProviderClient> createOidcClientUni(OidcTenantConfig oidcConfig,
+            TlsConfig tlsConfig, Vertx vertx) {
 
-    @SuppressWarnings("deprecation")
-    private static TenantConfigContext createdTenantContextFromPublicKey(OAuth2ClientOptions options,
-            OidcTenantConfig oidcConfig) {
-        if (oidcConfig.applicationType == ApplicationType.WEB_APP) {
-            throw new ConfigurationException("'public-key' property can only be used with the 'service' applications");
+        String authServerUriString = OidcCommonUtils.getAuthServerUrl(oidcConfig);
+
+        WebClientOptions options = new WebClientOptions();
+
+        URI authServerUri = URI.create(authServerUriString); // create uri for parse exception
+        OidcCommonUtils.setHttpClientOptions(oidcConfig, tlsConfig, options);
+
+        WebClient client = WebClient.create(new io.vertx.mutiny.core.Vertx(vertx), options);
+
+        Uni<OidcConfigurationMetadata> metadataUni = null;
+        if (!oidcConfig.discoveryEnabled) {
+            String tokenUri = OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(), oidcConfig.tokenPath);
+            String introspectionUri = OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(),
+                    oidcConfig.introspectionPath);
+            String authorizationUri = OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(),
+                    oidcConfig.authorizationPath);
+            String jwksUri = OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(), oidcConfig.jwksPath);
+            String userInfoUri = OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(), oidcConfig.userInfoPath);
+            String endSessionUri = OidcCommonUtils.getOidcEndpointUrl(authServerUri.toString(), oidcConfig.endSessionPath);
+            metadataUni = Uni.createFrom().item(new OidcConfigurationMetadata(tokenUri,
+                    introspectionUri, authorizationUri, jwksUri, userInfoUri, endSessionUri,
+                    oidcConfig.token.issuer.orElse(null)));
+        } else {
+            final long connectionRetryCount = OidcCommonUtils.getConnectionRetryCount(oidcConfig);
+            final long expireInDelay = OidcCommonUtils.getConnectionDelayInMillis(oidcConfig);
+            if (connectionRetryCount > 1) {
+                LOG.infof("Connecting to IDP for up to %d times every 2 seconds", connectionRetryCount);
+            }
+            metadataUni = discoverMetadata(client, authServerUri.toString(), oidcConfig).onFailure(ConnectException.class)
+                    .retry()
+                    .withBackOff(CONNECTION_BACKOFF_DURATION, CONNECTION_BACKOFF_DURATION)
+                    .expireIn(expireInDelay);
         }
-        LOG.debug("'public-key' property for the local token verification is set,"
-                + " no connection to the OIDC server will be created");
-        options.addPubSecKey(new PubSecKeyOptions()
-                .setAlgorithm("RS256")
-                .setPublicKey(oidcConfig.getPublicKey().get()));
+        return metadataUni.onItemOrFailure()
+                .transformToUni(new BiFunction<OidcConfigurationMetadata, Throwable, Uni<? extends OidcProviderClient>>() {
 
-        return new TenantConfigContext(new OAuth2AuthProviderImpl(null, options), oidcConfig);
+                    @Override
+                    public Uni<OidcProviderClient> apply(OidcConfigurationMetadata metadata, Throwable t) {
+                        if (t != null) {
+                            return Uni.createFrom().failure(toOidcException(t, authServerUri.toString()));
+                        }
+                        if (metadata == null) {
+                            return Uni.createFrom().failure(new ConfigurationException(
+                                    "OpenId Connect Provider configuration metadata is not configured and can not be discovered"));
+                        }
+                        if (oidcConfig.logout.path.isPresent()) {
+                            if (!oidcConfig.endSessionPath.isPresent() && metadata.getEndSessionUri() == null) {
+                                return Uni.createFrom().failure(new ConfigurationException(
+                                        "The application supports RP-Initiated Logout but the OpenID Provider does not advertise the end_session_endpoint"));
+                            }
+                        }
+                        return Uni.createFrom().item(new OidcProviderClient(client, metadata, oidcConfig));
+                    }
+                });
     }
 
-    protected static OIDCException toOidcException(Throwable cause) {
-        final String message = "OIDC server is not available at the 'quarkus.oidc.auth-server-url' URL. "
-                + "Please make sure it is correct. Note it has to end with a realm value if you work with Keycloak, for example:"
-                + " 'https://localhost:8180/auth/realms/quarkus'";
-        return new OIDCException(message, cause);
+    private static Uni<OidcConfigurationMetadata> discoverMetadata(WebClient client, String authServerUrl,
+            OidcTenantConfig oidcConfig) {
+        final String discoveryUrl = authServerUrl + "/.well-known/openid-configuration";
+        return client.getAbs(discoveryUrl).send().onItem().transform(resp -> {
+            if (resp.statusCode() == 200) {
+                return new OidcConfigurationMetadata(resp.bodyAsJsonObject());
+            } else {
+                return null;
+            }
+        });
     }
 
-    protected static Optional<ProxyOptions> toProxyOptions(OidcTenantConfig.Proxy proxyConfig) {
-        // Proxy is enabled if (at least) "host" is configured.
-        if (!proxyConfig.host.isPresent()) {
-            return Optional.empty();
-        }
-        JsonObject jsonOptions = new JsonObject();
-        jsonOptions.put("host", proxyConfig.host.get());
-        jsonOptions.put("port", proxyConfig.port);
-        if (proxyConfig.username.isPresent()) {
-            jsonOptions.put("username", proxyConfig.username.get());
-        }
-        if (proxyConfig.password.isPresent()) {
-            jsonOptions.put("password", proxyConfig.password.get());
-        }
-        return Optional.of(new ProxyOptions(jsonOptions));
-    }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java
index f29e5f85b622f..d6bb9d611ff49 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcTokenCredentialProducer.java
@@ -4,6 +4,9 @@
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.AlternativePriority;
 import io.quarkus.oidc.AccessTokenCredential;
 import io.quarkus.oidc.IdTokenCredential;
 import io.quarkus.oidc.OIDCException;
@@ -13,7 +16,7 @@
 
 @RequestScoped
 public class OidcTokenCredentialProducer {
-
+    private static final Logger LOG = Logger.getLogger(OidcTokenCredentialProducer.class);
     @Inject
     SecurityIdentity identity;
 
@@ -25,19 +28,35 @@ public class OidcTokenCredentialProducer {
     @Produces
     @RequestScoped
     IdTokenCredential currentIdToken() {
-        return identity.getCredential(IdTokenCredential.class);
+        IdTokenCredential cred = identity.getCredential(IdTokenCredential.class);
+        if (cred == null || cred.getToken() == null) {
+            LOG.trace("IdToken is null");
+            cred = new IdTokenCredential();
+        }
+        return cred;
     }
 
     @Produces
     @RequestScoped
+    @AlternativePriority(1)
     AccessTokenCredential currentAccessToken() {
-        return identity.getCredential(AccessTokenCredential.class);
+        AccessTokenCredential cred = identity.getCredential(AccessTokenCredential.class);
+        if (cred == null || cred.getToken() == null) {
+            LOG.trace("AccessToken is null");
+            cred = new AccessTokenCredential();
+        }
+        return cred;
     }
 
     @Produces
     @RequestScoped
     RefreshToken currentRefreshToken() {
-        return identity.getCredential(RefreshToken.class);
+        RefreshToken cred = identity.getCredential(RefreshToken.class);
+        if (cred == null) {
+            LOG.trace("RefreshToken is null");
+            cred = new RefreshToken();
+        }
+        return cred;
     }
 
     /**
@@ -48,7 +67,7 @@ RefreshToken currentRefreshToken() {
     @Produces
     @RequestScoped
     UserInfo currentUserInfo() {
-        UserInfo userInfo = (UserInfo) identity.getAttribute("userinfo");
+        UserInfo userInfo = (UserInfo) identity.getAttribute(OidcUtils.USER_INFO_ATTRIBUTE);
         if (userInfo == null) {
             throw new OIDCException("UserInfo can not be injected");
         }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java
index 7577a74701e4d..8d7add91f246d 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcUtils.java
@@ -21,12 +21,16 @@
 import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.ForbiddenException;
 import io.quarkus.security.credential.TokenCredential;
+import io.quarkus.security.identity.AuthenticationRequestContext;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.RoutingContext;
 
 public final class OidcUtils {
+    static final String CONFIG_METADATA_ATTRIBUTE = "configuration-metadata";
+    static final String USER_INFO_ATTRIBUTE = "userinfo";
+    static final String TENANT_ID_ATTRIBUTE = "tenant-id";
     /**
      * This pattern uses a positive lookahead to split an expression around the forward slashes
      * ignoring those which are located inside a pair of the double quotes.
@@ -62,28 +66,6 @@ public static JsonObject decodeJwtContent(String jwt) {
         }
     }
 
-    public static boolean validateClaims(OidcTenantConfig.Token tokenConfig, JsonObject json) {
-        if (tokenConfig.issuer.isPresent()) {
-            String issuer = json.getString(Claims.iss.name());
-            if (!tokenConfig.issuer.get().equals(issuer)) {
-                throw new OIDCException("Invalid issuer");
-            }
-        }
-        if (tokenConfig.audience.isPresent()) {
-            Object claimValue = json.getValue(Claims.aud.name());
-            List<String> audience = Collections.emptyList();
-            if (claimValue instanceof JsonArray) {
-                audience = convertJsonArrayToList((JsonArray) claimValue);
-            } else if (claimValue != null) {
-                audience = Arrays.asList((String) claimValue);
-            }
-            if (!audience.containsAll(tokenConfig.audience.get())) {
-                throw new OIDCException("Invalid audience");
-            }
-        }
-        return true;
-    }
-
     public static List<String> findRoles(String clientId, OidcTenantConfig.Roles rolesConfig, JsonObject json) {
         // If the user configured a specific path - check and enforce a claim at this path exists
         if (rolesConfig.getRoleClaimPath().isPresent()) {
@@ -154,13 +136,9 @@ private static List<String> convertJsonArrayToList(JsonArray claimValue) {
 
     static QuarkusSecurityIdentity validateAndCreateIdentity(
             RoutingContext vertxContext, TokenCredential credential,
-            OidcTenantConfig config, JsonObject tokenJson, JsonObject rolesJson, JsonObject userInfo) {
-        try {
-            OidcUtils.validateClaims(config.getToken(), tokenJson);
-        } catch (OIDCException e) {
-            throw new AuthenticationFailedException(e);
-        }
+            TenantConfigContext resolvedContext, JsonObject tokenJson, JsonObject rolesJson, JsonObject userInfo) {
 
+        OidcTenantConfig config = resolvedContext.oidcConfig;
         QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder();
         builder.addCredential(credential);
 
@@ -174,6 +152,16 @@ static QuarkusSecurityIdentity validateAndCreateIdentity(
             throw new AuthenticationFailedException(e);
         }
         builder.setPrincipal(jwtPrincipal);
+        setSecurityIdentityRoles(builder, config, rolesJson);
+        setSecurityIdentityUserInfo(builder, userInfo);
+        setSecurityIdentityConfigMetadata(builder, resolvedContext);
+        setBlockinApiAttribute(builder, vertxContext);
+        setTenantIdAttribute(builder, config);
+        return builder.build();
+    }
+
+    public static void setSecurityIdentityRoles(QuarkusSecurityIdentity.Builder builder, OidcTenantConfig config,
+            JsonObject rolesJson) {
         try {
             String clientId = config.getClientId().isPresent() ? config.getClientId().get() : null;
             for (String role : findRoles(clientId, config.getRoles(), rolesJson)) {
@@ -182,13 +170,29 @@ static QuarkusSecurityIdentity validateAndCreateIdentity(
         } catch (Exception e) {
             throw new ForbiddenException(e);
         }
-        setSecurityIdentityUserInfo(builder, userInfo);
-        return builder.build();
+    }
+
+    public static void setBlockinApiAttribute(QuarkusSecurityIdentity.Builder builder, RoutingContext vertxContext) {
+        if (vertxContext != null) {
+            builder.addAttribute(AuthenticationRequestContext.class.getName(),
+                    vertxContext.get(AuthenticationRequestContext.class.getName()));
+        }
+    }
+
+    public static void setTenantIdAttribute(QuarkusSecurityIdentity.Builder builder, OidcTenantConfig config) {
+        builder.addAttribute(TENANT_ID_ATTRIBUTE, config.tenantId.orElse("Default"));
     }
 
     public static void setSecurityIdentityUserInfo(QuarkusSecurityIdentity.Builder builder, JsonObject userInfo) {
         if (userInfo != null) {
-            builder.addAttribute("userinfo", new UserInfo(userInfo.encode()));
+            builder.addAttribute(USER_INFO_ATTRIBUTE, new UserInfo(userInfo.encode()));
+        }
+    }
+
+    public static void setSecurityIdentityConfigMetadata(QuarkusSecurityIdentity.Builder builder,
+            TenantConfigContext resolvedContext) {
+        if (resolvedContext.provider.client != null) {
+            builder.addAttribute(CONFIG_METADATA_ATTRIBUTE, resolvedContext.provider.client.getMetadata());
         }
     }
 
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java
index aab5ca8e46009..b3a5973c0cbf8 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigBean.java
@@ -1,21 +1,31 @@
 package io.quarkus.oidc.runtime;
 
 import java.util.Map;
+import java.util.concurrent.Executor;
 import java.util.function.Function;
 
 import io.quarkus.oidc.OidcTenantConfig;
+import io.smallrye.mutiny.Uni;
 
 public class TenantConfigBean {
 
     private final Map<String, TenantConfigContext> staticTenantsConfig;
+    private final Map<String, TenantConfigContext> dynamicTenantsConfig;
     private final TenantConfigContext defaultTenant;
-    private final Function<OidcTenantConfig, TenantConfigContext> tenantConfigContextFactory;
-
-    public TenantConfigBean(Map<String, TenantConfigContext> staticTenantsConfig, TenantConfigContext defaultTenant,
-            Function<OidcTenantConfig, TenantConfigContext> tenantConfigContextFactory) {
+    private final Function<OidcTenantConfig, Uni<TenantConfigContext>> tenantConfigContextFactory;
+    private final Executor blockingExecutor;
+
+    public TenantConfigBean(
+            Map<String, TenantConfigContext> staticTenantsConfig,
+            Map<String, TenantConfigContext> dynamicTenantsConfig,
+            TenantConfigContext defaultTenant,
+            Function<OidcTenantConfig, Uni<TenantConfigContext>> tenantConfigContextFactory,
+            Executor blockingExecutor) {
         this.staticTenantsConfig = staticTenantsConfig;
+        this.dynamicTenantsConfig = dynamicTenantsConfig;
         this.defaultTenant = defaultTenant;
         this.tenantConfigContextFactory = tenantConfigContextFactory;
+        this.blockingExecutor = blockingExecutor;
     }
 
     public Map<String, TenantConfigContext> getStaticTenantsConfig() {
@@ -26,7 +36,15 @@ public TenantConfigContext getDefaultTenant() {
         return defaultTenant;
     }
 
-    public Function<OidcTenantConfig, TenantConfigContext> getTenantConfigContextFactory() {
+    public Function<OidcTenantConfig, Uni<TenantConfigContext>> getTenantConfigContextFactory() {
         return tenantConfigContextFactory;
     }
+
+    public Map<String, TenantConfigContext> getDynamicTenantsConfig() {
+        return dynamicTenantsConfig;
+    }
+
+    public Executor getBlockingExecutor() {
+        return blockingExecutor;
+    }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java
index 488f3d6f4e131..de54cee456776 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TenantConfigContext.java
@@ -1,22 +1,21 @@
 package io.quarkus.oidc.runtime;
 
 import io.quarkus.oidc.OidcTenantConfig;
-import io.vertx.ext.auth.oauth2.OAuth2Auth;
 
 class TenantConfigContext {
 
     /**
-     * Discovered OIDC
+     * OIDC Provider
      */
-    final OAuth2Auth auth;
+    final OidcProvider provider;
+
     /**
      * Tenant configuration
      */
     final OidcTenantConfig oidcConfig;
 
-    TenantConfigContext(OAuth2Auth auth, OidcTenantConfig config) {
-        this.auth = auth;
+    public TenantConfigContext(OidcProvider client, OidcTenantConfig config) {
+        this.provider = client;
         this.oidcConfig = config;
     }
-
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TokenAutoRefreshException.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TokenAutoRefreshException.java
new file mode 100644
index 0000000000000..4cc039a301b31
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TokenAutoRefreshException.java
@@ -0,0 +1,16 @@
+package io.quarkus.oidc.runtime;
+
+import io.quarkus.security.identity.SecurityIdentity;
+
+@SuppressWarnings("serial")
+public class TokenAutoRefreshException extends RuntimeException {
+    private SecurityIdentity securityIdentity;
+
+    public TokenAutoRefreshException(SecurityIdentity securityIdentity) {
+        this.securityIdentity = securityIdentity;
+    }
+
+    public SecurityIdentity getSecurityIdentity() {
+        return securityIdentity;
+    }
+}
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TokenVerificationResult.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TokenVerificationResult.java
new file mode 100644
index 0000000000000..87fea597d4f3f
--- /dev/null
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/TokenVerificationResult.java
@@ -0,0 +1,13 @@
+package io.quarkus.oidc.runtime;
+
+import io.vertx.core.json.JsonObject;
+
+public class TokenVerificationResult {
+    public TokenVerificationResult(JsonObject localVerificationResult, JsonObject introspectionResult) {
+        this.localVerificationResult = localVerificationResult;
+        this.introspectionResult = introspectionResult;
+    }
+
+    JsonObject localVerificationResult;
+    JsonObject introspectionResult;
+}
diff --git a/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index d53da12f82c59..61e35a98dd37a 100644
--- a/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/oidc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -8,4 +8,4 @@ metadata:
   guide: "https://quarkus.io/guides/security-openid-connect"
   categories:
   - "security"
-  status: "preview"
+  status: "stable"
diff --git a/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/OidcUtilsTest.java b/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/OidcUtilsTest.java
index eb0960dd5c204..72acd6e7f0dc2 100644
--- a/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/OidcUtilsTest.java
+++ b/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/OidcUtilsTest.java
@@ -61,64 +61,6 @@ public void testKeycloakRefreshTokenType() throws Exception {
         }
     }
 
-    @Test
-    public void testTokenWithCorrectIssuer() throws Exception {
-        OidcTenantConfig.Token tokenClaims = OidcTenantConfig.Token.fromIssuer("https://server.example.com");
-        InputStream is = getClass().getResourceAsStream("/tokenIssuer.json");
-        assertTrue(OidcUtils.validateClaims(tokenClaims, read(is)));
-    }
-
-    @Test
-    public void testTokenWithWrongIssuer() throws Exception {
-        OidcTenantConfig.Token tokenClaims = OidcTenantConfig.Token.fromIssuer("https://servers.example.com");
-        InputStream is = getClass().getResourceAsStream("/tokenIssuer.json");
-        try {
-            OidcUtils.validateClaims(tokenClaims, read(is));
-            fail("Exception expected: wrong issuer");
-        } catch (OIDCException ex) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testTokenWithCorrectStringAudience() throws Exception {
-        OidcTenantConfig.Token tokenClaims = OidcTenantConfig.Token.fromAudience("https://quarkus.example.com");
-        InputStream is = getClass().getResourceAsStream("/tokenStringAudience.json");
-        assertTrue(OidcUtils.validateClaims(tokenClaims, read(is)));
-    }
-
-    @Test
-    public void testTokenWithWrongStringAudience() throws Exception {
-        OidcTenantConfig.Token tokenClaims = OidcTenantConfig.Token.fromIssuer("https://quarkus.examples.com");
-        InputStream is = getClass().getResourceAsStream("/tokenStringAudience.json");
-        try {
-            OidcUtils.validateClaims(tokenClaims, read(is));
-            fail("Exception expected: wrong audience");
-        } catch (OIDCException ex) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testTokenWithCorrectArrayAudience() throws Exception {
-        OidcTenantConfig.Token tokenClaims = OidcTenantConfig.Token.fromAudience("https://quarkus.example.com",
-                "frontend_client_id");
-        InputStream is = getClass().getResourceAsStream("/tokenArrayAudience.json");
-        assertTrue(OidcUtils.validateClaims(tokenClaims, read(is)));
-    }
-
-    @Test
-    public void testTokenWithWrongArrayAudience() throws Exception {
-        OidcTenantConfig.Token tokenClaims = OidcTenantConfig.Token.fromAudience("service_client_id");
-        InputStream is = getClass().getResourceAsStream("/tokenArrayAudience.json");
-        try {
-            OidcUtils.validateClaims(tokenClaims, read(is));
-            fail("Exception expected: wrong array audience");
-        } catch (OIDCException ex) {
-            // expected
-        }
-    }
-
     @Test
     public void testKeycloakRealmAccessToken() throws Exception {
         OidcTenantConfig.Roles rolesCfg = OidcTenantConfig.Roles.fromClaimPath(null);
diff --git a/extensions/openshift-client/deployment/pom.xml b/extensions/openshift-client/deployment/pom.xml
new file mode 100644
index 0000000000000..5f54dae121772
--- /dev/null
+++ b/extensions/openshift-client/deployment/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-openshift-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-openshift-client-deployment</artifactId>
+    <name>Quarkus - OpenShift Client - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-deployment</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/extensions/openshift-client/deployment/src/main/java/io/quarkus/openshift/client/deployment/OpenShiftClientProcessor.java b/extensions/openshift-client/deployment/src/main/java/io/quarkus/openshift/client/deployment/OpenShiftClientProcessor.java
new file mode 100644
index 0000000000000..87243a2ee6559
--- /dev/null
+++ b/extensions/openshift-client/deployment/src/main/java/io/quarkus/openshift/client/deployment/OpenShiftClientProcessor.java
@@ -0,0 +1,29 @@
+package io.quarkus.openshift.client.deployment;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.it.openshift.client.runtime.OpenShiftClientProducer;
+
+public class OpenShiftClientProcessor {
+
+    @BuildStep
+    public void process(BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemProducer) {
+        // wire up the OpenShiftClient bean support
+        additionalBeanBuildItemProducer.produce(AdditionalBeanBuildItem.unremovableOf(OpenShiftClientProducer.class));
+    }
+
+    @BuildStep
+    public FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.OPENSHIFT_CLIENT);
+    }
+
+    @BuildStep
+    public CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.OPENSHIFT_CLIENT);
+    }
+}
diff --git a/extensions/openshift-client/pom.xml b/extensions/openshift-client/pom.xml
new file mode 100644
index 0000000000000..664f8614a6f67
--- /dev/null
+++ b/extensions/openshift-client/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-openshift-client-parent</artifactId>
+    <name>Quarkus - OpenShift Client</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/openshift-client/runtime/pom.xml b/extensions/openshift-client/runtime/pom.xml
new file mode 100644
index 0000000000000..55d3e54351a99
--- /dev/null
+++ b/extensions/openshift-client/runtime/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-openshift-client-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-openshift-client</artifactId>
+    <name>Quarkus - OpenShift Client - Runtime</name>
+    <description>Interact with OpenShift and develop OpenShift Operators</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openshift-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java b/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java
new file mode 100644
index 0000000000000..fca00d44e4ee9
--- /dev/null
+++ b/extensions/openshift-client/runtime/src/main/java/io/quarkus/it/openshift/client/runtime/OpenShiftClientProducer.java
@@ -0,0 +1,36 @@
+package io.quarkus.it.openshift.client.runtime;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.openshift.client.DefaultOpenShiftClient;
+import io.fabric8.openshift.client.OpenShiftClient;
+import io.quarkus.arc.DefaultBean;
+
+@Singleton
+public class OpenShiftClientProducer {
+
+    private static final Logger LOGGER = Logger.getLogger(OpenShiftClientProducer.class);
+
+    private OpenShiftClient client;
+
+    @DefaultBean
+    @Singleton
+    @Produces
+    public OpenShiftClient openShiftClient(Config config) {
+        client = new DefaultOpenShiftClient(config);
+        return client;
+    }
+
+    @PreDestroy
+    public void destroy() {
+        if (client != null) {
+            LOGGER.info("Closing OpenShift client");
+            client.close();
+        }
+    }
+}
diff --git a/extensions/openshift-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/openshift-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..1d0e73be74e26
--- /dev/null
+++ b/extensions/openshift-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,10 @@
+---
+name: "OpenShift Client"
+metadata:
+  keywords:
+  - "openshift-client"
+  - "openshift"
+  guide: https://quarkus.io/guides/kubernetes-client
+  categories:
+  - "cloud"
+  status: "stable"
diff --git a/extensions/panache/hibernate-orm-panache-common/deployment/pom.xml b/extensions/panache/hibernate-orm-panache-common/deployment/pom.xml
index 4441c0c4dde67..8b7eaa28f86d8 100644
--- a/extensions/panache/hibernate-orm-panache-common/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-common/deployment/pom.xml
@@ -6,24 +6,15 @@
         <artifactId>quarkus-hibernate-orm-panache-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <artifactId>quarkus-hibernate-orm-panache-common-deployment</artifactId>
     <name>Quarkus - Hibernate ORM with Panache - Common - Deployment</name>
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <artifactId>quarkus-hibernate-orm-panache-common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -31,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm-panache-common</artifactId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
diff --git a/extensions/panache/hibernate-orm-panache-common/pom.xml b/extensions/panache/hibernate-orm-panache-common/pom.xml
index fd9580b37e89e..832eb7f63979c 100644
--- a/extensions/panache/hibernate-orm-panache-common/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-	<relativePath>../../../build-parent/pom.xml</relativePath>
+	<relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/pom.xml b/extensions/panache/hibernate-orm-panache-common/runtime/pom.xml
index 355b4366857ee..9625375d53dcf 100644
--- a/extensions/panache/hibernate-orm-panache-common/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-common/runtime/pom.xml
@@ -5,29 +5,16 @@
         <artifactId>quarkus-hibernate-orm-panache-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-hibernate-orm-panache-common</artifactId>
     <name>Quarkus - Hibernate ORM with Panache - Common - Runtime</name>
-    <description>Simplify your persistence code for Hibernate ORM via the active record or the repository pattern</description>
+    <description>Hibernate ORM with Panache Common module</description>
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-panache-common</artifactId>
+            <artifactId>quarkus-panache-hibernate-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java
new file mode 100644
index 0000000000000..68995e896cc75
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java
@@ -0,0 +1,86 @@
+package io.quarkus.hibernate.orm.panache;
+
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.transaction.TransactionManager;
+
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
+import io.quarkus.panache.common.Parameters;
+
+/**
+ * Utility class for Panache.
+ *
+ * @author Stéphane Épardaud
+ */
+public class Panache {
+
+    /**
+     * Returns the default {@link EntityManager}
+     *
+     * @return {@link EntityManager}
+     */
+    public static EntityManager getEntityManager() {
+        return AbstractJpaOperations.getEntityManager();
+    }
+
+    /**
+     * Returns the {@link EntityManager} for the given {@link Class<?> entity}
+     *
+     * @return {@link EntityManager}
+     */
+    public static EntityManager getEntityManager(Class<?> clazz) {
+        return AbstractJpaOperations.getEntityManager(clazz);
+    }
+
+    /**
+     * Returns the current {@link TransactionManager}
+     *
+     * @return the current {@link TransactionManager}
+     */
+    public static TransactionManager getTransactionManager() {
+        return AbstractJpaOperations.getTransactionManager();
+    }
+
+    /**
+     * Executes a database update operation and return the number of rows operated on.
+     *
+     * @param query a normal HQL query
+     * @param params optional list of indexed parameters
+     * @return the number of rows operated on.
+     */
+    public static int executeUpdate(String query, Object... params) {
+        return AbstractJpaOperations.executeUpdate(query, params);
+    }
+
+    /**
+     * Executes a database update operation and return the number of rows operated on.
+     *
+     * @param query a normal HQL query
+     * @param params {@link Map} of named parameters
+     * @return the number of rows operated on.
+     */
+    public static int executeUpdate(String query, Map<String, Object> params) {
+        return AbstractJpaOperations.executeUpdate(query, params);
+    }
+
+    /**
+     * Executes a database update operation and return the number of rows operated on.
+     *
+     * @param query a normal HQL query
+     * @param params {@link Parameters} of named parameters
+     * @return the number of rows operated on.
+     */
+    public static int executeUpdate(String query, Parameters params) {
+        return AbstractJpaOperations.executeUpdate(query, params.map());
+    }
+
+    /**
+     * Marks the current transaction as "rollback-only", which means that it will not be
+     * committed: it will be rolled back at the end of this transaction lifecycle.
+     */
+    public static void setRollbackOnly() {
+        AbstractJpaOperations.setRollbackOnly();
+    }
+
+}
diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/ProjectedFieldName.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/ProjectedFieldName.java
new file mode 100644
index 0000000000000..3e170d996adc3
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/ProjectedFieldName.java
@@ -0,0 +1,17 @@
+package io.quarkus.hibernate.orm.panache;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Define a field's path for the SELECT statement when using a projection DTO.
+ * It supports the "dot" notation for fields in referenced entities:
+ * the name is composed of the property name for the relationship, followed by a dot ("."), followed by the name of the field.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface ProjectedFieldName {
+    String value();
+}
diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java
index 61e26720fcbd3..7b8acfbbc8d1a 100644
--- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java
+++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java
@@ -1,5 +1,8 @@
 package io.quarkus.hibernate.orm.panache.common.runtime;
 
+import static io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME;
+
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -8,30 +11,86 @@
 
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
-import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
 
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
-import io.quarkus.panache.common.exception.PanacheQueryException;
+import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
 
 public abstract class AbstractJpaOperations<PanacheQueryType> {
+    private static volatile Map<String, String> entityToPersistenceUnit = Collections.emptyMap();
+
+    public static void setEntityToPersistenceUnit(Map<String, String> map) {
+        entityToPersistenceUnit = Collections.unmodifiableMap(map);
+    }
 
     protected abstract PanacheQueryType createPanacheQuery(EntityManager em, String query, String orderBy,
             Object paramsArrayOrMap);
 
-    protected abstract List<?> list(PanacheQueryType query);
+    public abstract List<?> list(PanacheQueryType query);
+
+    public abstract Stream<?> stream(PanacheQueryType query);
+
+    /**
+     * Returns the {@link EntityManager} for the given {@link Class<?> entity}
+     *
+     * @return {@link EntityManager}
+     */
+    public static EntityManager getEntityManager(Class<?> clazz) {
+        String clazzName = clazz.getName();
+        String persistentUnitName = entityToPersistenceUnit.get(clazzName);
+        return getEntityManager(persistentUnitName);
+    }
+
+    public static EntityManager getEntityManager(String persistentUnitName) {
+        ArcContainer arcContainer = Arc.container();
+        if (persistentUnitName == null || PersistenceUnitUtil.isDefaultPersistenceUnit(persistentUnitName)) {
+            InstanceHandle<EntityManager> emHandle = arcContainer.instance(EntityManager.class);
+            if (emHandle.isAvailable()) {
+                return emHandle.get();
+            }
+            if (!arcContainer.instance(AgroalDataSource.class).isAvailable()) {
+                throw new IllegalStateException(
+                        "The default datasource has not been properly configured. See https://quarkus.io/guides/datasource#jdbc-datasource for information on how to do that.");
+            }
+            throw new IllegalStateException(
+                    "No entities were found. Did you forget to annotate your Panache Entity classes with '@Entity'?");
+        }
 
-    protected abstract Stream<?> stream(PanacheQueryType query);
+        InstanceHandle<EntityManager> emHandle = arcContainer.instance(EntityManager.class,
+                new PersistenceUnit.PersistenceUnitLiteral(persistentUnitName));
+        if (emHandle.isAvailable()) {
+            return emHandle.get();
+        }
+        if (!arcContainer.instance(AgroalDataSource.class,
+                new DataSource.DataSourceLiteral(persistentUnitName)).isAvailable()) {
+            throw new IllegalStateException(
+                    "The named datasource '" + persistentUnitName
+                            + "' has not been properly configured. See https://quarkus.io/guides/datasource#multiple-datasources for information on how to do that.");
+        }
+        throw new IllegalStateException(
+                "No entities were attached to persistence unit '" + persistentUnitName
+                        + "'. Did you forget to annotate your Panache Entity classes with '@Entity' or improperly configure the 'quarkus.hibernate-orm.\" "
+                        + persistentUnitName + "\".packages' property?");
+    }
 
+    public static EntityManager getEntityManager() {
+        return getEntityManager(DEFAULT_PERSISTENCE_UNIT_NAME);
+    }
     //
     // Instance methods
 
     public void persist(Object entity) {
-        EntityManager em = getEntityManager();
+        EntityManager em = getEntityManager(entity.getClass());
         persist(em, entity);
     }
 
@@ -42,50 +101,42 @@ public void persist(EntityManager em, Object entity) {
     }
 
     public void persist(Iterable<?> entities) {
-        EntityManager em = getEntityManager();
         for (Object entity : entities) {
-            persist(em, entity);
+            persist(getEntityManager(entity.getClass()), entity);
         }
     }
 
     public void persist(Object firstEntity, Object... entities) {
-        EntityManager em = getEntityManager();
         persist(firstEntity);
         for (Object entity : entities) {
-            persist(em, entity);
+            persist(entity);
         }
     }
 
     public void persist(Stream<?> entities) {
-        EntityManager em = getEntityManager();
-        entities.forEach(entity -> persist(em, entity));
+        entities.forEach(entity -> persist(entity));
     }
 
     public void delete(Object entity) {
-        EntityManager em = getEntityManager();
+        EntityManager em = getEntityManager(entity.getClass());
         em.remove(entity);
     }
 
     public boolean isPersistent(Object entity) {
-        return getEntityManager().contains(entity);
+        return getEntityManager(entity.getClass()).contains(entity);
     }
 
     public void flush() {
         getEntityManager().flush();
     }
 
+    public void flush(Object entityClass) {
+        getEntityManager(entityClass.getClass()).flush();
+    }
     //
     // Private stuff
 
-    public EntityManager getEntityManager() {
-        EntityManager entityManager = Arc.container().instance(EntityManager.class).get();
-        if (entityManager == null) {
-            throw new PersistenceException("No EntityManager found. Do you have any JPA entities defined?");
-        }
-        return entityManager;
-    }
-
-    public TransactionManager getTransactionManager() {
+    public static TransactionManager getTransactionManager() {
         return Arc.container().instance(TransactionManager.class).get();
     }
 
@@ -115,144 +166,15 @@ public int paramCount(Map<String, Object> params) {
         return params != null ? params.size() : 0;
     }
 
-    private String getEntityName(Class<?> entityClass) {
-        // FIXME: not true?
-        return entityClass.getName();
-    }
-
-    public String createFindQuery(Class<?> entityClass, String query, int paramCount) {
-        if (query == null) {
-            return "FROM " + getEntityName(entityClass);
-        }
-
-        String trimmed = query.trim();
-        if (trimmed.isEmpty()) {
-            return "FROM " + getEntityName(entityClass);
-        }
-
-        if (isNamedQuery(query)) {
-            // we return named query as is
-            return query;
-        }
-
-        String trimmedLc = trimmed.toLowerCase();
-        if (trimmedLc.startsWith("from ") || trimmedLc.startsWith("select ")) {
-            return query;
-        }
-        if (trimmedLc.startsWith("order by ")) {
-            return "FROM " + getEntityName(entityClass) + " " + query;
-        }
-        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
-            query += " = ?1";
-        }
-        return "FROM " + getEntityName(entityClass) + " WHERE " + query;
-    }
-
-    static boolean isNamedQuery(String query) {
-        if (query == null || query.isEmpty()) {
-            return false;
-        }
-        return query.charAt(0) == '#';
-    }
-
-    private String createCountQuery(Class<?> entityClass, String query, int paramCount) {
-        if (query == null)
-            return "SELECT COUNT(*) FROM " + getEntityName(entityClass);
-
-        String trimmed = query.trim();
-        if (trimmed.isEmpty())
-            return "SELECT COUNT(*) FROM " + getEntityName(entityClass);
-
-        String trimmedLc = trimmed.toLowerCase();
-        if (trimmedLc.startsWith("from ")) {
-            return "SELECT COUNT(*) " + query;
-        }
-        if (trimmedLc.startsWith("order by ")) {
-            // ignore it
-            return "SELECT COUNT(*) FROM " + getEntityName(entityClass);
-        }
-        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
-            query += " = ?1";
-        }
-        return "SELECT COUNT(*) FROM " + getEntityName(entityClass) + " WHERE " + query;
-    }
-
-    private String createUpdateQuery(Class<?> entityClass, String query, int paramCount) {
-        if (query == null) {
-            throw new PanacheQueryException("Query string cannot be null");
-        }
-
-        String trimmed = query.trim();
-        if (trimmed.isEmpty()) {
-            throw new PanacheQueryException("Query string cannot be empty");
-        }
-
-        String trimmedLc = trimmed.toLowerCase();
-        if (trimmedLc.startsWith("update ")) {
-            return query;
-        }
-        if (trimmedLc.startsWith("from ")) {
-            return "UPDATE " + query;
-        }
-        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
-            query += " = ?1";
-        }
-        if (trimmedLc.startsWith("set ")) {
-            return "UPDATE FROM " + getEntityName(entityClass) + " " + query;
-        }
-        return "UPDATE FROM " + getEntityName(entityClass) + " SET " + query;
-    }
-
-    private String createDeleteQuery(Class<?> entityClass, String query, int paramCount) {
-        if (query == null)
-            return "DELETE FROM " + getEntityName(entityClass);
-
-        String trimmed = query.trim();
-        if (trimmed.isEmpty())
-            return "DELETE FROM " + getEntityName(entityClass);
-
-        String trimmedLc = trimmed.toLowerCase();
-        if (trimmedLc.startsWith("from ")) {
-            return "DELETE " + query;
-        }
-        if (trimmedLc.startsWith("order by ")) {
-            // ignore it
-            return "DELETE FROM " + getEntityName(entityClass);
-        }
-        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
-            query += " = ?1";
-        }
-        return "DELETE FROM " + getEntityName(entityClass) + " WHERE " + query;
-    }
-
-    public String toOrderBy(Sort sort) {
-        if (sort == null) {
-            return null;
-        }
-        if (sort.getColumns().size() == 0) {
-            return "";
-        }
-        StringBuilder sb = new StringBuilder(" ORDER BY ");
-        for (int i = 0; i < sort.getColumns().size(); i++) {
-            Sort.Column column = sort.getColumns().get(i);
-            if (i > 0)
-                sb.append(" , ");
-            sb.append(column.getName());
-            if (column.getDirection() != Sort.Direction.Ascending)
-                sb.append(" DESC");
-        }
-        return sb.toString();
-    }
-
     //
     // Queries
 
     public Object findById(Class<?> entityClass, Object id) {
-        return getEntityManager().find(entityClass, id);
+        return getEntityManager(entityClass).find(entityClass, id);
     }
 
     public Object findById(Class<?> entityClass, Object id, LockModeType lockModeType) {
-        return getEntityManager().find(entityClass, id, lockModeType);
+        return getEntityManager(entityClass).find(entityClass, id, lockModeType);
     }
 
     public Optional<?> findByIdOptional(Class<?> entityClass, Object id) {
@@ -268,15 +190,15 @@ public PanacheQueryType find(Class<?> entityClass, String query, Object... param
     }
 
     public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Object... params) {
-        String findQuery = createFindQuery(entityClass, query, paramCount(params));
-        EntityManager em = getEntityManager();
+        String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params));
+        EntityManager em = getEntityManager(entityClass);
         // FIXME: check for duplicate ORDER BY clause?
-        if (isNamedQuery(query)) {
+        if (PanacheJpaUtil.isNamedQuery(query)) {
             String namedQuery = query.substring(1);
             NamedQueryUtil.checkNamedQuery(entityClass, namedQuery);
-            return createPanacheQuery(em, query, toOrderBy(sort), params);
+            return createPanacheQuery(em, query, PanacheJpaUtil.toOrderBy(sort), params);
         }
-        return createPanacheQuery(em, findQuery, toOrderBy(sort), params);
+        return createPanacheQuery(em, findQuery, PanacheJpaUtil.toOrderBy(sort), params);
     }
 
     public PanacheQueryType find(Class<?> entityClass, String query, Map<String, Object> params) {
@@ -284,15 +206,15 @@ public PanacheQueryType find(Class<?> entityClass, String query, Map<String, Obj
     }
 
     public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        String findQuery = createFindQuery(entityClass, query, paramCount(params));
-        EntityManager em = getEntityManager();
+        String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params));
+        EntityManager em = getEntityManager(entityClass);
         // FIXME: check for duplicate ORDER BY clause?
-        if (isNamedQuery(query)) {
+        if (PanacheJpaUtil.isNamedQuery(query)) {
             String namedQuery = query.substring(1);
             NamedQueryUtil.checkNamedQuery(entityClass, namedQuery);
-            return createPanacheQuery(em, query, toOrderBy(sort), params);
+            return createPanacheQuery(em, query, PanacheJpaUtil.toOrderBy(sort), params);
         }
-        return createPanacheQuery(em, findQuery, toOrderBy(sort), params);
+        return createPanacheQuery(em, findQuery, PanacheJpaUtil.toOrderBy(sort), params);
     }
 
     public PanacheQueryType find(Class<?> entityClass, String query, Parameters params) {
@@ -352,15 +274,15 @@ public Stream<?> stream(Class<?> entityClass, String query, Sort sort, Parameter
     }
 
     public PanacheQueryType findAll(Class<?> entityClass) {
-        String query = "FROM " + getEntityName(entityClass);
-        EntityManager em = getEntityManager();
+        String query = "FROM " + PanacheJpaUtil.getEntityName(entityClass);
+        EntityManager em = getEntityManager(entityClass);
         return createPanacheQuery(em, query, null, null);
     }
 
     public PanacheQueryType findAll(Class<?> entityClass, Sort sort) {
-        String query = "FROM " + getEntityName(entityClass);
-        EntityManager em = getEntityManager();
-        return createPanacheQuery(em, query, toOrderBy(sort), null);
+        String query = "FROM " + PanacheJpaUtil.getEntityName(entityClass);
+        EntityManager em = getEntityManager(entityClass);
+        return createPanacheQuery(em, query, PanacheJpaUtil.toOrderBy(sort), null);
     }
 
     public List<?> listAll(Class<?> entityClass) {
@@ -380,16 +302,22 @@ public Stream<?> streamAll(Class<?> entityClass, Sort sort) {
     }
 
     public long count(Class<?> entityClass) {
-        return (long) getEntityManager().createQuery("SELECT COUNT(*) FROM " + getEntityName(entityClass)).getSingleResult();
+        return (long) getEntityManager(entityClass)
+                .createQuery("SELECT COUNT(*) FROM " + PanacheJpaUtil.getEntityName(entityClass))
+                .getSingleResult();
     }
 
     public long count(Class<?> entityClass, String query, Object... params) {
-        return (long) bindParameters(getEntityManager().createQuery(createCountQuery(entityClass, query, paramCount(params))),
+        return (long) bindParameters(
+                getEntityManager(entityClass)
+                        .createQuery(PanacheJpaUtil.createCountQuery(entityClass, query, paramCount(params))),
                 params).getSingleResult();
     }
 
     public long count(Class<?> entityClass, String query, Map<String, Object> params) {
-        return (long) bindParameters(getEntityManager().createQuery(createCountQuery(entityClass, query, paramCount(params))),
+        return (long) bindParameters(
+                getEntityManager(entityClass)
+                        .createQuery(PanacheJpaUtil.createCountQuery(entityClass, query, paramCount(params))),
                 params).getSingleResult();
     }
 
@@ -414,7 +342,8 @@ public boolean exists(Class<?> entityClass, String query, Parameters params) {
     }
 
     public long deleteAll(Class<?> entityClass) {
-        return (long) getEntityManager().createQuery("DELETE FROM " + getEntityName(entityClass)).executeUpdate();
+        return getEntityManager(entityClass).createQuery("DELETE FROM " + PanacheJpaUtil.getEntityName(entityClass))
+                .executeUpdate();
     }
 
     public boolean deleteById(Class<?> entityClass, Object id) {
@@ -424,49 +353,73 @@ public boolean deleteById(Class<?> entityClass, Object id) {
         if (entity == null) {
             return false;
         }
-        getEntityManager().remove(entity);
+        getEntityManager(entityClass).remove(entity);
         return true;
     }
 
     public long delete(Class<?> entityClass, String query, Object... params) {
-        return bindParameters(getEntityManager().createQuery(createDeleteQuery(entityClass, query, paramCount(params))), params)
-                .executeUpdate();
+        return bindParameters(
+                getEntityManager(entityClass)
+                        .createQuery(PanacheJpaUtil.createDeleteQuery(entityClass, query, paramCount(params))),
+                params)
+                        .executeUpdate();
     }
 
     public long delete(Class<?> entityClass, String query, Map<String, Object> params) {
-        return bindParameters(getEntityManager().createQuery(createDeleteQuery(entityClass, query, paramCount(params))), params)
-                .executeUpdate();
+        return bindParameters(
+                getEntityManager(entityClass)
+                        .createQuery(PanacheJpaUtil.createDeleteQuery(entityClass, query, paramCount(params))),
+                params)
+                        .executeUpdate();
     }
 
     public long delete(Class<?> entityClass, String query, Parameters params) {
         return delete(entityClass, query, params.map());
     }
 
-    public IllegalStateException implementationInjectionMissing() {
+    public static IllegalStateException implementationInjectionMissing() {
         return new IllegalStateException(
                 "This method is normally automatically overridden in subclasses: did you forget to annotate your entity with @Entity?");
     }
 
-    public int executeUpdate(String query, Object... params) {
-        Query jpaQuery = getEntityManager().createQuery(query);
+    /**
+     * Execute update on default persistence unit
+     */
+    public static int executeUpdate(String query, Object... params) {
+        Query jpaQuery = getEntityManager(DEFAULT_PERSISTENCE_UNIT_NAME).createQuery(query);
         bindParameters(jpaQuery, params);
         return jpaQuery.executeUpdate();
     }
 
-    public int executeUpdate(String query, Map<String, Object> params) {
-        Query jpaQuery = getEntityManager().createQuery(query);
+    /**
+     * Execute update on default persistence unit
+     */
+    public static int executeUpdate(String query, Map<String, Object> params) {
+        Query jpaQuery = getEntityManager(DEFAULT_PERSISTENCE_UNIT_NAME).createQuery(query);
+        bindParameters(jpaQuery, params);
+        return jpaQuery.executeUpdate();
+    }
+
+    public int executeUpdate(String query, Class<?> entityClass, Object... params) {
+        Query jpaQuery = getEntityManager(entityClass).createQuery(query);
+        bindParameters(jpaQuery, params);
+        return jpaQuery.executeUpdate();
+    }
+
+    public int executeUpdate(String query, Class<?> entityClass, Map<String, Object> params) {
+        Query jpaQuery = getEntityManager(entityClass).createQuery(query);
         bindParameters(jpaQuery, params);
         return jpaQuery.executeUpdate();
     }
 
     public int executeUpdate(Class<?> entityClass, String query, Object... params) {
-        String updateQuery = createUpdateQuery(entityClass, query, paramCount(params));
-        return executeUpdate(updateQuery, params);
+        String updateQuery = PanacheJpaUtil.createUpdateQuery(entityClass, query, paramCount(params));
+        return executeUpdate(updateQuery, entityClass, params);
     }
 
     public int executeUpdate(Class<?> entityClass, String query, Map<String, Object> params) {
-        String updateQuery = createUpdateQuery(entityClass, query, paramCount(params));
-        return executeUpdate(updateQuery, params);
+        String updateQuery = PanacheJpaUtil.createUpdateQuery(entityClass, query, paramCount(params));
+        return executeUpdate(updateQuery, entityClass, params);
     }
 
     public int update(Class<?> entityClass, String query, Map<String, Object> params) {
@@ -481,12 +434,11 @@ public int update(Class<?> entityClass, String query, Object... params) {
         return executeUpdate(entityClass, query, params);
     }
 
-    public void setRollbackOnly() {
+    public static void setRollbackOnly() {
         try {
             getTransactionManager().setRollbackOnly();
         } catch (SystemException e) {
             throw new IllegalStateException(e);
         }
     }
-
 }
diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java
index b9c82510ba852..949f24a28307d 100644
--- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java
+++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java
@@ -7,8 +7,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import javax.persistence.EntityManager;
@@ -20,21 +18,14 @@
 import org.hibernate.Session;
 import org.hibernate.engine.spi.RowSelection;
 
+import io.quarkus.hibernate.orm.panache.ProjectedFieldName;
 import io.quarkus.panache.common.Page;
 import io.quarkus.panache.common.Range;
 import io.quarkus.panache.common.exception.PanacheQueryException;
+import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
 
 public class CommonPanacheQueryImpl<Entity> {
 
-    // match SELECT DISTINCT? id (AS id)? (, id (AS id)?)*
-    static final Pattern SELECT_PATTERN = Pattern.compile(
-            "^\\s*SELECT\\s+((?:DISTINCT\\s+)?\\w+(?:\\.\\w+)*)(?:\\s+AS\\s+\\w+)?(\\s*,\\s*\\w+(?:\\.\\w+)*(?:\\s+AS\\s+\\w+)?)*\\s+(.*)",
-            Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
-
-    // match FROM
-    static final Pattern FROM_PATTERN = Pattern.compile("^\\s*FROM\\s+.*",
-            Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
-
     private interface NonThrowingCloseable extends AutoCloseable {
         @Override
         void close();
@@ -86,7 +77,7 @@ private CommonPanacheQueryImpl(CommonPanacheQueryImpl<?> previousQuery, String n
     // Builder
 
     public <T> CommonPanacheQueryImpl<T> project(Class<T> type) {
-        if (AbstractJpaOperations.isNamedQuery(query)) {
+        if (PanacheJpaUtil.isNamedQuery(query)) {
             throw new PanacheQueryException("Unable to perform a projection on a named query");
         }
 
@@ -100,16 +91,24 @@ public <T> CommonPanacheQueryImpl<T> project(Class<T> type) {
         StringBuilder select = new StringBuilder("SELECT new ").append(type.getName()).append(" (");
         int selectInitialLength = select.length();
         for (Parameter parameter : constructor.getParameters()) {
-            if (!parameter.isNamePresent()) {
+            String parameterName;
+            if (parameter.isAnnotationPresent(ProjectedFieldName.class)) {
+                final String name = parameter.getAnnotation(ProjectedFieldName.class).value();
+                if (name.isEmpty())
+                    throw new PanacheQueryException("The annotation ProjectedFieldName must have a non-empty value.");
+                parameterName = name;
+            } else if (!parameter.isNamePresent()) {
                 throw new PanacheQueryException(
                         "Your application must be built with parameter names, this should be the default if" +
                                 " using Quarkus artifacts. Check the maven or gradle compiler configuration to include '-parameters'.");
+            } else {
+                parameterName = parameter.getName();
             }
 
             if (select.length() > selectInitialLength) {
                 select.append(", ");
             }
-            select.append(parameter.getName());
+            select.append(parameterName);
         }
         select.append(") ");
 
@@ -208,7 +207,7 @@ public void withHint(String hintName, Object value) {
     public long count() {
         if (count == null) {
             String selectQuery = query;
-            if (AbstractJpaOperations.isNamedQuery(query)) {
+            if (PanacheJpaUtil.isNamedQuery(query)) {
                 org.hibernate.query.Query q = (org.hibernate.query.Query) em.createNamedQuery(query.substring(1));
                 selectQuery = q.getQueryString();
             }
@@ -230,37 +229,7 @@ private String countQuery(String selectQuery) {
             return countQuery;
         }
 
-        // try to generate a good count query from the existing query
-        Matcher selectMatcher = SELECT_PATTERN.matcher(selectQuery);
-        String countQuery;
-        if (selectMatcher.matches()) {
-            // this one cannot be null
-            String firstSelection = selectMatcher.group(1).trim();
-            if (firstSelection.toLowerCase().startsWith("distinct ")) {
-                // this one can be null
-                String secondSelection = selectMatcher.group(2);
-                // we can only count distinct single columns
-                if (secondSelection != null && !secondSelection.trim().isEmpty()) {
-                    throw new PanacheQueryException("Count query not supported for select query: " + selectQuery);
-                }
-                countQuery = "SELECT COUNT(" + firstSelection + ") " + selectMatcher.group(3);
-            } else {
-                // it's not distinct, forget the column list
-                countQuery = "SELECT COUNT(*) " + selectMatcher.group(3);
-            }
-        } else if (FROM_PATTERN.matcher(selectQuery).matches()) {
-            countQuery = "SELECT COUNT(*) " + selectQuery;
-        } else {
-            throw new PanacheQueryException("Count query not supported for select query: " + selectQuery);
-        }
-
-        // remove the order by clause
-        String lcQuery = countQuery.toLowerCase();
-        int orderByIndex = lcQuery.lastIndexOf(" order by ");
-        if (orderByIndex != -1) {
-            countQuery = countQuery.substring(0, orderByIndex);
-        }
-        return countQuery;
+        return PanacheJpaUtil.getCountQuery(selectQuery);
     }
 
     @SuppressWarnings("unchecked")
@@ -355,7 +324,7 @@ private Query createQuery(int maxResults) {
     @SuppressWarnings("unchecked")
     private Query createBaseQuery() {
         Query jpaQuery;
-        if (AbstractJpaOperations.isNamedQuery(query)) {
+        if (PanacheJpaUtil.isNamedQuery(query)) {
             String namedQuery = query.substring(1);
             jpaQuery = em.createNamedQuery(namedQuery);
         } else {
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml
index 9f9eabde95509..67133b7cac96d 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-hibernate-orm-panache-kotlin-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,6 +16,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm-deployment</artifactId>
@@ -52,6 +55,21 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -68,6 +86,41 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/main/java</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/test/java</source>
+                                <source>src/test/kotlin</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinJpaTypeBundle.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinJpaTypeBundle.java
new file mode 100644
index 0000000000000..fdf8831f225b0
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinJpaTypeBundle.java
@@ -0,0 +1,62 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment;
+
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion;
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanionBase;
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity;
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntityBase;
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheQuery;
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository;
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepositoryBase;
+import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+class KotlinJpaTypeBundle implements TypeBundle {
+
+    static final TypeBundle BUNDLE = new KotlinJpaTypeBundle();
+
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(PanacheEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(PanacheEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanion() {
+        return new ByteCodeType(PanacheCompanion.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanionBase() {
+        return new ByteCodeType(PanacheCompanionBase.class);
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(KotlinJpaOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(PanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(PanacheRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(PanacheRepositoryBase.class);
+    }
+
+    @Override
+    public ByteCodeType updateType() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionClassVisitor.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionClassVisitor.java
deleted file mode 100644
index 5d6b2f6f45602..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionClassVisitor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package io.quarkus.hibernate.orm.panache.kotlin.deployment;
-
-import static io.quarkus.gizmo.Gizmo.ASM_API_VERSION;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.CLASS_SIGNATURE;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.JPA_OPERATIONS;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.OBJECT_SIGNATURE;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.PANACHE_COMPANION_SIGNATURE;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.PANACHE_ENTITY_BASE_SIGNATURE;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.PANACHE_ENTITY_SIGNATURE;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-
-import java.util.Map;
-import java.util.StringJoiner;
-import java.util.TreeMap;
-
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.MethodInfo;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-
-import io.quarkus.deployment.util.AsmUtil;
-import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
-
-/**
- * kotlinc compiles default methods in to the implementing classes so we don't need to generate whole method bodies.
- * This visitor, then, inspects those methods and replaces the calls to the $DefaultImpls class (which holds those
- * default method implementations) with ones to JpaOperations thus giving the method actual functionality.
- */
-class KotlinPanacheCompanionClassVisitor extends ClassVisitor {
-
-    private static final String DEFAULT_IMPLS = "io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion$DefaultImpls";
-    private final Map<String, MethodInfo> bridgeMethods = new TreeMap<>();
-    private String entityBinaryType;
-    private String entitySignature;
-    private org.objectweb.asm.Type entityType;
-
-    public KotlinPanacheCompanionClassVisitor(ClassVisitor outputClassVisitor, ClassInfo entityInfo) {
-        super(ASM_API_VERSION, outputClassVisitor);
-
-        entityInfo
-                .methods()
-                .forEach(method -> {
-                    if (method.hasAnnotation(PanacheEntityEnhancer.DOTNAME_GENERATE_BRIDGE)) {
-                        bridgeMethods.put(method.name() + AsmUtil.getDescriptor(method, m -> null), method);
-                    }
-                });
-    }
-
-    @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        super.visit(version, access, name, signature, superName, interfaces);
-
-        String className = name.replace('.', '/');
-
-        entityBinaryType = className.replace("$Companion", "");
-        entitySignature = "L" + entityBinaryType + ";";
-        entityType = org.objectweb.asm.Type.getType(entitySignature);
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-        MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-        if (bridgeMethods.get(name + descriptor) != null) {
-            mv = new MethodVisitor(ASM_API_VERSION, mv) {
-                @Override
-                public void visitVarInsn(int opcode, int var) {
-                    if (opcode == ALOAD && var == 0) {
-                        visitLdcInsn(entityType);
-                    } else {
-                        super.visitVarInsn(opcode, var);
-                    }
-                }
-
-                @Override
-                public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
-                    if (opcode == INVOKESTATIC && owner.equals(DEFAULT_IMPLS)) {
-                        String replace = descriptor
-                                .replace(PANACHE_ENTITY_SIGNATURE, OBJECT_SIGNATURE)
-                                .replace(PANACHE_ENTITY_BASE_SIGNATURE, OBJECT_SIGNATURE)
-                                .replace(PANACHE_COMPANION_SIGNATURE, CLASS_SIGNATURE);
-                        super.visitMethodInsn(opcode, JPA_OPERATIONS, name, replace, isInterface);
-                    } else {
-                        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-                    }
-                }
-            };
-        }
-        return mv;
-    }
-
-    @Override
-    public void visitEnd() {
-        if (cv != null) {
-            cv.visitEnd();
-        }
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", KotlinPanacheCompanionClassVisitor.class.getSimpleName() + "[", "]")
-                .add(entityBinaryType)
-                .toString();
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionEnhancer.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionEnhancer.java
index 620bb5cb771bb..77eb455c13aca 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionEnhancer.java
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheCompanionEnhancer.java
@@ -1,49 +1,27 @@
 package io.quarkus.hibernate.orm.panache.kotlin.deployment;
 
-import java.lang.reflect.Modifier;
-import java.util.List;
+import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinJpaTypeBundle.BUNDLE;
 
-import javax.persistence.Transient;
+import java.util.List;
 
-import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
 
-import io.quarkus.gizmo.DescriptorUtils;
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
-import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
+import io.quarkus.panache.common.deployment.PanacheCompanionEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor;
 
-public class KotlinPanacheCompanionEnhancer extends PanacheEntityEnhancer<MetamodelInfo<EntityModel<EntityField>>> {
-
-    private static final DotName DOTNAME_TRANSIENT = DotName.createSimple(Transient.class.getName());
+public class KotlinPanacheCompanionEnhancer extends PanacheCompanionEnhancer {
 
     public KotlinPanacheCompanionEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
-        super(index, KotlinPanacheResourceProcessor.PANACHE_ENTITY_BASE_DOTNAME, methodCustomizers);
-        modelInfo = new MetamodelInfo<>();
+        super(index, methodCustomizers);
     }
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new KotlinPanacheCompanionClassVisitor(outputClassVisitor,
-                indexView.getClassByName(DotName.createSimple(className)));
-    }
-
-    @Override
-    public void collectFields(ClassInfo classInfo) {
-        EntityModel<EntityField> entityModel = new EntityModel<>(classInfo);
-        for (FieldInfo fieldInfo : classInfo.fields()) {
-            String name = fieldInfo.name();
-            if (Modifier.isPublic(fieldInfo.flags())
-                    && !Modifier.isStatic(fieldInfo.flags())
-                    && !fieldInfo.hasAnnotation(DOTNAME_TRANSIENT)) {
-                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
-            }
-        }
-        modelInfo.addEntityModel(entityModel);
+        return new KotlinPanacheClassOperationGenerationVisitor(outputClassVisitor,
+                indexView.getClassByName(DotName.createSimple(className)), indexView, BUNDLE,
+                BUNDLE.entityCompanionBase(), methodCustomizers);
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityClassVisitor.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityClassVisitor.java
deleted file mode 100644
index 49df9ed685726..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityClassVisitor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package io.quarkus.hibernate.orm.panache.kotlin.deployment;
-
-import java.util.List;
-import java.util.StringJoiner;
-
-import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
-import org.jboss.jandex.ClassInfo;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
-import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
-import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
-
-/**
- * This visitor process kotlin entities and removes the final modifier from the compiler generated getters and setters.
- * Unlike Java entities, we don't need to generate the getters and setters because kotlinc does that for us but kotlin,
- * by default, is final so we need to open those up for hibernate to add its hooks.
- */
-class KotlinPanacheEntityClassVisitor extends PanacheEntityEnhancer.PanacheEntityClassVisitor<EntityField> {
-
-    private String entityBinaryType;
-    private org.objectweb.asm.Type entityType;
-
-    public KotlinPanacheEntityClassVisitor(String className, ClassVisitor outputClassVisitor,
-            MetamodelInfo<EntityModel<EntityField>> modelInfo,
-            ClassInfo panacheEntityBaseClassInfo,
-            ClassInfo entityInfo,
-            List<PanacheMethodCustomizer> methodCustomizers) {
-        super(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo, entityInfo, methodCustomizers);
-    }
-
-    @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        super.visit(version, access, name, signature, superName, interfaces);
-
-        entityBinaryType = name.replace('.', '/');
-        entityType = org.objectweb.asm.Type.getType("L" + entityBinaryType + ";");
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-        int updated = access;
-        if (name.startsWith("get") || name.startsWith("set")) {
-            updated &= ~Opcodes.ACC_FINAL;
-        }
-        return super.visitMethod(updated, name, descriptor, signature, exceptions);
-    }
-
-    @Override
-    protected String getModelDescriptor() {
-        return "Ljava/lang/Class;";
-    }
-
-    @Override
-    protected String getPanacheOperationsBinaryName() {
-        return KotlinPanacheEntityEnhancer.JPA_OPERATIONS_BINARY_NAME;
-    }
-
-    @Override
-    protected void injectModel(MethodVisitor mv) {
-        mv.visitLdcInsn(entityType);
-    }
-
-    @Override
-    protected void generateAccessorSetField(MethodVisitor mv, EntityField field) {
-        mv.visitMethodInsn(
-                Opcodes.INVOKEVIRTUAL,
-                thisClass.getInternalName(),
-                EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + field.name,
-                Type.getMethodDescriptor(Type.getType(void.class), Type.getType(field.descriptor)),
-                false);
-    }
-
-    @Override
-    protected void generateAccessorGetField(MethodVisitor mv, EntityField field) {
-        mv.visitMethodInsn(
-                Opcodes.INVOKEVIRTUAL,
-                thisClass.getInternalName(),
-                EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + field.name,
-                Type.getMethodDescriptor(Type.getType(field.descriptor)),
-                false);
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", KotlinPanacheEntityClassVisitor.class.getSimpleName() + "[", "]")
-                .add(entityBinaryType)
-                .toString();
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityEnhancer.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityEnhancer.java
index bd682866d26bd..4e2861875287b 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityEnhancer.java
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheEntityEnhancer.java
@@ -1,52 +1,28 @@
 package io.quarkus.hibernate.orm.panache.kotlin.deployment;
 
-import java.lang.reflect.Modifier;
-import java.util.List;
+import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinJpaTypeBundle.BUNDLE;
 
-import javax.persistence.Transient;
+import java.util.List;
 
-import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
 
-import io.quarkus.gizmo.DescriptorUtils;
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations;
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
 import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor;
 
-public class KotlinPanacheEntityEnhancer extends PanacheEntityEnhancer<MetamodelInfo<EntityModel<EntityField>>> {
-
-    private final static String JPA_OPERATIONS_NAME = JpaOperations.class.getName();
-    public final static String JPA_OPERATIONS_BINARY_NAME = JPA_OPERATIONS_NAME.replace('.', '/');
-
-    private static final DotName DOTNAME_TRANSIENT = DotName.createSimple(Transient.class.getName());
+public class KotlinPanacheEntityEnhancer extends PanacheEntityEnhancer {
 
     public KotlinPanacheEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
-        super(index, KotlinPanacheResourceProcessor.PANACHE_ENTITY_BASE_DOTNAME, methodCustomizers);
-        modelInfo = new MetamodelInfo<>();
+        super(index, methodCustomizers);
     }
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new KotlinPanacheEntityClassVisitor(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo,
-                indexView.getClassByName(DotName.createSimple(className)), methodCustomizers);
+        return new KotlinPanacheClassOperationGenerationVisitor(outputClassVisitor,
+                indexView.getClassByName(DotName.createSimple(className)), indexView, BUNDLE,
+                BUNDLE.entityBase(), methodCustomizers);
     }
 
-    public void collectFields(ClassInfo classInfo) {
-        EntityModel<EntityField> entityModel = new EntityModel<>(classInfo);
-        for (FieldInfo fieldInfo : classInfo.fields()) {
-            String name = fieldInfo.name();
-            if (Modifier.isPublic(fieldInfo.flags())
-                    && !Modifier.isStatic(fieldInfo.flags())
-                    && !fieldInfo.hasAnnotation(DOTNAME_TRANSIENT)) {
-                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
-            }
-        }
-        modelInfo.addEntityModel(entityModel);
-    }
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryClassVisitor.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryClassVisitor.java
deleted file mode 100644
index 674bf0ba3a44f..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryClassVisitor.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package io.quarkus.hibernate.orm.panache.kotlin.deployment;
-
-import static io.quarkus.gizmo.Gizmo.ASM_API_VERSION;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.JPA_OPERATIONS;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.PANACHE_REPOSITORY_BASE_DOTNAME;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.autobox;
-import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinPanacheResourceProcessor.sanitize;
-import static io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer.PanacheRepositoryClassVisitor.findEntityTypeArgumentsForPanacheRepository;
-import static org.jboss.jandex.DotName.createSimple;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.LLOAD;
-import static org.objectweb.asm.Type.getArgumentTypes;
-import static org.objectweb.asm.Type.getMethodDescriptor;
-import static org.objectweb.asm.Type.getReturnType;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.regex.Pattern;
-
-import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-
-import io.quarkus.deployment.util.AsmUtil;
-import io.quarkus.gizmo.Gizmo;
-import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
-
-/**
- * kotlinc compiles default methods in to the implementing classes so we don't need to generate whole method bodies.
- * This visitor, then, inspects those methods and replaces the calls to the $DefaultImpls class (which holds those
- * default method implementations) with ones to JpaOperations thus giving the method actual functionality.
- */
-class KotlinPanacheRepositoryClassVisitor extends ClassVisitor {
-
-    public static final Pattern DEFAULT_IMPLS = Pattern.compile(".*PanacheRepository.*\\$DefaultImpls");
-    private final Map<String, MethodInfo> bridgeMethods = new TreeMap<>();
-    private final IndexView indexView;
-    private org.objectweb.asm.Type entityType;
-    private String entitySignature;
-    protected Map<String, String> typeArguments = new HashMap<>();
-    private String idBinaryType;
-    private String idSignature;
-
-    public KotlinPanacheRepositoryClassVisitor(String className, ClassVisitor outputClassVisitor, IndexView indexView) {
-        super(Gizmo.ASM_API_VERSION, outputClassVisitor);
-        this.indexView = indexView;
-    }
-
-    @Override
-    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        super.visit(version, access, name, signature, superName, interfaces);
-
-        final String repositoryClassName = name.replace('/', '.');
-
-        String[] foundTypeArguments = findEntityTypeArgumentsForPanacheRepository(indexView, repositoryClassName,
-                PANACHE_REPOSITORY_BASE_DOTNAME);
-
-        String entityBinaryType = foundTypeArguments[0];
-        entitySignature = "L" + entityBinaryType + ";";
-        entityType = Type.getType(entitySignature);
-        idBinaryType = foundTypeArguments[1];
-        idSignature = "L" + idBinaryType + ";";
-
-        typeArguments.put("Entity", entitySignature);
-        typeArguments.put("Id", idSignature);
-        indexView.getClassByName(createSimple(repositoryClassName))
-                .methods()
-                .forEach(method -> {
-                    if (method.hasAnnotation(PanacheEntityEnhancer.DOTNAME_GENERATE_BRIDGE)) {
-                        bridgeMethods.put(method.name() + AsmUtil.getDescriptor(method, m -> typeArguments.get(m)), method);
-                    }
-                });
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-        MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-        if (bridgeMethods.get(name + descriptor) != null) {
-            final Type[] argumentTypes = getArgumentTypes(descriptor);
-            int primitive = -1;
-
-            for (int i = 0; i < argumentTypes.length; i++) {
-                if (argumentTypes[i].getInternalName().length() == 1) {
-                    primitive = i;
-                }
-            }
-
-            int finalPrimitive = primitive;
-            mv = new MethodVisitor(ASM_API_VERSION, mv) {
-                /**
-                 * This method tracks the location of any primitive value (ID types) passed in. The javac-generated
-                 * bytecode is expecting an Object but with non-nullable "primitive" types in kotlin, those are
-                 * expressed as primitives and not the wrapper types (e.g., Long). This method will catch the cases
-                 * where the ID values passed in are loaded on to the stack prior to invoking the call to JpaOperations.
-                 * It will then inject an autoboxing-like call to ensure that any long values because Long values.
-                 */
-                @Override
-                public void visitVarInsn(int opcode, int var) {
-                    if (opcode == ALOAD && var == 0) {
-                        visitLdcInsn(entityType);
-                    } else {
-                        super.visitVarInsn(opcode, var);
-                        if (opcode == LLOAD && var == (finalPrimitive + 1)) {
-                            Type wrapper = autobox(argumentTypes[finalPrimitive]);
-                            super.visitMethodInsn(INVOKESTATIC, wrapper.getInternalName(), "valueOf",
-                                    getMethodDescriptor(wrapper, argumentTypes[finalPrimitive]), false);
-
-                        }
-                    }
-                }
-
-                /**
-                 * This method redirects the kotlinc generated call to $DefaultImpls to JpaOperations. In case of IDs,
-                 * e.g., these parameters are represented using primitives by kotlinc since they can never be null.
-                 * JpaOperation expects an object reference so we need to update the descriptor for the method
-                 * invocation to reflect that rather than the primitive type.
-                 */
-                @Override
-                public void visitMethodInsn(int opcode, String owner, String name, String descriptor,
-                        boolean isInterface) {
-                    if (opcode == INVOKESTATIC && DEFAULT_IMPLS.matcher(owner).matches()) {
-
-                        owner = JPA_OPERATIONS;
-                        Type[] arguments = getArgumentTypes(descriptor);
-                        sanitize(arguments);
-                        descriptor = getMethodDescriptor(getReturnType(descriptor), arguments);
-                    }
-
-                    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-                }
-            };
-
-        }
-        return mv;
-    }
-
-}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryEnhancer.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryEnhancer.java
index 003d256378604..9753f7d2f100a 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryEnhancer.java
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheRepositoryEnhancer.java
@@ -1,19 +1,30 @@
 package io.quarkus.hibernate.orm.panache.kotlin.deployment;
 
+import static io.quarkus.hibernate.orm.panache.kotlin.deployment.KotlinJpaTypeBundle.BUNDLE;
+
+import java.util.List;
+
+import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
 
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor;
 
 public class KotlinPanacheRepositoryEnhancer extends PanacheRepositoryEnhancer {
 
-    public KotlinPanacheRepositoryEnhancer(IndexView index) {
-        super(index, KotlinPanacheResourceProcessor.PANACHE_REPOSITORY_BASE_DOTNAME);
+    private List<PanacheMethodCustomizer> methodCustomizers;
+
+    public KotlinPanacheRepositoryEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
+        super(index);
+        this.methodCustomizers = methodCustomizers;
     }
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new KotlinPanacheRepositoryClassVisitor(className, outputClassVisitor,
-                this.indexView);
+        return new KotlinPanacheClassOperationGenerationVisitor(outputClassVisitor,
+                indexView.getClassByName(DotName.createSimple(className)), indexView, BUNDLE,
+                BUNDLE.repositoryBase(), methodCustomizers);
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java
index f463cca99af13..f9beceb8da8dd 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java
@@ -1,122 +1,98 @@
 package io.quarkus.hibernate.orm.panache.kotlin.deployment;
 
-import static java.util.Arrays.asList;
+import static io.quarkus.deployment.util.JandexUtil.resolveTypeParameters;
+import static java.util.Collections.singleton;
 import static org.jboss.jandex.DotName.createSimple;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
+import javax.persistence.Id;
 
+import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
-import org.jetbrains.annotations.NotNull;
 
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
 import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
 import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem;
-import io.quarkus.hibernate.orm.deployment.HibernateEnhancersRegisteredBuildItem;
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion;
+import io.quarkus.hibernate.orm.deployment.JpaModelPersistenceUnitMappingBuildItem;
 import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity;
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntityBase;
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository;
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepositoryBase;
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations;
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
-import io.quarkus.panache.common.deployment.PanacheFieldAccessEnhancer;
+import io.quarkus.hibernate.orm.panache.kotlin.runtime.PanacheKotlinHibernateOrmRecorder;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.TypeBundle;
 
 public final class KotlinPanacheResourceProcessor {
+    private static final DotName DOTNAME_ID = DotName.createSimple(Id.class.getName());
+    private static final DotName DOTNAME_PANACHE_ENTITY = DotName.createSimple(PanacheEntity.class.getName());
+    private static final Set<DotName> UNREMOVABLE_BEANS = singleton(createSimple(EntityManager.class.getName()));
 
-    private static final Set<DotName> UNREMOVABLE_BEANS = Collections.singleton(
-            createSimple(EntityManager.class.getName()));
-    static final String JPA_OPERATIONS = createSimple(JpaOperations.class.getName())
-            .toString().replace(".", "/");
-
-    static final DotName PANACHE_REPOSITORY_BASE_DOTNAME = createSimple(PanacheRepositoryBase.class.getName());
-    static final DotName PANACHE_REPOSITORY_DOTNAME = createSimple(PanacheRepository.class.getName());
-
-    static final DotName PANACHE_ENTITY_BASE_DOTNAME = createSimple(PanacheEntityBase.class.getName());
-    static final DotName PANACHE_ENTITY_DOTNAME = createSimple(PanacheEntity.class.getName());
-    static final DotName PANACHE_COMPANION_DOTNAME = createSimple(PanacheCompanion.class.getName());
-
-    static final String PANACHE_ENTITY_BASE_SIGNATURE = toBinarySignature(PanacheEntityBase.class);
-    static final String PANACHE_ENTITY_SIGNATURE = toBinarySignature(PanacheEntity.class);
-    static final String PANACHE_COMPANION_SIGNATURE = toBinarySignature(PanacheCompanion.class);
-
-    static final String OBJECT_SIGNATURE = toBinarySignature(Object.class);
-    static final String CLASS_SIGNATURE = toBinarySignature(Class.class);
-
-    static final org.objectweb.asm.Type CLASS_TYPE = org.objectweb.asm.Type.getType(Class.class);
-    static final org.objectweb.asm.Type OBJECT_TYPE = org.objectweb.asm.Type.getType(Object.class);
-    static final List<org.objectweb.asm.Type> REPOSITORY_TYPES = asList(
-            org.objectweb.asm.Type.getType(PanacheRepositoryBase.class),
-            org.objectweb.asm.Type.getType(PanacheRepository.class));
-    static final List<org.objectweb.asm.Type> ENTITY_TYPES = asList(
-            org.objectweb.asm.Type.getType(PanacheEntityBase.class),
-            org.objectweb.asm.Type.getType(PanacheEntity.class),
-            org.objectweb.asm.Type.getType(PanacheCompanion.class));
-    public static final List<org.objectweb.asm.Type> PRIMITIVE_TYPES = asList(
-            org.objectweb.asm.Type.getType(Void.class),
-            org.objectweb.asm.Type.getType(Boolean.class),
-            org.objectweb.asm.Type.getType(Character.class),
-            org.objectweb.asm.Type.getType(Byte.class),
-            org.objectweb.asm.Type.getType(Short.class),
-            org.objectweb.asm.Type.getType(Integer.class),
-            org.objectweb.asm.Type.getType(Float.class),
-            org.objectweb.asm.Type.getType(Long.class));
-
-    static org.objectweb.asm.Type sanitize(org.objectweb.asm.Type[] argumentTypes) {
-        org.objectweb.asm.Type primitiveReplaced = null;
-
-        for (int i = 0; i < argumentTypes.length; i++) {
-            if (REPOSITORY_TYPES.contains(argumentTypes[i])) {
-                argumentTypes[i] = CLASS_TYPE;
-            } else if (ENTITY_TYPES.contains(argumentTypes[i])) {
-                argumentTypes[i] = OBJECT_TYPE;
-            } else if (argumentTypes[i].getInternalName().length() == 1) {
-                primitiveReplaced = argumentTypes[i];
-                argumentTypes[i] = OBJECT_TYPE;
-            }
-        }
-        return primitiveReplaced;
-    }
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    void build(PanacheKotlinHibernateOrmRecorder recorder,
+            CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems,
+            Optional<JpaModelPersistenceUnitMappingBuildItem> jpaModelPersistenceUnitMapping) {
+
+        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
+                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+
+        TypeBundle bundle = KotlinJpaTypeBundle.BUNDLE;
+
+        processRepositories(index, transformers, reflectiveClass, createRepositoryEnhancer(index, methodCustomizers),
+                bundle.repositoryBase(), bundle.repository());
+
+        processEntities(index, transformers, reflectiveClass, recorder, jpaModelPersistenceUnitMapping,
+                createEntityEnhancer(index, methodCustomizers), bundle.entityBase(), bundle.entity());
 
-    static org.objectweb.asm.Type autobox(org.objectweb.asm.Type primitive) {
-        return PRIMITIVE_TYPES.get(primitive.getSort());
+        processCompanions(index, transformers, reflectiveClass, createCompanionEnhancer(index, methodCustomizers),
+                bundle.entityCompanionBase(), bundle.entityCompanion());
     }
 
-    @NotNull
-    static String toBinarySignature(Class<?> type) {
-        return org.objectweb.asm.Type.getType(type).getDescriptor();
+    public PanacheEntityEnhancer createEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new KotlinPanacheEntityEnhancer(index.getIndex(), methodCustomizers);
     }
 
-    @BuildStep
-    FeatureBuildItem featureBuildItem() {
-        return new FeatureBuildItem(Feature.HIBERNATE_ORM_PANACHE_KOTLIN);
+    private PanacheRepositoryEnhancer createRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new KotlinPanacheRepositoryEnhancer(index.getIndex(), methodCustomizers);
     }
 
-    @BuildStep
-    List<AdditionalJpaModelBuildItem> produceModel() {
-        // only useful for the index resolution: hibernate will register it to be transformed, but BuildMojo
-        // only transforms classes from the application jar, so we do our own transforming
-        return Collections.singletonList(new AdditionalJpaModelBuildItem(PanacheEntity.class));
+    private KotlinPanacheCompanionEnhancer createCompanionEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> customizers) {
+        return new KotlinPanacheCompanionEnhancer(index.getIndex(), customizers);
     }
 
     @BuildStep
@@ -136,66 +112,117 @@ public boolean test(BeanInfo beanInfo) {
     }
 
     @BuildStep
-    void build(CombinedIndexBuildItem index,
-            ApplicationIndexBuildItem applicationIndex,
-            BuildProducer<BytecodeTransformerBuildItem> transformers,
-            HibernateEnhancersRegisteredBuildItem hibernateMarker,
-            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
+    FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.HIBERNATE_ORM_PANACHE_KOTLIN);
+    }
 
-        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
-                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+    private void processEntities(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            PanacheKotlinHibernateOrmRecorder recorder,
+            Optional<JpaModelPersistenceUnitMappingBuildItem> jpaModelPersistenceUnitMapping,
+            PanacheEntityEnhancer entityEnhancer,
+            ByteCodeType baseType,
+            ByteCodeType type) {
 
-        KotlinPanacheRepositoryEnhancer daoEnhancer = new KotlinPanacheRepositoryEnhancer(index.getIndex());
-        Set<String> daoClasses = new HashSet<>();
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(PANACHE_REPOSITORY_BASE_DOTNAME)) {
-            // Skip PanacheRepository
-            if (classInfo.name().equals(PANACHE_REPOSITORY_DOTNAME))
-                continue;
-            if (PanacheRepositoryEnhancer.skipRepository(classInfo))
+        Set<String> modelClasses = new HashSet<>();
+        // Note that we do this in two passes because for some reason Jandex does not give us subtypes
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(baseType.dotName())) {
+            if (classInfo.name().equals(type.dotName())) {
                 continue;
-            daoClasses.add(classInfo.name().toString());
+            }
+            String name = classInfo.name().toString();
+            if (modelClasses.add(name)) {
+                transformers.produce(new BytecodeTransformerBuildItem(name, entityEnhancer));
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, name));
+            }
         }
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(PANACHE_REPOSITORY_DOTNAME)) {
-            if (PanacheRepositoryEnhancer.skipRepository(classInfo))
-                continue;
-            daoClasses.add(classInfo.name().toString());
+
+        Map<String, Set<String>> collectedEntityToPersistenceUnits = new HashMap<>();
+        if (jpaModelPersistenceUnitMapping.isPresent()) {
+            collectedEntityToPersistenceUnits = jpaModelPersistenceUnitMapping.get().getEntityToPersistenceUnits();
         }
-        for (String daoClass : daoClasses) {
-            transformers.produce(new BytecodeTransformerBuildItem(daoClass, daoEnhancer));
+
+        Map<String, String> panacheEntityToPersistenceUnit = new HashMap<>();
+        for (Map.Entry<String, Set<String>> entry : collectedEntityToPersistenceUnits.entrySet()) {
+            String entityName = entry.getKey();
+            List<String> selectedPersistenceUnits = new ArrayList<>(entry.getValue());
+            boolean isPanacheEntity = modelClasses.contains(entityName);
+            if (selectedPersistenceUnits.size() > 1 && isPanacheEntity) {
+                throw new IllegalStateException(String.format(
+                        "PanacheEntity '%s' cannot be defined for usage in several persistence units which is not supported. The following persistence units were found: %s.",
+                        entityName, String.join(",", selectedPersistenceUnits)));
+            }
+
+            panacheEntityToPersistenceUnit.put(entityName, selectedPersistenceUnits.get(0));
         }
+        recorder.setEntityToPersistenceUnit(panacheEntityToPersistenceUnit);
+    }
 
-        KotlinPanacheCompanionEnhancer companionEnhancer = new KotlinPanacheCompanionEnhancer(index.getIndex(),
-                methodCustomizers);
-        KotlinPanacheEntityEnhancer entityEnhancer = new KotlinPanacheEntityEnhancer(index.getIndex(), methodCustomizers);
-        Set<String> modelClasses = new HashSet<>();
-        // Note that we do this in two passes because for some reason Jandex does not give us subtypes
-        // of PanacheEntity if we ask for subtypes of PanacheEntityBase
-        // NOTE: we don't skip abstract/generic entities because they still need accessors
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(PANACHE_COMPANION_DOTNAME)) {
-            if (classInfo.name().equals(PANACHE_ENTITY_DOTNAME))
+    private void processRepositories(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            PanacheRepositoryEnhancer enhancer,
+            ByteCodeType baseType,
+            ByteCodeType type) {
+
+        Set<Type> typeParameters = new HashSet<>();
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(baseType.dotName())) {
+            if (classInfo.name().equals(type.dotName()) || enhancer.skipRepository(classInfo)) {
                 continue;
-            if (modelClasses.add(classInfo.name().toString())) {
-                transformers.produce(new BytecodeTransformerBuildItem(classInfo.name().toString(), companionEnhancer));
             }
+            transformers.produce(new BytecodeTransformerBuildItem(classInfo.name().toString(), enhancer));
+            typeParameters.addAll(resolveTypeParameters(classInfo.name(), baseType.dotName(), index.getIndex()));
+        }
+        for (Type parameterType : typeParameters) {
+            // Register for reflection the type parameters of the repository: this should be the entity class and the ID class
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, parameterType.name().toString()));
         }
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(PANACHE_ENTITY_BASE_DOTNAME)) {
-            if (classInfo.name().equals(PANACHE_ENTITY_DOTNAME))
+    }
+
+    private void processCompanions(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            KotlinPanacheCompanionEnhancer enhancer,
+            ByteCodeType baseType,
+            ByteCodeType type) {
+
+        Set<Type> typeParameters = new HashSet<>();
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(baseType.dotName())) {
+            if (classInfo.name().equals(type.dotName())) {
                 continue;
-            if (modelClasses.add(classInfo.name().toString())) {
-                entityEnhancer.collectFields(classInfo);
-                transformers.produce(new BytecodeTransformerBuildItem(classInfo.name().toString(), entityEnhancer));
             }
+            transformers.produce(new BytecodeTransformerBuildItem(classInfo.name().toString(), enhancer));
+            typeParameters.addAll(resolveTypeParameters(classInfo.name(), baseType.dotName(), index.getIndex()));
         }
 
-        MetamodelInfo<EntityModel<EntityField>> modelInfo = entityEnhancer.getModelInfo();
-        if (modelInfo.hasEntities()) {
-            PanacheFieldAccessEnhancer panacheFieldAccessEnhancer = new PanacheFieldAccessEnhancer(modelInfo);
-            for (ClassInfo classInfo : applicationIndex.getIndex().getKnownClasses()) {
-                String className = classInfo.name().toString();
-                if (!modelClasses.contains(className)) {
-                    transformers.produce(new BytecodeTransformerBuildItem(className, panacheFieldAccessEnhancer));
-                }
+        for (Type parameterType : typeParameters) {
+            // Register for reflection the type parameters of the repository: this should be the entity class and the ID class
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, parameterType.name().toString()));
+        }
+    }
+
+    @BuildStep
+    List<AdditionalJpaModelBuildItem> produceModel() {
+        // only useful for the index resolution: hibernate will register it to be transformed, but BuildMojo
+        // only transforms classes from the application jar, so we do our own transforming
+        return Collections.singletonList(new AdditionalJpaModelBuildItem(PanacheEntity.class));
+    }
+
+    @BuildStep
+    ValidationPhaseBuildItem.ValidationErrorBuildItem validate(ValidationPhaseBuildItem validationPhase,
+            CombinedIndexBuildItem index) throws BuildException {
+        // we verify that no ID fields are defined (via @Id) when extending PanacheEntity
+        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(DOTNAME_ID)) {
+            ClassInfo info = JandexUtil.getEnclosingClass(annotationInstance);
+            if (JandexUtil.isSubclassOf(index.getIndex(), info, DOTNAME_PANACHE_ENTITY)) {
+                BuildException be = new BuildException("You provide a JPA identifier via @Id inside '" + info.name() +
+                        "' but one is already provided by PanacheEntity, " +
+                        "your class should extend PanacheEntityBase instead, or use the id provided by PanacheEntity",
+                        Collections.emptyList());
+                return new ValidationPhaseBuildItem.ValidationErrorBuildItem(be);
             }
         }
+        return null;
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DefaultPanacheEntityToStringTest.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DefaultPanacheEntityToStringTest.java
deleted file mode 100644
index 9e6ad928450e4..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DefaultPanacheEntityToStringTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity;
-
-public class DefaultPanacheEntityToStringTest {
-
-    @Test
-    public void testDefaultToStringMethod() {
-        MyPanacheEntity myPanacheEntityWithId = new MyPanacheEntity(2912l);
-        assertEquals("MyPanacheEntity<2912>", myPanacheEntityWithId.toString());
-
-        MyPanacheEntity myPanacheEntityWithNullId = new MyPanacheEntity(null);
-        assertEquals("MyPanacheEntity<null>", myPanacheEntityWithNullId.toString());
-    }
-
-    static class MyPanacheEntity extends PanacheEntity {
-        public MyPanacheEntity(Long id) {
-            this.setId(id);
-        }
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/NoConfigTest.java b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/NoConfigTest.java
deleted file mode 100644
index b5c290ed30370..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/NoConfigTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-
-public class NoConfigTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
-            () -> ShrinkWrap.create(JavaArchive.class));
-
-    @Test
-    public void testNoConfig() {
-        // we should be able to start the application, even with no configuration at all
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DefaultPanacheEntityToStringTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DefaultPanacheEntityToStringTest.kt
new file mode 100644
index 0000000000000..05f2a5a63abf8
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DefaultPanacheEntityToStringTest.kt
@@ -0,0 +1,21 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test
+
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+class DefaultPanacheEntityToStringTest {
+    @Test
+    fun testDefaultToStringMethod() {
+        val myPanacheEntityWithId = MyPanacheEntity(2912L)
+        Assertions.assertEquals("MyPanacheEntity<2912>", myPanacheEntityWithId.toString())
+        val myPanacheEntityWithNullId = MyPanacheEntity(null)
+        Assertions.assertEquals("MyPanacheEntity<null>", myPanacheEntityWithNullId.toString())
+    }
+
+    internal class MyPanacheEntity(id: Long?) : PanacheEntity() {
+        init {
+            this.id = id
+        }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt
new file mode 100644
index 0000000000000..95de85ad86e6f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntity.kt
@@ -0,0 +1,9 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test
+
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
+import javax.persistence.Id
+
+class DuplicateIdEntity : PanacheEntity() {
+    @Id
+    var customId: String? = null
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt
new file mode 100644
index 0000000000000..126c527efd55e
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/DuplicateIdEntityTest.kt
@@ -0,0 +1,27 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test
+
+import io.quarkus.builder.BuildException
+import io.quarkus.test.QuarkusUnitTest
+import org.jboss.shrinkwrap.api.spec.JavaArchive
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
+
+class DuplicateIdEntityTest {
+    @Test
+    fun shouldThrow() {
+        Assertions.fail<Any>("A BuildException should have been thrown due to duplicate entity ID")
+    }
+
+    companion object {
+        @RegisterExtension
+        @JvmField
+        var runner = QuarkusUnitTest()
+                .setExpectedException(BuildException::class.java)
+                .setArchiveProducer {
+                    ShrinkWrap.create(JavaArchive::class.java)
+                            .addClasses(DuplicateIdEntity::class.java)
+                }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt
new file mode 100644
index 0000000000000..a0a7ee0180d10
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/NoConfigTest.kt
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test
+
+import io.quarkus.test.QuarkusUnitTest
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.spec.JavaArchive
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
+
+class NoConfigTest {
+    @Test
+    fun testNoConfig() {
+        // we should be able to start the application, even with no configuration at all
+    }
+
+    companion object {
+        @RegisterExtension
+        @JvmField
+        val config = QuarkusUnitTest().setArchiveProducer { ShrinkWrap.create(JavaArchive::class.java) }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt
new file mode 100644
index 0000000000000..ed1df30f9b7b2
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.kt
@@ -0,0 +1,38 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu
+
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first.FirstEntity
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second.SecondEntity
+import io.quarkus.test.QuarkusUnitTest
+import io.restassured.RestAssured
+import org.hamcrest.Matchers
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.spec.JavaArchive
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
+
+class DefaultPersistenceUnitConfigTest {
+    @Test
+    fun panacheOperations() {
+        /**
+         * First entity operations
+         */
+        RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
+        RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
+        /**
+         * second entity operations
+         */
+        RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
+        RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
+    }
+
+    companion object {
+        @RegisterExtension
+        @JvmField
+        var runner = QuarkusUnitTest()
+                .setArchiveProducer {
+                    ShrinkWrap.create(JavaArchive::class.java)
+                            .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
+                            .addAsResource("application.properties")
+                }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt
new file mode 100644
index 0000000000000..709925e92ec58
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.kt
@@ -0,0 +1,45 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu
+
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first.FirstEntity
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second.SecondEntity
+import io.quarkus.test.QuarkusUnitTest
+import io.restassured.RestAssured
+import org.hamcrest.Matchers
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.asset.StringAsset
+import org.jboss.shrinkwrap.api.spec.JavaArchive
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
+
+class DefaultPersistenceUnitFileTest {
+    @Test
+    fun panacheOperations() {
+        /**
+         * First entity operations
+         */
+        RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
+        RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
+        /**
+         * second entity operations
+         */
+        RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
+        RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
+    }
+
+    companion object {
+        @RegisterExtension
+        @JvmField
+        var runner = QuarkusUnitTest()
+                .setArchiveProducer {
+                    ShrinkWrap.create(JavaArchive::class.java)
+                            .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
+                            .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml")
+                            .addAsResource(StringAsset(
+                                    """
+                    quarkus.datasource.db-kind=h2
+                    quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+                    """.trimIndent()),
+                                    "application.properties")
+                }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt
new file mode 100644
index 0000000000000..b6eafd19511db
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.kt
@@ -0,0 +1,29 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu
+
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first.FirstEntity
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second.SecondEntity
+import io.quarkus.test.QuarkusUnitTest
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.spec.JavaArchive
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
+
+class ErroneousPersistenceUnitConfigTest {
+    @Test
+    fun shouldNotReachHere() {
+        Assertions.fail<Any>()
+    }
+
+    companion object {
+        @RegisterExtension
+        @JvmField
+        var runner = QuarkusUnitTest()
+                .setExpectedException(IllegalStateException::class.java)
+                .setArchiveProducer {
+                    ShrinkWrap.create(JavaArchive::class.java)
+                            .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
+                            .addAsResource("application-erroneous-multiple-persistence-units.properties", "application.properties")
+                }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt
new file mode 100644
index 0000000000000..de835e2076c3c
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.kt
@@ -0,0 +1,38 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu
+
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first.FirstEntity
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second.SecondEntity
+import io.quarkus.test.QuarkusUnitTest
+import io.restassured.RestAssured
+import org.hamcrest.Matchers
+import org.jboss.shrinkwrap.api.ShrinkWrap
+import org.jboss.shrinkwrap.api.spec.JavaArchive
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.RegisterExtension
+
+class MultiplePersistenceUnitConfigTest {
+    @Test
+    fun panacheOperations() {
+        /**
+         * First entity operations
+         */
+        RestAssured.`when`()["/persistence-unit/first/name-1"].then().body(Matchers.`is`("name-1"))
+        RestAssured.`when`()["/persistence-unit/first/name-2"].then().body(Matchers.`is`("name-2"))
+        /**
+         * second entity operations
+         */
+        RestAssured.`when`()["/persistence-unit/second/name-1"].then().body(Matchers.`is`("name-1"))
+        RestAssured.`when`()["/persistence-unit/second/name-2"].then().body(Matchers.`is`("name-2"))
+    }
+
+    companion object {
+        @RegisterExtension
+        @JvmField
+        var runner = QuarkusUnitTest()
+                .setArchiveProducer {
+                    ShrinkWrap.create(JavaArchive::class.java)
+                            .addClasses(FirstEntity::class.java, SecondEntity::class.java, PanacheTestResource::class.java)
+                            .addAsResource("application-multiple-persistence-units.properties", "application.properties")
+                }
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt
new file mode 100644
index 0000000000000..8d871527c1481
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/PanacheTestResource.kt
@@ -0,0 +1,35 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu
+
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first.FirstEntity
+import io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second.SecondEntity
+import javax.transaction.Transactional
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/persistence-unit")
+class PanacheTestResource {
+    @GET
+    @Path("/first/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    fun createWithFirstPuAndReturnCount(@PathParam("name") name: String?): String? {
+        val entity = FirstEntity()
+        entity.name = name
+        entity.persistAndFlush()
+        return name
+    }
+
+    @GET
+    @Path("/second/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    fun createWithSecondPUAndReturnCount(@PathParam("name") name: String?): String? {
+        val entity = SecondEntity()
+        entity.name = name
+        entity.persistAndFlush()
+        return name
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt
new file mode 100644
index 0000000000000..0f6d2488bf018
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/first/FirstEntity.kt
@@ -0,0 +1,9 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first
+
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
+import javax.persistence.Entity
+
+@Entity
+class FirstEntity : PanacheEntity() {
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt
new file mode 100644
index 0000000000000..94cbff744517e
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/deployment/test/multiple_pu/second/SecondEntity.kt
@@ -0,0 +1,9 @@
+package io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second
+
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity
+import javax.persistence.Entity
+
+@Entity
+class SecondEntity : PanacheEntity() {
+    var name: String? = null
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/META-INF/some-persistence.xml b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/META-INF/some-persistence.xml
new file mode 100644
index 0000000000000..9a8b9b174af45
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/META-INF/some-persistence.xml
@@ -0,0 +1,17 @@
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+             version="2.1">
+
+    <persistence-unit name="templatePU" transaction-type="JTA">
+
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class, hbm"/>
+
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+        </properties>
+
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
new file mode 100644
index 0000000000000..f465d9f160f05
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
@@ -0,0 +1,15 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.second.db-kind=h2
+quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first
+
+quarkus.hibernate-orm."second".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."second".database.generation=drop-and-create
+quarkus.hibernate-orm."second".datasource=second
+quarkus.hibernate-orm."second".packages=io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first
+        
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application-multiple-persistence-units.properties
new file mode 100644
index 0000000000000..f6e8e9c73ad60
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -0,0 +1,14 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.second.db-kind=h2
+quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.first
+
+quarkus.hibernate-orm."second".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."second".database.generation=drop-and-create
+quarkus.hibernate-orm."second".datasource=second
+quarkus.hibernate-orm."second".packages=io.quarkus.hibernate.orm.panache.kotlin.deployment.test.multiple_pu.second
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application.properties b/extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application.properties
similarity index 100%
rename from extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application.properties
rename to extensions/panache/hibernate-orm-panache-kotlin/deployment/src/test/resources/application.properties
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/pom.xml
index 878e2ec39741e..ae006308965df 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-kotlin/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-	<relativePath>../../../build-parent/pom.xml</relativePath>
+	<relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
index 7b468b79fa036..1089aa8dd345d 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-hibernate-orm-panache-kotlin-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,6 +20,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm-panache-common</artifactId>
@@ -43,10 +46,6 @@
             <artifactId>quarkus-jackson</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -63,6 +62,7 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>
             <version>${kotlin.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/JpaOperations.java b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/JpaOperations.java
deleted file mode 100644
index c4128d3f1a5f6..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/JpaOperations.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package io.quarkus.hibernate.orm.panache.kotlin.runtime;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.transaction.TransactionManager;
-
-import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheQuery;
-import io.quarkus.panache.common.Parameters;
-import io.quarkus.panache.common.Sort;
-
-public class JpaOperations {
-
-    private static final KotlinJpaOperations delegate = new KotlinJpaOperations();
-
-    public static Query bindParameters(Query query, Object[] params) {
-        return AbstractJpaOperations.bindParameters(query, params);
-    }
-
-    //
-    // Instance methods
-
-    public static Query bindParameters(Query query, Map<String, Object> params) {
-        return AbstractJpaOperations.bindParameters(query, params);
-    }
-
-    public static long count(Class<?> entityClass) {
-        return delegate.count(entityClass);
-    }
-
-    public static long count(Class<?> entityClass, String query, Object... params) {
-        return delegate.count(entityClass, query, params);
-    }
-
-    public static long count(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.count(entityClass, query, params);
-    }
-
-    public static long count(Class<?> entityClass, String query, Parameters params) {
-        return delegate.count(entityClass, query, params);
-    }
-
-    static String createFindQuery(Class<?> entityClass, String query, int paramCount) {
-        return delegate.createFindQuery(entityClass, query, paramCount);
-    }
-
-    public static void delete(Object entity) {
-        delegate.delete(entity);
-    }
-
-    public static long delete(Class<?> entityClass, String query, Object... params) {
-        return delegate.delete(entityClass, query, params);
-    }
-
-    //
-    // Private stuff
-
-    public static long delete(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.delete(entityClass, query, params);
-    }
-
-    public static long delete(Class<?> entityClass, String query, Parameters params) {
-        return delegate.delete(entityClass, query, params);
-    }
-
-    public static long deleteAll(Class<?> entityClass) {
-        return delegate.deleteAll(entityClass);
-    }
-
-    public static boolean deleteById(Class<?> entityClass, Object id) {
-        return delegate.deleteById(entityClass, id);
-    }
-
-    public static int executeUpdate(String query, Object... params) {
-        return delegate.executeUpdate(query, params);
-    }
-
-    public static int executeUpdate(String query, Map<String, Object> params) {
-        return delegate.executeUpdate(query, params);
-    }
-
-    public static int executeUpdate(Class<?> entityClass, String query, Object... params) {
-        return delegate.executeUpdate(entityClass, query, params);
-    }
-
-    public static int executeUpdate(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.executeUpdate(entityClass, query, params);
-    }
-
-    public static boolean exists(Class<?> entityClass) {
-        return delegate.exists(entityClass);
-    }
-
-    public static boolean exists(Class<?> entityClass, String query, Object... params) {
-        return delegate.exists(entityClass, query, params);
-    }
-
-    public static boolean exists(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.exists(entityClass, query, params);
-    }
-
-    public static boolean exists(Class<?> entityClass, String query, Parameters params) {
-        return delegate.exists(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Object... params) {
-        return delegate.find(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return delegate.find(entityClass, query, sort, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.find(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return delegate.find(entityClass, query, sort, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Parameters params) {
-        return delegate.find(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return delegate.find(entityClass, query, sort, params);
-    }
-
-    public static PanacheQuery<?> findAll(Class<?> entityClass) {
-        return delegate.findAll(entityClass);
-    }
-
-    public static PanacheQuery<?> findAll(Class<?> entityClass, Sort sort) {
-        return delegate.findAll(entityClass, sort);
-    }
-
-    public static Object findById(Class<?> entityClass, Object id) {
-        return delegate.findById(entityClass, id);
-    }
-
-    public static Object findById(Class<?> entityClass, Object id, LockModeType lockModeType) {
-        return delegate.findById(entityClass, id, lockModeType);
-    }
-
-    public static Optional<?> findByIdOptional(Class<?> entityClass, Object id) {
-        return delegate.findByIdOptional(entityClass, id);
-    }
-
-    public static Optional<?> findByIdOptional(Class<?> entityClass, Object id, LockModeType lockModeType) {
-        return delegate.findByIdOptional(entityClass, id, lockModeType);
-    }
-
-    public static void flush() {
-        delegate.flush();
-    }
-
-    public static EntityManager getEntityManager() {
-        return delegate.getEntityManager();
-    }
-
-    public static TransactionManager getTransactionManager() {
-        return delegate.getTransactionManager();
-    }
-
-    public static IllegalStateException implementationInjectionMissing() {
-        return delegate.implementationInjectionMissing();
-    }
-
-    public static boolean isPersistent(Object entity) {
-        return delegate.isPersistent(entity);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Object... params) {
-        return delegate.list(entityClass, query, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return delegate.list(entityClass, query, sort, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.list(entityClass, query, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return delegate.list(entityClass, query, sort, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Parameters params) {
-        return delegate.list(entityClass, query, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return delegate.list(entityClass, query, sort, params);
-    }
-
-    public static List<?> listAll(Class<?> entityClass) {
-        return delegate.listAll(entityClass);
-    }
-
-    public static List<?> listAll(Class<?> entityClass, Sort sort) {
-        return delegate.listAll(entityClass, sort);
-    }
-
-    static int paramCount(Object[] params) {
-        return delegate.paramCount(params);
-    }
-
-    static int paramCount(Map<String, Object> params) {
-        return delegate.paramCount(params);
-    }
-
-    public static void persist(Object entity) {
-        delegate.persist(entity);
-    }
-
-    public static void persist(EntityManager em, Object entity) {
-        delegate.persist(em, entity);
-    }
-
-    public static void persist(Iterable<?> entities) {
-        delegate.persist(entities);
-    }
-
-    public static void persist(Object firstEntity, Object... entities) {
-        delegate.persist(firstEntity, entities);
-    }
-
-    public static void persist(Stream<?> entities) {
-        delegate.persist(entities);
-    }
-
-    public static void setRollbackOnly() {
-        delegate.setRollbackOnly();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Object... params) {
-        return delegate.stream(entityClass, query, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return delegate.stream(entityClass, query, sort, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.stream(entityClass, query, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return delegate.stream(entityClass, query, sort, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Parameters params) {
-        return delegate.stream(entityClass, query, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return delegate.stream(entityClass, query, sort, params);
-    }
-
-    public static Stream<?> streamAll(Class<?> entityClass) {
-        return delegate.streamAll(entityClass);
-    }
-
-    public static Stream<?> streamAll(Class<?> entityClass, Sort sort) {
-        return delegate.streamAll(entityClass, sort);
-    }
-
-    public static String toOrderBy(Sort sort) {
-        return delegate.toOrderBy(sort);
-    }
-
-    public static int update(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.update(entityClass, query, params);
-    }
-
-    public static int update(Class<?> entityClass, String query, Parameters params) {
-        return delegate.update(entityClass, query, params);
-    }
-
-    public static int update(Class<?> entityClass, String query, Object... params) {
-        return delegate.update(entityClass, query, params);
-    }
-
-    private static class KotlinJpaOperations extends AbstractJpaOperations<PanacheQueryImpl<?>> {
-
-        @Override
-        protected PanacheQueryImpl<?> createPanacheQuery(EntityManager em, String query, String orderBy,
-                Object paramsArrayOrMap) {
-            return new PanacheQueryImpl<>(em, query, orderBy, paramsArrayOrMap);
-        }
-
-        @Override
-        protected List<?> list(PanacheQueryImpl<?> query) {
-            return query.list();
-        }
-
-        @Override
-        protected Stream<?> stream(PanacheQueryImpl<?> query) {
-            return query.stream();
-        }
-
-    }
-
-}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.java b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.java
new file mode 100644
index 0000000000000..0ca09c9ce78e0
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/KotlinJpaOperations.java
@@ -0,0 +1,31 @@
+package io.quarkus.hibernate.orm.panache.kotlin.runtime;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import javax.persistence.EntityManager;
+
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
+
+public class KotlinJpaOperations extends AbstractJpaOperations<PanacheQueryImpl<?>> {
+    /**
+     * Provides the default implementations for quarkus to wire up. Should not be used by third party developers.
+     */
+    public static final KotlinJpaOperations INSTANCE = new KotlinJpaOperations();
+
+    @Override
+    protected PanacheQueryImpl<?> createPanacheQuery(EntityManager em, String query, String orderBy,
+            Object paramsArrayOrMap) {
+        return new PanacheQueryImpl<>(em, query, orderBy, paramsArrayOrMap);
+    }
+
+    @Override
+    public List<?> list(PanacheQueryImpl<?> query) {
+        return query.list();
+    }
+
+    @Override
+    public Stream<?> stream(PanacheQueryImpl<?> query) {
+        return query.stream();
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheKotlinHibernateOrmRecorder.java b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheKotlinHibernateOrmRecorder.java
new file mode 100644
index 0000000000000..a51fcc639ffe0
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheKotlinHibernateOrmRecorder.java
@@ -0,0 +1,13 @@
+package io.quarkus.hibernate.orm.panache.kotlin.runtime;
+
+import java.util.Map;
+
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class PanacheKotlinHibernateOrmRecorder {
+    public void setEntityToPersistenceUnit(Map<String, String> entityToPersistenceUnit) {
+        AbstractJpaOperations.setEntityToPersistenceUnit(entityToPersistenceUnit);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.java b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.java
index e9866f8399c1a..edc6e1ff7bbf0 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.java
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/java/io/quarkus/hibernate/orm/panache/kotlin/runtime/PanacheQueryImpl.java
@@ -20,7 +20,7 @@ public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {
     private CommonPanacheQueryImpl<Entity> delegate;
 
     PanacheQueryImpl(EntityManager em, String query, String orderBy, Object paramsArrayOrMap) {
-        this.delegate = new CommonPanacheQueryImpl<Entity>(em, query, orderBy, paramsArrayOrMap);
+        this.delegate = new CommonPanacheQueryImpl<>(em, query, orderBy, paramsArrayOrMap);
     }
 
     protected PanacheQueryImpl(CommonPanacheQueryImpl<Entity> delegate) {
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/Panache.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/Panache.kt
deleted file mode 100644
index 0f5262c531c19..0000000000000
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/Panache.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.quarkus.hibernate.orm.panache.kotlin
-
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations
-
-internal fun injectionMissing(): Nothing = throw JpaOperations.implementationInjectionMissing()
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt
index c230798d60e58..af7a91e84c20f 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheCompanion.kt
@@ -1,6 +1,8 @@
 package io.quarkus.hibernate.orm.panache.kotlin
 
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations.implementationInjectionMissing
+import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.INSTANCE
 import io.quarkus.panache.common.Parameters
 import io.quarkus.panache.common.Sort
 import io.quarkus.panache.common.impl.GenerateBridge
@@ -13,15 +15,21 @@ import javax.persistence.LockModeType
  *
  * @param Entity the entity type
  */
-interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
+interface PanacheCompanion<Entity : PanacheEntityBase>: PanacheCompanionBase<Entity, Long>
 
+/**
+ * Defines methods to be used via the companion objects of entities.
+ *
+ * @param Entity the entity type
+ */
+interface PanacheCompanionBase<Entity : PanacheEntityBase, Id: Any> {
     // Operations
     /**
      * Returns the default [EntityManager] for extra operations (eg. CriteriaQueries)
      *
      * @return the default [EntityManager]
      */
-    fun entityManager(): EntityManager = JpaOperations.getEntityManager()
+    fun entityManager(): EntityManager = AbstractJpaOperations.getEntityManager()
 
     /**
      * Find an entity of this type by ID.
@@ -30,7 +38,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @return the entity found, or `null` if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    fun findById(id: Id): Entity? = injectionMissing()
+    fun findById(id: Id): Entity? = throw implementationInjectionMissing()
 
     /**
      * Find an entity of this type by ID and lock it.
@@ -40,7 +48,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @return the entity found, or `null` if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    fun findById(id: Id, lockModeType: LockModeType): Entity? = injectionMissing()
+    fun findById(id: Id, lockModeType: LockModeType): Entity? = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query, with optional indexed parameters.
@@ -53,10 +61,10 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun find(query: String, vararg params: Any): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, vararg params: Any): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
-     * Find entities using a query and the given sort options, with optional indexed parameters.
+     * Find entities using a query and the given sort options with optional indexed parameters.
      *
      * @param query a query string
      * @param sort the sort strategy to use
@@ -67,7 +75,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, vararg params: Any): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, sort: Sort, vararg params: Any): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query, with named parameters.
@@ -80,7 +88,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun find(query: String, params: Map<String, Any>): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, params: Map<String, Any>): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query and the given sort options, with named parameters.
@@ -94,7 +102,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, params: Map<String, Any>): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, sort: Sort, params: Map<String, Any>): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query, with named parameters.
@@ -107,7 +115,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun find(query: String, params: Parameters): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, params: Parameters): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query and the given sort options, with named parameters.
@@ -121,7 +129,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, params: Parameters): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, sort: Sort, params: Parameters): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type.
@@ -132,7 +140,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.streamAll]
      */
     @GenerateBridge
-    fun findAll(): PanacheQuery<Entity> = injectionMissing()
+    fun findAll(): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type, in the given order.
@@ -144,7 +152,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.streamAll]
      */
     @GenerateBridge
-    fun findAll(sort: Sort): PanacheQuery<Entity> = injectionMissing()
+    fun findAll(sort: Sort): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with optional indexed parameters.
@@ -158,7 +166,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun list(query: String, vararg params: Any): List<Entity> = injectionMissing()
+    fun list(query: String, vararg params: Any): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with optional indexed parameters.
@@ -173,7 +181,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, vararg params: Any): List<Entity> = injectionMissing()
+    fun list(query: String, sort: Sort, vararg params: Any): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -187,7 +195,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun list(query: String, params: Map<String, Any>): List<Entity> = injectionMissing()
+    fun list(query: String, params: Map<String, Any>): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -202,7 +210,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, params: Map<String, Any>): List<Entity> = injectionMissing()
+    fun list(query: String, sort: Sort, params: Map<String, Any>): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -216,7 +224,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun list(query: String, params: Parameters): List<Entity> = injectionMissing()
+    fun list(query: String, params: Parameters): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -231,7 +239,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, params: Parameters): List<Entity> = injectionMissing()
+    fun list(query: String, sort: Sort, params: Parameters): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type.
@@ -243,7 +251,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.streamAll]
      */
     @GenerateBridge
-    fun listAll(): List<Entity> = injectionMissing()
+    fun listAll(): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type, in the given order.
@@ -256,7 +264,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.streamAll]
      */
     @GenerateBridge
-    fun listAll(sort: Sort): List<Entity> = injectionMissing()
+    fun listAll(sort: Sort): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with optional indexed parameters.
@@ -272,7 +280,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.list]
      */
     @GenerateBridge
-    fun stream(query: String, vararg params: Any): Stream<Entity> = injectionMissing()
+    fun stream(query: String, vararg params: Any): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with optional indexed parameters.
@@ -289,7 +297,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, vararg params: Any): Stream<Entity> = injectionMissing()
+    fun stream(query: String, sort: Sort, vararg params: Any): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -305,7 +313,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.list]
      */
     @GenerateBridge
-    fun stream(query: String, params: Map<String, Any>): Stream<Entity> = injectionMissing()
+    fun stream(query: String, params: Map<String, Any>): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -322,7 +330,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, params: Map<String, Any>): Stream<Entity> = injectionMissing()
+    fun stream(query: String, sort: Sort, params: Map<String, Any>): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -338,7 +346,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.list]
      */
     @GenerateBridge
-    fun stream(query: String, params: Parameters): Stream<Entity> = injectionMissing()
+    fun stream(query: String, params: Parameters): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -355,7 +363,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, params: Parameters): Stream<Entity> = injectionMissing()
+    fun stream(query: String, sort: Sort, params: Parameters): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type.
@@ -369,7 +377,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.listAll]
      */
     @GenerateBridge
-    fun streamAll(): Stream<Entity> = injectionMissing()
+    fun streamAll(): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type, in the given order.
@@ -384,7 +392,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.listAll]
      */
     @GenerateBridge
-    fun streamAll(sort: Sort): Stream<Entity> = injectionMissing()
+    fun streamAll(sort: Sort): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity in the database.
@@ -393,7 +401,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.count]
      */
     @GenerateBridge
-    fun count(): Long = injectionMissing()
+    fun count(): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with optional indexed parameters.
@@ -404,7 +412,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.count]
      */
     @GenerateBridge
-    fun count(query: String, vararg params: Any): Long = injectionMissing()
+    fun count(query: String, vararg params: Any): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with named parameters.
@@ -415,7 +423,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.count]
      */
     @GenerateBridge
-    fun count(query: String, params: Map<String, Any>): Long = injectionMissing()
+    fun count(query: String, params: Map<String, Any>): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with named parameters.
@@ -426,20 +434,26 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.count]
      */
     @GenerateBridge
-    fun count(query: String, params: Parameters): Long = injectionMissing()
+    fun count(query: String, params: Parameters): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type from the database.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @return the number of entities deleted.
      * @see [PanacheCompanion.delete]
      */
     @GenerateBridge
-    fun deleteAll(): Long = injectionMissing()
+    fun deleteAll(): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with optional indexed parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @param query a query string
      * @param params optional sequence of indexed parameters
      * @return the number of entities deleted.
@@ -447,11 +461,14 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.delete]
      */
     @GenerateBridge
-    fun delete(query: String, vararg params: Any): Long = injectionMissing()
+    fun delete(query: String, vararg params: Any): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @param query a query string
      * @param params [Map] of named parameters
      * @return the number of entities deleted.
@@ -459,11 +476,14 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.delete]
      */
     @GenerateBridge
-    fun delete(query: String, params: Map<String, Any>): Long = injectionMissing()
+    fun delete(query: String, params: Map<String, Any>): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @param query a query string
      * @param params Parameters of named parameters
      * @return the number of entities deleted.
@@ -471,7 +491,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.delete]
      */
     @GenerateBridge
-    fun delete(query: String, params: Parameters): Long = injectionMissing()
+    fun delete(query: String, params: Parameters): Long = throw implementationInjectionMissing()
 
     /**
      * Delete an entity of this type by ID.
@@ -480,7 +500,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @return false if the entity was not deleted (not found).
      */
     @GenerateBridge
-    fun deleteById(id: Id): Boolean = throw JpaOperations.implementationInjectionMissing()
+    fun deleteById(id: Id): Boolean = throw implementationInjectionMissing()
 
     /**
      * Persist all given entities.
@@ -489,7 +509,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.persist]
      */
     fun persist(entities: Iterable<Entity>) {
-        JpaOperations.persist(entities)
+        INSTANCE.persist(entities)
     }
 
     /**
@@ -499,7 +519,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.persist]
      */
     fun persist(entities: Stream<Entity>) {
-        JpaOperations.persist(entities)
+        INSTANCE.persist(entities)
     }
 
     /**
@@ -509,7 +529,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.persist]
      */
     fun persist(firstEntity: Entity, vararg entities: Entity) {
-        JpaOperations.persist(firstEntity, *entities)
+        INSTANCE.persist(firstEntity, *entities)
     }
 
     /**
@@ -521,7 +541,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.update]
      */
     @GenerateBridge
-    fun update(query: String, vararg params: Any): Int = injectionMissing()
+    fun update(query: String, vararg params: Any): Int = throw implementationInjectionMissing()
 
     /**
      * Update all entities of this type matching the given query, with named parameters.
@@ -532,7 +552,7 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.update]
      */
     @GenerateBridge
-    fun update(query: String, params: Map<String, Any>): Int = injectionMissing()
+    fun update(query: String, params: Map<String, Any>): Int = throw implementationInjectionMissing()
 
     /**
      * Update all entities of this type matching the given query, with named parameters.
@@ -543,5 +563,5 @@ interface PanacheCompanion<Entity : PanacheEntityBase, Id: Any> {
      * @see [PanacheCompanion.update]
      */
     @GenerateBridge
-    fun update(query: String, params: Parameters): Int = injectionMissing()
+    fun update(query: String, params: Parameters): Int = throw implementationInjectionMissing()
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt
index aa014c4196439..36d3aa7f8e88a 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheEntityBase.kt
@@ -1,7 +1,8 @@
 package io.quarkus.hibernate.orm.panache.kotlin
 
 import com.fasterxml.jackson.annotation.JsonIgnore
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations
+import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.INSTANCE
 import javax.json.bind.annotation.JsonbTransient
 import javax.persistence.EntityManager
 
@@ -14,7 +15,6 @@ import javax.persistence.EntityManager
  * @see PanacheEntity
  */
 interface PanacheEntityBase {
-
     // Operations
 
     /**
@@ -24,7 +24,7 @@ interface PanacheEntityBase {
      */
     @JsonbTransient
     @JsonIgnore
-    fun getEntityManager(): EntityManager = JpaOperations.getEntityManager()
+    fun getEntityManager(): EntityManager = AbstractJpaOperations.getEntityManager(this.javaClass)
 
     /**
      * Returns true if this entity is persistent in the database. If yes, all modifications to
@@ -35,7 +35,7 @@ interface PanacheEntityBase {
      */
     @JsonbTransient
     @JsonIgnore
-    fun isPersistent(): Boolean = JpaOperations.isPersistent(this)
+    fun isPersistent(): Boolean = INSTANCE.isPersistent(this)
 
     /**
      * Persist this entity in the database, if not already persisted. This will set your ID field if it is not already set.
@@ -45,7 +45,7 @@ interface PanacheEntityBase {
      * @see PanacheEntityBase.persistAndFlush
      */
     fun persist() {
-        JpaOperations.persist(this)
+        INSTANCE.persist(this)
     }
 
     /**
@@ -57,8 +57,8 @@ interface PanacheEntityBase {
      * @see [PanacheEntityBase.persist]
      */
     fun persistAndFlush() {
-        JpaOperations.persist(this)
-        JpaOperations.flush()
+        INSTANCE.persist(this)
+        INSTANCE.flush(this)
     }
 
     /**
@@ -68,13 +68,13 @@ interface PanacheEntityBase {
      * @see [PanacheCompanion.deleteAll]
      */
     fun delete() {
-        JpaOperations.delete(this)
+        INSTANCE.delete(this)
     }
 
     /**
      * Flushes all pending changes to the database.
      */
     fun flush() {
-        JpaOperations.flush()
+        getEntityManager().flush()
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt
index e2995b7c8c2e6..c0e4e12b00921 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheQuery.kt
@@ -239,5 +239,5 @@ interface PanacheQuery<Entity: Any> {
      * @throws NonUniqueResultException if there are more than one result
      * @see [PanacheQuery.firstResult]
      */
-    fun singleResult(): Entity?
+    fun singleResult(): Entity
 }
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
index 05b5d7ce3c4ad..b1a6feef20278 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/main/kotlin/io/quarkus/hibernate/orm/panache/kotlin/PanacheRepositoryBase.kt
@@ -1,12 +1,15 @@
 package io.quarkus.hibernate.orm.panache.kotlin
 
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations.implementationInjectionMissing
+import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.INSTANCE
 import io.quarkus.panache.common.Parameters
 import io.quarkus.panache.common.Sort
 import io.quarkus.panache.common.impl.GenerateBridge
 import java.util.stream.Stream
 import javax.persistence.EntityManager
 import javax.persistence.LockModeType
+import kotlin.reflect.KClass
 
 /**
  * Represents a Repository for a specific type of entity `Entity`, with an ID type of `Id`. Implementing this interface
@@ -22,7 +25,14 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      *
      * @return the default [EntityManager]
      */
-    fun getEntityManager(): EntityManager = JpaOperations.getEntityManager()
+    fun getEntityManager(): EntityManager = AbstractJpaOperations.getEntityManager()
+
+    /**
+     * Returns the [EntityManager] tied to the given class for extra operations (eg. CriteriaQueries)
+     *
+     * @return the default [EntityManager]
+     */
+    fun getEntityManager(clazz: KClass<Any>): EntityManager = AbstractJpaOperations.getEntityManager(clazz.java)
 
     /**
      * Persist the given entity in the database, if not already persisted.
@@ -32,7 +42,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.persist]
      */
     fun persist(entity: Entity) {
-        JpaOperations.persist(entity)
+        INSTANCE.persist(entity)
     }
 
     /**
@@ -44,8 +54,8 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.persist]
      */
     fun persistAndFlush(entity: Entity) {
-        JpaOperations.persist(entity)
-        JpaOperations.flush()
+        INSTANCE.persist(entity)
+        INSTANCE.flush(entity)
     }
 
     /**
@@ -57,7 +67,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.deleteAll]
      */
     fun delete(entity: Entity) {
-        JpaOperations.delete(entity)
+        INSTANCE.delete(entity)
     }
 
     /**
@@ -68,13 +78,13 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @param entity the entity to check
      * @return true if the entity is persistent in the database.
      */
-    fun isPersistent(entity: Entity): Boolean = JpaOperations.isPersistent(entity)
+    fun isPersistent(entity: Entity): Boolean = INSTANCE.isPersistent(entity)
 
     /**
-     * Flushes all pending changes to the database.
+     * Flushes all pending changes to the database using the default EntityManager.
      */
     fun flush() {
-        JpaOperations.flush()
+        getEntityManager().flush()
     }
 
     /**
@@ -84,7 +94,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @return the entity found, or `null` if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    fun findById(id: Id): Entity? = injectionMissing()
+    fun findById(id: Id): Entity? = throw implementationInjectionMissing()
 
     /**
      * Find an entity of this type by ID and lock it.
@@ -94,7 +104,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @return the entity found, or `null` if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    fun findById(id: Id, lockModeType: LockModeType): Entity? = injectionMissing()
+    fun findById(id: Id, lockModeType: LockModeType): Entity? = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query, with optional indexed parameters.
@@ -107,7 +117,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, vararg params: Any): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, vararg params: Any): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query and the given sort options, with optional indexed parameters.
@@ -121,7 +131,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, vararg params: Any): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, sort: Sort, vararg params: Any): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query, with named parameters.
@@ -134,7 +144,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, params: Map<String, Any>): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, params: Map<String, Any>): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query and the given sort options, with named parameters.
@@ -148,7 +158,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, params: Map<String, Any>): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, sort: Sort, params: Map<String, Any>): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query, with named parameters.
@@ -161,7 +171,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, params: Parameters): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, params: Parameters): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities using a query and the given sort options, with named parameters.
@@ -175,7 +185,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun find(query: String, sort: Sort, params: Parameters): PanacheQuery<Entity> = injectionMissing()
+    fun find(query: String, sort: Sort, params: Parameters): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type.
@@ -186,7 +196,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.streamAll]
      */
     @GenerateBridge
-    fun findAll(): PanacheQuery<Entity> = injectionMissing()
+    fun findAll(): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type, in the given order.
@@ -198,7 +208,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.streamAll]
      */
     @GenerateBridge
-    fun findAll(sort: Sort): PanacheQuery<Entity> = injectionMissing()
+    fun findAll(sort: Sort): PanacheQuery<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with optional indexed parameters.
@@ -212,7 +222,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, vararg params: Any): List<Entity> = injectionMissing()
+    fun list(query: String, vararg params: Any): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with optional indexed parameters.
@@ -227,7 +237,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, vararg params: Any): List<Entity> = injectionMissing()
+    fun list(query: String, sort: Sort, vararg params: Any): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -241,7 +251,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, params: Map<String, Any>): List<Entity> = injectionMissing()
+    fun list(query: String, params: Map<String, Any>): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -256,7 +266,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, params: Map<String, Any>): List<Entity> = injectionMissing()
+    fun list(query: String, sort: Sort, params: Map<String, Any>): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -270,7 +280,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, params: Parameters): List<Entity> = injectionMissing()
+    fun list(query: String, params: Parameters): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -285,7 +295,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.stream]
      */
     @GenerateBridge
-    fun list(query: String, sort: Sort, params: Parameters): List<Entity> = injectionMissing()
+    fun list(query: String, sort: Sort, params: Parameters): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type.
@@ -297,7 +307,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.streamAll]
      */
     @GenerateBridge
-    fun listAll(): List<Entity> = injectionMissing()
+    fun listAll(): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type, in the given order.
@@ -310,7 +320,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.streamAll]
      */
     @GenerateBridge
-    fun listAll(sort: Sort): List<Entity> = injectionMissing()
+    fun listAll(sort: Sort): List<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with optional indexed parameters.
@@ -326,7 +336,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, vararg params: Any): Stream<Entity> = injectionMissing()
+    fun stream(query: String, vararg params: Any): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with optional indexed parameters.
@@ -343,7 +353,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, vararg params: Any): Stream<Entity> = injectionMissing()
+    fun stream(query: String, sort: Sort, vararg params: Any): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -359,7 +369,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, params: Map<String, Any>): Stream<Entity> = injectionMissing()
+    fun stream(query: String, params: Map<String, Any>): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -376,7 +386,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, params: Map<String, Any>): Stream<Entity> = injectionMissing()
+    fun stream(query: String, sort: Sort, params: Map<String, Any>): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query, with named parameters.
@@ -392,7 +402,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, params: Parameters): Stream<Entity> = injectionMissing()
+    fun stream(query: String, params: Parameters): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find entities matching a query and the given sort options, with named parameters.
@@ -409,7 +419,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.list]
      */
     @GenerateBridge
-    fun stream(query: String, sort: Sort, params: Parameters): Stream<Entity> = injectionMissing()
+    fun stream(query: String, sort: Sort, params: Parameters): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type.
@@ -423,7 +433,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.listAll]
      */
     @GenerateBridge
-    fun streamAll(): Stream<Entity> = injectionMissing()
+    fun streamAll(): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Find all entities of this type, in the given order.
@@ -438,7 +448,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.listAll]
      */
     @GenerateBridge
-    fun streamAll(sort: Sort): Stream<Entity> = injectionMissing()
+    fun streamAll(sort: Sort): Stream<Entity> = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity in the database.
@@ -447,7 +457,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.count]
      */
     @GenerateBridge
-    fun count(): Long = injectionMissing()
+    fun count(): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with optional indexed parameters.
@@ -458,7 +468,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.count]
      */
     @GenerateBridge
-    fun count(query: String, vararg params: Any): Long = injectionMissing()
+    fun count(query: String, vararg params: Any): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with named parameters.
@@ -469,7 +479,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.count]
      */
     @GenerateBridge
-    fun count(query: String, params: Map<String, Any>): Long = injectionMissing()
+    fun count(query: String, params: Map<String, Any>): Long = throw implementationInjectionMissing()
 
     /**
      * Counts the number of this type of entity matching the given query, with named parameters.
@@ -480,20 +490,26 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.count]
      */
     @GenerateBridge
-    fun count(query: String, params: Parameters): Long = injectionMissing()
+    fun count(query: String, params: Parameters): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type from the database.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @return the number of entities deleted.
      * @see [PanacheRepositoryBase.delete]
      */
     @GenerateBridge
-    fun deleteAll(): Long = injectionMissing()
+    fun deleteAll(): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with optional indexed parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @param query a query string
      * @param params optional sequence of indexed parameters
      * @return the number of entities deleted.
@@ -501,11 +517,14 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.delete]
      */
     @GenerateBridge
-    fun delete(query: String, vararg params: Any): Long = injectionMissing()
+    fun delete(query: String, vararg params: Any): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @param query a query string
      * @param params [Map] of named parameters
      * @return the number of entities deleted.
@@ -513,11 +532,14 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.delete]
      */
     @GenerateBridge
-    fun delete(query: String, params: Map<String, Any>): Long = injectionMissing()
+    fun delete(query: String, params: Map<String, Any>): Long = throw implementationInjectionMissing()
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     *
      * @param query a query string
      * @param params Parameters of named parameters
      * @return the number of entities deleted.
@@ -525,7 +547,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.delete]
      */
     @GenerateBridge
-    fun delete(query: String, params: Parameters): Long = injectionMissing()
+    fun delete(query: String, params: Parameters): Long = throw implementationInjectionMissing()
 
     /**
      * Delete an entity of this type by ID.
@@ -534,7 +556,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @return false if the entity was not deleted (not found).
      */
     @GenerateBridge
-    fun deleteById(id: Id): Boolean = throw JpaOperations.implementationInjectionMissing()
+    fun deleteById(id: Id): Boolean = throw implementationInjectionMissing()
 
     /**
      * Persist all given entities.
@@ -543,17 +565,17 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.persist]
      */
     fun persist(entities: Iterable<Entity>) {
-        JpaOperations.persist(entities)
+        INSTANCE.persist(entities)
     }
 
     /**
      * Persist all given entities.
      *
      * @param entities the entities to persist
-     * @see [PanacheRepositoryBase.persist]
+     * @see [PanacfluheRepositoryBase.persist]
      */
     fun persist(entities: Stream<Entity>) {
-        JpaOperations.persist(entities)
+        INSTANCE.persist(entities)
     }
 
     /**
@@ -563,7 +585,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.persist]
      */
     fun persist(firstEntity: Entity, vararg entities: Entity) {
-        JpaOperations.persist(firstEntity, *entities)
+        INSTANCE.persist(firstEntity, *entities)
     }
 
     /**
@@ -575,7 +597,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.update]
      */
     @GenerateBridge
-    fun update(query: String, vararg params: Any): Int = injectionMissing()
+    fun update(query: String, vararg params: Any): Int = throw implementationInjectionMissing()
 
     /**
      * Update all entities of this type matching the given query, with named parameters.
@@ -586,7 +608,7 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.update]
      */
     @GenerateBridge
-    fun update(query: String, params: Map<String, Any>): Int = injectionMissing()
+    fun update(query: String, params: Map<String, Any>): Int = throw implementationInjectionMissing()
 
     /**
      * Update all entities of this type matching the given query, with named parameters.
@@ -597,5 +619,5 @@ interface PanacheRepositoryBase<Entity : Any, Id: Any> {
      * @see [PanacheRepositoryBase.update]
      */
     @GenerateBridge
-    fun update(query: String, params: Parameters): Int = injectionMissing()
+    fun update(query: String, params: Parameters): Int = throw implementationInjectionMissing()
 }
diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt
index fb6180841ea1a..57f7eee7c80a6 100644
--- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt
+++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt
@@ -128,8 +128,7 @@ class AnalogVisitor : ClassVisitor(Gizmo.ASM_API_VERSION) {
     }
 }
 
-class Method(val access: Int, val name: String, val type: String, val parameters: String/*,
-                      val signature: String?*/) {
+class Method(val access: Int, val name: String, val type: String, val parameters: String) {
     fun isStatic() = access.matches(Opcodes.ACC_STATIC)
 
     override fun toString(): String {
diff --git a/extensions/panache/hibernate-orm-panache/deployment/pom.xml b/extensions/panache/hibernate-orm-panache/deployment/pom.xml
index 569d6ddb7fbe9..0515accf26e94 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/deployment/pom.xml
@@ -6,32 +6,19 @@
         <artifactId>quarkus-hibernate-orm-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
     <name>Quarkus - Hibernate ORM with Panache - Deployment</name>
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm-panache-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-panache-common-deployment</artifactId>
+            <artifactId>quarkus-panache-hibernate-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -63,17 +50,17 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/JavaJpaTypeBundle.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/JavaJpaTypeBundle.java
new file mode 100644
index 0000000000000..9062a8a50d91f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/JavaJpaTypeBundle.java
@@ -0,0 +1,45 @@
+package io.quarkus.hibernate.orm.panache.deployment;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
+import io.quarkus.hibernate.orm.panache.PanacheQuery;
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
+import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public class JavaJpaTypeBundle implements TypeBundle {
+
+    public static final TypeBundle BUNDLE = new JavaJpaTypeBundle();
+
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(PanacheEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(PanacheEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(JpaOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(PanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(PanacheRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(PanacheRepositoryBase.class);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java
index e1c600b6add26..15e79a2cad59e 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java
@@ -1,9 +1,16 @@
 package io.quarkus.hibernate.orm.panache.deployment;
 
+import static io.quarkus.panache.common.deployment.PanacheConstants.META_INF_PANACHE_ARCHIVE_MARKER;
+
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
@@ -15,44 +22,41 @@
 
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
-import io.quarkus.bootstrap.classloading.ClassPathElement;
-import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
-import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.util.JandexUtil;
 import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem;
-import io.quarkus.hibernate.orm.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.hibernate.orm.deployment.JpaModelPersistenceUnitMappingBuildItem;
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
-import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem;
-import io.quarkus.panache.common.deployment.PanacheFieldAccessEnhancer;
+import io.quarkus.hibernate.orm.panache.runtime.PanacheHibernateOrmRecorder;
+import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.common.deployment.PanacheJpaEntityOperationsEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
-import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
 
 public final class PanacheHibernateResourceProcessor {
 
     static final DotName DOTNAME_PANACHE_REPOSITORY_BASE = DotName.createSimple(PanacheRepositoryBase.class.getName());
     private static final DotName DOTNAME_PANACHE_REPOSITORY = DotName.createSimple(PanacheRepository.class.getName());
+
     static final DotName DOTNAME_PANACHE_ENTITY = DotName.createSimple(PanacheEntity.class.getName());
     static final DotName DOTNAME_PANACHE_ENTITY_BASE = DotName.createSimple(PanacheEntityBase.class.getName());
 
     private static final DotName DOTNAME_ENTITY_MANAGER = DotName.createSimple(EntityManager.class.getName());
 
     private static final DotName DOTNAME_ID = DotName.createSimple(Id.class.getName());
-    protected static final String META_INF_PANACHE_ARCHIVE_MARKER = "META-INF/panache-archive.marker";
 
     @BuildStep
     FeatureBuildItem featureBuildItem() {
@@ -89,94 +93,58 @@ void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheEnt
     }
 
     @BuildStep
-    PanacheEntityClassesBuildItem findEntityClasses(List<PanacheEntityClassBuildItem> entityClasses) {
-        if (!entityClasses.isEmpty()) {
-            Set<String> ret = new HashSet<>();
-            for (PanacheEntityClassBuildItem entityClass : entityClasses) {
-                ret.add(entityClass.get().name().toString());
-            }
-            return new PanacheEntityClassesBuildItem(ret);
-        }
-        return null;
-    }
-
-    @BuildStep
-    void build(CombinedIndexBuildItem index,
-            ApplicationArchivesBuildItem applicationArchivesBuildItem,
+    @Record(ExecutionTime.STATIC_INIT)
+    @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    void build(
+            PanacheHibernateOrmRecorder recorder,
+            CombinedIndexBuildItem index,
             BuildProducer<BytecodeTransformerBuildItem> transformers,
-            HibernateEnhancersRegisteredBuildItem hibernateMarker,
             List<PanacheEntityClassBuildItem> entityClasses,
-            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) throws Exception {
+            Optional<JpaModelPersistenceUnitMappingBuildItem> jpaModelPersistenceUnitMapping,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
 
         List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
                 .map(PanacheMethodCustomizerBuildItem::getMethodCustomizer).collect(Collectors.toList());
 
-        PanacheJpaRepositoryEnhancer daoEnhancer = new PanacheJpaRepositoryEnhancer(index.getIndex());
+        PanacheJpaRepositoryEnhancer daoEnhancer = new PanacheJpaRepositoryEnhancer(index.getIndex(),
+                JavaJpaTypeBundle.BUNDLE);
+        Set<String> panacheEntities = new HashSet<>();
         Set<String> daoClasses = new HashSet<>();
         for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_PANACHE_REPOSITORY_BASE)) {
             // Skip PanacheRepository
             if (classInfo.name().equals(DOTNAME_PANACHE_REPOSITORY))
                 continue;
-            if (PanacheRepositoryEnhancer.skipRepository(classInfo))
+            if (daoEnhancer.skipRepository(classInfo))
                 continue;
+            List<org.jboss.jandex.Type> typeParameters = JandexUtil
+                    .resolveTypeParameters(classInfo.name(), DOTNAME_PANACHE_REPOSITORY_BASE, index.getIndex());
+            panacheEntities.add(typeParameters.get(0).name().toString());
             daoClasses.add(classInfo.name().toString());
         }
         for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_PANACHE_REPOSITORY)) {
-            if (PanacheRepositoryEnhancer.skipRepository(classInfo))
+            if (daoEnhancer.skipRepository(classInfo))
                 continue;
+            List<org.jboss.jandex.Type> typeParameters = JandexUtil
+                    .resolveTypeParameters(classInfo.name(), DOTNAME_PANACHE_REPOSITORY, index.getIndex());
+            panacheEntities.add(typeParameters.get(0).name().toString());
             daoClasses.add(classInfo.name().toString());
         }
         for (String daoClass : daoClasses) {
             transformers.produce(new BytecodeTransformerBuildItem(daoClass, daoEnhancer));
         }
 
-        PanacheJpaEntityEnhancer modelEnhancer = new PanacheJpaEntityEnhancer(index.getIndex(), methodCustomizers);
+        PanacheJpaEntityOperationsEnhancer entityOperationsEnhancer = new PanacheJpaEntityOperationsEnhancer(index.getIndex(),
+                methodCustomizers, JavaJpaTypeBundle.BUNDLE);
         Set<String> modelClasses = new HashSet<>();
-        Set<String> modelClassNamesInternal = new HashSet<>();
         for (PanacheEntityClassBuildItem entityClass : entityClasses) {
             String entityClassName = entityClass.get().name().toString();
             modelClasses.add(entityClassName);
-            modelEnhancer.collectFields(entityClass.get());
-            modelClassNamesInternal.add(entityClassName.replace(".", "/"));
-            transformers.produce(new BytecodeTransformerBuildItem(true, entityClassName, modelEnhancer));
+            transformers.produce(new BytecodeTransformerBuildItem(true, entityClassName, entityOperationsEnhancer));
         }
 
-        MetamodelInfo<EntityModel<EntityField>> modelInfo = modelEnhancer.getModelInfo();
-        if (modelInfo.hasEntities()) {
-            PanacheFieldAccessEnhancer panacheFieldAccessEnhancer = new PanacheFieldAccessEnhancer(modelInfo);
-            QuarkusClassLoader tccl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
-            List<ClassPathElement> archives = tccl.getElementsWithResource(META_INF_PANACHE_ARCHIVE_MARKER);
-            Set<String> produced = new HashSet<>();
-            //we always transform the root archive, even though it should be run with the annotation
-            //processor on the CP it might not be if the user is using jpa-modelgen
-            //this won't cover every situation, but we have documented this, and as the fields are now
-            //made private the error should be very obvious
-            //we only do this for hibernate, as it is more common to have an additional annotation processor
-            for (ClassInfo i : applicationArchivesBuildItem.getRootArchive().getIndex().getKnownClasses()) {
-                String cn = i.name().toString();
-                if (!modelClasses.contains(cn)) {
-                    produced.add(cn);
-                    transformers.produce(
-                            new BytecodeTransformerBuildItem(cn, panacheFieldAccessEnhancer, modelClassNamesInternal));
-                }
-            }
+        panacheEntities.addAll(modelClasses);
 
-            for (ClassPathElement i : archives) {
-                for (String res : i.getProvidedResources()) {
-                    if (res.endsWith(".class")) {
-                        String cn = res.replace("/", ".").substring(0, res.length() - 6);
-                        if (produced.contains(cn)) {
-                            continue;
-                        }
-                        if (!modelClasses.contains(cn)) {
-                            produced.add(cn);
-                            transformers.produce(
-                                    new BytecodeTransformerBuildItem(cn, panacheFieldAccessEnhancer, modelClassNamesInternal));
-                        }
-                    }
-                }
-            }
-        }
+        recordPanacheEntityPersistenceUnits(recorder, jpaModelPersistenceUnitMapping, panacheEntities);
     }
 
     @BuildStep
@@ -195,4 +163,45 @@ ValidationPhaseBuildItem.ValidationErrorBuildItem validate(ValidationPhaseBuildI
         }
         return null;
     }
+
+    void recordPanacheEntityPersistenceUnits(PanacheHibernateOrmRecorder recorder,
+            Optional<JpaModelPersistenceUnitMappingBuildItem> jpaModelPersistenceUnitMapping,
+            Set<String> panacheEntityClasses) {
+        Map<String, String> panacheEntityToPersistenceUnit = new HashMap<>();
+        if (jpaModelPersistenceUnitMapping.isPresent()) {
+            Map<String, Set<String>> collectedEntityToPersistenceUnits = jpaModelPersistenceUnitMapping.get()
+                    .getEntityToPersistenceUnits();
+
+            Map<String, Set<String>> violatingPanacheEntities = new TreeMap<>();
+
+            for (Map.Entry<String, Set<String>> entry : collectedEntityToPersistenceUnits.entrySet()) {
+                String entityName = entry.getKey();
+                Set<String> selectedPersistenceUnits = entry.getValue();
+                boolean isPanacheEntity = panacheEntityClasses.contains(entityName);
+
+                if (!isPanacheEntity) {
+                    continue;
+                }
+
+                if (selectedPersistenceUnits.size() == 1) {
+                    panacheEntityToPersistenceUnit.put(entityName, selectedPersistenceUnits.iterator().next());
+                } else {
+                    violatingPanacheEntities.put(entityName, selectedPersistenceUnits);
+                }
+            }
+
+            if (violatingPanacheEntities.size() > 0) {
+                StringBuilder message = new StringBuilder(
+                        "Panache entities do not support being attached to several persistence units:\n");
+                for (Entry<String, Set<String>> violatingEntityEntry : violatingPanacheEntities
+                        .entrySet()) {
+                    message.append("\t- ").append(violatingEntityEntry.getKey()).append(" is attached to: ")
+                            .append(String.join(",", violatingEntityEntry.getValue()));
+                    throw new IllegalStateException(message.toString());
+                }
+            }
+        }
+
+        recorder.setEntityToPersistenceUnit(panacheEntityToPersistenceUnit);
+    }
 }
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaEntityEnhancer.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaEntityEnhancer.java
deleted file mode 100644
index b66738d056c75..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaEntityEnhancer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package io.quarkus.hibernate.orm.panache.deployment;
-
-import java.lang.reflect.Modifier;
-import java.util.List;
-
-import javax.persistence.Transient;
-
-import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-import org.jboss.jandex.IndexView;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-import io.quarkus.gizmo.DescriptorUtils;
-import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
-import io.quarkus.hibernate.orm.panache.PanacheQuery;
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
-import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
-import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
-
-public class PanacheJpaEntityEnhancer extends PanacheEntityEnhancer<MetamodelInfo<EntityModel<EntityField>>> {
-
-    public static final String ENTITY_BASE_NAME = PanacheEntityBase.class.getName();
-    public static final String ENTITY_BASE_BINARY_NAME = ENTITY_BASE_NAME.replace('.', '/');
-    public static final String ENTITY_BASE_SIGNATURE = "L" + ENTITY_BASE_BINARY_NAME + ";";
-
-    public static final String QUERY_NAME = PanacheQuery.class.getName();
-    public static final String QUERY_BINARY_NAME = QUERY_NAME.replace('.', '/');
-    public static final String QUERY_SIGNATURE = "L" + QUERY_BINARY_NAME + ";";
-
-    public static final String JPA_OPERATIONS_NAME = JpaOperations.class.getName();
-    public static final String JPA_OPERATIONS_BINARY_NAME = JPA_OPERATIONS_NAME.replace('.', '/');
-
-    private static final DotName DOTNAME_TRANSIENT = DotName.createSimple(Transient.class.getName());
-
-    public PanacheJpaEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
-        super(index, PanacheHibernateResourceProcessor.DOTNAME_PANACHE_ENTITY_BASE, methodCustomizers);
-        modelInfo = new MetamodelInfo<>();
-    }
-
-    @Override
-    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new PanacheJpaEntityClassVisitor(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo,
-                indexView.getClassByName(DotName.createSimple(className)), methodCustomizers);
-    }
-
-    static class PanacheJpaEntityClassVisitor extends PanacheEntityClassVisitor<EntityField> {
-
-        public PanacheJpaEntityClassVisitor(String className, ClassVisitor outputClassVisitor,
-                MetamodelInfo<EntityModel<EntityField>> modelInfo,
-                ClassInfo panacheEntityBaseClassInfo,
-                ClassInfo entityInfo,
-                List<PanacheMethodCustomizer> methodCustomizers) {
-            super(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo, entityInfo, methodCustomizers);
-        }
-
-        @Override
-        protected void injectModel(MethodVisitor mv) {
-            mv.visitLdcInsn(thisClass);
-        }
-
-        @Override
-        protected String getModelDescriptor() {
-            return "Ljava/lang/Class;";
-        }
-
-        @Override
-        protected String getPanacheOperationsBinaryName() {
-            return JPA_OPERATIONS_BINARY_NAME;
-        }
-
-        @Override
-        protected void generateAccessorSetField(MethodVisitor mv, EntityField field) {
-            // Due to https://github.com/quarkusio/quarkus/issues/1376 we generate Hibernate read/write calls
-            // directly rather than rely on Hibernate to see our generated accessor because it does not
-            mv.visitMethodInsn(
-                    Opcodes.INVOKEVIRTUAL,
-                    thisClass.getInternalName(),
-                    EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + field.name,
-                    Type.getMethodDescriptor(Type.getType(void.class), Type.getType(field.descriptor)),
-                    false);
-            // instead of:
-            //                    mv.visitFieldInsn(Opcodes.PUTFIELD, thisClass.getInternalName(), field.name, field.descriptor);
-        }
-
-        @Override
-        protected void generateAccessorGetField(MethodVisitor mv, EntityField field) {
-            // Due to https://github.com/quarkusio/quarkus/issues/1376 we generate Hibernate read/write calls
-            // directly rather than rely on Hibernate to see our generated accessor because it does not
-            mv.visitMethodInsn(
-                    Opcodes.INVOKEVIRTUAL,
-                    thisClass.getInternalName(),
-                    EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + field.name,
-                    Type.getMethodDescriptor(Type.getType(field.descriptor)),
-                    false);
-            // instead of:
-            //                    mv.visitFieldInsn(Opcodes.GETFIELD, thisClass.getInternalName(), field.name, field.descriptor);
-        }
-    }
-
-    public void collectFields(ClassInfo classInfo) {
-        EntityModel<EntityField> entityModel = new EntityModel<>(classInfo);
-        for (FieldInfo fieldInfo : classInfo.fields()) {
-            String name = fieldInfo.name();
-            if (Modifier.isPublic(fieldInfo.flags())
-                    && !fieldInfo.hasAnnotation(DOTNAME_TRANSIENT)) {
-                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
-            }
-        }
-        modelInfo.addEntityModel(entityModel);
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaRepositoryEnhancer.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaRepositoryEnhancer.java
index 16dace472aeba..fffe02fa3e159 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaRepositoryEnhancer.java
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheJpaRepositoryEnhancer.java
@@ -1,62 +1,24 @@
 package io.quarkus.hibernate.orm.panache.deployment;
 
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
 
-import io.quarkus.hibernate.orm.panache.PanacheRepository;
-import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.common.deployment.visitors.PanacheRepositoryClassOperationGenerationVisitor;
 
 public class PanacheJpaRepositoryEnhancer extends PanacheRepositoryEnhancer {
 
-    private static final DotName PANACHE_REPOSITORY_BINARY_NAME = DotName.createSimple(PanacheRepository.class.getName());
-    private static final DotName PANACHE_REPOSITORY_BASE_BINARY_NAME = DotName
-            .createSimple(PanacheRepositoryBase.class.getName());
+    private TypeBundle typeBundle;
 
-    public PanacheJpaRepositoryEnhancer(IndexView index) {
-        super(index, PanacheHibernateResourceProcessor.DOTNAME_PANACHE_REPOSITORY_BASE);
+    public PanacheJpaRepositoryEnhancer(IndexView index, TypeBundle typeBundle) {
+        super(index);
+        this.typeBundle = typeBundle;
     }
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new PanacheJpaRepositoryClassVisitor(className, outputClassVisitor, panacheRepositoryBaseClassInfo,
-                this.indexView);
-    }
-
-    static class PanacheJpaRepositoryClassVisitor extends PanacheRepositoryClassVisitor {
-
-        public PanacheJpaRepositoryClassVisitor(String className, ClassVisitor outputClassVisitor,
-                ClassInfo panacheRepositoryBaseClassInfo, IndexView indexView) {
-            super(className, outputClassVisitor, panacheRepositoryBaseClassInfo, indexView);
-        }
-
-        @Override
-        protected DotName getPanacheRepositoryDotName() {
-            return PANACHE_REPOSITORY_BINARY_NAME;
-        }
-
-        @Override
-        protected DotName getPanacheRepositoryBaseDotName() {
-            return PANACHE_REPOSITORY_BASE_BINARY_NAME;
-        }
-
-        @Override
-        protected String getPanacheOperationsBinaryName() {
-            return PanacheJpaEntityEnhancer.JPA_OPERATIONS_BINARY_NAME;
-        }
-
-        @Override
-        protected void injectModel(MethodVisitor mv) {
-            // inject Class
-            mv.visitLdcInsn(entityType);
-        }
-
-        @Override
-        protected String getModelDescriptor() {
-            return "Ljava/lang/Class;";
-        }
+        return new PanacheRepositoryClassOperationGenerationVisitor(className, outputClassVisitor,
+                this.indexView, typeBundle);
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DefaultPanacheEntityToStringTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DefaultPanacheEntityToStringTest.java
new file mode 100644
index 0000000000000..54a7279e08f6e
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DefaultPanacheEntityToStringTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+public class DefaultPanacheEntityToStringTest {
+
+    @Test
+    public void testDefaultToStringMethod() {
+        MyPanacheEntity myPanacheEntityWithId = new MyPanacheEntity(2912l);
+        assertEquals("MyPanacheEntity<2912>", myPanacheEntityWithId.toString());
+
+        MyPanacheEntity myPanacheEntityWithNullId = new MyPanacheEntity(null);
+        assertEquals("MyPanacheEntity<null>", myPanacheEntityWithNullId.toString());
+    }
+
+    static class MyPanacheEntity extends PanacheEntity {
+        public MyPanacheEntity(Long id) {
+            this.id = id;
+        }
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java
new file mode 100644
index 0000000000000..51323dd11dbb9
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import javax.persistence.Id;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+public class DuplicateIdEntity extends PanacheEntity {
+    @Id
+    public String customId;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java
new file mode 100644
index 0000000000000..727664fde4d0f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdEntityTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DuplicateIdEntityTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(BuildException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DuplicateIdEntity.class));
+
+    @Test
+    void shouldThrow() {
+        fail("A BuildException should have been thrown due to duplicate entity ID");
+    }
+
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdParentEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdParentEntity.java
new file mode 100644
index 0000000000000..adba10f1111c1
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdParentEntity.java
@@ -0,0 +1,6 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+public class DuplicateIdParentEntity extends PanacheEntity {
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java
new file mode 100644
index 0000000000000..d1bc52ffca989
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentEntity.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import javax.persistence.Id;
+
+public class DuplicateIdWithParentEntity extends DuplicateIdParentEntity {
+    @Id
+    public String customId;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java
new file mode 100644
index 0000000000000..ad1d50c12ee92
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/DuplicateIdWithParentTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DuplicateIdWithParentTest {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(BuildException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DuplicateIdWithParentEntity.class, DuplicateIdParentEntity.class));
+
+    @Test
+    void shouldThrow() {
+        fail("A BuildException should have been thrown due to duplicate entity ID");
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/EntityManagerTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java
similarity index 81%
rename from extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/EntityManagerTest.java
rename to extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java
index ffd5fd3f31260..1f5a7d651ca90 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/EntityManagerTest.java
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/EntityManagerTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.panache.test;
+package io.quarkus.hibernate.orm.panache.deployment.test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -14,7 +14,7 @@ public class EntityManagerTest {
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource("application.properties")
+                    .addAsResource("application-test.properties", "application.properties")
                     .addClasses(MyEntity.class));
 
     @Test
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java
new file mode 100644
index 0000000000000..1317e60c9f85e
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/ErroneousConfigHotReloadTestCase.java
@@ -0,0 +1,48 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+
+import java.util.function.Function;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class ErroneousConfigHotReloadTestCase {
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(UnAnnotatedEntity.class, UnAnnotatedEntityResource.class)
+                    .addAsResource("application-commented-out.properties", "application.properties"));
+
+    @Test
+    public void test() {
+        RestAssured.when().get("/unannotatedEntity").then().statusCode(500).body(containsString("No entities were found"))
+                .body(not(containsString("NullPointer")));
+
+        TEST.modifyResourceFile("application.properties", new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace("#", "");
+            }
+        });
+
+        RestAssured.when().get("/unannotatedEntity").then().statusCode(500).body(containsString("@Entity"))
+                .body(not(containsString("NullPointer")));
+
+        TEST.modifySourceFile(UnAnnotatedEntity.class, new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace("//", "");
+            }
+        });
+
+        RestAssured.when().get("/unannotatedEntity").then().statusCode(200);
+    }
+
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JpaOperationsSortTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JpaOperationsSortTest.java
new file mode 100644
index 0000000000000..85eca50964fa1
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/JpaOperationsSortTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.panache.common.Sort;
+import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
+
+public class JpaOperationsSortTest {
+
+    @Test
+    public void testEmptySortByYieldsEmptyString() {
+        Sort emptySort = Sort.by();
+        assertEquals("", PanacheJpaUtil.toOrderBy(emptySort));
+    }
+
+    @Test
+    public void testSortBy() {
+        Sort sort = Sort.by("foo", "bar");
+        assertEquals(" ORDER BY foo , bar", PanacheJpaUtil.toOrderBy(sort));
+    }
+
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java
new file mode 100644
index 0000000000000..ae831eb3c6f63
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class MyEntity extends PanacheEntity {
+    public String name;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java
new file mode 100644
index 0000000000000..10b054bd289fd
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class MyOtherEntity extends PanacheEntity {
+    public String name;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java
new file mode 100644
index 0000000000000..8c71dd76d1199
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyOtherTestResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@Path("other-entity")
+public class MyOtherTestResource {
+
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public MyOtherEntity get(@PathParam long id) {
+        MyOtherEntity ret = MyOtherEntity.findById(id);
+        if (ret == null)
+            throw new WebApplicationException(Response.Status.NOT_FOUND);
+        return ret;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java
new file mode 100644
index 0000000000000..a5ee66fa499bb
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/MyTestResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@Path("entity")
+public class MyTestResource {
+
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public MyEntity get(@PathParam long id) {
+        MyEntity ret = MyEntity.findById(id);
+        if (ret == null)
+            throw new WebApplicationException(Response.Status.NOT_FOUND);
+        return ret;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/NoConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/NoConfigTest.java
new file mode 100644
index 0000000000000..8c68c2e4aba8c
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/NoConfigTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoConfigTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void testNoConfig() {
+        // we should be able to start the application, even with no configuration at all
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheEntityMetaModelTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheEntityMetaModelTest.java
new file mode 100644
index 0000000000000..a68964506f587
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheEntityMetaModelTest.java
@@ -0,0 +1,13 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity_;
+
+public class PanacheEntityMetaModelTest {
+    @Test
+    public void testMetaModelExistence() {
+        Assertions.assertEquals("id", PanacheEntity_.ID);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java
new file mode 100644
index 0000000000000..118bad2548baf
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheHotReloadTestCase.java
@@ -0,0 +1,63 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import static org.hamcrest.Matchers.is;
+
+import java.util.function.Function;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class PanacheHotReloadTestCase {
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyEntity.class, MyTestResource.class)
+                    .addAsResource("application-test.properties", "application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    public void testAddNewFieldToEntity() {
+        String expectedName = "{\"id\":1,\"name\":\"my name\"}";
+        assertBodyIs(expectedName);
+
+        TEST.modifySourceFile(MyEntity.class, new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace("public String name;", "public String name;public String tag;");
+            }
+        });
+        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace(";", ";\nUPDATE MyEntity SET tag = 'related' WHERE id = 1;\n");
+            }
+        });
+        String hotReloadExpectedName = "{\"id\":1,\"name\":\"my name\",\"tag\":\"related\"}";
+        assertBodyIs(hotReloadExpectedName);
+    }
+
+    @Test
+    public void testAddEntity() {
+        RestAssured.when().get("/other-entity/1").then().statusCode(404);
+
+        TEST.addSourceFile(MyOtherEntity.class);
+        TEST.addSourceFile(MyOtherTestResource.class);
+
+        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s + s.replaceAll("MyEntity", "MyOtherEntity");
+            }
+        });
+        RestAssured.when().get("/other-entity/1").then().statusCode(200).body(is("{\"id\":1,\"name\":\"my name\"}"));
+    }
+
+    private void assertBodyIs(String expectedBody) {
+        RestAssured.when().get("/entity/1").then().statusCode(200).body(is(expectedBody));
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java
new file mode 100644
index 0000000000000..480ed807ae461
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+//import javax.persistence.Entity;
+
+//@Entity
+public class UnAnnotatedEntity extends PanacheEntity {
+    public String name;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.java
new file mode 100644
index 0000000000000..6e41d211ad8b1
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/UnAnnotatedEntityResource.java
@@ -0,0 +1,18 @@
+package io.quarkus.hibernate.orm.panache.deployment.test;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("unannotatedEntity")
+public class UnAnnotatedEntityResource {
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<UnAnnotatedEntity> get() {
+        return UnAnnotatedEntity.listAll();
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java
new file mode 100644
index 0000000000000..29845c6ee9ce5
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitConfigTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second.SecondEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DefaultPersistenceUnitConfigTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class)
+                    .addAsResource("application-test.properties", "application.properties"));
+
+    @Test
+    public void panacheOperations() {
+        /**
+         * First entity operations
+         */
+        RestAssured.when().get("/persistence-unit/first/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/first/name-2").then().body(Matchers.is("2"));
+
+        /**
+         * second entity operations
+         */
+        RestAssured.when().get("/persistence-unit/second/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/second/name-2").then().body(Matchers.is("2"));
+    }
+
+    @Test
+    void entityManagerShouldExist() {
+        FirstEntity firstEntity = new FirstEntity();
+        assertNotNull(firstEntity.getEntityManager());
+
+        SecondEntity secondEntity = new SecondEntity();
+        assertNotNull(secondEntity.getEntityManager());
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java
new file mode 100644
index 0000000000000..5a57d4be1e39f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/DefaultPersistenceUnitFileTest.java
@@ -0,0 +1,52 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second.SecondEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DefaultPersistenceUnitFileTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class)
+                    .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml")
+                    .addAsResource(new StringAsset(
+                            "quarkus.datasource.db-kind=h2\n" +
+                                    "quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1"),
+                            "application.properties"));
+
+    @Test
+    public void panacheOperations() {
+        /**
+         * First entity operations
+         */
+        RestAssured.when().get("/persistence-unit/first/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/first/name-2").then().body(Matchers.is("2"));
+
+        /**
+         * second entity operations
+         */
+        RestAssured.when().get("/persistence-unit/second/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/second/name-2").then().body(Matchers.is("2"));
+    }
+
+    @Test
+    void entityManagerShouldExist() {
+        FirstEntity firstEntity = new FirstEntity();
+        assertNotNull(firstEntity.getEntityManager());
+
+        SecondEntity secondEntity = new SecondEntity();
+        assertNotNull(secondEntity.getEntityManager());
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java
new file mode 100644
index 0000000000000..b0cc239b59df8
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/ErroneousPersistenceUnitConfigTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second.SecondEntity;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ErroneousPersistenceUnitConfigTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(IllegalStateException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class)
+                    .addAsResource("application-erroneous-multiple-persistence-units.properties", "application.properties"));
+
+    @Test
+    public void shouldNotReachHere() {
+        Assertions.fail();
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java
new file mode 100644
index 0000000000000..f671286de020e
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/MultiplePersistenceUnitConfigTest.java
@@ -0,0 +1,61 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second.SecondEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class MultiplePersistenceUnitConfigTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FirstEntity.class, SecondEntity.class, PanacheTestResource.class)
+                    .addAsResource("application-multiple-persistence-units.properties", "application.properties"));
+
+    @Inject
+    EntityManager defaultEntityManager;
+
+    @Inject
+    @PersistenceUnit("second")
+    EntityManager secondEntityManager;
+
+    @Test
+    public void panacheOperations() {
+        /**
+         * First entity operations
+         */
+        RestAssured.when().get("/persistence-unit/first/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/first/name-2").then().body(Matchers.is("2"));
+
+        /**
+         * second entity operations
+         */
+        RestAssured.when().get("/persistence-unit/second/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/second/name-2").then().body(Matchers.is("2"));
+    }
+
+    @Test
+    void entityManagerShouldExist() {
+        FirstEntity firstEntity = new FirstEntity();
+        assertNotNull(firstEntity.getEntityManager());
+        assertEquals(firstEntity.getEntityManager(), defaultEntityManager);
+
+        SecondEntity secondEntity = new SecondEntity();
+        assertNotNull(secondEntity.getEntityManager());
+        assertEquals(secondEntity.getEntityManager(), secondEntityManager);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java
new file mode 100644
index 0000000000000..d9af0e9c9ab2a
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/PanacheTestResource.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu;
+
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second.SecondEntity;
+
+@Path("/persistence-unit")
+public class PanacheTestResource {
+
+    @GET
+    @Path("/first/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Long createWithFirstPuAndReturnCount(@PathParam("name") String name) {
+        FirstEntity entity = new FirstEntity();
+        entity.name = name;
+        entity.persistAndFlush();
+        return FirstEntity.count();
+    }
+
+    @GET
+    @Path("/second/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Long createWithSecondPUAndReturnCount(@PathParam("name") String name) {
+        SecondEntity entity = new SecondEntity();
+        entity.name = name;
+        entity.persistAndFlush();
+        return SecondEntity.count();
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java
new file mode 100644
index 0000000000000..355ef65eb46f3
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/first/FirstEntity.java
@@ -0,0 +1,11 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class FirstEntity extends PanacheEntity {
+
+    public String name;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java
new file mode 100644
index 0000000000000..11cd178f54220
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Entity.java
@@ -0,0 +1,37 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Issue11842Entity implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(length = 64)
+    private String name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java
new file mode 100644
index 0000000000000..1d5718c9c85c4
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Repository.java
@@ -0,0 +1,9 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
+
+@ApplicationScoped
+public class Issue11842Repository implements PanacheRepositoryBase<Issue11842Entity, Integer> {
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java
new file mode 100644
index 0000000000000..bad3765e95066
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/Issue11842Resource.java
@@ -0,0 +1,39 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+
+@Path("/persistence-unit")
+public class Issue11842Resource {
+    @Inject
+    Issue11842Repository repository;
+
+    @GET
+    @Path("/repository/{name}")
+    @Transactional
+    public Long addAndReturnCountUsingPanacheRepository(@PathParam String name) {
+        Issue11842Entity entity = new Issue11842Entity();
+        entity.setName(name);
+        repository.persist(entity);
+        return repository.count();
+    }
+
+    @GET
+    @Path("/panache-entity/{name}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public Long addAndReturnCountUsingPanacheEntity(@PathParam String name) {
+        FirstEntity entity = new FirstEntity();
+        entity.name = name;
+        entity.persistAndFlush();
+        return FirstEntity.count();
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java
new file mode 100644
index 0000000000000..3f286af628da1
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/repository/MultiplePersistenceUnitConfigForRepositoryTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first.FirstEntity;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class MultiplePersistenceUnitConfigForRepositoryTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Issue11842Entity.class, Issue11842Repository.class, Issue11842Resource.class, FirstEntity.class)
+                    .addAsResource("application-multiple-persistence-units-for-repository.properties",
+                            "application.properties"));
+
+    @Test
+    public void panacheOperations() {
+        // Using PanacheRepository
+        RestAssured.when().get("/persistence-unit/repository/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/repository/name-2").then().body(Matchers.is("2"));
+
+        // Using PanacheEntity
+        RestAssured.when().get("/persistence-unit/panache-entity/name-1").then().body(Matchers.is("1"));
+        RestAssured.when().get("/persistence-unit/panache-entity/name-2").then().body(Matchers.is("2"));
+    }
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java
new file mode 100644
index 0000000000000..41d2ade66a0fa
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/multiple_pu/second/SecondEntity.java
@@ -0,0 +1,11 @@
+package io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class SecondEntity extends PanacheEntity {
+
+    public String name;
+}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DefaultPanacheEntityToStringTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DefaultPanacheEntityToStringTest.java
deleted file mode 100644
index 1c6a30dcc7212..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DefaultPanacheEntityToStringTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-public class DefaultPanacheEntityToStringTest {
-
-    @Test
-    public void testDefaultToStringMethod() {
-        MyPanacheEntity myPanacheEntityWithId = new MyPanacheEntity(2912l);
-        assertEquals("MyPanacheEntity<2912>", myPanacheEntityWithId.toString());
-
-        MyPanacheEntity myPanacheEntityWithNullId = new MyPanacheEntity(null);
-        assertEquals("MyPanacheEntity<null>", myPanacheEntityWithNullId.toString());
-    }
-
-    static class MyPanacheEntity extends PanacheEntity {
-        public MyPanacheEntity(Long id) {
-            this.id = id;
-        }
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdEntity.java
deleted file mode 100644
index 8ba404f238966..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdEntity.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import javax.persistence.Id;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-public class DuplicateIdEntity extends PanacheEntity {
-    @Id
-    public String customId;
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdEntityTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdEntityTest.java
deleted file mode 100644
index 3721b4d0d21d4..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdEntityTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.builder.BuildException;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class DuplicateIdEntityTest {
-
-    @RegisterExtension
-    static QuarkusUnitTest runner = new QuarkusUnitTest()
-            .setExpectedException(BuildException.class)
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(DuplicateIdEntity.class));
-
-    @Test
-    void shouldThrow() {
-        fail("A BuildException should have been thrown due to duplicate entity ID");
-    }
-
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdParentEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdParentEntity.java
deleted file mode 100644
index 04bb6e207a3e0..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdParentEntity.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-public class DuplicateIdParentEntity extends PanacheEntity {
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdWithParentEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdWithParentEntity.java
deleted file mode 100644
index 8ba3f631b73c3..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdWithParentEntity.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import javax.persistence.Id;
-
-public class DuplicateIdWithParentEntity extends DuplicateIdParentEntity {
-    @Id
-    public String customId;
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdWithParentTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdWithParentTest.java
deleted file mode 100644
index 4869fdf3c2586..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/DuplicateIdWithParentTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.builder.BuildException;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class DuplicateIdWithParentTest {
-    @RegisterExtension
-    static QuarkusUnitTest runner = new QuarkusUnitTest()
-            .setExpectedException(BuildException.class)
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(DuplicateIdWithParentEntity.class, DuplicateIdParentEntity.class));
-
-    @Test
-    void shouldThrow() {
-        fail("A BuildException should have been thrown due to duplicate entity ID");
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/JpaOperationsSortTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/JpaOperationsSortTest.java
deleted file mode 100644
index fcfbfe19da71b..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/JpaOperationsSortTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
-import io.quarkus.panache.common.Sort;
-
-public class JpaOperationsSortTest {
-
-    @Test
-    public void testSortBy() {
-        Sort sort = Sort.by("foo", "bar");
-        assertEquals(" ORDER BY foo , bar", JpaOperations.toOrderBy(sort));
-    }
-
-    @Test
-    public void testEmptySortByYieldsEmptyString() {
-        Sort emptySort = Sort.by();
-        assertEquals("", JpaOperations.toOrderBy(emptySort));
-    }
-
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyEntity.java
deleted file mode 100644
index c9ca45da68cc0..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyEntity.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import javax.persistence.Entity;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-@Entity
-public class MyEntity extends PanacheEntity {
-    public String name;
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyOtherEntity.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyOtherEntity.java
deleted file mode 100644
index baada7222506f..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyOtherEntity.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import javax.persistence.Entity;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
-
-@Entity
-public class MyOtherEntity extends PanacheEntity {
-    public String name;
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyOtherTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyOtherTestResource.java
deleted file mode 100644
index 873174181b2b6..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyOtherTestResource.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
-
-@Path("other-entity")
-public class MyOtherTestResource {
-
-    @GET
-    @Path("{id}")
-    @Produces(MediaType.APPLICATION_JSON)
-    public MyOtherEntity get(@PathParam long id) {
-        MyOtherEntity ret = MyOtherEntity.findById(id);
-        if (ret == null)
-            throw new WebApplicationException(Response.Status.NOT_FOUND);
-        return ret;
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyTestResource.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyTestResource.java
deleted file mode 100644
index 13df5fae7fab5..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/MyTestResource.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
-
-@Path("entity")
-public class MyTestResource {
-
-    @GET
-    @Path("{id}")
-    @Produces(MediaType.APPLICATION_JSON)
-    public MyEntity get(@PathParam long id) {
-        MyEntity ret = MyEntity.findById(id);
-        if (ret == null)
-            throw new WebApplicationException(Response.Status.NOT_FOUND);
-        return ret;
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/NoConfigTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/NoConfigTest.java
deleted file mode 100644
index b5c290ed30370..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/NoConfigTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-
-public class NoConfigTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
-            () -> ShrinkWrap.create(JavaArchive.class));
-
-    @Test
-    public void testNoConfig() {
-        // we should be able to start the application, even with no configuration at all
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/PanacheHotReloadTestCase.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/PanacheHotReloadTestCase.java
deleted file mode 100644
index 8a80f3bb3217d..0000000000000
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/test/PanacheHotReloadTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.quarkus.hibernate.orm.panache.test;
-
-import static org.hamcrest.Matchers.is;
-
-import java.util.function.Function;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusDevModeTest;
-import io.restassured.RestAssured;
-
-public class PanacheHotReloadTestCase {
-    @RegisterExtension
-    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(MyEntity.class, MyTestResource.class)
-                    .addAsResource("application.properties")
-                    .addAsResource("import.sql"));
-
-    @Test
-    public void testAddNewFieldToEntity() {
-        String expectedName = "{\"id\":1,\"name\":\"my name\"}";
-        assertBodyIs(expectedName);
-
-        TEST.modifySourceFile(MyEntity.class, new Function<String, String>() {
-            @Override
-            public String apply(String s) {
-                return s.replace("public String name;", "public String name;public String tag;");
-            }
-        });
-        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
-            @Override
-            public String apply(String s) {
-                return s.replace(";", ";\nUPDATE MyEntity SET tag = 'related' WHERE id = 1;\n");
-            }
-        });
-        String hotReloadExpectedName = "{\"id\":1,\"name\":\"my name\",\"tag\":\"related\"}";
-        assertBodyIs(hotReloadExpectedName);
-    }
-
-    @Test
-    public void testAddEntity() {
-        RestAssured.when().get("/other-entity/1").then().statusCode(404);
-
-        TEST.addSourceFile(MyOtherEntity.class);
-        TEST.addSourceFile(MyOtherTestResource.class);
-
-        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
-            @Override
-            public String apply(String s) {
-                return s + s.replaceAll("MyEntity", "MyOtherEntity");
-            }
-        });
-        RestAssured.when().get("/other-entity/1").then().statusCode(200).body(is("{\"id\":1,\"name\":\"my name\"}"));
-    }
-
-    private void assertBodyIs(String expectedBody) {
-        RestAssured.when().get("/entity/1").then().statusCode(200).body(is(expectedBody));
-    }
-}
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/META-INF/some-persistence.xml b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/META-INF/some-persistence.xml
new file mode 100644
index 0000000000000..9a8b9b174af45
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/META-INF/some-persistence.xml
@@ -0,0 +1,17 @@
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+             version="2.1">
+
+    <persistence-unit name="templatePU" transaction-type="JTA">
+
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class, hbm"/>
+
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+        </properties>
+
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-commented-out.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-commented-out.properties
new file mode 100644
index 0000000000000..1b719c3f3d84c
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-commented-out.properties
@@ -0,0 +1,7 @@
+#quarkus.datasource.db-kind=h2
+quarkus.datasource.devservices=false
+#quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+#
+#quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+#quarkus.hibernate-orm.log.sql=true
+#quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
new file mode 100644
index 0000000000000..cbcb3eec5ffa3
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
@@ -0,0 +1,15 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.second.db-kind=h2
+quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first
+
+quarkus.hibernate-orm."second".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."second".database.generation=drop-and-create
+quarkus.hibernate-orm."second".datasource=second
+quarkus.hibernate-orm."second".packages=io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first
+        
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
new file mode 100644
index 0000000000000..d257a345b938f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
@@ -0,0 +1,14 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.repository.db-kind=h2
+quarkus.datasource.repository.jdbc.url=jdbc:h2:mem:repository;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first
+
+quarkus.hibernate-orm."repository".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."repository".database.generation=drop-and-create
+quarkus.hibernate-orm."repository".datasource=repository
+quarkus.hibernate-orm."repository".packages=io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.repository
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
new file mode 100644
index 0000000000000..777cc07197332
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -0,0 +1,14 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+
+quarkus.datasource.second.db-kind=h2
+quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.first
+
+quarkus.hibernate-orm."second".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."second".database.generation=drop-and-create
+quarkus.hibernate-orm."second".datasource=second
+quarkus.hibernate-orm."second".packages=io.quarkus.hibernate.orm.panache.deployment.test.multiple_pu.second
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-test.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-test.properties
new file mode 100644
index 0000000000000..875028dd07447
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-test.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/panache/hibernate-orm-panache/pom.xml b/extensions/panache/hibernate-orm-panache/pom.xml
index fd84f889eaa1a..6120de18e8c5b 100644
--- a/extensions/panache/hibernate-orm-panache/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-	<relativePath>../../../build-parent/pom.xml</relativePath>
+	<relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/panache/hibernate-orm-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
index fa574e6f1f900..ec1b11cef0922 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-hibernate-orm-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,10 +12,6 @@
     <name>Quarkus - Hibernate ORM with Panache - Runtime</name>
     <description>Simplify your persistence code for Hibernate ORM via the active record or the repository pattern</description>
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-orm</artifactId>
@@ -90,7 +85,9 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <compilerArgument>-proc:none</compilerArgument>
+                    <annotationProcessors>
+                        <annotationProcessor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</annotationProcessor>
+                    </annotationProcessors>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java
deleted file mode 100644
index 52c719f97dc28..0000000000000
--- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/Panache.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package io.quarkus.hibernate.orm.panache;
-
-import java.util.Map;
-
-import javax.persistence.EntityManager;
-import javax.transaction.TransactionManager;
-
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
-import io.quarkus.panache.common.Parameters;
-
-/**
- * Utility class for Panache.
- *
- * @author Stéphane Épardaud
- */
-public class Panache {
-
-    /**
-     * Returns the current {@link EntityManager}
-     * 
-     * @return the current {@link EntityManager}
-     */
-    public static EntityManager getEntityManager() {
-        return JpaOperations.getEntityManager();
-    }
-
-    /**
-     * Returns the current {@link TransactionManager}
-     * 
-     * @return the current {@link TransactionManager}
-     */
-    public static TransactionManager getTransactionManager() {
-        return JpaOperations.getTransactionManager();
-    }
-
-    /**
-     * Executes a database update operation and return the number of rows operated on.
-     * 
-     * @param query a normal HQL query
-     * @param params optional list of indexed parameters
-     * @return the number of rows operated on.
-     */
-    public static int executeUpdate(String query, Object... params) {
-        return JpaOperations.executeUpdate(query, params);
-    }
-
-    /**
-     * Executes a database update operation and return the number of rows operated on.
-     * 
-     * @param query a normal HQL query
-     * @param params {@link Map} of named parameters
-     * @return the number of rows operated on.
-     */
-    public static int executeUpdate(String query, Map<String, Object> params) {
-        return JpaOperations.executeUpdate(query, params);
-    }
-
-    /**
-     * Executes a database update operation and return the number of rows operated on.
-     * 
-     * @param query a normal HQL query
-     * @param params {@link Parameters} of named parameters
-     * @return the number of rows operated on.
-     */
-    public static int executeUpdate(String query, Parameters params) {
-        return JpaOperations.executeUpdate(query, params.map());
-    }
-
-    /**
-     * Marks the current transaction as "rollback-only", which means that it will not be
-     * committed: it will be rolled back at the end of this transaction lifecycle.
-     */
-    public static void setRollbackOnly() {
-        JpaOperations.setRollbackOnly();
-    }
-
-}
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java
index 6d87da19e16b2..2647efa954a70 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java
+++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheEntityBase.java
@@ -1,5 +1,7 @@
 package io.quarkus.hibernate.orm.panache;
 
+import static io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations.implementationInjectionMissing;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -12,6 +14,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
 import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
@@ -29,9 +32,6 @@
  * @see PanacheEntity
  */
 public abstract class PanacheEntityBase {
-
-    // Operations
-
     /**
      * Returns the default {@link EntityManager} for extra operations (eg. CriteriaQueries)
      *
@@ -41,7 +41,7 @@ public abstract class PanacheEntityBase {
     // @JsonIgnore is here to avoid serialization of this property with jackson
     @JsonIgnore
     public EntityManager getEntityManager() {
-        return JpaOperations.getEntityManager();
+        return AbstractJpaOperations.getEntityManager(this.getClass());
     }
 
     /**
@@ -53,7 +53,7 @@ public EntityManager getEntityManager() {
      * @see #persist(Object, Object...)
      */
     public void persist() {
-        JpaOperations.persist(this);
+        JpaOperations.INSTANCE.persist(this);
     }
 
     /**
@@ -66,8 +66,8 @@ public void persist() {
      * @see #persist(Object, Object...)
      */
     public void persistAndFlush() {
-        JpaOperations.persist(this);
-        JpaOperations.flush();
+        JpaOperations.INSTANCE.persist(this);
+        JpaOperations.INSTANCE.flush(this);
     }
 
     /**
@@ -80,7 +80,7 @@ public void persistAndFlush() {
      * @see #deleteAll()
      */
     public void delete() {
-        JpaOperations.delete(this);
+        JpaOperations.INSTANCE.delete(this);
     }
 
     /**
@@ -94,14 +94,14 @@ public void delete() {
     // @JsonIgnore is here to avoid serialization of this property with jackson
     @JsonIgnore
     public boolean isPersistent() {
-        return JpaOperations.isPersistent(this);
+        return JpaOperations.INSTANCE.isPersistent(this);
     }
 
     /**
      * Flushes all pending changes to the database.
      */
     public void flush() {
-        JpaOperations.flush();
+        JpaOperations.INSTANCE.flush(this);
     }
 
     // Queries
@@ -114,7 +114,7 @@ public void flush() {
      */
     @GenerateBridge(targetReturnTypeErased = true)
     public static <T extends PanacheEntityBase> T findById(Object id) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -126,7 +126,7 @@ public static <T extends PanacheEntityBase> T findById(Object id) {
      */
     @GenerateBridge(targetReturnTypeErased = true)
     public static <T extends PanacheEntityBase> T findById(Object id, LockModeType lockModeType) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -137,7 +137,7 @@ public static <T extends PanacheEntityBase> T findById(Object id, LockModeType l
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Optional<T> findByIdOptional(Object id) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -149,7 +149,7 @@ public static <T extends PanacheEntityBase> Optional<T> findByIdOptional(Object
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Optional<T> findByIdOptional(Object id, LockModeType lockModeType) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -166,7 +166,7 @@ public static <T extends PanacheEntityBase> Optional<T> findByIdOptional(Object
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -184,7 +184,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, O
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Sort sort, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -201,7 +201,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, S
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -219,7 +219,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, M
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Sort sort, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -236,7 +236,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, S
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -254,7 +254,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, P
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Sort sort, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -267,7 +267,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, S
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> findAll() {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -281,7 +281,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> findAll() {
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> PanacheQuery<T> findAll(Sort sort) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -299,7 +299,7 @@ public static <T extends PanacheEntityBase> PanacheQuery<T> findAll(Sort sort) {
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> list(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -318,7 +318,7 @@ public static <T extends PanacheEntityBase> List<T> list(String query, Object...
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> list(String query, Sort sort, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -336,7 +336,7 @@ public static <T extends PanacheEntityBase> List<T> list(String query, Sort sort
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> list(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -355,7 +355,7 @@ public static <T extends PanacheEntityBase> List<T> list(String query, Map<Strin
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> list(String query, Sort sort, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -373,7 +373,7 @@ public static <T extends PanacheEntityBase> List<T> list(String query, Sort sort
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> list(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -392,7 +392,7 @@ public static <T extends PanacheEntityBase> List<T> list(String query, Parameter
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> list(String query, Sort sort, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -406,7 +406,7 @@ public static <T extends PanacheEntityBase> List<T> list(String query, Sort sort
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> listAll() {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -421,7 +421,7 @@ public static <T extends PanacheEntityBase> List<T> listAll() {
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> List<T> listAll(Sort sort) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -441,7 +441,7 @@ public static <T extends PanacheEntityBase> List<T> listAll(Sort sort) {
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> stream(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -462,7 +462,7 @@ public static <T extends PanacheEntityBase> Stream<T> stream(String query, Objec
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> stream(String query, Sort sort, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -482,7 +482,7 @@ public static <T extends PanacheEntityBase> Stream<T> stream(String query, Sort
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> stream(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -503,7 +503,7 @@ public static <T extends PanacheEntityBase> Stream<T> stream(String query, Map<S
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> stream(String query, Sort sort, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -523,7 +523,7 @@ public static <T extends PanacheEntityBase> Stream<T> stream(String query, Sort
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> stream(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -544,7 +544,7 @@ public static <T extends PanacheEntityBase> Stream<T> stream(String query, Param
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> stream(String query, Sort sort, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -560,7 +560,7 @@ public static <T extends PanacheEntityBase> Stream<T> stream(String query, Sort
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> streamAll() {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -577,7 +577,7 @@ public static <T extends PanacheEntityBase> Stream<T> streamAll() {
      */
     @GenerateBridge
     public static <T extends PanacheEntityBase> Stream<T> streamAll(Sort sort) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -590,7 +590,7 @@ public static <T extends PanacheEntityBase> Stream<T> streamAll(Sort sort) {
      */
     @GenerateBridge
     public static long count() {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -605,7 +605,7 @@ public static long count() {
      */
     @GenerateBridge
     public static long count(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -620,7 +620,7 @@ public static long count(String query, Object... params) {
      */
     @GenerateBridge
     public static long count(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -635,12 +635,15 @@ public static long count(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static long count(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type from the database.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @return the number of entities deleted.
      * @see #delete(String, Object...)
      * @see #delete(String, Map)
@@ -648,7 +651,7 @@ public static long count(String query, Parameters params) {
      */
     @GenerateBridge
     public static long deleteAll() {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -659,12 +662,15 @@ public static long deleteAll() {
      */
     @GenerateBridge
     public static boolean deleteById(Object id) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type matching the given query, with optional indexed parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @param query a {@link io.quarkus.hibernate.orm.panache query string}
      * @param params optional sequence of indexed parameters
      * @return the number of entities deleted.
@@ -674,12 +680,15 @@ public static boolean deleteById(Object id) {
      */
     @GenerateBridge
     public static long delete(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @param query a {@link io.quarkus.hibernate.orm.panache query string}
      * @param params {@link Map} of named parameters
      * @return the number of entities deleted.
@@ -689,12 +698,15 @@ public static long delete(String query, Object... params) {
      */
     @GenerateBridge
     public static long delete(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @param query a {@link io.quarkus.hibernate.orm.panache query string}
      * @param params {@link Parameters} of named parameters
      * @return the number of entities deleted.
@@ -704,7 +716,7 @@ public static long delete(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static long delete(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -716,7 +728,7 @@ public static long delete(String query, Parameters params) {
      * @see #persist(Object,Object...)
      */
     public static void persist(Iterable<?> entities) {
-        JpaOperations.persist(entities);
+        JpaOperations.INSTANCE.persist(entities);
     }
 
     /**
@@ -728,7 +740,7 @@ public static void persist(Iterable<?> entities) {
      * @see #persist(Object,Object...)
      */
     public static void persist(Stream<?> entities) {
-        JpaOperations.persist(entities);
+        JpaOperations.INSTANCE.persist(entities);
     }
 
     /**
@@ -740,7 +752,7 @@ public static void persist(Stream<?> entities) {
      * @see #persist(Iterable)
      */
     public static void persist(Object firstEntity, Object... entities) {
-        JpaOperations.persist(firstEntity, entities);
+        JpaOperations.INSTANCE.persist(firstEntity, entities);
     }
 
     /**
@@ -754,7 +766,7 @@ public static void persist(Object firstEntity, Object... entities) {
      */
     @GenerateBridge
     public static int update(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -769,7 +781,7 @@ public static int update(String query, Object... params) {
      */
     @GenerateBridge
     public static int update(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 
     /**
@@ -783,6 +795,6 @@ public static int update(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static int update(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+        throw implementationInjectionMissing();
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
index 162d5d590cc8c..6ef9b3aa96b60 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
+++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/PanacheRepositoryBase.java
@@ -1,5 +1,7 @@
 package io.quarkus.hibernate.orm.panache;
 
+import static io.quarkus.hibernate.orm.panache.runtime.JpaOperations.INSTANCE;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -8,7 +10,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
 
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
 import io.quarkus.panache.common.impl.GenerateBridge;
@@ -35,7 +37,16 @@ public interface PanacheRepositoryBase<Entity, Id> {
      * @return the default {@link EntityManager}
      */
     default EntityManager getEntityManager() {
-        return JpaOperations.getEntityManager();
+        return INSTANCE.getEntityManager(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
+    }
+
+    /**
+     * Returns the {@link EntityManager} for the given entity class
+     *
+     * @return the default {@link EntityManager}
+     */
+    default EntityManager getEntityManager(Class<?> clazz) {
+        return INSTANCE.getEntityManager(clazz);
     }
 
     /**
@@ -47,8 +58,8 @@ default EntityManager getEntityManager() {
      * @see #persist(Stream)
      * @see #persist(Object, Object...)
      */
-    public default void persist(Entity entity) {
-        JpaOperations.persist(entity);
+    default void persist(Entity entity) {
+        INSTANCE.persist(entity);
     }
 
     /**
@@ -61,9 +72,9 @@ public default void persist(Entity entity) {
      * @see #persist(Stream)
      * @see #persist(Object, Object...)
      */
-    public default void persistAndFlush(Entity entity) {
-        JpaOperations.persist(entity);
-        JpaOperations.flush();
+    default void persistAndFlush(Entity entity) {
+        INSTANCE.persist(entity);
+        INSTANCE.flush(entity);
     }
 
     /**
@@ -76,8 +87,8 @@ public default void persistAndFlush(Entity entity) {
      * @see #delete(String, Parameters)
      * @see #deleteAll()
      */
-    public default void delete(Entity entity) {
-        JpaOperations.delete(entity);
+    default void delete(Entity entity) {
+        INSTANCE.delete(entity);
     }
 
     /**
@@ -88,15 +99,15 @@ public default void delete(Entity entity) {
      * @param entity the entity to check
      * @return true if the entity is persistent in the database.
      */
-    public default boolean isPersistent(Entity entity) {
-        return JpaOperations.isPersistent(entity);
+    default boolean isPersistent(Entity entity) {
+        return INSTANCE.isPersistent(entity);
     }
 
     /**
-     * Flushes all pending changes to the database.
+     * FFlushes all pending changes to the database using the default EntityManager.
      */
-    public default void flush() {
-        JpaOperations.flush();
+    default void flush() {
+        INSTANCE.getEntityManager().flush();
     }
 
     // Queries
@@ -108,8 +119,8 @@ public default void flush() {
      * @return the entity found, or <code>null</code> if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    public default Entity findById(Id id) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Entity findById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -120,8 +131,8 @@ public default Entity findById(Id id) {
      * @return the entity found, or <code>null</code> if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    public default Entity findById(Id id, LockModeType lockModeType) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Entity findById(Id id, LockModeType lockModeType) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -131,8 +142,8 @@ public default Entity findById(Id id, LockModeType lockModeType) {
      * @return if found, an optional containing the entity, else <code>Optional.empty()</code>.
      */
     @GenerateBridge
-    public default Optional<Entity> findByIdOptional(Id id) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Optional<Entity> findByIdOptional(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -142,8 +153,8 @@ public default Optional<Entity> findByIdOptional(Id id) {
      * @return if found, an optional containing the entity, else <code>Optional.empty()</code>.
      */
     @GenerateBridge
-    public default Optional<Entity> findByIdOptional(Id id, LockModeType lockModeType) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Optional<Entity> findByIdOptional(Id id, LockModeType lockModeType) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -159,8 +170,8 @@ public default Optional<Entity> findByIdOptional(Id id, LockModeType lockModeTyp
      * @see #stream(String, Object...)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -177,8 +188,8 @@ public default PanacheQuery<Entity> find(String query, Object... params) {
      * @see #stream(String, Sort, Object...)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Sort sort, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -194,8 +205,8 @@ public default PanacheQuery<Entity> find(String query, Sort sort, Object... para
      * @see #stream(String, Map)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -212,8 +223,8 @@ public default PanacheQuery<Entity> find(String query, Map<String, Object> param
      * @see #stream(String, Sort, Map)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -229,8 +240,8 @@ public default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Ob
      * @see #stream(String, Parameters)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -247,8 +258,8 @@ public default PanacheQuery<Entity> find(String query, Parameters params) {
      * @see #stream(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -260,8 +271,8 @@ public default PanacheQuery<Entity> find(String query, Sort sort, Parameters par
      * @see #streamAll()
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> findAll() {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> findAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -274,8 +285,8 @@ public default PanacheQuery<Entity> findAll() {
      * @see #streamAll(Sort)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> findAll(Sort sort) {
-        throw JpaOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> findAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -292,8 +303,8 @@ public default PanacheQuery<Entity> findAll(Sort sort) {
      * @see #stream(String, Object...)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -311,8 +322,8 @@ public default List<Entity> list(String query, Object... params) {
      * @see #stream(String, Sort, Object...)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Sort sort, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -329,8 +340,8 @@ public default List<Entity> list(String query, Sort sort, Object... params) {
      * @see #stream(String, Map)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -348,8 +359,8 @@ public default List<Entity> list(String query, Map<String, Object> params) {
      * @see #stream(String, Sort, Map)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Sort sort, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -366,8 +377,8 @@ public default List<Entity> list(String query, Sort sort, Map<String, Object> pa
      * @see #stream(String, Parameters)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -385,8 +396,8 @@ public default List<Entity> list(String query, Parameters params) {
      * @see #stream(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Sort sort, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -399,8 +410,8 @@ public default List<Entity> list(String query, Sort sort, Parameters params) {
      * @see #streamAll()
      */
     @GenerateBridge
-    public default List<Entity> listAll() {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> listAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -414,8 +425,8 @@ public default List<Entity> listAll() {
      * @see #streamAll(Sort)
      */
     @GenerateBridge
-    public default List<Entity> listAll(Sort sort) {
-        throw JpaOperations.implementationInjectionMissing();
+    default List<Entity> listAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -434,8 +445,8 @@ public default List<Entity> listAll(Sort sort) {
      * @see #list(String, Object...)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -455,8 +466,8 @@ public default Stream<Entity> stream(String query, Object... params) {
      * @see #list(String, Sort, Object...)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Sort sort, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -475,8 +486,8 @@ public default Stream<Entity> stream(String query, Sort sort, Object... params)
      * @see #list(String, Map)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -496,8 +507,8 @@ public default Stream<Entity> stream(String query, Map<String, Object> params) {
      * @see #list(String, Sort, Map)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Sort sort, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -516,8 +527,8 @@ public default Stream<Entity> stream(String query, Sort sort, Map<String, Object
      * @see #list(String, Parameters)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -537,8 +548,8 @@ public default Stream<Entity> stream(String query, Parameters params) {
      * @see #list(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Sort sort, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -553,8 +564,8 @@ public default Stream<Entity> stream(String query, Sort sort, Parameters params)
      * @see #listAll()
      */
     @GenerateBridge
-    public default Stream<Entity> streamAll(Sort sort) {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> streamAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -569,8 +580,8 @@ public default Stream<Entity> streamAll(Sort sort) {
      * @see #listAll(Sort)
      */
     @GenerateBridge
-    public default Stream<Entity> streamAll() {
-        throw JpaOperations.implementationInjectionMissing();
+    default Stream<Entity> streamAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -582,8 +593,8 @@ public default Stream<Entity> streamAll() {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default long count() {
-        throw JpaOperations.implementationInjectionMissing();
+    default long count() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -597,8 +608,8 @@ public default long count() {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default long count(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default long count(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -612,8 +623,8 @@ public default long count(String query, Object... params) {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default long count(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default long count(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -627,21 +638,24 @@ public default long count(String query, Map<String, Object> params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default long count(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default long count(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type from the database.
      * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @return the number of entities deleted.
      * @see #delete(String, Object...)
      * @see #delete(String, Map)
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default long deleteAll() {
-        throw JpaOperations.implementationInjectionMissing();
+    default long deleteAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -651,13 +665,16 @@ public default long deleteAll() {
      * @return false if the entity was not deleted (not found).
      */
     @GenerateBridge
-    public default boolean deleteById(Id id) {
-        throw JpaOperations.implementationInjectionMissing();
+    default boolean deleteById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type matching the given query, with optional indexed parameters.
      * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @param query a {@link io.quarkus.hibernate.orm.panache query string}
      * @param params optional sequence of indexed parameters
      * @return the number of entities deleted.
@@ -666,13 +683,16 @@ public default boolean deleteById(Id id) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default long delete(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default long delete(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @param query a {@link io.quarkus.hibernate.orm.panache query string}
      * @param params {@link Map} of named parameters
      * @return the number of entities deleted.
@@ -681,13 +701,16 @@ public default long delete(String query, Object... params) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default long delete(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default long delete(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Delete all entities of this type matching the given query, with named parameters.
      * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
      * @param query a {@link io.quarkus.hibernate.orm.panache query string}
      * @param params {@link Parameters} of named parameters
      * @return the number of entities deleted.
@@ -696,8 +719,8 @@ public default long delete(String query, Map<String, Object> params) {
      * @see #delete(String, Map)
      */
     @GenerateBridge
-    public default long delete(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default long delete(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -708,8 +731,8 @@ public default long delete(String query, Parameters params) {
      * @see #persist(Stream)
      * @see #persist(Object,Object...)
      */
-    public default void persist(Iterable<Entity> entities) {
-        JpaOperations.persist(entities);
+    default void persist(Iterable<Entity> entities) {
+        INSTANCE.persist(entities);
     }
 
     /**
@@ -720,8 +743,8 @@ public default void persist(Iterable<Entity> entities) {
      * @see #persist(Iterable)
      * @see #persist(Object,Object...)
      */
-    public default void persist(Stream<Entity> entities) {
-        JpaOperations.persist(entities);
+    default void persist(Stream<Entity> entities) {
+        INSTANCE.persist(entities);
     }
 
     /**
@@ -732,8 +755,8 @@ public default void persist(Stream<Entity> entities) {
      * @see #persist(Stream)
      * @see #persist(Iterable)
      */
-    public default void persist(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
-        JpaOperations.persist(firstEntity, entities);
+    default void persist(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
+        INSTANCE.persist(firstEntity, entities);
     }
 
     /**
@@ -746,8 +769,8 @@ public default void persist(Entity firstEntity, @SuppressWarnings("unchecked") E
      * @see #update(String, Parameters)
      */
     @GenerateBridge
-    public default int update(String query, Object... params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default int update(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -760,8 +783,8 @@ public default int update(String query, Object... params) {
      * @see #update(String, Parameters)
      */
     @GenerateBridge
-    public default int update(String query, Map<String, Object> params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default int update(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -774,7 +797,7 @@ public default int update(String query, Map<String, Object> params) {
      * @see #update(String, Map)
      */
     @GenerateBridge
-    public default int update(String query, Parameters params) {
-        throw JpaOperations.implementationInjectionMissing();
+    default int update(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 }
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java
index a68038f8e9949..da94ab5dafa65 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java
+++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/AdditionalJpaOperations.java
@@ -1,11 +1,26 @@
 package io.quarkus.hibernate.orm.panache.runtime;
 
+import static io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil.createFindQuery;
+import static io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil.toOrderBy;
+
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import javax.persistence.metamodel.Attribute;
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.Metamodel;
+
+import org.hibernate.engine.spi.CascadeStyle;
+import org.hibernate.engine.spi.CascadingActions;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.metamodel.model.domain.internal.EntityTypeImpl;
 
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
 
@@ -14,26 +29,105 @@
 public class AdditionalJpaOperations {
 
     @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, String countQuery, Sort sort,
-            Map<String, Object> params) {
-        String findQuery = JpaOperations.createFindQuery(entityClass, query, JpaOperations.paramCount(params));
-        EntityManager em = JpaOperations.getEntityManager();
-        Query jpaQuery = em.createQuery(sort != null ? findQuery + JpaOperations.toOrderBy(sort) : findQuery);
+    public static PanacheQuery<?> find(AbstractJpaOperations<?> jpaOperations, Class<?> entityClass, String query,
+            String countQuery, Sort sort, Map<String, Object> params) {
+        String findQuery = createFindQuery(entityClass, query, jpaOperations.paramCount(params));
+        EntityManager em = jpaOperations.getEntityManager();
+        Query jpaQuery = em.createQuery(sort != null ? findQuery + toOrderBy(sort) : findQuery);
         JpaOperations.bindParameters(jpaQuery, params);
         return new CustomCountPanacheQuery(em, jpaQuery, findQuery, countQuery, params);
     }
 
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, String countQuery, Sort sort,
-            Parameters parameters) {
-        return find(entityClass, query, countQuery, sort, parameters.map());
+    public static PanacheQuery<?> find(AbstractJpaOperations<?> jpaOperations, Class<?> entityClass, String query,
+            String countQuery, Sort sort, Parameters parameters) {
+        return find(jpaOperations, entityClass, query, countQuery, sort, parameters.map());
     }
 
     @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, String countQuery, Sort sort, Object... params) {
-        String findQuery = JpaOperations.createFindQuery(entityClass, query, JpaOperations.paramCount(params));
-        EntityManager em = JpaOperations.getEntityManager();
-        Query jpaQuery = em.createQuery(sort != null ? findQuery + JpaOperations.toOrderBy(sort) : findQuery);
+    public static PanacheQuery<?> find(AbstractJpaOperations<?> jpaOperations, Class<?> entityClass, String query,
+            String countQuery, Sort sort, Object... params) {
+        String findQuery = createFindQuery(entityClass, query, jpaOperations.paramCount(params));
+        EntityManager em = jpaOperations.getEntityManager();
+        Query jpaQuery = em.createQuery(sort != null ? findQuery + toOrderBy(sort) : findQuery);
         JpaOperations.bindParameters(jpaQuery, params);
         return new CustomCountPanacheQuery(em, jpaQuery, findQuery, countQuery, params);
     }
+
+    public static long deleteAllWithCascade(AbstractJpaOperations<?> jpaOperations, Class<?> entityClass) {
+        EntityManager em = jpaOperations.getEntityManager();
+        //detecting the case where there are cascade-delete associations, and do the the bulk delete query otherwise.
+        if (deleteOnCascadeDetected(jpaOperations, entityClass)) {
+            int count = 0;
+            List<?> objects = jpaOperations.listAll(entityClass);
+            for (Object entity : objects) {
+                em.remove(entity);
+                count++;
+            }
+            return count;
+        }
+        return jpaOperations.deleteAll(entityClass);
+    }
+
+    /**
+     * Detects if cascading delete is needed. The delete-cascading is needed when associations with cascade delete enabled
+     * {@link javax.persistence.OneToMany#cascade()} and also on entities containing a collection of elements
+     * {@link javax.persistence.ElementCollection}
+     *
+     * @param entityClass
+     * @return true if cascading delete is needed. False otherwise
+     */
+    private static boolean deleteOnCascadeDetected(AbstractJpaOperations<?> jpaOperations, Class<?> entityClass) {
+        EntityManager em = jpaOperations.getEntityManager();
+        Metamodel metamodel = em.getMetamodel();
+        EntityType<?> entity1 = metamodel.entity(entityClass);
+        Set<Attribute<?, ?>> declaredAttributes = ((EntityTypeImpl) entity1).getDeclaredAttributes();
+
+        CascadeStyle[] propertyCascadeStyles = em.unwrap(SessionImplementor.class)
+                .getEntityPersister(entityClass.getName(), null)
+                .getPropertyCascadeStyles();
+        boolean doCascade = Arrays.stream(propertyCascadeStyles)
+                .anyMatch(cascadeStyle -> cascadeStyle.doCascade(CascadingActions.DELETE));
+        boolean hasElementCollection = declaredAttributes.stream()
+                .filter(attribute -> attribute.getPersistentAttributeType()
+                        .equals(Attribute.PersistentAttributeType.ELEMENT_COLLECTION))
+                .count() > 0;
+        return doCascade || hasElementCollection;
+
+    }
+
+    public static <PanacheQueryType> long deleteWithCascade(AbstractJpaOperations<PanacheQueryType> jpaOperations,
+            Class<?> entityClass, String query, Object... params) {
+        EntityManager em = jpaOperations.getEntityManager();
+        if (deleteOnCascadeDetected(jpaOperations, entityClass)) {
+            int count = 0;
+            List<?> objects = jpaOperations.list(jpaOperations.find(entityClass, query, params));
+            for (Object entity : objects) {
+                em.remove(entity);
+                count++;
+            }
+            return count;
+        }
+        return jpaOperations.delete(entityClass, query, params);
+    }
+
+    public static <PanacheQueryType> long deleteWithCascade(AbstractJpaOperations<PanacheQueryType> jpaOperations,
+            Class<?> entityClass, String query,
+            Map<String, Object> params) {
+        EntityManager em = jpaOperations.getEntityManager();
+        if (deleteOnCascadeDetected(jpaOperations, entityClass)) {
+            int count = 0;
+            List<?> objects = jpaOperations.list(jpaOperations.find(entityClass, query, params));
+            for (Object entity : objects) {
+                em.remove(entity);
+                count++;
+            }
+            return count;
+        }
+        return jpaOperations.delete(entityClass, query, params);
+    }
+
+    public static long deleteWithCascade(AbstractJpaOperations<?> jpaOperations, Class<?> entityClass, String query,
+            Parameters params) {
+        return deleteWithCascade(jpaOperations, entityClass, query, params.map());
+    }
 }
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java
index 8073e1fc9caa0..783385a053e96 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java
+++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/JpaOperations.java
@@ -1,336 +1,32 @@
 package io.quarkus.hibernate.orm.panache.runtime;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.transaction.TransactionManager;
 
-import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
-import io.quarkus.panache.common.Parameters;
-import io.quarkus.panache.common.Sort;
 
-public class JpaOperations {
+public class JpaOperations extends AbstractJpaOperations<PanacheQueryImpl<?>> {
+    /**
+     * Provides the default implementations for quarkus to wire up. Should not be used by third party developers.
+     */
+    public static final JpaOperations INSTANCE = new JpaOperations();
 
-    private static class JavaJpaOperations extends AbstractJpaOperations<PanacheQueryImpl<?>> {
-
-        @Override
-        protected PanacheQueryImpl<?> createPanacheQuery(EntityManager em, String query, String orderBy,
-                Object paramsArrayOrMap) {
-            return new PanacheQueryImpl<>(em, query, orderBy, paramsArrayOrMap);
-        }
-
-        @Override
-        protected List<?> list(PanacheQueryImpl<?> query) {
-            return query.list();
-        }
-
-        @Override
-        protected Stream<?> stream(PanacheQueryImpl<?> query) {
-            return query.stream();
-        }
-
-    }
-
-    private static final JavaJpaOperations delegate = new JavaJpaOperations();
-
-    //
-    // Instance methods
-
-    public static void persist(Object entity) {
-        delegate.persist(entity);
-    }
-
-    public static void persist(EntityManager em, Object entity) {
-        delegate.persist(em, entity);
-    }
-
-    public static void persist(Iterable<?> entities) {
-        delegate.persist(entities);
-    }
-
-    public static void persist(Object firstEntity, Object... entities) {
-        delegate.persist(firstEntity, entities);
-    }
-
-    public static void persist(Stream<?> entities) {
-        delegate.persist(entities);
-    }
-
-    public static void delete(Object entity) {
-        delegate.delete(entity);
-    }
-
-    public static boolean isPersistent(Object entity) {
-        return delegate.isPersistent(entity);
-    }
-
-    public static void flush() {
-        delegate.flush();
-    }
-
-    //
-    // Private stuff
-
-    public static EntityManager getEntityManager() {
-        return delegate.getEntityManager();
-    }
-
-    public static TransactionManager getTransactionManager() {
-        return delegate.getTransactionManager();
-    }
-
-    public static Query bindParameters(Query query, Object[] params) {
-        return AbstractJpaOperations.bindParameters(query, params);
-    }
-
-    public static Query bindParameters(Query query, Map<String, Object> params) {
-        return AbstractJpaOperations.bindParameters(query, params);
-    }
-
-    static int paramCount(Object[] params) {
-        return delegate.paramCount(params);
-    }
-
-    static int paramCount(Map<String, Object> params) {
-        return delegate.paramCount(params);
-    }
-
-    //
-    //    private static String getEntityName(Class<?> entityClass) {
-    //        return delegate.getEntityName(entityClass);
-    //    }
-    //
-    static String createFindQuery(Class<?> entityClass, String query, int paramCount) {
-        return delegate.createFindQuery(entityClass, query, paramCount);
-    }
-    //
-    //    static boolean isNamedQuery(String query) {
-    //        return delegate.isNamedQuery(query);
-    //    }
-    //
-    //    private static String createCountQuery(Class<?> entityClass, String query, int paramCount) {
-    //        return delegate.createCountQuery(entityClass, query, paramCount);
-    //    }
-    //
-    //    private static String createUpdateQuery(Class<?> entityClass, String query, int paramCount) {
-    //        return delegate.createUpdateQuery(entityClass, query, paramCount);
-    //    }
-    //
-    //    private static String createDeleteQuery(Class<?> entityClass, String query, int paramCount) {
-    //        return delegate.createDeleteQuery(entityClass, query, paramCount);
-    //    }
-
-    public static String toOrderBy(Sort sort) {
-        return delegate.toOrderBy(sort);
-    }
-
-    //
-    // Queries
-
-    public static Object findById(Class<?> entityClass, Object id) {
-        return delegate.findById(entityClass, id);
-    }
-
-    public static Object findById(Class<?> entityClass, Object id, LockModeType lockModeType) {
-        return delegate.findById(entityClass, id, lockModeType);
-    }
-
-    public static Optional<?> findByIdOptional(Class<?> entityClass, Object id) {
-        return delegate.findByIdOptional(entityClass, id);
-    }
-
-    public static Optional<?> findByIdOptional(Class<?> entityClass, Object id, LockModeType lockModeType) {
-        return delegate.findByIdOptional(entityClass, id, lockModeType);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Object... params) {
-        return delegate.find(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return delegate.find(entityClass, query, sort, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.find(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return delegate.find(entityClass, query, sort, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Parameters params) {
-        return delegate.find(entityClass, query, params);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return delegate.find(entityClass, query, sort, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Object... params) {
-        return delegate.list(entityClass, query, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return delegate.list(entityClass, query, sort, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.list(entityClass, query, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return delegate.list(entityClass, query, sort, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Parameters params) {
-        return delegate.list(entityClass, query, params);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return delegate.list(entityClass, query, sort, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Object... params) {
-        return delegate.stream(entityClass, query, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return delegate.stream(entityClass, query, sort, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.stream(entityClass, query, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return delegate.stream(entityClass, query, sort, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Parameters params) {
-        return delegate.stream(entityClass, query, params);
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return delegate.stream(entityClass, query, sort, params);
-    }
-
-    public static PanacheQuery<?> findAll(Class<?> entityClass) {
-        return delegate.findAll(entityClass);
-    }
-
-    public static PanacheQuery<?> findAll(Class<?> entityClass, Sort sort) {
-        return delegate.findAll(entityClass, sort);
-    }
-
-    public static List<?> listAll(Class<?> entityClass) {
-        return delegate.listAll(entityClass);
-    }
-
-    public static List<?> listAll(Class<?> entityClass, Sort sort) {
-        return delegate.listAll(entityClass, sort);
-    }
-
-    public static Stream<?> streamAll(Class<?> entityClass) {
-        return delegate.streamAll(entityClass);
-    }
-
-    public static Stream<?> streamAll(Class<?> entityClass, Sort sort) {
-        return delegate.streamAll(entityClass, sort);
-    }
-
-    public static long count(Class<?> entityClass) {
-        return delegate.count(entityClass);
-    }
-
-    public static long count(Class<?> entityClass, String query, Object... params) {
-        return delegate.count(entityClass, query, params);
-    }
-
-    public static long count(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.count(entityClass, query, params);
-    }
-
-    public static long count(Class<?> entityClass, String query, Parameters params) {
-        return delegate.count(entityClass, query, params);
-    }
-
-    public static boolean exists(Class<?> entityClass) {
-        return delegate.exists(entityClass);
-    }
-
-    public static boolean exists(Class<?> entityClass, String query, Object... params) {
-        return delegate.exists(entityClass, query, params);
-    }
-
-    public static boolean exists(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.exists(entityClass, query, params);
-    }
-
-    public static boolean exists(Class<?> entityClass, String query, Parameters params) {
-        return delegate.exists(entityClass, query, params);
-    }
-
-    public static long deleteAll(Class<?> entityClass) {
-        return delegate.deleteAll(entityClass);
-    }
-
-    public static boolean deleteById(Class<?> entityClass, Object id) {
-        return delegate.deleteById(entityClass, id);
-    }
-
-    public static long delete(Class<?> entityClass, String query, Object... params) {
-        return delegate.delete(entityClass, query, params);
-    }
-
-    public static long delete(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.delete(entityClass, query, params);
-    }
-
-    public static long delete(Class<?> entityClass, String query, Parameters params) {
-        return delegate.delete(entityClass, query, params);
-    }
-
-    public static IllegalStateException implementationInjectionMissing() {
-        return delegate.implementationInjectionMissing();
-    }
-
-    public static int executeUpdate(String query, Object... params) {
-        return delegate.executeUpdate(query, params);
-    }
-
-    public static int executeUpdate(String query, Map<String, Object> params) {
-        return delegate.executeUpdate(query, params);
-    }
-
-    public static int executeUpdate(Class<?> entityClass, String query, Object... params) {
-        return delegate.executeUpdate(entityClass, query, params);
-    }
-
-    public static int executeUpdate(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.executeUpdate(entityClass, query, params);
-    }
-
-    public static int update(Class<?> entityClass, String query, Map<String, Object> params) {
-        return delegate.update(entityClass, query, params);
-    }
-
-    public static int update(Class<?> entityClass, String query, Parameters params) {
-        return delegate.update(entityClass, query, params);
+    @Override
+    protected PanacheQueryImpl<?> createPanacheQuery(EntityManager em, String query, String orderBy,
+            Object paramsArrayOrMap) {
+        return new PanacheQueryImpl<>(em, query, orderBy, paramsArrayOrMap);
     }
 
-    public static int update(Class<?> entityClass, String query, Object... params) {
-        return delegate.update(entityClass, query, params);
+    @Override
+    public List<?> list(PanacheQueryImpl<?> query) {
+        return query.list();
     }
 
-    public static void setRollbackOnly() {
-        delegate.setRollbackOnly();
+    @Override
+    public Stream<?> stream(PanacheQueryImpl<?> query) {
+        return query.stream();
     }
 
 }
diff --git a/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheHibernateOrmRecorder.java b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheHibernateOrmRecorder.java
new file mode 100644
index 0000000000000..2d8abcbf9610f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-panache/runtime/src/main/java/io/quarkus/hibernate/orm/panache/runtime/PanacheHibernateOrmRecorder.java
@@ -0,0 +1,13 @@
+package io.quarkus.hibernate.orm.panache.runtime;
+
+import java.util.Map;
+
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class PanacheHibernateOrmRecorder {
+    public void setEntityToPersistenceUnit(Map<String, String> entityToPersistenceUnit) {
+        AbstractJpaOperations.setEntityToPersistenceUnit(entityToPersistenceUnit);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
index da68c8ac1ae8c..0a23562bece62 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
@@ -7,7 +7,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-hibernate-orm-rest-data-panache-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-hibernate-orm-rest-data-panache-deployment</artifactId>
@@ -38,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/DataAccessImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/DataAccessImplementor.java
new file mode 100644
index 0000000000000..069a0ce37218d
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/DataAccessImplementor.java
@@ -0,0 +1,65 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+
+/**
+ * Implement data access logic for a specific data access strategy.
+ */
+public interface DataAccessImplementor {
+
+    /**
+     * Find an entity by ID and return a result.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param id Requested entity ID.
+     * @return A requested entity or null if it wasn't found.
+     */
+    ResultHandle findById(BytecodeCreator creator, ResultHandle id);
+
+    /**
+     * Find all entities.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param page Page instance that should be used in a query. Might be null if pagination is disabled.
+     * @param sort Sort instance that should be used in a query.
+     * @return Entity list
+     */
+    ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort);
+
+    /**
+     * Persist a new entity.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param entity An entity that should be persisted.
+     * @return A persisted entity.
+     */
+    ResultHandle persist(BytecodeCreator creator, ResultHandle entity);
+
+    /**
+     * Update an existing entity or create a new one.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param entity Entity that should be updated or created.
+     * @return A persisted entity.
+     */
+    ResultHandle update(BytecodeCreator creator, ResultHandle entity);
+
+    /**
+     * Delete entity by ID.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param id Entity ID.
+     * @return Boolean indicating whether an entity was deleted or not.
+     */
+    ResultHandle deleteById(BytecodeCreator creator, ResultHandle id);
+
+    /**
+     * Available number of pages given a page instance.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param page Page instance.
+     * @return int page count.
+     */
+    ResultHandle pageCount(BytecodeCreator creator, ResultHandle page);
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java
new file mode 100644
index 0000000000000..2a468bee9ef54
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityClassHelper.java
@@ -0,0 +1,70 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment;
+
+import javax.persistence.Id;
+
+import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.gizmo.MethodDescriptor;
+
+public class EntityClassHelper {
+
+    private final IndexView index;
+
+    public EntityClassHelper(IndexView index) {
+        this.index = index;
+    }
+
+    public FieldInfo getIdField(String className) {
+        return getIdField(index.getClassByName(DotName.createSimple(className)));
+    }
+
+    private FieldInfo getIdField(ClassInfo classInfo) {
+        ClassInfo tmpClassInfo = classInfo;
+        while (tmpClassInfo != null) {
+            for (FieldInfo field : tmpClassInfo.fields()) {
+                if (field.hasAnnotation(DotName.createSimple(Id.class.getName()))) {
+                    return field;
+                }
+            }
+            if (tmpClassInfo.superName() != null) {
+                tmpClassInfo = index.getClassByName(tmpClassInfo.superName());
+            } else {
+                tmpClassInfo = null;
+            }
+        }
+        throw new IllegalArgumentException("Couldn't find id field of " + classInfo);
+    }
+
+    public MethodDescriptor getSetter(String className, FieldInfo field) {
+        return getSetter(index.getClassByName(DotName.createSimple(className)), field);
+    }
+
+    private MethodDescriptor getSetter(ClassInfo entityClass, FieldInfo field) {
+        MethodDescriptor setter = getMethod(entityClass, JavaBeanUtil.getSetterName(field.name()), field.type());
+        if (setter != null) {
+            return setter;
+        }
+        return MethodDescriptor.ofMethod(entityClass.toString(),
+                EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + field.name(), void.class, field.type().name().toString());
+    }
+
+    private MethodDescriptor getMethod(ClassInfo entityClass, String name, Type... parameters) {
+        if (entityClass == null) {
+            return null;
+        }
+        MethodInfo methodInfo = entityClass.method(name, parameters);
+        if (methodInfo != null) {
+            return MethodDescriptor.of(methodInfo);
+        } else if (entityClass.superName() != null) {
+            return getMethod(index.getClassByName(entityClass.superName()), name, parameters);
+        }
+        return null;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java
index 4f6ebc6edcea6..902a73c334a19 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java
@@ -10,10 +10,12 @@
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
 import io.quarkus.panache.common.Page;
-import io.quarkus.rest.data.panache.deployment.DataAccessImplementor;
+import io.quarkus.panache.common.Sort;
 
+/**
+ * Implement data access using active record.
+ */
 final class EntityDataAccessImplementor implements DataAccessImplementor {
 
     private final String entityClassName;
@@ -22,46 +24,63 @@ final class EntityDataAccessImplementor implements DataAccessImplementor {
         this.entityClassName = entityClassName;
     }
 
+    /**
+     * Implements <code>Entity.findById(id)</code>
+     */
     @Override
     public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
-        return creator.invokeStaticMethod(ofMethod(entityClassName, "findById", PanacheEntityBase.class, Object.class), id);
+        return creator.invokeStaticMethod(ofMethod(entityClassName, "findById", PanacheEntityBase.class, Object.class),
+                id);
     }
 
+    /**
+     * Implements <code>Entity.findAll(sort).page(page).list()</code>
+     */
     @Override
-    public ResultHandle listAll(BytecodeCreator creator) {
-        return creator.invokeStaticMethod(ofMethod(entityClassName, "listAll", List.class));
-    }
-
-    @Override
-    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page) {
-        ResultHandle query = creator.invokeStaticMethod(ofMethod(entityClassName, "findAll", PanacheQuery.class));
-        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query, page);
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort) {
+        ResultHandle query = creator.invokeStaticMethod(
+                ofMethod(entityClassName, "findAll", PanacheQuery.class, Sort.class), sort);
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
         return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
     }
 
+    /**
+     * Implements <code>entity.persist()</code>
+     */
     @Override
     public ResultHandle persist(BytecodeCreator creator, ResultHandle entity) {
         creator.invokeVirtualMethod(ofMethod(entityClassName, "persist", void.class), entity);
         return entity;
     }
 
+    /**
+     * Implements <code>JpaOperations.getEntityManager().merge(entity)</code>
+     */
     @Override
     public ResultHandle update(BytecodeCreator creator, ResultHandle entity) {
-        ResultHandle entityManager = creator.invokeStaticMethod(
-                ofMethod(JpaOperations.class, "getEntityManager", EntityManager.class));
+        ResultHandle entityManager = creator.invokeVirtualMethod(
+                ofMethod(entityClassName, "getEntityManager", EntityManager.class), entity);
         return creator.invokeInterfaceMethod(
                 ofMethod(EntityManager.class, "merge", Object.class, Object.class), entityManager, entity);
     }
 
+    /**
+     * Implements <code>Entity.deleteById(id)</code>
+     */
     @Override
     public ResultHandle deleteById(BytecodeCreator creator, ResultHandle id) {
         return creator.invokeStaticMethod(ofMethod(entityClassName, "deleteById", boolean.class, Object.class), id);
     }
 
+    /**
+     * Implements <code>Entity.findAll().page(page).pageCount()</code>
+     */
     @Override
     public ResultHandle pageCount(BytecodeCreator creator, ResultHandle page) {
         ResultHandle query = creator.invokeStaticMethod(ofMethod(entityClassName, "findAll", PanacheQuery.class));
-        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query, page);
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
         return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "pageCount", int.class), query);
     }
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java
index 371599eb97492..d258aa19ace3e 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java
@@ -10,15 +10,20 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Type;
 
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
 import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
+import io.quarkus.hibernate.orm.rest.data.panache.runtime.RestDataPanacheExceptionMapper;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
 import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
 
 class HibernateOrmPanacheRestProcessor {
 
@@ -34,33 +39,66 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    void findEntityResources(CombinedIndexBuildItem index, BuildProducer<RestDataResourceBuildItem> resourcesProducer) {
+    ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() {
+        return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName());
+    }
+
+    /**
+     * Find Panache entity resources and generate their implementations.
+     */
+    @BuildStep
+    void findEntityResources(CombinedIndexBuildItem index,
+            BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer) {
+        ResourceImplementor resourceImplementor = new ResourceImplementor(new EntityClassHelper(index.getIndex()));
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
+
         for (ClassInfo classInfo : index.getIndex().getKnownDirectImplementors(PANACHE_ENTITY_RESOURCE_INTERFACE)) {
             validateResource(index.getIndex(), classInfo);
+
             List<Type> generics = getGenericTypes(classInfo);
-            String entityClassName = generics.get(0).toString();
-            String idClassName = generics.get(1).toString();
-            RestDataResourceInfo resourceInfo = HibernateOrmRestDataResourceInfo
-                    .withEntityAccess(classInfo, idClassName, entityClassName);
-            resourcesProducer.produce(new RestDataResourceBuildItem(resourceInfo));
+            String resourceInterface = classInfo.name().toString();
+            String entityType = generics.get(0).name().toString();
+            String idType = generics.get(1).name().toString();
+
+            DataAccessImplementor dataAccessImplementor = new EntityDataAccessImplementor(entityType);
+            String resourceClass = resourceImplementor.implement(
+                    classOutput, dataAccessImplementor, resourceInterface, entityType);
+
+            restDataResourceProducer.produce(new RestDataResourceBuildItem(
+                    new ResourceMetadata(resourceClass, resourceInterface, entityType, idType)));
         }
     }
 
+    /**
+     * Find Panache repository resources and generate their implementations.
+     */
     @BuildStep
     void findRepositoryResources(CombinedIndexBuildItem index,
-            BuildProducer<RestDataResourceBuildItem> resourcesProducer,
+            BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeansProducer) {
+        ResourceImplementor resourceImplementor = new ResourceImplementor(new EntityClassHelper(index.getIndex()));
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
+
         for (ClassInfo classInfo : index.getIndex().getKnownDirectImplementors(PANACHE_REPOSITORY_RESOURCE_INTERFACE)) {
             validateResource(index.getIndex(), classInfo);
+
             List<Type> generics = getGenericTypes(classInfo);
-            String repositoryClassName = generics.get(0).toString();
-            String entityClassName = generics.get(1).toString();
-            String idClassName = generics.get(2).toString();
-            RestDataResourceInfo resourceInfo = HibernateOrmRestDataResourceInfo
-                    .withRepositoryAccess(classInfo, idClassName, entityClassName, repositoryClassName);
-            resourcesProducer.produce(new RestDataResourceBuildItem(resourceInfo));
-            unremovableBeansProducer.produce(
-                    new UnremovableBeanBuildItem(new UnremovableBeanBuildItem.BeanClassNameExclusion(repositoryClassName)));
+            String resourceInterface = classInfo.name().toString();
+            String repositoryClassName = generics.get(0).name().toString();
+            String entityType = generics.get(1).name().toString();
+            String idType = generics.get(2).name().toString();
+
+            DataAccessImplementor dataAccessImplementor = new RepositoryDataAccessImplementor(repositoryClassName);
+            String resourceClass = resourceImplementor.implement(
+                    classOutput, dataAccessImplementor, resourceInterface, entityType);
+            // Make sure that repository bean is not removed and will be injected to the generated resource
+            unremovableBeansProducer.produce(new UnremovableBeanBuildItem(
+                    new UnremovableBeanBuildItem.BeanClassNameExclusion(repositoryClassName)));
+
+            restDataResourceProducer.produce(new RestDataResourceBuildItem(
+                    new ResourceMetadata(resourceClass, resourceInterface, entityType, idType)));
         }
     }
 
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmRestDataResourceInfo.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmRestDataResourceInfo.java
deleted file mode 100644
index 581eadf758b1c..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmRestDataResourceInfo.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment;
-
-import java.util.function.Predicate;
-
-import javax.persistence.Id;
-
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-
-import io.quarkus.rest.data.panache.deployment.DataAccessImplementor;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-
-public class HibernateOrmRestDataResourceInfo implements RestDataResourceInfo {
-
-    private final ClassInfo classInfo;
-
-    private final String idClassName;
-
-    private final String entityClassName;
-
-    private final DataAccessImplementor dataAccessImplementor;
-
-    private HibernateOrmRestDataResourceInfo(ClassInfo classInfo, String idClassName, String entityClassName,
-            DataAccessImplementor dataAccessImplementor) {
-        this.classInfo = classInfo;
-        this.idClassName = idClassName;
-        this.entityClassName = entityClassName;
-        this.dataAccessImplementor = dataAccessImplementor;
-    }
-
-    public static RestDataResourceInfo withEntityAccess(ClassInfo classInfo, String idClassName, String entityClassName) {
-        return new HibernateOrmRestDataResourceInfo(classInfo, idClassName, entityClassName,
-                new EntityDataAccessImplementor(entityClassName));
-    }
-
-    public static RestDataResourceInfo withRepositoryAccess(ClassInfo classInfo, String idClassName, String entityClassName,
-            String repositoryClassName) {
-        return new HibernateOrmRestDataResourceInfo(classInfo, idClassName, entityClassName,
-                new RepositoryDataAccessImplementor(repositoryClassName));
-    }
-
-    @Override
-    public ClassInfo getClassInfo() {
-        return classInfo;
-    }
-
-    @Override
-    public String getIdClassName() {
-        return idClassName;
-    }
-
-    @Override
-    public String getEntityClassName() {
-        return entityClassName;
-    }
-
-    @Override
-    public DataAccessImplementor getDataAccessImplementor() {
-        return dataAccessImplementor;
-    }
-
-    @Override
-    public Predicate<FieldInfo> getIdFieldPredicate() {
-        return fieldInfo -> fieldInfo.hasAnnotation(DotName.createSimple(Id.class.getName()));
-    }
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
index cdf4c0cff72be..88d67382bb5e7 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
@@ -11,13 +11,16 @@
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
 import io.quarkus.panache.common.Page;
-import io.quarkus.rest.data.panache.deployment.DataAccessImplementor;
+import io.quarkus.panache.common.Sort;
 
+/**
+ * Implement data access using repository.
+ */
 final class RepositoryDataAccessImplementor implements DataAccessImplementor {
 
     private final String repositoryClassName;
@@ -26,26 +29,30 @@ final class RepositoryDataAccessImplementor implements DataAccessImplementor {
         this.repositoryClassName = repositoryClassName;
     }
 
+    /**
+     * Implements <code>repository.findById(id)</code>
+     */
     @Override
     public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
         return creator.invokeInterfaceMethod(ofMethod(PanacheRepositoryBase.class, "findById", Object.class, Object.class),
                 getRepositoryInstance(creator), id);
     }
 
+    /**
+     * Implements <code>repository.findAll(sort).page(page).list()</code>
+     */
     @Override
-    public ResultHandle listAll(BytecodeCreator creator) {
-        return creator.invokeInterfaceMethod(ofMethod(PanacheRepositoryBase.class, "listAll", List.class),
-                getRepositoryInstance(creator));
-    }
-
-    @Override
-    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page) {
-        ResultHandle query = creator.invokeInterfaceMethod(ofMethod(PanacheRepositoryBase.class, "findAll", PanacheQuery.class),
-                getRepositoryInstance(creator));
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort) {
+        ResultHandle query = creator.invokeInterfaceMethod(
+                ofMethod(PanacheRepositoryBase.class, "findAll", PanacheQuery.class, Sort.class),
+                getRepositoryInstance(creator), sort);
         creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query, page);
         return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
     }
 
+    /**
+     * Implements <code>repository.persist(entity)</code>
+     */
     @Override
     public ResultHandle persist(BytecodeCreator creator, ResultHandle entity) {
         creator.invokeInterfaceMethod(ofMethod(PanacheRepositoryBase.class, "persist", void.class, Object.class),
@@ -53,20 +60,31 @@ public ResultHandle persist(BytecodeCreator creator, ResultHandle entity) {
         return entity;
     }
 
+    /**
+     * Implements <code>JpaOperations.getEntityManager().merge(entity)</code>
+     */
     @Override
     public ResultHandle update(BytecodeCreator creator, ResultHandle entity) {
-        ResultHandle entityManager = creator.invokeStaticMethod(
-                ofMethod(JpaOperations.class, "getEntityManager", EntityManager.class));
+        MethodDescriptor getEntityManager = ofMethod(PanacheRepositoryBase.class, "getEntityManager",
+                EntityManager.class, Class.class);
+        ResultHandle entityManager = creator.invokeInterfaceMethod(getEntityManager, getRepositoryInstance(creator),
+                creator.invokeVirtualMethod(ofMethod(Object.class, "getClass", Class.class), entity));
         return creator.invokeInterfaceMethod(
                 ofMethod(EntityManager.class, "merge", Object.class, Object.class), entityManager, entity);
     }
 
+    /**
+     * Implements <code>repository.deleteById(id)</code>
+     */
     @Override
     public ResultHandle deleteById(BytecodeCreator creator, ResultHandle id) {
         return creator.invokeInterfaceMethod(ofMethod(PanacheRepositoryBase.class, "deleteById", boolean.class, Object.class),
                 getRepositoryInstance(creator), id);
     }
 
+    /**
+     * Implements <code>repository.findAll().page(page).pageCount()</code>
+     */
     @Override
     public ResultHandle pageCount(BytecodeCreator creator, ResultHandle page) {
         ResultHandle query = creator.invokeInterfaceMethod(ofMethod(PanacheRepositoryBase.class, "findAll", PanacheQuery.class),
@@ -75,6 +93,10 @@ public ResultHandle pageCount(BytecodeCreator creator, ResultHandle page) {
         return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "pageCount", int.class), query);
     }
 
+    /**
+     * Implements getting repository from Arc container.
+     * <code>Arc.container().instance(Repository.class, new Annotation[0]).get()</code>
+     */
     private ResultHandle getRepositoryInstance(BytecodeCreator creator) {
         ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class));
         ResultHandle instanceHandle = creator.invokeInterfaceMethod(
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java
new file mode 100644
index 0000000000000..f86b8c7533432
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java
@@ -0,0 +1,124 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.transaction.Transactional;
+
+import org.jboss.jandex.FieldInfo;
+import org.jboss.logging.Logger;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.rest.data.panache.deployment.Constants;
+import io.quarkus.runtime.util.HashUtil;
+
+/**
+ * {@link io.quarkus.rest.data.panache.RestDataResource} implementor that generates data access logic depending on which
+ * sub-interfaces are used in the application.
+ * The method implementation differs depending on a data access strategy (active record or repository).
+ */
+class ResourceImplementor {
+
+    private static final Logger LOGGER = Logger.getLogger(ResourceImplementor.class);
+
+    private final EntityClassHelper entityClassHelper;
+
+    ResourceImplementor(EntityClassHelper entityClassHelper) {
+        this.entityClassHelper = entityClassHelper;
+    }
+
+    /**
+     * Implements {@link io.quarkus.rest.data.panache.RestDataResource} interfaces defined in a user application.
+     * Instances of this class are registered as beans and are later used in the generated JAX-RS controllers.
+     */
+    String implement(ClassOutput classOutput, DataAccessImplementor dataAccessImplementor, String resourceType,
+            String entityType) {
+        String className = resourceType + "Impl_" + HashUtil.sha1(resourceType);
+        LOGGER.tracef("Starting generation of '%s'", className);
+        ClassCreator classCreator = ClassCreator.builder()
+                .classOutput(classOutput)
+                .className(className)
+                .interfaces(resourceType)
+                .build();
+
+        classCreator.addAnnotation(ApplicationScoped.class);
+        implementList(classCreator, dataAccessImplementor);
+        implementListPageCount(classCreator, dataAccessImplementor);
+        implementGet(classCreator, dataAccessImplementor);
+        implementAdd(classCreator, dataAccessImplementor);
+        implementUpdate(classCreator, dataAccessImplementor, entityType);
+        implementDelete(classCreator, dataAccessImplementor);
+
+        classCreator.close();
+        LOGGER.tracef("Completed generation of '%s'", className);
+        return className;
+    }
+
+    private void implementList(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("list", List.class, Page.class, Sort.class);
+        ResultHandle page = methodCreator.getMethodParam(0);
+        ResultHandle sort = methodCreator.getMethodParam(1);
+        methodCreator.returnValue(dataAccessImplementor.findAll(methodCreator, page, sort));
+        methodCreator.close();
+    }
+
+    /**
+     * Generate list page count method.
+     * This method is used when building page URLs for list operation response and is not exposed to a user.
+     */
+    private void implementListPageCount(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(Constants.PAGE_COUNT_METHOD_PREFIX + "list", int.class,
+                Page.class);
+        ResultHandle page = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.pageCount(methodCreator, page));
+        methodCreator.close();
+    }
+
+    private void implementGet(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("get", Object.class, Object.class);
+        ResultHandle id = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.findById(methodCreator, id));
+        methodCreator.close();
+    }
+
+    private void implementAdd(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("add", Object.class, Object.class);
+        methodCreator.addAnnotation(Transactional.class);
+        ResultHandle entity = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.persist(methodCreator, entity));
+        methodCreator.close();
+    }
+
+    private void implementUpdate(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor,
+            String entityType) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("update", Object.class, Object.class, Object.class);
+        methodCreator.addAnnotation(Transactional.class);
+        ResultHandle id = methodCreator.getMethodParam(0);
+        ResultHandle entity = methodCreator.getMethodParam(1);
+        // Set entity ID before executing an update to make sure that a requested object ID matches a given entity ID.
+        setId(methodCreator, entityType, entity, id);
+        methodCreator.returnValue(dataAccessImplementor.update(methodCreator, entity));
+        methodCreator.close();
+    }
+
+    private void implementDelete(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("delete", boolean.class, Object.class);
+        methodCreator.addAnnotation(Transactional.class);
+        ResultHandle id = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.deleteById(methodCreator, id));
+        methodCreator.close();
+    }
+
+    private void setId(BytecodeCreator creator, String entityType, ResultHandle entity, ResultHandle id) {
+        FieldInfo idField = entityClassHelper.getIdField(entityType);
+        MethodDescriptor idSetter = entityClassHelper.getSetter(entityType, idField);
+        creator.invokeVirtualMethod(idSetter, entity, id);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractDevModeTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractDevModeTest.java
new file mode 100644
index 0000000000000..4a25776fa1452
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractDevModeTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.restassured.response.Response;
+
+public abstract class AbstractDevModeTest {
+
+    @Test
+    void testGet() {
+        when().get("/items/1")
+                .then().statusCode(200);
+    }
+
+    @Test
+    void testCreate() {
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-simple\", \"collection\": {\"id\": \"full\"}}")
+                .when().post("/items")
+                .thenReturn();
+        assertThat(response.getStatusCode()).isEqualTo(201);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java
index 7ad8cd4c3dc2f..76bfdfb5a3865 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractGetMethodTest.java
@@ -51,21 +51,23 @@ void shouldGetSimpleHalObject() {
     }
 
     @Test
-    void shouldGetComplexObjects() {
+    void shouldGetComplexObject() {
         given().accept("application/json")
                 .when().get("/collections/full")
                 .then().statusCode(200)
-                .and().body("name", is(equalTo("full")))
+                .and().body("id", is(equalTo("full")))
+                .and().body("name", is(equalTo("full collection")))
                 .and().body("items.id", contains(1, 2))
                 .and().body("items.name", contains("first", "second"));
     }
 
     @Test
-    void shouldGetComplexHalObjects() {
+    void shouldGetComplexHalObject() {
         given().accept("application/hal+json")
                 .when().get("/collections/full")
                 .then().statusCode(200)
-                .and().body("name", is(equalTo("full")))
+                .and().body("id", is(equalTo("full")))
+                .and().body("name", is(equalTo("full collection")))
                 .and().body("items.id", contains(1, 2))
                 .and().body("items.name", contains("first", "second"))
                 .and().body("_links.add.href", endsWith("/collections"))
@@ -100,12 +102,47 @@ void shouldListSimpleHalObjects() {
                 .and().body("_links.list.href", endsWith("/items"));
     }
 
+    @Test
+    void shouldListSimpleAscendingObjects() {
+        given().accept("application/json")
+                .when().get("/items?sort=name,id")
+                .then().statusCode(200)
+                .and().body("id", contains(1, 2))
+                .and().body("name", contains("first", "second"));
+    }
+
+    @Test
+    void shouldListSimpleDescendingObjects() {
+        given().accept("application/json")
+                .when().get("/items?sort=-name,id")
+                .then().statusCode(200)
+                .and().body("id", contains(2, 1))
+                .and().body("name", contains("second", "first"));
+    }
+
+    @Test
+    void shouldNotListWithInvalidSortParam() {
+        given().accept("application/json")
+                .when().get("/items?sort=1name")
+                .then().statusCode(400)
+                .and().body(is(equalTo("Invalid sort parameter '1name'")));
+    }
+
+    @Test
+    void shouldNotListHalWithInvalidSortParam() {
+        given().accept("application/hal+json")
+                .when().get("/items?sort=1name")
+                .then().statusCode(400)
+                .and().body(is(equalTo("Invalid sort parameter '1name'")));
+    }
+
     @Test
     void shouldListComplexObjects() {
         given().accept("application/json")
                 .when().get("/collections")
                 .then().statusCode(200)
-                .and().body("name", contains("empty", "full"))
+                .and().body("id", contains("empty", "full"))
+                .and().body("name", contains("empty collection", "full collection"))
                 .and().body("items.id[0]", is(empty()))
                 .and().body("items.id[1]", contains(1, 2))
                 .and().body("items.name[1]", contains("first", "second"));
@@ -116,22 +153,25 @@ void shouldListComplexHalObjects() {
         given().accept("application/hal+json")
                 .when().get("/collections")
                 .then().statusCode(200)
-                .and().body("_embedded.collections.name", contains("empty", "full"))
-                .and().body("_embedded.collections.items.id[0]", is(empty()))
-                .and().body("_embedded.collections.items.id[1]", contains(1, 2))
-                .and().body("_embedded.collections.items.name[1]", contains("first", "second"))
+                .and().body("_embedded.item-collections.id", contains("empty", "full"))
+                .and().body("_embedded.item-collections.name", contains("empty collection", "full collection"))
+                .and().body("_embedded.item-collections.items.id[0]", is(empty()))
+                .and().body("_embedded.item-collections.items.id[1]", contains(1, 2))
+                .and().body("_embedded.item-collections.items.name[1]", contains("first", "second"))
                 .and()
-                .body("_embedded.collections._links.add.href", contains(endsWith("/collections"), endsWith("/collections")))
+                .body("_embedded.item-collections._links.add.href",
+                        contains(endsWith("/collections"), endsWith("/collections")))
                 .and()
-                .body("_embedded.collections._links.list.href", contains(endsWith("/collections"), endsWith("/collections")))
+                .body("_embedded.item-collections._links.list.href",
+                        contains(endsWith("/collections"), endsWith("/collections")))
                 .and()
-                .body("_embedded.collections._links.self.href",
+                .body("_embedded.item-collections._links.self.href",
                         contains(endsWith("/collections/empty"), endsWith("/collections/full")))
                 .and()
-                .body("_embedded.collections._links.update.href",
+                .body("_embedded.item-collections._links.update.href",
                         contains(endsWith("/collections/empty"), endsWith("/collections/full")))
                 .and()
-                .body("_embedded.collections._links.remove.href",
+                .body("_embedded.item-collections._links.remove.href",
                         contains(endsWith("/collections/empty"), endsWith("/collections/full")))
                 .and().body("_links.add.href", endsWith("/collections"))
                 .and().body("_links.list.href", endsWith("/collections"));
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractHotReloadTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractHotReloadTest.java
new file mode 100644
index 0000000000000..1f329fbcdd15e
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractHotReloadTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment;
+
+import static io.restassured.RestAssured.given;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public abstract class AbstractHotReloadTest {
+
+    protected abstract QuarkusDevModeTest getTestArchive();
+
+    @Test
+    public void shouldModifyPathAndDisableHal() {
+        getTestArchive().modifySourceFile(getResourceClass(),
+                s -> s.replaceAll(".*@ResourceProperties.*", "@ResourceProperties(path = \"col\")"));
+        given().accept("application/json")
+                .when().get("/col")
+                .then().statusCode(200);
+        given().accept("application/hal+json")
+                .when().get("/col")
+                .then().statusCode(406);
+    }
+
+    protected abstract Class<?> getResourceClass();
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPathCustomisationTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPathCustomisationTest.java
new file mode 100644
index 0000000000000..7fe4b9684951f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPathCustomisationTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+
+import io.restassured.response.Response;
+
+public abstract class AbstractPathCustomisationTest {
+
+    @ParameterizedTest
+    @ArgumentsSource(TestArgumentsProvider.class)
+    void testGet(String path, String accept) {
+        given().accept(accept)
+                .when().get(path)
+                .then().statusCode(200);
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(TestArgumentsProvider.class)
+    void testCreateAndDelete(String path, String accept) {
+        String id = "test-" + Objects.hash(path, accept);
+        Response response = given().body("{\"id\": \"" + id + "\", \"name\": \"test collection\"}")
+                .and().contentType("application/json")
+                .and().accept(accept)
+                .when().post(path)
+                .thenReturn();
+        assertThat(response.getStatusCode()).isEqualTo(201);
+        when().delete(path + "/" + id)
+                .then().statusCode(204);
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(TestArgumentsProvider.class)
+    void testUpdate(String path, String accept) {
+        given().body("{\"id\": \"empty\", \"name\": \"updated collection\"}")
+                .and().contentType("application/json")
+                .and().accept(accept)
+                .when().put(path + "/empty")
+                .then().statusCode(204);
+    }
+
+    static class TestArgumentsProvider implements ArgumentsProvider {
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+            return Stream.of(
+                    Arguments.of("/collections", "application/json"),
+                    Arguments.of("/custom-collections/api", "application/json"),
+                    Arguments.of("/collections", "application/hal+json"),
+                    Arguments.of("/custom-collections/api", "application/hal+json"));
+        }
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPostMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPostMethodTest.java
index 901e3e5c409a1..d1ff22c9bb891 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPostMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPostMethodTest.java
@@ -18,7 +18,7 @@ public abstract class AbstractPostMethodTest {
     void shouldCreateSimpleObject() {
         Response response = given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-simple\", \"collection\": {\"name\": \"full\"}}")
+                .and().body("{\"name\": \"test-simple\", \"collection\": {\"id\": \"full\"}}")
                 .when().post("/items")
                 .thenReturn();
         assertThat(response.statusCode()).isEqualTo(201);
@@ -33,7 +33,7 @@ void shouldCreateSimpleObject() {
     void shouldCreateSimpleHalObject() {
         Response response = given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-simple-hal\", \"collection\": {\"name\": \"full\"}}")
+                .and().body("{\"name\": \"test-simple-hal\", \"collection\": {\"id\": \"full\"}}")
                 .when().post("/items")
                 .thenReturn();
         assertThat(response.statusCode()).isEqualTo(201);
@@ -53,28 +53,40 @@ void shouldCreateSimpleHalObject() {
     void shouldCreateComplexObjects() {
         given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-complex\"}")
+                .and().body("{\"id\": \"test-complex\", \"name\": \"test collection\"}")
                 .when().post("/collections")
                 .then().statusCode(201)
                 .and().header("Location", endsWith("/test-complex"))
-                .and().body("name", is(equalTo("test-complex")))
+                .and().body("id", is(equalTo("test-complex")))
+                .and().body("name", is(equalTo("test collection")))
                 .and().body("items", is(empty()));
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"test-complex\", \"name\": \"test collection\"}")
+                .when().post("/collections")
+                .then().statusCode(409);
     }
 
     @Test
     void shouldCreateComplexHalObjects() {
         given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-complex-hal\"}")
+                .and().body("{\"id\": \"test-complex-hal\", \"name\": \"test collection\"}")
                 .when().post("/collections")
                 .then().statusCode(201)
                 .and().header("Location", endsWith("/test-complex-hal"))
-                .and().body("name", is(equalTo("test-complex-hal")))
+                .and().body("id", is(equalTo("test-complex-hal")))
+                .and().body("name", is(equalTo("test collection")))
                 .and().body("items", is(empty()))
                 .and().body("_links.add.href", endsWith("/collections"))
                 .and().body("_links.list.href", endsWith("/collections"))
                 .and().body("_links.self.href", endsWith("/collections/test-complex-hal"))
                 .and().body("_links.update.href", endsWith("/collections/test-complex-hal"))
                 .and().body("_links.remove.href", endsWith("/collections/test-complex-hal"));
+        given().accept("application/hal+json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"test-complex-hal\", \"name\": \"test collection\"}")
+                .when().post("/collections")
+                .then().statusCode(409);
     }
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPutMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPutMethodTest.java
index 010b4c9de48f1..eb12ddfc6716e 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPutMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/AbstractPutMethodTest.java
@@ -15,10 +15,10 @@
 public abstract class AbstractPutMethodTest {
 
     @Test
-    void shouldUpdateObject() {
+    void shouldUpdateSimpleObject() {
         given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"1\", \"name\": \"first-test\", \"collection\": {\"name\": \"full\"}}")
+                .and().body("{\"id\": \"1\", \"name\": \"first-test\", \"collection\": {\"id\": \"full\"}}")
                 .when().put("/items/1")
                 .then().statusCode(204);
         given().accept("application/json")
@@ -29,10 +29,24 @@ void shouldUpdateObject() {
     }
 
     @Test
-    void shouldNotUpdateObjectId() {
+    void shouldUpdateComplexObject() {
         given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"100\", \"name\": \"second\", \"collection\": {\"name\": \"full\"}}")
+                .and().body("{\"id\": \"empty\", \"name\": \"updated collection\"}")
+                .when().put("/collections/empty")
+                .then().statusCode(204);
+        given().accept("application/json")
+                .when().get("/collections/empty")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo("empty")))
+                .and().body("name", is(equalTo("updated collection")));
+    }
+
+    @Test
+    void shouldNotUpdateSimpleObjectId() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"100\", \"name\": \"second\", \"collection\": {\"id\": \"full\"}}")
                 .when().put("/items/2")
                 .then().statusCode(204);
         given().accept("application/json")
@@ -45,15 +59,33 @@ void shouldNotUpdateObjectId() {
                 .then().statusCode(404);
     }
 
+    @Test
+    void shouldNotUpdateComplexObjectId() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"updated-empty\", \"name\": \"empty collection\"}")
+                .when().put("/collections/empty")
+                .then().statusCode(204);
+        given().accept("application/json")
+                .when().get("/collections/empty")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo("empty")))
+                .and().body("name", is(equalTo("empty collection")));
+        given().accept("application/json")
+                .when().get("/collections/updated-empty")
+                .then().statusCode(404);
+    }
+
     @Test
     void shouldCreateObjectWithRequiredId() {
         given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-collection\"}")
+                .and().body("{\"id\": \"test-collection\", \"name\": \"test collection\"}")
                 .when().post("/collections")
                 .then().statusCode(201)
                 .and().header("Location", endsWith("/collections/test-collection"))
-                .and().body("name", is(equalTo("test-collection")))
+                .and().body("id", is(equalTo("test-collection")))
+                .and().body("name", is(equalTo("test collection")))
                 .and().body("items", is(empty()));
     }
 
@@ -61,11 +93,12 @@ void shouldCreateObjectWithRequiredId() {
     void shouldCreateHalObjectWithRequiredId() {
         given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-collection-hal\"}")
+                .and().body("{\"id\": \"test-collection-hal\", \"name\": \"test collection\"}")
                 .when().post("/collections")
                 .then().statusCode(201)
                 .and().header("Location", endsWith("/collections/test-collection-hal"))
-                .and().body("name", is(equalTo("test-collection-hal")))
+                .and().body("id", is(equalTo("test-collection-hal")))
+                .and().body("name", is(equalTo("test collection")))
                 .and().body("items", is(empty()))
                 .and().body("_links.add.href", endsWith("/collections"))
                 .and().body("_links.list.href", endsWith("/collections"))
@@ -78,7 +111,7 @@ void shouldCreateHalObjectWithRequiredId() {
     void shouldCreateObjectWithGeneratedId() {
         Response response = given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-item\", \"collection\": {\"name\": \"full\"}}")
+                .and().body("{\"name\": \"test-item\", \"collection\": {\"id\": \"full\"}}")
                 .when().post("/items")
                 .thenReturn();
         assertThat(response.statusCode()).isEqualTo(201);
@@ -93,7 +126,7 @@ void shouldCreateObjectWithGeneratedId() {
     void shouldCreateHalObjectWithGeneratedId() {
         Response response = given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"name\": \"test-item-hal\", \"collection\": {\"name\": \"full\"}}")
+                .and().body("{\"name\": \"test-item-hal\", \"collection\": {\"id\": \"full\"}}")
                 .when().post("/items")
                 .thenReturn();
         assertThat(response.statusCode()).isEqualTo(201);
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HotReloadTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HotReloadTest.java
deleted file mode 100644
index 5b5fa38c643ef..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HotReloadTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment;
-
-import static io.restassured.RestAssured.given;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.hibernate.orm.rest.data.panache.deployment.entity.CollectionsController;
-import io.quarkus.test.QuarkusDevModeTest;
-
-public class HotReloadTest {
-
-    @RegisterExtension
-    public final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addPackage(CollectionsController.class.getPackage()) // entity package
-                    .addAsResource("application.properties")
-                    .addAsResource("import.sql"));
-
-    @Test
-    public void shouldModifyPathAndDisableHal() {
-        TEST.modifySourceFile(CollectionsController.class,
-                s -> s.replace("@ResourceProperties(hal = true, paged = false)", "@ResourceProperties(path = \"col\")"));
-        given().accept("application/json")
-                .when().get("/col")
-                .then().statusCode(200);
-        given().accept("application/hal+json")
-                .when().get("/col")
-                .then().statusCode(406);
-    }
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/PathCustomisationTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/PathCustomisationTest.java
deleted file mode 100644
index e7c6103ad5f93..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/PathCustomisationTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.when;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
-import org.junit.jupiter.params.provider.ArgumentsSource;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
-import io.quarkus.hibernate.orm.rest.data.panache.deployment.entity.Collection;
-import io.quarkus.hibernate.orm.rest.data.panache.deployment.entity.CollectionsController;
-import io.quarkus.hibernate.orm.rest.data.panache.deployment.entity.Item;
-import io.quarkus.rest.data.panache.MethodProperties;
-import io.quarkus.rest.data.panache.ResourceProperties;
-import io.quarkus.test.QuarkusUnitTest;
-import io.restassured.response.Response;
-
-class PathCustomisationTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, Item.class,
-                            CustomPathCollectionsController.class)
-                    .addAsResource("application.properties")
-                    .addAsResource("import.sql"));
-
-    @ParameterizedTest
-    @ArgumentsSource(TestArgumentsProvider.class)
-    void testGet(String path, String accept) {
-        given().accept(accept)
-                .when().get(path)
-                .then().statusCode(200);
-    }
-
-    @ParameterizedTest
-    @ArgumentsSource(TestArgumentsProvider.class)
-    void testCreateAndDelete(String path, String accept) {
-        String name = "test-" + Objects.hash(path, accept);
-        Response response = given().body("{\"name\": \"" + name + "\"}")
-                .and().contentType("application/json")
-                .and().accept(accept)
-                .when().post(path)
-                .thenReturn();
-        assertThat(response.getStatusCode()).isEqualTo(201);
-        when().delete(path + "/" + name)
-                .then().statusCode(204);
-    }
-
-    @ParameterizedTest
-    @ArgumentsSource(TestArgumentsProvider.class)
-    void testUpdate(String path, String accept) {
-        given().body("{\"name\": \"test\"}")
-                .and().contentType("application/json")
-                .and().accept(accept)
-                .when().put(path + "/empty")
-                .then().statusCode(204);
-    }
-
-    @ResourceProperties(path = "custom-collections", hal = true)
-    public interface CustomPathCollectionsController extends PanacheEntityResource<Collection, String> {
-
-        @MethodProperties(path = "api")
-        javax.ws.rs.core.Response list();
-
-        @MethodProperties(path = "api")
-        Collection get(String name);
-
-        @MethodProperties(path = "api")
-        javax.ws.rs.core.Response add(Collection collection);
-
-        @MethodProperties(path = "api")
-        javax.ws.rs.core.Response update(String name, Collection collection);
-
-        @MethodProperties(path = "api")
-        void delete(String name);
-    }
-
-    static class TestArgumentsProvider implements ArgumentsProvider {
-        @Override
-        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-            return Stream.of(
-                    Arguments.of("/collections", "application/json"),
-                    Arguments.of("/custom-collections/api", "application/json"),
-                    Arguments.of("/collections", "application/hal+json"),
-                    Arguments.of("/custom-collections/api", "application/hal+json"));
-        }
-    }
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java
new file mode 100644
index 0000000000000..f30a5456bf391
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
+
+@MappedSuperclass
+public abstract class AbstractEntity<IdType extends Number> extends PanacheEntityBase {
+
+    @Id
+    @GeneratedValue
+    private IdType id;
+
+    public IdType getId() {
+        return id;
+    }
+
+    public void setId(IdType id) {
+        this.id = id;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java
new file mode 100644
index 0000000000000..4ef31561e99f9
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/AbstractItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import javax.json.bind.annotation.JsonbTransient;
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class AbstractItem<IdType extends Number> extends AbstractEntity<IdType> {
+
+    public String name;
+
+    @ManyToOne(optional = false)
+    public Collection collection;
+
+    @JsonbTransient // Avoid infinite loop when serializing
+    public Collection getCollection() {
+        return collection;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java
index 3374a114f4381..fff028b5212d9 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Collection.java
@@ -14,6 +14,8 @@
 public class Collection extends PanacheEntityBase {
 
     @Id
+    public String id;
+
     public String name;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "collection")
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsController.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsController.java
deleted file mode 100644
index a7ce687299be9..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsController.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
-import io.quarkus.rest.data.panache.ResourceProperties;
-
-@ResourceProperties(hal = true, paged = false)
-public interface CollectionsController extends PanacheEntityResource<Collection, String> {
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java
new file mode 100644
index 0000000000000..4b52d95e37684
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/CollectionsResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(hal = true, paged = false, halCollectionName = "item-collections")
+public interface CollectionsResource extends PanacheEntityResource<Collection, String> {
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java
index 7535a11b1929e..a1f94de46c346 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/Item.java
@@ -1,21 +1,8 @@
 package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
 
-import javax.json.bind.annotation.JsonbTransient;
 import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
 
 @Entity
-public class Item extends PanacheEntity {
-
-    public String name;
-
-    @ManyToOne(optional = false)
-    public Collection collection;
+public class Item extends AbstractItem<Long> {
 
-    @JsonbTransient // Avoid infinite loop when serializing
-    public Collection getCollection() {
-        return collection;
-    }
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemsController.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemsController.java
deleted file mode 100644
index d4f8078325a7c..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemsController.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
-import io.quarkus.rest.data.panache.ResourceProperties;
-
-@ResourceProperties(hal = true)
-public interface ItemsController extends PanacheEntityResource<Item, Long> {
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemsResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemsResource.java
new file mode 100644
index 0000000000000..98fd12d05581f
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/ItemsResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(hal = true)
+public interface ItemsResource extends PanacheEntityResource<Item, Long> {
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java
index aa0ece6e350d3..32fb48e1b8e42 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDeleteMethodTest.java
@@ -12,7 +12,8 @@ class PanacheEntityResourceDeleteMethodTest extends AbstractDeleteMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, Item.class, ItemsController.class)
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, ItemsResource.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java
new file mode 100644
index 0000000000000..bbdd384dd3b9d
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceDevModeTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractDevModeTest;
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class PanacheEntityResourceDevModeTest extends AbstractDevModeTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Collection.class, AbstractEntity.class, AbstractItem.class, Item.class,
+                            ItemsResource.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java
index 1568929265340..8aae2422a15a8 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceGetMethodTest.java
@@ -12,7 +12,8 @@ class PanacheEntityResourceGetMethodTest extends AbstractGetMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, Item.class, ItemsController.class)
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, ItemsResource.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java
new file mode 100644
index 0000000000000..3bc6468196f29
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourceHotReloadTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractHotReloadTest;
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class PanacheEntityResourceHotReloadTest extends AbstractHotReloadTest {
+
+    @RegisterExtension
+    public final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Override
+    protected QuarkusDevModeTest getTestArchive() {
+        return TEST;
+    }
+
+    @Override
+    protected Class<?> getResourceClass() {
+        return CollectionsResource.class;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java
new file mode 100644
index 0000000000000..cee4a84d1924c
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePathCustomisationTest.java
@@ -0,0 +1,45 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.entity;
+
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
+import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractPathCustomisationTest;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.rest.data.panache.MethodProperties;
+import io.quarkus.rest.data.panache.ResourceProperties;
+import io.quarkus.test.QuarkusUnitTest;
+
+class PanacheEntityResourcePathCustomisationTest extends AbstractPathCustomisationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, CustomPathCollectionsResource.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @ResourceProperties(path = "custom-collections", hal = true)
+    public interface CustomPathCollectionsResource extends PanacheEntityResource<Collection, String> {
+
+        @MethodProperties(path = "api")
+        List<Collection> list(Page page, Sort sort);
+
+        @MethodProperties(path = "api")
+        Collection get(String name);
+
+        @MethodProperties(path = "api")
+        Collection add(Collection collection);
+
+        @MethodProperties(path = "api")
+        Collection update(String name, Collection collection);
+
+        @MethodProperties(path = "api")
+        boolean delete(String name);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java
index ce1572f51e0e7..10aa0d9020827 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePostMethodTest.java
@@ -12,7 +12,8 @@ class PanacheEntityResourcePostMethodTest extends AbstractPostMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, Item.class, ItemsController.class)
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, ItemsResource.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java
index 329d3ada3ce69..de35261461c3f 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/entity/PanacheEntityResourcePutMethodTest.java
@@ -12,7 +12,8 @@ class PanacheEntityResourcePutMethodTest extends AbstractPutMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, Item.class, ItemsController.class)
+                    .addClasses(Collection.class, CollectionsResource.class, AbstractEntity.class, AbstractItem.class,
+                            Item.class, ItemsResource.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java
new file mode 100644
index 0000000000000..ff4ef4c88c3d5
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractEntity.java
@@ -0,0 +1,17 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class AbstractEntity<IdType extends Number> {
+
+    @Id
+    @GeneratedValue
+    private IdType id;
+
+    public IdType getId() {
+        return id;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java
new file mode 100644
index 0000000000000..0385b951e9a97
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/AbstractItem.java
@@ -0,0 +1,31 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import javax.json.bind.annotation.JsonbTransient;
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class AbstractItem<IdType extends Number> extends AbstractEntity<IdType> {
+
+    private String name;
+
+    @ManyToOne(optional = false)
+    private Collection collection;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonbTransient // Avoid infinite loop when serialising
+    public Collection getCollection() {
+        return collection;
+    }
+
+    public void setCollection(Collection collection) {
+        this.collection = collection;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java
index 972baaa5d32f9..5250476502e2f 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Collection.java
@@ -12,11 +12,21 @@
 public class Collection {
 
     @Id
+    private String id;
+
     private String name;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "collection")
     private List<Item> items = new LinkedList<>();
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsController.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsController.java
deleted file mode 100644
index 7795cb5d8dc11..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsController.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
-import io.quarkus.rest.data.panache.ResourceProperties;
-
-@ResourceProperties(hal = true, paged = false)
-public interface CollectionsController extends PanacheRepositoryResource<CollectionsRepository, Collection, String> {
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsResource.java
new file mode 100644
index 0000000000000..428e6a5be54fb
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/CollectionsResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(hal = true, paged = false, halCollectionName = "item-collections")
+public interface CollectionsResource extends PanacheRepositoryResource<CollectionsRepository, Collection, String> {
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java
index 4cce7d953eb9d..86a46ea9cee76 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/Item.java
@@ -1,45 +1,8 @@
 package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
 
-import javax.json.bind.annotation.JsonbTransient;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
 
 @Entity
-public class Item {
+public class Item extends AbstractItem<Long> {
 
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    private String name;
-
-    @ManyToOne(optional = false)
-    private Collection collection;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonbTransient // Avoid infinite loop when serialising
-    public Collection getCollection() {
-        return collection;
-    }
-
-    public void setCollection(Collection collection) {
-        this.collection = collection;
-    }
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsController.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsController.java
deleted file mode 100644
index d278f44830bd6..0000000000000
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsController.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
-import io.quarkus.rest.data.panache.ResourceProperties;
-
-@ResourceProperties(hal = true)
-public interface ItemsController extends PanacheRepositoryResource<ItemsRepository, Item, Long> {
-}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsResource.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsResource.java
new file mode 100644
index 0000000000000..a6f027ca91e65
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/ItemsResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(hal = true)
+public interface ItemsResource extends PanacheRepositoryResource<ItemsRepository, Item, Long> {
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java
index b20816f4bb6b0..618767c817b3f 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDeleteMethodTest.java
@@ -12,8 +12,9 @@ class PanacheRepositoryResourceDeleteMethodTest extends AbstractDeleteMethodTest
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, CollectionsRepository.class, Item.class,
-                            ItemsController.class, ItemsRepository.class)
+                    .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class,
+                            AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class,
+                            ItemsRepository.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java
new file mode 100644
index 0000000000000..e577d3a9e3f82
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceDevModeTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractDevModeTest;
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class PanacheRepositoryResourceDevModeTest extends AbstractDevModeTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Collection.class, AbstractEntity.class, AbstractItem.class, Item.class,
+                            ItemsResource.class, ItemsRepository.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java
index 8184606ad3ea4..a18441159182f 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceGetMethodTest.java
@@ -12,8 +12,9 @@ class PanacheRepositoryResourceGetMethodTest extends AbstractGetMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, CollectionsRepository.class, Item.class,
-                            ItemsController.class, ItemsRepository.class)
+                    .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class,
+                            AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class,
+                            ItemsRepository.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java
new file mode 100644
index 0000000000000..26f22e7c67631
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourceHotReloadTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractHotReloadTest;
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class PanacheRepositoryResourceHotReloadTest extends AbstractHotReloadTest {
+
+    @RegisterExtension
+    public final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class,
+                            AbstractEntity.class, AbstractItem.class, Item.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Override
+    protected QuarkusDevModeTest getTestArchive() {
+        return TEST;
+    }
+
+    @Override
+    protected Class<?> getResourceClass() {
+        return CollectionsResource.class;
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java
new file mode 100644
index 0000000000000..b8f99e5788418
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePathCustomisationTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.hibernate.orm.rest.data.panache.deployment.repository;
+
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
+import io.quarkus.hibernate.orm.rest.data.panache.deployment.AbstractPathCustomisationTest;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.rest.data.panache.MethodProperties;
+import io.quarkus.rest.data.panache.ResourceProperties;
+import io.quarkus.test.QuarkusUnitTest;
+
+class PanacheRepositoryResourcePathCustomisationTest extends AbstractPathCustomisationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class,
+                            AbstractEntity.class, AbstractItem.class, Item.class, CustomPathCollectionsResource.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @ResourceProperties(path = "custom-collections", hal = true)
+    public interface CustomPathCollectionsResource
+            extends PanacheRepositoryResource<CollectionsRepository, Collection, String> {
+
+        @MethodProperties(path = "api")
+        List<Collection> list(Page page, Sort sort);
+
+        @MethodProperties(path = "api")
+        Collection get(String name);
+
+        @MethodProperties(path = "api")
+        Collection add(Collection collection);
+
+        @MethodProperties(path = "api")
+        Collection update(String name, Collection collection);
+
+        @MethodProperties(path = "api")
+        boolean delete(String name);
+    }
+}
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java
index 3f15e24a5d83e..2186f43dca263 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePostMethodTest.java
@@ -12,8 +12,9 @@ class PanacheRepositoryResourcePostMethodTest extends AbstractPostMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, CollectionsRepository.class, Item.class,
-                            ItemsController.class, ItemsRepository.class)
+                    .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class,
+                            AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class,
+                            ItemsRepository.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java
index 8614751bcb571..eb43f7c60e4e9 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/repository/PanacheRepositoryResourcePutMethodTest.java
@@ -12,8 +12,9 @@ class PanacheRepositoryResourcePutMethodTest extends AbstractPutMethodTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Collection.class, CollectionsController.class, CollectionsRepository.class, Item.class,
-                            ItemsController.class, ItemsRepository.class)
+                    .addClasses(Collection.class, CollectionsResource.class, CollectionsRepository.class,
+                            AbstractEntity.class, AbstractItem.class, Item.class, ItemsResource.class,
+                            ItemsRepository.class)
                     .addAsResource("application.properties")
                     .addAsResource("import.sql"));
 }
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/resources/import.sql b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/resources/import.sql
index 959530399234d..9c88b9de589dd 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/resources/import.sql
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/test/resources/import.sql
@@ -1,5 +1,5 @@
-insert into collection(name) values ('empty');
-insert into collection(name) values ('full');
+insert into collection(id, name) values ('empty', 'empty collection');
+insert into collection(id, name) values ('full', 'full collection');
 
-insert into item(id, name, collection_name) values (nextval('hibernate_sequence'), 'first', 'full');
-insert into item(id, name, collection_name) values (nextval('hibernate_sequence'), 'second', 'full');
\ No newline at end of file
+insert into item(id, name, collection_id) values (nextval('hibernate_sequence'), 'first', 'full');
+insert into item(id, name, collection_id) values (nextval('hibernate_sequence'), 'second', 'full');
\ No newline at end of file
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/pom.xml
index 00b161524117f..bbec5d34276db 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/pom.xml
+++ b/extensions/panache/hibernate-orm-rest-data-panache/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hibernate-orm-rest-data-panache-parent</artifactId>
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml
index 1769d5dc59048..64b292a742ffe 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml
@@ -7,7 +7,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-hibernate-orm-rest-data-panache-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-hibernate-orm-rest-data-panache</artifactId>
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java b/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java
new file mode 100644
index 0000000000000..d15a8d358ecfc
--- /dev/null
+++ b/extensions/panache/hibernate-orm-rest-data-panache/runtime/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java
@@ -0,0 +1,34 @@
+package io.quarkus.hibernate.orm.rest.data.panache.runtime;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.rest.data.panache.RestDataPanacheException;
+
+public class RestDataPanacheExceptionMapper implements ExceptionMapper<RestDataPanacheException> {
+    private static final Logger LOGGER = Logger.getLogger(RestDataPanacheExceptionMapper.class);
+
+    @Override
+    public Response toResponse(RestDataPanacheException exception) {
+        LOGGER.warnf(exception, "Mapping an unhandled %s", RestDataPanacheException.class.getSimpleName());
+        return throwableToResponse(exception, exception.getMessage());
+    }
+
+    private Response throwableToResponse(Throwable throwable, String message) {
+        if (throwable instanceof org.hibernate.exception.ConstraintViolationException) {
+            return Response.status(Response.Status.CONFLICT.getStatusCode(), message).build();
+        }
+
+        if (throwable instanceof javax.validation.ConstraintViolationException) {
+            return Response.status(Response.Status.BAD_REQUEST.getStatusCode(), message).build();
+        }
+
+        if (throwable.getCause() != null) {
+            return throwableToResponse(throwable.getCause(), message);
+        }
+
+        return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), message).build();
+    };
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache-common/deployment/pom.xml
new file mode 100644
index 0000000000000..f0193d7e09a77
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/deployment/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-reactive-panache-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-reactive-panache-common-deployment</artifactId>
+    <name>Quarkus - Hibernate Reactive with Panache - Common - Deployment</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-analysis</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheJpaCommonResourceProcessor.java b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheJpaCommonResourceProcessor.java
new file mode 100644
index 0000000000000..4be470fcd9db5
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheJpaCommonResourceProcessor.java
@@ -0,0 +1,89 @@
+package io.quarkus.hibernate.reactive.panache.deployment;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.hibernate.orm.deployment.JpaEntitiesBuildItem;
+import io.quarkus.hibernate.reactive.panache.common.runtime.PanacheHibernateRecorder;
+
+public final class PanacheJpaCommonResourceProcessor {
+
+    private static final DotName DOTNAME_NAMED_QUERY = DotName.createSimple(NamedQuery.class.getName());
+    private static final DotName DOTNAME_NAMED_QUERIES = DotName.createSimple(NamedQueries.class.getName());
+
+    @BuildStep
+    void lookupNamedQueries(CombinedIndexBuildItem index,
+            BuildProducer<PanacheNamedQueryEntityClassBuildStep> namedQueries,
+            JpaEntitiesBuildItem jpaEntities) {
+        for (String modelClass : jpaEntities.getAllModelClassNames()) {
+            // lookup for `@NamedQuery` on the hierarchy and produce NamedQueryEntityClassBuildStep
+            Set<String> typeNamedQueries = new HashSet<>();
+            lookupNamedQueries(index, DotName.createSimple(modelClass), typeNamedQueries);
+            namedQueries.produce(new PanacheNamedQueryEntityClassBuildStep(modelClass, typeNamedQueries));
+        }
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void buildNamedQueryMap(List<PanacheNamedQueryEntityClassBuildStep> namedQueryEntityClasses,
+            PanacheHibernateRecorder panacheHibernateRecorder) {
+        Map<String, Set<String>> namedQueryMap = new HashMap<>();
+        for (PanacheNamedQueryEntityClassBuildStep entityNamedQueries : namedQueryEntityClasses) {
+            namedQueryMap.put(entityNamedQueries.getClassName(), entityNamedQueries.getNamedQueries());
+        }
+
+        panacheHibernateRecorder.setNamedQueryMap(namedQueryMap);
+    }
+
+    private void lookupNamedQueries(CombinedIndexBuildItem index, DotName name, Set<String> namedQueries) {
+        ClassInfo classInfo = index.getIndex().getClassByName(name);
+        if (classInfo == null) {
+            return;
+        }
+
+        List<AnnotationInstance> namedQueryInstances = classInfo.annotations().get(DOTNAME_NAMED_QUERY);
+        if (namedQueryInstances != null) {
+            for (AnnotationInstance namedQueryInstance : namedQueryInstances) {
+                namedQueries.add(namedQueryInstance.value("name").asString());
+            }
+        }
+
+        List<AnnotationInstance> namedQueriesInstances = classInfo.annotations().get(DOTNAME_NAMED_QUERIES);
+        if (namedQueriesInstances != null) {
+            for (AnnotationInstance namedQueriesInstance : namedQueriesInstances) {
+                AnnotationValue value = namedQueriesInstance.value();
+                AnnotationInstance[] nestedInstances = value.asNestedArray();
+                for (AnnotationInstance nested : nestedInstances) {
+                    namedQueries.add(nested.value("name").asString());
+                }
+            }
+        }
+
+        // climb up the hierarchy of types
+        if (!classInfo.superClassType().name().equals(JandexUtil.DOTNAME_OBJECT)) {
+            Type superType = classInfo.superClassType();
+            ClassInfo superClass = index.getIndex().getClassByName(superType.name());
+            if (superClass != null) {
+                lookupNamedQueries(index, superClass.name(), namedQueries);
+            }
+        }
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheNamedQueryEntityClassBuildStep.java b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheNamedQueryEntityClassBuildStep.java
new file mode 100644
index 0000000000000..7f0b731510816
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheNamedQueryEntityClassBuildStep.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.reactive.panache.deployment;
+
+import java.util.Set;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+final class PanacheNamedQueryEntityClassBuildStep extends MultiBuildItem {
+    private String className;
+    private Set<String> namedQueries;
+
+    public PanacheNamedQueryEntityClassBuildStep(String className, Set<String> namedQueries) {
+        this.className = className;
+        this.namedQueries = namedQueries;
+    }
+
+    public String getClassName() {
+        return this.className;
+    }
+
+    public Set<String> getNamedQueries() {
+        return namedQueries;
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/pom.xml b/extensions/panache/hibernate-reactive-panache-common/pom.xml
new file mode 100644
index 0000000000000..f7c5d94fc871f
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+	<relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-reactive-panache-common-parent</artifactId>
+    <name>Quarkus - Hibernate Reactive with Panache - Common</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+
+</project>
diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache-common/runtime/pom.xml
new file mode 100644
index 0000000000000..df891e7c59cdc
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-reactive-panache-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-reactive-panache-common</artifactId>
+    <name>Quarkus - Hibernate Reactive with Panache - Common - Runtime</name>
+    <description>Simplify your persistence code for Hibernate Reactive via the active record or the repository pattern</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-hibernate-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java
new file mode 100644
index 0000000000000..0a937b31756b4
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/AbstractJpaOperations.java
@@ -0,0 +1,358 @@
+package io.quarkus.hibernate.reactive.panache.common.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import javax.persistence.LockModeType;
+import javax.persistence.PersistenceException;
+
+import org.hibernate.internal.util.LockModeConverter;
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public abstract class AbstractJpaOperations<PanacheQueryType> {
+
+    protected abstract PanacheQueryType createPanacheQuery(Mutiny.Session session, String query, String orderBy,
+            Object paramsArrayOrMap);
+
+    protected abstract Uni<List<?>> list(PanacheQueryType query);
+
+    protected abstract Multi<?> stream(PanacheQueryType query);
+
+    //
+    // Instance methods
+
+    public Uni<Void> persist(Object entity) {
+        return persist(getSession(), entity);
+    }
+
+    public Uni<Void> persist(Mutiny.Session session, Object entity) {
+        if (!session.contains(entity)) {
+            return session.persist(entity).map(v -> null);
+        }
+        return Uni.createFrom().nullItem();
+    }
+
+    public Uni<Void> persist(Iterable<?> entities) {
+        return persist(StreamSupport.stream(entities.spliterator(), false));
+    }
+
+    public Uni<Void> persist(Object firstEntity, Object... entities) {
+        List<Object> array = new ArrayList<>(entities.length + 1);
+        array.add(firstEntity);
+        for (Object entity : entities) {
+            array.add(entity);
+        }
+        return persist(array.stream());
+    }
+
+    public Uni<Void> persist(Stream<?> entities) {
+        Mutiny.Session session = getSession();
+        List<Uni<Void>> uniList = entities.map(entity -> persist(session, entity)).collect(Collectors.toList());
+        return Uni.combine().all().unis(uniList).discardItems();
+        // this should work, but doesn't
+        //        return Multi.createFrom().items(entities)
+        //                .map(entity -> persist(session, entity))
+        //                .onItem().ignoreAsUni();
+    }
+
+    public Uni<Void> delete(Object entity) {
+        return getSession().remove(entity).map(v -> null);
+    }
+
+    public boolean isPersistent(Object entity) {
+        return getSession().contains(entity);
+    }
+
+    public Uni<Void> flush() {
+        return getSession().flush().map(v -> null);
+    }
+
+    //
+    // Private stuff
+
+    public static Mutiny.Session getSession() {
+        Mutiny.Session session = Arc.container().instance(Mutiny.Session.class).get();
+        // FIXME: handle null or exception?
+        if (session == null) {
+            throw new PersistenceException("No Mutiny.Session found. Do you have any JPA entities defined?");
+        }
+        return session;
+    }
+
+    public static Mutiny.Query<?> bindParameters(Mutiny.Query<?> query, Object[] params) {
+        if (params == null || params.length == 0)
+            return query;
+        for (int i = 0; i < params.length; i++) {
+            query.setParameter(i + 1, params[i]);
+        }
+        return query;
+    }
+
+    public static Mutiny.Query<?> bindParameters(Mutiny.Query<?> query, Map<String, Object> params) {
+        if (params == null || params.size() == 0)
+            return query;
+        for (Entry<String, Object> entry : params.entrySet()) {
+            query.setParameter(entry.getKey(), entry.getValue());
+        }
+        return query;
+    }
+
+    public int paramCount(Object[] params) {
+        return params != null ? params.length : 0;
+    }
+
+    public int paramCount(Map<String, Object> params) {
+        return params != null ? params.size() : 0;
+    }
+
+    //
+    // Queries
+
+    public Uni<?> findById(Class<?> entityClass, Object id) {
+        return getSession().find(entityClass, id);
+    }
+
+    public Uni<?> findById(Class<?> entityClass, Object id, LockModeType lockModeType) {
+        return getSession().find(entityClass, id, LockModeConverter.convertToLockMode(lockModeType));
+    }
+
+    public PanacheQueryType find(Class<?> entityClass, String query, Object... params) {
+        return find(entityClass, query, null, params);
+    }
+
+    public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Object... params) {
+        String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params));
+        Mutiny.Session session = getSession();
+        // FIXME: check for duplicate ORDER BY clause?
+        if (PanacheJpaUtil.isNamedQuery(query)) {
+            String namedQuery = query.substring(1);
+            NamedQueryUtil.checkNamedQuery(entityClass, namedQuery);
+            return createPanacheQuery(session, query, PanacheJpaUtil.toOrderBy(sort), params);
+        }
+        return createPanacheQuery(session, findQuery, PanacheJpaUtil.toOrderBy(sort), params);
+    }
+
+    public PanacheQueryType find(Class<?> entityClass, String query, Map<String, Object> params) {
+        return find(entityClass, query, null, params);
+    }
+
+    public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        String findQuery = PanacheJpaUtil.createFindQuery(entityClass, query, paramCount(params));
+        Mutiny.Session session = getSession();
+        // FIXME: check for duplicate ORDER BY clause?
+        if (PanacheJpaUtil.isNamedQuery(query)) {
+            String namedQuery = query.substring(1);
+            NamedQueryUtil.checkNamedQuery(entityClass, namedQuery);
+            return createPanacheQuery(session, query, PanacheJpaUtil.toOrderBy(sort), params);
+        }
+        return createPanacheQuery(session, findQuery, PanacheJpaUtil.toOrderBy(sort), params);
+    }
+
+    public PanacheQueryType find(Class<?> entityClass, String query, Parameters params) {
+        return find(entityClass, query, null, params);
+    }
+
+    public PanacheQueryType find(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return find(entityClass, query, sort, params.map());
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Object... params) {
+        return list(find(entityClass, query, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Object... params) {
+        return list(find(entityClass, query, sort, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Map<String, Object> params) {
+        return list(find(entityClass, query, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        return list(find(entityClass, query, sort, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Parameters params) {
+        return list(find(entityClass, query, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return list(find(entityClass, query, sort, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Object... params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Parameters params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public PanacheQueryType findAll(Class<?> entityClass) {
+        String query = "FROM " + PanacheJpaUtil.getEntityName(entityClass);
+        Mutiny.Session session = getSession();
+        return createPanacheQuery(session, query, null, null);
+    }
+
+    public PanacheQueryType findAll(Class<?> entityClass, Sort sort) {
+        String query = "FROM " + PanacheJpaUtil.getEntityName(entityClass);
+        Mutiny.Session session = getSession();
+        return createPanacheQuery(session, query, PanacheJpaUtil.toOrderBy(sort), null);
+    }
+
+    public Uni<List<?>> listAll(Class<?> entityClass) {
+        return list(findAll(entityClass));
+    }
+
+    public Uni<List<?>> listAll(Class<?> entityClass, Sort sort) {
+        return list(findAll(entityClass, sort));
+    }
+
+    public Multi<?> streamAll(Class<?> entityClass) {
+        return stream(findAll(entityClass));
+    }
+
+    public Multi<?> streamAll(Class<?> entityClass, Sort sort) {
+        return stream(findAll(entityClass, sort));
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public Uni<Long> count(Class<?> entityClass) {
+        return (Uni) getSession().createQuery("SELECT COUNT(*) FROM " + PanacheJpaUtil.getEntityName(entityClass))
+                .getSingleResult();
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public Uni<Long> count(Class<?> entityClass, String query, Object... params) {
+        return (Uni) bindParameters(
+                getSession().createQuery(PanacheJpaUtil.createCountQuery(entityClass, query, paramCount(params))),
+                params).getSingleResult();
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public Uni<Long> count(Class<?> entityClass, String query, Map<String, Object> params) {
+        return (Uni) bindParameters(
+                getSession().createQuery(PanacheJpaUtil.createCountQuery(entityClass, query, paramCount(params))),
+                params).getSingleResult();
+    }
+
+    public Uni<Long> count(Class<?> entityClass, String query, Parameters params) {
+        return count(entityClass, query, params.map());
+    }
+
+    public Uni<Boolean> exists(Class<?> entityClass) {
+        return count(entityClass).map(c -> c > 0);
+    }
+
+    public Uni<Boolean> exists(Class<?> entityClass, String query, Object... params) {
+        return count(entityClass, query, params).map(c -> c > 0);
+    }
+
+    public Uni<Boolean> exists(Class<?> entityClass, String query, Map<String, Object> params) {
+        return count(entityClass, query, params).map(c -> c > 0);
+    }
+
+    public Uni<Boolean> exists(Class<?> entityClass, String query, Parameters params) {
+        return count(entityClass, query, params).map(c -> c > 0);
+    }
+
+    public Uni<Long> deleteAll(Class<?> entityClass) {
+        return getSession().createQuery("DELETE FROM " + PanacheJpaUtil.getEntityName(entityClass)).executeUpdate()
+                .map(i -> i.longValue());
+    }
+
+    public Uni<Boolean> deleteById(Class<?> entityClass, Object id) {
+        // Impl note : we load the entity then delete it because it's the only implementation generic enough for any model,
+        // and correct in all cases (composite key, graph of entities, ...). HQL cannot be directly used for these reasons.
+        return findById(entityClass, id)
+                .flatMap(entity -> {
+                    if (entity == null) {
+                        return Uni.createFrom().item(false);
+                    }
+                    return getSession().remove(entity).map(v -> true);
+                });
+    }
+
+    public Uni<Long> delete(Class<?> entityClass, String query, Object... params) {
+        return bindParameters(
+                getSession().createQuery(PanacheJpaUtil.createDeleteQuery(entityClass, query, paramCount(params))), params)
+                        .executeUpdate().map(i -> i.longValue());
+    }
+
+    public Uni<Long> delete(Class<?> entityClass, String query, Map<String, Object> params) {
+        return bindParameters(
+                getSession().createQuery(PanacheJpaUtil.createDeleteQuery(entityClass, query, paramCount(params))), params)
+                        .executeUpdate().map(i -> i.longValue());
+    }
+
+    public Uni<Long> delete(Class<?> entityClass, String query, Parameters params) {
+        return delete(entityClass, query, params.map());
+    }
+
+    public IllegalStateException implementationInjectionMissing() {
+        return new IllegalStateException(
+                "This method is normally automatically overridden in subclasses: did you forget to annotate your entity with @Entity?");
+    }
+
+    public static Uni<Integer> executeUpdate(String query, Object... params) {
+        Mutiny.Query<?> jpaQuery = getSession().createQuery(query);
+        bindParameters(jpaQuery, params);
+        return jpaQuery.executeUpdate();
+    }
+
+    public static Uni<Integer> executeUpdate(String query, Map<String, Object> params) {
+        Mutiny.Query<?> jpaQuery = getSession().createQuery(query);
+        bindParameters(jpaQuery, params);
+        return jpaQuery.executeUpdate();
+    }
+
+    public Uni<Integer> executeUpdate(Class<?> entityClass, String query, Object... params) {
+        String updateQuery = PanacheJpaUtil.createUpdateQuery(entityClass, query, paramCount(params));
+        return executeUpdate(updateQuery, params);
+    }
+
+    public Uni<Integer> executeUpdate(Class<?> entityClass, String query, Map<String, Object> params) {
+        String updateQuery = PanacheJpaUtil.createUpdateQuery(entityClass, query, paramCount(params));
+        return executeUpdate(updateQuery, params);
+    }
+
+    public Uni<Integer> update(Class<?> entityClass, String query, Map<String, Object> params) {
+        return executeUpdate(entityClass, query, params);
+    }
+
+    public Uni<Integer> update(Class<?> entityClass, String query, Parameters params) {
+        return update(entityClass, query, params.map());
+    }
+
+    public Uni<Integer> update(Class<?> entityClass, String query, Object... params) {
+        return executeUpdate(entityClass, query, params);
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java
new file mode 100644
index 0000000000000..8a448d40ea90d
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/CommonPanacheQueryImpl.java
@@ -0,0 +1,337 @@
+package io.quarkus.hibernate.reactive.panache.common.runtime;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Parameter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.CompletionException;
+import java.util.function.Supplier;
+
+import javax.persistence.LockModeType;
+
+import org.hibernate.Filter;
+import org.hibernate.internal.util.LockModeConverter;
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Range;
+import io.quarkus.panache.common.exception.PanacheQueryException;
+import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public class CommonPanacheQueryImpl<Entity> {
+
+    private Object paramsArrayOrMap;
+    private String query;
+    protected String countQuery;
+    private String orderBy;
+    private Mutiny.Session em;
+
+    private Page page;
+    private Uni<Long> count;
+
+    private Range range;
+
+    private LockModeType lockModeType;
+    private Map<String, Object> hints;
+
+    private Map<String, Map<String, Object>> filters;
+
+    public CommonPanacheQueryImpl(Mutiny.Session em, String query, String orderBy, Object paramsArrayOrMap) {
+        this.em = em;
+        this.query = query;
+        this.orderBy = orderBy;
+        this.paramsArrayOrMap = paramsArrayOrMap;
+    }
+
+    private CommonPanacheQueryImpl(CommonPanacheQueryImpl<?> previousQuery, String newQueryString, String countQuery) {
+        this.em = previousQuery.em;
+        this.query = newQueryString;
+        this.countQuery = countQuery;
+        this.orderBy = previousQuery.orderBy;
+        this.paramsArrayOrMap = previousQuery.paramsArrayOrMap;
+        this.page = previousQuery.page;
+        this.count = previousQuery.count;
+        this.range = previousQuery.range;
+        this.lockModeType = previousQuery.lockModeType;
+        this.hints = previousQuery.hints;
+        this.filters = previousQuery.filters;
+    }
+
+    // Builder
+
+    public <T> CommonPanacheQueryImpl<T> project(Class<T> type) {
+        if (PanacheJpaUtil.isNamedQuery(query)) {
+            throw new PanacheQueryException("Unable to perform a projection on a named query");
+        }
+
+        // We use the first constructor that we found and use the parameter names,
+        // so the projection class must have only one constructor,
+        // and the application must be built with parameter names.
+        // Maybe this should be improved some days ...
+        Constructor<?> constructor = type.getDeclaredConstructors()[0];
+
+        // build select clause with a constructor expression
+        StringBuilder select = new StringBuilder("SELECT new ").append(type.getName()).append(" (");
+        int selectInitialLength = select.length();
+        for (Parameter parameter : constructor.getParameters()) {
+            if (!parameter.isNamePresent()) {
+                throw new PanacheQueryException(
+                        "Your application must be built with parameter names, this should be the default if" +
+                                " using Quarkus artifacts. Check the maven or gradle compiler configuration to include '-parameters'.");
+            }
+
+            if (select.length() > selectInitialLength) {
+                select.append(", ");
+            }
+            select.append(parameter.getName());
+        }
+        select.append(") ");
+
+        return new CommonPanacheQueryImpl<>(this, select.toString() + query, "select count(*) " + query);
+    }
+
+    public void filter(String filterName, Map<String, Object> parameters) {
+        if (filters == null)
+            filters = new HashMap<>();
+        filters.put(filterName, parameters);
+    }
+
+    public void page(Page page) {
+        this.page = page;
+        this.range = null; // reset the range to be able to switch from range to page
+    }
+
+    public void page(int pageIndex, int pageSize) {
+        page(Page.of(pageIndex, pageSize));
+    }
+
+    public void nextPage() {
+        checkPagination();
+        page(page.next());
+    }
+
+    public void previousPage() {
+        checkPagination();
+        page(page.previous());
+    }
+
+    public void firstPage() {
+        checkPagination();
+        page(page.first());
+    }
+
+    public Uni<Void> lastPage() {
+        checkPagination();
+        return pageCount().map(count -> {
+            page(page.index(count - 1));
+            return null;
+        });
+    }
+
+    public Uni<Boolean> hasNextPage() {
+        checkPagination();
+        return pageCount().map(pageCount -> page.index < (pageCount - 1));
+    }
+
+    public boolean hasPreviousPage() {
+        checkPagination();
+        return page.index > 0;
+    }
+
+    public Uni<Integer> pageCount() {
+        checkPagination();
+        return count().map(count -> {
+            if (count == 0)
+                return 1; // a single page of zero results
+            return (int) Math.ceil((double) count / (double) page.size);
+        });
+    }
+
+    public Page page() {
+        checkPagination();
+        return page;
+    }
+
+    private void checkPagination() {
+        // FIXME: turn into Uni
+        if (page == null) {
+            throw new UnsupportedOperationException("Cannot call a page related method, " +
+                    "call page(Page) or page(int, int) to initiate pagination first");
+        }
+        if (range != null) {
+            throw new UnsupportedOperationException("Cannot call a page related method in a ranged query, " +
+                    "call page(Page) or page(int, int) to initiate pagination first");
+        }
+    }
+
+    public void range(int startIndex, int lastIndex) {
+        this.range = Range.of(startIndex, lastIndex);
+        // reset the page to its default to be able to switch from page to range
+        this.page = null;
+    }
+
+    public void withLock(LockModeType lockModeType) {
+        this.lockModeType = lockModeType;
+    }
+
+    public void withHint(String hintName, Object value) {
+        if (hints == null) {
+            hints = new HashMap<>();
+        }
+        hints.put(hintName, value);
+        throw new UnsupportedOperationException("Hints not supported yet");
+    }
+
+    // Results
+
+    @SuppressWarnings("unchecked")
+    public Uni<Long> count() {
+        if (PanacheJpaUtil.isNamedQuery(query)) {
+            throw new PanacheQueryException("Unable to perform a count operation on a named query");
+        }
+
+        if (count == null) {
+            Mutiny.Query<Long> countQuery = em.createQuery(countQuery());
+            if (paramsArrayOrMap instanceof Map)
+                AbstractJpaOperations.bindParameters(countQuery, (Map<String, Object>) paramsArrayOrMap);
+            else
+                AbstractJpaOperations.bindParameters(countQuery, (Object[]) paramsArrayOrMap);
+            // FIXME: question about caching the result here
+            count = applyFilters(em, () -> countQuery.getSingleResult());
+        }
+        return count;
+    }
+
+    private String countQuery() {
+        if (countQuery != null) {
+            return countQuery;
+        }
+        return PanacheJpaUtil.getCountQuery(query);
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public <T extends Entity> Uni<List<T>> list() {
+        Mutiny.Query<?> jpaQuery = createQuery(em);
+        return (Uni) applyFilters(em, () -> jpaQuery.getResultList());
+    }
+
+    public <T extends Entity> Multi<T> stream() {
+        // FIXME: requires Hibernate support
+        //        Mutiny.Query<?> jpaQuery = createQuery();
+        //        return applyFilters(jpaQuery.getResultStream());
+        Uni<List<T>> results = list();
+        return (Multi<T>) results.toMulti().flatMap(list -> {
+            return Multi.createFrom().iterable(list);
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> Uni<T> firstResult() {
+        Mutiny.Query<?> jpaQuery = createQuery(em, 1);
+        return applyFilters(em, () -> jpaQuery.getResultList().map(list -> list.isEmpty() ? null : (T) list.get(0)));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> Uni<T> singleResult() {
+        Mutiny.Query<?> jpaQuery = createQuery(em);
+        return applyFilters(em, () -> jpaQuery.getSingleResult().map(v -> (T) v))
+                // FIXME: workaround https://github.com/hibernate/hibernate-reactive/issues/263
+                .onFailure(CompletionException.class).transform(t -> t.getCause());
+    }
+
+    private Mutiny.Query<?> createQuery(Mutiny.Session em) {
+        Mutiny.Query<?> jpaQuery = createBaseQuery(em);
+
+        if (range != null) {
+            jpaQuery.setFirstResult(range.getStartIndex());
+            // range is 0 based, so we add 1
+            jpaQuery.setMaxResults(range.getLastIndex() - range.getStartIndex() + 1);
+        } else if (page != null) {
+            jpaQuery.setFirstResult(page.index * page.size);
+            jpaQuery.setMaxResults(page.size);
+        } else {
+            // Use deprecated API in org.hibernate.Query that will be moved to org.hibernate.query.Query on Hibernate 6.0
+            // FIXME: requires Hibernate support
+            //            @SuppressWarnings("deprecation")
+            //            RowSelection options = jpaQuery.unwrap(org.hibernate.query.Query.class).getQueryOptions();
+            //            options.setFirstRow(null);
+            //            options.setMaxRows(null);
+            // FIXME: why would we even do that? those are the defaults, let's leave them blank
+            // if we don't, we get a LIMIT
+            //            jpaQuery.setFirstResult(0);
+            //            jpaQuery.setMaxResults(Integer.MAX_VALUE);
+        }
+
+        return jpaQuery;
+    }
+
+    private Mutiny.Query<?> createQuery(Mutiny.Session em, int maxResults) {
+        Mutiny.Query<?> jpaQuery = createBaseQuery(em);
+
+        if (range != null) {
+            jpaQuery.setFirstResult(range.getStartIndex());
+        } else if (page != null) {
+            jpaQuery.setFirstResult(page.index * page.size);
+        } else {
+            // Use deprecated API in org.hibernate.Query that will be moved to org.hibernate.query.Query on Hibernate 6.0
+            // FIXME: requires Hibernate support
+            //            @SuppressWarnings("deprecation")
+            //            RowSelection options = jpaQuery.unwrap(org.hibernate.query.Query.class).getQueryOptions();
+            //            options.setFirstRow(null);
+            jpaQuery.setFirstResult(0);
+        }
+        jpaQuery.setMaxResults(maxResults);
+
+        return jpaQuery;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Mutiny.Query<?> createBaseQuery(Mutiny.Session em) {
+        Mutiny.Query<?> jpaQuery;
+        if (PanacheJpaUtil.isNamedQuery(query)) {
+            String namedQuery = query.substring(1);
+            jpaQuery = em.createNamedQuery(namedQuery);
+        } else {
+            jpaQuery = em.createQuery(orderBy != null ? query + orderBy : query);
+        }
+
+        if (paramsArrayOrMap instanceof Map) {
+            AbstractJpaOperations.bindParameters(jpaQuery, (Map<String, Object>) paramsArrayOrMap);
+        } else {
+            AbstractJpaOperations.bindParameters(jpaQuery, (Object[]) paramsArrayOrMap);
+        }
+
+        if (this.lockModeType != null) {
+            jpaQuery.setLockMode(LockModeConverter.convertToLockMode(lockModeType));
+        }
+
+        if (hints != null) {
+            // FIXME: requires Hibernate support
+            //            for (Map.Entry<String, Object> hint : hints.entrySet()) {
+            //                jpaQuery.setHint(hint.getKey(), hint.getValue());
+            //            }
+        }
+        return jpaQuery;
+    }
+
+    private <T> Uni<T> applyFilters(Mutiny.Session em, Supplier<Uni<T>> uni) {
+        if (filters == null)
+            return uni.get();
+        for (Entry<String, Map<String, Object>> entry : filters.entrySet()) {
+            Filter filter = em.enableFilter(entry.getKey());
+            for (Entry<String, Object> paramEntry : entry.getValue().entrySet()) {
+                filter.setParameter(paramEntry.getKey(), paramEntry.getValue());
+            }
+            filter.validate();
+        }
+        return uni.get().onTermination().invoke(() -> {
+            for (Entry<String, Map<String, Object>> entry : filters.entrySet()) {
+                em.disableFilter(entry.getKey());
+            }
+        });
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/NamedQueryUtil.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/NamedQueryUtil.java
new file mode 100644
index 0000000000000..c251a7f6317ca
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/NamedQueryUtil.java
@@ -0,0 +1,29 @@
+package io.quarkus.hibernate.reactive.panache.common.runtime;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import io.quarkus.panache.common.exception.PanacheQueryException;
+
+public final class NamedQueryUtil {
+
+    // will be replaced at augmentation phase
+    private static volatile Map<String, Set<String>> namedQueryMap = Collections.emptyMap();
+
+    private NamedQueryUtil() {
+        // prevent initialization
+    }
+
+    public static void setNamedQueryMap(Map<String, Set<String>> newNamedQueryMap) {
+        namedQueryMap = newNamedQueryMap;
+    }
+
+    public static void checkNamedQuery(Class<?> entityClass, String namedQuery) {
+        Set<String> namedQueries = namedQueryMap.get(entityClass.getName());
+        if (namedQueries == null || !namedQueries.contains(namedQuery)) {
+            throw new PanacheQueryException("The named query '" + namedQuery +
+                    "' must be defined on your JPA entity or one of its super classes");
+        }
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/PanacheHibernateRecorder.java b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/PanacheHibernateRecorder.java
new file mode 100644
index 0000000000000..3a1083a57e0da
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/common/runtime/PanacheHibernateRecorder.java
@@ -0,0 +1,13 @@
+package io.quarkus.hibernate.reactive.panache.common.runtime;
+
+import java.util.Map;
+import java.util.Set;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class PanacheHibernateRecorder {
+    public void setNamedQueryMap(Map<String, Set<String>> namedQueryMap) {
+        NamedQueryUtil.setNamedQueryMap(namedQueryMap);
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..5f949f726dcd0
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "Hibernate Reactive with Panache Common module"
+metadata:
+  keywords:
+  - "hibernate-reactive-panache"
+  - "panache"
+  - "hibernate"
+  - "jpa"
+  categories:
+  - "data"
+  status: "stable"
+  unlisted: true
+
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
new file mode 100644
index 0000000000000..1132737e08533
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-reactive-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <properties>
+        <postgres.image>postgres:13.1</postgres.image>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+    </properties>
+
+    <artifactId>quarkus-hibernate-reactive-panache-deployment</artifactId>
+    <name>Quarkus - Hibernate Reactive with Panache - Deployment</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-hibernate-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-analysis</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-postgresql</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-postgresql</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${postgres.image}</name>
+                                    <alias>postgresql</alias>
+                                    <run>
+                                        <env>
+                                            <POSTGRES_USER>hibernate_orm_test</POSTGRES_USER>
+                                            <POSTGRES_PASSWORD>hibernate_orm_test</POSTGRES_PASSWORD>
+                                            <POSTGRES_DB>hibernate_orm_test</POSTGRES_DB>
+                                        </env>
+                                        <ports>
+                                            <port>5431:5432</port>
+                                        </ports>
+                                        <wait>
+                                            <tcp>
+                                                <mode>mapped</mode>
+                                                <ports>
+                                                    <port>5432</port>
+                                                </ports>
+                                            </tcp>
+                                            <time>10000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <!--Stops all postgres images currently running, not just those we just started.
+                              Useful to stop processes still running from a previously failed integration test run -->
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${docker-prune.location}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheEntityClassBuildItem.java b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheEntityClassBuildItem.java
new file mode 100644
index 0000000000000..4d616d4f91c4f
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheEntityClassBuildItem.java
@@ -0,0 +1,22 @@
+package io.quarkus.hibernate.reactive.panache.deployment;
+
+import org.jboss.jandex.ClassInfo;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Represents a regular Panache entity class.
+ */
+public final class PanacheEntityClassBuildItem extends MultiBuildItem {
+
+    private final ClassInfo entityClass;
+
+    public PanacheEntityClassBuildItem(ClassInfo entityClass) {
+        this.entityClass = entityClass;
+    }
+
+    public ClassInfo get() {
+        return entityClass;
+    }
+
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheHibernateResourceProcessor.java b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheHibernateResourceProcessor.java
new file mode 100644
index 0000000000000..007e6d435dadf
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheHibernateResourceProcessor.java
@@ -0,0 +1,141 @@
+package io.quarkus.hibernate.reactive.panache.deployment;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.persistence.Id;
+import javax.persistence.Transient;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
+import io.quarkus.builder.BuildException;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem;
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.common.deployment.PanacheJpaEntityOperationsEnhancer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
+
+public final class PanacheHibernateResourceProcessor {
+
+    static final DotName DOTNAME_PANACHE_REPOSITORY_BASE = DotName.createSimple(PanacheRepositoryBase.class.getName());
+    private static final DotName DOTNAME_PANACHE_REPOSITORY = DotName.createSimple(PanacheRepository.class.getName());
+    static final DotName DOTNAME_PANACHE_ENTITY_BASE = DotName.createSimple(PanacheEntityBase.class.getName());
+    private static final DotName DOTNAME_PANACHE_ENTITY = DotName.createSimple(PanacheEntity.class.getName());
+
+    private static final DotName DOTNAME_REACTIVE_SESSION = DotName.createSimple(Mutiny.Session.class.getName());
+
+    private static final DotName DOTNAME_ID = DotName.createSimple(Id.class.getName());
+    protected static final String META_INF_PANACHE_ARCHIVE_MARKER = "META-INF/panache-archive.marker";
+
+    private static final DotName DOTNAME_TRANSIENT = DotName.createSimple(Transient.class.getName());
+
+    @BuildStep
+    FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.HIBERNATE_REACTIVE_PANACHE);
+    }
+
+    @BuildStep
+    List<AdditionalJpaModelBuildItem> produceModel() {
+        // only useful for the index resolution: hibernate will register it to be transformed, but BuildMojo
+        // only transforms classes from the application jar, so we do our own transforming
+        return Collections.singletonList(
+                new AdditionalJpaModelBuildItem(PanacheEntity.class));
+    }
+
+    @BuildStep
+    UnremovableBeanBuildItem ensureBeanLookupAvailable() {
+        return UnremovableBeanBuildItem.beanTypes(DOTNAME_REACTIVE_SESSION);
+    }
+
+    @BuildStep
+    AdditionalApplicationArchiveMarkerBuildItem marker() {
+        return new AdditionalApplicationArchiveMarkerBuildItem(META_INF_PANACHE_ARCHIVE_MARKER);
+    }
+
+    @BuildStep
+    void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheEntityClassBuildItem> entityClasses) {
+        // NOTE: we don't skip abstract/generic entities because they still need accessors
+        for (ClassInfo panacheEntityBaseSubclass : index.getIndex().getAllKnownSubclasses(DOTNAME_PANACHE_ENTITY_BASE)) {
+            // FIXME: should we really skip PanacheEntity or all MappedSuperClass?
+            if (!panacheEntityBaseSubclass.name().equals(DOTNAME_PANACHE_ENTITY)) {
+                entityClasses.produce(new PanacheEntityClassBuildItem(panacheEntityBaseSubclass));
+            }
+        }
+    }
+
+    @BuildStep
+    @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    void build(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            List<PanacheEntityClassBuildItem> entityClasses,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) throws Exception {
+
+        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
+                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+
+        PanacheJpaRepositoryEnhancer daoEnhancer = new PanacheJpaRepositoryEnhancer(index.getIndex());
+        Set<String> daoClasses = new HashSet<>();
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_PANACHE_REPOSITORY_BASE)) {
+            // Skip PanacheRepository
+            if (classInfo.name().equals(DOTNAME_PANACHE_REPOSITORY))
+                continue;
+            if (daoEnhancer.skipRepository(classInfo))
+                continue;
+            daoClasses.add(classInfo.name().toString());
+        }
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_PANACHE_REPOSITORY)) {
+            if (daoEnhancer.skipRepository(classInfo))
+                continue;
+            daoClasses.add(classInfo.name().toString());
+        }
+        for (String daoClass : daoClasses) {
+            transformers.produce(new BytecodeTransformerBuildItem(daoClass, daoEnhancer));
+        }
+
+        PanacheJpaEntityOperationsEnhancer entityOperationsEnhancer = new PanacheJpaEntityOperationsEnhancer(index.getIndex(),
+                methodCustomizers,
+                ReactiveJavaJpaTypeBundle.BUNDLE);
+        for (PanacheEntityClassBuildItem entityClass : entityClasses) {
+            String entityClassName = entityClass.get().name().toString();
+            transformers.produce(new BytecodeTransformerBuildItem(true, entityClassName, entityOperationsEnhancer));
+        }
+    }
+
+    @BuildStep
+    ValidationPhaseBuildItem.ValidationErrorBuildItem validate(ValidationPhaseBuildItem validationPhase,
+            CombinedIndexBuildItem index) throws BuildException {
+        // we verify that no ID fields are defined (via @Id) when extending PanacheEntity
+        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(DOTNAME_ID)) {
+            ClassInfo info = JandexUtil.getEnclosingClass(annotationInstance);
+            if (JandexUtil.isSubclassOf(index.getIndex(), info, DOTNAME_PANACHE_ENTITY)) {
+                BuildException be = new BuildException("You provide a JPA identifier via @Id inside '" + info.name() +
+                        "' but one is already provided by PanacheEntity, " +
+                        "your class should extend PanacheEntityBase instead, or use the id provided by PanacheEntity",
+                        Collections.emptyList());
+                return new ValidationPhaseBuildItem.ValidationErrorBuildItem(be);
+            }
+        }
+        return null;
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheJpaRepositoryEnhancer.java b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheJpaRepositoryEnhancer.java
new file mode 100644
index 0000000000000..bd9c5e14bcfbb
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/PanacheJpaRepositoryEnhancer.java
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.reactive.panache.deployment;
+
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.visitors.PanacheRepositoryClassOperationGenerationVisitor;
+
+public class PanacheJpaRepositoryEnhancer extends PanacheRepositoryEnhancer {
+
+    public PanacheJpaRepositoryEnhancer(IndexView index) {
+        super(index);
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
+        return new PanacheRepositoryClassOperationGenerationVisitor(className, outputClassVisitor,
+                this.indexView, ReactiveJavaJpaTypeBundle.BUNDLE);
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/ReactiveJavaJpaTypeBundle.java b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/ReactiveJavaJpaTypeBundle.java
new file mode 100644
index 0000000000000..f139134fd1112
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/deployment/ReactiveJavaJpaTypeBundle.java
@@ -0,0 +1,45 @@
+package io.quarkus.hibernate.reactive.panache.deployment;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+import io.quarkus.hibernate.reactive.panache.PanacheQuery;
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.quarkus.hibernate.reactive.panache.runtime.JpaOperations;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public class ReactiveJavaJpaTypeBundle implements TypeBundle {
+
+    public static final TypeBundle BUNDLE = new ReactiveJavaJpaTypeBundle();
+
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(PanacheEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(PanacheEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(JpaOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(PanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(PanacheRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(PanacheRepositoryBase.class);
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DefaultPanacheEntityToStringTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DefaultPanacheEntityToStringTest.java
new file mode 100644
index 0000000000000..9bba50c25577b
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DefaultPanacheEntityToStringTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+public class DefaultPanacheEntityToStringTest {
+
+    @Test
+    public void testDefaultToStringMethod() {
+        MyPanacheEntity myPanacheEntityWithId = new MyPanacheEntity(2912l);
+        assertEquals("MyPanacheEntity<2912>", myPanacheEntityWithId.toString());
+
+        MyPanacheEntity myPanacheEntityWithNullId = new MyPanacheEntity(null);
+        assertEquals("MyPanacheEntity<null>", myPanacheEntityWithNullId.toString());
+    }
+
+    static class MyPanacheEntity extends PanacheEntity {
+        public MyPanacheEntity(Long id) {
+            this.id = id;
+        }
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java
new file mode 100644
index 0000000000000..95f29dc187c17
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.persistence.Id;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+public class DuplicateIdEntity extends PanacheEntity {
+    @Id
+    public String customId;
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java
new file mode 100644
index 0000000000000..046deb1bfe05a
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DuplicateIdEntityTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(BuildException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DuplicateIdEntity.class));
+
+    @Test
+    void shouldThrow() {
+        fail("A BuildException should have been thrown due to duplicate entity ID");
+    }
+
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdParentEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdParentEntity.java
new file mode 100644
index 0000000000000..f01d43ecb7269
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdParentEntity.java
@@ -0,0 +1,6 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+public class DuplicateIdParentEntity extends PanacheEntity {
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java
new file mode 100644
index 0000000000000..87922c53fea5b
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentEntity.java
@@ -0,0 +1,8 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.persistence.Id;
+
+public class DuplicateIdWithParentEntity extends DuplicateIdParentEntity {
+    @Id
+    public String customId;
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java
new file mode 100644
index 0000000000000..b3d4ab2f83348
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdWithParentTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DuplicateIdWithParentTest {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(BuildException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DuplicateIdWithParentEntity.class, DuplicateIdParentEntity.class));
+
+    @Test
+    void shouldThrow() {
+        fail("A BuildException should have been thrown due to duplicate entity ID");
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/JAXBEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/JAXBEntity.java
new file mode 100644
index 0000000000000..04750e3fc2341
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/JAXBEntity.java
@@ -0,0 +1,51 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+@XmlRootElement(name = "JAXBEntity")
+public class JAXBEntity extends PanacheEntity {
+
+    @XmlAttribute(name = "Named")
+    public String namedAnnotatedProp;
+
+    @XmlTransient
+    public String transientProp;
+
+    @XmlAttribute
+    public String defaultAnnotatedProp;
+
+    @XmlElements({
+            @XmlElement(name = "array1"),
+            @XmlElement(name = "array2")
+    })
+    public String arrayAnnotatedProp;
+
+    public String unAnnotatedProp;
+
+    // note that this annotation is automatically added for mapped fields, which is not the case here
+    // so we do it manually to emulate a mapped field situation
+    @XmlTransient
+    @Transient
+    public int serialisationTrick;
+
+    public String name;
+
+    // For JAXB: both getter and setter are required
+    // Here we make sure the field is not used by Hibernate, but the accessor is used by jaxb, jsonb and jackson
+    public int getSerialisationTrick() {
+        return ++serialisationTrick;
+    }
+
+    public void setSerialisationTrick(int serialisationTrick) {
+        this.serialisationTrick = serialisationTrick;
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/JAXBTestResource.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/JAXBTestResource.java
new file mode 100644
index 0000000000000..b0f09cb86f10b
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/JAXBTestResource.java
@@ -0,0 +1,31 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("test")
+public class JAXBTestResource {
+
+    @Produces(MediaType.APPLICATION_XML)
+    @GET
+    @Path("ignored-properties")
+    public JAXBEntity ignoredProperties() throws NoSuchMethodException, SecurityException {
+        JAXBEntity.class.getMethod("$$_hibernate_read_id");
+        JAXBEntity.class.getMethod("$$_hibernate_read_name");
+        try {
+            JAXBEntity.class.getMethod("$$_hibernate_read_persistent");
+            Assertions.fail();
+        } catch (NoSuchMethodException e) {
+        }
+
+        // no need to persist it, we can fake it
+        JAXBEntity entity = new JAXBEntity();
+        entity.id = 666l;
+        entity.name = "Eddie";
+        return entity;
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java
new file mode 100644
index 0000000000000..3f6705e99befe
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class MyEntity extends PanacheEntity {
+    public String name;
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java
new file mode 100644
index 0000000000000..08e3b8712d072
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class MyOtherEntity extends PanacheEntity {
+    public String name;
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java
new file mode 100644
index 0000000000000..d4c5c1f54b3c1
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyOtherTestResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("other-entity")
+public class MyOtherTestResource {
+
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<MyOtherEntity> get(@PathParam long id) {
+        return MyOtherEntity.<MyOtherEntity> findById(id)
+                .onItem().ifNull().failWith(() -> new WebApplicationException(Response.Status.NOT_FOUND));
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java
new file mode 100644
index 0000000000000..b8420934e5682
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/MyTestResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+import io.smallrye.mutiny.Uni;
+
+@Path("entity")
+public class MyTestResource {
+
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Uni<MyEntity> get(@PathParam long id) {
+        return MyEntity.<MyEntity> findById(id)
+                .onItem().ifNull().failWith(() -> new WebApplicationException(Response.Status.NOT_FOUND));
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java
new file mode 100644
index 0000000000000..7cb07508a9d21
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoConfigTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void testNoConfig() {
+        // we should be able to start the application, even with no configuration at all
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheEntityMetaModelTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheEntityMetaModelTest.java
new file mode 100644
index 0000000000000..ab8eecc53f564
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheEntityMetaModelTest.java
@@ -0,0 +1,13 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity_;
+
+public class PanacheEntityMetaModelTest {
+    @Test
+    public void testMetaModelExistence() {
+        Assertions.assertEquals("id", PanacheEntity_.ID);
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java
new file mode 100644
index 0000000000000..ac87fe9da93f9
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheHotReloadTestCase.java
@@ -0,0 +1,63 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import static org.hamcrest.Matchers.is;
+
+import java.util.function.Function;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class PanacheHotReloadTestCase {
+    @RegisterExtension
+    final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyEntity.class, MyTestResource.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    public void testAddNewFieldToEntity() {
+        String expectedName = "{\"id\":1,\"name\":\"my name\"}";
+        assertBodyIs(expectedName);
+
+        TEST.modifySourceFile(MyEntity.class, new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace("public String name;", "public String name;public String tag;");
+            }
+        });
+        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace(";", ";\nUPDATE MyEntity SET tag = 'related' WHERE id = 1;\n");
+            }
+        });
+        String hotReloadExpectedName = "{\"id\":1,\"name\":\"my name\",\"tag\":\"related\"}";
+        assertBodyIs(hotReloadExpectedName);
+    }
+
+    @Test
+    public void testAddEntity() {
+        RestAssured.when().get("/other-entity/1").then().statusCode(404);
+
+        TEST.addSourceFile(MyOtherEntity.class);
+        TEST.addSourceFile(MyOtherTestResource.class);
+
+        TEST.modifyResourceFile("import.sql", new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s + s.replaceAll("MyEntity", "MyOtherEntity");
+            }
+        });
+        RestAssured.when().get("/other-entity/1").then().statusCode(200).body(is("{\"id\":1,\"name\":\"my name\"}"));
+    }
+
+    private void assertBodyIs(String expectedBody) {
+        RestAssured.when().get("/entity/1").then().statusCode(200).body(is(expectedBody));
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheJAXBTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheJAXBTest.java
new file mode 100644
index 0000000000000..6bddad2cbb999
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/PanacheJAXBTest.java
@@ -0,0 +1,107 @@
+package io.quarkus.hibernate.reactive.panache.test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+
+public class PanacheJAXBTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(JAXBEntity.class, JAXBTestResource.class)
+                    .addAsResource("application.properties"));
+
+    @Test
+    public void testJaxbAnnotationTransfer() throws Exception {
+        // Test for fix to this bug: https://github.com/quarkusio/quarkus/issues/6021
+
+        // Ensure that any JAX-B annotations are properly moved to generated getters
+        Method m = JAXBEntity.class.getMethod("getNamedAnnotatedProp");
+        XmlAttribute anno = m.getAnnotation(XmlAttribute.class);
+        assertNotNull(anno);
+        assertEquals("Named", anno.name());
+        assertNull(m.getAnnotation(XmlTransient.class));
+
+        m = JAXBEntity.class.getMethod("getDefaultAnnotatedProp");
+        anno = m.getAnnotation(XmlAttribute.class);
+        assertNotNull(anno);
+        assertEquals("##default", anno.name());
+        assertNull(m.getAnnotation(XmlTransient.class));
+
+        m = JAXBEntity.class.getMethod("getUnAnnotatedProp");
+        assertNull(m.getAnnotation(XmlAttribute.class));
+        assertNull(m.getAnnotation(XmlTransient.class));
+
+        m = JAXBEntity.class.getMethod("getTransientProp");
+        assertNull(m.getAnnotation(XmlAttribute.class));
+        assertNotNull(m.getAnnotation(XmlTransient.class));
+
+        m = JAXBEntity.class.getMethod("getArrayAnnotatedProp");
+        assertNull(m.getAnnotation(XmlTransient.class));
+        XmlElements elementsAnno = m.getAnnotation(XmlElements.class);
+        assertNotNull(elementsAnno);
+        assertNotNull(elementsAnno.value());
+        assertEquals(2, elementsAnno.value().length);
+        assertEquals("array1", elementsAnno.value()[0].name());
+        assertEquals("array2", elementsAnno.value()[1].name());
+
+        // Ensure that all original fields were labeled @XmlTransient and had their original JAX-B annotations removed
+        ensureFieldSanitized("namedAnnotatedProp");
+        ensureFieldSanitized("transientProp");
+        ensureFieldSanitized("defaultAnnotatedProp");
+        ensureFieldSanitized("unAnnotatedProp");
+        ensureFieldSanitized("arrayAnnotatedProp");
+    }
+
+    private void ensureFieldSanitized(String fieldName) throws Exception {
+        Field f = JAXBEntity.class.getDeclaredField(fieldName);
+        assertNull(f.getAnnotation(XmlAttribute.class));
+        assertNotNull(f.getAnnotation(XmlTransient.class));
+    }
+
+    @Test
+    public void testPanacheSerialisation() {
+        RestAssured.given().accept(ContentType.XML)
+                .when().get("/test/ignored-properties")
+                .then().body(is(
+                        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><JAXBEntity><id>666</id><name>Eddie</name><serialisationTrick>1</serialisationTrick></JAXBEntity>"));
+    }
+
+    @Test
+    public void jaxbDeserializationHasAllFields() throws JAXBException {
+        // set Up
+        JAXBEntity person = new JAXBEntity();
+        person.name = "max";
+        // do
+        JAXBContext jaxbContext = JAXBContext.newInstance(JAXBEntity.class);
+
+        Marshaller marshaller = jaxbContext.createMarshaller();
+        StringWriter sw = new StringWriter();
+        marshaller.marshal(person, sw);
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><JAXBEntity><name>max</name><serialisationTrick>1</serialisationTrick></JAXBEntity>",
+                sw.toString());
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties b/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties
new file mode 100644
index 0000000000000..6d0922b28d2fe
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=hibernate_orm_test
+quarkus.datasource.password=hibernate_orm_test
+quarkus.datasource.reactive.url=${postgres.reactive.url}
+
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/import.sql b/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/import.sql
new file mode 100644
index 0000000000000..1af482b794e4e
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/import.sql
@@ -0,0 +1 @@
+INSERT INTO MyEntity(id, name) VALUES(1, 'my name');
diff --git a/extensions/panache/hibernate-reactive-panache/pom.xml b/extensions/panache/hibernate-reactive-panache/pom.xml
new file mode 100644
index 0000000000000..32be6753b5f82
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+	<relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-reactive-panache-parent</artifactId>
+    <name>Quarkus - Hibernate Reactive with Panache - JPA</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+
+</project>
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
new file mode 100644
index 0000000000000..8fe252fd5da64
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-hibernate-reactive-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-hibernate-reactive-panache</artifactId>
+    <name>Quarkus - Hibernate Reactive with Panache - Runtime</name>
+    <description>Simplify your persistence code for Hibernate Reactive via the active record or the repository pattern</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json.bind</groupId>
+            <artifactId>jakarta.json.bind-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+            <scope>provided</scope>
+            <!-- Exclude these dependencies, since they are banned -->
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>javax.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Explicitly provide banned dependencies, in the correct version -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.bind</groupId>
+            <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <!-- The entity classes needs to be indexed -->
+            <plugin>
+                <groupId>org.jboss.jandex</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/Panache.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/Panache.java
new file mode 100644
index 0000000000000..a0984e6684d55
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/Panache.java
@@ -0,0 +1,74 @@
+package io.quarkus.hibernate.reactive.panache;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import io.quarkus.hibernate.reactive.panache.common.runtime.AbstractJpaOperations;
+import io.quarkus.hibernate.reactive.panache.runtime.JpaOperations;
+import io.quarkus.panache.common.Parameters;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Utility class for Panache.
+ *
+ * @author Stéphane Épardaud
+ */
+public class Panache {
+
+    /**
+     * Returns the current {@link Mutiny.Session}
+     * 
+     * @return the current {@link Mutiny.Session}
+     */
+    public static Mutiny.Session getSession() {
+        return JpaOperations.getSession();
+    }
+
+    /**
+     * Performs the given work within the scope of a database transaction, automatically flushing the session.
+     * The transaction will be rolled back if the work completes with an uncaught exception, or if
+     * {@link Mutiny.Transaction#markForRollback()} is called.
+     * 
+     * @param <T> The function's return type
+     * @param work The function to execute in the new transaction
+     * @return the result of executing the function
+     */
+    public static <T> Uni<T> withTransaction(Supplier<Uni<T>> work) {
+        return getSession().withTransaction(t -> work.get());
+    }
+
+    /**
+     * Executes a database update operation and return the number of rows operated on.
+     *
+     * @param query a normal HQL query
+     * @param params optional list of indexed parameters
+     * @return the number of rows operated on.
+     */
+    public static Uni<Integer> executeUpdate(String query, Object... params) {
+        return AbstractJpaOperations.executeUpdate(query, params);
+    }
+
+    /**
+     * Executes a database update operation and return the number of rows operated on.
+     *
+     * @param query a normal HQL query
+     * @param params {@link Map} of named parameters
+     * @return the number of rows operated on.
+     */
+    public static Uni<Integer> executeUpdate(String query, Map<String, Object> params) {
+        return AbstractJpaOperations.executeUpdate(query, params);
+    }
+
+    /**
+     * Executes a database update operation and return the number of rows operated on.
+     *
+     * @param query a normal HQL query
+     * @param params {@link Parameters} of named parameters
+     * @return the number of rows operated on.
+     */
+    public static Uni<Integer> executeUpdate(String query, Parameters params) {
+        return AbstractJpaOperations.executeUpdate(query, params.map());
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java
new file mode 100644
index 0000000000000..c2b3750f4d259
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntity.java
@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.reactive.panache;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+
+/**
+ * <p>
+ * Represents an entity with a generated ID field {@link #id} of type {@link Long}. If your
+ * Hibernate entities extend this class they gain the ID field and auto-generated accessors
+ * to all their public fields (unless annotated with {@link Transient}), as well as all
+ * the useful methods from {@link PanacheEntityBase}.
+ * </p>
+ * <p>
+ * If you want a custom ID type or strategy, you can directly extend {@link PanacheEntityBase}
+ * instead, and write your own ID field. You will still get auto-generated accessors and
+ * all the useful methods.
+ * </p>
+ *
+ * @author Stéphane Épardaud
+ * @see PanacheEntityBase
+ */
+@MappedSuperclass
+public abstract class PanacheEntity extends PanacheEntityBase {
+
+    /**
+     * The auto-generated ID field. This field is set by Hibernate ORM when this entity
+     * is persisted.
+     *
+     * @see #persist()
+     */
+    @Id
+    @GeneratedValue
+    public Long id;
+
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + "<" + id + ">";
+    }
+
+    // FIXME: VERSION?
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java
new file mode 100644
index 0000000000000..0dc25ffd8f5f5
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheEntityBase.java
@@ -0,0 +1,778 @@
+package io.quarkus.hibernate.reactive.panache;
+
+import static io.quarkus.hibernate.reactive.panache.runtime.JpaOperations.INSTANCE;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import javax.json.bind.annotation.JsonbTransient;
+import javax.persistence.LockModeType;
+import javax.persistence.Transient;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.panache.common.impl.GenerateBridge;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * <p>
+ * Represents an entity. If your Hibernate entities extend this class they gain auto-generated accessors
+ * to all their public fields (unless annotated with {@link Transient}), as well as a lot of useful
+ * methods. Unless you have a custom ID strategy, you should not extend this class directly but extend
+ * {@link PanacheEntity} instead.
+ * </p>
+ *
+ * @author Stéphane Épardaud
+ * @see PanacheEntity
+ */
+public abstract class PanacheEntityBase {
+
+    // Operations
+
+    /**
+     * Persist this entity in the database, if not already persisted. This will set your ID field if it is not already set.
+     * 
+     * @return
+     *
+     * @see #isPersistent()
+     * @see #persist(Iterable)
+     * @see #persist(Stream)
+     * @see #persist(Object, Object...)
+     */
+    public Uni<Void> persist() {
+        return INSTANCE.persist(this);
+    }
+
+    /**
+     * Persist this entity in the database, if not already persisted. This will set your ID field if it is not already set.
+     * Then flushes all pending changes to the database.
+     * 
+     * @return
+     *
+     * @see #isPersistent()
+     * @see #persist(Iterable)
+     * @see #persist(Stream)
+     * @see #persist(Object, Object...)
+     */
+    public Uni<Void> persistAndFlush() {
+        return INSTANCE.persist(this)
+                .flatMap(v -> INSTANCE.flush())
+                .map(v -> null);
+    }
+
+    /**
+     * Delete this entity from the database, if it is already persisted.
+     * 
+     * @return
+     *
+     * @see #isPersistent()
+     * @see #delete(String, Object...)
+     * @see #delete(String, Map)
+     * @see #delete(String, Parameters)
+     * @see #deleteAll()
+     */
+    public Uni<Void> delete() {
+        return INSTANCE.delete(this);
+    }
+
+    /**
+     * Returns true if this entity is persistent in the database. If yes, all modifications to
+     * its persistent fields will be automatically committed to the database at transaction
+     * commit time.
+     *
+     * @return true if this entity is persistent in the database.
+     */
+    @JsonbTransient
+    // @JsonIgnore is here to avoid serialization of this property with jackson
+    @JsonIgnore
+    public boolean isPersistent() {
+        return INSTANCE.isPersistent(this);
+    }
+
+    /**
+     * Flushes all pending changes to the database.
+     * 
+     * @return
+     */
+    public Uni<Void> flush() {
+        return INSTANCE.flush();
+    }
+
+    // Queries
+
+    /**
+     * Find an entity of this type by ID.
+     *
+     * @param id the ID of the entity to find.
+     * @return the entity found, or <code>null</code> if not found.
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<T> findById(Object id) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find an entity of this type by ID and lock it.
+     *
+     * @param id the ID of the entity to find.
+     * @param lockModeType the locking strategy to be used when retrieving the entity.
+     * @return the entity found, or <code>null</code> if not found.
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<T> findById(Object id, LockModeType lockModeType) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query, with optional indexed parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Sort, Object...)
+     * @see #find(String, Map)
+     * @see #find(String, Parameters)
+     * @see #list(String, Object...)
+     * @see #stream(String, Object...)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query and the given sort options, with optional indexed parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Object...)
+     * @see #find(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Object...)
+     * @see #stream(String, Sort, Object...)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Sort, Map)
+     * @see #find(String, Object...)
+     * @see #find(String, Parameters)
+     * @see #list(String, Map)
+     * @see #stream(String, Map)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Map} of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Map)
+     * @see #find(String, Sort, Object...)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Map)
+     * @see #stream(String, Sort, Map)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Sort, Parameters)
+     * @see #find(String, Map)
+     * @see #find(String, Parameters)
+     * @see #list(String, Parameters)
+     * @see #stream(String, Parameters)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Parameters} of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Parameters)
+     * @see #find(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Parameters)
+     * @see #stream(String, Sort, Parameters)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type.
+     *
+     * @return a new {@link PanacheQuery} instance to find all entities of this type.
+     * @see #findAll(Sort)
+     * @see #listAll()
+     * @see #streamAll()
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> findAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type, in the given order.
+     *
+     * @param sort the sort order to use
+     * @return a new {@link PanacheQuery} instance to find all entities of this type.
+     * @see #findAll()
+     * @see #listAll(Sort)
+     * @see #streamAll(Sort)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> PanacheQuery<T> findAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, params).list()</code>.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Sort, Object...)
+     * @see #list(String, Map)
+     * @see #list(String, Parameters)
+     * @see #find(String, Object...)
+     * @see #stream(String, Object...)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> list(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, sort, params).list()</code>.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Object...)
+     * @see #list(String, Sort, Map)
+     * @see #list(String, Sort, Parameters)
+     * @see #find(String, Sort, Object...)
+     * @see #stream(String, Sort, Object...)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> list(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).list()</code>.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Sort, Map)
+     * @see #list(String, Object...)
+     * @see #list(String, Parameters)
+     * @see #find(String, Map)
+     * @see #stream(String, Map)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> list(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).list()</code>.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Map} of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Map)
+     * @see #list(String, Sort, Object...)
+     * @see #list(String, Sort, Parameters)
+     * @see #find(String, Sort, Map)
+     * @see #stream(String, Sort, Map)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> list(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).list()</code>.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Sort, Parameters)
+     * @see #list(String, Object...)
+     * @see #list(String, Map)
+     * @see #find(String, Parameters)
+     * @see #stream(String, Parameters)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> list(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).list()</code>.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Parameters} of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Parameters)
+     * @see #list(String, Sort, Object...)
+     * @see #list(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #stream(String, Sort, Parameters)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> list(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for <code>findAll().list()</code>.
+     *
+     * @return a {@link List} containing all results, without paging
+     * @see #listAll(Sort)
+     * @see #findAll()
+     * @see #streamAll()
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> listAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for <code>findAll(sort).list()</code>.
+     *
+     * @param sort the sort order to use
+     * @return a {@link List} containing all results, without paging
+     * @see #listAll()
+     * @see #findAll(Sort)
+     * @see #streamAll(Sort)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Uni<List<T>> listAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Sort, Object...)
+     * @see #stream(String, Map)
+     * @see #stream(String, Parameters)
+     * @see #find(String, Object...)
+     * @see #list(String, Object...)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> stream(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, sort, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Object...)
+     * @see #stream(String, Sort, Map)
+     * @see #stream(String, Sort, Parameters)
+     * @see #find(String, Sort, Object...)
+     * @see #list(String, Sort, Object...)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> stream(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Sort, Map)
+     * @see #stream(String, Object...)
+     * @see #stream(String, Parameters)
+     * @see #find(String, Map)
+     * @see #list(String, Map)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> stream(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Map} of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Map)
+     * @see #stream(String, Sort, Object...)
+     * @see #stream(String, Sort, Parameters)
+     * @see #find(String, Sort, Map)
+     * @see #list(String, Sort, Map)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> stream(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Sort, Parameters)
+     * @see #stream(String, Object...)
+     * @see #stream(String, Map)
+     * @see #find(String, Parameters)
+     * @see #list(String, Parameters)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> stream(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Parameters} of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Parameters)
+     * @see #stream(String, Sort, Object...)
+     * @see #stream(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Parameters)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> stream(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for <code>findAll().stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @return a {@link Stream} containing all results, without paging
+     * @see #streamAll(Sort)
+     * @see #findAll()
+     * @see #listAll()
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> streamAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for <code>findAll(sort).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     *
+     * @param sort the sort order to use
+     * @return a {@link Stream} containing all results, without paging
+     * @see #streamAll()
+     * @see #findAll(Sort)
+     * @see #listAll(Sort)
+     */
+    @GenerateBridge
+    public static <T extends PanacheEntityBase> Multi<T> streamAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity in the database.
+     *
+     * @return the number of this type of entity in the database.
+     * @see #count(String, Object...)
+     * @see #count(String, Map)
+     * @see #count(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Long> count() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity matching the given query, with optional indexed parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities counted.
+     * @see #count()
+     * @see #count(String, Map)
+     * @see #count(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Long> count(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return the number of entities counted.
+     * @see #count()
+     * @see #count(String, Object...)
+     * @see #count(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Long> count(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return the number of entities counted.
+     * @see #count()
+     * @see #count(String, Object...)
+     * @see #count(String, Map)
+     */
+    @GenerateBridge
+    public static Uni<Long> count(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type from the database.
+     *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @return the number of entities deleted.
+     * @see #delete(String, Object...)
+     * @see #delete(String, Map)
+     * @see #delete(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Long> deleteAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete an entity of this type by ID.
+     *
+     * @param id the ID of the entity to delete.
+     * @return false if the entity was not deleted (not found).
+     */
+    @GenerateBridge
+    public static Uni<Boolean> deleteById(Object id) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type matching the given query, with optional indexed parameters.
+     *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities deleted.
+     * @see #deleteAll()
+     * @see #delete(String, Map)
+     * @see #delete(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Long> delete(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return the number of entities deleted.
+     * @see #deleteAll()
+     * @see #delete(String, Object...)
+     * @see #delete(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Long> delete(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return the number of entities deleted.
+     * @see #deleteAll()
+     * @see #delete(String, Object...)
+     * @see #delete(String, Map)
+     */
+    @GenerateBridge
+    public static Uni<Long> delete(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to persist
+     * @return
+     * @see #persist()
+     * @see #persist(Stream)
+     * @see #persist(Object,Object...)
+     */
+    public static Uni<Void> persist(Iterable<?> entities) {
+        return INSTANCE.persist(entities);
+    }
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to persist
+     * @return
+     * @see #persist()
+     * @see #persist(Iterable)
+     * @see #persist(Object,Object...)
+     */
+    public static Uni<Void> persist(Stream<?> entities) {
+        return INSTANCE.persist(entities);
+    }
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to persist
+     * @return
+     * @see #persist()
+     * @see #persist(Stream)
+     * @see #persist(Iterable)
+     */
+    public static Uni<Void> persist(Object firstEntity, Object... entities) {
+        return INSTANCE.persist(firstEntity, entities);
+    }
+
+    /**
+     * Update all entities of this type matching the given query, with optional indexed parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities updated.
+     * @see #update(String, Map)
+     * @see #update(String, Parameters)
+     */
+    @GenerateBridge
+    public static Uni<Integer> update(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Update all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return the number of entities updated.
+     * @see #update(String, Object...)
+     * @see #update(String, Parameters)
+     * 
+     */
+    @GenerateBridge
+    public static Uni<Integer> update(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Update all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return the number of entities updated.
+     * @see #update(String, Object...)
+     * @see #update(String, Map)
+     */
+    @GenerateBridge
+    public static Uni<Integer> update(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java
new file mode 100644
index 0000000000000..2d8048e6ea540
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheQuery.java
@@ -0,0 +1,264 @@
+package io.quarkus.hibernate.reactive.panache;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import javax.persistence.LockModeType;
+import javax.persistence.NoResultException;
+import javax.persistence.NonUniqueResultException;
+
+import org.hibernate.Session;
+import org.hibernate.annotations.FilterDef;
+
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Parameters;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * <p>
+ * Interface representing an entity query, which abstracts the use of paging, getting the number of results, and
+ * operating on {@link List} or {@link Stream}.
+ * </p>
+ * <p>
+ * Instances of this interface cannot mutate the query itself or its parameters: only paging information can be
+ * modified, and instances of this interface can be reused to obtain multiple pages of results.
+ * </p>
+ *
+ * @author Stéphane Épardaud
+ * @param <Entity> The entity type being queried
+ */
+public interface PanacheQuery<Entity> {
+
+    // Builder
+
+    /**
+     * Defines a projection class: the getters, and the public fields, will be used to restrict which fields should be
+     * retrieved from the database.
+     *
+     * @return a new query with the same state as the previous one (params, page, range, lockMode, hints, ...).
+     */
+    public <T> PanacheQuery<T> project(Class<T> type);
+
+    /**
+     * Sets the current page.
+     * 
+     * @param page the new page
+     * @return this query, modified
+     * @see #page(int, int)
+     * @see #page()
+     */
+    public <T extends Entity> PanacheQuery<T> page(Page page);
+
+    /**
+     * Sets the current page.
+     * 
+     * @param pageIndex the page index
+     * @param pageSize the page size
+     * @return this query, modified
+     * @see #page(Page)
+     * @see #page()
+     */
+    public <T extends Entity> PanacheQuery<T> page(int pageIndex, int pageSize);
+
+    /**
+     * Sets the current page to the next page
+     * 
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #previousPage()
+     */
+    public <T extends Entity> PanacheQuery<T> nextPage();
+
+    /**
+     * Sets the current page to the previous page (or the first page if there is no previous page)
+     * 
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #nextPage()
+     */
+    public <T extends Entity> PanacheQuery<T> previousPage();
+
+    /**
+     * Sets the current page to the first page
+     * 
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #lastPage()
+     */
+    public <T extends Entity> PanacheQuery<T> firstPage();
+
+    /**
+     * Sets the current page to the last page. This will cause reading of the entity count.
+     * 
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #firstPage()
+     * @see #count()
+     */
+    public <T extends Entity> Uni<PanacheQuery<T>> lastPage();
+
+    /**
+     * Returns true if there is another page to read after the current one.
+     * This will cause reading of the entity count.
+     * 
+     * @return true if there is another page to read
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #hasPreviousPage()
+     * @see #count()
+     */
+    public Uni<Boolean> hasNextPage();
+
+    /**
+     * Returns true if there is a page to read before the current one.
+     * 
+     * @return true if there is a previous page to read
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #hasNextPage()
+     */
+    public boolean hasPreviousPage();
+
+    /**
+     * Returns the total number of pages to be read using the current page size.
+     * This will cause reading of the entity count.
+     * 
+     * @return the total number of pages to be read using the current page size.
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     */
+    public Uni<Integer> pageCount();
+
+    /**
+     * Returns the current page.
+     * 
+     * @return the current page
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see #page(Page)
+     * @see #page(int,int)
+     */
+    public Page page();
+
+    /**
+     * Switch the query to use a fixed range (start index - last index) instead of a page.
+     * As the range is fixed, subsequent pagination of the query is not possible.
+     *
+     * @param startIndex the index of the first element, starting at 0
+     * @param lastIndex the index of the last element
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> range(int startIndex, int lastIndex);
+
+    /**
+     * Define the locking strategy used for this query.
+     *
+     * @param lockModeType the locking strategy to be used for this query.
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> withLock(LockModeType lockModeType);
+
+    /**
+     * Set a query property or hint on the underlying JPA Query.
+     *
+     * @param hintName name of the property or hint.
+     * @param value value for the property or hint.
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> withHint(String hintName, Object value);
+
+    /**
+     * <p>
+     * Enables a Hibernate filter during fetching of results for this query. Your filter must be declared
+     * with {@link FilterDef} on your entity or package, and enabled with {@link Filter} on your entity.
+     * <p>
+     * WARNING: setting filters can only be done on the underlying Hibernate {@link Session} and so this
+     * will modify the session's filters for the duration of obtaining the results (not while building
+     * the query). Enabled filters will be removed from the session afterwards, but no effort is made to
+     * preserve filters enabled on the session outside of this API.
+     * 
+     * @param filterName The name of the filter to enable
+     * @param parameters The set of parameters for the filter, if the filter requires parameters
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> filter(String filterName, Parameters parameters);
+
+    /**
+     * <p>
+     * Enables a Hibernate filter during fetching of results for this query. Your filter must be declared
+     * with {@link FilterDef} on your entity or package, and enabled with {@link Filter} on your entity.
+     * <p>
+     * WARNING: setting filters can only be done on the underlying Hibernate {@link Session} and so this
+     * will modify the session's filters for the duration of obtaining the results (not while building
+     * the query). Enabled filters will be removed from the session afterwards, but no effort is made to
+     * preserve filters enabled on the session outside of this API.
+     * 
+     * @param filterName The name of the filter to enable
+     * @param parameters The set of parameters for the filter, if the filter requires parameters
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> filter(String filterName, Map<String, Object> parameters);
+
+    /**
+     * <p>
+     * Enables a Hibernate filter during fetching of results for this query. Your filter must be declared
+     * with {@link FilterDef} on your entity or package, and enabled with {@link Filter} on your entity.
+     * <p>
+     * WARNING: setting filters can only be done on the underlying Hibernate {@link Session} and so this
+     * will modify the session's filters for the duration of obtaining the results (not while building
+     * the query). Enabled filters will be removed from the session afterwards, but no effort is made to
+     * preserve filters enabled on the session outside of this API.
+     * 
+     * @param filterName The name of the filter to enable
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> filter(String filterName);
+
+    // Results
+
+    /**
+     * Reads and caches the total number of entities this query operates on. This causes a database
+     * query with <code>SELECT COUNT(*)</code> and a query equivalent to the current query, minus
+     * ordering.
+     * 
+     * @return the total number of entities this query operates on, cached.
+     */
+    public Uni<Long> count();
+
+    /**
+     * Returns the current page of results as a {@link List}.
+     * 
+     * @return the current page of results as a {@link List}.
+     * @see #stream()
+     * @see #page(Page)
+     * @see #page()
+     */
+    public <T extends Entity> Uni<List<T>> list();
+
+    /**
+     * Returns the current page of results as a {@link Stream}.
+     * 
+     * @return the current page of results as a {@link Stream}.
+     * @see #list()
+     * @see #page(Page)
+     * @see #page()
+     */
+    public <T extends Entity> Multi<T> stream();
+
+    /**
+     * Returns the first result of the current page index. This ignores the current page size to fetch
+     * a single result.
+     * 
+     * @return the first result of the current page index, or null if there are no results.
+     * @see #singleResult()
+     */
+    public <T extends Entity> Uni<T> firstResult();
+
+    /**
+     * Executes this query for the current page and return a single result.
+     * 
+     * @return the single result (throws if there is not exactly one)
+     * @throws NoResultException if there is no result
+     * @throws NonUniqueResultException if there are more than one result
+     * @see #firstResult()
+     */
+    public <T extends Entity> Uni<T> singleResult();
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepository.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepository.java
new file mode 100644
index 0000000000000..722ce146c3f00
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepository.java
@@ -0,0 +1,16 @@
+package io.quarkus.hibernate.reactive.panache;
+
+/**
+ * <p>
+ * Represents a Repository for a specific type of entity {@code Entity}, with an ID type
+ * of {@code Long}. Implementing this repository will gain you the exact same useful methods
+ * that are on {@link PanacheEntityBase}. If you have a custom ID strategy, you should
+ * implement {@link PanacheRepositoryBase} instead.
+ * </p>
+ *
+ * @author Stéphane Épardaud
+ * @param <Entity> The type of entity to operate on
+ */
+public interface PanacheRepository<Entity> extends PanacheRepositoryBase<Entity, Long> {
+
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java
new file mode 100644
index 0000000000000..e88ff9c95f31c
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/PanacheRepositoryBase.java
@@ -0,0 +1,771 @@
+package io.quarkus.hibernate.reactive.panache;
+
+import static io.quarkus.hibernate.reactive.panache.runtime.JpaOperations.INSTANCE;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import javax.persistence.LockModeType;
+
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.panache.common.impl.GenerateBridge;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * <p>
+ * Represents a Repository for a specific type of entity {@code Entity}, with an ID type
+ * of {@code Id}. Implementing this repository will gain you the exact same useful methods
+ * that are on {@link PanacheEntityBase}. Unless you have a custom ID strategy, you should not
+ * implement this interface directly but implement {@link PanacheRepository} instead.
+ * </p>
+ *
+ * @author Stéphane Épardaud
+ * @param <Entity> The type of entity to operate on
+ * @param <Id> The ID type of the entity
+ */
+public interface PanacheRepositoryBase<Entity, Id> {
+
+    // Operations
+
+    /**
+     * Persist the given entity in the database, if not already persisted.
+     * 
+     * @param entity the entity to persist.
+     * @return
+     * @see #isPersistent(Object)
+     * @see #persist(Iterable)
+     * @see #persist(Stream)
+     * @see #persist(Object, Object...)
+     */
+    public default Uni<Void> persist(Entity entity) {
+        return INSTANCE.persist(entity);
+    }
+
+    /**
+     * Persist the given entity in the database, if not already persisted.
+     * Then flushes all pending changes to the database.
+     *
+     * @param entity the entity to persist.
+     * @return
+     * @see #isPersistent(Object)
+     * @see #persist(Iterable)
+     * @see #persist(Stream)
+     * @see #persist(Object, Object...)
+     */
+    public default Uni<Void> persistAndFlush(Entity entity) {
+        return INSTANCE.persist(entity)
+                .flatMap(v -> INSTANCE.flush())
+                .map(v -> null);
+    }
+
+    /**
+     * Delete the given entity from the database, if it is already persisted.
+     * 
+     * @param entity the entity to delete.
+     * @return
+     * @see #isPersistent(Object)
+     * @see #delete(String, Object...)
+     * @see #delete(String, Map)
+     * @see #delete(String, Parameters)
+     * @see #deleteAll()
+     */
+    public default Uni<Void> delete(Entity entity) {
+        return INSTANCE.delete(entity);
+    }
+
+    /**
+     * Returns true if the given entity is persistent in the database. If yes, all modifications to
+     * its persistent fields will be automatically committed to the database at transaction
+     * commit time.
+     * 
+     * @param entity the entity to check
+     * @return true if the entity is persistent in the database.
+     */
+    public default boolean isPersistent(Entity entity) {
+        return INSTANCE.isPersistent(entity);
+    }
+
+    /**
+     * Flushes all pending changes to the database.
+     * 
+     * @return
+     */
+    public default Uni<Void> flush() {
+        return INSTANCE.flush();
+    }
+
+    // Queries
+
+    /**
+     * Find an entity of this type by ID.
+     * 
+     * @param id the ID of the entity to find.
+     * @return the entity found, or <code>null</code> if not found.
+     */
+    @GenerateBridge
+    public default Uni<Entity> findById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find an entity of this type by ID and lock it.
+     *
+     * @param id the ID of the entity to find.
+     * @param lockModeType the locking strategy to be used when retrieving the entity.
+     * @return the entity found, or <code>null</code> if not found.
+     */
+    @GenerateBridge
+    public default Uni<Entity> findById(Id id, LockModeType lockModeType) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query, with optional indexed parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Sort, Object...)
+     * @see #find(String, Map)
+     * @see #find(String, Parameters)
+     * @see #list(String, Object...)
+     * @see #stream(String, Object...)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> find(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query and the given sort options, with optional indexed parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Object...)
+     * @see #find(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Object...)
+     * @see #stream(String, Sort, Object...)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> find(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Sort, Map)
+     * @see #find(String, Object...)
+     * @see #find(String, Parameters)
+     * @see #list(String, Map)
+     * @see #stream(String, Map)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> find(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Map} of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Map)
+     * @see #find(String, Sort, Object...)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Map)
+     * @see #stream(String, Sort, Map)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Sort, Parameters)
+     * @see #find(String, Map)
+     * @see #find(String, Parameters)
+     * @see #list(String, Parameters)
+     * @see #stream(String, Parameters)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> find(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Parameters} of indexed parameters
+     * @return a new {@link PanacheQuery} instance for the given query
+     * @see #find(String, Parameters)
+     * @see #find(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Parameters)
+     * @see #stream(String, Sort, Parameters)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type.
+     * 
+     * @return a new {@link PanacheQuery} instance to find all entities of this type.
+     * @see #findAll(Sort)
+     * @see #listAll()
+     * @see #streamAll()
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> findAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type, in the given order.
+     * 
+     * @param sort the sort order to use
+     * @return a new {@link PanacheQuery} instance to find all entities of this type.
+     * @see #findAll()
+     * @see #listAll(Sort)
+     * @see #streamAll(Sort)
+     */
+    @GenerateBridge
+    public default PanacheQuery<Entity> findAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, params).list()</code>.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Sort, Object...)
+     * @see #list(String, Map)
+     * @see #list(String, Parameters)
+     * @see #find(String, Object...)
+     * @see #stream(String, Object...)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> list(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, sort, params).list()</code>.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Object...)
+     * @see #list(String, Sort, Map)
+     * @see #list(String, Sort, Parameters)
+     * @see #find(String, Sort, Object...)
+     * @see #stream(String, Sort, Object...)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> list(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).list()</code>.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Sort, Map)
+     * @see #list(String, Object...)
+     * @see #list(String, Parameters)
+     * @see #find(String, Map)
+     * @see #stream(String, Map)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> list(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).list()</code>.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Map} of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Map)
+     * @see #list(String, Sort, Object...)
+     * @see #list(String, Sort, Parameters)
+     * @see #find(String, Sort, Map)
+     * @see #stream(String, Sort, Map)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> list(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).list()</code>.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Sort, Parameters)
+     * @see #list(String, Object...)
+     * @see #list(String, Map)
+     * @see #find(String, Parameters)
+     * @see #stream(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> list(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).list()</code>.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Parameters} of indexed parameters
+     * @return a {@link List} containing all results, without paging
+     * @see #list(String, Parameters)
+     * @see #list(String, Sort, Object...)
+     * @see #list(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #stream(String, Sort, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> list(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for <code>findAll().list()</code>.
+     * 
+     * @return a {@link List} containing all results, without paging
+     * @see #listAll(Sort)
+     * @see #findAll()
+     * @see #streamAll()
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> listAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for <code>findAll(sort).list()</code>.
+     * 
+     * @param sort the sort order to use
+     * @return a {@link List} containing all results, without paging
+     * @see #listAll()
+     * @see #findAll(Sort)
+     * @see #streamAll(Sort)
+     */
+    @GenerateBridge
+    public default Uni<List<Entity>> listAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Sort, Object...)
+     * @see #stream(String, Map)
+     * @see #stream(String, Parameters)
+     * @see #find(String, Object...)
+     * @see #list(String, Object...)
+     */
+    @GenerateBridge
+    public default Multi<Entity> stream(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for <code>find(query, sort, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Object...)
+     * @see #stream(String, Sort, Map)
+     * @see #stream(String, Sort, Parameters)
+     * @see #find(String, Sort, Object...)
+     * @see #list(String, Sort, Object...)
+     */
+    @GenerateBridge
+    public default Multi<Entity> stream(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Sort, Map)
+     * @see #stream(String, Object...)
+     * @see #stream(String, Parameters)
+     * @see #find(String, Map)
+     * @see #list(String, Map)
+     */
+    @GenerateBridge
+    public default Multi<Entity> stream(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Map} of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Map)
+     * @see #stream(String, Sort, Object...)
+     * @see #stream(String, Sort, Parameters)
+     * @see #find(String, Sort, Map)
+     * @see #list(String, Sort, Map)
+     */
+    @GenerateBridge
+    public default Multi<Entity> stream(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for <code>find(query, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Sort, Parameters)
+     * @see #stream(String, Object...)
+     * @see #stream(String, Map)
+     * @see #find(String, Parameters)
+     * @see #list(String, Parameters)
+     */
+    @GenerateBridge
+    public default Multi<Entity> stream(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for <code>find(query, sort, params).stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param sort the sort strategy to use
+     * @param params {@link Parameters} of indexed parameters
+     * @return a {@link Stream} containing all results, without paging
+     * @see #stream(String, Parameters)
+     * @see #stream(String, Sort, Object...)
+     * @see #stream(String, Sort, Map)
+     * @see #find(String, Sort, Parameters)
+     * @see #list(String, Sort, Parameters)
+     */
+    @GenerateBridge
+    public default Multi<Entity> stream(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for <code>findAll().stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @return a {@link Stream} containing all results, without paging
+     * @see #streamAll(Sort)
+     * @see #findAll()
+     * @see #listAll()
+     */
+    @GenerateBridge
+    public default Multi<Entity> streamAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for <code>findAll().stream()</code>.
+     * It requires a transaction to work.
+     * Without a transaction, the underlying cursor can be closed before the end of the stream.
+     * 
+     * @return a {@link Stream} containing all results, without paging
+     * @see #streamAll()
+     * @see #findAll(Sort)
+     * @see #listAll(Sort)
+     */
+    @GenerateBridge
+    public default Multi<Entity> streamAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity in the database.
+     * 
+     * @return the number of this type of entity in the database.
+     * @see #count(String, Object...)
+     * @see #count(String, Map)
+     * @see #count(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Long> count() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity matching the given query, with optional indexed parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities counted.
+     * @see #count()
+     * @see #count(String, Map)
+     * @see #count(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Long> count(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return the number of entities counted.
+     * @see #count()
+     * @see #count(String, Object...)
+     * @see #count(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Long> count(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return the number of entities counted.
+     * @see #count()
+     * @see #count(String, Object...)
+     * @see #count(String, Map)
+     */
+    @GenerateBridge
+    public default Uni<Long> count(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type from the database.
+     * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @return the number of entities deleted.
+     * @see #delete(String, Object...)
+     * @see #delete(String, Map)
+     * @see #delete(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Long> deleteAll() {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete an entity of this type by ID.
+     *
+     * @param id the ID of the entity to delete.
+     * @return false if the entity was not deleted (not found).
+     */
+    @GenerateBridge
+    public default Uni<Boolean> deleteById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type matching the given query, with optional indexed parameters.
+     * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities deleted.
+     * @see #deleteAll()
+     * @see #delete(String, Map)
+     * @see #delete(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Long> delete(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return the number of entities deleted.
+     * @see #deleteAll()
+     * @see #delete(String, Object...)
+     * @see #delete(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Long> delete(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     * 
+     * WARNING: the default implementation of this method uses a bulk delete query and ignores
+     * cascading rules from the JPA model.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return the number of entities deleted.
+     * @see #deleteAll()
+     * @see #delete(String, Object...)
+     * @see #delete(String, Map)
+     */
+    @GenerateBridge
+    public default Uni<Long> delete(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Persist all given entities.
+     * 
+     * @param entities the entities to persist
+     * @return
+     * @see #persist(Object)
+     * @see #persist(Stream)
+     * @see #persist(Object,Object...)
+     */
+    public default Uni<Void> persist(Iterable<Entity> entities) {
+        return INSTANCE.persist(entities);
+    }
+
+    /**
+     * Persist all given entities.
+     * 
+     * @param entities the entities to persist
+     * @return
+     * @see #persist(Object)
+     * @see #persist(Iterable)
+     * @see #persist(Object,Object...)
+     */
+    public default Uni<Void> persist(Stream<Entity> entities) {
+        return INSTANCE.persist(entities);
+    }
+
+    /**
+     * Persist all given entities.
+     * 
+     * @param entities the entities to persist
+     * @return
+     * @see #persist(Object)
+     * @see #persist(Stream)
+     * @see #persist(Iterable)
+     */
+    public default Uni<Void> persist(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
+        return INSTANCE.persist(firstEntity, entities);
+    }
+
+    /**
+     * Update all entities of this type matching the given query, with optional indexed parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities updated.
+     * @see #update(String, Map)
+     * @see #update(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Integer> update(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Update all entities of this type matching the given query, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Map} of named parameters
+     * @return the number of entities updated.
+     * @see #update(String, Object...)
+     * @see #update(String, Parameters)
+     */
+    @GenerateBridge
+    public default Uni<Integer> update(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+
+    /**
+     * Update all entities of this type matching the given query, with named parameters.
+     * 
+     * @param query a {@link io.quarkus.hibernate.reactive.panache query string}
+     * @param params {@link Parameters} of named parameters
+     * @return the number of entities updated.
+     * @see #update(String, Object...)
+     * @see #update(String, Map)
+     */
+    @GenerateBridge
+    public default Uni<Integer> update(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/package-info.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/package-info.java
new file mode 100644
index 0000000000000..2cfc8eb7f6c3a
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/package-info.java
@@ -0,0 +1,84 @@
+/**
+ * <h2>API usage</h2>
+ *
+ * Hibernate with Panache comes in two flavors, the active record pattern via
+ * {@link io.quarkus.hibernate.reactive.panache.PanacheEntity}
+ * and the repository pattern via {@link io.quarkus.hibernate.reactive.panache.PanacheRepository}.
+ *
+ * To use the active record pattern, make your entities extend {@link io.quarkus.hibernate.reactive.panache.PanacheEntity},
+ * use public fields for your columns, use the existing operations defined as static methods on your entity class,
+ * and define custom ones as static methods on your entity class:
+ * 
+ * <code><pre>
+ * &#64;Entity
+ * public class Person extends PanacheEntity {
+ *     public String name;
+ *     public LocalDate birth;
+ *     public PersonStatus status;
+ *     
+ *     public static Person findByName(String name){
+ *       return find("name", name).firstResult();
+ *     }
+ *     
+ *     public static List&lt;Person&gt; findAlive(){
+ *       return list("status", Status.Alive);
+ *     }
+ *     
+ *     public static void deleteStefs(){
+ *       delete("name", "Stef");
+ *     }
+ * }
+ * </pre></code>
+ *
+ * To use the repository pattern, create a class implementing {@link io.quarkus.hibernate.reactive.panache.PanacheRepository},
+ * use the existing operations from your repository and define new ones on your repository class:
+ *
+ * <code><pre>
+ * &#64;ApplicationScoped
+ * public class PersonRepository implements PanacheRepository&lt;Person&gt; {
+ *    public Person findByName(String name){
+ *        return find("name", name).firstResult();
+ *    }
+ *
+ *    public List&lt;Person&gt; findAlive(){
+ *        return list("status", Status.Alive);
+ *    }
+ *
+ *    public void deleteStefs(){
+ *        delete("name", "Stef");
+ *   }
+ * }
+ * </pre></code>
+ * 
+ * <h2>Simplified queries</h2>
+ * 
+ * <p>
+ * Normally, HQL queries are of this form: <code>from EntityName [where ...] [order by ...]</code>, with optional elements
+ * at the end.
+ * </p>
+ * <p>
+ * If your select query does not start with <code>from</code>, we support the following additional forms:
+ * </p>
+ * <ul>
+ * <li><code>order by ...</code> which will expand to <code>from EntityName order by ...</code></li>
+ * <li><code>&lt;singleColumnName&gt;</code> (and single parameter) which will expand to
+ * <code>from EntityName where &lt;singleColumnName&gt; = ?</code></li>
+ * <li><code>&lt;query&gt;</code> will expand to <code>from EntityName where &lt;query&gt;</code></li>
+ * </ul>
+ * 
+ * If your update query does not start with <code>update from</code>, we support the following additional forms:
+ * </p>
+ * <ul>
+ * <li><code>from EntityName ...</code> which will expand to <code>update from EntityName ...</code></li>
+ * <li><code>set? &lt;singleColumnName&gt;</code> (and single parameter) which will expand to
+ * <code>update from EntityName set &lt;singleColumnName&gt; = ?</code></li>
+ * <li><code>set? &lt;update-query&gt;</code> will expand to
+ * <code>update from EntityName set &lt;update-query&gt; = ?</code></li>
+ * </ul>
+ *
+ * We also support named queries, for Panache to know that a query is a named query and not an HQL one, you need
+ * to prefix the name of the query with '#'.
+ * 
+ * @author Stéphane Épardaud
+ */
+package io.quarkus.hibernate.reactive.panache;
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/CustomCountPanacheQuery.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/CustomCountPanacheQuery.java
new file mode 100644
index 0000000000000..cbc3adea60b52
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/CustomCountPanacheQuery.java
@@ -0,0 +1,19 @@
+package io.quarkus.hibernate.reactive.panache.runtime;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import io.quarkus.hibernate.reactive.panache.common.runtime.CommonPanacheQueryImpl;
+
+//TODO this class is only needed by the Spring Data JPA module and would be placed there it it weren't for a dev-mode classloader issue
+// see https://github.com/quarkusio/quarkus/issues/6214
+public class CustomCountPanacheQuery<Entity> extends PanacheQueryImpl<Entity> {
+
+    public CustomCountPanacheQuery(Mutiny.Session em, String query, String customCountQuery,
+            Object paramsArrayOrMap) {
+        super(new CommonPanacheQueryImpl<Entity>(em, query, null, paramsArrayOrMap) {
+            {
+                this.countQuery = customCountQuery;
+            }
+        });
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/JpaOperations.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/JpaOperations.java
new file mode 100644
index 0000000000000..32355e98d8165
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/JpaOperations.java
@@ -0,0 +1,30 @@
+package io.quarkus.hibernate.reactive.panache.runtime;
+
+import java.util.List;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import io.quarkus.hibernate.reactive.panache.common.runtime.AbstractJpaOperations;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public class JpaOperations extends AbstractJpaOperations<PanacheQueryImpl<?>> {
+    public static final JpaOperations INSTANCE = new JpaOperations();
+
+    @Override
+    protected PanacheQueryImpl<?> createPanacheQuery(Mutiny.Session session, String query, String orderBy,
+            Object paramsArrayOrMap) {
+        return new PanacheQueryImpl<>(session, query, orderBy, paramsArrayOrMap);
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Override
+    protected Uni<List<?>> list(PanacheQueryImpl<?> query) {
+        return (Uni) query.list();
+    }
+
+    @Override
+    protected Multi<?> stream(PanacheQueryImpl<?> query) {
+        return query.stream();
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java
new file mode 100644
index 0000000000000..61fa48dd96649
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/java/io/quarkus/hibernate/reactive/panache/runtime/PanacheQueryImpl.java
@@ -0,0 +1,166 @@
+package io.quarkus.hibernate.reactive.panache.runtime;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.LockModeType;
+
+import org.hibernate.reactive.mutiny.Mutiny;
+
+import io.quarkus.hibernate.reactive.panache.PanacheQuery;
+import io.quarkus.hibernate.reactive.panache.common.runtime.CommonPanacheQueryImpl;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Parameters;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {
+
+    private CommonPanacheQueryImpl<Entity> delegate;
+
+    PanacheQueryImpl(Mutiny.Session em, String query, String orderBy, Object paramsArrayOrMap) {
+        this.delegate = new CommonPanacheQueryImpl<Entity>(em, query, orderBy, paramsArrayOrMap);
+    }
+
+    protected PanacheQueryImpl(CommonPanacheQueryImpl<Entity> delegate) {
+        this.delegate = delegate;
+    }
+
+    // Builder
+
+    @Override
+    public <T> PanacheQuery<T> project(Class<T> type) {
+        return new PanacheQueryImpl<>(delegate.project(type));
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> PanacheQuery<T> page(Page page) {
+        delegate.page(page);
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> page(int pageIndex, int pageSize) {
+        delegate.page(pageIndex, pageSize);
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> nextPage() {
+        delegate.nextPage();
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> previousPage() {
+        delegate.previousPage();
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> firstPage() {
+        delegate.firstPage();
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> Uni<PanacheQuery<T>> lastPage() {
+        return delegate.lastPage().map(v -> (PanacheQuery<T>) this);
+    }
+
+    @Override
+    public Uni<Boolean> hasNextPage() {
+        return delegate.hasNextPage();
+    }
+
+    @Override
+    public boolean hasPreviousPage() {
+        return delegate.hasPreviousPage();
+    }
+
+    @Override
+    public Uni<Integer> pageCount() {
+        return delegate.pageCount();
+    }
+
+    @Override
+    public Page page() {
+        return delegate.page();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> range(int startIndex, int lastIndex) {
+        delegate.range(startIndex, lastIndex);
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> withLock(LockModeType lockModeType) {
+        delegate.withLock(lockModeType);
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> withHint(String hintName, Object value) {
+        delegate.withHint(hintName, value);
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> filter(String filterName, Parameters parameters) {
+        delegate.filter(filterName, parameters.map());
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> filter(String filterName, Map<String, Object> parameters) {
+        delegate.filter(filterName, parameters);
+        return (PanacheQuery<T>) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T extends Entity> PanacheQuery<T> filter(String filterName) {
+        delegate.filter(filterName, Collections.emptyMap());
+        return (PanacheQuery<T>) this;
+    }
+
+    // Results
+
+    @Override
+    public Uni<Long> count() {
+        return delegate.count();
+    }
+
+    @Override
+    public <T extends Entity> Uni<List<T>> list() {
+        return delegate.list();
+    }
+
+    @Override
+    public <T extends Entity> Multi<T> stream() {
+        return delegate.stream();
+    }
+
+    @Override
+    public <T extends Entity> Uni<T> firstResult() {
+        return delegate.firstResult();
+    }
+
+    @Override
+    public <T extends Entity> Uni<T> singleResult() {
+        return delegate.singleResult();
+    }
+}
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/hibernate-reactive-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..4c6d1666aff31
--- /dev/null
+++ b/extensions/panache/hibernate-reactive-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,11 @@
+---
+name: "Hibernate Reactive with Panache"
+metadata:
+  keywords:
+  - "hibernate-reactive-panache"
+  - "panache"
+  - "hibernate"
+  - "jpa"
+  categories:
+  - "data"
+  status: "preview"
diff --git a/extensions/panache/mongodb-panache-common/deployment/pom.xml b/extensions/panache/mongodb-panache-common/deployment/pom.xml
new file mode 100644
index 0000000000000..e00b7bc2c12af
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/deployment/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-mongodb-panache-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-mongodb-panache-common-deployment</artifactId>
+    <name>Quarkus - MongoDB with Panache - Common Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java
new file mode 100644
index 0000000000000..2b8d885630d5d
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java
@@ -0,0 +1,438 @@
+package io.quarkus.mongodb.panache.deployment;
+
+import static io.quarkus.deployment.util.JandexUtil.resolveTypeParameters;
+import static io.quarkus.panache.common.deployment.PanacheConstants.META_INF_PANACHE_ARCHIVE_MARKER;
+import static org.jboss.jandex.DotName.createSimple;
+
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.bson.types.ObjectId;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
+import io.quarkus.bootstrap.classloading.ClassPathElement;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.builder.BuildException;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.gizmo.DescriptorUtils;
+import io.quarkus.jackson.spi.JacksonModuleBuildItem;
+import io.quarkus.jsonb.spi.JsonbDeserializerBuildItem;
+import io.quarkus.jsonb.spi.JsonbSerializerBuildItem;
+import io.quarkus.mongodb.deployment.MongoClientNameBuildItem;
+import io.quarkus.mongodb.deployment.MongoUnremovableClientsBuildItem;
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.PanacheMongoRecorder;
+import io.quarkus.mongodb.panache.ProjectionFor;
+import io.quarkus.mongodb.panache.jackson.ObjectIdDeserializer;
+import io.quarkus.mongodb.panache.jackson.ObjectIdSerializer;
+import io.quarkus.panache.common.deployment.EntityField;
+import io.quarkus.panache.common.deployment.EntityModel;
+import io.quarkus.panache.common.deployment.MetamodelInfo;
+import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem;
+import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
+import io.quarkus.panache.common.deployment.PanacheFieldAccessEnhancer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
+import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public abstract class BasePanacheMongoResourceProcessor {
+    public static final DotName BSON_ID = createSimple(BsonId.class.getName());
+    public static final DotName BSON_IGNORE = createSimple(BsonIgnore.class.getName());
+    public static final DotName BSON_PROPERTY = createSimple(BsonProperty.class.getName());
+    public static final DotName MONGO_ENTITY = createSimple(MongoEntity.class.getName());
+    public static final DotName OBJECT_ID = createSimple(ObjectId.class.getName());
+    public static final DotName PROJECTION_FOR = createSimple(ProjectionFor.class.getName());
+
+    @BuildStep
+    public void buildImperative(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
+
+        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
+                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+
+        MetamodelInfo modelInfo = new MetamodelInfo();
+        processTypes(index, transformers, reflectiveClass, reflectiveHierarchy, propertyMappingClass, getImperativeTypeBundle(),
+                createRepositoryEnhancer(index, methodCustomizers),
+                createEntityEnhancer(index, methodCustomizers, modelInfo),
+                modelInfo);
+    }
+
+    @BuildStep
+    public void buildReactive(CombinedIndexBuildItem index,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
+        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
+                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+
+        MetamodelInfo modelInfo = new MetamodelInfo();
+        processTypes(index, transformers, reflectiveClass, reflectiveHierarchy, propertyMappingClass, getReactiveTypeBundle(),
+                createReactiveRepositoryEnhancer(index, methodCustomizers),
+                createReactiveEntityEnhancer(index, methodCustomizers, modelInfo),
+                modelInfo);
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    protected void buildReplacementMap(List<PropertyMappingClassBuildStep> propertyMappingClasses, CombinedIndexBuildItem index,
+            PanacheMongoRecorder recorder) {
+        Map<String, Map<String, String>> replacementMap = new ConcurrentHashMap<>();
+        for (PropertyMappingClassBuildStep classToMap : propertyMappingClasses) {
+            DotName dotName = createSimple(classToMap.getClassName());
+            ClassInfo classInfo = index.getIndex().getClassByName(dotName);
+            if (classInfo != null) {
+                // only compute field replacement for types inside the index
+                Map<String, String> classReplacementMap = replacementMap.computeIfAbsent(classToMap.getClassName(),
+                        className -> computeReplacement(classInfo));
+                if (classToMap.getAliasClassName() != null) {
+                    // also register the replacement map for the projection classes
+                    replacementMap.put(classToMap.getAliasClassName(), classReplacementMap);
+                }
+            }
+        }
+
+        recorder.setReplacementCache(replacementMap);
+    }
+
+    private Map<String, String> computeReplacement(ClassInfo classInfo) {
+        Map<String, String> replacementMap = new HashMap<>();
+        for (FieldInfo field : classInfo.fields()) {
+            AnnotationInstance bsonProperty = field.annotation(BSON_PROPERTY);
+            if (bsonProperty != null) {
+                replacementMap.put(field.name(), bsonProperty.value().asString());
+            }
+        }
+        for (MethodInfo method : classInfo.methods()) {
+            if (method.name().startsWith("get")) {
+                // we try to replace also for getter
+                AnnotationInstance bsonProperty = method.annotation(BSON_PROPERTY);
+                if (bsonProperty != null) {
+                    String fieldName = JavaBeanUtil.decapitalize(method.name().substring(3));
+                    replacementMap.put(fieldName, bsonProperty.value().asString());
+                }
+            }
+        }
+        return replacementMap.isEmpty() ? Collections.emptyMap() : replacementMap;
+    }
+
+    protected abstract PanacheEntityEnhancer createEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers, MetamodelInfo modelInfo);
+
+    protected abstract PanacheEntityEnhancer createReactiveEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers, MetamodelInfo modelInfo);
+
+    protected abstract PanacheRepositoryEnhancer createReactiveRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers);
+
+    protected abstract PanacheRepositoryEnhancer createRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers);
+
+    private void extractMappings(Map<String, String> classPropertyMapping, ClassInfo target, CombinedIndexBuildItem index) {
+        for (FieldInfo fieldInfo : target.fields()) {
+            if (fieldInfo.hasAnnotation(BSON_PROPERTY)) {
+                AnnotationInstance bsonProperty = fieldInfo.annotation(BSON_PROPERTY);
+                classPropertyMapping.put(fieldInfo.name(), bsonProperty.value().asString());
+            }
+        }
+        for (MethodInfo methodInfo : target.methods()) {
+            if (methodInfo.hasAnnotation(BSON_PROPERTY)) {
+                AnnotationInstance bsonProperty = methodInfo.annotation(BSON_PROPERTY);
+                classPropertyMapping.put(methodInfo.name(), bsonProperty.value().asString());
+            }
+        }
+
+        // climb up the hierarchy of types
+        if (!target.superClassType().name().equals(JandexUtil.DOTNAME_OBJECT)) {
+            Type superType = target.superClassType();
+            ClassInfo superClass = index.getIndex().getClassByName(superType.name());
+            extractMappings(classPropertyMapping, superClass, index);
+        }
+    }
+
+    @BuildStep
+    protected PanacheEntityClassesBuildItem findEntityClasses(List<PanacheMongoEntityClassBuildItem> entityClasses) {
+        if (!entityClasses.isEmpty()) {
+            Set<String> ret = new HashSet<>();
+            for (PanacheMongoEntityClassBuildItem entityClass : entityClasses) {
+                ret.add(entityClass.get().name().toString());
+            }
+            return new PanacheEntityClassesBuildItem(ret);
+        }
+        return null;
+    }
+
+    protected abstract TypeBundle getImperativeTypeBundle();
+
+    protected abstract TypeBundle getReactiveTypeBundle();
+
+    @BuildStep
+    protected void handleProjectionFor(CombinedIndexBuildItem index,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            BuildProducer<BytecodeTransformerBuildItem> transformers) {
+        // manage @BsonProperty for the @ProjectionFor annotation
+        Map<DotName, Map<String, String>> propertyMapping = new HashMap<>();
+        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(PROJECTION_FOR)) {
+            Type targetClass = annotationInstance.value().asClass();
+            ClassInfo target = index.getIndex().getClassByName(targetClass.name());
+            Map<String, String> classPropertyMapping = new HashMap<>();
+            extractMappings(classPropertyMapping, target, index);
+            propertyMapping.put(targetClass.name(), classPropertyMapping);
+        }
+        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(PROJECTION_FOR)) {
+            Type targetClass = annotationInstance.value().asClass();
+            Map<String, String> targetPropertyMapping = propertyMapping.get(targetClass.name());
+            if (targetPropertyMapping != null && !targetPropertyMapping.isEmpty()) {
+                ClassInfo info = annotationInstance.target().asClass();
+                ProjectionForEnhancer fieldEnhancer = new ProjectionForEnhancer(targetPropertyMapping);
+                transformers.produce(new BytecodeTransformerBuildItem(info.name().toString(), fieldEnhancer));
+            }
+
+            // Register for building the property mapping cache
+            propertyMappingClass
+                    .produce(new PropertyMappingClassBuildStep(targetClass.name().toString(),
+                            annotationInstance.target().asClass().name().toString()));
+        }
+    }
+
+    @BuildStep
+    public void mongoClientNames(ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            BuildProducer<MongoClientNameBuildItem> mongoClientName) {
+        Set<String> values = new HashSet<>();
+        IndexView indexView = applicationArchivesBuildItem.getRootArchive().getIndex();
+        Collection<AnnotationInstance> instances = indexView.getAnnotations(MONGO_ENTITY);
+        for (AnnotationInstance annotation : instances) {
+            AnnotationValue clientName = annotation.value("clientName");
+            if ((clientName != null) && !clientName.asString().isEmpty()) {
+                values.add(clientName.asString());
+            }
+        }
+        for (String value : values) {
+            // we don't want the qualifier @MongoClientName qualifier added
+            // as these clients will only be looked up programmatically via name
+            // see MongoOperations#mongoClient
+            mongoClientName.produce(new MongoClientNameBuildItem(value, false));
+        }
+    }
+
+    protected void processEntities(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            PanacheEntityEnhancer entityEnhancer, TypeBundle typeBundle,
+            MetamodelInfo modelInfo) {
+
+        Set<String> modelClasses = new HashSet<>();
+        // Note that we do this in two passes because for some reason Jandex does not give us subtypes
+        // of PanacheMongoEntity if we ask for subtypes of PanacheMongoEntityBase
+        for (ClassInfo classInfo : index.getIndex().getAllKnownSubclasses(typeBundle.entityBase().dotName())) {
+            if (classInfo.name().equals(typeBundle.entity().dotName())) {
+                continue;
+            }
+            if (modelClasses.add(classInfo.name().toString()))
+                modelInfo.addEntityModel(createEntityModel(classInfo));
+        }
+        for (ClassInfo classInfo : index.getIndex().getAllKnownSubclasses(typeBundle.entity().dotName())) {
+            if (modelClasses.add(classInfo.name().toString()))
+                modelInfo.addEntityModel(createEntityModel(classInfo));
+        }
+
+        // iterate over all the entity classes
+        for (String modelClass : modelClasses) {
+            transformers.produce(new BytecodeTransformerBuildItem(modelClass, entityEnhancer));
+
+            //register for reflection entity classes
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, modelClass));
+
+            // Register for building the property mapping cache
+            propertyMappingClass.produce(new PropertyMappingClassBuildStep(modelClass));
+        }
+
+        replaceFieldAccesses(transformers, modelInfo);
+    }
+
+    private void replaceFieldAccesses(BuildProducer<BytecodeTransformerBuildItem> transformers, MetamodelInfo modelInfo) {
+        Set<String> entitiesWithPublicFields = modelInfo.getEntitiesWithPublicFields();
+        if (entitiesWithPublicFields.isEmpty()) {
+            // There are no public fields to be accessed in the first place.
+            return;
+        }
+
+        Set<String> entityClassNamesInternal = new HashSet<>();
+        for (String entityClassName : entitiesWithPublicFields) {
+            entityClassNamesInternal.add(entityClassName.replace(".", "/"));
+        }
+
+        PanacheFieldAccessEnhancer panacheFieldAccessEnhancer = new PanacheFieldAccessEnhancer(modelInfo);
+        QuarkusClassLoader tccl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+        Set<String> produced = new HashSet<>();
+
+        for (ClassPathElement i : tccl.getElementsWithResource(META_INF_PANACHE_ARCHIVE_MARKER)) {
+            for (String res : i.getProvidedResources()) {
+                if (res.endsWith(".class")) {
+                    String cn = res.replace("/", ".").substring(0, res.length() - 6);
+                    if (produced.contains(cn)) {
+                        continue;
+                    }
+                    produced.add(cn);
+                    transformers.produce(
+                            new BytecodeTransformerBuildItem(cn, panacheFieldAccessEnhancer, entityClassNamesInternal));
+                }
+            }
+        }
+    }
+
+    private EntityModel createEntityModel(ClassInfo classInfo) {
+        EntityModel entityModel = new EntityModel(classInfo);
+        for (FieldInfo fieldInfo : classInfo.fields()) {
+            String name = fieldInfo.name();
+            if (Modifier.isPublic(fieldInfo.flags())
+                    && !Modifier.isStatic(fieldInfo.flags())
+                    && !fieldInfo.hasAnnotation(BSON_IGNORE)) {
+                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
+            }
+        }
+        return entityModel;
+    }
+
+    protected void processRepositories(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            PanacheRepositoryEnhancer repositoryEnhancer, TypeBundle typeBundle) {
+
+        Set<String> daoClasses = new HashSet<>();
+        Set<Type> daoTypeParameters = new HashSet<>();
+        DotName dotName = typeBundle.repositoryBase().dotName();
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(dotName)) {
+            // Skip PanacheMongoRepository and abstract repositories
+            if (classInfo.name().equals(typeBundle.repository().dotName()) || repositoryEnhancer.skipRepository(classInfo)) {
+                continue;
+            }
+            daoClasses.add(classInfo.name().toString());
+            daoTypeParameters.addAll(
+                    resolveTypeParameters(classInfo.name(), typeBundle.repositoryBase().dotName(), index.getIndex()));
+        }
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(typeBundle.repository().dotName())) {
+            if (repositoryEnhancer.skipRepository(classInfo)) {
+                continue;
+            }
+            daoClasses.add(classInfo.name().toString());
+            daoTypeParameters.addAll(
+                    resolveTypeParameters(classInfo.name(), typeBundle.repositoryBase().dotName(), index.getIndex()));
+        }
+        for (String daoClass : daoClasses) {
+            transformers.produce(new BytecodeTransformerBuildItem(daoClass, repositoryEnhancer));
+        }
+
+        for (Type parameterType : daoTypeParameters) {
+            // Register for reflection the type parameters of the repository: this should be the entity class and the ID class
+            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder().type(parameterType).build());
+
+            // Register for building the property mapping cache
+            propertyMappingClass.produce(new PropertyMappingClassBuildStep(parameterType.name().toString()));
+        }
+    }
+
+    protected void processTypes(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            TypeBundle typeBundle, PanacheRepositoryEnhancer repositoryEnhancer,
+            PanacheEntityEnhancer entityEnhancer, MetamodelInfo modelInfo) {
+        processRepositories(index, transformers, reflectiveHierarchy, propertyMappingClass,
+                repositoryEnhancer, typeBundle);
+        processEntities(index, transformers, reflectiveClass, propertyMappingClass,
+                entityEnhancer, typeBundle, modelInfo);
+    }
+
+    @BuildStep
+    ReflectiveClassBuildItem registerForReflection() {
+        return new ReflectiveClassBuildItem(true, true, OBJECT_ID.toString());
+    }
+
+    @BuildStep
+    protected void registerJacksonSerDeser(BuildProducer<JacksonModuleBuildItem> customSerDeser) {
+        customSerDeser.produce(
+                new JacksonModuleBuildItem.Builder("ObjectIdModule")
+                        .add(ObjectIdSerializer.class.getName(),
+                                ObjectIdDeserializer.class.getName(),
+                                ObjectId.class.getName())
+                        .build());
+    }
+
+    @BuildStep
+    protected void registerJsonbSerDeser(BuildProducer<JsonbSerializerBuildItem> jsonbSerializers,
+            BuildProducer<JsonbDeserializerBuildItem> jsonbDeserializers) {
+        jsonbSerializers
+                .produce(new JsonbSerializerBuildItem(io.quarkus.mongodb.panache.jsonb.ObjectIdSerializer.class.getName()));
+        jsonbDeserializers
+                .produce(new JsonbDeserializerBuildItem(io.quarkus.mongodb.panache.jsonb.ObjectIdDeserializer.class.getName()));
+    }
+
+    @BuildStep
+    public void unremovableClients(BuildProducer<MongoUnremovableClientsBuildItem> unremovable) {
+        unremovable.produce(new MongoUnremovableClientsBuildItem());
+    }
+
+    @BuildStep
+    protected ValidationPhaseBuildItem.ValidationErrorBuildItem validate(ValidationPhaseBuildItem validationPhase,
+            CombinedIndexBuildItem index) throws BuildException {
+        // we verify that no ID fields are defined (via @BsonId) when extending PanacheMongoEntity or ReactivePanacheMongoEntity
+        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(BSON_ID)) {
+            ClassInfo info = JandexUtil.getEnclosingClass(annotationInstance);
+            if (JandexUtil.isSubclassOf(index.getIndex(), info,
+                    getImperativeTypeBundle().entity().dotName())) {
+                BuildException be = new BuildException("You provide a MongoDB identifier via @BsonId inside '" + info.name() +
+                        "' but one is already provided by PanacheMongoEntity, " +
+                        "your class should extend PanacheMongoEntityBase instead, or use the id provided by PanacheMongoEntity",
+                        Collections.emptyList());
+                return new ValidationPhaseBuildItem.ValidationErrorBuildItem(be);
+            } else if (JandexUtil.isSubclassOf(index.getIndex(), info,
+                    getReactiveTypeBundle().entity().dotName())) {
+                BuildException be = new BuildException("You provide a MongoDB identifier via @BsonId inside '" + info.name() +
+                        "' but one is already provided by ReactivePanacheMongoEntity, " +
+                        "your class should extend ReactivePanacheMongoEntityBase instead, or use the id provided by ReactivePanacheMongoEntity",
+                        Collections.emptyList());
+                return new ValidationPhaseBuildItem.ValidationErrorBuildItem(be);
+            }
+        }
+        return null;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java
similarity index 100%
rename from extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java
rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java
similarity index 100%
rename from extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java
rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java
similarity index 88%
rename from extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java
rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java
index dd75677c27f79..a3a178f786c80 100644
--- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java
+++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java
@@ -2,7 +2,7 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 
-final class PropertyMappingClassBuildStep extends MultiBuildItem {
+public final class PropertyMappingClassBuildStep extends MultiBuildItem {
     private String className;
     private String aliasClassName;
 
diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/visitors/PanacheMongoEntityClassAccessorGenerationVisitor.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/visitors/PanacheMongoEntityClassAccessorGenerationVisitor.java
new file mode 100644
index 0000000000000..75f214fe2cd83
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/visitors/PanacheMongoEntityClassAccessorGenerationVisitor.java
@@ -0,0 +1,28 @@
+package io.quarkus.mongodb.panache.deployment.visitors;
+
+import org.jboss.jandex.ClassInfo;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import io.quarkus.panache.common.deployment.EntityField;
+import io.quarkus.panache.common.deployment.EntityModel;
+import io.quarkus.panache.common.deployment.visitors.PanacheEntityClassAccessorGenerationVisitor;
+
+public class PanacheMongoEntityClassAccessorGenerationVisitor extends PanacheEntityClassAccessorGenerationVisitor {
+
+    public PanacheMongoEntityClassAccessorGenerationVisitor(ClassVisitor outputClassVisitor,
+            ClassInfo entityInfo, EntityModel entityModel) {
+        super(outputClassVisitor, entityInfo, entityModel);
+    }
+
+    @Override
+    protected void generateAccessorSetField(MethodVisitor mv, EntityField field) {
+        mv.visitFieldInsn(Opcodes.PUTFIELD, thisClass.getInternalName(), field.name, field.descriptor);
+    }
+
+    @Override
+    protected void generateAccessorGetField(MethodVisitor mv, EntityField field) {
+        mv.visitFieldInsn(Opcodes.GETFIELD, thisClass.getInternalName(), field.name, field.descriptor);
+    }
+}
diff --git a/extensions/panache/mongodb-panache-common/pom.xml b/extensions/panache/mongodb-panache-common/pom.xml
new file mode 100644
index 0000000000000..d4c364e7b4fc4
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-mongodb-panache-common-parent</artifactId>
+    <name>Quarkus - MongoDB with Panache - Common</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-common/runtime/pom.xml b/extensions/panache/mongodb-panache-common/runtime/pom.xml
new file mode 100644
index 0000000000000..f3e803cac47c5
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-mongodb-panache-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-mongodb-panache-common</artifactId>
+    <name>Quarkus - MongoDB with Panache - Common Runtime</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panacheql</artifactId>
+        </dependency>
+        <!-- This is optional to avoid pulling libraries if jax-rs/jsonb is not on the path-->
+        <!-- But needed to provides default serializer/deserializer for JsonB -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- This is optional to avoid pulling libraries if jackson is not on the path-->
+        <!-- But needed to provides default serializer/deserializer for Jackson -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <!-- The entity classes needs to be indexed -->
+            <plugin>
+                <groupId>org.jboss.jandex</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/MongoEntity.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/MongoEntity.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/MongoEntity.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/MongoEntity.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRecorder.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRecorder.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRecorder.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRecorder.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheUpdate.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheUpdate.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheUpdate.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheUpdate.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/ProjectionFor.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/ProjectionFor.java
similarity index 92%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/ProjectionFor.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/ProjectionFor.java
index 6f74d7aab4a48..260267b716cb5 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/ProjectionFor.java
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/ProjectionFor.java
@@ -10,5 +10,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface ProjectionFor {
-    public Class<?> value();
+    Class<?> value();
 }
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/CommonQueryBinder.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/CommonQueryBinder.java
new file mode 100644
index 0000000000000..ca23c81af461f
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/CommonQueryBinder.java
@@ -0,0 +1,88 @@
+package io.quarkus.mongodb.panache.binder;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.bson.types.ObjectId;
+
+final class CommonQueryBinder {
+
+    private static final String ISO_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+    // the default DateTimeFormatter.ISO_LOCAL_DATE_TIME format with too many nano fraction (up to 9) for MongoDB (only 3)
+    private static final DateTimeFormatter ISO_DATE_FORMATTER = DateTimeFormatter.ofPattern(ISO_DATE_PATTERN);
+
+    private CommonQueryBinder() {
+    }
+
+    static String replace(String query, String oldChars, Object value) {
+        return query.replace(oldChars, escape(value));
+    }
+
+    static String escape(Object value) {
+        if (value == null) {
+            return "null";
+        }
+        if (value.getClass().isArray() || Collection.class.isAssignableFrom(value.getClass())) {
+            return arrayAsString(value);
+        }
+        if (Number.class.isAssignableFrom(value.getClass()) || value instanceof Boolean) {
+            return value.toString();
+        }
+        if (value.getClass().isEnum()) {
+            return "'" + ((Enum<?>) value).name() + "'";
+        }
+        if (value instanceof Date) {
+            ZonedDateTime zonedDateTime = ((Date) value).toInstant().atZone(ZoneOffset.UTC);
+            return "{\"$date\": \"" + ISO_DATE_FORMATTER.format(zonedDateTime) + "\"} ";
+        }
+        if (value instanceof LocalDate) {
+            ZonedDateTime zonedDateTime = ((LocalDate) value).atStartOfDay(ZoneOffset.UTC);
+            return "{\"$date\": \"" + ISO_DATE_FORMATTER.format(zonedDateTime) + "\"} ";
+        }
+        if (value instanceof LocalDateTime) {
+            ZonedDateTime zonedDateTime = ((LocalDateTime) value).atZone(ZoneOffset.UTC);
+            return "{\"$date\": \"" + ISO_DATE_FORMATTER.format(zonedDateTime) + "\"} ";
+        }
+        if (value instanceof Instant) {
+            ZonedDateTime zonedDateTime = ((Instant) value).atZone(ZoneOffset.UTC);
+            return "{\"$date\": \"" + ISO_DATE_FORMATTER.format(zonedDateTime) + "\"} ";
+        }
+        if (value instanceof UUID) {
+            return "UUID('" + value.toString() + "')";
+        }
+        if (value instanceof ObjectId) {
+            ObjectId objectId = (ObjectId) value;
+            return "ObjectId('" + objectId.toHexString() + "')";
+        }
+        return "'" + value.toString().replace("\\", "\\\\").replace("'", "\\'") + "'";
+    }
+
+    /**
+     * Converts Collection or Array to a String separated for ','. Used in $in operators
+     */
+    private static String arrayAsString(Object value) {
+        Object[] valueArray = convertToArray(value);
+
+        return Arrays.stream(valueArray)
+                .map(CommonQueryBinder::escape)
+                .collect(Collectors.joining(", "));
+    }
+
+    private static Object[] convertToArray(Object value) {
+        if (value.getClass().isArray()) {
+            return (Object[]) value;
+        }
+
+        Collection collection = (Collection) value;
+        return collection.toArray(new Object[collection.size()]);
+    }
+}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/MongoParserVisitor.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/MongoParserVisitor.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/MongoParserVisitor.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/MongoParserVisitor.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/NativeQueryBinder.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/NativeQueryBinder.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/NativeQueryBinder.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/NativeQueryBinder.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/PanacheQlQueryBinder.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/PanacheQlQueryBinder.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/PanacheQlQueryBinder.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/binder/PanacheQlQueryBinder.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdDeserializer.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdDeserializer.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdDeserializer.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdDeserializer.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdSerializer.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdSerializer.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdSerializer.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jackson/ObjectIdSerializer.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdDeserializer.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdDeserializer.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdDeserializer.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdDeserializer.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdSerializer.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdSerializer.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdSerializer.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/jsonb/ObjectIdSerializer.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheUpdate.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheUpdate.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheUpdate.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheUpdate.java
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/CommonReactivePanacheQueryImpl.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/CommonReactivePanacheQueryImpl.java
new file mode 100644
index 0000000000000..af67d631c878e
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/CommonReactivePanacheQueryImpl.java
@@ -0,0 +1,244 @@
+package io.quarkus.mongodb.panache.reactive.runtime;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.model.Collation;
+
+import io.quarkus.mongodb.FindOptions;
+import io.quarkus.mongodb.panache.runtime.MongoPropertyUtil;
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Range;
+import io.quarkus.panache.common.exception.PanacheQueryException;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+public class CommonReactivePanacheQueryImpl<Entity> {
+    private ReactiveMongoCollection collection;
+    private Bson mongoQuery;
+    private Bson sort;
+    private Bson projections;
+
+    private Page page;
+    private Uni<Long> count;
+
+    private Range range;
+
+    private Collation collation;
+
+    public CommonReactivePanacheQueryImpl(ReactiveMongoCollection<? extends Entity> collection, Bson mongoQuery, Bson sort) {
+        this.collection = collection;
+        this.mongoQuery = mongoQuery;
+        this.sort = sort;
+    }
+
+    private CommonReactivePanacheQueryImpl(CommonReactivePanacheQueryImpl previousQuery, Bson projections, Class<?> type) {
+        this.collection = previousQuery.collection.withDocumentClass(type);
+        this.mongoQuery = previousQuery.mongoQuery;
+        this.sort = previousQuery.sort;
+        this.projections = projections;
+        this.page = previousQuery.page;
+        this.count = previousQuery.count;
+        this.range = previousQuery.range;
+        this.collation = previousQuery.collation;
+    }
+
+    // Builder
+
+    public <T> CommonReactivePanacheQueryImpl<T> project(Class<T> type) {
+        // collect field names from public fields and getters
+        Set<String> fieldNames = MongoPropertyUtil.collectFields(type);
+
+        // create the projection document
+        Document projections = new Document();
+        for (String fieldName : fieldNames) {
+            projections.append(fieldName, 1);
+        }
+
+        return new CommonReactivePanacheQueryImpl(this, projections, type);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> page(Page page) {
+        this.page = page;
+        this.range = null; // reset the range to be able to switch from range to page
+        return (CommonReactivePanacheQueryImpl<T>) this;
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> page(int pageIndex, int pageSize) {
+        return page(Page.of(pageIndex, pageSize));
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> nextPage() {
+        checkPagination();
+        return page(page.next());
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> previousPage() {
+        checkPagination();
+        return page(page.previous());
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> firstPage() {
+        checkPagination();
+        return page(page.first());
+    }
+
+    public <T extends Entity> Uni<CommonReactivePanacheQueryImpl<T>> lastPage() {
+        checkPagination();
+        Uni<CommonReactivePanacheQueryImpl<T>> map = pageCount().map(pageCount -> page(page.index(pageCount - 1)));
+        return map;
+    }
+
+    public Uni<Boolean> hasNextPage() {
+        checkPagination();
+        return pageCount().map(pageCount -> page.index < (pageCount - 1));
+    }
+
+    public boolean hasPreviousPage() {
+        checkPagination();
+        return page.index > 0;
+    }
+
+    public Uni<Integer> pageCount() {
+        checkPagination();
+        return count().map(count -> {
+            if (count == 0)
+                return 1; // a single page of zero results
+            return (int) Math.ceil((double) count / (double) page.size);
+        });
+    }
+
+    public Page page() {
+        checkPagination();
+        return page;
+    }
+
+    private void checkPagination() {
+        if (page == null) {
+            throw new UnsupportedOperationException(
+                    "Cannot call a page related method, "
+                            + "call page(Page) or page(int, int) to initiate pagination first");
+        }
+        if (range != null) {
+            throw new UnsupportedOperationException("Cannot call a page related method in a ranged query, " +
+                    "call page(Page) or page(int, int) to initiate pagination first");
+        }
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> range(int startIndex, int lastIndex) {
+        this.range = Range.of(startIndex, lastIndex);
+        // reset the page to its default to be able to switch from page to range
+        this.page = null;
+        return (CommonReactivePanacheQueryImpl<T>) this;
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> withCollation(Collation collation) {
+        this.collation = collation;
+        return (CommonReactivePanacheQueryImpl<T>) this;
+    }
+
+    public <T extends Entity> CommonReactivePanacheQueryImpl<T> withReadPreference(ReadPreference readPreference) {
+        this.collection = this.collection.withReadPreference(readPreference);
+        return (CommonReactivePanacheQueryImpl<T>) this;
+    }
+
+    // Results
+
+    @SuppressWarnings("unchecked")
+    public Uni<Long> count() {
+        if (count == null) {
+            count = collection.countDocuments(mongoQuery);
+        }
+        return count;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> Uni<List<T>> list() {
+        Multi<T> results = stream();
+        return results.collectItems().asList();
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> Multi<T> stream() {
+        FindOptions options = buildOptions();
+        return mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
+    }
+
+    public <T extends Entity> Uni<T> firstResult() {
+        Uni<Optional<T>> optionalEntity = firstResultOptional();
+        return optionalEntity.map(optional -> optional.orElse(null));
+    }
+
+    public <T extends Entity> Uni<Optional<T>> firstResultOptional() {
+        FindOptions options = buildOptions(1);
+        Multi<T> results = mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
+        return results.collectItems().first().map(o -> Optional.ofNullable(o));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> Uni<T> singleResult() {
+        FindOptions options = buildOptions(2);
+        Multi<T> results = mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
+        return results.collectItems().asList().map(list -> {
+            if (list.size() != 1) {
+                throw new PanacheQueryException("There should be only one result");
+            } else {
+                return list.get(0);
+            }
+        });
+    }
+
+    public <T extends Entity> Uni<Optional<T>> singleResultOptional() {
+        FindOptions options = buildOptions(2);
+        Multi<T> results = mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
+        return results.collectItems().asList().map(list -> {
+            if (list.size() == 2) {
+                throw new PanacheQueryException("There should be no more than one result");
+            }
+            return list.isEmpty() ? Optional.empty() : Optional.of(list.get(0));
+        });
+    }
+
+    private FindOptions buildOptions() {
+        FindOptions options = new FindOptions();
+        options.sort(sort);
+        if (range != null) {
+            // range is 0 based, so we add 1 to the limit
+            options.skip(range.getStartIndex()).limit(range.getLastIndex() - range.getStartIndex() + 1);
+        } else if (page != null) {
+            options.skip(page.index * page.size).limit(page.size);
+        }
+        if (projections != null) {
+            options.projection(this.projections);
+        }
+        if (this.collation != null) {
+            options.collation(collation);
+        }
+        return options;
+    }
+
+    private FindOptions buildOptions(int maxResults) {
+        FindOptions options = new FindOptions();
+        options.sort(sort);
+        if (range != null) {
+            // range is 0 based, so we add 1 to the limit
+            options.skip(range.getStartIndex());
+        } else if (page != null) {
+            options.skip(page.index * page.size);
+        }
+        if (projections != null) {
+            options.projection(this.projections);
+        }
+        if (this.collation != null) {
+            options.collation(collation);
+        }
+        return options.limit(maxResults);
+    }
+}
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactiveMongoOperations.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactiveMongoOperations.java
new file mode 100644
index 0000000000000..0e27d7536b8ad
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactiveMongoOperations.java
@@ -0,0 +1,684 @@
+package io.quarkus.mongodb.panache.reactive.runtime;
+
+import static io.quarkus.mongodb.panache.runtime.BeanUtils.beanName;
+import static io.quarkus.mongodb.panache.runtime.BeanUtils.clientFromArc;
+import static io.quarkus.mongodb.panache.runtime.BeanUtils.getDatabaseName;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+import org.jboss.logging.Logger;
+
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.WriteModel;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.binder.NativeQueryBinder;
+import io.quarkus.mongodb.panache.binder.PanacheQlQueryBinder;
+import io.quarkus.mongodb.reactive.ReactiveMongoClient;
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
+import io.quarkus.mongodb.reactive.ReactiveMongoDatabase;
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+@SuppressWarnings({ "rawtypes", "unchecked", "Convert2MethodRef" })
+public abstract class ReactiveMongoOperations<QueryType, UpdateType> {
+    public final String ID = "_id";
+    private static final Logger LOGGER = Logger.getLogger(ReactiveMongoOperations.class);
+
+    // update operators: https://docs.mongodb.com/manual/reference/operator/update/
+    private static final List<String> UPDATE_OPERATORS = Arrays.asList(
+            "$currentDate", "$inc", "$min", "$max", "$mul", "$rename", "$set", "$setOnInsert", "$unset",
+            "$addToSet", "$pop", "$pull", "$push", "$pullAll",
+            "$each", "$position", "$slice", "$sort",
+            "$bit");
+
+    private static final Map<String, String> defaultDatabaseName = new ConcurrentHashMap<>();
+
+    protected abstract QueryType createQuery(ReactiveMongoCollection collection, Document query, Document sortDoc);
+
+    protected abstract UpdateType createUpdate(ReactiveMongoCollection<?> collection, Class<?> entityClass,
+            Document docUpdate);
+
+    protected abstract Uni<?> list(QueryType query);
+
+    protected abstract Multi<?> stream(QueryType query);
+
+    public Uni<Void> persist(Object entity) {
+        ReactiveMongoCollection collection = mongoCollection(entity);
+        return persist(collection, entity);
+    }
+
+    public Uni<Void> persist(Iterable<?> entities) {
+        return Uni.createFrom().deferred(() -> {
+            // not all iterables are re-traversal, so we traverse it once for copying inside a list
+            List<Object> objects = new ArrayList<>();
+            for (Object entity : entities) {
+                objects.add(entity);
+            }
+
+            if (objects.size() > 0) {
+                // get the first entity to be able to retrieve the collection with it
+                Object firstEntity = objects.get(0);
+                ReactiveMongoCollection collection = mongoCollection(firstEntity);
+                return persist(collection, objects);
+            }
+            return nullUni();
+        });
+    }
+
+    public Uni<Void> persist(Object firstEntity, Object... entities) {
+        ReactiveMongoCollection collection = mongoCollection(firstEntity);
+        if (entities == null || entities.length == 0) {
+            return persist(collection, firstEntity);
+        } else {
+            List<Object> entityList = new ArrayList<>();
+            entityList.add(firstEntity);
+            entityList.addAll(Arrays.asList(entities));
+            return persist(collection, entityList);
+        }
+    }
+
+    public Uni<Void> persist(Stream<?> entities) {
+        return Uni.createFrom().deferred(() -> {
+            List<Object> objects = entities.collect(Collectors.toList());
+            if (objects.size() > 0) {
+                // get the first entity to be able to retrieve the collection with it
+                Object firstEntity = objects.get(0);
+                ReactiveMongoCollection collection = mongoCollection(firstEntity);
+                return persist(collection, objects);
+            }
+            return nullUni();
+        });
+    }
+
+    public Uni<Void> update(Object entity) {
+        ReactiveMongoCollection collection = mongoCollection(entity);
+        return update(collection, entity);
+    }
+
+    public Uni<Void> update(Iterable<?> entities) {
+        return Uni.createFrom().deferred(() -> {
+            // not all iterables are re-traversal, so we traverse it once for copying inside a list
+            List<Object> objects = new ArrayList<>();
+            for (Object entity : entities) {
+                objects.add(entity);
+            }
+
+            if (objects.size() > 0) {
+                // get the first entity to be able to retrieve the collection with it
+                Object firstEntity = objects.get(0);
+                ReactiveMongoCollection collection = mongoCollection(firstEntity);
+                return update(collection, objects);
+            }
+            return nullUni();
+        });
+    }
+
+    public Uni<Void> update(Object firstEntity, Object... entities) {
+        ReactiveMongoCollection collection = mongoCollection(firstEntity);
+        if (entities == null || entities.length == 0) {
+            return update(collection, firstEntity);
+        } else {
+            List<Object> entityList = new ArrayList<>();
+            entityList.add(firstEntity);
+            entityList.addAll(Arrays.asList(entities));
+            return update(collection, entityList);
+        }
+    }
+
+    public Uni<Void> update(Stream<?> entities) {
+        return Uni.createFrom().deferred(() -> {
+            List<Object> objects = entities.collect(Collectors.toList());
+            if (objects.size() > 0) {
+                // get the first entity to be able to retrieve the collection with it
+                Object firstEntity = objects.get(0);
+                ReactiveMongoCollection collection = mongoCollection(firstEntity);
+                return update(collection, objects);
+            }
+            return nullUni();
+        });
+    }
+
+    public Uni<Void> persistOrUpdate(Object entity) {
+        ReactiveMongoCollection collection = mongoCollection(entity);
+        return persistOrUpdate(collection, entity);
+    }
+
+    public Uni<Void> persistOrUpdate(Iterable<?> entities) {
+        return Uni.createFrom().deferred(() -> {
+            // not all iterables are re-traversal, so we traverse it once for copying inside a list
+            List<Object> objects = new ArrayList<>();
+            for (Object entity : entities) {
+                objects.add(entity);
+            }
+
+            if (objects.size() > 0) {
+                // get the first entity to be able to retrieve the collection with it
+                Object firstEntity = objects.get(0);
+                ReactiveMongoCollection collection = mongoCollection(firstEntity);
+                return persistOrUpdate(collection, objects);
+            }
+            return nullUni();
+        });
+    }
+
+    public Uni<Void> persistOrUpdate(Object firstEntity, Object... entities) {
+        ReactiveMongoCollection collection = mongoCollection(firstEntity);
+        if (entities == null || entities.length == 0) {
+            return persistOrUpdate(collection, firstEntity);
+        } else {
+            List<Object> entityList = new ArrayList<>();
+            entityList.add(firstEntity);
+            entityList.addAll(Arrays.asList(entities));
+            return persistOrUpdate(collection, entityList);
+        }
+    }
+
+    public Uni<Void> persistOrUpdate(Stream<?> entities) {
+        return Uni.createFrom().deferred(() -> {
+            List<Object> objects = entities.collect(Collectors.toList());
+            if (objects.size() > 0) {
+                // get the first entity to be able to retrieve the collection with it
+                Object firstEntity = objects.get(0);
+                ReactiveMongoCollection collection = mongoCollection(firstEntity);
+                return persistOrUpdate(collection, objects);
+            }
+            return nullUni();
+        });
+    }
+
+    public Uni<Void> delete(Object entity) {
+        ReactiveMongoCollection collection = mongoCollection(entity);
+        BsonDocument document = getBsonDocument(collection, entity);
+        BsonValue id = document.get(ID);
+        BsonDocument query = new BsonDocument().append(ID, id);
+        return collection.deleteOne(query).onItem().ignore().andContinueWithNull();
+    }
+
+    public ReactiveMongoCollection mongoCollection(Class<?> entityClass) {
+        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
+        ReactiveMongoDatabase database = mongoDatabase(mongoEntity);
+        if (mongoEntity != null && !mongoEntity.collection().isEmpty()) {
+            return database.getCollection(mongoEntity.collection(), entityClass);
+        }
+        return database.getCollection(entityClass.getSimpleName(), entityClass);
+    }
+
+    public ReactiveMongoDatabase mongoDatabase(Class<?> entityClass) {
+        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
+        return mongoDatabase(mongoEntity);
+    }
+
+    //
+    // Private stuff
+
+    public Uni<Void> nullUni() {
+        return Uni.createFrom().item((Void) null);
+    }
+
+    private Uni<Void> persist(ReactiveMongoCollection collection, Object entity) {
+        return collection.insertOne(entity).onItem().ignore().andContinueWithNull();
+    }
+
+    private Uni<Void> persist(ReactiveMongoCollection collection, List<Object> entities) {
+        return collection.insertMany(entities).onItem().ignore().andContinueWithNull();
+    }
+
+    private Uni<Void> update(ReactiveMongoCollection collection, Object entity) {
+        //we transform the entity as a document first
+        BsonDocument document = getBsonDocument(collection, entity);
+
+        //then we get its id field and create a new Document with only this one that will be our replace query
+        BsonValue id = document.get(ID);
+        BsonDocument query = new BsonDocument().append(ID, id);
+        return collection.replaceOne(query, entity).onItem().ignore().andContinueWithNull();
+    }
+
+    private Uni<Void> update(ReactiveMongoCollection collection, List<Object> entities) {
+        List<Uni<Void>> unis = entities.stream().map(entity -> update(collection, entity)).collect(Collectors.toList());
+        return Uni.combine().all().unis(unis).combinedWith(u -> null);
+    }
+
+    private Uni<Void> persistOrUpdate(ReactiveMongoCollection collection, Object entity) {
+        //we transform the entity as a document first
+        BsonDocument document = getBsonDocument(collection, entity);
+
+        //then we get its id field and create a new Document with only this one that will be our replace query
+        BsonValue id = document.get(ID);
+        if (id == null) {
+            //insert with autogenerated ID
+            return collection.insertOne(entity).onItem().ignore().andContinueWithNull();
+        } else {
+            //insert with user provided ID or update
+            BsonDocument query = new BsonDocument().append(ID, id);
+            return collection.replaceOne(query, entity, new ReplaceOptions().upsert(true))
+                    .onItem().ignore().andContinueWithNull();
+        }
+    }
+
+    private Uni<Void> persistOrUpdate(ReactiveMongoCollection collection, List<Object> entities) {
+        //this will be an ordered bulk: it's less performant than a unordered one but will fail at the first failed write
+        List<WriteModel> bulk = new ArrayList<>();
+        for (Object entity : entities) {
+            //we transform the entity as a document first
+            BsonDocument document = getBsonDocument(collection, entity);
+
+            //then we get its id field and create a new Document with only this one that will be our replace query
+            BsonValue id = document.get(ID);
+            if (id == null) {
+                //insert with autogenerated ID
+                bulk.add(new InsertOneModel(entity));
+            } else {
+                //insert with user provided ID or update
+                BsonDocument query = new BsonDocument().append(ID, id);
+                bulk.add(new ReplaceOneModel(query, entity,
+                        new ReplaceOptions().upsert(true)));
+            }
+        }
+
+        return collection.bulkWrite(bulk).onItem().ignore().andContinueWithNull();
+    }
+
+    private BsonDocument getBsonDocument(ReactiveMongoCollection collection, Object entity) {
+        BsonDocument document = new BsonDocument();
+        Codec codec = collection.getCodecRegistry().get(entity.getClass());
+        codec.encode(new BsonDocumentWriter(document), entity, EncoderContext.builder().build());
+        return document;
+    }
+
+    private ReactiveMongoCollection mongoCollection(Object entity) {
+        Class<?> entityClass = entity.getClass();
+        return mongoCollection(entityClass);
+    }
+
+    private ReactiveMongoDatabase mongoDatabase(MongoEntity entity) {
+        ReactiveMongoClient mongoClient = clientFromArc(entity, ReactiveMongoClient.class, true);
+        if (entity != null && !entity.database().isEmpty()) {
+            return mongoClient.getDatabase(entity.database());
+        }
+        String databaseName = getDefaultDatabaseName(entity);
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    private String getDefaultDatabaseName(MongoEntity entity) {
+        return defaultDatabaseName.computeIfAbsent(beanName(entity), new Function<String, String>() {
+            @Override
+            public String apply(String beanName) {
+                return getDatabaseName(entity, beanName);
+            }
+        });
+    }
+
+    //
+    // Queries
+
+    public Uni<Object> findById(Class<?> entityClass, Object id) {
+        Uni<Optional> optionalEntity = findByIdOptional(entityClass, id);
+        return optionalEntity.onItem().transform(optional -> optional.orElse(null));
+    }
+
+    public Uni<Optional> findByIdOptional(Class<?> entityClass, Object id) {
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return collection.find(new Document(ID, id)).collectItems().first()
+                .onItem().transform(Optional::ofNullable);
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Object... params) {
+        return find(entityClass, query, null, params);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType find(Class<?> entityClass, String query, Sort sort, Object... params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        Document docQuery = Document.parse(bindQuery);
+        Document docSort = sortToDocument(sort);
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, docQuery, docSort);
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
+     * and like <code>firstname = ?1</code> for PanacheQL one.
+     */
+    public String bindFilter(Class<?> clazz, String query, Object[] params) {
+        String bindQuery = bindQuery(clazz, query, params);
+        LOGGER.debug(bindQuery);
+        return bindQuery;
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
+     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
+     */
+    public String bindFilter(Class<?> clazz, String query, Map<String, Object> params) {
+        String bindQuery = bindQuery(clazz, query, params);
+        LOGGER.debug(bindQuery);
+        return bindQuery;
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
+     * and like <code>firstname = ?1 and lastname = ?2</code> for PanacheQL one.
+     * As update document needs an update operator, we add <code>$set</code> if none is provided.
+     */
+    String bindUpdate(Class<?> clazz, String query, Object[] params) {
+        String bindUpdate = bindQuery(clazz, query, params);
+        if (!containsUpdateOperator(query)) {
+            bindUpdate = "{'$set':" + bindUpdate + "}";
+        }
+        LOGGER.debug(bindUpdate);
+        return bindUpdate;
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
+     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
+     * As update document needs an update operator, we add <code>$set</code> if none is provided.
+     */
+    String bindUpdate(Class<?> clazz, String query, Map<String, Object> params) {
+        String bindUpdate = bindQuery(clazz, query, params);
+        if (!containsUpdateOperator(query)) {
+            bindUpdate = "{'$set':" + bindUpdate + "}";
+        }
+        LOGGER.debug(bindUpdate);
+        return bindUpdate;
+    }
+
+    private boolean containsUpdateOperator(String update) {
+        for (String operator : UPDATE_OPERATORS) {
+            if (update.contains(operator)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    String bindQuery(Class<?> clazz, String query, Object[] params) {
+        String bindQuery = null;
+
+        //determine the type of the query
+        if (query.charAt(0) == '{') {
+            //this is a native query
+            bindQuery = NativeQueryBinder.bindQuery(query, params);
+        } else {
+            //this is a PanacheQL query
+            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
+        }
+
+        return bindQuery;
+    }
+
+    String bindQuery(Class<?> clazz, String query, Map<String, Object> params) {
+        String bindQuery = null;
+
+        //determine the type of the query
+        if (query.charAt(0) == '{') {
+            //this is a native query
+            bindQuery = NativeQueryBinder.bindQuery(query, params);
+        } else {
+            //this is a PanacheQL query
+            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
+        }
+
+        return bindQuery;
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Map<String, Object> params) {
+        return find(entityClass, query, null, params);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        Document docQuery = Document.parse(bindQuery);
+        Document docSort = sortToDocument(sort);
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, docQuery, docSort);
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Parameters params) {
+        return find(entityClass, query, null, params.map());
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return find(entityClass, query, sort, params.map());
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType find(Class<?> entityClass, Document query, Sort sort) {
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        Document sortDoc = sortToDocument(sort);
+        return createQuery(collection, query, sortDoc);
+    }
+
+    public QueryType find(Class<?> entityClass, Document query, Document sort) {
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, query, sort);
+    }
+
+    public QueryType find(Class<?> entityClass, Document query) {
+        return find(entityClass, query, (Document) null);
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Object... params) {
+        return (Uni) list(find(entityClass, query, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Object... params) {
+        return (Uni) list(find(entityClass, query, sort, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Map<String, Object> params) {
+        return (Uni) list(find(entityClass, query, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        return (Uni) list(find(entityClass, query, sort, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Parameters params) {
+        return (Uni) list(find(entityClass, query, params));
+    }
+
+    public Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return (Uni) list(find(entityClass, query, sort, params));
+    }
+
+    //specific Mongo query
+    public Uni<List<?>> list(Class<?> entityClass, Document query) {
+        return (Uni) list(find(entityClass, query));
+    }
+
+    //specific Mongo query
+    public Uni<List<?>> list(Class<?> entityClass, Document query, Document sort) {
+        return (Uni) list(find(entityClass, query, sort));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Object... params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Parameters params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Multi<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    //specific Mongo query
+    public Multi<?> stream(Class<?> entityClass, Document query) {
+        return stream(find(entityClass, query));
+    }
+
+    //specific Mongo query
+    public Multi<?> stream(Class<?> entityClass, Document query, Document sort) {
+        return stream(find(entityClass, query, sort));
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType findAll(Class<?> entityClass) {
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, null, null);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType findAll(Class<?> entityClass, Sort sort) {
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        Document sortDoc = sortToDocument(sort);
+        return createQuery(collection, null, sortDoc);
+    }
+
+    private Document sortToDocument(Sort sort) {
+        if (sort == null) {
+            return null;
+        }
+
+        Document sortDoc = new Document();
+        for (Sort.Column col : sort.getColumns()) {
+            sortDoc.append(col.getName(), col.getDirection() == Sort.Direction.Ascending ? 1 : -1);
+        }
+        return sortDoc;
+    }
+
+    public Uni<List<?>> listAll(Class<?> entityClass) {
+        return (Uni) list(findAll(entityClass));
+    }
+
+    public Uni<List<?>> listAll(Class<?> entityClass, Sort sort) {
+        return (Uni) list(findAll(entityClass, sort));
+    }
+
+    public Multi<?> streamAll(Class<?> entityClass) {
+        return stream(findAll(entityClass));
+    }
+
+    public Multi<?> streamAll(Class<?> entityClass, Sort sort) {
+        return stream(findAll(entityClass, sort));
+    }
+
+    public Uni<Long> count(Class<?> entityClass) {
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments();
+    }
+
+    public Uni<Long> count(Class<?> entityClass, String query, Object... params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments(docQuery);
+    }
+
+    public Uni<Long> count(Class<?> entityClass, String query, Map<String, Object> params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        ReactiveMongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments(docQuery);
+    }
+
+    public Uni<Long> count(Class<?> entityClass, String query, Parameters params) {
+        return count(entityClass, query, params.map());
+    }
+
+    //specific Mongo query
+    public Uni<Long> count(Class<?> entityClass, Document query) {
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return collection.countDocuments(query);
+    }
+
+    public Uni<Long> deleteAll(Class<?> entityClass) {
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return collection.deleteMany(new Document()).map(deleteResult -> deleteResult.getDeletedCount());
+    }
+
+    public Uni<Boolean> deleteById(Class<?> entityClass, Object id) {
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        Document query = new Document().append(ID, id);
+        return collection.deleteOne(query).map(results -> results.getDeletedCount() == 1);
+    }
+
+    public Uni<Long> delete(Class<?> entityClass, String query, Object... params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return collection.deleteMany(docQuery).map(deleteResult -> deleteResult.getDeletedCount());
+    }
+
+    public Uni<Long> delete(Class<?> entityClass, String query, Map<String, Object> params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return collection.deleteMany(docQuery).map(deleteResult -> deleteResult.getDeletedCount());
+    }
+
+    public Uni<Long> delete(Class<?> entityClass, String query, Parameters params) {
+        return delete(entityClass, query, params.map());
+    }
+
+    //specific Mongo query
+    public Uni<Long> delete(Class<?> entityClass, Document query) {
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return collection.deleteMany(query).map(deleteResult -> deleteResult.getDeletedCount());
+    }
+
+    public UpdateType update(Class<?> entityClass, String update, Map<String, Object> params) {
+        return executeUpdate(entityClass, update, params);
+    }
+
+    public UpdateType update(Class<?> entityClass, String update, Parameters params) {
+        return update(entityClass, update, params.map());
+    }
+
+    public UpdateType update(Class<?> entityClass, String update, Object... params) {
+        return executeUpdate(entityClass, update, params);
+    }
+
+    private UpdateType executeUpdate(Class<?> entityClass, String update, Object... params) {
+        String bindUpdate = bindUpdate(entityClass, update, params);
+        Document docUpdate = Document.parse(bindUpdate);
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return createUpdate(collection, entityClass, docUpdate);
+    }
+
+    private UpdateType executeUpdate(Class<?> entityClass, String update, Map<String, Object> params) {
+        String bindUpdate = bindUpdate(entityClass, update, params);
+        Document docUpdate = Document.parse(bindUpdate);
+        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
+        return createUpdate(collection, entityClass, docUpdate);
+    }
+
+    public IllegalStateException implementationInjectionMissing() {
+        return new IllegalStateException(
+                "This method is normally automatically overridden in subclasses");
+    }
+}
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheUpdateImpl.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheUpdateImpl.java
new file mode 100644
index 0000000000000..f8d0c502cc8ac
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheUpdateImpl.java
@@ -0,0 +1,51 @@
+package io.quarkus.mongodb.panache.reactive.runtime;
+
+import java.util.Map;
+
+import org.bson.BsonDocument;
+import org.bson.conversions.Bson;
+
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
+import io.quarkus.panache.common.Parameters;
+import io.smallrye.mutiny.Uni;
+
+@SuppressWarnings({ "unchecked", "rawtypes" })
+public class ReactivePanacheUpdateImpl implements ReactivePanacheUpdate {
+    private final ReactiveMongoOperations operations;
+    private final Class<?> entityClass;
+    private final Bson update;
+    private final ReactiveMongoCollection<?> collection;
+
+    public ReactivePanacheUpdateImpl(ReactiveMongoOperations operations, Class<?> entityClass, Bson update,
+            ReactiveMongoCollection<?> collection) {
+        this.operations = operations;
+        this.entityClass = entityClass;
+        this.update = update;
+        this.collection = collection;
+    }
+
+    @Override
+    public Uni<Long> where(String query, Object... params) {
+        String bindQuery = operations.bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        return collection.updateMany(docQuery, update).map(result -> result.getModifiedCount());
+    }
+
+    @Override
+    public Uni<Long> where(String query, Map<String, Object> params) {
+        String bindQuery = operations.bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        return collection.updateMany(docQuery, update).map(result -> result.getModifiedCount());
+    }
+
+    @Override
+    public Uni<Long> where(String query, Parameters params) {
+        return where(query, params.map());
+    }
+
+    @Override
+    public Uni<Long> all() {
+        return collection.updateMany(new BsonDocument(), update).map(result -> result.getModifiedCount());
+    }
+}
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/BeanUtils.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/BeanUtils.java
new file mode 100644
index 0000000000000..d0287d7b66007
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/BeanUtils.java
@@ -0,0 +1,83 @@
+package io.quarkus.mongodb.panache.runtime;
+
+import java.lang.annotation.Annotation;
+
+import javax.inject.Named;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.runtime.MongoClientBeanUtil;
+import io.quarkus.mongodb.runtime.MongoClientConfig;
+import io.quarkus.mongodb.runtime.MongoClients;
+
+public final class BeanUtils {
+
+    private BeanUtils() {
+    }
+
+    public static String beanName(MongoEntity entity) {
+        if (entity != null && !entity.clientName().isEmpty()) {
+            return entity.clientName();
+        }
+
+        return MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME;
+    }
+
+    public static <T> T clientFromArc(MongoEntity entity, Class<T> clientClass, boolean isReactive) {
+        T mongoClient = Arc.container().instance(clientClass, MongoClientBeanUtil.clientLiteral(beanName(entity), isReactive))
+                .get();
+        if (mongoClient != null) {
+            return mongoClient;
+        }
+
+        if ((entity == null) || entity.clientName().isEmpty()) {
+            // this case happens when there are multiple instances because they are all annotated with @Named
+            for (InstanceHandle<T> handle : Arc.container().select(clientClass).handles()) {
+                InjectableBean<T> bean = handle.getBean();
+                boolean hasNamed = false;
+                for (Annotation qualifier : bean.getQualifiers()) {
+                    if (qualifier.annotationType().equals(Named.class)) {
+                        hasNamed = true;
+                    }
+                }
+                if (!hasNamed) {
+                    return handle.get();
+                }
+            }
+            throw new IllegalStateException(String.format("Unable to find default %s bean", clientClass.getSimpleName()));
+        } else {
+            throw new IllegalStateException(
+                    String.format("Unable to find %s bean for entity %s", clientClass.getSimpleName(), entity.toString()));
+        }
+    }
+
+    public static String getDatabaseName(MongoEntity entity, String clientBeanName) {
+        MongoClients mongoClients = Arc.container().instance(MongoClients.class).get();
+        MongoClientConfig matchingMongoClientConfig = mongoClients.getMatchingMongoClientConfig(clientBeanName);
+        if (matchingMongoClientConfig.database.isPresent()) {
+            return matchingMongoClientConfig.database.get();
+        }
+
+        if (!clientBeanName.equals(MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME)) {
+            MongoClientConfig defaultMongoClientConfig = mongoClients
+                    .getMatchingMongoClientConfig(MongoClientBeanUtil.DEFAULT_MONGOCLIENT_NAME);
+            if (defaultMongoClientConfig.database.isPresent()) {
+                return defaultMongoClientConfig.database.get();
+            }
+        }
+
+        if (entity == null) {
+            throw new IllegalArgumentException(
+                    "The database property was not configured for the default Mongo Client (via 'quarkus.mongodb.database'");
+        }
+        if (entity.clientName().isEmpty()) {
+            throw new IllegalArgumentException("The database attribute was not set for the @MongoEntity annotation "
+                    + "and neither was the database property configured for the default Mongo Client (via 'quarkus.mongodb.database')");
+        }
+        throw new IllegalArgumentException(String.format(
+                "The database attribute was not set for the @MongoEntity annotation neither was the database property configured for the named Mongo Client (via 'quarkus.mongodb.%s.database')",
+                entity.clientName()));
+    }
+}
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonPanacheQueryImpl.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonPanacheQueryImpl.java
new file mode 100644
index 0000000000000..2cdaa88be6e2f
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/CommonPanacheQueryImpl.java
@@ -0,0 +1,235 @@
+package io.quarkus.mongodb.panache.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.model.Collation;
+
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Range;
+import io.quarkus.panache.common.exception.PanacheQueryException;
+
+public class CommonPanacheQueryImpl<Entity> {
+    private MongoCollection collection;
+    private Bson mongoQuery;
+    private Bson sort;
+    private Bson projections;
+
+    private Page page;
+    private Long count;
+
+    private Range range;
+
+    private Collation collation;
+
+    public CommonPanacheQueryImpl(MongoCollection<? extends Entity> collection, Bson mongoQuery, Bson sort) {
+        this.collection = collection;
+        this.mongoQuery = mongoQuery;
+        this.sort = sort;
+    }
+
+    private CommonPanacheQueryImpl(CommonPanacheQueryImpl<?> previousQuery, Bson projections, Class<?> documentClass) {
+        this.collection = previousQuery.collection.withDocumentClass(documentClass);
+        this.mongoQuery = previousQuery.mongoQuery;
+        this.sort = previousQuery.sort;
+        this.projections = projections;
+        this.page = previousQuery.page;
+        this.count = previousQuery.count;
+        this.range = previousQuery.range;
+        this.collation = previousQuery.collation;
+    }
+
+    public <T> CommonPanacheQueryImpl<T> project(Class<T> type) {
+        // collect field names from public fields and getters
+        Set<String> fieldNames = MongoPropertyUtil.collectFields(type);
+
+        // create the projection document
+        Document projections = new Document();
+        for (String fieldName : fieldNames) {
+            projections.append(fieldName, 1);
+        }
+
+        return new CommonPanacheQueryImpl<>(this, projections, type);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> CommonPanacheQueryImpl<T> page(Page page) {
+        this.page = page;
+        this.range = null; // reset the range to be able to switch from range to page
+        return (CommonPanacheQueryImpl<T>) this;
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> page(int pageIndex, int pageSize) {
+        return page(Page.of(pageIndex, pageSize));
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> nextPage() {
+        checkPagination();
+        return page(page.next());
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> previousPage() {
+        checkPagination();
+        return page(page.previous());
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> firstPage() {
+        checkPagination();
+        return page(page.first());
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> lastPage() {
+        checkPagination();
+        return page(page.index(pageCount() - 1));
+    }
+
+    public boolean hasNextPage() {
+        checkPagination();
+        return page.index < (pageCount() - 1);
+    }
+
+    public boolean hasPreviousPage() {
+        checkPagination();
+        return page.index > 0;
+    }
+
+    public int pageCount() {
+        checkPagination();
+        long count = count();
+        if (count == 0)
+            return 1; // a single page of zero results
+        return (int) Math.ceil((double) count / (double) page.size);
+    }
+
+    public Page page() {
+        checkPagination();
+        return page;
+    }
+
+    private void checkPagination() {
+        if (page == null) {
+            throw new UnsupportedOperationException(
+                    "Cannot call a page related method, "
+                            + "call page(Page) or page(int, int) to initiate pagination first");
+        }
+        if (range != null) {
+            throw new UnsupportedOperationException("Cannot call a page related method in a ranged query, " +
+                    "call page(Page) or page(int, int) to initiate pagination first");
+        }
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> range(int startIndex, int lastIndex) {
+        this.range = Range.of(startIndex, lastIndex);
+        // reset the page to its default to be able to switch from page to range
+        this.page = null;
+        return (CommonPanacheQueryImpl<T>) this;
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> withCollation(Collation collation) {
+        this.collation = collation;
+        return (CommonPanacheQueryImpl<T>) this;
+    }
+
+    public <T extends Entity> CommonPanacheQueryImpl<T> withReadPreference(ReadPreference readPreference) {
+        this.collection = this.collection.withReadPreference(readPreference);
+        return (CommonPanacheQueryImpl<T>) this;
+    }
+
+    // Results
+
+    @SuppressWarnings("unchecked")
+    public long count() {
+        if (count == null) {
+            count = collection.countDocuments(mongoQuery);
+        }
+        return count;
+    }
+
+    public <T extends Entity> List<T> list() {
+        return list(null);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T extends Entity> List<T> list(Integer limit) {
+        List<T> list = new ArrayList<>();
+        FindIterable find = mongoQuery == null ? collection.find() : collection.find(mongoQuery);
+        if (this.projections != null) {
+            find.projection(projections);
+        }
+        if (this.collation != null) {
+            find.collation(collation);
+        }
+        manageOffsets(find, limit);
+        MongoCursor<T> cursor = find.sort(sort).iterator();
+
+        try {
+            while (cursor.hasNext()) {
+                T entity = cursor.next();
+                list.add(entity);
+            }
+        } finally {
+            cursor.close();
+        }
+        return list;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Entity> Stream<T> stream() {
+        return (Stream<T>) list().stream();
+    }
+
+    public <T extends Entity> T firstResult() {
+        List<T> list = list(1);
+        return list.isEmpty() ? null : list.get(0);
+    }
+
+    public <T extends Entity> Optional<T> firstResultOptional() {
+        return Optional.ofNullable(firstResult());
+    }
+
+    public <T extends Entity> T singleResult() {
+        List<T> list = list(2);
+        if (list.size() != 1) {
+            throw new PanacheQueryException("There should be only one result");
+        }
+
+        return list.get(0);
+    }
+
+    public <T extends Entity> Optional<T> singleResultOptional() {
+        List<T> list = list(2);
+        if (list.size() > 1) {
+            throw new PanacheQueryException("There should be no more than one result");
+        }
+
+        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(0));
+    }
+
+    private void manageOffsets(FindIterable find, Integer limit) {
+        if (range != null) {
+            find.skip(range.getStartIndex());
+            if (limit == null) {
+                // range is 0 based, so we add 1 to the limit
+                find.limit(range.getLastIndex() - range.getStartIndex() + 1);
+            }
+        } else if (page != null) {
+            find.skip(page.index * page.size);
+            if (limit == null) {
+                find.limit(page.size);
+            }
+        }
+        if (limit != null) {
+            find.limit(limit);
+        }
+    }
+}
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoOperations.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoOperations.java
new file mode 100644
index 0000000000000..9ed4225e27517
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoOperations.java
@@ -0,0 +1,653 @@
+package io.quarkus.mongodb.panache.runtime;
+
+import static io.quarkus.mongodb.panache.runtime.BeanUtils.beanName;
+import static io.quarkus.mongodb.panache.runtime.BeanUtils.clientFromArc;
+import static io.quarkus.mongodb.panache.runtime.BeanUtils.getDatabaseName;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+import org.jboss.logging.Logger;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.client.result.DeleteResult;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.binder.NativeQueryBinder;
+import io.quarkus.mongodb.panache.binder.PanacheQlQueryBinder;
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
+
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public abstract class MongoOperations<QueryType, UpdateType> {
+    public final String ID = "_id";
+    private static final Logger LOGGER = Logger.getLogger(MongoOperations.class);
+
+    // update operators: https://docs.mongodb.com/manual/reference/operator/update/
+    private static final List<String> UPDATE_OPERATORS = Arrays.asList(
+            "$currentDate", "$inc", "$min", "$max", "$mul", "$rename", "$set", "$setOnInsert", "$unset",
+            "$addToSet", "$pop", "$pull", "$push", "$pullAll",
+            "$each", "$position", "$slice", "$sort",
+            "$bit");
+
+    private final Map<String, String> defaultDatabaseName = new ConcurrentHashMap<>();
+
+    protected abstract QueryType createQuery(MongoCollection<?> collection, Document query, Document sortDoc);
+
+    protected abstract UpdateType createUpdate(MongoCollection collection, Class<?> entityClass, Document docUpdate);
+
+    protected abstract List<?> list(QueryType queryType);
+
+    protected abstract Stream<?> stream(QueryType queryType);
+
+    public void persist(Object entity) {
+        MongoCollection collection = mongoCollection(entity);
+        persist(collection, entity);
+    }
+
+    public void persist(Iterable<?> entities) {
+        // not all iterables are re-traversal, so we traverse it once for copying inside a list
+        List<Object> objects = new ArrayList<>();
+        for (Object entity : entities) {
+            objects.add(entity);
+        }
+
+        if (objects.size() > 0) {
+            // get the first entity to be able to retrieve the collection with it
+            Object firstEntity = objects.get(0);
+            MongoCollection collection = mongoCollection(firstEntity);
+            persist(collection, objects);
+        }
+    }
+
+    public void persist(Object firstEntity, Object... entities) {
+        MongoCollection collection = mongoCollection(firstEntity);
+        if (entities == null || entities.length == 0) {
+            persist(collection, firstEntity);
+        } else {
+            List<Object> entityList = new ArrayList<>();
+            entityList.add(firstEntity);
+            entityList.addAll(Arrays.asList(entities));
+            persist(collection, entityList);
+        }
+    }
+
+    public void persist(Stream<?> entities) {
+        List<Object> objects = entities.collect(Collectors.toList());
+        if (objects.size() > 0) {
+            // get the first entity to be able to retrieve the collection with it
+            Object firstEntity = objects.get(0);
+            MongoCollection collection = mongoCollection(firstEntity);
+            update(collection, objects);
+        }
+    }
+
+    public void update(Object entity) {
+        MongoCollection collection = mongoCollection(entity);
+        update(collection, entity);
+    }
+
+    public void update(Iterable<?> entities) {
+        // not all iterables are re-traversal, so we traverse it once for copying inside a list
+        List<Object> objects = new ArrayList<>();
+        for (Object entity : entities) {
+            objects.add(entity);
+        }
+
+        if (objects.size() > 0) {
+            // get the first entity to be able to retrieve the collection with it
+            Object firstEntity = objects.get(0);
+            MongoCollection collection = mongoCollection(firstEntity);
+            update(collection, objects);
+        }
+    }
+
+    public void update(Object firstEntity, Object... entities) {
+        MongoCollection collection = mongoCollection(firstEntity);
+        if (entities == null || entities.length == 0) {
+            update(collection, firstEntity);
+        } else {
+            List<Object> entityList = new ArrayList<>();
+            entityList.add(firstEntity);
+            entityList.addAll(Arrays.asList(entities));
+            update(collection, entityList);
+        }
+    }
+
+    public void update(Stream<?> entities) {
+        List<Object> objects = entities.collect(Collectors.toList());
+        if (objects.size() > 0) {
+            // get the first entity to be able to retrieve the collection with it
+            Object firstEntity = objects.get(0);
+            MongoCollection collection = mongoCollection(firstEntity);
+            update(collection, objects);
+        }
+    }
+
+    public void persistOrUpdate(Object entity) {
+        MongoCollection collection = mongoCollection(entity);
+        persistOrUpdate(collection, entity);
+    }
+
+    public void persistOrUpdate(Iterable<?> entities) {
+        // not all iterables are re-traversal, so we traverse it once for copying inside a list
+        List<Object> objects = new ArrayList<>();
+        for (Object entity : entities) {
+            objects.add(entity);
+        }
+
+        if (objects.size() > 0) {
+            // get the first entity to be able to retrieve the collection with it
+            Object firstEntity = objects.get(0);
+            MongoCollection collection = mongoCollection(firstEntity);
+            persistOrUpdate(collection, objects);
+        }
+    }
+
+    public void persistOrUpdate(Object firstEntity, Object... entities) {
+        MongoCollection collection = mongoCollection(firstEntity);
+        if (entities == null || entities.length == 0) {
+            persistOrUpdate(collection, firstEntity);
+        } else {
+            List<Object> entityList = new ArrayList<>();
+            entityList.add(firstEntity);
+            entityList.addAll(Arrays.asList(entities));
+            persistOrUpdate(collection, entityList);
+        }
+    }
+
+    public void persistOrUpdate(Stream<?> entities) {
+        List<Object> objects = entities.collect(Collectors.toList());
+        if (objects.size() > 0) {
+            // get the first entity to be able to retrieve the collection with it
+            Object firstEntity = objects.get(0);
+            MongoCollection collection = mongoCollection(firstEntity);
+            persistOrUpdate(collection, objects);
+        }
+    }
+
+    public void delete(Object entity) {
+        MongoCollection collection = mongoCollection(entity);
+        BsonDocument document = getBsonDocument(collection, entity);
+        BsonValue id = document.get(ID);
+        BsonDocument query = new BsonDocument().append(ID, id);
+        collection.deleteOne(query);
+    }
+
+    public MongoCollection mongoCollection(Class<?> entityClass) {
+        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
+        MongoDatabase database = mongoDatabase(mongoEntity);
+        if (mongoEntity != null && !mongoEntity.collection().isEmpty()) {
+            return database.getCollection(mongoEntity.collection(), entityClass);
+        }
+        return database.getCollection(entityClass.getSimpleName(), entityClass);
+    }
+
+    public MongoDatabase mongoDatabase(Class<?> entityClass) {
+        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
+        return mongoDatabase(mongoEntity);
+    }
+
+    //
+    // Private stuff
+
+    private void persist(MongoCollection collection, Object entity) {
+        collection.insertOne(entity);
+    }
+
+    private void persist(MongoCollection collection, List<Object> entities) {
+        collection.insertMany(entities);
+    }
+
+    private void update(MongoCollection collection, Object entity) {
+        //we transform the entity as a document first
+        BsonDocument document = getBsonDocument(collection, entity);
+
+        //then we get its id field and create a new Document with only this one that will be our replace query
+        BsonValue id = document.get(ID);
+        BsonDocument query = new BsonDocument().append(ID, id);
+        collection.replaceOne(query, entity);
+    }
+
+    private void update(MongoCollection collection, List<Object> entities) {
+        for (Object entity : entities) {
+            update(collection, entity);
+        }
+    }
+
+    private void persistOrUpdate(MongoCollection collection, Object entity) {
+        //we transform the entity as a document first
+        BsonDocument document = getBsonDocument(collection, entity);
+
+        //then we get its id field and create a new Document with only this one that will be our replace query
+        BsonValue id = document.get(ID);
+        if (id == null) {
+            //insert with autogenerated ID
+            collection.insertOne(entity);
+        } else {
+            //insert with user provided ID or update
+            BsonDocument query = new BsonDocument().append(ID, id);
+            collection.replaceOne(query, entity, new ReplaceOptions().upsert(true));
+        }
+    }
+
+    private void persistOrUpdate(MongoCollection collection, List<Object> entities) {
+        //this will be an ordered bulk: it's less performant than a unordered one but will fail at the first failed write
+        List<WriteModel> bulk = new ArrayList<>();
+        for (Object entity : entities) {
+            //we transform the entity as a document first
+            BsonDocument document = getBsonDocument(collection, entity);
+
+            //then we get its id field and create a new Document with only this one that will be our replace query
+            BsonValue id = document.get(ID);
+            if (id == null) {
+                //insert with autogenerated ID
+                bulk.add(new InsertOneModel(entity));
+            } else {
+                //insert with user provided ID or update
+                BsonDocument query = new BsonDocument().append(ID, id);
+                bulk.add(new ReplaceOneModel(query, entity,
+                        new ReplaceOptions().upsert(true)));
+            }
+        }
+
+        collection.bulkWrite(bulk);
+    }
+
+    private BsonDocument getBsonDocument(MongoCollection collection, Object entity) {
+        BsonDocument document = new BsonDocument();
+        Codec codec = collection.getCodecRegistry().get(entity.getClass());
+        codec.encode(new BsonDocumentWriter(document), entity, EncoderContext.builder().build());
+        return document;
+    }
+
+    private MongoCollection mongoCollection(Object entity) {
+        Class<?> entityClass = entity.getClass();
+        return mongoCollection(entityClass);
+    }
+
+    private MongoDatabase mongoDatabase(MongoEntity entity) {
+        MongoClient mongoClient = clientFromArc(entity, MongoClient.class, false);
+        if (entity != null && !entity.database().isEmpty()) {
+            return mongoClient.getDatabase(entity.database());
+        }
+        String databaseName = getDefaultDatabaseName(entity);
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    private String getDefaultDatabaseName(MongoEntity entity) {
+        return defaultDatabaseName.computeIfAbsent(beanName(entity), new Function<String, String>() {
+            @Override
+            public String apply(String beanName) {
+                return getDatabaseName(entity, beanName);
+            }
+        });
+    }
+    //
+    // Queries
+
+    public Object findById(Class<?> entityClass, Object id) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.find(new Document(ID, id)).first();
+    }
+
+    public Optional findByIdOptional(Class<?> entityClass, Object id) {
+        return Optional.ofNullable(findById(entityClass, id));
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Object... params) {
+        return find(entityClass, query, null, params);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType find(Class<?> entityClass, String query, Sort sort, Object... params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        Document docQuery = Document.parse(bindQuery);
+        Document docSort = sortToDocument(sort);
+        MongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, docQuery, docSort);
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
+     * and like <code>firstname = ?1</code> for PanacheQL one.
+     */
+    public String bindFilter(Class<?> clazz, String query, Object[] params) {
+        String bindQuery = bindQuery(clazz, query, params);
+        LOGGER.debug(bindQuery);
+        return bindQuery;
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
+     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
+     */
+    public String bindFilter(Class<?> clazz, String query, Map<String, Object> params) {
+        String bindQuery = bindQuery(clazz, query, params);
+        LOGGER.debug(bindQuery);
+        return bindQuery;
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
+     * and like <code>firstname = ?1 and lastname = ?2</code> for PanacheQL one.
+     * As update document needs an update operator, we add <code>$set</code> if none is provided.
+     */
+    String bindUpdate(Class<?> clazz, String query, Object[] params) {
+        String bindUpdate = bindQuery(clazz, query, params);
+        if (!containsUpdateOperator(query)) {
+            bindUpdate = "{'$set':" + bindUpdate + "}";
+        }
+        LOGGER.debug(bindUpdate);
+        return bindUpdate;
+    }
+
+    /**
+     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
+     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
+     * As update document needs an update operator, we add <code>$set</code> if none is provided.
+     */
+    String bindUpdate(Class<?> clazz, String query, Map<String, Object> params) {
+        String bindUpdate = bindQuery(clazz, query, params);
+        if (!containsUpdateOperator(query)) {
+            bindUpdate = "{'$set':" + bindUpdate + "}";
+        }
+        LOGGER.debug(bindUpdate);
+        return bindUpdate;
+    }
+
+    private boolean containsUpdateOperator(String update) {
+        for (String operator : UPDATE_OPERATORS) {
+            if (update.contains(operator)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String bindQuery(Class<?> clazz, String query, Object[] params) {
+        String bindQuery = null;
+        //determine the type of the query
+        if (query.charAt(0) == '{') {
+            //this is a native query
+            bindQuery = NativeQueryBinder.bindQuery(query, params);
+        } else {
+            //this is a PanacheQL query
+            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
+        }
+        return bindQuery;
+    }
+
+    private String bindQuery(Class<?> clazz, String query, Map<String, Object> params) {
+        String bindQuery = null;
+        //determine the type of the query
+        if (query.charAt(0) == '{') {
+            //this is a native query
+            bindQuery = NativeQueryBinder.bindQuery(query, params);
+        } else {
+            //this is a PanacheQL query
+            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
+        }
+        return bindQuery;
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Map<String, Object> params) {
+        return find(entityClass, query, null, params);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        Document docQuery = Document.parse(bindQuery);
+        Document docSort = sortToDocument(sort);
+        MongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, docQuery, docSort);
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Parameters params) {
+        return find(entityClass, query, null, params.map());
+    }
+
+    public QueryType find(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return find(entityClass, query, sort, params.map());
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType find(Class<?> entityClass, Document query, Sort sort) {
+        MongoCollection collection = mongoCollection(entityClass);
+        Document sortDoc = sortToDocument(sort);
+        return createQuery(collection, query, sortDoc);
+    }
+
+    public QueryType find(Class<?> entityClass, Document query, Document sort) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, query, sort);
+    }
+
+    public QueryType find(Class<?> entityClass, Document query) {
+        return find(entityClass, query, (Document) null);
+    }
+
+    public List<?> list(Class<?> entityClass, String query, Object... params) {
+        return list(find(entityClass, query, params));
+    }
+
+    public List<?> list(Class<?> entityClass, String query, Sort sort, Object... params) {
+        return list(find(entityClass, query, sort, params));
+    }
+
+    public List<?> list(Class<?> entityClass, String query, Map<String, Object> params) {
+        return list(find(entityClass, query, params));
+    }
+
+    public List<?> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        return list(find(entityClass, query, sort, params));
+    }
+
+    public List<?> list(Class<?> entityClass, String query, Parameters params) {
+        return list(find(entityClass, query, params));
+    }
+
+    public List<?> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return list(find(entityClass, query, sort, params));
+    }
+
+    //specific Mongo query
+    public List<?> list(Class<?> entityClass, Document query) {
+        return list(find(entityClass, query));
+    }
+
+    //specific Mongo query
+    public List<?> list(Class<?> entityClass, Document query, Document sort) {
+        return list(find(entityClass, query, sort));
+    }
+
+    public Stream<?> stream(Class<?> entityClass, String query, Object... params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Stream<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public Stream<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Stream<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    public Stream<?> stream(Class<?> entityClass, String query, Parameters params) {
+        return stream(find(entityClass, query, params));
+    }
+
+    public Stream<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
+        return stream(find(entityClass, query, sort, params));
+    }
+
+    //specific Mongo query
+    public Stream<?> stream(Class<?> entityClass, Document query) {
+        return stream(find(entityClass, query));
+    }
+
+    //specific Mongo query
+    public Stream<?> stream(Class<?> entityClass, Document query, Document sort) {
+        return stream(find(entityClass, query, sort));
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType findAll(Class<?> entityClass) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return createQuery(collection, null, null);
+    }
+
+    @SuppressWarnings("rawtypes")
+    public QueryType findAll(Class<?> entityClass, Sort sort) {
+        MongoCollection collection = mongoCollection(entityClass);
+        Document sortDoc = sortToDocument(sort);
+        return createQuery(collection, null, sortDoc);
+    }
+
+    private Document sortToDocument(Sort sort) {
+        if (sort == null) {
+            return null;
+        }
+
+        Document sortDoc = new Document();
+        for (Sort.Column col : sort.getColumns()) {
+            sortDoc.append(col.getName(), col.getDirection() == Sort.Direction.Ascending ? 1 : -1);
+        }
+        return sortDoc;
+    }
+
+    public List<?> listAll(Class<?> entityClass) {
+        return list(findAll(entityClass));
+    }
+
+    public List<?> listAll(Class<?> entityClass, Sort sort) {
+        return list(findAll(entityClass, sort));
+    }
+
+    public Stream<?> streamAll(Class<?> entityClass) {
+        return stream(findAll(entityClass));
+    }
+
+    public Stream<?> streamAll(Class<?> entityClass, Sort sort) {
+        return stream(findAll(entityClass, sort));
+    }
+
+    public long count(Class<?> entityClass) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments();
+    }
+
+    public long count(Class<?> entityClass, String query, Object... params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments(docQuery);
+    }
+
+    public long count(Class<?> entityClass, String query, Map<String, Object> params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments(docQuery);
+    }
+
+    public long count(Class<?> entityClass, String query, Parameters params) {
+        return count(entityClass, query, params.map());
+    }
+
+    //specific Mongo query
+    public long count(Class<?> entityClass, Document query) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.countDocuments(query);
+    }
+
+    public long deleteAll(Class<?> entityClass) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.deleteMany(new Document()).getDeletedCount();
+    }
+
+    public boolean deleteById(Class<?> entityClass, Object id) {
+        MongoCollection collection = mongoCollection(entityClass);
+        Document query = new Document().append(ID, id);
+        DeleteResult results = collection.deleteOne(query);
+        return results.getDeletedCount() == 1;
+    }
+
+    public long delete(Class<?> entityClass, String query, Object... params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.deleteMany(docQuery).getDeletedCount();
+    }
+
+    public long delete(Class<?> entityClass, String query, Map<String, Object> params) {
+        String bindQuery = bindFilter(entityClass, query, params);
+        BsonDocument docQuery = BsonDocument.parse(bindQuery);
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.deleteMany(docQuery).getDeletedCount();
+    }
+
+    public long delete(Class<?> entityClass, String query, Parameters params) {
+        return delete(entityClass, query, params.map());
+    }
+
+    //specific Mongo query
+    public long delete(Class<?> entityClass, Document query) {
+        MongoCollection collection = mongoCollection(entityClass);
+        return collection.deleteMany(query).getDeletedCount();
+    }
+
+    public UpdateType update(Class<?> entityClass, String update, Map<String, Object> params) {
+        return executeUpdate(entityClass, update, params);
+    }
+
+    public UpdateType update(Class<?> entityClass, String update, Parameters params) {
+        return update(entityClass, update, params.map());
+    }
+
+    public UpdateType update(Class<?> entityClass, String update, Object... params) {
+        return executeUpdate(entityClass, update, params);
+    }
+
+    private UpdateType executeUpdate(Class<?> entityClass, String update, Object... params) {
+        String bindUpdate = bindUpdate(entityClass, update, params);
+        Document docUpdate = Document.parse(bindUpdate);
+        return createUpdate(mongoCollection(entityClass), entityClass, docUpdate);
+    }
+
+    private UpdateType executeUpdate(Class<?> entityClass, String update, Map<String, Object> params) {
+        String bindUpdate = bindUpdate(entityClass, update, params);
+        Document docUpdate = Document.parse(bindUpdate);
+        return createUpdate(mongoCollection(entityClass), entityClass, docUpdate);
+    }
+
+    public IllegalStateException implementationInjectionMissing() {
+        return new IllegalStateException(
+                "This method is normally automatically overridden in subclasses");
+    }
+
+}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoPropertyUtil.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoPropertyUtil.java
similarity index 100%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoPropertyUtil.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoPropertyUtil.java
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheUpdateImpl.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheUpdateImpl.java
similarity index 77%
rename from extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheUpdateImpl.java
rename to extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheUpdateImpl.java
index effeae31cdbb5..1cf9e9d7bfac6 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheUpdateImpl.java
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheUpdateImpl.java
@@ -11,11 +11,13 @@
 import io.quarkus.panache.common.Parameters;
 
 public class PanacheUpdateImpl implements PanacheUpdate {
+    private MongoOperations operations;
     private Class<?> entityClass;
     private Bson update;
     private MongoCollection collection;
 
-    public PanacheUpdateImpl(Class<?> entityClass, Bson update, MongoCollection collection) {
+    public PanacheUpdateImpl(MongoOperations operations, Class<?> entityClass, Bson update, MongoCollection collection) {
+        this.operations = operations;
         this.entityClass = entityClass;
         this.update = update;
         this.collection = collection;
@@ -23,14 +25,14 @@ public PanacheUpdateImpl(Class<?> entityClass, Bson update, MongoCollection coll
 
     @Override
     public long where(String query, Object... params) {
-        String bindQuery = MongoOperations.bindFilter(entityClass, query, params);
+        String bindQuery = operations.bindFilter(entityClass, query, params);
         BsonDocument docQuery = BsonDocument.parse(bindQuery);
         return collection.updateMany(docQuery, update).getModifiedCount();
     }
 
     @Override
     public long where(String query, Map<String, Object> params) {
-        String bindQuery = MongoOperations.bindFilter(entityClass, query, params);
+        String bindQuery = operations.bindFilter(entityClass, query, params);
         BsonDocument docQuery = BsonDocument.parse(bindQuery);
         return collection.updateMany(docQuery, update).getModifiedCount();
     }
diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/mongodb-panache-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..659c8b8f067aa
--- /dev/null
+++ b/extensions/panache/mongodb-panache-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,4 @@
+---
+name: "MongoDB Panache Common module"
+metadata:
+  unlisted: true
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml b/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml
new file mode 100644
index 0000000000000..c85ca75112746
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-mongodb-panache-kotlin-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-mongodb-panache-kotlin-deployment</artifactId>
+    <name>Quarkus - MongoDB with Panache - Kotlin Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/main/java</source>
+                                <source>src/main/kotlin</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/test/java</source>
+                                <source>src/test/kotlin</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <javaParameters>true</javaParameters>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinImperativeTypeBundle.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinImperativeTypeBundle.java
new file mode 100644
index 0000000000000..755f08605eac2
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinImperativeTypeBundle.java
@@ -0,0 +1,61 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import io.quarkus.mongodb.panache.PanacheUpdate;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanionBase;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntityBase;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase;
+import io.quarkus.mongodb.panache.kotlin.PanacheQuery;
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+class KotlinImperativeTypeBundle implements TypeBundle {
+
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(PanacheMongoEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(PanacheMongoEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanion() {
+        return new ByteCodeType(PanacheMongoCompanion.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanionBase() {
+        return new ByteCodeType(PanacheMongoCompanionBase.class);
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(KotlinMongoOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(PanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(PanacheMongoRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(PanacheMongoRepositoryBase.class);
+    }
+
+    @Override
+    public ByteCodeType updateType() {
+        return new ByteCodeType(PanacheUpdate.class);
+    }
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoEntityEnhancer.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoEntityEnhancer.java
new file mode 100644
index 0000000000000..7b022124f3501
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoEntityEnhancer.java
@@ -0,0 +1,32 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import static java.util.Collections.emptyList;
+
+import java.util.List;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor;
+
+public class KotlinPanacheMongoEntityEnhancer extends PanacheEntityEnhancer {
+    private final TypeBundle types;
+
+    public KotlinPanacheMongoEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers,
+            TypeBundle types) {
+        super(index, methodCustomizers);
+        this.types = types;
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
+        return new KotlinPanacheClassOperationGenerationVisitor(outputClassVisitor,
+                indexView.getClassByName(DotName.createSimple(className)), indexView, types,
+                types.entityBase(), emptyList());
+    }
+
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoRepositoryEnhancer.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoRepositoryEnhancer.java
new file mode 100644
index 0000000000000..12e24f3098619
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoRepositoryEnhancer.java
@@ -0,0 +1,27 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import java.util.Collections;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor;
+
+public class KotlinPanacheMongoRepositoryEnhancer extends PanacheRepositoryEnhancer {
+    private final TypeBundle types;
+
+    public KotlinPanacheMongoRepositoryEnhancer(IndexView index, TypeBundle types) {
+        super(index);
+        this.types = types;
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
+        return new KotlinPanacheClassOperationGenerationVisitor(outputClassVisitor,
+                indexView.getClassByName(DotName.createSimple(className)), indexView, types,
+                types.repositoryBase(), Collections.emptyList());
+    }
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java
new file mode 100644
index 0000000000000..60e0cb462083a
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java
@@ -0,0 +1,146 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jboss.jandex.ClassInfo;
+
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.mongodb.panache.deployment.BasePanacheMongoResourceProcessor;
+import io.quarkus.mongodb.panache.deployment.PropertyMappingClassBuildStep;
+import io.quarkus.panache.common.deployment.MetamodelInfo;
+import io.quarkus.panache.common.deployment.PanacheCompanionEnhancer;
+import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
+import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public class KotlinPanacheMongoResourceProcessor extends BasePanacheMongoResourceProcessor {
+    public static final KotlinImperativeTypeBundle IMPERATIVE_TYPE_BUNDLE = new KotlinImperativeTypeBundle();
+    public static final KotlinReactiveTypeBundle REACTIVE_TYPE_BUNDLE = new KotlinReactiveTypeBundle();
+
+    @BuildStep
+    public void buildImperativeCompanions(CombinedIndexBuildItem index, ApplicationIndexBuildItem applicationIndex,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
+
+        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
+                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+
+        processCompanions(index, transformers, reflectiveClass, propertyMappingClass,
+                createCompanionEnhancer(index, methodCustomizers),
+                getImperativeTypeBundle());
+    }
+
+    @BuildStep
+    public void buildReactiveCompanions(CombinedIndexBuildItem index,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
+
+        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
+                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
+
+        processCompanions(index, transformers, reflectiveClass, propertyMappingClass,
+                createReactiveCompanionEnhancer(index, methodCustomizers),
+                getReactiveTypeBundle());
+    }
+
+    protected KotlinImperativeTypeBundle getImperativeTypeBundle() {
+        return IMPERATIVE_TYPE_BUNDLE;
+    }
+
+    protected KotlinReactiveTypeBundle getReactiveTypeBundle() {
+        return REACTIVE_TYPE_BUNDLE;
+    }
+
+    @BuildStep
+    protected CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.MONGODB_PANACHE_KOTLIN);
+    }
+
+    @BuildStep
+    protected FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.MONGODB_PANACHE_KOTLIN);
+    }
+
+    @Override
+    public PanacheEntityEnhancer createEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers, MetamodelInfo modelInfo) {
+        return new KotlinPanacheMongoEntityEnhancer(index.getIndex(), methodCustomizers, getImperativeTypeBundle());
+    }
+
+    private PanacheMongoCompanionEnhancer createCompanionEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new PanacheMongoCompanionEnhancer(index.getIndex(), methodCustomizers, getImperativeTypeBundle());
+    }
+
+    private PanacheMongoCompanionEnhancer createReactiveCompanionEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new PanacheMongoCompanionEnhancer(index.getIndex(), methodCustomizers, getReactiveTypeBundle());
+    }
+
+    @Override
+    public PanacheEntityEnhancer createReactiveEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers, MetamodelInfo modelInfo) {
+        return new KotlinPanacheMongoEntityEnhancer(index.getIndex(), methodCustomizers, getImperativeTypeBundle());
+    }
+
+    @Override
+    public PanacheRepositoryEnhancer createRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new KotlinPanacheMongoRepositoryEnhancer(index.getIndex(), getImperativeTypeBundle());
+    }
+
+    @Override
+    public PanacheRepositoryEnhancer createReactiveRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new KotlinPanacheMongoRepositoryEnhancer(index.getIndex(), getReactiveTypeBundle());
+    }
+
+    private void processCompanions(CombinedIndexBuildItem index,
+            BuildProducer<BytecodeTransformerBuildItem> transformers,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
+            PanacheCompanionEnhancer companionEnhancer, TypeBundle typeBundle) {
+
+        Set<String> modelClasses = new HashSet<>();
+        // Note that we do this in two passes because for some reason Jandex does not give us subtypes
+        // of PanacheMongoEntity if we ask for subtypes of PanacheMongoEntityBase
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(typeBundle.entityCompanionBase().dotName())) {
+            if (classInfo.name().equals(typeBundle.entityCompanion().dotName())) {
+                continue;
+            }
+            modelClasses.add(classInfo.name().toString());
+        }
+        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(typeBundle.entityCompanion().dotName())) {
+            modelClasses.add(classInfo.name().toString());
+        }
+
+        // iterate over all the entity classes
+        for (String modelClass : modelClasses) {
+            transformers.produce(new BytecodeTransformerBuildItem(modelClass, companionEnhancer));
+
+            //register for reflection entity classes
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, modelClass));
+
+            // Register for building the property mapping cache
+            propertyMappingClass.produce(new PropertyMappingClassBuildStep(modelClass));
+        }
+    }
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinReactiveTypeBundle.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinReactiveTypeBundle.java
new file mode 100644
index 0000000000000..e425a786382cd
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinReactiveTypeBundle.java
@@ -0,0 +1,61 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoCompanion;
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoCompanionBase;
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoEntity;
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoEntityBase;
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepository;
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepositoryBase;
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheQuery;
+import io.quarkus.mongodb.panache.kotlin.reactive.runtime.KotlinReactiveMongoOperations;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+class KotlinReactiveTypeBundle implements TypeBundle {
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(ReactivePanacheMongoEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(ReactivePanacheMongoEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanion() {
+        return new ByteCodeType(ReactivePanacheMongoCompanion.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanionBase() {
+        return new ByteCodeType(ReactivePanacheMongoCompanionBase.class);
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(KotlinReactiveMongoOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(ReactivePanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(ReactivePanacheMongoRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(ReactivePanacheMongoRepositoryBase.class);
+    }
+
+    @Override
+    public ByteCodeType updateType() {
+        return new ByteCodeType(ReactivePanacheUpdate.class);
+    }
+
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/PanacheMongoCompanionEnhancer.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/PanacheMongoCompanionEnhancer.java
new file mode 100644
index 0000000000000..f8458635b41a0
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/PanacheMongoCompanionEnhancer.java
@@ -0,0 +1,32 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import static java.util.Collections.emptyList;
+
+import java.util.List;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+import io.quarkus.panache.common.deployment.PanacheCompanionEnhancer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor;
+
+public class PanacheMongoCompanionEnhancer extends PanacheCompanionEnhancer {
+    private final TypeBundle types;
+
+    public PanacheMongoCompanionEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers,
+            TypeBundle types) {
+        super(index, methodCustomizers);
+        this.types = types;
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
+        return new KotlinPanacheClassOperationGenerationVisitor(outputClassVisitor,
+                indexView.getClassByName(DotName.createSimple(className)), indexView, types,
+                types.entityCompanionBase(), emptyList());
+    }
+
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt
new file mode 100644
index 0000000000000..006431efe0d18
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/Book.kt
@@ -0,0 +1,167 @@
+package io.quarkus.mongodb.panache.kotlin.deployment
+
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.MongoDatabase
+import io.quarkus.mongodb.panache.PanacheUpdate
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity
+import io.quarkus.mongodb.panache.kotlin.PanacheQuery
+				import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import org.bson.Document
+import org.bson.types.ObjectId
+import java.util.stream.Stream
+
+/**
+ * This class is used by TestEnhancers to validate the bytecode generation.  Each method on PanacheMongoCompanion is
+ * manually implemented to give us a compiler generated metric against which to validate the quarkus generated bytecode.
+ * TestEnhancers further validates that all @GenerateBridge annotated methods are represented by a 'target_' method
+ * here.
+ */
+@Suppress("UNCHECKED_CAST", "unused")
+class Book : PanacheMongoEntity() {
+    companion object : PanacheMongoCompanion<Book> {
+        fun target_count(): Long
+            = INSTANCE.count(Book::class.java)
+
+        fun target_count(query: Document): Long
+            = INSTANCE.count(Book::class.java, query)
+
+        fun target_count(query: String, params: Map<String, Any?>): Long
+            = INSTANCE.count(Book::class.java, query, params)
+
+        fun target_count(query: String, params: Parameters): Long
+            = INSTANCE.count(Book::class.java, query, params)
+
+        fun target_count(query: String, vararg params: Any?): Long
+            = INSTANCE.count(Book::class.java, query, *params)
+
+        fun target_delete(query: Document): Long
+            = INSTANCE.delete(Book::class.java, query)
+
+        fun target_delete(query: String, params: Map<String, Any?>): Long
+            = INSTANCE.delete(Book::class.java, query, params)
+
+        fun target_delete(query: String, params: Parameters): Long
+            = INSTANCE.delete(Book::class.java, query, params)
+
+        fun target_delete(query: String, vararg params: Any?): Long
+            = INSTANCE.delete(Book::class.java, query, *params)
+
+        fun target_deleteAll(): Long
+            = INSTANCE.deleteAll(Book::class.java)
+
+        fun target_deleteById(id: ObjectId): Boolean
+            = INSTANCE.deleteById(Book::class.java, id)
+
+        fun target_find(query: Document): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query) as PanacheQuery<Book>
+
+        fun target_find(query: Document, sort: Document): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, sort) as PanacheQuery<Book>
+
+        fun target_find(query: String, params: Map<String, Any?>): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, params) as PanacheQuery<Book>
+
+        fun target_find(query: String, params: Parameters): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, params) as PanacheQuery<Book>
+
+        fun target_find(query: String, sort: Sort, params: Map<String, Any?>): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, sort, params) as PanacheQuery<Book>
+
+        fun target_find(query: String, sort: Sort, params: Parameters): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, sort, params) as PanacheQuery<Book>
+
+        fun target_find(query: String, sort: Sort, vararg params: Any?): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, sort, *params) as PanacheQuery<Book>
+
+        fun target_find(query: String, vararg params: Any?): PanacheQuery<Book>
+            = INSTANCE.find(Book::class.java, query, *params) as PanacheQuery<Book>
+
+        fun target_findAll(): PanacheQuery<Book>
+            = INSTANCE.findAll(Book::class.java) as PanacheQuery<Book>
+
+        fun target_findAll(sort: Sort): PanacheQuery<Book>
+            = INSTANCE.findAll(Book::class.java, sort) as PanacheQuery<Book>
+
+        fun target_findById(id: ObjectId): Book?
+            = INSTANCE.findById(Book::class.java, id) as Book?
+
+        fun target_list(query: Document): List<Book>
+            = INSTANCE.list(Book::class.java, query) as List<Book>
+
+        fun target_list(query: Document, sort: Document): List<Book>
+            = INSTANCE.list(Book::class.java, query, sort) as List<Book>
+
+        fun target_list(query: String, params: Map<String, Any?>): List<Book>
+            = INSTANCE.list(Book::class.java, query, params) as List<Book>
+
+        fun target_list(query: String, params: Parameters): List<Book>
+            = INSTANCE.list(Book::class.java, query, params) as List<Book>
+
+        fun target_list(query: String, sort: Sort, params: Map<String, Any?>): List<Book>
+            = INSTANCE.list(Book::class.java, query, sort, params) as List<Book>
+
+        fun target_list(query: String, sort: Sort, params: Parameters): List<Book>
+            = INSTANCE.list(Book::class.java, query, sort, params) as List<Book>
+
+        fun target_list(query: String, sort: Sort, vararg params: Any?): List<Book>
+            = INSTANCE.list(Book::class.java, query, sort, *params) as List<Book>
+
+        fun target_list(query: String, vararg params: Any?): List<Book>
+            = INSTANCE.list(Book::class.java, query, *params) as List<Book>
+
+        fun target_listAll(): List<Book>
+            = INSTANCE.listAll(Book::class.java) as List<Book>
+
+        fun target_listAll(sort: Sort): List<Book>
+            = INSTANCE.listAll(Book::class.java, sort) as List<Book>
+
+        fun target_mongoCollection(): MongoCollection<Book>
+            = INSTANCE.mongoCollection(Book::class.java) as MongoCollection<Book>
+
+        fun target_mongoDatabase(): MongoDatabase
+            = INSTANCE.mongoDatabase(Book::class.java)
+
+        fun target_stream(query: Document): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query) as Stream<Book>
+
+        fun target_stream(query: Document, sort: Document): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, sort) as Stream<Book>
+
+        fun target_stream(query: String, params: Map<String, Any?>): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, params) as Stream<Book>
+
+        fun target_stream(query: String, params: Parameters): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, params) as Stream<Book>
+
+        fun target_stream(query: String, sort: Sort, params: Map<String, Any?>): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, sort, params) as Stream<Book>
+
+        fun target_stream(query: String, sort: Sort, params: Parameters): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, sort, params) as Stream<Book>
+
+        fun target_stream(query: String, sort: Sort, vararg params: Any?): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, sort, *params) as Stream<Book>
+
+        fun target_stream(query: String, vararg params: Any?): Stream<Book>
+            = INSTANCE.stream(Book::class.java, query, *params) as Stream<Book>
+
+        fun target_streamAll(): Stream<Book>
+            = INSTANCE.streamAll(Book::class.java) as Stream<Book>
+
+        fun target_streamAll(sort: Sort): Stream<Book>
+            = INSTANCE.streamAll(Book::class.java, sort) as Stream<Book>
+
+        fun target_update(update: String, params: Map<String, Any?>): PanacheUpdate
+            = INSTANCE.update(Book::class.java, update, params)
+
+        fun target_update(update: String, params: Parameters): PanacheUpdate
+            = INSTANCE.update(Book::class.java, update, params)
+
+        fun target_update(update: String, vararg params: Any?): PanacheUpdate
+            = INSTANCE.update(Book::class.java, update, *params)
+
+    }
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt
new file mode 100644
index 0000000000000..f95847a96f430
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/StudentRepository.kt
@@ -0,0 +1,157 @@
+package io.quarkus.mongodb.panache.kotlin.deployment
+
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.MongoDatabase
+import io.quarkus.mongodb.panache.PanacheUpdate
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase
+import io.quarkus.mongodb.panache.kotlin.PanacheQuery
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import org.bson.Document
+import java.util.stream.Stream
+
+/**
+ * This class is used by TestEnhancers to validate the bytecode generation.  Each method on PanacheMongoRepositoryBase
+ * is manually implemented to give us a compiler generated metric against which to validate the quarkus generated
+ * bytecode. TestEnhancers further validates that all @GenerateBridge annotated methods are represented by a 'target_'
+ * method here.
+ */
+@Suppress("unused", "UNCHECKED_CAST")
+class StudentRepository : PanacheMongoRepositoryBase<Student, Long> {
+    fun target_count(): Long = INSTANCE.count(Student::class.java)
+
+    fun target_count(query: String, vararg params: Any?): Long =
+            INSTANCE.count(Student::class.java, query, *params)
+
+    fun target_count(query: String, params: Map<String, Any?>): Long =
+            INSTANCE.count(Student::class.java, query, params)
+
+    fun target_count(query: String, params: Parameters): Long =
+            INSTANCE.count(Student::class.java, query, params)
+
+    fun target_count(query: Document): Long = INSTANCE.count(Student::class.java, query)
+
+    fun target_deleteAll(): Long = INSTANCE.deleteAll(Student::class.java)
+
+    fun target_deleteById(id: Long): Boolean = INSTANCE.deleteById(Student::class.java, id)
+
+    fun target_delete(query: String, vararg params: Any?): Long =
+            INSTANCE.delete(Student::class.java, query, *params)
+
+    fun target_delete(query: String, params: Map<String, Any?>): Long =
+            INSTANCE.delete(Student::class.java, query, params)
+
+    fun target_delete(query: String, params: Parameters): Long =
+            INSTANCE.delete(Student::class.java, query, params)
+
+    fun target_delete(query: Document): Long = INSTANCE.delete(Student::class.java, query)
+
+    fun target_findById(id: Long): Student? =
+            INSTANCE.findById(Student::class.java, id) as Student?
+
+    fun target_find(query: String, vararg params: Any?): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, *params) as PanacheQuery<Student>
+
+    fun target_find(query: String, sort: Sort, vararg params: Any?): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, sort, *params) as PanacheQuery<Student>
+
+    fun target_find(query: String, params: Map<String, Any?>): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, params) as PanacheQuery<Student>
+
+    fun target_find(query: String, sort: Sort, params: Map<String, Any?>): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, sort, params) as PanacheQuery<Student>
+
+    fun target_find(query: String, params: Parameters): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, params) as PanacheQuery<Student>
+
+    fun target_find(query: String, sort: Sort, params: Parameters): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, sort, params) as PanacheQuery<Student>
+
+    fun target_find(query: Document): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query) as PanacheQuery<Student>
+
+    fun target_find(query: Document, sort: Document): PanacheQuery<Student> =
+            INSTANCE.find(Student::class.java, query, sort) as PanacheQuery<Student>
+
+    fun target_findAll(): PanacheQuery<Student> =
+            INSTANCE.findAll(Student::class.java) as PanacheQuery<Student>
+
+    fun target_findAll(sort: Sort): PanacheQuery<Student> =
+            INSTANCE.findAll(Student::class.java, sort) as PanacheQuery<Student>
+
+    fun target_list(query: String, vararg params: Any?): List<Student> =
+            INSTANCE.list(Student::class.java, query, *params) as List<Student>
+
+    fun target_list(query: String, sort: Sort, vararg params: Any?): List<Student> =
+            INSTANCE.list(Student::class.java, query, sort, *params) as List<Student>
+
+    fun target_list(query: String, params: Map<String, Any?>): List<Student> =
+            INSTANCE.list(Student::class.java, query, params) as List<Student>
+
+    fun target_list(query: String, sort: Sort, params: Map<String, Any?>): List<Student> =
+            INSTANCE.list(Student::class.java, query, sort, params) as List<Student>
+
+    fun target_list(query: String, params: Parameters): List<Student> =
+            INSTANCE.list(Student::class.java, query, params) as List<Student>
+
+    fun target_list(query: String, sort: Sort, params: Parameters): List<Student> =
+            INSTANCE.list(Student::class.java, query, sort, params) as List<Student>
+
+    fun target_list(query: Document): List<Student> =
+            INSTANCE.list(Student::class.java, query) as List<Student>
+
+    fun target_list(query: Document, sort: Document): List<Student> =
+            INSTANCE.list(Student::class.java, query, sort) as List<Student>
+
+    fun target_listAll(): List<Student> = INSTANCE.listAll(Student::class.java) as List<Student>
+
+    fun target_listAll(sort: Sort): List<Student> =
+            INSTANCE.listAll(Student::class.java, sort) as List<Student>
+
+    fun target_mongoCollection(): MongoCollection<Student> =
+            INSTANCE.mongoCollection(Student::class.java) as MongoCollection<Student>
+
+    fun target_mongoDatabase(): MongoDatabase = INSTANCE.mongoDatabase(Student::class.java)
+
+    fun target_stream(query: String, vararg params: Any?): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, *params) as Stream<Student>
+
+    fun target_stream(query: String, sort: Sort, vararg params: Any?): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, sort, *params) as Stream<Student>
+
+    fun target_stream(query: String, params: Map<String, Any?>): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, params) as Stream<Student>
+
+    fun target_stream(query: String, sort: Sort, params: Map<String, Any?>): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, sort, params) as Stream<Student>
+
+    fun target_stream(query: String, params: Parameters): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, params) as Stream<Student>
+
+    fun target_stream(query: String, sort: Sort, params: Parameters): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, sort, params) as Stream<Student>
+
+    fun target_stream(query: Document): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query) as Stream<Student>
+
+    fun target_stream(query: Document, sort: Document): Stream<Student> =
+            INSTANCE.stream(Student::class.java, query, sort) as Stream<Student>
+
+    fun target_streamAll(sort: Sort): Stream<Student> =
+            INSTANCE.streamAll(Student::class.java, sort) as Stream<Student>
+
+    fun target_streamAll(): Stream<Student> =
+            INSTANCE.streamAll(Student::class.java) as Stream<Student>
+
+    fun target_update(update: String, vararg params: Any?): PanacheUpdate =
+            INSTANCE.update(Student::class.java, update, *params)
+
+    fun target_update(update: String, params: Map<String, Any?>): PanacheUpdate =
+            INSTANCE.update(Student::class.java, update, params)
+
+    fun target_update(update: String, params: Parameters): PanacheUpdate =
+            INSTANCE.update(Student::class.java, update, params)
+}
+class Student
diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java
new file mode 100644
index 0000000000000..e06ebec92dd17
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/deployment/TestEnhancers.java
@@ -0,0 +1,192 @@
+package io.quarkus.mongodb.panache.kotlin.deployment;
+
+import static java.lang.String.format;
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.StringJoiner;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.bson.types.ObjectId;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.util.Printer;
+import org.objectweb.asm.util.Textifier;
+import org.objectweb.asm.util.TraceClassVisitor;
+
+import io.quarkus.gizmo.Gizmo;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanionBase;
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.impl.GenerateBridge;
+import io.quarkus.test.QuarkusUnitTest;
+
+@SuppressWarnings("unchecked")
+public class TestEnhancers {
+    public static final ByteCodeType CLASS = new ByteCodeType(Class.class);
+    public static final ByteCodeType OBJECT_ID = new ByteCodeType(ObjectId.class);
+    public static final ByteCodeType LONG = new ByteCodeType(long.class);
+    public static final ByteCodeType GENERATE_BRIDGE = new ByteCodeType(GenerateBridge.class);
+    public static final Pattern LABEL = Pattern.compile("^L(\\d)$");
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Book.class)
+                    .addClasses(Student.class)
+                    .addClasses(StudentRepository.class));
+
+    @Test
+    public void testCompanion() throws Exception {
+        evaluate(new ByteCodeType(Book.Companion.getClass()), new ByteCodeType(Book.class), PanacheMongoCompanionBase.class, OBJECT_ID);
+    }
+
+    @Test
+    public void testRepository() throws Exception {
+        evaluate(new ByteCodeType(StudentRepository.class), new ByteCodeType(Student.class), PanacheMongoRepositoryBase.class, LONG);
+    }
+
+    private void evaluate(ByteCodeType testClass, ByteCodeType entityType, Class<?> baseType, ByteCodeType idType) throws Exception {
+        ByteCodeType object = new ByteCodeType(Object.class);
+        Map<String, BytecodeMethod> localMethods = findLocalMethods(testClass);
+
+        Map<String, MethodNode> bridgeMethods = getBridgeMethods(baseType);
+        List<String> missing = bridgeMethods.keySet().stream()
+                .map(key -> {
+                    if (key.contains("ById")) {
+                        key = key.replace(object.descriptor(), idType.descriptor());
+                        if (key.contains("findById")) {
+                            key = key.substring(0, key.lastIndexOf(')') + 1) + entityType.descriptor();
+                        }
+                    }
+                    return "target_" + key;
+                })
+                .filter(key -> localMethods.get(key) == null)
+                .map(key -> String.format("%nCouldn't find %s in %s", key, testClass.dotName()))
+                .collect(Collectors.toList());
+        assertTrue(missing.isEmpty(), missing.toString());
+
+        localMethods.entrySet().stream()
+                .filter(e -> e.getKey().startsWith("target_"))
+                .forEach(entry -> {
+                    String key = entry.getKey().substring(7);
+                    BytecodeMethod generatedMethod = localMethods.get(key);
+                    BytecodeMethod targetMethod = entry.getValue();
+                    try {
+                        validate(key, generatedMethod.body, targetMethod.body);
+                    } catch (NullPointerException e) {
+                        throw new RuntimeException("could not find " + key);
+                    }
+                });
+    }
+
+    @NotNull
+    private Map<String, BytecodeMethod> findLocalMethods(ByteCodeType byteCodeType) throws Exception {
+        Printer printer = new Textifier();
+        String path = "/" + byteCodeType.internalName() + ".class";
+        InputStream inputStream = config.getArchiveProducer().get().get(path).getAsset().openStream();
+        new ClassReader(inputStream).accept(new TraceClassVisitor(
+                new ClassNode(Gizmo.ASM_API_VERSION), printer, null), ClassReader.EXPAND_FRAMES);
+        Map<String, BytecodeMethod> methods = new TreeMap<>();
+        ListIterator<Object> iterator = printer.text.listIterator();
+        while (iterator.hasNext()) {
+            Object t = iterator.next();
+            if (t instanceof String) {
+                String line = (String) t;
+                if (line.trim().startsWith("// access flags") && !line.contains("synthetic bridge")) {
+                    Object next = iterator.next();
+                    if (next instanceof List) {
+                        BytecodeMethod method = BytecodeMethod.parse(line, (List<Object>) next);
+                        methods.put(method.name, method);
+                    } else {
+                        iterator.previous();
+                    }
+                }
+            }
+        }
+        return methods;
+    }
+
+    private Map<String, MethodNode> getBridgeMethods(Class<?> type) throws IOException {
+        ClassNode node = new ClassNode(Gizmo.ASM_API_VERSION);
+        new ClassReader(type.getName())
+                .accept(node, ClassReader.SKIP_FRAMES);
+        Map<String, MethodNode> map = new TreeMap<>();
+        node.methods.stream()
+                .filter(m -> m.visibleAnnotations != null && m.visibleAnnotations.stream()
+                        .map(a -> a.desc)
+                        .collect(toList()).contains(GENERATE_BRIDGE.descriptor()))
+                .forEach(m -> map.put(m.name + m.desc, m));
+        return map;
+    }
+
+    private void validate(String key, List<Object> actual, List<Object> expected) {
+        assertEquals(cleanUp(expected), cleanUp(actual), format("%s does not match", key));
+    }
+
+    /**
+     * we don't generate labels, e.g., like the compiler does (it's sourcemap related) so we need to elide some lines
+     * to account for the difference.
+     *
+     * @return
+     */
+    private List<Object> cleanUp(List<Object> input) {
+        List<Object> results = new ArrayList<>(input);
+        ListIterator<Object> iterator = results.listIterator();
+        while (iterator.hasNext()) {
+            Object next = iterator.next();
+            if (next instanceof String) {
+                String line = ((String) next).trim();
+                if (line.startsWith("LINENUMBER") || LABEL.matcher(line).matches()) {
+                    iterator.remove();
+                } else if (line.startsWith("LOCALVARIABLE")) {
+                    iterator.set(line.replaceAll(" L\\d.*", "\n"));
+                } else if (line.startsWith("IFNONNULL") || line.startsWith("LDC") && line.contains("\\u2026")) {
+                    iterator.set(line.substring(0, line.indexOf(" ") + 1) + "\n");
+                }
+            }
+        }
+        return results;
+    }
+
+    private static class BytecodeMethod {
+        private final List<Object> body;
+        private final String name;
+
+        public BytecodeMethod(String name, List<Object> body) {
+            this.name = name;
+            this.body = body;
+        }
+
+        public static BytecodeMethod parse(String input, List<Object> body) {
+            String[] split = input.trim().split("\\n");
+
+            String[] nameSplit = split[split.length - 1].trim().split(" ");
+            String name = nameSplit[nameSplit.length - 1];
+
+            return new BytecodeMethod(name, body);
+        }
+
+        @Override
+        public String toString() {
+            return new StringJoiner(", ", BytecodeMethod.class.getSimpleName() + "[", "]")
+                    .add("name = " + name)
+                    .add("\nbody = " + body.toString())
+                    .toString();
+        }
+    }
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/pom.xml b/extensions/panache/mongodb-panache-kotlin/pom.xml
new file mode 100644
index 0000000000000..e8fd077f88c73
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-mongodb-panache-kotlin-parent</artifactId>
+    <name>Quarkus - MongoDB with Panache - Kotlin Parent</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/pom.xml b/extensions/panache/mongodb-panache-kotlin/runtime/pom.xml
new file mode 100644
index 0000000000000..d223080817d6c
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/pom.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-mongodb-panache-kotlin-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-mongodb-panache-kotlin</artifactId>
+    <name>Quarkus - MongoDB with Panache - Kotlin Runtime</name>
+    <description>Simplify your persistence code for MongoDB via the active record or the repository pattern</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-common</artifactId>
+        </dependency>
+        <!-- This is optional to avoid pulling libraries if jax-rs/jsonb is not on the path-->
+        <!-- But needed to provides default serializer/deserializer for JsonB -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- This is optional to avoid pulling libraries if jackson is not on the path-->
+        <!-- But needed to provides default serializer/deserializer for Jackson -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-common-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.gizmo</groupId>
+            <artifactId>gizmo</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>jcenter</id>
+            <name>JCenter</name>
+            <url>https://jcenter.bintray.com/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <!-- The entity classes needs to be indexed -->
+            <plugin>
+                <groupId>org.jboss.jandex</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/main/java</source>
+                                <source>src/main/kotlin</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/test/java</source>
+                                <source>src/test/kotlin</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <javaParameters>true</javaParameters>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>testCompile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+                <version>0.10.1</version>
+                <executions>
+                    <execution>
+                        <id>javadoc</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>dokka</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputFormat>html</outputFormat>
+                    <sourceDirectories>
+                        <sourceDirectory>src/main/java</sourceDirectory>
+                        <sourceDirectory>src/main/kotlin</sourceDirectory>
+                    </sourceDirectories>
+                    <externalDocumentationLinks>
+                        <link>
+                            <!-- Root URL of the generated documentation to link with. The trailing slash is required! -->
+                            <url>https://docs.oracle.com/javase/8/docs/api/</url>
+                            <packageListUrl>https://docs.oracle.com/javase/8/docs/api/package-list</packageListUrl>
+                        </link>
+                    </externalDocumentationLinks>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/java/io/quarkus/mongodb/panache/kotlin/reactive/runtime/ReactivePanacheQueryImpl.java b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/java/io/quarkus/mongodb/panache/kotlin/reactive/runtime/ReactivePanacheQueryImpl.java
new file mode 100644
index 0000000000000..6a763eac8624a
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/java/io/quarkus/mongodb/panache/kotlin/reactive/runtime/ReactivePanacheQueryImpl.java
@@ -0,0 +1,133 @@
+package io.quarkus.mongodb.panache.kotlin.reactive.runtime;
+
+import java.util.List;
+
+import org.bson.conversions.Bson;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.model.Collation;
+
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheQuery;
+import io.quarkus.mongodb.panache.reactive.runtime.CommonReactivePanacheQueryImpl;
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
+import io.quarkus.panache.common.Page;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+@SuppressWarnings("unchecked")
+public class ReactivePanacheQueryImpl<Entity> implements ReactivePanacheQuery<Entity> {
+    private final CommonReactivePanacheQueryImpl<Entity> delegate;
+
+    ReactivePanacheQueryImpl(ReactiveMongoCollection<? extends Entity> collection, Bson mongoQuery, Bson sort) {
+        this.delegate = new CommonReactivePanacheQueryImpl<>(collection, mongoQuery, sort);
+    }
+
+    private ReactivePanacheQueryImpl(CommonReactivePanacheQueryImpl<Entity> delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public <T> ReactivePanacheQuery<T> project(Class<T> type) {
+        return new ReactivePanacheQueryImpl<>(delegate.project(type));
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public ReactivePanacheQuery<Entity> page(Page page) {
+        delegate.page(page);
+        return this;
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> page(int pageIndex, int pageSize) {
+        return page(Page.of(pageIndex, pageSize));
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> nextPage() {
+        delegate.nextPage();
+        return this;
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> previousPage() {
+        delegate.previousPage();
+        return this;
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> firstPage() {
+        delegate.firstPage();
+        return this;
+    }
+
+    @Override
+    public Uni<ReactivePanacheQuery<Entity>> lastPage() {
+        Uni<CommonReactivePanacheQueryImpl<Entity>> uni = delegate.lastPage();
+        return uni.map(q -> this);
+    }
+
+    @Override
+    public Uni<Boolean> hasNextPage() {
+        return delegate.hasNextPage();
+    }
+
+    @Override
+    public boolean hasPreviousPage() {
+        return delegate.hasPreviousPage();
+    }
+
+    @Override
+    public Uni<Integer> pageCount() {
+        return delegate.pageCount();
+    }
+
+    @Override
+    public Page page() {
+        return delegate.page();
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> range(int startIndex, int lastIndex) {
+        delegate.range(startIndex, lastIndex);
+        return this;
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> withCollation(Collation collation) {
+        delegate.withCollation(collation);
+        return this;
+    }
+
+    @Override
+    public ReactivePanacheQuery<Entity> withReadPreference(ReadPreference readPreference) {
+        delegate.withReadPreference(readPreference);
+        return this;
+    }
+
+    @Override
+    public Uni<Long> count() {
+        return delegate.count();
+    }
+
+    @Override
+    public Uni<List<Entity>> list() {
+        return delegate.list();
+    }
+
+    @Override
+    public Multi<Entity> stream() {
+        return delegate.stream();
+    }
+
+    @Override
+    public Uni<Entity> firstResult() {
+        return delegate.firstResult();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Uni<Entity> singleResult() {
+        return delegate.singleResult();
+    }
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/java/io/quarkus/mongodb/panache/kotlin/runtime/PanacheQueryImpl.java b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/java/io/quarkus/mongodb/panache/kotlin/runtime/PanacheQueryImpl.java
new file mode 100644
index 0000000000000..29ef0719bece6
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/java/io/quarkus/mongodb/panache/kotlin/runtime/PanacheQueryImpl.java
@@ -0,0 +1,132 @@
+package io.quarkus.mongodb.panache.kotlin.runtime;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.bson.conversions.Bson;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Collation;
+
+import io.quarkus.mongodb.panache.kotlin.PanacheQuery;
+import io.quarkus.mongodb.panache.runtime.CommonPanacheQueryImpl;
+import io.quarkus.panache.common.Page;
+
+public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {
+    private final CommonPanacheQueryImpl<Entity> delegate;
+
+    PanacheQueryImpl(MongoCollection<? extends Entity> collection, Bson mongoQuery, Bson sort) {
+        this.delegate = new CommonPanacheQueryImpl<>(collection, mongoQuery, sort);
+    }
+
+    private PanacheQueryImpl(CommonPanacheQueryImpl<Entity> delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public <T> PanacheQuery<T> project(Class<T> type) {
+        return new PanacheQueryImpl<>(delegate.project(type));
+    }
+
+    @Override
+    public PanacheQuery<Entity> page(Page page) {
+        delegate.page(page);
+        return this;
+    }
+
+    @Override
+    public PanacheQuery<Entity> page(int pageIndex, int pageSize) {
+        return page(Page.of(pageIndex, pageSize));
+    }
+
+    @Override
+    public PanacheQuery<Entity> nextPage() {
+        delegate.nextPage();
+        return this;
+    }
+
+    @Override
+    public PanacheQuery<Entity> previousPage() {
+        delegate.previousPage();
+        return this;
+    }
+
+    @Override
+    public PanacheQuery<Entity> firstPage() {
+        delegate.firstPage();
+        return this;
+    }
+
+    @Override
+    public PanacheQuery<Entity> lastPage() {
+        delegate.lastPage();
+        return this;
+    }
+
+    @Override
+    public boolean hasNextPage() {
+        return delegate.hasNextPage();
+    }
+
+    @Override
+    public boolean hasPreviousPage() {
+        return delegate.hasPreviousPage();
+    }
+
+    @Override
+    public int pageCount() {
+        return delegate.pageCount();
+    }
+
+    @Override
+    public Page page() {
+        return delegate.page();
+    }
+
+    @Override
+    public PanacheQuery<Entity> range(int startIndex, int lastIndex) {
+        delegate.range(startIndex, lastIndex);
+        return this;
+    }
+
+    @Override
+    public PanacheQuery<Entity> withCollation(Collation collation) {
+        delegate.withCollation(collation);
+        return this;
+    }
+
+    @Override
+    public PanacheQuery<Entity> withReadPreference(ReadPreference readPreference) {
+        delegate.withReadPreference(readPreference);
+        return this;
+    }
+
+    // Results
+
+    @Override
+    public long count() {
+        return delegate.count();
+    }
+
+    @Override
+    public List<Entity> list() {
+        return delegate.list();
+    }
+
+    @Override
+    public Stream<Entity> stream() {
+        return delegate.stream();
+    }
+
+    @Override
+    public Entity firstResult() {
+        return delegate.firstResult();
+    }
+
+    @Override
+    public Entity singleResult() {
+        return delegate.singleResult();
+    }
+
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoCompanion.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoCompanion.kt
new file mode 100644
index 0000000000000..ea00195eaebc2
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoCompanion.kt
@@ -0,0 +1,703 @@
+package io.quarkus.mongodb.panache.kotlin
+
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.MongoDatabase
+import io.quarkus.mongodb.panache.PanacheUpdate
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import io.quarkus.panache.common.impl.GenerateBridge
+import org.bson.Document
+import org.bson.types.ObjectId
+import java.util.stream.Stream
+
+/**
+ * Define persistence and query methods for an Entity with a default ID type of [ObjectId]
+ *
+ * @param Entity the entity type
+ */
+interface PanacheMongoCompanion<Entity : PanacheMongoEntityBase>: PanacheMongoCompanionBase<Entity, ObjectId>
+
+/**
+ * Define persistence and query methods for an Entity with a type of Id
+ *
+ * @param Entity the entity type
+ * @param Id the ID type
+ */
+interface PanacheMongoCompanionBase<Entity : PanacheMongoEntityBase, Id: Any> {
+    /**
+     * Find an entity of this type by ID.
+     *
+     * @param id the ID of the entity to find.
+     * @return the entity found, or `null` if not found.
+     */
+    @GenerateBridge(targetReturnTypeErased = true)
+    fun findById(id: Id): Entity? = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, vararg params: Any?): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, vararg params: Any?): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Map<String, Any?>): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Map<String, Any?>): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params Parameters of named parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Parameters): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params Parameters of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Parameters): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     *
+     * @param query a query string
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document, sort: Document): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     *
+     * @return a new [PanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     *
+     * @param sort the sort order to use
+     * @return a new [PanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(sort: Sort): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, vararg params: Any?): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, vararg params: Any?): List<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Map<String, Any?>): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Map<String, Any?>): List<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params Parameters of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Parameters): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params Parameters of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Parameters): List<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).list()`.
+     *
+     * @param query a query document
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).list()`.
+     *
+     * @param query a query document
+     * @param sort the sort document
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document, sort: Document): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().list()`.
+     *
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).list()`.
+     *
+     * @param sort the sort order to use
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(sort: Sort): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, vararg params: Any?): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, vararg params: Any?): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Map<String, Any?>): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Map<String, Any?>): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params Parameters of named parameters
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Parameters): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params Parameters of indexed parameters
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Parameters): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).stream()`.
+     *
+     * @param query a query Document
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: Document): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).stream()`.
+     *
+     * @param query a query Document
+     * @param sort the sort strategy to use
+     * @return a Stream containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: Document, sort: Document): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().stream()`.
+     *
+     * @return a Stream containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).stream()`.
+     *
+     * @param sort the sort order to use
+     * @return a Stream containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(sort: Sort): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity in the database.
+     *
+     * @return the number of this type of entity in the database.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, vararg params: Any?): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Map<String, Any?>): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query with named parameters.
+     *
+     * @param query a query string
+     * @param params Parameters of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Parameters): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query
+     *
+     * @param query a query document
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: Document): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type from the database.
+     *
+     * @return the number of entities deleted.
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun deleteAll(): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, vararg params: Any?): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Map<String, Any?>): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params Parameters of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Parameters): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query
+     *
+     * @param query a query document
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: Document): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete an entity of this type by ID.
+     *
+     * @param id the ID of the entity to delete.
+     * @return false if the entity was not deleted (not found).
+     */
+    @GenerateBridge
+    fun deleteById(id: Id): Boolean = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Insert all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(entities: Iterable<Entity>) = INSTANCE.persist(entities)
+
+    /**
+     * Insert all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(entities: Stream<Entity>) = INSTANCE.persist(entities)
+
+    /**
+     * Insert all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(firstEntity: Entity, vararg entities: Entity) = INSTANCE.persist(firstEntity, *entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(entities: Iterable<Entity>) = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [update]
+     */
+    fun update(entities: Stream<Entity>) = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(firstEntity: Entity, vararg entities: Entity) = INSTANCE.update(firstEntity, *entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Iterable<Entity>) = INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Stream<Entity>) = INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(firstEntity: Entity, vararg entities: Entity) = INSTANCE.persistOrUpdate(firstEntity, *entities)
+
+    /**
+     * Update all entities of this type using the given update document with optional indexed parameters.
+     * The returned [PanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params optional sequence of indexed parameters
+     * @return a new [PanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, vararg params: Any?): PanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document with named parameters.
+     * The returned [PanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     *
+     * @param params map of named parameters
+     * @return a new [PanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Map<String, Any?>): PanacheUpdate =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [PanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     *
+     * @param params [Parameters] of named parameters
+     * @return a new [PanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Parameters): PanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Collection.
+     *
+     * @return the [MongoCollection] used by this entity
+     */
+    @GenerateBridge
+    fun mongoCollection(): MongoCollection<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Database.
+     *
+     * @return the [MongoDatabase] used by this entity
+     */
+    @GenerateBridge
+    fun mongoDatabase(): MongoDatabase = throw INSTANCE.implementationInjectionMissing()
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt
new file mode 100755
index 0000000000000..3207db347a654
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntity.kt
@@ -0,0 +1,31 @@
+package io.quarkus.mongodb.panache.kotlin
+
+import org.bson.types.ObjectId
+
+/**
+ * Represents an entity with a generated ID field [id] of type [ObjectId]. If your
+ * Mongo entities extend this class they gain the ID field and auto-generated accessors
+ * to all their public fields, as well as all the useful methods from [PanacheMongoEntityBase].
+ *
+ * If you want a custom ID type or strategy, you can directly extend [PanacheMongoEntityBase]
+ * instead, and write your own ID field. You will still get auto-generated accessors and
+ * all the useful methods.
+ *
+ * @see PanacheMongoEntityBase
+ */
+abstract class PanacheMongoEntity : PanacheMongoEntityBase() {
+    /**
+     * The auto-generated ID field.
+     * This field is set by Mongo when this entity is persisted.
+     *
+     * @see [PanacheMongoEntityBase.persist]
+     */
+    var id: ObjectId? = null
+
+    /**
+     * Default toString() implementation
+     *
+     * @return the class type and ID type
+     */
+    override fun toString(): String = "${this.javaClass.simpleName}<$id>"
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt
new file mode 100755
index 0000000000000..acc1ef36a3bcb
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoEntityBase.kt
@@ -0,0 +1,51 @@
+package io.quarkus.mongodb.panache.kotlin
+
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE
+
+/**
+ * Represents an entity. If your Mongo entities extend this class they gain auto-generated accessors
+ * to all their public fields, as well as a lot of useful methods. Unless you have a custom ID strategy, you
+ * should not extend this class directly but extend [PanacheMongoEntity] instead.
+ *
+ * @see PanacheMongoEntity
+ */
+@Suppress("unused")
+abstract class PanacheMongoEntityBase {
+
+    /**
+     * Persist this entity in the database.  This will set its ID field if not already set.
+     *
+     * @see [persist]
+     */
+    fun persist() {
+        INSTANCE.persist(this)
+    }
+
+    /**
+     * Update this entity in the database.
+     *
+     * @see [update]
+     */
+    fun update() {
+        INSTANCE.update(this)
+    }
+
+    /**
+     * Persist this entity in the database or update it if it already exists.
+     *
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate() {
+        INSTANCE.persistOrUpdate(this)
+    }
+
+    /**
+     * Delete this entity from the database if it is already persisted.
+     *
+     * @see [delete]
+     * @see [PanacheMongoCompanionBase.deleteAll]
+     */
+    fun delete() {
+        INSTANCE.delete(this)
+    }
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt
new file mode 100755
index 0000000000000..f4e044fc1fd9c
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepository.kt
@@ -0,0 +1,13 @@
+package io.quarkus.mongodb.panache.kotlin
+
+import org.bson.types.ObjectId
+
+/**
+ * Represents a Repository for a specific type of entity `Entity`, with an ID type
+ * of `ObjectId`. Implementing this repository will gain you the exact same useful methods
+ * that are on [PanacheMongoEntityBase]. If you have a custom ID strategy, you should
+ * implement [PanacheMongoRepositoryBase] instead.
+ *
+ * @param Entity The type of entity to operate on
+ */
+interface PanacheMongoRepository<Entity: Any> : PanacheMongoRepositoryBase<Entity, ObjectId>
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt
new file mode 100755
index 0000000000000..ca61bbf8301a3
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheMongoRepositoryBase.kt
@@ -0,0 +1,728 @@
+@file:Suppress("unused")
+
+package io.quarkus.mongodb.panache.kotlin
+
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.MongoDatabase
+import io.quarkus.mongodb.panache.PanacheUpdate
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import io.quarkus.panache.common.impl.GenerateBridge
+import org.bson.Document
+import java.util.stream.Stream
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE
+
+/**
+ * Represents a Repository for a specific type of entity `Entity`, with an ID type
+ * of `Id`. Implementing this repository will gain you the exact same useful methods
+ * that are on [PanacheMongoEntityBase]. Unless you have a custom ID strategy, you should not
+ * implement this interface directly but implement [PanacheMongoRepository] instead.
+ *
+ * @param Entity The type of entity to operate on
+ * @param Id The ID type of the entity
+ * @see PanacheMongoRepository<Id><Entity>
+ */
+interface PanacheMongoRepositoryBase<Entity: Any, Id: Any> {
+    /**
+     * Persist the given entity in the database.
+     * This will set it's ID field if not already set.
+     *
+     * @param entity the entity to insert.
+     * @see [persist]
+     */
+    fun persist(entity: Entity) = INSTANCE.persist(entity)
+
+    /**
+     * Update the given entity in the database.
+     *
+     * @param entity the entity to update.
+     * @see [update]
+     */
+    fun update(entity: Entity) = INSTANCE.update(entity)
+
+    /**
+     * Persist the given entity in the database or update it if it already exist.
+     *
+     * @param entity the entity to update.
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entity: Entity) = INSTANCE.persistOrUpdate(entity)
+
+    /**
+     * Delete the given entity from the database, if it is already persisted.
+     *
+     * @param entity the entity to delete.
+     * @see [delete]
+     * @see [deleteAll]
+     */
+    fun delete(entity: Entity) = INSTANCE.delete(entity)
+
+    /**
+     * Find an entity of this type by ID.
+     *
+     * @param id the ID of the entity to find.
+     * @return the entity found, or `null` if not found.
+     */
+    @GenerateBridge(targetReturnTypeErased = true)
+    fun findById(id: Id): Entity? = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, vararg params: Any?): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, vararg params: Any?): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Map<String, Any?>): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Map<String, Any?>): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Parameters): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Parameters): PanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     *
+     * @param query a [Document] query
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a new [PanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document, sort: Document): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     *
+     * @return a new [PanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     *
+     * @param sort the sort order to use
+     * @return a new [PanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(sort: Sort): PanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, vararg params: Any?): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, vararg params: Any?): List<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Map<String, Any?>): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Map<String, Any?>): List<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Parameters): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Parameters): List<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).list()`.
+     *
+     * @param query a [Document] query
+     * @return a [List] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).list()`.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a [List] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document, sort: Document): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().list()`.
+     *
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).list()`.
+     *
+     * @param sort the sort order to use
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(sort: Sort): List<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [Stream] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, vararg params: Any?): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [Stream] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, vararg params: Any?): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [Stream] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Map<String, Any?>): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [Stream] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Map<String, Any?>): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a [Stream] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Parameters): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a [Stream] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Parameters): Stream<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).stream()`.
+     *
+     * @param query a [Document] query
+     * @return a [Stream] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun stream(query: Document): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).stream()`.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a [Stream] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun stream(query: Document, sort: Document): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().stream()`.
+     *
+     * @return a [Stream] containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(sort: Sort): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).stream()`.
+     *
+     * @return a [Stream] containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(): Stream<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity in the database.
+     *
+     * @return the number of this type of entity in the database.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, vararg params: Any?): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Map<String, Any?>): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Parameters): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query
+     *
+     * @param query a [Document] query
+     * @return he number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: Document): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type from the database.
+     *
+     * @return the number of entities deleted.
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun deleteAll(): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete an entity of this type by ID.
+     *
+     * @param id the ID of the entity to delete.
+     * @return false if the entity was not deleted (not found).
+     */
+    @GenerateBridge
+    fun deleteById(id: Id): Boolean = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, vararg params: Any?): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Map<String, Any?>): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Parameters): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query
+     *
+     * @param query a [Document] query
+     * @return he number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun delete(query: Document): Long = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(entities: Iterable<Entity>) = INSTANCE.persist(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(entities: Stream<Entity>) = INSTANCE.persist(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(firstEntity: Entity, vararg entities: Entity) = INSTANCE.persist(firstEntity, *entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(entities: Iterable<Entity>) = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(entities: Stream<Entity>) = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(firstEntity: Entity, vararg entities: Entity) = INSTANCE.update(firstEntity, *entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Iterable<Entity>) = INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Stream<Entity>) = INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun persistOrUpdate(firstEntity: Entity, vararg entities: Entity) =
+            INSTANCE.persistOrUpdate(firstEntity, *entities)
+
+    /**
+     * Update all entities of this type by the given update document, with optional indexed parameters.
+     * The returned [PanacheUpdate] object will allow to restrict on which documents the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params optional sequence of indexed parameters
+     * @return a new [PanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, vararg params: Any?): PanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [PanacheUpdate] object will allow to restrict on which documents the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params [Map] of named parameters
+     * @return a new [PanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Map<String, Any?>): PanacheUpdate =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [PanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params [Parameters] of named parameters
+     * @return a new [PanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Parameters): PanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Collection
+     */
+    @GenerateBridge
+    fun mongoCollection(): MongoCollection<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Database.
+     */
+    @GenerateBridge
+    fun mongoDatabase(): MongoDatabase = throw INSTANCE.implementationInjectionMissing()
+}
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheQuery.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheQuery.kt
new file mode 100644
index 0000000000000..bd89d9206f3db
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/PanacheQuery.kt
@@ -0,0 +1,197 @@
+package io.quarkus.mongodb.panache.kotlin
+
+import com.mongodb.ReadPreference
+import com.mongodb.client.model.Collation
+import io.quarkus.panache.common.Page
+import io.quarkus.panache.common.exception.PanacheQueryException
+import java.util.stream.Stream
+
+/**
+ * Interface representing an entity query, which abstracts the use of paging, getting the number of results, and
+ * operating on [List] or [Stream].
+ *
+ * Instances of this interface cannot mutate the query itself or its parameters: only paging information can be
+ * modified, and instances of this interface can be reused to obtain multiple pages of results.
+ *
+ * @param Entity The entity type being queried
+ */
+interface PanacheQuery<Entity: Any> {
+    /**
+     * Defines a projection class: the getters, and the public fields, will be used to restrict which fields should be
+     * retrieved from the database.
+     *
+     * @return a new query with the same state as the previous one (params, page, range, ...).
+     */
+    fun <NewEntity: Any> project(type: Class<NewEntity>): PanacheQuery<NewEntity>
+
+    /**
+     * Sets the current page.
+     *
+     * @param page the new page
+     * @return this query, modified
+     * @see .page
+     * @see .page
+     */
+    fun page(page: Page): PanacheQuery<Entity>
+
+    /**
+     * Sets the current page.
+     *
+     * @param pageIndex the page index
+     * @param pageSize the page size
+     * @return this query, modified
+     * @see .page
+     * @see .page
+     */
+    fun page(pageIndex: Int, pageSize: Int): PanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the next page
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .previousPage
+     */
+    fun nextPage(): PanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the previous page (or the first page if there is no previous page)
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .nextPage
+     */
+    fun previousPage(): PanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the first page
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .lastPage
+     */
+    fun firstPage(): PanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the last page. This will cause reading of the entity count.
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .firstPage
+     * @see .count
+     */
+    fun lastPage(): PanacheQuery<Entity>
+
+    /**
+     * Returns true if there is another page to read after the current one.
+     * This will cause reading of the entity count.
+     *
+     * @return true if there is another page to read
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .hasPreviousPage
+     * @see .count
+     */
+    fun hasNextPage(): Boolean
+
+    /**
+     * Returns true if there is a page to read before the current one.
+     *
+     * @return true if there is a previous page to read
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .hasNextPage
+     */
+    fun hasPreviousPage(): Boolean
+
+    /**
+     * Returns the total number of pages to be read using the current page size.
+     * This will cause reading of the entity count.
+     *
+     * @return the total number of pages to be read using the current page size.
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     */
+    fun pageCount(): Int
+
+    /**
+     * Returns the current page.
+     *
+     * @return the current page
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see .page
+     * @see .page
+     */
+    fun page(): Page
+
+    /**
+     * Switch the query to use a fixed range (start index - last index) instead of a page.
+     * As the range is fixed, subsequent pagination of the query is not possible.
+     *
+     * @param startIndex the index of the first element, starting at 0
+     * @param lastIndex the index of the last element
+     * @return this query, modified
+     */
+    fun range(startIndex: Int, lastIndex: Int): PanacheQuery<Entity>
+
+    /**
+     * Define the collation used for this query.
+     *
+     * @param collation the collation to be used for this query.
+     * @return this query, modified
+     */
+    fun withCollation(collation: Collation): PanacheQuery<Entity>
+
+    /**
+     * Define the read preference used for this query.
+     *
+     * @param readPreference the read preference to be used for this query.
+     * @return this query, modified
+     */
+    fun withReadPreference(readPreference: ReadPreference?): PanacheQuery<Entity>
+
+    // Results
+    /**
+     * Reads and caches the total number of entities this query operates on. This causes a database
+     * query with `SELECT COUNT(*)` and a query equivalent to the current query, minus
+     * ordering.
+     *
+     * @return the total number of entities this query operates on, cached.
+     */
+    fun count(): Long
+
+    /**
+     * Returns the current page of results as a [List].
+     *
+     * @return the current page of results as a [List].
+     * @see .stream
+     * @see .page
+     * @see .page
+     */
+    fun list(): List<Entity>
+
+    /**
+     * Returns the current page of results as a [Stream].
+     *
+     * @return the current page of results as a [Stream].
+     * @see .list
+     * @see .page
+     * @see .page
+     */
+    fun stream(): Stream<Entity>
+
+    /**
+     * Returns the first result of the current page index. This ignores the current page size to fetch
+     * a single result.
+     *
+     * @return the first result of the current page index, or null if there are no results.
+     * @see .singleResult
+     */
+    fun firstResult(): Entity?
+
+    /**
+     * Executes this query for the current page and return a single result.
+     *
+     * @return the single result
+     * @throws PanacheQueryException if there is not exactly one result.
+     * @see .firstResult
+     */
+    fun singleResult(): Entity?
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoCompanion.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoCompanion.kt
new file mode 100644
index 0000000000000..ee54a438afa79
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoCompanion.kt
@@ -0,0 +1,771 @@
+package io.quarkus.mongodb.panache.kotlin.reactive
+
+import io.quarkus.mongodb.panache.kotlin.reactive.runtime.KotlinReactiveMongoOperations.Companion.INSTANCE
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection
+import io.quarkus.mongodb.reactive.ReactiveMongoDatabase
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import io.quarkus.panache.common.impl.GenerateBridge
+import io.smallrye.mutiny.Multi
+import io.smallrye.mutiny.Uni
+import org.bson.Document
+import org.bson.types.ObjectId
+import java.util.stream.Stream
+
+/**
+ * Define persistence and query methods for an Entity with a default ID type of [ObjectId]
+ *
+ * @param Entity the entity type
+ */
+interface ReactivePanacheMongoCompanion<Entity : ReactivePanacheMongoEntityBase>
+    : ReactivePanacheMongoCompanionBase<Entity, ObjectId>
+
+/**
+ * Define persistence and query methods for an Entity with a type of Id
+ *
+ * @param Entity the entity type
+ * @param Id the ID type
+ */
+interface ReactivePanacheMongoCompanionBase<Entity : ReactivePanacheMongoEntityBase, Id: Any> {
+    /**
+     * Find an entity of this type by ID.
+     *
+     * @param id the ID of the entity to find.
+     * @return the entity found, or `null` if not found.
+     */
+    @GenerateBridge
+    fun findById(id: Id): Uni<Entity?> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, vararg params: Any?): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, vararg params: Any?): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Map<String, Any?>): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Map<String, Any?>): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Parameters): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Parameters): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     *
+     * @param query a [Document] query
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [list]
+     * @see [stream]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [list]
+     * @see [stream]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document, sort: Document): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     *
+     * @return a new [ReactivePanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     *
+     * @param sort the sort order to use
+     * @return a new [ReactivePanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(sort: Sort): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [list]
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, vararg params: Any?): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [list]
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, vararg params: Any?): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [list]
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Map<String, Any?>): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [list]
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Map<String, Any?>): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [list]
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Parameters): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [list]
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Parameters): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).list()`.
+     *
+     * @param query a [Document] query
+     * @return a [List] containing all results, without paging
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).list()`.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a [List] containing all results, without paging
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document, sort: Document): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().list()`.
+     *
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).list()`.
+     *
+     * @param sort the sort order to use
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(sort: Sort): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [stream]
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, vararg params: Any?): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [stream]
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, vararg params: Any?): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [stream]
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Map<String, Any?>): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [stream]
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Map<String, Any?>): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [stream]
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Parameters): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [stream]
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Parameters): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).stream()`.
+     *
+     * @param query a [Document] query
+     * @return a [Multi] containing all results, without paging
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun stream(query: Document): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).stream()`.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a [Multi] containing all results, without paging
+     * @see [find]
+     * @see [find]
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun stream(query: Document, sort: Document): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().stream()`.
+     *
+     * @return a [Multi] containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).stream()`.
+     *
+     * @param sort the sort order to use
+     * @return a [Multi] containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(sort: Sort): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity in the database.
+     *
+     * @return the number of this type of entity in the database.
+     * @see [count]
+     * @see [count]
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities counted.
+     * @see [count]
+     * @see [count]
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, vararg params: Any?): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     * @see [count]
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Map<String, Any?>): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     * @see [count]
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Parameters): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query
+     *
+     * @param query a [Document] query
+     * @return he number of entities counted.
+     * @see [count]
+     * @see [count]
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: Document): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type from the database.
+     *
+     * @return the number of entities deleted.
+     * @see [delete]
+     * @see [delete]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun deleteAll(): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete an entity of this type by ID.
+     *
+     * @param id the ID of the entity to delete.
+     * @return false if the entity was not deleted (not found).
+     */
+    @GenerateBridge
+    fun deleteById(id: Id): Uni<Boolean> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, vararg params: Any?): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Map<String, Any?>): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Parameters): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query
+     *
+     * @param query a [Document] query
+     * @return he number of entities counted.
+     * @see [count]
+     * @see [count]
+     * @see [count]
+     */
+    @GenerateBridge
+    fun delete(query: Document): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Insert all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     * @see [persist]
+     * @see [persist]
+     */
+    fun persist(entities: Iterable<Entity>): Uni<Void> = INSTANCE.persist(entities)
+
+    /**
+     * Insert all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     * @see [persist]
+     * @see [persist]
+     */
+    fun persist(entities: Stream<Entity>): Uni<Void> = INSTANCE.persist(entities)
+
+    /**
+     * Insert all given entities.
+     *
+     * @param entities the entities to update
+     * @see [persist]
+     * @see [persist]
+     * @see [persist]
+     */
+    fun persist(firstEntity: Entity, vararg entities: Entity): Uni<Void> = INSTANCE.persist(firstEntity, *entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     * @see [update]
+     * @see [update]
+     */
+    fun update(entities: Iterable<Entity>): Uni<Void> = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [update]
+     * @see [update]
+     * @see [update]
+     */
+    fun update(entities: Stream<Entity>): Uni<Void> = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     * @see [update]
+     * @see [update]
+     */
+    fun update(firstEntity: Entity, vararg entities: Entity): Uni<Void> = INSTANCE.update(firstEntity, *entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     * @see [persistOrUpdate]
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Iterable<Entity>): Uni<Void> = INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persistOrUpdate]
+     * @see [persistOrUpdate]
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Stream<Entity>): Uni<Void> = INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     * @see [persistOrUpdate]
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(firstEntity: Entity, vararg entities: Entity): Uni<Void> =
+            INSTANCE.persistOrUpdate(firstEntity, *entities)
+
+    /**
+     * Update all entities of this type by the given update document, with optional indexed parameters.
+     * The returned [ReactivePanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params optional sequence of indexed parameters
+     * @return a new [ReactivePanacheUpdate] instance for the given update document
+     * @see [update]
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, vararg params: Any?): ReactivePanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [ReactivePanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params [Map] of named parameters
+     * @return a new [ReactivePanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Map<String, Any?>): ReactivePanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [ReactivePanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params [Parameters] of named parameters
+     * @return a new [ReactivePanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Parameters): ReactivePanacheUpdate = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Collection.
+     */
+    @GenerateBridge
+    fun mongoCollection(): ReactiveMongoCollection<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Database.
+     */
+    @GenerateBridge
+    fun mongoDatabase(): ReactiveMongoDatabase = throw INSTANCE.implementationInjectionMissing()
+
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoEntity.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoEntity.kt
new file mode 100644
index 0000000000000..2c886d900a7e7
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoEntity.kt
@@ -0,0 +1,31 @@
+package io.quarkus.mongodb.panache.kotlin.reactive
+
+import org.bson.types.ObjectId
+
+/**
+ * Represents an entity with a generated ID field [id] of type [ObjectId]. If your
+ * Mongo entities extend this class they gain the ID field and auto-generated accessors
+ * to all their public fields, as well as all the useful methods from [ReactivePanacheMongoEntityBase].
+ *
+ * If you want a custom ID type or strategy, you can directly extend [ReactivePanacheMongoEntityBase]
+ * instead, and write your own ID field. You will still get auto-generated accessors and
+ * all the useful methods.
+ *
+ * @see ReactivePanacheMongoEntityBase
+ */
+abstract class ReactivePanacheMongoEntity : ReactivePanacheMongoEntityBase() {
+    /**
+     * The auto-generated ID field.
+     * This field is set by Mongo when this entity is persisted.
+     *
+     * @see [persist]
+     */
+    var id: ObjectId? = null
+
+    /**
+     * Default toString() implementation
+     *
+     * @return the class type and ID type
+     */
+    override fun toString(): String = "${javaClass.simpleName}<$id>"
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoEntityBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoEntityBase.kt
new file mode 100644
index 0000000000000..eaf6b08de73c6
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoEntityBase.kt
@@ -0,0 +1,44 @@
+package io.quarkus.mongodb.panache.kotlin.reactive
+
+import io.quarkus.mongodb.panache.kotlin.reactive.runtime.KotlinReactiveMongoOperations.Companion.INSTANCE
+import io.smallrye.mutiny.Uni
+
+/**
+ * Represents an entity. If your Mongo entities extend this class they gain auto-generated accessors
+ * to all their public fields, as well as a lot of useful
+ * methods. Unless you have a custom ID strategy, you should not extend this class directly but extend
+ * [ReactivePanacheMongoEntity] instead.
+ *
+ * @see [ReactivePanacheMongoEntity]
+ */
+abstract class ReactivePanacheMongoEntityBase {
+    /**
+     * Persist this entity in the database.
+     * This will set it's ID field if not already set.
+     *
+     * @see [persist]
+     */
+    fun persist(): Uni<Void> = INSTANCE.persist(this)
+
+    /**
+     * Update this entity in the database.
+     *
+     * @see [update]
+     */
+    fun update(): Uni<Void> = INSTANCE.update(this)
+
+    /**
+     * Persist this entity in the database or update it if it already exist.
+     *
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(): Uni<Void> = INSTANCE.persistOrUpdate(this)
+
+    /**
+     * Delete this entity from the database, if it is already persisted.
+     *
+     * @see [delete]
+     * @see [ReactivePanacheMongoCompanionBase.deleteAll]
+     */
+    fun delete(): Uni<Void> = INSTANCE.delete(this)
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoRepository.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoRepository.kt
new file mode 100644
index 0000000000000..c0a15bec86fe3
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoRepository.kt
@@ -0,0 +1,13 @@
+package io.quarkus.mongodb.panache.kotlin.reactive
+
+import org.bson.types.ObjectId
+
+/**
+ * Represents a Repository for a specific type of entity `Entity`, with an ID type
+ * of `ObjectId`. Implementing this repository will gain you the exact same useful methods
+ * that are on [ReactivePanacheMongoEntityBase]. If you have a custom ID strategy, you should
+ * implement [ReactivePanacheMongoRepositoryBase] instead.
+ *
+ * @param Entity The type of entity to operate on
+ */
+interface ReactivePanacheMongoRepository<Entity: Any> : ReactivePanacheMongoRepositoryBase<Entity, ObjectId>
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoRepositoryBase.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoRepositoryBase.kt
new file mode 100644
index 0000000000000..deaacfbbaa2e7
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheMongoRepositoryBase.kt
@@ -0,0 +1,737 @@
+@file:Suppress("unused")
+
+package io.quarkus.mongodb.panache.kotlin.reactive
+
+import io.quarkus.mongodb.panache.kotlin.reactive.runtime.KotlinReactiveMongoOperations.Companion.INSTANCE
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection
+import io.quarkus.mongodb.reactive.ReactiveMongoDatabase
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import io.quarkus.panache.common.impl.GenerateBridge
+import io.smallrye.mutiny.Multi
+import io.smallrye.mutiny.Uni
+import org.bson.Document
+import java.util.stream.Stream
+
+/**
+ * Represents a Repository for a specific type of entity `Entity`, with an ID type
+ * of `Id`. Implementing this repository will gain you the exact same useful methods
+ * that are on [ReactivePanacheMongoEntityBase]. Unless you have a custom ID strategy, you should not
+ * implement this interface directly but implement [ReactivePanacheMongoRepository] instead.
+ *
+ * @param Entity The type of entity to operate on
+ * @param Id The ID type of the entity
+ * @see [ReactivePanacheMongoRepository<Id><Entity>]
+ */
+interface ReactivePanacheMongoRepositoryBase<Entity: Any, Id: Any> {
+    /**
+     * Persist the given entity in the database.
+     * This will set it's ID field if not already set.
+     *
+     * @param entity the entity to insert.
+     * @see [persist]
+     */
+    fun persist(entity: Entity): Uni<Void> = INSTANCE.persist(entity)
+
+    /**
+     * Update the given entity in the database.
+     *
+     * @param entity the entity to update.
+     * @see [update]
+     */
+    fun update(entity: Entity): Uni<Void> = INSTANCE.update(entity)
+
+    /**
+     * Persist the given entity in the database or update it if it already exist.
+     *
+     * @param entity the entity to update.
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entity: Entity): Uni<Void> = INSTANCE.persistOrUpdate(entity)
+
+    /**
+     * Delete the given entity from the database, if it is already persisted.
+     *
+     * @param entity the entity to delete.
+     * @see [delete]
+     * @see [deleteAll]
+     */
+    fun delete(entity: Entity): Uni<Void> = INSTANCE.delete(entity)
+
+    /**
+     * Find an entity of this type by ID.
+     *
+     * @param id the ID of the entity to find.
+     * @return the entity found, or `null` if not found.
+     */
+    @GenerateBridge
+    fun findById(id: Id): Uni<Entity?> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, vararg params: Any?): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, vararg params: Any?): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Map<String, Any?>): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Map<String, Any?>): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, params: Parameters): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a query and the given sort options, with named parameters.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: String, sort: Sort, params: Parameters): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     *
+     * @param query a [Document] query
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a new [ReactivePanacheQuery] instance for the given query
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun find(query: Document, sort: Document): ReactivePanacheQuery<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     *
+     * @return a new [ReactivePanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     *
+     * @param sort the sort order to use
+     * @return a new [ReactivePanacheQuery] instance to find all entities of this type.
+     * @see [findAll]
+     * @see [listAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun findAll(sort: Sort): ReactivePanacheQuery<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, vararg params: Any?): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, vararg params: Any?): Uni<List<Entity>> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Map<String, Any?>): Uni<List<Entity>> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Map<String, Any?>): Uni<List<Entity>> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).list()`.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, params: Parameters): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).list()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a [List] containing all results, without paging
+     * @see [list]
+     * @see [find]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: String, sort: Sort, params: Parameters): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).list()`.
+     *
+     * @param query a [Document] query
+     * @return a [List] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).list()`.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a [List] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun list(query: Document, sort: Document): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().list()`.
+     *
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).list()`.
+     *
+     * @param sort the sort order to use
+     * @return a [List] containing all results, without paging
+     * @see [listAll]
+     * @see [findAll]
+     * @see [streamAll]
+     */
+    @GenerateBridge
+    fun listAll(sort: Sort): Uni<List<Entity>> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with optional indexed parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, vararg params: Any?): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with optional indexed parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params optional sequence of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, vararg params: Any?): Multi<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Map<String, Any?>): Multi<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Map] of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Map<String, Any?>): Multi<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query, with named parameters.
+     * This method is a shortcut for `find(query, params).stream()`.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, params: Parameters): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities matching a query and the given sort options, with named parameters.
+     * This method is a shortcut for `find(query, sort, params).stream()`.
+     *
+     * @param query a query string
+     * @param sort the sort strategy to use
+     * @param params [Parameters] of indexed parameters
+     * @return a [Multi] containing all results, without paging
+     * @see [stream]
+     * @see [find]
+     * @see [list]
+     */
+    @GenerateBridge
+    fun stream(query: String, sort: Sort, params: Parameters): Multi<Entity> =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a BSON query.
+     * This method is a shortcut for `find(query).stream()`.
+     *
+     * @param query a [Document] query
+     * @return a [Multi] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun stream(query: Document): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find entities using a a BSON query and a BSON sort.
+     * This method is a shortcut for `find(query, sort).stream()`.
+     *
+     * @param query a [Document] query
+     * @param sort the [Document] sort
+     * @return a [Multi] containing all results, without paging
+     * @see [find]
+     * @see [list]
+     * @see [stream]
+     */
+    @GenerateBridge
+    fun stream(query: Document, sort: Document): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type.
+     * This method is a shortcut for `findAll().stream()`.
+     *
+     * @return a [Multi] containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(sort: Sort): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Find all entities of this type, in the given order.
+     * This method is a shortcut for `findAll(sort).stream()`.
+     *
+     * @return a [Multi] containing all results, without paging
+     * @see [streamAll]
+     * @see [findAll]
+     * @see [listAll]
+     */
+    @GenerateBridge
+    fun streamAll(): Multi<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity in the database.
+     *
+     * @return the number of this type of entity in the database.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, vararg params: Any?): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Map<String, Any?>): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return the number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: String, params: Parameters): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Counts the number of this type of entity matching the given query
+     *
+     * @param query a [Document] query
+     * @return he number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun count(query: Document): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type from the database.
+     *
+     * @return the number of entities deleted.
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun deleteAll(): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete an entity of this type by ID.
+     *
+     * @param id the ID of the entity to delete.
+     * @return false if the entity was not deleted (not found).
+     */
+    @GenerateBridge
+    fun deleteById(id: Id): Uni<Boolean> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with optional indexed parameters.
+     *
+     * @param query a query string
+     * @param params optional sequence of indexed parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, vararg params: Any?): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Map] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Map<String, Any?>): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query, with named parameters.
+     *
+     * @param query a query string
+     * @param params [Parameters] of named parameters
+     * @return the number of entities deleted.
+     * @see [deleteAll]
+     * @see [delete]
+     */
+    @GenerateBridge
+    fun delete(query: String, params: Parameters): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Delete all entities of this type matching the given query
+     *
+     * @param query a [Document] query
+     * @return he number of entities counted.
+     * @see [count]
+     */
+    @GenerateBridge
+    fun delete(query: Document): Uni<Long> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(entities: Iterable<Entity>): Uni<Void> = INSTANCE.persist(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(entities: Stream<Entity>): Uni<Void> = INSTANCE.persist(entities)
+
+    /**
+     * Persist all given entities.
+     *
+     * @param entities the entities to insert
+     * @see [persist]
+     */
+    fun persist(firstEntity: Entity, vararg entities: Entity): Uni<Void> =
+            INSTANCE.persist(firstEntity, *entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(entities: Iterable<Entity>): Uni<Void> = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(entities: Stream<Entity>): Uni<Void> = INSTANCE.update(entities)
+
+    /**
+     * Update all given entities.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun update(firstEntity: Entity, vararg entities: Entity): Uni<Void> =
+            INSTANCE.update(firstEntity, *entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Iterable<Entity>): Uni<Void> =
+            INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [persistOrUpdate]
+     */
+    fun persistOrUpdate(entities: Stream<Entity>): Uni<Void> =
+            INSTANCE.persistOrUpdate(entities)
+
+    /**
+     * Persist all given entities or update them if they already exist.
+     *
+     * @param entities the entities to update
+     * @see [update]
+     */
+    fun persistOrUpdate(firstEntity: Entity, vararg entities: Entity): Uni<Void> =
+            INSTANCE.persistOrUpdate(firstEntity, *entities)
+
+    /**
+     * Update all entities of this type by the given update document, with optional indexed parameters.
+     * The returned [ReactivePanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params optional sequence of indexed parameters
+     * @return a new [ReactivePanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, vararg params: Any?): ReactivePanacheUpdate =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [ReactivePanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params [Map] of named parameters
+     * @return a new [ReactivePanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Map<String, Any?>): ReactivePanacheUpdate =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Update all entities of this type by the given update document, with named parameters.
+     * The returned [ReactivePanacheUpdate] object will allow to restrict on which document the update should be applied.
+     *
+     * @param update the update document, if it didn't contain any update operator, we add `$set`.
+     * It can also be expressed as a query string.
+     * @param params [Parameters] of named parameters
+     * @return a new [ReactivePanacheUpdate] instance for the given update document
+     * @see [update]
+     */
+    @GenerateBridge
+    fun update(update: String, params: Parameters): ReactivePanacheUpdate =
+            throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Collection
+     */
+    @GenerateBridge
+    fun mongoCollection(): ReactiveMongoCollection<Entity> = throw INSTANCE.implementationInjectionMissing()
+
+    /**
+     * Allow to access the underlying Mongo Database.
+     */
+    @GenerateBridge
+    fun mongoDatabase(): ReactiveMongoDatabase = throw INSTANCE.implementationInjectionMissing()
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheQuery.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheQuery.kt
new file mode 100644
index 0000000000000..6389b1c5d9308
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/ReactivePanacheQuery.kt
@@ -0,0 +1,190 @@
+package io.quarkus.mongodb.panache.kotlin.reactive
+
+import com.mongodb.ReadPreference
+import com.mongodb.client.model.Collation
+import io.quarkus.panache.common.Page
+import io.smallrye.mutiny.Multi
+import io.smallrye.mutiny.Uni
+
+/**
+ * Interface representing an entity query, which abstracts the use of paging, getting the number of results, and
+ * operating on [List] or [Stream].
+ *
+ * Instances of this interface cannot mutate the query itself or its parameters: only paging information can be
+ * modified, and instances of this interface can be reused to obtain multiple pages of results.
+ *
+ * @param Entity The entity type being queried
+ */
+interface ReactivePanacheQuery<Entity> {
+    /**
+     * Defines a projection class: the getters, and the public fields, will be used to restrict which fields should be
+     * retrieved from the database.
+     *
+     * @return @return a new query with the same state as the previous one (params, page, range, ...).
+     */
+    fun <NewEntity> project(type: Class<NewEntity>): ReactivePanacheQuery<NewEntity>
+
+    /**
+     * Sets the current page.
+     *
+     * @param page the new page
+     * @return this query, modified
+     * @see [page]
+     */
+    fun page(page: Page): ReactivePanacheQuery<Entity>
+
+    /**
+     * Sets the current page.
+     *
+     * @param pageIndex the page index
+     * @param pageSize the page size
+     * @return this query, modified
+     * @see [page]
+     */
+    fun page(pageIndex: Int, pageSize: Int): ReactivePanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the next page
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [previousPage]
+     */
+    fun nextPage(): ReactivePanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the previous page (or the first page if there is no previous page)
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [nextPage]
+     */
+    fun previousPage(): ReactivePanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the first page
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [lastPage]
+     */
+    fun firstPage(): ReactivePanacheQuery<Entity>
+
+    /**
+     * Sets the current page to the last page. This will cause reading of the entity count.
+     *
+     * @return this query, modified
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [firstPage]
+     * @see [count]
+     */
+    fun lastPage(): Uni<ReactivePanacheQuery<Entity>>
+
+    /**
+     * Returns true if there is another page to read after the current one.
+     * This will cause reading of the entity count.
+     *
+     * @return true if there is another page to read
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [hasPreviousPage]
+     * @see [count]
+     */
+    fun hasNextPage(): Uni<Boolean>
+
+    /**
+     * Returns true if there is a page to read before the current one.
+     *
+     * @return true if there is a previous page to read
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [hasNextPage]
+     */
+    fun hasPreviousPage(): Boolean
+
+    /**
+     * Returns the total number of pages to be read using the current page size.
+     * This will cause reading of the entity count.
+     *
+     * @return the total number of pages to be read using the current page size.
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     */
+    fun pageCount(): Uni<Int>
+
+    /**
+     * Returns the current page.
+     *
+     * @return the current page
+     * @throws UnsupportedOperationException if a page hasn't been set or if a range is already set
+     * @see [page]
+     */
+    fun page(): Page
+
+    /**
+     * Switch the query to use a fixed range (start index - last index) instead of a page.
+     * As the range is fixed, subsequent pagination of the query is not possible.
+     *
+     * @param startIndex the index of the first element, starting at 0
+     * @param lastIndex the index of the last element
+     * @return this query, modified
+     */
+    fun range(startIndex: Int, lastIndex: Int): ReactivePanacheQuery<Entity>
+
+    /**
+     * Define the collation used for this query.
+     *
+     * @param collation the collation to be used for this query.
+     * @return this query, modified
+     */
+    fun withCollation(collation: Collation): ReactivePanacheQuery<Entity>
+
+    /**
+     * Define the read preference used for this query.
+     *
+     * @param readPreference the read preference to be used for this query.
+     * @return this query, modified
+     */
+    fun withReadPreference(readPreference: ReadPreference): ReactivePanacheQuery<Entity>
+
+    /**
+     * Reads and caches the total number of entities this query operates on. This causes a database
+     * query with `SELECT COUNT(*)` and a query equivalent to the current query, minus
+     * ordering.
+     *
+     * @return the total number of entities this query operates on, cached.
+     */
+    fun count(): Uni<Long>
+
+    /**
+     * Returns the current page of results as a [List].
+     *
+     * @return the current page of results as a [List].
+     * @see [page]
+     */
+    fun list(): Uni<List<Entity>>
+
+    /**
+     * Returns the current page of results as a [Stream].
+     *
+     * @return the current page of results as a [Stream].
+     * @see [list]
+     * @see [page]
+     */
+    fun stream(): Multi<Entity>
+
+    /**
+     * Returns the first result of the current page index. This ignores the current page size to fetch
+     * a single result.
+     *
+     * @return the first result of the current page index, or null if there are no results.
+     * @see [singleResult]
+     */
+    fun firstResult(): Uni<Entity?>
+
+    /**
+     * Executes this query for the current page and return a single result.
+     *
+     * @return the single result.
+     * @throws io.quarkus.panache.common.exception.PanacheQueryException if there are more than one result.
+     * @see [firstResult]
+     */
+    fun singleResult(): Uni<Entity?>
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/KotlinReactiveMongoOperations.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/KotlinReactiveMongoOperations.kt
new file mode 100644
index 0000000000000..c5a289f70756f
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/reactive/runtime/KotlinReactiveMongoOperations.kt
@@ -0,0 +1,66 @@
+package io.quarkus.mongodb.panache.kotlin.reactive.runtime
+
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheQuery
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate
+import io.quarkus.mongodb.panache.reactive.runtime.ReactiveMongoOperations
+import io.quarkus.mongodb.panache.reactive.runtime.ReactivePanacheUpdateImpl
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection
+import io.smallrye.mutiny.Multi
+import io.smallrye.mutiny.Uni
+import org.bson.Document
+
+/**
+ * Defines kotlin specific implementations of methods needed by [ReactiveMongoOperations].
+ */
+class KotlinReactiveMongoOperations : ReactiveMongoOperations<ReactivePanacheQuery<*>, ReactivePanacheUpdate>() {
+    /**
+     * Defines internal implementation details for use by quarkus.  Use of these members is highly discouraged as the
+     * implementation may change without warning.
+     */
+    companion object {
+        @JvmField
+        val INSTANCE = KotlinReactiveMongoOperations()
+    }
+
+    /**
+     * Creates the query implementation
+     *
+     * @param collection the collection to query
+     * @param query the query to base the new query off of
+     * @param sortDoc the sort document to use
+     *
+     * @return the new query implementation
+     */
+    override fun createQuery(collection: ReactiveMongoCollection<*>, query: Document?, sortDoc: Document?) =
+            ReactivePanacheQueryImpl(collection, query, sortDoc)
+
+    /**
+     * Creates the update implementation
+     *
+     * @param collection the collection to query
+     * @param entityClass the type to update
+     * @param docUpdate the update document to start with
+     *
+     * @return the new query implementation
+     */
+    override fun createUpdate(collection: ReactiveMongoCollection<*>, entityClass: Class<*>, docUpdate: Document) =
+            ReactivePanacheUpdateImpl(this, entityClass, docUpdate, collection)
+
+    /**
+     * Extracts the query results in to a List.
+     *
+     * @param query the query to list
+     *
+     * @return the query results
+     */
+    override fun list(query: ReactivePanacheQuery<*>): Uni<List<*>> = query.list() as Uni<List<*>>
+
+    /**
+     * Extracts the query results in to a Stream.
+     *
+     * @param query the query to stream
+     *
+     * @return the query results
+     */
+    override fun stream(query: ReactivePanacheQuery<*>): Multi<*> = query.stream()
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/KotlinMongoOperations.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/KotlinMongoOperations.kt
new file mode 100644
index 0000000000000..98e8eaec091b4
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/kotlin/io/quarkus/mongodb/panache/kotlin/runtime/KotlinMongoOperations.kt
@@ -0,0 +1,65 @@
+package io.quarkus.mongodb.panache.kotlin.runtime
+
+import com.mongodb.client.MongoCollection
+import io.quarkus.mongodb.panache.PanacheUpdate
+import io.quarkus.mongodb.panache.kotlin.PanacheQuery
+import io.quarkus.mongodb.panache.runtime.MongoOperations
+import io.quarkus.mongodb.panache.runtime.PanacheUpdateImpl
+import org.bson.Document
+import java.util.stream.Stream
+
+/**
+ * Defines kotlin specific implementations of methods needed by [MongoOperations].
+ */
+class KotlinMongoOperations : MongoOperations<PanacheQuery<*>, PanacheUpdate>() {
+    /**
+     * Defines internal implementation details for use by quarkus.  Use of these members is highly discouraged as the
+     * implementation may change without warning.
+     */
+    companion object {
+        @JvmField
+        val INSTANCE = KotlinMongoOperations()
+    }
+
+    /**
+     * Creates the query implementation
+     * 
+     * @param collection the collection to query
+     * @param query the query to base the new query off of
+     * @param sortDoc the sort document to use
+     * 
+     * @return the new query implementation
+     */
+    override fun createQuery(collection: MongoCollection<*>, query: Document?, sortDoc: Document?) =
+            PanacheQueryImpl(collection, query, sortDoc)
+
+    /**
+     * Creates the update implementation
+     *
+     * @param collection the collection to query
+     * @param entityClass the type to update
+     * @param docUpdate the update document to start with
+     *
+     * @return the new query implementation
+     */
+    override fun createUpdate(collection: MongoCollection<*>, entityClass: Class<*>, docUpdate: Document) =
+            PanacheUpdateImpl(this, entityClass, docUpdate, collection)
+
+    /**
+     * Extracts the query results in to a List.
+     * 
+     * @param query the query to list
+     * 
+     * @return a [List] of the results
+     */
+    override fun list(query: PanacheQuery<*>): List<*> = query.list()
+
+    /**
+     * Extracts the query results in to a Stream.
+     *
+     * @param query the query to stream
+     *
+     * @return a [Stream] of the results
+     */
+    override fun stream(query: PanacheQuery<*>): Stream<*> = query.stream()
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..7588222abb56a
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,11 @@
+---
+name: "MongoDB with Panache for Kotlin"
+metadata:
+  keywords:
+  - "mongodb-panache-kotlin"
+  - "panache"
+  - "mongodb"
+  - "kotlin"
+  categories:
+  - "data"
+  status: "stable"
diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt
new file mode 100644
index 0000000000000..26d6a87eb859b
--- /dev/null
+++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt
@@ -0,0 +1,224 @@
+package io.quarkus.mongodb.panache.kotlin
+
+import io.quarkus.gizmo.Gizmo
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoCompanionBase
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoEntityBase
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery
+import io.quarkus.panache.common.deployment.ByteCodeType
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.ClassReader.SKIP_CODE
+import org.objectweb.asm.ClassVisitor
+import org.objectweb.asm.MethodVisitor
+import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Type
+import org.objectweb.asm.Type.getArgumentTypes
+import org.objectweb.asm.Type.getReturnType
+import org.objectweb.asm.Type.getType
+import java.util.Optional
+import java.util.function.Consumer
+import kotlin.reflect.KClass
+import io.quarkus.mongodb.panache.PanacheMongoEntity as JavaPanacheMongoEntity
+import io.quarkus.mongodb.panache.PanacheMongoEntityBase as JavaPanacheMongoEntityBase
+import io.quarkus.mongodb.panache.PanacheMongoRepository as JavaPanacheMongoRepository
+import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase as JavaPanacheMongoRepositoryBase
+import io.quarkus.mongodb.panache.PanacheQuery as JavaPanacheQuery
+
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity as ReactiveJavaPanacheMongoEntity
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntityBase as ReactiveJavaPanacheMongoEntityBase
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository as ReactiveJavaPanacheMongoRepository
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase as ReactiveJavaPanacheMongoRepositoryBase
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery as ReactiveJavaPanacheQuery
+
+class TestAnalogs {
+    @Test
+    fun testPanacheQuery() {
+        compare(map(JavaPanacheQuery::class), map(PanacheQuery::class))
+        compare(map(ReactiveJavaPanacheQuery::class), map(ReactivePanacheQuery::class))
+    }
+
+    @Test
+    fun testPanacheRepository() {
+        compare(map(JavaPanacheMongoRepository::class), map(PanacheMongoRepository::class))
+        compare(map(ReactiveJavaPanacheMongoRepository::class), map(ReactivePanacheMongoRepository::class))
+    }
+
+    @Test
+    fun testPanacheRepositoryBase() {
+        compare(map(JavaPanacheMongoRepositoryBase::class), map(PanacheMongoRepositoryBase::class), listOf("findByIdOptional"))
+        compare(map(ReactiveJavaPanacheMongoRepositoryBase::class), map(ReactivePanacheMongoRepositoryBase::class), listOf("findByIdOptional"))
+    }
+
+    @Test
+    fun testPanacheEntity() {
+        compare(JavaPanacheMongoEntity::class, PanacheMongoEntity::class, PanacheMongoCompanion::class)
+        compare(JavaPanacheMongoEntityBase::class, PanacheMongoEntityBase::class, PanacheMongoCompanionBase::class)
+        compare(ReactiveJavaPanacheMongoEntity::class, PanacheMongoEntity::class, PanacheMongoCompanion::class)
+        compare(ReactiveJavaPanacheMongoEntityBase::class, ReactivePanacheMongoEntityBase::class, ReactivePanacheMongoCompanionBase::class)
+    }
+
+    private fun compare(javaEntity: KClass<*>,
+                        kotlinEntity: KClass<*>,
+                        companion: KClass<*>) {
+        val javaMethods = map(javaEntity).methods
+        val kotlinMethods = map(kotlinEntity).methods
+                .filterNot {
+                    it.name.contains("getId")
+                            || it.name.contains("setId")
+                            || it.name.contains("getOperations")
+                }
+                .toMutableList()
+        val companionMethods = map(companion).methods
+        val implemented = mutableListOf<Method>()
+
+        javaMethods
+                .forEach {
+                    if (!it.isStatic()) {
+                        if (it in kotlinMethods) {
+                            kotlinMethods -= it
+                            implemented += it
+                        }
+                    } else {
+                        if (it in companionMethods) {
+                            companionMethods -= it
+                            implemented += it
+                        }
+                    }
+                }
+        javaMethods.removeIf {
+            it.name == "findByIdOptional" ||
+                    it in implemented
+        }
+
+        methods("javaMethods", javaMethods)
+        methods("kotlinMethods", kotlinMethods)
+        methods("companionMethods", companionMethods)
+
+        assertTrue(javaMethods.isEmpty(), "New methods not implemented: ${javaMethods}")
+        assertTrue(kotlinMethods.isEmpty(), "Old methods not removed: ${kotlinMethods}")
+        assertTrue(companionMethods.isEmpty(), "Old methods not removed: ${companionMethods}")
+    }
+
+    private fun map(type: KClass<*>): AnalogVisitor {
+        return AnalogVisitor().also { node ->
+            ClassReader(type.bytes()).accept(node, SKIP_CODE)
+        }
+    }
+
+
+    private fun KClass<*>.bytes() =
+            java.classLoader.getResourceAsStream(qualifiedName.toString().replace(".", "/") + ".class")
+
+    private fun compare(javaClass: AnalogVisitor, kotlinClass: AnalogVisitor, whiteList: List<String> = listOf()) {
+        val javaMethods = javaClass.methods
+        val kotlinMethods = kotlinClass.methods
+        val implemented = mutableListOf<Method>()
+
+        javaMethods
+                .forEach {
+                    if (it in kotlinMethods) {
+                        kotlinMethods -= it
+                        implemented += it
+                    }
+                }
+
+        javaMethods.removeIf {
+            it.name in whiteList ||
+                    it in implemented
+        }
+
+        assertTrue(javaMethods.isEmpty(), "New methods not implemented: ${javaMethods}")
+        assertTrue(kotlinMethods.isEmpty(), "Old methods not removed: ${kotlinMethods}")
+    }
+
+    @Suppress("unused")
+    private fun methods(label: String, methods: List<Method>) {
+        if (methods.isNotEmpty()) {
+            println("$label: ")
+            methods
+                    .forEach {
+                        println(it)
+                    }
+            println()
+        }
+    }
+}
+
+class AnalogVisitor : ClassVisitor(Gizmo.ASM_API_VERSION) {
+    val erasures = mapOf(
+            getType(PanacheMongoEntityBase::class.java).descriptor to getType(Object::class.java).descriptor,
+            getType(ReactivePanacheMongoEntityBase::class.java).descriptor to getType(Object::class.java).descriptor
+    )
+
+    val methods = mutableListOf<Method>()
+    override fun visitMethod(access: Int, name: String, descriptor: String, signature: String?,
+                             exceptions: Array<out String>?): MethodVisitor? {
+        if (name != "<clinit>" && name != "<init>" && !descriptor.endsWith(ByteCodeType(Optional::class.java).descriptor())) {
+            val method = Method(access, name, erase(getReturnType(descriptor)), erase(getArgumentTypes(descriptor)))
+            methods += method
+        }
+        return super.visitMethod(access, name, descriptor, signature, exceptions)
+    }
+
+    private fun erase(type: Type): String {
+        var value = type.descriptor
+        erasures.entries.forEach(Consumer {
+            value = value.replace(it.key, it.value)
+        })
+        return value
+    }
+
+    private fun erase(types: Array<Type>): List<String> = types.map { erase(it) }
+}
+
+class Method(val access: Int, val name: String, val type: String, val parameters: List<String>) {
+    fun isStatic() = access.matches(Opcodes.ACC_STATIC)
+
+    override fun toString(): String {
+        return (if (isStatic()) "static " else "") + "fun ${name}(${parameters.joinToString(", ")})" +
+                (if (type != Unit::class.qualifiedName) ": $type" else "")
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Method) return false
+
+        if (name != other.name) return false
+        if (parameters != other.parameters) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = name.hashCode()
+        result = 31 * result + type.hashCode()
+        result = 31 * result + parameters.hashCode()
+        return result
+    }
+
+}
+
+fun Int.matches(mask: Int) = (this and mask) == mask
+
+fun Int.accDecode(): List<String> {
+    val decode: MutableList<String> = ArrayList()
+    val values: MutableMap<String, Int> = LinkedHashMap()
+    try {
+        for (f in Opcodes::class.java.declaredFields) {
+            if (f.name.startsWith("ACC_")) {
+                values[f.name] = f.getInt(Opcodes::class.java)
+            }
+        }
+    } catch (e: IllegalAccessException) {
+        throw RuntimeException(e.message, e)
+    }
+    for ((key, value) in values) {
+        if (this.matches(value)) {
+            decode.add(key)
+        }
+    }
+    return decode
+}
\ No newline at end of file
diff --git a/extensions/panache/mongodb-panache/deployment/pom.xml b/extensions/panache/mongodb-panache/deployment/pom.xml
index 00d4134365b65..d7968ca5ac1b3 100644
--- a/extensions/panache/mongodb-panache/deployment/pom.xml
+++ b/extensions/panache/mongodb-panache/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-mongodb-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-mongodb-panache-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ImperativeTypeBundle.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ImperativeTypeBundle.java
new file mode 100644
index 0000000000000..3faab59afb280
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ImperativeTypeBundle.java
@@ -0,0 +1,48 @@
+package io.quarkus.mongodb.panache.deployment;
+
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+import io.quarkus.mongodb.panache.PanacheMongoEntityBase;
+import io.quarkus.mongodb.panache.PanacheMongoRepository;
+import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase;
+import io.quarkus.mongodb.panache.PanacheQuery;
+import io.quarkus.mongodb.panache.PanacheUpdate;
+import io.quarkus.mongodb.panache.runtime.JavaMongoOperations;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public class ImperativeTypeBundle implements TypeBundle {
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(PanacheMongoEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(PanacheMongoEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(JavaMongoOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(PanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(PanacheMongoRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(PanacheMongoRepositoryBase.class);
+    }
+
+    @Override
+    public ByteCodeType updateType() {
+        return new ByteCodeType(PanacheUpdate.class);
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityEnhancer.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityEnhancer.java
index 78cf0614bea9d..92d73985b1839 100644
--- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityEnhancer.java
+++ b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityEnhancer.java
@@ -1,88 +1,38 @@
 package io.quarkus.mongodb.panache.deployment;
 
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
-import org.bson.codecs.pojo.annotations.BsonIgnore;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
-import io.quarkus.gizmo.DescriptorUtils;
-import io.quarkus.mongodb.panache.runtime.MongoOperations;
-import io.quarkus.panache.common.deployment.EntityField;
+import io.quarkus.mongodb.panache.deployment.visitors.PanacheMongoEntityClassAccessorGenerationVisitor;
 import io.quarkus.panache.common.deployment.EntityModel;
 import io.quarkus.panache.common.deployment.MetamodelInfo;
 import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.common.deployment.visitors.PanacheEntityClassOperationGenerationVisitor;
 
-public class PanacheMongoEntityEnhancer extends PanacheEntityEnhancer<MetamodelInfo<EntityModel<EntityField>>> {
-    public final static String MONGO_OPERATIONS_NAME = MongoOperations.class.getName();
-    public final static String MONGO_OPERATIONS_BINARY_NAME = MONGO_OPERATIONS_NAME.replace('.', '/');
+public class PanacheMongoEntityEnhancer extends PanacheEntityEnhancer {
 
-    private static final DotName DOTNAME_BSON_IGNORE = DotName.createSimple(BsonIgnore.class.getName());
+    private final TypeBundle typeBundle;
+    private final MetamodelInfo modelInfo;
 
-    final Map<String, EntityModel> entities = new HashMap<>();
-
-    public PanacheMongoEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
-        super(index, PanacheMongoResourceProcessor.DOTNAME_PANACHE_ENTITY_BASE, methodCustomizers);
-        modelInfo = new MetamodelInfo<>();
+    public PanacheMongoEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers,
+            TypeBundle typeBundle, MetamodelInfo modelInfo) {
+        super(index, methodCustomizers);
+        this.typeBundle = typeBundle;
+        this.modelInfo = modelInfo;
     }
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new PanacheMongoEntityClassVisitor(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo,
-                indexView.getClassByName(DotName.createSimple(className)), methodCustomizers);
-    }
-
-    static class PanacheMongoEntityClassVisitor extends PanacheEntityClassVisitor<EntityField> {
-
-        public PanacheMongoEntityClassVisitor(String className, ClassVisitor outputClassVisitor,
-                MetamodelInfo<EntityModel<EntityField>> modelInfo, ClassInfo panacheEntityBaseClassInfo,
-                ClassInfo entityInfo, List<PanacheMethodCustomizer> methodCustomizers) {
-            super(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo, entityInfo, methodCustomizers);
-        }
-
-        @Override
-        protected void injectModel(MethodVisitor mv) {
-            mv.visitLdcInsn(thisClass);
-        }
-
-        @Override
-        protected String getModelDescriptor() {
-            return "Ljava/lang/Class;";
-        }
-
-        @Override
-        protected String getPanacheOperationsBinaryName() {
-            return MONGO_OPERATIONS_BINARY_NAME;
-        }
-
-        @Override
-        protected void generateAccessorSetField(MethodVisitor mv, EntityField field) {
-            mv.visitFieldInsn(Opcodes.PUTFIELD, thisClass.getInternalName(), field.name, field.descriptor);
-        }
-
-        @Override
-        protected void generateAccessorGetField(MethodVisitor mv, EntityField field) {
-            mv.visitFieldInsn(Opcodes.GETFIELD, thisClass.getInternalName(), field.name, field.descriptor);
-        }
-    }
-
-    public void collectFields(ClassInfo classInfo) {
-        EntityModel<EntityField> entityModel = new EntityModel<>(classInfo);
-        for (FieldInfo fieldInfo : classInfo.fields()) {
-            String name = fieldInfo.name();
-            if (Modifier.isPublic(fieldInfo.flags()) && !fieldInfo.hasAnnotation(DOTNAME_BSON_IGNORE)) {
-                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
-            }
-        }
-        modelInfo.addEntityModel(entityModel);
+        ClassInfo entityInfo = indexView.getClassByName(DotName.createSimple(className));
+        EntityModel entityModel = modelInfo.getEntityModel(className);
+        outputClassVisitor = new PanacheMongoEntityClassAccessorGenerationVisitor(outputClassVisitor, entityInfo, entityModel);
+        return new PanacheEntityClassOperationGenerationVisitor(outputClassVisitor, typeBundle,
+                entityInfo, methodCustomizers, indexView);
     }
 }
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoRepositoryEnhancer.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoRepositoryEnhancer.java
index 3bb6919d4c618..eb4cc0e7e4df6 100644
--- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoRepositoryEnhancer.java
+++ b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoRepositoryEnhancer.java
@@ -1,61 +1,23 @@
 package io.quarkus.mongodb.panache.deployment;
 
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
 
-import io.quarkus.mongodb.panache.PanacheMongoRepository;
-import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.common.deployment.visitors.PanacheRepositoryClassOperationGenerationVisitor;
 
 public class PanacheMongoRepositoryEnhancer extends PanacheRepositoryEnhancer {
-    public final static DotName PANACHE_REPOSITORY_BASE_NAME = DotName.createSimple(PanacheMongoRepositoryBase.class.getName());
+    private final TypeBundle typeBundle;
 
-    public final static DotName PANACHE_REPOSITORY_NAME = DotName.createSimple(PanacheMongoRepository.class.getName());
-
-    public PanacheMongoRepositoryEnhancer(IndexView index) {
-        super(index, PanacheMongoResourceProcessor.DOTNAME_PANACHE_REPOSITORY_BASE);
+    public PanacheMongoRepositoryEnhancer(IndexView index, TypeBundle typeBundle) {
+        super(index);
+        this.typeBundle = typeBundle;
     }
 
     @Override
     public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new PanacheMongoRepositoryClassVisitor(className, outputClassVisitor, panacheRepositoryBaseClassInfo,
-                this.indexView);
+        return new PanacheRepositoryClassOperationGenerationVisitor(className, outputClassVisitor, indexView, typeBundle);
     }
 
-    static class PanacheMongoRepositoryClassVisitor extends PanacheRepositoryClassVisitor {
-
-        public PanacheMongoRepositoryClassVisitor(String className, ClassVisitor outputClassVisitor,
-                ClassInfo panacheRepositoryBaseClassInfo, IndexView indexView) {
-            super(className, outputClassVisitor, panacheRepositoryBaseClassInfo, indexView);
-        }
-
-        @Override
-        protected DotName getPanacheRepositoryDotName() {
-            return PANACHE_REPOSITORY_NAME;
-        }
-
-        @Override
-        protected DotName getPanacheRepositoryBaseDotName() {
-            return PANACHE_REPOSITORY_BASE_NAME;
-        }
-
-        @Override
-        protected String getPanacheOperationsBinaryName() {
-            return PanacheMongoEntityEnhancer.MONGO_OPERATIONS_BINARY_NAME;
-        }
-
-        @Override
-        protected void injectModel(MethodVisitor mv) {
-            // inject Class
-            mv.visitLdcInsn(entityType);
-        }
-
-        @Override
-        protected String getModelDescriptor() {
-            return "Ljava/lang/Class;";
-        }
-    }
 }
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java
index 66af5427c0209..fa241516c7e1c 100644
--- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java
+++ b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java
@@ -1,444 +1,61 @@
 package io.quarkus.mongodb.panache.deployment;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
-import org.bson.codecs.pojo.annotations.BsonId;
-import org.bson.codecs.pojo.annotations.BsonProperty;
-import org.bson.types.ObjectId;
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.Type;
-
-import com.mongodb.client.MongoClient;
-
-import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
-import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
-import io.quarkus.bootstrap.classloading.ClassPathElement;
-import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
-import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.bean.JavaBeanUtil;
-import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
-import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
-import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
-import io.quarkus.deployment.util.JandexUtil;
-import io.quarkus.jackson.spi.JacksonModuleBuildItem;
-import io.quarkus.jsonb.spi.JsonbDeserializerBuildItem;
-import io.quarkus.jsonb.spi.JsonbSerializerBuildItem;
-import io.quarkus.mongodb.panache.PanacheMongoEntity;
-import io.quarkus.mongodb.panache.PanacheMongoEntityBase;
-import io.quarkus.mongodb.panache.PanacheMongoRecorder;
-import io.quarkus.mongodb.panache.PanacheMongoRepository;
-import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase;
-import io.quarkus.mongodb.panache.ProjectionFor;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntityBase;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase;
-import io.quarkus.mongodb.reactive.ReactiveMongoClient;
-import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem;
-import io.quarkus.panache.common.deployment.PanacheFieldAccessEnhancer;
+import io.quarkus.panache.common.deployment.MetamodelInfo;
+import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
-import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
 
-public class PanacheMongoResourceProcessor {
-    // blocking types
-    static final DotName DOTNAME_PANACHE_REPOSITORY_BASE = DotName.createSimple(PanacheMongoRepositoryBase.class.getName());
-    private static final DotName DOTNAME_PANACHE_REPOSITORY = DotName.createSimple(PanacheMongoRepository.class.getName());
-    static final DotName DOTNAME_PANACHE_ENTITY_BASE = DotName.createSimple(PanacheMongoEntityBase.class.getName());
-    private static final DotName DOTNAME_PANACHE_ENTITY = DotName.createSimple(PanacheMongoEntity.class.getName());
-
-    private static final DotName DOTNAME_PROJECTION_FOR = DotName.createSimple(ProjectionFor.class.getName());
-    private static final DotName DOTNAME_BSON_PROPERTY = DotName.createSimple(BsonProperty.class.getName());
-    private static final DotName DOTNAME_BSON_ID = DotName.createSimple(BsonId.class.getName());
-
-    // reactive types (Mutiny)
-    static final DotName DOTNAME_MUTINY_PANACHE_REPOSITORY_BASE = DotName
-            .createSimple(ReactivePanacheMongoRepositoryBase.class.getName());
-    private static final DotName DOTNAME_MUTINY_PANACHE_REPOSITORY = DotName
-            .createSimple(ReactivePanacheMongoRepository.class.getName());
-    static final DotName DOTNAME_MUTINY_PANACHE_ENTITY_BASE = DotName
-            .createSimple(ReactivePanacheMongoEntityBase.class.getName());
-    private static final DotName DOTNAME_MUTINY_PANACHE_ENTITY = DotName
-            .createSimple(ReactivePanacheMongoEntity.class.getName());
+public class PanacheMongoResourceProcessor extends BasePanacheMongoResourceProcessor {
+    public static final ImperativeTypeBundle IMPERATIVE_TYPE_BUNDLE = new ImperativeTypeBundle();
+    public static final ReactiveTypeBundle REACTIVE_TYPE_BUNDLE = new ReactiveTypeBundle();
 
-    private static final DotName DOTNAME_OBJECT_ID = DotName.createSimple(ObjectId.class.getName());
-    protected static final String META_INF_PANACHE_ARCHIVE_MARKER = "META-INF/panache-archive.marker";
-
-    @BuildStep
-    CapabilityBuildItem capability() {
-        return new CapabilityBuildItem(Capability.MONGODB_PANACHE);
+    protected ReactiveTypeBundle getReactiveTypeBundle() {
+        return REACTIVE_TYPE_BUNDLE;
     }
 
-    @BuildStep
-    FeatureBuildItem featureBuildItem() {
-        return new FeatureBuildItem(Feature.MONGODB_PANACHE);
+    protected ImperativeTypeBundle getImperativeTypeBundle() {
+        return IMPERATIVE_TYPE_BUNDLE;
     }
 
-    @BuildStep
-    void contributeClassesToIndex(BuildProducer<AdditionalIndexedClassesBuildItem> additionalIndexedClasses) {
-        additionalIndexedClasses.produce(new AdditionalIndexedClassesBuildItem(
-                DOTNAME_OBJECT_ID.toString()));
+    @Override
+    public PanacheMongoEntityEnhancer createEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers, MetamodelInfo modelInfo) {
+        return new PanacheMongoEntityEnhancer(index.getIndex(), methodCustomizers, getImperativeTypeBundle(), modelInfo);
     }
 
-    @BuildStep
-    void registerJsonbSerDeser(BuildProducer<JsonbSerializerBuildItem> jsonbSerializers,
-            BuildProducer<JsonbDeserializerBuildItem> jsonbDeserializers) {
-        jsonbSerializers
-                .produce(new JsonbSerializerBuildItem(io.quarkus.mongodb.panache.jsonb.ObjectIdSerializer.class.getName()));
-        jsonbDeserializers
-                .produce(new JsonbDeserializerBuildItem(io.quarkus.mongodb.panache.jsonb.ObjectIdDeserializer.class.getName()));
+    @Override
+    public PanacheEntityEnhancer createReactiveEntityEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers, MetamodelInfo modelInfo) {
+        return new PanacheMongoEntityEnhancer(index.getIndex(), methodCustomizers, getReactiveTypeBundle(), modelInfo);
     }
 
-    @BuildStep
-    void registerJacksonSerDeser(BuildProducer<JacksonModuleBuildItem> customSerDeser) {
-        customSerDeser.produce(
-                new JacksonModuleBuildItem.Builder("ObjectIdModule")
-                        .add(io.quarkus.mongodb.panache.jackson.ObjectIdSerializer.class.getName(),
-                                io.quarkus.mongodb.panache.jackson.ObjectIdDeserializer.class.getName(),
-                                ObjectId.class.getName())
-                        .build());
+    @Override
+    public PanacheMongoRepositoryEnhancer createReactiveRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new PanacheMongoRepositoryEnhancer(index.getIndex(), getReactiveTypeBundle());
     }
 
-    @BuildStep
-    ReflectiveHierarchyBuildItem registerForReflection(CombinedIndexBuildItem index) {
-        Type type = Type.create(DOTNAME_OBJECT_ID, Type.Kind.CLASS);
-        return new ReflectiveHierarchyBuildItem(type, index.getIndex());
+    @Override
+    public PanacheRepositoryEnhancer createRepositoryEnhancer(CombinedIndexBuildItem index,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        return new PanacheMongoRepositoryEnhancer(index.getIndex(), getImperativeTypeBundle());
     }
 
     @BuildStep
-    void unremoveableClients(BuildProducer<UnremovableBeanBuildItem> unremovable) {
-        unremovable.produce(
-                new UnremovableBeanBuildItem(
-                        new UnremovableBeanBuildItem.BeanClassNamesExclusion(new HashSet<>(
-                                Arrays.asList(MongoClient.class.getName(), ReactiveMongoClient.class.getName())))));
-
-    }
-
-    @BuildStep
-    void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheMongoEntityClassBuildItem> entityClasses) {
-        // NOTE: we don't skip abstract/generic entities because they still need accessors
-        for (ClassInfo panacheEntityBaseSubclass : index.getIndex().getAllKnownSubclasses(DOTNAME_PANACHE_ENTITY_BASE)) {
-            // FIXME: should we really skip PanacheEntity or all MappedSuperClass?
-            if (!panacheEntityBaseSubclass.name().equals(DOTNAME_PANACHE_ENTITY)) {
-                entityClasses.produce(new PanacheMongoEntityClassBuildItem(panacheEntityBaseSubclass));
-            }
-        }
-    }
-
-    @BuildStep
-    PanacheEntityClassesBuildItem findEntityClasses(List<PanacheMongoEntityClassBuildItem> entityClasses) {
-        if (!entityClasses.isEmpty()) {
-            Set<String> ret = new HashSet<>();
-            for (PanacheMongoEntityClassBuildItem entityClass : entityClasses) {
-                ret.add(entityClass.get().name().toString());
-            }
-            return new PanacheEntityClassesBuildItem(ret);
-        }
-        return null;
-    }
-
-    @BuildStep
-    void buildImperative(CombinedIndexBuildItem index,
-            ApplicationIndexBuildItem applicationIndex,
-            BuildProducer<BytecodeTransformerBuildItem> transformers,
-            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
-            List<PanacheMongoEntityClassBuildItem> entityClasses,
-            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
-
-        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
-                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
-
-        PanacheMongoRepositoryEnhancer daoEnhancer = new PanacheMongoRepositoryEnhancer(index.getIndex());
-        Set<String> daoClasses = new HashSet<>();
-        Set<Type> daoTypeParameters = new HashSet<>();
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_PANACHE_REPOSITORY_BASE)) {
-            // Skip PanacheMongoRepository and abstract repositories
-            if (classInfo.name().equals(DOTNAME_PANACHE_REPOSITORY) || PanacheRepositoryEnhancer.skipRepository(classInfo)) {
-                continue;
-            }
-            daoClasses.add(classInfo.name().toString());
-            daoTypeParameters.addAll(
-                    JandexUtil.resolveTypeParameters(classInfo.name(), DOTNAME_PANACHE_REPOSITORY_BASE, index.getIndex()));
-        }
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_PANACHE_REPOSITORY)) {
-            if (PanacheRepositoryEnhancer.skipRepository(classInfo)) {
-                continue;
-            }
-            daoClasses.add(classInfo.name().toString());
-            daoTypeParameters.addAll(
-                    JandexUtil.resolveTypeParameters(classInfo.name(), DOTNAME_PANACHE_REPOSITORY_BASE, index.getIndex()));
-        }
-        for (String daoClass : daoClasses) {
-            transformers.produce(new BytecodeTransformerBuildItem(daoClass, daoEnhancer));
-        }
-
-        for (Type parameterType : daoTypeParameters) {
-            // Register for reflection the type parameters of the repository: this should be the entity class and the ID class
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, parameterType.name().toString()));
-
-            // Register for building the property mapping cache
-            propertyMappingClass.produce(new PropertyMappingClassBuildStep(parameterType.name().toString()));
-        }
-
-        PanacheMongoEntityEnhancer modelEnhancer = new PanacheMongoEntityEnhancer(index.getIndex(), methodCustomizers);
-        Set<String> modelClasses = new HashSet<>();
-        Set<String> modelClassNamesInternal = new HashSet<>();
-
-        for (PanacheMongoEntityClassBuildItem entityClass : entityClasses) {
-            String entityClassName = entityClass.get().name().toString();
-            modelClasses.add(entityClassName);
-            modelEnhancer.collectFields(entityClass.get());
-            modelClassNamesInternal.add(entityClassName.replace(".", "/"));
-            transformers.produce(new BytecodeTransformerBuildItem(entityClassName, modelEnhancer));
-            //register for reflection entity classes
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, entityClassName));
-            // Register for building the property mapping cache
-            propertyMappingClass.produce(new PropertyMappingClassBuildStep(entityClassName));
-        }
-
-        if (!modelEnhancer.entities.isEmpty()) {
-            PanacheFieldAccessEnhancer panacheFieldAccessEnhancer = new PanacheFieldAccessEnhancer(
-                    modelEnhancer.getModelInfo());
-            QuarkusClassLoader tccl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
-            List<ClassPathElement> archives = tccl.getElementsWithResource(META_INF_PANACHE_ARCHIVE_MARKER);
-            for (ClassPathElement i : archives) {
-                for (String res : i.getProvidedResources()) {
-                    if (res.endsWith(".class")) {
-                        String cn = res.replace("/", ".").substring(0, res.length() - 6);
-                        if (!modelClasses.contains(cn)) {
-                            transformers.produce(
-                                    new BytecodeTransformerBuildItem(cn, panacheFieldAccessEnhancer, modelClassNamesInternal));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @BuildStep
-    void buildMutiny(CombinedIndexBuildItem index,
-            ApplicationIndexBuildItem applicationIndex,
-            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
-            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
-            BuildProducer<BytecodeTransformerBuildItem> transformers,
-            List<PanacheMethodCustomizerBuildItem> methodCustomizersBuildItems) {
-
-        List<PanacheMethodCustomizer> methodCustomizers = methodCustomizersBuildItems.stream()
-                .map(bi -> bi.getMethodCustomizer()).collect(Collectors.toList());
-        ReactivePanacheMongoRepositoryEnhancer daoEnhancer = new ReactivePanacheMongoRepositoryEnhancer(index.getIndex());
-        Set<String> daoClasses = new HashSet<>();
-        Set<Type> daoTypeParameters = new HashSet<>();
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_MUTINY_PANACHE_REPOSITORY_BASE)) {
-            // Skip ReactivePanacheMongoRepository and abstract repositories
-            if (classInfo.name().equals(DOTNAME_MUTINY_PANACHE_REPOSITORY)
-                    || PanacheRepositoryEnhancer.skipRepository(classInfo)) {
-                continue;
-            }
-            daoClasses.add(classInfo.name().toString());
-            daoTypeParameters.addAll(
-                    JandexUtil.resolveTypeParameters(classInfo.name(), DOTNAME_PANACHE_REPOSITORY_BASE, index.getIndex()));
-        }
-        for (ClassInfo classInfo : index.getIndex().getAllKnownImplementors(DOTNAME_MUTINY_PANACHE_REPOSITORY)) {
-            if (PanacheRepositoryEnhancer.skipRepository(classInfo)) {
-                continue;
-            }
-            daoClasses.add(classInfo.name().toString());
-            daoTypeParameters.addAll(
-                    JandexUtil.resolveTypeParameters(classInfo.name(), DOTNAME_PANACHE_REPOSITORY_BASE, index.getIndex()));
-        }
-        for (String daoClass : daoClasses) {
-            transformers.produce(new BytecodeTransformerBuildItem(daoClass, daoEnhancer));
-        }
-
-        for (Type parameterType : daoTypeParameters) {
-            // Register for reflection the type parameters of the repository: this should be the entity class and the ID class
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, parameterType.name().toString()));
-
-            // Register for building the property mapping cache
-            propertyMappingClass.produce(new PropertyMappingClassBuildStep(parameterType.name().toString()));
-        }
-
-        ReactivePanacheMongoEntityEnhancer modelEnhancer = new ReactivePanacheMongoEntityEnhancer(index.getIndex(),
-                methodCustomizers);
-        Set<String> modelClasses = new HashSet<>();
-        // Note that we do this in two passes because for some reason Jandex does not give us subtypes
-        // of PanacheMongoEntity if we ask for subtypes of PanacheMongoEntityBase
-        for (ClassInfo classInfo : index.getIndex().getAllKnownSubclasses(DOTNAME_MUTINY_PANACHE_ENTITY_BASE)) {
-            if (classInfo.name().equals(DOTNAME_MUTINY_PANACHE_ENTITY)) {
-                continue;
-            }
-            if (modelClasses.add(classInfo.name().toString()))
-                modelEnhancer.collectFields(classInfo);
-        }
-        for (ClassInfo classInfo : index.getIndex().getAllKnownSubclasses(DOTNAME_MUTINY_PANACHE_ENTITY)) {
-            if (modelClasses.add(classInfo.name().toString()))
-                modelEnhancer.collectFields(classInfo);
-        }
-
-        // iterate over all the entity classes
-        for (String modelClass : modelClasses) {
-            transformers.produce(new BytecodeTransformerBuildItem(modelClass, modelEnhancer));
-
-            //register for reflection entity classes
-            reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, modelClass));
-
-            // Register for building the property mapping cache
-            propertyMappingClass.produce(new PropertyMappingClassBuildStep(modelClass));
-        }
-
-        if (!modelEnhancer.entities.isEmpty()) {
-            PanacheFieldAccessEnhancer panacheFieldAccessEnhancer = new PanacheFieldAccessEnhancer(
-                    modelEnhancer.getModelInfo());
-            for (ClassInfo classInfo : applicationIndex.getIndex().getKnownClasses()) {
-                String className = classInfo.name().toString();
-                if (!modelClasses.contains(className)) {
-                    transformers.produce(new BytecodeTransformerBuildItem(className, panacheFieldAccessEnhancer));
-                }
-            }
-        }
-    }
-
-    @BuildStep
-    ValidationPhaseBuildItem.ValidationErrorBuildItem validate(ValidationPhaseBuildItem validationPhase,
-            CombinedIndexBuildItem index) throws BuildException {
-        // we verify that no ID fields are defined (via @BsonId) when extending PanacheMongoEntity or ReactivePanacheMongoEntity
-        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(DOTNAME_BSON_ID)) {
-            ClassInfo info = JandexUtil.getEnclosingClass(annotationInstance);
-            if (JandexUtil.isSubclassOf(index.getIndex(), info,
-                    DOTNAME_PANACHE_ENTITY)) {
-                BuildException be = new BuildException("You provide a MongoDB identifier via @BsonId inside '" + info.name() +
-                        "' but one is already provided by PanacheMongoEntity, " +
-                        "your class should extend PanacheMongoEntityBase instead, or use the id provided by PanacheMongoEntity",
-                        Collections.emptyList());
-                return new ValidationPhaseBuildItem.ValidationErrorBuildItem(be);
-            } else if (JandexUtil.isSubclassOf(index.getIndex(), info,
-                    DOTNAME_MUTINY_PANACHE_ENTITY)) {
-                BuildException be = new BuildException("You provide a MongoDB identifier via @BsonId inside '" + info.name() +
-                        "' but one is already provided by ReactivePanacheMongoEntity, " +
-                        "your class should extend ReactivePanacheMongoEntityBase instead, or use the id provided by ReactivePanacheMongoEntity",
-                        Collections.emptyList());
-                return new ValidationPhaseBuildItem.ValidationErrorBuildItem(be);
-            }
-        }
-        return null;
-    }
-
-    @BuildStep
-    void handleProjectionFor(CombinedIndexBuildItem index,
-            BuildProducer<PropertyMappingClassBuildStep> propertyMappingClass,
-            BuildProducer<BytecodeTransformerBuildItem> transformers) {
-        // manage @BsonProperty for the @ProjectionFor annotation
-        Map<DotName, Map<String, String>> propertyMapping = new HashMap<>();
-        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(DOTNAME_PROJECTION_FOR)) {
-            Type targetClass = annotationInstance.value().asClass();
-            ClassInfo target = index.getIndex().getClassByName(targetClass.name());
-            Map<String, String> classPropertyMapping = new HashMap<>();
-            extractMappings(classPropertyMapping, target, index);
-            propertyMapping.put(targetClass.name(), classPropertyMapping);
-        }
-        for (AnnotationInstance annotationInstance : index.getIndex().getAnnotations(DOTNAME_PROJECTION_FOR)) {
-            Type targetClass = annotationInstance.value().asClass();
-            Map<String, String> targetPropertyMapping = propertyMapping.get(targetClass.name());
-            if (targetPropertyMapping != null && !targetPropertyMapping.isEmpty()) {
-                ClassInfo info = annotationInstance.target().asClass();
-                ProjectionForEnhancer fieldEnhancer = new ProjectionForEnhancer(targetPropertyMapping);
-                transformers.produce(new BytecodeTransformerBuildItem(info.name().toString(), fieldEnhancer));
-            }
-
-            // Register for building the property mapping cache
-            propertyMappingClass
-                    .produce(new PropertyMappingClassBuildStep(targetClass.name().toString(),
-                            annotationInstance.target().asClass().name().toString()));
-        }
-    }
-
-    private void extractMappings(Map<String, String> classPropertyMapping, ClassInfo target, CombinedIndexBuildItem index) {
-        for (FieldInfo fieldInfo : target.fields()) {
-            if (fieldInfo.hasAnnotation(DOTNAME_BSON_PROPERTY)) {
-                AnnotationInstance bsonProperty = fieldInfo.annotation(DOTNAME_BSON_PROPERTY);
-                classPropertyMapping.put(fieldInfo.name(), bsonProperty.value().asString());
-            }
-        }
-        for (MethodInfo methodInfo : target.methods()) {
-            if (methodInfo.hasAnnotation(DOTNAME_BSON_PROPERTY)) {
-                AnnotationInstance bsonProperty = methodInfo.annotation(DOTNAME_BSON_PROPERTY);
-                classPropertyMapping.put(methodInfo.name(), bsonProperty.value().asString());
-            }
-        }
-
-        // climb up the hierarchy of types
-        if (!target.superClassType().name().equals(JandexUtil.DOTNAME_OBJECT)) {
-            Type superType = target.superClassType();
-            ClassInfo superClass = index.getIndex().getClassByName(superType.name());
-            extractMappings(classPropertyMapping, superClass, index);
-        }
+    protected CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.MONGODB_PANACHE);
     }
 
     @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    void buildReplacementMap(List<PropertyMappingClassBuildStep> propertyMappingClasses, CombinedIndexBuildItem index,
-            PanacheMongoRecorder recorder) {
-        Map<String, Map<String, String>> replacementMap = new ConcurrentHashMap<>();
-        for (PropertyMappingClassBuildStep classToMap : propertyMappingClasses) {
-            DotName dotName = DotName.createSimple(classToMap.getClassName());
-            ClassInfo classInfo = index.getIndex().getClassByName(dotName);
-            if (classInfo != null) {
-                // only compute field replacement for types inside the index
-                Map<String, String> classReplacementMap = replacementMap.computeIfAbsent(classToMap.getClassName(),
-                        className -> computeReplacement(classInfo));
-                if (classToMap.getAliasClassName() != null) {
-                    // also register the replacement map for the projection classes
-                    replacementMap.put(classToMap.getAliasClassName(), classReplacementMap);
-                }
-            }
-        }
-
-        recorder.setReplacementCache(replacementMap);
-    }
-
-    private Map<String, String> computeReplacement(ClassInfo classInfo) {
-        Map<String, String> replacementMap = new HashMap<>();
-        for (FieldInfo field : classInfo.fields()) {
-            AnnotationInstance bsonProperty = field.annotation(DOTNAME_BSON_PROPERTY);
-            if (bsonProperty != null) {
-                replacementMap.put(field.name(), bsonProperty.value().asString());
-            }
-        }
-        for (MethodInfo method : classInfo.methods()) {
-            if (method.name().startsWith("get")) {
-                // we try to replace also for getter
-                AnnotationInstance bsonProperty = method.annotation(DOTNAME_BSON_PROPERTY);
-                if (bsonProperty != null) {
-                    String fieldName = JavaBeanUtil.decapitalize(method.name().substring(3));
-                    replacementMap.put(fieldName, bsonProperty.value().asString());
-                }
-            }
-        }
-        return replacementMap.isEmpty() ? Collections.emptyMap() : replacementMap;
+    protected FeatureBuildItem featureBuildItem() {
+        return new FeatureBuildItem(Feature.MONGODB_PANACHE);
     }
-
 }
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactivePanacheMongoEntityEnhancer.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactivePanacheMongoEntityEnhancer.java
deleted file mode 100644
index 739d898fd5aa7..0000000000000
--- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactivePanacheMongoEntityEnhancer.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.quarkus.mongodb.panache.deployment;
-
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.bson.codecs.pojo.annotations.BsonIgnore;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-import org.jboss.jandex.IndexView;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import io.quarkus.gizmo.DescriptorUtils;
-import io.quarkus.mongodb.panache.reactive.runtime.ReactiveMongoOperations;
-import io.quarkus.panache.common.deployment.EntityField;
-import io.quarkus.panache.common.deployment.EntityModel;
-import io.quarkus.panache.common.deployment.MetamodelInfo;
-import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
-import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
-
-public class ReactivePanacheMongoEntityEnhancer extends PanacheEntityEnhancer<MetamodelInfo<EntityModel<EntityField>>> {
-    public final static String MONGO_OPERATIONS_NAME = ReactiveMongoOperations.class.getName();
-    public final static String MONGO_OPERATIONS_BINARY_NAME = MONGO_OPERATIONS_NAME.replace('.', '/');
-
-    private static final DotName DOTNAME_BSON_IGNORE = DotName.createSimple(BsonIgnore.class.getName());
-
-    final Map<String, EntityModel> entities = new HashMap<>();
-
-    public ReactivePanacheMongoEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
-        super(index, PanacheMongoResourceProcessor.DOTNAME_MUTINY_PANACHE_ENTITY_BASE, methodCustomizers);
-        modelInfo = new MetamodelInfo<>();
-    }
-
-    @Override
-    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new PanacheMongoEntityClassVisitor(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo,
-                indexView.getClassByName(DotName.createSimple(className)), methodCustomizers);
-    }
-
-    static class PanacheMongoEntityClassVisitor extends PanacheEntityClassVisitor<EntityField> {
-
-        public PanacheMongoEntityClassVisitor(String className, ClassVisitor outputClassVisitor,
-                MetamodelInfo<EntityModel<EntityField>> modelInfo, ClassInfo panacheEntityBaseClassInfo,
-                ClassInfo entityInfo, List<PanacheMethodCustomizer> methodCustomizers) {
-            super(className, outputClassVisitor, modelInfo, panacheEntityBaseClassInfo, entityInfo, methodCustomizers);
-        }
-
-        @Override
-        protected void injectModel(MethodVisitor mv) {
-            mv.visitLdcInsn(thisClass);
-        }
-
-        @Override
-        protected String getModelDescriptor() {
-            return "Ljava/lang/Class;";
-        }
-
-        @Override
-        protected String getPanacheOperationsBinaryName() {
-            return MONGO_OPERATIONS_BINARY_NAME;
-        }
-
-        @Override
-        protected void generateAccessorSetField(MethodVisitor mv, EntityField field) {
-            mv.visitFieldInsn(Opcodes.PUTFIELD, thisClass.getInternalName(), field.name, field.descriptor);
-        }
-
-        @Override
-        protected void generateAccessorGetField(MethodVisitor mv, EntityField field) {
-            mv.visitFieldInsn(Opcodes.GETFIELD, thisClass.getInternalName(), field.name, field.descriptor);
-        }
-    }
-
-    public void collectFields(ClassInfo classInfo) {
-        EntityModel<EntityField> entityModel = new EntityModel<>(classInfo);
-        for (FieldInfo fieldInfo : classInfo.fields()) {
-            String name = fieldInfo.name();
-            if (Modifier.isPublic(fieldInfo.flags()) && !fieldInfo.hasAnnotation(DOTNAME_BSON_IGNORE)) {
-                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
-            }
-        }
-        modelInfo.addEntityModel(entityModel);
-    }
-}
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactivePanacheMongoRepositoryEnhancer.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactivePanacheMongoRepositoryEnhancer.java
deleted file mode 100644
index 4cc24f7903381..0000000000000
--- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactivePanacheMongoRepositoryEnhancer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package io.quarkus.mongodb.panache.deployment;
-
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase;
-import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
-
-public class ReactivePanacheMongoRepositoryEnhancer extends PanacheRepositoryEnhancer {
-    public final static DotName PANACHE_REPOSITORY_BASE_NAME = DotName
-            .createSimple(ReactivePanacheMongoRepositoryBase.class.getName());
-
-    public final static DotName PANACHE_REPOSITORY_NAME = DotName.createSimple(ReactivePanacheMongoRepository.class.getName());
-
-    public ReactivePanacheMongoRepositoryEnhancer(IndexView index) {
-        super(index, PanacheMongoResourceProcessor.DOTNAME_MUTINY_PANACHE_REPOSITORY_BASE);
-    }
-
-    @Override
-    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
-        return new PanacheMongoRepositoryClassVisitor(className, outputClassVisitor, panacheRepositoryBaseClassInfo,
-                this.indexView);
-    }
-
-    static class PanacheMongoRepositoryClassVisitor extends PanacheRepositoryClassVisitor {
-
-        public PanacheMongoRepositoryClassVisitor(String className, ClassVisitor outputClassVisitor,
-                ClassInfo panacheRepositoryBaseClassInfo, IndexView indexView) {
-            super(className, outputClassVisitor, panacheRepositoryBaseClassInfo, indexView);
-        }
-
-        @Override
-        protected DotName getPanacheRepositoryDotName() {
-            return PANACHE_REPOSITORY_NAME;
-        }
-
-        @Override
-        protected DotName getPanacheRepositoryBaseDotName() {
-            return PANACHE_REPOSITORY_BASE_NAME;
-        }
-
-        @Override
-        protected String getPanacheOperationsBinaryName() {
-            return ReactivePanacheMongoEntityEnhancer.MONGO_OPERATIONS_BINARY_NAME;
-        }
-
-        @Override
-        protected void injectModel(MethodVisitor mv) {
-            // inject Class
-            mv.visitLdcInsn(entityType);
-        }
-
-        @Override
-        protected String getModelDescriptor() {
-            return "Ljava/lang/Class;";
-        }
-    }
-}
diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactiveTypeBundle.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactiveTypeBundle.java
new file mode 100644
index 0000000000000..271443c582103
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ReactiveTypeBundle.java
@@ -0,0 +1,58 @@
+package io.quarkus.mongodb.panache.deployment;
+
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntityBase;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepositoryBase;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
+import io.quarkus.mongodb.panache.reactive.runtime.JavaReactiveMongoOperations;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public class ReactiveTypeBundle implements TypeBundle {
+    @Override
+    public ByteCodeType entity() {
+        return new ByteCodeType(ReactivePanacheMongoEntity.class);
+    }
+
+    @Override
+    public ByteCodeType entityBase() {
+        return new ByteCodeType(ReactivePanacheMongoEntityBase.class);
+    }
+
+    @Override
+    public ByteCodeType entityCompanion() {
+        throw new UnsupportedOperationException("Companions are not supported in Java.");
+    }
+
+    @Override
+    public ByteCodeType entityCompanionBase() {
+        throw new UnsupportedOperationException("Companions are not supported in Java.");
+    }
+
+    @Override
+    public ByteCodeType operations() {
+        return new ByteCodeType(JavaReactiveMongoOperations.class);
+    }
+
+    @Override
+    public ByteCodeType queryType() {
+        return new ByteCodeType(ReactivePanacheQuery.class);
+    }
+
+    @Override
+    public ByteCodeType repository() {
+        return new ByteCodeType(ReactivePanacheMongoRepository.class);
+    }
+
+    @Override
+    public ByteCodeType repositoryBase() {
+        return new ByteCodeType(ReactivePanacheMongoRepositoryBase.class);
+    }
+
+    @Override
+    public ByteCodeType updateType() {
+        return new ByteCodeType(ReactivePanacheUpdate.class);
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient1Entity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient1Entity.java
new file mode 100644
index 0000000000000..e5b424184a886
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient1Entity.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+@MongoEntity(collection = "TheBookEntity", clientName = "cl1-10812")
+public class Bug10812BookClient1Entity extends PanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookClient1Entity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient1ReactiveEntity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient1ReactiveEntity.java
new file mode 100644
index 0000000000000..1390bfb5f2226
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient1ReactiveEntity.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity;
+
+@MongoEntity(collection = "TheBookEntity", clientName = "cl1-10812")
+public class Bug10812BookClient1ReactiveEntity extends ReactivePanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookClient1ReactiveEntity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient2Entity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient2Entity.java
new file mode 100644
index 0000000000000..824116d05f095
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient2Entity.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+@MongoEntity(collection = "TheBookEntity", clientName = "cl2-10812")
+public class Bug10812BookClient2Entity extends PanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookClient2Entity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient2ReactiveEntity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient2ReactiveEntity.java
new file mode 100644
index 0000000000000..1150b7f328b00
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookClient2ReactiveEntity.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity;
+
+@MongoEntity(collection = "TheBookEntity", clientName = "cl2-10812")
+public class Bug10812BookClient2ReactiveEntity extends ReactivePanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookClient2ReactiveEntity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookDefaultClientNameEntity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookDefaultClientNameEntity.java
new file mode 100644
index 0000000000000..0ab70295b7601
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookDefaultClientNameEntity.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+@MongoEntity(collection = "TheBookEntity")
+public class Bug10812BookDefaultClientNameEntity extends PanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookDefaultClientNameEntity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookDefaultClientNameReactiveEntity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookDefaultClientNameReactiveEntity.java
new file mode 100644
index 0000000000000..4779194277ae3
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookDefaultClientNameReactiveEntity.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity;
+
+@MongoEntity(collection = "TheBookEntity")
+public class Bug10812BookDefaultClientNameReactiveEntity extends ReactivePanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookDefaultClientNameReactiveEntity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookNotAnnotatedEntity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookNotAnnotatedEntity.java
new file mode 100644
index 0000000000000..1b38f4e5bb40b
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookNotAnnotatedEntity.java
@@ -0,0 +1,19 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+public class Bug10812BookNotAnnotatedEntity extends PanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookNotAnnotatedEntity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookNotAnnotatedReactiveEntity.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookNotAnnotatedReactiveEntity.java
new file mode 100644
index 0000000000000..bfd5ef86c6cb8
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812BookNotAnnotatedReactiveEntity.java
@@ -0,0 +1,19 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoEntity;
+
+public class Bug10812BookNotAnnotatedReactiveEntity extends ReactivePanacheMongoEntity {
+    @BsonProperty("bookTitle")
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Bug10812BookNotAnnotatedReactiveEntity setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java
new file mode 100644
index 0000000000000..4814286e84dbb
--- /dev/null
+++ b/extensions/panache/mongodb-panache/deployment/src/test/java/io/quarkus/mongodb/panache/bug10812/Bug10812MongodbMultiClientsTest.java
@@ -0,0 +1,50 @@
+package io.quarkus.mongodb.panache.bug10812;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class Bug10812MongodbMultiClientsTest {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(
+                            Bug10812BookNotAnnotatedEntity.class,
+                            Bug10812BookDefaultClientNameEntity.class,
+                            Bug10812BookClient1Entity.class,
+                            Bug10812BookClient2Entity.class,
+                            Bug10812BookNotAnnotatedReactiveEntity.class,
+                            Bug10812BookDefaultClientNameReactiveEntity.class,
+                            Bug10812BookClient1ReactiveEntity.class,
+                            Bug10812BookClient2ReactiveEntity.class)
+                    .addAsResource("application.properties"));
+
+    @Test
+    public void testMongoDatabaseNameConfigurationWhenEntityIsNotAnnotated() {
+        assertEquals("test", Bug10812BookNotAnnotatedEntity.mongoDatabase().getName());
+        assertEquals("test", Bug10812BookNotAnnotatedReactiveEntity.mongoDatabase().getName());
+    }
+
+    @Test
+    public void testMongoDatabaseNameConfigurationWhenEntityUsesDefaultClientName() {
+        assertEquals("test", Bug10812BookDefaultClientNameEntity.mongoDatabase().getName());
+        assertEquals("test", Bug10812BookDefaultClientNameReactiveEntity.mongoDatabase().getName());
+    }
+
+    @Test
+    public void testMongoDatabaseNameConfigurationWhenEntityHasClientNameAndUseSpecificDatabaseName() {
+        assertEquals("cl1-10812-db", Bug10812BookClient1Entity.mongoDatabase().getName());
+        assertEquals("cl1-10812-db", Bug10812BookClient1ReactiveEntity.mongoDatabase().getName());
+    }
+
+    @Test
+    public void testMongoDatabaseNameConfigurationWhenEntityHasClientNameAndUseDefaultDatabaseName() {
+        assertEquals("test", Bug10812BookClient2Entity.mongoDatabase().getName());
+        assertEquals("test", Bug10812BookClient2ReactiveEntity.mongoDatabase().getName());
+    }
+}
diff --git a/extensions/panache/mongodb-panache/deployment/src/test/resources/application.properties b/extensions/panache/mongodb-panache/deployment/src/test/resources/application.properties
index c50b7f60a280c..283ba4bf725e4 100644
--- a/extensions/panache/mongodb-panache/deployment/src/test/resources/application.properties
+++ b/extensions/panache/mongodb-panache/deployment/src/test/resources/application.properties
@@ -1 +1,5 @@
-quarkus.mongodb.database=test
\ No newline at end of file
+quarkus.mongodb.database=test
+
+quarkus.mongodb.cl1-10812.connection-string=mongodb://localhost:27018
+quarkus.mongodb.cl1-10812.database=cl1-10812-db
+quarkus.mongodb.cl2-10812.connection-string=mongodb://localhost:27018
diff --git a/extensions/panache/mongodb-panache/pom.xml b/extensions/panache/mongodb-panache/pom.xml
index a6469490656af..1deb594e66668 100644
--- a/extensions/panache/mongodb-panache/pom.xml
+++ b/extensions/panache/mongodb-panache/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/panache/mongodb-panache/runtime/pom.xml b/extensions/panache/mongodb-panache/runtime/pom.xml
index 773e2dff4bca3..15b33b2e0fa2e 100644
--- a/extensions/panache/mongodb-panache/runtime/pom.xml
+++ b/extensions/panache/mongodb-panache/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-mongodb-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-mongodb-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-panacheql</artifactId>
+            <artifactId>quarkus-mongodb-panache-common</artifactId>
         </dependency>
         <!-- This is optional to avoid pulling libraries if jax-rs/jsonb is not on the path-->
         <!-- But needed to provides default serializer/deserializer for JsonB -->
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java
index b057466896d0d..ebb226a3eb107 100755
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoEntityBase.java
@@ -1,5 +1,7 @@
 package io.quarkus.mongodb.panache;
 
+import static io.quarkus.mongodb.panache.runtime.JavaMongoOperations.INSTANCE;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -10,33 +12,28 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
-import io.quarkus.mongodb.panache.runtime.MongoOperations;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
 import io.quarkus.panache.common.impl.GenerateBridge;
 
 /**
  * Represents an entity. If your Mongo entities extend this class they gain auto-generated accessors
- * to all their public fields, as well as a lot of useful
- * methods. Unless you have a custom ID strategy, you should not extend this class directly but extend
- * {@link PanacheMongoEntity} instead.
+ * to all their public fields, as well as a lot of useful methods. Unless you have a custom ID strategy, you
+ * should not extend this class directly but extend {@link PanacheMongoEntity} instead.
  *
  * @see PanacheMongoEntity
  */
 public abstract class PanacheMongoEntityBase {
-
-    // Operations
-
     /**
      * Persist this entity in the database.
-     * This will set it's ID field if not already set.
+     * This will set its ID field if not already set.
      *
      * @see #persist(Iterable)
      * @see #persist(Stream)
      * @see #persist(Object, Object...)
      */
     public void persist() {
-        MongoOperations.persist(this);
+        INSTANCE.persist(this);
     }
 
     /**
@@ -47,7 +44,7 @@ public void persist() {
      * @see #update(Object, Object...)
      */
     public void update() {
-        MongoOperations.update(this);
+        INSTANCE.update(this);
     }
 
     /**
@@ -58,7 +55,7 @@ public void update() {
      * @see #persistOrUpdate(Object, Object...)
      */
     public void persistOrUpdate() {
-        MongoOperations.persistOrUpdate(this);
+        INSTANCE.persistOrUpdate(this);
     }
 
     /**
@@ -70,7 +67,7 @@ public void persistOrUpdate() {
      * @see #deleteAll()
      */
     public void delete() {
-        MongoOperations.delete(this);
+        INSTANCE.delete(this);
     }
 
     // Queries
@@ -83,7 +80,7 @@ public void delete() {
      */
     @GenerateBridge(targetReturnTypeErased = true)
     public static <T extends PanacheMongoEntityBase> T findById(Object id) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -94,7 +91,7 @@ public static <T extends PanacheMongoEntityBase> T findById(Object id) {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Optional<T> findByIdOptional(Object id) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -111,7 +108,7 @@ public static <T extends PanacheMongoEntityBase> Optional<T> findByIdOptional(Ob
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -129,7 +126,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String que
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String query, Sort sort, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -146,7 +143,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String que
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -164,7 +161,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String que
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String query, Sort sort, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -181,7 +178,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String que
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -199,7 +196,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String que
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String query, Sort sort, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -215,7 +212,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(String que
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -232,7 +229,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(Document q
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(Document query, Document sort) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -245,7 +242,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> find(Document q
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> findAll() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -259,7 +256,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> findAll() {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> PanacheQuery<T> findAll(Sort sort) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -277,7 +274,7 @@ public static <T extends PanacheMongoEntityBase> PanacheQuery<T> findAll(Sort so
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -296,7 +293,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(String query, Obje
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(String query, Sort sort, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -314,7 +311,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(String query, Sort
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -333,7 +330,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(String query, Map<
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(String query, Sort sort, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -351,7 +348,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(String query, Sort
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -370,7 +367,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(String query, Para
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(String query, Sort sort, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -387,7 +384,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(String query, Sort
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -405,7 +402,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(Document query) {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> list(Document query, Document sort) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -419,7 +416,7 @@ public static <T extends PanacheMongoEntityBase> List<T> list(Document query, Do
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> listAll() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -434,7 +431,7 @@ public static <T extends PanacheMongoEntityBase> List<T> listAll() {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> List<T> listAll(Sort sort) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -452,7 +449,7 @@ public static <T extends PanacheMongoEntityBase> List<T> listAll(Sort sort) {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -471,7 +468,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query,
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query, Sort sort, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -489,7 +486,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query,
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -508,7 +505,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query,
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query, Sort sort, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -526,7 +523,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query,
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -545,7 +542,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query,
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query, Sort sort, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -562,7 +559,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(String query,
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -580,7 +577,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(Document query
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> stream(Document query, Document sort) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -594,7 +591,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> stream(Document query
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> streamAll() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -609,7 +606,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> streamAll() {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> Stream<T> streamAll(Sort sort) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -622,7 +619,7 @@ public static <T extends PanacheMongoEntityBase> Stream<T> streamAll(Sort sort)
      */
     @GenerateBridge
     public static long count() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -637,7 +634,7 @@ public static long count() {
      */
     @GenerateBridge
     public static long count(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -652,7 +649,7 @@ public static long count(String query, Object... params) {
      */
     @GenerateBridge
     public static long count(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -667,7 +664,7 @@ public static long count(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static long count(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -681,7 +678,7 @@ public static long count(String query, Parameters params) {
      */
     @GenerateBridge
     public static long count(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -694,7 +691,7 @@ public static long count(Document query) {
      */
     @GenerateBridge
     public static long deleteAll() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -705,7 +702,7 @@ public static long deleteAll() {
      */
     @GenerateBridge
     public static boolean deleteById(Object id) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -720,7 +717,7 @@ public static boolean deleteById(Object id) {
      */
     @GenerateBridge
     public static long delete(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -735,7 +732,7 @@ public static long delete(String query, Object... params) {
      */
     @GenerateBridge
     public static long delete(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -750,7 +747,7 @@ public static long delete(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static long delete(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -764,7 +761,7 @@ public static long delete(String query, Parameters params) {
      */
     @GenerateBridge
     public static long delete(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -776,7 +773,7 @@ public static long delete(Document query) {
      * @see #persist(Object,Object...)
      */
     public static void persist(Iterable<?> entities) {
-        MongoOperations.persist(entities);
+        INSTANCE.persist(entities);
     }
 
     /**
@@ -788,7 +785,7 @@ public static void persist(Iterable<?> entities) {
      * @see #persist(Object,Object...)
      */
     public static void persist(Stream<?> entities) {
-        MongoOperations.persist(entities);
+        INSTANCE.persist(entities);
     }
 
     /**
@@ -800,7 +797,7 @@ public static void persist(Stream<?> entities) {
      * @see #persist(Iterable)
      */
     public static void persist(Object firstEntity, Object... entities) {
-        MongoOperations.persist(firstEntity, entities);
+        INSTANCE.persist(firstEntity, entities);
     }
 
     /**
@@ -812,7 +809,7 @@ public static void persist(Object firstEntity, Object... entities) {
      * @see #update(Object,Object...)
      */
     public static void update(Iterable<?> entities) {
-        MongoOperations.update(entities);
+        INSTANCE.update(entities);
     }
 
     /**
@@ -824,7 +821,7 @@ public static void update(Iterable<?> entities) {
      * @see #update(Object,Object...)
      */
     public static void update(Stream<?> entities) {
-        MongoOperations.update(entities);
+        INSTANCE.update(entities);
     }
 
     /**
@@ -836,7 +833,7 @@ public static void update(Stream<?> entities) {
      * @see #update(Iterable)
      */
     public static void update(Object firstEntity, Object... entities) {
-        MongoOperations.update(firstEntity, entities);
+        INSTANCE.update(firstEntity, entities);
     }
 
     /**
@@ -848,7 +845,7 @@ public static void update(Object firstEntity, Object... entities) {
      * @see #persistOrUpdate(Object,Object...)
      */
     public static void persistOrUpdate(Iterable<?> entities) {
-        MongoOperations.persistOrUpdate(entities);
+        INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -860,7 +857,7 @@ public static void persistOrUpdate(Iterable<?> entities) {
      * @see #persistOrUpdate(Object,Object...)
      */
     public static void persistOrUpdate(Stream<?> entities) {
-        MongoOperations.persistOrUpdate(entities);
+        INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -872,14 +869,14 @@ public static void persistOrUpdate(Stream<?> entities) {
      * @see #persistOrUpdate(Iterable)
      */
     public static void persistOrUpdate(Object firstEntity, Object... entities) {
-        MongoOperations.persistOrUpdate(firstEntity, entities);
+        INSTANCE.persistOrUpdate(firstEntity, entities);
     }
 
     /**
      * Update all entities of this type by the given update document, with optional indexed parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>..
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params optional sequence of indexed parameters
      * @return a new {@link PanacheUpdate} instance for the given update document
@@ -888,14 +885,14 @@ public static void persistOrUpdate(Object firstEntity, Object... entities) {
      */
     @GenerateBridge
     public static PanacheUpdate update(String update, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Map} of named parameters
      * @return a new {@link PanacheUpdate} instance for the given update document
@@ -905,14 +902,14 @@ public static PanacheUpdate update(String update, Object... params) {
      */
     @GenerateBridge
     public static PanacheUpdate update(String update, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Parameters} of named parameters
      * @return a new {@link PanacheUpdate} instance for the given update document
@@ -921,7 +918,7 @@ public static PanacheUpdate update(String update, Map<String, Object> params) {
      */
     @GenerateBridge
     public static PanacheUpdate update(String update, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -929,7 +926,7 @@ public static PanacheUpdate update(String update, Parameters params) {
      */
     @GenerateBridge
     public static <T extends PanacheMongoEntityBase> MongoCollection<T> mongoCollection() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -937,6 +934,6 @@ public static <T extends PanacheMongoEntityBase> MongoCollection<T> mongoCollect
      */
     @GenerateBridge
     public static MongoDatabase mongoDatabase() {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java
index 7c2f7d1ebe58d..eb360d109f827 100755
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheMongoRepositoryBase.java
@@ -1,5 +1,7 @@
 package io.quarkus.mongodb.panache;
 
+import static io.quarkus.mongodb.panache.runtime.JavaMongoOperations.INSTANCE;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -10,7 +12,6 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
-import io.quarkus.mongodb.panache.runtime.MongoOperations;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
 import io.quarkus.panache.common.impl.GenerateBridge;
@@ -27,8 +28,6 @@
  */
 public interface PanacheMongoRepositoryBase<Entity, Id> {
 
-    // Operations
-
     /**
      * Persist the given entity in the database.
      * This will set it's ID field if not already set.
@@ -38,8 +37,8 @@ public interface PanacheMongoRepositoryBase<Entity, Id> {
      * @see #persist(Stream)
      * @see #persist(Object, Object...)
      */
-    public default void persist(Entity entity) {
-        MongoOperations.persist(entity);
+    default void persist(Entity entity) {
+        INSTANCE.persist(entity);
     }
 
     /**
@@ -50,8 +49,8 @@ public default void persist(Entity entity) {
      * @see #update(Stream)
      * @see #update(Object, Object...)
      */
-    public default void update(Entity entity) {
-        MongoOperations.update(entity);
+    default void update(Entity entity) {
+        INSTANCE.update(entity);
     }
 
     /**
@@ -62,8 +61,8 @@ public default void update(Entity entity) {
      * @see #persistOrUpdate(Stream)
      * @see #persistOrUpdate(Object, Object...)
      */
-    public default void persistOrUpdate(Entity entity) {
-        MongoOperations.persistOrUpdate(entity);
+    default void persistOrUpdate(Entity entity) {
+        INSTANCE.persistOrUpdate(entity);
     }
 
     /**
@@ -75,8 +74,8 @@ public default void persistOrUpdate(Entity entity) {
      * @see #delete(String, Parameters)
      * @see #deleteAll()
      */
-    public default void delete(Entity entity) {
-        MongoOperations.delete(entity);
+    default void delete(Entity entity) {
+        INSTANCE.delete(entity);
     }
 
     // Queries
@@ -88,8 +87,8 @@ public default void delete(Entity entity) {
      * @return the entity found, or <code>null</code> if not found.
      */
     @GenerateBridge(targetReturnTypeErased = true)
-    public default Entity findById(Id id) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Entity findById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -99,8 +98,8 @@ public default Entity findById(Id id) {
      * @return if found, an optional containing the entity, else <code>Optional.empty()</code>.
      */
     @GenerateBridge
-    public default Optional<Entity> findByIdOptional(Id id) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Optional<Entity> findByIdOptional(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -116,8 +115,8 @@ public default Optional<Entity> findByIdOptional(Id id) {
      * @see #stream(String, Object...)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -134,8 +133,8 @@ public default PanacheQuery<Entity> find(String query, Object... params) {
      * @see #stream(String, Sort, Object...)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Sort sort, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -151,8 +150,8 @@ public default PanacheQuery<Entity> find(String query, Sort sort, Object... para
      * @see #stream(String, Map)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -169,8 +168,8 @@ public default PanacheQuery<Entity> find(String query, Map<String, Object> param
      * @see #stream(String, Sort, Map)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -186,8 +185,8 @@ public default PanacheQuery<Entity> find(String query, Sort sort, Map<String, Ob
      * @see #stream(String, Parameters)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -204,8 +203,8 @@ public default PanacheQuery<Entity> find(String query, Parameters params) {
      * @see #stream(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -220,8 +219,8 @@ public default PanacheQuery<Entity> find(String query, Sort sort, Parameters par
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -237,8 +236,8 @@ public default PanacheQuery<Entity> find(Document query) {
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> find(Document query, Document sort) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> find(Document query, Document sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -250,8 +249,8 @@ public default PanacheQuery<Entity> find(Document query, Document sort) {
      * @see #streamAll()
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> findAll() {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> findAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -264,8 +263,8 @@ public default PanacheQuery<Entity> findAll() {
      * @see #streamAll(Sort)
      */
     @GenerateBridge
-    public default PanacheQuery<Entity> findAll(Sort sort) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheQuery<Entity> findAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -282,8 +281,8 @@ public default PanacheQuery<Entity> findAll(Sort sort) {
      * @see #stream(String, Object...)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -301,8 +300,8 @@ public default List<Entity> list(String query, Object... params) {
      * @see #stream(String, Sort, Object...)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Sort sort, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -319,8 +318,8 @@ public default List<Entity> list(String query, Sort sort, Object... params) {
      * @see #stream(String, Map)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -338,8 +337,8 @@ public default List<Entity> list(String query, Map<String, Object> params) {
      * @see #stream(String, Sort, Map)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Sort sort, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -356,8 +355,8 @@ public default List<Entity> list(String query, Sort sort, Map<String, Object> pa
      * @see #stream(String, Parameters)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -375,8 +374,8 @@ public default List<Entity> list(String query, Parameters params) {
      * @see #stream(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default List<Entity> list(String query, Sort sort, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -392,8 +391,8 @@ public default List<Entity> list(String query, Sort sort, Parameters params) {
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default List<Entity> list(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -410,8 +409,8 @@ public default List<Entity> list(Document query) {
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default List<Entity> list(Document query, Document sort) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> list(Document query, Document sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -424,8 +423,8 @@ public default List<Entity> list(Document query, Document sort) {
      * @see #streamAll()
      */
     @GenerateBridge
-    public default List<Entity> listAll() {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> listAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -439,8 +438,8 @@ public default List<Entity> listAll() {
      * @see #streamAll(Sort)
      */
     @GenerateBridge
-    public default List<Entity> listAll(Sort sort) {
-        throw MongoOperations.implementationInjectionMissing();
+    default List<Entity> listAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -457,8 +456,8 @@ public default List<Entity> listAll(Sort sort) {
      * @see #list(String, Object...)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -476,8 +475,8 @@ public default Stream<Entity> stream(String query, Object... params) {
      * @see #list(String, Sort, Object...)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Sort sort, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -494,8 +493,8 @@ public default Stream<Entity> stream(String query, Sort sort, Object... params)
      * @see #list(String, Map)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -513,8 +512,8 @@ public default Stream<Entity> stream(String query, Map<String, Object> params) {
      * @see #list(String, Sort, Map)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Sort sort, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -531,8 +530,8 @@ public default Stream<Entity> stream(String query, Sort sort, Map<String, Object
      * @see #list(String, Parameters)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -550,8 +549,8 @@ public default Stream<Entity> stream(String query, Parameters params) {
      * @see #list(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(String query, Sort sort, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -567,8 +566,8 @@ public default Stream<Entity> stream(String query, Sort sort, Parameters params)
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -585,8 +584,8 @@ public default Stream<Entity> stream(Document query) {
      * @see #stream(Document)
      */
     @GenerateBridge
-    public default Stream<Entity> stream(Document query, Document sort) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> stream(Document query, Document sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -599,8 +598,8 @@ public default Stream<Entity> stream(Document query, Document sort) {
      * @see #listAll()
      */
     @GenerateBridge
-    public default Stream<Entity> streamAll(Sort sort) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> streamAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -613,8 +612,8 @@ public default Stream<Entity> streamAll(Sort sort) {
      * @see #listAll(Sort)
      */
     @GenerateBridge
-    public default Stream<Entity> streamAll() {
-        throw MongoOperations.implementationInjectionMissing();
+    default Stream<Entity> streamAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -626,8 +625,8 @@ public default Stream<Entity> streamAll() {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default long count() {
-        throw MongoOperations.implementationInjectionMissing();
+    default long count() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -641,8 +640,8 @@ public default long count() {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default long count(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long count(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -656,8 +655,8 @@ public default long count(String query, Object... params) {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default long count(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long count(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -671,8 +670,8 @@ public default long count(String query, Map<String, Object> params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default long count(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long count(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -685,8 +684,8 @@ public default long count(String query, Parameters params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default long count(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long count(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -698,8 +697,8 @@ public default long count(Document query) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default long deleteAll() {
-        throw MongoOperations.implementationInjectionMissing();
+    default long deleteAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -709,8 +708,8 @@ public default long deleteAll() {
      * @return false if the entity was not deleted (not found).
      */
     @GenerateBridge
-    public default boolean deleteById(Id id) {
-        throw MongoOperations.implementationInjectionMissing();
+    default boolean deleteById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -724,8 +723,8 @@ public default boolean deleteById(Id id) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default long delete(String query, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long delete(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -739,8 +738,8 @@ public default long delete(String query, Object... params) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default long delete(String query, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long delete(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -754,8 +753,8 @@ public default long delete(String query, Map<String, Object> params) {
      * @see #delete(String, Map)
      */
     @GenerateBridge
-    public default long delete(String query, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long delete(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -768,8 +767,8 @@ public default long delete(String query, Parameters params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default long delete(Document query) {
-        throw MongoOperations.implementationInjectionMissing();
+    default long delete(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -780,8 +779,8 @@ public default long delete(Document query) {
      * @see #persist(Stream)
      * @see #persist(Object,Object...)
      */
-    public default void persist(Iterable<Entity> entities) {
-        MongoOperations.persist(entities);
+    default void persist(Iterable<Entity> entities) {
+        INSTANCE.persist(entities);
     }
 
     /**
@@ -792,8 +791,8 @@ public default void persist(Iterable<Entity> entities) {
      * @see #persist(Iterable)
      * @see #persist(Object,Object...)
      */
-    public default void persist(Stream<Entity> entities) {
-        MongoOperations.persist(entities);
+    default void persist(Stream<Entity> entities) {
+        INSTANCE.persist(entities);
     }
 
     /**
@@ -804,8 +803,8 @@ public default void persist(Stream<Entity> entities) {
      * @see #persist(Stream)
      * @see #persist(Iterable)
      */
-    public default void persist(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
-        MongoOperations.persist(firstEntity, entities);
+    default void persist(Entity firstEntity, Entity... entities) {
+        INSTANCE.persist(firstEntity, entities);
     }
 
     /**
@@ -816,8 +815,8 @@ public default void persist(Entity firstEntity, @SuppressWarnings("unchecked") E
      * @see #update(Stream)
      * @see #update(Object,Object...)
      */
-    public default void update(Iterable<Entity> entities) {
-        MongoOperations.update(entities);
+    default void update(Iterable<Entity> entities) {
+        INSTANCE.update(entities);
     }
 
     /**
@@ -828,8 +827,8 @@ public default void update(Iterable<Entity> entities) {
      * @see #update(Iterable)
      * @see #update(Object,Object...)
      */
-    public default void update(Stream<Entity> entities) {
-        MongoOperations.update(entities);
+    default void update(Stream<Entity> entities) {
+        INSTANCE.update(entities);
     }
 
     /**
@@ -840,8 +839,8 @@ public default void update(Stream<Entity> entities) {
      * @see #update(Stream)
      * @see #update(Iterable)
      */
-    public default void update(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
-        MongoOperations.update(firstEntity, entities);
+    default void update(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
+        INSTANCE.update(firstEntity, entities);
     }
 
     /**
@@ -852,8 +851,8 @@ public default void update(Entity firstEntity, @SuppressWarnings("unchecked") En
      * @see #persistOrUpdate(Stream)
      * @see #persistOrUpdate(Object,Object...)
      */
-    public default void persistOrUpdate(Iterable<Entity> entities) {
-        MongoOperations.persistOrUpdate(entities);
+    default void persistOrUpdate(Iterable<Entity> entities) {
+        INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -864,8 +863,8 @@ public default void persistOrUpdate(Iterable<Entity> entities) {
      * @see #persistOrUpdate(Iterable)
      * @see #persistOrUpdate(Object,Object...)
      */
-    public default void persistOrUpdate(Stream<Entity> entities) {
-        MongoOperations.persistOrUpdate(entities);
+    default void persistOrUpdate(Stream<Entity> entities) {
+        INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -876,15 +875,15 @@ public default void persistOrUpdate(Stream<Entity> entities) {
      * @see #update(Stream)
      * @see #update(Iterable)
      */
-    public default void persistOrUpdate(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
-        MongoOperations.persistOrUpdate(firstEntity, entities);
+    default void persistOrUpdate(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
+        INSTANCE.persistOrUpdate(firstEntity, entities);
     }
 
     /**
      * Update all entities of this type by the given update document, with optional indexed parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which documents the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params optional sequence of indexed parameters
      * @return a new {@link PanacheUpdate} instance for the given update document
@@ -892,15 +891,15 @@ public default void persistOrUpdate(Entity firstEntity, @SuppressWarnings("unche
      * @see #update(String, Parameters)
      */
     @GenerateBridge
-    public default PanacheUpdate update(String update, Object... params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheUpdate update(String update, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which documents the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Map} of named parameters
      * @return a new {@link PanacheUpdate} instance for the given update document
@@ -909,15 +908,15 @@ public default PanacheUpdate update(String update, Object... params) {
      *
      */
     @GenerateBridge
-    public default PanacheUpdate update(String update, Map<String, Object> params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheUpdate update(String update, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Parameters} of named parameters
      * @return a new {@link PanacheUpdate} instance for the given update document
@@ -925,23 +924,23 @@ public default PanacheUpdate update(String update, Map<String, Object> params) {
      * @see #update(String, Map)
      */
     @GenerateBridge
-    public default PanacheUpdate update(String update, Parameters params) {
-        throw MongoOperations.implementationInjectionMissing();
+    default PanacheUpdate update(String update, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Allow to access the underlying Mongo Collection
      */
     @GenerateBridge
-    public default MongoCollection<Entity> mongoCollection() {
-        throw MongoOperations.implementationInjectionMissing();
+    default MongoCollection<Entity> mongoCollection() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Allow to access the underlying Mongo Database.
      */
     @GenerateBridge
-    public default MongoDatabase mongoDatabase() {
-        throw MongoOperations.implementationInjectionMissing();
+    default MongoDatabase mongoDatabase() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheQuery.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheQuery.java
index ea7b9104a74c9..eb7ecfb335346 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheQuery.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/PanacheQuery.java
@@ -4,6 +4,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import com.mongodb.ReadPreference;
 import com.mongodb.client.model.Collation;
 
 import io.quarkus.panache.common.Page;
@@ -144,6 +145,14 @@ public interface PanacheQuery<Entity> {
      */
     public <T extends Entity> PanacheQuery<T> withCollation(Collation collation);
 
+    /**
+     * Define the read preference used for this query.
+     *
+     * @param readPreference the read preference to be used for this query.
+     * @return this query, modified
+     */
+    public <T extends Entity> PanacheQuery<T> withReadPreference(ReadPreference readPreference);
+
     // Results
 
     /**
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/CommonQueryBinder.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/CommonQueryBinder.java
deleted file mode 100644
index e228a0c6be142..0000000000000
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/binder/CommonQueryBinder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package io.quarkus.mongodb.panache.binder;
-
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.stream.Collectors;
-
-import org.bson.types.ObjectId;
-
-final class CommonQueryBinder {
-
-    private static final String ISO_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-    // the default DateTimeFormatter.ISO_LOCAL_DATE_TIME format with too many nano fraction (up to 9) for MongoDB (only 3)
-    private static final DateTimeFormatter ISO_DATE_FORMATTER = DateTimeFormatter.ofPattern(ISO_DATE_PATTERN);
-
-    private CommonQueryBinder() {
-    }
-
-    static String replace(String query, String oldChars, Object value) {
-        return query.replace(oldChars, escape(value));
-    }
-
-    static String escape(Object value) {
-        if (value == null) {
-            return "null";
-        }
-        if (value.getClass().isArray() || Collection.class.isAssignableFrom(value.getClass())) {
-            return arrayAsString(value);
-        }
-        if (Number.class.isAssignableFrom(value.getClass()) || value instanceof Boolean) {
-            return value.toString();
-        }
-        if (value instanceof Date) {
-            SimpleDateFormat dateFormat = new SimpleDateFormat(ISO_DATE_PATTERN);
-            dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-            Date dateValue = (Date) value;
-            return "ISODate('" + dateFormat.format(dateValue) + "')";
-        }
-        if (value instanceof LocalDate) {
-            LocalDate dateValue = (LocalDate) value;
-            return "ISODate('" + DateTimeFormatter.ISO_LOCAL_DATE.format(dateValue) + "')";
-        }
-        if (value instanceof LocalDateTime) {
-            LocalDateTime dateValue = (LocalDateTime) value;
-            return "ISODate('" + ISO_DATE_FORMATTER.format(dateValue.atZone(ZoneOffset.UTC)) + "')";
-        }
-        if (value instanceof Instant) {
-            Instant dateValue = (Instant) value;
-            return "ISODate('" + ISO_DATE_FORMATTER.format(dateValue.atZone(ZoneOffset.UTC)) + "')";
-        }
-        if (value instanceof ObjectId) {
-            ObjectId objectId = (ObjectId) value;
-            return "ObjectId('" + objectId.toHexString() + "')";
-        }
-        return "'" + value.toString().replace("\\", "\\\\").replace("'", "\\'") + "'";
-    }
-
-    /**
-     * Converts Collection or Array to a String separated for ','. Used in $in operators
-     */
-    private static String arrayAsString(Object value) {
-        Object[] valueArray = convertToArray(value);
-
-        return Arrays.stream(valueArray)
-                .map(CommonQueryBinder::escape)
-                .collect(Collectors.joining(", "));
-    }
-
-    private static Object[] convertToArray(Object value) {
-        if (value.getClass().isArray()) {
-            return (Object[]) value;
-        }
-
-        Collection collection = (Collection) value;
-        return collection.toArray(new Object[collection.size()]);
-    }
-}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/package-info.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/package-info.java
index 9e411b999e726..1e845ecd178fa 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/package-info.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/package-info.java
@@ -85,6 +85,11 @@
  * </ul>
  * </p>
  * <p>
+ * <b>WARNING</b>: MongoDB queries must be valid JSON documents,
+ * using the same field multiple times in a query is not allowed using PanacheQL as it would generate an invalid JSON
+ * (see this issue on github: https://github.com/quarkusio/quarkus/issues/12086).
+ * </p>
+ * <p>
  * You can also write native MongoDB queries, in this case the field names are not replaced even if you use
  * <code>@BsonProperty</code>, but you can still use parameterized queries by index or name.<br/>
  * <code>find("{'field':?1}", value)</code> or <code>find("{'field'::key}", value)</code>
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoEntityBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoEntityBase.java
index b4f95eecb8101..c326e9136b749 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoEntityBase.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoEntityBase.java
@@ -1,5 +1,7 @@
 package io.quarkus.mongodb.panache.reactive;
 
+import static io.quarkus.mongodb.panache.reactive.runtime.JavaReactiveMongoOperations.INSTANCE;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -8,8 +10,6 @@
 import org.bson.Document;
 
 import io.quarkus.mongodb.panache.PanacheUpdate;
-import io.quarkus.mongodb.panache.reactive.runtime.ReactiveMongoOperations;
-import io.quarkus.mongodb.panache.runtime.MongoOperations;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
 import io.quarkus.mongodb.reactive.ReactiveMongoDatabase;
 import io.quarkus.panache.common.Parameters;
@@ -26,20 +26,18 @@
  *
  * @see ReactivePanacheMongoEntity
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class ReactivePanacheMongoEntityBase {
-
-    // Operations
-
     /**
      * Persist this entity in the database.
-     * This will set it's ID field if not already set.
+     * This will set its ID field if not already set.
      *
      * @see #persist(Iterable)
      * @see #persist(Stream)
      * @see #persist(Object, Object...)
      */
     public Uni<Void> persist() {
-        return ReactiveMongoOperations.persist(this);
+        return INSTANCE.persist(this);
     }
 
     /**
@@ -50,7 +48,7 @@ public Uni<Void> persist() {
      * @see #update(Object, Object...)
      */
     public Uni<Void> update() {
-        return ReactiveMongoOperations.update(this);
+        return INSTANCE.update(this);
     }
 
     /**
@@ -61,7 +59,7 @@ public Uni<Void> update() {
      * @see #persistOrUpdate(Object, Object...)
      */
     public Uni<Void> persistOrUpdate() {
-        return ReactiveMongoOperations.persistOrUpdate(this);
+        return INSTANCE.persistOrUpdate(this);
     }
 
     /**
@@ -73,7 +71,7 @@ public Uni<Void> persistOrUpdate() {
      * @see #deleteAll()
      */
     public Uni<Void> delete() {
-        return ReactiveMongoOperations.delete(this);
+        return INSTANCE.delete(this);
     }
 
     // Queries
@@ -86,7 +84,7 @@ public Uni<Void> delete() {
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<T> findById(Object id) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -97,7 +95,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<T> findById(Object
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<Optional<T>> findByIdOptional(Object id) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -114,7 +112,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<Optional<T>> findBy
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -133,7 +131,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(String query, Sort sort,
             Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -151,7 +149,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(String query,
             Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -170,7 +168,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(String query, Sort sort,
             Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -187,7 +185,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -206,7 +204,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(String query, Sort sort,
             Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -222,7 +220,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -239,7 +237,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> find(Document query, Document sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -252,7 +250,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> findAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -266,7 +264,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T> findAll(Sort sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -284,7 +282,7 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactivePanacheQuery<T>
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -304,7 +302,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Strin
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(String query, Sort sort,
             Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -323,7 +321,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Strin
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(String query,
             Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -343,7 +341,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Strin
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(String query, Sort sort,
             Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -361,7 +359,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Strin
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -381,7 +379,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Strin
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(String query, Sort sort,
             Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -398,7 +396,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Strin
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -416,7 +414,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Docum
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Document query, Document sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -430,7 +428,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> list(Docum
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> listAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -445,7 +443,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> listAll()
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> listAll(Sort sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -463,7 +461,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Uni<List<T>> listAll(So
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -482,7 +480,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String query, Sort sort, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -500,7 +498,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -520,7 +518,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String query, Sort sort,
             Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -538,7 +536,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -557,7 +555,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String query, Sort sort, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -574,7 +572,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(String
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -592,7 +590,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(Documen
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(Document query, Document sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -606,7 +604,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> stream(Documen
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> streamAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -621,7 +619,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> streamAll() {
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> Multi<T> streamAll(Sort sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -634,7 +632,7 @@ public static <T extends ReactivePanacheMongoEntityBase> Multi<T> streamAll(Sort
      */
     @GenerateBridge
     public static Uni<Long> count() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -649,7 +647,7 @@ public static Uni<Long> count() {
      */
     @GenerateBridge
     public static Uni<Long> count(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -664,7 +662,7 @@ public static Uni<Long> count(String query, Object... params) {
      */
     @GenerateBridge
     public static Uni<Long> count(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -679,7 +677,7 @@ public static Uni<Long> count(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static Uni<Long> count(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -693,7 +691,7 @@ public static Uni<Long> count(String query, Parameters params) {
      */
     @GenerateBridge
     public static Uni<Long> count(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -706,7 +704,7 @@ public static Uni<Long> count(Document query) {
      */
     @GenerateBridge
     public static Uni<Long> deleteAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -717,7 +715,7 @@ public static Uni<Long> deleteAll() {
      */
     @GenerateBridge
     public static Uni<Boolean> deleteById(Object id) {
-        throw MongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -732,7 +730,7 @@ public static Uni<Boolean> deleteById(Object id) {
      */
     @GenerateBridge
     public static Uni<Long> delete(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -747,7 +745,7 @@ public static Uni<Long> delete(String query, Object... params) {
      */
     @GenerateBridge
     public static Uni<Long> delete(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -762,7 +760,7 @@ public static Uni<Long> delete(String query, Map<String, Object> params) {
      */
     @GenerateBridge
     public static Uni<Long> delete(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -776,7 +774,7 @@ public static Uni<Long> delete(String query, Parameters params) {
      */
     @GenerateBridge
     public static Uni<Long> delete(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -788,7 +786,7 @@ public static Uni<Long> delete(Document query) {
      * @see #persist(Object,Object...)
      */
     public static Uni<Void> persist(Iterable<?> entities) {
-        return ReactiveMongoOperations.persist(entities);
+        return INSTANCE.persist(entities);
     }
 
     /**
@@ -800,7 +798,7 @@ public static Uni<Void> persist(Iterable<?> entities) {
      * @see #persist(Object,Object...)
      */
     public static Uni<Void> persist(Stream<?> entities) {
-        return ReactiveMongoOperations.persist(entities);
+        return INSTANCE.persist(entities);
     }
 
     /**
@@ -812,7 +810,7 @@ public static Uni<Void> persist(Stream<?> entities) {
      * @see #persist(Iterable)
      */
     public static Uni<Void> persist(Object firstEntity, Object... entities) {
-        return ReactiveMongoOperations.persist(firstEntity, entities);
+        return INSTANCE.persist(firstEntity, entities);
     }
 
     /**
@@ -824,7 +822,7 @@ public static Uni<Void> persist(Object firstEntity, Object... entities) {
      * @see #update(Object,Object...)
      */
     public static Uni<Void> update(Iterable<?> entities) {
-        return ReactiveMongoOperations.update(entities);
+        return INSTANCE.update(entities);
     }
 
     /**
@@ -836,7 +834,7 @@ public static Uni<Void> update(Iterable<?> entities) {
      * @see #update(Object,Object...)
      */
     public static Uni<Void> update(Stream<?> entities) {
-        return ReactiveMongoOperations.update(entities);
+        return INSTANCE.update(entities);
     }
 
     /**
@@ -848,7 +846,7 @@ public static Uni<Void> update(Stream<?> entities) {
      * @see #update(Iterable)
      */
     public static Uni<Void> update(Object firstEntity, Object... entities) {
-        return ReactiveMongoOperations.update(firstEntity, entities);
+        return INSTANCE.update(firstEntity, entities);
     }
 
     /**
@@ -860,7 +858,7 @@ public static Uni<Void> update(Object firstEntity, Object... entities) {
      * @see #persistOrUpdate(Object,Object...)
      */
     public static Uni<Void> persistOrUpdate(Iterable<?> entities) {
-        return ReactiveMongoOperations.persistOrUpdate(entities);
+        return INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -872,7 +870,7 @@ public static Uni<Void> persistOrUpdate(Iterable<?> entities) {
      * @see #persistOrUpdate(Object,Object...)
      */
     public static Uni<Void> persistOrUpdate(Stream<?> entities) {
-        return ReactiveMongoOperations.persistOrUpdate(entities);
+        return INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -884,14 +882,14 @@ public static Uni<Void> persistOrUpdate(Stream<?> entities) {
      * @see #persistOrUpdate(Iterable)
      */
     public static Uni<Void> persistOrUpdate(Object firstEntity, Object... entities) {
-        return ReactiveMongoOperations.persistOrUpdate(firstEntity, entities);
+        return INSTANCE.persistOrUpdate(firstEntity, entities);
     }
 
     /**
      * Update all entities of this type by the given update document, with optional indexed parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params optional sequence of indexed parameters
      * @return a new {@link ReactivePanacheUpdate} instance for the given update document
@@ -900,14 +898,14 @@ public static Uni<Void> persistOrUpdate(Object firstEntity, Object... entities)
      */
     @GenerateBridge
     public static ReactivePanacheUpdate update(String update, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Map} of named parameters
      * @return a new {@link ReactivePanacheUpdate} instance for the given update document
@@ -917,14 +915,14 @@ public static ReactivePanacheUpdate update(String update, Object... params) {
      */
     @GenerateBridge
     public static ReactivePanacheUpdate update(String update, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Parameters} of named parameters
      * @return a new {@link ReactivePanacheUpdate} instance for the given update document
@@ -933,7 +931,7 @@ public static ReactivePanacheUpdate update(String update, Map<String, Object> pa
      */
     @GenerateBridge
     public static ReactivePanacheUpdate update(String update, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -941,7 +939,7 @@ public static ReactivePanacheUpdate update(String update, Parameters params) {
      */
     @GenerateBridge
     public static <T extends ReactivePanacheMongoEntityBase> ReactiveMongoCollection<T> mongoCollection() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -949,6 +947,6 @@ public static <T extends ReactivePanacheMongoEntityBase> ReactiveMongoCollection
      */
     @GenerateBridge
     public static ReactiveMongoDatabase mongoDatabase() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+        throw INSTANCE.implementationInjectionMissing();
     }
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoRepositoryBase.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoRepositoryBase.java
index 5f6e3fadafb51..8eb0ac42aa98d 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoRepositoryBase.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheMongoRepositoryBase.java
@@ -1,5 +1,7 @@
 package io.quarkus.mongodb.panache.reactive;
 
+import static io.quarkus.mongodb.panache.reactive.runtime.JavaReactiveMongoOperations.INSTANCE;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -8,8 +10,6 @@
 import org.bson.Document;
 
 import io.quarkus.mongodb.panache.PanacheUpdate;
-import io.quarkus.mongodb.panache.reactive.runtime.ReactiveMongoOperations;
-import io.quarkus.mongodb.panache.runtime.MongoOperations;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
 import io.quarkus.mongodb.reactive.ReactiveMongoDatabase;
 import io.quarkus.panache.common.Parameters;
@@ -28,10 +28,8 @@
  * @param <Id> The ID type of the entity
  * @see ReactivePanacheMongoRepository
  */
+@SuppressWarnings("unchecked")
 public interface ReactivePanacheMongoRepositoryBase<Entity, Id> {
-
-    // Operations
-
     /**
      * Persist the given entity in the database.
      * This will set it's ID field if not already set.
@@ -41,8 +39,8 @@ public interface ReactivePanacheMongoRepositoryBase<Entity, Id> {
      * @see #persist(Stream)
      * @see #persist(Object, Object...)
      */
-    public default Uni<Void> persist(Entity entity) {
-        return ReactiveMongoOperations.persist(entity);
+    default Uni<Void> persist(Entity entity) {
+        return INSTANCE.persist(entity);
     }
 
     /**
@@ -53,8 +51,8 @@ public default Uni<Void> persist(Entity entity) {
      * @see #update(Stream)
      * @see #update(Object, Object...)
      */
-    public default Uni<Void> update(Entity entity) {
-        return ReactiveMongoOperations.update(entity);
+    default Uni<Void> update(Entity entity) {
+        return INSTANCE.update(entity);
     }
 
     /**
@@ -65,8 +63,8 @@ public default Uni<Void> update(Entity entity) {
      * @see #persistOrUpdate(Stream)
      * @see #persistOrUpdate(Object, Object...)
      */
-    public default Uni<Void> persistOrUpdate(Entity entity) {
-        return ReactiveMongoOperations.persistOrUpdate(entity);
+    default Uni<Void> persistOrUpdate(Entity entity) {
+        return INSTANCE.persistOrUpdate(entity);
     }
 
     /**
@@ -78,8 +76,8 @@ public default Uni<Void> persistOrUpdate(Entity entity) {
      * @see #delete(String, Parameters)
      * @see #deleteAll()
      */
-    public default Uni<Void> delete(Entity entity) {
-        return ReactiveMongoOperations.delete(entity);
+    default Uni<Void> delete(Entity entity) {
+        return INSTANCE.delete(entity);
     }
 
     // Queries
@@ -91,8 +89,8 @@ public default Uni<Void> delete(Entity entity) {
      * @return the entity found, or <code>null</code> if not found.
      */
     @GenerateBridge
-    public default Uni<Entity> findById(Id id) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Entity> findById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -102,8 +100,8 @@ public default Uni<Entity> findById(Id id) {
      * @return if found, an optional containing the entity, else <code>Optional.empty()</code>.
      */
     @GenerateBridge
-    public default Uni<Optional<Entity>> findByIdOptional(Object id) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Optional<Entity>> findByIdOptional(Object id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -119,8 +117,8 @@ public default Uni<Optional<Entity>> findByIdOptional(Object id) {
      * @see #stream(String, Object...)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -137,8 +135,8 @@ public default ReactivePanacheQuery<Entity> find(String query, Object... params)
      * @see #stream(String, Sort, Object...)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(String query, Sort sort, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -154,8 +152,8 @@ public default ReactivePanacheQuery<Entity> find(String query, Sort sort, Object
      * @see #stream(String, Map)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -172,8 +170,8 @@ public default ReactivePanacheQuery<Entity> find(String query, Map<String, Objec
      * @see #stream(String, Sort, Map)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -189,8 +187,8 @@ public default ReactivePanacheQuery<Entity> find(String query, Sort sort, Map<St
      * @see #stream(String, Parameters)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -207,8 +205,8 @@ public default ReactivePanacheQuery<Entity> find(String query, Parameters params
      * @see #stream(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -223,8 +221,8 @@ public default ReactivePanacheQuery<Entity> find(String query, Sort sort, Parame
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -240,8 +238,8 @@ public default ReactivePanacheQuery<Entity> find(Document query) {
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> find(Document query, Document sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> find(Document query, Document sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -253,8 +251,8 @@ public default ReactivePanacheQuery<Entity> find(Document query, Document sort)
      * @see #streamAll()
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> findAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> findAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -267,8 +265,8 @@ public default ReactivePanacheQuery<Entity> findAll() {
      * @see #streamAll(Sort)
      */
     @GenerateBridge
-    public default ReactivePanacheQuery<Entity> findAll(Sort sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheQuery<Entity> findAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -285,8 +283,8 @@ public default ReactivePanacheQuery<Entity> findAll(Sort sort) {
      * @see #stream(String, Object...)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -304,8 +302,8 @@ public default Uni<List<Entity>> list(String query, Object... params) {
      * @see #stream(String, Sort, Object...)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(String query, Sort sort, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -322,8 +320,8 @@ public default Uni<List<Entity>> list(String query, Sort sort, Object... params)
      * @see #stream(String, Map)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -341,8 +339,8 @@ public default Uni<List<Entity>> list(String query, Map<String, Object> params)
      * @see #stream(String, Sort, Map)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(String query, Sort sort, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -359,8 +357,8 @@ public default Uni<List<Entity>> list(String query, Sort sort, Map<String, Objec
      * @see #stream(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -378,8 +376,8 @@ public default Uni<List<Entity>> list(String query, Parameters params) {
      * @see #stream(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(String query, Sort sort, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -395,8 +393,8 @@ public default Uni<List<Entity>> list(String query, Sort sort, Parameters params
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -413,8 +411,8 @@ public default Uni<List<Entity>> list(Document query) {
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> list(Document query, Document sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> list(Document query, Document sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -427,8 +425,8 @@ public default Uni<List<Entity>> list(Document query, Document sort) {
      * @see #streamAll()
      */
     @GenerateBridge
-    public default Uni<List<Entity>> listAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> listAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -442,8 +440,8 @@ public default Uni<List<Entity>> listAll() {
      * @see #streamAll(Sort)
      */
     @GenerateBridge
-    public default Uni<List<Entity>> listAll(Sort sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<List<Entity>> listAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -460,8 +458,8 @@ public default Uni<List<Entity>> listAll(Sort sort) {
      * @see #list(String, Object...)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -479,8 +477,8 @@ public default Multi<Entity> stream(String query, Object... params) {
      * @see #list(String, Sort, Object...)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(String query, Sort sort, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(String query, Sort sort, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -497,8 +495,8 @@ public default Multi<Entity> stream(String query, Sort sort, Object... params) {
      * @see #list(String, Map)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -516,8 +514,8 @@ public default Multi<Entity> stream(String query, Map<String, Object> params) {
      * @see #list(String, Sort, Map)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(String query, Sort sort, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(String query, Sort sort, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -534,8 +532,8 @@ public default Multi<Entity> stream(String query, Sort sort, Map<String, Object>
      * @see #list(String, Parameters)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -553,8 +551,8 @@ public default Multi<Entity> stream(String query, Parameters params) {
      * @see #list(String, Sort, Parameters)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(String query, Sort sort, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(String query, Sort sort, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -571,8 +569,8 @@ public default Multi<Entity> stream(String query, Sort sort, Parameters params)
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -590,8 +588,8 @@ public default Multi<Entity> stream(Document query) {
      * @see #stream(Document, Document)
      */
     @GenerateBridge
-    public default Multi<Entity> stream(Document query, Document sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> stream(Document query, Document sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -604,8 +602,8 @@ public default Multi<Entity> stream(Document query, Document sort) {
      * @see #listAll()
      */
     @GenerateBridge
-    public default Multi<Entity> streamAll(Sort sort) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> streamAll(Sort sort) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -618,8 +616,8 @@ public default Multi<Entity> streamAll(Sort sort) {
      * @see #listAll(Sort)
      */
     @GenerateBridge
-    public default Multi<Entity> streamAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Multi<Entity> streamAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -631,8 +629,8 @@ public default Multi<Entity> streamAll() {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<Long> count() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> count() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -646,8 +644,8 @@ public default Uni<Long> count() {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<Long> count(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> count(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -661,8 +659,8 @@ public default Uni<Long> count(String query, Object... params) {
      * @see #count(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<Long> count(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> count(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -676,8 +674,8 @@ public default Uni<Long> count(String query, Map<String, Object> params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default Uni<Long> count(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> count(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -690,8 +688,8 @@ public default Uni<Long> count(String query, Parameters params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default Uni<Long> count(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> count(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -703,8 +701,8 @@ public default Uni<Long> count(Document query) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<Long> deleteAll() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> deleteAll() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -714,8 +712,8 @@ public default Uni<Long> deleteAll() {
      * @return false if the entity was not deleted (not found).
      */
     @GenerateBridge
-    public default Uni<Boolean> deleteById(Id id) {
-        throw MongoOperations.implementationInjectionMissing();
+    default Uni<Boolean> deleteById(Id id) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -729,8 +727,8 @@ public default Uni<Boolean> deleteById(Id id) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<Long> delete(String query, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> delete(String query, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -744,8 +742,8 @@ public default Uni<Long> delete(String query, Object... params) {
      * @see #delete(String, Parameters)
      */
     @GenerateBridge
-    public default Uni<Long> delete(String query, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> delete(String query, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -759,8 +757,8 @@ public default Uni<Long> delete(String query, Map<String, Object> params) {
      * @see #delete(String, Map)
      */
     @GenerateBridge
-    public default Uni<Long> delete(String query, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> delete(String query, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -773,8 +771,8 @@ public default Uni<Long> delete(String query, Parameters params) {
      * @see #count(String, Map)
      */
     @GenerateBridge
-    public default Uni<Long> delete(Document query) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default Uni<Long> delete(Document query) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
@@ -785,8 +783,8 @@ public default Uni<Long> delete(Document query) {
      * @see #persist(Stream)
      * @see #persist(Object,Object...)
      */
-    public default Uni<Void> persist(Iterable<Entity> entities) {
-        return ReactiveMongoOperations.persist(entities);
+    default Uni<Void> persist(Iterable<Entity> entities) {
+        return INSTANCE.persist(entities);
     }
 
     /**
@@ -797,8 +795,8 @@ public default Uni<Void> persist(Iterable<Entity> entities) {
      * @see #persist(Iterable)
      * @see #persist(Object,Object...)
      */
-    public default Uni<Void> persist(Stream<Entity> entities) {
-        return ReactiveMongoOperations.persist(entities);
+    default Uni<Void> persist(Stream<Entity> entities) {
+        return INSTANCE.persist(entities);
     }
 
     /**
@@ -809,8 +807,8 @@ public default Uni<Void> persist(Stream<Entity> entities) {
      * @see #persist(Stream)
      * @see #persist(Iterable)
      */
-    public default Uni<Void> persist(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
-        return ReactiveMongoOperations.persist(firstEntity, entities);
+    default Uni<Void> persist(Entity firstEntity, Entity... entities) {
+        return INSTANCE.persist(firstEntity, entities);
     }
 
     /**
@@ -821,8 +819,8 @@ public default Uni<Void> persist(Entity firstEntity, @SuppressWarnings("unchecke
      * @see #update(Stream)
      * @see #update(Object,Object...)
      */
-    public default Uni<Void> update(Iterable<Entity> entities) {
-        return ReactiveMongoOperations.update(entities);
+    default Uni<Void> update(Iterable<Entity> entities) {
+        return INSTANCE.update(entities);
     }
 
     /**
@@ -833,8 +831,8 @@ public default Uni<Void> update(Iterable<Entity> entities) {
      * @see #update(Iterable)
      * @see #update(Object,Object...)
      */
-    public default Uni<Void> update(Stream<Entity> entities) {
-        return ReactiveMongoOperations.update(entities);
+    default Uni<Void> update(Stream<Entity> entities) {
+        return INSTANCE.update(entities);
     }
 
     /**
@@ -845,8 +843,8 @@ public default Uni<Void> update(Stream<Entity> entities) {
      * @see #update(Stream)
      * @see #update(Iterable)
      */
-    public default Uni<Void> update(Entity firstEntity, @SuppressWarnings("unchecked") Entity... entities) {
-        return ReactiveMongoOperations.update(firstEntity, entities);
+    default Uni<Void> update(Entity firstEntity, Entity... entities) {
+        return INSTANCE.update(firstEntity, entities);
     }
 
     /**
@@ -857,8 +855,8 @@ public default Uni<Void> update(Entity firstEntity, @SuppressWarnings("unchecked
      * @see #persistOrUpdate(Stream)
      * @see #persistOrUpdate(Object,Object...)
      */
-    public default Uni<Void> persistOrUpdate(Iterable<Entity> entities) {
-        return ReactiveMongoOperations.persistOrUpdate(entities);
+    default Uni<Void> persistOrUpdate(Iterable<Entity> entities) {
+        return INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -869,8 +867,8 @@ public default Uni<Void> persistOrUpdate(Iterable<Entity> entities) {
      * @see #persistOrUpdate(Iterable)
      * @see #persistOrUpdate(Object,Object...)
      */
-    public default Uni<Void> persistOrUpdate(Stream<Entity> entities) {
-        return ReactiveMongoOperations.persistOrUpdate(entities);
+    default Uni<Void> persistOrUpdate(Stream<Entity> entities) {
+        return INSTANCE.persistOrUpdate(entities);
     }
 
     /**
@@ -881,16 +879,15 @@ public default Uni<Void> persistOrUpdate(Stream<Entity> entities) {
      * @see #update(Stream)
      * @see #update(Iterable)
      */
-    public default Uni<Void> persistOrUpdate(Entity firstEntity,
-            @SuppressWarnings("unchecked") Entity... entities) {
-        return ReactiveMongoOperations.persistOrUpdate(firstEntity, entities);
+    default Uni<Void> persistOrUpdate(Entity firstEntity, Entity... entities) {
+        return INSTANCE.persistOrUpdate(firstEntity, entities);
     }
 
     /**
      * Update all entities of this type by the given update document, with optional indexed parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params optional sequence of indexed parameters
      * @return a new {@link ReactivePanacheUpdate} instance for the given update document
@@ -898,15 +895,15 @@ public default Uni<Void> persistOrUpdate(Entity firstEntity,
      * @see #update(String, Parameters)
      */
     @GenerateBridge
-    public default ReactivePanacheUpdate update(String update, Object... params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheUpdate update(String update, Object... params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Map} of named parameters
      * @return a new {@link ReactivePanacheUpdate} instance for the given update document
@@ -915,15 +912,15 @@ public default ReactivePanacheUpdate update(String update, Object... params) {
      *
      */
     @GenerateBridge
-    public default ReactivePanacheUpdate update(String update, Map<String, Object> params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheUpdate update(String update, Map<String, Object> params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Update all entities of this type by the given update document, with named parameters.
      * The returned {@link PanacheUpdate} object will allow to restrict on which document the update should be applied.
      *
-     * @param update the update document, if it didn't contain <code>$set</code> we add it.
+     * @param update the update document, if it didn't contain any update operator, we add <code>$set</code>.
      *        It can also be expressed as a {@link io.quarkus.mongodb.panache query string}.
      * @param params {@link Parameters} of named parameters
      * @return a new {@link ReactivePanacheUpdate} instance for the given update document
@@ -931,23 +928,23 @@ public default ReactivePanacheUpdate update(String update, Map<String, Object> p
      * @see #update(String, Map)
      */
     @GenerateBridge
-    public default ReactivePanacheUpdate update(String update, Parameters params) {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactivePanacheUpdate update(String update, Parameters params) {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Allow to access the underlying Mongo Collection
      */
     @GenerateBridge
-    public default ReactiveMongoCollection<Entity> mongoCollection() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactiveMongoCollection<Entity> mongoCollection() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 
     /**
      * Allow to access the underlying Mongo Database.
      */
     @GenerateBridge
-    public default ReactiveMongoDatabase mongoDatabase() {
-        throw ReactiveMongoOperations.implementationInjectionMissing();
+    default ReactiveMongoDatabase mongoDatabase() {
+        throw INSTANCE.implementationInjectionMissing();
     }
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheQuery.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheQuery.java
index 1fbf709e70dda..e561d03804a9a 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheQuery.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/ReactivePanacheQuery.java
@@ -4,6 +4,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import com.mongodb.ReadPreference;
 import com.mongodb.client.model.Collation;
 
 import io.quarkus.panache.common.Page;
@@ -146,6 +147,14 @@ public interface ReactivePanacheQuery<Entity> {
      */
     public <T extends Entity> ReactivePanacheQuery<T> withCollation(Collation collation);
 
+    /**
+     * Define the read preference used for this query.
+     *
+     * @param readPreference the read preference to be used for this query.
+     * @return this query, modified
+     */
+    public <T extends Entity> ReactivePanacheQuery<T> withReadPreference(ReadPreference readPreference);
+
     // Results
 
     /**
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/JavaReactiveMongoOperations.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/JavaReactiveMongoOperations.java
new file mode 100644
index 0000000000000..d2fccb28fcac9
--- /dev/null
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/JavaReactiveMongoOperations.java
@@ -0,0 +1,37 @@
+package io.quarkus.mongodb.panache.reactive.runtime;
+
+import java.util.List;
+
+import org.bson.Document;
+
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery;
+import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
+import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+@SuppressWarnings({ "unchecked", "rawtypes" })
+public class JavaReactiveMongoOperations extends ReactiveMongoOperations<ReactivePanacheQuery<?>, ReactivePanacheUpdate> {
+    public static final JavaReactiveMongoOperations INSTANCE = new JavaReactiveMongoOperations();
+
+    @Override
+    protected ReactivePanacheQuery<?> createQuery(ReactiveMongoCollection collection, Document query, Document sortDoc) {
+        return new ReactivePanacheQueryImpl(collection, query, sortDoc);
+    }
+
+    @Override
+    protected ReactivePanacheUpdate createUpdate(ReactiveMongoCollection<?> collection, Class<?> entityClass,
+            Document docUpdate) {
+        return new ReactivePanacheUpdateImpl(this, entityClass, docUpdate, collection);
+    }
+
+    @Override
+    protected Uni<? extends List<?>> list(ReactivePanacheQuery<?> query) {
+        return query.list();
+    }
+
+    @Override
+    protected Multi<?> stream(ReactivePanacheQuery<?> query) {
+        return query.stream();
+    }
+}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactiveMongoOperations.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactiveMongoOperations.java
deleted file mode 100644
index 6e93e4c48fea4..0000000000000
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactiveMongoOperations.java
+++ /dev/null
@@ -1,680 +0,0 @@
-package io.quarkus.mongodb.panache.reactive.runtime;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWriter;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.codecs.Codec;
-import org.bson.codecs.EncoderContext;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.logging.Logger;
-
-import com.mongodb.client.model.InsertOneModel;
-import com.mongodb.client.model.ReplaceOneModel;
-import com.mongodb.client.model.ReplaceOptions;
-import com.mongodb.client.model.WriteModel;
-
-import io.quarkus.arc.Arc;
-import io.quarkus.mongodb.panache.MongoEntity;
-import io.quarkus.mongodb.panache.binder.NativeQueryBinder;
-import io.quarkus.mongodb.panache.binder.PanacheQlQueryBinder;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery;
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
-import io.quarkus.mongodb.panache.runtime.MongoOperations;
-import io.quarkus.mongodb.reactive.ReactiveMongoClient;
-import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
-import io.quarkus.mongodb.reactive.ReactiveMongoDatabase;
-import io.quarkus.panache.common.Parameters;
-import io.quarkus.panache.common.Sort;
-import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.Uni;
-
-public class ReactiveMongoOperations {
-    private static final Logger LOGGER = Logger.getLogger(ReactiveMongoOperations.class);
-    public static final String ID = "_id";
-    public static final String MONGODB_DATABASE = "quarkus.mongodb.database";
-
-    private static volatile String defaultDatabaseName;
-
-    //
-    // Instance methods
-
-    public static Uni<Void> persist(Object entity) {
-        ReactiveMongoCollection collection = mongoCollection(entity);
-        return persist(collection, entity);
-    }
-
-    public static Uni<Void> persist(Iterable<?> entities) {
-        return Uni.createFrom().deferred(() -> {
-            // not all iterables are re-traversal, so we traverse it once for copying inside a list
-            List<Object> objects = new ArrayList<>();
-            for (Object entity : entities) {
-                objects.add(entity);
-            }
-
-            if (objects.size() > 0) {
-                // get the first entity to be able to retrieve the collection with it
-                Object firstEntity = objects.get(0);
-                ReactiveMongoCollection collection = mongoCollection(firstEntity);
-                return persist(collection, objects);
-            }
-            return nullUni();
-        });
-    }
-
-    public static Uni<Void> persist(Object firstEntity, Object... entities) {
-        ReactiveMongoCollection collection = mongoCollection(firstEntity);
-        if (entities == null || entities.length == 0) {
-            return persist(collection, firstEntity);
-        } else {
-            List<Object> entityList = new ArrayList<>();
-            entityList.add(firstEntity);
-            entityList.addAll(Arrays.asList(entities));
-            return persist(collection, entityList);
-        }
-    }
-
-    public static Uni<Void> persist(Stream<?> entities) {
-        return Uni.createFrom().deferred(() -> {
-            List<Object> objects = entities.collect(Collectors.toList());
-            if (objects.size() > 0) {
-                // get the first entity to be able to retrieve the collection with it
-                Object firstEntity = objects.get(0);
-                ReactiveMongoCollection collection = mongoCollection(firstEntity);
-                return persist(collection, objects);
-            }
-            return nullUni();
-        });
-    }
-
-    public static Uni<Void> update(Object entity) {
-        ReactiveMongoCollection collection = mongoCollection(entity);
-        return update(collection, entity);
-    }
-
-    public static Uni<Void> update(Iterable<?> entities) {
-        return Uni.createFrom().deferred(() -> {
-            // not all iterables are re-traversal, so we traverse it once for copying inside a list
-            List<Object> objects = new ArrayList<>();
-            for (Object entity : entities) {
-                objects.add(entity);
-            }
-
-            if (objects.size() > 0) {
-                // get the first entity to be able to retrieve the collection with it
-                Object firstEntity = objects.get(0);
-                ReactiveMongoCollection collection = mongoCollection(firstEntity);
-                return update(collection, objects);
-            }
-            return nullUni();
-        });
-    }
-
-    public static Uni<Void> update(Object firstEntity, Object... entities) {
-        ReactiveMongoCollection collection = mongoCollection(firstEntity);
-        if (entities == null || entities.length == 0) {
-            return update(collection, firstEntity);
-        } else {
-            List<Object> entityList = new ArrayList<>();
-            entityList.add(firstEntity);
-            entityList.addAll(Arrays.asList(entities));
-            return update(collection, entityList);
-        }
-    }
-
-    public static Uni<Void> update(Stream<?> entities) {
-        return Uni.createFrom().deferred(() -> {
-            List<Object> objects = entities.collect(Collectors.toList());
-            if (objects.size() > 0) {
-                // get the first entity to be able to retrieve the collection with it
-                Object firstEntity = objects.get(0);
-                ReactiveMongoCollection collection = mongoCollection(firstEntity);
-                return update(collection, objects);
-            }
-            return nullUni();
-        });
-    }
-
-    public static Uni<Void> persistOrUpdate(Object entity) {
-        ReactiveMongoCollection collection = mongoCollection(entity);
-        return persistOrUpdate(collection, entity);
-    }
-
-    public static Uni<Void> persistOrUpdate(Iterable<?> entities) {
-        return Uni.createFrom().deferred(() -> {
-            // not all iterables are re-traversal, so we traverse it once for copying inside a list
-            List<Object> objects = new ArrayList<>();
-            for (Object entity : entities) {
-                objects.add(entity);
-            }
-
-            if (objects.size() > 0) {
-                // get the first entity to be able to retrieve the collection with it
-                Object firstEntity = objects.get(0);
-                ReactiveMongoCollection collection = mongoCollection(firstEntity);
-                return persistOrUpdate(collection, objects);
-            }
-            return nullUni();
-        });
-    }
-
-    public static Uni<Void> persistOrUpdate(Object firstEntity, Object... entities) {
-        ReactiveMongoCollection collection = mongoCollection(firstEntity);
-        if (entities == null || entities.length == 0) {
-            return persistOrUpdate(collection, firstEntity);
-        } else {
-            List<Object> entityList = new ArrayList<>();
-            entityList.add(firstEntity);
-            entityList.addAll(Arrays.asList(entities));
-            return persistOrUpdate(collection, entityList);
-        }
-    }
-
-    public static Uni<Void> persistOrUpdate(Stream<?> entities) {
-        return Uni.createFrom().deferred(() -> {
-            List<Object> objects = entities.collect(Collectors.toList());
-            if (objects.size() > 0) {
-                // get the first entity to be able to retrieve the collection with it
-                Object firstEntity = objects.get(0);
-                ReactiveMongoCollection collection = mongoCollection(firstEntity);
-                return persistOrUpdate(collection, objects);
-            }
-            return nullUni();
-        });
-    }
-
-    public static Uni<Void> delete(Object entity) {
-        ReactiveMongoCollection collection = mongoCollection(entity);
-        BsonDocument document = getBsonDocument(collection, entity);
-        BsonValue id = document.get(ID);
-        BsonDocument query = new BsonDocument().append(ID, id);
-        return collection.deleteOne(query).onItem().ignore().andContinueWithNull();
-    }
-
-    public static ReactiveMongoCollection mongoCollection(Class<?> entityClass) {
-        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
-        ReactiveMongoDatabase database = mongoDatabase(mongoEntity);
-        if (mongoEntity != null && !mongoEntity.collection().isEmpty()) {
-            return database.getCollection(mongoEntity.collection(), entityClass);
-        }
-        return database.getCollection(entityClass.getSimpleName(), entityClass);
-    }
-
-    public static ReactiveMongoDatabase mongoDatabase(Class<?> entityClass) {
-        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
-        return mongoDatabase(mongoEntity);
-    }
-
-    //
-    // Private stuff
-
-    public static Uni<Void> nullUni() {
-        return Uni.createFrom().item((Void) null);
-    }
-
-    private static Uni<Void> persist(ReactiveMongoCollection collection, Object entity) {
-        return collection.insertOne(entity).onItem().ignore().andContinueWithNull();
-    }
-
-    private static Uni<Void> persist(ReactiveMongoCollection collection, List<Object> entities) {
-        return collection.insertMany(entities).onItem().ignore().andContinueWithNull();
-    }
-
-    private static Uni<Void> update(ReactiveMongoCollection collection, Object entity) {
-        //we transform the entity as a document first
-        BsonDocument document = getBsonDocument(collection, entity);
-
-        //then we get its id field and create a new Document with only this one that will be our replace query
-        BsonValue id = document.get(ID);
-        BsonDocument query = new BsonDocument().append(ID, id);
-        return collection.replaceOne(query, entity).onItem().ignore().andContinueWithNull();
-    }
-
-    private static Uni<Void> update(ReactiveMongoCollection collection, List<Object> entities) {
-        List<Uni<Void>> unis = entities.stream().map(entity -> update(collection, entity)).collect(Collectors.toList());
-        return Uni.combine().all().unis(unis).combinedWith(u -> null);
-    }
-
-    private static Uni<Void> persistOrUpdate(ReactiveMongoCollection collection, Object entity) {
-        //we transform the entity as a document first
-        BsonDocument document = getBsonDocument(collection, entity);
-
-        //then we get its id field and create a new Document with only this one that will be our replace query
-        BsonValue id = document.get(ID);
-        if (id == null) {
-            //insert with autogenerated ID
-            return collection.insertOne(entity).onItem().ignore().andContinueWithNull();
-        } else {
-            //insert with user provided ID or update
-            BsonDocument query = new BsonDocument().append(ID, id);
-            return collection.replaceOne(query, entity, new ReplaceOptions().upsert(true))
-                    .onItem().ignore().andContinueWithNull();
-        }
-    }
-
-    private static Uni<Void> persistOrUpdate(ReactiveMongoCollection collection, List<Object> entities) {
-        //this will be an ordered bulk: it's less performant than a unordered one but will fail at the first failed write
-        List<WriteModel> bulk = new ArrayList<>();
-        for (Object entity : entities) {
-            //we transform the entity as a document first
-            BsonDocument document = getBsonDocument(collection, entity);
-
-            //then we get its id field and create a new Document with only this one that will be our replace query
-            BsonValue id = document.get(ID);
-            if (id == null) {
-                //insert with autogenerated ID
-                bulk.add(new InsertOneModel(entity));
-            } else {
-                //insert with user provided ID or update
-                BsonDocument query = new BsonDocument().append(ID, id);
-                bulk.add(new ReplaceOneModel(query, entity,
-                        new ReplaceOptions().upsert(true)));
-            }
-        }
-
-        return collection.bulkWrite(bulk).onItem().ignore().andContinueWithNull();
-    }
-
-    private static BsonDocument getBsonDocument(ReactiveMongoCollection collection, Object entity) {
-        BsonDocument document = new BsonDocument();
-        Codec codec = collection.getCodecRegistry().get(entity.getClass());
-        codec.encode(new BsonDocumentWriter(document), entity, EncoderContext.builder().build());
-        return document;
-    }
-
-    private static ReactiveMongoCollection mongoCollection(Object entity) {
-        Class<?> entityClass = entity.getClass();
-        return mongoCollection(entityClass);
-    }
-
-    private static ReactiveMongoDatabase mongoDatabase(MongoEntity entity) {
-        ReactiveMongoClient mongoClient = mongoClient(entity);
-        if (entity != null && !entity.database().isEmpty()) {
-            return mongoClient.getDatabase(entity.database());
-        }
-        String databaseName = getDefaultDatabaseName();
-        return mongoClient.getDatabase(databaseName);
-    }
-
-    private static String getDefaultDatabaseName() {
-        if (defaultDatabaseName == null) {
-            synchronized (MongoOperations.class) {
-                if (defaultDatabaseName == null) {
-                    defaultDatabaseName = ConfigProvider.getConfig()
-                            .getValue(MONGODB_DATABASE, String.class);
-                }
-            }
-        }
-        return defaultDatabaseName;
-    }
-
-    private static ReactiveMongoClient mongoClient(MongoEntity entity) {
-        if (entity != null && !entity.clientName().isEmpty()) {
-            Set<Bean<?>> beans = Arc.container().beanManager().getBeans(ReactiveMongoClient.class);
-            for (Bean<?> bean : beans) {
-                if (bean.getName() != null) {
-                    return (ReactiveMongoClient) Arc.container().instance(entity.clientName()).get();
-                }
-            }
-        }
-        return Arc.container().instance(ReactiveMongoClient.class).get();
-    }
-
-    //
-    // Queries
-
-    public static Uni<Object> findById(Class<?> entityClass, Object id) {
-        Uni<Optional> optionalEntity = findByIdOptional(entityClass, id);
-        return optionalEntity.onItem().transform(optional -> optional.orElse(null));
-    }
-
-    public static Uni<Optional> findByIdOptional(Class<?> entityClass, Object id) {
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return collection.find(new Document(ID, id)).collectItems().first()
-                .onItem().transform(Optional::ofNullable);
-    }
-
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, String query, Object... params) {
-        return find(entityClass, query, null, params);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Object... params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        Document docSort = sortToDocument(sort);
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return new ReactivePanacheQueryImpl(collection, docQuery, docSort);
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
-     * and like <code>firstname = ?1</code> for PanacheQL one.
-     */
-    static String bindFilter(Class<?> clazz, String query, Object[] params) {
-        String bindQuery = bindQuery(clazz, query, params);
-        LOGGER.debug(bindQuery);
-        return bindQuery;
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
-     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
-     */
-    static String bindFilter(Class<?> clazz, String query, Map<String, Object> params) {
-        String bindQuery = bindQuery(clazz, query, params);
-        LOGGER.debug(bindQuery);
-        return bindQuery;
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
-     * and like <code>firstname = ?1 and lastname = ?2</code> for PanacheQL one.
-     * As update document needs a <code>$set</code> operator we add it if needed.
-     */
-    static String bindUpdate(Class<?> clazz, String query, Object[] params) {
-        String bindUpdate = bindQuery(clazz, query, params);
-        if (!bindUpdate.contains("$set")) {
-            bindUpdate = "{'$set':" + bindUpdate + "}";
-        }
-        LOGGER.debug(bindUpdate);
-        return bindUpdate;
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
-     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
-     * As update document needs a <code>$set</code> operator we add it if needed.
-     */
-    static String bindUpdate(Class<?> clazz, String query, Map<String, Object> params) {
-        String bindUpdate = bindQuery(clazz, query, params);
-        if (!bindUpdate.contains("$set")) {
-            bindUpdate = "{'$set':" + bindUpdate + "}";
-        }
-        LOGGER.debug(bindUpdate);
-        return bindUpdate;
-    }
-
-    static String bindQuery(Class<?> clazz, String query, Object[] params) {
-        String bindQuery = null;
-
-        //determine the type of the query
-        if (query.charAt(0) == '{') {
-            //this is a native query
-            bindQuery = NativeQueryBinder.bindQuery(query, params);
-        } else {
-            //this is a PanacheQL query
-            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
-        }
-
-        return bindQuery;
-    }
-
-    static String bindQuery(Class<?> clazz, String query, Map<String, Object> params) {
-        String bindQuery = null;
-
-        //determine the type of the query
-        if (query.charAt(0) == '{') {
-            //this is a native query
-            bindQuery = NativeQueryBinder.bindQuery(query, params);
-        } else {
-            //this is a PanacheQL query
-            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
-        }
-
-        return bindQuery;
-    }
-
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, String query, Map<String, Object> params) {
-        return find(entityClass, query, null, params);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        Document docSort = sortToDocument(sort);
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return new ReactivePanacheQueryImpl(collection, docQuery, docSort);
-    }
-
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, String query, Parameters params) {
-        return find(entityClass, query, null, params.map());
-    }
-
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return find(entityClass, query, sort, params.map());
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, Document query, Sort sort) {
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        Document sortDoc = sortToDocument(sort);
-        return new ReactivePanacheQueryImpl(collection, query, sortDoc);
-    }
-
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, Document query, Document sort) {
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return new ReactivePanacheQueryImpl(collection, query, sort);
-    }
-
-    public static ReactivePanacheQuery<?> find(Class<?> entityClass, Document query) {
-        return find(entityClass, query, (Document) null);
-    }
-
-    public static Uni<List<?>> list(Class<?> entityClass, String query, Object... params) {
-        return (Uni) find(entityClass, query, params).list();
-    }
-
-    public static Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return (Uni) find(entityClass, query, sort, params).list();
-    }
-
-    public static Uni<List<?>> list(Class<?> entityClass, String query, Map<String, Object> params) {
-        return (Uni) find(entityClass, query, params).list();
-    }
-
-    public static Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return (Uni) find(entityClass, query, sort, params).list();
-    }
-
-    public static Uni<List<?>> list(Class<?> entityClass, String query, Parameters params) {
-        return (Uni) find(entityClass, query, params).list();
-    }
-
-    public static Uni<List<?>> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return (Uni) find(entityClass, query, sort, params).list();
-    }
-
-    //specific Mongo query
-    public static Uni<List<?>> list(Class<?> entityClass, Document query) {
-        return (Uni) find(entityClass, query).list();
-    }
-
-    //specific Mongo query
-    public static Uni<List<?>> list(Class<?> entityClass, Document query, Document sort) {
-        return (Uni) find(entityClass, query, sort).list();
-    }
-
-    public static Multi<?> stream(Class<?> entityClass, String query, Object... params) {
-        return find(entityClass, query, params).stream();
-    }
-
-    public static Multi<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return find(entityClass, query, sort, params).stream();
-    }
-
-    public static Multi<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
-        return find(entityClass, query, params).stream();
-    }
-
-    public static Multi<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return find(entityClass, query, sort, params).stream();
-    }
-
-    public static Multi<?> stream(Class<?> entityClass, String query, Parameters params) {
-        return find(entityClass, query, params).stream();
-    }
-
-    public static Multi<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return find(entityClass, query, sort, params).stream();
-    }
-
-    //specific Mongo query
-    public static Multi<?> stream(Class<?> entityClass, Document query) {
-        return find(entityClass, query).stream();
-    }
-
-    //specific Mongo query
-    public static Multi<?> stream(Class<?> entityClass, Document query, Document sort) {
-        return find(entityClass, query, sort).stream();
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static ReactivePanacheQuery<?> findAll(Class<?> entityClass) {
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return new ReactivePanacheQueryImpl(collection, null, null);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static ReactivePanacheQuery<?> findAll(Class<?> entityClass, Sort sort) {
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        Document sortDoc = sortToDocument(sort);
-        return new ReactivePanacheQueryImpl(collection, null, sortDoc);
-    }
-
-    private static Document sortToDocument(Sort sort) {
-        if (sort == null) {
-            return null;
-        }
-
-        Document sortDoc = new Document();
-        for (Sort.Column col : sort.getColumns()) {
-            sortDoc.append(col.getName(), col.getDirection() == Sort.Direction.Ascending ? 1 : -1);
-        }
-        return sortDoc;
-    }
-
-    public static Uni<List<?>> listAll(Class<?> entityClass) {
-        return (Uni) findAll(entityClass).list();
-    }
-
-    public static Uni<List<?>> listAll(Class<?> entityClass, Sort sort) {
-        return (Uni) findAll(entityClass, sort).list();
-    }
-
-    public static Multi<?> streamAll(Class<?> entityClass) {
-        return findAll(entityClass).stream();
-    }
-
-    public static Multi<?> streamAll(Class<?> entityClass, Sort sort) {
-        return findAll(entityClass, sort).stream();
-    }
-
-    public static Uni<Long> count(Class<?> entityClass) {
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments();
-    }
-
-    public static Uni<Long> count(Class<?> entityClass, String query, Object... params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments(docQuery);
-    }
-
-    public static Uni<Long> count(Class<?> entityClass, String query, Map<String, Object> params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        ReactiveMongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments(docQuery);
-    }
-
-    public static Uni<Long> count(Class<?> entityClass, String query, Parameters params) {
-        return count(entityClass, query, params.map());
-    }
-
-    //specific Mongo query
-    public static Uni<Long> count(Class<?> entityClass, Document query) {
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return collection.countDocuments(query);
-    }
-
-    public static Uni<Long> deleteAll(Class<?> entityClass) {
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return collection.deleteMany(new Document()).map(deleteResult -> deleteResult.getDeletedCount());
-    }
-
-    public static Uni<Boolean> deleteById(Class<?> entityClass, Object id) {
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        Document query = new Document().append(ID, id);
-        return collection.deleteOne(query).map(results -> results.getDeletedCount() == 1);
-    }
-
-    public static Uni<Long> delete(Class<?> entityClass, String query, Object... params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return collection.deleteMany(docQuery).map(deleteResult -> deleteResult.getDeletedCount());
-    }
-
-    public static Uni<Long> delete(Class<?> entityClass, String query, Map<String, Object> params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return collection.deleteMany(docQuery).map(deleteResult -> deleteResult.getDeletedCount());
-    }
-
-    public static Uni<Long> delete(Class<?> entityClass, String query, Parameters params) {
-        return delete(entityClass, query, params.map());
-    }
-
-    //specific Mongo query
-    public static Uni<Long> delete(Class<?> entityClass, Document query) {
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return collection.deleteMany(query).map(deleteResult -> deleteResult.getDeletedCount());
-    }
-
-    public static ReactivePanacheUpdate update(Class<?> entityClass, String update, Map<String, Object> params) {
-        return executeUpdate(entityClass, update, params);
-    }
-
-    public static ReactivePanacheUpdate update(Class<?> entityClass, String update, Parameters params) {
-        return update(entityClass, update, params.map());
-    }
-
-    public static ReactivePanacheUpdate update(Class<?> entityClass, String update, Object... params) {
-        return executeUpdate(entityClass, update, params);
-    }
-
-    private static ReactivePanacheUpdate executeUpdate(Class<?> entityClass, String update, Object... params) {
-        String bindUpdate = bindUpdate(entityClass, update, params);
-        BsonDocument docUpdate = BsonDocument.parse(bindUpdate);
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return new ReactivePanacheUpdateImpl(entityClass, docUpdate, collection);
-    }
-
-    private static ReactivePanacheUpdate executeUpdate(Class<?> entityClass, String update, Map<String, Object> params) {
-        String bindUpdate = bindUpdate(entityClass, update, params);
-        BsonDocument docUpdate = BsonDocument.parse(bindUpdate);
-        ReactiveMongoCollection<?> collection = mongoCollection(entityClass);
-        return new ReactivePanacheUpdateImpl(entityClass, docUpdate, collection);
-    }
-
-    public static IllegalStateException implementationInjectionMissing() {
-        return new IllegalStateException(
-                "This method is normally automatically overridden in subclasses");
-    }
-
-}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java
index 4ebd2b7d73ff0..cdf257cb5d490 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java
@@ -2,74 +2,39 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 
-import org.bson.Document;
 import org.bson.conversions.Bson;
 
+import com.mongodb.ReadPreference;
 import com.mongodb.client.model.Collation;
 
-import io.quarkus.mongodb.FindOptions;
 import io.quarkus.mongodb.panache.reactive.ReactivePanacheQuery;
-import io.quarkus.mongodb.panache.runtime.MongoPropertyUtil;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
 import io.quarkus.panache.common.Page;
-import io.quarkus.panache.common.Range;
-import io.quarkus.panache.common.exception.PanacheQueryException;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 
+@SuppressWarnings("unchecked")
 public class ReactivePanacheQueryImpl<Entity> implements ReactivePanacheQuery<Entity> {
-    private ReactiveMongoCollection collection;
-    private Bson mongoQuery;
-    private Bson sort;
-    private Bson projections;
-
-    private Page page;
-    private Uni<Long> count;
-
-    private Range range;
-
-    private Collation collation;
+    private final CommonReactivePanacheQueryImpl<Entity> delegate;
 
     ReactivePanacheQueryImpl(ReactiveMongoCollection<? extends Entity> collection, Bson mongoQuery, Bson sort) {
-        this.collection = collection;
-        this.mongoQuery = mongoQuery;
-        this.sort = sort;
+        this.delegate = new CommonReactivePanacheQueryImpl<>(collection, mongoQuery, sort);
     }
 
-    private ReactivePanacheQueryImpl(ReactivePanacheQueryImpl previousQuery, Bson projections, Class<?> type) {
-        this.collection = previousQuery.collection.withDocumentClass(type);
-        this.mongoQuery = previousQuery.mongoQuery;
-        this.sort = previousQuery.sort;
-        this.projections = projections;
-        this.page = previousQuery.page;
-        this.count = previousQuery.count;
-        this.range = previousQuery.range;
-        this.collation = previousQuery.collation;
+    private ReactivePanacheQueryImpl(CommonReactivePanacheQueryImpl<Entity> delegate) {
+        this.delegate = delegate;
     }
 
-    // Builder
-
     @Override
     public <T> ReactivePanacheQuery<T> project(Class<T> type) {
-        // collect field names from public fields and getters
-        Set<String> fieldNames = MongoPropertyUtil.collectFields(type);
-
-        // create the projection document
-        Document projections = new Document();
-        for (String fieldName : fieldNames) {
-            projections.append(fieldName, 1);
-        }
-
-        return new ReactivePanacheQueryImpl(this, projections, type);
+        return new ReactivePanacheQueryImpl<>(delegate.project(type));
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <T extends Entity> ReactivePanacheQuery<T> page(Page page) {
-        this.page = page;
-        this.range = null; // reset the range to be able to switch from range to page
+        delegate.page(page);
         return (ReactivePanacheQuery<T>) this;
     }
 
@@ -80,179 +45,98 @@ public <T extends Entity> ReactivePanacheQuery<T> page(int pageIndex, int pageSi
 
     @Override
     public <T extends Entity> ReactivePanacheQuery<T> nextPage() {
-        checkPagination();
-        return page(page.next());
+        delegate.nextPage();
+        return (ReactivePanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> ReactivePanacheQuery<T> previousPage() {
-        checkPagination();
-        return page(page.previous());
+        delegate.previousPage();
+        return (ReactivePanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> ReactivePanacheQuery<T> firstPage() {
-        checkPagination();
-        return page(page.first());
+        delegate.firstPage();
+        return (ReactivePanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> Uni<ReactivePanacheQuery<T>> lastPage() {
-        checkPagination();
-        return pageCount().map(pageCount -> page(page.index(pageCount - 1)));
+        Uni<CommonReactivePanacheQueryImpl<T>> uni = delegate.lastPage();
+        return uni.map(q -> (ReactivePanacheQuery<T>) this);
     }
 
     @Override
     public Uni<Boolean> hasNextPage() {
-        checkPagination();
-        return pageCount().map(pageCount -> page.index < (pageCount - 1));
+        return delegate.hasNextPage();
     }
 
     @Override
     public boolean hasPreviousPage() {
-        checkPagination();
-        return page.index > 0;
+        return delegate.hasPreviousPage();
     }
 
     @Override
     public Uni<Integer> pageCount() {
-        checkPagination();
-        return count().map(count -> {
-            if (count == 0)
-                return 1; // a single page of zero results
-            return (int) Math.ceil((double) count / (double) page.size);
-        });
+        return delegate.pageCount();
     }
 
     @Override
     public Page page() {
-        checkPagination();
-        return page;
-    }
-
-    private void checkPagination() {
-        if (page == null) {
-            throw new UnsupportedOperationException(
-                    "Cannot call a page related method, "
-                            + "call page(Page) or page(int, int) to initiate pagination first");
-        }
-        if (range != null) {
-            throw new UnsupportedOperationException("Cannot call a page related method in a ranged query, " +
-                    "call page(Page) or page(int, int) to initiate pagination first");
-        }
+        return delegate.page();
     }
 
     @Override
     public <T extends Entity> ReactivePanacheQuery<T> range(int startIndex, int lastIndex) {
-        this.range = Range.of(startIndex, lastIndex);
-        // reset the page to its default to be able to switch from page to range
-        this.page = null;
+        delegate.range(startIndex, lastIndex);
         return (ReactivePanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> ReactivePanacheQuery<T> withCollation(Collation collation) {
-        this.collation = collation;
+        delegate.withCollation(collation);
         return (ReactivePanacheQuery<T>) this;
     }
 
-    // Results
+    @Override
+    public <T extends Entity> ReactivePanacheQuery<T> withReadPreference(ReadPreference readPreference) {
+        delegate.withReadPreference(readPreference);
+        return (ReactivePanacheQuery<T>) this;
+    }
 
     @Override
-    @SuppressWarnings("unchecked")
     public Uni<Long> count() {
-        if (count == null) {
-            count = collection.countDocuments(mongoQuery);
-        }
-        return count;
+        return delegate.count();
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T extends Entity> Uni<List<T>> list() {
-        Multi<T> results = stream();
-        return results.collectItems().asList();
+        return delegate.list();
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T extends Entity> Multi<T> stream() {
-        FindOptions options = buildOptions();
-        return mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
+        return delegate.stream();
     }
 
     @Override
     public <T extends Entity> Uni<T> firstResult() {
-        Uni<Optional<T>> optionalEntity = firstResultOptional();
-        return optionalEntity.map(optional -> optional.orElse(null));
+        return delegate.firstResult();
     }
 
     @Override
     public <T extends Entity> Uni<Optional<T>> firstResultOptional() {
-        FindOptions options = buildOptions(1);
-        Multi<T> results = mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
-        return results.collectItems().first().map(o -> Optional.ofNullable(o));
+        return delegate.firstResultOptional();
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T extends Entity> Uni<T> singleResult() {
-        FindOptions options = buildOptions(2);
-        Multi<T> results = mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
-        return results.collectItems().asList().map(list -> {
-            if (list.size() != 1) {
-                throw new PanacheQueryException("There should be only one result");
-            } else {
-                return list.get(0);
-            }
-        });
+        return delegate.singleResult();
     }
 
     @Override
     public <T extends Entity> Uni<Optional<T>> singleResultOptional() {
-        FindOptions options = buildOptions(2);
-        Multi<T> results = mongoQuery == null ? collection.find(options) : collection.find(mongoQuery, options);
-        return results.collectItems().asList().map(list -> {
-            if (list.size() == 2) {
-                throw new PanacheQueryException("There should be no more than one result");
-            }
-            return list.isEmpty() ? Optional.empty() : Optional.of(list.get(0));
-        });
-    }
-
-    private FindOptions buildOptions() {
-        FindOptions options = new FindOptions();
-        options.sort(sort);
-        if (range != null) {
-            // range is 0 based, so we add 1 to the limit
-            options.skip(range.getStartIndex()).limit(range.getLastIndex() - range.getStartIndex() + 1);
-        } else if (page != null) {
-            options.skip(page.index * page.size).limit(page.size);
-        }
-        if (projections != null) {
-            options.projection(this.projections);
-        }
-        if (this.collation != null) {
-            options.collation(collation);
-        }
-        return options;
-    }
-
-    private FindOptions buildOptions(int maxResults) {
-        FindOptions options = new FindOptions();
-        options.sort(sort);
-        if (range != null) {
-            // range is 0 based, so we add 1 to the limit
-            options.skip(range.getStartIndex());
-        } else if (page != null) {
-            options.skip(page.index * page.size);
-        }
-        if (projections != null) {
-            options.projection(this.projections);
-        }
-        if (this.collation != null) {
-            options.collation(collation);
-        }
-        return options.limit(maxResults);
+        return delegate.singleResultOptional();
     }
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheUpdateImpl.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheUpdateImpl.java
deleted file mode 100644
index c380211a3edbe..0000000000000
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheUpdateImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.quarkus.mongodb.panache.reactive.runtime;
-
-import java.util.Map;
-
-import org.bson.BsonDocument;
-import org.bson.conversions.Bson;
-
-import io.quarkus.mongodb.panache.reactive.ReactivePanacheUpdate;
-import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
-import io.quarkus.panache.common.Parameters;
-import io.smallrye.mutiny.Uni;
-
-public class ReactivePanacheUpdateImpl implements ReactivePanacheUpdate {
-    private Class<?> entityClass;
-    private Bson update;
-    private ReactiveMongoCollection<?> collection;
-
-    public ReactivePanacheUpdateImpl(Class<?> entityClass, Bson update, ReactiveMongoCollection<?> collection) {
-        this.entityClass = entityClass;
-        this.update = update;
-        this.collection = collection;
-    }
-
-    @Override
-    public Uni<Long> where(String query, Object... params) {
-        String bindQuery = ReactiveMongoOperations.bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        return collection.updateMany(docQuery, update).map(result -> result.getModifiedCount());
-    }
-
-    @Override
-    public Uni<Long> where(String query, Map<String, Object> params) {
-        String bindQuery = ReactiveMongoOperations.bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        return collection.updateMany(docQuery, update).map(result -> result.getModifiedCount());
-    }
-
-    @Override
-    public Uni<Long> where(String query, Parameters params) {
-        return where(query, params.map());
-    }
-
-    @Override
-    public Uni<Long> all() {
-        return collection.updateMany(new BsonDocument(), update).map(result -> result.getModifiedCount());
-    }
-}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/JavaMongoOperations.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/JavaMongoOperations.java
new file mode 100644
index 0000000000000..5b40d09cabe18
--- /dev/null
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/JavaMongoOperations.java
@@ -0,0 +1,38 @@
+package io.quarkus.mongodb.panache.runtime;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+
+import com.mongodb.client.MongoCollection;
+
+import io.quarkus.mongodb.panache.PanacheQuery;
+import io.quarkus.mongodb.panache.PanacheUpdate;
+
+public class JavaMongoOperations extends MongoOperations<PanacheQuery<?>, PanacheUpdate> {
+    /**
+     * Provides the default implementations for quarkus to wire up. Should not be used by third party developers.
+     */
+    public static final JavaMongoOperations INSTANCE = new JavaMongoOperations();
+
+    @Override
+    protected PanacheQuery<?> createQuery(MongoCollection collection, Document query, Document sortDoc) {
+        return new PanacheQueryImpl(collection, query, sortDoc);
+    }
+
+    @Override
+    protected PanacheUpdate createUpdate(MongoCollection collection, Class<?> entityClass, Document docUpdate) {
+        return new PanacheUpdateImpl(this, entityClass, docUpdate, collection);
+    }
+
+    @Override
+    protected List<?> list(PanacheQuery<?> query) {
+        return query.list();
+    }
+
+    @Override
+    protected Stream<?> stream(PanacheQuery<?> query) {
+        return query.stream();
+    }
+}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoOperations.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoOperations.java
deleted file mode 100644
index 3afdbfd5c3191..0000000000000
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/MongoOperations.java
+++ /dev/null
@@ -1,651 +0,0 @@
-package io.quarkus.mongodb.panache.runtime;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWriter;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.codecs.Codec;
-import org.bson.codecs.EncoderContext;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.logging.Logger;
-
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.model.InsertOneModel;
-import com.mongodb.client.model.ReplaceOneModel;
-import com.mongodb.client.model.ReplaceOptions;
-import com.mongodb.client.model.WriteModel;
-import com.mongodb.client.result.DeleteResult;
-
-import io.quarkus.arc.Arc;
-import io.quarkus.mongodb.panache.MongoEntity;
-import io.quarkus.mongodb.panache.PanacheQuery;
-import io.quarkus.mongodb.panache.PanacheUpdate;
-import io.quarkus.mongodb.panache.binder.NativeQueryBinder;
-import io.quarkus.mongodb.panache.binder.PanacheQlQueryBinder;
-import io.quarkus.panache.common.Parameters;
-import io.quarkus.panache.common.Sort;
-
-public class MongoOperations {
-    private static final Logger LOGGER = Logger.getLogger(MongoOperations.class);
-    public static final String ID = "_id";
-    public static final String MONGODB_DATABASE = "quarkus.mongodb.database";
-
-    private static volatile String defaultDatabaseName;
-
-    //
-    // Instance methods
-
-    public static void persist(Object entity) {
-        MongoCollection collection = mongoCollection(entity);
-        persist(collection, entity);
-    }
-
-    public static void persist(Iterable<?> entities) {
-        // not all iterables are re-traversal, so we traverse it once for copying inside a list
-        List<Object> objects = new ArrayList<>();
-        for (Object entity : entities) {
-            objects.add(entity);
-        }
-
-        if (objects.size() > 0) {
-            // get the first entity to be able to retrieve the collection with it
-            Object firstEntity = objects.get(0);
-            MongoCollection collection = mongoCollection(firstEntity);
-            persist(collection, objects);
-        }
-    }
-
-    public static void persist(Object firstEntity, Object... entities) {
-        MongoCollection collection = mongoCollection(firstEntity);
-        if (entities == null || entities.length == 0) {
-            persist(collection, firstEntity);
-        } else {
-            List<Object> entityList = new ArrayList<>();
-            entityList.add(firstEntity);
-            entityList.addAll(Arrays.asList(entities));
-            persist(collection, entityList);
-        }
-    }
-
-    public static void persist(Stream<?> entities) {
-        List<Object> objects = entities.collect(Collectors.toList());
-        if (objects.size() > 0) {
-            // get the first entity to be able to retrieve the collection with it
-            Object firstEntity = objects.get(0);
-            MongoCollection collection = mongoCollection(firstEntity);
-            persist(collection, objects);
-        }
-    }
-
-    public static void update(Object entity) {
-        MongoCollection collection = mongoCollection(entity);
-        update(collection, entity);
-    }
-
-    public static void update(Iterable<?> entities) {
-        // not all iterables are re-traversal, so we traverse it once for copying inside a list
-        List<Object> objects = new ArrayList<>();
-        for (Object entity : entities) {
-            objects.add(entity);
-        }
-
-        if (objects.size() > 0) {
-            // get the first entity to be able to retrieve the collection with it
-            Object firstEntity = objects.get(0);
-            MongoCollection collection = mongoCollection(firstEntity);
-            update(collection, objects);
-        }
-    }
-
-    public static void update(Object firstEntity, Object... entities) {
-        MongoCollection collection = mongoCollection(firstEntity);
-        if (entities == null || entities.length == 0) {
-            update(collection, firstEntity);
-        } else {
-            List<Object> entityList = new ArrayList<>();
-            entityList.add(firstEntity);
-            entityList.addAll(Arrays.asList(entities));
-            update(collection, entityList);
-        }
-    }
-
-    public static void update(Stream<?> entities) {
-        List<Object> objects = entities.collect(Collectors.toList());
-        if (objects.size() > 0) {
-            // get the first entity to be able to retrieve the collection with it
-            Object firstEntity = objects.get(0);
-            MongoCollection collection = mongoCollection(firstEntity);
-            update(collection, objects);
-        }
-    }
-
-    public static void persistOrUpdate(Object entity) {
-        MongoCollection collection = mongoCollection(entity);
-        persistOrUpdate(collection, entity);
-    }
-
-    public static void persistOrUpdate(Iterable<?> entities) {
-        // not all iterables are re-traversal, so we traverse it once for copying inside a list
-        List<Object> objects = new ArrayList<>();
-        for (Object entity : entities) {
-            objects.add(entity);
-        }
-
-        if (objects.size() > 0) {
-            // get the first entity to be able to retrieve the collection with it
-            Object firstEntity = objects.get(0);
-            MongoCollection collection = mongoCollection(firstEntity);
-            persistOrUpdate(collection, objects);
-        }
-    }
-
-    public static void persistOrUpdate(Object firstEntity, Object... entities) {
-        MongoCollection collection = mongoCollection(firstEntity);
-        if (entities == null || entities.length == 0) {
-            persistOrUpdate(collection, firstEntity);
-        } else {
-            List<Object> entityList = new ArrayList<>();
-            entityList.add(firstEntity);
-            entityList.addAll(Arrays.asList(entities));
-            persistOrUpdate(collection, entityList);
-        }
-    }
-
-    public static void persistOrUpdate(Stream<?> entities) {
-        List<Object> objects = entities.collect(Collectors.toList());
-        if (objects.size() > 0) {
-            // get the first entity to be able to retrieve the collection with it
-            Object firstEntity = objects.get(0);
-            MongoCollection collection = mongoCollection(firstEntity);
-            persistOrUpdate(collection, objects);
-        }
-    }
-
-    public static void delete(Object entity) {
-        MongoCollection collection = mongoCollection(entity);
-        BsonDocument document = getBsonDocument(collection, entity);
-        BsonValue id = document.get(ID);
-        BsonDocument query = new BsonDocument().append(ID, id);
-        collection.deleteOne(query);
-    }
-
-    public static MongoCollection mongoCollection(Class<?> entityClass) {
-        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
-        MongoDatabase database = mongoDatabase(mongoEntity);
-        if (mongoEntity != null && !mongoEntity.collection().isEmpty()) {
-            return database.getCollection(mongoEntity.collection(), entityClass);
-        }
-        return database.getCollection(entityClass.getSimpleName(), entityClass);
-    }
-
-    public static MongoDatabase mongoDatabase(Class<?> entityClass) {
-        MongoEntity mongoEntity = entityClass.getAnnotation(MongoEntity.class);
-        return mongoDatabase(mongoEntity);
-    }
-
-    //
-    // Private stuff
-
-    private static void persist(MongoCollection collection, Object entity) {
-        collection.insertOne(entity);
-    }
-
-    private static void persist(MongoCollection collection, List<Object> entities) {
-        collection.insertMany(entities);
-    }
-
-    private static void update(MongoCollection collection, Object entity) {
-        //we transform the entity as a document first
-        BsonDocument document = getBsonDocument(collection, entity);
-
-        //then we get its id field and create a new Document with only this one that will be our replace query
-        BsonValue id = document.get(ID);
-        BsonDocument query = new BsonDocument().append(ID, id);
-        collection.replaceOne(query, entity);
-    }
-
-    private static void update(MongoCollection collection, List<Object> entities) {
-        for (Object entity : entities) {
-            update(collection, entity);
-        }
-    }
-
-    private static void persistOrUpdate(MongoCollection collection, Object entity) {
-        //we transform the entity as a document first
-        BsonDocument document = getBsonDocument(collection, entity);
-
-        //then we get its id field and create a new Document with only this one that will be our replace query
-        BsonValue id = document.get(ID);
-        if (id == null) {
-            //insert with autogenerated ID
-            collection.insertOne(entity);
-        } else {
-            //insert with user provided ID or update
-            BsonDocument query = new BsonDocument().append(ID, id);
-            collection.replaceOne(query, entity, new ReplaceOptions().upsert(true));
-        }
-    }
-
-    private static void persistOrUpdate(MongoCollection collection, List<Object> entities) {
-        //this will be an ordered bulk: it's less performant than a unordered one but will fail at the first failed write
-        List<WriteModel> bulk = new ArrayList<>();
-        for (Object entity : entities) {
-            //we transform the entity as a document first
-            BsonDocument document = getBsonDocument(collection, entity);
-
-            //then we get its id field and create a new Document with only this one that will be our replace query
-            BsonValue id = document.get(ID);
-            if (id == null) {
-                //insert with autogenerated ID
-                bulk.add(new InsertOneModel(entity));
-            } else {
-                //insert with user provided ID or update
-                BsonDocument query = new BsonDocument().append(ID, id);
-                bulk.add(new ReplaceOneModel(query, entity,
-                        new ReplaceOptions().upsert(true)));
-            }
-        }
-
-        collection.bulkWrite(bulk);
-    }
-
-    private static BsonDocument getBsonDocument(MongoCollection collection, Object entity) {
-        BsonDocument document = new BsonDocument();
-        Codec codec = collection.getCodecRegistry().get(entity.getClass());
-        codec.encode(new BsonDocumentWriter(document), entity, EncoderContext.builder().build());
-        return document;
-    }
-
-    private static MongoCollection mongoCollection(Object entity) {
-        Class<?> entityClass = entity.getClass();
-        return mongoCollection(entityClass);
-    }
-
-    private static MongoDatabase mongoDatabase(MongoEntity entity) {
-        MongoClient mongoClient = mongoClient(entity);
-        if (entity != null && !entity.database().isEmpty()) {
-            return mongoClient.getDatabase(entity.database());
-        }
-        String databaseName = getDefaultDatabaseName();
-        return mongoClient.getDatabase(databaseName);
-    }
-
-    private static String getDefaultDatabaseName() {
-        if (defaultDatabaseName == null) {
-            synchronized (MongoOperations.class) {
-                if (defaultDatabaseName == null) {
-                    defaultDatabaseName = ConfigProvider.getConfig()
-                            .getValue(MONGODB_DATABASE, String.class);
-                }
-            }
-        }
-        return defaultDatabaseName;
-    }
-
-    private static MongoClient mongoClient(MongoEntity entity) {
-        if (entity != null && !entity.clientName().isEmpty()) {
-            Set<Bean<?>> beans = Arc.container().beanManager().getBeans(MongoClient.class);
-            for (Bean<?> bean : beans) {
-                if (bean.getName() != null) {
-                    return (MongoClient) Arc.container().instance(entity.clientName()).get();
-                }
-            }
-        }
-        return Arc.container().instance(MongoClient.class).get();
-    }
-
-    //
-    // Queries
-
-    public static Object findById(Class<?> entityClass, Object id) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.find(new Document(ID, id)).first();
-    }
-
-    public static Optional findByIdOptional(Class<?> entityClass, Object id) {
-        return Optional.ofNullable(findById(entityClass, id));
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Object... params) {
-        return find(entityClass, query, null, params);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Object... params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        Document docSort = sortToDocument(sort);
-        MongoCollection collection = mongoCollection(entityClass);
-        return new PanacheQueryImpl(collection, docQuery, docSort);
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
-     * and like <code>firstname = ?1</code> for PanacheQL one.
-     */
-    static String bindFilter(Class<?> clazz, String query, Object[] params) {
-        String bindQuery = bindQuery(clazz, query, params);
-        LOGGER.debug(bindQuery);
-        return bindQuery;
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
-     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
-     */
-    static String bindFilter(Class<?> clazz, String query, Map<String, Object> params) {
-        String bindQuery = bindQuery(clazz, query, params);
-        LOGGER.debug(bindQuery);
-        return bindQuery;
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': ?1, 'lastname': ?2}</code> for native one
-     * and like <code>firstname = ?1 and lastname = ?2</code> for PanacheQL one.
-     * As update document needs a <code>$set</code> operator we add it if needed.
-     */
-    static String bindUpdate(Class<?> clazz, String query, Object[] params) {
-        String bindUpdate = bindQuery(clazz, query, params);
-        if (!bindUpdate.contains("$set")) {
-            bindUpdate = "{'$set':" + bindUpdate + "}";
-        }
-        LOGGER.debug(bindUpdate);
-        return bindUpdate;
-    }
-
-    /**
-     * We should have a query like <code>{'firstname': :firstname, 'lastname': :lastname}</code> for native one
-     * and like <code>firstname = :firstname and lastname = :lastname</code> for PanacheQL one.
-     * As update document needs a <code>$set</code> operator we add it if needed.
-     */
-    static String bindUpdate(Class<?> clazz, String query, Map<String, Object> params) {
-        String bindUpdate = bindQuery(clazz, query, params);
-        if (!bindUpdate.contains("$set")) {
-            bindUpdate = "{'$set':" + bindUpdate + "}";
-        }
-        LOGGER.debug(bindUpdate);
-        return bindUpdate;
-    }
-
-    private static String bindQuery(Class<?> clazz, String query, Object[] params) {
-        String bindQuery = null;
-        //determine the type of the query
-        if (query.charAt(0) == '{') {
-            //this is a native query
-            bindQuery = NativeQueryBinder.bindQuery(query, params);
-        } else {
-            //this is a PanacheQL query
-            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
-        }
-        return bindQuery;
-    }
-
-    private static String bindQuery(Class<?> clazz, String query, Map<String, Object> params) {
-        String bindQuery = null;
-        //determine the type of the query
-        if (query.charAt(0) == '{') {
-            //this is a native query
-            bindQuery = NativeQueryBinder.bindQuery(query, params);
-        } else {
-            //this is a PanacheQL query
-            bindQuery = PanacheQlQueryBinder.bindQuery(clazz, query, params);
-        }
-        return bindQuery;
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Map<String, Object> params) {
-        return find(entityClass, query, null, params);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        Document docSort = sortToDocument(sort);
-        MongoCollection collection = mongoCollection(entityClass);
-        return new PanacheQueryImpl(collection, docQuery, docSort);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Parameters params) {
-        return find(entityClass, query, null, params.map());
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return find(entityClass, query, sort, params.map());
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> find(Class<?> entityClass, Document query, Sort sort) {
-        MongoCollection collection = mongoCollection(entityClass);
-        Document sortDoc = sortToDocument(sort);
-        return new PanacheQueryImpl(collection, query, sortDoc);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, Document query, Document sort) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return new PanacheQueryImpl(collection, query, sort);
-    }
-
-    public static PanacheQuery<?> find(Class<?> entityClass, Document query) {
-        return find(entityClass, query, (Document) null);
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Object... params) {
-        return find(entityClass, query, params).list();
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return find(entityClass, query, sort, params).list();
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Map<String, Object> params) {
-        return find(entityClass, query, params).list();
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return find(entityClass, query, sort, params).list();
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Parameters params) {
-        return find(entityClass, query, params).list();
-    }
-
-    public static List<?> list(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return find(entityClass, query, sort, params).list();
-    }
-
-    //specific Mongo query
-    public static List<?> list(Class<?> entityClass, Document query) {
-        return find(entityClass, query).list();
-    }
-
-    //specific Mongo query
-    public static List<?> list(Class<?> entityClass, Document query, Document sort) {
-        return find(entityClass, query, sort).list();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Object... params) {
-        return find(entityClass, query, params).stream();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Object... params) {
-        return find(entityClass, query, sort, params).stream();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Map<String, Object> params) {
-        return find(entityClass, query, params).stream();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Map<String, Object> params) {
-        return find(entityClass, query, sort, params).stream();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Parameters params) {
-        return find(entityClass, query, params).stream();
-    }
-
-    public static Stream<?> stream(Class<?> entityClass, String query, Sort sort, Parameters params) {
-        return find(entityClass, query, sort, params).stream();
-    }
-
-    //specific Mongo query
-    public static Stream<?> stream(Class<?> entityClass, Document query) {
-        return find(entityClass, query).stream();
-    }
-
-    //specific Mongo query
-    public static Stream<?> stream(Class<?> entityClass, Document query, Document sort) {
-        return find(entityClass, query, sort).stream();
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> findAll(Class<?> entityClass) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return new PanacheQueryImpl(collection, null, null);
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static PanacheQuery<?> findAll(Class<?> entityClass, Sort sort) {
-        MongoCollection collection = mongoCollection(entityClass);
-        Document sortDoc = sortToDocument(sort);
-        return new PanacheQueryImpl(collection, null, sortDoc);
-    }
-
-    private static Document sortToDocument(Sort sort) {
-        if (sort == null) {
-            return null;
-        }
-
-        Document sortDoc = new Document();
-        for (Sort.Column col : sort.getColumns()) {
-            sortDoc.append(col.getName(), col.getDirection() == Sort.Direction.Ascending ? 1 : -1);
-        }
-        return sortDoc;
-    }
-
-    public static List<?> listAll(Class<?> entityClass) {
-        return findAll(entityClass).list();
-    }
-
-    public static List<?> listAll(Class<?> entityClass, Sort sort) {
-        return findAll(entityClass, sort).list();
-    }
-
-    public static Stream<?> streamAll(Class<?> entityClass) {
-        return findAll(entityClass).stream();
-    }
-
-    public static Stream<?> streamAll(Class<?> entityClass, Sort sort) {
-        return findAll(entityClass, sort).stream();
-    }
-
-    public static long count(Class<?> entityClass) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments();
-    }
-
-    public static long count(Class<?> entityClass, String query, Object... params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments(docQuery);
-    }
-
-    public static long count(Class<?> entityClass, String query, Map<String, Object> params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments(docQuery);
-    }
-
-    public static long count(Class<?> entityClass, String query, Parameters params) {
-        return count(entityClass, query, params.map());
-    }
-
-    //specific Mongo query
-    public static long count(Class<?> entityClass, Document query) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.countDocuments(query);
-    }
-
-    public static long deleteAll(Class<?> entityClass) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.deleteMany(new Document()).getDeletedCount();
-    }
-
-    public static boolean deleteById(Class<?> entityClass, Object id) {
-        MongoCollection collection = mongoCollection(entityClass);
-        Document query = new Document().append(ID, id);
-        DeleteResult results = collection.deleteOne(query);
-        return results.getDeletedCount() == 1;
-    }
-
-    public static long delete(Class<?> entityClass, String query, Object... params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.deleteMany(docQuery).getDeletedCount();
-    }
-
-    public static long delete(Class<?> entityClass, String query, Map<String, Object> params) {
-        String bindQuery = bindFilter(entityClass, query, params);
-        BsonDocument docQuery = BsonDocument.parse(bindQuery);
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.deleteMany(docQuery).getDeletedCount();
-    }
-
-    public static long delete(Class<?> entityClass, String query, Parameters params) {
-        return delete(entityClass, query, params.map());
-    }
-
-    //specific Mongo query
-    public static long delete(Class<?> entityClass, Document query) {
-        MongoCollection collection = mongoCollection(entityClass);
-        return collection.deleteMany(query).getDeletedCount();
-    }
-
-    public static PanacheUpdate update(Class<?> entityClass, String update, Map<String, Object> params) {
-        return executeUpdate(entityClass, update, params);
-    }
-
-    public static PanacheUpdate update(Class<?> entityClass, String update, Parameters params) {
-        return update(entityClass, update, params.map());
-    }
-
-    public static PanacheUpdate update(Class<?> entityClass, String update, Object... params) {
-        return executeUpdate(entityClass, update, params);
-    }
-
-    private static PanacheUpdate executeUpdate(Class<?> entityClass, String update, Object... params) {
-        String bindUpdate = bindUpdate(entityClass, update, params);
-        BsonDocument docUpdate = BsonDocument.parse(bindUpdate);
-        MongoCollection collection = mongoCollection(entityClass);
-        return new PanacheUpdateImpl(entityClass, docUpdate, collection);
-    }
-
-    private static PanacheUpdate executeUpdate(Class<?> entityClass, String update, Map<String, Object> params) {
-        String bindUpdate = bindUpdate(entityClass, update, params);
-        BsonDocument docUpdate = BsonDocument.parse(bindUpdate);
-        MongoCollection collection = mongoCollection(entityClass);
-        return new PanacheUpdateImpl(entityClass, docUpdate, collection);
-    }
-
-    public static IllegalStateException implementationInjectionMissing() {
-        return new IllegalStateException(
-                "This method is normally automatically overridden in subclasses");
-    }
-
-}
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java
index 63bcc519a788a..89d2f81669da3 100644
--- a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java
+++ b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java
@@ -1,252 +1,143 @@
 package io.quarkus.mongodb.panache.runtime;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Stream;
 
-import org.bson.Document;
 import org.bson.conversions.Bson;
 
-import com.mongodb.client.FindIterable;
+import com.mongodb.ReadPreference;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
 import com.mongodb.client.model.Collation;
 
 import io.quarkus.mongodb.panache.PanacheQuery;
 import io.quarkus.panache.common.Page;
-import io.quarkus.panache.common.Range;
-import io.quarkus.panache.common.exception.PanacheQueryException;
 
 public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {
-    private MongoCollection collection;
-    private Bson mongoQuery;
-    private Bson sort;
-    private Bson projections;
-
-    private Page page;
-    private Long count;
-
-    private Range range;
-
-    private Collation collation;
+    private final CommonPanacheQueryImpl<Entity> delegate;
 
     PanacheQueryImpl(MongoCollection<? extends Entity> collection, Bson mongoQuery, Bson sort) {
-        this.collection = collection;
-        this.mongoQuery = mongoQuery;
-        this.sort = sort;
+        this.delegate = new CommonPanacheQueryImpl<>(collection, mongoQuery, sort);
     }
 
-    private PanacheQueryImpl(PanacheQueryImpl previousQuery, Bson projections, Class<?> documentClass) {
-        this.collection = previousQuery.collection.withDocumentClass(documentClass);
-        this.mongoQuery = previousQuery.mongoQuery;
-        this.sort = previousQuery.sort;
-        this.projections = projections;
-        this.page = previousQuery.page;
-        this.count = previousQuery.count;
-        this.range = previousQuery.range;
-        this.collation = previousQuery.collation;
+    private PanacheQueryImpl(CommonPanacheQueryImpl<Entity> delegate) {
+        this.delegate = delegate;
     }
 
-    // Builder
-
     @Override
     public <T> PanacheQuery<T> project(Class<T> type) {
-        // collect field names from public fields and getters
-        Set<String> fieldNames = MongoPropertyUtil.collectFields(type);
-
-        // create the projection document
-        Document projections = new Document();
-        for (String fieldName : fieldNames) {
-            projections.append(fieldName, 1);
-        }
-
-        return new PanacheQueryImpl<>(this, projections, type);
+        return new PanacheQueryImpl<>(delegate.project(type));
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <T extends Entity> PanacheQuery<T> page(Page page) {
-        this.page = page;
-        this.range = null; // reset the range to be able to switch from range to page
+        delegate.page(page);
         return (PanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> page(int pageIndex, int pageSize) {
-        return page(Page.of(pageIndex, pageSize));
+        delegate.page(Page.of(pageIndex, pageSize));
+        return (PanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> nextPage() {
-        checkPagination();
-        return page(page.next());
+        delegate.nextPage();
+        return (PanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> previousPage() {
-        checkPagination();
-        return page(page.previous());
+        delegate.previousPage();
+        return (PanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> firstPage() {
-        checkPagination();
-        return page(page.first());
+        delegate.firstPage();
+        return (PanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> lastPage() {
-        checkPagination();
-        return page(page.index(pageCount() - 1));
+        delegate.lastPage();
+        return (PanacheQuery<T>) this;
     }
 
     @Override
     public boolean hasNextPage() {
-        checkPagination();
-        return page.index < (pageCount() - 1);
+        return delegate.hasNextPage();
     }
 
     @Override
     public boolean hasPreviousPage() {
-        checkPagination();
-        return page.index > 0;
+        return delegate.hasPreviousPage();
     }
 
     @Override
     public int pageCount() {
-        checkPagination();
-        long count = count();
-        if (count == 0)
-            return 1; // a single page of zero results
-        return (int) Math.ceil((double) count / (double) page.size);
+        return delegate.pageCount();
     }
 
     @Override
     public Page page() {
-        checkPagination();
-        return page;
-    }
-
-    private void checkPagination() {
-        if (page == null) {
-            throw new UnsupportedOperationException(
-                    "Cannot call a page related method, "
-                            + "call page(Page) or page(int, int) to initiate pagination first");
-        }
-        if (range != null) {
-            throw new UnsupportedOperationException("Cannot call a page related method in a ranged query, " +
-                    "call page(Page) or page(int, int) to initiate pagination first");
-        }
+        return delegate.page();
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> range(int startIndex, int lastIndex) {
-        this.range = Range.of(startIndex, lastIndex);
-        // reset the page to its default to be able to switch from page to range
-        this.page = null;
+        delegate.range(startIndex, lastIndex);
         return (PanacheQuery<T>) this;
     }
 
     @Override
     public <T extends Entity> PanacheQuery<T> withCollation(Collation collation) {
-        this.collation = collation;
+        delegate.withCollation(collation);
+        return (PanacheQuery<T>) this;
+    }
+
+    @Override
+    public <T extends Entity> PanacheQuery<T> withReadPreference(ReadPreference readPreference) {
+        delegate.withReadPreference(readPreference);
         return (PanacheQuery<T>) this;
     }
 
     // Results
 
     @Override
-    @SuppressWarnings("unchecked")
     public long count() {
-        if (count == null) {
-            count = collection.countDocuments(mongoQuery);
-        }
-        return count;
+        return delegate.count();
     }
 
     @Override
     public <T extends Entity> List<T> list() {
-        return list(null);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T extends Entity> List<T> list(Integer limit) {
-        List<T> list = new ArrayList<>();
-        FindIterable find = mongoQuery == null ? collection.find() : collection.find(mongoQuery);
-        if (this.projections != null) {
-            find.projection(projections);
-        }
-        if (this.collation != null) {
-            find.collation(collation);
-        }
-        manageOffsets(find, limit);
-        MongoCursor<T> cursor = find.sort(sort).iterator();
-
-        try {
-            while (cursor.hasNext()) {
-                T entity = cursor.next();
-                list.add(entity);
-            }
-        } finally {
-            cursor.close();
-        }
-        return list;
+        return delegate.list();
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T extends Entity> Stream<T> stream() {
-        return (Stream<T>) list().stream();
+        return delegate.stream();
     }
 
     @Override
     public <T extends Entity> T firstResult() {
-        List<T> list = list(1);
-        return list.isEmpty() ? null : list.get(0);
+        return delegate.firstResult();
     }
 
     @Override
     public <T extends Entity> Optional<T> firstResultOptional() {
-        return Optional.ofNullable(firstResult());
+        return delegate.firstResultOptional();
     }
 
     @Override
     public <T extends Entity> T singleResult() {
-        List<T> list = list(2);
-        if (list.size() != 1) {
-            throw new PanacheQueryException("There should be only one result");
-        }
-
-        return list.get(0);
+        return delegate.singleResult();
     }
 
     @Override
     public <T extends Entity> Optional<T> singleResultOptional() {
-        List<T> list = list(2);
-        if (list.size() > 1) {
-            throw new PanacheQueryException("There should be no more than one result");
-        }
-
-        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(0));
-    }
-
-    private void manageOffsets(FindIterable find, Integer limit) {
-        if (range != null) {
-            find.skip(range.getStartIndex());
-            if (limit == null) {
-                // range is 0 based, so we add 1 to the limit
-                find.limit(range.getLastIndex() - range.getStartIndex() + 1);
-            }
-        } else if (page != null) {
-            find.skip(page.index * page.size);
-            if (limit == null) {
-                find.limit(page.size);
-            }
-        }
-        if (limit != null) {
-            find.limit(limit);
-        }
+        return delegate.singleResultOptional();
     }
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java b/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java
index 0fac5fccebf84..96379b0bdbd25 100644
--- a/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java
+++ b/extensions/panache/mongodb-panache/runtime/src/test/java/io/quarkus/mongodb/panache/runtime/MongoOperationsTest.java
@@ -1,6 +1,6 @@
 package io.quarkus.mongodb.panache.runtime;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -12,15 +12,20 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.bson.codecs.pojo.annotations.BsonProperty;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.mongodb.panache.PanacheQuery;
+import io.quarkus.mongodb.panache.PanacheUpdate;
 import io.quarkus.panache.common.Parameters;
 
 class MongoOperationsTest {
 
+    private final MongoOperations<PanacheQuery<?>, PanacheUpdate> operations = new JavaMongoOperations();
+
     private static class DemoObj {
         public String field;
         public boolean isOk;
@@ -40,28 +45,32 @@ static void setupFieldReplacement() {
 
     @Test
     public void testBindShorthandFilter() {
-        String query = MongoOperations.bindFilter(Object.class, "field", new Object[] { "a value" });
+        String query = operations.bindFilter(Object.class, "field", new Object[] { "a value" });
         assertEquals("{'field':'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field", new Object[] { true });
+        query = operations.bindFilter(Object.class, "field", new Object[] { true });
         assertEquals("{'field':true}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field", new Object[] { LocalDate.of(2019, 3, 4) });
-        assertEquals("{'field':ISODate('2019-03-04')}", query);
+        query = operations.bindFilter(Object.class, "field", new Object[] { LocalDate.of(2019, 3, 4) });
+        assertEquals("{'field':{\"$date\": \"2019-03-04T00:00:00.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field", new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) });
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        query = operations.bindFilter(Object.class, "field", new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) });
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field",
+        query = operations.bindFilter(Object.class, "field",
                 new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC) });
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field",
+        query = operations.bindFilter(Object.class, "field",
                 new Object[] { toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1)) });
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
+
+        query = operations.bindFilter(Object.class, "field",
+                new Object[] { UUID.fromString("7f000101-7370-1f68-8173-70afa71b0000") });
+        assertEquals("{'field':UUID('7f000101-7370-1f68-8173-70afa71b0000')}", query);
 
         //test field replacement
-        query = MongoOperations.bindFilter(DemoObj.class, "property", new Object[] { "a value" });
+        query = operations.bindFilter(DemoObj.class, "property", new Object[] { "a value" });
         assertEquals("{'value':'a value'}", query);
     }
 
@@ -71,49 +80,53 @@ private Object toDate(LocalDateTime of) {
 
     @Test
     public void testBindNativeFilterByIndex() {
-        String query = MongoOperations.bindFilter(DemoObj.class, "{'field': ?1}", new Object[] { "a value" });
+        String query = operations.bindFilter(DemoObj.class, "{'field': ?1}", new Object[] { "a value" });
         assertEquals("{'field': 'a value'}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class, "{'field.sub': ?1}", new Object[] { "a value" });
+        query = operations.bindFilter(DemoObj.class, "{'field.sub': ?1}", new Object[] { "a value" });
         assertEquals("{'field.sub': 'a value'}", query);
 
         //test that there are no field replacement for native queries
-        query = MongoOperations.bindFilter(DemoObj.class, "{'property': ?1}", new Object[] { "a value" });
+        query = operations.bindFilter(DemoObj.class, "{'property': ?1}", new Object[] { "a value" });
         assertEquals("{'property': 'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': ?1}",
+        query = operations.bindFilter(Object.class, "{'field': ?1}",
                 new Object[] { LocalDate.of(2019, 3, 4) });
-        assertEquals("{'field': ISODate('2019-03-04')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T00:00:00.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': ?1}",
+        query = operations.bindFilter(Object.class, "{'field': ?1}",
                 new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) });
-        assertEquals("{'field': ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': ?1}",
+        query = operations.bindFilter(Object.class, "{'field': ?1}",
                 new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC) });
-        assertEquals("{'field': ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': ?1}",
+        query = operations.bindFilter(Object.class, "{'field': ?1}",
                 new Object[] { toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1)) });
-        assertEquals("{'field': ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
+
+        query = operations.bindFilter(Object.class, "{'field': ?1}",
+                new Object[] { UUID.fromString("7f000101-7370-1f68-8173-70afa71b0000") });
+        assertEquals("{'field': UUID('7f000101-7370-1f68-8173-70afa71b0000')}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': ?1, 'isOk': ?2}", new Object[] { "a value", true });
+        query = operations.bindFilter(Object.class, "{'field': ?1, 'isOk': ?2}", new Object[] { "a value", true });
         assertEquals("{'field': 'a value', 'isOk': true}", query);
 
         //queries related to '$in' operator
         List<Object> list = Arrays.asList("f1", "f2");
-        query = MongoOperations.bindFilter(DemoObj.class, "{ field: { '$in': [?1] } }", new Object[] { list });
+        query = operations.bindFilter(DemoObj.class, "{ field: { '$in': [?1] } }", new Object[] { list });
         assertEquals("{ field: { '$in': ['f1', 'f2'] } }", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class, "{ field: { '$in': [?1] }, isOk: ?2 }", new Object[] { list, true });
+        query = operations.bindFilter(DemoObj.class, "{ field: { '$in': [?1] }, isOk: ?2 }", new Object[] { list, true });
         assertEquals("{ field: { '$in': ['f1', 'f2'] }, isOk: true }", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "{ field: { '$in': [?1] }, $or: [ {'property': ?2}, {'property': ?3} ] }",
                 new Object[] { list, "jpg", "gif" });
         assertEquals("{ field: { '$in': ['f1', 'f2'] }, $or: [ {'property': 'jpg'}, {'property': 'gif'} ] }", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "{ field: { '$in': [?1] }, isOk: ?2, $or: [ {'property': ?3}, {'property': ?4} ] }",
                 new Object[] { list, true, "jpg", "gif" });
         assertEquals("{ field: { '$in': ['f1', 'f2'] }, isOk: true, $or: [ {'property': 'jpg'}, {'property': 'gif'} ] }",
@@ -122,55 +135,59 @@ public void testBindNativeFilterByIndex() {
 
     @Test
     public void testBindNativeFilterByName() {
-        String query = MongoOperations.bindFilter(Object.class, "{'field': :field}",
+        String query = operations.bindFilter(Object.class, "{'field': :field}",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field': 'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field.sub': :field}",
+        query = operations.bindFilter(Object.class, "{'field.sub': :field}",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field.sub': 'a value'}", query);
 
         //test that there are no field replacement for native queries
-        query = MongoOperations.bindFilter(DemoObj.class, "{'property': :field}",
+        query = operations.bindFilter(DemoObj.class, "{'property': :field}",
                 Parameters.with("field", "a value").map());
         assertEquals("{'property': 'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': :field}",
+        query = operations.bindFilter(Object.class, "{'field': :field}",
                 Parameters.with("field", LocalDate.of(2019, 3, 4)).map());
-        assertEquals("{'field': ISODate('2019-03-04')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T00:00:00.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': :field}",
+        query = operations.bindFilter(Object.class, "{'field': :field}",
                 Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1)).map());
-        assertEquals("{'field': ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': :field}",
+        query = operations.bindFilter(Object.class, "{'field': :field}",
                 Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC)).map());
-        assertEquals("{'field': ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': :field}",
+        query = operations.bindFilter(Object.class, "{'field': :field}",
                 Parameters.with("field", toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1))).map());
-        assertEquals("{'field': ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field': {\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field': :field, 'isOk': :isOk}",
+        query = operations.bindFilter(Object.class, "{'field': :field}",
+                Parameters.with("field", UUID.fromString("7f000101-7370-1f68-8173-70afa71b0000")).map());
+        assertEquals("{'field': UUID('7f000101-7370-1f68-8173-70afa71b0000')}", query);
+
+        query = operations.bindFilter(Object.class, "{'field': :field, 'isOk': :isOk}",
                 Parameters.with("field", "a value").and("isOk", true).map());
         assertEquals("{'field': 'a value', 'isOk': true}", query);
 
         //queries related to '$in' operator
         List<Object> ids = Arrays.asList("f1", "f2");
-        query = MongoOperations.bindFilter(DemoObj.class, "{ field: { '$in': [:fields] } }",
+        query = operations.bindFilter(DemoObj.class, "{ field: { '$in': [:fields] } }",
                 Parameters.with("fields", ids).map());
         assertEquals("{ field: { '$in': ['f1', 'f2'] } }", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class, "{ field: { '$in': [:fields] }, isOk: :isOk }",
+        query = operations.bindFilter(DemoObj.class, "{ field: { '$in': [:fields] }, isOk: :isOk }",
                 Parameters.with("fields", ids).and("isOk", true).map());
         assertEquals("{ field: { '$in': ['f1', 'f2'] }, isOk: true }", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "{ field: { '$in': [:fields] }, $or: [ {'property': :p1}, {'property': :p2} ] }",
                 Parameters.with("fields", ids).and("p1", "jpg").and("p2", "gif").map());
         assertEquals("{ field: { '$in': ['f1', 'f2'] }, $or: [ {'property': 'jpg'}, {'property': 'gif'} ] }", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "{ field: { '$in': [:fields] }, isOk: :isOk, $or: [ {'property': :p1}, {'property': :p2} ] }",
                 Parameters.with("fields", ids)
                         .and("isOk", true)
@@ -182,70 +199,74 @@ public void testBindNativeFilterByName() {
 
     @Test
     public void testBindEnhancedFilterByIndex() {
-        String query = MongoOperations.bindFilter(Object.class, "field = ?1", new Object[] { "a value" });
+        String query = operations.bindFilter(Object.class, "field = ?1", new Object[] { "a value" });
         assertEquals("{'field':'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "{'field.sub': :field}",
+        query = operations.bindFilter(Object.class, "{'field.sub': :field}",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field.sub': 'a value'}", query);
 
         //test field replacement
-        query = MongoOperations.bindFilter(DemoObj.class, "property = ?1", new Object[] { "a value" });
+        query = operations.bindFilter(DemoObj.class, "property = ?1", new Object[] { "a value" });
         assertEquals("{'value':'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = ?1", new Object[] { LocalDate.of(2019, 3, 4) });
-        assertEquals("{'field':ISODate('2019-03-04')}", query);
+        query = operations.bindFilter(Object.class, "field = ?1", new Object[] { LocalDate.of(2019, 3, 4) });
+        assertEquals("{'field':{\"$date\": \"2019-03-04T00:00:00.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = ?1", new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) });
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        query = operations.bindFilter(Object.class, "field = ?1", new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1) });
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = ?1",
+        query = operations.bindFilter(Object.class, "field = ?1",
                 new Object[] { LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC) });
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = ?1",
+        query = operations.bindFilter(Object.class, "field = ?1",
                 new Object[] { toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1)) });
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
+
+        query = operations.bindFilter(Object.class, "field = ?1",
+                new Object[] { UUID.fromString("7f000101-7370-1f68-8173-70afa71b0000") });
+        assertEquals("{'field':UUID('7f000101-7370-1f68-8173-70afa71b0000')}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = ?1 and isOk = ?2", new Object[] { "a value", true });
+        query = operations.bindFilter(Object.class, "field = ?1 and isOk = ?2", new Object[] { "a value", true });
         assertEquals("{'field':'a value','isOk':true}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = ?1 or isOk = ?2", new Object[] { "a value", true });
+        query = operations.bindFilter(Object.class, "field = ?1 or isOk = ?2", new Object[] { "a value", true });
         assertEquals("{'$or':[{'field':'a value'},{'isOk':true}]}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "count >= ?1 and count < ?2", new Object[] { 5, 10 });
+        query = operations.bindFilter(Object.class, "count >= ?1 and count < ?2", new Object[] { 5, 10 });
         assertEquals("{'count':{'$gte':5},'count':{'$lt':10}}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field != ?1", new Object[] { "a value" });
+        query = operations.bindFilter(Object.class, "field != ?1", new Object[] { "a value" });
         assertEquals("{'field':{'$ne':'a value'}}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field like ?1", new Object[] { "a value" });
+        query = operations.bindFilter(Object.class, "field like ?1", new Object[] { "a value" });
         assertEquals("{'field':{'$regex':'a value'}}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field is not null", new Object[] {});
+        query = operations.bindFilter(Object.class, "field is not null", new Object[] {});
         assertEquals("{'field':{'$exists':true}}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field is null", new Object[] {});
+        query = operations.bindFilter(Object.class, "field is null", new Object[] {});
         assertEquals("{'field':{'$exists':false}}", query);
 
         // test with hardcoded value
-        query = MongoOperations.bindFilter(Object.class, "field = 'some hardcoded value'", new Object[] {});
+        query = operations.bindFilter(Object.class, "field = 'some hardcoded value'", new Object[] {});
         assertEquals("{'field':'some hardcoded value'}", query);
 
         //queries related to '$in' operator
         List<Object> list = Arrays.asList("f1", "f2");
-        query = MongoOperations.bindFilter(DemoObj.class, "field in ?1", new Object[] { list });
+        query = operations.bindFilter(DemoObj.class, "field in ?1", new Object[] { list });
         assertEquals("{'field':{'$in':['f1', 'f2']}}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class, "field in ?1 and isOk = ?2", new Object[] { list, true });
+        query = operations.bindFilter(DemoObj.class, "field in ?1 and isOk = ?2", new Object[] { list, true });
         assertEquals("{'field':{'$in':['f1', 'f2']},'isOk':true}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "field in ?1 and property = ?2 or property = ?3",
                 new Object[] { list, "jpg", "gif" });
         assertEquals("{'field':{'$in':['f1', 'f2']},'$or':[{'value':'jpg'},{'value':'gif'}]}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "field in ?1 and isOk = ?2 and property = ?3 or property = ?4",
                 new Object[] { list, true, "jpg", "gif" });
         assertEquals("{'field':{'$in':['f1', 'f2']},'isOk':true,'$or':[{'value':'jpg'},{'value':'gif'}]}", query);
@@ -253,71 +274,75 @@ public void testBindEnhancedFilterByIndex() {
 
     @Test
     public void testBindEnhancedFilterByName() {
-        String query = MongoOperations.bindFilter(Object.class, "field = :field",
+        String query = operations.bindFilter(Object.class, "field = :field",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field':'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field.sub = :field",
+        query = operations.bindFilter(Object.class, "field.sub = :field",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field.sub':'a value'}", query);
 
         //test field replacement
-        query = MongoOperations.bindFilter(DemoObj.class, "property = :field",
+        query = operations.bindFilter(DemoObj.class, "property = :field",
                 Parameters.with("field", "a value").map());
         assertEquals("{'value':'a value'}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = :field",
+        query = operations.bindFilter(Object.class, "field = :field",
                 Parameters.with("field", LocalDate.of(2019, 3, 4)).map());
-        assertEquals("{'field':ISODate('2019-03-04')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T00:00:00.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = :field",
+        query = operations.bindFilter(Object.class, "field = :field",
                 Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1)).map());
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = :field",
+        query = operations.bindFilter(Object.class, "field = :field",
                 Parameters.with("field", LocalDateTime.of(2019, 3, 4, 1, 1, 1).toInstant(ZoneOffset.UTC)).map());
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = :field",
+        query = operations.bindFilter(Object.class, "field = :field",
                 Parameters.with("field", toDate(LocalDateTime.of(2019, 3, 4, 1, 1, 1))).map());
-        assertEquals("{'field':ISODate('2019-03-04T01:01:01.000Z')}", query);
+        assertEquals("{'field':{\"$date\": \"2019-03-04T01:01:01.000Z\"} }", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = :field and isOk = :isOk",
+        query = operations.bindFilter(Object.class, "field = :field",
+                Parameters.with("field", UUID.fromString("7f000101-7370-1f68-8173-70afa71b0000")).map());
+        assertEquals("{'field':UUID('7f000101-7370-1f68-8173-70afa71b0000')}", query);
+
+        query = operations.bindFilter(Object.class, "field = :field and isOk = :isOk",
                 Parameters.with("field", "a value").and("isOk", true).map());
         assertEquals("{'field':'a value','isOk':true}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field = :field or isOk = :isOk",
+        query = operations.bindFilter(Object.class, "field = :field or isOk = :isOk",
                 Parameters.with("field", "a value").and("isOk", true).map());
         assertEquals("{'$or':[{'field':'a value'},{'isOk':true}]}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "count > :lower and count <= :upper",
+        query = operations.bindFilter(Object.class, "count > :lower and count <= :upper",
                 Parameters.with("lower", 5).and("upper", 10).map());
         assertEquals("{'count':{'$gt':5},'count':{'$lte':10}}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field != :field",
+        query = operations.bindFilter(Object.class, "field != :field",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field':{'$ne':'a value'}}", query);
 
-        query = MongoOperations.bindFilter(Object.class, "field like :field",
+        query = operations.bindFilter(Object.class, "field like :field",
                 Parameters.with("field", "a value").map());
         assertEquals("{'field':{'$regex':'a value'}}", query);
 
         //queries related to '$in' operator
         List<Object> list = Arrays.asList("f1", "f2");
-        query = MongoOperations.bindFilter(DemoObj.class, "field in :fields",
+        query = operations.bindFilter(DemoObj.class, "field in :fields",
                 Parameters.with("fields", list).map());
         assertEquals("{'field':{'$in':['f1', 'f2']}}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class, "field in :fields and isOk = :isOk",
+        query = operations.bindFilter(DemoObj.class, "field in :fields and isOk = :isOk",
                 Parameters.with("fields", list).and("isOk", true).map());
         assertEquals("{'field':{'$in':['f1', 'f2']},'isOk':true}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "field in :fields and property = :p1 or property = :p2",
                 Parameters.with("fields", list).and("p1", "jpg").and("p2", "gif").map());
         assertEquals("{'field':{'$in':['f1', 'f2']},'$or':[{'value':'jpg'},{'value':'gif'}]}", query);
 
-        query = MongoOperations.bindFilter(DemoObj.class,
+        query = operations.bindFilter(DemoObj.class,
                 "field in :fields and isOk = :isOk and property = :p1 or property = :p2",
                 Parameters.with("fields", list)
                         .and("isOk", true)
@@ -329,33 +354,42 @@ public void testBindEnhancedFilterByName() {
     @Test
     public void testBindUpdate() {
         // native update by index without $set
-        String update = MongoOperations.bindUpdate(DemoObj.class, "{'field': ?1}", new Object[] { "a value" });
+        String update = operations.bindUpdate(DemoObj.class, "{'field': ?1}", new Object[] { "a value" });
         assertEquals("{'$set':{'field': 'a value'}}", update);
 
         // native update by name without $set
-        update = MongoOperations.bindUpdate(Object.class, "{'field': :field}",
+        update = operations.bindUpdate(Object.class, "{'field': :field}",
                 Parameters.with("field", "a value").map());
         assertEquals("{'$set':{'field': 'a value'}}", update);
 
         // native update by index with $set
-        update = MongoOperations.bindUpdate(DemoObj.class, "{'$set':{'field': ?1}}", new Object[] { "a value" });
+        update = operations.bindUpdate(DemoObj.class, "{'$set':{'field': ?1}}", new Object[] { "a value" });
         assertEquals("{'$set':{'field': 'a value'}}", update);
 
         // native update by name with $set
-        update = MongoOperations.bindUpdate(Object.class, "{'$set':{'field': :field}}",
+        update = operations.bindUpdate(Object.class, "{'$set':{'field': :field}}",
                 Parameters.with("field", "a value").map());
         assertEquals("{'$set':{'field': 'a value'}}", update);
 
+        // native update by index with $inc
+        update = operations.bindUpdate(DemoObj.class, "{'$inc':{'field': ?1}}", new Object[] { "a value" });
+        assertEquals("{'$inc':{'field': 'a value'}}", update);
+
+        // native update by name with $inc
+        update = operations.bindUpdate(Object.class, "{'$inc':{'field': :field}}",
+                Parameters.with("field", "a value").map());
+        assertEquals("{'$inc':{'field': 'a value'}}", update);
+
         // shortand update
-        update = MongoOperations.bindUpdate(Object.class, "field", new Object[] { "a value" });
+        update = operations.bindUpdate(Object.class, "field", new Object[] { "a value" });
         assertEquals("{'$set':{'field':'a value'}}", update);
 
         // enhanced update by index
-        update = MongoOperations.bindUpdate(Object.class, "field = ?1", new Object[] { "a value" });
+        update = operations.bindUpdate(Object.class, "field = ?1", new Object[] { "a value" });
         assertEquals("{'$set':{'field':'a value'}}", update);
 
         // enhanced update by name
-        update = MongoOperations.bindUpdate(Object.class, "field = :field",
+        update = operations.bindUpdate(Object.class, "field = :field",
                 Parameters.with("field", "a value").map());
         assertEquals("{'$set':{'field':'a value'}}", update);
     }
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/pom.xml b/extensions/panache/mongodb-rest-data-panache/deployment/pom.xml
new file mode 100644
index 0000000000000..b8ae1296c58d8
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-mongodb-rest-data-panache-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-mongodb-rest-data-panache-deployment</artifactId>
+    <name>Quarkus - MongoDB REST data with Panache - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-rest-data-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-data-panache-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-deployment</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/DataAccessImplementor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/DataAccessImplementor.java
new file mode 100644
index 0000000000000..f745813d58d1a
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/DataAccessImplementor.java
@@ -0,0 +1,65 @@
+package io.quarkus.mongodb.rest.data.panache.deployment;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+
+/**
+ * Implement data access logic for a specific data access strategy.
+ */
+public interface DataAccessImplementor {
+
+    /**
+     * Find an entity by ID and return a result.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param id Requested entity ID.
+     * @return A requested entity or null if it wasn't found.
+     */
+    ResultHandle findById(BytecodeCreator creator, ResultHandle id);
+
+    /**
+     * Find all entities.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param page Page instance that should be used in a query. Might be null if pagination is disabled.
+     * @param sort Sort instance that should be used in a query.
+     * @return Entity list
+     */
+    ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort);
+
+    /**
+     * Persist a new entity.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param entity An entity that should be persisted.
+     * @return A persisted entity.
+     */
+    ResultHandle persist(BytecodeCreator creator, ResultHandle entity);
+
+    /**
+     * Update an existing entity or create a new one.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param entity Entity that should be updated or created.
+     * @return A persisted entity.
+     */
+    ResultHandle persistOrUpdate(BytecodeCreator creator, ResultHandle entity);
+
+    /**
+     * Delete entity by ID.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param id Entity ID.
+     * @return Boolean indicating whether an entity was deleted or not.
+     */
+    ResultHandle deleteById(BytecodeCreator creator, ResultHandle id);
+
+    /**
+     * Available number of pages given a page instance.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param page Page instance.
+     * @return int page count.
+     */
+    ResultHandle pageCount(BytecodeCreator creator, ResultHandle page);
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityClassHelper.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityClassHelper.java
new file mode 100644
index 0000000000000..3e8cd72b63253
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityClassHelper.java
@@ -0,0 +1,63 @@
+package io.quarkus.mongodb.rest.data.panache.deployment;
+
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.types.ObjectId;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.gizmo.MethodDescriptor;
+
+public class EntityClassHelper {
+
+    private static final DotName OBJECT_ID = DotName.createSimple(ObjectId.class.getName());
+
+    private static final DotName BSON_ID_ANNOTATION = DotName.createSimple(BsonId.class.getName());
+
+    private final IndexView index;
+
+    public EntityClassHelper(IndexView index) {
+        this.index = index;
+    }
+
+    public FieldInfo getIdField(String className) {
+        return getIdField(index.getClassByName(DotName.createSimple(className)));
+    }
+
+    private FieldInfo getIdField(ClassInfo classInfo) {
+        ClassInfo tmpClassInfo = classInfo;
+        while (tmpClassInfo != null) {
+            for (FieldInfo field : tmpClassInfo.fields()) {
+                if (field.type().name().equals(OBJECT_ID) || field.hasAnnotation(BSON_ID_ANNOTATION)) {
+                    return field;
+                }
+            }
+            if (tmpClassInfo.superName() != null) {
+                tmpClassInfo = index.getClassByName(tmpClassInfo.superName());
+            } else {
+                tmpClassInfo = null;
+            }
+        }
+        throw new IllegalArgumentException("Couldn't find id field of " + classInfo);
+    }
+
+    public MethodDescriptor getSetter(String className, FieldInfo field) {
+        return getSetter(index.getClassByName(DotName.createSimple(className)), field);
+    }
+
+    private MethodDescriptor getSetter(ClassInfo entityClass, FieldInfo field) {
+        if (entityClass == null) {
+            return null;
+        }
+        MethodInfo methodInfo = entityClass.method(JavaBeanUtil.getSetterName(field.name()), field.type());
+        if (methodInfo != null) {
+            return MethodDescriptor.of(methodInfo);
+        } else if (entityClass.superName() != null) {
+            return getSetter(index.getClassByName(entityClass.superName()), field);
+        }
+        return null;
+    }
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityDataAccessImplementor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityDataAccessImplementor.java
new file mode 100644
index 0000000000000..203f84b1a7965
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityDataAccessImplementor.java
@@ -0,0 +1,61 @@
+package io.quarkus.mongodb.rest.data.panache.deployment;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.util.List;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.mongodb.panache.PanacheMongoEntityBase;
+import io.quarkus.mongodb.panache.PanacheQuery;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+
+final class EntityDataAccessImplementor implements DataAccessImplementor {
+
+    private final String entityClassName;
+
+    EntityDataAccessImplementor(String entityClassName) {
+        this.entityClassName = entityClassName;
+    }
+
+    @Override
+    public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
+        return creator.invokeStaticMethod(
+                ofMethod(entityClassName, "findById", PanacheMongoEntityBase.class, Object.class), id);
+    }
+
+    @Override
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort) {
+        ResultHandle query = creator.invokeStaticMethod(
+                ofMethod(entityClassName, "findAll", PanacheQuery.class, Sort.class), sort);
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
+    }
+
+    @Override
+    public ResultHandle persist(BytecodeCreator creator, ResultHandle entity) {
+        creator.invokeVirtualMethod(ofMethod(entityClassName, "persist", void.class), entity);
+        return entity;
+    }
+
+    @Override
+    public ResultHandle persistOrUpdate(BytecodeCreator creator, ResultHandle entity) {
+        creator.invokeVirtualMethod(ofMethod(entityClassName, "persistOrUpdate", void.class), entity);
+        return entity;
+    }
+
+    @Override
+    public ResultHandle deleteById(BytecodeCreator creator, ResultHandle id) {
+        return creator.invokeStaticMethod(ofMethod(entityClassName, "deleteById", boolean.class, Object.class), id);
+    }
+
+    @Override
+    public ResultHandle pageCount(BytecodeCreator creator, ResultHandle page) {
+        ResultHandle query = creator.invokeStaticMethod(ofMethod(entityClassName, "findAll", PanacheQuery.class));
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "pageCount", int.class), query);
+    }
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java
new file mode 100644
index 0000000000000..70a48da899dfa
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java
@@ -0,0 +1,153 @@
+package io.quarkus.mongodb.rest.data.panache.deployment;
+
+import static io.quarkus.deployment.Feature.MONGODB_REST_DATA_PANACHE;
+
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.Gizmo;
+import io.quarkus.mongodb.rest.data.panache.PanacheMongoEntityResource;
+import io.quarkus.mongodb.rest.data.panache.PanacheMongoRepositoryResource;
+import io.quarkus.mongodb.rest.data.panache.runtime.RestDataPanacheExceptionMapper;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+
+class MongoPanacheRestProcessor {
+
+    private static final DotName PANACHE_MONGO_ENTITY_RESOURCE_INTERFACE = DotName
+            .createSimple(PanacheMongoEntityResource.class.getName());
+
+    private static final DotName PANACHE_MONGO_REPOSITORY_RESOURCE_INTERFACE = DotName
+            .createSimple(PanacheMongoRepositoryResource.class.getName());
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(MONGODB_REST_DATA_PANACHE);
+    }
+
+    @BuildStep
+    ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() {
+        return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName());
+    }
+
+    @BuildStep
+    void findEntityResources(CombinedIndexBuildItem index,
+            BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer,
+            BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformersProducer) {
+        EntityClassHelper entityClassHelper = new EntityClassHelper(index.getIndex());
+        ResourceImplementor resourceImplementor = new ResourceImplementor(entityClassHelper);
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
+
+        for (ClassInfo classInfo : index.getIndex()
+                .getKnownDirectImplementors(PANACHE_MONGO_ENTITY_RESOURCE_INTERFACE)) {
+            validateResource(index.getIndex(), classInfo);
+
+            List<Type> generics = getGenericTypes(classInfo);
+            String resourceInterface = classInfo.name().toString();
+            String entityType = generics.get(0).toString();
+            String idType = generics.get(1).toString();
+
+            DataAccessImplementor dataAccessImplementor = new EntityDataAccessImplementor(entityType);
+            String resourceClass = resourceImplementor.implement(
+                    classOutput, dataAccessImplementor, resourceInterface, entityType);
+
+            restDataResourceProducer.produce(new RestDataResourceBuildItem(
+                    new ResourceMetadata(resourceClass, resourceInterface, entityType, idType)));
+            bytecodeTransformersProducer.produce(
+                    getEntityIdAnnotationTransformer(entityType, entityClassHelper.getIdField(entityType).name()));
+        }
+    }
+
+    @BuildStep
+    void findRepositoryResources(CombinedIndexBuildItem index,
+            BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeansProducer,
+            BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformersProducer) {
+        EntityClassHelper entityClassHelper = new EntityClassHelper(index.getIndex());
+        ResourceImplementor resourceImplementor = new ResourceImplementor(entityClassHelper);
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
+
+        for (ClassInfo classInfo : index.getIndex()
+                .getKnownDirectImplementors(PANACHE_MONGO_REPOSITORY_RESOURCE_INTERFACE)) {
+            validateResource(index.getIndex(), classInfo);
+
+            List<Type> generics = getGenericTypes(classInfo);
+            String resourceInterface = classInfo.name().toString();
+            String repositoryClassName = generics.get(0).toString();
+            String entityType = generics.get(1).toString();
+            String idType = generics.get(2).toString();
+
+            DataAccessImplementor dataAccessImplementor = new RepositoryDataAccessImplementor(repositoryClassName);
+            String resourceClass = resourceImplementor.implement(
+                    classOutput, dataAccessImplementor, resourceInterface, entityType);
+            unremovableBeansProducer.produce(new UnremovableBeanBuildItem(
+                    new UnremovableBeanBuildItem.BeanClassNameExclusion(repositoryClassName)));
+
+            restDataResourceProducer.produce(new RestDataResourceBuildItem(
+                    new ResourceMetadata(resourceClass, resourceInterface, entityType, idType)));
+            bytecodeTransformersProducer.produce(
+                    getEntityIdAnnotationTransformer(entityType, entityClassHelper.getIdField(entityType).name()));
+        }
+    }
+
+    private void validateResource(IndexView index, ClassInfo classInfo) {
+        if (!Modifier.isInterface(classInfo.flags())) {
+            throw new RuntimeException(classInfo.name() + " has to be an interface");
+        }
+
+        if (classInfo.interfaceNames().size() > 1) {
+            throw new RuntimeException(classInfo.name() + " should only extend REST Data Panache interface");
+        }
+
+        if (!index.getKnownDirectImplementors(classInfo.name()).isEmpty()) {
+            throw new RuntimeException(classInfo.name() + " should not be extended or implemented");
+        }
+    }
+
+    private List<Type> getGenericTypes(ClassInfo classInfo) {
+        return classInfo.interfaceTypes()
+                .stream()
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException(classInfo.toString() + " does not have generic types"))
+                .asParameterizedType()
+                .arguments();
+    }
+
+    /**
+     * Annotate Mongo entity ID fields with a RESTEasy links annotation.
+     * Otherwise RESTEasy will not be able to generate links that use ID as path parameter.
+     */
+    private BytecodeTransformerBuildItem getEntityIdAnnotationTransformer(String entityClassName, String idFieldName) {
+        return new BytecodeTransformerBuildItem(entityClassName,
+                (className, classVisitor) -> new ClassVisitor(Gizmo.ASM_API_VERSION, classVisitor) {
+                    @Override
+                    public FieldVisitor visitField(int access, String name, String descriptor, String signature,
+                            Object value) {
+                        FieldVisitor fieldVisitor = super.visitField(access, name, descriptor, signature, value);
+                        if (name.equals(idFieldName)) {
+                            fieldVisitor.visitAnnotation("Lorg/jboss/resteasy/links/ResourceID;", true).visitEnd();
+                        }
+                        return fieldVisitor;
+                    }
+                });
+    }
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
new file mode 100644
index 0000000000000..9909a2a9efea6
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
@@ -0,0 +1,88 @@
+package io.quarkus.mongodb.rest.data.panache.deployment;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase;
+import io.quarkus.mongodb.panache.PanacheQuery;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+
+final class RepositoryDataAccessImplementor implements DataAccessImplementor {
+
+    private final String repositoryClassName;
+
+    RepositoryDataAccessImplementor(String repositoryClassName) {
+        this.repositoryClassName = repositoryClassName;
+    }
+
+    @Override
+    public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
+        return creator.invokeInterfaceMethod(
+                ofMethod(PanacheMongoRepositoryBase.class, "findById", Object.class, Object.class),
+                getRepositoryInstance(creator), id);
+    }
+
+    @Override
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort) {
+        ResultHandle query = creator.invokeInterfaceMethod(
+                ofMethod(PanacheMongoRepositoryBase.class, "findAll", PanacheQuery.class, Sort.class),
+                getRepositoryInstance(creator), sort);
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
+    }
+
+    @Override
+    public ResultHandle persist(BytecodeCreator creator, ResultHandle entity) {
+        creator.invokeInterfaceMethod(ofMethod(PanacheMongoRepositoryBase.class, "persist", void.class, Object.class),
+                getRepositoryInstance(creator), entity);
+        return entity;
+    }
+
+    @Override
+    public ResultHandle persistOrUpdate(BytecodeCreator creator, ResultHandle entity) {
+        creator.invokeInterfaceMethod(
+                ofMethod(PanacheMongoRepositoryBase.class, "persistOrUpdate", void.class, Object.class),
+                getRepositoryInstance(creator), entity);
+        return entity;
+    }
+
+    @Override
+    public ResultHandle deleteById(BytecodeCreator creator, ResultHandle id) {
+        return creator.invokeInterfaceMethod(
+                ofMethod(PanacheMongoRepositoryBase.class, "deleteById", boolean.class, Object.class),
+                getRepositoryInstance(creator), id);
+    }
+
+    @Override
+    public ResultHandle pageCount(BytecodeCreator creator, ResultHandle page) {
+        ResultHandle query = creator.invokeInterfaceMethod(
+                ofMethod(PanacheMongoRepositoryBase.class, "findAll", PanacheQuery.class),
+                getRepositoryInstance(creator));
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "pageCount", int.class), query);
+    }
+
+    private ResultHandle getRepositoryInstance(BytecodeCreator creator) {
+        ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class));
+        ResultHandle instanceHandle = creator.invokeInterfaceMethod(
+                ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class),
+                arcContainer, creator.loadClass(repositoryClassName), creator.newArray(Annotation.class, 0));
+        ResultHandle instance = creator.invokeInterfaceMethod(
+                ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle);
+
+        creator.ifNull(instance).trueBranch()
+                .throwException(RuntimeException.class, repositoryClassName + " instance was not found");
+
+        return instance;
+    }
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java
new file mode 100644
index 0000000000000..9d67fbdc9e063
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java
@@ -0,0 +1,115 @@
+package io.quarkus.mongodb.rest.data.panache.deployment;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.jboss.jandex.FieldInfo;
+import org.jboss.logging.Logger;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.rest.data.panache.deployment.Constants;
+import io.quarkus.runtime.util.HashUtil;
+
+/**
+ * {@link io.quarkus.rest.data.panache.RestDataResource} implementor that generates data access logic depending on which
+ * sub-interfaces are used in the application.
+ * The method implementation differs depending on a data access strategy (active record or repository).
+ */
+class ResourceImplementor {
+
+    private static final Logger LOGGER = Logger.getLogger(ResourceImplementor.class);
+
+    private final EntityClassHelper entityClassHelper;
+
+    ResourceImplementor(EntityClassHelper entityClassHelper) {
+        this.entityClassHelper = entityClassHelper;
+    }
+
+    String implement(ClassOutput classOutput, DataAccessImplementor dataAccessImplementor, String resourceType,
+            String entityType) {
+        String className = resourceType + "Impl_" + HashUtil.sha1(resourceType);
+        LOGGER.tracef("Starting generation of '%s'", className);
+        ClassCreator classCreator = ClassCreator.builder()
+                .classOutput(classOutput)
+                .className(className)
+                .interfaces(resourceType)
+                .build();
+
+        classCreator.addAnnotation(ApplicationScoped.class);
+        implementList(classCreator, dataAccessImplementor);
+        implementListPageCount(classCreator, dataAccessImplementor);
+        implementGet(classCreator, dataAccessImplementor);
+        implementAdd(classCreator, dataAccessImplementor);
+        implementUpdate(classCreator, dataAccessImplementor, entityType);
+        implementDelete(classCreator, dataAccessImplementor);
+
+        classCreator.close();
+        LOGGER.tracef("Completed generation of '%s'", className);
+        return className;
+    }
+
+    private void implementList(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("list", List.class, Page.class, Sort.class);
+        ResultHandle page = methodCreator.getMethodParam(0);
+        ResultHandle sort = methodCreator.getMethodParam(1);
+        methodCreator.returnValue(dataAccessImplementor.findAll(methodCreator, page, sort));
+        methodCreator.close();
+    }
+
+    private void implementListPageCount(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(Constants.PAGE_COUNT_METHOD_PREFIX + "list", int.class,
+                Page.class);
+        ResultHandle page = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.pageCount(methodCreator, page));
+        methodCreator.close();
+    }
+
+    private void implementGet(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("get", Object.class, Object.class);
+        ResultHandle id = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.findById(methodCreator, id));
+        methodCreator.close();
+    }
+
+    private void implementAdd(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("add", Object.class, Object.class);
+        ResultHandle entity = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.persist(methodCreator, entity));
+        methodCreator.close();
+    }
+
+    private void implementUpdate(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor,
+            String entityType) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("update", Object.class, Object.class, Object.class);
+        ResultHandle id = methodCreator.getMethodParam(0);
+        ResultHandle entity = methodCreator.getMethodParam(1);
+        setId(methodCreator, entityType, entity, id);
+        methodCreator.returnValue(dataAccessImplementor.persistOrUpdate(methodCreator, entity));
+        methodCreator.close();
+    }
+
+    private void implementDelete(ClassCreator classCreator, DataAccessImplementor dataAccessImplementor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("delete", boolean.class, Object.class);
+        ResultHandle id = methodCreator.getMethodParam(0);
+        methodCreator.returnValue(dataAccessImplementor.deleteById(methodCreator, id));
+        methodCreator.close();
+    }
+
+    private void setId(BytecodeCreator creator, String entityType, ResultHandle entity, ResultHandle id) {
+        FieldInfo idField = entityClassHelper.getIdField(entityType);
+        MethodDescriptor idSetter = entityClassHelper.getSetter(entityType, idField);
+        if (idSetter == null) {
+            creator.writeInstanceField(idField, entity, id);
+        } else {
+            creator.invokeVirtualMethod(idSetter, entity, id);
+        }
+    }
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/pom.xml b/extensions/panache/mongodb-rest-data-panache/pom.xml
new file mode 100644
index 0000000000000..ae14687230be6
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-mongodb-rest-data-panache-parent</artifactId>
+    <name>Quarkus - MongoDB REST data with Panache - Parent</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/pom.xml b/extensions/panache/mongodb-rest-data-panache/runtime/pom.xml
new file mode 100644
index 0000000000000..38260d4dd6967
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/runtime/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-mongodb-rest-data-panache-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-mongodb-rest-data-panache</artifactId>
+    <name>Quarkus - MongoDB REST data with Panache - Runtime</name>
+    <description>Generate JAX-RS resources for your MongoDB entities and repositories</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-data-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache</artifactId>
+        </dependency>
+        <!-- RESTEasy Links need a JPA ID annotation in a classpath -->
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/PanacheMongoEntityResource.java b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/PanacheMongoEntityResource.java
new file mode 100644
index 0000000000000..83caf44a8f423
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/PanacheMongoEntityResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.mongodb.rest.data.panache;
+
+import io.quarkus.mongodb.panache.PanacheMongoEntityBase;
+import io.quarkus.rest.data.panache.MethodProperties;
+import io.quarkus.rest.data.panache.ResourceProperties;
+import io.quarkus.rest.data.panache.RestDataResource;
+
+/**
+ * REST data Panache resource that uses {@link PanacheMongoEntityBase} instance for data access and exposes it as a JAX-RS
+ * resource.
+ * <p>
+ * See {@link RestDataResource} for the methods provided by this resource.
+ * <p>
+ * See {@link ResourceProperties} and {@link MethodProperties} for the ways to customize this resource.
+ *
+ * @param <Entity> {@link PanacheMongoEntityBase} that is handled by this resource.
+ * @param <ID> ID type of the entity.
+ */
+public interface PanacheMongoEntityResource<Entity extends PanacheMongoEntityBase, ID> extends RestDataResource<Entity, ID> {
+
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/PanacheMongoRepositoryResource.java b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/PanacheMongoRepositoryResource.java
new file mode 100644
index 0000000000000..fb517235f33ec
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/PanacheMongoRepositoryResource.java
@@ -0,0 +1,23 @@
+package io.quarkus.mongodb.rest.data.panache;
+
+import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase;
+import io.quarkus.rest.data.panache.MethodProperties;
+import io.quarkus.rest.data.panache.ResourceProperties;
+import io.quarkus.rest.data.panache.RestDataResource;
+
+/**
+ * REST data Panache resource that uses {@link PanacheMongoRepositoryBase} instance for data access and exposes it as a JAX-RS
+ * resource.
+ * <p>
+ * See {@link RestDataResource} for the methods provided by this resource.
+ * <p>
+ * See {@link ResourceProperties} and {@link MethodProperties} for the ways to customize this resource.
+ *
+ * @param <Repository> {@link PanacheMongoRepositoryBase} instance that should be used for data access.
+ * @param <Entity> Entity type that is handled by this resource and the linked {@link PanacheMongoRepositoryBase} instance.
+ * @param <ID> ID type of the entity.
+ */
+public interface PanacheMongoRepositoryResource<Repository extends PanacheMongoRepositoryBase<Entity, ID>, Entity, ID>
+        extends RestDataResource<Entity, ID> {
+
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java
new file mode 100644
index 0000000000000..03c803882dd41
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/java/io/quarkus/mongodb/rest/data/panache/runtime/RestDataPanacheExceptionMapper.java
@@ -0,0 +1,35 @@
+package io.quarkus.mongodb.rest.data.panache.runtime;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.jboss.logging.Logger;
+
+import com.mongodb.MongoWriteException;
+
+import io.quarkus.rest.data.panache.RestDataPanacheException;
+
+public class RestDataPanacheExceptionMapper implements ExceptionMapper<RestDataPanacheException> {
+
+    private static final String DUPLICATE_KEY_ERROR_CODE = "E11000";
+
+    private static final Logger LOGGER = Logger.getLogger(RestDataPanacheExceptionMapper.class);
+
+    @Override
+    public Response toResponse(RestDataPanacheException exception) {
+        LOGGER.warnf(exception, "Mapping an unhandled %s", RestDataPanacheException.class.getSimpleName());
+        return throwableToResponse(exception, exception.getMessage());
+    }
+
+    private Response throwableToResponse(Throwable throwable, String message) {
+        if (throwable instanceof MongoWriteException && throwable.getMessage().contains(DUPLICATE_KEY_ERROR_CODE)) {
+            return Response.status(Response.Status.CONFLICT.getStatusCode(), message).build();
+        }
+
+        if (throwable.getCause() != null) {
+            return throwableToResponse(throwable.getCause(), message);
+        }
+
+        return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), message).build();
+    };
+}
diff --git a/extensions/panache/mongodb-rest-data-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..aaf2d62245861
--- /dev/null
+++ b/extensions/panache/mongodb-rest-data-panache/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,15 @@
+---
+name: "REST resources for MongoDB with Panache"
+metadata:
+  keywords:
+  - "mongodb-panache"
+  - "panache"
+  - "mongodb"
+  - "rest"
+  - "jaxrs"
+  - "resteasy"
+  guide: "https://quarkus.io/guides/rest-data-panache"
+  categories:
+  - "data"
+  - "web"
+  status: "experimental"
diff --git a/extensions/panache/panache-common/deployment/pom.xml b/extensions/panache/panache-common/deployment/pom.xml
index 209569513a010..ef1a0737cadca 100644
--- a/extensions/panache/panache-common/deployment/pom.xml
+++ b/extensions/panache/panache-common/deployment/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-panache-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,16 +22,19 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
+            <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/ByteCodeType.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/ByteCodeType.java
new file mode 100644
index 0000000000000..86e3a37814c86
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/ByteCodeType.java
@@ -0,0 +1,93 @@
+package io.quarkus.panache.common.deployment;
+
+import static org.jboss.jandex.DotName.createSimple;
+import static org.objectweb.asm.Type.BOOLEAN_TYPE;
+import static org.objectweb.asm.Type.BYTE_TYPE;
+import static org.objectweb.asm.Type.CHAR_TYPE;
+import static org.objectweb.asm.Type.DOUBLE_TYPE;
+import static org.objectweb.asm.Type.FLOAT_TYPE;
+import static org.objectweb.asm.Type.INT_TYPE;
+import static org.objectweb.asm.Type.LONG_TYPE;
+import static org.objectweb.asm.Type.SHORT_TYPE;
+import static org.objectweb.asm.Type.getType;
+
+import java.util.StringJoiner;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.PrimitiveType;
+import org.objectweb.asm.Type;
+
+import io.quarkus.deployment.util.AsmUtil;
+
+public class ByteCodeType {
+    private final Type type;
+
+    public ByteCodeType(Type type) {
+        this.type = type;
+    }
+
+    public ByteCodeType(Class<?> type) {
+        this.type = getType(type);
+    }
+
+    public ByteCodeType(org.jboss.jandex.Type type) {
+        if (type.kind() == org.jboss.jandex.Type.Kind.PRIMITIVE) {
+            this.type = toAsm(type.asPrimitiveType());
+        } else {
+            String typeDescriptor = type.kind() == org.jboss.jandex.Type.Kind.PRIMITIVE
+                    ? type.toString()
+                    : "L" + type.name().toString().replace('.', '/') + ";";
+            this.type = getType(typeDescriptor);
+        }
+    }
+
+    public String descriptor() {
+        return type.getDescriptor();
+    }
+
+    public DotName dotName() {
+        return createSimple(type.getClassName());
+    }
+
+    public String internalName() {
+        return type.getInternalName();
+    }
+
+    private Type toAsm(PrimitiveType primitive) {
+        switch (primitive.name().toString()) {
+            case "byte":
+                return BYTE_TYPE;
+            case "char":
+                return CHAR_TYPE;
+            case "double":
+                return DOUBLE_TYPE;
+            case "float":
+                return FLOAT_TYPE;
+            case "int":
+                return INT_TYPE;
+            case "long":
+                return LONG_TYPE;
+            case "short":
+                return SHORT_TYPE;
+            case "boolean":
+                return BOOLEAN_TYPE;
+
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", ByteCodeType.class.getSimpleName() + "[", "]")
+                .add(type.toString())
+                .toString();
+    }
+
+    public Type type() {
+        return this.type;
+    }
+
+    public ByteCodeType unbox() {
+        return new ByteCodeType(AsmUtil.WRAPPER_TO_PRIMITIVE.getOrDefault(type, type));
+    }
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/EntityModel.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/EntityModel.java
index 7a06f4db87ba7..fa23bbdf5af4a 100644
--- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/EntityModel.java
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/EntityModel.java
@@ -5,19 +5,19 @@
 
 import org.jboss.jandex.ClassInfo;
 
-public class EntityModel<EntityFieldType extends EntityField> {
+public class EntityModel {
 
     public final String name;
     public final String superClassName;
     // VERY IMPORTANT: field traversal order should not change
-    public final Map<String, EntityFieldType> fields = new LinkedHashMap<>();
+    public final Map<String, EntityField> fields = new LinkedHashMap<>();
 
     public EntityModel(ClassInfo classInfo) {
         this.name = classInfo.name().toString();
         this.superClassName = classInfo.superName().toString();
     }
 
-    public void addField(EntityFieldType field) {
+    public void addField(EntityField field) {
         fields.put(field.name, field);
     }
 }
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/MetamodelInfo.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/MetamodelInfo.java
index 93012a24b239e..cbb16ad73fdce 100644
--- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/MetamodelInfo.java
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/MetamodelInfo.java
@@ -2,19 +2,24 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-public class MetamodelInfo<EntityModelType extends EntityModel<?>> {
-    final Map<String, EntityModelType> entities = new HashMap<>();
+public class MetamodelInfo {
+    final Map<String, EntityModel> entities = new HashMap<>();
 
-    public EntityModelType getEntityModel(String className) {
+    public EntityModel getEntityModel(String className) {
         return entities.get(className);
     }
 
-    public void addEntityModel(EntityModelType entityModel) {
+    public void addEntityModel(EntityModel entityModel) {
         entities.put(entityModel.name, entityModel);
     }
 
-    public boolean hasEntities() {
-        return !entities.isEmpty();
+    public Set<String> getEntitiesWithPublicFields() {
+        return entities.entrySet().stream()
+                .filter(e -> !e.getValue().fields.isEmpty())
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toSet());
     }
 }
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheCompanionEnhancer.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheCompanionEnhancer.java
new file mode 100644
index 0000000000000..4b32b2b4b6797
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheCompanionEnhancer.java
@@ -0,0 +1,23 @@
+package io.quarkus.panache.common.deployment;
+
+import java.util.List;
+import java.util.function.BiFunction;
+
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+public abstract class PanacheCompanionEnhancer
+        implements BiFunction<String, ClassVisitor, ClassVisitor> {
+
+    protected final IndexView indexView;
+    protected final List<PanacheMethodCustomizer> methodCustomizers;
+
+    public PanacheCompanionEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
+        this.indexView = index;
+        this.methodCustomizers = methodCustomizers;
+    }
+
+    @Override
+    public abstract ClassVisitor apply(String className, ClassVisitor outputClassVisitor);
+
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java
new file mode 100644
index 0000000000000..34a8d14af6bd6
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheConstants.java
@@ -0,0 +1,25 @@
+package io.quarkus.panache.common.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.panache.common.impl.GenerateBridge;
+
+public final class PanacheConstants {
+
+    private PanacheConstants() {
+    }
+
+    public static final DotName DOTNAME_GENERATE_BRIDGE = DotName.createSimple(GenerateBridge.class.getName());
+
+    public static final String JAXB_ANNOTATION_PREFIX = "Ljavax/xml/bind/annotation/";
+    public static final String META_INF_PANACHE_ARCHIVE_MARKER = "META-INF/panache-archive.marker";
+    private static final String JAXB_TRANSIENT_BINARY_NAME = "javax/xml/bind/annotation/XmlTransient";
+    public static final String JAXB_TRANSIENT_SIGNATURE = "L" + JAXB_TRANSIENT_BINARY_NAME + ";";
+
+    private static final String JSON_PROPERTY_BINARY_NAME = "com/fasterxml/jackson/annotation/JsonProperty";
+    public static final String JSON_PROPERTY_SIGNATURE = "L" + JSON_PROPERTY_BINARY_NAME + ";";
+
+    public static final DotName JSON_IGNORE_DOT_NAME = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");
+    public static final DotName JSON_PROPERTY_DOT_NAME = DotName.createSimple("com.fasterxml.jackson.annotation.JsonProperty");
+
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java
index b60f40f41ab04..59023e576d6f2 100644
--- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java
@@ -1,319 +1,22 @@
 package io.quarkus.panache.common.deployment;
 
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.function.BiFunction;
 
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationValue;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
-import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
 
-import io.quarkus.deployment.util.AsmUtil;
-import io.quarkus.gizmo.Gizmo;
-import io.quarkus.panache.common.Parameters;
-import io.quarkus.panache.common.Sort;
-import io.quarkus.panache.common.deployment.EntityField.EntityFieldAnnotation;
-import io.quarkus.panache.common.impl.GenerateBridge;
-
-public abstract class PanacheEntityEnhancer<MetamodelType extends MetamodelInfo<?>>
+public abstract class PanacheEntityEnhancer
         implements BiFunction<String, ClassVisitor, ClassVisitor> {
 
-    public final static DotName DOTNAME_GENERATE_BRIDGE = DotName.createSimple(GenerateBridge.class.getName());
-
-    public final static String SORT_NAME = Sort.class.getName();
-    public final static String SORT_BINARY_NAME = SORT_NAME.replace('.', '/');
-    public final static String SORT_SIGNATURE = "L" + SORT_BINARY_NAME + ";";
-
-    public final static String PARAMETERS_NAME = Parameters.class.getName();
-    public final static String PARAMETERS_BINARY_NAME = PARAMETERS_NAME.replace('.', '/');
-    public final static String PARAMETERS_SIGNATURE = "L" + PARAMETERS_BINARY_NAME + ";";
-
-    private static final String JAXB_ANNOTATION_PREFIX = "Ljavax/xml/bind/annotation/";
-    private static final String JAXB_TRANSIENT_BINARY_NAME = "javax/xml/bind/annotation/XmlTransient";
-    private static final String JAXB_TRANSIENT_SIGNATURE = "L" + JAXB_TRANSIENT_BINARY_NAME + ";";
-
-    private static final String JSON_PROPERTY_BINARY_NAME = "com/fasterxml/jackson/annotation/JsonProperty";
-    private static final String JSON_PROPERTY_SIGNATURE = "L" + JSON_PROPERTY_BINARY_NAME + ";";
-
-    private static final DotName JSON_IGNORE_DOT_NAME = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");
-
-    protected MetamodelType modelInfo;
-    protected final ClassInfo panacheEntityBaseClassInfo;
     protected final IndexView indexView;
     protected final List<PanacheMethodCustomizer> methodCustomizers;
 
-    public PanacheEntityEnhancer(IndexView index, DotName panacheEntityBaseName,
-            List<PanacheMethodCustomizer> methodCustomizers) {
-        this.panacheEntityBaseClassInfo = index.getClassByName(panacheEntityBaseName);
+    public PanacheEntityEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers) {
         this.indexView = index;
         this.methodCustomizers = methodCustomizers;
     }
 
     @Override
     public abstract ClassVisitor apply(String className, ClassVisitor outputClassVisitor);
-
-    public abstract static class PanacheEntityClassVisitor<EntityFieldType extends EntityField> extends ClassVisitor {
-
-        protected Type thisClass;
-        protected Map<String, ? extends EntityFieldType> fields;
-        // set of name + "/" + descriptor
-        private Set<String> userMethods = new HashSet<>();
-        private MetamodelInfo<?> modelInfo;
-        private ClassInfo panacheEntityBaseClassInfo;
-        protected ClassInfo entityInfo;
-        protected List<PanacheMethodCustomizer> methodCustomizers;
-
-        public PanacheEntityClassVisitor(String className, ClassVisitor outputClassVisitor,
-                MetamodelInfo<? extends EntityModel<? extends EntityFieldType>> modelInfo,
-                ClassInfo panacheEntityBaseClassInfo,
-                ClassInfo entityInfo,
-                List<PanacheMethodCustomizer> methodCustomizers) {
-            super(Gizmo.ASM_API_VERSION, outputClassVisitor);
-            thisClass = Type.getType("L" + className.replace('.', '/') + ";");
-            this.modelInfo = modelInfo;
-            EntityModel<? extends EntityFieldType> entityModel = modelInfo.getEntityModel(className);
-            fields = entityModel != null ? entityModel.fields : null;
-            this.panacheEntityBaseClassInfo = panacheEntityBaseClassInfo;
-            this.entityInfo = entityInfo;
-            this.methodCustomizers = methodCustomizers;
-        }
-
-        @Override
-        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
-            FieldVisitor superVisitor = super.visitField(access, name, descriptor, signature, value);
-            EntityField ef = fields.get(name);
-            if (ef == null) {
-                return superVisitor;
-            }
-            ef.signature = signature;
-            // if we have a mapped field, let's add some annotations
-            return new FieldVisitor(Gizmo.ASM_API_VERSION, superVisitor) {
-                private Set<String> descriptors = new HashSet<>();
-
-                @Override
-                public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-                    descriptors.add(descriptor);
-                    if (!descriptor.startsWith(JAXB_ANNOTATION_PREFIX)) {
-                        return super.visitAnnotation(descriptor, visible);
-                    } else {
-                        // Save off JAX-B annotations on the field so they can be applied to the generated getter later
-                        EntityFieldAnnotation efAnno = new EntityFieldAnnotation(descriptor);
-                        ef.annotations.add(efAnno);
-                        return new PanacheMovingAnnotationVisitor(efAnno);
-                    }
-                }
-
-                @Override
-                public void visitEnd() {
-                    // Add the @JaxbTransient property to the field so that JAXB prefers the generated getter (otherwise JAXB complains about
-                    // having a field and property both with the same name)
-                    // JSONB will already use the getter so we're good
-                    // Note: we don't need to check if we already have @XmlTransient in the descriptors because if we did, we moved it to the getter
-                    // so we can't have any duplicate
-                    super.visitAnnotation(JAXB_TRANSIENT_SIGNATURE, true);
-                    super.visitEnd();
-                }
-            };
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String methodName, String descriptor, String signature,
-                String[] exceptions) {
-            userMethods.add(methodName + "/" + descriptor);
-            MethodVisitor superVisitor = super.visitMethod(access, methodName, descriptor, signature, exceptions);
-            if (Modifier.isStatic(access)
-                    && Modifier.isPublic(access)
-                    && (access & Opcodes.ACC_SYNTHETIC) == 0
-                    && !methodCustomizers.isEmpty()) {
-                org.jboss.jandex.Type[] argTypes = AsmUtil.getParameterTypes(descriptor);
-                MethodInfo method = this.entityInfo.method(methodName, argTypes);
-                if (method == null) {
-                    throw new IllegalStateException(
-                            "Could not find indexed method: " + thisClass + "." + methodName + " with descriptor " + descriptor
-                                    + " and arg types " + Arrays.toString(argTypes));
-                }
-                superVisitor = new PanacheMethodCustomizerVisitor(superVisitor, method, thisClass, methodCustomizers);
-            }
-            return new PanacheFieldAccessMethodVisitor(superVisitor, thisClass.getInternalName(), methodName, descriptor,
-                    modelInfo);
-        }
-
-        @Override
-        public void visitEnd() {
-            // FIXME: generate default constructor
-
-            for (MethodInfo method : panacheEntityBaseClassInfo.methods()) {
-                // Do not generate a method that already exists
-                String descriptor = AsmUtil.getDescriptor(method, name -> null);
-                if (!userMethods.contains(method.name() + "/" + descriptor)) {
-                    AnnotationInstance bridge = method.annotation(DOTNAME_GENERATE_BRIDGE);
-                    if (bridge != null) {
-                        generateMethod(method, bridge.value("targetReturnTypeErased"));
-                    }
-                }
-            }
-
-            generateAccessors();
-
-            super.visitEnd();
-        }
-
-        private void generateMethod(MethodInfo method, AnnotationValue targetReturnTypeErased) {
-            String descriptor = AsmUtil.getDescriptor(method, name -> null);
-            String signature = AsmUtil.getSignature(method, name -> null);
-            List<org.jboss.jandex.Type> parameters = method.parameters();
-            String castTo = null;
-            if (targetReturnTypeErased != null && targetReturnTypeErased.asBoolean()) {
-                castTo = method.returnType().name().toString('/');
-            }
-
-            MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC,
-                    method.name(),
-                    descriptor,
-                    signature,
-                    null);
-            for (int i = 0; i < parameters.size(); i++) {
-                mv.visitParameter(method.parameterName(i), 0 /* modifiers */);
-            }
-            mv.visitCode();
-            for (PanacheMethodCustomizer customizer : methodCustomizers) {
-                customizer.customize(thisClass, method, mv);
-            }
-            // inject model
-            injectModel(mv);
-            for (int i = 0; i < parameters.size(); i++) {
-                mv.visitIntInsn(Opcodes.ALOAD, i);
-            }
-            // inject Class
-            String forwardingDescriptor = "(" + getModelDescriptor() + descriptor.substring(1);
-            if (castTo != null) {
-                // return type is erased to Object
-                int lastParen = forwardingDescriptor.lastIndexOf(')');
-                forwardingDescriptor = forwardingDescriptor.substring(0, lastParen + 1) + "Ljava/lang/Object;";
-            }
-            mv.visitMethodInsn(Opcodes.INVOKESTATIC,
-                    getPanacheOperationsBinaryName(),
-                    method.name(),
-                    forwardingDescriptor, false);
-            if (castTo != null)
-                mv.visitTypeInsn(Opcodes.CHECKCAST, castTo);
-            String returnTypeDescriptor = descriptor.substring(descriptor.lastIndexOf(")") + 1);
-            mv.visitInsn(AsmUtil.getReturnInstruction(returnTypeDescriptor));
-            mv.visitMaxs(0, 0);
-            mv.visitEnd();
-        }
-
-        protected abstract String getModelDescriptor();
-
-        protected abstract String getPanacheOperationsBinaryName();
-
-        protected abstract void injectModel(MethodVisitor mv);
-
-        protected void generateAccessors() {
-            if (fields == null)
-                return;
-            for (EntityField field : fields.values()) {
-                // Getter
-                String getterName = field.getGetterName();
-                String getterDescriptor = "()" + field.descriptor;
-                if (!userMethods.contains(getterName + "/" + getterDescriptor)) {
-                    MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC,
-                            getterName, getterDescriptor, field.signature == null ? null : "()" + field.signature, null);
-                    mv.visitCode();
-                    mv.visitIntInsn(Opcodes.ALOAD, 0);
-                    generateAccessorGetField(mv, field);
-                    int returnCode = AsmUtil.getReturnInstruction(field.descriptor);
-                    mv.visitInsn(returnCode);
-                    mv.visitMaxs(0, 0);
-                    // Apply JAX-B annotations that are being transferred from the field
-                    for (EntityFieldAnnotation anno : field.annotations) {
-                        anno.writeToVisitor(mv);
-                    }
-                    // Add an explicit Jackson annotation so that the entire property is not ignored due to having @XmlTransient
-                    // on the field
-                    if (shouldAddJsonProperty(field)) {
-                        mv.visitAnnotation(JSON_PROPERTY_SIGNATURE, true);
-                    }
-                    mv.visitEnd();
-                }
-
-                // Setter
-                String setterName = field.getSetterName();
-                String setterDescriptor = "(" + field.descriptor + ")V";
-                if (!userMethods.contains(setterName + "/" + setterDescriptor)) {
-                    MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC,
-                            setterName, setterDescriptor, field.signature == null ? null : "(" + field.signature + ")V", null);
-                    mv.visitCode();
-                    mv.visitIntInsn(Opcodes.ALOAD, 0);
-                    int loadCode;
-                    switch (field.descriptor) {
-                        case "Z":
-                        case "B":
-                        case "C":
-                        case "S":
-                        case "I":
-                            loadCode = Opcodes.ILOAD;
-                            break;
-                        case "J":
-                            loadCode = Opcodes.LLOAD;
-                            break;
-                        case "F":
-                            loadCode = Opcodes.FLOAD;
-                            break;
-                        case "D":
-                            loadCode = Opcodes.DLOAD;
-                            break;
-                        default:
-                            loadCode = Opcodes.ALOAD;
-                            break;
-                    }
-                    mv.visitIntInsn(loadCode, 1);
-                    generateAccessorSetField(mv, field);
-                    mv.visitInsn(Opcodes.RETURN);
-                    mv.visitMaxs(0, 0);
-                    mv.visitEnd();
-                }
-            }
-        }
-
-        private boolean shouldAddJsonProperty(EntityField entityField) {
-            if (isAnnotatedWithJsonIgnore(entityField)) {
-                return false;
-            }
-            return !entityField.hasAnnotation(JSON_PROPERTY_SIGNATURE);
-        }
-
-        private boolean isAnnotatedWithJsonIgnore(EntityField entityField) {
-            FieldInfo field = entityInfo.field(entityField.name);
-            if (field != null) {
-                return field.hasAnnotation(JSON_IGNORE_DOT_NAME);
-            }
-
-            return false;
-        }
-
-        protected abstract void generateAccessorSetField(MethodVisitor mv, EntityField field);
-
-        protected abstract void generateAccessorGetField(MethodVisitor mv, EntityField field);
-    }
-
-    public abstract void collectFields(ClassInfo classInfo);
-
-    public MetamodelType getModelInfo() {
-        return modelInfo;
-    }
 }
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessEnhancer.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessEnhancer.java
index 0eb935269cc23..e6743ecb2d5af 100644
--- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessEnhancer.java
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessEnhancer.java
@@ -9,9 +9,9 @@
 
 public class PanacheFieldAccessEnhancer implements BiFunction<String, ClassVisitor, ClassVisitor> {
 
-    private MetamodelInfo<?> modelInfo;
+    private MetamodelInfo modelInfo;
 
-    public PanacheFieldAccessEnhancer(MetamodelInfo<?> modelInfo) {
+    public PanacheFieldAccessEnhancer(MetamodelInfo modelInfo) {
         this.modelInfo = modelInfo;
     }
 
@@ -23,9 +23,9 @@ public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
     static class FieldAccessClassVisitor extends ClassVisitor {
 
         private String classBinaryName;
-        private MetamodelInfo<?> modelInfo;
+        private MetamodelInfo modelInfo;
 
-        public FieldAccessClassVisitor(String className, ClassVisitor outputClassVisitor, MetamodelInfo<?> modelInfo) {
+        public FieldAccessClassVisitor(String className, ClassVisitor outputClassVisitor, MetamodelInfo modelInfo) {
             super(Gizmo.ASM_API_VERSION, outputClassVisitor);
             this.modelInfo = modelInfo;
             this.classBinaryName = className.replace('.', '/');
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessMethodVisitor.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessMethodVisitor.java
index f0ab48067c6c3..ccd0c3d8acb6c 100644
--- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessMethodVisitor.java
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheFieldAccessMethodVisitor.java
@@ -11,11 +11,11 @@ public class PanacheFieldAccessMethodVisitor extends MethodVisitor {
     private final String methodName;
     private String owner;
     private String methodDescriptor;
-    private MetamodelInfo<?> modelInfo;
+    private MetamodelInfo modelInfo;
 
     public PanacheFieldAccessMethodVisitor(MethodVisitor methodVisitor, String owner,
             String methodName, String methodDescriptor,
-            MetamodelInfo<?> modelInfo) {
+            MetamodelInfo modelInfo) {
         super(Gizmo.ASM_API_VERSION, methodVisitor);
         this.owner = owner;
         this.methodName = methodName;
@@ -62,7 +62,7 @@ && isEntityField(ownerName, fieldName)) {
     private boolean targetIsInHierarchy(String currentClass, String targetClass) {
         if (currentClass.equals(targetClass))
             return true;
-        EntityModel<?> entityModel = modelInfo.getEntityModel(currentClass);
+        EntityModel entityModel = modelInfo.getEntityModel(currentClass);
         if (entityModel == null)
             return false;
         if (entityModel.superClassName != null)
@@ -74,7 +74,7 @@ private boolean targetIsInHierarchy(String currentClass, String targetClass) {
      * Checks that the given field belongs to an entity (any entity)
      */
     boolean isEntityField(String className, String fieldName) {
-        EntityModel<?> entityModel = modelInfo.getEntityModel(className);
+        EntityModel entityModel = modelInfo.getEntityModel(className);
         if (entityModel == null)
             return false;
         EntityField field = entityModel.fields.get(fieldName);
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheRepositoryEnhancer.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheRepositoryEnhancer.java
index 1b83709d56759..83daf39ea1e66 100644
--- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheRepositoryEnhancer.java
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheRepositoryEnhancer.java
@@ -1,273 +1,24 @@
 package io.quarkus.panache.common.deployment;
 
 import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.function.BiFunction;
 
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.Type.Kind;
 import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
-import io.quarkus.deployment.util.AsmUtil;
-import io.quarkus.deployment.util.JandexUtil;
-import io.quarkus.gizmo.Gizmo;
 
 public abstract class PanacheRepositoryEnhancer implements BiFunction<String, ClassVisitor, ClassVisitor> {
 
-    protected final ClassInfo panacheRepositoryBaseClassInfo;
     protected final IndexView indexView;
 
-    public PanacheRepositoryEnhancer(IndexView index, DotName panacheRepositoryBaseName) {
-        panacheRepositoryBaseClassInfo = index.getClassByName(panacheRepositoryBaseName);
+    public PanacheRepositoryEnhancer(IndexView index) {
         this.indexView = index;
     }
 
     @Override
     public abstract ClassVisitor apply(String className, ClassVisitor outputClassVisitor);
 
-    public static abstract class PanacheRepositoryClassVisitor extends ClassVisitor {
-
-        protected Type entityType;
-        protected String entitySignature;
-        protected String entityBinaryType;
-        protected String idSignature;
-        protected String idBinaryType;
-        protected String daoBinaryName;
-        protected ClassInfo daoClassInfo;
-        protected ClassInfo panacheRepositoryBaseClassInfo;
-        protected IndexView indexView;
-        protected Map<String, String> typeArguments = new HashMap<>();
-        // set of name + "/" + descriptor
-        protected Set<String> userMethods = new HashSet<>();
-
-        public PanacheRepositoryClassVisitor(String className, ClassVisitor outputClassVisitor,
-                ClassInfo panacheRepositoryBaseClassInfo, IndexView indexView) {
-            super(Gizmo.ASM_API_VERSION, outputClassVisitor);
-            daoClassInfo = indexView.getClassByName(DotName.createSimple(className));
-            daoBinaryName = className.replace('.', '/');
-            this.panacheRepositoryBaseClassInfo = panacheRepositoryBaseClassInfo;
-            this.indexView = indexView;
-        }
-
-        protected abstract DotName getPanacheRepositoryDotName();
-
-        protected abstract DotName getPanacheRepositoryBaseDotName();
-
-        protected abstract String getPanacheOperationsBinaryName();
-
-        protected abstract String getModelDescriptor();
-
-        protected abstract void injectModel(MethodVisitor mv);
-
-        @Override
-        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-            super.visit(version, access, name, signature, superName, interfaces);
-
-            final String repositoryClassName = name.replace('/', '.');
-
-            String[] foundTypeArguments = findEntityTypeArgumentsForPanacheRepository(indexView, repositoryClassName,
-                    getPanacheRepositoryBaseDotName());
-
-            entityBinaryType = foundTypeArguments[0];
-            entitySignature = "L" + entityBinaryType + ";";
-            entityType = Type.getType(entitySignature);
-            idBinaryType = foundTypeArguments[1];
-            idSignature = "L" + idBinaryType + ";";
-
-            typeArguments.put("Entity", entitySignature);
-            typeArguments.put("Id", idSignature);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String methodName, String descriptor, String signature,
-                String[] exceptions) {
-            userMethods.add(methodName + "/" + descriptor);
-            return super.visitMethod(access, methodName, descriptor, signature, exceptions);
-        }
-
-        public static String[] findEntityTypeArgumentsForPanacheRepository(IndexView indexView,
-                String repositoryClassName,
-                DotName repositoryDotName) {
-            for (ClassInfo classInfo : indexView.getAllKnownImplementors(repositoryDotName)) {
-                if (repositoryClassName.equals(classInfo.name().toString())) {
-                    return recursivelyFindEntityTypeArgumentsFromClass(indexView, classInfo.name(), repositoryDotName);
-                }
-            }
-
-            return null;
-        }
-
-        public static String[] recursivelyFindEntityTypeArgumentsFromClass(IndexView indexView, DotName clazz,
-                DotName repositoryDotName) {
-            if (clazz.equals(JandexUtil.DOTNAME_OBJECT)) {
-                return null;
-            }
-
-            List<org.jboss.jandex.Type> typeParameters = JandexUtil
-                    .resolveTypeParameters(clazz, repositoryDotName, indexView);
-            if (typeParameters.isEmpty())
-                throw new IllegalStateException(
-                        "Failed to find supertype " + repositoryDotName + " from entity class " + clazz);
-            org.jboss.jandex.Type entityType = typeParameters.get(0);
-            org.jboss.jandex.Type idType = typeParameters.get(1);
-            return new String[] {
-                    entityType.name().toString().replace('.', '/'),
-                    idType.name().toString().replace('.', '/')
-            };
-        }
-
-        @Override
-        public void visitEnd() {
-            for (MethodInfo method : panacheRepositoryBaseClassInfo.methods()) {
-                // Do not generate a method that already exists
-                String descriptor = AsmUtil.getDescriptor(method, name -> typeArguments.get(name));
-                if (!userMethods.contains(method.name() + "/" + descriptor)) {
-                    AnnotationInstance bridge = method.annotation(PanacheEntityEnhancer.DOTNAME_GENERATE_BRIDGE);
-                    if (bridge != null) {
-                        generateModelBridge(method, bridge.value("targetReturnTypeErased"));
-                        if (needsJvmBridge(method)) {
-                            generateJvmBridge(method);
-                        }
-                    }
-                }
-            }
-            super.visitEnd();
-        }
-
-        private boolean needsJvmBridge(MethodInfo method) {
-            if (needsJvmBridge(method.returnType()))
-                return true;
-            for (org.jboss.jandex.Type paramType : method.parameters()) {
-                if (needsJvmBridge(paramType))
-                    return true;
-            }
-            return false;
-        }
-
-        private boolean needsJvmBridge(org.jboss.jandex.Type type) {
-            if (type.kind() == Kind.TYPE_VARIABLE) {
-                String typeParamName = type.asTypeVariable().identifier();
-                return typeArguments.containsKey(typeParamName);
-            }
-            return false;
-        }
-
-        private void generateJvmBridge(MethodInfo method) {
-            // get a bounds-erased descriptor
-            String descriptor = AsmUtil.getDescriptor(method, name -> null);
-            // make sure we need a bridge
-            if (!userMethods.contains(method.name() + "/" + descriptor)) {
-                MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE,
-                        method.name(),
-                        descriptor,
-                        null,
-                        null);
-                List<org.jboss.jandex.Type> parameters = method.parameters();
-                for (int i = 0; i < parameters.size(); i++) {
-                    mv.visitParameter(method.parameterName(i), 0 /* modifiers */);
-                }
-                mv.visitCode();
-                // this
-                mv.visitIntInsn(Opcodes.ALOAD, 0);
-                // each param
-                for (int i = 0; i < parameters.size(); i++) {
-                    org.jboss.jandex.Type paramType = parameters.get(i);
-                    if (paramType.kind() == Kind.PRIMITIVE)
-                        throw new IllegalStateException("BUG: Don't know how to generate JVM bridge method for " + method
-                                + ": has primitive parameters");
-                    mv.visitIntInsn(Opcodes.ALOAD, i + 1);
-                    if (paramType.kind() == Kind.TYPE_VARIABLE) {
-                        String typeParamName = paramType.asTypeVariable().identifier();
-                        switch (typeParamName) {
-                            case "Entity":
-                                mv.visitTypeInsn(Opcodes.CHECKCAST, entityBinaryType);
-                                break;
-                            case "Id":
-                                mv.visitTypeInsn(Opcodes.CHECKCAST, idBinaryType);
-                                break;
-                        }
-                    }
-                }
-
-                String targetDescriptor = AsmUtil.getDescriptor(method, name -> typeArguments.get(name));
-                mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
-                        daoBinaryName,
-                        method.name(),
-                        targetDescriptor, false);
-                String targetReturnTypeDescriptor = targetDescriptor.substring(targetDescriptor.indexOf(')') + 1);
-                mv.visitInsn(AsmUtil.getReturnInstruction(targetReturnTypeDescriptor));
-                mv.visitMaxs(0, 0);
-                mv.visitEnd();
-            }
-
-        }
-
-        private void generateModelBridge(MethodInfo method, AnnotationValue targetReturnTypeErased) {
-            String descriptor = AsmUtil.getDescriptor(method, name -> typeArguments.get(name));
-            // JpaOperations erases the Id type to Object
-            String descriptorForJpaOperations = AsmUtil.getDescriptor(method,
-                    name -> name.equals("Entity") ? entitySignature : null);
-            String signature = AsmUtil.getSignature(method, name -> typeArguments.get(name));
-            List<org.jboss.jandex.Type> parameters = method.parameters();
-
-            String castTo = null;
-            if (targetReturnTypeErased != null && targetReturnTypeErased.asBoolean()) {
-                org.jboss.jandex.Type type = method.returnType();
-                if (type.kind() == Kind.TYPE_VARIABLE &&
-                        type.asTypeVariable().identifier().equals("Entity")) {
-                    castTo = entityBinaryType;
-                }
-                if (castTo == null)
-                    castTo = type.name().toString('/');
-            }
-
-            // Note: we can't use SYNTHETIC here because otherwise Mockito will never mock these methods
-            MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC,
-                    method.name(),
-                    descriptor,
-                    signature,
-                    null);
-            for (int i = 0; i < parameters.size(); i++) {
-                mv.visitParameter(method.parameterName(i), 0 /* modifiers */);
-            }
-            mv.visitCode();
-            injectModel(mv);
-            for (int i = 0; i < parameters.size(); i++) {
-                mv.visitIntInsn(Opcodes.ALOAD, i + 1);
-            }
-            // inject Class
-            String forwardingDescriptor = "(" + getModelDescriptor() + descriptorForJpaOperations.substring(1);
-            if (castTo != null) {
-                // return type is erased to Object
-                int lastParen = forwardingDescriptor.lastIndexOf(')');
-                forwardingDescriptor = forwardingDescriptor.substring(0, lastParen + 1) + "Ljava/lang/Object;";
-            }
-            mv.visitMethodInsn(Opcodes.INVOKESTATIC,
-                    getPanacheOperationsBinaryName(),
-                    method.name(),
-                    forwardingDescriptor, false);
-            if (castTo != null)
-                mv.visitTypeInsn(Opcodes.CHECKCAST, castTo);
-            String returnTypeDescriptor = descriptor.substring(descriptor.lastIndexOf(")") + 1);
-            mv.visitInsn(AsmUtil.getReturnInstruction(returnTypeDescriptor));
-            mv.visitMaxs(0, 0);
-            mv.visitEnd();
-        }
-    }
-
-    public static boolean skipRepository(ClassInfo classInfo) {
+    public boolean skipRepository(ClassInfo classInfo) {
         // we don't want to add methods to abstract/generic entities/repositories: they get added to bottom types
         // which can't be either
         return Modifier.isAbstract(classInfo.flags())
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/TypeBundle.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/TypeBundle.java
new file mode 100644
index 0000000000000..af373b1befae8
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/TypeBundle.java
@@ -0,0 +1,27 @@
+package io.quarkus.panache.common.deployment;
+
+public interface TypeBundle {
+    ByteCodeType entity();
+
+    ByteCodeType entityBase();
+
+    default ByteCodeType entityCompanion() {
+        throw new UnsupportedOperationException("Companions are not supported in Java.");
+    }
+
+    default ByteCodeType entityCompanionBase() {
+        throw new UnsupportedOperationException("Companions are not supported in Java.");
+    }
+
+    ByteCodeType operations();
+
+    ByteCodeType queryType();
+
+    ByteCodeType repository();
+
+    ByteCodeType repositoryBase();
+
+    default ByteCodeType updateType() {
+        throw new UnsupportedOperationException("Update types are only supported in MongoDB contexts");
+    };
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java
new file mode 100644
index 0000000000000..2b198da6f45bc
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java
@@ -0,0 +1,550 @@
+package io.quarkus.panache.common.deployment.visitors;
+
+import static io.quarkus.deployment.util.AsmUtil.getDescriptor;
+import static io.quarkus.deployment.util.AsmUtil.getLoadOpcode;
+import static io.quarkus.deployment.util.AsmUtil.getSignature;
+import static io.quarkus.deployment.util.AsmUtil.unboxIfRequired;
+import static io.quarkus.gizmo.Gizmo.ASM_API_VERSION;
+import static io.quarkus.panache.common.deployment.PanacheConstants.DOTNAME_GENERATE_BRIDGE;
+import static java.lang.String.format;
+import static java.util.stream.Collectors.toList;
+import static org.objectweb.asm.Opcodes.ACC_BRIDGE;
+import static org.objectweb.asm.Opcodes.ARRAYLENGTH;
+import static org.objectweb.asm.Opcodes.ATHROW;
+import static org.objectweb.asm.Opcodes.CHECKCAST;
+import static org.objectweb.asm.Opcodes.DUP;
+import static org.objectweb.asm.Opcodes.GETSTATIC;
+import static org.objectweb.asm.Opcodes.IFNONNULL;
+import static org.objectweb.asm.Opcodes.ILOAD;
+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static org.objectweb.asm.Opcodes.NEW;
+import static org.objectweb.asm.Type.ARRAY;
+import static org.objectweb.asm.Type.getMethodDescriptor;
+import static org.objectweb.asm.Type.getType;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+import java.util.TreeMap;
+import java.util.function.Function;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.ClassType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.TypeVariable;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import io.quarkus.deployment.util.AsmUtil;
+import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+/**
+ * kotlinc compiles default methods in to the implementing classes so we need to elide them first and then we can
+ * generate new methods like we do elsewhere.
+ */
+public class KotlinPanacheClassOperationGenerationVisitor extends ClassVisitor {
+    public static final String NOT_NULL_DESCRIPTOR = "Lorg/jetbrains/annotations/NotNull;";
+    public static final String NULLABLE_DESCRIPTOR = "Lorg/jetbrains/annotations/Nullable;";
+    public static final ByteCodeType OBJECT = new ByteCodeType(Object.class);
+    protected static final ByteCodeType CLASS = new ByteCodeType(Class.class);
+    protected final Function<String, String> argMapper;
+    protected final ClassInfo classInfo;
+    protected final ByteCodeType entityUpperBound;
+    protected final Map<String, ByteCodeType> typeArguments = new HashMap<>();
+    private final ByteCodeType baseType;
+    private final Map<String, MethodInfo> definedMethods = new TreeMap<>();
+
+    private final Map<String, String> erasures = new HashMap<>();
+    private final IndexView indexView;
+    protected List<PanacheMethodCustomizer> methodCustomizers;
+    protected TypeBundle typeBundle;
+    private final List<Label> labels = new ArrayList<>();
+
+    public KotlinPanacheClassOperationGenerationVisitor(ClassVisitor outputClassVisitor, ClassInfo classInfo,
+            IndexView indexView, TypeBundle typeBundle, ByteCodeType baseType,
+            List<PanacheMethodCustomizer> methodCustomizers) {
+        super(ASM_API_VERSION, outputClassVisitor);
+        this.classInfo = classInfo;
+        this.indexView = indexView;
+        this.typeBundle = typeBundle;
+        this.baseType = baseType;
+        this.methodCustomizers = methodCustomizers;
+
+        List<TypeVariable> typeVariables = indexView.getClassByName(baseType.dotName()).typeParameters();
+        entityUpperBound = !typeVariables.isEmpty()
+                ? new ByteCodeType(typeVariables.get(0).bounds().get(0))
+                : OBJECT;
+
+        discoverTypeParameters(classInfo, indexView, typeBundle, baseType);
+
+        argMapper = type -> {
+            ByteCodeType byteCodeType = typeArguments.get(type);
+            return byteCodeType != null
+                    ? byteCodeType.descriptor()
+                    : type;
+        };
+
+        collectMethods(classInfo);
+        filterNonOverrides();
+
+    }
+
+    public static List<ByteCodeType> recursivelyFindEntityTypeArguments(IndexView indexView, DotName clazz,
+            DotName repositoryDotName) {
+        if (clazz.equals(JandexUtil.DOTNAME_OBJECT)) {
+            return Collections.emptyList();
+        }
+
+        return JandexUtil
+                .resolveTypeParameters(clazz, repositoryDotName, indexView).stream()
+                .map(t -> new ByteCodeType(t))
+                .collect(toList());
+    }
+
+    private Label addLabel() {
+        Label label = new Label();
+        labels.add(label);
+        return label;
+    }
+
+    protected void addNullityChecks(MethodVisitor mv, MethodInfo method) {
+        int index = 1;
+        for (Type methodParameter : method.parameters()) {
+            org.objectweb.asm.Type parameter = asmType(methodParameter);
+            if (isNotPrimitiveId(methodParameter)) {
+                mv.visitVarInsn(parameter.getOpcode(ILOAD), index);
+                String value = method.parameterName(index);
+                mv.visitLdcInsn(value != null ? value : ("arg" + (index - 1)));
+                mv.visitMethodInsn(INVOKESTATIC, "kotlin/jvm/internal/Intrinsics", "checkNotNullParameter",
+                        "(Ljava/lang/Object;Ljava/lang/String;)V", false);
+            }
+            index += parameter.getSize();
+        }
+    }
+
+    private void loadArguments(MethodVisitor mv, MethodInfo method) {
+        mv.visitLdcInsn(typeArguments.get("Entity").type());
+        int index = 1;
+        for (Type methodParameter : method.parameters()) {
+            org.objectweb.asm.Type parameter = asmType(methodParameter);
+            mv.visitVarInsn(parameter.getOpcode(ILOAD), index);
+            // long and double take two slots and have size == 2.  others, size == 1
+            if (parameter.getSort() < ARRAY) {
+                org.objectweb.asm.Type wrapper = AsmUtil.autobox(parameter);
+                mv.visitMethodInsn(INVOKESTATIC, wrapper.getInternalName(), "valueOf",
+                        getMethodDescriptor(wrapper, parameter), false);
+            } else if (parameter.getSort() == ARRAY) {
+                mv.visitInsn(DUP);
+                mv.visitInsn(ARRAYLENGTH);
+                mv.visitMethodInsn(INVOKESTATIC, "java/util/Arrays", "copyOf",
+                        "([Ljava/lang/Object;I)[Ljava/lang/Object;", false);
+            }
+            index += parameter.getSize();
+        }
+    }
+
+    private void annotateParamsWithNotNull(MethodVisitor mv, MethodInfo method) {
+        List<Type> parameters = method.parameters();
+        if (parameters.size() != 0) {
+            mv.visitAnnotableParameterCount(parameters.size(), false);
+            for (int i = 0; i < parameters.size(); i++) {
+                if (isNotPrimitiveId(method.parameters().get(i))) {
+                    mv.visitParameterAnnotation(i, NOT_NULL_DESCRIPTOR, false);
+                }
+            }
+        }
+    }
+
+    private boolean isNotPrimitiveId(Type type) {
+        boolean primitive = true;
+        if (type instanceof TypeVariable && ((TypeVariable) type).identifier().equals("Id")) {
+            String identifier = ((TypeVariable) type).identifier();
+            ByteCodeType idType = typeArguments.get(identifier);
+            primitive = idType.descriptor().length() != 1;
+        }
+        return primitive;
+    }
+
+    protected String bridgeMethodDescriptor(MethodInfo method, Function<String, String> mapper) {
+        StringJoiner joiner = new StringJoiner("", "(", ")");
+        descriptors(method, joiner);
+
+        AnnotationInstance annotation = method.annotation(DOTNAME_GENERATE_BRIDGE);
+        boolean erased;
+        if (annotation != null) {
+            AnnotationValue value = annotation.value("targetReturnTypeErased");
+            erased = value != null && value.asBoolean();
+        } else {
+            erased = false;
+        }
+        String returnType;
+        if (erased) {
+            returnType = entityUpperBound.descriptor();
+        } else {
+            returnType = getDescriptor(method.returnType(), mapper);
+        }
+        return joiner.toString() + returnType;
+    }
+
+    private void checkCast(MethodVisitor mv, Type returnType, String operationReturnType) {
+        String cast;
+        if (returnType.kind() == Type.Kind.TYPE_VARIABLE) {
+            ByteCodeType type = typeArguments.getOrDefault(returnType.asTypeVariable().identifier(), entityUpperBound);
+            cast = type.internalName();
+        } else {
+            cast = returnType.name().toString().replace('.', '/');
+        }
+        if (!cast.equals(operationReturnType)) {
+            mv.visitTypeInsn(CHECKCAST, cast);
+        }
+    }
+
+    private void collectMethods(ClassInfo classInfo) {
+        if (classInfo != null && !classInfo.name().equals(baseType.dotName())) {
+            classInfo.methods()
+                    .forEach(method -> {
+                        String descriptor = getDescriptor(method, m -> {
+                            ByteCodeType byteCodeType = typeArguments.get(m);
+                            return byteCodeType != null ? byteCodeType.descriptor() : OBJECT.descriptor();
+                        });
+                        MethodInfo prior = definedMethods.put(method.name() + descriptor, method);
+                        if (prior != null && !isBridgeMethod(method)) {
+                            throw new IllegalStateException(format("Should not run in to duplicate " +
+                                    "mappings: \n\t%s\n\t%s\n\t%s", method, descriptor, prior));
+                        }
+                    });
+            collectMethods(indexView.getClassByName(classInfo.superName()));
+        }
+    }
+
+    private String desc(String name) {
+        String s = name.replace(".", "/");
+        s = s.startsWith("L") || s.startsWith("[") ? s : "L" + s + ";";
+        return s;
+    }
+
+    private void descriptors(MethodInfo method, StringJoiner joiner) {
+        for (Type parameter : method.parameters()) {
+            if (parameter.kind() == Type.Kind.TYPE_VARIABLE
+                    || method.name().endsWith("ById")
+                            && parameter.name().equals(typeArguments.get("Id").dotName())) {
+                joiner.add(OBJECT.descriptor());
+            } else {
+                joiner.add(mapType(parameter));
+            }
+        }
+    }
+
+    protected void discoverTypeParameters(ClassInfo classInfo, IndexView indexView, TypeBundle types, ByteCodeType baseType) {
+        List<ByteCodeType> foundTypeArguments = recursivelyFindEntityTypeArguments(indexView,
+                classInfo.name(), baseType.dotName());
+
+        ByteCodeType entityType = (foundTypeArguments.size() > 0) ? foundTypeArguments.get(0) : OBJECT;
+        ByteCodeType idType = (foundTypeArguments.size() > 1) ? foundTypeArguments.get(1).unbox() : OBJECT;
+
+        typeArguments.put("Entity", entityType);
+        typeArguments.put("Id", idType);
+        typeArguments.keySet().stream()
+                .filter(k -> !k.equals("Id"))
+                .forEach(k -> erasures.put(k, OBJECT.descriptor()));
+        try {
+            erasures.put(typeArguments.get("Entity").dotName().toString(), entityUpperBound.descriptor());
+            erasures.put(types.queryType().dotName().toString(), OBJECT.descriptor());
+            erasures.put(types.updateType().dotName().toString(), OBJECT.descriptor());
+        } catch (UnsupportedOperationException ignored) {
+        }
+    }
+
+    private void emitNullCheck(MethodVisitor mv, String operationDescriptor) {
+        mv.visitInsn(DUP);
+        mv.visitLdcInsn(elideDescriptor(operationDescriptor));
+        mv.visitMethodInsn(INVOKESTATIC, "kotlin/jvm/internal/Intrinsics", "checkNotNullExpressionValue",
+                "(Ljava/lang/Object;Ljava/lang/String;)V", false);
+    }
+
+    private void emitNullCheck(MethodVisitor mv, Type returnType) {
+        Label label = addLabel();
+        mv.visitInsn(DUP);
+        mv.visitJumpInsn(IFNONNULL, label);
+        mv.visitTypeInsn(NEW, "java/lang/NullPointerException");
+        mv.visitInsn(DUP);
+
+        ParameterizedType parameterizedType = ParameterizedType.create(returnType.name(),
+                new Type[] { Type.create(typeArguments.get("Entity").dotName(), Type.Kind.CLASS) }, null);
+        mv.visitLdcInsn("null cannot be cast to non-null type " + (parameterizedType.toString()
+                .replace("java.util.List", "kotlin.collections.List")));
+
+        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/NullPointerException",
+                "<init>", "(Ljava/lang/String;)V", false);
+        mv.visitInsn(ATHROW);
+        mv.visitLabel(label);
+        mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "java/lang/Object" });
+    }
+
+    private String elideDescriptor(String descriptor) {
+        // sample kotlinc text: "KotlinMongoOperations.IN\u2026atabase(Book::class.java)"
+        if (descriptor.length() > 55) {
+            return descriptor.substring(0, 24) + '\u2026' + descriptor.substring(descriptor.length() - 24);
+        }
+        return descriptor;
+    }
+
+    private Label endLabel() {
+        return labels.get(labels.size() - 1);
+    }
+
+    private void filterNonOverrides() {
+        new ArrayList<>(definedMethods.values())
+                .forEach(method -> {
+                    AnnotationInstance generateBridge = method.annotation(DOTNAME_GENERATE_BRIDGE);
+                    if (generateBridge != null) {
+                        definedMethods.remove(method.name() + getDescriptor(method, m -> m));
+                        AnnotationValue typeErased = generateBridge.value("targetReturnTypeErased");
+                        if (typeErased != null && typeErased.asBoolean()) {
+                            definedMethods.remove(method.name()
+                                    + bridgeMethodDescriptor(method, type -> type));
+                        }
+                    }
+                });
+    }
+
+    private void generate(MethodInfo method) {
+        // Note: we can't use SYNTHETIC here because otherwise Mockito will never mock these methods
+        MethodVisitor mv = cv.visitMethod(Opcodes.ACC_PUBLIC, method.name(),
+                getDescriptor(method, argMapper), getSignature(method, argMapper), null);
+
+        AsmUtil.copyParameterNames(mv, method);
+        for (PanacheMethodCustomizer customizer : methodCustomizers) {
+            org.objectweb.asm.Type thisClass = getType("L" + classInfo.name().toString().replace('.', '/') + ";");
+            customizer.customize(thisClass, method, mv);
+        }
+
+        annotateParamsWithNotNull(mv, method);
+        mv.visitCode();
+        addNullityChecks(mv, method);
+        loadOperationsReference(mv);
+        loadArguments(mv, method);
+        invokeOperation(mv, method);
+        emitLocalVariablesTable(mv, method);
+
+        mv.visitMaxs(0, 0);
+    }
+
+    private void emitLocalVariablesTable(MethodVisitor mv, MethodInfo method) {
+        mv.visitLabel(addLabel());
+        mv.visitLocalVariable("this", desc(classInfo.name().toString()), null, startLabel(), endLabel(), 0);
+        for (int i = 0; i < method.parameters().size(); i++) {
+            Type type = method.parameters().get(i);
+            String typeName = type instanceof TypeVariable
+                    ? this.typeArguments.get(((TypeVariable) type).identifier()).descriptor()
+                    : desc(type.name().toString());
+            String parameterName = method.parameterName(i);
+            mv.visitLocalVariable(parameterName != null ? parameterName : ("arg" + 1), typeName, null, startLabel(),
+                    endLabel(), i + 1);
+        }
+    }
+
+    private void generateBridge(MethodInfo method) {
+        // get a bounds-erased descriptor
+        String descriptor = bridgeMethodDescriptor(method, type -> {
+            ByteCodeType mapped = typeArguments.get(type);
+            return mapped != null ? mapped.descriptor() : type;
+        });
+        // make sure we need a bridge
+        MethodVisitor mv = cv.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE,
+                method.name(),
+                descriptor,
+                null,
+                null);
+        List<Type> parameters = method.parameters();
+        AsmUtil.copyParameterNames(mv, method);
+        mv.visitCode();
+        // this
+        mv.visitIntInsn(Opcodes.ALOAD, 0);
+        // each param
+        for (int i = 0; i < parameters.size(); i++) {
+            Type paramType = parameters.get(i);
+            if (paramType.kind() == Type.Kind.PRIMITIVE)
+                throw new IllegalStateException("BUG: Don't know how to generate JVM bridge method for " + method
+                        + ": has primitive parameters");
+            mv.visitIntInsn(getLoadOpcode(paramType), i + 1);
+            if (paramType.kind() == Type.Kind.TYPE_VARIABLE) {
+                String typeParamName = paramType.asTypeVariable().identifier();
+                org.objectweb.asm.Type type = getType(typeArguments.get(typeParamName).descriptor());
+                if (type.getSort() > org.objectweb.asm.Type.DOUBLE) {
+                    mv.visitTypeInsn(Opcodes.CHECKCAST, type.getInternalName());
+                } else {
+                    unboxIfRequired(mv, type);
+                }
+            }
+        }
+
+        String targetDescriptor = getDescriptor(method, name -> typeArguments.get(name).descriptor());
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+                classInfo.name().toString().replace('.', '/'),
+                method.name(),
+                targetDescriptor, false);
+        String targetReturnTypeDescriptor = targetDescriptor.substring(targetDescriptor.indexOf(')') + 1);
+        mv.visitInsn(AsmUtil.getReturnInstruction(targetReturnTypeDescriptor));
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+
+    }
+
+    private void invokeOperation(MethodVisitor mv, MethodInfo method) {
+        String operationDescriptor;
+
+        StringJoiner joiner = new StringJoiner("", "(", ")");
+        joiner.add(CLASS.descriptor());
+        descriptors(method, joiner);
+
+        Type returnType = method.returnType();
+        String descriptor = getDescriptor(returnType, argMapper);
+        String key = returnType.kind() == Type.Kind.TYPE_VARIABLE
+                ? returnType.asTypeVariable().identifier()
+                : returnType.name().toString();
+        String operationReturnType = erasures.getOrDefault(key, descriptor);
+        operationDescriptor = joiner + operationReturnType;
+
+        mv.visitMethodInsn(INVOKEVIRTUAL, typeBundle.operations().internalName(), method.name(),
+                operationDescriptor, false);
+        if (returnType.kind() != Type.Kind.PRIMITIVE) {
+            String retType = operationReturnType.substring(1, operationReturnType.length() - 1);
+            String annotationDesc = NOT_NULL_DESCRIPTOR;
+            if ("findById".equals(method.name())) {
+                annotationDesc = NULLABLE_DESCRIPTOR;
+            } else {
+                nullCheckReturn(mv, returnType,
+                        typeBundle.operations().dotName().withoutPackagePrefix() + ".INSTANCE."
+                                + method.name() + joiner);
+            }
+            checkCast(mv, returnType, retType);
+            mv.visitAnnotation(annotationDesc, false);
+        }
+        mv.visitInsn(AsmUtil.getReturnInstruction(returnType));
+    }
+
+    private boolean isBridgeMethod(MethodInfo method) {
+        return (method.flags() & ACC_BRIDGE) != ACC_BRIDGE;
+    }
+
+    private org.objectweb.asm.Type asmType(Type methodParameter) {
+        org.objectweb.asm.Type parameter;
+        if (methodParameter.kind() == Type.Kind.TYPE_VARIABLE) {
+            parameter = typeArguments.get(methodParameter.asTypeVariable().identifier()).type();
+        } else {
+            parameter = getType(getDescriptor(methodParameter, s -> null));
+        }
+        return parameter;
+    }
+
+    protected void loadOperationsReference(MethodVisitor mv) {
+        mv.visitLabel(addLabel());
+        mv.visitFieldInsn(GETSTATIC, typeBundle.operations().internalName(), "INSTANCE",
+                typeBundle.operations().descriptor());
+    }
+
+    private String mapType(Type parameter) {
+        switch (parameter.kind()) {
+            case PRIMITIVE:
+            case TYPE_VARIABLE:
+                return OBJECT.descriptor();
+            default:
+                String value = getDescriptor(parameter, argMapper);
+                return erasures.getOrDefault(value, value);
+        }
+    }
+
+    private boolean needsJvmBridge(MethodInfo method) {
+        if (needsJvmBridge(method.returnType()))
+            return true;
+        for (Type paramType : method.parameters()) {
+            if (needsJvmBridge(paramType))
+                return true;
+        }
+        return false;
+    }
+
+    private boolean needsJvmBridge(Type type) {
+        if (type.kind() == Type.Kind.TYPE_VARIABLE) {
+            String typeParamName = type.asTypeVariable().identifier();
+            return typeArguments.containsKey(typeParamName);
+        }
+        return false;
+    }
+
+    private void nullCheckReturn(MethodVisitor mv, Type returnType, String operationDescriptor) {
+        if (returnType instanceof ParameterizedType) {
+            emitNullCheck(mv, returnType);
+        } else if (returnType instanceof ClassType) {
+            emitNullCheck(mv, operationDescriptor);
+        }
+    }
+
+    private Label startLabel() {
+        return labels.get(0);
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", getClass().getSimpleName() + "[", "]")
+                .add(classInfo.name().toString())
+                .toString();
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature,
+            String[] exceptions) {
+
+        MethodInfo methodInfo = definedMethods.entrySet().stream()
+                .filter(e -> e.getKey().equals(name + descriptor))
+                .map(e -> e.getValue())
+                .findFirst()
+                .orElse(null);
+        if (methodInfo != null && !methodInfo.hasAnnotation(DOTNAME_GENERATE_BRIDGE)) {
+            return super.visitMethod(access, name, descriptor, signature, exceptions);
+        }
+        return null;
+    }
+
+    @Override
+    public void visitEnd() {
+        for (MethodInfo method : indexView.getClassByName(baseType.dotName()).methods()) {
+            String descriptor = getDescriptor(method, type -> typeArguments.getOrDefault(type, OBJECT).descriptor());
+            if (!definedMethods.containsKey(method.name() + descriptor)) {
+                AnnotationInstance bridge = method.annotation(DOTNAME_GENERATE_BRIDGE);
+                if (bridge != null) {
+
+                    generate(method);
+                    if (needsJvmBridge(method)) {
+                        String bridgeDescriptor = bridgeMethodDescriptor(method, type -> {
+                            ByteCodeType mapped = typeArguments.get(type);
+                            return mapped != null ? mapped.descriptor() : type;
+                        });
+                        if (!definedMethods.containsKey(method.name() + bridgeDescriptor)) {
+                            generateBridge(method);
+                        }
+                    }
+                }
+            }
+        }
+
+        super.visitEnd();
+    }
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheEntityClassAccessorGenerationVisitor.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheEntityClassAccessorGenerationVisitor.java
new file mode 100644
index 0000000000000..dc371c8ca8369
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheEntityClassAccessorGenerationVisitor.java
@@ -0,0 +1,212 @@
+package io.quarkus.panache.common.deployment.visitors;
+
+import static io.quarkus.panache.common.deployment.PanacheConstants.JAXB_ANNOTATION_PREFIX;
+import static io.quarkus.panache.common.deployment.PanacheConstants.JAXB_TRANSIENT_SIGNATURE;
+import static io.quarkus.panache.common.deployment.PanacheConstants.JSON_IGNORE_DOT_NAME;
+import static io.quarkus.panache.common.deployment.PanacheConstants.JSON_PROPERTY_DOT_NAME;
+import static io.quarkus.panache.common.deployment.PanacheConstants.JSON_PROPERTY_SIGNATURE;
+
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.FieldInfo;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import io.quarkus.deployment.util.AsmUtil;
+import io.quarkus.gizmo.Gizmo;
+import io.quarkus.panache.common.deployment.EntityField;
+import io.quarkus.panache.common.deployment.EntityField.EntityFieldAnnotation;
+import io.quarkus.panache.common.deployment.EntityModel;
+import io.quarkus.panache.common.deployment.PanacheMovingAnnotationVisitor;
+
+/**
+ * A visitor that replaces public fields in an entity with a protected field + accessors,
+ * so that the accessors can be called in {@link io.quarkus.panache.common.deployment.PanacheEntityEnhancer}.
+ */
+public abstract class PanacheEntityClassAccessorGenerationVisitor extends ClassVisitor {
+
+    protected final Type thisClass;
+    private final Map<String, ? extends EntityField> fields;
+    private final Set<String> userMethods = new HashSet<>();
+    private final ClassInfo entityInfo;
+
+    public PanacheEntityClassAccessorGenerationVisitor(ClassVisitor outputClassVisitor,
+            ClassInfo entityInfo, EntityModel entityModel) {
+        super(Gizmo.ASM_API_VERSION, outputClassVisitor);
+
+        String className = entityInfo.name().toString();
+        thisClass = Type.getType("L" + className.replace('.', '/') + ";");
+        fields = entityModel != null ? entityModel.fields : null;
+        this.entityInfo = entityInfo;
+    }
+
+    @Override
+    public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+        EntityField entityField = fields == null ? null : fields.get(name);
+        if (entityField == null) {
+            return super.visitField(access, name, descriptor, signature, value);
+        }
+
+        //we make the fields protected
+        //so any errors are visible immediately, rather than data just being lost
+
+        FieldVisitor superVisitor;
+        if (entityField == null || name.equals("id")) {
+            superVisitor = super.visitField(access, name, descriptor, signature, value);
+        } else {
+            superVisitor = super.visitField((access | Modifier.PROTECTED) & ~(Modifier.PRIVATE | Modifier.PUBLIC),
+                    name, descriptor, signature, value);
+        }
+        entityField.signature = signature;
+        // if we have a mapped field, let's add some annotations
+        return new FieldVisitor(Gizmo.ASM_API_VERSION, superVisitor) {
+            @Override
+            public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
+                if (!descriptor.startsWith(JAXB_ANNOTATION_PREFIX)) {
+                    return super.visitAnnotation(descriptor, visible);
+                } else {
+                    // Save off JAX-B annotations on the field so they can be applied to the generated getter later
+                    EntityFieldAnnotation efAnno = new EntityFieldAnnotation(descriptor);
+                    entityField.annotations.add(efAnno);
+                    return new PanacheMovingAnnotationVisitor(efAnno);
+                }
+            }
+
+            @Override
+            public void visitEnd() {
+                // Add the @JaxbTransient property to the field so that JAXB prefers the generated getter (otherwise JAXB complains about
+                // having a field and property both with the same name)
+                // JSONB will already use the getter so we're good
+                // Note: we don't need to check if we already have @XmlTransient in the descriptors because if we did, we moved it to the getter
+                // so we can't have any duplicate
+                super.visitAnnotation(JAXB_TRANSIENT_SIGNATURE, true);
+                super.visitEnd();
+            }
+        };
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String methodName, String descriptor, String signature,
+            String[] exceptions) {
+        userMethods.add(methodName + "/" + descriptor);
+        return super.visitMethod(access, methodName, descriptor, signature, exceptions);
+    }
+
+    @Override
+    public void visitEnd() {
+        // FIXME: generate default constructor
+
+        generateAccessors();
+
+        super.visitEnd();
+    }
+
+    protected void generateAccessors() {
+        if (fields == null)
+            return;
+        for (EntityField field : fields.values()) {
+            // Getter
+            String getterName = field.getGetterName();
+            String getterDescriptor = "()" + field.descriptor;
+            if (!userMethods.contains(getterName + "/" + getterDescriptor)) {
+                MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC,
+                        getterName, getterDescriptor, field.signature == null ? null : "()" + field.signature, null);
+                mv.visitCode();
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                generateAccessorGetField(mv, field);
+                int returnCode = AsmUtil.getReturnInstruction(field.descriptor);
+                mv.visitInsn(returnCode);
+                mv.visitMaxs(0, 0);
+                // Apply JAX-B annotations that are being transferred from the field
+                for (EntityFieldAnnotation anno : field.annotations) {
+                    anno.writeToVisitor(mv);
+                }
+                // Add an explicit Jackson annotation so that the entire property is not ignored due to having @XmlTransient
+                // on the field
+                if (shouldAddJsonProperty(field)) {
+                    AnnotationVisitor visitor = mv.visitAnnotation(JSON_PROPERTY_SIGNATURE, true);
+                    FieldInfo fieldInfo = entityInfo.field(field.name);
+                    if (fieldInfo != null) {
+                        AnnotationInstance jsonPropertyInstance = fieldInfo.annotation(JSON_PROPERTY_DOT_NAME);
+                        // propagate the value of @JsonProperty field annotation to the newly added method annotation
+                        if (jsonPropertyInstance != null) {
+                            AnnotationValue jsonPropertyValue = jsonPropertyInstance.value();
+                            if ((jsonPropertyValue != null) && !jsonPropertyValue.asString().isEmpty()) {
+                                visitor.visit("value", jsonPropertyValue.asString());
+                            }
+                        }
+                    }
+                    visitor.visitEnd();
+                }
+                mv.visitEnd();
+            }
+
+            // Setter
+            String setterName = field.getSetterName();
+            String setterDescriptor = "(" + field.descriptor + ")V";
+            if (!userMethods.contains(setterName + "/" + setterDescriptor)) {
+                MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC,
+                        setterName, setterDescriptor, field.signature == null ? null : "(" + field.signature + ")V", null);
+                mv.visitCode();
+                mv.visitIntInsn(Opcodes.ALOAD, 0);
+                int loadCode;
+                switch (field.descriptor) {
+                    case "Z":
+                    case "B":
+                    case "C":
+                    case "S":
+                    case "I":
+                        loadCode = Opcodes.ILOAD;
+                        break;
+                    case "J":
+                        loadCode = Opcodes.LLOAD;
+                        break;
+                    case "F":
+                        loadCode = Opcodes.FLOAD;
+                        break;
+                    case "D":
+                        loadCode = Opcodes.DLOAD;
+                        break;
+                    default:
+                        loadCode = Opcodes.ALOAD;
+                        break;
+                }
+                mv.visitIntInsn(loadCode, 1);
+                generateAccessorSetField(mv, field);
+                mv.visitInsn(Opcodes.RETURN);
+                mv.visitMaxs(0, 0);
+                mv.visitEnd();
+            }
+        }
+    }
+
+    private boolean shouldAddJsonProperty(EntityField entityField) {
+        if (isAnnotatedWithJsonIgnore(entityField)) {
+            return false;
+        }
+        return !entityField.hasAnnotation(JSON_PROPERTY_SIGNATURE);
+    }
+
+    private boolean isAnnotatedWithJsonIgnore(EntityField entityField) {
+        FieldInfo field = entityInfo.field(entityField.name);
+        if (field != null) {
+            return field.hasAnnotation(JSON_IGNORE_DOT_NAME);
+        }
+
+        return false;
+    }
+
+    protected abstract void generateAccessorSetField(MethodVisitor mv, EntityField field);
+
+    protected abstract void generateAccessorGetField(MethodVisitor mv, EntityField field);
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheEntityClassOperationGenerationVisitor.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheEntityClassOperationGenerationVisitor.java
new file mode 100644
index 0000000000000..411908511f476
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheEntityClassOperationGenerationVisitor.java
@@ -0,0 +1,245 @@
+package io.quarkus.panache.common.deployment.visitors;
+
+import static io.quarkus.deployment.util.AsmUtil.getDescriptor;
+import static io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor.OBJECT;
+import static io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor.recursivelyFindEntityTypeArguments;
+import static io.quarkus.panache.common.deployment.visitors.PanacheRepositoryClassOperationGenerationVisitor.CLASS;
+import static org.objectweb.asm.Opcodes.CHECKCAST;
+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.function.Function;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.TypeVariable;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import io.quarkus.deployment.util.AsmUtil;
+import io.quarkus.gizmo.Gizmo;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.PanacheConstants;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizerVisitor;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+/**
+ * A visitor that adds Panache operations to a Panache entity type.
+ */
+public class PanacheEntityClassOperationGenerationVisitor extends ClassVisitor {
+
+    protected Type thisClass;
+    private final Set<String> userMethods = new HashSet<>();
+    protected TypeBundle typeBundle;
+    protected final ClassInfo panacheEntityBaseClassInfo;
+    protected ClassInfo entityInfo;
+    protected List<PanacheMethodCustomizer> methodCustomizers;
+    protected final Map<String, ByteCodeType> typeArguments = new HashMap<>();
+    protected final Function<String, String> argMapper;
+    protected final ByteCodeType entityUpperBound;
+    private final Map<String, String> erasures = new HashMap<>();
+
+    public PanacheEntityClassOperationGenerationVisitor(ClassVisitor outputClassVisitor,
+            TypeBundle typeBundle,
+            ClassInfo entityInfo,
+            List<PanacheMethodCustomizer> methodCustomizers, IndexView indexView) {
+        super(Gizmo.ASM_API_VERSION, outputClassVisitor);
+
+        String className = entityInfo.name().toString();
+        thisClass = Type.getType("L" + className.replace('.', '/') + ";");
+        this.typeBundle = typeBundle;
+        this.panacheEntityBaseClassInfo = indexView.getClassByName(typeBundle.entityBase().dotName());
+        this.entityInfo = entityInfo;
+        this.methodCustomizers = methodCustomizers;
+
+        ByteCodeType baseType = typeBundle.entityBase();
+        List<TypeVariable> typeVariables = indexView.getClassByName(baseType.dotName()).typeParameters();
+        if (!typeVariables.isEmpty()) {
+            entityUpperBound = new ByteCodeType(typeVariables.get(0).bounds().get(0));
+        } else {
+            entityUpperBound = null;
+        }
+
+        discoverTypeParameters(entityInfo, indexView, typeBundle, baseType);
+        argMapper = type -> {
+            ByteCodeType byteCodeType = typeArguments.get(type);
+            return byteCodeType != null
+                    ? byteCodeType.descriptor()
+                    : OBJECT.descriptor();
+        };
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String methodName, String descriptor, String signature,
+            String[] exceptions) {
+        userMethods.add(methodName + "/" + descriptor);
+        MethodVisitor superVisitor = super.visitMethod(access, methodName, descriptor, signature, exceptions);
+        if (Modifier.isStatic(access)
+                && Modifier.isPublic(access)
+                && (access & Opcodes.ACC_SYNTHETIC) == 0
+                && !methodCustomizers.isEmpty()) {
+            org.jboss.jandex.Type[] argTypes = AsmUtil.getParameterTypes(descriptor);
+            MethodInfo method = this.entityInfo.method(methodName, argTypes);
+            if (method == null) {
+                throw new IllegalStateException(
+                        "Could not find indexed method: " + thisClass + "." + methodName + " with descriptor " + descriptor
+                                + " and arg types " + Arrays.toString(argTypes));
+            }
+            superVisitor = new PanacheMethodCustomizerVisitor(superVisitor, method, thisClass, methodCustomizers);
+        }
+        return superVisitor;
+    }
+
+    @Override
+    public void visitEnd() {
+        // FIXME: generate default constructor
+
+        for (MethodInfo method : panacheEntityBaseClassInfo.methods()) {
+            // Do not generate a method that already exists
+            String descriptor = AsmUtil.getDescriptor(method, name -> null);
+            if (!userMethods.contains(method.name() + "/" + descriptor)) {
+                AnnotationInstance bridge = method.annotation(PanacheConstants.DOTNAME_GENERATE_BRIDGE);
+                if (bridge != null) {
+                    generateMethod(method, bridge.value("targetReturnTypeErased"));
+                }
+            }
+        }
+
+        super.visitEnd();
+    }
+
+    protected void discoverTypeParameters(ClassInfo classInfo, IndexView indexView, TypeBundle types, ByteCodeType baseType) {
+        List<ByteCodeType> foundTypeArguments = recursivelyFindEntityTypeArguments(indexView,
+                classInfo.name(), baseType.dotName());
+
+        ByteCodeType entityType = (foundTypeArguments.size() > 0) ? foundTypeArguments.get(0) : OBJECT;
+        ByteCodeType idType = (foundTypeArguments.size() > 1) ? foundTypeArguments.get(1) : OBJECT;
+
+        typeArguments.put("Entity", entityType);
+        typeArguments.put("Id", idType);
+        typeArguments.keySet().stream()
+                .filter(k -> !k.equals("Id"))
+                .forEach(k -> erasures.put(k, OBJECT.descriptor()));
+        try {
+            ByteCodeType entity = typeArguments.get("Entity");
+            if (entity != null) {
+                erasures.put(entity.dotName().toString(), entity.descriptor());
+            }
+            erasures.put(types.queryType().dotName().toString(), OBJECT.descriptor());
+            erasures.put(types.updateType().dotName().toString(), OBJECT.descriptor());
+        } catch (UnsupportedOperationException ignored) {
+        }
+    }
+
+    protected void generateMethod(MethodInfo method, AnnotationValue targetReturnTypeErased) {
+        List<org.jboss.jandex.Type> parameters = method.parameters();
+
+        MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC,
+                method.name(),
+                AsmUtil.getDescriptor(method, name -> null),
+                AsmUtil.getSignature(method, name1 -> null),
+                null);
+        AsmUtil.copyParameterNames(mv, method);
+        mv.visitCode();
+        for (PanacheMethodCustomizer customizer : methodCustomizers) {
+            customizer.customize(thisClass, method, mv);
+        }
+        loadOperations(mv);
+        loadArguments(mv, parameters);
+        invokeOperations(mv, method);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+    }
+
+    private void loadOperations(MethodVisitor mv) {
+        mv.visitFieldInsn(Opcodes.GETSTATIC, typeBundle.operations().internalName(), "INSTANCE",
+                typeBundle.operations().descriptor());
+    }
+
+    private void loadArguments(MethodVisitor mv, List<org.jboss.jandex.Type> parameters) {
+        // inject Class
+        injectModel(mv);
+        for (int i = 0; i < parameters.size(); i++) {
+            mv.visitIntInsn(Opcodes.ALOAD, i);
+        }
+    }
+
+    private void invokeOperations(MethodVisitor mv, MethodInfo method) {
+        String operationDescriptor;
+
+        StringJoiner joiner = new StringJoiner("", "(", ")");
+        joiner.add(CLASS.descriptor());
+        descriptors(method, joiner);
+
+        org.jboss.jandex.Type returnType = method.returnType();
+        String descriptor = getDescriptor(returnType, argMapper);
+        String key = returnType.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE
+                ? returnType.asTypeVariable().identifier()
+                : returnType.name().toString();
+        operationDescriptor = joiner + erasures.getOrDefault(key, descriptor);
+
+        mv.visitMethodInsn(INVOKEVIRTUAL, typeBundle.operations().internalName(), method.name(),
+                operationDescriptor, false);
+        if (returnType.kind() != org.jboss.jandex.Type.Kind.PRIMITIVE) {
+            String cast;
+            if (returnType.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE) {
+                TypeVariable typeVariable = returnType.asTypeVariable();
+                ByteCodeType type = typeArguments.get(typeVariable.identifier());
+                if (type == null && typeVariable.bounds().size() != 1) {
+                    type = OBJECT;
+                } else {
+                    type = new ByteCodeType(typeVariable.bounds().get(0));
+                }
+                cast = type.internalName();
+            } else {
+                cast = returnType.name().toString().replace('.', '/');
+            }
+            mv.visitTypeInsn(CHECKCAST, cast);
+        }
+        mv.visitInsn(AsmUtil.getReturnInstruction(returnType));
+    }
+
+    private void descriptors(MethodInfo method, StringJoiner joiner) {
+        for (org.jboss.jandex.Type parameter : method.parameters()) {
+            if (parameter.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE
+                    || method.name().endsWith("ById")
+                            && parameter.name().equals(typeArguments.get("Id").dotName())) {
+                joiner.add(OBJECT.descriptor());
+            } else {
+                joiner.add(mapType(parameter));
+            }
+        }
+    }
+
+    private String mapType(org.jboss.jandex.Type parameter) {
+        String descriptor;
+        switch (parameter.kind()) {
+            case PRIMITIVE:
+            case TYPE_VARIABLE:
+                descriptor = OBJECT.descriptor();
+                break;
+            default:
+                String value = getDescriptor(parameter, argMapper);
+                descriptor = erasures.getOrDefault(value, value);
+        }
+        return descriptor;
+    }
+
+    protected void injectModel(MethodVisitor mv) {
+        mv.visitLdcInsn(thisClass);
+    }
+
+}
diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheRepositoryClassOperationGenerationVisitor.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheRepositoryClassOperationGenerationVisitor.java
new file mode 100644
index 0000000000000..6403fc039982c
--- /dev/null
+++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheRepositoryClassOperationGenerationVisitor.java
@@ -0,0 +1,289 @@
+package io.quarkus.panache.common.deployment.visitors;
+
+import static io.quarkus.deployment.util.AsmUtil.getDescriptor;
+import static io.quarkus.deployment.util.AsmUtil.unboxIfRequired;
+import static io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor.OBJECT;
+import static io.quarkus.panache.common.deployment.visitors.KotlinPanacheClassOperationGenerationVisitor.recursivelyFindEntityTypeArguments;
+import static org.objectweb.asm.Opcodes.CHECKCAST;
+import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.function.Function;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.TypeVariable;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import io.quarkus.deployment.util.AsmUtil;
+import io.quarkus.gizmo.Gizmo;
+import io.quarkus.panache.common.deployment.ByteCodeType;
+import io.quarkus.panache.common.deployment.PanacheConstants;
+import io.quarkus.panache.common.deployment.TypeBundle;
+
+public class PanacheRepositoryClassOperationGenerationVisitor extends ClassVisitor {
+    public static final ByteCodeType CLASS = new ByteCodeType(Class.class);
+
+    protected Type entityType;
+    protected String entitySignature;
+    protected String daoBinaryName;
+    protected ClassInfo daoClassInfo;
+    protected ClassInfo panacheRepositoryBaseClassInfo;
+    protected IndexView indexView;
+    protected Map<String, ByteCodeType> typeArguments = new HashMap<>();
+    // set of name + "/" + descriptor
+    protected Set<String> userMethods = new HashSet<>();
+    private final TypeBundle typeBundle;
+    protected Function<String, String> argMapper;
+    protected ByteCodeType entityUpperBound;
+    private final Map<String, String> erasures = new HashMap<>();
+
+    public PanacheRepositoryClassOperationGenerationVisitor(String className, ClassVisitor outputClassVisitor,
+            IndexView indexView,
+            TypeBundle typeBundle) {
+        super(Gizmo.ASM_API_VERSION, outputClassVisitor);
+        this.typeBundle = typeBundle;
+        daoClassInfo = indexView.getClassByName(DotName.createSimple(className));
+        daoBinaryName = className.replace('.', '/');
+        this.indexView = indexView;
+    }
+
+    protected void injectModel(MethodVisitor mv) {
+        // inject Class
+        mv.visitLdcInsn(entityType);
+    }
+
+    @Override
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        super.visit(version, access, name, signature, superName, interfaces);
+
+        DotName baseType = typeBundle.repositoryBase().dotName();
+
+        List<TypeVariable> typeVariables = indexView.getClassByName(baseType).typeParameters();
+        entityUpperBound = !typeVariables.isEmpty()
+                ? new ByteCodeType(typeVariables.get(0).bounds().get(0))
+                : OBJECT;
+
+        discoverTypeParameters(daoClassInfo, indexView, typeBundle, typeBundle.repositoryBase());
+
+        this.entityType = typeArguments.getOrDefault("Entity", OBJECT).type();
+
+        this.panacheRepositoryBaseClassInfo = indexView.getClassByName(baseType);
+
+        argMapper = type -> {
+            ByteCodeType byteCodeType = typeArguments.get(type);
+            return byteCodeType != null
+                    ? byteCodeType.descriptor()
+                    : type;
+        };
+
+    }
+
+    protected void discoverTypeParameters(ClassInfo classInfo, IndexView indexView, TypeBundle types, ByteCodeType baseType) {
+        List<ByteCodeType> foundTypeArguments = recursivelyFindEntityTypeArguments(indexView,
+                classInfo.name(), baseType.dotName());
+
+        ByteCodeType entityType = (foundTypeArguments.size() > 0) ? foundTypeArguments.get(0) : OBJECT;
+        ByteCodeType idType = (foundTypeArguments.size() > 1) ? foundTypeArguments.get(1) : OBJECT;
+
+        typeArguments.put("Entity", entityType);
+        typeArguments.put("Id", idType);
+        typeArguments.keySet().stream()
+                .filter(k -> !k.equals("Id"))
+                .forEach(k -> erasures.put(k, OBJECT.descriptor()));
+        try {
+            ByteCodeType entity = typeArguments.get("Entity");
+            erasures.put(entity.dotName().toString(), entityUpperBound.descriptor());
+            erasures.put(types.queryType().dotName().toString(), OBJECT.descriptor());
+            erasures.put(types.updateType().dotName().toString(), OBJECT.descriptor());
+        } catch (UnsupportedOperationException ignored) {
+        }
+    }
+
+    @Override
+    public MethodVisitor visitMethod(int access, String methodName, String descriptor, String signature,
+            String[] exceptions) {
+        userMethods.add(methodName + "/" + descriptor);
+        return super.visitMethod(access, methodName, descriptor, signature, exceptions);
+    }
+
+    @Override
+    public void visitEnd() {
+        for (MethodInfo method : panacheRepositoryBaseClassInfo.methods()) {
+            // Do not generate a method that already exists
+            String descriptor = getDescriptor(method, type -> typeArguments.getOrDefault(type, OBJECT).descriptor());
+            if (!userMethods.contains(method.name() + "/" + descriptor)) {
+                AnnotationInstance bridge = method.annotation(PanacheConstants.DOTNAME_GENERATE_BRIDGE);
+                if (bridge != null) {
+                    generateModelBridge(method);
+                    if (needsJvmBridge(method)) {
+                        generateJvmBridge(method);
+                    }
+                }
+            }
+        }
+        super.visitEnd();
+    }
+
+    private boolean needsJvmBridge(MethodInfo method) {
+        if (needsJvmBridge(method.returnType()))
+            return true;
+        for (org.jboss.jandex.Type paramType : method.parameters()) {
+            if (needsJvmBridge(paramType))
+                return true;
+        }
+        return false;
+    }
+
+    private boolean needsJvmBridge(org.jboss.jandex.Type type) {
+        if (type.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE) {
+            String typeParamName = type.asTypeVariable().identifier();
+            return typeArguments.containsKey(typeParamName);
+        }
+        return false;
+    }
+
+    protected void generateJvmBridge(MethodInfo method) {
+        // get a bounds-erased descriptor
+        String descriptor = AsmUtil.getDescriptor(method, name -> null);
+        // make sure we need a bridge
+        if (!userMethods.contains(method.name() + "/" + descriptor)) {
+            MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE,
+                    method.name(),
+                    descriptor,
+                    null,
+                    null);
+            List<org.jboss.jandex.Type> parameters = method.parameters();
+            AsmUtil.copyParameterNames(mv, method);
+            mv.visitCode();
+            // this
+            mv.visitIntInsn(Opcodes.ALOAD, 0);
+            // each param
+            for (int i = 0; i < parameters.size(); i++) {
+                org.jboss.jandex.Type paramType = parameters.get(i);
+                if (paramType.kind() == org.jboss.jandex.Type.Kind.PRIMITIVE)
+                    throw new IllegalStateException("BUG: Don't know how to generate JVM bridge method for " + method
+                            + ": has primitive parameters");
+                mv.visitIntInsn(Opcodes.ALOAD, i + 1);
+                if (paramType.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE) {
+                    String typeParamName = paramType.asTypeVariable().identifier();
+                    Type type = typeArguments.get(typeParamName).type();
+                    if (type.getSort() > Type.DOUBLE) {
+                        mv.visitTypeInsn(Opcodes.CHECKCAST, type.getInternalName());
+                    } else {
+                        unboxIfRequired(mv, type);
+                    }
+                }
+            }
+
+            String targetDescriptor = AsmUtil.getDescriptor(method, argMapper);
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+                    daoBinaryName,
+                    method.name(),
+                    targetDescriptor, false);
+            String targetReturnTypeDescriptor = targetDescriptor.substring(targetDescriptor.indexOf(')') + 1);
+            mv.visitInsn(AsmUtil.getReturnInstruction(targetReturnTypeDescriptor));
+            mv.visitMaxs(0, 0);
+            mv.visitEnd();
+        }
+
+    }
+
+    protected void generateModelBridge(MethodInfo method) {
+        // JpaOperations erases the Id type to Object
+        List<org.jboss.jandex.Type> parameters = method.parameters();
+
+        // Note: we can't use SYNTHETIC here because otherwise Mockito will never mock these methods
+        MethodVisitor mv = super.visitMethod(Opcodes.ACC_PUBLIC,
+                method.name(),
+                AsmUtil.getDescriptor(method, argMapper),
+                AsmUtil.getSignature(method, argMapper),
+                null);
+        AsmUtil.copyParameterNames(mv, method);
+        mv.visitCode();
+        loadOperations(mv);
+        loadArguments(parameters, mv);
+        invokeOperations(mv, method);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+    }
+
+    private void invokeOperations(MethodVisitor mv, MethodInfo method) {
+        String operationDescriptor;
+
+        StringJoiner joiner = new StringJoiner("", "(", ")");
+        joiner.add(CLASS.descriptor());
+        descriptors(method, joiner);
+
+        org.jboss.jandex.Type returnType = method.returnType();
+        String descriptor = getDescriptor(returnType, argMapper);
+        String key = returnType.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE
+                ? returnType.asTypeVariable().identifier()
+                : returnType.name().toString();
+        operationDescriptor = joiner + erasures.getOrDefault(key, descriptor);
+
+        mv.visitMethodInsn(INVOKEVIRTUAL, typeBundle.operations().internalName(), method.name(),
+                operationDescriptor, false);
+        if (returnType.kind() != org.jboss.jandex.Type.Kind.PRIMITIVE) {
+            String cast;
+            if (returnType.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE) {
+                ByteCodeType type = typeArguments.getOrDefault(returnType.asTypeVariable().identifier(), entityUpperBound);
+                cast = type.internalName();
+            } else {
+                cast = returnType.name().toString().replace('.', '/');
+            }
+            mv.visitTypeInsn(CHECKCAST, cast);
+        }
+        mv.visitInsn(AsmUtil.getReturnInstruction(returnType));
+    }
+
+    private void descriptors(MethodInfo method, StringJoiner joiner) {
+        for (org.jboss.jandex.Type parameter : method.parameters()) {
+            if (parameter.kind() == org.jboss.jandex.Type.Kind.TYPE_VARIABLE
+                    || method.name().endsWith("ById")
+                            && parameter.name().equals(typeArguments.get("Id").dotName())) {
+                joiner.add(OBJECT.descriptor());
+            } else {
+                joiner.add(mapType(parameter));
+            }
+        }
+    }
+
+    private String mapType(org.jboss.jandex.Type parameter) {
+        String descriptor;
+        switch (parameter.kind()) {
+            case PRIMITIVE:
+            case TYPE_VARIABLE:
+                descriptor = OBJECT.descriptor();
+                break;
+            default:
+                String value = getDescriptor(parameter, argMapper);
+                descriptor = erasures.getOrDefault(value, value);
+        }
+        return descriptor;
+    }
+
+    private void loadArguments(List<org.jboss.jandex.Type> parameters, MethodVisitor mv) {
+        // inject Class
+        injectModel(mv);
+        for (int i = 0; i < parameters.size(); i++) {
+            mv.visitIntInsn(Opcodes.ALOAD, i + 1);
+        }
+    }
+
+    private void loadOperations(MethodVisitor mv) {
+        mv.visitFieldInsn(Opcodes.GETSTATIC, typeBundle.operations().internalName(), "INSTANCE",
+                typeBundle.operations().descriptor());
+    }
+}
diff --git a/extensions/panache/panache-common/pom.xml b/extensions/panache/panache-common/pom.xml
index bad6f492d3516..fb34991536486 100644
--- a/extensions/panache/panache-common/pom.xml
+++ b/extensions/panache/panache-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-	<relativePath>../../../build-parent/pom.xml</relativePath>
+	<relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/panache/panache-common/runtime/pom.xml b/extensions/panache/panache-common/runtime/pom.xml
index 6f4da4387e7f0..8651cb4859eab 100644
--- a/extensions/panache/panache-common/runtime/pom.xml
+++ b/extensions/panache/panache-common/runtime/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-panache-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,6 +20,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/extensions/panache/panache-common/runtime/src/main/java/io/quarkus/panache/common/Sort.java b/extensions/panache/panache-common/runtime/src/main/java/io/quarkus/panache/common/Sort.java
index 42f8432437800..bc3a8ec66d885 100644
--- a/extensions/panache/panache-common/runtime/src/main/java/io/quarkus/panache/common/Sort.java
+++ b/extensions/panache/panache-common/runtime/src/main/java/io/quarkus/panache/common/Sort.java
@@ -40,7 +40,7 @@ public enum Direction {
         Descending;
     }
 
-    public class Column {
+    public static class Column {
         private String name;
         private Direction direction;
 
diff --git a/extensions/panache/panache-hibernate-common/deployment/pom.xml b/extensions/panache/panache-hibernate-common/deployment/pom.xml
new file mode 100644
index 0000000000000..fcc44e98545af
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-hibernate-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-panache-hibernate-common-deployment</artifactId>
+    <name>Quarkus - Panache - Hibernate - Common - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-hibernate-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jandex</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEnhancersRegisteredBuildItem.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateEnhancersRegisteredBuildItem.java
similarity index 87%
rename from extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEnhancersRegisteredBuildItem.java
rename to extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateEnhancersRegisteredBuildItem.java
index a64920812165b..67e568923c5a2 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateEnhancersRegisteredBuildItem.java
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateEnhancersRegisteredBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.deployment;
+package io.quarkus.panache.common.deployment;
 
 import io.quarkus.builder.item.SimpleBuildItem;
 
diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateMetamodelForFieldAccessBuildItem.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateMetamodelForFieldAccessBuildItem.java
new file mode 100644
index 0000000000000..bca2285ad4615
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateMetamodelForFieldAccessBuildItem.java
@@ -0,0 +1,15 @@
+package io.quarkus.panache.common.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class HibernateMetamodelForFieldAccessBuildItem extends SimpleBuildItem {
+    private final MetamodelInfo metamodelInfo;
+
+    public HibernateMetamodelForFieldAccessBuildItem(MetamodelInfo metamodelInfo) {
+        this.metamodelInfo = metamodelInfo;
+    }
+
+    public MetamodelInfo getMetamodelInfo() {
+        return metamodelInfo;
+    }
+}
diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateModelClassCandidatesForFieldAccessBuildItem.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateModelClassCandidatesForFieldAccessBuildItem.java
new file mode 100644
index 0000000000000..6f98ea1845dcc
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/HibernateModelClassCandidatesForFieldAccessBuildItem.java
@@ -0,0 +1,17 @@
+package io.quarkus.panache.common.deployment;
+
+import java.util.Set;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class HibernateModelClassCandidatesForFieldAccessBuildItem extends SimpleBuildItem {
+    private final Set<String> allModelClassNames;
+
+    public HibernateModelClassCandidatesForFieldAccessBuildItem(Set<String> allModelClassNames) {
+        this.allModelClassNames = allModelClassNames;
+    }
+
+    public Set<String> getAllModelClassNames() {
+        return allModelClassNames;
+    }
+}
diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java
new file mode 100644
index 0000000000000..19bfa999bab1f
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java
@@ -0,0 +1,147 @@
+package io.quarkus.panache.common.deployment;
+
+import static io.quarkus.panache.common.deployment.PanacheConstants.META_INF_PANACHE_ARCHIVE_MARKER;
+
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.Transient;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+
+import io.quarkus.bootstrap.classloading.ClassPathElement;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.gizmo.DescriptorUtils;
+
+public final class PanacheHibernateCommonResourceProcessor {
+
+    private static final DotName DOTNAME_TRANSIENT = DotName.createSimple(Transient.class.getName());
+    private static final DotName DOTNAME_KOTLIN_METADATA = DotName.createSimple("kotlin.Metadata");
+
+    // This MUST be a separate step from replaceFieldAccess,
+    // to avoid a cycle in build steps:
+    //
+    // HibernateEnhancersRegisteredBuildItem
+    // needed for PanacheEntityClassesBuildItem
+    // needed for InterceptedStaticMethodsTransformersRegisteredBuildItem
+    // needed for HibernateEnhancersRegisteredBuildItem
+    @BuildStep
+    void findEntityClasses(CombinedIndexBuildItem index,
+            HibernateModelClassCandidatesForFieldAccessBuildItem candidatesForFieldAccess,
+            BuildProducer<HibernateMetamodelForFieldAccessBuildItem> modelInfoBuildItem,
+            BuildProducer<PanacheEntityClassesBuildItem> fieldAccessEnhancedEntityClasses) {
+        MetamodelInfo modelInfo = new MetamodelInfo();
+
+        // Technically we wouldn't need to process embeddables, but we don't have an easy way to exclude them.
+        for (String entityClassName : candidatesForFieldAccess.getAllModelClassNames()) {
+            ClassInfo entityClass = index.getIndex().getClassByName(DotName.createSimple(entityClassName));
+            if (entityClass == null) {
+                // Probably a synthetic entity, such as Envers' DefaultRevisionEntity.
+                // We don't need to generate accessors for those.
+                continue;
+            }
+            if (entityClass.annotations().containsKey(DOTNAME_KOTLIN_METADATA)) {
+                // This is a Kotlin class.
+                // Historically we've never created accessors automatically for Kotlin,
+                // since Kotlin language features (properties) can be used instead.
+                continue;
+            }
+            modelInfo.addEntityModel(createEntityModel(entityClass));
+        }
+
+        // Share the metamodel for use in replaceFieldAccesses
+        modelInfoBuildItem.produce(new HibernateMetamodelForFieldAccessBuildItem(modelInfo));
+
+        Set<String> entitiesWithPublicFields = modelInfo.getEntitiesWithPublicFields();
+        if (entitiesWithPublicFields.isEmpty()) {
+            // There are no public fields to be accessed in the first place.
+            return;
+        }
+
+        // Share with other extensions that we will generate accessors for some classes
+        fieldAccessEnhancedEntityClasses
+                .produce(new PanacheEntityClassesBuildItem(entitiesWithPublicFields));
+    }
+
+    @BuildStep
+    @Consume(HibernateEnhancersRegisteredBuildItem.class)
+    void replaceFieldAccesses(CombinedIndexBuildItem index,
+            ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            HibernateMetamodelForFieldAccessBuildItem modelInfoBuildItem,
+            BuildProducer<BytecodeTransformerBuildItem> transformers) {
+        MetamodelInfo modelInfo = modelInfoBuildItem.getMetamodelInfo();
+        Set<String> entitiesWithPublicFields = modelInfo.getEntitiesWithPublicFields();
+        if (entitiesWithPublicFields.isEmpty()) {
+            // There are no public fields to be accessed in the first place.
+            return;
+        }
+
+        // Generate accessors for public fields in entities, mapped superclasses
+        // (and embeddables, see where we build modelInfo above).
+        PanacheJpaEntityAccessorsEnhancer entityAccessorsEnhancer = new PanacheJpaEntityAccessorsEnhancer(index.getIndex(),
+                modelInfo);
+        for (String entityClassName : entitiesWithPublicFields) {
+            transformers.produce(new BytecodeTransformerBuildItem(true, entityClassName, entityAccessorsEnhancer));
+        }
+
+        // Replace field access in application code with calls to accessors
+        Set<String> entityClassNamesInternal = new HashSet<>();
+        for (String entityClassName : entitiesWithPublicFields) {
+            entityClassNamesInternal.add(entityClassName.replace(".", "/"));
+        }
+
+        PanacheFieldAccessEnhancer panacheFieldAccessEnhancer = new PanacheFieldAccessEnhancer(modelInfo);
+        QuarkusClassLoader tccl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+        List<ClassPathElement> archives = tccl.getElementsWithResource(META_INF_PANACHE_ARCHIVE_MARKER);
+        Set<String> produced = new HashSet<>();
+        //we always transform the root archive, even though it should be run with the annotation
+        //processor on the CP it might not be if the user is using jpa-modelgen
+        //this won't cover every situation, but we have documented this, and as the fields are now
+        //made private the error should be very obvious
+        //we only do this for hibernate, as it is more common to have an additional annotation processor
+        for (ClassInfo i : applicationArchivesBuildItem.getRootArchive().getIndex().getKnownClasses()) {
+            String cn = i.name().toString();
+            produced.add(cn);
+            transformers.produce(
+                    new BytecodeTransformerBuildItem(cn, panacheFieldAccessEnhancer, entityClassNamesInternal));
+        }
+
+        for (ClassPathElement i : archives) {
+            for (String res : i.getProvidedResources()) {
+                if (res.endsWith(".class")) {
+                    String cn = res.replace("/", ".").substring(0, res.length() - 6);
+                    if (produced.contains(cn)) {
+                        continue;
+                    }
+                    produced.add(cn);
+                    transformers.produce(
+                            new BytecodeTransformerBuildItem(cn, panacheFieldAccessEnhancer, entityClassNamesInternal));
+                }
+            }
+        }
+    }
+
+    private EntityModel createEntityModel(ClassInfo classInfo) {
+        EntityModel entityModel = new EntityModel(classInfo);
+        for (FieldInfo fieldInfo : classInfo.fields()) {
+            String name = fieldInfo.name();
+            if (Modifier.isPublic(fieldInfo.flags())
+                    && !Modifier.isStatic(fieldInfo.flags())
+                    && !fieldInfo.hasAnnotation(DOTNAME_TRANSIENT)) {
+                entityModel.addField(new EntityField(name, DescriptorUtils.typeToString(fieldInfo.type())));
+            }
+        }
+        return entityModel;
+    }
+
+}
diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheJpaEntityAccessorsEnhancer.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheJpaEntityAccessorsEnhancer.java
new file mode 100644
index 0000000000000..5beb5a93c8a79
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheJpaEntityAccessorsEnhancer.java
@@ -0,0 +1,29 @@
+package io.quarkus.panache.common.deployment;
+
+import java.util.function.BiFunction;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+import io.quarkus.panache.common.deployment.visitors.PanacheJpaEntityClassAccessorGenerationVisitor;
+
+public class PanacheJpaEntityAccessorsEnhancer
+        implements BiFunction<String, ClassVisitor, ClassVisitor> {
+
+    private final IndexView indexView;
+    private final MetamodelInfo modelInfo;
+
+    public PanacheJpaEntityAccessorsEnhancer(IndexView index, MetamodelInfo modelInfo) {
+        this.indexView = index;
+        this.modelInfo = modelInfo;
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
+        ClassInfo entityInfo = indexView.getClassByName(DotName.createSimple(className));
+        EntityModel entityModel = modelInfo.getEntityModel(className);
+        return new PanacheJpaEntityClassAccessorGenerationVisitor(outputClassVisitor, entityInfo, entityModel);
+    }
+}
diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheJpaEntityOperationsEnhancer.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheJpaEntityOperationsEnhancer.java
new file mode 100644
index 0000000000000..0794bbf9053d4
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheJpaEntityOperationsEnhancer.java
@@ -0,0 +1,27 @@
+package io.quarkus.panache.common.deployment;
+
+import java.util.List;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.objectweb.asm.ClassVisitor;
+
+import io.quarkus.panache.common.deployment.visitors.PanacheEntityClassOperationGenerationVisitor;
+
+public class PanacheJpaEntityOperationsEnhancer extends PanacheEntityEnhancer {
+    private final TypeBundle typeBundle;
+
+    public PanacheJpaEntityOperationsEnhancer(IndexView index, List<PanacheMethodCustomizer> methodCustomizers,
+            TypeBundle typeBundle) {
+        super(index, methodCustomizers);
+        this.typeBundle = typeBundle;
+    }
+
+    @Override
+    public ClassVisitor apply(String className, ClassVisitor outputClassVisitor) {
+        ClassInfo entityInfo = indexView.getClassByName(DotName.createSimple(className));
+        return new PanacheEntityClassOperationGenerationVisitor(outputClassVisitor, typeBundle,
+                entityInfo, methodCustomizers, indexView);
+    }
+}
diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheJpaEntityClassAccessorGenerationVisitor.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheJpaEntityClassAccessorGenerationVisitor.java
new file mode 100644
index 0000000000000..4053ae1b2eeb0
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/PanacheJpaEntityClassAccessorGenerationVisitor.java
@@ -0,0 +1,47 @@
+package io.quarkus.panache.common.deployment.visitors;
+
+import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
+import org.jboss.jandex.ClassInfo;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import io.quarkus.panache.common.deployment.EntityField;
+import io.quarkus.panache.common.deployment.EntityModel;
+
+public class PanacheJpaEntityClassAccessorGenerationVisitor extends PanacheEntityClassAccessorGenerationVisitor {
+
+    public PanacheJpaEntityClassAccessorGenerationVisitor(ClassVisitor outputClassVisitor,
+            ClassInfo entityInfo, EntityModel entityModel) {
+        super(outputClassVisitor, entityInfo, entityModel);
+    }
+
+    @Override
+    protected void generateAccessorSetField(MethodVisitor mv, EntityField field) {
+        // Due to https://github.com/quarkusio/quarkus/issues/1376 we generate Hibernate read/write calls
+        // directly rather than rely on Hibernate to see our generated accessor because it does not
+        mv.visitMethodInsn(
+                Opcodes.INVOKEVIRTUAL,
+                thisClass.getInternalName(),
+                EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + field.name,
+                Type.getMethodDescriptor(Type.getType(void.class), Type.getType(field.descriptor)),
+                false);
+        // instead of:
+        // mv.visitFieldInsn(Opcodes.PUTFIELD, thisClass.getInternalName(), field.name, field.descriptor);
+    }
+
+    @Override
+    protected void generateAccessorGetField(MethodVisitor mv, EntityField field) {
+        // Due to https://github.com/quarkusio/quarkus/issues/1376 we generate Hibernate read/write calls
+        // directly rather than rely on Hibernate to see our generated accessor because it does not
+        mv.visitMethodInsn(
+                Opcodes.INVOKEVIRTUAL,
+                thisClass.getInternalName(),
+                EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + field.name,
+                Type.getMethodDescriptor(Type.getType(field.descriptor)),
+                false);
+        // instead of:
+        // mv.visitFieldInsn(Opcodes.GETFIELD, thisClass.getInternalName(), field.name, field.descriptor);
+    }
+}
diff --git a/extensions/panache/panache-hibernate-common/pom.xml b/extensions/panache/panache-hibernate-common/pom.xml
new file mode 100644
index 0000000000000..24c1b8f0527df
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+	<relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-panache-hibernate-common-parent</artifactId>
+    <name>Quarkus - Panache - Hibernate - Common</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+
+</project>
diff --git a/extensions/panache/panache-hibernate-common/runtime/pom.xml b/extensions/panache/panache-hibernate-common/runtime/pom.xml
new file mode 100644
index 0000000000000..e973ccced23a5
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/runtime/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-panache-hibernate-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-panache-hibernate-common</artifactId>
+    <name>Quarkus - Panache - Hibernate - Common - Runtime</name>
+    <description>An opinionated approach to make Hibernate as easy as possible</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/panache/panache-hibernate-common/runtime/src/main/java/io/quarkus/panache/hibernate/common/runtime/PanacheJpaUtil.java b/extensions/panache/panache-hibernate-common/runtime/src/main/java/io/quarkus/panache/hibernate/common/runtime/PanacheJpaUtil.java
new file mode 100644
index 0000000000000..2741d99091ed5
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/runtime/src/main/java/io/quarkus/panache/hibernate/common/runtime/PanacheJpaUtil.java
@@ -0,0 +1,182 @@
+package io.quarkus.panache.hibernate.common.runtime;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import io.quarkus.panache.common.Sort;
+import io.quarkus.panache.common.exception.PanacheQueryException;
+
+public class PanacheJpaUtil {
+
+    // match SELECT DISTINCT? id (AS id)? (, id (AS id)?)*
+    static final Pattern SELECT_PATTERN = Pattern.compile(
+            "^\\s*SELECT\\s+((?:DISTINCT\\s+)?\\w+(?:\\.\\w+)*)(?:\\s+AS\\s+\\w+)?(\\s*,\\s*\\w+(?:\\.\\w+)*(?:\\s+AS\\s+\\w+)?)*\\s+(.*)",
+            Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+
+    // match FROM
+    static final Pattern FROM_PATTERN = Pattern.compile("^\\s*FROM\\s+.*",
+            Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+
+    public static String getCountQuery(String query) {
+        // try to generate a good count query from the existing query
+        Matcher selectMatcher = SELECT_PATTERN.matcher(query);
+        String countQuery;
+        if (selectMatcher.matches()) {
+            // this one cannot be null
+            String firstSelection = selectMatcher.group(1).trim();
+            if (firstSelection.toLowerCase().startsWith("distinct ")) {
+                // this one can be null
+                String secondSelection = selectMatcher.group(2);
+                // we can only count distinct single columns
+                if (secondSelection != null && !secondSelection.trim().isEmpty()) {
+                    throw new PanacheQueryException("Count query not supported for select query: " + query);
+                }
+                countQuery = "SELECT COUNT(" + firstSelection + ") " + selectMatcher.group(3);
+            } else {
+                // it's not distinct, forget the column list
+                countQuery = "SELECT COUNT(*) " + selectMatcher.group(3);
+            }
+        } else if (FROM_PATTERN.matcher(query).matches()) {
+            countQuery = "SELECT COUNT(*) " + query;
+        } else {
+            throw new PanacheQueryException("Count query not supported for select query: " + query);
+        }
+
+        // remove the order by clause
+        String lcQuery = countQuery.toLowerCase();
+        int orderByIndex = lcQuery.lastIndexOf(" order by ");
+        if (orderByIndex != -1) {
+            countQuery = countQuery.substring(0, orderByIndex);
+        }
+        return countQuery;
+    }
+
+    public static String getEntityName(Class<?> entityClass) {
+        // FIXME: not true?
+        return entityClass.getName();
+    }
+
+    public static String createFindQuery(Class<?> entityClass, String query, int paramCount) {
+        if (query == null) {
+            return "FROM " + getEntityName(entityClass);
+        }
+
+        String trimmed = query.trim();
+        if (trimmed.isEmpty()) {
+            return "FROM " + getEntityName(entityClass);
+        }
+
+        if (isNamedQuery(query)) {
+            // we return named query as is
+            return query;
+        }
+
+        String trimmedLc = trimmed.toLowerCase();
+        if (trimmedLc.startsWith("from ") || trimmedLc.startsWith("select ")) {
+            return query;
+        }
+        if (trimmedLc.startsWith("order by ")) {
+            return "FROM " + getEntityName(entityClass) + " " + query;
+        }
+        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
+            query += " = ?1";
+        }
+        return "FROM " + getEntityName(entityClass) + " WHERE " + query;
+    }
+
+    public static boolean isNamedQuery(String query) {
+        if (query == null || query.isEmpty()) {
+            return false;
+        }
+        return query.charAt(0) == '#';
+    }
+
+    public static String createCountQuery(Class<?> entityClass, String query, int paramCount) {
+        if (query == null)
+            return "SELECT COUNT(*) FROM " + getEntityName(entityClass);
+
+        String trimmed = query.trim();
+        if (trimmed.isEmpty())
+            return "SELECT COUNT(*) FROM " + getEntityName(entityClass);
+
+        String trimmedLc = trimmed.toLowerCase();
+        if (trimmedLc.startsWith("from ")) {
+            return "SELECT COUNT(*) " + query;
+        }
+        if (trimmedLc.startsWith("order by ")) {
+            // ignore it
+            return "SELECT COUNT(*) FROM " + getEntityName(entityClass);
+        }
+        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
+            query += " = ?1";
+        }
+        return "SELECT COUNT(*) FROM " + getEntityName(entityClass) + " WHERE " + query;
+    }
+
+    public static String createUpdateQuery(Class<?> entityClass, String query, int paramCount) {
+        if (query == null) {
+            throw new PanacheQueryException("Query string cannot be null");
+        }
+
+        String trimmed = query.trim();
+        if (trimmed.isEmpty()) {
+            throw new PanacheQueryException("Query string cannot be empty");
+        }
+
+        String trimmedLc = trimmed.toLowerCase();
+        if (trimmedLc.startsWith("update ")) {
+            return query;
+        }
+        if (trimmedLc.startsWith("from ")) {
+            return "UPDATE " + query;
+        }
+        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
+            query += " = ?1";
+        }
+        if (trimmedLc.startsWith("set ")) {
+            return "UPDATE FROM " + getEntityName(entityClass) + " " + query;
+        }
+        return "UPDATE FROM " + getEntityName(entityClass) + " SET " + query;
+    }
+
+    public static String createDeleteQuery(Class<?> entityClass, String query, int paramCount) {
+        if (query == null)
+            return "DELETE FROM " + getEntityName(entityClass);
+
+        String trimmed = query.trim();
+        if (trimmed.isEmpty())
+            return "DELETE FROM " + getEntityName(entityClass);
+
+        String trimmedLc = trimmed.toLowerCase();
+        if (trimmedLc.startsWith("from ")) {
+            return "DELETE " + query;
+        }
+        if (trimmedLc.startsWith("order by ")) {
+            // ignore it
+            return "DELETE FROM " + getEntityName(entityClass);
+        }
+        if (trimmedLc.indexOf(' ') == -1 && trimmedLc.indexOf('=') == -1 && paramCount == 1) {
+            query += " = ?1";
+        }
+        return "DELETE FROM " + getEntityName(entityClass) + " WHERE " + query;
+    }
+
+    public static String toOrderBy(Sort sort) {
+        if (sort == null) {
+            return null;
+        }
+        if (sort.getColumns().size() == 0) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder(" ORDER BY ");
+        for (int i = 0; i < sort.getColumns().size(); i++) {
+            Sort.Column column = sort.getColumns().get(i);
+            if (i > 0)
+                sb.append(" , ");
+            sb.append(column.getName());
+            if (column.getDirection() != Sort.Direction.Ascending)
+                sb.append(" DESC");
+        }
+        return sb.toString();
+    }
+}
diff --git a/extensions/panache/panache-hibernate-common/runtime/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/extensions/panache/panache-hibernate-common/runtime/src/main/resources/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 0000000000000..ca0d25c94559a
--- /dev/null
+++ b/extensions/panache/panache-hibernate-common/runtime/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+io.quarkus.panache.common.runtime.PanacheAnnotationProcessor
diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/test/java/io/quarkus/hibernate/orm/panache/common/runtime/QueryMatcherTest.java b/extensions/panache/panache-hibernate-common/runtime/src/test/java/io/quarkus/panache/hibernate/common/runtime/QueryMatcherTest.java
similarity index 92%
rename from extensions/panache/hibernate-orm-panache-common/runtime/src/test/java/io/quarkus/hibernate/orm/panache/common/runtime/QueryMatcherTest.java
rename to extensions/panache/panache-hibernate-common/runtime/src/test/java/io/quarkus/panache/hibernate/common/runtime/QueryMatcherTest.java
index 95fee841074bc..d6e647beb4f31 100644
--- a/extensions/panache/hibernate-orm-panache-common/runtime/src/test/java/io/quarkus/hibernate/orm/panache/common/runtime/QueryMatcherTest.java
+++ b/extensions/panache/panache-hibernate-common/runtime/src/test/java/io/quarkus/panache/hibernate/common/runtime/QueryMatcherTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.hibernate.orm.panache.common.runtime;
+package io.quarkus.panache.hibernate.common.runtime;
 
 import java.util.regex.Matcher;
 
@@ -31,7 +31,7 @@ public void testSelectMatcher() {
     }
 
     private void testSelectMatch(String select, String result) {
-        Matcher matcher = CommonPanacheQueryImpl.SELECT_PATTERN.matcher(select);
+        Matcher matcher = PanacheJpaUtil.SELECT_PATTERN.matcher(select);
         if (result != null) {
             Assertions.assertTrue(matcher.matches());
             Assertions.assertEquals(result, matcher.group(3));
@@ -56,7 +56,7 @@ public void testFromMatcher() {
     }
 
     private void testFromMatch(String query) {
-        Matcher matcher = CommonPanacheQueryImpl.FROM_PATTERN.matcher(query);
+        Matcher matcher = PanacheJpaUtil.FROM_PATTERN.matcher(query);
         Assertions.assertTrue(matcher.matches());
     }
 
diff --git a/extensions/panache/panache-mock/pom.xml b/extensions/panache/panache-mock/pom.xml
index 156810152a342..d33d2536e2e66 100644
--- a/extensions/panache/panache-mock/pom.xml
+++ b/extensions/panache/panache-mock/pom.xml
@@ -2,16 +2,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-panache-mock</artifactId>
     <name>Quarkus - Panache - Mock</name>
     <description>Mocking with Panache</description>
+
+    <properties>
+        <enforce-test-deps-scope.skip>true</enforce-test-deps-scope.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/panache/panache-mock/src/main/java/io/quarkus/panache/mock/PanacheMock.java b/extensions/panache/panache-mock/src/main/java/io/quarkus/panache/mock/PanacheMock.java
index f0bcfe098a67e..c8a6aa7521fe4 100644
--- a/extensions/panache/panache-mock/src/main/java/io/quarkus/panache/mock/PanacheMock.java
+++ b/extensions/panache/panache-mock/src/main/java/io/quarkus/panache/mock/PanacheMock.java
@@ -22,11 +22,11 @@ public class PanacheMock {
     private final static Map<Class<?>, Object> mocks = new ConcurrentHashMap<>();
 
     @SuppressWarnings("unchecked")
-    public static <T> T getMock(Class<T> klass) {
+    public static synchronized <T> T getMock(Class<T> klass) {
         return (T) mocks.get(klass);
     }
 
-    public static Object[] getMocks(Class<?>... classes) {
+    public static synchronized Object[] getMocks(Class<?>... classes) {
         Object[] mocks = new Object[classes.length];
         for (int i = 0; i < classes.length; i++) {
             mocks[i] = getMock(classes[i]);
@@ -34,19 +34,19 @@ public static Object[] getMocks(Class<?>... classes) {
         return mocks;
     }
 
-    public static void mock(Class<?>... classes) {
+    public static synchronized void mock(Class<?>... classes) {
         for (Class<?> klass : classes) {
             mocks.computeIfAbsent(klass, v -> Mockito.mock(klass));
         }
         IsMockEnabled = !mocks.isEmpty();
     }
 
-    public static void reset() {
+    public static synchronized void reset() {
         mocks.clear();
         IsMockEnabled = false;
     }
 
-    public static boolean isMocked(Class<?> klass) {
+    public static synchronized boolean isMocked(Class<?> klass) {
         return mocks.containsKey(klass);
     }
 
diff --git a/extensions/panache/panacheql/pom.xml b/extensions/panache/panacheql/pom.xml
index 4aae5516bfb1f..d4e631cb17688 100644
--- a/extensions/panache/panacheql/pom.xml
+++ b/extensions/panache/panacheql/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,11 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId> 
+            <artifactId>jboss-logmanager-embedded</artifactId> 
+            <scope>test</scope> 
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/panache/pom.xml b/extensions/panache/pom.xml
index 39d2a3d946119..b1f972fa0003a 100644
--- a/extensions/panache/pom.xml
+++ b/extensions/panache/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-	<relativePath>../../build-parent/pom.xml</relativePath>
+	<relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,14 +15,20 @@
     <packaging>pom</packaging>
     <modules>
         <module>panache-common</module>
+        <module>panache-hibernate-common</module>
         <module>panache-mock</module>
         <module>hibernate-orm-panache-common</module>
         <module>hibernate-orm-panache</module>
         <module>hibernate-orm-panache-kotlin</module>
+        <module>mongodb-panache-common</module>
+        <module>hibernate-reactive-panache-common</module>
+        <module>hibernate-reactive-panache</module>
         <module>mongodb-panache</module>
+        <module>mongodb-panache-kotlin</module>
         <module>panacheql</module>
         <module>rest-data-panache</module>
         <module>hibernate-orm-rest-data-panache</module>
+        <module>mongodb-rest-data-panache</module>
     </modules>
 
 
diff --git a/extensions/panache/rest-data-panache/deployment/pom.xml b/extensions/panache/rest-data-panache/deployment/pom.xml
index fd187b2b45fcd..d3b0d7ec113a8 100644
--- a/extensions/panache/rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/rest-data-panache/deployment/pom.xml
@@ -43,6 +43,10 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common-deployment</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/Constants.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/Constants.java
new file mode 100644
index 0000000000000..d23cfab383b84
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/Constants.java
@@ -0,0 +1,6 @@
+package io.quarkus.rest.data.panache.deployment;
+
+public final class Constants {
+
+    public static final String PAGE_COUNT_METHOD_PREFIX = "$$_page_count_";
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/DataAccessImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/DataAccessImplementor.java
deleted file mode 100644
index bc09cfe8fff95..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/DataAccessImplementor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.rest.data.panache.deployment;
-
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.ResultHandle;
-
-public interface DataAccessImplementor {
-
-    ResultHandle findById(BytecodeCreator creator, ResultHandle id);
-
-    ResultHandle listAll(BytecodeCreator creator);
-
-    ResultHandle findAll(BytecodeCreator creator, ResultHandle page);
-
-    ResultHandle persist(BytecodeCreator creator, ResultHandle entity);
-
-    ResultHandle update(BytecodeCreator creator, ResultHandle entity);
-
-    ResultHandle deleteById(BytecodeCreator creator, ResultHandle id);
-
-    ResultHandle pageCount(BytecodeCreator creator, ResultHandle page);
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java
new file mode 100644
index 0000000000000..f5c6b67156f1d
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java
@@ -0,0 +1,99 @@
+package io.quarkus.rest.data.panache.deployment;
+
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.ws.rs.Path;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.rest.data.panache.deployment.methods.AddMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.DeleteMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.GetMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.ListMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.UpdateMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.hal.AddHalMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.hal.GetHalMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.hal.ListHalMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.methods.hal.UpdateHalMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
+import io.quarkus.runtime.util.HashUtil;
+
+/**
+ * Implement a JAX-RS controller exposing a specific {@link io.quarkus.rest.data.panache.RestDataResource} implementation.
+ */
+class JaxRsResourceImplementor {
+
+    private static final Logger LOGGER = Logger.getLogger(JaxRsResourceImplementor.class);
+
+    private final List<MethodImplementor> methodImplementors;
+
+    JaxRsResourceImplementor(boolean withValidation) {
+        this.methodImplementors = Arrays.asList(
+                new GetMethodImplementor(),
+                new GetHalMethodImplementor(),
+                new ListMethodImplementor(),
+                new ListHalMethodImplementor(),
+                new AddMethodImplementor(withValidation),
+                new AddHalMethodImplementor(withValidation),
+                new UpdateMethodImplementor(withValidation),
+                new UpdateHalMethodImplementor(withValidation),
+                new DeleteMethodImplementor());
+    }
+
+    /**
+     * Implement a JAX-RS resource with a following structure.
+     *
+     * <pre>
+     * {@code
+     *      &#64;Path("/my-entities')
+     *      public class MyEntitiesResourceController_1234 {
+     *          &#64;Inject
+     *          MyEntitiesResource resource;
+     *
+     *          // JAX-RS method implementations. See method implementors for details.
+     *      }
+     * }
+     * </pre>
+     */
+    void implement(ClassOutput classOutput, ResourceMetadata resourceMetadata, ResourceProperties resourceProperties) {
+        String controllerClassName = resourceMetadata.getResourceInterface() + "JaxRs_" +
+                HashUtil.sha1(resourceMetadata.getResourceInterface());
+        LOGGER.tracef("Starting generation of '%s'", controllerClassName);
+        ClassCreator classCreator = ClassCreator.builder()
+                .classOutput(classOutput).className(controllerClassName)
+                .build();
+
+        implementClassAnnotations(classCreator, resourceProperties);
+        FieldDescriptor resourceField = implementResourceField(classCreator, resourceMetadata);
+        implementMethods(classCreator, resourceMetadata, resourceProperties, resourceField);
+
+        classCreator.close();
+        LOGGER.tracef("Completed generation of '%s'", controllerClassName);
+    }
+
+    private void implementClassAnnotations(ClassCreator classCreator, ResourceProperties resourceProperties) {
+        classCreator.addAnnotation(Path.class).addValue("value", resourceProperties.getPath());
+    }
+
+    private FieldDescriptor implementResourceField(ClassCreator classCreator, ResourceMetadata resourceMetadata) {
+        FieldCreator resourceFieldCreator = classCreator.getFieldCreator("resource", resourceMetadata.getResourceClass());
+        resourceFieldCreator.setModifiers(resourceFieldCreator.getModifiers() & ~Modifier.PRIVATE)
+                .addAnnotation(Inject.class);
+        return resourceFieldCreator.getFieldDescriptor();
+    }
+
+    private void implementMethods(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        for (MethodImplementor methodImplementor : methodImplementors) {
+            methodImplementor.implement(classCreator, resourceMetadata, resourceProperties, resourceField);
+        }
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/PrivateFields.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/PrivateFields.java
deleted file mode 100644
index 460098ecaa463..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/PrivateFields.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.quarkus.rest.data.panache.deployment;
-
-import javax.ws.rs.core.UriInfo;
-
-public final class PrivateFields {
-
-    public static final Field URI_INFO = new Field("uriInfo", UriInfo.class);
-
-    public static final class Field {
-
-        private final String name;
-
-        private final Class<?> type;
-
-        public Field(String name, Class<?> type) {
-            this.name = name;
-            this.type = type;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public Class<?> getType() {
-            return type;
-        }
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/PrivateMethods.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/PrivateMethods.java
deleted file mode 100644
index 2f124edb03e32..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/PrivateMethods.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.quarkus.rest.data.panache.deployment;
-
-public final class PrivateMethods {
-
-    public static final Method IS_PAGED = new Method("isPaged", boolean.class.getTypeName(), new String[0]);
-
-    public static final class Method {
-        private final String name;
-
-        private final String type;
-
-        private final String[] params;
-
-        public Method(String name, String type, String[] params) {
-            this.name = name;
-            this.type = type;
-            this.params = params;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public String[] getParams() {
-            return params;
-        }
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMetadata.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMetadata.java
new file mode 100644
index 0000000000000..fa3e0d4adbf67
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/ResourceMetadata.java
@@ -0,0 +1,47 @@
+package io.quarkus.rest.data.panache.deployment;
+
+public class ResourceMetadata {
+
+    /**
+     * Generated class that implements RestDataResource.
+     */
+    private final String resourceClass;
+
+    /**
+     * Application interface that extends RestDataResource interface.
+     */
+    private final String resourceInterface;
+
+    /**
+     * Entity class that is used by the resource.
+     */
+    private final String entityType;
+
+    /**
+     * ID class/interface that is used by the resource.
+     */
+    private final String idType;
+
+    public ResourceMetadata(String resourceClass, String resourceInterface, String entityType, String idType) {
+        this.resourceClass = resourceClass;
+        this.resourceInterface = resourceInterface;
+        this.entityType = entityType;
+        this.idType = idType;
+    }
+
+    public String getResourceClass() {
+        return resourceClass;
+    }
+
+    public String getResourceInterface() {
+        return resourceInterface;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public String getIdType() {
+        return idType;
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java
index 194815b9248b4..8da00a85419ac 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java
@@ -5,8 +5,11 @@
 
 import org.jboss.resteasy.links.impl.EL;
 
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -14,6 +17,9 @@
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.jackson.spi.JacksonModuleBuildItem;
 import io.quarkus.jsonb.spi.JsonbSerializerBuildItem;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
+import io.quarkus.rest.data.panache.deployment.properties.ResourcePropertiesBuildItem;
+import io.quarkus.rest.data.panache.deployment.properties.ResourcePropertiesProvider;
 import io.quarkus.rest.data.panache.runtime.hal.HalCollectionWrapper;
 import io.quarkus.rest.data.panache.runtime.hal.HalCollectionWrapperJacksonSerializer;
 import io.quarkus.rest.data.panache.runtime.hal.HalCollectionWrapperJsonbSerializer;
@@ -23,16 +29,34 @@
 import io.quarkus.rest.data.panache.runtime.hal.HalLink;
 import io.quarkus.rest.data.panache.runtime.hal.HalLinkJacksonSerializer;
 import io.quarkus.rest.data.panache.runtime.hal.HalLinkJsonbSerializer;
+import io.quarkus.rest.data.panache.runtime.jta.TransactionalExecutor;
 
 public class RestDataProcessor {
 
+    @BuildStep
+    AdditionalBeanBuildItem registerTransactionalExecutor() {
+        return AdditionalBeanBuildItem.unremovableOf(TransactionalExecutor.class);
+    }
+
     @BuildStep
     void implementResources(CombinedIndexBuildItem index, List<RestDataResourceBuildItem> resourceBuildItems,
+            List<ResourcePropertiesBuildItem> resourcePropertiesBuildItems, Capabilities capabilities,
             BuildProducer<GeneratedBeanBuildItem> implementationsProducer) {
         ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
-        RestDataResourceImplementor implementor = new RestDataResourceImplementor(index.getIndex());
+        JaxRsResourceImplementor jaxRsResourceImplementor = new JaxRsResourceImplementor(hasValidatorCapability(capabilities));
+        ResourcePropertiesProvider resourcePropertiesProvider = new ResourcePropertiesProvider(index.getIndex());
+
         for (RestDataResourceBuildItem resourceBuildItem : resourceBuildItems) {
-            implementor.implement(classOutput, resourceBuildItem.getResourceInfo());
+            ResourceMetadata resourceMetadata = resourceBuildItem.getResourceMetadata();
+            ResourceProperties resourceProperties = getResourceProperties(resourcePropertiesProvider,
+                    resourceMetadata, resourcePropertiesBuildItems);
+            if (resourceProperties.isHal() && !hasHalCapability(capabilities)) {
+                throw new IllegalStateException(
+                        "Cannot generate HAL endpoints without a RESTEasy JSON-B or Jackson capability");
+            }
+            if (resourceProperties.isExposed()) {
+                jaxRsResourceImplementor.implement(classOutput, resourceMetadata, resourceProperties);
+            }
         }
     }
 
@@ -40,7 +64,8 @@ void implementResources(CombinedIndexBuildItem index, List<RestDataResourceBuild
     JacksonModuleBuildItem registerJacksonSerializers() {
         return new JacksonModuleBuildItem.Builder("hal-wrappers")
                 .addSerializer(HalEntityWrapperJacksonSerializer.class.getName(), HalEntityWrapper.class.getName())
-                .addSerializer(HalCollectionWrapperJacksonSerializer.class.getName(), HalCollectionWrapper.class.getName())
+                .addSerializer(HalCollectionWrapperJacksonSerializer.class.getName(),
+                        HalCollectionWrapper.class.getName())
                 .addSerializer(HalLinkJacksonSerializer.class.getName(), HalLink.class.getName())
                 .build();
     }
@@ -57,4 +82,23 @@ JsonbSerializerBuildItem registerJsonbSerializers() {
     RuntimeInitializedClassBuildItem el() {
         return new RuntimeInitializedClassBuildItem(EL.class.getCanonicalName());
     }
+
+    private ResourceProperties getResourceProperties(ResourcePropertiesProvider resourcePropertiesProvider,
+            ResourceMetadata resourceMetadata, List<ResourcePropertiesBuildItem> resourcePropertiesBuildItems) {
+        for (ResourcePropertiesBuildItem resourcePropertiesBuildItem : resourcePropertiesBuildItems) {
+            if (resourcePropertiesBuildItem.getResourceType().equals(resourceMetadata.getResourceClass())
+                    || resourcePropertiesBuildItem.getResourceType().equals(resourceMetadata.getResourceInterface())) {
+                return resourcePropertiesBuildItem.getResourcePropertiesInfo();
+            }
+        }
+        return resourcePropertiesProvider.getForInterface(resourceMetadata.getResourceInterface());
+    }
+
+    private boolean hasValidatorCapability(Capabilities capabilities) {
+        return capabilities.isPresent(Capability.HIBERNATE_VALIDATOR);
+    }
+
+    private boolean hasHalCapability(Capabilities capabilities) {
+        return capabilities.isPresent(Capability.RESTEASY_JSONB) || capabilities.isPresent(Capability.RESTEASY_JACKSON);
+    }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceBuildItem.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceBuildItem.java
index 4ba8ac4669d1a..bd1497808bd1e 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceBuildItem.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceBuildItem.java
@@ -4,13 +4,13 @@
 
 public final class RestDataResourceBuildItem extends MultiBuildItem {
 
-    private final RestDataResourceInfo resourceInfo;
+    private final ResourceMetadata resourceMetadata;
 
-    public RestDataResourceBuildItem(RestDataResourceInfo resourceInfo) {
-        this.resourceInfo = resourceInfo;
+    public RestDataResourceBuildItem(ResourceMetadata resourceMetadata) {
+        this.resourceMetadata = resourceMetadata;
     }
 
-    public RestDataResourceInfo getResourceInfo() {
-        return resourceInfo;
+    public ResourceMetadata getResourceMetadata() {
+        return resourceMetadata;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceImplementor.java
deleted file mode 100644
index 90c22153e5594..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceImplementor.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package io.quarkus.rest.data.panache.deployment;
-
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-
-import org.jboss.jandex.IndexView;
-import org.jboss.logging.Logger;
-
-import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.gizmo.ClassOutput;
-import io.quarkus.rest.data.panache.deployment.methods.AddMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.DeleteMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.GetMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.ListMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.UpdateMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.hal.AddHalMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.hal.GetHalMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.hal.ListHalMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.hal.UpdateHalMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.internal.IsPagedMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
-import io.quarkus.rest.data.panache.deployment.properties.ResourcePropertiesAccessor;
-import io.quarkus.runtime.util.HashUtil;
-
-class RestDataResourceImplementor {
-
-    private static final Logger LOGGER = Logger.getLogger(RestDataResourceImplementor.class);
-
-    private static final List<MethodImplementor> STANDARD_METHOD_IMPLEMENTORS = Arrays.asList(
-            new GetMethodImplementor(),
-            new ListMethodImplementor(),
-            new AddMethodImplementor(),
-            new UpdateMethodImplementor(),
-            new DeleteMethodImplementor());
-
-    private static final List<MethodImplementor> HAL_METHOD_IMPLEMENTORS = Arrays.asList(
-            new GetHalMethodImplementor(),
-            new ListHalMethodImplementor(),
-            new AddHalMethodImplementor(),
-            new UpdateHalMethodImplementor());
-
-    private final IndexView index;
-
-    private final ResourcePropertiesAccessor resourcePropertiesAccessor;
-
-    private final MethodPropertiesAccessor methodPropertiesAccessor;
-
-    public RestDataResourceImplementor(IndexView index) {
-        this.index = index;
-        this.resourcePropertiesAccessor = new ResourcePropertiesAccessor(index);
-        this.methodPropertiesAccessor = new MethodPropertiesAccessor(index);
-    }
-
-    void implement(ClassOutput classOutput, RestDataResourceInfo resourceInfo) {
-        String resourceInterfaceName = resourceInfo.getClassInfo().toString();
-        String implementationClassName = resourceInterfaceName + "Impl_" + HashUtil.sha1(resourceInterfaceName);
-        LOGGER.tracef("Starting generation of '%s'", implementationClassName);
-        ClassCreator classCreator = ClassCreator.builder()
-                .classOutput(classOutput)
-                .className(implementationClassName)
-                .interfaces(resourceInterfaceName)
-                .build();
-        classCreator.addAnnotation(Path.class)
-                .addValue("value", resourcePropertiesAccessor.path(resourceInfo.getClassInfo()));
-        implementPrivateFields(classCreator);
-        implementMethods(classCreator, resourceInfo);
-        implementPrivateMethods(classCreator, resourceInfo);
-
-        classCreator.close();
-        LOGGER.tracef("Completed generation of '%s'", implementationClassName);
-    }
-
-    private void implementPrivateFields(ClassCreator classCreator) {
-        classCreator.getFieldCreator(PrivateFields.URI_INFO.getName(), PrivateFields.URI_INFO.getType())
-                .setModifiers(Modifier.PRIVATE)
-                .addAnnotation(Context.class);
-    }
-
-    private void implementMethods(ClassCreator classCreator, RestDataResourceInfo resourceInfo) {
-        for (MethodImplementor methodImplementor : STANDARD_METHOD_IMPLEMENTORS) {
-            methodImplementor.implement(classCreator, index, methodPropertiesAccessor, resourceInfo);
-        }
-        if (resourcePropertiesAccessor.isHal(resourceInfo.getClassInfo())) {
-            for (MethodImplementor methodImplementor : HAL_METHOD_IMPLEMENTORS) {
-                methodImplementor.implement(classCreator, index, methodPropertiesAccessor, resourceInfo);
-            }
-        }
-    }
-
-    private void implementPrivateMethods(ClassCreator classCreator, RestDataResourceInfo resourceInfo) {
-        new IsPagedMethodImplementor(resourcePropertiesAccessor.isPaged(resourceInfo.getClassInfo()))
-                .implement(classCreator, index, methodPropertiesAccessor, resourceInfo);
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceInfo.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceInfo.java
deleted file mode 100644
index 44873d156ed63..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataResourceInfo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.quarkus.rest.data.panache.deployment;
-
-import java.util.function.Predicate;
-
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.FieldInfo;
-
-public interface RestDataResourceInfo {
-
-    ClassInfo getClassInfo();
-
-    DataAccessImplementor getDataAccessImplementor();
-
-    String getIdClassName();
-
-    String getEntityClassName();
-
-    Predicate<FieldInfo> getIdFieldPredicate();
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java
index 1cc33ed8468e6..28b7be0ee957a 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java
@@ -1,30 +1,40 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import javax.ws.rs.core.Response;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
-import org.jboss.jandex.IndexView;
+import javax.validation.Valid;
+import javax.ws.rs.core.Response;
 
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
 
 public final class AddMethodImplementor extends StandardMethodImplementor {
 
-    public static final String NAME = "add";
+    private static final String METHOD_NAME = "add";
+
+    private static final String RESOURCE_METHOD_NAME = "add";
 
     private static final String REL = "add";
 
+    private final boolean withValidation;
+
+    public AddMethodImplementor(boolean withValidation) {
+        this.withValidation = withValidation;
+    }
+
     /**
-     * Implements {@link RestDataResource#add(Object)}.
+     * Generate JAX-RS POST method that exposes {@link RestDataResource#add(Object)}.
      * Generated code looks more or less like this:
      *
      * <pre>
      * {@code
-     *     &#64;Transactional
      *     &#64;POST
      *     &#64;Path("")
      *     &#64;Consumes({"application/json"})
@@ -33,43 +43,59 @@ public final class AddMethodImplementor extends StandardMethodImplementor {
      *         rel = "add",
      *         entityClassName = "com.example.Entity"
      *     )
-     *     public Response add(Entity entity) {
-     *         entity.persist();
-     *         String location = new ResourceLinksProvider().getSelfLink(entity);
-     *         if (location != null) {
-     *             ResponseBuilder responseBuilder = Response.status(201);
-     *             responseBuilder.entity(entity);
-     *             responseBuilder.location(URI.create(location));
-     *             return responseBuilder.build();
-     *         } else {
-     *             throw new RuntimeException("Could not extract a new entity URL")
+     *     public Response add(Entity entityToSave) {
+     *         try {
+     *             Entity entity = restDataResource.add(entityToSave);
+     *             String location = new ResourceLinksProvider().getSelfLink(entity);
+     *             if (location != null) {
+     *                 ResponseBuilder responseBuilder = Response.status(201);
+     *                 responseBuilder.entity(entity);
+     *                 responseBuilder.location(URI.create(location));
+     *                 return responseBuilder.build();
+     *             } else {
+     *                 throw new RuntimeException("Could not extract a new entity URL")
+     *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodMetadata methodMetadata = getMethodMetadata(resourceInfo);
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(methodMetadata.getName(), Response.class.getName(), methodMetadata.getParameterTypes());
-        addTransactionalAnnotation(methodCreator);
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getEntityType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
         addPostAnnotation(methodCreator);
-        addPathAnnotation(methodCreator, propertiesAccessor.getPath(resourceInfo.getClassInfo(), methodMetadata));
         addConsumesAnnotation(methodCreator, APPLICATION_JSON);
         addProducesAnnotation(methodCreator, APPLICATION_JSON);
-        addLinksAnnotation(methodCreator, resourceInfo.getEntityClassName(), REL);
+        addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL);
+        // Add parameter annotations
+        if (withValidation) {
+            methodCreator.getParameterAnnotations(0).addAnnotation(Valid.class);
+        }
+
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle entityToSave = methodCreator.getMethodParam(0);
 
-        ResultHandle entity = methodCreator.getMethodParam(0);
-        resourceInfo.getDataAccessImplementor().persist(methodCreator, entity);
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to add an entity");
+        ResultHandle entity = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, Object.class, Object.class),
+                resource, entityToSave);
+        // Return response
+        tryBlock.returnValue(ResponseImplementor.created(tryBlock, entity));
 
-        methodCreator.returnValue(ResponseImplementor.created(methodCreator, entity));
+        tryBlock.close();
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(NAME, resourceInfo.getEntityClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java
index 9bd88c0a99e51..59222f0d6d818 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java
@@ -1,67 +1,87 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import org.jboss.jandex.IndexView;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import javax.ws.rs.core.Response;
 
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
 
 public final class DeleteMethodImplementor extends StandardMethodImplementor {
 
-    private static final String NAME = "delete";
+    private static final String METHOD_NAME = "delete";
+
+    private static final String RESOURCE_METHOD_NAME = "delete";
 
     private static final String REL = "remove";
 
     /**
-     * Implements {@link RestDataResource#delete(Object)}.
+     * Generate JAX-RS DELETE method that exposes {@link RestDataResource#delete(Object)}.
      * Generated code looks more or less like this:
      *
      * <pre>
      * {@code
-     *     &#64;Transactional
      *     &#64;DELETE
      *     &#64;Path("{id}")
      *     &#64;LinkResource(
      *         rel = "remove",
      *         entityClassName = "com.example.Entity"
      *     )
-     *     public void delete(@PathParam("id") ID id) {
-     *         if (!BookEntity.deleteById(id)) {
-     *             throw new WebApplicationException(404);
+     *     public Response delete(@PathParam("id") ID id) {
+     *         try {
+     *             boolean deleted = restDataResource.delete(id);
+     *             if (deleted) {
+     *                 return Response.noContent().build();
+     *             } else {
+     *                 return Response.status(404).build();
+     *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodMetadata methodMetadata = getMethodMetadata(resourceInfo);
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(methodMetadata.getName(), void.class.getName(), methodMetadata.getParameterTypes());
-        addTransactionalAnnotation(methodCreator);
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getIdType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_METHOD_NAME), "{id}"));
         addDeleteAnnotation(methodCreator);
-        addPathAnnotation(methodCreator,
-                propertiesAccessor.getPath(resourceInfo.getClassInfo(), methodMetadata, "{id}"));
         addPathParamAnnotation(methodCreator.getParameterAnnotations(0), "id");
-        addLinksAnnotation(methodCreator, resourceInfo.getEntityClassName(), REL);
+        addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL);
+
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle id = methodCreator.getMethodParam(0);
+
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to delete an entity");
+        ResultHandle deleted = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, boolean.class, Object.class),
+                resource, id);
 
-        ResultHandle result = resourceInfo.getDataAccessImplementor()
-                .deleteById(methodCreator, methodCreator.getMethodParam(0));
-        BranchResult entityWasDeleted = methodCreator.ifNonZero(result);
+        // Return response
+        BranchResult entityWasDeleted = tryBlock.ifNonZero(deleted);
+        entityWasDeleted.trueBranch().returnValue(ResponseImplementor.noContent(entityWasDeleted.trueBranch()));
+        entityWasDeleted.falseBranch().returnValue(ResponseImplementor.notFound(entityWasDeleted.falseBranch()));
 
-        entityWasDeleted.trueBranch().returnValue(null);
-        entityWasDeleted.falseBranch().throwException(ResponseImplementor.notFoundException(entityWasDeleted.falseBranch()));
+        tryBlock.close();
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(NAME, resourceInfo.getIdClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java
index 41ca18d318a9c..563acd7e2f981 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java
@@ -1,24 +1,30 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import org.jboss.jandex.IndexView;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import javax.ws.rs.core.Response;
 
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
 
 public final class GetMethodImplementor extends StandardMethodImplementor {
 
-    public static final String NAME = "get";
+    private static final String METHOD_NAME = "get";
+
+    private static final String RESOURCE_METHOD_NAME = "get";
 
     private static final String REL = "self";
 
     /**
-     * Implements {@link RestDataResource#get(Object)}.
+     * Generate JAX-RS GET method that exposes {@link RestDataResource#get(Object)}.
      * Generated code looks more or less like this:
      *
      * <pre>
@@ -30,40 +36,54 @@ public final class GetMethodImplementor extends StandardMethodImplementor {
      *         rel = "self",
      *         entityClassName = "com.example.Entity"
      *     )
-     *     public Entity get(@PathParam("id") ID id) {
-     *         Entity entity = Entity.findById(id);
-     *         if (entity != null) {
-     *             return entity;
-     *         } else {
-     *             throw new WebApplicationException(404);
+     *     public Response get(@PathParam("id") ID id) {
+     *         try {
+     *             Entity entity = restDataResource.get(id);
+     *             if (entity != null) {
+     *                 return entity;
+     *             } else {
+     *                 return Response.status(404).build();
+     *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodMetadata methodMetadata = getMethodMetadata(resourceInfo);
-        MethodCreator methodCreator = classCreator.getMethodCreator(methodMetadata.getName(), resourceInfo.getEntityClassName(),
-                methodMetadata.getParameterTypes());
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getIdType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_METHOD_NAME), "{id}"));
         addGetAnnotation(methodCreator);
         addProducesAnnotation(methodCreator, APPLICATION_JSON);
-        addPathAnnotation(methodCreator,
-                propertiesAccessor.getPath(resourceInfo.getClassInfo(), methodMetadata, "{id}"));
         addPathParamAnnotation(methodCreator.getParameterAnnotations(0), "id");
-        addLinksAnnotation(methodCreator, resourceInfo.getEntityClassName(), REL);
+        addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL);
+
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle id = methodCreator.getMethodParam(0);
+
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to get an entity");
+        ResultHandle entity = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, Object.class, Object.class),
+                resource, id);
 
-        ResultHandle entity = resourceInfo.getDataAccessImplementor().findById(methodCreator, methodCreator.getMethodParam(0));
-        BranchResult entityNotFound = methodCreator.ifNull(entity);
+        // Return response
+        BranchResult wasNotFound = tryBlock.ifNull(entity);
+        wasNotFound.trueBranch().returnValue(ResponseImplementor.notFound(wasNotFound.trueBranch()));
+        wasNotFound.falseBranch().returnValue(ResponseImplementor.ok(wasNotFound.falseBranch(), entity));
 
-        entityNotFound.trueBranch().throwException(ResponseImplementor.notFoundException(entityNotFound.trueBranch()));
-        entityNotFound.falseBranch().returnValue(entity);
+        tryBlock.close();
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(NAME, resourceInfo.getIdClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java
index e2e80045e2c6e..c6332488bb75d 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java
@@ -1,37 +1,45 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import static io.quarkus.gizmo.FieldDescriptor.of;
 import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
-import static io.quarkus.rest.data.panache.deployment.PrivateFields.URI_INFO;
-import static io.quarkus.rest.data.panache.deployment.PrivateMethods.IS_PAGED;
+import static io.quarkus.rest.data.panache.deployment.utils.PaginationImplementor.DEFAULT_PAGE_INDEX;
+import static io.quarkus.rest.data.panache.deployment.utils.PaginationImplementor.DEFAULT_PAGE_SIZE;
 
-import javax.ws.rs.core.Response;
+import java.util.List;
 
-import org.jboss.jandex.IndexView;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
-import io.quarkus.gizmo.BranchResult;
-import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
-import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.DataAccessImplementor;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.Constants;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.PaginationImplementor;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
+import io.quarkus.rest.data.panache.deployment.utils.SortImplementor;
 
 public final class ListMethodImplementor extends StandardMethodImplementor {
 
-    public static final String NAME = "list";
+    private static final String METHOD_NAME = "list";
+
+    private static final String RESOURCE_METHOD_NAME = "list";
 
     private static final String REL = "list";
 
+    private final PaginationImplementor paginationImplementor = new PaginationImplementor();
+
+    private final SortImplementor sortImplementor = new SortImplementor();
+
     /**
-     * Implements {@link RestDataResource#list()}.
-     * Generated code looks more or less like this:
+     * Generate JAX-RS GET method that exposes {@link RestDataResource#list(Page, Sort)}.
+     * Generated pseudo-code with enabled pagination is shown below. If pagination is disabled pageIndex and pageSize
+     * query parameters are skipped and null {@link Page} instance is used.
      *
      * <pre>
      * {@code
@@ -42,61 +50,110 @@ public final class ListMethodImplementor extends StandardMethodImplementor {
      *         rel = "list",
      *         entityClassName = "com.example.Entity"
      *     )
-     *     public Response list() {
-     *         if (this.isPaged()) {
-     *            Page page = ...; // Extract page index and size from a UriInfo field and create a page instance.
-     *            PanacheQuery query = Entity.findAll();
-     *            query.page(page);
-     *            // Get the page count, and build first, last, next, previous page instances
-     *            Response.ResponseBuilder responseBuilder = Response.status(200);
-     *            responseBuilder.entity(query.list());
-     *            // Add headers with first, last, next and previous page URIs if they exist
-     *            return responseBuilder.build();
-     *         } else {
-     *             return Response.ok(Entity.listAll()).build();
+     *     public Response list(@QueryParam("page") @DefaultValue("0") int pageIndex,
+     *             &#64;QueryParam("size") @DefaultValue("20") int pageSize,
+     *             &#64;QueryParam("sort") String sortQuery) {
+     *         Page page = Page.of(pageIndex, pageSize);
+     *         Sort sort = ...; // Build a sort instance by parsing a query param
+     *         try {
+     *             List<Entity> entities = resource.getAll(page, sort);
+     *             // Get the page count, and build first, last, next, previous page instances
+     *             Response.ResponseBuilder responseBuilder = Response.status(200);
+     *             responseBuilder.entity(entities);
+     *             // Add headers with first, last, next and previous page URIs if they exist
+     *             return responseBuilder.build();
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodMetadata methodMetadata = getMethodMetadata(resourceInfo);
-        MethodCreator methodCreator = classCreator.getMethodCreator(methodMetadata.getName(), Response.class);
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        if (resourceProperties.isPaged()) {
+            implementPaged(classCreator, resourceMetadata, resourceProperties, resourceField);
+        } else {
+            implementNotPaged(classCreator, resourceMetadata, resourceProperties, resourceField);
+        }
+    }
+
+    @Override
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
+    }
+
+    private void implementPaged(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        // Method parameters: sort strings, page index, page size, uri info
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class, List.class, int.class,
+                int.class, UriInfo.class);
+
+        // Add method annotations
         addGetAnnotation(methodCreator);
-        addPathAnnotation(methodCreator, propertiesAccessor.getPath(resourceInfo.getClassInfo(), methodMetadata));
+        addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
         addProducesAnnotation(methodCreator, APPLICATION_JSON);
-        addLinksAnnotation(methodCreator, resourceInfo.getEntityClassName(), REL);
+        addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL);
+        addSortQueryParamValidatorAnnotation(methodCreator);
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(0), "sort");
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(1), "page");
+        addDefaultValueAnnotation(methodCreator.getParameterAnnotations(1), Integer.toString(DEFAULT_PAGE_INDEX));
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(2), "size");
+        addDefaultValueAnnotation(methodCreator.getParameterAnnotations(2), Integer.toString(DEFAULT_PAGE_SIZE));
+        addContextAnnotation(methodCreator.getParameterAnnotations(3));
 
-        FieldDescriptor uriInfoField = of(methodCreator.getMethodDescriptor().getDeclaringClass(), URI_INFO.getName(),
-                URI_INFO.getType());
-        MethodDescriptor isPagedMethod = ofMethod(methodCreator.getMethodDescriptor().getDeclaringClass(), IS_PAGED.getName(),
-                IS_PAGED.getType(), IS_PAGED.getParams());
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle sortQuery = methodCreator.getMethodParam(0);
+        ResultHandle sort = sortImplementor.getSort(methodCreator, sortQuery);
+        ResultHandle pageIndex = methodCreator.getMethodParam(1);
+        ResultHandle pageSize = methodCreator.getMethodParam(2);
+        ResultHandle page = paginationImplementor.getPage(methodCreator, pageIndex, pageSize);
+        ResultHandle uriInfo = methodCreator.getMethodParam(3);
 
-        BranchResult isPaged = methodCreator.ifTrue(methodCreator.invokeVirtualMethod(isPagedMethod, methodCreator.getThis()));
-        returnPaged(isPaged.trueBranch(), resourceInfo.getDataAccessImplementor(), uriInfoField);
-        returnNotPaged(isPaged.falseBranch(), resourceInfo.getDataAccessImplementor());
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to list the entities");
+        ResultHandle pageCount = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), Constants.PAGE_COUNT_METHOD_PREFIX + RESOURCE_METHOD_NAME,
+                        int.class, Page.class),
+                resource, page);
+        ResultHandle links = paginationImplementor.getLinks(tryBlock, uriInfo, page, pageCount);
+        ResultHandle entities = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, List.class, Page.class, Sort.class),
+                resource, page, sort);
+
+        // Return response
+        tryBlock.returnValue(ResponseImplementor.ok(tryBlock, entities, links));
+
+        tryBlock.close();
         methodCreator.close();
     }
 
-    @Override
-    protected MethodMetadata getMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(NAME);
-    }
+    private void implementNotPaged(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceFieldDescriptor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class, List.class);
+
+        // Add method annotations
+        addGetAnnotation(methodCreator);
+        addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
+        addProducesAnnotation(methodCreator, APPLICATION_JSON);
+        addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL);
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(0), "sort");
 
-    private void returnPaged(BytecodeCreator creator, DataAccessImplementor dataAccessImplementor,
-            FieldDescriptor uriInfoField) {
-        ResultHandle uriInfo = creator.readInstanceField(uriInfoField, creator.getThis());
-        ResultHandle page = PaginationImplementor.getRequestPage(creator, uriInfo);
-        ResultHandle pageCount = dataAccessImplementor.pageCount(creator, page);
-        ResultHandle links = PaginationImplementor.getLinks(creator, uriInfo, page, pageCount);
-        ResultHandle entities = dataAccessImplementor.findAll(creator, page);
+        ResultHandle sortQuery = methodCreator.getMethodParam(0);
+        ResultHandle sort = sortImplementor.getSort(methodCreator, sortQuery);
+        ResultHandle resource = methodCreator.readInstanceField(resourceFieldDescriptor, methodCreator.getThis());
 
-        creator.returnValue(ResponseImplementor.ok(creator, entities, links));
-    }
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to list the entities");
+        ResultHandle entities = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, List.class, Page.class, Sort.class),
+                resource, tryBlock.loadNull(), sort);
 
-    private void returnNotPaged(BytecodeCreator creator, DataAccessImplementor dataAccessImplementor) {
-        creator.returnValue(ResponseImplementor.ok(creator, dataAccessImplementor.listAll(creator)));
+        // Return response
+        tryBlock.returnValue(ResponseImplementor.ok(tryBlock, entities));
+
+        tryBlock.close();
+        methodCreator.close();
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodImplementor.java
index c5c17ef1a6c14..f82e8c8e019b6 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodImplementor.java
@@ -1,72 +1,22 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import javax.transaction.Transactional;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.jboss.jandex.IndexView;
-import org.jboss.resteasy.links.LinkResource;
-
-import io.quarkus.gizmo.AnnotatedElement;
-import io.quarkus.gizmo.AnnotationCreator;
 import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 
+/**
+ * JAX-RS method implementor.
+ */
 public interface MethodImplementor {
 
     String APPLICATION_JSON = "application/json";
 
     String APPLICATION_HAL_JSON = "application/hal+json";
 
-    void implement(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo);
-
-    default void addTransactionalAnnotation(AnnotatedElement element) {
-        element.addAnnotation(Transactional.class);
-    }
-
-    default void addGetAnnotation(AnnotatedElement element) {
-        element.addAnnotation(GET.class);
-    }
-
-    default void addPostAnnotation(AnnotatedElement element) {
-        element.addAnnotation(POST.class);
-    }
-
-    default void addPutAnnotation(AnnotatedElement element) {
-        element.addAnnotation(PUT.class);
-    }
-
-    default void addDeleteAnnotation(AnnotatedElement element) {
-        element.addAnnotation(DELETE.class);
-    }
-
-    default void addLinksAnnotation(AnnotatedElement element, String type, String rel) {
-        AnnotationCreator linkResource = element.addAnnotation(LinkResource.class);
-        linkResource.addValue("entityClassName", type);
-        linkResource.addValue("rel", rel);
-    }
-
-    default void addPathAnnotation(AnnotatedElement element, String value) {
-        element.addAnnotation(Path.class).addValue("value", value);
-    }
-
-    default void addPathParamAnnotation(AnnotatedElement element, String value) {
-        element.addAnnotation(PathParam.class).addValue("value", value);
-    }
-
-    default void addProducesAnnotation(AnnotatedElement element, String... mediaTypes) {
-        element.addAnnotation(Produces.class).addValue("value", mediaTypes);
-    }
-
-    default void addConsumesAnnotation(AnnotatedElement element, String... mediaTypes) {
-        element.addAnnotation(Consumes.class).addValue("value", mediaTypes);
-    }
+    /**
+     * Implement a specific JAX-RS method using the provided resource metadata.
+     */
+    void implement(ClassCreator classCreator, ResourceMetadata resourceMetadata, ResourceProperties resourceProperties,
+            FieldDescriptor resourceField);
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodMetadata.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodMetadata.java
deleted file mode 100644
index 9fa48926e1968..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/MethodMetadata.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.quarkus.rest.data.panache.deployment.methods;
-
-public final class MethodMetadata {
-
-    private final String name;
-
-    private final String[] parameterTypes;
-
-    public MethodMetadata(String name, String... parameterTypes) {
-        this.name = name;
-        this.parameterTypes = parameterTypes;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String[] getParameterTypes() {
-        return parameterTypes;
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/NotExposedMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/NotExposedMethodImplementor.java
deleted file mode 100644
index 72fbdd438c56b..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/NotExposedMethodImplementor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.quarkus.rest.data.panache.deployment.methods;
-
-import javax.ws.rs.core.Response;
-
-import org.jboss.jandex.IndexView;
-
-import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.gizmo.MethodCreator;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
-
-final class NotExposedMethodImplementor implements MethodImplementor {
-
-    private final MethodMetadata methodMetadata;
-
-    public NotExposedMethodImplementor(MethodMetadata methodMetadata) {
-        this.methodMetadata = methodMetadata;
-    }
-
-    @Override
-    public void implement(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor accessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(methodMetadata.getName(), Response.class.getName(), methodMetadata.getParameterTypes());
-        methodCreator
-                .throwException(RuntimeException.class, String.format("'%s' method is not exposed", methodMetadata.getName()));
-        methodCreator.close();
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
index ce801586a20b9..bc2c937f65c19 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
@@ -1,28 +1,127 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import org.jboss.jandex.IndexView;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
 
+import org.jboss.resteasy.links.LinkResource;
+
+import io.quarkus.gizmo.AnnotatedElement;
+import io.quarkus.gizmo.AnnotationCreator;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.TryBlock;
+import io.quarkus.rest.data.panache.RestDataPanacheException;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
+import io.quarkus.rest.data.panache.runtime.sort.SortQueryParamValidator;
 
-abstract class StandardMethodImplementor implements MethodImplementor {
+/**
+ * A standard JAX-RS method implementor.
+ */
+public abstract class StandardMethodImplementor implements MethodImplementor {
 
+    /**
+     * Implement exposed JAX-RS method.
+     */
     @Override
-    public void implement(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodMetadata methodMetadata = getMethodMetadata(resourceInfo);
-        if (propertiesAccessor.isExposed(resourceInfo.getClassInfo(), methodMetadata)) {
-            implementInternal(classCreator, index, propertiesAccessor, resourceInfo);
-        } else {
-            NotExposedMethodImplementor implementor = new NotExposedMethodImplementor(methodMetadata);
-            implementor.implement(classCreator, index, propertiesAccessor, resourceInfo);
+    public void implement(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        if (resourceProperties.isExposed(getResourceMethodName())) {
+            implementInternal(classCreator, resourceMetadata, resourceProperties, resourceField);
         }
     }
 
-    protected abstract void implementInternal(ClassCreator classCreator, IndexView index,
-            MethodPropertiesAccessor propertiesAccessor, RestDataResourceInfo resourceInfo);
+    /**
+     * Implement the actual JAX-RS method logic.
+     */
+    protected abstract void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField);
+
+    /**
+     * Get a name of a method which this controller uses to access data.
+     */
+    protected abstract String getResourceMethodName();
+
+    protected TryBlock implementTryBlock(BytecodeCreator bytecodeCreator, String message) {
+        TryBlock tryBlock = bytecodeCreator.tryBlock();
+        CatchBlockCreator catchBlock = tryBlock.addCatch(Throwable.class);
+        catchBlock.throwException(RestDataPanacheException.class, message, catchBlock.getCaughtException());
+        catchBlock.close();
+        return tryBlock;
+    }
+
+    protected void addGetAnnotation(AnnotatedElement element) {
+        element.addAnnotation(GET.class);
+    }
+
+    protected void addPostAnnotation(AnnotatedElement element) {
+        element.addAnnotation(POST.class);
+    }
+
+    protected void addPutAnnotation(AnnotatedElement element) {
+        element.addAnnotation(PUT.class);
+    }
+
+    protected void addDeleteAnnotation(AnnotatedElement element) {
+        element.addAnnotation(DELETE.class);
+    }
+
+    protected void addLinksAnnotation(AnnotatedElement element, String entityClassName, String rel) {
+        AnnotationCreator linkResource = element.addAnnotation(LinkResource.class);
+        linkResource.addValue("entityClassName", entityClassName);
+        linkResource.addValue("rel", rel);
+    }
+
+    protected void addPathAnnotation(AnnotatedElement element, String value) {
+        element.addAnnotation(Path.class).addValue("value", value);
+    }
+
+    protected void addPathParamAnnotation(AnnotatedElement element, String value) {
+        element.addAnnotation(PathParam.class).addValue("value", value);
+    }
+
+    protected void addQueryParamAnnotation(AnnotatedElement element, String value) {
+        element.addAnnotation(QueryParam.class).addValue("value", value);
+    }
+
+    protected void addDefaultValueAnnotation(AnnotatedElement element, String value) {
+        element.addAnnotation(DefaultValue.class).addValue("value", value);
+    }
+
+    protected void addProducesAnnotation(AnnotatedElement element, String... mediaTypes) {
+        element.addAnnotation(Produces.class).addValue("value", mediaTypes);
+    }
+
+    protected void addConsumesAnnotation(AnnotatedElement element, String... mediaTypes) {
+        element.addAnnotation(Consumes.class).addValue("value", mediaTypes);
+    }
+
+    protected void addContextAnnotation(AnnotatedElement element) {
+        element.addAnnotation(Context.class);
+    }
 
-    protected abstract MethodMetadata getMethodMetadata(RestDataResourceInfo resourceInfo);
+    protected void addSortQueryParamValidatorAnnotation(AnnotatedElement element) {
+        element.addAnnotation(SortQueryParamValidator.class);
+    }
 
+    protected String appendToPath(String path, String suffix) {
+        if (path.endsWith("/")) {
+            path = path.substring(0, path.lastIndexOf("/"));
+        }
+        if (suffix.startsWith("/")) {
+            suffix = suffix.substring(1);
+        }
+        return String.join("/", path, suffix);
+    }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java
index 60c3c5ce8a8ef..3034803a13a5b 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java
@@ -1,33 +1,54 @@
 package io.quarkus.rest.data.panache.deployment.methods;
 
-import javax.ws.rs.core.Response;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.lang.annotation.Annotation;
+import java.util.function.Supplier;
 
-import org.jboss.jandex.IndexView;
+import javax.validation.Valid;
+import javax.ws.rs.core.Response;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.FunctionCreator;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
-import io.quarkus.rest.data.panache.deployment.utils.FieldAccessImplementor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
+import io.quarkus.rest.data.panache.runtime.jta.TransactionalExecutor;
 
 public final class UpdateMethodImplementor extends StandardMethodImplementor {
 
-    public static final String NAME = "update";
+    private static final String METHOD_NAME = "update";
+
+    private static final String RESOURCE_UPDATE_METHOD_NAME = "update";
+
+    private static final String RESOURCE_GET_METHOD_NAME = "get";
 
     private static final String REL = "update";
 
+    private final boolean withValidation;
+
+    public UpdateMethodImplementor(boolean withValidation) {
+        this.withValidation = withValidation;
+    }
+
     /**
-     * Implements {@link RestDataResource#update(Object, Object)}.
+     * Generate JAX-RS UPDATE method that exposes {@link RestDataResource#update(Object, Object)}.
+     * Expose {@link RestDataResource#update(Object, Object)} via JAX-RS method.
      * Generated code looks more or less like this:
      *
      * <pre>
      * {@code
-     *     &#64;Transactional
      *     &#64;PUT
      *     &#64;Path("{id}")
      *     &#64;Consumes({"application/json"})
@@ -36,71 +57,134 @@ public final class UpdateMethodImplementor extends StandardMethodImplementor {
      *         rel = "update",
      *         entityClassName = "com.example.Entity"
      *     )
-     *     public Response update(@PathParam("id") ID id, Entity entity) {
-     *         if (BookEntity.findById(id) != null) {
-     *             entity.id = id;
-     *             JpaOperations.getEntityManager().merge(entity);
-     *             return Response.status(204).build();
-     *         } else {
-     *             entity.id = id;
-     *             Entity newEntity = JpaOperations.getEntityManager().merge(entity);
-     *             String location = new ResourceLinksProvider().getSelfLink(newEntity);
-     *             if (location != null) {
-     *                 ResponseBuilder responseBuilder = Response.status(201);
-     *                 responseBuilder.entity(entity);
-     *                 responseBuilder.location(URI.create(location));
-     *                 return responseBuilder.build();
+     *     public Response update(@PathParam("id") ID id, Entity entityToSave) {
+     *         try {
+     *             Object newEntity = transactionalExecutor.execute(() -> {
+     *                 if (resource.get(id) == null) {
+     *                     return resource.update(id, entityToSave);
+     *                 } else {
+     *                     resource.update(id, entityToSave);
+     *                     return null;
+     *                 }
+     *             });
+     *
+     *             if (newEntity == null) {
+     *                 return Response.status(204).build();
      *             } else {
-     *                 throw new RuntimeException("Could not extract a new entity URL")
+     *                 String location = new ResourceLinksProvider().getSelfLink(newEntity);
+     *                 if (location != null) {
+     *                     ResponseBuilder responseBuilder = Response.status(201);
+     *                     responseBuilder.entity(newEntity);
+     *                     responseBuilder.location(URI.create(location));
+     *                     return responseBuilder.build();
+     *                 } else {
+     *                     throw new RuntimeException("Could not extract a new entity URL")
+     *                 }
      *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodMetadata methodMetadata = getMethodMetadata(resourceInfo);
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(methodMetadata.getName(), Response.class.getName(), methodMetadata.getParameterTypes());
-        addTransactionalAnnotation(methodCreator);
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getIdType(), resourceMetadata.getEntityType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_UPDATE_METHOD_NAME), "{id}"));
         addPutAnnotation(methodCreator);
-        addPathAnnotation(methodCreator,
-                propertiesAccessor.getPath(resourceInfo.getClassInfo(), methodMetadata, "{id}"));
         addPathParamAnnotation(methodCreator.getParameterAnnotations(0), "id");
         addConsumesAnnotation(methodCreator, APPLICATION_JSON);
         addProducesAnnotation(methodCreator, APPLICATION_JSON);
-        addLinksAnnotation(methodCreator, resourceInfo.getEntityClassName(), REL);
+        addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL);
+        // Add parameter annotations
+        if (withValidation) {
+            methodCreator.getParameterAnnotations(1).addAnnotation(Valid.class);
+        }
 
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
         ResultHandle id = methodCreator.getMethodParam(0);
-        ResultHandle entity = methodCreator.getMethodParam(1);
-        BranchResult entityDoesNotExist = methodCreator
-                .ifNull(resourceInfo.getDataAccessImplementor().findById(methodCreator, id));
+        ResultHandle entityToSave = methodCreator.getMethodParam(1);
+
+        // Invoke resource methods inside a supplier function which will be given to a transactional executor to make
+        // sure that all database operations are executed in a single transaction.
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to update an entity");
+        ResultHandle transactionalExecutor = getTransactionalExecutor(tryBlock);
+        ResultHandle updateFunction = getUpdateFunction(tryBlock, resourceMetadata.getResourceClass(), resource, id,
+                entityToSave);
+        ResultHandle newEntity = tryBlock.invokeVirtualMethod(
+                ofMethod(TransactionalExecutor.class, "execute", Object.class, Supplier.class),
+                transactionalExecutor, updateFunction);
+
+        BranchResult createdNewEntity = tryBlock.ifNotNull(newEntity);
+        createdNewEntity.trueBranch()
+                .returnValue(ResponseImplementor.created(createdNewEntity.trueBranch(), newEntity));
+        createdNewEntity.falseBranch().returnValue(ResponseImplementor.noContent(createdNewEntity.falseBranch()));
 
-        FieldAccessImplementor fieldAccessImplementor = new FieldAccessImplementor(index, resourceInfo.getIdFieldPredicate());
-        createAndReturn(entityDoesNotExist.trueBranch(), fieldAccessImplementor, resourceInfo, entity, id);
-        updateAndReturn(entityDoesNotExist.falseBranch(), fieldAccessImplementor, resourceInfo, entity, id);
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(NAME, resourceInfo.getIdClassName(), resourceInfo.getEntityClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_UPDATE_METHOD_NAME;
     }
 
-    private void createAndReturn(BytecodeCreator creator, FieldAccessImplementor fieldAccessImplementor,
-            RestDataResourceInfo resourceInfo, ResultHandle entity, ResultHandle id) {
-        fieldAccessImplementor.setId(creator, resourceInfo.getEntityClassName(), entity, id);
-        ResultHandle newEntity = resourceInfo.getDataAccessImplementor().update(creator, entity);
-        ResultHandle response = ResponseImplementor.created(creator, newEntity);
-        creator.returnValue(response);
+    private ResultHandle getUpdateFunction(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id, ResultHandle entity) {
+        FunctionCreator functionCreator = creator.createFunction(Supplier.class);
+        BytecodeCreator functionBytecodeCreator = functionCreator.getBytecode();
+
+        AssignableResultHandle entityToSave = functionBytecodeCreator.createVariable(Object.class);
+        functionBytecodeCreator.assign(entityToSave, entity);
+
+        BranchResult shouldUpdate = entityExists(functionBytecodeCreator, resourceClass, resource, id);
+        // Update and return null
+        updateAndReturn(shouldUpdate.trueBranch(), resourceClass, resource, id, entityToSave);
+        // Update and return new entity
+        createAndReturn(shouldUpdate.falseBranch(), resourceClass, resource, id, entityToSave);
+
+        return functionCreator.getInstance();
     }
 
-    private void updateAndReturn(BytecodeCreator creator, FieldAccessImplementor fieldAccessImplementor,
-            RestDataResourceInfo resourceInfo, ResultHandle entity, ResultHandle id) {
-        fieldAccessImplementor.setId(creator, resourceInfo.getEntityClassName(), entity, id);
-        resourceInfo.getDataAccessImplementor().update(creator, entity);
-        creator.returnValue(ResponseImplementor.noContent(creator));
+    private BranchResult entityExists(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id) {
+        return creator.ifNotNull(creator.invokeVirtualMethod(
+                ofMethod(resourceClass, RESOURCE_GET_METHOD_NAME, Object.class, Object.class), resource, id));
+    }
+
+    private void createAndReturn(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id, ResultHandle entityToSave) {
+        ResultHandle newEntity = creator.invokeVirtualMethod(
+                ofMethod(resourceClass, RESOURCE_UPDATE_METHOD_NAME, Object.class, Object.class, Object.class),
+                resource, id, entityToSave);
+        creator.returnValue(newEntity);
+    }
+
+    private void updateAndReturn(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id, ResultHandle entityToSave) {
+        creator.invokeVirtualMethod(
+                ofMethod(resourceClass, RESOURCE_UPDATE_METHOD_NAME, Object.class, Object.class, Object.class),
+                resource, id, entityToSave);
+        creator.returnValue(creator.loadNull());
+    }
+
+    private ResultHandle getTransactionalExecutor(BytecodeCreator creator) {
+        ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class));
+        ResultHandle instanceHandle = creator.invokeInterfaceMethod(
+                ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class),
+                arcContainer, creator.loadClass(TransactionalExecutor.class), creator.newArray(Annotation.class, 0));
+        ResultHandle instance = creator.invokeInterfaceMethod(
+                ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle);
+
+        creator.ifNull(instance)
+                .trueBranch()
+                .throwException(RuntimeException.class,
+                        TransactionalExecutor.class.getSimpleName() + " instance was not found");
+
+        return instance;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java
index e8398067251f9..4e12f49b9ac5b 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java
@@ -1,72 +1,97 @@
 package io.quarkus.rest.data.panache.deployment.methods.hal;
 
-import javax.ws.rs.core.Response;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
-import org.jboss.jandex.IndexView;
+import javax.validation.Valid;
+import javax.ws.rs.core.Response;
 
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.methods.AddMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodMetadata;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
 
 public final class AddHalMethodImplementor extends HalMethodImplementor {
 
-    private static final String NAME = "addHal";
+    private static final String METHOD_NAME = "addHal";
+
+    private static final String RESOURCE_METHOD_NAME = "add";
+
+    private final boolean withValidation;
+
+    public AddHalMethodImplementor(boolean withValidation) {
+        this.withValidation = withValidation;
+    }
 
     /**
-     * Implements HAL version of {@link RestDataResource#add(Object)}.
+     * Expose {@link RestDataResource#add(Object)} via HAL JAX-RS method.
      * Generated code looks more or less like this:
      *
      * <pre>
      * {@code
-     *     &#64;Transactional
      *     &#64;POST
      *     &#64;Path("")
      *     &#64;Consumes({"application/json"})
      *     &#64;Produces({"application/hal+json"})
-     *     public Response addHal(Entity entity) {
-     *         entity.persist();
-     *         HalEntityWrapper wrapper = new HalEntityWrapper(entity);
-     *         String location = new ResourceLinksProvider().getSelfLink(entity);
-     *         if (location != null) {
-     *             ResponseBuilder responseBuilder = Response.status(201);
-     *             responseBuilder.entity(wrapper);
-     *             responseBuilder.location(URI.create(location));
-     *             return responseBuilder.build();
-     *         } else {
-     *             throw new RuntimeException("Could not extract a new entity URL")
+     *     public Response addHal(Entity entityToSave) {
+     *         try {
+     *             Entity entity = resource.add(entityToSave);
+     *             HalEntityWrapper wrapper = new HalEntityWrapper(entity);
+     *             String location = new ResourceLinksProvider().getSelfLink(entity);
+     *             if (location != null) {
+     *                 ResponseBuilder responseBuilder = Response.status(201);
+     *                 responseBuilder.entity(wrapper);
+     *                 responseBuilder.location(URI.create(location));
+     *                 return responseBuilder.build();
+     *             } else {
+     *                 throw new RuntimeException("Could not extract a new entity URL");
+     *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(NAME, Response.class.getName(), resourceInfo.getEntityClassName());
-        addTransactionalAnnotation(methodCreator);
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getEntityType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
         addPostAnnotation(methodCreator);
-        addPathAnnotation(methodCreator,
-                propertiesAccessor.getPath(resourceInfo.getClassInfo(), getStandardMethodMetadata(resourceInfo)));
         addConsumesAnnotation(methodCreator, APPLICATION_JSON);
         addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON);
+        // Add parameter annotations
+        if (withValidation) {
+            methodCreator.getParameterAnnotations(0).addAnnotation(Valid.class);
+        }
+
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle entityToSave = methodCreator.getMethodParam(0);
+
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to add an entity");
+        ResultHandle entity = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, Object.class, Object.class),
+                resource, entityToSave);
 
-        ResultHandle entity = methodCreator.getMethodParam(0);
-        resourceInfo.getDataAccessImplementor().persist(methodCreator, entity);
+        // Wrap and return response
+        tryBlock.returnValue(ResponseImplementor.created(tryBlock, wrapHalEntity(tryBlock, entity),
+                ResponseImplementor.getEntityUrl(tryBlock, entity)));
 
-        methodCreator.returnValue(ResponseImplementor.created(methodCreator, wrapHalEntity(methodCreator, entity),
-                ResponseImplementor.getEntityUrl(methodCreator, entity)));
+        tryBlock.close();
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getStandardMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(AddMethodImplementor.NAME, resourceInfo.getEntityClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/GetHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/GetHalMethodImplementor.java
index e97a545d8c98d..8d457e5d49d44 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/GetHalMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/GetHalMethodImplementor.java
@@ -1,26 +1,29 @@
 package io.quarkus.rest.data.panache.deployment.methods.hal;
 
-import org.jboss.jandex.IndexView;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import javax.ws.rs.core.Response;
 
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.methods.GetMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodMetadata;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
 import io.quarkus.rest.data.panache.runtime.hal.HalEntityWrapper;
 
 public final class GetHalMethodImplementor extends HalMethodImplementor {
 
-    private static final String NAME = "getHal";
+    private static final String METHOD_NAME = "getHal";
+
+    private static final String RESOURCE_METHOD_NAME = "get";
 
     /**
-     * Implements HAL version of {@link RestDataResource#get(Object)}.
+     * Expose {@link RestDataResource#get(Object)} via HAL JAX-RS method.
      * Generated code looks more or less like this:
      *
      * <pre>
@@ -28,38 +31,54 @@ public final class GetHalMethodImplementor extends HalMethodImplementor {
      *     &#64;GET
      *     &#64;Produces({"application/hal+json"})
      *     &#64;Path("{id}")
-     *     public HalEntityWrapper getHal(@PathParam("id") ID id) {
-     *         PanacheEntityBase entity = BookEntity.findById(id);
-     *         if (entity != null) {
-     *             return new HalEntityWrapper(entity);
-     *         } else {
-     *             throw new WebApplicationException(404);
+     *     public Response getHal(@PathParam("id") ID id) {
+     *         try {
+     *             Entity entity = resource.get(id);
+     *             if (entity != null) {
+     *                 return Response.ok(new HalEntityWrapper(entity)).build();
+     *             } else {
+     *                 return Response.status(404).build();
+     *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(NAME, HalEntityWrapper.class.getName(), resourceInfo.getIdClassName());
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getIdType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_METHOD_NAME), "{id}"));
         addGetAnnotation(methodCreator);
-        addProducesAnnotation(methodCreator, MethodImplementor.APPLICATION_HAL_JSON);
-        addPathAnnotation(methodCreator, propertiesAccessor
-                .getPath(resourceInfo.getClassInfo(), getStandardMethodMetadata(resourceInfo), "{id}"));
+        addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON);
         addPathParamAnnotation(methodCreator.getParameterAnnotations(0), "id");
 
-        ResultHandle entity = resourceInfo.getDataAccessImplementor().findById(methodCreator, methodCreator.getMethodParam(0));
-        BranchResult entityNotFound = methodCreator.ifNull(entity);
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle id = methodCreator.getMethodParam(0);
+
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to get an entity");
+        ResultHandle entity = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, Object.class, Object.class),
+                resource, id);
+
+        // Wrap and return response
+        BranchResult wasNotFound = tryBlock.ifNull(entity);
+        wasNotFound.trueBranch().returnValue(ResponseImplementor.notFound(wasNotFound.trueBranch()));
+        wasNotFound.falseBranch().returnValue(
+                ResponseImplementor.ok(wasNotFound.falseBranch(), wrapHalEntity(wasNotFound.falseBranch(), entity)));
 
-        entityNotFound.trueBranch().throwException(ResponseImplementor.notFoundException(entityNotFound.trueBranch()));
-        entityNotFound.falseBranch().returnValue(wrapHalEntity(entityNotFound.falseBranch(), entity));
+        tryBlock.close();
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getStandardMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(GetMethodImplementor.NAME, resourceInfo.getIdClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java
index 28830de03a347..268fbc2ccf7b9 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/HalMethodImplementor.java
@@ -2,43 +2,42 @@
 
 import java.util.Collection;
 
-import org.jboss.jandex.IndexView;
-
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodMetadata;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
-import io.quarkus.rest.data.panache.deployment.utils.ResourceName;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.methods.StandardMethodImplementor;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.runtime.hal.HalCollectionWrapper;
 import io.quarkus.rest.data.panache.runtime.hal.HalEntityWrapper;
 
-abstract class HalMethodImplementor implements MethodImplementor {
+/**
+ * HAL JAX-RS method implementor.
+ */
+abstract class HalMethodImplementor extends StandardMethodImplementor {
 
+    /**
+     * Implement a method if it is exposed and hal is enabled.
+     */
     @Override
-    public void implement(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        if (propertiesAccessor.isExposed(resourceInfo.getClassInfo(), getStandardMethodMetadata(resourceInfo))) {
-            implementInternal(classCreator, index, propertiesAccessor, resourceInfo);
+    public void implement(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        if (resourceProperties.isHal() && resourceProperties.isExposed(getResourceMethodName())) {
+            implementInternal(classCreator, resourceMetadata, resourceProperties, resourceField);
         }
     }
 
-    protected abstract void implementInternal(ClassCreator classCreator, IndexView index,
-            MethodPropertiesAccessor propertiesAccessor, RestDataResourceInfo resourceInfo);
-
-    protected abstract MethodMetadata getStandardMethodMetadata(RestDataResourceInfo resourceInfo);
-
     protected ResultHandle wrapHalEntity(BytecodeCreator creator, ResultHandle entity) {
         return creator.newInstance(MethodDescriptor.ofConstructor(HalEntityWrapper.class, Object.class), entity);
     }
 
-    protected ResultHandle wrapHalEntities(BytecodeCreator creator, ResultHandle entities, RestDataResourceInfo resourceInfo) {
-        String collectionName = ResourceName.fromClass(resourceInfo.getClassInfo().simpleName());
+    protected ResultHandle wrapHalEntities(BytecodeCreator creator, ResultHandle entities, String entityType,
+            String collectionName) {
         return creator.newInstance(
                 MethodDescriptor.ofConstructor(HalCollectionWrapper.class, Collection.class, Class.class, String.class),
-                entities, creator.loadClass(resourceInfo.getEntityClassName()), creator.load(collectionName));
+                entities, creator.loadClass(entityType),
+                creator.load(collectionName));
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java
index 58c3674250766..6f15a3d6b7860 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java
@@ -1,105 +1,161 @@
 package io.quarkus.rest.data.panache.deployment.methods.hal;
 
-import static io.quarkus.gizmo.FieldDescriptor.of;
 import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
-import static io.quarkus.rest.data.panache.deployment.PrivateFields.URI_INFO;
-import static io.quarkus.rest.data.panache.deployment.PrivateMethods.IS_PAGED;
+import static io.quarkus.rest.data.panache.deployment.utils.PaginationImplementor.DEFAULT_PAGE_INDEX;
+import static io.quarkus.rest.data.panache.deployment.utils.PaginationImplementor.DEFAULT_PAGE_SIZE;
+
+import java.util.List;
 
 import javax.ws.rs.core.Link;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 
-import org.jboss.jandex.IndexView;
-
-import io.quarkus.gizmo.BranchResult;
-import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
-import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.methods.ListMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodMetadata;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
+import io.quarkus.rest.data.panache.deployment.Constants;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.PaginationImplementor;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
+import io.quarkus.rest.data.panache.deployment.utils.SortImplementor;
 import io.quarkus.rest.data.panache.runtime.hal.HalCollectionWrapper;
 
 public final class ListHalMethodImplementor extends HalMethodImplementor {
 
-    private static final String NAME = "listHal";
+    private static final String METHOD_NAME = "listHal";
+
+    private static final String RESOURCE_METHOD_NAME = "list";
+
+    private final PaginationImplementor paginationImplementor = new PaginationImplementor();
+
+    private final SortImplementor sortImplementor = new SortImplementor();
 
     /**
-     * Implements HAL version of {@link RestDataResource#list()}.
-     * Generated code looks more or less like this:
+     * Expose {@link RestDataResource#list(Page, Sort)} via HAL JAX-RS method.
+     * Generated pseudo-code with enabled pagination is shown below. If pagination is disabled pageIndex and pageSize
+     * query parameters are skipped and null {@link Page} instance is used.
      *
      * <pre>
      * {@code
      *     &#64;GET
      *     &#64;Path("")
      *     &#64;Produces({"application/hal+json"})
-     *     public Response listHal() {
-     *         if (this.isPaged()) {
-     *            Page page = ...; // Extract page index and size from a UriInfo field and create a page instance.
-     *            PanacheQuery query = Entity.findAll();
-     *            query.page(page);
-     *            List entities = query.list();
-     *            // Get the page count, and build first, last, next, previous page instances
-     *            HalCollectionWrapper wrapper = new HalCollectionWrapper(entities, Entity.class, "entities");
-     *            // Add first, last, next and previous page URIs to the wrapper if they exist
-     *            Response.ResponseBuilder responseBuilder = Response.status(200);
-     *            responseBuilder.entity(wrapper);
-     *            // Add headers with first, last, next and previous page URIs if they exist
-     *            return responseBuilder.build();
-     *         } else {
-     *             List entities = Entity.listAll();
-     *             return Response.ok(new HalCollectionWrapper(entities, Entity.class, "entities")).build();
+     *     public Response listHal(@QueryParam("page") @DefaultValue("0") int pageIndex,
+     *             &#64;QueryParam("size") @DefaultValue("20") int pageSize,
+     *             &#64;QueryParam("sort") String sortQuery) {
+     *         Page page = Page.of(pageIndex, pageSize);
+     *         Sort sort = ...; // Build a sort instance by parsing a query param
+     *         try {
+     *             List<Entity> entities = resource.getAll(page, sort);
+     *             // Get the page count, and build first, last, next, previous page instances
+     *             HalCollectionWrapper wrapper = new HalCollectionWrapper(entities, Entity.class, "entities");
+     *             // Add first, last, next and previous page URIs to the wrapper if they exist
+     *             Response.ResponseBuilder responseBuilder = Response.status(200);
+     *             responseBuilder.entity(wrapper);
+     *             // Add headers with first, last, next and previous page URIs if they exist
+     *             return responseBuilder.build();
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
-     *     }
+     *    }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodCreator methodCreator = classCreator.getMethodCreator(NAME, Response.class);
-        addGetAnnotation(methodCreator);
-        addPathAnnotation(methodCreator,
-                propertiesAccessor.getPath(resourceInfo.getClassInfo(), getStandardMethodMetadata(resourceInfo)));
-        addProducesAnnotation(methodCreator, MethodImplementor.APPLICATION_HAL_JSON);
-
-        FieldDescriptor uriInfoField = of(methodCreator.getMethodDescriptor().getDeclaringClass(), URI_INFO.getName(),
-                URI_INFO.getType());
-        MethodDescriptor isPagedMethod = ofMethod(methodCreator.getMethodDescriptor().getDeclaringClass(), IS_PAGED.getName(),
-                IS_PAGED.getType(), IS_PAGED.getParams());
-
-        BranchResult isPaged = methodCreator.ifTrue(methodCreator.invokeVirtualMethod(isPagedMethod, methodCreator.getThis()));
-        returnPaged(isPaged.trueBranch(), resourceInfo, uriInfoField);
-        returnNotPaged(isPaged.falseBranch(), resourceInfo);
-        methodCreator.close();
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        if (resourceProperties.isPaged()) {
+            implementPaged(classCreator, resourceMetadata, resourceProperties, resourceField);
+        } else {
+            implementNotPaged(classCreator, resourceMetadata, resourceProperties, resourceField);
+        }
     }
 
     @Override
-    protected MethodMetadata getStandardMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(ListMethodImplementor.NAME);
+    protected String getResourceMethodName() {
+        return RESOURCE_METHOD_NAME;
     }
 
-    private void returnPaged(BytecodeCreator creator, RestDataResourceInfo resourceInfo, FieldDescriptor uriInfoField) {
-        ResultHandle uriInfo = creator.readInstanceField(uriInfoField, creator.getThis());
-        ResultHandle page = PaginationImplementor.getRequestPage(creator, uriInfo);
-        ResultHandle pageCount = resourceInfo.getDataAccessImplementor().pageCount(creator, page);
-        ResultHandle links = PaginationImplementor.getLinks(creator, uriInfo, page, pageCount);
-        ResultHandle entities = resourceInfo.getDataAccessImplementor().findAll(creator, page);
-        ResultHandle wrapper = wrapHalEntities(creator, entities, resourceInfo);
-        creator.invokeVirtualMethod(ofMethod(HalCollectionWrapper.class, "addLinks", void.class, Link[].class), wrapper, links);
+    private void implementPaged(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        // Method parameters: sort strings, page index, page size, uri info
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class, List.class, int.class,
+                int.class, UriInfo.class);
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
+        addGetAnnotation(methodCreator);
+        addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON);
+        addSortQueryParamValidatorAnnotation(methodCreator);
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(0), "sort");
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(1), "page");
+        addDefaultValueAnnotation(methodCreator.getParameterAnnotations(1), Integer.toString(DEFAULT_PAGE_INDEX));
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(2), "size");
+        addDefaultValueAnnotation(methodCreator.getParameterAnnotations(2), Integer.toString(DEFAULT_PAGE_SIZE));
+        addContextAnnotation(methodCreator.getParameterAnnotations(3));
+
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
+        ResultHandle sortQuery = methodCreator.getMethodParam(0);
+        ResultHandle sort = sortImplementor.getSort(methodCreator, sortQuery);
+        ResultHandle pageIndex = methodCreator.getMethodParam(1);
+        ResultHandle pageSize = methodCreator.getMethodParam(2);
+        ResultHandle page = paginationImplementor.getPage(methodCreator, pageIndex, pageSize);
+        ResultHandle uriInfo = methodCreator.getMethodParam(3);
 
-        creator.returnValue(ResponseImplementor.ok(creator, wrapper, links));
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to list the entities");
+        ResultHandle pageCount = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), Constants.PAGE_COUNT_METHOD_PREFIX + RESOURCE_METHOD_NAME,
+                        int.class, Page.class),
+                resource, page);
+        ResultHandle links = paginationImplementor.getLinks(tryBlock, uriInfo, page, pageCount);
+        ResultHandle entities = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, List.class, Page.class, Sort.class),
+                resource, page, sort);
+
+        // Wrap and return response
+        ResultHandle wrapper = wrapHalEntities(tryBlock, entities, resourceMetadata.getEntityType(),
+                resourceProperties.getHalCollectionName());
+        tryBlock.invokeVirtualMethod(
+                ofMethod(HalCollectionWrapper.class, "addLinks", void.class, Link[].class), wrapper, links);
+        tryBlock.returnValue(ResponseImplementor.ok(tryBlock, wrapper, links));
+
+        tryBlock.close();
+        methodCreator.close();
     }
 
-    private void returnNotPaged(BytecodeCreator creator, RestDataResourceInfo resourceInfo) {
-        ResultHandle entities = resourceInfo.getDataAccessImplementor().listAll(creator);
-        creator.returnValue(ResponseImplementor.ok(creator, wrapHalEntities(creator, entities, resourceInfo)));
+    private void implementNotPaged(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceFieldDescriptor) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class, List.class);
+
+        // Add method annotations
+        addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
+        addGetAnnotation(methodCreator);
+        addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON);
+        addQueryParamAnnotation(methodCreator.getParameterAnnotations(0), "sort");
+
+        ResultHandle sortQuery = methodCreator.getMethodParam(0);
+        ResultHandle sort = sortImplementor.getSort(methodCreator, sortQuery);
+        ResultHandle resource = methodCreator.readInstanceField(resourceFieldDescriptor, methodCreator.getThis());
+
+        // Invoke resource methods
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to list the entities");
+        ResultHandle entities = tryBlock.invokeVirtualMethod(
+                ofMethod(resourceMetadata.getResourceClass(), RESOURCE_METHOD_NAME, List.class, Page.class, Sort.class),
+                resource, tryBlock.loadNull(), sort);
+
+        // Wrap and return response
+        ResultHandle wrapper = wrapHalEntities(tryBlock, entities, resourceMetadata.getEntityType(),
+                resourceProperties.getHalCollectionName());
+        tryBlock.returnValue(ResponseImplementor.ok(tryBlock, wrapper));
+
+        tryBlock.close();
+        methodCreator.close();
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java
index 1f1d01a995478..6bf420f948d76 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java
@@ -1,104 +1,185 @@
 package io.quarkus.rest.data.panache.deployment.methods.hal;
 
-import javax.ws.rs.core.Response;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.lang.annotation.Annotation;
+import java.util.function.Supplier;
 
-import org.jboss.jandex.IndexView;
+import javax.validation.Valid;
+import javax.ws.rs.core.Response;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.FunctionCreator;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.rest.data.panache.RestDataResource;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
-import io.quarkus.rest.data.panache.deployment.methods.MethodMetadata;
-import io.quarkus.rest.data.panache.deployment.methods.UpdateMethodImplementor;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
-import io.quarkus.rest.data.panache.deployment.utils.FieldAccessImplementor;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.deployment.utils.ResponseImplementor;
+import io.quarkus.rest.data.panache.runtime.jta.TransactionalExecutor;
 
 public final class UpdateHalMethodImplementor extends HalMethodImplementor {
 
-    private static final String NAME = "updateHal";
+    private static final String METHOD_NAME = "updateHal";
+
+    private static final String RESOURCE_UPDATE_METHOD_NAME = "update";
+
+    private static final String RESOURCE_GET_METHOD_NAME = "get";
+
+    private final boolean withValidation;
+
+    public UpdateHalMethodImplementor(boolean withValidation) {
+        this.withValidation = withValidation;
+    }
 
     /**
-     * Implements HAL version of {@link RestDataResource#update(Object, Object)}.
+     * Expose {@link RestDataResource#update(Object, Object)} via HAL JAX-RS method.
      * Generated code looks more or less like this:
      *
      * <pre>
      * {@code
-     *     &#64;Transactional
      *     &#64;PUT
      *     &#64;Path("{id}")
      *     &#64;Consumes({"application/json"})
      *     &#64;Produces({"application/hal+json"})
-     *     public Response updateHal(@PathParam("id") ID id, Entity entity) {
-     *         if (BookEntity.findById(id) != null) {
-     *             entity.id = id;
-     *             JpaOperations.getEntityManager().merge(entity);
-     *             return Response.status(204).build();
-     *         } else {
-     *             entity.id = id;
-     *             Entity newEntity = JpaOperations.getEntityManager().merge(entity);
-     *             HalEntityWrapper wrapper = new HalEntityWrapper(newEntity);
-     *             String location = new ResourceLinksProvider().getSelfLink(newEntity);
-     *             if (location != null) {
-     *                 ResponseBuilder responseBuilder = Response.status(201);
-     *                 responseBuilder.entity(wrapper);
-     *                 responseBuilder.location(URI.create(location));
-     *                 return responseBuilder.build();
+     *     public Response updateHal(@PathParam("id") ID id, Entity entityToSave) {
+     *         try {
+     *             Object newEntity = transactionalExecutor.execute(() -> {
+     *                 if (resource.get(id) == null) {
+     *                     return resource.update(id, entityToSave);
+     *                 } else {
+     *                     resource.update(id, entityToSave);
+     *                     return null;
+     *                 }
+     *             });
+     *
+     *             if (newEntity == null) {
+     *                 return Response.status(204).build();
      *             } else {
-     *                 throw new RuntimeException("Could not extract a new entity URL")
+     *                 String location = new ResourceLinksProvider().getSelfLink(newEntity);
+     *                 if (location != null) {
+     *                     ResponseBuilder responseBuilder = Response.status(201);
+     *                     responseBuilder.entity(new HalEntityWrapper(newEntity));
+     *                     responseBuilder.location(URI.create(location));
+     *                     return responseBuilder.build();
+     *                 } else {
+     *                     throw new RuntimeException("Could not extract a new entity URL")
+     *                 }
      *             }
+     *         } catch (Throwable t) {
+     *             throw new RestDataPanacheException(t);
      *         }
      *     }
      * }
      * </pre>
      */
     @Override
-    protected void implementInternal(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodCreator methodCreator = classCreator.getMethodCreator(
-                NAME, Response.class.getName(), resourceInfo.getIdClassName(), resourceInfo.getEntityClassName());
-        addTransactionalAnnotation(methodCreator);
+    protected void implementInternal(ClassCreator classCreator, ResourceMetadata resourceMetadata,
+            ResourceProperties resourceProperties, FieldDescriptor resourceField) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(METHOD_NAME, Response.class,
+                resourceMetadata.getIdType(), resourceMetadata.getEntityType());
+
+        // Add method annotations
+        addPathAnnotation(methodCreator,
+                appendToPath(resourceProperties.getPath(RESOURCE_UPDATE_METHOD_NAME), "{id}"));
         addPutAnnotation(methodCreator);
-        addPathAnnotation(methodCreator, propertiesAccessor
-                .getPath(resourceInfo.getClassInfo(), getStandardMethodMetadata(resourceInfo), "{id}"));
         addPathParamAnnotation(methodCreator.getParameterAnnotations(0), "id");
-        addConsumesAnnotation(methodCreator, MethodImplementor.APPLICATION_JSON);
+        addConsumesAnnotation(methodCreator, APPLICATION_JSON);
         addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON);
+        // Add parameter annotations
+        if (withValidation) {
+            methodCreator.getParameterAnnotations(1).addAnnotation(Valid.class);
+        }
 
+        ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis());
         ResultHandle id = methodCreator.getMethodParam(0);
-        ResultHandle entity = methodCreator.getMethodParam(1);
-        BranchResult entityDoesNotExist = methodCreator
-                .ifNull(resourceInfo.getDataAccessImplementor().findById(methodCreator, id));
+        ResultHandle entityToSave = methodCreator.getMethodParam(1);
+
+        // Invoke resource methods inside a supplier function which will be given to a transactional executor to make
+        // sure that all database operations are executed in a single transaction.
+        TryBlock tryBlock = implementTryBlock(methodCreator, "Failed to update an entity");
+        ResultHandle transactionalExecutor = getTransactionalExecutor(tryBlock);
+        ResultHandle updateFunction = getUpdateFunction(tryBlock, resourceMetadata.getResourceClass(), resource, id,
+                entityToSave);
+        ResultHandle newEntity = tryBlock.invokeVirtualMethod(
+                ofMethod(TransactionalExecutor.class, "execute", Object.class, Supplier.class),
+                transactionalExecutor, updateFunction);
+
+        BranchResult createdNewEntity = tryBlock.ifNotNull(newEntity);
+        ResultHandle wrappedNewEntity = wrapHalEntity(createdNewEntity.trueBranch(), newEntity);
+        ResultHandle newEntityUrl = ResponseImplementor.getEntityUrl(createdNewEntity.trueBranch(), newEntity);
+        createdNewEntity.trueBranch().returnValue(
+                ResponseImplementor.created(createdNewEntity.trueBranch(), wrappedNewEntity, newEntityUrl));
+        createdNewEntity.falseBranch().returnValue(ResponseImplementor.noContent(createdNewEntity.falseBranch()));
 
-        FieldAccessImplementor fieldAccessImplementor = new FieldAccessImplementor(index, resourceInfo.getIdFieldPredicate());
-        createAndReturn(entityDoesNotExist.trueBranch(), fieldAccessImplementor, resourceInfo, entity, id);
-        updateAndReturn(entityDoesNotExist.falseBranch(), fieldAccessImplementor, resourceInfo, entity, id);
         methodCreator.close();
     }
 
     @Override
-    protected MethodMetadata getStandardMethodMetadata(RestDataResourceInfo resourceInfo) {
-        return new MethodMetadata(UpdateMethodImplementor.NAME, resourceInfo.getIdClassName(),
-                resourceInfo.getEntityClassName());
+    protected String getResourceMethodName() {
+        return RESOURCE_UPDATE_METHOD_NAME;
     }
 
-    private void createAndReturn(BytecodeCreator creator, FieldAccessImplementor fieldAccessImplementor,
-            RestDataResourceInfo resourceInfo, ResultHandle entity, ResultHandle id) {
-        fieldAccessImplementor.setId(creator, resourceInfo.getEntityClassName(), entity, id);
-        ResultHandle newEntity = resourceInfo.getDataAccessImplementor().update(creator, entity);
-        ResultHandle response = ResponseImplementor
-                .created(creator, wrapHalEntity(creator, newEntity), ResponseImplementor.getEntityUrl(creator, newEntity));
-        creator.returnValue(response);
+    private ResultHandle getUpdateFunction(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id, ResultHandle entity) {
+        FunctionCreator functionCreator = creator.createFunction(Supplier.class);
+        BytecodeCreator functionBytecodeCreator = functionCreator.getBytecode();
+
+        AssignableResultHandle entityToSave = functionBytecodeCreator.createVariable(Object.class);
+        functionBytecodeCreator.assign(entityToSave, entity);
+
+        BranchResult shouldUpdate = entityExists(functionBytecodeCreator, resourceClass, resource, id);
+        // Update and return null
+        updateAndReturn(shouldUpdate.trueBranch(), resourceClass, resource, id, entityToSave);
+        // Update and return new entity
+        createAndReturn(shouldUpdate.falseBranch(), resourceClass, resource, id, entityToSave);
+
+        return functionCreator.getInstance();
     }
 
-    private void updateAndReturn(BytecodeCreator creator, FieldAccessImplementor fieldAccessImplementor,
-            RestDataResourceInfo resourceInfo, ResultHandle entity, ResultHandle id) {
-        fieldAccessImplementor.setId(creator, resourceInfo.getEntityClassName(), entity, id);
-        resourceInfo.getDataAccessImplementor().update(creator, entity);
-        creator.returnValue(ResponseImplementor.noContent(creator));
+    private BranchResult entityExists(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id) {
+        return creator.ifNotNull(creator.invokeVirtualMethod(
+                ofMethod(resourceClass, RESOURCE_GET_METHOD_NAME, Object.class, Object.class), resource, id));
+    }
+
+    private void createAndReturn(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id, ResultHandle entityToSave) {
+        ResultHandle newEntity = creator.invokeVirtualMethod(
+                ofMethod(resourceClass, RESOURCE_UPDATE_METHOD_NAME, Object.class, Object.class, Object.class),
+                resource, id, entityToSave);
+        creator.returnValue(newEntity);
+    }
+
+    private void updateAndReturn(BytecodeCreator creator, String resourceClass, ResultHandle resource,
+            ResultHandle id, ResultHandle entityToSave) {
+        creator.invokeVirtualMethod(
+                ofMethod(resourceClass, RESOURCE_UPDATE_METHOD_NAME, Object.class, Object.class, Object.class),
+                resource, id, entityToSave);
+        creator.returnValue(creator.loadNull());
+    }
+
+    private ResultHandle getTransactionalExecutor(BytecodeCreator creator) {
+        ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class));
+        ResultHandle instanceHandle = creator.invokeInterfaceMethod(
+                ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class),
+                arcContainer, creator.loadClass(TransactionalExecutor.class), creator.newArray(Annotation.class, 0));
+        ResultHandle instance = creator.invokeInterfaceMethod(
+                ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle);
+
+        creator.ifNull(instance)
+                .trueBranch()
+                .throwException(RuntimeException.class,
+                        TransactionalExecutor.class.getSimpleName() + " instance was not found");
+
+        return instance;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/internal/IsPagedMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/internal/IsPagedMethodImplementor.java
deleted file mode 100644
index d16cc01bea96a..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/internal/IsPagedMethodImplementor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.quarkus.rest.data.panache.deployment.methods.internal;
-
-import java.lang.reflect.Modifier;
-
-import org.jboss.jandex.IndexView;
-
-import io.quarkus.gizmo.ClassCreator;
-import io.quarkus.gizmo.MethodCreator;
-import io.quarkus.rest.data.panache.deployment.PrivateMethods;
-import io.quarkus.rest.data.panache.deployment.RestDataResourceInfo;
-import io.quarkus.rest.data.panache.deployment.methods.MethodImplementor;
-import io.quarkus.rest.data.panache.deployment.properties.MethodPropertiesAccessor;
-
-public class IsPagedMethodImplementor implements MethodImplementor {
-
-    private final boolean isPaged;
-
-    public IsPagedMethodImplementor(boolean isPaged) {
-        this.isPaged = isPaged;
-    }
-
-    @Override
-    public void implement(ClassCreator classCreator, IndexView index, MethodPropertiesAccessor propertiesAccessor,
-            RestDataResourceInfo resourceInfo) {
-        MethodCreator methodCreator = classCreator
-                .getMethodCreator(PrivateMethods.IS_PAGED.getName(), PrivateMethods.IS_PAGED.getType())
-                .setModifiers(Modifier.PRIVATE);
-        methodCreator.returnValue(methodCreator.load(isPaged));
-        methodCreator.close();
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/MethodProperties.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/MethodProperties.java
new file mode 100644
index 0000000000000..d47615d9b2523
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/MethodProperties.java
@@ -0,0 +1,21 @@
+package io.quarkus.rest.data.panache.deployment.properties;
+
+public class MethodProperties {
+
+    private final boolean exposed;
+
+    private final String path;
+
+    public MethodProperties(boolean exposed, String path) {
+        this.exposed = exposed;
+        this.path = path;
+    }
+
+    public boolean isExposed() {
+        return exposed;
+    }
+
+    public String getPath() {
+        return path;
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/MethodPropertiesAccessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/MethodPropertiesAccessor.java
deleted file mode 100644
index e6d6f7123ead0..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/MethodPropertiesAccessor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package io.quarkus.rest.data.panache.deployment.properties;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.Type;
-
-import io.quarkus.rest.data.panache.MethodProperties;
-import io.quarkus.rest.data.panache.deployment.methods.MethodMetadata;
-
-public class MethodPropertiesAccessor {
-
-    private static final DotName OPERATION_PROPERTIES_ANNOTATION = DotName.createSimple(MethodProperties.class.getName());
-
-    private final IndexView index;
-
-    public MethodPropertiesAccessor(IndexView index) {
-        this.index = index;
-    }
-
-    public boolean isExposed(ClassInfo classInfo, MethodMetadata methodMetadata) {
-        AnnotationInstance annotation = getAnnotation(classInfo, methodMetadata);
-
-        return annotation == null
-                || annotation.value("exposed") == null
-                || annotation.value("exposed").asBoolean();
-    }
-
-    public String getPath(ClassInfo classInfo, MethodMetadata methodMetadata) {
-        AnnotationInstance annotation = getAnnotation(classInfo, methodMetadata);
-        if (annotation == null || annotation.value("path") == null) {
-            return "";
-        }
-        return annotation.value("path").asString();
-    }
-
-    public String getPath(ClassInfo classInfo, MethodMetadata methodMetadata, String lastSegment) {
-        String path = getPath(classInfo, methodMetadata);
-        if (path.endsWith("/")) {
-            path = path.substring(0, path.lastIndexOf("/"));
-        }
-        if (lastSegment.startsWith("/")) {
-            lastSegment = lastSegment.substring(1);
-        }
-        return String.join("/", path, lastSegment);
-    }
-
-    private AnnotationInstance getAnnotation(ClassInfo resourceInterface, MethodMetadata methodMetadata) {
-        Optional<MethodInfo> optionalMethod = getMethodInfo(resourceInterface, methodMetadata);
-        if (optionalMethod.isPresent() && optionalMethod.get().hasAnnotation(OPERATION_PROPERTIES_ANNOTATION)) {
-            return optionalMethod.get().annotation(OPERATION_PROPERTIES_ANNOTATION);
-        }
-        if (resourceInterface.superName() != null) {
-            ClassInfo superResourceInterface = index.getClassByName(resourceInterface.superName());
-            if (superResourceInterface != null) {
-                return getAnnotation(superResourceInterface, methodMetadata);
-            }
-        }
-
-        return null;
-    }
-
-    private Optional<MethodInfo> getMethodInfo(ClassInfo classInfo, MethodMetadata methodMetadata) {
-        return classInfo.methods()
-                .stream()
-                .filter(methodInfo -> methodMetadata.getName().equals(methodInfo.name()))
-                .filter(methodInfo -> doParametersMatch(methodInfo, methodMetadata.getParameterTypes()))
-                .findFirst();
-    }
-
-    private boolean doParametersMatch(MethodInfo methodInfo, String... methodParameterTypes) {
-        if (methodInfo.parameters().size() != methodParameterTypes.length) {
-            return false;
-        }
-
-        List<String> actualParameterTypes = methodInfo.parameters()
-                .stream()
-                .map(Type::name)
-                .map(DotName::toString)
-                .collect(Collectors.toList());
-
-        return actualParameterTypes.equals(Arrays.asList(methodParameterTypes));
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourceProperties.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourceProperties.java
new file mode 100644
index 0000000000000..4318e021166a9
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourceProperties.java
@@ -0,0 +1,71 @@
+package io.quarkus.rest.data.panache.deployment.properties;
+
+import java.util.Map;
+
+public class ResourceProperties {
+
+    private final boolean exposed;
+
+    private final String path;
+
+    private final boolean paged;
+
+    private final boolean hal;
+
+    private final String halCollectionName;
+
+    private final Map<String, MethodProperties> methodProperties;
+
+    public ResourceProperties(boolean exposed, String path, boolean paged, boolean hal, String halCollectionName,
+            Map<String, MethodProperties> methodProperties) {
+        this.exposed = exposed;
+        this.path = path;
+        this.paged = paged;
+        this.hal = hal;
+        this.halCollectionName = halCollectionName;
+        this.methodProperties = methodProperties;
+    }
+
+    public boolean isExposed() {
+        if (exposed) {
+            return true;
+        }
+        // If at least one method is explicitly exposed, resource should also be exposed
+        for (MethodProperties properties : this.methodProperties.values()) {
+            if (properties.isExposed()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isExposed(String methodName) {
+        if (methodProperties.containsKey(methodName)) {
+            return methodProperties.get(methodName).isExposed();
+        }
+        return exposed;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public String getPath(String methodName) {
+        if (methodProperties.containsKey(methodName)) {
+            return methodProperties.get(methodName).getPath();
+        }
+        return "";
+    }
+
+    public boolean isPaged() {
+        return paged;
+    }
+
+    public boolean isHal() {
+        return hal;
+    }
+
+    public String getHalCollectionName() {
+        return halCollectionName;
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesAccessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesAccessor.java
deleted file mode 100644
index 3af4883a4585d..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesAccessor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.quarkus.rest.data.panache.deployment.properties;
-
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
-
-import io.quarkus.rest.data.panache.ResourceProperties;
-import io.quarkus.rest.data.panache.deployment.utils.ResourceName;
-
-public class ResourcePropertiesAccessor {
-
-    private static final DotName RESOURCE_PROPERTIES_ANNOTATION = DotName.createSimple(ResourceProperties.class.getName());
-
-    private final IndexView index;
-
-    public ResourcePropertiesAccessor(IndexView index) {
-        this.index = index;
-    }
-
-    public boolean isHal(ClassInfo classInfo) {
-        AnnotationInstance annotation = getAnnotation(classInfo);
-        return annotation != null
-                && annotation.value("hal") != null
-                && annotation.value("hal").asBoolean();
-    }
-
-    public String path(ClassInfo classInfo) {
-        AnnotationInstance annotation = getAnnotation(classInfo);
-        if (annotation == null || annotation.value("path") == null || "".equals(annotation.value("path").asString())) {
-            return ResourceName.fromClass(classInfo.simpleName());
-        }
-        return annotation.value("path").asString();
-    }
-
-    public boolean isPaged(ClassInfo classInfo) {
-        AnnotationInstance annotation = getAnnotation(classInfo);
-        return annotation == null
-                || annotation.value("paged") == null
-                || annotation.value("paged").asBoolean();
-    }
-
-    private AnnotationInstance getAnnotation(ClassInfo classInfo) {
-        if (classInfo.classAnnotation(RESOURCE_PROPERTIES_ANNOTATION) != null) {
-            return classInfo.classAnnotation(RESOURCE_PROPERTIES_ANNOTATION);
-        }
-        if (classInfo.superName() != null) {
-            ClassInfo superControllerInterface = index.getClassByName(classInfo.superName());
-            if (superControllerInterface != null) {
-                return getAnnotation(superControllerInterface);
-            }
-        }
-        return null;
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesBuildItem.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesBuildItem.java
new file mode 100644
index 0000000000000..ad369bf5cab87
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.rest.data.panache.deployment.properties;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class ResourcePropertiesBuildItem extends MultiBuildItem {
+
+    private final String resourceType;
+
+    private final ResourceProperties resourceProperties;
+
+    public ResourcePropertiesBuildItem(String resourceType, ResourceProperties resourceProperties) {
+        this.resourceType = resourceType;
+        this.resourceProperties = resourceProperties;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public ResourceProperties getResourcePropertiesInfo() {
+        return resourceProperties;
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java
new file mode 100644
index 0000000000000..13fc2fd1bcc80
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/properties/ResourcePropertiesProvider.java
@@ -0,0 +1,118 @@
+package io.quarkus.rest.data.panache.deployment.properties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.rest.data.panache.deployment.utils.ResourceName;
+
+public class ResourcePropertiesProvider {
+
+    private static final DotName RESOURCE_PROPERTIES_ANNOTATION = DotName
+            .createSimple(io.quarkus.rest.data.panache.ResourceProperties.class.getName());
+
+    private static final DotName METHOD_PROPERTIES_ANNOTATION = DotName.createSimple(
+            io.quarkus.rest.data.panache.MethodProperties.class.getName());
+
+    private final IndexView index;
+
+    public ResourcePropertiesProvider(IndexView index) {
+        this.index = index;
+    }
+
+    /**
+     * Find resource and method properties annotations used by a given interface
+     * and build {@link ResourceProperties} instance.
+     */
+    public ResourceProperties getForInterface(String resourceInterface) {
+        DotName resourceInterfaceName = DotName.createSimple(resourceInterface);
+        AnnotationInstance annotation = findResourcePropertiesAnnotation(resourceInterfaceName);
+        Map<String, MethodProperties> methodProperties = new HashMap<>();
+        collectMethodProperties(resourceInterfaceName, methodProperties);
+
+        return new ResourceProperties(
+                isExposed(annotation),
+                getPath(annotation, resourceInterface),
+                isPaged(annotation),
+                isHal(annotation),
+                getHalCollectionName(annotation, resourceInterface),
+                methodProperties);
+    }
+
+    private AnnotationInstance findResourcePropertiesAnnotation(DotName className) {
+        ClassInfo classInfo = index.getClassByName(className);
+        if (classInfo == null) {
+            return null;
+        }
+        if (classInfo.classAnnotation(RESOURCE_PROPERTIES_ANNOTATION) != null) {
+            return classInfo.classAnnotation(RESOURCE_PROPERTIES_ANNOTATION);
+        }
+        if (classInfo.superName() != null) {
+            return findResourcePropertiesAnnotation(classInfo.superName());
+        }
+        return null;
+    }
+
+    private void collectMethodProperties(DotName className, Map<String, MethodProperties> properties) {
+        ClassInfo classInfo = index.getClassByName(className);
+        if (classInfo == null) {
+            return;
+        }
+        for (MethodInfo method : classInfo.methods()) {
+            if (!properties.containsKey(method.name()) && method.hasAnnotation(METHOD_PROPERTIES_ANNOTATION)) {
+                properties.put(method.name(), getMethodProperties(method.annotation(METHOD_PROPERTIES_ANNOTATION)));
+            }
+        }
+        if (classInfo.superName() != null) {
+            collectMethodProperties(classInfo.superName(), properties);
+        }
+    }
+
+    private MethodProperties getMethodProperties(AnnotationInstance annotation) {
+        return new MethodProperties(isExposed(annotation), getPath(annotation));
+    }
+
+    private boolean isHal(AnnotationInstance annotation) {
+        return annotation != null
+                && annotation.value("hal") != null
+                && annotation.value("hal").asBoolean();
+    }
+
+    private boolean isPaged(AnnotationInstance annotation) {
+        return annotation == null
+                || annotation.value("paged") == null
+                || annotation.value("paged").asBoolean();
+    }
+
+    private boolean isExposed(AnnotationInstance annotation) {
+        return annotation == null
+                || annotation.value("exposed") == null
+                || annotation.value("exposed").asBoolean();
+    }
+
+    private String getPath(AnnotationInstance annotation) {
+        if (annotation != null && annotation.value("path") != null) {
+            return annotation.value("path").asString();
+        }
+        return "";
+    }
+
+    private String getPath(AnnotationInstance annotation, String resourceInterface) {
+        if (annotation != null && annotation.value("path") != null) {
+            return annotation.value("path").asString();
+        }
+        return ResourceName.fromClass(resourceInterface);
+    }
+
+    private String getHalCollectionName(AnnotationInstance annotation, String resourceInterface) {
+        if (annotation != null && annotation.value("halCollectionName") != null) {
+            return annotation.value("halCollectionName").asString();
+        }
+        return ResourceName.fromClass(resourceInterface);
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/FieldAccessImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/FieldAccessImplementor.java
deleted file mode 100644
index 615a27f4acd3b..0000000000000
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/FieldAccessImplementor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package io.quarkus.rest.data.panache.deployment.utils;
-
-import java.util.function.Predicate;
-
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
-import org.jboss.jandex.IndexView;
-import org.jboss.jandex.MethodInfo;
-
-import io.quarkus.deployment.bean.JavaBeanUtil;
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.ResultHandle;
-
-public final class FieldAccessImplementor {
-
-    private final IndexView index;
-
-    private final Predicate<FieldInfo> idFieldPredicate;
-
-    public FieldAccessImplementor(IndexView index, Predicate<FieldInfo> idFieldPredicate) {
-        this.index = index;
-        this.idFieldPredicate = idFieldPredicate;
-    }
-
-    public ResultHandle getId(BytecodeCreator creator, String className, ResultHandle instance) {
-        ClassInfo classInfo = index.getClassByName(DotName.createSimple(className));
-        FieldInfo field = getIdField(classInfo);
-        if (field == null) {
-            throw new RuntimeException(className + " does not have a field annotated with @Id");
-        }
-
-        MethodInfo getter = getGetter(classInfo, field);
-        if (getter != null) {
-            return creator.invokeVirtualMethod(getter, instance);
-        }
-
-        return creator.readInstanceField(field, instance);
-    }
-
-    public void setId(BytecodeCreator creator, String className, ResultHandle instance, ResultHandle value) {
-        ClassInfo classInfo = index.getClassByName(DotName.createSimple(className));
-        FieldInfo field = getIdField(classInfo);
-        if (field == null) {
-            throw new RuntimeException(className + " does not have a field annotated with @Id");
-        }
-
-        MethodInfo setter = getSetter(classInfo, field);
-
-        if (setter != null) {
-            creator.invokeVirtualMethod(setter, instance, value);
-        } else {
-            creator.writeInstanceField(field, instance, value);
-        }
-    }
-
-    private FieldInfo getIdField(ClassInfo entityClass) {
-        for (FieldInfo field : entityClass.fields()) {
-            if (idFieldPredicate.test(field)) {
-                return field;
-            }
-        }
-
-        if (entityClass.superName() != null) {
-            ClassInfo superClass = index.getClassByName(entityClass.superName());
-            if (superClass != null) {
-                return getIdField(superClass);
-            }
-        }
-
-        return null;
-    }
-
-    private MethodInfo getGetter(ClassInfo entityClass, FieldInfo field) {
-        MethodInfo getter = entityClass.method(JavaBeanUtil.getGetterName(field.name(), field.type().name()));
-        if (getter != null) {
-            return getter;
-        }
-
-        if (entityClass.superName() != null) {
-            ClassInfo superClass = index.getClassByName(entityClass.superName());
-            if (superClass != null) {
-                getGetter(superClass, field);
-            }
-        }
-
-        return null;
-    }
-
-    private MethodInfo getSetter(ClassInfo entityClass, FieldInfo field) {
-        MethodInfo setter = entityClass.method(JavaBeanUtil.getSetterName(field.name()), field.type());
-        if (setter != null) {
-            return setter;
-        }
-
-        if (entityClass.superName() != null) {
-            ClassInfo superClass = index.getClassByName(entityClass.superName());
-            if (superClass != null) {
-                getSetter(superClass, field);
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java
index b22c1771e7bfc..8a2d0b2e14f6b 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/PaginationImplementor.java
@@ -8,61 +8,46 @@
 import java.util.List;
 
 import javax.ws.rs.core.Link;
-import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
 import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.ResultHandle;
-import io.quarkus.gizmo.TryBlock;
 import io.quarkus.panache.common.Page;
 
+/**
+ * Pagination logic implementor utilities.
+ */
 public final class PaginationImplementor {
 
+    public static final int DEFAULT_PAGE_INDEX = 0;
+
+    public static final int DEFAULT_PAGE_SIZE = 20;
+
     /**
-     * Extracts page and size query parameters from the URI and returns the {@link Page} instance.
-     * If page index or size is invalid - default value is used.
-     *
-     * @param creator a bytecode creator to be used for code generation
-     * @param uriInfo a {@link UriInfo} instance to extract the query parameters form
-     * @return a {@link Page} instance
+     * Get a {@link Page} instance give an index and size.
      */
-    public static ResultHandle getRequestPage(BytecodeCreator creator, ResultHandle uriInfo) {
-        ResultHandle queryParams = creator.invokeInterfaceMethod(
-                ofMethod(UriInfo.class, "getQueryParameters", MultivaluedMap.class), uriInfo);
-        AssignableResultHandle page = creator.createVariable(Integer.class);
-        assignIntQueryParam(creator, queryParams, "page", 0, 0, page);
-        AssignableResultHandle size = creator.createVariable(Integer.class);
-        assignIntQueryParam(creator, queryParams, "size", 1, 20, size);
-        return creator.invokeStaticMethod(ofMethod(Page.class, "of", Page.class, int.class, int.class), page, size);
+    public ResultHandle getPage(BytecodeCreator creator, ResultHandle index, ResultHandle size) {
+        ResultHandle validIndex = getValidOrDefault(creator, index, 0, DEFAULT_PAGE_INDEX);
+        ResultHandle validSize = getValidOrDefault(creator, size, 1, DEFAULT_PAGE_SIZE);
+        return creator.invokeStaticMethod(ofMethod(Page.class, "of", Page.class, int.class, int.class), validIndex, validSize);
     }
 
-    private static void assignIntQueryParam(BytecodeCreator creator, ResultHandle queryParams, String key, int minValue,
-            int defaultValue, AssignableResultHandle variable) {
-        ResultHandle stringValue = creator.invokeInterfaceMethod(
-                ofMethod(MultivaluedMap.class, "getFirst", Object.class, Object.class), queryParams, creator.load(key));
-        TryBlock tryBlock = creator.tryBlock();
-
-        // Catch NumberFormatException and return default
-        CatchBlockCreator catchBlockCreator = tryBlock.addCatch(NumberFormatException.class);
-        catchBlockCreator.assign(variable, catchBlockCreator.load(defaultValue));
-
-        // Parse int and return that or default
-        ResultHandle value = tryBlock.invokeStaticMethod(
-                ofMethod(Integer.class, "parseInt", int.class, String.class), stringValue);
-        BranchResult valueIsTooSmall = tryBlock.ifIntegerLessThan(value, tryBlock.load(minValue));
-        valueIsTooSmall.trueBranch().assign(variable, tryBlock.load(defaultValue));
-        valueIsTooSmall.falseBranch().assign(variable, value);
+    private ResultHandle getValidOrDefault(BytecodeCreator creator, ResultHandle value, int minValue, int defaultValue) {
+        AssignableResultHandle result = creator.createVariable(int.class);
+        BranchResult isValid = creator.ifIntegerGreaterEqual(value, creator.load(minValue));
+        isValid.trueBranch().assign(result, value);
+        isValid.falseBranch().assign(result, isValid.falseBranch().load(defaultValue));
+        return result;
     }
 
     /**
      * Return an array with the links applicable for the provided page and page count.
      */
-    public static ResultHandle getLinks(BytecodeCreator creator, ResultHandle uriInfo, ResultHandle page,
+    public ResultHandle getLinks(BytecodeCreator creator, ResultHandle uriInfo, ResultHandle page,
             ResultHandle pageCount) {
         ResultHandle links = creator.newInstance(ofConstructor(ArrayList.class, int.class), creator.load(4));
 
@@ -91,7 +76,7 @@ public static ResultHandle getLinks(BytecodeCreator creator, ResultHandle uriInf
                 ofMethod(List.class, "toArray", Object[].class, Object[].class), links, linksArray);
     }
 
-    private static ResultHandle getLink(BytecodeCreator creator, ResultHandle uriInfo, ResultHandle page, String rel) {
+    private ResultHandle getLink(BytecodeCreator creator, ResultHandle uriInfo, ResultHandle page, String rel) {
         ResultHandle builder = creator.invokeStaticMethod(
                 ofMethod(Link.class, "fromUri", Link.Builder.class, URI.class), getPageUri(creator, uriInfo, page));
         creator.invokeInterfaceMethod(ofMethod(Link.Builder.class, "rel", Link.Builder.class, String.class),
@@ -109,7 +94,7 @@ private static ResultHandle getLink(BytecodeCreator creator, ResultHandle uriInf
      * @param page a {@link Page} to be used for getting page number and size
      * @return a page {@link URI}
      */
-    private static ResultHandle getPageUri(BytecodeCreator creator, ResultHandle uriInfo, ResultHandle page) {
+    private ResultHandle getPageUri(BytecodeCreator creator, ResultHandle uriInfo, ResultHandle page) {
         ResultHandle uriBuilder = creator.invokeInterfaceMethod(
                 ofMethod(UriInfo.class, "getAbsolutePathBuilder", UriBuilder.class), uriInfo);
 
@@ -132,7 +117,7 @@ private static ResultHandle getPageUri(BytecodeCreator creator, ResultHandle uri
     /**
      * Returns the last page with the same size as the provided page.
      */
-    private static ResultHandle getLastPage(BytecodeCreator creator, ResultHandle page, ResultHandle pageCount) {
+    private ResultHandle getLastPage(BytecodeCreator creator, ResultHandle page, ResultHandle pageCount) {
         ResultHandle pageNumber = creator.invokeStaticMethod(
                 ofMethod(Integer.class, "sum", int.class, int.class, int.class), pageCount, creator.load(-1));
         return creator.invokeVirtualMethod(
@@ -142,7 +127,7 @@ private static ResultHandle getLastPage(BytecodeCreator creator, ResultHandle pa
     /**
      * Compares indexes of two pages.
      */
-    private static BranchResult isTheSamePage(BytecodeCreator creator, ResultHandle page, ResultHandle anotherPage) {
+    private BranchResult isTheSamePage(BytecodeCreator creator, ResultHandle page, ResultHandle anotherPage) {
         ResultHandle index = creator.readInstanceField(FieldDescriptor.of(Page.class, "index", int.class), page);
         ResultHandle anotherIndex = creator.readInstanceField(FieldDescriptor.of(Page.class, "index", int.class), anotherPage);
         return creator.ifIntegerEqual(index, anotherIndex);
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResourceName.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResourceName.java
index 29bcecd8856db..1a2844942a11f 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResourceName.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResourceName.java
@@ -7,9 +7,17 @@
 
 public final class ResourceName {
 
-    private static final String[] SUFFIXES = { "controller", "resource" };
+    private static final String[] SUFFIXES = { "controller", "resource", "repository" };
 
     public static String fromClass(String resourceClassName) {
-        return String.join("-", toList(withoutSuffix(lowerCase(camelHumpsIterator(resourceClassName)), SUFFIXES)));
+        return String.join("-",
+                toList(withoutSuffix(lowerCase(camelHumpsIterator(toSimpleName(resourceClassName))), SUFFIXES)));
+    }
+
+    private static String toSimpleName(String className) {
+        if (className.contains(".")) {
+            return className.substring(className.lastIndexOf(".") + 1);
+        }
+        return className;
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java
index 0c1d072511c08..a3cd37068c1f0 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/ResponseImplementor.java
@@ -55,6 +55,10 @@ public static ResultHandle noContent(BytecodeCreator creator) {
         return status(creator, Response.Status.NO_CONTENT.getStatusCode());
     }
 
+    public static ResultHandle notFound(BytecodeCreator creator) {
+        return status(creator, Response.Status.NOT_FOUND.getStatusCode());
+    }
+
     public static ResultHandle notFoundException(BytecodeCreator creator) {
         return creator.newInstance(MethodDescriptor.ofConstructor(WebApplicationException.class, int.class),
                 creator.load(Response.Status.NOT_FOUND.getStatusCode()));
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SortImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SortImplementor.java
new file mode 100644
index 0000000000000..13095694ceeed
--- /dev/null
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/utils/SortImplementor.java
@@ -0,0 +1,90 @@
+package io.quarkus.rest.data.panache.deployment.utils;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofConstructor;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.panache.common.Sort;
+
+public final class SortImplementor {
+
+    /**
+     * Builds a Panache {@code Sort} instance based on the sort query parameters.
+     * Sort query parameters could be either separated by comma or given as separate instances, e.g. '?sort=name,-age&sort=age'.
+     * '-' sign before the field name indicates a descending order.
+     *
+     * @param creator Bytecode creator instance.
+     * @param sortParams List of sort query strings
+     * @return Panache Sort instance
+     */
+    public ResultHandle getSort(BytecodeCreator creator, ResultHandle sortParams) {
+        ResultHandle sort = creator.invokeStaticMethod(
+                ofMethod(Sort.class, "by", Sort.class, String[].class), creator.newArray(String.class, 0));
+        ResultHandle fieldsIterator = creator.invokeInterfaceMethod(
+                ofMethod(List.class, "iterator", Iterator.class), getSortFields(creator, sortParams));
+        // Iterate through the sort fields
+        BytecodeCreator loopCreator = creator.whileLoop(c -> iteratorHasNext(c, fieldsIterator)).block();
+        ResultHandle field = loopCreator.invokeInterfaceMethod(
+                ofMethod(Iterator.class, "next", Object.class), fieldsIterator);
+        // Add the field to a sort object
+        BranchResult isDescendingBranch = isDescendingField(loopCreator, field);
+        addDescendingSortField(isDescendingBranch.trueBranch(), sort, field);
+        addAscendingSortField(isDescendingBranch.falseBranch(), sort, field);
+        return sort;
+    }
+
+    private void addAscendingSortField(BytecodeCreator creator, ResultHandle sort, ResultHandle field) {
+        creator.invokeVirtualMethod(ofMethod(Sort.class, "and", Sort.class, String.class), sort, field);
+    }
+
+    private void addDescendingSortField(BytecodeCreator creator, ResultHandle sort, ResultHandle field) {
+        ResultHandle fieldToAdd = creator.invokeVirtualMethod(
+                ofMethod(String.class, "substring", String.class, int.class), field, creator.load(1));
+        creator.invokeVirtualMethod(ofMethod(Sort.class, "and", Sort.class, String.class, Sort.Direction.class),
+                sort, fieldToAdd, creator.load(Sort.Direction.Descending));
+    }
+
+    private BranchResult isDescendingField(BytecodeCreator creator, ResultHandle field) {
+        return creator.ifTrue(creator.invokeVirtualMethod(
+                ofMethod(String.class, "startsWith", boolean.class, String.class), field, creator.load("-")));
+    }
+
+    private ResultHandle getSortFields(BytecodeCreator creator, ResultHandle sortParamsList) {
+        ResultHandle sortFieldsList = creator.newInstance(ofConstructor(LinkedList.class));
+        ResultHandle sortParamsIterator = creator.invokeInterfaceMethod(
+                ofMethod(List.class, "iterator", Iterator.class), sortParamsList);
+        // Iterate through the sort query parameters
+        BytecodeCreator loopCreator = creator.whileLoop(c -> iteratorHasNext(c, sortParamsIterator)).block();
+        ResultHandle sortParam = loopCreator.invokeInterfaceMethod(
+                ofMethod(Iterator.class, "next", Object.class), sortParamsIterator);
+        ResultHandle extractedSortFields = extractSortFieldsFromParam(loopCreator, sortParam);
+        loopCreator.invokeInterfaceMethod(
+                ofMethod(List.class, "addAll", boolean.class, Collection.class), sortFieldsList, extractedSortFields);
+        return sortFieldsList;
+    }
+
+    /**
+     * Takes a single sort query parameter value, splits it by ',' and returns the result as a list.
+     *
+     * @param creator Bytecode creator instance
+     * @param sortParam a single sort query parameter value (e.g. 'name' or 'name,-age')
+     * @return A list of sort fields
+     */
+    private ResultHandle extractSortFieldsFromParam(BytecodeCreator creator, ResultHandle sortParam) {
+        ResultHandle sortFieldsArray = creator.invokeVirtualMethod(
+                ofMethod(String.class, "split", String[].class, String.class), sortParam, creator.load(","));
+        return creator.invokeStaticMethod(ofMethod(Arrays.class, "asList", List.class, Object[].class), sortFieldsArray);
+    }
+
+    private BranchResult iteratorHasNext(BytecodeCreator creator, ResultHandle iterator) {
+        return creator.ifTrue(creator.invokeInterfaceMethod(ofMethod(Iterator.class, "hasNext", boolean.class), iterator));
+    }
+}
diff --git a/extensions/panache/rest-data-panache/deployment/src/test/java/io/quarkus/rest/data/panache/deployment/utils/ResourceNameTest.java b/extensions/panache/rest-data-panache/deployment/src/test/java/io/quarkus/rest/data/panache/deployment/utils/ResourceNameTest.java
index b1da23c92c500..577a4caee4c75 100644
--- a/extensions/panache/rest-data-panache/deployment/src/test/java/io/quarkus/rest/data/panache/deployment/utils/ResourceNameTest.java
+++ b/extensions/panache/rest-data-panache/deployment/src/test/java/io/quarkus/rest/data/panache/deployment/utils/ResourceNameTest.java
@@ -20,4 +20,9 @@ void testResourceName() {
     void testControllerName() {
         assertThat(ResourceName.fromClass("SomeEntityController")).isEqualTo("some-entity");
     }
+
+    @Test
+    void testComplexName() {
+        assertThat(ResourceName.fromClass("com.example.Entity")).isEqualTo("entity");
+    }
 }
\ No newline at end of file
diff --git a/extensions/panache/rest-data-panache/pom.xml b/extensions/panache/rest-data-panache/pom.xml
index 943e829b02f06..b2f684e8be458 100644
--- a/extensions/panache/rest-data-panache/pom.xml
+++ b/extensions/panache/rest-data-panache/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-panache-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-rest-data-panache-parent</artifactId>
diff --git a/extensions/panache/rest-data-panache/runtime/pom.xml b/extensions/panache/rest-data-panache/runtime/pom.xml
index 2a4e7578b29ab..57f5a709178a8 100644
--- a/extensions/panache/rest-data-panache/runtime/pom.xml
+++ b/extensions/panache/rest-data-panache/runtime/pom.xml
@@ -13,6 +13,10 @@
     <name>Quarkus - REST data with Panache - Runtime</name>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
@@ -41,5 +45,10 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/ResourceProperties.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/ResourceProperties.java
index f4cab440d6ffb..e1865e8b7ef95 100644
--- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/ResourceProperties.java
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/ResourceProperties.java
@@ -16,14 +16,12 @@
 public @interface ResourceProperties {
 
     /**
-     * Generate operations that support HAL content type.
-     * HAL methods are generated in addition to the standard methods. They accept the same parameters but return a content of
-     * `application/hal+json` type.
-     * The operations that support HAL responses are `get`, `list`, `add` and `update`.
+     * Whether this resource operations should be exposed as JAX-RS methods by default.
+     * Separate methods can override this setting by using {@link MethodProperties} annotation.
      * <p>
-     * Default: false.
+     * Default: true.
      */
-    boolean hal() default false;
+    boolean exposed() default true;
 
     /**
      * URL path segment that should be used to access the resources.
@@ -42,4 +40,21 @@
      * Default: true.
      */
     boolean paged() default true;
+
+    /**
+     * Generate operations that support HAL content type.
+     * HAL methods are generated in addition to the standard methods. They accept the same parameters but return a content of
+     * `application/hal+json` type.
+     * The operations that support HAL responses are `get`, `list`, `add` and `update`.
+     * <p>
+     * Default: false.
+     */
+    boolean hal() default false;
+
+    /**
+     * Name that should be used when generating a HAL collection response.
+     * <p>
+     * Default: hyphenated resource name without a suffix. Ignored suffixes are `Controller` and `Resource`.
+     */
+    String halCollectionName() default "";
 }
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataPanacheException.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataPanacheException.java
new file mode 100644
index 0000000000000..454f6bf50a5aa
--- /dev/null
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataPanacheException.java
@@ -0,0 +1,8 @@
+package io.quarkus.rest.data.panache;
+
+public class RestDataPanacheException extends RuntimeException {
+
+    public RestDataPanacheException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataResource.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataResource.java
index 33204a146d3a9..082291b2c805a 100644
--- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataResource.java
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/RestDataResource.java
@@ -1,10 +1,13 @@
 package io.quarkus.rest.data.panache;
 
-import javax.ws.rs.core.Response;
+import java.util.List;
+
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
 
 /**
  * Base REST data Panache resource interface.
- * Defines JAX-RS operations that will be implemented by the data store specific extensions such as Hibernate ORB or MongoDB.
+ * Defines JAX-RS operations that will be implemented by the data store specific extensions such as Hibernate ORM or MongoDB.
  * <p>
  * User shouldn't use this interface directly but rather its sub-interfaces defined by the data store specific extensions.
  *
@@ -14,13 +17,15 @@
 public interface RestDataResource<Entity, ID> {
 
     /**
-     * Return all entities as a JSON array.The response is paged by default, but that could be disabled with
-     * {@link ResourceProperties} annotation.
+     * Return entities as a JSON array.
+     * The response is paged by default, but that could be disabled with {@link ResourceProperties} annotation.
      * Response content type: application/json.
      *
-     * @return A response with a JSON array of all entities.
+     * @param page Panache page instance that should be used in a query. Will be null if pagination is disabled.
+     * @param sort Panache sort instance that should be used in a query.
+     * @return A response with an entities JSON array.
      */
-    Response list();
+    List<Entity> list(Page page, Sort sort);
 
     /**
      * Return an entity as a JSON object.
@@ -39,7 +44,7 @@ public interface RestDataResource<Entity, ID> {
      * @param entity Entity to be created
      * @return A response with a JSON object representing an entity and a location header of the new entity.
      */
-    Response add(Entity entity);
+    Entity add(Entity entity);
 
     /**
      * Update an existing entity or create a new one from the provided JSON object.
@@ -51,12 +56,13 @@ public interface RestDataResource<Entity, ID> {
      * @return A response with no-content status in case of the update.
      *         A response with a JSON object representing an entity and a location header in case of the create.
      */
-    Response update(ID id, Entity entity);
+    Entity update(ID id, Entity entity);
 
     /**
      * Delete an entity.
      *
      * @param id Entity identifier.
+     * @return A boolean indicated whether the entity was deleted or not.
      */
-    void delete(ID id);
+    boolean delete(ID id);
 }
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJsonbSerializer.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJsonbSerializer.java
index 00c4d29380ba5..b860fbbcbe92e 100644
--- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJsonbSerializer.java
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJsonbSerializer.java
@@ -37,7 +37,7 @@ public void serialize(HalEntityWrapper wrapper, JsonGenerator generator, Seriali
 
             for (PropertyModel property : classModel.getSortedProperties()) {
                 if (property.isReadable()) {
-                    context.serialize(property.getWriteName(), property.getValue(entity), generator);
+                    writeValue(property.getWriteName(), property.getValue(entity), generator, context);
                 }
             }
 
@@ -48,6 +48,14 @@ public void serialize(HalEntityWrapper wrapper, JsonGenerator generator, Seriali
         }
     }
 
+    private void writeValue(String name, Object value, JsonGenerator generator, SerializationContext context) {
+        if (value == null) {
+            generator.writeNull(name);
+        } else {
+            context.serialize(name, value, generator);
+        }
+    }
+
     private void writeLinks(Object entity, JsonGenerator generator, SerializationContext context) {
         Map<String, HalLink> links = linksExtractor.getLinks(entity);
         context.serialize("_links", links, generator);
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/jta/TransactionalExecutor.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/jta/TransactionalExecutor.java
new file mode 100644
index 0000000000000..e5576c316a2ed
--- /dev/null
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/jta/TransactionalExecutor.java
@@ -0,0 +1,15 @@
+package io.quarkus.rest.data.panache.runtime.jta;
+
+import java.util.function.Supplier;
+
+import javax.inject.Singleton;
+import javax.transaction.Transactional;
+
+@Singleton
+public class TransactionalExecutor {
+
+    @Transactional
+    public <T> T execute(Supplier<T> supplier) {
+        return supplier.get();
+    }
+}
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java
index d481e86226a8a..7712a422385fe 100644
--- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java
@@ -3,30 +3,30 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.core.ResourceMethodRegistry;
-import org.jboss.resteasy.core.ResteasyContext;
-import org.jboss.resteasy.links.ClassLinksProvider;
-import org.jboss.resteasy.links.ObjectLinksProvider;
+import org.jboss.resteasy.links.LinksProvider;
 import org.jboss.resteasy.links.RESTServiceDiscovery;
-import org.jboss.resteasy.spi.Registry;
 
 public final class ResourceLinksProvider {
 
     private static final String SELF_REF = "self";
 
     public Map<String, String> getClassLinks(Class<?> className) {
-        return linksToMap(getClassLinksProvider().getLinks(className));
+        RESTServiceDiscovery links = LinksProvider
+                .getClassLinksProvider()
+                .getLinks(className, Thread.currentThread().getContextClassLoader());
+        return linksToMap(links);
     }
 
     public Map<String, String> getInstanceLinks(Object instance) {
-        return linksToMap(getObjectLinksProvider().getLinks(instance));
+        RESTServiceDiscovery links = LinksProvider
+                .getObjectLinksProvider()
+                .getLinks(instance, Thread.currentThread().getContextClassLoader());
+        return linksToMap(links);
     }
 
     public String getSelfLink(Object instance) {
-        RESTServiceDiscovery.AtomLink link = getObjectLinksProvider()
-                .getLinks(instance)
+        RESTServiceDiscovery.AtomLink link = LinksProvider.getObjectLinksProvider()
+                .getLinks(instance, Thread.currentThread().getContextClassLoader())
                 .getLinkForRel(SELF_REF);
         return link == null ? null : link.getHref();
     }
@@ -38,16 +38,4 @@ private Map<String, String> linksToMap(RESTServiceDiscovery serviceDiscovery) {
         }
         return links;
     }
-
-    private ObjectLinksProvider getObjectLinksProvider() {
-        UriInfo uriInfo = ResteasyContext.getContextData(UriInfo.class);
-        ResourceMethodRegistry registry = (ResourceMethodRegistry) ResteasyContext.getContextData(Registry.class);
-        return new ObjectLinksProvider(uriInfo, registry);
-    }
-
-    private ClassLinksProvider getClassLinksProvider() {
-        UriInfo uriInfo = ResteasyContext.getContextData(UriInfo.class);
-        ResourceMethodRegistry registry = (ResourceMethodRegistry) ResteasyContext.getContextData(Registry.class);
-        return new ClassLinksProvider(uriInfo, registry);
-    }
 }
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java
new file mode 100644
index 0000000000000..ac61239ed1538
--- /dev/null
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilter.java
@@ -0,0 +1,41 @@
+package io.quarkus.rest.data.panache.runtime.sort;
+
+import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+
+import java.util.Collections;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@SortQueryParamValidator
+public class SortQueryParamFilter implements ContainerRequestFilter {
+
+    private static final String SORT_REGEX = "-?([a-z]|[A-Z]|_|\\$|[\u0080-\ufffe])([a-z]|[A-Z]|_|\\$|[0-9]|[\u0080-\ufffe])*";
+
+    /**
+     * Verifies that sort query parameters are valid.
+     * Valid examples:
+     * * ?sort=name,surname
+     * * ?sort=$surname&sort=-age
+     * * ?sort=_id
+     */
+    @Override
+    public void filter(ContainerRequestContext requestContext) {
+        MultivaluedMap<String, String> queryParams = requestContext.getUriInfo().getQueryParameters();
+        for (String sort : queryParams.getOrDefault("sort", Collections.emptyList())) {
+            for (String sortPart : sort.split(",")) {
+                String trimmed = sortPart.trim();
+                if (trimmed.length() > 0 && !trimmed.matches(SORT_REGEX)) {
+                    requestContext.abortWith(
+                            Response.status(BAD_REQUEST)
+                                    .entity(String.format("Invalid sort parameter '%s'", sort))
+                                    .build());
+                }
+            }
+        }
+    }
+}
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java
new file mode 100644
index 0000000000000..58a33e834290f
--- /dev/null
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamValidator.java
@@ -0,0 +1,14 @@
+package io.quarkus.rest.data.panache.runtime.sort;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.ws.rs.NameBinding;
+
+@NameBinding
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+public @interface SortQueryParamValidator {
+}
diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java
index 3e69d37def3e5..59ab3f35e74cd 100644
--- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java
+++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java
@@ -23,6 +23,14 @@ void shouldSerializeOneBook() {
         assertBook(book, jsonReader.readObject());
     }
 
+    @Test
+    void shouldSerializeOneBookWithNullName() {
+        Book book = new Book(1, null);
+        JsonReader jsonReader = Json.createReader(new StringReader(toJson(new HalEntityWrapper(book))));
+
+        assertBook(book, jsonReader.readObject());
+    }
+
     @Test
     void shouldSerializeCollectionOfBooks() {
         Book book = new Book(1, "Black Swan");
@@ -39,7 +47,11 @@ void shouldSerializeCollectionOfBooks() {
 
     private void assertBook(Book book, JsonObject bookJson) {
         assertThat(bookJson.getInt("id")).isEqualTo(book.id);
-        assertThat(bookJson.getString("book-name")).isEqualTo(book.getName());
+        if (bookJson.isNull("book-name")) {
+            assertThat(book.getName()).isNull();
+        } else {
+            assertThat(bookJson.getString("book-name")).isEqualTo(book.getName());
+        }
         assertThat(bookJson.containsKey("ignored")).isFalse();
 
         JsonObject bookLinksJson = bookJson.getJsonObject("_links");
diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java
new file mode 100644
index 0000000000000..5b463fae49ead
--- /dev/null
+++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/sort/SortQueryParamFilterTest.java
@@ -0,0 +1,98 @@
+package io.quarkus.rest.data.panache.runtime.sort;
+
+import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class SortQueryParamFilterTest {
+
+    @Mock
+    private ContainerRequestContext requestContext;
+
+    @Mock
+    private UriInfo uriInfo;
+
+    private final SortQueryParamFilter filter = new SortQueryParamFilter();
+
+    @BeforeEach
+    void setUp() {
+        given(requestContext.getUriInfo()).willReturn(uriInfo);
+    }
+
+    @Test
+    void shouldAllowValidParameters() {
+        MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
+        map.putSingle("sort", "$name");
+        map.putSingle("sort", "-surname_1");
+        given(uriInfo.getQueryParameters()).willReturn(map);
+
+        filter.filter(requestContext);
+
+        verify(requestContext, times(0)).abortWith(any());
+    }
+
+    @Test
+    void shouldAllowValidParametersWithMultipleValues() {
+        MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
+        map.putSingle("sort", "$name,-surname_1");
+        given(uriInfo.getQueryParameters()).willReturn(map);
+
+        filter.filter(requestContext);
+
+        verify(requestContext, times(0)).abortWith(any());
+    }
+
+    @Test
+    void shouldAllowEmptyParameters() {
+        given(uriInfo.getQueryParameters()).willReturn(new MultivaluedHashMap<>());
+
+        filter.filter(requestContext);
+
+        verify(requestContext, times(0)).abortWith(any());
+    }
+
+    @Test
+    void shouldCatchInvalidParameter() {
+        MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
+        map.putSingle("sort", "$name");
+        map.putSingle("sort", "(surname_1");
+        given(uriInfo.getQueryParameters()).willReturn(map);
+
+        filter.filter(requestContext);
+
+        verify(requestContext).abortWith(argThat(abortResponseMatcher("(surname_1")));
+    }
+
+    @Test
+    void shouldCatchInvalidParameterValue() {
+        MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
+        map.putSingle("sort", "$name,1_surname");
+        given(uriInfo.getQueryParameters()).willReturn(map);
+
+        filter.filter(requestContext);
+
+        verify(requestContext).abortWith(argThat(abortResponseMatcher("$name,1_surname")));
+    }
+
+    private ArgumentMatcher<Response> abortResponseMatcher(String sortValue) {
+        return response -> response.getStatus() == BAD_REQUEST.getStatusCode()
+                && response.getEntity().equals(String.format("Invalid sort parameter '%s'", sortValue));
+    }
+}
diff --git a/extensions/picocli/pom.xml b/extensions/picocli/pom.xml
index 2ffd32e9c0bba..101df1229cbb8 100644
--- a/extensions/picocli/pom.xml
+++ b/extensions/picocli/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-picocli-parent</artifactId>
diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java
index ccf5cd8dfb5ef..08160a271738e 100644
--- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java
+++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/DefaultPicocliCommandLineFactory.java
@@ -24,7 +24,7 @@ public DefaultPicocliCommandLineFactory(@TopCommand Instance<Object> topCommand,
 
     private Class<?> classForName(String name) {
         try {
-            return Class.forName(name);
+            return Class.forName(name, false, Thread.currentThread().getContextClassLoader());
         } catch (ClassNotFoundException ex) {
             throw new IllegalArgumentException(ex);
         }
diff --git a/extensions/picocli/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/picocli/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 0b41f860370ee..8e0578be53ce3 100644
--- a/extensions/picocli/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/picocli/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Picocli"
 metadata:
   keywords:
@@ -8,3 +7,10 @@ metadata:
   categories:
   - "miscellaneous"
   status: "experimental"
+  codestart:
+    name: "picocli"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/pom.xml b/extensions/pom.xml
index ed53e95a036dc..44ff9a58ff8e9 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -18,6 +18,7 @@
         <module>arc</module>
         <module>scheduler</module>
         <module>quartz</module>
+        <module>jaxp</module>
 
         <!-- Configuration -->
         <module>config-yaml</module>
@@ -32,8 +33,9 @@
         <module>vertx-core</module>
         <module>vertx-http</module>
         <module>undertow</module>
-        <module>undertow-websockets</module>
+        <module>websockets</module>
         <module>webjars-locator</module>
+        <module>resteasy-reactive</module>
 
         <!-- Monitoring -->
         <module>smallrye-health</module>
@@ -41,6 +43,8 @@
         <module>smallrye-opentracing</module>
         <module>smallrye-fault-tolerance</module>
         <module>jaeger</module>
+        <module>micrometer</module>
+        <module>micrometer-registry-prometheus</module>
 
         <!-- REST services -->
         <module>resteasy-common</module>
@@ -49,12 +53,15 @@
         <module>resteasy-jsonb</module>
         <module>resteasy-jackson</module>
         <module>resteasy-jaxb</module>
+        <module>resteasy-mutiny-common</module>
         <module>resteasy-mutiny</module>
         <module>resteasy-qute</module>
+        <module>resteasy-multipart</module>
         <module>rest-client</module>
         <module>rest-client-jackson</module>
         <module>rest-client-jsonb</module>
         <module>rest-client-jaxb</module>
+        <module>rest-client-mutiny</module>
         <module>smallrye-openapi-common</module>
         <module>smallrye-openapi</module>
         <module>swagger-ui</module>
@@ -64,6 +71,7 @@
         <module>vertx</module>
         <module>vertx-web</module>
         <module>netty</module>
+        <module>reactive-messaging-http</module>
         <module>reactive-streams-operators</module>
         <module>smallrye-reactive-messaging</module>
         <module>smallrye-reactive-messaging-kafka</module>
@@ -89,7 +97,7 @@
         <module>hibernate-reactive</module>
         <module>hibernate-validator</module>
         <module>panache</module>
-        <module>hibernate-search-elasticsearch</module>
+        <module>hibernate-search-orm-elasticsearch</module>
         <module>elasticsearch-rest-client-common</module>
         <module>elasticsearch-rest-client</module>
         <module>elasticsearch-rest-high-level-client</module>
@@ -103,6 +111,7 @@
         <module>artemis-core</module>
         <module>artemis-jms</module>
         <module>avro</module>
+        <module>devservices</module>
 
         <!-- Spring -->
         <module>spring-di</module>
@@ -113,6 +122,7 @@
         <module>spring-cloud-config-client</module>
         <module>spring-cache</module>
         <module>spring-scheduled</module>
+        <module>spring-data-rest</module>
 
         <!-- Security -->
         <module>security</module>
@@ -123,8 +133,13 @@
         <module>elytron-security-ldap</module>
         <module>elytron-security-properties-file</module>
         <module>elytron-security-oauth2</module>
+        <module>smallrye-jwt-build</module>
         <module>smallrye-jwt</module>
+        <module>oidc-common</module>
         <module>oidc</module>
+        <module>oidc-token-propagation</module>
+        <module>oidc-client</module>
+        <module>oidc-client-filter</module>
         <module>keycloak-authorization</module>
         <module>keycloak-admin-client</module>
 
@@ -138,7 +153,10 @@
         <!-- Integrations -->
         <module>amazon-lambda</module>
         <module>amazon-lambda-xray</module>
+        <!-- AWS API Gateway HTTP API -->
         <module>amazon-lambda-http</module>
+        <!-- AWS API Gateway REST API -->
+        <module>amazon-lambda-rest</module>
         <module>amazon-services</module>
         <module>amazon-alexa</module>
         <module>azure-functions-http</module>
@@ -155,6 +173,8 @@
         <module>kubernetes</module>
         <module>kubernetes-client</module>
         <module>kubernetes-config</module>
+        <module>openshift-client</module>
+        <module>kubernetes-service-binding</module>
 
         <!-- Consul -->
         <module>consul-config</module>
@@ -183,31 +203,35 @@
         <module>picocli</module>
         <module>google-cloud-functions-http</module>
         <module>google-cloud-functions</module>
+        <module>grpc-common</module>
     </modules>
 
-    <!-- Unfortunately the config below introduces a build dependency on the maven plugin
-         which leads to an ordering that prevents the tooling to include the generated
-         JSON platform descriptor.
-         Hopefully, this can be re-enabled once we refactor the tools.
     <build>
         <plugins>
             <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${project.version}</version>
-                <inherited>false</inherited>
-                < ! - - Settings for stubbing new extensions via
-                     mvn quarkus:create-extension -N -Dquarkus.artifactIdBase=my-ext -Dquarkus.nameBase="My Extension"
-                - - >
-                <configuration>
-                    <artifactIdPrefix>quarkus-</artifactIdPrefix>
-                    <namePrefix xml:space="preserve">Quarkus - </namePrefix>
-                    <quarkusVersion>@{project.version}</quarkusVersion>
-                    <bomPath>../bom/application/pom.xml</runtimeBomPath>
-                    <itestParentPath>../integration-tests/pom.xml</itestParentPath>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-no-runtime-deps</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bansRuntimeDependency implementation="io.quarkus.enforcer.BansRuntimeDependency"/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-enforcer-rules</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>
-    -->
 </project>
diff --git a/extensions/quartz/deployment/pom.xml b/extensions/quartz/deployment/pom.xml
index ee15976860035..3e781bd48c515 100644
--- a/extensions/quartz/deployment/pom.xml
+++ b/extensions/quartz/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-quartz-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java b/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java
index fb440f4efa5bd..38f52a0eac2f7 100644
--- a/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java
+++ b/extensions/quartz/deployment/src/main/java/io/quarkus/quartz/deployment/QuartzProcessor.java
@@ -5,14 +5,21 @@
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.logging.Level;
 
 import javax.inject.Singleton;
 
+import org.jboss.jandex.DotName;
+import org.quartz.Job;
+import org.quartz.JobListener;
+import org.quartz.TriggerListener;
 import org.quartz.core.QuartzSchedulerThread;
 import org.quartz.core.SchedulerSignalerImpl;
 import org.quartz.impl.StdSchedulerFactory;
 import org.quartz.impl.jdbcjobstore.AttributeRestoringConnectionInvocationHandler;
+import org.quartz.impl.jdbcjobstore.DB2v8Delegate;
 import org.quartz.impl.jdbcjobstore.HSQLDBDelegate;
 import org.quartz.impl.jdbcjobstore.JobStoreSupport;
 import org.quartz.impl.jdbcjobstore.MSSQLDelegate;
@@ -23,17 +30,23 @@
 import org.quartz.simpl.CascadingClassLoadHelper;
 import org.quartz.simpl.SimpleInstanceIdGenerator;
 import org.quartz.simpl.SimpleThreadPool;
+import org.quartz.spi.SchedulerPlugin;
 
-import io.quarkus.agroal.deployment.JdbcDataSourceBuildItem;
-import io.quarkus.agroal.deployment.JdbcDataSourceSchemaReadyBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
+import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.AutoAddScopeBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
@@ -41,25 +54,41 @@
 import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
 import io.quarkus.quartz.runtime.QuarkusQuartzConnectionPoolProvider;
 import io.quarkus.quartz.runtime.QuartzBuildTimeConfig;
+import io.quarkus.quartz.runtime.QuartzExtensionPointConfig;
 import io.quarkus.quartz.runtime.QuartzRecorder;
 import io.quarkus.quartz.runtime.QuartzRuntimeConfig;
 import io.quarkus.quartz.runtime.QuartzScheduler;
 import io.quarkus.quartz.runtime.QuartzSupport;
 
 /**
- * @author Martin Kouba
+ *
  */
 public class QuartzProcessor {
+
+    private static final DotName JOB = DotName.createSimple(Job.class.getName());
+
     @BuildStep
     CapabilityBuildItem capability() {
         return new CapabilityBuildItem(Capability.QUARTZ);
     }
 
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.QUARTZ);
+    }
+
     @BuildStep
     AdditionalBeanBuildItem beans() {
         return new AdditionalBeanBuildItem(QuartzScheduler.class);
     }
 
+    @BuildStep
+    AutoAddScopeBuildItem addScope() {
+        // Add @Dependent to a Job implementation that has no scope defined but requires CDI services
+        return AutoAddScopeBuildItem.builder().implementsInterface(JOB).requiresContainerServices()
+                .defaultScope(BuiltinScope.DEPENDENT).build();
+    }
+
     @BuildStep
     NativeImageProxyDefinitionBuildItem connectionProxy(QuartzBuildTimeConfig config) {
         if (config.storeType.isDbStore()) {
@@ -70,7 +99,8 @@ NativeImageProxyDefinitionBuildItem connectionProxy(QuartzBuildTimeConfig config
 
     @BuildStep
     QuartzJDBCDriverDialectBuildItem driver(List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
-            QuartzBuildTimeConfig config) {
+            QuartzBuildTimeConfig config,
+            Capabilities capabilities) {
         if (!config.storeType.isDbStore()) {
             if (config.clustered) {
                 throw new ConfigurationError("Clustered jobs configured with unsupported job store option");
@@ -79,6 +109,11 @@ QuartzJDBCDriverDialectBuildItem driver(List<JdbcDataSourceBuildItem> jdbcDataSo
             return new QuartzJDBCDriverDialectBuildItem(Optional.empty());
         }
 
+        if (capabilities.isMissing(Capability.AGROAL)) {
+            throw new ConfigurationError(
+                    "The Agroal extension is missing and it is required when a Quartz JDBC store is used.");
+        }
+
         Optional<JdbcDataSourceBuildItem> selectedJdbcDataSourceBuildItem = jdbcDataSourceBuildItems.stream()
                 .filter(i -> config.dataSourceName.isPresent() ? config.dataSourceName.get().equals(i.getName())
                         : i.isDefault())
@@ -86,7 +121,7 @@ QuartzJDBCDriverDialectBuildItem driver(List<JdbcDataSourceBuildItem> jdbcDataSo
 
         if (!selectedJdbcDataSourceBuildItem.isPresent()) {
             String message = String.format(
-                    "JDBC Store configured but '%s' datasource is not configured properly. You can configure your datasource by following the guide available at: https://quarkus.io/guides/datasource-guide",
+                    "JDBC Store configured but the '%s' datasource is not configured properly. You can configure your datasource by following the guide available at: https://quarkus.io/guides/datasource",
                     config.dataSourceName.isPresent() ? config.dataSourceName.get() : "default");
             throw new ConfigurationError(message);
         }
@@ -109,6 +144,9 @@ private String guessDriver(Optional<JdbcDataSourceBuildItem> jdbcDataSource) {
         if (DatabaseKind.isMsSQL(dataSourceKind)) {
             return MSSQLDelegate.class.getName();
         }
+        if (DatabaseKind.isDB2(dataSourceKind)) {
+            return DB2v8Delegate.class.getName();
+        }
 
         return StdJDBCDelegate.class.getName();
 
@@ -123,6 +161,8 @@ List<ReflectiveClassBuildItem> reflectiveClasses(QuartzBuildTimeConfig config,
         reflectiveClasses.add(new ReflectiveClassBuildItem(true, false, SimpleInstanceIdGenerator.class.getName()));
         reflectiveClasses.add(new ReflectiveClassBuildItem(false, false, CascadingClassLoadHelper.class.getName()));
         reflectiveClasses.add(new ReflectiveClassBuildItem(true, true, config.storeType.clazz));
+        reflectiveClasses
+                .add(new ReflectiveClassBuildItem(false, false, org.quartz.simpl.InitThreadContextClassLoadHelper.class));
 
         if (config.storeType.isDbStore()) {
             reflectiveClasses.add(new ReflectiveClassBuildItem(true, false, JobStoreSupport.class.getName()));
@@ -136,6 +176,27 @@ List<ReflectiveClassBuildItem> reflectiveClasses(QuartzBuildTimeConfig config,
                     .add(new ReflectiveClassBuildItem(true, false, QuarkusQuartzConnectionPoolProvider.class.getName()));
         }
 
+        reflectiveClasses.addAll(getAdditionalConfigurationReflectiveClasses(config.triggerListeners, TriggerListener.class));
+        reflectiveClasses.addAll(getAdditionalConfigurationReflectiveClasses(config.jobListeners, JobListener.class));
+        reflectiveClasses.addAll(getAdditionalConfigurationReflectiveClasses(config.plugins, SchedulerPlugin.class));
+
+        return reflectiveClasses;
+    }
+
+    private List<ReflectiveClassBuildItem> getAdditionalConfigurationReflectiveClasses(
+            Map<String, QuartzExtensionPointConfig> config, Class<?> clazz) {
+        List<ReflectiveClassBuildItem> reflectiveClasses = new ArrayList<>();
+        for (QuartzExtensionPointConfig props : config.values()) {
+            try {
+                if (!clazz
+                        .isAssignableFrom(Class.forName(props.clazz, false, Thread.currentThread().getContextClassLoader()))) {
+                    throw new IllegalArgumentException(String.format("%s does not implements %s", props.clazz, clazz));
+                }
+            } catch (ClassNotFoundException e) {
+                throw new IllegalArgumentException(e);
+            }
+            reflectiveClasses.add(new ReflectiveClassBuildItem(true, false, props.clazz));
+        }
         return reflectiveClasses;
     }
 
@@ -143,15 +204,17 @@ List<ReflectiveClassBuildItem> reflectiveClasses(QuartzBuildTimeConfig config,
     public List<LogCleanupFilterBuildItem> logCleanup(QuartzBuildTimeConfig config) {
         List<LogCleanupFilterBuildItem> logCleanUps = new ArrayList<>();
         logCleanUps.add(new LogCleanupFilterBuildItem(StdSchedulerFactory.class.getName(),
+                Level.INFO,
                 "Quartz scheduler version:",
                 "Using default implementation for",
-                "Quartz scheduler 'QuarkusQuartzScheduler'"));
+                "Quartz scheduler '"));
 
         logCleanUps.add(new LogCleanupFilterBuildItem(org.quartz.core.QuartzScheduler.class.getName(),
+                Level.INFO,
                 "Quartz Scheduler v",
                 "JobFactory set to:",
                 "Scheduler meta-data:",
-                "Scheduler QuarkusQuartzScheduler"));
+                "Scheduler "));
 
         logCleanUps.add(new LogCleanupFilterBuildItem(config.storeType.clazz, config.storeType.simpleName
                 + " initialized.", "Handling", "Using db table-based data access locking",
@@ -184,7 +247,7 @@ public void quartzSupportBean(QuartzRuntimeConfig runtimeConfig, QuartzBuildTime
             QuartzJDBCDriverDialectBuildItem driverDialect) {
 
         syntheticBeanBuildItemBuildProducer.produce(SyntheticBeanBuildItem.configure(QuartzSupport.class)
-                .scope(Singleton.class)
+                .scope(Singleton.class) // this should be @ApplicationScoped but it fails for some reason
                 .setRuntimeInit()
                 .supplier(recorder.quartzSupportSupplier(runtimeConfig, buildTimeConfig, driverDialect.getDriver())).done());
     }
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java
new file mode 100644
index 0000000000000..d2a91f2451cdc
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/DuplicateIdentityExpressionTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.quartz.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DuplicateIdentityExpressionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setExpectedException(IllegalStateException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DuplicateIdentityExpressionTest.InvalidBean.class)
+                    .addAsResource(new StringAsset("my.identity=my_name"),
+                            "application.properties"));
+
+    @Test
+    public void test() {
+    }
+
+    static class InvalidBean {
+
+        @Scheduled(every = "1s", identity = "{my.identity}")
+        @Scheduled(every = "1s", identity = "my_name")
+        void wrong() {
+        }
+
+    }
+
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java
new file mode 100644
index 0000000000000..b5d64284a99fc
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/HaltedSchedulerTest.java
@@ -0,0 +1,42 @@
+package io.quarkus.quartz.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.quartz.SchedulerException;
+
+import io.quarkus.scheduler.Scheduler;
+import io.quarkus.test.QuarkusUnitTest;
+
+public final class HaltedSchedulerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("quarkus.quartz.start-mode=halted"),
+                            "application.properties"));
+
+    @Inject
+    Scheduler scheduler;
+
+    @Inject
+    org.quartz.Scheduler quartzScheduler;
+
+    @Test
+    public final void testSchedulerHalted() throws SchedulerException {
+        assertSchedulerState(false);
+        quartzScheduler.start();
+        assertSchedulerState(true);
+    }
+
+    private void assertSchedulerState(final boolean expectedState) throws SchedulerException {
+        assertEquals(expectedState, scheduler.isRunning());
+        assertEquals(expectedState, quartzScheduler.isStarted());
+    }
+}
\ No newline at end of file
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectDeprecatedForceStartQuartzSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectDeprecatedForceStartQuartzSchedulerTest.java
new file mode 100644
index 0000000000000..1b53c04fc6333
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectDeprecatedForceStartQuartzSchedulerTest.java
@@ -0,0 +1,68 @@
+package io.quarkus.quartz.test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.enterprise.event.Observes;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+
+import io.quarkus.runtime.StartupEvent;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InjectDeprecatedForceStartQuartzSchedulerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Starter.class)
+                    .addAsResource(new StringAsset("quarkus.quartz.force-start=true"),
+                            "application.properties"));
+
+    @Test
+    public void testSimpleScheduledJobs() throws InterruptedException {
+        assertTrue(Starter.LATCH.await(5, TimeUnit.SECONDS), "Latch count: " + Starter.LATCH.getCount());
+    }
+
+    public static class Starter implements Job {
+
+        static final CountDownLatch LATCH = new CountDownLatch(2);
+
+        void onStart(@Observes StartupEvent event, Scheduler quartz) throws SchedulerException {
+            JobDetail job = JobBuilder.newJob(Starter.class)
+                    .withIdentity("myJob", "myGroup")
+                    .build();
+            Trigger trigger = TriggerBuilder.newTrigger()
+                    .withIdentity("myTrigger", "myGroup")
+                    .startNow()
+                    .withSchedule(SimpleScheduleBuilder.simpleSchedule()
+                            .withIntervalInSeconds(1)
+                            .repeatForever())
+                    .build();
+            quartz.scheduleJob(job, trigger);
+        }
+
+        @Override
+        public void execute(JobExecutionContext context) throws JobExecutionException {
+            LATCH.countDown();
+        }
+
+    }
+
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java
new file mode 100644
index 0000000000000..25cdf5d4dad2d
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java
@@ -0,0 +1,97 @@
+package io.quarkus.quartz.test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.runtime.StartupEvent;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InjectJobTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Starter.class, Service.class, CountDownLatchProducer.class)
+                    .addAsResource(new StringAsset("quarkus.quartz.force-start=true"),
+                            "application.properties"));
+
+    @Test
+    public void testSimpleScheduledJobs() throws InterruptedException {
+        CountDownLatch latch = Arc.container().instance(CountDownLatch.class).get();
+        assertTrue(latch.await(5, TimeUnit.SECONDS), "Latch count: " + latch.getCount());
+    }
+
+    @ApplicationScoped
+    public static class CountDownLatchProducer {
+        @Produces
+        @Singleton
+        CountDownLatch LATCH = new CountDownLatch(2);
+    }
+
+    @ApplicationScoped
+    public static class Service {
+
+        @Inject
+        CountDownLatch latch;
+
+        public void execute() {
+            latch.countDown();
+        }
+
+    }
+
+    public static class Starter {
+
+        void onStart(@Observes StartupEvent event, Scheduler quartz) throws SchedulerException {
+            JobDetail job = JobBuilder.newJob(ServiceJob.class)
+                    .withIdentity("myJob", "myGroup")
+                    .build();
+            Trigger trigger = TriggerBuilder.newTrigger()
+                    .withIdentity("myTrigger", "myGroup")
+                    .startNow()
+                    .withSchedule(SimpleScheduleBuilder.simpleSchedule()
+                            .withIntervalInSeconds(1)
+                            .repeatForever())
+                    .build();
+            quartz.scheduleJob(job, trigger);
+        }
+
+    }
+
+    public static class ServiceJob implements Job {
+
+        @Inject
+        Service service;
+
+        @Override
+        public void execute(JobExecutionContext context) throws JobExecutionException {
+            service.execute();
+        }
+    }
+
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java
index d64b45854a8ea..e79f21ef1c6ed 100644
--- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectQuartzSchedulerTest.java
@@ -32,7 +32,7 @@ public class InjectQuartzSchedulerTest {
     static final QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(Starter.class)
-                    .addAsResource(new StringAsset("quarkus.quartz.force-start=true"),
+                    .addAsResource(new StringAsset("quarkus.quartz.start-mode=forced"),
                             "application.properties"));
 
     @Test
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java
new file mode 100644
index 0000000000000..675233458a4be
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InvalidTriggerListenerConfigurationTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.quartz.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InvalidTriggerListenerConfigurationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setExpectedException(IllegalArgumentException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SimpleJobs.class)
+                    .addAsResource(new StringAsset(
+                            "quarkus.quartz.trigger-listeners.jobHistory.class=org.quartz.plugins.history.LoggingJobHistoryPlugin\n"
+                                    + "quarkus.quartz.trigger-listeners.jobHistory.properties.jobSuccessMessage=Job [{1}.{0}] execution complete and reports: {8}"),
+                            "application.properties"));
+
+    @Test
+    public void shouldFailWhenInvalidTriggerListenerConfiguration() {
+        Assertions.fail();
+    }
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java
new file mode 100644
index 0000000000000..9c97aeb525d0f
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingConfigIdentityExpressionTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.quartz.test;
+
+import java.util.NoSuchElementException;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MissingConfigIdentityExpressionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setExpectedException(NoSuchElementException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MissingConfigIdentityExpressionTest.InvalidBean.class));
+
+    @Test
+    public void test() {
+    }
+
+    static class InvalidBean {
+
+        @Scheduled(every = "1s", identity = "{my.identity}")
+        void wrong() {
+        }
+
+    }
+
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java
new file mode 100644
index 0000000000000..595fde4cfb437
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterJobListenerTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.quartz.test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.quartz.SchedulerException;
+
+import io.quarkus.quartz.test.listeners.HelloJobListener;
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class RegisterJobListenerTest {
+
+    @Inject
+    org.quartz.Scheduler quartzScheduler;
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Jobs.class)
+                    .addClass(HelloJobListener.class)
+                    .addAsResource(new StringAsset(
+                            "quarkus.quartz.job-listeners.testJobListener.class=io.quarkus.quartz.test.listeners.HelloJobListener"),
+                            "application.properties"));
+
+    @Test
+    public void testJobListenerRegistered() throws InterruptedException, SchedulerException {
+        assertNotNull(quartzScheduler.getListenerManager().getJobListener("testJobListener"));
+    }
+
+    static class Jobs {
+        @Scheduled(every = "1s")
+        void checkEverySecond() {
+            // no op
+        }
+    }
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java
new file mode 100644
index 0000000000000..1851efd88786b
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/RegisterLoggingJobHistoryPluginTest.java
@@ -0,0 +1,42 @@
+package io.quarkus.quartz.test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.scheduler.Scheduler;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class RegisterLoggingJobHistoryPluginTest {
+
+    @Inject
+    Scheduler quartzScheduler;
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Jobs.class)
+                    .addAsResource(new StringAsset(
+                            "quarkus.quartz.plugin.jobHistory.class=org.quartz.plugins.history.LoggingJobHistoryPlugin\n"
+                                    + "quarkus.quartz.plugin.jobHistory.jobSuccessMessage=Job [{1}.{0}] execution complete and reports: {8}"),
+                            "application.properties"));
+
+    @Test
+    public void testSchedulerStarted() throws InterruptedException {
+        assertTrue(quartzScheduler.isRunning());
+    }
+
+    static class Jobs {
+        @Scheduled(every = "1s")
+        void checkEverySecond() {
+            // no op
+        }
+    }
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java
new file mode 100644
index 0000000000000..c572869511aef
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/SimpleIdentityTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.quartz.test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SimpleIdentityTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Jobs.class)
+                    .addAsResource(new StringAsset("jobs.identity=every_1s_another_name"),
+                            "application.properties"));
+
+    @Test
+    public void testJobsWithIdentity() throws InterruptedException {
+        // Only assert that the scheduled method is working fine
+        assertTrue(Jobs.LATCH.await(5, TimeUnit.SECONDS));
+    }
+
+    public static class Jobs {
+
+        static final CountDownLatch LATCH = new CountDownLatch(2);
+
+        @Scheduled(every = "1s", identity = "every_1s_name")
+        @Scheduled(every = "1s", identity = "{jobs.identity}")
+        void ping() {
+            LATCH.countDown();
+        }
+
+    }
+
+}
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/listeners/HelloJobListener.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/listeners/HelloJobListener.java
new file mode 100644
index 0000000000000..4a80629bde027
--- /dev/null
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/listeners/HelloJobListener.java
@@ -0,0 +1,28 @@
+package io.quarkus.quartz.test.listeners;
+
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.JobListener;
+
+public class HelloJobListener implements JobListener {
+
+    @Override
+    public String getName() {
+        return "testJobListener";
+    }
+
+    @Override
+    public void jobToBeExecuted(JobExecutionContext jobExecutionContext) {
+
+    }
+
+    @Override
+    public void jobExecutionVetoed(JobExecutionContext jobExecutionContext) {
+
+    }
+
+    @Override
+    public void jobWasExecuted(JobExecutionContext jobExecutionContext, JobExecutionException e) {
+
+    }
+}
diff --git a/extensions/quartz/pom.xml b/extensions/quartz/pom.xml
index d9808d29769ea..7f74b6bda5d96 100644
--- a/extensions/quartz/pom.xml
+++ b/extensions/quartz/pom.xml
@@ -3,15 +3,15 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>quarkus-build-parent</artifactId>
+    <artifactId>quarkus-extensions-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../../build-parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>quarkus-quartz-parent</artifactId>
-  <name>Quarkus - Scheduler Quartz</name>
+  <name>Quarkus - Quartz</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/extensions/quartz/runtime/pom.xml b/extensions/quartz/runtime/pom.xml
index 7bed3d83b653f..a2b8e49242153 100644
--- a/extensions/quartz/runtime/pom.xml
+++ b/extensions/quartz/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-quartz-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java
index 4411910f4a0f0..a1f90ee2ac095 100644
--- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java
@@ -1,7 +1,10 @@
 package io.quarkus.quartz.runtime;
 
+import java.util.Map;
 import java.util.Optional;
 
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -16,6 +19,12 @@ public class QuartzBuildTimeConfig {
     @ConfigItem
     public boolean clustered;
 
+    /**
+     * The frequency (in milliseconds) at which the scheduler instance checks-in with other instances of the cluster.
+     */
+    @ConfigItem(defaultValue = "15000")
+    public long clusterCheckinInterval;
+
     /**
      * The type of store to use.
      * <p>
@@ -38,4 +47,34 @@ public class QuartzBuildTimeConfig {
      */
     @ConfigItem(name = "datasource")
     public Optional<String> dataSourceName;
+
+    /**
+     * The prefix for quartz job store tables.
+     * <p>
+     * Ignored if using a `ram` store.
+     */
+    @ConfigItem(defaultValue = "QRTZ_")
+    public String tablePrefix;
+
+    /**
+     * Trigger listeners.
+     */
+    @ConfigItem
+    @ConfigDocMapKey("listener-name")
+    @ConfigDocSection
+    public Map<String, QuartzExtensionPointConfig> triggerListeners;
+    /**
+     * Job listeners.
+     */
+    @ConfigItem
+    @ConfigDocMapKey("listener-name")
+    @ConfigDocSection
+    public Map<String, QuartzExtensionPointConfig> jobListeners;
+    /**
+     * Plugins.
+     */
+    @ConfigItem
+    @ConfigDocMapKey("plugin-name")
+    @ConfigDocSection
+    public Map<String, QuartzExtensionPointConfig> plugins;
 }
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzExtensionPointConfig.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzExtensionPointConfig.java
new file mode 100644
index 0000000000000..d0df8c85d4c6a
--- /dev/null
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzExtensionPointConfig.java
@@ -0,0 +1,23 @@
+package io.quarkus.quartz.runtime;
+
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class QuartzExtensionPointConfig {
+    /**
+     * Class name for the configuration.
+     */
+    @ConfigItem(name = "class")
+    public String clazz;
+
+    /**
+     * The properties passed to the class.
+     */
+    @ConfigItem
+    @ConfigDocMapKey("property-name")
+    public Map<String, String> properties;
+}
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzRuntimeConfig.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzRuntimeConfig.java
index 6486d3c7dff48..68be1a59d2210 100644
--- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzRuntimeConfig.java
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzRuntimeConfig.java
@@ -1,5 +1,7 @@
 package io.quarkus.quartz.runtime;
 
+import java.util.Optional;
+
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -7,6 +9,12 @@
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
 public class QuartzRuntimeConfig {
 
+    /**
+     * The name of the Quartz instance.
+     */
+    @ConfigItem(defaultValue = "QuarkusQuartzScheduler")
+    public String instanceName;
+
     /**
      * The size of scheduler thread pool. This will initialize the number of worker threads in the pool.
      */
@@ -23,8 +31,23 @@ public class QuartzRuntimeConfig {
      * By default, the scheduler is not started unless a {@link io.quarkus.scheduler.Scheduled} business method is found.
      * If set to true the scheduler will be started even if no scheduled business methods are found. This is necessary for
      * "pure" programmatic scheduling.
+     *
+     * @deprecated use quarkus.quartz.start-mode=forced instead.
      */
+    @Deprecated
     @ConfigItem
-    public boolean forceStart;
+    public Optional<Boolean> forceStart;
 
+    /**
+     * Scheduler can be started in different modes: normal, forced or halted.
+     * By default, the scheduler is not started unless a {@link io.quarkus.scheduler.Scheduled} business method
+     * is found.
+     * If set to "forced", scheduler will be started even if no scheduled business methods are found.
+     * This is necessary for "pure" programmatic scheduling.
+     * Additionally, setting it to "halted" will behave just like forced mode but the scheduler will not start
+     * triggering jobs until an explicit start is called from the main scheduler.
+     * This is useful to programmatically register listeners before scheduler starts performing some work.
+     */
+    @ConfigItem(defaultValue = "normal")
+    public QuartzStartMode startMode;
 }
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java
index de6fff650dc6b..684d9388c7480 100644
--- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java
@@ -12,25 +12,27 @@
 import javax.enterprise.context.BeforeDestroyed;
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
 import javax.inject.Singleton;
 import javax.interceptor.Interceptor;
 import javax.transaction.SystemException;
 import javax.transaction.UserTransaction;
 
-import org.eclipse.microprofile.config.Config;
 import org.jboss.logging.Logger;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.Job;
 import org.quartz.JobBuilder;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
 import org.quartz.ScheduleBuilder;
 import org.quartz.SchedulerException;
 import org.quartz.SchedulerFactory;
 import org.quartz.SimpleScheduleBuilder;
 import org.quartz.TriggerBuilder;
 import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.simpl.InitThreadContextClassLoadHelper;
 import org.quartz.simpl.SimpleJobFactory;
 import org.quartz.spi.TriggerFiredBundle;
 
@@ -41,8 +43,6 @@
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.parser.CronParser;
 
-import io.quarkus.arc.Arc;
-import io.quarkus.arc.InstanceHandle;
 import io.quarkus.runtime.StartupEvent;
 import io.quarkus.scheduler.Scheduled;
 import io.quarkus.scheduler.Scheduled.ConcurrentExecution;
@@ -54,8 +54,8 @@
 import io.quarkus.scheduler.runtime.ScheduledMethodMetadata;
 import io.quarkus.scheduler.runtime.SchedulerContext;
 import io.quarkus.scheduler.runtime.SchedulerRuntimeConfig;
-import io.quarkus.scheduler.runtime.SimpleScheduler;
 import io.quarkus.scheduler.runtime.SkipConcurrentExecutionInvoker;
+import io.quarkus.scheduler.runtime.util.SchedulerUtils;
 
 @Singleton
 public class QuartzScheduler implements Scheduler {
@@ -65,24 +65,27 @@ public class QuartzScheduler implements Scheduler {
 
     private final org.quartz.Scheduler scheduler;
     private final boolean enabled;
+    private final boolean startHalted;
 
-    @Produces
-    @Singleton
-    org.quartz.Scheduler produceQuartzScheduler() {
-        if (scheduler == null) {
-            throw new IllegalStateException(
-                    "Quartz scheduler is either explicitly disabled through quarkus.scheduler.enabled=false or no @Scheduled methods were found. If you only need to schedule a job programmatically you can force the start of the scheduler via quarkus.quartz.force-start=true");
+    public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, SchedulerRuntimeConfig schedulerRuntimeConfig,
+            Event<SkippedExecution> skippedExecutionEvent, Instance<Job> jobs, Instance<UserTransaction> userTransation) {
+        enabled = schedulerRuntimeConfig.enabled;
+        final QuartzRuntimeConfig runtimeConfig = quartzSupport.getRuntimeConfig();
+        warnDeprecated(runtimeConfig);
+
+        boolean forceStart;
+        if (runtimeConfig.startMode != QuartzStartMode.NORMAL) {
+            startHalted = (runtimeConfig.startMode == QuartzStartMode.HALTED);
+            forceStart = startHalted || (runtimeConfig.startMode == QuartzStartMode.FORCED);
+        } else {
+            startHalted = false;
+            forceStart = runtimeConfig.forceStart.orElse(false);
         }
-        return scheduler;
-    }
 
-    public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Config config,
-            SchedulerRuntimeConfig schedulerRuntimeConfig, Event<SkippedExecution> skippedExecutionEvent) {
-        enabled = schedulerRuntimeConfig.enabled;
         if (!enabled) {
             LOGGER.info("Quartz scheduler is disabled by config property and will not be started");
             this.scheduler = null;
-        } else if (!quartzSupport.getRuntimeConfig().forceStart && context.getScheduledMethods().isEmpty()) {
+        } else if (!forceStart && context.getScheduledMethods().isEmpty()) {
             LOGGER.info("No scheduled business methods found - Quartz scheduler will not be started");
             this.scheduler = null;
         } else {
@@ -90,10 +93,10 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
             Map<String, ScheduledInvoker> invokers = new HashMap<>();
             UserTransaction transaction = null;
 
-            try (InstanceHandle<UserTransaction> handle = Arc.container().instance(UserTransaction.class)) {
+            try {
                 boolean manageTx = quartzSupport.getBuildTimeConfig().storeType.isNonManagedTxJobStore();
-                if (manageTx && handle.isAvailable()) {
-                    transaction = handle.get();
+                if (manageTx && userTransation.isResolvable()) {
+                    transaction = userTransation.get();
                 }
                 Properties props = getSchedulerConfigurationProperties(quartzSupport);
 
@@ -101,7 +104,7 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
                 scheduler = schedulerFactory.getScheduler();
 
                 // Set custom job factory
-                scheduler.setJobFactory(new InvokerJobFactory(invokers));
+                scheduler.setJobFactory(new InvokerJobFactory(invokers, jobs));
 
                 CronType cronType = context.getCronType();
                 CronDefinition def = CronDefinitionBuilder.instanceDefinitionFor(cronType);
@@ -113,7 +116,7 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
                     int nameSequence = 0;
 
                     for (Scheduled scheduled : method.getSchedules()) {
-                        String identity = scheduled.identity().trim();
+                        String identity = SchedulerUtils.lookUpPropertyValue(scheduled.identity());
                         if (identity.isEmpty()) {
                             identity = ++nameSequence + "_" + method.getInvokerClassName();
                         }
@@ -131,11 +134,8 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
                                 .requestRecovery();
                         ScheduleBuilder<?> scheduleBuilder;
 
-                        String cron = scheduled.cron().trim();
+                        String cron = SchedulerUtils.lookUpPropertyValue(scheduled.cron());
                         if (!cron.isEmpty()) {
-                            if (SchedulerContext.isConfigValue(cron)) {
-                                cron = config.getValue(SchedulerContext.getConfigProperty(cron), String.class);
-                            }
                             if (!CronType.QUARTZ.equals(cronType)) {
                                 // Migrate the expression
                                 Cron cronExpr = parser.parse(cron);
@@ -153,8 +153,7 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
                             scheduleBuilder = CronScheduleBuilder.cronSchedule(cron);
                         } else if (!scheduled.every().isEmpty()) {
                             scheduleBuilder = SimpleScheduleBuilder.simpleSchedule()
-                                    .withIntervalInMilliseconds(
-                                            SimpleScheduler.parseDuration(scheduled, scheduled.every(), "every").toMillis())
+                                    .withIntervalInMilliseconds(SchedulerUtils.parseEveryAsMillis(scheduled))
                                     .repeatForever();
                         } else {
                             throw new IllegalArgumentException("Invalid schedule configuration: " + scheduled);
@@ -168,8 +167,7 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
                         if (scheduled.delay() > 0) {
                             millisToAdd = scheduled.delayUnit().toMillis(scheduled.delay());
                         } else if (!scheduled.delayed().isEmpty()) {
-                            millisToAdd = Math
-                                    .abs(SimpleScheduler.parseDuration(scheduled, scheduled.delayed(), "delayed").toMillis());
+                            millisToAdd = SchedulerUtils.parseDelayedAsMillis(scheduled);
                         }
                         if (millisToAdd != null) {
                             triggerBuilder.startAt(new Date(Instant.now()
@@ -177,12 +175,11 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
                         }
 
                         JobDetail job = jobBuilder.build();
-                        if (scheduler.checkExists(job.getKey())) {
-                            scheduler.deleteJob(job.getKey());
+                        if (!scheduler.checkExists(job.getKey())) {
+                            scheduler.scheduleJob(job, triggerBuilder.build());
+                            LOGGER.debugf("Scheduled business method %s with config %s", method.getMethodDescription(),
+                                    scheduled);
                         }
-                        scheduler.scheduleJob(job, triggerBuilder.build());
-                        LOGGER.debugf("Scheduled business method %s with config %s", method.getMethodDescription(),
-                                scheduled);
                     }
                 }
                 if (transaction != null) {
@@ -201,6 +198,28 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Co
         }
     }
 
+    /**
+     * Warn if there's any deprecated configuration
+     *
+     * @param runtimeConfig {@link QuartzRuntimeConfig} quartz scheduler configurations
+     */
+    private static void warnDeprecated(QuartzRuntimeConfig runtimeConfig) {
+        if (runtimeConfig.forceStart.isPresent()) {
+            LOGGER.warn("`quarkus.quartz.force-start` is deprecated and will be removed in a future version - it is "
+                    + "recommended to switch to `quarkus.quartz.start-mode`");
+        }
+    }
+
+    @Produces
+    @Singleton
+    org.quartz.Scheduler produceQuartzScheduler() {
+        if (scheduler == null) {
+            throw new IllegalStateException(
+                    "Quartz scheduler is either explicitly disabled through quarkus.scheduler.enabled=false or no @Scheduled methods were found. If you only need to schedule a job programmatically you can force the start of the scheduler via quarkus.quartz.force-start=true");
+        }
+        return scheduler;
+    }
+
     @Override
     public void pause() {
         if (!enabled) {
@@ -246,7 +265,7 @@ public boolean isRunning() {
 
     // Use Interceptor.Priority.PLATFORM_BEFORE to start the scheduler before regular StartupEvent observers
     void start(@Observes @Priority(Interceptor.Priority.PLATFORM_BEFORE) StartupEvent startupEvent) {
-        if (scheduler == null) {
+        if (scheduler == null || startHalted) {
             return;
         }
         try {
@@ -290,10 +309,11 @@ private Properties getSchedulerConfigurationProperties(QuartzSupport quartzSuppo
         QuartzBuildTimeConfig buildTimeConfig = quartzSupport.getBuildTimeConfig();
         props.put(StdSchedulerFactory.PROP_SCHED_INSTANCE_ID, "AUTO");
         props.put("org.quartz.scheduler.skipUpdateCheck", "true");
-        props.put(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, "QuarkusQuartzScheduler");
+        props.put(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, quartzSupport.getRuntimeConfig().instanceName);
         props.put(StdSchedulerFactory.PROP_SCHED_WRAP_JOB_IN_USER_TX, "false");
         props.put(StdSchedulerFactory.PROP_SCHED_SCHEDULER_THREADS_INHERIT_CONTEXT_CLASS_LOADER_OF_INITIALIZING_THREAD, "true");
         props.put(StdSchedulerFactory.PROP_THREAD_POOL_CLASS, "org.quartz.simpl.SimpleThreadPool");
+        props.put(StdSchedulerFactory.PROP_SCHED_CLASS_LOAD_HELPER_CLASS, InitThreadContextClassLoadHelper.class.getName());
         props.put(StdSchedulerFactory.PROP_THREAD_POOL_PREFIX + ".threadCount",
                 "" + quartzSupport.getRuntimeConfig().threadCount);
         props.put(StdSchedulerFactory.PROP_THREAD_POOL_PREFIX + ".threadPriority",
@@ -307,7 +327,7 @@ private Properties getSchedulerConfigurationProperties(QuartzSupport quartzSuppo
             QuarkusQuartzConnectionPoolProvider.setDataSourceName(dataSource);
             props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".useProperties", "true");
             props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".misfireThreshold", "60000");
-            props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".tablePrefix", "QRTZ_");
+            props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".tablePrefix", buildTimeConfig.tablePrefix);
             props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".dataSource", dataSource);
             props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".driverDelegateClass",
                     quartzSupport.getDriverDialect().get());
@@ -315,17 +335,35 @@ private Properties getSchedulerConfigurationProperties(QuartzSupport quartzSuppo
                     QuarkusQuartzConnectionPoolProvider.class.getName());
             if (buildTimeConfig.clustered) {
                 props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".isClustered", "true");
-                props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".clusterCheckinInterval", "20000"); // 20 seconds
+                props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".acquireTriggersWithinLock", "true");
+                props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".clusterCheckinInterval",
+                        "" + quartzSupport.getBuildTimeConfig().clusterCheckinInterval);
             }
 
             if (buildTimeConfig.storeType.isNonManagedTxJobStore()) {
                 props.put(StdSchedulerFactory.PROP_JOB_STORE_PREFIX + ".nonManagedTXDataSource", dataSource);
             }
         }
+        props.putAll(getAdditionalConfigurationProperties(StdSchedulerFactory.PROP_PLUGIN_PREFIX, buildTimeConfig.plugins));
+        props.putAll(getAdditionalConfigurationProperties(StdSchedulerFactory.PROP_JOB_LISTENER_PREFIX,
+                buildTimeConfig.jobListeners));
+        props.putAll(getAdditionalConfigurationProperties(StdSchedulerFactory.PROP_TRIGGER_LISTENER_PREFIX,
+                buildTimeConfig.triggerListeners));
 
         return props;
     }
 
+    private Properties getAdditionalConfigurationProperties(String prefix, Map<String, QuartzExtensionPointConfig> config) {
+        Properties props = new Properties();
+        for (Map.Entry<String, QuartzExtensionPointConfig> configEntry : config.entrySet()) {
+            props.put(String.format("%s.%s.class", prefix, configEntry.getKey()), configEntry.getValue().clazz);
+            for (Map.Entry<String, String> propsEntry : configEntry.getValue().properties.entrySet()) {
+                props.put(String.format("%s.%s.%s", prefix, configEntry.getKey(), propsEntry.getKey()), propsEntry.getValue());
+            }
+        }
+        return props;
+    }
+
     static class InvokerJob implements Job {
 
         final Map<String, ScheduledInvoker> invokers;
@@ -335,11 +373,15 @@ static class InvokerJob implements Job {
         }
 
         @Override
-        public void execute(JobExecutionContext context) {
+        public void execute(JobExecutionContext context) throws JobExecutionException {
             QuartzTrigger trigger = new QuartzTrigger(context);
             ScheduledInvoker scheduledInvoker = invokers.get(context.getJobDetail().getKey().getName());
             if (scheduledInvoker != null) { // could be null from previous runs
-                scheduledInvoker.invoke(new QuartzScheduledExecution(trigger));
+                try {
+                    scheduledInvoker.invoke(new QuartzScheduledExecution(trigger));
+                } catch (Exception e) {
+                    throw new JobExecutionException(e);
+                }
             }
         }
     }
@@ -399,9 +441,11 @@ public Instant getScheduledFireTime() {
     static class InvokerJobFactory extends SimpleJobFactory {
 
         final Map<String, ScheduledInvoker> invokers;
+        final Instance<Job> jobs;
 
-        InvokerJobFactory(Map<String, ScheduledInvoker> invokers) {
+        InvokerJobFactory(Map<String, ScheduledInvoker> invokers, Instance<Job> jobs) {
             this.invokers = invokers;
+            this.jobs = jobs;
         }
 
         @Override
@@ -410,6 +454,10 @@ public Job newJob(TriggerFiredBundle bundle, org.quartz.Scheduler Scheduler) thr
             if (jobClass.equals(InvokerJob.class)) {
                 return new InvokerJob(invokers);
             }
+            Instance<?> instance = jobs.select(jobClass);
+            if (instance.isResolvable()) {
+                return (Job) instance.get();
+            }
             return super.newJob(bundle, Scheduler);
         }
 
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzStartMode.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzStartMode.java
new file mode 100644
index 0000000000000..0be35034542d0
--- /dev/null
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzStartMode.java
@@ -0,0 +1,25 @@
+package io.quarkus.quartz.runtime;
+
+/**
+ * Defines starting modes of Quartz scheduler
+ */
+public enum QuartzStartMode {
+
+    /**
+     * Scheduler is not started unless a {@link io.quarkus.scheduler.Scheduled} business method is found.
+     */
+    NORMAL,
+
+    /**
+     * Scheduler will be started even if no scheduled business methods are found.
+     * This is necessary for "pure" programmatic scheduling.
+     */
+    FORCED,
+
+    /**
+     * Just like forced mode but the scheduler will not start triggering jobs until an explicit start is called
+     * from the main scheduler.
+     * This is useful to programmatically register listeners before scheduler starts performing some work.
+     */
+    HALTED;
+}
diff --git a/extensions/qute/deployment/pom.xml b/extensions/qute/deployment/pom.xml
index d16fd1cd99c40..65952ecfd99fb 100644
--- a/extensions/qute/deployment/pom.xml
+++ b/extensions/qute/deployment/pom.xml
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>quarkus-qute-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-qute-deployment</artifactId>
     <name>Quarkus - Qute - Deployment</name>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -26,6 +21,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
+        <!-- Panache SPI-like module to collect entity classes -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-common-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus.qute</groupId>
             <artifactId>qute-generator</artifactId>
@@ -39,6 +39,25 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Used by the preview feature of the dev console -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/CheckedTemplateBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/CheckedTemplateBuildItem.java
index 0512043705740..ee042871046c8 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/CheckedTemplateBuildItem.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/CheckedTemplateBuildItem.java
@@ -2,16 +2,20 @@
 
 import java.util.Map;
 
+import org.jboss.jandex.MethodInfo;
+
 import io.quarkus.builder.item.MultiBuildItem;
 
 public final class CheckedTemplateBuildItem extends MultiBuildItem {
 
     public final String templateId;
     public final Map<String, String> bindings;
+    public final MethodInfo method;
 
-    public CheckedTemplateBuildItem(String templateId, Map<String, String> bindings) {
+    public CheckedTemplateBuildItem(String templateId, Map<String, String> bindings, MethodInfo method) {
         this.templateId = templateId;
         this.bindings = bindings;
+        this.method = method;
     }
 
 }
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Descriptors.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Descriptors.java
new file mode 100644
index 0000000000000..8afc70fe8a2cb
--- /dev/null
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Descriptors.java
@@ -0,0 +1,19 @@
+package io.quarkus.qute.deployment;
+
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.i18n.MessageBundles;
+
+final class Descriptors {
+
+    static final MethodDescriptor TEMPLATE_INSTANCE = MethodDescriptor.ofMethod(Template.class, "instance",
+            TemplateInstance.class);
+    static final MethodDescriptor TEMPLATE_INSTANCE_DATA = MethodDescriptor.ofMethod(TemplateInstance.class, "data",
+            TemplateInstance.class, String.class, Object.class);
+    static final MethodDescriptor TEMPLATE_INSTANCE_RENDER = MethodDescriptor.ofMethod(TemplateInstance.class, "render",
+            String.class);
+    static final MethodDescriptor BUNDLES_GET_TEMPLATE = MethodDescriptor.ofMethod(MessageBundles.class, "getTemplate",
+            Template.class, String.class);
+
+}
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/IncorrectExpressionBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/IncorrectExpressionBuildItem.java
index 83d1d3b37117c..88e28f73b9de1 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/IncorrectExpressionBuildItem.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/IncorrectExpressionBuildItem.java
@@ -1,31 +1,30 @@
 package io.quarkus.qute.deployment;
 
 import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.qute.TemplateNode.Origin;
 
 public final class IncorrectExpressionBuildItem extends MultiBuildItem {
 
     public final String expression;
     public final String property;
     public final String clazz;
-    public final int line;
-    public final String templateId;
+    public final Origin origin;
     public final String reason;
 
-    public IncorrectExpressionBuildItem(String expression, String property, String clazz, int line, String templateId) {
-        this(expression, property, clazz, line, templateId, null);
+    public IncorrectExpressionBuildItem(String expression, String property, String clazz, Origin origin) {
+        this(expression, property, clazz, origin, null);
     }
 
-    public IncorrectExpressionBuildItem(String expression, String reason, int line, String templateId) {
-        this(expression, null, null, line, templateId, reason);
+    public IncorrectExpressionBuildItem(String expression, String reason, Origin origin) {
+        this(expression, null, null, origin, reason);
     }
 
-    public IncorrectExpressionBuildItem(String expression, String property, String clazz, int line, String templateId,
+    public IncorrectExpressionBuildItem(String expression, String property, String clazz, Origin origin,
             String reason) {
         this.expression = expression;
         this.property = property;
         this.clazz = clazz;
-        this.line = line;
-        this.templateId = templateId;
+        this.origin = origin;
         this.reason = reason;
     }
 
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java
index 000c287eb0c5e..ec39f4ad5e255 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleMethodBuildItem.java
@@ -5,7 +5,7 @@
 import io.quarkus.builder.item.MultiBuildItem;
 
 /**
- * Represents a message bundle method that has a template that needs to be validated.
+ * Represents a message bundle method.
  * <p>
  * Note that templates that contain no expressions don't need to be validated.
  */
@@ -45,4 +45,13 @@ public String getTemplate() {
         return template;
     }
 
+    /**
+     * A bundle method that does not need to be validated has {@code null} template id.
+     * 
+     * @return {@code true} if the template needs to be validated
+     */
+    public boolean isValidatable() {
+        return templateId != null;
+    }
+
 }
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
index e3458df33a6d6..cde34ac4144ef 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
@@ -1,18 +1,19 @@
 package io.quarkus.qute.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
-import static org.objectweb.asm.Opcodes.ACC_FINAL;
-import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -53,6 +54,7 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
@@ -67,11 +69,10 @@
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.gizmo.TryBlock;
 import io.quarkus.qute.EvalContext;
+import io.quarkus.qute.EvaluatedParams;
 import io.quarkus.qute.Expression;
 import io.quarkus.qute.Expression.Part;
 import io.quarkus.qute.Resolver;
-import io.quarkus.qute.Template;
-import io.quarkus.qute.TemplateInstance;
 import io.quarkus.qute.deployment.QuteProcessor.Match;
 import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis;
 import io.quarkus.qute.generator.Descriptors;
@@ -80,7 +81,6 @@
 import io.quarkus.qute.i18n.Message;
 import io.quarkus.qute.i18n.MessageBundle;
 import io.quarkus.qute.i18n.MessageBundles;
-import io.quarkus.qute.i18n.MessageParam;
 import io.quarkus.qute.runtime.MessageBundleRecorder;
 import io.quarkus.runtime.util.StringUtil;
 
@@ -91,20 +91,8 @@ public class MessageBundleProcessor {
     private static final String SUFFIX = "_Bundle";
     private static final String BUNDLE_DEFAULT_KEY = "defaultKey";
     private static final String BUNDLE_LOCALE = "locale";
-
-    static final DotName BUNDLE = DotName.createSimple(MessageBundle.class.getName());
-    static final DotName MESSAGE = DotName.createSimple(Message.class.getName());
-    static final DotName MESSAGE_PARAM = DotName.createSimple(MessageParam.class.getName());
-    static final DotName LOCALIZED = DotName.createSimple(Localized.class.getName());
-
-    static final MethodDescriptor TEMPLATE_INSTANCE = MethodDescriptor.ofMethod(Template.class, "instance",
-            TemplateInstance.class);
-    static final MethodDescriptor TEMPLATE_INSTANCE_DATA = MethodDescriptor.ofMethod(TemplateInstance.class, "data",
-            TemplateInstance.class, String.class, Object.class);
-    static final MethodDescriptor TEMPLATE_INSTANCE_RENDER = MethodDescriptor.ofMethod(TemplateInstance.class, "render",
-            String.class);
-    static final MethodDescriptor BUNDLES_GET_TEMPLATE = MethodDescriptor.ofMethod(MessageBundles.class, "getTemplate",
-            Template.class, String.class);
+    private static final String MESSAGES = "messages";
+    private static final String MESSAGE = "message";
 
     @BuildStep
     AdditionalBeanBuildItem beans() {
@@ -116,15 +104,25 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
             BuildProducer<GeneratedClassBuildItem> generatedClasses, BeanRegistrationPhaseBuildItem beanRegistration,
             BuildProducer<BeanConfiguratorBuildItem> configurators,
-            BuildProducer<MessageBundleMethodBuildItem> messageTemplateMethods) throws IOException {
+            BuildProducer<MessageBundleMethodBuildItem> messageTemplateMethods,
+            BuildProducer<HotDeploymentWatchedFileBuildItem> watchedFiles) throws IOException {
 
         IndexView index = beanArchiveIndex.getIndex();
         Map<String, ClassInfo> found = new HashMap<>();
         List<MessageBundleBuildItem> bundles = new ArrayList<>();
         Set<Path> messageFiles = findMessageFiles(applicationArchivesBuildItem);
 
+        Path messagesPath = applicationArchivesBuildItem.getRootArchive().getChildPath(MESSAGES);
+        for (Path messageFile : messageFiles) {
+            String messageFilePath = messagesPath.relativize(messageFile).toString();
+            if (File.separatorChar != '/') {
+                messageFilePath = messageFilePath.replace(File.separatorChar, '/');
+            }
+            watchedFiles.produce(new HotDeploymentWatchedFileBuildItem(MESSAGES + "/" + messageFilePath));
+        }
+
         // First collect all interfaces annotated with @MessageBundle
-        for (AnnotationInstance bundleAnnotation : index.getAnnotations(BUNDLE)) {
+        for (AnnotationInstance bundleAnnotation : index.getAnnotations(Names.BUNDLE)) {
             if (bundleAnnotation.target().kind() == Kind.CLASS) {
                 ClassInfo bundleClass = bundleAnnotation.target().asClass();
                 if (Modifier.isInterface(bundleClass.flags())) {
@@ -148,12 +146,12 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
                     }
                     Map<String, ClassInfo> localeToInterface = new HashMap<>();
                     for (ClassInfo localizedInterface : localized) {
-                        String locale = localizedInterface.classAnnotation(LOCALIZED).value().asString();
+                        String locale = localizedInterface.classAnnotation(Names.LOCALIZED).value().asString();
                         ClassInfo previous = localeToInterface.put(locale, localizedInterface);
                         if (defaultLocale.equals(locale) || previous != null) {
                             throw new MessageBundleException(String.format(
                                     "A localized message bundle interface [%s] already exists for locale %s: [%s]",
-                                    previous != null ? previous : bundleClass, localizedInterface));
+                                    previous != null ? previous : bundleClass, locale, localizedInterface));
                         }
                     }
 
@@ -192,8 +190,8 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
             ClassInfo bundleInterface = bundle.getDefaultBundleInterface();
             beanRegistration.getContext().configure(bundleInterface.name()).addType(bundle.getDefaultBundleInterface().name())
                     // The default message bundle - add both @Default and @Localized
-                    .addQualifier(DotNames.DEFAULT).addQualifier().annotation(LOCALIZED)
-                    .addValue("value", getDefaultLocale(bundleInterface.classAnnotation(BUNDLE))).done().unremovable()
+                    .addQualifier(DotNames.DEFAULT).addQualifier().annotation(Names.LOCALIZED)
+                    .addValue("value", getDefaultLocale(bundleInterface.classAnnotation(Names.BUNDLE))).done().unremovable()
                     .scope(Singleton.class).creator(mc -> {
                         // Just create a new instance of the generated class
                         mc.returnValue(
@@ -205,7 +203,7 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
             for (ClassInfo localizedInterface : bundle.getLocalizedInterfaces().values()) {
                 beanRegistration.getContext().configure(localizedInterface.name())
                         .addType(bundle.getDefaultBundleInterface().name())
-                        .addQualifier(localizedInterface.classAnnotation(LOCALIZED))
+                        .addQualifier(localizedInterface.classAnnotation(Names.LOCALIZED))
                         .unremovable()
                         .scope(Singleton.class).creator(mc -> {
                             // Just create a new instance of the generated class
@@ -218,7 +216,7 @@ List<MessageBundleBuildItem> processBundles(BeanArchiveIndexBuildItem beanArchiv
             for (Entry<String, Path> entry : bundle.getLocalizedFiles().entrySet()) {
                 beanRegistration.getContext().configure(bundle.getDefaultBundleInterface().name())
                         .addType(bundle.getDefaultBundleInterface().name())
-                        .addQualifier().annotation(LOCALIZED)
+                        .addQualifier().annotation(Names.LOCALIZED)
                         .addValue("value", entry.getKey()).done()
                         .unremovable()
                         .scope(Singleton.class).creator(mc -> {
@@ -257,8 +255,10 @@ void initBundleContext(MessageBundleRecorder recorder,
             bundleInterfaces.put(bundle.getName(), localeToInterface);
         }
 
-        Map<String, String> templateIdToContent = messageBundleMethods.stream().collect(
-                Collectors.toMap(MessageBundleMethodBuildItem::getTemplateId, MessageBundleMethodBuildItem::getTemplate));
+        Map<String, String> templateIdToContent = messageBundleMethods.stream()
+                .filter(MessageBundleMethodBuildItem::isValidatable).collect(
+                        Collectors.toMap(MessageBundleMethodBuildItem::getTemplateId,
+                                MessageBundleMethodBuildItem::getTemplate));
 
         syntheticBeans.produce(SyntheticBeanBuildItem.configure(MessageBundleRecorder.BundleContext.class)
                 .supplier(recorder.createContext(templateIdToContent, bundleInterfaces)).done());
@@ -270,6 +270,7 @@ void validateMessageBundleMethods(TemplatesAnalysisBuildItem templatesAnalysis,
             BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions) {
 
         Map<String, MessageBundleMethodBuildItem> bundleMethods = messageBundleMethods.stream()
+                .filter(MessageBundleMethodBuildItem::isValidatable)
                 .collect(Collectors.toMap(MessageBundleMethodBuildItem::getTemplateId, Function.identity()));
 
         for (TemplateAnalysis analysis : templatesAnalysis.getAnalysis()) {
@@ -289,8 +290,7 @@ void validateMessageBundleMethods(TemplatesAnalysisBuildItem templatesAnalysis,
                                 name + " is not a parameter of the message bundle method "
                                         + messageBundleMethod.getMethod().declaringClass().name() + "#"
                                         + messageBundleMethod.getMethod().name() + "()",
-                                expression.getOrigin().getLine(),
-                                expression.getOrigin().getTemplateGeneratedId()));
+                                expression.getOrigin()));
                     } else {
                         usedParamNames.add(name);
                     }
@@ -342,85 +342,93 @@ public String apply(String id) {
             bundlesMap.put(messageBundle.getName(), messageBundle.getDefaultBundleInterface());
         }
 
-        for (Entry<String, Map<String, MethodInfo>> entry : bundleMethodsMap.entrySet()) {
+        for (Entry<String, Map<String, MethodInfo>> bundleEntry : bundleMethodsMap.entrySet()) {
 
-            Set<Expression> expressions = QuteProcessor.collectNamespaceExpressions(analysis, entry.getKey());
-            Map<String, MethodInfo> methods = entry.getValue();
-            ClassInfo defaultBundleInterface = bundlesMap.get(entry.getKey());
+            Map<TemplateAnalysis, Set<Expression>> expressions = QuteProcessor.collectNamespaceExpressions(analysis,
+                    bundleEntry.getKey());
+            Map<String, MethodInfo> methods = bundleEntry.getValue();
+            ClassInfo defaultBundleInterface = bundlesMap.get(bundleEntry.getKey());
 
             if (!expressions.isEmpty()) {
 
-                // Map implicit class -> true if methods were used
-                Map<ClassInfo, Boolean> implicitClassToMethodUsed = new HashMap<>();
+                // Map implicit class -> set of used members
+                Map<DotName, Set<String>> implicitClassToMembersUsed = new HashMap<>();
 
-                for (Expression expression : expressions) {
+                for (Entry<TemplateAnalysis, Set<Expression>> exprEntry : expressions.entrySet()) {
 
-                    // msg:hello_world(foo.name)
-                    Part methodPart = expression.getParts().get(0);
-                    MethodInfo method = methods.get(methodPart.getName());
+                    Map<Integer, Match> generatedIdsToMatches = new HashMap<>();
 
-                    if (method == null) {
-                        if (!methodPart.isVirtualMethod() || methodPart.asVirtualMethod().getParameters().isEmpty()) {
-                            // The method template may contain no expressions
-                            method = defaultBundleInterface.method(methodPart.getName());
-                        }
-                        if (method == null) {
-                            // User is referencing a non-existent message
-                            incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
-                                    "Message bundle [name=" + entry.getKey() + ", interface="
-                                            + defaultBundleInterface
-                                            + "] does not define a method for key: " + methodPart.getName(),
-                                    expression.getOrigin().getLine(),
-                                    expression.getOrigin().getTemplateGeneratedId()));
+                    for (Expression expression : exprEntry.getValue()) {
+                        // msg:hello_world(foo.name)
+                        Part methodPart = expression.getParts().get(0);
+                        if (methodPart.getName().equals(MESSAGE)) {
+                            // Skip validation - dynamic key, e.g. msg:message(myKey,param1,param2)
                             continue;
                         }
-                    }
+                        MethodInfo method = methods.get(methodPart.getName());
 
-                    if (methodPart.isVirtualMethod()) {
-                        // For virtual method validate the number of params first  
-                        List<Expression> params = methodPart.asVirtualMethod().getParameters();
-                        List<Type> methodParams = method.parameters();
-
-                        if (methodParams.size() != params.size()) {
-                            incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
-                                    "Message bundle [name=" + entry.getKey() + ", interface="
-                                            + defaultBundleInterface
-                                            + "] - wrong number of parameters for method: " + method.toString(),
-                                    expression.getOrigin().getLine(),
-                                    expression.getOrigin().getTemplateGeneratedId()));
-                            continue;
+                        if (method == null) {
+                            if (!methodPart.isVirtualMethod() || methodPart.asVirtualMethod().getParameters().isEmpty()) {
+                                // The method template may contain no expressions
+                                method = defaultBundleInterface.method(methodPart.getName());
+                            }
+                            if (method == null) {
+                                // User is referencing a non-existent message
+                                incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
+                                        "Message bundle [name=" + bundleEntry.getKey() + ", interface="
+                                                + defaultBundleInterface
+                                                + "] does not define a method for key: " + methodPart.getName(),
+                                        expression.getOrigin()));
+                                continue;
+                            }
                         }
 
-                        // Then attempt to validate the parameter types
-                        int idx = 0;
-                        for (Expression param : params) {
-                            if (param.hasTypeInfo()) {
-                                Map<String, Match> results = new HashMap<>();
-                                QuteProcessor.validateNestedExpressions(defaultBundleInterface, results,
-                                        templateExtensionMethods, excludes,
-                                        incorrectExpressions, expression, index, implicitClassToMethodUsed,
-                                        templateIdToPathFun);
-                                Match match = results.get(param.toOriginalString());
-                                if (match != null && !Types.isAssignableFrom(match.type,
-                                        methodParams.get(idx), index)) {
-                                    incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
-                                            "Message bundle method " + method.declaringClass().name() + "#" +
-                                                    method.name() + "() parameter [" + method.parameterName(idx)
-                                                    + "] does not match the type: " + match.type,
-                                            expression.getOrigin().getLine(),
-                                            expression.getOrigin().getTemplateGeneratedId()));
+                        if (methodPart.isVirtualMethod()) {
+                            // For virtual method validate the number of params first  
+                            List<Expression> params = methodPart.asVirtualMethod().getParameters();
+                            List<Type> methodParams = method.parameters();
+
+                            if (methodParams.size() != params.size()) {
+                                incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
+                                        "Message bundle [name=" + bundleEntry.getKey() + ", interface="
+                                                + defaultBundleInterface
+                                                + "] - wrong number of parameters for method: " + method.toString(),
+                                        expression.getOrigin()));
+                                continue;
+                            }
+
+                            // Then attempt to validate the parameter types
+                            int idx = 0;
+                            for (Expression param : params) {
+                                if (param.hasTypeInfo()) {
+                                    Map<String, Match> results = new HashMap<>();
+                                    QuteProcessor.validateNestedExpressions(exprEntry.getKey(), defaultBundleInterface,
+                                            results, templateExtensionMethods, excludes,
+                                            incorrectExpressions, expression, index, implicitClassToMembersUsed,
+                                            templateIdToPathFun, generatedIdsToMatches);
+                                    Match match = results.get(param.toOriginalString());
+                                    if (match != null && !Types.isAssignableFrom(match.type(),
+                                            methodParams.get(idx), index)) {
+                                        incorrectExpressions
+                                                .produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
+                                                        "Message bundle method " + method.declaringClass().name() + "#" +
+                                                                method.name() + "() parameter [" + method.parameterName(idx)
+                                                                + "] does not match the type: " + match.type(),
+                                                        expression.getOrigin()));
+                                    }
                                 }
+                                idx++;
                             }
-                            idx++;
                         }
                     }
                 }
 
-                for (Entry<ClassInfo, Boolean> implicit : implicitClassToMethodUsed.entrySet()) {
-                    implicitClasses.produce(implicit.getValue()
-                            ? new ImplicitValueResolverBuildItem(implicit.getKey(),
-                                    new TemplateDataBuilder().properties(false).build())
-                            : new ImplicitValueResolverBuildItem(implicit.getKey()));
+                for (Entry<DotName, Set<String>> e : implicitClassToMembersUsed.entrySet()) {
+                    ClassInfo clazz = index.getClassByName(e.getKey());
+                    if (clazz != null) {
+                        implicitClasses.produce(new ImplicitValueResolverBuildItem(clazz,
+                                new TemplateDataBuilder().addIgnore(QuteProcessor.buildIgnorePattern(e.getValue())).build()));
+                    }
                 }
             }
         }
@@ -433,30 +441,18 @@ private Map<String, String> generateImplementations(List<MessageBundleBuildItem>
 
         Map<String, String> generatedTypes = new HashMap<>();
 
-        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClasses, new Predicate<String>() {
-            @Override
-            public boolean test(String name) {
-                int idx = name.lastIndexOf(SUFFIX);
-                String className = name.substring(0, idx).replace("/", ".");
-                if (className.contains(ValueResolverGenerator.NESTED_SEPARATOR)) {
-                    className = className.replace(ValueResolverGenerator.NESTED_SEPARATOR, "$");
-                }
-                if (applicationArchivesBuildItem.getRootArchive().getIndex()
-                        .getClassByName(DotName.createSimple(className)) != null) {
-                    return true;
-                }
-                return false;
-            }
-        });
+        ClassOutput defaultClassOutput = new GeneratedClassGizmoAdaptor(generatedClasses,
+                new AppClassPredicate(applicationArchivesBuildItem));
 
         for (MessageBundleBuildItem bundle : bundles) {
             ClassInfo bundleInterface = bundle.getDefaultBundleInterface();
-            String bundleImpl = generateImplementation(null, null, bundleInterface, classOutput, messageTemplateMethods,
+            String bundleImpl = generateImplementation(null, null, bundleInterface, defaultClassOutput, messageTemplateMethods,
                     Collections.emptyMap(), null);
             generatedTypes.put(bundleInterface.name().toString(), bundleImpl);
             for (ClassInfo localizedInterface : bundle.getLocalizedInterfaces().values()) {
                 generatedTypes.put(localizedInterface.name().toString(),
-                        generateImplementation(bundle.getDefaultBundleInterface(), bundleImpl, localizedInterface, classOutput,
+                        generateImplementation(bundle.getDefaultBundleInterface(), bundleImpl, localizedInterface,
+                                defaultClassOutput,
                                 messageTemplateMethods, Collections.emptyMap(), null));
             }
 
@@ -482,9 +478,22 @@ public boolean test(String name) {
                         keyToTemplate.put(key, value);
                     }
                 }
+                String locale = entry.getKey();
+                ClassOutput localeAwareGizmoAdaptor = new GeneratedClassGizmoAdaptor(generatedClasses,
+                        new AppClassPredicate(applicationArchivesBuildItem, new Function<String, String>() {
+                            @Override
+                            public String apply(String className) {
+                                String localeSuffix = "_" + locale;
+                                if (className.endsWith(localeSuffix)) {
+                                    return className.replace(localeSuffix, "");
+                                }
+                                return className;
+                            }
+                        }));
                 generatedTypes.put(localizedFile.toString(),
-                        generateImplementation(bundle.getDefaultBundleInterface(), bundleImpl, bundleInterface, classOutput,
-                                messageTemplateMethods, keyToTemplate, entry.getKey()));
+                        generateImplementation(bundle.getDefaultBundleInterface(), bundleImpl, bundleInterface,
+                                localeAwareGizmoAdaptor,
+                                messageTemplateMethods, keyToTemplate, locale));
             }
         }
         return generatedTypes;
@@ -492,7 +501,7 @@ public boolean test(String name) {
 
     private boolean hasMessageBundleMethod(ClassInfo bundleInterface, String name) {
         for (MethodInfo method : bundleInterface.methods()) {
-            if (method.name().equals(name) && method.hasAnnotation(MESSAGE)) {
+            if (method.name().equals(name) && method.hasAnnotation(Names.MESSAGE)) {
                 return true;
             }
         }
@@ -504,8 +513,9 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
             Map<String, String> messageTemplates, String locale) {
 
         LOGGER.debugf("Generate bundle implementation for %s", bundleInterface);
-        AnnotationInstance bundleAnnotation = defaultBundleInterface != null ? defaultBundleInterface.classAnnotation(BUNDLE)
-                : bundleInterface.classAnnotation(BUNDLE);
+        AnnotationInstance bundleAnnotation = defaultBundleInterface != null
+                ? defaultBundleInterface.classAnnotation(Names.BUNDLE)
+                : bundleInterface.classAnnotation(Names.BUNDLE);
         AnnotationValue nameValue = bundleAnnotation.value();
         String bundleName = nameValue != null ? nameValue.asString() : MessageBundle.DEFAULT_NAME;
         AnnotationValue defaultKeyValue = bundleAnnotation.value(BUNDLE_DEFAULT_KEY);
@@ -521,8 +531,8 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
             baseName = baseName + "_" + locale;
         }
 
-        String targetPackage = DotNames.packageName(bundleInterface.name());
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + SUFFIX;
+        String targetPackage = DotNames.internalPackageNameWithTrailingSlash(bundleInterface.name());
+        String generatedName = targetPackage + baseName + SUFFIX;
 
         // MyMessages_Bundle implements MyMessages, Resolver
         Builder builder = ClassCreator.builder().classOutput(classOutput).className(generatedName)
@@ -533,9 +543,12 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
         ClassCreator bundleCreator = builder.build();
 
         // key -> method
-        Map<String, MethodInfo> keyMap = new HashMap<>();
+        Map<String, MethodInfo> keyMap = new LinkedHashMap<>();
+        List<MethodInfo> methods = new ArrayList<>(bundleInterface.methods());
+        // Sort methods
+        methods.sort(Comparator.comparing(MethodInfo::name).thenComparing(Comparator.comparing(MethodInfo::toString)));
 
-        for (MethodInfo method : bundleInterface.methods()) {
+        for (MethodInfo method : methods) {
             if (!method.returnType().name().equals(DotNames.STRING)) {
                 throw new MessageBundleException(
                         String.format("A message bundle interface method must return java.lang.String on %s: %s",
@@ -553,9 +566,9 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
                     throw new MessageBundleException(
                             String.format("Default bundle method not found on %s: %s", bundleInterface, method));
                 }
-                messageAnnotation = defaultBundleMethod.annotation(MESSAGE);
+                messageAnnotation = defaultBundleMethod.annotation(Names.MESSAGE);
             } else {
-                messageAnnotation = method.annotation(MESSAGE);
+                messageAnnotation = method.annotation(Names.MESSAGE);
             }
 
             if (messageAnnotation == null) {
@@ -565,6 +578,11 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
             }
 
             String key = getKey(method, messageAnnotation, defaultKeyValue);
+            if (key.equals(MESSAGE)) {
+                throw new MessageBundleException(String.format(
+                        "A message bundle interface method must not use the key 'message' which is reserved for dynamic lookup; defined for %s#%s()",
+                        bundleInterface, method.name()));
+            }
             if (keyMap.containsKey(key)) {
                 throw new MessageBundleException(String.format("Duplicate key [%s] found on %s", key, bundleInterface));
             }
@@ -574,30 +592,36 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
             if (messageTemplate == null) {
                 messageTemplate = messageAnnotation.value().asString();
             }
-            if (!messageTemplate.contains("}")) {
-                // No expression/tag - no need to use qute
-                bundleMethod.returnValue(bundleMethod.load(messageTemplate));
-            } else {
-                // Obtain the template, e.g. msg_hello_name
-                String templateId;
 
+            String templateId = null;
+            if (messageTemplate.contains("}")) {
                 if (defaultBundleInterface != null) {
                     if (locale == null) {
-                        AnnotationInstance localizedAnnotation = bundleInterface.classAnnotation(LOCALIZED);
+                        AnnotationInstance localizedAnnotation = bundleInterface.classAnnotation(Names.LOCALIZED);
                         locale = localizedAnnotation.value().asString();
                     }
                     templateId = bundleName + "_" + locale + "_" + key;
                 } else {
                     templateId = bundleName + "_" + key;
                 }
+            }
 
-                messageTemplateMethods
-                        .produce(new MessageBundleMethodBuildItem(bundleName, key, templateId, method, messageTemplate));
+            MessageBundleMethodBuildItem messageBundleMethod = new MessageBundleMethodBuildItem(bundleName, key, templateId,
+                    method, messageTemplate);
+            messageTemplateMethods
+                    .produce(messageBundleMethod);
 
-                ResultHandle template = bundleMethod.invokeStaticMethod(BUNDLES_GET_TEMPLATE,
+            if (!messageBundleMethod.isValidatable()) {
+                // No expression/tag - no need to use qute
+                bundleMethod.returnValue(bundleMethod.load(messageTemplate));
+            } else {
+                // Obtain the template, e.g. msg_hello_name
+                ResultHandle template = bundleMethod.invokeStaticMethod(
+                        io.quarkus.qute.deployment.Descriptors.BUNDLES_GET_TEMPLATE,
                         bundleMethod.load(templateId));
                 // Create a template instance
-                ResultHandle templateInstance = bundleMethod.invokeInterfaceMethod(TEMPLATE_INSTANCE, template);
+                ResultHandle templateInstance = bundleMethod
+                        .invokeInterfaceMethod(io.quarkus.qute.deployment.Descriptors.TEMPLATE_INSTANCE, template);
                 List<Type> paramTypes = method.parameters();
                 if (!paramTypes.isEmpty()) {
                     // Set data
@@ -605,7 +629,8 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
                     Iterator<Type> it = paramTypes.iterator();
                     while (it.hasNext()) {
                         String name = getParameterName(method, i);
-                        bundleMethod.invokeInterfaceMethod(TEMPLATE_INSTANCE_DATA, templateInstance,
+                        bundleMethod.invokeInterfaceMethod(io.quarkus.qute.deployment.Descriptors.TEMPLATE_INSTANCE_DATA,
+                                templateInstance,
                                 bundleMethod.load(name), bundleMethod.getMethodParam(i));
                         i++;
                         it.next();
@@ -613,7 +638,8 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
                 }
                 // Render the template
                 // At this point it's already validated that the method returns String
-                bundleMethod.returnValue(bundleMethod.invokeInterfaceMethod(TEMPLATE_INSTANCE_RENDER, templateInstance));
+                bundleMethod.returnValue(bundleMethod.invokeInterfaceMethod(
+                        io.quarkus.qute.deployment.Descriptors.TEMPLATE_INSTANCE_RENDER, templateInstance));
             }
         }
 
@@ -628,7 +654,7 @@ private String getParameterName(MethodInfo method, int position) {
         AnnotationInstance paramAnnotation = Annotations
                 .find(Annotations.getParameterAnnotations(method.annotations()).stream()
                         .filter(a -> a.target().asMethodParameter().position() == position).collect(Collectors.toList()),
-                        MESSAGE_PARAM);
+                        Names.MESSAGE_PARAM);
         if (paramAnnotation != null) {
             AnnotationValue paramAnnotationValue = paramAnnotation.value();
             if (paramAnnotationValue != null && !paramAnnotationValue.asString().equals(Message.ELEMENT_NAME)) {
@@ -646,12 +672,71 @@ private String getParameterName(MethodInfo method, int position) {
 
     private void implementResolve(String defaultBundleImpl, ClassCreator bundleCreator, Map<String, MethodInfo> keyMap) {
         MethodCreator resolve = bundleCreator.getMethodCreator("resolve", CompletionStage.class, EvalContext.class);
+        String resolveMethodPrefix = bundleCreator.getClassName().contains("/")
+                ? bundleCreator.getClassName().substring(bundleCreator.getClassName().lastIndexOf('/') + 1)
+                : bundleCreator.getClassName();
 
         ResultHandle evalContext = resolve.getMethodParam(0);
         ResultHandle name = resolve.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
         ResultHandle ret = resolve.newInstance(MethodDescriptor.ofConstructor(CompletableFuture.class));
 
-        // Group messages to workaround limits of a java method body 
+        // First handle dynamic messages, i.e. the "message" virtual method 
+        BytecodeCreator dynamicMessage = resolve.ifTrue(resolve.invokeVirtualMethod(Descriptors.EQUALS,
+                resolve.load(MESSAGE), name))
+                .trueBranch();
+        ResultHandle evaluatedMessageKey = dynamicMessage.invokeStaticMethod(Descriptors.EVALUATED_PARAMS_EVALUATE_MESSAGE_KEY,
+                evalContext);
+        ResultHandle paramsReady = dynamicMessage.readInstanceField(Descriptors.EVALUATED_PARAMS_STAGE,
+                evaluatedMessageKey);
+
+        // Define function called when the message key is ready
+        FunctionCreator whenCompleteFun = dynamicMessage.createFunction(BiConsumer.class);
+        dynamicMessage.invokeInterfaceMethod(Descriptors.CF_WHEN_COMPLETE, paramsReady, whenCompleteFun.getInstance());
+        BytecodeCreator whenComplete = whenCompleteFun.getBytecode();
+        AssignableResultHandle whenThis = whenComplete
+                .createVariable(DescriptorUtils.extToInt(bundleCreator.getClassName()));
+        whenComplete.assign(whenThis, dynamicMessage.getThis());
+        AssignableResultHandle whenRet = whenComplete.createVariable(CompletableFuture.class);
+        whenComplete.assign(whenRet, ret);
+        AssignableResultHandle whenEvalContext = whenComplete.createVariable(EvalContext.class);
+        whenComplete.assign(whenEvalContext, evalContext);
+        BranchResult throwableIsNull = whenComplete.ifNull(whenComplete.getMethodParam(1));
+        BytecodeCreator success = throwableIsNull.trueBranch();
+
+        // Return if the name is null or NOT_FOUND
+        ResultHandle resultNotFound = success.readStaticField(Descriptors.RESULT_NOT_FOUND);
+        BytecodeCreator nameIsNull = success.ifNull(whenComplete.getMethodParam(0)).trueBranch();
+        nameIsNull.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE, whenRet,
+                resultNotFound);
+        nameIsNull.returnValue(null);
+        BytecodeCreator nameNotFound = success.ifTrue(success.invokeVirtualMethod(Descriptors.EQUALS,
+                whenComplete.getMethodParam(0), resultNotFound)).trueBranch();
+        nameNotFound.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE, whenRet, resultNotFound);
+        nameNotFound.returnValue(null);
+
+        // Evaluate the rest of the params
+        ResultHandle evaluatedMessageParams = success.invokeStaticMethod(
+                Descriptors.EVALUATED_PARAMS_EVALUATE_MESSAGE_PARAMS,
+                whenEvalContext);
+        // Delegate to BundleClassName_resolve_0 (the first group of messages)
+        ResultHandle res0Ret = success.invokeVirtualMethod(
+                MethodDescriptor.ofMethod(bundleCreator.getClassName(), resolveMethodPrefix + "_resolve_0",
+                        CompletableFuture.class, String.class,
+                        EvaluatedParams.class, CompletableFuture.class),
+                whenThis, whenComplete.getMethodParam(0), evaluatedMessageParams, whenRet);
+        BytecodeCreator ret0Null = success.ifNull(res0Ret).trueBranch();
+        ret0Null.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE, whenRet,
+                resultNotFound);
+        BytecodeCreator failure = throwableIsNull.falseBranch();
+        failure.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE_EXCEPTIONALLY, whenRet,
+                whenComplete.getMethodParam(1));
+        whenComplete.returnValue(null);
+        // Return from the resolve method
+        dynamicMessage.returnValue(ret);
+
+        // Proceed with generated messages
+        // We do group messages to workaround limits of a JVM method body 
+        ResultHandle evaluatedParams = resolve.invokeStaticMethod(Descriptors.EVALUATED_PARAMS_EVALUATE, evalContext);
         final int groupLimit = 300;
         int groupIndex = 0;
         int resolveIndex = 0;
@@ -659,24 +744,33 @@ private void implementResolve(String defaultBundleImpl, ClassCreator bundleCreat
 
         for (Entry<String, MethodInfo> entry : keyMap.entrySet()) {
             if (resolveGroup == null || groupIndex++ >= groupLimit) {
+                groupIndex = 0;
+                String resolveMethodName = resolveMethodPrefix + "_resolve_" + resolveIndex++;
                 if (resolveGroup != null) {
-                    resolveGroup.returnValue(resolveGroup.loadNull());
+                    // Delegate to the next "resolve_x" method
+                    resolveGroup.returnValue(resolveGroup.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(bundleCreator.getClassName(), resolveMethodName, CompletableFuture.class,
+                                    String.class,
+                                    EvaluatedParams.class, CompletableFuture.class),
+                            resolveGroup.getThis(), resolveGroup.getMethodParam(0), resolveGroup.getMethodParam(1),
+                            resolveGroup.getMethodParam(2)));
                 }
-                groupIndex = 0;
-                String resolveMethodName = "resolve_" + resolveIndex++;
                 resolveGroup = bundleCreator.getMethodCreator(resolveMethodName, CompletableFuture.class, String.class,
-                        EvalContext.class, CompletableFuture.class).setModifiers(ACC_PRIVATE | ACC_FINAL);
-                ResultHandle resRet = resolve.invokeVirtualMethod(
-                        MethodDescriptor.ofMethod(bundleCreator.getClassName(), resolveMethodName, CompletableFuture.class,
-                                String.class, EvalContext.class, CompletableFuture.class),
-                        resolve.getThis(), name, evalContext, ret);
-                resolve.ifNotNull(resRet).trueBranch().returnValue(resRet);
+                        EvaluatedParams.class, CompletableFuture.class).setModifiers(0);
+                if (resolveIndex == 1) {
+                    ResultHandle resRet = resolve.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(bundleCreator.getClassName(), resolveMethodName, CompletableFuture.class,
+                                    String.class, EvaluatedParams.class, CompletableFuture.class),
+                            resolve.getThis(), name, evaluatedParams, ret);
+                    resolve.ifNotNull(resRet).trueBranch().returnValue(resRet);
+                }
             }
             addMessageMethod(resolveGroup, entry.getKey(), entry.getValue(), resolveGroup.getMethodParam(0),
                     resolveGroup.getMethodParam(1), resolveGroup.getMethodParam(2), bundleCreator.getClassName());
         }
 
         if (resolveGroup != null) {
+            // Last group - return null
             resolveGroup.returnValue(resolveGroup.loadNull());
         }
 
@@ -690,11 +784,11 @@ private void implementResolve(String defaultBundleImpl, ClassCreator bundleCreat
     }
 
     private void addMessageMethod(MethodCreator resolve, String key, MethodInfo method, ResultHandle name,
-            ResultHandle evalContext,
+            ResultHandle evaluatedParams,
             ResultHandle ret, String bundleClass) {
         List<Type> methodParams = method.parameters();
 
-        BytecodeCreator matched = resolve.ifNonZero(resolve.invokeVirtualMethod(Descriptors.EQUALS,
+        BytecodeCreator matched = resolve.ifTrue(resolve.invokeVirtualMethod(Descriptors.EQUALS,
                 resolve.load(key), name))
                 .trueBranch();
         if (method.parameters().isEmpty()) {
@@ -703,8 +797,6 @@ private void addMessageMethod(MethodCreator resolve, String key, MethodInfo meth
             matched.returnValue(ret);
         } else {
             // The CompletionStage upon which we invoke whenComplete()
-            ResultHandle evaluatedParams = matched.invokeStaticMethod(Descriptors.EVALUATED_PARAMS_EVALUATE,
-                    evalContext);
             ResultHandle paramsReady = matched.readInstanceField(Descriptors.EVALUATED_PARAMS_STAGE,
                     evaluatedParams);
 
@@ -793,8 +885,7 @@ private String getDefaultLocale(AnnotationInstance bundleAnnotation) {
 
     private Set<Path> findMessageFiles(ApplicationArchivesBuildItem applicationArchivesBuildItem) throws IOException {
         ApplicationArchive applicationArchive = applicationArchivesBuildItem.getRootArchive();
-        String basePath = "messages";
-        Path messagesPath = applicationArchive.getChildPath(basePath);
+        Path messagesPath = applicationArchive.getChildPath(MESSAGES);
         if (messagesPath == null) {
             return Collections.emptySet();
         }
@@ -811,4 +902,30 @@ private Set<Path> findMessageFiles(ApplicationArchivesBuildItem applicationArchi
         return messageFiles;
     }
 
+    private static class AppClassPredicate implements Predicate<String> {
+        private final ApplicationArchivesBuildItem applicationArchivesBuildItem;
+        private final Function<String, String> additionalClassNameSanitizer;
+
+        public AppClassPredicate(ApplicationArchivesBuildItem applicationArchivesBuildItem) {
+            this(applicationArchivesBuildItem, Function.identity());
+        }
+
+        public AppClassPredicate(ApplicationArchivesBuildItem applicationArchivesBuildItem,
+                Function<String, String> additionalClassNameSanitizer) {
+            this.applicationArchivesBuildItem = applicationArchivesBuildItem;
+            this.additionalClassNameSanitizer = additionalClassNameSanitizer;
+        }
+
+        @Override
+        public boolean test(String name) {
+            int idx = name.lastIndexOf(SUFFIX);
+            String className = name.substring(0, idx).replace("/", ".");
+            if (className.contains(ValueResolverGenerator.NESTED_SEPARATOR)) {
+                className = className.replace(ValueResolverGenerator.NESTED_SEPARATOR, "$");
+            }
+            className = additionalClassNameSanitizer.apply(className);
+            return applicationArchivesBuildItem.getRootArchive().getIndex()
+                    .getClassByName(DotName.createSimple(className)) != null;
+        }
+    }
 }
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Names.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Names.java
new file mode 100644
index 0000000000000..a7873e3160181
--- /dev/null
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Names.java
@@ -0,0 +1,47 @@
+package io.quarkus.qute.deployment;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.CompletionStage;
+import java.util.stream.Stream;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.qute.Location;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.qute.api.ResourcePath;
+import io.quarkus.qute.i18n.Localized;
+import io.quarkus.qute.i18n.Message;
+import io.quarkus.qute.i18n.MessageBundle;
+import io.quarkus.qute.i18n.MessageParam;
+import io.smallrye.mutiny.Uni;
+
+final class Names {
+
+    static final DotName BUNDLE = DotName.createSimple(MessageBundle.class.getName());
+    static final DotName MESSAGE = DotName.createSimple(Message.class.getName());
+    static final DotName MESSAGE_PARAM = DotName.createSimple(MessageParam.class.getName());
+    static final DotName LOCALIZED = DotName.createSimple(Localized.class.getName());
+    static final DotName RESOURCE_PATH = DotName.createSimple(ResourcePath.class.getName());
+    static final DotName TEMPLATE = DotName.createSimple(Template.class.getName());
+    static final DotName ITERABLE = DotName.createSimple(Iterable.class.getName());
+    static final DotName ITERATOR = DotName.createSimple(Iterator.class.getName());
+    static final DotName STREAM = DotName.createSimple(Stream.class.getName());
+    static final DotName MAP = DotName.createSimple(Map.class.getName());
+    static final DotName MAP_ENTRY = DotName.createSimple(Entry.class.getName());
+    static final DotName COLLECTION = DotName.createSimple(Collection.class.getName());
+    static final DotName CHECKED_TEMPLATE_OLD = DotName.createSimple(CheckedTemplate.class.getName());
+    static final DotName TEMPLATE_INSTANCE = DotName.createSimple(TemplateInstance.class.getName());
+    static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
+    static final DotName UNI = DotName.createSimple(Uni.class.getName());
+    static final DotName LOCATION = DotName.createSimple(Location.class.getName());
+    static final DotName CHECKED_TEMPLATE = DotName.createSimple(io.quarkus.qute.CheckedTemplate.class.getName());
+
+    private Names() {
+    }
+
+}
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java
index 5efef354c22ee..c93625a39f8ad 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java
@@ -1,5 +1,6 @@
 package io.quarkus.qute.deployment;
 
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 import static java.util.stream.Collectors.toMap;
 
@@ -8,12 +9,14 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.lang.reflect.Modifier;
+import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -24,10 +27,12 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -41,21 +46,24 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.PrimitiveType;
+import org.jboss.jandex.PrimitiveType.Primitive;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.TypeVariable;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
-import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
-import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem;
+import io.quarkus.arc.deployment.BeanDiscoveryFinishedBuildItem;
+import io.quarkus.arc.deployment.QualifierRegistrarBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
 import io.quarkus.arc.processor.BeanInfo;
-import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.InjectionPointInfo;
+import io.quarkus.arc.processor.QualifierRegistrar;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.deployment.ApplicationArchive;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
@@ -72,17 +80,23 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
 import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem;
+import io.quarkus.qute.CheckedTemplate;
 import io.quarkus.qute.Engine;
 import io.quarkus.qute.EngineBuilder;
 import io.quarkus.qute.Expression;
 import io.quarkus.qute.Expression.VirtualMethodPart;
+import io.quarkus.qute.Expressions;
 import io.quarkus.qute.LoopSectionHelper;
 import io.quarkus.qute.ParserHelper;
 import io.quarkus.qute.ParserHook;
 import io.quarkus.qute.ResultNode;
 import io.quarkus.qute.SectionHelper;
 import io.quarkus.qute.SectionHelperFactory;
+import io.quarkus.qute.SetSectionHelper;
 import io.quarkus.qute.Template;
 import io.quarkus.qute.TemplateException;
 import io.quarkus.qute.TemplateExtension;
@@ -90,43 +104,54 @@
 import io.quarkus.qute.TemplateLocator;
 import io.quarkus.qute.UserTagSectionHelper;
 import io.quarkus.qute.Variant;
-import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.qute.WhenSectionHelper;
 import io.quarkus.qute.api.ResourcePath;
 import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis;
-import io.quarkus.qute.deployment.TypeCheckExcludeBuildItem.Check;
+import io.quarkus.qute.deployment.TypeCheckExcludeBuildItem.TypeCheck;
 import io.quarkus.qute.deployment.TypeInfos.Info;
 import io.quarkus.qute.generator.ExtensionMethodGenerator;
+import io.quarkus.qute.generator.ExtensionMethodGenerator.NamespaceResolverCreator;
+import io.quarkus.qute.generator.ExtensionMethodGenerator.NamespaceResolverCreator.ResolveCreator;
 import io.quarkus.qute.generator.ValueResolverGenerator;
+import io.quarkus.qute.runtime.ContentTypes;
 import io.quarkus.qute.runtime.EngineProducer;
 import io.quarkus.qute.runtime.QuteConfig;
 import io.quarkus.qute.runtime.QuteRecorder;
 import io.quarkus.qute.runtime.QuteRecorder.QuteContext;
 import io.quarkus.qute.runtime.TemplateProducer;
+import io.quarkus.qute.runtime.devmode.QuteDevConsoleRecorder;
 import io.quarkus.qute.runtime.extensions.CollectionTemplateExtensions;
+import io.quarkus.qute.runtime.extensions.ConfigTemplateExtensions;
 import io.quarkus.qute.runtime.extensions.MapTemplateExtensions;
 import io.quarkus.qute.runtime.extensions.NumberTemplateExtensions;
+import io.quarkus.qute.runtime.extensions.TimeTemplateExtensions;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.core.json.DecodeException;
+import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
 
 public class QuteProcessor {
 
-    private static final Logger LOGGER = Logger.getLogger(QuteProcessor.class);
-
-    public static final DotName RESOURCE_PATH = DotName.createSimple(ResourcePath.class.getName());
-    public static final DotName TEMPLATE = DotName.createSimple(Template.class.getName());
-
-    static final DotName ITERABLE = DotName.createSimple(Iterable.class.getName());
-    static final DotName ITERATOR = DotName.createSimple(Iterator.class.getName());
-    static final DotName STREAM = DotName.createSimple(Stream.class.getName());
-    static final DotName MAP = DotName.createSimple(Map.class.getName());
-
-    static final DotName MAP_ENTRY = DotName.createSimple(Entry.class.getName());
-    static final DotName COLLECTION = DotName.createSimple(Collection.class.getName());
-    static final DotName STRING = DotName.createSimple(String.class.getName());
+    public static final DotName RESOURCE_PATH = Names.RESOURCE_PATH;
 
-    static final DotName DOTNAME_CHECKED_TEMPLATE = DotName.createSimple(CheckedTemplate.class.getName());
-    static final DotName DOTNAME_TEMPLATE_INSTANCE = DotName.createSimple(TemplateInstance.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(QuteProcessor.class);
 
-    private static final String MATCH_NAME = "matchName";
-    private static final String PRIORITY = "priority";
+    private static final Function<FieldInfo, String> GETTER_FUN = new Function<FieldInfo, String>() {
+        @Override
+        public String apply(FieldInfo field) {
+            String prefix;
+            if (field.type().kind() == org.jboss.jandex.Type.Kind.PRIMITIVE
+                    && field.type().asPrimitiveType().primitive() == Primitive.BOOLEAN) {
+                prefix = ValueResolverGenerator.IS_PREFIX;
+            } else {
+                prefix = ValueResolverGenerator.GET_PREFIX;
+            }
+            return prefix + ValueResolverGenerator.capitalize(field.name());
+        }
+    };
 
     @BuildStep
     FeatureBuildItem feature() {
@@ -137,34 +162,41 @@ FeatureBuildItem feature() {
     void processTemplateErrors(TemplatesAnalysisBuildItem analysis, List<IncorrectExpressionBuildItem> incorrectExpressions,
             BuildProducer<ServiceStartBuildItem> serviceStart) {
 
-        List<String> errors = new ArrayList<>();
+        List<TemplateException> errors = new ArrayList<>();
 
         for (IncorrectExpressionBuildItem incorrectExpression : incorrectExpressions) {
             if (incorrectExpression.reason != null) {
-                errors.add(String.format(
-                        "Incorrect expression: %s\n\t- %s\n\t- found in template [%s] on line %s",
+                errors.add(new TemplateException(incorrectExpression.origin, String.format(
+                        "Incorrect expression found: {%s}\n\t- %s\n\t- at %s:%s",
                         incorrectExpression.expression, incorrectExpression.reason,
-                        findTemplatePath(analysis, incorrectExpression.templateId), incorrectExpression.line));
+                        findTemplatePath(analysis, incorrectExpression.origin.getTemplateGeneratedId()),
+                        incorrectExpression.origin.getLine())));
             } else if (incorrectExpression.clazz != null) {
-                errors.add(String.format(
-                        "Incorrect expression: %s\n\t- property/method [%s] not found on class [%s] nor handled by an extension method\n\t- found in template [%s] on line %s",
+                errors.add(new TemplateException(incorrectExpression.origin, String.format(
+                        "Incorrect expression found: {%s}\n\t- property/method [%s] not found on class [%s] nor handled by an extension method\n\t- at %s:%s",
                         incorrectExpression.expression, incorrectExpression.property, incorrectExpression.clazz,
-                        findTemplatePath(analysis, incorrectExpression.templateId), incorrectExpression.line));
+                        findTemplatePath(analysis, incorrectExpression.origin.getTemplateGeneratedId()),
+                        incorrectExpression.origin.getLine())));
             } else {
-                errors.add(String.format(
-                        "Incorrect expression %s\n\t @Named bean not found for [%s]\n\t- found in template [%s] on line %s",
+                errors.add(new TemplateException(incorrectExpression.origin, String.format(
+                        "Incorrect expression found: {%s}\n\t- @Named bean not found for [%s]\n\t- at %s:%s",
                         incorrectExpression.expression, incorrectExpression.property,
-                        findTemplatePath(analysis, incorrectExpression.templateId), incorrectExpression.line));
+                        findTemplatePath(analysis, incorrectExpression.origin.getTemplateGeneratedId()),
+                        incorrectExpression.origin.getLine())));
             }
         }
 
         if (!errors.isEmpty()) {
             StringBuilder message = new StringBuilder("Found template problems (").append(errors.size()).append("):");
             int idx = 1;
-            for (String errorMessage : errors) {
-                message.append("\n").append("[").append(idx++).append("] ").append(errorMessage);
+            for (TemplateException error : errors) {
+                message.append("\n").append("[").append(idx++).append("] ").append(error.getMessage());
             }
-            throw new TemplateException(message.toString());
+            TemplateException exception = new TemplateException(message.toString());
+            for (TemplateException error : errors) {
+                exception.addSuppressed(error);
+            }
+            throw exception;
         }
     }
 
@@ -172,17 +204,19 @@ void processTemplateErrors(TemplatesAnalysisBuildItem analysis, List<IncorrectEx
     AdditionalBeanBuildItem additionalBeans() {
         return AdditionalBeanBuildItem.builder()
                 .setUnremovable()
-                .addBeanClasses(EngineProducer.class, TemplateProducer.class, ResourcePath.class,
+                .addBeanClasses(EngineProducer.class, TemplateProducer.class, ContentTypes.class, ResourcePath.class,
                         Template.class, TemplateInstance.class, CollectionTemplateExtensions.class,
-                        MapTemplateExtensions.class, NumberTemplateExtensions.class)
+                        MapTemplateExtensions.class, NumberTemplateExtensions.class, ConfigTemplateExtensions.class,
+                        TimeTemplateExtensions.class)
                 .build();
     }
 
     @BuildStep
-    List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem index,
+    List<CheckedTemplateBuildItem> collectCheckedTemplates(BeanArchiveIndexBuildItem index,
             BuildProducer<BytecodeTransformerBuildItem> transformers,
             List<TemplatePathBuildItem> templatePaths,
-            List<CheckedTemplateAdapterBuildItem> templateAdaptorBuildItems) {
+            List<CheckedTemplateAdapterBuildItem> templateAdaptorBuildItems,
+            QuteConfig config) {
         List<CheckedTemplateBuildItem> ret = new ArrayList<>();
 
         Map<DotName, CheckedTemplateAdapter> adaptors = new HashMap<>();
@@ -192,9 +226,9 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem
         }
         String supportedAdaptors;
         if (adaptors.isEmpty()) {
-            supportedAdaptors = DOTNAME_TEMPLATE_INSTANCE + " is supported";
+            supportedAdaptors = Names.TEMPLATE_INSTANCE + " is supported";
         } else {
-            StringBuffer strbuf = new StringBuffer(DOTNAME_TEMPLATE_INSTANCE.toString());
+            StringBuffer strbuf = new StringBuffer(Names.TEMPLATE_INSTANCE.toString());
             List<String> adaptorsList = new ArrayList<>(adaptors.size());
             for (DotName name : adaptors.keySet()) {
                 adaptorsList.add(name.toString());
@@ -206,17 +240,39 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem
             supportedAdaptors = strbuf.append(" are supported").toString();
         }
 
-        for (AnnotationInstance annotation : index.getIndex().getAnnotations(DOTNAME_CHECKED_TEMPLATE)) {
-            if (annotation.target().kind() != Kind.CLASS)
+        // template path -> checked template method
+        Map<String, MethodInfo> checkedTemplateMethods = new HashMap<>();
+
+        Set<AnnotationInstance> checkedTemplateAnnotations = new HashSet<>();
+        checkedTemplateAnnotations.addAll(index.getIndex().getAnnotations(Names.CHECKED_TEMPLATE_OLD));
+        checkedTemplateAnnotations.addAll(index.getIndex().getAnnotations(Names.CHECKED_TEMPLATE));
+
+        // Build a set of file paths for validation
+        Set<String> filePaths = new HashSet<String>();
+        for (TemplatePathBuildItem templatePath : templatePaths) {
+            String path = templatePath.getPath();
+            filePaths.add(path);
+            // Also add version without suffix from the path
+            // For example for "items.html" also add "items"
+            for (String suffix : config.suffixes) {
+                if (path.endsWith(suffix)) {
+                    filePaths.add(path.substring(0, path.length() - (suffix.length() + 1)));
+                }
+            }
+        }
+
+        for (AnnotationInstance annotation : checkedTemplateAnnotations) {
+            if (annotation.target().kind() != Kind.CLASS) {
                 continue;
+            }
             ClassInfo classInfo = annotation.target().asClass();
             NativeCheckedTemplateEnhancer enhancer = new NativeCheckedTemplateEnhancer();
             for (MethodInfo methodInfo : classInfo.methods()) {
-                // only keep native public static methods
-                if (!Modifier.isPublic(methodInfo.flags())
-                        || !Modifier.isStatic(methodInfo.flags())
-                        || !Modifier.isNative(methodInfo.flags()))
+                // only keep native static methods
+                if (!Modifier.isStatic(methodInfo.flags())
+                        || !Modifier.isNative(methodInfo.flags())) {
                     continue;
+                }
                 // check its return type
                 if (methodInfo.returnType().kind() != Type.Kind.CLASS) {
                     throw new TemplateException("Incompatible checked template return type: " + methodInfo.returnType()
@@ -225,22 +281,50 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem
                 DotName returnTypeName = methodInfo.returnType().asClassType().name();
                 CheckedTemplateAdapter adaptor = null;
                 // if it's not the default template instance, try to find an adapter
-                if (!returnTypeName.equals(DOTNAME_TEMPLATE_INSTANCE)) {
+                if (!returnTypeName.equals(Names.TEMPLATE_INSTANCE)) {
                     adaptor = adaptors.get(returnTypeName);
                     if (adaptor == null)
                         throw new TemplateException("Incompatible checked template return type: " + methodInfo.returnType()
                                 + " only " + supportedAdaptors);
                 }
-                String methodName = methodInfo.name();
-                String templatePath;
-                if (classInfo.enclosingClass() != null) {
+
+                StringBuilder templatePathBuilder = new StringBuilder();
+                AnnotationValue basePathValue = annotation.value("basePath");
+                if (basePathValue != null && !basePathValue.asString().equals(CheckedTemplate.DEFAULTED)) {
+                    templatePathBuilder.append(basePathValue.asString());
+                } else if (classInfo.enclosingClass() != null) {
                     ClassInfo enclosingClass = index.getIndex().getClassByName(classInfo.enclosingClass());
-                    String className = enclosingClass.simpleName();
-                    templatePath = className + "/" + methodName;
-                } else {
-                    templatePath = methodName;
+                    templatePathBuilder.append(enclosingClass.simpleName());
+                }
+                if (templatePathBuilder.length() > 0 && templatePathBuilder.charAt(templatePathBuilder.length() - 1) != '/') {
+                    templatePathBuilder.append('/');
+                }
+                String templatePath = templatePathBuilder.append(methodInfo.name()).toString();
+                MethodInfo checkedTemplateMethod = checkedTemplateMethods.putIfAbsent(templatePath, methodInfo);
+                if (checkedTemplateMethod != null) {
+                    throw new TemplateException(
+                            String.format(
+                                    "Multiple checked template methods exist for the template path %s:\n\t- %s: %s\n\t- %s: %s",
+                                    templatePath, methodInfo.declaringClass().name(), methodInfo,
+                                    checkedTemplateMethod.declaringClass().name(), checkedTemplateMethod));
+                }
+                if (!filePaths.contains(templatePath)) {
+                    List<String> startsWith = new ArrayList<>();
+                    for (String filePath : filePaths) {
+                        if (filePath.startsWith(templatePath)) {
+                            startsWith.add(filePath);
+                        }
+                    }
+                    if (startsWith.isEmpty()) {
+                        throw new TemplateException(
+                                "No template matching the path " + templatePath + " could be found for: "
+                                        + classInfo.name() + "." + methodInfo.name());
+                    } else {
+                        throw new TemplateException(
+                                startsWith + " match the path " + templatePath
+                                        + " but the file suffix is not configured via the quarkus.qute.suffixes property");
+                    }
                 }
-                checkTemplatePath(templatePath, templatePaths, classInfo, methodInfo);
 
                 Map<String, String> bindings = new HashMap<>();
                 List<Type> parameters = methodInfo.parameters();
@@ -255,7 +339,7 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem
                     bindings.put(name, JandexUtil.getBoxedTypeName(type));
                     parameterNames.add(name);
                 }
-                ret.add(new CheckedTemplateBuildItem(templatePath, bindings));
+                ret.add(new CheckedTemplateBuildItem(templatePath, bindings, methodInfo));
                 enhancer.implement(methodInfo, templatePath, parameterNames, adaptor);
             }
             transformers.produce(new BytecodeTransformerBuildItem(classInfo.name().toString(),
@@ -265,29 +349,9 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem
         return ret;
     }
 
-    private void checkTemplatePath(String templatePath, List<TemplatePathBuildItem> templatePaths, ClassInfo enclosingClass,
-            MethodInfo methodInfo) {
-        for (TemplatePathBuildItem templatePathBuildItem : templatePaths) {
-            // perfect match
-            if (templatePathBuildItem.getPath().equals(templatePath)) {
-                return;
-            }
-            // if our templatePath is "Foo/hello", make it match "Foo/hello.txt"
-            // if they're not equal and they start with our path, there must be something left after
-            if (templatePathBuildItem.getPath().startsWith(templatePath)
-                    // check that we have an extension, let variant matching work later
-                    && templatePathBuildItem.getPath().charAt(templatePath.length()) == '.') {
-                return;
-            }
-        }
-        throw new TemplateException(
-                "Declared template " + templatePath + " could not be found. Either add it or delete its declaration in "
-                        + enclosingClass.name().toString('.') + "." + methodInfo.name());
-    }
-
     @BuildStep
     TemplatesAnalysisBuildItem analyzeTemplates(List<TemplatePathBuildItem> templatePaths,
-            List<CheckedTemplateBuildItem> dynamicTemplates, List<MessageBundleMethodBuildItem> messageBundleMethods) {
+            List<CheckedTemplateBuildItem> checkedTemplates, List<MessageBundleMethodBuildItem> messageBundleMethods) {
         long start = System.currentTimeMillis();
         List<TemplateAnalysis> analysis = new ArrayList<>();
 
@@ -315,7 +379,7 @@ public SectionHelper initialize(SectionInitContext context) {
                     return new SectionHelper() {
                         @Override
                         public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
-                            return CompletableFuture.completedFuture(ResultNode.NOOP);
+                            return ResultNode.NOOP;
                         }
                     };
                 }
@@ -349,28 +413,25 @@ public Optional<Variant> getVariant() {
         }).addParserHook(new ParserHook() {
 
             @Override
-            public void beforeParsing(ParserHelper parserHelper, String id) {
-                if (id != null) {
-                    for (CheckedTemplateBuildItem dynamicTemplate : dynamicTemplates) {
-                        // FIXME: check for dot/extension?
-                        if (id.startsWith(dynamicTemplate.templateId)) {
-                            for (Entry<String, String> entry : dynamicTemplate.bindings.entrySet()) {
-                                parserHelper.addParameter(entry.getKey(), entry.getValue());
-                            }
+            public void beforeParsing(ParserHelper parserHelper) {
+                for (CheckedTemplateBuildItem checkedTemplate : checkedTemplates) {
+                    // FIXME: check for dot/extension?
+                    if (parserHelper.getTemplateId().startsWith(checkedTemplate.templateId)) {
+                        for (Entry<String, String> entry : checkedTemplate.bindings.entrySet()) {
+                            parserHelper.addParameter(entry.getKey(), entry.getValue());
                         }
                     }
-
-                    // Add params to message bundle templates
-                    for (MessageBundleMethodBuildItem messageBundleMethod : messageBundleMethods) {
-                        if (id.equals(messageBundleMethod.getTemplateId())) {
-                            MethodInfo method = messageBundleMethod.getMethod();
-                            for (ListIterator<Type> it = method.parameters().listIterator(); it.hasNext();) {
-                                Type paramType = it.next();
-                                parserHelper.addParameter(method.parameterName(it.previousIndex()),
-                                        JandexUtil.getBoxedTypeName(paramType));
-                            }
-                            break;
+                }
+                // Add params to message bundle templates
+                for (MessageBundleMethodBuildItem messageBundleMethod : messageBundleMethods) {
+                    if (parserHelper.getTemplateId().equals(messageBundleMethod.getTemplateId())) {
+                        MethodInfo method = messageBundleMethod.getMethod();
+                        for (ListIterator<Type> it = method.parameters().listIterator(); it.hasNext();) {
+                            Type paramType = it.next();
+                            parserHelper.addParameter(method.parameterName(it.previousIndex()),
+                                    JandexUtil.getBoxedTypeName(paramType));
                         }
+                        break;
                     }
                 }
             }
@@ -404,7 +465,8 @@ void validateExpressions(TemplatesAnalysisBuildItem templatesAnalysis, BeanArchi
             List<TemplateExtensionMethodBuildItem> templateExtensionMethods,
             List<TypeCheckExcludeBuildItem> excludes,
             BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions,
-            BuildProducer<ImplicitValueResolverBuildItem> implicitClasses) {
+            BuildProducer<ImplicitValueResolverBuildItem> implicitClasses,
+            BeanDiscoveryFinishedBuildItem beanDiscovery) {
 
         IndexView index = beanArchiveIndex.getIndex();
         Function<String, String> templateIdToPathFun = new Function<String, String>() {
@@ -414,101 +476,226 @@ public String apply(String id) {
             }
         };
 
-        // Map implicit class -> true if methods were used
-        Map<ClassInfo, Boolean> implicitClassToMethodUsed = new HashMap<>();
+        // IMPLEMENTATION NOTE: 
+        // We do not support injection of synthetic beans with names 
+        // Dependency on the ValidationPhaseBuildItem would result in a cycle in the build chain
+        Map<String, BeanInfo> namedBeans = beanDiscovery.beanStream().withName()
+                .collect(toMap(BeanInfo::getName, Function.identity()));
+
+        // Map implicit class -> set of used members
+        Map<DotName, Set<String>> implicitClassToMembersUsed = new HashMap<>();
 
-        for (TemplateAnalysis analysis : templatesAnalysis.getAnalysis()) {
-            for (Expression expression : analysis.expressions) {
-                if (expression.hasNamespace() || expression.isLiteral()) {
+        for (TemplateAnalysis templateAnalysis : templatesAnalysis.getAnalysis()) {
+            // Maps an expression generated id to the last match of an expression (i.e. the type of the last part)
+            Map<Integer, Match> generatedIdsToMatches = new HashMap<>();
+
+            for (Expression expression : templateAnalysis.expressions) {
+                if (expression.isLiteral()) {
                     continue;
                 }
-                validateNestedExpressions(null, new HashMap<>(), templateExtensionMethods, excludes, incorrectExpressions,
-                        expression, index, implicitClassToMethodUsed, templateIdToPathFun);
+                if (expression.hasNamespace()) {
+                    if (expression.getNamespace().equals(EngineProducer.INJECT_NAMESPACE)) {
+                        validateInjectExpression(templateAnalysis, expression, index, incorrectExpressions,
+                                templateExtensionMethods, excludes, namedBeans, generatedIdsToMatches,
+                                implicitClassToMembersUsed,
+                                templateIdToPathFun);
+                    } else {
+                        continue;
+                    }
+                } else {
+                    generatedIdsToMatches.put(expression.getGeneratedId(),
+                            validateNestedExpressions(templateAnalysis, null, new HashMap<>(), templateExtensionMethods,
+                                    excludes,
+                                    incorrectExpressions, expression, index, implicitClassToMembersUsed, templateIdToPathFun,
+                                    generatedIdsToMatches));
+                }
             }
         }
 
-        for (Entry<ClassInfo, Boolean> implicit : implicitClassToMethodUsed.entrySet()) {
-            implicitClasses.produce(implicit.getValue()
-                    ? new ImplicitValueResolverBuildItem(implicit.getKey(), new TemplateDataBuilder().properties(false).build())
-                    : new ImplicitValueResolverBuildItem(implicit.getKey()));
+        for (Entry<DotName, Set<String>> entry : implicitClassToMembersUsed.entrySet()) {
+            ClassInfo clazz = index.getClassByName(entry.getKey());
+            if (clazz != null) {
+                implicitClasses.produce(new ImplicitValueResolverBuildItem(clazz,
+                        new TemplateDataBuilder().addIgnore(buildIgnorePattern(entry.getValue())).build()));
+            }
         }
     }
 
-    static void validateNestedExpressions(ClassInfo rootClazz, Map<String, Match> results,
+    static String buildIgnorePattern(Iterable<String> names) {
+        // ^(?!\\Qbar\\P|\\Qfoo\\P).*$
+        StringBuilder ignorePattern = new StringBuilder("^(?!");
+        for (Iterator<String> iterator = names.iterator(); iterator.hasNext();) {
+            String memberName = iterator.next();
+            ignorePattern.append(Pattern.quote(memberName));
+            if (iterator.hasNext()) {
+                ignorePattern.append("|");
+            }
+        }
+        ignorePattern.append(").*$");
+        return ignorePattern.toString();
+    }
+
+    /**
+     * @param templateAnalysis
+     * @param rootClazz
+     * @param results Map of cached results within a single expression
+     * @param templateExtensionMethods
+     * @param excludes
+     * @param incorrectExpressions
+     * @param expression
+     * @param index
+     * @param implicitClassToMembersUsed
+     * @param templateIdToPathFun
+     * @return the last match object
+     */
+    static Match validateNestedExpressions(TemplateAnalysis templateAnalysis, ClassInfo rootClazz, Map<String, Match> results,
             List<TemplateExtensionMethodBuildItem> templateExtensionMethods,
             List<TypeCheckExcludeBuildItem> excludes,
             BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions, Expression expression, IndexView index,
-            Map<ClassInfo, Boolean> implicitClassToMethodUsed, Function<String, String> templateIdToPathFun) {
+            Map<DotName, Set<String>> implicitClassToMembersUsed, Function<String, String> templateIdToPathFun,
+            Map<Integer, Match> generatedIdsToMatches) {
 
         // First validate nested virtual methods
         for (Expression.Part part : expression.getParts()) {
             if (part.isVirtualMethod()) {
                 for (Expression param : part.asVirtualMethod().getParameters()) {
                     if (!results.containsKey(param.toOriginalString())) {
-                        validateNestedExpressions(null, results, templateExtensionMethods, excludes, incorrectExpressions,
-                                param, index, implicitClassToMethodUsed, templateIdToPathFun);
+                        validateNestedExpressions(templateAnalysis, null, results, templateExtensionMethods, excludes,
+                                incorrectExpressions, param, index, implicitClassToMembersUsed, templateIdToPathFun,
+                                generatedIdsToMatches);
                     }
                 }
             }
         }
         // Then validate the expression itself
-        Match match = new Match();
+        Match match = new Match(index);
         if (rootClazz == null && !expression.hasTypeInfo()) {
             // No type info available or a namespace expression
             results.put(expression.toOriginalString(), match);
-            return;
+            return match;
         }
 
-        Iterator<Info> parts = TypeInfos.create(expression, index, templateIdToPathFun).iterator();
+        List<Info> parts = TypeInfos.create(expression, index, templateIdToPathFun);
+        Iterator<Info> iterator = parts.iterator();
+        Info root = iterator.next();
 
         if (rootClazz == null) {
-            // {foo.name} 
-            Info root = parts.next();
-            match.clazz = root.asTypeInfo().rawClass;
-            match.type = root.asTypeInfo().resolvedType;
-            if (root.asTypeInfo().hint != null) {
-                processHints(root.asTypeInfo().hint, match, index, expression);
+            if (root.isTypeInfo()) {
+                // E.g. |org.acme.Item|
+                match.setValues(root.asTypeInfo().rawClass, root.asTypeInfo().resolvedType);
+                if (root.hasHints()) {
+                    processHints(templateAnalysis, root.asTypeInfo().hints, match, index, expression, generatedIdsToMatches,
+                            incorrectExpressions);
+                }
+            } else {
+                if (root.hasHints()) {
+                    // Root is not a type info but a property with hint
+                    // E.g. 'it<loop#123>' and 'STATUS<when#123>'
+                    if (processHints(templateAnalysis, root.asHintInfo().hints, match, index, expression,
+                            generatedIdsToMatches, incorrectExpressions)) {
+                        // In some cases it's necessary to reset the iterator
+                        iterator = parts.iterator();
+                    }
+                } else {
+                    // No type info available 
+                    results.put(expression.toOriginalString(), match);
+                    return match;
+                }
             }
         } else {
             // The first part is skipped, e.g. for {inject:foo.name} the first part is the name of the bean
-            parts.next();
-            match.clazz = rootClazz;
-            match.type = Type.create(rootClazz.name(), org.jboss.jandex.Type.Kind.CLASS);
+            match.setValues(rootClazz, Type.create(rootClazz.name(), org.jboss.jandex.Type.Kind.CLASS));
         }
 
-        while (parts.hasNext()) {
-            // Now iterate over all parts of the expression and check each part against the current "match class"
-            Info info = parts.next();
-            if (match.clazz != null) {
-                // By default, we only consider properties
-                implicitClassToMethodUsed.putIfAbsent(match.clazz, false);
+        while (iterator.hasNext()) {
+            // Now iterate over all parts of the expression and check each part against the current match type
+            Info info = iterator.next();
+            if (!match.isEmpty()) {
+
+                // Arrays are handled specifically
+                // We use the built-in resolver at runtime because the extension methods cannot be used to cover all combinations of dimensions and component types 
+                if (match.isArray()) {
+                    if (info.isProperty()) {
+                        String name = info.asProperty().name;
+                        if (name.equals("length")) {
+                            // myArray.length
+                            match.setValues(null, PrimitiveType.INT);
+                            continue;
+                        } else {
+                            // myArray[0], myArray.1
+                            try {
+                                Integer.parseInt(name);
+                                match.setValues(null, match.type().asArrayType().component());
+                                continue;
+                            } catch (NumberFormatException e) {
+                                // not an integer index
+                            }
+                        }
+                    } else if (info.isVirtualMethod() && info.asVirtualMethod().name.equals("get")) {
+                        // array.get(84)
+                        List<Expression> params = info.asVirtualMethod().part.asVirtualMethod().getParameters();
+                        if (params.size() == 1) {
+                            Expression param = params.get(0);
+                            Object literalValue;
+                            try {
+                                literalValue = param.getLiteralValue().get();
+                            } catch (InterruptedException | ExecutionException e) {
+                                literalValue = null;
+                            }
+                            if (literalValue == null || literalValue instanceof Integer) {
+                                match.setValues(null, match.type().asArrayType().component());
+                                continue;
+                            }
+                        }
+                    }
+                }
+
                 AnnotationTarget member = null;
-                // First try to find java members
-                if (info.isVirtualMethod()) {
-                    member = findMethod(info.part.asVirtualMethod(), match.clazz, expression, index, templateIdToPathFun,
-                            results);
-                    if (member != null) {
-                        implicitClassToMethodUsed.put(match.clazz, true);
+
+                if (!match.isPrimitive()) {
+                    Set<String> membersUsed = implicitClassToMembersUsed.get(match.type().name());
+                    if (membersUsed == null) {
+                        membersUsed = new HashSet<>();
+                        implicitClassToMembersUsed.put(match.type().name(), membersUsed);
+                    }
+                    // First try to find a java member
+                    if (match.clazz() != null) {
+                        if (info.isVirtualMethod()) {
+                            member = findMethod(info.part.asVirtualMethod(), match.clazz(), expression, index,
+                                    templateIdToPathFun,
+                                    results);
+                            if (member != null) {
+                                membersUsed.add(member.asMethod().name());
+                            }
+                        } else if (info.isProperty()) {
+                            member = findProperty(info.asProperty().name, match.clazz(), index);
+                            if (member != null) {
+                                membersUsed
+                                        .add(member.kind() == Kind.FIELD ? member.asField().name() : member.asMethod().name());
+                            }
+                        }
                     }
-                } else if (info.isProperty()) {
-                    member = findProperty(info.asProperty().name, match.clazz, index);
                 }
-                // Java member not found - try extension methods
+
                 if (member == null) {
-                    member = findTemplateExtensionMethod(info, match.clazz, templateExtensionMethods, expression, index,
+                    // Then try to find an etension method
+                    member = findTemplateExtensionMethod(info, match.type(), templateExtensionMethods, expression,
+                            index,
                             templateIdToPathFun, results);
                 }
 
                 if (member == null) {
                     // Test whether the validation should be skipped
-                    Check check = new Check(info.isProperty() ? info.asProperty().name : info.asVirtualMethod().name,
-                            match.clazz, info.part.isVirtualMethod() ? info.part.asVirtualMethod().getParameters().size() : -1);
+                    TypeCheck check = new TypeCheck(
+                            info.isProperty() ? info.asProperty().name : info.asVirtualMethod().name,
+                            match.clazz(),
+                            info.part.isVirtualMethod() ? info.part.asVirtualMethod().getParameters().size() : -1);
                     if (isExcluded(check, excludes)) {
                         LOGGER.debugf(
-                                "Expression part [%s] excluded from validation of [%s] against class [%s]",
+                                "Expression part [%s] excluded from validation of [%s] against type [%s]",
                                 info.value,
-                                expression.toOriginalString(), match.clazz);
-                        match.clear();
+                                expression.toOriginalString(), match.type());
+                        match.clearValues();
                         break;
                     }
                 }
@@ -516,24 +703,20 @@ static void validateNestedExpressions(ClassInfo rootClazz, Map<String, Match> re
                 if (member == null) {
                     // No member found - incorrect expression
                     incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
-                            info.value, match.clazz.toString(), expression.getOrigin().getLine(),
-                            expression.getOrigin().getTemplateGeneratedId()));
-                    match.clear();
+                            info.value, match.type().toString(), expression.getOrigin()));
+                    match.clearValues();
                     break;
                 } else {
-                    match.type = resolveType(member, match, index);
-                    if (match.type.kind() == org.jboss.jandex.Type.Kind.PRIMITIVE) {
-                        break;
+                    Type type = resolveType(member, match, index);
+                    ClassInfo clazz = null;
+                    if (type.kind() == Type.Kind.CLASS || type.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+                        clazz = index.getClassByName(type.name());
                     }
-                    if (match.type.kind() == Type.Kind.CLASS || match.type.kind() == Type.Kind.PARAMETERIZED_TYPE) {
-                        match.clazz = index.getClassByName(match.type.name());
-                    }
-                    if (info.isProperty()) {
-                        String hint = info.asProperty().hint;
-                        if (hint != null) {
-                            // For example a loop section needs to validate the type of an element
-                            processHints(hint, match, index, expression);
-                        }
+                    match.setValues(clazz, type);
+                    if (info.hasHints()) {
+                        // For example a loop section needs to validate the type of an element
+                        processHints(templateAnalysis, info.asHintInfo().hints, match, index, expression, generatedIdsToMatches,
+                                incorrectExpressions);
                     }
                 }
             } else {
@@ -541,11 +724,12 @@ static void validateNestedExpressions(ClassInfo rootClazz, Map<String, Match> re
                         "No match class available - skip further validation for [%s] in expression [%s] in template [%s] on line %s",
                         info.part, expression.toOriginalString(), expression.getOrigin().getTemplateId(),
                         expression.getOrigin().getLine());
-                match.clear();
+                match.clearValues();
                 break;
             }
         }
         results.put(expression.toOriginalString(), match);
+        return match;
     }
 
     @BuildStep
@@ -567,7 +751,8 @@ void collectTemplateExtensionMethods(BeanArchiveIndexBuildItem beanArchiveIndex,
         // Method-level annotations
         for (Entry<MethodInfo, AnnotationInstance> entry : methods.entrySet()) {
             MethodInfo method = entry.getKey();
-            ExtensionMethodGenerator.validate(method);
+            AnnotationValue namespaceValue = entry.getValue().value(ExtensionMethodGenerator.NAMESPACE);
+            ExtensionMethodGenerator.validate(method, namespaceValue != null ? namespaceValue.asString() : null);
             produceExtensionMethod(index, extensionMethods, method, entry.getValue());
             LOGGER.debugf("Found template extension method %s declared on %s", method,
                     method.declaringClass().name());
@@ -576,11 +761,17 @@ void collectTemplateExtensionMethods(BeanArchiveIndexBuildItem beanArchiveIndex,
         // Class-level annotations
         for (Entry<ClassInfo, AnnotationInstance> entry : classes.entrySet()) {
             ClassInfo clazz = entry.getKey();
+            AnnotationValue namespaceValue = entry.getValue().value(ExtensionMethodGenerator.NAMESPACE);
+            String namespace = namespaceValue != null ? namespaceValue.asString() : null;
             for (MethodInfo method : clazz.methods()) {
                 if (!Modifier.isStatic(method.flags()) || method.returnType().kind() == org.jboss.jandex.Type.Kind.VOID
-                        || method.parameters().isEmpty() || Modifier.isPrivate(method.flags())
+                        || Modifier.isPrivate(method.flags())
                         || ValueResolverGenerator.isSynthetic(method.flags())) {
-                    // Filter out non-static, synthetic, private and void methods with no params
+                    // Filter out non-static, synthetic, private and void methods
+                    continue;
+                }
+                if ((namespace == null || namespace.isEmpty()) && method.parameters().isEmpty()) {
+                    // Filter out methods with no params for non-namespace extensions
                     continue;
                 }
                 if (methods.containsKey(method)) {
@@ -598,7 +789,7 @@ private void produceExtensionMethod(IndexView index, BuildProducer<TemplateExten
             MethodInfo method, AnnotationInstance extensionAnnotation) {
         // Analyze matchName and priority so that it could be used during validation 
         String matchName = null;
-        AnnotationValue matchNameValue = extensionAnnotation.value(MATCH_NAME);
+        AnnotationValue matchNameValue = extensionAnnotation.value(ExtensionMethodGenerator.MATCH_NAME);
         if (matchNameValue != null) {
             matchName = matchNameValue.asString();
         }
@@ -606,69 +797,61 @@ private void produceExtensionMethod(IndexView index, BuildProducer<TemplateExten
             matchName = method.name();
         }
         int priority = TemplateExtension.DEFAULT_PRIORITY;
-        AnnotationValue priorityValue = extensionAnnotation.value(PRIORITY);
+        AnnotationValue priorityValue = extensionAnnotation.value(ExtensionMethodGenerator.PRIORITY);
         if (priorityValue != null) {
             priority = priorityValue.asInt();
         }
-        extensionMethods.produce(new TemplateExtensionMethodBuildItem(method, matchName,
-                index.getClassByName(method.parameters().get(0).name()), priority));
+        String namespace = "";
+        AnnotationValue namespaceValue = extensionAnnotation.value(ExtensionMethodGenerator.NAMESPACE);
+        if (namespaceValue != null) {
+            namespace = namespaceValue.asString();
+        }
+        String matchRegex = null;
+        AnnotationValue matchRegexValue = extensionAnnotation.value(ExtensionMethodGenerator.MATCH_REGEX);
+        if (matchRegexValue != null) {
+            matchRegex = matchRegexValue.asString();
+        }
+        extensionMethods.produce(new TemplateExtensionMethodBuildItem(method, matchName, matchRegex,
+                namespace.isEmpty() ? method.parameters().get(0) : null, priority, namespace));
     }
 
-    @BuildStep
-    void validateBeansInjectedInTemplates(TemplatesAnalysisBuildItem analysis, BeanArchiveIndexBuildItem beanArchiveIndex,
+    private void validateInjectExpression(TemplateAnalysis templateAnalysis, Expression expression, IndexView index,
             BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions,
-            List<TemplateExtensionMethodBuildItem> templateExtensionMethods,
-            List<TypeCheckExcludeBuildItem> excludes,
-            BeanRegistrationPhaseBuildItem registrationPhase,
-            // This producer is needed to ensure the correct ordering, ie. this build step must be executed before the ArC validation step
-            BuildProducer<BeanConfiguratorBuildItem> configurators,
-            BuildProducer<ImplicitValueResolverBuildItem> implicitClasses) {
-
-        IndexView index = beanArchiveIndex.getIndex();
-        Function<String, String> templateIdToPathFun = new Function<String, String>() {
-            @Override
-            public String apply(String id) {
-                return findTemplatePath(analysis, id);
-            }
-        };
-        Set<Expression> injectExpressions = collectNamespaceExpressions(analysis, EngineProducer.INJECT_NAMESPACE);
-
-        if (!injectExpressions.isEmpty()) {
-            // IMPLEMENTATION NOTE: 
-            // We do not support injection of synthetic beans with names 
-            // Dependency on the ValidationPhaseBuildItem would result in a cycle in the build chain
-            Map<String, BeanInfo> namedBeans = registrationPhase.getContext().beans().withName()
-                    .collect(toMap(BeanInfo::getName, Function.identity()));
-
-            // Map implicit class -> true if methods were used
-            Map<ClassInfo, Boolean> implicitClassToMethodUsed = new HashMap<>();
-
-            for (Expression expression : injectExpressions) {
-
-                String beanName = expression.getParts().get(0).getName();
-                BeanInfo bean = namedBeans.get(beanName);
-                if (bean != null) {
-                    if (expression.getParts().size() == 1) {
-                        // Only the bean needs to be validated
-                        continue;
-                    }
-                    validateNestedExpressions(bean.getImplClazz(), new HashMap<>(), templateExtensionMethods, excludes,
-                            incorrectExpressions, expression, index, implicitClassToMethodUsed, templateIdToPathFun);
+            List<TemplateExtensionMethodBuildItem> templateExtensionMethods, List<TypeCheckExcludeBuildItem> excludes,
+            Map<String, BeanInfo> namedBeans, Map<Integer, Match> generatedIdsToMatches,
+            Map<DotName, Set<String>> implicitClassToMembersUsed, Function<String, String> templateIdToPathFun) {
+        Expression.Part firstPart = expression.getParts().get(0);
+        if (firstPart.isVirtualMethod()) {
+            incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
+                    "The inject: namespace must be followed by a bean name",
+                    expression.getOrigin()));
+            return;
+        }
+        String beanName;
+        if (expression.hasNamespace()) {
+            beanName = firstPart.getName();
+        } else {
+            // inject:foo.labels<loop-element> => foo
+            String firstInfoPart = Expressions.splitTypeInfoParts(firstPart.getTypeInfo()).get(0);
+            beanName = firstInfoPart.substring(EngineProducer.INJECT_NAMESPACE.length() + 1,
+                    firstInfoPart.length());
+        }
 
-                } else {
-                    // User is injecting a non-existing bean
-                    incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
-                            beanName, null, expression.getOrigin().getLine(),
-                            expression.getOrigin().getTemplateGeneratedId()));
-                }
+        BeanInfo bean = namedBeans.get(beanName);
+        if (bean != null) {
+            if (expression.getParts().size() == 1) {
+                // Only the bean needs to be validated
+                return;
             }
+            generatedIdsToMatches.put(expression.getGeneratedId(),
+                    validateNestedExpressions(templateAnalysis, bean.getImplClazz(), new HashMap<>(),
+                            templateExtensionMethods, excludes, incorrectExpressions, expression, index,
+                            implicitClassToMembersUsed, templateIdToPathFun, generatedIdsToMatches));
 
-            for (Entry<ClassInfo, Boolean> implicit : implicitClassToMethodUsed.entrySet()) {
-                implicitClasses.produce(implicit.getValue()
-                        ? new ImplicitValueResolverBuildItem(implicit.getKey(),
-                                new TemplateDataBuilder().properties(false).build())
-                        : new ImplicitValueResolverBuildItem(implicit.getKey()));
-            }
+        } else {
+            // User is injecting a non-existing bean
+            incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
+                    beanName, null, expression.getOrigin()));
         }
     }
 
@@ -690,78 +873,136 @@ void generateValueResolvers(QuteConfig config, BuildProducer<GeneratedClassBuild
             List<ImplicitValueResolverBuildItem> implicitClasses,
             TemplatesAnalysisBuildItem templatesAnalysis,
             BuildProducer<GeneratedValueResolverBuildItem> generatedResolvers,
-            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            List<PanacheEntityClassesBuildItem> panacheEntityClasses) {
 
         IndexView index = beanArchiveIndex.getIndex();
         ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClasses, new Predicate<String>() {
             @Override
             public boolean test(String name) {
-                int idx = name.lastIndexOf(ExtensionMethodGenerator.SUFFIX);
+                int idx = name.lastIndexOf(ExtensionMethodGenerator.NAMESPACE_SUFFIX);
+                if (idx == -1) {
+                    idx = name.lastIndexOf(ExtensionMethodGenerator.SUFFIX);
+                }
                 if (idx == -1) {
                     idx = name.lastIndexOf(ValueResolverGenerator.SUFFIX);
                 }
-                String className = name.substring(0, idx).replace("/", ".");
+                String className = name.substring(0, idx);
                 if (className.contains(ValueResolverGenerator.NESTED_SEPARATOR)) {
                     className = className.replace(ValueResolverGenerator.NESTED_SEPARATOR, "$");
                 }
-                if (applicationArchivesBuildItem.getRootArchive().getIndex()
-                        .getClassByName(DotName.createSimple(className)) != null) {
-                    return true;
-                }
-                return false;
+                //if the class is (directly) in the TCCL (and not its parent) then it is an application class
+                QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader();
+                return !cl.getElementsWithResource(className + ".class", true).isEmpty();
             }
         });
 
-        Map<DotName, ClassInfo> nameToClass = new HashMap<>();
+        ValueResolverGenerator.Builder builder = ValueResolverGenerator.builder()
+                .setIndex(index).setClassOutput(classOutput);
+
+        if (!panacheEntityClasses.isEmpty()) {
+            Set<String> entityClasses = new HashSet<>();
+            for (PanacheEntityClassesBuildItem panaecheEntityClasses : panacheEntityClasses) {
+                entityClasses.addAll(panaecheEntityClasses.getEntityClasses());
+            }
+            builder.setForceGettersFunction(new Function<ClassInfo, Function<FieldInfo, String>>() {
+                @Override
+                public Function<FieldInfo, String> apply(ClassInfo clazz) {
+                    if (entityClasses.contains(clazz.name().toString())) {
+                        return GETTER_FUN;
+                    }
+                    return null;
+                }
+            });
+        }
+
         Set<DotName> controlled = new HashSet<>();
         Map<DotName, AnnotationInstance> uncontrolled = new HashMap<>();
         for (AnnotationInstance templateData : index.getAnnotations(ValueResolverGenerator.TEMPLATE_DATA)) {
-            processsTemplateData(index, templateData, templateData.target(), controlled, uncontrolled, nameToClass);
+            processsTemplateData(index, templateData, templateData.target(), controlled, uncontrolled, builder);
         }
         for (AnnotationInstance containerInstance : index.getAnnotations(ValueResolverGenerator.TEMPLATE_DATA_CONTAINER)) {
             for (AnnotationInstance templateData : containerInstance.value().asNestedArray()) {
-                processsTemplateData(index, templateData, containerInstance.target(), controlled, uncontrolled, nameToClass);
+                processsTemplateData(index, templateData, containerInstance.target(), controlled, uncontrolled, builder);
             }
         }
 
         for (ImplicitValueResolverBuildItem implicit : implicitClasses) {
-            if (controlled.contains(implicit.getClazz().name())) {
-                LOGGER.debugf("Implicit value resolver build item ignored: %s is annotated with @TemplateData");
+            DotName implicitClassName = implicit.getClazz().name();
+            if (controlled.contains(implicitClassName)) {
+                LOGGER.debugf("Implicit value resolver for %s ignored: class is annotated with @TemplateData",
+                        implicitClassName);
                 continue;
             }
-            AnnotationInstance templateData = uncontrolled.get(implicit.getClazz().name());
-            if (templateData != null) {
-                if (!templateData.equals(implicit.getTemplateData())) {
-                    throw new IllegalStateException("Multiple implicit value resolver build items produced for "
-                            + implicit.getClazz() + " and the synthetic template data is not equal");
-                }
+            if (uncontrolled.containsKey(implicitClassName)) {
+                LOGGER.debugf("Implicit value resolver for %d ignored: %s declared on %s", uncontrolled.get(implicitClassName),
+                        uncontrolled.get(implicitClassName).target());
                 continue;
             }
-            uncontrolled.put(implicit.getClazz().name(), implicit.getTemplateData());
-            nameToClass.put(implicit.getClazz().name(), implicit.getClazz());
+            builder.addClass(implicit.getClazz(), implicit.getTemplateData());
         }
 
-        ValueResolverGenerator generator = ValueResolverGenerator.builder().setIndex(index).setClassOutput(classOutput)
-                .setUncontrolled(uncontrolled)
-                .build();
-
-        // @TemplateData
-        for (DotName name : controlled) {
-            generator.generate(nameToClass.get(name));
-        }
-        // Uncontrolled classes
-        for (DotName name : uncontrolled.keySet()) {
-            generator.generate(nameToClass.get(name));
-        }
+        ValueResolverGenerator generator = builder.build();
+        generator.generate();
 
         Set<String> generatedTypes = new HashSet<>();
         generatedTypes.addAll(generator.getGeneratedTypes());
 
-        ExtensionMethodGenerator extensionMethodGenerator = new ExtensionMethodGenerator(classOutput);
+        ExtensionMethodGenerator extensionMethodGenerator = new ExtensionMethodGenerator(index, classOutput);
+        Map<DotName, Map<String, List<TemplateExtensionMethodBuildItem>>> classToNamespaceExtensions = new HashMap<>();
+        Map<String, DotName> namespaceToClass = new HashMap<>();
+
         for (TemplateExtensionMethodBuildItem templateExtension : templateExtensionMethods) {
-            extensionMethodGenerator.generate(templateExtension.getMethod(), templateExtension.getMatchName(),
-                    templateExtension.getPriority());
+            if (templateExtension.hasNamespace()) {
+                // Group extension methods declared on the same class by namespace
+                DotName declaringClassName = templateExtension.getMethod().declaringClass().name();
+                DotName namespaceClassName = namespaceToClass.get(templateExtension.getNamespace());
+                if (namespaceClassName == null) {
+                    namespaceToClass.put(templateExtension.getNamespace(), namespaceClassName);
+                } else if (!namespaceClassName.equals(declaringClassName)) {
+                    throw new IllegalStateException("Template extension methods that share the namespace "
+                            + templateExtension.getNamespace() + " must be declared on the same class; but declared on "
+                            + namespaceClassName + " and " + declaringClassName);
+                }
+                Map<String, List<TemplateExtensionMethodBuildItem>> namespaceToExtensions = classToNamespaceExtensions
+                        .get(declaringClassName);
+                if (namespaceToExtensions == null) {
+                    namespaceToExtensions = new HashMap<>();
+                    classToNamespaceExtensions.put(declaringClassName, namespaceToExtensions);
+                }
+                List<TemplateExtensionMethodBuildItem> namespaceMethods = namespaceToExtensions
+                        .get(templateExtension.getNamespace());
+                if (namespaceMethods == null) {
+                    namespaceMethods = new ArrayList<>();
+                    namespaceToExtensions.put(templateExtension.getNamespace(), namespaceMethods);
+                }
+                namespaceMethods.add(templateExtension);
+            } else {
+                // Generate ValueResolver per extension method
+                extensionMethodGenerator.generate(templateExtension.getMethod(), templateExtension.getMatchName(),
+                        templateExtension.getMatchRegex(), templateExtension.getPriority());
+            }
         }
+
+        // Generate a namespace resolver for extension methods declared on the same class
+        for (Entry<DotName, Map<String, List<TemplateExtensionMethodBuildItem>>> entry1 : classToNamespaceExtensions
+                .entrySet()) {
+            Map<String, List<TemplateExtensionMethodBuildItem>> namespaceToMethods = entry1.getValue();
+            for (Entry<String, List<TemplateExtensionMethodBuildItem>> entry2 : namespaceToMethods.entrySet()) {
+                List<TemplateExtensionMethodBuildItem> methods = entry2.getValue();
+                // Methods with higher priority take precedence
+                methods.sort(Comparator.comparingInt(TemplateExtensionMethodBuildItem::getPriority).reversed());
+                try (NamespaceResolverCreator namespaceResolverCreator = extensionMethodGenerator
+                        .createNamespaceResolver(methods.get(0).getMethod().declaringClass(), entry2.getKey())) {
+                    try (ResolveCreator resolveCreator = namespaceResolverCreator.implementResolve()) {
+                        for (TemplateExtensionMethodBuildItem method : methods) {
+                            resolveCreator.addMethod(method.getMethod(), method.getMatchName(), method.getMatchRegex());
+                        }
+                    }
+                }
+            }
+        }
+
         generatedTypes.addAll(extensionMethodGenerator.getGeneratedTypes());
 
         LOGGER.debugf("Generated types: %s", generatedTypes);
@@ -805,14 +1046,16 @@ void validateTemplateInjectionPoints(QuteConfig config, List<TemplatePathBuildIt
             }
         }
 
-        for (InjectionPointInfo injectionPoint : validationPhase.getContext().get(BuildExtension.Key.INJECTION_POINTS)) {
-
-            if (injectionPoint.getRequiredType().name().equals(TEMPLATE)) {
-
-                AnnotationInstance resourcePath = injectionPoint.getRequiredQualifier(RESOURCE_PATH);
+        for (InjectionPointInfo injectionPoint : validationPhase.getContext().getInjectionPoints()) {
+            if (injectionPoint.getRequiredType().name().equals(Names.TEMPLATE)) {
+                AnnotationInstance location = injectionPoint.getRequiredQualifier(Names.LOCATION);
+                if (location == null) {
+                    // Try the deprecated @ResourcePath
+                    location = injectionPoint.getRequiredQualifier(Names.RESOURCE_PATH);
+                }
                 String name;
-                if (resourcePath != null) {
-                    name = resourcePath.value().asString();
+                if (location != null) {
+                    name = location.value().asString();
                 } else if (injectionPoint.hasDefaultedQualifier()) {
                     name = getName(injectionPoint);
                 } else {
@@ -820,10 +1063,11 @@ void validateTemplateInjectionPoints(QuteConfig config, List<TemplatePathBuildIt
                 }
                 if (name != null) {
                     // For "@Inject Template items" we try to match "items"
-                    // For "@ResourcePath("github/pulls") Template pulls" we try to match "github/pulls"
-                    if (filePaths.stream().noneMatch(path -> path.endsWith(name))) {
+                    // For "@Location("github/pulls") Template pulls" we try to match "github/pulls"
+                    // For "@Location("foo/bar/baz.txt") Template baz" we try to match "foo/bar/baz.txt"
+                    if (!filePaths.contains(name)) {
                         validationErrors.produce(new ValidationErrorBuildItem(
-                                new IllegalStateException("No template found for " + injectionPoint.getTargetInfo())));
+                                new TemplateException("No template found for " + injectionPoint.getTargetInfo())));
                     }
                 }
             }
@@ -834,6 +1078,7 @@ void validateTemplateInjectionPoints(QuteConfig config, List<TemplatePathBuildIt
     TemplateVariantsBuildItem collectTemplateVariants(List<TemplatePathBuildItem> templatePaths) throws IOException {
         Set<String> allPaths = templatePaths.stream().map(TemplatePathBuildItem::getPath).collect(Collectors.toSet());
         // item -> [item.html, item.txt]
+        // ItemResource/item -> -> [ItemResource/item.html, ItemResource/item.xml]
         Map<String, List<String>> baseToVariants = new HashMap<>();
         for (String path : allPaths) {
             int idx = path.lastIndexOf('.');
@@ -852,32 +1097,58 @@ TemplateVariantsBuildItem collectTemplateVariants(List<TemplatePathBuildItem> te
     }
 
     @BuildStep
-    void excludeTypeChecks(BuildProducer<TypeCheckExcludeBuildItem> excludes) {
+    void excludeTypeChecks(QuteConfig config, BuildProducer<TypeCheckExcludeBuildItem> excludes) {
         // Exclude all checks that involve built-in value resolvers
-        // TODO we need a better way to exclude value resolvers that are not template extension methods
-        excludes.produce(new TypeCheckExcludeBuildItem(new Predicate<Check>() {
+        List<String> skipOperators = Arrays.asList("?:", "or", ":", "?", "ifTruthy", "&&", "||");
+        excludes.produce(new TypeCheckExcludeBuildItem(new Predicate<TypeCheck>() {
             @Override
-            public boolean test(Check check) {
-                // RawString
-                if (check.isProperty() && check.nameIn("raw", "safe")) {
+            public boolean test(TypeCheck check) {
+                // RawString and orEmpty - these properties can be used on any object
+                if (check.isProperty()
+                        && ("raw".equals(check.name) || "safe".equals(check.name) || "orEmpty".equals(check.name))) {
                     return true;
                 }
-                // Elvis and ternary operators
-                if (check.numberOfParameters == 1 && check.nameIn("?:", "or", ":", "?")) {
+                // Elvis, ternary and logical operators
+                if (check.numberOfParameters == 1 && skipOperators.contains(check.name)) {
                     return true;
                 }
                 // Collection.contains()
-                if (check.numberOfParameters == 1 && check.classNameEquals(COLLECTION) && check.name.equals("contains")) {
+                if (check.numberOfParameters == 1 && check.classNameEquals(Names.COLLECTION) && check.name.equals("contains")) {
                     return true;
                 }
                 return false;
             }
         }));
+
+        if (config.typeCheckExcludes.isPresent()) {
+            for (String exclude : config.typeCheckExcludes.get()) {
+                //  
+                String[] parts = exclude.split("\\.");
+                if (parts.length < 2) {
+                    // An exclude rule must have at least two parts separated by dot
+                    continue;
+                }
+                String className = Arrays.stream(parts).limit(parts.length - 1).collect(Collectors.joining("."));
+                String propertyName = parts[parts.length - 1];
+                excludes.produce(new TypeCheckExcludeBuildItem(new Predicate<TypeCheck>() {
+                    @Override
+                    public boolean test(TypeCheck check) {
+                        if (!className.equals("*") && !check.clazz.name().toString().equals(className)) {
+                            return false;
+                        }
+                        if (!propertyName.equals("*") && !check.name.equals(propertyName)) {
+                            return false;
+                        }
+                        return true;
+                    }
+                }));
+            }
+        }
     }
 
     @BuildStep
     @Record(value = STATIC_INIT)
-    void initialize(QuteConfig config, BuildProducer<SyntheticBeanBuildItem> syntheticBeans, QuteRecorder recorder,
+    void initialize(BuildProducer<SyntheticBeanBuildItem> syntheticBeans, QuteRecorder recorder,
             List<GeneratedValueResolverBuildItem> generatedValueResolvers, List<TemplatePathBuildItem> templatePaths,
             Optional<TemplateVariantsBuildItem> templateVariants) {
 
@@ -900,11 +1171,101 @@ void initialize(QuteConfig config, BuildProducer<SyntheticBeanBuildItem> synthet
         }
 
         syntheticBeans.produce(SyntheticBeanBuildItem.configure(QuteContext.class)
-                .supplier(recorder.createContext(config, generatedValueResolvers.stream()
+                .supplier(recorder.createContext(generatedValueResolvers.stream()
                         .map(GeneratedValueResolverBuildItem::getClassName).collect(Collectors.toList()), templates,
                         tags, variants))
                 .done());
-        ;
+    }
+
+    @BuildStep
+    @Record(value = STATIC_INIT, optional = true)
+    DevConsoleRouteBuildItem invokeEndpoint(QuteDevConsoleRecorder recorder) {
+        recorder.setupRenderer();
+        return new DevConsoleRouteBuildItem("preview", "POST", new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext context) {
+                context.request().setExpectMultipart(true);
+                context.request().endHandler(new Handler<Void>() {
+                    @Override
+                    public void handle(Void ignore) {
+                        MultiMap form = context.request().formAttributes();
+                        String templatePath = form.get("template-path");
+                        String testJsonData = form.get("template-data");
+                        String contentType = null;
+                        String fileName = templatePath;
+                        int slashIdx = fileName.lastIndexOf('/');
+                        if (slashIdx != -1) {
+                            fileName = fileName.substring(slashIdx, fileName.length());
+                        }
+                        int dotIdx = fileName.lastIndexOf('.');
+                        if (dotIdx != -1) {
+                            String suffix = fileName.substring(dotIdx + 1, fileName.length());
+                            if (suffix.equalsIgnoreCase("json")) {
+                                contentType = Variant.APPLICATION_JSON;
+                            } else {
+                                contentType = URLConnection.getFileNameMap().getContentTypeFor(fileName);
+                            }
+                        }
+                        try {
+                            BiFunction<String, Object, String> renderer = DevConsoleManager
+                                    .getGlobal(QuteDevConsoleRecorder.RENDER_HANDLER);
+                            Object testData = Json.decodeValue(testJsonData);
+                            testData = translate(testData); //translate it to JDK types
+                            context.response().setStatusCode(200).putHeader(CONTENT_TYPE, contentType)
+                                    .end(renderer.apply(templatePath, testData));
+                        } catch (DecodeException e) {
+                            context.response().setStatusCode(500).putHeader(CONTENT_TYPE, "text/plain; charset=UTF-8")
+                                    .end("Failed to parse JSON: " + e.getMessage());
+                        } catch (Throwable e) {
+                            context.fail(e);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    @BuildStep
+    QualifierRegistrarBuildItem turnLocationIntoQualifier() {
+        return new QualifierRegistrarBuildItem(new QualifierRegistrar() {
+
+            @Override
+            public Map<DotName, Set<String>> getAdditionalQualifiers() {
+                return Collections.singletonMap(Names.LOCATION, Collections.singleton("value"));
+            }
+        });
+    }
+
+    /**
+     * translates Json types to JDK types
+     *
+     * @param testData
+     * @return
+     */
+    private Object translate(Object testData) {
+        if (testData instanceof JsonArray) {
+            return translate((JsonArray) testData);
+        } else if (testData instanceof JsonObject) {
+            return translate((JsonObject) testData);
+        }
+        return testData;
+    }
+
+    private Object translate(JsonArray testData) {
+        List<Object> ret = new ArrayList<>();
+        for (Object i : testData.getList()) {
+            ret.add(translate(i));
+        }
+        return ret;
+    }
+
+    private Object translate(JsonObject testData) {
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> data = testData.getMap();
+        for (String i : testData.fieldNames()) {
+            map.put(i, translate(data.get(i)));
+        }
+        return map;
     }
 
     private static Type resolveType(AnnotationTarget member, Match match, IndexView index) {
@@ -941,53 +1302,103 @@ private static Type resolveType(AnnotationTarget member, Match match, IndexView
         return matchType;
     }
 
-    static void processHints(String helperHint, Match match, IndexView index, Expression expression) {
-        if (LoopSectionHelper.Factory.HINT.equals(helperHint)) {
-            // Iterable<Item>, Stream<Item> => Item
-            // Map<String,Long> => Entry<String,Long>
-            processLoopHint(match, index, expression);
+    /**
+     * @param templateAnalysis
+     * @param helperHints
+     * @param match
+     * @param index
+     * @param expression
+     * @param generatedIdsToMatches
+     * @param incorrectExpressions
+     * @return {@code true} if it is necessary to reset the type info part iterator
+     */
+    static boolean processHints(TemplateAnalysis templateAnalysis, List<String> helperHints, Match match, IndexView index,
+            Expression expression, Map<Integer, Match> generatedIdsToMatches,
+            BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions) {
+        if (helperHints == null || helperHints.isEmpty()) {
+            return false;
         }
+        for (String helperHint : helperHints) {
+            if (helperHint.equals(LoopSectionHelper.Factory.HINT_ELEMENT)) {
+                // Iterable<Item>, Stream<Item> => Item
+                // Map<String,Long> => Entry<String,Long>
+                processLoopElementHint(match, index, expression, incorrectExpressions);
+            } else if (helperHint.startsWith(LoopSectionHelper.Factory.HINT_PREFIX)) {
+                Expression valueExpr = findExpression(helperHint, LoopSectionHelper.Factory.HINT_PREFIX, templateAnalysis);
+                if (valueExpr != null) {
+                    Match valueExprMatch = generatedIdsToMatches.get(valueExpr.getGeneratedId());
+                    if (valueExprMatch != null) {
+                        match.setValues(valueExprMatch.clazz, valueExprMatch.type);
+                    }
+                }
+            } else if (helperHint.startsWith(WhenSectionHelper.Factory.HINT_PREFIX)) {
+                // If a value expression resolves to an enum we attempt to use the enum type to validate the enum constant  
+                // This basically transforms the type info "ON<when:12345>" into something like "|org.acme.Status|.ON"
+                Expression valueExpr = findExpression(helperHint, WhenSectionHelper.Factory.HINT_PREFIX, templateAnalysis);
+                if (valueExpr != null) {
+                    Match valueExprMatch = generatedIdsToMatches.get(valueExpr.getGeneratedId());
+                    if (valueExprMatch != null && valueExprMatch.clazz.isEnum()) {
+                        match.setValues(valueExprMatch.clazz, valueExprMatch.type);
+                        return true;
+                    }
+                }
+            } else if (helperHint.startsWith(SetSectionHelper.Factory.HINT_PREFIX)) {
+                Expression valueExpr = findExpression(helperHint, SetSectionHelper.Factory.HINT_PREFIX, templateAnalysis);
+                if (valueExpr != null) {
+                    Match valueExprMatch = generatedIdsToMatches.get(valueExpr.getGeneratedId());
+                    if (valueExprMatch != null) {
+                        match.setValues(valueExprMatch.clazz, valueExprMatch.type);
+                    }
+                }
+            }
+        }
+        return false;
     }
 
-    static void processLoopHint(Match match, IndexView index, Expression expression) {
-        if (match.type.name().equals(DotNames.INTEGER)) {
+    private static Expression findExpression(String helperHint, String hintPrefix, TemplateAnalysis templateAnalysis) {
+        return templateAnalysis
+                .findExpression(Integer.parseInt(helperHint.substring(hintPrefix.length(), helperHint.length() - 1)));
+    }
+
+    static void processLoopElementHint(Match match, IndexView index, Expression expression,
+            BuildProducer<IncorrectExpressionBuildItem> incorrectExpressions) {
+        if (match.type().name().equals(DotNames.INTEGER)) {
             return;
         }
         Type matchType = null;
-        if (match.type.kind() == Type.Kind.ARRAY) {
-            matchType = match.type.asArrayType().component();
-        } else if (match.type.kind() == Type.Kind.CLASS || match.type.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+        if (match.isArray()) {
+            matchType = match.type().asArrayType().component();
+        } else if (match.isClass() || match.isParameterizedType()) {
             Set<Type> closure = Types.getTypeClosure(match.clazz, Types.buildResolvedMap(
                     match.getParameterizedTypeArguments(), match.getTypeParameters(), new HashMap<>(), index), index);
             Function<Type, Type> firstParamType = t -> t.asParameterizedType().arguments().get(0);
             // Iterable<Item> => Item
-            matchType = extractMatchType(closure, ITERABLE, firstParamType);
+            matchType = extractMatchType(closure, Names.ITERABLE, firstParamType);
             if (matchType == null) {
                 // Stream<Long> => Long
-                matchType = extractMatchType(closure, STREAM, firstParamType);
+                matchType = extractMatchType(closure, Names.STREAM, firstParamType);
             }
             if (matchType == null) {
                 // Entry<K,V> => Entry<String,Item>
-                matchType = extractMatchType(closure, MAP, t -> {
+                matchType = extractMatchType(closure, Names.MAP, t -> {
                     Type[] args = new Type[2];
                     args[0] = t.asParameterizedType().arguments().get(0);
                     args[1] = t.asParameterizedType().arguments().get(1);
-                    return ParameterizedType.create(MAP_ENTRY, args, null);
+                    return ParameterizedType.create(Names.MAP_ENTRY, args, null);
                 });
             }
             if (matchType == null) {
                 // Iterator<Item> => Item
-                matchType = extractMatchType(closure, ITERATOR, firstParamType);
+                matchType = extractMatchType(closure, Names.ITERATOR, firstParamType);
             }
         }
+
         if (matchType != null) {
-            match.type = matchType;
-            match.clazz = index.getClassByName(match.type.name());
+            match.setValues(index.getClassByName(matchType.name()), matchType);
         } else {
-            throw new IllegalStateException(String.format(
-                    "Unsupported iterable type found in [%s]\n\t- matching type: %s \n\t- found in template [%s] on line %s",
-                    expression.toOriginalString(),
-                    match.type, expression.getOrigin().getTemplateId(), expression.getOrigin().getLine()));
+            incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(),
+                    "Unsupported iterable type found: " + match.type, expression.getOrigin()));
+            match.clearValues();
         }
     }
 
@@ -998,8 +1409,13 @@ static Type extractMatchType(Set<Type> closure, DotName matchName, Function<Type
 
     static class Match {
 
-        ClassInfo clazz;
-        Type type;
+        private final IndexView index;
+        private ClassInfo clazz;
+        private Type type;
+
+        Match(IndexView index) {
+            this.index = index;
+        }
 
         List<Type> getParameterizedTypeArguments() {
             return type.kind() == org.jboss.jandex.Type.Kind.PARAMETERIZED_TYPE ? type.asParameterizedType().arguments()
@@ -1010,17 +1426,63 @@ List<TypeVariable> getTypeParameters() {
             return clazz.typeParameters();
         }
 
-        void clear() {
+        ClassInfo clazz() {
+            return clazz;
+        }
+
+        Type type() {
+            return type;
+        }
+
+        boolean isPrimitive() {
+            return type != null && type.kind() == org.jboss.jandex.Type.Kind.PRIMITIVE;
+        }
+
+        boolean isArray() {
+            return type != null && type.kind() == org.jboss.jandex.Type.Kind.ARRAY;
+        }
+
+        boolean isParameterizedType() {
+            return type != null && type.kind() == org.jboss.jandex.Type.Kind.PARAMETERIZED_TYPE;
+        }
+
+        boolean isClass() {
+            return type != null && type.kind() == org.jboss.jandex.Type.Kind.CLASS;
+        }
+
+        void setValues(ClassInfo clazz, Type type) {
+            this.clazz = clazz;
+            this.type = type;
+            autoExtractType();
+        }
+
+        void clearValues() {
             clazz = null;
             type = null;
         }
 
         boolean isEmpty() {
-            return clazz == null;
+            // For arrays the class is null 
+            return type == null;
+        }
+
+        void autoExtractType() {
+            boolean hasCompletionStage = ValueResolverGenerator.hasCompletionStageInTypeClosure(clazz, index);
+            boolean hasUni = hasCompletionStage ? false
+                    : ValueResolverGenerator.hasClassInTypeClosure(clazz, Names.UNI, index);
+            if (hasCompletionStage || hasUni) {
+                Set<Type> closure = Types.getTypeClosure(clazz, Types.buildResolvedMap(
+                        getParameterizedTypeArguments(), getTypeParameters(), new HashMap<>(), index), index);
+                Function<Type, Type> firstParamType = t -> t.asParameterizedType().arguments().get(0);
+                // CompletionStage<List<Item>> => List<Item>
+                // Uni<List<String>> => List<String>
+                this.type = extractMatchType(closure, hasCompletionStage ? Names.COMPLETION_STAGE : Names.UNI, firstParamType);
+                this.clazz = index.getClassByName(type.name());
+            }
         }
     }
 
-    private static AnnotationTarget findTemplateExtensionMethod(Info info, ClassInfo matchClass,
+    private static AnnotationTarget findTemplateExtensionMethod(Info info, Type matchType,
             List<TemplateExtensionMethodBuildItem> templateExtensionMethods, Expression expression, IndexView index,
             Function<String, String> templateIdToPathFun, Map<String, Match> results) {
         if (!info.isProperty() && !info.isVirtualMethod()) {
@@ -1028,7 +1490,11 @@ private static AnnotationTarget findTemplateExtensionMethod(Info info, ClassInfo
         }
         String name = info.isProperty() ? info.asProperty().name : info.asVirtualMethod().name;
         for (TemplateExtensionMethodBuildItem extensionMethod : templateExtensionMethods) {
-            if (!Types.isAssignableFrom(extensionMethod.getMatchClass().name(), matchClass.name(), index)) {
+            if (extensionMethod.hasNamespace()) {
+                // Skip namespace extensions
+                continue;
+            }
+            if (!Types.isAssignableFrom(extensionMethod.getMatchType(), matchType, index)) {
                 // If "Bar extends Foo" then Bar should be matched for the extension method "int get(Foo)"   
                 continue;
             }
@@ -1036,13 +1502,17 @@ private static AnnotationTarget findTemplateExtensionMethod(Info info, ClassInfo
                 // Name does not match
                 continue;
             }
+            List<Type> parameters = extensionMethod.getMethod().parameters();
+            int realParamSize = parameters.size() - (TemplateExtension.ANY.equals(extensionMethod.getMatchName()) ? 2 : 1);
+            if (realParamSize > 0 && !info.isVirtualMethod()) {
+                // If method accepts additional params the info must be a virtual method
+                continue;
+            }
             if (info.isVirtualMethod()) {
                 // For virtual method validate the number of params and attempt to validate the parameter types if available
                 VirtualMethodPart virtualMethod = info.part.asVirtualMethod();
                 boolean isVarArgs = ValueResolverGenerator.isVarArgs(extensionMethod.getMethod());
-                List<Type> parameters = extensionMethod.getMethod().parameters();
                 int lastParamIdx = parameters.size() - 1;
-                int realParamSize = parameters.size() - (TemplateExtension.ANY.equals(extensionMethod.getMatchName()) ? 2 : 1);
 
                 if (isVarArgs) {
                     // For varargs methods match the minimal number of params
@@ -1073,8 +1543,8 @@ private static AnnotationTarget findTemplateExtensionMethod(Info info, ClassInfo
                         } else {
                             paramType = parameters.get(idx);
                         }
-                        if (!Types.isAssignableFrom(result.type,
-                                paramType, index)) {
+                        if (!Types.isAssignableFrom(paramType,
+                                result.type, index)) {
                             matches = false;
                             break;
                         }
@@ -1101,7 +1571,7 @@ private static AnnotationTarget findTemplateExtensionMethod(Info info, ClassInfo
     /**
      * Attempts to find a property with the specified name, ie. a public non-static non-synthetic field with the given name or a
      * public non-static non-synthetic method with no params and the given name.
-     * 
+     *
      * @param name
      * @param clazz
      * @param index
@@ -1111,16 +1581,23 @@ private static AnnotationTarget findProperty(String name, ClassInfo clazz, Index
         while (clazz != null) {
             // Fields
             for (FieldInfo field : clazz.fields()) {
-                if (Modifier.isPublic(field.flags()) && !Modifier.isStatic(field.flags())
-                        && !ValueResolverGenerator.isSynthetic(field.flags()) && field.name().equals(name)) {
+                if (!Modifier.isPublic(field.flags()) || ValueResolverGenerator.isSynthetic(field.flags())) {
+                    // Skip non-public and synthetic fields 
+                    continue;
+                }
+                if (field.name().equals(name) && (field.isEnumConstant() || !Modifier.isStatic(field.flags()))) {
+                    // Name matches and it's either an enum constant or a non-static field
                     return field;
                 }
             }
             // Methods
             for (MethodInfo method : clazz.methods()) {
-                if (Modifier.isPublic(method.flags()) && !Modifier.isStatic(method.flags())
+                if (method.returnType().kind() != org.jboss.jandex.Type.Kind.VOID && Modifier.isPublic(method.flags())
+                        && !Modifier.isStatic(method.flags())
                         && !ValueResolverGenerator.isSynthetic(method.flags()) && (method.name().equals(name)
                                 || ValueResolverGenerator.getPropertyName(method.name()).equals(name))) {
+                    // Skip void, non-public, static and synthetic methods
+                    // Method name must match (exact or getter)
                     return method;
                 }
             }
@@ -1136,7 +1613,7 @@ private static AnnotationTarget findProperty(String name, ClassInfo clazz, Index
 
     /**
      * Find a non-static non-synthetic method with the given name, matching number of params and assignable parameter types.
-     * 
+     *
      * @param virtualMethod
      * @param clazz
      * @param expression
@@ -1183,8 +1660,8 @@ private static AnnotationTarget findMethod(VirtualMethodPart virtualMethod, Clas
                             } else {
                                 paramType = parameters.get(idx);
                             }
-                            if (!Types.isAssignableFrom(result.type,
-                                    paramType, index)) {
+                            if (!Types.isAssignableFrom(paramType,
+                                    result.type, index)) {
                                 matches = false;
                                 break;
                             }
@@ -1199,7 +1676,9 @@ private static AnnotationTarget findMethod(VirtualMethodPart virtualMethod, Clas
                         }
                         idx++;
                     }
-                    return matches ? method : null;
+                    if (matches) {
+                        return method;
+                    }
                 }
             }
             DotName superName = clazz.superName();
@@ -1213,18 +1692,18 @@ private static AnnotationTarget findMethod(VirtualMethodPart virtualMethod, Clas
     }
 
     private void processsTemplateData(IndexView index, AnnotationInstance templateData, AnnotationTarget annotationTarget,
-            Set<DotName> controlled, Map<DotName, AnnotationInstance> uncontrolled, Map<DotName, ClassInfo> nameToClass) {
+            Set<DotName> controlled, Map<DotName, AnnotationInstance> uncontrolled, ValueResolverGenerator.Builder builder) {
         AnnotationValue targetValue = templateData.value("target");
         if (targetValue == null || targetValue.asClass().name().equals(ValueResolverGenerator.TEMPLATE_DATA)) {
             ClassInfo annotationTargetClass = annotationTarget.asClass();
             controlled.add(annotationTargetClass.name());
-            nameToClass.put(annotationTargetClass.name(), annotationTargetClass);
+            builder.addClass(annotationTargetClass, templateData);
         } else {
             ClassInfo uncontrolledClass = index.getClassByName(targetValue.asClass().name());
             if (uncontrolledClass != null) {
                 uncontrolled.compute(uncontrolledClass.name(), (c, v) -> {
                     if (v == null) {
-                        nameToClass.put(uncontrolledClass.name(), uncontrolledClass);
+                        builder.addClass(uncontrolledClass, templateData);
                         return templateData;
                     }
                     if (!Objects.equals(v.value(ValueResolverGenerator.IGNORE),
@@ -1244,38 +1723,58 @@ private void processsTemplateData(IndexView index, AnnotationInstance templateDa
         }
     }
 
-    static Set<Expression> collectNamespaceExpressions(TemplatesAnalysisBuildItem analysis, String namespace) {
-        Set<Expression> injectExpressions = new HashSet<>();
+    static Map<TemplateAnalysis, Set<Expression>> collectNamespaceExpressions(TemplatesAnalysisBuildItem analysis,
+            String namespace) {
+        Map<TemplateAnalysis, Set<Expression>> namespaceExpressions = new HashMap<>();
         for (TemplateAnalysis template : analysis.getAnalysis()) {
-            injectExpressions.addAll(collectNamespaceExpressions(template, namespace));
+            Set<Expression> expressions = null;
+            for (Expression expr : collectNamespaceExpressions(template, namespace)) {
+                if (expressions == null) {
+                    expressions = new HashSet<>();
+                }
+                expressions.add(expr);
+            }
+            if (expressions != null) {
+                namespaceExpressions.put(template, expressions);
+            }
         }
-        return injectExpressions;
+        return namespaceExpressions;
     }
 
     static Set<Expression> collectNamespaceExpressions(TemplateAnalysis analysis, String namespace) {
-        Set<Expression> injectExpressions = new HashSet<>();
+        Set<Expression> namespaceExpressions = new HashSet<>();
         for (Expression expression : analysis.expressions) {
-            collectNamespaceExpressions(expression, injectExpressions, namespace);
+            collectNamespaceExpressions(expression, namespaceExpressions, namespace);
         }
-        return injectExpressions;
+        return namespaceExpressions;
     }
 
-    static void collectNamespaceExpressions(Expression expression, Set<Expression> injectExpressions, String namespace) {
+    static void collectNamespaceExpressions(Expression expression, Set<Expression> namespaceExpressions, String namespace) {
         if (expression.isLiteral()) {
             return;
         }
-        if (namespace.equals(expression.getNamespace())) {
-            injectExpressions.add(expression);
+        if (includeNamespaceExpression(expression, namespace)) {
+            // The expression itself has namespace
+            namespaceExpressions.add(expression);
         }
+        // Collect namespace expressions used as params of virtual methods
         for (Expression.Part part : expression.getParts()) {
             if (part.isVirtualMethod()) {
                 for (Expression param : part.asVirtualMethod().getParameters()) {
-                    collectNamespaceExpressions(param, injectExpressions, namespace);
+                    collectNamespaceExpressions(param, namespaceExpressions, namespace);
                 }
             }
         }
     }
 
+    private static boolean includeNamespaceExpression(Expression expression, String namespace) {
+        if (namespace.equals(expression.getNamespace())) {
+            return true;
+        }
+        String typeInfo = expression.getParts().get(0).getTypeInfo();
+        return typeInfo != null ? typeInfo.startsWith(namespace) : false;
+    }
+
     public static String getName(InjectionPointInfo injectionPoint) {
         if (injectionPoint.isField()) {
             return injectionPoint.getTarget().asField().name();
@@ -1326,7 +1825,7 @@ private void scan(Path root, Path directory, String basePath, BuildProducer<HotD
         }
     }
 
-    private static boolean isExcluded(Check check, List<TypeCheckExcludeBuildItem> excludes) {
+    private static boolean isExcluded(TypeCheck check, List<TypeCheckExcludeBuildItem> excludes) {
         for (TypeCheckExcludeBuildItem exclude : excludes) {
             if (exclude.getPredicate().test(check)) {
                 return true;
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplateExtensionMethodBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplateExtensionMethodBuildItem.java
index 697c2235d3ca1..ba215f97e930d 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplateExtensionMethodBuildItem.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplateExtensionMethodBuildItem.java
@@ -1,7 +1,10 @@
 package io.quarkus.qute.deployment;
 
+import java.util.regex.Pattern;
+
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
 
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.qute.TemplateExtension;
@@ -15,18 +18,21 @@ public final class TemplateExtensionMethodBuildItem extends MultiBuildItem {
 
     private final MethodInfo method;
     private final String matchName;
-    private final ClassInfo matchClass;
+    private final String matchRegex;
+    private final Pattern matchPattern;
+    private final Type matchType;
     private final int priority;
+    private final String namespace;
 
-    public TemplateExtensionMethodBuildItem(MethodInfo method, String matchName, ClassInfo matchClass) {
-        this(method, matchName, matchClass, TemplateExtension.DEFAULT_PRIORITY);
-    }
-
-    public TemplateExtensionMethodBuildItem(MethodInfo method, String matchName, ClassInfo matchClass, int priority) {
+    public TemplateExtensionMethodBuildItem(MethodInfo method, String matchName, String matchRegex, Type matchType,
+            int priority, String namespace) {
         this.method = method;
         this.matchName = matchName;
-        this.matchClass = matchClass;
+        this.matchRegex = matchRegex;
+        this.matchType = matchType;
         this.priority = priority;
+        this.namespace = namespace;
+        this.matchPattern = (matchRegex == null || matchRegex.isEmpty()) ? null : Pattern.compile(matchRegex);
     }
 
     public MethodInfo getMethod() {
@@ -37,20 +43,35 @@ public String getMatchName() {
         return matchName;
     }
 
-    public ClassInfo getMatchClass() {
-        return matchClass;
+    public String getMatchRegex() {
+        return matchRegex;
+    }
+
+    public Type getMatchType() {
+        return matchType;
     }
 
     public int getPriority() {
         return priority;
     }
 
+    public String getNamespace() {
+        return namespace;
+    }
+
     boolean matchesClass(ClassInfo clazz) {
-        return matchClass.name().equals(clazz.name());
+        return matchType.name().equals(clazz.name());
     }
 
     boolean matchesName(String name) {
+        if (matchPattern != null) {
+            return matchPattern.matcher(name).matches();
+        }
         return TemplateExtension.ANY.equals(matchName) ? true : matchName.equals(name);
     }
 
+    boolean hasNamespace() {
+        return namespace != null && !namespace.isEmpty();
+    }
+
 }
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplatesAnalysisBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplatesAnalysisBuildItem.java
index 364100469ad5e..c844c5ec1f91b 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplatesAnalysisBuildItem.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TemplatesAnalysisBuildItem.java
@@ -1,7 +1,7 @@
 package io.quarkus.qute.deployment;
 
 import java.util.List;
-import java.util.Set;
+import java.util.Objects;
 
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.qute.Expression;
@@ -26,16 +26,45 @@ static class TemplateAnalysis {
         // Path or other user-defined id; may be null
         public final String id;
         public final String generatedId;
-        public final Set<Expression> expressions;
+        public final List<Expression> expressions;
         public final String path;
 
-        public TemplateAnalysis(String id, String generatedId, Set<Expression> expressions, String path) {
+        public TemplateAnalysis(String id, String generatedId, List<Expression> expressions, String path) {
             this.id = id;
             this.generatedId = generatedId;
             this.expressions = expressions;
             this.path = path;
         }
 
+        Expression findExpression(int id) {
+            for (Expression expression : expressions) {
+                if (expression.getGeneratedId() == id) {
+                    return expression;
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((generatedId == null) ? 0 : generatedId.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            TemplateAnalysis other = (TemplateAnalysis) obj;
+            return Objects.equals(generatedId, other.generatedId);
+        }
+
     }
 
 }
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeCheckExcludeBuildItem.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeCheckExcludeBuildItem.java
index efca6374b42a8..9665bc898be9c 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeCheckExcludeBuildItem.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeCheckExcludeBuildItem.java
@@ -1,5 +1,6 @@
 package io.quarkus.qute.deployment;
 
+import java.util.Objects;
 import java.util.function.Predicate;
 
 import org.jboss.jandex.ClassInfo;
@@ -8,21 +9,29 @@
 import io.quarkus.builder.item.MultiBuildItem;
 
 /**
- * Makes it possible to intentionally ignore some classes when performing type-safe checking.
+ * Makes it possible to intentionally ignore some parts of an expression when performing type-safe validation.
+ * 
+ * @see TypeCheck
  */
 public final class TypeCheckExcludeBuildItem extends MultiBuildItem {
 
-    private final Predicate<Check> predicate;
+    private final Predicate<TypeCheck> predicate;
 
-    public TypeCheckExcludeBuildItem(Predicate<Check> predicate) {
-        this.predicate = predicate;
+    public TypeCheckExcludeBuildItem(Predicate<TypeCheck> predicate) {
+        this.predicate = Objects.requireNonNull(predicate);
     }
 
-    public Predicate<Check> getPredicate() {
+    public Predicate<TypeCheck> getPredicate() {
         return predicate;
     }
 
-    public static class Check {
+    /**
+     * Represents a type check of a part of an expression.
+     * <p>
+     * For example, the expression {@code item.name} has two parts, {@code item} and {@code name}, and for each part a new
+     * instance is created and tested for exclusion.
+     */
+    public static class TypeCheck {
 
         /**
          * The name of a property/method, e.g. {@code foo} and {@code ping} for expression {@code foo.ping(bar)}.
@@ -39,7 +48,7 @@ public static class Check {
          */
         public final int numberOfParameters;
 
-        public Check(String name, ClassInfo clazz, int parameters) {
+        public TypeCheck(String name, ClassInfo clazz, int parameters) {
             this.name = name;
             this.clazz = clazz;
             this.numberOfParameters = parameters;
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeInfos.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeInfos.java
index 32312f62ace4c..18cd138865a07 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeInfos.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/TypeInfos.java
@@ -4,11 +4,15 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import org.jboss.jandex.ArrayType;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.PrimitiveType;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.Type.Kind;
 
@@ -19,6 +23,8 @@
 
 final class TypeInfos {
 
+    private static final String ARRAY_DIM = "[]";
+
     static List<Info> create(Expression expression, IndexView index, Function<String, String> templateIdToPathFun) {
         if (expression.isLiteral()) {
             Expression.Part literalPart = expression.getParts().get(0);
@@ -53,30 +59,76 @@ static Info create(String typeInfo, Expression.Part part, IndexView index, Funct
             if (classStr.equals(Expressions.TYPECHECK_NAMESPACE_PLACEHOLDER)) {
                 return new Info(typeInfo, part);
             } else {
-                DotName rawClassName = rawClassName(classStr);
-                ClassInfo rawClass = index.getClassByName(rawClassName);
-                if (rawClass == null) {
-                    throw new TemplateException(
-                            "Class [" + rawClassName + "] used in the parameter declaration in template ["
-                                    + templateIdToPathFun.apply(expressionOrigin.getTemplateGeneratedId()) + "] on line "
-                                    + expressionOrigin.getLine()
-                                    + " was not found in the application index. Make sure it is spelled correctly.");
+                // TODO make the parsing logic more robust 
+                ClassInfo rawClass;
+                Type resolvedType;
+                int idx = classStr.indexOf(ARRAY_DIM);
+                if (idx > 0) {
+                    // int[], java.lang.String[][], etc.
+                    String componentTypeStr = classStr.substring(0, idx);
+                    Type componentType = decodePrimitive(componentTypeStr);
+                    if (componentType == null) {
+                        componentType = resolveType(componentTypeStr);
+                    }
+                    String[] dimensions = classStr.substring(idx, classStr.length()).split("\\]");
+                    rawClass = null;
+                    resolvedType = ArrayType.create(componentType, dimensions.length);
+                } else {
+                    rawClass = getClassInfo(classStr, index, templateIdToPathFun, expressionOrigin);
+                    resolvedType = resolveType(classStr);
                 }
-                Type resolvedType = resolveType(classStr);
                 return new TypeInfo(typeInfo, part, helperHint(typeInfo.substring(endIdx, typeInfo.length())), resolvedType,
                         rawClass);
             }
-        } else if (part.isVirtualMethod()) {
-            return new VirtualMethodInfo(typeInfo, part.asVirtualMethod());
         } else {
             String hint = helperHint(typeInfo);
             if (hint != null) {
                 typeInfo = typeInfo.substring(0, typeInfo.indexOf(LEFT_ANGLE));
             }
+            if (part.isVirtualMethod() || Expressions.isVirtualMethod(typeInfo)) {
+                return new VirtualMethodInfo(typeInfo, part.asVirtualMethod(), hint);
+            }
             return new PropertyInfo(typeInfo, part, hint);
         }
     }
 
+    private static ClassInfo getClassInfo(String val, IndexView index, Function<String, String> templateIdToPathFun,
+            Origin expressionOrigin) {
+        DotName rawClassName = rawClassName(val);
+        ClassInfo clazz = index.getClassByName(rawClassName);
+        if (clazz == null) {
+            throw new TemplateException(
+                    "Class [" + rawClassName + "] used in the parameter declaration in template ["
+                            + templateIdToPathFun.apply(expressionOrigin.getTemplateGeneratedId()) + "] on line "
+                            + expressionOrigin.getLine()
+                            + " was not found in the application index. Make sure it is spelled correctly.");
+        }
+        return clazz;
+    }
+
+    private static PrimitiveType decodePrimitive(String val) {
+        switch (val) {
+            case "byte":
+                return PrimitiveType.BYTE;
+            case "char":
+                return PrimitiveType.CHAR;
+            case "double":
+                return PrimitiveType.DOUBLE;
+            case "float":
+                return PrimitiveType.FLOAT;
+            case "int":
+                return PrimitiveType.INT;
+            case "long":
+                return PrimitiveType.LONG;
+            case "short":
+                return PrimitiveType.SHORT;
+            case "boolean":
+                return PrimitiveType.BOOLEAN;
+            default:
+                return null;
+        }
+    }
+
     static final String LEFT_ANGLE = "<";
     static final String RIGHT_ANGLE = ">";
     static final String TYPE_INFO_SEPARATOR = "" + Expressions.TYPE_INFO_SEPARATOR;
@@ -108,7 +160,7 @@ private static Type resolveType(String value) {
             String[] parts = value.substring(angleIdx + 1, value.length() - 1).split(",");
             Type[] arguments = new Type[parts.length];
             for (int i = 0; i < arguments.length; i++) {
-                arguments[i] = resolveType(parts[i]);
+                arguments[i] = resolveType(parts[i].trim());
             }
             return ParameterizedType.create(rawName, arguments, null);
         }
@@ -139,6 +191,10 @@ boolean isTypeInfo() {
             return false;
         }
 
+        boolean hasHints() {
+            return false;
+        }
+
         VirtualMethodInfo asVirtualMethod() {
             throw new IllegalArgumentException("Not a virtual method");
         }
@@ -151,6 +207,10 @@ TypeInfo asTypeInfo() {
             throw new IllegalArgumentException("Not a type info: " + getClass().getName() + ":" + toString());
         }
 
+        HintInfo asHintInfo() {
+            throw new IllegalArgumentException("Not a hint info");
+        }
+
         @Override
         public String toString() {
             return value;
@@ -160,11 +220,32 @@ public String toString() {
 
     static abstract class HintInfo extends Info {
 
-        final String hint;
+        static final Pattern HINT_PATTERN = Pattern.compile("\\<[a-zA-Z_0-9#-]+\\>");
+
+        // <loop#1>, <set#10><loop-element>, etc.
+        final List<String> hints;
 
-        public HintInfo(String value, Expression.Part part, String hint) {
+        HintInfo(String value, Expression.Part part, String hintStr) {
             super(value, part);
-            this.hint = hint;
+            if (hintStr != null) {
+                List<String> found = new ArrayList<>();
+                Matcher m = HINT_PATTERN.matcher(hintStr);
+                while (m.find()) {
+                    found.add(m.group());
+                }
+                this.hints = found;
+            } else {
+                this.hints = Collections.emptyList();
+            }
+        }
+
+        boolean hasHints() {
+            return !hints.isEmpty();
+        }
+
+        @Override
+        HintInfo asHintInfo() {
+            return this;
         }
 
     }
@@ -174,7 +255,7 @@ static class TypeInfo extends HintInfo {
         final Type resolvedType;
         final ClassInfo rawClass;
 
-        public TypeInfo(String value, Expression.Part part, String hint, Type resolvedType, ClassInfo rawClass) {
+        TypeInfo(String value, Expression.Part part, String hint, Type resolvedType, ClassInfo rawClass) {
             super(value, part, hint);
             this.resolvedType = resolvedType;
             this.rawClass = rawClass;
@@ -196,7 +277,7 @@ static class PropertyInfo extends HintInfo {
 
         final String name;
 
-        public PropertyInfo(String name, Expression.Part part, String hint) {
+        PropertyInfo(String name, Expression.Part part, String hint) {
             super(name, part, hint);
             this.name = name;
         }
@@ -213,12 +294,12 @@ public PropertyInfo asProperty() {
 
     }
 
-    static class VirtualMethodInfo extends Info {
+    static class VirtualMethodInfo extends HintInfo {
 
         final String name;
 
-        public VirtualMethodInfo(String value, Expression.VirtualMethodPart part) {
-            super(value, part);
+        VirtualMethodInfo(String value, Expression.VirtualMethodPart part, String hint) {
+            super(value, part, hint);
             this.name = part.getName();
         }
 
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Types.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Types.java
index 2920cc80e3f1f..e4d859e790fe9 100644
--- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Types.java
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/Types.java
@@ -113,6 +113,9 @@ static boolean containsTypeVariable(Type type) {
 
     static boolean isAssignableFrom(Type type1, Type type2, IndexView index) {
         // TODO consider type params in assignability rules
+        if (type1.kind() == Kind.ARRAY && type2.kind() == Kind.ARRAY) {
+            return isAssignableFrom(type1.asArrayType().component(), type2.asArrayType().component(), index);
+        }
         return Types.isAssignableFrom(box(type1).name(), box(type2).name(), index);
     }
 
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevConsoleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..3f2b744cae8ae
--- /dev/null
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,47 @@
+package io.quarkus.qute.deployment.devconsole;
+
+import java.util.List;
+import java.util.Map.Entry;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
+import io.quarkus.qute.deployment.CheckedTemplateBuildItem;
+import io.quarkus.qute.deployment.TemplatePathBuildItem;
+import io.quarkus.qute.deployment.TemplateVariantsBuildItem;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleTemplateInfoBuildItem collectTemplateInfo(
+            List<TemplatePathBuildItem> templatePaths,
+            List<CheckedTemplateBuildItem> checkedTemplates,
+            TemplateVariantsBuildItem variants) {
+        DevQuteInfos quteInfos = new DevQuteInfos();
+        for (Entry<String, List<String>> entry : variants.getVariants().entrySet()) {
+            CheckedTemplateBuildItem checkedTemplate = findCheckedTemplate(entry.getKey(), checkedTemplates);
+            if (checkedTemplate != null) {
+                quteInfos.addQuteTemplateInfo(new DevQuteTemplateInfo(checkedTemplate.templateId,
+                        entry.getValue(),
+                        checkedTemplate.method.declaringClass().name() + "." + checkedTemplate.method.name() + "()",
+                        checkedTemplate.bindings));
+            } else {
+                quteInfos.addQuteTemplateInfo(new DevQuteTemplateInfo(entry.getKey(),
+                        entry.getValue(),
+                        null, null));
+            }
+        }
+        return new DevConsoleTemplateInfoBuildItem("devQuteInfos", quteInfos);
+
+    }
+
+    private CheckedTemplateBuildItem findCheckedTemplate(String basePath, List<CheckedTemplateBuildItem> checkedTemplates) {
+        for (CheckedTemplateBuildItem checkedTemplate : checkedTemplates) {
+            if (checkedTemplate.templateId.equals(basePath)) {
+                return checkedTemplate;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevQuteInfos.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevQuteInfos.java
new file mode 100644
index 0000000000000..35d5b31d97d59
--- /dev/null
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevQuteInfos.java
@@ -0,0 +1,21 @@
+package io.quarkus.qute.deployment.devconsole;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DevQuteInfos {
+
+    private final List<DevQuteTemplateInfo> templateInfos;
+
+    public DevQuteInfos() {
+        templateInfos = new ArrayList<>();
+    }
+
+    public List<DevQuteTemplateInfo> getTemplates() {
+        return templateInfos;
+    }
+
+    public void addQuteTemplateInfo(DevQuteTemplateInfo info) {
+        templateInfos.add(info);
+    }
+}
diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevQuteTemplateInfo.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevQuteTemplateInfo.java
new file mode 100644
index 0000000000000..6bb534b0e81bf
--- /dev/null
+++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/devconsole/DevQuteTemplateInfo.java
@@ -0,0 +1,40 @@
+package io.quarkus.qute.deployment.devconsole;
+
+import java.util.List;
+import java.util.Map;
+
+public class DevQuteTemplateInfo implements Comparable<DevQuteTemplateInfo> {
+
+    private final String path;
+    private final List<String> variants;
+    private final String methodInfo;
+    private final Map<String, String> parameters;
+
+    public DevQuteTemplateInfo(String path, List<String> variants, String methodInfo, Map<String, String> parameters) {
+        this.path = path;
+        this.variants = variants;
+        this.methodInfo = methodInfo;
+        this.parameters = parameters;
+    }
+
+    public Map<String, String> getParameters() {
+        return parameters;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public List<String> getVariants() {
+        return variants;
+    }
+
+    public String getMethodInfo() {
+        return methodInfo;
+    }
+
+    @Override
+    public int compareTo(DevQuteTemplateInfo o) {
+        return path.compareTo(o.path);
+    }
+}
diff --git a/extensions/qute/deployment/src/main/resources/dev-templates/embedded.html b/extensions/qute/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..0f30b53bbb21f
--- /dev/null
+++ b/extensions/qute/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,7 @@
+<a href="{urlbase}/templates" class="badge badge-light">
+  <i class="fa fa-file-code fa-fw"></i>
+Templates</a>
+<br>
+<a href="{urlbase}/preview" class="badge badge-light">
+  <i class="fa fa-eye fa-fw"></i>
+Render Preview</a>
diff --git a/extensions/qute/deployment/src/main/resources/dev-templates/preview.html b/extensions/qute/deployment/src/main/resources/dev-templates/preview.html
new file mode 100644
index 0000000000000..befea543cec80
--- /dev/null
+++ b/extensions/qute/deployment/src/main/resources/dev-templates/preview.html
@@ -0,0 +1,22 @@
+{#include main}
+  {#title}Render Preview{/title}
+  {#body}
+  <form method="post" enctype="application/x-www-form-urlencoded" target="_blank">
+     <div class="form-group">
+        <label for="template-select">Select a template:</label>
+        <select class="form-control" name="template-path" id="template-select">
+        {#for template in info:devQuteInfos.templates}
+          {#each template.variants}
+          <option value="{it}">{it}</option>
+          {/each}
+        {/for}
+        </select>
+     </div>
+     <div class="form-group">
+        <label for="template-select">Test JSON data</label>
+        <textarea class="form-control" placeholder="Test JSON data" name="template-data" id="template-data"></textarea>
+     </div>
+     <input id="invoke" type="submit" value="Render" class="btn btn-primary">
+  </form>
+  {/body}
+{/include}
diff --git a/extensions/qute/deployment/src/main/resources/dev-templates/templates.html b/extensions/qute/deployment/src/main/resources/dev-templates/templates.html
new file mode 100644
index 0000000000000..c26e52159f2aa
--- /dev/null
+++ b/extensions/qute/deployment/src/main/resources/dev-templates/templates.html
@@ -0,0 +1,48 @@
+{#include main}
+  {#style}
+   .annotation {
+     color: gray;
+   }
+  {/style}
+  {#title}Templates{/title}
+  {#body}
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Path</th>
+      <th scope="col">Variants</th>
+      <th scope="col">Method *</th>
+      <th scope="col">Parameters *</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#for template in info:devQuteInfos.templates}
+    <tr>
+      <td>{count}.</td>
+      <td>
+        {template.path}
+      </td>
+      <td>
+        <ul>
+        {#each template.variants}
+          <li>{it}</li>
+        {/each}
+        </ul>
+      </td>
+      <td>
+        {template.methodInfo ?: ''}
+      </td>
+      <td>
+        {#if template.parameters}
+          {#for entry in template.parameters}
+            {entry.key}: {entry.value}</br>
+          {/for}
+        {/if}
+      </td>
+    {/for}
+   </tbody>
+   <tfoot><tr><td colspan="5">* This information is only available for templates that match a <code>@CheckedTemplate</code> method.</td></tr></tfoot>
+  </table>
+  {/body}
+{/include}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java
index a5c54c1a4fa16..dbd4e830f0ab3 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/EscapingTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Locale;
+
 import javax.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -14,6 +16,7 @@
 import io.quarkus.qute.RawString;
 import io.quarkus.qute.Template;
 import io.quarkus.qute.TemplateData;
+import io.quarkus.qute.Variant;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class EscapingTest {
@@ -61,6 +64,13 @@ public void testValidation() {
                 engine.getTemplate("validation").data("text", "<div>").render());
     }
 
+    @Test
+    public void testEngineParse() {
+        assertEquals("&lt;div&gt; <div>",
+                engine.parse("{text} {text.raw}",
+                        new Variant(Locale.ENGLISH, "text/html", "UTF-8")).data("text", "<div>").render());
+    }
+
     @TemplateData
     public static class Item {
 
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/HelloReflect.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/HelloReflect.java
index 9bd38b765709a..39b498fc117e4 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/HelloReflect.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/HelloReflect.java
@@ -8,4 +8,16 @@ public String ping() {
         return "pong";
     }
 
+    public boolean isActive() {
+        return true;
+    }
+
+    public Long getAge2() {
+        return age;
+    }
+
+    public boolean hasItem() {
+        return false;
+    }
+
 }
\ No newline at end of file
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java
new file mode 100644
index 0000000000000..9e9d9d6937816
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/OrEmptyTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.qute.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class OrEmptyTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(Templates.class)
+                    .addAsResource(new StringAsset(
+                            "START{#for pet in pets.orEmpty}...{/for}END::{pets.orEmpty.size}"),
+                            "templates/OrEmptyTest/pets.html"));
+
+    @CheckedTemplate
+    static class Templates {
+
+        static native TemplateInstance pets(List<Object> pets);
+
+    }
+
+    @Test
+    public void testOrEmpty() {
+        assertEquals("STARTEND::0", Templates.pets(null).render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java
index 0a6c17ed063b1..93a7e97eb5489 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/ReflectionResolverTest.java
@@ -19,14 +19,15 @@ public class ReflectionResolverTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(HelloReflect.class)
-                    .addAsResource(new StringAsset("{age}:{ping}:{noMatch}"), "templates/reflect.txt"));
+                    .addAsResource(new StringAsset("{age}:{ping}:{noMatch}:{active}:{isActive}:{hasItem}:{item}:{age2}"),
+                            "templates/reflect.txt"));
 
     @Inject
     Template reflect;
 
     @Test
     public void testInjection() {
-        assertEquals("10:pong:NOT_FOUND", reflect.render(new HelloReflect()));
+        assertEquals("10:pong:NOT_FOUND:true:true:false:false:10", reflect.render(new HelloReflect()));
     }
 
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java
index c5e8e569d9045..37a93ea95d6f7 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateDataTest.java
@@ -23,7 +23,8 @@ public class TemplateDataTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(Foo.class)
-                    .addAsResource(new StringAsset("{foo.val} is not {foo.val.setScale(2,roundingMode)}"),
+                    .addAsResource(new StringAsset(
+                            "{foo.val} is not {foo.val.setScale(2,roundingMode)} and {foo.bar}={foo.hasBar} and {foo.baz}={foo.isBaz}"),
                             "templates/foo.txt"));
 
     @Inject
@@ -31,7 +32,7 @@ public class TemplateDataTest {
 
     @Test
     public void testTemplateData() {
-        assertEquals("123.4563 is not 123.46",
+        assertEquals("123.4563 is not 123.46 and true=true and false=false",
                 foo.data("roundingMode", RoundingMode.HALF_UP).data("foo", new Foo(new BigDecimal("123.4563"))).render());
     }
 
@@ -45,6 +46,14 @@ public Foo(BigDecimal val) {
             this.val = val;
         }
 
+        public boolean hasBar() {
+            return true;
+        }
+
+        public boolean isBaz() {
+            return false;
+        }
+
     }
 
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java
deleted file mode 100644
index f2ea32ffb386c..0000000000000
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TemplateExtensionMethodsTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package io.quarkus.qute.deployment;
-
-import static io.quarkus.qute.TemplateExtension.ANY;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.qute.Engine;
-import io.quarkus.qute.Template;
-import io.quarkus.qute.TemplateExtension;
-import io.quarkus.test.QuarkusUnitTest;
-
-public class TemplateExtensionMethodsTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Foo.class, Extensions.class, PrioritizedExtensions.class)
-                    .addAsResource(new StringAsset("{foo.name.toLower} {foo.name.ignored} {foo.callMe(1)} {foo.baz}"),
-                            "templates/foo.txt")
-                    .addAsResource(new StringAsset("{baz.setScale(baz.defaultScale,roundingMode)}"),
-                            "templates/baz.txt")
-                    .addAsResource(new StringAsset("{anyInt.foo('bing')}"),
-                            "templates/any.txt")
-                    .addAsResource(new StringAsset("{foo.pong}::{foo.name}"),
-                            "templates/priority.txt"));
-
-    @Inject
-    Template foo;
-
-    @Inject
-    Engine engine;
-
-    @Test
-    public void testTemplateExtensions() {
-        assertEquals("fantomas NOT_FOUND 11 baz",
-                foo.data("foo", new Foo("Fantomas", 10l)).render());
-    }
-
-    @Test
-    public void testMethodParameters() {
-        assertEquals("123.46",
-                engine.getTemplate("baz.txt").data("roundingMode", RoundingMode.HALF_UP).data("baz", new BigDecimal("123.4563"))
-                        .render());
-    }
-
-    @Test
-    public void testMatchAnyWithParameter() {
-        assertEquals("10=bing",
-                engine.getTemplate("any.txt").data("anyInt", 10).render());
-    }
-
-    @Test
-    public void testBuiltinExtensions() {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("alpha", "1");
-        map.put("bravo", "2");
-        map.put("charlie", "3");
-        assertEquals("3:1:NOT_FOUND:1:false:true",
-                engine.parse(
-                        "{myMap.size}:{myMap.alpha}:{myMap.missing}:{myMap.get(key)}:{myMap.empty}:{myMap.containsKey('charlie')}")
-                        .data("myMap", map).data("key", "alpha").render());
-
-    }
-
-    @Test
-    public void testPriority() {
-        assertEquals("bravo::baz", engine.getTemplate("priority").data("foo", new Foo("baz", 10l)).render());
-    }
-
-    @TemplateExtension
-    public static class Extensions {
-
-        String ignored(String val) {
-            return val.toLowerCase();
-        }
-
-        static String toLower(String val) {
-            return val.toLowerCase();
-        }
-
-        static Long callMe(Foo foo, Integer val) {
-            return foo.age + val;
-        }
-
-        @TemplateExtension(matchName = "baz")
-        static String override(Foo foo) {
-            return "baz";
-        }
-
-        static BigDecimal setScale(BigDecimal val, int scale, RoundingMode mode) {
-            return val.setScale(scale, mode);
-        }
-
-        @TemplateExtension(matchName = ANY)
-        static String any(Integer val, String name, String info) {
-            return val + "=" + info;
-        }
-
-        static int defaultScale(BigDecimal val) {
-            return 2;
-        }
-    }
-
-    @TemplateExtension(matchName = "pong")
-    public static class PrioritizedExtensions {
-
-        // default priority - class-level annotation
-        static String alpha(Foo foo) {
-            return "alpha";
-        }
-
-        // Explicit priority, higher than ValueResolverGenerator.DEFAULT_PRIORITY
-        @TemplateExtension(matchName = "pong", priority = 100)
-        static String bravo(Foo foo) {
-            return "bravo";
-        }
-
-        // default priority - method-level annotation
-        @TemplateExtension(matchName = "pong")
-        static String charlie(Foo foo) {
-            return "charlie";
-        }
-
-    }
-
-}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java
new file mode 100644
index 0000000000000..6ec6fce4efe8d
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/TypeInfosTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.qute.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+
+import org.junit.jupiter.api.Test;
+
+public class TypeInfosTest {
+
+    @Test
+    public void testHintPattern() {
+        assertHints("<loop-element>", "<loop-element>");
+        assertHints("<set#10><loop-element>", "<set#10>", "<loop-element>");
+        assertHints("<set#10><loop#4><any_other>", "<set#10>", "<loop#4>", "<any_other>");
+        assertHints("<set#10>loop-element>", "<set#10>");
+    }
+
+    private void assertHints(String hintStr, String... expectedHints) {
+        Matcher m = TypeInfos.HintInfo.HINT_PATTERN.matcher(hintStr);
+        List<String> hints = new ArrayList<>();
+        while (m.find()) {
+            hints.add(m.group());
+        }
+        assertEquals(Arrays.asList(expectedHints), hints);
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java
index b1d68816cf315..4c2afbcc6b405 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/VariantTemplateTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.qute.deployment;
 
+import static io.quarkus.qute.TemplateInstance.SELECTED_VARIANT;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javax.enterprise.context.Dependent;
@@ -30,11 +31,11 @@ public class VariantTemplateTest {
 
     @Test
     public void testRendering() {
-        TemplateInstance rendering = simpleBean.foo.instance().data("bar");
-        rendering.setAttribute(TemplateInstance.SELECTED_VARIANT, new Variant(null, "text/plain", null));
-        assertEquals("bar", rendering.render());
-        rendering.setAttribute(TemplateInstance.SELECTED_VARIANT, new Variant(null, "text/html", null));
-        assertEquals("<strong>bar</strong>", rendering.render());
+        TemplateInstance instance = simpleBean.foo.instance().data("bar");
+        instance.setAttribute(SELECTED_VARIANT, Variant.forContentType("text/plain"));
+        assertEquals("bar", instance.render());
+        instance.setAttribute(SELECTED_VARIANT, Variant.forContentType("text/html"));
+        assertEquals("<strong>bar</strong>", instance.render());
     }
 
     @Dependent
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java
new file mode 100644
index 0000000000000..e007ea1f82243
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/AsyncDataTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.qute.deployment.asyncdata;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.concurrent.CompletableFuture;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class AsyncDataTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Client.class)
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.asyncdata.Client client}"
+                            + "{#for token in client.tokens}"
+                            + "{token}:{/for}"), "templates/test1.html")
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.asyncdata.Client client}"
+                            + "{#for token in tokens}"
+                            + "{token}:{/for}"), "templates/test2.html")
+                    .addAsResource(new StringAsset("{token}"), "templates/test3.html"));
+
+    @Inject
+    Template test1;
+
+    @Inject
+    Template test2;
+
+    @Inject
+    Template test3;
+
+    @Test
+    public void testAsyncData() {
+        assertEquals("alpha:bravo:delta:", test1.data("client", new Client()).render());
+        assertEquals("alpha:bravo:delta:", test2.data("tokens", new Client().getTokens()).render());
+        assertEquals("alpha", test3.data("token", CompletableFuture.completedFuture("alpha")).render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/Client.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/Client.java
new file mode 100644
index 0000000000000..fea27a6df09f7
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/asyncdata/Client.java
@@ -0,0 +1,16 @@
+package io.quarkus.qute.deployment.asyncdata;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+public class Client {
+
+    public CompletionStage<List<String>> getTokens() {
+        CompletableFuture<List<String>> tokens = new CompletableFuture<>();
+        tokens.complete(Arrays.asList("alpha", "bravo", "delta"));
+        return tokens;
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java
new file mode 100644
index 0000000000000..73601e5fc4c57
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/contenttypes/AdditionalContentTypeTest.java
@@ -0,0 +1,42 @@
+package io.quarkus.qute.deployment.contenttypes;
+
+import static io.quarkus.qute.TemplateInstance.SELECTED_VARIANT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.Variant;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class AdditionalContentTypeTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("Empty txt"), "templates/foo.txt")
+                    .addAsResource(new StringAsset("Empty graphql"), "templates/foo.graphql")
+                    .addAsResource(new StringAsset("quarkus.qute.content-types.graphql=application/graphql\n"
+                            + "quarkus.qute.suffixes=txt,graphql"), "application.properties"));
+
+    @Inject
+    Template foo;
+
+    @Test
+    public void testVariant() {
+        assertEquals("Empty graphql",
+                foo.instance().setAttribute(SELECTED_VARIANT, Variant.forContentType("application/graphql")).render());
+        assertEquals("Empty txt",
+                foo.instance().setAttribute(SELECTED_VARIANT, Variant.forContentType("text/plain")).render());
+        // foo.txt is used by default because it's first in the quarkus.qute.suffixes list
+        assertEquals("Empty txt",
+                foo.instance().render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java
new file mode 100644
index 0000000000000..ac03d0e190914
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/devconsole/DevConsolePreviewTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.qute.deployment.devconsole;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class DevConsolePreviewTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest config = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(
+                            "{#for i in total}{i}:{/for}"),
+                            "templates/loop.txt"));
+
+    @Test
+    public void testLoopPreview() {
+        RestAssured.with().formParam("template-path", "loop.txt").formParam("template-data", "{\"total\": [1 ,2 ,3]}")
+                .post("q/dev/io.quarkus.quarkus-qute/preview")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("1:2:3:"));
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java
new file mode 100644
index 0000000000000..bcd552698883d
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ConfigTemplateExtensionsTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ConfigTemplateExtensionsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(
+                            "{config:foo}={config:property('foo')} {config:nonExistent}={config:property('nonExistent')} {config:['foo.bar.baz']}={config:property('foo.bar.baz')} {config:['quarkus.qute.remove-standalone-lines']}={config:property('quarkus.qute.remove-standalone-lines')} {config:property(name)}"),
+                            "templates/foo.html")
+                    .addAsResource(new StringAsset("foo=false\nfoo.bar.baz=11"), "application.properties"));
+
+    @Inject
+    Template foo;
+
+    @Test
+    public void testGetProperty() {
+        assertEquals("false=false NOT_FOUND=NOT_FOUND 11=11 true=true false",
+                foo.data("name", "foo").render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java
new file mode 100644
index 0000000000000..ab995e72d4864
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/ExtensionMethodCompletionStageTest.java
@@ -0,0 +1,64 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.Unremovable;
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.deployment.Foo;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ExtensionMethodCompletionStageTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Foo.class, Extensions.class, FooParentService.class));
+
+    @Inject
+    Engine engine;
+
+    @Test
+    public void testTemplateExtensions() throws InterruptedException, ExecutionException {
+        CompletableFuture<String> result = engine.parse("{foo.parent.name}").data("foo", new Foo("alpha", 10l)).renderAsync()
+                .toCompletableFuture();
+        assertFalse(result.isDone());
+        FooParentService.parent.complete(new Foo("bravo", 1l));
+        assertEquals("bravo", result.toCompletableFuture().get());
+    }
+
+    @Unremovable
+    @Singleton
+    public static class FooParentService {
+
+        static final CompletableFuture<Foo> parent = new CompletableFuture<Foo>();
+
+        CompletableFuture<Foo> getParent(Foo foo) {
+            return parent;
+        }
+
+    }
+
+    public static class Extensions {
+
+        @TemplateExtension(matchName = "parent")
+        static CompletableFuture<Foo> fooParentAsync(Foo foo) {
+            return CDI.current().select(FooParentService.class).get().getParent(foo);
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java
new file mode 100644
index 0000000000000..c756f8180f150
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/InvalidExtensionMethodMatchRegexTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.TemplateException;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.deployment.Foo;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InvalidExtensionMethodMatchRegexTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Foo.class, Extensions.class))
+            .setExpectedException(TemplateException.class);
+
+    @Test
+    public void testValidation() {
+        fail();
+    }
+
+    public static class Extensions {
+
+        // the method should have at least two params and the second one must be a string
+        @TemplateExtension(matchRegex = "bar")
+        static String fooRegex(Foo foo) {
+            return foo.name.toUpperCase();
+        }
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java
new file mode 100644
index 0000000000000..5a21b33940374
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NamespaceTemplateExtensionTest.java
@@ -0,0 +1,96 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static io.quarkus.qute.TemplateExtension.ANY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.enterprise.event.TransactionPhase;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NamespaceTemplateExtensionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(StringExtensions.class, MyEnum.class, EnumExtensions.class));
+
+    @Inject
+    Engine engine;
+
+    @Test
+    public void testTemplateExtensions() {
+        assertEquals("hello:1",
+                engine.parse("{str:format('%s:%s','hello', 1)}").render());
+        assertEquals("1",
+                engine.parse("{str:format('%s',1)}").render());
+        assertEquals("olleh",
+                engine.parse("{str:reverse('hello')}").render());
+        assertEquals("foolish:olleh",
+                engine.parse("{str:foolish('hello')}").render());
+        assertEquals("ONE=ONE",
+                engine.parse("{MyEnum:ONE}={MyEnum:one}").render());
+        assertEquals("IN_PROGRESS=0",
+                engine.parse("{txPhase:IN_PROGRESS}={txPhase:IN_PROGRESS.ordinal}").render());
+        assertEquals("Quark!",
+                engine.parse("{str:quark}").render());
+        assertEquals("QUARKUS!",
+                engine.parse("{str:quarkus}").render());
+    }
+
+    @TemplateExtension(namespace = "str")
+    public static class StringExtensions {
+
+        static String format(String fmt, Object... args) {
+            return String.format(fmt, args);
+        }
+
+        static String reverse(String val) {
+            return new StringBuilder(val).reverse().toString();
+        }
+
+        @TemplateExtension(namespace = "str", matchRegex = "foo.*", priority = 5)
+        static String foo(String name, String val) {
+            return name + ":" + new StringBuilder(val).reverse().toString();
+        }
+
+        static String quark() {
+            return "Quark!";
+        }
+
+        @TemplateExtension(namespace = "str", matchName = ANY, priority = 1)
+        static String quarkAny(String key) {
+            return key.toUpperCase() + "!";
+        }
+
+    }
+
+    public enum MyEnum {
+
+        ONE,
+        TWO
+
+    }
+
+    public static class EnumExtensions {
+
+        @TemplateExtension(namespace = "MyEnum", matchName = ANY)
+        static MyEnum getVal(String val) {
+            return MyEnum.valueOf(val.toUpperCase());
+        }
+
+        @TemplateExtension(namespace = "txPhase", matchName = "*")
+        static TransactionPhase enumValue(String value) {
+            return TransactionPhase.valueOf(value);
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/NumberTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java
similarity index 94%
rename from extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/NumberTemplateExtensionsTest.java
rename to extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java
index f077f27f8becd..b25b339e79974 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/NumberTemplateExtensionsTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/NumberTemplateExtensionsTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.qute.deployment;
+package io.quarkus.qute.deployment.extensions;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java
new file mode 100644
index 0000000000000..c0572c66c1c5f
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionAttributeTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.TemplateExtension.TemplateAttribute;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TemplateExtensionAttributeTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Extensions.class));
+
+    @Inject
+    Engine engine;
+
+    @Test
+    public void testTemplateExtensions() {
+        assertEquals("bar::en",
+                engine.parse("{foo.transform}").data("foo", "bar").setAttribute("locale", Locale.ENGLISH).render());
+        assertEquals("OK",
+                engine.parse("{foo.myAttr}").instance().setAttribute("myAttribute", "OK").render());
+        assertEquals("NULL",
+                engine.parse("{foo.myAttr}").render());
+        assertEquals("OK",
+                engine.parse("{attr:ping}").instance().setAttribute("myAttribute", "OK").render());
+    }
+
+    @TemplateExtension
+    public static class Extensions {
+
+        static String myAttr(Object any, @TemplateAttribute Object myAttribute) {
+            return myAttribute != null ? myAttribute.toString() : "NULL";
+        }
+
+        static String transform(String val, @TemplateAttribute("locale") Object loc) {
+            return val.toLowerCase() + "::" + loc.toString();
+        }
+
+        @TemplateExtension(namespace = "attr")
+        static String ping(@TemplateAttribute Object myAttribute) {
+            return myAttribute.toString();
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java
new file mode 100644
index 0000000000000..374eb293914f9
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TemplateExtensionMethodsTest.java
@@ -0,0 +1,181 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static io.quarkus.qute.TemplateExtension.ANY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.deployment.Foo;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TemplateExtensionMethodsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Foo.class, Extensions.class, PrioritizedExtensions.class)
+                    .addAsResource(new StringAsset("{foo.name.toLower} {foo.name.ignored} {foo.callMe(1)} {foo.baz}"),
+                            "templates/foo.txt")
+                    .addAsResource(new StringAsset("{baz.setScale(baz.defaultScale,roundingMode)}"),
+                            "templates/baz.txt")
+                    .addAsResource(new StringAsset("{anyInt.foo('bing')}"),
+                            "templates/any.txt")
+                    .addAsResource(new StringAsset("{foo.pong}::{foo.name}"),
+                            "templates/priority.txt")
+                    .addAsResource(new StringAsset("{num.twice}"),
+                            "templates/assignability.txt")
+                    .addAsResource(new StringAsset("{myArray.getLast}"),
+                            "templates/arrays.txt"));
+
+    @Inject
+    Template foo;
+
+    @Inject
+    Engine engine;
+
+    @Test
+    public void testTemplateExtensions() {
+        assertEquals("fantomas NOT_FOUND 11 baz",
+                foo.data("foo", new Foo("Fantomas", 10l)).render());
+    }
+
+    @Test
+    public void testMethodParameters() {
+        assertEquals("123.46",
+                engine.getTemplate("baz.txt").data("roundingMode", RoundingMode.HALF_UP).data("baz", new BigDecimal("123.4563"))
+                        .render());
+    }
+
+    @Test
+    public void testMatchAnyWithParameter() {
+        assertEquals("10=bing",
+                engine.getTemplate("any.txt").data("anyInt", 10).render());
+    }
+
+    @Test
+    public void testMatchRegex() {
+        assertEquals("BRAVO=BAR",
+                engine.parse("{foo.bravo}={foo.bar}").data("foo", new Foo("pong", 10l)).render());
+    }
+
+    @Test
+    public void testBuiltinExtensions() {
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("alpha", "1");
+        map.put("bravo", "2");
+        map.put("charlie", "3");
+        assertEquals("3:1:NOT_FOUND:1:false:true",
+                engine.parse(
+                        "{myMap.size}:{myMap.alpha}:{myMap.missing}:{myMap.get(key)}:{myMap.empty}:{myMap.containsKey('charlie')}")
+                        .data("myMap", map).data("key", "alpha").render());
+
+    }
+
+    @Test
+    public void testPriority() {
+        assertEquals("bravo::baz", engine.getTemplate("priority").data("foo", new Foo("baz", 10l)).render());
+    }
+
+    @Test
+    public void testListGetByIndex() {
+        assertEquals("true=true=NOT_FOUND",
+                engine.parse("{list.0}={list[0]}={list[100]}").data("list", Collections.singletonList(true)).render());
+    }
+
+    @Test
+    public void testMatchTypeAssignability() {
+        assertEquals("20",
+                engine.getTemplate("assignability").data("num", 10.1).render());
+    }
+
+    @Test
+    public void testArrayMatchType() {
+        assertEquals("last",
+                engine.getTemplate("arrays").data("myArray", new String[] { "first", "second", "last" }).render());
+    }
+
+    @TemplateExtension
+    public static class Extensions {
+
+        String ignored(String val) {
+            return val.toLowerCase();
+        }
+
+        static String toLower(String val) {
+            return val.toLowerCase();
+        }
+
+        static Long callMe(Foo foo, Integer val) {
+            return foo.age + val;
+        }
+
+        @TemplateExtension(matchName = "baz")
+        static String override(Foo foo) {
+            return "baz";
+        }
+
+        static BigDecimal setScale(BigDecimal val, int scale, RoundingMode mode) {
+            return val.setScale(scale, mode);
+        }
+
+        @TemplateExtension(matchName = ANY)
+        static String any(Integer val, String name, String info) {
+            return val + "=" + info;
+        }
+
+        static int defaultScale(BigDecimal val) {
+            return 2;
+        }
+
+        @TemplateExtension(matchRegex = "(bar|bravo)")
+        static String fooRegex(Foo foo, String name) {
+            return name.toUpperCase();
+        }
+
+        static int twice(Number number) {
+            return number.intValue() * 2;
+        }
+
+        static Object getLast(Object[] array) {
+            return array[array.length - 1];
+        }
+    }
+
+    @TemplateExtension(matchName = "pong")
+    public static class PrioritizedExtensions {
+
+        // default priority - class-level annotation
+        static String alpha(Foo foo) {
+            return "alpha";
+        }
+
+        // Explicit priority, higher than ValueResolverGenerator.DEFAULT_PRIORITY
+        @TemplateExtension(matchName = "pong", priority = 100)
+        static String bravo(Foo foo) {
+            return "bravo";
+        }
+
+        // default priority - method-level annotation
+        @TemplateExtension(matchName = "pong")
+        static String charlie(Foo foo) {
+            return "charlie";
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java
new file mode 100644
index 0000000000000..5bbc6d7be5606
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/extensions/TimeTemplateExtensionsTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.qute.deployment.extensions;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TimeTemplateExtensionsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(
+                            "{now.format('d uuuu')}:{nowLocalDate.format('d MMM uuuu',myLocale)}:{time:format(nowDate,'d MMM uuuu',myLocale)}:{time:format(nowCalendar,'d uuuu')}"),
+                            "templates/foo.html"));
+
+    @Inject
+    Template foo;
+
+    @Test
+    public void testFormat() {
+        Calendar nowCal = Calendar.getInstance();
+        nowCal.set(Calendar.YEAR, 2020);
+        nowCal.set(Calendar.MONTH, Calendar.SEPTEMBER);
+        nowCal.set(Calendar.DAY_OF_MONTH, 10);
+        Date nowDate = nowCal.getTime();
+        assertEquals("10 2020:10 Sep 2020:10 Sep 2020:10 2020", foo
+                .data("now", LocalDateTime.of(2020, 9, 10, 11, 12))
+                .data("nowLocalDate", LocalDate.of(2020, 9, 10))
+                .data("nowDate", nowDate)
+                .data("nowCalendar", nowCal)
+                .data("myLocale", Locale.ENGLISH).render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java
new file mode 100644
index 0000000000000..4f8280a3157c5
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/generatedresolvers/HierarchyTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.qute.deployment.generatedresolvers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateData;
+import io.quarkus.qute.ValueResolver;
+import io.quarkus.qute.generator.ValueResolverGenerator;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class HierarchyTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Foo.class, Bar.class)
+                    .addAsResource(new StringAsset("{foo.name}"), "templates/test.html"));
+
+    @Inject
+    Template test;
+
+    @Inject
+    Engine engine;
+
+    @Test
+    public void testGeneratedResolvers() {
+        List<ValueResolver> resolvers = engine.getValueResolvers();
+        ValueResolver fooResolver = null;
+        ValueResolver barResolver = null;
+        for (ValueResolver valueResolver : resolvers) {
+            if (valueResolver.getClass().getName().endsWith(ValueResolverGenerator.SUFFIX)
+                    && valueResolver.getClass().getName().contains("Foo")) {
+                fooResolver = valueResolver;
+            }
+            if (valueResolver.getClass().getName().endsWith(ValueResolverGenerator.SUFFIX)
+                    && valueResolver.getClass().getName().contains("Bar")) {
+                barResolver = valueResolver;
+            }
+        }
+        assertNotNull(fooResolver);
+        assertNotNull(barResolver);
+        assertTrue(barResolver.getPriority() > fooResolver.getPriority(), "Bar resolver priority " + barResolver.getPriority()
+                + " is not higher than Foo resolver priority " + fooResolver.getPriority());
+        assertEquals("bar", test.data("foo", new Bar()).render());
+    }
+
+    @TemplateData
+    public static class Foo {
+
+        public String getName() {
+            return "foo";
+        }
+
+    }
+
+    @TemplateData
+    public static class Bar extends Foo {
+
+        @Override
+        public String getName() {
+            return "bar";
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java
index e973f3dedc45f..c405d5fd7f1fd 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AlphaMessages.java
@@ -12,4 +12,7 @@ public interface AlphaMessages {
     @Message(value = "Hello!", key = "hello_alpha")
     String hello();
 
+    @Message("Hello {name} from alpha!")
+    String helloWithParam(String name);
+
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AppMessages.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AppMessages.java
index ebc95df60b081..aed50cf3fe181 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AppMessages.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/AppMessages.java
@@ -14,6 +14,9 @@ public interface AppMessages {
     @Message("Hello {name}!")
     String hello_name(String name);
 
+    @Message("Hello {name} {surname}!")
+    String hello_fullname(String name, String surname);
+
     // key=hello_with_if_section
     @Message(key = UNDERSCORED_ELEMENT_NAME, value = "{#if count eq 1}"
             + "{msg:hello_name('you guy')}"
@@ -25,4 +28,7 @@ public interface AppMessages {
     @Message("Item name: {item.name}, age: {item.age}")
     String itemDetail(Item item);
 
+    @Message(key = "dot.test", value = "Dot test!")
+    String dotTest();
+
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java
index 4363b8d295000..fc31165d04ca2 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java
@@ -37,9 +37,9 @@ public class MessageBundleExpressionValidationTest {
                     fail("No template exception thrown: " + t);
                 }
                 assertTrue(te.getMessage().contains("Found template problems (3)"), te.getMessage());
-                assertTrue(te.getMessage().contains("Incorrect expression: item.foo"), te.getMessage());
-                assertTrue(te.getMessage().contains("Incorrect expression: bar"), te.getMessage());
-                assertTrue(te.getMessage().contains("Incorrect expression: foo"), te.getMessage());
+                assertTrue(te.getMessage().contains("item.foo"), te.getMessage());
+                assertTrue(te.getMessage().contains("bar"), te.getMessage());
+                assertTrue(te.getMessage().contains("foo"), te.getMessage());
             });
 
     @Test
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java
index 81599c68c7f54..2fa7abb662ed1 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleTest.java
@@ -25,11 +25,14 @@ public class MessageBundleTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(AppMessages.class, OtherMessages.class, AlphaMessages.class, Item.class)
                     .addAsResource(new StringAsset(
-                            "{msg:hello} {msg:hello_name('Jachym')} {msg:hello_with_if_section(3)} {alpha:hello-alpha} {alpha:hello_alpha}"),
+                            "{msg:hello} {msg:hello_name('Jachym')} {msg:hello_with_if_section(3)} {alpha:hello-alpha} {alpha:hello_alpha} {alpha:hello-with-param('foo')}"),
                             "templates/foo.html")
                     .addAsResource(new StringAsset(
                             "hello=Hallo Welt!\nhello_name=Hallo {name}!"),
-                            "messages/msg_de.properties"));
+                            "messages/msg_de.properties")
+                    .addAsResource(new StringAsset(
+                            "{msg:message('hello')} {msg:message(key,'Malachi',surname)}"),
+                            "templates/dynamic.html"));
 
     @Inject
     AppMessages messages;
@@ -64,11 +67,15 @@ public void testBeans() {
 
     @Test
     public void testResolvers() {
-        assertEquals("Hello world! Hello Jachym! Hello you guys! Hello alpha! Hello!", foo.instance().render());
-        assertEquals("Hello world! Ahoj Jachym! Hello you guys! Hello alpha! Hello!",
+        assertEquals("Hello world! Hello Jachym! Hello you guys! Hello alpha! Hello! Hello foo from alpha!",
+                foo.instance().render());
+        assertEquals("Hello world! Ahoj Jachym! Hello you guys! Hello alpha! Hello! Hello foo from alpha!",
                 foo.instance().setAttribute(MessageBundles.ATTRIBUTE_LOCALE, Locale.forLanguageTag("cs")).render());
-        assertEquals("Hallo Welt! Hallo Jachym! Hello you guys! Hello alpha! Hello!",
+        assertEquals("Hallo Welt! Hallo Jachym! Hello you guys! Hello alpha! Hello! Hello foo from alpha!",
                 foo.instance().setAttribute(MessageBundles.ATTRIBUTE_LOCALE, Locale.GERMAN).render());
+        assertEquals("Dot test!", engine.parse("{msg:['dot.test']}").render());
+        assertEquals("Hello world! Hello Malachi Constant!",
+                engine.getTemplate("dynamic").data("key", "hello_fullname").data("surname", "Constant").render());
     }
 
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java
index c15b9fd7cbb01..5117e1ab4c60f 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/InjectionTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.qute.Engine;
+import io.quarkus.qute.Location;
 import io.quarkus.qute.Template;
 import io.quarkus.qute.api.ResourcePath;
 import io.quarkus.test.QuarkusUnitTest;
@@ -37,6 +38,7 @@ public void testInjection() {
         assertEquals("bar", simpleBean.foo.render("bar"));
         assertEquals("<strong>bar</strong>", simpleBean.foo2.render("bar"));
         assertEquals("bar", simpleBean.bar.render("bar"));
+        assertEquals("bar", simpleBean.barLocation.render("bar"));
     }
 
     @Dependent
@@ -54,6 +56,9 @@ public static class SimpleBean {
         @ResourcePath("bars/bar")
         Template bar;
 
+        @Location("bars/bar")
+        Template barLocation;
+
     }
 
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java
new file mode 100644
index 0000000000000..61030a0310643
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationFailureTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.qute.deployment.inject;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Named;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.TemplateException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NamedBeanValidationFailureTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(NamedFoo.class)
+                    .addAsResource(new StringAsset("{#each inject:foo.list}{it.ping}{/each}}"), "templates/fooping.html"))
+            .assertException(t -> {
+                Throwable e = t;
+                TemplateException te = null;
+                while (e != null) {
+                    if (e instanceof TemplateException) {
+                        te = (TemplateException) e;
+                        break;
+                    }
+                    e = e.getCause();
+                }
+                assertNotNull(te);
+                assertTrue(te.getMessage().contains("Found template problems (1)"), te.getMessage());
+                assertTrue(te.getMessage().contains("it.ping"), te.getMessage());
+            });
+
+    @Test
+    public void testValidation() {
+        fail();
+    }
+
+    @ApplicationScoped
+    @Named("foo")
+    public static class NamedFoo {
+
+        public List<String> getList() {
+            return null;
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java
new file mode 100644
index 0000000000000..7a8123e66ab51
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/inject/NamedBeanValidationSuccessTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.qute.deployment.inject;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NamedBeanValidationSuccessTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(NamedFoo.class)
+                    .addAsResource(
+                            new StringAsset(
+                                    "{inject:foo.getList(true).size}::{#each inject:foo.getList('foo')}{it.length}{/each}"),
+                            "templates/fooping.html"));
+
+    @Inject
+    Template fooping;
+
+    @Test
+    public void testResult() {
+        assertEquals("0::3", fooping.render());
+    }
+
+    @ApplicationScoped
+    @Named("foo")
+    public static class NamedFoo {
+
+        public List<String> getList(String param) {
+            return Collections.singletonList(param);
+        }
+
+        public List<String> getList(boolean param) {
+            return Collections.emptyList();
+        }
+
+        public List<String> getList() {
+            return Collections.singletonList("one");
+        }
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java
new file mode 100644
index 0000000000000..30e04f874a12e
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundNoopTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.qute.deployment.propertynotfound;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class PropertyNotFoundNoopTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("foos:{foos}"), "templates/test.html")
+                    .addAsResource(new StringAsset("quarkus.qute.property-not-found-strategy=noop"), "application.properties"));
+
+    @Inject
+    Template test;
+
+    @Test
+    public void testNoop() {
+        assertEquals("foos:", test.render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java
new file mode 100644
index 0000000000000..5f3e53c876964
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundOutputOriginalTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.qute.deployment.propertynotfound;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class PropertyNotFoundOutputOriginalTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("foos:{foos}"), "templates/test.html")
+                    .addAsResource(new StringAsset("quarkus.qute.property-not-found-strategy=output-original"),
+                            "application.properties"));
+
+    @Inject
+    Template test;
+
+    @Test
+    public void testOriginal() {
+        assertEquals("foos:{foos}", test.render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java
new file mode 100644
index 0000000000000..6dddfa44439f0
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/propertynotfound/PropertyNotFoundThrowExceptionTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.qute.deployment.propertynotfound;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateException;
+import io.quarkus.runtime.util.ExceptionUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class PropertyNotFoundThrowExceptionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("foos:{foos}"), "templates/test.html")
+                    .addAsResource(new StringAsset("quarkus.qute.property-not-found-strategy=throw-exception"),
+                            "application.properties"));
+
+    @Inject
+    Template test;
+
+    @Test
+    public void testException() {
+        try {
+            test.render();
+            fail();
+        } catch (Exception expected) {
+            Throwable rootCause = ExceptionUtil.getRootCause(expected);
+            assertEquals(TemplateException.class, rootCause.getClass());
+            assertTrue(rootCause.getMessage().contains("{foos}"));
+        }
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java
new file mode 100644
index 0000000000000..1971ab3955ce5
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateArrayParamTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.CheckedTemplate;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CheckedTemplateArrayParamTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Templates.class)
+                    .addAsResource(new StringAsset("Hello {myArray[1]}!"),
+                            "templates/CheckedTemplateArrayParamTest/arrays.txt"));
+
+    @Test
+    public void testBasePath() {
+        assertEquals("Hello 1!",
+                Templates.arrays(new int[] { 0, 1 }).render());
+    }
+
+    @CheckedTemplate
+    public static class Templates {
+
+        static native TemplateInstance arrays(int[] myArray);
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java
new file mode 100644
index 0000000000000..57e136b1fbb9a
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateBasePathTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CheckedTemplateBasePathTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Monks.class)
+                    .addAsResource(new StringAsset("Hello {name}!"), "templates/foo/monk.txt")
+                    .addAsResource(new StringAsset("Hello {name}!"), "templates/Monks/monk.txt"));
+
+    @Test
+    public void testBasePath() {
+        assertEquals("Hello Ondrej!",
+                Monks.Templates.monk("Ondrej").render());
+        assertEquals("Hello Ondrej!",
+                Monks.OtherTemplates.monk("Ondrej").render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java
new file mode 100644
index 0000000000000..89cb9c648f15a
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/CheckedTemplateConflictTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.TemplateException;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CheckedTemplateConflictTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Templates.class)
+                    .addAsResource(new StringAsset("Hello {name}!"), "templates/CheckedTemplateConflictTest/monk.txt"))
+            .setExpectedException(TemplateException.class);
+
+    @Test
+    public void testValidation() {
+        fail();
+    }
+
+    @CheckedTemplate
+    static class Templates {
+
+        static native TemplateInstance monk(String name);
+
+        static native TemplateInstance monk(Integer age);
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java
new file mode 100644
index 0000000000000..325aea8e1104e
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/LoopValidationTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LoopValidationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Machine.class, MachineStatus.class)
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Machine machine}"
+                            + "{#for name in machine.getNames(42)}"
+                            + "{name}::{name.length}"
+                            + "{/for}"), "templates/machine.html"));
+
+    @Inject
+    Template machine;
+
+    @Test
+    public void testValidation() {
+        assertEquals("ping::4",
+                machine.data("machine", new Machine().setStatus(MachineStatus.ON)).render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Machine.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Machine.java
new file mode 100644
index 0000000000000..fc060fca1c81a
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Machine.java
@@ -0,0 +1,25 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import java.util.Collections;
+import java.util.List;
+
+public class Machine {
+
+    public Integer ping = 1;
+
+    private MachineStatus status;
+
+    public Machine setStatus(MachineStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    public MachineStatus getStatus() {
+        return status;
+    }
+
+    public List<String> getNames(int pings) {
+        return Collections.singletonList("ping");
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MachineStatus.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MachineStatus.java
new file mode 100644
index 0000000000000..d73a3116bb049
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MachineStatus.java
@@ -0,0 +1,6 @@
+package io.quarkus.qute.deployment.typesafe;
+
+enum MachineStatus {
+    ON,
+    OFF
+}
\ No newline at end of file
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Monks.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Monks.java
new file mode 100644
index 0000000000000..64f76f0e0d5a5
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Monks.java
@@ -0,0 +1,22 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+
+public class Monks {
+
+    @CheckedTemplate(basePath = "foo")
+    static class Templates {
+
+        static native TemplateInstance monk(String name);
+
+    }
+
+    @CheckedTemplate
+    static class OtherTemplates {
+
+        static native TemplateInstance monk(String name);
+
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Movie.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Movie.java
index 2254ca10cb0e5..540081bb4367b 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Movie.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/Movie.java
@@ -7,6 +7,8 @@ public class Movie {
 
     public final Boolean alwaysTrue;
 
+    public final boolean alwaysFalsePrimitive = false;
+
     public final List<String> mainCharacters;
 
     public Movie(String... mainCharacters) {
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MovieExtensions.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MovieExtensions.java
index 024060acb449c..25b4361f5d82f 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MovieExtensions.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/MovieExtensions.java
@@ -17,4 +17,8 @@ static Long toLong(Movie movie, long... values) {
         return ret;
     }
 
+    static boolean negate(boolean val) {
+        return !val;
+    }
+
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java
new file mode 100644
index 0000000000000..7363cb94b0b64
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeCheckExcludesTest.java
@@ -0,0 +1,38 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TypeCheckExcludesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Movie.class, Machine.class, MachineStatus.class)
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}"
+                            + "{@io.quarkus.qute.deployment.typesafe.Machine machine}"
+                            + "{movie.name}::{movie.superior}::{machine.ping}::{machine.neverEver}"), "templates/movie.html")
+                    .addAsResource(new StringAsset(
+                            "quarkus.qute.type-check-excludes=io.quarkus.qute.deployment.typesafe.Movie.superior,io.quarkus.qute.deployment.typesafe.Machine.*"),
+                            "application.properties"));
+
+    @Inject
+    Template movie;
+
+    @Test
+    public void testValidationSuccess() {
+        assertEquals("Jason::NOT_FOUND::1::NOT_FOUND",
+                movie.data("movie", new Movie(), "machine", new Machine()).render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java
new file mode 100644
index 0000000000000..4c6e331908fdd
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLetTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TypeSafeLetTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Movie.class)
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}"
+                            + "{#let service=movie.findService('foo')}"
+                            + "{service.shortValue}"
+                            + "{/let}"), "templates/foo.html"));
+
+    @Inject
+    Template foo;
+
+    @Test
+    public void testValidation() {
+        assertEquals("10",
+                foo.data("movie", new Movie()).render());
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java
index 732a3690568b4..a5f6b382fafd7 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopFailureTest.java
@@ -1,5 +1,7 @@
 package io.quarkus.qute.deployment.typesafe;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -22,7 +24,20 @@ public class TypeSafeLoopFailureTest {
                             + "{#for foo in list}"
                             + "{foo.name}={foo.ages}"
                             + "{/}"), "templates/foo.html"))
-            .setExpectedException(TemplateException.class);
+            .assertException(t -> {
+                Throwable e = t;
+                TemplateException te = null;
+                while (e != null) {
+                    if (e instanceof TemplateException) {
+                        te = (TemplateException) e;
+                        break;
+                    }
+                    e = e.getCause();
+                }
+                assertNotNull(te);
+                assertTrue(te.getMessage().contains("Found template problems (1)"), te.getMessage());
+                assertTrue(te.getMessage().contains("foo.ages"), te.getMessage());
+            });
 
     @Test
     public void testValidation() {
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java
index 88a847419cd05..7842dbe7b069d 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/TypeSafeLoopTest.java
@@ -2,7 +2,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -13,16 +15,18 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
 import io.quarkus.qute.deployment.Foo;
 import io.quarkus.qute.deployment.MyFooList;
 import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Uni;
 
 public class TypeSafeLoopTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(Foo.class, MyFooList.class)
+                    .addClasses(Foo.class, MyFooList.class, Item.class, Extensions.class)
                     .addAsResource(new StringAsset("{@java.util.List<io.quarkus.qute.deployment.Foo> list}"
                             + "{@io.quarkus.qute.deployment.MyFooList fooList}"
                             + "{#for foo in list}"
@@ -33,16 +37,57 @@ public class TypeSafeLoopTest {
                             + "{foo.name}={foo.age}={foo.charlie.name}"
                             + "{/}"
                             + "::"
-                            + "{fooList.get(0).name}"), "templates/foo.html"));
+                            + "{fooList.get(0).name}"
+                            + "::"
+                            + "{#for item in items}{#each item.tags('foo')}{it}{/each}{/for}"
+                            + "::"
+                            + "{fooList.get(0).tags.size}={#each fooList.get(0).tags}{it}{/each}"), "templates/foo.html")
+                    .addAsResource(new StringAsset("{@java.util.List<io.quarkus.qute.deployment.Foo> list}"
+                            + "{#for foo in list}"
+                            + "{#let name=foo.name}"
+                            + "{#for char in name.toCharArray}"
+                            + "{char}:"
+                            + "{/for}"
+                            + "{/let}"
+                            + "{/for}"), "templates/nested.html"));
 
     @Inject
     Template foo;
 
+    @Inject
+    Template nested;
+
     @Test
     public void testValidation() {
-        assertEquals("bravo=10=BRAVO::alpha=1=ALPHA::alpha",
-                foo.data("list", Collections.singletonList(new Foo("bravo", 10l)))
-                        .data("fooList", new MyFooList(new Foo("alpha", 1l))).render());
+        List<Foo> foos = Collections.singletonList(new Foo("bravo", 10l));
+        MyFooList myFoos = new MyFooList(new Foo("alpha", 1l));
+        List<Item> items = Arrays.asList(new Item());
+        assertEquals("bravo=10=BRAVO::alpha=1=ALPHA::alpha::foobar::2=boxunbox",
+                foo.data("list", foos, "fooList", myFoos, "items", items).render());
+    }
+
+    @Test
+    public void testNestedHintsValidation() {
+        List<Foo> foos = Collections.singletonList(new Foo("boom", 10l));
+        assertEquals("b:o:o:m:",
+                nested.data("list", foos).render());
+    }
+
+    static class Item {
+
+    }
+
+    @TemplateExtension
+    static class Extensions {
+
+        static List<String> tags(Item item, String foo) {
+            return Arrays.asList(foo, "bar");
+        }
+
+        static Uni<List<String>> tags(Foo foo) {
+            return Uni.createFrom().item(Arrays.asList("box", "unbox"));
+        }
+
     }
 
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java
index 9aa457b5a1999..801b5fc4bebd1 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationFailuresTest.java
@@ -32,7 +32,10 @@ public class ValidationFailuresTest {
                             + "{movie.findServices(age,name)}"
                             // Name and number of params ok for extension method; the parameter type does not match
                             + "{movie.toNumber(age)}"
-                            + "{#each movie.mainCharacters}{it.boom(1)}{/}"),
+                            + "{#each movie.mainCharacters}{it.boom(1)}{/}"
+                            // Template extension method must accept one param
+                            + "{movie.toNumber}"
+                            + "{#each movie}{it}{/each}"),
                             "templates/movie.html"))
             .assertException(t -> {
                 Throwable e = t;
@@ -45,7 +48,7 @@ public class ValidationFailuresTest {
                     e = e.getCause();
                 }
                 assertNotNull(te);
-                assertTrue(te.getMessage().contains("Found template problems (7)"), te.getMessage());
+                assertTrue(te.getMessage().contains("Found template problems (9)"), te.getMessage());
                 assertTrue(te.getMessage().contains("movie.foo"), te.getMessage());
                 assertTrue(te.getMessage().contains("movie.getName('foo')"), te.getMessage());
                 assertTrue(te.getMessage().contains("movie.findService(age)"), te.getMessage());
@@ -53,6 +56,10 @@ public class ValidationFailuresTest {
                 assertTrue(te.getMessage().contains("movie.findServices(age,name)"), te.getMessage());
                 assertTrue(te.getMessage().contains("movie.toNumber(age)"), te.getMessage());
                 assertTrue(te.getMessage().contains("it.boom(1)"), te.getMessage());
+                assertTrue(te.getMessage().contains("movie.toNumber"), te.getMessage());
+                assertTrue(
+                        te.getMessage().contains("Unsupported iterable type found: io.quarkus.qute.deployment.typesafe.Movie"),
+                        te.getMessage());
             });
 
     @Test
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java
index 26e9a6c342e0f..c1cfa4ee322a4 100644
--- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/ValidationSuccessTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
+
 import javax.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -22,11 +24,15 @@ public class ValidationSuccessTest {
                     .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Movie movie}"
                             + "{@java.lang.Long age}"
                             + "{@java.lang.String surname}"
+                            + "{@java.util.Map<String,String map}"
                             // Property found
                             + "{movie.name} "
                             // Built-in value resolvers
                             + "{movie.name ?: 'Mono'} "
                             + "{movie.alwaysTrue ? 'Mono' : 'Stereo'} "
+                            + "{movie.alwaysFalsePrimitive ? 'Mono' : 'Stereo'} "
+                            + "{movie.alwaysFalsePrimitive.negate} "
+                            + "{movie.mainCharacters.size} "
                             // Name and number of params ok and param type ignored
                             + "{movie.findService('foo')} "
                             // Name and number of params ok; name type ignored, age ok
@@ -38,7 +44,9 @@ public class ValidationSuccessTest {
                             // Varargs extension method
                             + "{movie.toLong(1l,2l)} "
                             // Field access
-                            + "{#each movie.mainCharacters}{it.substring(1)}{/}"),
+                            + "{#each movie.mainCharacters}{it.substring(1)}{/} "
+                            // Method param assignability
+                            + "{map.get('foo')}"),
                             "templates/movie.html"));
 
     @Inject
@@ -47,8 +55,9 @@ public class ValidationSuccessTest {
     @Test
     public void testResult() {
         // Validation succeeded! Yay!
-        assertEquals("Jason Jason Mono 10 11 ok 43 3 ohn",
-                movie.data("movie", new Movie("John")).data("name", "Vasik").data("surname", "Hu").data("age", 10l).render());
+        assertEquals("Jason Jason Mono Stereo true 1 10 11 ok 43 3 ohn bar",
+                movie.data("movie", new Movie("John"), "name", "Vasik", "surname", "Hu", "age", 10l, "map",
+                        Collections.singletonMap("foo", "bar")).render());
     }
 
 }
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java
new file mode 100644
index 0000000000000..64fc549fa6e63
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationFailureTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.TemplateException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class WhenValidationFailureTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Machine.class, MachineStatus.class)
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Machine machine}"
+                            + "{#when machine.status}"
+                            + "{#is WRONG} 1"
+                            + "{#is item.name} 2"
+                            + "{#is OFF} 0"
+                            + "{/when}"), "templates/machine.html"))
+            .assertException(t -> {
+                Throwable e = t;
+                TemplateException te = null;
+                while (e != null) {
+                    if (e instanceof TemplateException) {
+                        te = (TemplateException) e;
+                        break;
+                    }
+                    e = e.getCause();
+                }
+                assertNotNull(te);
+                assertTrue(te.getMessage().contains("Found template problems (1)"), te.getMessage());
+                assertTrue(te.getMessage().contains("{WRONG}"), te.getMessage());
+            });
+
+    @Test
+    public void test() {
+        fail();
+    }
+
+}
diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java
new file mode 100644
index 0000000000000..4fba10f635b5d
--- /dev/null
+++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/typesafe/WhenValidationTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.qute.deployment.typesafe;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.Template;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class WhenValidationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Machine.class, MachineStatus.class)
+                    .addAsResource(new StringAsset("{@io.quarkus.qute.deployment.typesafe.Machine machine}"
+                            + "{#when machine.status}"
+                            + "{#is ON}1"
+                            + "{#is OFF}0"
+                            + "{/when} "
+                            + "{#when machine.status}"
+                            + "{#is in ON OFF}"
+                            + "OK"
+                            + "{/when} "
+                            + "{#when machine.ping}"
+                            + "{#is machine.status}"
+                            + "NOK"
+                            + "{#is in 1 2}"
+                            + "OK"
+                            + "{/when}"), "templates/machine.html"));
+
+    @Inject
+    Template machine;
+
+    @Test
+    public void testValidation() {
+        assertEquals("1 OK OK",
+                machine.data("machine", new Machine().setStatus(MachineStatus.ON)).render());
+        assertEquals("0 OK OK",
+                machine.data("machine", new Machine().setStatus(MachineStatus.OFF)).render());
+    }
+
+}
diff --git a/extensions/qute/pom.xml b/extensions/qute/pom.xml
index 2e6db42848f20..58829b02f79a9 100644
--- a/extensions/qute/pom.xml
+++ b/extensions/qute/pom.xml
@@ -5,10 +5,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-qute-parent</artifactId>
diff --git a/extensions/qute/runtime/pom.xml b/extensions/qute/runtime/pom.xml
index ee47f8defd956..bb73c2797c617 100644
--- a/extensions/qute/runtime/pom.xml
+++ b/extensions/qute/runtime/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-qute-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-qute</artifactId>
@@ -27,11 +26,6 @@
             <groupId>io.quarkus.qute</groupId>
             <artifactId>qute-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/CheckedTemplate.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/CheckedTemplate.java
index 5d67cb64c24d9..28169c9c700fd 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/CheckedTemplate.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/CheckedTemplate.java
@@ -9,17 +9,21 @@
 import io.quarkus.qute.TemplateInstance;
 
 /**
- * <p>
  * If you place this annotation on a class, all its <code>native static</code> methods will be used to declare
  * templates and the list of parameters they require.
  * <p>
- * If this is placed on an inner class of the class <code>X</code>, a <code>native static</code> method of the name
- * <code>foo</code> will refer to a template at the path <code>X/foo</code> (template file extensions are
- * not part of the method name) relative to your templates root.
- * <p>
- * If this is placed on a toplevel class, a <code>native static</code> method of the name
- * <code>foo</code> will refer to a template at the path <code>foo</code> (template file extensions are
- * not part of the method name) at the toplevel of your templates root.
+ * The name of a method and the base path are used to locate the template contents.
+ * By default, the base path is derived from the annotation target:
+ * <ul>
+ * <li>If this is placed on a static nested class of an enclosing class with a simple name <code>X</code>, a
+ * <code>native static</code> method of the name <code>foo</code> will refer to a template at the path <code>X/foo</code>
+ * (template file extensions are
+ * not part of the method name) relative to the templates root.</li>
+ * <li>If this is placed on a top-level class, a <code>native static</code> method of the name <code>foo</code> will refer to a
+ * template at the path <code>foo</code> (template file extensions are
+ * not part of the method name) at the toplevel of the templates root.</li>
+ * </ul>
+ * The base path can be also specified via {@link #basePath()}.
  * <p>
  * Each parameter of the <code>native static</code> will be used to validate the template at build time, to
  * make sure that those parameters are used properly in a type-safe manner. The return type of each
@@ -29,31 +33,59 @@
  * <p>
  * 
  * <pre>
- * {
- *     &#64;code
- *     &#64;Path("item")
- *     public class ItemResource {
+ * &#64;Path("item")
+ * public class ItemResource {
  * 
- *         &#64;CheckedTemplate
- *         class Templates {
- *             // defines a template at ItemResource/item, taking an Item parameter named item
- *             public static native TemplateInstance item(Item item);
- *         }
+ *     &#64;CheckedTemplate
+ *     static class Templates {
+ *         // defines a template at ItemResource/item, taking an Item parameter named item
+ *         static native TemplateInstance item(Item item);
+ *     }
  * 
- *         &#64;GET
- *         &#64;Path("{id}")
- *         &#64;Produces(MediaType.TEXT_HTML)
- *         public TemplateInstance get(@PathParam("id") Integer id) {
- *             // instantiate that template and pass it the required template parameter
- *             return Templates.item(service.findItem(id));
- *         }
+ *     &#64;GET
+ *     &#64;Path("{id}")
+ *     &#64;Produces(MediaType.TEXT_HTML)
+ *     public TemplateInstance get(@PathParam("id") Integer id) {
+ *         // instantiate that template and pass it the required template parameter
+ *         return Templates.item(service.findItem(id));
  *     }
  * }
  * </pre>
+ * 
+ * @deprecated Use {@link io.quarkus.qute.CheckedTemplate} instead. This annotation will be removed at some point post Quarkus
+ *             1.13.
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Deprecated
 public @interface CheckedTemplate {
 
+    /**
+     * Constant value for {@link #basePath()} indicating that the default strategy should be used.
+     */
+    String DEFAULTED = "<<defaulted>>";
+
+    /**
+     * Example:
+     * 
+     * <pre>
+     * &#64;Path("item")
+     * public class ItemResource {
+     * 
+     *     &#64;CheckedTemplate(basePath = "items_v1")
+     *     static class Templates {
+     *         // defines a template at items_v1/item
+     *         static native TemplateInstance item(Item item);
+     * 
+     *         // defines a template at items_v1/allItems
+     *         static native TemplateInstance allItems(List&lt;Item&gt; items);
+     *     }
+     * }
+     * </pre>
+     * 
+     * @return the base path relative to the templates root
+     */
+    String basePath() default DEFAULTED;
+
 }
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/ResourcePath.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/ResourcePath.java
index c06865a57dc26..939597999a1c0 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/ResourcePath.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/api/ResourcePath.java
@@ -15,10 +15,13 @@
 /**
  * Qualifies an injected template. The {@link #value()} is used to locate the template; it represents the path relative from
  * the base path.
+ * 
+ * @deprecated Use {@link io.quarkus.qute.Location} instead. This annotation will be removed at some point post Quarkus 1.13.
  */
 @Qualifier
 @Retention(RUNTIME)
 @Target({ FIELD, PARAMETER, METHOD })
+@Deprecated
 public @interface ResourcePath {
 
     /**
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java
index 2f323890080a7..b68248a51e67d 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/i18n/MessageBundles.java
@@ -7,13 +7,13 @@
 import java.util.concurrent.CompletionStage;
 
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Instance;
 
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.qute.Engine;
 import io.quarkus.qute.EngineBuilder;
@@ -21,6 +21,8 @@
 import io.quarkus.qute.NamespaceResolver;
 import io.quarkus.qute.Resolver;
 import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.Variant;
 import io.quarkus.qute.runtime.MessageBundleRecorder.BundleContext;
 
 public final class MessageBundles {
@@ -44,7 +46,8 @@ public static <T> T get(Class<T> bundleInterface, Localized localized) {
         if (!bundleInterface.isAnnotationPresent(MessageBundle.class)
                 && !bundleInterface.isAnnotationPresent(Localized.class)) {
             throw new IllegalArgumentException(
-                    "Message bundle interface must be annotated either with @Bundle or with @Localized: " + bundleInterface);
+                    "Message bundle interface must be annotated either with @MessageBundle or with @Localized: "
+                            + bundleInterface);
         }
         InstanceHandle<T> handle = localized != null ? Arc.container().instance(bundleInterface, localized)
                 : Arc.container().instance(bundleInterface);
@@ -54,8 +57,9 @@ public static <T> T get(Class<T> bundleInterface, Localized localized) {
         throw new IllegalStateException("Unable to obtain a message bundle instance for: " + bundleInterface);
     }
 
-    static void setupNamespaceResolvers(@Observes EngineBuilder builder, BundleContext context,
-            @Any Instance<Object> instance) {
+    static void setupNamespaceResolvers(@Observes EngineBuilder builder, BundleContext context) {
+        // Avoid injecting "Instance<Object> instance" which prevents unused beans removal
+        ArcContainer container = Arc.container();
         // For every bundle register a new resolver
         for (Entry<String, Map<String, Class<?>>> entry : context.getBundleInterfaces().entrySet()) {
             final String bundle = entry.getKey();
@@ -63,10 +67,10 @@ static void setupNamespaceResolvers(@Observes EngineBuilder builder, BundleConte
             Resolver resolver = null;
             for (Entry<String, Class<?>> locEntry : entry.getValue().entrySet()) {
                 if (locEntry.getKey().equals(DEFAULT_LOCALE)) {
-                    resolver = (Resolver) instance.select(locEntry.getValue(), Default.Literal.INSTANCE).get();
+                    resolver = (Resolver) container.select(locEntry.getValue(), Default.Literal.INSTANCE).get();
                     continue;
                 }
-                Instance<?> found = instance.select(locEntry.getValue(), new Localized.Literal(locEntry.getKey()));
+                Instance<?> found = container.select(locEntry.getValue(), new Localized.Literal(locEntry.getKey()));
                 if (!found.isResolvable()) {
                     throw new IllegalStateException("Bean instance for localized interface not found: " + locEntry.getValue());
                 }
@@ -79,10 +83,21 @@ static void setupNamespaceResolvers(@Observes EngineBuilder builder, BundleConte
                 public CompletionStage<Object> resolve(EvalContext context) {
                     Object locale = context.getAttribute(ATTRIBUTE_LOCALE);
                     if (locale == null) {
-                        return defaultResolver.resolve(context);
+                        Object selectedVariant = context.getAttribute(TemplateInstance.SELECTED_VARIANT);
+                        if (selectedVariant != null) {
+                            locale = ((Variant) selectedVariant).getLocale();
+                        }
+                        if (locale == null) {
+                            return defaultResolver.resolve(context);
+                        }
                     }
+                    // First try the exact match
                     Resolver localeResolver = interfaces
                             .get(locale instanceof Locale ? ((Locale) locale).toLanguageTag() : locale.toString());
+                    if (localeResolver == null && locale instanceof Locale) {
+                        // Next try the language
+                        localeResolver = interfaces.get(((Locale) locale).getLanguage());
+                    }
                     return localeResolver != null ? localeResolver.resolve(context) : defaultResolver.resolve(context);
                 }
 
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java
new file mode 100644
index 0000000000000..75f15a26a780f
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/ContentTypes.java
@@ -0,0 +1,50 @@
+package io.quarkus.qute.runtime;
+
+import java.net.URLConnection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.qute.Variant;
+
+@Singleton
+public class ContentTypes {
+
+    private static final Logger LOGGER = Logger.getLogger(ContentTypes.class);
+
+    @Inject
+    QuteConfig config;
+
+    /**
+     * 
+     * @param templatePath The path relative to the template root, uses the {@code /} path separator.
+     * @return the content type
+     */
+    public String getContentType(String templatePath) {
+        String fileName = templatePath;
+        int slashIdx = fileName.lastIndexOf('/');
+        if (slashIdx != -1) {
+            fileName = fileName.substring(slashIdx, fileName.length());
+        }
+        int dotIdx = fileName.lastIndexOf('.');
+        if (dotIdx != -1) {
+            String suffix = fileName.substring(dotIdx + 1, fileName.length());
+            String additionalContentType = config.contentTypes.get(suffix);
+            if (additionalContentType != null) {
+                return additionalContentType;
+            }
+            if (suffix.equalsIgnoreCase("json")) {
+                return Variant.APPLICATION_JSON;
+            }
+            String contentType = URLConnection.getFileNameMap().getContentTypeFor(fileName);
+            if (contentType != null) {
+                return contentType;
+            }
+        }
+        LOGGER.warn("Unable to detect the content type for " + templatePath + "; using application/octet-stream");
+        return "application/octet-stream";
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java
index 676204fa68203..a9df70d9c1b5b 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/EngineProducer.java
@@ -20,8 +20,10 @@
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.qute.Engine;
 import io.quarkus.qute.EngineBuilder;
+import io.quarkus.qute.HtmlEscaper;
 import io.quarkus.qute.NamespaceResolver;
 import io.quarkus.qute.ReflectionValueResolver;
+import io.quarkus.qute.Resolver;
 import io.quarkus.qute.Results.Result;
 import io.quarkus.qute.TemplateLocator.TemplateLocation;
 import io.quarkus.qute.UserTagSectionHelper;
@@ -42,13 +44,16 @@ public class EngineProducer {
     private static final Logger LOGGER = Logger.getLogger(EngineProducer.class);
 
     private final Engine engine;
+    private final ContentTypes contentTypes;
     private final List<String> tags;
     private final List<String> suffixes;
     private final String basePath;
     private final String tagPath;
 
-    public EngineProducer(QuteContext context, Event<EngineBuilder> builderReady, Event<Engine> engineReady) {
-        this.suffixes = context.getConfig().suffixes;
+    public EngineProducer(QuteContext context, QuteConfig config, QuteRuntimeConfig runtimeConfig,
+            Event<EngineBuilder> builderReady, Event<Engine> engineReady, ContentTypes contentTypes) {
+        this.contentTypes = contentTypes;
+        this.suffixes = config.suffixes;
         this.basePath = "templates/";
         this.tagPath = basePath + TAGS;
         this.tags = context.getTags();
@@ -69,6 +74,27 @@ public EngineProducer(QuteContext context, Event<EngineBuilder> builderReady, Ev
         builder.addValueResolver(ValueResolvers.mapEntryResolver());
         // foo.string.raw returns a RawString which is never escaped
         builder.addValueResolver(ValueResolvers.rawResolver());
+        builder.addValueResolver(ValueResolvers.logicalAndResolver());
+        builder.addValueResolver(ValueResolvers.logicalOrResolver());
+        builder.addValueResolver(ValueResolvers.orEmpty());
+        // Note that arrays are handled specifically during validation
+        builder.addValueResolver(ValueResolvers.arrayResolver());
+
+        // If needed use a specific result mapper for the selected strategy  
+        switch (runtimeConfig.propertyNotFoundStrategy) {
+            case THROW_EXCEPTION:
+                builder.addResultMapper(new PropertyNotFoundThrowException());
+                break;
+            case NOOP:
+                builder.addResultMapper(new PropertyNotFoundNoop());
+                break;
+            case OUTPUT_ORIGINAL:
+                builder.addResultMapper(new PropertyNotFoundOutputOriginal());
+                break;
+            default:
+                // Use the default strategy
+                break;
+        }
 
         // Escape some characters for HTML templates
         builder.addResultMapper(new HtmlEscaper());
@@ -77,7 +103,7 @@ public EngineProducer(QuteContext context, Event<EngineBuilder> builderReady, Ev
         builder.addValueResolver(new ReflectionValueResolver());
 
         // Remove standalone lines if desired
-        builder.removeStandaloneLines(context.getConfig().removeStandaloneLines);
+        builder.removeStandaloneLines(runtimeConfig.removeStandaloneLines);
 
         // Allow anyone to customize the builder
         builderReady.fire(builder);
@@ -90,7 +116,12 @@ public EngineProducer(QuteContext context, Event<EngineBuilder> builderReady, Ev
 
         // Add generated resolvers
         for (String resolverClass : context.getResolverClasses()) {
-            builder.addValueResolver(createResolver(resolverClass));
+            Resolver resolver = createResolver(resolverClass);
+            if (resolver instanceof NamespaceResolver) {
+                builder.addNamespaceResolver((NamespaceResolver) resolver);
+            } else {
+                builder.addValueResolver((ValueResolver) resolver);
+            }
             LOGGER.debugf("Added generated value resolver: %s", resolverClass);
         }
         // Add tags
@@ -126,14 +157,14 @@ String getTagPath() {
         return tagPath;
     }
 
-    private ValueResolver createResolver(String resolverClassName) {
+    private Resolver createResolver(String resolverClassName) {
         try {
             Class<?> resolverClazz = Thread.currentThread()
                     .getContextClassLoader().loadClass(resolverClassName);
-            if (ValueResolver.class.isAssignableFrom(resolverClazz)) {
-                return (ValueResolver) resolverClazz.newInstance();
+            if (Resolver.class.isAssignableFrom(resolverClazz)) {
+                return (Resolver) resolverClazz.newInstance();
             }
-            throw new IllegalStateException("Not a value resolver: " + resolverClassName);
+            throw new IllegalStateException("Not a resolver: " + resolverClassName);
         } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
             throw new IllegalStateException("Unable to create resolver: " + resolverClassName, e);
         }
@@ -172,14 +203,9 @@ private URL locatePath(String path) {
         return cl.getResource(path);
     }
 
-    static Variant guessVariant(String path) {
-        // TODO we need a proper way to detect the variant
-        int suffixIdx = path.lastIndexOf('.');
-        if (suffixIdx != -1) {
-            String suffix = path.substring(suffixIdx);
-            return new Variant(null, TemplateProducer.parseMediaType(suffix), null);
-        }
-        return null;
+    Variant guessVariant(String path) {
+        // TODO detect locale and encoding
+        return Variant.forContentType(contentTypes.getContentType(path));
     }
 
     static class ResourceTemplateLocation implements TemplateLocation {
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java
new file mode 100644
index 0000000000000..66724f59172bc
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/LocationLiteral.java
@@ -0,0 +1,25 @@
+package io.quarkus.qute.runtime;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import io.quarkus.qute.Location;
+
+/**
+ * Supports inline instantiation of {@link Location}.
+ */
+public class LocationLiteral extends AnnotationLiteral<Location> implements Location {
+
+    private static final long serialVersionUID = 1L;
+
+    private final String value;
+
+    public LocationLiteral(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String value() {
+        return value;
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundNoop.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundNoop.java
new file mode 100644
index 0000000000000..4a1a03053902e
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundNoop.java
@@ -0,0 +1,25 @@
+package io.quarkus.qute.runtime;
+
+import io.quarkus.qute.Expression;
+import io.quarkus.qute.ResultMapper;
+import io.quarkus.qute.Results.Result;
+import io.quarkus.qute.TemplateNode.Origin;
+
+class PropertyNotFoundNoop implements ResultMapper {
+
+    @Override
+    public int getPriority() {
+        return 10;
+    }
+
+    @Override
+    public boolean appliesTo(Origin origin, Object result) {
+        return result.equals(Result.NOT_FOUND);
+    }
+
+    @Override
+    public String map(Object result, Expression expression) {
+        return "";
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundOutputExpression.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundOutputExpression.java
new file mode 100644
index 0000000000000..0d8e1ba684c82
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundOutputExpression.java
@@ -0,0 +1,25 @@
+package io.quarkus.qute.runtime;
+
+import io.quarkus.qute.Expression;
+import io.quarkus.qute.ResultMapper;
+import io.quarkus.qute.Results.Result;
+import io.quarkus.qute.TemplateNode.Origin;
+
+class PropertyNotFoundOutputOriginal implements ResultMapper {
+
+    @Override
+    public int getPriority() {
+        return 10;
+    }
+
+    @Override
+    public boolean appliesTo(Origin origin, Object result) {
+        return result.equals(Result.NOT_FOUND);
+    }
+
+    @Override
+    public String map(Object result, Expression expression) {
+        return "{" + expression.toOriginalString() + "}";
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundThrowException.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundThrowException.java
new file mode 100644
index 0000000000000..f48a1daa19c28
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/PropertyNotFoundThrowException.java
@@ -0,0 +1,28 @@
+package io.quarkus.qute.runtime;
+
+import io.quarkus.qute.Expression;
+import io.quarkus.qute.ResultMapper;
+import io.quarkus.qute.Results.Result;
+import io.quarkus.qute.TemplateException;
+import io.quarkus.qute.TemplateNode.Origin;
+
+class PropertyNotFoundThrowException implements ResultMapper {
+
+    @Override
+    public int getPriority() {
+        return 10;
+    }
+
+    @Override
+    public boolean appliesTo(Origin origin, Object result) {
+        return result.equals(Result.NOT_FOUND);
+    }
+
+    @Override
+    public String map(Object result, Expression expression) {
+        throw new TemplateException(expression.getOrigin(),
+                String.format("Property not found in expression {%s} in template %s on line %s", expression.toOriginalString(),
+                        expression.getOrigin().getTemplateId(), expression.getOrigin().getLine()));
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteConfig.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteConfig.java
index b6bcdba147dc8..f6a2d7c92159c 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteConfig.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteConfig.java
@@ -1,6 +1,8 @@
 package io.quarkus.qute.runtime;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
@@ -10,7 +12,7 @@
 public class QuteConfig {
 
     /**
-     * The set of suffixes used when attempting to locate a template file.
+     * The list of suffixes used when attempting to locate a template file.
      * 
      * By default, `engine.getTemplate("foo")` would result in several lookups: `foo`, `foo.html`, `foo.txt`, etc.
      * 
@@ -20,10 +22,26 @@ public class QuteConfig {
     public List<String> suffixes;
 
     /**
-     * Specify whether the parser should remove standalone lines from the output. A standalone line is a line that contains
-     * only section tags, parameter declarations and whitespace characters.
+     * The additional map of suffixes to content types. This map is used when working with template variants. By default, the
+     * {@link java.net.URLConnection#getFileNameMap()} is used to determine the content type of a template file.
      */
-    @ConfigItem(defaultValue = "true")
-    public boolean removeStandaloneLines;
+    @ConfigItem
+    public Map<String, String> contentTypes;
+
+    /**
+     * The list of exclude rules used to intentionally ignore some parts of an expression when performing type-safe validation.
+     * <p>
+     * An element value must have at least two parts separated by dot. The last part is used to match the property/method name.
+     * The prepended parts are used to match the class name. The value {@code *} can be used to match any name.
+     * <p>
+     * Examples:
+     * <ul>
+     * <li>{@code org.acme.Foo.name} - exclude the property/method {@code name} on the {@code org.acme.Foo} class</li>
+     * <li>{@code org.acme.Foo.*} - exclude any property/method on the {@code org.acme.Foo} class</li>
+     * <li>{@code *.age} - exlude the property/method {@code age} on any class</li>
+     * </ul>
+     */
+    @ConfigItem
+    public Optional<List<String>> typeCheckExcludes;
 
 }
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRecorder.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRecorder.java
index e5b7d1b599a92..716ce9349a362 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRecorder.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRecorder.java
@@ -9,7 +9,7 @@
 @Recorder
 public class QuteRecorder {
 
-    public Supplier<Object> createContext(QuteConfig config, List<String> resolverClasses,
+    public Supplier<Object> createContext(List<String> resolverClasses,
             List<String> templatePaths, List<String> tags, Map<String, List<String>> variants) {
         return new Supplier<Object>() {
 
@@ -32,11 +32,6 @@ public List<String> getResolverClasses() {
                         return resolverClasses;
                     }
 
-                    @Override
-                    public QuteConfig getConfig() {
-                        return config;
-                    }
-
                     @Override
                     public Map<String, List<String>> getVariants() {
                         return variants;
@@ -48,8 +43,6 @@ public Map<String, List<String>> getVariants() {
 
     public interface QuteContext {
 
-        QuteConfig getConfig();
-
         List<String> getResolverClasses();
 
         List<String> getTemplatePaths();
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRuntimeConfig.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRuntimeConfig.java
new file mode 100644
index 0000000000000..11e8cd550f55f
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/QuteRuntimeConfig.java
@@ -0,0 +1,45 @@
+package io.quarkus.qute.runtime;
+
+import io.quarkus.qute.TemplateException;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "qute", phase = ConfigPhase.RUN_TIME)
+public class QuteRuntimeConfig {
+
+    /**
+     * The strategy used if a property is not found when evaluating a standalone expression at runtime.
+     * <p>
+     * This strategy is not used when evaluating an expression that is used in a section parameter, e.g.
+     * <code>{#if foo.name}</code>. In such case, it's the responsibility of the section to handle this situation appropriately.
+     */
+    @ConfigItem(defaultValue = "default")
+    public PropertyNotFoundStrategy propertyNotFoundStrategy;
+    /**
+     * Specify whether the parser should remove standalone lines from the output. A standalone line is a line that contains at
+     * least one section tag, parameter declaration, or comment but no expression and no non-whitespace character.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean removeStandaloneLines;
+
+    public enum PropertyNotFoundStrategy {
+        /**
+         * Output the {@code NOT_FOUND} constant.
+         */
+        DEFAULT,
+        /**
+         * No operation - no output.
+         */
+        NOOP,
+        /**
+         * Throw a {@link TemplateException}.
+         */
+        THROW_EXCEPTION,
+        /**
+         * Output the original expression string, e.g. <code>{foo.name}</code>.
+         */
+        OUTPUT_ORIGINAL
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java
index a7d43e7d745f0..9f5753446e075 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/TemplateProducer.java
@@ -5,11 +5,11 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
 
@@ -22,6 +22,7 @@
 
 import io.quarkus.qute.Engine;
 import io.quarkus.qute.Expression;
+import io.quarkus.qute.Location;
 import io.quarkus.qute.Template;
 import io.quarkus.qute.TemplateInstance;
 import io.quarkus.qute.TemplateInstanceBase;
@@ -29,6 +30,7 @@
 import io.quarkus.qute.api.ResourcePath;
 import io.quarkus.qute.runtime.QuteRecorder.QuteContext;
 import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 
 @Singleton
 public class TemplateProducer {
@@ -39,11 +41,12 @@ public class TemplateProducer {
 
     private final Map<String, TemplateVariants> templateVariants;
 
-    TemplateProducer(Engine engine, QuteContext context) {
+    TemplateProducer(Engine engine, QuteContext context, ContentTypes contentTypes) {
         this.engine = engine;
         Map<String, TemplateVariants> templateVariants = new HashMap<>();
         for (Entry<String, List<String>> entry : context.getVariants().entrySet()) {
-            TemplateVariants var = new TemplateVariants(initVariants(entry.getKey(), entry.getValue()), entry.getKey());
+            TemplateVariants var = new TemplateVariants(initVariants(entry.getKey(), entry.getValue(), contentTypes),
+                    entry.getKey());
             templateVariants.put(entry.getKey(), var);
         }
         this.templateVariants = Collections.unmodifiableMap(templateVariants);
@@ -69,22 +72,26 @@ Template getDefaultTemplate(InjectionPoint injectionPoint) {
     }
 
     @Produces
+    @Location("ignored")
     @ResourcePath("ignored")
     Template getTemplate(InjectionPoint injectionPoint) {
-        ResourcePath path = null;
+        String path = null;
         for (Annotation qualifier : injectionPoint.getQualifiers()) {
-            if (qualifier.annotationType().equals(ResourcePath.class)) {
-                path = (ResourcePath) qualifier;
+            if (qualifier.annotationType().equals(Location.class)) {
+                path = ((Location) qualifier).value();
+                break;
+            } else if (qualifier.annotationType().equals(ResourcePath.class)) {
+                path = ((ResourcePath) qualifier).value();
                 break;
             }
         }
-        if (path == null || path.value().isEmpty()) {
-            throw new IllegalStateException("No template reource path specified");
+        if (path == null || path.isEmpty()) {
+            throw new IllegalStateException("No template location specified");
         }
         // We inject a delegating template in order to:
         // 1. Be able to select an appropriate variant if needed
         // 2. Be able to reload the template when needed, i.e. when the cache is cleared
-        return new InjectableTemplate(path.value(), templateVariants, engine);
+        return new InjectableTemplate(path, templateVariants, engine);
     }
 
     /**
@@ -112,7 +119,7 @@ public TemplateInstance instance() {
         }
 
         @Override
-        public Set<Expression> getExpressions() {
+        public List<Expression> getExpressions() {
             throw new UnsupportedOperationException("Injected templates do not support getExpressions()");
         }
 
@@ -158,6 +165,11 @@ public Multi<String> createMulti() {
             return templateInstance().createMulti();
         }
 
+        @Override
+        public Uni<String> createUni() {
+            return templateInstance().createUni();
+        }
+
         @Override
         public CompletionStage<Void> consume(Consumer<String> consumer) {
             return templateInstance().consume(consumer);
@@ -178,7 +190,8 @@ private Template template() {
             Variant selected = (Variant) getAttribute(TemplateInstance.SELECTED_VARIANT);
             String id;
             if (selected != null) {
-                id = variants.variantToTemplate.get(selected);
+                // Currently, we only use the content type to match the template
+                id = variants.getId(selected.getContentType());
                 if (id == null) {
                     id = variants.defaultTemplate;
                 }
@@ -200,38 +213,26 @@ public TemplateVariants(Map<Variant, String> variants, String defaultTemplate) {
             this.defaultTemplate = defaultTemplate;
         }
 
+        String getId(String contentType) {
+            for (Entry<Variant, String> entry : variantToTemplate.entrySet()) {
+                if (entry.getKey().getContentType().equals(contentType)) {
+                    return entry.getValue();
+                }
+            }
+            return null;
+        }
+
         @Override
         public String toString() {
             return "TemplateVariants{default=" + defaultTemplate + ", variants=" + variantToTemplate + "}";
         }
     }
 
-    static String parseMediaType(String suffix) {
-        // TODO we need a proper way to parse the media type
-        if (suffix.equalsIgnoreCase(".html") || suffix.equalsIgnoreCase(".htm")) {
-            return Variant.TEXT_HTML;
-        } else if (suffix.equalsIgnoreCase(".xml")) {
-            return Variant.TEXT_XML;
-        } else if (suffix.equalsIgnoreCase(".txt")) {
-            return Variant.TEXT_PLAIN;
-        } else if (suffix.equalsIgnoreCase(".json")) {
-            return Variant.APPLICATION_JSON;
-        }
-        LOGGER.warn("Unknown media type for suffix: " + suffix);
-        return "application/octet-stream";
-    }
-
-    static String parseMediaType(String base, String variant) {
-        String suffix = variant.substring(base.length());
-        return parseMediaType(suffix);
-    }
-
-    private static Map<Variant, String> initVariants(String base, List<String> availableVariants) {
-        Map<Variant, String> map = new HashMap<>();
+    private static Map<Variant, String> initVariants(String base, List<String> availableVariants, ContentTypes contentTypes) {
+        Map<Variant, String> map = new LinkedHashMap<>();
         for (String path : availableVariants) {
             if (!base.equals(path)) {
-                String mediaType = parseMediaType(base, path);
-                map.put(new Variant(null, mediaType, null), path);
+                map.put(new Variant(null, contentTypes.getContentType(path), null), path);
             }
         }
         return map;
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java
new file mode 100644
index 0000000000000..6953cf9fc8415
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteDevConsoleRecorder.java
@@ -0,0 +1,27 @@
+package io.quarkus.qute.runtime.devmode;
+
+import java.util.function.BiFunction;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.qute.Engine;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class QuteDevConsoleRecorder {
+
+    public static final String RENDER_HANDLER = QuteDevConsoleRecorder.class.getName() + ".RENDER_HANDLER";
+
+    public void setupRenderer() {
+        //setup the render handler that is used to handle the template
+        //this is invoked from the deployment side
+        DevConsoleManager.setGlobal(RENDER_HANDLER, new BiFunction<String, Object, String>() {
+            @Override
+            public String apply(String template, Object data) {
+                Engine engine = Arc.container().instance(Engine.class).get();
+                return engine.getTemplate(template).render(data);
+            }
+        });
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java
new file mode 100644
index 0000000000000..1869375cda46e
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/devmode/QuteErrorPageSetup.java
@@ -0,0 +1,241 @@
+package io.quarkus.qute.runtime.devmode;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.stream.Collectors;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.dev.ErrorPageGenerators;
+import io.quarkus.dev.spi.HotReplacementContext;
+import io.quarkus.dev.spi.HotReplacementSetup;
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.Escaper;
+import io.quarkus.qute.EvalContext;
+import io.quarkus.qute.ReflectionValueResolver;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.ValueResolver;
+import io.quarkus.runtime.TemplateHtmlBuilder;
+
+public class QuteErrorPageSetup implements HotReplacementSetup {
+
+    private static final Logger LOG = Logger.getLogger(QuteErrorPageSetup.class);
+
+    private static final String TEMPLATE_EXCEPTION = "io.quarkus.qute.TemplateException";
+    private static final String ORIGIN = "io.quarkus.qute.TemplateNode$Origin";
+
+    private static final String PROBLEM_TEMPLATE = ""
+            + "<h3>#{problemIndex} {title}</h3>\n"
+            + "<div style=\"margin-bottom:0.5em;\">{description}</div>\n"
+            + "<div style=\"font-family:monospace;font-size:1em;background-color:#2E3436;color:white;padding:1em;margin-bottom:2em;\">\n"
+            + "{#if realLines.get(0) > 1}<span style=\"color:silver;\">...</span><br>{/if}\n"
+            + "{#for line in sourceLines}\n"
+            // highlight the error line - start
+            + "{#if lineNumber is realLines.get(index)}<div style=\"background-color:#555753;\">{/if}\n"
+            // line number
+            + "<span style=\"color:silver;\">{realLines.get(index).pad}</span>\n"
+            // line content
+            + " {line}\n"
+            // highlight the error line - end 
+            + "{#if lineNumber is realLines.get(index)}</div>{#else}<br>{/if}\n"
+            // point to error
+            + "{#if lineNumber is realLines.get(index)}{space.pad}<span style=\"color:red;\">{#for i in lineCharacterStart}={/for}^</span><br>{/if}\n"
+            + "{/for}\n"
+            + "{#if endLinesSkipped}<span style=\"color:silver;\">...</span>{/if}\n"
+            + "</div>";
+
+    private HotReplacementContext hotReplacementContext;
+
+    @Override
+    public void setupHotDeployment(HotReplacementContext context) {
+        this.hotReplacementContext = context;
+        ErrorPageGenerators.register(TEMPLATE_EXCEPTION, this::generatePage);
+    }
+
+    String generatePage(Throwable exception) {
+        Escaper escaper = Escaper.builder().add('"', "&quot;").add('\'', "&#39;")
+                .add('&', "&amp;").add('<', "&lt;").add('>', "&gt;").build();
+        Template problemTemplate = Engine.builder().addDefaults().addValueResolver(new ReflectionValueResolver())
+                .addValueResolver(new ValueResolver() {
+
+                    public boolean appliesTo(EvalContext context) {
+                        return context.getName().equals("pad");
+                    }
+
+                    @Override
+                    public CompletionStage<Object> resolve(EvalContext context) {
+                        return CompletableFuture.completedFuture(htmlPadRight(context.getBase().toString(), 5));
+                    }
+                })
+                .build()
+                .parse(PROBLEM_TEMPLATE);
+        TemplateHtmlBuilder builder;
+        List<Throwable> problems;
+        Throwable[] suppressed = exception.getSuppressed();
+        if (suppressed.length == 0) {
+            problems = Collections.singletonList(exception);
+        } else {
+            problems = Arrays.asList(suppressed);
+        }
+
+        String problemsFound = "Found " + problems.size() + " Qute problems";
+        builder = new TemplateHtmlBuilder("Error restarting Quarkus", problemsFound, problemsFound);
+
+        // Attempt to sort problems by line
+        Collections.sort(problems, new Comparator<Throwable>() {
+            @Override
+            public int compare(Throwable t1, Throwable t2) {
+                Object o1 = getOrigin(t1);
+                Object o2 = getOrigin(t2);
+                if (o1 == o2) {
+                    return 0;
+                } else if (o1 == null && o2 != null) {
+                    return -1;
+                } else if (o1 != null && o2 == null) {
+                    return 1;
+                }
+                return Integer.compare(getLine(o1), getLine(o2));
+            }
+        });
+
+        for (ListIterator<Throwable> it = problems.listIterator(); it.hasNext();) {
+            Throwable problem = it.next();
+            builder.append(getProblemInfo(it.previousIndex() + 1, problem, problemTemplate, escaper));
+        }
+        return builder.toString();
+    }
+
+    String getProblemInfo(int index, Throwable problem, Template problemTemplate, Escaper escaper) {
+        Object origin = getOrigin(problem);
+        String[] messageLines = problem.getMessage().split("\\r?\\n");
+
+        if (origin == null) {
+            return Arrays.stream(messageLines).collect(Collectors.joining("<br>"));
+        }
+
+        String templateId = getTemplateId(origin);
+        int lineNumber = getLine(origin);
+        int lineCharacterStart = getLineCharacterStart(origin);
+
+        List<String> sourceLines = new ArrayList<>();
+        try (BufferedReader in = getBufferedReader(templateId)) {
+            String line = null;
+            while ((line = in.readLine()) != null) {
+                sourceLines.add(escaper.escape(line).replace(" ", "&nbsp;"));
+            }
+        } catch (Exception e) {
+            LOG.warn("Unable to read the template source: " + templateId, e);
+        }
+
+        List<Integer> realLines = new ArrayList<>();
+        boolean endLinesSkipped = false;
+        if (sourceLines.size() > 15) {
+            // Line with error plus few surrounding lines
+            int fromIndex = lineNumber > 7 ? (lineNumber - 8) : 0;
+            int toIndex = (lineNumber + 7) > sourceLines.size() ? sourceLines.size() : lineNumber + 7;
+            for (int j = fromIndex; j < toIndex; j++) {
+                // e.g. [10,11,12]
+                realLines.add(j + 1);
+            }
+            sourceLines = sourceLines.subList(fromIndex, toIndex);
+            endLinesSkipped = toIndex != sourceLines.size();
+        } else {
+            for (int j = 0; j < sourceLines.size(); j++) {
+                // [1,2,3]
+                realLines.add(j + 1);
+            }
+        }
+
+        return problemTemplate
+                .data("problemIndex", index)
+                .data("title", messageLines[0])
+                .data("description", Arrays.stream(messageLines).skip(1).collect(Collectors.joining("<br>")))
+                .data("sourceLines", sourceLines)
+                .data("lineNumber", lineNumber)
+                .data("lineCharacterStart", lineCharacterStart)
+                .data("realLines", realLines)
+                .data("endLinesSkipped", endLinesSkipped)
+                .data("space", " ")
+                .render();
+    }
+
+    static String htmlPadRight(String s, int n) {
+        return String.format("%-" + n + "s", s).replace(" ", "&nbsp;");
+    }
+
+    private BufferedReader getBufferedReader(String templateId) throws IOException {
+        for (Path resource : hotReplacementContext.getResourcesDir()) {
+            // src/main/resources/templates
+            Path templates = resource.resolve("templates");
+            if (Files.exists(templates)) {
+                // src/main/resources/templates/items.html
+                Path template = templates.resolve(templateId.replace("\\", "/"));
+                if (Files.exists(template)) {
+                    return Files.newBufferedReader(template);
+                }
+            }
+        }
+        throw new IllegalStateException("Template source not available");
+    }
+
+    private Object getOrigin(Throwable t) {
+        Object origin = null;
+        try {
+            Method getOrigin = t.getClass().getClassLoader().loadClass(TEMPLATE_EXCEPTION).getMethod("getOrigin");
+            origin = getOrigin.invoke(t);
+        } catch (NoSuchMethodException | SecurityException | ClassNotFoundException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException e) {
+            LOG.warn("Unable to read the origin field", e);
+        }
+        return origin;
+    }
+
+    private String getTemplateId(Object origin) {
+        String templateId = null;
+        try {
+            Method getTemplateId = origin.getClass().getClassLoader().loadClass(ORIGIN).getMethod("getTemplateId");
+            templateId = getTemplateId.invoke(origin).toString();
+        } catch (NoSuchMethodException | SecurityException | ClassNotFoundException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException e) {
+            LOG.warn("Unable to invoke the TemplateNode.Origin.getTemplateId() method", e);
+        }
+        return templateId;
+    }
+
+    private int getLine(Object origin) {
+        int line = 0;
+        try {
+            Method getLine = origin.getClass().getClassLoader().loadClass(ORIGIN).getMethod("getLine");
+            line = (int) getLine.invoke(origin);
+        } catch (NoSuchMethodException | SecurityException | ClassNotFoundException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException e) {
+            LOG.warn("Unable to invoke the TemplateNode.Origin.getLine() method", e);
+        }
+        return line;
+    }
+
+    private int getLineCharacterStart(Object origin) {
+        int lineCharacter = 0;
+        try {
+            Method getLineCharacter = origin.getClass().getClassLoader().loadClass(ORIGIN).getMethod("getLineCharacterStart");
+            lineCharacter = (int) getLineCharacter.invoke(origin);
+        } catch (NoSuchMethodException | SecurityException | ClassNotFoundException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException e) {
+            LOG.warn("Unable to invoke the TemplateNode.Origin.getLineCharacterStart() method", e);
+        }
+        return lineCharacter;
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java
index c6c02d26b7b69..8124ab958cb08 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/CollectionTemplateExtensions.java
@@ -2,12 +2,26 @@
 
 import java.util.List;
 
+import javax.enterprise.inject.Vetoed;
+
+import io.quarkus.qute.Results.Result;
 import io.quarkus.qute.TemplateExtension;
 
+@Vetoed // Make sure no bean is created from this class
 @TemplateExtension
 public class CollectionTemplateExtensions {
 
     static Object get(List<?> list, int index) {
         return list.get(index);
     }
-}
\ No newline at end of file
+
+    @TemplateExtension(matchRegex = "\\d{1,10}")
+    static Object getByIndex(List<?> list, String index) {
+        int idx = Integer.parseInt(index);
+        if (idx >= list.size()) {
+            // Be consistent with property resolvers
+            return Result.NOT_FOUND;
+        }
+        return list.get(idx);
+    }
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java
new file mode 100644
index 0000000000000..554d7a63e7406
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/ConfigTemplateExtensions.java
@@ -0,0 +1,33 @@
+package io.quarkus.qute.runtime.extensions;
+
+import static io.quarkus.qute.TemplateExtension.ANY;
+import static io.quarkus.qute.TemplateExtension.DEFAULT_PRIORITY;
+
+import java.util.Optional;
+
+import javax.enterprise.inject.Vetoed;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.qute.Results.Result;
+import io.quarkus.qute.TemplateExtension;
+
+@Vetoed // Make sure no bean is created from this class
+public class ConfigTemplateExtensions {
+
+    static final String CONFIG = "config";
+
+    // {config:foo} or {config:['bar.baz']}
+    @TemplateExtension(namespace = CONFIG, matchName = ANY)
+    static Object getConfigProperty(String propertyName) {
+        return property(propertyName);
+    }
+
+    // {config:property(foo.getPropertyName())}
+    @TemplateExtension(namespace = CONFIG, priority = DEFAULT_PRIORITY + 1)
+    static Object property(String propertyName) {
+        Optional<String> val = ConfigProvider.getConfig().getOptionalValue(propertyName, String.class);
+        return val.isPresent() ? val.get() : Result.NOT_FOUND;
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java
index d32c57099ca05..83afd7ab9725e 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/MapTemplateExtensions.java
@@ -4,9 +4,12 @@
 
 import java.util.Map;
 
+import javax.enterprise.inject.Vetoed;
+
 import io.quarkus.qute.Results.Result;
 import io.quarkus.qute.TemplateExtension;
 
+@Vetoed // Make sure no bean is created from this class
 @TemplateExtension
 public class MapTemplateExtensions {
     @SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java
index a8374e628d1e8..656366e68244c 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/NumberTemplateExtensions.java
@@ -1,7 +1,10 @@
 package io.quarkus.qute.runtime.extensions;
 
+import javax.enterprise.inject.Vetoed;
+
 import io.quarkus.qute.TemplateExtension;
 
+@Vetoed // Make sure no bean is created from this class
 @TemplateExtension
 public class NumberTemplateExtensions {
 
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java
new file mode 100644
index 0000000000000..d24d7612f12a7
--- /dev/null
+++ b/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/extensions/TimeTemplateExtensions.java
@@ -0,0 +1,127 @@
+package io.quarkus.qute.runtime.extensions;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.TemporalAccessor;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.enterprise.inject.Vetoed;
+
+import io.quarkus.qute.TemplateExtension;
+
+@Vetoed // Make sure no bean is created from this class
+@TemplateExtension
+public class TimeTemplateExtensions {
+
+    private static final Map<Key, DateTimeFormatter> FORMATTER_CACHE = new ConcurrentHashMap<>();
+
+    static String format(TemporalAccessor temporal, String pattern) {
+        return FORMATTER_CACHE.computeIfAbsent(new Key(pattern, null, null), TimeTemplateExtensions::formatterForKey)
+                .format(temporal);
+    }
+
+    static String format(TemporalAccessor temporal, String pattern, Locale locale) {
+        return FORMATTER_CACHE.computeIfAbsent(new Key(pattern, locale, null), TimeTemplateExtensions::formatterForKey)
+                .format(temporal);
+    }
+
+    static String format(TemporalAccessor temporal, String pattern, Locale locale, ZoneId timeZone) {
+        return FORMATTER_CACHE.computeIfAbsent(new Key(pattern, locale, timeZone), TimeTemplateExtensions::formatterForKey)
+                .format(temporal);
+    }
+
+    @TemplateExtension(namespace = "time")
+    static String format(Object dateTimeObject, String pattern) {
+        return format(getFormattableObject(dateTimeObject, ZoneId.systemDefault()), pattern);
+    }
+
+    @TemplateExtension(namespace = "time")
+    static String format(Object dateTimeObject, String pattern, Locale locale) {
+        return format(getFormattableObject(dateTimeObject, ZoneId.systemDefault()), pattern, locale);
+    }
+
+    @TemplateExtension(namespace = "time")
+    static String format(Object dateTimeObject, String pattern, Locale locale, ZoneId timeZone) {
+        return format(getFormattableObject(dateTimeObject, timeZone), pattern, locale, timeZone);
+    }
+
+    private static TemporalAccessor getFormattableObject(Object value,
+            ZoneId timeZone) {
+        if (value instanceof TemporalAccessor) {
+            return (TemporalAccessor) value;
+        } else if (value instanceof Date) {
+            return LocalDateTime.ofInstant(((Date) value).toInstant(),
+                    timeZone);
+        } else if (value instanceof Calendar) {
+            return LocalDateTime.ofInstant(((Calendar) value).toInstant(),
+                    timeZone);
+        } else if (value instanceof Number) {
+            return LocalDateTime.ofInstant(
+                    Instant.ofEpochMilli(((Number) value).longValue()),
+                    timeZone);
+        } else {
+            throw new IllegalArgumentException("Not a formattable date/time object: " + value);
+        }
+    }
+
+    private static DateTimeFormatter formatterForKey(Key key) {
+        DateTimeFormatter formatter;
+        DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
+        builder.appendPattern(key.pattern);
+        if (key.locale != null) {
+            formatter = builder.toFormatter(key.locale);
+        } else {
+            formatter = builder.toFormatter();
+        }
+        return key.timeZone != null ? formatter.withZone(key.timeZone) : formatter;
+    }
+
+    static final class Key {
+
+        private final String pattern;
+        private final Locale locale;
+        private final ZoneId timeZone;
+
+        public Key(String pattern, Locale locale, ZoneId timeZone) {
+            this.pattern = pattern;
+            this.locale = locale;
+            this.timeZone = timeZone;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((locale == null) ? 0 : locale.hashCode());
+            result = prime * result + ((pattern == null) ? 0 : pattern.hashCode());
+            result = prime * result + ((timeZone == null) ? 0 : timeZone.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            Key other = (Key) obj;
+            return Objects.equals(locale, other.locale) && Objects.equals(pattern, other.pattern)
+                    && Objects.equals(timeZone, other.timeZone);
+        }
+
+    }
+
+}
diff --git a/extensions/qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index dc31829fad11f..6ad09433c8c7e 100644
--- a/extensions/qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -7,4 +7,4 @@ metadata:
   guide: "https://quarkus.io/guides/qute"
   categories:
   - "miscellaneous"
-  status: "experimental"
+  status: "stable"
diff --git a/extensions/qute/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup b/extensions/qute/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
new file mode 100644
index 0000000000000..2d9eb0704bb28
--- /dev/null
+++ b/extensions/qute/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
@@ -0,0 +1 @@
+io.quarkus.qute.runtime.devmode.QuteErrorPageSetup
\ No newline at end of file
diff --git a/extensions/reactive-datasource/deployment/pom.xml b/extensions/reactive-datasource/deployment/pom.xml
index 9d134a34e2ba8..7da6cf1f211a8 100644
--- a/extensions/reactive-datasource/deployment/pom.xml
+++ b/extensions/reactive-datasource/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-reactive-datasource-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-reactive-datasource</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/reactive-datasource/deployment/src/main/java/io/quarkus/reactive/datasource/deployment/ReactiveDataSourceProcessor.java b/extensions/reactive-datasource/deployment/src/main/java/io/quarkus/reactive/datasource/deployment/ReactiveDataSourceProcessor.java
new file mode 100644
index 0000000000000..f98553171cfae
--- /dev/null
+++ b/extensions/reactive-datasource/deployment/src/main/java/io/quarkus/reactive/datasource/deployment/ReactiveDataSourceProcessor.java
@@ -0,0 +1,15 @@
+package io.quarkus.reactive.datasource.deployment;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+
+class ReactiveDataSourceProcessor {
+
+    @BuildStep
+    void addQualifierAsBean(BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        // add the @ReactiveDataSource class otherwise it won't be registered as a qualifier
+        additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(ReactiveDataSource.class).build());
+    }
+}
diff --git a/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/ConnectionPoolsClosedTest.java b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/ConnectionPoolsClosedTest.java
new file mode 100644
index 0000000000000..83c9c67ad3386
--- /dev/null
+++ b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/ConnectionPoolsClosedTest.java
@@ -0,0 +1,148 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.jupiter.api.Test;
+import org.wildfly.common.Assert;
+
+/**
+ * Regression tests for some basic sanity semantics of ThreadLocalPool
+ */
+public class ConnectionPoolsClosedTest {
+
+    /**
+     * When a thread is terminated, we don't immediately clean up
+     * any related Pool instances.
+     * But we do look for abandoned connections when we scale up again,
+     * so test for that specifically.
+     * Connections will be closed more aggressively in practice as implementors
+     * of ThreadLocalPool register a callback on close; so assuming clients
+     * actually close it and threads aren't terminated abruptly this
+     * should be unnecessary (still useful, since reality is often different).
+     */
+    @Test
+    public void connectionsFromOtherThreadsGetClosed() throws ExecutionException, InterruptedException {
+        TestableThreadLocalPool globalPool = new TestableThreadLocalPool();
+        Assert.assertTrue(globalPool.trackedSize() == 0);
+        final TestPoolInterface p1 = grabPoolFromOtherThread(globalPool);
+        Assert.assertFalse(p1.isClosed());
+        Assert.assertTrue(globalPool.trackedSize() == 1);
+        final TestPoolInterface p2 = grabPoolFromOtherThread(globalPool);
+        Assert.assertTrue(p1.isClosed());
+        Assert.assertFalse(p2.isClosed());
+        Assert.assertTrue(globalPool.trackedSize() == 1);
+        globalPool.close();
+        Assert.assertTrue(p2.isClosed());
+        Assert.assertTrue(globalPool.trackedSize() == 0);
+    }
+
+    /**
+     * This test makes sure that when the closed connection is not the last one in the list
+     * of closed connections, no exception is thrown.
+     */
+    @Test
+    public void connectionsThatAreNotTheLastGetClosedSuccessfully()
+            throws ExecutionException, InterruptedException {
+        ExecutorService e = Executors.newFixedThreadPool(3);
+        Set<Thread> threads = new HashSet<>();
+        try {
+            TestableThreadLocalPool globalPool = new TestableThreadLocalPool();
+            Assert.assertTrue(globalPool.trackedSize() == 0);
+            final TestPoolInterface p1 = grabPoolFromLongLivingThread(globalPool, e, threads);
+            Assert.assertFalse(p1.isClosed());
+            Assert.assertTrue(globalPool.trackedSize() == 1);
+            final TestPoolInterface p2 = grabPoolFromLongLivingThread(globalPool, e, threads);
+            Assert.assertFalse(p1.isClosed());
+            Assert.assertFalse(p2.isClosed());
+            Assert.assertFalse(p1.isClosed());
+            Assert.assertFalse(p2.isClosed());
+            Assert.assertTrue(globalPool.trackedSize() == 2);
+            e.shutdown();
+            while (!e.isTerminated()) {
+                Thread.sleep(1);
+            }
+            for (Thread thread : threads) {
+                waitForThreadStop(thread);
+            }
+            final TestPoolInterface p3 = grabPoolFromOtherThread(globalPool);
+            Assert.assertTrue(p1.isClosed());
+            Assert.assertTrue(p2.isClosed());
+            Assert.assertFalse(p3.isClosed());
+            Assert.assertTrue(globalPool.trackedSize() == 1);
+            globalPool.close();
+            Assert.assertTrue(p1.isClosed());
+            Assert.assertTrue(p2.isClosed());
+            Assert.assertTrue(p3.isClosed());
+            Assert.assertTrue(globalPool.trackedSize() == 0);
+        } finally {
+            e.shutdown();
+        }
+    }
+
+    /**
+     * Here we check that when explicit close of a thread-local
+     * specific pool is closed, we also de-reference it.
+     * And when closing the global pool, all thread-local
+     * specific pools are closed and de-referenced.
+     */
+    @Test
+    public void plainClose() {
+        TestableThreadLocalPool globalPool = new TestableThreadLocalPool();
+        Assert.assertTrue(globalPool.trackedSize() == 0);
+        final TestPoolInterface p1 = globalPool.pool();
+        Assert.assertTrue(globalPool.trackedSize() == 1);
+        Assert.assertFalse(p1.isClosed());
+        p1.close();
+        Assert.assertTrue(p1.isClosed());
+        Assert.assertTrue(globalPool.trackedSize() == 0);
+        final TestPoolInterface p2 = globalPool.pool();
+        Assert.assertTrue(globalPool.trackedSize() == 1);
+        Assert.assertFalse(p2.isClosed());
+        Assert.assertTrue(p1.isClosed());
+        globalPool.close();
+        Assert.assertTrue(p2.isClosed());
+        Assert.assertTrue(globalPool.trackedSize() == 0);
+    }
+
+    private TestPoolInterface grabPoolFromOtherThread(TestableThreadLocalPool globalPool)
+            throws ExecutionException, InterruptedException {
+        final ExecutorService e = Executors.newSingleThreadExecutor();
+        CompletableFuture<Thread> thread = new CompletableFuture<>();
+        final Future<TestPoolInterface> creation = e.submit(() -> {
+            thread.complete(Thread.currentThread());
+            return globalPool.pool();
+        });
+        final TestPoolInterface poolInstance = creation.get();
+        e.shutdown();
+        waitForThreadStop(thread.get());
+        return poolInstance;
+    }
+
+    private void waitForThreadStop(Thread thread) throws InterruptedException {
+        while (thread.isAlive()) {
+            //even after the pool is shutdown the thread may not actually report itself
+            //as being dead yet, which can lead to race conditions
+            //so we wait just to be sure
+            Thread.sleep(1);
+        }
+    }
+
+    private TestPoolInterface grabPoolFromLongLivingThread(TestableThreadLocalPool globalPool,
+            ExecutorService e, Set<Thread> allThreads)
+            throws InterruptedException, ExecutionException {
+        CompletableFuture<Thread> thread = new CompletableFuture<>();
+        final Future<TestPoolInterface> creation = e.submit(() -> {
+            thread.complete(Thread.currentThread());
+            return globalPool.pool();
+        });
+        allThreads.add(thread.get());
+        return creation.get();
+    }
+
+}
diff --git a/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestPool.java b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestPool.java
new file mode 100644
index 0000000000000..9d3bd5744394f
--- /dev/null
+++ b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestPool.java
@@ -0,0 +1,45 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.sqlclient.PreparedQuery;
+import io.vertx.sqlclient.Query;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.RowSet;
+import io.vertx.sqlclient.SqlConnection;
+import io.vertx.sqlclient.Transaction;
+
+class TestPool implements TestPoolInterface {
+
+    private final AtomicBoolean isClosed = new AtomicBoolean(false);
+
+    @Override
+    public void getConnection(Handler<AsyncResult<SqlConnection>> handler) {
+    }
+
+    @Override
+    public Query<RowSet<Row>> query(String s) {
+        return null;
+    }
+
+    @Override
+    public PreparedQuery<RowSet<Row>> preparedQuery(String s) {
+        return null;
+    }
+
+    @Override
+    public void begin(Handler<AsyncResult<Transaction>> handler) {
+    }
+
+    @Override
+    public void close() {
+        isClosed.set(true);
+    }
+
+    @Override
+    public boolean isClosed() {
+        return isClosed.get();
+    }
+}
diff --git a/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestPoolInterface.java b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestPoolInterface.java
new file mode 100644
index 0000000000000..e02698392d638
--- /dev/null
+++ b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestPoolInterface.java
@@ -0,0 +1,11 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import io.vertx.sqlclient.Pool;
+
+/**
+ * Having an interface here is useful to mimic the
+ * same patterns as DB2Pool, MySQLPool, PgPool, etc..
+ */
+public interface TestPoolInterface extends Pool {
+    boolean isClosed();
+}
diff --git a/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestableThreadLocalPool.java b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestableThreadLocalPool.java
new file mode 100644
index 0000000000000..6ad88bc26c768
--- /dev/null
+++ b/extensions/reactive-datasource/deployment/src/test/java/io/quarkus/reactive/datasource/runtime/TestableThreadLocalPool.java
@@ -0,0 +1,66 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.sqlclient.PreparedQuery;
+import io.vertx.sqlclient.Query;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.RowSet;
+import io.vertx.sqlclient.SqlConnection;
+import io.vertx.sqlclient.Transaction;
+
+final class TestableThreadLocalPool extends ThreadLocalPool<TestPoolInterface> {
+
+    public TestableThreadLocalPool() {
+        super(null, null);
+    }
+
+    @Override
+    protected TestPoolInterface createThreadLocalPool() {
+        return new TestPoolWrapper(new TestPool());
+    }
+
+    private class TestPoolWrapper implements TestPoolInterface {
+
+        private final TestPool delegate;
+        private boolean open = true;
+
+        private TestPoolWrapper(TestPool delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void getConnection(Handler<AsyncResult<SqlConnection>> handler) {
+            delegate.getConnection(handler);
+        }
+
+        @Override
+        public Query<RowSet<Row>> query(String s) {
+            return delegate.query(s);
+        }
+
+        @Override
+        public PreparedQuery<RowSet<Row>> preparedQuery(String s) {
+            return delegate.preparedQuery(s);
+        }
+
+        @Override
+        public void begin(Handler<AsyncResult<Transaction>> handler) {
+            delegate.begin(handler);
+        }
+
+        @Override
+        public void close() {
+            if (open) {
+                delegate.close();
+                TestableThreadLocalPool.this.removeSelfFromTracking(this);
+            }
+        }
+
+        @Override
+        public boolean isClosed() {
+            return delegate.isClosed();
+        }
+    }
+
+}
diff --git a/extensions/reactive-datasource/pom.xml b/extensions/reactive-datasource/pom.xml
index e9fb236b2a2a2..a3f6689686e06 100644
--- a/extensions/reactive-datasource/pom.xml
+++ b/extensions/reactive-datasource/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/reactive-datasource/runtime/pom.xml b/extensions/reactive-datasource/runtime/pom.xml
index e65e6d5d68862..e7af1b58563c6 100644
--- a/extensions/reactive-datasource/runtime/pom.xml
+++ b/extensions/reactive-datasource/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-reactive-datasource-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +33,12 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-core</artifactId>
         </dependency>
+        <!-- Add the health extension as optional as we will produce the health check only if it's included -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java
new file mode 100644
index 0000000000000..bc429c78993f7
--- /dev/null
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/ReactiveDataSource.java
@@ -0,0 +1,40 @@
+package io.quarkus.reactive.datasource;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+
+/**
+ * Qualifier used to specify which reactive datasource will be injected.
+ */
+@Target({ METHOD, FIELD, PARAMETER, TYPE })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface ReactiveDataSource {
+
+    String value();
+
+    public class ReactiveDataSourceLiteral extends AnnotationLiteral<ReactiveDataSource> implements ReactiveDataSource {
+
+        private String name;
+
+        public ReactiveDataSourceLiteral(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String value() {
+            return name;
+        }
+    }
+}
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveBuildTimeConfig.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveBuildTimeConfig.java
index ef5cdf23edd12..087a4c5637d28 100644
--- a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveBuildTimeConfig.java
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveBuildTimeConfig.java
@@ -1,18 +1,14 @@
 package io.quarkus.reactive.datasource.runtime;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
 
-/**
- * For now, the reactive extensions only support a default datasource.
- */
-@ConfigRoot(name = "datasource.reactive", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+@ConfigGroup
 public class DataSourceReactiveBuildTimeConfig {
 
     /**
      * If we create a Reactive datasource for this datasource.
      */
     @ConfigItem(name = ConfigItem.PARENT, defaultValue = "true")
-    public boolean enabled;
+    public boolean enabled = true;
 }
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java
index e527466abe325..5e0770fd8e643 100644
--- a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java
@@ -1,45 +1,43 @@
 package io.quarkus.reactive.datasource.runtime;
 
+import java.time.Duration;
 import java.util.Optional;
 import java.util.OptionalInt;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
 import io.quarkus.vertx.core.runtime.config.JksConfiguration;
 import io.quarkus.vertx.core.runtime.config.PemKeyCertConfiguration;
 import io.quarkus.vertx.core.runtime.config.PemTrustCertConfiguration;
 import io.quarkus.vertx.core.runtime.config.PfxConfiguration;
 
-/**
- * For now, the reactive extensions only support a default datasource.
- */
-@ConfigRoot(name = "datasource.reactive", phase = ConfigPhase.RUN_TIME)
+@ConfigGroup
 public class DataSourceReactiveRuntimeConfig {
 
     /**
      * Whether prepared statements should be cached on the client side.
      */
     @ConfigItem(defaultValue = "false")
-    public boolean cachePreparedStatements;
+    public boolean cachePreparedStatements = false;
 
     /**
      * The datasource URL.
      */
     @ConfigItem
-    public Optional<String> url;
+    public Optional<String> url = Optional.empty();
 
     /**
      * The datasource pool maximum size.
+     * Note that a separate pool instance is started for each thread using it: the size limits each individual pool instance.
      */
     @ConfigItem
-    public OptionalInt maxSize;
+    public OptionalInt maxSize = OptionalInt.empty();
 
     /**
      * Whether all server certificates should be trusted.
      */
     @ConfigItem(defaultValue = "false")
-    public boolean trustAll;
+    public boolean trustAll = false;
 
     /**
      * Trust configuration in the PEM format.
@@ -47,7 +45,7 @@ public class DataSourceReactiveRuntimeConfig {
      * When enabled, {@code #trust-certificate-jks} and {@code #trust-certificate-pfx} must be disabled.
      */
     @ConfigItem
-    public PemTrustCertConfiguration trustCertificatePem;
+    public PemTrustCertConfiguration trustCertificatePem = new PemTrustCertConfiguration();
 
     /**
      * Trust configuration in the JKS format.
@@ -55,7 +53,7 @@ public class DataSourceReactiveRuntimeConfig {
      * When enabled, {@code #trust-certificate-pem} and {@code #trust-certificate-pfx} must be disabled.
      */
     @ConfigItem
-    public JksConfiguration trustCertificateJks;
+    public JksConfiguration trustCertificateJks = new JksConfiguration();
 
     /**
      * Trust configuration in the PFX format.
@@ -63,7 +61,7 @@ public class DataSourceReactiveRuntimeConfig {
      * When enabled, {@code #trust-certificate-jks} and {@code #trust-certificate-pem} must be disabled.
      */
     @ConfigItem
-    public PfxConfiguration trustCertificatePfx;
+    public PfxConfiguration trustCertificatePfx = new PfxConfiguration();
 
     /**
      * Key/cert configuration in the PEM format.
@@ -71,7 +69,7 @@ public class DataSourceReactiveRuntimeConfig {
      * When enabled, {@code key-certificate-jks} and {@code #key-certificate-pfx} must be disabled.
      */
     @ConfigItem
-    public PemKeyCertConfiguration keyCertificatePem;
+    public PemKeyCertConfiguration keyCertificatePem = new PemKeyCertConfiguration();
 
     /**
      * Key/cert configuration in the JKS format.
@@ -79,7 +77,7 @@ public class DataSourceReactiveRuntimeConfig {
      * When enabled, {@code #key-certificate-pem} and {@code #key-certificate-pfx} must be disabled.
      */
     @ConfigItem
-    public JksConfiguration keyCertificateJks;
+    public JksConfiguration keyCertificateJks = new JksConfiguration();
 
     /**
      * Key/cert configuration in the PFX format.
@@ -87,11 +85,33 @@ public class DataSourceReactiveRuntimeConfig {
      * When enabled, {@code key-certificate-jks} and {@code #key-certificate-pem} must be disabled.
      */
     @ConfigItem
-    public PfxConfiguration keyCertificatePfx;
+    public PfxConfiguration keyCertificatePfx = new PfxConfiguration();
 
     /**
-     * Experimental: use one connection pool per thread.
+     * Deprecated: this will be removed with no replacement.
+     * We always return a threadsafe pool now, using a separate Pool instance for each Thread.
+     * 
+     * @Deprecated
      */
     @ConfigItem
-    public Optional<Boolean> threadLocal;
+    @Deprecated
+    public Optional<Boolean> threadLocal = Optional.empty();
+
+    /**
+     * The number of reconnection attempts when a pooled connection cannot be established on first try.
+     */
+    @ConfigItem(defaultValue = "0")
+    public int reconnectAttempts = 0;
+
+    /**
+     * The interval between reconnection attempts when a pooled connection cannot be established on first try.
+     */
+    @ConfigItem(defaultValue = "PT1S")
+    public Duration reconnectInterval = Duration.ofSeconds(1L);
+
+    /**
+     * The maximum time without data written to or read from a connection before it is closed.
+     */
+    @ConfigItem(defaultValueDocumentation = "no timeout")
+    public Optional<Duration> idleTimeout = Optional.empty();
 }
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveBuildTimeConfig.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveBuildTimeConfig.java
new file mode 100644
index 0000000000000..a400ba23498d3
--- /dev/null
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveBuildTimeConfig.java
@@ -0,0 +1,53 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import java.util.Map;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "datasource", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class DataSourcesReactiveBuildTimeConfig {
+
+    /**
+     * The default datasource.
+     */
+    @ConfigItem(name = "reactive")
+    public DataSourceReactiveBuildTimeConfig defaultDataSource;
+
+    /**
+     * Additional named datasources.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("datasource-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, DataSourceReactiveOuterNamedBuildTimeConfig> namedDataSources;
+
+    public DataSourceReactiveBuildTimeConfig getDataSourceReactiveBuildTimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceReactiveOuterNamedBuildTimeConfig dataSourceReactiveOuterNamedBuildTimeConfig = namedDataSources
+                .get(dataSourceName);
+        if (dataSourceReactiveOuterNamedBuildTimeConfig == null) {
+            return new DataSourceReactiveBuildTimeConfig();
+        }
+
+        return dataSourceReactiveOuterNamedBuildTimeConfig.reactive;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactiveOuterNamedBuildTimeConfig {
+
+        /**
+         * The JDBC build time configuration.
+         */
+        @ConfigItem
+        public DataSourceReactiveBuildTimeConfig reactive;
+    }
+}
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveRuntimeConfig.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveRuntimeConfig.java
new file mode 100644
index 0000000000000..5336e0ae705f2
--- /dev/null
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveRuntimeConfig.java
@@ -0,0 +1,53 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import java.util.Map;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "datasource", phase = ConfigPhase.RUN_TIME)
+public class DataSourcesReactiveRuntimeConfig {
+
+    /**
+     * The default datasource.
+     */
+    @ConfigItem(name = "reactive")
+    public DataSourceReactiveRuntimeConfig defaultDataSource;
+
+    /**
+     * Additional named datasources.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("datasource-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, DataSourceReactiveOuterNamedRuntimeConfig> namedDataSources;
+
+    public DataSourceReactiveRuntimeConfig getDataSourceReactiveRuntimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceReactiveOuterNamedRuntimeConfig dataSourceReactiveOuterNamedRuntimeConfig = namedDataSources
+                .get(dataSourceName);
+        if (dataSourceReactiveOuterNamedRuntimeConfig == null) {
+            return new DataSourceReactiveRuntimeConfig();
+        }
+
+        return dataSourceReactiveOuterNamedRuntimeConfig.reactive;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactiveOuterNamedRuntimeConfig {
+
+        /**
+         * The JDBC runtime configuration.
+         */
+        @ConfigItem
+        public DataSourceReactiveRuntimeConfig reactive;
+    }
+}
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java
new file mode 100644
index 0000000000000..7e5956e60eb36
--- /dev/null
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ReactiveDatasourceHealthCheck.java
@@ -0,0 +1,120 @@
+package io.quarkus.reactive.datasource.runtime;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
+import org.jboss.logging.Logger;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Context;
+import io.vertx.core.Vertx;
+import io.vertx.sqlclient.Pool;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.RowSet;
+
+public abstract class ReactiveDatasourceHealthCheck implements HealthCheck {
+
+    private static final Logger log = Logger.getLogger(ReactiveDatasourceHealthCheck.class);
+
+    private final Map<String, Pool> pools = new ConcurrentHashMap<>();
+    private final String healthCheckResponseName;
+    private final String healthCheckSQL;
+
+    protected ReactiveDatasourceHealthCheck(String healthCheckResponseName, String healthCheckSQL) {
+        this.healthCheckResponseName = healthCheckResponseName;
+        this.healthCheckSQL = healthCheckSQL;
+    }
+
+    protected void addPool(String name, Pool p) {
+        final Pool previous = pools.put(name, p);
+        if (previous != null) {
+            throw new IllegalStateException("Duplicate pool name: " + name);
+        }
+    }
+
+    @Override
+    public HealthCheckResponse call() {
+        HealthCheckResponseBuilder builder = HealthCheckResponse.named(healthCheckResponseName);
+        builder.up();
+
+        for (Map.Entry<String, Pool> pgPoolEntry : pools.entrySet()) {
+            final String dataSourceName = pgPoolEntry.getKey();
+            final Pool pgPool = pgPoolEntry.getValue();
+            try {
+                CompletableFuture<Void> databaseConnectionAttempt = new CompletableFuture<>();
+                Context context = Vertx.currentContext();
+                if (context != null) {
+                    log.debug("Run health check on the current Vert.x context");
+                    context.runOnContext(v -> {
+                        pgPool.query(healthCheckSQL)
+                                .execute(ar -> {
+                                    checkFailure(ar, builder, dataSourceName);
+                                    databaseConnectionAttempt.complete(null);
+                                });
+                    });
+                } else {
+                    log.warn("Vert.x context unavailable to perform healthcheck of reactive datasource `" + dataSourceName
+                            + "`. This is unlikely to work correctly.");
+                    pgPool.query(healthCheckSQL)
+                            .execute(ar -> {
+                                checkFailure(ar, builder, dataSourceName);
+                                databaseConnectionAttempt.complete(null);
+                            });
+                }
+
+                //20 seconds is rather high, but using just 10 is often not enough on slow CI
+                //systems, especially if the connections have to be established for the first time.
+                databaseConnectionAttempt.get(20, TimeUnit.SECONDS);
+                builder.withData(dataSourceName, "up");
+            } catch (RuntimeException | ExecutionException exception) {
+                operationsError(dataSourceName, exception);
+                builder.down();
+                builder.withData(dataSourceName, "down - connection failed: " + exception.getMessage());
+            } catch (InterruptedException e) {
+                log.warn("Interrupted while obtaining database connection for healthcheck of datasource " + dataSourceName);
+                Thread.currentThread().interrupt();
+                return builder.build();
+            } catch (TimeoutException e) {
+                log.warn("Timed out while waiting for an available connection to perform healthcheck of datasource "
+                        + dataSourceName);
+                builder.down();
+                builder.withData(dataSourceName, "timed out, unable to obtain connection to perform healthcheck of datasource");
+            }
+        }
+
+        return builder.build();
+    }
+
+    private void operationsError(final String datasourceName, final Throwable cause) {
+        log.warn("Error obtaining database connection for healthcheck of datasource '" + datasourceName + '\'', cause);
+    }
+
+    private void checkFailure(AsyncResult<RowSet<Row>> ar, HealthCheckResponseBuilder builder, String dataSourceName) {
+        if (ar.failed()) {
+            operationsError(dataSourceName, ar.cause());
+            builder.down();
+            builder.withData(dataSourceName, "down - connection failed: " + ar.cause().getMessage());
+        }
+    }
+
+    protected String getPoolName(Bean<?> bean) {
+        for (Object qualifier : bean.getQualifiers()) {
+            if (qualifier instanceof ReactiveDataSource) {
+                return ((ReactiveDataSource) qualifier).value();
+            }
+        }
+        return DataSourceUtil.DEFAULT_DATASOURCE_NAME;
+    }
+
+}
diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ThreadLocalPool.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ThreadLocalPool.java
index cacc1330bfc95..4474217ef2bb2 100644
--- a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ThreadLocalPool.java
+++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/ThreadLocalPool.java
@@ -1,11 +1,8 @@
 package io.quarkus.reactive.datasource.runtime;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.StampedLock;
-
-import org.jboss.logging.Logger;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
@@ -19,34 +16,87 @@
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.Transaction;
 
+/**
+ * This Pool implementation wraps the Vert.x Pool into thread-locals,
+ * as it's otherwise not thread-safe to be exposed to all the threads
+ * possibly accessing it in Quarkus.
+ * There are two main drawbacks to this approach:
+ * <p>
+ * 1# We need to track each instance stored in a ThreadLocal
+ * so to ensure we can close also the ones started in other threads.
+ * </p>
+ * <p>
+ * 2# Having the actual number of Pools determined by the number
+ * of threads requesting one makes this not honour the limit of
+ * connections to the database.
+ * </p>
+ *
+ * In particular the second limitation will need to be addressed.
+ *
+ * @param <PoolType> useful for implementations to produce typed pools
+ */
 public abstract class ThreadLocalPool<PoolType extends Pool> implements Pool {
 
-    private static final Logger log = Logger.getLogger(ThreadLocalPool.class);
+    //List of all opened pools. Access requires synchronization on the list instance.
+    private final List<PoolAndThread> allConnections = new ArrayList<>();
 
-    private final AtomicReference<ThreadLocalPoolSet> poolset = new AtomicReference<>(new ThreadLocalPoolSet());
+    //The pool instance for the current thread
+    private final ThreadLocal<PoolType> threadLocal = new ThreadLocal<>();
 
+    //Used by subclasses to create new pool instances
     protected final PoolOptions poolOptions;
+
+    //Used by subclasses to create new pool instances
     protected final Vertx vertx;
 
+    private volatile boolean closed = false;
+
     public ThreadLocalPool(Vertx vertx, PoolOptions poolOptions) {
         this.vertx = vertx;
         this.poolOptions = poolOptions;
     }
 
-    private PoolType pool() {
-        //We re-try to be nice on an extremely unlikely race condition.
-        //3 attempts should be more than enough:
-        //especially consider that if this race is triggered, then someone is trying to use the pool on shutdown,
-        //which is inherently a broken plan.
-        for (int i = 0; i < 3; i++) {
-            final ThreadLocalPoolSet currentConnections = poolset.get();
-            PoolType p = currentConnections.getPool();
-            if (p != null)
-                return p;
+    PoolType pool() {
+        checkPoolIsOpen();
+        PoolType pool = threadLocal.get();
+        if (pool == null) {
+            synchronized (allConnections) {
+                checkPoolIsOpen();
+                pool = createThreadLocalPool();
+                allConnections.add(new PoolAndThread(pool));
+                threadLocal.set(pool);
+                scanForAbandonedConnections();
+            }
+        }
+        return pool;
+    }
+
+    private final void scanForAbandonedConnections() {
+        ArrayList<PoolAndThread> garbage = new ArrayList<>();
+        for (PoolAndThread pair : allConnections) {
+            if (pair.isDead()) {
+                garbage.add(pair);
+            }
+        }
+        //This needs a second loop, as the close() operation
+        //will otherwise trigger a concurrent modification on the iterator.
+        for (PoolAndThread dead : garbage) {
+            //This might potentially close the connection a second time,
+            //so we need to ensure implementations allow it.
+            dead.close();
+        }
+    }
+
+    private void checkPoolIsOpen() {
+        if (closed) {
+            throw new IllegalStateException("This Pool has been closed");
         }
-        throw new IllegalStateException("Multiple attempts to reopen a new pool on a closed instance: aborting");
     }
 
+    /**
+     * We will need the created Pool instances to have an idempotent implementation
+     * of close()
+     */
     protected abstract PoolType createThreadLocalPool();
 
     @Override
@@ -69,82 +119,78 @@ public void begin(Handler<AsyncResult<Transaction>> handler) {
         pool().begin(handler);
     }
 
-    /**
-     * This is a bit weird because it works on all ThreadLocal pools, but it's only
-     * called from a single thread, when doing shutdown, and needs to close all the
-     * pools and reinitialise the thread local so that all newly created pools after
-     * the restart will start with an empty thread local instead of a closed one.
-     * N.B. while we take care of the pool to behave as best as we can,
-     * it's responsibility of the user of the returned pools to not use them
-     * while a close is being requested.
-     */
     @Override
     public void close() {
-        // close all the thread-local pools, then discard the current ThreadLocal pool.
-        // Atomically set a new pool to be used: useful for live-reloading.
-        final ThreadLocalPoolSet previousPool = poolset.getAndSet(new ThreadLocalPoolSet());
-        previousPool.close();
+        synchronized (allConnections) {
+            this.closed = true;
+            for (PoolAndThread pair : allConnections) {
+                pair.close();
+            }
+            allConnections.clear();
+            threadLocal.remove();
+        }
     }
 
-    private class ThreadLocalPoolSet {
-        final List<Pool> threadLocalPools = new ArrayList<>();
-        final ThreadLocal<PoolType> threadLocal = new ThreadLocal<>();
-        final StampedLock stampedLock = new StampedLock();
-        boolean isOpen = true;
-
-        public PoolType getPool() {
-            final long optimisticRead = stampedLock.tryOptimisticRead();
-            if (isOpen == false) {
-                //Let the caller re-try on a different instance
-                return null;
-            }
-            PoolType ret = threadLocal.get();
-            if (ret != null) {
-                if (stampedLock.validate(optimisticRead)) {
-                    return ret;
-                } else {
-                    //On invalid optimisticRead stamp, it means this pool instance was closed:
-                    //let the caller re-try on a different instance
-                    return null;
-                }
-            } else {
-                //Now acquire an exclusive readlock:
-                final long readLock = stampedLock.tryConvertToReadLock(optimisticRead);
-                //Again, on failure the pool was closed, return null in such case.
-                if (readLock == 0)
-                    return null;
-                //else, we own the exclusive read lock and can now enter our slow path:
-                try {
-                    log.debugf("Making pool for thread: %s", Thread.currentThread());
-                    ret = createThreadLocalPool();
-                    synchronized (threadLocalPools) {
-                        threadLocalPools.add(ret);
-                    }
-                    threadLocal.set(ret);
-                    return ret;
-                } finally {
-                    stampedLock.unlockRead(readLock);
-                }
-            }
+    //Useful for testing mostly
+    public int trackedSize() {
+        synchronized (allConnections) {
+            return allConnections.size();
         }
+    }
 
-        public void close() {
-            final long lock = stampedLock.writeLock();
-            try {
-                isOpen = false;
-                //While this synchronized block might take a while as we have to close all
-                //pool instances, it shouldn't block the getPool method as contention is
-                //prevented by the exclusive stamped lock.
-                synchronized (threadLocalPools) {
-                    for (Pool pool : threadLocalPools) {
-                        log.debugf("Closing pool: %s", pool);
-                        pool.close();
+    /**
+     * Removes references to the instance without closing it.
+     * This assumes the instance was created via this pool
+     * and that it's now closed, so no longer needing tracking.
+     * 
+     * @param instance
+     */
+    protected void removeSelfFromTracking(final PoolType instance) {
+        synchronized (allConnections) {
+            if (closed)
+                return;
+            for (PoolAndThread pair : allConnections) {
+                if (pair.pool == instance) {
+                    allConnections.remove(pair);
+                    if (pair.isCurrentThread()) {
+                        threadLocal.remove();
                     }
+                    return;
                 }
-            } finally {
-                stampedLock.unlockWrite(lock);
             }
         }
     }
 
+    private static class PoolAndThread {
+        private final Pool pool;
+        private final WeakReference<Thread> threadReference;
+
+        private PoolAndThread(Pool pool) {
+            this.pool = pool;
+            this.threadReference = new WeakReference<>(Thread.currentThread());
+        }
+
+        /**
+         * @return true if this pools is associated to a Thread which is no longer alive.
+         */
+        boolean isDead() {
+            final Thread thread = threadReference.get();
+            return thread == null || (!thread.isAlive());
+        }
+
+        /**
+         * Closes the connection
+         */
+        void close() {
+            pool.close();
+        }
+
+        /**
+         * @return if this is the pair referring to the current Thread
+         */
+        public boolean isCurrentThread() {
+            return threadReference.get() == Thread.currentThread();
+        }
+    }
+
 }
diff --git a/extensions/reactive-db2-client/deployment/pom.xml b/extensions/reactive-db2-client/deployment/pom.xml
index 6093cdcc5a72b..928907201aa0b 100644
--- a/extensions/reactive-db2-client/deployment/pom.xml
+++ b/extensions/reactive-db2-client/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-reactive-db2-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-db2-client-deployment</artifactId>
diff --git a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/DB2PoolBuildItem.java b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/DB2PoolBuildItem.java
index 36394622ede50..95b5c18a89872 100644
--- a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/DB2PoolBuildItem.java
+++ b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/DB2PoolBuildItem.java
@@ -1,19 +1,31 @@
 package io.quarkus.reactive.db2.client.deployment;
 
-import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.RuntimeValue;
 import io.vertx.db2client.DB2Pool;
 
-public final class DB2PoolBuildItem extends SimpleBuildItem {
+public final class DB2PoolBuildItem extends MultiBuildItem {
+
+    private final String dataSourceName;
 
     private final RuntimeValue<DB2Pool> db2Pool;
 
-    public DB2PoolBuildItem(RuntimeValue<DB2Pool> db2Pool) {
+    public DB2PoolBuildItem(String dataSourceName, RuntimeValue<DB2Pool> db2Pool) {
+        this.dataSourceName = dataSourceName;
         this.db2Pool = db2Pool;
     }
 
+    public String getDataSourceName() {
+        return dataSourceName;
+    }
+
     public RuntimeValue<DB2Pool> getDB2Pool() {
         return db2Pool;
     }
 
+    public boolean isDefault() {
+        return DataSourceUtil.isDefault(dataSourceName);
+    }
+
 }
diff --git a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java
index 92d3fe7e0c684..3d882b0cbaf7a 100644
--- a/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java
+++ b/extensions/reactive-db2-client/deployment/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java
@@ -1,10 +1,17 @@
 package io.quarkus.reactive.db2.client.deployment;
 
-import javax.inject.Singleton;
+import java.util.List;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem.ExtendedBeanConfigurator;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
 import io.quarkus.deployment.Feature;
@@ -16,12 +23,14 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
 import io.quarkus.reactive.datasource.deployment.VertxPoolBuildItem;
 import io.quarkus.reactive.datasource.runtime.DataSourceReactiveBuildTimeConfig;
-import io.quarkus.reactive.datasource.runtime.DataSourceReactiveRuntimeConfig;
-import io.quarkus.reactive.db2.client.runtime.DB2PoolProducer;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveBuildTimeConfig;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveRuntimeConfig;
 import io.quarkus.reactive.db2.client.runtime.DB2PoolRecorder;
-import io.quarkus.reactive.db2.client.runtime.DataSourceReactiveDB2Config;
+import io.quarkus.reactive.db2.client.runtime.DataSourcesReactiveDB2Config;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
 import io.quarkus.vertx.deployment.VertxBuildItem;
@@ -30,11 +39,6 @@
 
 class ReactiveDB2ClientProcessor {
 
-    @BuildStep
-    AdditionalBeanBuildItem registerBean() {
-        return AdditionalBeanBuildItem.unremovableOf(DB2PoolProducer.class);
-    }
-
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature,
@@ -42,46 +46,160 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature,
             BuildProducer<VertxPoolBuildItem> vertxPool,
             DB2PoolRecorder recorder,
             VertxBuildItem vertx,
-            BuildProducer<SyntheticBeanBuildItem> syntheticBeans, ShutdownContextBuildItem shutdown,
+            ShutdownContextBuildItem shutdown,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport,
             DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
-            DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig,
-            DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
-            DataSourceReactiveDB2Config dataSourceReactiveDB2Config) {
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactiveDB2Config dataSourcesReactiveDB2Config,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
 
         feature.produce(new FeatureBuildItem(Feature.REACTIVE_DB2_CLIENT));
-        // Make sure the DB2PoolProducer is initialized before the StartupEvent is fired
-        ServiceStartBuildItem serviceStart = new ServiceStartBuildItem("reactive-db2-client");
-
-        // Note: we had to tweak that logic to support the legacy configuration
-        if (dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()
-                && (!DatabaseKind.isDB2(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get())
-                        || !dataSourceReactiveBuildTimeConfig.enabled)) {
-            return serviceStart;
-        }
 
-        RuntimeValue<DB2Pool> db2PoolValue = recorder.configureDB2Pool(vertx.getVertx(),
-                dataSourcesRuntimeConfig, dataSourceReactiveRuntimeConfig, dataSourceReactiveDB2Config,
-                shutdown);
-        db2Pool.produce(new DB2PoolBuildItem(db2PoolValue));
+        createPoolIfDefined(recorder, vertx, shutdown, db2Pool, vertxPool, syntheticBeans,
+                DataSourceUtil.DEFAULT_DATASOURCE_NAME, dataSourcesBuildTimeConfig,
+                dataSourcesRuntimeConfig, dataSourcesReactiveBuildTimeConfig, dataSourcesReactiveRuntimeConfig,
+                dataSourcesReactiveDB2Config, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
 
-        // Synthetic bean for DB2Pool
-        syntheticBeans.produce(SyntheticBeanBuildItem.configure(DB2Pool.class).addType(Pool.class).scope(Singleton.class)
-                .runtimeValue(db2PoolValue)
-                .setRuntimeInit().done());
-
-        boolean isDefault = true; // assume always the default pool for now
-        vertxPool.produce(new VertxPoolBuildItem(db2PoolValue, DatabaseKind.DB2, isDefault));
+        for (String dataSourceName : dataSourcesBuildTimeConfig.namedDataSources.keySet()) {
+            createPoolIfDefined(recorder, vertx, shutdown, db2Pool, vertxPool, syntheticBeans, dataSourceName,
+                    dataSourcesBuildTimeConfig, dataSourcesRuntimeConfig, dataSourcesReactiveBuildTimeConfig,
+                    dataSourcesReactiveRuntimeConfig, dataSourcesReactiveDB2Config, defaultDataSourceDbKindBuildItems,
+                    curateOutcomeBuildItem);
+        }
 
         // Enable SSL support by default
         sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.REACTIVE_DB2_CLIENT));
 
-        return serviceStart;
+        return new ServiceStartBuildItem("reactive-db2-client");
     }
 
+    /**
+     * The health check needs to be produced in a separate method to avoid a circular dependency (the Vert.x instance creation
+     * consumes the AdditionalBeanBuildItems).
+     */
     @BuildStep
-    HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig) {
-        return new HealthBuildItem("io.quarkus.reactive.db2.client.runtime.health.ReactiveDB2DataSourceHealthCheck",
-                dataSourcesBuildTimeConfig.healthEnabled);
+    void addHealthCheck(
+            BuildProducer<HealthBuildItem> healthChecks,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (!hasPools(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig, defaultDataSourceDbKindBuildItems,
+                curateOutcomeBuildItem)) {
+            return;
+        }
+
+        healthChecks.produce(
+                new HealthBuildItem("io.quarkus.reactive.db2.client.runtime.health.ReactiveDB2DataSourcesHealthCheck",
+                        dataSourcesBuildTimeConfig.healthEnabled));
+    }
+
+    private void createPoolIfDefined(DB2PoolRecorder recorder,
+            VertxBuildItem vertx,
+            ShutdownContextBuildItem shutdown,
+            BuildProducer<DB2PoolBuildItem> db2Pool,
+            BuildProducer<VertxPoolBuildItem> vertxPool,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
+            String dataSourceName,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactiveDB2Config dataSourcesReactiveDB2Config,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+
+        if (!isReactiveDB2PoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig, dataSourceName,
+                defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+            return;
+        }
+
+        RuntimeValue<DB2Pool> pool = recorder.configureDB2Pool(vertx.getVertx(),
+                dataSourceName,
+                dataSourcesRuntimeConfig,
+                dataSourcesReactiveRuntimeConfig,
+                dataSourcesReactiveDB2Config,
+                shutdown);
+        db2Pool.produce(new DB2PoolBuildItem(dataSourceName, pool));
+
+        ExtendedBeanConfigurator db2PoolBeanConfigurator = SyntheticBeanBuildItem.configure(DB2Pool.class)
+                .defaultBean()
+                .addType(Pool.class)
+                .scope(ApplicationScoped.class)
+                .runtimeValue(pool)
+                .unremovable()
+                .setRuntimeInit();
+
+        addQualifiers(db2PoolBeanConfigurator, dataSourceName);
+
+        syntheticBeans.produce(db2PoolBeanConfigurator.done());
+
+        ExtendedBeanConfigurator mutinyDB2PoolConfigurator = SyntheticBeanBuildItem
+                .configure(io.vertx.mutiny.db2client.DB2Pool.class)
+                .defaultBean()
+                .scope(ApplicationScoped.class)
+                .runtimeValue(recorder.mutinyDB2Pool(pool))
+                .setRuntimeInit();
+
+        addQualifiers(mutinyDB2PoolConfigurator, dataSourceName);
+
+        syntheticBeans.produce(mutinyDB2PoolConfigurator.done());
+
+        vertxPool.produce(new VertxPoolBuildItem(pool, DatabaseKind.DB2, DataSourceUtil.isDefault(dataSourceName)));
+    }
+
+    private static boolean isReactiveDB2PoolDefined(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig, String dataSourceName,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
+                .getDataSourceRuntimeConfig(dataSourceName);
+        DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
+                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+
+        Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind,
+                defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
+        if (!dbKind.isPresent()) {
+            return false;
+        }
+
+        if (!DatabaseKind.isDB2(dbKind.get())
+                || !dataSourceReactiveBuildTimeConfig.enabled) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean hasPools(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (isReactiveDB2PoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig,
+                DataSourceUtil.DEFAULT_DATASOURCE_NAME, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+            return true;
+        }
+
+        for (String dataSourceName : dataSourcesBuildTimeConfig.namedDataSources.keySet()) {
+            if (isReactiveDB2PoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig,
+                    dataSourceName, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static void addQualifiers(ExtendedBeanConfigurator configurator, String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            configurator.addQualifier(DotNames.DEFAULT);
+        } else {
+            configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", dataSourceName).done();
+            configurator.addQualifier().annotation(ReactiveDataSource.class).addValue("value", dataSourceName)
+                    .done();
+        }
     }
 }
diff --git a/extensions/reactive-db2-client/pom.xml b/extensions/reactive-db2-client/pom.xml
index ac425d3ac5a78..0dd54906622bc 100644
--- a/extensions/reactive-db2-client/pom.xml
+++ b/extensions/reactive-db2-client/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-db2-client-parent</artifactId>
diff --git a/extensions/reactive-db2-client/runtime/pom.xml b/extensions/reactive-db2-client/runtime/pom.xml
index c98c3b385c6c1..599602810dc2e 100644
--- a/extensions/reactive-db2-client/runtime/pom.xml
+++ b/extensions/reactive-db2-client/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-reactive-db2-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-db2-client</artifactId>
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java
deleted file mode 100644
index 7b0734a051680..0000000000000
--- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.reactive.db2.client.runtime;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.vertx.db2client.DB2Pool;
-
-@ApplicationScoped
-public class DB2PoolProducer {
-
-    @Inject
-    DB2Pool db2Pool;
-
-    /**
-     * @return the <em>mutiny</em> DB2 Pool instance. The instance is created lazily.
-     */
-    @Singleton
-    @Produces
-    public io.vertx.mutiny.db2client.DB2Pool mutinyDB2Pool() {
-        return io.vertx.mutiny.db2client.DB2Pool.newInstance(db2Pool);
-    }
-}
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java
index 8cff95546c55e..2063f9fa06a6f 100644
--- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java
+++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java
@@ -10,6 +10,7 @@
 import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxTrustOptions;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.jboss.logging.Logger;
 
@@ -18,6 +19,7 @@
 import io.quarkus.datasource.runtime.DataSourceRuntimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
 import io.quarkus.reactive.datasource.runtime.DataSourceReactiveRuntimeConfig;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveRuntimeConfig;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
@@ -32,17 +34,23 @@ public class DB2PoolRecorder {
     private static final Logger log = Logger.getLogger(DB2PoolRecorder.class);
 
     public RuntimeValue<DB2Pool> configureDB2Pool(RuntimeValue<Vertx> vertx,
+            String dataSourceName,
             DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
-            DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
-            DataSourceReactiveDB2Config dataSourceReactiveDB2Config,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactiveDB2Config dataSourcesReactiveDB2Config,
             ShutdownContext shutdown) {
 
-        DB2Pool pool = initialize(vertx.getValue(), dataSourcesRuntimeConfig.defaultDataSource,
-                dataSourceReactiveRuntimeConfig,
-                dataSourceReactiveDB2Config);
+        DB2Pool db2Pool = initialize(vertx.getValue(),
+                dataSourcesRuntimeConfig.getDataSourceRuntimeConfig(dataSourceName),
+                dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                dataSourcesReactiveDB2Config.getDataSourceReactiveRuntimeConfig(dataSourceName));
 
-        shutdown.addShutdownTask(pool::close);
-        return new RuntimeValue<>(pool);
+        shutdown.addShutdownTask(db2Pool::close);
+        return new RuntimeValue<>(db2Pool);
+    }
+
+    public RuntimeValue<io.vertx.mutiny.db2client.DB2Pool> mutinyDB2Pool(RuntimeValue<DB2Pool> db2Pool) {
+        return new RuntimeValue<>(io.vertx.mutiny.db2client.DB2Pool.newInstance(db2Pool.getValue()));
     }
 
     private DB2Pool initialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntimeConfig,
@@ -52,11 +60,11 @@ private DB2Pool initialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntim
                 dataSourceReactiveDB2Config);
         DB2ConnectOptions connectOptions = toConnectOptions(dataSourceRuntimeConfig, dataSourceReactiveRuntimeConfig,
                 dataSourceReactiveDB2Config);
-        if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent() &&
-                dataSourceReactiveRuntimeConfig.threadLocal.get()) {
-            return new ThreadLocalDB2Pool(vertx, connectOptions, poolOptions);
+        if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) {
+            log.warn(
+                    "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now.");
         }
-        return DB2Pool.pool(vertx, connectOptions, poolOptions);
+        return new ThreadLocalDB2Pool(vertx, connectOptions, poolOptions);
     }
 
     private PoolOptions toPoolOptions(DataSourceRuntimeConfig dataSourceRuntimeConfig,
@@ -132,6 +140,15 @@ private DB2ConnectOptions toConnectOptions(DataSourceRuntimeConfig dataSourceRun
         configureJksKeyCertOptions(connectOptions, dataSourceReactiveRuntimeConfig.keyCertificateJks);
         configurePfxKeyCertOptions(connectOptions, dataSourceReactiveRuntimeConfig.keyCertificatePfx);
 
+        connectOptions.setReconnectAttempts(dataSourceReactiveRuntimeConfig.reconnectAttempts);
+
+        connectOptions.setReconnectInterval(dataSourceReactiveRuntimeConfig.reconnectInterval.toMillis());
+
+        if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) {
+            int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis());
+            connectOptions.setIdleTimeout(idleTimeout).setIdleTimeoutUnit(TimeUnit.MILLISECONDS);
+        }
+
         return connectOptions;
     }
 }
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java
index b14665b7cca72..c2d4f018eea4b 100644
--- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java
+++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java
@@ -2,26 +2,25 @@
 
 import java.util.Optional;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
 
-@ConfigRoot(name = "datasource.reactive.db2", phase = ConfigPhase.RUN_TIME)
+@ConfigGroup
 public class DataSourceReactiveDB2Config {
 
     /**
      * Whether prepared statements should be cached on the client side.
-     * 
+     *
      * @deprecated use {@code datasource.reactive.cache-prepared-statements} instead.
      */
     @ConfigItem
     @Deprecated
-    public Optional<Boolean> cachePreparedStatements;
+    public Optional<Boolean> cachePreparedStatements = Optional.empty();
 
     /**
      * Whether SSL/TLS is enabled.
      */
     @ConfigItem(defaultValue = "false")
-    public boolean ssl;
+    public boolean ssl = false;
 
 }
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourcesReactiveDB2Config.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourcesReactiveDB2Config.java
new file mode 100644
index 0000000000000..669b1f2047ccb
--- /dev/null
+++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourcesReactiveDB2Config.java
@@ -0,0 +1,62 @@
+package io.quarkus.reactive.db2.client.runtime;
+
+import java.util.Map;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "datasource", phase = ConfigPhase.RUN_TIME)
+public class DataSourcesReactiveDB2Config {
+
+    /**
+     * The default datasource.
+     */
+    @ConfigItem(name = "reactive.db2")
+    public DataSourceReactiveDB2Config defaultDataSource;
+
+    /**
+     * Additional named datasources.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("datasource-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, DataSourceReactiveDB2OuterNamedConfig> namedDataSources;
+
+    public DataSourceReactiveDB2Config getDataSourceReactiveRuntimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceReactiveDB2OuterNamedConfig dataSourceReactiveDB2OuterNamedConfig = namedDataSources
+                .get(dataSourceName);
+        if (dataSourceReactiveDB2OuterNamedConfig == null) {
+            return new DataSourceReactiveDB2Config();
+        }
+
+        return dataSourceReactiveDB2OuterNamedConfig.reactive.db2;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactiveDB2OuterNamedConfig {
+
+        /**
+         * The DB2-specific configuration.
+         */
+        public DataSourceReactiveDB2OuterNestedNamedConfig reactive;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactiveDB2OuterNestedNamedConfig {
+
+        /**
+         * The DB2-specific configuration.
+         */
+        public DataSourceReactiveDB2Config db2;
+    }
+
+}
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/ThreadLocalDB2Pool.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/ThreadLocalDB2Pool.java
index a9b6b6fd6ef24..9984ae73e6dd1 100644
--- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/ThreadLocalDB2Pool.java
+++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/ThreadLocalDB2Pool.java
@@ -1,10 +1,18 @@
 package io.quarkus.reactive.db2.client.runtime;
 
 import io.quarkus.reactive.datasource.runtime.ThreadLocalPool;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.db2client.DB2Pool;
 import io.vertx.sqlclient.PoolOptions;
+import io.vertx.sqlclient.PreparedQuery;
+import io.vertx.sqlclient.Query;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.RowSet;
+import io.vertx.sqlclient.SqlConnection;
+import io.vertx.sqlclient.Transaction;
 
 public class ThreadLocalDB2Pool extends ThreadLocalPool<DB2Pool> implements DB2Pool {
 
@@ -17,6 +25,44 @@ public ThreadLocalDB2Pool(Vertx vertx, DB2ConnectOptions db2ConnectOptions, Pool
 
     @Override
     protected DB2Pool createThreadLocalPool() {
-        return DB2Pool.pool(vertx, db2ConnectOptions, poolOptions);
+        return new DB2PoolWrapper(DB2Pool.pool(vertx, db2ConnectOptions, poolOptions));
+    }
+
+    private class DB2PoolWrapper implements DB2Pool {
+
+        private final DB2Pool delegate;
+        private boolean open = true;
+
+        private DB2PoolWrapper(DB2Pool delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void getConnection(Handler<AsyncResult<SqlConnection>> handler) {
+            delegate.getConnection(handler);
+        }
+
+        @Override
+        public Query<RowSet<Row>> query(String s) {
+            return delegate.query(s);
+        }
+
+        @Override
+        public PreparedQuery<RowSet<Row>> preparedQuery(String s) {
+            return delegate.preparedQuery(s);
+        }
+
+        @Override
+        public void begin(Handler<AsyncResult<Transaction>> handler) {
+            delegate.begin(handler);
+        }
+
+        @Override
+        public void close() {
+            if (open) {
+                delegate.close();
+                ThreadLocalDB2Pool.this.removeSelfFromTracking(this);
+            }
+        }
     }
 }
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourceHealthCheck.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourceHealthCheck.java
deleted file mode 100644
index b1871ab3b4e4c..0000000000000
--- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourceHealthCheck.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.quarkus.reactive.db2.client.runtime.health;
-
-import java.time.Duration;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.eclipse.microprofile.health.HealthCheck;
-import org.eclipse.microprofile.health.HealthCheckResponse;
-import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
-import org.eclipse.microprofile.health.Readiness;
-
-import io.vertx.mutiny.db2client.DB2Pool;
-
-@Readiness
-@ApplicationScoped
-public class ReactiveDB2DataSourceHealthCheck implements HealthCheck {
-
-    @Inject
-    DB2Pool db2Pool;
-
-    @Override
-    public HealthCheckResponse call() {
-        HealthCheckResponseBuilder builder = HealthCheckResponse.named("Reactive DB2 connection health check").up();
-
-        try {
-            db2Pool.query("SELECT 1 FROM SYSIBM.SYSDUMMY1")
-                    .execute()
-                    .await().atMost(Duration.ofSeconds(10));
-        } catch (Exception exception) {
-            builder.down();
-        }
-
-        return builder.build();
-    }
-}
diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java
new file mode 100644
index 0000000000000..b6ca074c3956e
--- /dev/null
+++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/health/ReactiveDB2DataSourcesHealthCheck.java
@@ -0,0 +1,71 @@
+package io.quarkus.reactive.db2.client.runtime.health;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.spi.Bean;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
+import org.eclipse.microprofile.health.Readiness;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+import io.vertx.mutiny.db2client.DB2Pool;
+
+@Readiness
+@ApplicationScoped
+/**
+ * Implementation note: this healthcheck doesn't extend ReactiveDatasourceHealthCheck
+ * as a DB2Pool is based on Mutiny: does not extend io.vertx.sqlclient.Pool
+ */
+class ReactiveDB2DataSourcesHealthCheck implements HealthCheck {
+
+    private Map<String, DB2Pool> db2Pools = new HashMap<>();
+
+    @PostConstruct
+    protected void init() {
+        for (InstanceHandle<DB2Pool> handle : Arc.container().select(DB2Pool.class, Any.Literal.INSTANCE).handles()) {
+            db2Pools.put(getDB2PoolName(handle.getBean()), handle.get());
+        }
+    }
+
+    @Override
+    public HealthCheckResponse call() {
+        HealthCheckResponseBuilder builder = HealthCheckResponse.named("Reactive DB2 connections health check");
+        builder.up();
+
+        for (Entry<String, DB2Pool> db2PoolEntry : db2Pools.entrySet()) {
+            String dataSourceName = db2PoolEntry.getKey();
+            DB2Pool db2Pool = db2PoolEntry.getValue();
+            try {
+                db2Pool.query("SELECT 1 FROM SYSIBM.SYSDUMMY1")
+                        .execute()
+                        .await().atMost(Duration.ofSeconds(10));
+                builder.withData(dataSourceName, "up");
+            } catch (Exception exception) {
+                builder.down();
+                builder.withData(dataSourceName, "down - connection failed: " + exception.getMessage());
+            }
+        }
+
+        return builder.build();
+    }
+
+    private String getDB2PoolName(Bean<?> bean) {
+        for (Object qualifier : bean.getQualifiers()) {
+            if (qualifier instanceof ReactiveDataSource) {
+                return ((ReactiveDataSource) qualifier).value();
+            }
+        }
+        return DataSourceUtil.DEFAULT_DATASOURCE_NAME;
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/pom.xml b/extensions/reactive-messaging-http/deployment/pom.xml
new file mode 100644
index 0000000000000..c35d3e194f3a2
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-reactive-messaging-http-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+  <artifactId>quarkus-reactive-messaging-http-deployment</artifactId>
+  <name>Quarkus - SmallRye Reactive Messaging - HTTP and WebSockets - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-messaging-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/reactive-messaging-http/deployment/src/main/java/io/quarkus/reactivemessaging/http/deployment/ReactiveHttpProcessor.java b/extensions/reactive-messaging-http/deployment/src/main/java/io/quarkus/reactivemessaging/http/deployment/ReactiveHttpProcessor.java
new file mode 100644
index 0000000000000..026a6543c8a87
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/main/java/io/quarkus/reactivemessaging/http/deployment/ReactiveHttpProcessor.java
@@ -0,0 +1,205 @@
+package io.quarkus.reactivemessaging.http.deployment;
+
+import static io.quarkus.arc.processor.DotNames.OBJECT;
+import static io.quarkus.arc.processor.DotNames.STRING;
+import static java.util.Arrays.asList;
+
+import java.lang.reflect.Modifier;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.streams.operators.ProcessorBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.reactivestreams.Processor;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.reactivemessaging.http.runtime.QuarkusHttpConnector;
+import io.quarkus.reactivemessaging.http.runtime.QuarkusWebSocketConnector;
+import io.quarkus.reactivemessaging.http.runtime.ReactiveHttpHandlerBean;
+import io.quarkus.reactivemessaging.http.runtime.ReactiveHttpRecorder;
+import io.quarkus.reactivemessaging.http.runtime.ReactiveWebSocketHandlerBean;
+import io.quarkus.reactivemessaging.http.runtime.config.HttpStreamConfig;
+import io.quarkus.reactivemessaging.http.runtime.config.ReactiveHttpConfig;
+import io.quarkus.reactivemessaging.http.runtime.config.WebSocketStreamConfig;
+import io.quarkus.reactivemessaging.http.runtime.converters.JsonArrayConverter;
+import io.quarkus.reactivemessaging.http.runtime.converters.JsonObjectConverter;
+import io.quarkus.reactivemessaging.http.runtime.converters.ObjectConverter;
+import io.quarkus.reactivemessaging.http.runtime.converters.StringConverter;
+import io.quarkus.reactivemessaging.http.runtime.serializers.Serializer;
+import io.quarkus.reactivemessaging.http.runtime.serializers.SerializerFactoryBase;
+import io.quarkus.vertx.http.deployment.BodyHandlerBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.smallrye.mutiny.Multi;
+import io.vertx.core.Handler;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+public class ReactiveHttpProcessor {
+
+    private static final DotName JSON_ARRAY = DotName.createSimple(JsonArray.class.getName());
+    private static final DotName JSON_OBJECT = DotName.createSimple(JsonObject.class.getName());
+    private static final DotName MESSAGE = DotName.createSimple(Message.class.getName());
+    private static final DotName MULTI = DotName.createSimple(Multi.class.getName());
+    private static final DotName PROCESSOR = DotName.createSimple(Processor.class.getName());
+    private static final DotName PROCESSOR_BUILDER = DotName.createSimple(ProcessorBuilder.class.getName());
+    private static final DotName PUBLISHER = DotName.createSimple(Publisher.class.getName());
+    private static final DotName PUBLISHER_BUILDER = DotName.createSimple(PublisherBuilder.class.getName());
+    private static final DotName SUBSCRIBER = DotName.createSimple(Subscriber.class.getName());
+    private static final DotName SUBSCRIBER_BUILDER = DotName.createSimple(SubscriberBuilder.class.getName());
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void registerHttpConnector(BuildProducer<AdditionalBeanBuildItem> beanProducer,
+            BuildProducer<GeneratedBeanBuildItem> generatedBeanProducer,
+            BuildProducer<RouteBuildItem> routeProducer,
+            BodyHandlerBuildItem bodyHandler,
+            ReactiveHttpRecorder recorder) {
+        beanProducer.produce(new AdditionalBeanBuildItem(QuarkusHttpConnector.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(QuarkusWebSocketConnector.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(ReactiveHttpConfig.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(ReactiveHttpHandlerBean.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(ReactiveWebSocketHandlerBean.class));
+
+        beanProducer.produce(new AdditionalBeanBuildItem(JsonArrayConverter.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(JsonObjectConverter.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(ObjectConverter.class));
+        beanProducer.produce(new AdditionalBeanBuildItem(StringConverter.class));
+
+        List<HttpStreamConfig> httpConfigs = ReactiveHttpConfig.readIncomingHttpConfigs();
+        List<WebSocketStreamConfig> wsConfigs = ReactiveHttpConfig.readIncomingWebSocketConfigs();
+
+        if (!httpConfigs.isEmpty()) {
+            Handler<RoutingContext> handler = recorder.createHttpHandler();
+
+            httpConfigs.stream()
+                    .map(HttpStreamConfig::path)
+                    .distinct()
+                    .forEach(path -> {
+                        routeProducer.produce(new RouteBuildItem(path, bodyHandler.getHandler()));
+                        routeProducer.produce(new RouteBuildItem(path, handler));
+                    });
+        }
+        if (!wsConfigs.isEmpty()) {
+            Handler<RoutingContext> handler = recorder.createWebSocketeHandler();
+
+            wsConfigs.stream()
+                    .map(WebSocketStreamConfig::path)
+                    .distinct()
+                    .forEach(path -> routeProducer.produce(new RouteBuildItem(path, handler)));
+        }
+
+        initSerializers(ReactiveHttpConfig.readSerializers(), generatedBeanProducer);
+    }
+
+    @BuildStep
+    void registerMessagePayloadClassesForReflection(BeanArchiveIndexBuildItem index,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+
+        Set<String> payloadClasses = new HashSet<>();
+        for (AnnotationInstance incoming : index.getIndex().getAnnotations(DotName.createSimple(Incoming.class.getName()))) {
+            MethodInfo methodInfo = incoming.target().asMethod();
+            List<Type> parameters = methodInfo.parameters();
+
+            if (parameters.size() == 1) {
+                Type type = parameters.get(0);
+                // payload can be consumed as Publisher[Builder]<PayloadObject> or Publisher[Builder]<Message<PayloadObject>>
+                // or Multi<PayloadObject>, Multi<Message<PayloadObject>>
+                DotName typeName = type.name();
+                if (type.kind() == Type.Kind.PARAMETERIZED_TYPE
+                        && (typeName.equals(PUBLISHER_BUILDER) || typeName.equals(PUBLISHER) || typeName.equals(MULTI))) {
+                    List<Type> arguments = type.asParameterizedType().arguments();
+                    if (arguments.size() > 0) {
+                        collectPayloadType(payloadClasses, arguments.get(0));
+                    }
+                } else {
+                    collectPayloadType(payloadClasses, type);
+                }
+            } else if (parameters.size() == 0) {
+                // @Incoming method can also return a Subscriber[Builder] or Processor[Builder] for message payloads:
+                Type returnType = methodInfo.returnType();
+                if ((returnType.name().equals(SUBSCRIBER_BUILDER)
+                        || returnType.name().equals(PROCESSOR_BUILDER)
+                        || returnType.name().equals(SUBSCRIBER)
+                        || returnType.name().equals(PROCESSOR))
+                        && returnType.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+                    ParameterizedType parameterizedType = returnType.asParameterizedType();
+                    List<Type> arguments = parameterizedType.arguments();
+                    if (arguments.size() > 0) {
+                        collectPayloadType(payloadClasses, arguments.get(0));
+                    }
+                }
+            }
+        }
+
+        payloadClasses.removeAll(asList(JSON_OBJECT.toString(), OBJECT.toString(), JSON_ARRAY.toString(), STRING.toString()));
+
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, payloadClasses.toArray(new String[] {})));
+    }
+
+    private void collectPayloadType(Set<String> payloadClasses, Type type) {
+        if (type.kind() != Type.Kind.CLASS && type.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+            return;
+        }
+        if (type.name().equals(MESSAGE)) {
+            // wrapped in a message
+            if (type.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+                Type payloadType = type.asParameterizedType().arguments().get(0);
+                if (payloadType.kind() == Type.Kind.CLASS) {
+                    payloadClasses.add(payloadType.name().toString());
+                }
+            }
+        } else {
+            // or used directly
+            payloadClasses.add(type.name().toString());
+        }
+    }
+
+    private void initSerializers(List<String> serializers, BuildProducer<GeneratedBeanBuildItem> generatedBeans) {
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(generatedBeans);
+        try (ClassCreator factory = ClassCreator.builder().classOutput(classOutput)
+                .className("io.quarkus.reactivemessaging.http.runtime.serializers.SerializerFactory")
+                .superClass(SerializerFactoryBase.class)
+                .build()) {
+            factory.addAnnotation(ApplicationScoped.class);
+
+            try (MethodCreator init = factory.getMethodCreator("initAdditionalSerializers", void.class)) {
+                init.setModifiers(Modifier.PROTECTED);
+                MethodDescriptor addSerializer = MethodDescriptor.ofMethod(SerializerFactoryBase.class, "addSerializer",
+                        void.class, String.class, Serializer.class);
+
+                for (String serializerName : serializers) {
+                    ResultHandle serializer = init.newInstance(MethodDescriptor.ofConstructor(serializerName));
+                    init.invokeVirtualMethod(addSerializer, init.getThis(), init.load(serializerName), serializer);
+                }
+                init.returnValue(null);
+            }
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java
new file mode 100644
index 0000000000000..e7b5cd0671cc6
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/RegistrationForReflectionTest.java
@@ -0,0 +1,236 @@
+package io.quarkus.reactivemessaging.http;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.eclipse.microprofile.reactive.streams.operators.ProcessorBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.reactivestreams.Processor;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+
+public class RegistrationForReflectionTest {
+
+    private static volatile List<ReflectiveClassBuildItem> registeredClasses;
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    @Test
+    void shouldRegisterPayloadTypesForReflection() {
+        // if it gets there, it succeeded
+    }
+
+    private static void checkProperClassesAreRegistered() {
+        assertThat(registeredClasses)
+                .overridingErrorMessage("buildCustomizer failed to collect registered classes")
+                .isNotNull();
+
+        List<String> allRegisteredClasses = registeredClasses.stream()
+                .flatMap(c -> c.getClassNames().stream())
+                .collect(Collectors.toList());
+
+        List<String> expectedClasses = Stream
+                .of(PT1.class, PT2.class, PT3.class, PT4.class, PT5.class, PT6.class, PT7.class,
+                        PT8.class,
+                        PT9.class, PT10.class, PT11.class, PT12.class)
+                .map(Class::getName).collect(Collectors.toList());
+
+        assertThat(allRegisteredClasses).containsAll(expectedClasses);
+    }
+
+    private static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+            @Override
+            public void accept(BuildChainBuilder chainBuilder) {
+                chainBuilder.addBuildStep(
+                        new BuildStep() {
+                            @Override
+                            public void execute(BuildContext context) {
+                                registeredClasses = context.consumeMulti(ReflectiveClassBuildItem.class);
+                                checkProperClassesAreRegistered();
+                            }
+                        }).consumes(ReflectiveClassBuildItem.class)
+                        .produces(GeneratedResourceBuildItem.class).build();
+            }
+        };
+    }
+
+    @ApplicationScoped
+    static class ConsumerBean {
+        @Incoming("c1")
+        void consume(PT1 payload) {
+
+        }
+
+        @Incoming("c2")
+        CompletionStage<Void> consume(Message<PT2> payload) {
+            return new CompletableFuture<>();
+        }
+
+        @Incoming("c3")
+        @Outgoing("c5")
+        Multi<PT5> consume(Multi<PT3> payload) {
+            return payload.onItem().transform(o -> new PT5());
+        }
+
+        @Incoming("c4")
+        @Outgoing("c6")
+        Multi<Message<PT6>> consumeMultiWithMessage(Multi<Message<PT4>> payload) {
+            return payload.onItem().transform(msg -> Message.of(new PT6()));
+        }
+
+        @Incoming("c5")
+        Subscriber<PT5> consumeWithSubscriber() {
+            return createSubscriber();
+        }
+
+        @Incoming("c6")
+        Subscriber<Message<PT6>> consumeWithSubscriberWithMessage() {
+            return createSubscriber();
+        }
+
+        @Incoming("c7")
+        SubscriberBuilder<PT7, Void> consumeWithSubscriberBuilder() {
+            return ReactiveStreams.<PT7> builder().ignore();
+        }
+
+        @Incoming("c8")
+        SubscriberBuilder<Message<PT8>, Void> consumeWithSubscriberBuilderOfMsg() {
+            return ReactiveStreams.<Message<PT8>> builder().ignore();
+        }
+
+        @Incoming("c9")
+        @Outgoing("c1")
+        Processor<PT9, PT1> consumeWithProcessor() {
+            return createProcessor(new PT1());
+        }
+
+        @Incoming("c10")
+        @Outgoing("c2")
+        Processor<Message<PT10>, PT2> consumeWithProcessorOfMsg() {
+            return createProcessor(new PT2());
+        }
+
+        @Incoming("c11")
+        @Outgoing("c3")
+        ProcessorBuilder<PT11, PT3> consumeWithProcessorBuilder() {
+            return ReactiveStreams.<PT11> builder().map(o -> new PT3());
+        }
+
+        @Incoming("c12")
+        @Outgoing("c4")
+        ProcessorBuilder<Message<PT12>, Message<PT4>> consumeWithProcessorBuilderOfMsg() {
+            return ReactiveStreams.<Message<PT12>> builder().map(o -> Message.of(new PT4()));
+        }
+
+        @Outgoing("c7")
+        Publisher<PT7> producer7() {
+            return createPublisher(new PT7());
+        }
+
+        @Outgoing("c8")
+        Publisher<PT8> producer8() {
+            return createPublisher(new PT8());
+        }
+
+        @Outgoing("c9")
+        Publisher<PT9> producer9() {
+            return createPublisher(new PT9());
+        }
+
+        @Outgoing("c10")
+        Publisher<PT10> producer10() {
+            return createPublisher(new PT10());
+        }
+
+        @Outgoing("c11")
+        Publisher<PT11> producer11() {
+            return createPublisher(new PT11());
+        }
+
+        @Outgoing("c12")
+        Publisher<PT12> producer12() {
+            return createPublisher(new PT12());
+        }
+
+        <T> Publisher<T> createPublisher(T val) {
+            return ReactiveStreams.of(val)
+                    .buildRs();
+        }
+
+        <V, T> Processor<V, T> createProcessor(T val) {
+            return ReactiveStreams.<V> builder()
+                    .map(m -> val)
+                    .buildRs();
+        }
+
+        Subscriber createSubscriber() {
+            return ReactiveStreams.builder()
+                    .buildRs();
+        }
+    }
+
+    static class PT1 {
+    }
+
+    static class PT2 {
+    }
+
+    static class PT3 {
+    }
+
+    static class PT4 {
+    }
+
+    static class PT5 {
+    }
+
+    static class PT6 {
+    }
+
+    static class PT7 {
+    }
+
+    static class PT8 {
+    }
+
+    static class PT9 {
+    }
+
+    static class PT10 {
+    }
+
+    static class PT11 {
+    }
+
+    static class PT12 {
+    }
+
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java
new file mode 100644
index 0000000000000..37a955792864b
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkBackpressureTest.java
@@ -0,0 +1,100 @@
+package io.quarkus.reactivemessaging.http.sink;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.inject.Inject;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactivemessaging.http.sink.app.Dto;
+import io.quarkus.reactivemessaging.http.sink.app.HttpEmitterWithOverflow;
+import io.quarkus.reactivemessaging.http.sink.app.HttpEndpoint;
+import io.quarkus.reactivemessaging.utils.ToUpperCaseSerializer;
+import io.quarkus.test.QuarkusUnitTest;
+
+class HttpSinkBackpressureTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ToUpperCaseSerializer.class, Dto.class, HttpEmitterWithOverflow.class, HttpEndpoint.class))
+            .withConfigurationResource("http-sink-backpressure-test-application.properties");
+
+    @Inject
+    HttpEmitterWithOverflow emitter;
+    @Inject
+    HttpEndpoint endpoint;
+
+    @Test
+    void shouldThrowExceptionOnOverflow() throws InterruptedException {
+        endpoint.pause();
+
+        CompletionStage<Void> emission1 = emitter.emitAndThrowOnOverflow(1);
+        assertThrows(IllegalStateException.class, () -> emitter.emitAndThrowOnOverflow(2));
+
+        endpoint.release();
+        try {
+            emission1.toCompletableFuture().get(1, TimeUnit.SECONDS);
+        } catch (ExecutionException | TimeoutException e) {
+            fail("failed waiting for success for the first emission", e);
+        }
+    }
+
+    @Test
+    void shouldBufferPrecisely10() throws InterruptedException {
+        endpoint.pause();
+
+        List<CompletionStage<Void>> emissions = new ArrayList<>();
+        List<Failure> failures = new ArrayList<>();
+
+        for (int i = 0; i < 12; i++) {
+            try {
+                emissions.add(emitter.emitAndBufferOnOverflow(i));
+            } catch (RuntimeException failure) {
+                failures.add(new Failure(i, failure));
+            }
+        }
+        // emitter is set to buffer 10. 1 is being processed, 10 should be buffered and one should fail
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> failures, Matchers.hasSize(1));
+
+        endpoint.release();
+        try {
+            for (int i = 0; i < 11; i++) {
+                emissions.get(0).toCompletableFuture().get(1, TimeUnit.SECONDS);
+            }
+        } catch (ExecutionException | TimeoutException e) {
+            fail("failed waiting for success for the buffered emissions", e);
+        }
+    }
+
+    @AfterEach
+    void cleanUp() {
+        endpoint.reset();
+    }
+
+    private static class Failure {
+        int attempt;
+        Throwable failure;
+
+        Failure(int attempt, Throwable failure) {
+            this.attempt = attempt;
+            this.failure = failure;
+        }
+    }
+
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java
new file mode 100644
index 0000000000000..a815b20a64d67
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/HttpSinkTest.java
@@ -0,0 +1,152 @@
+package io.quarkus.reactivemessaging.http.sink;
+
+import static com.google.common.collect.Maps.immutableEntry;
+import static io.restassured.RestAssured.given;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.aMapWithSize;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata;
+import io.quarkus.reactivemessaging.http.sink.app.Dto;
+import io.quarkus.reactivemessaging.http.sink.app.HttpEmitter;
+import io.quarkus.reactivemessaging.http.sink.app.HttpEndpoint;
+import io.quarkus.reactivemessaging.utils.ToUpperCaseSerializer;
+import io.quarkus.test.QuarkusUnitTest;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+class HttpSinkTest {
+
+    @Inject
+    HttpEndpoint httpEndpoint;
+    @Inject
+    HttpEmitter emitter;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HttpEmitter.class, ToUpperCaseSerializer.class, HttpEndpoint.class, Dto.class))
+            .withConfigurationResource("http-sink-test-application.properties");
+
+    @AfterEach
+    void cleanUp() {
+        httpEndpoint.getRequests().clear();
+    }
+
+    @Test
+    void shouldSendMessage() throws InterruptedException {
+        emit(Buffer.buffer("{\"foo\": \"bar\"}"));
+        assertThat(httpEndpoint.getRequests()).hasSize(1);
+        String body = httpEndpoint.getRequests().get(0).getBody();
+        assertThat(new JsonObject(body)).isEqualTo(new JsonObject().put("foo", "bar"));
+    }
+
+    @Test
+    void shouldUseCustomSerializer() {
+        // @formatter:off
+        given()
+                .body("some-text")
+        .when()
+                .post("/custom-http-source")
+        .then()
+                .statusCode(202);
+        // @formatter:on
+        await()
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> httpEndpoint.getRequests(), hasSize(1));
+        String body = httpEndpoint.getRequests().get(0).getBody();
+        assertThat(body).isEqualTo("SOME-TEXT");
+    }
+
+    // todo add content-type headers from serializer?
+    @Test
+    void shouldPassHeadersPathParamAndQueryParam() {
+        String id = "10";
+        OutgoingHttpMetadata metadata = new OutgoingHttpMetadata.Builder()
+                .addHeader("myHeader", "myValue")
+                .addPathParameter("id", id)
+                .addQueryParameter("sort", "ASC")
+                .build();
+        emitter.emitMessageWithPathParam(Message.of(new Dto("foo")).addMetadata(metadata));
+
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> httpEndpoint.getIdentifiableRequests(), aMapWithSize(1));
+
+        HttpEndpoint.Request request = httpEndpoint.getIdentifiableRequests().get(id);
+        assertThat(new JsonObject(request.getBody())).isEqualTo(new JsonObject().put("field", "foo"));
+        assertThat(request.getHeaders()).contains(immutableEntry("myHeader", singletonList("myValue")));
+        assertThat(request.getQueryParameters()).contains(immutableEntry("sort", singletonList("ASC")));
+    }
+
+    @Test
+    void shouldSerializeCollectionToJson() throws InterruptedException {
+        emit(asList(new Dto("foo"), new Dto("bar")));
+
+        assertThat(httpEndpoint.getRequests()).hasSize(1);
+        String body = httpEndpoint.getRequests().get(0).getBody();
+        assertThat(new JsonArray(body)).isEqualTo(new JsonArray("[{\"field\": \"foo\"}, {\"field\": \"bar\"}]"));
+    }
+
+    @Test
+    void shouldSerializeObjectToJson() throws InterruptedException {
+        emit(new Dto("fooo"));
+
+        List<HttpEndpoint.Request> requests = httpEndpoint.getRequests();
+        assertThat(requests).hasSize(1);
+        String body = requests.get(0).getBody();
+        assertThat(new JsonObject(body)).isEqualTo(new JsonObject("{\"field\": \"fooo\"}"));
+    }
+
+    @Test
+    void shouldRetry() throws InterruptedException {
+        httpEndpoint.setInitialFailures(1);
+        emit(emitter::retryingEmitObject, new Dto("fooo"));
+
+        List<HttpEndpoint.Request> requests = httpEndpoint.getRequests();
+        assertThat(requests).hasSize(1);
+        String body = requests.get(0).getBody();
+        assertThat(new JsonObject(body)).isEqualTo(new JsonObject("{\"field\": \"fooo\"}"));
+    }
+
+    @Test
+    void shouldNotRetryByDefault() throws InterruptedException {
+        httpEndpoint.setInitialFailures(1);
+        emit(new Dto("fooo"));
+        emit(new Dto("fooo2"));
+
+        List<HttpEndpoint.Request> requests = httpEndpoint.getRequests();
+        assertThat(requests).hasSize(1);
+        String body = requests.get(0).getBody();
+        assertThat(new JsonObject(body)).isEqualTo(new JsonObject("{\"field\": \"fooo2\"}"));
+    }
+
+    private void emit(Object payload) throws InterruptedException {
+        emit(emitter::emitObject, payload);
+    }
+
+    private void emit(Function<Object, CompletionStage<Void>> emitter, Object payload) throws InterruptedException {
+        CountDownLatch done = new CountDownLatch(1);
+        emitter.apply(payload).thenRun(done::countDown);
+        done.await(10, TimeUnit.SECONDS);
+    }
+
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/Dto.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/Dto.java
new file mode 100644
index 0000000000000..0be103a9385a4
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/Dto.java
@@ -0,0 +1,24 @@
+package io.quarkus.reactivemessaging.http.sink.app;
+
+public class Dto {
+    String field;
+
+    public Dto(String value) {
+        field = value;
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public void setField(String field) {
+        this.field = field;
+    }
+
+    @Override
+    public String toString() {
+        return "Dto{" +
+                "field='" + field + '\'' +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEmitter.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEmitter.java
new file mode 100644
index 0000000000000..38973f5d6514d
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEmitter.java
@@ -0,0 +1,44 @@
+package io.quarkus.reactivemessaging.http.sink.app;
+
+import java.util.concurrent.CompletionStage;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Emitter;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+
+import io.vertx.core.buffer.Buffer;
+
+@ApplicationScoped
+public class HttpEmitter {
+
+    @Channel("my-http-sink")
+    Emitter<Object> emitter;
+
+    @Channel("http-sink-with-path-param")
+    Emitter<Object> emitterWithPathParam;
+
+    @Channel("retrying-http-sink")
+    Emitter<Object> retryingEmitter;
+
+    @Incoming("custom-http-source")
+    @Outgoing("custom-http-sink")
+    String passThroughWithCustomSerializer(Buffer message) {
+        return message.toString();
+    }
+
+    public <T> void emitMessageWithPathParam(Message<T> message) {
+        emitterWithPathParam.send(message);
+    }
+
+    public CompletionStage<Void> retryingEmitObject(Object message) {
+        return retryingEmitter.send(message);
+    }
+
+    public CompletionStage<Void> emitObject(Object message) {
+        return emitter.send(message);
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEmitterWithOverflow.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEmitterWithOverflow.java
new file mode 100644
index 0000000000000..63003731d14db
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEmitterWithOverflow.java
@@ -0,0 +1,31 @@
+package io.quarkus.reactivemessaging.http.sink.app;
+
+import java.util.concurrent.CompletionStage;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Emitter;
+import org.eclipse.microprofile.reactive.messaging.OnOverflow;
+
+@ApplicationScoped
+public class HttpEmitterWithOverflow {
+
+    public static final int BUFFER_SIZE = 10;
+
+    @Channel("my-http-sink")
+    @OnOverflow(OnOverflow.Strategy.THROW_EXCEPTION)
+    Emitter<Object> emitterThrowingOnOverflow;
+
+    @Channel("my-http-sink2")
+    @OnOverflow(value = OnOverflow.Strategy.BUFFER, bufferSize = BUFFER_SIZE)
+    Emitter<Object> emitterBufferingOnOverflow;
+
+    public CompletionStage<Void> emitAndThrowOnOverflow(int attemptNo) {
+        return emitterThrowingOnOverflow.send(new Dto("attempt" + attemptNo));
+    }
+
+    public CompletionStage<Void> emitAndBufferOnOverflow(int attemptNo) {
+        return emitterBufferingOnOverflow.send(new Dto("attempt" + attemptNo));
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEndpoint.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEndpoint.java
new file mode 100644
index 0000000000000..ec5e7dd04fba0
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/sink/app/HttpEndpoint.java
@@ -0,0 +1,111 @@
+package io.quarkus.reactivemessaging.http.sink.app;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@ApplicationScoped
+@Path("/recorder")
+public class HttpEndpoint {
+    private List<Request> requests = new ArrayList<>();
+    private Map<String, Request> identifiableRequests = new HashMap<>();
+    private AtomicInteger initialFailures = new AtomicInteger(0);
+    private ReadWriteLock consumptionLock = new ReentrantReadWriteLock();
+
+    @POST
+    @Path("{id}")
+    public void handleRequestWithIdAndParams(String body,
+            @PathParam String id,
+            @Context HttpHeaders headers,
+            @Context UriInfo uriInfo) {
+        identifiableRequests.put(id, new Request(body, headers.getRequestHeaders(), uriInfo.getQueryParameters()));
+    }
+
+    @POST
+    public Response handlePost(String body) {
+        consumptionLock.readLock().lock();
+        try {
+            if (initialFailures.getAndDecrement() > 0) {
+                return Response.status(500).entity("forced failure").build();
+            }
+            requests.add(new Request(body, null, null));
+            return Response.ok().entity("bye").build();
+        } finally {
+            consumptionLock.readLock().unlock();
+        }
+    }
+
+    public List<Request> getRequests() {
+        return requests;
+    }
+
+    public Map<String, Request> getIdentifiableRequests() {
+        return identifiableRequests;
+    }
+
+    public static class Request {
+        String body;
+        MultivaluedMap<String, String> headers;
+        MultivaluedMap<String, String> queryParameters;
+
+        public Request(String body, MultivaluedMap<String, String> requestHeaders,
+                MultivaluedMap<String, String> queryParameters) {
+            this.body = body;
+            this.queryParameters = queryParameters;
+            headers = requestHeaders;
+        }
+
+        public String getBody() {
+            return body;
+        }
+
+        public MultivaluedMap<String, String> getHeaders() {
+            return headers;
+        }
+
+        public MultivaluedMap<String, String> getQueryParameters() {
+            return queryParameters;
+        }
+    }
+
+    public void setInitialFailures(int initialFailures) {
+        this.initialFailures.set(initialFailures);
+    }
+
+    public void reset() {
+        requests.clear();
+        initialFailures.set(0);
+        try {
+            consumptionLock.writeLock().unlock();
+        } catch (RuntimeException ignored) {
+        }
+        try {
+            consumptionLock.readLock().unlock();
+        } catch (RuntimeException ignored) {
+        }
+    }
+
+    @SuppressWarnings("LockAcquiredButNotSafelyReleased")
+    public void pause() {
+        consumptionLock.writeLock().lock();
+    }
+
+    public void release() {
+        consumptionLock.writeLock().unlock();
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java
new file mode 100644
index 0000000000000..19906ebbe3fea
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/HttpSourceTest.java
@@ -0,0 +1,200 @@
+package io.quarkus.reactivemessaging.http.source;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.util.Arrays.asList;
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactivemessaging.http.runtime.IncomingHttpMetadata;
+import io.quarkus.reactivemessaging.http.source.app.Consumer;
+import io.quarkus.reactivemessaging.utils.VertxFriendlyLock;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.response.ValidatableResponse;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+class HttpSourceTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Consumer.class, VertxFriendlyLock.class))
+            .withConfigurationResource("http-source-test-application.properties");
+
+    @Inject
+    Consumer consumer;
+
+    @AfterEach
+    void setUp() {
+        consumer.clear();
+    }
+
+    @Test
+    void shouldPassTextContentPathAndHeaders() {
+        String headerName = "my-custom-header";
+        String headerValue = "my-custom-header-value";
+        // @formatter:off
+        given()
+                .header(headerName, headerValue)
+                .body("some-text")
+        .when()
+                .post("/my-http-source")
+        .then()
+                .statusCode(202);
+        // @formatter:on
+
+        List<Message<?>> messages = consumer.getPostMessages();
+        assertThat(messages).hasSize(1);
+        Message<?> message = messages.get(0);
+        assertThat(message.getPayload().toString()).isEqualTo("some-text");
+        Optional<IncomingHttpMetadata> maybeMetadata = message.getMetadata(IncomingHttpMetadata.class);
+        assertThat(maybeMetadata).isNotEmpty();
+        IncomingHttpMetadata metadata = maybeMetadata.get();
+        assertThat(metadata.getHeaders().get(headerName)).isEqualTo(headerValue);
+        assertThat(metadata.getPath()).isEqualTo("/my-http-source");
+        assertThat(metadata.getMethod()).isEqualTo(HttpMethod.POST);
+    }
+
+    @Test
+    void shouldDifferentiatePostAndPut() {
+        // @formatter:off
+        given()
+                .body("some-text")
+        .when()
+                .put("/my-http-source")
+        .then()
+                .statusCode(202);
+        // @formatter:on
+
+        send("some-text", "/my-http-source");
+        assertThat(consumer.getPostMessages()).hasSize(1);
+        assertThat(consumer.getPutMessages()).hasSize(1);
+    }
+
+    @Test
+    void shouldConsumeHttpTwice() {
+        send("some-text", "/my-http-source");
+
+        send("some-text", "/my-http-source");
+        List<Message<?>> messages = consumer.getPostMessages();
+        assertThat(messages).hasSize(2);
+    }
+
+    @Test
+    void shouldConsumeJsonObject() {
+        send("{\"some\": \"json\"}", "/json-http-source");
+
+        List<?> payloads = consumer.getPayloads();
+        assertThat(payloads).hasSize(1);
+        assertThat(payloads.get(0)).isInstanceOf(JsonObject.class);
+        JsonObject payload = (JsonObject) payloads.get(0);
+        assertThat(payload.getString("some")).isEqualTo("json");
+    }
+
+    @Test
+    void shouldReportFailureOnInvalidJsonAndSucceedOnProperOne() {
+        // TODO: change to assert 422 when proper propagation of failures is implemented
+        assertThat(sendAndGetStatus("{\"some\": \"json}", "/json-http-source")).isEqualTo(500);
+        send("{\"some\": \"json\"}", "/json-http-source");
+
+        List<?> payloads = consumer.getPayloads();
+        assertThat(payloads).hasSize(1);
+        assertThat(payloads.get(0)).isInstanceOf(JsonObject.class);
+        JsonObject payload = (JsonObject) payloads.get(0);
+        assertThat(payload.getString("some")).isEqualTo("json");
+    }
+
+    @Test
+    void shouldConsumeJsonArray() {
+        send("[{\"some\": \"json\"}]", "/jsonarray-http-source");
+
+        List<?> payloads = consumer.getPayloads();
+        assertThat(payloads).hasSize(1);
+        assertThat(payloads.get(0)).isInstanceOf(JsonArray.class);
+        JsonArray payload = (JsonArray) payloads.get(0);
+        assertThat(payload.getJsonObject(0).getString("some")).isEqualTo("json");
+    }
+
+    @Test
+    void shouldConsumeString() {
+        send("someString", "/string-http-source");
+
+        List<?> payloads = consumer.getPayloads();
+        assertThat(payloads).hasSize(1);
+        assertThat(payloads.get(0)).isInstanceOf(String.class);
+        String payload = (String) payloads.get(0);
+        assertThat(payload).isEqualTo("someString");
+    }
+
+    @Test
+    void shouldBuffer13MessagesIfConfigured() {
+        // 1 message should start being consumed, 13 should be buffered, the rest should respond with 503
+        consumer.pause();
+        List<Future<Integer>> sendStates = new ArrayList<>();
+        ExecutorService executorService = Executors.newFixedThreadPool(17);
+        for (int i = 0; i < 17; i++) {
+            sendStates.add(executorService.submit(() -> sendAndGetStatus("some-text", "/my-http-source")));
+        }
+
+        await("assert 3 failures")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> countCodes(sendStates, 503), Predicate.isEqual(3L));
+
+        consumer.resume();
+
+        await("all processing finished")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> countCodes(sendStates, 503, 202), Predicate.isEqual(17L));
+
+        assertThat(consumer.getPostMessages()).hasSize(14);
+    }
+
+    private long countCodes(List<Future<Integer>> sendStates, int... codes) {
+        List<Integer> statusCodes = new ArrayList<>();
+        for (Future<Integer> sendState : sendStates) {
+            if (sendState.isDone()) {
+                try {
+                    statusCodes.add(sendState.get());
+                } catch (InterruptedException | ExecutionException e) {
+                    fail("checking the status code for http connection failed unexpectedly", e);
+                }
+            }
+        }
+        return statusCodes.stream().filter(asList(codes)::contains).count();
+    }
+
+    static int sendAndGetStatus(String body, String path) {
+        return sendAndGetResponse(body, path).extract().statusCode();
+    }
+
+    static ValidatableResponse sendAndGetResponse(String body, String path) {
+        return given().body(body)
+                .when().post(path)
+                .then();
+    }
+
+    static void send(String body, String path) {
+        sendAndGetResponse(body, path).statusCode(202);
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/app/Consumer.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/app/Consumer.java
new file mode 100644
index 0000000000000..6d0985f4f4bfd
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/http/source/app/Consumer.java
@@ -0,0 +1,104 @@
+package io.quarkus.reactivemessaging.http.source.app;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import io.quarkus.reactivemessaging.utils.VertxFriendlyLock;
+import io.vertx.core.Vertx;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+@ApplicationScoped
+public class Consumer {
+    private static final CompletableFuture<Void> COMPLETED;
+
+    static {
+        COMPLETED = new CompletableFuture<>();
+        COMPLETED.complete(null);
+    }
+
+    private final List<Message<?>> postMessages = new ArrayList<>();
+    private final List<Message<?>> putMessages = new ArrayList<>();
+    private final List<Object> payloads = new ArrayList<>();
+
+    VertxFriendlyLock lock;
+
+    @Inject
+    Consumer(Vertx vertx) {
+        lock = new VertxFriendlyLock(vertx);
+    }
+
+    @Incoming("post-http-source")
+    public CompletionStage<Void> process(Message<?> message) {
+        CompletableFuture<Void> result = new CompletableFuture<>();
+
+        lock.triggerWhenUnlocked(() -> {
+            postMessages.add(message);
+            message.ack();
+            result.complete(null);
+        }, 10000);
+        return result;
+    }
+
+    @Incoming("put-http-source")
+    @Acknowledgment(Acknowledgment.Strategy.POST_PROCESSING)
+    public CompletionStage<Void> processPut(Message<?> message) {
+        putMessages.add(message);
+        return COMPLETED;
+    }
+
+    @Incoming("json-http-source")
+    public CompletionStage<Void> processJsonObject(JsonObject jsonObject) {
+        payloads.add(jsonObject);
+        return COMPLETED;
+    }
+
+    @Incoming("jsonarray-http-source")
+    public CompletionStage<Void> processJsonArray(JsonArray jsonArray) {
+        payloads.add(jsonArray);
+        return COMPLETED;
+    }
+
+    @Incoming("string-http-source")
+    @Acknowledgment(Acknowledgment.Strategy.POST_PROCESSING)
+    public CompletionStage<Void> processString(Message<String> stringMessage) {
+        payloads.add(stringMessage.getPayload());
+        return COMPLETED;
+    }
+
+    public List<Message<?>> getPostMessages() {
+        return postMessages;
+    }
+
+    public List<Message<?>> getPutMessages() {
+        return putMessages;
+    }
+
+    public List<?> getPayloads() {
+        return payloads;
+    }
+
+    public void pause() {
+        lock.lock();
+    }
+
+    public void resume() {
+        lock.unlock();
+    }
+
+    public void clear() {
+        postMessages.clear();
+        putMessages.clear();
+        payloads.clear();
+        lock.reset();
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/utils/ToUpperCaseSerializer.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/utils/ToUpperCaseSerializer.java
new file mode 100644
index 0000000000000..107bbac1dba05
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/utils/ToUpperCaseSerializer.java
@@ -0,0 +1,22 @@
+package io.quarkus.reactivemessaging.utils;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.serializers.Serializer;
+import io.vertx.core.buffer.Buffer;
+
+public class ToUpperCaseSerializer implements Serializer<String> {
+    private static final Logger log = Logger.getLogger(ToUpperCaseSerializer.class);
+
+    @Override
+    public boolean handles(Object payload) {
+        log.infof("checking if %s of type %s is handled", payload, payload.getClass());
+        return payload instanceof String;
+    }
+
+    @Override
+    public Buffer serialize(String payload) {
+        log.infof("serializing %s", payload);
+        return Buffer.buffer(payload.toUpperCase());
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/utils/VertxFriendlyLock.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/utils/VertxFriendlyLock.java
new file mode 100644
index 0000000000000..de448e9ffcfd8
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/utils/VertxFriendlyLock.java
@@ -0,0 +1,49 @@
+package io.quarkus.reactivemessaging.utils;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.vertx.core.Vertx;
+
+public class VertxFriendlyLock {
+    private final Vertx vertx;
+
+    volatile boolean ready = true;
+    private final List<Long> timers = new ArrayList<>();
+
+    public VertxFriendlyLock(Vertx vertx) {
+        this.vertx = vertx;
+    }
+
+    public void triggerWhenUnlocked(Runnable action, long maxTime) {
+        triggerWhenUnlocked(action, System.currentTimeMillis(), maxTime);
+    }
+
+    private void triggerWhenUnlocked(Runnable action, long startTime, long maxTime) {
+        if (System.currentTimeMillis() - startTime >= maxTime) {
+            fail("the consumer not released in " + maxTime + " ms");
+        }
+        if (!ready) {
+            timers.add(vertx.setTimer(100, timer -> triggerWhenUnlocked(action, startTime, maxTime)));
+        } else {
+            action.run();
+        }
+    }
+
+    public void lock() {
+        ready = false;
+    }
+
+    public void unlock() {
+        ready = true;
+    }
+
+    public void reset() {
+        for (Long timer : timers) {
+            vertx.cancelTimer(timer);
+        }
+        ready = true;
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/WebSocketClient.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/WebSocketClient.java
new file mode 100644
index 0000000000000..4088c8155943e
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/WebSocketClient.java
@@ -0,0 +1,65 @@
+package io.quarkus.reactivemessaging.websocket;
+
+import java.net.URI;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.http.WebSocket;
+
+public class WebSocketClient {
+
+    private final Vertx vertx;
+
+    public WebSocketClient(Vertx vertx) {
+        this.vertx = vertx;
+    }
+
+    public WsConnection connect(URI uri) {
+        return connect(uri, 1, TimeUnit.SECONDS);
+    }
+
+    public WsConnection connect(URI uri, long timeout, TimeUnit unit) {
+        CompletableFuture<WebSocket> webSocket = new CompletableFuture<>();
+        vertx.createHttpClient().webSocket(uri.getPort(), uri.getHost(), uri.getPath(), ws -> {
+            if (ws.succeeded()) {
+                webSocket.complete(ws.result());
+            } else {
+                webSocket.completeExceptionally(ws.cause());
+            }
+        });
+        try {
+            return new WsConnection(webSocket.get(timeout, unit));
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            throw new RuntimeException("Web socket client failed", e);
+        }
+    }
+
+    public static class WsConnection {
+
+        private WebSocket ws;
+        private List<String> responses = new CopyOnWriteArrayList<>();
+
+        private WsConnection(WebSocket ws) {
+            this.ws = ws;
+            ws.handler(buffer -> responses.add(buffer.toString()));
+        }
+
+        public WsConnection send(String message) {
+            try {
+                ws.writeTextMessage(message);
+            } catch (Exception any) {
+                throw new RuntimeException("Failed to send message " + message, any);
+            }
+            return this;
+        }
+
+        public List<String> getResponses() {
+            return responses;
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java
new file mode 100644
index 0000000000000..dccfc269e0ae2
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/WebSocketSinkTest.java
@@ -0,0 +1,119 @@
+package io.quarkus.reactivemessaging.websocket.sink;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.hasSize;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactivemessaging.utils.ToUpperCaseSerializer;
+import io.quarkus.reactivemessaging.websocket.sink.app.WebSocketEmitter;
+import io.quarkus.reactivemessaging.websocket.sink.app.WebSocketEndpoint;
+import io.quarkus.test.QuarkusUnitTest;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+class WebSocketSinkTest {
+    private static final Logger log = Logger.getLogger(WebSocketSinkTest.class);
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(WebSocketEndpoint.class, WebSocketEmitter.class, ToUpperCaseSerializer.class))
+            .withConfigurationResource("websocket-sink-test-application.properties");
+
+    @Inject
+    WebSocketEndpoint webSocketEndpoint;
+
+    @Inject
+    WebSocketEmitter emitter;
+
+    @Test
+    void shouldSerializeBuffer() {
+        log.debug("shouldSerializeBuffer");
+        emitter.sendMessage(Message.of(Buffer.buffer("{\"foo\": \"bar\"}")));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(1));
+        assertThat(webSocketEndpoint.getMessages().get(0)).isEqualTo("{\"foo\": \"bar\"}");
+    }
+
+    @Test
+    void shouldSerializeJsonObject() {
+        log.debug("shouldSerializeJsonObject");
+        emitter.sendMessage(Message.of(new JsonObject().put("jsonFoo", "jsonBar")));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(1));
+        assertThat(new JsonObject(webSocketEndpoint.getMessages().get(0)))
+                .isEqualTo(new JsonObject("{\"jsonFoo\": \"jsonBar\"}"));
+    }
+
+    @Test
+    void shouldSerializeJsonArray() {
+        log.debug("shouldSerializeJsonArray");
+        emitter.sendMessage(Message.of(new JsonArray().add(new JsonObject().put("arrFoo", "arrBar"))));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(1));
+        assertThat(new JsonArray(webSocketEndpoint.getMessages().get(0)))
+                .isEqualTo(new JsonArray().add(new JsonObject().put("arrFoo", "arrBar")));
+    }
+
+    @Test
+    void shouldSerializeString() {
+        log.debug("shouldSerializeString");
+        emitter.sendMessage(Message.of("someText"));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(1));
+        assertThat(webSocketEndpoint.getMessages().get(0)).isEqualTo("someText");
+    }
+
+    @Test
+    void shouldUseCustomSerializer() {
+        log.debug("shouldUseCustomSerializer");
+        emitter.sendMessageWithCustomSerializer(Message.of("sometext"));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(1));
+        assertThat(webSocketEndpoint.getMessages().get(0)).isEqualTo("SOMETEXT");
+    }
+
+    @Test
+    void shouldReuseClientIfConnected() {
+        log.debug("shouldReuseClientIfConnected");
+        emitter.sendMessage(Message.of("sometext"));
+        emitter.sendMessage(Message.of("sometext"));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(2));
+        assertThat(webSocketEndpoint.sessionCount()).isEqualTo(1);
+    }
+
+    @Test
+    void shouldReconnectOnClientDisconnected() {
+        log.debug("shouldReconnectOnClientDisconnected");
+        emitter.sendMessage(Message.of("sometext"));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(1));
+        webSocketEndpoint.killAllSessions();
+        emitter.sendMessage(Message.of("sometext"));
+        await().atMost(10, TimeUnit.SECONDS)
+                .until(() -> webSocketEndpoint.getMessages(), hasSize(2));
+        assertThat(webSocketEndpoint.sessionCount()).isEqualTo(1);
+    }
+
+    // TODO: test retry mechanism when STOMP or similar protocol is implemented
+
+    @AfterEach
+    void cleanUp() {
+        webSocketEndpoint.reset();
+    }
+
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/app/WebSocketEmitter.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/app/WebSocketEmitter.java
new file mode 100644
index 0000000000000..3ae01e3f9f5b9
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/app/WebSocketEmitter.java
@@ -0,0 +1,34 @@
+package io.quarkus.reactivemessaging.websocket.sink.app;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Emitter;
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+@SuppressWarnings("rawtypes")
+@ApplicationScoped
+public class WebSocketEmitter {
+
+    public static final String BUFFER = "BUFFER";
+    public static final String JSON_OBJECT = "JSON_OBJECT";
+    public static final String JSON_ARRAY = "JSON_ARRAY";
+    public static final String STRING = "STRING";
+
+    @Inject
+    @Channel("my-ws-sink")
+    Emitter<Object> emitter;
+
+    @Inject
+    @Channel("ws-sink-with-serializer")
+    Emitter<Object> emitterWithCustomSerializer;
+
+    public void sendMessage(Message<?> message) {
+        emitter.send(message);
+    }
+
+    public void sendMessageWithCustomSerializer(Message<String> message) {
+        emitterWithCustomSerializer.send(message);
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/app/WebSocketEndpoint.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/app/WebSocketEndpoint.java
new file mode 100644
index 0000000000000..8ad117ff22af9
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/sink/app/WebSocketEndpoint.java
@@ -0,0 +1,65 @@
+package io.quarkus.reactivemessaging.websocket.sink.app;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+@ServerEndpoint("/ws-target-url")
+public class WebSocketEndpoint {
+    private static final Logger log = Logger.getLogger(WebSocketEndpoint.class);
+    private final List<String> messages = new ArrayList<>();
+
+    private final List<Session> sessions = new ArrayList<>();
+
+    @OnError
+    void onError(Throwable error) {
+        log.error("Unexpected error in the WebSocketSinkTest", error);
+    }
+
+    @OnOpen
+    void onOpen(Session session) {
+        sessions.add(session);
+    }
+
+    @OnMessage
+    void consumeMessage(byte[] message) {
+        messages.add(new String(message));
+    }
+
+    public void killAllSessions() {
+        for (Session session : sessions) {
+            try {
+                session.close();
+            } catch (Exception ignored) {
+            }
+        }
+        try {
+            Thread.sleep(1000); // wait for the web socket sessions to be closed
+        } catch (InterruptedException ignored) {
+        }
+        sessions.clear();
+    }
+
+    public List<String> getMessages() {
+        return messages;
+    }
+
+    public void reset() {
+        messages.clear();
+
+        killAllSessions();
+    }
+
+    public int sessionCount() {
+        return sessions.size();
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java
new file mode 100644
index 0000000000000..c858f6853d60e
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/WebSocketSourceTest.java
@@ -0,0 +1,130 @@
+package io.quarkus.reactivemessaging.websocket.source;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+
+import java.net.URI;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactivemessaging.utils.VertxFriendlyLock;
+import io.quarkus.reactivemessaging.websocket.WebSocketClient;
+import io.quarkus.reactivemessaging.websocket.source.app.Consumer;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.vertx.core.Vertx;
+
+class WebSocketSourceTest {
+
+    private static Vertx vertx;
+    private static WebSocketClient client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Consumer.class, WebSocketClient.class, VertxFriendlyLock.class))
+            .withConfigurationResource("websocket-source-test-application.properties");
+
+    @TestHTTPResource("my-ws")
+    URI wsSourceUri;
+
+    @TestHTTPResource("my-ws-json")
+    URI wsSourceForJsonUri;
+
+    @TestHTTPResource("my-ws-buffer-13")
+    URI wsSourceBuffer13Uri;
+
+    @Inject
+    Consumer consumer;
+
+    @Test
+    void shouldPassTextContentAndHeaders() {
+        client.connect(wsSourceUri).send("test-message");
+
+        await("wait for message to be consumed")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> consumer.getMessages(), hasSize(1));
+        String payload = consumer.getMessages().get(0);
+        assertThat(payload).isEqualTo("test-message");
+    }
+
+    @Test
+    void shouldConsumeJson() {
+        client.connect(wsSourceForJsonUri).send("{\"field\": \"json\"}");
+
+        await("wait for json message to be consumed and deserialized")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> consumer.getDtos(), hasSize(1));
+        assertThat(consumer.getDtos().get(0).getField()).isEqualTo("json");
+    }
+
+    @Test
+    void shouldBuffer13IfConfigured() {
+        shouldBuffer(13, wsSourceBuffer13Uri);
+    }
+
+    @Test
+    void shouldBuffer8ByDefault() {
+        shouldBuffer(8, wsSourceUri);
+    }
+
+    void shouldBuffer(int bufferSize, URI wsUri) {
+        WebSocketClient.WsConnection connection = client.connect(wsUri);
+        int messagesToSend = 17;
+        // 1 message should start being consumed, `messagesToSend` should be buffered, the rest should respond with 503
+
+        consumer.pause();
+        ExecutorService executorService = Executors.newFixedThreadPool(messagesToSend);
+
+        for (int i = 0; i < messagesToSend; i++) {
+            executorService.submit(() -> connection.send("some-text"));
+        }
+
+        Integer expectedFailureCount = messagesToSend - bufferSize - 1;
+
+        await("assert " + expectedFailureCount + " failures")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> connection.getResponses().stream().filter("BUFFER_OVERFLOW"::equals).count(),
+                        equalTo(expectedFailureCount.longValue()));
+
+        consumer.resume();
+
+        await("all processing finished")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> connection.getResponses().size(), equalTo(messagesToSend));
+
+        assertThat(consumer.getMessages()).hasSize(messagesToSend - expectedFailureCount);
+    }
+
+    @AfterEach
+    void cleanUp() {
+        consumer.clear();
+    }
+
+    @BeforeAll
+    static void setUp() {
+        vertx = Vertx.vertx();
+        client = new WebSocketClient(vertx);
+    }
+
+    @AfterAll
+    static void tearDown() throws InterruptedException {
+        CountDownLatch shutdownLatch = new CountDownLatch(1);
+        vertx.close(ignored -> shutdownLatch.countDown());
+        shutdownLatch.await(10, TimeUnit.SECONDS);
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/app/Consumer.java b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/app/Consumer.java
new file mode 100644
index 0000000000000..24e86bc3f46c8
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/java/io/quarkus/reactivemessaging/websocket/source/app/Consumer.java
@@ -0,0 +1,91 @@
+package io.quarkus.reactivemessaging.websocket.source.app;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import io.quarkus.reactivemessaging.utils.VertxFriendlyLock;
+import io.vertx.core.Vertx;
+
+@ApplicationScoped
+public class Consumer {
+
+    private final List<String> messages = new ArrayList<>();
+    private final List<Dto> dtos = new ArrayList<>();
+
+    VertxFriendlyLock lock;
+
+    @Inject
+    Consumer(Vertx vertx) {
+        lock = new VertxFriendlyLock(vertx);
+    }
+
+    @Incoming("my-ws-source-json")
+    public void consumeJson(Dto dto) {
+        dtos.add(dto);
+    }
+
+    @Incoming("my-ws-source")
+    public CompletionStage<Void> process(Message<String> message) {
+        CompletableFuture<Void> result = new CompletableFuture<>();
+
+        lock.triggerWhenUnlocked(() -> {
+            messages.add(message.getPayload());
+            message.ack();
+            result.complete(null);
+        }, 10000);
+        return result;
+    }
+
+    @Incoming("my-ws-source-buffer-13")
+    public CompletionStage<Void> processWithBuffer13(Message<String> message) {
+        CompletableFuture<Void> result = new CompletableFuture<>();
+
+        lock.triggerWhenUnlocked(() -> {
+            messages.add(message.getPayload());
+            message.ack();
+            result.complete(null);
+        }, 10000);
+        return result;
+    }
+
+    public List<String> getMessages() {
+        return messages;
+    }
+
+    public void pause() {
+        lock.lock();
+    }
+
+    public void resume() {
+        lock.unlock();
+    }
+
+    public void clear() {
+        messages.clear();
+        lock.reset();
+    }
+
+    public List<Dto> getDtos() {
+        return dtos;
+    }
+
+    public static class Dto {
+        private String field;
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/deployment/src/test/resources/http-sink-backpressure-test-application.properties b/extensions/reactive-messaging-http/deployment/src/test/resources/http-sink-backpressure-test-application.properties
new file mode 100644
index 0000000000000..539778ba61391
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/resources/http-sink-backpressure-test-application.properties
@@ -0,0 +1,7 @@
+mp.messaging.outgoing.my-http-sink.connector=quarkus-http
+mp.messaging.outgoing.my-http-sink.url=http://localhost:${quarkus.http.test-port:8081}/recorder
+mp.messaging.outgoing.my-http-sink.method=POST
+
+mp.messaging.outgoing.my-http-sink2.connector=quarkus-http
+mp.messaging.outgoing.my-http-sink2.url=http://localhost:${quarkus.http.test-port:8081}/recorder
+mp.messaging.outgoing.my-http-sink2.method=POST
\ No newline at end of file
diff --git a/extensions/reactive-messaging-http/deployment/src/test/resources/http-sink-test-application.properties b/extensions/reactive-messaging-http/deployment/src/test/resources/http-sink-test-application.properties
new file mode 100644
index 0000000000000..13f7fb9c7a3b4
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/resources/http-sink-test-application.properties
@@ -0,0 +1,26 @@
+mp.messaging.incoming.post-http-source.connector=quarkus-http
+mp.messaging.incoming.post-http-source.path=/my-http-source
+mp.messaging.incoming.post-http-source.method=POST
+
+mp.messaging.outgoing.my-http-sink.connector=quarkus-http
+mp.messaging.outgoing.my-http-sink.url=http://localhost:${quarkus.http.test-port:8081}/recorder
+mp.messaging.outgoing.my-http-sink.method=POST
+
+mp.messaging.outgoing.retrying-http-sink.connector=quarkus-http
+mp.messaging.outgoing.retrying-http-sink.maxRetries=1
+mp.messaging.outgoing.retrying-http-sink.url=http://localhost:${quarkus.http.test-port:8081}/recorder
+mp.messaging.outgoing.retrying-http-sink.method=POST
+
+# for custom serializer test:
+mp.messaging.incoming.custom-http-source.connector=quarkus-http
+mp.messaging.incoming.custom-http-source.path=/custom-http-source
+mp.messaging.incoming.custom-http-source.method=POST
+
+mp.messaging.outgoing.custom-http-sink.connector=quarkus-http
+mp.messaging.outgoing.custom-http-sink.url=http://localhost:${quarkus.http.test-port:8081}/recorder
+mp.messaging.outgoing.custom-http-sink.method=POST
+mp.messaging.outgoing.custom-http-sink.serializer=io.quarkus.reactivemessaging.utils.ToUpperCaseSerializer
+
+mp.messaging.outgoing.http-sink-with-path-param.connector=quarkus-http
+mp.messaging.outgoing.http-sink-with-path-param.url=http://localhost:${quarkus.http.test-port:8081}/recorder/{id}
+mp.messaging.outgoing.http-sink-with-path-param.method=POST
diff --git a/extensions/reactive-messaging-http/deployment/src/test/resources/http-source-test-application.properties b/extensions/reactive-messaging-http/deployment/src/test/resources/http-source-test-application.properties
new file mode 100644
index 0000000000000..95c7229c789bb
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/resources/http-source-test-application.properties
@@ -0,0 +1,21 @@
+mp.messaging.incoming.post-http-source.connector=quarkus-http
+mp.messaging.incoming.post-http-source.path=/my-http-source
+mp.messaging.incoming.post-http-source.method=POST
+mp.messaging.incoming.post-http-source.buffer-size=13
+
+mp.messaging.incoming.put-http-source.connector=quarkus-http
+mp.messaging.incoming.put-http-source.path=/my-http-source
+mp.messaging.incoming.put-http-source.method=PUT
+
+mp.messaging.incoming.json-http-source.connector=quarkus-http
+mp.messaging.incoming.json-http-source.path=/json-http-source
+mp.messaging.incoming.json-http-source.method=POST
+
+mp.messaging.incoming.jsonarray-http-source.connector=quarkus-http
+mp.messaging.incoming.jsonarray-http-source.path=/jsonarray-http-source
+mp.messaging.incoming.jsonarray-http-source.method=POST
+
+mp.messaging.incoming.string-http-source.connector=quarkus-http
+mp.messaging.incoming.string-http-source.path=/string-http-source
+mp.messaging.incoming.string-http-source.method=POST
+
diff --git a/extensions/reactive-messaging-http/deployment/src/test/resources/websocket-sink-test-application.properties b/extensions/reactive-messaging-http/deployment/src/test/resources/websocket-sink-test-application.properties
new file mode 100644
index 0000000000000..02d0bda2087cf
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/resources/websocket-sink-test-application.properties
@@ -0,0 +1,6 @@
+mp.messaging.outgoing.my-ws-sink.connector=quarkus-websocket
+mp.messaging.outgoing.my-ws-sink.url=ws://localhost:${quarkus.http.test-port:8081}/ws-target-url
+
+mp.messaging.outgoing.ws-sink-with-serializer.connector=quarkus-websocket
+mp.messaging.outgoing.ws-sink-with-serializer.url=ws://localhost:${quarkus.http.test-port:8081}/ws-target-url
+mp.messaging.outgoing.ws-sink-with-serializer.serializer=io.quarkus.reactivemessaging.utils.ToUpperCaseSerializer
diff --git a/extensions/reactive-messaging-http/deployment/src/test/resources/websocket-source-test-application.properties b/extensions/reactive-messaging-http/deployment/src/test/resources/websocket-source-test-application.properties
new file mode 100644
index 0000000000000..d033c857a8c91
--- /dev/null
+++ b/extensions/reactive-messaging-http/deployment/src/test/resources/websocket-source-test-application.properties
@@ -0,0 +1,9 @@
+mp.messaging.incoming.my-ws-source.connector=quarkus-websocket
+mp.messaging.incoming.my-ws-source.path=/my-ws
+
+mp.messaging.incoming.my-ws-source-json.connector=quarkus-websocket
+mp.messaging.incoming.my-ws-source-json.path=/my-ws-json
+
+mp.messaging.incoming.my-ws-source-buffer-13.connector=quarkus-websocket
+mp.messaging.incoming.my-ws-source-buffer-13.path=/my-ws-buffer-13
+mp.messaging.incoming.my-ws-source-buffer-13.buffer-size=13
diff --git a/extensions/reactive-messaging-http/pom.xml b/extensions/reactive-messaging-http/pom.xml
new file mode 100644
index 0000000000000..f75bc1a0cf8e3
--- /dev/null
+++ b/extensions/reactive-messaging-http/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>quarkus-reactive-messaging-http-parent</artifactId>
+    <name>Quarkus - Reactive Messaging - HTTP and WebSockets</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/reactive-messaging-http/runtime/pom.xml b/extensions/reactive-messaging-http/runtime/pom.xml
new file mode 100644
index 0000000000000..8fb2e76d3366e
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-reactive-messaging-http-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-reactive-messaging-http</artifactId>
+    <name>Quarkus - SmallRye Reactive Messaging - HTTP and WebSockets - Runtime</name>
+    <description>Connect to HTTP or Web Socket and expose HTTP or Web Socket endpoints for Reactive Messaging
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-connector-attribute-processor</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <generatedSourcesDirectory>${project.build.directory}/generated-sources/</generatedSourcesDirectory>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            io.smallrye.reactive.messaging.connector.ConnectorAttributeProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/HttpMessage.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/HttpMessage.java
new file mode 100644
index 0000000000000..fb61546676e4b
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/HttpMessage.java
@@ -0,0 +1,57 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Metadata;
+
+/**
+ * used by http source
+ * 
+ * @param <T> payload type
+ */
+class HttpMessage<T> implements Message<T> {
+
+    private final T payload;
+    private final Runnable successHandler;
+    private final Consumer<Throwable> failureHandler;
+    private final Metadata metadata;
+
+    HttpMessage(T payload, IncomingHttpMetadata requestMetadata, Runnable successHandler,
+            Consumer<Throwable> failureHandler) {
+        this.payload = payload;
+        this.successHandler = successHandler;
+        this.failureHandler = failureHandler;
+        metadata = Metadata.of(requestMetadata);
+    }
+
+    @Override
+    public T getPayload() {
+        return payload;
+    }
+
+    @Override
+    public Metadata getMetadata() {
+        return metadata;
+    }
+
+    @Override
+    public Supplier<CompletionStage<Void>> getAck() {
+        return () -> {
+            successHandler.run();
+            return CompletableFuture.completedFuture(null);
+        };
+    }
+
+    @Override
+    public Function<Throwable, CompletionStage<Void>> getNack() {
+        return error -> {
+            failureHandler.accept(error);
+            return CompletableFuture.completedFuture(null);
+        };
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/HttpSink.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/HttpSink.java
new file mode 100644
index 0000000000000..0b4c22e37e20f
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/HttpSink.java
@@ -0,0 +1,182 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.serializers.Serializer;
+import io.quarkus.reactivemessaging.http.runtime.serializers.SerializerFactoryBase;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.groups.UniRetry;
+import io.vertx.core.Vertx;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.core.buffer.Buffer;
+import io.vertx.mutiny.ext.web.client.HttpRequest;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+class HttpSink {
+
+    private static final Logger log = Logger.getLogger(HttpSink.class);
+
+    private static final String[] SUPPORTED_SCHEMES = { "http:", "https:" };
+
+    private final SubscriberBuilder<Message<?>, Void> subscriber;
+    private final WebClient client;
+    private final String method;
+    private final String url;
+    private final SerializerFactoryBase serializerFactory;
+    private final String serializerName;
+
+    HttpSink(Vertx vertx, String method, String url,
+            String serializerName,
+            int maxRetries,
+            double jitter,
+            Optional<Duration> delay,
+            Optional<Integer> maxPoolSize,
+            Optional<Integer> maxWaitQueueSize,
+            SerializerFactoryBase serializerFactory) {
+        this.method = method;
+        this.url = url;
+        this.serializerFactory = serializerFactory;
+        this.serializerName = serializerName;
+
+        WebClientOptions options = new WebClientOptions();
+        if (maxPoolSize.isPresent()) {
+            options.setMaxPoolSize(maxPoolSize.get());
+        }
+        if (maxWaitQueueSize.isPresent()) {
+            options.setMaxWaitQueueSize(maxWaitQueueSize.get());
+        }
+        client = WebClient.create(io.vertx.mutiny.core.Vertx.newInstance(vertx), options);
+
+        if (Arrays.stream(SUPPORTED_SCHEMES).noneMatch(url.toLowerCase()::startsWith)) {
+            throw new IllegalArgumentException("Unsupported scheme for the http connector in URL: " + url);
+        }
+
+        subscriber = ReactiveStreams.<Message<?>> builder()
+                .flatMapCompletionStage(m -> {
+                    Uni<Void> send = send(m);
+                    if (maxRetries > 0) {
+                        UniRetry<Void> retry = send.onFailure().retry();
+                        if (delay.isPresent()) {
+                            retry = retry.withBackOff(delay.get()).withJitter(jitter);
+                        }
+                        send = retry.atMost(maxRetries);
+                    }
+
+                    return send
+                            .onItemOrFailure().transformToUni((result, error) -> {
+                                if (error != null) {
+                                    return Uni.createFrom().completionStage(m.nack(error).thenApply(x -> m));
+                                }
+                                return Uni.createFrom().completionStage(m.ack().thenApply(x -> m));
+                            })
+                            .subscribeAsCompletionStage();
+                }).ignore();
+    }
+
+    SubscriberBuilder<Message<?>, Void> sink() {
+        return subscriber;
+    }
+
+    private Uni<Void> send(Message<?> message) {
+        HttpRequest<?> request = toHttpRequest(message);
+        return Uni.createFrom().item(message.getPayload())
+                .onItem().transform(this::serialize)
+                .onItem().transformToUni(buffer -> invoke(request, buffer));
+    }
+
+    private <T> Buffer serialize(T payload) {
+        Serializer<T> serializer = serializerFactory.getSerializer(serializerName, payload);
+        return Buffer.newInstance(serializer.serialize(payload));
+    }
+
+    private Uni<Void> invoke(HttpRequest<?> request, Buffer buffer) {
+        return request
+                .sendBuffer(buffer)
+                .onItem().transform(resp -> {
+                    if (resp.statusCode() >= 200 && resp.statusCode() < 300) {
+                        return null;
+                    } else {
+                        throw new RuntimeException("HTTP request returned an invalid status: " + resp.statusCode());
+                    }
+                });
+    }
+
+    private HttpRequest<?> toHttpRequest(Message<?> message) {
+        try {
+            OutgoingHttpMetadata metadata = message.getMetadata(OutgoingHttpMetadata.class).orElse((OutgoingHttpMetadata) null);
+
+            Map<String, List<String>> httpHeaders = metadata != null ? metadata.getHeaders() : Collections.emptyMap();
+            Map<String, List<String>> query = metadata != null ? metadata.getQuery() : Collections.emptyMap();
+            Map<String, String> pathParams = metadata != null ? metadata.getPathParameters() : Collections.emptyMap();
+
+            String url = prepareUrl(pathParams);
+
+            HttpRequest<Buffer> request = createRequest(url);
+
+            addHeaders(request, httpHeaders);
+
+            addQueryParameters(query, request);
+
+            return request;
+        } catch (Exception any) {
+            log.error("Failed to transform message to http request", any);
+            throw any;
+        }
+    }
+
+    private HttpRequest<Buffer> createRequest(String url) {
+        HttpRequest<Buffer> request;
+        switch (method) {
+            case "POST":
+                request = client.postAbs(url);
+                break;
+            case "PUT":
+                request = client.putAbs(url);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported HTTP method: " + method + "only PUT and POST are supported");
+        }
+        return request;
+    }
+
+    private void addQueryParameters(Map<String, List<String>> query, HttpRequest<Buffer> request) {
+        for (Map.Entry<String, List<String>> queryParam : query.entrySet()) {
+            for (String queryParamValue : queryParam.getValue()) {
+                request.addQueryParam(queryParam.getKey(), queryParamValue);
+            }
+        }
+    }
+
+    private void addHeaders(HttpRequest<Buffer> request, Map<String, List<String>> httpHeaders) {
+        if (!httpHeaders.isEmpty()) {
+            for (Map.Entry<String, List<String>> header : httpHeaders.entrySet()) {
+                request.putHeader(header.getKey(), header.getValue());
+            }
+        }
+    }
+
+    private String prepareUrl(Map<String, String> pathParams) {
+        String result = url;
+        for (Map.Entry<String, String> pathParamEntry : pathParams.entrySet()) {
+            String toReplace = String.format("{%s}", pathParamEntry.getKey());
+            if (url.contains(toReplace)) {
+                result = url.replace(toReplace, pathParamEntry.getValue());
+            } else {
+                log.warnf("Failed to find %s in the URL that would correspond to the %s path parameter",
+                        toReplace, pathParamEntry.getKey());
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/IncomingHttpMetadata.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/IncomingHttpMetadata.java
new file mode 100644
index 0000000000000..17108222f0e3a
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/IncomingHttpMetadata.java
@@ -0,0 +1,48 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import io.vertx.core.MultiMap;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServerRequest;
+
+/**
+ * Metadata for Http Source. Provides a way to get headers, method and path from a http request
+ */
+public class IncomingHttpMetadata {
+
+    private final HttpServerRequest request;
+
+    IncomingHttpMetadata(HttpServerRequest request) {
+        this.request = request;
+    }
+
+    /**
+     * http method of the request
+     * 
+     * @return either POST or PUT
+     */
+    public HttpMethod getMethod() {
+        return request.method();
+    }
+
+    /**
+     * headers of the request
+     * 
+     * @return a MultiMap of headers
+     */
+    public MultiMap getHeaders() {
+        return request.headers();
+    }
+
+    /**
+     * path of the request
+     * 
+     * @return path
+     */
+    public String getPath() {
+        return request.path();
+    }
+
+    public HttpServerRequest unwrap() {
+        return request;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/OutgoingHttpMetadata.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/OutgoingHttpMetadata.java
new file mode 100644
index 0000000000000..a60bb3534fc1d
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/OutgoingHttpMetadata.java
@@ -0,0 +1,142 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Metadata for messages sent out by the http connector
+ */
+public class OutgoingHttpMetadata {
+    private final Map<String, List<String>> query;
+    private final Map<String, List<String>> headers;
+    private final Map<String, String> pathParameters;
+
+    private OutgoingHttpMetadata(Map<String, String> pathParameters, Map<String, List<String>> query,
+            Map<String, List<String>> headers) {
+        this.pathParameters = pathParameters;
+        this.query = query;
+        this.headers = headers;
+    }
+
+    Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    Map<String, List<String>> getQuery() {
+        return query;
+    }
+
+    Map<String, String> getPathParameters() {
+        return pathParameters;
+    }
+
+    /**
+     * OutgoingHttpMetadata buiilder
+     */
+    public static final class Builder {
+        private Map<String, List<String>> query;
+        private Map<String, List<String>> headers;
+        private Map<String, String> pathParameters;
+
+        /**
+         * add a query parameter
+         *
+         * @param paramName name of the query parameter
+         * @param paramValue value of the query parameter
+         * @return this
+         */
+        public Builder addQueryParameter(String paramName, String paramValue) {
+            if (query == null) {
+                query = new HashMap<>();
+            }
+            addToMap(query, paramName, paramValue, false);
+            return this;
+        }
+
+        /**
+         * add a query parameter. If there is a previous parameter with the same name, it will be removed
+         *
+         * @param paramName name of the query parameter
+         * @param paramValue value of the query parameter
+         * @return this
+         */
+        public Builder replaceQueryParameter(String paramName, String paramValue) {
+            if (query == null) {
+                query = new HashMap<>();
+            }
+            addToMap(query, paramName, paramValue, true);
+            return this;
+        }
+
+        /**
+         * add a HTTP header
+         *
+         * @param headerName name of the header
+         * @param headerValue value of the header
+         * @return this
+         */
+        public Builder addHeader(String headerName, String headerValue) {
+            if (headers == null) {
+                headers = new HashMap<>();
+            }
+            addToMap(headers, headerName, headerValue, false);
+            return this;
+        }
+
+        /**
+         * add a HTTP header. If there is a previous header with the same name, it will be removed
+         *
+         * @param headerName name of the header
+         * @param headerValue value of the header
+         * @return this
+         */
+        public Builder replaceHeader(String headerName, String headerValue) {
+            if (headers == null) {
+                headers = new HashMap<>();
+            }
+            addToMap(headers, headerName, headerValue, true);
+            return this;
+        }
+
+        private void addToMap(Map<String, List<String>> map, String headerName, String headerValue, boolean replaceExisting) {
+            List<String> values = map.computeIfAbsent(headerName, whatever -> new ArrayList<>());
+
+            if (replaceExisting && !values.isEmpty()) {
+                values.clear();
+            }
+
+            values.add(headerValue);
+        }
+
+        /**
+         * Add a path parameter.
+         * To use parameters, it is needed to add a placeholder in the URL of the connector in the form of {parameterName}
+         *
+         * @param parameter path parameter name, should correspond to a placeholder like {parameter} in the URL
+         * @param value path parameter value
+         * @return this
+         */
+        public Builder addPathParameter(String parameter, String value) {
+            if (pathParameters == null) {
+                pathParameters = new HashMap<>();
+            }
+            pathParameters.put(parameter, value);
+            return this;
+        }
+
+        /**
+         * build the metadata object
+         * 
+         * @return metadata
+         */
+        public OutgoingHttpMetadata build() {
+            return new OutgoingHttpMetadata(
+                    pathParameters == null ? Collections.emptyMap() : pathParameters,
+                    query == null ? Collections.emptyMap() : query,
+                    headers == null ? Collections.emptyMap() : headers);
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/QuarkusHttpConnector.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/QuarkusHttpConnector.java
new file mode 100644
index 0000000000000..18d8dfe084410
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/QuarkusHttpConnector.java
@@ -0,0 +1,118 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.INCOMING;
+import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.INCOMING_AND_OUTGOING;
+import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.OUTGOING;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.spi.Connector;
+import org.eclipse.microprofile.reactive.messaging.spi.IncomingConnectorFactory;
+import org.eclipse.microprofile.reactive.messaging.spi.OutgoingConnectorFactory;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.serializers.SerializerFactoryBase;
+import io.quarkus.runtime.configuration.DurationConverter;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.reactive.messaging.annotations.ConnectorAttribute;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpMethod;
+
+/**
+ * Quarkus-specific reactive messaging connector for HTTP
+ */
+@ConnectorAttribute(name = "url", type = "string", direction = OUTGOING, description = "The target URL", mandatory = true)
+@ConnectorAttribute(name = "serializer", type = "string", direction = OUTGOING, description = "Message serializer")
+@ConnectorAttribute(name = "maxPoolSize", type = "int", direction = OUTGOING, description = "Maximum pool size for connections")
+@ConnectorAttribute(name = "maxWaitQueueSize", type = "int", direction = OUTGOING, description = "Maximum requests allowed in the wait queue of the underlying client.  If the value is set to a negative number then the queue will be unbounded")
+@ConnectorAttribute(name = "maxRetries", type = "int", direction = OUTGOING, description = "The number of attempts to make for sending a request to a remote endpoint. Must not be less than zero", defaultValue = QuarkusHttpConnector.DEFAULT_MAX_ATTEMPTS_STR)
+@ConnectorAttribute(name = "jitter", type = "string", direction = OUTGOING, description = "Configures the random factor when using back-off with maxRetries > 0", defaultValue = QuarkusHttpConnector.DEFAULT_JITTER)
+@ConnectorAttribute(name = "delay", type = "string", direction = OUTGOING, description = "Configures a back-off delay between attempts to send a request. A random factor (jitter) is applied to increase the delay when several failures happen.")
+
+@ConnectorAttribute(name = "method", type = "string", direction = INCOMING_AND_OUTGOING, description = "The HTTP method (either `POST` or `PUT`)", defaultValue = "POST")
+@ConnectorAttribute(name = "path", type = "string", direction = INCOMING, description = "The path of the endpoint", mandatory = true)
+@ConnectorAttribute(name = "buffer-size", type = "string", direction = INCOMING, description = "HTTP endpoint buffers messages if a consumer is not able to keep up. This setting specifies the size of the buffer.", defaultValue = QuarkusHttpConnector.DEFAULT_SOURCE_BUFFER_STR)
+
+@Connector(QuarkusHttpConnector.NAME)
+@ApplicationScoped
+public class QuarkusHttpConnector implements IncomingConnectorFactory, OutgoingConnectorFactory {
+    private static final Logger log = Logger.getLogger(QuarkusHttpConnector.class);
+
+    static final String DEFAULT_JITTER = "0.5";
+    static final String DEFAULT_MAX_ATTEMPTS_STR = "0";
+
+    static final String DEFAULT_SOURCE_BUFFER_STR = "8";
+
+    public static final Integer DEFAULT_SOURCE_BUFFER = Integer.valueOf(DEFAULT_SOURCE_BUFFER_STR);
+
+    public static final String NAME = "quarkus-http";
+
+    @Inject
+    ReactiveHttpHandlerBean handlerBean;
+
+    @Inject
+    Vertx vertx;
+
+    @Inject
+    SerializerFactoryBase serializerFactory;
+
+    @Override
+    public PublisherBuilder<HttpMessage<?>> getPublisherBuilder(Config configuration) {
+        QuarkusHttpConnectorIncomingConfiguration config = new QuarkusHttpConnectorIncomingConfiguration(configuration);
+        String methodAsString = config.getMethod();
+        HttpMethod method = getMethod(methodAsString);
+
+        Multi<HttpMessage<?>> processor = handlerBean.getProcessor(config.getPath(), method);
+
+        return ReactiveStreams.fromPublisher(processor);
+    }
+
+    private HttpMethod getMethod(String methodAsString) {
+        try {
+            return HttpMethod.valueOf(methodAsString);
+        } catch (IllegalArgumentException e) {
+            String error = "Unsupported HTTP method: " + methodAsString + ". The supported methods are: "
+                    + Arrays.toString(HttpMethod.values());
+            log.warn(error, e);
+            throw new IllegalArgumentException(error);
+        }
+    }
+
+    @Override
+    public SubscriberBuilder<? extends Message<?>, Void> getSubscriberBuilder(Config configuration) {
+        QuarkusHttpConnectorOutgoingConfiguration config = new QuarkusHttpConnectorOutgoingConfiguration(configuration);
+        String url = config.getUrl();
+        String method = getMethod(config.getMethod()).name();
+        String serializer = config.getSerializer().orElse(null);
+        Optional<String> maybeDelay = config.getDelay();
+
+        Optional<Duration> delay = maybeDelay.map(DurationConverter::parseDuration);
+
+        String jitterAsString = config.getJitter();
+        Integer maxRetries = config.getMaxRetries();
+
+        Optional<Integer> maxPoolSize = config.getMaxPoolSize();
+        Optional<Integer> maxWaitQueueSize = config.getMaxWaitQueueSize();
+
+        double jitter;
+        try {
+            jitter = Double.valueOf(jitterAsString);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException(String.format("Failed to parse jitter value '%s' to a double.", jitterAsString));
+        }
+
+        return new HttpSink(vertx, method, url, serializer, maxRetries, jitter, delay, maxPoolSize, maxWaitQueueSize,
+                serializerFactory).sink();
+    }
+
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/QuarkusWebSocketConnector.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/QuarkusWebSocketConnector.java
new file mode 100644
index 0000000000000..bbb5f077c6fd0
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/QuarkusWebSocketConnector.java
@@ -0,0 +1,84 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import static io.quarkus.reactivemessaging.http.runtime.QuarkusWebSocketConnector.DEFAULT_JITTER;
+import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.INCOMING;
+import static io.smallrye.reactive.messaging.annotations.ConnectorAttribute.Direction.OUTGOING;
+
+import java.net.URI;
+import java.time.Duration;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.spi.Connector;
+import org.eclipse.microprofile.reactive.messaging.spi.IncomingConnectorFactory;
+import org.eclipse.microprofile.reactive.messaging.spi.OutgoingConnectorFactory;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+
+import io.quarkus.reactivemessaging.http.runtime.serializers.SerializerFactoryBase;
+import io.quarkus.runtime.configuration.DurationConverter;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.reactive.messaging.annotations.ConnectorAttribute;
+import io.vertx.core.Vertx;
+
+/**
+ * Quarkus-specific reactive messaging connector for web sockets
+ */
+@Connector(QuarkusWebSocketConnector.NAME)
+
+@ConnectorAttribute(name = "url", type = "string", direction = OUTGOING, description = "The target URL", mandatory = true)
+@ConnectorAttribute(name = "serializer", type = "string", direction = OUTGOING, description = "Message serializer")
+@ConnectorAttribute(name = "maxRetries", type = "int", direction = OUTGOING, description = "The number of retries to make for sending a message to a remote websocket endpoint. A value greater than 0 is advised. Otherwise, a web socket timeout can result in a dropped message", defaultValue = QuarkusWebSocketConnector.DEFAULT_MAX_ATTEMPTS_STR)
+@ConnectorAttribute(name = "jitter", type = "double", direction = OUTGOING, description = "Configures the random factor when using back-off with maxAttempts > 1", defaultValue = DEFAULT_JITTER)
+@ConnectorAttribute(name = "delay", type = "string", direction = OUTGOING, description = "Configures a back-off delay between attempts to send a request. A random factor (jitter) is applied to increase the delay when several failures happen.")
+
+@ConnectorAttribute(name = "path", type = "string", direction = INCOMING, description = "The path of the endpoint", mandatory = true)
+@ConnectorAttribute(name = "buffer-size", type = "string", direction = INCOMING, description = "Web socket endpoint buffers messages if a consumer is not able to keep up. This setting specifies the size of the buffer.", defaultValue = QuarkusHttpConnector.DEFAULT_SOURCE_BUFFER_STR)
+@ApplicationScoped
+public class QuarkusWebSocketConnector implements IncomingConnectorFactory, OutgoingConnectorFactory {
+    public static final String NAME = "quarkus-websocket";
+
+    static final String DEFAULT_JITTER = "0.5";
+    static final String DEFAULT_MAX_ATTEMPTS_STR = "1";
+
+    static final String DEFAULT_SOURCE_BUFFER_STR = "8";
+
+    public static final Integer DEFAULT_SOURCE_BUFFER = Integer.valueOf(DEFAULT_SOURCE_BUFFER_STR);
+
+    @Inject
+    ReactiveWebSocketHandlerBean handlerBean;
+
+    @Inject
+    SerializerFactoryBase serializerFactory;
+
+    @Inject
+    Vertx vertx;
+
+    @Override
+    public PublisherBuilder<WebSocketMessage<?>> getPublisherBuilder(Config configuration) {
+        QuarkusWebSocketConnectorIncomingConfiguration config = new QuarkusWebSocketConnectorIncomingConfiguration(
+                configuration);
+        String path = config.getPath();
+
+        Multi<WebSocketMessage<?>> processor = handlerBean.getProcessor(path);
+        return ReactiveStreams.fromPublisher(processor);
+    }
+
+    @Override
+    public SubscriberBuilder<? extends Message<?>, Void> getSubscriberBuilder(Config configuration) {
+        QuarkusWebSocketConnectorOutgoingConfiguration config = new QuarkusWebSocketConnectorOutgoingConfiguration(
+                configuration);
+        String serializer = config.getSerializer().orElse(null);
+        Optional<Duration> delay = config.getDelay().map(DurationConverter::parseDuration);
+        Double jitter = config.getJitter();
+        Integer maxRetries = config.getMaxRetries();
+        URI url = URI.create(config.getUrl());
+
+        return new WebSocketSink(vertx, url, serializer, serializerFactory, maxRetries, delay, jitter).sink();
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHandlerBeanBase.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHandlerBeanBase.java
new file mode 100644
index 0000000000000..5a427728e8e14
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHandlerBeanBase.java
@@ -0,0 +1,83 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
+import io.quarkus.reactivemessaging.http.runtime.config.StreamConfigBase;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.subscription.BackPressureStrategy;
+import io.smallrye.mutiny.subscription.MultiEmitter;
+import io.vertx.ext.web.RoutingContext;
+
+abstract class ReactiveHandlerBeanBase<ConfigType extends StreamConfigBase, MessageType> {
+
+    protected final Map<String, Bundle<MessageType>> processors = new HashMap<>();
+
+    @PostConstruct
+    void init() {
+        configs().forEach(this::addProcessor);
+    }
+
+    void handle(RoutingContext event) {
+        Bundle<MessageType> bundle = processors.get(key(event));
+        if (bundle != null) {
+            MultiEmitter<? super MessageType> emitter = bundle.emitter;
+            StrictQueueSizeGuard guard = bundle.guard;
+            handleRequest(event, emitter, guard);
+        } else {
+            event.response().setStatusCode(404).end();
+        }
+    }
+
+    private void addProcessor(ConfigType streamConfig) {
+        StrictQueueSizeGuard guard = new StrictQueueSizeGuard(streamConfig.bufferSize);
+        Bundle<MessageType> bundle = new Bundle<>(guard);
+
+        Multi<MessageType> processor = Multi.createFrom()
+                // emitter with an unbounded queue, we control the size ourselves, with the guard
+                .<MessageType> emitter(bundle::setEmitter, BackPressureStrategy.BUFFER)
+                .onItem().invoke(guard::dequeue);
+        bundle.setProcessor(processor);
+
+        Bundle<MessageType> previousProcessor = processors.put(key(streamConfig), bundle);
+        if (previousProcessor != null) {
+            throw new IllegalStateException("Duplicate incoming streams defined for " + description(streamConfig));
+        }
+    }
+
+    protected abstract void handleRequest(RoutingContext event, MultiEmitter<? super MessageType> emitter,
+            StrictQueueSizeGuard guard);
+
+    protected abstract String description(ConfigType streamConfig);
+
+    protected abstract String key(ConfigType streamConfig);
+
+    protected abstract String key(RoutingContext context);
+
+    protected abstract Collection<ConfigType> configs();
+
+    protected class Bundle<MessageType> {
+        private final StrictQueueSizeGuard guard;
+        private Multi<MessageType> processor; // effectively final
+        private MultiEmitter<? super MessageType> emitter; // effectively final
+
+        private Bundle(StrictQueueSizeGuard guard) {
+            this.guard = guard;
+        }
+
+        public void setProcessor(Multi<MessageType> processor) {
+            this.processor = processor;
+        }
+
+        public void setEmitter(MultiEmitter<? super MessageType> emitter) {
+            this.emitter = emitter;
+        }
+
+        public Multi<MessageType> getProcessor() {
+            return processor;
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpHandler.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpHandler.java
new file mode 100644
index 0000000000000..09e88d41858dd
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpHandler.java
@@ -0,0 +1,21 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+class ReactiveHttpHandler implements Handler<RoutingContext> {
+    private final ReactiveHttpHandlerBean handler;
+
+    ReactiveHttpHandler(ReactiveHttpHandlerBean handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        try {
+            handler.handle(event);
+        } catch (RuntimeException any) {
+            event.fail(any);
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpHandlerBean.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpHandlerBean.java
new file mode 100644
index 0000000000000..f6200f8b088cb
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpHandlerBean.java
@@ -0,0 +1,79 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.config.HttpStreamConfig;
+import io.quarkus.reactivemessaging.http.runtime.config.ReactiveHttpConfig;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.subscription.MultiEmitter;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * a bean that handles incoming http requests
+ */
+@Singleton
+public class ReactiveHttpHandlerBean extends ReactiveHandlerBeanBase<HttpStreamConfig, HttpMessage<?>> {
+
+    private static final Logger log = Logger.getLogger(ReactiveHttpHandlerBean.class);
+
+    @Inject
+    ReactiveHttpConfig config;
+
+    Multi<HttpMessage<?>> getProcessor(String path, HttpMethod method) {
+        return processors.get(key(path, method)).getProcessor();
+    }
+
+    @Override
+    protected Collection<HttpStreamConfig> configs() {
+        return config.getHttpConfigs();
+    }
+
+    @Override
+    protected String key(HttpStreamConfig streamConfig) {
+        return key(streamConfig.path, streamConfig.method);
+    }
+
+    @Override
+    protected String key(RoutingContext context) {
+        return key(context.normalisedPath(), context.request().method());
+    }
+
+    @Override
+    protected String description(HttpStreamConfig streamConfig) {
+        return String.format("path: %s, method %s", streamConfig.path, streamConfig.method);
+    }
+
+    @Override
+    protected void handleRequest(RoutingContext event, MultiEmitter<? super HttpMessage<?>> emitter,
+            StrictQueueSizeGuard guard) {
+        if (guard.prepareToEmit()) {
+            try {
+                HttpMessage<Buffer> message = new HttpMessage<>(event.getBody(), new IncomingHttpMetadata(event.request()),
+                        () -> event.response().setStatusCode(202).end(),
+                        error -> onUnexpectedError(event, error, "Failed to process message."));
+                emitter.emit(message);
+            } catch (Exception any) {
+                guard.dequeue();
+                onUnexpectedError(event, any, "Emitting message failed");
+            }
+        } else {
+            event.response().setStatusCode(503).end();
+        }
+    }
+
+    private void onUnexpectedError(RoutingContext event, Throwable error, String message) {
+        event.response().setStatusCode(500).end("Unexpected error while processing the message");
+        log.error(message, error);
+    }
+
+    private String key(String path, HttpMethod method) {
+        return String.format("%s:%s", path, method);
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpRecorder.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpRecorder.java
new file mode 100644
index 0000000000000..7ae54238a128b
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveHttpRecorder.java
@@ -0,0 +1,20 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class ReactiveHttpRecorder {
+
+    public Handler<RoutingContext> createWebSocketeHandler() {
+        ReactiveWebSocketHandlerBean bean = Arc.container().instance(ReactiveWebSocketHandlerBean.class).get();
+        return new ReactiveWebSocketHandler(bean);
+    }
+
+    public Handler<RoutingContext> createHttpHandler() {
+        ReactiveHttpHandlerBean bean = Arc.container().instance(ReactiveHttpHandlerBean.class).get();
+        return new ReactiveHttpHandler(bean);
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveWebSocketHandler.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveWebSocketHandler.java
new file mode 100644
index 0000000000000..d03fe26705fb1
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveWebSocketHandler.java
@@ -0,0 +1,17 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+class ReactiveWebSocketHandler implements Handler<RoutingContext> {
+    private final ReactiveWebSocketHandlerBean handler;
+
+    ReactiveWebSocketHandler(ReactiveWebSocketHandlerBean handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        handler.handle(event);
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveWebSocketHandlerBean.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveWebSocketHandlerBean.java
new file mode 100644
index 0000000000000..cb3b1983d825e
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/ReactiveWebSocketHandlerBean.java
@@ -0,0 +1,91 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.config.ReactiveHttpConfig;
+import io.quarkus.reactivemessaging.http.runtime.config.WebSocketStreamConfig;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.subscription.MultiEmitter;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * a bean that handles incoming web socket messages
+ */
+@Singleton
+public class ReactiveWebSocketHandlerBean extends ReactiveHandlerBeanBase<WebSocketStreamConfig, WebSocketMessage<?>> {
+
+    private static final Logger log = Logger.getLogger(ReactiveWebSocketHandlerBean.class);
+
+    @Inject
+    ReactiveHttpConfig config;
+
+    @Override
+    protected void handleRequest(RoutingContext event, MultiEmitter<? super WebSocketMessage<?>> emitter,
+            StrictQueueSizeGuard guard) {
+        event.request().toWebSocket(
+                webSocket -> {
+                    if (webSocket.failed()) {
+                        log.error("failed to connect web socket", webSocket.cause());
+                    } else {
+                        ServerWebSocket serverWebSocket = webSocket.result();
+                        serverWebSocket.handler(
+                                b -> {
+                                    if (guard.prepareToEmit()) {
+                                        try {
+                                            emitter.emit(new WebSocketMessage<>(b,
+                                                    () -> serverWebSocket.write(Buffer.buffer("ACK")),
+                                                    error -> onUnexpectedError(serverWebSocket, error,
+                                                            "Failed to process incoming web socket message.")));
+                                        } catch (Exception error) {
+                                            guard.dequeue();
+                                            onUnexpectedError(serverWebSocket, error, "Emitting message failed");
+                                        }
+                                    } else {
+                                        serverWebSocket.write(Buffer.buffer("BUFFER_OVERFLOW"));
+                                    }
+                                });
+                    }
+                });
+    }
+
+    @Override
+    protected String description(WebSocketStreamConfig config) {
+        return String.format("path %s", config.path);
+    }
+
+    @Override
+    protected String key(WebSocketStreamConfig config) {
+        return config.path;
+    }
+
+    @Override
+    protected String key(RoutingContext context) {
+        return context.normalisedPath();
+    }
+
+    @Override
+    protected Collection<WebSocketStreamConfig> configs() {
+        return config.getWebSocketConfigs();
+    }
+
+    private void onUnexpectedError(ServerWebSocket serverWebSocket, Throwable error, String message) {
+        log.error(message, error);
+        // TODO some error message for the client? exception mapper would be best...
+        serverWebSocket.close((short) 3500, message);
+    }
+
+    Multi<WebSocketMessage<?>> getProcessor(String path) {
+        Bundle<WebSocketMessage<?>> bundle = processors.get(path);
+        if (bundle == null) {
+            throw new IllegalStateException("No incoming stream defined for path " + path);
+        }
+        return bundle.getProcessor();
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/StrictQueueSizeGuard.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/StrictQueueSizeGuard.java
new file mode 100644
index 0000000000000..28890ee5f69aa
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/StrictQueueSizeGuard.java
@@ -0,0 +1,43 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * A non-blocking utility class to keep the amount of enqueued emissions under a certain number ({@code queueSize})
+ */
+class StrictQueueSizeGuard {
+    private final int queueSize;
+    private final AtomicInteger enqueued = new AtomicInteger();
+
+    /**
+     * @param queueSize size of the queue
+     */
+    StrictQueueSizeGuard(int queueSize) {
+        this.queueSize = queueSize;
+    }
+
+    /**
+     * mark an emission as dequeued. In other words, remove it from the count
+     */
+    void dequeue() {
+        enqueued.decrementAndGet();
+    }
+
+    /**
+     *
+     * @return if the message can be emitted or not
+     */
+    boolean prepareToEmit() {
+        while (true) {
+            int oldVal = enqueued.get();
+            int newVal = oldVal + 1;
+            if (newVal <= queueSize) {
+                if (enqueued.compareAndSet(oldVal, newVal)) {
+                    return true;
+                } // else try again
+            } else {
+                return false; // too many messages to enqueue
+            }
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/WebSocketMessage.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/WebSocketMessage.java
new file mode 100644
index 0000000000000..be8ff674310ff
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/WebSocketMessage.java
@@ -0,0 +1,43 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+class WebSocketMessage<PayloadType> implements Message<PayloadType> {
+
+    private final PayloadType payload;
+    private final Runnable successHandler;
+    private final Consumer<Throwable> failureHandler;
+
+    WebSocketMessage(PayloadType payload, Runnable successHandler, Consumer<Throwable> failureHandler) {
+        this.payload = payload;
+        this.successHandler = successHandler;
+        this.failureHandler = failureHandler;
+    }
+
+    @Override
+    public PayloadType getPayload() {
+        return payload;
+    }
+
+    @Override
+    public Supplier<CompletionStage<Void>> getAck() {
+        return () -> {
+            successHandler.run();
+            return CompletableFuture.completedFuture(null);
+        };
+    }
+
+    @Override
+    public Function<Throwable, CompletionStage<Void>> getNack() {
+        return error -> {
+            failureHandler.accept(error);
+            return CompletableFuture.completedFuture(null);
+        };
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/WebSocketSink.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/WebSocketSink.java
new file mode 100644
index 0000000000000..5780db90f892c
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/WebSocketSink.java
@@ -0,0 +1,162 @@
+package io.quarkus.reactivemessaging.http.runtime;
+
+import static java.util.Arrays.asList;
+
+import java.net.URI;
+import java.time.Duration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.serializers.Serializer;
+import io.quarkus.reactivemessaging.http.runtime.serializers.SerializerFactoryBase;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.groups.UniRetry;
+import io.smallrye.mutiny.vertx.AsyncResultUni;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Future;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.WebSocket;
+import io.vertx.core.http.WebSocketConnectOptions;
+
+class WebSocketSink {
+
+    private static final Logger log = Logger.getLogger(WebSocketSink.class);
+
+    private static final String WSS = "wss";
+    private static final List<String> supportedSchemes = asList("ws", WSS);
+
+    private final URI uri;
+    private final HttpClient httpClient;
+    private final SubscriberBuilder<Message<?>, Void> subscriber;
+    private final boolean ssl;
+    private final String serializer;
+    private final SerializerFactoryBase serializerFactory;
+
+    WebSocketSink(Vertx vertx, URI uri, String serializer, SerializerFactoryBase serializerFactory,
+            int maxRetries, Optional<Duration> delay, double jitter) {
+        this.uri = uri;
+        this.serializerFactory = serializerFactory;
+        this.serializer = serializer;
+
+        String scheme = uri.getScheme().toLowerCase(Locale.getDefault());
+        if (!supportedSchemes.contains(scheme)) {
+            throw new IllegalArgumentException("Invalid scheme '" + scheme + "' for the websocket sink URL: " + uri);
+        }
+        ssl = WSS.equals(scheme);
+
+        httpClient = vertx.createHttpClient();
+        subscriber = ReactiveStreams.<Message<?>> builder()
+                .flatMapCompletionStage(m -> {
+                    Uni<Void> send = send(m);
+
+                    log.debugf("maxRetries: %d", maxRetries);
+                    if (maxRetries > 0) {
+                        UniRetry<Void> retry = send.onFailure().retry();
+                        if (delay.isPresent()) {
+                            retry = retry.withBackOff(delay.get()).withJitter(jitter);
+                        }
+                        send = retry.atMost(maxRetries);
+                    }
+
+                    return send
+                            .onItemOrFailure().transformToUni(
+                                    (result, error) -> {
+                                        if (error != null) {
+                                            return Uni.createFrom().completionStage(m.nack(error).thenApply(x -> {
+                                                log.debug("error responding", error);
+                                                return m;
+                                            }));
+                                        }
+                                        return Uni.createFrom().completionStage(m.ack().thenApply(x -> {
+                                            log.debug("responded with success", error);
+                                            return m;
+                                        }));
+                                    })
+                            .subscribeAsCompletionStage();
+                })
+                .ignore();
+    }
+
+    private final AtomicReference<WebSocket> websocket = new AtomicReference<>();
+
+    private void connect(WebSocketConnectOptions options, Handler<AsyncResult<WebSocket>> handler) {
+        log.debug("using a new web socket connection");
+        httpClient.webSocket(options, connectResult -> {
+            if (connectResult.succeeded()) {
+                WebSocket result = connectResult.result();
+                WebSocket oldWs = websocket.getAndSet(result);
+                if (oldWs != null) { // someone might have initialized it in parallel
+                    log.debug("Closing previous web socket connection");
+                    oldWs.close();
+                }
+
+                result.closeHandler(ignored -> {
+                    log.debug("WebSocket disconnected");
+                    websocket.compareAndSet(result, null);
+                });
+                handler.handle(connectResult);
+            } else {
+                handler.handle(Future.failedFuture(connectResult.cause()));
+            }
+        });
+    }
+
+    private Uni<Void> send(Message<?> message) {
+        WebSocketConnectOptions options = options();
+        Serializer<Object> serializer = serializerFactory.getSerializer(this.serializer, message.getPayload());
+        Buffer serialized = serializer.serialize(message.getPayload());
+
+        return AsyncResultUni.toUni(
+                // all happening in "one step" so that the retry mechanism is applied to the connection too
+                handler -> {
+                    WebSocket ws = websocket.get();
+                    if (ws != null && !ws.isClosed()) {
+                        log.debug("reusing a previous web socket connection");
+                        _send(ws, serialized, handler);
+                    } else {
+                        connect(options, result -> {
+                            if (result.succeeded()) {
+                                _send(result.result(), serialized, handler);
+                            } else {
+                                handler.handle(Future.failedFuture(result.cause()));
+                            }
+                        });
+                    }
+                });
+    }
+
+    private WebSocketConnectOptions options() {
+        return new WebSocketConnectOptions()
+                .setSsl(ssl)
+                .setHost(uri.getHost())
+                .setPort(uri.getPort())
+                .setURI(uri.getPath());
+    }
+
+    private void _send(WebSocket webSocket, Buffer serialized, Handler<AsyncResult<Void>> handler) {
+        log.debug("sending out the message");
+        webSocket.write(serialized, writeResult -> {
+            if (writeResult.succeeded()) {
+                log.debug("success");
+            } else {
+                Throwable cause = writeResult.cause();
+                log.debug("failure", cause);
+            }
+            handler.handle(writeResult);
+        });
+    }
+
+    SubscriberBuilder<Message<?>, Void> sink() {
+        return subscriber;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/HttpStreamConfig.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/HttpStreamConfig.java
new file mode 100644
index 0000000000000..127302d410215
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/HttpStreamConfig.java
@@ -0,0 +1,28 @@
+package io.quarkus.reactivemessaging.http.runtime.config;
+
+import java.util.Locale;
+
+import io.vertx.core.http.HttpMethod;
+
+public class HttpStreamConfig extends StreamConfigBase {
+    public final HttpMethod method;
+    public final String path;
+
+    public HttpStreamConfig(String path, String method, String name, int bufferSize) {
+        super(bufferSize);
+        this.path = path;
+        this.method = toHttpMethod(method, name);
+    }
+
+    public String path() {
+        return path;
+    }
+
+    private HttpMethod toHttpMethod(String method, String connectorName) {
+        try {
+            return HttpMethod.valueOf(method.toUpperCase(Locale.ENGLISH));
+        } catch (IllegalArgumentException e) {
+            throw new IllegalStateException("Invalid http method '" + method + "' defined for connector " + connectorName);
+        }
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/ReactiveHttpConfig.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/ReactiveHttpConfig.java
new file mode 100644
index 0000000000000..4907f2c582800
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/ReactiveHttpConfig.java
@@ -0,0 +1,155 @@
+package io.quarkus.reactivemessaging.http.runtime.config;
+
+import static java.util.regex.Pattern.quote;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+
+import io.quarkus.reactivemessaging.http.runtime.QuarkusHttpConnector;
+import io.quarkus.reactivemessaging.http.runtime.QuarkusWebSocketConnector;
+
+/**
+ * Utility class for reading http and web socket connector configuration
+ */
+@Singleton
+public class ReactiveHttpConfig {
+    private static final String CONNECTOR = ".connector";
+
+    private static final String MP_MSG_IN = "mp.messaging.incoming.";
+    private static final String IN_KEY = "mp.messaging.incoming.%s.%s";
+    private static final Pattern IN_PATTERN = Pattern.compile(quote(MP_MSG_IN) + "[^.]+" + quote(CONNECTOR));
+
+    private static final String MP_MSG_OUT = "mp.messaging.outgoing.";
+    private static final String OUT_KEY = "mp.messaging.outgoing.%s.%s";
+    private static final Pattern OUT_PATTERN = Pattern.compile(quote(MP_MSG_OUT) + "[^.]+" + quote(CONNECTOR));
+
+    private List<HttpStreamConfig> httpConfigs;
+    private List<WebSocketStreamConfig> websocketConfigs;
+
+    /**
+     * @return list of http stream configurations
+     */
+    public List<HttpStreamConfig> getHttpConfigs() {
+        return httpConfigs;
+    }
+
+    /**
+     * @return list of web socket stream configurations
+     */
+    public List<WebSocketStreamConfig> getWebSocketConfigs() {
+        return websocketConfigs;
+    }
+
+    @PostConstruct
+    void init() {
+        httpConfigs = readIncomingHttpConfigs();
+        websocketConfigs = readIncomingWebSocketConfigs();
+    }
+
+    /**
+     * Reads HTTP config, can be used in the build time
+     * 
+     * @return list of HTTP configurations
+     */
+    public static List<HttpStreamConfig> readIncomingHttpConfigs() {
+        List<HttpStreamConfig> streamConfigs = new ArrayList<>();
+        Config config = ConfigProviderResolver.instance().getConfig();
+        for (String propertyName : config.getPropertyNames()) {
+            String connectorName = getConnectorNameIfMatching(IN_PATTERN, propertyName, IN_KEY, MP_MSG_IN,
+                    QuarkusHttpConnector.NAME);
+            if (connectorName != null) {
+                String method = getConfigProperty(IN_KEY, connectorName, "method", "POST", String.class);
+                String path = getConfigProperty(IN_KEY, connectorName, "path", String.class);
+                int bufferSize = getConfigProperty(IN_KEY, connectorName, "buffer-size",
+                        QuarkusHttpConnector.DEFAULT_SOURCE_BUFFER, Integer.class);
+                streamConfigs.add(new HttpStreamConfig(path, method, connectorName, bufferSize));
+            }
+        }
+        return streamConfigs;
+    }
+
+    /**
+     * Reads web socket config, can be used in the build time
+     * 
+     * @return list of web socket configurations
+     */
+    public static List<WebSocketStreamConfig> readIncomingWebSocketConfigs() {
+        List<WebSocketStreamConfig> streamConfigs = new ArrayList<>();
+        Config config = ConfigProviderResolver.instance().getConfig();
+        for (String propertyName : config.getPropertyNames()) {
+            String connectorName = getConnectorNameIfMatching(IN_PATTERN, propertyName, IN_KEY, MP_MSG_IN,
+                    QuarkusWebSocketConnector.NAME);
+
+            if (connectorName != null) {
+                String path = getConfigProperty(IN_KEY, connectorName, "path", String.class);
+                int bufferSize = getConfigProperty(IN_KEY, connectorName, "buffer-size",
+                        QuarkusWebSocketConnector.DEFAULT_SOURCE_BUFFER, Integer.class);
+                streamConfigs.add(new WebSocketStreamConfig(path, bufferSize));
+            }
+        }
+        return streamConfigs;
+    }
+
+    /**
+     * Read custom serializer class names from the configuration
+     * 
+     * @return list of custom serializer class names
+     */
+    public static List<String> readSerializers() {
+        List<String> result = new ArrayList<>();
+        Config config = ConfigProviderResolver.instance().getConfig();
+        for (String propertyName : config.getPropertyNames()) {
+            String connectorName = getConnectorNameIfMatching(OUT_PATTERN, propertyName, OUT_KEY, MP_MSG_OUT,
+                    QuarkusWebSocketConnector.NAME);
+            if (connectorName == null) {
+                connectorName = getConnectorNameIfMatching(OUT_PATTERN, propertyName, OUT_KEY, MP_MSG_OUT,
+                        QuarkusHttpConnector.NAME);
+            }
+            if (connectorName != null) {
+                String serializer = getConfigProperty(OUT_KEY, connectorName, "serializer", null, String.class);
+                if (serializer != null) {
+                    result.add(serializer);
+                }
+            }
+        }
+        return result;
+    }
+
+    private static String getConnectorNameIfMatching(Pattern connectorPropertyPattern,
+            String propertyName, String format, String prefix, String expectedConnectorType) {
+        Matcher matcher = connectorPropertyPattern.matcher(propertyName);
+        if (matcher.matches()) {
+            String connectorName = propertyName.substring(prefix.length(), propertyName.length() - CONNECTOR.length());
+            String connectorType = getConfigProperty(format, connectorName, "connector", String.class);
+            boolean matches = expectedConnectorType.equals(connectorType);
+            return matches ? connectorName : null;
+        } else {
+            return null;
+        }
+    }
+
+    private static <T> T getConfigProperty(String format, String connectorName, String property, T defValue, Class<T> type) {
+        String key = String.format(format, connectorName, property);
+        return ConfigProvider.getConfig().getOptionalValue(key, type).orElse(defValue);
+    }
+
+    private static <T> T getConfigProperty(String format, String connectorName, String property, Class<T> type) {
+        String key = String.format(format, connectorName, property);
+        return ConfigProvider.getConfig().getOptionalValue(key, type)
+                .orElseThrow(() -> noPropertyFound(connectorName, property));
+    }
+
+    private static IllegalStateException noPropertyFound(String key, String propertyName) {
+        String message = String.format("No %s defined for reactive http connector '%s'", propertyName, key);
+        return new IllegalStateException(message);
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/StreamConfigBase.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/StreamConfigBase.java
new file mode 100644
index 0000000000000..caed4a514a826
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/StreamConfigBase.java
@@ -0,0 +1,9 @@
+package io.quarkus.reactivemessaging.http.runtime.config;
+
+public class StreamConfigBase {
+    public final int bufferSize;
+
+    public StreamConfigBase(int bufferSize) {
+        this.bufferSize = bufferSize;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/WebSocketStreamConfig.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/WebSocketStreamConfig.java
new file mode 100644
index 0000000000000..c2ff5316ae000
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/config/WebSocketStreamConfig.java
@@ -0,0 +1,14 @@
+package io.quarkus.reactivemessaging.http.runtime.config;
+
+public class WebSocketStreamConfig extends StreamConfigBase {
+    public final String path;
+
+    public WebSocketStreamConfig(String path, int bufferSize) {
+        super(bufferSize);
+        this.path = path;
+    }
+
+    public String path() {
+        return path;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JacksonBasedConverter.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JacksonBasedConverter.java
new file mode 100644
index 0000000000000..5e82554aa2d48
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JacksonBasedConverter.java
@@ -0,0 +1,30 @@
+package io.quarkus.reactivemessaging.http.runtime.converters;
+
+import java.lang.reflect.Type;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.logging.Logger;
+
+import io.smallrye.reactive.messaging.MessageConverter;
+
+public abstract class JacksonBasedConverter implements MessageConverter {
+    private static final Logger log = Logger.getLogger(JacksonBasedConverter.class);
+
+    @Override
+    public Message<?> convert(Message<?> in, Type target) {
+        try {
+            return doConvert(in, target);
+        } catch (Exception any) {
+            String suffix = "";
+            if (any instanceof IllegalArgumentException) {
+                String message = any.getMessage();
+                suffix = ": " + message;
+            }
+            log.error("Failed to convert payload to type " + target + suffix, any);
+
+            return in;
+        }
+    }
+
+    protected abstract Message<?> doConvert(Message<?> in, Type target);
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JsonArrayConverter.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JsonArrayConverter.java
new file mode 100644
index 0000000000000..10b4cc533d6e3
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JsonArrayConverter.java
@@ -0,0 +1,27 @@
+package io.quarkus.reactivemessaging.http.runtime.converters;
+
+import java.lang.reflect.Type;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonArray;
+
+/**
+ * Converts message payload to {@link JsonArray}
+ */
+@ApplicationScoped
+public class JsonArrayConverter extends JacksonBasedConverter {
+
+    @Override
+    public boolean canConvert(Message<?> in, Type target) {
+        return in.getPayload() instanceof Buffer && target == JsonArray.class;
+    }
+
+    @Override
+    protected Message<JsonArray> doConvert(Message<?> in, Type target) {
+        return in.withPayload(new JsonArray((Buffer) in.getPayload()));
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JsonObjectConverter.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JsonObjectConverter.java
new file mode 100644
index 0000000000000..6fa2089c96959
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/JsonObjectConverter.java
@@ -0,0 +1,27 @@
+package io.quarkus.reactivemessaging.http.runtime.converters;
+
+import java.lang.reflect.Type;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+
+/**
+ * Converts message payload to {@link JsonObject}
+ */
+@ApplicationScoped
+public class JsonObjectConverter extends JacksonBasedConverter {
+
+    @Override
+    public boolean canConvert(Message<?> in, Type target) {
+        return in.getPayload() instanceof Buffer && target == JsonObject.class;
+    }
+
+    @Override
+    protected Message<JsonObject> doConvert(Message<?> in, Type target) {
+        return in.withPayload(new JsonObject((Buffer) in.getPayload()));
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/ObjectConverter.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/ObjectConverter.java
new file mode 100644
index 0000000000000..649633db56661
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/ObjectConverter.java
@@ -0,0 +1,41 @@
+package io.quarkus.reactivemessaging.http.runtime.converters;
+
+import java.lang.reflect.Type;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import io.vertx.core.buffer.Buffer;
+
+/**
+ * Converts message payload to objects of specified class.
+ *
+ * Used as the last converter
+ */
+@ApplicationScoped
+public class ObjectConverter extends JacksonBasedConverter {
+
+    @Override
+    public boolean canConvert(Message<?> message, Type type) {
+        if (!(type instanceof Class)) {
+            return false;
+        }
+        Class<?> theClass = (Class<?>) type;
+        return message.getPayload() instanceof Buffer
+                && !Buffer.class.isAssignableFrom(theClass)
+                && Object.class.isAssignableFrom((Class<?>) type);
+    }
+
+    @Override
+    protected Message<?> doConvert(Message<?> message, Type type) {
+        Buffer buffer = (Buffer) message.getPayload();
+        Object result = buffer.toJsonObject().mapTo((Class<?>) type);
+        return message.withPayload(result);
+    }
+
+    @Override
+    public int getPriority() {
+        return Integer.MAX_VALUE; // use this converter only if there is no specific converter
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/StringConverter.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/StringConverter.java
new file mode 100644
index 0000000000000..5fd8a3c4e2201
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/converters/StringConverter.java
@@ -0,0 +1,27 @@
+package io.quarkus.reactivemessaging.http.runtime.converters;
+
+import java.lang.reflect.Type;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import io.smallrye.reactive.messaging.MessageConverter;
+import io.vertx.core.buffer.Buffer;
+
+/**
+ * Converts message payload to String
+ */
+@ApplicationScoped
+public class StringConverter implements MessageConverter {
+
+    @Override
+    public boolean canConvert(Message<?> in, Type target) {
+        return in.getPayload() instanceof Buffer && target == String.class;
+    }
+
+    @Override
+    public Message<String> convert(Message<?> in, Type target) {
+        return in.withPayload(((Buffer) in.getPayload()).toString());
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/BufferSerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/BufferSerializer.java
new file mode 100644
index 0000000000000..adfea61f4fbba
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/BufferSerializer.java
@@ -0,0 +1,18 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import io.vertx.core.buffer.Buffer;
+
+/**
+ * A no-op serializer for Buffers
+ */
+public class BufferSerializer implements Serializer<Buffer> {
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof Buffer;
+    }
+
+    @Override
+    public Buffer serialize(Buffer payload) {
+        return payload;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/CollectionSerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/CollectionSerializer.java
new file mode 100644
index 0000000000000..d991ed156a79e
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/CollectionSerializer.java
@@ -0,0 +1,34 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import java.util.Collection;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+/**
+ * serializer of collections. Serializes collections to a json string inside a Buffer
+ */
+public class CollectionSerializer implements Serializer<Collection<?>> {
+
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof Collection;
+    }
+
+    @Override
+    public Buffer serialize(Collection<?> payload) {
+        JsonArray array = new JsonArray();
+        for (Object element : payload) {
+            array.add(JsonObject.mapFrom(element));
+        }
+
+        return array.toBuffer();
+    }
+
+    @Override
+    public int getPriority() {
+        // first try other serializers, try this one if they don't match
+        return DEFAULT_PRIORITY - 100;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/JsonArraySerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/JsonArraySerializer.java
new file mode 100644
index 0000000000000..a06cf3ebdcb65
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/JsonArraySerializer.java
@@ -0,0 +1,23 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import org.jboss.logging.Logger;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonArray;
+
+/**
+ * Serializer for JsonArray
+ */
+public class JsonArraySerializer implements Serializer<JsonArray> {
+    private static final Logger log = Logger.getLogger(JsonArraySerializer.class);
+
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof JsonArray;
+    }
+
+    @Override
+    public Buffer serialize(JsonArray payload) {
+        return payload.toBuffer();
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/JsonObjectSerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/JsonObjectSerializer.java
new file mode 100644
index 0000000000000..34c20abd50610
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/JsonObjectSerializer.java
@@ -0,0 +1,19 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+
+/**
+ * Serializer for JsonObject
+ */
+public class JsonObjectSerializer implements Serializer<JsonObject> {
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof JsonObject;
+    }
+
+    @Override
+    public Buffer serialize(JsonObject payload) {
+        return payload.toBuffer();
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/NumberSerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/NumberSerializer.java
new file mode 100644
index 0000000000000..f8567dc9564c6
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/NumberSerializer.java
@@ -0,0 +1,18 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import io.vertx.core.buffer.Buffer;
+
+/**
+ * Serializer for numbers
+ */
+public class NumberSerializer implements Serializer<Number> {
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof Number;
+    }
+
+    @Override
+    public Buffer serialize(Number payload) {
+        return Buffer.buffer(payload.toString());
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/ObjectSerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/ObjectSerializer.java
new file mode 100644
index 0000000000000..bc2567d98a041
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/ObjectSerializer.java
@@ -0,0 +1,23 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+
+public class ObjectSerializer implements Serializer<Object> {
+
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof Object;
+    }
+
+    @Override
+    public Buffer serialize(Object payload) {
+        return JsonObject.mapFrom(payload).toBuffer();
+    }
+
+    @Override
+    public int getPriority() {
+        // first try other serializers, try this one if they don't match
+        return DEFAULT_PRIORITY - 200;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/Serializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/Serializer.java
new file mode 100644
index 0000000000000..ff6e1d8efdf98
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/Serializer.java
@@ -0,0 +1,45 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import io.vertx.core.buffer.Buffer;
+
+/**
+ * Reactive http connector serializer.
+ * Serializes given payload to a {@link Buffer}
+ *
+ * The serializers are sorted by Priority.
+ * If more than one says that it {@link Serializer#handles(Object)} the ones with the highest priority is used
+ *
+ * @param <PayloadType> type of the payload to serialize
+ */
+public interface Serializer<PayloadType> {
+
+    /**
+     * default serializer priority
+     */
+    int DEFAULT_PRIORITY = 0;
+
+    /**
+     * if the serializer can handle given payload
+     *
+     * @param payload the payload
+     * @return true iff the seralizer can handle the payload
+     */
+    boolean handles(Object payload);
+
+    /**
+     * serialize the payload
+     * 
+     * @param payload object to serialize
+     * @return a buffer with serialized payload
+     */
+    Buffer serialize(PayloadType payload);
+
+    /**
+     * From serializers that can handle a specific payload, the one with the higher priority is used.
+     * 
+     * @return the priority of the serializer
+     */
+    default int getPriority() {
+        return DEFAULT_PRIORITY;
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/SerializerFactoryBase.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/SerializerFactoryBase.java
new file mode 100644
index 0000000000000..ca38e41c7c1d7
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/SerializerFactoryBase.java
@@ -0,0 +1,80 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+
+/**
+ * a base superclass for a SerializerFactory that is generated in build time
+ */
+public abstract class SerializerFactoryBase {
+    private static final Logger log = Logger.getLogger(SerializerFactoryBase.class);
+
+    private final Map<String, Serializer<?>> serializersByClassName = new HashMap<>();
+    private final List<Serializer<?>> predefinedSerializers = new ArrayList<>();
+
+    protected SerializerFactoryBase() {
+        predefinedSerializers.add(new JsonObjectSerializer());
+        predefinedSerializers.add(new JsonArraySerializer());
+        predefinedSerializers.add(new StringSerializer());
+        predefinedSerializers.add(new BufferSerializer());
+        predefinedSerializers.add(new ObjectSerializer());
+        predefinedSerializers.add(new CollectionSerializer());
+        predefinedSerializers.add(new NumberSerializer());
+
+        predefinedSerializers.sort(Comparator.comparingInt(Serializer::getPriority));
+        Collections.reverse(predefinedSerializers);
+
+        initAdditionalSerializers();
+    }
+
+    /**
+     * method that initializes additional serializers (used by user's config).
+     * Implemented in the generated subclass
+     */
+    protected abstract void initAdditionalSerializers();
+
+    /**
+     * get a {@link Serializer} of a given (class) name or for a given payload type
+     * 
+     * @param name name of the serializer
+     * @param payload payload to serialize
+     * @param <T> type of the payload
+     * @return serializer
+     */
+    public <T> Serializer<T> getSerializer(String name, T payload) {
+        if (payload == null) {
+            throw new IllegalArgumentException("Payload cannot be null");
+        }
+        if (name != null) {
+            @SuppressWarnings("unchecked")
+            Serializer<T> serializer = (Serializer<T>) serializersByClassName.get(name);
+            if (serializer == null) {
+                throw new IllegalArgumentException("No serializer class found for name: " + name);
+            }
+            if (serializer.handles(payload)) {
+                return serializer;
+            } else {
+                log.warnf("Specified serializer (%s) does not handle the payload type %s", name, payload.getClass());
+            }
+        }
+        for (Serializer<?> serializer : predefinedSerializers) {
+            if (serializer.handles(payload)) {
+                //noinspection unchecked
+                return (Serializer<T>) serializer;
+            }
+        }
+        throw new IllegalArgumentException("No predefined serializer found matching class: " + payload.getClass());
+    }
+
+    @SuppressWarnings("unused") // used by a generated subclass
+    void addSerializer(String className, Serializer<?> serializer) {
+        serializersByClassName.put(className, serializer);
+    }
+
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/StringSerializer.java b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/StringSerializer.java
new file mode 100644
index 0000000000000..dd01e6833ecd3
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/java/io/quarkus/reactivemessaging/http/runtime/serializers/StringSerializer.java
@@ -0,0 +1,18 @@
+package io.quarkus.reactivemessaging.http.runtime.serializers;
+
+import io.vertx.core.buffer.Buffer;
+
+/**
+ * Serializer for Strings
+ */
+public class StringSerializer implements Serializer<String> {
+    @Override
+    public boolean handles(Object payload) {
+        return payload instanceof String;
+    }
+
+    @Override
+    public Buffer serialize(String payload) {
+        return Buffer.buffer(payload);
+    }
+}
diff --git a/extensions/reactive-messaging-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/reactive-messaging-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..1dea2a0fa9f6c
--- /dev/null
+++ b/extensions/reactive-messaging-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,12 @@
+---
+name: "Reactive HTTP and WebSocket Connector"
+metadata:
+  keywords:
+    - "http-connector"
+    - "http"
+    - "websockets"
+  categories:
+    - "web"
+    - "reactive"
+    - "messaging"
+  status: "experimental"
diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml
index cd98a4ec668d8..870cd4666b9f8 100644
--- a/extensions/reactive-mysql-client/deployment/pom.xml
+++ b/extensions/reactive-mysql-client/deployment/pom.xml
@@ -6,7 +6,7 @@
   ~ (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
+  ~ https://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
@@ -24,7 +24,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-reactive-mysql-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-mysql-client-deployment</artifactId>
@@ -57,10 +56,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-mysql</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -109,7 +112,7 @@
             <id>test-mariadb</id>
             <activation>
                 <property>
-                    <name>test-mariadb</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -127,7 +130,7 @@
             <id>docker-mariadb</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -215,7 +218,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/MySQLPoolBuildItem.java b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/MySQLPoolBuildItem.java
index 8c0ab477e500f..b8c40a65cef57 100644
--- a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/MySQLPoolBuildItem.java
+++ b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/MySQLPoolBuildItem.java
@@ -1,19 +1,31 @@
 package io.quarkus.reactive.mysql.client.deployment;
 
-import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.RuntimeValue;
 import io.vertx.mysqlclient.MySQLPool;
 
-public final class MySQLPoolBuildItem extends SimpleBuildItem {
+public final class MySQLPoolBuildItem extends MultiBuildItem {
+
+    private final String dataSourceName;
 
     private final RuntimeValue<MySQLPool> mysqlPool;
 
-    public MySQLPoolBuildItem(RuntimeValue<MySQLPool> mysqlPool) {
+    public MySQLPoolBuildItem(String dataSourceName, RuntimeValue<MySQLPool> mysqlPool) {
+        this.dataSourceName = dataSourceName;
         this.mysqlPool = mysqlPool;
     }
 
+    public String getDataSourceName() {
+        return dataSourceName;
+    }
+
     public RuntimeValue<MySQLPool> getMySQLPool() {
         return mysqlPool;
     }
 
+    public boolean isDefault() {
+        return DataSourceUtil.isDefault(dataSourceName);
+    }
+
 }
diff --git a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java
index ca5c654b0a538..79168330f17fa 100644
--- a/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java
+++ b/extensions/reactive-mysql-client/deployment/src/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java
@@ -1,13 +1,20 @@
 package io.quarkus.reactive.mysql.client.deployment;
 
-import javax.inject.Singleton;
+import java.util.List;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem.ExtendedBeanConfigurator;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
+import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourcesRuntimeConfig;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -17,12 +24,13 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
 import io.quarkus.reactive.datasource.deployment.VertxPoolBuildItem;
 import io.quarkus.reactive.datasource.runtime.DataSourceReactiveBuildTimeConfig;
-import io.quarkus.reactive.datasource.runtime.DataSourceReactiveRuntimeConfig;
-import io.quarkus.reactive.mysql.client.runtime.DataSourceReactiveMySQLConfig;
-import io.quarkus.reactive.mysql.client.runtime.LegacyDataSourceReactiveMySQLConfig;
-import io.quarkus.reactive.mysql.client.runtime.MySQLPoolProducer;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveBuildTimeConfig;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveRuntimeConfig;
+import io.quarkus.reactive.mysql.client.runtime.DataSourcesReactiveMySQLConfig;
 import io.quarkus.reactive.mysql.client.runtime.MySQLPoolRecorder;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
@@ -30,67 +38,175 @@
 import io.vertx.mysqlclient.MySQLPool;
 import io.vertx.sqlclient.Pool;
 
-@SuppressWarnings("deprecation")
 class ReactiveMySQLClientProcessor {
 
-    @BuildStep
-    AdditionalBeanBuildItem registerBean() {
-        return AdditionalBeanBuildItem.unremovableOf(MySQLPoolProducer.class);
-    }
-
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature,
-            BuildProducer<MySQLPoolBuildItem> mysqlPool,
+            BuildProducer<MySQLPoolBuildItem> mySQLPool,
             BuildProducer<VertxPoolBuildItem> vertxPool,
             MySQLPoolRecorder recorder,
             VertxBuildItem vertx,
-            BuildProducer<SyntheticBeanBuildItem> syntheticBeans, ShutdownContextBuildItem shutdown,
+            ShutdownContextBuildItem shutdown,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport,
             DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
-            DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig,
-            DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
-            DataSourceReactiveMySQLConfig dataSourceReactiveMySQLConfig,
-            LegacyDataSourcesRuntimeConfig legacyDataSourcesRuntimeConfig,
-            LegacyDataSourceReactiveMySQLConfig legacyDataSourceReactiveMySQLConfig) {
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactiveMySQLConfig dataSourcesReactiveMySQLConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
 
         feature.produce(new FeatureBuildItem(Feature.REACTIVE_MYSQL_CLIENT));
-        // Make sure the MySQLPoolProducer is initialized before the StartupEvent is fired
-        ServiceStartBuildItem serviceStart = new ServiceStartBuildItem("reactive-mysql-client");
-
-        // Note: we had to tweak that logic to support the legacy configuration
-        if (dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()
-                && ((!DatabaseKind.isMySQL(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get())
-                        && !DatabaseKind.isMariaDB(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get()))
-                        || !dataSourceReactiveBuildTimeConfig.enabled)) {
-            return serviceStart;
+
+        createPoolIfDefined(recorder, vertx, shutdown, mySQLPool, vertxPool, syntheticBeans,
+                DataSourceUtil.DEFAULT_DATASOURCE_NAME, dataSourcesBuildTimeConfig,
+                dataSourcesRuntimeConfig, dataSourcesReactiveBuildTimeConfig, dataSourcesReactiveRuntimeConfig,
+                dataSourcesReactiveMySQLConfig, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
+
+        for (String dataSourceName : dataSourcesBuildTimeConfig.namedDataSources.keySet()) {
+            createPoolIfDefined(recorder, vertx, shutdown, mySQLPool, vertxPool, syntheticBeans, dataSourceName,
+                    dataSourcesBuildTimeConfig, dataSourcesRuntimeConfig, dataSourcesReactiveBuildTimeConfig,
+                    dataSourcesReactiveRuntimeConfig, dataSourcesReactiveMySQLConfig, defaultDataSourceDbKindBuildItems,
+                    curateOutcomeBuildItem);
+        }
+
+        // Enable SSL support by default
+        sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.REACTIVE_MYSQL_CLIENT));
+
+        return new ServiceStartBuildItem("reactive-mysql-client");
+    }
+
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MYSQL);
+    }
+
+    /**
+     * The health check needs to be produced in a separate method to avoid a circular dependency (the Vert.x instance creation
+     * consumes the AdditionalBeanBuildItems).
+     */
+    @BuildStep
+    void addHealthCheck(
+            BuildProducer<HealthBuildItem> healthChecks,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (!hasPools(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig, defaultDataSourceDbKindBuildItems,
+                curateOutcomeBuildItem)) {
+            return;
         }
 
-        boolean isLegacy = !dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent();
+        healthChecks.produce(
+                new HealthBuildItem("io.quarkus.reactive.mysql.client.runtime.health.ReactiveMySQLDataSourcesHealthCheck",
+                        dataSourcesBuildTimeConfig.healthEnabled));
+    }
 
-        RuntimeValue<MySQLPool> mySqlPool = recorder.configureMySQLPool(vertx.getVertx(),
-                dataSourcesRuntimeConfig, dataSourceReactiveRuntimeConfig, dataSourceReactiveMySQLConfig,
-                legacyDataSourcesRuntimeConfig, legacyDataSourceReactiveMySQLConfig, isLegacy,
+    private void createPoolIfDefined(MySQLPoolRecorder recorder,
+            VertxBuildItem vertx,
+            ShutdownContextBuildItem shutdown,
+            BuildProducer<MySQLPoolBuildItem> mySQLPool,
+            BuildProducer<VertxPoolBuildItem> vertxPool,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
+            String dataSourceName,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactiveMySQLConfig dataSourcesReactiveMySQLConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+
+        if (!isReactiveMySQLPoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig, dataSourceName,
+                defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+            return;
+        }
+
+        RuntimeValue<MySQLPool> pool = recorder.configureMySQLPool(vertx.getVertx(),
+                dataSourceName,
+                dataSourcesRuntimeConfig,
+                dataSourcesReactiveRuntimeConfig,
+                dataSourcesReactiveMySQLConfig,
                 shutdown);
-        mysqlPool.produce(new MySQLPoolBuildItem(mySqlPool));
+        mySQLPool.produce(new MySQLPoolBuildItem(dataSourceName, pool));
 
-        // Synthetic bean for MySQLPool
-        syntheticBeans.produce(SyntheticBeanBuildItem.configure(MySQLPool.class).addType(Pool.class).scope(Singleton.class)
-                .runtimeValue(mySqlPool)
-                .setRuntimeInit().done());
+        ExtendedBeanConfigurator mySQLPoolBeanConfigurator = SyntheticBeanBuildItem.configure(MySQLPool.class)
+                .defaultBean()
+                .addType(Pool.class)
+                .scope(ApplicationScoped.class)
+                .runtimeValue(pool)
+                .unremovable()
+                .setRuntimeInit();
 
-        boolean isDefault = true; // assume always the default pool for now
-        vertxPool.produce(new VertxPoolBuildItem(mySqlPool, DatabaseKind.MYSQL, isDefault));
+        addQualifiers(mySQLPoolBeanConfigurator, dataSourceName);
 
-        // Enable SSL support by default
-        sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.REACTIVE_MYSQL_CLIENT));
+        syntheticBeans.produce(mySQLPoolBeanConfigurator.done());
+
+        ExtendedBeanConfigurator mutinyMySQLPoolConfigurator = SyntheticBeanBuildItem
+                .configure(io.vertx.mutiny.mysqlclient.MySQLPool.class)
+                .defaultBean()
+                .scope(ApplicationScoped.class)
+                .runtimeValue(recorder.mutinyMySQLPool(pool))
+                .setRuntimeInit();
+
+        addQualifiers(mutinyMySQLPoolConfigurator, dataSourceName);
+
+        syntheticBeans.produce(mutinyMySQLPoolConfigurator.done());
 
-        return serviceStart;
+        vertxPool.produce(new VertxPoolBuildItem(pool, DatabaseKind.MYSQL, DataSourceUtil.isDefault(dataSourceName)));
     }
 
-    @BuildStep
-    HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig) {
-        return new HealthBuildItem("io.quarkus.reactive.mysql.client.runtime.health.ReactiveMySQLDataSourceHealthCheck",
-                dataSourcesBuildTimeConfig.healthEnabled);
+    private static boolean isReactiveMySQLPoolDefined(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig, String dataSourceName,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
+                .getDataSourceRuntimeConfig(dataSourceName);
+        DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
+                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+
+        Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind,
+                defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
+        if (!dbKind.isPresent()) {
+            return false;
+        }
+
+        if ((!DatabaseKind.isMySQL(dbKind.get())
+                && !DatabaseKind.isMariaDB(dbKind.get()))
+                || !dataSourceReactiveBuildTimeConfig.enabled) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean hasPools(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (isReactiveMySQLPoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig,
+                DataSourceUtil.DEFAULT_DATASOURCE_NAME, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+            return true;
+        }
+
+        for (String dataSourceName : dataSourcesBuildTimeConfig.namedDataSources.keySet()) {
+            if (isReactiveMySQLPoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig,
+                    dataSourceName, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static void addQualifiers(ExtendedBeanConfigurator configurator, String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            configurator.addQualifier(DotNames.DEFAULT);
+        } else {
+            configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", dataSourceName).done();
+            configurator.addQualifier().annotation(ReactiveDataSource.class).addValue("value", dataSourceName)
+                    .done();
+        }
     }
 }
diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LegacyMySQLPoolProducerTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LegacyMySQLPoolProducerTest.java
deleted file mode 100644
index dbb291e31926b..0000000000000
--- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LegacyMySQLPoolProducerTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package io.quarkus.reactive.mysql.client;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import io.vertx.mysqlclient.MySQLPool;
-
-public class LegacyMySQLPoolProducerTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(BeanUsingBareMySQLClient.class)
-                    .addClasses(BeanUsingMutinyMySQLClient.class)
-                    .addClasses(BeanUsingAxleMySQLClient.class)
-                    .addClasses(BeanUsingRXMySQLClient.class));
-
-    @Inject
-    BeanUsingBareMySQLClient beanUsingBare;
-
-    @Inject
-    BeanUsingAxleMySQLClient beanUsingAxle;
-
-    @Inject
-    BeanUsingRXMySQLClient beanUsingRx;
-
-    @Inject
-    BeanUsingMutinyMySQLClient beanUsingMutiny;
-
-    @Test
-    public void testVertxInjection() {
-        beanUsingBare.verify()
-                .thenCompose(v -> beanUsingAxle.verify())
-                .thenCompose(v -> beanUsingRx.verify())
-                .thenCompose(v -> beanUsingMutiny.verify())
-                .toCompletableFuture()
-                .join();
-    }
-
-    @ApplicationScoped
-    static class BeanUsingBareMySQLClient {
-
-        @Inject
-        MySQLPool mysqlClient;
-
-        public CompletionStage<Void> verify() {
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            mysqlClient.query("SELECT 1").execute(ar -> {
-                cf.complete(null);
-            });
-            return cf;
-        }
-    }
-
-    @ApplicationScoped
-    static class BeanUsingAxleMySQLClient {
-
-        @Inject
-        io.vertx.mutiny.mysqlclient.MySQLPool mysqlClient;
-
-        public CompletionStage<Void> verify() {
-            return mysqlClient.query("SELECT 1").execute()
-                    .onItem().ignore().andContinueWithNull()
-                    .onFailure().recoverWithItem((Void) null)
-                    .subscribeAsCompletionStage();
-        }
-    }
-
-    @ApplicationScoped
-    static class BeanUsingMutinyMySQLClient {
-
-        @Inject
-        io.vertx.axle.mysqlclient.MySQLPool mysqlClient;
-
-        public CompletionStage<Void> verify() {
-            return mysqlClient.query("SELECT 1").execute()
-                    .<Void> thenApply(rs -> null)
-                    .exceptionally(t -> null);
-        }
-    }
-
-    @ApplicationScoped
-    static class BeanUsingRXMySQLClient {
-
-        @Inject
-        io.vertx.reactivex.mysqlclient.MySQLPool mysqlClient;
-
-        public CompletionStage<Void> verify() {
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            mysqlClient.query("SELECT 1").rxExecute()
-                    .ignoreElement()
-                    .onErrorComplete()
-                    .subscribe(() -> cf.complete(null));
-            return cf;
-        }
-    }
-}
diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LegacyReactiveMySQLReloadTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LegacyReactiveMySQLReloadTest.java
deleted file mode 100644
index 56ae01ea97ef0..0000000000000
--- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/LegacyReactiveMySQLReloadTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.quarkus.reactive.mysql.client;
-
-import org.hamcrest.Matchers;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusDevModeTest;
-import io.restassured.RestAssured;
-
-public class LegacyReactiveMySQLReloadTest {
-
-    @RegisterExtension
-    public static final QuarkusDevModeTest test = new QuarkusDevModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(DevModeResource.class)
-                    .add(new StringAsset("quarkus.datasource.url=vertx-reactive:mysql://localhost:6033/reload_test"),
-                            "application.properties"));
-
-    @Test
-    public void testHotReplacement() {
-        RestAssured
-                .get("/dev/error")
-                .then()
-                .statusCode(200)
-                .body(Matchers.endsWith(":6033"));
-
-        test.modifyResourceFile("application.properties", s -> s.replace(":6033", ":9366"));
-
-        RestAssured
-                .get("/dev/error")
-                .then()
-                .statusCode(200)
-                .body(Matchers.endsWith(":9366"));
-    }
-}
diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java
new file mode 100644
index 0000000000000..f4ac20b89c8ef
--- /dev/null
+++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MultipleDataSourcesTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.reactive.mysql.client;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+import io.quarkus.test.QuarkusUnitTest;
+import io.vertx.mysqlclient.MySQLPool;
+
+public class MultipleDataSourcesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-multiple-datasources.properties")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BeanUsingDefaultDataSource.class)
+                    .addClass(BeanUsingHibernateDataSource.class));
+
+    @Inject
+    BeanUsingDefaultDataSource beanUsingDefaultDataSource;
+
+    @Inject
+    BeanUsingHibernateDataSource beanUsingHibernateDataSource;
+
+    @Test
+    public void testMultipleDataSources() {
+        beanUsingDefaultDataSource.verify()
+                .thenCompose(v -> beanUsingHibernateDataSource.verify())
+                .toCompletableFuture()
+                .join();
+    }
+
+    @ApplicationScoped
+    static class BeanUsingDefaultDataSource {
+
+        @Inject
+        MySQLPool mySQLClient;
+
+        public CompletionStage<Void> verify() {
+            CompletableFuture<Void> cf = new CompletableFuture<>();
+            mySQLClient.query("SELECT 1").execute(ar -> {
+                if (ar.failed()) {
+                    cf.completeExceptionally(ar.cause());
+                } else {
+                    cf.complete(null);
+                }
+            });
+            return cf;
+        }
+    }
+
+    @ApplicationScoped
+    static class BeanUsingHibernateDataSource {
+
+        @Inject
+        @ReactiveDataSource("hibernate")
+        MySQLPool mySQLClient;
+
+        public CompletionStage<Void> verify() {
+            CompletableFuture<Void> cf = new CompletableFuture<>();
+            mySQLClient.query("SELECT 1").execute(ar -> {
+                if (ar.failed()) {
+                    cf.completeExceptionally(ar.cause());
+                } else {
+                    cf.complete(null);
+                }
+            });
+            return cf;
+        }
+    }
+}
diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java
index f2d410d70c7eb..04cc4f3d6d0aa 100644
--- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java
+++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java
@@ -21,27 +21,17 @@ public class MySQLPoolProducerTest {
             .withConfigurationResource("application-default-datasource.properties")
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(BeanUsingBareMySQLClient.class)
-                    .addClasses(BeanUsingMutinyMySQLClient.class)
-                    .addClasses(BeanUsingAxleMySQLClient.class)
-                    .addClasses(BeanUsingRXMySQLClient.class));
+                    .addClasses(BeanUsingMutinyMySQLClient.class));
 
     @Inject
     BeanUsingBareMySQLClient beanUsingBare;
 
-    @Inject
-    BeanUsingAxleMySQLClient beanUsingAxle;
-
-    @Inject
-    BeanUsingRXMySQLClient beanUsingRx;
-
     @Inject
     BeanUsingMutinyMySQLClient beanUsingMutiny;
 
     @Test
     public void testVertxInjection() {
         beanUsingBare.verify()
-                .thenCompose(v -> beanUsingAxle.verify())
-                .thenCompose(v -> beanUsingRx.verify())
                 .thenCompose(v -> beanUsingMutiny.verify())
                 .toCompletableFuture()
                 .join();
@@ -61,7 +51,7 @@ public CompletionStage<Void> verify() {
     }
 
     @ApplicationScoped
-    static class BeanUsingAxleMySQLClient {
+    static class BeanUsingMutinyMySQLClient {
 
         @Inject
         io.vertx.mutiny.mysqlclient.MySQLPool mysqlClient;
@@ -73,33 +63,4 @@ public CompletionStage<Void> verify() {
                     .subscribeAsCompletionStage();
         }
     }
-
-    @ApplicationScoped
-    static class BeanUsingMutinyMySQLClient {
-
-        @Inject
-        io.vertx.axle.mysqlclient.MySQLPool mysqlClient;
-
-        public CompletionStage<Void> verify() {
-            return mysqlClient.query("SELECT 1").execute()
-                    .<Void> thenApply(rs -> null)
-                    .exceptionally(t -> null);
-        }
-    }
-
-    @ApplicationScoped
-    static class BeanUsingRXMySQLClient {
-
-        @Inject
-        io.vertx.reactivex.mysqlclient.MySQLPool mysqlClient;
-
-        public CompletionStage<Void> verify() {
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            mysqlClient.query("SELECT 1").rxExecute()
-                    .ignoreElement()
-                    .onErrorComplete()
-                    .subscribe(() -> cf.complete(null));
-            return cf;
-        }
-    }
 }
diff --git a/extensions/reactive-mysql-client/deployment/src/test/resources/application-multiple-datasources.properties b/extensions/reactive-mysql-client/deployment/src/test/resources/application-multiple-datasources.properties
new file mode 100644
index 0000000000000..3dbae75d12c9a
--- /dev/null
+++ b/extensions/reactive-mysql-client/deployment/src/test/resources/application-multiple-datasources.properties
@@ -0,0 +1,9 @@
+quarkus.datasource.db-kind=mysql
+quarkus.datasource.username=hibernate_orm_test
+quarkus.datasource.password=hibernate_orm_test
+quarkus.datasource.reactive.url=${reactive-mysql.url}
+
+quarkus.datasource."hibernate".db-kind=mysql
+quarkus.datasource."hibernate".username=hibernate_orm_test
+quarkus.datasource."hibernate".password=hibernate_orm_test
+quarkus.datasource."hibernate".reactive.url=${reactive-mysql.url}
\ No newline at end of file
diff --git a/extensions/reactive-mysql-client/pom.xml b/extensions/reactive-mysql-client/pom.xml
index 604b87bd8973e..488a81f3b08f9 100644
--- a/extensions/reactive-mysql-client/pom.xml
+++ b/extensions/reactive-mysql-client/pom.xml
@@ -6,7 +6,7 @@
   ~ (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
+  ~ https://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
@@ -21,10 +21,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-mysql-client-parent</artifactId>
diff --git a/extensions/reactive-mysql-client/runtime/pom.xml b/extensions/reactive-mysql-client/runtime/pom.xml
index 410842c241fdd..370bb59b33fb2 100644
--- a/extensions/reactive-mysql-client/runtime/pom.xml
+++ b/extensions/reactive-mysql-client/runtime/pom.xml
@@ -6,7 +6,7 @@
   ~ (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
+  ~ https://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
@@ -24,7 +24,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-reactive-mysql-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-mysql-client</artifactId>
@@ -44,10 +43,6 @@
             <groupId>io.vertx</groupId>
             <artifactId>vertx-mysql-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>smallrye-axle-mysql-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>smallrye-mutiny-vertx-mysql-client</artifactId>
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java
index e109c2f581843..f30e01ca17e5d 100644
--- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java
+++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java
@@ -2,12 +2,11 @@
 
 import java.util.Optional;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
 import io.vertx.mysqlclient.SslMode;
 
-@ConfigRoot(name = "datasource.reactive.mysql", phase = ConfigPhase.RUN_TIME)
+@ConfigGroup
 public class DataSourceReactiveMySQLConfig {
 
     /**
@@ -17,19 +16,19 @@ public class DataSourceReactiveMySQLConfig {
      */
     @ConfigItem
     @Deprecated
-    public Optional<Boolean> cachePreparedStatements;
+    public Optional<Boolean> cachePreparedStatements = Optional.empty();
 
     /**
      * Charset for connections.
      */
     @ConfigItem
-    public Optional<String> charset;
+    public Optional<String> charset = Optional.empty();
 
     /**
      * Collation for connections.
      */
     @ConfigItem
-    public Optional<String> collation;
+    public Optional<String> collation = Optional.empty();
 
     /**
      * Desired security state of the connection to the server.
@@ -38,5 +37,5 @@ public class DataSourceReactiveMySQLConfig {
      * Manual</a>.
      */
     @ConfigItem(defaultValueDocumentation = "disabled")
-    public Optional<SslMode> sslMode;
+    public Optional<SslMode> sslMode = Optional.empty();
 }
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourcesReactiveMySQLConfig.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourcesReactiveMySQLConfig.java
new file mode 100644
index 0000000000000..1e6be7b48abda
--- /dev/null
+++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourcesReactiveMySQLConfig.java
@@ -0,0 +1,62 @@
+package io.quarkus.reactive.mysql.client.runtime;
+
+import java.util.Map;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "datasource", phase = ConfigPhase.RUN_TIME)
+public class DataSourcesReactiveMySQLConfig {
+
+    /**
+     * The default datasource.
+     */
+    @ConfigItem(name = "reactive.mysql")
+    public DataSourceReactiveMySQLConfig defaultDataSource;
+
+    /**
+     * Additional named datasources.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("datasource-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, DataSourceReactiveMySQLOuterNamedConfig> namedDataSources;
+
+    public DataSourceReactiveMySQLConfig getDataSourceReactiveRuntimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceReactiveMySQLOuterNamedConfig dataSourceReactiveMySQLOuterNamedConfig = namedDataSources
+                .get(dataSourceName);
+        if (dataSourceReactiveMySQLOuterNamedConfig == null) {
+            return new DataSourceReactiveMySQLConfig();
+        }
+
+        return dataSourceReactiveMySQLOuterNamedConfig.reactive.mysql;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactiveMySQLOuterNamedConfig {
+
+        /**
+         * The MySQL-specific configuration.
+         */
+        public DataSourceReactiveMySQLOuterNestedNamedConfig reactive;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactiveMySQLOuterNestedNamedConfig {
+
+        /**
+         * The MySQL-specific configuration.
+         */
+        public DataSourceReactiveMySQLConfig mysql;
+    }
+
+}
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/LegacyDataSourceReactiveMySQLConfig.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/LegacyDataSourceReactiveMySQLConfig.java
deleted file mode 100644
index d13c790e97b86..0000000000000
--- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/LegacyDataSourceReactiveMySQLConfig.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.quarkus.reactive.mysql.client.runtime;
-
-import java.util.Optional;
-
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-@ConfigRoot(name = "reactive-mysql-client", phase = ConfigPhase.RUN_TIME)
-@Deprecated
-public class LegacyDataSourceReactiveMySQLConfig {
-
-    /**
-     * @deprecated use {@code quarkus.datasource.reactive.cache-prepared-statements} instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Boolean> cachePreparedStatements;
-
-    /**
-     * @deprecated use {@code quarkus.datasource.reactive.mysql.charset} instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<String> charset;
-
-    /**
-     * @deprecated use {@code quarkus.datasource.reactive.mysql.collation} instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<String> collation;
-}
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java
deleted file mode 100644
index a949a9e81195d..0000000000000
--- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolProducer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.quarkus.reactive.mysql.client.runtime;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jboss.logging.Logger;
-
-import io.vertx.mysqlclient.MySQLPool;
-
-@ApplicationScoped
-public class MySQLPoolProducer {
-
-    private static final Logger LOGGER = Logger.getLogger(MySQLPoolProducer.class);
-
-    @Inject
-    MySQLPool mysqlPool;
-
-    /**
-     * @return the <em>mutiny</em> MySQL Pool instance. The instance is created lazily.
-     */
-    @Singleton
-    @Produces
-    public io.vertx.mutiny.mysqlclient.MySQLPool mutinyMySQLPool() {
-        return io.vertx.mutiny.mysqlclient.MySQLPool.newInstance(mysqlPool);
-    }
-
-    /**
-     * Produces the Axle MySQL Pool instance. The instance is created lazily.
-     *
-     * @return the Axle MySQL pool instance
-     * @deprecated The Axle API is deprecated and will be removed in the future, use {@link #mutinyMySQLPool()} instead.
-     */
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.axle.mysqlclient.MySQLPool axleMySQLPool() {
-        LOGGER.warn(
-                "`io.vertx.axle.mysqlclient.MySQLPool` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.mysqlclient.MySQLPool`");
-        return io.vertx.axle.mysqlclient.MySQLPool.newInstance(mysqlPool);
-    }
-
-    /**
-     * Produces the RX MySQL Pool instance. The instance is created lazily.
-     *
-     * @return the RX MySQL pool instance
-     * @deprecated The RX API is deprecated and will be removed in the future, use {@link #mutinyMySQLPool()} instead.
-     */
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.reactivex.mysqlclient.MySQLPool rxMySQLPool() {
-        LOGGER.warn(
-                "`io.vertx.reactivex.mysqlclient.MySQLPool` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.mysqlclient.MySQLPool`");
-        return io.vertx.reactivex.mysqlclient.MySQLPool.newInstance(mysqlPool);
-    }
-}
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java
index 4dcde4001e7f0..4bd4ae1e74d42 100644
--- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java
+++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java
@@ -10,6 +10,7 @@
 import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxTrustOptions;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.jboss.logging.Logger;
 
@@ -17,9 +18,8 @@
 import io.quarkus.credentials.runtime.CredentialsProviderFinder;
 import io.quarkus.datasource.runtime.DataSourceRuntimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourceRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourcesRuntimeConfig;
 import io.quarkus.reactive.datasource.runtime.DataSourceReactiveRuntimeConfig;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveRuntimeConfig;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
@@ -35,28 +35,25 @@ public class MySQLPoolRecorder {
     private static final Logger log = Logger.getLogger(MySQLPoolRecorder.class);
 
     public RuntimeValue<MySQLPool> configureMySQLPool(RuntimeValue<Vertx> vertx,
+            String dataSourceName,
             DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
-            DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
-            DataSourceReactiveMySQLConfig dataSourceReactiveMySQLConfig,
-            LegacyDataSourcesRuntimeConfig legacyDataSourcesRuntimeConfig,
-            LegacyDataSourceReactiveMySQLConfig legacyDataSourceReactiveMySQLConfig,
-            boolean isLegacy,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactiveMySQLConfig dataSourcesReactiveMySQLConfig,
             ShutdownContext shutdown) {
 
-        MySQLPool mysqlPool;
-        if (!isLegacy) {
-            mysqlPool = initialize(vertx.getValue(), dataSourcesRuntimeConfig.defaultDataSource,
-                    dataSourceReactiveRuntimeConfig,
-                    dataSourceReactiveMySQLConfig);
-        } else {
-            mysqlPool = legacyInitialize(vertx.getValue(), dataSourcesRuntimeConfig.defaultDataSource,
-                    legacyDataSourcesRuntimeConfig.defaultDataSource, legacyDataSourceReactiveMySQLConfig);
-        }
+        MySQLPool mysqlPool = initialize(vertx.getValue(),
+                dataSourcesRuntimeConfig.getDataSourceRuntimeConfig(dataSourceName),
+                dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                dataSourcesReactiveMySQLConfig.getDataSourceReactiveRuntimeConfig(dataSourceName));
 
         shutdown.addShutdownTask(mysqlPool::close);
         return new RuntimeValue<>(mysqlPool);
     }
 
+    public RuntimeValue<io.vertx.mutiny.mysqlclient.MySQLPool> mutinyMySQLPool(RuntimeValue<MySQLPool> mysqlPool) {
+        return new RuntimeValue<>(io.vertx.mutiny.mysqlclient.MySQLPool.newInstance(mysqlPool.getValue()));
+    }
+
     private MySQLPool initialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntimeConfig,
             DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
             DataSourceReactiveMySQLConfig dataSourceReactiveMySQLConfig) {
@@ -64,11 +61,11 @@ private MySQLPool initialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRunt
                 dataSourceReactiveMySQLConfig);
         MySQLConnectOptions mysqlConnectOptions = toMySQLConnectOptions(dataSourceRuntimeConfig,
                 dataSourceReactiveRuntimeConfig, dataSourceReactiveMySQLConfig);
-        if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent() &&
-                dataSourceReactiveRuntimeConfig.threadLocal.get()) {
-            return new ThreadLocalMySQLPool(vertx, mysqlConnectOptions, poolOptions);
+        if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) {
+            log.warn(
+                    "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now.");
         }
-        return MySQLPool.pool(vertx, mysqlConnectOptions, poolOptions);
+        return new ThreadLocalMySQLPool(vertx, mysqlConnectOptions, poolOptions);
     }
 
     private PoolOptions toPoolOptions(DataSourceRuntimeConfig dataSourceRuntimeConfig,
@@ -152,63 +149,16 @@ private MySQLConnectOptions toMySQLConnectOptions(DataSourceRuntimeConfig dataSo
         configureJksKeyCertOptions(mysqlConnectOptions, dataSourceReactiveRuntimeConfig.keyCertificateJks);
         configurePfxKeyCertOptions(mysqlConnectOptions, dataSourceReactiveRuntimeConfig.keyCertificatePfx);
 
-        return mysqlConnectOptions;
-    }
-
-    // Legacy configuration
-
-    private MySQLPool legacyInitialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntimeConfig,
-            LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig,
-            LegacyDataSourceReactiveMySQLConfig legacyDataSourceReactiveMySQLConfig) {
-        PoolOptions poolOptions = legacyToPoolOptionsLegacy(legacyDataSourceRuntimeConfig);
-        MySQLConnectOptions mysqlConnectOptions = legacyToMySQLConnectOptions(dataSourceRuntimeConfig,
-                legacyDataSourceRuntimeConfig, legacyDataSourceReactiveMySQLConfig);
-        return MySQLPool.pool(vertx, mysqlConnectOptions, poolOptions);
-    }
-
-    private PoolOptions legacyToPoolOptionsLegacy(LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig) {
-        PoolOptions poolOptions;
-        poolOptions = new PoolOptions();
-
-        // Slight change of behavior compared to the legacy code: the default max size is set to 20
-        poolOptions.setMaxSize(legacyDataSourceRuntimeConfig.maxSize);
-
-        return poolOptions;
-    }
-
-    private MySQLConnectOptions legacyToMySQLConnectOptions(DataSourceRuntimeConfig dataSourceRuntimeConfig,
-            LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig,
-            LegacyDataSourceReactiveMySQLConfig legacyDataSourceReactiveMySQLConfig) {
-        MySQLConnectOptions mysqlConnectOptions;
-        if (legacyDataSourceRuntimeConfig.url.isPresent()) {
-            String url = legacyDataSourceRuntimeConfig.url.get();
-            // clean up the URL to make migrations easier
-            if (url.startsWith("vertx-reactive:mysql://")) {
-                url = url.substring("vertx-reactive:".length());
-            }
-            mysqlConnectOptions = MySQLConnectOptions.fromUri(url);
-        } else {
-            mysqlConnectOptions = new MySQLConnectOptions();
-        }
+        mysqlConnectOptions.setReconnectAttempts(dataSourceReactiveRuntimeConfig.reconnectAttempts);
 
-        if (dataSourceRuntimeConfig.username.isPresent()) {
-            mysqlConnectOptions.setUser(dataSourceRuntimeConfig.username.get());
-        }
+        mysqlConnectOptions.setReconnectInterval(dataSourceReactiveRuntimeConfig.reconnectInterval.toMillis());
 
-        if (dataSourceRuntimeConfig.password.isPresent()) {
-            mysqlConnectOptions.setPassword(dataSourceRuntimeConfig.password.get());
-        }
-
-        if (legacyDataSourceReactiveMySQLConfig.cachePreparedStatements.isPresent()) {
-            mysqlConnectOptions.setCachePreparedStatements(legacyDataSourceReactiveMySQLConfig.cachePreparedStatements.get());
-        }
-        if (legacyDataSourceReactiveMySQLConfig.charset.isPresent()) {
-            mysqlConnectOptions.setCharset(legacyDataSourceReactiveMySQLConfig.charset.get());
-        }
-        if (legacyDataSourceReactiveMySQLConfig.collation.isPresent()) {
-            mysqlConnectOptions.setCollation(legacyDataSourceReactiveMySQLConfig.collation.get());
+        if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) {
+            int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis());
+            mysqlConnectOptions.setIdleTimeout(idleTimeout).setIdleTimeoutUnit(TimeUnit.MILLISECONDS);
         }
 
         return mysqlConnectOptions;
     }
+
 }
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/ThreadLocalMySQLPool.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/ThreadLocalMySQLPool.java
index a6ed317e8fbb4..2b525d3836aa7 100644
--- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/ThreadLocalMySQLPool.java
+++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/ThreadLocalMySQLPool.java
@@ -1,10 +1,18 @@
 package io.quarkus.reactive.mysql.client.runtime;
 
 import io.quarkus.reactive.datasource.runtime.ThreadLocalPool;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.mysqlclient.MySQLConnectOptions;
 import io.vertx.mysqlclient.MySQLPool;
 import io.vertx.sqlclient.PoolOptions;
+import io.vertx.sqlclient.PreparedQuery;
+import io.vertx.sqlclient.Query;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.RowSet;
+import io.vertx.sqlclient.SqlConnection;
+import io.vertx.sqlclient.Transaction;
 
 public class ThreadLocalMySQLPool extends ThreadLocalPool<MySQLPool> implements MySQLPool {
 
@@ -17,6 +25,45 @@ public ThreadLocalMySQLPool(Vertx vertx, MySQLConnectOptions mySQLConnectOptions
 
     @Override
     protected MySQLPool createThreadLocalPool() {
-        return MySQLPool.pool(vertx, mySQLConnectOptions, poolOptions);
+        return new MySQLPoolWrapper(MySQLPool.pool(vertx, mySQLConnectOptions, poolOptions));
     }
+
+    private class MySQLPoolWrapper implements MySQLPool {
+
+        private final MySQLPool delegate;
+        private boolean open = true;
+
+        private MySQLPoolWrapper(MySQLPool delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void getConnection(Handler<AsyncResult<SqlConnection>> handler) {
+            delegate.getConnection(handler);
+        }
+
+        @Override
+        public Query<RowSet<Row>> query(String s) {
+            return delegate.query(s);
+        }
+
+        @Override
+        public PreparedQuery<RowSet<Row>> preparedQuery(String s) {
+            return delegate.preparedQuery(s);
+        }
+
+        @Override
+        public void begin(Handler<AsyncResult<Transaction>> handler) {
+            delegate.begin(handler);
+        }
+
+        @Override
+        public void close() {
+            if (open) {
+                delegate.close();
+                ThreadLocalMySQLPool.this.removeSelfFromTracking(this);
+            }
+        }
+    }
+
 }
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourceHealthCheck.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourceHealthCheck.java
deleted file mode 100644
index f510349b28dbd..0000000000000
--- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourceHealthCheck.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.quarkus.reactive.mysql.client.runtime.health;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-
-import org.eclipse.microprofile.health.HealthCheck;
-import org.eclipse.microprofile.health.HealthCheckResponse;
-import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
-import org.eclipse.microprofile.health.Readiness;
-
-import io.quarkus.arc.Arc;
-import io.vertx.mysqlclient.MySQLPool;
-
-@Readiness
-@ApplicationScoped
-public class ReactiveMySQLDataSourceHealthCheck implements HealthCheck {
-
-    private MySQLPool mySQLPool;
-
-    @PostConstruct
-    protected void init() {
-        mySQLPool = Arc.container().instance(MySQLPool.class).get();
-    }
-
-    @Override
-    public HealthCheckResponse call() {
-        HealthCheckResponseBuilder builder = HealthCheckResponse.named("Reactive MySQL connection health check").up();
-
-        try {
-            CompletableFuture<Void> databaseConnectionAttempt = new CompletableFuture<>();
-            mySQLPool.query("SELECT 1")
-                    .execute(ar -> {
-                        if (ar.failed()) {
-                            builder.down();
-                        }
-                        databaseConnectionAttempt.complete(null);
-                    });
-            databaseConnectionAttempt.get(10, TimeUnit.SECONDS);
-        } catch (Exception exception) {
-            builder.down();
-        }
-
-        return builder.build();
-    }
-}
diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java
new file mode 100644
index 0000000000000..4cf78acaa85b3
--- /dev/null
+++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/health/ReactiveMySQLDataSourcesHealthCheck.java
@@ -0,0 +1,29 @@
+package io.quarkus.reactive.mysql.client.runtime.health;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
+
+import org.eclipse.microprofile.health.Readiness;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.reactive.datasource.runtime.ReactiveDatasourceHealthCheck;
+import io.vertx.mysqlclient.MySQLPool;
+
+@Readiness
+@ApplicationScoped
+class ReactiveMySQLDataSourcesHealthCheck extends ReactiveDatasourceHealthCheck {
+
+    public ReactiveMySQLDataSourcesHealthCheck() {
+        super("Reactive MySQL connections health check", "SELECT 1");
+    }
+
+    @PostConstruct
+    protected void init() {
+        for (InstanceHandle<MySQLPool> handle : Arc.container().select(MySQLPool.class, Any.Literal.INSTANCE).handles()) {
+            addPool(getPoolName(handle.getBean()), handle.get());
+        }
+    }
+
+}
diff --git a/extensions/reactive-pg-client/deployment/pom.xml b/extensions/reactive-pg-client/deployment/pom.xml
index 73d451f3e5569..d11e5cbacef76 100644
--- a/extensions/reactive-pg-client/deployment/pom.xml
+++ b/extensions/reactive-pg-client/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-reactive-pg-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
@@ -16,7 +15,7 @@
     <name>Quarkus - Reactive PostgreSQL Client - Deployment</name>
 
     <properties>
-        <postgres.image>postgres:10.5</postgres.image>
+        <postgres.image>postgres:13.1</postgres.image>
         <reactive-postgres.url>vertx-reactive:postgresql:///hibernate_orm_test</reactive-postgres.url>
     </properties>
 
@@ -25,6 +24,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-reactive-datasource-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-postgresql</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-deployment</artifactId>
@@ -44,7 +47,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -93,7 +96,7 @@
             <id>test-postgresql</id>
             <activation>
                 <property>
-                    <name>test-postgresql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -112,7 +115,7 @@
             <id>docker-postgresql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -149,7 +152,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all postgres:10.5 images currently running, not just those we just started.
+                            <!--Stops all postgres images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>
@@ -182,7 +185,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/PgPoolBuildItem.java b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/PgPoolBuildItem.java
index 18bcd1da83753..518bf7df817a8 100644
--- a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/PgPoolBuildItem.java
+++ b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/PgPoolBuildItem.java
@@ -1,19 +1,30 @@
 package io.quarkus.reactive.pg.client.deployment;
 
-import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.RuntimeValue;
 import io.vertx.pgclient.PgPool;
 
-public final class PgPoolBuildItem extends SimpleBuildItem {
+public final class PgPoolBuildItem extends MultiBuildItem {
+
+    private final String dataSourceName;
 
     private final RuntimeValue<PgPool> pgPool;
 
-    public PgPoolBuildItem(RuntimeValue<PgPool> pgPool) {
+    public PgPoolBuildItem(String dataSourceName, RuntimeValue<PgPool> pgPool) {
+        this.dataSourceName = dataSourceName;
         this.pgPool = pgPool;
     }
 
+    public String getDataSourceName() {
+        return dataSourceName;
+    }
+
     public RuntimeValue<PgPool> getPgPool() {
         return pgPool;
     }
 
+    public boolean isDefault() {
+        return DataSourceUtil.isDefault(dataSourceName);
+    }
 }
diff --git a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java
index 87e4ef71fa568..88dee4c0d2888 100644
--- a/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java
+++ b/extensions/reactive-pg-client/deployment/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java
@@ -1,13 +1,20 @@
 package io.quarkus.reactive.pg.client.deployment;
 
-import javax.inject.Singleton;
+import java.util.List;
+import java.util.Optional;
+
+import javax.enterprise.context.ApplicationScoped;
 
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem.ExtendedBeanConfigurator;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
+import io.quarkus.datasource.deployment.spi.DefaultDataSourceDbKindBuildItem;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceConfigurationHandlerBuildItem;
+import io.quarkus.datasource.runtime.DataSourceBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourcesRuntimeConfig;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -18,12 +25,13 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
 import io.quarkus.reactive.datasource.deployment.VertxPoolBuildItem;
 import io.quarkus.reactive.datasource.runtime.DataSourceReactiveBuildTimeConfig;
-import io.quarkus.reactive.datasource.runtime.DataSourceReactiveRuntimeConfig;
-import io.quarkus.reactive.pg.client.runtime.DataSourceReactivePostgreSQLConfig;
-import io.quarkus.reactive.pg.client.runtime.LegacyDataSourceReactivePostgreSQLConfig;
-import io.quarkus.reactive.pg.client.runtime.PgPoolProducer;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveBuildTimeConfig;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveRuntimeConfig;
+import io.quarkus.reactive.pg.client.runtime.DataSourcesReactivePostgreSQLConfig;
 import io.quarkus.reactive.pg.client.runtime.PgPoolRecorder;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
@@ -31,20 +39,19 @@
 import io.vertx.pgclient.PgPool;
 import io.vertx.sqlclient.Pool;
 
-@SuppressWarnings("deprecation")
 class ReactivePgClientProcessor {
 
-    @BuildStep
-    AdditionalBeanBuildItem registerBean() {
-        return AdditionalBeanBuildItem.unremovableOf(PgPoolProducer.class);
-    }
-
     @BuildStep
     NativeImageConfigBuildItem config() {
         return NativeImageConfigBuildItem.builder().addRuntimeInitializedClass("io.vertx.pgclient.impl.codec.StartupMessage")
                 .build();
     }
 
+    @BuildStep
+    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
+        return DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.POSTGRESQL);
+    }
+
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature,
@@ -52,52 +59,166 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature,
             BuildProducer<VertxPoolBuildItem> vertxPool,
             PgPoolRecorder recorder,
             VertxBuildItem vertx,
-            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             ShutdownContextBuildItem shutdown,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport,
             DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig, DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
-            DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig,
-            DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
-            DataSourceReactivePostgreSQLConfig dataSourceReactivePostgreSQLConfig,
-            LegacyDataSourcesRuntimeConfig legacyDataSourcesRuntimeConfig,
-            LegacyDataSourceReactivePostgreSQLConfig legacyDataSourceReactivePostgreSQLConfig) {
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactivePostgreSQLConfig dataSourcesReactivePostgreSQLConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
 
         feature.produce(new FeatureBuildItem(Feature.REACTIVE_PG_CLIENT));
-        // Make sure the PgPoolProducer is initialized before the StartupEvent is fired
-        ServiceStartBuildItem serviceStart = new ServiceStartBuildItem("reactive-pg-client");
-
-        // Note: we had to tweak that logic to support the legacy configuration
-        if (dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent()
-                && (!DatabaseKind.isPostgreSQL(dataSourcesBuildTimeConfig.defaultDataSource.dbKind.get())
-                        || !dataSourceReactiveBuildTimeConfig.enabled)) {
-            return serviceStart;
+
+        createPoolIfDefined(recorder, vertx, shutdown, pgPool, vertxPool, syntheticBeans,
+                DataSourceUtil.DEFAULT_DATASOURCE_NAME, dataSourcesBuildTimeConfig,
+                dataSourcesRuntimeConfig, dataSourcesReactiveBuildTimeConfig, dataSourcesReactiveRuntimeConfig,
+                dataSourcesReactivePostgreSQLConfig, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
+
+        for (String dataSourceName : dataSourcesBuildTimeConfig.namedDataSources.keySet()) {
+            createPoolIfDefined(recorder, vertx, shutdown, pgPool, vertxPool, syntheticBeans, dataSourceName,
+                    dataSourcesBuildTimeConfig, dataSourcesRuntimeConfig, dataSourcesReactiveBuildTimeConfig,
+                    dataSourcesReactiveRuntimeConfig, dataSourcesReactivePostgreSQLConfig, defaultDataSourceDbKindBuildItems,
+                    curateOutcomeBuildItem);
+        }
+
+        // Enable SSL support by default
+        sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.REACTIVE_PG_CLIENT));
+
+        return new ServiceStartBuildItem("reactive-pg-client");
+    }
+
+    /**
+     * The health check needs to be produced in a separate method to avoid a circular dependency (the Vert.x instance creation
+     * consumes the AdditionalBeanBuildItems).
+     */
+    @BuildStep
+    void addHealthCheck(
+            BuildProducer<HealthBuildItem> healthChecks,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (!hasPools(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig, defaultDataSourceDbKindBuildItems,
+                curateOutcomeBuildItem)) {
+            return;
         }
 
-        boolean isLegacy = !dataSourcesBuildTimeConfig.defaultDataSource.dbKind.isPresent();
+        healthChecks
+                .produce(new HealthBuildItem("io.quarkus.reactive.pg.client.runtime.health.ReactivePgDataSourcesHealthCheck",
+                        dataSourcesBuildTimeConfig.healthEnabled));
+    }
+
+    @BuildStep
+    void registerServiceBinding(BuildProducer<DefaultDataSourceDbKindBuildItem> dbKind) {
+        dbKind.produce(new DefaultDataSourceDbKindBuildItem(DatabaseKind.POSTGRESQL));
+    }
+
+    private void createPoolIfDefined(PgPoolRecorder recorder,
+            VertxBuildItem vertx,
+            ShutdownContextBuildItem shutdown,
+            BuildProducer<PgPoolBuildItem> pgPool,
+            BuildProducer<VertxPoolBuildItem> vertxPool,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
+            String dataSourceName,
+            DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactivePostgreSQLConfig dataSourcesReactivePostgreSQLConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+
+        if (!isReactivePostgreSQLPoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig, dataSourceName,
+                defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+            return;
+        }
 
         RuntimeValue<PgPool> pool = recorder.configurePgPool(vertx.getVertx(),
-                dataSourcesRuntimeConfig, dataSourceReactiveRuntimeConfig, dataSourceReactivePostgreSQLConfig,
-                legacyDataSourcesRuntimeConfig, legacyDataSourceReactivePostgreSQLConfig, isLegacy,
+                dataSourceName,
+                dataSourcesRuntimeConfig,
+                dataSourcesReactiveRuntimeConfig,
+                dataSourcesReactivePostgreSQLConfig,
                 shutdown);
-        pgPool.produce(new PgPoolBuildItem(pool));
+        pgPool.produce(new PgPoolBuildItem(dataSourceName, pool));
 
-        // Synthetic bean for PgPool
-        syntheticBeans.produce(
-                SyntheticBeanBuildItem.configure(PgPool.class).addType(Pool.class).scope(Singleton.class).runtimeValue(pool)
-                        .setRuntimeInit().done());
+        ExtendedBeanConfigurator pgPoolBeanConfigurator = SyntheticBeanBuildItem.configure(PgPool.class)
+                .defaultBean()
+                .addType(Pool.class)
+                .scope(ApplicationScoped.class)
+                .runtimeValue(pool)
+                .unremovable()
+                .setRuntimeInit();
 
-        boolean isDefault = true; // assume always the default pool for now
-        vertxPool.produce(new VertxPoolBuildItem(pool, DatabaseKind.POSTGRESQL, isDefault));
+        addQualifiers(pgPoolBeanConfigurator, dataSourceName);
 
-        // Enable SSL support by default
-        sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.REACTIVE_PG_CLIENT));
+        syntheticBeans.produce(pgPoolBeanConfigurator.done());
 
-        return serviceStart;
+        ExtendedBeanConfigurator mutinyPgPoolConfigurator = SyntheticBeanBuildItem
+                .configure(io.vertx.mutiny.pgclient.PgPool.class)
+                .defaultBean()
+                .scope(ApplicationScoped.class)
+                .runtimeValue(recorder.mutinyPgPool(pool))
+                .setRuntimeInit();
+
+        addQualifiers(mutinyPgPoolConfigurator, dataSourceName);
+
+        syntheticBeans.produce(mutinyPgPoolConfigurator.done());
+
+        vertxPool.produce(new VertxPoolBuildItem(pool, DatabaseKind.POSTGRESQL, DataSourceUtil.isDefault(dataSourceName)));
     }
 
-    @BuildStep
-    HealthBuildItem addHealthCheck(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig) {
-        return new HealthBuildItem("io.quarkus.reactive.pg.client.runtime.health.ReactivePgDataSourceHealthCheck",
-                dataSourcesBuildTimeConfig.healthEnabled);
+    private static boolean isReactivePostgreSQLPoolDefined(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig, String dataSourceName,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
+                .getDataSourceRuntimeConfig(dataSourceName);
+        DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
+                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+
+        Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind,
+                defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem);
+
+        if (!dbKind.isPresent()) {
+            return false;
+        }
+
+        if (!DatabaseKind.isPostgreSQL(dbKind.get())
+                || !dataSourceReactiveBuildTimeConfig.enabled) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean hasPools(DataSourcesBuildTimeConfig dataSourcesBuildTimeConfig,
+            DataSourcesReactiveBuildTimeConfig dataSourcesReactiveBuildTimeConfig,
+            List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (isReactivePostgreSQLPoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig,
+                DataSourceUtil.DEFAULT_DATASOURCE_NAME, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+            return true;
+        }
+
+        for (String dataSourceName : dataSourcesBuildTimeConfig.namedDataSources.keySet()) {
+            if (isReactivePostgreSQLPoolDefined(dataSourcesBuildTimeConfig, dataSourcesReactiveBuildTimeConfig,
+                    dataSourceName, defaultDataSourceDbKindBuildItems, curateOutcomeBuildItem)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static void addQualifiers(ExtendedBeanConfigurator configurator, String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            configurator.addQualifier(DotNames.DEFAULT);
+        } else {
+            configurator.addQualifier().annotation(DotNames.NAMED).addValue("value", dataSourceName).done();
+            configurator.addQualifier().annotation(ReactiveDataSource.class).addValue("value", dataSourceName)
+                    .done();
+        }
     }
 }
diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LegacyReactivePgReloadTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LegacyReactivePgReloadTest.java
deleted file mode 100644
index 8d8014a7dc16c..0000000000000
--- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/LegacyReactivePgReloadTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.quarkus.reactive.pg.client;
-
-import org.hamcrest.Matchers;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusDevModeTest;
-import io.restassured.RestAssured;
-
-public class LegacyReactivePgReloadTest {
-
-    @RegisterExtension
-    public static final QuarkusDevModeTest test = new QuarkusDevModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(DevModeResource.class)
-                    .add(new StringAsset("quarkus.datasource.url=vertx-reactive:postgres://localhost:2345/reload_test"),
-                            "application.properties"));
-
-    @Test
-    public void testHotReplacement() {
-        RestAssured
-                .get("/dev/error")
-                .then()
-                .statusCode(200)
-                .body(Matchers.endsWith(":2345"));
-
-        test.modifyResourceFile("application.properties", s -> s.replace(":2345", ":5234"));
-
-        RestAssured
-                .get("/dev/error")
-                .then()
-                .statusCode(200)
-                .body(Matchers.endsWith(":5234"));
-    }
-}
diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java
new file mode 100644
index 0000000000000..795da4acb0c7e
--- /dev/null
+++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/MultipleDataSourcesTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.reactive.pg.client;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+import io.quarkus.test.QuarkusUnitTest;
+import io.vertx.pgclient.PgPool;
+
+public class MultipleDataSourcesTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withConfigurationResource("application-multiple-datasources.properties")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BeanUsingDefaultDataSource.class)
+                    .addClass(BeanUsingHibernateDataSource.class));
+
+    @Inject
+    BeanUsingDefaultDataSource beanUsingDefaultDataSource;
+
+    @Inject
+    BeanUsingHibernateDataSource beanUsingHibernateDataSource;
+
+    @Test
+    public void testMultipleDataSources() {
+        beanUsingDefaultDataSource.verify()
+                .thenCompose(v -> beanUsingHibernateDataSource.verify())
+                .toCompletableFuture()
+                .join();
+    }
+
+    @ApplicationScoped
+    static class BeanUsingDefaultDataSource {
+
+        @Inject
+        PgPool pgClient;
+
+        public CompletionStage<Void> verify() {
+            CompletableFuture<Void> cf = new CompletableFuture<>();
+            pgClient.query("SELECT 1").execute(ar -> {
+                if (ar.failed()) {
+                    cf.completeExceptionally(ar.cause());
+                } else {
+                    cf.complete(null);
+                }
+            });
+            return cf;
+        }
+    }
+
+    @ApplicationScoped
+    static class BeanUsingHibernateDataSource {
+
+        @Inject
+        @ReactiveDataSource("hibernate")
+        PgPool pgClient;
+
+        public CompletionStage<Void> verify() {
+            CompletableFuture<Void> cf = new CompletableFuture<>();
+            pgClient.query("SELECT 1").execute(ar -> {
+                if (ar.failed()) {
+                    cf.completeExceptionally(ar.cause());
+                } else {
+                    cf.complete(null);
+                }
+            });
+            return cf;
+        }
+    }
+}
diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java
index f42aa654877d4..756c3990af623 100644
--- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java
+++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java
@@ -21,19 +21,11 @@ public class PgPoolProducerTest {
             .withConfigurationResource("application-default-datasource.properties")
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(BeanUsingBarePgClient.class)
-                    .addClass(BeanUsingMutinyPgClient.class)
-                    .addClasses(BeanUsingAxlePgClient.class)
-                    .addClasses(BeanUsingRXPgClient.class));
+                    .addClass(BeanUsingMutinyPgClient.class));
 
     @Inject
     BeanUsingBarePgClient beanUsingBare;
 
-    @Inject
-    BeanUsingAxlePgClient beanUsingAxle;
-
-    @Inject
-    BeanUsingRXPgClient beanUsingRx;
-
     @Inject
     BeanUsingMutinyPgClient beanUsingMutiny;
 
@@ -41,8 +33,6 @@ public class PgPoolProducerTest {
     public void testVertxInjection() {
         beanUsingBare.verify()
                 .thenCompose(v -> beanUsingMutiny.verify())
-                .thenCompose(v -> beanUsingAxle.verify())
-                .thenCompose(v -> beanUsingRx.verify())
                 .toCompletableFuture()
                 .join();
     }
@@ -73,33 +63,4 @@ public CompletionStage<Void> verify() {
                     .subscribeAsCompletionStage();
         }
     }
-
-    @ApplicationScoped
-    static class BeanUsingAxlePgClient {
-
-        @Inject
-        io.vertx.axle.pgclient.PgPool pgClient;
-
-        public CompletionStage<Void> verify() {
-            return pgClient.query("SELECT 1").execute()
-                    .<Void> thenApply(rs -> null)
-                    .exceptionally(t -> null);
-        }
-    }
-
-    @ApplicationScoped
-    static class BeanUsingRXPgClient {
-
-        @Inject
-        io.vertx.reactivex.pgclient.PgPool pgClient;
-
-        public CompletionStage<Void> verify() {
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            pgClient.query("SELECT 1").rxExecute()
-                    .ignoreElement()
-                    .onErrorComplete()
-                    .subscribe(() -> cf.complete(null));
-            return cf;
-        }
-    }
 }
diff --git a/extensions/reactive-pg-client/deployment/src/test/resources/application-multiple-datasources.properties b/extensions/reactive-pg-client/deployment/src/test/resources/application-multiple-datasources.properties
new file mode 100644
index 0000000000000..2b6242950797b
--- /dev/null
+++ b/extensions/reactive-pg-client/deployment/src/test/resources/application-multiple-datasources.properties
@@ -0,0 +1,11 @@
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=hibernate_orm_test
+quarkus.datasource.password=hibernate_orm_test
+quarkus.datasource.reactive.url=${reactive-postgres.url}
+quarkus.datasource.reactive.postgresql.pipelining-limit=10
+
+quarkus.datasource."hibernate".db-kind=postgresql
+quarkus.datasource."hibernate".username=hibernate_orm_test
+quarkus.datasource."hibernate".password=hibernate_orm_test
+quarkus.datasource."hibernate".reactive.url=${reactive-postgres.url}
+quarkus.datasource."hibernate".reactive.postgresql.pipelining-limit=7
\ No newline at end of file
diff --git a/extensions/reactive-pg-client/pom.xml b/extensions/reactive-pg-client/pom.xml
index 5cb48daac2550..ef8d4535a0b97 100644
--- a/extensions/reactive-pg-client/pom.xml
+++ b/extensions/reactive-pg-client/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-pg-client-parent</artifactId>
diff --git a/extensions/reactive-pg-client/runtime/pom.xml b/extensions/reactive-pg-client/runtime/pom.xml
index a67158b1bc290..27243e341bdae 100644
--- a/extensions/reactive-pg-client/runtime/pom.xml
+++ b/extensions/reactive-pg-client/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-reactive-pg-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-reactive-pg-client</artifactId>
@@ -32,10 +31,6 @@
             <groupId>com.ongres.scram</groupId>
             <artifactId>client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>smallrye-axle-pg-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>smallrye-mutiny-vertx-pg-client</artifactId>
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java
index b1dd120d5a81e..46f1d98f1399d 100644
--- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java
+++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java
@@ -3,28 +3,27 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
 import io.vertx.pgclient.SslMode;
 
-@ConfigRoot(name = "datasource.reactive.postgresql", phase = ConfigPhase.RUN_TIME)
+@ConfigGroup
 public class DataSourceReactivePostgreSQLConfig {
 
     /**
      * Whether prepared statements should be cached on the client side.
-     * 
+     *
      * @deprecated use {@code datasource.reactive.cache-prepared-statements} instead.
      */
     @ConfigItem
     @Deprecated
-    public Optional<Boolean> cachePreparedStatements;
+    public Optional<Boolean> cachePreparedStatements = Optional.empty();
 
     /**
      * The maximum number of inflight database commands that can be pipelined.
      */
     @ConfigItem
-    public OptionalInt pipeliningLimit;
+    public OptionalInt pipeliningLimit = OptionalInt.empty();
 
     /**
      * SSL operating mode of the client.
@@ -33,5 +32,5 @@ public class DataSourceReactivePostgreSQLConfig {
      * Different Modes</a>.
      */
     @ConfigItem(defaultValueDocumentation = "disable")
-    public Optional<SslMode> sslMode;
+    public Optional<SslMode> sslMode = Optional.empty();
 }
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourcesReactivePostgreSQLConfig.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourcesReactivePostgreSQLConfig.java
new file mode 100644
index 0000000000000..d79f46c6c2fb4
--- /dev/null
+++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourcesReactivePostgreSQLConfig.java
@@ -0,0 +1,62 @@
+package io.quarkus.reactive.pg.client.runtime;
+
+import java.util.Map;
+
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "datasource", phase = ConfigPhase.RUN_TIME)
+public class DataSourcesReactivePostgreSQLConfig {
+
+    /**
+     * The default datasource.
+     */
+    @ConfigItem(name = "reactive.postgresql")
+    public DataSourceReactivePostgreSQLConfig defaultDataSource;
+
+    /**
+     * Additional named datasources.
+     */
+    @ConfigDocSection
+    @ConfigDocMapKey("datasource-name")
+    @ConfigItem(name = ConfigItem.PARENT)
+    public Map<String, DataSourceReactivePostgreSQLOuterNamedConfig> namedDataSources;
+
+    public DataSourceReactivePostgreSQLConfig getDataSourceReactiveRuntimeConfig(String dataSourceName) {
+        if (DataSourceUtil.isDefault(dataSourceName)) {
+            return defaultDataSource;
+        }
+
+        DataSourceReactivePostgreSQLOuterNamedConfig dataSourceReactivePostgreSQLOuterNamedConfig = namedDataSources
+                .get(dataSourceName);
+        if (dataSourceReactivePostgreSQLOuterNamedConfig == null) {
+            return new DataSourceReactivePostgreSQLConfig();
+        }
+
+        return dataSourceReactivePostgreSQLOuterNamedConfig.reactive.postgresql;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactivePostgreSQLOuterNamedConfig {
+
+        /**
+         * The PostgreSQL-specific configuration.
+         */
+        public DataSourceReactivePostgreSQLOuterNestedNamedConfig reactive;
+    }
+
+    @ConfigGroup
+    public static class DataSourceReactivePostgreSQLOuterNestedNamedConfig {
+
+        /**
+         * The PostgreSQL-specific configuration.
+         */
+        public DataSourceReactivePostgreSQLConfig postgresql;
+    }
+
+}
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/LegacyDataSourceReactivePostgreSQLConfig.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/LegacyDataSourceReactivePostgreSQLConfig.java
deleted file mode 100644
index e28965a7d643e..0000000000000
--- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/LegacyDataSourceReactivePostgreSQLConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.reactive.pg.client.runtime;
-
-import java.util.Optional;
-import java.util.OptionalInt;
-
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-
-@ConfigRoot(name = "reactive-pg-client", phase = ConfigPhase.RUN_TIME)
-@Deprecated
-public class LegacyDataSourceReactivePostgreSQLConfig {
-
-    /**
-     * @deprecated use {@code quarkus.datasource.reactive.cache-prepared-statements} instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public Optional<Boolean> cachePreparedStatements;
-
-    /**
-     * @deprecated use {@code quarkus.datasource.reactive.postgresql.pipelining-limit} instead.
-     */
-    @ConfigItem
-    @Deprecated
-    public OptionalInt pipeliningLimit;
-}
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java
deleted file mode 100644
index c997c62f1c14b..0000000000000
--- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolProducer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.quarkus.reactive.pg.client.runtime;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jboss.logging.Logger;
-
-import io.vertx.pgclient.PgPool;
-
-@ApplicationScoped
-public class PgPoolProducer {
-
-    private static final Logger LOGGER = Logger.getLogger(PgPoolProducer.class);
-
-    @Inject
-    PgPool pgPool;
-
-    /**
-     * @return the <em>mutiny</em> PostGreSQL Pool instance. The instance is created lazily.
-     */
-    @Singleton
-    @Produces
-    public io.vertx.mutiny.pgclient.PgPool mutinyPgPool() {
-        return io.vertx.mutiny.pgclient.PgPool.newInstance(pgPool);
-    }
-
-    /**
-     * Produces the Axle PostGreSQL Pool instance. The instance is created lazily.
-     *
-     * @return the Axle PostGreSQL pool instance
-     * @deprecated The Axle API is deprecated and will be removed in the future, use {@link #mutinyPgPool()} instead.
-     */
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.axle.pgclient.PgPool axlePgPool() {
-        LOGGER.warn(
-                "`io.vertx.axle.pgclient.PgPool` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.pgclient.PgPool`");
-        return io.vertx.axle.pgclient.PgPool.newInstance(pgPool);
-    }
-
-    /**
-     * Produces the RX PostGreSQL Pool instance. The instance is created lazily.
-     *
-     * @return the RX PostGreSQL pool instance
-     * @deprecated The RX API is deprecated and will be removed in the future, use {@link #mutinyPgPool()} instead.
-     */
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.reactivex.pgclient.PgPool rxPgPool() {
-        LOGGER.warn(
-                "`io.vertx.reactivex.pgclient.PgPool` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.pgclient.PgPool`");
-        return io.vertx.reactivex.pgclient.PgPool.newInstance(pgPool);
-    }
-}
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java
index 7d4e7c5fd8ae3..7cbee0906394b 100644
--- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java
+++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java
@@ -10,6 +10,7 @@
 import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxTrustOptions;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.jboss.logging.Logger;
 
@@ -17,9 +18,8 @@
 import io.quarkus.credentials.runtime.CredentialsProviderFinder;
 import io.quarkus.datasource.runtime.DataSourceRuntimeConfig;
 import io.quarkus.datasource.runtime.DataSourcesRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourceRuntimeConfig;
-import io.quarkus.datasource.runtime.LegacyDataSourcesRuntimeConfig;
 import io.quarkus.reactive.datasource.runtime.DataSourceReactiveRuntimeConfig;
+import io.quarkus.reactive.datasource.runtime.DataSourcesReactiveRuntimeConfig;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
@@ -35,28 +35,25 @@ public class PgPoolRecorder {
     private static final Logger log = Logger.getLogger(PgPoolRecorder.class);
 
     public RuntimeValue<PgPool> configurePgPool(RuntimeValue<Vertx> vertx,
+            String dataSourceName,
             DataSourcesRuntimeConfig dataSourcesRuntimeConfig,
-            DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
-            DataSourceReactivePostgreSQLConfig dataSourceReactivePostgreSQLConfig,
-            LegacyDataSourcesRuntimeConfig legacyDataSourcesRuntimeConfig,
-            LegacyDataSourceReactivePostgreSQLConfig legacyDataSourceReactivePostgreSQLConfig,
-            boolean isLegacy,
+            DataSourcesReactiveRuntimeConfig dataSourcesReactiveRuntimeConfig,
+            DataSourcesReactivePostgreSQLConfig dataSourcesReactivePostgreSQLConfig,
             ShutdownContext shutdown) {
 
-        PgPool pgPool;
-        if (!isLegacy) {
-            pgPool = initialize(vertx.getValue(), dataSourcesRuntimeConfig.defaultDataSource,
-                    dataSourceReactiveRuntimeConfig,
-                    dataSourceReactivePostgreSQLConfig);
-        } else {
-            pgPool = legacyInitialize(vertx.getValue(), dataSourcesRuntimeConfig.defaultDataSource,
-                    legacyDataSourcesRuntimeConfig.defaultDataSource, legacyDataSourceReactivePostgreSQLConfig);
-        }
+        PgPool pgPool = initialize(vertx.getValue(),
+                dataSourcesRuntimeConfig.getDataSourceRuntimeConfig(dataSourceName),
+                dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                dataSourcesReactivePostgreSQLConfig.getDataSourceReactiveRuntimeConfig(dataSourceName));
 
         shutdown.addShutdownTask(pgPool::close);
         return new RuntimeValue<>(pgPool);
     }
 
+    public RuntimeValue<io.vertx.mutiny.pgclient.PgPool> mutinyPgPool(RuntimeValue<PgPool> pgPool) {
+        return new RuntimeValue<>(io.vertx.mutiny.pgclient.PgPool.newInstance(pgPool.getValue()));
+    }
+
     private PgPool initialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntimeConfig,
             DataSourceReactiveRuntimeConfig dataSourceReactiveRuntimeConfig,
             DataSourceReactivePostgreSQLConfig dataSourceReactivePostgreSQLConfig) {
@@ -64,11 +61,11 @@ private PgPool initialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntime
                 dataSourceReactivePostgreSQLConfig);
         PgConnectOptions pgConnectOptions = toPgConnectOptions(dataSourceRuntimeConfig, dataSourceReactiveRuntimeConfig,
                 dataSourceReactivePostgreSQLConfig);
-        if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent() &&
-                dataSourceReactiveRuntimeConfig.threadLocal.get()) {
-            return new ThreadLocalPgPool(vertx, pgConnectOptions, poolOptions);
+        if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) {
+            log.warn(
+                    "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now.");
         }
-        return PgPool.pool(vertx, pgConnectOptions, poolOptions);
+        return new ThreadLocalPgPool(vertx, pgConnectOptions, poolOptions);
     }
 
     private PoolOptions toPoolOptions(DataSourceRuntimeConfig dataSourceRuntimeConfig,
@@ -150,58 +147,13 @@ private PgConnectOptions toPgConnectOptions(DataSourceRuntimeConfig dataSourceRu
         configureJksKeyCertOptions(pgConnectOptions, dataSourceReactiveRuntimeConfig.keyCertificateJks);
         configurePfxKeyCertOptions(pgConnectOptions, dataSourceReactiveRuntimeConfig.keyCertificatePfx);
 
-        return pgConnectOptions;
-    }
-
-    // Legacy configuration
-
-    private PgPool legacyInitialize(Vertx vertx, DataSourceRuntimeConfig dataSourceRuntimeConfig,
-            LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig,
-            LegacyDataSourceReactivePostgreSQLConfig legacyDataSourceReactivePostgreSQLConfig) {
-        PoolOptions poolOptions = legacyToPoolOptionsLegacy(legacyDataSourceRuntimeConfig);
-        PgConnectOptions pgConnectOptions = legacyToPostgreSQLConnectOptions(dataSourceRuntimeConfig,
-                legacyDataSourceRuntimeConfig, legacyDataSourceReactivePostgreSQLConfig);
-        return PgPool.pool(vertx, pgConnectOptions, poolOptions);
-    }
-
-    private PoolOptions legacyToPoolOptionsLegacy(LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig) {
-        PoolOptions poolOptions;
-        poolOptions = new PoolOptions();
-
-        // Slight change of behavior compared to the legacy code: the default max size is set to 20
-        poolOptions.setMaxSize(legacyDataSourceRuntimeConfig.maxSize);
-
-        return poolOptions;
-    }
-
-    private PgConnectOptions legacyToPostgreSQLConnectOptions(DataSourceRuntimeConfig dataSourceRuntimeConfig,
-            LegacyDataSourceRuntimeConfig legacyDataSourceRuntimeConfig,
-            LegacyDataSourceReactivePostgreSQLConfig legacyDataSourceReactivePostgreSQLConfig) {
-        PgConnectOptions pgConnectOptions;
-        if (legacyDataSourceRuntimeConfig.url.isPresent()) {
-            String url = legacyDataSourceRuntimeConfig.url.get();
-            // clean up the URL to make migrations easier
-            if (url.matches("^vertx-reactive:postgre(?:s|sql)://.*$")) {
-                url = url.substring("vertx-reactive:".length());
-            }
-            pgConnectOptions = PgConnectOptions.fromUri(url);
-        } else {
-            pgConnectOptions = new PgConnectOptions();
-        }
-
-        if (dataSourceRuntimeConfig.username.isPresent()) {
-            pgConnectOptions.setUser(dataSourceRuntimeConfig.username.get());
-        }
+        pgConnectOptions.setReconnectAttempts(dataSourceReactiveRuntimeConfig.reconnectAttempts);
 
-        if (dataSourceRuntimeConfig.password.isPresent()) {
-            pgConnectOptions.setPassword(dataSourceRuntimeConfig.password.get());
-        }
+        pgConnectOptions.setReconnectInterval(dataSourceReactiveRuntimeConfig.reconnectInterval.toMillis());
 
-        if (legacyDataSourceReactivePostgreSQLConfig.cachePreparedStatements.isPresent()) {
-            pgConnectOptions.setCachePreparedStatements(legacyDataSourceReactivePostgreSQLConfig.cachePreparedStatements.get());
-        }
-        if (legacyDataSourceReactivePostgreSQLConfig.pipeliningLimit.isPresent()) {
-            pgConnectOptions.setPipeliningLimit(legacyDataSourceReactivePostgreSQLConfig.pipeliningLimit.getAsInt());
+        if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) {
+            int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis());
+            pgConnectOptions.setIdleTimeout(idleTimeout).setIdleTimeoutUnit(TimeUnit.MILLISECONDS);
         }
 
         return pgConnectOptions;
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/ThreadLocalPgPool.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/ThreadLocalPgPool.java
index d5e5e9e86c5f5..e22deb2978efb 100644
--- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/ThreadLocalPgPool.java
+++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/ThreadLocalPgPool.java
@@ -1,10 +1,18 @@
 package io.quarkus.reactive.pg.client.runtime;
 
 import io.quarkus.reactive.datasource.runtime.ThreadLocalPool;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.pgclient.PgConnectOptions;
 import io.vertx.pgclient.PgPool;
 import io.vertx.sqlclient.PoolOptions;
+import io.vertx.sqlclient.PreparedQuery;
+import io.vertx.sqlclient.Query;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.RowSet;
+import io.vertx.sqlclient.SqlConnection;
+import io.vertx.sqlclient.Transaction;
 
 public class ThreadLocalPgPool extends ThreadLocalPool<PgPool> implements PgPool {
 
@@ -17,6 +25,44 @@ public ThreadLocalPgPool(Vertx vertx, PgConnectOptions pgConnectOptions, PoolOpt
 
     @Override
     protected PgPool createThreadLocalPool() {
-        return PgPool.pool(vertx, pgConnectOptions, poolOptions);
+        return new PgPoolWrapper(PgPool.pool(vertx, pgConnectOptions, poolOptions));
+    }
+
+    private class PgPoolWrapper implements PgPool {
+
+        private final PgPool delegate;
+        private boolean open = true;
+
+        private PgPoolWrapper(PgPool delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void getConnection(Handler<AsyncResult<SqlConnection>> handler) {
+            delegate.getConnection(handler);
+        }
+
+        @Override
+        public Query<RowSet<Row>> query(String s) {
+            return delegate.query(s);
+        }
+
+        @Override
+        public PreparedQuery<RowSet<Row>> preparedQuery(String s) {
+            return delegate.preparedQuery(s);
+        }
+
+        @Override
+        public void begin(Handler<AsyncResult<Transaction>> handler) {
+            delegate.begin(handler);
+        }
+
+        @Override
+        public void close() {
+            if (open) {
+                delegate.close();
+                ThreadLocalPgPool.this.removeSelfFromTracking(this);
+            }
+        }
     }
 }
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourceHealthCheck.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourceHealthCheck.java
deleted file mode 100644
index 4fae36e7a39ad..0000000000000
--- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourceHealthCheck.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.quarkus.reactive.pg.client.runtime.health;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-
-import org.eclipse.microprofile.health.HealthCheck;
-import org.eclipse.microprofile.health.HealthCheckResponse;
-import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
-import org.eclipse.microprofile.health.Readiness;
-
-import io.quarkus.arc.Arc;
-import io.vertx.pgclient.PgPool;
-
-@Readiness
-@ApplicationScoped
-public class ReactivePgDataSourceHealthCheck implements HealthCheck {
-    private PgPool pgPool;
-
-    @PostConstruct
-    protected void init() {
-        pgPool = Arc.container().instance(PgPool.class).get();
-    }
-
-    @Override
-    public HealthCheckResponse call() {
-        HealthCheckResponseBuilder builder = HealthCheckResponse.named("Reactive PostgreSQL connection health check").up();
-
-        try {
-            CompletableFuture<Void> databaseConnectionAttempt = new CompletableFuture<>();
-            pgPool.query("SELECT 1")
-                    .execute(ar -> {
-                        if (ar.failed()) {
-                            builder.down();
-                        }
-                        databaseConnectionAttempt.complete(null);
-                    });
-            databaseConnectionAttempt.get(10, TimeUnit.SECONDS);
-        } catch (Exception exception) {
-            builder.down();
-        }
-
-        return builder.build();
-    }
-}
diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java
new file mode 100644
index 0000000000000..ff5b22afe419b
--- /dev/null
+++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/health/ReactivePgDataSourcesHealthCheck.java
@@ -0,0 +1,29 @@
+package io.quarkus.reactive.pg.client.runtime.health;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
+
+import org.eclipse.microprofile.health.Readiness;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.reactive.datasource.runtime.ReactiveDatasourceHealthCheck;
+import io.vertx.pgclient.PgPool;
+
+@Readiness
+@ApplicationScoped
+class ReactivePgDataSourcesHealthCheck extends ReactiveDatasourceHealthCheck {
+
+    public ReactivePgDataSourcesHealthCheck() {
+        super("Reactive PostgreSQL connections health check", "SELECT 1");
+    }
+
+    @PostConstruct
+    protected void init() {
+        for (InstanceHandle<PgPool> handle : Arc.container().select(PgPool.class, Any.Literal.INSTANCE).handles()) {
+            addPool(getPoolName(handle.getBean()), handle.get());
+        }
+    }
+
+}
diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/main/java/io/quarkus/mutiny/reactive/operators/deployment/MutinyReactiveStreamsOperatorsProcessor.java b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/main/java/io/quarkus/mutiny/reactive/operators/deployment/MutinyReactiveStreamsOperatorsProcessor.java
index c8d30dcda7412..ea0e6b962f824 100644
--- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/main/java/io/quarkus/mutiny/reactive/operators/deployment/MutinyReactiveStreamsOperatorsProcessor.java
+++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/deployment/src/main/java/io/quarkus/mutiny/reactive/operators/deployment/MutinyReactiveStreamsOperatorsProcessor.java
@@ -6,7 +6,10 @@
 
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.mutiny.reactive.operators.runtime.ReactiveStreamsOperatorsRecorder;
 import io.smallrye.mutiny.streams.Engine;
 
 public class MutinyReactiveStreamsOperatorsProcessor {
@@ -19,4 +22,10 @@ public void build(BuildProducer<ServiceProviderBuildItem> serviceProvider) {
                 ReactiveStreamsFactoryImpl.class.getName()));
     }
 
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void classLoadingHack(ReactiveStreamsOperatorsRecorder reactiveStreamsOperatorsRecorder) {
+        reactiveStreamsOperatorsRecorder.classLoaderHack();
+    }
+
 }
diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/pom.xml
index 0a2501a95c02d..0c20108b82c03 100644
--- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/pom.xml
+++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-reactive-streams-operators-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/pom.xml b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/pom.xml
index 4052b5ebc8b77..46d87341154e1 100644
--- a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/pom.xml
+++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
-            <artifactId>mutiny-context-propagation</artifactId>
+            <artifactId>mutiny-smallrye-context-propagation</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/src/main/java/io/quarkus/mutiny/reactive/operators/runtime/ReactiveStreamsOperatorsRecorder.java b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/src/main/java/io/quarkus/mutiny/reactive/operators/runtime/ReactiveStreamsOperatorsRecorder.java
new file mode 100644
index 0000000000000..a0ab776c1cf1c
--- /dev/null
+++ b/extensions/reactive-streams-operators/mutiny-reactive-streams-operators/runtime/src/main/java/io/quarkus/mutiny/reactive/operators/runtime/ReactiveStreamsOperatorsRecorder.java
@@ -0,0 +1,58 @@
+package io.quarkus.mutiny.reactive.operators.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.eclipse.microprofile.reactive.streams.operators.core.ReactiveStreamsEngineResolver;
+import org.eclipse.microprofile.reactive.streams.operators.spi.ReactiveStreamsFactoryResolver;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class ReactiveStreamsOperatorsRecorder {
+
+    /**
+     * ClassLoader hack to work around reactive streams API issue
+     * see https://github.com/eclipse/microprofile-reactive-streams-operators/pull/130
+     *
+     * This must be deleted when Reactive Streams Operators 1.1 is merged
+     */
+    public void classLoaderHack() {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(new ClassLoader(null) {
+                @Override
+                public Class<?> loadClass(String name) throws ClassNotFoundException {
+                    return cl.loadClass(name);
+                }
+
+                @Override
+                protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                    return cl.loadClass(name);
+                }
+
+                @Override
+                public URL getResource(String name) {
+                    return cl.getResource(name);
+                }
+
+                @Override
+                public Enumeration<URL> getResources(String name) throws IOException {
+                    return cl.getResources(name);
+                }
+
+                @Override
+                public InputStream getResourceAsStream(String name) {
+                    return cl.getResourceAsStream(name);
+                }
+            });
+            ReactiveStreamsFactoryResolver.instance();
+            ReactiveStreamsEngineResolver.instance();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
+
+    }
+}
diff --git a/extensions/reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/pom.xml
index b0e703efda704..cd2f77b8f4ad4 100644
--- a/extensions/reactive-streams-operators/pom.xml
+++ b/extensions/reactive-streams-operators/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/io/quarkus/smallrye/reactivestreamoperators/deployment/SmallRyeReactiveStreamsOperatorsProcessor.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/io/quarkus/smallrye/reactivestreamoperators/deployment/SmallRyeReactiveStreamsOperatorsProcessor.java
index c5ee5b2b5ef3e..7e532e0091380 100644
--- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/io/quarkus/smallrye/reactivestreamoperators/deployment/SmallRyeReactiveStreamsOperatorsProcessor.java
+++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/io/quarkus/smallrye/reactivestreamoperators/deployment/SmallRyeReactiveStreamsOperatorsProcessor.java
@@ -7,8 +7,11 @@
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.smallrye.reactivestreamsoperators.runtime.ReactiveStreamsOperatorsRecorder;
 import io.smallrye.reactive.streams.Engine;
 
 public class SmallRyeReactiveStreamsOperatorsProcessor {
@@ -22,4 +25,10 @@ public void build(BuildProducer<ServiceProviderBuildItem> serviceProvider,
                 ReactiveStreamsFactoryImpl.class.getName()));
     }
 
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void classLoadingHack(ReactiveStreamsOperatorsRecorder reactiveStreamsOperatorsRecorder) {
+        reactiveStreamsOperatorsRecorder.classLoaderHack();
+    }
+
 }
diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml
index cbda7f034598e..8df1ec5ffdc86 100644
--- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml
+++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-reactive-streams-operators-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/java/io/quarkus/smallrye/reactivestreamsoperators/runtime/ReactiveStreamsOperatorsRecorder.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/java/io/quarkus/smallrye/reactivestreamsoperators/runtime/ReactiveStreamsOperatorsRecorder.java
new file mode 100644
index 0000000000000..66f5adbe71997
--- /dev/null
+++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/src/main/java/io/quarkus/smallrye/reactivestreamsoperators/runtime/ReactiveStreamsOperatorsRecorder.java
@@ -0,0 +1,58 @@
+package io.quarkus.smallrye.reactivestreamsoperators.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.eclipse.microprofile.reactive.streams.operators.core.ReactiveStreamsEngineResolver;
+import org.eclipse.microprofile.reactive.streams.operators.spi.ReactiveStreamsFactoryResolver;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class ReactiveStreamsOperatorsRecorder {
+
+    /**
+     * ClassLoader hack to work around reactive streams API issue
+     * see https://github.com/eclipse/microprofile-reactive-streams-operators/pull/130
+     *
+     * This must be deleted when Reactive Streams Operators 1.1 is merged
+     */
+    public void classLoaderHack() {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(new ClassLoader(null) {
+                @Override
+                public Class<?> loadClass(String name) throws ClassNotFoundException {
+                    return cl.loadClass(name);
+                }
+
+                @Override
+                protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                    return cl.loadClass(name);
+                }
+
+                @Override
+                public URL getResource(String name) {
+                    return cl.getResource(name);
+                }
+
+                @Override
+                public Enumeration<URL> getResources(String name) throws IOException {
+                    return cl.getResources(name);
+                }
+
+                @Override
+                public InputStream getResourceAsStream(String name) {
+                    return cl.getResourceAsStream(name);
+                }
+            });
+            ReactiveStreamsFactoryResolver.instance();
+            ReactiveStreamsEngineResolver.instance();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
+
+    }
+}
diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml
index b8798ab745d3e..8c764225cd6c2 100644
--- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml
+++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-reactive-streams-operators-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-smallrye-reactive-type-converters-parent</artifactId>
diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml
index d0e9ebf669e53..f777b31b0ca9b 100644
--- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml
+++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml
@@ -14,6 +14,10 @@
     <name>Quarkus - SmallRye Reactive Type Converters - Runtime</name>
     <description>Converters for reactive types from various reactive programming libraries</description>
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
             <artifactId>smallrye-reactive-converter-api</artifactId>
diff --git a/extensions/redis-client/deployment/pom.xml b/extensions/redis-client/deployment/pom.xml
index 428efb057fc7f..eaad7f12c04b9 100644
--- a/extensions/redis-client/deployment/pom.xml
+++ b/extensions/redis-client/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-redis-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-redis-client-deployment</artifactId>
@@ -28,12 +27,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java
index 0c0a29c8c3518..319d51f966a1c 100644
--- a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java
+++ b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java
@@ -1,16 +1,48 @@
 package io.quarkus.redis.client.deployment;
 
+import static io.quarkus.arc.processor.BuiltinScope.SINGLETON;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Default;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.RedisClientName;
+import io.quarkus.redis.client.reactive.ReactiveRedisClient;
+import io.quarkus.redis.client.runtime.MutinyRedis;
+import io.quarkus.redis.client.runtime.MutinyRedisAPI;
+import io.quarkus.redis.client.runtime.RedisClientRecorder;
+import io.quarkus.redis.client.runtime.RedisClientUtil;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
+import io.quarkus.vertx.deployment.VertxBuildItem;
+import io.vertx.redis.client.Redis;
+import io.vertx.redis.client.RedisAPI;
 import io.vertx.redis.client.impl.types.BulkType;
 
 public class RedisClientProcessor {
 
+    private static final DotName REDIS_CLIENT_ANNOTATION = DotName.createSimple(RedisClientName.class.getName());
+
     @BuildStep
     FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.REDIS_CLIENT);
@@ -22,8 +54,18 @@ ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
     }
 
     @BuildStep
-    AdditionalBeanBuildItem registerAPIsProducer() {
-        return AdditionalBeanBuildItem.unremovableOf("io.quarkus.redis.client.runtime.RedisAPIProducer");
+    List<AdditionalBeanBuildItem> registerRedisBeans() {
+        return Arrays.asList(
+                AdditionalBeanBuildItem
+                        .builder()
+                        .addBeanClass("io.quarkus.redis.client.runtime.RedisAPIProducer")
+                        .setDefaultScope(SINGLETON.getName())
+                        .setUnremovable()
+                        .build(),
+                AdditionalBeanBuildItem
+                        .builder()
+                        .addBeanClass(RedisClientName.class)
+                        .build());
     }
 
     @BuildStep
@@ -35,4 +77,101 @@ HealthBuildItem addHealthCheck(RedisBuildTimeConfig buildTimeConfig) {
     RuntimeInitializedClassBuildItem initializeBulkTypeDuringRuntime() {
         return new RuntimeInitializedClassBuildItem(BulkType.class.getName());
     }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public void produceRedisClient(RedisClientRecorder recorder, BeanArchiveIndexBuildItem indexBuildItem,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
+            VertxBuildItem vertxBuildItem) {
+        Set<String> clientNames = new HashSet<>();
+        clientNames.add(RedisClientUtil.DEFAULT_CLIENT);
+
+        IndexView indexView = indexBuildItem.getIndex();
+        Collection<AnnotationInstance> clientAnnotations = indexView.getAnnotations(REDIS_CLIENT_ANNOTATION);
+        for (AnnotationInstance annotation : clientAnnotations) {
+            clientNames.add(annotation.value().asString());
+        }
+
+        for (String clientName : clientNames) {
+            syntheticBeans.produce(createRedisClientSyntheticBean(recorder, clientName));
+            syntheticBeans.produce(createRedisReactiveClientSyntheticBean(recorder, clientName));
+            syntheticBeans.produce(createMutinyRedisAPISyntheticBean(recorder, clientName));
+            syntheticBeans.produce(createMutinyRedisSyntheticBean(recorder, clientName));
+            syntheticBeans.produce(createRedisSyntheticBean(recorder, clientName));
+            syntheticBeans.produce(createRedisAPISyntheticBean(recorder, clientName));
+        }
+    }
+
+    private SyntheticBeanBuildItem createRedisClientSyntheticBean(RedisClientRecorder recorder, String clientName) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(RedisClient.class)
+                .scope(ApplicationScoped.class)
+                .supplier(recorder.redisClientSupplier(clientName))
+                .setRuntimeInit();
+
+        return applyCommonBeanConfig(clientName, configurator);
+    }
+
+    private SyntheticBeanBuildItem createRedisReactiveClientSyntheticBean(RedisClientRecorder recorder, String clientName) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(ReactiveRedisClient.class)
+                .scope(ApplicationScoped.class)
+                .supplier(recorder.reactiveRedisClientSupplier(clientName))
+                .setRuntimeInit();
+
+        return applyCommonBeanConfig(clientName, configurator);
+    }
+
+    private SyntheticBeanBuildItem createMutinyRedisSyntheticBean(RedisClientRecorder recorder, String clientName) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(MutinyRedis.class)
+                .scope(ApplicationScoped.class)
+                .supplier(recorder.mutinyRedisSupplier(clientName))
+                .setRuntimeInit();
+
+        return applyCommonBeanConfig(clientName, configurator);
+    }
+
+    private SyntheticBeanBuildItem createMutinyRedisAPISyntheticBean(RedisClientRecorder recorder, String clientName) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(MutinyRedisAPI.class)
+                .scope(ApplicationScoped.class)
+                .supplier(recorder.mutinyRedisAPISupplier(clientName))
+                .setRuntimeInit();
+
+        return applyCommonBeanConfig(clientName, configurator);
+    }
+
+    private SyntheticBeanBuildItem createRedisSyntheticBean(RedisClientRecorder recorder, String clientName) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(Redis.class)
+                .scope(ApplicationScoped.class)
+                .supplier(recorder.redisSupplier(clientName))
+                .setRuntimeInit();
+
+        return applyCommonBeanConfig(clientName, configurator);
+    }
+
+    private SyntheticBeanBuildItem createRedisAPISyntheticBean(RedisClientRecorder recorder, String clientName) {
+        SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem
+                .configure(RedisAPI.class)
+                .scope(ApplicationScoped.class)
+                .supplier(recorder.redisAPISupplier(clientName))
+                .setRuntimeInit();
+
+        return applyCommonBeanConfig(clientName, configurator);
+    }
+
+    private SyntheticBeanBuildItem applyCommonBeanConfig(String clientName,
+            SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator) {
+
+        configurator.unremovable();
+
+        if (RedisClientUtil.isDefault(clientName)) {
+            configurator.addQualifier(Default.class);
+        } else {
+            configurator.addQualifier().annotation(REDIS_CLIENT_ANNOTATION).addValue("value", clientName).done();
+        }
+        return configurator.done();
+    }
 }
diff --git a/extensions/redis-client/pom.xml b/extensions/redis-client/pom.xml
index 953b70056bec7..458b2563a75bf 100644
--- a/extensions/redis-client/pom.xml
+++ b/extensions/redis-client/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-redis-client-parent</artifactId>
diff --git a/extensions/redis-client/runtime/pom.xml b/extensions/redis-client/runtime/pom.xml
index 2d37cc78cbc19..190acd9933dad 100644
--- a/extensions/redis-client/runtime/pom.xml
+++ b/extensions/redis-client/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-redis-client-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-redis-client</artifactId>
@@ -30,16 +29,6 @@
             <artifactId>quarkus-smallrye-health</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java
new file mode 100644
index 0000000000000..7c5148d2613b9
--- /dev/null
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/RedisClientName.java
@@ -0,0 +1,38 @@
+package io.quarkus.redis.client;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * Marker annotation to select the Redis client.
+ *
+ * For example, if the Redis connection is configured like so in {@code application.properties}:
+ *
+ * <pre>
+ * quarkus.redis.client1.hosts=localhost:6379
+ * </pre>
+ *
+ * Then to inject the proper {@code redisClient}, you would need to use {@code RedisClientName} like indicated below:
+ *
+ * <pre>
+ *     &#64Inject
+ *     &#64RedisClientName("client1")
+ *     RedisClient client;
+ * </pre>
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface RedisClientName {
+    /**
+     * The Redis client name.
+     */
+    String value() default "";
+}
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/MutinyRedis.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/MutinyRedis.java
new file mode 100644
index 0000000000000..37a8fbf0c926a
--- /dev/null
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/MutinyRedis.java
@@ -0,0 +1,13 @@
+package io.quarkus.redis.client.runtime;
+
+import io.vertx.redis.client.Redis;
+
+public class MutinyRedis extends io.vertx.mutiny.redis.client.Redis {
+    MutinyRedis(Redis delegate) {
+        super(delegate);
+    }
+
+    MutinyRedis() {
+        super(null);
+    }
+}
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/MutinyRedisAPI.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/MutinyRedisAPI.java
new file mode 100644
index 0000000000000..533aa8d090c55
--- /dev/null
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/MutinyRedisAPI.java
@@ -0,0 +1,13 @@
+package io.quarkus.redis.client.runtime;
+
+import io.vertx.redis.client.RedisAPI;
+
+public class MutinyRedisAPI extends io.vertx.mutiny.redis.client.RedisAPI {
+    MutinyRedisAPI(RedisAPI delegate) {
+        super(delegate);
+    }
+
+    MutinyRedisAPI() {
+        super(null);
+    }
+}
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIContainer.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIContainer.java
new file mode 100644
index 0000000000000..d8a47789d6e1b
--- /dev/null
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIContainer.java
@@ -0,0 +1,65 @@
+package io.quarkus.redis.client.runtime;
+
+import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.reactive.ReactiveRedisClient;
+import io.vertx.redis.client.Redis;
+import io.vertx.redis.client.RedisAPI;
+
+class RedisAPIContainer {
+    private final Redis redis;
+
+    private final RedisAPI redisAPI;
+
+    private final RedisClient redisClient;
+
+    private final ReactiveRedisClient reactiveClient;
+
+    private final MutinyRedis mutinyRedis;
+
+    private final MutinyRedisAPI mutinyRedisAPI;
+
+    public RedisAPIContainer(Redis redis, RedisAPI redisAPI, RedisClient redisClient,
+            ReactiveRedisClient reactiveClient, MutinyRedis mutinyRedis,
+            MutinyRedisAPI mutinyRedisAPI) {
+        this.redis = redis;
+        this.redisAPI = redisAPI;
+        this.redisClient = redisClient;
+        this.reactiveClient = reactiveClient;
+        this.mutinyRedis = mutinyRedis;
+        this.mutinyRedisAPI = mutinyRedisAPI;
+    }
+
+    public Redis getRedis() {
+        return redis;
+    }
+
+    public RedisAPI getRedisAPI() {
+        return redisAPI;
+    }
+
+    public RedisClient getRedisClient() {
+        return redisClient;
+    }
+
+    public ReactiveRedisClient getReactiveClient() {
+        return reactiveClient;
+    }
+
+    public MutinyRedis getMutinyRedis() {
+        return mutinyRedis;
+    }
+
+    public MutinyRedisAPI getMutinyRedisAPI() {
+        return mutinyRedisAPI;
+    }
+
+    public void close() {
+        this.redisAPI.close();
+        this.redis.close();
+        this.redisAPI.close();
+        this.redisClient.close();
+        this.reactiveClient.close();
+        this.mutinyRedis.close();
+        this.mutinyRedisAPI.close();
+    }
+}
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIProducer.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIProducer.java
index 5db2ce94b2216..ca98ec44e54eb 100644
--- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIProducer.java
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisAPIProducer.java
@@ -1,136 +1,60 @@
 package io.quarkus.redis.client.runtime;
 
-import java.net.InetSocketAddress;
-import java.util.Set;
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
 
 import io.quarkus.redis.client.RedisClient;
 import io.quarkus.redis.client.reactive.ReactiveRedisClient;
-import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.redis.client.runtime.RedisConfig.RedisConfiguration;
 import io.vertx.core.Vertx;
 import io.vertx.redis.client.Redis;
 import io.vertx.redis.client.RedisAPI;
-import io.vertx.redis.client.RedisClientType;
 import io.vertx.redis.client.RedisOptions;
 
-@ApplicationScoped
 class RedisAPIProducer {
-    private static final char AT = '@';
-    private static final char COLON = ':';
-    private static final char SLASH = '/';
-    private static final String REDIS_SCHEME = "redis://";
-    private static final String REDIS_SSL_SCHEME = "rediss://";
-
-    private long timeout = 10;
-
-    private final RedisConfig config;
-
-    private final Redis vertxRedisClient;
-
-    private final RedisAPI redisAPI;
-
-    private final RedisClient redisClient;
-
-    private final ReactiveRedisClient reactiveClient;
-
-    private final io.vertx.mutiny.redis.client.Redis mutinyRedisClient;
-
-    private final io.vertx.mutiny.redis.client.RedisAPI mutinyRedisAPI;
-
-    public RedisAPIProducer(RedisConfig config, Vertx vertx) {
-        this.config = config;
-        RedisOptions options = new RedisOptions();
-        options.setType(config.clientType);
-
-        if (RedisClientType.STANDALONE == config.clientType) {
-            if (config.hosts.isPresent() && config.hosts.get().size() > 1) {
-                throw new ConfigurationException("Multiple hosts supplied for non clustered configuration");
-            }
-        }
-
-        if (config.hosts.isPresent()) {
-            Set<InetSocketAddress> hosts = config.hosts.get();
-            for (InetSocketAddress host : hosts) {
-                String connectionString = buildConnectionString(host);
-                options.addConnectionString(connectionString);
+    private static Map<String, RedisAPIContainer> REDIS_APIS = new ConcurrentHashMap<>();
+
+    private final Vertx vertx;
+    private final RedisConfig redisConfig;
+
+    public RedisAPIProducer(RedisConfig redisConfig, Vertx vertx) {
+        this.redisConfig = redisConfig;
+        this.vertx = vertx;
+    }
+
+    public RedisAPIContainer getRedisAPIContainer(String name) {
+        return REDIS_APIS.computeIfAbsent(name, new Function<String, RedisAPIContainer>() {
+            @Override
+            public RedisAPIContainer apply(String s) {
+                Duration timeout = Duration.ofSeconds(10);
+                RedisConfiguration redisConfiguration = RedisClientUtil.getConfiguration(RedisAPIProducer.this.redisConfig,
+                        name);
+                if (redisConfiguration.timeout.isPresent()) {
+                    timeout = redisConfiguration.timeout.get();
+                }
+                RedisOptions options = RedisClientUtil.buildOptions(redisConfiguration);
+                Redis redis = Redis.createClient(vertx, options);
+                RedisAPI redisAPI = RedisAPI.api(redis);
+                MutinyRedis mutinyRedis = new MutinyRedis(redis);
+                MutinyRedisAPI mutinyRedisAPI = new MutinyRedisAPI(redisAPI);
+                RedisClient redisClient = new RedisClientImpl(mutinyRedisAPI, timeout);
+                ReactiveRedisClient reactiveClient = new ReactiveRedisClientImpl(mutinyRedisAPI);
+                return new RedisAPIContainer(redis, redisAPI, redisClient, reactiveClient, mutinyRedis, mutinyRedisAPI);
             }
-        } else {
-            InetSocketAddress defaultRedisAddress = new InetSocketAddress("localhost", 6379);
-            String connectionString = buildConnectionString(defaultRedisAddress);
-            options.addConnectionString(connectionString);
-        }
-
-        if (config.timeout.isPresent()) {
-            timeout = config.timeout.get().getSeconds();
-        }
-
-        vertxRedisClient = Redis.createClient(vertx, options);
-        redisAPI = RedisAPI.api(vertxRedisClient);
-        mutinyRedisClient = io.vertx.mutiny.redis.client.Redis.newInstance(vertxRedisClient);
-        mutinyRedisAPI = io.vertx.mutiny.redis.client.RedisAPI.api(mutinyRedisClient);
-        redisClient = new RedisClientImpl(mutinyRedisAPI, timeout);
-        reactiveClient = new ReactiveRedisClientImpl(mutinyRedisAPI);
-    }
-
-    @Produces
-    @Singleton
-    Redis redis() {
-        return vertxRedisClient;
-    }
-
-    @Produces
-    @Singleton
-    RedisAPI redisAPI() {
-        return redisAPI;
-    }
-
-    @Produces
-    @Singleton
-    RedisClient redisClient() {
-        return redisClient;
-    }
-
-    @Produces
-    @Singleton
-    ReactiveRedisClient reactiveRedisClient() {
-        return reactiveClient;
-    }
-
-    @Produces
-    @Singleton
-    io.vertx.mutiny.redis.client.Redis mutinyRedisClient() {
-        return mutinyRedisClient;
-    }
-
-    @Produces
-    @Singleton
-    io.vertx.mutiny.redis.client.RedisAPI mutinyRedisAPI() {
-        return mutinyRedisAPI;
+        });
     }
 
     @PreDestroy
     public void close() {
-        this.redis().close();
-    }
-
-    private String buildConnectionString(InetSocketAddress address) {
-        final StringBuilder builder = config.ssl ? new StringBuilder(REDIS_SSL_SCHEME) : new StringBuilder(REDIS_SCHEME);
-
-        if (config.password.isPresent()) {
-            builder.append(config.password.get());
-            builder.append(AT);
+        for (RedisAPIContainer container : REDIS_APIS.values()) {
+            container.close();
         }
 
-        builder.append(address.getHostString());
-        builder.append(COLON);
-        builder.append(address.getPort());
-        builder.append(SLASH);
-        builder.append(config.database);
-
-        return builder.toString();
+        REDIS_APIS.clear();
     }
+
 }
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java
index bb1f119610f8d..c2599364f5d4a 100644
--- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientImpl.java
@@ -10,9 +10,9 @@
 
 class RedisClientImpl implements RedisClient {
     private final RedisAPI redisAPI;
-    private final long timeout;
+    private final Duration timeout;
 
-    public RedisClientImpl(RedisAPI redisAPI, long timeout) {
+    public RedisClientImpl(RedisAPI redisAPI, Duration timeout) {
         this.redisAPI = redisAPI;
         this.timeout = timeout;
     }
@@ -1023,6 +1023,10 @@ public Response zunionstore(List<String> args) {
     }
 
     private Response await(Uni<io.vertx.mutiny.redis.client.Response> mutinyResponse) {
-        return mutinyResponse.await().atMost(Duration.ofSeconds(timeout)).getDelegate();
+        io.vertx.mutiny.redis.client.Response response = mutinyResponse.await().atMost(timeout);
+        if (response == null) {
+            return null;
+        }
+        return response.getDelegate();
     }
 }
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientRecorder.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientRecorder.java
new file mode 100644
index 0000000000000..02ebd1f75ffd5
--- /dev/null
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientRecorder.java
@@ -0,0 +1,79 @@
+package io.quarkus.redis.client.runtime;
+
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.reactive.ReactiveRedisClient;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.redis.client.Redis;
+import io.vertx.redis.client.RedisAPI;
+
+@Recorder
+public class RedisClientRecorder {
+
+    public Supplier<RedisClient> redisClientSupplier(String clientName) {
+        return new Supplier<RedisClient>() {
+            @Override
+            public RedisClient get() {
+                RedisAPIContainer redisAPIContainer = getRedisAPIContainer(clientName);
+                return redisAPIContainer.getRedisClient();
+            }
+        };
+    }
+
+    public Supplier<ReactiveRedisClient> reactiveRedisClientSupplier(String clientName) {
+        return new Supplier<ReactiveRedisClient>() {
+            @Override
+            public ReactiveRedisClient get() {
+                RedisAPIContainer redisAPIContainer = getRedisAPIContainer(clientName);
+                return redisAPIContainer.getReactiveClient();
+            }
+        };
+    }
+
+    public Supplier<MutinyRedis> mutinyRedisSupplier(String clientName) {
+        return new Supplier<MutinyRedis>() {
+            @Override
+            public MutinyRedis get() {
+                RedisAPIContainer redisAPIContainer = getRedisAPIContainer(clientName);
+                return redisAPIContainer.getMutinyRedis();
+            }
+        };
+    }
+
+    public Supplier<MutinyRedisAPI> mutinyRedisAPISupplier(String clientName) {
+        return new Supplier<MutinyRedisAPI>() {
+            @Override
+            public MutinyRedisAPI get() {
+                RedisAPIContainer redisApiContainer = getRedisAPIContainer(clientName);
+                return redisApiContainer.getMutinyRedisAPI();
+            }
+        };
+    }
+
+    public Supplier<RedisAPI> redisAPISupplier(String clientName) {
+        return new Supplier<RedisAPI>() {
+            @Override
+            public RedisAPI get() {
+                RedisAPIContainer redisAPIContainer = getRedisAPIContainer(clientName);
+                return redisAPIContainer.getRedisAPI();
+            }
+        };
+    }
+
+    public Supplier<Redis> redisSupplier(String clientName) {
+        return new Supplier<Redis>() {
+            @Override
+            public Redis get() {
+                RedisAPIContainer redisAPIContainer = getRedisAPIContainer(clientName);
+                return redisAPIContainer.getRedis();
+            }
+        };
+    }
+
+    private RedisAPIContainer getRedisAPIContainer(String clientName) {
+        RedisAPIProducer redisAPIProducer = Arc.container().instance(RedisAPIProducer.class).get();
+        return redisAPIProducer.getRedisAPIContainer(clientName);
+    }
+}
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientUtil.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientUtil.java
new file mode 100644
index 0000000000000..94396bbb8911a
--- /dev/null
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisClientUtil.java
@@ -0,0 +1,63 @@
+package io.quarkus.redis.client.runtime;
+
+import java.net.URI;
+import java.util.Set;
+
+import io.quarkus.redis.client.runtime.RedisConfig.RedisConfiguration;
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.vertx.redis.client.RedisClientType;
+import io.vertx.redis.client.RedisOptions;
+
+public class RedisClientUtil {
+    public static final String DEFAULT_CLIENT = "<default>";
+
+    public static RedisOptions buildOptions(RedisConfiguration redisConfig) {
+        RedisOptions options = new RedisOptions();
+        options.setType(redisConfig.clientType);
+
+        if (RedisClientType.STANDALONE == redisConfig.clientType) {
+            if (redisConfig.hosts.isPresent() && redisConfig.hosts.get().size() > 1) {
+                throw new ConfigurationException("Multiple hosts supplied for non clustered configuration");
+            }
+        }
+
+        if (redisConfig.hosts.isPresent()) {
+            Set<URI> hosts = redisConfig.hosts.get();
+            for (URI host : hosts) {
+                options.addConnectionString(host.toString());
+            }
+
+        }
+        options.setMaxNestedArrays(redisConfig.maxNestedArrays);
+        options.setMaxWaitingHandlers(redisConfig.maxWaitingHandlers);
+        options.setMaxPoolSize(redisConfig.maxPoolSize);
+        options.setMaxPoolWaiting(redisConfig.maxPoolWaiting);
+        options.setPoolRecycleTimeout(Math.toIntExact(redisConfig.poolRecycleTimeout.toMillis()));
+
+        if (redisConfig.poolCleanerInterval.isPresent()) {
+            options.setPoolCleanerInterval(Math.toIntExact(redisConfig.poolCleanerInterval.get().toMillis()));
+        }
+
+        if (redisConfig.role.isPresent()) {
+            options.setRole(redisConfig.role.get());
+        }
+
+        if (redisConfig.masterName.isPresent()) {
+            options.setMasterName(redisConfig.masterName.get());
+        }
+
+        if (redisConfig.slaves.isPresent()) {
+            options.setUseSlave(redisConfig.slaves.get());
+        }
+
+        return options;
+    }
+
+    public static boolean isDefault(String clientName) {
+        return DEFAULT_CLIENT.equals(clientName);
+    }
+
+    public static RedisConfiguration getConfiguration(RedisConfig config, String name) {
+        return isDefault(name) ? config.defaultClient : config.additionalRedisClients.get(name);
+    }
+}
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisConfig.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisConfig.java
index 321ff1a26e9c7..778cf5d6129d8 100644
--- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisConfig.java
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/RedisConfig.java
@@ -1,51 +1,139 @@
 package io.quarkus.redis.client.runtime;
 
-import java.net.InetSocketAddress;
+import java.net.URI;
 import java.time.Duration;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.RedisClientName;
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.vertx.redis.client.RedisClientType;
+import io.vertx.redis.client.RedisRole;
+import io.vertx.redis.client.RedisSlaves;
 
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
 public class RedisConfig {
 
     /**
-     * The redis password
+     * The default redis client
      */
-    @ConfigItem
-    public Optional<String> password;
+    @ConfigItem(name = ConfigItem.PARENT)
+    public RedisConfiguration defaultClient;
 
     /**
-     * The redis hosts
+     * Configures additional Redis client connections.
+     * <p>
+     * Each client has a unique identifier which must be identified to select the right connection.
+     * For example:
+     * <p>
+     *
+     * <pre>
+     * quarkus.redis.client1.hosts = redis://localhost:6379
+     * quarkus.redis.client2.hosts = redis://localhost:6380
+     * </pre>
+     * <p>
+     * And then use the {@link RedisClientName} annotation to select the {@link RedisClient} or
+     * {@link io.quarkus.redis.client.reactive.ReactiveRedisClient}.
+     * <p>
+     * 
+     * <pre>
+     * {@code
+     * &#64;RedisClientName("client1")
+     * &#64;Inject
+     * RedisClient redisClient1
+     * }
+     * </pre>
      */
-    @ConfigItem(defaultValue = "localhost:6379")
-    public Optional<Set<InetSocketAddress>> hosts;
+    @ConfigItem(name = ConfigItem.PARENT)
+    Map<String, RedisConfiguration> additionalRedisClients;
 
-    /**
-     * The redis database
-     */
-    @ConfigItem
-    public int database;
+    @ConfigGroup
+    public static class RedisConfiguration {
+        /**
+         * The redis hosts to use while connecting to the redis server. Only the cluster mode will consider more than
+         * 1 element.
+         * <p>
+         * The URI provided uses the following schema `redis://[username:password@][host][:port][/database]`
+         * 
+         * @see <a href="https://www.iana.org/assignments/uri-schemes/prov/redis">Redis scheme on www.iana.org</a>
+         */
+        @ConfigItem(defaultValueDocumentation = "redis://localhost:6379")
+        public Optional<Set<URI>> hosts;
 
-    /**
-     * The maximum delay to wait before a blocking command to redis server times out
-     */
-    @ConfigItem(defaultValue = "10s")
-    public Optional<Duration> timeout;
+        /**
+         * The maximum delay to wait before a blocking command to redis server times out
+         */
+        @ConfigItem(defaultValue = "10s")
+        public Optional<Duration> timeout;
 
-    /**
-     * Enables or disables the SSL on connect.
-     */
-    @ConfigItem
-    public boolean ssl;
+        /**
+         * The redis client type
+         */
+        @ConfigItem(defaultValue = "standalone")
+        public RedisClientType clientType;
 
-    /**
-     * The redis client type
-     */
-    @ConfigItem(defaultValue = "standalone")
-    public RedisClientType clientType;
+        /**
+         * The master name (only considered in HA mode).
+         */
+        @ConfigItem(defaultValueDocumentation = "mymaster")
+        public Optional<String> masterName;
+
+        /**
+         * The role name (only considered in HA mode).
+         */
+        @ConfigItem(defaultValueDocumentation = "master")
+        public Optional<RedisRole> role;
+
+        /**
+         * Whether or not to use slave nodes (only considered in Cluster mode).
+         */
+        @ConfigItem(defaultValueDocumentation = "never")
+        public Optional<RedisSlaves> slaves;
+
+        /**
+         * The maximum size of the connection pool. When working with cluster or sentinel.
+         * <p>
+         * This value should be at least the total number of cluster member (or number of sentinels + 1)
+         */
+        @ConfigItem(defaultValue = "6")
+        public int maxPoolSize;
+
+        /**
+         * The maximum waiting requests for a connection from the pool.
+         */
+        @ConfigItem(defaultValue = "24")
+        public int maxPoolWaiting;
+
+        /**
+         * The duration indicating how often should the connection pool cleaner executes.
+         */
+        @ConfigItem
+        public Optional<Duration> poolCleanerInterval;
+
+        /**
+         * The timeout for a connection recycling.
+         */
+        @ConfigItem(defaultValue = "15")
+        public Duration poolRecycleTimeout;
+
+        /**
+         * Sets how much handlers is the client willing to queue.
+         * <p>
+         * The client will always work on pipeline mode, this means that messages can start queueing.
+         * Using this configuration option, you can control how much backlog you're willing to accept.
+         */
+        @ConfigItem(defaultValue = "2048")
+        public int maxWaitingHandlers;
+
+        /**
+         * Tune how much nested arrays are allowed on a redis response. This affects the parser performance.
+         */
+        @ConfigItem(defaultValue = "32")
+        public int maxNestedArrays;
+    }
 }
diff --git a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/health/RedisHealthCheck.java b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/health/RedisHealthCheck.java
index d8b23e679c666..e54041a525cab 100644
--- a/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/health/RedisHealthCheck.java
+++ b/extensions/redis-client/runtime/src/main/java/io/quarkus/redis/client/runtime/health/RedisHealthCheck.java
@@ -1,8 +1,16 @@
 package io.quarkus.redis.client.runtime.health;
 
+import static io.quarkus.redis.client.runtime.RedisClientUtil.DEFAULT_CLIENT;
+
+import java.time.Duration;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.spi.Bean;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
@@ -12,24 +20,86 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.RedisClientName;
+import io.quarkus.redis.client.reactive.ReactiveRedisClient;
+import io.quarkus.redis.client.runtime.RedisClientUtil;
+import io.quarkus.redis.client.runtime.RedisConfig;
+import io.quarkus.redis.client.runtime.RedisConfig.RedisConfiguration;
+import io.vertx.redis.client.Response;
 
 @Readiness
 @ApplicationScoped
 class RedisHealthCheck implements HealthCheck {
+    private final Map<String, RedisClient> clients = new HashMap<>();
+    private final Map<String, ReactiveRedisClient> reactiveClients = new HashMap<>();
+    private final RedisConfig redisConfig;
+
+    public RedisHealthCheck(RedisConfig redisConfig) {
+        this.redisConfig = redisConfig;
+    }
+
+    @PostConstruct
+    protected void init() {
+        for (InstanceHandle<RedisClient> handle : Arc.container().select(RedisClient.class, Any.Literal.INSTANCE).handles()) {
+            String clientName = getClientName(handle.getBean());
+            clients.put(clientName == null ? DEFAULT_CLIENT : clientName, handle.get());
+        }
+
+        for (InstanceHandle<ReactiveRedisClient> handle : Arc.container()
+                .select(ReactiveRedisClient.class, Any.Literal.INSTANCE).handles()) {
+            String clientName = getClientName(handle.getBean());
+            reactiveClients.put(clientName == null ? DEFAULT_CLIENT : clientName, handle.get());
+        }
+    }
+
+    private String getClientName(Bean bean) {
+        for (Object qualifier : bean.getQualifiers()) {
+            if (qualifier instanceof RedisClientName) {
+                return ((RedisClientName) qualifier).value();
+            }
+        }
+        return null;
+    }
 
     @Override
     public HealthCheckResponse call() {
         HealthCheckResponseBuilder builder = HealthCheckResponse.named("Redis connection health check").up();
+        for (Map.Entry<String, RedisClient> client : clients.entrySet()) {
+            try {
+                boolean isDefault = DEFAULT_CLIENT.equals(client.getKey());
+                RedisClient redisClient = client.getValue();
+                String redisClientName = isDefault ? "default" : client.getKey();
+                Response response = redisClient.ping(Collections.emptyList());
+                builder.up().withData(redisClientName, response.toString());
+            } catch (Exception e) {
+                return builder.down().withData("reason", "client [" + client.getKey() + "]: " + e.getMessage()).build();
+            }
+        }
+
+        for (Map.Entry<String, ReactiveRedisClient> client : reactiveClients.entrySet()) {
+
+            // Ignore named ReactiveRedisClient that have a blocking RedisClient since they have already been checked as part of blocking clients
+            if (clients.containsKey(client.getKey())) {
+                continue;
+            }
 
-        try (InstanceHandle<RedisClient> instanceHandle = Arc.container().instance(RedisClient.class)) {
-            if (!instanceHandle.isAvailable()) {
-                builder.down();
-            } else {
-                RedisClient redisAPI = instanceHandle.get();
-                redisAPI.ping(Collections.emptyList());
+            try {
+                boolean isDefault = DEFAULT_CLIENT.equals(client.getKey());
+                ReactiveRedisClient redisClient = client.getValue();
+                RedisConfiguration redisConfig = RedisClientUtil.getConfiguration(this.redisConfig,
+                        isDefault ? DEFAULT_CLIENT : client.getKey());
+                long timeout = 10;
+                if (redisConfig.timeout.isPresent()) {
+                    timeout = redisConfig.timeout.get().getSeconds();
+                }
+                String redisClientName = isDefault ? "default" : client.getKey();
+                io.vertx.mutiny.redis.client.Response response = redisClient.ping(Collections.emptyList()).await()
+                        .atMost(Duration.ofSeconds(timeout));
+                builder.up().withData(redisClientName, response.toString());
+            } catch (Exception e) {
+                return builder.down().withData("reason", "client [" + client.getKey() + "]: " + e.getMessage())
+                        .build();
             }
-        } catch (RuntimeException e) {
-            builder.down();
         }
         return builder.build();
     }
diff --git a/extensions/redis-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/redis-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f822f8cb2d9ac..52f1aacbc2b3b 100644
--- a/extensions/redis-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/redis-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -10,6 +10,6 @@ metadata:
     - "reactive"
   guide: "https://quarkus.io/guides/redis"
   categories:
-    - "persistence"
+    - "data"
     - "reactive"
   status: "preview"
diff --git a/extensions/rest-client-jackson/deployment/pom.xml b/extensions/rest-client-jackson/deployment/pom.xml
index d0ba161b61338..9c7581539064a 100644
--- a/extensions/rest-client-jackson/deployment/pom.xml
+++ b/extensions/rest-client-jackson/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-jackson-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jackson/deployment/src/main/java/io/quarkus/restclient/jackson/deployment/RestClientJacksonProcessor.java b/extensions/rest-client-jackson/deployment/src/main/java/io/quarkus/restclient/jackson/deployment/RestClientJacksonProcessor.java
index c29b19c7b9271..f35102a8bb147 100644
--- a/extensions/rest-client-jackson/deployment/src/main/java/io/quarkus/restclient/jackson/deployment/RestClientJacksonProcessor.java
+++ b/extensions/rest-client-jackson/deployment/src/main/java/io/quarkus/restclient/jackson/deployment/RestClientJacksonProcessor.java
@@ -15,5 +15,6 @@ void build(BuildProducer<FeatureBuildItem> feature,
         feature.produce(new FeatureBuildItem(Feature.REST_CLIENT_JACKSON));
 
         capability.produce(new CapabilityBuildItem(Capability.REST_JACKSON));
+        capability.produce(new CapabilityBuildItem(Capability.RESTEASY_JSON));
     }
 }
diff --git a/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java b/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java
index 89bce568ad2d0..9cf541b844927 100644
--- a/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java
+++ b/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/HelloResource.java
@@ -6,13 +6,10 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-@Produces(MediaType.APPLICATION_JSON)
 @Path("/hello")
 public class HelloResource {
 
diff --git a/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java b/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java
index 637a7b3424790..7a367ebe3f6ca 100644
--- a/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java
+++ b/extensions/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/RestInterface.java
@@ -2,8 +2,6 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@@ -14,6 +12,5 @@
 public interface RestInterface {
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     DateDto get();
 }
diff --git a/extensions/rest-client-jackson/pom.xml b/extensions/rest-client-jackson/pom.xml
index aa8a722224a18..bed008174c6c2 100644
--- a/extensions/rest-client-jackson/pom.xml
+++ b/extensions/rest-client-jackson/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jackson/runtime/pom.xml b/extensions/rest-client-jackson/runtime/pom.xml
index 6345ed9f89ed9..2ff76a57df928 100644
--- a/extensions/rest-client-jackson/runtime/pom.xml
+++ b/extensions/rest-client-jackson/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-jackson-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jaxb/deployment/pom.xml b/extensions/rest-client-jaxb/deployment/pom.xml
index bb138d8671489..4fdbc2a081de5 100644
--- a/extensions/rest-client-jaxb/deployment/pom.xml
+++ b/extensions/rest-client-jaxb/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-jaxb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jaxb/pom.xml b/extensions/rest-client-jaxb/pom.xml
index 9f3f7210e808f..26c75be023b2b 100644
--- a/extensions/rest-client-jaxb/pom.xml
+++ b/extensions/rest-client-jaxb/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jaxb/runtime/pom.xml b/extensions/rest-client-jaxb/runtime/pom.xml
index 77345e8877a65..4bbf4ef2299f4 100644
--- a/extensions/rest-client-jaxb/runtime/pom.xml
+++ b/extensions/rest-client-jaxb/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-jaxb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jsonb/deployment/pom.xml b/extensions/rest-client-jsonb/deployment/pom.xml
index 0505299df2dba..e29f75ae66ecb 100644
--- a/extensions/rest-client-jsonb/deployment/pom.xml
+++ b/extensions/rest-client-jsonb/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-jsonb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java b/extensions/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java
index 6cbcf14e3ea2f..3e0a885e37a02 100755
--- a/extensions/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java
+++ b/extensions/rest-client-jsonb/deployment/src/main/java/io/quarkus/restclient/jsonb/deployment/RestClientJsonbProcessor.java
@@ -15,5 +15,6 @@ void build(BuildProducer<FeatureBuildItem> feature,
         feature.produce(new FeatureBuildItem(Feature.REST_CLIENT_JSONB));
 
         capability.produce(new CapabilityBuildItem(Capability.REST_JSONB));
+        capability.produce(new CapabilityBuildItem(Capability.RESTEASY_JSON));
     }
 }
diff --git a/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java b/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java
index 6149f3a87a0c8..af8a4781a7b8c 100644
--- a/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java
+++ b/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/HelloResource.java
@@ -6,10 +6,7 @@
 import javax.json.bind.Jsonb;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
-@Produces(MediaType.APPLICATION_JSON)
 @Path("/hello")
 public class HelloResource {
 
diff --git a/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java b/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java
index 6588dc1ab3f2d..a20c3fab7d045 100644
--- a/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java
+++ b/extensions/rest-client-jsonb/deployment/src/test/java/io/quarkus/restclient/jsonb/deployment/RestInterface.java
@@ -2,8 +2,6 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@@ -14,6 +12,5 @@
 public interface RestInterface {
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     DateDto get();
 }
diff --git a/extensions/rest-client-jsonb/pom.xml b/extensions/rest-client-jsonb/pom.xml
index db67cf68d776b..02d92982456d2 100644
--- a/extensions/rest-client-jsonb/pom.xml
+++ b/extensions/rest-client-jsonb/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-jsonb/runtime/pom.xml b/extensions/rest-client-jsonb/runtime/pom.xml
index f25528fdba94f..f459709bd05fe 100644
--- a/extensions/rest-client-jsonb/runtime/pom.xml
+++ b/extensions/rest-client-jsonb/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-jsonb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client-mutiny/deployment/pom.xml b/extensions/rest-client-mutiny/deployment/pom.xml
new file mode 100644
index 0000000000000..9812c79f14eef
--- /dev/null
+++ b/extensions/rest-client-mutiny/deployment/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-rest-client-mutiny-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-rest-client-mutiny-deployment</artifactId>
+    <name>Quarkus - REST Client - Mutiny - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/rest-client-mutiny/deployment/src/main/java/io/quarkus/restclient/mutiny/deployment/RestClientMutinyProcessor.java b/extensions/rest-client-mutiny/deployment/src/main/java/io/quarkus/restclient/mutiny/deployment/RestClientMutinyProcessor.java
new file mode 100644
index 0000000000000..42aecbb5896f1
--- /dev/null
+++ b/extensions/rest-client-mutiny/deployment/src/main/java/io/quarkus/restclient/mutiny/deployment/RestClientMutinyProcessor.java
@@ -0,0 +1,14 @@
+package io.quarkus.restclient.mutiny.deployment;
+
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+public class RestClientMutinyProcessor {
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.REST_CLIENT_MUTINY);
+    }
+
+}
diff --git a/extensions/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java b/extensions/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java
new file mode 100644
index 0000000000000..62cd2533b4875
--- /dev/null
+++ b/extensions/rest-client-mutiny/deployment/src/test/java/io/quarkus/restclient/mutiny/deployment/MutinyRestClientTest.java
@@ -0,0 +1,56 @@
+package io.quarkus.restclient.mutiny.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URL;
+import java.util.concurrent.ExecutionException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.smallrye.mutiny.Uni;
+
+public class MutinyRestClientTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MutinyRestClientTest.class, Client.class, TestEndpoint.class));
+
+    @TestHTTPResource
+    URL url;
+
+    @Test
+    public void testUni() throws InterruptedException, ExecutionException {
+        Client client = RestClientBuilder.newBuilder().baseUrl(url).build(Client.class);
+        assertEquals("OK", client.ping().await().indefinitely());
+    }
+
+    @RegisterRestClient
+    public interface Client {
+
+        @GET
+        @Path("/test")
+        Uni<String> ping();
+
+    }
+
+    @Path("/test")
+    public static class TestEndpoint {
+
+        @GET
+        public String get() {
+            return "OK";
+        }
+
+    }
+}
diff --git a/extensions/rest-client-mutiny/pom.xml b/extensions/rest-client-mutiny/pom.xml
new file mode 100644
index 0000000000000..46a098e9c9e3b
--- /dev/null
+++ b/extensions/rest-client-mutiny/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-rest-client-mutiny-parent</artifactId>
+    <name>Quarkus - REST Client - Mutiny</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/rest-client-mutiny/runtime/pom.xml b/extensions/rest-client-mutiny/runtime/pom.xml
new file mode 100644
index 0000000000000..bffdf2a99bb5d
--- /dev/null
+++ b/extensions/rest-client-mutiny/runtime/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-rest-client-mutiny-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-rest-client-mutiny</artifactId>
+    <name>Quarkus - REST Client - Mutiny - Runtime</name>
+    <description>Enable Mutiny for the REST client</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/rest-client-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/rest-client-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..bdfcb0dab66b4
--- /dev/null
+++ b/extensions/rest-client-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "Mutiny support for REST Client"
+metadata:
+  keywords:
+  - "rest-client-mutiny"
+  - "rest-client"
+  - "web-client"
+  - "microprofile-rest-client"
+  - "mutiny"
+  categories:
+  - "web"
+  - "reactive"
+  status: "preview"
diff --git a/extensions/rest-client/deployment/pom.xml b/extensions/rest-client/deployment/pom.xml
index 87422b675ea5e..9b07466bc2895 100644
--- a/extensions/rest-client/deployment/pom.xml
+++ b/extensions/rest-client/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -43,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientAnnotationProviderBuildItem.java b/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientAnnotationProviderBuildItem.java
new file mode 100644
index 0000000000000..afe6d2982b18e
--- /dev/null
+++ b/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientAnnotationProviderBuildItem.java
@@ -0,0 +1,33 @@
+package io.quarkus.restclient.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Used to mark a custom annotation and its associated JAX-RS client provider
+ */
+public final class RestClientAnnotationProviderBuildItem extends MultiBuildItem {
+
+    private final DotName annotationName;
+    private final Class<?> providerClass;
+
+    public RestClientAnnotationProviderBuildItem(DotName annotationName, Class<?> providerClass) {
+        this.annotationName = annotationName;
+        this.providerClass = providerClass;
+    }
+
+    public RestClientAnnotationProviderBuildItem(String annotationName, Class<?> providerClass) {
+        this.annotationName = DotName.createSimple(annotationName);
+        this.providerClass = providerClass;
+    }
+
+    public DotName getAnnotationName() {
+        return annotationName;
+    }
+
+    public Class<?> getProviderClass() {
+        return providerClass;
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java b/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java
index ff9674ec6df76..41407fe791457 100644
--- a/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java
+++ b/extensions/rest-client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java
@@ -21,6 +21,7 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProviders;
 import org.eclipse.microprofile.rest.client.ext.DefaultClientHeadersFactoryImpl;
@@ -30,6 +31,7 @@
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.CompositeIndex;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
@@ -46,10 +48,10 @@
 
 import io.quarkus.arc.BeanDestroyer;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
-import io.quarkus.arc.deployment.BeanRegistrarBuildItem;
-import io.quarkus.arc.processor.BeanConfigurator;
-import io.quarkus.arc.processor.BeanRegistrar;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem.ExtendedBeanConfigurator;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.ScopeInfo;
 import io.quarkus.deployment.Capabilities;
@@ -70,12 +72,13 @@
 import io.quarkus.deployment.pkg.PackageConfig;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.restclient.NoopHostnameVerifier;
 import io.quarkus.restclient.runtime.RestClientBase;
 import io.quarkus.restclient.runtime.RestClientRecorder;
 import io.quarkus.resteasy.common.deployment.JaxrsProvidersToRegisterBuildItem;
 import io.quarkus.resteasy.common.deployment.RestClientBuildItem;
-import io.quarkus.resteasy.common.deployment.ResteasyDotNames;
 import io.quarkus.resteasy.common.deployment.ResteasyInjectionReadyBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyDotNames;
 
 class RestClientProcessor {
     private static final Logger log = Logger.getLogger(RestClientProcessor.class);
@@ -89,6 +92,7 @@ class RestClientProcessor {
 
     private static final DotName REGISTER_PROVIDER = DotName.createSimple(RegisterProvider.class.getName());
     private static final DotName REGISTER_PROVIDERS = DotName.createSimple(RegisterProviders.class.getName());
+    private static final DotName REGISTER_CLIENT_HEADERS = DotName.createSimple(RegisterClientHeaders.class.getName());
 
     private static final DotName CLIENT_REQUEST_FILTER = DotName.createSimple(ClientRequestFilter.class.getName());
     private static final DotName CLIENT_RESPONSE_FILTER = DotName.createSimple(ClientResponseFilter.class.getName());
@@ -104,6 +108,11 @@ void setupProviders(BuildProducer<NativeImageResourceBuildItem> resources,
         resources.produce(new NativeImageResourceBuildItem(PROVIDERS_SERVICE_FILE));
     }
 
+    @BuildStep
+    void setupClientBuilder(BuildProducer<NativeImageResourceBuildItem> resources) {
+        resources.produce(new NativeImageResourceBuildItem("META-INF/services/javax.ws.rs.client.ClientBuilder"));
+    }
+
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
     BeanContainerListenerBuildItem fixExtension(RestClientRecorder restClientRecorder) {
@@ -115,6 +124,19 @@ NativeImageProxyDefinitionBuildItem addProxy() {
         return new NativeImageProxyDefinitionBuildItem(ResteasyConfiguration.class.getName());
     }
 
+    @BuildStep
+    void registerRestClientListenerForTracing(
+            Capabilities capabilities,
+            BuildProducer<NativeImageResourceBuildItem> resource,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        if (capabilities.isPresent(Capability.SMALLRYE_OPENTRACING)) {
+            resource.produce(new NativeImageResourceBuildItem(
+                    "META-INF/services/org.eclipse.microprofile.rest.client.spi.RestClientListener"));
+            reflectiveClass
+                    .produce(new ReflectiveClassBuildItem(true, true, "io.smallrye.opentracing.SmallRyeRestClientListener"));
+        }
+    }
+
     @BuildStep
     @Record(ExecutionTime.STATIC_INIT)
     void setup(BuildProducer<FeatureBuildItem> feature,
@@ -138,18 +160,20 @@ void setup(BuildProducer<FeatureBuildItem> feature,
                 javax.ws.rs.ext.ReaderInterceptor[].class.getName()));
 
         reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
-                ResteasyClientBuilder.class.getName()));
+                ResteasyClientBuilder.class.getName(), NoopHostnameVerifier.class.getName()));
     }
 
     @BuildStep
-    void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem,
+    void processInterfaces(
+            CombinedIndexBuildItem combinedIndexBuildItem,
+            BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
             Capabilities capabilities,
             PackageConfig packageConfig,
+            List<RestClientAnnotationProviderBuildItem> restClientAnnotationProviders,
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxyDefinition,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
-            BuildProducer<BeanRegistrarBuildItem> beanRegistrars,
-            BuildProducer<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             BuildProducer<ServiceProviderBuildItem> serviceProvider,
             BuildProducer<RestClientBuildItem> restClient) {
 
@@ -157,7 +181,7 @@ void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem,
         Map<DotName, ClassInfo> interfaces = new HashMap<>();
         Set<Type> returnTypes = new HashSet<>();
 
-        IndexView index = combinedIndexBuildItem.getIndex();
+        IndexView index = CompositeIndex.create(beanArchiveIndexBuildItem.getIndex(), combinedIndexBuildItem.getIndex());
 
         findInterfaces(index, interfaces, returnTypes, REGISTER_REST_CLIENT);
         findInterfaces(index, interfaces, returnTypes, PATH);
@@ -189,44 +213,66 @@ void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem,
         // Register Interface return types for reflection
         for (Type returnType : returnTypes) {
             reflectiveHierarchy
-                    .produce(new ReflectiveHierarchyBuildItem(returnType, ResteasyDotNames.IGNORE_FOR_REFLECTION_PREDICATE));
+                    .produce(new ReflectiveHierarchyBuildItem.Builder()
+                            .type(returnType)
+                            .ignoreTypePredicate(ResteasyDotNames.IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                            .ignoreFieldPredicate(ResteasyDotNames.IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                            .ignoreMethodPredicate(ResteasyDotNames.IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                            .source(getClass().getSimpleName() + " > " + returnType.toString())
+                            .build());
         }
 
-        beanRegistrars.produce(new BeanRegistrarBuildItem(new BeanRegistrar() {
-
-            @Override
-            public void register(RegistrationContext registrationContext) {
-                final Config config = ConfigProvider.getConfig();
-
-                for (Map.Entry<DotName, ClassInfo> entry : interfaces.entrySet()) {
-                    DotName restClientName = entry.getKey();
-                    BeanConfigurator<Object> configurator = registrationContext.configure(restClientName);
-                    // The spec is not clear whether we should add superinterfaces too - let's keep aligned with SmallRye for now
-                    configurator.addType(restClientName);
-                    configurator.addQualifier(REST_CLIENT);
-                    final String configPrefix = computeConfigPrefix(restClientName.toString(), entry.getValue());
-                    final ScopeInfo scope = computeDefaultScope(capabilities, config, entry, configPrefix);
-                    configurator.scope(scope);
-                    configurator.creator(m -> {
-                        // return new RestClientBase(proxyType, baseUri).create();
-                        ResultHandle interfaceHandle = m.loadClass(restClientName.toString());
-                        ResultHandle baseUriHandle = m.load(getAnnotationParameter(entry.getValue(), "baseUri"));
-                        ResultHandle configPrefixHandle = m.load(configPrefix);
-                        ResultHandle baseHandle = m.newInstance(
-                                MethodDescriptor.ofConstructor(RestClientBase.class, Class.class, String.class, String.class),
-                                interfaceHandle, baseUriHandle, configPrefixHandle);
-                        ResultHandle ret = m.invokeVirtualMethod(
-                                MethodDescriptor.ofMethod(RestClientBase.class, "create", Object.class), baseHandle);
-                        m.returnValue(ret);
-                    });
-                    configurator.destroyer(BeanDestroyer.CloseableDestroyer.class);
-                    configurator.done();
+        final Config config = ConfigProvider.getConfig();
+
+        for (Map.Entry<DotName, ClassInfo> entry : interfaces.entrySet()) {
+            DotName restClientName = entry.getKey();
+            ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem.configure(restClientName);
+            // The spec is not clear whether we should add superinterfaces too - let's keep aligned with SmallRye for now
+            configurator.addType(restClientName);
+            configurator.addQualifier(REST_CLIENT);
+            final String configPrefix = computeConfigPrefix(restClientName.toString(), entry.getValue());
+            final ScopeInfo scope = computeDefaultScope(capabilities, config, entry, configPrefix);
+            final List<Class<?>> annotationProviders = checkAnnotationProviders(entry.getValue(),
+                    restClientAnnotationProviders);
+            configurator.scope(scope);
+            configurator.creator(m -> {
+                // return new RestClientBase(proxyType, baseUri).create();
+                ResultHandle interfaceHandle = m.loadClass(restClientName.toString());
+                ResultHandle baseUriHandle = m.load(getAnnotationParameter(entry.getValue(), "baseUri"));
+                ResultHandle configPrefixHandle = m.load(configPrefix);
+                ResultHandle annotationProvidersHandle = null;
+                if (!annotationProviders.isEmpty()) {
+                    annotationProvidersHandle = m.newArray(Class.class, annotationProviders.size());
+                    for (int i = 0; i < annotationProviders.size(); i++) {
+                        m.writeArrayValue(annotationProvidersHandle, i, m.loadClass(annotationProviders.get(i)));
+                    }
+                } else {
+                    annotationProvidersHandle = m.loadNull();
                 }
-            }
-        }));
+                ResultHandle baseHandle = m.newInstance(
+                        MethodDescriptor.ofConstructor(RestClientBase.class, Class.class, String.class,
+                                String.class,
+                                Class[].class),
+                        interfaceHandle, baseUriHandle, configPrefixHandle, annotationProvidersHandle);
+                ResultHandle ret = m.invokeVirtualMethod(
+                        MethodDescriptor.ofMethod(RestClientBase.class, "create", Object.class), baseHandle);
+                m.returnValue(ret);
+            });
+            configurator.destroyer(BeanDestroyer.CloseableDestroyer.class);
+
+            syntheticBeans.produce(configurator.done());
+        }
+    }
+
+    private static List<Class<?>> checkAnnotationProviders(ClassInfo classInfo,
+            List<RestClientAnnotationProviderBuildItem> restClientAnnotationProviders) {
+        return restClientAnnotationProviders.stream().filter(p -> (classInfo.classAnnotation(p.getAnnotationName()) != null))
+                .map(p -> p.getProviderClass()).collect(Collectors.toList());
+    }
 
-        // Indicates that this extension would like the SSL support to be enabled
-        extensionSslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.REST_CLIENT));
+    @BuildStep
+    ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
+        return new ExtensionSslNativeSupportBuildItem(Feature.REST_CLIENT);
     }
 
     // currently default methods on a rest-client interface
@@ -397,6 +443,15 @@ void registerProviders(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
                     .produce(new ReflectiveClassBuildItem(false, false, annotationInstance.value().asClass().toString()));
         }
 
+        // Register @RegisterClientHeaders for reflection
+        for (AnnotationInstance annotationInstance : index.getAnnotations(REGISTER_CLIENT_HEADERS)) {
+            AnnotationValue value = annotationInstance.value();
+            if (value != null) {
+                reflectiveClass
+                        .produce(new ReflectiveClassBuildItem(false, false, annotationInstance.value().asClass().toString()));
+            }
+        }
+
         // now retain all un-annotated implementations of ClientRequestFilter and ClientResponseFilter
         // in case they are programmatically registered by applications
         for (ClassInfo info : index.getAllKnownImplementors(CLIENT_REQUEST_FILTER)) {
@@ -414,10 +469,14 @@ AdditionalBeanBuildItem registerProviderBeans(CombinedIndexBuildItem combinedInd
         for (AnnotationInstance annotation : index.getAnnotations(REGISTER_PROVIDERS)) {
             allInstances.addAll(Arrays.asList(annotation.value().asNestedArray()));
         }
+        allInstances.addAll(index.getAnnotations(REGISTER_CLIENT_HEADERS));
         AdditionalBeanBuildItem.Builder builder = AdditionalBeanBuildItem.builder().setUnremovable();
         for (AnnotationInstance annotationInstance : allInstances) {
             // Make sure all providers not annotated with @Provider but used in @RegisterProvider are registered as beans
-            builder.addBeanClass(annotationInstance.value().asClass().toString());
+            AnnotationValue value = annotationInstance.value();
+            if (value != null) {
+                builder.addBeanClass(value.asClass().toString());
+            }
         }
         return builder.build();
     }
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java
new file mode 100644
index 0000000000000..5130947b02150
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceClient.java
@@ -0,0 +1,13 @@
+package io.quarkus.restclient.exception;
+
+import javax.ws.rs.GET;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+public interface DownstreamServiceClient {
+
+    @GET
+    String getData();
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java
new file mode 100644
index 0000000000000..9055fe3129356
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceRedirectEndpoint.java
@@ -0,0 +1,18 @@
+package io.quarkus.restclient.exception;
+
+import java.net.URI;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.RedirectionException;
+import javax.ws.rs.core.Response;
+
+@Path("/downstream")
+public class DownstreamServiceRedirectEndpoint {
+
+    @GET
+    public String getData() {
+        throw new RedirectionException(
+                Response.status(302).location(URI.create("http://localhost/private-service")).build());
+    }
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java
new file mode 100644
index 0000000000000..e0f532172bf6d
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/DownstreamServiceUnavailableEndpoint.java
@@ -0,0 +1,15 @@
+package io.quarkus.restclient.exception;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+@Path("/downstream")
+public class DownstreamServiceUnavailableEndpoint {
+
+    @GET
+    public String getData() {
+        throw new WebApplicationException(Response.status(503).header("Retry-After", "5").build());
+    }
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java
new file mode 100644
index 0000000000000..2b67e730e55db
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/FrontendService.java
@@ -0,0 +1,32 @@
+package io.quarkus.restclient.exception;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendService {
+    @RestClient
+    DownstreamServiceClient client;
+
+    @GET
+    @Path("/exception")
+    public String exception() {
+        return client.getData();
+    }
+
+    @GET
+    @Path("/exception-caught")
+    public String exceptionCaught() {
+        try {
+            return client.getData();
+        } catch (WebApplicationException ex) {
+            Response r = ex.getResponse();
+            throw new WebApplicationException(r);
+        }
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java
new file mode 100644
index 0000000000000..2e5efe16dcb41
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionOriginalBehaviorTest.java
@@ -0,0 +1,63 @@
+package io.quarkus.restclient.exception;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.net.URL;
+import java.util.Properties;
+
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class RestClientExceptionOriginalBehaviorTest {
+
+    static StringAsset createStringAsset() {
+        try {
+            Properties props = new Properties();
+            props.put("io.quarkus.restclient.exception.DownstreamServiceClient/mp-rest/url",
+                    "${test.url}/downstream");
+            props.put("resteasy.original.webapplicationexception.behavior", "true");
+            StringWriter sw = new StringWriter();
+            props.store(sw, "application.properties");
+            return new StringAsset(sw.toString());
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(createStringAsset(), "application.properties")
+                    .addClasses(RestClientExceptionOriginalBehaviorTest.class, DownstreamServiceClient.class,
+                            FrontendService.class,
+                            DownstreamServiceUnavailableEndpoint.class));
+
+    @TestHTTPResource
+    URL url;
+
+    @Test
+    public void testException() {
+        Response r = ClientBuilder.newClient().target(url.toString()).path("frontend/exception").request().get();
+        assertEquals(503, r.getStatus());
+        assertEquals("5", r.getHeaderString("Retry-After"));
+    }
+
+    @Test
+    public void testExceptionCaught() {
+        Response r = ClientBuilder.newClient().target(url.toString()).path("frontend/exception-caught").request().get();
+        assertEquals(503, r.getStatus());
+        assertEquals("5", r.getHeaderString("Retry-After"));
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java
new file mode 100644
index 0000000000000..5f5b7ce24a0ef
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/exception/RestClientExceptionTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.restclient.exception;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.net.URL;
+
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class RestClientExceptionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(
+                            new StringAsset(
+                                    "io.quarkus.restclient.exception.DownstreamServiceClient/mp-rest/url=${test.url}/downstream"),
+                            "application.properties")
+                    .addClasses(RestClientExceptionTest.class, DownstreamServiceClient.class, FrontendService.class,
+                            DownstreamServiceRedirectEndpoint.class));
+
+    @TestHTTPResource
+    URL url;
+
+    @Test
+    public void testException() {
+        Response r = ClientBuilder.newClient().target(url.toString()).path("frontend/exception").request().get();
+        assertEquals(302, r.getStatus());
+        assertNull(r.getLocation());
+    }
+
+    @Test
+    public void testExceptionCaught() {
+        Response r = ClientBuilder.newClient().target(url.toString()).path("frontend/exception-caught").request().get();
+        assertEquals(302, r.getStatus());
+        assertNull(r.getLocation());
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java
index 41f1dab0bfc4a..ddb40114532aa 100644
--- a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/ft/RestClientFallbackTest.java
@@ -51,7 +51,7 @@ public interface Client {
     public static class TestEndpoint {
 
         @GET
-        String get() {
+        public String get() {
             throw new WebApplicationException(404);
         }
 
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java
new file mode 100644
index 0000000000000..37ace0002b57f
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoClient.java
@@ -0,0 +1,23 @@
+package io.quarkus.restclient.registerclientheaders;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@Path("/echo")
+@RegisterRestClient
+@RegisterClientHeaders(MyHeadersFactory.class)
+public interface EchoClient {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    String echo(@QueryParam("message") String message);
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java
new file mode 100644
index 0000000000000..ec7aa4476789a
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/EchoResource.java
@@ -0,0 +1,26 @@
+package io.quarkus.restclient.registerclientheaders;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/echo")
+public class EchoResource {
+
+    @RestClient
+    EchoClient client;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public String echo(@QueryParam("message") String message, @HeaderParam("foo") String foo) {
+        return message + foo;
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java
new file mode 100644
index 0000000000000..08fce91855ae6
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/MyHeadersFactory.java
@@ -0,0 +1,26 @@
+package io.quarkus.restclient.registerclientheaders;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
+
+@Singleton
+public class MyHeadersFactory implements ClientHeadersFactory {
+
+    @Inject
+    BeanManager beanManager;
+
+    @Override
+    public MultivaluedMap<String, String> update(MultivaluedMap<String, String> incomingHeaders,
+            MultivaluedMap<String, String> clientOutgoingHeaders) {
+        assertNotNull(beanManager);
+        incomingHeaders.add("foo", "bar");
+        return incomingHeaders;
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java
new file mode 100644
index 0000000000000..0d219666c8ef1
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerclientheaders/RegisterClientHeadersTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.restclient.registerclientheaders;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class RegisterClientHeadersTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(EchoResource.class, EchoClient.class, MyHeadersFactory.class)
+                    .addAsResource(
+                            new StringAsset("io.quarkus.restclient.registerclientheaders.EchoClient/mp-rest/url=${test.url}"),
+                            "application.properties"));
+
+    @RestClient
+    EchoClient client;
+
+    @Test
+    public void testProvider() {
+        assertEquals("ping:bar", client.echo("ping:"));
+    }
+
+}
diff --git a/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java
new file mode 100644
index 0000000000000..94a8ade42f8cf
--- /dev/null
+++ b/extensions/rest-client/deployment/src/test/java/io/quarkus/restclient/registerprovider/ProviderClientRegistrationTest.java
@@ -0,0 +1,123 @@
+package io.quarkus.restclient.registerprovider;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.InetSocketAddress;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.specimpl.ResteasyUriInfo;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.sun.net.httpserver.HttpServer;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ProviderClientRegistrationTest {
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ProviderClientRegistrationTest.class, ClientBean.class, HelloFooProvider.class));
+
+    static HttpServer server;
+
+    @Inject
+    ClientBean client;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        // This Server is required, so we don't start a REST Application and test that we are able to add Providers
+        // without a class annotated with @Path, to a Client: https://github.com/quarkusio/quarkus/issues/11424
+        server = HttpServer.create(new InetSocketAddress(0), 0);
+        server.createContext("/hello", exchange -> {
+            ResteasyUriInfo uriInfo = new ResteasyUriInfo(exchange.getRequestURI());
+            String who = uriInfo.getQueryParameters().getFirst("name");
+            String response = "Hello ";
+            if (who == null) {
+                response = response + "Undefined";
+            } else {
+                response = response + who;
+            }
+
+            exchange.sendResponseHeaders(200, response.length());
+            exchange.getResponseHeaders().add(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN);
+            exchange.getResponseBody().write(response.getBytes());
+            exchange.getResponseBody().flush();
+            exchange.getResponseBody().close();
+        });
+
+        server.start();
+    }
+
+    @AfterAll
+    static void afterAll() {
+        server.stop(0);
+    }
+
+    @Test
+    void hello() {
+        assertEquals("Hello Naruto", client.hello("Naruto"));
+    }
+
+    @Test
+    void helloFoo() {
+        assertEquals("Hello Foo", client.hello());
+    }
+
+    // The Client needs to be deployed with the Quarkus app, so it inherits all of the RESTEasy configuration.
+    @ApplicationScoped
+    public static class ClientBean {
+        private WebTarget webTarget;
+
+        @PostConstruct
+        void init() {
+            webTarget = ClientBuilder.newClient().target("http://localhost:" + server.getAddress().getPort()).path("/hello");
+            ;
+        }
+
+        String hello() {
+            return hello(null);
+        }
+
+        String hello(final String name) {
+            WebTarget webTarget = this.webTarget;
+            if (name != null) {
+                webTarget = webTarget.queryParam("name", name);
+            }
+
+            Response response = webTarget.request(MediaType.TEXT_PLAIN_TYPE).get(Response.class);
+
+            assertEquals(200, response.getStatus());
+            return response.readEntity(String.class);
+        }
+    }
+
+    @Provider
+    @Priority(Priorities.USER - 1)
+    public static class HelloFooProvider implements ClientRequestFilter {
+        @Override
+        public void filter(final ClientRequestContext requestContext) {
+            if (requestContext.getUri().getQuery() == null) {
+                requestContext.setUri(UriBuilder.fromUri(requestContext.getUri()).queryParam("name", "Foo").build());
+            }
+        }
+    }
+}
diff --git a/extensions/rest-client/pom.xml b/extensions/rest-client/pom.xml
index 6753563041001..28073c0276a2f 100644
--- a/extensions/rest-client/pom.xml
+++ b/extensions/rest-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/rest-client/runtime/pom.xml b/extensions/rest-client/runtime/pom.xml
index 0eb84cb596d9a..cc85da855b8fa 100644
--- a/extensions/rest-client/runtime/pom.xml
+++ b/extensions/rest-client/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-rest-client-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -64,6 +63,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/NoopHostnameVerifier.java b/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/NoopHostnameVerifier.java
new file mode 100644
index 0000000000000..892005f39c170
--- /dev/null
+++ b/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/NoopHostnameVerifier.java
@@ -0,0 +1,20 @@
+package io.quarkus.restclient;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
+
+/**
+ * The {@link NoopHostnameVerifier} essentially turns hostname verification off.
+ */
+public class NoopHostnameVerifier implements HostnameVerifier {
+
+    @Override
+    public boolean verify(String hostname, SSLSession session) {
+        return true;
+    }
+
+    @Override
+    public final String toString() {
+        return "NO_OP";
+    }
+}
diff --git a/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java b/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java
index 1d19a7a102df2..21bb933bdf6e5 100644
--- a/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java
+++ b/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientBase.java
@@ -1,6 +1,11 @@
 package io.quarkus.restclient.runtime;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.KeyStore;
@@ -24,7 +29,6 @@
 import io.quarkus.runtime.ssl.SslContextConfiguration;
 
 public class RestClientBase {
-
     public static final String MP_REST = "mp-rest";
     public static final String REST_URL_FORMAT = "%s/" + MP_REST + "/url";
     public static final String REST_URI_FORMAT = "%s/" + MP_REST + "/uri";
@@ -39,15 +43,20 @@ public class RestClientBase {
     public static final String REST_KEY_STORE_PASSWORD = "%s/" + MP_REST + "/keyStorePassword";
     public static final String REST_KEY_STORE_TYPE = "%s/" + MP_REST + "/keyStoreType";
     public static final String REST_HOSTNAME_VERIFIER = "%s/" + MP_REST + "/hostnameVerifier";
+    public static final String REST_NOOP_HOSTNAME_VERIFIER = "io.quarkus.restclient.NoopHostnameVerifier";
+    public static final String TLS_TRUST_ALL = "quarkus.tls.trust-all";
 
     private final Class<?> proxyType;
     private final String baseUriFromAnnotation;
     private final String propertyPrefix;
+    private final Class<?>[] annotationProviders;
 
-    public RestClientBase(Class<?> proxyType, String baseUriFromAnnotation, String propertyPrefix) {
+    public RestClientBase(Class<?> proxyType, String baseUriFromAnnotation, String propertyPrefix,
+            Class<?>[] annotationProviders) {
         this.proxyType = proxyType;
         this.baseUriFromAnnotation = baseUriFromAnnotation;
         this.propertyPrefix = propertyPrefix;
+        this.annotationProviders = annotationProviders;
     }
 
     public Object create() {
@@ -67,17 +76,23 @@ public Object create() {
     }
 
     private void configureSsl(RestClientBuilder builder) {
-        Optional<String> maybeTrustStore = getOptionalProperty(REST_TRUST_STORE, String.class);
+
+        Optional<Boolean> trustAll = getOptionalProperty(TLS_TRUST_ALL, Boolean.class);
+        if (trustAll.isPresent() && trustAll.get()) {
+            registerHostnameVerifier(REST_NOOP_HOSTNAME_VERIFIER, builder);
+        }
+
+        Optional<String> maybeTrustStore = getOptionalDynamicProperty(REST_TRUST_STORE, String.class);
         if (maybeTrustStore.isPresent()) {
             registerTrustStore(maybeTrustStore.get(), builder);
         }
 
-        Optional<String> maybeKeyStore = getOptionalProperty(REST_KEY_STORE, String.class);
+        Optional<String> maybeKeyStore = getOptionalDynamicProperty(REST_KEY_STORE, String.class);
         if (maybeKeyStore.isPresent()) {
             registerKeyStore(maybeKeyStore.get(), builder);
         }
 
-        Optional<String> maybeHostnameVerifier = getOptionalProperty(REST_HOSTNAME_VERIFIER, String.class);
+        Optional<String> maybeHostnameVerifier = getOptionalDynamicProperty(REST_HOSTNAME_VERIFIER, String.class);
         if (maybeHostnameVerifier.isPresent()) {
             registerHostnameVerifier(maybeHostnameVerifier.get(), builder);
         }
@@ -91,13 +106,18 @@ private void configureSsl(RestClientBuilder builder) {
 
     private void registerHostnameVerifier(String verifier, RestClientBuilder builder) {
         try {
-            Class<?> verifierClass = Class.forName(verifier, true, Thread.currentThread().getContextClassLoader());
-            builder.hostnameVerifier((HostnameVerifier) verifierClass.newInstance());
+            Class<?> verifierClass = Thread.currentThread().getContextClassLoader().loadClass(verifier);
+            builder.hostnameVerifier((HostnameVerifier) verifierClass.getDeclaredConstructor().newInstance());
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(
+                    "Could not find a public, no-argument constructor for the hostname verifier class " + verifier, e);
         } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Could not find hostname verifier class" + verifier, e);
-        } catch (InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException("Could not find hostname verifier class " + verifier, e);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
             throw new RuntimeException(
-                    "Failed to instantiate hostname verifier class. Make sure it has a public, no-argument constructor", e);
+                    "Failed to instantiate hostname verifier class " + verifier
+                            + ". Make sure it has a public, no-argument constructor",
+                    e);
         } catch (ClassCastException e) {
             throw new RuntimeException("The provided hostname verifier " + verifier + " is not an instance of HostnameVerifier",
                     e);
@@ -105,8 +125,8 @@ private void registerHostnameVerifier(String verifier, RestClientBuilder builder
     }
 
     private void registerKeyStore(String keyStorePath, RestClientBuilder builder) {
-        Optional<String> keyStorePassword = getOptionalProperty(REST_KEY_STORE_PASSWORD, String.class);
-        Optional<String> keyStoreType = getOptionalProperty(REST_KEY_STORE_TYPE, String.class);
+        Optional<String> keyStorePassword = getOptionalDynamicProperty(REST_KEY_STORE_PASSWORD, String.class);
+        Optional<String> keyStoreType = getOptionalDynamicProperty(REST_KEY_STORE_TYPE, String.class);
 
         try {
             KeyStore keyStore = KeyStore.getInstance(keyStoreType.orElse("JKS"));
@@ -129,8 +149,8 @@ private void registerKeyStore(String keyStorePath, RestClientBuilder builder) {
     }
 
     private void registerTrustStore(String trustStorePath, RestClientBuilder builder) {
-        Optional<String> maybeTrustStorePassword = getOptionalProperty(REST_TRUST_STORE_PASSWORD, String.class);
-        Optional<String> maybeTrustStoreType = getOptionalProperty(REST_TRUST_STORE_TYPE, String.class);
+        Optional<String> maybeTrustStorePassword = getOptionalDynamicProperty(REST_TRUST_STORE_PASSWORD, String.class);
+        Optional<String> maybeTrustStoreType = getOptionalDynamicProperty(REST_TRUST_STORE_TYPE, String.class);
 
         try {
             KeyStore trustStore = KeyStore.getInstance(maybeTrustStoreType.orElse("JKS"));
@@ -178,10 +198,15 @@ private InputStream locateStream(String path) throws FileNotFoundException {
     }
 
     private void configureProviders(RestClientBuilder builder) {
-        Optional<String> maybeProviders = getOptionalProperty(REST_PROVIDERS, String.class);
+        Optional<String> maybeProviders = getOptionalDynamicProperty(REST_PROVIDERS, String.class);
         if (maybeProviders.isPresent()) {
             registerProviders(builder, maybeProviders.get());
         }
+        if (annotationProviders != null) {
+            for (Class<?> annotationProvider : annotationProviders) {
+                builder.register(annotationProvider);
+            }
+        }
     }
 
     private void registerProviders(RestClientBuilder builder, String providersAsString) {
@@ -199,21 +224,21 @@ private Class<?> providerClassForName(String name) {
     }
 
     private void configureTimeouts(RestClientBuilder builder) {
-        Optional<Long> connectTimeout = getOptionalProperty(REST_CONNECT_TIMEOUT_FORMAT, Long.class);
+        Optional<Long> connectTimeout = getOptionalDynamicProperty(REST_CONNECT_TIMEOUT_FORMAT, Long.class);
         if (connectTimeout.isPresent()) {
             builder.connectTimeout(connectTimeout.get(), TimeUnit.MILLISECONDS);
         }
 
-        Optional<Long> readTimeout = getOptionalProperty(REST_READ_TIMEOUT_FORMAT, Long.class);
+        Optional<Long> readTimeout = getOptionalDynamicProperty(REST_READ_TIMEOUT_FORMAT, Long.class);
         if (readTimeout.isPresent()) {
             builder.readTimeout(readTimeout.get(), TimeUnit.MILLISECONDS);
         }
     }
 
     private void configureBaseUrl(RestClientBuilder builder) {
-        Optional<String> propertyOptional = getOptionalProperty(REST_URI_FORMAT, String.class);
+        Optional<String> propertyOptional = getOptionalDynamicProperty(REST_URI_FORMAT, String.class);
         if (!propertyOptional.isPresent()) {
-            propertyOptional = getOptionalProperty(REST_URL_FORMAT, String.class);
+            propertyOptional = getOptionalDynamicProperty(REST_URL_FORMAT, String.class);
         }
         if (((baseUriFromAnnotation == null) || baseUriFromAnnotation.isEmpty())
                 && !propertyOptional.isPresent()) {
@@ -240,10 +265,16 @@ private void configureBaseUrl(RestClientBuilder builder) {
         }
     }
 
-    private <T> Optional<T> getOptionalProperty(String propertyFormat, Class<T> type) {
+    private <T> Optional<T> getOptionalDynamicProperty(String propertyFormat, Class<T> type) {
         final Config config = ConfigProvider.getConfig();
         Optional<T> interfaceNameValue = config.getOptionalValue(String.format(propertyFormat, proxyType.getName()), type);
         return interfaceNameValue.isPresent() ? interfaceNameValue
                 : config.getOptionalValue(String.format(propertyFormat, propertyPrefix), type);
     }
+
+    private <T> Optional<T> getOptionalProperty(String propertyName, Class<T> type) {
+        final Config config = ConfigProvider.getConfig();
+        return config.getOptionalValue(propertyName, type);
+    }
+
 }
diff --git a/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java b/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java
index 61a4e20ad71f2..133f7e3598748 100644
--- a/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java
+++ b/extensions/rest-client/runtime/src/main/java/io/quarkus/restclient/runtime/RestClientRecorder.java
@@ -7,6 +7,7 @@
 import javax.ws.rs.RuntimeType;
 
 import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;
+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
 import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
 import org.jboss.resteasy.microprofile.client.RestClientBuilderImpl;
 import org.jboss.resteasy.microprofile.client.RestClientExtension;
@@ -59,24 +60,29 @@ public InjectorFactory getInjectorFactory() {
             }
         };
 
+        registerProviders(clientProviderFactory, useBuiltIn, providersToRegister, contributedProviders);
+        RestClientBuilderImpl.setProviderFactory(clientProviderFactory);
+        ResteasyClientBuilderImpl.setProviderFactory(clientProviderFactory);
+        providerFactory = clientProviderFactory;
+    }
+
+    private static void registerProviders(ResteasyProviderFactory providerFactory, boolean useBuiltIn,
+            Set<String> providersToRegister,
+            Set<String> contributedProviders) {
         if (useBuiltIn) {
-            RegisterBuiltin.register(clientProviderFactory);
-            registerProviders(clientProviderFactory, contributedProviders, false);
+            RegisterBuiltin.register(providerFactory);
         } else {
             providersToRegister.removeAll(contributedProviders);
-            registerProviders(clientProviderFactory, providersToRegister, true);
-            registerProviders(clientProviderFactory, contributedProviders, false);
+            registerProviders(providerFactory, providersToRegister, true);
         }
-
-        RestClientBuilderImpl.setProviderFactory(clientProviderFactory);
-        providerFactory = clientProviderFactory;
+        registerProviders(providerFactory, contributedProviders, false);
     }
 
-    private static void registerProviders(ResteasyProviderFactory clientProviderFactory, Set<String> providersToRegister,
+    private static void registerProviders(ResteasyProviderFactory providerFactory, Set<String> providersToRegister,
             Boolean isBuiltIn) {
         for (String providerToRegister : providersToRegister) {
             try {
-                clientProviderFactory
+                providerFactory
                         .registerProvider(Thread.currentThread().getContextClassLoader().loadClass(providerToRegister.trim()),
                                 isBuiltIn);
             } catch (ClassNotFoundException e) {
diff --git a/extensions/resteasy-common/deployment/pom.xml b/extensions/resteasy-common/deployment/pom.xml
index d593ba2bd807b..adaa64e8f0b3a 100644
--- a/extensions/resteasy-common/deployment/pom.xml
+++ b/extensions/resteasy-common/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,10 +29,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/JaxrsProvidersToRegisterBuildItem.java b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/JaxrsProvidersToRegisterBuildItem.java
index 183e4892ebdc0..75f4118001a83 100644
--- a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/JaxrsProvidersToRegisterBuildItem.java
+++ b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/JaxrsProvidersToRegisterBuildItem.java
@@ -8,11 +8,14 @@ public final class JaxrsProvidersToRegisterBuildItem extends SimpleBuildItem {
 
     private final Set<String> providers;
     private final Set<String> contributedProviders;
+    private final Set<String> annotatedProviders;
     private final boolean useBuiltIn;
 
-    public JaxrsProvidersToRegisterBuildItem(Set<String> providers, Set<String> contributedProviders, boolean useBuiltIn) {
+    public JaxrsProvidersToRegisterBuildItem(Set<String> providers, Set<String> contributedProviders,
+            Set<String> annotatedProviders, boolean useBuiltIn) {
         this.providers = providers;
         this.contributedProviders = contributedProviders;
+        this.annotatedProviders = annotatedProviders;
         this.useBuiltIn = useBuiltIn;
     }
 
@@ -24,6 +27,10 @@ public Set<String> getContributedProviders() {
         return this.contributedProviders;
     }
 
+    public Set<String> getAnnotatedProviders() {
+        return annotatedProviders;
+    }
+
     public boolean useBuiltIn() {
         return useBuiltIn;
     }
diff --git a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java
index 35a70661f6452..db9c735c8fc90 100644
--- a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java
+++ b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java
@@ -55,6 +55,9 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.util.ServiceUtil;
 import io.quarkus.resteasy.common.runtime.ResteasyInjectorFactoryRecorder;
+import io.quarkus.resteasy.common.runtime.providers.ServerFormUrlEncodedProvider;
+import io.quarkus.resteasy.common.spi.ResteasyConfigBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyDotNames;
 import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.ConfigGroup;
@@ -79,9 +82,16 @@ public class ResteasyCommonProcessor {
     private static final DotName QUARKUS_OBJECT_MAPPER_CONTEXT_RESOLVER = DotName
             .createSimple("io.quarkus.resteasy.common.runtime.jackson.QuarkusObjectMapperContextResolver");
     private static final DotName OBJECT_MAPPER = DotName.createSimple("com.fasterxml.jackson.databind.ObjectMapper");
+    private static final DotName QUARKUS_JACKSON_SERIALIZER = DotName
+            .createSimple("io.quarkus.resteasy.common.runtime.jackson.QuarkusJacksonSerializer");
+
     private static final DotName QUARKUS_JSONB_CONTEXT_RESOLVER = DotName
             .createSimple("io.quarkus.resteasy.common.runtime.jsonb.QuarkusJsonbContextResolver");
     private static final DotName JSONB = DotName.createSimple("javax.json.bind.Jsonb");
+    private static final DotName QUARKUS_JSONB_SERIALIZER = DotName
+            .createSimple("io.quarkus.resteasy.common.runtime.jsonb.QuarkusJsonbSerializer");
+
+    private static final String[] WILDCARD_MEDIA_TYPE_ARRAY = { MediaType.WILDCARD };
 
     private ResteasyCommonConfig resteasyCommonConfig;
 
@@ -110,6 +120,12 @@ public static final class ResteasyCommonConfigGzip {
         public MemorySize maxInput;
     }
 
+    @BuildStep
+    ResteasyConfigBuildItem resteasyConfig(ResteasyJsonConfig resteasyJsonConfig, Capabilities capabilities) {
+        return new ResteasyConfigBuildItem(resteasyJsonConfig.jsonDefault &&
+                (capabilities.isPresent(Capability.REST_JACKSON) || capabilities.isPresent(Capability.REST_JSONB)));
+    }
+
     @BuildStep
     void setupGzipProviders(BuildProducer<ResteasyJaxrsProviderBuildItem> providers) {
         // If GZIP support is enabled, enable it
@@ -124,6 +140,7 @@ void setupGzipProviders(BuildProducer<ResteasyJaxrsProviderBuildItem> providers)
     @BuildStep
     ResteasyInjectionReadyBuildItem setupResteasyInjection(List<ProxyUnwrapperBuildItem> proxyUnwrappers,
             BeanContainerBuildItem beanContainerBuildItem,
+            Capabilities capabilities,
             ResteasyInjectorFactoryRecorder recorder) {
         List<Function<Object, Object>> unwrappers = new ArrayList<>();
         for (ProxyUnwrapperBuildItem i : proxyUnwrappers) {
@@ -138,23 +155,28 @@ JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer<ReflectiveClassBu
             CombinedIndexBuildItem indexBuildItem,
             BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
             List<ResteasyJaxrsProviderBuildItem> contributedProviderBuildItems,
-            List<RestClientBuildItem> restClients, Capabilities capabilities) throws Exception {
+            List<RestClientBuildItem> restClients,
+            ResteasyConfigBuildItem resteasyConfig,
+            Capabilities capabilities) throws Exception {
 
         Set<String> contributedProviders = new HashSet<>();
         for (ResteasyJaxrsProviderBuildItem contributedProviderBuildItem : contributedProviderBuildItems) {
             contributedProviders.add(contributedProviderBuildItem.getName());
         }
 
+        Set<String> annotatedProviders = new HashSet<>();
         for (AnnotationInstance i : indexBuildItem.getIndex().getAnnotations(ResteasyDotNames.PROVIDER)) {
             if (i.target().kind() == AnnotationTarget.Kind.CLASS) {
-                contributedProviders.add(i.target().asClass().name().toString());
+                annotatedProviders.add(i.target().asClass().name().toString());
             }
             checkProperConfigAccessInProvider(i);
             checkProperConstructorInProvider(i);
         }
-
-        Set<String> availableProviders = ServiceUtil.classNamesNamedIn(getClass().getClassLoader(),
-                "META-INF/services/" + Providers.class.getName());
+        contributedProviders.addAll(annotatedProviders);
+        Set<String> availableProviders = new HashSet<>(ServiceUtil.classNamesNamedIn(getClass().getClassLoader(),
+                "META-INF/services/" + Providers.class.getName()));
+        // this one is added manually in RESTEasy's ResteasyDeploymentImpl
+        availableProviders.add(ServerFormUrlEncodedProvider.class.getName());
 
         MediaTypeMap<String> categorizedReaders = new MediaTypeMap<>();
         MediaTypeMap<String> categorizedWriters = new MediaTypeMap<>();
@@ -171,7 +193,8 @@ JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer<ReflectiveClassBu
 
             boolean needJsonSupport = restJsonSupportNeeded(indexBuildItem, ResteasyDotNames.CONSUMES)
                     || restJsonSupportNeeded(indexBuildItem, ResteasyDotNames.PRODUCES)
-                    || restJsonSupportNeeded(indexBuildItem, ResteasyDotNames.RESTEASY_SSE_ELEMENT_TYPE);
+                    || restJsonSupportNeeded(indexBuildItem, ResteasyDotNames.RESTEASY_SSE_ELEMENT_TYPE)
+                    || restJsonSupportNeeded(indexBuildItem, ResteasyDotNames.RESTEASY_PART_TYPE);
             if (needJsonSupport) {
                 LOGGER.warn(
                         "Quarkus detected the need of REST JSON support but you have not provided the necessary JSON " +
@@ -199,8 +222,9 @@ JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer<ReflectiveClassBu
         IndexView beansIndex = beanArchiveIndexBuildItem.getIndex();
 
         // find the providers declared in our services
-        boolean useBuiltinProviders = collectDeclaredProviders(restClients, providersToRegister, categorizedReaders,
-                categorizedWriters, categorizedContextResolvers, index, beansIndex);
+        boolean useBuiltinProviders = collectDeclaredProviders(restClients, resteasyConfig,
+                providersToRegister, categorizedReaders, categorizedWriters, categorizedContextResolvers,
+                index, beansIndex);
 
         if (useBuiltinProviders) {
             providersToRegister = new HashSet<>(contributedProviders);
@@ -215,7 +239,8 @@ JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer<ReflectiveClassBu
                     "org.jboss.resteasy.plugins.providers.jsonb.AbstractJsonBindingProvider"));
         }
 
-        return new JaxrsProvidersToRegisterBuildItem(providersToRegister, contributedProviders, useBuiltinProviders);
+        return new JaxrsProvidersToRegisterBuildItem(
+                providersToRegister, contributedProviders, annotatedProviders, useBuiltinProviders);
     }
 
     private String mutinySupportNeeded(CombinedIndexBuildItem indexBuildItem) {
@@ -247,6 +272,7 @@ public String apply(MethodInfo methodInfo) {
     @BuildStep
     void registerJsonContextResolvers(CombinedIndexBuildItem combinedIndexBuildItem,
             Capabilities capabilities,
+            ResteasyJsonConfig resteasyJsonConfig,
             BuildProducer<ResteasyJaxrsProviderBuildItem> jaxrsProvider,
             BuildProducer<AdditionalBeanBuildItem> additionalBean,
             BuildProducer<UnremovableBeanBuildItem> unremovable) {
@@ -254,11 +280,17 @@ void registerJsonContextResolvers(CombinedIndexBuildItem combinedIndexBuildItem,
         if (capabilities.isPresent(Capability.REST_JACKSON)) {
             registerJsonContextResolver(OBJECT_MAPPER, QUARKUS_OBJECT_MAPPER_CONTEXT_RESOLVER, combinedIndexBuildItem,
                     jaxrsProvider, additionalBean, unremovable);
+            if (resteasyJsonConfig.jsonDefault) {
+                jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(QUARKUS_JACKSON_SERIALIZER.toString()));
+            }
         }
 
         if (capabilities.isPresent(Capability.REST_JSONB)) {
             registerJsonContextResolver(JSONB, QUARKUS_JSONB_CONTEXT_RESOLVER, combinedIndexBuildItem, jaxrsProvider,
                     additionalBean, unremovable);
+            if (resteasyJsonConfig.jsonDefault) {
+                jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(QUARKUS_JSONB_SERIALIZER.toString()));
+            }
         }
     }
 
@@ -358,7 +390,8 @@ public static void categorizeProviders(Set<String> availableProviders, MediaType
             Set<String> otherProviders) {
         for (String availableProvider : availableProviders) {
             try {
-                Class<?> providerClass = Class.forName(availableProvider);
+                Class<?> providerClass = Class.forName(availableProvider, false,
+                        Thread.currentThread().getContextClassLoader());
                 if (MessageBodyReader.class.isAssignableFrom(providerClass)
                         || MessageBodyWriter.class.isAssignableFrom(providerClass)) {
                     if (MessageBodyReader.class.isAssignableFrom(providerClass)) {
@@ -401,9 +434,11 @@ public static void categorizeProviders(Set<String> availableProviders, MediaType
     }
 
     private static boolean collectDeclaredProviders(List<RestClientBuildItem> restClients,
+            ResteasyConfigBuildItem resteasyConfig,
             Set<String> providersToRegister,
             MediaTypeMap<String> categorizedReaders, MediaTypeMap<String> categorizedWriters,
-            MediaTypeMap<String> categorizedContextResolvers, IndexView... indexes) {
+            MediaTypeMap<String> categorizedContextResolvers,
+            IndexView... indexes) {
         Set<String> restClientNames = restClients.stream()
                 .map(RestClientBuildItem::getInterfaceName)
                 .collect(Collectors.toSet());
@@ -413,64 +448,95 @@ private static boolean collectDeclaredProviders(List<RestClientBuildItem> restCl
                 Collection<AnnotationInstance> getMethods = index.getAnnotations(providerDiscoverer.getMethodAnnotation());
                 for (AnnotationInstance getMethod : getMethods) {
                     MethodInfo methodTarget = getMethod.target().asMethod();
-                    if (restClientNames.contains(methodTarget.declaringClass().name().toString())) {
+                    boolean isRestClient = restClientNames.contains(methodTarget.declaringClass().name().toString());
+
+                    if (isRestClient) {
                         // when dealing with a REST client, we need to collect @Consumes as writers and @Produces as readers
                         if (collectDeclaredProvidersForMethodAndMediaTypeAnnotation(providersToRegister, categorizedWriters,
-                                methodTarget, ResteasyDotNames.CONSUMES, providerDiscoverer.noConsumesDefaultsToAll())) {
+                                methodTarget, ResteasyDotNames.CONSUMES, providerDiscoverer.noConsumesDefaultsToAll(),
+                                resteasyConfig.isJsonDefault())) {
                             return true;
                         }
                         if (collectDeclaredProvidersForMethodAndMediaTypeAnnotation(providersToRegister, categorizedReaders,
-                                methodTarget, ResteasyDotNames.PRODUCES, providerDiscoverer.noProducesDefaultsToAll())) {
+                                methodTarget, ResteasyDotNames.PRODUCES, providerDiscoverer.noProducesDefaultsToAll(),
+                                resteasyConfig.isJsonDefault())) {
                             return true;
                         }
                     } else {
                         // for JAX-RS resources, we do the opposite
                         if (collectDeclaredProvidersForMethodAndMediaTypeAnnotation(providersToRegister, categorizedReaders,
-                                methodTarget, ResteasyDotNames.CONSUMES, providerDiscoverer.noConsumesDefaultsToAll())) {
+                                methodTarget, ResteasyDotNames.CONSUMES, providerDiscoverer.noConsumesDefaultsToAll(),
+                                resteasyConfig.isJsonDefault())) {
                             return true;
                         }
                         if (collectDeclaredProvidersForMethodAndMediaTypeAnnotation(providersToRegister, categorizedWriters,
-                                methodTarget, ResteasyDotNames.PRODUCES, providerDiscoverer.noProducesDefaultsToAll())) {
+                                methodTarget, ResteasyDotNames.PRODUCES, providerDiscoverer.noProducesDefaultsToAll(),
+                                resteasyConfig.isJsonDefault())) {
                             return true;
                         }
                     }
 
                     if (collectDeclaredProvidersForMethodAndMediaTypeAnnotation(providersToRegister,
                             categorizedContextResolvers, methodTarget, ResteasyDotNames.CONSUMES,
-                            providerDiscoverer.noConsumesDefaultsToAll())) {
+                            providerDiscoverer.noConsumesDefaultsToAll(), resteasyConfig.isJsonDefault())) {
                         return true;
                     }
                     if (collectDeclaredProvidersForMethodAndMediaTypeAnnotation(providersToRegister,
                             categorizedContextResolvers, methodTarget, ResteasyDotNames.PRODUCES,
-                            providerDiscoverer.noProducesDefaultsToAll())) {
+                            providerDiscoverer.noProducesDefaultsToAll(), resteasyConfig.isJsonDefault())) {
                         return true;
                     }
                 }
             }
+
+            // handle @PartType: we don't know if it's used for writing or reading so we register both
+            for (AnnotationInstance partTypeAnnotation : index.getAnnotations(ResteasyDotNames.RESTEASY_PART_TYPE)) {
+                try {
+                    MediaType partTypeMediaType = MediaType.valueOf(partTypeAnnotation.value().asString());
+                    providersToRegister.addAll(categorizedReaders.getPossible(partTypeMediaType));
+                    providersToRegister.addAll(categorizedWriters.getPossible(partTypeMediaType));
+                } catch (IllegalArgumentException e) {
+                    // Let's not throw an error, there's a good chance RESTEasy will do it for us
+                    // and if not, this might be valid.
+                }
+            }
         }
         return false;
     }
 
     private static boolean collectDeclaredProvidersForMethodAndMediaTypeAnnotation(Set<String> providersToRegister,
             MediaTypeMap<String> categorizedProviders, MethodInfo methodTarget, DotName mediaTypeAnnotation,
-            boolean defaultsToAll) {
-        AnnotationInstance mediaTypeAnnotationInstance = methodTarget.annotation(mediaTypeAnnotation);
-        if (mediaTypeAnnotationInstance == null) {
-            // let's consider the class
-            Collection<AnnotationInstance> classAnnotations = methodTarget.declaringClass().classAnnotations();
-            for (AnnotationInstance classAnnotation : classAnnotations) {
-                if (mediaTypeAnnotation.equals(classAnnotation.name())) {
-                    if (collectDeclaredProvidersForMediaTypeAnnotationInstance(providersToRegister, categorizedProviders,
-                            classAnnotation, methodTarget)) {
-                        return true;
-                    }
-                    return false;
+            boolean includeDefaults, boolean jsonDefault) {
+        AnnotationInstance mediaTypeMethodAnnotationInstance = methodTarget.annotation(mediaTypeAnnotation);
+        if (mediaTypeMethodAnnotationInstance == null) {
+            // no media types defined on the method, let's consider the class annotations
+            AnnotationInstance mediaTypeClassAnnotationInstance = methodTarget.declaringClass()
+                    .classAnnotation(mediaTypeAnnotation);
+            if (mediaTypeClassAnnotationInstance != null) {
+                if (collectDeclaredProvidersForMediaTypeAnnotationInstance(providersToRegister, categorizedProviders,
+                        mediaTypeClassAnnotationInstance.value().asStringArray(), methodTarget)) {
+                    return true;
                 }
+                return false;
+            }
+            // we couldn't find any annotations neither on the method nor on the class, stick to the default
+            if (!includeDefaults) {
+                return false;
             }
-            return defaultsToAll;
+            if (jsonDefault) {
+                collectDeclaredProvidersForMediaTypeAnnotationInstance(providersToRegister, categorizedProviders,
+                        new String[] { MediaType.APPLICATION_JSON }, methodTarget);
+                return false;
+            } else {
+                return true;
+            }
+        }
+        String[] mediaTypes = WILDCARD_MEDIA_TYPE_ARRAY;
+        if (mediaTypeMethodAnnotationInstance.value() != null) {
+            mediaTypes = mediaTypeMethodAnnotationInstance.value().asStringArray();
         }
         if (collectDeclaredProvidersForMediaTypeAnnotationInstance(providersToRegister, categorizedProviders,
-                mediaTypeAnnotationInstance, methodTarget)) {
+                mediaTypes, methodTarget)) {
             return true;
         }
 
@@ -479,9 +545,9 @@ private static boolean collectDeclaredProvidersForMethodAndMediaTypeAnnotation(S
 
     private static boolean collectDeclaredProvidersForMediaTypeAnnotationInstance(Set<String> providersToRegister,
             MediaTypeMap<String> categorizedProviders,
-            AnnotationInstance mediaTypeAnnotationInstance,
+            String[] mediaTypes,
             MethodInfo targetMethod) {
-        for (String media : mediaTypeAnnotationInstance.value().asStringArray()) {
+        for (String media : mediaTypes) {
             MediaType mediaType = MediaType.valueOf(media);
             if (MediaType.WILDCARD_TYPE.equals(mediaType)) {
                 // exit early if we have the wildcard type
@@ -585,4 +651,9 @@ public boolean noProducesDefaultsToAll() {
             return noProducesDefaultsToAll;
         }
     }
+
+    private enum NoMediaTypesDefault {
+        ALL,
+        JSON;
+    }
 }
diff --git a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyDotNames.java b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyDotNames.java
deleted file mode 100644
index 75239b572946a..0000000000000
--- a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyDotNames.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package io.quarkus.resteasy.common.deployment;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.DynamicFeature;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.ext.Provider;
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jboss.jandex.DotName;
-
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
-
-public final class ResteasyDotNames {
-
-    public static final DotName CONSUMES = DotName.createSimple(Consumes.class.getName());
-    public static final DotName PRODUCES = DotName.createSimple(Produces.class.getName());
-    public static final DotName PROVIDER = DotName.createSimple(Provider.class.getName());
-    public static final DotName GET = DotName.createSimple(javax.ws.rs.GET.class.getName());
-    public static final DotName HEAD = DotName.createSimple(javax.ws.rs.HEAD.class.getName());
-    public static final DotName DELETE = DotName.createSimple(javax.ws.rs.DELETE.class.getName());
-    public static final DotName OPTIONS = DotName.createSimple(javax.ws.rs.OPTIONS.class.getName());
-    public static final DotName PATCH = DotName.createSimple(javax.ws.rs.PATCH.class.getName());
-    public static final DotName POST = DotName.createSimple(javax.ws.rs.POST.class.getName());
-    public static final DotName PUT = DotName.createSimple(javax.ws.rs.PUT.class.getName());
-    public static final DotName APPLICATION_PATH = DotName.createSimple(ApplicationPath.class.getName());
-    public static final DotName PATH = DotName.createSimple(Path.class.getName());
-    public static final DotName DYNAMIC_FEATURE = DotName.createSimple(DynamicFeature.class.getName());
-    public static final DotName CONTEXT = DotName.createSimple(Context.class.getName());
-    public static final DotName RESTEASY_QUERY_PARAM = DotName
-            .createSimple(org.jboss.resteasy.annotations.jaxrs.QueryParam.class.getName());
-    public static final DotName RESTEASY_FORM_PARAM = DotName
-            .createSimple(org.jboss.resteasy.annotations.jaxrs.FormParam.class.getName());
-    public static final DotName RESTEASY_COOKIE_PARAM = DotName
-            .createSimple(org.jboss.resteasy.annotations.jaxrs.CookieParam.class.getName());
-    public static final DotName RESTEASY_PATH_PARAM = DotName
-            .createSimple(org.jboss.resteasy.annotations.jaxrs.PathParam.class.getName());
-    public static final DotName RESTEASY_HEADER_PARAM = DotName
-            .createSimple(org.jboss.resteasy.annotations.jaxrs.HeaderParam.class.getName());
-    public static final DotName RESTEASY_MATRIX_PARAM = DotName
-            .createSimple(org.jboss.resteasy.annotations.jaxrs.MatrixParam.class.getName());
-    public static final DotName RESTEASY_SSE_ELEMENT_TYPE = DotName
-            .createSimple(org.jboss.resteasy.annotations.SseElementType.class.getName());
-    public static final DotName CONFIG_PROPERTY = DotName
-            .createSimple(ConfigProperty.class.getName());
-    public static final DotName CDI_INSTANCE = DotName
-            .createSimple(javax.enterprise.inject.Instance.class.getName());
-
-    public static final List<DotName> JAXRS_METHOD_ANNOTATIONS = Collections
-            .unmodifiableList(Arrays.asList(GET, POST, HEAD, DELETE, PUT, PATCH, OPTIONS));
-
-    public static final IgnoreForReflectionPredicate IGNORE_FOR_REFLECTION_PREDICATE = new IgnoreForReflectionPredicate();
-
-    private static class IgnoreForReflectionPredicate implements Predicate<DotName> {
-
-        @Override
-        public boolean test(DotName dotName) {
-            if (ResteasyDotNames.TYPES_IGNORED_FOR_REFLECTION.contains(dotName)
-                    || ReflectiveHierarchyBuildItem.DefaultIgnorePredicate.INSTANCE.test(dotName)) {
-                return true;
-            }
-            String name = dotName.toString();
-            for (String packageName : PACKAGES_IGNORED_FOR_REFLECTION) {
-                if (name.startsWith(packageName)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    // Types ignored for reflection used by the RESTEasy and SmallRye REST client extensions.
-    private static final Set<DotName> TYPES_IGNORED_FOR_REFLECTION = new HashSet<>(Arrays.asList(
-            // Jackson
-            DotName.createSimple("com.fasterxml.jackson.databind.JsonNode"),
-
-            // JAX-RS
-            DotName.createSimple("javax.ws.rs.core.Response"),
-            DotName.createSimple("javax.ws.rs.core.Response.StatusType"),
-            DotName.createSimple("javax.ws.rs.container.AsyncResponse"),
-            DotName.createSimple("javax.ws.rs.core.StreamingOutput"),
-            DotName.createSimple("javax.ws.rs.core.Form"),
-            DotName.createSimple("javax.ws.rs.core.MultivaluedMap"),
-
-            // RESTEasy
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartInput"),
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput"),
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartOutput"),
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput"),
-
-            // Vert-x
-            DotName.createSimple("io.vertx.core.json.JsonArray"),
-            DotName.createSimple("io.vertx.core.json.JsonObject")));
-
-    private static final String[] PACKAGES_IGNORED_FOR_REFLECTION = {
-            "javax.json."
-    };
-}
diff --git a/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyJsonConfig.java b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyJsonConfig.java
new file mode 100644
index 0000000000000..13b6847d541f7
--- /dev/null
+++ b/extensions/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyJsonConfig.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.common.deployment;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+public class ResteasyJsonConfig {
+
+    /**
+     * If this is true (the default) then JSON is set to the default media type. If a method has no
+     * produces/consumes and there is no builtin provider than can handle the type
+     * then we will assume the response should be JSON.
+     *
+     * Note that this will only take effect if a JSON provider has been installed, such as quarkus-resteasy-jsonb
+     * or quarkus-resteasy-jackson.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean jsonDefault;
+}
diff --git a/extensions/resteasy-common/pom.xml b/extensions/resteasy-common/pom.xml
index 7ec90e1155cfa..63d6c11cd7ecc 100644
--- a/extensions/resteasy-common/pom.xml
+++ b/extensions/resteasy-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-common/runtime/pom.xml b/extensions/resteasy-common/runtime/pom.xml
index 176687f38b50a..01dcc526a8260 100644
--- a/extensions/resteasy-common/runtime/pom.xml
+++ b/extensions/resteasy-common/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,6 +16,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -39,11 +39,35 @@
             <artifactId>jackson-databind</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-json-binding-provider</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java
index 76ef0feb47d65..208852004c11b 100644
--- a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java
+++ b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProvider.java
@@ -5,12 +5,16 @@
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 import javax.imageio.IIOImage;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 
+import org.jboss.resteasy.spi.AsyncOutputStream;
+
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
@@ -38,4 +42,11 @@ public void writeTo(IIOImage iioImage, Class<?> type, Type genericType, Annotati
             MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
 
     }
+
+    @Substitute
+    public CompletionStage<Void> asyncWriteTo(IIOImage t, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
+            AsyncOutputStream entityStream) {
+        return CompletableFuture.completedFuture(null);
+    }
 }
diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProviderHelper.java b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProviderHelper.java
new file mode 100644
index 0000000000000..6b80b472b25e1
--- /dev/null
+++ b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/DeleteIIOImageProviderHelper.java
@@ -0,0 +1,7 @@
+package io.quarkus.resteasy.common.runtime.graal;
+
+import com.oracle.svm.core.annotate.Delete;
+
+@Delete("org.jboss.resteasy.plugins.providers.IIOImageProviderHelper")
+final class DeleteIIOImageProviderHelper {
+}
diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java
new file mode 100644
index 0000000000000..ec4b48899850b
--- /dev/null
+++ b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jackson/QuarkusJacksonSerializer.java
@@ -0,0 +1,79 @@
+package io.quarkus.resteasy.common.runtime.jackson;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CompletionStage;
+
+import javax.activation.DataSource;
+import javax.annotation.Priority;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.StreamingOutput;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.plugins.providers.FileRange;
+import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider;
+import org.jboss.resteasy.spi.AsyncOutputStream;
+import org.jboss.resteasy.spi.AsyncStreamingOutput;
+
+/**
+ * provider that can produce JSON by default, removing the need for @Produces and @Consumes everywhere
+ */
+@Provider
+@Produces(MediaType.WILDCARD)
+@Consumes(MediaType.WILDCARD)
+@Priority(Priorities.USER - 200)
+public class QuarkusJacksonSerializer extends ResteasyJackson2Provider {
+
+    /**
+     * RESTEasy can already handle these
+     */
+    private static final Set<Class<?>> BUILTIN_DEFAULTS = new HashSet<>(
+            Arrays.asList(String.class, InputStream.class, FileRange.class, AsyncStreamingOutput.class, DataSource.class,
+                    Reader.class, StreamingOutput.class, byte[].class, File.class));
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        if (BUILTIN_DEFAULTS.contains(type)) {
+            return false;
+        }
+        return super.isReadable(type, genericType, annotations, mediaType);
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        if (BUILTIN_DEFAULTS.contains(type)) {
+            return false;
+        }
+        return mediaType.equals(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                || mediaType.isWildcardType()
+                || super.isWriteable(type, genericType, annotations, mediaType);
+    }
+
+    @Override
+    public void writeTo(Object t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        super.writeTo(t, type, genericType, annotations, mediaType, httpHeaders, entityStream);
+    }
+
+    @Override
+    public CompletionStage<Void> asyncWriteTo(Object t, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, AsyncOutputStream entityStream) {
+        httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        return super.asyncWriteTo(t, type, genericType, annotations, mediaType, httpHeaders, entityStream);
+    }
+}
diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java
new file mode 100644
index 0000000000000..c554e886eb59c
--- /dev/null
+++ b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/jsonb/QuarkusJsonbSerializer.java
@@ -0,0 +1,78 @@
+package io.quarkus.resteasy.common.runtime.jsonb;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CompletionStage;
+
+import javax.activation.DataSource;
+import javax.annotation.Priority;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.StreamingOutput;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.plugins.providers.FileRange;
+import org.jboss.resteasy.plugins.providers.jsonb.JsonBindingProvider;
+import org.jboss.resteasy.spi.AsyncOutputStream;
+import org.jboss.resteasy.spi.AsyncStreamingOutput;
+
+/**
+ * provider that can produce JSON by default, removing the need for @Produces and @Consumes everywhere
+ */
+@Provider
+@Produces(MediaType.WILDCARD)
+@Consumes(MediaType.WILDCARD)
+@Priority(Priorities.USER - 200)
+public class QuarkusJsonbSerializer extends JsonBindingProvider {
+
+    /**
+     * RESTEasy can already handle these
+     */
+    private static final Set<Class<?>> BUILTIN_DEFAULTS = new HashSet<>(
+            Arrays.asList(String.class, InputStream.class, FileRange.class, AsyncStreamingOutput.class, DataSource.class,
+                    Reader.class, StreamingOutput.class, byte[].class, File.class));
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        if (BUILTIN_DEFAULTS.contains(type)) {
+            return false;
+        }
+        return isSupportedMediaType(mediaType);
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        if (BUILTIN_DEFAULTS.contains(type)) {
+            return false;
+        }
+        return isSupportedMediaType(mediaType) || mediaType.equals(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                || mediaType.isWildcardType();
+    }
+
+    @Override
+    public void writeTo(Object t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        super.writeTo(t, type, genericType, annotations, mediaType, httpHeaders, entityStream);
+    }
+
+    @Override
+    public CompletionStage<Void> asyncWriteTo(Object t, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, AsyncOutputStream entityStream) {
+        httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        return super.asyncWriteTo(t, type, genericType, annotations, mediaType, httpHeaders, entityStream);
+    }
+}
diff --git a/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java
new file mode 100644
index 0000000000000..cf5d21195fd6e
--- /dev/null
+++ b/extensions/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/providers/ServerFormUrlEncodedProvider.java
@@ -0,0 +1,40 @@
+package io.quarkus.resteasy.common.runtime.providers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.ConstrainedTo;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.plugins.providers.FormUrlEncodedProvider;
+import org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages;
+import org.jboss.resteasy.spi.HttpRequest;
+
+/**
+ * We maintain a stripped down version of RESTEasy's ServerFormUrlEncodedProvider here because we need a version compatible with
+ * our media types discovery i.e. we need a no-args constructor.
+ */
+@Produces("application/x-www-form-urlencoded")
+@Consumes("application/x-www-form-urlencoded")
+@ConstrainedTo(RuntimeType.SERVER)
+public class ServerFormUrlEncodedProvider extends FormUrlEncodedProvider {
+
+    @Context
+    HttpRequest request;
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public MultivaluedMap readFrom(Class<MultivaluedMap> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException {
+        LogMessages.LOGGER.debugf("Provider : %s,  Method : readFrom", getClass().getName());
+
+        return super.readFrom(type, genericType, annotations, mediaType, httpHeaders, entityStream);
+    }
+}
diff --git a/extensions/resteasy-common/spi/pom.xml b/extensions/resteasy-common/spi/pom.xml
index 17817f6b707f8..39ba698e33f8f 100644
--- a/extensions/resteasy-common/spi/pom.xml
+++ b/extensions/resteasy-common/spi/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyConfigBuildItem.java b/extensions/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyConfigBuildItem.java
new file mode 100644
index 0000000000000..98786f0321e0b
--- /dev/null
+++ b/extensions/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyConfigBuildItem.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.common.spi;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class ResteasyConfigBuildItem extends SimpleBuildItem {
+
+    private boolean jsonDefault;
+
+    public ResteasyConfigBuildItem(boolean jsonDefault) {
+        this.jsonDefault = jsonDefault;
+    }
+
+    public boolean isJsonDefault() {
+        return jsonDefault;
+    }
+}
diff --git a/extensions/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java b/extensions/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java
new file mode 100644
index 0000000000000..15c09880d4d93
--- /dev/null
+++ b/extensions/resteasy-common/spi/src/main/java/io/quarkus/resteasy/common/spi/ResteasyDotNames.java
@@ -0,0 +1,122 @@
+package io.quarkus.resteasy.common.spi;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+
+public final class ResteasyDotNames {
+
+    public static final DotName APPLICATION = DotName.createSimple("javax.ws.rs.core.Application");
+    public static final DotName CONSUMES = DotName.createSimple("javax.ws.rs.Consumes");
+    public static final DotName PRODUCES = DotName.createSimple("javax.ws.rs.Produces");
+    public static final DotName PROVIDER = DotName.createSimple("javax.ws.rs.ext.Provider");
+    public static final DotName GET = DotName.createSimple("javax.ws.rs.GET");
+    public static final DotName HEAD = DotName.createSimple("javax.ws.rs.HEAD");
+    public static final DotName DELETE = DotName.createSimple("javax.ws.rs.DELETE");
+    public static final DotName OPTIONS = DotName.createSimple("javax.ws.rs.OPTIONS");
+    public static final DotName PATCH = DotName.createSimple("javax.ws.rs.PATCH");
+    public static final DotName POST = DotName.createSimple("javax.ws.rs.POST");
+    public static final DotName PUT = DotName.createSimple("javax.ws.rs.PUT");
+    public static final DotName APPLICATION_PATH = DotName.createSimple("javax.ws.rs.ApplicationPath");
+    public static final DotName PATH = DotName.createSimple("javax.ws.rs.Path");
+    public static final DotName DYNAMIC_FEATURE = DotName.createSimple("javax.ws.rs.container.DynamicFeature");
+    public static final DotName CONTEXT = DotName.createSimple("javax.ws.rs.core.Context");
+    public static final DotName RESTEASY_QUERY_PARAM = DotName
+            .createSimple("org.jboss.resteasy.annotations.jaxrs.QueryParam");
+    public static final DotName RESTEASY_FORM_PARAM = DotName
+            .createSimple("org.jboss.resteasy.annotations.jaxrs.FormParam");
+    public static final DotName RESTEASY_COOKIE_PARAM = DotName
+            .createSimple("org.jboss.resteasy.annotations.jaxrs.CookieParam");
+    public static final DotName RESTEASY_PATH_PARAM = DotName
+            .createSimple("org.jboss.resteasy.annotations.jaxrs.PathParam");
+    public static final DotName RESTEASY_HEADER_PARAM = DotName
+            .createSimple("org.jboss.resteasy.annotations.jaxrs.HeaderParam");
+    public static final DotName RESTEASY_MATRIX_PARAM = DotName
+            .createSimple("org.jboss.resteasy.annotations.jaxrs.MatrixParam");
+    public static final DotName RESTEASY_SSE_ELEMENT_TYPE = DotName
+            .createSimple("org.jboss.resteasy.annotations.SseElementType");
+    public static final DotName RESTEASY_PART_TYPE = DotName
+            .createSimple("org.jboss.resteasy.annotations.providers.multipart.PartType");
+    public static final DotName CONFIG_PROPERTY = DotName
+            .createSimple(ConfigProperty.class.getName());
+    public static final DotName CDI_INSTANCE = DotName
+            .createSimple(javax.enterprise.inject.Instance.class.getName());
+    public static final DotName JSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");
+    public static final DotName JSONB_TRANSIENT = DotName.createSimple("javax.json.bind.annotation.JsonbTransient");
+    public static final DotName XML_TRANSIENT = DotName.createSimple("javax.xml.bind.annotation.XmlTransient");
+
+    public static final List<DotName> JAXRS_METHOD_ANNOTATIONS = Collections
+            .unmodifiableList(Arrays.asList(GET, POST, HEAD, DELETE, PUT, PATCH, OPTIONS));
+
+    public static final IgnoreTypeForReflectionPredicate IGNORE_TYPE_FOR_REFLECTION_PREDICATE = new IgnoreTypeForReflectionPredicate();
+    public static final IgnoreFieldForReflectionPredicate IGNORE_FIELD_FOR_REFLECTION_PREDICATE = new IgnoreFieldForReflectionPredicate();
+    public static final IgnoreMethodForReflectionPredicate IGNORE_METHOD_FOR_REFLECTION_PREDICATE = new IgnoreMethodForReflectionPredicate();
+
+    private static class IgnoreTypeForReflectionPredicate implements Predicate<DotName> {
+
+        @Override
+        public boolean test(DotName dotName) {
+            if (ResteasyDotNames.TYPES_IGNORED_FOR_REFLECTION.contains(dotName)
+                    || ReflectiveHierarchyBuildItem.DefaultIgnoreTypePredicate.INSTANCE.test(dotName)) {
+                return true;
+            }
+            String name = dotName.toString();
+            for (String packageName : PACKAGES_IGNORED_FOR_REFLECTION) {
+                if (name.startsWith(packageName)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private static class IgnoreFieldForReflectionPredicate implements Predicate<FieldInfo> {
+
+        @Override
+        public boolean test(FieldInfo fieldInfo) {
+            return fieldInfo.hasAnnotation(JSON_IGNORE)
+                    || fieldInfo.hasAnnotation(JSONB_TRANSIENT)
+                    || fieldInfo.hasAnnotation(XML_TRANSIENT);
+        }
+    }
+
+    private static class IgnoreMethodForReflectionPredicate implements Predicate<MethodInfo> {
+
+        @Override
+        public boolean test(MethodInfo methodInfo) {
+            return methodInfo.hasAnnotation(JSON_IGNORE)
+                    || methodInfo.hasAnnotation(JSONB_TRANSIENT)
+                    || methodInfo.hasAnnotation(XML_TRANSIENT);
+        }
+    }
+
+    // Types ignored for reflection used by the RESTEasy and SmallRye REST client extensions.
+    private static final Set<DotName> TYPES_IGNORED_FOR_REFLECTION = new HashSet<>(Arrays.asList(
+    // Consider adding packages below instead if it makes more sense
+    ));
+
+    private static final String[] PACKAGES_IGNORED_FOR_REFLECTION = {
+            // JSON-P
+            "javax.json.",
+            // Jackson
+            "com.fasterxml.jackson.databind.",
+            // JAX-RS
+            "javax.ws.rs.",
+            // RESTEasy
+            "org.jboss.resteasy.",
+            // Vert.x JSON layer
+            "io.vertx.core.json.",
+            // Mutiny
+            "io.smallrye.mutiny."
+    };
+}
diff --git a/extensions/resteasy-jackson/deployment/pom.xml b/extensions/resteasy-jackson/deployment/pom.xml
index 23cdcdf25f58e..f2ec8817cbf84 100644
--- a/extensions/resteasy-jackson/deployment/pom.xml
+++ b/extensions/resteasy-jackson/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-jackson-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jackson/deployment/src/main/java/io/quarkus/resteasy/jackson/deployment/ResteasyJacksonProcessor.java b/extensions/resteasy-jackson/deployment/src/main/java/io/quarkus/resteasy/jackson/deployment/ResteasyJacksonProcessor.java
index 92b6af38f8e77..65926ee2a949c 100644
--- a/extensions/resteasy-jackson/deployment/src/main/java/io/quarkus/resteasy/jackson/deployment/ResteasyJacksonProcessor.java
+++ b/extensions/resteasy-jackson/deployment/src/main/java/io/quarkus/resteasy/jackson/deployment/ResteasyJacksonProcessor.java
@@ -18,5 +18,6 @@ void feature(BuildProducer<FeatureBuildItem> feature) {
     void capabilities(BuildProducer<CapabilityBuildItem> capability) {
         capability.produce(new CapabilityBuildItem(Capability.RESTEASY_JSON));
         capability.produce(new CapabilityBuildItem(Capability.REST_JACKSON));
+        capability.produce(new CapabilityBuildItem(Capability.RESTEASY_JACKSON));
     }
 }
diff --git a/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java b/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java
new file mode 100644
index 0000000000000..d82a6b1092be2
--- /dev/null
+++ b/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/HelloNoMediaTypeResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.jackson;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/hello-default")
+public class HelloNoMediaTypeResource {
+
+    @GET
+    public Message hello() {
+        Message m = new Message();
+        m.setMessage("Hello");
+        return m;
+    }
+}
diff --git a/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/Message.java b/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/Message.java
new file mode 100644
index 0000000000000..719196cc4899a
--- /dev/null
+++ b/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/Message.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.jackson;
+
+public class Message {
+
+    private String message;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Message setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+}
diff --git a/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java b/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java
new file mode 100644
index 0000000000000..11c2a566fdaf2
--- /dev/null
+++ b/extensions/resteasy-jackson/deployment/src/test/java/io/quarkus/resteasy/jackson/NoMediaTypeTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.jackson;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class NoMediaTypeTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloNoMediaTypeResource.class, Message.class));
+
+    @Test
+    public void testJsonDefaultNoProduces() {
+        RestAssured.get("/hello-default").then()
+                .statusCode(200)
+                .body("message", equalTo("Hello"));
+    }
+
+}
diff --git a/extensions/resteasy-jackson/pom.xml b/extensions/resteasy-jackson/pom.xml
index b6f0cdcb2b653..fe4c5c14b193c 100644
--- a/extensions/resteasy-jackson/pom.xml
+++ b/extensions/resteasy-jackson/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jackson/runtime/pom.xml b/extensions/resteasy-jackson/runtime/pom.xml
index 8bdf38377f3de..c67d5c149e9f8 100644
--- a/extensions/resteasy-jackson/runtime/pom.xml
+++ b/extensions/resteasy-jackson/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-jackson-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f59d95a577687..82e96447cc9d0 100644
--- a/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/resteasy-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "RESTEasy Jackson"
 metadata:
   keywords:
@@ -13,3 +12,10 @@ metadata:
   - "web"
   - "serialization"
   status: "stable"
+  codestart:
+    name: "resteasy-jackson"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/resteasy-jaxb/deployment/pom.xml b/extensions/resteasy-jaxb/deployment/pom.xml
index 8413bb06354ff..458aa0d93b16e 100644
--- a/extensions/resteasy-jaxb/deployment/pom.xml
+++ b/extensions/resteasy-jaxb/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-jaxb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java b/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java
index efa692c91b447..f9492324c8e9c 100755
--- a/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java
+++ b/extensions/resteasy-jaxb/deployment/src/main/java/io/quarkus/resteasy/jaxb/deployment/ResteasyJaxbProcessor.java
@@ -1,14 +1,52 @@
 package io.quarkus.resteasy.jaxb.deployment;
 
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.resteasy.annotations.providers.jaxb.Wrapped;
+import org.jboss.resteasy.annotations.providers.jaxb.WrappedMap;
+
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 
 public class ResteasyJaxbProcessor {
 
+    private static final List<Class<? extends Annotation>> RESTEASY_JAXB_ANNOTATIONS = Arrays.asList(
+            Wrapped.class,
+            WrappedMap.class);
+
+    @BuildStep
+    void processAnnotations(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            CombinedIndexBuildItem combinedIndexBuildItem) {
+        IndexView index = combinedIndexBuildItem.getIndex();
+
+        // Handle RESTEasy annotations usage.
+        for (Class annotationClazz : RESTEASY_JAXB_ANNOTATIONS) {
+            DotName annotation = DotName.createSimple(annotationClazz.getName());
+
+            if (!index.getAnnotations(annotation).isEmpty()) {
+                addReflectiveClass(reflectiveClass, true, true, "org.jboss.resteasy.plugins.providers.jaxb.JaxbCollection");
+                addReflectiveClass(reflectiveClass, true, true, "org.jboss.resteasy.plugins.providers.jaxb.JaxbMap");
+                addReflectiveClass(reflectiveClass, true, true, "javax.xml.bind.annotation.W3CDomHandler");
+                break;
+            }
+        }
+    }
+
     @BuildStep
     void build(BuildProducer<FeatureBuildItem> feature) {
         feature.produce(new FeatureBuildItem(Feature.RESTEASY_JAXB));
     }
+
+    private void addReflectiveClass(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, boolean methods, boolean fields,
+            String... className) {
+        reflectiveClass.produce(new ReflectiveClassBuildItem(methods, fields, className));
+    }
 }
diff --git a/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java b/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java
index f1e44da341e5f..bb04058c16475 100644
--- a/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java
+++ b/extensions/resteasy-jaxb/deployment/src/test/java/io/quarkus/resteasy/jaxb/deployment/ProducesXMLTestCase.java
@@ -1,11 +1,18 @@
 package io.quarkus.resteasy.jaxb.deployment;
 
+import static org.hamcrest.Matchers.is;
+
+import java.util.Arrays;
+import java.util.List;
+
 import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.jboss.resteasy.annotations.providers.jaxb.Wrapped;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Assertions;
@@ -34,6 +41,15 @@ public void testProducesXML() {
                 .contentType(MediaType.APPLICATION_XML)
                 .extract().as(Bar.class);
         Assertions.assertEquals(new Bar("open", "bar"), res);
+
+        RestAssured.given()
+                .contentType(ContentType.TEXT)
+                .when().get("/foo")
+                .then()
+                .log().ifValidationFails()
+                .statusCode(200)
+                .contentType(MediaType.APPLICATION_XML)
+                .body("bars.bar.size()", is(2));
     }
 
     @Path("/foo")
@@ -46,6 +62,14 @@ public Bar post(String bar) {
             final String[] s = bar.split(" ");
             return new Bar(s[0], s[1]);
         }
-    }
 
+        @GET
+        @Consumes(MediaType.TEXT_PLAIN)
+        @Produces(MediaType.APPLICATION_XML)
+        @Wrapped(element = "bars")
+        public List<Bar> list() {
+            return Arrays.asList(new Bar("name_1", "description_1"),
+                    new Bar("name_2", "description_2"));
+        }
+    }
 }
diff --git a/extensions/resteasy-jaxb/pom.xml b/extensions/resteasy-jaxb/pom.xml
index 8adfae5c38697..3d3726599a398 100644
--- a/extensions/resteasy-jaxb/pom.xml
+++ b/extensions/resteasy-jaxb/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jaxb/runtime/pom.xml b/extensions/resteasy-jaxb/runtime/pom.xml
index b324c362e78e8..4dfa163247e14 100644
--- a/extensions/resteasy-jaxb/runtime/pom.xml
+++ b/extensions/resteasy-jaxb/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-jaxb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jsonb/deployment/pom.xml b/extensions/resteasy-jsonb/deployment/pom.xml
index 63d24f85fc90f..8f18e1017034e 100644
--- a/extensions/resteasy-jsonb/deployment/pom.xml
+++ b/extensions/resteasy-jsonb/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-jsonb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java b/extensions/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java
index abba89a154824..1c71bc74a04de 100755
--- a/extensions/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java
+++ b/extensions/resteasy-jsonb/deployment/src/main/java/io/quarkus/resteasy/jsonb/deployment/ResteasyJsonbProcessor.java
@@ -32,6 +32,7 @@ void feature(BuildProducer<FeatureBuildItem> feature) {
     void capabilities(BuildProducer<CapabilityBuildItem> capability) {
         capability.produce(new CapabilityBuildItem(Capability.RESTEASY_JSON));
         capability.produce(new CapabilityBuildItem(Capability.REST_JSONB));
+        capability.produce(new CapabilityBuildItem(Capability.RESTEASY_JSONB));
     }
 
     @BuildStep
diff --git a/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java
new file mode 100644
index 0000000000000..3998b9a6fda08
--- /dev/null
+++ b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/HelloNoMediaTypeResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.jsonb;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/hello-default")
+public class HelloNoMediaTypeResource {
+
+    @GET
+    public Message hello() {
+        Message m = new Message();
+        m.setMessage("Hello");
+        return m;
+    }
+}
diff --git a/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/Message.java b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/Message.java
new file mode 100644
index 0000000000000..96d5cd237302e
--- /dev/null
+++ b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/Message.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.jsonb;
+
+public class Message {
+
+    private String message;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Message setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+}
diff --git a/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java
new file mode 100644
index 0000000000000..5e3959b1f7084
--- /dev/null
+++ b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/NoMediaTypeTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.jsonb;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class NoMediaTypeTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloNoMediaTypeResource.class, Message.class));
+
+    @Test
+    public void testJsonDefaultNoProduces() {
+        RestAssured.get("/hello-default").then()
+                .statusCode(200)
+                .body("message", equalTo("Hello"));
+    }
+
+}
diff --git a/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java
index dacf478db8612..439da024276c8 100644
--- a/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java
+++ b/extensions/resteasy-jsonb/deployment/src/test/java/io/quarkus/resteasy/jsonb/ResourceSendingJsonObjects.java
@@ -4,12 +4,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.junit.jupiter.api.Assertions;
@@ -18,7 +15,6 @@
 import io.vertx.core.json.JsonObject;
 
 @Path("/test")
-@Produces(MediaType.APPLICATION_JSON)
 public class ResourceSendingJsonObjects {
 
     @GET
@@ -38,7 +34,6 @@ public List<JsonArray> getJsonArrays() {
     }
 
     @POST
-    @Consumes(MediaType.APPLICATION_JSON)
     @Path("/objects")
     public Response receiveJsonObjects(List<JsonObject> objects) {
         Assertions.assertEquals(2, objects.size());
@@ -50,7 +45,6 @@ public Response receiveJsonObjects(List<JsonObject> objects) {
     }
 
     @POST
-    @Consumes(MediaType.APPLICATION_JSON)
     @Path("/arrays")
     public Response receiveJsonArrays(List<JsonArray> array) {
         Assertions.assertEquals(1, array.size());
diff --git a/extensions/resteasy-jsonb/pom.xml b/extensions/resteasy-jsonb/pom.xml
index e02951fd0a3f4..282ef6193f2b4 100644
--- a/extensions/resteasy-jsonb/pom.xml
+++ b/extensions/resteasy-jsonb/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-jsonb/runtime/pom.xml b/extensions/resteasy-jsonb/runtime/pom.xml
index 34de53626f17d..e25fcf8a37ec7 100644
--- a/extensions/resteasy-jsonb/runtime/pom.xml
+++ b/extensions/resteasy-jsonb/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-jsonb-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-multipart/deployment/pom.xml b/extensions/resteasy-multipart/deployment/pom.xml
new file mode 100644
index 0000000000000..4705610c80fb8
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-multipart-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-multipart-deployment</artifactId>
+    <name>Quarkus - RESTEasy - Multipart - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-multipart</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/resteasy-multipart/deployment/src/main/java/io/quarkus/resteasy/multipart/deployment/ResteasyMultipartProcessor.java b/extensions/resteasy-multipart/deployment/src/main/java/io/quarkus/resteasy/multipart/deployment/ResteasyMultipartProcessor.java
new file mode 100644
index 0000000000000..555868d9effd1
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/main/java/io/quarkus/resteasy/multipart/deployment/ResteasyMultipartProcessor.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.multipart.deployment;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.resteasy.multipart.runtime.MultipartInputPartConfigContainerRequestFilter;
+
+public class ResteasyMultipartProcessor {
+
+    @BuildStep
+    void feature(BuildProducer<FeatureBuildItem> feature) {
+        feature.produce(new FeatureBuildItem(Feature.RESTEASY_MULTIPART));
+    }
+
+    @BuildStep
+    AdditionalBeanBuildItem filter() {
+        return new AdditionalBeanBuildItem.Builder()
+                .addBeanClass(MultipartInputPartConfigContainerRequestFilter.class)
+                .setUnremovable()
+                .setDefaultScope(DotNames.SINGLETON)
+                .build();
+    }
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java
new file mode 100644
index 0000000000000..4782162069835
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackBody.java
@@ -0,0 +1,10 @@
+package io.quarkus.resteasy.multipart;
+
+import javax.ws.rs.FormParam;
+
+public class FeedbackBody {
+
+    @FormParam("content")
+    public String content;
+
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java
new file mode 100644
index 0000000000000..dfe9fb1e3c1c9
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/FeedbackResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.multipart;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
+
+@Path("/test")
+public class FeedbackResource {
+
+    @POST
+    @Path("/multipart-encoding")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.MULTIPART_FORM_DATA + ";charset=UTF-8")
+    public String postForm(@MultipartForm final FeedbackBody feedback) {
+        return feedback.content;
+    }
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java
new file mode 100644
index 0000000000000..9b3258301ed7d
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/InvalidEncodingTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.resteasy.multipart;
+
+import static org.hamcrest.CoreMatchers.not;
+
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.builder.MultiPartSpecBuilder;
+import io.restassured.specification.MultiPartSpecification;
+
+public class InvalidEncodingTest {
+
+    private static final String TEXT_WITH_ACCENTED_CHARACTERS = "Text with UTF-8 accented characters: é à è";
+
+    @RegisterExtension
+    static QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FeedbackBody.class, FeedbackResource.class))
+            .withConfigurationResource("application-charset-us-ascii.properties");
+
+    @Test
+    public void testMultipartEncoding() throws URISyntaxException {
+        MultiPartSpecification multiPartSpecification = new MultiPartSpecBuilder(TEXT_WITH_ACCENTED_CHARACTERS)
+                .controlName("content")
+                // we need to force the content-type to avoid having the charset included
+                // as we are testing the default behavior when no charset is defined
+                .header("Content-Type", "text/plain")
+                .charset(StandardCharsets.UTF_8)
+                .build();
+
+        RestAssured
+                .given()
+                .multiPart(multiPartSpecification)
+                .post("/test/multipart-encoding")
+                .then()
+                .statusCode(200)
+                .body(not(TEXT_WITH_ACCENTED_CHARACTERS));
+    }
+
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java
new file mode 100644
index 0000000000000..b7e0032d724fd
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/MultipartEncodingTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.resteasy.multipart;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.builder.MultiPartSpecBuilder;
+import io.restassured.specification.MultiPartSpecification;
+
+public class MultipartEncodingTest {
+
+    private static final String TEXT_WITH_ACCENTED_CHARACTERS = "Text with UTF-8 accented characters: é à è";
+
+    @RegisterExtension
+    static QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FeedbackBody.class, FeedbackResource.class));
+
+    @Test
+    public void testMultipartEncoding() throws URISyntaxException {
+        MultiPartSpecification multiPartSpecification = new MultiPartSpecBuilder(TEXT_WITH_ACCENTED_CHARACTERS)
+                .controlName("content")
+                // we need to force the content-type to avoid having the charset included
+                // as we are testing the default behavior when no charset is defined
+                .header("Content-Type", "text/plain")
+                .charset(StandardCharsets.UTF_8)
+                .build();
+
+        RestAssured
+                .given()
+                .multiPart(multiPartSpecification)
+                .post("/test/multipart-encoding")
+                .then()
+                .statusCode(200)
+                .body(is(TEXT_WITH_ACCENTED_CHARACTERS));
+    }
+
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java
new file mode 100644
index 0000000000000..997d2fdbd34af
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeDto.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.multipart.parttype;
+
+import java.util.Map;
+
+import javax.ws.rs.FormParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.annotations.providers.multipart.PartType;
+
+public class PartTypeDto {
+
+    @FormParam("myMapping")
+    @PartType(MediaType.APPLICATION_JSON)
+    public Map<String, String> myMapping;
+
+    @FormParam("flag")
+    @PartType(MediaType.TEXT_PLAIN)
+    public boolean flag;
+
+    @FormParam("reproduceEnum")
+    @PartType(MediaType.TEXT_PLAIN)
+    public PartTypeEnum partTypeEnum;
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeEnum.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeEnum.java
new file mode 100644
index 0000000000000..d12ec81044f71
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeEnum.java
@@ -0,0 +1,6 @@
+package io.quarkus.resteasy.multipart.parttype;
+
+public enum PartTypeEnum {
+    PENDING,
+    ACTIVE;
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java
new file mode 100644
index 0000000000000..46013efdd7444
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeMultipartTest.java
@@ -0,0 +1,41 @@
+package io.quarkus.resteasy.multipart.parttype;
+
+import java.net.URISyntaxException;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.builder.MultiPartSpecBuilder;
+import io.restassured.specification.MultiPartSpecification;
+
+public class PartTypeMultipartTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(PartTypeDto.class, PartTypeEnum.class, PartTypeResource.class));
+
+    @Test
+    public void testMultipartEncoding() throws URISyntaxException {
+        MultiPartSpecification multiPartSpecification = new MultiPartSpecBuilder("{ \"key\": \"value\" }")
+                .controlName("myMapping")
+                .mimeType(MediaType.APPLICATION_JSON)
+                .build();
+
+        RestAssured
+                .given()
+                .multiPart(multiPartSpecification)
+                .multiPart("flag", "true")
+                .multiPart("partTypeEnum", "ACTIVE")
+                .post("/test/part-type/")
+                .then()
+                .statusCode(200);
+    }
+
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java
new file mode 100644
index 0000000000000..ddd3df0e0379d
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/java/io/quarkus/resteasy/multipart/parttype/PartTypeResource.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.multipart.parttype;
+
+import javax.transaction.Transactional;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
+
+@Path("/test/part-type/")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public final class PartTypeResource {
+
+    @POST
+    @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.APPLICATION_JSON })
+    @Transactional
+    public Response reproduce(@MultipartForm PartTypeDto reproduceDto) {
+        return Response.ok().build();
+    }
+}
diff --git a/extensions/resteasy-multipart/deployment/src/test/resources/application-charset-us-ascii.properties b/extensions/resteasy-multipart/deployment/src/test/resources/application-charset-us-ascii.properties
new file mode 100644
index 0000000000000..19f12f0cc0eb9
--- /dev/null
+++ b/extensions/resteasy-multipart/deployment/src/test/resources/application-charset-us-ascii.properties
@@ -0,0 +1 @@
+quarkus.resteasy.multipart.input-part.default-charset=us-ascii
\ No newline at end of file
diff --git a/extensions/resteasy-multipart/pom.xml b/extensions/resteasy-multipart/pom.xml
new file mode 100644
index 0000000000000..c8578da906a7a
--- /dev/null
+++ b/extensions/resteasy-multipart/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-multipart-parent</artifactId>
+    <name>Quarkus - RESTEasy - Multipart</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/resteasy-multipart/runtime/pom.xml b/extensions/resteasy-multipart/runtime/pom.xml
new file mode 100644
index 0000000000000..0d61c4a4103f0
--- /dev/null
+++ b/extensions/resteasy-multipart/runtime/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-multipart-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-multipart</artifactId>
+    <name>Quarkus - RESTEasy - Multipart - Runtime</name>
+    <description>Multipart support for RESTEasy</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java b/extensions/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java
new file mode 100644
index 0000000000000..783ccb4ff6db6
--- /dev/null
+++ b/extensions/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/MultipartInputPartConfigContainerRequestFilter.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.multipart.runtime;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.plugins.providers.multipart.InputPart;
+
+import io.quarkus.arc.WithCaching;
+
+@Provider
+public class MultipartInputPartConfigContainerRequestFilter implements ContainerRequestFilter {
+
+    @WithCaching
+    @Inject
+    Instance<ResteasyMultipartRuntimeConfig> resteasyMultipartConfigInstance;
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        ResteasyMultipartRuntimeConfig resteasyMultipartConfig = resteasyMultipartConfigInstance.get();
+
+        requestContext.setProperty(InputPart.DEFAULT_CHARSET_PROPERTY,
+                resteasyMultipartConfig.inputPart.defaultCharset.name());
+        requestContext.setProperty(InputPart.DEFAULT_CONTENT_TYPE_PROPERTY,
+                resteasyMultipartConfig.inputPart.defaultContentType);
+    }
+}
diff --git a/extensions/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/ResteasyMultipartRuntimeConfig.java b/extensions/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/ResteasyMultipartRuntimeConfig.java
new file mode 100644
index 0000000000000..9108ceea9b23e
--- /dev/null
+++ b/extensions/resteasy-multipart/runtime/src/main/java/io/quarkus/resteasy/multipart/runtime/ResteasyMultipartRuntimeConfig.java
@@ -0,0 +1,36 @@
+package io.quarkus.resteasy.multipart.runtime;
+
+import java.nio.charset.Charset;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "resteasy.multipart", phase = ConfigPhase.RUN_TIME)
+public class ResteasyMultipartRuntimeConfig {
+
+    /**
+     * Input part configuration.
+     */
+    @ConfigItem
+    public InputPartConfigGroup inputPart;
+
+    @ConfigGroup
+    public static class InputPartConfigGroup {
+
+        /**
+         * Default charset.
+         * <p>
+         * Note that the default value is UTF-8 which is different from RESTEasy's default value US-ASCII.
+         */
+        @ConfigItem(defaultValue = "UTF-8")
+        public Charset defaultCharset;
+
+        /**
+         * The default content-type.
+         */
+        @ConfigItem(defaultValue = "text/plain")
+        public String defaultContentType;
+    }
+}
diff --git a/extensions/resteasy-multipart/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-multipart/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..690817653947f
--- /dev/null
+++ b/extensions/resteasy-multipart/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "RESTEasy Multipart"
+metadata:
+  keywords:
+  - "resteasy-multipart"
+  - "multipart"
+  - "upload"
+  - "resteasy"
+  - "jaxrs"
+  guide: "https://quarkus.io/guides/rest-json#multipart-support"
+  categories:
+  - "web"
+  status: "stable"
diff --git a/extensions/resteasy-multipart/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/extensions/resteasy-multipart/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
new file mode 100644
index 0000000000000..7da2deff4637c
--- /dev/null
+++ b/extensions/resteasy-multipart/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
@@ -0,0 +1 @@
+io.quarkus.resteasy.multipart.runtime.MultipartInputPartConfigContainerRequestFilter
diff --git a/extensions/resteasy-mutiny-common/deployment/pom.xml b/extensions/resteasy-mutiny-common/deployment/pom.xml
new file mode 100644
index 0000000000000..005a9730fd8ae
--- /dev/null
+++ b/extensions/resteasy-mutiny-common/deployment/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-mutiny-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-mutiny-common-deployment</artifactId>
+    <name>Quarkus - RESTEasy - Mutiny - Common - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-mutiny-common/deployment/src/main/java/io/quarkus/resteasy/mutiny/common/deployment/ResteasyMutinyCommonProcessor.java b/extensions/resteasy-mutiny-common/deployment/src/main/java/io/quarkus/resteasy/mutiny/common/deployment/ResteasyMutinyCommonProcessor.java
new file mode 100644
index 0000000000000..bd4996ed073b3
--- /dev/null
+++ b/extensions/resteasy-mutiny-common/deployment/src/main/java/io/quarkus/resteasy/mutiny/common/deployment/ResteasyMutinyCommonProcessor.java
@@ -0,0 +1,37 @@
+package io.quarkus.resteasy.mutiny.common.deployment;
+
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.mutiny.common.runtime.MultiInvokerProvider;
+import io.quarkus.resteasy.mutiny.common.runtime.MultiProvider;
+import io.quarkus.resteasy.mutiny.common.runtime.MultiRxInvoker;
+import io.quarkus.resteasy.mutiny.common.runtime.MultiRxInvokerImpl;
+import io.quarkus.resteasy.mutiny.common.runtime.UniInvokerProvider;
+import io.quarkus.resteasy.mutiny.common.runtime.UniProvider;
+import io.quarkus.resteasy.mutiny.common.runtime.UniRxInvoker;
+import io.quarkus.resteasy.mutiny.common.runtime.UniRxInvokerImpl;
+
+public class ResteasyMutinyCommonProcessor {
+
+    @BuildStep
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.RESTEASY_MUTINY);
+    }
+
+    @BuildStep
+    public void registerProviders(BuildProducer<ResteasyJaxrsProviderBuildItem> jaxrsProvider) {
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiInvokerProvider.class.getName()));
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiProvider.class.getName()));
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiRxInvoker.class.getName()));
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiRxInvokerImpl.class.getName()));
+
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniInvokerProvider.class.getName()));
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniProvider.class.getName()));
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniRxInvoker.class.getName()));
+        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniRxInvokerImpl.class.getName()));
+    }
+
+}
diff --git a/extensions/resteasy-mutiny-common/pom.xml b/extensions/resteasy-mutiny-common/pom.xml
new file mode 100644
index 0000000000000..112c7d4b70951
--- /dev/null
+++ b/extensions/resteasy-mutiny-common/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-resteasy-mutiny-common-parent</artifactId>
+    <name>Quarkus - RESTEasy - Mutiny - Common</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-mutiny-common/runtime/pom.xml b/extensions/resteasy-mutiny-common/runtime/pom.xml
new file mode 100644
index 0000000000000..3d596c9f0c80e
--- /dev/null
+++ b/extensions/resteasy-mutiny-common/runtime/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-mutiny-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-mutiny-common</artifactId>
+    <name>Quarkus - RESTEasy - Mutiny - Common - Runtime</name>
+    <description>Mutiny components common to the RESTEasy server and the REST Client</description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiInvokerProvider.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java
similarity index 93%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiInvokerProvider.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java
index 77ac782b3c989..792bfd62a7d7f 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiInvokerProvider.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiInvokerProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import java.util.concurrent.ExecutorService;
 
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiProvider.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java
similarity index 84%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiProvider.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java
index 210b81906d200..fa53954b5168e 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiProvider.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import org.jboss.resteasy.spi.AsyncStreamProvider;
 import org.reactivestreams.Publisher;
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiRxInvoker.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java
similarity index 85%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiRxInvoker.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java
index 497b49e1bfece..c0004a06da245 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiRxInvoker.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import javax.ws.rs.client.RxInvoker;
 
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiRxInvokerImpl.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java
similarity index 98%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiRxInvokerImpl.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java
index 8d7c67b977f72..97ecff37de2c9 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/MultiRxInvokerImpl.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/MultiRxInvokerImpl.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -219,8 +219,7 @@ private SseEventSourceImpl getEventSource() {
         if (executorService != null) {
             builder.executor(executorService);
         }
-        SseEventSourceImpl sseEventSource = (SseEventSourceImpl) builder.build();
-        sseEventSource.setAlwaysReconnect(false);
+        SseEventSourceImpl sseEventSource = (SseEventSourceImpl) builder.alwaysReconnect(false).build();
         return sseEventSource;
     }
 
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniInvokerProvider.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java
similarity index 95%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniInvokerProvider.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java
index 7bdd0a01e5c49..e67e47d121b1d 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniInvokerProvider.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniInvokerProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import java.util.concurrent.ExecutorService;
 
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniProvider.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniProvider.java
similarity index 93%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniProvider.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniProvider.java
index 3db928916c01b..71f276ea7bb79 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniProvider.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniRxInvoker.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java
similarity index 97%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniRxInvoker.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java
index adc561e59713f..b265dff7d0e8a 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniRxInvoker.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.RxInvoker;
diff --git a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniRxInvokerImpl.java b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java
similarity index 99%
rename from extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniRxInvokerImpl.java
rename to extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java
index bf394994e11b2..36e501816c6db 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/java/io/quarkus/resteasy/mutiny/runtime/UniRxInvokerImpl.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/java/io/quarkus/resteasy/mutiny/common/runtime/UniRxInvokerImpl.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.runtime;
+package io.quarkus.resteasy.mutiny.common.runtime;
 
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
diff --git a/extensions/resteasy-mutiny-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-mutiny-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..97289aa3ee076
--- /dev/null
+++ b/extensions/resteasy-mutiny-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,4 @@
+---
+name: "RESTEasy Mutiny Common"
+metadata:
+  unlisted: true
diff --git a/extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/MultiProviderTest.java b/extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java
similarity index 86%
rename from extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/MultiProviderTest.java
rename to extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java
index 05ec999bcd39b..85ccf9a5fe0a4 100644
--- a/extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/MultiProviderTest.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/MultiProviderTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.test;
+package io.quarkus.resteasy.mutiny.common.test;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 
-import io.quarkus.resteasy.mutiny.runtime.MultiProvider;
+import io.quarkus.resteasy.mutiny.common.runtime.MultiProvider;
 import io.smallrye.mutiny.Multi;
 
 public class MultiProviderTest {
diff --git a/extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/UniProviderTest.java b/extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniProviderTest.java
similarity index 90%
rename from extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/UniProviderTest.java
rename to extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniProviderTest.java
index 7fe0a78a7ca1f..420e14b19d08e 100644
--- a/extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/UniProviderTest.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniProviderTest.java
@@ -1,11 +1,11 @@
-package io.quarkus.resteasy.mutiny.test;
+package io.quarkus.resteasy.mutiny.common.test;
 
 import java.util.concurrent.CompletableFuture;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.resteasy.mutiny.runtime.UniProvider;
+import io.quarkus.resteasy.mutiny.common.runtime.UniProvider;
 import io.smallrye.mutiny.Uni;
 
 public class UniProviderTest {
diff --git a/extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/UniRxInvokerImplTest.java b/extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java
similarity index 98%
rename from extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/UniRxInvokerImplTest.java
rename to extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java
index b313d2db118f7..75ed84a93cbf4 100644
--- a/extensions/resteasy-mutiny/runtime/src/test/java/io/quarkus/resteasy/mutiny/test/UniRxInvokerImplTest.java
+++ b/extensions/resteasy-mutiny-common/runtime/src/test/java/io/quarkus/resteasy/mutiny/common/test/UniRxInvokerImplTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.mutiny.test;
+package io.quarkus.resteasy.mutiny.common.test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -16,7 +16,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.resteasy.mutiny.runtime.UniRxInvokerImpl;
+import io.quarkus.resteasy.mutiny.common.runtime.UniRxInvokerImpl;
 import io.smallrye.mutiny.Uni;
 
 @SuppressWarnings("unchecked")
diff --git a/extensions/resteasy-mutiny/deployment/pom.xml b/extensions/resteasy-mutiny/deployment/pom.xml
index 6487e177d4dfe..79b3faab5910f 100644
--- a/extensions/resteasy-mutiny/deployment/pom.xml
+++ b/extensions/resteasy-mutiny/deployment/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-resteasy-mutiny-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
@@ -16,11 +15,11 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <artifactId>quarkus-resteasy-mutiny-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-mutiny-deployment</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/resteasy-mutiny/deployment/src/main/java/io/quarkus/resteasy/mutiny/deployment/ResteasyMutinyProcessor.java b/extensions/resteasy-mutiny/deployment/src/main/java/io/quarkus/resteasy/mutiny/deployment/ResteasyMutinyProcessor.java
index 60d225b5ddb73..d5eb331ef64e1 100644
--- a/extensions/resteasy-mutiny/deployment/src/main/java/io/quarkus/resteasy/mutiny/deployment/ResteasyMutinyProcessor.java
+++ b/extensions/resteasy-mutiny/deployment/src/main/java/io/quarkus/resteasy/mutiny/deployment/ResteasyMutinyProcessor.java
@@ -1,20 +1,8 @@
 package io.quarkus.resteasy.mutiny.deployment;
 
-import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
-import io.quarkus.resteasy.mutiny.runtime.MultiInvokerProvider;
-import io.quarkus.resteasy.mutiny.runtime.MultiProvider;
-import io.quarkus.resteasy.mutiny.runtime.MultiRxInvoker;
-import io.quarkus.resteasy.mutiny.runtime.MultiRxInvokerImpl;
-import io.quarkus.resteasy.mutiny.runtime.UniInvokerProvider;
-import io.quarkus.resteasy.mutiny.runtime.UniProvider;
-import io.quarkus.resteasy.mutiny.runtime.UniRxInvoker;
-import io.quarkus.resteasy.mutiny.runtime.UniRxInvokerImpl;
 
 public class ResteasyMutinyProcessor {
 
@@ -23,22 +11,4 @@ FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.RESTEASY_MUTINY);
     }
 
-    @BuildStep
-    CapabilityBuildItem capability() {
-        return new CapabilityBuildItem(Capability.RESTEASY_MUTINY);
-    }
-
-    @BuildStep
-    public void registerProviders(BuildProducer<ResteasyJaxrsProviderBuildItem> jaxrsProvider) {
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiInvokerProvider.class.getName()));
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiProvider.class.getName()));
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiRxInvoker.class.getName()));
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(MultiRxInvokerImpl.class.getName()));
-
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniInvokerProvider.class.getName()));
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniProvider.class.getName()));
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniRxInvoker.class.getName()));
-        jaxrsProvider.produce(new ResteasyJaxrsProviderBuildItem(UniRxInvokerImpl.class.getName()));
-    }
-
 }
diff --git a/extensions/resteasy-mutiny/pom.xml b/extensions/resteasy-mutiny/pom.xml
index da7e7a5916893..dd53e29fe5ea4 100644
--- a/extensions/resteasy-mutiny/pom.xml
+++ b/extensions/resteasy-mutiny/pom.xml
@@ -5,10 +5,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-resteasy-mutiny-parent</artifactId>
diff --git a/extensions/resteasy-mutiny/runtime/pom.xml b/extensions/resteasy-mutiny/runtime/pom.xml
index b50a7f6404e13..3649fab9a6f95 100644
--- a/extensions/resteasy-mutiny/runtime/pom.xml
+++ b/extensions/resteasy-mutiny/runtime/pom.xml
@@ -7,12 +7,11 @@
         <artifactId>quarkus-resteasy-mutiny-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-resteasy-mutiny</artifactId>
     <name>Quarkus - RESTEasy - Mutiny - Runtime</name>
-    <description>Mutiny support for RESTEasy</description>
+    <description>Mutiny support for RESTEasy server</description>
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -28,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-mutiny</artifactId>
+            <artifactId>quarkus-resteasy-mutiny-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
diff --git a/extensions/resteasy-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 0bde4c9dba4de..12a6ebce7d8aa 100644
--- a/extensions/resteasy-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/resteasy-mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -5,6 +5,7 @@ metadata:
     - "resteasy-mutiny"
     - "resteasy"
     - "mutiny"
+  guide: "https://quarkus.io/guides/getting-started-reactive#mutiny"
   categories:
     - "web"
     - "reactive"
diff --git a/extensions/resteasy-qute/deployment/pom.xml b/extensions/resteasy-qute/deployment/pom.xml
index 774ed24a7ac69..5014135fdfc55 100644
--- a/extensions/resteasy-qute/deployment/pom.xml
+++ b/extensions/resteasy-qute/deployment/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-resteasy-qute-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-resteasy-qute-deployment</artifactId>
@@ -51,7 +50,6 @@
                             <version>${project.version}</version>
                         </path>
                     </annotationProcessorPaths>
-                    <parameters>true</parameters>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java
new file mode 100644
index 0000000000000..9759857a7c70c
--- /dev/null
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessageHelloResource.java
@@ -0,0 +1,33 @@
+package io.quarkus.qute.resteasy.deployment;
+
+import java.util.Locale;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.i18n.MessageBundles;
+
+@Path("hello")
+public class AppMessageHelloResource {
+
+    @Inject
+    Template hello;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public TemplateInstance get() {
+        return hello.instance();
+    }
+
+    @GET
+    @Path("de")
+    @Produces(MediaType.TEXT_PLAIN)
+    public TemplateInstance helloDe() {
+        return hello.instance().setAttribute(MessageBundles.ATTRIBUTE_LOCALE, Locale.GERMAN);
+    }
+}
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessages.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessages.java
new file mode 100644
index 0000000000000..11fb6a3a28d57
--- /dev/null
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/AppMessages.java
@@ -0,0 +1,15 @@
+package io.quarkus.qute.resteasy.deployment;
+
+import io.quarkus.qute.i18n.Message;
+import io.quarkus.qute.i18n.MessageBundle;
+
+@MessageBundle
+public interface AppMessages {
+
+    @Message("Hello world!")
+    String hello();
+
+    @Message("Hello {name}!")
+    String hello_name(String name);
+
+}
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java
index ebcbe9328ef4e..33c8cea643470 100644
--- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/HelloResource.java
@@ -28,7 +28,7 @@ public static class Templates {
 
         public static native TemplateInstance typedTemplate(String name, Map<String, Object> other);
 
-        public static native TemplateInstance typedTemplatePrimitives(boolean bool, byte b, short s, int i, long l, char c,
+        static native TemplateInstance typedTemplatePrimitives(boolean bool, byte b, short s, int i, long l, char c,
                 float f, double d);
     }
 
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java
index 670494068aa0a..4b7937c62f096 100644
--- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/ItemResource.java
@@ -1,26 +1,29 @@
 package io.quarkus.qute.resteasy.deployment;
 
-import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import io.quarkus.qute.Template;
 import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
 
 @Path("item")
 public class ItemResource {
 
-    @Inject
-    Template item;
+    @CheckedTemplate
+    static class Templates {
+
+        static native TemplateInstance item(Item item);
+
+    }
 
     @GET
     @Path("{id}")
     @Produces({ MediaType.TEXT_HTML, MediaType.TEXT_PLAIN })
     public TemplateInstance get(@PathParam("id") Integer id) {
-        return item.data(new Item(id, "foo"));
+        return Templates.item(new Item(id, "foo"));
     }
 
     public static class Item {
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java
new file mode 100644
index 0000000000000..2c529e32c2bfb
--- /dev/null
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleDevModeTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.qute.resteasy.deployment;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class MessageBundleDevModeTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AppMessages.class, AppMessageHelloResource.class)
+                    .addAsResource(new StringAsset(
+                            "{msg:hello_name('Georg')}"),
+                            "templates/hello.html")
+                    .addAsResource(new StringAsset(
+                            "hello=Hallo Welt!\nhello_name=Hallo {name}!"),
+                            "messages/msg_de.properties"));
+
+    @Test
+    public void testMessageBundles() {
+        when().get("/hello").then().body(is("Hello Georg!"));
+        TEST.modifySourceFile("AppMessages.java", (s -> s.replace("Hello", "Heya")));
+        when().get("/hello").then().body(is("Heya Georg!"));
+
+        when().get("/hello/de").then().body(is("Hallo Georg!"));
+        TEST.modifyResourceFile("messages/msg_de.properties", (s -> s.replace("Hallo", "Heya")));
+        when().get("/hello/de").then().body(is("Heya Georg!"));
+    }
+}
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java
new file mode 100644
index 0000000000000..997b205f6a83d
--- /dev/null
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MessageBundleLocaleFromVariantTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.qute.resteasy.deployment;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MessageBundleLocaleFromVariantTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AppMessages.class, AppMessageHelloResource.class)
+                    .addAsResource(new StringAsset(
+                            "{msg:hello_name('Georg')}"),
+                            "templates/hello.html")
+                    .addAsResource(new StringAsset(
+                            "hello=Hallo Welt!\nhello_name=Hallo {name}!"),
+                            "messages/msg_de.properties"));
+
+    @Test
+    public void testMessageBundles() {
+        given().header("Accept-Language", "de-DE").when().get("/hello").then().body(is("Hallo Georg!"));
+
+    }
+}
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java
index 99e063bafd447..f6cf3a3dbbaeb 100644
--- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java
@@ -1,11 +1,13 @@
 package io.quarkus.qute.resteasy.deployment;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.wildfly.common.Assert;
 
+import io.quarkus.qute.TemplateException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class MissingTemplateTest {
@@ -15,13 +17,10 @@ public class MissingTemplateTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(MissingTemplateResource.class)
                     .addAsResource("templates/MissingTemplateResource/hello.txt"))
-            .assertException(t -> {
-                t.printStackTrace();
-                Assert.assertTrue(t.getMessage().contains(
-                        "Declared template MissingTemplateResource/missingTemplate could not be found. Either add it or delete its declaration in io.quarkus.qute.resteasy.deployment.MissingTemplateResource$Templates.missingTemplate"));
-            });
+            .setExpectedException(TemplateException.class);
 
     @Test
     public void emptyTest() {
+        fail();
     }
 }
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java
index 2b6a881e37dea..4ac89bb764303 100644
--- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest.java
@@ -1,11 +1,12 @@
 package io.quarkus.qute.resteasy.deployment;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.wildfly.common.Assert;
 
 import io.quarkus.test.QuarkusUnitTest;
 
@@ -21,7 +22,8 @@ public class TypeErrorTest {
                     .addAsResource("templates/HelloResource/typedTemplatePrimitives.txt")
                     .addAsResource(new StringAsset("Hello {name}!"), "templates/hello.txt"))
             .assertException(t -> {
-                Assert.assertTrue(t.getMessage().contains("Incorrect expression: name.foo()"));
+                assertTrue(t.getMessage().contains("Incorrect expression"));
+                assertTrue(t.getMessage().contains("name.foo()"));
             });
 
     @Test
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java
index ae72ca17de1eb..6dc60928a3d21 100644
--- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/TypeErrorTest3.java
@@ -1,10 +1,11 @@
 package io.quarkus.qute.resteasy.deployment;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.wildfly.common.Assert;
 
 import io.quarkus.test.QuarkusUnitTest;
 
@@ -16,8 +17,8 @@ public class TypeErrorTest3 {
                     .addClass(TypeErrorResource.class)
                     .addAsResource("templates/TypeErrorResource/typeError3.txt"))
             .assertException(t -> {
-                t.printStackTrace();
-                Assert.assertTrue(t.getMessage().contains("Incorrect expression: name.foo()"));
+                assertTrue(t.getMessage().contains("Incorrect expression"));
+                assertTrue(t.getMessage().contains("name.foo()"));
             });
 
     @Test
diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java
index d6398f1025e6f..fe1beab155dfb 100644
--- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java
+++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/VariantTemplateTest.java
@@ -18,14 +18,14 @@ public class VariantTemplateTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(ItemResource.class, Item.class)
-                    .addAsResource(new StringAsset("Item {name}: {price}"), "templates/item.txt")
-                    .addAsResource(new StringAsset("<html><body>Item {name}: {price}</body></html>"),
-                            "templates/item.html"));
+                    .addAsResource(new StringAsset("Item {item.name}: {item.price}"), "templates/ItemResource/item.txt")
+                    .addAsResource(new StringAsset("<html><body>Item {item.name}: {item.price}</body></html>"),
+                            "templates/ItemResource/item.html"));
 
     @Test
     public void testVariant() {
         given().when().accept("text/plain").get("/item/10").then().body(Matchers.is("Item foo: 10"));
-        given().when().get("/item/20").then().body(Matchers.is("<html><body>Item foo: 20</body></html>"));
+        given().when().accept("text/html").get("/item/20").then().body(Matchers.is("<html><body>Item foo: 20</body></html>"));
     }
 
 }
diff --git a/extensions/resteasy-qute/pom.xml b/extensions/resteasy-qute/pom.xml
index 71b5dbe28cda7..3f14d943dae21 100644
--- a/extensions/resteasy-qute/pom.xml
+++ b/extensions/resteasy-qute/pom.xml
@@ -5,10 +5,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-resteasy-qute-parent</artifactId>
diff --git a/extensions/resteasy-qute/runtime/pom.xml b/extensions/resteasy-qute/runtime/pom.xml
index 9ffe58c1595f4..071146b824922 100644
--- a/extensions/resteasy-qute/runtime/pom.xml
+++ b/extensions/resteasy-qute/runtime/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>quarkus-resteasy-qute-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-resteasy-qute</artifactId>
diff --git a/extensions/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java b/extensions/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java
index f061404c32904..170019b73d8d0 100644
--- a/extensions/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java
+++ b/extensions/resteasy-qute/runtime/src/main/java/io/quarkus/resteasy/qute/runtime/TemplateResponseFilter.java
@@ -1,8 +1,9 @@
 package io.quarkus.resteasy.qute.runtime;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Locale;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
@@ -18,6 +19,7 @@
 @Provider
 public class TemplateResponseFilter implements ContainerResponseFilter {
 
+    @SuppressWarnings("unchecked")
     @Override
     public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
             throws IOException {
@@ -30,23 +32,30 @@ public void filter(ContainerRequestContext requestContext, ContainerResponseCont
             TemplateInstance instance = (TemplateInstance) entity;
             Object variantsAttr = instance.getAttribute(TemplateInstance.VARIANTS);
             if (variantsAttr != null) {
-                @SuppressWarnings("unchecked")
-                List<Variant> variants = (List<Variant>) variantsAttr;
+                List<javax.ws.rs.core.Variant> variants = new ArrayList<>();
+                for (Variant variant : (List<Variant>) variantsAttr) {
+                    variants.add(new javax.ws.rs.core.Variant(MediaType.valueOf(variant.getMediaType()), variant.getLocale(),
+                            variant.getEncoding()));
+                }
                 javax.ws.rs.core.Variant selected = requestContext.getRequest()
-                        .selectVariant(variants.stream()
-                                .map(v -> new javax.ws.rs.core.Variant(MediaType.valueOf(v.mediaType), v.locale, v.encoding))
-                                .collect(Collectors.toList()));
+                        .selectVariant(variants);
+
                 if (selected != null) {
+                    Locale selectedLocale = selected.getLanguage();
+                    if (selectedLocale == null) {
+                        List<Locale> acceptableLocales = requestContext.getAcceptableLanguages();
+                        if (!acceptableLocales.isEmpty()) {
+                            selectedLocale = acceptableLocales.get(0);
+                        }
+                    }
                     instance.setAttribute(TemplateInstance.SELECTED_VARIANT,
-                            new Variant(selected.getLanguage(), selected.getMediaType().toString(), selected.getEncoding()));
+                            new Variant(selectedLocale, selected.getMediaType().toString(), selected.getEncoding()));
                     mediaType = selected.getMediaType();
                 } else {
-                    // TODO we should use the default
-                    mediaType = null;
+                    mediaType = responseContext.getMediaType();
                 }
             } else {
-                // TODO how to get media type from non-variant templates?
-                mediaType = null;
+                mediaType = responseContext.getMediaType();
             }
 
             try {
diff --git a/extensions/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index b18397ef209ab..52c45b00b2792 100644
--- a/extensions/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/resteasy-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -9,3 +9,10 @@ metadata:
   categories:
   - "web"
   status: "experimental"
+  codestart:
+    name: "resteasy-qute"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+    artifact: "io.quarkus:quarkus-descriptor-json"
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/pom.xml b/extensions/resteasy-reactive/pom.xml
new file mode 100644
index 0000000000000..ce1ac2e2602b1
--- /dev/null
+++ b/extensions/resteasy-reactive/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Parent - Aggregator</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>quarkus-resteasy-reactive-common</module>
+        <module>quarkus-resteasy-reactive</module>
+        <module>quarkus-jaxrs-client</module>
+        <module>quarkus-resteasy-reactive-jackson</module>
+        <module>quarkus-resteasy-reactive-jsonb</module>
+        <module>quarkus-resteasy-reactive-qute</module>
+        <module>quarkus-resteasy-reactive-servlet</module>
+        <module>rest-client-reactive</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/pom.xml
new file mode 100644
index 0000000000000..7c558e737b1db
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/pom.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-jaxrs-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+    <name>Quarkus - JAXRS Client - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-client-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <!--  Move SSE tests into separate execution as they seem to be flaky, probably due to resource constraints in CI  -->
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>%regex[.*Sse.*Test.*]</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sse</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>%regex[.*Sse.*Test.*]</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/ClientEndpointIndexer.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/ClientEndpointIndexer.java
new file mode 100644
index 0000000000000..66ae55797b6d9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/ClientEndpointIndexer.java
@@ -0,0 +1,167 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_ARRAY;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_NUMBER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_OBJECT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_STRING;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_STRUCTURE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_VALUE;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.InjectableBean;
+import org.jboss.resteasy.reactive.common.model.MaybeRestClientInterface;
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.common.model.RestClientInterface;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaderWriter;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaders;
+import org.jboss.resteasy.reactive.common.processor.AdditionalWriters;
+import org.jboss.resteasy.reactive.common.processor.EndpointIndexer;
+import org.jboss.resteasy.reactive.common.processor.IndexedParameter;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonArrayHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonObjectHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonStructureHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler;
+
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.BeanParamParser;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.ClientBeanParamInfo;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.Item;
+
+public class ClientEndpointIndexer
+        extends EndpointIndexer<ClientEndpointIndexer, ClientEndpointIndexer.ClientIndexedParam, ResourceMethod> {
+
+    private final String[] defaultProduces;
+    private final String[] defaultProducesNegotiated;
+
+    ClientEndpointIndexer(Builder builder, String defaultProduces) {
+        super(builder);
+        this.defaultProduces = new String[] { defaultProduces };
+        this.defaultProducesNegotiated = new String[] { defaultProduces, MediaType.WILDCARD };
+    }
+
+    public MaybeRestClientInterface createClientProxy(ClassInfo classInfo,
+            String path) {
+        try {
+            RestClientInterface clazz = new RestClientInterface();
+            clazz.setClassName(classInfo.name().toString());
+            if (path != null) {
+                if (!path.startsWith("/")) {
+                    path = "/" + path;
+                }
+                if (path.endsWith("/")) {
+                    path = path.substring(0, path.length() - 1);
+                }
+                clazz.setPath(path);
+            }
+            List<ResourceMethod> methods = createEndpoints(classInfo, classInfo, new HashSet<>(),
+                    clazz.getPathParameters());
+            clazz.getMethods().addAll(methods);
+            return MaybeRestClientInterface.success(clazz);
+        } catch (Exception e) {
+            //kinda bogus, but we just ignore failed interfaces for now
+            //they can have methods that are not valid until they are actually extended by a concrete type
+
+            log.warn("Ignoring interface for creating client proxy" + classInfo.name(), e);
+            return MaybeRestClientInterface.failure(e.getMessage());
+        }
+    }
+
+    @Override
+    protected ResourceMethod createResourceMethod(MethodInfo info, Map<String, Object> methodContext) {
+        return new ResourceMethod();
+    }
+
+    @Override
+    protected boolean handleBeanParam(ClassInfo actualEndpointInfo, Type paramType, MethodParameter[] methodParameters, int i) {
+        ClassInfo beanParamClassInfo = index.getClassByName(paramType.name());
+        methodParameters[i] = parseClientBeanParam(beanParamClassInfo, index);
+
+        return false;
+    }
+
+    private MethodParameter parseClientBeanParam(ClassInfo beanParamClassInfo, IndexView index) {
+        List<Item> items = BeanParamParser.parse(beanParamClassInfo, index);
+        return new ClientBeanParamInfo(items, beanParamClassInfo.name().toString());
+    }
+
+    protected InjectableBean scanInjectableBean(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo,
+            Map<String, String> existingConverters, AdditionalReaders additionalReaders,
+            Map<String, InjectableBean> injectableBeans, boolean hasRuntimeConverters) {
+        throw new RuntimeException("Injectable beans not supported in client");
+    }
+
+    protected MethodParameter createMethodParameter(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo, boolean encoded,
+            Type paramType, ClientIndexedParam parameterResult, String name, String defaultValue, ParameterType type,
+            String elementType, boolean single, String signature) {
+        return new MethodParameter(name,
+                elementType, toClassName(paramType, currentClassInfo, actualEndpointInfo, index), signature, type, single,
+                defaultValue, parameterResult.isObtainedAsCollection(), parameterResult.isOptional(), encoded);
+    }
+
+    @Override
+    protected String[] applyAdditionalDefaults(Type nonAsyncReturnType) {
+        if (config.isSingleDefaultProduces()) {
+            return defaultProduces;
+        } else {
+            return defaultProducesNegotiated;
+        }
+    }
+
+    protected void addWriterForType(AdditionalWriters additionalWriters, Type paramType) {
+        addReaderWriterForType(additionalWriters, paramType);
+    }
+
+    protected void addReaderForType(AdditionalReaders additionalReaders, Type paramType) {
+        addReaderWriterForType(additionalReaders, paramType);
+    }
+
+    private void addReaderWriterForType(AdditionalReaderWriter additionalReaderWriter, Type paramType) {
+        DotName dotName = paramType.name();
+        if (dotName.equals(JSONP_JSON_NUMBER)
+                || dotName.equals(JSONP_JSON_VALUE)
+                || dotName.equals(JSONP_JSON_STRING)) {
+            additionalReaderWriter.add(JsonValueHandler.class, APPLICATION_JSON, javax.json.JsonValue.class);
+        } else if (dotName.equals(JSONP_JSON_ARRAY)) {
+            additionalReaderWriter.add(JsonArrayHandler.class, APPLICATION_JSON, javax.json.JsonArray.class);
+        } else if (dotName.equals(JSONP_JSON_OBJECT)) {
+            additionalReaderWriter.add(JsonObjectHandler.class, APPLICATION_JSON, javax.json.JsonObject.class);
+        } else if (dotName.equals(JSONP_JSON_STRUCTURE)) {
+            additionalReaderWriter.add(JsonStructureHandler.class, APPLICATION_JSON, javax.json.JsonStructure.class);
+        }
+    }
+
+    @Override
+    protected ClientIndexedParam createIndexedParam() {
+        return new ClientIndexedParam();
+    }
+
+    public static class ClientIndexedParam extends IndexedParameter<ClientIndexedParam> {
+
+    }
+
+    public static final class Builder extends EndpointIndexer.Builder<ClientEndpointIndexer, Builder, ResourceMethod> {
+        private String defaultProduces = MediaType.TEXT_PLAIN;
+
+        public Builder setDefaultProduces(String defaultProduces) {
+            this.defaultProduces = defaultProduces;
+            return this;
+        }
+
+        @Override
+        public ClientEndpointIndexer build() {
+            return new ClientEndpointIndexer(this, defaultProduces);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientEnricher.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientEnricher.java
new file mode 100644
index 0000000000000..18624e666f394
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientEnricher.java
@@ -0,0 +1,47 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+
+/**
+ * Alter jaxrs client proxy generation
+ */
+public interface JaxrsClientEnricher {
+    /**
+     * Class-level alterations
+     * 
+     * @param ctor jaxrs client constructor
+     * @param globalTarget WebTarget field of the jaxrs client
+     * @param interfaceClass JAXRS-annotated interface for which the client is being generated
+     * @param index jandex index
+     */
+    void forClass(MethodCreator ctor, AssignableResultHandle globalTarget,
+            ClassInfo interfaceClass, IndexView index);
+
+    /**
+     * Method-level alterations
+     * 
+     * @param classCreator creator of the jaxrs stub class
+     * @param constructor constructor of the jaxrs stub class
+     * @param methodCreator the method that is being generated, e.g. a method corresponding to `@GET Response get()`
+     * @param interfaceClass JAXRS-annotated interface for which the client is being generated
+     * @param method jandex method object corresponding to the method
+     * @param methodWebTarget method-level WebTarget
+     * @param index jandex index
+     * @param generatedClasses build producer used to generate classes. Used e.g. to generate classes for header filling
+     * @param methodIndex 0-based index of the method in the class. Used to assure there is no clash in generating classes
+     * @return customizer for Invocation.Builder
+     */
+    void forMethod(ClassCreator classCreator, MethodCreator constructor, MethodCreator methodCreator,
+            ClassInfo interfaceClass, MethodInfo method,
+            AssignableResultHandle invocationBuilder, IndexView index,
+            BuildProducer<GeneratedClassBuildItem> generatedClasses,
+            int methodIndex);
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientEnricherBuildItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientEnricherBuildItem.java
new file mode 100644
index 0000000000000..f16a6230b8184
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientEnricherBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * BuildItem to register a {@link JaxrsClientEnricher}
+ */
+public final class JaxrsClientEnricherBuildItem extends MultiBuildItem {
+    private final JaxrsClientEnricher enricher;
+
+    public JaxrsClientEnricherBuildItem(JaxrsClientEnricher enricher) {
+        this.enricher = enricher;
+    }
+
+    public JaxrsClientEnricher getEnricher() {
+        return enricher;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientProcessor.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientProcessor.java
new file mode 100644
index 0000000000000..46a7d1c41954d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/JaxrsClientProcessor.java
@@ -0,0 +1,826 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+import static io.quarkus.deployment.Feature.RESTEASY_REACTIVE_JAXRS_CLIENT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COMPLETION_STAGE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.WEB_APPLICATION_EXCEPTION;
+
+import java.io.Closeable;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Function;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.client.AsyncInvoker;
+import javax.ws.rs.client.CompletionStageRxInvoker;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.client.impl.AsyncInvokerImpl;
+import org.jboss.resteasy.reactive.client.impl.ClientImpl;
+import org.jboss.resteasy.reactive.client.impl.WebTargetImpl;
+import org.jboss.resteasy.reactive.common.core.GenericTypeMapping;
+import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.model.MaybeRestClientInterface;
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.common.model.RestClientInterface;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaderWriter;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaders;
+import org.jboss.resteasy.reactive.common.processor.AdditionalWriters;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
+
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.processor.MethodDescriptors;
+import io.quarkus.arc.processor.Types;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.recording.RecorderContext;
+import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.BeanParamItem;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.ClientBeanParamInfo;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.CookieParamItem;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.HeaderParamItem;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.Item;
+import io.quarkus.resteasy.reactive.client.deployment.beanparam.QueryParamItem;
+import io.quarkus.resteasy.reactive.client.runtime.ClientResponseBuilderFactory;
+import io.quarkus.resteasy.reactive.client.runtime.ResteasyReactiveClientRecorder;
+import io.quarkus.resteasy.reactive.common.deployment.ApplicationResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.QuarkusFactoryCreator;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.SerializersUtil;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfig;
+import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+
+public class JaxrsClientProcessor {
+
+    private static final Logger log = Logger.getLogger(JaxrsClientProcessor.class);
+
+    private static final MethodDescriptor WEB_TARGET_RESOLVE_TEMPLATE_METHOD = MethodDescriptor.ofMethod(WebTarget.class,
+            "resolveTemplate",
+            WebTarget.class,
+            String.class, Object.class);
+
+    @BuildStep
+    void addFeature(BuildProducer<FeatureBuildItem> features) {
+        features.produce(new FeatureBuildItem(RESTEASY_REACTIVE_JAXRS_CLIENT));
+    }
+
+    @BuildStep
+    void registerClientResponseBuilder(BuildProducer<ServiceProviderBuildItem> serviceProviders) {
+        serviceProviders.produce(new ServiceProviderBuildItem(ResponseBuilderFactory.class.getName(),
+                ClientResponseBuilderFactory.class.getName()));
+    }
+
+    @BuildStep
+    void initializeRuntimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+        runtimeInitializedClasses.produce(new RuntimeInitializedClassBuildItem(AsyncInvokerImpl.class.getName()));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void setupClientProxies(ResteasyReactiveClientRecorder recorder,
+            BeanContainerBuildItem beanContainerBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer,
+            List<MessageBodyReaderBuildItem> messageBodyReaderBuildItems,
+            List<MessageBodyWriterBuildItem> messageBodyWriterBuildItems,
+            List<JaxrsClientEnricherBuildItem> enricherBuildItems,
+            BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
+            Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            ResteasyReactiveConfig config,
+            RecorderContext recorderContext,
+            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
+            BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformerBuildItemBuildProducer,
+            List<RestClientDefaultProducesBuildItem> defaultConsumes,
+            List<RestClientDefaultConsumesBuildItem> defaultProduces) {
+        String defaultConsumesType = defaultMediaType(defaultConsumes, MediaType.APPLICATION_OCTET_STREAM);
+        String defaultProducesType = defaultMediaType(defaultProduces, MediaType.TEXT_PLAIN);
+
+        Serialisers serialisers = recorder.createSerializers();
+
+        SerializersUtil.setupSerializers(recorder, reflectiveClassBuildItemBuildProducer, messageBodyReaderBuildItems,
+                messageBodyWriterBuildItems, beanContainerBuildItem, applicationResultBuildItem, serialisers,
+                RuntimeType.CLIENT);
+
+        if (!resourceScanningResultBuildItem.isPresent()
+                || resourceScanningResultBuildItem.get().getResult().getClientInterfaces().isEmpty()) {
+            recorder.setupClientProxies(new HashMap<>(), Collections.emptyMap());
+            return;
+        }
+        ResourceScanningResult result = resourceScanningResultBuildItem.get().getResult();
+
+        AdditionalReaders additionalReaders = new AdditionalReaders();
+        AdditionalWriters additionalWriters = new AdditionalWriters();
+
+        IndexView index = beanArchiveIndexBuildItem.getIndex();
+        ClientEndpointIndexer clientEndpointIndexer = new ClientEndpointIndexer.Builder()
+                .setIndex(index)
+                .setExistingConverters(new HashMap<>())
+                .setScannedResourcePaths(result.getScannedResourcePaths())
+                .setConfig(new org.jboss.resteasy.reactive.common.ResteasyReactiveConfig(config.inputBufferSize.asLongValue(),
+                        config.singleDefaultProduces, config.defaultProduces))
+                .setAdditionalReaders(additionalReaders)
+                .setHttpAnnotationToMethod(result.getHttpAnnotationToMethod())
+                .setInjectableBeans(new HashMap<>())
+                .setFactoryCreator(new QuarkusFactoryCreator(recorder, beanContainerBuildItem.getValue()))
+                .setAdditionalWriters(additionalWriters)
+                .setDefaultBlocking(applicationResultBuildItem.getResult().isBlocking())
+                .setHasRuntimeConverters(false)
+                .setDefaultProduces(defaultProducesType)
+                .build();
+
+        Map<String, RuntimeValue<Function<WebTarget, ?>>> clientImplementations = new HashMap<>();
+        Map<String, String> failures = new HashMap<>();
+        for (Map.Entry<DotName, String> i : result.getClientInterfaces().entrySet()) {
+            ClassInfo clazz = index.getClassByName(i.getKey());
+            //these interfaces can also be clients
+            //so we generate client proxies for them
+            MaybeRestClientInterface maybeClientProxy = clientEndpointIndexer.createClientProxy(clazz,
+                    i.getValue());
+            if (maybeClientProxy.exists()) {
+                RestClientInterface clientProxy = maybeClientProxy.getRestClientInterface();
+                try {
+                    RuntimeValue<Function<WebTarget, ?>> proxyProvider = generateClientInvoker(recorderContext, clientProxy,
+                            enricherBuildItems, generatedClassBuildItemBuildProducer, clazz, index, defaultConsumesType);
+                    if (proxyProvider != null) {
+                        clientImplementations.put(clientProxy.getClassName(), proxyProvider);
+                    }
+                } catch (Exception any) {
+                    log.debugv(any, "Failed to create client proxy for {0} this can usually be safely ignored", clazz.name());
+                    failures.put(clazz.name().toString(), any.getMessage());
+                }
+
+            } else {
+                failures.put(clazz.name().toString(), maybeClientProxy.getFailure());
+            }
+        }
+
+        recorder.setupClientProxies(clientImplementations, failures);
+
+        for (AdditionalReaderWriter.Entry additionalReader : additionalReaders.get()) {
+            Class readerClass = additionalReader.getHandlerClass();
+            ResourceReader reader = new ResourceReader();
+            reader.setBuiltin(true);
+            reader.setFactory(recorder.factory(readerClass.getName(), beanContainerBuildItem.getValue()));
+            reader.setMediaTypeStrings(Collections.singletonList(additionalReader.getMediaType()));
+            recorder.registerReader(serialisers, additionalReader.getEntityClass().getName(), reader);
+            reflectiveClassBuildItemBuildProducer
+                    .produce(new ReflectiveClassBuildItem(true, false, false, readerClass.getName()));
+        }
+
+        for (AdditionalReaderWriter.Entry entry : additionalWriters.get()) {
+            Class writerClass = entry.getHandlerClass();
+            ResourceWriter writer = new ResourceWriter();
+            writer.setBuiltin(true);
+            writer.setFactory(recorder.factory(writerClass.getName(), beanContainerBuildItem.getValue()));
+            writer.setMediaTypeStrings(Collections.singletonList(entry.getMediaType()));
+            recorder.registerWriter(serialisers, entry.getEntityClass().getName(), writer);
+            reflectiveClassBuildItemBuildProducer
+                    .produce(new ReflectiveClassBuildItem(true, false, false, writerClass.getName()));
+        }
+
+    }
+
+    private String defaultMediaType(List<? extends MediaTypeWithPriority> defaultMediaTypes, String defaultMediaType) {
+        if (defaultMediaTypes == null || defaultMediaTypes.isEmpty()) {
+            return defaultMediaType;
+        }
+        defaultMediaTypes.sort(Comparator.comparingInt(MediaTypeWithPriority::getPriority));
+        return defaultMediaTypes.get(0).getMediaType();
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    public void registerInvocationCallbacks(CombinedIndexBuildItem index, ResteasyReactiveClientRecorder recorder) {
+
+        Collection<ClassInfo> invocationCallbacks = index.getComputingIndex()
+                .getAllKnownImplementors(ResteasyReactiveDotNames.INVOCATION_CALLBACK);
+
+        GenericTypeMapping genericTypeMapping = new GenericTypeMapping();
+        for (ClassInfo invocationCallback : invocationCallbacks) {
+            try {
+                List<Type> typeParameters = JandexUtil.resolveTypeParameters(invocationCallback.name(),
+                        ResteasyReactiveDotNames.INVOCATION_CALLBACK, index.getComputingIndex());
+                recorder.registerInvocationHandlerGenericType(genericTypeMapping, invocationCallback.name().toString(),
+                        typeParameters.get(0).name().toString());
+            } catch (Exception ignored) {
+
+            }
+        }
+        recorder.setGenericTypeMapping(genericTypeMapping);
+    }
+
+    /*
+       @formatter:off
+       Generates client stub, e.g. for the following interface:
+       ```
+       public interface BaseClient {
+          @GET
+          @Path("/base")
+          Response executeBaseGet();
+
+          @POST
+          @Path("/base")
+          Response executeBasePost();
+       }
+       ```
+       Generates the following (with MicroProfile enricher):
+       ```
+      public class BaseClient$$QuarkusRestClientInterface implements Closeable, BaseClient {
+         final WebTarget target1;
+         private final Method javaMethod1;
+         private final HeaderFiller headerFiller1;
+         final WebTarget target2;
+         private final Method javaMethod2;
+         private final HeaderFiller headerFiller2;
+      
+         public BaseClient$$QuarkusRestClientInterface(WebTarget var1) {
+            WebTarget var3 = var1.path("");
+            DefaultClientHeadersFactoryImpl var2 = new DefaultClientHeadersFactoryImpl();
+            MicroProfileRestClientRequestFilter var4 = new MicroProfileRestClientRequestFilter((ClientHeadersFactory)var2);
+            var3 = (WebTarget)((Configurable)var3).register(var4);
+            String var6 = "/base";
+            WebTarget var5 = var3.path(var6);
+            this.target1 = var5;
+            Class[] var7 = new Class[0];
+            Method var8 = BaseClient.class.getMethod("executeBasePost", var7);
+            this.javaMethod1 = var8;
+            NoOpHeaderFiller var9 = NoOpHeaderFiller.INSTANCE;
+            this.headerFiller1 = (HeaderFiller)var9;
+            String var11 = "/base";
+            WebTarget var10 = var3.path(var11);
+            this.target2 = var10;
+            Class[] var12 = new Class[0];
+            Method var13 = BaseClient.class.getMethod("executeBaseGet", var12);
+            this.javaMethod2 = var13;
+            NoOpHeaderFiller var14 = NoOpHeaderFiller.INSTANCE;
+            this.headerFiller2 = (HeaderFiller)var14;
+         }
+      
+         public Response executeBasePost() {
+            WebTarget var1 = this.target1;
+            String[] var2 = new String[]{"application/json"};
+            Builder var3 = var1.request(var2);
+            Method var4 = this.javaMethod1;
+            var3 = var3.property("org.eclipse.microprofile.rest.client.invokedMethod", var4);
+            HeaderFiller var5 = this.headerFiller1;
+            var3 = var3.property("io.quarkus.resteasy.reactive.client.microprofile.HeaderFiller", var5);
+      
+            try {
+               return (Response)var3.method("POST", Response.class);
+            } catch (ProcessingException var8) {
+               Throwable var7 = ((Throwable)var8).getCause();
+               if (!(var7 instanceof WebApplicationException)) {
+                  throw (Throwable)var8;
+               } else {
+                  throw var7;
+               }
+            }
+         }
+      
+         public Response executeBaseGet() {
+            WebTarget var1 = this.target2;
+            String[] var2 = new String[]{"application/json"};
+            Builder var3 = var1.request(var2);
+            Method var4 = this.javaMethod2;
+            var3 = var3.property("org.eclipse.microprofile.rest.client.invokedMethod", var4);
+            HeaderFiller var5 = this.headerFiller2;
+            var3 = var3.property("io.quarkus.resteasy.reactive.client.microprofile.HeaderFiller", var5);
+      
+            try {
+               return (Response)var3.method("GET", Response.class);
+            } catch (ProcessingException var8) {
+               Throwable var7 = ((Throwable)var8).getCause();
+               if (!(var7 instanceof WebApplicationException)) {
+                  throw (Throwable)var8;
+               } else {
+                  throw var7;
+               }
+            }
+         }
+      
+         public void close() {
+            ((WebTargetImpl)this.target1).getRestClient().close();
+            ((WebTargetImpl)this.target2).getRestClient().close();
+         }
+      }
+       ```
+
+       @formatter:on
+     */
+    private RuntimeValue<Function<WebTarget, ?>> generateClientInvoker(RecorderContext recorderContext,
+            RestClientInterface restClientInterface, List<JaxrsClientEnricherBuildItem> enrichers,
+            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer, ClassInfo interfaceClass,
+            IndexView index, String defaultMediaType) {
+        boolean subResource = false;
+        //if the interface contains sub resource locator methods we ignore it
+        // TODO: support subresources
+        for (ResourceMethod i : restClientInterface.getMethods()) {
+            if (i.getHttpMethod() == null) {
+                subResource = true;
+                break;
+            }
+        }
+        if (subResource) {
+            return null;
+        }
+
+        String name = restClientInterface.getClassName() + "$$QuarkusRestClientInterface";
+        MethodDescriptor ctorDesc = MethodDescriptor.ofConstructor(name, WebTarget.class.getName());
+        try (ClassCreator c = new ClassCreator(new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true),
+                name, null, Object.class.getName(),
+                Closeable.class.getName(), restClientInterface.getClassName())) {
+
+            //
+            // initialize basic WebTarget in constructor
+            //
+
+            MethodCreator constructor = c.getMethodCreator(ctorDesc);
+            constructor.invokeSpecialMethod(MethodDescriptor.ofConstructor(Object.class), constructor.getThis());
+
+            AssignableResultHandle baseTarget = constructor.createVariable(WebTarget.class);
+            constructor.assign(baseTarget,
+                    constructor.invokeInterfaceMethod(
+                            MethodDescriptor.ofMethod(WebTarget.class, "path", WebTarget.class, String.class),
+                            constructor.getMethodParam(0), constructor.load(restClientInterface.getPath())));
+
+            for (JaxrsClientEnricherBuildItem enricher : enrichers) {
+                enricher.getEnricher().forClass(constructor, baseTarget, interfaceClass, index);
+            }
+
+            //
+            // go through all the methods of the jaxrs interface. Create specific WebTargets (in the constructor) and methods
+            //
+            int methodIndex = 0;
+            List<FieldDescriptor> webTargets = new ArrayList<>();
+            for (ResourceMethod method : restClientInterface.getMethods()) {
+                methodIndex++;
+
+                // constructor: initializing the immutable part of the method-specific web target
+                FieldDescriptor webTargetForMethod = FieldDescriptor.of(name, "target" + methodIndex, WebTarget.class);
+                c.getFieldCreator(webTargetForMethod).setModifiers(Modifier.FINAL);
+                webTargets.add(webTargetForMethod);
+
+                AssignableResultHandle constructorTarget = createWebTargetForMethod(constructor, baseTarget, method);
+                constructor.writeInstanceField(webTargetForMethod, constructor.getThis(), constructorTarget);
+
+                // finding corresponding jandex method, used by enricher (MicroProfile enricher stores it in a field
+                // to later fill in context with corresponding java.lang.reflect.Method
+                String[] javaMethodParameters = new String[method.getParameters().length];
+                for (int i = 0; i < method.getParameters().length; i++) {
+                    MethodParameter param = method.getParameters()[i];
+                    javaMethodParameters[i] = param.declaredType != null ? param.declaredType : param.type;
+                }
+                MethodInfo jandexMethod = getJavaMethod(interfaceClass, method, method.getParameters(), index)
+                        .orElseThrow(() -> new RuntimeException(
+                                "Failed to find matching java method for " + method + " on " + interfaceClass
+                                        + ". It may have unresolved parameter types (generics)"));
+
+                // generate implementation for a method from jaxrs interface:
+                MethodCreator methodCreator = c.getMethodCreator(method.getName(), method.getSimpleReturnType(),
+                        javaMethodParameters);
+
+                AssignableResultHandle methodTarget = methodCreator.createVariable(WebTarget.class);
+                methodCreator.assign(methodTarget,
+                        methodCreator.readInstanceField(webTargetForMethod, methodCreator.getThis()));
+
+                Integer bodyParameterIdx = null;
+                Map<MethodDescriptor, ResultHandle> invocationBuilderEnrichers = new HashMap<>();
+
+                for (int paramIdx = 0; paramIdx < method.getParameters().length; ++paramIdx) {
+                    MethodParameter param = method.getParameters()[paramIdx];
+                    if (param.parameterType == ParameterType.QUERY) {
+                        //TODO: converters
+
+                        // query params have to be set on a method-level web target (they vary between invocations)
+                        methodCreator.assign(methodTarget, addQueryParam(methodCreator, methodTarget, param.name,
+                                methodCreator.getMethodParam(paramIdx)));
+                    } else if (param.parameterType == ParameterType.BEAN) {
+                        // bean params require both, web-target and Invocation.Builder, modifications
+                        // The web target changes have to be done on the method level.
+                        // Invocation.Builder changes are offloaded to a separate method
+                        // so that we can generate bytecode for both, web target and invocation builder modifications
+                        // at once
+                        ClientBeanParamInfo beanParam = (ClientBeanParamInfo) param;
+                        MethodDescriptor handleBeanParamDescriptor = MethodDescriptor.ofMethod(name,
+                                method.getName() + "$$" + methodIndex + "$$handleBeanParam$$" + paramIdx,
+                                Invocation.Builder.class,
+                                Invocation.Builder.class, param.type);
+                        MethodCreator handleBeanParamMethod = c.getMethodCreator(handleBeanParamDescriptor);
+
+                        AssignableResultHandle invocationBuilderRef = handleBeanParamMethod
+                                .createVariable(Invocation.Builder.class);
+                        handleBeanParamMethod.assign(invocationBuilderRef, handleBeanParamMethod.getMethodParam(0));
+                        addBeanParamData(methodCreator, handleBeanParamMethod,
+                                invocationBuilderRef, beanParam.getItems(),
+                                methodCreator.getMethodParam(paramIdx), methodTarget);
+
+                        handleBeanParamMethod.returnValue(invocationBuilderRef);
+                        invocationBuilderEnrichers.put(handleBeanParamDescriptor, methodCreator.getMethodParam(paramIdx));
+                    } else if (param.parameterType == ParameterType.PATH) {
+                        // methodTarget = methodTarget.resolveTemplate(paramname, paramvalue);
+                        methodCreator.assign(methodTarget,
+                                methodCreator.invokeInterfaceMethod(WEB_TARGET_RESOLVE_TEMPLATE_METHOD, methodTarget,
+                                        methodCreator.load(param.name), methodCreator.getMethodParam(paramIdx)));
+                    } else if (param.parameterType == ParameterType.BODY) {
+                        // just store the index of parameter used to create the body, we'll use it later
+                        bodyParameterIdx = paramIdx;
+                    } else if (param.parameterType == ParameterType.HEADER) {
+                        // headers are added at the invocation builder level
+                        MethodDescriptor handleHeaderDescriptor = MethodDescriptor.ofMethod(name,
+                                method.getName() + "$$" + methodIndex + "$$handleHeader$$" + paramIdx,
+                                Invocation.Builder.class,
+                                Invocation.Builder.class, param.type);
+                        MethodCreator handleHeaderMethod = c.getMethodCreator(handleHeaderDescriptor);
+
+                        AssignableResultHandle invocationBuilderRef = handleHeaderMethod
+                                .createVariable(Invocation.Builder.class);
+                        handleHeaderMethod.assign(invocationBuilderRef, handleHeaderMethod.getMethodParam(0));
+                        addHeaderParam(handleHeaderMethod, invocationBuilderRef, param.name,
+                                handleHeaderMethod.getMethodParam(1));
+                        handleHeaderMethod.returnValue(invocationBuilderRef);
+                        invocationBuilderEnrichers.put(handleHeaderDescriptor, methodCreator.getMethodParam(paramIdx));
+                    }
+                }
+
+                AssignableResultHandle builder = methodCreator.createVariable(Invocation.Builder.class);
+                if (method.getProduces() == null || method.getProduces().length == 0) { // this should never happen!
+                    methodCreator.assign(builder, methodCreator.invokeInterfaceMethod(
+                            MethodDescriptor.ofMethod(WebTarget.class, "request", Invocation.Builder.class), methodTarget));
+                } else {
+
+                    ResultHandle array = methodCreator.newArray(String.class, method.getProduces().length);
+                    for (int i = 0; i < method.getProduces().length; ++i) {
+                        methodCreator.writeArrayValue(array, i, methodCreator.load(method.getProduces()[i]));
+                    }
+                    methodCreator.assign(builder, methodCreator.invokeInterfaceMethod(
+                            MethodDescriptor.ofMethod(WebTarget.class, "request", Invocation.Builder.class, String[].class),
+                            methodTarget, array));
+                }
+
+                for (Map.Entry<MethodDescriptor, ResultHandle> invocationBuilderEnricher : invocationBuilderEnrichers
+                        .entrySet()) {
+                    methodCreator.assign(builder,
+                            methodCreator.invokeVirtualMethod(invocationBuilderEnricher.getKey(), methodCreator.getThis(),
+                                    builder, invocationBuilderEnricher.getValue()));
+                }
+
+                for (JaxrsClientEnricherBuildItem enricher : enrichers) {
+                    enricher.getEnricher()
+                            .forMethod(c, constructor, methodCreator, interfaceClass, jandexMethod, builder,
+                                    index, generatedClassBuildItemBuildProducer, methodIndex);
+                }
+
+                Type returnType = jandexMethod.returnType();
+                boolean completionStage = false;
+                String simpleReturnType = method.getSimpleReturnType();
+
+                ResultHandle genericReturnType = null;
+                if (returnType.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+
+                    ParameterizedType paramType = returnType.asParameterizedType();
+                    if (paramType.name().equals(COMPLETION_STAGE)) {
+                        completionStage = true;
+
+                        // CompletionStage has one type argument:
+                        if (paramType.arguments().isEmpty()) {
+                            simpleReturnType = Object.class.getName();
+                        } else {
+                            Type type = paramType.arguments().get(0);
+                            if (type.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+                                ResultHandle currentThread = methodCreator
+                                        .invokeStaticMethod(MethodDescriptors.THREAD_CURRENT_THREAD);
+                                ResultHandle tccl = methodCreator.invokeVirtualMethod(MethodDescriptors.THREAD_GET_TCCL,
+                                        currentThread);
+                                genericReturnType = Types.getParameterizedType(methodCreator, tccl, type.asParameterizedType());
+                            } else {
+                                simpleReturnType = type.toString();
+                            }
+                        }
+                    } else {
+                        ResultHandle currentThread = methodCreator.invokeStaticMethod(MethodDescriptors.THREAD_CURRENT_THREAD);
+                        ResultHandle tccl = methodCreator.invokeVirtualMethod(MethodDescriptors.THREAD_GET_TCCL, currentThread);
+                        ResultHandle parameterizedType = Types.getParameterizedType(methodCreator, tccl,
+                                paramType);
+
+                        genericReturnType = methodCreator.newInstance(
+                                MethodDescriptor.ofConstructor(GenericType.class, java.lang.reflect.Type.class),
+                                parameterizedType);
+                    }
+                }
+
+                ResultHandle result;
+
+                String mediaTypeValue = defaultMediaType;
+
+                // if a JAXRS method throws an exception, unwrap the ProcessingException and throw the exception instead
+                // Similarly with WebApplicationException
+                TryBlock tryBlock = methodCreator.tryBlock();
+
+                List<Type> exceptionTypes = jandexMethod.exceptions();
+                Set<DotName> exceptions = new HashSet<>();
+                exceptions.add(WEB_APPLICATION_EXCEPTION);
+                for (Type exceptionType : exceptionTypes) {
+                    exceptions.add(exceptionType.name());
+                }
+
+                CatchBlockCreator catchBlock = tryBlock.addCatch(ProcessingException.class);
+                ResultHandle caughtException = catchBlock.getCaughtException();
+                ResultHandle cause = catchBlock.invokeVirtualMethod(
+                        MethodDescriptor.ofMethod(Throwable.class, "getCause", Throwable.class),
+                        caughtException);
+                for (DotName exception : exceptions) {
+                    catchBlock.ifTrue(catchBlock.instanceOf(cause, exception.toString()))
+                            .trueBranch().throwException(cause);
+                }
+
+                catchBlock.throwException(caughtException);
+
+                if (bodyParameterIdx != null) {
+                    String[] consumes = method.getConsumes();
+                    if (consumes != null && consumes.length > 0) {
+
+                        if (consumes.length > 1) {
+                            throw new IllegalArgumentException(
+                                    "Multiple `@Consumes` values used in a MicroProfile Rest Client: " +
+                                            restClientInterface.getClassName()
+                                            + " Unable to determine a single `Content-Type`.");
+                        }
+                        mediaTypeValue = consumes[0];
+                    }
+                    ResultHandle mediaType = tryBlock.invokeStaticMethod(
+                            MethodDescriptor.ofMethod(MediaType.class, "valueOf", MediaType.class, String.class),
+                            tryBlock.load(mediaTypeValue));
+
+                    ResultHandle entity = tryBlock.invokeStaticMethod(
+                            MethodDescriptor.ofMethod(Entity.class, "entity", Entity.class, Object.class, MediaType.class),
+                            tryBlock.getMethodParam(bodyParameterIdx),
+                            mediaType);
+
+                    if (completionStage) {
+                        ResultHandle async = tryBlock.invokeInterfaceMethod(
+                                MethodDescriptor.ofMethod(Invocation.Builder.class, "async", AsyncInvoker.class),
+                                builder);
+                        // with entity
+                        if (genericReturnType != null) {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(CompletionStageRxInvoker.class, "method",
+                                            CompletionStage.class, String.class,
+                                            Entity.class, GenericType.class),
+                                    async, tryBlock.load(method.getHttpMethod()), entity,
+                                    genericReturnType);
+                        } else {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(CompletionStageRxInvoker.class, "method", CompletionStage.class,
+                                            String.class,
+                                            Entity.class, Class.class),
+                                    async, tryBlock.load(method.getHttpMethod()), entity,
+                                    tryBlock.loadClass(simpleReturnType));
+                        }
+                    } else {
+                        if (genericReturnType != null) {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(Invocation.Builder.class, "method", Object.class, String.class,
+                                            Entity.class, GenericType.class),
+                                    builder, tryBlock.load(method.getHttpMethod()), entity,
+                                    genericReturnType);
+                        } else {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(Invocation.Builder.class, "method", Object.class, String.class,
+                                            Entity.class, Class.class),
+                                    builder, tryBlock.load(method.getHttpMethod()), entity,
+                                    tryBlock.loadClass(simpleReturnType));
+                        }
+                    }
+                } else {
+
+                    if (completionStage) {
+                        ResultHandle async = tryBlock.invokeInterfaceMethod(
+                                MethodDescriptor.ofMethod(Invocation.Builder.class, "async", AsyncInvoker.class),
+                                builder);
+                        if (genericReturnType != null) {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(CompletionStageRxInvoker.class, "method",
+                                            CompletionStage.class, String.class,
+                                            GenericType.class),
+                                    async, tryBlock.load(method.getHttpMethod()), genericReturnType);
+                        } else {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(CompletionStageRxInvoker.class, "method", CompletionStage.class,
+                                            String.class,
+                                            Class.class),
+                                    async, tryBlock.load(method.getHttpMethod()),
+                                    tryBlock.loadClass(simpleReturnType));
+                        }
+                    } else {
+                        if (genericReturnType != null) {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(Invocation.Builder.class, "method", Object.class, String.class,
+                                            GenericType.class),
+                                    builder, tryBlock.load(method.getHttpMethod()), genericReturnType);
+                        } else {
+                            result = tryBlock.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(Invocation.Builder.class, "method", Object.class, String.class,
+                                            Class.class),
+                                    builder, tryBlock.load(method.getHttpMethod()),
+                                    tryBlock.loadClass(simpleReturnType));
+                        }
+                    }
+                }
+                tryBlock.returnValue(result);
+            }
+
+            constructor.returnValue(null);
+
+            // create `void close()` method:
+            MethodCreator closeCreator = c.getMethodCreator(MethodDescriptor.ofMethod(Closeable.class, "close", void.class));
+            for (FieldDescriptor target : webTargets) {
+                ResultHandle webTarget = closeCreator.readInstanceField(target, closeCreator.getThis());
+                ResultHandle webTargetImpl = closeCreator.checkCast(webTarget, WebTargetImpl.class);
+                ResultHandle restClient = closeCreator.invokeVirtualMethod(
+                        MethodDescriptor.ofMethod(WebTargetImpl.class, "getRestClient", ClientImpl.class), webTargetImpl);
+                closeCreator.invokeVirtualMethod(MethodDescriptor.ofMethod(ClientImpl.class, "close", void.class), restClient);
+            }
+            closeCreator.returnValue(null);
+        }
+        String creatorName = restClientInterface.getClassName() + "$$QuarkusRestClientInterfaceCreator";
+        try (ClassCreator c = new ClassCreator(new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true),
+                creatorName, null, Object.class.getName(), Function.class.getName())) {
+
+            MethodCreator apply = c
+                    .getMethodCreator(MethodDescriptor.ofMethod(creatorName, "apply", Object.class, Object.class));
+            apply.returnValue(apply.newInstance(ctorDesc, apply.getMethodParam(0)));
+        }
+        return recorderContext.newInstance(creatorName);
+
+    }
+
+    private AssignableResultHandle createWebTargetForMethod(MethodCreator constructor, AssignableResultHandle baseTarget,
+            ResourceMethod method) {
+        AssignableResultHandle target = constructor.createVariable(WebTarget.class);
+        constructor.assign(target, baseTarget);
+
+        if (method.getPath() != null) {
+            AssignableResultHandle path = constructor.createVariable(String.class);
+            constructor.assign(path, constructor.load(method.getPath()));
+            constructor.assign(target,
+                    constructor.invokeInterfaceMethod(
+                            MethodDescriptor.ofMethod(WebTarget.class, "path", WebTarget.class, String.class),
+                            target, path));
+        }
+        return target;
+    }
+
+    private Optional<MethodInfo> getJavaMethod(ClassInfo interfaceClass, ResourceMethod method,
+            MethodParameter[] parameters, IndexView index) {
+
+        for (MethodInfo methodInfo : interfaceClass.methods()) {
+            if (methodInfo.name().equals(method.getName()) && methodInfo.parameters().size() == parameters.length) {
+                boolean matches = true;
+                for (int i = 0; i < parameters.length; i++) {
+                    MethodParameter actualParam = parameters[i];
+                    Type parameterType = methodInfo.parameters().get(i);
+                    String declaredType = actualParam.declaredType != null ? actualParam.declaredType : actualParam.type;
+                    if (!declaredType.equals(parameterType.name().toString())) {
+                        matches = false;
+                        break;
+                    }
+                }
+                if (matches) {
+                    return Optional.of(methodInfo);
+                }
+            }
+        }
+
+        Optional<MethodInfo> maybeMethod = Optional.empty();
+        for (DotName interfaceName : interfaceClass.interfaceNames()) {
+            maybeMethod = getJavaMethod(index.getClassByName(interfaceName), method, parameters,
+                    index);
+            if (maybeMethod.isPresent()) {
+                break;
+            }
+        }
+        return maybeMethod;
+    }
+
+    private void addBeanParamData(BytecodeCreator methodCreator,
+            BytecodeCreator invocationBuilderEnricher, // Invocation.Builder executePut$$enrichInvocationBuilder${noOfBeanParam}(Invocation.Builder)
+            AssignableResultHandle invocationBuilder,
+            List<Item> beanParamItems,
+            ResultHandle param,
+            AssignableResultHandle target // can only be used in the current method, not in `invocationBuilderEnricher`
+    ) {
+        BytecodeCreator creator = methodCreator.ifNotNull(param).trueBranch();
+        BytecodeCreator invoEnricher = invocationBuilderEnricher.ifNotNull(invocationBuilderEnricher.getMethodParam(1))
+                .trueBranch();
+        for (Item item : beanParamItems) {
+            switch (item.type()) {
+                case BEAN_PARAM:
+                    BeanParamItem beanParamItem = (BeanParamItem) item;
+                    ResultHandle beanParamElementHandle = beanParamItem.extract(creator, param);
+                    addBeanParamData(creator, invoEnricher, invocationBuilder, beanParamItem.items(),
+                            beanParamElementHandle, target);
+                    break;
+                case QUERY_PARAM:
+                    QueryParamItem queryParam = (QueryParamItem) item;
+                    creator.assign(target,
+                            addQueryParam(creator, target, queryParam.name(), queryParam.extract(creator, param)));
+                    break;
+                case COOKIE:
+                    CookieParamItem cookieParam = (CookieParamItem) item;
+                    addCookieParam(invoEnricher, invocationBuilder,
+                            cookieParam.getCookieName(),
+                            cookieParam.extract(invoEnricher, invoEnricher.getMethodParam(1)));
+                    break;
+                case HEADER_PARAM:
+                    HeaderParamItem headerParam = (HeaderParamItem) item;
+                    addHeaderParam(invoEnricher, invocationBuilder,
+                            headerParam.getHeaderName(),
+                            headerParam.extract(invoEnricher, invoEnricher.getMethodParam(1)));
+                    break;
+                default:
+                    throw new IllegalStateException("Unimplemented"); // TODO form params, etc
+            }
+        }
+    }
+
+    // takes a result handle to target as one of the parameters, returns a result handle to a modified target
+    private ResultHandle addQueryParam(BytecodeCreator methodCreator,
+            ResultHandle target,
+            String paramName, ResultHandle queryParamHandle) {
+        ResultHandle array = methodCreator.newArray(Object.class, 1);
+        methodCreator.writeArrayValue(array, 0, queryParamHandle);
+        ResultHandle alteredTarget = methodCreator.invokeInterfaceMethod(
+                MethodDescriptor.ofMethod(WebTarget.class, "queryParam", WebTarget.class,
+                        String.class, Object[].class),
+                target, methodCreator.load(paramName), array);
+        return alteredTarget;
+    }
+
+    private void addHeaderParam(BytecodeCreator invoBuilderEnricher, AssignableResultHandle invocationBuilder,
+            String paramName, ResultHandle headerParamHandle) {
+        invoBuilderEnricher.assign(invocationBuilder,
+                invoBuilderEnricher.invokeInterfaceMethod(
+                        MethodDescriptor.ofMethod(Invocation.Builder.class, "header", Invocation.Builder.class, String.class,
+                                Object.class),
+                        invocationBuilder, invoBuilderEnricher.load(paramName), headerParamHandle));
+    }
+
+    private void addCookieParam(BytecodeCreator invoBuilderEnricher, AssignableResultHandle invocationBuilder,
+            String paramName, ResultHandle cookieParamHandle) {
+        invoBuilderEnricher.assign(invocationBuilder,
+                invoBuilderEnricher.invokeInterfaceMethod(
+                        MethodDescriptor.ofMethod(Invocation.Builder.class, "cookie", Invocation.Builder.class, String.class,
+                                String.class),
+                        invocationBuilder, invoBuilderEnricher.load(paramName), cookieParamHandle));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/MediaTypeWithPriority.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/MediaTypeWithPriority.java
new file mode 100644
index 0000000000000..1ed82bf0e9fc8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/MediaTypeWithPriority.java
@@ -0,0 +1,7 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+public interface MediaTypeWithPriority {
+    int getPriority();
+
+    String getMediaType();
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/RestClientDefaultConsumesBuildItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/RestClientDefaultConsumesBuildItem.java
new file mode 100644
index 0000000000000..e5a84bce27c06
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/RestClientDefaultConsumesBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class RestClientDefaultConsumesBuildItem extends MultiBuildItem implements MediaTypeWithPriority {
+    private final String defaultMediaType;
+    private final int priority;
+
+    public RestClientDefaultConsumesBuildItem(String defaultMediaType, int priority) {
+        this.defaultMediaType = defaultMediaType;
+        this.priority = priority;
+    }
+
+    @Override
+    public String getMediaType() {
+        return defaultMediaType;
+    }
+
+    @Override
+    public int getPriority() {
+        return priority;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/RestClientDefaultProducesBuildItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/RestClientDefaultProducesBuildItem.java
new file mode 100644
index 0000000000000..6ce6bef9cc035
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/RestClientDefaultProducesBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.client.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class RestClientDefaultProducesBuildItem extends MultiBuildItem implements MediaTypeWithPriority {
+    private final String defaultMediaType;
+    private final int priority;
+
+    public RestClientDefaultProducesBuildItem(String defaultMediaType, int priority) {
+        this.defaultMediaType = defaultMediaType;
+        this.priority = priority;
+    }
+
+    @Override
+    public String getMediaType() {
+        return defaultMediaType;
+    }
+
+    @Override
+    public int getPriority() {
+        return priority;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/BeanParamItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/BeanParamItem.java
new file mode 100644
index 0000000000000..6b7595f21d848
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/BeanParamItem.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import java.util.List;
+
+public class BeanParamItem extends Item {
+    private final List<Item> items;
+
+    public List<Item> items() {
+        return items;
+    }
+
+    public BeanParamItem(List<Item> items, ValueExtractor extractor) {
+        super(ItemType.BEAN_PARAM, extractor);
+        this.items = items;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/BeanParamParser.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/BeanParamParser.java
new file mode 100644
index 0000000000000..41a678ea539cf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/BeanParamParser.java
@@ -0,0 +1,119 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BEAN_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COOKIE_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.HEADER_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.QUERY_PARAM;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+public class BeanParamParser {
+    public static List<Item> parse(ClassInfo beanParamClass, IndexView index) {
+        List<Item> resultList = new ArrayList<>();
+        Map<DotName, List<AnnotationInstance>> annotations = beanParamClass.annotations();
+        List<AnnotationInstance> queryParams = annotations.get(QUERY_PARAM);
+        if (queryParams != null) {
+            for (AnnotationInstance annotation : queryParams) {
+                AnnotationTarget target = annotation.target();
+                if (target.kind() == AnnotationTarget.Kind.FIELD) {
+                    FieldInfo fieldInfo = target.asField();
+                    resultList.add(new QueryParamItem(annotation.value().asString(),
+                            new FieldExtractor(null, fieldInfo.name(), fieldInfo.declaringClass().name().toString())));
+                } else if (target.kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo getterMethod = getGetterMethod(beanParamClass, target.asMethod());
+                    resultList.add(new QueryParamItem(annotation.value().asString(),
+                            new GetterExtractor(getterMethod)));
+                }
+            }
+        }
+        List<AnnotationInstance> beanParams = annotations.get(BEAN_PARAM);
+        if (beanParams != null) {
+            for (AnnotationInstance annotation : beanParams) {
+                AnnotationTarget target = annotation.target();
+                if (target.kind() == AnnotationTarget.Kind.FIELD) {
+                    FieldInfo fieldInfo = target.asField();
+                    Type type = fieldInfo.type();
+                    if (type.kind() == Type.Kind.CLASS) {
+                        List<Item> subBeanParamItems = parse(index.getClassByName(type.asClassType().name()), index);
+                        resultList.add(new BeanParamItem(subBeanParamItems,
+                                new FieldExtractor(null, fieldInfo.name(), fieldInfo.declaringClass().name().toString())));
+                    } else {
+                        throw new IllegalArgumentException("BeanParam annotation used on a field that is not an object: "
+                                + beanParamClass.name() + "." + fieldInfo.name());
+                    }
+                } else if (target.kind() == AnnotationTarget.Kind.METHOD) {
+                    // this should be getter or setter
+                    MethodInfo methodInfo = target.asMethod();
+                    MethodInfo getter = getGetterMethod(beanParamClass, methodInfo);
+                    Type returnType = getter.returnType();
+                    List<Item> items = parse(index.getClassByName(returnType.name()), index);
+                    resultList.add(new BeanParamItem(items, new GetterExtractor(getter)));
+                }
+            }
+        }
+
+        List<AnnotationInstance> cookieParams = annotations.get(COOKIE_PARAM);
+        if (cookieParams != null) {
+            for (AnnotationInstance annotation : cookieParams) {
+                AnnotationTarget target = annotation.target();
+                if (target.kind() == AnnotationTarget.Kind.FIELD) {
+                    FieldInfo fieldInfo = target.asField();
+                    resultList.add(new CookieParamItem(annotation.value().asString(),
+                            new FieldExtractor(null, fieldInfo.name(), fieldInfo.declaringClass().name().toString())));
+                } else if (target.kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo getterMethod = getGetterMethod(beanParamClass, target.asMethod());
+                    resultList.add(new CookieParamItem(annotation.value().asString(),
+                            new GetterExtractor(getterMethod)));
+                }
+            }
+        }
+
+        List<AnnotationInstance> headerParams = annotations.get(HEADER_PARAM);
+        if (headerParams != null) {
+            for (AnnotationInstance queryParamAnnotation : headerParams) {
+                AnnotationTarget target = queryParamAnnotation.target();
+                if (target.kind() == AnnotationTarget.Kind.FIELD) {
+                    FieldInfo fieldInfo = target.asField();
+                    resultList.add(new HeaderParamItem(queryParamAnnotation.value().asString(),
+                            new FieldExtractor(null, fieldInfo.name(), fieldInfo.declaringClass().name().toString())));
+                } else if (target.kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo getterMethod = getGetterMethod(beanParamClass, target.asMethod());
+                    resultList.add(new HeaderParamItem(queryParamAnnotation.value().asString(),
+                            new GetterExtractor(getterMethod)));
+                }
+            }
+        }
+
+        return resultList;
+    }
+
+    private static MethodInfo getGetterMethod(ClassInfo beanParamClass, MethodInfo methodInfo) {
+        MethodInfo getter = null;
+        if (methodInfo.parameters().size() > 0) { // should be setter
+            // find the corresponding getter:
+            String setterName = methodInfo.name();
+            if (setterName.startsWith("set")) {
+                getter = beanParamClass.method(setterName.replace("^set", "^get"));
+            }
+        } else if (methodInfo.name().startsWith("get")) {
+            getter = methodInfo;
+        }
+
+        if (getter == null) {
+            throw new IllegalArgumentException(
+                    "No getter corresponding to " + methodInfo.declaringClass().name() + "#" + methodInfo.name() + " found");
+        }
+        return getter;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ClientBeanParamInfo.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ClientBeanParamInfo.java
new file mode 100644
index 0000000000000..6c4d10c308712
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ClientBeanParamInfo.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import java.util.List;
+
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+
+public class ClientBeanParamInfo extends MethodParameter {
+
+    private final List<Item> items;
+
+    public ClientBeanParamInfo(List<Item> items, String beanParamClass) {
+        this.items = items;
+        setType(beanParamClass);
+        setParameterType(ParameterType.BEAN);
+    }
+
+    public List<Item> getItems() {
+        return items;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/CookieParamItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/CookieParamItem.java
new file mode 100644
index 0000000000000..60e63c2d81ecf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/CookieParamItem.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+public class CookieParamItem extends Item {
+    private final String cookieName;
+
+    public CookieParamItem(String cookieName, ValueExtractor extractor) {
+        super(ItemType.COOKIE, extractor);
+        this.cookieName = cookieName;
+    }
+
+    public String getCookieName() {
+        return cookieName;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/FieldExtractor.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/FieldExtractor.java
new file mode 100644
index 0000000000000..a6ab46faacf4d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/FieldExtractor.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.resteasy.reactive.client.runtime.ReflectionUtil;
+
+public class FieldExtractor extends ValueExtractor {
+
+    final String companionClass;
+    private final String className;
+    private final String fieldName;
+
+    public FieldExtractor(String companionClass, String fieldName, String className) {
+        this.companionClass = companionClass;
+        this.fieldName = fieldName;
+        this.className = className;
+    }
+
+    @Override
+    ResultHandle extract(BytecodeCreator bytecodeCreator, ResultHandle containingObject) {
+        MethodDescriptor readField = MethodDescriptor.ofMethod(ReflectionUtil.class, "readField", Object.class, Object.class,
+                Class.class, String.class);
+        return bytecodeCreator.invokeStaticMethod(readField, containingObject, bytecodeCreator.loadClass(className),
+                bytecodeCreator.load(fieldName));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/GetterExtractor.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/GetterExtractor.java
new file mode 100644
index 0000000000000..8500e00aeedb1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/GetterExtractor.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+
+public class GetterExtractor extends ValueExtractor {
+
+    private final MethodInfo getterMethod;
+
+    public GetterExtractor(MethodInfo getterMethod) {
+        this.getterMethod = getterMethod;
+    }
+
+    @Override
+    ResultHandle extract(BytecodeCreator bytecodeCreator, ResultHandle containingObject) {
+        return bytecodeCreator.invokeVirtualMethod(getterMethod, containingObject);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/HeaderParamItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/HeaderParamItem.java
new file mode 100644
index 0000000000000..bd638aa66a417
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/HeaderParamItem.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+public class HeaderParamItem extends Item {
+    private final String headerName;
+
+    public HeaderParamItem(String headerName, ValueExtractor extractor) {
+        super(ItemType.HEADER_PARAM, extractor);
+        this.headerName = headerName;
+    }
+
+    public String getHeaderName() {
+        return headerName;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/Item.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/Item.java
new file mode 100644
index 0000000000000..3f1425b26817f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/Item.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+
+public abstract class Item {
+
+    private final ItemType type;
+    private final ValueExtractor valueExtractor;
+
+    public Item(ItemType type, ValueExtractor valueExtractor) {
+        this.type = type;
+        this.valueExtractor = valueExtractor;
+    }
+
+    public ItemType type() {
+        return type;
+    }
+
+    public ResultHandle extract(BytecodeCreator methodCreator, ResultHandle param) {
+        return valueExtractor.extract(methodCreator, param);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ItemType.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ItemType.java
new file mode 100644
index 0000000000000..e71cdcc9d9c4a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ItemType.java
@@ -0,0 +1,9 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+public enum ItemType {
+    BEAN_PARAM,
+    QUERY_PARAM,
+    COOKIE,
+    HEADER_PARAM,
+    // TODO: more
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/QueryParamItem.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/QueryParamItem.java
new file mode 100644
index 0000000000000..6ce6d8c4c56f9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/QueryParamItem.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+public class QueryParamItem extends Item {
+
+    private final String name;
+
+    public QueryParamItem(String name, ValueExtractor extractor) {
+        super(ItemType.QUERY_PARAM, extractor);
+        this.name = name;
+    }
+
+    public String name() {
+        return name;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ValueExtractor.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ValueExtractor.java
new file mode 100644
index 0000000000000..2d12eea4637a4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/main/java/io/quarkus/resteasy/reactive/client/deployment/beanparam/ValueExtractor.java
@@ -0,0 +1,8 @@
+package io.quarkus.resteasy.reactive.client.deployment.beanparam;
+
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
+
+abstract class ValueExtractor {
+    abstract ResultHandle extract(BytecodeCreator bytecodeCreator, ResultHandle containingObject);
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/test/java/io/quarkus/resteasy/reactive/client/deployment/test/UniInvokerTestCase.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/test/java/io/quarkus/resteasy/reactive/client/deployment/test/UniInvokerTestCase.java
new file mode 100644
index 0000000000000..5bc56c35ab232
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/deployment/src/test/java/io/quarkus/resteasy/reactive/client/deployment/test/UniInvokerTestCase.java
@@ -0,0 +1,66 @@
+package io.quarkus.resteasy.reactive.client.deployment.test;
+
+import java.net.URL;
+
+import javax.enterprise.event.Observes;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+
+import org.jboss.resteasy.reactive.client.impl.UniInvoker;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+public class UniInvokerTestCase {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Endpoint.class));
+
+    @TestHTTPResource
+    URL url;
+
+    private Client client;
+
+    @BeforeEach
+    public void before() {
+        client = ClientBuilder.newBuilder().build();
+    }
+
+    @AfterEach
+    public void after() {
+        client.close();
+    }
+
+    @Test
+    public void testInjection() {
+        Object data = client.target(url.toExternalForm() + "/hello").request().rx(UniInvoker.class).get().await()
+                .indefinitely();
+        Assertions.assertEquals("Hello World", data);
+    }
+
+    public static class Endpoint {
+
+        public void setup(@Observes Router router) {
+            router.route("/hello").handler(new Handler<RoutingContext>() {
+                @Override
+                public void handle(RoutingContext event) {
+                    event.response().end("Hello World");
+                }
+            });
+        }
+
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/pom.xml b/extensions/resteasy-reactive/quarkus-jaxrs-client/pom.xml
new file mode 100644
index 0000000000000..a674b23a2c13a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jaxrs-client-parent</artifactId>
+    <name>Quarkus - JAXRS Client</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/pom.xml
new file mode 100644
index 0000000000000..acfbb3333c336
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-jaxrs-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jaxrs-client</artifactId>
+    <name>Quarkus - JAXRS Client - Runtime</name>
+    <description>JAX-RS Client</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ClientResponseBuilderFactory.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ClientResponseBuilderFactory.java
new file mode 100644
index 0000000000000..bbfadf667e481
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ClientResponseBuilderFactory.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.client.runtime;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.client.impl.ClientResponseBuilderImpl;
+import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory;
+
+/**
+ * ResponseBuilderFactory used only when the server response builder factory is not available
+ */
+public class ClientResponseBuilderFactory implements ResponseBuilderFactory {
+    @Override
+    public Response.ResponseBuilder create() {
+        return new ClientResponseBuilderImpl();
+    }
+
+    @Override
+    public int priority() {
+        return 10; // lower than the server one
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ReflectionUtil.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ReflectionUtil.java
new file mode 100644
index 0000000000000..de8da45158034
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ReflectionUtil.java
@@ -0,0 +1,30 @@
+package io.quarkus.resteasy.reactive.client.runtime;
+
+import java.lang.reflect.Field;
+
+@SuppressWarnings("unused")
+public class ReflectionUtil {
+
+    private ReflectionUtil() {
+    }
+
+    /**
+     * Used by io.quarkus.resteasy.reactive.client.deployment.beanparam.FieldExtractor
+     *
+     * @param object object to read the field from
+     * @param clazz class that declares the field
+     * @param fieldName name of the field
+     * @return value of the field
+     */
+    public static Object readField(Object object, Class<?> clazz, String fieldName) {
+        try {
+            Field field = clazz.getDeclaredField(fieldName);
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            return field.get(object);
+        } catch (IllegalAccessException | NoSuchFieldException e) {
+            throw new IllegalArgumentException("Cannot read '" + fieldName + "' field from " + object + " of class " + clazz);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ResteasyReactiveClientContextResolver.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ResteasyReactiveClientContextResolver.java
new file mode 100644
index 0000000000000..6beee43890d1d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ResteasyReactiveClientContextResolver.java
@@ -0,0 +1,56 @@
+package io.quarkus.resteasy.reactive.client.runtime;
+
+import java.util.function.Supplier;
+
+import org.jboss.resteasy.reactive.client.impl.ClientProxies;
+import org.jboss.resteasy.reactive.client.impl.DefaultClientContext;
+import org.jboss.resteasy.reactive.client.spi.ClientContext;
+import org.jboss.resteasy.reactive.client.spi.ClientContextResolver;
+import org.jboss.resteasy.reactive.common.core.GenericTypeMapping;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+
+import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
+import io.vertx.core.Vertx;
+
+public class ResteasyReactiveClientContextResolver implements ClientContextResolver {
+    @Override
+    public ClientContext resolve(ClassLoader classLoader) {
+        return new ClientContext() {
+            @Override
+            public Serialisers getSerialisers() {
+                Serialisers serialisers = ResteasyReactiveClientRecorder.getSerialisers();
+                if (serialisers == null) {
+                    return DefaultClientContext.INSTANCE.getSerialisers();
+                }
+                return serialisers;
+            }
+
+            @Override
+            public GenericTypeMapping getGenericTypeMapping() {
+                GenericTypeMapping genericTypeMapping = ResteasyReactiveClientRecorder.getGenericTypeMapping();
+                if (genericTypeMapping == null) {
+                    return DefaultClientContext.INSTANCE.getGenericTypeMapping();
+                }
+                return genericTypeMapping;
+            }
+
+            @Override
+            public Supplier<Vertx> getVertx() {
+                Supplier<Vertx> vertx = VertxCoreRecorder.getVertx();
+                if (vertx == null) {
+                    return DefaultClientContext.INSTANCE.getVertx();
+                }
+                return vertx;
+            }
+
+            @Override
+            public ClientProxies getClientProxies() {
+                ClientProxies clientProxies = ResteasyReactiveClientRecorder.getClientProxies();
+                if (clientProxies == null) {
+                    return DefaultClientContext.INSTANCE.getClientProxies();
+                }
+                return clientProxies;
+            }
+        };
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ResteasyReactiveClientRecorder.java b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ResteasyReactiveClientRecorder.java
new file mode 100644
index 0000000000000..d5f9c62a18ff0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/java/io/quarkus/resteasy/reactive/client/runtime/ResteasyReactiveClientRecorder.java
@@ -0,0 +1,83 @@
+package io.quarkus.resteasy.reactive.client.runtime;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.client.WebTarget;
+
+import org.jboss.resteasy.reactive.client.impl.ClientProxies;
+import org.jboss.resteasy.reactive.client.impl.ClientSerialisers;
+import org.jboss.resteasy.reactive.common.core.GenericTypeMapping;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveCommonRecorder;
+import io.quarkus.runtime.ExecutorRecorder;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class ResteasyReactiveClientRecorder extends ResteasyReactiveCommonRecorder {
+
+    public static final Supplier<Executor> EXECUTOR_SUPPLIER = new Supplier<Executor>() {
+        @Override
+        public Executor get() {
+            return ExecutorRecorder.getCurrent();
+        }
+    };
+    private static volatile Serialisers serialisers;
+    private static volatile GenericTypeMapping genericTypeMapping;
+
+    private static volatile ClientProxies clientProxies = new ClientProxies(Collections.emptyMap(), Collections.emptyMap());
+
+    public static ClientProxies getClientProxies() {
+        return clientProxies;
+    }
+
+    public static Serialisers getSerialisers() {
+        return serialisers;
+    }
+
+    public static GenericTypeMapping getGenericTypeMapping() {
+        return genericTypeMapping;
+    }
+
+    public void setupClientProxies(Map<String, RuntimeValue<Function<WebTarget, ?>>> clientImplementations,
+            Map<String, String> failures) {
+        clientProxies = createClientImpls(clientImplementations, failures);
+    }
+
+    public Serialisers createSerializers() {
+        ClientSerialisers s = new ClientSerialisers();
+        s.registerBuiltins(RuntimeType.CLIENT);
+        serialisers = s;
+        return s;
+    }
+
+    private ClientProxies createClientImpls(Map<String, RuntimeValue<Function<WebTarget, ?>>> clientImplementations,
+            Map<String, String> failureMessages) {
+        Map<Class<?>, Function<WebTarget, ?>> map = new HashMap<>();
+        for (Map.Entry<String, RuntimeValue<Function<WebTarget, ?>>> entry : clientImplementations.entrySet()) {
+            map.put(loadClass(entry.getKey()), entry.getValue().getValue());
+        }
+        Map<Class<?>, String> failures = new HashMap<>();
+        for (Map.Entry<String, String> entry : failureMessages.entrySet()) {
+            failures.put(loadClass(entry.getKey()), entry.getValue());
+        }
+
+        return new ClientProxies(map, failures);
+    }
+
+    public void setGenericTypeMapping(GenericTypeMapping typeMapping) {
+        genericTypeMapping = typeMapping;
+    }
+
+    public void registerInvocationHandlerGenericType(GenericTypeMapping genericTypeMapping, String invocationHandlerClass,
+            String resolvedType) {
+        genericTypeMapping.addInvocationCallback(loadClass(invocationHandlerClass), loadClass(resolvedType));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000000000..2c6aca785cad8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.jboss.resteasy.reactive.client.impl.ClientBuilderImpl
diff --git a/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/resources/META-INF/services/org.jboss.resteasy.reactive.client.spi.ClientContextResolver b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/resources/META-INF/services/org.jboss.resteasy.reactive.client.spi.ClientContextResolver
new file mode 100644
index 0000000000000..c3a063de4a904
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-jaxrs-client/runtime/src/main/resources/META-INF/services/org.jboss.resteasy.reactive.client.spi.ClientContextResolver
@@ -0,0 +1 @@
+io.quarkus.resteasy.reactive.client.runtime.ResteasyReactiveClientContextResolver
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/pom.xml
new file mode 100644
index 0000000000000..dd4841d3ac674
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Common - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <!--  Move SSE tests into separate execution as they seem to be flaky, probably due to resource constraints in CI  -->
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>%regex[.*Sse.*Test.*]</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sse</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>%regex[.*Sse.*Test.*]</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ApplicationResultBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ApplicationResultBuildItem.java
new file mode 100644
index 0000000000000..b7e89913d54da
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ApplicationResultBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class ApplicationResultBuildItem extends SimpleBuildItem {
+
+    final ApplicationScanningResult result;
+
+    public ApplicationResultBuildItem(ApplicationScanningResult result) {
+        this.result = result;
+    }
+
+    public ApplicationScanningResult getResult() {
+        return result;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/FactoryUtils.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/FactoryUtils.java
new file mode 100644
index 0000000000000..1c9bb14dd2eed
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/FactoryUtils.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.Objects;
+import java.util.Set;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.resteasy.reactive.common.core.SingletonBeanFactory;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveCommonRecorder;
+
+public class FactoryUtils {
+    public static <T> BeanFactory<T> factory(ClassInfo providerClass, Set<String> singletons,
+            ResteasyReactiveCommonRecorder recorder,
+            BeanContainerBuildItem beanContainerBuildItem) {
+        return factory(providerClass.name().toString(), singletons, recorder, beanContainerBuildItem);
+    }
+
+    public static <T> BeanFactory<T> factory(String providerClass, Set<String> singletons,
+            ResteasyReactiveCommonRecorder recorder,
+            BeanContainerBuildItem beanContainerBuildItem) {
+        Objects.requireNonNull(providerClass, "providerClass cannot be null");
+        if (singletons.contains(providerClass)) {
+            return new SingletonBeanFactory<>(providerClass);
+        } else {
+            return recorder.factory(providerClass,
+                    beanContainerBuildItem.getValue());
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java
new file mode 100644
index 0000000000000..f682990015fa7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JsonDefaultProducersHandler.java
@@ -0,0 +1,50 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COLLECTION;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.LIST;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.MAP;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SET;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.processor.DefaultProducesHandler;
+
+public class JsonDefaultProducersHandler implements DefaultProducesHandler {
+
+    private static final List<MediaType> PRODUCES_APPLICATION_JSON = Collections.singletonList(MediaType.APPLICATION_JSON_TYPE);
+
+    private static final Set<DotName> SUPPORTED_JAVA_TYPES = new HashSet<>(Arrays.asList(COLLECTION, LIST, SET, MAP));
+
+    @Override
+    public List<MediaType> handle(Context context) {
+        if (context.config().isDefaultProduces() && isJsonCompatibleType(context)) {
+            return PRODUCES_APPLICATION_JSON;
+        }
+        return Collections.emptyList();
+    }
+
+    private boolean isJsonCompatibleType(Context context) {
+        Type type = context.nonAsyncReturnType();
+        // this doesn't catch every single case, but it should be good enough to cover most common cases
+        if ((type.kind() != Type.Kind.CLASS) && (type.kind() != Type.Kind.PARAMETERIZED_TYPE)) {
+            return false;
+        }
+        DotName dotName = type.name();
+        if (dotName.toString().startsWith("java")) {
+            return SUPPORTED_JAVA_TYPES.contains(dotName);
+        }
+        if (dotName.toString().startsWith("jakarta")) { // let's be forward compatible
+            return false;
+        }
+        // check if the class is an application class
+        return context.index().getClassByName(dotName) != null;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusFactoryCreator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusFactoryCreator.java
new file mode 100644
index 0000000000000..7c6672d649fb6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusFactoryCreator.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.function.Function;
+
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveCommonRecorder;
+
+public class QuarkusFactoryCreator implements Function<String, BeanFactory<Object>> {
+
+    final ResteasyReactiveCommonRecorder recorder;
+    final BeanContainer beanContainer;
+
+    public QuarkusFactoryCreator(ResteasyReactiveCommonRecorder recorder, BeanContainer beanContainer) {
+        this.recorder = recorder;
+        this.beanContainer = beanContainer;
+    }
+
+    @Override
+    public BeanFactory<Object> apply(String s) {
+        return recorder.factory(s, beanContainer);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java
new file mode 100644
index 0000000000000..a3c68765bc262
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/QuarkusResteasyReactiveDotNames.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+
+public class QuarkusResteasyReactiveDotNames {
+
+    public static final DotName HTTP_SERVER_REQUEST = DotName.createSimple(HttpServerRequest.class.getName());
+    public static final DotName HTTP_SERVER_RESPONSE = DotName.createSimple(HttpServerResponse.class.getName());
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceInterceptorsBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceInterceptorsBuildItem.java
new file mode 100644
index 0000000000000..ecb18b973c204
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceInterceptorsBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class ResourceInterceptorsBuildItem extends SimpleBuildItem {
+
+    private final ResourceInterceptors resourceInterceptors;
+
+    public ResourceInterceptorsBuildItem(ResourceInterceptors resourceInterceptors) {
+        this.resourceInterceptors = resourceInterceptors;
+    }
+
+    public ResourceInterceptors getResourceInterceptors() {
+        return resourceInterceptors;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceInterceptorsContributorBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceInterceptorsContributorBuildItem.java
new file mode 100644
index 0000000000000..c458e3af17de8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceInterceptorsContributorBuildItem.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.function.Consumer;
+
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class ResourceInterceptorsContributorBuildItem extends MultiBuildItem {
+
+    private final Consumer<ResourceInterceptors> buildTask;
+
+    public ResourceInterceptorsContributorBuildItem(Consumer<ResourceInterceptors> function) {
+        this.buildTask = function;
+    }
+
+    public Consumer<ResourceInterceptors> getBuildTask() {
+        return buildTask;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceScanningResultBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceScanningResultBuildItem.java
new file mode 100644
index 0000000000000..51e73b9bf6efa
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResourceScanningResultBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class ResourceScanningResultBuildItem extends SimpleBuildItem {
+
+    final ResourceScanningResult result;
+
+    public ResourceScanningResultBuildItem(ResourceScanningResult result) {
+        this.result = result;
+    }
+
+    public ResourceScanningResult getResult() {
+        return result;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
new file mode 100644
index 0000000000000..7b5716bac90d3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
@@ -0,0 +1,302 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.jaxrs.RuntimeDelegateImpl;
+import org.jboss.resteasy.reactive.common.model.InterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.PreMatchInterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptor;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult.KeepProviderResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveInterceptorScanner;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveScanner;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.PreAdditionalBeanBuildTimeConditionBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
+import io.quarkus.resteasy.reactive.common.runtime.JaxRsSecurityConfig;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfig;
+import io.quarkus.resteasy.reactive.spi.AbstractInterceptorBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContainerResponseFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
+import io.quarkus.resteasy.reactive.spi.ReaderInterceptorBuildItem;
+import io.quarkus.resteasy.reactive.spi.WriterInterceptorBuildItem;
+import io.quarkus.security.spi.AdditionalSecuredClassesBuildIem;
+import io.quarkus.security.spi.SecurityTransformerUtils;
+
+public class ResteasyReactiveCommonProcessor {
+
+    @BuildStep
+    void setUpDenyAllJaxRs(CombinedIndexBuildItem index,
+            JaxRsSecurityConfig config,
+            Optional<ResourceScanningResultBuildItem> resteasyDeployment,
+            BuildProducer<AdditionalSecuredClassesBuildIem> additionalSecuredClasses) {
+        if (config.denyJaxRs && resteasyDeployment.isPresent()) {
+            final List<ClassInfo> classes = new ArrayList<>();
+
+            Set<DotName> resourceClasses = resteasyDeployment.get().getResult().getScannedResourcePaths().keySet();
+            for (DotName className : resourceClasses) {
+                ClassInfo classInfo = index.getIndex().getClassByName(className);
+                if (!SecurityTransformerUtils.hasSecurityAnnotation(classInfo)) {
+                    classes.add(classInfo);
+                }
+            }
+
+            additionalSecuredClasses.produce(new AdditionalSecuredClassesBuildIem(classes));
+        }
+    }
+
+    @BuildStep
+    ApplicationResultBuildItem handleApplication(CombinedIndexBuildItem combinedIndexBuildItem,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            List<PreAdditionalBeanBuildTimeConditionBuildItem> buildTimeConditions,
+            ResteasyReactiveConfig config) {
+        // Use the "pre additional bean" build time conditions since we need to be able to filter the beans
+        // before actually adding them otherwise if we use normal build time conditions, we end up
+        // with a circular dependency
+        ApplicationScanningResult result = ResteasyReactiveScanner
+                .scanForApplicationClass(combinedIndexBuildItem.getComputingIndex(),
+                        config.buildTimeConditionAware ? getExcludedClasses(buildTimeConditions) : Collections.emptySet());
+        if (result.getSelectedAppClass() != null) {
+            reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, result.getSelectedAppClass().name().toString()));
+        }
+        return new ApplicationResultBuildItem(result);
+    }
+
+    @BuildStep
+    public ResourceInterceptorsContributorBuildItem scanForIOInterceptors(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem) {
+        return new ResourceInterceptorsContributorBuildItem(new Consumer<ResourceInterceptors>() {
+            @Override
+            public void accept(ResourceInterceptors interceptors) {
+                ResteasyReactiveInterceptorScanner.scanForIOInterceptors(interceptors,
+                        combinedIndexBuildItem.getComputingIndex(),
+                        applicationResultBuildItem.getResult());
+            }
+        });
+    }
+
+    @BuildStep
+    public ResourceInterceptorsBuildItem buildResourceInterceptors(List<ResourceInterceptorsContributorBuildItem> scanningTasks,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer,
+            List<WriterInterceptorBuildItem> writerInterceptors,
+            List<ReaderInterceptorBuildItem> readerInterceptors,
+            List<ContainerRequestFilterBuildItem> requestFilters,
+            List<ContainerResponseFilterBuildItem> responseFilters) {
+        ResourceInterceptors resourceInterceptors = new ResourceInterceptors();
+        for (ResourceInterceptorsContributorBuildItem i : scanningTasks) {
+            i.getBuildTask().accept(resourceInterceptors);
+        }
+        AdditionalBeanBuildItem.Builder beanBuilder = AdditionalBeanBuildItem.builder();
+        registerContainerBeans(beanBuilder, resourceInterceptors.getContainerResponseFilters());
+        registerContainerBeans(beanBuilder, resourceInterceptors.getContainerRequestFilters());
+        registerContainerBeans(beanBuilder, resourceInterceptors.getReaderInterceptors());
+        registerContainerBeans(beanBuilder, resourceInterceptors.getWriterInterceptors());
+        Set<String> globalNameBindings = applicationResultBuildItem.getResult().getGlobalNameBindings();
+        for (WriterInterceptorBuildItem i : writerInterceptors) {
+            registerInterceptors(globalNameBindings, resourceInterceptors.getWriterInterceptors(), i, beanBuilder);
+        }
+        for (ReaderInterceptorBuildItem i : readerInterceptors) {
+            registerInterceptors(globalNameBindings, resourceInterceptors.getReaderInterceptors(), i, beanBuilder);
+        }
+        for (ContainerRequestFilterBuildItem i : requestFilters) {
+            registerInterceptors(globalNameBindings, resourceInterceptors.getContainerRequestFilters(), i, beanBuilder);
+        }
+        for (ContainerResponseFilterBuildItem i : responseFilters) {
+            registerInterceptors(globalNameBindings, resourceInterceptors.getContainerResponseFilters(), i, beanBuilder);
+        }
+        additionalBeanBuildItemBuildProducer.produce(beanBuilder.setUnremovable().build());
+        return new ResourceInterceptorsBuildItem(resourceInterceptors);
+    }
+
+    protected <T, B extends AbstractInterceptorBuildItem> void registerInterceptors(Set<String> globalNameBindings,
+            InterceptorContainer<T> interceptors, B filterItem, AdditionalBeanBuildItem.Builder beanBuilder) {
+        if (filterItem.isRegisterAsBean()) {
+            beanBuilder.addBeanClass(filterItem.getClassName());
+        }
+        ResourceInterceptor<T> interceptor = interceptors.create();
+        interceptor.setClassName(filterItem.getClassName());
+        Integer priority = filterItem.getPriority();
+        if (priority != null) {
+            interceptor.setPriority(priority);
+        }
+        if (interceptors instanceof PreMatchInterceptorContainer
+                && ((ContainerRequestFilterBuildItem) filterItem).isPreMatching()) {
+            ((PreMatchInterceptorContainer<T>) interceptors).addPreMatchInterceptor(interceptor);
+
+        } else {
+            Set<String> nameBindingNames = filterItem.getNameBindingNames();
+            if (nameBindingNames.isEmpty() || namePresent(nameBindingNames, globalNameBindings)) {
+                interceptors.addGlobalRequestInterceptor(interceptor);
+            } else {
+                interceptor.setNameBindingNames(nameBindingNames);
+                interceptors.addNameRequestInterceptor(interceptor);
+            }
+        }
+    }
+
+    private void registerContainerBeans(AdditionalBeanBuildItem.Builder additionalProviders,
+            InterceptorContainer<?> container) {
+        for (ResourceInterceptor<?> i : container.getGlobalResourceInterceptors()) {
+            additionalProviders.addBeanClass(i.getClassName());
+        }
+        for (ResourceInterceptor<?> i : container.getNameResourceInterceptors()) {
+            additionalProviders.addBeanClass(i.getClassName());
+        }
+        if (container instanceof PreMatchInterceptorContainer) {
+            for (ResourceInterceptor<?> i : ((PreMatchInterceptorContainer<?>) container).getPreMatchInterceptors()) {
+                additionalProviders.addBeanClass(i.getClassName());
+            }
+        }
+    }
+
+    private boolean namePresent(Set<String> nameBindingNames, Set<String> globalNameBindings) {
+        for (String i : globalNameBindings) {
+            if (nameBindingNames.contains(i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @BuildStep
+    void scanResources(
+            // TODO: We need to use this index instead of BeanArchiveIndexBuildItem to avoid build cycles. It it OK?
+            CombinedIndexBuildItem combinedIndexBuildItem,
+            BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformerBuildItemBuildProducer,
+            BuildProducer<ResourceScanningResultBuildItem> resourceScanningResultBuildItemBuildProducer) {
+
+        ResourceScanningResult res = ResteasyReactiveScanner.scanResources(combinedIndexBuildItem.getComputingIndex());
+        if (res == null) {
+            return;
+        }
+        if (!res.getResourcesThatNeedCustomProducer().isEmpty()) {
+            annotationsTransformerBuildItemBuildProducer
+                    .produce(new AnnotationsTransformerBuildItem(
+                            new VetoingAnnotationTransformer(res.getResourcesThatNeedCustomProducer().keySet())));
+        }
+        resourceScanningResultBuildItemBuildProducer.produce(new ResourceScanningResultBuildItem(res));
+    }
+
+    @BuildStep
+    public void setupEndpoints(BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BeanContainerBuildItem beanContainerBuildItem,
+            Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<MessageBodyWriterBuildItem> messageBodyWriterBuildItemBuildProducer,
+            BuildProducer<MessageBodyReaderBuildItem> messageBodyReaderBuildItemBuildProducer) throws NoSuchMethodException {
+
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            // no detected @Path, bail out
+            return;
+        }
+
+        IndexView index = beanArchiveIndexBuildItem.getIndex();
+        Collection<ClassInfo> writers = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.MESSAGE_BODY_WRITER);
+        Collection<ClassInfo> readers = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.MESSAGE_BODY_READER);
+
+        for (ClassInfo writerClass : writers) {
+            KeepProviderResult keepProviderResult = applicationResultBuildItem.getResult().keepProvider(writerClass);
+            if (keepProviderResult != KeepProviderResult.DISCARD) {
+                RuntimeType runtimeType = null;
+                if (keepProviderResult == KeepProviderResult.SERVER_ONLY) {
+                    runtimeType = RuntimeType.SERVER;
+                }
+                List<String> mediaTypeStrings = Collections.emptyList();
+                AnnotationInstance producesAnnotation = writerClass.classAnnotation(ResteasyReactiveDotNames.PRODUCES);
+                if (producesAnnotation != null) {
+                    mediaTypeStrings = Arrays.asList(producesAnnotation.value().asStringArray());
+                }
+                List<Type> typeParameters = JandexUtil.resolveTypeParameters(writerClass.name(),
+                        ResteasyReactiveDotNames.MESSAGE_BODY_WRITER,
+                        index);
+                String writerClassName = writerClass.name().toString();
+                AnnotationInstance constrainedToInstance = writerClass.classAnnotation(ResteasyReactiveDotNames.CONSTRAINED_TO);
+                if (constrainedToInstance != null) {
+                    runtimeType = RuntimeType.valueOf(constrainedToInstance.value().asEnum());
+                }
+                messageBodyWriterBuildItemBuildProducer.produce(new MessageBodyWriterBuildItem(writerClassName,
+                        typeParameters.get(0).name().toString(), mediaTypeStrings, runtimeType, false));
+            }
+        }
+
+        for (ClassInfo readerClass : readers) {
+            KeepProviderResult keepProviderResult = applicationResultBuildItem.getResult().keepProvider(readerClass);
+            if (keepProviderResult != KeepProviderResult.DISCARD) {
+                List<Type> typeParameters = JandexUtil.resolveTypeParameters(readerClass.name(),
+                        ResteasyReactiveDotNames.MESSAGE_BODY_READER,
+                        index);
+                RuntimeType runtimeType = null;
+                if (keepProviderResult == KeepProviderResult.SERVER_ONLY) {
+                    runtimeType = RuntimeType.SERVER;
+                }
+                List<String> mediaTypeStrings = Collections.emptyList();
+                String readerClassName = readerClass.name().toString();
+                AnnotationInstance consumesAnnotation = readerClass.classAnnotation(ResteasyReactiveDotNames.CONSUMES);
+                if (consumesAnnotation != null) {
+                    mediaTypeStrings = Arrays.asList(consumesAnnotation.value().asStringArray());
+                }
+                AnnotationInstance constrainedToInstance = readerClass.classAnnotation(ResteasyReactiveDotNames.CONSTRAINED_TO);
+                if (constrainedToInstance != null) {
+                    runtimeType = RuntimeType.valueOf(constrainedToInstance.value().asEnum());
+                }
+                messageBodyReaderBuildItemBuildProducer.produce(new MessageBodyReaderBuildItem(readerClassName,
+                        typeParameters.get(0).name().toString(), mediaTypeStrings, runtimeType, false));
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, readerClassName));
+            }
+        }
+    }
+
+    @BuildStep
+    void registerRuntimeDelegateImpl(BuildProducer<ServiceProviderBuildItem> serviceProviders) {
+        serviceProviders.produce(new ServiceProviderBuildItem(RuntimeDelegate.class.getName(),
+                RuntimeDelegateImpl.class.getName()));
+    }
+
+    /**
+     * @param buildTimeConditions the build time conditions from which the excluded classes are extracted.
+     * @return the set of classes that have been annotated with unsuccessful build time conditions.
+     */
+    private static Set<String> getExcludedClasses(List<PreAdditionalBeanBuildTimeConditionBuildItem> buildTimeConditions) {
+        return buildTimeConditions.stream()
+                .filter(item -> !item.isEnabled())
+                .map(PreAdditionalBeanBuildTimeConditionBuildItem::getTarget)
+                .filter(target -> target.kind() == AnnotationTarget.Kind.CLASS)
+                .map(target -> target.asClass().toString())
+                .collect(Collectors.toSet());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java
new file mode 100644
index 0000000000000..ab449cab2be3e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/SerializersUtil.java
@@ -0,0 +1,61 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.List;
+
+import javax.ws.rs.RuntimeType;
+
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveCommonRecorder;
+import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
+import io.quarkus.resteasy.reactive.spi.RuntimeTypeItem;
+
+public class SerializersUtil {
+
+    public static void setupSerializers(ResteasyReactiveCommonRecorder recorder,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            List<MessageBodyReaderBuildItem> messageBodyReaderBuildItems,
+            List<MessageBodyWriterBuildItem> messageBodyWriterBuildItems,
+            BeanContainerBuildItem beanContainerBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            Serialisers serialisers, RuntimeType runtimeType) {
+
+        for (MessageBodyWriterBuildItem additionalWriter : RuntimeTypeItem.filter(messageBodyWriterBuildItems,
+                runtimeType)) {
+            ResourceWriter writer = new ResourceWriter();
+            writer.setBuiltin(additionalWriter.isBuiltin());
+            String writerClassName = additionalWriter.getClassName();
+            writer.setFactory(FactoryUtils.factory(writerClassName,
+                    applicationResultBuildItem.getResult().getSingletonClasses(), recorder,
+                    beanContainerBuildItem));
+            writer.setConstraint(additionalWriter.getRuntimeType());
+            if (!additionalWriter.getMediaTypeStrings().isEmpty()) {
+                writer.setMediaTypeStrings(additionalWriter.getMediaTypeStrings());
+            }
+            recorder.registerWriter(serialisers, additionalWriter.getHandledClassName(), writer);
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, writerClassName));
+        }
+        for (MessageBodyReaderBuildItem additionalReader : RuntimeTypeItem.filter(messageBodyReaderBuildItems,
+                runtimeType)) {
+            ResourceReader reader = new ResourceReader();
+            reader.setBuiltin(additionalReader.isBuiltin());
+            String readerClassName = additionalReader.getClassName();
+            reader.setFactory(FactoryUtils.factory(readerClassName,
+                    applicationResultBuildItem.getResult().getSingletonClasses(), recorder,
+                    beanContainerBuildItem));
+            reader.setConstraint(additionalReader.getRuntimeType());
+            if (!additionalReader.getMediaTypeStrings().isEmpty()) {
+                reader.setMediaTypeStrings(additionalReader.getMediaTypeStrings());
+            }
+            recorder.registerReader(serialisers, additionalReader.getHandledClassName(), reader);
+            reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, readerClassName));
+        }
+
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ServerDefaultProducesHandlerBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ServerDefaultProducesHandlerBuildItem.java
new file mode 100644
index 0000000000000..df63b714eeaf3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ServerDefaultProducesHandlerBuildItem.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import org.jboss.resteasy.reactive.common.processor.DefaultProducesHandler;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Enable the registration of additional default produces handlers for server endpoints
+ */
+public final class ServerDefaultProducesHandlerBuildItem extends MultiBuildItem {
+
+    private final DefaultProducesHandler defaultProducesHandler;
+
+    public ServerDefaultProducesHandlerBuildItem(DefaultProducesHandler defaultProducesHandler) {
+        this.defaultProducesHandler = defaultProducesHandler;
+    }
+
+    public DefaultProducesHandler getDefaultProducesHandler() {
+        return defaultProducesHandler;
+    }
+
+    public static ServerDefaultProducesHandlerBuildItem json() {
+        return new ServerDefaultProducesHandlerBuildItem(new JsonDefaultProducersHandler());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java
new file mode 100644
index 0000000000000..95badca93dd83
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/VetoingAnnotationTransformer.java
@@ -0,0 +1,37 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import java.util.Set;
+
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.DotName;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+
+import io.quarkus.arc.processor.AnnotationsTransformer;
+
+/**
+ * If a JAX-RS resource uses something like @QueryParam, @HeaderParam or the like in a constructor parameter,
+ * then we need to make sure that Arc doesn't create a bean for it automatically (as it will fail validation because
+ * there is no way to pass the parameter).
+ * For these resources we add {@link javax.enterprise.inject.Vetoed}, and we generate custom CDI producers under the hood
+ * in {@link CustomResourceProducersGenerator#generate}.
+ */
+public class VetoingAnnotationTransformer implements AnnotationsTransformer {
+
+    private final Set<DotName> resourcesThatNeedCustomProducer;
+
+    public VetoingAnnotationTransformer(Set<DotName> resourcesThatNeedCustomProducer) {
+        this.resourcesThatNeedCustomProducer = resourcesThatNeedCustomProducer;
+    }
+
+    @Override
+    public boolean appliesTo(AnnotationTarget.Kind kind) {
+        return AnnotationTarget.Kind.CLASS == kind;
+    }
+
+    @Override
+    public void transform(TransformationContext context) {
+        if (resourcesThatNeedCustomProducer.contains(context.getTarget().asClass().name())) {
+            context.transform().add(ResteasyReactiveDotNames.VETOED).done();
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/pom.xml
new file mode 100644
index 0000000000000..505b9b674f4c3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-common-parent</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Common</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+        <module>spi-deployment</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/pom.xml
new file mode 100644
index 0000000000000..abe382006375c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-common</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Common - Runtime</name>
+    <description>Common runtime parts of Quarkus RESTEasy Reactive</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java
new file mode 100644
index 0000000000000..0808558c0ca57
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+import io.quarkus.arc.runtime.BeanContainer;
+
+public class ArcBeanFactory<T> implements BeanFactory<T> {
+
+    private final BeanContainer.Factory<T> factory;
+    // for toString
+    private final String targetClassName;
+
+    public ArcBeanFactory(Class<T> target, BeanContainer beanContainer) {
+        targetClassName = target.getName();
+        factory = beanContainer.instanceFactory(target);
+    }
+
+    @Override
+    public String toString() {
+        return "ArcBeanFactory[" + targetClassName + "]";
+    }
+
+    @Override
+    public BeanInstance<T> createInstance() {
+        BeanContainer.Instance<T> instance = factory.create();
+        return new BeanInstance<T>() {
+            @Override
+            public T getInstance() {
+                return instance.get();
+            }
+
+            @Override
+            public void close() {
+                instance.close();
+            }
+        };
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcThreadSetupAction.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcThreadSetupAction.java
new file mode 100644
index 0000000000000..a64d3ae4d7901
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcThreadSetupAction.java
@@ -0,0 +1,46 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+import io.quarkus.arc.InjectableContext;
+import io.quarkus.arc.ManagedContext;
+
+public class ArcThreadSetupAction implements ThreadSetupAction {
+
+    private final ManagedContext managedContext;
+
+    public ArcThreadSetupAction(ManagedContext managedContext) {
+        this.managedContext = managedContext;
+    }
+
+    @Override
+    public ThreadState activateInitial() {
+        managedContext.activate();
+        InjectableContext.ContextState state = managedContext.getState();
+        return toThreadState(state);
+    }
+
+    private ThreadState toThreadState(InjectableContext.ContextState state) {
+        return new ThreadState() {
+            @Override
+            public void close() {
+                managedContext.destroy(state);
+            }
+
+            @Override
+            public void activate() {
+                managedContext.activate(state);
+            }
+
+            @Override
+            public void deactivate() {
+                managedContext.deactivate();
+            }
+        };
+    }
+
+    @Override
+    public ThreadState currentState() {
+        return toThreadState(managedContext.getState());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/JaxRsSecurityConfig.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/JaxRsSecurityConfig.java
new file mode 100644
index 0000000000000..781feb25b5715
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/JaxRsSecurityConfig.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
+ */
+@ConfigRoot(name = "security.jaxrs", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class JaxRsSecurityConfig {
+    /**
+     * if set to true, access to all JAX-RS resources will be denied by default
+     */
+    @ConfigItem(name = "deny-unannotated-endpoints")
+    public boolean denyJaxRs;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveCommonRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveCommonRecorder.java
new file mode 100644
index 0000000000000..1fdc0c5aa0467
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveCommonRecorder.java
@@ -0,0 +1,57 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class ResteasyReactiveCommonRecorder {
+    private static final Map<String, Class<?>> primitiveTypes;
+    static {
+        Map<String, Class<?>> prims = new HashMap<>();
+        prims.put(byte.class.getName(), byte.class);
+        prims.put(boolean.class.getName(), boolean.class);
+        prims.put(char.class.getName(), char.class);
+        prims.put(short.class.getName(), short.class);
+        prims.put(int.class.getName(), int.class);
+        prims.put(float.class.getName(), float.class);
+        prims.put(double.class.getName(), double.class);
+        prims.put(long.class.getName(), long.class);
+        primitiveTypes = Collections.unmodifiableMap(prims);
+    }
+
+    public <T> BeanFactory<T> factory(String targetClass, BeanContainer beanContainer) {
+        return new ArcBeanFactory<>(loadClass(targetClass),
+                beanContainer);
+    }
+
+    public void registerWriter(Serialisers serialisers, String entityClassName,
+            ResourceWriter writer) {
+        serialisers.addWriter(loadClass(entityClassName), writer);
+    }
+
+    public void registerReader(Serialisers serialisers, String entityClassName,
+            ResourceReader reader) {
+        serialisers.addReader(loadClass(entityClassName), reader);
+    }
+
+    protected static <T> Class<T> loadClass(String name) {
+        if (primitiveTypes.containsKey(name)) {
+            return (Class<T>) primitiveTypes.get(name);
+        }
+        try {
+            return (Class<T>) Class.forName(name, false, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfig.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfig.java
new file mode 100644
index 0000000000000..6e3405f60d495
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfig.java
@@ -0,0 +1,44 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.runtime.configuration.MemorySize;
+import io.smallrye.common.annotation.Experimental;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED, name = "rest")
+public class ResteasyReactiveConfig {
+
+    /**
+     * The amount of memory that can be used to buffer input before switching to
+     * blocking IO.
+     */
+    @ConfigItem(defaultValue = "10k")
+    public MemorySize inputBufferSize;
+
+    /**
+     * By default we assume a default produced media type of "text/plain"
+     * for String endpoint return types. If this is disabled, the default
+     * produced media type will be "[text/plain, *&sol;*]" which is more
+     * expensive due to negotiation.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean singleDefaultProduces;
+
+    /**
+     * When one of the quarkus-resteasy-reactive-jackson or quarkus-resteasy-reactive-jsonb extension are active
+     * and the result type of an endpoint is an application class or one of {@code Collection}, {@code List}, {@code Set} or
+     * {@code Map},
+     * we assume the default return type is "application/json" if this configuration is enabled.
+     */
+    @ConfigItem(defaultValue = "true")
+    @Experimental("This flag has a high probability of going away in the future")
+    public boolean defaultProduces;
+
+    /**
+     * Whether or not annotations such `@IfBuildTimeProfile`, `@IfBuildTimeProperty` and friends will be taken
+     * into account when used on JAX-RS classes.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean buildTimeConditionAware;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java
new file mode 100644
index 0000000000000..e8379dc1cb43f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/VertxBufferMessageBodyWriter.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+import io.vertx.core.buffer.Buffer;
+
+public class VertxBufferMessageBodyWriter implements MessageBodyWriter<Buffer> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public void writeTo(Buffer buffer, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        entityStream.write(buffer.getBytes());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..cab22db2f85ce
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,4 @@
+---
+name: "RESTEasy Reactive Common"
+metadata:
+  unlisted: true
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml
new file mode 100644
index 0000000000000..21c6eb7646eb2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-resteasy-reactive-common-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive - SPI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/AbstractInterceptorBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/AbstractInterceptorBuildItem.java
new file mode 100644
index 0000000000000..365a3a1ba38af
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/AbstractInterceptorBuildItem.java
@@ -0,0 +1,76 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public abstract class AbstractInterceptorBuildItem extends MultiBuildItem implements CheckBean {
+
+    private final String className;
+    private final Integer priority;
+    private final boolean registerAsBean;
+    private final Set<String> nameBindingNames;
+
+    protected AbstractInterceptorBuildItem(Builder<?, ?> builder) {
+        this.className = builder.className;
+        this.priority = builder.priority;
+        this.registerAsBean = builder.registerAsBean;
+        this.nameBindingNames = builder.nameBindingNames;
+    }
+
+    protected AbstractInterceptorBuildItem(String className) {
+        this.className = className;
+        this.priority = null;
+        this.registerAsBean = true;
+        this.nameBindingNames = Collections.emptySet();
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public Set<String> getNameBindingNames() {
+        return nameBindingNames;
+    }
+
+    @Override
+    public boolean isRegisterAsBean() {
+        return registerAsBean;
+    }
+
+    public static abstract class Builder<T extends AbstractInterceptorBuildItem, B extends Builder<T, B>> {
+        private final String className;
+
+        private Integer priority;
+        private boolean registerAsBean = true;
+        private Set<String> nameBindingNames = Collections.emptySet();
+
+        public Builder(String className) {
+            this.className = className;
+        }
+
+        public B setPriority(Integer priority) {
+            this.priority = priority;
+            return (B) this;
+        }
+
+        public B setRegisterAsBean(boolean registerAsBean) {
+            this.registerAsBean = registerAsBean;
+            return (B) this;
+        }
+
+        public B setNameBindingNames(Set<String> nameBindingNames) {
+            Objects.requireNonNull(nameBindingNames);
+            this.nameBindingNames = nameBindingNames;
+            return (B) this;
+        }
+
+        public abstract T build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CheckBean.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CheckBean.java
new file mode 100644
index 0000000000000..a41f52247f3d5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CheckBean.java
@@ -0,0 +1,6 @@
+package io.quarkus.resteasy.reactive.spi;
+
+public interface CheckBean {
+
+    boolean isRegisterAsBean();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContainerRequestFilterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContainerRequestFilterBuildItem.java
new file mode 100644
index 0000000000000..356291171e186
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContainerRequestFilterBuildItem.java
@@ -0,0 +1,37 @@
+package io.quarkus.resteasy.reactive.spi;
+
+public final class ContainerRequestFilterBuildItem extends AbstractInterceptorBuildItem {
+
+    private final boolean preMatching;
+
+    protected ContainerRequestFilterBuildItem(Builder builder) {
+        super(builder);
+        this.preMatching = builder.preMatching;
+    }
+
+    public ContainerRequestFilterBuildItem(String className) {
+        super(className);
+        this.preMatching = false;
+    }
+
+    public boolean isPreMatching() {
+        return preMatching;
+    }
+
+    public static final class Builder extends AbstractInterceptorBuildItem.Builder<ContainerRequestFilterBuildItem, Builder> {
+        boolean preMatching = false;
+
+        public Builder(String className) {
+            super(className);
+        }
+
+        public Builder setPreMatching(Boolean preMatching) {
+            this.preMatching = preMatching;
+            return this;
+        }
+
+        public ContainerRequestFilterBuildItem build() {
+            return new ContainerRequestFilterBuildItem(this);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContainerResponseFilterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContainerResponseFilterBuildItem.java
new file mode 100644
index 0000000000000..67334ef34d2c2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContainerResponseFilterBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.spi;
+
+public final class ContainerResponseFilterBuildItem extends AbstractInterceptorBuildItem {
+
+    protected ContainerResponseFilterBuildItem(AbstractInterceptorBuildItem.Builder<?, ?> builder) {
+        super(builder);
+    }
+
+    public static final class Builder extends AbstractInterceptorBuildItem.Builder<ContainerResponseFilterBuildItem, Builder> {
+
+        public Builder(String className) {
+            super(className);
+        }
+
+        public ContainerResponseFilterBuildItem build() {
+            return new ContainerResponseFilterBuildItem(this);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContextResolverBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContextResolverBuildItem.java
new file mode 100644
index 0000000000000..94704226ecefa
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ContextResolverBuildItem.java
@@ -0,0 +1,41 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import java.util.List;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class ContextResolverBuildItem extends MultiBuildItem implements CheckBean {
+
+    private final String className;
+    private final String providedType;
+    private final List<String> mediaTypes;
+    private final boolean registerAsBean;
+
+    public ContextResolverBuildItem(String className, List<String> mediaTypes, String providedType) {
+        this(className, providedType, mediaTypes, true);
+    }
+
+    public ContextResolverBuildItem(String className, String providedType, List<String> mediaTypes, boolean registerAsBean) {
+        this.className = className;
+        this.providedType = providedType;
+        this.mediaTypes = mediaTypes;
+        this.registerAsBean = registerAsBean;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    @Override
+    public boolean isRegisterAsBean() {
+        return registerAsBean;
+    }
+
+    public List<String> getMediaTypes() {
+        return mediaTypes;
+    }
+
+    public String getProvidedType() {
+        return providedType;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomContainerRequestFilterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomContainerRequestFilterBuildItem.java
new file mode 100644
index 0000000000000..b438bff395cc9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomContainerRequestFilterBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Build item used to register classes that are annotated with {@code @org.jboss.resteasy.reactive.server.ServerRequestFilter}
+ */
+public final class CustomContainerRequestFilterBuildItem extends MultiBuildItem {
+
+    private final String className;
+
+    public CustomContainerRequestFilterBuildItem(String className) {
+        this.className = className;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomContainerResponseFilterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomContainerResponseFilterBuildItem.java
new file mode 100644
index 0000000000000..d22bfc02aea3e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomContainerResponseFilterBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Build item used to register classes that are annotated with {@code @org.jboss.resteasy.reactive.server.ServerResponseFilter}
+ */
+public final class CustomContainerResponseFilterBuildItem extends MultiBuildItem {
+
+    private final String className;
+
+    public CustomContainerResponseFilterBuildItem(String className) {
+        this.className = className;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomExceptionMapperBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomExceptionMapperBuildItem.java
new file mode 100644
index 0000000000000..eb8d2a9d741dc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/CustomExceptionMapperBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Build item used to register classes that are annotated with {@code @org.jboss.resteasy.reactive.server.ServerExceptionMapper}
+ */
+public final class CustomExceptionMapperBuildItem extends MultiBuildItem {
+
+    private final String className;
+
+    public CustomExceptionMapperBuildItem(String className) {
+        this.className = className;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/DynamicFeatureBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/DynamicFeatureBuildItem.java
new file mode 100644
index 0000000000000..424b1a27383d4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/DynamicFeatureBuildItem.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+// TODO: we should really provide a better alternative than this...
+public final class DynamicFeatureBuildItem extends MultiBuildItem implements CheckBean {
+
+    private final String className;
+    private final boolean registerAsBean;
+
+    public DynamicFeatureBuildItem(String className) {
+        this(className, true);
+    }
+
+    public DynamicFeatureBuildItem(String className, boolean registerAsBean) {
+        this.className = className;
+        this.registerAsBean = registerAsBean;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    @Override
+    public boolean isRegisterAsBean() {
+        return registerAsBean;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ExceptionMapperBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ExceptionMapperBuildItem.java
new file mode 100644
index 0000000000000..727213f77799f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ExceptionMapperBuildItem.java
@@ -0,0 +1,69 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class ExceptionMapperBuildItem extends MultiBuildItem implements CheckBean {
+
+    private final String className;
+    private final Integer priority;
+    private final String handledExceptionName;
+    private final boolean registerAsBean;
+
+    public ExceptionMapperBuildItem(String className, String handledExceptionName, Integer priority, boolean registerAsBean) {
+        this.className = className;
+        this.priority = priority;
+        this.handledExceptionName = handledExceptionName;
+        this.registerAsBean = registerAsBean;
+    }
+
+    private ExceptionMapperBuildItem(Builder builder) {
+        this.className = builder.className;
+        this.handledExceptionName = builder.handledExceptionName;
+        this.priority = builder.priority;
+        this.registerAsBean = builder.registerAsBean;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public String getHandledExceptionName() {
+        return handledExceptionName;
+    }
+
+    @Override
+    public boolean isRegisterAsBean() {
+        return registerAsBean;
+    }
+
+    public static class Builder {
+        private final String className;
+        private final String handledExceptionName;
+
+        private Integer priority;
+        private boolean registerAsBean = true;
+
+        public Builder(String className, String handledExceptionName) {
+            this.className = className;
+            this.handledExceptionName = handledExceptionName;
+        }
+
+        public Builder setPriority(Integer priority) {
+            this.priority = priority;
+            return this;
+        }
+
+        public Builder setRegisterAsBean(boolean registerAsBean) {
+            this.registerAsBean = registerAsBean;
+            return this;
+        }
+
+        public ExceptionMapperBuildItem build() {
+            return new ExceptionMapperBuildItem(this);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/JaxrsFeatureBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/JaxrsFeatureBuildItem.java
new file mode 100644
index 0000000000000..9ef993300e237
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/JaxrsFeatureBuildItem.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+// TODO: we should really provide a better alternative than this...
+public final class JaxrsFeatureBuildItem extends MultiBuildItem implements CheckBean {
+
+    private final String className;
+    private final boolean registerAsBean;
+
+    public JaxrsFeatureBuildItem(String className) {
+        this(className, true);
+    }
+
+    public JaxrsFeatureBuildItem(String className, boolean registerAsBean) {
+        this.className = className;
+        this.registerAsBean = registerAsBean;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    @Override
+    public boolean isRegisterAsBean() {
+        return registerAsBean;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java
new file mode 100644
index 0000000000000..2c887e7adc592
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyReaderBuildItem.java
@@ -0,0 +1,50 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import java.util.List;
+
+import javax.ws.rs.RuntimeType;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class MessageBodyReaderBuildItem extends MultiBuildItem implements RuntimeTypeItem {
+
+    private final String className;
+    private final String handledClassName;
+    private final List<String> mediaTypeStrings;
+    private final RuntimeType runtimeType;
+    private final boolean builtin;
+
+    public MessageBodyReaderBuildItem(String className, String handledClassName, List<String> mediaTypeStrings) {
+        this(className, handledClassName, mediaTypeStrings, null, true);
+    }
+
+    public MessageBodyReaderBuildItem(String className, String handledClassName, List<String> mediaTypeStrings,
+            RuntimeType runtimeType, boolean builtin) {
+        this.className = className;
+        this.handledClassName = handledClassName;
+        this.mediaTypeStrings = mediaTypeStrings;
+        this.runtimeType = runtimeType;
+        this.builtin = builtin;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public String getHandledClassName() {
+        return handledClassName;
+    }
+
+    public List<String> getMediaTypeStrings() {
+        return mediaTypeStrings;
+    }
+
+    @Override
+    public RuntimeType getRuntimeType() {
+        return runtimeType;
+    }
+
+    public boolean isBuiltin() {
+        return builtin;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java
new file mode 100644
index 0000000000000..75c638501b3c8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/MessageBodyWriterBuildItem.java
@@ -0,0 +1,50 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import java.util.List;
+
+import javax.ws.rs.RuntimeType;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class MessageBodyWriterBuildItem extends MultiBuildItem implements RuntimeTypeItem {
+
+    private final String className;
+    private final String handledClassName;
+    private final List<String> mediaTypeStrings;
+    private final RuntimeType runtimeType;
+    private final boolean builtin;
+
+    public MessageBodyWriterBuildItem(String className, String handledClassName, List<String> mediaTypeStrings) {
+        this(className, handledClassName, mediaTypeStrings, null, false);
+    }
+
+    public MessageBodyWriterBuildItem(String className, String handledClassName, List<String> mediaTypeStrings,
+            RuntimeType runtimeType, boolean builtin) {
+        this.className = className;
+        this.handledClassName = handledClassName;
+        this.mediaTypeStrings = mediaTypeStrings;
+        this.runtimeType = runtimeType;
+        this.builtin = builtin;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public String getHandledClassName() {
+        return handledClassName;
+    }
+
+    public List<String> getMediaTypeStrings() {
+        return mediaTypeStrings;
+    }
+
+    @Override
+    public RuntimeType getRuntimeType() {
+        return runtimeType;
+    }
+
+    public boolean isBuiltin() {
+        return builtin;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ParamConverterBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ParamConverterBuildItem.java
new file mode 100644
index 0000000000000..db244f49c4080
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ParamConverterBuildItem.java
@@ -0,0 +1,29 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class ParamConverterBuildItem extends MultiBuildItem implements CheckBean {
+
+    private final String className;
+    private final int priority;
+    private final boolean registerAsBean;
+
+    public ParamConverterBuildItem(String className, int priority, boolean registerAsBean) {
+        this.className = className;
+        this.priority = priority;
+        this.registerAsBean = registerAsBean;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    @Override
+    public boolean isRegisterAsBean() {
+        return registerAsBean;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ReaderInterceptorBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ReaderInterceptorBuildItem.java
new file mode 100644
index 0000000000000..9b9edd15f3eef
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/ReaderInterceptorBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.spi;
+
+public final class ReaderInterceptorBuildItem extends AbstractInterceptorBuildItem {
+
+    protected ReaderInterceptorBuildItem(AbstractInterceptorBuildItem.Builder<?, ?> builder) {
+        super(builder);
+    }
+
+    public static final class Builder extends AbstractInterceptorBuildItem.Builder<ReaderInterceptorBuildItem, Builder> {
+
+        public Builder(String className) {
+            super(className);
+        }
+
+        public ReaderInterceptorBuildItem build() {
+            return new ReaderInterceptorBuildItem(this);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java
new file mode 100644
index 0000000000000..e601c795e1700
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/RuntimeTypeItem.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.RuntimeType;
+
+public interface RuntimeTypeItem {
+
+    /**
+     * Returns the runtime type for this build item. If the value is null
+     * then it applies to both server and client.
+     */
+    RuntimeType getRuntimeType();
+
+    static <T extends RuntimeTypeItem> Collection<T> filter(Collection<T> items, RuntimeType current) {
+        return items.stream().filter(s -> s.getRuntimeType() == null || s.getRuntimeType() == current)
+                .collect(Collectors.toList());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/WriterInterceptorBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/WriterInterceptorBuildItem.java
new file mode 100644
index 0000000000000..835d900421430
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/WriterInterceptorBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.spi;
+
+public final class WriterInterceptorBuildItem extends AbstractInterceptorBuildItem {
+
+    protected WriterInterceptorBuildItem(AbstractInterceptorBuildItem.Builder<?, ?> builder) {
+        super(builder);
+    }
+
+    public static final class Builder extends AbstractInterceptorBuildItem.Builder<WriterInterceptorBuildItem, Builder> {
+
+        public Builder(String className) {
+            super(className);
+        }
+
+        public WriterInterceptorBuildItem build() {
+            return new WriterInterceptorBuildItem(this);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/pom.xml
new file mode 100644
index 0000000000000..cf1b5424ddc54
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-jackson-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Jackson - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java
new file mode 100644
index 0000000000000..cec2063beaa77
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/main/java/io/quarkus/resteasy/reactive/jackson/deployment/processor/ResteasyReactiveJacksonProcessor.java
@@ -0,0 +1,129 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.processor;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+
+import com.fasterxml.jackson.annotation.JsonView;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.ServerDefaultProducesHandlerBuildItem;
+import io.quarkus.resteasy.reactive.jackson.CustomSerialization;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.JacksonMessageBodyReader;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.JacksonMessageBodyWriter;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx.VertxJsonArrayMessageBodyReader;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx.VertxJsonArrayMessageBodyWriter;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx.VertxJsonObjectMessageBodyReader;
+import io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx.VertxJsonObjectMessageBodyWriter;
+import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+public class ResteasyReactiveJacksonProcessor {
+
+    private static final DotName JSON_VIEW = DotName.createSimple(JsonView.class.getName());
+    private static final DotName CUSTOM_SERIALIZATION = DotName.createSimple(CustomSerialization.class.getName());
+
+    @BuildStep
+    void feature(BuildProducer<FeatureBuildItem> feature) {
+        feature.produce(new FeatureBuildItem(Feature.RESTEASY_REACTIVE_JACKSON));
+    }
+
+    @BuildStep
+    ServerDefaultProducesHandlerBuildItem jsonDefault() {
+        return ServerDefaultProducesHandlerBuildItem.json();
+    }
+
+    @BuildStep
+    void additionalProviders(BuildProducer<AdditionalBeanBuildItem> additionalBean,
+            BuildProducer<MessageBodyReaderBuildItem> additionalReaders,
+            BuildProducer<MessageBodyWriterBuildItem> additionalWriters) {
+        // make these beans to they can get instantiated with the Quarkus CDI configured Jsonb object
+        additionalBean.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(JacksonMessageBodyReader.class.getName())
+                .addBeanClass(JacksonMessageBodyWriter.class.getName())
+                .setUnremovable().build());
+
+        additionalReaders
+                .produce(new MessageBodyReaderBuildItem(JacksonMessageBodyReader.class.getName(), Object.class.getName(),
+                        Collections.singletonList(MediaType.APPLICATION_JSON)));
+        additionalReaders
+                .produce(new MessageBodyReaderBuildItem(VertxJsonArrayMessageBodyReader.class.getName(),
+                        JsonArray.class.getName(),
+                        Collections.singletonList(MediaType.APPLICATION_JSON)));
+        additionalReaders
+                .produce(new MessageBodyReaderBuildItem(VertxJsonObjectMessageBodyReader.class.getName(),
+                        JsonObject.class.getName(),
+                        Collections.singletonList(MediaType.APPLICATION_JSON)));
+        additionalWriters
+                .produce(new MessageBodyWriterBuildItem(JacksonMessageBodyWriter.class.getName(), Object.class.getName(),
+                        Collections.singletonList(MediaType.APPLICATION_JSON)));
+        additionalWriters
+                .produce(new MessageBodyWriterBuildItem(VertxJsonArrayMessageBodyWriter.class.getName(),
+                        JsonArray.class.getName(),
+                        Collections.singletonList(MediaType.APPLICATION_JSON)));
+        additionalWriters
+                .produce(new MessageBodyWriterBuildItem(VertxJsonObjectMessageBodyWriter.class.getName(),
+                        JsonObject.class.getName(),
+                        Collections.singletonList(MediaType.APPLICATION_JSON)));
+    }
+
+    @BuildStep
+    void handleJsonAnnotations(Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            CombinedIndexBuildItem index,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            return;
+        }
+        Collection<ClassInfo> resourceClasses = resourceScanningResultBuildItem.get().getResult().getScannedResources()
+                .values();
+        Set<String> classesNeedingReflectionOnMethods = new HashSet<>();
+        for (ClassInfo resourceClass : resourceClasses) {
+            DotName resourceClassDotName = resourceClass.name();
+            if (resourceClass.annotations().containsKey(JSON_VIEW)) {
+                classesNeedingReflectionOnMethods.add(resourceClassDotName.toString());
+            } else if (resourceClass.annotations().containsKey(CUSTOM_SERIALIZATION)) {
+                classesNeedingReflectionOnMethods.add(resourceClassDotName.toString());
+                for (AnnotationInstance instance : resourceClass.annotations().get(CUSTOM_SERIALIZATION)) {
+                    AnnotationValue annotationValue = instance.value();
+                    if (annotationValue != null) {
+                        Type biFunctionType = annotationValue.asClass();
+                        ClassInfo biFunctionClassInfo = index.getIndex().getClassByName(biFunctionType.name());
+                        if (biFunctionClassInfo == null) {
+                            // be lenient
+                        } else {
+                            if (!biFunctionClassInfo.hasNoArgsConstructor()) {
+                                throw new RuntimeException(
+                                        "Class '" + biFunctionClassInfo.name() + "' must contain a no-args constructor");
+                            }
+                        }
+                        reflectiveClass.produce(
+                                new ReflectiveClassBuildItem(true, false, false, biFunctionType.name().toString()));
+                    }
+                }
+            }
+        }
+        if (!classesNeedingReflectionOnMethods.isEmpty()) {
+            reflectiveClass.produce(
+                    new ReflectiveClassBuildItem(true, false, classesNeedingReflectionOnMethods.toArray(new String[0])));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cheese.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cheese.java
new file mode 100644
index 0000000000000..e45bc5adbffbc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Cheese.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+public class Cheese {
+
+    // private is what's causing the exception
+    private final String name;
+
+    public Cheese(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Cheese: " + name;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java
new file mode 100644
index 0000000000000..7cc108929dff1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/CheeseEndpoint.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("cheese")
+public class CheeseEndpoint {
+
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN })
+    @GET
+    public Cheese get() {
+        return new Cheese("Morbier");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderTest.java
new file mode 100644
index 0000000000000..f2beddab345e0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInReaderTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ExceptionInReaderTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(FroMage.class, FroMageEndpoint.class);
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.with().contentType("application/json").body("{\"name\": \"brie\"}").put("/fromage")
+                .then().statusCode(400);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInWriterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInWriterTest.java
new file mode 100644
index 0000000000000..2ab992b10d2db
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/ExceptionInWriterTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ExceptionInWriterTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Cheese.class, CheeseEndpoint.class);
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.with().header("Accept", "text/plain", "application/json").get("/cheese")
+                .then().statusCode(500);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java
new file mode 100644
index 0000000000000..f68185fd00b62
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FormData.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.RestForm;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+
+public class FormData {
+
+    @RestForm
+    @PartType(MediaType.APPLICATION_JSON)
+    public Map<String, Object> map;
+
+    @RestForm
+    @PartType(MediaType.APPLICATION_JSON)
+    public Person person;
+
+    @RestForm("htmlFile")
+    private FileUpload htmlPart;
+
+    public FileUpload getHtmlPart() {
+        return htmlPart;
+    }
+
+    public void setHtmlPart(FileUpload htmlPart) {
+        this.htmlPart = htmlPart;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMage.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMage.java
new file mode 100644
index 0000000000000..b0770514f40e0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMage.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+public class FroMage {
+    public String name;
+
+    // required for Jackson
+    // public FroMage() {}
+    public FroMage(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "FroMage: " + name;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java
new file mode 100644
index 0000000000000..6271bbd4f8e79
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/FroMageEndpoint.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("fromage")
+public class FroMageEndpoint {
+
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @PUT
+    public FroMage putJson(FroMage fromage) {
+        return fromage;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java
new file mode 100644
index 0000000000000..241273065f604
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartResource.java
@@ -0,0 +1,32 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.MultipartForm;
+
+import io.smallrye.common.annotation.Blocking;
+
+@Path("/multipart")
+public class MultipartResource {
+
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Blocking
+    @Path("/json")
+    public Map<String, Object> greeting(@MultipartForm FormData formData) {
+        Map<String, Object> result = new HashMap<>(formData.map);
+        result.put("person", formData.person);
+        result.put("htmlFileSize", formData.getHtmlPart().size());
+        result.put("htmlFilePath", formData.getHtmlPart().uploadedFile().toAbsolutePath().toString());
+        result.put("htmlFileContentType", formData.getHtmlPart().contentType());
+        return result;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartTest.java
new file mode 100644
index 0000000000000..c3984d530706a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/MultipartTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class MultipartTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(FormData.class, Person.class, MultipartResource.class)
+                            .addAsResource(new StringAsset("quarkus.http.body.delete-uploaded-files-on-end=true\n"),
+                                    "application.properties");
+                }
+
+            });
+
+    private final File HTML_FILE = new File("./src/test/resources/test.html");
+
+    @Test
+    public void test() throws IOException {
+        RestAssured.given()
+                .multiPart("map",
+                        "{\n" +
+                                "  \"foo\": \"bar\",\n" +
+                                "  \"sub\": {\n" +
+                                "    \"foo2\": \"bar2\"\n" +
+                                "  }\n" +
+                                "}")
+                .multiPart("person", "{\"first\": \"Bob\", \"last\": \"Builder\"}", "application/json")
+                .multiPart("htmlFile", HTML_FILE, "text/html")
+                .accept("application/json")
+                .when()
+                .post("/multipart/json")
+                .then()
+                .statusCode(200)
+                .body("foo", equalTo("bar"))
+                .body("sub.foo2", equalTo("bar2"))
+                .body("person.first", equalTo("Bob"))
+                .body("person.last", equalTo("Builder"))
+                .body("htmlFileSize", equalTo(Files.readAllBytes(HTML_FILE.toPath()).length))
+                .body("htmlFilePath", not(equalTo(HTML_FILE.toPath().toAbsolutePath().toString())))
+                .body("htmlFileContentType", equalTo("text/html"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java
new file mode 100644
index 0000000000000..53ecc04fe1b1e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/NoopReaderInterceptor.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.io.IOException;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
+
+@Provider
+public class NoopReaderInterceptor implements ReaderInterceptor {
+
+    @Override
+    public Object aroundReadFrom(ReaderInterceptorContext context) throws IOException, WebApplicationException {
+        return context.proceed();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java
new file mode 100644
index 0000000000000..d1c5a5329681b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Person.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import javax.validation.constraints.NotBlank;
+
+public class Person {
+
+    private String first;
+
+    @NotBlank(message = "Title cannot be blank")
+    private String last;
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getLast() {
+        return last;
+    }
+
+    public void setLast(String last) {
+        this.last = last;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java
new file mode 100644
index 0000000000000..9df7219b1292a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java
@@ -0,0 +1,257 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+
+import javax.validation.Valid;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.json.JsonWriteFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import io.quarkus.resteasy.reactive.jackson.CustomSerialization;
+import io.quarkus.runtime.BlockingOperationControl;
+import io.smallrye.mutiny.Multi;
+
+@Path("/simple")
+public class SimpleJsonResource extends SuperClass<Person> {
+
+    @ServerExceptionMapper
+    public Response handleParseException(JsonParseException jpe) {
+        return Response.status(Response.Status.BAD_REQUEST).entity(jpe.getMessage()).build();
+    }
+
+    @GET
+    @Path("/person")
+    public Person getPerson() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        return person;
+    }
+
+    @CustomSerialization(UnquotedFieldsPersonBiFunction.class)
+    @GET
+    @Path("custom-serialized-person")
+    public Person getCustomSerializedPerson() {
+        return getPerson();
+    }
+
+    @POST
+    @Path("/person")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Person getPerson(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return person;
+    }
+
+    @POST
+    @Path("/person-custom-mt")
+    @Produces("application/vnd.quarkus.person-v1+json")
+    @Consumes("application/vnd.quarkus.person-v1+json")
+    public Person getPersonCustomMediaType(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return person;
+    }
+
+    @POST
+    @Path("/person-custom-mt-response")
+    @Produces("application/vnd.quarkus.person-v1+json")
+    @Consumes("application/vnd.quarkus.person-v1+json")
+    public Response getPersonCustomMediaTypeResponse(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return Response.ok(person).status(201).build();
+    }
+
+    @POST
+    @Path("/person-custom-mt-response-with-type")
+    @Produces("application/vnd.quarkus.person-v1+json")
+    @Consumes("application/vnd.quarkus.person-v1+json")
+    public Response getPersonCustomMediaTypeResponseWithType(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return Response.ok(person).status(201).header("Content-Type", "application/vnd.quarkus.other-v1+json").build();
+    }
+
+    @POST
+    @Path("/people")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public List<Person> getPeople(List<Person> people) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        List<Person> reversed = new ArrayList<>(people.size());
+        for (Person person : people) {
+            reversed.add(0, person);
+        }
+        return reversed;
+    }
+
+    @CustomSerialization(UnquotedFieldsPersonBiFunction.class)
+    @POST
+    @Path("/custom-serialized-people")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public List<Person> getCustomSerializedPeople(List<Person> people) {
+        return getPeople(people);
+    }
+
+    @POST
+    @Path("/strings")
+    public List<String> strings(List<String> strings) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return strings;
+    }
+
+    @POST
+    @Path("/person-large")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Person personTest(Person person) {
+        //large requests should get bumped from the IO thread
+        if (!BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should have dispatched");
+        }
+        return person;
+    }
+
+    @POST
+    @Path("/person-validated")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Person getValidatedPerson(@Valid Person person) {
+        return person;
+    }
+
+    @POST
+    @Path("/person-invalid-result")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Valid
+    public Person getInvalidPersonResult(@Valid Person person) {
+        person.setLast(null);
+        return person;
+    }
+
+    @GET
+    @Path("/async-person")
+    @Produces(MediaType.APPLICATION_JSON)
+    public void getPerson(@Suspended AsyncResponse response) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Person person = new Person();
+                person.setFirst("Bob");
+                person.setLast("Builder");
+                response.resume(person);
+            }
+        }).start();
+    }
+
+    @GET
+    @Path("/user-without-view")
+    public User userWithoutView() {
+        return testUser();
+    }
+
+    @JsonView(Views.Public.class)
+    @GET
+    @Path("/user-with-public-view")
+    public User userWithPublicView() {
+        return testUser();
+    }
+
+    @JsonView(Views.Private.class)
+    @GET
+    @Path("/user-with-private-view")
+    public User userWithPrivateView() {
+        return testUser();
+    }
+
+    @CustomSerialization(UnquotedFieldsPersonBiFunction.class)
+    @GET
+    @Path("/invalid-use-of-custom-serializer")
+    public User invalidUseOfCustomSerializer() {
+        return testUser();
+    }
+
+    private User testUser() {
+        User user = new User();
+        user.id = 1;
+        user.name = "test";
+        return user;
+    }
+
+    @GET
+    @Path("/multi1")
+    public Multi<Person> getMulti1() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        return Multi.createFrom().items(person);
+    }
+
+    @GET
+    @Path("/multi2")
+    public Multi<Person> getMulti2() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        Person person2 = new Person();
+        person2.setFirst("Bob2");
+        person2.setLast("Builder2");
+        return Multi.createFrom().items(person, person2);
+    }
+
+    @GET
+    @Path("/multi0")
+    public Multi<Person> getMulti0() {
+        return Multi.createFrom().empty();
+    }
+
+    public static class UnquotedFieldsPersonBiFunction implements BiFunction<ObjectMapper, Type, ObjectWriter> {
+
+        public static final AtomicInteger count = new AtomicInteger();
+
+        public UnquotedFieldsPersonBiFunction() {
+            count.incrementAndGet();
+        }
+
+        @Override
+        public ObjectWriter apply(ObjectMapper objectMapper, Type type) {
+            if (type instanceof ParameterizedType) {
+                type = ((ParameterizedType) type).getActualTypeArguments()[0];
+            }
+            if (!type.getTypeName().equals(Person.class.getName())) {
+                throw new IllegalArgumentException("Only Person type can be handled");
+            }
+            return objectMapper.writer().without(JsonWriteFeature.QUOTE_FIELD_NAMES);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java
new file mode 100644
index 0000000000000..493650f4034f9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonTest.java
@@ -0,0 +1,296 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class SimpleJsonTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Person.class, SimpleJsonResource.class, User.class, Views.class, SuperClass.class,
+                                    NoopReaderInterceptor.class);
+                }
+            });
+
+    @Test
+    public void testJson() {
+        RestAssured.get("/simple/person")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .header("transfer-encoding", nullValue())
+                .header("content-length", notNullValue())
+                .body("first", Matchers.equalTo("Bob"))
+                .body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/person")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .header("content-length", notNullValue())
+                .header("transfer-encoding", nullValue())
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .post("/simple/person-custom-mt")
+                .then()
+                .statusCode(200)
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .post("/simple/person-custom-mt-response")
+                .then()
+                .statusCode(201)
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .post("/simple/person-custom-mt-response-with-type")
+                .then()
+                .statusCode(201)
+                .contentType("application/vnd.quarkus.other-v1+json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("[{\"first\": \"Bob\", \"last\": \"Builder\"}, {\"first\": \"Bob2\", \"last\": \"Builder2\"}]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/people")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[1].first", Matchers.equalTo("Bob"))
+                .body("[1].last", Matchers.equalTo("Builder"))
+                .body("[0].first", Matchers.equalTo("Bob2"))
+                .body("[0].last", Matchers.equalTo("Builder2"));
+
+        RestAssured.with()
+                .body("[\"first\", \"second\"]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/strings")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0]", Matchers.equalTo("first"))
+                .body("[1]", Matchers.equalTo("second"));
+
+        RestAssured
+                .with()
+                .body("[{\"first\": \"Bob\", \"last\": \"Builder\"}, {\"first\": \"Bob2\", \"last\": \"Builder2\"}]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/super")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[1].first", Matchers.equalTo("Bob"))
+                .body("[1].last", Matchers.equalTo("Builder"))
+                .body("[0].first", Matchers.equalTo("Bob2"))
+                .body("[0].last", Matchers.equalTo("Builder2"));
+    }
+
+    @Test
+    public void testLargeJsonPost() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10000; ++i) {
+            sb.append("abc");
+        }
+        String longString = sb.toString();
+        RestAssured
+                .with()
+                .body("{\"first\": \"" + longString + "\", \"last\": \"" + longString + "\"}")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/person-large")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("first", Matchers.equalTo(longString)).body("last", Matchers.equalTo(longString));
+    }
+
+    @Test
+    public void testValidatedJson() {
+        String postBody = "{\"first\": \"Bob\", \"last\": \"Builder\"}";
+        RestAssured
+                .with()
+                .body(postBody)
+                .contentType("application/json")
+                .post("/simple/person-validated")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body(postBody)
+                .contentType("application/json")
+                .post("/simple/person-invalid-result")
+                .then()
+                .statusCode(500)
+                .contentType("application/json");
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\"}")
+                .contentType("application/json")
+                .post("/simple/person-validated")
+                .then()
+                .statusCode(400)
+                .contentType("application/json");
+    }
+
+    @Test
+    public void testAsyncJson() {
+        RestAssured.get("/simple/async-person")
+                .then().body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+    }
+
+    // when there is no view defined, Jackson will serialize all fields
+    @Test
+    public void testUserWithoutView() {
+        RestAssured.get("/simple/user-without-view")
+                .then().body(containsString("1"), containsString("test"));
+    }
+
+    @Test
+    public void testUserWithPublicView() {
+        RestAssured.get("/simple/user-with-public-view")
+                .then().body(not(containsString("1")), containsString("test"));
+    }
+
+    @Test
+    public void testUserWithPrivateView() {
+        RestAssured.get("/simple/user-with-private-view")
+                .then().body(containsString("1"), containsString("test"));
+    }
+
+    @Test
+    public void testPerClassExceptionMapper() {
+        RestAssured
+                .with()
+                .body("{\"first\": Bob, \"last\": \"Builder\"}")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/person")
+                .then()
+                .statusCode(400)
+                .contentType("application/json")
+                .body(containsString("Unrecognized token 'Bob'"));
+    }
+
+    @Test
+    public void testJsonMulti() {
+        RestAssured
+                .with()
+                .get("/simple/multi2")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0].first", Matchers.equalTo("Bob"))
+                .body("[0].last", Matchers.equalTo("Builder"))
+                .body("[1].first", Matchers.equalTo("Bob2"))
+                .body("[1].last", Matchers.equalTo("Builder2"));
+        RestAssured
+                .with()
+                .get("/simple/multi1")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0].first", Matchers.equalTo("Bob"))
+                .body("[0].last", Matchers.equalTo("Builder"));
+        RestAssured
+                .with()
+                .get("/simple/multi0")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body(Matchers.equalTo("[]"));
+    }
+
+    @Test
+    public void testCustomSerialization() {
+        assertEquals(0, SimpleJsonResource.UnquotedFieldsPersonBiFunction.count.intValue());
+
+        // assert that we get a proper response
+        // we can't use json-path to assert because the returned string is not proper json as it does not have quotes around the field names
+        RestAssured.get("/simple/custom-serialized-person")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .header("transfer-encoding", nullValue())
+                .header("content-length", notNullValue())
+                .body(containsString("Bob"))
+                .body(containsString("Builder"));
+        // assert that our bi-function was created
+        assertEquals(1, SimpleJsonResource.UnquotedFieldsPersonBiFunction.count.intValue());
+
+        // assert with a list of people
+        RestAssured
+                .with()
+                .body("[{\"first\": \"Bob\", \"last\": \"Builder\"}, {\"first\": \"Bob2\", \"last\": \"Builder2\"}]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/custom-serialized-people")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .header("transfer-encoding", nullValue())
+                .header("content-length", notNullValue())
+                .body(containsString("Bob"))
+                .body(containsString("Builder"))
+                .body(containsString("Bob2"))
+                .body(containsString("Builder2"));
+        // assert that another instance of our bi-function was created as a different resource method was used
+        assertEquals(2, SimpleJsonResource.UnquotedFieldsPersonBiFunction.count.intValue());
+
+        RestAssured.get("/simple/custom-serialized-person")
+                .then()
+                .statusCode(200)
+                .contentType("application/json");
+        RestAssured
+                .with()
+                .body("[{\"first\": \"Bob\", \"last\": \"Builder\"}, {\"first\": \"Bob2\", \"last\": \"Builder2\"}]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/custom-serialized-people")
+                .then()
+                .statusCode(200)
+                .contentType("application/json");
+        // assert that the instances were re-used as we simply invoked methods that should have already created their object writters
+        assertEquals(2, SimpleJsonResource.UnquotedFieldsPersonBiFunction.count.intValue());
+
+        RestAssured.get("/simple/invalid-use-of-custom-serializer")
+                .then()
+                .statusCode(500);
+        // a new instance should have been created
+        assertEquals(3, SimpleJsonResource.UnquotedFieldsPersonBiFunction.count.intValue());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java
new file mode 100644
index 0000000000000..01a0afa487b4d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SuperClass.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+public class SuperClass<T> {
+
+    @POST
+    @Path("/super")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public List<T> reverseListFromSuper(List<T> list) {
+        List<T> reversed = new ArrayList<>(list.size());
+        for (T t : list) {
+            reversed.add(0, t);
+        }
+        return reversed;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/User.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/User.java
new file mode 100644
index 0000000000000..795da2ebfd2b4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/User.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import com.fasterxml.jackson.annotation.JsonView;
+
+public class User {
+
+    @JsonView(Views.Private.class)
+    public int id;
+
+    @JsonView(Views.Public.class)
+    public String name;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java
new file mode 100644
index 0000000000000..f2341527cd385
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonEndpoint.java
@@ -0,0 +1,39 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.Collections;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+@Path("vertx")
+public class VertxJsonEndpoint {
+
+    @POST
+    @Path("jsonObject")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public JsonObject jsonObject(JsonObject input) {
+        JsonObject result = new JsonObject();
+        result.put("name", input.getString("name"));
+        result.put("age", 50);
+        result.put("nested", new JsonObject(Collections.singletonMap("foo", "bar")));
+        result.put("bools", new JsonArray().add(true));
+        return result;
+    }
+
+    @POST
+    @Path("jsonArray")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public JsonArray jsonArray(JsonArray input) {
+        JsonArray result = input.copy();
+        result.add("last");
+        return result;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonTest.java
new file mode 100644
index 0000000000000..6d7aedb550596
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/VertxJsonTest.java
@@ -0,0 +1,54 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class VertxJsonTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(VertxJsonEndpoint.class);
+                }
+            });
+
+    @Test
+    public void testJsonObject() {
+        RestAssured.with()
+                .body("{\"name\": \"Bob\"}")
+                .contentType("application/json")
+                .post("/vertx/jsonObject")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("name", Matchers.equalTo("Bob"))
+                .body("age", Matchers.equalTo(50))
+                .body("nested.foo", Matchers.equalTo("bar"))
+                .body("bools[0]", Matchers.equalTo(true));
+    }
+
+    @Test
+    public void testJsonArray() {
+        RestAssured.with()
+                .body("[\"first\"]")
+                .contentType("application/json")
+                .post("/vertx/jsonArray")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0]", Matchers.equalTo("first"))
+                .body("[1]", Matchers.equalTo("last"));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Views.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Views.java
new file mode 100644
index 0000000000000..a5d230e4e4fb0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/Views.java
@@ -0,0 +1,10 @@
+package io.quarkus.resteasy.reactive.jackson.deployment.test;
+
+public class Views {
+
+    public static class Public {
+    }
+
+    public static class Private extends Public {
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/resources/test.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/resources/test.html
new file mode 100644
index 0000000000000..0d2c081db5dc9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/deployment/src/test/resources/test.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <!-- head definitions go here -->
+</head>
+<body>
+<!-- the content goes here -->
+</body>
+</html>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/pom.xml
new file mode 100644
index 0000000000000..701061ee2ecdf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-jackson-parent</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Jackson</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml
new file mode 100644
index 0000000000000..8c3a873e52729
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-jackson-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Jackson - Runtime</name>
+    <description>Jackson integration for RESTEasy Reactive. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/CustomSerialization.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/CustomSerialization.java
new file mode 100644
index 0000000000000..db8aa8243a9af
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/CustomSerialization.java
@@ -0,0 +1,40 @@
+package io.quarkus.resteasy.reactive.jackson;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Type;
+import java.util.function.BiFunction;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import io.smallrye.common.annotation.Experimental;
+
+/**
+ * Annotation that can be used on RESTEasy Reactive Resource method to allow users to configure Jackson serialization
+ * for that method only, without affecting the global Jackson configuration.
+ */
+@Experimental(value = "Remains to be determined if this is the best possible API for users to configure per Resource Method Serialization")
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD })
+public @interface CustomSerialization {
+
+    /**
+     * A {@code BiFunction} that converts the global {@code ObjectMapper} and type for which a custom {@code ObjectWriter} is
+     * needed
+     * (this type will be a generic type if the method returns such a generic type) and returns the instance of the custom
+     * {@code ObjectWriter}.
+     *
+     * Quarkus will construct one instance of this {@code BiFunction} for each JAX-RS resource method that is annotated with
+     * {@code CustomSerialization} and once an instance is created it will be cached for subsequent usage by that resource
+     * method.
+     *
+     * The class MUST contain a no-args constructor and it is advisable that it contains no state that is updated outside
+     * of its constructor.
+     * Furthermore, the {@code ObjectMapper} should NEVER be changed any way as it is the global ObjectMapper that is
+     * accessible to the entire Quarkus application.
+     */
+    Class<? extends BiFunction<ObjectMapper, Type, ObjectWriter>> value();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/JacksonMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/JacksonMessageBodyReader.java
new file mode 100644
index 0000000000000..a0558bf050663
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/JacksonMessageBodyReader.java
@@ -0,0 +1,59 @@
+package io.quarkus.resteasy.reactive.jackson.runtime.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.inject.Inject;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.common.util.EmptyInputStream;
+import org.jboss.resteasy.reactive.server.providers.serialisers.json.AbstractJsonMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+
+public class JacksonMessageBodyReader extends AbstractJsonMessageBodyReader {
+
+    private final ObjectReader reader;
+
+    @Inject
+    public JacksonMessageBodyReader(ObjectMapper mapper) {
+        this.reader = mapper.reader();
+    }
+
+    @Override
+    public Object readFrom(Class<Object> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        try {
+            return doReadFrom(type, genericType, entityStream);
+        } catch (MismatchedInputException e) {
+            throw new WebApplicationException(Response.Status.BAD_REQUEST);
+        }
+    }
+
+    @Override
+    public Object readFrom(Class<Object> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        try {
+            return doReadFrom(type, genericType, context.getInputStream());
+        } catch (MismatchedInputException e) {
+            context.abortWith(Response.status(Response.Status.BAD_REQUEST).build());
+            return null;
+        }
+    }
+
+    private Object doReadFrom(Class<Object> type, Type genericType, InputStream entityStream) throws IOException {
+        if (entityStream instanceof EmptyInputStream) {
+            return null;
+        }
+        return reader.forType(reader.getTypeFactory().constructType(genericType != null ? genericType : type))
+                .readValue(entityStream);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/JacksonMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/JacksonMessageBodyWriter.java
new file mode 100644
index 0000000000000..566e5755e3831
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/JacksonMessageBodyWriter.java
@@ -0,0 +1,163 @@
+package io.quarkus.resteasy.reactive.jackson.runtime.serialisers;
+
+import static org.jboss.resteasy.reactive.server.vertx.providers.serialisers.json.JsonMessageBodyWriterUtil.setContentTypeIfNecessary;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import javax.inject.Inject;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator.Feature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import io.quarkus.resteasy.reactive.jackson.CustomSerialization;
+
+public class JacksonMessageBodyWriter extends ServerMessageBodyWriter.AllWriteableMessageBodyWriter {
+
+    private static final String JSON_VIEW_NAME = JsonView.class.getName();
+    private static final String CUSTOM_SERIALIZATION = CustomSerialization.class.getName();
+
+    private final ObjectMapper originalMapper;
+    private final ObjectWriter defaultWriter;
+    private final ConcurrentMap<Method, ObjectWriter> perMethodWriter = new ConcurrentHashMap<>();
+
+    @Inject
+    public JacksonMessageBodyWriter(ObjectMapper mapper) {
+        this.originalMapper = mapper;
+        // we don't want the ObjectWriter to close the stream automatically, as we want to handle closing manually at the proper points
+        JsonFactory jsonFactory = mapper.getFactory();
+        if (needsNewFactory(jsonFactory)) {
+            jsonFactory = jsonFactory.copy();
+            setNecessaryJsonFactoryConfig(jsonFactory);
+            this.defaultWriter = mapper.writer().with(jsonFactory);
+        } else {
+            this.defaultWriter = mapper.writer();
+        }
+    }
+
+    private boolean needsNewFactory(JsonFactory jsonFactory) {
+        return jsonFactory.isEnabled(Feature.AUTO_CLOSE_TARGET) || jsonFactory.isEnabled(Feature.FLUSH_PASSED_TO_STREAM);
+    }
+
+    private static void setNecessaryJsonFactoryConfig(JsonFactory jsonFactory) {
+        jsonFactory.configure(Feature.AUTO_CLOSE_TARGET, false);
+        jsonFactory.configure(Feature.FLUSH_PASSED_TO_STREAM, false);
+    }
+
+    @Override
+    public void writeTo(Object o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        setContentTypeIfNecessary(httpHeaders);
+        if (o instanceof String) { // YUK: done in order to avoid adding extra quotes...
+            entityStream.write(((String) o).getBytes());
+        } else {
+            if (annotations != null) {
+                for (Annotation annotation : annotations) {
+                    if (JsonView.class.equals(annotation.annotationType())) {
+                        if (handleJsonView(((JsonView) annotation), o, entityStream)) {
+                            return;
+                        }
+                    }
+                }
+            }
+            entityStream.write(defaultWriter.writeValueAsBytes(o));
+        }
+    }
+
+    @Override
+    public void writeResponse(Object o, Type genericType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        setContentTypeIfNecessary(context);
+        OutputStream stream = context.getOrCreateOutputStream();
+        if (o instanceof String) { // YUK: done in order to avoid adding extra quotes...
+            stream.write(((String) o).getBytes());
+        } else {
+            // First test the names to see if JsonView is used. We do this to avoid doing reflection for the common case
+            // where JsonView is not used
+            ResteasyReactiveResourceInfo resourceInfo = context.getResteasyReactiveResourceInfo();
+            if (resourceInfo != null) {
+                Set<String> methodAnnotationNames = resourceInfo.getMethodAnnotationNames();
+                if (methodAnnotationNames.contains(CUSTOM_SERIALIZATION)) {
+                    Method method = resourceInfo.getMethod();
+                    if (handleCustomSerialization(method, o, genericType, stream)) {
+                        return;
+                    }
+                } else if (methodAnnotationNames.contains(JSON_VIEW_NAME)) {
+                    Method method = resourceInfo.getMethod();
+                    if (handleJsonView(method.getAnnotation(JsonView.class), o, stream)) {
+                        return;
+                    }
+                }
+            }
+            defaultWriter.writeValue(stream, o);
+        }
+        // we don't use try-with-resources because that results in writing to the http output without the exception mapping coming into play
+        stream.close();
+    }
+
+    // TODO: this can definitely be made faster if necessary by optimizing the use of the map and also by moving the creation of the
+    //  biFunction to build time
+    private boolean handleCustomSerialization(Method method, Object o, Type genericType, OutputStream stream)
+            throws IOException {
+        CustomSerialization customSerialization = method.getAnnotation(CustomSerialization.class);
+        if ((customSerialization == null)) {
+            return false;
+        }
+        Class<? extends BiFunction<ObjectMapper, Type, ObjectWriter>> biFunctionClass = customSerialization.value();
+        ObjectWriter objectWriter = perMethodWriter.computeIfAbsent(method,
+                new MethodObjectWriterFunction(biFunctionClass, genericType, originalMapper));
+        objectWriter.writeValue(stream, o);
+        return true;
+    }
+
+    private boolean handleJsonView(JsonView jsonView, Object o, OutputStream stream) throws IOException {
+        if ((jsonView != null) && (jsonView.value().length > 0)) {
+            defaultWriter.withView(jsonView.value()[0]).writeValue(stream, o);
+            return true;
+        }
+        return false;
+    }
+
+    private static class MethodObjectWriterFunction implements Function<Method, ObjectWriter> {
+        private final Class<? extends BiFunction<ObjectMapper, Type, ObjectWriter>> clazz;
+        private final Type genericType;
+        private final ObjectMapper originalMapper;
+
+        public MethodObjectWriterFunction(Class<? extends BiFunction<ObjectMapper, Type, ObjectWriter>> clazz, Type genericType,
+                ObjectMapper originalMapper) {
+            this.clazz = clazz;
+            this.genericType = genericType;
+            this.originalMapper = originalMapper;
+        }
+
+        @Override
+        public ObjectWriter apply(Method method) {
+            try {
+                BiFunction<ObjectMapper, Type, ObjectWriter> biFunctionInstance = clazz.getDeclaredConstructor().newInstance();
+                ObjectWriter objectWriter = biFunctionInstance.apply(originalMapper, genericType);
+                setNecessaryJsonFactoryConfig(objectWriter.getFactory());
+                return objectWriter;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java
new file mode 100644
index 0000000000000..1e99732ae9d90
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyReader.java
@@ -0,0 +1,50 @@
+package io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.common.providers.serialisers.PrimitiveBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.vertx.core.json.JsonArray;
+
+public class VertxJsonArrayMessageBodyReader extends PrimitiveBodyHandler implements ServerMessageBodyReader<JsonArray> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return isReadable(type);
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return isReadable(type);
+    }
+
+    private boolean isReadable(Class<?> type) {
+        return JsonArray.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public JsonArray readFrom(Class<JsonArray> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return readFrom(context.getInputStream());
+    }
+
+    @Override
+    public JsonArray readFrom(Class<JsonArray> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return readFrom(entityStream);
+    }
+
+    private JsonArray readFrom(InputStream entityStream) throws IOException {
+        return new JsonArray(readFrom(entityStream, false));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java
new file mode 100644
index 0000000000000..80b518d0b313e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonArrayMessageBodyWriter.java
@@ -0,0 +1,46 @@
+package io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.vertx.core.json.JsonArray;
+
+public class VertxJsonArrayMessageBodyWriter implements ServerMessageBodyWriter<JsonArray> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return isWriteable(type);
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return isWriteable(type);
+    }
+
+    private boolean isWriteable(Class<?> type) {
+        return JsonArray.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(JsonArray o, Type genericType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        context.serverResponse().end(o.encode());
+    }
+
+    @Override
+    public void writeTo(JsonArray o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        entityStream.write(o.encode().getBytes(StandardCharsets.UTF_8));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java
new file mode 100644
index 0000000000000..49b1237984fa7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyReader.java
@@ -0,0 +1,50 @@
+package io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.common.providers.serialisers.PrimitiveBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.vertx.core.json.JsonObject;
+
+public class VertxJsonObjectMessageBodyReader extends PrimitiveBodyHandler implements ServerMessageBodyReader<JsonObject> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return isReadable(type);
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return isReadable(type);
+    }
+
+    private boolean isReadable(Class<?> type) {
+        return JsonObject.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public JsonObject readFrom(Class<JsonObject> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return readFrom(context.getInputStream());
+    }
+
+    @Override
+    public JsonObject readFrom(Class<JsonObject> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return readFrom(entityStream);
+    }
+
+    private JsonObject readFrom(InputStream entityStream) throws IOException {
+        return new JsonObject(readFrom(entityStream, false));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java
new file mode 100644
index 0000000000000..e656b170402ff
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/java/io/quarkus/resteasy/reactive/jackson/runtime/serialisers/vertx/VertxJsonObjectMessageBodyWriter.java
@@ -0,0 +1,47 @@
+package io.quarkus.resteasy.reactive.jackson.runtime.serialisers.vertx;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.vertx.core.json.JsonObject;
+
+public class VertxJsonObjectMessageBodyWriter implements ServerMessageBodyWriter<JsonObject> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return isWriteable(type);
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return isWriteable(type);
+    }
+
+    private boolean isWriteable(Class<?> type) {
+        return JsonObject.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(JsonObject o, Type genericType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        context.serverResponse().end(o.encode());
+    }
+
+    @Override
+    public void writeTo(JsonObject o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        entityStream.write(o.encode().getBytes(StandardCharsets.UTF_8));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..e0a542aa1b523
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,16 @@
+---
+name: "RESTEasy Reactive Jackson"
+metadata:
+  short-name: "resteasy-reactive-jackson"
+  keywords:
+    - "rest-jackson"
+    - "quarkus-resteasy-reactive-json"
+    - "jaxrs-json"
+    - "rest"
+    - "jaxrs"
+    - "json"
+    - "jackson"
+  categories:
+  - "web"
+  - "reactive"
+  status: "experimental"
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/pom.xml
new file mode 100644
index 0000000000000..d44e5222aec18
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-jsonb-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive - JSON-B - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/processor/ResteasyReactiveJsonbProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/processor/ResteasyReactiveJsonbProcessor.java
new file mode 100644
index 0000000000000..b6dc3c28e6d3f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/main/java/io/quarkus/resteasy/reactive/jsonb/deployment/processor/ResteasyReactiveJsonbProcessor.java
@@ -0,0 +1,66 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.processor;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.jsonb.spi.JsonbDeserializerBuildItem;
+import io.quarkus.jsonb.spi.JsonbSerializerBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.ServerDefaultProducesHandlerBuildItem;
+import io.quarkus.resteasy.reactive.jsonb.runtime.serialisers.JsonbMessageBodyReader;
+import io.quarkus.resteasy.reactive.jsonb.runtime.serialisers.JsonbMessageBodyWriter;
+import io.quarkus.resteasy.reactive.jsonb.runtime.serialisers.vertx.VertxJson;
+import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
+
+public class ResteasyReactiveJsonbProcessor {
+
+    private static final List<String> VERTX_SERIALIZERS = Arrays.asList(
+            VertxJson.JsonObjectSerializer.class.getName(),
+            VertxJson.JsonArraySerializer.class.getName());
+
+    private static final List<String> VERTX_DESERIALIZERS = Arrays.asList(
+            VertxJson.JsonObjectDeserializer.class.getName(),
+            VertxJson.JsonArrayDeserializer.class.getName());
+
+    @BuildStep
+    void feature(BuildProducer<FeatureBuildItem> feature) {
+        feature.produce(new FeatureBuildItem(Feature.RESTEASY_REACTIVE_JSONB));
+    }
+
+    @BuildStep
+    ServerDefaultProducesHandlerBuildItem jsonDefault() {
+        return ServerDefaultProducesHandlerBuildItem.json();
+    }
+
+    @BuildStep
+    void additionalProviders(BuildProducer<AdditionalBeanBuildItem> additionalBean,
+            BuildProducer<MessageBodyReaderBuildItem> additionalReaders,
+            BuildProducer<MessageBodyWriterBuildItem> additionalWriters) {
+        // make these beans to they can get instantiated with the Quarkus CDI configured Jsonb object
+        additionalBean.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(JsonbMessageBodyReader.class.getName())
+                .addBeanClass(JsonbMessageBodyWriter.class.getName())
+                .setUnremovable().build());
+
+        additionalReaders.produce(new MessageBodyReaderBuildItem(JsonbMessageBodyReader.class.getName(), Object.class.getName(),
+                Collections.singletonList(MediaType.APPLICATION_JSON)));
+        additionalWriters.produce(new MessageBodyWriterBuildItem(JsonbMessageBodyWriter.class.getName(), Object.class.getName(),
+                Collections.singletonList(MediaType.APPLICATION_JSON)));
+    }
+
+    @BuildStep
+    public void registerVertxJsonSupport(
+            BuildProducer<JsonbSerializerBuildItem> serializers,
+            BuildProducer<JsonbDeserializerBuildItem> deserializers) {
+        serializers.produce(new JsonbSerializerBuildItem(VERTX_SERIALIZERS));
+        deserializers.produce(new JsonbDeserializerBuildItem(VERTX_DESERIALIZERS));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Cheese.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Cheese.java
new file mode 100644
index 0000000000000..603cdb741be4f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Cheese.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+public class Cheese {
+
+    private final String name;
+
+    public Cheese(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Cheese: " + name;
+    }
+
+    public String getName() {
+        // explicitly cause an exception to ensure that an exception during json writing is properly handled
+        throw new RuntimeException("Fake exception during serialization");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java
new file mode 100644
index 0000000000000..6955c935dc53f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/CheeseEndpoint.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("cheese")
+public class CheeseEndpoint {
+
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN })
+    @GET
+    public Cheese get() {
+        return new Cheese("Morbier");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/ExceptionInWriterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/ExceptionInWriterTest.java
new file mode 100644
index 0000000000000..a14c804de8f01
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/ExceptionInWriterTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ExceptionInWriterTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Cheese.class, CheeseEndpoint.class);
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.with().header("Accept", "text/plain", "application/json").get("/cheese")
+                .then().statusCode(500);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java
new file mode 100644
index 0000000000000..5c02da8ac86e3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/Person.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import javax.validation.constraints.NotBlank;
+
+public class Person {
+
+    private String first;
+
+    @NotBlank(message = "Title cannot be blank")
+    private String last;
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getLast() {
+        return last;
+    }
+
+    public void setLast(String last) {
+        this.last = last;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java
new file mode 100644
index 0000000000000..63b61561e6bd8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonResource.java
@@ -0,0 +1,170 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import io.quarkus.runtime.BlockingOperationControl;
+import io.smallrye.mutiny.Multi;
+
+@Path("/simple")
+public class SimpleJsonResource extends SuperClass<Person> {
+
+    @GET
+    @Path("/person")
+    public Person getPerson() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        return person;
+    }
+
+    @POST
+    @Path("/person")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Person getPerson(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return person;
+    }
+
+    @POST
+    @Path("/person-custom-mt")
+    @Produces("application/vnd.quarkus.person-v1+json")
+    @Consumes("application/vnd.quarkus.person-v1+json")
+    public Person getPersonCustomMediaType(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return person;
+    }
+
+    @POST
+    @Path("/person-custom-mt-response")
+    @Produces("application/vnd.quarkus.person-v1+json")
+    @Consumes("application/vnd.quarkus.person-v1+json")
+    public Response getPersonCustomMediaTypeResponse(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return Response.ok(person).status(201).build();
+    }
+
+    @POST
+    @Path("/person-custom-mt-response-with-type")
+    @Produces("application/vnd.quarkus.person-v1+json")
+    @Consumes("application/vnd.quarkus.person-v1+json")
+    public Response getPersonCustomMediaTypeResponseWithType(Person person) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return Response.ok(person).status(201).header("Content-Type", "application/vnd.quarkus.other-v1+json").build();
+    }
+
+    @POST
+    @Path("/people")
+    @Consumes(MediaType.APPLICATION_JSON)
+    public List<Person> getPeople(List<Person> people) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        List<Person> reversed = new ArrayList<>(people.size());
+        for (Person person : people) {
+            reversed.add(0, person);
+        }
+        return reversed;
+    }
+
+    @POST
+    @Path("/strings")
+    public List<String> strings(List<String> strings) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return strings;
+    }
+
+    @POST
+    @Path("/person-large")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Person personTest(Person person) {
+        //large requests should get bumped from the IO thread
+        if (!BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should have dispatched");
+        }
+        return person;
+    }
+
+    @POST
+    @Path("/person-validated")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public Person getValidatedPerson(@Valid Person person) {
+        return person;
+    }
+
+    @POST
+    @Path("/person-invalid-result")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Valid
+    public Person getInvalidPersonResult(@Valid Person person) {
+        person.setLast(null);
+        return person;
+    }
+
+    @GET
+    @Path("/async-person")
+    @Produces(MediaType.APPLICATION_JSON)
+    public void getPerson(@Suspended AsyncResponse response) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                Person person = new Person();
+                person.setFirst("Bob");
+                person.setLast("Builder");
+                response.resume(person);
+            }
+        }).start();
+    }
+
+    @GET
+    @Path("/multi1")
+    public Multi<Person> getMulti1() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        return Multi.createFrom().items(person);
+    }
+
+    @GET
+    @Path("/multi2")
+    public Multi<Person> getMulti2() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        Person person2 = new Person();
+        person2.setFirst("Bob2");
+        person2.setLast("Builder2");
+        return Multi.createFrom().items(person, person2);
+    }
+
+    @GET
+    @Path("/multi0")
+    public Multi<Person> getMulti0() {
+        return Multi.createFrom().empty();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonTest.java
new file mode 100644
index 0000000000000..2a2bfc677e052
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SimpleJsonTest.java
@@ -0,0 +1,203 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class SimpleJsonTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Person.class, SimpleJsonResource.class, SuperClass.class);
+                }
+            });
+
+    @Test
+    public void testJson() {
+        RestAssured.get("/simple/person")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .header("transfer-encoding", nullValue())
+                .header("content-length", notNullValue())
+                .body("first", Matchers.equalTo("Bob"))
+                .body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/person")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .header("content-length", notNullValue())
+                .header("transfer-encoding", nullValue())
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .post("/simple/person-custom-mt")
+                .then()
+                .statusCode(200)
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .post("/simple/person-custom-mt-response")
+                .then()
+                .statusCode(201)
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\", \"last\": \"Builder\"}")
+                .contentType("application/vnd.quarkus.person-v1+json")
+                .post("/simple/person-custom-mt-response-with-type")
+                .then()
+                .statusCode(201)
+                .contentType("application/vnd.quarkus.other-v1+json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body("[{\"first\": \"Bob\", \"last\": \"Builder\"}, {\"first\": \"Bob2\", \"last\": \"Builder2\"}]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/people")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[1].first", Matchers.equalTo("Bob"))
+                .body("[1].last", Matchers.equalTo("Builder"))
+                .body("[0].first", Matchers.equalTo("Bob2"))
+                .body("[0].last", Matchers.equalTo("Builder2"));
+
+        RestAssured.with()
+                .body("[\"first\", \"second\"]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/strings")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0]", Matchers.equalTo("first"))
+                .body("[1]", Matchers.equalTo("second"));
+
+        RestAssured
+                .with()
+                .body("[{\"first\": \"Bob\", \"last\": \"Builder\"}, {\"first\": \"Bob2\", \"last\": \"Builder2\"}]")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/super")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[1].first", Matchers.equalTo("Bob"))
+                .body("[1].last", Matchers.equalTo("Builder"))
+                .body("[0].first", Matchers.equalTo("Bob2"))
+                .body("[0].last", Matchers.equalTo("Builder2"));
+    }
+
+    @Test
+    public void testLargeJsonPost() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10000; ++i) {
+            sb.append("abc");
+        }
+        String longString = sb.toString();
+        RestAssured
+                .with()
+                .body("{\"first\": \"" + longString + "\", \"last\": \"" + longString + "\"}")
+                .contentType("application/json; charset=utf-8")
+                .post("/simple/person-large")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("first", Matchers.equalTo(longString)).body("last", Matchers.equalTo(longString));
+    }
+
+    @Test
+    public void testValidatedJson() {
+        String postBody = "{\"first\": \"Bob\", \"last\": \"Builder\"}";
+        RestAssured
+                .with()
+                .body(postBody)
+                .contentType("application/json")
+                .post("/simple/person-validated")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+
+        RestAssured
+                .with()
+                .body(postBody)
+                .contentType("application/json")
+                .post("/simple/person-invalid-result")
+                .then()
+                .statusCode(500)
+                .contentType("application/json");
+
+        RestAssured
+                .with()
+                .body("{\"first\": \"Bob\"}")
+                .contentType("application/json")
+                .post("/simple/person-validated")
+                .then()
+                .statusCode(400)
+                .contentType("application/json");
+    }
+
+    @Test
+    public void testAsyncJson() {
+        RestAssured.get("/simple/async-person")
+                .then().body("first", Matchers.equalTo("Bob")).body("last", Matchers.equalTo("Builder"));
+    }
+
+    @Test
+    public void testJsonMulti() {
+        RestAssured
+                .with()
+                .get("/simple/multi2")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0].first", Matchers.equalTo("Bob"))
+                .body("[0].last", Matchers.equalTo("Builder"))
+                .body("[1].first", Matchers.equalTo("Bob2"))
+                .body("[1].last", Matchers.equalTo("Builder2"));
+        RestAssured
+                .with()
+                .get("/simple/multi1")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0].first", Matchers.equalTo("Bob"))
+                .body("[0].last", Matchers.equalTo("Builder"));
+        RestAssured
+                .with()
+                .get("/simple/multi0")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body(Matchers.equalTo("[]"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java
new file mode 100644
index 0000000000000..0d273996f3b90
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/SuperClass.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+public class SuperClass<T> {
+
+    @POST
+    @Path("/super")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public List<T> reverseListFromSuper(List<T> list) {
+        List<T> reversed = new ArrayList<>(list.size());
+        for (T t : list) {
+            reversed.add(0, t);
+        }
+        return reversed;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java
new file mode 100644
index 0000000000000..619a6a8c4bf55
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonEndpoint.java
@@ -0,0 +1,39 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import java.util.Collections;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+@Path("vertx")
+public class VertxJsonEndpoint {
+
+    @POST
+    @Path("jsonObject")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public JsonObject jsonObject(JsonObject input) {
+        JsonObject result = new JsonObject();
+        result.put("name", input.getString("name"));
+        result.put("age", 50);
+        result.put("nested", new JsonObject(Collections.singletonMap("foo", "bar")));
+        result.put("bools", new JsonArray().add(true));
+        return result;
+    }
+
+    @POST
+    @Path("jsonArray")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public JsonArray jsonArray(JsonArray input) {
+        JsonArray result = input.copy();
+        result.add("last");
+        return result;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonTest.java
new file mode 100644
index 0000000000000..d2102effdff70
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/VertxJsonTest.java
@@ -0,0 +1,54 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class VertxJsonTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(VertxJsonEndpoint.class);
+                }
+            });
+
+    @Test
+    public void testJsonObject() {
+        RestAssured.with()
+                .body("{\"name\": \"Bob\"}")
+                .contentType("application/json")
+                .post("/vertx/jsonObject")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("name", Matchers.equalTo("Bob"))
+                .body("age", Matchers.equalTo(50))
+                .body("nested.foo", Matchers.equalTo("bar"))
+                .body("bools[0]", Matchers.equalTo(true));
+    }
+
+    @Test
+    public void testJsonArray() {
+        RestAssured.with()
+                .body("[\"first\"]")
+                .contentType("application/json")
+                .post("/vertx/jsonArray")
+                .then()
+                .statusCode(200)
+                .contentType("application/json")
+                .body("[0]", Matchers.equalTo("first"))
+                .body("[1]", Matchers.equalTo("last"));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/Message.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/Message.java
new file mode 100644
index 0000000000000..9fc38d95f1fc8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/Message.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test.sse;
+
+public class Message {
+    public String name;
+
+    public Message(String name) {
+        this.name = name;
+    }
+
+    // for Jsonb
+    public Message() {
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java
new file mode 100644
index 0000000000000..6dd57db0cbbaf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseParserTest.java
@@ -0,0 +1,180 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test.sse;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEvent;
+
+import org.jboss.resteasy.reactive.client.impl.InboundSseEventImpl;
+import org.jboss.resteasy.reactive.client.impl.SseEventSourceImpl;
+import org.jboss.resteasy.reactive.client.impl.SseParser;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.vertx.core.buffer.Buffer;
+
+public class SseParserTest {
+
+    @Test
+    public void testParser() {
+        // various EOF combinations
+        testParser("data:foo\r\n\r\n", "foo", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:foo\n\n", "foo", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:foo\r\r", "foo", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        // split data line, with various EOF combinations
+        testParser("data:foo\ndata:bar\n\n", "foo\nbar", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:foo\r\ndata:bar\r\n\r\n", "foo\nbar", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:foo\rdata:bar\r\r", "foo\nbar", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        // split data line with empty data in the middle
+        testParser("data:foo\ndata\ndata:bar\n\n", "foo\n\nbar", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:foo\ndata:\ndata:bar\n\n", "foo\n\nbar", null, null, null, SseEvent.RECONNECT_NOT_SET);
+
+        // no data: no event
+        testParser("\n", null, null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:\n\n", null, null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data\n\n", null, null, null, null, SseEvent.RECONNECT_NOT_SET);
+
+        // all fields
+        testParser("data:DATA\nid:ID\n:COMMENT\nretry:23\nevent:NAME\n\n", "DATA", "COMMENT", "ID", "NAME", 23);
+        // all fields and no data: no event
+        testParser("id:ID\n:COMMENT\nretry:23\nevent:NAME\n\n", null, null, null, null, SseEvent.RECONNECT_NOT_SET);
+
+        // optional space after colon
+        testParser("data:foo\n\n", "foo", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data: foo\n\n", "foo", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:  foo\n\n", " foo", null, null, null, SseEvent.RECONNECT_NOT_SET);
+
+        // UTF-8
+        testParser("data: a¢€𐍈\n\n", "a¢€𐍈", null, null, null, SseEvent.RECONNECT_NOT_SET);
+
+        // invalid retry is ignored
+        testParser("data:DATA\nretry:-23\n\n", "DATA", null, null, null, SseEvent.RECONNECT_NOT_SET);
+        testParser("data:DATA\nretry:ASD\n\n", "DATA", null, null, null, SseEvent.RECONNECT_NOT_SET);
+
+        // two events
+        testParser(Collections.singletonList("data:foo\n\ndata:bar\n\n"),
+                Arrays.asList(new InboundSseEventImpl(null, null)
+                        .setData("foo"),
+                        new InboundSseEventImpl(null, null)
+                                .setData("bar")));
+        // two events with data
+        testParser(Collections.singletonList("data:DATA\nid:ID\n:COMMENT\nretry:23\nevent:NAME\n\n"
+                + "data:DATA2\nid:ID2\n:COMMENT2\nretry:232\nevent:NAME2\n\n"),
+                Arrays.asList(new InboundSseEventImpl(null, null)
+                        .setData("DATA")
+                        .setId("ID")
+                        .setComment("COMMENT")
+                        .setReconnectDelay(23)
+                        .setName("NAME"),
+                        new InboundSseEventImpl(null, null)
+                                .setData("DATA2")
+                                .setId("ID2")
+                                .setComment("COMMENT2")
+                                .setReconnectDelay(232)
+                                .setName("NAME2")));
+        // two events with data, only ID is persistent
+        testParser(Collections.singletonList("data:DATA\nid:ID\n:COMMENT\nretry:23\nevent:NAME\n\n"
+                + "data:DATA2\n\n"),
+                Arrays.asList(new InboundSseEventImpl(null, null)
+                        .setData("DATA")
+                        .setId("ID")
+                        .setComment("COMMENT")
+                        .setReconnectDelay(23)
+                        .setName("NAME"),
+                        new InboundSseEventImpl(null, null)
+                                .setData("DATA2")
+                                .setId("ID")));
+
+        // two events in two buffers
+        testParser(Arrays.asList("data:foo\n\n", "data:bar\n\n"),
+                Arrays.asList(new InboundSseEventImpl(null, null)
+                        .setData("foo"),
+                        new InboundSseEventImpl(null, null)
+                                .setData("bar")));
+        // two events in two buffers at awkward places
+        testParser(Arrays.asList("data:foo\n\ndata:b", "ar\n\n"),
+                Arrays.asList(new InboundSseEventImpl(null, null)
+                        .setData("foo"),
+                        new InboundSseEventImpl(null, null)
+                                .setData("bar")));
+        // one event in two buffers
+        testParser(Arrays.asList("data:f", "oo\n\n"),
+                Collections.singletonList(new InboundSseEventImpl(null, null)
+                        .setData("foo")));
+        // one event in two buffers within a utf-8 char
+        testParserWithBytes(
+                Arrays.asList(new byte[] { 'd', 'a', 't', 'a', ':', (byte) 0b11000010 },
+                        new byte[] { (byte) 0b10100010, '\n', '\n' }),
+                Collections.singletonList(new InboundSseEventImpl(null, null)
+                        .setData("¢")));
+
+        // BOM
+        testParserWithBytes(
+                Collections.singletonList(
+                        new byte[] { (byte) 0xFE, (byte) 0xFF, 'd', 'a', 't', 'a', ':', 'f', 'o', 'o', '\n', '\n' }),
+                Collections.singletonList(new InboundSseEventImpl(null, null)
+                        .setData("foo")));
+
+        // invalid BOM location
+        Assertions
+                .assertThrows(IllegalStateException.class,
+                        () -> testParserWithBytes(
+                                Arrays.asList(new byte[] { 'd', 'a', 't', 'a', ':', 'f', 'o', 'o', '\n', '\n' },
+                                        new byte[] { (byte) 0xFE, (byte) 0xFF, 'd', 'a', 't', 'a', ':', 'f', 'o', 'o', '\n',
+                                                '\n' }),
+                                Collections.singletonList(new InboundSseEventImpl(null, null)
+                                        .setData("foo"))));
+        // invalid UTF-8
+        Assertions.assertThrows(IllegalStateException.class,
+                () -> testParserWithBytes(
+                        Collections.singletonList(
+                                new byte[] { 'd', 'a', 't', 'a', ':', (byte) 0b1111_1000, 'f', 'o', 'o', '\n', '\n' }),
+                        Collections.emptyList()));
+    }
+
+    private void testParser(String event, String data, String comment, String lastId, String name, long reconnectDelay) {
+        if (data != null) {
+            testParser(Collections.singletonList(event), Collections.singletonList(new InboundSseEventImpl(null, null)
+                    .setData(data)
+                    .setComment(comment)
+                    .setId(lastId)
+                    .setName(name)
+                    .setReconnectDelay(reconnectDelay)));
+        } else {
+            testParser(Collections.singletonList(event), Collections.emptyList());
+        }
+    }
+
+    private void testParser(List<String> events, List<InboundSseEvent> expectedEvents) {
+        testParserWithBytes(events.stream().map(str -> str.getBytes(StandardCharsets.UTF_8)).collect(Collectors.toList()),
+                expectedEvents);
+    }
+
+    private void testParserWithBytes(List<byte[]> events, List<InboundSseEvent> expectedEvents) {
+        SseEventSourceImpl eventSource = new SseEventSourceImpl(null, 500, TimeUnit.MILLISECONDS);
+        SseParser parser = eventSource.getSseParser();
+        CountDownLatch latch = new CountDownLatch(expectedEvents.size());
+        List<InboundSseEvent> receivedEvents = Collections.synchronizedList(new ArrayList<>(expectedEvents.size()));
+        eventSource.register(evt -> {
+            latch.countDown();
+            receivedEvents.add(evt);
+        });
+        for (byte[] event : events) {
+            parser.handle(Buffer.buffer(event));
+        }
+        // this is really synchronous, so we can't timeout
+        try {
+            latch.await(1, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        Assertions.assertEquals(expectedEvents, receivedEvents);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java
new file mode 100644
index 0000000000000..45526efd9d9d6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseResource.java
@@ -0,0 +1,101 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test.sse;
+
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.Sse;
+import javax.ws.rs.sse.SseBroadcaster;
+import javax.ws.rs.sse.SseEventSink;
+
+import org.jboss.resteasy.reactive.RestSseElementType;
+
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.mutiny.Multi;
+
+@Path("sse")
+public class SseResource {
+
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public void sse(Sse sse, SseEventSink sink) throws IOException {
+        if (sink == null) {
+            throw new IllegalStateException("No client connected.");
+        }
+        SseBroadcaster sseBroadcaster = sse.newBroadcaster();
+
+        sseBroadcaster.register(sink);
+        sseBroadcaster.broadcast(sse.newEventBuilder().data("hello").build())
+                .thenCompose(v -> sseBroadcaster.broadcast(sse.newEventBuilder().data("stef").build()))
+                .thenAccept(v -> sseBroadcaster.close());
+    }
+
+    @Path("multi")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public Multi<String> multiText() {
+        return Multi.createFrom().items("hello", "stef");
+    }
+
+    @Path("json")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    @RestSseElementType(MediaType.APPLICATION_JSON)
+    public void sseJson(Sse sse, SseEventSink sink) throws IOException {
+        if (sink == null) {
+            throw new IllegalStateException("No client connected.");
+        }
+        SseBroadcaster sseBroadcaster = sse.newBroadcaster();
+
+        sseBroadcaster.register(sink);
+        sseBroadcaster.broadcast(sse.newEventBuilder().data(new Message("hello")).build())
+                .thenCompose(v -> sseBroadcaster.broadcast(sse.newEventBuilder().data(new Message("stef")).build()))
+                .thenAccept(v -> sseBroadcaster.close());
+    }
+
+    @Blocking
+    @Path("blocking/json")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    @RestSseElementType(MediaType.APPLICATION_JSON)
+    public void blockingSseJson(Sse sse, SseEventSink sink) throws IOException {
+        if (sink == null) {
+            throw new IllegalStateException("No client connected.");
+        }
+        SseBroadcaster sseBroadcaster = sse.newBroadcaster();
+
+        sseBroadcaster.register(sink);
+        sseBroadcaster.broadcast(sse.newEventBuilder().data(new Message("hello")).build())
+                .thenCompose(v -> sseBroadcaster.broadcast(sse.newEventBuilder().data(new Message("stef")).build()))
+                .thenAccept(v -> sseBroadcaster.close());
+    }
+
+    @Path("json2")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public void sseJson2(Sse sse, SseEventSink sink) throws IOException {
+        if (sink == null) {
+            throw new IllegalStateException("No client connected.");
+        }
+        SseBroadcaster sseBroadcaster = sse.newBroadcaster();
+
+        // Same as sseJson but set mediaType in builder
+        sseBroadcaster.register(sink);
+        sseBroadcaster
+                .broadcast(sse.newEventBuilder().data(new Message("hello")).mediaType(MediaType.APPLICATION_JSON_TYPE).build())
+                .thenCompose(v -> sseBroadcaster.broadcast(
+                        sse.newEventBuilder().mediaType(MediaType.APPLICATION_JSON_TYPE).data(new Message("stef")).build()))
+                .thenAccept(v -> sseBroadcaster.close());
+    }
+
+    @Path("json/multi")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    @RestSseElementType(MediaType.APPLICATION_JSON)
+    public Multi<Message> multiJson() {
+        return Multi.createFrom().items(new Message("hello"), new Message("stef"));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java
new file mode 100644
index 0000000000000..cc4abb6b1ed4a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/deployment/src/test/java/io/quarkus/resteasy/reactive/jsonb/deployment/test/sse/SseTestCase.java
@@ -0,0 +1,113 @@
+package io.quarkus.resteasy.reactive.jsonb.deployment.test.sse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEventSource;
+
+import org.jboss.resteasy.reactive.client.impl.MultiInvoker;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.smallrye.mutiny.Multi;
+
+public class SseTestCase {
+
+    @TestHTTPResource
+    URI uri;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SseResource.class, Message.class));
+
+    @Test
+    public void testSseFromSse() throws Exception {
+        testSse("sse");
+    }
+
+    @Test
+    public void testSseFromMulti() throws Exception {
+        testSse("sse/multi");
+    }
+
+    private void testSse(String path) throws Exception {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + path);
+        // do not reconnect
+        try (SseEventSource eventSource = SseEventSource.target(target).reconnectingEvery(Integer.MAX_VALUE, TimeUnit.SECONDS)
+                .build()) {
+            CompletableFuture<List<String>> res = new CompletableFuture<>();
+            List<String> collect = Collections.synchronizedList(new ArrayList<>());
+            eventSource.register(new Consumer<InboundSseEvent>() {
+                @Override
+                public void accept(InboundSseEvent inboundSseEvent) {
+                    collect.add(inboundSseEvent.readData());
+                }
+            }, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable throwable) {
+                    res.completeExceptionally(throwable);
+                }
+            }, () -> {
+                res.complete(collect);
+            });
+            eventSource.open();
+            assertThat(res.get(5, TimeUnit.SECONDS)).containsExactly("hello", "stef");
+        }
+    }
+
+    @Test
+    public void testMultiFromSse() {
+        testMulti("sse");
+    }
+
+    @Test
+    public void testMultiFromMulti() {
+        testMulti("sse/multi");
+    }
+
+    private void testMulti(String path) {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + path);
+        Multi<String> multi = target.request().rx(MultiInvoker.class).get(String.class);
+        List<String> list = multi.collect().asList().await().atMost(Duration.ofSeconds(30));
+        assertThat(list).containsExactly("hello", "stef");
+    }
+
+    @Test
+    public void testJsonMultiFromSse() {
+        testJsonMulti("sse/json");
+        testJsonMulti("sse/json2");
+        testJsonMulti("sse/blocking/json");
+    }
+
+    @Test
+    public void testJsonMultiFromMulti() {
+        testJsonMulti("sse/json/multi");
+    }
+
+    private void testJsonMulti(String path) {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + path);
+        Multi<Message> multi = target.request().rx(MultiInvoker.class).get(Message.class);
+        List<Message> list = multi.collect().asList().await().atMost(Duration.ofSeconds(30));
+        assertThat(list).extracting("name").containsExactly("hello", "stef");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/pom.xml
new file mode 100644
index 0000000000000..336a66cbe3085
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-jsonb-parent</artifactId>
+    <name>Quarkus - RESTEasy Reactive - JSON-B</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml
new file mode 100644
index 0000000000000..806eb660cb514
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-jsonb-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
+    <name>Quarkus - RESTEasy Reactive - JSON-B - Runtime</name>
+    <description>JSON-B integration for RESTEasy Reactive. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/JsonbMessageBodyReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/JsonbMessageBodyReader.java
new file mode 100644
index 0000000000000..e96bca33ba906
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/JsonbMessageBodyReader.java
@@ -0,0 +1,45 @@
+package io.quarkus.resteasy.reactive.jsonb.runtime.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.inject.Inject;
+import javax.json.bind.Jsonb;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.common.util.EmptyInputStream;
+import org.jboss.resteasy.reactive.server.providers.serialisers.json.AbstractJsonMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class JsonbMessageBodyReader extends AbstractJsonMessageBodyReader {
+
+    private final Jsonb json;
+
+    @Inject
+    public JsonbMessageBodyReader(Jsonb json) {
+        this.json = json;
+    }
+
+    @Override
+    public Object readFrom(Class<Object> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return doReadFrom(type, genericType, entityStream);
+    }
+
+    @Override
+    public Object readFrom(Class<Object> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return doReadFrom(type, genericType, context.getInputStream());
+    }
+
+    private Object doReadFrom(Class<Object> type, Type genericType, InputStream entityStream) {
+        if (entityStream instanceof EmptyInputStream) {
+            return null;
+        }
+        return json.fromJson(entityStream, genericType != null ? genericType : type);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/JsonbMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/JsonbMessageBodyWriter.java
new file mode 100644
index 0000000000000..93bbbf7aaf8bb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/JsonbMessageBodyWriter.java
@@ -0,0 +1,89 @@
+package io.quarkus.resteasy.reactive.jsonb.runtime.serialisers;
+
+import static org.jboss.resteasy.reactive.server.vertx.providers.serialisers.json.JsonMessageBodyWriterUtil.*;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.inject.Inject;
+import javax.json.bind.Jsonb;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class JsonbMessageBodyWriter extends ServerMessageBodyWriter.AllWriteableMessageBodyWriter {
+
+    private final Jsonb json;
+
+    @Inject
+    public JsonbMessageBodyWriter(Jsonb json) {
+        this.json = json;
+    }
+
+    @Override
+    public void writeTo(Object o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        setContentTypeIfNecessary(httpHeaders);
+        if (o instanceof String) { // YUK: done in order to avoid adding extra quotes...
+            entityStream.write(((String) o).getBytes());
+        } else {
+            json.toJson(o, type, entityStream);
+        }
+    }
+
+    @Override
+    public void writeResponse(Object o, Type genericType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        setContentTypeIfNecessary(context);
+        OutputStream originalStream = context.getOrCreateOutputStream();
+        OutputStream stream = new NoopCloseAndFlushOutputStream(originalStream);
+        if (o instanceof String) { // YUK: done in order to avoid adding extra quotes...
+            stream.write(((String) o).getBytes());
+        } else {
+            json.toJson(o, stream);
+        }
+        // we don't use try-with-resources because that results in writing to the http output without the exception mapping coming into play
+        originalStream.close();
+    }
+
+    /**
+     * This class is needed because Yasson doesn't give us a way to control if the output stream is going to be closed or not
+     */
+    private static class NoopCloseAndFlushOutputStream extends OutputStream {
+        private final OutputStream delegate;
+
+        public NoopCloseAndFlushOutputStream(OutputStream delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void flush() {
+
+        }
+
+        @Override
+        public void close() {
+
+        }
+
+        @Override
+        public void write(int b) throws IOException {
+            delegate.write(b);
+        }
+
+        @Override
+        public void write(byte[] b) throws IOException {
+            delegate.write(b);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            delegate.write(b, off, len);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/vertx/VertxJson.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/vertx/VertxJson.java
new file mode 100644
index 0000000000000..73d567587aaf1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/java/io/quarkus/resteasy/reactive/jsonb/runtime/serialisers/vertx/VertxJson.java
@@ -0,0 +1,145 @@
+package io.quarkus.resteasy.reactive.jsonb.runtime.serialisers.vertx;
+
+import java.lang.reflect.Type;
+
+import javax.json.JsonNumber;
+import javax.json.JsonValue;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+/**
+ * Provides Vert.x JSON Object/Array <-> JsonB serializers and deserializers.
+ *
+ * These are useful when you use a List of JsonObject or JsonArray, as the serialization use JSON-B to serializer the
+ * contained items.
+ */
+public final class VertxJson {
+
+    private VertxJson() {
+
+    }
+
+    public static void copy(JsonObject object, javax.json.JsonObject origin) {
+        origin.keySet().forEach(key -> {
+            JsonValue value = origin.get(key);
+            JsonValue.ValueType kind = value.getValueType();
+
+            switch (kind) {
+                case STRING:
+                    object.put(key, origin.getString(key));
+                    break;
+                case NULL:
+                    object.putNull(key);
+                    break;
+                case TRUE:
+                    object.put(key, true);
+                    break;
+                case FALSE:
+                    object.put(key, false);
+                    break;
+                case NUMBER:
+                    JsonNumber number = origin.getJsonNumber(key);
+                    if (number.isIntegral()) {
+                        object.put(key, number.longValue());
+                    } else {
+                        object.put(key, number.doubleValue());
+                    }
+                    break;
+                case ARRAY:
+                    JsonArray array = new JsonArray();
+                    copy(array, origin.getJsonArray(key));
+                    object.put(key, array);
+                    break;
+                case OBJECT:
+                    JsonObject json = new JsonObject();
+                    copy(json, origin.getJsonObject(key));
+                    object.put(key, json);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown JSON Value " + kind);
+            }
+        });
+    }
+
+    public static void copy(JsonArray array, javax.json.JsonArray origin) {
+        for (int i = 0; i < origin.size(); i++) {
+            JsonValue value = origin.get(i);
+            JsonValue.ValueType kind = value.getValueType();
+            switch (kind) {
+                case STRING:
+                    array.add(origin.getString(i));
+                    break;
+                case TRUE:
+                    array.add(true);
+                    break;
+                case FALSE:
+                    array.add(false);
+                    break;
+                case NULL:
+                    array.addNull();
+                    break;
+                case NUMBER:
+                    JsonNumber number = origin.getJsonNumber(i);
+                    if (number.isIntegral()) {
+                        array.add(number.longValue());
+                    } else {
+                        array.add(number.doubleValue());
+                    }
+                    break;
+                case ARRAY:
+                    JsonArray newArray = new JsonArray();
+                    copy(newArray, origin.getJsonArray(i));
+                    array.add(newArray);
+                    break;
+                case OBJECT:
+                    JsonObject newObject = new JsonObject();
+                    copy(newObject, origin.getJsonObject(i));
+                    array.add(newObject);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown JSON Value " + kind);
+            }
+        }
+    }
+
+    public static class JsonObjectSerializer implements JsonbSerializer<JsonObject> {
+        @Override
+        public void serialize(JsonObject json, JsonGenerator generator, SerializationContext ctxt) {
+            ctxt.serialize(json.getMap(), generator);
+        }
+    }
+
+    public static class JsonArrayDeserializer implements JsonbDeserializer<JsonArray> {
+
+        @Override
+        public JsonArray deserialize(JsonParser parser, DeserializationContext context, Type type) {
+            JsonArray object = new JsonArray();
+            copy(object, parser.getArray());
+            return object;
+        }
+    }
+
+    public static class JsonArraySerializer implements JsonbSerializer<JsonArray> {
+        @Override
+        public void serialize(JsonArray json, JsonGenerator generator, SerializationContext ctxt) {
+            ctxt.serialize(json.getList(), generator);
+        }
+    }
+
+    public static class JsonObjectDeserializer implements JsonbDeserializer<JsonObject> {
+
+        @Override
+        public JsonObject deserialize(JsonParser parser, DeserializationContext context, Type type) {
+            JsonObject object = new JsonObject();
+            copy(object, parser.getObject());
+            return object;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..0ab5c086c2931
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,16 @@
+---
+name: "RESTEasy Reactive JSON-B"
+metadata:
+  short-name: "resteasy-reactive-jsonb"
+  keywords:
+    - "rest-jsonb"
+    - "resteasy-reactive-json"
+    - "jaxrs-json"
+    - "rest"
+    - "jaxrs"
+    - "json"
+    - "jsonb"
+  categories:
+  - "web"
+  - "reactive"
+  status: "experimental"
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/pom.xml
new file mode 100644
index 0000000000000..85e62f0fa707e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-qute-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-reactive-qute-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Qute - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-qute-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-qute</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/main/java/io/quarkus/resteasy/reactive/qute/deployment/ResteasyReactiveQuteProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/main/java/io/quarkus/resteasy/reactive/qute/deployment/ResteasyReactiveQuteProcessor.java
new file mode 100644
index 0000000000000..308a079fb51a5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/main/java/io/quarkus/resteasy/reactive/qute/deployment/ResteasyReactiveQuteProcessor.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.resteasy.reactive.qute.runtime.TemplateResponseFilter;
+import io.quarkus.resteasy.reactive.spi.CustomContainerResponseFilterBuildItem;
+
+public class ResteasyReactiveQuteProcessor {
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.RESTEASY_REACTIVE_QUTE);
+    }
+
+    @BuildStep
+    CustomContainerResponseFilterBuildItem registerProviders() {
+        return new CustomContainerResponseFilterBuildItem(TemplateResponseFilter.class.getName());
+    }
+
+    @BuildStep
+    ReflectiveHierarchyIgnoreWarningBuildItem ignoreReflectiveWarning() {
+        return new ReflectiveHierarchyIgnoreWarningBuildItem(new ReflectiveHierarchyIgnoreWarningBuildItem.DotNameExclusion(
+                DotName.createSimple(TemplateInstance.class.getName())));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java
new file mode 100644
index 0000000000000..e710f541501a3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessageHelloResource.java
@@ -0,0 +1,33 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import java.util.Locale;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.i18n.MessageBundles;
+
+@Path("hello")
+public class AppMessageHelloResource {
+
+    @Inject
+    Template hello;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public TemplateInstance get() {
+        return hello.instance();
+    }
+
+    @GET
+    @Path("de")
+    @Produces(MediaType.TEXT_PLAIN)
+    public TemplateInstance helloDe() {
+        return hello.instance().setAttribute(MessageBundles.ATTRIBUTE_LOCALE, Locale.GERMAN);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessages.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessages.java
new file mode 100644
index 0000000000000..966f0fe667cd9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/AppMessages.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import io.quarkus.qute.i18n.Message;
+import io.quarkus.qute.i18n.MessageBundle;
+
+@MessageBundle
+public interface AppMessages {
+
+    @Message("Hello world!")
+    String hello();
+
+    @Message("Hello {name}!")
+    String hello_name(String name);
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java
new file mode 100644
index 0000000000000..c5bef35231aec
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/HelloResource.java
@@ -0,0 +1,83 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+import io.quarkus.resteasy.reactive.qute.RestTemplate;
+
+@Path("hello")
+public class HelloResource {
+
+    @CheckedTemplate
+    public static class Templates {
+        // GENERATED    
+        //        {
+        //            Template template = Arc.container().instance(Engine.class).get().getTemplate("HelloResource/typedTemplate");
+        //            TemplateInstance instance = template.instance();
+        //            instance.data("name", name);
+        //            return instance;
+        //        }
+
+        public static native TemplateInstance typedTemplate(String name, Map<String, Object> other);
+
+        public static native TemplateInstance typedTemplatePrimitives(boolean bool, byte b, short s, int i, long l, char c,
+                float f, double d);
+    }
+
+    @Inject
+    Template hello;
+
+    @GET
+    public TemplateInstance get(@QueryParam("name") String name) {
+        if (name == null) {
+            name = "world";
+        }
+        return hello.data("name", name);
+    }
+
+    @Path("no-injection")
+    @GET
+    public TemplateInstance hello(@QueryParam("name") String name) {
+        if (name == null) {
+            name = "world";
+        }
+        return RestTemplate.data("name", name);
+    }
+
+    @Path("type-error")
+    @GET
+    public TemplateInstance typeError() {
+        return RestTemplate.data("name", "world");
+    }
+
+    @Path("native/typed-template-primitives")
+    @GET
+    public TemplateInstance typedTemplatePrimitives() {
+        return Templates.typedTemplatePrimitives(true, (byte) 0, (short) 1, 2, 3, 'a', 4.0f, 5.0);
+    }
+
+    @Path("native/typed-template")
+    @GET
+    public TemplateInstance nativeTypedTemplate(@QueryParam("name") String name) {
+        if (name == null) {
+            name = "world";
+        }
+        return Templates.typedTemplate(name, null);
+    }
+
+    @Path("native/toplevel")
+    @GET
+    public TemplateInstance nativeToplevelTypedTemplate(@QueryParam("name") String name) {
+        if (name == null) {
+            name = "world";
+        }
+        return io.quarkus.resteasy.reactive.qute.deployment.Templates.toplevel(name);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java
new file mode 100644
index 0000000000000..5e913fa1cb6ef
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/ItemResource.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+
+@Path("item")
+public class ItemResource {
+
+    @Inject
+    Template item;
+
+    @GET
+    @Path("{id}")
+    @Produces({ MediaType.TEXT_HTML, MediaType.TEXT_PLAIN })
+    public TemplateInstance get(@PathParam("id") Integer id) {
+        return item.data(new Item(id, "foo"));
+    }
+
+    public static class Item {
+
+        public final Integer price;
+        public final String name;
+
+        public Item(Integer price, String name) {
+            this.price = price;
+            this.name = name;
+        }
+
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java
new file mode 100644
index 0000000000000..ebfd456b94ac4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MessageBundleDevModeTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class MessageBundleDevModeTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AppMessages.class, AppMessageHelloResource.class)
+                    .addAsResource(new StringAsset(
+                            "{msg:hello_name('Georg')}"),
+                            "templates/hello.html")
+                    .addAsResource(new StringAsset(
+                            "hello=Hallo Welt!\nhello_name=Hallo {name}!"),
+                            "messages/msg_de.properties"));
+
+    @Test
+    public void testMessageBundles() {
+        when().get("/hello").then().body(is("Hello Georg!"));
+        TEST.modifySourceFile("AppMessages.java", (s -> s.replace("Hello", "Heya")));
+        when().get("/hello").then().body(is("Heya Georg!"));
+
+        when().get("/hello/de").then().body(is("Hallo Georg!"));
+        TEST.modifyResourceFile("messages/msg_de.properties", (s -> s.replace("Hallo", "Heya")));
+        when().get("/hello/de").then().body(is("Heya Georg!"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java
new file mode 100644
index 0000000000000..a26599371e6b1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateResource.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import java.util.Map;
+
+import javax.ws.rs.Path;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+
+@Path("missing-template")
+public class MissingTemplateResource {
+
+    @CheckedTemplate
+    public static class Templates {
+        public static native TemplateInstance hello(String name, Map<String, Object> other);
+
+        public static native TemplateInstance missingTemplate();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java
new file mode 100644
index 0000000000000..c17fda7ce455b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.qute.TemplateException;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MissingTemplateTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest configError = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MissingTemplateResource.class)
+                    .addAsResource("templates/MissingTemplateResource/hello.txt"))
+            .setExpectedException(TemplateException.class);
+
+    @Test
+    public void emptyTest() {
+        fail();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java
new file mode 100644
index 0000000000000..8adab770a90f2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TemplateResponseFilterTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import static io.restassured.RestAssured.when;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+
+public class TemplateResponseFilterTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(HelloResource.class)
+                    .addClass(Templates.class)
+                    .addAsResource("templates/toplevel.txt")
+                    .addAsResource("templates/HelloResource/hello.txt")
+                    .addAsResource("templates/HelloResource/typedTemplate.txt")
+                    .addAsResource("templates/HelloResource/typedTemplate.html")
+                    .addAsResource("templates/HelloResource/typedTemplatePrimitives.txt")
+                    .addAsResource(new StringAsset("Hello {name}!"), "templates/hello.txt"));
+
+    @Test
+    public void testFilter() {
+        when().get("/hello").then().body(Matchers.is("Hello world!"));
+        when().get("/hello?name=Joe").then().body(Matchers.is("Hello Joe!"));
+        when().get("/hello/no-injection").then().body(Matchers.is("Salut world!"));
+        when().get("/hello/no-injection?name=Joe").then().body(Matchers.is("Salut Joe!"));
+        RestAssured.given().accept(ContentType.TEXT).get("/hello/native/typed-template").then()
+                .body(Matchers.is("Salut world!"));
+        RestAssured.given().accept(ContentType.TEXT).get("/hello/native/typed-template?name=Joe").then()
+                .body(Matchers.is("Salut Joe!"));
+        RestAssured.given().accept(ContentType.HTML).get("/hello/native/typed-template?name=Joe").then()
+                .body(Matchers.is("<html>Salut Joe!</html>"));
+        when().get("/hello/native/typed-template-primitives").then()
+                .body(Matchers.is("Byte: 0 Short: 1 Int: 2 Long: 3 Char: a Boolean: true Float: 4.0 Double: 5.0"));
+        when().get("/hello/native/toplevel?name=Joe").then().body(Matchers.is("Salut Joe!"));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/Templates.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/Templates.java
new file mode 100644
index 0000000000000..30bf36437f345
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/Templates.java
@@ -0,0 +1,9 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+
+@CheckedTemplate
+public class Templates {
+    public static native TemplateInstance toplevel(String name);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java
new file mode 100644
index 0000000000000..981d22b64e2a4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.api.CheckedTemplate;
+
+@Path("type-error")
+public class TypeErrorResource {
+
+    @CheckedTemplate
+    public static class Templates {
+        public static native TemplateInstance typeError3(String name);
+    }
+
+    @Path("native/type-error3")
+    @GET
+    public TemplateInstance nativeTypeError3() {
+        return Templates.typeError3("world");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java
new file mode 100644
index 0000000000000..f390ac8086912
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TypeErrorTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest configError = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(HelloResource.class)
+                    .addAsResource("templates/HelloResource/hello.txt")
+                    .addAsResource("templates/HelloResource/typeError.txt")
+                    .addAsResource("templates/HelloResource/typedTemplate.txt")
+                    .addAsResource("templates/HelloResource/typedTemplatePrimitives.txt")
+                    .addAsResource(new StringAsset("Hello {name}!"), "templates/hello.txt"))
+            .assertException(t -> {
+                assertTrue(t.getMessage().contains("Incorrect expression"));
+                assertTrue(t.getMessage().contains("name.foo()"));
+            });
+
+    @Test
+    public void emptyTest() {
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java
new file mode 100644
index 0000000000000..3cb7eb7267ac0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/TypeErrorTest3.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.wildfly.common.Assert;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class TypeErrorTest3 {
+
+    @RegisterExtension
+    static final QuarkusUnitTest configError = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(TypeErrorResource.class)
+                    .addAsResource("templates/TypeErrorResource/typeError3.txt"))
+            .assertException(t -> {
+                t.printStackTrace();
+                Assert.assertTrue(t.getMessage().contains("Incorrect expression: name.foo()"));
+            });
+
+    @Test
+    public void emptyTest() {
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java
new file mode 100644
index 0000000000000..d455a7becb0ab
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/VariantTemplateTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.reactive.qute.deployment;
+
+import static io.restassured.RestAssured.given;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.qute.deployment.ItemResource.Item;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class VariantTemplateTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ItemResource.class, Item.class)
+                    .addAsResource(new StringAsset("Item {name}: {price}"), "templates/item.txt")
+                    .addAsResource(new StringAsset("<html><body>Item {name}: {price}</body></html>"),
+                            "templates/item.html"));
+
+    @Test
+    public void testVariant() {
+        given().when().accept("text/plain").get("/item/10").then().body(Matchers.is("Item foo: 10"));
+        given().when().accept("text/html").get("/item/20").then().body(Matchers.is("<html><body>Item foo: 20</body></html>"));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/hello.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/hello.txt
new file mode 100644
index 0000000000000..8c2a722b8984a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/hello.txt
@@ -0,0 +1 @@
+Salut {name}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typeError.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typeError.txt
new file mode 100644
index 0000000000000..7b7d4ddcdae5e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typeError.txt
@@ -0,0 +1 @@
+{@java.lang.String name}Salut {name.foo()}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typeError2.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typeError2.txt
new file mode 100644
index 0000000000000..e6a6bf71b26d6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typeError2.txt
@@ -0,0 +1 @@
+Salut {name.foo()}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplate.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplate.html
new file mode 100644
index 0000000000000..f8f74faf3cf34
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplate.html
@@ -0,0 +1 @@
+<html>Salut {name}!</html>
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplate.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplate.txt
new file mode 100644
index 0000000000000..8c2a722b8984a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplate.txt
@@ -0,0 +1 @@
+Salut {name}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplatePrimitives.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplatePrimitives.txt
new file mode 100644
index 0000000000000..534874e943163
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/HelloResource/typedTemplatePrimitives.txt
@@ -0,0 +1 @@
+Byte: {b} Short: {s} Int: {i} Long: {l} Char: {c} Boolean: {bool} Float: {f} Double: {d}
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/MissingTemplateResource/hello.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/MissingTemplateResource/hello.txt
new file mode 100644
index 0000000000000..8c2a722b8984a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/MissingTemplateResource/hello.txt
@@ -0,0 +1 @@
+Salut {name}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/TypeErrorResource/typeError3.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/TypeErrorResource/typeError3.txt
new file mode 100644
index 0000000000000..e6a6bf71b26d6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/TypeErrorResource/typeError3.txt
@@ -0,0 +1 @@
+Salut {name.foo()}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/toplevel.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/toplevel.txt
new file mode 100644
index 0000000000000..8c2a722b8984a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/resources/templates/toplevel.txt
@@ -0,0 +1 @@
+Salut {name}!
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/pom.xml
new file mode 100644
index 0000000000000..3f2d9192a5c09
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-qute-parent</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Qute</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/pom.xml
new file mode 100644
index 0000000000000..20240af5f215c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-qute-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-resteasy-reactive-qute</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Qute - Runtime</name>
+    <description>Qute integration for RESTEasy Reactive. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-qute</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/RestTemplate.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/RestTemplate.java
new file mode 100644
index 0000000000000..e57e2e2f76afd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/RestTemplate.java
@@ -0,0 +1,33 @@
+package io.quarkus.resteasy.reactive.qute;
+
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+
+// TODO: We probably want to share this with quarkus-resteasy-qute somehow...
+public final class RestTemplate {
+
+    private RestTemplate() {
+    }
+
+    private static String getActionName() {
+        ResteasyReactiveRequestContext otherHttpContextObject = CurrentRequestManager.get();
+        SimpleResourceInfo resourceMethod = otherHttpContextObject.getTarget().getSimplifiedResourceInfo();
+        return resourceMethod.getResourceClass().getSimpleName() + "/" + resourceMethod.getMethodName();
+    }
+
+    public static TemplateInstance data(String name, Object value) {
+        Template template = Arc.container().instance(Engine.class).get().getTemplate(getActionName());
+        return template.data(name, value);
+    }
+
+    public static TemplateInstance data(Object data) {
+        Template template = Arc.container().instance(Engine.class).get().getTemplate(getActionName());
+        return template.data(data);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java
new file mode 100644
index 0000000000000..458c8a6f7bea2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseFilter.java
@@ -0,0 +1,66 @@
+package io.quarkus.resteasy.reactive.qute.runtime;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+
+import io.quarkus.qute.TemplateInstance;
+import io.quarkus.qute.Variant;
+import io.smallrye.mutiny.Uni;
+
+public class TemplateResponseFilter {
+
+    @SuppressWarnings("unchecked")
+    @ServerResponseFilter
+    public Uni<Void> filter(ResteasyReactiveContainerRequestContext requestContext, ContainerResponseContext responseContext) {
+        Object entity = responseContext.getEntity();
+        if (!(entity instanceof TemplateInstance)) {
+            return null;
+        }
+
+        MediaType mediaType;
+        TemplateInstance instance = (TemplateInstance) entity;
+        Object variantsAttr = instance.getAttribute(TemplateInstance.VARIANTS);
+        if (variantsAttr != null) {
+            List<javax.ws.rs.core.Variant> variants = new ArrayList<>();
+            for (Variant variant : (List<Variant>) variantsAttr) {
+                variants.add(new javax.ws.rs.core.Variant(MediaType.valueOf(variant.getMediaType()), variant.getLocale(),
+                        variant.getEncoding()));
+            }
+            javax.ws.rs.core.Variant selected = requestContext.getRequest()
+                    .selectVariant(variants);
+
+            if (selected != null) {
+                Locale selectedLocale = selected.getLanguage();
+                if (selectedLocale == null) {
+                    List<Locale> acceptableLocales = requestContext.getAcceptableLanguages();
+                    if (!acceptableLocales.isEmpty()) {
+                        selectedLocale = acceptableLocales.get(0);
+                    }
+                }
+                instance.setAttribute(TemplateInstance.SELECTED_VARIANT,
+                        new Variant(selectedLocale, selected.getMediaType().toString(), selected.getEncoding()));
+                mediaType = selected.getMediaType();
+            } else {
+                mediaType = responseContext.getMediaType();
+            }
+        } else {
+            mediaType = responseContext.getMediaType();
+        }
+
+        return instance.createUni().chain(r -> {
+            if (mediaType != null) {
+                responseContext.setEntity(r, null, mediaType);
+            } else {
+                responseContext.setEntity(r);
+            }
+            return Uni.createFrom().nullItem();
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..9d2c354be3b61
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,12 @@
+---
+name: "RESTEasy Reactive Qute"
+metadata:
+  keywords:
+    - "templating"
+    - "templates"
+    - "rest"
+  categories:
+    - "web"
+    - "reactive"
+  status: "experimental"
+
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/pom.xml
new file mode 100644
index 0000000000000..cf2a4615ce3d2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-servlet-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-servlet-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive Servlet - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <!--  Move SSE tests into separate execution as they seem to be flaky, probably due to resource constraints in CI  -->
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>%regex[.*Sse.*Test.*]</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sse</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>%regex[.*Sse.*Test.*]</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java
new file mode 100644
index 0000000000000..24d975f8d12c9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/main/java/io/quarkus/resteasy/reactive/server/servlet/deployment/ResteasyReactiveServletProcessor.java
@@ -0,0 +1,66 @@
+package io.quarkus.resteasy.reactive.server.servlet.deployment;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import javax.servlet.DispatcherType;
+import javax.ws.rs.core.Application;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.resteasy.reactive.server.deployment.RequestContextFactoryBuildItem;
+import io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveDeploymentBuildItem;
+import io.quarkus.resteasy.reactive.server.servlet.runtime.ResteasyReactiveFilter;
+import io.quarkus.resteasy.reactive.server.servlet.runtime.ResteasyReactiveServlet;
+import io.quarkus.resteasy.reactive.server.servlet.runtime.ResteasyReactiveServletRecorder;
+import io.quarkus.resteasy.reactive.server.servlet.runtime.ServletRequestContextFactory;
+import io.quarkus.undertow.deployment.FilterBuildItem;
+import io.quarkus.undertow.deployment.ServletBuildItem;
+
+/**
+ * Processor that finds JAX-RS classes in the deployment
+ */
+public class ResteasyReactiveServletProcessor {
+
+    private static final String JAVAX_WS_RS_APPLICATION = Application.class.getName();
+    private static final String JAX_RS_FILTER_NAME = JAVAX_WS_RS_APPLICATION;
+    private static final String JAX_RS_SERVLET_NAME = JAVAX_WS_RS_APPLICATION;
+
+    @BuildStep
+    public RequestContextFactoryBuildItem contextFactoryBuildItem() {
+        return new RequestContextFactoryBuildItem(ServletRequestContextFactory.INSTANCE);
+    }
+
+    @BuildStep
+    @Record(STATIC_INIT)
+    public void build(ResteasyReactiveServletRecorder restRecorder,
+            ResteasyReactiveDeploymentBuildItem deploymentBuildItem,
+            BuildProducer<FilterBuildItem> filter,
+            BuildProducer<ServletBuildItem> servlet) throws Exception {
+
+        if (deploymentBuildItem == null) {
+            return;
+        }
+
+        String path = deploymentBuildItem.getApplicationPath();
+
+        //if JAX-RS is installed at the root location we use a filter, otherwise we use a Servlet and take over the whole mapped path
+        if (path.equals("/") || path.isEmpty()) {
+            filter.produce(
+                    FilterBuildItem.builder(JAX_RS_FILTER_NAME, ResteasyReactiveFilter.class.getName()).setLoadOnStartup(1)
+                            .addFilterServletNameMapping("default", DispatcherType.REQUEST)
+                            .addFilterServletNameMapping("default", DispatcherType.FORWARD)
+                            .addFilterServletNameMapping("default", DispatcherType.INCLUDE)
+                            .setInstanceFactory(restRecorder.filter(deploymentBuildItem.getDeployment()))
+                            .setAsyncSupported(true)
+                            .build());
+        } else {
+            String mappingPath = deploymentBuildItem.getApplicationPath();
+            servlet.produce(ServletBuildItem.builder(JAX_RS_SERVLET_NAME, ResteasyReactiveServlet.class.getName())
+                    .setInstanceFactory(restRecorder.servlet(deploymentBuildItem.getDeployment()))
+                    .setLoadOnStartup(1).addMapping(mappingPath + "/*").setAsyncSupported(true).build());
+        }
+
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/test/java/io/quarkus/resteasy/reactive/server/servlet/test/ServletSimpleRestTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/test/java/io/quarkus/resteasy/reactive/server/servlet/test/ServletSimpleRestTestCase.java
new file mode 100644
index 0000000000000..5d0b8918fd0ee
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/deployment/src/test/java/io/quarkus/resteasy/reactive/server/servlet/test/ServletSimpleRestTestCase.java
@@ -0,0 +1,6 @@
+package io.quarkus.resteasy.reactive.server.servlet.test;
+
+import io.quarkus.resteasy.reactive.server.test.simple.SimpleQuarkusRestTestCase;
+
+public class ServletSimpleRestTestCase extends SimpleQuarkusRestTestCase {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/pom.xml
new file mode 100644
index 0000000000000..fe11155672299
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-servlet-parent</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Servlet</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/pom.xml
new file mode 100644
index 0000000000000..49c6d498853b4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-servlet-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-servlet</artifactId>
+    <name>Quarkus - RESTEasy Reactive Servlet - Runtime</name>
+    <description>Servlet support for Quarkus RESTEasy Reactive</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/EnumerationIterable.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/EnumerationIterable.java
new file mode 100644
index 0000000000000..0b9116f13e888
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/EnumerationIterable.java
@@ -0,0 +1,32 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * Single shot wrapper for an enum that allows it to be used in for-each loops
+ * 
+ * @param <T>
+ */
+public class EnumerationIterable<T> implements Iterable<T>, Iterator<T> {
+    private final Enumeration<T> enumeration;
+
+    public EnumerationIterable(Enumeration<T> enumeration) {
+        this.enumeration = enumeration;
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return this;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return enumeration.hasMoreElements();
+    }
+
+    @Override
+    public T next() {
+        return enumeration.nextElement();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java
new file mode 100644
index 0000000000000..2f09a797de3c6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveFilter.java
@@ -0,0 +1,36 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+
+import io.undertow.servlet.handlers.ServletRequestContext;
+import io.undertow.servlet.spec.HttpServletRequestImpl;
+
+public class ResteasyReactiveFilter extends HttpFilter {
+
+    private final RestInitialHandler initialHandler;
+
+    public ResteasyReactiveFilter(Deployment deployment) {
+        this.initialHandler = new RestInitialHandler(deployment);
+    }
+
+    @Override
+    protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
+            throws IOException, ServletException {
+        HttpServletRequest request = req;
+        while (request instanceof HttpServletRequestWrapper) {
+            request = (HttpServletRequest) ((HttpServletRequestWrapper) request).getRequest();
+        }
+        initialHandler.beginProcessing(
+                ((HttpServletRequestImpl) request).getExchange().getAttachment(ServletRequestContext.ATTACHMENT_KEY));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java
new file mode 100644
index 0000000000000..aa126a3b7dfd3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServlet.java
@@ -0,0 +1,34 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+
+import io.undertow.servlet.handlers.ServletRequestContext;
+import io.undertow.servlet.spec.HttpServletRequestImpl;
+
+public class ResteasyReactiveServlet extends HttpServlet {
+
+    private final RestInitialHandler initialHandler;
+
+    public ResteasyReactiveServlet(Deployment deployment) {
+        this.initialHandler = new RestInitialHandler(deployment);
+    }
+
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        HttpServletRequest request = req;
+        while (request instanceof HttpServletRequestWrapper) {
+            request = (HttpServletRequest) ((HttpServletRequestWrapper) request).getRequest();
+        }
+        initialHandler.beginProcessing(
+                ((HttpServletRequestImpl) request).getExchange().getAttachment(ServletRequestContext.ATTACHMENT_KEY));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java
new file mode 100644
index 0000000000000..b599c20bf7d68
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ResteasyReactiveServletRecorder.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import io.undertow.servlet.api.InstanceFactory;
+import io.undertow.servlet.util.ImmediateInstanceFactory;
+
+@Recorder
+public class ResteasyReactiveServletRecorder {
+
+    public InstanceFactory<Servlet> servlet(RuntimeValue<Deployment> deployment) {
+        return new ImmediateInstanceFactory<>(new ResteasyReactiveServlet(deployment.getValue()));
+    }
+
+    public InstanceFactory<Filter> filter(RuntimeValue<Deployment> deployment) {
+        return new ImmediateInstanceFactory<>(new ResteasyReactiveFilter(deployment.getValue()));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java
new file mode 100644
index 0000000000000..ab2a6725e428e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContext.java
@@ -0,0 +1,577 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import javax.enterprise.event.Event;
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.SecurityContext;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+import io.netty.channel.EventLoop;
+import io.netty.util.concurrent.ScheduledFuture;
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.impl.LazyValue;
+import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveSecurityContext;
+import io.quarkus.runtime.BlockingOperationControl;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.ResponseCommitListener;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.net.impl.ConnectionBase;
+import io.vertx.ext.web.RoutingContext;
+
+public class ServletRequestContext extends ResteasyReactiveRequestContext
+        implements ServerHttpRequest, ServerHttpResponse, ResponseCommitListener {
+
+    private static final LazyValue<Event<SecurityIdentity>> SECURITY_IDENTITY_EVENT = new LazyValue<>(
+            ServletRequestContext::createEvent);
+    final RoutingContext context;
+    final HttpServletRequest request;
+    final HttpServletResponse response;
+    AsyncContext asyncContext;
+    ServletWriteListener writeListener;
+    byte[] asyncWriteData;
+    boolean closed;
+    Consumer<Throwable> asyncWriteHandler;
+    protected Consumer<ResteasyReactiveRequestContext> preCommitTask;
+
+    public ServletRequestContext(Deployment deployment, ProvidersImpl providers,
+            HttpServletRequest request, HttpServletResponse response,
+            ThreadSetupAction requestContext, ServerRestHandler[] handlerChain, ServerRestHandler[] abortHandlerChain,
+            RoutingContext context, HttpServerExchange exchange) {
+        super(deployment, providers, requestContext, handlerChain, abortHandlerChain);
+        this.request = request;
+        this.response = response;
+        this.context = context;
+        exchange.addResponseCommitListener(this);
+    }
+
+    protected boolean isRequestScopeManagementRequired() {
+        return asyncContext != null;
+    }
+
+    protected void beginAsyncProcessing() {
+        asyncContext = request.startAsync();
+    }
+
+    @Override
+    public synchronized void close() {
+        if (asyncWriteData != null) {
+            closed = true;
+        } else {
+            super.close();
+            if (asyncContext != null) {
+                asyncContext.complete();
+            }
+        }
+    }
+
+    @Override
+    public ServerHttpResponse addCloseHandler(Runnable onClose) {
+        context.response().closeHandler(v -> onClose.run());
+        return this;
+    }
+
+    @Override
+    public ServerHttpRequest serverRequest() {
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse serverResponse() {
+        return this;
+    }
+
+    protected void handleRequestScopeActivation() {
+        super.handleRequestScopeActivation();
+        QuarkusHttpUser user = (QuarkusHttpUser) context.user();
+        if (user != null) {
+            fireSecurityIdentity(user.getSecurityIdentity());
+        }
+    }
+
+    static void fireSecurityIdentity(SecurityIdentity identity) {
+        SECURITY_IDENTITY_EVENT.get().fire(identity);
+    }
+
+    static void clear() {
+        SECURITY_IDENTITY_EVENT.clear();
+    }
+
+    private static Event<SecurityIdentity> createEvent() {
+        return Arc.container().beanManager().getEvent().select(SecurityIdentity.class);
+    }
+
+    protected SecurityContext createSecurityContext() {
+        return new ResteasyReactiveSecurityContext(context);
+    }
+
+    @Override
+    protected EventLoop getEventLoop() {
+        return ((ConnectionBase) context.request().connection()).channel().eventLoop();
+    }
+
+    @Override
+    public Runnable registerTimer(long millis, Runnable task) {
+        ScheduledFuture<?> handle = getEventLoop().schedule(task, millis, TimeUnit.MILLISECONDS);
+        return new Runnable() {
+            @Override
+            public void run() {
+                handle.cancel(false);
+            }
+        };
+    }
+
+    @Override
+    public String getRequestHeader(CharSequence name) {
+        return request.getHeader(name.toString());
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> getAllRequestHeaders() {
+        List<Map.Entry<String, String>> ret = new ArrayList<>();
+        Enumeration<String> headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            String name = headerNames.nextElement();
+            for (String v : new EnumerationIterable<>(request.getHeaders(name))) {
+                ret.add(new MapEntry<>(name, v));
+            }
+        }
+        return ret;
+    }
+
+    @Override
+    public List<String> getAllRequestHeaders(String name) {
+        Enumeration<String> headers = request.getHeaders(name);
+        if (headers == null) {
+            return Collections.emptyList();
+        }
+        List<String> ret = new ArrayList<>();
+        while (headers.hasMoreElements()) {
+            ret.add(headers.nextElement());
+        }
+        return ret;
+    }
+
+    @Override
+    public boolean containsRequestHeader(CharSequence accept) {
+        return request.getHeader(accept.toString()) != null;
+    }
+
+    @Override
+    public String getRequestPath() {
+        return request.getServletPath();
+    }
+
+    @Override
+    public String getRequestMethod() {
+        return request.getMethod();
+    }
+
+    @Override
+    public String getRequestNormalisedPath() {
+        return context.normalisedPath();
+    }
+
+    @Override
+    public String getRequestAbsoluteUri() {
+        return request.getRequestURL().toString();
+    }
+
+    @Override
+    public String getRequestScheme() {
+        return request.getScheme();
+    }
+
+    @Override
+    public String getRequestHost() {
+        return context.request().host();
+    }
+
+    @Override
+    public void closeConnection() {
+        try {
+            response.getOutputStream().close();
+        } catch (IOException e) {
+            //ignore
+        }
+        context.response().close();
+    }
+
+    @Override
+    public String getFormAttribute(String name) {
+        if (context.queryParams().contains(name)) {
+            return null;
+        }
+        return request.getParameter(name);
+    }
+
+    @Override
+    public List<String> getAllFormAttributes(String name) {
+        if (context.queryParams().contains(name)) {
+            return Collections.emptyList();
+        }
+        String[] values = request.getParameterValues(name);
+        if (values == null) {
+            return Collections.emptyList();
+        }
+        return Arrays.asList(values);
+    }
+
+    @Override
+    public String getQueryParam(String name) {
+        if (!context.queryParams().contains(name)) {
+            return null;
+        }
+        return request.getParameter(name);
+    }
+
+    @Override
+    public List<String> getAllQueryParams(String name) {
+        return context.queryParam(name);
+    }
+
+    @Override
+    public String query() {
+        return request.getQueryString();
+    }
+
+    @Override
+    public Collection<String> queryParamNames() {
+        return context.queryParams().names();
+    }
+
+    @Override
+    public boolean isRequestEnded() {
+        return context.request().isEnded();
+    }
+
+    @Override
+    public void setExpectMultipart(boolean expectMultipart) {
+        //read the form data
+        request.getParameterMap();
+    }
+
+    @Override
+    public InputStream createInputStream(ByteBuffer existingData) {
+        return new ServletResteasyReactiveInputStream(existingData, request);
+    }
+
+    @Override
+    public InputStream createInputStream() {
+        try {
+            return request.getInputStream();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public ServerHttpResponse pauseRequestInput() {
+        //TODO
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse resumeRequestInput() {
+        //TODO
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse setReadListener(ReadCallback callback) {
+        byte[] buf = new byte[1024];
+        int r;
+        try {
+            InputStream in = request.getInputStream();
+            while ((r = in.read(buf)) > 0) {
+                callback.data(ByteBuffer.wrap(buf, 0, r));
+            }
+            callback.done();
+        } catch (IOException e) {
+            resume(e);
+        }
+        return this;
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> theType) {
+        if (theType == RoutingContext.class) {
+            return (T) context;
+        } else if (theType == HttpServerRequest.class) {
+            return (T) context.request();
+        } else if (theType == HttpServerResponse.class) {
+            return (T) context.response();
+        } else if (theType == HttpServletRequest.class) {
+            return (T) request;
+        } else if (theType == HttpServletResponse.class) {
+            return (T) response;
+        }
+        return null;
+    }
+
+    @Override
+    public ServerHttpResponse setStatusCode(int code) {
+        response.setStatus(code);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse end() {
+        try {
+            response.getOutputStream().close();
+        } catch (IOException e) {
+            //ignore
+        }
+        return this;
+    }
+
+    @Override
+    public boolean headWritten() {
+        return response.isCommitted();
+    }
+
+    @Override
+    public ServerHttpResponse end(byte[] data) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            try {
+                response.getOutputStream().write(data);
+                response.getOutputStream().close();
+            } catch (IOException e) {
+                log.debug("IoException writing response", e);
+            }
+        } else {
+            write(data, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable throwable) {
+                    try {
+                        response.getOutputStream().close();
+                    } catch (IOException e) {
+                        log.debug("IoException writing response", e);
+                    }
+                }
+            });
+        }
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse end(String data) {
+        end(data.getBytes(StandardCharsets.UTF_8));
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse addResponseHeader(CharSequence name, CharSequence value) {
+        response.addHeader(name.toString(), value.toString());
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse setResponseHeader(CharSequence name, CharSequence value) {
+        response.setHeader(name.toString(), value.toString());
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse setResponseHeader(CharSequence name, Iterable<CharSequence> values) {
+        for (CharSequence v : values) {
+            response.addHeader(name.toString(), v.toString());
+        }
+        return this;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> getAllResponseHeaders() {
+        List<Map.Entry<String, String>> ret = new ArrayList<>();
+        Collection<String> headerNames = response.getHeaderNames();
+        for (String name : headerNames) {
+            for (String v : response.getHeaders(name)) {
+                ret.add(new MapEntry<>(name, v));
+            }
+        }
+        return ret;
+    }
+
+    @Override
+    public boolean closed() {
+        return context.response().closed();
+    }
+
+    @Override
+    public ServerHttpResponse setChunked(boolean chunked) {
+        context.response().setChunked(chunked);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse write(byte[] data, Consumer<Throwable> asyncResultHandler) {
+        if (asyncWriteData != null) {
+            asyncResultHandler.accept(new IllegalStateException("Cannot write before data has all been written"));
+        }
+        if (asyncContext == null) {
+            try {
+                response.getOutputStream().write(data);
+                asyncResultHandler.accept(null);
+            } catch (IOException e) {
+                asyncResultHandler.accept(e);
+            }
+        } else {
+            synchronized (this) {
+                if (asyncWriteData != null) {
+                    throw new IllegalStateException("Cannot write more than one piece of async data at a time");
+                }
+                asyncWriteData = data;
+                asyncWriteHandler = asyncResultHandler;
+                if (writeListener == null) {
+                    try {
+                        ServletOutputStream outputStream = response.getOutputStream();
+                        outputStream.setWriteListener(writeListener = new ServletWriteListener(outputStream));
+                    } catch (IOException e) {
+                        asyncResultHandler.accept(e);
+                    }
+                } else {
+                    writeListener.onWritePossible();
+                }
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public CompletionStage<Void> write(byte[] data) {
+        CompletableFuture<Void> cf = new CompletableFuture<>();
+        write(data, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) {
+                if (throwable == null) {
+                    cf.complete(null);
+                } else {
+                    cf.completeExceptionally(throwable);
+                }
+            }
+        });
+        return cf;
+    }
+
+    @Override
+    public OutputStream createResponseOutputStream() {
+        try {
+            return response.getOutputStream();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void setPreCommitListener(Consumer<ResteasyReactiveRequestContext> task) {
+        preCommitTask = task;
+    }
+
+    @Override
+    public void beforeCommit(HttpServerExchange exchange) {
+        if (preCommitTask != null) {
+            preCommitTask.accept(this);
+        }
+    }
+
+    class ServletWriteListener implements WriteListener {
+
+        private final ServletOutputStream outputStream;
+
+        ServletWriteListener(ServletOutputStream outputStream) {
+            this.outputStream = outputStream;
+        }
+
+        @Override
+        public void onWritePossible() {
+            synchronized (ServletRequestContext.this) {
+                if (!outputStream.isReady()) {
+                    return;
+                }
+                Consumer<Throwable> ctx = asyncWriteHandler;
+                byte[] data = asyncWriteData;
+                asyncWriteHandler = null;
+                asyncWriteData = null;
+                try {
+                    outputStream.write(data);
+                    ctx.accept(null);
+                } catch (IOException e) {
+                    ctx.accept(e);
+                }
+                if (closed) {
+                    close();
+                }
+            }
+        }
+
+        @Override
+        public synchronized void onError(Throwable t) {
+            synchronized (ServletRequestContext.this) {
+                if (asyncWriteHandler != null) {
+                    Consumer<Throwable> ctx = asyncWriteHandler;
+                    asyncWriteHandler = null;
+                    asyncWriteData = null;
+                    ctx.accept(t);
+                    close();
+                }
+            }
+        }
+    }
+
+    static final class MapEntry<K, V> implements Map.Entry<K, V> {
+
+        private final K key;
+        private V value;
+
+        MapEntry(K key, V value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        public K getKey() {
+            return key;
+        }
+
+        @Override
+        public V getValue() {
+            return value;
+        }
+
+        @Override
+        public V setValue(V value) {
+            V old = value;
+            this.value = value;
+            return old;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java
new file mode 100644
index 0000000000000..25462aaa57173
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletRequestContextFactory.java
@@ -0,0 +1,34 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.RequestContextFactory;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+import io.undertow.vertx.VertxHttpExchange;
+import io.vertx.ext.web.RoutingContext;
+
+public class ServletRequestContextFactory implements RequestContextFactory {
+
+    public static final ServletRequestContextFactory INSTANCE = new ServletRequestContextFactory();
+
+    @Override
+    public ResteasyReactiveRequestContext createContext(Deployment deployment, ProvidersImpl providers,
+            Object context, ThreadSetupAction requestContext, ServerRestHandler[] handlerChain,
+            ServerRestHandler[] abortHandlerChain) {
+        io.undertow.servlet.handlers.ServletRequestContext src = (io.undertow.servlet.handlers.ServletRequestContext) context;
+        return new ServletRequestContext(deployment, providers, (HttpServletRequest) src.getServletRequest(),
+                (HttpServletResponse) src.getServletResponse(), requestContext, handlerChain, abortHandlerChain,
+                (RoutingContext) ((VertxHttpExchange) src.getExchange().getDelegate()).getContext(), src.getExchange());
+    }
+
+    @Override
+    public boolean isDefaultBlocking() {
+        return true;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java
new file mode 100644
index 0000000000000..1d432c170b093
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/java/io/quarkus/resteasy/reactive/server/servlet/runtime/ServletResteasyReactiveInputStream.java
@@ -0,0 +1,46 @@
+package io.quarkus.resteasy.reactive.server.servlet.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class ServletResteasyReactiveInputStream extends InputStream {
+    ByteBuffer existingData;
+    HttpServletRequest request;
+    InputStream delegate;
+
+    public ServletResteasyReactiveInputStream(ByteBuffer existingData, HttpServletRequest request) {
+        if (existingData.remaining() > 0) {
+            this.existingData = existingData;
+        }
+        this.request = request;
+    }
+
+    @Override
+    public int read() throws IOException {
+        byte[] b = new byte[1];
+        int read = read(b);
+        if (read == -1) {
+            return -1;
+        }
+        return b[0] & 0xff;
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        if (existingData != null) {
+            int read = Math.min(len, existingData.remaining());
+            existingData.get(b, off, read);
+            if (existingData.remaining() == 0) {
+                existingData = null;
+            }
+            return read;
+        }
+        if (delegate == null) {
+            delegate = request.getInputStream();
+        }
+        return delegate.read(b, off, len);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..b6f0f4b39ecdd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-servlet/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "Quarkus RESTEasy Reactive Servlet"
+metadata:
+  unlisted: true
+  short-name: "quarkus-resteasy-reactive-servlet"
+  keywords:
+  - "jaxrs"
+  - "web"
+  - "rest"
+  - "servlet"
+  categories:
+  - "web"
+  status: "experimental"
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/pom.xml
new file mode 100644
index 0000000000000..3ffa5a035a14c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-test-utils</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java
new file mode 100644
index 0000000000000..8fa2ef6742dc5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassInjectorTransformer.java
@@ -0,0 +1,473 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.BiFunction;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.WebApplicationException;
+
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.Type.Kind;
+import org.jboss.resteasy.reactive.common.processor.IndexedParameter;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.DelegatingParameterConverterSupplier;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverterSupplier;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.RuntimeResolvedConverter;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionContext;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget;
+import org.jboss.resteasy.reactive.server.processor.ServerIndexedParameter;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+
+import io.quarkus.deployment.util.AsmUtil;
+import io.quarkus.gizmo.Gizmo;
+
+public class ClassInjectorTransformer implements BiFunction<String, ClassVisitor, ClassVisitor> {
+
+    private static final String WEB_APPLICATION_EXCEPTION_BINARY_NAME = WebApplicationException.class.getName().replace('.',
+            '/');
+    private static final String NOT_FOUND_EXCEPTION_BINARY_NAME = NotFoundException.class.getName().replace('.', '/');
+    private static final String BAD_REQUEST_EXCEPTION_BINARY_NAME = BadRequestException.class.getName().replace('.', '/');
+
+    private static final String PARAMETER_CONVERTER_BINARY_NAME = ParameterConverter.class.getName()
+            .replace('.', '/');
+    private static final String PARAMETER_CONVERTER_DESCRIPTOR = "L" + PARAMETER_CONVERTER_BINARY_NAME + ";";
+
+    private static final String QUARKUS_REST_INJECTION_TARGET_BINARY_NAME = ResteasyReactiveInjectionTarget.class.getName()
+            .replace('.', '/');
+
+    private static final String QUARKUS_REST_INJECTION_CONTEXT_BINARY_NAME = ResteasyReactiveInjectionContext.class.getName()
+            .replace('.', '/');
+    private static final String QUARKUS_REST_INJECTION_CONTEXT_DESCRIPTOR = "L" + QUARKUS_REST_INJECTION_CONTEXT_BINARY_NAME
+            + ";";
+    private static final String INJECT_METHOD_NAME = "__quarkus_rest_inject";
+    private static final String INJECT_METHOD_DESCRIPTOR = "(" + QUARKUS_REST_INJECTION_CONTEXT_DESCRIPTOR + ")V";
+
+    private static final String QUARKUS_REST_DEPLOYMENT_BINARY_NAME = Deployment.class.getName().replace('.', '/');
+    private static final String QUARKUS_REST_DEPLOYMENT_DESCRIPTOR = "L" + QUARKUS_REST_DEPLOYMENT_BINARY_NAME + ";";
+
+    static final String INIT_CONVERTER_METHOD_NAME = "__quarkus_init_converter__";
+    private static final String INIT_CONVERTER_FIELD_NAME = "__quarkus_converter__";
+    private static final String INIT_CONVERTER_METHOD_DESCRIPTOR = "(" + QUARKUS_REST_DEPLOYMENT_DESCRIPTOR + ")V";
+
+    private final Map<FieldInfo, ServerIndexedParameter> fieldExtractors;
+    private final boolean superTypeIsInjectable;
+
+    public ClassInjectorTransformer(Map<FieldInfo, ServerIndexedParameter> fieldExtractors, boolean superTypeIsInjectable) {
+        this.fieldExtractors = fieldExtractors;
+        this.superTypeIsInjectable = superTypeIsInjectable;
+    }
+
+    @Override
+    public ClassVisitor apply(String classname, ClassVisitor visitor) {
+        return new ClassInjectorVisitor(Gizmo.ASM_API_VERSION, visitor, fieldExtractors, superTypeIsInjectable);
+    }
+
+    static class ClassInjectorVisitor extends ClassVisitor {
+
+        private Map<FieldInfo, ServerIndexedParameter> fieldExtractors;
+        private String thisName;
+        private boolean superTypeIsInjectable;
+        private String superTypeName;
+
+        public ClassInjectorVisitor(int api, ClassVisitor classVisitor, Map<FieldInfo, ServerIndexedParameter> fieldExtractors,
+                boolean superTypeIsInjectable) {
+            super(api, classVisitor);
+            this.fieldExtractors = fieldExtractors;
+            this.superTypeIsInjectable = superTypeIsInjectable;
+        }
+
+        @Override
+        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+            // make the class public otherwise we can't call its static init converters
+            access &= ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED);
+            access |= Opcodes.ACC_PUBLIC;
+            // if our supertype is already injectable we don't have to implement it again
+            if (!superTypeIsInjectable) {
+                String[] newInterfaces = new String[interfaces.length + 1];
+                newInterfaces[0] = QUARKUS_REST_INJECTION_TARGET_BINARY_NAME;
+                System.arraycopy(interfaces, 0, newInterfaces, 1, interfaces.length);
+                super.visit(version, access, name, signature, superName, newInterfaces);
+            } else {
+                super.visit(version, access, name, signature, superName, interfaces);
+            }
+            superTypeName = superName;
+            thisName = name;
+        }
+
+        @Override
+        public void visitEnd() {
+            // FIXME: handle setters
+            // FIXME: handle multi fields
+            MethodVisitor injectMethod = visitMethod(Opcodes.ACC_PUBLIC, INJECT_METHOD_NAME, INJECT_METHOD_DESCRIPTOR, null,
+                    null);
+            injectMethod.visitParameter("ctx", 0 /* modifiers */);
+            injectMethod.visitCode();
+            if (superTypeIsInjectable) {
+                // this
+                injectMethod.visitIntInsn(Opcodes.ALOAD, 0);
+                // ctx param
+                injectMethod.visitIntInsn(Opcodes.ALOAD, 1);
+                // call inject on our bean param field
+                injectMethod.visitMethodInsn(Opcodes.INVOKESPECIAL, superTypeName,
+                        INJECT_METHOD_NAME,
+                        INJECT_METHOD_DESCRIPTOR, false);
+            }
+            for (Entry<FieldInfo, ServerIndexedParameter> entry : fieldExtractors.entrySet()) {
+                FieldInfo fieldInfo = entry.getKey();
+                ServerIndexedParameter extractor = entry.getValue();
+                switch (extractor.getType()) {
+                    case BEAN:
+                        // this
+                        injectMethod.visitIntInsn(Opcodes.ALOAD, 0);
+                        // our bean param field
+                        injectMethod.visitFieldInsn(Opcodes.GETFIELD, thisName, fieldInfo.name(),
+                                AsmUtil.getDescriptor(fieldInfo.type(), name -> null));
+                        // ctx param
+                        injectMethod.visitIntInsn(Opcodes.ALOAD, 1);
+                        // call inject on our bean param field
+                        injectMethod.visitMethodInsn(Opcodes.INVOKEINTERFACE, QUARKUS_REST_INJECTION_TARGET_BINARY_NAME,
+                                INJECT_METHOD_NAME,
+                                INJECT_METHOD_DESCRIPTOR, true);
+                        break;
+                    case ASYNC_RESPONSE:
+                    case BODY:
+                        // spec says not supported
+                        break;
+                    case CONTEXT:
+                        // already set by CDI
+                        break;
+                    case FORM:
+                        injectParameterWithConverter(injectMethod, "getFormParameter", fieldInfo, extractor, true, true,
+                                fieldInfo.hasAnnotation(ResteasyReactiveDotNames.ENCODED));
+                        break;
+                    case HEADER:
+                        injectParameterWithConverter(injectMethod, "getHeader", fieldInfo, extractor, true, false, false);
+                        break;
+                    case MATRIX:
+                        injectParameterWithConverter(injectMethod, "getMatrixParameter", fieldInfo, extractor, true, true,
+                                fieldInfo.hasAnnotation(ResteasyReactiveDotNames.ENCODED));
+                        break;
+                    case COOKIE:
+                        injectParameterWithConverter(injectMethod, "getCookieParameter", fieldInfo, extractor, false, false,
+                                false);
+                        break;
+                    case PATH:
+                        injectParameterWithConverter(injectMethod, "getPathParameter", fieldInfo, extractor, false, true,
+                                fieldInfo.hasAnnotation(ResteasyReactiveDotNames.ENCODED));
+                        break;
+                    case QUERY:
+                        injectParameterWithConverter(injectMethod, "getQueryParameter", fieldInfo, extractor, true, true,
+                                fieldInfo.hasAnnotation(ResteasyReactiveDotNames.ENCODED));
+                        break;
+                    default:
+                        break;
+
+                }
+            }
+            injectMethod.visitInsn(Opcodes.RETURN);
+            injectMethod.visitEnd();
+            injectMethod.visitMaxs(0, 0);
+
+            // now generate initialisers for every field converter
+            for (Entry<FieldInfo, ServerIndexedParameter> entry : fieldExtractors.entrySet()) {
+                FieldInfo fieldInfo = entry.getKey();
+                ServerIndexedParameter extractor = entry.getValue();
+                switch (extractor.getType()) {
+                    case FORM:
+                    case HEADER:
+                    case MATRIX:
+                    case COOKIE:
+                    case PATH:
+                    case QUERY:
+                        ParameterConverterSupplier converter = extractor.getConverter();
+                        // do we need converters?
+                        if (converter != null) {
+                            generateConverterInitMethod(fieldInfo, converter, extractor.isSingle());
+                        }
+
+                        break;
+                }
+            }
+
+            super.visitEnd();
+        }
+
+        private void generateConverterInitMethod(FieldInfo fieldInfo, ParameterConverterSupplier converter, boolean single) {
+            String converterFieldName = INIT_CONVERTER_FIELD_NAME + fieldInfo.name();
+            FieldVisitor field = visitField(Opcodes.ACC_PRIVATE | Opcodes.ACC_STATIC, converterFieldName,
+                    PARAMETER_CONVERTER_DESCRIPTOR, null, null);
+            field.visitEnd();
+
+            // get rid of runtime delegates since we always delegate to deployment to find one
+            // can be a List/Set/Sorted set delegator -> RuntimeDelegating -> generated converter|null
+            // can be a RuntimeDelegating -> generated converter
+            converter = removeRuntimeResolvedConverterDelegate(converter);
+
+            String delegateBinaryName = null;
+            if (converter instanceof DelegatingParameterConverterSupplier) {
+                ParameterConverterSupplier delegate = removeRuntimeResolvedConverterDelegate(
+                        ((DelegatingParameterConverterSupplier) converter).getDelegate());
+                if (delegate != null)
+                    delegateBinaryName = delegate.getClassName().replace('.', '/');
+            } else {
+                delegateBinaryName = converter.getClassName().replace('.', '/');
+            }
+
+            MethodVisitor initConverterMethod = visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC,
+                    INIT_CONVERTER_METHOD_NAME + fieldInfo.name(),
+                    INIT_CONVERTER_METHOD_DESCRIPTOR, null,
+                    null);
+            initConverterMethod.visitParameter("deployment", 0 /* modifiers */);
+            initConverterMethod.visitCode();
+            // deployment param
+            initConverterMethod.visitIntInsn(Opcodes.ALOAD, 0);
+            // this class
+            initConverterMethod.visitLdcInsn(Type.getType("L" + thisName + ";"));
+            // param name
+            initConverterMethod.visitLdcInsn(fieldInfo.name());
+            // single
+            initConverterMethod.visitLdcInsn(single);
+            initConverterMethod.visitMethodInsn(Opcodes.INVOKEVIRTUAL, QUARKUS_REST_DEPLOYMENT_BINARY_NAME,
+                    "getRuntimeParamConverter",
+                    "(Ljava/lang/Class;Ljava/lang/String;Z)" + PARAMETER_CONVERTER_DESCRIPTOR, false);
+
+            // now if we have a backup delegate, let's call it
+
+            // stack: [converter]
+            if (delegateBinaryName != null) {
+                // check if we have a delegate
+                Label notNull = new Label();
+                initConverterMethod.visitInsn(Opcodes.DUP);
+                // stack: [converter, converter]
+                // if we got a converter, skip this
+                initConverterMethod.visitJumpInsn(Opcodes.IFNONNULL, notNull);
+                // stack: [converter]
+                initConverterMethod.visitInsn(Opcodes.POP);
+                // stack: []
+                // let's instantiate our delegate
+                initConverterMethod.visitTypeInsn(Opcodes.NEW, delegateBinaryName);
+                // stack: [converter]
+                initConverterMethod.visitInsn(Opcodes.DUP);
+                // stack: [converter, converter]
+                initConverterMethod.visitMethodInsn(Opcodes.INVOKESPECIAL, delegateBinaryName, "<init>",
+                        "()V", false);
+                // stack: [converter]
+                // If we don't cast this to ParameterConverter, ASM in computeFrames will call getCommonSuperType
+                // and try to load our generated class before we can load it, so we insert this cast to avoid that
+                initConverterMethod.visitTypeInsn(Opcodes.CHECKCAST, PARAMETER_CONVERTER_BINARY_NAME);
+                // end default delegate
+                initConverterMethod.visitLabel(notNull);
+            }
+
+            // FIXME: throw if we don't have a converter
+
+            // we have our element converter, see if we need to use list/set/sortedset converter around it
+
+            if (converter instanceof DelegatingParameterConverterSupplier) {
+                // stack: [converter]
+                // let's instantiate our composite delegator
+                String delegatorBinaryName = converter.getClassName().replace('.', '/');
+                initConverterMethod.visitTypeInsn(Opcodes.NEW, delegatorBinaryName);
+                // stack: [converter, instance]
+                initConverterMethod.visitInsn(Opcodes.DUP_X1);
+                // [instance, converter, instance]
+                initConverterMethod.visitInsn(Opcodes.SWAP);
+                // [instance, instance, converter]
+                initConverterMethod.visitMethodInsn(Opcodes.INVOKESPECIAL, delegatorBinaryName, "<init>",
+                        "(" + PARAMETER_CONVERTER_DESCRIPTOR + ")V", false);
+            }
+
+            // store the converter in the static field
+            initConverterMethod.visitFieldInsn(Opcodes.PUTSTATIC, thisName, converterFieldName, PARAMETER_CONVERTER_DESCRIPTOR);
+
+            initConverterMethod.visitInsn(Opcodes.RETURN);
+            initConverterMethod.visitEnd();
+            initConverterMethod.visitMaxs(0, 0);
+        }
+
+        private ParameterConverterSupplier removeRuntimeResolvedConverterDelegate(ParameterConverterSupplier converter) {
+            if (converter instanceof RuntimeResolvedConverter.Supplier) {
+                return ((RuntimeResolvedConverter.Supplier) converter).getDelegate();
+            }
+            return converter;
+        }
+
+        private void injectParameterWithConverter(MethodVisitor injectMethod, String methodName, FieldInfo fieldInfo,
+                ServerIndexedParameter extractor, boolean extraSingleParameter, boolean extraEncodedParam, boolean encoded) {
+            // spec says: 
+            /*
+             * 3.2 Fields and Bean Properties
+             * if the field or property is annotated with @MatrixParam, @QueryParam or @PathParam then an implementation
+             * MUST generate an instance of NotFoundException (404 status) that wraps the thrown exception and no
+             * entity; if the field or property is annotated with @HeaderParam or @CookieParam then an implementation
+             * MUST generate an instance of BadRequestException (400 status) that wraps the thrown exception and
+             * no entity.
+             * 3.3.2 Parameters
+             * Exceptions thrown during construction of @FormParam annotated parameter values are treated the same as if
+             * the parameter were annotated with @HeaderParam.
+             */
+            Label tryStart, tryEnd = null, tryWebAppHandler = null, tryHandler = null;
+            switch (extractor.getType()) {
+                case MATRIX:
+                case QUERY:
+                case PATH:
+                case HEADER:
+                case COOKIE:
+                case FORM:
+                    tryStart = new Label();
+                    tryEnd = new Label();
+                    tryWebAppHandler = new Label();
+                    tryHandler = new Label();
+                    injectMethod.visitTryCatchBlock(tryStart, tryEnd, tryWebAppHandler, WEB_APPLICATION_EXCEPTION_BINARY_NAME);
+                    injectMethod.visitTryCatchBlock(tryStart, tryEnd, tryHandler, "java/lang/Throwable");
+                    injectMethod.visitLabel(tryStart);
+                    break;
+            }
+            // push the parameter value
+            loadParameter(injectMethod, methodName, extractor, extraSingleParameter, extraEncodedParam, encoded);
+            Label valueWasNull = new Label();
+            // dup to test it
+            injectMethod.visitInsn(Opcodes.DUP);
+            injectMethod.visitJumpInsn(Opcodes.IFNULL, valueWasNull);
+            convertParameter(injectMethod, extractor, fieldInfo);
+            // inject this (for the put field) before the injected value
+            injectMethod.visitIntInsn(Opcodes.ALOAD, 0);
+            injectMethod.visitInsn(Opcodes.SWAP);
+            if (fieldInfo.type().kind() == Kind.PRIMITIVE) {
+                // this already does the right checkcast
+                AsmUtil.unboxIfRequired(injectMethod, fieldInfo.type());
+            } else {
+                // FIXME: this is totally wrong wrt. generics
+                injectMethod.visitTypeInsn(Opcodes.CHECKCAST, fieldInfo.type().name().toString('/'));
+            }
+            // store our param field
+            injectMethod.visitFieldInsn(Opcodes.PUTFIELD, thisName, fieldInfo.name(),
+                    AsmUtil.getDescriptor(fieldInfo.type(), name -> null));
+            Label endLabel = new Label();
+            injectMethod.visitJumpInsn(Opcodes.GOTO, endLabel);
+
+            // if the value was null, we don't set it
+            injectMethod.visitLabel(valueWasNull);
+            // we have a null value for the object we wanted to inject on the stack
+            injectMethod.visitInsn(Opcodes.POP);
+
+            if (tryEnd != null) {
+                // skip the catch block
+                injectMethod.visitJumpInsn(Opcodes.GOTO, endLabel);
+                injectMethod.visitLabel(tryEnd);
+                // start the web app catch block
+                injectMethod.visitLabel(tryWebAppHandler);
+                // exception is on the stack, just throw it
+                injectMethod.visitInsn(Opcodes.ATHROW);
+                // start the catch block
+                injectMethod.visitLabel(tryHandler);
+
+                String exceptionBinaryName;
+                switch (extractor.getType()) {
+                    case MATRIX:
+                    case QUERY:
+                    case PATH:
+                        exceptionBinaryName = NOT_FOUND_EXCEPTION_BINARY_NAME;
+                        break;
+                    case HEADER:
+                    case COOKIE:
+                    case FORM:
+                        exceptionBinaryName = BAD_REQUEST_EXCEPTION_BINARY_NAME;
+                        break;
+                    default:
+                        throw new IllegalStateException(
+                                "Should not have been trying to catch exceptions for parameter of type " + extractor.getType());
+                }
+                // [x]
+                injectMethod.visitTypeInsn(Opcodes.NEW, exceptionBinaryName);
+                // [x, instance]
+                injectMethod.visitInsn(Opcodes.DUP_X1);
+                // [instance, x, instance]
+                injectMethod.visitInsn(Opcodes.SWAP);
+                // [instance, instance, x]
+                injectMethod.visitMethodInsn(Opcodes.INVOKESPECIAL, exceptionBinaryName, "<init>", "(Ljava/lang/Throwable;)V",
+                        false);
+                injectMethod.visitInsn(Opcodes.ATHROW);
+            }
+
+            // really done
+            injectMethod.visitLabel(endLabel);
+        }
+
+        private void convertParameter(MethodVisitor injectMethod, ServerIndexedParameter extractor, FieldInfo fieldInfo) {
+            ParameterConverterSupplier converter = extractor.getConverter();
+            if (converter != null) {
+                // load our converter
+                String converterFieldName = INIT_CONVERTER_FIELD_NAME + fieldInfo.name();
+                injectMethod.visitFieldInsn(Opcodes.GETSTATIC, thisName, converterFieldName, PARAMETER_CONVERTER_DESCRIPTOR);
+                // at this point we have [val, converter] and we need to reverse that order
+                injectMethod.visitInsn(Opcodes.SWAP);
+                // now call the convert method on the converter
+                injectMethod.visitMethodInsn(Opcodes.INVOKEINTERFACE, PARAMETER_CONVERTER_BINARY_NAME, "convert",
+                        "(Ljava/lang/Object;)Ljava/lang/Object;", true);
+                // now we got ourselves a converted value
+            }
+        }
+
+        private void loadParameter(MethodVisitor injectMethod, String methodName, IndexedParameter extractor,
+                boolean extraSingleParameter, boolean extraEncodedParam, boolean encoded) {
+            // ctx param
+            injectMethod.visitIntInsn(Opcodes.ALOAD, 1);
+            // name param
+            injectMethod.visitLdcInsn(extractor.getName());
+            String methodSignature;
+            if (extraEncodedParam && extraSingleParameter) {
+                injectMethod.visitLdcInsn(extractor.isSingle());
+                injectMethod.visitLdcInsn(encoded);
+                methodSignature = "(Ljava/lang/String;ZZ)Ljava/lang/Object;";
+            } else if (extraEncodedParam) {
+                injectMethod.visitLdcInsn(encoded);
+                methodSignature = "(Ljava/lang/String;Z)Ljava/lang/String;";
+            } else if (extraSingleParameter) {
+                // single param
+                injectMethod.visitLdcInsn(extractor.isSingle());
+                methodSignature = "(Ljava/lang/String;Z)Ljava/lang/Object;";
+            } else {
+                methodSignature = "(Ljava/lang/String;)Ljava/lang/String;";
+            }
+            // call methodName on the ctx
+            injectMethod.visitMethodInsn(Opcodes.INVOKEINTERFACE, QUARKUS_REST_INJECTION_CONTEXT_BINARY_NAME, methodName,
+                    methodSignature, true);
+            // deal with default value
+            if (extractor.getDefaultValue() != null) {
+                // dup to test it
+                injectMethod.visitInsn(Opcodes.DUP);
+                Label wasNonNullTarget = new Label();
+                Label setDefaultValueTarget = new Label();
+                injectMethod.visitJumpInsn(Opcodes.IFNULL, setDefaultValueTarget);
+                // it's not null, do we allow empty values?
+                // only if this supports multiple values
+                if (extractor.isObtainedAsCollection()) {
+                    // dup to test it
+                    injectMethod.visitInsn(Opcodes.DUP);
+                    // check if it's not an empty collection
+                    injectMethod.visitTypeInsn(Opcodes.CHECKCAST, "java/util/Collection");
+                    injectMethod.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Collection", "isEmpty",
+                            "()Z", true);
+                    injectMethod.visitJumpInsn(Opcodes.IFNE, setDefaultValueTarget);
+                }
+                injectMethod.visitJumpInsn(Opcodes.GOTO, wasNonNullTarget);
+                injectMethod.visitLabel(setDefaultValueTarget);
+                // it was null or empty, so let's eat the null value on the stack
+                injectMethod.visitInsn(Opcodes.POP);
+                // replace it with the default value
+                injectMethod.visitLdcInsn(extractor.getDefaultValue());
+                injectMethod.visitLabel(wasNonNullTarget);
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassLevelExceptionMappersBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassLevelExceptionMappersBuildItem.java
new file mode 100644
index 0000000000000..9acb49e59d429
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ClassLevelExceptionMappersBuildItem.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.util.Map;
+import java.util.Objects;
+
+import org.jboss.jandex.DotName;
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class ClassLevelExceptionMappersBuildItem extends SimpleBuildItem {
+
+    /**
+     * The key is the DotName of the class which contains methods annotated with {@link ServerExceptionMapper}
+     * and the value is a map of from exception class name to generated exception mapper class name
+     */
+    private final Map<DotName, Map<String, String>> mappers;
+
+    ClassLevelExceptionMappersBuildItem(Map<DotName, Map<String, String>> mappers) {
+        this.mappers = Objects.requireNonNull(mappers);
+    }
+
+    public Map<DotName, Map<String, String>> getMappers() {
+        return mappers;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ContextResolversBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ContextResolversBuildItem.java
new file mode 100644
index 0000000000000..101389dd26056
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ContextResolversBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class ContextResolversBuildItem extends SimpleBuildItem {
+
+    private final ContextResolvers contextResolvers;
+
+    public ContextResolversBuildItem(ContextResolvers contextResolvers) {
+        this.contextResolvers = contextResolvers;
+    }
+
+    public ContextResolvers getContextResolvers() {
+        return contextResolvers;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java
new file mode 100644
index 0000000000000..8364f419550f1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java
@@ -0,0 +1,483 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofConstructor;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+import static io.quarkus.resteasy.reactive.common.deployment.QuarkusResteasyReactiveDotNames.HTTP_SERVER_REQUEST;
+import static io.quarkus.resteasy.reactive.common.deployment.QuarkusResteasyReactiveDotNames.HTTP_SERVER_RESPONSE;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.QUARKUS_REST_CONTAINER_REQUEST_CONTEXT;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.ROUTING_CONTEXT;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.SERVER_REQUEST_FILTER;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.SERVER_RESPONSE_FILTER;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.SIMPLIFIED_RESOURCE_INFO;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONTAINER_REQUEST_CONTEXT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONTAINER_RESPONSE_CONTEXT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.HTTP_HEADERS;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.OPTIONAL;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REQUEST;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.RESOURCE_INFO;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.RESPONSE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.THROWABLE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.UNI;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.URI_INFO;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.VOID;
+
+import java.lang.reflect.Modifier;
+import java.util.Optional;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Response;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.HttpHeadersImpl;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestFilter;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerResponseFilter;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.quarkus.arc.Unremovable;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.resteasy.reactive.server.runtime.filters.FilterUtil;
+import io.quarkus.resteasy.reactive.server.runtime.filters.PreventAbortResteasyReactiveContainerRequestContext;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Generates the actual implementation of a provider that allows user code using annotations like
+ * {@link ServerRequestFilter} and {@link ServerResponseFilter} to work seamlessly
+ */
+final class CustomFilterGenerator {
+
+    private CustomFilterGenerator() {
+    }
+
+    /**
+     * Generates an implementation of {@link javax.ws.rs.container.ContainerRequestFilter} that delegates to the method
+     * annotated with {@code @ServerRequestFilter}.
+     * <p>
+     * An example of the generated code is:
+     *
+     * <pre>
+     *
+     * &#64;Singleton
+     * &#64;Unremovable
+     * public class CustomContainerRequestFilter$GeneratedContainerRequestFilter$someMethod implements ServerRequestFilter {
+     *     private final CustomContainerRequestFilter delegate;
+     *
+     *     &#64;Inject
+     *     public CustomContainerRequestFilter$GeneratedContainerRequestFilter$someMethod(CustomContainerRequestFilter var1) {
+     *         this.delegate = var1;
+     *     }
+     *
+     *     public void filter(ContainerRequestContext var1) {
+     *         QuarkusRestRequestContext var2 = (QuarkusRestRequestContext) ((ResteasyReactiveContainerRequestContext) var1)
+     *                 .getQuarkusRestContext();
+     *         UriInfo var3 = var2.getUriInfo();
+     *         HttpHeadersImpl var4 = var2.getHttpHeaders();
+     *         this.delegate.someMethod(var3, (HttpHeaders) var4);
+     *     }
+     * }
+     *
+     * </pre>
+     */
+    static String generateContainerRequestFilter(MethodInfo targetMethod, ClassOutput classOutput) {
+        ReturnType returnType = determineRequestFilterReturnType(targetMethod);
+        checkModifiers(targetMethod, SERVER_REQUEST_FILTER);
+        String generatedClassName = getGeneratedClassName(targetMethod, SERVER_REQUEST_FILTER);
+        DotName declaringClassName = targetMethod.declaringClass().name();
+        try (ClassCreator cc = ClassCreator.builder().classOutput(classOutput)
+                .className(generatedClassName)
+                .interfaces(determineRequestInterfaceType(returnType))
+                .build()) {
+            cc.addAnnotation(Singleton.class);
+            cc.addAnnotation(Unremovable.class);
+
+            FieldDescriptor delegateField = cc.getFieldCreator("delegate", declaringClassName.toString())
+                    .setModifiers(Modifier.PRIVATE | Modifier.FINAL)
+                    .getFieldDescriptor();
+
+            // generate a constructor that takes the target class as an argument - this class is a CDI bean so Arc will be able to inject into the generated class
+            MethodCreator ctor = cc.getMethodCreator("<init>", void.class, declaringClassName.toString());
+            ctor.setModifiers(Modifier.PUBLIC);
+            ctor.addAnnotation(Inject.class);
+            ctor.invokeSpecialMethod(MethodDescriptor.ofConstructor(Object.class), ctor.getThis());
+            ResultHandle self = ctor.getThis();
+            ResultHandle config = ctor.getMethodParam(0);
+            ctor.writeInstanceField(delegateField, self, config);
+            ctor.returnValue(null);
+
+            if ((returnType == ReturnType.VOID) || (returnType == ReturnType.OPTIONAL_RESPONSE)
+                    || (returnType == ReturnType.RESPONSE)) {
+                // generate the implementation of the filter method
+                MethodCreator filterMethod = cc.getMethodCreator("filter", void.class, ContainerRequestContext.class);
+                ResultHandle rrContainerReqCtxHandle = getRRContainerReqCtxHandle(filterMethod, 0);
+                // call the target method
+                ResultHandle resultHandle = filterMethod.invokeVirtualMethod(targetMethod,
+                        filterMethod.readInstanceField(delegateField, filterMethod.getThis()),
+                        getRequestFilterResultHandles(targetMethod, declaringClassName, filterMethod,
+                                getRRReqCtxHandle(filterMethod, rrContainerReqCtxHandle)));
+                if (returnType == ReturnType.OPTIONAL_RESPONSE) {
+                    // invoke utility class that deals with Optional
+                    filterMethod.invokeStaticMethod(ofMethod(FilterUtil.class, "handleOptional", void.class,
+                            Optional.class, ResteasyReactiveContainerRequestContext.class), resultHandle,
+                            rrContainerReqCtxHandle);
+                } else if (returnType == ReturnType.RESPONSE) {
+                    filterMethod.invokeStaticMethod(ofMethod(FilterUtil.class, "handleResponse", void.class,
+                            Response.class, ResteasyReactiveContainerRequestContext.class), resultHandle,
+                            rrContainerReqCtxHandle);
+                }
+                filterMethod.returnValue(null);
+            } else if ((returnType == ReturnType.UNI_VOID) || (returnType == ReturnType.UNI_RESPONSE)) {
+                // generate the implementation of the filter method
+                MethodCreator filterMethod = cc.getMethodCreator("filter", void.class,
+                        ResteasyReactiveContainerRequestContext.class);
+                // call the target method
+                ResultHandle rrContainerReqCtxHandle = getRRContainerReqCtxHandle(filterMethod, 0);
+                ResultHandle uniHandle = filterMethod.invokeVirtualMethod(targetMethod,
+                        filterMethod.readInstanceField(delegateField, filterMethod.getThis()),
+                        getRequestFilterResultHandles(targetMethod, declaringClassName, filterMethod,
+                                getRRReqCtxHandle(filterMethod, rrContainerReqCtxHandle)));
+                // invoke utility class that deals with suspend / resume
+                filterMethod
+                        .invokeStaticMethod(
+                                ofMethod(FilterUtil.class,
+                                        returnType == ReturnType.UNI_VOID ? "handleUniVoid"
+                                                : "handleUniResponse",
+                                        void.class,
+                                        Uni.class, ResteasyReactiveContainerRequestContext.class),
+                                uniHandle, rrContainerReqCtxHandle);
+                filterMethod.returnValue(null);
+            } else {
+                throw new IllegalStateException("ReturnType: '" + returnType + "' is not supported");
+            }
+        }
+        return generatedClassName;
+    }
+
+    private static ResultHandle[] getRequestFilterResultHandles(MethodInfo targetMethod, DotName declaringClassName,
+            MethodCreator filterMethod, ResultHandle rrReqCtxHandle) {
+        // for each of the parameters of the user method, generate bytecode that pulls the argument outs of QuarkusRestRequestContext
+        ResultHandle[] targetMethodParamHandles = new ResultHandle[targetMethod.parameters().size()];
+        for (int i = 0; i < targetMethod.parameters().size(); i++) {
+            Type param = targetMethod.parameters().get(i);
+            DotName paramDotName = param.name();
+            if (CONTAINER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = filterMethod.newInstance(
+                        ofConstructor(PreventAbortResteasyReactiveContainerRequestContext.class, ContainerRequestContext.class),
+                        filterMethod.getMethodParam(0));
+                ;
+            } else if (QUARKUS_REST_CONTAINER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = filterMethod.checkCast(filterMethod.getMethodParam(0),
+                        ResteasyReactiveContainerRequestContext.class);
+            } else if (URI_INFO.equals(paramDotName)) {
+                GeneratorUtils.paramHandleFromReqContextMethod(filterMethod, rrReqCtxHandle, targetMethodParamHandles,
+                        i,
+                        "getUriInfo",
+                        URI_INFO);
+            } else if (HTTP_HEADERS.equals(paramDotName)) {
+                GeneratorUtils.paramHandleFromReqContextMethod(filterMethod, rrReqCtxHandle, targetMethodParamHandles,
+                        i,
+                        "getHttpHeaders",
+                        HttpHeadersImpl.class);
+            } else if (REQUEST.equals(paramDotName)) {
+                GeneratorUtils.paramHandleFromReqContextMethod(filterMethod, rrReqCtxHandle, targetMethodParamHandles,
+                        i,
+                        "getRequest",
+                        REQUEST);
+            } else if (HTTP_SERVER_REQUEST.equals(paramDotName)) {
+                ResultHandle routingContextHandle = GeneratorUtils.routingContextHandler(filterMethod, rrReqCtxHandle);
+                targetMethodParamHandles[i] = filterMethod.invokeInterfaceMethod(
+                        ofMethod(RoutingContext.class, "request", HttpServerRequest.class), routingContextHandle);
+            } else if (RESOURCE_INFO.equals(paramDotName)) {
+                targetMethodParamHandles[i] = getResourceInfoHandle(filterMethod, rrReqCtxHandle);
+            } else if (SIMPLIFIED_RESOURCE_INFO.equals(paramDotName)) {
+                targetMethodParamHandles[i] = getSimpleResourceInfoHandle(filterMethod, rrReqCtxHandle);
+            } else if (ROUTING_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = GeneratorUtils.routingContextHandler(filterMethod, rrReqCtxHandle);
+            } else {
+                String parameterName = targetMethod.parameterName(i);
+                throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name()
+                        + " of class '" + declaringClassName
+                        + "' is not allowed");
+            }
+        }
+        return targetMethodParamHandles;
+    }
+
+    /**
+     * Generates an implementation of {@link javax.ws.rs.container.ContainerResponseFilter} that delegates to the method
+     * annotated with {@code @ServerResponseFilter}.
+     * <p>
+     * An example of the generated code is:
+     *
+     * <pre>
+     *
+     * &#64;Singleton
+     * &#64;Unremovable
+     * public class CustomContainerResponseFilter$GeneratedContainerResponseFilter$someMethod
+     *         implements ServerResponseFilter {
+     *     private final CustomContainerRequestFilter delegate;
+     *
+     *     &#64;Inject
+     *     public CustomContainerResponseFilter$GeneratedContainerResponseFilter$someMethod(CustomContainerRequestFilter var1) {
+     *         this.delegate = var1;
+     *     }
+     *
+     *     public void filter(ContainerRequestContext var1, ContainerResponseContext var2) {
+     *         QuarkusRestRequestContext var3 = (QuarkusRestRequestContext) ((ResteasyReactiveContainerRequestContext) var1)
+     *                 .getQuarkusRestContext();
+     *         UriInfo var4 = var2.getUriInfo();
+     *         this.delegate.someMethod(var4);
+     *     }
+     * }
+     *
+     * </pre>
+     */
+    static String generateContainerResponseFilter(MethodInfo targetMethod, ClassOutput classOutput) {
+        ReturnType returnType = determineResponseFilterReturnType(targetMethod);
+        checkModifiers(targetMethod, SERVER_RESPONSE_FILTER);
+        String generatedClassName = getGeneratedClassName(targetMethod, SERVER_RESPONSE_FILTER);
+        DotName declaringClassName = targetMethod.declaringClass().name();
+        try (ClassCreator cc = ClassCreator.builder().classOutput(classOutput)
+                .className(generatedClassName)
+                .interfaces(determineResponseInterfaceType(returnType))
+                .build()) {
+            cc.addAnnotation(Singleton.class);
+            cc.addAnnotation(Unremovable.class);
+
+            FieldDescriptor delegateField = cc.getFieldCreator("delegate", declaringClassName.toString())
+                    .setModifiers(Modifier.PRIVATE | Modifier.FINAL)
+                    .getFieldDescriptor();
+
+            // generate a constructor that takes the target class as an argument - this class is a CDI bean so Arc will be able to inject into the generated class
+            MethodCreator ctor = cc.getMethodCreator("<init>", void.class, declaringClassName.toString());
+            ctor.setModifiers(Modifier.PUBLIC);
+            ctor.addAnnotation(Inject.class);
+            ctor.invokeSpecialMethod(MethodDescriptor.ofConstructor(Object.class), ctor.getThis());
+            ResultHandle self = ctor.getThis();
+            ResultHandle config = ctor.getMethodParam(0);
+            ctor.writeInstanceField(delegateField, self, config);
+            ctor.returnValue(null);
+
+            if (returnType == ReturnType.VOID) {
+                // generate the implementation of the filter method
+                MethodCreator filterMethod = cc.getMethodCreator("filter", void.class, ContainerRequestContext.class,
+                        ContainerResponseContext.class);
+
+                ResultHandle rrContainerReqCtxHandle = getRRContainerReqCtxHandle(filterMethod, 0);
+                ResultHandle rrReqCtxHandle = getRRReqCtxHandle(filterMethod, rrContainerReqCtxHandle);
+
+                // call the target method
+                filterMethod.invokeVirtualMethod(targetMethod,
+                        filterMethod.readInstanceField(delegateField, filterMethod.getThis()),
+                        getResponseFilterResultHandles(targetMethod, declaringClassName,
+                                filterMethod, rrReqCtxHandle));
+                filterMethod.returnValue(null);
+            } else if (returnType == ReturnType.UNI_VOID) {
+                // generate the implementation of the filter method
+                MethodCreator filterMethod = cc.getMethodCreator("filter", void.class,
+                        ResteasyReactiveContainerRequestContext.class,
+                        ContainerResponseContext.class);
+
+                ResultHandle rrContainerReqCtxHandle = getRRContainerReqCtxHandle(filterMethod, 0);
+                ResultHandle rrReqCtxHandle = getRRReqCtxHandle(filterMethod, rrContainerReqCtxHandle);
+
+                // call the target method
+                ResultHandle uniHandle = filterMethod.invokeVirtualMethod(targetMethod,
+                        filterMethod.readInstanceField(delegateField, filterMethod.getThis()),
+                        getResponseFilterResultHandles(targetMethod, declaringClassName,
+                                filterMethod, rrReqCtxHandle));
+
+                // invoke utility class that deals with Optional
+                filterMethod.invokeStaticMethod(
+                        ofMethod(FilterUtil.class, "handleUniVoid", void.class,
+                                Uni.class, ResteasyReactiveContainerRequestContext.class),
+                        uniHandle, rrContainerReqCtxHandle);
+                filterMethod.returnValue(null);
+            }
+        }
+        return generatedClassName;
+    }
+
+    private static ResultHandle[] getResponseFilterResultHandles(MethodInfo targetMethod, DotName declaringClassName,
+            MethodCreator filterMethod, ResultHandle rrReqCtxHandle) {
+        ResultHandle[] targetMethodParamHandles = new ResultHandle[targetMethod.parameters().size()];
+        for (int i = 0; i < targetMethod.parameters().size(); i++) {
+            Type param = targetMethod.parameters().get(i);
+            DotName paramDotName = param.name();
+            if (CONTAINER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = filterMethod.newInstance(
+                        ofConstructor(PreventAbortResteasyReactiveContainerRequestContext.class,
+                                ContainerRequestContext.class),
+                        filterMethod.getMethodParam(0));
+            } else if (QUARKUS_REST_CONTAINER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = filterMethod.checkCast(filterMethod.getMethodParam(0),
+                        ResteasyReactiveContainerRequestContext.class);
+            } else if (CONTAINER_RESPONSE_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = filterMethod.getMethodParam(1);
+            } else if (HTTP_SERVER_REQUEST.equals(paramDotName)) {
+                ResultHandle routingContextHandle = GeneratorUtils.routingContextHandler(filterMethod, rrReqCtxHandle);
+                targetMethodParamHandles[i] = filterMethod.invokeInterfaceMethod(
+                        ofMethod(RoutingContext.class, "request", HttpServerRequest.class), routingContextHandle);
+            } else if (HTTP_SERVER_RESPONSE.equals(paramDotName)) {
+                ResultHandle routingContextHandle = GeneratorUtils.routingContextHandler(filterMethod, rrReqCtxHandle);
+                targetMethodParamHandles[i] = filterMethod.invokeInterfaceMethod(
+                        ofMethod(RoutingContext.class, "response", HttpServerResponse.class), routingContextHandle);
+            } else if (RESOURCE_INFO.equals(paramDotName)) {
+                targetMethodParamHandles[i] = getResourceInfoHandle(filterMethod, rrReqCtxHandle);
+            } else if (SIMPLIFIED_RESOURCE_INFO.equals(paramDotName)) {
+                targetMethodParamHandles[i] = getSimpleResourceInfoHandle(filterMethod, rrReqCtxHandle);
+            } else if (THROWABLE.equals(paramDotName)) {
+                GeneratorUtils.paramHandleFromReqContextMethod(filterMethod, rrReqCtxHandle, targetMethodParamHandles, i,
+                        "getThrowable",
+                        THROWABLE);
+            } else {
+                String parameterName = targetMethod.parameterName(i);
+                throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name()
+                        + " of class '" + declaringClassName
+                        + "' is not allowed");
+            }
+        }
+        return targetMethodParamHandles;
+    }
+
+    private static ResultHandle getRRContainerReqCtxHandle(MethodCreator filter, int containerReqCtxParamIndex) {
+        ResultHandle containerReqCtxHandle = filter.getMethodParam(containerReqCtxParamIndex);
+        return filter.checkCast(containerReqCtxHandle,
+                ResteasyReactiveContainerRequestContext.class);
+    }
+
+    private static ResultHandle getRRReqCtxHandle(MethodCreator filter, ResultHandle rrContainerReqCtxHandle) {
+        ResultHandle rrCtxHandle = filter.invokeInterfaceMethod(
+                ofMethod(ResteasyReactiveContainerRequestContext.class, "getServerRequestContext",
+                        ServerRequestContext.class),
+                rrContainerReqCtxHandle);
+        return filter.checkCast(rrCtxHandle, ResteasyReactiveRequestContext.class);
+    }
+
+    private static AssignableResultHandle getResourceInfoHandle(MethodCreator filterMethod, ResultHandle rrReqCtxHandle) {
+        ResultHandle runtimeResourceHandle = GeneratorUtils.runtimeResourceHandle(filterMethod, rrReqCtxHandle);
+        AssignableResultHandle resourceInfo = filterMethod.createVariable(ResteasyReactiveResourceInfo.class);
+        BranchResult ifNullBranch = filterMethod.ifNull(runtimeResourceHandle);
+        ifNullBranch.trueBranch().assign(resourceInfo, ifNullBranch.trueBranch().loadNull());
+        ifNullBranch.falseBranch().assign(resourceInfo, ifNullBranch.falseBranch().invokeVirtualMethod(
+                ofMethod(RuntimeResource.class, "getLazyMethod", ResteasyReactiveResourceInfo.class),
+                runtimeResourceHandle));
+        return resourceInfo;
+    }
+
+    private static AssignableResultHandle getSimpleResourceInfoHandle(MethodCreator filterMethod, ResultHandle rrReqCtxHandle) {
+        ResultHandle runtimeResourceHandle = GeneratorUtils.runtimeResourceHandle(filterMethod, rrReqCtxHandle);
+        AssignableResultHandle resourceInfo = filterMethod.createVariable(SimpleResourceInfo.class);
+        BranchResult ifNullBranch = filterMethod.ifNull(runtimeResourceHandle);
+        ifNullBranch.trueBranch().assign(resourceInfo, ifNullBranch.trueBranch().loadNull());
+        ifNullBranch.falseBranch().assign(resourceInfo, ifNullBranch.falseBranch().invokeVirtualMethod(
+                ofMethod(RuntimeResource.class, "getSimplifiedResourceInfo", SimpleResourceInfo.class),
+                runtimeResourceHandle));
+        return resourceInfo;
+    }
+
+    private static String getGeneratedClassName(MethodInfo targetMethod, DotName annotationDotName) {
+        DotName declaringClassName = targetMethod.declaringClass().name();
+        return declaringClassName.toString() + "$Generated" + annotationDotName.withoutPackagePrefix() + "$"
+                + targetMethod.name();
+    }
+
+    private static void checkModifiers(MethodInfo info, DotName annotationDotName) {
+        if ((info.flags() & Modifier.PRIVATE) != 0) {
+            throw new RuntimeException("Method '" + info.name() + " of class '" + info.declaringClass().name()
+                    + "' cannot be private as it is annotated with '@" + annotationDotName + "'");
+        }
+        if ((info.flags() & Modifier.STATIC) != 0) {
+            throw new RuntimeException("Method '" + info.name() + " of class '" + info.declaringClass().name()
+                    + "' cannot be static as it is annotated with '@" + annotationDotName + "'");
+        }
+    }
+
+    private static ReturnType determineRequestFilterReturnType(MethodInfo targetMethod) {
+        if (targetMethod.returnType().kind() == Type.Kind.VOID) {
+            return ReturnType.VOID;
+        } else if (targetMethod.returnType().kind() == Type.Kind.PARAMETERIZED_TYPE) {
+            ParameterizedType parameterizedType = targetMethod.returnType().asParameterizedType();
+            if (parameterizedType.name().equals(UNI) && (parameterizedType.arguments().size() == 1)) {
+                if (parameterizedType.arguments().get(0).name().equals(VOID)) {
+                    return ReturnType.UNI_VOID;
+                } else if (parameterizedType.arguments().get(0).name().equals(RESPONSE)) {
+                    return ReturnType.UNI_RESPONSE;
+                }
+            } else if (parameterizedType.name().equals(OPTIONAL) && (parameterizedType.arguments().size() == 1)) {
+                if (parameterizedType.arguments().get(0).name().equals(RESPONSE)) {
+                    return ReturnType.OPTIONAL_RESPONSE;
+                }
+            }
+        } else if (targetMethod.returnType().name().equals(RESPONSE)) {
+            return ReturnType.RESPONSE;
+        }
+        throw new RuntimeException("Method '" + targetMethod.name() + " of class '" + targetMethod.declaringClass().name()
+                + "' cannot be used as a request filter as it does not declare 'void', Optional<Response>, 'Uni<Void>' or 'Uni<Response>' as its return type");
+    }
+
+    private static ReturnType determineResponseFilterReturnType(MethodInfo targetMethod) {
+        if (targetMethod.returnType().kind() == Type.Kind.VOID) {
+            return ReturnType.VOID;
+        } else if (targetMethod.returnType().kind() == Type.Kind.PARAMETERIZED_TYPE) {
+            ParameterizedType parameterizedType = targetMethod.returnType().asParameterizedType();
+            if (parameterizedType.name().equals(UNI) && (parameterizedType.arguments().size() == 1)) {
+                if (parameterizedType.arguments().get(0).name().equals(VOID)) {
+                    return ReturnType.UNI_VOID;
+                }
+            }
+        }
+        throw new RuntimeException("Method '" + targetMethod.name() + " of class '" + targetMethod.declaringClass().name()
+                + "' cannot be used as a response filter as it does not declare 'void' or 'Uni<Void>' as its return type");
+    }
+
+    private static Class<?> determineRequestInterfaceType(ReturnType returnType) {
+        if ((returnType == ReturnType.VOID) || (returnType == ReturnType.OPTIONAL_RESPONSE)
+                || (returnType == ReturnType.RESPONSE)) {
+            return ContainerRequestFilter.class;
+        } else if ((returnType == ReturnType.UNI_VOID) || (returnType == ReturnType.UNI_RESPONSE)) {
+            return ResteasyReactiveContainerRequestFilter.class;
+        }
+        throw new IllegalStateException("ReturnType: '" + returnType + "' is not supported");
+    }
+
+    private static Class<?> determineResponseInterfaceType(ReturnType returnType) {
+        if (returnType == ReturnType.VOID) {
+            return ContainerResponseFilter.class;
+        } else if (returnType == ReturnType.UNI_VOID) {
+            return ResteasyReactiveContainerResponseFilter.class;
+        }
+        throw new IllegalStateException("ReturnType: '" + returnType + "' is not supported");
+    }
+
+    private enum ReturnType {
+        VOID,
+        RESPONSE,
+        OPTIONAL_RESPONSE,
+        UNI_VOID,
+        UNI_RESPONSE
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java
new file mode 100644
index 0000000000000..802da5d03397b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomResourceProducersGenerator.java
@@ -0,0 +1,356 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.MethodParameterInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.parameters.CookieParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.HeaderParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.MatrixParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.PathParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.QueryParamExtractor;
+
+import io.quarkus.arc.Unremovable;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.runtime.util.HashUtil;
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+
+final class CustomResourceProducersGenerator {
+
+    private static final DotName DOTNAME_REQUEST_SCOPED = DotName.createSimple(RequestScoped.class.getSimpleName());
+
+    private CustomResourceProducersGenerator() {
+    }
+
+    /**
+     * We generate a class that contains as many CDI producer methods as there are JAX-RS Resources that use JAX-RS params.
+     *
+     * If for example there was a single such JAX-RS resource looking like:
+     *
+     * <code><pre>
+     *
+     * &#64;Path("/query")
+     * public class QueryParamResource {
+     *
+     * 	 private final String queryParamValue;
+     * 	 private final UriInfo uriInfo;
+     *
+     * 	 public QueryParamResource(@QueryParam("p1") String headerValue, @Context UriInfo uriInfo) {
+     * 		this.headerValue = headerValue;
+     *   }
+     *
+     *   &#64;GET
+     *   public String get() {
+     * 	    // DO something
+     *   }
+     * }
+     *
+     *  </pre></code>
+     *
+     *
+     * then the generated producer would look like this:
+     *
+     * <code><pre>
+     *
+     *  &#64;Singleton
+     * public class ResourcesWithParamProducer {
+     *
+     *    &#64;Inject
+     *    CurrentVertxRequest currentVertxRequest;
+     *
+     *    &#64;Produces
+     *    &#64;RequestScoped
+     *    public QueryParamResource producer_QueryParamResource_somehash(UriInfo uriInfo) {
+     * 		return new QueryParamResource(getContext().getContext().queryParams().get("p1"), uriInfo);
+     *    }
+     *
+     * 	private QuarkusRestRequestContext getContext() {
+     * 		return (QuarkusRestRequestContext) currentVertxRequest.getOtherHttpContextObject();
+     *    }
+     * }
+     *
+     *  </pre></code>
+     */
+    public static void generate(Map<DotName, MethodInfo> resourcesThatNeedCustomProducer,
+            Set<String> beanParamsThatNeedCustomProducer,
+            BuildProducer<GeneratedBeanBuildItem> generatedBeanBuildItemBuildProducer,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer) {
+        GeneratedBeanGizmoAdaptor classOutput = new GeneratedBeanGizmoAdaptor(generatedBeanBuildItemBuildProducer);
+        try (ClassCreator c = new ClassCreator(classOutput, "io.quarkus.rest.cdi.ResourceWithJaxRsCtorParamsProducer", null,
+                Object.class.getName())) {
+            c.addAnnotation(Singleton.class);
+
+            MethodCreator getContextMethodCreator = c.getMethodCreator("getContext", ResteasyReactiveRequestContext.class);
+            MethodCreator getHeaderParamMethodCreator = c.getMethodCreator("getHeaderParam", String.class, String.class);
+            MethodCreator getQueryParamMethodCreator = c.getMethodCreator("getQueryParam", String.class, String.class);
+            MethodCreator getPathParamMethodCreator = c.getMethodCreator("getPathParam", String.class, int.class);
+            MethodCreator getMatrixParamMethodCreator = c.getMethodCreator("getMatrixParam", String.class, String.class);
+            MethodCreator getCookieParamMethodCreator = c.getMethodCreator("getCookieParam", String.class, String.class);
+
+            try (MethodCreator m = getContextMethodCreator) {
+                m.setModifiers(Modifier.PRIVATE);
+
+                ResultHandle otherHttpContextObjectHandle = m.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(CurrentRequestManager.class, "get", ResteasyReactiveRequestContext.class));
+                ResultHandle result = m.checkCast(otherHttpContextObjectHandle, ResteasyReactiveRequestContext.class);
+                m.returnValue(result);
+            }
+
+            try (MethodCreator m = getHeaderParamMethodCreator) {
+                m.setModifiers(Modifier.PRIVATE);
+                ResultHandle quarkusRestContextHandle = m.invokeVirtualMethod(getContextMethodCreator.getMethodDescriptor(),
+                        m.getThis());
+                ResultHandle extractorHandle = m.newInstance(
+                        MethodDescriptor.ofConstructor(HeaderParamExtractor.class, String.class, boolean.class),
+                        m.getMethodParam(0), m.load(true));
+                ResultHandle resultHandle = m.invokeVirtualMethod(MethodDescriptor.ofMethod(HeaderParamExtractor.class,
+                        "extractParameter", Object.class, ResteasyReactiveRequestContext.class), extractorHandle,
+                        quarkusRestContextHandle);
+                m.returnValue(resultHandle);
+            }
+
+            try (MethodCreator m = getQueryParamMethodCreator) {
+                m.setModifiers(Modifier.PRIVATE);
+                ResultHandle quarkusRestContextHandle = m.invokeVirtualMethod(getContextMethodCreator.getMethodDescriptor(),
+                        m.getThis());
+                ResultHandle extractorHandle = m.newInstance(
+                        MethodDescriptor.ofConstructor(QueryParamExtractor.class, String.class, boolean.class, boolean.class),
+                        m.getMethodParam(0), m.load(true), m.load(false));
+                ResultHandle resultHandle = m.invokeVirtualMethod(MethodDescriptor.ofMethod(QueryParamExtractor.class,
+                        "extractParameter", Object.class, ResteasyReactiveRequestContext.class), extractorHandle,
+                        quarkusRestContextHandle);
+                m.returnValue(resultHandle);
+            }
+
+            try (MethodCreator m = getPathParamMethodCreator) {
+                m.setModifiers(Modifier.PRIVATE);
+                ResultHandle quarkusRestContextHandle = m.invokeVirtualMethod(getContextMethodCreator.getMethodDescriptor(),
+                        m.getThis());
+                ResultHandle extractorHandle = m.newInstance(
+                        MethodDescriptor.ofConstructor(PathParamExtractor.class, int.class, boolean.class),
+                        m.getMethodParam(0), m.load(false));
+                ResultHandle resultHandle = m.invokeVirtualMethod(MethodDescriptor.ofMethod(PathParamExtractor.class,
+                        "extractParameter", Object.class, ResteasyReactiveRequestContext.class), extractorHandle,
+                        quarkusRestContextHandle);
+                m.returnValue(resultHandle);
+            }
+
+            try (MethodCreator m = getMatrixParamMethodCreator) {
+                m.setModifiers(Modifier.PRIVATE);
+                ResultHandle quarkusRestContextHandle = m.invokeVirtualMethod(getContextMethodCreator.getMethodDescriptor(),
+                        m.getThis());
+                ResultHandle extractorHandle = m.newInstance(
+                        MethodDescriptor.ofConstructor(MatrixParamExtractor.class, String.class, boolean.class, boolean.class),
+                        m.getMethodParam(0), m.load(true), m.load(false));
+                ResultHandle resultHandle = m.invokeVirtualMethod(MethodDescriptor.ofMethod(MatrixParamExtractor.class,
+                        "extractParameter", Object.class, ResteasyReactiveRequestContext.class), extractorHandle,
+                        quarkusRestContextHandle);
+                m.returnValue(resultHandle);
+            }
+
+            try (MethodCreator m = getCookieParamMethodCreator) {
+                m.setModifiers(Modifier.PRIVATE);
+                ResultHandle quarkusRestContextHandle = m.invokeVirtualMethod(getContextMethodCreator.getMethodDescriptor(),
+                        m.getThis());
+                ResultHandle extractorHandle = m.newInstance(
+                        MethodDescriptor.ofConstructor(CookieParamExtractor.class, String.class),
+                        m.getMethodParam(0));
+                ResultHandle resultHandle = m.invokeVirtualMethod(MethodDescriptor.ofMethod(CookieParamExtractor.class,
+                        "extractParameter", Object.class, ResteasyReactiveRequestContext.class), extractorHandle,
+                        quarkusRestContextHandle);
+                m.returnValue(resultHandle);
+            }
+
+            for (Map.Entry<DotName, MethodInfo> entry : resourcesThatNeedCustomProducer.entrySet()) {
+                DotName resourceDotName = entry.getKey();
+                MethodInfo ctor = entry.getValue();
+
+                List<AnnotationInstance> annotations = ctor.annotations();
+
+                Map<Short, List<AnnotationInstance>> paramIndexToAnnotations = new HashMap<>();
+                for (AnnotationInstance annotation : annotations) {
+                    if (annotation.target().kind() != AnnotationTarget.Kind.METHOD_PARAMETER) {
+                        continue;
+                    }
+                    MethodParameterInfo methodParameterInfo = annotation.target().asMethodParameter();
+                    List<AnnotationInstance> annotationsOfParam = paramIndexToAnnotations.get(methodParameterInfo.position());
+                    if (annotationsOfParam == null) {
+                        annotationsOfParam = new ArrayList<>(1);
+                        annotationsOfParam.add(annotation);
+                        paramIndexToAnnotations.put(methodParameterInfo.position(), annotationsOfParam);
+                    }
+                }
+                // We first need to determine how each parameter will be handled
+                // The JAX-RS parameters will be handled directly
+                // The other parameters we will just add to the method signature of the producer method
+                // and let CDI populate them for us
+                List<CtorParamData> ctorParamData = new ArrayList<>(ctor.parameters().size());
+                for (short i = 0; i < ctor.parameters().size(); i++) {
+                    Type parameterType = ctor.parameters().get(i);
+                    if (!paramIndexToAnnotations.containsKey(i)) {
+                        ctorParamData.add(new CtorParamData(CtorParamData.CustomProducerParameterType.OTHER, parameterType));
+                    } else {
+                        List<AnnotationInstance> paramAnnotations = paramIndexToAnnotations.get(i);
+                        List<AnnotationInstance> jaxRSAnnotationsOfParam = new ArrayList<>(paramAnnotations.size());
+                        for (AnnotationInstance paramAnnotation : paramAnnotations) {
+                            if (ResteasyReactiveDotNames.RESOURCE_CTOR_PARAMS_THAT_NEED_HANDLING
+                                    .contains(paramAnnotation.name())) {
+                                jaxRSAnnotationsOfParam.add(paramAnnotation);
+                            }
+                        }
+                        if (jaxRSAnnotationsOfParam.isEmpty()) {
+                            ctorParamData
+                                    .add(new CtorParamData(CtorParamData.CustomProducerParameterType.OTHER, parameterType));
+                        } else if (jaxRSAnnotationsOfParam.size() > 1) {
+                            throw new IllegalArgumentException("Parameter: " + i + " of the constructor of class '"
+                                    + resourceDotName + "' contains multiple JAX-RS annotations, which is not valid");
+                        } else {
+                            AnnotationInstance jaxRSAnnotationOfParam = jaxRSAnnotationsOfParam.iterator().next();
+                            if (!parameterType.name().equals(ResteasyReactiveDotNames.STRING)) {
+                                // TODO: do we need to support converters here?
+                                throw new IllegalArgumentException("Parameter: " + i + " of the constructor of class '"
+                                        + resourceDotName + "' which is annotated with '" + jaxRSAnnotationOfParam.name()
+                                        + "' can only be of type String");
+                            }
+                            CtorParamData.CustomProducerParameterType customProducerParameterType;
+                            if (jaxRSAnnotationOfParam.name().equals(ResteasyReactiveDotNames.QUERY_PARAM)) {
+                                customProducerParameterType = CtorParamData.CustomProducerParameterType.QUERY;
+                            } else if (jaxRSAnnotationOfParam.name().equals(ResteasyReactiveDotNames.HEADER_PARAM)) {
+                                customProducerParameterType = CtorParamData.CustomProducerParameterType.HEADER;
+                            } else if (jaxRSAnnotationOfParam.name().equals(ResteasyReactiveDotNames.PATH_PARAM)) {
+                                customProducerParameterType = CtorParamData.CustomProducerParameterType.PATH;
+                            } else if (jaxRSAnnotationOfParam.name().equals(ResteasyReactiveDotNames.MATRIX_PARAM)) {
+                                customProducerParameterType = CtorParamData.CustomProducerParameterType.MATRIX;
+                            } else if (jaxRSAnnotationOfParam.name().equals(ResteasyReactiveDotNames.COOKIE_PARAM)) {
+                                customProducerParameterType = CtorParamData.CustomProducerParameterType.COOKIE;
+                            } else {
+                                throw new IllegalStateException("Unsupported type '" + jaxRSAnnotationOfParam.name()
+                                        + "' used as an annotation in constructor of class '" + resourceDotName + "'");
+                            }
+                            String name = jaxRSAnnotationOfParam.value().asString(); // all the types we handle have the same annotation method
+                            ctorParamData.add(new CtorParamData(customProducerParameterType, parameterType, name));
+                        }
+                    }
+                }
+                List<String> producerMethodParameterTypes = new ArrayList<>(ctor.parameters().size());
+                for (CtorParamData ctorParamDatum : ctorParamData) {
+                    if (ctorParamDatum.getCustomProducerParameterType() == CtorParamData.CustomProducerParameterType.OTHER) {
+                        producerMethodParameterTypes.add(ctorParamDatum.getParameterType().name().toString());
+                    }
+                }
+
+                String methodName = "producer_" + resourceDotName.withoutPackagePrefix()
+                        + HashUtil.sha1(resourceDotName.toString());
+                try (MethodCreator m = c.getMethodCreator(methodName, resourceDotName.toString(),
+                        producerMethodParameterTypes.toArray(new String[0]))) {
+                    m.addAnnotation(Produces.class);
+                    m.addAnnotation(RequestScoped.class);
+                    // we need this to be unremovable because the Resource itself does not get referenced in any injection point
+                    m.addAnnotation(Unremovable.class);
+
+                    List<ResultHandle> ctorParamHandles = new ArrayList<>(ctorParamData.size());
+                    int otherParamIndex = 0;
+                    for (CtorParamData ctorParamDatum : ctorParamData) {
+                        CtorParamData.CustomProducerParameterType type = ctorParamDatum.getCustomProducerParameterType();
+                        ResultHandle resultHandle;
+                        if (type == CtorParamData.CustomProducerParameterType.OTHER) {
+                            resultHandle = m.getMethodParam(otherParamIndex);
+                            otherParamIndex++;
+                        } else if (type == CtorParamData.CustomProducerParameterType.HEADER) {
+                            resultHandle = m.invokeVirtualMethod(getHeaderParamMethodCreator.getMethodDescriptor(), m.getThis(),
+                                    m.load(ctorParamDatum.getAnnotationValue()));
+                        } else if (type == CtorParamData.CustomProducerParameterType.QUERY) {
+                            resultHandle = m.invokeVirtualMethod(getQueryParamMethodCreator.getMethodDescriptor(), m.getThis(),
+                                    m.load(ctorParamDatum.getAnnotationValue()));
+                        } else if (type == CtorParamData.CustomProducerParameterType.PATH) {
+                            resultHandle = m.invokeVirtualMethod(getPathParamMethodCreator.getMethodDescriptor(), m.getThis(),
+                                    m.load(0)); // TODO: this is not correct, we really need to look up the index
+                        } else if (type == CtorParamData.CustomProducerParameterType.MATRIX) {
+                            resultHandle = m.invokeVirtualMethod(getMatrixParamMethodCreator.getMethodDescriptor(), m.getThis(),
+                                    m.load(ctorParamDatum.getAnnotationValue()));
+                        } else if (type == CtorParamData.CustomProducerParameterType.COOKIE) {
+                            resultHandle = m.invokeVirtualMethod(getCookieParamMethodCreator.getMethodDescriptor(), m.getThis(),
+                                    m.load(ctorParamDatum.getAnnotationValue()));
+                        } else {
+                            throw new IllegalStateException("Unknown type '" + type
+                                    + "' used as an annotation in constructor of class '" + resourceDotName + "'");
+                        }
+                        ctorParamHandles.add(resultHandle);
+                    }
+
+                    // FIXME: this doesn't actually support injection in the resource instance
+                    m.returnValue(m.newInstance(ctor, ctorParamHandles.toArray(new ResultHandle[0])));
+                }
+            }
+            // FIXME: support constructors for bean params too
+            additionalBeanBuildItemBuildProducer
+                    .produce(AdditionalBeanBuildItem.builder().addBeanClasses(beanParamsThatNeedCustomProducer)
+                            // FIXME: we should add this, but for that we also need to make the resource class request-scoped
+                            //                                                         .setDefaultScope(DOTNAME_REQUEST_SCOPED)
+                            //                                                         .setUnremovable()
+                            .build());
+        }
+    }
+
+    private static class CtorParamData {
+        private final CustomProducerParameterType customProducerParameterType;
+        private final Type parameterType;
+        private final String annotationValue; // represents the name obtained from the JAX-RS annotation
+
+        public CtorParamData(CustomProducerParameterType customProducerParameterType, Type parameterType) {
+            this(customProducerParameterType, parameterType, null);
+        }
+
+        public CtorParamData(CustomProducerParameterType customProducerParameterType, Type parameterType,
+                String annotationValue) {
+            this.customProducerParameterType = customProducerParameterType;
+            this.parameterType = parameterType;
+            this.annotationValue = annotationValue;
+        }
+
+        public CustomProducerParameterType getCustomProducerParameterType() {
+            return customProducerParameterType;
+        }
+
+        public Type getParameterType() {
+            return parameterType;
+        }
+
+        public String getAnnotationValue() {
+            return annotationValue;
+        }
+
+        private enum CustomProducerParameterType {
+            QUERY,
+            HEADER,
+            PATH,
+            MATRIX,
+            COOKIE,
+            OTHER
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/DotNames.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/DotNames.java
new file mode 100644
index 0000000000000..8979dead825fd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/DotNames.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+
+import org.jboss.jandex.DotName;
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+
+final class DotNames {
+
+    static final String POPULATE_METHOD_NAME = "populate";
+    static final DotName OBJECT_NAME = DotName.createSimple(Object.class.getName());
+    static final DotName STRING_NAME = DotName.createSimple(String.class.getName());
+    static final DotName INPUT_STREAM_NAME = DotName.createSimple(InputStream.class.getName());
+    static final DotName INPUT_STREAM_READER_NAME = DotName.createSimple(InputStreamReader.class.getName());
+    static final DotName FIELD_UPLOAD_NAME = DotName.createSimple(FileUpload.class.getName());
+    static final DotName PATH_NAME = DotName.createSimple(Path.class.getName());
+    static final DotName FILE_NAME = DotName.createSimple(File.class.getName());
+    static final DotName PART_TYPE_NAME = DotName.createSimple(PartType.class.getName());
+
+    private DotNames() {
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ExceptionMappersBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ExceptionMappersBuildItem.java
new file mode 100644
index 0000000000000..2ad8c5fe5412e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ExceptionMappersBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class ExceptionMappersBuildItem extends SimpleBuildItem {
+
+    private final ExceptionMapping exceptionMapping;
+
+    public ExceptionMappersBuildItem(ExceptionMapping exceptionMapping) {
+        this.exceptionMapping = exceptionMapping;
+    }
+
+    public ExceptionMapping getExceptionMapping() {
+        return exceptionMapping;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratorUtils.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratorUtils.java
new file mode 100644
index 0000000000000..a0dacaf64780c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratorUtils.java
@@ -0,0 +1,43 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import org.jboss.jandex.DotName;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.ResultHandle;
+import io.vertx.ext.web.RoutingContext;
+
+final class GeneratorUtils {
+
+    private GeneratorUtils() {
+    }
+
+    static void paramHandleFromReqContextMethod(MethodCreator m, ResultHandle qrReqCtxHandle,
+            ResultHandle[] targetMethodParamHandles, int i, String methodName, DotName returnType) {
+        paramHandleFromReqContextMethod(m, qrReqCtxHandle, targetMethodParamHandles, i, methodName, returnType.toString());
+    }
+
+    static void paramHandleFromReqContextMethod(MethodCreator m, ResultHandle qrReqCtxHandle,
+            ResultHandle[] targetMethodParamHandles, int i, String methodName, Class<?> returnType) {
+        paramHandleFromReqContextMethod(m, qrReqCtxHandle, targetMethodParamHandles, i, methodName, returnType.getName());
+    }
+
+    private static void paramHandleFromReqContextMethod(MethodCreator m, ResultHandle qrReqCtxHandle,
+            ResultHandle[] targetMethodParamHandles, int i, String methodName, String returnType) {
+        targetMethodParamHandles[i] = m.invokeVirtualMethod(
+                ofMethod(ResteasyReactiveRequestContext.class.getName(), methodName, returnType), qrReqCtxHandle);
+    }
+
+    static ResultHandle routingContextHandler(MethodCreator m, ResultHandle qrReqCtxHandle) {
+        return m.invokeVirtualMethod(ofMethod(ResteasyReactiveRequestContext.class, "unwrap", Object.class, Class.class),
+                qrReqCtxHandle, m.loadClass(RoutingContext.class));
+    }
+
+    static ResultHandle runtimeResourceHandle(MethodCreator filterMethod, ResultHandle qrReqCtxHandle) {
+        return filterMethod.invokeVirtualMethod(
+                ofMethod(ResteasyReactiveRequestContext.class, "getTarget", RuntimeResource.class), qrReqCtxHandle);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MethodScannerBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MethodScannerBuildItem.java
new file mode 100644
index 0000000000000..0d5c20fe48723
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MethodScannerBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class MethodScannerBuildItem extends MultiBuildItem {
+
+    private final MethodScanner methodScanner;
+
+    public MethodScannerBuildItem(MethodScanner methodScanner) {
+        this.methodScanner = methodScanner;
+    }
+
+    public MethodScanner getMethodScanner() {
+        return methodScanner;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java
new file mode 100644
index 0000000000000..c5e2bfc5480ec
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java
@@ -0,0 +1,392 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.*;
+
+import java.io.File;
+import java.lang.reflect.Modifier;
+import java.nio.file.Path;
+import java.util.List;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.processor.AsmUtil;
+import org.jboss.resteasy.reactive.common.processor.TypeArgMapper;
+import org.jboss.resteasy.reactive.common.util.DeploymentUtils;
+import org.jboss.resteasy.reactive.common.util.types.TypeSignatureParser;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionContext;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+
+import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.resteasy.reactive.server.runtime.multipart.MultipartSupport;
+import io.quarkus.resteasy.reactive.server.runtime.multipart.QuarkusFileUpload;
+
+final class MultipartPopulatorGenerator {
+
+    private static final Logger LOGGER = Logger.getLogger(MultipartPopulatorGenerator.class);
+
+    private MultipartPopulatorGenerator() {
+    }
+
+    /**
+     * Generates a class that populates a Pojo that is used as a @MultipartForm parameter in a resource method.
+     * The generated class is called at runtime by the {@code __quarkus_rest_inject} method of the class
+     * (which is added by {@link MultipartTransformer}).
+     *
+     * <p>
+     * For example for a pojo like:
+     *
+     * <pre>
+     * public class FormData {
+     *
+     *     &#64;RestForm
+     *     &#64;PartType(MediaType.TEXT_PLAIN)
+     *     private String foo;
+     *
+     *     &#64;RestForm
+     *     &#64;PartType(MediaType.APPLICATION_JSON)
+     *     public Map<String, String> map;
+     *
+     *     &#64;RestForm
+     *     &#64;PartType(MediaType.APPLICATION_JSON)
+     *     public Person person;
+     *
+     *     &#64;RestForm
+     *     &#64;PartType(MediaType.TEXT_PLAIN)
+     *     private Status status;
+     *
+     *     &#64;RestForm("htmlFile")
+     *     private FileUpload htmlPart;
+     *
+     *     &#64;RestForm("htmlFile")
+     *     public Path xmlPart;
+     *
+     *     &#64;RestForm
+     *     public File txtFile;
+     *
+     *     public String getFoo() {
+     *         return foo;
+     *     }
+     *
+     *     public void setFoo(String foo) {
+     *         this.foo = foo;
+     *     }
+     *
+     *     public Status getStatus() {
+     *         return status;
+     *     }
+     *
+     *     public void setStatus(Status status) {
+     *         this.status = status;
+     *     }
+     *
+     *     public FileUpload getHtmlPart() {
+     *         return htmlPart;
+     *     }
+     *
+     *     public void setHtmlPart(FileUpload htmlPart) {
+     *         this.htmlPart = htmlPart;
+     *     }
+     * }
+     * </pre>
+     *
+     * <p>
+     * the generated populator would look like:
+     *
+     * <pre>
+     * public class FormData_generated_populator {
+     *     private static Class map_type;
+     *     private static Type map_genericType;
+     *     private static MediaType map_mediaType;
+     *     private static Class person_type;
+     *     private static Type person_genericType;
+     *     private static MediaType person_mediaType;
+     *     private static Class status_type;
+     *     private static Type status_genericType;
+     *     private static MediaType status_mediaType;
+     *
+     *     static {
+     *         map_type = DeploymentUtils.loadClass("java.util.Map");
+     *         map_genericType = TypeSignatureParser.parse("Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;");
+     *         map_mediaType = MediaType.valueOf("application/json");
+     *         Class var0 = DeploymentUtils.loadClass("org.acme.getting.started.Person");
+     *         person_type = var0;
+     *         person_genericType = var0;
+     *         person_mediaType = MediaType.valueOf("application/json");
+     *         Class var1 = DeploymentUtils.loadClass("org.acme.getting.started.Status");
+     *         status_type = var1;
+     *         status_genericType = var1;
+     *         status_mediaType = MediaType.valueOf("text/plain");
+     *     }
+     *
+     *     public static void populate(FormData var0, ResteasyReactiveInjectionContext var1) {
+     *         ResteasyReactiveRequestContext var3 = (ResteasyReactiveRequestContext) var1;
+     *         ServerHttpRequest var5 = var3.serverRequest();
+     *         String var2 = var5.getFormAttribute("foo");
+     *         var0.setFoo((String) var2);
+     *         QuarkusFileUpload var4 = MultipartSupport.getFileUpload("htmlFile", var3);
+     *         var0.setHtmlPart((FileUpload) var4);
+     *         String var6 = var5.getFormAttribute("map");
+     *         Class var7 = map_type;
+     *         Type var8 = map_genericType;
+     *         MediaType var9 = map_mediaType;
+     *         Object var10 = MultipartSupport.convertFormAttribute(var6, var7, var8, var9, var3);
+     *         var0.map = (Map) var10;
+     *         String var11 = var5.getFormAttribute("person");
+     *         Class var12 = person_type;
+     *         Type var13 = person_genericType;
+     *         MediaType var14 = person_mediaType;
+     *         Object var15 = MultipartSupport.convertFormAttribute(var11, var12, var13, var14, var3);
+     *         var0.person = (Person) var15;
+     *         String var16 = var5.getFormAttribute("status");
+     *         Class var17 = status_type;
+     *         Type var18 = status_genericType;
+     *         MediaType var19 = status_mediaType;
+     *         Object var20 = MultipartSupport.convertFormAttribute(var16, var17, var18, var19, var3);
+     *         var0.setStatus((Status) var20);
+     *         QuarkusFileUpload var21 = MultipartSupport.getFileUpload("txtFile", var3);
+     *         File var22;
+     *         if (var21 != null) {
+     *             var22 = var21.uploadedFile().toFile();
+     *         } else {
+     *             var22 = null;
+     *         }
+     *
+     *         var0.txtFile = (File) var22;
+     *         QuarkusFileUpload var23 = MultipartSupport.getFileUpload("htmlFile", var3);
+     *         Path var24;
+     *         if (var23 != null) {
+     *             var24 = var23.uploadedFile();
+     *         } else {
+     *             var24 = null;
+     *         }
+     *
+     *         var0.xmlPart = (Path) var24;
+     *     }
+     * }
+     * </pre>
+     *
+     */
+    static String generate(ClassInfo multipartClassInfo, ClassOutput classOutput, IndexView index) {
+        if (!multipartClassInfo.hasNoArgsConstructor()) {
+            throw new IllegalArgumentException("Classes annotated with '@MultipartForm' must contain a no-args constructor");
+        }
+
+        String multipartClassName = multipartClassInfo.name().toString();
+        String generateClassName = multipartClassName + "_generated_populator";
+        try (ClassCreator cc = new ClassCreator(classOutput, generateClassName, null, Object.class.getName())) {
+            MethodCreator populate = cc.getMethodCreator(DotNames.POPULATE_METHOD_NAME, void.class.getName(),
+                    multipartClassName,
+                    ResteasyReactiveInjectionContext.class.getName());
+            populate.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
+
+            MethodCreator clinit = cc.getMethodCreator("<clinit>", void.class);
+            clinit.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
+
+            ResultHandle instanceHandle = populate.getMethodParam(0);
+            ResultHandle rrCtxHandle = populate.checkCast(populate.getMethodParam(1), ResteasyReactiveRequestContext.class);
+            ResultHandle serverReqHandle = populate.invokeVirtualMethod(
+                    MethodDescriptor.ofMethod(ResteasyReactiveRequestContext.class, "serverRequest", ServerHttpRequest.class),
+                    rrCtxHandle);
+
+            // go up the class hierarchy until we reach Object
+            ClassInfo currentClassInHierarchy = multipartClassInfo;
+            while (true) {
+                List<FieldInfo> fields = currentClassInHierarchy.fields();
+                for (FieldInfo field : fields) {
+                    if (Modifier.isStatic(field.flags())) { // nothing we need to do about static fields
+                        continue;
+                    }
+
+                    AnnotationInstance formParamInstance = field.annotation(REST_FORM_PARAM);
+                    if (formParamInstance == null) {
+                        formParamInstance = field.annotation(FORM_PARAM);
+                    }
+                    if (formParamInstance == null) { // fields not annotated with @RestForm or @FormParam are completely ignored
+                        continue;
+                    }
+
+                    boolean useFieldAccess = false;
+                    String setterName = JavaBeanUtil.getSetterName(field.name());
+                    Type fieldType = field.type();
+                    DotName fieldDotName = fieldType.name();
+                    MethodInfo setter = currentClassInHierarchy.method(setterName, fieldType);
+                    if (setter == null) {
+                        // even if the field is private, it will be transformed to be made public
+                        useFieldAccess = true;
+                    }
+                    if (!useFieldAccess && !Modifier.isPublic(setter.flags())) {
+                        throw new IllegalArgumentException(
+                                "Setter '" + setterName + "' of class '" + multipartClassInfo + "' must be public");
+                    }
+
+                    if (fieldDotName.equals(DotNames.INPUT_STREAM_NAME)
+                            || fieldDotName.equals(DotNames.INPUT_STREAM_READER_NAME)) {
+                        // don't support InputStream as it's too easy to get into trouble
+                        throw new IllegalArgumentException(
+                                "InputStream and InputStreamReader are not support as a field type of a Multipart POJO class. Offending field is '"
+                                        + field.name() + "' of class '" + multipartClassName + "'");
+                    }
+
+                    String formAttrName = field.name();
+                    AnnotationValue formParamValue = formParamInstance.value();
+                    if (formParamValue != null) {
+                        formAttrName = formParamValue.asString();
+                    }
+
+                    // TODO: not sure this is correct, but it seems to be what RESTEasy does and it also makes most sense in the context of a POJO
+                    String partType = MediaType.TEXT_PLAIN;
+                    AnnotationInstance partTypeInstance = field.annotation(DotNames.PART_TYPE_NAME);
+                    if (partTypeInstance != null) {
+                        AnnotationValue partTypeValue = partTypeInstance.value();
+                        if (partTypeValue != null) {
+                            partType = partTypeValue.asString();
+                        }
+                    }
+
+                    boolean isFileRelatedField = fieldDotName.equals(DotNames.FIELD_UPLOAD_NAME)
+                            || fieldDotName.equals(DotNames.PATH_NAME)
+                            || fieldDotName.equals(DotNames.FILE_NAME);
+                    ResultHandle formAttrNameHandle = populate.load(formAttrName);
+                    AssignableResultHandle resultHandle = populate.createVariable(Object.class);
+
+                    if (isFileRelatedField) {
+                        // uploaded file are present in the RoutingContext and are extracted using MultipartSupport#getFileUpload
+
+                        ResultHandle fileUploadHandle = populate.invokeStaticMethod(
+                                MethodDescriptor.ofMethod(MultipartSupport.class, "getFileUpload", QuarkusFileUpload.class,
+                                        String.class, ResteasyReactiveRequestContext.class),
+                                formAttrNameHandle, rrCtxHandle);
+                        if (fieldDotName.equals(DotNames.FIELD_UPLOAD_NAME)) {
+                            populate.assign(resultHandle, fileUploadHandle);
+                        } else if (fieldDotName.equals(DotNames.PATH_NAME) || fieldDotName.equals(DotNames.FILE_NAME)) {
+                            BranchResult fileUploadNullBranch = populate.ifNull(fileUploadHandle);
+                            BytecodeCreator fileUploadNullTrue = fileUploadNullBranch.trueBranch();
+                            fileUploadNullTrue.assign(resultHandle, populate.loadNull());
+                            fileUploadNullTrue.breakScope();
+                            BytecodeCreator fileUploadFalse = fileUploadNullBranch.falseBranch();
+                            ResultHandle pathHandle = fileUploadFalse.invokeVirtualMethod(
+                                    MethodDescriptor.ofMethod(QuarkusFileUpload.class, "uploadedFile", Path.class),
+                                    fileUploadHandle);
+                            if (fieldDotName.equals(DotNames.PATH_NAME)) {
+                                fileUploadFalse.assign(resultHandle, pathHandle);
+                            } else {
+                                fileUploadFalse.assign(resultHandle, fileUploadFalse.invokeInterfaceMethod(
+                                        MethodDescriptor.ofMethod(Path.class, "toFile", File.class), pathHandle));
+                            }
+                            fileUploadFalse.breakScope();
+                        }
+                    } else {
+                        if (fieldDotName.equals(DotNames.STRING_NAME) && partType.equals(MediaType.TEXT_PLAIN)) {
+                            // in this case all we need to do is read the value of the form attribute
+
+                            populate.assign(resultHandle,
+                                    populate.invokeInterfaceMethod(MethodDescriptor.ofMethod(ServerHttpRequest.class,
+                                            "getFormAttribute", String.class, String.class), serverReqHandle,
+                                            formAttrNameHandle));
+                        } else {
+                            // we need to use the field type and the media type to locate a MessageBodyReader
+
+                            FieldDescriptor typeField = cc.getFieldCreator(field.name() + "_type", Class.class)
+                                    .setModifiers(Modifier.PRIVATE | Modifier.STATIC).getFieldDescriptor();
+                            FieldDescriptor genericTypeField = cc
+                                    .getFieldCreator(field.name() + "_genericType", java.lang.reflect.Type.class)
+                                    .setModifiers(Modifier.PRIVATE | Modifier.STATIC).getFieldDescriptor();
+                            FieldDescriptor mediaTypeField = cc.getFieldCreator(field.name() + "_mediaType", MediaType.class)
+                                    .setModifiers(Modifier.PRIVATE | Modifier.STATIC).getFieldDescriptor();
+
+                            ResultHandle typeHandle = clinit.invokeStaticMethod(
+                                    MethodDescriptor.ofMethod(DeploymentUtils.class, "loadClass", Class.class, String.class),
+                                    clinit.load(fieldDotName.toString()));
+                            clinit.writeStaticField(typeField, typeHandle);
+                            if ((fieldType.kind() != Type.Kind.CLASS) && (fieldType.kind() != Type.Kind.PRIMITIVE)) {
+                                // in order to pass the generic type we use the same trick with capturing and at runtime
+                                // parsing the signature
+                                TypeArgMapper typeArgMapper = new TypeArgMapper(field.declaringClass(), index);
+                                ResultHandle genericTypeHandle = clinit.invokeStaticMethod(
+                                        MethodDescriptor.ofMethod(TypeSignatureParser.class, "parse",
+                                                java.lang.reflect.Type.class, String.class),
+                                        clinit.load(AsmUtil.getSignature(fieldType, typeArgMapper)));
+                                clinit.writeStaticField(genericTypeField, genericTypeHandle);
+                            } else {
+                                clinit.writeStaticField(genericTypeField, typeHandle);
+                            }
+                            clinit.writeStaticField(mediaTypeField, clinit.invokeStaticMethod(
+                                    MethodDescriptor.ofMethod(MediaType.class, "valueOf", MediaType.class, String.class),
+                                    clinit.load(partType)));
+
+                            ResultHandle formStrValueHandle = populate.invokeInterfaceMethod(
+                                    MethodDescriptor.ofMethod(ServerHttpRequest.class,
+                                            "getFormAttribute", String.class, String.class),
+                                    serverReqHandle,
+                                    formAttrNameHandle);
+
+                            populate.assign(resultHandle, populate.invokeStaticMethod(
+                                    MethodDescriptor.ofMethod(MultipartSupport.class, "convertFormAttribute", Object.class,
+                                            String.class,
+                                            Class.class,
+                                            java.lang.reflect.Type.class, MediaType.class,
+                                            ResteasyReactiveRequestContext.class),
+                                    formStrValueHandle, populate.readStaticField(typeField),
+                                    populate.readStaticField(genericTypeField),
+                                    populate.readStaticField(mediaTypeField),
+                                    rrCtxHandle));
+                        }
+                    }
+
+                    if (useFieldAccess) {
+                        BytecodeCreator bc = populate;
+                        if (fieldType.kind() == Type.Kind.PRIMITIVE) {
+                            bc = populate.ifNull(resultHandle).falseBranch();
+                        }
+                        bc.writeInstanceField(FieldDescriptor.of(currentClassInHierarchy.name().toString(), field.name(),
+                                fieldDotName.toString()), instanceHandle, resultHandle);
+                    } else {
+                        BytecodeCreator bc = populate;
+                        if (fieldType.kind() == Type.Kind.PRIMITIVE) {
+                            bc = populate.ifNull(resultHandle).falseBranch();
+                        }
+                        bc.invokeVirtualMethod(MethodDescriptor.ofMethod(currentClassInHierarchy.name().toString(),
+                                setterName, void.class, fieldDotName.toString()), instanceHandle, resultHandle);
+                    }
+                }
+
+                DotName superClassDotName = currentClassInHierarchy.superName();
+                if (superClassDotName.equals(DotNames.OBJECT_NAME)) {
+                    break;
+                }
+                ClassInfo newCurrentClassInHierarchy = index.getClassByName(superClassDotName);
+                if (newCurrentClassInHierarchy == null) {
+                    if (!superClassDotName.toString().startsWith("java.")) {
+                        LOGGER.warn("Class '" + superClassDotName + "' which is a parent class of '"
+                                + currentClassInHierarchy.name()
+                                + "' is not part of the Jandex index so its fields will be ignored. If you intended to include these fields, consider making the dependency part of the Jandex index by following the advice at: https://quarkus.io/guides/cdi-reference#bean_discovery");
+                    }
+                    break;
+                }
+                currentClassInHierarchy = newCurrentClassInHierarchy;
+            }
+            clinit.returnValue(null);
+            populate.returnValue(null);
+        }
+        return generateClassName;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java
new file mode 100644
index 0000000000000..461d0068d2be9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartTransformer.java
@@ -0,0 +1,92 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.util.function.BiFunction;
+
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionContext;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import io.quarkus.gizmo.Gizmo;
+
+class MultipartTransformer implements BiFunction<String, ClassVisitor, ClassVisitor> {
+
+    private static final String INJECTION_TARGET_BINARY_NAME = ResteasyReactiveInjectionTarget.class.getName()
+            .replace('.', '/');
+    private static final String INJECTION_CONTEXT_BINARY_NAME = ResteasyReactiveInjectionContext.class.getName()
+            .replace('.', '/');
+    private static final String INJECTION_CONTEXT_DESCRIPTOR = "L" + INJECTION_CONTEXT_BINARY_NAME + ";";
+
+    private static final String INJECT_METHOD_NAME = "__quarkus_rest_inject";
+    private static final String INJECT_METHOD_DESCRIPTOR = "(" + INJECTION_CONTEXT_DESCRIPTOR + ")V";
+
+    private final String populatorName;
+
+    public MultipartTransformer(String populatorName) {
+        this.populatorName = populatorName;
+    }
+
+    @Override
+    public ClassVisitor apply(String s, ClassVisitor visitor) {
+        return new MultipartClassVisitor(Gizmo.ASM_API_VERSION, visitor, populatorName);
+    }
+
+    static class MultipartClassVisitor extends ClassVisitor {
+
+        private String thisDescriptor;
+        private final String populatorName;
+
+        public MultipartClassVisitor(int api, ClassVisitor classVisitor, String populatorName) {
+            super(api, classVisitor);
+            this.populatorName = populatorName;
+        }
+
+        @Override
+        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+            thisDescriptor = "L" + name + ";";
+
+            // make the class public
+            access &= ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED);
+            access |= Opcodes.ACC_PUBLIC;
+
+            String[] newInterfaces = new String[interfaces.length + 1];
+            newInterfaces[0] = INJECTION_TARGET_BINARY_NAME;
+            System.arraycopy(interfaces, 0, newInterfaces, 1, interfaces.length);
+            super.visit(version, access, name, signature, superName, newInterfaces);
+        }
+
+        @Override
+        public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
+            if (((access & Opcodes.ACC_FINAL) == 0) && ((access & Opcodes.ACC_STATIC) == 0)) {
+                // convert non-final, non-static fields to public so our generated code can always access it
+                access &= ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED);
+                access |= Opcodes.ACC_PUBLIC;
+            }
+            return super.visitField(access, name, descriptor, signature, value);
+        }
+
+        @Override
+        public void visitEnd() {
+            MethodVisitor injectMethod = visitMethod(Opcodes.ACC_PUBLIC, INJECT_METHOD_NAME, INJECT_METHOD_DESCRIPTOR, null,
+                    null);
+            injectMethod.visitParameter("ctx", 0 /* modifiers */);
+            injectMethod.visitCode();
+
+            // this
+            injectMethod.visitIntInsn(Opcodes.ALOAD, 0);
+            // ctx param
+            injectMethod.visitIntInsn(Opcodes.ALOAD, 1);
+
+            // call the populator
+            injectMethod.visitMethodInsn(Opcodes.INVOKESTATIC, populatorName.replace('.', '/'),
+                    DotNames.POPULATE_METHOD_NAME,
+                    String.format("(%s%s)V", thisDescriptor, INJECTION_CONTEXT_DESCRIPTOR), false);
+
+            injectMethod.visitInsn(Opcodes.RETURN);
+            injectMethod.visitEnd();
+            injectMethod.visitMaxs(0, 0);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ParamConverterProvidersBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ParamConverterProvidersBuildItem.java
new file mode 100644
index 0000000000000..c68450e46aa5e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ParamConverterProvidersBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class ParamConverterProvidersBuildItem extends SimpleBuildItem {
+
+    private final ParamConverterProviders paramConverterProviders;
+
+    public ParamConverterProvidersBuildItem(ParamConverterProviders paramConverterProviders) {
+        this.paramConverterProviders = paramConverterProviders;
+    }
+
+    public ParamConverterProviders getParamConverterProviders() {
+        return paramConverterProviders;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusInvokerFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusInvokerFactory.java
new file mode 100644
index 0000000000000..80bdce0deba84
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusInvokerFactory.java
@@ -0,0 +1,68 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.lang.reflect.Modifier;
+import java.util.function.Supplier;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.common.processor.HashUtil;
+import org.jboss.resteasy.reactive.server.processor.EndpointInvokerFactory;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRecorder;
+
+public class QuarkusInvokerFactory implements EndpointInvokerFactory {
+
+    final BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer;
+    final ResteasyReactiveRecorder recorder;
+
+    public QuarkusInvokerFactory(BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
+            ResteasyReactiveRecorder recorder) {
+        this.generatedClassBuildItemBuildProducer = generatedClassBuildItemBuildProducer;
+        this.recorder = recorder;
+    }
+
+    @Override
+    public Supplier<EndpointInvoker> create(ResourceMethod method, ClassInfo currentClassInfo, MethodInfo info) {
+
+        StringBuilder sigBuilder = new StringBuilder();
+        sigBuilder.append(method.getName())
+                .append(method.getReturnType());
+        for (MethodParameter t : method.getParameters()) {
+            sigBuilder.append(t);
+        }
+        String baseName = currentClassInfo.name() + "$quarkusrestinvoker$" + method.getName() + "_"
+                + HashUtil.sha1(sigBuilder.toString());
+        try (ClassCreator classCreator = new ClassCreator(
+                new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true), baseName, null,
+                Object.class.getName(), EndpointInvoker.class.getName())) {
+            MethodCreator mc = classCreator.getMethodCreator("invoke", Object.class, Object.class, Object[].class);
+            ResultHandle[] args = new ResultHandle[method.getParameters().length];
+            ResultHandle array = mc.getMethodParam(1);
+            for (int i = 0; i < method.getParameters().length; ++i) {
+                args[i] = mc.readArrayValue(array, i);
+            }
+            ResultHandle res;
+            if (Modifier.isInterface(currentClassInfo.flags())) {
+                res = mc.invokeInterfaceMethod(info, mc.getMethodParam(0), args);
+            } else {
+                res = mc.invokeVirtualMethod(info, mc.getMethodParam(0), args);
+            }
+            if (info.returnType().kind() == Type.Kind.VOID) {
+                mc.returnValue(mc.loadNull());
+            } else {
+                mc.returnValue(res);
+            }
+        }
+        return recorder.invoker(baseName);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java
new file mode 100644
index 0000000000000..724796218995a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java
@@ -0,0 +1,297 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.STRING;
+
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.ClassType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig;
+import org.jboss.resteasy.reactive.common.processor.DefaultProducesHandler;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.GeneratedParameterConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.NoopParameterConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverterSupplier;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.RuntimeResolvedConverter;
+import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer;
+import org.jboss.resteasy.reactive.server.processor.ServerIndexedParameter;
+
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.ext.web.RoutingContext;
+
+public class QuarkusServerEndpointIndexer
+        extends ServerEndpointIndexer {
+    private final MethodCreator initConverters;
+    private final BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer;
+    private final BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformerBuildProducer;
+    private final BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer;
+    private final DefaultProducesHandler defaultProducesHandler;
+
+    private final Map<String, String> multipartGeneratedPopulators = new HashMap<>();
+    private final Predicate<String> applicationClassPredicate;
+
+    private static final Set<DotName> CONTEXT_TYPES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+            DotName.createSimple(HttpServerRequest.class.getName()),
+            DotName.createSimple(HttpServerResponse.class.getName()),
+            DotName.createSimple(RoutingContext.class.getName()))));
+
+    QuarkusServerEndpointIndexer(Builder builder) {
+        super(builder);
+        this.initConverters = builder.initConverters;
+        this.generatedClassBuildItemBuildProducer = builder.generatedClassBuildItemBuildProducer;
+        this.bytecodeTransformerBuildProducer = builder.bytecodeTransformerBuildProducer;
+        this.reflectiveClassProducer = builder.reflectiveClassProducer;
+        this.defaultProducesHandler = builder.defaultProducesHandler;
+        this.applicationClassPredicate = builder.applicationClassPredicate;
+    }
+
+    protected boolean isContextType(ClassType klass) {
+        return super.isContextType(klass) || CONTEXT_TYPES.contains(klass.name());
+    }
+
+    @Override
+    protected String[] applyAdditionalDefaults(Type nonAsyncReturnType) {
+        List<MediaType> defaultMediaTypes = defaultProducesHandler.handle(new DefaultProducesHandler.Context() {
+            @Override
+            public Type nonAsyncReturnType() {
+                return nonAsyncReturnType;
+            }
+
+            @Override
+            public IndexView index() {
+                return index;
+            }
+
+            @Override
+            public ResteasyReactiveConfig config() {
+                return config;
+            }
+        });
+        if ((defaultMediaTypes != null) && !defaultMediaTypes.isEmpty()) {
+            String[] result = new String[defaultMediaTypes.size()];
+            for (int i = 0; i < defaultMediaTypes.size(); i++) {
+                result[i] = defaultMediaTypes.get(i).toString();
+            }
+            return result;
+        }
+        return super.applyAdditionalDefaults(nonAsyncReturnType);
+    }
+
+    @Override
+    protected ParameterConverterSupplier extractConverter(String elementType, IndexView indexView,
+            Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters) {
+        if (elementType.equals(String.class.getName())) {
+            if (hasRuntimeConverters)
+                return new RuntimeResolvedConverter.Supplier().setDelegate(new NoopParameterConverter.Supplier());
+            // String needs no conversion
+            return null;
+        } else if (existingConverters.containsKey(elementType)) {
+            String className = existingConverters.get(elementType);
+            ParameterConverterSupplier delegate;
+            if (className == null)
+                delegate = null;
+            else
+                delegate = new GeneratedParameterConverter().setClassName(className);
+            if (hasRuntimeConverters)
+                return new RuntimeResolvedConverter.Supplier().setDelegate(delegate);
+            if (delegate == null)
+                throw new RuntimeException("Failed to find converter for " + elementType);
+            return delegate;
+        }
+
+        MethodDescriptor fromString = null;
+        MethodDescriptor valueOf = null;
+        MethodInfo stringCtor = null;
+        String primitiveWrapperType = primitiveTypes.get(elementType);
+        String prefix = "";
+        if (primitiveWrapperType != null) {
+            valueOf = MethodDescriptor.ofMethod(primitiveWrapperType, "valueOf", primitiveWrapperType, String.class);
+            prefix = "io.quarkus.generated.";
+        } else {
+            ClassInfo type = indexView.getClassByName(DotName.createSimple(elementType));
+            if (type != null) {
+                for (MethodInfo i : type.methods()) {
+                    boolean isStatic = ((i.flags() & Modifier.STATIC) != 0);
+                    boolean isNotPrivate = (i.flags() & Modifier.PRIVATE) == 0;
+                    if ((i.parameters().size() == 1) && isNotPrivate) {
+                        if (i.parameters().get(0).name().equals(STRING)) {
+                            if (i.name().equals("<init>")) {
+                                stringCtor = i;
+                            } else if (i.name().equals("valueOf") && isStatic) {
+                                valueOf = MethodDescriptor.of(i);
+                            } else if (i.name().equals("fromString") && isStatic) {
+                                fromString = MethodDescriptor.of(i);
+                            }
+                        }
+                    }
+                }
+                if (type.isEnum()) {
+                    //spec weirdness, enums order is different
+                    if (fromString != null) {
+                        valueOf = null;
+                    }
+                }
+            }
+        }
+
+        String baseName;
+        ParameterConverterSupplier delegate;
+        if (stringCtor != null || valueOf != null || fromString != null) {
+            String effectivePrefix = prefix + elementType;
+            if (effectivePrefix.startsWith("java")) {
+                effectivePrefix = effectivePrefix.replace("java", "javaq"); // generated classes can't start with the java package
+            }
+            baseName = effectivePrefix + "$quarkusrestparamConverter$";
+            try (ClassCreator classCreator = new ClassCreator(
+                    new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer,
+                            applicationClassPredicate.test(elementType)),
+                    baseName, null,
+                    Object.class.getName(), ParameterConverter.class.getName())) {
+                MethodCreator mc = classCreator.getMethodCreator("convert", Object.class, Object.class);
+                if (stringCtor != null) {
+                    ResultHandle ret = mc.newInstance(stringCtor, mc.getMethodParam(0));
+                    mc.returnValue(ret);
+                } else if (valueOf != null) {
+                    ResultHandle ret = mc.invokeStaticMethod(valueOf, mc.getMethodParam(0));
+                    mc.returnValue(ret);
+                } else if (fromString != null) {
+                    ResultHandle ret = mc.invokeStaticMethod(fromString, mc.getMethodParam(0));
+                    mc.returnValue(ret);
+                }
+            }
+            delegate = new GeneratedParameterConverter().setClassName(baseName);
+        } else {
+            // let's not try this again
+            baseName = null;
+            delegate = null;
+        }
+        existingConverters.put(elementType, baseName);
+        if (hasRuntimeConverters)
+            return new RuntimeResolvedConverter.Supplier().setDelegate(delegate);
+        if (delegate == null)
+            throw new RuntimeException("Failed to find converter for " + elementType);
+        return delegate;
+    }
+
+    protected void handleFieldExtractors(String currentTypeName, Map<FieldInfo, ServerIndexedParameter> fieldExtractors,
+            boolean superTypeIsInjectable) {
+        bytecodeTransformerBuildProducer.produce(new BytecodeTransformerBuildItem(currentTypeName,
+                new ClassInjectorTransformer(fieldExtractors, superTypeIsInjectable)));
+    }
+
+    protected void handleConverter(String currentTypeName, FieldInfo field) {
+        initConverters.invokeStaticMethod(MethodDescriptor.ofMethod(currentTypeName,
+                ClassInjectorTransformer.INIT_CONVERTER_METHOD_NAME + field.name(),
+                void.class, Deployment.class),
+                initConverters.getMethodParam(0));
+    }
+
+    protected void handleMultipart(ClassInfo multipartClassInfo) {
+        String className = multipartClassInfo.name().toString();
+        if (multipartGeneratedPopulators.containsKey(className)) {
+            // we've already seen this class before and have done all we need to make it work
+            return;
+        }
+        reflectiveClassProducer.produce(new ReflectiveClassBuildItem(false, false, className));
+        String populatorClassName = MultipartPopulatorGenerator.generate(multipartClassInfo,
+                new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true), index);
+        multipartGeneratedPopulators.put(className, populatorClassName);
+
+        // transform the multipart pojo (and any super-classes) so we can access its fields no matter what
+        ClassInfo currentClassInHierarchy = multipartClassInfo;
+        while (true) {
+            bytecodeTransformerBuildProducer
+                    .produce(new BytecodeTransformerBuildItem(currentClassInHierarchy.name().toString(),
+                            new MultipartTransformer(populatorClassName)));
+
+            DotName superClassDotName = currentClassInHierarchy.superName();
+            if (superClassDotName.equals(DotNames.OBJECT_NAME)) {
+                break;
+            }
+            ClassInfo newCurrentClassInHierarchy = index.getClassByName(superClassDotName);
+            if (newCurrentClassInHierarchy == null) {
+                break;
+            }
+            currentClassInHierarchy = newCurrentClassInHierarchy;
+        }
+
+    }
+
+    public static final class Builder extends AbstractBuilder<Builder> {
+
+        private BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer;
+        private BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformerBuildProducer;
+        private BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer;
+        private MethodCreator initConverters;
+        private DefaultProducesHandler defaultProducesHandler = DefaultProducesHandler.Noop.INSTANCE;
+        public Predicate<String> applicationClassPredicate;
+
+        @Override
+        public QuarkusServerEndpointIndexer build() {
+            return new QuarkusServerEndpointIndexer(this);
+        }
+
+        public MethodCreator getInitConverters() {
+            return initConverters;
+        }
+
+        public Builder setBytecodeTransformerBuildProducer(
+                BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformerBuildProducer) {
+            this.bytecodeTransformerBuildProducer = bytecodeTransformerBuildProducer;
+            return this;
+        }
+
+        public Builder setGeneratedClassBuildItemBuildProducer(
+                BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer) {
+            this.generatedClassBuildItemBuildProducer = generatedClassBuildItemBuildProducer;
+            return this;
+        }
+
+        public Builder setReflectiveClassProducer(
+                BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer) {
+            this.reflectiveClassProducer = reflectiveClassProducer;
+            return this;
+        }
+
+        public Builder setApplicationClassPredicate(Predicate<String> applicationClassPredicate) {
+            this.applicationClassPredicate = applicationClassPredicate;
+            return this;
+        }
+
+        public Builder setInitConverters(MethodCreator initConverters) {
+            this.initConverters = initConverters;
+            return this;
+        }
+
+        public Builder setDefaultProducesHandler(DefaultProducesHandler defaultProducesHandler) {
+            this.defaultProducesHandler = defaultProducesHandler;
+            return this;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/RequestContextFactoryBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/RequestContextFactoryBuildItem.java
new file mode 100644
index 0000000000000..737b18d7ad74c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/RequestContextFactoryBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import org.jboss.resteasy.reactive.server.core.RequestContextFactory;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class RequestContextFactoryBuildItem extends SimpleBuildItem {
+
+    private final RequestContextFactory factory;
+
+    public RequestContextFactoryBuildItem(RequestContextFactory factory) {
+        this.factory = factory;
+    }
+
+    public RequestContextFactory getFactory() {
+        return factory;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java
new file mode 100644
index 0000000000000..ba5865a8355eb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveCDIProcessor.java
@@ -0,0 +1,104 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import javax.ws.rs.BeanParam;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
+import org.jboss.resteasy.reactive.server.injection.ContextProducers;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.AutoInjectAnnotationBuildItem;
+import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
+import io.quarkus.resteasy.reactive.server.runtime.QuarkusContextProducers;
+import io.quarkus.resteasy.reactive.spi.DynamicFeatureBuildItem;
+import io.quarkus.resteasy.reactive.spi.JaxrsFeatureBuildItem;
+
+public class ResteasyReactiveCDIProcessor {
+
+    @BuildStep
+    AutoInjectAnnotationBuildItem contextInjection(
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer) {
+        additionalBeanBuildItemBuildProducer
+                .produce(AdditionalBeanBuildItem.builder().addBeanClasses(ContextProducers.class, QuarkusContextProducers.class)
+                        .build());
+        return new AutoInjectAnnotationBuildItem(ResteasyReactiveServerDotNames.CONTEXT,
+                DotName.createSimple(BeanParam.class.getName()));
+    }
+
+    @BuildStep
+    void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) {
+        beanDefiningAnnotations
+                .produce(new BeanDefiningAnnotationBuildItem(ResteasyReactiveDotNames.PATH, BuiltinScope.SINGLETON.getName()));
+        beanDefiningAnnotations
+                .produce(new BeanDefiningAnnotationBuildItem(ResteasyReactiveDotNames.APPLICATION_PATH,
+                        BuiltinScope.SINGLETON.getName()));
+        beanDefiningAnnotations
+                .produce(new BeanDefiningAnnotationBuildItem(ResteasyReactiveDotNames.PROVIDER,
+                        BuiltinScope.SINGLETON.getName()));
+    }
+
+    // when an interface is annotated with @Path and there is only one implementation of it that is not annotated with @Path,
+    // we need to make this class a bean. See https://github.com/quarkusio/quarkus/issues/15028
+    @BuildStep
+    void pathInterfaceImpls(Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer) {
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            return;
+        }
+        ResourceScanningResult resourceScanningResult = resourceScanningResultBuildItem.get().getResult();
+        Map<DotName, String> pathInterfaces = resourceScanningResult.getPathInterfaces();
+        List<String> impls = new ArrayList<>();
+        for (Map.Entry<DotName, String> i : pathInterfaces.entrySet()) {
+            List<ClassInfo> candidateBeans = new ArrayList<>(1);
+            for (ClassInfo clazz : resourceScanningResult.getIndex().getAllKnownImplementors(i.getKey())) {
+                if (!Modifier.isAbstract(clazz.flags())) {
+                    if ((clazz.enclosingClass() == null || Modifier.isStatic(clazz.flags())) &&
+                            clazz.enclosingMethod() == null) {
+                        candidateBeans.add(clazz);
+                    }
+                }
+            }
+            if (candidateBeans.size() == 1) {
+                impls.add(candidateBeans.get(0).name().toString());
+            }
+        }
+        if (!impls.isEmpty()) {
+            additionalBeanBuildItemBuildProducer
+                    .produce(AdditionalBeanBuildItem.builder().setUnremovable().addBeanClasses(impls.toArray(new String[0]))
+                            .build());
+        }
+    }
+
+    @BuildStep
+    void additionalBeans(List<DynamicFeatureBuildItem> additionalDynamicFeatures,
+            List<JaxrsFeatureBuildItem> featureBuildItems,
+            BuildProducer<AdditionalBeanBuildItem> additionalBean) {
+
+        AdditionalBeanBuildItem.Builder additionalProviders = AdditionalBeanBuildItem.builder();
+        for (DynamicFeatureBuildItem dynamicFeature : additionalDynamicFeatures) {
+            if (dynamicFeature.isRegisterAsBean()) {
+                additionalProviders.addBeanClass(dynamicFeature.getClassName());
+            }
+        }
+        for (JaxrsFeatureBuildItem dynamicFeature : featureBuildItems) {
+            if (dynamicFeature.isRegisterAsBean()) {
+                additionalProviders.addBeanClass(dynamicFeature.getClassName());
+            }
+        }
+        additionalBean.produce(additionalProviders.setUnremovable().setDefaultScope(DotNames.SINGLETON).build());
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveDeploymentBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveDeploymentBuildItem.java
new file mode 100644
index 0000000000000..871dce5d3f14a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveDeploymentBuildItem.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+
+public final class ResteasyReactiveDeploymentBuildItem extends SimpleBuildItem {
+
+    private final RuntimeValue<Deployment> deployment;
+    private final String applicationPath;
+
+    public ResteasyReactiveDeploymentBuildItem(RuntimeValue<Deployment> deployment, String applicationPath) {
+        this.deployment = deployment;
+        this.applicationPath = applicationPath;
+    }
+
+    public RuntimeValue<Deployment> getDeployment() {
+        return deployment;
+    }
+
+    public String getApplicationPath() {
+        return applicationPath;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveDevModeProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveDevModeProcessor.java
new file mode 100644
index 0000000000000..62e710115e15c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveDevModeProcessor.java
@@ -0,0 +1,71 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.resteasy.reactive.server.runtime.ExceptionMapperRecorder;
+import io.quarkus.resteasy.reactive.server.runtime.NotFoundExceptionMapper;
+import io.quarkus.resteasy.reactive.spi.CustomExceptionMapperBuildItem;
+import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.RouteDescriptionBuildItem;
+import io.quarkus.vertx.http.runtime.devmode.AdditionalRouteDescription;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
+
+public class ResteasyReactiveDevModeProcessor {
+
+    private static final String META_INF_RESOURCES = "META-INF/resources";
+
+    @Record(STATIC_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void setupExceptionMapper(BuildProducer<CustomExceptionMapperBuildItem> customExceptionMappers,
+            HttpRootPathBuildItem httpRoot,
+            ExceptionMapperRecorder recorder) {
+        customExceptionMappers.produce(new CustomExceptionMapperBuildItem(NotFoundExceptionMapper.class.getName()));
+        recorder.setHttpRoot(httpRoot.getRootPath());
+    }
+
+    @Record(STATIC_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void addStaticResourcesExceptionMapper(ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            ExceptionMapperRecorder recorder) {
+        recorder.setStaticResourceRoots(applicationArchivesBuildItem.getAllApplicationArchives().stream()
+                .map(i -> i.getChildPath(META_INF_RESOURCES))
+                .filter(Objects::nonNull)
+                .map(p -> p.toAbsolutePath().toString())
+                .collect(Collectors.toSet()));
+    }
+
+    @Record(STATIC_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void addReactiveRoutesExceptionMapper(List<RouteDescriptionBuildItem> routeDescriptions,
+            ExceptionMapperRecorder recorder) {
+        List<RouteDescription> reactiveRoutes = new ArrayList<>();
+        for (RouteDescriptionBuildItem description : routeDescriptions) {
+            reactiveRoutes.add(description.getDescription());
+        }
+        recorder.setReactiveRoutes(reactiveRoutes);
+    }
+
+    @Record(STATIC_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void addAdditionalEndpointsExceptionMapper(List<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
+            ExceptionMapperRecorder recorder, HttpRootPathBuildItem httpRoot) {
+        List<AdditionalRouteDescription> endpoints = displayableEndpoints
+                .stream()
+                .map(v -> new AdditionalRouteDescription(v.getEndpoint(httpRoot), v.getDescription()))
+                .sorted()
+                .collect(Collectors.toList());
+
+        recorder.setAdditionalEndpoints(endpoints);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
new file mode 100644
index 0000000000000..738d8c310fdbf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -0,0 +1,658 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.ws.rs.Priorities;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.core.SingletonBeanFactory;
+import org.jboss.resteasy.reactive.common.model.InjectableBean;
+import org.jboss.resteasy.reactive.common.model.ResourceClass;
+import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature;
+import org.jboss.resteasy.reactive.common.model.ResourceFeature;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaderWriter;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaders;
+import org.jboss.resteasy.reactive.common.processor.AdditionalWriters;
+import org.jboss.resteasy.reactive.common.processor.DefaultProducesHandler;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
+import org.jboss.resteasy.reactive.common.util.Encode;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.DeploymentInfo;
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+import org.jboss.resteasy.reactive.server.model.DynamicFeatures;
+import org.jboss.resteasy.reactive.server.model.Features;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.arc.runtime.ClientProxyUnwrapper;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+import io.quarkus.deployment.recording.RecorderContext;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.resteasy.reactive.common.deployment.ApplicationResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.FactoryUtils;
+import io.quarkus.resteasy.reactive.common.deployment.QuarkusFactoryCreator;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceInterceptorsBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.SerializersUtil;
+import io.quarkus.resteasy.reactive.common.deployment.ServerDefaultProducesHandlerBuildItem;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfig;
+import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveInitialiser;
+import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRecorder;
+import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRuntimeRecorder;
+import io.quarkus.resteasy.reactive.server.runtime.ServerVertxBufferMessageBodyWriter;
+import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.AuthenticationCompletionExceptionMapper;
+import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.AuthenticationFailedExceptionMapper;
+import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.AuthenticationRedirectExceptionMapper;
+import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.ForbiddenExceptionMapper;
+import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.UnauthorizedExceptionMapper;
+import io.quarkus.resteasy.reactive.server.runtime.security.SecurityContextOverrideHandler;
+import io.quarkus.resteasy.reactive.spi.CustomExceptionMapperBuildItem;
+import io.quarkus.resteasy.reactive.spi.DynamicFeatureBuildItem;
+import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
+import io.quarkus.resteasy.reactive.spi.JaxrsFeatureBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
+import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.security.AuthenticationCompletionException;
+import io.quarkus.security.AuthenticationFailedException;
+import io.quarkus.security.AuthenticationRedirectException;
+import io.quarkus.security.ForbiddenException;
+import io.quarkus.security.UnauthorizedException;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.runtime.BasicRoute;
+import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
+import io.quarkus.vertx.http.runtime.HttpConfiguration;
+import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.ext.web.RoutingContext;
+
+public class ResteasyReactiveProcessor {
+
+    private static final String QUARKUS_INIT_CLASS = "io.quarkus.rest.runtime.__QuarkusInit";
+
+    @BuildStep
+    public FeatureBuildItem buildSetup() {
+        return new FeatureBuildItem(Feature.RESTEASY_REACTIVE);
+    }
+
+    @BuildStep
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.RESTEASY_REACTIVE);
+    }
+
+    @BuildStep
+    void vertxIntegration(BuildProducer<MessageBodyWriterBuildItem> writerBuildItemBuildProducer) {
+        writerBuildItemBuildProducer.produce(new MessageBodyWriterBuildItem(ServerVertxBufferMessageBodyWriter.class.getName(),
+                Buffer.class.getName(), Collections.singletonList(MediaType.WILDCARD), RuntimeType.SERVER, true));
+    }
+
+    @BuildStep
+    void generateCustomProducer(Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<GeneratedBeanBuildItem> generatedBeanBuildItemBuildProducer,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer) {
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            return;
+        }
+
+        Map<DotName, MethodInfo> resourcesThatNeedCustomProducer = resourceScanningResultBuildItem.get().getResult()
+                .getResourcesThatNeedCustomProducer();
+        Set<String> beanParams = resourceScanningResultBuildItem.get().getResult()
+                .getBeanParams();
+        if (!resourcesThatNeedCustomProducer.isEmpty() || !beanParams.isEmpty()) {
+            CustomResourceProducersGenerator.generate(resourcesThatNeedCustomProducer, beanParams,
+                    generatedBeanBuildItemBuildProducer,
+                    additionalBeanBuildItemBuildProducer);
+        }
+    }
+
+    @BuildStep
+    void handleClassLevelExceptionMappers(Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<GeneratedClassBuildItem> generatedClass,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ClassLevelExceptionMappersBuildItem> classLevelExceptionMappers) {
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            return;
+        }
+        List<MethodInfo> methodExceptionMapper = resourceScanningResultBuildItem.get().getResult()
+                .getClassLevelExceptionMappers();
+        if (methodExceptionMapper.isEmpty()) {
+            return;
+        }
+        GeneratedClassGizmoAdaptor classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
+        final Map<DotName, Map<String, String>> resultingMappers = new HashMap<>(methodExceptionMapper.size());
+        for (MethodInfo methodInfo : methodExceptionMapper) {
+            Map<String, String> generationResult = ServerExceptionMapperGenerator.generatePerClassMapper(methodInfo,
+                    classOutput);
+            reflectiveClass.produce(
+                    new ReflectiveClassBuildItem(true, false, false, generationResult.values().toArray(new String[0])));
+            Map<String, String> classMappers;
+            DotName classDotName = methodInfo.declaringClass().name();
+            if (resultingMappers.containsKey(classDotName)) {
+                classMappers = resultingMappers.get(classDotName);
+            } else {
+                classMappers = new HashMap<>();
+                resultingMappers.put(classDotName, classMappers);
+            }
+            classMappers.putAll(generationResult);
+        }
+        classLevelExceptionMappers.produce(new ClassLevelExceptionMappersBuildItem(resultingMappers));
+    }
+
+    @BuildStep
+    void registerCustomExceptionMappers(BuildProducer<CustomExceptionMapperBuildItem> customExceptionMapper) {
+        customExceptionMapper.produce(new CustomExceptionMapperBuildItem(AuthenticationFailedExceptionMapper.class.getName()));
+        customExceptionMapper.produce(new CustomExceptionMapperBuildItem(UnauthorizedExceptionMapper.class.getName()));
+    }
+
+    @BuildStep
+    public void unremoveableBeans(Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<UnremovableBeanBuildItem> unremoveableBeans) {
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            return;
+        }
+        Set<String> beanParams = resourceScanningResultBuildItem.get().getResult()
+                .getBeanParams();
+        unremoveableBeans.produce(UnremovableBeanBuildItem.beanClassNames(beanParams.toArray(new String[0])));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    public void setupEndpoints(Capabilities capabilities, BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
+            BeanContainerBuildItem beanContainerBuildItem,
+            ResteasyReactiveConfig config,
+            Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
+            BuildProducer<BytecodeTransformerBuildItem> bytecodeTransformerBuildItemBuildProducer,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer,
+            ResteasyReactiveRecorder recorder,
+            RecorderContext recorderContext,
+            ShutdownContextBuildItem shutdownContext,
+            HttpBuildTimeConfig vertxConfig,
+            List<DynamicFeatureBuildItem> dynamicFeatures,
+            List<MessageBodyReaderBuildItem> additionalMessageBodyReaders,
+            List<MessageBodyWriterBuildItem> additionalMessageBodyWriters,
+            List<JaxrsFeatureBuildItem> features,
+            List<ServerDefaultProducesHandlerBuildItem> serverDefaultProducesHandlers,
+            Optional<RequestContextFactoryBuildItem> requestContextFactoryBuildItem,
+            Optional<ClassLevelExceptionMappersBuildItem> classLevelExceptionMappers,
+            BuildProducer<ResteasyReactiveDeploymentBuildItem> quarkusRestDeploymentBuildItemBuildProducer,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
+            BuildProducer<RouteBuildItem> routes,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            ResourceInterceptorsBuildItem resourceInterceptorsBuildItem,
+            ExceptionMappersBuildItem exceptionMappersBuildItem,
+            ParamConverterProvidersBuildItem paramConverterProvidersBuildItem,
+            ContextResolversBuildItem contextResolversBuildItem,
+            List<ApplicationClassPredicateBuildItem> applicationClassPredicateBuildItems,
+            List<MethodScannerBuildItem> methodScanners, ResteasyReactiveServerConfig serverConfig)
+            throws NoSuchMethodException {
+
+        if (!resourceScanningResultBuildItem.isPresent()) {
+            // no detected @Path, bail out
+            return;
+        }
+
+        if (capabilities.isPresent(Capability.RESTEASY)) {
+            throw new IllegalStateException(
+                    "The 'quarkus-resteasy-reactive' and 'quarkus-resteasy' extensions cannot be used at the same time.");
+        }
+
+        recorderContext.registerNonDefaultConstructor(
+                MediaType.class.getDeclaredConstructor(String.class, String.class, String.class),
+                mediaType -> Stream.of(mediaType.getType(), mediaType.getSubtype(), mediaType.getParameters())
+                        .collect(toList()));
+
+        IndexView index = beanArchiveIndexBuildItem.getIndex();
+
+        ResourceScanningResult result = resourceScanningResultBuildItem.get().getResult();
+        Map<DotName, ClassInfo> scannedResources = result.getScannedResources();
+        Map<DotName, String> scannedResourcePaths = result.getScannedResourcePaths();
+        Map<DotName, ClassInfo> possibleSubResources = result.getPossibleSubResources();
+        Map<DotName, String> pathInterfaces = result.getPathInterfaces();
+
+        ApplicationScanningResult appResult = applicationResultBuildItem.getResult();
+        Set<String> singletonClasses = appResult.getSingletonClasses();
+        Application application = appResult.getApplication();
+
+        Map<String, String> existingConverters = new HashMap<>();
+        List<ResourceClass> resourceClasses = new ArrayList<>();
+        List<ResourceClass> subResourceClasses = new ArrayList<>();
+        AdditionalReaders additionalReaders = new AdditionalReaders();
+        AdditionalWriters additionalWriters = new AdditionalWriters();
+        Map<String, InjectableBean> injectableBeans = new HashMap<>();
+        QuarkusServerEndpointIndexer serverEndpointIndexer;
+
+        ResourceInterceptors interceptors = resourceInterceptorsBuildItem.getResourceInterceptors();
+        ExceptionMapping exceptionMapping = exceptionMappersBuildItem.getExceptionMapping();
+        ContextResolvers contextResolvers = contextResolversBuildItem.getContextResolvers();
+        ParamConverterProviders paramConverterProviders = paramConverterProvidersBuildItem.getParamConverterProviders();
+        Function<String, BeanFactory<?>> factoryFunction = s -> FactoryUtils.factory(s, singletonClasses, recorder,
+                beanContainerBuildItem);
+        interceptors.initializeDefaultFactories(factoryFunction);
+        exceptionMapping.initializeDefaultFactories(factoryFunction);
+        contextResolvers.initializeDefaultFactories(factoryFunction);
+        paramConverterProviders.initializeDefaultFactories(factoryFunction);
+        paramConverterProviders.sort();
+        interceptors.sort();
+
+        try (ClassCreator c = new ClassCreator(new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true),
+                QUARKUS_INIT_CLASS, null, Object.class.getName(), ResteasyReactiveInitialiser.class.getName());
+                MethodCreator initConverters = c.getMethodCreator("init", void.class, Deployment.class)) {
+
+            QuarkusServerEndpointIndexer.Builder serverEndpointIndexerBuilder = new QuarkusServerEndpointIndexer.Builder()
+                    .addMethodScanners(
+                            methodScanners.stream().map(MethodScannerBuildItem::getMethodScanner).collect(Collectors.toList()))
+                    .setIndex(index)
+                    .setFactoryCreator(new QuarkusFactoryCreator(recorder, beanContainerBuildItem.getValue()))
+                    .setEndpointInvokerFactory(new QuarkusInvokerFactory(generatedClassBuildItemBuildProducer, recorder))
+                    .setGeneratedClassBuildItemBuildProducer(generatedClassBuildItemBuildProducer)
+                    .setBytecodeTransformerBuildProducer(bytecodeTransformerBuildItemBuildProducer)
+                    .setReflectiveClassProducer(reflectiveClassBuildItemBuildProducer)
+                    .setExistingConverters(existingConverters).setScannedResourcePaths(scannedResourcePaths)
+                    .setConfig(new org.jboss.resteasy.reactive.common.ResteasyReactiveConfig(
+                            config.inputBufferSize.asLongValue(), config.singleDefaultProduces, config.defaultProduces))
+                    .setAdditionalReaders(additionalReaders)
+                    .setHttpAnnotationToMethod(result.getHttpAnnotationToMethod())
+                    .setInjectableBeans(injectableBeans)
+                    .setAdditionalWriters(additionalWriters)
+                    .setDefaultBlocking(appResult.isBlocking())
+                    .setHasRuntimeConverters(!paramConverterProviders.getParamConverterProviders().isEmpty())
+                    .setClassLevelExceptionMappers(
+                            classLevelExceptionMappers.isPresent() ? classLevelExceptionMappers.get().getMappers()
+                                    : Collections.emptyMap())
+                    .setResourceMethodCallback(new Consumer<Map.Entry<MethodInfo, ResourceMethod>>() {
+                        @Override
+                        public void accept(Map.Entry<MethodInfo, ResourceMethod> entry) {
+                            MethodInfo method = entry.getKey();
+                            String source = ResteasyReactiveProcessor.class.getSimpleName() + " > " + method.declaringClass()
+                                    + "[" + method + "]";
+
+                            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                                    .type(method.returnType())
+                                    .index(index)
+                                    .ignoreTypePredicate(ResteasyReactiveServerDotNames.IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                                    .ignoreFieldPredicate(ResteasyReactiveServerDotNames.IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                                    .ignoreMethodPredicate(
+                                            ResteasyReactiveServerDotNames.IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                                    .source(source)
+                                    .build());
+
+                            for (short i = 0; i < method.parameters().size(); i++) {
+                                Type parameterType = method.parameters().get(i);
+                                if (!hasAnnotation(method, i, ResteasyReactiveServerDotNames.CONTEXT)) {
+                                    reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                                            .type(parameterType)
+                                            .index(index)
+                                            .ignoreTypePredicate(
+                                                    ResteasyReactiveServerDotNames.IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                                            .ignoreFieldPredicate(
+                                                    ResteasyReactiveServerDotNames.IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                                            .ignoreMethodPredicate(
+                                                    ResteasyReactiveServerDotNames.IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                                            .source(source)
+                                            .build());
+                                }
+                            }
+                        }
+
+                        private boolean hasAnnotation(MethodInfo method, short paramPosition, DotName annotation) {
+                            for (AnnotationInstance annotationInstance : method.annotations()) {
+                                AnnotationTarget target = annotationInstance.target();
+                                if (target != null && target.kind() == AnnotationTarget.Kind.METHOD_PARAMETER
+                                        && target.asMethodParameter().position() == paramPosition
+                                        && annotationInstance.name().equals(annotation)) {
+                                    return true;
+                                }
+                            }
+                            return false;
+                        }
+                    })
+                    .setInitConverters(initConverters)
+                    .setApplicationClassPredicate(s -> {
+                        for (ApplicationClassPredicateBuildItem i : applicationClassPredicateBuildItems) {
+                            if (i.test(s)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    });
+
+            if (!serverDefaultProducesHandlers.isEmpty()) {
+                List<DefaultProducesHandler> handlers = new ArrayList<>(serverDefaultProducesHandlers.size());
+                for (ServerDefaultProducesHandlerBuildItem bi : serverDefaultProducesHandlers) {
+                    handlers.add(bi.getDefaultProducesHandler());
+                }
+                serverEndpointIndexerBuilder
+                        .setDefaultProducesHandler(new DefaultProducesHandler.DelegatingDefaultProducesHandler(handlers));
+            }
+            serverEndpointIndexer = serverEndpointIndexerBuilder.build();
+
+            for (ClassInfo i : scannedResources.values()) {
+                if (!appResult.keepClass(i.name().toString())) {
+                    continue;
+                }
+                ResourceClass endpoints = serverEndpointIndexer.createEndpoints(i);
+                if (singletonClasses.contains(i.name().toString())) {
+                    endpoints.setFactory(new SingletonBeanFactory<>(i.name().toString()));
+                }
+                if (endpoints != null) {
+                    resourceClasses.add(endpoints);
+                }
+            }
+            //now index possible sub resources. These are all classes that have method annotations
+            //that are not annotated @Path
+            Deque<ClassInfo> toScan = new ArrayDeque<>();
+            for (DotName methodAnnotation : result.getHttpAnnotationToMethod().keySet()) {
+                for (AnnotationInstance instance : index.getAnnotations(methodAnnotation)) {
+                    MethodInfo method = instance.target().asMethod();
+                    ClassInfo classInfo = method.declaringClass();
+                    toScan.add(classInfo);
+                }
+            }
+            //sub resources can also have just a path annotation
+            //if they are 'intermediate' sub resources
+            for (AnnotationInstance instance : index.getAnnotations(ResteasyReactiveDotNames.PATH)) {
+                if (instance.target().kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo method = instance.target().asMethod();
+                    ClassInfo classInfo = method.declaringClass();
+                    toScan.add(classInfo);
+                }
+            }
+            while (!toScan.isEmpty()) {
+                ClassInfo classInfo = toScan.poll();
+                if (scannedResources.containsKey(classInfo.name()) ||
+                        pathInterfaces.containsKey(classInfo.name()) ||
+                        possibleSubResources.containsKey(classInfo.name())) {
+                    continue;
+                }
+                possibleSubResources.put(classInfo.name(), classInfo);
+                ResourceClass endpoints = serverEndpointIndexer.createEndpoints(classInfo);
+                if (endpoints != null) {
+                    subResourceClasses.add(endpoints);
+                }
+                //we need to also look for all sub classes and interfaces
+                //they may have type variables that need to be handled
+                toScan.addAll(index.getKnownDirectImplementors(classInfo.name()));
+                toScan.addAll(index.getKnownDirectSubclasses(classInfo.name()));
+            }
+
+            Features feats = new Features();
+            for (JaxrsFeatureBuildItem feature : features) {
+                ResourceFeature resourceFeature = new ResourceFeature();
+                resourceFeature
+                        .setFactory(
+                                FactoryUtils.factory(feature.getClassName(), singletonClasses, recorder,
+                                        beanContainerBuildItem));
+                feats.addFeature(resourceFeature);
+            }
+
+            DynamicFeatures dynamicFeats = new DynamicFeatures();
+            for (DynamicFeatureBuildItem additionalDynamicFeature : dynamicFeatures) {
+                ResourceDynamicFeature resourceFeature = new ResourceDynamicFeature();
+                resourceFeature.setFactory(
+                        recorder.factory(additionalDynamicFeature.getClassName(), beanContainerBuildItem.getValue()));
+                dynamicFeats.addFeature(resourceFeature);
+            }
+
+            ServerSerialisers serialisers = new ServerSerialisers();
+            SerializersUtil.setupSerializers(recorder, reflectiveClass, additionalMessageBodyReaders,
+                    additionalMessageBodyWriters, beanContainerBuildItem, applicationResultBuildItem, serialisers,
+                    RuntimeType.SERVER);
+            // built-ins
+
+            for (Serialisers.BuiltinWriter builtinWriter : ServerSerialisers.BUILTIN_WRITERS) {
+                registerWriter(recorder, serialisers, builtinWriter.entityClass, builtinWriter.writerClass,
+                        beanContainerBuildItem.getValue(),
+                        builtinWriter.mediaType);
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, builtinWriter.writerClass.getName()));
+            }
+            for (Serialisers.BuiltinReader builtinReader : ServerSerialisers.BUILTIN_READERS) {
+                registerReader(recorder, serialisers, builtinReader.entityClass, builtinReader.readerClass,
+                        beanContainerBuildItem.getValue(),
+                        builtinReader.mediaType, builtinReader.constraint);
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, builtinReader.readerClass.getName()));
+            }
+
+            for (AdditionalReaderWriter.Entry additionalReader : additionalReaders.get()) {
+                Class readerClass = additionalReader.getHandlerClass();
+                registerReader(recorder, serialisers, additionalReader.getEntityClass(), readerClass,
+                        beanContainerBuildItem.getValue(), additionalReader.getMediaType(), additionalReader.getConstraint());
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, readerClass.getName()));
+            }
+
+            for (AdditionalReaderWriter.Entry entry : additionalWriters.get()) {
+                Class writerClass = entry.getHandlerClass();
+                registerWriter(recorder, serialisers, entry.getEntityClass(), writerClass,
+                        beanContainerBuildItem.getValue(), entry.getMediaType());
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, writerClass.getName()));
+            }
+
+            initConverters.returnValue(null);
+            BeanFactory<ResteasyReactiveInitialiser> initClassFactory = recorder.factory(QUARKUS_INIT_CLASS,
+                    beanContainerBuildItem.getValue());
+
+            String applicationPath = determineApplicationPath(index, serverConfig.path);
+            // spec allows the path contain encoded characters
+            if ((applicationPath != null) && applicationPath.contains("%")) {
+                applicationPath = Encode.decodePath(applicationPath);
+            }
+
+            String deploymentPath = sanitizeApplicationPath(applicationPath);
+            // Handler used for both the default and non-default deployment path (specified as application path or resteasyConfig.path)
+            // Routes use the order VertxHttpRecorder.DEFAULT_ROUTE_ORDER + 1 to ensure the default route is called before the resteasy one
+            Class<? extends Application> applicationClass = application == null ? Application.class : application.getClass();
+            RuntimeValue<Deployment> deployment = recorder.createDeployment(new DeploymentInfo()
+                    .setInterceptors(interceptors.sort())
+                    .setConfig(new org.jboss.resteasy.reactive.common.ResteasyReactiveConfig(
+                            config.inputBufferSize.asLongValue(), config.singleDefaultProduces, config.defaultProduces))
+                    .setExceptionMapping(exceptionMapping)
+                    .setCtxResolvers(contextResolvers)
+                    .setFeatures(feats)
+                    .setClientProxyUnwrapper(new ClientProxyUnwrapper())
+                    .setApplicationSupplier(recorder.handleApplication(applicationClass, singletonClasses.isEmpty()))
+                    .setFactoryCreator(recorder.factoryCreator(beanContainerBuildItem.getValue()))
+                    .setDynamicFeatures(dynamicFeats)
+                    .setSerialisers(serialisers)
+                    .setApplicationPath(applicationPath)
+                    .setResourceClasses(resourceClasses)
+                    .setLocatableResourceClasses(subResourceClasses)
+                    .setParamConverterProviders(paramConverterProviders),
+                    beanContainerBuildItem.getValue(), shutdownContext, vertxConfig,
+                    requestContextFactoryBuildItem.map(RequestContextFactoryBuildItem::getFactory).orElse(null),
+                    initClassFactory);
+
+            quarkusRestDeploymentBuildItemBuildProducer
+                    .produce(new ResteasyReactiveDeploymentBuildItem(deployment, deploymentPath));
+            if (!requestContextFactoryBuildItem.isPresent()) {
+                Handler<RoutingContext> handler = recorder.handler(deployment);
+
+                // Exact match for resources matched to the root path
+                routes.produce(new RouteBuildItem(
+                        new BasicRoute(deploymentPath, VertxHttpRecorder.DEFAULT_ROUTE_ORDER + 1), handler));
+                String matchPath = deploymentPath;
+                if (matchPath.endsWith("/")) {
+                    matchPath += "*";
+                } else {
+                    matchPath += "/*";
+                }
+                // Match paths that begin with the deployment path
+                routes.produce(
+                        new RouteBuildItem(new BasicRoute(matchPath, VertxHttpRecorder.DEFAULT_ROUTE_ORDER + 1), handler));
+            }
+        }
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public void applyRuntimeConfig(ResteasyReactiveRuntimeRecorder recorder,
+            Optional<ResteasyReactiveDeploymentBuildItem> deployment,
+            HttpConfiguration httpConfiguration) {
+        if (!deployment.isPresent()) {
+            return;
+        }
+        recorder.configure(deployment.get().getDeployment(), httpConfiguration);
+    }
+
+    @BuildStep
+    public void securityExceptionMappers(BuildProducer<ExceptionMapperBuildItem> exceptionMapperBuildItemBuildProducer) {
+        // built-ins
+        exceptionMapperBuildItemBuildProducer.produce(new ExceptionMapperBuildItem(
+                AuthenticationCompletionExceptionMapper.class.getName(),
+                AuthenticationCompletionException.class.getName(),
+                Priorities.USER, false));
+        exceptionMapperBuildItemBuildProducer.produce(new ExceptionMapperBuildItem(
+                AuthenticationFailedExceptionMapper.class.getName(),
+                AuthenticationFailedException.class.getName(),
+                Priorities.USER + 1, false));
+        exceptionMapperBuildItemBuildProducer.produce(new ExceptionMapperBuildItem(
+                AuthenticationRedirectExceptionMapper.class.getName(),
+                AuthenticationRedirectException.class.getName(),
+                Priorities.USER, false));
+        exceptionMapperBuildItemBuildProducer.produce(new ExceptionMapperBuildItem(
+                ForbiddenExceptionMapper.class.getName(),
+                ForbiddenException.class.getName(),
+                Priorities.USER + 1, false));
+        exceptionMapperBuildItemBuildProducer.produce(new ExceptionMapperBuildItem(
+                UnauthorizedExceptionMapper.class.getName(),
+                UnauthorizedException.class.getName(),
+                Priorities.USER + 1, false));
+    }
+
+    @BuildStep
+    MethodScannerBuildItem integrateSecurityOverrideSupport() {
+        return new MethodScannerBuildItem(new MethodScanner() {
+            @Override
+            public List<HandlerChainCustomizer> scan(MethodInfo method, Map<String, Object> methodContext) {
+                return Collections.singletonList(new SecurityContextOverrideHandler.Customizer());
+            }
+        });
+    }
+
+    private String determineApplicationPath(IndexView index, Optional<String> defaultPath) {
+        Collection<AnnotationInstance> applicationPaths = index.getAnnotations(ResteasyReactiveDotNames.APPLICATION_PATH);
+        if (applicationPaths.isEmpty()) {
+            return defaultPath.orElse("/");
+        }
+        // currently we only examine the first class that is annotated with @ApplicationPath so best
+        // fail if the user code has multiple such annotations instead of surprising the user
+        // at runtime
+        if (applicationPaths.size() > 1) {
+            StringBuilder sb = new StringBuilder();
+            boolean first = true;
+            for (AnnotationInstance annotationInstance : applicationPaths) {
+                if (first) {
+                    first = false;
+                } else {
+                    sb.append(",");
+                }
+                sb.append(annotationInstance.target().asClass().name().toString());
+            }
+            throw new RuntimeException("Multiple classes ( " + sb.toString()
+                    + ") have been annotated with @ApplicationPath which is currently not supported");
+        }
+        String applicationPath = null;
+        AnnotationValue applicationPathValue = applicationPaths.iterator().next().value();
+        if ((applicationPathValue != null)) {
+            applicationPath = applicationPathValue.asString();
+        }
+        return applicationPath;
+    }
+
+    private String sanitizeApplicationPath(String applicationPath) {
+        if ((applicationPath == null) || applicationPath.isEmpty() || "/".equals(applicationPath)) {
+            return "/";
+        }
+        applicationPath = applicationPath.trim();
+        if (applicationPath.equals("/"))
+            applicationPath = "";
+        // add leading slash
+        if (!applicationPath.startsWith("/"))
+            applicationPath = "/" + applicationPath;
+        // remove trailing slash
+        if (applicationPath.endsWith("/"))
+            applicationPath = applicationPath.substring(0, applicationPath.length() - 1);
+        return applicationPath;
+    }
+
+    private void registerWriter(ResteasyReactiveRecorder recorder, ServerSerialisers serialisers, Class<?> entityClass,
+            Class<? extends MessageBodyWriter<?>> writerClass, BeanContainer beanContainer,
+            String mediaType) {
+        ResourceWriter writer = new ResourceWriter();
+        writer.setFactory(recorder.factory(writerClass.getName(), beanContainer));
+        writer.setMediaTypeStrings(Collections.singletonList(mediaType));
+        recorder.registerWriter(serialisers, entityClass.getName(), writer);
+    }
+
+    private void registerReader(ResteasyReactiveRecorder recorder, ServerSerialisers serialisers, Class<?> entityClass,
+            Class<? extends MessageBodyReader<?>> readerClass, BeanContainer beanContainer, String mediaType,
+            RuntimeType constraint) {
+        ResourceReader reader = new ResourceReader();
+        reader.setFactory(recorder.factory(readerClass.getName(), beanContainer));
+        reader.setMediaTypeStrings(Collections.singletonList(mediaType));
+        reader.setConstraint(constraint);
+        recorder.registerReader(serialisers, entityClass.getName(), reader);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java
new file mode 100644
index 0000000000000..ba872454f21f6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveScanningProcessor.java
@@ -0,0 +1,358 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.SERVER_REQUEST_FILTER;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.SERVER_RESPONSE_FILTER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SERVER_EXCEPTION_MAPPER;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import javax.ws.rs.Priorities;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.CompositeIndex;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.resteasy.reactive.common.model.ResourceContextResolver;
+import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveInterceptorScanner;
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.server.processor.scanning.AsyncReturnTypeScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveContextResolverScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveExceptionMappingScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveFeatureScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveParamConverterScanner;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.arc.processor.DotNames;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.index.IndexingUtil;
+import io.quarkus.resteasy.reactive.common.deployment.ApplicationResultBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceInterceptorsContributorBuildItem;
+import io.quarkus.resteasy.reactive.common.deployment.ResourceScanningResultBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContainerResponseFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContextResolverBuildItem;
+import io.quarkus.resteasy.reactive.spi.CustomContainerRequestFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.CustomContainerResponseFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.CustomExceptionMapperBuildItem;
+import io.quarkus.resteasy.reactive.spi.DynamicFeatureBuildItem;
+import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
+import io.quarkus.resteasy.reactive.spi.JaxrsFeatureBuildItem;
+import io.quarkus.resteasy.reactive.spi.ParamConverterBuildItem;
+
+/**
+ * Processor that handles scanning for types and turning them into build items
+ */
+public class ResteasyReactiveScanningProcessor {
+
+    @BuildStep
+    public MethodScannerBuildItem asyncSupport() {
+        return new MethodScannerBuildItem(new AsyncReturnTypeScanner());
+    }
+
+    @BuildStep
+    public ResourceInterceptorsContributorBuildItem scanForInterceptors(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem) {
+        return new ResourceInterceptorsContributorBuildItem(new Consumer<ResourceInterceptors>() {
+            @Override
+            public void accept(ResourceInterceptors interceptors) {
+                ResteasyReactiveInterceptorScanner.scanForInterceptors(interceptors, combinedIndexBuildItem.getIndex(),
+                        applicationResultBuildItem.getResult());
+            }
+        });
+    }
+
+    @BuildStep
+    public ExceptionMappersBuildItem scanForExceptionMappers(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer,
+            List<ExceptionMapperBuildItem> mappers) {
+        AdditionalBeanBuildItem.Builder beanBuilder = AdditionalBeanBuildItem.builder().setUnremovable();
+        ExceptionMapping exceptions = ResteasyReactiveExceptionMappingScanner
+                .scanForExceptionMappers(combinedIndexBuildItem.getComputingIndex(), applicationResultBuildItem.getResult());
+        for (Map.Entry<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> i : exceptions.getMappers()
+                .entrySet()) {
+            beanBuilder.addBeanClass(i.getValue().getClassName());
+        }
+        for (ExceptionMapperBuildItem additionalExceptionMapper : mappers) {
+            if (additionalExceptionMapper.isRegisterAsBean()) {
+                beanBuilder.addBeanClass(additionalExceptionMapper.getClassName());
+            }
+            int priority = Priorities.USER;
+            if (additionalExceptionMapper.getPriority() != null) {
+                priority = additionalExceptionMapper.getPriority();
+            }
+            ResourceExceptionMapper<Throwable> mapper = new ResourceExceptionMapper<>();
+            mapper.setPriority(priority);
+            mapper.setClassName(additionalExceptionMapper.getClassName());
+            try {
+                exceptions.addExceptionMapper((Class) Class.forName(additionalExceptionMapper.getHandledExceptionName(), false,
+                        Thread.currentThread().getContextClassLoader()), mapper);
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(
+                        "Unable to load handled exception type " + additionalExceptionMapper.getHandledExceptionName(), e);
+            }
+        }
+        additionalBeanBuildItemBuildProducer.produce(beanBuilder.build());
+        return new ExceptionMappersBuildItem(exceptions);
+    }
+
+    @BuildStep
+    public ParamConverterProvidersBuildItem scanForParamConverters(CombinedIndexBuildItem combinedIndexBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            List<ParamConverterBuildItem> paramConverterBuildItems) {
+
+        AdditionalBeanBuildItem.Builder beanBuilder = AdditionalBeanBuildItem.builder().setUnremovable();
+        ParamConverterProviders paramConverterProviders = ResteasyReactiveParamConverterScanner
+                .scanForParamConverters(combinedIndexBuildItem.getComputingIndex(), applicationResultBuildItem.getResult());
+        for (ResourceParamConverterProvider i : paramConverterProviders.getParamConverterProviders()) {
+            beanBuilder.addBeanClass(i.getClassName());
+        }
+        for (ParamConverterBuildItem additionalParamConverter : paramConverterBuildItems) {
+            if (additionalParamConverter.isRegisterAsBean()) {
+                beanBuilder.addBeanClass(additionalParamConverter.getClassName());
+            }
+            int priority = Priorities.USER;
+            if (additionalParamConverter.getPriority() != null) {
+                priority = additionalParamConverter.getPriority();
+            }
+            ResourceParamConverterProvider provider = new ResourceParamConverterProvider();
+            provider.setPriority(priority);
+            provider.setClassName(additionalParamConverter.getClassName());
+            paramConverterProviders.addParamConverterProviders(provider);
+        }
+        additionalBeanBuildItemBuildProducer.produce(beanBuilder.build());
+        return new ParamConverterProvidersBuildItem(paramConverterProviders);
+
+    }
+
+    @BuildStep
+    public void scanForDynamicFeatures(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<DynamicFeatureBuildItem> dynamicFeatureBuildItemBuildProducer) {
+        IndexView index = combinedIndexBuildItem.getComputingIndex();
+        Set<String> features = ResteasyReactiveFeatureScanner.scanForDynamicFeatures(index,
+                applicationResultBuildItem.getResult());
+        for (String dynamicFeatureClass : features) {
+            dynamicFeatureBuildItemBuildProducer
+                    .produce(new DynamicFeatureBuildItem(dynamicFeatureClass, true));
+        }
+    }
+
+    @BuildStep
+    public void scanForFeatures(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<JaxrsFeatureBuildItem> featureBuildItemBuildProducer) {
+        IndexView index = combinedIndexBuildItem.getComputingIndex();
+        Set<String> features = ResteasyReactiveFeatureScanner.scanForFeatures(index, applicationResultBuildItem.getResult());
+        for (String feature : features) {
+            featureBuildItemBuildProducer
+                    .produce(new JaxrsFeatureBuildItem(feature, true));
+        }
+    }
+
+    @BuildStep
+    public ContextResolversBuildItem scanForContextResolvers(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer,
+            List<ContextResolverBuildItem> additionalResolvers) {
+        IndexView index = combinedIndexBuildItem.getComputingIndex();
+        AdditionalBeanBuildItem.Builder beanBuilder = AdditionalBeanBuildItem.builder().setUnremovable();
+        ContextResolvers resolvers = ResteasyReactiveContextResolverScanner.scanForContextResolvers(index,
+                applicationResultBuildItem.getResult());
+        for (Map.Entry<Class<?>, List<ResourceContextResolver>> entry : resolvers.getResolvers().entrySet()) {
+            for (ResourceContextResolver i : entry.getValue()) {
+                beanBuilder.addBeanClass(i.getClassName());
+            }
+        }
+        for (ContextResolverBuildItem i : additionalResolvers) {
+            if (i.isRegisterAsBean()) {
+                beanBuilder.addBeanClass(i.getClassName());
+            }
+            ResourceContextResolver resolver = new ResourceContextResolver();
+            resolver.setClassName(i.getClassName());
+            resolver.setMediaTypeStrings(i.getMediaTypes());
+            try {
+                resolvers.addContextResolver((Class) Class.forName(i.getProvidedType(), false,
+                        Thread.currentThread().getContextClassLoader()), resolver);
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(
+                        "Unable to load handled exception type " + i.getProvidedType(), e);
+            }
+        }
+        additionalBeanBuildItemBuildProducer.produce(beanBuilder.build());
+        return new ContextResolversBuildItem(resolvers);
+    }
+
+    @BuildStep
+    public void scanForParamConverters(CombinedIndexBuildItem combinedIndexBuildItem,
+            ApplicationResultBuildItem applicationResultBuildItem,
+            BuildProducer<ParamConverterBuildItem> paramConverterBuildItemBuildProducer) {
+        IndexView index = combinedIndexBuildItem.getComputingIndex();
+        Collection<ClassInfo> paramConverterProviders = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.PARAM_CONVERTER_PROVIDER);
+
+        for (ClassInfo converterClass : paramConverterProviders) {
+            ApplicationScanningResult.KeepProviderResult keepProviderResult = applicationResultBuildItem.getResult()
+                    .keepProvider(converterClass);
+            if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+                AnnotationInstance priorityInstance = converterClass.classAnnotation(ResteasyReactiveDotNames.PRIORITY);
+                paramConverterBuildItemBuildProducer.produce(new ParamConverterBuildItem(converterClass.name().toString(),
+                        priorityInstance != null ? priorityInstance.value().asInt() : Priorities.USER, true));
+            }
+        }
+
+    }
+
+    @BuildStep
+    public void handleCustomAnnotatedMethods(
+            Optional<ResourceScanningResultBuildItem> resourceScanningResultBuildItem,
+            CombinedIndexBuildItem combinedIndexBuildItem,
+            BuildProducer<GeneratedBeanBuildItem> generatedBean,
+            List<CustomContainerRequestFilterBuildItem> customContainerRequestFilters,
+            List<CustomContainerResponseFilterBuildItem> customContainerResponseFilters,
+            List<CustomExceptionMapperBuildItem> customExceptionMappers,
+            BuildProducer<ContainerRequestFilterBuildItem> additionalContainerRequestFilters,
+            BuildProducer<ContainerResponseFilterBuildItem> additionalContainerResponseFilters,
+            BuildProducer<ExceptionMapperBuildItem> additionalExceptionMappers,
+            BuildProducer<AdditionalBeanBuildItem> additionalBean) {
+        IndexView index = combinedIndexBuildItem.getComputingIndex();
+        AdditionalBeanBuildItem.Builder additionalBeans = AdditionalBeanBuildItem.builder();
+
+        // if we have custom filters, we need to index these classes
+        if (!customContainerRequestFilters.isEmpty() || !customContainerResponseFilters.isEmpty()
+                || !customExceptionMappers.isEmpty()) {
+            Indexer indexer = new Indexer();
+            Set<DotName> additionalIndex = new HashSet<>();
+            //we have to use the non-computing index here
+            //the logic checks if the bean is already indexed, so the computing one breaks this
+            for (CustomContainerRequestFilterBuildItem filter : customContainerRequestFilters) {
+                IndexingUtil.indexClass(filter.getClassName(), indexer, combinedIndexBuildItem.getIndex(), additionalIndex,
+                        Thread.currentThread().getContextClassLoader());
+            }
+            for (CustomContainerResponseFilterBuildItem filter : customContainerResponseFilters) {
+                IndexingUtil.indexClass(filter.getClassName(), indexer, combinedIndexBuildItem.getIndex(), additionalIndex,
+                        Thread.currentThread().getContextClassLoader());
+            }
+            for (CustomExceptionMapperBuildItem mapper : customExceptionMappers) {
+                IndexingUtil.indexClass(mapper.getClassName(), indexer, combinedIndexBuildItem.getIndex(), additionalIndex,
+                        Thread.currentThread().getContextClassLoader());
+            }
+            index = CompositeIndex.create(index, indexer.complete());
+        }
+
+        for (AnnotationInstance instance : index
+                .getAnnotations(SERVER_REQUEST_FILTER)) {
+            if (instance.target().kind() != AnnotationTarget.Kind.METHOD) {
+                continue;
+            }
+            MethodInfo methodInfo = instance.target().asMethod();
+            // the user class itself is made to be a bean as we want the user to be able to declare dependencies
+            additionalBeans.addBeanClass(methodInfo.declaringClass().name().toString());
+            String generatedClassName = CustomFilterGenerator.generateContainerRequestFilter(methodInfo,
+                    new GeneratedBeanGizmoAdaptor(generatedBean));
+
+            ContainerRequestFilterBuildItem.Builder builder = new ContainerRequestFilterBuildItem.Builder(generatedClassName)
+                    .setRegisterAsBean(false); // it has already been made a bean
+            AnnotationValue priorityValue = instance.value("priority");
+            if (priorityValue != null) {
+                builder.setPriority(priorityValue.asInt());
+            }
+            AnnotationValue preMatchingValue = instance.value("preMatching");
+            if (preMatchingValue != null) {
+                builder.setPreMatching(preMatchingValue.asBoolean());
+            }
+
+            List<AnnotationInstance> annotations = methodInfo.annotations();
+            Set<String> nameBindingNames = new HashSet<>();
+            for (AnnotationInstance annotation : annotations) {
+                if (SERVER_REQUEST_FILTER.equals(annotation.name())) {
+                    continue;
+                }
+                DotName annotationDotName = annotation.name();
+                ClassInfo annotationClassInfo = index.getClassByName(annotationDotName);
+                if (annotationClassInfo == null) {
+                    continue;
+                }
+                if ((annotationClassInfo.classAnnotation(ResteasyReactiveDotNames.NAME_BINDING) != null)) {
+                    nameBindingNames.add(annotationDotName.toString());
+                }
+            }
+            if (!nameBindingNames.isEmpty()) {
+                builder.setNameBindingNames(nameBindingNames);
+            }
+
+            additionalContainerRequestFilters.produce(builder.build());
+        }
+        for (AnnotationInstance instance : index
+                .getAnnotations(SERVER_RESPONSE_FILTER)) {
+            if (instance.target().kind() != AnnotationTarget.Kind.METHOD) {
+                continue;
+            }
+            MethodInfo methodInfo = instance.target().asMethod();
+            // the user class itself is made to be a bean as we want the user to be able to declare dependencies
+            additionalBeans.addBeanClass(methodInfo.declaringClass().name().toString());
+            String generatedClassName = CustomFilterGenerator.generateContainerResponseFilter(methodInfo,
+                    new GeneratedBeanGizmoAdaptor(generatedBean));
+            ContainerResponseFilterBuildItem.Builder builder = new ContainerResponseFilterBuildItem.Builder(generatedClassName)
+                    .setRegisterAsBean(false);// it has already been made a bean
+            AnnotationValue priorityValue = instance.value("priority");
+            if (priorityValue != null) {
+                builder.setPriority(priorityValue.asInt());
+            }
+            additionalContainerResponseFilters.produce(builder.build());
+        }
+
+        Set<MethodInfo> classLevelExceptionMappers = new HashSet<>(resourceScanningResultBuildItem
+                .map(s -> s.getResult().getClassLevelExceptionMappers()).orElse(Collections.emptyList()));
+        for (AnnotationInstance instance : index
+                .getAnnotations(SERVER_EXCEPTION_MAPPER)) {
+            if (instance.target().kind() != AnnotationTarget.Kind.METHOD) {
+                continue;
+            }
+            MethodInfo methodInfo = instance.target().asMethod();
+            if (classLevelExceptionMappers.contains(methodInfo)) { // methods annotated with @ServerExceptionMapper that exist inside a Resource Class are handled differently
+                continue;
+            }
+            // the user class itself is made to be a bean as we want the user to be able to declare dependencies
+            additionalBeans.addBeanClass(methodInfo.declaringClass().name().toString());
+            Map<String, String> generatedClassNames = ServerExceptionMapperGenerator.generateGlobalMapper(methodInfo,
+                    new GeneratedBeanGizmoAdaptor(generatedBean));
+            for (Map.Entry<String, String> entry : generatedClassNames.entrySet()) {
+                ExceptionMapperBuildItem.Builder builder = new ExceptionMapperBuildItem.Builder(entry.getValue(),
+                        entry.getKey()).setRegisterAsBean(false);// it has already been made a bean
+                AnnotationValue priorityValue = instance.value("priority");
+                if (priorityValue != null) {
+                    builder.setPriority(priorityValue.asInt());
+                }
+                additionalExceptionMappers.produce(builder.build());
+            }
+        }
+
+        additionalBean.produce(additionalBeans.setUnremovable().setDefaultScope(DotNames.SINGLETON).build());
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerConfig.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerConfig.java
new file mode 100644
index 0000000000000..4c9721d275321
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerConfig.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "rest")
+public class ResteasyReactiveServerConfig {
+
+    /**
+     * Set this to define the application path that serves as the base URI for all
+     * JAX-RS resource URIs provided by {@code @Path} annotations when there are no
+     * {@code @ApplicationPath} annotations defined on {@code Application} classes.
+     * <p>
+     * This value is always resolved relative to {@code quarkus.http.root-path}.
+     */
+    @ConfigItem
+    Optional<String> path;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerDotNames.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerDotNames.java
new file mode 100644
index 0000000000000..5fc80ebf5f26b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerDotNames.java
@@ -0,0 +1,85 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.util.function.Predicate;
+
+import javax.ws.rs.core.Context;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
+import io.vertx.ext.web.RoutingContext;
+
+public class ResteasyReactiveServerDotNames {
+    public static final DotName CONTEXT = DotName.createSimple(Context.class.getName());
+    public static final DotName SERVER_REQUEST_FILTER = DotName
+            .createSimple(ServerRequestFilter.class.getName());
+    public static final DotName SERVER_RESPONSE_FILTER = DotName
+            .createSimple(ServerResponseFilter.class.getName());
+    public static final DotName QUARKUS_REST_CONTAINER_REQUEST_CONTEXT = DotName
+            .createSimple(ResteasyReactiveContainerRequestContext.class.getName());
+    public static final DotName SIMPLIFIED_RESOURCE_INFO = DotName.createSimple(SimpleResourceInfo.class.getName());
+    public static final DotName ROUTING_CONTEXT = DotName.createSimple(RoutingContext.class.getName());
+
+    public static final DotName JSON_IGNORE = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");
+    public static final DotName JSONB_TRANSIENT = DotName.createSimple("javax.json.bind.annotation.JsonbTransient");
+
+    public static final IgnoreTypeForReflectionPredicate IGNORE_TYPE_FOR_REFLECTION_PREDICATE = new IgnoreTypeForReflectionPredicate();
+    public static final IgnoreFieldForReflectionPredicate IGNORE_FIELD_FOR_REFLECTION_PREDICATE = new IgnoreFieldForReflectionPredicate();
+    public static final IgnoreMethodForReflectionPredicate IGNORE_METHOD_FOR_REFLECTION_PREDICATE = new IgnoreMethodForReflectionPredicate();
+
+    private static class IgnoreTypeForReflectionPredicate implements Predicate<DotName> {
+
+        @Override
+        public boolean test(DotName dotName) {
+            if (ReflectiveHierarchyBuildItem.DefaultIgnoreTypePredicate.INSTANCE.test(dotName)) {
+                return true;
+            }
+            String name = dotName.toString();
+            for (String packageName : PACKAGES_IGNORED_FOR_REFLECTION) {
+                if (name.startsWith(packageName)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private static class IgnoreFieldForReflectionPredicate implements Predicate<FieldInfo> {
+
+        @Override
+        public boolean test(FieldInfo fieldInfo) {
+            return fieldInfo.hasAnnotation(JSON_IGNORE)
+                    || fieldInfo.hasAnnotation(JSONB_TRANSIENT);
+        }
+    }
+
+    private static class IgnoreMethodForReflectionPredicate implements Predicate<MethodInfo> {
+
+        @Override
+        public boolean test(MethodInfo methodInfo) {
+            return methodInfo.hasAnnotation(JSON_IGNORE)
+                    || methodInfo.hasAnnotation(JSONB_TRANSIENT);
+        }
+    }
+
+    private static final String[] PACKAGES_IGNORED_FOR_REFLECTION = {
+            // JSON-P
+            "javax.json.",
+            // Jackson
+            "com.fasterxml.jackson.databind.",
+            // JAX-RS
+            "javax.ws.rs.",
+            // RESTEasy
+            "org.jboss.resteasy.reactive",
+            // Vert.x JSON layer
+            "io.vertx.core.json.",
+            // Mutiny
+            "io.smallrye.mutiny."
+    };
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveVertxWebSocketIntegrationProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveVertxWebSocketIntegrationProcessor.java
new file mode 100644
index 0000000000000..4d5e51e1e7d3b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveVertxWebSocketIntegrationProcessor.java
@@ -0,0 +1,47 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.resteasy.reactive.server.runtime.websocket.VertxWebSocketParamExtractor;
+import io.quarkus.resteasy.reactive.server.runtime.websocket.VertxWebSocketRestHandler;
+import io.vertx.core.http.ServerWebSocket;
+
+public class ResteasyReactiveVertxWebSocketIntegrationProcessor {
+
+    static final DotName SERVER_WEB_SOCKET = DotName.createSimple(ServerWebSocket.class.getName());
+    public static final String NAME = ResteasyReactiveVertxWebSocketIntegrationProcessor.class.getName();
+
+    @BuildStep
+    MethodScannerBuildItem scanner() {
+        return new MethodScannerBuildItem(new MethodScanner() {
+            @Override
+            public List<HandlerChainCustomizer> scan(MethodInfo method, Map<String, Object> methodContext) {
+                if (methodContext.containsKey(NAME)) {
+                    return Collections.singletonList(new VertxWebSocketRestHandler());
+                }
+                return Collections.emptyList();
+            }
+
+            @Override
+            public ParameterExtractor handleCustomParameter(Type paramType, Map<DotName, AnnotationInstance> annotations,
+                    boolean field, Map<String, Object> methodContext) {
+                if (paramType.name().equals(SERVER_WEB_SOCKET)) {
+                    methodContext.put(NAME, true);
+                    return new VertxWebSocketParamExtractor();
+                }
+                return null;
+            }
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ServerExceptionMapperGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ServerExceptionMapperGenerator.java
new file mode 100644
index 0000000000000..7e39ba3a5e5f2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ServerExceptionMapperGenerator.java
@@ -0,0 +1,557 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofConstructor;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+import static io.quarkus.resteasy.reactive.common.deployment.QuarkusResteasyReactiveDotNames.*;
+import static io.quarkus.resteasy.reactive.common.deployment.QuarkusResteasyReactiveDotNames.HTTP_SERVER_REQUEST;
+import static io.quarkus.resteasy.reactive.server.deployment.GeneratorUtils.paramHandleFromReqContextMethod;
+import static io.quarkus.resteasy.reactive.server.deployment.GeneratorUtils.routingContextHandler;
+import static io.quarkus.resteasy.reactive.server.deployment.GeneratorUtils.runtimeResourceHandle;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.QUARKUS_REST_CONTAINER_REQUEST_CONTEXT;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.ROUTING_CONTEXT;
+import static io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveServerDotNames.SIMPLIFIED_RESOURCE_INFO;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.*;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONTAINER_REQUEST_CONTEXT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.HTTP_HEADERS;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REQUEST;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.RESOURCE_INFO;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.URI_INFO;
+
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.core.Response;
+
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.HttpHeadersImpl;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.spi.AsyncExceptionMapperContext;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveAsyncExceptionMapper;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveExceptionMapper;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.quarkus.arc.Unremovable;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.AsyncExceptionMappingUtil;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.ext.web.RoutingContext;
+
+final class ServerExceptionMapperGenerator {
+
+    private ServerExceptionMapperGenerator() {
+    }
+
+    /**
+     * Generates an exception mapper that delegates exception handling to a method of a Resource class.
+     * For example, for a method like:
+     * 
+     * <pre>
+     * &#64;ServerExceptionMapper(IllegalArgumentException.class)
+     * public Response perClassMapper(IllegalArgumentException e, Request r) {
+     *
+     * }
+     * </pre>
+     *
+     * a generated exception mapper would look like this (only the actual called method is displayed)
+     *
+     * <pre>
+     * &#64;Singleton
+     * &#64;Unremovable
+     * public class GreetingResource$GeneratedExceptionHandlerFor$IllegalArgumentException$OfMethod$perClassMapper
+     *         implements ResteasyReactiveExceptionMapper {
+     *
+     *     public Response toResponse(IllegalArgumentException e, ServerRequestContext ctx) {
+     *         GreetingResource instance = (GreetingResource) ((ResteasyReactiveRequestContext) ctx).getEndpointInstance();
+     *         return instance.perClassMapper(e, ctx.getRequest());
+     *     }
+     * }
+     * </pre>
+     * <p>
+     * An example of a generated exception handler that returns Uni is:
+     *
+     * <pre>
+     * &#64;Singleton
+     * &#64;Unremovable
+     * public class GreetingResource$GeneratedExceptionHandlerFor$IllegalArgumentException$OfMethod$perClassMapper
+     *         implements ResteasyReactiveAsyncExceptionMapper {
+     *
+     *     public void asyncResponse(IllegalArgumentException e, AsyncExceptionMapperContext ctx) {
+     *         GreetingResource instance = (GreetingResource) ((ResteasyReactiveRequestContext) ctx).getEndpointInstance();
+     *         AsyncExceptionMappingUtil.handleUniResponse(instance.perClassMapper(e, ctx.getRequest()));
+     *     }
+     * }
+     * </pre>
+     *
+     * @return a map containing the exception class name as the key and the generated exception mapper as the value
+     */
+    public static Map<String, String> generatePerClassMapper(MethodInfo targetMethod, ClassOutput classOutput) {
+        ReturnType returnType = determineReturnType(targetMethod);
+        checkModifiers(targetMethod);
+
+        ClassInfo targetClass = targetMethod.declaringClass();
+        Type[] handledExceptionTypes = getHandledExceptionTypes(targetMethod);
+        Map<String, String> result = new HashMap<>();
+        for (Type handledExceptionType : handledExceptionTypes) {
+            String generatedClassName = getGeneratedClassName(targetMethod, handledExceptionType);
+            try (ClassCreator cc = ClassCreator.builder().className(generatedClassName)
+                    .interfaces(determineInterfaceType(returnType)).classOutput(classOutput).build()) {
+                cc.addAnnotation(Singleton.class);
+                cc.addAnnotation(Unremovable.class);
+
+                // ctor
+                MethodCreator ctor = cc.getMethodCreator("<init>", "V");
+                ctor.invokeSpecialMethod(ofConstructor(Object.class), ctor.getThis());
+                ctor.returnValue(null);
+
+                if (returnType == ReturnType.RESPONSE) {
+                    MethodDescriptor specToResponseDescriptor = generateSpecToResponse(handledExceptionType, generatedClassName,
+                            cc);
+
+                    // bridge toResponse(Throwable) method
+                    generateSpecToResponseBridge(handledExceptionType, cc, specToResponseDescriptor);
+
+                    MethodDescriptor rrToResponseDescriptor = toResponseDescriptor(handledExceptionType, generatedClassName);
+
+                    // bridge toResponse(Throwable, ServerRequestContext) method
+                    generateRRResponseBridge(handledExceptionType, cc, rrToResponseDescriptor);
+
+                    // RESTEasy Reactive toResponse(...) method
+                    generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor,
+                            (method, contextHandle) -> {
+                                ResultHandle endpointInstanceHandle = method.invokeVirtualMethod(
+                                        ofMethod(ResteasyReactiveRequestContext.class, "getEndpointInstance", Object.class),
+                                        contextHandle);
+                                return method.checkCast(endpointInstanceHandle, targetClass.name().toString());
+                            });
+                } else if (returnType == ReturnType.UNI_RESPONSE) {
+                    MethodDescriptor rrAsyncResponseDescriptor = asyncResponseDescriptor(handledExceptionType,
+                            generatedClassName);
+
+                    // bridge asyncResponse(Throwable, AsyncExceptionMapperContext) method
+                    generateRRUniResponseBridge(handledExceptionType, cc, rrAsyncResponseDescriptor);
+
+                    // RESTEasy Reactive asyncResponse(...) method
+                    generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor,
+                            (method, contextHandle) -> {
+                                ResultHandle endpointInstanceHandle = method.invokeVirtualMethod(
+                                        ofMethod(ResteasyReactiveRequestContext.class, "getEndpointInstance", Object.class),
+                                        contextHandle);
+                                return method.checkCast(endpointInstanceHandle, targetClass.name().toString());
+                            });
+                } else {
+                    throw new IllegalStateException("ReturnType: '" + returnType + "' is not supported");
+                }
+            }
+            result.put(handledExceptionType.name().toString(), generatedClassName);
+        }
+        return result;
+    }
+
+    /**
+     * Generates an implementation of {@link ResteasyReactiveExceptionMapper} that delegates to the method
+     * annotated with {@code @ServerExceptionMapper}.
+     * <p>
+     * An example of the generated code is:
+     *
+     * <pre>
+     *
+     * &#64;Singleton
+     * &#64;Unremovable
+     * public class CustomExceptionMapper$GeneratedExceptionHandlerFor$IllegalArgumentException$OfMethod$handle
+     *         implements ResteasyReactiveExceptionMapper {
+     *     private final CustomExceptionMapper delegate;
+     *
+     *     &#64;Inject
+     *     public CustomExceptionMapper$GeneratedExceptionHandlerFor$IllegalArgumentException$OfMethod$handle(
+     *             CustomExceptionMapper var1) {
+     *         this.delegate = var1;
+     *     }
+     *
+     *     public Response toResponse(IllegalArgumentException e, ServerRequestContext ctx) {
+     *         return delegate.handle(e, ctx.getRequest());
+     *     }
+     * }
+     *
+     * </pre>
+     * <p>
+     * An example of a generated exception handler that returns Uni is:
+     *
+     * <pre>
+     *
+     * &#64;Singleton
+     * &#64;Unremovable
+     * public class CustomExceptionMapper$GeneratedExceptionHandlerFor$IllegalArgumentException$OfMethod$handle
+     *         implements ResteasyReactiveAsyncExceptionMapper {
+     *     private final CustomExceptionMapper delegate;
+     *
+     *     &#64;Inject
+     *     public CustomExceptionMapper$GeneratedExceptionHandlerFor$IllegalArgumentException$OfMethod$handle(
+     *             CustomExceptionMapper var1) {
+     *         this.delegate = var1;
+     *     }
+     *
+     *     public void asyncResponse(IllegalArgumentException e, AsyncExceptionMapperContext ctx) {
+     *         AsyncExceptionMappingUtil.handleUniResponse(delegate.handle(e, ctx.getRequest()));
+     *     }
+     * }
+     *
+     * </pre>
+     *
+     * Returns a map containing the handled exception name as the key and the generated class name as the value
+     */
+    public static Map<String, String> generateGlobalMapper(MethodInfo targetMethod, ClassOutput classOutput) {
+        ReturnType returnType = determineReturnType(targetMethod);
+        checkModifiers(targetMethod);
+
+        ClassInfo targetClass = targetMethod.declaringClass();
+        Type[] handledExceptionTypes = getHandledExceptionTypes(targetMethod);
+        Map<String, String> result = new HashMap<>();
+        for (Type handledExceptionType : handledExceptionTypes) {
+            String generatedClassName = getGeneratedClassName(targetMethod, handledExceptionType);
+            try (ClassCreator cc = ClassCreator.builder().className(generatedClassName)
+                    .interfaces(determineInterfaceType(returnType)).classOutput(classOutput).build()) {
+                cc.addAnnotation(Singleton.class);
+                cc.addAnnotation(Unremovable.class);
+
+                FieldDescriptor delegateField = cc.getFieldCreator("delegate", targetClass.name().toString())
+                        .setModifiers(Modifier.PRIVATE | Modifier.FINAL)
+                        .getFieldDescriptor();
+
+                // generate a constructor that takes the target class as an argument - this class is a CDI bean so Arc will be able to inject into the generated class
+                MethodCreator ctor = cc.getMethodCreator("<init>", void.class, targetClass.name().toString());
+                ctor.setModifiers(Modifier.PUBLIC);
+                ctor.addAnnotation(Inject.class);
+                ctor.invokeSpecialMethod(ofConstructor(Object.class), ctor.getThis());
+                ResultHandle self = ctor.getThis();
+                ResultHandle config = ctor.getMethodParam(0);
+                ctor.writeInstanceField(delegateField, self, config);
+                ctor.returnValue(null);
+
+                if (returnType == ReturnType.RESPONSE) {
+                    // spec toResponse(...) method
+                    MethodDescriptor specToResponseDescriptor = generateSpecToResponse(handledExceptionType, generatedClassName,
+                            cc);
+
+                    // bridge toResponse(Throwable) method
+                    generateSpecToResponseBridge(handledExceptionType, cc, specToResponseDescriptor);
+
+                    MethodDescriptor rrToResponseDescriptor = toResponseDescriptor(handledExceptionType, generatedClassName);
+
+                    // bridge toResponse(Throwable, ServerRequestContext) method
+                    generateRRResponseBridge(handledExceptionType, cc, rrToResponseDescriptor);
+
+                    // RESTEasy Reactive toResponse(...) method
+                    generateRRResponse(targetMethod, targetClass, handledExceptionType, cc, rrToResponseDescriptor,
+                            (method, contextHandle) -> method.readInstanceField(delegateField, method.getThis()));
+                } else if (returnType == ReturnType.UNI_RESPONSE) {
+                    MethodDescriptor rrAsyncResponseDescriptor = asyncResponseDescriptor(handledExceptionType,
+                            generatedClassName);
+
+                    // bridge asyncResponse(Throwable, AsyncExceptionMapperContext) method
+                    generateRRUniResponseBridge(handledExceptionType, cc, rrAsyncResponseDescriptor);
+
+                    // RESTEasy Reactive asyncResponse(...) method
+                    generateRRUniResponse(targetMethod, targetClass, handledExceptionType, cc, rrAsyncResponseDescriptor,
+                            (method, contextHandle) -> method.readInstanceField(delegateField, method.getThis()));
+                } else {
+                    throw new IllegalStateException("ReturnType: '" + returnType + "' is not supported");
+                }
+            }
+            result.put(handledExceptionType.name().toString(), generatedClassName);
+        }
+        return result;
+    }
+
+    private static Type[] getHandledExceptionTypes(MethodInfo targetMethod) {
+        AnnotationValue annotationValue = targetMethod.annotation(SERVER_EXCEPTION_MAPPER).value();
+        // handle the case where 'value' is set
+        if (annotationValue != null) {
+            Type[] valueArray = annotationValue.asClassArray();
+            if ((valueArray != null) && (valueArray.length > 0)) {
+                return valueArray;
+            }
+        }
+
+        // handle the case where we deduce the type of exception handler by the Throwable defined in method parameters
+        Type deducedHandledExceptionType = null;
+        List<Type> methodParameters = targetMethod.parameters();
+        for (Type methodParameter : methodParameters) {
+            if (methodParameter.kind() == Type.Kind.CLASS) {
+                try {
+                    Class<?> methodParameterClass = Class.forName(methodParameter.name().toString(), false,
+                            Thread.currentThread().getContextClassLoader());
+                    if (Throwable.class.isAssignableFrom(methodParameterClass)) {
+                        if (deducedHandledExceptionType != null) {
+                            throw new IllegalArgumentException(
+                                    "Multiple method parameters found that extend 'Throwable'. When using '@ServerExceptionMapper', only one parameter can be of type 'Throwable'. Offending method is '"
+                                            + targetMethod.name() + "' of class '"
+                                            + targetMethod.declaringClass().name().toString() + "'");
+                        }
+                        deducedHandledExceptionType = methodParameter;
+                    }
+                } catch (ClassNotFoundException ignored) {
+
+                }
+            }
+        }
+        if (deducedHandledExceptionType == null) {
+            throw new IllegalArgumentException(
+                    "When '@ServerExceptionMapper' is used without a value, then the annotated method must contain a method parameter that extends 'Throwable'. Offending method is '"
+                            + targetMethod.name() + "' of class '" + targetMethod.declaringClass().name().toString() + "'");
+        }
+        return new Type[] { deducedHandledExceptionType };
+    }
+
+    private static MethodDescriptor toResponseDescriptor(Type handledExceptionType, String generatedClassName) {
+        return ofMethod(generatedClassName, "toResponse",
+                Response.class.getName(),
+                handledExceptionType.name().toString(), ServerRequestContext.class.getName());
+    }
+
+    private static MethodDescriptor asyncResponseDescriptor(Type handledExceptionType, String generatedClassName) {
+        return ofMethod(generatedClassName, "asyncResponse",
+                void.class.getName(),
+                handledExceptionType.name().toString(), AsyncExceptionMapperContext.class.getName());
+    }
+
+    private static Class<?> determineInterfaceType(ReturnType returnType) {
+        if (returnType == ReturnType.RESPONSE) {
+            return ResteasyReactiveExceptionMapper.class;
+        } else if (returnType == ReturnType.UNI_RESPONSE) {
+            return ResteasyReactiveAsyncExceptionMapper.class;
+        }
+        throw new IllegalStateException("ReturnType: '" + returnType + "' is not supported");
+    }
+
+    private static void generateSpecToResponseBridge(Type handledExceptionType, ClassCreator cc,
+            MethodDescriptor specToResponseDescriptor) {
+        MethodCreator mc = cc.getMethodCreator("toResponse", Response.class, Throwable.class);
+        ResultHandle bridgeSpecParam = mc.getMethodParam(0);
+        ResultHandle castedBridgeSpecMethodParam = mc.checkCast(bridgeSpecParam,
+                handledExceptionType.name().toString());
+        mc.returnValue(mc.invokeVirtualMethod(specToResponseDescriptor,
+                mc.getThis(), castedBridgeSpecMethodParam));
+    }
+
+    private static MethodDescriptor generateSpecToResponse(Type handledExceptionType, String generatedClassName,
+            ClassCreator cc) {
+        MethodDescriptor specToResponseDescriptor = ofMethod(generatedClassName, "toResponse",
+                Response.class.getName(),
+                handledExceptionType.name().toString());
+        MethodCreator specToResponse = cc.getMethodCreator(specToResponseDescriptor);
+        specToResponse.throwException(IllegalStateException.class, "This should never be called");
+        return specToResponseDescriptor;
+    }
+
+    private static void generateRRResponseBridge(Type handledExceptionType, ClassCreator cc,
+            MethodDescriptor rrToResponseDescriptor) {
+        MethodCreator bridgeRRToResponse = cc.getMethodCreator("toResponse", Response.class, Throwable.class,
+                ServerRequestContext.class);
+        ResultHandle bridgeRRExceptionParam = bridgeRRToResponse.getMethodParam(0);
+        ResultHandle bridgeRRContextParam = bridgeRRToResponse.getMethodParam(1);
+        ResultHandle castedBridgeRRMethodParam = bridgeRRToResponse.checkCast(bridgeRRExceptionParam,
+                handledExceptionType.name().toString());
+        bridgeRRToResponse.returnValue(bridgeRRToResponse.invokeVirtualMethod(rrToResponseDescriptor,
+                bridgeRRToResponse.getThis(), castedBridgeRRMethodParam, bridgeRRContextParam));
+    }
+
+    private static void generateRRResponse(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType,
+            ClassCreator cc, MethodDescriptor rrToResponseDescriptor,
+            BiFunction<MethodCreator, ResultHandle, ResultHandle> targetInstanceHandleCreator) {
+        MethodCreator mc = cc.getMethodCreator(rrToResponseDescriptor);
+        ResultHandle exceptionHandle = mc.getMethodParam(0);
+        ResultHandle contextHandle = mc.checkCast(mc.getMethodParam(1),
+                ResteasyReactiveRequestContext.class);
+        ResultHandle targetInstanceHandle = targetInstanceHandleCreator.apply(mc, contextHandle);
+        if (targetMethod.parameters().isEmpty()) {
+            // just call the target method with no parameters
+            ResultHandle resultHandle = mc.invokeVirtualMethod(
+                    ofMethod(targetClass.name().toString(), targetMethod.name(), Response.class),
+                    targetInstanceHandle);
+            mc.returnValue(resultHandle);
+        } else {
+            TargetMethodParamsInfo targetMethodParamsInfo = getTargetMethodParamsInfo(targetMethod, targetClass,
+                    handledExceptionType, mc, exceptionHandle, contextHandle);
+            ResultHandle resultHandle = mc.invokeVirtualMethod(
+                    ofMethod(targetClass.name().toString(), targetMethod.name(),
+                            Response.class.getName(), targetMethodParamsInfo.getTypes()),
+                    targetInstanceHandle, targetMethodParamsInfo.getHandles());
+            mc.returnValue(resultHandle);
+        }
+    }
+
+    private static void generateRRUniResponseBridge(Type handledExceptionType, ClassCreator cc,
+            MethodDescriptor rrAsyncResponseDescriptor) {
+        MethodCreator mc = cc.getMethodCreator("asyncResponse", void.class, Throwable.class,
+                AsyncExceptionMapperContext.class);
+        ResultHandle bridgeRRExceptionParam = mc.getMethodParam(0);
+        ResultHandle bridgeRRContextParam = mc.getMethodParam(1);
+        ResultHandle castedBridgeRRMethodParam = mc.checkCast(bridgeRRExceptionParam,
+                handledExceptionType.name().toString());
+        mc.returnValue(mc.invokeVirtualMethod(rrAsyncResponseDescriptor,
+                mc.getThis(), castedBridgeRRMethodParam, bridgeRRContextParam));
+    }
+
+    private static void generateRRUniResponse(MethodInfo targetMethod, ClassInfo targetClass, Type handledExceptionType,
+            ClassCreator cc, MethodDescriptor rrAsyncResponseDescriptor,
+            BiFunction<MethodCreator, ResultHandle, ResultHandle> targetInstanceHandleCreator) {
+        MethodCreator mc = cc.getMethodCreator(rrAsyncResponseDescriptor);
+        ResultHandle exceptionHandle = mc.getMethodParam(0);
+        ResultHandle asyncContextHandle = mc.getMethodParam(1);
+        ResultHandle serverContextHandle = mc.invokeInterfaceMethod(
+                ofMethod(AsyncExceptionMapperContext.class, "serverRequestContext", ServerRequestContext.class),
+                asyncContextHandle);
+        ResultHandle contextHandle = mc.checkCast(serverContextHandle, ResteasyReactiveRequestContext.class);
+        ResultHandle targetInstanceHandle = targetInstanceHandleCreator.apply(mc, contextHandle);
+        ResultHandle uniHandle;
+        if (targetMethod.parameters().isEmpty()) {
+            // just call the target method with no parameters
+            uniHandle = mc.invokeVirtualMethod(
+                    ofMethod(targetClass.name().toString(), targetMethod.name(), Uni.class),
+                    targetInstanceHandle);
+        } else {
+            TargetMethodParamsInfo targetMethodParamsInfo = getTargetMethodParamsInfo(targetMethod, targetClass,
+                    handledExceptionType, mc, exceptionHandle, contextHandle);
+            uniHandle = mc.invokeVirtualMethod(
+                    ofMethod(targetClass.name().toString(), targetMethod.name(),
+                            Uni.class.getName(), targetMethodParamsInfo.getTypes()),
+                    targetInstanceHandle, targetMethodParamsInfo.getHandles());
+        }
+        mc.invokeStaticMethod(ofMethod(AsyncExceptionMappingUtil.class, "handleUniResponse", void.class, Uni.class,
+                AsyncExceptionMapperContext.class), uniHandle, asyncContextHandle);
+        mc.returnValue(null);
+    }
+
+    private static TargetMethodParamsInfo getTargetMethodParamsInfo(MethodInfo targetMethod, ClassInfo targetClass,
+            Type handledExceptionType, MethodCreator mc, ResultHandle exceptionHandle, ResultHandle contextHandle) {
+        List<Type> parameters = targetMethod.parameters();
+        ResultHandle[] targetMethodParamHandles = new ResultHandle[parameters.size()];
+        String[] parameterTypes = new String[parameters.size()];
+        // TODO: we probably want to refactor this and remove duplicate code that also exists in CustomFilterGenerator
+        for (int i = 0; i < parameters.size(); i++) {
+            Type parameter = parameters.get(i);
+            DotName paramDotName = parameter.name();
+            parameterTypes[i] = paramDotName.toString();
+            if (paramDotName.equals(handledExceptionType.name())) {
+                targetMethodParamHandles[i] = exceptionHandle;
+            } else if (CONTAINER_REQUEST_CONTEXT.equals(paramDotName)
+                    || QUARKUS_REST_CONTAINER_REQUEST_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = mc.invokeVirtualMethod(
+                        ofMethod(ResteasyReactiveRequestContext.class.getName(), "getContainerRequestContext",
+                                ContainerRequestContextImpl.class),
+                        contextHandle);
+            } else if (URI_INFO.equals(paramDotName)) {
+                paramHandleFromReqContextMethod(mc, contextHandle, targetMethodParamHandles, i,
+                        "getUriInfo",
+                        URI_INFO);
+            } else if (HTTP_HEADERS.equals(paramDotName)) {
+                paramHandleFromReqContextMethod(mc, contextHandle, targetMethodParamHandles, i,
+                        "getHttpHeaders",
+                        HttpHeadersImpl.class);
+            } else if (REQUEST.equals(paramDotName)) {
+                paramHandleFromReqContextMethod(mc, contextHandle, targetMethodParamHandles, i,
+                        "getRequest",
+                        REQUEST);
+            } else if (HTTP_SERVER_REQUEST.equals(paramDotName)) {
+                ResultHandle routingContextHandle = routingContextHandler(mc, contextHandle);
+                targetMethodParamHandles[i] = mc.invokeInterfaceMethod(
+                        ofMethod(RoutingContext.class, "request", HttpServerRequest.class), routingContextHandle);
+            } else if (RESOURCE_INFO.equals(paramDotName)) {
+                ResultHandle runtimeResourceHandle = runtimeResourceHandle(mc, contextHandle);
+                targetMethodParamHandles[i] = mc.invokeVirtualMethod(
+                        ofMethod(RuntimeResource.class, "getLazyMethod", ResteasyReactiveResourceInfo.class),
+                        runtimeResourceHandle);
+            } else if (SIMPLIFIED_RESOURCE_INFO.equals(paramDotName)) {
+                ResultHandle runtimeResourceHandle = runtimeResourceHandle(mc, contextHandle);
+                targetMethodParamHandles[i] = mc.invokeVirtualMethod(
+                        ofMethod(RuntimeResource.class, "getSimplifiedResourceInfo", SimpleResourceInfo.class),
+                        runtimeResourceHandle);
+            } else if (ROUTING_CONTEXT.equals(paramDotName)) {
+                targetMethodParamHandles[i] = routingContextHandler(mc, contextHandle);
+            } else {
+                String parameterName = targetMethod.parameterName(i);
+                throw new RuntimeException("Parameter '" + parameterName + "' of method '" + targetMethod.name()
+                        + " of class '" + targetClass.name()
+                        + "' is not allowed");
+            }
+        }
+        return new TargetMethodParamsInfo(targetMethodParamHandles, parameterTypes);
+    }
+
+    private static ReturnType determineReturnType(MethodInfo targetMethod) {
+        if (targetMethod.returnType().name().equals(RESPONSE)) {
+            return ReturnType.RESPONSE;
+        } else if (targetMethod.returnType().kind() == Type.Kind.PARAMETERIZED_TYPE) {
+            ParameterizedType parameterizedType = targetMethod.returnType().asParameterizedType();
+            if (parameterizedType.name().equals(UNI) && (parameterizedType.arguments().size() == 1)) {
+                if (parameterizedType.arguments().get(0).name().equals(RESPONSE)) {
+                    return ReturnType.UNI_RESPONSE;
+                }
+            }
+        }
+        throw new RuntimeException("Method '" + targetMethod.name() + " of class '" + targetMethod.declaringClass().name()
+                + "' cannot be used as an exception mapper as it does not declare 'Response' or 'Uni<Response>' or as its return type");
+    }
+
+    private static void checkModifiers(MethodInfo info) {
+        if ((info.flags() & Modifier.PRIVATE) != 0) {
+            throw new RuntimeException("Method '" + info.name() + " of class '" + info.declaringClass().name()
+                    + "' cannot be private as it is annotated with '@" + SERVER_EXCEPTION_MAPPER
+                    + "'");
+        }
+        if ((info.flags() & Modifier.STATIC) != 0) {
+            throw new RuntimeException("Method '" + info.name() + " of class '" + info.declaringClass().name()
+                    + "' cannot be static as it is annotated with '@" + SERVER_EXCEPTION_MAPPER
+                    + "'");
+        }
+    }
+
+    private static String getGeneratedClassName(MethodInfo targetMethod, Type handledExceptionType) {
+        return targetMethod.declaringClass().name() + "$GeneratedExceptionHandlerFor$"
+                + handledExceptionType.name().withoutPackagePrefix()
+                + "$OfMethod$" + targetMethod.name();
+    }
+
+    private enum ReturnType {
+        RESPONSE,
+        UNI_RESPONSE
+    }
+
+    private static class TargetMethodParamsInfo {
+        private final ResultHandle[] handles;
+        private final String[] types;
+
+        public TargetMethodParamsInfo(ResultHandle[] handles, String[] types) {
+            this.handles = handles;
+            this.types = types;
+        }
+
+        public ResultHandle[] getHandles() {
+            return handles;
+        }
+
+        public String[] getTypes() {
+            return types;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevConsoleProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..bcf7f2fa5a8e4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,100 @@
+package io.quarkus.resteasy.reactive.server.deployment.devconsole;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Collections;
+import java.util.List;
+import java.util.Stack;
+
+import io.quarkus.deployment.ApplicationArchive;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
+import io.quarkus.resteasy.reactive.server.runtime.EndpointScoresSupplier;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.runtime.StaticResourcesRecorder;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleRuntimeTemplateInfoBuildItem collectScores() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("endpointScores", new EndpointScoresSupplier());
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleTemplateInfoBuildItem collectAdditionalEndpoints(
+            List<NotFoundPageDisplayableEndpointBuildItem> additionalEndpoint) {
+        return new DevConsoleTemplateInfoBuildItem("additionalEndpointInfo", additionalEndpoint);
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleTemplateInfoBuildItem collectStaticResourcesInfo(
+            ApplicationArchivesBuildItem applicationArchivesBuildItem) throws Exception {
+
+        StaticResourceInfo staticResourceInfo = new StaticResourceInfo();
+
+        for (ApplicationArchive i : applicationArchivesBuildItem.getAllApplicationArchives()) {
+            Path resource = i.getChildPath(StaticResourcesRecorder.META_INF_RESOURCES);
+            if (resource != null && Files.exists(resource)) {
+                collectKnownPaths(resource, staticResourceInfo);
+            }
+        }
+        return new DevConsoleTemplateInfoBuildItem("staticResourceInfo", staticResourceInfo);
+    }
+
+    private void collectKnownPaths(Path resource, StaticResourceInfo staticResourceInfo) {
+
+        try {
+            Files.walkFileTree(resource, new SimpleFileVisitor<Path>() {
+                final Stack<StaticResourceInfo.StaticFile> currentFolder = new Stack<>();
+
+                @Override
+                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+
+                    Path relativeFile = resource.relativize(dir);
+                    String relativeFileString = "/" + relativeFile.toString();
+                    Path dirName = dir.getFileName();
+                    StaticResourceInfo.StaticFile getStaticFile = staticResourceInfo.resourceMap.get(relativeFileString);
+                    if (getStaticFile == null) {
+                        getStaticFile = new StaticResourceInfo.StaticFile(dirName.toString(), true);
+                        staticResourceInfo.resourceMap.put(relativeFileString, getStaticFile);
+
+                        // adding to parent
+                        if (!currentFolder.isEmpty()) {
+                            currentFolder.peek().children.add(getStaticFile);
+                        }
+                    }
+                    currentFolder.push(getStaticFile);
+                    return FileVisitResult.CONTINUE;
+                }
+
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    String fileName = file.getFileName().toString();
+                    StaticResourceInfo.StaticFile newStaticFile = new StaticResourceInfo.StaticFile(fileName, false);
+
+                    List<StaticResourceInfo.StaticFile> childrenList = currentFolder.peek().children;
+                    childrenList.add(newStaticFile);
+
+                    return FileVisitResult.CONTINUE;
+                }
+
+                @Override
+                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                    Collections.sort(currentFolder.peek().children);
+                    currentFolder.pop();
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevQuteInfos.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevQuteInfos.java
new file mode 100644
index 0000000000000..aebf067b05cdd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevQuteInfos.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.deployment.devconsole;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DevQuteInfos {
+    private List<DevQuteTemplateInfo> templateInfos = new ArrayList<>();
+
+    public DevQuteInfos() {
+    }
+
+    public List<DevQuteTemplateInfo> getTemplateInfos() {
+        return templateInfos;
+    }
+
+    public void setTemplateInfos(List<DevQuteTemplateInfo> templateInfos) {
+        this.templateInfos = templateInfos;
+    }
+
+    public void addQuteTemplateInfo(DevQuteTemplateInfo info) {
+        templateInfos.add(info);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevQuteTemplateInfo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevQuteTemplateInfo.java
new file mode 100644
index 0000000000000..ea0e02a8be04d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/DevQuteTemplateInfo.java
@@ -0,0 +1,49 @@
+package io.quarkus.resteasy.reactive.server.deployment.devconsole;
+
+import java.util.List;
+import java.util.Map;
+
+public class DevQuteTemplateInfo implements Comparable<DevQuteTemplateInfo> {
+
+    private String path;
+    private List<String> variants;
+    private Map<String, String> parameters;
+
+    public DevQuteTemplateInfo() {
+    }
+
+    public DevQuteTemplateInfo(String path, List<String> variants, Map<String, String> parameters) {
+        this.path = path;
+        this.variants = variants;
+        this.parameters = parameters;
+    }
+
+    public Map<String, String> getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(Map<String, String> parameters) {
+        this.parameters = parameters;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public List<String> getVariants() {
+        return variants;
+    }
+
+    public void setVariants(List<String> variants) {
+        this.variants = variants;
+    }
+
+    @Override
+    public int compareTo(DevQuteTemplateInfo o) {
+        return path.compareTo(o.path);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/StaticResourceInfo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/StaticResourceInfo.java
new file mode 100644
index 0000000000000..425538bf06eda
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devconsole/StaticResourceInfo.java
@@ -0,0 +1,37 @@
+package io.quarkus.resteasy.reactive.server.deployment.devconsole;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class StaticResourceInfo {
+
+    public Map<String, StaticFile> resourceMap = new TreeMap<>();
+
+    public static final class StaticFile implements Comparable<StaticFile> {
+        public String lastName;
+        public boolean isFolder;
+        public List<StaticFile> children = new ArrayList<>();
+
+        public StaticFile(String lastName, boolean isFolder) {
+            this.lastName = lastName;
+            this.isFolder = isFolder;
+        }
+
+        @Override
+        public int compareTo(StaticFile staticFile) {
+
+            if (isFolder && !staticFile.isFolder) {
+                //Folder before file
+                return -1;
+            } else if (!isFolder && staticFile.isFolder) {
+                //File after folder
+                return 1;
+            } else
+                //sort alphabetically
+                return lastName.toLowerCase().compareTo(staticFile.lastName.toLowerCase());
+
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/embedded.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..6bb3b8cd3246d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,8 @@
+<a href="{urlbase}/scores" class="badge badge-light">
+  <i class="fa fa-chart-bar fa-fw"></i>
+  Endpoint scores</a>
+<br>
+<a href="{urlbase}/endpoints" class="badge badge-light">
+  <i class="fa fa-map fa-fw"></i>
+  List of endpoints</a>
+
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/endpoints.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/endpoints.html
new file mode 100644
index 0000000000000..5dfeafef8e61a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/endpoints.html
@@ -0,0 +1,76 @@
+{#include main}
+{#title}Quarkus REST Endpoints{/title}
+{#style}
+h5{
+ background: gainsboro;
+ margin-top: 20px;
+ margin-bottom: 20px;
+ padding: 10px;
+}
+.static{
+ margin-top: 5px;
+}
+{/style}
+{#body}
+ <h5>REST Resources</h5>
+ {#for endpoint in info:endpointScores.endpoints}
+ <div class="row">
+  <div class="col">
+   <code>{endpoint.httpMethod} {endpoint.fullPath}</code>
+  </div>
+ </div>
+ {#if !endpoint.produces.isEmpty()}
+ <div class="row">
+  <div class="col-1"></div>
+  <div class="col-1">
+   Produces
+  </div>
+  <div class="col">
+   {endpoint.produces}
+  </div>
+ </div>
+ {/if}
+ {#if !endpoint.consumes.isEmpty()}
+ <div class="row">
+  <div class="col-1"></div>
+  <div class="col-1">
+   Consumes
+  </div>
+  <div class="col">
+   {endpoint.consumes}
+  </div>
+ </div>
+ {/if}
+ {/for}
+ <h5>Static Resources</h5>
+ {#for resource in info:staticResourceInfo.resourceMap.get("/").children}
+ <div class="row">
+  <div class="col">
+   {#if resource.isFolder}
+   <i class="far fa-folder-open" style="margin-right:5px; margin-top:5px"></i>
+   <a class="static" href="view?path=/{resource.lastName}">
+    {resource.lastName}
+   </a>
+   {#else}
+   <i class="fas fa-file-alt" style="margin-right:5px; margin-top:5px"></i>
+   <a class="static" href="/{resource.lastName}">
+    {resource.lastName}
+   </a>
+   {/if}
+  </div>
+ </div>
+ {/for}
+ <h5>Additional Endpoints</h5>
+ {#for additionalEndpoint in info:additionalEndpointInfo}
+ <div class="row">
+  <div class="col">
+   {#if additionalEndpoint.description}
+   <a href="{additionalEndpoint.endpoint}">{additionalEndpoint.description}</a>
+   {#else}
+   <a href="{additionalEndpoint.endpoint}">{additionalEndpoint.endpoint}</a>
+   {/if}
+  </div>
+ </div>
+ {/for}
+{/body}
+{/include}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/scores.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/scores.html
new file mode 100644
index 0000000000000..c3f1c7e8920cb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/scores.html
@@ -0,0 +1,231 @@
+{#include main}
+{#title}Quarkus REST Score Console{/title}
+
+{#style}
+collapse-list{
+  cursor: pointer;
+}
+p{
+  text-align: right;
+  font-size:20px;
+}
+
+.scoregauge{
+    justify-content: center;
+}
+.gauge {
+  width: 100%;
+  max-width: 250px;
+  font-family: "Roboto", sans-serif;
+  font-size: 32px;
+  color: #004033;
+}
+
+.gauge__body {
+  width: 100%;
+  height: 0;
+  padding-bottom: 50%;
+  background: #b4c0be;
+  position: relative;
+  border-top-left-radius: 100% 200%;
+  border-top-right-radius: 100% 200%;
+  overflow: hidden;
+}
+
+.gauge__fill {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: inherit;
+  height: 100%;
+  transform-origin: center top;
+  transition: transform 0.2s ease-out;
+}
+
+.gauge__cover {
+  width: 75%;
+  height: 150%;
+  background: #ffffff;
+  border-radius: 50%;
+  position: absolute;
+  top: 25%;
+  left: 50%;
+  transform: translateX(-50%);
+  display: flex;
+  align-items: center;
+  text-align: center;
+  justify-content: center;
+  padding-bottom: 25%;
+  box-sizing: border-box;
+}
+
+.scorekey{
+  font-weight: bold;
+  font-size: 165%;
+  font-family: "Roboto", sans-serif;
+}
+
+.scoremessage{
+  font-size: 90%;
+  font-family: "Roboto", sans-serif;
+  display: block;
+  text-align: center;
+  padding: 15px;
+}
+th, td {
+  border: 1px solid black;
+  border-collapse: collapse;
+}
+table {
+  position: relative;
+  margin: 10px auto;
+  padding: 0;
+  width: 100%;
+  height: auto;
+  border-collapse: collapse;
+  text-align: center;
+}
+code{
+  float: left;
+  font-size: 80%;
+}
+.styleBadge{
+  float: right;
+}
+
+.btn{
+  min-width: 100%;
+}
+.accordion{
+  align: center;
+  width: 99%;
+  margin-top: 2%;
+
+}
+
+.showfilters {
+    cursor: pointer;
+}
+
+.filterbox{
+    font-size: 0.9em;
+    background: #343a40;
+    color: white;
+}
+
+{/style}
+{#script}
+function setGaugeValue(gauge, value) {
+    if (value < 0 || value > 100) {
+        return;
+    }
+
+    var r;
+    if(value < 50){
+      r = "transform:rotate( " + value*2 + "grad);background: #DE4E46;";
+    }else if(value < 100){
+      r = "transform:rotate( " + value*2 + "grad);background: #F7C00F;";
+    }else{
+      r = "transform:rotate( " + value*2 + "grad);background: lightgreen;";
+    }
+
+    gauge.find(".gauge__fill").attr("style",r);
+    gauge.find(".gauge__cover").text(value + "%");
+}
+
+$(document).ready(function(){
+    $(".gauge").each(function(){
+        setGaugeValue($(this), $(this).attr("data-score"));
+    });
+});
+
+{/script}
+
+{#body}
+<div class="accordion" id="endpointsAccordion">
+{#for endpoint in info:endpointScores.endpoints}
+
+    <div class="card">
+
+        <div class="card-header" id="Heading{count}">
+            <button class="btn btn-block btn-lg collapsed" type="button" data-toggle="collapse"
+                    data-target="#Line{count}" aria-expanded="false"
+                    aria-controls="Line{count}">
+              <code>{endpoint.httpMethod} {endpoint.fullPath}</code>
+              <span class="styleBadge badge badge-{#if endpoint.score < 50}danger{#else if endpoint.score < 100}warning{#else}success{/if}">{endpoint.score}/100</span>
+            </button>
+        </div>
+
+        <div id="Line{count}" class="collapse" aria-labelledby="Heading{count}" data-parent="#endpointsAccordion">
+            <div class="card-body">
+
+                <div class="row">
+                    {#for diagnosticEntry in endpoint.diagnostics.entrySet()}
+                        {#for diagnostic in diagnosticEntry.value}
+                            <div class="col-4">
+                                <div class="row scoregauge">
+                                    <div class="gauge" data-score="{diagnostic.score}">
+                                        <div class="gauge__body">
+                                            <div class="gauge__fill"></div>
+                                            <div class="gauge__cover"></div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="row scoregauge scorekey">
+                                    {diagnosticEntry.key}
+                                </div>
+
+                                <div class="row scoremessage">
+                                    {diagnostic.message}
+                                </div>
+                            </div>
+                        {/for}
+                    {/for}
+                </div>
+
+                <hr/>
+                
+                <div class="row">
+                    {#if !endpoint.produces.isEmpty()}
+                        <div class="col-2" style="text-align: right;">
+                            Produces:
+                        </div>
+                        <div class="col-10">
+                            <span class="badge badge-primary">{endpoint.produces}</span>
+                        </div>
+                    {/if}
+                    {#if !endpoint.consumes.isEmpty()}
+
+                        <div class="col-2" style="text-align: right;">
+                            Consumes:
+                        </div>
+                        <div class="col-10">
+                            <span class="badge badge-primary">{endpoint.consumes}</span>
+                        </div>
+                    {/if}
+                    {#if !endpoint.requestFilterEntries.isEmpty()}
+                        <div class="col-2 showfilters" style="text-align: right;" data-toggle="collapse" data-target="#filter{count}">
+                            Filters:
+                        </div>
+                        <div class="col-10 showfilters" data-toggle="collapse" data-target="#filter{count}">
+                            <span class="badge badge-pill badge-secondary">{endpoint.requestFilterEntries.size}</span>
+                        </div>
+                    
+                        <div id="filter{count}" class="col-10 offset-2 filterbox collapse">
+                            <samp class="text-wrap">
+                                {#for requestFilters in endpoint.requestFilterEntries}
+                                    {requestFilters.getName}<br/>
+                                {/for}
+                            </samp>
+                            
+                        </div>
+                    {/if}
+                </div>
+            </div>
+        </div>
+    </div>
+{/for}
+</div>
+{/body}
+{/include}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/view.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/view.html
new file mode 100644
index 0000000000000..78fed267a6bb2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-templates/view.html
@@ -0,0 +1,35 @@
+{#include main}
+{#title}Static Resources{/title}
+{#style}
+.static{
+margin-top: 5px;
+}
+{/style}
+{#body}
+ {#let folder=currentRequest.params.get("path")}
+  <div class="row">
+    <div class="col">
+      {folder}
+    </div>
+  </div>
+  {#for childOfFolder in info:staticResourceInfo.resourceMap.get(folder).children}
+    <div class="row">
+      <div class="col-1"></div>
+      <div class="col">
+        {#if !childOfFolder.isFolder}
+          <i class="fas fa-file-alt" style="margin-right:5px; margin-top:5px"></i>
+          <a class="static" href="{folder}/{childOfFolder.lastName}">
+            {childOfFolder.lastName}
+          </a>
+        {#else}
+          <i class="far fa-folder-open" style="margin-right:5px; margin-top:5px"></i>
+          <a class="static" href="view?path={folder}/{childOfFolder.lastName}">
+            {childOfFolder.lastName}
+          </a>
+        {/if}
+      </div>
+    </div>
+    {/for}
+ {/let}
+{/body}
+{/include}
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java
new file mode 100644
index 0000000000000..3c6fb6894ae97
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/client/test/ContentTypeHeaderTest.java
@@ -0,0 +1,100 @@
+package io.quarkus.resteasy.reactive.client.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.client.impl.ClientImpl;
+import org.jboss.resteasy.reactive.client.impl.WebTargetImpl;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+// TODO: pull out RuntimeDelegateImpl to common and move the tests to client's deployment
+class ContentTypeHeaderTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SomeClient.class, Endpoint.class));
+
+    @TestHTTPResource("/foo")
+    URI uri;
+
+    @Test
+    void shouldUseDefaultContentType() {
+        ClientImpl client = (ClientImpl) ClientBuilder.newClient();
+        WebTargetImpl target = (WebTargetImpl) client.target(uri);
+        SomeClient someClient = target.proxy(SomeClient.class);
+        assertThat(someClient.postDefaultType("some-text"))
+                .isEqualToIgnoringCase("application/octet-stream");
+    }
+
+    @Test
+    void shouldUseSpecifiedContentType() {
+        ClientImpl client = (ClientImpl) ClientBuilder.newClient();
+        WebTargetImpl target = (WebTargetImpl) client.target(uri);
+        SomeClient someClient = target.proxy(SomeClient.class);
+        assertThat(someClient.postHtml("some-text"))
+                .isEqualToIgnoringCase("text/html");
+    }
+
+    @Test
+    void shouldPassTextEntity() {
+        ClientImpl client = (ClientImpl) ClientBuilder.newClient();
+        WebTargetImpl target = (WebTargetImpl) client.target(uri);
+        SomeClient someClient = target.proxy(SomeClient.class);
+        assertThat(someClient.echoText("some-other-text"))
+                .isEqualToIgnoringCase("some-other-text");
+    }
+
+    @Path("/")
+    interface SomeClient {
+        @POST
+        String postDefaultType(String content);
+
+        @POST
+        @Path("/as-html")
+        @Consumes(MediaType.TEXT_HTML)
+        String postHtml(String content);
+
+        @POST
+        @Consumes("text/plain")
+        @Path("/echo")
+        String echoText(String content);
+    }
+
+    @Path("/foo")
+    static class Endpoint {
+        @POST
+        @Consumes("*/*")
+        public String postDefaultType(String content, @HeaderParam("Content-Type") String contentType) {
+            return contentType;
+        }
+
+        @POST
+        @Consumes("text/plain")
+        @Path("/echo")
+        public String echoText(String content) {
+            return content;
+        }
+
+        @POST
+        @Path("/as-html")
+        @Consumes("*/*")
+        public String postHtml(String content, @HeaderParam("Content-Type") String contentType) {
+            return contentType;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java
new file mode 100644
index 0000000000000..42c6d5c391dbb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/MultipleHttpAnnotationsTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.resteasy.reactive.server.test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MultipleHttpAnnotationsTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Resource.class);
+                }
+            }).setExpectedException(DeploymentException.class);
+
+    @Test
+    public void test() {
+        fail("Should never have been called");
+    }
+
+    @Path("test")
+    public static class Resource {
+
+        @Path("hello")
+        @GET
+        @POST
+        public String hello() {
+            return "hello";
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/CustomExceptionMappersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/CustomExceptionMappersTest.java
new file mode 100644
index 0000000000000..8c99deecc0ff6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/CustomExceptionMappersTest.java
@@ -0,0 +1,72 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class CustomExceptionMappersTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(FirstResource.class, SecondResource.class,
+                                    MyException.class, MyOtherException.class, UniException.class, ExtendsUniException.class,
+                                    MyOtherExceptionMapper.class, UniExceptionMapper.class,
+                                    SomeBean.class);
+                }
+            });
+
+    @Test
+    public void testResourceWithExceptionMapper() {
+        RestAssured.get("/first?name=IllegalState")
+                .then().statusCode(409);
+        RestAssured.get("/first?name=IllegalArgument")
+                .then().statusCode(409);
+        RestAssured.get("/first?name=My")
+                .then().statusCode(410).body(Matchers.equalTo("/first->throwsVariousExceptions"));
+        RestAssured.get("/first?name=MyOther")
+                .then().statusCode(411);
+        RestAssured.get("/first?name=Uni")
+                .then().statusCode(412).body(Matchers.equalTo("/first->throwsVariousExceptions"));
+        RestAssured.get("/first?name=Other")
+                .then().statusCode(500);
+    }
+
+    @Test
+    public void testResourceWithExceptionMapperAndUniResponse() {
+        RestAssured.get("/first/uni?name=IllegalState")
+                .then().statusCode(409);
+        RestAssured.get("/first/uni?name=IllegalArgument")
+                .then().statusCode(409);
+        RestAssured.get("/first/uni?name=My")
+                .then().statusCode(410).body(Matchers.equalTo("/first/uni->uni"));
+        RestAssured.get("/first/uni?name=MyOther")
+                .then().statusCode(411);
+        RestAssured.get("/first/uni?name=Uni")
+                .then().statusCode(412).body(Matchers.equalTo("/first/uni->uni"));
+        RestAssured.get("/first/uni?name=Other")
+                .then().statusCode(500);
+    }
+
+    @Test
+    public void testResourceWithoutExceptionMapper() {
+        RestAssured.get("/second")
+                .then().statusCode(500);
+        RestAssured.get("/second/other")
+                .then().statusCode(411);
+        RestAssured.get("/second/uni")
+                .then().statusCode(413);
+        RestAssured.get("/second/extendsUni")
+                .then().statusCode(414);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ExtendsUniException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ExtendsUniException.java
new file mode 100644
index 0000000000000..bd1c57147b32d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/ExtendsUniException.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+public class ExtendsUniException extends UniException {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java
new file mode 100644
index 0000000000000..7891cc61979a9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/FirstResource.java
@@ -0,0 +1,75 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.reactive.RestQuery;
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpServerRequest;
+
+@Path("first")
+public class FirstResource {
+
+    @GET
+    @Produces("text/plain")
+    public String throwsVariousExceptions(@RestQuery String name) {
+        if (name.startsWith("IllegalArgument")) {
+            throw new IllegalArgumentException();
+        } else if (name.startsWith("IllegalState")) {
+            throw new IllegalStateException("IllegalState");
+        } else if (name.startsWith("MyOther")) {
+            throw new MyOtherException();
+        } else if (name.startsWith("My")) {
+            throw new MyException();
+        } else if (name.startsWith("Uni")) {
+            throw new UniException();
+        }
+        throw new RuntimeException();
+    }
+
+    @GET
+    @Path("uni")
+    @Produces("text/plain")
+    public Uni<String> uni(@RestQuery String name) {
+        Exception e = new RuntimeException();
+        if (name.startsWith("IllegalArgument")) {
+            e = new IllegalArgumentException();
+        } else if (name.startsWith("IllegalState")) {
+            e = new IllegalStateException("IllegalState");
+        } else if (name.startsWith("MyOther")) {
+            e = new MyOtherException();
+        } else if (name.startsWith("My")) {
+            e = new MyException();
+        } else if (name.startsWith("Uni")) {
+            e = new UniException();
+        }
+        return Uni.createFrom().failure(e);
+    }
+
+    @ServerExceptionMapper({ IllegalStateException.class, IllegalArgumentException.class })
+    public Response handleIllegal() {
+        return Response.status(409).build();
+    }
+
+    @ServerExceptionMapper
+    public Response handleMyException(SimpleResourceInfo simplifiedResourceInfo, MyException myException,
+            ContainerRequestContext containerRequestContext, UriInfo uriInfo, HttpHeaders httpHeaders, Request request,
+            HttpServerRequest httpServerRequest) {
+        return Response.status(410).entity(uriInfo.getPath() + "->" + simplifiedResourceInfo.getMethodName()).build();
+    }
+
+    @ServerExceptionMapper(UniException.class)
+    public Uni<Response> handleUniException(UniException e, UriInfo uriInfo, SimpleResourceInfo simplifiedResourceInfo) {
+        return Uni.createFrom().item(
+                () -> Response.status(412).entity(uriInfo.getPath() + "->" + simplifiedResourceInfo.getMethodName()).build());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyException.java
new file mode 100644
index 0000000000000..e5f87e4e1b52f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyException.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+public class MyException extends RuntimeException {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherException.java
new file mode 100644
index 0000000000000..87bef48447f45
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherException.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+public class MyOtherException extends RuntimeException {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java
new file mode 100644
index 0000000000000..0a1c98478e940
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/MyOtherExceptionMapper.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+import io.vertx.ext.web.RoutingContext;
+
+public class MyOtherExceptionMapper {
+
+    private final SomeBean someBean;
+
+    public MyOtherExceptionMapper(SomeBean someBean) {
+        this.someBean = someBean;
+    }
+
+    @ServerExceptionMapper
+    public Response handleMyOtherException(RoutingContext routingContext, MyOtherException myOtherException,
+            SimpleResourceInfo simplifiedResourceInfo) {
+        return Response.status(411).build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java
new file mode 100644
index 0000000000000..6828d312ce205
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SecondResource.java
@@ -0,0 +1,36 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("second")
+public class SecondResource {
+
+    @GET
+    @Produces("text/plain")
+    public String throwsMyException() {
+        throw new MyException();
+    }
+
+    @GET
+    @Path("other")
+    @Produces("text/plain")
+    public String throwsMyOtherException() {
+        throw new MyOtherException();
+    }
+
+    @GET
+    @Path("uni")
+    @Produces("text/plain")
+    public String throwsUniException() {
+        throw new UniException();
+    }
+
+    @GET
+    @Path("extendsUni")
+    @Produces("text/plain")
+    public String throwsExtendsUniException() {
+        throw new ExtendsUniException();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java
new file mode 100644
index 0000000000000..1810de1ee9a11
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/SomeBean.java
@@ -0,0 +1,7 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import javax.inject.Singleton;
+
+@Singleton
+public class SomeBean {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniException.java
new file mode 100644
index 0000000000000..4b5bbdfb555f0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniException.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+public class UniException extends RuntimeException {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java
new file mode 100644
index 0000000000000..3005fd23e7790
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customexceptions/UniExceptionMapper.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.customexceptions;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+import io.smallrye.mutiny.Uni;
+
+public class UniExceptionMapper {
+
+    @ServerExceptionMapper(UniException.class)
+    Uni<Response> handleUni() {
+        return Uni.createFrom().deferred(() -> Uni.createFrom().item(Response.status(413).build()));
+    }
+
+    @ServerExceptionMapper(ExtendsUniException.class)
+    Uni<Response> handleExtendsUni() {
+        return Uni.createFrom().deferred(() -> Uni.createFrom().item(Response.status(414).build()));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AbortingFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AbortingFiltersTest.java
new file mode 100644
index 0000000000000..f8a6e85cb4810
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AbortingFiltersTest.java
@@ -0,0 +1,45 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static org.hamcrest.Matchers.containsString;
+
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class AbortingFiltersTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(CustomContainerRequestFilter.class, CustomFiltersResource.class, ResponseFilter.class,
+                                    OptionalRequestFilter.class, IllegalStateExceptionMapper.class);
+                }
+            });
+
+    @Test
+    public void testFilters() {
+        RestAssured.given().header("some-input", "bar").get("/custom/req")
+                .then().statusCode(200).body(containsString("/custom/req-bar")).extract().headers();
+    }
+
+    @Test
+    public void testOptionalFilter() {
+        RestAssured.given().header("optional-input", "abort").get("/custom/req")
+                .then().statusCode(204);
+    }
+
+    @Test
+    public void testResponseFilter() {
+        RestAssured.given().header("response-input", "abort").get("/custom/req")
+                .then().statusCode(202).body(containsString("abort"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java
new file mode 100644
index 0000000000000..b865853d01fb4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/AssertContainerFilter.java
@@ -0,0 +1,68 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Request;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveSimplifiedResourceInfo;
+import org.jboss.resteasy.reactive.server.jaxrs.RequestImpl;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+
+import io.quarkus.resteasy.reactive.server.runtime.filters.PreventAbortResteasyReactiveContainerRequestContext;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Used only to ensure that the proper types are passed to the method and that CDI integrations work properly
+ */
+public class AssertContainerFilter {
+
+    private final SomeBean someBean;
+
+    public static final AtomicInteger COUNT = new AtomicInteger(0);
+
+    public AssertContainerFilter(SomeBean someBean) {
+        this.someBean = someBean;
+    }
+
+    @ServerRequestFilter
+    public void whatever(Request request, HttpServerRequest httpServerRequest, SimpleResourceInfo simplifiedResourceInfo,
+            ResourceInfo resourceInfo, ResteasyReactiveContainerRequestContext resteasyReactiveContainerRequestContext,
+            ContainerRequestContext containerRequestContext, RoutingContext routingContext) {
+        assertNotNull(someBean);
+        assertTrue(RequestImpl.class.isAssignableFrom(request.getClass()));
+        assertNotNull(httpServerRequest);
+        assertTrue(ResteasyReactiveSimplifiedResourceInfo.class.isAssignableFrom(simplifiedResourceInfo.getClass()));
+        assertTrue(ResteasyReactiveResourceInfo.class.isAssignableFrom(resourceInfo.getClass()));
+        assertNotNull(resteasyReactiveContainerRequestContext);
+        assertTrue(
+                PreventAbortResteasyReactiveContainerRequestContext.class.isAssignableFrom(containerRequestContext.getClass()));
+        assertNotNull(routingContext);
+        COUNT.incrementAndGet();
+    }
+
+    @ServerRequestFilter
+    public void another() {
+        assertNotNull(someBean);
+        COUNT.incrementAndGet();
+    }
+
+    @ServerResponseFilter
+    public void response(ResteasyReactiveContainerRequestContext resteasyReactiveContainerRequestContext,
+            ContainerResponseContext containerResponseContext) {
+        assertNotNull(someBean);
+        assertNotNull(resteasyReactiveContainerRequestContext);
+        assertNotNull(containerResponseContext);
+        COUNT.incrementAndGet();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java
new file mode 100644
index 0000000000000..a8cb35b49f93d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerRequestFilter.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+public class CustomContainerRequestFilter {
+
+    @ServerRequestFilter
+    public void whatever(UriInfo uriInfo, HttpHeaders httpHeaders, ContainerRequestContext requestContext) {
+        String customHeaderValue = uriInfo.getPath() + "-" + httpHeaders.getHeaderString("some-input");
+        requestContext.getHeaders().putSingle("custom-header", customHeaderValue);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java
new file mode 100644
index 0000000000000..5490af21c2b1e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomContainerResponseFilter.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+import io.quarkus.resteasy.reactive.server.runtime.filters.PreventAbortResteasyReactiveContainerRequestContext;
+
+public class CustomContainerResponseFilter {
+
+    @ServerResponseFilter
+    public void whatever(SimpleResourceInfo simplifiedResourceInfo, ContainerResponseContext responseContext,
+            ContainerRequestContext requestContext, Throwable t) {
+        assertTrue(
+                PreventAbortResteasyReactiveContainerRequestContext.class.isAssignableFrom(requestContext.getClass()));
+        assertNull(t);
+        if (simplifiedResourceInfo != null) {
+            responseContext.getHeaders().putSingle("java-method", simplifiedResourceInfo.getMethodName());
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java
new file mode 100644
index 0000000000000..6d304cfd13cb1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersResource.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
+@Path("/custom")
+public class CustomFiltersResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("req")
+    public String filters(@Context HttpHeaders headers) {
+        return headers.getHeaderString("custom-header") + "-" + headers.getHeaderString("heavy");
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("metal")
+    @Metal
+    public String metal(@Context HttpHeaders headers) {
+        return headers.getHeaderString("custom-header") + "-" + headers.getHeaderString("heavy");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersTest.java
new file mode 100644
index 0000000000000..70eefc488faf0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/CustomFiltersTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.Headers;
+
+public class CustomFiltersTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(CustomContainerRequestFilter.class, CustomFiltersResource.class,
+                                    CustomContainerResponseFilter.class, AssertContainerFilter.class, SomeBean.class,
+                                    Metal.class, MetalFilter.class);
+                }
+            });
+
+    @Test
+    public void testFilters() {
+        Headers headers = RestAssured.given().header("some-input", "bar").get("/custom/req")
+                .then().statusCode(200).body(Matchers.containsString("/custom/req-bar-null")).extract().headers();
+        assertThat(headers.getValues("java-method")).containsOnly("filters");
+        Assertions.assertEquals(3, AssertContainerFilter.COUNT.get());
+
+        headers = RestAssured.given().header("some-input", "bar").get("/custom/metal")
+                .then().statusCode(200).body(Matchers.containsString("/custom/metal-bar-metal")).extract().headers();
+        assertThat(headers.getValues("java-method")).containsOnly("metal");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java
new file mode 100644
index 0000000000000..ccf1cf947b68b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/IllegalStateExceptionMapper.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class IllegalStateExceptionMapper implements ExceptionMapper<IllegalStateException> {
+
+    @Override
+    public Response toResponse(IllegalStateException exception) {
+        return Response.serverError().entity(exception.getMessage()).build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java
new file mode 100644
index 0000000000000..77ecdd13b77d6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/Metal.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.ws.rs.NameBinding;
+
+@NameBinding
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface Metal {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java
new file mode 100644
index 0000000000000..f23d62aa2dfef
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/MetalFilter.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.container.ContainerRequestContext;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+public class MetalFilter {
+
+    @Metal
+    @ServerRequestFilter
+    public void headBang(ContainerRequestContext requestContext) {
+        requestContext.getHeaders().putSingle("heavy", "metal");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java
new file mode 100644
index 0000000000000..bcac985db195e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/OptionalRequestFilter.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import java.util.Optional;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+public class OptionalRequestFilter {
+
+    @ServerRequestFilter
+    public Optional<Response> filter(HttpHeaders httpHeaders) {
+        String optionalHeader = httpHeaders.getHeaderString("optional-input");
+        if ("abort".equals(optionalHeader)) {
+            return Optional.of(Response.noContent().build());
+        }
+        return Optional.empty();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java
new file mode 100644
index 0000000000000..f4e268df210c9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/ResponseFilter.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+public class ResponseFilter {
+
+    @ServerRequestFilter
+    public Response aborting(HttpHeaders httpHeaders) {
+        String abortInputHeader = httpHeaders.getHeaderString("response-input");
+        if ("abort".equals(abortInputHeader)) {
+            return Response.accepted().entity(abortInputHeader).build();
+        }
+        return null;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java
new file mode 100644
index 0000000000000..2ce396ebb6bbd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/SomeBean.java
@@ -0,0 +1,7 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.inject.Singleton;
+
+@Singleton
+public class SomeBean {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniException.java
new file mode 100644
index 0000000000000..9a14464142af1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniException.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+public class UniException extends RuntimeException {
+
+    private final String input;
+
+    public UniException(String input) {
+        super("Failed with input: " + input);
+        this.input = input;
+    }
+
+    public String getInput() {
+        return input;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java
new file mode 100644
index 0000000000000..5d6c7d67da507
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniExceptionMapper.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class UniExceptionMapper implements ExceptionMapper<UniException> {
+
+    @Override
+    public Response toResponse(UniException exception) {
+        return Response.accepted(exception.getInput()).build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java
new file mode 100644
index 0000000000000..bb6a3da6e2e4e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersResource.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
+@Path("uni")
+public class UniFiltersResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("req")
+    public String filters(@Context HttpHeaders headers) {
+        return headers.getHeaderString("custom-uni-header");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersTest.java
new file mode 100644
index 0000000000000..feee7298206e4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniFiltersTest.java
@@ -0,0 +1,56 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.Headers;
+
+public class UniFiltersTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(UniVoidRequestFilter.class, UniResponseRequestFilter.class, UniResponseFilter.class,
+                                    UniException.class, UniExceptionMapper.class,
+                                    UniFiltersResource.class);
+                }
+            });
+
+    @Test
+    public void testUniVoid() {
+        Headers headers = RestAssured.given().header("some-uni-input", "bar").get("/uni/req")
+                .then().statusCode(200).body(Matchers.containsString("/uni/req-bar")).extract().headers();
+        assertThat(headers.getValues("java-method")).containsOnly("filters");
+    }
+
+    @Test
+    public void testUniVoidThrowingException() {
+        RestAssured.given().header("some-uni-exception-input", "whatever").get("/uni/req")
+                .then().statusCode(202).body(Matchers.containsString("whatever"));
+    }
+
+    @Test
+    public void testUniResponseReturningNull() {
+        Headers headers = RestAssured.given().header("some-other-uni-input", "bar").get("/uni/req")
+                .then().statusCode(200).body(Matchers.containsString("/uni/req-bar")).extract().headers();
+        assertThat(headers.getValues("java-method")).containsOnly("filters");
+    }
+
+    @Test
+    public void testUniVoidReturningResponse() {
+        RestAssured.given().header("some-other-uni-exception-input", "whatever").get("/uni/req")
+                .then().statusCode(500).body(Matchers.containsString("whatever"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java
new file mode 100644
index 0000000000000..68f8bb0af9588
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseFilter.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.container.ContainerResponseContext;
+
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+import io.smallrye.mutiny.Uni;
+
+public class UniResponseFilter {
+
+    @ServerResponseFilter
+    Uni<Void> filter(SimpleResourceInfo simplifiedResourceInfo,
+            ContainerResponseContext responseContext) {
+        if (simplifiedResourceInfo != null) {
+            return Uni.createFrom().deferred(() -> {
+                responseContext.getHeaders().putSingle("java-method", simplifiedResourceInfo.getMethodName());
+                return Uni.createFrom().nullItem();
+            });
+        }
+        return Uni.createFrom().nullItem();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java
new file mode 100644
index 0000000000000..27b3e2fe057b7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniResponseRequestFilter.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+import io.smallrye.mutiny.Uni;
+
+public class UniResponseRequestFilter {
+
+    @ServerRequestFilter
+    Uni<Response> uniResponse(UriInfo uriInfo, HttpHeaders httpHeaders, ContainerRequestContext requestContext) {
+        String exceptionHeader = httpHeaders.getHeaderString("some-other-uni-exception-input");
+        if ((exceptionHeader != null) && !exceptionHeader.isEmpty()) {
+            return Uni.createFrom().item(Response.serverError().entity(exceptionHeader).build());
+        }
+        return Uni.createFrom().deferred(() -> {
+            String inputHeader = httpHeaders.getHeaderString("some-other-uni-input");
+            if (inputHeader != null) {
+                requestContext.getHeaders().putSingle("custom-uni-header", uriInfo.getPath() + "-" + inputHeader);
+            }
+            return Uni.createFrom().nullItem();
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java
new file mode 100644
index 0000000000000..97f69fc993c50
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/UniVoidRequestFilter.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+
+import io.smallrye.mutiny.Uni;
+
+public class UniVoidRequestFilter {
+
+    @ServerRequestFilter
+    Uni<Void> uniVoid(UriInfo uriInfo, HttpHeaders httpHeaders, ContainerRequestContext requestContext) {
+        String exceptionHeader = httpHeaders.getHeaderString("some-uni-exception-input");
+        if ((exceptionHeader != null) && !exceptionHeader.isEmpty()) {
+            return Uni.createFrom().failure(new UniException(exceptionHeader));
+        }
+        return Uni.createFrom().deferred(() -> {
+            String inputHeader = httpHeaders.getHeaderString("some-uni-input");
+            if (inputHeader != null) {
+                requestContext.getHeaders().putSingle("custom-uni-header", uriInfo.getPath() + "-" + inputHeader);
+            }
+            return Uni.createFrom().nullItem();
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java
new file mode 100644
index 0000000000000..14529e614572f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormData.java
@@ -0,0 +1,54 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.RestForm;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+
+public class FormData extends FormDataBase {
+
+    @RestForm
+    // don't set a part type, use the default
+    private String name;
+
+    @RestForm
+    @PartType(MediaType.TEXT_PLAIN)
+    private Status status;
+
+    @RestForm("htmlFile")
+    private FileUpload htmlPart;
+
+    @RestForm("xmlFile")
+    public Path xmlPart;
+
+    @RestForm
+    public File txtFile;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public FileUpload getHtmlPart() {
+        return htmlPart;
+    }
+
+    public void setHtmlPart(FileUpload htmlPart) {
+        this.htmlPart = htmlPart;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java
new file mode 100644
index 0000000000000..0a25134a4538a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/FormDataBase.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.RestForm;
+
+import io.quarkus.resteasy.reactive.server.test.multipart.other.OtherPackageFormDataBase;
+
+abstract class FormDataBase extends OtherPackageFormDataBase {
+    @RestForm
+    @PartType(MediaType.TEXT_PLAIN)
+    boolean active;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartInputTest.java
new file mode 100644
index 0000000000000..7d8e32aa2a098
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartInputTest.java
@@ -0,0 +1,138 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.multipart.other.OtherPackageFormDataBase;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class MultipartInputTest {
+
+    private static final Path uploadDir = Paths.get("file-uploads");
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(FormDataBase.class, OtherPackageFormDataBase.class, FormData.class, Status.class,
+                                    OtherFormData.class,
+                                    OtherFormDataBase.class,
+                                    MultipartResource.class, OtherMultipartResource.class)
+                            .addAsResource(new StringAsset(
+                                    // keep the files around so we can assert the outcome
+                                    "quarkus.http.body.delete-uploaded-files-on-end=false\nquarkus.http.body.uploads-directory="
+                                            + uploadDir.toString() + "\n"),
+                                    "application.properties");
+                }
+
+            });
+
+    private final File HTML_FILE = new File("./src/test/resources/test.html");
+    private final File XML_FILE = new File("./src/test/resources/test.html");
+    private final File TXT_FILE = new File("./src/test/resources/lorem.txt");
+
+    @BeforeEach
+    public void assertEmptyUploads() {
+        Assertions.assertEquals(0, uploadDir.toFile().listFiles().length);
+    }
+
+    @AfterEach
+    public void clearDirectory() {
+        for (File file : uploadDir.toFile().listFiles()) {
+            if (!file.isDirectory()) {
+                file.delete();
+            }
+        }
+    }
+
+    @Test
+    public void testSimple() {
+        RestAssured.given()
+                .multiPart("name", "Alice")
+                .multiPart("active", "true")
+                .multiPart("num", "25")
+                .multiPart("status", "WORKING")
+                .multiPart("htmlFile", HTML_FILE, "text/html")
+                .multiPart("xmlFile", XML_FILE, "text/xml")
+                .multiPart("txtFile", TXT_FILE, "text/plain")
+                .accept("text/plain")
+                .when()
+                .post("/multipart/simple/2")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Alice - true - 50 - WORKING - text/html - true - true"));
+
+        // ensure that the 3 uploaded files where created on disk
+        Assertions.assertEquals(3, uploadDir.toFile().listFiles().length);
+    }
+
+    @Test
+    public void testBlocking() throws IOException {
+        RestAssured.given()
+                .multiPart("name", "Trudy")
+                .multiPart("num", "20")
+                .multiPart("status", "SLEEPING")
+                .multiPart("htmlFile", HTML_FILE, "text/html")
+                .multiPart("xmlFile", XML_FILE, "text/xml")
+                .multiPart("txtFile", TXT_FILE, "text/plain")
+                .accept("text/plain")
+                .when()
+                .post("/multipart/blocking?times=2")
+                .then()
+                .statusCode(200)
+                .body(equalTo("Trudy - 40 - SLEEPING"))
+                .header("html-size", equalTo(fileSizeAsStr(HTML_FILE)))
+                // test that file was actually upload and that the web application isn't sharing the file with the test...
+                .header("html-path", not(equalTo(filePath(HTML_FILE))))
+                .header("xml-size", equalTo(fileSizeAsStr(XML_FILE)))
+                .header("xml-path", not(equalTo(filePath(XML_FILE))))
+                .header("txt-size", equalTo(fileSizeAsStr(TXT_FILE)))
+                .header("txt-path", not(equalTo(filePath(TXT_FILE))));
+
+        // ensure that the 3 uploaded files where created on disk
+        Assertions.assertEquals(3, uploadDir.toFile().listFiles().length);
+    }
+
+    @Test
+    public void testOther() {
+        RestAssured.given()
+                .multiPart("first", "foo")
+                .multiPart("last", "bar")
+                .accept("text/plain")
+                .when()
+                .post("/otherMultipart/simple")
+                .then()
+                .statusCode(200)
+                .body(equalTo("foo - bar - final - static"));
+
+        Assertions.assertEquals(0, uploadDir.toFile().listFiles().length);
+    }
+
+    private String filePath(File file) {
+        return file.toPath().toAbsolutePath().toString();
+    }
+
+    private String fileSizeAsStr(File file) throws IOException {
+        return "" + Files.readAllBytes(file.toPath()).length;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java
new file mode 100644
index 0000000000000..1ee71f45bff66
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/MultipartResource.java
@@ -0,0 +1,56 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.MultipartForm;
+import org.jboss.resteasy.reactive.RestQuery;
+
+import io.quarkus.runtime.BlockingOperationControl;
+import io.smallrye.common.annotation.Blocking;
+
+@Path("/multipart")
+public class MultipartResource {
+
+    @POST
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("/simple/{times}")
+    public String simple(@MultipartForm FormData formData, Integer times) {
+        if (BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return formData.getName() + " - " + formData.active + " - " + times * formData.getNum() + " - " + formData.getStatus()
+                + " - "
+                + formData.getHtmlPart().contentType() + " - " + Files.exists(formData.xmlPart) + " - "
+                + formData.txtFile.exists();
+    }
+
+    @POST
+    @Blocking
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Path("/blocking")
+    public Response blocking(@DefaultValue("1") @RestQuery Integer times, @MultipartForm FormData formData) throws IOException {
+        if (!BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return Response.ok(formData.getName() + " - " + times * formData.getNum() + " - " + formData.getStatus())
+                .header("html-size", formData.getHtmlPart().size())
+                .header("html-path", formData.getHtmlPart().uploadedFile().toAbsolutePath().toString())
+                .header("xml-size", Files.readAllBytes(formData.xmlPart).length)
+                .header("xml-path", formData.xmlPart.toAbsolutePath().toString())
+                .header("txt-size", Files.readAllBytes(formData.txtFile.toPath()).length)
+                .header("txt-path", formData.txtFile.toPath().toAbsolutePath().toString())
+                .build();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormData.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormData.java
new file mode 100644
index 0000000000000..46529e3ff2ce6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormData.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import org.jboss.resteasy.reactive.RestForm;
+
+public class OtherFormData extends OtherFormDataBase {
+
+    public static String staticField = "static";
+
+    public final String finalField = "final";
+
+    @RestForm
+    public String last;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java
new file mode 100644
index 0000000000000..27549010a8804
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherFormDataBase.java
@@ -0,0 +1,9 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import javax.ws.rs.FormParam;
+
+public class OtherFormDataBase {
+
+    @FormParam("first")
+    public String first;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java
new file mode 100644
index 0000000000000..1e4df1fcc2336
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/OtherMultipartResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.MultipartForm;
+
+@Path("/otherMultipart")
+public class OtherMultipartResource {
+
+    @Path("simple")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @POST
+    public String simple(@MultipartForm OtherFormData formData) {
+        return formData.first + " - " + formData.last + " - " + formData.finalField + " - " + OtherFormData.staticField;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/Status.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/Status.java
new file mode 100644
index 0000000000000..d971c999a79ba
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/Status.java
@@ -0,0 +1,7 @@
+package io.quarkus.resteasy.reactive.server.test.multipart;
+
+public enum Status {
+    SLEEPING,
+    WORKING,
+    EATING;
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java
new file mode 100644
index 0000000000000..f0db1e86e3ea6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/other/OtherPackageFormDataBase.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.test.multipart.other;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.RestForm;
+
+public class OtherPackageFormDataBase {
+
+    @RestForm
+    @PartType(MediaType.TEXT_PLAIN)
+    private int num;
+
+    public int getNum() {
+        return num;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java
new file mode 100644
index 0000000000000..c172e743f13df
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/HelloResource.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.server.test.path;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * Per spec:
+ * <quote>
+ * Paths are relative. For an annotated class the base URI is the application path, see ApplicationPath.
+ * For an annotated method the base URI is the effective URI of the containing class. For the purposes of
+ * absolutizing a path against the base URI , a leading '/' in a path is ignored and base URIs are treated
+ * as if they ended in '/'.
+ * </quote>
+ */
+@Path("hello")
+public class HelloResource {
+
+    @GET
+    public String hello() {
+        return "hello";
+    }
+
+    @GET
+    @Path("/nested")
+    public String nested() {
+        return "world hello";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java
new file mode 100644
index 0000000000000..8d7c22e65d5eb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RelativeRestPathTestCase.java
@@ -0,0 +1,29 @@
+package io.quarkus.resteasy.reactive.server.test.path;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class RelativeRestPathTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .withConfigurationResource("empty.properties")
+            .overrideConfigKey("quarkus.rest.path", "foo")
+            .overrideConfigKey("quarkus.http.root-path", "/app")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(HelloResource.class));
+
+    @Test
+    public void testRestPath() {
+        RestAssured.basePath = "/";
+        // This is expected behavior (relative path appended to HTTP root path)
+        RestAssured.when().get("/app/foo/hello").then().body(Matchers.is("hello"));
+        RestAssured.when().get("/app/foo/hello/nested").then().body(Matchers.is("world hello"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java
new file mode 100644
index 0000000000000..2bdc84d39bd7b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestApplicationPathTestCase.java
@@ -0,0 +1,45 @@
+package io.quarkus.resteasy.reactive.server.test.path;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class RestApplicationPathTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .withConfigurationResource("empty.properties")
+            .overrideConfigKey("quarkus.rest.path", "/foo")
+            .overrideConfigKey("quarkus.http.root-path", "/app")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloResource.class, BarApp.class));
+
+    /**
+     * Using @ApplicationPath will overlay/replace `quarkus.rest.path`.
+     * Per spec:
+     * <quote>
+     * Identifies the application path that serves as the base URI for all resource
+     * URIs provided by Path. May only be applied to a subclass of Application.
+     * </quote>
+     *
+     * This path will also be relative to the configured HTTP root
+     */
+    @ApplicationPath("/bar")
+    public static class BarApp extends Application {
+    }
+
+    @Test
+    public void testRestPath() {
+        RestAssured.basePath = "/";
+        RestAssured.when().get("/app/bar/hello").then().body(Matchers.is("hello"));
+        RestAssured.when().get("/app/bar/hello/nested").then().body(Matchers.is("world hello"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java
new file mode 100644
index 0000000000000..379f4c84644b5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/path/RestPathTestCase.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.server.test.path;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class RestPathTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .withConfigurationResource("empty.properties")
+            .overrideConfigKey("quarkus.rest.path", "/foo")
+            .overrideConfigKey("quarkus.http.root-path", "/app")
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(HelloResource.class));
+
+    @Test
+    public void testRestPath() {
+        RestAssured.basePath = "/";
+        RestAssured.when().get("/app/foo/hello").then().body(Matchers.is("hello"));
+        RestAssured.when().get("/app/foo/hello/nested").then().body(Matchers.is("world hello"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java
new file mode 100644
index 0000000000000..baa56bcbea4a3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortFilterWithLargePayloadTest.java
@@ -0,0 +1,73 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class AbortFilterWithLargePayloadTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(TestResource.class, AbortingFilter.class);
+                    return war;
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.get("/test")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("hello"));
+
+        io.restassured.response.Response response = RestAssured.with().header("abort", "true").get("/test")
+                .then()
+                .statusCode(999).extract().response();
+        Assertions.assertEquals(30464, response.body().asByteArray().length);
+    }
+
+    @Path("/test")
+    public static class TestResource {
+
+        @GET
+        public String hello() {
+            return "hello";
+        }
+    }
+
+    @Provider
+    @PreMatching
+    public static class AbortingFilter implements ContainerRequestFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext) throws IOException {
+            if (requestContext.getHeaderString("abort") != null) {
+                // the magic number of 30464 is where the overflow code path used to fail
+                requestContext.abortWith(
+                        Response.status(999).type(MediaType.APPLICATION_OCTET_STREAM).entity(new byte[30464]).build());
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java
new file mode 100644
index 0000000000000..3f50b252d4c10
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilter.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class AbortingRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        requestContext.abortWith(Response.status(555).entity("aborted").build());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilterTest.java
new file mode 100644
index 0000000000000..008ab10e68334
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/AbortingRequestFilterTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ClassLevelMediaTypeResource;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class AbortingRequestFilterTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(ClassLevelMediaTypeResource.class, AbortingRequestFilter.class);
+                    return war;
+                }
+            });
+
+    @Test
+    public void testAbortingRequestFilter() {
+        RestAssured.get("/test")
+                .then().body(Matchers.equalTo("aborted"))
+                .statusCode(555);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java
new file mode 100644
index 0000000000000..37c72d2c9f23a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/BasicGenericTypesHandlingTest.java
@@ -0,0 +1,164 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Supplier;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class BasicGenericTypesHandlingTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive archive = ShrinkWrap.create(JavaArchive.class);
+                    archive.addClasses(AbstractResource.class, TestResource.class, Input.class, Output.class,
+                            TestMessageBodyReader.class, TestMessageBodyWriter.class);
+                    return archive;
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.with().body("hello").contentType("text/test").post("/test")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("out / hello"));
+    }
+
+    public static abstract class AbstractResource<I, O> {
+
+        protected abstract O convert(I i);
+
+        @POST
+        @Produces("text/test")
+        @Consumes("text/test")
+        public O handle(I i) {
+            return convert(i);
+        }
+    }
+
+    @Path("/test")
+    public static class TestResource extends AbstractResource<Input, Output> {
+
+        @Override
+        protected Output convert(Input input) {
+            return new Output("out / " + input.getInMessage());
+        }
+    }
+
+    public static class Input {
+
+        private final String inMessage;
+
+        public Input(String inMessage) {
+            this.inMessage = inMessage;
+        }
+
+        public String getInMessage() {
+            return inMessage;
+        }
+    }
+
+    public static class Output {
+
+        private final String outMessage;
+
+        public Output(String outMessage) {
+            this.outMessage = outMessage;
+        }
+
+        public String getOutMessage() {
+            return outMessage;
+        }
+    }
+
+    @Provider
+    @Consumes("text/test")
+    public static class TestMessageBodyReader implements ServerMessageBodyReader<Object> {
+
+        @Override
+        public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod,
+                MediaType mediaType) {
+            return genericType.getTypeName().equals(Input.class.getName());
+        }
+
+        @Override
+        public Object readFrom(Class<Object> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+                throws WebApplicationException, IOException {
+            return new Input(MessageReaderUtil.readString(context.getInputStream(), mediaType));
+        }
+
+        @Override
+        public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+            throw new IllegalStateException("should never have been called");
+        }
+
+        @Override
+        public Object readFrom(Class<Object> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+                MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+                throws IOException, WebApplicationException {
+            throw new IllegalStateException("should never have been called");
+        }
+    }
+
+    @Provider
+    @Produces("text/test")
+    public static class TestMessageBodyWriter implements ServerMessageBodyWriter<Object> {
+
+        @Override
+        public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+            return genericType.getTypeName().equals(Output.class.getName());
+        }
+
+        @Override
+        public void writeResponse(Object o, Type genericType, ServerRequestContext context)
+                throws WebApplicationException, IOException {
+            if (genericType.getTypeName().equals(Output.class.getName())) {
+                context.getOrCreateOutputStream().write(((Output) o).getOutMessage().getBytes(StandardCharsets.UTF_8));
+            } else {
+                throw new IllegalStateException("Writer called with generic type: " + genericType.getTypeName());
+            }
+        }
+
+        @Override
+        public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+            throw new IllegalStateException("should never have been called");
+        }
+
+        @Override
+        public void writeTo(Object o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+                MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+                throws IOException, WebApplicationException {
+            throw new IllegalStateException("should never have been called");
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java
new file mode 100644
index 0000000000000..2d62e7ec484c9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ClassLevelMediaTypeTest.java
@@ -0,0 +1,67 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ClassLevelMediaTypeResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+@DisplayName("Class Level Media Type Test")
+public class ClassLevelMediaTypeTest {
+
+    private static Client client;
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, ClassLevelMediaTypeResource.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void after() throws Exception {
+        client.close();
+        client = null;
+    }
+
+    @Test
+    @DisplayName("Test Application Json Media Type")
+    public void testApplicationJsonMediaType() {
+        WebTarget base = client.target(generateURL("/test"));
+        System.err.println(base.getClass());
+        try {
+            Response response = base.request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            String body = response.readEntity(String.class);
+            Assertions.assertEquals(response.getHeaderString("Content-Type"), "application/json");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java
new file mode 100644
index 0000000000000..5512216580c08
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CollectionDefaultValueTest.java
@@ -0,0 +1,68 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.CollectionDefaultValueResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resteasy-client
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Test that empty QueryParam list is empty
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Collection Default Value Test")
+public class CollectionDefaultValueTest {
+
+    static Client client;
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(CollectionDefaultValueResource.class, PortProviderUtil.class);
+                    return war;
+                }
+            });
+
+    @BeforeEach
+    public void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterEach
+    public void after() throws Exception {
+        client.close();
+    }
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, CollectionDefaultValueTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Test that empty QueryParam list is empty
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Empty")
+    public void testEmpty() throws Exception {
+        Response response = client.target(generateURL("/collection")).request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        response.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java
new file mode 100644
index 0000000000000..7eecdbe29d195
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/CovariantReturnSubresourceLocatorsTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.CovariantReturnSubresourceLocatorsRootProxy;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.CovariantReturnSubresourceLocatorsSubProxy;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.CovariantReturnSubresourceLocatorsSubProxyRootImpl;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.CovariantReturnSubresourceLocatorsSubProxySubImpl;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Test return value of covariant with locators.
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Covariant Return Subresource Locators Test")
+public class CovariantReturnSubresourceLocatorsTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(CovariantReturnSubresourceLocatorsRootProxy.class, PortProviderUtil.class,
+                            CovariantReturnSubresourceLocatorsSubProxy.class);
+                    war.addClasses(CovariantReturnSubresourceLocatorsSubProxyRootImpl.class,
+                            CovariantReturnSubresourceLocatorsSubProxySubImpl.class);
+                    return war;
+                }
+            });
+
+    /**
+     * @tpTestDetails Test basic path
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Basic Test")
+    public void basicTest() {
+        Client client = ClientBuilder.newClient();
+        Response response = client.target(
+                PortProviderUtil.generateURL("/path/sub/xyz", CovariantReturnSubresourceLocatorsTest.class.getSimpleName()))
+                .request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("Boo! - xyz", response.readEntity(String.class), "Wrong content of response");
+        response.close();
+        client.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java
new file mode 100644
index 0000000000000..bb2dc56fd6271
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/DefaultMediaTypeTest.java
@@ -0,0 +1,220 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.ByteArrayOutputStream;
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.DefaultMediaTypeCustomObject;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.DefaultMediaTypeResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Regression test for JBEAP-2847. DefaultTextPlain should be used, if produce annotation annotation is not
+ *                    used in end-point.
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Default Media Type Test")
+public class DefaultMediaTypeTest {
+
+    private final Logger LOG = Logger.getLogger(DefaultMediaTypeResource.class.getName());
+
+    static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(DefaultMediaTypeCustomObject.class);
+                    war.addClasses(PortProviderUtil.class, DefaultMediaTypeResource.class);
+                    return war;
+                }
+            });
+
+    @BeforeEach
+    public void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterEach
+    public void after() throws Exception {
+        client.close();
+        client = null;
+    }
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, DefaultMediaTypeResource.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Test Date object with produce annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Post Date Produce")
+    public void postDateProduce() throws Exception {
+        WebTarget target = client.target(generateURL("/postDateProduce"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test Date object without produce annotation
+     *                https://issues.jboss.org/browse/RESTEASY-1403
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+
+    @DisplayName("Post Date")
+    public void postDate() throws Exception {
+        WebTarget target = client.target(generateURL("/postDate"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(),
+                response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test Foo object with produce annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Post Foo Produce")
+    public void postFooProduce() throws Exception {
+        WebTarget target = client.target(generateURL("/postFooProduce"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test Foo object without produce annotation
+     *                https://issues.jboss.org/browse/RESTEASY-1403
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+
+    @DisplayName("Post Foo")
+    public void postFoo() throws Exception {
+        WebTarget target = client.target(generateURL("/postFoo"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(),
+                response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test int primitive with produce annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Post Int Produce")
+    public void postIntProduce() throws Exception {
+        WebTarget target = client.target(generateURL("/postIntProduce"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test int primitive without produce annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Post Int")
+    public void postInt() throws Exception {
+        WebTarget target = client.target(generateURL("/postInt"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(),
+                response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test Integer object with produce annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Post Integer Produce")
+    public void postIntegerProduce() throws Exception {
+        WebTarget target = client.target(generateURL("/postIntegerProduce"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+
+    /**
+     * @tpTestDetails Test Integer object without produce annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Post Integer")
+    public void postInteger() throws Exception {
+        WebTarget target = client.target(generateURL("/postInteger"));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(5000);
+        for (int i = 0; i < 5000; i++) {
+            baos.write(i);
+        }
+        Response response = target.request().post(Entity.entity(baos.toByteArray(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(),
+                response.getStatus());
+        String responseContent = response.readEntity(String.class);
+        LOG.debug(String.format("Response: %s", responseContent));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java
new file mode 100644
index 0000000000000..02591a9c0d04a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericEntityTest.java
@@ -0,0 +1,120 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericEntityDoubleWriter;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericEntityFloatWriter;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericEntityIntegerServerMessageBodyWriter;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericEntityResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resource
+ * @tpChapter Integration tests
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Generic Entity Test")
+public class GenericEntityTest {
+
+    static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, GenericEntityResource.class, GenericEntityDoubleWriter.class,
+                            GenericEntityFloatWriter.class, GenericEntityIntegerServerMessageBodyWriter.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void after() throws Exception {
+        client.close();
+        client = null;
+    }
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, GenericEntityTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Resource returning GenericEntity with custom MessageBodyWriter returning double values
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Doubles")
+    public void testDoubles() {
+        WebTarget base = client.target(generateURL("/doubles"));
+        try {
+            Response response = base.request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            String body = response.readEntity(String.class);
+            Assertions.assertEquals("45.0D 50.0D ", body, "The response doesn't contain the expected entity");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * @tpTestDetails Resource returning GenericEntity with custom MessageBodyWriter returning float values
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Floats")
+    public void testFloats() {
+        WebTarget base = client.target(generateURL("/floats"));
+        try {
+            Response response = base.request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            String body = response.readEntity(String.class);
+            Assertions.assertEquals("45.0F 50.0F ", body, "The response doesn't contain the expected entity");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    public void testIntegers() {
+        doTestIntegers("/integers");
+    }
+
+    @Test
+    public void testIntegersNoResponse() {
+        doTestIntegers("/integers-no-response");
+    }
+
+    private void doTestIntegers(String path) {
+        WebTarget base = client.target(generateURL(path));
+        try {
+            Response response = base.request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            String body = response.readEntity(String.class);
+            Assertions.assertEquals("45I 50I ", body, "The response doesn't contain the expected entity");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java
new file mode 100644
index 0000000000000..4c3a334ee5e51
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/GenericResourceTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericResourceCrudResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericResourceStudent;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericResourceStudentCrudResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericResourceStudentInterface;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericResourceStudentReader;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GenericResourceStudentWriter;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resource
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Tests generic resource class
+ * @tpSince RESTEasy 3.0.20
+ */
+@DisplayName("Generic Resource Test")
+public class GenericResourceTest {
+
+    private static WebTarget proxy;
+
+    @BeforeAll
+    public static void setup() {
+        WebTarget target = ClientBuilder.newClient().target(generateURL(""));
+        proxy = target.register(GenericResourceStudentReader.class).register(GenericResourceStudentWriter.class);
+    }
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(GenericResourceStudent.class);
+                    war.addClass(PortProviderUtil.class);
+                    war.addClass(GenericResourceStudentInterface.class);
+                    war.addClass(GenericResourceCrudResource.class);
+                    war.addClasses(GenericResourceStudentCrudResource.class, GenericResourceStudentReader.class,
+                            GenericResourceStudentWriter.class);
+                    return war;
+                }
+            });
+
+    private static String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, GenericResourceTest.class.getSimpleName());
+    }
+
+    @Test
+    @DisplayName("Test Get")
+    @Disabled
+    public void testGet() {
+        //Assertions.assertTrue(proxy.get(1).getName().equals("Jozef Hartinger"));
+    }
+
+    @Test
+    @DisplayName("Test Put")
+    @Disabled
+    public void testPut() {
+        //proxy.put(2, new GenericResourceStudent("John Doe"));
+        //Assertions.assertTrue(proxy.get(2).getName().equals("John Doe"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java
new file mode 100644
index 0000000000000..9f5dfc24c994f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/HttpHeadersTest.java
@@ -0,0 +1,81 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.HttpHeadersResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Spec requires that HEAD and OPTIONS are handled in a default manner
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Http Headers Test")
+public class HttpHeadersTest {
+
+    static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, HttpHeadersResource.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void close() {
+        client.close();
+    }
+
+    private static String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, HttpHeadersTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Client invokes GET request on a sub resource at /HeadersTest/sub2
+     *                with Accept MediaType and Content-Type Headers set;
+     *                Verify that HttpHeaders got the property set by the request
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Request Headers Test")
+    public void RequestHeadersTest() throws Exception {
+        String errorMessage = "Wrong content of response";
+        Response response = client.target(generateURL("/HeadersTest/headers")).request()
+                .header("Accept", "text/plain, text/html, text/html;level=1, */*")
+                .header("Content-Type", "application/xml;charset=utf8").get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        String content = response.readEntity(String.class);
+        Assertions.assertTrue(-1 < content.indexOf("Accept:"));
+        Assertions.assertTrue(-1 < content.indexOf("Content-Type:"));
+        Assertions.assertTrue(-1 < content.indexOf("application/xml"));
+        Assertions.assertTrue(-1 < content.indexOf("charset=utf8"));
+        Assertions.assertTrue(-1 < content.indexOf("text/html"));
+        Assertions.assertTrue(-1 < content.indexOf("*/*"));
+        response.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java
new file mode 100644
index 0000000000000..b0ddccd8a5426
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/InheritanceTest.java
@@ -0,0 +1,70 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.InheritenceParentResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.InheritenceParentResourceImpl;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resource
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Tests annotation inheritence from interface.
+ * @tpSince RESTEasy 3.0.20
+ */
+@DisplayName("Inheritance Test")
+public class InheritanceTest {
+
+    private static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(InheritenceParentResource.class);
+                    war.addClasses(PortProviderUtil.class, InheritenceParentResourceImpl.class);
+                    return war;
+                }
+            });
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, InheritanceTest.class.getSimpleName());
+    }
+
+    @BeforeAll
+    public static void beforeSub() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void afterSub() {
+        client.close();
+    }
+
+    @Test
+    @DisplayName("Test 1")
+    public void Test1() throws Exception {
+        Builder builder = client.target(generateURL("/InheritanceTest")).request();
+        builder.header("Accept", "text/plain");
+        Response response = builder.get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals(response.readEntity(String.class), "First");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java
new file mode 100644
index 0000000000000..2831fe1e20281
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MatchedResourceTest.java
@@ -0,0 +1,114 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MatchedResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Regression tests for RESTEASY-549 and RESTEASY-537
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Matched Resource Test")
+public class MatchedResourceTest {
+
+    static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(MatchedResource.class, PortProviderUtil.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void close() {
+        client.close();
+    }
+
+    private static String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, MatchedResourceTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Regression test for RESTEASY-549
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Empty")
+    public void testEmpty() throws Exception {
+        WebTarget base = client.target(generateURL("/start"));
+        Response response = base.request().post(Entity.text(""));
+        Assertions.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
+        String rtn = response.readEntity(String.class);
+        Assertions.assertEquals("started", rtn);
+        response.close();
+        base = client.target(generateURL("/start"));
+        response = base.request().post(Entity.entity("<xml/>", "application/xml"));
+        Assertions.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode());
+        rtn = response.readEntity(String.class);
+        Assertions.assertEquals("<xml/>", rtn, "Wrong response content");
+        response.close();
+    }
+
+    /**
+     * @tpTestDetails Regression test for RESTEASY-537
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Match")
+    public void testMatch() throws Exception {
+        WebTarget base = client.target(generateURL("/match"));
+        Response response = base.request().header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
+                .get();
+        Assertions.assertEquals("text/html", response.getHeaders().getFirst("Content-Type"));
+        String res = response.readEntity(String.class);
+        Assertions.assertEquals("*/*", res, "Wrong response content");
+        response.close();
+    }
+
+    public void generalPostTest(String uri, String value) {
+        WebTarget base = client.target(uri);
+        Response response = base.request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals(response.readEntity(String.class), value, "Wrong response content");
+    }
+
+    /**
+     * @tpTestDetails Check post request on resource with @GET annotation
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Post")
+    public void testPost() {
+        generalPostTest(generateURL("/test2/foo.xml.en"), "complex2");
+        generalPostTest(generateURL("/test1/foo.xml.en"), "complex");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java
new file mode 100644
index 0000000000000..e883e20e8ddac
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeFromMessageBodyWriterTestMultiple.java
@@ -0,0 +1,133 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MediaTypeFromMessageBodyWriterListAsText;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MediaTypeFromMessageBodyWriterListAsXML;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MediaTypeFromMessageBodyWriterResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resteasy server
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Test that MessageBodyWriters can be consulted for media type
+ * @tpSince RESTEasy 3.1.3.Final
+ */
+@DisplayName("Media Type From Message Body Writer Test")
+public class MediaTypeFromMessageBodyWriterTestMultiple {
+
+    @DisplayName("Target")
+    private static class Target {
+
+        String path;
+
+        String queryName;
+
+        String queryValue;
+
+        Target(final String path, final String queryName, final String queryValue) {
+            this.path = path;
+            this.queryName = queryName;
+            this.queryValue = queryValue;
+        }
+    }
+
+    private static String ACCEPT_CHROME = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8";
+
+    private static String ACCEPT_FIREFOX = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
+
+    private static String ACCEPT_IE11 = "text/html, application/xhtml+xml, */*";
+
+    private static Collection<Target> tgts = new ArrayList<Target>();
+
+    private static Collection<String> accepts = new ArrayList<String>();
+
+    private static Client client;
+
+    static {
+        tgts.add(new Target("java.util.TreeSet", null, null));
+        tgts.add(new Target("fixed", "type", "text/plain"));
+        tgts.add(new Target("fixed", "type", "application/xml"));
+        tgts.add(new Target("variants", null, null));
+        tgts.add(new Target("variantsObject", null, null));
+        accepts.add(ACCEPT_CHROME);
+        accepts.add(ACCEPT_FIREFOX);
+        accepts.add(ACCEPT_IE11);
+        accepts.add("foo/bar,text/plain");
+        accepts.add("foo/bar,*/*");
+        accepts.add("text/plain");
+    }
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, MediaTypeFromMessageBodyWriterListAsText.class,
+                            MediaTypeFromMessageBodyWriterListAsXML.class, MediaTypeFromMessageBodyWriterResource.class);
+                    return war;
+                }
+            });
+
+    @BeforeEach
+    public void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterEach
+    public void after() throws Exception {
+        client.close();
+    }
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, MediaTypeFromMessageBodyWriterTestMultiple.class.getSimpleName());
+    }
+
+    private String generateURLUserCase(String path) {
+        return PortProviderUtil.generateURL(path, MediaTypeFromMessageBodyWriterTestMultiple.class.getSimpleName() + "_single");
+    }
+
+    /**
+     * @tpTestDetails Test that MessageBodyWriters can be consulted for media type
+     * @tpSince RESTEasy 3.1.3.Final
+     */
+    @Test
+    @DisplayName("Test")
+    public void test() throws Exception {
+        WebTarget base = client.target(generateURL(""));
+        Response response = null;
+        for (Target tgt : tgts) {
+            for (String accept : accepts) {
+                if (tgt.queryName != null) {
+                    response = base.path(tgt.path).queryParam(tgt.queryName, tgt.queryValue).request().header("Accept", accept)
+                            .get();
+                } else {
+                    response = base.path(tgt.path).request().header("Accept", accept).get();
+                }
+                Assertions.assertEquals(200, response.getStatus());
+                String s = response.getHeaderString("X-COUNT");
+                Assertions.assertNotNull(s);
+                response.close();
+            }
+        }
+        client.close();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java
new file mode 100644
index 0000000000000..ef9d8da30442f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationClientQualityTest.java
@@ -0,0 +1,112 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+@DisplayName("Media Type Negotiation Client Quality Test")
+public class MediaTypeNegotiationClientQualityTest {
+
+    @Produces({ "application/x;qs=0.9", "application/y;qs=0.7" })
+    @DisplayName("Custom Message Body Writer 1")
+    @Provider
+    public static class CustomMessageBodyWriter1 implements MessageBodyWriter<Object> {
+
+        @Override
+        public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+            return true;
+        }
+
+        @Override
+        public long getSize(Object t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+            return -1;
+        }
+
+        @Override
+        public void writeTo(Object t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+                MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+                throws IOException, WebApplicationException {
+        }
+    }
+
+    @Path("/echo")
+    public static class Resource {
+        @GET
+        public Object nothing() {
+            return new Object();
+        }
+    }
+
+    private static Client client;
+
+    private static final String DEP = "MediaTypeNegotiationClientQualityTest";
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, CustomMessageBodyWriter1.class, Resource.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void setup() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void cleanup() {
+        client.close();
+    }
+
+    private String generateURL() {
+        return PortProviderUtil.generateBaseUrl();
+    }
+
+    @Test
+    @DisplayName("Test Client Quality")
+    public void testClientQuality() throws Exception {
+        Invocation.Builder request = client.target(generateURL()).path("echo").request("application/x;q=0.7",
+                "application/y;q=0.9");
+        Response response = request.get();
+        try {
+            Assertions.assertEquals(Status.OK.getStatusCode(), response.getStatus());
+            MediaType mediaType = response.getMediaType();
+            Assertions.assertEquals(mediaType.getType(), "application");
+            Assertions.assertEquals(mediaType.getSubtype(), "y");
+        } finally {
+            response.close();
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java
new file mode 100644
index 0000000000000..ccb2fd29995cb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MediaTypeNegotiationServerQualityTest.java
@@ -0,0 +1,123 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+@DisplayName("Media Type Negotiation Server Quality Test")
+public class MediaTypeNegotiationServerQualityTest {
+
+    @Produces({ "application/*;qs=0.7", "text/*;qs=0.9" })
+    @DisplayName("Custom Message Body Writter")
+    @Provider
+    public static class CustomMessageBodyWriter implements MessageBodyWriter<Object> {
+
+        @Override
+        public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+            return true;
+        }
+
+        @Override
+        public long getSize(Object t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+            return -1;
+        }
+
+        @Override
+        public void writeTo(Object t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+                MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+                throws IOException, WebApplicationException {
+        }
+    }
+
+    @DisplayName("Not Found Exception Mapper")
+    @Provider
+    public static class NotFoundExceptionMapper implements ExceptionMapper<NotFoundException> {
+
+        @Override
+        public Response toResponse(NotFoundException notFoundException) {
+            return Response.status(Status.NOT_FOUND).entity(new Object()).build();
+        }
+    }
+
+    @Path("/foo")
+    public static class FakeResource {
+        @GET
+        @Path("/fake")
+        public String fake() {
+            return "";
+        }
+    }
+
+    private static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, CustomMessageBodyWriter.class, FakeResource.class,
+                            NotFoundExceptionMapper.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void setup() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void cleanup() {
+        client.close();
+    }
+
+    private String generateURL() {
+        return PortProviderUtil.generateBaseUrl();
+    }
+
+    @Test
+    @DisplayName("Test Server Quality")
+    public void testServerQuality() throws Exception {
+        Invocation.Builder request = client.target(generateURL()).path("foo/echo").request("application/x;", "text/y");
+        Response response = request.get();
+        try {
+            Assertions.assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus());
+            MediaType mediaType = response.getMediaType();
+            Assertions.assertEquals("text", mediaType.getType());
+            Assertions.assertEquals("y", mediaType.getSubtype());
+        } finally {
+            response.close();
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java
new file mode 100644
index 0000000000000..10445e6134867
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultiInterfaceResLocatorTest.java
@@ -0,0 +1,67 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorIntf1;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorIntf2;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorSubresource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Multi Interface Res Locator Test")
+public class MultiInterfaceResLocatorTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(MultiInterfaceResLocatorIntf1.class);
+                    war.addClass(MultiInterfaceResLocatorIntf2.class);
+                    war.addClasses(PortProviderUtil.class, MultiInterfaceResLocatorResource.class,
+                            MultiInterfaceResLocatorSubresource.class);
+                    return war;
+                }
+            });
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, MultiInterfaceResLocatorTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Test for resource with more interfaces.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test")
+    public void test() throws Exception {
+        Client client = ClientBuilder.newClient();
+        Response response = client.target(generateURL("/test/hello1")).request().get();
+        String entity = response.readEntity(String.class);
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("resourceMethod1", entity, "Wrong content of response");
+        response = client.target(generateURL("/test/hello2")).request().get();
+        entity = response.readEntity(String.class);
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("resourceMethod2", entity, "Wrong content of response");
+        client.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java
new file mode 100644
index 0000000000000..c7eaa347e292f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/MultipleAcceptHeaderTest.java
@@ -0,0 +1,134 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.client.ClientBuilder;
+
+import org.jboss.resteasy.reactive.client.impl.ClientImpl;
+import org.jboss.resteasy.reactive.client.impl.WebTargetImpl;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+@DisplayName("Multiple Accept Header Test")
+public class MultipleAcceptHeaderTest {
+
+    protected static String APPLICATION_JSON = "Content-Type: application/json";
+
+    protected static String APPLICATION_XML = "Content-Type: application/xml";
+
+    private TestInterfaceClient service;
+
+    private ClientImpl client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(TestResourceServer.class, PortProviderUtil.class);
+                    return war;
+                }
+            });
+
+    private String generateBaseUrl() {
+        return PortProviderUtil.generateBaseUrl();
+    }
+
+    @Path("/test")
+    @DisplayName("Test Resource Server")
+    public static class TestResourceServer {
+
+        @GET
+        @Path("accept")
+        @Produces("application/json")
+        public String acceptJson() {
+            return APPLICATION_JSON;
+        }
+
+        @GET
+        @Path("accept")
+        @Produces("application/xml, text/plain")
+        public String acceptXml() {
+            return APPLICATION_XML;
+        }
+    }
+
+    @Path("test")
+    @DisplayName("Test Interface Client")
+    interface TestInterfaceClient {
+
+        @GET
+        @Path("accept")
+        @Produces("application/json")
+        String getJson();
+
+        @GET
+        @Path("accept")
+        @Produces("application/xml")
+        String getXml();
+
+        @GET
+        @Path("accept")
+        @Produces({ "application/wrong1", "application/wrong2", "application/xml" })
+        String getXmlMultiple();
+
+        @GET
+        @Path("accept")
+        @Produces({ "application/wrong1", "text/plain" })
+        String getXmlPlainMultiple();
+    }
+
+    @BeforeEach
+    public void setUp() throws Exception {
+        client = (ClientImpl) ClientBuilder.newClient();
+        WebTargetImpl target = (WebTargetImpl) client.target(generateBaseUrl());
+        service = target.proxy(TestInterfaceClient.class);
+    }
+
+    @AfterEach
+    public void tearDown() throws Exception {
+        client.close();
+        client = null;
+    }
+
+    @Test
+    @DisplayName("Test Single Accept Header")
+    public void testSingleAcceptHeader() throws Exception {
+        String result = service.getJson();
+        Assertions.assertEquals(APPLICATION_JSON, result);
+    }
+
+    @Test
+    @DisplayName("Test Single Accept Header 2")
+    public void testSingleAcceptHeader2() throws Exception {
+        String result = service.getXml();
+        Assertions.assertEquals(APPLICATION_XML, result);
+    }
+
+    @Test
+    @DisplayName("Test Multiple Accept Header")
+    public void testMultipleAcceptHeader() throws Exception {
+        String result = service.getXmlMultiple();
+        Assertions.assertEquals(APPLICATION_XML, result);
+    }
+
+    @Test
+    @DisplayName("Test Multiple Accept Header Second Header")
+    public void testMultipleAcceptHeaderSecondHeader() throws Exception {
+        String result = service.getXmlPlainMultiple();
+        Assertions.assertEquals(APPLICATION_XML, result);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java
new file mode 100644
index 0000000000000..4ab152c20d097
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ParameterSubResTest.java
@@ -0,0 +1,123 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ApplicationScopeObject;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorIntf1;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorIntf2;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.MultiInterfaceResLocatorSubresource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResClassSub;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResConcreteSubImpl;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResDoubleInterface;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResGenericInterface;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResGenericSub;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResInternalInterface;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResRoot;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResRootImpl;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResSub;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ParameterSubResSubImpl;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.RequestScopedObject;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Test resources with sub-resources with parameters.
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Parameter Sub Res Test")
+public class ParameterSubResTest {
+
+    static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(MultiInterfaceResLocatorResource.class);
+                    war.addClass(MultiInterfaceResLocatorSubresource.class);
+                    war.addClasses(MultiInterfaceResLocatorIntf1.class);
+                    war.addClasses(MultiInterfaceResLocatorIntf2.class);
+                    war.addClass(ParameterSubResConcreteSubImpl.class);
+                    war.addClass(ParameterSubResDoubleInterface.class);
+                    war.addClass(ParameterSubResGenericInterface.class);
+                    war.addClass(ParameterSubResInternalInterface.class);
+                    war.addClasses(PortProviderUtil.class);
+                    war.addClass(ParameterSubResRoot.class);
+                    war.addClass(ParameterSubResClassSub.class);
+                    war.addClass(ApplicationScopeObject.class);
+                    war.addClass(RequestScopedObject.class);
+                    war.addClass(ParameterSubResSub.class);
+                    war.addClass(ParameterSubResSubImpl.class);
+                    war.addClasses(ParameterSubResRootImpl.class, ParameterSubResGenericSub.class);
+                    return war;
+                }
+            });
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, ParameterSubResTest.class.getSimpleName());
+    }
+
+    @BeforeEach
+    public void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterEach
+    public void after() throws Exception {
+        client.close();
+    }
+
+    /**
+     * @tpTestDetails Check sub resources.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Sub Resource")
+    public void testSubResource() throws Exception {
+        Response response = client.target(generateURL("/path/sub/fred")).request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("Boo! - fred", response.readEntity(String.class), "Wrong content of response");
+    }
+
+    @Test
+    @DisplayName("Test Return Sub Resource As Class")
+    public void testReturnSubResourceAsClass() throws Exception {
+        Response response = client.target(generateURL("/path/subclass")).request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("resourceCounter:1,appscope:1,requestScope:1", response.readEntity(String.class),
+                "Wrong response");
+        response = client.target(generateURL("/path/subclass")).request().get();
+        Assertions.assertEquals("resourceCounter:2,appscope:2,requestScope:1", response.readEntity(String.class),
+                "Wrong response");
+    }
+
+    /**
+     * @tpTestDetails Check root resource.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Root")
+    public void testRoot() throws Exception {
+        Response response = client.target(generateURL("/generic/sub")).queryParam("foo", "42.0").request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals("42.0", response.readEntity(String.class), "Wrong content of response");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ReponseInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ReponseInfoTest.java
new file mode 100644
index 0000000000000..545cad1d85762
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ReponseInfoTest.java
@@ -0,0 +1,72 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResponseInfoResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resource
+ * @tpChapter Integration tests
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Reponse Info Test")
+public class ReponseInfoTest {
+
+    static Client client;
+
+    @BeforeAll
+    public static void before() throws Exception {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void close() {
+        client.close();
+    }
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, ReponseInfoTest.class);
+                    // Use of PortProviderUtil in the deployment
+                    war.addClasses(ResponseInfoResource.class);
+                    return war;
+                }
+            });
+
+    private void basicTest(String path) {
+        WebTarget base = client.target(PortProviderUtil.generateURL(path, ReponseInfoTest.class.getSimpleName()));
+        Response response = base.request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        response.close();
+    }
+
+    /**
+     * @tpTestDetails Check URI location from HTTP headers from response prepared in resource
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Uri Info")
+    public void testUriInfo() throws Exception {
+        basicTest("/simple");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java
new file mode 100644
index 0000000000000..7c60b603e53d7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/ResourceLocatorTest.java
@@ -0,0 +1,148 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorAbstractAnnotationFreeResouce;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorAnnotationFreeSubResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorBaseResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorCollectionResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorDirectory;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorQueueReceiver;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorReceiver;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorRootInterface;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorSubInterface;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorSubresource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorSubresource2;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorSubresource3;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.ResourceLocatorSubresource3Interface;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resource
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Tests path encoding
+ * @tpSince RESTEasy 3.0.20
+ */
+@DisplayName("Resource Locator Test")
+public class ResourceLocatorTest {
+
+    static Client client;
+
+    @BeforeAll
+    public static void setup() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void close() {
+        client.close();
+    }
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(ResourceLocatorQueueReceiver.class).addClass(ResourceLocatorReceiver.class)
+                            .addClass(ResourceLocatorRootInterface.class).addClass(ResourceLocatorSubInterface.class)
+                            .addClass(ResourceLocatorSubresource3Interface.class);
+                    war.addClasses(PortProviderUtil.class, ResourceLocatorAbstractAnnotationFreeResouce.class,
+                            ResourceLocatorAnnotationFreeSubResource.class, ResourceLocatorBaseResource.class,
+                            ResourceLocatorCollectionResource.class, ResourceLocatorDirectory.class,
+                            ResourceLocatorSubresource.class, ResourceLocatorSubresource2.class,
+                            ResourceLocatorSubresource3.class);
+                    return war;
+                }
+            });
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, ResourceLocatorTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Resource locator returns proxied resource.
+     * @tpSince RESTEasy 3.0.20
+     */
+    @Test
+    @DisplayName("Test Proxied Subresource")
+    public void testProxiedSubresource() throws Exception {
+        WebTarget target = client.target(generateURL("/proxy/3"));
+        Response res = target.queryParam("foo", "1.2").queryParam("foo", "1.3").request().get();
+        Assertions.assertEquals(200, res.getStatus());
+        res.close();
+    }
+
+    /**
+     * @tpTestDetails 1) Resource locator returns resource; 2) Resource locator returns resource locator.
+     * @tpSince RESTEasy 3.0.20
+     */
+    @Test
+    @DisplayName("Test Subresource")
+    public void testSubresource() throws Exception {
+        {
+            Response response = client.target(generateURL("/base/1/resources")).request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            Assertions.assertEquals(ResourceLocatorSubresource.class.getName(), response.readEntity(String.class));
+        }
+        {
+            Response response = client.target(generateURL("/base/1/resources/subresource2/stuff/2/bar")).request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            Assertions.assertEquals(ResourceLocatorSubresource2.class.getName() + "-2", response.readEntity(String.class));
+        }
+    }
+
+    /**
+     * @tpTestDetails Two matching metods, one a resource locator, the other a resource method.
+     * @tpSince RESTEasy 3.0.20
+     */
+    @Test
+    @DisplayName("Test Same Uri")
+    public void testSameUri() throws Exception {
+        Response response = client.target(generateURL("/directory/receivers/1")).request().delete();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertEquals(ResourceLocatorDirectory.class.getName(), response.readEntity(String.class));
+    }
+
+    /**
+     * @tpTestDetails Locator returns resource which inherits annotations from an interface.
+     * @tpSince RESTEasy 3.0.20
+     */
+    @Test
+    @DisplayName("Test Annotation Free Subresource")
+    public void testAnnotationFreeSubresource() throws Exception {
+        {
+            Response response = client.target(generateURL("/collection/annotation_free_subresource")).request().get();
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            Assertions.assertEquals(response.readEntity(String.class), "got");
+            Assertions.assertNotNull(response.getHeaderString("Content-Type"));
+            Assertions.assertNotNull(response.getHeaderString("Content-Type"));
+            Assertions.assertEquals(MediaType.TEXT_PLAIN_TYPE.toString(),
+                    response.getHeaderString("Content-Type"));
+        }
+        {
+            Builder request = client.target(generateURL("/collection/annotation_free_subresource")).request();
+            Response response = request.post(Entity.entity("hello!".getBytes(), MediaType.TEXT_PLAIN));
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+            Assertions.assertEquals("posted: hello!", response.readEntity(String.class));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java
new file mode 100644
index 0000000000000..e491fb6b49020
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SpecialResourceTest.java
@@ -0,0 +1,140 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SpecialResourceApiResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SpecialResourceDeleteResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SpecialResourceStreamResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Regression test for RESTEasy issues about special resources
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Special Resource Test")
+public class SpecialResourceTest {
+
+    static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(SpecialResourceStreamResource.class, SpecialResourceApiResource.class,
+                            PortProviderUtil.class,
+                            SpecialResourceDeleteResource.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void init() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void close() {
+        client.close();
+        client = null;
+    }
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, SpecialResourceTest.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Regression test for RESTEASY-631
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test 631")
+    public void test631() throws Exception {
+        WebTarget base = client.target(generateURL("/delete"));
+        Response response = base.request().method("DELETE", Entity.entity("hello", "text/plain"));
+        Assertions.assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
+        response.close();
+    }
+
+    /**
+     * @tpTestDetails Regression test for RESTEASY-534
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test 534")
+    public void test534() throws Exception {
+        WebTarget base = client.target(generateURL("/inputstream/test/json"));
+        Response response = base.request().post(Entity.entity("hello world".getBytes(), MediaType.APPLICATION_OCTET_STREAM));
+        Assertions.assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
+        response.close();
+    }
+
+    /**
+     * @tpTestDetails Regression test for RESTEASY-624
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test 624")
+    public void test624() throws Exception {
+        WebTarget base = client.target(generateURL("/ApI/FuNc"));
+        Response response = base.request().get();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        response.close();
+    }
+
+    /**
+     * @tpTestDetails Regression test for RESTEASY-583
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test 583")
+    public void test583() throws Exception {
+        HttpClient client = HttpClientBuilder.create().build();
+        HttpPut method = new HttpPut(generateURL("/api"));
+        HttpResponse response = null;
+        try {
+            method.setEntity(
+                    new StringEntity("hello", ContentType.create("vnd.net.juniper.space.target-management.targets+xml")));
+            response = client.execute(method);
+            Assertions.assertEquals(response.getStatusLine().getStatusCode(), Response.Status.BAD_REQUEST.getStatusCode());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                if (response != null) {
+                    EntityUtils.consume(response.getEntity());
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java
new file mode 100644
index 0000000000000..2d3cc6ac44fee
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceLocatorTest.java
@@ -0,0 +1,68 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorBaseCrudService;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorBaseService;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorFoo;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorImpFoo;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorOhaUserModel;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorPlatformServiceImpl;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorPlatformServiceResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.SubResourceLocatorUserResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Regression test for RESTEASY-657
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Sub Resource Locator Test")
+public class SubResourceLocatorTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, SubResourceLocatorBaseCrudService.class,
+                            SubResourceLocatorBaseService.class,
+                            SubResourceLocatorFoo.class, SubResourceLocatorOhaUserModel.class,
+                            SubResourceLocatorPlatformServiceResource.class, SubResourceLocatorUserResource.class);
+                    war.addClasses(SubResourceLocatorImpFoo.class, SubResourceLocatorPlatformServiceImpl.class);
+                    return war;
+                }
+            });
+
+    /**
+     * @tpTestDetails Sub resource locator should not fail
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test 657")
+    public void test657() throws Exception {
+        Client client = ClientBuilder.newClient();
+        WebTarget base = client.target(PortProviderUtil.generateURL("/platform/users/89080/data/ada/jsanchez110",
+                SubResourceLocatorTest.class.getSimpleName()));
+        Response response = base.request().get();
+        String s = response.readEntity(String.class);
+        Assertions.assertEquals("bill", s);
+        response.close();
+        client.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java
new file mode 100644
index 0000000000000..2daf58362e5fb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java
@@ -0,0 +1,95 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.resteasy.reactive.RestPath;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class SubResourceRequestFilterTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(RestResource.class, RestSubResource.class, SingleExecutionFilter.class,
+                            MiddleRestResource.class);
+                    return war;
+                }
+            });
+
+    @Test
+    public void testSubResourceFilter() {
+        RestAssured.get("/sub-resource/Bob/Builder")
+                .then()
+                .header("single-filter", Matchers.equalTo("once"))
+                .body(Matchers.equalTo("Bob Builder"))
+                .statusCode(200);
+    }
+
+    @Path("/")
+    public static class RestResource {
+
+        @Inject
+        MiddleRestResource restSubResource;
+
+        @Path("sub-resource/{first}")
+        public MiddleRestResource hello(String first) {
+            return restSubResource;
+        }
+    }
+
+    @ApplicationScoped
+    @Path("/")
+    public static class MiddleRestResource {
+
+        @Inject
+        RestSubResource restSubResource;
+
+        @Path("{last}")
+        public RestSubResource hello() {
+            return restSubResource;
+        }
+    }
+
+    @ApplicationScoped
+    public static class RestSubResource {
+
+        @GET
+        public Response hello(HttpHeaders headers, @RestPath String first, @RestPath String last) {
+            return Response.ok(first + " " + last).header("single-filter", headers.getHeaderString("single-filter")).build();
+        }
+    }
+
+    @Provider
+    public static class SingleExecutionFilter implements ContainerRequestFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext) throws IOException {
+            if (requestContext.getProperty("been.here") != null) {
+                throw new IllegalStateException("Filter should not have been called twice");
+            }
+            requestContext.setProperty("been.here", Boolean.TRUE);
+            requestContext.getHeaders().putSingle("single-filter", "once");
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java
new file mode 100644
index 0000000000000..fa6194b91bb72
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java
@@ -0,0 +1,170 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+
+import org.hamcrest.Matchers;
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEncodedQueryResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEncodedTemplateResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEscapedMatrParamResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoQueryParamsResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoSimpleResource;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoSimpleSingletonResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Tests for java.net.URI class
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Uri Info Test")
+public class UriInfoTest {
+
+    protected final Logger logger = Logger.getLogger(UriInfoTest.class);
+
+    private static Client client;
+
+    @RegisterExtension
+    static QuarkusUnitTest quarkusUnitTest = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClass(PortProviderUtil.class);
+                    // Use of PortProviderUtil in the deployment
+                    war.addClasses(UriInfoSimpleResource.class, UriInfoEncodedQueryResource.class,
+                            UriInfoQueryParamsResource.class, UriInfoSimpleSingletonResource.class,
+                            UriInfoEncodedTemplateResource.class, UriInfoEscapedMatrParamResource.class,
+                            UriInfoEncodedTemplateResource.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void before() throws Exception {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void after() throws Exception {
+        client.close();
+        client = null;
+    }
+
+    /**
+     * @tpTestDetails Check uri from resource on server. Simple resource is used.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Uri Info")
+    public void testUriInfo() throws Exception {
+        basicTest("/simple", UriInfoSimpleResource.class.getSimpleName());
+        basicTest("/simple/fromField", UriInfoSimpleResource.class.getSimpleName());
+
+        RestAssured.get("/" + UriInfoSimpleResource.class.getSimpleName() + "/uri?foo=bar").then()
+                .body(Matchers.endsWith("/uri?foo=bar"));
+    }
+
+    /**
+     * @tpTestDetails Check uri from resource on server. Resource is set as singleton to RESTEasy.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @Disabled
+    @DisplayName("Test Uri Info With Singleton")
+    public void testUriInfoWithSingleton() throws Exception {
+        basicTest("/simple/fromField", UriInfoSimpleSingletonResource.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Check uri from resource on server. Test complex parameter.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @Disabled
+    @DisplayName("Test Escaped Matr Param")
+    public void testEscapedMatrParam() throws Exception {
+        basicTest("/queryEscapedMatrParam;a=a%3Bb;b=x%2Fy;c=m%5Cn;d=k%3Dl",
+                UriInfoEscapedMatrParamResource.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Check uri from resource on server. Test space character in URI.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @Disabled
+    @DisplayName("Test Encoded Template Params")
+    public void testEncodedTemplateParams() throws Exception {
+        basicTest("/a%20b/x%20y", UriInfoEncodedTemplateResource.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Check uri from resource on server. Test space character in URI attribute.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @Disabled
+    @DisplayName("Test Encoded Query Params")
+    public void testEncodedQueryParams() throws Exception {
+        basicTest("/query?a=a%20b", UriInfoEncodedQueryResource.class.getSimpleName());
+    }
+
+    /**
+     * @tpTestDetails Check uri from resource on server. Test return value from resource - same URI address.
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @Disabled
+    @DisplayName("Test Relativize")
+    public void testRelativize() throws Exception {
+        String uri = PortProviderUtil.generateURL("/");
+        WebTarget target = client.target(uri);
+        String result;
+        result = target.path("a/b/c").queryParam("to", "a/d/e").request().get(String.class);
+        Assertions.assertEquals("../../d/e", result);
+        result = target.path("a/b/c").queryParam("to", UriBuilder.fromUri(uri).path("a/d/e").build().toString()).request()
+                .get(String.class);
+        Assertions.assertEquals(result, "../../d/e");
+        result = target.path("a/b/c").queryParam("to", "http://foobar/a/d/e").request().get(String.class);
+        Assertions.assertEquals(result, "http://foobar/a/d/e");
+    }
+
+    private static void basicTest(String path, String testName) throws Exception {
+        Response response = client.target(PortProviderUtil.generateURL("/" + testName + path)).request().get();
+        try {
+            Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        } finally {
+            response.close();
+        }
+    }
+
+    /**
+     * @tpTestDetails Test that UriInfo.getQueryParameters() returns an immutable map. Test's logic is in end-point.
+     * @tpSince RESTEasy 3.0.17
+     */
+    @Test
+    @DisplayName("Test Query Params Mutability")
+    public void testQueryParamsMutability() throws Exception {
+        basicTest("/queryParams?a=a,b", "UriInfoQueryParamsResource");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java
new file mode 100644
index 0000000000000..8999ad880e8c8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/WiderMappingNegativeTest.java
@@ -0,0 +1,71 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.WiderMappingDefaultOptions;
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.WiderMappingResource;
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @tpSubChapter Resources
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Test negative scenario for "resteasy.wider.request.matching" property
+ * @tpSince RESTEasy 3.0.16
+ */
+@DisplayName("Wider Mapping Negative Test")
+public class WiderMappingNegativeTest {
+
+    static Client client;
+
+    private String generateURL(String path) {
+        return PortProviderUtil.generateURL(path, WiderMappingNegativeTest.class.getSimpleName());
+    }
+
+    @RegisterExtension
+    static QuarkusUnitTest testExtension = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    JavaArchive war = ShrinkWrap.create(JavaArchive.class);
+                    war.addClasses(PortProviderUtil.class, WiderMappingResource.class, WiderMappingDefaultOptions.class);
+                    return war;
+                }
+            });
+
+    @BeforeAll
+    public static void setup() {
+        client = ClientBuilder.newClient();
+    }
+
+    @AfterAll
+    public static void cleanup() {
+        client.close();
+    }
+
+    /**
+     * @tpTestDetails Two resources used, more general resource should not be used
+     * @tpSince RESTEasy 3.0.16
+     */
+    @Test
+    @DisplayName("Test Options")
+    public void testOptions() {
+        Response response = client.target(generateURL("/hello/int")).request().options();
+        Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        Assertions.assertNotEquals(response.readEntity(String.class), "hello");
+        response.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java
new file mode 100644
index 0000000000000..fdcc69f595d9e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ApplicationScopeObject.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class ApplicationScopeObject {
+    AtomicInteger counter = new AtomicInteger();
+
+    public int getCount() {
+        return counter.incrementAndGet();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java
new file mode 100644
index 0000000000000..af256f113946a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ClassLevelMediaTypeResource.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/test")
+@Produces(MediaType.APPLICATION_JSON)
+public class ClassLevelMediaTypeResource {
+
+    @GET
+    public String test() {
+        return "test";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java
new file mode 100644
index 0000000000000..78548b83b8177
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CollectionDefaultValueResource.java
@@ -0,0 +1,45 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("/collection")
+public class CollectionDefaultValueResource {
+
+    private static class MyParams {
+        @QueryParam("nada")
+        List<String> params;
+        @DefaultValue("foo")
+        @QueryParam("nada")
+        List<String> paramsWithDefaultValue;
+    }
+
+    @BeanParam
+    MyParams params;
+
+    @GET
+    @Produces("text/plain")
+    public String get(@QueryParam("nada") List<String> params,
+            @DefaultValue("foo") @QueryParam("nada") List<String> paramsWithDefaultValue) {
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(0, params.size());
+        Assertions.assertNotNull(paramsWithDefaultValue);
+        Assertions.assertEquals(1, paramsWithDefaultValue.size());
+        Assertions.assertEquals("foo", paramsWithDefaultValue.get(0));
+        Assertions.assertNotNull(this.params.params);
+        Assertions.assertEquals(0, this.params.params.size());
+        Assertions.assertNotNull(this.params.paramsWithDefaultValue);
+        Assertions.assertEquals(1, this.params.paramsWithDefaultValue.size());
+        Assertions.assertEquals("foo", this.params.paramsWithDefaultValue.get(0));
+        return "hello";
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java
new file mode 100644
index 0000000000000..6e29245e45072
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsRootProxy.java
@@ -0,0 +1,9 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+public interface CovariantReturnSubresourceLocatorsRootProxy {
+    @Path("sub/{path}")
+    CovariantReturnSubresourceLocatorsSubProxy getSub(@PathParam("path") String path);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java
new file mode 100644
index 0000000000000..5a5754cc135af
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxy.java
@@ -0,0 +1,10 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+
+public interface CovariantReturnSubresourceLocatorsSubProxy {
+    @GET
+    @Produces("text/plain")
+    String get();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java
new file mode 100644
index 0000000000000..4662374a832c3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxyRootImpl.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+
+@Path("/path")
+public class CovariantReturnSubresourceLocatorsSubProxyRootImpl implements CovariantReturnSubresourceLocatorsRootProxy {
+    @Override
+    public CovariantReturnSubresourceLocatorsSubProxySubImpl getSub(String path) {
+        return new CovariantReturnSubresourceLocatorsSubProxySubImpl(path);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxySubImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxySubImpl.java
new file mode 100644
index 0000000000000..39ea899bdbe97
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/CovariantReturnSubresourceLocatorsSubProxySubImpl.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class CovariantReturnSubresourceLocatorsSubProxySubImpl implements CovariantReturnSubresourceLocatorsSubProxy {
+    private final String path;
+
+    public CovariantReturnSubresourceLocatorsSubProxySubImpl(final String path) {
+        this.path = path;
+    }
+
+    public String get() {
+        return "Boo! - " + path;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java
new file mode 100644
index 0000000000000..d2c9553a993ec
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultCharsetResource.java
@@ -0,0 +1,57 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/")
+public class DefaultCharsetResource {
+
+    @GET
+    @Produces("text/plain")
+    @Path("nocharset")
+    public String noCharset() {
+        return "ok";
+    }
+
+    @GET
+    @Produces("text/plain; charset=UTF-16")
+    @Path("charset")
+    public String charset() {
+        return "ok";
+    }
+
+    @GET
+    @Path("nomediatype")
+    public String noMediaType() {
+        return "ok";
+    }
+
+    @GET
+    @Produces("application/xml")
+    @Path("xml_nocharset")
+    public String xmlNoCharset() {
+        return "ok";
+    }
+
+    @GET
+    @Produces("application/xml; charset=UTF-16")
+    @Path("xml_charset")
+    public String xmlCharset() {
+        return "ok";
+    }
+
+    @GET
+    @Produces("application/xml-external-parsed-entity")
+    @Path("external")
+    public String external() {
+        return "ok";
+    }
+
+    @GET
+    @Produces("application/json")
+    @Path("json")
+    public String json() {
+        return "ok";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeCustomObject.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeCustomObject.java
new file mode 100644
index 0000000000000..0f87607366143
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeCustomObject.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class DefaultMediaTypeCustomObject {
+    public int a;
+    public int b;
+
+    public String toString() {
+        return String.format("%d,%d", a, b);
+    }
+
+    public DefaultMediaTypeCustomObject(final int a, final int b) {
+        this.a = a;
+        this.b = b;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java
new file mode 100644
index 0000000000000..5f06495bbdcf2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/DefaultMediaTypeResource.java
@@ -0,0 +1,78 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.Date;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+
+@Path("/")
+public class DefaultMediaTypeResource {
+
+    protected static final Logger logger = Logger.getLogger(DefaultMediaTypeResource.class.getName());
+
+    @Path("postDateProduce")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @Produces(MediaType.TEXT_PLAIN)
+    @POST
+    public Response postDateProduce(String source) throws Exception {
+        return Response.ok().entity(new Date(10000)).build();
+    }
+
+    @Path("postDate")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @POST
+    public Response postDate(String source) throws Exception {
+        return Response.ok().entity(new Date(10000)).build();
+    }
+
+    @Path("postFooProduce")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @Produces(MediaType.TEXT_PLAIN)
+    @POST
+    public Response postFooProduce(String source) throws Exception {
+        return Response.ok().entity(new DefaultMediaTypeCustomObject(8, 9)).build();
+    }
+
+    @Path("postFoo")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @POST
+    public Response postFoo(String source) throws Exception {
+        return Response.ok().entity(new DefaultMediaTypeCustomObject(8, 9)).build();
+    }
+
+    @Path("postIntProduce")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @Produces(MediaType.TEXT_PLAIN)
+    @POST
+    public Response postIntProduce(String source) throws Exception {
+        return Response.ok().entity(new Integer(8)).build();
+    }
+
+    @Path("postInt")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @POST
+    public Response postInt(String source) throws Exception {
+        return Response.ok().entity(new Integer(8)).build();
+    }
+
+    @Path("postIntegerProduce")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @Produces(MediaType.TEXT_PLAIN)
+    @POST
+    public Response postIntegerProduce(String source) throws Exception {
+        return Response.ok().entity(5).build();
+    }
+
+    @Path("postInteger")
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    @POST
+    public Response postInteger(String source) throws Exception {
+        return Response.ok().entity(5).build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java
new file mode 100644
index 0000000000000..684bef347005d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ExtensionResource.java
@@ -0,0 +1,55 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+import java.util.Locale;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("/extension")
+public class ExtensionResource {
+    @GET
+    @Produces("*/*")
+    public String getDefault() {
+        return "default";
+    }
+
+    @GET
+    @Produces("application/xml")
+    public String getXml(@Context HttpHeaders headers) {
+        @SuppressWarnings("unused")
+        List<Locale> languages = headers.getAcceptableLanguages();
+        @SuppressWarnings("unused")
+        List<MediaType> mediaTypes = headers.getAcceptableMediaTypes();
+        return "xml";
+    }
+
+    @GET
+    @Produces("text/html")
+    public String getXmlTwo(@Context HttpHeaders headers) {
+        List<Locale> languages = headers.getAcceptableLanguages();
+        Assertions.assertEquals(1, languages.size(), "Wrong number of accepted languages");
+        Assertions.assertEquals(new Locale("en", "us"), languages.get(0), "Wrong accepted language");
+        Assertions.assertEquals(MediaType.valueOf("text/html"),
+                headers.getAcceptableMediaTypes().get(0), "Wrong accepted language");
+        return "html";
+    }
+
+    @GET
+    @Path("/stuff.old")
+    @Produces("text/plain")
+    public String getJson(@Context HttpHeaders headers) {
+        List<Locale> languages = headers.getAcceptableLanguages();
+        Assertions.assertEquals(1, languages.size(), "Wrong number of accepted languages");
+        Assertions.assertEquals(new Locale("en", "us"), languages.get(0), "Wrong accepted language");
+        Assertions.assertEquals(MediaType.valueOf("text/plain"),
+                headers.getAcceptableMediaTypes().get(0), "Wrong accepted language");
+        return "plain";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java
new file mode 100644
index 0000000000000..71d63ad1ecab9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityDoubleWriter.java
@@ -0,0 +1,55 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.logging.Logger;
+
+@Provider
+@Produces("*/*")
+public class GenericEntityDoubleWriter implements MessageBodyWriter<List<Double>> {
+
+    private static final Logger LOG = Logger.getLogger(GenericEntityDoubleWriter.class);
+
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        LOG.debug("DoubleWriter type: " + type.getName());
+        if (!List.class.isAssignableFrom(type)) {
+            return false;
+        }
+        LOG.debug("DoubleWriter: " + genericType);
+        if (!(genericType instanceof ParameterizedType)) {
+            return false;
+        }
+        LOG.debug("DoubleWriter");
+        ParameterizedType pt = (ParameterizedType) genericType;
+        boolean result = pt.getActualTypeArguments()[0].equals(Double.class);
+        LOG.debug("Doublewriter result!!!: " + result);
+        return result;
+    }
+
+    public long getSize(List<Double> doubles, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        return -1;
+    }
+
+    public void writeTo(List<Double> floats, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+            throws IOException, WebApplicationException {
+        StringBuilder buf = new StringBuilder();
+        for (Double f : floats) {
+            buf.append(f.toString()).append("D ");
+        }
+        entityStream.write(buf.toString().getBytes());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java
new file mode 100644
index 0000000000000..4f1f63d2109f1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityFloatWriter.java
@@ -0,0 +1,52 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.logging.Logger;
+
+@Provider
+@Produces("*/*")
+public class GenericEntityFloatWriter implements MessageBodyWriter<List<Float>> {
+
+    private static final Logger LOG = Logger.getLogger(GenericEntityFloatWriter.class);
+
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        if (!List.class.isAssignableFrom(type)) {
+            return false;
+        }
+        if (!(genericType instanceof ParameterizedType)) {
+            return false;
+        }
+        ParameterizedType pt = (ParameterizedType) genericType;
+        boolean result = pt.getActualTypeArguments()[0].equals(Float.class);
+        LOG.debug("FloatWriter result!!!: " + result);
+        return result;
+    }
+
+    public long getSize(List<Float> floats, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        return -1;
+    }
+
+    public void writeTo(List<Float> floats, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+            throws IOException, WebApplicationException {
+        StringBuilder buf = new StringBuilder();
+        for (Float f : floats) {
+            buf.append(f.toString()).append("F ");
+        }
+        entityStream.write(buf.toString().getBytes());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java
new file mode 100644
index 0000000000000..6442c65c9ac41
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityIntegerServerMessageBodyWriter.java
@@ -0,0 +1,67 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+@Produces("*/*")
+public class GenericEntityIntegerServerMessageBodyWriter implements ServerMessageBodyWriter<List<Integer>> {
+
+    private static final Logger LOG = Logger.getLogger(GenericEntityIntegerServerMessageBodyWriter.class);
+
+    @Override
+    public long getSize(List<Integer> integers, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        return -1;
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        throw new IllegalStateException("Should never have been called");
+    }
+
+    @Override
+    public void writeTo(List<Integer> integers, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        throw new IllegalStateException("Should never have been called");
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        if (!List.class.isAssignableFrom(type)) {
+            return false;
+        }
+        if (!(genericType instanceof ParameterizedType)) {
+            return false;
+        }
+        ParameterizedType pt = (ParameterizedType) genericType;
+        boolean result = pt.getActualTypeArguments()[0].equals(Integer.class);
+        LOG.debug("IntegerWriter result!!!: " + result);
+        return result;
+    }
+
+    @Override
+    public void writeResponse(List<Integer> integers, Type genericType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        StringBuilder buf = new StringBuilder();
+        for (Integer i : integers) {
+            buf.append(i.toString()).append("I ");
+        }
+        context.getOrCreateOutputStream().write(buf.toString().getBytes());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java
new file mode 100644
index 0000000000000..3f075a6f8bbf4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericEntityResource.java
@@ -0,0 +1,54 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.Response;
+
+@Path("/")
+public class GenericEntityResource {
+    @Path("floats")
+    @GET
+    public Response getFloats() {
+        ArrayList<Float> list = new ArrayList<Float>();
+        list.add(45.0f);
+        list.add(50.0f);
+        GenericEntity<List<Float>> ge = new GenericEntity<List<Float>>(list) {
+        };
+        return Response.ok(ge).build();
+    }
+
+    @Path("doubles")
+    @GET
+    public Response getDoubles() {
+        ArrayList<Double> list = new ArrayList<Double>();
+        list.add(45.0);
+        list.add(50.0);
+        GenericEntity<List<Double>> ge = new GenericEntity<List<Double>>(list) {
+        };
+        return Response.ok(ge).build();
+    }
+
+    @Path("integers")
+    @GET
+    public Response getIntegers() {
+        List<Integer> list = new ArrayList<>();
+        list.add(45);
+        list.add(50);
+        GenericEntity<List<Integer>> ge = new GenericEntity<List<Integer>>(list) {
+        };
+        return Response.ok(ge).build();
+    }
+
+    @Path("integers-no-response")
+    @GET
+    public List<Integer> getIntegersNoResponse() {
+        List<Integer> list = new ArrayList<>();
+        list.add(45);
+        list.add(50);
+        return list;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java
new file mode 100644
index 0000000000000..5b73f1171a34a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceCrudResource.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+/**
+ * This is a sample of a CRUD resource template which can be reused for different entities.
+ *
+ * @param <ENTITY_TYPE> Type of the entity which CRUD operations are performed on.
+ * @param <ENTITY_IDENTIFIER_TYPE> Type of the entity identified i.e. java.lang.Long
+ * @author Jozef Hartinger
+ */
+public abstract class GenericResourceCrudResource<ENTITY_TYPE, ENTITY_IDENTIFIER_TYPE> {
+    abstract ENTITY_TYPE getEntity(ENTITY_IDENTIFIER_TYPE id);
+
+    abstract void setEntity(ENTITY_IDENTIFIER_TYPE id, ENTITY_TYPE entity);
+
+    @GET
+    @Path("/{id}")
+    public ENTITY_TYPE get(@PathParam("id") ENTITY_IDENTIFIER_TYPE id) {
+        return getEntity(id);
+    }
+
+    @PUT
+    @Path("/{id}")
+    public void put(@PathParam("id") ENTITY_IDENTIFIER_TYPE id, ENTITY_TYPE entity) {
+        setEntity(id, entity);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudent.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudent.java
new file mode 100644
index 0000000000000..9e1c19ae49534
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudent.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class GenericResourceStudent {
+    private String name;
+
+    public GenericResourceStudent() {
+    }
+
+    public GenericResourceStudent(final String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Student: " + name;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java
new file mode 100644
index 0000000000000..1532702e78634
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentCrudResource.java
@@ -0,0 +1,35 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+/**
+ * RESTEasy should be able to use type parameter values (Student, Integer) for (de)marshalling parameters/entity body.
+ *
+ * @author Jozef Hartinger
+ */
+@Path("/student")
+@Produces("application/student")
+@Consumes("application/student")
+public class GenericResourceStudentCrudResource extends GenericResourceCrudResource<GenericResourceStudent, Integer> {
+
+    private static Map<Integer, GenericResourceStudent> students = new HashMap<Integer, GenericResourceStudent>();
+
+    public GenericResourceStudentCrudResource() {
+        students.put(1, new GenericResourceStudent("Jozef Hartinger"));
+    }
+
+    @Override
+    GenericResourceStudent getEntity(Integer id) {
+        return students.get(id);
+    }
+
+    @Override
+    void setEntity(Integer id, GenericResourceStudent entity) {
+        students.put(id, entity);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java
new file mode 100644
index 0000000000000..ede0b3e055602
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentInterface.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+/**
+ * This interface is used on the client side only.
+ *
+ * @author Jozef Hartinger
+ */
+
+@Path("/student/{id}")
+@Produces("application/student")
+@Consumes("application/student")
+public interface GenericResourceStudentInterface {
+    @GET
+    GenericResourceStudent get(@PathParam("id") Integer id);
+
+    @PUT
+    void put(@PathParam("id") Integer id, GenericResourceStudent entity);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java
new file mode 100644
index 0000000000000..9bd73fe406d94
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentReader.java
@@ -0,0 +1,36 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Consumes("application/student")
+public class GenericResourceStudentReader implements MessageBodyReader<GenericResourceStudent> {
+
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public GenericResourceStudent readFrom(Class<GenericResourceStudent> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+            throws IOException, WebApplicationException {
+        BufferedReader br = null;
+        try {
+            br = new BufferedReader(new InputStreamReader(entityStream));
+            return new GenericResourceStudent(br.readLine());
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to parse student.", e);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java
new file mode 100644
index 0000000000000..71648f112e9d0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GenericResourceStudentWriter.java
@@ -0,0 +1,36 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces("application/student")
+public class GenericResourceStudentWriter implements MessageBodyWriter<GenericResourceStudent> {
+
+    public long getSize(GenericResourceStudent t, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        return t.getName().length();
+    }
+
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public void writeTo(GenericResourceStudent t, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+            throws IOException, WebApplicationException {
+        OutputStreamWriter writer = new OutputStreamWriter(entityStream);
+        writer.write(t.getName());
+        writer.flush();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java
new file mode 100644
index 0000000000000..70ff2175bda5e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/HttpHeadersResource.java
@@ -0,0 +1,170 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.jboss.logging.Logger;
+
+@Path(value = "/HeadersTest")
+public class HttpHeadersResource {
+    private static Logger logger = Logger.getLogger(HttpHeadersResource.class);
+
+    @GET
+    @Path("/headers")
+    public String headersGet(@Context HttpHeaders hs) {
+        StringBuffer sb = new StringBuffer();
+        List<String> myHeaders = Arrays.asList("Accept", "Content-Type");
+
+        try {
+            MultivaluedMap<String, String> rqhdrs = hs.getRequestHeaders();
+            Set<String> keys = rqhdrs.keySet();
+            sb.append("getRequestHeaders= ");
+            for (String header : myHeaders) {
+                if (keys.contains(header)) {
+                    sb.append("Found " + header + ": " +
+                            hs.getRequestHeader(header) + "; ");
+                }
+            }
+        } catch (Throwable ex) {
+            sb.append("Unexpected exception thrown in getRequestHeaders: " +
+                    ex.getMessage());
+            StringWriter errors = new StringWriter();
+            ex.printStackTrace(new PrintWriter(errors));
+            logger.error(errors.toString());
+        }
+        return sb.toString();
+    }
+
+    @GET
+    @Path("/acl")
+    public String aclGet(@Context HttpHeaders hs) {
+        StringBuffer sb = new StringBuffer();
+        try {
+            sb.append("Accept-Language");
+
+            List<Locale> acl = hs.getAcceptableLanguages();
+            sb.append("getLanguage= ");
+            for (Locale tmp : acl) {
+                sb.append(tmp.toString() + "; ");
+            }
+        } catch (Throwable ex) {
+            sb.append("Unexpected exception thrown in getAcceptableLanguages: " +
+                    ex.getMessage());
+            StringWriter errors = new StringWriter();
+            ex.printStackTrace(new PrintWriter(errors));
+            logger.error(errors.toString());
+        }
+        return sb.toString();
+    }
+
+    @GET
+    @Path("/amt")
+    public String amtGet(@Context HttpHeaders hs) {
+        StringBuffer sb = new StringBuffer();
+        try {
+            sb.append("getAcceptableMediaTypes");
+            List<MediaType> acmts = hs.getAcceptableMediaTypes();
+
+            for (MediaType mt : acmts) {
+                sb.append(mt.getType());
+                sb.append("/");
+                sb.append(mt.getSubtype());
+            }
+        } catch (Throwable ex) {
+            sb.append("Unexpected exception thrown: " + ex.getMessage());
+            StringWriter errors = new StringWriter();
+            ex.printStackTrace(new PrintWriter(errors));
+            logger.error(errors.toString());
+        }
+        return sb.toString();
+    }
+
+    @GET
+    @Path("/mt")
+    public String mtGet(@Context HttpHeaders hs) {
+        StringBuffer sb = new StringBuffer();
+
+        try {
+            sb.append("getMediaType");
+            MediaType mt = hs.getMediaType();
+            if (mt != null) {
+                sb.append(mt.getType());
+                sb.append("/");
+                sb.append(mt.getSubtype());
+                sb.append(" ");
+
+                Map<String, String> pmap = mt.getParameters();
+
+                sb.append("MediaType size=" + pmap.size());
+
+                for (Map.Entry<String, String> entry : pmap.entrySet()) {
+                    sb.append("Key " + entry.getKey() + "; Value " + entry.getValue());
+                }
+
+                sb.append(mt.toString());
+
+                sb.append("MediaType= " + mt.toString() + "; ");
+            } else {
+                sb.append("MediaType= null; ");
+            }
+        } catch (Throwable ex) {
+            sb.append("Unexpected exception thrown: " + ex.getMessage());
+            StringWriter errors = new StringWriter();
+            ex.printStackTrace(new PrintWriter(errors));
+            logger.error(errors.toString());
+        }
+        return sb.toString();
+    }
+
+    @GET
+    @Path("/cookie")
+    public String cookieGet(@Context HttpHeaders hs) {
+        StringBuffer sb = new StringBuffer();
+
+        try {
+            sb.append("getCookies= ");
+            Map<String, Cookie> cookies = hs.getCookies();
+            sb.append("Cookie Size=" + cookies.size());
+
+            for (Map.Entry<String, Cookie> tmp : cookies.entrySet()) {
+                sb.append(tmp.getKey() + ": " + tmp.getValue() + "; ");
+                Cookie c = cookies.get("name1");
+                sb.append("Cookie Name=" + c.getName());
+                sb.append("Cookie Value=" + c.getValue());
+                sb.append("Cookie Path=" + c.getPath());
+                sb.append("Cookie Domain=" + c.getDomain());
+                sb.append("Cookie Version=" + c.getVersion());
+
+            }
+        } catch (Throwable ex) {
+            sb.append("Unexpected exception thrown: " + ex.getMessage());
+            StringWriter errors = new StringWriter();
+            ex.printStackTrace(new PrintWriter(errors));
+            logger.error(errors.toString());
+        }
+
+        return sb.toString();
+    }
+
+    @PUT
+    public String headersPlainPut(@Context HttpHeaders hs) {
+        StringBuffer sb = new StringBuffer();
+        sb.append("Content-Language");
+        sb.append(hs.getLanguage());
+        return sb.toString();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritenceParentResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritenceParentResource.java
new file mode 100644
index 0000000000000..1878d25f47410
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritenceParentResource.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+
+public interface InheritenceParentResource {
+
+    @GET
+    @Produces("text/plain")
+    String firstest();
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritenceParentResourceImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritenceParentResourceImpl.java
new file mode 100644
index 0000000000000..aa91b1b850844
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/InheritenceParentResourceImpl.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+
+@Path(value = "/InheritanceTest")
+public class InheritenceParentResourceImpl implements InheritenceParentResource {
+
+    public String firstest() {
+        return "First";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/LogHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/LogHandler.java
new file mode 100644
index 0000000000000..e7d8043dcd302
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/LogHandler.java
@@ -0,0 +1,30 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
+public class LogHandler extends Handler {
+
+    public static final String MESSAGE_CODE = "RESTEASY002142";
+
+    private static volatile int messagesLogged = 0;
+
+    @Override
+    public void publish(LogRecord record) {
+        if (record.getMessage().contains(MESSAGE_CODE)) {
+            messagesLogged++;
+        }
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() throws SecurityException {
+    }
+
+    public int getMessagesLogged() {
+        return messagesLogged;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java
new file mode 100644
index 0000000000000..e1e8c2c209872
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MatchedResource.java
@@ -0,0 +1,71 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/")
+public class MatchedResource {
+    @Path("/test1/{id}.xml.{lang}")
+    @GET
+    public String getComplex() {
+        return "complex";
+    }
+
+    @Path("/test1/{id}")
+    @GET
+    public String getSimple() {
+        return "simple";
+    }
+
+    @Path("/test2/{id}")
+    @GET
+    public String getSimple2() {
+        return "simple2";
+    }
+
+    @Path("/test2/{id}.xml.{lang}")
+    @GET
+    public String getComplex2() {
+        return "complex2";
+    }
+
+    @Path("match")
+    @Produces("*/*;qs=0.0")
+    @GET
+    public String getObj() {
+        return "*/*";
+    }
+
+    @Path("match")
+    @Produces("application/xml")
+    @GET
+    public String getObjXml() {
+        return "<xml/>";
+    }
+
+    @Path("match")
+    @Produces("application/json")
+    @GET
+    public String getObjJson() {
+        return "{ \"name\" : \"bill\" }";
+    }
+
+    @Path("start")
+    @POST
+    @Produces("text/plain")
+    public String start() {
+        return "started";
+    }
+
+    @Path("start")
+    @Consumes("application/xml")
+    @POST
+    @Produces("text/plain")
+    public String start(String xml) {
+        return xml;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java
new file mode 100644
index 0000000000000..456d56f81d82b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsText.java
@@ -0,0 +1,40 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collection;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces(MediaType.TEXT_PLAIN + "; charset=UTF-8")
+public class MediaTypeFromMessageBodyWriterListAsText implements MessageBodyWriter<Iterable<?>> {
+
+    @Override
+    public long getSize(final Iterable<?> t, final Class<?> type, final Type genericType, final Annotation[] annotations,
+            final MediaType mediaType) {
+        return -1L;
+    }
+
+    @Override
+    public boolean isWriteable(final Class<?> type, final Type genericType, final Annotation[] annotations,
+            final MediaType mediaType) {
+        return Iterable.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeTo(final Iterable<?> items, final Class<?> type, final Type genericType,
+            final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders,
+            final OutputStream out) throws IOException {
+
+        if (items instanceof Collection) {
+            httpHeaders.putSingle("X-COUNT", Integer.toString(((Collection<?>) items).size()));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java
new file mode 100644
index 0000000000000..6c048a6791aa0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterListAsXML.java
@@ -0,0 +1,40 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collection;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces(MediaType.APPLICATION_XML + "; charset=UTF-8")
+public class MediaTypeFromMessageBodyWriterListAsXML implements MessageBodyWriter<Iterable<?>> {
+
+    @Override
+    public long getSize(final Iterable<?> t, final Class<?> type, final Type genericType, final Annotation[] annotations,
+            final MediaType mediaType) {
+        return -1L;
+    }
+
+    @Override
+    public boolean isWriteable(final Class<?> type, final Type genericType, final Annotation[] annotations,
+            final MediaType mediaType) {
+        return Iterable.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeTo(final Iterable<?> items, final Class<?> type, final Type genericType,
+            final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders,
+            final OutputStream out) throws IOException {
+
+        if (items instanceof Collection) {
+            httpHeaders.putSingle("X-COUNT", Integer.toString(((Collection<?>) items).size()));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java
new file mode 100644
index 0000000000000..d2febc1c18fd1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MediaTypeFromMessageBodyWriterResource.java
@@ -0,0 +1,51 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Variant;
+
+@Path("/")
+public class MediaTypeFromMessageBodyWriterResource {
+
+    @GET
+    @Path("{type}")
+    public Object hello(@PathParam("type") final String type, @HeaderParam("Accept") final String accept)
+            throws Exception {
+        return Class.forName(type).newInstance();
+    }
+
+    @GET
+    @Path("fixed")
+    public Object fixedResponse(@QueryParam("type") @DefaultValue(MediaType.TEXT_PLAIN) final MediaType type) {
+        final List<Integer> body = Arrays.asList(1, 2, 3, 4, 5, 6);
+        return Response.ok(body, type).build();
+    }
+
+    @GET
+    @Path("variants")
+    public Response variantsResponse() {
+        final List<Integer> body = Arrays.asList(1, 2, 3, 4, 5, 6);
+        final List<Variant> variants = Variant
+                .mediaTypes(MediaType.APPLICATION_JSON_TYPE, MediaType.APPLICATION_XML_TYPE, MediaType.TEXT_PLAIN_TYPE).build();
+        return Response.ok(body).variants(variants).build();
+    }
+
+    @GET
+    @Path("variantsObject")
+    public Object variantsObjectResponse() {
+        final List<Integer> body = Arrays.asList(1, 2, 3, 4, 5, 6);
+        final List<Variant> variants = Variant
+                .mediaTypes(MediaType.APPLICATION_JSON_TYPE, MediaType.APPLICATION_XML_TYPE, MediaType.TEXT_PLAIN_TYPE).build();
+        return Response.ok(body).variants(variants).build();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java
new file mode 100644
index 0000000000000..9782b667f5423
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf1.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+public interface MultiInterfaceResLocatorIntf1 {
+    @GET
+    @Produces("text/plain")
+    @Path("hello1")
+    String resourceMethod1();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java
new file mode 100644
index 0000000000000..8111192887a05
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorIntf2.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+public interface MultiInterfaceResLocatorIntf2 {
+    @GET
+    @Produces("text/plain")
+    @Path("hello2")
+    String resourceMethod2();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java
new file mode 100644
index 0000000000000..32c9e91131bba
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorResource.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/")
+public class MultiInterfaceResLocatorResource {
+    @Produces("text/plain")
+    @Path("test")
+    public Object resourceLocator() {
+        return new MultiInterfaceResLocatorSubresource();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorSubresource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorSubresource.java
new file mode 100644
index 0000000000000..7dc26520432fc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultiInterfaceResLocatorSubresource.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class MultiInterfaceResLocatorSubresource implements MultiInterfaceResLocatorIntf1, MultiInterfaceResLocatorIntf2 {
+    @Override
+    public String resourceMethod1() {
+        return "resourceMethod1";
+    }
+
+    @Override
+    public String resourceMethod2() {
+        return "resourceMethod2";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java
new file mode 100644
index 0000000000000..911cc3553f3ee
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/MultipleGetResource.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/api")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class MultipleGetResource {
+    private List<String> todoList = new ArrayList<>();
+
+    @GET
+    public List<String> getAll() {
+        return todoList;
+    }
+
+    @GET
+    public List<String> findNotCompleted() {
+        return todoList;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java
new file mode 100644
index 0000000000000..49c950756375e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResClassSub.java
@@ -0,0 +1,35 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.arc.Unremovable;
+
+@ApplicationScoped
+@Unremovable
+public class ParameterSubResClassSub {
+    AtomicInteger resourceCounter = new AtomicInteger();
+    @Inject
+    ApplicationScopeObject appScope;
+
+    @Inject
+    RequestScopedObject requestScope;
+
+    @GET
+    @Produces("text/plain")
+    public String get(@Context HttpHeaders headers, @Context UriInfo uriInfo) {
+        Assertions.assertEquals("/path/subclass", uriInfo.getPath());
+        Assertions.assertNotNull(headers.getHeaderString("Host"));
+        return "resourceCounter:" + resourceCounter.incrementAndGet() + ",appscope:" + appScope.getCount() + ",requestScope:"
+                + requestScope.getCount();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResConcreteSubImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResConcreteSubImpl.java
new file mode 100644
index 0000000000000..ce70829db5290
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResConcreteSubImpl.java
@@ -0,0 +1,7 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class ParameterSubResConcreteSubImpl extends ParameterSubResSubImpl<Integer> {
+    public ParameterSubResConcreteSubImpl(final String path) {
+        super(path);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResDoubleInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResDoubleInterface.java
new file mode 100644
index 0000000000000..77f9fab23f22f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResDoubleInterface.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public interface ParameterSubResDoubleInterface extends ParameterSubResGenericInterface<Double> {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java
new file mode 100644
index 0000000000000..d9862c779209d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericInterface.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+
+public interface ParameterSubResGenericInterface<T> {
+    @GET
+    String get(@QueryParam("foo") List<T> params);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java
new file mode 100644
index 0000000000000..621810fead935
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResGenericSub.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.List;
+
+import javax.ws.rs.Path;
+
+@Path("generic")
+public class ParameterSubResGenericSub {
+    @SuppressWarnings(value = "unchecked")
+    @Path("sub")
+    public ParameterSubResDoubleInterface doit() {
+        InvocationHandler handler = new InvocationHandler() {
+            @Override
+            public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                List<Double> list = (List<Double>) args[0];
+                return list.get(0).toString();
+            }
+        };
+        Class[] intfs = { ParameterSubResDoubleInterface.class };
+        return (ParameterSubResDoubleInterface) Proxy.newProxyInstance(ParameterSubResGenericSub.class.getClassLoader(), intfs,
+                handler);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java
new file mode 100644
index 0000000000000..be75c62d2e6dd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResInternalInterface.java
@@ -0,0 +1,8 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.PUT;
+
+public interface ParameterSubResInternalInterface<T extends Number> {
+    @PUT
+    void foo(T value);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java
new file mode 100644
index 0000000000000..7ca75b42c58e3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRoot.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+public interface ParameterSubResRoot {
+    @Path("sub/{path}")
+    ParameterSubResSub getSub(@PathParam("path") String path);
+
+    @Path("subclass")
+    Class<ParameterSubResClassSub> getSubClass();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java
new file mode 100644
index 0000000000000..8719ce20f2971
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResRootImpl.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+
+@Path("/path")
+public class ParameterSubResRootImpl implements ParameterSubResRoot {
+    @Override
+    public ParameterSubResSubImpl<Integer> getSub(String path) {
+        return new ParameterSubResSubImpl<Integer>(path) {
+        };
+    }
+
+    @Override
+    public Class<ParameterSubResClassSub> getSubClass() {
+        return ParameterSubResClassSub.class;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java
new file mode 100644
index 0000000000000..79d615a7f1402
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSub.java
@@ -0,0 +1,10 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+
+public interface ParameterSubResSub {
+    @GET
+    @Produces("text/plain")
+    String get();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSubImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSubImpl.java
new file mode 100644
index 0000000000000..881da3124776a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ParameterSubResSubImpl.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import org.jboss.logging.Logger;
+
+public class ParameterSubResSubImpl<T extends Number> implements ParameterSubResSub, ParameterSubResInternalInterface<T> {
+    private static Logger LOG = Logger.getLogger(ParameterSubResSubImpl.class);
+
+    private final String path;
+
+    public ParameterSubResSubImpl(final String path) {
+        this.path = path;
+    }
+
+    @Override
+    public String get() {
+        return "Boo! - " + path;
+    }
+
+    @Override
+    public void foo(T value) {
+        LOG.debug("foo: " + value);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java
new file mode 100644
index 0000000000000..771dff2e2baf1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/RequestScopedObject.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class RequestScopedObject {
+
+    AtomicInteger count = new AtomicInteger();
+
+    public int getCount() {
+        return count.incrementAndGet();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java
new file mode 100644
index 0000000000000..818276a62f84a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceInfoInjectionFilter.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class ResourceInfoInjectionFilter implements ContainerResponseFilter {
+    @Context
+    private ResourceInfo resourceInfo;
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+        Method method = resourceInfo.getResourceMethod();
+        if (method == null) {
+            responseContext.setStatus(responseContext.getStatus() * 2);
+        } else {
+            responseContext.setEntity(method.getName(), null, MediaType.TEXT_PLAIN_TYPE);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorAbstractAnnotationFreeResouce.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorAbstractAnnotationFreeResouce.java
new file mode 100644
index 0000000000000..dfbb3a568bd5a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorAbstractAnnotationFreeResouce.java
@@ -0,0 +1,8 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public abstract class ResourceLocatorAbstractAnnotationFreeResouce implements ResourceLocatorRootInterface {
+
+    public String get() {
+        return "got";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorAnnotationFreeSubResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorAnnotationFreeSubResource.java
new file mode 100644
index 0000000000000..c1ca8cb08fe6d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorAnnotationFreeSubResource.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class ResourceLocatorAnnotationFreeSubResource extends ResourceLocatorAbstractAnnotationFreeResouce
+        implements ResourceLocatorSubInterface {
+
+    public String post(String s) {
+        return "posted: " + s;
+    }
+
+    public Object getSubSubResource(String id) {
+        return null;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java
new file mode 100644
index 0000000000000..a6b50a2c5bfd1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorBaseResource.java
@@ -0,0 +1,49 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.List;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+@Path("/")
+public class ResourceLocatorBaseResource {
+
+    private static final Logger LOG = Logger.getLogger(ResourceLocatorBaseResource.class);
+
+    @Path("base/{param}/resources")
+    public Object getSubresource(@PathParam("param") String param, @Context UriInfo uri) {
+        LOG.debug("Here in BaseResource");
+        Assertions.assertEquals("1", param);
+        List<String> matchedURIs = uri.getMatchedURIs();
+        Assertions.assertEquals(2, matchedURIs.size());
+        Assertions.assertEquals("base/1/resources", matchedURIs.get(0));
+        Assertions.assertEquals("", matchedURIs.get(1));
+        for (String ancestor : matchedURIs)
+            LOG.debug("   " + ancestor);
+
+        LOG.debug("Uri Ancestors Object for Subresource.doGet():");
+        Assertions.assertEquals(1, uri.getMatchedResources().size());
+        Assertions.assertEquals(ResourceLocatorBaseResource.class, uri.getMatchedResources().get(0).getClass());
+        return new ResourceLocatorSubresource();
+    }
+
+    @Path("proxy")
+    public ResourceLocatorSubresource3Interface sub3() {
+        return (ResourceLocatorSubresource3Interface) Proxy.newProxyInstance(this.getClass().getClassLoader(),
+                new Class<?>[] { ResourceLocatorSubresource3Interface.class }, new InvocationHandler() {
+                    @Override
+                    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                        return method.invoke(new ResourceLocatorSubresource3(), args);
+                    }
+                });
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java
new file mode 100644
index 0000000000000..f4462d3253938
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorCollectionResource.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+
+@Path("/collection")
+public class ResourceLocatorCollectionResource {
+
+    @Path("annotation_free_subresource")
+    public Object getAnnotationFreeSubResource() {
+        return new ResourceLocatorAnnotationFreeSubResource();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java
new file mode 100644
index 0000000000000..9a4844292bd04
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorDirectory.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("/directory")
+public class ResourceLocatorDirectory {
+
+    @Path("/receivers/{id}")
+    public ResourceLocatorQueueReceiver getReceiver(@PathParam("id") String id) {
+        return new ResourceLocatorQueueReceiver();
+    }
+
+    @DELETE
+    @Path("/receivers/{id}")
+    public String closeReceiver(@PathParam("id") String id) throws Exception {
+        return ResourceLocatorDirectory.class.getName();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorQueueReceiver.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorQueueReceiver.java
new file mode 100644
index 0000000000000..93363f38a1cf6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorQueueReceiver.java
@@ -0,0 +1,5 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class ResourceLocatorQueueReceiver extends ResourceLocatorReceiver {
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java
new file mode 100644
index 0000000000000..16dbf319af970
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorReceiver.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+public class ResourceLocatorReceiver {
+
+    @Path("/head")
+    @GET
+    public String get() {
+        return this.getClass().getName();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java
new file mode 100644
index 0000000000000..dc019b7baf31a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorRootInterface.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Produces(MediaType.TEXT_PLAIN)
+public interface ResourceLocatorRootInterface {
+
+    @GET
+    String get();
+
+    @Path("{id}")
+    Object getSubSubResource(@PathParam("id") String id);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java
new file mode 100644
index 0000000000000..9f2cb61f3f0ed
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubInterface.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Produces(MediaType.TEXT_PLAIN)
+public interface ResourceLocatorSubInterface extends ResourceLocatorRootInterface {
+
+    @POST
+    @Consumes(MediaType.TEXT_PLAIN)
+    String post(String s);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java
new file mode 100644
index 0000000000000..088fe7c7179f0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource.java
@@ -0,0 +1,55 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+public class ResourceLocatorSubresource {
+
+    private static final Logger LOG = Logger.getLogger(ResourceLocatorSubresource.class);
+
+    @GET
+    public String doGet(@Context UriInfo uri) {
+        LOG.info("Uri Ancesstors for Subresource.doGet():");
+        List<String> matchedURIs = uri.getMatchedURIs();
+        Assertions.assertEquals(2, matchedURIs.size());
+        Assertions.assertEquals("base/1/resources", matchedURIs.get(0));
+        Assertions.assertEquals("", matchedURIs.get(1));
+        for (String ancestor : matchedURIs)
+            LOG.debug("   " + ancestor);
+
+        LOG.info("Uri Ancestors Object for Subresource.doGet():");
+        Assertions.assertEquals(2, uri.getMatchedResources().size());
+        Assertions.assertEquals(ResourceLocatorSubresource.class, uri.getMatchedResources().get(0).getClass());
+        Assertions.assertEquals(ResourceLocatorBaseResource.class, uri.getMatchedResources().get(1).getClass());
+        for (Object ancestor : uri.getMatchedResources())
+            LOG.debugv("   {0}", ancestor.getClass().getName());
+        return this.getClass().getName();
+    }
+
+    @Path("/subresource2")
+    public Object getSubresource2(@Context UriInfo uri) {
+        LOG.info("Uri Ancestors for Subresource.getSubresource2():");
+        List<String> matchedURIs = uri.getMatchedURIs();
+        Assertions.assertEquals(3, matchedURIs.size());
+        Assertions.assertEquals("base/1/resources/subresource2", matchedURIs.get(0));
+        Assertions.assertEquals("base/1/resources", matchedURIs.get(1));
+        Assertions.assertEquals("", matchedURIs.get(2));
+        for (String ancestor : matchedURIs)
+            LOG.debug("   " + ancestor);
+
+        LOG.info("Uri Ancestors Object for Subresource.getSubresource2():");
+        Assertions.assertEquals(2, uri.getMatchedResources().size());
+        Assertions.assertEquals(ResourceLocatorSubresource.class, uri.getMatchedResources().get(0).getClass());
+        Assertions.assertEquals(ResourceLocatorBaseResource.class, uri.getMatchedResources().get(1).getClass());
+        for (Object ancestor : uri.getMatchedResources())
+            LOG.debugv("   {0}", ancestor.getClass().getName());
+        return new ResourceLocatorSubresource2();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java
new file mode 100644
index 0000000000000..069786972a9dc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource2.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+public class ResourceLocatorSubresource2 {
+
+    private static final Logger LOG = Logger.getLogger(ResourceLocatorSubresource2.class);
+
+    @GET
+    @Path("stuff/{param}/bar")
+    public String doGet(@PathParam("param") String param, @Context UriInfo uri) {
+        LOG.debug("Uri Ancestors for Subresource2.doGet():");
+        Assertions.assertEquals(4, uri.getMatchedURIs().size());
+        Assertions.assertEquals("base/1/resources/subresource2/stuff/2/bar", uri.getMatchedURIs().get(0));
+        Assertions.assertEquals("base/1/resources/subresource2", uri.getMatchedURIs().get(1));
+        Assertions.assertEquals("base/1/resources", uri.getMatchedURIs().get(2));
+        Assertions.assertEquals("", uri.getMatchedURIs().get(3));
+        for (String ancestor : uri.getMatchedURIs())
+            LOG.debugv("   {0}", ancestor);
+
+        LOG.debug("Uri Ancestors Object for Subresource2.doGet():");
+        Assertions.assertEquals(3, uri.getMatchedResources().size());
+        Assertions.assertEquals(ResourceLocatorSubresource2.class, uri.getMatchedResources().get(0).getClass());
+        Assertions.assertEquals(ResourceLocatorSubresource.class, uri.getMatchedResources().get(1).getClass());
+        Assertions.assertEquals(ResourceLocatorBaseResource.class, uri.getMatchedResources().get(2).getClass());
+        for (Object ancestor : uri.getMatchedResources())
+            LOG.debugv("   {0}", ancestor.getClass().getName());
+        Assertions.assertEquals("2", param);
+        return this.getClass().getName() + "-" + param;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3.java
new file mode 100644
index 0000000000000..82e3255574b84
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+
+public class ResourceLocatorSubresource3 implements ResourceLocatorSubresource3Interface {
+
+    @SuppressWarnings("unused")
+    @Override
+    public String get(List<Double> params) {
+        Assertions.assertNotNull(params);
+        Assertions.assertEquals(2, params.size());
+        double p1 = params.get(0);
+        double p2 = params.get(1);
+        return "Subresource3";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java
new file mode 100644
index 0000000000000..871463c73e923
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResourceLocatorSubresource3Interface.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+public interface ResourceLocatorSubresource3Interface {
+
+    @GET
+    @Path("3")
+    String get(@QueryParam("foo") List<Double> params);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java
new file mode 100644
index 0000000000000..0c518d330a1f0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ResponseInfoResource.java
@@ -0,0 +1,36 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.net.URI;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+
+@Path("/")
+public class ResponseInfoResource {
+    private static Logger LOG = Logger.getLogger(ResponseInfoResource.class);
+
+    @Path("/simple")
+    @GET
+    public String get(@QueryParam("abs") String abs) {
+        LOG.debug("abs query: " + abs);
+        URI base;
+        if (abs == null) {
+            base = PortProviderUtil.createURI("/new/one");
+        } else {
+            base = PortProviderUtil.createURI("/" + abs + "/new/one");
+        }
+        Response response = Response.temporaryRedirect(URI.create("new/one")).build();
+        URI uri = (URI) response.getMetadata().getFirst(HttpHeaders.LOCATION);
+        LOG.debug("Location uri: " + uri);
+        Assertions.assertEquals(base.getPath(), uri.getPath());
+        return "CONTENT";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java
new file mode 100644
index 0000000000000..f57d270263e35
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanProxy.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/test")
+public interface ScanProxy {
+    @Path("/subrsource")
+    ScanSubresource doit();
+
+    @Path("/doit")
+    @GET
+    @Produces("text/plain")
+    String get();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanResource.java
new file mode 100644
index 0000000000000..671780f813f05
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanResource.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class ScanResource implements ScanProxy {
+    public ScanSubresource doit() {
+        return new ScanSubresource();
+    }
+
+    public String get() {
+        return "hello world";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java
new file mode 100644
index 0000000000000..c57ffae49ed8b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/ScanSubresource.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+public class ScanSubresource {
+    @Path("doit")
+    @GET
+    @Produces("text/plain")
+    public String get() {
+        return "subresource-doit";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java
new file mode 100644
index 0000000000000..4262119cf37e6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceApiResource.java
@@ -0,0 +1,29 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+@Path("/{api:(?i:api)}")
+public class SpecialResourceApiResource {
+    private static Logger LOG = Logger.getLogger(SpecialResourceApiResource.class);
+
+    @Path("/{func:(?i:func)}")
+    @GET
+    @Produces("text/plain")
+    public String func() {
+        return "hello";
+    }
+
+    @PUT
+    public void put(@Context HttpHeaders headers, String val) {
+        LOG.debug(headers.getMediaType());
+        Assertions.assertEquals("Wrong request content", val, "hello");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java
new file mode 100644
index 0000000000000..ff7d79bee4816
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceDeleteResource.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("/delete")
+public class SpecialResourceDeleteResource {
+    @DELETE
+    @Consumes("text/plain")
+    public void delete(String msg) {
+        Assertions.assertEquals("hello", msg);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java
new file mode 100644
index 0000000000000..b2f3eba6be5d4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SpecialResourceStreamResource.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("/inputstream")
+public class SpecialResourceStreamResource {
+    @POST
+    @Path("/test/{type}")
+    public void test(InputStream is, @PathParam("type") final String type) throws IOException {
+
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java
new file mode 100644
index 0000000000000..00ff276718574
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseCrudService.java
@@ -0,0 +1,45 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+public interface SubResourceLocatorBaseCrudService<T> {
+
+    @GET
+    @Path("/content/{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    T getContent(
+            @PathParam("id") String id);
+
+    @POST
+    @Path("/add")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    T add(T object);
+
+    @GET
+    @Path("/all")
+    @Produces(MediaType.APPLICATION_JSON)
+    List<T> get();
+
+    @PUT
+    @Path("/update")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    T update(T object);
+
+    @DELETE
+    @Path("/delete/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    Boolean delete(
+            @PathParam("id") String id);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java
new file mode 100644
index 0000000000000..824ce81f8e3b2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorBaseService.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+public interface SubResourceLocatorBaseService extends SubResourceLocatorBaseCrudService<SubResourceLocatorOhaUserModel> {
+
+    @GET
+    @Produces("text/plain")
+    @Path("data/ada/{user}")
+    SubResourceLocatorOhaUserModel getUserDataByAdaId(
+            @PathParam("user") String adaId);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java
new file mode 100644
index 0000000000000..116f1388974f8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorFoo.java
@@ -0,0 +1,9 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+
+public interface SubResourceLocatorFoo<T> {
+    @GET
+    T getFoo(@HeaderParam("foo") String val);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java
new file mode 100644
index 0000000000000..20f6f13b82722
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorImpFoo.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.Path;
+
+@Path("blah")
+public class SubResourceLocatorImpFoo implements SubResourceLocatorFoo {
+    @Override
+    public Object getFoo(String val) {
+        return "hello";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorOhaUserModel.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorOhaUserModel.java
new file mode 100644
index 0000000000000..f0321af2985fc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorOhaUserModel.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+public class SubResourceLocatorOhaUserModel {
+    private String username;
+
+    public SubResourceLocatorOhaUserModel(final String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String toString() {
+        return username;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java
new file mode 100644
index 0000000000000..58e19750e944d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceImpl.java
@@ -0,0 +1,89 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+
+public class SubResourceLocatorPlatformServiceImpl implements SubResourceLocatorPlatformServiceResource {
+    @Override
+    public SubResourceLocatorUserResource getUserService(String entity, String ticket, String userId) {
+        return new SubResourceLocatorUserResource() {
+            @Override
+            public List<SubResourceLocatorOhaUserModel> getByNameSurname(@PathParam("name") String name,
+                    @PathParam("surname") String surname) {
+                return null;
+            }
+
+            @Override
+            public SubResourceLocatorOhaUserModel getUserByMail(@PathParam("mail") String mail) {
+                return null;
+            }
+
+            @Override
+            public Boolean update(@PathParam("id") String id, @QueryParam("adaId") String adaId,
+                    @QueryParam("name") String name, @QueryParam("surname") String surname,
+                    @QueryParam("address") String address, @QueryParam("city") String city,
+                    @QueryParam("country") String country, @QueryParam("zipcode") String zipcode,
+                    @QueryParam("email") String email, @QueryParam("phone") String phone,
+                    @QueryParam("phone") String timezone) {
+                return null;
+            }
+
+            @Override
+            public Boolean updatePassword(@PathParam("username") String username, List<String> passwords) {
+                return null;
+            }
+
+            @Override
+            public Boolean create(@QueryParam("email") String email, @QueryParam("password") String password,
+                    @QueryParam("username") String username) {
+                return null;
+            }
+
+            @Override
+            public Boolean showHelp(@PathParam("user") long userId) {
+                return null;
+            }
+
+            @Override
+            public Boolean setShowHelp(@PathParam("user") long userId, @PathParam("show") boolean showHelp) {
+                return null;
+            }
+
+            @Override
+            public void createJabberAccounts() {
+            }
+
+            @Override
+            public SubResourceLocatorOhaUserModel getContent(String id) {
+                return null;
+            }
+
+            @Override
+            public SubResourceLocatorOhaUserModel add(SubResourceLocatorOhaUserModel object) {
+                return null;
+            }
+
+            @Override
+            public List<SubResourceLocatorOhaUserModel> get() {
+                return null;
+            }
+
+            @Override
+            public SubResourceLocatorOhaUserModel update(SubResourceLocatorOhaUserModel object) {
+                return null;
+            }
+
+            @Override
+            public Boolean delete(String id) {
+                return null;
+            }
+
+            @Override
+            public SubResourceLocatorOhaUserModel getUserDataByAdaId(String adaId) {
+                return new SubResourceLocatorOhaUserModel("bill");
+            }
+        };
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java
new file mode 100644
index 0000000000000..39d503eb55c0b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorPlatformServiceResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("/platform")
+public interface SubResourceLocatorPlatformServiceResource {
+
+    @Path("/users/{user}")
+    SubResourceLocatorUserResource getUserService(
+            @HeaderParam("entity") String entity,
+            @HeaderParam("ticket") String ticket,
+            @PathParam("user") String userId);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java
new file mode 100644
index 0000000000000..f8c63ce5a8936
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/SubResourceLocatorUserResource.java
@@ -0,0 +1,111 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+@Path("/users")
+public interface SubResourceLocatorUserResource extends SubResourceLocatorBaseService {
+
+    @GET
+    @Path("/content/{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    SubResourceLocatorOhaUserModel getContent(
+            @PathParam("id") String id);
+
+    @POST
+    @Path("/add")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    SubResourceLocatorOhaUserModel add(SubResourceLocatorOhaUserModel object);
+
+    @GET
+    @Path("/all")
+    @Produces(MediaType.APPLICATION_JSON)
+    List<SubResourceLocatorOhaUserModel> get();
+
+    @PUT
+    @Path("/update")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    SubResourceLocatorOhaUserModel update(SubResourceLocatorOhaUserModel object);
+
+    @DELETE
+    @Path("/delete/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    Boolean delete(
+            @PathParam("id") String id);
+
+    @GET
+    @Path("/getbynamesurname/{name}/{surname}")
+    @Produces(MediaType.APPLICATION_JSON)
+    List<SubResourceLocatorOhaUserModel> getByNameSurname(
+            @PathParam("name") String name,
+            @PathParam("surname") String surname);
+
+    @GET
+    @Path("/getuserbymail/{mail}")
+    @Produces(MediaType.APPLICATION_JSON)
+    SubResourceLocatorOhaUserModel getUserByMail(
+            @PathParam("mail") String mail);
+
+    @POST
+    @Path("/update/{id}")
+    @Produces(MediaType.TEXT_PLAIN)
+    Boolean update(
+            @PathParam("id") String id,
+            @QueryParam("adaId") String adaId,
+            @QueryParam("name") String name,
+            @QueryParam("surname") String surname,
+            @QueryParam("address") String address,
+            @QueryParam("city") String city,
+            @QueryParam("country") String country,
+            @QueryParam("zipcode") String zipcode,
+            @QueryParam("email") String email,
+            @QueryParam("phone") String phone,
+            @QueryParam("phone") String timezone);
+
+    @POST
+    @Path("/updatepassword/{username}")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    Boolean updatePassword(
+            @PathParam("username") String username,
+            List<String> passwords);
+
+    @POST
+    @Path("/createuser")
+    @Produces(MediaType.APPLICATION_JSON)
+    Boolean create(
+            @QueryParam("email") String email,
+            @QueryParam("password") String password,
+            @QueryParam("username") String username);
+
+    @GET
+    @Path("/show-help/{user}")
+    @Produces(MediaType.TEXT_PLAIN)
+    Boolean showHelp(
+            @PathParam("user") long userId);
+
+    @PUT
+    @Path("/show-help/{user}/{show}")
+    @Produces(MediaType.TEXT_PLAIN)
+    Boolean setShowHelp(
+            @PathParam("user") long userId,
+            @PathParam("show") boolean showHelp);
+
+    @GET
+    @Path("/create-jabber")
+    @Produces(MediaType.TEXT_PLAIN)
+    void createJabberAccounts();
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java
new file mode 100644
index 0000000000000..86cb2b953627a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedQueryResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("UriInfoEncodedQueryResource/query")
+public class UriInfoEncodedQueryResource {
+
+    @GET
+    public String doGet(@QueryParam("a") String a, @Context UriInfo info) {
+        Assertions.assertEquals("a b", a);
+        Assertions.assertEquals("a b", info.getQueryParameters().getFirst("a"));
+        Assertions.assertEquals("a%20b", info.getQueryParameters(false).getFirst("a"));
+        return "content";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java
new file mode 100644
index 0000000000000..b0eed0db506e2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEncodedTemplateResource.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("UriInfoEncodedTemplateResource/{a}/{b}")
+public class UriInfoEncodedTemplateResource {
+    private static final String ERROR_MSG = "Wrong parameter";
+
+    @GET
+    public String doGet(@PathParam("a") String a, @PathParam("b") String b, @Context UriInfo info) {
+        Assertions.assertEquals("a b", a);
+        Assertions.assertEquals("x y", b);
+        Assertions.assertEquals("a b", info.getPathParameters().getFirst("a"));
+        Assertions.assertEquals("x y", info.getPathParameters().getFirst("b"));
+        Assertions.assertEquals("a%20b", info.getPathParameters(false).getFirst("a"));
+        Assertions.assertEquals("x%20y", info.getPathParameters(false).getFirst("b"));
+
+        List<PathSegment> decoded = info.getPathSegments(true);
+        Assertions.assertEquals(decoded.size(), 2);
+        Assertions.assertEquals("a b", decoded.get(0).getPath());
+        Assertions.assertEquals("x y", decoded.get(1).getPath());
+
+        List<PathSegment> encoded = info.getPathSegments(false);
+        Assertions.assertEquals(encoded.size(), 2);
+        Assertions.assertEquals("a%20b", encoded.get(0).getPath());
+        Assertions.assertEquals("x%20y", encoded.get(1).getPath());
+        return "content";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java
new file mode 100644
index 0000000000000..509bd62d62b05
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoEscapedMatrParamResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.MatrixParam;
+import javax.ws.rs.Path;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("UriInfoEscapedMatrParamResource/queryEscapedMatrParam")
+public class UriInfoEscapedMatrParamResource {
+    private static final String ERROR_MSG = "Wrong parameter";
+
+    @GET
+    public String doGet(@MatrixParam("a") String a, @MatrixParam("b") String b, @MatrixParam("c") String c,
+            @MatrixParam("d") String d) {
+        Assertions.assertEquals(ERROR_MSG, "a;b", a);
+        Assertions.assertEquals(ERROR_MSG, "x/y", b);
+        Assertions.assertEquals(ERROR_MSG, "m\\n", c);
+        Assertions.assertEquals(ERROR_MSG, "k=l", d);
+        return "content";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java
new file mode 100644
index 0000000000000..fe86c2fa716fc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoQueryParamsResource.java
@@ -0,0 +1,140 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("UriInfoQueryParamsResource/queryParams")
+public class UriInfoQueryParamsResource {
+    @GET
+    public String doGet(@QueryParam("a") String a, @Context UriInfo info) {
+        Assertions.assertNotNull(info);
+
+        Assertions.assertNotNull(info.getQueryParameters());
+        assertNotMutable(info.getQueryParameters());
+
+        return "content";
+    }
+
+    private static void assertNotMutable(MultivaluedMap<String, String> params) {
+
+        final String param = "param";
+        final String key = params.keySet().iterator().next();
+
+        try {
+            params.put(param, Collections.singletonList(param));
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.add(param, param);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.addAll(param, Collections.singletonList(param));
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.addAll(param, param);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.addFirst(param, param);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.putSingle(param, param);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.entrySet().add(new Map.Entry<String, List<String>>() {
+                @Override
+                public String getKey() {
+                    return param;
+                }
+
+                @Override
+                public List<String> getValue() {
+                    return Collections.singletonList(param);
+                }
+
+                @Override
+                public List<String> setValue(List<String> value) {
+                    return Collections.singletonList(param);
+                }
+            });
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.keySet().add(param);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.clear();
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.putAll(params);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.remove(key);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.remove(null);
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+        try {
+            params.values().add(Collections.singletonList(param));
+            Assertions.fail("mutable UriInfo");
+        } catch (UnsupportedOperationException uoe) {
+            //OK
+        }
+
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java
new file mode 100644
index 0000000000000..981c2a36063b7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoRelativizeResource.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.net.URI;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+@Path("/")
+public class UriInfoRelativizeResource {
+    @Produces("text/plain")
+    @GET
+    @Path("{path : .*}")
+    public String relativize(@Context UriInfo info, @QueryParam("to") String to) {
+        return info.relativize(URI.create(to)).toString();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java
new file mode 100644
index 0000000000000..7ba33b4faa167
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleResource.java
@@ -0,0 +1,65 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.net.URI;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+
+@Path("/UriInfoSimpleResource")
+public class UriInfoSimpleResource {
+    private static Logger LOG = Logger.getLogger(UriInfoSimpleResource.class);
+    @Context
+    UriInfo myInfo;
+
+    @Path("/simple")
+    @GET
+    public String get(@Context UriInfo info, @QueryParam("abs") String abs) {
+        LOG.debug("abs query: " + abs);
+        URI base = null;
+        if (abs == null) {
+            base = PortProviderUtil.createURI("/");
+        } else {
+            base = PortProviderUtil.createURI("/" + abs + "/");
+        }
+
+        LOG.debug("BASE URI: " + info.getBaseUri());
+        LOG.debug("Request URI: " + info.getRequestUri());
+        LOG.debug("Absolute URI: " + info.getAbsolutePath());
+        Assertions.assertEquals(base.getPath(), info.getBaseUri().getPath());
+        Assertions.assertEquals("/UriInfoSimpleResource/simple", info.getPath());
+        return "CONTENT";
+    }
+
+    @Path("/uri")
+    @GET
+    public String get(@Context UriInfo info) {
+        return info.getRequestUri().toASCIIString();
+    }
+
+    @Path("/simple/fromField")
+    @GET
+    public String getField(@QueryParam("abs") String abs) {
+        LOG.debug("abs query: " + abs);
+        URI base = null;
+        if (abs == null) {
+            base = PortProviderUtil.createURI("/");
+        } else {
+            base = PortProviderUtil.createURI("/" + abs + "/");
+        }
+
+        LOG.debug("BASE URI: " + myInfo.getBaseUri());
+        LOG.debug("Request URI: " + myInfo.getRequestUri());
+        Assertions.assertEquals(base.getPath(), myInfo.getBaseUri().getPath());
+        Assertions.assertEquals("/UriInfoSimpleResource/simple/fromField", myInfo.getPath());
+        return "CONTENT";
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java
new file mode 100644
index 0000000000000..5c92562566c6f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/UriInfoSimpleSingletonResource.java
@@ -0,0 +1,59 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import java.net.URI;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+
+@Path("UriInfoSimpleSingletonResource")
+public class UriInfoSimpleSingletonResource {
+    private static Logger LOG = Logger.getLogger(UriInfoSimpleSingletonResource.class);
+
+    @Context
+    UriInfo myInfo;
+
+    @Path("/simple")
+    @GET
+    public String get(@Context UriInfo info, @QueryParam("abs") String abs) {
+        LOG.debug("abs query: " + abs);
+        URI base = null;
+        if (abs == null) {
+            base = PortProviderUtil.createURI("/");
+        } else {
+            base = PortProviderUtil.createURI("/" + abs + "/");
+        }
+
+        LOG.debug("BASE URI: " + info.getBaseUri());
+        LOG.debug("Request URI: " + info.getRequestUri());
+        Assertions.assertEquals(base.getPath(), info.getBaseUri().getPath());
+        Assertions.assertEquals("/simple", info.getPath());
+        return "CONTENT";
+    }
+
+    @Path("/simple/fromField")
+    @GET
+    public String get(@QueryParam("abs") String abs) {
+        LOG.debug("abs query: " + abs);
+        URI base = null;
+        if (abs == null) {
+            base = PortProviderUtil.createURI("/");
+        } else {
+            base = PortProviderUtil.createURI("/" + abs + "/");
+        }
+
+        LOG.debug("BASE URI: " + myInfo.getBaseUri());
+        LOG.debug("Request URI: " + myInfo.getRequestUri());
+        Assertions.assertEquals(base.getPath(), myInfo.getBaseUri().getPath());
+        Assertions.assertEquals("/simple/fromField", myInfo.getPath());
+        return "CONTENT";
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java
new file mode 100644
index 0000000000000..884a094974b9e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingDefaultOptions.java
@@ -0,0 +1,12 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.OPTIONS;
+import javax.ws.rs.Path;
+
+@Path("{x:.*}")
+public class WiderMappingDefaultOptions {
+    @OPTIONS
+    public String options() {
+        return "hello";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java
new file mode 100644
index 0000000000000..737e54b1678a5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/WiderMappingResource.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+@Path("/hello")
+public class WiderMappingResource {
+    @POST
+    @Path("int")
+    public int postInt(int val) {
+        return val;
+    }
+
+    @POST
+    @Path("boolean")
+    public boolean postInt(boolean val) {
+        return val;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java
new file mode 100644
index 0000000000000..a4c2a6877327b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/response/ResponseTest.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.server.test.response;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ResponseTest {
+
+    @Test
+    public void testCaseInsensitivity() {
+        Response response = Response.status(Response.Status.METHOD_NOT_ALLOWED)
+                .header("allow", "HEAD").header(HttpHeaders.HOST, "whatever").build();
+
+        Assertions.assertEquals("HEAD", response.getHeaders().getFirst("allow"));
+        Assertions.assertEquals("HEAD", response.getHeaders().getFirst(HttpHeaders.ALLOW));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterException.java
new file mode 100644
index 0000000000000..2d1ed148f2dbc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterException.java
@@ -0,0 +1,10 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+@SuppressWarnings("serial")
+public class AsyncFilterException extends RuntimeException {
+
+    public AsyncFilterException(final String message) {
+        super(message);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java
new file mode 100644
index 0000000000000..8ab56151e64a0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncFilterExceptionMapper.java
@@ -0,0 +1,16 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class AsyncFilterExceptionMapper implements ExceptionMapper<AsyncFilterException> {
+
+    @Override
+    public Response toResponse(AsyncFilterException exception) {
+        return Response.ok("exception was mapped").status(Status.ACCEPTED).build();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java
new file mode 100644
index 0000000000000..467b7b48421d3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter1.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.ext.Provider;
+
+@PreMatching
+@Priority(1)
+@Provider
+public class AsyncPreMatchRequestFilter1 extends AsyncRequestFilter {
+
+    public AsyncPreMatchRequestFilter1() {
+        super("PreMatchFilter1");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java
new file mode 100644
index 0000000000000..3260a8f238804
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter2.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.ext.Provider;
+
+@PreMatching
+@Priority(2)
+@Provider
+public class AsyncPreMatchRequestFilter2 extends AsyncRequestFilter {
+
+    public AsyncPreMatchRequestFilter2() {
+        super("PreMatchFilter2");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java
new file mode 100644
index 0000000000000..20abdb936d140
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncPreMatchRequestFilter3.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.ext.Provider;
+
+@PreMatching
+@Priority(3)
+@Provider
+public class AsyncPreMatchRequestFilter3 extends AsyncRequestFilter {
+
+    public AsyncPreMatchRequestFilter3() {
+        super("PreMatchFilter3");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java
new file mode 100644
index 0000000000000..ca648199ec2b0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter.java
@@ -0,0 +1,73 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestFilter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public abstract class AsyncRequestFilter implements ResteasyReactiveContainerRequestFilter {
+
+    private final String name;
+    private volatile String callbackException;
+    private static final Logger LOG = Logger.getLogger(AsyncRequestFilter.class);
+
+    public AsyncRequestFilter(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void filter(ResteasyReactiveContainerRequestContext ctx) {
+        ctx.getHeaders().add("RequestFilterCallback" + name, String.valueOf(callbackException));
+        callbackException = null;
+
+        String action = ctx.getHeaderString(name);
+        LOG.debug("Filter request for " + name + " with action: " + action);
+        if ("sync-pass".equals(action)) {
+            // do nothing
+        } else if ("sync-fail".equals(action)) {
+            ctx.abortWith(Response.ok(name).build());
+        } else if ("async-pass".equals(action)) {
+            ctx.suspend();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> ctx.resume());
+        } else if ("async-pass-instant".equals(action)) {
+            ctx.suspend();
+            ctx.resume();
+        } else if ("async-fail".equals(action)) {
+            ctx.suspend();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> ctx.abortWith(Response.ok(name).build()));
+        } else if ("async-fail-instant".equals(action)) {
+            ctx.suspend();
+            ctx.abortWith(Response.ok(name).build());
+        } else if ("async-throw-late".equals(action)) {
+            ctx.suspend();
+            ServerRequestContext resteasyReactiveCallbackContext = ctx.getServerRequestContext();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    LOG.debug("Error:", e);
+                }
+                resteasyReactiveCallbackContext.registerCompletionCallback((t) -> {
+                    if (callbackException != null)
+                        throw new RuntimeException("Callback called twice");
+                    callbackException = Objects.toString(t);
+                });
+                if ("true".equals(ctx.getHeaderString("UseExceptionMapper")))
+                    ctx.resume(new AsyncFilterException("ouch"));
+                else
+                    ctx.resume(new Throwable("ouch"));
+            });
+        }
+        LOG.debug("Filter request for " + name + " with action: " + action + " done");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java
new file mode 100644
index 0000000000000..e95b9bf707967
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter1.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.ext.Provider;
+
+@Priority(1)
+@Provider
+public class AsyncRequestFilter1 extends AsyncRequestFilter {
+
+    public AsyncRequestFilter1() {
+        super("Filter1");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java
new file mode 100644
index 0000000000000..70379bfb39975
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter2.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.ext.Provider;
+
+@Priority(2)
+@Provider
+public class AsyncRequestFilter2 extends AsyncRequestFilter {
+
+    public AsyncRequestFilter2() {
+        super("Filter2");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java
new file mode 100644
index 0000000000000..584e67e65ba16
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilter3.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.ext.Provider;
+
+@Priority(3)
+@Provider
+public class AsyncRequestFilter3 extends AsyncRequestFilter {
+
+    public AsyncRequestFilter3() {
+        super("Filter3");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java
new file mode 100644
index 0000000000000..606b175efba1a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterResource.java
@@ -0,0 +1,95 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Path("/")
+public class AsyncRequestFilterResource {
+
+    private static final Logger LOG = Logger.getLogger(AsyncRequestFilterResource.class);
+
+    @GET
+    public Response threeSyncRequestFilters(@Context ServerRequestContext ctx,
+            @HeaderParam("Filter1") @DefaultValue("") String filter1,
+            @HeaderParam("Filter2") @DefaultValue("") String filter2,
+            @HeaderParam("Filter3") @DefaultValue("") String filter3,
+            @HeaderParam("PreMatchFilter1") @DefaultValue("") String preMatchFilter1,
+            @HeaderParam("PreMatchFilter2") @DefaultValue("") String preMatchFilter2,
+            @HeaderParam("PreMatchFilter3") @DefaultValue("") String preMatchFilter3) {
+        //        boolean async = isAsync(filter1)
+        //                || isAsync(filter2)
+        //                || isAsync(filter3)
+        //                || isAsync(preMatchFilter1)
+        //                || isAsync(preMatchFilter2)
+        //                || isAsync(preMatchFilter3);
+        //        if (async != ctx.isSuspended())
+        //            return Response.serverError().entity("Request suspention is wrong").build();
+        return Response.ok("resource").build();
+    }
+
+    @Path("non-response")
+    @GET
+    public String threeSyncRequestFiltersNonResponse(@Context ServerRequestContext ctx,
+            @HeaderParam("Filter1") @DefaultValue("") String filter1,
+            @HeaderParam("Filter2") @DefaultValue("") String filter2,
+            @HeaderParam("Filter3") @DefaultValue("") String filter3,
+            @HeaderParam("PreMatchFilter1") @DefaultValue("") String preMatchFilter1,
+            @HeaderParam("PreMatchFilter2") @DefaultValue("") String preMatchFilter2,
+            @HeaderParam("PreMatchFilter3") @DefaultValue("") String preMatchFilter3) {
+        //        boolean async = isAsync(filter1)
+        //                || isAsync(filter2)
+        //                || isAsync(filter3)
+        //                || isAsync(preMatchFilter1)
+        //                || isAsync(preMatchFilter2)
+        //                || isAsync(preMatchFilter3);
+        //        if (async != ctx.isSuspended())
+        //            throw new WebApplicationException(Response.serverError().entity("Request suspention is wrong").build());
+        return "resource";
+    }
+
+    @Path("async")
+    @GET
+    public CompletionStage<Response> async() {
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        CompletableFuture<Response> resp = new CompletableFuture<>();
+        executor.submit(() -> {
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                LOG.error("Error:", e);
+            }
+            resp.complete(Response.ok("resource").build());
+        });
+        return resp;
+    }
+
+    @Path("callback")
+    @GET
+    public String callback() {
+        return "hello";
+    }
+
+    @Path("callback-async")
+    @GET
+    public CompletionStage<String> callbackAsync() {
+        return CompletableFuture.completedFuture("hello");
+    }
+
+    private boolean isAsync(String filter) {
+        return filter.equals("async-pass")
+                || filter.equals("async-fail");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java
new file mode 100644
index 0000000000000..d0fdf5fc7c142
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncRequestFilterTest.java
@@ -0,0 +1,541 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class AsyncRequestFilterTest {
+    protected static final Logger log = Logger.getLogger(AsyncRequestFilterTest.class.getName());
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(PortProviderUtil.class,
+                                    AsyncRequestFilter.class, AsyncRequestFilter1.class, AsyncRequestFilter2.class,
+                                    AsyncRequestFilter3.class,
+                                    AsyncPreMatchRequestFilter1.class, AsyncPreMatchRequestFilter2.class,
+                                    AsyncPreMatchRequestFilter3.class,
+                                    AsyncResponseFilter.class,
+                                    AsyncResponseFilter1.class, AsyncResponseFilter2.class, AsyncResponseFilter3.class,
+                                    AsyncFilterException.class, AsyncFilterExceptionMapper.class,
+                                    AsyncRequestFilterResource.class);
+                }
+            });
+
+    /**
+     * @tpTestDetails Interceptors work
+     * @tpSince RESTEasy 4.0.0
+     */
+    @Test
+    public void testRequestFilters() throws Exception {
+        Client client = ClientBuilder.newClient();
+
+        // Create book.
+        WebTarget base = client.target(PortProviderUtil.generateURL("/"));
+
+        // all sync
+
+        Response response = base.request()
+                .header("Filter1", "sync-pass")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "sync-fail")
+                .header("Filter2", "sync-fail")
+                .header("Filter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter1", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "sync-pass")
+                .header("Filter2", "sync-fail")
+                .header("Filter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter2", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "sync-pass")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter3", response.readEntity(String.class));
+
+        // async
+        response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "async-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "async-pass")
+                .header("Filter3", "async-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "async-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "sync-pass")
+                .header("Filter2", "async-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        // async failures
+
+        response = base.request()
+                .header("Filter1", "async-fail")
+                .header("Filter2", "sync-fail")
+                .header("Filter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter1", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "sync-fail")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter2", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "async-fail")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter2", response.readEntity(String.class));
+
+        // async instantaneous
+        response = base.request()
+                .header("Filter1", "async-pass-instant")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("Filter1", "async-fail-instant")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("Filter1", response.readEntity(String.class));
+
+        client.close();
+    }
+
+    /**
+     * @tpTestDetails Interceptors work
+     * @tpSince RESTEasy 4.0.0
+     */
+    @Test
+    public void testPreMatchRequestFilters() throws Exception {
+        Client client = ClientBuilder.newClient();
+
+        // Create book.
+        WebTarget base = client.target(PortProviderUtil.generateURL("/"));
+
+        // all sync
+
+        Response response = base.request()
+                .header("PreMatchFilter1", "sync-pass")
+                .header("PreMatchFilter2", "sync-pass")
+                .header("PreMatchFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "sync-fail")
+                .header("PreMatchFilter2", "sync-fail")
+                .header("PreMatchFilter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("PreMatchFilter1", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "sync-pass")
+                .header("PreMatchFilter2", "sync-fail")
+                .header("PreMatchFilter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("PreMatchFilter2", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "sync-pass")
+                .header("PreMatchFilter2", "sync-pass")
+                .header("PreMatchFilter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("PreMatchFilter3", response.readEntity(String.class));
+
+        // async
+        response = base.request()
+                .header("PreMatchFilter1", "async-pass")
+                .header("PreMatchFilter2", "sync-pass")
+                .header("PreMatchFilter3", "sync-pass")
+                .get();
+        assertEquals("resource", response.readEntity(String.class));
+        assertEquals(200, response.getStatus());
+
+        response = base.request()
+                .header("PreMatchFilter1", "async-pass")
+                .header("PreMatchFilter2", "async-pass")
+                .header("PreMatchFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "async-pass")
+                .header("PreMatchFilter2", "async-pass")
+                .header("PreMatchFilter3", "async-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "async-pass")
+                .header("PreMatchFilter2", "sync-pass")
+                .header("PreMatchFilter3", "async-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "sync-pass")
+                .header("PreMatchFilter2", "async-pass")
+                .header("PreMatchFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        // async failures
+
+        response = base.request()
+                .header("PreMatchFilter1", "async-fail")
+                .header("PreMatchFilter2", "sync-fail")
+                .header("PreMatchFilter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("PreMatchFilter1", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "async-pass")
+                .header("PreMatchFilter2", "sync-fail")
+                .header("PreMatchFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("PreMatchFilter2", response.readEntity(String.class));
+
+        response = base.request()
+                .header("PreMatchFilter1", "async-pass")
+                .header("PreMatchFilter2", "async-fail")
+                .header("PreMatchFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("PreMatchFilter2", response.readEntity(String.class));
+
+        client.close();
+    }
+
+    /**
+     * @tpTestDetails Interceptors work
+     * @tpSince RESTEasy 4.0.0
+     */
+    @Test
+    public void testResponseFilters() throws Exception {
+        Client client = ClientBuilder.newClient();
+
+        // Create book.
+        WebTarget base = client.target(PortProviderUtil.generateURL("/"));
+
+        // all sync
+
+        Response response = base.request()
+                .header("ResponseFilter1", "sync-pass")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "sync-fail")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter1", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "sync-pass")
+                .header("ResponseFilter2", "sync-fail")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter2", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "sync-pass")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-fail")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter3", response.readEntity(String.class));
+
+        // async
+        response = base.request()
+                .header("ResponseFilter1", "async-pass")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals("resource", response.readEntity(String.class));
+        assertEquals(200, response.getStatus());
+
+        response = base.request()
+                .header("ResponseFilter1", "async-pass")
+                .header("ResponseFilter2", "async-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "async-pass")
+                .header("ResponseFilter2", "async-pass")
+                .header("ResponseFilter3", "async-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "async-pass")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "async-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "sync-pass")
+                .header("ResponseFilter2", "async-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        // async failures
+
+        response = base.request()
+                .header("ResponseFilter1", "async-fail")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter1", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "async-pass")
+                .header("ResponseFilter2", "sync-fail")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter2", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "async-pass")
+                .header("ResponseFilter2", "async-fail")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter2", response.readEntity(String.class));
+
+        // async instantaneous
+        response = base.request()
+                .header("ResponseFilter1", "async-pass-instant")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+
+        response = base.request()
+                .header("ResponseFilter1", "async-fail-instant")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter1", response.readEntity(String.class));
+
+        client.close();
+    }
+
+    /**
+     * @tpTestDetails Interceptors work
+     * @tpSince RESTEasy 4.0.0
+     */
+    @Test
+    public void testResponseFilters2() throws Exception {
+        Client client = ClientBuilder.newClient();
+
+        // Create book.
+        WebTarget base = client.target(PortProviderUtil.generateURL("/async"));
+
+        // async way later
+        Response response = base.request()
+                .header("ResponseFilter1", "sync-pass")
+                .header("ResponseFilter2", "sync-pass")
+                .header("ResponseFilter3", "async-fail-late")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("ResponseFilter3", response.readEntity(String.class));
+
+        client.close();
+    }
+
+    /**
+     * @tpTestDetails Async filters work with resume(Throwable) wrt filters/callbacks/complete
+     * @tpSince RESTEasy 4.0.0
+     */
+    @Test
+    public void testResponseFiltersThrow() throws Exception {
+        Client client = ClientBuilder.newClient();
+
+        testResponseFilterThrow(client, "/callback-async", false);
+        testResponseFilterThrow(client, "/callback", false);
+
+        testResponseFilterThrow(client, "/callback-async", true);
+        testResponseFilterThrow(client, "/callback", true);
+
+        client.close();
+    }
+
+    private void testResponseFilterThrow(Client client, String target, boolean useExceptionMapper) {
+        WebTarget base = client.target(PortProviderUtil.generateURL(target));
+
+        // throw in response filter
+        Response response = base.request()
+                .header("ResponseFilter1", "sync-pass")
+                .header("ResponseFilter2", "sync-pass")
+                .header("UseExceptionMapper", useExceptionMapper)
+                .header("ResponseFilter3", "async-throw-late")
+                .get();
+        // this is 500 even with exception mapper because exceptions in response filters are not mapped
+        assertEquals(500, response.getStatus());
+
+        try {
+            // give a chance to CI to run the callbacks
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+        }
+
+        // check that callbacks were called
+        response = base.request().get();
+        assertEquals(200, response.getStatus());
+        if (useExceptionMapper)
+            assertEquals(AsyncFilterException.class.getName() + ": ouch",
+                    response.getHeaders().getFirst("ResponseFilterCallbackResponseFilter3"));
+        else
+            assertEquals("java.lang.Throwable: ouch", response.getHeaders().getFirst("ResponseFilterCallbackResponseFilter3"));
+
+        // throw in request filter
+        response = base.request()
+                .header("Filter1", "sync-pass")
+                .header("Filter2", "sync-pass")
+                .header("UseExceptionMapper", useExceptionMapper)
+                .header("Filter3", "async-throw-late")
+                .get();
+        if (useExceptionMapper) {
+            assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatus());
+            assertEquals("exception was mapped", response.readEntity(String.class));
+        } else {
+            assertEquals(500, response.getStatus());
+        }
+
+        try {
+            // give a chance to CI to run the callbacks
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+        }
+
+        // check that callbacks were called
+        response = base.request().get();
+        assertEquals(200, response.getStatus());
+        if (useExceptionMapper)
+            assertEquals(AsyncFilterException.class.getName() + ": ouch",
+                    response.getHeaders().getFirst("RequestFilterCallbackFilter3"));
+        else
+            assertEquals("java.lang.Throwable: ouch", response.getHeaders().getFirst("RequestFilterCallbackFilter3"));
+
+    }
+
+    /**
+     * @tpTestDetails Interceptors work with non-Response resource methods
+     * @tpSince RESTEasy 4.0.0
+     */
+    @Test
+    public void testRequestFiltersGuessReturnType() throws Exception {
+        Client client = ClientBuilder.newClient();
+
+        // Create book.
+        WebTarget base = client.target(PortProviderUtil.generateURL("/non-response"));
+
+        Response response = base.request()
+                .header("Filter1", "async-pass")
+                .header("Filter2", "sync-pass")
+                .header("Filter3", "sync-pass")
+                .get();
+        assertEquals(200, response.getStatus());
+        assertEquals("resource", response.readEntity(String.class));
+        client.close();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java
new file mode 100644
index 0000000000000..4cd637586bca5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResource.java
@@ -0,0 +1,69 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.concurrent.TimeUnit;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+@Path("/async")
+public class AsyncResource {
+    @GET
+    @Produces("text/plain")
+    public void get(@Suspended final AsyncResponse response) {
+        response.setTimeout(2000, TimeUnit.MILLISECONDS);
+        Thread t = new Thread() {
+            private Logger log = Logger.getLogger(AsyncResource.class);
+
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(100);
+                    Response jaxrs = Response.ok("hello").type(MediaType.TEXT_PLAIN).build();
+                    response.resume(jaxrs);
+                } catch (Exception e) {
+                    StringWriter errors = new StringWriter();
+                    e.printStackTrace(new PrintWriter(errors));
+                    log.error(errors.toString());
+                }
+            }
+        };
+        t.start();
+    }
+
+    @GET
+    @Path("timeout")
+    @Produces("text/plain")
+    public void timeout(@Suspended final AsyncResponse response) {
+        response.setTimeout(10, TimeUnit.MILLISECONDS);
+        Thread t = new Thread() {
+            private Logger log = Logger.getLogger(AsyncResource.class);
+
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(100000);
+                    Response jaxrs = Response.ok("goodbye").type(MediaType.TEXT_PLAIN).build();
+                    response.resume(jaxrs);
+                } catch (Exception e) {
+                    StringWriter errors = new StringWriter();
+                    e.printStackTrace(new PrintWriter(errors));
+                    log.error(errors.toString());
+                }
+            }
+        };
+        t.start();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java
new file mode 100644
index 0000000000000..733af34cbaffc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter.java
@@ -0,0 +1,104 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.ws.rs.container.ContainerResponseContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerResponseFilter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public abstract class AsyncResponseFilter implements ResteasyReactiveContainerResponseFilter {
+
+    private final String name;
+    private volatile String callbackException;
+    private static final Logger LOG = Logger.getLogger(AsyncRequestFilter.class);
+
+    public AsyncResponseFilter(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public void filter(ResteasyReactiveContainerRequestContext requestContext, ContainerResponseContext ctx) {
+        // copy request filter callback values
+        for (Entry<String, List<String>> entry : requestContext.getHeaders().entrySet()) {
+            if (entry.getKey().startsWith("RequestFilterCallback"))
+                addValuesToContext(ctx, entry);
+        }
+        ctx.getHeaders().add("ResponseFilterCallback" + name, String.valueOf(callbackException));
+        callbackException = null;
+
+        String action = requestContext.getHeaderString(name);
+        LOG.debug("Filter response for " + name + " with action: " + action);
+        if ("sync-pass".equals(action)) {
+            // do nothing
+        } else if ("sync-fail".equals(action)) {
+            ctx.setEntity(name);
+        } else if ("async-pass".equals(action)) {
+            requestContext.suspend();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> requestContext.resume());
+        } else if ("async-pass-instant".equals(action)) {
+            requestContext.suspend();
+            requestContext.resume();
+        } else if ("async-fail".equals(action)) {
+            requestContext.suspend();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> {
+                ctx.setEntity(name);
+                requestContext.resume();
+            });
+        } else if ("async-fail-late".equals(action)) {
+            requestContext.suspend();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    LOG.debug("Error:", e);
+                }
+                ctx.setEntity(name);
+                requestContext.resume();
+            });
+        } else if ("async-fail-instant".equals(action)) {
+            requestContext.suspend();
+            ctx.setEntity(name);
+            requestContext.resume();
+        } else if ("sync-throw".equals(action)) {
+            throw new AsyncFilterException("ouch");
+        } else if ("async-throw-late".equals(action)) {
+            requestContext.suspend();
+            ServerRequestContext resteasyReactiveCallbackContext = requestContext.getServerRequestContext();
+            ExecutorService executor = Executors.newSingleThreadExecutor();
+            executor.submit(() -> {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    LOG.debug("Error:", e);
+                }
+                ctx.setEntity(name);
+                resteasyReactiveCallbackContext.registerCompletionCallback((t) -> {
+                    if (callbackException != null)
+                        throw new RuntimeException("Callback called twice");
+                    callbackException = Objects.toString(t);
+                });
+                if ("true".equals(requestContext.getHeaderString("UseExceptionMapper")))
+                    requestContext.resume(new AsyncFilterException("ouch"));
+                else
+                    requestContext.resume(new Throwable("ouch"));
+            });
+        }
+        LOG.debug("Filter response for " + name + " with action: " + action + " done");
+    }
+
+    @SuppressWarnings("unchecked")
+    private void addValuesToContext(ContainerResponseContext responseContext, Entry<String, List<String>> entry) {
+        // cast required to disambiguate with Object... method
+        responseContext.getHeaders().addAll(entry.getKey(), (List) entry.getValue());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java
new file mode 100644
index 0000000000000..dce1fa1d4d91b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter1.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.ext.Provider;
+
+@Priority(1)
+@Provider
+public class AsyncResponseFilter1 extends AsyncResponseFilter {
+
+    public AsyncResponseFilter1() {
+        super("ResponseFilter1");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java
new file mode 100644
index 0000000000000..6a32c14b64d81
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter2.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.ext.Provider;
+
+@Priority(2)
+@Provider
+public class AsyncResponseFilter2 extends AsyncResponseFilter {
+
+    public AsyncResponseFilter2() {
+        super("ResponseFilter2");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java
new file mode 100644
index 0000000000000..7b93d87611795
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resteasy/async/filters/AsyncResponseFilter3.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.test.resteasy.async.filters;
+
+import javax.annotation.Priority;
+import javax.ws.rs.ext.Provider;
+
+@Priority(3)
+@Provider
+public class AsyncResponseFilter3 extends AsyncResponseFilter {
+
+    public AsyncResponseFilter3() {
+        super("ResponseFilter3");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java
new file mode 100644
index 0000000000000..1ed546f18cef3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/DenyAllJaxRsTest.java
@@ -0,0 +1,88 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
+ */
+public class DenyAllJaxRsTest {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(PermitAllResource.class, UnsecuredResource.class,
+                            TestIdentityProvider.class,
+                            TestIdentityController.class,
+                            UnsecuredSubResource.class)
+                    .addAsResource(new StringAsset("quarkus.security.jaxrs.deny-unannotated-endpoints = true\n"),
+                            "application.properties"));
+
+    @BeforeAll
+    public static void setupUsers() {
+        TestIdentityController.resetRoles()
+                .add("admin", "admin", "admin")
+                .add("user", "user", "user");
+    }
+
+    @Test
+    public void shouldDenyUnannotated() {
+        String path = "/unsecured/defaultSecurity";
+        assertStatus(path, 403, 401);
+    }
+
+    @Test
+    public void shouldDenyDenyAllMethod() {
+        String path = "/unsecured/denyAll";
+        assertStatus(path, 403, 401);
+    }
+
+    @Test
+    public void shouldPermitPermitAllMethod() {
+        assertStatus("/unsecured/permitAll", 200, 200);
+    }
+
+    @Test
+    public void shouldDenySubResource() {
+        String path = "/unsecured/sub/subMethod";
+        assertStatus(path, 403, 401);
+    }
+
+    @Test
+    public void shouldAllowPermitAllSubResource() {
+        String path = "/unsecured/permitAllSub/subMethod";
+        assertStatus(path, 200, 200);
+    }
+
+    @Test
+    public void shouldAllowPermitAllClass() {
+        String path = "/permitAll/sub/subMethod";
+        assertStatus(path, 200, 200);
+    }
+
+    private void assertStatus(String path, int status, int anonStatus) {
+        given().auth().preemptive()
+                .basic("admin", "admin").get(path)
+                .then()
+                .statusCode(status);
+        given().auth().preemptive()
+                .basic("user", "user").get(path)
+                .then()
+                .statusCode(status);
+        when().get(path)
+                .then()
+                .statusCode(anonStatus);
+
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java
new file mode 100644
index 0000000000000..8c6479555944b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/LazyAuthRolesAllowedJaxRsTestCase.java
@@ -0,0 +1,53 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class LazyAuthRolesAllowedJaxRsTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(RolesAllowedResource.class, UserResource.class,
+                            TestIdentityProvider.class,
+                            TestIdentityController.class,
+                            UnsecuredSubResource.class)
+                    .addAsResource(new StringAsset("quarkus.http.auth.proactive=false\n"),
+                            "application.properties"));
+
+    @BeforeAll
+    public static void setupUsers() {
+        TestIdentityController.resetRoles()
+                .add("admin", "admin", "admin")
+                .add("user", "user", "user");
+    }
+
+    @Test
+    public void testRolesAllowed() {
+        RestAssured.get("/roles").then().statusCode(401);
+        RestAssured.given().auth().basic("admin", "admin").get("/roles").then().statusCode(200);
+        RestAssured.given().auth().basic("admin", "wrong").get("/roles").then().statusCode(401);
+        RestAssured.given().auth().basic("user", "user").get("/roles").then().statusCode(200);
+        RestAssured.given().auth().basic("admin", "admin").get("/roles/admin").then().statusCode(200);
+        RestAssured.given().auth().basic("user", "user").get("/roles/admin").then().statusCode(403);
+    }
+
+    @Test
+    public void testUser() {
+        RestAssured.get("/user").then().body(is(""));
+        RestAssured.given().auth().basic("admin", "admin").get("/user").then().body(is(""));
+        RestAssured.given().auth().preemptive().basic("admin", "admin").get("/user").then().body(is(""));
+        RestAssured.given().auth().basic("user", "user").get("/user").then().body(is(""));
+        RestAssured.given().auth().preemptive().basic("user", "user").get("/user").then().body(is(""));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java
new file mode 100644
index 0000000000000..d371a81127359
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/PermitAllResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import javax.annotation.security.PermitAll;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
+ */
+@Path("/permitAll")
+@PermitAll
+public class PermitAllResource {
+    @Path("/defaultSecurity")
+    @GET
+    public String defaultSecurity() {
+        return "defaultSecurity";
+    }
+
+    @Path("/sub")
+    public UnsecuredSubResource sub() {
+        return new UnsecuredSubResource();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java
new file mode 100644
index 0000000000000..38492b3ef2346
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java
@@ -0,0 +1,58 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(RolesAllowedResource.class, UserResource.class,
+                            TestIdentityProvider.class,
+                            TestIdentityController.class,
+                            SecurityOverrideFilter.class,
+                            UnsecuredSubResource.class)
+                    .addAsResource(new StringAsset("quarkus.http.auth.proactive=false\n"),
+                            "application.properties"));
+
+    @BeforeAll
+    public static void setupUsers() {
+        TestIdentityController.resetRoles()
+                .add("admin", "admin", "admin")
+                .add("user", "user", "user");
+    }
+
+    @Test
+    public void testRolesAllowedModified() {
+        //make sure that things work as normal when no modification happens
+        RestAssured.given()
+                .header("user", "admin")
+                .header("role", "admin")
+                .get("/roles").then().statusCode(200);
+        RestAssured.given()
+                .auth().basic("user", "user")
+                .header("user", "admin")
+                .header("role", "admin").get("/roles/admin").then().statusCode(200);
+    }
+
+    @Test
+    public void testUser() {
+        RestAssured.given().auth().basic("user", "user")
+                .header("user", "admin")
+                .header("role", "admin").get("/user").then().body(is("admin"));
+        RestAssured.given().auth().preemptive().basic("user", "user")
+                .header("user", "admin")
+                .header("role", "admin").get("/user").then().body(is("admin"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java
new file mode 100644
index 0000000000000..e55d06541c6c6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedJaxRsTestCase.java
@@ -0,0 +1,49 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class RolesAllowedJaxRsTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(RolesAllowedResource.class, UserResource.class,
+                            TestIdentityProvider.class,
+                            TestIdentityController.class,
+                            UnsecuredSubResource.class));
+
+    @BeforeAll
+    public static void setupUsers() {
+        TestIdentityController.resetRoles()
+                .add("admin", "admin", "admin")
+                .add("user", "user", "user");
+    }
+
+    @Test
+    public void testRolesAllowed() {
+        RestAssured.get("/roles").then().statusCode(401);
+        RestAssured.given().auth().basic("admin", "admin").get("/roles").then().statusCode(200);
+        RestAssured.given().auth().basic("user", "user").get("/roles").then().statusCode(200);
+        RestAssured.given().auth().basic("admin", "admin").get("/roles/admin").then().statusCode(200);
+        RestAssured.given().auth().basic("user", "user").get("/roles/admin").then().statusCode(403);
+    }
+
+    @Test
+    public void testUser() {
+        RestAssured.get("/user").then().body(is(""));
+        RestAssured.given().auth().preemptive().basic("admin", "admin").get("/user").then().statusCode(200).body(is("admin"));
+        RestAssured.given().auth().basic("admin", "admin").get("/user").then().body(is(""));
+        RestAssured.given().auth().basic("user", "user").get("/user").then().body(is(""));
+        RestAssured.given().auth().preemptive().basic("user", "user").get("/user").then().body(is("user"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java
new file mode 100644
index 0000000000000..51279ee6b74a1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/RolesAllowedResource.java
@@ -0,0 +1,30 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.smallrye.common.annotation.Blocking;
+
+/**
+ * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
+ */
+@Path("/roles")
+@PermitAll
+@Blocking
+public class RolesAllowedResource {
+    @GET
+    @RolesAllowed({ "user", "admin" })
+    public String defaultSecurity() {
+        return "default";
+    }
+
+    @Path("/admin")
+    @RolesAllowed("admin")
+    @GET
+    public String admin() {
+        return "admin";
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java
new file mode 100644
index 0000000000000..5e9f8d1f53902
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/SecurityOverrideFilter.java
@@ -0,0 +1,49 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import java.io.IOException;
+import java.security.Principal;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@PreMatching
+public class SecurityOverrideFilter implements ContainerRequestFilter {
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String user = requestContext.getHeaders().getFirst("User");
+        String role = requestContext.getHeaders().getFirst("Role");
+        if (user != null && role != null) {
+            requestContext.setSecurityContext(new SecurityContext() {
+                @Override
+                public Principal getUserPrincipal() {
+                    return new Principal() {
+                        @Override
+                        public String getName() {
+                            return user;
+                        }
+                    };
+                }
+
+                @Override
+                public boolean isUserInRole(String r) {
+                    return role.equals(r);
+                }
+
+                @Override
+                public boolean isSecure() {
+                    return false;
+                }
+
+                @Override
+                public String getAuthenticationScheme() {
+                    return "basic";
+                }
+            });
+        }
+
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java
new file mode 100644
index 0000000000000..77185150b5988
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredResource.java
@@ -0,0 +1,43 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.PermitAll;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
+ */
+@Path("/unsecured")
+public class UnsecuredResource {
+    @Path("/defaultSecurity")
+    @GET
+    public String defaultSecurity() {
+        return "defaultSecurity";
+    }
+
+    @Path("/permitAll")
+    @GET
+    @PermitAll
+    public String permitAll() {
+        return "permitAll";
+    }
+
+    @Path("/denyAll")
+    @GET
+    @DenyAll
+    public String denyAll() {
+        return "denyAll";
+    }
+
+    @Path("/sub")
+    public UnsecuredSubResource sub() {
+        return new UnsecuredSubResource();
+    }
+
+    @PermitAll
+    @Path("/permitAllSub")
+    public UnsecuredSubResource permitAllSub() {
+        return new UnsecuredSubResource();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java
new file mode 100644
index 0000000000000..212678ae7b6d1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UnsecuredSubResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+/**
+ * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
+ */
+public class UnsecuredSubResource {
+    @GET
+    @Path("/subMethod")
+    public String subMethod() {
+        return "subMethod";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java
new file mode 100644
index 0000000000000..c751cd7b7c7a1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/UserResource.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.server.test.security;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.SecurityContext;
+
+import io.smallrye.common.annotation.Blocking;
+
+@Path("/user")
+@Blocking
+public class UserResource {
+
+    @Context
+    SecurityContext securityContext;
+
+    @GET
+    public String get() {
+        if (securityContext.getUserPrincipal() == null) {
+            return null;
+        }
+        return securityContext.getUserPrincipal().getName();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java
new file mode 100644
index 0000000000000..e038be22d0e5e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationPathTest.java
@@ -0,0 +1,51 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ApplicationPathTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(TestApplication.class, HelloResource.class);
+                }
+            });
+
+    @Test
+    public void helloTest() {
+        RestAssured.get("/app/hello")
+                .then().body(Matchers.equalTo("hello"));
+    }
+
+    @ApplicationPath("app")
+    public static class TestApplication extends Application {
+
+    }
+
+    @Path("hello")
+    public static class HelloResource {
+
+        @GET
+        public String hello() {
+            return "hello";
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java
new file mode 100644
index 0000000000000..ea65f4df68d5c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationTest.java
@@ -0,0 +1,237 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.*;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * The integration test allowing to ensure that we can rely on {@link Application#getClasses()} to specify explicitly
+ * the classes to use for the application.
+ */
+class ApplicationTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(
+                            ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class,
+                            ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class,
+                            Feature1.class, Feature2.class, DynamicFeature1.class, DynamicFeature2.class,
+                            ExceptionMapper1.class, ExceptionMapper2.class, AppTest.class));
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_call_ok_of_resource_1() {
+        when()
+                .get("/rt-1/ok")
+                .then()
+                .header("X-RF-1", notNullValue())
+                .header("X-RF-2", nullValue())
+                .header("X-RF-3", notNullValue())
+                .header("X-RF-4", nullValue())
+                .header("X-RF-5", notNullValue())
+                .header("X-RF-6", nullValue())
+                .body(Matchers.is("ok1"));
+    }
+
+    @DisplayName("Should access to ko of resource 1 and call the expected exception mapper")
+    @Test
+    void should_call_ko_of_resource_1() {
+        when()
+                .get("/rt-1/ko")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_not_call_ok_of_resource_2() {
+        when()
+                .get("/rt-2/ok")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @Path("rt-1")
+    public static class ResourceTest1 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok1";
+        }
+
+        @GET
+        @Path("ko")
+        public String ko() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @Path("rt-2")
+    public static class ResourceTest2 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok2";
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter1 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-1", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter2 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-2", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter3 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-3", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter4 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-4", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter5 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-5", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter6 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-6", "Value");
+        }
+    }
+
+    @Provider
+    public static class Feature1 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter3.class);
+            return true;
+        }
+    }
+
+    @Provider
+    public static class Feature2 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter4.class);
+            return true;
+        }
+    }
+
+    @Provider
+    public static class ExceptionMapper1 implements ExceptionMapper<RuntimeException> {
+
+        @Override
+        public Response toResponse(RuntimeException exception) {
+            return Response.status(Response.Status.SERVICE_UNAVAILABLE.getStatusCode()).build();
+        }
+    }
+
+    @Provider
+    public static class ExceptionMapper2 implements ExceptionMapper<UnsupportedOperationException> {
+
+        @Override
+        public Response toResponse(UnsupportedOperationException exception) {
+            return Response.status(Response.Status.NOT_IMPLEMENTED.getStatusCode()).build();
+        }
+    }
+
+    @Provider
+    public static class DynamicFeature1 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter5.class);
+        }
+    }
+
+    @Provider
+    public static class DynamicFeature2 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter6.class);
+        }
+    }
+
+    public static class AppTest extends Application {
+
+        @Override
+        public Set<Class<?>> getClasses() {
+            return new HashSet<>(
+                    Arrays.asList(
+                            ResourceTest1.class, Feature1.class, ExceptionMapper1.class));
+        }
+
+        @Override
+        public Set<Object> getSingletons() {
+            return new HashSet<>(
+                    Arrays.asList(
+                            new ResponseFilter1(), new DynamicFeature1()));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java
new file mode 100644
index 0000000000000..4abbe528c48a2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ApplicationWithBlockingTest.java
@@ -0,0 +1,63 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.common.annotation.NonBlocking;
+
+public class ApplicationWithBlockingTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(BlockingApplication.class, ThreadNameResource.class);
+                }
+            });
+
+    @Test
+    public void test() {
+        RestAssured.get("/tname/blocking")
+                .then().body(Matchers.containsString("executor"), Matchers.not(Matchers.containsString("loop")));
+
+        RestAssured.get("/tname/nonblocking")
+                .then().body(Matchers.containsString("loop"), Matchers.not(Matchers.containsString("executor")));
+    }
+
+    @Blocking
+    public static class BlockingApplication extends Application {
+
+    }
+
+    @Path("tname")
+    public static class ThreadNameResource {
+
+        @Path("blocking")
+        @GET
+        public String threadName() {
+            return Thread.currentThread().getName();
+        }
+
+        @NonBlocking
+        @Path("nonblocking")
+        @GET
+        public String nonBlocking() {
+            return Thread.currentThread().getName();
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java
new file mode 100644
index 0000000000000..1fca320a2bfb0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Bar.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.ws.rs.NameBinding;
+
+@NameBinding
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface Bar {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java
new file mode 100644
index 0000000000000..26979401343a0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSubClass.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.QueryParam;
+
+import org.junit.jupiter.api.Assertions;
+
+public class BeanParamSubClass extends BeanParamSuperClass {
+    @QueryParam("query")
+    String queryInSubClass;
+
+    public void check(String path) {
+        super.check(path);
+        Assertions.assertEquals("one-query", queryInSubClass);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java
new file mode 100644
index 0000000000000..5e5920d7187e8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BeanParamSuperClass.java
@@ -0,0 +1,89 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.List;
+
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+public class BeanParamSuperClass {
+    @QueryParam("query")
+    String query;
+
+    @QueryParam("query")
+    private String privateQuery;
+
+    @QueryParam("query")
+    protected String protectedQuery;
+
+    @QueryParam("query")
+    public String publicQuery;
+
+    @HeaderParam("header")
+    String header;
+
+    @Context
+    UriInfo uriInfo;
+
+    @BeanParam
+    OtherBeanParam otherBeanParam;
+
+    @QueryParam("queryList")
+    List<String> queryList;
+
+    @QueryParam("query")
+    ParameterWithFromString parameterWithFromString;
+
+    @QueryParam("missing")
+    String missing;
+
+    @DefaultValue("there")
+    @QueryParam("missing")
+    String missingWithDefaultValue;
+
+    @QueryParam("missing")
+    ParameterWithFromString missingParameterWithFromString;
+
+    @DefaultValue("there")
+    @QueryParam("missing")
+    ParameterWithFromString missingParameterWithFromStringAndDefaultValue;
+
+    @QueryParam("int")
+    int primitiveParam;
+
+    @QueryParam("missing")
+    int missingPrimitiveParam;
+
+    @DefaultValue("42")
+    @QueryParam("missing")
+    int missingPrimitiveParamWithDefaultValue;
+
+    public void check(String path) {
+        Assertions.assertEquals("one-query", query);
+        Assertions.assertEquals("one-query", privateQuery);
+        Assertions.assertEquals("one-query", protectedQuery);
+        Assertions.assertEquals("one-query", publicQuery);
+        Assertions.assertEquals("one-header", header);
+        Assertions.assertNotNull(uriInfo);
+        Assertions.assertEquals(path, uriInfo.getPath());
+        Assertions.assertNotNull(otherBeanParam);
+        otherBeanParam.check(path);
+        Assertions.assertNotNull(queryList);
+        Assertions.assertEquals("one", queryList.get(0));
+        Assertions.assertEquals("two", queryList.get(1));
+        Assertions.assertNotNull(parameterWithFromString);
+        Assertions.assertEquals("ParameterWithFromString[val=one-query]", parameterWithFromString.toString());
+        Assertions.assertNull(missing);
+        Assertions.assertEquals("there", missingWithDefaultValue);
+        Assertions.assertNull(missingParameterWithFromString);
+        Assertions.assertEquals("ParameterWithFromString[val=there]", missingParameterWithFromStringAndDefaultValue.toString());
+        Assertions.assertEquals(666, primitiveParam);
+        Assertions.assertEquals(0, missingPrimitiveParam);
+        Assertions.assertEquals(42, missingPrimitiveParamWithDefaultValue);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java
new file mode 100644
index 0000000000000..6ba8e799d6b64
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BlockingWithFilterTest.java
@@ -0,0 +1,67 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.smallrye.common.annotation.Blocking;
+
+public class BlockingWithFilterTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(TestFilter.class, TestResource.class);
+                }
+            });
+
+    @Test
+    public void requestFilterTest() {
+        String response = RestAssured.get("/test/request")
+                .then().statusCode(200).contentType("text/plain").extract().body().asString();
+        String[] parts = response.split("/");
+        assertEquals(2, parts.length);
+        assertEquals(parts[0], parts[1]);
+        assertFalse(parts[0].contains("eventloop"));
+        assertTrue(parts[0].contains("executor"));
+    }
+
+    public static class TestFilter {
+
+        @ServerRequestFilter
+        public void filter(ContainerRequestContext requestContext) {
+            requestContext.getHeaders().add("filter-thread", Thread.currentThread().getName());
+        }
+
+    }
+
+    @Path("/test")
+    public static class TestResource {
+
+        @Blocking
+        @Path("/request")
+        @GET
+        public String get(@Context HttpHeaders headers) {
+            return headers.getHeaderString("filter-thread") + "/" + Thread.currentThread().getName();
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java
new file mode 100644
index 0000000000000..ba1a6bce17a25
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/BuildProfileTest.java
@@ -0,0 +1,240 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.profile.IfBuildProfile;
+import io.quarkus.arc.profile.UnlessBuildProfile;
+import io.quarkus.arc.properties.IfBuildProperty;
+import io.quarkus.arc.properties.UnlessBuildProperty;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * The integration test for the support of build time conditions on JAX-RS resource classes.
+ */
+class BuildProfileTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(
+                            ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class,
+                            ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class,
+                            Feature1.class, Feature2.class, DynamicFeature1.class, DynamicFeature2.class,
+                            ExceptionMapper1.class, ExceptionMapper2.class))
+            .overrideConfigKey("some.prop1", "v1")
+            .overrideConfigKey("some.prop2", "v2");
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_call_ok_of_resource_1() {
+        when()
+                .get("/rt-1/ok")
+                .then()
+                .header("X-RF-1", notNullValue())
+                .header("X-RF-2", nullValue())
+                .header("X-RF-3", notNullValue())
+                .header("X-RF-4", nullValue())
+                .header("X-RF-5", notNullValue())
+                .header("X-RF-6", nullValue())
+                .body(Matchers.is("ok1"));
+    }
+
+    @DisplayName("Should access to ko of resource 1 and call the expected exception mapper")
+    @Test
+    void should_call_ko_of_resource_1() {
+        when()
+                .get("/rt-1/ko")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_not_call_ok_of_resource_2() {
+        when()
+                .get("/rt-2/ok")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @IfBuildProfile("test")
+    @Path("rt-1")
+    public static class ResourceTest1 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok1";
+        }
+
+        @GET
+        @Path("ko")
+        public String ko() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @IfBuildProfile("foo")
+    @Path("rt-2")
+    public static class ResourceTest2 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok2";
+        }
+    }
+
+    @IfBuildProperty(name = "some.prop1", stringValue = "v1") // will be enabled because the value matches
+    @Provider
+    public static class ResponseFilter1 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-1", "Value");
+        }
+    }
+
+    @IfBuildProperty(name = "some.prop1", stringValue = "v") // won't be enabled because the value doesn't match
+    @Provider
+    public static class ResponseFilter2 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-2", "Value");
+        }
+    }
+
+    @IfBuildProfile("test")
+    @UnlessBuildProperty(name = "some.prop2", stringValue = "v1") // will be enabled because the value doesn't match
+    @Provider
+    public static class ResponseFilter3 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-3", "Value");
+        }
+    }
+
+    @UnlessBuildProperty(name = "some.prop2", stringValue = "v2") // won't be enabled because the value matches
+    @Provider
+    public static class ResponseFilter4 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-4", "Value");
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class ResponseFilter5 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-5", "Value");
+        }
+    }
+
+    @IfBuildProfile("bar")
+    @Provider
+    public static class ResponseFilter6 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-6", "Value");
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class Feature1 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter3.class);
+            return true;
+        }
+    }
+
+    @UnlessBuildProfile("test")
+    @Provider
+    public static class Feature2 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter4.class);
+            return true;
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class ExceptionMapper1 implements ExceptionMapper<RuntimeException> {
+
+        @Override
+        public Response toResponse(RuntimeException exception) {
+            return Response.status(Response.Status.SERVICE_UNAVAILABLE.getStatusCode()).build();
+        }
+    }
+
+    @UnlessBuildProfile("test")
+    @Provider
+    public static class ExceptionMapper2 implements ExceptionMapper<UnsupportedOperationException> {
+
+        @Override
+        public Response toResponse(UnsupportedOperationException exception) {
+            return Response.status(Response.Status.NOT_IMPLEMENTED.getStatusCode()).build();
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class DynamicFeature1 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter5.class);
+        }
+    }
+
+    @IfBuildProfile("bar")
+    @Provider
+    public static class DynamicFeature2 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter6.class);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java
new file mode 100644
index 0000000000000..376612d254a1c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/DynamicFeatureRequestFilterWithLowPriority.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+
+@Priority(Priorities.USER + 1000)
+public class DynamicFeatureRequestFilterWithLowPriority implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("feature-filter-request");
+        requestContext.getHeaders().putSingle("feature-filter-request", previousFilterHeaderValue + "-low");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedException.java
new file mode 100644
index 0000000000000..c2809f1d6a4d2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedException.java
@@ -0,0 +1,4 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+public class FeatureMappedException extends RuntimeException {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java
new file mode 100644
index 0000000000000..f95bea81a89e7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureMappedExceptionMapper.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.Serializable;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+public class FeatureMappedExceptionMapper implements Cloneable, ExceptionMapper<FeatureMappedException>, Serializable {
+
+    @Override
+    public Response toResponse(FeatureMappedException exception) {
+        return Response.status(667).build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java
new file mode 100644
index 0000000000000..d8747131ffcea
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithHighestPriority.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+
+@Priority(Priorities.AUTHENTICATION)
+public class FeatureRequestFilterWithHighestPriority implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add("feature-filter-request", "authentication");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java
new file mode 100644
index 0000000000000..f3e30db9219cd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureRequestFilterWithNormalPriority.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+
+public class FeatureRequestFilterWithNormalPriority implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("feature-filter-request");
+        requestContext.getHeaders().putSingle("feature-filter-request", previousFilterHeaderValue + "-default");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java
new file mode 100644
index 0000000000000..6c7e4cab8cb1a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FeatureResponseFilter.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+
+public class FeatureResponseFilter implements ContainerResponseFilter {
+
+    private final String headerName;
+    private final String headerValue;
+
+    public FeatureResponseFilter(String headerName, String headerValue) {
+        this.headerName = headerName;
+        this.headerValue = headerValue;
+    }
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+        responseContext.getHeaders().add(headerName, headerValue);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java
new file mode 100644
index 0000000000000..a3776b3e9c462
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedResource.java
@@ -0,0 +1,53 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("injection")
+public class FieldInjectedResource {
+
+    @QueryParam("query")
+    String query;
+
+    @HeaderParam("header")
+    String header;
+
+    @Context
+    UriInfo uriInfo;
+
+    @BeanParam
+    SimpleBeanParam beanParam;
+
+    @Path("field")
+    @GET
+    public String field() {
+        checkInjections("/injection/field", query, header, uriInfo, beanParam);
+        return "OK";
+    }
+
+    protected void checkInjections(String path, String query, String header, UriInfo uriInfo, SimpleBeanParam beanParam) {
+        Assertions.assertEquals("one-query", query);
+        Assertions.assertEquals("one-header", header);
+        Assertions.assertNotNull(uriInfo);
+        Assertions.assertEquals(path, uriInfo.getPath());
+        Assertions.assertNotNull(beanParam);
+        beanParam.check(path);
+    }
+
+    @Path("param")
+    @GET
+    public String param(@QueryParam("query") String query,
+            @HeaderParam("header") String header,
+            @Context UriInfo uriInfo,
+            @BeanParam SimpleBeanParam beanParam) {
+        checkInjections("/injection/param", query, header, uriInfo, beanParam);
+        return "OK";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java
new file mode 100644
index 0000000000000..bdbc47772cc09
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java
@@ -0,0 +1,53 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("injection-subclass")
+public class FieldInjectedSubClassResource extends FieldInjectedResource {
+
+    @QueryParam("query")
+    String queryInSubClass;
+
+    @Context
+    UriInfo uriInfoInSubClass;
+
+    @BeanParam
+    BeanParamSubClass beanParamSubClass;
+
+    @Path("field2")
+    @GET
+    public String field() {
+        checkInjections("/injection-subclass/field2", query, header, uriInfo, beanParam, queryInSubClass, uriInfoInSubClass,
+                beanParamSubClass);
+        return "OK";
+    }
+
+    private void checkInjections(String path, String query, String header, UriInfo uriInfo, SimpleBeanParam beanParam,
+            String queryInSubClass, UriInfo uriInfoInSubClass, BeanParamSubClass beanParamSubClass) {
+        super.checkInjections(path, query, header, uriInfo, beanParam);
+        Assertions.assertEquals("one-query", queryInSubClass);
+        Assertions.assertNotNull(uriInfoInSubClass);
+        Assertions.assertEquals(path, uriInfoInSubClass.getPath());
+        Assertions.assertNotNull(beanParamSubClass);
+        beanParamSubClass.check(path);
+    }
+
+    @Path("param2")
+    @GET
+    public String param(@QueryParam("query") String query,
+            @HeaderParam("header") String header,
+            @Context UriInfo uriInfo,
+            @BeanParam @NotNull BeanParamSubClass beanParam) {
+        checkInjections("/injection-subclass/param2", query, header, uriInfo, this.beanParam, query, uriInfo, beanParam);
+        return "OK";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java
new file mode 100644
index 0000000000000..8c58b741625c3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Foo.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.ws.rs.NameBinding;
+
+@NameBinding
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface Foo {
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java
new file mode 100644
index 0000000000000..921a8cbfea0cf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HeaderParamResource.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+
+@Path("/ctor-header")
+public class HeaderParamResource {
+
+    private final String headerParamValue;
+
+    public HeaderParamResource(@HeaderParam("h1") String headerParamValue) {
+        this.headerParamValue = headerParamValue;
+    }
+
+    @GET
+    public String get() {
+        return headerParamValue;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java
new file mode 100644
index 0000000000000..e3ec06842e6cb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/HelloService.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class HelloService {
+
+    public String sayHello() {
+        return "Hello";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java
new file mode 100644
index 0000000000000..9948f486809a3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/IllegalClassExceptionMapper.java
@@ -0,0 +1,94 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.util.Printer;
+import org.objectweb.asm.util.Textifier;
+import org.objectweb.asm.util.TraceClassVisitor;
+import org.objectweb.asm.util.TraceMethodVisitor;
+
+import io.quarkus.gizmo.Gizmo;
+
+@Provider
+public class IllegalClassExceptionMapper implements ExceptionMapper<IncompatibleClassChangeError> {
+
+    public static class MethodFindingClassVisitor extends ClassVisitor {
+
+        private String method;
+        private Textifier textifier;
+        private PrintWriter writer;
+
+        public MethodFindingClassVisitor(String method, PrintWriter writer) {
+            super(Gizmo.ASM_API_VERSION);
+            this.method = method;
+            this.writer = writer;
+            textifier = new Textifier();
+        }
+
+        @Override
+        public void visitEnd() {
+            textifier.visitClassEnd();
+            textifier.print(writer);
+            writer.flush();
+            super.visitEnd();
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            if (method.equals(name)) {
+                System.err.println("Match for method " + name + " " + descriptor);
+                Printer methodPrinter = textifier.visitMethod(access, name, descriptor, signature, exceptions);
+                return new TraceMethodVisitor(mv, methodPrinter);
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public Response toResponse(IncompatibleClassChangeError exception) {
+        String message = exception.getMessage();
+        Pattern pattern = Pattern.compile("Method (([a-zA-Z0-9_]+\\.)+)[a-zA-Z0-9_]+\\(.*");
+        Matcher matcher = pattern.matcher(message);
+        exception.printStackTrace();
+        if (matcher.matches()) {
+            String classname = matcher.group(1);
+            classname = classname.substring(0, classname.length() - 1);
+            System.err.println("IncompatibleClassChangeError for: " + classname + " dumping its bytecode:");
+            dumpClass(classname, null);
+            StackTraceElement stackTraceElement = exception.getStackTrace()[0];
+            System.err.println("The call that triggered the error is at: " + stackTraceElement + " so dumping its bytecode:");
+            dumpClass(stackTraceElement.getClassName(), stackTraceElement.getMethodName());
+        }
+        StringWriter writer = new StringWriter();
+        exception.printStackTrace(new PrintWriter(writer));
+        return Response.serverError().entity(writer.toString()).build();
+    }
+
+    private void dumpClass(String classname, String method) {
+        InputStream bytes = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream(classname.replace('.', '/') + ".class");
+        try {
+            ClassReader cr = new ClassReader(bytes);
+            PrintWriter writer = new PrintWriter(System.err);
+            if (method == null)
+                cr.accept(new TraceClassVisitor(writer), 0);
+            else
+                cr.accept(new MethodFindingClassVisitor(method, writer), 0);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java
new file mode 100644
index 0000000000000..c1871daa1da30
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResource.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("iface")
+public interface InterfaceResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    String hello();
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java
new file mode 100644
index 0000000000000..e7943d12c2f94
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/InterfaceResourceImpl.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.inject.Inject;
+
+public class InterfaceResourceImpl implements InterfaceResource {
+
+    @Inject
+    HelloService helloService;
+
+    @Override
+    public String hello() {
+        return helloService.sayHello();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java
new file mode 100644
index 0000000000000..2f7da02dc2298
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateCustomParamConverterProviderTest.java
@@ -0,0 +1,84 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class LocalDateCustomParamConverterProviderTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloResource.class, CustomLocalDateParamConverterProvider.class,
+                            CustomLocalDateParamConverter.class));
+
+    @Test
+    public void localDateAsQueryParam() {
+        RestAssured.get("/hello?date=1981-W38-6")
+                .then().body(Matchers.equalTo("hello#1981-09-19"));
+    }
+
+    @Test
+    public void localDateAsPathParam() {
+        RestAssured.get("/hello/1995-W38-4")
+                .then().body(Matchers.equalTo("hello@1995-09-21"));
+    }
+
+    @Path("hello")
+    public static class HelloResource {
+
+        @GET
+        public String helloQuery(@QueryParam("date") LocalDate date) {
+            return "hello#" + date;
+        }
+
+        @GET
+        @Path("{date}")
+        public String helloPath(@PathParam("date") LocalDate date) {
+            return "hello@" + date;
+        }
+    }
+
+    public static class CustomLocalDateParamConverter implements ParamConverter<LocalDate> {
+
+        @Override
+        public LocalDate fromString(String value) {
+            return LocalDate.parse(value, DateTimeFormatter.ISO_WEEK_DATE);
+        }
+
+        @Override
+        public String toString(LocalDate value) {
+            return value.format(DateTimeFormatter.ISO_WEEK_DATE);
+        }
+    }
+
+    @Provider
+    public static class CustomLocalDateParamConverterProvider implements ParamConverterProvider {
+
+        @Override
+        public <T> ParamConverter<T> getConverter(Class<T> rawType, Type genericType, Annotation[] annotations) {
+            if (rawType == LocalDate.class) {
+                return (ParamConverter<T>) new CustomLocalDateParamConverter();
+            }
+            return null;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java
new file mode 100644
index 0000000000000..5f7fced579066
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/LocalDateParamTest.java
@@ -0,0 +1,52 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.time.LocalDate;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class LocalDateParamTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloResource.class));
+
+    @Test
+    public void localDateAsQueryParam() {
+        RestAssured.get("/hello?date=1984-08-08")
+                .then().body(Matchers.equalTo("hello#1984-08-08"));
+    }
+
+    @Test
+    public void localDateAsPathParam() {
+        RestAssured.get("/hello/1995-09-21")
+                .then().body(Matchers.equalTo("hello@1995-09-21"));
+    }
+
+    @Path("hello")
+    public static class HelloResource {
+
+        @GET
+        public String helloQuery(@QueryParam("date") LocalDate date) {
+            return "hello#" + date;
+        }
+
+        @GET
+        @Path("{date}")
+        public String helloPath(@PathParam("date") LocalDate date) {
+            return "hello@" + date;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameter.java
new file mode 100644
index 0000000000000..4d0bf72c181af
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameter.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+public class MyParameter {
+    private String value;
+
+    public MyParameter(String str) {
+        this.value = "WRONG CONSTRUCTOR";
+    }
+
+    public MyParameter(String str, String str2) {
+        this.value = str + str2;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java
new file mode 100644
index 0000000000000..62f5bad385c7e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterConverter.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.ext.ParamConverter;
+
+public class MyParameterConverter implements ParamConverter<MyParameter> {
+
+    @Override
+    public MyParameter fromString(String value) {
+        return new MyParameter(value, value);
+    }
+
+    @Override
+    public String toString(MyParameter value) {
+        return value.toString();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java
new file mode 100644
index 0000000000000..40a21c5558ff4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/MyParameterProvider.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class MyParameterProvider implements ParamConverterProvider {
+    @Override
+    public <T> ParamConverter<T> getConverter(Class<T> rawType, Type genericType, Annotation[] annotations) {
+        if (rawType == MyParameter.class)
+            return (ParamConverter<T>) new MyParameterConverter();
+        return null;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java
new file mode 100644
index 0000000000000..fcb4aa7203ca0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/NewParamsRestResource.java
@@ -0,0 +1,111 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.Optional;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Providers;
+import javax.ws.rs.sse.Sse;
+import javax.ws.rs.sse.SseEventSink;
+
+import org.jboss.resteasy.reactive.RestCookie;
+import org.jboss.resteasy.reactive.RestForm;
+import org.jboss.resteasy.reactive.RestHeader;
+import org.jboss.resteasy.reactive.RestMatrix;
+import org.jboss.resteasy.reactive.RestPath;
+import org.jboss.resteasy.reactive.RestQuery;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.runtime.BlockingOperationControl;
+import io.smallrye.common.annotation.Blocking;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+
+@Path("/new-params/{klass}/{regex:[^/]+}")
+public class NewParamsRestResource {
+
+    @GET
+    @Path("{id}")
+    public String get(String klass, String regex, String id) {
+        return "GET:" + klass + ":" + regex + ":" + id;
+    }
+
+    @POST
+    @Path("params/{p}")
+    public String params(@RestPath String p,
+            @RestQuery String q,
+            @RestQuery Optional<String> q2,
+            @RestQuery Optional<Integer> q3,
+            @RestHeader int h,
+            @RestForm String f,
+            @RestMatrix String m,
+            @RestCookie String c) {
+        return "params: p: " + p + ", q: " + q + ", h: " + h + ", f: " + f + ", m: " + m + ", c: " + c + ", q2: "
+                + q2.orElse("empty") + ", q3: " + q3.orElse(-1);
+    }
+
+    @Blocking
+    @POST
+    @Path("form-blocking")
+    public String formBlocking(@RestForm String f) {
+        if (!BlockingOperationControl.isBlockingAllowed()) {
+            throw new RuntimeException("should not have dispatched");
+        }
+        return f;
+    }
+
+    @GET
+    @Path("context")
+    public String context(// Spec:
+            UriInfo uriInfo,
+            HttpHeaders headers,
+            Request request,
+            SecurityContext securityContext,
+            Providers providers,
+            ResourceContext resourceContext,
+            Configuration configuration,
+            // Extras
+            ResourceInfo resourceInfo,
+            SimpleResourceInfo simplifiedResourceInfo,
+            ServerRequestContext restContext,
+            HttpServerRequest httpServerRequest,
+            HttpServerResponse httpServerResponse) {
+        Assertions.assertNotNull(uriInfo);
+        Assertions.assertNotNull(headers);
+        Assertions.assertNotNull(request);
+        Assertions.assertNotNull(securityContext);
+        Assertions.assertNotNull(providers);
+        Assertions.assertNotNull(resourceContext);
+        Assertions.assertNotNull(configuration);
+        Assertions.assertNotNull(resourceInfo);
+        Assertions.assertNotNull(simplifiedResourceInfo);
+        Assertions.assertNotNull(restContext);
+        Assertions.assertNotNull(httpServerRequest);
+        Assertions.assertNotNull(httpServerResponse);
+        return "OK";
+    }
+
+    @GET
+    @Path("sse")
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public void eventStream(SseEventSink eventSink,
+            Sse sse) {
+        Assertions.assertNotNull(eventSink);
+        Assertions.assertNotNull(sse);
+        try (SseEventSink sink = eventSink) {
+            eventSink.send(sse.newEvent("OK"));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java
new file mode 100644
index 0000000000000..a10d946fa4224
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/OtherBeanParam.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+public class OtherBeanParam {
+    @QueryParam("query")
+    String query;
+
+    @HeaderParam("header")
+    String header;
+
+    @Context
+    UriInfo uriInfo;
+
+    public void check(String path) {
+        Assertions.assertEquals("one-query", query);
+        Assertions.assertEquals("one-header", header);
+        Assertions.assertNotNull(uriInfo);
+        Assertions.assertEquals(path, uriInfo.getPath());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ParameterWithFromString.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ParameterWithFromString.java
new file mode 100644
index 0000000000000..fd03fd5b2f67e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ParameterWithFromString.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+public class ParameterWithFromString {
+
+    private String val;
+
+    public ParameterWithFromString(String val) {
+        this.val = val;
+    }
+
+    public static ParameterWithFromString fromString(String val) {
+        return new ParameterWithFromString(val);
+    }
+
+    @Override
+    public String toString() {
+        return "ParameterWithFromString[val=" + val + "]";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java
new file mode 100644
index 0000000000000..e28b55e4c0597
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/Person.java
@@ -0,0 +1,27 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.validation.constraints.NotBlank;
+
+public class Person {
+
+    private String first;
+
+    @NotBlank(message = "Title cannot be blank")
+    private String last;
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getLast() {
+        return last;
+    }
+
+    public void setLast(String last) {
+        this.last = last;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/PortProviderUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/PortProviderUtil.java
new file mode 100644
index 0000000000000..90e36b0fb2ff9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/PortProviderUtil.java
@@ -0,0 +1,71 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import io.quarkus.test.common.http.TestHTTPResourceManager;
+
+/**
+ * Utility class that provides a port number for the Resteasy embedded container.
+ */
+public class PortProviderUtil {
+
+    /**
+     * Create a URI for the provided path, using the configured port
+     *
+     * @param path the request path
+     * @return a full URI
+     */
+    public static URI createURI(String path) {
+        return URI.create(generateURL(path));
+    }
+
+    /**
+     * Generate a base URL incorporating the configured port.
+     *
+     * @return a full URL
+     */
+    public static String generateBaseUrl() {
+        return generateURL("");
+    }
+
+    /**
+     * Generate a URL with port, hostname
+     *
+     * @param path the path
+     * @return a full URL
+     */
+    public static String generateURL(String path) {
+        return TestHTTPResourceManager.getUri().replace("0.0.0.0", "localhost") + path;
+    }
+
+    public static String generateURL(String path, String ignore) {
+        return generateURL(path);
+    }
+
+    /**
+     * Get port.
+     *
+     * @return The port number
+     */
+    public static int getPort() {
+        try {
+            return new URI(TestHTTPResourceManager.getUri()).getPort();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Get host IP.
+     *
+     * @return The host IP
+     */
+    public static String getHost() {
+        try {
+            return new URI(TestHTTPResourceManager.getUri()).getHost();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/PrefixedQuarkusRestTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/PrefixedQuarkusRestTestCase.java
new file mode 100644
index 0000000000000..5c0c38561fe74
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/PrefixedQuarkusRestTestCase.java
@@ -0,0 +1,80 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * This test makes sure that the http.root-path is honored by quarkus-rest
+ * by running the same test as SimpleQuarkusRestTestCase
+ */
+public class PrefixedQuarkusRestTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .overrideConfigKey("quarkus.http.root-path", "/prefix")
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(SimpleQuarkusRestResource.class, Person.class,
+                                    TestRequestFilter.class, TestRequestFilterWithHighPriority.class,
+                                    TestRequestFilterWithHighestPriority.class,
+                                    Foo.class, Bar.class,
+                                    TestFooRequestFilter.class, TestBarRequestFilter.class, TestFooBarRequestFilter.class,
+                                    TestFooResponseFilter.class, TestBarResponseFilter.class, TestFooBarResponseFilter.class,
+                                    TestResponseFilter.class, HelloService.class, TestException.class,
+                                    TestExceptionMapper.class, TestPreMatchRequestFilter.class,
+                                    FeatureMappedException.class, FeatureMappedExceptionMapper.class,
+                                    FeatureRequestFilterWithNormalPriority.class, FeatureRequestFilterWithHighestPriority.class,
+                                    FeatureResponseFilter.class, DynamicFeatureRequestFilterWithLowPriority.class,
+                                    TestFeature.class, TestDynamicFeature.class,
+                                    SubResource.class, RootAResource.class, RootBResource.class,
+                                    TestWriter.class, TestClass.class);
+                }
+            });
+
+    @Test
+    public void simpleTest() {
+        Assertions.assertEquals("prefix", RestAssured.basePath);
+        RestAssured.get("/simple")
+                .then().body(Matchers.equalTo("GET"));
+        RestAssured.get("/simple/foo")
+                .then().body(Matchers.equalTo("GET:foo"));
+
+        RestAssured.post("/simple")
+                .then().body(Matchers.equalTo("POST"));
+
+        RestAssured.get("/missing")
+                .then().statusCode(404);
+
+        RestAssured.post("/missing")
+                .then().statusCode(404);
+
+        RestAssured.delete("/missing")
+                .then().statusCode(404);
+
+        RestAssured.delete("/simple")
+                .then().body(Matchers.equalTo("DELETE"));
+
+        RestAssured.put("/simple")
+                .then().body(Matchers.equalTo("PUT"));
+
+        RestAssured.head("/simple")
+                .then().header("Stef", "head");
+
+        RestAssured.options("/simple")
+                .then().body(Matchers.equalTo("OPTIONS"));
+
+        RestAssured.patch("/simple")
+                .then().body(Matchers.equalTo("PATCH"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java
new file mode 100644
index 0000000000000..805a0f2f112e0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/QueryParamResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+@Path("/ctor-query")
+public class QueryParamResource {
+
+    private final String queryParamValue;
+
+    public QueryParamResource(HelloService helloService, @QueryParam("q1") String queryParamValue, @Context UriInfo uriInfo) {
+        this.queryParamValue = queryParamValue;
+    }
+
+    @GET
+    public String get() {
+        return queryParamValue;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java
new file mode 100644
index 0000000000000..2b3a815660727
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/ResourceInfoInjectingFilter.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class ResourceInfoInjectingFilter implements ContainerRequestFilter {
+
+    @Context
+    ResourceInfo resourceInfo;
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add("method-name", resourceInfo.getResourceMethod().getName());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java
new file mode 100644
index 0000000000000..3e8a40917028d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootAResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/")
+public class RootAResource {
+
+    @GET
+    @Path("a")
+    public String a() {
+        return "a";
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java
new file mode 100644
index 0000000000000..0184794913c48
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RootBResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/")
+public class RootBResource {
+
+    @GET
+    @Path("b")
+    public String b() {
+        return "b";
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java
new file mode 100644
index 0000000000000..bf3a4763e2d18
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleBeanParam.java
@@ -0,0 +1,97 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.List;
+
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.jupiter.api.Assertions;
+
+public class SimpleBeanParam {
+    @QueryParam("query")
+    String query;
+
+    @QueryParam("query")
+    private String privateQuery;
+
+    @QueryParam("query")
+    protected String protectedQuery;
+
+    @QueryParam("query")
+    public String publicQuery;
+
+    @HeaderParam("header")
+    String header;
+
+    @Context
+    UriInfo uriInfo;
+
+    @BeanParam
+    OtherBeanParam otherBeanParam;
+
+    @QueryParam("queryList")
+    List<String> queryList;
+
+    @QueryParam("query")
+    ParameterWithFromString parameterWithFromString;
+
+    @QueryParam("missing")
+    String missing;
+
+    @DefaultValue("there")
+    @QueryParam("missing")
+    String missingWithDefaultValue;
+
+    @QueryParam("missing")
+    ParameterWithFromString missingParameterWithFromString;
+
+    @DefaultValue("there")
+    @QueryParam("missing")
+    ParameterWithFromString missingParameterWithFromStringAndDefaultValue;
+
+    @QueryParam("int")
+    int primitiveParam;
+
+    @QueryParam("missing")
+    int missingPrimitiveParam;
+
+    @DefaultValue("42")
+    @QueryParam("missing")
+    int missingPrimitiveParamWithDefaultValue;
+
+    @QueryParam("query")
+    MyParameter myParameter;
+
+    @QueryParam("query")
+    List<MyParameter> myParameterList;
+
+    public void check(String path) {
+        Assertions.assertEquals("one-query", query);
+        Assertions.assertEquals("one-query", privateQuery);
+        Assertions.assertEquals("one-query", protectedQuery);
+        Assertions.assertEquals("one-query", publicQuery);
+        Assertions.assertEquals("one-header", header);
+        Assertions.assertNotNull(uriInfo);
+        Assertions.assertEquals(path, uriInfo.getPath());
+        Assertions.assertNotNull(otherBeanParam);
+        otherBeanParam.check(path);
+        Assertions.assertNotNull(queryList);
+        Assertions.assertEquals("one", queryList.get(0));
+        Assertions.assertEquals("two", queryList.get(1));
+        Assertions.assertNotNull(parameterWithFromString);
+        Assertions.assertEquals("ParameterWithFromString[val=one-query]", parameterWithFromString.toString());
+        Assertions.assertNull(missing);
+        Assertions.assertEquals("there", missingWithDefaultValue);
+        Assertions.assertNull(missingParameterWithFromString);
+        Assertions.assertEquals("ParameterWithFromString[val=there]", missingParameterWithFromStringAndDefaultValue.toString());
+        Assertions.assertEquals(666, primitiveParam);
+        Assertions.assertEquals(0, missingPrimitiveParam);
+        Assertions.assertEquals(42, missingPrimitiveParamWithDefaultValue);
+        Assertions.assertEquals("one-queryone-query", myParameter.toString());
+        Assertions.assertEquals("one-queryone-query", myParameterList.get(0).toString());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java
new file mode 100644
index 0000000000000..aaf353146c047
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestResource.java
@@ -0,0 +1,348 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import javax.inject.Inject;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.HEAD;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.OPTIONS;
+import javax.ws.rs.PATCH;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Providers;
+
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+import io.quarkus.runtime.BlockingOperationControl;
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+
+@Path("/simple")
+public class SimpleQuarkusRestResource {
+
+    @Inject
+    HelloService service;
+
+    @GET
+    public String get() {
+        return "GET";
+    }
+
+    @Path("sub")
+    public Object subResource() {
+        return new SubResource();
+    }
+
+    @GET
+    @Path("/hello")
+    public String hello() {
+        return service.sayHello();
+    }
+
+    @GET
+    @Path("{id}")
+    public String get(@PathParam("id") String id) {
+        return "GET:" + id;
+    }
+
+    @POST
+    @Path("params/{p}")
+    public String params(@PathParam("p") String p,
+            @QueryParam("q") String q,
+            @HeaderParam("h") int h,
+            @FormParam("f") String f) {
+        return "params: p: " + p + ", q: " + q + ", h: " + h + ", f: " + f;
+    }
+
+    @POST
+    public String post() {
+        return "POST";
+    }
+
+    @DELETE
+    public String delete() {
+        return "DELETE";
+    }
+
+    @PUT
+    public String put() {
+        return "PUT";
+    }
+
+    @PATCH
+    public String patch() {
+        return "PATCH";
+    }
+
+    @OPTIONS
+    public String options() {
+        return "OPTIONS";
+    }
+
+    @HEAD
+    public Response head() {
+        return Response.ok().header("Stef", "head").build();
+    }
+
+    @GET
+    @Path("/person")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Person getPerson() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        return person;
+    }
+
+    @GET
+    @Path("/blocking")
+    @Blocking
+    public String blocking() {
+        service.sayHello();
+        return String.valueOf(BlockingOperationControl.isBlockingAllowed());
+    }
+
+    @GET
+    @Path("providers")
+    public Response filters(@Context Providers providers) {
+        // TODO: enhance this test
+        return Response.ok().entity(providers.getExceptionMapper(TestException.class).getClass().getName()).build();
+    }
+
+    @GET
+    @Path("filters")
+    public Response filters(@Context HttpHeaders headers) {
+        return Response.ok().header("filter-request", headers.getHeaderString("filter-request")).build();
+    }
+
+    @GET
+    @Path("feature-filters")
+    public Response featureFilters(@Context HttpHeaders headers) {
+        return Response.ok().header("feature-filter-request", headers.getHeaderString("feature-filter-request")).build();
+    }
+
+    @GET
+    @Path("dynamic-feature-filters")
+    public Response dynamicFeatureFilters(@Context HttpHeaders headers) {
+        return Response.ok().header("feature-filter-request", headers.getHeaderString("feature-filter-request")).build();
+    }
+
+    @GET
+    @Path("fooFilters")
+    @Foo
+    public Response fooFilters(@Context HttpHeaders headers) {
+        return Response.ok().header("filter-request", headers.getHeaderString("filter-request")).build();
+    }
+
+    @GET
+    @Path("barFilters")
+    @Bar
+    public Response barFilters(@Context HttpHeaders headers) {
+        return Response.ok().header("filter-request", headers.getHeaderString("filter-request")).build();
+    }
+
+    @GET
+    @Path("fooBarFilters")
+    @Foo
+    @Bar
+    public Response fooBarFilters(@Context HttpHeaders headers) {
+        return Response.ok().header("filter-request", headers.getHeaderString("filter-request")).build();
+    }
+
+    @GET
+    @Path("mapped-exception")
+    public String mappedException() {
+        throw new TestException();
+    }
+
+    @GET
+    @Path("feature-mapped-exception")
+    public String featureMappedException() {
+        throw new FeatureMappedException();
+    }
+
+    @GET
+    @Path("unknown-exception")
+    public String unknownException() {
+        throw new RuntimeException("OUCH");
+    }
+
+    @GET
+    @Path("web-application-exception")
+    public String webApplicationException() {
+        throw new WebApplicationException(Response.status(666).entity("OK").build());
+    }
+
+    @GET
+    @Path("writer")
+    public TestClass writer() {
+        return new TestClass();
+    }
+
+    @GET
+    @Path("fast-writer")
+    @Produces("text/plain")
+    public String fastWriter() {
+        return "OK";
+    }
+
+    @GET
+    @Path("lookup-writer")
+    public Object slowWriter() {
+        return "OK";
+    }
+
+    @GET
+    @Path("writer/vertx-buffer")
+    public Buffer vertxBuffer() {
+        return Buffer.buffer("VERTX-BUFFER");
+    }
+
+    @GET
+    @Path("async/cs/ok")
+    public CompletionStage<String> asyncCompletionStageOK() {
+        return CompletableFuture.completedFuture("CS-OK");
+    }
+
+    @GET
+    @Path("async/cs/fail")
+    public CompletionStage<String> asyncCompletionStageFail() {
+        CompletableFuture<String> ret = new CompletableFuture<>();
+        ret.completeExceptionally(new TestException());
+        return ret;
+    }
+
+    @GET
+    @Path("async/uni/ok")
+    public Uni<String> asyncUniOK() {
+        return Uni.createFrom().item("UNI-OK");
+    }
+
+    @Produces(MediaType.APPLICATION_JSON)
+    @GET
+    @Path("async/uni/list")
+    public Uni<List<Person>> asyncUniListJson() {
+        Person person = new Person();
+        person.setFirst("Bob");
+        person.setLast("Builder");
+        return Uni.createFrom().item(Arrays.asList(person));
+    }
+
+    @GET
+    @Path("async/uni/fail")
+    public Uni<String> asyncUniStageFail() {
+        return Uni.createFrom().failure(new TestException());
+    }
+
+    @GET
+    @Path("pre-match")
+    public String preMatchGet() {
+        return "pre-match-get";
+    }
+
+    @POST
+    @Path("pre-match")
+    public String preMatchPost() {
+        return "pre-match-post";
+    }
+
+    @GET
+    @Path("request-response-params")
+    public String requestAndResponseParams(@Context HttpServerRequest request, @Context HttpServerResponse response) {
+        response.headers().add("dummy", "value");
+        return request.remoteAddress().host();
+    }
+
+    @GET
+    @Path("jax-rs-request")
+    public String jaxRsRequest(@Context Request request) {
+        return request.getMethod();
+    }
+
+    @GET
+    @Path("resource-info")
+    public Response resourceInfo(@Context ResourceInfo resourceInfo, @Context HttpHeaders headers) {
+        return Response.ok()
+                .header("class-name", resourceInfo.getResourceClass().getSimpleName())
+                .header("method-name", headers.getHeaderString("method-name"))
+                .build();
+    }
+
+    @Path("form-map")
+    @POST
+    @Produces(MediaType.APPLICATION_FORM_URLENCODED)
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public MultivaluedMap<String, String> map(MultivaluedMap<String, String> map) {
+        return map;
+    }
+
+    @Path("jsonp-object")
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    public String jsonpObject(JsonObject jsonbObject) {
+        return jsonbObject.getString("k");
+    }
+
+    @Path("jsonp-array")
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
+    public Integer jsonpArray(JsonArray jsonArray) {
+        return jsonArray.size();
+    }
+
+    @Path("/bool")
+    @POST
+    @Consumes(MediaType.TEXT_PLAIN)
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean bool(boolean bool) {
+        return bool;
+    }
+
+    @Path("/trace")
+    @TRACE
+    public Response trace() {
+        return Response.status(Response.Status.OK).build();
+    }
+
+    @GET
+    @Path("simplifiedResourceInfo")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String simplifiedResourceInfo(@Context SimpleResourceInfo simplifiedResourceInfo) {
+        return simplifiedResourceInfo.getResourceClass().getName() + "#" + simplifiedResourceInfo.getMethodName() + "-"
+                + simplifiedResourceInfo.parameterTypes().length;
+    }
+
+    @GET
+    @Path("bigDecimal/{val}")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String bigDecimalConverter(BigDecimal val) {
+        return val.toString();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java
new file mode 100644
index 0000000000000..0af962e3c270f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SimpleQuarkusRestTestCase.java
@@ -0,0 +1,422 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.emptyString;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.Headers;
+
+public class SimpleQuarkusRestTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(TRACE.class, SimpleQuarkusRestResource.class, Person.class,
+                                    TestRequestFilter.class, TestRequestFilterWithHighPriority.class,
+                                    TestRequestFilterWithHighestPriority.class, ResourceInfoInjectingFilter.class,
+                                    Foo.class, Bar.class,
+                                    TestFooRequestFilter.class, TestBarRequestFilter.class, TestFooBarRequestFilter.class,
+                                    TestFooResponseFilter.class, TestBarResponseFilter.class, TestFooBarResponseFilter.class,
+                                    TestResponseFilter.class, HelloService.class, TestException.class,
+                                    TestExceptionMapper.class, TestPreMatchRequestFilter.class,
+                                    FeatureMappedException.class, FeatureMappedExceptionMapper.class,
+                                    FeatureRequestFilterWithNormalPriority.class, FeatureRequestFilterWithHighestPriority.class,
+                                    FeatureResponseFilter.class, DynamicFeatureRequestFilterWithLowPriority.class,
+                                    TestFeature.class, TestDynamicFeature.class,
+                                    SubResource.class, RootAResource.class, RootBResource.class,
+                                    QueryParamResource.class, HeaderParamResource.class,
+                                    TestWriter.class, TestClass.class,
+                                    SimpleBeanParam.class, OtherBeanParam.class, FieldInjectedResource.class,
+                                    ParameterWithFromString.class, BeanParamSubClass.class, FieldInjectedSubClassResource.class,
+                                    BeanParamSuperClass.class, IllegalClassExceptionMapper.class,
+                                    MyParameterProvider.class, MyParameterConverter.class, MyParameter.class,
+                                    NewParamsRestResource.class, InterfaceResource.class, InterfaceResourceImpl.class);
+                }
+            });
+
+    @Test
+    public void simpleTest() {
+        RestAssured.get("/missing")
+                .then().statusCode(404);
+        RestAssured.get("/simple")
+                .then().body(Matchers.equalTo("GET"));
+        RestAssured.get("/simple/foo")
+                .then().body(Matchers.equalTo("GET:foo"));
+
+        RestAssured.post("/simple")
+                .then().body(Matchers.equalTo("POST"));
+
+        RestAssured.post("/missing")
+                .then().statusCode(404);
+
+        RestAssured.delete("/missing")
+                .then().statusCode(404);
+
+        RestAssured.delete("/simple")
+                .then().body(Matchers.equalTo("DELETE"));
+
+        RestAssured.put("/simple")
+                .then().body(Matchers.equalTo("PUT"));
+
+        RestAssured.head("/simple")
+                .then().header("Stef", "head");
+
+        RestAssured.options("/simple")
+                .then().body(Matchers.equalTo("OPTIONS"));
+
+        RestAssured.patch("/simple")
+                .then().body(Matchers.equalTo("PATCH"));
+    }
+
+    @Test
+    public void test405() {
+        RestAssured.put("/ctor-query")
+                .then().statusCode(405);
+
+        RestAssured.put("/simple/person")
+                .then().statusCode(405);
+    }
+
+    @Test
+    public void testInjection() {
+        RestAssured.get("/simple/hello")
+                .then().body(Matchers.equalTo("Hello"));
+    }
+
+    @Test
+    public void testSubResource() {
+        RestAssured.get("/simple/sub/otherSub")
+                .then().body(Matchers.equalTo("otherSub"));
+        RestAssured.get("/simple/sub")
+                .then().body(Matchers.equalTo("sub"));
+    }
+
+    @Test
+    public void testParams() {
+        RestAssured.with()
+                .queryParam("q", "qv")
+                .header("h", "123")
+                .formParam("f", "fv")
+                .post("/simple/params/pv")
+                .then().body(Matchers.equalTo("params: p: pv, q: qv, h: 123, f: fv"));
+    }
+
+    @Test
+    public void testBlocking() {
+        RestAssured.get("/simple/blocking")
+                .then().body(Matchers.equalTo("true"));
+    }
+
+    @Test
+    public void testPreMatchFilter() {
+        RestAssured.get("/simple/pre-match")
+                .then().body(Matchers.equalTo("pre-match-post"));
+        RestAssured.post("/simple/pre-match")
+                .then().body(Matchers.equalTo("pre-match-post"));
+    }
+
+    @Test
+    public void testFilters() {
+        Headers headers = RestAssured.get("/simple/fooFilters")
+                .then().extract().headers();
+        assertThat(headers.getValues("filter-request")).containsOnly("authentication-authorization-foo-default");
+        assertThat(headers.getValues("filter-response")).containsOnly("default-foo");
+
+        headers = RestAssured.get("/simple/filters")
+                .then().extract().headers();
+        assertThat(headers.getValues("filter-request")).containsOnly("authentication-authorization-default");
+        assertThat(headers.getValues("filter-response")).containsOnly("default");
+
+        headers = RestAssured.get("/simple/barFilters")
+                .then().extract().headers();
+        assertThat(headers.getValues("filter-request")).containsOnly("authentication-authorization-default-bar");
+        assertThat(headers.getValues("filter-response")).containsOnly("default-bar");
+
+        headers = RestAssured.get("/simple/fooBarFilters")
+                .then().extract().headers();
+        assertThat(headers.getValues("filter-request")).containsOnly("authentication-authorization-foo-default-bar-foobar");
+        assertThat(headers.getValues("filter-response")).containsOnly("default-foo-bar-foobar");
+    }
+
+    @Test
+    public void testProviders() {
+        RestAssured.get("/simple/providers")
+                .then().body(Matchers.containsString("TestException"))
+                .statusCode(200);
+    }
+
+    @Test
+    public void testException() {
+        RestAssured.get("/simple/mapped-exception")
+                .then().body(Matchers.equalTo("OK"))
+                .statusCode(666);
+        RestAssured.get("/simple/unknown-exception")
+                .then().statusCode(500);
+        RestAssured.get("/simple/web-application-exception")
+                .then().body(Matchers.equalTo("OK"))
+                .statusCode(666);
+    }
+
+    @Test
+    public void testWriter() {
+        RestAssured.get("/simple/lookup-writer")
+                .then().body(Matchers.equalTo("OK"));
+        RestAssured.get("/simple/writer")
+                .then().body(Matchers.equalTo("WRITER"));
+
+        RestAssured.get("/simple/fast-writer")
+                .then().body(Matchers.equalTo("OK"));
+
+        RestAssured.get("/simple/writer/vertx-buffer")
+                .then().body(Matchers.equalTo("VERTX-BUFFER"));
+    }
+
+    @DisabledOnOs(OS.WINDOWS)
+    @Test
+    public void testAsync() {
+        RestAssured.get("/simple/async/cs/ok")
+                .then().body(Matchers.equalTo("CS-OK"));
+        RestAssured.get("/simple/async/cs/fail")
+                .then().body(Matchers.equalTo("OK"))
+                .statusCode(666);
+        RestAssured.get("/simple/async/uni/ok")
+                .then().body(Matchers.equalTo("UNI-OK"));
+        RestAssured.get("/simple/async/uni/fail")
+                .then().body(Matchers.equalTo("OK"))
+                .statusCode(666);
+    }
+
+    @Test
+    public void testMultiResourceSamePath() {
+        RestAssured.get("/a")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("a"));
+        RestAssured.get("/b")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("b"));
+    }
+
+    @Test
+    public void testRequestAndResponseParams() {
+        RestAssured.get("/simple/request-response-params")
+                .then()
+                .body(Matchers.equalTo("127.0.0.1"))
+                .header("dummy", "value");
+
+    }
+
+    @Test
+    public void testJaxRsRequest() {
+        RestAssured.get("/simple/jax-rs-request")
+                .then()
+                .body(Matchers.equalTo("GET"));
+    }
+
+    @Test
+    public void testFeature() {
+        RestAssured.get("/simple/feature-mapped-exception")
+                .then()
+                .statusCode(667);
+
+        Headers headers = RestAssured.get("/simple/feature-filters")
+                .then().extract().headers();
+        assertThat(headers.getValues("feature-filter-request")).containsOnly("authentication-default");
+        assertThat(headers.getValues("feature-filter-response")).containsExactly("high-priority", "normal-priority");
+    }
+
+    @Test
+    public void testDynamicFeature() {
+        Headers headers = RestAssured.get("/simple/dynamic-feature-filters")
+                .then().extract().headers();
+        assertThat(headers.getValues("feature-filter-request")).containsOnly("authentication-default-low");
+        assertThat(headers.getValues("feature-filter-response")).containsExactly("high-priority", "normal-priority",
+                "low-priority");
+    }
+
+    @Test
+    public void testResourceInfo() {
+        Headers headers = RestAssured.get("/simple/resource-info")
+                .then().extract().headers();
+        assertThat(headers.getValues("class-name")).containsOnly("SimpleQuarkusRestResource");
+        assertThat(headers.getValues("method-name")).containsOnly("resourceInfo");
+    }
+
+    @Test
+    public void testQueryParamInCtor() {
+        RestAssured.get("/ctor-query")
+                .then().body(Matchers.is(emptyString()));
+
+        RestAssured.get("/ctor-query?q1=v1")
+                .then().body(Matchers.equalTo("v1"));
+
+        RestAssured.get("/ctor-query?q1=v11")
+                .then().body(Matchers.equalTo("v11"));
+
+        RestAssured.get("/ctor-query?q2=v2")
+                .then().body(Matchers.is(emptyString()));
+    }
+
+    @Test
+    public void testHeaderParamInCtor() {
+        RestAssured.get("/ctor-header")
+                .then().body(Matchers.is(emptyString()));
+
+        RestAssured.with().header("h1", "v1").get("/ctor-header")
+                .then().body(Matchers.equalTo("v1"));
+
+        RestAssured.with().header("h1", "v11").get("/ctor-header")
+                .then().body(Matchers.equalTo("v11"));
+
+        RestAssured.with().header("h2", "v2").get("/ctor-header")
+                .then().body(Matchers.is(emptyString()));
+    }
+
+    @Test
+    public void testFormMap() {
+        RestAssured
+                .given()
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .header("Accept", "application/x-www-form-urlencoded")
+                .formParam("f1", "v1")
+                .formParam("f2", "v2")
+                .post("/simple/form-map")
+                .then()
+                .statusCode(200)
+                .contentType("application/x-www-form-urlencoded")
+                .body(Matchers.equalTo("f1=v1&f2=v2"));
+    }
+
+    @Test
+    public void testJsonp() {
+        RestAssured.with().body("{\"k\": \"v\"}").contentType("application/json; charset=utf-8").post("/simple/jsonp-object")
+                .then().statusCode(200).body(Matchers.equalTo("v"));
+
+        RestAssured.with().body("[{}, {}]").contentType("application/json").post("/simple/jsonp-array")
+                .then().statusCode(200).body(Matchers.equalTo("2"));
+    }
+
+    @Test
+    public void testPrimitiveBody() {
+        RestAssured.with().body("true").contentType("text/plain").post("/simple/bool")
+                .then().statusCode(200).contentType("text/plain").body(Matchers.equalTo("true"));
+    }
+
+    @Test
+    public void testCustomHttpMethodAnnotation() {
+        RestAssured.request("TRACE", "/simple/trace")
+                .then().statusCode(200);
+    }
+
+    @Test
+    public void simpleFieldInjection() {
+        RestAssured
+                .with()
+                .header("header", "one-header")
+                .queryParam("query", "one-query")
+                .queryParam("queryList", "one")
+                .queryParam("queryList", "two")
+                .queryParam("int", "666")
+                .get("/injection/field")
+                .then().statusCode(200).body(Matchers.equalTo("OK"));
+        RestAssured
+                .with()
+                .header("header", "one-header")
+                .queryParam("query", "one-query")
+                .queryParam("queryList", "one")
+                .queryParam("queryList", "two")
+                .queryParam("int", "666")
+                .get("/injection/param")
+                .then().statusCode(200).body(Matchers.equalTo("OK"));
+    }
+
+    @Test
+    public void fieldInjectionWithSubClasses() {
+        RestAssured
+                .with()
+                .header("header", "one-header")
+                .queryParam("query", "one-query")
+                .queryParam("queryList", "one")
+                .queryParam("queryList", "two")
+                .queryParam("int", "666")
+                .get("/injection-subclass/field2")
+                .then().body(Matchers.equalTo("OK"));
+        RestAssured
+                .with()
+                .header("header", "one-header")
+                .queryParam("query", "one-query")
+                .queryParam("queryList", "one")
+                .queryParam("queryList", "two")
+                .queryParam("int", "666")
+                .get("/injection-subclass/param2")
+                .then().body(Matchers.equalTo("OK"));
+    }
+
+    @DisabledOnOs(OS.WINDOWS)
+    @Test
+    public void testNewParams() {
+        RestAssured.get("/new-params/myklass/myregex/context")
+                .then()
+                .log().ifError()
+                .statusCode(200)
+                .body(Matchers.equalTo("OK"));
+        RestAssured.get("/new-params/myklass/myregex/mymethod")
+                .then()
+                .log().ifError()
+                .body(Matchers.equalTo("GET:myklass:myregex:mymethod"));
+        RestAssured.with()
+                .urlEncodingEnabled(false)
+                .cookie("c", "cv")
+                .queryParam("q", "qv")
+                .queryParam("q3", "999")
+                .header("h", "123")
+                .formParam("f", "fv")
+                .post("/new-params/myklass;m=mv/myregex/params/pv")
+                .then()
+                .log().ifError()
+                .body(Matchers.equalTo("params: p: pv, q: qv, h: 123, f: fv, m: mv, c: cv, q2: empty, q3: 999"));
+        RestAssured.get("/new-params/myklass/myregex/sse")
+                .then()
+                .log().ifError()
+                .body(Matchers.equalTo("data:OK\n\n"));
+        RestAssured.with()
+                .urlEncodingEnabled(false)
+                .formParam("f", "fv")
+                .post("/new-params/myklass;m=mv/myregex/form-blocking")
+                .then()
+                .body(Matchers.equalTo("fv"));
+    }
+
+    @Test
+    public void simplifiedResourceInfo() {
+        RestAssured.get("/simple/simplifiedResourceInfo")
+                .then().statusCode(200).body(Matchers.containsString("SimpleQuarkusRestResource#simplifiedResourceInfo-1"));
+    }
+
+    @Test
+    public void bigDecimal() {
+        RestAssured.get("/simple/bigDecimal/1.0")
+                .then().statusCode(200).body(Matchers.equalTo("1.0"));
+    }
+
+    @Test
+    public void testInterfaceResource() {
+        RestAssured.get("/iface")
+                .then().statusCode(200).body(Matchers.equalTo("Hello"));
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java
new file mode 100644
index 0000000000000..00b37fdf42c6c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/SubResource.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+public class SubResource {
+
+    @GET
+    public String sub() {
+        return "sub";
+    }
+
+    @GET
+    @Path("otherSub")
+    public String otherPath() {
+        return "otherSub";
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java
new file mode 100644
index 0000000000000..51512f8de968f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TRACE.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.ws.rs.HttpMethod;
+
+@HttpMethod("TRACE")
+@Target(value = ElementType.METHOD)
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface TRACE {
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java
new file mode 100644
index 0000000000000..d022a9a183caf
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarRequestFilter.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Bar
+@Priority(Priorities.USER + 1)
+public class TestBarRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("filter-request");
+        requestContext.getHeaders().putSingle("filter-request", previousFilterHeaderValue + "-bar");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java
new file mode 100644
index 0000000000000..098d5ae13742a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestBarResponseFilter.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Bar
+@Priority(Priorities.USER - 2)
+public class TestBarResponseFilter implements ContainerResponseFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+        String previousFilterHeaderValue = (String) responseContext.getHeaders().getFirst("filter-response");
+        responseContext.getHeaders().putSingle("filter-response", previousFilterHeaderValue + "-bar");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestClass.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestClass.java
new file mode 100644
index 0000000000000..b3484a9f6e1d9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestClass.java
@@ -0,0 +1,5 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+public class TestClass {
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java
new file mode 100644
index 0000000000000..6c2d0af92ba4a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestDynamicFeature.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class TestDynamicFeature implements DynamicFeature {
+
+    @Override
+    public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+        if (resourceInfo.getResourceClass().getName().equals(SimpleQuarkusRestResource.class.getName())
+                && resourceInfo.getResourceMethod().getName().equals("dynamicFeatureFilters")) {
+            context.register(DynamicFeatureRequestFilterWithLowPriority.class);
+            context.register(new FeatureResponseFilter("feature-filter-response", "low-priority"), Priorities.USER - 1);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestException.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestException.java
new file mode 100644
index 0000000000000..34de4a8f21652
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestException.java
@@ -0,0 +1,6 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+@SuppressWarnings("serial")
+public class TestException extends RuntimeException {
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java
new file mode 100644
index 0000000000000..dea268a763a09
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestExceptionMapper.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class TestExceptionMapper implements ExceptionMapper<TestException> {
+
+    @Override
+    public Response toResponse(TestException exception) {
+        return Response.status(666).entity("OK").build();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java
new file mode 100644
index 0000000000000..46724cc504241
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFeature.java
@@ -0,0 +1,19 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import javax.ws.rs.Priorities;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class TestFeature implements Feature {
+    @Override
+    public boolean configure(FeatureContext context) {
+        context.register(FeatureMappedExceptionMapper.class);
+        context.register(FeatureRequestFilterWithHighestPriority.class);
+        context.register(FeatureRequestFilterWithNormalPriority.class);
+        context.register(new FeatureResponseFilter("feature-filter-response", "normal-priority"));
+        context.register(new FeatureResponseFilter("feature-filter-response", "high-priority"), Priorities.USER + 1);
+        return true;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java
new file mode 100644
index 0000000000000..2fe83a04bf17f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarRequestFilter.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Foo
+@Bar
+@Priority(Priorities.USER + 2)
+public class TestFooBarRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("filter-request");
+        requestContext.getHeaders().putSingle("filter-request", previousFilterHeaderValue + "-foobar");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java
new file mode 100644
index 0000000000000..dc46967780589
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooBarResponseFilter.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Foo
+@Bar
+@Priority(Priorities.USER - 3)
+public class TestFooBarResponseFilter implements ContainerResponseFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+        String previousFilterHeaderValue = (String) responseContext.getHeaders().getFirst("filter-response");
+        responseContext.getHeaders().putSingle("filter-response", previousFilterHeaderValue + "-foobar");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java
new file mode 100644
index 0000000000000..480fa38034a7e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooRequestFilter.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Foo
+@Priority(Priorities.USER - 1)
+public class TestFooRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("filter-request");
+        requestContext.getHeaders().putSingle("filter-request", previousFilterHeaderValue + "-foo");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java
new file mode 100644
index 0000000000000..519ee0f7f57a7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestFooResponseFilter.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Foo
+@Priority(Priorities.USER - 1)
+public class TestFooResponseFilter implements ContainerResponseFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+        String previousFilterHeaderValue = (String) responseContext.getHeaders().getFirst("filter-response");
+        responseContext.getHeaders().putSingle("filter-response", previousFilterHeaderValue + "-foo");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java
new file mode 100644
index 0000000000000..4b8ff257647c9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestPreMatchRequestFilter.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@PreMatching
+public class TestPreMatchRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        if (requestContext.getUriInfo().getPath().equals("/simple/pre-match")) {
+            requestContext.setMethod("POST");
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java
new file mode 100644
index 0000000000000..e56f5c19edc11
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilter.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class TestRequestFilter implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("filter-request");
+        requestContext.getHeaders().putSingle("filter-request", previousFilterHeaderValue + "-default");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java
new file mode 100644
index 0000000000000..c7fe67b4e3436
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighPriority.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Priority(Priorities.AUTHORIZATION)
+public class TestRequestFilterWithHighPriority implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        String previousFilterHeaderValue = requestContext.getHeaders().getFirst("filter-request");
+        requestContext.getHeaders().putSingle("filter-request", previousFilterHeaderValue + "-authorization");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java
new file mode 100644
index 0000000000000..32cc859af874f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestRequestFilterWithHighestPriority.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Priority(Priorities.AUTHENTICATION)
+public class TestRequestFilterWithHighestPriority implements ContainerRequestFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add("filter-request", "authentication");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java
new file mode 100644
index 0000000000000..1d4504d7a6a8c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestResponseFilter.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class TestResponseFilter implements ContainerResponseFilter {
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
+        responseContext.getHeaders().add("filter-response", "default");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java
new file mode 100644
index 0000000000000..15ec0dd37d3fb
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestUtil.java
@@ -0,0 +1,292 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.core.Application;
+
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Assertions;
+
+/**
+ * Base util class for RESTEasy testing.
+ */
+public class TestUtil {
+
+    protected static Logger LOG;
+
+    private static String baseResourcePath = new StringBuilder()
+            .append("src").append(File.separator)
+            .append("test").append(File.separator)
+            .append("resources").append(File.separator).toString();
+    /**
+     * Try to initialize logger. This is unsuccessful on EAP deployment, because EAP do not contain log4j.
+     * Logger is not necessary for this class. Some methods could be used without it.
+     */
+    static {
+        try {
+            LOG = Logger.getLogger(TestUtil.class.getName());
+        } catch (NoClassDefFoundError e) {
+            // unable to initialize logger, finishContainerPrepare method could not be used
+        }
+    }
+
+    public static WebArchive prepareArchiveWithApplication(String deploymentName, Class<? extends Application> clazz) {
+        WebArchive war = ShrinkWrap.create(WebArchive.class, deploymentName + ".war");
+        war.addClass(clazz);
+        return war;
+    }
+
+    /**
+     * Finish preparing war deployment and deploy it.
+     *
+     * Add classes in @resources to deployment. Also all sub-classes of classes in @resources are added to deployment.
+     * But only classes in @resources (not sub-classes of classes in @resources) can be used as resources
+     * (getClasses function of TestApplication class return only classes in @resources).
+     *
+     * @param resources classes used in deployment as resources
+     */
+    public static Archive<?> finishContainerPrepare(WebArchive war, Map<String, String> contextParams,
+            final Class<?>... resources) {
+        return finishContainerPrepare(war, contextParams, null, resources);
+    }
+
+    /**
+     * Finish preparing war deployment and deploy it.
+     *
+     * Add classes in @resources to deployment. Also all sub-classes of classes in @resources are added to deployment.
+     * But only classes in @resources (not sub-classes of classes in @resources) can be used as resources
+     * (getClasses function of TestApplication class return only classes in @resources).
+     *
+     * @param singletons classes used in deployment as singletons
+     * @param resources classes used in deployment as resources
+     */
+    public static Archive<?> finishContainerPrepare(WebArchive war, Map<String, String> contextParams,
+            List<Class<?>> singletons, final Class<?>... resources) {
+
+        if (contextParams == null) {
+            contextParams = new Hashtable<>();
+        }
+
+        Set<String> classNamesInDeployment = new HashSet<>();
+        Set<String> singletonsNamesInDeployment = new HashSet<>();
+
+        if (resources != null) {
+            for (final Class<?> clazz : resources) {
+                war.addClass(clazz);
+                classNamesInDeployment.add(clazz.getTypeName());
+            }
+        }
+
+        if (singletons != null) {
+            for (Class<?> singleton : singletons) {
+                war.addClass(singleton);
+                singletonsNamesInDeployment.add(singleton.getTypeName());
+            }
+        }
+
+        if (contextParams != null && contextParams.size() > 0 && !war.contains("WEB-INF/web.xml")) {
+            StringBuilder webXml = new StringBuilder();
+            webXml.append("<web-app version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" \n");
+            webXml.append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n");
+            webXml.append(
+                    " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"> \n");
+            for (Map.Entry<String, String> entry : contextParams.entrySet()) {
+                String paramName = entry.getKey();
+                String paramValue = entry.getValue();
+                LOG.debug("Context param " + paramName + " value " + paramValue);
+
+                webXml.append("<context-param>\n");
+                webXml.append("<param-name>" + paramName + "</param-name>\n");
+                webXml.append("<param-value>" + paramValue + "</param-value>\n");
+                webXml.append("</context-param>\n");
+            }
+
+            webXml.append("</web-app>\n");
+            Asset resource = new StringAsset(webXml.toString());
+            war.addAsWebInfResource(resource, "web.xml");
+        }
+
+        // prepare class list for getClasses function of TestApplication class
+        StringBuilder classes = new StringBuilder();
+        boolean start = true;
+        for (String clazz : classNamesInDeployment) {
+            if (start) {
+                start = false;
+            } else {
+                classes.append(",");
+            }
+            classes.append(clazz);
+        }
+        war.addAsResource(new StringAsset(classes.toString()), "classes.txt");
+
+        // prepare singleton list for getSingletons function of TestApplication class
+        StringBuilder singletonBuilder = new StringBuilder();
+        start = true;
+        for (String clazz : singletonsNamesInDeployment) {
+            if (start) {
+                start = false;
+            } else {
+                singletonBuilder.append(",");
+            }
+            singletonBuilder.append(clazz);
+        }
+        war.addAsResource(new StringAsset(singletonBuilder.toString()), "singletons.txt");
+
+        if (System.getProperty("STORE_WAR") != null) {
+            war.as(ZipExporter.class).exportTo(new File("target", war.getName()), true);
+        }
+        return war;
+    }
+
+    /**
+     * Add package info to deployment.
+     *
+     * @param clazz Package info is for package of this class.
+     */
+    protected WebArchive addPackageInfo(WebArchive war, final Class<?> clazz) {
+        return war.addPackages(false, new org.jboss.shrinkwrap.api.Filter<ArchivePath>() {
+            @Override
+            public boolean include(final ArchivePath path) {
+                return path.get().endsWith("package-info.class");
+            }
+        }, clazz.getPackage());
+    }
+
+    /**
+     * Convert input stream to String.
+     *
+     * @param in Input stream
+     * @return Converted string
+     */
+    public static String readString(final InputStream in) throws IOException {
+        char[] buffer = new char[1024];
+        StringBuilder builder = new StringBuilder();
+        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+        int wasRead = 0;
+        do {
+            wasRead = reader.read(buffer, 0, 1024);
+            if (wasRead > 0) {
+                builder.append(buffer, 0, wasRead);
+            }
+        } while (wasRead > -1);
+
+        return builder.toString();
+    }
+
+    public static String getErrorMessageForKnownIssue(String jira, String message) {
+        StringBuilder s = new StringBuilder();
+        s.append("https://issues.jboss.org/browse/");
+        s.append(jira);
+        s.append(" - ");
+        s.append(message);
+        return s.toString();
+    }
+
+    public static String getErrorMessageForKnownIssue(String jira) {
+        return getErrorMessageForKnownIssue(jira, "known issue");
+    }
+
+    public static String getJbossHome() {
+        return System.getProperty("jboss.home");
+    }
+
+    public static String getJbossHome(boolean onServer) {
+        if (onServer == false) {
+            return getJbossHome();
+        }
+        return System.getProperty("jboss.home.dir", "");
+    }
+
+    /**
+     * Get the path to the containers base dir for standalone mode (configuration, logs, etc..).
+     * When arquillian.xml contains more containers that could be started simultaneously the parameter containerQualifier
+     * is used to determine which base dir to get.
+     * 
+     * @param containerQualifier container qualifier or null if the arquillian.xml contains max 1 container available
+     *        to be running at time
+     * @return absolute path to base dir
+     */
+    public static String getStandaloneDir(String containerQualifier) {
+        return getStandaloneDir(false, containerQualifier);
+    }
+
+    /**
+     * Get the path to the containers base dir for standalone mode (configuration, logs, etc..).
+     * When arquillian.xml contains more containers that could be started simultaneously the parameter containerQualifier
+     * is used to determine which base dir to get.
+     * 
+     * @param onServer whether the check is made from client side (the path is constructed) or from deployment (the path
+     *        is read from actual runtime value)
+     * @param containerQualifier container qualifier or null if the arquillian.xml contains max 1 container available
+     *        to be running at time; this has no effect when onServer is true
+     * @return absolute path to base dir
+     */
+    public static String getStandaloneDir(boolean onServer, String containerQualifier) {
+        if (onServer == false) {
+            if (containerQualifier == null) {
+                return new File(getJbossHome(), "standalone").getAbsolutePath();
+            } else {
+                return new File("target", containerQualifier).getAbsolutePath();
+            }
+        } else {
+            return System.getProperty("jboss.server.base.dir", "");
+        }
+    }
+
+    public static boolean isOpenJDK() {
+        return System.getProperty("java.runtime.name").toLowerCase().contains("openjdk");
+    }
+
+    public static boolean isWildFly9x() {
+        final String sv = System.getProperty("server.version");
+        return ("9.0.2.Final".equals(sv) || "9.0.1.Final".equals(sv) || "9.0.0.Final".equals(sv));
+    }
+
+    public static boolean isOracleJDK() {
+        if (isOpenJDK()) {
+            return false;
+        }
+        String vendor = System.getProperty("java.vendor").toLowerCase();
+        return vendor.contains("sun") || vendor.contains("oracle");
+    }
+
+    public static boolean isIbmJdk() {
+        return System.getProperty("java.vendor").toLowerCase().contains("ibm");
+    }
+
+    /**
+     * Get resource in test scope for some class.
+     * Example: class org.test.MyTest and name "my_resource.txt" returns "src/test/resource/org/test/my_resource.txt"
+     */
+    public static String getResourcePath(Class<?> c, String name) {
+        return new StringBuilder()
+                .append(baseResourcePath)
+                .append(c.getPackage().getName().replace('.', File.separatorChar))
+                .append(File.separator).append(name)
+                .toString();
+    }
+
+    public static boolean isWindows() {
+        String osName = System.getProperty("os.name");
+        if (osName == null) {
+            Assertions.fail("Can't get the operating system name");
+        }
+        return (osName.indexOf("Windows") > -1) || (osName.indexOf("windows") > -1);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java
new file mode 100644
index 0000000000000..bad67513e8451
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/TestWriter.java
@@ -0,0 +1,32 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces(MediaType.TEXT_PLAIN)
+public class TestWriter implements MessageBodyWriter<TestClass> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public void writeTo(TestClass t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+            throws IOException, WebApplicationException {
+        entityStream.write("WRITER".getBytes(StandardCharsets.UTF_8));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java
new file mode 100644
index 0000000000000..e47544800d224
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamResource.java
@@ -0,0 +1,155 @@
+package io.quarkus.resteasy.reactive.server.test.stream;
+
+import java.util.Date;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.reactive.common.util.MultiCollectors;
+import org.reactivestreams.Publisher;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.vertx.core.buffer.Buffer;
+
+@Path("stream")
+public class StreamResource {
+
+    private static final int INITIAL_BUFFER_SIZE = 2048;
+
+    @Path("text/collect")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Uni<String> getCollectedText() {
+        return MultiCollectors.concatenateStrings(getStreamedText());
+    }
+
+    @Path("text/stream")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Multi<String> getStreamedText() {
+        return Multi.createFrom().items("foo", "bar");
+    }
+
+    @Path("text/stream/publisher")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Publisher<String> getStreamedTextPublisher() {
+        return Multi.createFrom().items("foo", "bar");
+    }
+
+    @Path("byte-arrays/collect")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Uni<byte[]> getCollectedByteArrays() {
+        return MultiCollectors.concatenateByteArrays(getStreamedByteArrays());
+    }
+
+    @Path("byte-arrays/stream")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Multi<byte[]> getStreamedByteArrays() {
+        return Multi.createFrom().items("foo".getBytes(), "bar".getBytes());
+    }
+
+    @Path("char-arrays/collect")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Uni<char[]> getCollectedCharacterArrays() {
+        return MultiCollectors.concatenateCharArrays(getStreamedCharArrays());
+    }
+
+    @Path("char-arrays/stream")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Multi<char[]> getStreamedCharArrays() {
+        return Multi.createFrom().items("foo".toCharArray(), "bar".toCharArray());
+    }
+
+    @Path("char-arrays/stream/publisher")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Publisher<char[]> getStreamedCharArraysPublisher() {
+        return Multi.createFrom().items("foo".toCharArray(), "bar".toCharArray());
+    }
+
+    @Path("buffer/collect")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Uni<Buffer> getCollectedBuffers() {
+        return concatenateBuffers(getStreamedBuffers());
+    }
+
+    @Path("buffer/stream")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public Multi<Buffer> getStreamedBuffers() {
+        return Multi.createFrom().items(Buffer.buffer("foo"), Buffer.buffer("bar"));
+    }
+
+    public static Uni<Buffer> concatenateBuffers(Multi<Buffer> multi) {
+        return multi.collectItems().in(() -> Buffer.buffer(INITIAL_BUFFER_SIZE),
+                (accumulatingBuffer, receivedBuffer) -> accumulatingBuffer.appendBuffer(receivedBuffer));
+    }
+
+    private boolean receivedCancel = false;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Path("infinite/stream")
+    public Multi<String> infiniteStream() {
+        receivedCancel = false;
+        return Multi.createFrom().emitter(emitter -> {
+            ScheduledExecutorService scheduler = Infrastructure.getDefaultWorkerPool();
+            // this should never complete, but let's kill it after 30 seconds
+            ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> {
+                String str = "Called at " + new Date();
+                emitter.emit(str);
+            }, 0, 1, TimeUnit.SECONDS);
+
+            // catch client close
+            emitter.onTermination(() -> {
+                if (emitter.isCancelled()) {
+                    receivedCancel = true;
+                    if (!future.isCancelled())
+                        future.cancel(true);
+                }
+            });
+
+            // die in 30s max
+            scheduler.schedule(() -> {
+                if (!future.isCancelled()) {
+                    future.cancel(true);
+                    // just in case
+                    emitter.complete();
+                }
+            }, 30, TimeUnit.SECONDS);
+        });
+    }
+
+    @GET
+    @Path("infinite/stream-was-cancelled")
+    public String infiniteStreamWasCancelled() {
+        return receivedCancel ? "OK" : "KO";
+    }
+
+    @Path("sse")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public Multi<String> sse() {
+        return Multi.createFrom().items("a", "b", "c");
+    }
+
+    @Path("sse/throw")
+    @GET
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    public Multi<String> sseThrows() {
+        throw new IllegalStateException("STOP");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java
new file mode 100644
index 0000000000000..e46e3e08e49f8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/stream/StreamTestCase.java
@@ -0,0 +1,184 @@
+package io.quarkus.resteasy.reactive.server.test.stream;
+
+import java.net.URI;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.sse.SseEventSource;
+
+import org.hamcrest.Matchers;
+import org.jboss.resteasy.reactive.client.impl.MultiInvoker;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.restassured.RestAssured;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.subscription.Cancellable;
+
+@DisabledOnOs(OS.WINDOWS)
+public class StreamTestCase {
+
+    @TestHTTPResource
+    URI uri;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(StreamResource.class));
+
+    @Test
+    public void testStreaming() throws Exception {
+        RestAssured.get("/stream/text/stream")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+        RestAssured.get("/stream/text/stream/publisher")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+        RestAssured.get("/stream/text/collect")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+
+        RestAssured.get("/stream/byte-arrays/stream")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+        RestAssured.get("/stream/byte-arrays/collect")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+
+        RestAssured.get("/stream/char-arrays/stream")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+        RestAssured.get("/stream/char-arrays/stream/publisher")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+        RestAssured.get("/stream/char-arrays/collect")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+
+        RestAssured.get("/stream/buffer/stream")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+        RestAssured.get("/stream/buffer/collect")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("foobar"));
+    }
+
+    @Test
+    public void testClientStreaming() throws Exception {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + "stream/text/stream");
+        Multi<String> multi = target.request().rx(MultiInvoker.class).get(String.class);
+        List<String> list = multi.collectItems().asList().await().atMost(Duration.ofSeconds(5));
+        Assertions.assertEquals(2, list.size());
+        Assertions.assertEquals("foo", list.get(0));
+        Assertions.assertEquals("bar", list.get(1));
+    }
+
+    @Test
+    public void testInfiniteStreamClosedByClientImmediately() throws Exception {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + "stream/infinite/stream");
+        Multi<String> multi = target.request().rx(MultiInvoker.class).get(String.class);
+        Cancellable cancellable = multi.subscribe().with(item -> {
+            System.err.println("Received " + item);
+        });
+        // immediately cancel
+        cancellable.cancel();
+        // give it some time and check
+        Thread.sleep(2000);
+
+        WebTarget checkTarget = client.target(uri.toString() + "stream/infinite/stream-was-cancelled");
+        String check = checkTarget.request().get(String.class);
+        Assertions.assertEquals("OK", check);
+    }
+
+    @Test
+    public void testInfiniteStreamClosedByClientAfterRegistration() throws Exception {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + "stream/infinite/stream");
+        Multi<String> multi = target.request().rx(MultiInvoker.class).get(String.class);
+        // cancel after two items
+        CountDownLatch latch = new CountDownLatch(2);
+        Cancellable cancellable = multi.subscribe().with(item -> {
+            System.err.println("Received " + item);
+            latch.countDown();
+        });
+        Assertions.assertTrue(latch.await(30, TimeUnit.SECONDS));
+        // now cancel
+        cancellable.cancel();
+        // give it some time and check
+        Thread.sleep(2000);
+
+        WebTarget checkTarget = client.target(uri.toString() + "stream/infinite/stream-was-cancelled");
+        String check = checkTarget.request().get(String.class);
+        Assertions.assertEquals("OK", check);
+    }
+
+    @Test
+    public void testSse() throws InterruptedException {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + "stream/sse");
+        try (SseEventSource sse = SseEventSource.target(target).build()) {
+            CountDownLatch latch = new CountDownLatch(1);
+            List<Throwable> errors = new CopyOnWriteArrayList<>();
+            List<String> results = new CopyOnWriteArrayList<>();
+            sse.register(event -> {
+                results.add(event.readData());
+            }, error -> {
+                errors.add(error);
+            }, () -> {
+                latch.countDown();
+            });
+            sse.open();
+            Assertions.assertTrue(latch.await(20, TimeUnit.SECONDS));
+            Assertions.assertEquals(Arrays.asList("a", "b", "c"), results);
+            Assertions.assertEquals(0, errors.size());
+        }
+    }
+
+    @Test
+    public void testSseThrows() throws InterruptedException {
+        Client client = ClientBuilder.newBuilder().build();
+        WebTarget target = client.target(uri.toString() + "stream/sse/throws");
+        try (SseEventSource sse = SseEventSource.target(target).build()) {
+            CountDownLatch latch = new CountDownLatch(1);
+            List<Throwable> errors = new CopyOnWriteArrayList<>();
+            List<String> results = new CopyOnWriteArrayList<>();
+            sse.register(event -> {
+                results.add(event.readData());
+            }, error -> {
+                errors.add(error);
+            }, () -> {
+                latch.countDown();
+            });
+            sse.open();
+            Assertions.assertTrue(latch.await(20, TimeUnit.SECONDS));
+            Assertions.assertEquals(0, results.size());
+            Assertions.assertEquals(1, errors.size());
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java
new file mode 100644
index 0000000000000..32bc4efa94674
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.reactive.server.test.websocket;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.vertx.core.Handler;
+import io.vertx.core.http.ServerWebSocket;
+
+@Path("ws")
+public class WebSocketResource {
+
+    @GET
+    public void echoWebSocket(ServerWebSocket serverWebSocket) {
+        serverWebSocket.textMessageHandler(new Handler<String>() {
+            @Override
+            public void handle(String event) {
+                serverWebSocket.writeTextMessage(event);
+            }
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java
new file mode 100644
index 0000000000000..a52b78c8d2fb2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/websocket/WebSocketTestCase.java
@@ -0,0 +1,64 @@
+package io.quarkus.resteasy.reactive.server.test.websocket;
+
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.WebSocket;
+
+public class WebSocketTestCase {
+
+    @TestHTTPResource("/ws")
+    URI uri;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(WebSocketResource.class));
+
+    @Test
+    public void testWebSocket() throws Exception {
+        HttpClient httpClient = VertxCoreRecorder.getVertx().get().createHttpClient();
+        try {
+            final CompletableFuture<String> result = new CompletableFuture<>();
+            httpClient.webSocket(uri.getPort(), uri.getHost(), uri.getPath(), new Handler<AsyncResult<WebSocket>>() {
+                @Override
+                public void handle(AsyncResult<WebSocket> event) {
+                    if (event.failed()) {
+                        result.completeExceptionally(event.cause());
+                    } else {
+                        event.result().exceptionHandler(new Handler<Throwable>() {
+                            @Override
+                            public void handle(Throwable event) {
+                                result.completeExceptionally(event);
+                            }
+                        });
+                        event.result().textMessageHandler(new Handler<String>() {
+                            @Override
+                            public void handle(String event) {
+                                result.complete(event);
+                            }
+                        });
+                        event.result().writeTextMessage("Hello World");
+                    }
+                }
+            });
+            Assertions.assertEquals("Hello World", result.get());
+        } finally {
+            httpClient.close();
+        }
+
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/application-asyncio.properties b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/application-asyncio.properties
new file mode 100644
index 0000000000000..7644ecbef99d7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/application-asyncio.properties
@@ -0,0 +1,2 @@
+quarkus.http.io-threads=1
+quarkus.vertx.event-loops-pool-size=1
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/cors-config.properties b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/cors-config.properties
new file mode 100644
index 0000000000000..aa8d0000a7867
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/cors-config.properties
@@ -0,0 +1 @@
+quarkus.http.cors=true
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/empty.properties b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/empty.properties
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/index.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/index.html
new file mode 100644
index 0000000000000..8890d0049ed98
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Hello</title>
+</head>
+<body>
+<h1>Hello</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/lorem.txt b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/lorem.txt
new file mode 100644
index 0000000000000..ff415863722e0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/lorem.txt
@@ -0,0 +1,5 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
+in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident,
+ sunt in culpa qui officia deserunt mollit anim id est laborum.
+
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/test.html b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/test.html
new file mode 100644
index 0000000000000..0d2c081db5dc9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/test.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <!-- head definitions go here -->
+</head>
+<body>
+<!-- the content goes here -->
+</body>
+</html>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/test.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/test.xml
new file mode 100644
index 0000000000000..15279ade5128f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/resources/test.xml
@@ -0,0 +1,4 @@
+<note>
+    <heading>Reminder</heading>
+    <body>Remind me of...</body>
+</note>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive/pom.xml
new file mode 100644
index 0000000000000..25ed7a24c94b6
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent-aggregator</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive-parent</artifactId>
+    <name>Quarkus - RESTEasy Reactive</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/README.md b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/README.md
new file mode 100644
index 0000000000000..d9bb993abcaaa
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/README.md
@@ -0,0 +1,101 @@
+** NOT IMPLEMENTED
+
+- Proper handling of generics (not clear if we do, in fact)
+    - In entity return/parameter type
+    - For reader/writer selection
+    - For param converter selection
+- Async return types (single/stream)
+    - Preliminary support for CS/Uni, but hacked in and not pluggable
+- SSE
+    - Reconnect special responses that should stop reconnecting
+    - Last-Event-Id not sent
+- RESTEasy extensions
+    - Async Reader/Writer and interceptors: do we need this?
+    - Servlet replacement for remote host/IP (HttpRequest.getRemoteHost/Address)
+    - resteasy-links (used by quarkus-data-rest)
+- Default readers/writers
+    - Vertx JSON types
+    - Async variants of spec
+    - Spec:
+        - javax.activation.DataSource All media types (*/*).
+        - javax.xml.transform.Source XML types (text/xml, application/xml and media types of the
+          form application/*+xml).
+        - javax.xml.bind.JAXBElement and application-supplied JAXB classes XML types (text/xml and
+          application/xml and media types of the form application/*+xml).
+- Callbacks on async responses
+    - CompletionCallback supported
+    - ConnectionCallback not supported yet
+- We use the request context to store and inject provider types, which means they are also injected
+  on client resources if the client runs on the server, and just not injected if the client is not
+  on the server. This is wrong.
+
+** TODO later list
+
+- XML?
+- Optim: CookieParser splits things without checking if a separator exists, but it's too weird to touch ATM (see spec discussion)
+- I don't think we handle generic endpoints well: we don't appear to apply type arguments for methods defined in generic supertypes,
+  so we see all method parameters as `Object`. Same for bean params.
+- SSE questions
+  - Should we add @Sse annotation instead of @Produces(MediaType.SERVER_SENT_EVENTS), and use @Produces for the current @SseElementType?
+  - Should we do something to prevent reconnect when the server is done?
+
+** JAXRS SPEC observations
+
+*** Will not implement
+
+- `ManagedBean`
+- `DataSource`
+- `Source`
+- `StreamingOutput`
+- `JAXB`
+
+*** Spec inconsistencies
+
+- `ResponseBuilder.location(URI)` doc says relativise to request, but TCK tests relative to base
+- `ResponseBuilder.location(URI)` doc says relativise using `UriInfo` but not available for client API
+- `Response.readEntity` says entity stream should be closed, but TCK checks that the `Response` is closed instead
+- `Response.readEntity` says entity can be retrieved by call to `getEntity()` but TCK closes the `Response`, which forbids calls to `getEntity()`
+- `Response.getEntity` does not mention that the response being closed forbids getting an already read entity, but TCK checks that
+- It's crazy that if there's a client `RequestFilter` that calls `abortWith(Response)`, we have to serialise the entity to run the response filter/interceptors
+- `AbstractMultivaluedMap.putAll(MultivaluedMap)` will add the parameter's `List` values without copying, directly to the store, which means that 
+  further calls to `addAll()` will modify those lists, effectively having both maps share their mutable `List` storage. 
+- `MultivaluedMap` is missing `addAll(MultivaluedMap)` to complete `putAll`
+- The TCK in JAXRSClient0162 tests sending pre-serialised JSON strings as JSON, and so the JSON serialiser had to be modified to not serialise String
+  entities, but that's wrong, because it will properly serialise Boolean, Number and any Object type. Also if you deserialise a JSON string value `"foo"`
+  you will get `foo` without the quotes, whereas with this fix, if we now send a `foo` String value as JSON it will be sent raw (assumed pre-serialised)
+  so this is not regular. We should always serialise string values as JSON string values, and introduce a `SerialisedJsonString` type to mark pre-serialised
+  JSON strings. Possibly even just `RawString` to make sure no serialise will modify them.
+- Request Cookies are based on https://tools.ietf.org/html/rfc2109 which have the clients send cookie params to the server, using `$`-prefixed parameter names,
+  but it was obsoleted in https://tools.ietf.org/html/rfc2965 and then in https://tools.ietf.org/html/rfc6265, which does not send cookie params to the server
+  and those params are not `$`-prefixed anymore.
+- Should add HTTP status codes integer constants, without requiring to go via Response.Status.OK.getStatus() which is not a constant
+- There are missing HTTP status codes
+- Turn `@BeanParam` into a type declaration
+- Spec should say when `CompletionCallback` run: is it after the request is sent, or before? ATM it can be before (that's how we do it
+  but it leads in tests that get a response before the callbacks are run and a nightmare to test because the next request can be executed
+  before the callbacks are run).
+- We should fix the client `WebApplicationException` usage that leaks the `Response` when on the server
+
+*** Spec extensions proposed
+
+- We should disfavour `ParamConverterProvider` and allow `@Context` on `ParamConverter` since it has a type param, we could scan those at build time
+  rather than do runtime-resolving.
+- API to support pluggable async types (on top of `CompletionStage`, so for `Uni`/`Multi`), like what RESTEasy has, but a bit different if we can, so
+  avoid double conversions just to register listeners.
+- SSE element types annotation: support being able to set content type of individual SSE elements via an annotation
+- Streaming with `Multi` (SSE or raw): a method can return a `Multi` and the content is streamed to the HTTP response, or via SSE
+- Support suspendable filters: add `suspend`/`resume` methods to `ContainerRequestContext`
+- Annotation-based filters, interceptors and exception mappers: @ServerResponseFilter on a method declares a filter, all parameters are injected automatically,
+  and the return type can be `Response`, `Optional<Response>` or `Uni<Response>`
+- Local annotation-based exception mappers: if declared in a JAX-RS endpoint, local to that endpoint
+- Add or generify `Response`: this allows scanners to know the type of a response and optimise or produce valid openapi.
+- Parameter-less `@*Param` annotations, make `@Context` optional for method parameters, same for `@PathParam` when there's a path param declared
+  with the same name.
+
+*** Not tested by the TCK (and not implemented)
+
+- Parameter converters that throw exceptions should produce NOT_FOUND or BAD_REQUEST, and we implemented it for method params, but
+  not for beanparams/resource fields.
+- SSE client should reconnect with Last-Event-Id.
+- SSE client should handle certain HTTP status codes from the server.
+- Connection Callbacks on AsyncResponse
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/pom.xml
new file mode 100644
index 0000000000000..ef5f7c696f601
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-resteasy-reactive-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-resteasy-reactive</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Runtime</name>
+    <description>Reactive implementation of JAX-RS with additional features. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-vertx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/BlockingInputHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/BlockingInputHandler.java
new file mode 100644
index 0000000000000..aa933e600bf06
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/BlockingInputHandler.java
@@ -0,0 +1,48 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.time.Duration;
+
+import javax.ws.rs.HttpMethod;
+
+import org.jboss.resteasy.reactive.common.util.EmptyInputStream;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfigurableServerRestHandler;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfiguration;
+import org.jboss.resteasy.reactive.server.vertx.VertxResteasyReactiveRequestContext;
+
+import io.quarkus.vertx.http.runtime.VertxInputStream;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Handler that reads data and sets up the input stream and blocks until the data has been read.
+ * This is meant to be used only when the request processing has already been offloaded to a worker thread.
+ */
+public class BlockingInputHandler implements RuntimeConfigurableServerRestHandler {
+
+    private volatile Duration timeout;
+
+    @Override
+    public void configure(RuntimeConfiguration configuration) {
+        timeout = configuration.readTimeout();
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext context) throws Exception {
+        // in some cases, with sub-resource locators or via request filters, 
+        // it's possible we've already read the entity
+        if (context.getInputStream() != EmptyInputStream.INSTANCE) {
+            // let's not set it twice
+            return;
+        }
+        if (context.serverRequest().getRequestMethod().equals(HttpMethod.GET) ||
+                context.serverRequest().getRequestMethod().equals(HttpMethod.HEAD)) {
+            return;
+        }
+        if (context instanceof VertxResteasyReactiveRequestContext) {
+            //TODO: this should not be installed for servlet
+            VertxResteasyReactiveRequestContext vertxContext = (VertxResteasyReactiveRequestContext) context;
+            RoutingContext routingContext = vertxContext.getContext();
+            vertxContext.setInputStream(new VertxInputStream(routingContext, timeout.toMillis()));
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/EndpointScoresSupplier.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/EndpointScoresSupplier.java
new file mode 100644
index 0000000000000..b565745682839
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/EndpointScoresSupplier.java
@@ -0,0 +1,13 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.util.function.Supplier;
+
+import org.jboss.resteasy.reactive.server.util.ScoreSystem;
+
+public class EndpointScoresSupplier implements Supplier<ScoreSystem.EndpointScores> {
+
+    @Override
+    public ScoreSystem.EndpointScores get() {
+        return ScoreSystem.latestScores;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ExceptionMapperRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ExceptionMapperRecorder.java
new file mode 100644
index 0000000000000..ccf2cbf021ea5
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ExceptionMapperRecorder.java
@@ -0,0 +1,33 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.http.runtime.devmode.AdditionalRouteDescription;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
+
+@Recorder
+public class ExceptionMapperRecorder {
+
+    public void setStaticResourceRoots(Set<String> resources) {
+        NotFoundExceptionMapper.staticResources(resources);
+    }
+
+    public void setAdditionalEndpoints(List<AdditionalRouteDescription> additionalEndpoints) {
+        NotFoundExceptionMapper.setAdditionalEndpoints(additionalEndpoints);
+    }
+
+    public void setReactiveRoutes(List<RouteDescription> reactiveRoutes) {
+        NotFoundExceptionMapper.setReactiveRoutes(reactiveRoutes);
+    }
+
+    public void setServlets(Map<String, List<String>> servletToMapping) {
+        NotFoundExceptionMapper.servlets(servletToMapping);
+    }
+
+    public void setHttpRoot(String rootPath) {
+        NotFoundExceptionMapper.setHttpRoot(rootPath);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/MultipartFormHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/MultipartFormHandler.java
new file mode 100644
index 0000000000000..249330862a9a7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/MultipartFormHandler.java
@@ -0,0 +1,233 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfigurableServerRestHandler;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfiguration;
+
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.file.FileSystem;
+import io.vertx.core.http.HttpServerFileUpload;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.ext.web.FileUpload;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.impl.FileUploadImpl;
+
+/**
+ * ServerRestHandler implementation that handles the {@code multipart/form-data} media type.
+ *
+ * The code has been adapted from {@link io.vertx.ext.web.handler.impl.BodyHandlerImpl}
+ * and its main functionality is to populate {@code RoutingContext}'s fileUploads
+ */
+public class MultipartFormHandler implements RuntimeConfigurableServerRestHandler {
+
+    private static final Logger LOG = Logger.getLogger(MultipartFormHandler.class);
+
+    // in multipart requests, the body should not be available as a stream
+    private static final ByteArrayInputStream NO_BYTES_INPUT_STREAM = new ByteArrayInputStream(new byte[0]);
+
+    private volatile String uploadsDirectory;
+    private volatile boolean deleteUploadedFilesOnEnd;
+    private volatile Optional<Long> maxBodySize;
+
+    @Override
+    public void configure(RuntimeConfiguration configuration) {
+        uploadsDirectory = configuration.body().uploadsDirectory();
+        deleteUploadedFilesOnEnd = configuration.body().deleteUploadedFilesOnEnd();
+        maxBodySize = configuration.limits().maxBodySize();
+
+        try {
+            Files.createDirectories(Paths.get(uploadsDirectory));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext context) throws Exception {
+        // in some cases, with sub-resource locators or via request filters,
+        // it's possible we've already read the entity
+        if (context.hasInputStream()) {
+            // let's not set it twice
+            return;
+        }
+        if (context.serverRequest().getRequestMethod().equals(HttpMethod.GET) ||
+                context.serverRequest().getRequestMethod().equals(HttpMethod.HEAD)) {
+            return;
+        }
+        HttpServerRequest httpServerRequest = context.serverRequest().unwrap(HttpServerRequest.class);
+        if (httpServerRequest.isEnded()) {
+            context.setInputStream(NO_BYTES_INPUT_STREAM);
+        } else {
+            httpServerRequest.setExpectMultipart(true);
+            httpServerRequest.pause();
+            context.suspend();
+            MultipartFormVertxHandler handler = new MultipartFormVertxHandler(context, uploadsDirectory,
+                    deleteUploadedFilesOnEnd, maxBodySize);
+            httpServerRequest.handler(handler);
+            httpServerRequest.endHandler(new Handler<Void>() {
+                @Override
+                public void handle(Void event) {
+                    handler.end();
+                }
+            });
+            httpServerRequest.resume();
+        }
+    }
+
+    private static class MultipartFormVertxHandler implements Handler<Buffer> {
+        private final ResteasyReactiveRequestContext rrContext;
+        private final RoutingContext context;
+
+        private final String uploadsDirectory;
+        private final boolean deleteUploadedFilesOnEnd;
+        private final Optional<Long> maxBodySize;
+
+        boolean failed;
+        AtomicInteger uploadCount = new AtomicInteger();
+        AtomicBoolean cleanup = new AtomicBoolean(false);
+        boolean ended;
+        long uploadSize = 0L;
+
+        public MultipartFormVertxHandler(ResteasyReactiveRequestContext rrContext, String uploadsDirectory,
+                boolean deleteUploadedFilesOnEnd, Optional<Long> maxBodySize) {
+            this.rrContext = rrContext;
+            this.context = rrContext.serverRequest().unwrap(RoutingContext.class);
+            this.uploadsDirectory = uploadsDirectory;
+            this.deleteUploadedFilesOnEnd = deleteUploadedFilesOnEnd;
+            this.maxBodySize = maxBodySize;
+            Set<FileUpload> fileUploads = context.fileUploads();
+
+            context.request().setExpectMultipart(true);
+            context.request().uploadHandler(new Handler<HttpServerFileUpload>() {
+                @Override
+                public void handle(HttpServerFileUpload upload) {
+                    if (maxBodySize.isPresent() && upload.isSizeAvailable()) {
+                        // we can try to abort even before the upload starts
+                        long size = uploadSize + upload.size();
+                        if (size > MultipartFormVertxHandler.this.maxBodySize.get()) {
+                            failed = true;
+                            rrContext.resume(new WebApplicationException(Response.Status.REQUEST_ENTITY_TOO_LARGE));
+                            return;
+                        }
+                    }
+                    // we actually upload to a file with a generated filename
+                    uploadCount.incrementAndGet();
+                    String uploadedFileName = new File(MultipartFormVertxHandler.this.uploadsDirectory,
+                            UUID.randomUUID().toString()).getPath();
+                    upload.exceptionHandler(new UploadExceptionHandler(rrContext));
+                    upload.streamToFileSystem(uploadedFileName).exceptionHandler(new UploadExceptionHandler(rrContext))
+                            .endHandler(new Handler<Void>() {
+                                @Override
+                                public void handle(Void event) {
+                                    uploadEnded();
+                                }
+                            });
+                    FileUploadImpl fileUpload = new FileUploadImpl(uploadedFileName, upload);
+                    fileUploads.add(fileUpload);
+                }
+            });
+        }
+
+        @Override
+        public void handle(Buffer buff) {
+            if (failed) {
+                return;
+            }
+            uploadSize += buff.length();
+            if (maxBodySize.isPresent() && uploadSize > maxBodySize.get()) {
+                failed = true;
+                // enqueue a delete for the error uploads
+                context.vertx().runOnContext(new Handler<Void>() {
+                    @Override
+                    public void handle(Void v) {
+                        MultipartFormVertxHandler.this.deleteFileUploads();
+                    }
+                });
+                rrContext.resume(new WebApplicationException(Response.Status.REQUEST_ENTITY_TOO_LARGE));
+            }
+        }
+
+        void uploadEnded() {
+            int count = uploadCount.decrementAndGet();
+            // only if parsing is done and count is 0 then all files have been processed
+            if (ended && count == 0) {
+                doEnd();
+            }
+        }
+
+        void end() {
+            // this marks the end of body parsing, calling doEnd should
+            // only be possible from this moment onwards
+            ended = true;
+            // only if parsing is done and count is 0 then all files have been processed
+            if (uploadCount.get() == 0) {
+                doEnd();
+            }
+        }
+
+        void doEnd() {
+            if (failed) {
+                deleteFileUploads();
+                return;
+            }
+            if (deleteUploadedFilesOnEnd) {
+                context.addBodyEndHandler(x -> deleteFileUploads());
+            }
+            rrContext.setInputStream(NO_BYTES_INPUT_STREAM);
+            rrContext.resume();
+        }
+
+        private void deleteFileUploads() {
+            if (cleanup.compareAndSet(false, true)) {
+                for (FileUpload fileUpload : context.fileUploads()) {
+                    FileSystem fileSystem = context.vertx().fileSystem();
+                    String uploadedFileName = fileUpload.uploadedFileName();
+                    fileSystem.exists(uploadedFileName, existResult -> {
+                        if (existResult.failed()) {
+                            LOG.warn("Could not detect if uploaded file exists, not deleting: " + uploadedFileName,
+                                    existResult.cause());
+                        } else if (existResult.result()) {
+                            fileSystem.delete(uploadedFileName, deleteResult -> {
+                                if (deleteResult.failed()) {
+                                    LOG.warn("Delete of uploaded file failed: " + uploadedFileName, deleteResult.cause());
+                                }
+                            });
+                        }
+                    });
+                }
+            }
+        }
+
+        private class UploadExceptionHandler implements Handler<Throwable> {
+            private final ResteasyReactiveRequestContext rrContext;
+
+            public UploadExceptionHandler(ResteasyReactiveRequestContext rrContext) {
+                this.rrContext = rrContext;
+            }
+
+            @Override
+            public void handle(Throwable t) {
+                MultipartFormVertxHandler.this.deleteFileUploads();
+                rrContext.resume(new WebApplicationException(t, Response.Status.INTERNAL_SERVER_ERROR));
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java
new file mode 100644
index 0000000000000..f0953b12a33fc
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java
@@ -0,0 +1,325 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import static io.quarkus.runtime.TemplateHtmlBuilder.adjustRoot;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.Variant;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.jboss.resteasy.reactive.server.core.request.ServerDrivenNegotiation;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.util.RuntimeResourceVisitor;
+
+import io.quarkus.runtime.TemplateHtmlBuilder;
+import io.quarkus.runtime.util.ClassPathUtils;
+import io.quarkus.vertx.http.runtime.devmode.AdditionalRouteDescription;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
+
+public class NotFoundExceptionMapper {
+
+    protected static final String META_INF_RESOURCES = "META-INF/resources";
+
+    private final static Variant JSON_VARIANT = new Variant(MediaType.APPLICATION_JSON_TYPE, (String) null, null);
+    private final static Variant HTML_VARIANT = new Variant(MediaType.TEXT_HTML_TYPE, (String) null, null);
+    private final static List<Variant> VARIANTS = Arrays.asList(JSON_VARIANT, HTML_VARIANT);
+    static volatile List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers;
+
+    private volatile static String httpRoot = "";
+    private volatile static List<String> servletMappings = Collections.emptyList();
+    private volatile static Set<java.nio.file.Path> staticResourceRoots = Collections.emptySet();
+    private volatile static List<AdditionalRouteDescription> additionalEndpoints = Collections.emptyList();
+    private volatile static List<RouteDescription> reactiveRoutes = Collections.emptyList();
+
+    private static final Logger LOG = Logger.getLogger(NotFoundExceptionMapper.class);
+
+    public static void setHttpRoot(String rootPath) {
+        httpRoot = rootPath;
+    }
+
+    public static final class MethodDescription {
+        public String method;
+        public String fullPath;
+        public String produces;
+        public String consumes;
+
+        public MethodDescription(String method, String fullPath, String produces, String consumes) {
+            super();
+            this.method = method;
+            this.fullPath = fullPath;
+            this.produces = produces;
+            this.consumes = consumes;
+        }
+    }
+
+    @ServerExceptionMapper(value = NotFoundException.class, priority = Priorities.USER + 1)
+    public Response toResponse(HttpHeaders headers) {
+        if ((classMappers == null) || classMappers.isEmpty()) {
+            return respond(headers);
+        }
+        return respond(ResourceDescription.fromClassMappers(classMappers), headers);
+    }
+
+    private Response respond(HttpHeaders headers) {
+        Variant variant = selectVariant(headers);
+
+        if (variant == JSON_VARIANT) {
+            return Response.status(Status.NOT_FOUND).type(MediaType.APPLICATION_JSON).build();
+        }
+
+        if (variant == HTML_VARIANT) {
+            TemplateHtmlBuilder sb = new TemplateHtmlBuilder("404 - Resource Not Found", "", "No resources discovered");
+            return Response.status(Status.NOT_FOUND).entity(sb.toString()).type(MediaType.TEXT_HTML_TYPE).build();
+        }
+
+        return Response.status(Status.NOT_FOUND).build();
+    }
+
+    private Response respond(List<ResourceDescription> descriptions, HttpHeaders headers) {
+        Variant variant = selectVariant(headers);
+
+        if (variant == JSON_VARIANT) {
+            return Response.status(Status.NOT_FOUND).type(MediaType.APPLICATION_JSON).build();
+        }
+
+        if (variant == HTML_VARIANT) {
+            TemplateHtmlBuilder sb = new TemplateHtmlBuilder("404 - Resource Not Found", "", "Resources overview");
+            sb.resourcesStart("REST resources");
+            for (ResourceDescription resource : descriptions) {
+                sb.resourcePath(adjustRoot(httpRoot, resource.basePath));
+                for (MethodDescription method : resource.calls) {
+                    sb.method(method.method, method.fullPath);
+                    if (method.consumes != null) {
+                        sb.consumes(method.consumes);
+                    }
+                    if (method.produces != null) {
+                        sb.produces(method.produces);
+                    }
+                    sb.methodEnd();
+                }
+                sb.resourceEnd();
+            }
+            if (descriptions.isEmpty()) {
+                sb.noResourcesFound();
+            }
+            sb.resourcesEnd();
+
+            if (!servletMappings.isEmpty()) {
+                sb.resourcesStart("Servlet mappings");
+                for (String servletMapping : servletMappings) {
+                    sb.servletMapping(adjustRoot(httpRoot, servletMapping));
+                }
+                sb.resourcesEnd();
+            }
+
+            if (!reactiveRoutes.isEmpty()) {
+                sb.resourcesStart("Reactive Routes");
+                sb.resourceStart();
+                for (RouteDescription route : reactiveRoutes) {
+                    sb.method(route.getHttpMethod(), route.getPath());
+                    sb.listItem(route.getJavaMethod());
+                    if (route.getConsumes() != null) {
+                        sb.consumes(route.getConsumes());
+                    }
+                    if (route.getProduces() != null) {
+                        sb.produces(route.getProduces());
+                    }
+                    sb.methodEnd();
+                }
+                sb.resourceEnd();
+                sb.resourcesEnd();
+            }
+
+            if (!staticResourceRoots.isEmpty()) {
+                List<String> resources = findRealResources();
+                if (!resources.isEmpty()) {
+                    sb.resourcesStart("Static resources");
+                    for (String staticResource : resources) {
+                        sb.staticResourcePath(adjustRoot(httpRoot, staticResource));
+                    }
+                    sb.resourcesEnd();
+                }
+            }
+
+            if (!additionalEndpoints.isEmpty()) {
+                sb.resourcesStart("Additional endpoints");
+                for (AdditionalRouteDescription additionalEndpoint : additionalEndpoints) {
+                    sb.staticResourcePath(additionalEndpoint.getUri(),
+                            additionalEndpoint.getDescription());
+                }
+                sb.resourcesEnd();
+            }
+
+            return Response.status(Status.NOT_FOUND).entity(sb.toString()).type(MediaType.TEXT_HTML_TYPE).build();
+        }
+        return Response.status(Status.NOT_FOUND).build();
+    }
+
+    private List<String> findRealResources() {
+
+        //we need to check for web resources in order to get welcome files to work
+        //this kinda sucks
+        Set<String> knownFiles = new HashSet<>();
+        for (java.nio.file.Path resource : staticResourceRoots) {
+            if (resource != null && Files.exists(resource)) {
+                try (Stream<java.nio.file.Path> fileTreeElements = Files.walk(resource)) {
+                    fileTreeElements.forEach(new Consumer<java.nio.file.Path>() {
+                        @Override
+                        public void accept(java.nio.file.Path path) {
+                            // Skip META-INF/resources entry
+                            if (resource.equals(path)) {
+                                return;
+                            }
+                            java.nio.file.Path rel = resource.relativize(path);
+                            if (!Files.isDirectory(path)) {
+                                knownFiles.add(rel.toString());
+                            }
+                        }
+                    });
+                } catch (IOException e) {
+                    LOG.error("Failed to read static resources", e);
+                }
+            }
+        }
+        try {
+            ClassPathUtils.consumeAsPaths(META_INF_RESOURCES, p -> {
+                collectKnownPaths(p, knownFiles);
+            });
+        } catch (IOException e) {
+            LOG.error("Failed to read static resources", e);
+        }
+
+        //limit to 1000 to not have to many files to display
+        return knownFiles.stream().filter(this::isHtmlFileName).limit(1000).distinct().sorted(Comparator.naturalOrder())
+                .collect(Collectors.toList());
+    }
+
+    private void collectKnownPaths(java.nio.file.Path resource, Set<String> knownPaths) {
+        try {
+            Files.walkFileTree(resource, new SimpleFileVisitor<java.nio.file.Path>() {
+                @Override
+                public FileVisitResult visitFile(java.nio.file.Path p, BasicFileAttributes attrs)
+                        throws IOException {
+                    String file = resource.relativize(p).toString();
+                    // Windows has a backslash
+                    file = file.replace('\\', '/');
+                    knownPaths.add(file);
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private boolean isHtmlFileName(String fileName) {
+        return fileName.endsWith(".html") || fileName.endsWith(".htm");
+    }
+
+    private static Variant selectVariant(HttpHeaders headers) {
+        ServerDrivenNegotiation negotiation = new ServerDrivenNegotiation();
+        negotiation.setAcceptHeaders(headers.getRequestHeaders().get(HttpHeaders.ACCEPT));
+        return negotiation.getBestMatch(VARIANTS);
+    }
+
+    public static void servlets(Map<String, List<String>> servletToMapping) {
+        NotFoundExceptionMapper.servletMappings = servletToMapping.values().stream()
+                .flatMap(List::stream)
+                .sorted()
+                .collect(Collectors.toList());
+    }
+
+    public static void staticResources(Set<String> knownRoots) {
+        NotFoundExceptionMapper.staticResourceRoots = new HashSet<>();
+        for (String i : knownRoots) {
+            staticResourceRoots.add(Paths.get(i));
+        }
+    }
+
+    public static void setAdditionalEndpoints(List<AdditionalRouteDescription> additionalEndpoints) {
+        NotFoundExceptionMapper.additionalEndpoints = additionalEndpoints;
+    }
+
+    public static void setReactiveRoutes(List<RouteDescription> reactiveRoutes) {
+        NotFoundExceptionMapper.reactiveRoutes = reactiveRoutes;
+    }
+
+    public static final class ResourceDescription {
+        public final String basePath;
+        public final List<MethodDescription> calls = new ArrayList<>();
+
+        public ResourceDescription(String basePath) {
+            this.basePath = basePath;
+        }
+
+        private static String mostPreferredOrNull(List<MediaType> mediaTypes) {
+            if (mediaTypes == null || mediaTypes.isEmpty()) {
+                return null;
+            } else {
+                return mediaTypes.get(0).toString();
+            }
+        }
+
+        public static List<ResourceDescription> fromClassMappers(
+                List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers) {
+            Map<String, ResourceDescription> descriptions = new HashMap<>();
+            RuntimeResourceVisitor.visitRuntimeResources(classMappers, new RuntimeResourceVisitor() {
+
+                private ResourceDescription description;
+
+                @Override
+                public void visitRuntimeResource(String httpMethod, String fullPath, RuntimeResource runtimeResource) {
+                    ServerMediaType serverMediaType = runtimeResource.getProduces();
+                    List<MediaType> produces = Collections.emptyList();
+                    if (serverMediaType != null) {
+                        if ((serverMediaType.getSortedOriginalMediaTypes() != null)
+                                && serverMediaType.getSortedOriginalMediaTypes().length >= 1) {
+                            produces = Arrays.asList(serverMediaType.getSortedOriginalMediaTypes());
+                        }
+                    }
+                    description.calls.add(new MethodDescription(httpMethod, fullPath, mostPreferredOrNull(produces),
+                            mostPreferredOrNull(runtimeResource.getConsumes())));
+                }
+
+                @Override
+                public void visitBasePath(String basePath) {
+                    description = descriptions.get(basePath);
+                    if (description == null) {
+                        description = new ResourceDescription(basePath);
+                        descriptions.put(basePath, description);
+                    }
+                }
+            });
+            return new LinkedList<>(descriptions.values());
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java
new file mode 100644
index 0000000000000..f59291971a68d
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusContextProducers.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+
+/**
+ * Provides CDI producers for objects that can be injected via @Context
+ * In quarkus-rest this works because @Context is considered an alias for @Inject
+ * through the use of {@code AutoInjectAnnotationBuildItem}
+ */
+@Singleton
+public class QuarkusContextProducers {
+
+    // HttpServerRequest, HttpServerRequest are Vert.x types so it's not necessary to have it injectable via @Context,
+    // however we do use it in the Quickstarts so let's make it work
+    @RequestScoped
+    @Produces
+    HttpServerRequest httpServerRequest() {
+        return CurrentRequestManager.get().serverRequest().unwrap(HttpServerRequest.class);
+    }
+
+    @RequestScoped
+    @Produces
+    HttpServerResponse httpServerResponse() {
+        return CurrentRequestManager.get().serverRequest().unwrap(HttpServerResponse.class);
+    }
+
+    private ResteasyReactiveRequestContext getContext() {
+        return CurrentRequestManager.get();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java
new file mode 100644
index 0000000000000..c2e32389673f0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusCurrentRequest.java
@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import org.jboss.resteasy.reactive.server.core.CurrentRequest;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+
+public class QuarkusCurrentRequest implements CurrentRequest {
+
+    private final CurrentVertxRequest currentVertxRequest;
+
+    public QuarkusCurrentRequest(CurrentVertxRequest currentVertxRequest) {
+        this.currentVertxRequest = currentVertxRequest;
+    }
+
+    @Override
+    public ResteasyReactiveRequestContext get() {
+        return (ResteasyReactiveRequestContext) currentVertxRequest.getOtherHttpContextObject();
+    }
+
+    @Override
+    public void set(ResteasyReactiveRequestContext set) {
+        currentVertxRequest.setOtherHttpContextObject(set);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java
new file mode 100644
index 0000000000000..0a5f7ccd5e279
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/QuarkusResteasyReactiveRequestContext.java
@@ -0,0 +1,64 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import javax.enterprise.event.Event;
+import javax.ws.rs.core.SecurityContext;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.server.vertx.VertxResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
+import io.vertx.ext.web.RoutingContext;
+
+public class QuarkusResteasyReactiveRequestContext extends VertxResteasyReactiveRequestContext {
+
+    final CurrentIdentityAssociation association;
+
+    public QuarkusResteasyReactiveRequestContext(Deployment deployment, ProvidersImpl providers,
+            RoutingContext context, ThreadSetupAction requestContext, ServerRestHandler[] handlerChain,
+            ServerRestHandler[] abortHandlerChain, CurrentIdentityAssociation currentIdentityAssociation) {
+        super(deployment, providers, context, requestContext, handlerChain, abortHandlerChain);
+        this.association = currentIdentityAssociation;
+    }
+
+    protected void handleRequestScopeActivation() {
+        super.handleRequestScopeActivation();
+        if (association != null) {
+            QuarkusHttpUser existing = (QuarkusHttpUser) context.user();
+            if (existing != null) {
+                SecurityIdentity identity = existing.getSecurityIdentity();
+                association.setIdentity(identity);
+            } else {
+                association.setIdentity(QuarkusHttpUser.getSecurityIdentity(context, null));
+            }
+        }
+    }
+
+    private static Event<SecurityIdentity> createEvent() {
+        return Arc.container().beanManager().getEvent().select(SecurityIdentity.class);
+    }
+
+    protected SecurityContext createSecurityContext() {
+        return new ResteasyReactiveSecurityContext(context);
+    }
+
+    @Override
+    protected void handleUnrecoverableError(Throwable throwable) {
+        context.fail(throwable);
+        super.handleUnrecoverableError(throwable);
+    }
+
+    @Override
+    public void handleUnmappedException(Throwable throwable) {
+        throw sneakyThrow(throwable);
+    }
+
+    private <E extends Throwable> RuntimeException sneakyThrow(Throwable e) throws E {
+        throw (E) e;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveInitialiser.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveInitialiser.java
new file mode 100644
index 0000000000000..873d02e9b7878
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveInitialiser.java
@@ -0,0 +1,10 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+
+public interface ResteasyReactiveInitialiser {
+    /**
+     * This is where we stuff all generated static init calls we need to make.
+     */
+    void init(Deployment deployment);
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java
new file mode 100644
index 0000000000000..08cfd617aea83
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java
@@ -0,0 +1,222 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import static io.quarkus.resteasy.reactive.server.runtime.NotFoundExceptionMapper.classMappers;
+
+import java.io.Closeable;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.ws.rs.core.Application;
+
+import org.jboss.resteasy.reactive.common.core.SingletonBeanFactory;
+import org.jboss.resteasy.reactive.common.model.ResourceContextResolver;
+import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
+import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport;
+import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.DeploymentInfo;
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+import org.jboss.resteasy.reactive.server.core.RequestContextFactory;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.startup.CustomServerRestHandlers;
+import org.jboss.resteasy.reactive.server.core.startup.RuntimeDeploymentManager;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.server.util.RuntimeResourceVisitor;
+import org.jboss.resteasy.reactive.server.util.ScoreSystem;
+import org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.resteasy.reactive.common.runtime.ArcBeanFactory;
+import io.quarkus.resteasy.reactive.common.runtime.ArcThreadSetupAction;
+import io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveCommonRecorder;
+import io.quarkus.runtime.BlockingOperationControl;
+import io.quarkus.runtime.ExecutorRecorder;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.ShutdownContext;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class ResteasyReactiveRecorder extends ResteasyReactiveCommonRecorder {
+
+    public static final Supplier<Executor> EXECUTOR_SUPPLIER = new Supplier<Executor>() {
+        @Override
+        public Executor get() {
+            return ExecutorRecorder.getCurrent();
+        }
+    };
+
+    static volatile Deployment currentDeployment;
+
+    public static Deployment getCurrentDeployment() {
+        return currentDeployment;
+    }
+
+    public RuntimeValue<Deployment> createDeployment(DeploymentInfo info,
+            BeanContainer beanContainer,
+            ShutdownContext shutdownContext, HttpBuildTimeConfig vertxConfig,
+            RequestContextFactory contextFactory,
+            BeanFactory<ResteasyReactiveInitialiser> initClassFactory) {
+
+        CurrentRequestManager
+                .setCurrentRequestInstance(new QuarkusCurrentRequest(beanContainer.instance(CurrentVertxRequest.class)));
+
+        BlockingOperationSupport.setIoThreadDetector(new BlockingOperationSupport.IOThreadDetector() {
+            @Override
+            public boolean isBlockingAllowed() {
+                return BlockingOperationControl.isBlockingAllowed();
+            }
+        });
+
+        Consumer<Closeable> closeTaskHandler = new Consumer<Closeable>() {
+            @Override
+            public void accept(Closeable closeable) {
+                shutdownContext.addShutdownTask(new ShutdownContext.CloseRunnable(closeable));
+            }
+        };
+        CurrentIdentityAssociation currentIdentityAssociation = Arc.container().instance(CurrentIdentityAssociation.class)
+                .get();
+        if (contextFactory == null) {
+            contextFactory = new RequestContextFactory() {
+                @Override
+                public ResteasyReactiveRequestContext createContext(Deployment deployment,
+                        ProvidersImpl providers, Object context, ThreadSetupAction requestContext,
+                        ServerRestHandler[] handlerChain, ServerRestHandler[] abortHandlerChain) {
+                    return new QuarkusResteasyReactiveRequestContext(deployment, providers, (RoutingContext) context,
+                            requestContext,
+                            handlerChain,
+                            abortHandlerChain, currentIdentityAssociation);
+                }
+
+            };
+        }
+
+        RuntimeDeploymentManager runtimeDeploymentManager = new RuntimeDeploymentManager(info, EXECUTOR_SUPPLIER,
+                new CustomServerRestHandlers(new BlockingInputHandlerSupplier(), new MultipartHandlerSupplier()),
+                closeTaskHandler, contextFactory, new ArcThreadSetupAction(beanContainer.requestContext()),
+                vertxConfig.rootPath);
+        Deployment deployment = runtimeDeploymentManager.deploy();
+        initClassFactory.createInstance().getInstance().init(deployment);
+        currentDeployment = deployment;
+
+        if (LaunchMode.current() == LaunchMode.DEVELOPMENT) {
+            classMappers = deployment.getClassMappers();
+            RuntimeResourceVisitor.visitRuntimeResources(classMappers, ScoreSystem.ScoreVisitor);
+        }
+        return new RuntimeValue<>(deployment);
+    }
+
+    public Handler<RoutingContext> handler(RuntimeValue<Deployment> deploymentRuntimeValue) {
+        Deployment deployment = deploymentRuntimeValue.getValue();
+        RestInitialHandler initialHandler = new RestInitialHandler(deployment);
+        return new ResteasyReactiveVertxHandler(initialHandler);
+    }
+
+    /**
+     * This is Quarkus specific.
+     * <p>
+     * We have a strategy around handling the Application class and build time init, that allows for the singletons
+     * to still work.
+     *
+     * @param applicationClass
+     * @param singletonClassesEmpty
+     * @return
+     */
+    public Supplier<Application> handleApplication(final Class<? extends Application> applicationClass,
+            final boolean singletonClassesEmpty) {
+        Supplier<Application> applicationSupplier;
+        if (singletonClassesEmpty) {
+            applicationSupplier = new Supplier<Application>() {
+                @Override
+                public Application get() {
+                    try {
+                        return applicationClass.getConstructor().newInstance();
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            };
+        } else {
+            try {
+                final Application application = applicationClass.getConstructor().newInstance();
+                for (Object i : application.getSingletons()) {
+                    SingletonBeanFactory.setInstance(i.getClass().getName(), i);
+                }
+                applicationSupplier = new Supplier<Application>() {
+                    @Override
+                    public Application get() {
+                        return application;
+                    }
+                };
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return applicationSupplier;
+    }
+
+    @SuppressWarnings("unchecked")
+    public void registerExceptionMapper(ExceptionMapping exceptionMapping, String string,
+            ResourceExceptionMapper<Throwable> mapper) {
+        exceptionMapping.addExceptionMapper(loadClass(string), mapper);
+    }
+
+    public void registerContextResolver(ContextResolvers contextResolvers, String string,
+            ResourceContextResolver resolver) {
+        contextResolvers.addContextResolver(loadClass(string), resolver);
+    }
+
+    public Supplier<EndpointInvoker> invoker(String baseName) {
+        return new Supplier<EndpointInvoker>() {
+            @Override
+            public EndpointInvoker get() {
+                try {
+                    return (EndpointInvoker) loadClass(baseName).newInstance();
+                } catch (IllegalAccessException | InstantiationException e) {
+                    throw new RuntimeException("Unable to generate endpoint invoker", e);
+                }
+
+            }
+        };
+    }
+
+    public Function<Class<?>, BeanFactory<?>> factoryCreator(BeanContainer container) {
+        return new Function<Class<?>, BeanFactory<?>>() {
+            @Override
+            public BeanFactory<?> apply(Class<?> aClass) {
+                return new ArcBeanFactory<>(aClass, container);
+            }
+        };
+    }
+
+    private static class BlockingInputHandlerSupplier implements Supplier<ServerRestHandler> {
+
+        @Override
+        public ServerRestHandler get() {
+            return new BlockingInputHandler();
+        }
+    }
+
+    private static class MultipartHandlerSupplier implements Supplier<ServerRestHandler> {
+
+        @Override
+        public ServerRestHandler get() {
+            return new MultipartFormHandler();
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRuntimeRecorder.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRuntimeRecorder.java
new file mode 100644
index 0000000000000..5febf37afd65e
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRuntimeRecorder.java
@@ -0,0 +1,59 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfigurableServerRestHandler;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfiguration;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.http.runtime.HttpConfiguration;
+
+@Recorder
+public class ResteasyReactiveRuntimeRecorder {
+
+    public void configure(RuntimeValue<Deployment> deployment, HttpConfiguration configuration) {
+        List<RuntimeConfigurableServerRestHandler> runtimeConfigurableServerRestHandlers = deployment.getValue()
+                .getRuntimeConfigurableServerRestHandlers();
+        for (RuntimeConfigurableServerRestHandler handler : runtimeConfigurableServerRestHandlers) {
+            handler.configure(new RuntimeConfiguration() {
+                @Override
+                public Duration readTimeout() {
+                    return configuration.readTimeout;
+                }
+
+                @Override
+                public Body body() {
+                    return new Body() {
+                        @Override
+                        public boolean deleteUploadedFilesOnEnd() {
+                            return configuration.body.deleteUploadedFilesOnEnd;
+                        }
+
+                        @Override
+                        public String uploadsDirectory() {
+                            return configuration.body.uploadsDirectory;
+                        }
+                    };
+                }
+
+                @Override
+                public Limits limits() {
+                    return new Limits() {
+                        @Override
+                        public Optional<Long> maxBodySize() {
+                            if (configuration.limits.maxBodySize.isPresent()) {
+                                return Optional.of(configuration.limits.maxBodySize.get().asLongValue());
+                            } else {
+                                return Optional.empty();
+                            }
+                        }
+                    };
+                }
+            });
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java
new file mode 100644
index 0000000000000..63b6e385fed34
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveSecurityContext.java
@@ -0,0 +1,52 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.security.Principal;
+
+import javax.ws.rs.core.SecurityContext;
+
+import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
+import io.vertx.ext.web.RoutingContext;
+
+public class ResteasyReactiveSecurityContext implements SecurityContext {
+
+    private final RoutingContext routingContext;
+
+    public ResteasyReactiveSecurityContext(RoutingContext routingContext) {
+        this.routingContext = routingContext;
+    }
+
+    @Override
+    public Principal getUserPrincipal() {
+        QuarkusHttpUser user = (QuarkusHttpUser) routingContext.user();
+        if (user == null || user.getSecurityIdentity().isAnonymous()) {
+            return null;
+        }
+        return user.getSecurityIdentity().getPrincipal();
+    }
+
+    @Override
+    public boolean isUserInRole(String role) {
+        SecurityIdentity user = CurrentIdentityAssociation.current();
+        if (role.equals("**")) {
+            return !user.isAnonymous();
+        }
+        return user.hasRole(role);
+    }
+
+    @Override
+    public boolean isSecure() {
+        return routingContext.request().isSSL();
+    }
+
+    @Override
+    public String getAuthenticationScheme() {
+        String authorizationValue = routingContext.request().getHeader("Authorization");
+        if (authorizationValue == null) {
+            return null;
+        } else {
+            return authorizationValue.split(" ")[0].trim();
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java
new file mode 100644
index 0000000000000..aad96fe47e6e8
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveTestHttpProvider.java
@@ -0,0 +1,70 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+import java.util.function.Function;
+
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
+
+public class ResteasyReactiveTestHttpProvider implements TestHttpEndpointProvider {
+    @Override
+    public Function<Class<?>, String> endpointProvider() {
+        return new Function<Class<?>, String>() {
+            @Override
+            public String apply(Class<?> aClass) {
+                String value = getPath(aClass);
+                if (value == null) {
+                    return null;
+                }
+                if (value.startsWith("/")) {
+                    value = value.substring(1);
+                }
+                //TODO: there is not really any way to handle @ApplicationPath, we could do something for @QuarkusTest apps but we can't for
+                //native apps, so we just have to document the limitation
+                String path = "/";
+                Optional<String> appPath = ConfigProvider.getConfig().getOptionalValue("quarkus.rest.path", String.class);
+                if (appPath.isPresent()) {
+                    path = appPath.get();
+                }
+                if (!path.endsWith("/")) {
+                    path = path + "/";
+                }
+                value = path + value;
+                return value;
+            }
+        };
+    }
+
+    private String getPath(Class<?> aClass) {
+        String value = null;
+        for (Annotation annotation : aClass.getAnnotations()) {
+            if (annotation.annotationType().getName().equals(Path.class.getName())) {
+                try {
+                    value = (String) annotation.annotationType().getMethod("value").invoke(annotation);
+                    break;
+                } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        if (value == null) {
+            for (Class<?> i : aClass.getInterfaces()) {
+                value = getPath(i);
+                if (value != null) {
+                    break;
+                }
+            }
+        }
+        if (value == null) {
+            if (aClass.getSuperclass() != Object.class) {
+                value = getPath(aClass.getSuperclass());
+            }
+        }
+        return value;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerVertxBufferMessageBodyWriter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerVertxBufferMessageBodyWriter.java
new file mode 100644
index 0000000000000..3b815f36dcf97
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ServerVertxBufferMessageBodyWriter.java
@@ -0,0 +1,29 @@
+package io.quarkus.resteasy.reactive.server.runtime;
+
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+import io.quarkus.resteasy.reactive.common.runtime.VertxBufferMessageBodyWriter;
+import io.vertx.core.buffer.Buffer;
+
+@Provider
+public class ServerVertxBufferMessageBodyWriter extends VertxBufferMessageBodyWriter
+        implements ServerMessageBodyWriter<Buffer> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public void writeResponse(Buffer buffer, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        context.serverResponse().end(buffer.getBytes());
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AsyncExceptionMappingUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AsyncExceptionMappingUtil.java
new file mode 100644
index 0000000000000..6b2460c514807
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AsyncExceptionMappingUtil.java
@@ -0,0 +1,53 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import java.util.function.Consumer;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+import org.jboss.resteasy.reactive.server.spi.AsyncExceptionMapperContext;
+
+import io.smallrye.mutiny.Uni;
+
+/**
+ * This class is used by the exception mappers that are generated as a result of the use of {@link ServerExceptionMapper}
+ * with a {@link Uni} response type.
+ * See {@code io.quarkus.resteasy.reactive.server.deployment.ServerExceptionMapperGenerator}
+ */
+public final class AsyncExceptionMappingUtil {
+
+    private static final Logger log = Logger.getLogger(AsyncExceptionMappingUtil.class);
+
+    private static final Response DEFAULT_RESPONSE = Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+            .entity("Internal Server Error").build();
+
+    static final Response DEFAULT_UNAUTHORIZED_RESPONSE = Response.status(Response.Status.UNAUTHORIZED)
+            .entity("Not Authenticated").build();
+
+    private AsyncExceptionMappingUtil() {
+    }
+
+    public static void handleUniResponse(Uni<Response> asyncResponse, AsyncExceptionMapperContext context) {
+        context.suspend();
+        asyncResponse.subscribe().with(new Consumer<Response>() {
+            @Override
+            public void accept(Response response) {
+                if (response == null) {
+                    log.debug("Response was null, returning default error response");
+                    context.setResponse(DEFAULT_RESPONSE);
+                } else {
+                    context.setResponse(response);
+                }
+                context.resume();
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) {
+                log.error("Unable to convert exception to Response", throwable);
+                context.setResponse(DEFAULT_RESPONSE);
+                context.resume();
+            }
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java
new file mode 100644
index 0000000000000..d3f1dd499923f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationCompletionExceptionMapper.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import io.quarkus.security.AuthenticationCompletionException;
+
+public class AuthenticationCompletionExceptionMapper implements ExceptionMapper<AuthenticationCompletionException> {
+
+    @Override
+    public Response toResponse(AuthenticationCompletionException ex) {
+        return Response.status(Response.Status.UNAUTHORIZED).build();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java
new file mode 100644
index 0000000000000..3cc1a7180645b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationFailedExceptionMapper.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+import io.quarkus.security.AuthenticationFailedException;
+import io.smallrye.mutiny.Uni;
+import io.vertx.ext.web.RoutingContext;
+
+public class AuthenticationFailedExceptionMapper {
+
+    @ServerExceptionMapper(AuthenticationFailedException.class)
+    public Uni<Response> handle(RoutingContext routingContext) {
+        return SecurityExceptionMapperUtil.handleWithAuthenticator(routingContext);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java
new file mode 100644
index 0000000000000..2dc9d1e0fc486
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/AuthenticationRedirectExceptionMapper.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import io.quarkus.security.AuthenticationRedirectException;
+
+public class AuthenticationRedirectExceptionMapper implements ExceptionMapper<AuthenticationRedirectException> {
+
+    @Override
+    public Response toResponse(AuthenticationRedirectException ex) {
+        return Response.status(ex.getCode())
+                .header(HttpHeaders.LOCATION, ex.getRedirectUri())
+                .header(HttpHeaders.CACHE_CONTROL, "no-store")
+                .header("Pragma", "no-cache")
+                .build();
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java
new file mode 100644
index 0000000000000..bfad75655a6c9
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/ForbiddenExceptionMapper.java
@@ -0,0 +1,14 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import io.quarkus.security.ForbiddenException;
+
+public class ForbiddenExceptionMapper implements ExceptionMapper<ForbiddenException> {
+
+    @Override
+    public Response toResponse(ForbiddenException exception) {
+        return Response.status(Response.Status.FORBIDDEN).build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java
new file mode 100644
index 0000000000000..00e19455ffea4
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/SecurityExceptionMapperUtil.java
@@ -0,0 +1,40 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import static io.quarkus.resteasy.reactive.server.runtime.exceptionmappers.AsyncExceptionMappingUtil.DEFAULT_UNAUTHORIZED_RESPONSE;
+
+import java.util.function.Function;
+
+import javax.ws.rs.core.Response;
+
+import io.quarkus.vertx.http.runtime.security.ChallengeData;
+import io.quarkus.vertx.http.runtime.security.HttpAuthenticator;
+import io.smallrye.mutiny.Uni;
+import io.vertx.ext.web.RoutingContext;
+
+final class SecurityExceptionMapperUtil {
+
+    private SecurityExceptionMapperUtil() {
+    }
+
+    static Uni<Response> handleWithAuthenticator(RoutingContext routingContext) {
+        HttpAuthenticator authenticator = routingContext.get(HttpAuthenticator.class.getName());
+        if (authenticator != null) {
+            Uni<ChallengeData> challenge = authenticator.getChallenge(routingContext);
+            return challenge.map(new Function<ChallengeData, Response>() {
+                @Override
+                public Response apply(ChallengeData challengeData) {
+                    if (challengeData == null) {
+                        return DEFAULT_UNAUTHORIZED_RESPONSE;
+                    }
+                    Response.ResponseBuilder status = Response.status(challengeData.status);
+                    if (challengeData.headerName != null) {
+                        status.header(challengeData.headerName.toString(), challengeData.headerContent);
+                    }
+                    return status.build();
+                }
+            }).onFailure().recoverWithItem(DEFAULT_UNAUTHORIZED_RESPONSE);
+        } else {
+            return Uni.createFrom().item(DEFAULT_UNAUTHORIZED_RESPONSE);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java
new file mode 100644
index 0000000000000..b0059fb16961a
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/exceptionmappers/UnauthorizedExceptionMapper.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.reactive.server.runtime.exceptionmappers;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+import io.quarkus.security.UnauthorizedException;
+import io.smallrye.mutiny.Uni;
+import io.vertx.ext.web.RoutingContext;
+
+public class UnauthorizedExceptionMapper {
+
+    @ServerExceptionMapper(UnauthorizedException.class)
+    public Uni<Response> handle(RoutingContext routingContext) {
+        return SecurityExceptionMapperUtil.handleWithAuthenticator(routingContext);
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/filters/FilterUtil.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/filters/FilterUtil.java
new file mode 100644
index 0000000000000..a1ab882fdb7e1
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/filters/FilterUtil.java
@@ -0,0 +1,78 @@
+package io.quarkus.resteasy.reactive.server.runtime.filters;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+
+import io.smallrye.mutiny.Uni;
+
+/**
+ * This class is used by the filters that are generated as a result of the use of {@link ServerRequestFilter} or
+ * {@link ServerResponseFilter} on methods
+ * that don't return {@code void}.
+ * See {@code io.quarkus.resteasy.reactive.server.deployment.CustomFilterGenerator}
+ */
+public final class FilterUtil {
+
+    private FilterUtil() {
+    }
+
+    public static void handleOptional(Optional<Response> optional,
+            ResteasyReactiveContainerRequestContext context) {
+        if ((optional != null) && optional.isPresent()) {
+            context.abortWith(optional.get());
+        }
+    }
+
+    public static void handleResponse(Response response,
+            ResteasyReactiveContainerRequestContext context) {
+        if (response != null) {
+            context.abortWith(response);
+        }
+    }
+
+    public static void handleUniVoid(Uni<Void> uni, ResteasyReactiveContainerRequestContext context) {
+        if (uni == null) {
+            return;
+        }
+        context.suspend();
+        uni.subscribe().with(new Consumer<Void>() {
+            @Override
+            public void accept(Void unused) {
+                context.resume();
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) {
+                context.resume(throwable);
+            }
+        });
+    }
+
+    public static void handleUniResponse(Uni<Response> uni, ResteasyReactiveContainerRequestContext context) {
+        if (uni == null) {
+            return;
+        }
+        context.suspend();
+        uni.subscribe().with(new Consumer<Response>() {
+            @Override
+            public void accept(Response response) {
+                if (response != null) {
+                    context.abortWith(response);
+                } else {
+                    context.resume();
+                }
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) {
+                context.resume(throwable);
+            }
+        });
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/filters/PreventAbortResteasyReactiveContainerRequestContext.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/filters/PreventAbortResteasyReactiveContainerRequestContext.java
new file mode 100644
index 0000000000000..0cee42485f1da
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/filters/PreventAbortResteasyReactiveContainerRequestContext.java
@@ -0,0 +1,157 @@
+package io.quarkus.resteasy.reactive.server.runtime.filters;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * This class is used to prevent calls to 'abortWith' which could lead to unexpected results in generated
+ * {@code ContainerRequestFilter} and {@code ContainerResponseFilter}.
+ */
+public final class PreventAbortResteasyReactiveContainerRequestContext implements ContainerRequestContext {
+
+    private final ContainerRequestContext delegate;
+
+    public PreventAbortResteasyReactiveContainerRequestContext(ContainerRequestContext delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return delegate.getProperty(name);
+    }
+
+    @Override
+    public Collection<String> getPropertyNames() {
+        return delegate.getPropertyNames();
+    }
+
+    @Override
+    public void setProperty(String name, Object object) {
+        delegate.setProperty(name, object);
+    }
+
+    @Override
+    public void removeProperty(String name) {
+        delegate.removeProperty(name);
+    }
+
+    @Override
+    public UriInfo getUriInfo() {
+        return delegate.getUriInfo();
+    }
+
+    @Override
+    public void setRequestUri(URI requestUri) {
+        delegate.setRequestUri(requestUri);
+    }
+
+    @Override
+    public void setRequestUri(URI baseUri, URI requestUri) {
+        delegate.setRequestUri(baseUri, requestUri);
+    }
+
+    @Override
+    public Request getRequest() {
+        return delegate.getRequest();
+    }
+
+    @Override
+    public String getMethod() {
+        return delegate.getMethod();
+    }
+
+    @Override
+    public void setMethod(String method) {
+        delegate.setMethod(method);
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getHeaders() {
+        return delegate.getHeaders();
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return delegate.getHeaderString(name);
+    }
+
+    @Override
+    public Date getDate() {
+        return delegate.getDate();
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return delegate.getLanguage();
+    }
+
+    @Override
+    public int getLength() {
+        return delegate.getLength();
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return delegate.getMediaType();
+    }
+
+    @Override
+    public List<MediaType> getAcceptableMediaTypes() {
+        return delegate.getAcceptableMediaTypes();
+    }
+
+    @Override
+    public List<Locale> getAcceptableLanguages() {
+        return delegate.getAcceptableLanguages();
+    }
+
+    @Override
+    public Map<String, Cookie> getCookies() {
+        return delegate.getCookies();
+    }
+
+    @Override
+    public boolean hasEntity() {
+        return delegate.hasEntity();
+    }
+
+    @Override
+    public InputStream getEntityStream() {
+        return delegate.getEntityStream();
+    }
+
+    @Override
+    public void setEntityStream(InputStream input) {
+        delegate.setEntityStream(input);
+    }
+
+    @Override
+    public SecurityContext getSecurityContext() {
+        return delegate.getSecurityContext();
+    }
+
+    @Override
+    public void setSecurityContext(SecurityContext context) {
+        delegate.setSecurityContext(context);
+    }
+
+    @Override
+    public void abortWith(Response response) {
+        throw new IllegalStateException(
+                "Calling 'abortWith' is not permitted when using @ServerRequestFilter or @ServerResponseFilter. If you need to abort processing, consider returning 'Response' or 'Uni<Response>'");
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java
new file mode 100644
index 0000000000000..aded53e831a7f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java
@@ -0,0 +1,102 @@
+package io.quarkus.resteasy.reactive.server.runtime.multipart;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Set;
+
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.handlers.RequestDeserializeHandler;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+
+import io.vertx.ext.web.FileUpload;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * This class isn't used directly, it is however used by generated code meant to deal with multipart forms.
+ */
+public final class MultipartSupport {
+
+    private static final Logger log = Logger.getLogger(RequestDeserializeHandler.class);
+
+    private static final Annotation[] EMPTY_ANNOTATIONS = new Annotation[0];
+
+    private MultipartSupport() {
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static Object convertFormAttribute(String value, Class type, Type genericType, MediaType mediaType,
+            ResteasyReactiveRequestContext context) {
+        if (value == null) {
+            return null;
+        }
+
+        ServerSerialisers serialisers = context.getDeployment().getSerialisers();
+        List<MessageBodyReader<?>> readers = serialisers.findReaders(null, type, mediaType, RuntimeType.SERVER);
+        if (readers.isEmpty()) {
+            throw new NotSupportedException();
+        }
+
+        for (MessageBodyReader<?> reader : readers) {
+            if (reader instanceof ServerMessageBodyReader) {
+                ServerMessageBodyReader<?> serverMessageBodyReader = (ServerMessageBodyReader<?>) reader;
+                if (serverMessageBodyReader.isReadable(type, genericType, context.getTarget().getLazyMethod(), mediaType)) {
+                    // this should always be an empty stream as multipart doesn't set the request body
+                    InputStream originalInputStream = context.getInputStream();
+                    try {
+                        // we need to set a fake input stream in order to trick the readers into thinking they are reading from the body
+                        context.setInputStream(formAttributeValueToInputStream(value));
+                        return serverMessageBodyReader.readFrom(type, genericType, mediaType, context);
+                    } catch (IOException e) {
+                        log.debug("Error occurred during deserialization of input", e);
+                        throw new InternalServerErrorException(e);
+                    } finally {
+                        context.setInputStream(originalInputStream);
+                    }
+
+                }
+            } else {
+                // TODO: should we be passing in the annotations?
+                if (reader.isReadable(type, genericType, EMPTY_ANNOTATIONS, mediaType)) {
+                    try {
+                        return reader.readFrom((Class) type, genericType, EMPTY_ANNOTATIONS, mediaType,
+                                context.getHttpHeaders().getRequestHeaders(),
+                                formAttributeValueToInputStream(value));
+                    } catch (IOException e) {
+                        log.debug("Error occurred during deserialization of input", e);
+                        throw new InternalServerErrorException(e);
+                    }
+                }
+            }
+        }
+        throw new NotSupportedException("Media type '" + mediaType + "' in multipart request is not supported");
+    }
+
+    public static QuarkusFileUpload getFileUpload(String formName, ResteasyReactiveRequestContext context) {
+        RoutingContext routingContext = context.unwrap(RoutingContext.class);
+        Set<FileUpload> fileUploads = routingContext.fileUploads();
+        for (FileUpload fileUpload : fileUploads) {
+            if (fileUpload.name().equals(formName)) {
+                return new QuarkusFileUpload(fileUpload);
+            }
+        }
+        return null;
+    }
+
+    private static ByteArrayInputStream formAttributeValueToInputStream(String formAttributeValue) {
+        return new ByteArrayInputStream(formAttributeValue.getBytes(StandardCharsets.UTF_8));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/QuarkusFileUpload.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/QuarkusFileUpload.java
new file mode 100644
index 0000000000000..112b650989327
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/QuarkusFileUpload.java
@@ -0,0 +1,45 @@
+package io.quarkus.resteasy.reactive.server.runtime.multipart;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+
+public class QuarkusFileUpload implements FileUpload {
+
+    private final io.vertx.ext.web.FileUpload vertxFileUpload;
+
+    public QuarkusFileUpload(io.vertx.ext.web.FileUpload vertxFileUpload) {
+        this.vertxFileUpload = vertxFileUpload;
+    }
+
+    @Override
+    public String name() {
+        return vertxFileUpload.name();
+    }
+
+    @Override
+    public Path uploadedFile() {
+        return Paths.get(vertxFileUpload.uploadedFileName());
+    }
+
+    @Override
+    public String fileName() {
+        return vertxFileUpload.fileName();
+    }
+
+    @Override
+    public long size() {
+        return vertxFileUpload.size();
+    }
+
+    @Override
+    public String contentType() {
+        return vertxFileUpload.contentType();
+    }
+
+    @Override
+    public String charSet() {
+        return vertxFileUpload.charSet();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java
new file mode 100644
index 0000000000000..f9e6b49835e49
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/security/SecurityContextOverrideHandler.java
@@ -0,0 +1,131 @@
+package io.quarkus.resteasy.reactive.server.runtime.security;
+
+import java.security.Permission;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.ws.rs.core.SecurityContext;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveSecurityContext;
+import io.quarkus.security.credential.Credential;
+import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.smallrye.mutiny.Uni;
+
+public class SecurityContextOverrideHandler implements ServerRestHandler {
+
+    private volatile SecurityIdentity securityIdentity;
+    private volatile CurrentIdentityAssociation currentIdentityAssociation;
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        if (!requestContext.isSecurityContextSet()) {
+            //nothing to do
+            return;
+        }
+        SecurityContext modified = requestContext.getSecurityContext();
+        if (modified instanceof ResteasyReactiveSecurityContext) {
+            //an original security context, it has not been modified
+            return;
+        }
+        updateIdentity(requestContext, modified);
+    }
+
+    private void updateIdentity(ResteasyReactiveRequestContext requestContext, SecurityContext modified) {
+        requestContext.requireCDIRequestScope();
+        CurrentIdentityAssociation currentIdentityAssociation = Arc.container().select(CurrentIdentityAssociation.class).get();
+        Uni<SecurityIdentity> oldIdentity = currentIdentityAssociation.getDeferredIdentity();
+        currentIdentityAssociation.setIdentity(oldIdentity.map(new Function<SecurityIdentity, SecurityIdentity>() {
+            @Override
+            public SecurityIdentity apply(SecurityIdentity old) {
+                Set<Credential> oldCredentials = old.getCredentials();
+                Map<String, Object> oldAttributes = old.getAttributes();
+                return new SecurityIdentity() {
+                    @Override
+                    public Principal getPrincipal() {
+                        return modified.getUserPrincipal();
+                    }
+
+                    @Override
+                    public boolean isAnonymous() {
+                        return modified.getUserPrincipal() == null;
+                    }
+
+                    @Override
+                    public Set<String> getRoles() {
+                        throw new UnsupportedOperationException(
+                                "retrieving all roles not supported when JAX-RS security context has been replaced");
+                    }
+
+                    @Override
+                    public boolean hasRole(String role) {
+                        return modified.isUserInRole(role);
+                    }
+
+                    @Override
+                    public <T extends Credential> T getCredential(Class<T> credentialType) {
+                        for (Credential cred : getCredentials()) {
+                            if (credentialType.isAssignableFrom(cred.getClass())) {
+                                return (T) cred;
+                            }
+                        }
+                        return null;
+                    }
+
+                    @Override
+                    public Set<Credential> getCredentials() {
+                        return oldCredentials;
+                    }
+
+                    @Override
+                    public <T> T getAttribute(String name) {
+                        return (T) oldAttributes.get(name);
+                    }
+
+                    @Override
+                    public Map<String, Object> getAttributes() {
+                        return oldAttributes;
+                    }
+
+                    @Override
+                    public Uni<Boolean> checkPermission(Permission permission) {
+                        return Uni.createFrom().nullItem();
+                    }
+                };
+            }
+        }));
+    }
+
+    private CurrentIdentityAssociation getCurrentIdentityAssociation() {
+        CurrentIdentityAssociation identityAssociation = this.currentIdentityAssociation;
+        if (identityAssociation == null) {
+            return this.currentIdentityAssociation = CDI.current().select(CurrentIdentityAssociation.class).get();
+        }
+        return identityAssociation;
+    }
+
+    private SecurityIdentity getSecurityIdentity() {
+        SecurityIdentity identity = this.securityIdentity;
+        if (identity == null) {
+            return this.securityIdentity = CDI.current().select(SecurityIdentity.class).get();
+        }
+        return identity;
+    }
+
+    public static class Customizer implements HandlerChainCustomizer {
+        @Override
+        public List<ServerRestHandler> handlers(Phase phase) {
+            return Collections.singletonList(new SecurityContextOverrideHandler());
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java
new file mode 100644
index 0000000000000..4406fa7439e24
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketParamExtractor.java
@@ -0,0 +1,52 @@
+package io.quarkus.resteasy.reactive.server.runtime.websocket;
+
+import javax.ws.rs.container.CompletionCallback;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+
+import io.quarkus.resteasy.reactive.server.runtime.QuarkusResteasyReactiveRequestContext;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.ServerWebSocket;
+
+//TODO: do we actually want vert.x websockets?
+//they are not our primary API but they are easy to support
+public class VertxWebSocketParamExtractor implements ParameterExtractor {
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        QuarkusResteasyReactiveRequestContext qrs = (QuarkusResteasyReactiveRequestContext) context;
+        HttpServerRequest req = qrs.vertxServerRequest();
+        ParameterCallback parameterCallback = new ParameterCallback();
+        req.toWebSocket(new Handler<AsyncResult<ServerWebSocket>>() {
+            @Override
+            public void handle(AsyncResult<ServerWebSocket> event) {
+                if (event.succeeded()) {
+                    ServerWebSocket result = event.result();
+                    result.closeHandler(new Handler<Void>() {
+                        @Override
+                        public void handle(Void event) {
+                            context.close();
+                        }
+                    });
+                    parameterCallback.setResult(result);
+                    //the completion callback is generally invoked by the websocket close
+                    //so the close will be a no-op
+                    //if there is an exception somewhere else in processing though
+                    //we want to close the websocket
+                    context.registerCompletionCallback(new CompletionCallback() {
+                        @Override
+                        public void onComplete(Throwable throwable) {
+                            result.close();
+                        }
+                    });
+                } else {
+                    parameterCallback.setFailure(event.cause());
+                }
+
+            }
+        });
+        return parameterCallback;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketRestHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketRestHandler.java
new file mode 100644
index 0000000000000..8cba0014a122f
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/websocket/VertxWebSocketRestHandler.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.reactive.server.runtime.websocket;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class VertxWebSocketRestHandler implements HandlerChainCustomizer {
+
+    private static final ServerRestHandler[] AWOL = new ServerRestHandler[] {
+            new ServerRestHandler() {
+
+                @Override
+                public void handle(ResteasyReactiveRequestContext requestContext)
+                        throws Exception {
+                    throw new IllegalStateException("FAILURE: should never be restarted");
+                }
+            }
+    };
+
+    @Override
+    public List<ServerRestHandler> handlers(Phase phase) {
+        if (phase == Phase.AFTER_METHOD_INVOKE) {
+            return Collections.singletonList(new ServerRestHandler() {
+                @Override
+                public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+                    //make sure that we are never restarted
+                    requestContext.restart(AWOL, true);
+                    requestContext.suspend(); //we never resume
+                }
+            });
+        }
+        return Collections.emptyList();
+
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..44cce2716d9f7
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,19 @@
+name: "RESTEasy Reactive"
+metadata:
+  short-name: "resteasy-reactive"
+  keywords:
+  - "jaxrs"
+  - "web"
+  - "rest"
+  categories:
+  - "web"
+  - "reactive"
+  status: "experimental"
+  codestart:
+    name: "resteasy-reactive"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+      - "scala"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
new file mode 100644
index 0000000000000..9d2f77c790542
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
@@ -0,0 +1 @@
+io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveTestHttpProvider
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/RequestMapperTestCase.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/RequestMapperTestCase.java
new file mode 100644
index 0000000000000..2b5984ae0f5ed
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/RequestMapperTestCase.java
@@ -0,0 +1,46 @@
+package io.quarkus.resteasy.reactive.runtime.mapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.URITemplate;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class RequestMapperTestCase {
+
+    @Test
+    public void testPathMapper() {
+
+        RequestMapper<String> mapper = mapper("/id", "/id/{param}", "/bar/{p1}/{p2}", "/bar/{p1}");
+        mapper.dump();
+
+        RequestMapper.RequestMatch<String> result = mapper.map("/bar/34/44");
+        Assertions.assertEquals("/bar/{p1}/{p2}", result.value);
+        Assertions.assertEquals("34", result.pathParamValues[0]);
+        Assertions.assertEquals("44", result.pathParamValues[1]);
+        Assertions.assertNull(mapper.map("/foo"));
+        Assertions.assertEquals("/id", mapper.map("/id").value);
+        result = mapper.map("/id/34");
+        Assertions.assertEquals("/id/{param}", result.value);
+        Assertions.assertEquals("34", result.pathParamValues[0]);
+        result = mapper.map("/id/34/");
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals("/id/{param}", result.value);
+        Assertions.assertEquals("34", result.pathParamValues[0]);
+        result = mapper.map("/bar/34");
+        Assertions.assertEquals("/bar/{p1}", result.value);
+        Assertions.assertEquals("34", result.pathParamValues[0]);
+
+    }
+
+    RequestMapper<String> mapper(String... vals) {
+        List<RequestMapper.RequestPath<String>> list = new ArrayList<>();
+        for (String i : vals) {
+            list.add(new RequestMapper.RequestPath<>(false, new URITemplate(i, false), i));
+        }
+        return new RequestMapper<>(list);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java
new file mode 100644
index 0000000000000..fa3f116917225
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/test/java/io/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.java
@@ -0,0 +1,88 @@
+package io.quarkus.resteasy.reactive.runtime.mapping;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.util.TypeLiteral;
+
+import org.jboss.resteasy.reactive.common.util.types.TypeSignatureParser;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TypeSignatureParserTest {
+
+    public static class StaticInner {
+    }
+
+    public class Inner {
+    }
+
+    public class InnerGeneric<T> {
+        public class Inner<P> {
+        }
+    }
+
+    public class Foo<T> extends InnerGeneric<T> {
+    }
+
+    @Test
+    public void testSignatures() throws NoSuchMethodException, SecurityException {
+        assertType("B", byte.class);
+        assertType("C", char.class);
+        assertType("D", double.class);
+        assertType("F", float.class);
+        assertType("I", int.class);
+        assertType("J", long.class);
+        assertType("S", short.class);
+        assertType("Z", boolean.class);
+        assertType("[Z", boolean[].class);
+        assertType("[[Z", boolean[][].class);
+        assertType("Ljava/lang/Class;", Class.class);
+        assertType("[Ljava/lang/Class;", Class[].class);
+        assertType("[[Ljava/lang/Class;", Class[][].class);
+        assertType("Lio/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest;", TypeSignatureParserTest.class);
+        assertType("Lio/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.StaticInner;", StaticInner.class);
+        assertType("Lio/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.Inner;", Inner.class);
+        assertType("Ljava/util/List<Ljava/lang/String;>;", new TypeLiteral<List<String>>() {
+        });
+        assertType("[Ljava/util/List<Ljava/lang/String;>;", new TypeLiteral<List<String>[]>() {
+        });
+        assertType("[[Ljava/util/List<Ljava/lang/String;>;", new TypeLiteral<List<String>[][]>() {
+        });
+        assertType("Ljava/util/Map<Ljava/lang/String;Ljava/lang/Integer;>;", new TypeLiteral<Map<String, Integer>>() {
+        });
+        assertType("Lio/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.InnerGeneric<Ljava/lang/String;>;",
+                new TypeLiteral<InnerGeneric<String>>() {
+                });
+        assertType(
+                "Lio/quarkus/resteasy/reactive/runtime/mapping/TypeSignatureParserTest.InnerGeneric<Ljava/lang/String;>.Inner<Ljava/lang/Integer;>;",
+                new TypeLiteral<InnerGeneric<String>.Inner<Integer>>() {
+                });
+
+        assertType("Ljava/util/List<+Ljava/lang/String;>;", new TypeLiteral<List<? extends String>>() {
+        });
+        assertType("Ljava/util/List<-Ljava/lang/String;>;", new TypeLiteral<List<? super String>>() {
+        });
+        assertType("Ljava/util/List<*>;", new TypeLiteral<List<?>>() {
+        });
+
+        //        assertType("TT;", ((ParameterizedType)Foo.class.getGenericSuperclass()).getActualTypeArguments()[0]);
+    }
+
+    private void assertType(String signature, TypeLiteral<?> actual) {
+        assertType(signature, actual.getType());
+    }
+
+    private void assertType(String signature, Type actual) {
+        Type parsedType = new TypeSignatureParser(signature).parseType();
+        // the JDK impl has reasonable hashCode/equals for lots of stuff but not TypeVariable, so we do a switcheroo for those
+        if (actual instanceof TypeVariable) {
+            Assertions.assertTrue(parsedType.equals(actual), () -> "expecting " + actual + " but got " + parsedType);
+        } else {
+            Assertions.assertEquals(actual, parsedType);
+        }
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/pom.xml b/extensions/resteasy-reactive/rest-client-reactive/deployment/pom.xml
new file mode 100644
index 0000000000000..53ee801436147
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-rest-client-reactive-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-rest-client-reactive-deployment</artifactId>
+    <name>Quarkus - MicroProfile Rest Client with RestEasy Reactive - Deployment</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client-deployment</artifactId>
+        </dependency>
+        <!-- test dependencies: -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java
new file mode 100644
index 0000000000000..9f6b8bd42618a
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/DotNames.java
@@ -0,0 +1,20 @@
+package io.quarkus.rest.client.reactive.deployment;
+
+import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
+import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParams;
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.annotation.RegisterProviders;
+import org.jboss.jandex.DotName;
+
+public class DotNames {
+
+    public static final DotName REGISTER_PROVIDER = DotName.createSimple(RegisterProvider.class.getName());
+    public static final DotName REGISTER_PROVIDERS = DotName.createSimple(RegisterProviders.class.getName());
+    public static final DotName CLIENT_HEADER_PARAM = DotName.createSimple(ClientHeaderParam.class.getName());
+    public static final DotName CLIENT_HEADER_PARAMS = DotName.createSimple(ClientHeaderParams.class.getName());
+    public static final DotName REGISTER_CLIENT_HEADERS = DotName.createSimple(RegisterClientHeaders.class.getName());
+
+    private DotNames() {
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java
new file mode 100644
index 0000000000000..e106d4a7958c4
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java
@@ -0,0 +1,445 @@
+package io.quarkus.rest.client.reactive.deployment;
+
+import static io.quarkus.arc.processor.DotNames.STRING;
+import static io.quarkus.rest.client.reactive.deployment.DotNames.CLIENT_HEADER_PARAM;
+import static io.quarkus.rest.client.reactive.deployment.DotNames.CLIENT_HEADER_PARAMS;
+import static io.quarkus.rest.client.reactive.deployment.DotNames.REGISTER_CLIENT_HEADERS;
+import static io.quarkus.rest.client.reactive.deployment.DotNames.REGISTER_PROVIDER;
+import static io.quarkus.rest.client.reactive.deployment.DotNames.REGISTER_PROVIDERS;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
+import org.eclipse.microprofile.rest.client.ext.DefaultClientHeadersFactoryImpl;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
+import io.quarkus.rest.client.reactive.HeaderFiller;
+import io.quarkus.rest.client.reactive.MicroProfileRestClientRequestFilter;
+import io.quarkus.rest.client.reactive.NoOpHeaderFiller;
+import io.quarkus.resteasy.reactive.client.deployment.JaxrsClientEnricher;
+import io.quarkus.runtime.util.HashUtil;
+
+/**
+ * Alters client stub generation to add MicroProfile Rest Client features.
+ *
+ * Used mostly to handle the `@RegisterProvider` annotation that e.g. registers filters
+ * and to add support for `@ClientHeaderParam` annotations for specifying (possibly) computed headers via annotations
+ */
+class MicroProfileRestClientEnricher implements JaxrsClientEnricher {
+    private static final Logger log = Logger.getLogger(MicroProfileRestClientEnricher.class);
+
+    public static final String DEFAULT_HEADERS_FACTORY = DefaultClientHeadersFactoryImpl.class.getName();
+
+    private static final AnnotationInstance[] EMPTY_ANNOTATION_INSTANCES = new AnnotationInstance[0];
+
+    private static final MethodDescriptor INVOCATION_BUILDER_PROPERTY_METHOD = MethodDescriptor.ofMethod(
+            Invocation.Builder.class,
+            "property", Invocation.Builder.class, String.class, Object.class);
+    private static final MethodDescriptor LIST_ADD_METHOD = MethodDescriptor.ofMethod(List.class, "add", boolean.class,
+            Object.class);
+    private static final MethodDescriptor MAP_PUT_METHOD = MethodDescriptor.ofMethod(Map.class, "put", Object.class,
+            Object.class, Object.class);
+    private static final MethodDescriptor MAP_CONTAINS_KEY_METHOD = MethodDescriptor.ofMethod(Map.class, "containsKey",
+            boolean.class, Object.class);
+    public static final String INVOKED_METHOD = "org.eclipse.microprofile.rest.client.invokedMethod";
+
+    private final Map<ClassInfo, String> interfaceMocks = new HashMap<>();
+
+    @Override
+    public void forClass(MethodCreator constructor, AssignableResultHandle webTargetBase,
+            ClassInfo interfaceClass, IndexView index) {
+
+        AnnotationInstance annotation = interfaceClass.classAnnotation(REGISTER_PROVIDER);
+        AnnotationInstance groupAnnotation = interfaceClass.classAnnotation(REGISTER_PROVIDERS);
+
+        if (annotation != null) {
+            addProvider(constructor, webTargetBase, index, annotation);
+        }
+        for (AnnotationInstance annotationInstance : extractAnnotations(groupAnnotation)) {
+            addProvider(constructor, webTargetBase, index, annotationInstance);
+        }
+
+        ResultHandle clientHeadersFactory = null;
+
+        AnnotationInstance registerClientHeaders = interfaceClass.classAnnotation(REGISTER_CLIENT_HEADERS);
+
+        boolean useDefaultHeaders = true;
+        if (registerClientHeaders != null) {
+            String headersFactoryClass = registerClientHeaders.valueWithDefault(index)
+                    .asClass().name().toString();
+
+            if (!headersFactoryClass.equals(DEFAULT_HEADERS_FACTORY)) {
+                // Arc.container().instance(...).get():
+                ResultHandle containerHandle = constructor
+                        .invokeStaticMethod(MethodDescriptor.ofMethod(Arc.class, "container", ArcContainer.class));
+                ResultHandle instanceHandle = constructor.invokeInterfaceMethod(
+                        MethodDescriptor.ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class,
+                                Annotation[].class),
+                        containerHandle, constructor.loadClass(headersFactoryClass),
+                        constructor.newArray(Annotation.class, 0));
+                clientHeadersFactory = constructor
+                        .invokeInterfaceMethod(MethodDescriptor.ofMethod(InstanceHandle.class, "get", Object.class),
+                                instanceHandle);
+                useDefaultHeaders = false;
+            }
+        }
+        if (useDefaultHeaders) {
+            clientHeadersFactory = constructor
+                    .newInstance(MethodDescriptor.ofConstructor(DEFAULT_HEADERS_FACTORY));
+        }
+
+        ResultHandle restClientFilter = constructor.newInstance(
+                MethodDescriptor.ofConstructor(MicroProfileRestClientRequestFilter.class, ClientHeadersFactory.class),
+                clientHeadersFactory);
+
+        constructor.assign(webTargetBase, constructor.invokeInterfaceMethod(
+                MethodDescriptor.ofMethod(Configurable.class, "register", Configurable.class, Object.class),
+                webTargetBase, restClientFilter));
+    }
+
+    @Override
+    public void forMethod(ClassCreator classCreator, MethodCreator constructor,
+            MethodCreator methodCreator,
+            ClassInfo interfaceClass,
+            MethodInfo method, AssignableResultHandle invocationBuilder,
+            IndexView index, BuildProducer<GeneratedClassBuildItem> generatedClasses,
+            int methodIndex) {
+
+        // create a field in the stub class to contain (interface) java.lang.reflect.Method corresponding to this method
+        // MP Rest Client spec says it has to be in the request context, keeping it in a field we don't have to
+        // initialize it on each call
+        ResultHandle interfaceClassHandle = constructor.loadClass(interfaceClass.toString());
+
+        ResultHandle parameterArray = constructor.newArray(Class.class, method.parameters().size());
+        for (int i = 0; i < method.parameters().size(); i++) {
+            String parameterClass = method.parameters().get(i).name().toString();
+            constructor.writeArrayValue(parameterArray, i, constructor.loadClass(parameterClass));
+        }
+
+        ResultHandle javaMethodHandle = constructor.invokeVirtualMethod(
+                MethodDescriptor.ofMethod(Class.class, "getMethod", Method.class, String.class, Class[].class),
+                interfaceClassHandle, constructor.load(method.name()), parameterArray);
+        FieldDescriptor javaMethodField = FieldDescriptor.of(classCreator.getClassName(), "javaMethod" + methodIndex,
+                Method.class);
+        classCreator.getFieldCreator(javaMethodField).setModifiers(Modifier.PRIVATE | Modifier.FINAL);
+        constructor.writeInstanceField(javaMethodField, constructor.getThis(), javaMethodHandle);
+
+        // header filler
+        Map<String, AnnotationInstance> headerFillersByName = new HashMap<>();
+
+        AnnotationInstance classLevelHeader = interfaceClass.classAnnotation(CLIENT_HEADER_PARAM);
+        if (classLevelHeader != null) {
+            headerFillersByName.put(classLevelHeader.value("name").asString(), classLevelHeader);
+        }
+        putAllHeaderAnnotations(headerFillersByName,
+                extractAnnotations(interfaceClass.classAnnotation(CLIENT_HEADER_PARAMS)));
+
+        Map<String, AnnotationInstance> methodLevelHeadersByName = new HashMap<>();
+        AnnotationInstance methodLevelHeader = method.annotation(CLIENT_HEADER_PARAM);
+        if (methodLevelHeader != null) {
+            methodLevelHeadersByName.put(methodLevelHeader.value("name").asString(), methodLevelHeader);
+        }
+        putAllHeaderAnnotations(methodLevelHeadersByName, extractAnnotations(method.annotation(CLIENT_HEADER_PARAMS)));
+
+        headerFillersByName.putAll(methodLevelHeadersByName);
+
+        FieldDescriptor headerFillerField = FieldDescriptor.of(classCreator.getClassName(),
+                "headerFiller" + methodIndex, HeaderFiller.class);
+        classCreator.getFieldCreator(headerFillerField).setModifiers(Modifier.PRIVATE | Modifier.FINAL);
+        ResultHandle headerFiller;
+        // create header filler for this method if headerFillersByName is not empty
+        if (!headerFillersByName.isEmpty()) {
+            String fillerClassName = interfaceClass.toString() + "$$" + method.name() + "$$" + methodIndex;
+
+            GeneratedClassGizmoAdaptor classOutput = new GeneratedClassGizmoAdaptor(generatedClasses, true);
+            try (ClassCreator headerFillerClass = ClassCreator.builder().className(fillerClassName)
+                    .interfaces(HeaderFiller.class)
+                    .classOutput(classOutput)
+                    .build()) {
+                FieldCreator logField = headerFillerClass.getFieldCreator("log", Logger.class);
+                logField.setModifiers(Modifier.FINAL | Modifier.STATIC | Modifier.PRIVATE);
+
+                MethodCreator staticConstructor = headerFillerClass.getMethodCreator("<clinit>", void.class);
+                staticConstructor.setModifiers(ACC_STATIC);
+                ResultHandle log = staticConstructor.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(Logger.class, "getLogger", Logger.class, String.class),
+                        staticConstructor.load(fillerClassName));
+                staticConstructor.writeStaticField(logField.getFieldDescriptor(), log);
+                staticConstructor.returnValue(null);
+
+                MethodCreator fillHeaders = headerFillerClass
+                        .getMethodCreator(
+                                MethodDescriptor.ofMethod(HeaderFiller.class, "addHeaders", void.class, MultivaluedMap.class));
+
+                for (Map.Entry<String, AnnotationInstance> headerEntry : headerFillersByName.entrySet()) {
+                    addHeaderParam(interfaceClass, method, fillHeaders, headerEntry.getValue(), generatedClasses,
+                            fillerClassName, index);
+                }
+                fillHeaders.returnValue(null);
+
+                headerFiller = constructor.newInstance(MethodDescriptor.ofConstructor(fillerClassName));
+            }
+        } else {
+            headerFiller = constructor
+                    .readStaticField(FieldDescriptor.of(NoOpHeaderFiller.class, "INSTANCE", NoOpHeaderFiller.class));
+        }
+        constructor.writeInstanceField(headerFillerField, constructor.getThis(), headerFiller);
+
+        ResultHandle javaMethod = methodCreator.readInstanceField(javaMethodField, methodCreator.getThis());
+        ResultHandle javaMethodAsObject = methodCreator.checkCast(javaMethod, Object.class);
+        methodCreator.assign(invocationBuilder,
+                methodCreator.invokeInterfaceMethod(INVOCATION_BUILDER_PROPERTY_METHOD, invocationBuilder,
+                        methodCreator.load(INVOKED_METHOD), javaMethodAsObject));
+        ResultHandle headerFillerAsObject = methodCreator.checkCast(
+                methodCreator.readInstanceField(headerFillerField, methodCreator.getThis()), Object.class);
+        methodCreator.assign(invocationBuilder,
+                methodCreator.invokeInterfaceMethod(INVOCATION_BUILDER_PROPERTY_METHOD, invocationBuilder,
+                        methodCreator.load(HeaderFiller.class.getName()), headerFillerAsObject));
+    }
+
+    private void putAllHeaderAnnotations(Map<String, AnnotationInstance> headerMap, AnnotationInstance[] annotations) {
+        for (AnnotationInstance annotation : annotations) {
+            String headerName = annotation.value("name").asString();
+            if (headerMap.put(headerName, annotation) != null) {
+                throw new RestClientDefinitionException("Duplicate ClientHeaderParam annotation for header: " + headerName +
+                        " on " + annotation.target());
+            }
+        }
+    }
+
+    // fillHeaders takes `MultivaluedMap<String, String>` as param and modifies it
+    private void addHeaderParam(ClassInfo declaringClass,
+            MethodInfo declaringMethod, MethodCreator fillHeadersCreator,
+            AnnotationInstance annotation,
+            BuildProducer<GeneratedClassBuildItem> generatedClasses,
+            String fillerClassName,
+            IndexView index) {
+
+        String headerName = annotation.value("name").asString();
+
+        String[] values = annotation.value().asStringArray();
+
+        if (values.length == 0) {
+            log.warnv("Ignoring ClientHeaderParam that specifies an empty array of header values for header {} on {}",
+                    annotation.value("name").asString(), annotation.target());
+            return;
+        }
+
+        ResultHandle headerMap = fillHeadersCreator.getMethodParam(0);
+
+        // if headers are set here, they were set with @HeaderParam, which should take precedence of MP ways
+        BytecodeCreator fillHeaders = fillHeadersCreator
+                .ifFalse(fillHeadersCreator.invokeInterfaceMethod(MAP_CONTAINS_KEY_METHOD, headerMap,
+                        fillHeadersCreator.load(headerName)))
+                .trueBranch();
+
+        if (values.length > 1 || !(values[0].startsWith("{") && values[0].endsWith("}"))) {
+            ResultHandle headerList = fillHeaders.newInstance(MethodDescriptor.ofConstructor(ArrayList.class));
+            for (String value : values) {
+                fillHeaders.invokeInterfaceMethod(LIST_ADD_METHOD, headerList, fillHeaders.load(value));
+            }
+
+            fillHeaders.invokeInterfaceMethod(MAP_PUT_METHOD, headerMap, fillHeaders.load(headerName), headerList);
+        } else { // method call :O {some.package.ClassName.methodName} or {defaultMethodWithinThisInterfaceName}
+            // if `required` an exception on header filling does not fail the invocation:
+            boolean required = annotation.valueWithDefault(index, "required").asBoolean();
+
+            BytecodeCreator fillHeader = fillHeaders;
+            TryBlock tryBlock = null;
+
+            if (!required) {
+                tryBlock = fillHeaders.tryBlock();
+                fillHeader = tryBlock;
+            }
+            String methodName = values[0].substring(1, values[0].length() - 1); // strip curly braces
+
+            MethodInfo headerFillingMethod = null;
+            ResultHandle headerValue;
+            if (methodName.contains(".")) {
+                // calling a static method
+                int endOfClassName = methodName.lastIndexOf('.');
+                String className = methodName.substring(0, endOfClassName);
+                String staticMethodName = methodName.substring(endOfClassName + 1);
+
+                ClassInfo clazz = index.getClassByName(DotName.createSimple(className));
+                if (clazz == null) {
+                    throw new RestClientDefinitionException(
+                            "Class " + className + " used in ClientHeaderParam on " + declaringClass + " not found");
+                }
+                headerFillingMethod = findMethod(clazz, declaringClass, staticMethodName);
+
+                if (headerFillingMethod.parameters().size() == 0) {
+                    headerValue = fillHeader.invokeStaticMethod(headerFillingMethod);
+                } else if (headerFillingMethod.parameters().size() == 1 && isString(headerFillingMethod.parameters().get(0))) {
+                    headerValue = fillHeader.invokeStaticMethod(headerFillingMethod, fillHeader.load(headerName));
+                } else {
+                    throw new RestClientDefinitionException(
+                            "ClientHeaderParam method " + declaringClass.toString() + "#" + staticMethodName
+                                    + " has too many parameters, at most one parameter, header name, expected");
+                }
+            } else {
+                // interface method
+                String mockName = mockInterface(declaringClass, generatedClasses, index);
+                ResultHandle interfaceMock = fillHeader.newInstance(MethodDescriptor.ofConstructor(mockName));
+
+                headerFillingMethod = findMethod(declaringClass, declaringClass, methodName);
+
+                if (headerFillingMethod == null) {
+                    throw new RestClientDefinitionException(
+                            "ClientHeaderParam method " + methodName + " not found on " + declaringClass);
+                }
+
+                if (headerFillingMethod.parameters().size() == 0) {
+                    headerValue = fillHeader.invokeInterfaceMethod(headerFillingMethod, interfaceMock);
+                } else if (headerFillingMethod.parameters().size() == 1 && isString(headerFillingMethod.parameters().get(0))) {
+                    headerValue = fillHeader.invokeInterfaceMethod(headerFillingMethod, interfaceMock,
+                            fillHeader.load(headerName));
+                } else {
+                    throw new RestClientDefinitionException(
+                            "ClientHeaderParam method " + declaringClass.toString() + "#" + methodName
+                                    + " has too many parameters, at most one parameter, header name, expected");
+                }
+
+            }
+
+            Type returnType = headerFillingMethod.returnType();
+            ResultHandle headerList;
+            if (returnType.kind() == Type.Kind.ARRAY && returnType.asArrayType().component().name().equals(STRING)) {
+                // repack array to list
+                headerList = fillHeader.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(Arrays.class, "asList", List.class, Object[].class), headerValue);
+            } else if (returnType.kind() == Type.Kind.CLASS && returnType.name().equals(STRING)) {
+                headerList = fillHeader.newInstance(MethodDescriptor.ofConstructor(ArrayList.class));
+                fillHeader.invokeInterfaceMethod(LIST_ADD_METHOD, headerList, headerValue);
+            } else {
+                throw new RestClientDefinitionException("Method " + declaringClass.toString() + "#" + methodName
+                        + " has an unsupported return type for ClientHeaderParam. " +
+                        "Only String and String[] return types are supported");
+            }
+            fillHeader.invokeInterfaceMethod(MAP_PUT_METHOD, headerMap, fillHeader.load(headerName), headerList);
+
+            if (!required) {
+                CatchBlockCreator catchBlock = tryBlock.addCatch(Exception.class);
+                ResultHandle log = catchBlock.readStaticField(FieldDescriptor.of(fillerClassName, "log", Logger.class));
+                String errorMessage = String.format(
+                        "Invoking header generation method '%s' for header '%s' on method '%s#%s' failed",
+                        methodName, headerName, declaringClass.name(), declaringMethod.name());
+                catchBlock.invokeVirtualMethod(
+                        MethodDescriptor.ofMethod(Logger.class, "warn", void.class, Object.class, Throwable.class),
+                        log,
+                        catchBlock.load(errorMessage), catchBlock.getCaughtException());
+            }
+        }
+    }
+
+    private MethodInfo findMethod(ClassInfo declaringClass, ClassInfo restInterface, String methodName) {
+        MethodInfo headerFillingMethod = null;
+        for (MethodInfo method : declaringClass.methods()) {
+            if (method.name().equals(methodName)) {
+                if (headerFillingMethod != null) {
+                    throw new RestClientDefinitionException("Ambiguous ClientHeaderParam definition, " +
+                            "more than one method of name " + methodName + " found on " + declaringClass +
+                            ". Problematic interface: " + restInterface);
+                } else {
+                    headerFillingMethod = method;
+                }
+            }
+        }
+        return headerFillingMethod;
+    }
+
+    private static boolean isString(Type type) {
+        return type.kind() == Type.Kind.CLASS && type.name().toString().equals(String.class.getName());
+    }
+
+    private String mockInterface(ClassInfo declaringClass, BuildProducer<GeneratedClassBuildItem> generatedClass,
+            IndexView index) {
+        // we have an interface, we have to call a default method on it, we generate a (very simplistic) implementation:
+
+        return interfaceMocks.computeIfAbsent(declaringClass, classInfo -> {
+            String mockName = declaringClass.toString() + HashUtil.sha1(declaringClass.toString());
+            ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
+            List<DotName> interfaceNames = declaringClass.interfaceNames();
+            Set<MethodInfo> methods = new HashSet<>();
+            for (DotName interfaceName : interfaceNames) {
+                ClassInfo interfaceClass = index.getClassByName(interfaceName);
+                methods.addAll(interfaceClass.methods());
+            }
+            methods.addAll(declaringClass.methods());
+
+            try (ClassCreator classCreator = ClassCreator.builder().className(mockName).interfaces(declaringClass.toString())
+                    .classOutput(classOutput)
+                    .build()) {
+
+                for (MethodInfo method : methods) {
+                    if (Modifier.isAbstract(method.flags())) {
+                        MethodCreator methodCreator = classCreator.getMethodCreator(MethodDescriptor.of(method));
+                        methodCreator.returnValue(methodCreator.loadNull());
+                    }
+                }
+            }
+            return mockName;
+        });
+    }
+
+    private AnnotationInstance[] extractAnnotations(AnnotationInstance groupAnnotation) {
+        if (groupAnnotation != null) {
+            AnnotationValue annotationValue = groupAnnotation.value();
+            if (annotationValue != null) {
+                return annotationValue.asNestedArray();
+            }
+        }
+        return EMPTY_ANNOTATION_INSTANCES;
+    }
+
+    private void addProvider(MethodCreator ctor, AssignableResultHandle target, IndexView index,
+            AnnotationInstance registerProvider) {
+        ResultHandle provider = ctor.newInstance(MethodDescriptor.ofConstructor(registerProvider.value().asString()));
+        ResultHandle alteredTarget = ctor.invokeInterfaceMethod(
+                MethodDescriptor.ofMethod(Configurable.class, "register", Configurable.class, Object.class,
+                        int.class),
+                target, provider,
+                ctor.load(registerProvider.valueWithDefault(index, "priority").asInt()));
+        ctor.assign(target, alteredTarget);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ReactiveResteasyMpClientProcessor.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ReactiveResteasyMpClientProcessor.java
new file mode 100644
index 0000000000000..82d39b4e9756c
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/ReactiveResteasyMpClientProcessor.java
@@ -0,0 +1,313 @@
+package io.quarkus.rest.client.reactive.deployment;
+
+import static org.jboss.resteasy.reactive.common.processor.EndpointIndexer.CDI_WRAPPER_SUFFIX;
+import static org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveScanner.BUILTIN_HTTP_ANNOTATIONS_TO_METHOD;
+
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Typed;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.CompositeIndex;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.arc.processor.ScopeInfo;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.rest.client.reactive.HeaderCapturingServerFilter;
+import io.quarkus.rest.client.reactive.HeaderContainer;
+import io.quarkus.rest.client.reactive.ReactiveResteasyMpClientConfig;
+import io.quarkus.rest.client.reactive.RestClientCDIDelegateBuilder;
+import io.quarkus.rest.client.reactive.recorder.RestClientRecorder;
+import io.quarkus.resteasy.reactive.client.deployment.JaxrsClientEnricherBuildItem;
+import io.quarkus.resteasy.reactive.client.deployment.RestClientDefaultConsumesBuildItem;
+import io.quarkus.resteasy.reactive.client.deployment.RestClientDefaultProducesBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
+
+class ReactiveResteasyMpClientProcessor {
+
+    private static final Logger log = Logger.getLogger(ReactiveResteasyMpClientProcessor.class);
+
+    private static final DotName REGISTER_REST_CLIENT = DotName.createSimple(RegisterRestClient.class.getName());
+    private static final DotName SESSION_SCOPED = DotName.createSimple(SessionScoped.class.getName());
+
+    private static final String DELEGATE = "delegate";
+    private static final String CREATE_DELEGATE = "createDelegate";
+
+    @BuildStep
+    void setUpDefaultMediaType(BuildProducer<RestClientDefaultConsumesBuildItem> consumes,
+            BuildProducer<RestClientDefaultProducesBuildItem> produces) {
+        consumes.produce(new RestClientDefaultConsumesBuildItem(MediaType.APPLICATION_JSON, 10));
+        produces.produce(new RestClientDefaultProducesBuildItem(MediaType.APPLICATION_JSON, 10));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void setupAdditionalBeans(
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            RestClientRecorder restClientRecorder) {
+        restClientRecorder.setRestClientBuilderResolver();
+        additionalBeans.produce(new AdditionalBeanBuildItem(RestClient.class));
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(HeaderContainer.class));
+    }
+
+    @BuildStep
+    void setupRequestCollectingFilter(BuildProducer<ContainerRequestFilterBuildItem> filters) {
+        filters.produce(new ContainerRequestFilterBuildItem(HeaderCapturingServerFilter.class.getName()));
+    }
+
+    @BuildStep
+    void addMpClientEnricher(BuildProducer<JaxrsClientEnricherBuildItem> enrichers) {
+        enrichers.produce(new JaxrsClientEnricherBuildItem(new MicroProfileRestClientEnricher()));
+    }
+
+    private void searchForJaxRsMethods(List<MethodInfo> listOfKnownMethods, ClassInfo startingInterface, CompositeIndex index) {
+        for (MethodInfo method : startingInterface.methods()) {
+            if (isRestMethod(method)) {
+                listOfKnownMethods.add(method);
+            }
+        }
+        List<DotName> otherImplementedInterfaces = startingInterface.interfaceNames();
+        for (DotName otherInterface : otherImplementedInterfaces) {
+            ClassInfo superInterface = index.getClassByName(otherInterface);
+            if (superInterface != null)
+                searchForJaxRsMethods(listOfKnownMethods, superInterface, index);
+        }
+    }
+
+    @BuildStep
+    void registerHeaderFactoryBeans(CombinedIndexBuildItem index,
+            BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
+        Collection<AnnotationInstance> annotations = index.getIndex().getAnnotations(DotNames.REGISTER_CLIENT_HEADERS);
+
+        for (AnnotationInstance registerClientHeaders : annotations) {
+            AnnotationValue value = registerClientHeaders.value();
+            if (value != null) {
+                Type clientHeaderFactoryType = value.asClass();
+                String factoryTypeName = clientHeaderFactoryType.name().toString();
+                if (!MicroProfileRestClientEnricher.DEFAULT_HEADERS_FACTORY.equals(factoryTypeName)) {
+                    additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(factoryTypeName));
+                }
+            }
+        }
+    }
+
+    @BuildStep
+    void addRestClientBeans(Capabilities capabilities,
+            CombinedIndexBuildItem combinedIndexBuildItem,
+            BuildProducer<GeneratedBeanBuildItem> generatedBeans,
+            ReactiveResteasyMpClientConfig clientConfig) {
+
+        CompositeIndex index = CompositeIndex.create(combinedIndexBuildItem.getIndex());
+        Set<AnnotationInstance> registerRestClientAnnos = new HashSet<>(index.getAnnotations(REGISTER_REST_CLIENT));
+        for (AnnotationInstance registerRestClient : registerRestClientAnnos) {
+            ClassInfo jaxrsInterface = registerRestClient.target().asClass();
+            // for each interface annotated with @RegisterRestClient, generate a $$CDIWrapper CDI bean that can be injected
+            if (Modifier.isAbstract(jaxrsInterface.flags())) {
+                List<MethodInfo> restMethods = new ArrayList<>();
+
+                // search this class and its super interfaces for jaxrs methods
+                searchForJaxRsMethods(restMethods, jaxrsInterface, index);
+                if (restMethods.isEmpty()) {
+                    continue;
+                }
+
+                String wrapperClassName = jaxrsInterface.name().toString() + CDI_WRAPPER_SUFFIX;
+                try (ClassCreator classCreator = ClassCreator.builder()
+                        .className(wrapperClassName)
+                        .classOutput(new GeneratedBeanGizmoAdaptor(generatedBeans))
+                        .interfaces(jaxrsInterface.name().toString())
+                        .build()) {
+
+                    // CLASS LEVEL
+                    final String configPrefix = computeConfigPrefix(jaxrsInterface.name(), registerRestClient);
+                    final ScopeInfo scope = computeDefaultScope(capabilities, ConfigProvider.getConfig(), jaxrsInterface,
+                            configPrefix, clientConfig);
+                    // add a scope annotation, e.g. @Singleton
+                    classCreator.addAnnotation(scope.getDotName().toString());
+                    classCreator.addAnnotation(RestClient.class);
+                    // e.g. @Typed({InterfaceClass.class})
+                    // needed for CDI to inject the proper wrapper in case of
+                    // subinterfaces
+                    org.objectweb.asm.Type asmType = org.objectweb.asm.Type
+                            .getObjectType(jaxrsInterface.name().toString().replace('.', '/'));
+                    classCreator.addAnnotation(Typed.class.getName(), RetentionPolicy.RUNTIME)
+                            .addValue("value", new org.objectweb.asm.Type[] { asmType });
+
+                    //private final InterfaceClass delegate;
+                    FieldDescriptor delegateField = FieldDescriptor.of(classCreator.getClassName(), DELEGATE,
+                            jaxrsInterface.name().toString());
+                    classCreator.getFieldCreator(delegateField).setModifiers(Modifier.FINAL | Modifier.PRIVATE);
+
+                    // CONSTRUCTOR:
+                    MethodCreator constructor = classCreator
+                            .getMethodCreator(MethodDescriptor.ofConstructor(classCreator.getClassName()));
+                    constructor.invokeSpecialMethod(MethodDescriptor.ofConstructor(Object.class), constructor.getThis());
+
+                    //       Object var1 = RestClientCDIDelegateBuilder.createDelegate(InterfaceClass.class, "/baseUri",
+                    //       "com.example.InterfaceClass");
+                    //      this.delegate = (InterfaceClass)var1;
+                    ResultHandle interfaceHandle = constructor.loadClass(jaxrsInterface.toString());
+
+                    AnnotationValue baseUri = registerRestClient.value("baseUri");
+
+                    ResultHandle baseUriHandle = constructor.load(baseUri != null ? baseUri.asString() : "");
+                    ResultHandle configPrefixHandle = constructor.load(configPrefix);
+
+                    MethodDescriptor createDelegate = MethodDescriptor.ofMethod(RestClientCDIDelegateBuilder.class,
+                            CREATE_DELEGATE, Object.class, Class.class, String.class, String.class);
+
+                    constructor.writeInstanceField(delegateField, constructor.getThis(),
+                            constructor.invokeStaticMethod(createDelegate, interfaceHandle, baseUriHandle,
+                                    configPrefixHandle));
+                    constructor.returnValue(null);
+
+                    // METHODS:
+                    for (MethodInfo method : restMethods) {
+                        // for each method method that corresponds to making a rest call, create a method like:
+                        // public JsonArray get() {
+                        //      return ((InterfaceClass)this.delegate).get();
+                        // }
+                        MethodCreator methodCreator = classCreator.getMethodCreator(MethodDescriptor.of(method));
+
+                        // copy method annotations, there can be interceptors bound to them:
+                        for (AnnotationInstance annotation : method.annotations()) {
+                            if (annotation.target().kind() == AnnotationTarget.Kind.METHOD
+                                    && !BUILTIN_HTTP_ANNOTATIONS_TO_METHOD.containsKey(annotation.name())
+                                    && !ResteasyReactiveDotNames.PATH.equals(annotation.name())) {
+                                AnnotationValue value = annotation.value();
+                                if (value != null && value.kind() == AnnotationValue.Kind.ARRAY
+                                        && value.componentKind() == AnnotationValue.Kind.NESTED) {
+                                    for (AnnotationInstance annotationInstance : value.asNestedArray()) {
+                                        methodCreator.addAnnotation(annotationInstance);
+                                    }
+                                } else {
+                                    methodCreator.addAnnotation(annotation);
+                                }
+                            }
+                        }
+
+                        ResultHandle delegate = methodCreator.readInstanceField(delegateField, methodCreator.getThis());
+
+                        int parameterCount = method.parameters().size();
+                        ResultHandle result;
+                        if (parameterCount == 0) {
+                            result = methodCreator.invokeInterfaceMethod(method, delegate);
+                        } else {
+                            ResultHandle[] params = new ResultHandle[parameterCount];
+                            for (int i = 0; i < parameterCount; i++) {
+                                params[i] = methodCreator.getMethodParam(i);
+                            }
+                            result = methodCreator.invokeInterfaceMethod(method, delegate, params);
+                        }
+                        methodCreator.returnValue(result);
+                    }
+                }
+            }
+        }
+    }
+
+    private boolean isRestMethod(MethodInfo method) {
+        if (!Modifier.isAbstract(method.flags())) {
+            return false;
+        }
+        for (AnnotationInstance annotation : method.annotations()) {
+            if (annotation.target().kind() == AnnotationTarget.Kind.METHOD
+                    && BUILTIN_HTTP_ANNOTATIONS_TO_METHOD.containsKey(annotation.name())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String computeConfigPrefix(DotName interfaceName, AnnotationInstance registerRestClientAnnotation) {
+        AnnotationValue configKeyValue = registerRestClientAnnotation.value("configKey");
+        return configKeyValue != null
+                ? configKeyValue.asString()
+                : interfaceName.toString();
+    }
+
+    private ScopeInfo computeDefaultScope(Capabilities capabilities, Config config,
+            ClassInfo restClientInterface,
+            String configPrefix,
+            ReactiveResteasyMpClientConfig mpClientConfig) {
+        ScopeInfo scopeToUse = null;
+        final Optional<String> scopeConfig = config
+                .getOptionalValue(String.format(RestClientCDIDelegateBuilder.REST_SCOPE_FORMAT, configPrefix), String.class);
+
+        BuiltinScope globalDefaultScope = BuiltinScope.from(DotName.createSimple(mpClientConfig.scope));
+        if (globalDefaultScope == null) {
+            log.warnv("Unable to map the global rest client scope: '{}' to a scope. Using @ApplicationScoped",
+                    mpClientConfig.scope);
+            globalDefaultScope = BuiltinScope.APPLICATION;
+        }
+
+        if (scopeConfig.isPresent()) {
+            final DotName scope = DotName.createSimple(scopeConfig.get());
+            final BuiltinScope builtinScope = BuiltinScope.from(scope);
+            if (builtinScope != null) { // override default @Dependent scope with user defined one.
+                scopeToUse = builtinScope.getInfo();
+            } else if (capabilities.isPresent(Capability.SERVLET)) {
+                if (scope.equals(SESSION_SCOPED)) {
+                    scopeToUse = new ScopeInfo(SESSION_SCOPED, true);
+                }
+            }
+
+            if (scopeToUse == null) {
+                log.warnf("Unsupported default scope {} provided for rest client {}. Defaulting to {}",
+                        scope, restClientInterface.name(), globalDefaultScope.getName());
+                scopeToUse = BuiltinScope.DEPENDENT.getInfo();
+            }
+        } else {
+            final Set<DotName> annotations = restClientInterface.annotations().keySet();
+            for (final DotName annotationName : annotations) {
+                final BuiltinScope builtinScope = BuiltinScope.from(annotationName);
+                if (builtinScope != null) {
+                    scopeToUse = builtinScope.getInfo();
+                    break;
+                }
+                if (annotationName.equals(SESSION_SCOPED)) {
+                    scopeToUse = new ScopeInfo(SESSION_SCOPED, true);
+                    break;
+                }
+            }
+        }
+
+        // Initialize a default @Dependent scope as per the spec
+        return scopeToUse != null ? scopeToUse : globalDefaultScope.getInfo();
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicMpRestClientTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicMpRestClientTest.java
new file mode 100644
index 0000000000000..7703a3e52caf6
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/BasicMpRestClientTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.rest.client.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class BasicMpRestClientTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloClient.class, HelloResource.class, TestBean.class, HelloClient2.class))
+            .withConfigurationResource("basic-test-application.properties");
+
+    @Inject
+    TestBean testBean;
+
+    @Test
+    void shouldHello() {
+        assertThat(testBean.helloViaBuiltClient("w0rld")).isEqualTo("hello, w0rld");
+    }
+
+    @Test
+    void shouldHelloThroughInjectedClient() {
+        assertThat(testBean.helloViaInjectedClient("wor1d")).isEqualTo("hello, wor1d");
+    }
+
+    @Test
+    void shouldHaveApplicationScopeByDefault() {
+        BeanManager beanManager = Arc.container().beanManager();
+        Set<Bean<?>> beans = beanManager.getBeans(HelloClient2.class, RestClient.LITERAL);
+        Bean<?> resolvedBean = beanManager.resolve(beans);
+        assertThat(resolvedBean.getScope()).isEqualTo(ApplicationScoped.class);
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java
new file mode 100644
index 0000000000000..8038231aeb5d2
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient.java
@@ -0,0 +1,15 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public interface HelloClient {
+    @POST
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    String echo(String name);
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java
new file mode 100644
index 0000000000000..4834c5cbb66a6
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloClient2.java
@@ -0,0 +1,18 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient(configKey = "hello2")
+public interface HelloClient2 {
+    @POST
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    @Path("/")
+    String echo(String name);
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java
new file mode 100644
index 0000000000000..938d18738d1ce
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/HelloResource.java
@@ -0,0 +1,19 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Request;
+
+@Path("/hello")
+@Produces(MediaType.TEXT_PLAIN)
+@Consumes(MediaType.TEXT_PLAIN)
+public class HelloResource {
+    @POST
+    public String echo(String name, @Context Request request) {
+        return "hello, " + name;
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpRestClientScopeOverrideTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpRestClientScopeOverrideTest.java
new file mode 100644
index 0000000000000..feb883bf6f001
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MpRestClientScopeOverrideTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.rest.client.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MpRestClientScopeOverrideTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(HelloClient2.class))
+            .withConfigurationResource("dependent-test-application.properties");
+
+    @RestClient
+    HelloClient2 client;
+
+    @Test
+    void shouldHaveDependentScope() {
+        BeanManager beanManager = Arc.container().beanManager();
+        Set<Bean<?>> beans = beanManager.getBeans(HelloClient2.class, RestClient.LITERAL);
+        Bean<?> resolvedBean = beanManager.resolve(beans);
+        assertThat(resolvedBean.getScope()).isEqualTo(Dependent.class);
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java
new file mode 100644
index 0000000000000..06fd623c7da3d
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/TestBean.java
@@ -0,0 +1,30 @@
+package io.quarkus.rest.client.reactive;
+
+import java.net.URL;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@ApplicationScoped
+public class TestBean {
+
+    @ConfigProperty(name = "test-url")
+    URL url;
+
+    @RestClient
+    HelloClient2 client2;
+
+    String helloViaInjectedClient(String name) {
+        return client2.echo(name);
+    }
+
+    String helloViaBuiltClient(String name) {
+        HelloClient helloClient = RestClientBuilder.newBuilder()
+                .baseUrl(url)
+                .build(HelloClient.class);
+        return helloClient.echo(name);
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java
new file mode 100644
index 0000000000000..a762f07496d1f
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/EchoClient.java
@@ -0,0 +1,23 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@Path("/echo")
+@RegisterRestClient
+@RegisterClientHeaders(MyHeadersFactory.class)
+public interface EchoClient {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    String echo(@QueryParam("message") String message);
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java
new file mode 100644
index 0000000000000..b0a379c1e1020
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderPassingClient.java
@@ -0,0 +1,17 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@RegisterClientHeaders
+public interface HeaderPassingClient {
+
+    @GET
+    @Path("/describe-request")
+    RequestData call();
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java
new file mode 100644
index 0000000000000..fad7c9124d185
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/HeaderSettingClient.java
@@ -0,0 +1,18 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+public interface HeaderSettingClient {
+
+    String HEADER = "my-header";
+
+    @Path("/with-incoming-header")
+    @GET
+    RequestData setHeaderValue(@HeaderParam(HEADER) String headerName);
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java
new file mode 100644
index 0000000000000..8572362e62d2e
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/MyHeadersFactory.java
@@ -0,0 +1,26 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
+
+@Singleton
+public class MyHeadersFactory implements ClientHeadersFactory {
+
+    @Inject
+    BeanManager beanManager;
+
+    @Override
+    public MultivaluedMap<String, String> update(MultivaluedMap<String, String> incomingHeaders,
+            MultivaluedMap<String, String> clientOutgoingHeaders) {
+        assertNotNull(beanManager);
+        incomingHeaders.add("foo", "bar");
+        return incomingHeaders;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/RegisterClientHeadersTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/RegisterClientHeadersTest.java
new file mode 100644
index 0000000000000..5c0e708913163
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/RegisterClientHeadersTest.java
@@ -0,0 +1,54 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class RegisterClientHeadersTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> {
+                return ShrinkWrap.create(JavaArchive.class)
+                        .addPackage(EchoClient.class.getPackage())
+                        .addAsResource(
+                                new StringAsset(
+                                        setUrlForClass(EchoClient.class) +
+                                                setUrlForClass(HeaderSettingClient.class) +
+                                                setUrlForClass(HeaderPassingClient.class) +
+                                                "org.eclipse.microprofile.rest.client.propagateHeaders="
+                                                + HeaderSettingClient.HEADER),
+                                "application.properties");
+            });
+
+    private static String setUrlForClass(Class<?> clazz) {
+        return clazz.getName() + "/mp-rest/url=${test.url}\n";
+    }
+
+    @RestClient
+    EchoClient client;
+
+    @RestClient
+    HeaderSettingClient headerSettingClient;
+
+    @Test
+    public void shouldUseHeadersFactory() {
+        assertEquals("ping:bar", client.echo("ping:"));
+    }
+
+    @Test
+    public void shouldPassIncomingHeaders() {
+        String headerValue = "my-header-value";
+        RequestData requestData = headerSettingClient.setHeaderValue(headerValue);
+        assertThat(requestData.getHeaders().get(HeaderSettingClient.HEADER).get(0)).isEqualTo(headerValue);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/RequestData.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/RequestData.java
new file mode 100644
index 0000000000000..ecf4c02014eb7
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/RequestData.java
@@ -0,0 +1,16 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import java.util.List;
+import java.util.Map;
+
+public class RequestData {
+    private Map<String, List<String>> headers;
+
+    public Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(Map<String, List<String>> headers) {
+        this.headers = headers;
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java
new file mode 100644
index 0000000000000..d788df782ee63
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/registerclientheaders/TestResource.java
@@ -0,0 +1,52 @@
+package io.quarkus.rest.client.reactive.registerclientheaders;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+import io.smallrye.common.annotation.Blocking;
+
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Path("/")
+@ApplicationScoped
+public class TestResource {
+
+    @RestClient
+    HeaderPassingClient headerPassingClient;
+
+    @GET
+    @Path("/echo")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public String echo(@QueryParam("message") String message,
+            @HeaderParam("foo") String foo) {
+        return message + foo;
+    }
+
+    @GET
+    @Path("/describe-request")
+    public RequestData describeRequest(@Context HttpHeaders headers) {
+        RequestData result = new RequestData();
+        result.setHeaders(headers.getRequestHeaders());
+        return result;
+    }
+
+    @GET
+    @Path("/with-incoming-header")
+    @Blocking
+    public RequestData callThroughClient() {
+        RequestData data = headerPassingClient.call();
+        return data;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Client.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Client.java
new file mode 100644
index 0000000000000..de2f2ffeea031
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Client.java
@@ -0,0 +1,19 @@
+package io.quarkus.rest.client.reactive.timeout;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Produces(MediaType.TEXT_PLAIN)
+@Consumes(MediaType.TEXT_PLAIN)
+public interface Client {
+    @GET
+    @Path("/slow")
+    String slow();
+
+    @GET
+    @Path("/fast")
+    String fast();
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/ReadTimeoutTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/ReadTimeoutTest.java
new file mode 100644
index 0000000000000..33d1a86d32612
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/ReadTimeoutTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.rest.client.reactive.timeout;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.net.URI;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class ReadTimeoutTest {
+
+    @TestHTTPResource
+    URI uri;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Client.class, Resource.class));
+
+    @Test
+    void shouldTimeoutIfReadTimeoutSetShort() {
+        Client client = RestClientBuilder.newBuilder()
+                .baseUri(uri)
+                .readTimeout(1, TimeUnit.SECONDS)
+                .build(Client.class);
+
+        RuntimeException exception = assertThrows(RuntimeException.class, client::slow);
+        assertThat(exception).hasCauseInstanceOf(TimeoutException.class);
+    }
+
+    @Test
+    void shouldNotTimeoutOnFastResponse() {
+        Client client = RestClientBuilder.newBuilder()
+                .baseUri(uri)
+                .readTimeout(1, TimeUnit.SECONDS)
+                .build(Client.class);
+
+        assertThat(client.fast()).isEqualTo("fast-response");
+    }
+
+    @Test
+    void shouldNotTimeoutOnDefaultTimeout() {
+        Client client = RestClientBuilder.newBuilder()
+                .baseUri(uri)
+                .build(Client.class);
+
+        assertThat(client.slow()).isEqualTo("slow-response");
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Resource.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Resource.java
new file mode 100644
index 0000000000000..968c1b849ad80
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Resource.java
@@ -0,0 +1,36 @@
+package io.quarkus.rest.client.reactive.timeout;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.vertx.core.Vertx;
+
+@Path("/")
+@Produces(MediaType.TEXT_PLAIN)
+@Consumes(MediaType.TEXT_PLAIN)
+public class Resource {
+
+    @Inject
+    Vertx vertx;
+
+    @Path("/slow")
+    @GET
+    public String slow() throws InterruptedException {
+        Thread.sleep(5000L);
+        return "slow-response";
+    }
+
+    @Path("/fast")
+    @GET
+    public CompletionStage<String> fast() {
+        return CompletableFuture.completedFuture("fast-response");
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/basic-test-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/basic-test-application.properties
new file mode 100644
index 0000000000000..b70fa3009474d
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/basic-test-application.properties
@@ -0,0 +1,2 @@
+hello2/mp-rest/url=http://localhost:${quarkus.http.test-port:8081}/hello
+test-url=http://localhost:${quarkus.http.test-port:8081}
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/dependent-test-application.properties b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/dependent-test-application.properties
new file mode 100644
index 0000000000000..2418ae8329dd8
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/resources/dependent-test-application.properties
@@ -0,0 +1,3 @@
+hello2/mp-rest/url=http://localhost:${quarkus.http.test-port:8081}/hello
+
+quarkus.rest-client.scope=javax.enterprise.context.Dependent
\ No newline at end of file
diff --git a/extensions/resteasy-reactive/rest-client-reactive/pom.xml b/extensions/resteasy-reactive/rest-client-reactive/pom.xml
new file mode 100644
index 0000000000000..c202402806082
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-rest-client-reactive-parent</artifactId>
+    <name>Quarkus - MicroProfile Rest Client with Reactive RestEasy</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml b/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml
new file mode 100644
index 0000000000000..2fb7ab26eba1f
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-rest-client-reactive-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-rest-client-reactive</artifactId>
+    <name>Quarkus - MicroProfile Rest Client - Runtime</name>
+    <description>MicroProfile Rest Client</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxrs-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.rest.client</groupId>
+            <artifactId>microprofile-rest-client-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.inject</groupId>
+                    <artifactId>javax.inject</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}
+                            </deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/BuilderResolver.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/BuilderResolver.java
new file mode 100644
index 0000000000000..7cacb05ca2351
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/BuilderResolver.java
@@ -0,0 +1,11 @@
+package io.quarkus.rest.client.reactive;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;
+
+public class BuilderResolver extends RestClientBuilderResolver {
+    @Override
+    public RestClientBuilder newBuilder() {
+        return new RestClientBuilderImpl();
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/DefaultMicroprofileRestClientExceptionMapper.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/DefaultMicroprofileRestClientExceptionMapper.java
new file mode 100644
index 0000000000000..bfe2af8280861
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/DefaultMicroprofileRestClientExceptionMapper.java
@@ -0,0 +1,27 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
+
+public class DefaultMicroprofileRestClientExceptionMapper implements ResponseExceptionMapper {
+
+    public Throwable toThrowable(Response response) {
+        try {
+            response.bufferEntity();
+        } catch (Exception var3) {
+        }
+
+        return new WebApplicationException("Unknown error, status code " + response.getStatus(), response);
+    }
+
+    public boolean handles(int status, MultivaluedMap headers) {
+        return status >= 400;
+    }
+
+    public int getPriority() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderCapturingServerFilter.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderCapturingServerFilter.java
new file mode 100644
index 0000000000000..a8c6fcf7b4c62
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderCapturingServerFilter.java
@@ -0,0 +1,21 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+
+import io.quarkus.arc.Arc;
+
+@SuppressWarnings("unused")
+public class HeaderCapturingServerFilter implements ContainerRequestFilter {
+    private final HeaderContainer headerContainer;
+
+    public HeaderCapturingServerFilter() {
+        headerContainer = Arc.container().instance(HeaderContainer.class).get();
+    }
+
+    public void filter(ContainerRequestContext requestContext) {
+        if (headerContainer != null) {
+            headerContainer.setContainerRequestContext(requestContext);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderContainer.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderContainer.java
new file mode 100644
index 0000000000000..654664550dd9c
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderContainer.java
@@ -0,0 +1,25 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.enterprise.context.RequestScoped;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+@RequestScoped
+public class HeaderContainer {
+
+    private static final MultivaluedHashMap<String, String> EMPTY_MAP = new MultivaluedHashMap<>();
+    private ContainerRequestContext requestContext;
+
+    void setContainerRequestContext(ContainerRequestContext requestContext) {
+        this.requestContext = requestContext;
+    }
+
+    MultivaluedMap<String, String> getHeaders() {
+        if (requestContext == null) {
+            return EMPTY_MAP;
+        } else {
+            return requestContext.getHeaders();
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java
new file mode 100644
index 0000000000000..8387d97aa612e
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/HeaderFiller.java
@@ -0,0 +1,7 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+public interface HeaderFiller {
+    void addHeaders(MultivaluedMap<String, String> headers);
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/MicroProfileRestClientRequestFilter.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/MicroProfileRestClientRequestFilter.java
new file mode 100644
index 0000000000000..c165d25384370
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/MicroProfileRestClientRequestFilter.java
@@ -0,0 +1,90 @@
+package io.quarkus.rest.client.reactive;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Priority;
+import javax.enterprise.context.RequestScoped;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.eclipse.microprofile.rest.client.ext.ClientHeadersFactory;
+import org.eclipse.microprofile.rest.client.ext.DefaultClientHeadersFactoryImpl;
+
+import io.quarkus.arc.Arc;
+
+@Priority(Integer.MIN_VALUE)
+public class MicroProfileRestClientRequestFilter implements ClientRequestFilter {
+
+    private static final MultivaluedMap<String, String> EMPTY_MAP = new MultivaluedHashMap<>();
+
+    private final ClientHeadersFactory clientHeadersFactory;
+
+    public MicroProfileRestClientRequestFilter(ClientHeadersFactory clientHeadersFactory) {
+        this.clientHeadersFactory = clientHeadersFactory;
+    }
+
+    @Override
+    public void filter(ClientRequestContext requestContext) {
+        HeaderFiller headerFiller = (HeaderFiller) requestContext.getProperty(HeaderFiller.class.getName());
+
+        // mutable collection of headers
+        MultivaluedMap<String, String> headers = new MultivaluedHashMap<>();
+
+        // gather original headers
+        for (Map.Entry<String, List<Object>> headerEntry : requestContext.getHeaders().entrySet()) {
+            headers.put(headerEntry.getKey(), castToListOfStrings(headerEntry.getValue()));
+        }
+
+        // add headers from MP annotations
+        if (headerFiller != null) {
+            // add headers to a mutable headers collection
+            headerFiller.addHeaders(headers);
+        }
+
+        MultivaluedMap<String, String> incomingHeaders = MicroProfileRestClientRequestFilter.EMPTY_MAP;
+        if (Arc.container().getActiveContext(RequestScoped.class) != null) {
+            HeaderContainer headerContainer = Arc.container().instance(HeaderContainer.class).get();
+            if (headerContainer != null) {
+                incomingHeaders = headerContainer.getHeaders();
+            }
+        }
+
+        if (clientHeadersFactory instanceof DefaultClientHeadersFactoryImpl) {
+            // When using the default factory, pass the proposed outgoing headers onto the request context.
+            // Propagation with the default factory will then overwrite any values if required.
+            for (Map.Entry<String, List<String>> headerEntry : headers.entrySet()) {
+                requestContext.getHeaders().put(headerEntry.getKey(), castToListOfObjects(headerEntry.getValue()));
+            }
+        }
+
+        if (clientHeadersFactory != null) {
+            incomingHeaders = clientHeadersFactory.update(incomingHeaders, headers);
+        }
+
+        for (Map.Entry<String, List<String>> headerEntry : incomingHeaders.entrySet()) {
+            requestContext.getHeaders().put(headerEntry.getKey(), castToListOfObjects(headerEntry.getValue()));
+        }
+    }
+
+    private static List<String> castToListOfStrings(List<Object> values) {
+        List<String> result = new ArrayList<>();
+        for (Object value : values) {
+            if (value instanceof String) {
+                result.add((String) value);
+            } else {
+                result.add(String.valueOf(value));
+            }
+        }
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<Object> castToListOfObjects(List<String> values) {
+        return (List<Object>) (List<?>) values;
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/MicroProfileRestClientResponseFilter.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/MicroProfileRestClientResponseFilter.java
new file mode 100644
index 0000000000000..a75964e1db776
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/MicroProfileRestClientResponseFilter.java
@@ -0,0 +1,42 @@
+package io.quarkus.rest.client.reactive;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+
+import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
+import org.jboss.resteasy.reactive.client.handlers.ClientResponseRestHandler;
+import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl;
+import org.jboss.resteasy.reactive.client.impl.ClientResponseContextImpl;
+import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
+
+public class MicroProfileRestClientResponseFilter implements ClientResponseFilter {
+    private final List<ResponseExceptionMapper<?>> exceptionMappers;
+
+    public MicroProfileRestClientResponseFilter(List<ResponseExceptionMapper<?>> exceptionMappers) {
+        if (exceptionMappers == null) {
+            throw new NullPointerException("exceptionMappers cannot be null");
+        }
+        this.exceptionMappers = exceptionMappers;
+    }
+
+    @Override
+    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
+        for (ResponseExceptionMapper exceptionMapper : exceptionMappers) {
+            if (exceptionMapper.handles(responseContext.getStatus(), responseContext.getHeaders())) {
+                // we have an exception mapper, we don't need the response anymore, we can map it to response right away (I hope :D)
+                ResponseImpl response = ClientResponseRestHandler.mapToResponse(
+                        ((ClientRequestContextImpl) requestContext).getRestClientRequestContext(),
+                        (ClientResponseContextImpl) responseContext);
+                Throwable throwable = exceptionMapper.toThrowable(response);
+                if (throwable != null) {
+                    throw new ProcessingException(throwable);
+                }
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/NoOpHeaderFiller.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/NoOpHeaderFiller.java
new file mode 100644
index 0000000000000..2410b4796f133
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/NoOpHeaderFiller.java
@@ -0,0 +1,12 @@
+package io.quarkus.rest.client.reactive;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+public class NoOpHeaderFiller implements HeaderFiller {
+    @Override
+    public void addHeaders(MultivaluedMap<String, String> headers) {
+    }
+
+    @SuppressWarnings("unused")
+    public static final NoOpHeaderFiller INSTANCE = new NoOpHeaderFiller();
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveResteasyMpClientConfig.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveResteasyMpClientConfig.java
new file mode 100644
index 0000000000000..a7de3b34c79d0
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/ReactiveResteasyMpClientConfig.java
@@ -0,0 +1,15 @@
+package io.quarkus.rest.client.reactive;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME, name = "rest-client")
+public class ReactiveResteasyMpClientConfig {
+
+    /**
+     * Default scope for MicroProfile Rest Client. Use `javax.enterprise.context.Dependent` for spec-compliant behavior
+     */
+    @ConfigItem(name = "scope", defaultValue = "javax.enterprise.context.ApplicationScoped")
+    public String scope;
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientBuilderImpl.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientBuilderImpl.java
new file mode 100644
index 0000000000000..554c8cf014a36
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientBuilderImpl.java
@@ -0,0 +1,206 @@
+package io.quarkus.rest.client.reactive;
+
+import java.lang.reflect.InvocationTargetException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.KeyStore;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Configuration;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
+import org.jboss.resteasy.reactive.client.api.InvalidRestClientDefinitionException;
+import org.jboss.resteasy.reactive.client.impl.ClientBuilderImpl;
+import org.jboss.resteasy.reactive.client.impl.ClientImpl;
+import org.jboss.resteasy.reactive.client.impl.WebTargetImpl;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+
+/**
+ * Builder implementation for MicroProfile Rest Client
+ */
+public class RestClientBuilderImpl implements RestClientBuilder {
+
+    private static final String DEFAULT_MAPPER_DISABLED = "microprofile.rest.client.disable.default.mapper";
+
+    private final ClientBuilder clientBuilder = new ClientBuilderImpl().withConfig(new ConfigurationImpl(RuntimeType.CLIENT));
+    private final List<ResponseExceptionMapper<?>> exceptionMappers = new ArrayList<>();
+
+    private URL url;
+
+    @Override
+    public RestClientBuilder baseUrl(URL url) {
+        this.url = url;
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder connectTimeout(long timeout, TimeUnit timeUnit) {
+        clientBuilder.connectTimeout(timeout, timeUnit);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder readTimeout(long timeout, TimeUnit timeUnit) {
+        clientBuilder.readTimeout(timeout, timeUnit);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder sslContext(SSLContext sslContext) {
+        clientBuilder.sslContext(sslContext);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder trustStore(KeyStore trustStore) {
+        clientBuilder.trustStore(trustStore);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder keyStore(KeyStore keyStore, String keystorePassword) {
+        clientBuilder.keyStore(keyStore, keystorePassword);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder hostnameVerifier(HostnameVerifier hostnameVerifier) {
+        clientBuilder.hostnameVerifier(hostnameVerifier);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder executorService(ExecutorService executor) {
+        throw new IllegalArgumentException("Specifying executor service is not supported. " +
+                "The underlying call in RestEasy Reactive is non-blocking, " +
+                "there is no reason to offload the call to a separate thread pool.");
+    }
+
+    @Override
+    public Configuration getConfiguration() {
+        return clientBuilder.getConfiguration();
+    }
+
+    @Override
+    public RestClientBuilder property(String name, Object value) {
+        clientBuilder.property(name, value);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Class<?> componentClass) {
+        registerMpSpecificProvider(componentClass);
+        clientBuilder.register(componentClass);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Class<?> componentClass, int priority) {
+        registerMpSpecificProvider(componentClass);
+        clientBuilder.register(componentClass, priority);
+        return this;
+    }
+
+    private void registerMpSpecificProvider(Class<?> componentClass) {
+        if (ResponseExceptionMapper.class.isAssignableFrom(componentClass)) {
+            try {
+                registerMpSpecificProvider(componentClass.getDeclaredConstructor().newInstance());
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                throw new IllegalArgumentException("Failed to instantiate exception mapper " + componentClass
+                        + ". Does it have a public no-arg constructor?", e);
+            }
+        }
+    }
+
+    private void registerMpSpecificProvider(Object component) {
+        if (component instanceof ResponseExceptionMapper) {
+            exceptionMappers.add((ResponseExceptionMapper<?>) component);
+        }
+    };
+
+    @Override
+    public RestClientBuilder register(Class<?> componentClass, Class<?>... contracts) {
+        registerMpSpecificProvider(componentClass);
+        clientBuilder.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+        registerMpSpecificProvider(componentClass);
+        clientBuilder.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Object component) {
+        registerMpSpecificProvider(component);
+        clientBuilder.register(component);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Object component, int priority) {
+        registerMpSpecificProvider(component);
+        clientBuilder.register(component, priority);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Object component, Class<?>... contracts) {
+        registerMpSpecificProvider(component);
+        clientBuilder.register(component, contracts);
+        return this;
+    }
+
+    @Override
+    public RestClientBuilder register(Object component, Map<Class<?>, Integer> contracts) {
+        registerMpSpecificProvider(component);
+        clientBuilder.register(component, contracts);
+        return this;
+    }
+
+    @Override
+    public <T> T build(Class<T> aClass) throws IllegalStateException, RestClientDefinitionException {
+        if (url == null) {
+            // mandated by the spec
+            throw new IllegalStateException("No URL specified. Cannot build a rest client without URL");
+        }
+
+        RestClientListeners.get().forEach(listener -> listener.onNewClient(aClass, this));
+
+        Object defaultMapperDisabled = getConfiguration().getProperty(DEFAULT_MAPPER_DISABLED);
+        Boolean globallyDisabledMapper = ConfigProvider.getConfig()
+                .getOptionalValue(DEFAULT_MAPPER_DISABLED, Boolean.class).orElse(false);
+        if (!globallyDisabledMapper && !(defaultMapperDisabled instanceof Boolean && (Boolean) defaultMapperDisabled)) {
+            exceptionMappers.add(new DefaultMicroprofileRestClientExceptionMapper());
+        }
+
+        exceptionMappers.sort(Comparator.comparingInt(ResponseExceptionMapper::getPriority));
+        clientBuilder.register(new MicroProfileRestClientResponseFilter(exceptionMappers));
+        ClientImpl client = (ClientImpl) clientBuilder.build();
+        WebTargetImpl target = null;
+        try {
+            target = (WebTargetImpl) client.target(url.toURI());
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid Rest Client URL: " + url, e);
+        }
+        try {
+            return target.proxy(aClass);
+        } catch (InvalidRestClientDefinitionException e) {
+            throw new RestClientDefinitionException(e);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientCDIDelegateBuilder.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientCDIDelegateBuilder.java
new file mode 100644
index 0000000000000..8c51b35d8dcc2
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientCDIDelegateBuilder.java
@@ -0,0 +1,260 @@
+package io.quarkus.rest.client.reactive;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+
+public class RestClientCDIDelegateBuilder {
+
+    private static final String MP_REST = "mp-rest";
+    private static final String REST_URL_FORMAT = "%s/" + MP_REST + "/url";
+    private static final String REST_URI_FORMAT = "%s/" + MP_REST + "/uri";
+    private static final String REST_CONNECT_TIMEOUT_FORMAT = "%s/" + MP_REST + "/connectTimeout";
+    private static final String REST_READ_TIMEOUT_FORMAT = "%s/" + MP_REST + "/readTimeout";
+    public static final String REST_SCOPE_FORMAT = "%s/" + MP_REST + "/scope";
+    private static final String REST_PROVIDERS = "%s/" + MP_REST + "/providers";
+    private static final String REST_TRUST_STORE = "%s/" + MP_REST + "/trustStore";
+    private static final String REST_TRUST_STORE_PASSWORD = "%s/" + MP_REST + "/trustStorePassword";
+    private static final String REST_TRUST_STORE_TYPE = "%s/" + MP_REST + "/trustStoreType";
+    private static final String REST_KEY_STORE = "%s/" + MP_REST + "/keyStore";
+    private static final String REST_KEY_STORE_PASSWORD = "%s/" + MP_REST + "/keyStorePassword";
+    private static final String REST_KEY_STORE_TYPE = "%s/" + MP_REST + "/keyStoreType";
+    private static final String REST_HOSTNAME_VERIFIER = "%s/" + MP_REST + "/hostnameVerifier";
+    private static final String REST_NOOP_HOSTNAME_VERIFIER = "io.quarkus.restclient.NoopHostnameVerifier";
+    private static final String TLS_TRUST_ALL = "quarkus.tls.trust-all";
+
+    private final Class<?> jaxrsInterface;
+    private final String baseUriFromAnnotation;
+    private final String propertyPrefix;
+
+    // used by generated code
+    @SuppressWarnings("unused")
+    public static Object createDelegate(Class<?> jaxrsInterface, String baseUriFromAnnotation, String propertyPrefix) {
+        return new RestClientCDIDelegateBuilder(jaxrsInterface, baseUriFromAnnotation, propertyPrefix).build();
+    }
+
+    private RestClientCDIDelegateBuilder(Class<?> jaxrsInterface, String baseUriFromAnnotation, String propertyPrefix) {
+        this.jaxrsInterface = jaxrsInterface;
+        this.baseUriFromAnnotation = baseUriFromAnnotation;
+        this.propertyPrefix = propertyPrefix;
+    }
+
+    private Object build() {
+        RestClientBuilder builder = RestClientBuilder.newBuilder();
+        configureBaseUrl(builder);
+        configureTimeouts(builder);
+        configureProviders(builder);
+        configureSsl(builder);
+        Object result = builder.build(jaxrsInterface);
+        return result;
+    }
+
+    private void configureSsl(RestClientBuilder builder) {
+
+        Optional<Boolean> trustAll = getOptionalProperty(TLS_TRUST_ALL, Boolean.class);
+        if (trustAll.isPresent() && trustAll.get()) {
+            registerHostnameVerifier(REST_NOOP_HOSTNAME_VERIFIER, builder);
+        }
+
+        Optional<String> maybeTrustStore = getOptionalDynamicProperty(REST_TRUST_STORE, String.class);
+        if (maybeTrustStore.isPresent()) {
+            registerTrustStore(maybeTrustStore.get(), builder);
+        }
+
+        Optional<String> maybeKeyStore = getOptionalDynamicProperty(REST_KEY_STORE, String.class);
+        if (maybeKeyStore.isPresent()) {
+            registerKeyStore(maybeKeyStore.get(), builder);
+        }
+
+        Optional<String> maybeHostnameVerifier = getOptionalDynamicProperty(REST_HOSTNAME_VERIFIER, String.class);
+        if (maybeHostnameVerifier.isPresent()) {
+            registerHostnameVerifier(maybeHostnameVerifier.get(), builder);
+        }
+    }
+
+    private void registerHostnameVerifier(String verifier, RestClientBuilder builder) {
+        try {
+            Class<?> verifierClass = Thread.currentThread().getContextClassLoader().loadClass(verifier);
+            builder.hostnameVerifier((HostnameVerifier) verifierClass.getDeclaredConstructor().newInstance());
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(
+                    "Could not find a public, no-argument constructor for the hostname verifier class " + verifier, e);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Could not find hostname verifier class " + verifier, e);
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(
+                    "Failed to instantiate hostname verifier class " + verifier
+                            + ". Make sure it has a public, no-argument constructor",
+                    e);
+        } catch (ClassCastException e) {
+            throw new RuntimeException("The provided hostname verifier " + verifier + " is not an instance of HostnameVerifier",
+                    e);
+        }
+    }
+
+    private void registerKeyStore(String keyStorePath, RestClientBuilder builder) {
+        Optional<String> keyStorePassword = getOptionalDynamicProperty(REST_KEY_STORE_PASSWORD, String.class);
+        Optional<String> keyStoreType = getOptionalDynamicProperty(REST_KEY_STORE_TYPE, String.class);
+
+        try {
+            KeyStore keyStore = KeyStore.getInstance(keyStoreType.orElse("JKS"));
+            if (!keyStorePassword.isPresent()) {
+                throw new IllegalArgumentException("No password provided for keystore");
+            }
+            String password = keyStorePassword.get();
+
+            try (InputStream input = locateStream(keyStorePath)) {
+                keyStore.load(input, password.toCharArray());
+            } catch (IOException | CertificateException | NoSuchAlgorithmException e) {
+                throw new IllegalArgumentException("Failed to initialize trust store from classpath resource " + keyStorePath,
+                        e);
+            }
+
+            builder.keyStore(keyStore, password);
+        } catch (KeyStoreException e) {
+            throw new IllegalArgumentException("Failed to initialize trust store from " + keyStorePath, e);
+        }
+    }
+
+    private void registerTrustStore(String trustStorePath, RestClientBuilder builder) {
+        Optional<String> maybeTrustStorePassword = getOptionalDynamicProperty(REST_TRUST_STORE_PASSWORD, String.class);
+        Optional<String> maybeTrustStoreType = getOptionalDynamicProperty(REST_TRUST_STORE_TYPE, String.class);
+
+        try {
+            KeyStore trustStore = KeyStore.getInstance(maybeTrustStoreType.orElse("JKS"));
+            if (!maybeTrustStorePassword.isPresent()) {
+                throw new IllegalArgumentException("No password provided for truststore");
+            }
+            String password = maybeTrustStorePassword.get();
+
+            try (InputStream input = locateStream(trustStorePath)) {
+                trustStore.load(input, password.toCharArray());
+            } catch (IOException | CertificateException | NoSuchAlgorithmException e) {
+                throw new IllegalArgumentException("Failed to initialize trust store from classpath resource " + trustStorePath,
+                        e);
+            }
+
+            builder.trustStore(trustStore);
+        } catch (KeyStoreException e) {
+            throw new IllegalArgumentException("Failed to initialize trust store from " + trustStorePath, e);
+        }
+    }
+
+    private InputStream locateStream(String path) throws FileNotFoundException {
+        if (path.startsWith("classpath:")) {
+            path = path.replaceFirst("classpath:", "");
+            InputStream resultStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
+            if (resultStream == null) {
+                resultStream = getClass().getResourceAsStream(path);
+            }
+            if (resultStream == null) {
+                throw new IllegalArgumentException(
+                        "Classpath resource " + path + " not found for MicroProfile Rest Client SSL configuration");
+            }
+            return resultStream;
+        } else {
+            if (path.startsWith("file:")) {
+                path = path.replaceFirst("file:", "");
+            }
+            File certificateFile = new File(path);
+            if (!certificateFile.isFile()) {
+                throw new IllegalArgumentException(
+                        "Certificate file: " + path + " not found for MicroProfile Rest Client SSL configuration");
+            }
+            return new FileInputStream(certificateFile);
+        }
+    }
+
+    private void configureProviders(RestClientBuilder builder) {
+        Optional<String> maybeProviders = getOptionalDynamicProperty(REST_PROVIDERS, String.class);
+        if (maybeProviders.isPresent()) {
+            registerProviders(builder, maybeProviders.get());
+        }
+    }
+
+    private void registerProviders(RestClientBuilder builder, String providersAsString) {
+        for (String s : providersAsString.split(",")) {
+            builder.register(providerClassForName(s.trim()));
+        }
+    }
+
+    private Class<?> providerClassForName(String name) {
+        try {
+            return Class.forName(name, true, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Could not find provider class: " + name);
+        }
+    }
+
+    private void configureTimeouts(RestClientBuilder builder) {
+        Optional<Long> connectTimeout = getOptionalDynamicProperty(REST_CONNECT_TIMEOUT_FORMAT, Long.class);
+        if (connectTimeout.isPresent()) {
+            builder.connectTimeout(connectTimeout.get(), TimeUnit.MILLISECONDS);
+        }
+
+        Optional<Long> readTimeout = getOptionalDynamicProperty(REST_READ_TIMEOUT_FORMAT, Long.class);
+        if (readTimeout.isPresent()) {
+            builder.readTimeout(readTimeout.get(), TimeUnit.MILLISECONDS);
+        }
+    }
+
+    private void configureBaseUrl(RestClientBuilder builder) {
+        Optional<String> propertyOptional = getOptionalDynamicProperty(REST_URI_FORMAT, String.class);
+        if (!propertyOptional.isPresent()) {
+            propertyOptional = getOptionalDynamicProperty(REST_URL_FORMAT, String.class);
+        }
+        if (((baseUriFromAnnotation == null) || baseUriFromAnnotation.isEmpty())
+                && !propertyOptional.isPresent()) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Unable to determine the proper baseUrl/baseUri. " +
+                                    "Consider registering using @RegisterRestClient(baseUri=\"someuri\"), @RegisterRestClient(configKey=\"orkey\"), "
+                                    +
+                                    "or by adding '%s' or '%s' to your Quarkus configuration",
+                            String.format(REST_URL_FORMAT, propertyPrefix), String.format(REST_URI_FORMAT, propertyPrefix)));
+        }
+        String baseUrl = propertyOptional.orElse(baseUriFromAnnotation);
+
+        try {
+            builder.baseUrl(new URL(baseUrl));
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("The value of URL was invalid " + baseUrl, e);
+        } catch (Exception e) {
+            if ("com.oracle.svm.core.jdk.UnsupportedFeatureError".equals(e.getClass().getCanonicalName())) {
+                throw new IllegalArgumentException(baseUrl
+                        + " requires SSL support but it is disabled. You probably have set quarkus.ssl.native to false.");
+            }
+            throw e;
+        }
+    }
+
+    private <T> Optional<T> getOptionalDynamicProperty(String propertyFormat, Class<T> type) {
+        final Config config = ConfigProvider.getConfig();
+        Optional<T> interfaceNameValue = config.getOptionalValue(String.format(propertyFormat, jaxrsInterface.getName()), type);
+        return interfaceNameValue.isPresent() ? interfaceNameValue
+                : config.getOptionalValue(String.format(propertyFormat, propertyPrefix), type);
+    }
+
+    private <T> Optional<T> getOptionalProperty(String propertyName, Class<T> type) {
+        final Config config = ConfigProvider.getConfig();
+        return config.getOptionalValue(propertyName, type);
+    }
+
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientListeners.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientListeners.java
new file mode 100644
index 0000000000000..6c7b9b4ad01c1
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/RestClientListeners.java
@@ -0,0 +1,24 @@
+package io.quarkus.rest.client.reactive;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.ServiceLoader;
+
+import org.eclipse.microprofile.rest.client.spi.RestClientListener;
+
+public class RestClientListeners {
+
+    private RestClientListeners() {
+    }
+
+    static Collection<RestClientListener> get() {
+        List<RestClientListener> result = new ArrayList<>();
+        ServiceLoader<RestClientListener> listeners = ServiceLoader.load(RestClientListener.class,
+                RestClientListeners.class.getClassLoader());
+        for (RestClientListener listener : listeners) {
+            result.add(listener);
+        }
+        return result;
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/recorder/RestClientRecorder.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/recorder/RestClientRecorder.java
new file mode 100644
index 0000000000000..cb23e3eb9b75b
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/recorder/RestClientRecorder.java
@@ -0,0 +1,13 @@
+package io.quarkus.rest.client.reactive.recorder;
+
+import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver;
+
+import io.quarkus.rest.client.reactive.BuilderResolver;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class RestClientRecorder {
+    public void setRestClientBuilderResolver() {
+        RestClientBuilderResolver.setInstance(new BuilderResolver());
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/resources/quarkus-extension.yaml b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/resources/quarkus-extension.yaml
new file mode 100644
index 0000000000000..4745aab169301
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/resources/quarkus-extension.yaml
@@ -0,0 +1,7 @@
+---
+name: "MicroProfile Rest Client with RESTEasy Reactive"
+metadata:
+  keywords:
+  categories:
+  - "microprofile"
+  status: "experimental"
diff --git a/extensions/resteasy-server-common/deployment/pom.xml b/extensions/resteasy-server-common/deployment/pom.xml
index 92f999e5a8c7e..b1940b0c73202 100644
--- a/extensions/resteasy-server-common/deployment/pom.xml
+++ b/extensions/resteasy-server-common/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-server-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java
index c6ccffe66fe32..f7c82dac4244f 100755
--- a/extensions/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java
+++ b/extensions/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java
@@ -2,10 +2,12 @@
 
 import static io.quarkus.runtime.annotations.ConfigPhase.BUILD_TIME;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -16,7 +18,7 @@
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
-import javax.servlet.DispatcherType;
+import javax.ws.rs.core.Application;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -46,6 +48,7 @@
 import io.quarkus.arc.deployment.AutoInjectAnnotationBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.arc.deployment.BuildTimeConditionBuildItem;
 import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassNameExclusion;
@@ -53,31 +56,27 @@
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.Transformation;
-import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.util.JandexUtil;
 import io.quarkus.gizmo.Gizmo;
 import io.quarkus.resteasy.common.deployment.JaxrsProvidersToRegisterBuildItem;
 import io.quarkus.resteasy.common.deployment.ResteasyCommonProcessor.ResteasyCommonConfig;
-import io.quarkus.resteasy.common.deployment.ResteasyDotNames;
 import io.quarkus.resteasy.common.runtime.QuarkusInjectorFactory;
-import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyDotNames;
 import io.quarkus.resteasy.server.common.runtime.QuarkusResteasyDeployment;
 import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceDefiningAnnotationBuildItem;
 import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceMethodAnnotationsBuildItem;
 import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceMethodParamAnnotations;
+import io.quarkus.resteasy.server.common.spi.AllowedJaxRsAnnotationPrefixBuildItem;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
-import io.quarkus.undertow.deployment.FilterBuildItem;
 
 /**
  * Processor that builds the RESTEasy server configuration.
@@ -144,11 +143,31 @@ static final class ResteasyConfig {
         String path;
 
         /**
-         * Whether or not JAX-RS metrics should be enabled if the Metrics capability is present and Vert.x is being used.
+         * Whether or not detailed JAX-RS metrics should be enabled if the smallrye-metrics
+         * extension is present.
+         *
+         * See <a href=
+         * "https://github.com/eclipse/microprofile-metrics/blob/2.3.x/spec/src/main/asciidoc/required-metrics.adoc#optional-rest">MicroProfile
+         * Metrics: Optional REST metrics</a>.
+         *
+         * Deprecated. Use {@code quarkus.smallrye-metrics.jaxrs.enabled}.
          */
         @ConfigItem(name = "metrics.enabled", defaultValue = "false")
         public boolean metricsEnabled;
 
+        /**
+         * Ignore all explicit JAX-RS {@link Application} classes.
+         * As multiple JAX-RS applications are not supported, this can be used to effectively merge all JAX-RS applications.
+         */
+        @ConfigItem(defaultValue = "false")
+        boolean ignoreApplicationClasses;
+
+        /**
+         * Whether or not annotations such `@IfBuildTimeProfile`, `@IfBuildTimeProperty` and friends will be taken
+         * into account when used on JAX-RS classes.
+         */
+        @ConfigItem(defaultValue = "true")
+        boolean buildTimeConditionAware;
     }
 
     @BuildStep
@@ -163,17 +182,17 @@ public void build(
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxyDefinition,
-            BuildProducer<NativeImageResourceBuildItem> resource,
-            BuildProducer<RuntimeInitializedClassBuildItem> runtimeClasses,
             BuildProducer<BytecodeTransformerBuildItem> transformers,
             BuildProducer<ResteasyServerConfigBuildItem> resteasyServerConfig,
             BuildProducer<ResteasyDeploymentBuildItem> resteasyDeployment,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
             BuildProducer<AnnotationsTransformerBuildItem> annotationsTransformer,
+            List<BuildTimeConditionBuildItem> buildTimeConditions,
             List<AutoInjectAnnotationBuildItem> autoInjectAnnotations,
             List<AdditionalJaxRsResourceDefiningAnnotationBuildItem> additionalJaxRsResourceDefiningAnnotations,
             List<AdditionalJaxRsResourceMethodAnnotationsBuildItem> additionalJaxRsResourceMethodAnnotations,
             List<AdditionalJaxRsResourceMethodParamAnnotations> additionalJaxRsResourceMethodParamAnnotations,
+            List<AllowedJaxRsAnnotationPrefixBuildItem> friendlyJaxRsAnnotationPrefixes,
             List<ResteasyDeploymentCustomizerBuildItem> deploymentCustomizers,
             JaxrsProvidersToRegisterBuildItem jaxrsProvidersToRegisterBuildItem,
             CombinedIndexBuildItem combinedIndexBuildItem,
@@ -182,9 +201,24 @@ public void build(
             CustomScopeAnnotationsBuildItem scopes) throws Exception {
         IndexView index = combinedIndexBuildItem.getIndex();
 
-        resource.produce(new NativeImageResourceBuildItem("META-INF/services/javax.ws.rs.client.ClientBuilder"));
+        Collection<AnnotationInstance> applicationPaths = Collections.emptySet();
+        final Set<String> allowedClasses;
+        final Set<String> excludedClasses;
+        if (resteasyConfig.buildTimeConditionAware) {
+            excludedClasses = getExcludedClasses(buildTimeConditions);
+        } else {
+            excludedClasses = Collections.emptySet();
+        }
+        if (resteasyConfig.ignoreApplicationClasses) {
+            allowedClasses = Collections.emptySet();
+        } else {
+            applicationPaths = index.getAnnotations(ResteasyDotNames.APPLICATION_PATH);
+            allowedClasses = getAllowedClasses(index);
+            jaxrsProvidersToRegisterBuildItem = getFilteredJaxrsProvidersToRegisterBuildItem(
+                    jaxrsProvidersToRegisterBuildItem, allowedClasses, excludedClasses);
+        }
 
-        Collection<AnnotationInstance> applicationPaths = index.getAnnotations(ResteasyDotNames.APPLICATION_PATH);
+        boolean filterClasses = !allowedClasses.isEmpty() || !excludedClasses.isEmpty();
 
         // currently we only examine the first class that is annotated with @ApplicationPath so best
         // fail if the user code has multiple such annotations instead of surprising the user
@@ -193,13 +227,20 @@ public void build(
             throw createMultipleApplicationsException(applicationPaths);
         }
 
-        Collection<AnnotationInstance> paths = beanArchiveIndexBuildItem.getIndex().getAnnotations(ResteasyDotNames.PATH);
         Set<AnnotationInstance> additionalPaths = new HashSet<>();
         for (AdditionalJaxRsResourceDefiningAnnotationBuildItem annotation : additionalJaxRsResourceDefiningAnnotations) {
             additionalPaths.addAll(beanArchiveIndexBuildItem.getIndex().getAnnotations(annotation.getAnnotationClass()));
         }
 
-        Collection<AnnotationInstance> allPaths = new ArrayList<>(paths);
+        Collection<AnnotationInstance> paths = beanArchiveIndexBuildItem.getIndex().getAnnotations(ResteasyDotNames.PATH);
+        final Collection<AnnotationInstance> allPaths;
+        if (filterClasses) {
+            allPaths = paths.stream().filter(
+                    annotationInstance -> keepEnclosingClass(allowedClasses, excludedClasses, annotationInstance))
+                    .collect(Collectors.toList());
+        } else {
+            allPaths = new ArrayList<>(paths);
+        }
         allPaths.addAll(additionalPaths);
 
         if (allPaths.isEmpty()) {
@@ -234,6 +275,7 @@ public void build(
 
         Map<DotName, ClassInfo> scannedResources = new HashMap<>();
         Set<DotName> pathInterfaces = new HashSet<>();
+        Set<DotName> pathAbstract = new HashSet<>();
         Map<DotName, ClassInfo> withoutDefaultCtor = new HashMap<>();
         for (AnnotationInstance annotation : allPaths) {
             if (annotation.target().kind() == AnnotationTarget.Kind.CLASS) {
@@ -242,7 +284,11 @@ public void build(
                     if (!withoutDefaultCtor.containsKey(clazz.name())) {
                         String className = clazz.name().toString();
                         if (!additionalPaths.contains(annotation)) { // scanned resources only contains real JAX-RS resources
-                            scannedResources.putIfAbsent(clazz.name(), clazz);
+                            if (Modifier.isAbstract(clazz.flags())) {
+                                pathAbstract.add(clazz.name());
+                            } else {
+                                scannedResources.putIfAbsent(clazz.name(), clazz);
+                            }
                         }
                         reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, className));
 
@@ -269,6 +315,21 @@ public void build(
                 }
             }
         }
+        // look for all implementations of abstract classes annotated @Path
+        for (final DotName cls : pathAbstract) {
+            final Collection<ClassInfo> implementors = index.getAllKnownSubclasses(cls);
+            for (final ClassInfo implementor : implementors) {
+                String className = implementor.name().toString();
+                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, className));
+                if (!Modifier.isAbstract(implementor.flags())) {
+                    scannedResources.putIfAbsent(implementor.name(), implementor);
+                }
+
+                if (!implementor.hasNoArgsConstructor()) {
+                    withoutDefaultCtor.put(implementor.name(), implementor);
+                }
+            }
+        }
 
         Set<DotName> subresources = findSubresources(beanArchiveIndexBuildItem.getIndex(), scannedResources);
         if (!subresources.isEmpty()) {
@@ -283,7 +344,8 @@ public void build(
 
         // generate default constructors for suitable concrete @Path classes that don't have them
         // see https://issues.jboss.org/browse/RESTEASY-2183
-        generateDefaultConstructors(transformers, withoutDefaultCtor, additionalJaxRsResourceDefiningAnnotations);
+        generateDefaultConstructors(transformers, withoutDefaultCtor, additionalJaxRsResourceDefiningAnnotations,
+                friendlyJaxRsAnnotationPrefixes);
 
         checkParameterNames(beanArchiveIndexBuildItem.getIndex(), additionalJaxRsResourceMethodParamAnnotations);
 
@@ -387,6 +449,19 @@ public void transform(TransformationContext context) {
         resteasyDeployment.produce(new ResteasyDeploymentBuildItem(path, deployment));
     }
 
+    @BuildStep
+    List<AllowedJaxRsAnnotationPrefixBuildItem> registerCompatibleAnnotationPrefixes() {
+        List<AllowedJaxRsAnnotationPrefixBuildItem> prefixes = new ArrayList<>();
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem(packageName(ResteasyDotNames.PATH)));
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("kotlin")); // make sure the annotation that the Kotlin compiler adds don't interfere with creating a default constructor
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("lombok")); // same for lombok
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("io.quarkus.security")); // same for the security annotations
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("javax.annotation.security"));
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("jakarta.annotation.security"));
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("java.lang"));
+        return prefixes;
+    }
+
     @BuildStep
     void processPathInterfaceImplementors(CombinedIndexBuildItem combinedIndexBuildItem,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
@@ -440,33 +515,6 @@ void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> bean
                         BuiltinScope.SINGLETON.getName()));
     }
 
-    @BuildStep
-    void enableMetrics(ResteasyConfig buildConfig,
-            BuildProducer<ResteasyJaxrsProviderBuildItem> jaxRsProviders,
-            BuildProducer<FilterBuildItem> servletFilters,
-            Capabilities capabilities) {
-        if (buildConfig.metricsEnabled && capabilities.isPresent(Capability.METRICS)) {
-            if (capabilities.isPresent(Capability.SERVLET)) {
-                // if running with servlet, use the MetricsFilter implementation from SmallRye
-                jaxRsProviders.produce(
-                        new ResteasyJaxrsProviderBuildItem("io.smallrye.metrics.jaxrs.JaxRsMetricsFilter"));
-                servletFilters.produce(
-                        FilterBuildItem.builder("metricsFilter", "io.smallrye.metrics.jaxrs.JaxRsMetricsServletFilter")
-                                .setAsyncSupported(true)
-                                .addFilterUrlMapping("*", DispatcherType.FORWARD)
-                                .addFilterUrlMapping("*", DispatcherType.INCLUDE)
-                                .addFilterUrlMapping("*", DispatcherType.REQUEST)
-                                .addFilterUrlMapping("*", DispatcherType.ASYNC)
-                                .addFilterUrlMapping("*", DispatcherType.ERROR)
-                                .build());
-            } else {
-                // if running with vert.x, use the MetricsFilter implementation from Quarkus codebase
-                jaxRsProviders.produce(
-                        new ResteasyJaxrsProviderBuildItem("io.quarkus.smallrye.metrics.runtime.QuarkusJaxRsMetricsFilter"));
-            }
-        }
-    }
-
     private boolean hasAutoInjectAnnotation(Set<DotName> autoInjectAnnotationNames, ClassInfo clazz) {
         for (DotName name : autoInjectAnnotationNames) {
             List<AnnotationInstance> instances = clazz.annotations().get(name);
@@ -579,15 +627,14 @@ private static void registerProviders(ResteasyDeployment deployment,
 
     private static void generateDefaultConstructors(BuildProducer<BytecodeTransformerBuildItem> transformers,
             Map<DotName, ClassInfo> withoutDefaultCtor,
-            List<AdditionalJaxRsResourceDefiningAnnotationBuildItem> additionalJaxRsResourceDefiningAnnotations) {
+            List<AdditionalJaxRsResourceDefiningAnnotationBuildItem> additionalJaxRsResourceDefiningAnnotations,
+            List<AllowedJaxRsAnnotationPrefixBuildItem> friendlyJaxRsAnnotationPrefixes) {
 
         final Set<String> allowedAnnotationPrefixes = new HashSet<>(1 + additionalJaxRsResourceDefiningAnnotations.size());
-        allowedAnnotationPrefixes.add(packageName(ResteasyDotNames.PATH));
-        allowedAnnotationPrefixes.add("kotlin"); // make sure the annotation that the Kotlin compiler adds don't interfere with creating a default constructor
-        allowedAnnotationPrefixes.add("lombok"); // same for lombok
-        allowedAnnotationPrefixes.add("io.quarkus.security"); // same for the security annotations
-        allowedAnnotationPrefixes.add("javax.annotation.security");
-        allowedAnnotationPrefixes.add("jakarta.annotation.security");
+        friendlyJaxRsAnnotationPrefixes.stream()
+                .map(prefix -> prefix.getAnnotationPrefix())
+                .forEachOrdered(allowedAnnotationPrefixes::add);
+
         for (AdditionalJaxRsResourceDefiningAnnotationBuildItem additionalJaxRsResourceDefiningAnnotation : additionalJaxRsResourceDefiningAnnotations) {
             final String packageName = packageName(additionalJaxRsResourceDefiningAnnotation.getAnnotationClass());
             if (packageName != null) {
@@ -605,7 +652,7 @@ private static void generateDefaultConstructors(BuildProducer<BytecodeTransforme
             boolean hasNonJaxRSAnnotations = false;
             for (AnnotationInstance instance : classInfo.classAnnotations()) {
                 final String packageName = packageName(instance.name());
-                if (packageName == null || !allowedAnnotationPrefixes.contains(packageName)) {
+                if (packageName == null || !isPackageAllowed(allowedAnnotationPrefixes, packageName)) {
                     hasNonJaxRSAnnotations = true;
                     break;
                 }
@@ -643,6 +690,10 @@ public void visit(int version, int access, String name, String signature, String
         }
     }
 
+    private static boolean isPackageAllowed(Set<String> allowedAnnotationPrefixes, String packageName) {
+        return allowedAnnotationPrefixes.stream().anyMatch(prefix -> packageName.startsWith(prefix));
+    }
+
     private static String packageName(DotName dotName) {
         final String className = dotName.toString();
         final int index = className.lastIndexOf('.');
@@ -707,7 +758,8 @@ private static void registerContextProxyDefinitions(IndexView index,
                 } else {
                     //might be a framework class, which should be loadable
                     try {
-                        Class<?> typeClass = Class.forName(annotatedType.name().toString());
+                        Class<?> typeClass = Class.forName(annotatedType.name().toString(), false,
+                                Thread.currentThread().getContextClassLoader());
                         if (typeClass.isInterface()) {
                             proxyDefinition.produce(new NativeImageProxyDefinitionBuildItem(annotatedType.name().toString()));
                         }
@@ -767,16 +819,29 @@ private static void scanMethods(DotName annotationType,
             }
             processedAnnotations.add(instance);
             MethodInfo method = instance.target().asMethod();
-            String source = method.declaringClass() + "[" + method + "]";
-
-            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(method.returnType(), index,
-                    ResteasyDotNames.IGNORE_FOR_REFLECTION_PREDICATE, source));
+            String source = ResteasyServerCommonProcessor.class.getSimpleName() + " > " + method.declaringClass() + "[" + method
+                    + "]";
+
+            reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                    .type(method.returnType())
+                    .index(index)
+                    .ignoreTypePredicate(ResteasyDotNames.IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                    .ignoreFieldPredicate(ResteasyDotNames.IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                    .ignoreMethodPredicate(ResteasyDotNames.IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                    .source(source)
+                    .build());
 
             for (short i = 0; i < method.parameters().size(); i++) {
                 Type parameterType = method.parameters().get(i);
                 if (!hasAnnotation(method, i, ResteasyDotNames.CONTEXT)) {
-                    reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(parameterType, index,
-                            ResteasyDotNames.IGNORE_FOR_REFLECTION_PREDICATE, source));
+                    reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                            .type(parameterType)
+                            .index(index)
+                            .ignoreTypePredicate(ResteasyDotNames.IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                            .ignoreFieldPredicate(ResteasyDotNames.IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                            .ignoreMethodPredicate(ResteasyDotNames.IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                            .source(source)
+                            .build());
                 }
             }
         }
@@ -808,4 +873,112 @@ private static RuntimeException createMultipleApplicationsException(Collection<A
         return new RuntimeException("Multiple classes ( " + sb.toString()
                 + ") have been annotated with @ApplicationPath which is currently not supported");
     }
+
+    /**
+     * @param buildTimeConditions the build time conditions from which the excluded classes are extracted.
+     * @return the set of classes that have been annotated with unsuccessful build time conditions.
+     */
+    private static Set<String> getExcludedClasses(List<BuildTimeConditionBuildItem> buildTimeConditions) {
+        return buildTimeConditions.stream()
+                .filter(item -> !item.isEnabled())
+                .map(BuildTimeConditionBuildItem::getTarget)
+                .filter(target -> target.kind() == Kind.CLASS)
+                .map(target -> target.asClass().toString())
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * @param allowedClasses the classes returned by the methods {@link Application#getClasses()} and
+     *        {@link Application#getSingletons()} to keep.
+     * @param excludedClasses the classes that have been annotated wih unsuccessful build time conditions and that
+     *        need to be excluded from the list of paths.
+     * @param annotationInstance the annotation instance from which the enclosing class will be extracted.
+     * @return {@code true} if the enclosing class of the annotation is part of the allowed classes if not empty
+     *         or if is not part of the excluded classes, {@code false} otherwise.
+     */
+    private static boolean keepEnclosingClass(Set<String> allowedClasses, Set<String> excludedClasses,
+            AnnotationInstance annotationInstance) {
+        final String className = JandexUtil.getEnclosingClass(annotationInstance).toString();
+        if (allowedClasses.isEmpty()) {
+            // No allowed classes have been set, meaning that only excluded classes have been provided.
+            // Keep the enclosing class only if not excluded
+            return !excludedClasses.contains(className);
+        }
+        return allowedClasses.contains(className);
+    }
+
+    /**
+     * @param allowedClasses the classes returned by the methods {@link Application#getClasses()} and
+     *        {@link Application#getSingletons()} to keep.
+     * @param excludedClasses the classes that have been annotated wih unsuccessful build time conditions and that
+     *        need to be excluded from the list of providers.
+     * @param jaxrsProvidersToRegisterBuildItem the initial {@code jaxrsProvidersToRegisterBuildItem} before being
+     *        filtered
+     * @return an instance of {@link JaxrsProvidersToRegisterBuildItem} that has been filtered to take into account
+     *         the classes returned by the methods {@link Application#getClasses()} and {@link Application#getSingletons()}
+     *         if at least one of those methods return a non empty {@code Set}, the provided instance of
+     *         {@link JaxrsProvidersToRegisterBuildItem} otherwise.
+     */
+    private static JaxrsProvidersToRegisterBuildItem getFilteredJaxrsProvidersToRegisterBuildItem(
+            JaxrsProvidersToRegisterBuildItem jaxrsProvidersToRegisterBuildItem, Set<String> allowedClasses,
+            Set<String> excludedClasses) {
+
+        if (allowedClasses.isEmpty() && excludedClasses.isEmpty()) {
+            return jaxrsProvidersToRegisterBuildItem;
+        }
+        Set<String> providers = new HashSet<>(jaxrsProvidersToRegisterBuildItem.getProviders());
+        Set<String> contributedProviders = new HashSet<>(jaxrsProvidersToRegisterBuildItem.getContributedProviders());
+        Set<String> annotatedProviders = new HashSet<>(jaxrsProvidersToRegisterBuildItem.getAnnotatedProviders());
+        providers.removeAll(annotatedProviders);
+        contributedProviders.removeAll(annotatedProviders);
+        if (allowedClasses.isEmpty()) {
+            annotatedProviders.removeAll(excludedClasses);
+        } else {
+            annotatedProviders.retainAll(allowedClasses);
+        }
+        providers.addAll(annotatedProviders);
+        contributedProviders.addAll(annotatedProviders);
+        return new JaxrsProvidersToRegisterBuildItem(
+                providers, contributedProviders, annotatedProviders, jaxrsProvidersToRegisterBuildItem.useBuiltIn());
+    }
+
+    /**
+     * @param index the index to use to find the existing {@link Application}.
+     * @return the set of classes returned by the methods {@link Application#getClasses()} and
+     *         {@link Application#getSingletons()}.
+     */
+    private static Set<String> getAllowedClasses(IndexView index) {
+        final Collection<ClassInfo> applications = index.getAllKnownSubclasses(ResteasyDotNames.APPLICATION);
+        final Set<String> allowedClasses = new HashSet<>();
+        Application application;
+        ClassInfo selectedAppClass = null;
+        for (ClassInfo applicationClassInfo : applications) {
+            if (selectedAppClass != null) {
+                throw new RuntimeException("More than one Application class: " + applications);
+            }
+            selectedAppClass = applicationClassInfo;
+            // FIXME: yell if there's more than one
+            String applicationClass = applicationClassInfo.name().toString();
+            try {
+                Class<?> appClass = Thread.currentThread().getContextClassLoader().loadClass(applicationClass);
+                application = (Application) appClass.getConstructor().newInstance();
+                Set<Class<?>> classes = application.getClasses();
+                if (!classes.isEmpty()) {
+                    for (Class<?> klass : classes) {
+                        allowedClasses.add(klass.getName());
+                    }
+                }
+                classes = application.getSingletons().stream().map(Object::getClass).collect(Collectors.toSet());
+                if (!classes.isEmpty()) {
+                    for (Class<?> klass : classes) {
+                        allowedClasses.add(klass.getName());
+                    }
+                }
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException
+                    | InvocationTargetException e) {
+                throw new RuntimeException("Unable to handle class: " + applicationClass, e);
+            }
+        }
+        return allowedClasses;
+    }
 }
diff --git a/extensions/resteasy-server-common/pom.xml b/extensions/resteasy-server-common/pom.xml
index a694c25c845ae..ad6f30dfae832 100644
--- a/extensions/resteasy-server-common/pom.xml
+++ b/extensions/resteasy-server-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-server-common/runtime/pom.xml b/extensions/resteasy-server-common/runtime/pom.xml
index d97c3ebee34dd..ceb579fc2b7a6 100644
--- a/extensions/resteasy-server-common/runtime/pom.xml
+++ b/extensions/resteasy-server-common/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-server-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java b/extensions/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java
new file mode 100644
index 0000000000000..a0b405e4a721b
--- /dev/null
+++ b/extensions/resteasy-server-common/runtime/src/main/java/io/quarkus/resteasy/server/common/runtime/RESTEasyTestHttpProvider.java
@@ -0,0 +1,70 @@
+package io.quarkus.resteasy.server.common.runtime;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+import java.util.function.Function;
+
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
+
+public class RESTEasyTestHttpProvider implements TestHttpEndpointProvider {
+    @Override
+    public Function<Class<?>, String> endpointProvider() {
+        return new Function<Class<?>, String>() {
+            @Override
+            public String apply(Class<?> aClass) {
+                String value = getPath(aClass);
+                if (value == null) {
+                    return null;
+                }
+                if (value.startsWith("/")) {
+                    value = value.substring(1);
+                }
+                //TODO: there is not really any way to handle @ApplicationPath, we could do something for @QuarkusTest apps but we can't for
+                //native apps, so we just have to document the limitation
+                String path = "/";
+                Optional<String> appPath = ConfigProvider.getConfig().getOptionalValue("quarkus.resteasy.path", String.class);
+                if (appPath.isPresent()) {
+                    path = appPath.get();
+                }
+                if (!path.endsWith("/")) {
+                    path = path + "/";
+                }
+                value = path + value;
+                return value;
+            }
+        };
+    }
+
+    private String getPath(Class<?> aClass) {
+        String value = null;
+        for (Annotation annotation : aClass.getAnnotations()) {
+            if (annotation.annotationType().getName().equals(Path.class.getName())) {
+                try {
+                    value = (String) annotation.annotationType().getMethod("value").invoke(annotation);
+                    break;
+                } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        if (value == null) {
+            for (Class<?> i : aClass.getInterfaces()) {
+                value = getPath(i);
+                if (value != null) {
+                    break;
+                }
+            }
+        }
+        if (value == null) {
+            if (aClass.getSuperclass() != Object.class) {
+                value = getPath(aClass.getSuperclass());
+            }
+        }
+        return value;
+    }
+}
diff --git a/extensions/resteasy-server-common/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider b/extensions/resteasy-server-common/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
new file mode 100644
index 0000000000000..07469473a2cd0
--- /dev/null
+++ b/extensions/resteasy-server-common/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
@@ -0,0 +1 @@
+io.quarkus.resteasy.server.common.runtime.RESTEasyTestHttpProvider
\ No newline at end of file
diff --git a/extensions/resteasy-server-common/spi/src/main/java/io/quarkus/resteasy/server/common/spi/AllowedJaxRsAnnotationPrefixBuildItem.java b/extensions/resteasy-server-common/spi/src/main/java/io/quarkus/resteasy/server/common/spi/AllowedJaxRsAnnotationPrefixBuildItem.java
new file mode 100644
index 0000000000000..102dc86702b26
--- /dev/null
+++ b/extensions/resteasy-server-common/spi/src/main/java/io/quarkus/resteasy/server/common/spi/AllowedJaxRsAnnotationPrefixBuildItem.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.server.common.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * The package prefix of any annotations that have to be compatible with JaxRs resource class
+ * to allow constructor injection.
+ */
+public final class AllowedJaxRsAnnotationPrefixBuildItem extends MultiBuildItem {
+
+    private final String prefix;
+
+    public AllowedJaxRsAnnotationPrefixBuildItem(String prefix) {
+        this.prefix = prefix;
+    }
+
+    public String getAnnotationPrefix() {
+        return prefix;
+    }
+}
diff --git a/extensions/resteasy/deployment/pom.xml b/extensions/resteasy/deployment/pom.xml
index 4bcaf688410a8..30eaebb537c47 100644
--- a/extensions/resteasy/deployment/pom.xml
+++ b/extensions/resteasy/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,10 +37,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-security-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-security-deployment</artifactId>
@@ -53,8 +48,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/DenyJaxRsTransformer.java b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/DenyJaxRsTransformer.java
index c78898b1601af..6d01de9d40d25 100644
--- a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/DenyJaxRsTransformer.java
+++ b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/DenyJaxRsTransformer.java
@@ -1,7 +1,7 @@
 package io.quarkus.resteasy.deployment;
 
-import static io.quarkus.resteasy.deployment.SecurityTransformerUtils.DENY_ALL;
-import static io.quarkus.resteasy.deployment.SecurityTransformerUtils.hasSecurityAnnotation;
+import static io.quarkus.security.spi.SecurityTransformerUtils.DENY_ALL;
+import static io.quarkus.security.spi.SecurityTransformerUtils.hasSecurityAnnotation;
 
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
diff --git a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyBuiltinsProcessor.java b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyBuiltinsProcessor.java
index 76a25883b0ea5..0de72fccfedde 100644
--- a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyBuiltinsProcessor.java
+++ b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyBuiltinsProcessor.java
@@ -1,7 +1,7 @@
 package io.quarkus.resteasy.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
-import static io.quarkus.resteasy.deployment.SecurityTransformerUtils.hasSecurityAnnotation;
+import static io.quarkus.security.spi.SecurityTransformerUtils.hasSecurityAnnotation;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,17 +21,27 @@
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.runtime.AuthenticationCompletionExceptionMapper;
 import io.quarkus.resteasy.runtime.AuthenticationFailedExceptionMapper;
+import io.quarkus.resteasy.runtime.AuthenticationRedirectExceptionMapper;
+import io.quarkus.resteasy.runtime.CompositeExceptionMapper;
 import io.quarkus.resteasy.runtime.ExceptionMapperRecorder;
 import io.quarkus.resteasy.runtime.ForbiddenExceptionMapper;
 import io.quarkus.resteasy.runtime.JaxRsSecurityConfig;
 import io.quarkus.resteasy.runtime.NotFoundExceptionMapper;
 import io.quarkus.resteasy.runtime.SecurityContextFilter;
 import io.quarkus.resteasy.runtime.UnauthorizedExceptionMapper;
+import io.quarkus.resteasy.runtime.vertx.JsonArrayReader;
+import io.quarkus.resteasy.runtime.vertx.JsonArrayWriter;
+import io.quarkus.resteasy.runtime.vertx.JsonObjectReader;
+import io.quarkus.resteasy.runtime.vertx.JsonObjectWriter;
 import io.quarkus.resteasy.server.common.deployment.ResteasyDeploymentBuildItem;
 import io.quarkus.security.spi.AdditionalSecuredClassesBuildIem;
 import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.RouteDescriptionBuildItem;
+import io.quarkus.vertx.http.runtime.devmode.AdditionalRouteDescription;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
 
 public class ResteasyBuiltinsProcessor {
 
@@ -71,12 +81,25 @@ void setUpSecurity(BuildProducer<ResteasyJaxrsProviderBuildItem> providers,
         providers.produce(new ResteasyJaxrsProviderBuildItem(UnauthorizedExceptionMapper.class.getName()));
         providers.produce(new ResteasyJaxrsProviderBuildItem(ForbiddenExceptionMapper.class.getName()));
         providers.produce(new ResteasyJaxrsProviderBuildItem(AuthenticationFailedExceptionMapper.class.getName()));
+        providers.produce(new ResteasyJaxrsProviderBuildItem(AuthenticationRedirectExceptionMapper.class.getName()));
+        providers.produce(new ResteasyJaxrsProviderBuildItem(AuthenticationCompletionExceptionMapper.class.getName()));
+        providers.produce(new ResteasyJaxrsProviderBuildItem(CompositeExceptionMapper.class.getName()));
         if (capabilities.isPresent(Capability.SECURITY)) {
             providers.produce(new ResteasyJaxrsProviderBuildItem(SecurityContextFilter.class.getName()));
             additionalBeanBuildItem.produce(AdditionalBeanBuildItem.unremovableOf(SecurityContextFilter.class));
         }
     }
 
+    @BuildStep
+    void vertxProviders(BuildProducer<ResteasyJaxrsProviderBuildItem> providers, Capabilities capabilities) {
+        if (capabilities.isPresent(Capability.JACKSON)) {
+            providers.produce(new ResteasyJaxrsProviderBuildItem(JsonArrayReader.class.getName()));
+            providers.produce(new ResteasyJaxrsProviderBuildItem(JsonArrayWriter.class.getName()));
+            providers.produce(new ResteasyJaxrsProviderBuildItem(JsonObjectReader.class.getName()));
+            providers.produce(new ResteasyJaxrsProviderBuildItem(JsonObjectWriter.class.getName()));
+        }
+    }
+
     @Record(STATIC_INIT)
     @BuildStep(onlyIf = IsDevelopment.class)
     void setupExceptionMapper(BuildProducer<ResteasyJaxrsProviderBuildItem> providers, HttpRootPathBuildItem httpRoot,
@@ -100,13 +123,24 @@ void addStaticResourcesExceptionMapper(ApplicationArchivesBuildItem applicationA
     @BuildStep(onlyIf = IsDevelopment.class)
     void addAdditionalEndpointsExceptionMapper(List<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
             ExceptionMapperRecorder recorder, HttpRootPathBuildItem httpRoot) {
-        List<String> endpoints = displayableEndpoints
+        List<AdditionalRouteDescription> endpoints = displayableEndpoints
                 .stream()
-                .map(displayableAdditionalBuildItem -> displayableAdditionalBuildItem.getEndpoint()
-                        .substring(1))
+                .map(displayableAdditionalBuildItem -> new AdditionalRouteDescription(
+                        displayableAdditionalBuildItem.getEndpoint(httpRoot), displayableAdditionalBuildItem.getDescription()))
                 .sorted()
                 .collect(Collectors.toList());
 
         recorder.setAdditionalEndpoints(endpoints);
     }
+
+    @Record(STATIC_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void addReactiveRoutesExceptionMapper(List<RouteDescriptionBuildItem> routeDescriptions,
+            ExceptionMapperRecorder recorder, HttpRootPathBuildItem httpRoot) {
+        List<RouteDescription> reactiveRoutes = new ArrayList<>();
+        for (RouteDescriptionBuildItem description : routeDescriptions) {
+            reactiveRoutes.add(description.getDescription());
+        }
+        recorder.setReactiveRoutes(reactiveRoutes);
+    }
 }
diff --git a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java
index 2840979a94fe8..0508e4e6ffe69 100644
--- a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java
+++ b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyServletProcessor.java
@@ -29,6 +29,7 @@
 import io.quarkus.resteasy.common.deployment.ResteasyInjectionReadyBuildItem;
 import io.quarkus.resteasy.runtime.ExceptionMapperRecorder;
 import io.quarkus.resteasy.runtime.ResteasyFilter;
+import io.quarkus.resteasy.runtime.ResteasyServlet;
 import io.quarkus.resteasy.server.common.deployment.ResteasyServerConfigBuildItem;
 import io.quarkus.resteasy.server.common.deployment.ResteasyServletMappingBuildItem;
 import io.quarkus.undertow.deployment.FilterBuildItem;
@@ -55,8 +56,9 @@ public void jaxrsConfig(
             BuildProducer<io.quarkus.resteasy.server.common.spi.ResteasyJaxrsConfigBuildItem> resteasyJaxrsConfig,
             HttpRootPathBuildItem httpRootPathBuildItem) {
         if (resteasyServerConfig.isPresent()) {
-            String rootPath = httpRootPathBuildItem.adjustPath(resteasyServerConfig.get().getRootPath());
-            String defaultPath = httpRootPathBuildItem.adjustPath(resteasyServerConfig.get().getPath());
+            String rp = resteasyServerConfig.get().getRootPath();
+            String rootPath = httpRootPathBuildItem.resolvePath(rp.startsWith("/") ? rp.substring(1) : rp);
+            String defaultPath = httpRootPathBuildItem.resolvePath(resteasyServerConfig.get().getPath());
 
             deprecatedResteasyJaxrsConfig.produce(new ResteasyJaxrsConfigBuildItem(defaultPath));
             resteasyJaxrsConfig
@@ -114,7 +116,7 @@ public void build(
                 reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, ResteasyFilter.class.getName()));
             } else {
                 String mappingPath = getMappingPath(path);
-                servlet.produce(ServletBuildItem.builder(JAX_RS_SERVLET_NAME, HttpServlet30Dispatcher.class.getName())
+                servlet.produce(ServletBuildItem.builder(JAX_RS_SERVLET_NAME, ResteasyServlet.class.getName())
                         .setLoadOnStartup(1).addMapping(mappingPath).setAsyncSupported(true).build());
                 reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, HttpServlet30Dispatcher.class.getName()));
             }
diff --git a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java
index e0fc5649c5d52..eb84dd521a269 100644
--- a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java
+++ b/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/ResteasyStandaloneBuildStep.java
@@ -18,6 +18,7 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.resteasy.common.deployment.ResteasyInjectionReadyBuildItem;
+import io.quarkus.resteasy.runtime.ResteasyVertxConfig;
 import io.quarkus.resteasy.runtime.standalone.ResteasyStandaloneRecorder;
 import io.quarkus.resteasy.server.common.deployment.ResteasyDeploymentBuildItem;
 import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
@@ -91,6 +92,7 @@ public void boot(ShutdownContextBuildItem shutdown,
             ResteasyStandaloneBuildItem standalone,
             Optional<RequireVirtualHttpBuildItem> requireVirtual,
             ExecutorBuildItem executorBuildItem,
+            ResteasyVertxConfig resteasyVertxConfig,
             HttpConfiguration httpConfiguration) throws Exception {
 
         if (standalone == null) {
@@ -101,7 +103,7 @@ public void boot(ShutdownContextBuildItem shutdown,
         // Handler used for both the default and non-default deployment path (specified as application path or resteasyConfig.path)
         // Routes use the order VertxHttpRecorder.DEFAULT_ROUTE_ORDER + 1 to ensure the default route is called before the resteasy one
         Handler<RoutingContext> handler = recorder.vertxRequestHandler(vertx.getVertx(), beanContainer.getValue(),
-                executorBuildItem.getExecutorProxy(), httpConfiguration);
+                executorBuildItem.getExecutorProxy(), httpConfiguration, resteasyVertxConfig);
         // Exact match for resources matched to the root path
         routes.produce(new RouteBuildItem(
                 new BasicRoute(standalone.deploymentRootPath, VertxHttpRecorder.DEFAULT_ROUTE_ORDER + 1), handler));
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java
new file mode 100644
index 0000000000000..6d33f4e1efd0c
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.resteasy.test;
+
+import java.nio.charset.StandardCharsets;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+@Path("/length")
+public class ContentLengthResource {
+
+    @POST
+    @Path("cl")
+    public Response handleWithCl(String data) {
+        byte[] body = data.getBytes(StandardCharsets.UTF_8);
+        return Response.ok(body, "image/png").header("Content-Length", body.length).build();
+    }
+
+    @POST
+    public Response handle(String data) {
+        byte[] body = data.getBytes(StandardCharsets.UTF_8);
+        return Response.ok(body, "image/png").build();
+    }
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java
new file mode 100644
index 0000000000000..44abdb07589b5
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ContentLengthTestCase.java
@@ -0,0 +1,48 @@
+package io.quarkus.resteasy.test;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ContentLengthTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ContentLengthResource.class))
+            .overrideConfigKey("quarkus.resteasy.vertx.response-buffer-size", "100");
+
+    @Test
+    public void testContentLengthSet() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10000; ++i) {
+            sb.append("Hello World");
+        }
+        RestAssured.given().body(sb.toString()).post("/length/cl").then().header("Content-Length",
+                Matchers.equalTo(Integer.toString(sb.length())));
+    }
+
+    @Test
+    public void testClForSmallResponse() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10; ++i) {
+            sb.append("A");
+        }
+        RestAssured.given().body(sb.toString()).post("/length").then().header("Content-Length",
+                Matchers.equalTo(Integer.toString(sb.length())));
+    }
+
+    @Test
+    public void testResponseBufferSize() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 101; ++i) {
+            sb.append("A");
+        }
+        RestAssured.given().body(sb.toString()).post("/length").then().header("Content-Length", Matchers.nullValue());
+    }
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java
new file mode 100644
index 0000000000000..b4d2a6ee1df87
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/ForwardedEnabledTest.java
@@ -0,0 +1,41 @@
+package io.quarkus.resteasy.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class ForwardedEnabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestResource.class)
+                    .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
+                            "quarkus.http.proxy.enable-forwarded-host=true\n"),
+                            "application.properties"));
+
+    @Test
+    public void test() {
+        RestAssured.get("/test").then().statusCode(200).body(Matchers.equalToIgnoringCase("hello"));
+        RestAssured.given().header("Host", "").get("/test").then().statusCode(200).body(Matchers.equalToIgnoringCase("hello"));
+    }
+
+    @Path("/test")
+    public static class TestResource {
+
+        @GET
+        public String get() {
+            return "hello";
+        }
+    }
+
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java
index e43703e5ed2b2..34a487eb75237 100644
--- a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/IncompletePostTestCase.java
@@ -46,8 +46,8 @@ public void testIncompleteWrite() throws Exception {
         Assertions.assertFalse(PostEndpoint.invoked);
         RestAssuredConfig config = RestAssured.config()
                 .httpClient(HttpClientConfig.httpClientConfig()
-                        .setParam(CoreConnectionPNames.CONNECTION_TIMEOUT, 1000)
-                        .setParam(CoreConnectionPNames.SO_TIMEOUT, 1000));
+                        .setParam(CoreConnectionPNames.CONNECTION_TIMEOUT, 60000)
+                        .setParam(CoreConnectionPNames.SO_TIMEOUT, 60000));
 
         RestAssured.given().config(config).get("/post").then().body(Matchers.is("ok"));
     }
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java
new file mode 100644
index 0000000000000..c14d23ff9fbbc
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/InputStreamResource.java
@@ -0,0 +1,61 @@
+package io.quarkus.resteasy.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.LinkedBlockingDeque;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.event.Observes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+@Path("/in")
+public class InputStreamResource {
+
+    Timer timer = new Timer();
+
+    public static final LinkedBlockingDeque<Throwable> THROWABLES = new LinkedBlockingDeque<>();
+
+    @PreDestroy
+    void stop() {
+        timer.cancel();
+    }
+
+    @POST
+    public String read(InputStream inputStream) throws IOException {
+        try {
+            byte[] buf = new byte[1024];
+            int r;
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            while ((r = inputStream.read(buf)) > 0) {
+                out.write(buf, 0, r);
+            }
+            return new String(out.toByteArray(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            THROWABLES.add(e);
+            throw e;
+        }
+    }
+
+    public void delayFilter(@Observes Router router) {
+        router.route().order(Integer.MIN_VALUE).handler(new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext event) {
+                timer.schedule(new TimerTask() {
+                    @Override
+                    public void run() {
+                        event.next();
+                    }
+                }, 1000);
+            }
+        });
+    }
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java
new file mode 100644
index 0000000000000..7295bcfd62af9
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/VertxIOHangTestCase.java
@@ -0,0 +1,47 @@
+package io.quarkus.resteasy.test;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.restassured.RestAssured;
+
+public class VertxIOHangTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(InputStreamResource.class));
+
+    @TestHTTPResource
+    URI uri;
+
+    @Test
+    public void testDelayFilter() {
+        // makes sure that everything works as normal
+        RestAssured.given().body("hello world").post("/in").then().body(Matchers.is("hello world"));
+    }
+
+    @Test
+    public void testDelayFilterConnectionKilled() throws Exception {
+        // makes sure that everything works as normal
+        try (Socket s = new Socket(uri.getHost(), uri.getPort())) {
+            s.getOutputStream().write(
+                    "POST /in HTTP/1.1\r\nHost:localhost\r\nContent-Length: 100\r\n\r\n".getBytes(StandardCharsets.UTF_8));
+            s.getOutputStream().flush();
+        }
+        Throwable exception = InputStreamResource.THROWABLES.poll(3, TimeUnit.SECONDS);
+        Assertions.assertTrue(exception instanceof IOException);
+    }
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java
index eaa922a350a65..2f57a58886723 100644
--- a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/files/StaticFileWithResourcesTest.java
@@ -47,6 +47,10 @@ public void test() {
                 .statusCode(200)
                 .body(containsString("<h1>Hello</h1>"));
 
+        RestAssured.get("/web/").then()
+                .statusCode(200)
+                .body(containsString("<h1>Hello</h1>"));
+
         RestAssured.get("/lorem.txt").then()
                 .statusCode(200)
                 .body(containsString("Lorem"));
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java
new file mode 100644
index 0000000000000..129d7a8e86eb5
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.test.gzip;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.annotations.GZIP;
+
+@Path("gzip")
+public class GZipResource {
+
+    public static final String BODY = "hello world this string is going to be compressed";
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @GZIP
+    public String hello() {
+        return BODY;
+    }
+
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java
new file mode 100644
index 0000000000000..25dbc35de5784
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/gzip/GZipResourceTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.resteasy.test.gzip;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class GZipResourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(GZipResource.class))
+            .overrideConfigKey("quarkus.resteasy.gzip.enabled", "true");
+
+    @Test
+    public void testGzipEndpoint() {
+        RestAssured.given().get("/gzip").then().statusCode(200)
+                .header("content-encoding", "gzip")
+                .header("content-length", Matchers.not(Matchers.equalTo(Integer.toString(GZipResource.BODY.length()))))
+                .body(Matchers.equalTo(GZipResource.BODY));
+    }
+
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java
new file mode 100644
index 0000000000000..6bd67f5507f4b
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResource.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.test.multipart;
+
+import static java.util.stream.Collectors.toList;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
+@Path("multipart/")
+public class MultipartResource {
+
+    @POST
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public String hello(MultivaluedMap<String, String> formData) {
+        return formData.entrySet().stream()
+                .map(e -> e.getKey() + ":" + String.join(",", e.getValue()))
+                .collect(toList())
+                .toString();
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java
new file mode 100644
index 0000000000000..b409190a81b2d
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/multipart/MultipartResourceTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.resteasy.test.multipart;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.http.ContentType;
+
+public class MultipartResourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MultipartResource.class));
+
+    @Test
+    public void testHelloEndpoint() {
+        Map<String, String> map = new HashMap<>();
+        map.put("test", "value");
+
+        given()
+                .formParams(map)
+                .header("Expect", "100-continue")
+                .contentType(ContentType.URLENC)
+                .when().post("/multipart/")
+                .then()
+                .statusCode(200)
+                .body(is("[test:value]"));
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java
new file mode 100644
index 0000000000000..a8613bd142b14
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java
@@ -0,0 +1,237 @@
+package io.quarkus.resteasy.test.root;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.*;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * The integration test allowing to ensure that we can rely on {@link Application#getClasses()} to specify explicitly
+ * the classes to use for the application.
+ */
+class ApplicationTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(
+                            ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class,
+                            ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class,
+                            Feature1.class, Feature2.class, DynamicFeature1.class, DynamicFeature2.class,
+                            ExceptionMapper1.class, ExceptionMapper2.class, AppTest.class));
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_call_ok_of_resource_1() {
+        when()
+                .get("/rt-1/ok")
+                .then()
+                .header("X-RF-1", notNullValue())
+                .header("X-RF-2", nullValue())
+                .header("X-RF-3", notNullValue())
+                .header("X-RF-4", nullValue())
+                .header("X-RF-5", notNullValue())
+                .header("X-RF-6", nullValue())
+                .body(Matchers.is("ok1"));
+    }
+
+    @DisplayName("Should access to ko of resource 1 and call the expected exception mapper")
+    @Test
+    void should_call_ko_of_resource_1() {
+        when()
+                .get("/rt-1/ko")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_not_call_ok_of_resource_2() {
+        when()
+                .get("/rt-2/ok")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @Path("rt-1")
+    public static class ResourceTest1 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok1";
+        }
+
+        @GET
+        @Path("ko")
+        public String ko() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @Path("rt-2")
+    public static class ResourceTest2 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok2";
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter1 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-1", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter2 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-2", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter3 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-3", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter4 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-4", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter5 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-5", "Value");
+        }
+    }
+
+    @Provider
+    public static class ResponseFilter6 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-6", "Value");
+        }
+    }
+
+    @Provider
+    public static class Feature1 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter3.class);
+            return true;
+        }
+    }
+
+    @Provider
+    public static class Feature2 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter4.class);
+            return true;
+        }
+    }
+
+    @Provider
+    public static class ExceptionMapper1 implements ExceptionMapper<RuntimeException> {
+
+        @Override
+        public Response toResponse(RuntimeException exception) {
+            return Response.status(Response.Status.SERVICE_UNAVAILABLE.getStatusCode()).build();
+        }
+    }
+
+    @Provider
+    public static class ExceptionMapper2 implements ExceptionMapper<UnsupportedOperationException> {
+
+        @Override
+        public Response toResponse(UnsupportedOperationException exception) {
+            return Response.status(Response.Status.NOT_IMPLEMENTED.getStatusCode()).build();
+        }
+    }
+
+    @Provider
+    public static class DynamicFeature1 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter5.class);
+        }
+    }
+
+    @Provider
+    public static class DynamicFeature2 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter6.class);
+        }
+    }
+
+    public static class AppTest extends Application {
+
+        @Override
+        public Set<Class<?>> getClasses() {
+            return new HashSet<>(
+                    Arrays.asList(
+                            ResourceTest1.class, Feature1.class, ExceptionMapper1.class));
+        }
+
+        @Override
+        public Set<Object> getSingletons() {
+            return new HashSet<>(
+                    Arrays.asList(
+                            new ResponseFilter1(), new DynamicFeature1()));
+        }
+    }
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java
new file mode 100644
index 0000000000000..067427b0fcaf8
--- /dev/null
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/BuildProfileTest.java
@@ -0,0 +1,240 @@
+package io.quarkus.resteasy.test.root;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.profile.IfBuildProfile;
+import io.quarkus.arc.profile.UnlessBuildProfile;
+import io.quarkus.arc.properties.IfBuildProperty;
+import io.quarkus.arc.properties.UnlessBuildProperty;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * The integration test for the support of build time conditions on JAX-RS resource classes.
+ */
+class BuildProfileTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(
+                            ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class,
+                            ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class,
+                            Feature1.class, Feature2.class, DynamicFeature1.class, DynamicFeature2.class,
+                            ExceptionMapper1.class, ExceptionMapper2.class))
+            .overrideConfigKey("some.prop1", "v1")
+            .overrideConfigKey("some.prop2", "v2");
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_call_ok_of_resource_1() {
+        when()
+                .get("/rt-1/ok")
+                .then()
+                .header("X-RF-1", notNullValue())
+                .header("X-RF-2", nullValue())
+                .header("X-RF-3", notNullValue())
+                .header("X-RF-4", nullValue())
+                .header("X-RF-5", notNullValue())
+                .header("X-RF-6", nullValue())
+                .body(Matchers.is("ok1"));
+    }
+
+    @DisplayName("Should access to ko of resource 1 and call the expected exception mapper")
+    @Test
+    void should_call_ko_of_resource_1() {
+        when()
+                .get("/rt-1/ko")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @DisplayName("Should access to ok of resource 1 and provide a response with the expected headers")
+    @Test
+    void should_not_call_ok_of_resource_2() {
+        when()
+                .get("/rt-2/ok")
+                .then()
+                .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode());
+    }
+
+    @IfBuildProfile("test")
+    @Path("rt-1")
+    public static class ResourceTest1 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok1";
+        }
+
+        @GET
+        @Path("ko")
+        public String ko() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @IfBuildProfile("foo")
+    @Path("rt-2")
+    public static class ResourceTest2 {
+
+        @GET
+        @Path("ok")
+        public String ok() {
+            return "ok2";
+        }
+    }
+
+    @IfBuildProperty(name = "some.prop1", stringValue = "v1") // will be enabled because the value matches
+    @Provider
+    public static class ResponseFilter1 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-1", "Value");
+        }
+    }
+
+    @IfBuildProperty(name = "some.prop1", stringValue = "v") // won't be enabled because the value doesn't match
+    @Provider
+    public static class ResponseFilter2 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-2", "Value");
+        }
+    }
+
+    @IfBuildProfile("test")
+    @UnlessBuildProperty(name = "some.prop2", stringValue = "v1") // will be enabled because the value doesn't match
+    @Provider
+    public static class ResponseFilter3 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-3", "Value");
+        }
+    }
+
+    @UnlessBuildProperty(name = "some.prop2", stringValue = "v2") // won't be enabled because the value matches
+    @Provider
+    public static class ResponseFilter4 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-4", "Value");
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class ResponseFilter5 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-5", "Value");
+        }
+    }
+
+    @IfBuildProfile("bar")
+    @Provider
+    public static class ResponseFilter6 implements ContainerResponseFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+                throws IOException {
+            responseContext.getHeaders().add("X-RF-6", "Value");
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class Feature1 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter3.class);
+            return true;
+        }
+    }
+
+    @UnlessBuildProfile("test")
+    @Provider
+    public static class Feature2 implements Feature {
+
+        @Override
+        public boolean configure(FeatureContext context) {
+            context.register(ResponseFilter4.class);
+            return true;
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class ExceptionMapper1 implements ExceptionMapper<RuntimeException> {
+
+        @Override
+        public Response toResponse(RuntimeException exception) {
+            return Response.status(Response.Status.SERVICE_UNAVAILABLE.getStatusCode()).build();
+        }
+    }
+
+    @UnlessBuildProfile("test")
+    @Provider
+    public static class ExceptionMapper2 implements ExceptionMapper<UnsupportedOperationException> {
+
+        @Override
+        public Response toResponse(UnsupportedOperationException exception) {
+            return Response.status(Response.Status.NOT_IMPLEMENTED.getStatusCode()).build();
+        }
+    }
+
+    @IfBuildProfile("test")
+    @Provider
+    public static class DynamicFeature1 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter5.class);
+        }
+    }
+
+    @IfBuildProfile("bar")
+    @Provider
+    public static class DynamicFeature2 implements DynamicFeature {
+
+        @Override
+        public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+            context.register(ResponseFilter6.class);
+        }
+    }
+}
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java
index 464a31434689f..479030d5798de 100644
--- a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/LazyAuthRolesAllowedJaxRsTestCase.java
@@ -23,7 +23,7 @@ public class LazyAuthRolesAllowedJaxRsTestCase {
                             TestIdentityController.class,
                             UnsecuredSubResource.class)
                     .addAsResource(new StringAsset("quarkus.http.auth.proactive=false\n"),
-                            "application.properties"));;
+                            "application.properties"));
 
     @BeforeAll
     public static void setupUsers() {
diff --git a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java
index 067e6d338e7f3..10dbf823eca5c 100644
--- a/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java
+++ b/extensions/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/security/ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase.java
@@ -24,7 +24,7 @@ public class ReplaceIdentityLazyAuthRolesAllowedJaxRsTestCase {
                             SecurityOverrideFilter.class,
                             UnsecuredSubResource.class)
                     .addAsResource(new StringAsset("quarkus.http.auth.proactive=false\n"),
-                            "application.properties"));;
+                            "application.properties"));
 
     @BeforeAll
     public static void setupUsers() {
diff --git a/extensions/resteasy/pom.xml b/extensions/resteasy/pom.xml
index 23b31b2b2fe47..7e795c7944773 100644
--- a/extensions/resteasy/pom.xml
+++ b/extensions/resteasy/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy/runtime/pom.xml b/extensions/resteasy/runtime/pom.xml
index a32f5b0e36db4..2bbe977e73682 100644
--- a/extensions/resteasy/runtime/pom.xml
+++ b/extensions/resteasy/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-resteasy-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java
new file mode 100644
index 0000000000000..62ff707749093
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationCompletionExceptionMapper.java
@@ -0,0 +1,17 @@
+package io.quarkus.resteasy.runtime;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import io.quarkus.security.AuthenticationCompletionException;
+
+@Provider
+public class AuthenticationCompletionExceptionMapper implements ExceptionMapper<AuthenticationCompletionException> {
+
+    @Override
+    public Response toResponse(AuthenticationCompletionException ex) {
+        return Response.status(401).build();
+    }
+
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java
new file mode 100644
index 0000000000000..91c0f194fffdb
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/AuthenticationRedirectExceptionMapper.java
@@ -0,0 +1,22 @@
+package io.quarkus.resteasy.runtime;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import io.quarkus.security.AuthenticationRedirectException;
+
+@Provider
+public class AuthenticationRedirectExceptionMapper implements ExceptionMapper<AuthenticationRedirectException> {
+
+    @Override
+    public Response toResponse(AuthenticationRedirectException ex) {
+        return Response.status(ex.getCode())
+                .header(HttpHeaders.LOCATION, ex.getRedirectUri())
+                .header(HttpHeaders.CACHE_CONTROL, "no-store")
+                .header("Pragma", "no-cache")
+                .build();
+    }
+
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java
new file mode 100644
index 0000000000000..b859c33b9af37
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/CompositeExceptionMapper.java
@@ -0,0 +1,31 @@
+package io.quarkus.resteasy.runtime;
+
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.Providers;
+
+import io.smallrye.mutiny.CompositeException;
+
+@Provider
+public class CompositeExceptionMapper implements ExceptionMapper<CompositeException> {
+
+    @Context
+    Providers p;
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Response toResponse(CompositeException ex) {
+        Throwable t = ex.getCauses().stream().filter(s -> s != null).findFirst()
+                .orElseThrow(() -> new InternalServerErrorException());
+
+        ExceptionMapper<Throwable> mapper = (ExceptionMapper<Throwable>) p.getExceptionMapper(t.getClass());
+        if (mapper == null) {
+            throw new InternalServerErrorException();
+        }
+        return mapper.toResponse(t);
+    }
+
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ContextUtil.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ContextUtil.java
new file mode 100644
index 0000000000000..ab1d1e45b82ac
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ContextUtil.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.runtime;
+
+import java.util.Map;
+
+import org.jboss.resteasy.core.ResteasyContext;
+
+import io.quarkus.vertx.http.runtime.QuarkusHttpHeaders;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+public class ContextUtil {
+    /**
+     * Used to push context objects from virtual http plugins like AWS Lambda and Azure Functions.
+     * We keep this code here because its used in multiple places.
+     *
+     * @param routingContext
+     */
+    public static void pushContext(RoutingContext routingContext) {
+        MultiMap qheaders = routingContext.request().headers();
+        if (qheaders instanceof QuarkusHttpHeaders) {
+            for (Map.Entry<Class<?>, Object> entry : ((QuarkusHttpHeaders) qheaders).getContextObjects().entrySet()) {
+                ResteasyContext.pushContext((Class) entry.getKey(), entry.getValue());
+            }
+        }
+    }
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ExceptionMapperRecorder.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ExceptionMapperRecorder.java
index f2b1fd302896f..41b7a520e646a 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ExceptionMapperRecorder.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ExceptionMapperRecorder.java
@@ -5,6 +5,8 @@
 import java.util.Set;
 
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.http.runtime.devmode.AdditionalRouteDescription;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
 
 @Recorder
 public class ExceptionMapperRecorder {
@@ -13,10 +15,14 @@ public void setStaticResourceRoots(Set<String> resources) {
         NotFoundExceptionMapper.staticResources(resources);
     }
 
-    public void setAdditionalEndpoints(List<String> additionalEndpoints) {
+    public void setAdditionalEndpoints(List<AdditionalRouteDescription> additionalEndpoints) {
         NotFoundExceptionMapper.setAdditionalEndpoints(additionalEndpoints);
     }
 
+    public void setReactiveRoutes(List<RouteDescription> reactiveRoutes) {
+        NotFoundExceptionMapper.setReactiveRoutes(reactiveRoutes);
+    }
+
     public void setServlets(Map<String, List<String>> servletToMapping) {
         NotFoundExceptionMapper.servlets(servletToMapping);
     }
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java
index 18585ebbcf932..d8553592e98ba 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java
@@ -1,5 +1,6 @@
 package io.quarkus.resteasy.runtime;
 
+import static io.quarkus.runtime.TemplateHtmlBuilder.adjustRoot;
 import static org.jboss.resteasy.util.HttpHeaderNames.ACCEPT;
 
 import java.io.IOException;
@@ -17,7 +18,6 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -47,6 +47,8 @@
 
 import io.quarkus.runtime.TemplateHtmlBuilder;
 import io.quarkus.runtime.util.ClassPathUtils;
+import io.quarkus.vertx.http.runtime.devmode.AdditionalRouteDescription;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
 
 @Provider
 @Priority(Priorities.USER + 1)
@@ -58,12 +60,15 @@ public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundExceptio
     private final static Variant JSON_VARIANT = new Variant(MediaType.APPLICATION_JSON_TYPE, (String) null, null);
     private final static Variant HTML_VARIANT = new Variant(MediaType.TEXT_HTML_TYPE, (String) null, null);
     private final static List<Variant> VARIANTS = Arrays.asList(JSON_VARIANT, HTML_VARIANT);
+    private final static ResourceDescriptionComparator RESOURCE_DESCRIPTION_COMPARATOR = new ResourceDescriptionComparator();
+    private final static MethodDescriptionComparator METHOD_DESCRIPTION_COMPARATOR = new MethodDescriptionComparator();
 
     private volatile static String httpRoot = "";
-    private volatile static List<String> servletMappings = Collections.EMPTY_LIST;
-    private volatile static Set<java.nio.file.Path> staticResouceRoots = Collections.EMPTY_SET;
-    private volatile static List<String> additionalEndpoints = Collections.EMPTY_LIST;
-    private volatile static Map<String, NonJaxRsClassMappings> nonJaxRsClassNameToMethodPaths = Collections.EMPTY_MAP;
+    private volatile static List<String> servletMappings = Collections.emptyList();
+    private volatile static Set<java.nio.file.Path> staticResouceRoots = Collections.emptySet();
+    private volatile static List<AdditionalRouteDescription> additionalEndpoints = Collections.emptyList();
+    private volatile static Map<String, NonJaxRsClassMappings> nonJaxRsClassNameToMethodPaths = Collections.emptyMap();
+    private volatile static List<RouteDescription> reactiveRoutes = Collections.emptyList();
 
     private static final Logger LOG = Logger.getLogger(NotFoundExceptionMapper.class);
 
@@ -120,7 +125,7 @@ private static String mostPreferredOrNull(MediaType[] mediaTypes) {
 
         public static List<ResourceDescription> fromBoundResourceInvokers(
                 Set<Map.Entry<String, List<ResourceInvoker>>> bound) {
-            Map<String, ResourceDescription> descriptions = new HashMap<>();
+            Map<String, ResourceDescription> descriptionMap = new HashMap<>();
 
             for (Map.Entry<String, List<ResourceInvoker>> entry : bound) {
                 for (ResourceInvoker invoker : entry.getValue()) {
@@ -147,8 +152,10 @@ public static List<ResourceDescription> fromBoundResourceInvokers(
                         continue;
                     }
 
-                    if (!descriptions.containsKey(basePath)) {
-                        descriptions.put(basePath, new ResourceDescription(basePath));
+                    ResourceDescription description = descriptionMap.get(basePath);
+                    if (description == null) {
+                        description = new ResourceDescription(basePath);
+                        descriptionMap.put(basePath, description);
                     }
 
                     String subPath = "";
@@ -167,11 +174,24 @@ public static List<ResourceDescription> fromBoundResourceInvokers(
                         }
                     }
 
-                    descriptions.get(basePath).addMethod(basePath + subPath, method);
+                    String fullPath = basePath;
+                    if (!subPath.isEmpty()) {
+                        if (basePath.endsWith("/")) {
+                            fullPath += subPath;
+                        } else {
+                            fullPath = basePath + "/" + subPath;
+                        }
+                    }
+                    description.addMethod(fullPath, method);
                 }
             }
 
-            return new LinkedList<>(descriptions.values());
+            List<ResourceDescription> descriptions = new ArrayList<>(descriptionMap.values());
+            descriptions.sort(RESOURCE_DESCRIPTION_COMPARATOR);
+            for (ResourceDescription description : descriptions) {
+                description.calls.sort(METHOD_DESCRIPTION_COMPARATOR);
+            }
+            return descriptions;
         }
     }
 
@@ -231,7 +251,7 @@ private Response respond(List<ResourceDescription> descriptions) {
             TemplateHtmlBuilder sb = new TemplateHtmlBuilder("404 - Resource Not Found", "", "Resources overview");
             sb.resourcesStart("REST resources");
             for (ResourceDescription resource : descriptions) {
-                sb.resourcePath(adjustRoot(resource.basePath));
+                sb.resourcePath(adjustRoot(httpRoot, resource.basePath));
                 for (MethodDescription method : resource.calls) {
                     sb.method(method.method, method.fullPath);
                     if (method.consumes != null) {
@@ -252,17 +272,35 @@ private Response respond(List<ResourceDescription> descriptions) {
             if (!servletMappings.isEmpty()) {
                 sb.resourcesStart("Servlet mappings");
                 for (String servletMapping : servletMappings) {
-                    sb.servletMapping(adjustRoot(servletMapping));
+                    sb.servletMapping(adjustRoot(httpRoot, servletMapping));
                 }
                 sb.resourcesEnd();
             }
 
+            if (!reactiveRoutes.isEmpty()) {
+                sb.resourcesStart("Reactive Routes");
+                sb.resourceStart();
+                for (RouteDescription route : reactiveRoutes) {
+                    sb.method(route.getHttpMethod(), route.getPath() != null ? route.getPath() : "/*");
+                    sb.listItem(route.getJavaMethod());
+                    if (route.getConsumes() != null) {
+                        sb.consumes(route.getConsumes());
+                    }
+                    if (route.getProduces() != null) {
+                        sb.produces(route.getProduces());
+                    }
+                    sb.methodEnd();
+                }
+                sb.resourceEnd();
+                sb.resourcesEnd();
+            }
+
             if (!staticResouceRoots.isEmpty()) {
                 List<String> resources = findRealResources();
                 if (!resources.isEmpty()) {
                     sb.resourcesStart("Static resources");
                     for (String staticResource : resources) {
-                        sb.staticResourcePath(adjustRoot(staticResource));
+                        sb.staticResourcePath(adjustRoot(httpRoot, staticResource));
                     }
                     sb.resourcesEnd();
                 }
@@ -270,8 +308,9 @@ private Response respond(List<ResourceDescription> descriptions) {
 
             if (!additionalEndpoints.isEmpty()) {
                 sb.resourcesStart("Additional endpoints");
-                for (String additionalEndpoint : additionalEndpoints) {
-                    sb.staticResourcePath(adjustRoot(additionalEndpoint));
+                for (AdditionalRouteDescription additionalEndpoint : additionalEndpoints) {
+                    sb.staticResourcePath(additionalEndpoint.getUri(),
+                            additionalEndpoint.getDescription());
                 }
                 sb.resourcesEnd();
             }
@@ -342,28 +381,6 @@ private boolean isHtmlFileName(String fileName) {
         return fileName.endsWith(".html") || fileName.endsWith(".htm");
     }
 
-    private String adjustRoot(String basePath) {
-        //httpRoot can optionally end with a slash
-        //also some templates want the returned path to start with a / and some don't
-        //to make this work we check if the basePath starts with a / or not, and make sure we
-        //the return value follows the same pattern
-
-        if (httpRoot.equals("/")) {
-            //leave it alone
-            return basePath;
-        }
-        if (basePath.startsWith("/")) {
-            if (!httpRoot.endsWith("/")) {
-                return httpRoot + basePath;
-            }
-            return httpRoot.substring(0, httpRoot.length() - 1) + basePath;
-        }
-        if (httpRoot.endsWith("/")) {
-            return httpRoot.substring(1) + basePath;
-        }
-        return httpRoot.substring(1) + "/" + basePath;
-    }
-
     private static Variant selectVariant(HttpHeaders headers) {
         ServerDrivenNegotiation negotiation = new ServerDrivenNegotiation();
         negotiation.setAcceptHeaders(headers.getRequestHeaders().get(ACCEPT));
@@ -388,7 +405,27 @@ public static void nonJaxRsClassNameToMethodPaths(Map<String, NonJaxRsClassMappi
         NotFoundExceptionMapper.nonJaxRsClassNameToMethodPaths = nonJaxRsPaths;
     }
 
-    public static void setAdditionalEndpoints(List<String> additionalEndpoints) {
+    public static void setAdditionalEndpoints(List<AdditionalRouteDescription> additionalEndpoints) {
         NotFoundExceptionMapper.additionalEndpoints = additionalEndpoints;
     }
+
+    public static void setReactiveRoutes(List<RouteDescription> reactiveRoutes) {
+        NotFoundExceptionMapper.reactiveRoutes = reactiveRoutes;
+    }
+
+    private static class ResourceDescriptionComparator implements Comparator<ResourceDescription> {
+        @Override
+        public int compare(
+                NotFoundExceptionMapper.ResourceDescription d1, NotFoundExceptionMapper.ResourceDescription d2) {
+            return d1.basePath.compareTo(d2.basePath);
+        }
+    }
+
+    private static class MethodDescriptionComparator implements Comparator<MethodDescription> {
+        @Override
+        public int compare(MethodDescription m1, MethodDescription m2) {
+            int fullPathComparison = m1.fullPath.compareTo(m2.fullPath);
+            return fullPathComparison == 0 ? m1.method.compareTo(m2.method) : fullPathComparison;
+        }
+    }
 }
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java
index 80a150ce4d038..41415eefebf5b 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyFilter.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 
+import javax.enterprise.inject.spi.CDI;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -12,6 +13,8 @@
 
 import org.jboss.resteasy.plugins.server.servlet.Filter30Dispatcher;
 
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+
 /**
  * A filter that will be mapped to the default servlet. At first content will attempt to be served from the
  * default servlet, and if it fails then a REST response will be attempted
@@ -27,6 +30,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
             //we only serve get requests from the default servlet and CORS preflight requests
             filterChain.doFilter(servletRequest, new ResteasyResponseWrapper(response, request));
         } else {
+            CurrentVertxRequest currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
+            ContextUtil.pushContext(currentVertxRequest.getCurrent());
             servletContainerDispatcher.service(request.getMethod(), request, response, true);
         }
     }
@@ -53,19 +58,25 @@ public ResteasyResponseWrapper(HttpServletResponse response, HttpServletRequest
         public void sendError(int sc, String msg) throws IOException {
             if (sc == 404 || sc == 403) {
 
-                servletContainerDispatcher.service(request.getMethod(), request, response, true);
+                service();
             } else {
                 super.sendError(sc, msg);
             }
         }
 
+        protected void service() throws IOException {
+            CurrentVertxRequest currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
+            ContextUtil.pushContext(currentVertxRequest.getCurrent());
+            servletContainerDispatcher.service(request.getMethod(), request, response, true);
+        }
+
         @Override
         public void sendError(int sc) throws IOException {
             if (sc == 404 || sc == 403) {
-                servletContainerDispatcher.service(request.getMethod(), request, response, true);
+                service();
             } else {
                 super.sendError(sc);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java
new file mode 100644
index 0000000000000..99a5bbbd2558f
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyServlet.java
@@ -0,0 +1,21 @@
+package io.quarkus.resteasy.runtime;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher;
+
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+
+public class ResteasyServlet extends HttpServlet30Dispatcher {
+    @Override
+    public void service(String httpMethod, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        CurrentVertxRequest currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
+        ContextUtil.pushContext(currentVertxRequest.getCurrent());
+
+        super.service(httpMethod, request, response);
+    }
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyVertxConfig.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyVertxConfig.java
new file mode 100644
index 0000000000000..b4d71a5ac1810
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ResteasyVertxConfig.java
@@ -0,0 +1,18 @@
+package io.quarkus.resteasy.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "resteasy.vertx")
+public class ResteasyVertxConfig {
+
+    /**
+     * The size of the output stream response buffer. If a response is larger than this and no content-length
+     * is provided then the request will be chunked.
+     *
+     * Larger values may give slight performance increases for large responses, at the expense of more memory usage.
+     */
+    @ConfigItem(defaultValue = "8191")
+    public int responseBufferSize;
+
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyConfigurationMPConfig.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyConfigurationMPConfig.java
new file mode 100644
index 0000000000000..1fe30ead48ec9
--- /dev/null
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyConfigurationMPConfig.java
@@ -0,0 +1,44 @@
+package io.quarkus.resteasy.runtime.standalone;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.resteasy.spi.ResteasyConfiguration;
+
+/**
+ * Some resteasy components use this class for configuration. This bridges MP Config to ResteasyConfiguration
+ *
+ */
+public class ResteasyConfigurationMPConfig implements ResteasyConfiguration {
+    @Override
+    public String getParameter(String name) {
+        Config config = ConfigProvider.getConfig();
+        if (config == null)
+            return null;
+        return config.getOptionalValue(name, String.class).orElse(null);
+    }
+
+    @Override
+    public Set<String> getParameterNames() {
+        Config config = ConfigProvider.getConfig();
+        if (config == null)
+            return Collections.EMPTY_SET;
+        HashSet<String> set = new HashSet<>();
+        for (String name : config.getPropertyNames())
+            set.add(name);
+        return set;
+    }
+
+    @Override
+    public String getInitParameter(String name) {
+        return getParameter(name);
+    }
+
+    @Override
+    public Set<String> getInitParameterNames() {
+        return getParameterNames();
+    }
+}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyStandaloneRecorder.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyStandaloneRecorder.java
index c40e32aec28b7..eba273dd2cf41 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyStandaloneRecorder.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/ResteasyStandaloneRecorder.java
@@ -3,11 +3,13 @@
 import java.util.concurrent.Executor;
 import java.util.function.Supplier;
 
+import org.jboss.resteasy.spi.ResteasyConfiguration;
 import org.jboss.resteasy.spi.ResteasyDeployment;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.resteasy.runtime.ResteasyVertxConfig;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
@@ -23,51 +25,15 @@ public class ResteasyStandaloneRecorder {
 
     public static final String META_INF_RESOURCES = "META-INF/resources";
 
-    /**
-     * TODO: configuration
-     */
-    protected static final int BUFFER_SIZE = 8 * 1024;
-
     private static boolean useDirect = true;
 
-    //TODO: clean this up
-    private static BufferAllocator ALLOCATOR = new BufferAllocator() {
-        @Override
-        public ByteBuf allocateBuffer() {
-            return allocateBuffer(useDirect);
-        }
-
-        @Override
-        public ByteBuf allocateBuffer(boolean direct) {
-            return allocateBuffer(direct, BUFFER_SIZE);
-        }
-
-        @Override
-        public ByteBuf allocateBuffer(int bufferSize) {
-            return allocateBuffer(useDirect, bufferSize);
-        }
-
-        @Override
-        public ByteBuf allocateBuffer(boolean direct, int bufferSize) {
-            if (direct) {
-                return PooledByteBufAllocator.DEFAULT.directBuffer(bufferSize);
-            } else {
-                return PooledByteBufAllocator.DEFAULT.heapBuffer(bufferSize);
-            }
-        }
-
-        @Override
-        public int getBufferSize() {
-            return BUFFER_SIZE;
-        }
-    };
-
     private static ResteasyDeployment deployment;
     private static String contextPath;
 
     public void staticInit(ResteasyDeployment dep, String path) {
         if (dep != null) {
             deployment = dep;
+            deployment.getDefaultContextObjects().put(ResteasyConfiguration.class, new ResteasyConfigurationMPConfig());
             deployment.start();
         }
         contextPath = path;
@@ -87,12 +53,50 @@ public void run() {
     }
 
     public Handler<RoutingContext> vertxRequestHandler(Supplier<Vertx> vertx,
-            BeanContainer beanContainer, Executor executor, HttpConfiguration readTimeout) {
+            BeanContainer beanContainer, Executor executor, HttpConfiguration readTimeout, ResteasyVertxConfig config) {
         if (deployment != null) {
-            return new VertxRequestHandler(vertx.get(), beanContainer, deployment, contextPath, ALLOCATOR, executor,
+            return new VertxRequestHandler(vertx.get(), beanContainer, deployment, contextPath,
+                    new ResteasyVertxAllocator(config.responseBufferSize), executor,
                     readTimeout.readTimeout.toMillis());
         }
         return null;
     }
 
+    private static class ResteasyVertxAllocator implements BufferAllocator {
+
+        private final int bufferSize;
+
+        private ResteasyVertxAllocator(int bufferSize) {
+            this.bufferSize = bufferSize;
+        }
+
+        @Override
+        public ByteBuf allocateBuffer() {
+            return allocateBuffer(useDirect);
+        }
+
+        @Override
+        public ByteBuf allocateBuffer(boolean direct) {
+            return allocateBuffer(direct, bufferSize);
+        }
+
+        @Override
+        public ByteBuf allocateBuffer(int bufferSize) {
+            return allocateBuffer(useDirect, bufferSize);
+        }
+
+        @Override
+        public ByteBuf allocateBuffer(boolean direct, int bufferSize) {
+            if (direct) {
+                return PooledByteBufAllocator.DEFAULT.directBuffer(bufferSize);
+            } else {
+                return PooledByteBufAllocator.DEFAULT.heapBuffer(bufferSize);
+            }
+        }
+
+        @Override
+        public int getBufferSize() {
+            return bufferSize;
+        }
+    }
 }
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBlockingOutput.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBlockingOutput.java
index 217da8e61152f..e2dffa0c80f1a 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBlockingOutput.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBlockingOutput.java
@@ -8,6 +8,7 @@
 import org.jboss.logging.Logger;
 
 import io.netty.buffer.ByteBuf;
+import io.quarkus.vertx.core.runtime.VertxBufferImpl;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
 import io.vertx.core.Handler;
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBufferImpl.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBufferImpl.java
deleted file mode 100644
index 9b322f7bd64a9..0000000000000
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBufferImpl.java
+++ /dev/null
@@ -1,490 +0,0 @@
-package io.quarkus.resteasy.runtime.standalone;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Objects;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.util.CharsetUtil;
-import io.vertx.core.buffer.Buffer;
-import io.vertx.core.impl.Arguments;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-
-public class VertxBufferImpl implements Buffer {
-
-    private ByteBuf buffer;
-
-    public VertxBufferImpl(ByteBuf buffer) {
-        this.buffer = buffer;
-    }
-
-    public String toString() {
-        return buffer.toString(StandardCharsets.UTF_8);
-    }
-
-    public String toString(String enc) {
-        return buffer.toString(Charset.forName(enc));
-    }
-
-    public String toString(Charset enc) {
-        return buffer.toString(enc);
-    }
-
-    @Override
-    public JsonObject toJsonObject() {
-        return new JsonObject(this);
-    }
-
-    @Override
-    public JsonArray toJsonArray() {
-        return new JsonArray(this);
-    }
-
-    public byte getByte(int pos) {
-        return buffer.getByte(pos);
-    }
-
-    public short getUnsignedByte(int pos) {
-        return buffer.getUnsignedByte(pos);
-    }
-
-    public int getInt(int pos) {
-        return buffer.getInt(pos);
-    }
-
-    public int getIntLE(int pos) {
-        return buffer.getIntLE(pos);
-    }
-
-    public long getUnsignedInt(int pos) {
-        return buffer.getUnsignedInt(pos);
-    }
-
-    public long getUnsignedIntLE(int pos) {
-        return buffer.getUnsignedIntLE(pos);
-    }
-
-    public long getLong(int pos) {
-        return buffer.getLong(pos);
-    }
-
-    public long getLongLE(int pos) {
-        return buffer.getLongLE(pos);
-    }
-
-    public double getDouble(int pos) {
-        return buffer.getDouble(pos);
-    }
-
-    public float getFloat(int pos) {
-        return buffer.getFloat(pos);
-    }
-
-    public short getShort(int pos) {
-        return buffer.getShort(pos);
-    }
-
-    public short getShortLE(int pos) {
-        return buffer.getShortLE(pos);
-    }
-
-    public int getUnsignedShort(int pos) {
-        return buffer.getUnsignedShort(pos);
-    }
-
-    public int getUnsignedShortLE(int pos) {
-        return buffer.getUnsignedShortLE(pos);
-    }
-
-    public int getMedium(int pos) {
-        return buffer.getMedium(pos);
-    }
-
-    public int getMediumLE(int pos) {
-        return buffer.getMediumLE(pos);
-    }
-
-    public int getUnsignedMedium(int pos) {
-        return buffer.getUnsignedMedium(pos);
-    }
-
-    public int getUnsignedMediumLE(int pos) {
-        return buffer.getUnsignedMediumLE(pos);
-    }
-
-    public byte[] getBytes() {
-        byte[] arr = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, arr);
-        return arr;
-    }
-
-    public byte[] getBytes(int start, int end) {
-        Arguments.require(end >= start, "end must be greater or equal than start");
-        byte[] arr = new byte[end - start];
-        buffer.getBytes(start, arr, 0, end - start);
-        return arr;
-    }
-
-    @Override
-    public Buffer getBytes(byte[] dst) {
-        return getBytes(dst, 0);
-    }
-
-    @Override
-    public Buffer getBytes(byte[] dst, int dstIndex) {
-        return getBytes(0, buffer.writerIndex(), dst, dstIndex);
-    }
-
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst) {
-        return getBytes(start, end, dst, 0);
-    }
-
-    @Override
-    public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
-        Arguments.require(end >= start, "end must be greater or equal than start");
-        buffer.getBytes(start, dst, dstIndex, end - start);
-        return this;
-    }
-
-    public Buffer getBuffer(int start, int end) {
-        return new VertxBufferImpl(Unpooled.wrappedBuffer(getBytes(start, end)));
-    }
-
-    public String getString(int start, int end, String enc) {
-        byte[] bytes = getBytes(start, end);
-        Charset cs = Charset.forName(enc);
-        return new String(bytes, cs);
-    }
-
-    public String getString(int start, int end) {
-        byte[] bytes = getBytes(start, end);
-        return new String(bytes, StandardCharsets.UTF_8);
-    }
-
-    public Buffer appendBuffer(Buffer buff) {
-        buffer.writeBytes(buff.getByteBuf());
-        return this;
-    }
-
-    public Buffer appendBuffer(Buffer buff, int offset, int len) {
-        ByteBuf byteBuf = buff.getByteBuf();
-        int from = byteBuf.readerIndex() + offset;
-        buffer.writeBytes(byteBuf, from, len);
-        return this;
-    }
-
-    public Buffer appendBytes(byte[] bytes) {
-        buffer.writeBytes(bytes);
-        return this;
-    }
-
-    public Buffer appendBytes(byte[] bytes, int offset, int len) {
-        buffer.writeBytes(bytes, offset, len);
-        return this;
-    }
-
-    public Buffer appendByte(byte b) {
-        buffer.writeByte(b);
-        return this;
-    }
-
-    public Buffer appendUnsignedByte(short b) {
-        buffer.writeByte(b);
-        return this;
-    }
-
-    public Buffer appendInt(int i) {
-        buffer.writeInt(i);
-        return this;
-    }
-
-    public Buffer appendIntLE(int i) {
-        buffer.writeIntLE(i);
-        return this;
-    }
-
-    public Buffer appendUnsignedInt(long i) {
-        buffer.writeInt((int) i);
-        return this;
-    }
-
-    public Buffer appendUnsignedIntLE(long i) {
-        buffer.writeIntLE((int) i);
-        return this;
-    }
-
-    public Buffer appendMedium(int i) {
-        buffer.writeMedium(i);
-        return this;
-    }
-
-    public Buffer appendMediumLE(int i) {
-        buffer.writeMediumLE(i);
-        return this;
-    }
-
-    public Buffer appendLong(long l) {
-        buffer.writeLong(l);
-        return this;
-    }
-
-    public Buffer appendLongLE(long l) {
-        buffer.writeLongLE(l);
-        return this;
-    }
-
-    public Buffer appendShort(short s) {
-        buffer.writeShort(s);
-        return this;
-    }
-
-    public Buffer appendShortLE(short s) {
-        buffer.writeShortLE(s);
-        return this;
-    }
-
-    public Buffer appendUnsignedShort(int s) {
-        buffer.writeShort(s);
-        return this;
-    }
-
-    public Buffer appendUnsignedShortLE(int s) {
-        buffer.writeShortLE(s);
-        return this;
-    }
-
-    public Buffer appendFloat(float f) {
-        buffer.writeFloat(f);
-        return this;
-    }
-
-    public Buffer appendDouble(double d) {
-        buffer.writeDouble(d);
-        return this;
-    }
-
-    public Buffer appendString(String str, String enc) {
-        return append(str, Charset.forName(Objects.requireNonNull(enc)));
-    }
-
-    public Buffer appendString(String str) {
-        return append(str, CharsetUtil.UTF_8);
-    }
-
-    public Buffer setByte(int pos, byte b) {
-        ensureWritable(pos, 1);
-        buffer.setByte(pos, b);
-        return this;
-    }
-
-    public Buffer setUnsignedByte(int pos, short b) {
-        ensureWritable(pos, 1);
-        buffer.setByte(pos, b);
-        return this;
-    }
-
-    public Buffer setInt(int pos, int i) {
-        ensureWritable(pos, 4);
-        buffer.setInt(pos, i);
-        return this;
-    }
-
-    public Buffer setIntLE(int pos, int i) {
-        ensureWritable(pos, 4);
-        buffer.setIntLE(pos, i);
-        return this;
-    }
-
-    public Buffer setUnsignedInt(int pos, long i) {
-        ensureWritable(pos, 4);
-        buffer.setInt(pos, (int) i);
-        return this;
-    }
-
-    public Buffer setUnsignedIntLE(int pos, long i) {
-        ensureWritable(pos, 4);
-        buffer.setIntLE(pos, (int) i);
-        return this;
-    }
-
-    public Buffer setMedium(int pos, int i) {
-        ensureWritable(pos, 3);
-        buffer.setMedium(pos, i);
-        return this;
-    }
-
-    public Buffer setMediumLE(int pos, int i) {
-        ensureWritable(pos, 3);
-        buffer.setMediumLE(pos, i);
-        return this;
-    }
-
-    public Buffer setLong(int pos, long l) {
-        ensureWritable(pos, 8);
-        buffer.setLong(pos, l);
-        return this;
-    }
-
-    public Buffer setLongLE(int pos, long l) {
-        ensureWritable(pos, 8);
-        buffer.setLongLE(pos, l);
-        return this;
-    }
-
-    public Buffer setDouble(int pos, double d) {
-        ensureWritable(pos, 8);
-        buffer.setDouble(pos, d);
-        return this;
-    }
-
-    public Buffer setFloat(int pos, float f) {
-        ensureWritable(pos, 4);
-        buffer.setFloat(pos, f);
-        return this;
-    }
-
-    public Buffer setShort(int pos, short s) {
-        ensureWritable(pos, 2);
-        buffer.setShort(pos, s);
-        return this;
-    }
-
-    public Buffer setShortLE(int pos, short s) {
-        ensureWritable(pos, 2);
-        buffer.setShortLE(pos, s);
-        return this;
-    }
-
-    public Buffer setUnsignedShort(int pos, int s) {
-        ensureWritable(pos, 2);
-        buffer.setShort(pos, s);
-        return this;
-    }
-
-    public Buffer setUnsignedShortLE(int pos, int s) {
-        ensureWritable(pos, 2);
-        buffer.setShortLE(pos, s);
-        return this;
-    }
-
-    public Buffer setBuffer(int pos, Buffer b) {
-        ensureWritable(pos, b.length());
-        buffer.setBytes(pos, b.getByteBuf());
-        return this;
-    }
-
-    public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
-        ensureWritable(pos, len);
-        ByteBuf byteBuf = b.getByteBuf();
-        buffer.setBytes(pos, byteBuf, byteBuf.readerIndex() + offset, len);
-        return this;
-    }
-
-    public VertxBufferImpl setBytes(int pos, ByteBuffer b) {
-        ensureWritable(pos, b.limit());
-        buffer.setBytes(pos, b);
-        return this;
-    }
-
-    public Buffer setBytes(int pos, byte[] b) {
-        ensureWritable(pos, b.length);
-        buffer.setBytes(pos, b);
-        return this;
-    }
-
-    public Buffer setBytes(int pos, byte[] b, int offset, int len) {
-        ensureWritable(pos, len);
-        buffer.setBytes(pos, b, offset, len);
-        return this;
-    }
-
-    public Buffer setString(int pos, String str) {
-        return setBytes(pos, str, CharsetUtil.UTF_8);
-    }
-
-    public Buffer setString(int pos, String str, String enc) {
-        return setBytes(pos, str, Charset.forName(enc));
-    }
-
-    public int length() {
-        return buffer.writerIndex();
-    }
-
-    public Buffer copy() {
-        return new VertxBufferImpl(buffer.copy());
-    }
-
-    public Buffer slice() {
-        return new VertxBufferImpl(buffer.slice());
-    }
-
-    public Buffer slice(int start, int end) {
-        return new VertxBufferImpl(buffer.slice(start, end - start));
-    }
-
-    public ByteBuf getByteBuf() {
-        // Return a duplicate so the Buffer can be written multiple times.
-        // See #648
-        return buffer;
-    }
-
-    private Buffer append(String str, Charset charset) {
-        byte[] bytes = str.getBytes(charset);
-        buffer.writeBytes(bytes);
-        return this;
-    }
-
-    private Buffer setBytes(int pos, String str, Charset charset) {
-        byte[] bytes = str.getBytes(charset);
-        ensureWritable(pos, bytes.length);
-        buffer.setBytes(pos, bytes);
-        return this;
-    }
-
-    private void ensureWritable(int pos, int len) {
-        int ni = pos + len;
-        int cap = buffer.capacity();
-        int over = ni - cap;
-        if (over > 0) {
-            buffer.writerIndex(cap);
-            buffer.ensureWritable(over);
-        }
-        //We have to make sure that the writerindex is always positioned on the last bit of data set in the buffer
-        if (ni > buffer.writerIndex()) {
-            buffer.writerIndex(ni);
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        VertxBufferImpl buffer1 = (VertxBufferImpl) o;
-        return buffer != null ? buffer.equals(buffer1.buffer) : buffer1.buffer == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return buffer != null ? buffer.hashCode() : 0;
-    }
-
-    @Override
-    public void writeToBuffer(Buffer buff) {
-        buff.appendInt(this.length());
-        buff.appendBuffer(this);
-    }
-
-    @Override
-    public int readFromBuffer(int pos, Buffer buffer) {
-        int len = buffer.getInt(pos);
-        Buffer b = buffer.getBuffer(pos + 4, pos + 4 + len);
-        this.buffer = b.getByteBuf();
-        return pos + 4 + len;
-    }
-}
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java
index ea3e339db0d7b..3dd4255d70d08 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxOutputStream.java
@@ -142,11 +142,7 @@ private CompletionStage<Void> asyncFlush(boolean isLast) {
         if (pooledBuffer != null) {
             ByteBuf sentBuffer = pooledBuffer;
             pooledBuffer = null;
-            CompletionStage<Void> ret = response.writeNonBlocking(sentBuffer, isLast);
-            return ret.whenComplete((v, t) -> {
-                if (t != null)
-                    sentBuffer.release();
-            });
+            return response.writeNonBlocking(sentBuffer, isLast);
         }
         return CompletableFuture.completedFuture(null);
     }
diff --git a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java
index 8f6a97b66bd82..45587a144ebfd 100644
--- a/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java
+++ b/extensions/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java
@@ -3,6 +3,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Executor;
 
 import javax.enterprise.inject.Instance;
@@ -19,8 +21,10 @@
 
 import io.quarkus.arc.ManagedContext;
 import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.resteasy.runtime.ContextUtil;
 import io.quarkus.runtime.BlockingOperationControl;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.VertxInputStream;
 import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
@@ -70,15 +74,10 @@ public void handle(RoutingContext request) {
         // have to create input stream here.  Cannot execute in another thread
         // otherwise request handlers may not get set up before request ends
         InputStream is;
-        try {
-            if (request.getBody() != null) {
-                is = new ByteArrayInputStream(request.getBody().getBytes());
-            } else {
-                is = new VertxInputStream(request, readTimeout);
-            }
-        } catch (IOException e) {
-            request.fail(e);
-            return;
+        if (request.getBody() != null) {
+            is = new ByteArrayInputStream(request.getBody().getBytes());
+        } else {
+            is = new VertxInputStream(request, readTimeout);
         }
         if (BlockingOperationControl.isBlockingAllowed()) {
             try {
@@ -105,9 +104,14 @@ private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput
         ManagedContext requestContext = beanContainer.requestContext();
         requestContext.activate();
         routingContext.remove(QuarkusHttpUser.AUTH_FAILURE_HANDLER);
-        QuarkusHttpUser user = (QuarkusHttpUser) routingContext.user();
         if (association != null) {
-            association.setIdentity(QuarkusHttpUser.getSecurityIdentity(routingContext, null));
+            QuarkusHttpUser existing = (QuarkusHttpUser) routingContext.user();
+            if (existing != null) {
+                SecurityIdentity identity = existing.getSecurityIdentity();
+                association.setIdentity(identity);
+            } else {
+                association.setIdentity(QuarkusHttpUser.getSecurityIdentity(routingContext, null));
+            }
         }
         currentVertxRequest.setCurrent(routingContext);
         try {
@@ -126,9 +130,11 @@ private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput
                     hostSupplier,
                     dispatcher.getDispatcher(), vertxResponse, requestContext, executor);
             vertxRequest.setInputStream(is);
-            try {
-                ResteasyContext.pushContext(SecurityContext.class, new QuarkusResteasySecurityContext(request, routingContext));
-                ResteasyContext.pushContext(RoutingContext.class, routingContext);
+            Map<Class<?>, Object> map = new HashMap<>();
+            map.put(SecurityContext.class, new QuarkusResteasySecurityContext(request, routingContext));
+            map.put(RoutingContext.class, routingContext);
+            try (ResteasyContext.CloseableContext restCtx = ResteasyContext.addCloseableContextDataLevel(map)) {
+                ContextUtil.pushContext(routingContext);
                 dispatcher.service(ctx, request, response, vertxRequest, vertxResponse, true);
             } catch (Failure e1) {
                 vertxResponse.setStatus(e1.getErrorCode());
@@ -167,4 +173,5 @@ private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput
             }
         }
     }
+
 }
diff --git a/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 63e9dffb8c5a2..19c44114cb2ea 100644
--- a/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/resteasy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "RESTEasy JAX-RS"
 metadata:
   short-name: "jax-rs"
@@ -11,3 +10,11 @@ metadata:
   categories:
   - "web"
   status: "stable"
+  codestart:
+    name: "resteasy"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+      - "scala"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/resteasy/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/extensions/resteasy/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
deleted file mode 100644
index 6807c15e36f3a..0000000000000
--- a/extensions/resteasy/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
+++ /dev/null
@@ -1,4 +0,0 @@
-io.quarkus.resteasy.runtime.vertx.JsonObjectWriter
-io.quarkus.resteasy.runtime.vertx.JsonArrayWriter
-io.quarkus.resteasy.runtime.vertx.JsonObjectReader
-io.quarkus.resteasy.runtime.vertx.JsonArrayReader
diff --git a/extensions/scala/deployment/pom.xml b/extensions/scala/deployment/pom.xml
index 6da90d9f94264..3fc80398f86ff 100644
--- a/extensions/scala/deployment/pom.xml
+++ b/extensions/scala/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-scala-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/scala/pom.xml b/extensions/scala/pom.xml
index 3591f97d12516..ce4e53e7e8dbe 100644
--- a/extensions/scala/pom.xml
+++ b/extensions/scala/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/scala/runtime/pom.xml b/extensions/scala/runtime/pom.xml
index be20101021aad..65fcd612df7f2 100644
--- a/extensions/scala/runtime/pom.xml
+++ b/extensions/scala/runtime/pom.xml
@@ -13,6 +13,12 @@
     <artifactId>quarkus-scala</artifactId>
     <name>Quarkus - Scala - Runtime</name>
     <description>Write your services in Scala</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
             <plugin>
diff --git a/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 24e2190eb812d..b35474f9c4a46 100644
--- a/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/scala/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Scala"
 metadata:
   keywords:
@@ -6,3 +5,7 @@ metadata:
   categories:
   - "alt-languages"
   status: "preview"
+  codestart:
+    name: "scala"
+    kind: "core"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/extensions/scheduler/deployment/pom.xml b/extensions/scheduler/deployment/pom.xml
index 1703d10efdfc8..4e8f531bb34b6 100644
--- a/extensions/scheduler/deployment/pom.xml
+++ b/extensions/scheduler/deployment/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-scheduler-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -15,25 +14,33 @@
   <name>Quarkus - Scheduler - Deployment</name>
 
   <dependencies>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-core-deployment</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-arc-deployment</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-scheduler</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
-      <scope>test</scope>
-    </dependency>
-
+      <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-core-deployment</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-arc-deployment</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-scheduler</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-vertx-http-deployment</artifactId>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-junit5-internal</artifactId>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>io.rest-assured</groupId>
+          <artifactId>rest-assured</artifactId>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
 
   <build>
diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
index c65429994d486..3058beeebd062 100644
--- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
+++ b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
@@ -1,6 +1,7 @@
 package io.quarkus.scheduler.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -10,8 +11,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Singleton;
-
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
@@ -30,21 +29,19 @@
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.AutoAddScopeBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
-import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
-import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
+import io.quarkus.arc.deployment.BeanDiscoveryFinishedBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.TransformedAnnotationsBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
-import io.quarkus.arc.processor.AnnotationStore;
-import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanInfo;
-import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
+import io.quarkus.arc.runtime.BeanLookupSupplier;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -57,6 +54,8 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.gizmo.MethodCreator;
@@ -71,6 +70,8 @@
 import io.quarkus.scheduler.runtime.SchedulerContext;
 import io.quarkus.scheduler.runtime.SchedulerRecorder;
 import io.quarkus.scheduler.runtime.SimpleScheduler;
+import io.quarkus.scheduler.runtime.devconsole.SchedulerDevConsoleRecorder;
+import io.quarkus.scheduler.runtime.util.SchedulerUtils;
 
 /**
  * @author Martin Kouba
@@ -95,54 +96,35 @@ void beans(Capabilities capabilities, BuildProducer<AdditionalBeanBuildItem> add
     }
 
     @BuildStep
-    AnnotationsTransformerBuildItem annotationTransformer(CustomScopeAnnotationsBuildItem scopes) {
-        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
-            @Override
-            public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind kind) {
-                return kind == org.jboss.jandex.AnnotationTarget.Kind.CLASS;
-            }
-
-            @Override
-            public void transform(TransformationContext context) {
-                ClassInfo target = context.getTarget().asClass();
-                if (!scopes.isScopeIn(context.getAnnotations())
-                        && (target.annotations().containsKey(SCHEDULED_NAME)
-                                || target.annotations().containsKey(SCHEDULES_NAME))) {
-                    // Class with no scope annotation but with @Scheduled method
-                    LOGGER.debugf("Found scheduled business methods on a class %s with no scope defined - adding @Singleton",
-                            context.getTarget());
-                    context.transform().add(Singleton.class).done();
-                }
-            }
-        });
+    AutoAddScopeBuildItem autoAddScope() {
+        return AutoAddScopeBuildItem.builder().containsAnnotations(SCHEDULED_NAME, SCHEDULES_NAME)
+                .defaultScope(BuiltinScope.SINGLETON)
+                .reason("Found scheduled business methods").build();
     }
 
     @BuildStep
-    void collectScheduledMethods(BeanArchiveIndexBuildItem beanArchives, BeanRegistrationPhaseBuildItem beanRegistrationPhase,
-            BuildProducer<ScheduledBusinessMethodItem> scheduledBusinessMethods,
-            BuildProducer<BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem> beans) {
-
-        AnnotationStore annotationStore = beanRegistrationPhase.getContext().get(BuildExtension.Key.ANNOTATION_STORE);
+    void collectScheduledMethods(BeanArchiveIndexBuildItem beanArchives, BeanDiscoveryFinishedBuildItem beanDiscovery,
+            TransformedAnnotationsBuildItem transformedAnnotations,
+            BuildProducer<ScheduledBusinessMethodItem> scheduledBusinessMethods) {
 
         // We need to collect all business methods annotated with @Scheduled first
-        for (BeanInfo bean : beanRegistrationPhase.getContext().beans().classBeans()) {
-            collectScheduledMethods(beanArchives.getIndex(), annotationStore, bean,
+        for (BeanInfo bean : beanDiscovery.beanStream().classBeans()) {
+            collectScheduledMethods(beanArchives.getIndex(), transformedAnnotations, bean,
                     bean.getTarget().get().asClass(),
                     scheduledBusinessMethods);
         }
     }
 
-    private void collectScheduledMethods(IndexView index, AnnotationStore annotationStore, BeanInfo bean,
+    private void collectScheduledMethods(IndexView index, TransformedAnnotationsBuildItem transformedAnnotations, BeanInfo bean,
             ClassInfo beanClass, BuildProducer<ScheduledBusinessMethodItem> scheduledBusinessMethods) {
 
         for (MethodInfo method : beanClass.methods()) {
             List<AnnotationInstance> schedules = null;
-            AnnotationInstance scheduledAnnotation = annotationStore.getAnnotation(method, SCHEDULED_NAME);
+            AnnotationInstance scheduledAnnotation = transformedAnnotations.getAnnotation(method, SCHEDULED_NAME);
             if (scheduledAnnotation != null) {
                 schedules = Collections.singletonList(scheduledAnnotation);
             } else {
-                AnnotationInstance schedulesAnnotation = annotationStore.getAnnotation(method, SCHEDULES_NAME);
+                AnnotationInstance schedulesAnnotation = transformedAnnotations.getAnnotation(method, SCHEDULES_NAME);
                 if (schedulesAnnotation != null) {
                     schedules = new ArrayList<>();
                     for (AnnotationInstance scheduledInstance : schedulesAnnotation.value().asNestedArray()) {
@@ -162,7 +144,7 @@ private void collectScheduledMethods(IndexView index, AnnotationStore annotation
         if (superClassName != null) {
             ClassInfo superClass = index.getClassByName(superClassName);
             if (superClass != null) {
-                collectScheduledMethods(index, annotationStore, bean, superClass, scheduledBusinessMethods);
+                collectScheduledMethods(index, transformedAnnotations, bean, superClass, scheduledBusinessMethods);
             }
         }
     }
@@ -244,6 +226,18 @@ public FeatureBuildItem build(SchedulerConfig config, BuildProducer<SyntheticBea
         return new FeatureBuildItem(Feature.SCHEDULER);
     }
 
+    @BuildStep
+    public DevConsoleRuntimeTemplateInfoBuildItem devConsoleInfo() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("schedulerContext",
+                new BeanLookupSupplier(SchedulerContext.class));
+    }
+
+    @BuildStep
+    @Record(value = STATIC_INIT, optional = true)
+    DevConsoleRouteBuildItem invokeEndpoint(SchedulerDevConsoleRecorder recorder) {
+        return new DevConsoleRouteBuildItem("schedules", "POST", recorder.invokeHandler());
+    }
+
     private String generateInvoker(ScheduledBusinessMethodItem scheduledMethod, ClassOutput classOutput) {
 
         BeanInfo bean = scheduledMethod.getBean();
@@ -261,8 +255,8 @@ private String generateInvoker(ScheduledBusinessMethodItem scheduledMethod, Clas
         for (Type i : method.parameters()) {
             sigBuilder.append(i.name().toString());
         }
-        String targetPackage = DotNames.packageName(bean.getImplClazz().name());
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + INVOKER_SUFFIX + "_" + method.name() + "_"
+        String generatedName = DotNames.internalPackageNameWithTrailingSlash(bean.getImplClazz().name()) + baseName
+                + INVOKER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString());
 
         ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)
@@ -270,7 +264,8 @@ private String generateInvoker(ScheduledBusinessMethodItem scheduledMethod, Clas
                 .build();
 
         // The descriptor is: void invokeBean(Object execution)
-        MethodCreator invoke = invokerCreator.getMethodCreator("invokeBean", void.class, Object.class);
+        MethodCreator invoke = invokerCreator.getMethodCreator("invokeBean", void.class, Object.class)
+                .addException(Exception.class);
         // InjectableBean<Foo: bean = Arc.container().bean("1");
         // InstanceHandle<Foo> handle = Arc.container().instance(bean);
         // handle.get().ping();
@@ -312,7 +307,7 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
         AnnotationValue everyValue = schedule.value("every");
         if (cronValue != null && !cronValue.asString().trim().isEmpty()) {
             String cron = cronValue.asString().trim();
-            if (SchedulerContext.isConfigValue(cron)) {
+            if (SchedulerUtils.isConfigValue(cron)) {
                 // Don't validate config property
                 return null;
             }
@@ -329,7 +324,7 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
         } else {
             if (everyValue != null && !everyValue.asString().trim().isEmpty()) {
                 String every = everyValue.asString().trim();
-                if (SchedulerContext.isConfigValue(every)) {
+                if (SchedulerUtils.isConfigValue(every)) {
                     return null;
                 }
                 if (Character.isDigit(every.charAt(0))) {
@@ -349,7 +344,7 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
         if (delay == null || delay.asLong() <= 0) {
             if (delayedValue != null && !delayedValue.asString().trim().isEmpty()) {
                 String delayed = delayedValue.asString().trim();
-                if (SchedulerContext.isConfigValue(delayed)) {
+                if (SchedulerUtils.isConfigValue(delayed)) {
                     return null;
                 }
                 if (Character.isDigit(delayed.charAt(0))) {
@@ -371,7 +366,7 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
 
         AnnotationValue identityValue = schedule.value("identity");
         if (identityValue != null) {
-            String identity = identityValue.asString().trim();
+            String identity = SchedulerUtils.lookUpPropertyValue(identityValue.asString());
             AnnotationInstance previousInstanceWithSameIdentity = encounteredIdentities.get(identity);
             if (previousInstanceWithSameIdentity != null) {
                 String message = String.format("The identity: \"%s\" on: %s is not unique and it has already bean used by : %s",
diff --git a/extensions/scheduler/deployment/src/main/resources/dev-templates/embedded.html b/extensions/scheduler/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..eb3056710e716
--- /dev/null
+++ b/extensions/scheduler/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,3 @@
+<a href="{urlbase}/schedules" class="badge badge-light">
+  <i class="fa fa-clock fa-fw"></i>
+  Schedules <span class="badge badge-light">{info:schedulerContext.scheduledMethods.size()}</span></a>
diff --git a/extensions/scheduler/deployment/src/main/resources/dev-templates/schedules.html b/extensions/scheduler/deployment/src/main/resources/dev-templates/schedules.html
new file mode 100644
index 0000000000000..9f6e080c581bf
--- /dev/null
+++ b/extensions/scheduler/deployment/src/main/resources/dev-templates/schedules.html
@@ -0,0 +1,41 @@
+{#include main}
+  {#title}Schedules{/title}
+  {#body}
+  <table class="table table-striped">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Schedule</th>
+      <th scope="col">Source</th>
+      <th scope="col">Actions</th>
+    </tr>
+   </thead>
+   <tbody>
+   {#for scheduledMethod in info:schedulerContext.scheduledMethods}
+    <tr>
+      <td>{count}.</td>
+      <td>
+       {#if scheduledMethod.schedules.size > 1}
+         <ol type="a">
+         {#for schedule in scheduledMethod.schedules}
+           <li>{#scheduleInfo schedule /}</li>
+         {/for}
+         </ol>
+       {#else}
+         {#scheduleInfo scheduledMethod.schedules.iterator.next /}
+       {/if}
+      </td>
+      <td>
+        {scheduledMethod.methodDescription}
+      </td>
+      <td>
+       <form method="post"  enctype="application/x-www-form-urlencoded">
+        <input type="hidden" name="name" value="{scheduledMethod.methodDescription}">
+        <input id="invoke" type="submit" value="Invoke" class="btn btn-primary btn-sm">
+       </form>
+      </td>
+    {/for}
+   </tbody>
+  </table>
+  {/body}
+{/include}
\ No newline at end of file
diff --git a/extensions/scheduler/deployment/src/main/resources/dev-templates/tags/scheduleInfo.html b/extensions/scheduler/deployment/src/main/resources/dev-templates/tags/scheduleInfo.html
new file mode 100644
index 0000000000000..dd3120f2d645f
--- /dev/null
+++ b/extensions/scheduler/deployment/src/main/resources/dev-templates/tags/scheduleInfo.html
@@ -0,0 +1,10 @@
+{#if it.cron}
+  <code>{it.cron}</code>
+{#else}
+  Every <code>{it.every}</code>
+{/if}
+{#if it.delay > 0}
+  (with delay {it.delay} {it.delayUnit.toString.toLowerCase})
+{#else if !schedule.delayed.empty}
+  (delayed for {it.delayed})
+{/if}
\ No newline at end of file
diff --git a/extensions/scheduler/deployment/src/test/java/SimpleJobsDefaultPackage.java b/extensions/scheduler/deployment/src/test/java/SimpleJobsDefaultPackage.java
new file mode 100644
index 0000000000000..070bd5b6866db
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/SimpleJobsDefaultPackage.java
@@ -0,0 +1,40 @@
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+
+import io.quarkus.scheduler.Scheduled;
+
+public class SimpleJobsDefaultPackage {
+
+    static final Map<String, CountDownLatch> LATCHES;
+
+    static {
+        LATCHES = new ConcurrentHashMap<>();
+        LATCHES.put("every", new CountDownLatch(2));
+        LATCHES.put("everyConfig", new CountDownLatch(2));
+        LATCHES.put("cron", new CountDownLatch(2));
+        LATCHES.put("cronConfig", new CountDownLatch(2));
+    }
+
+    // the cron expression takes precedence
+    @Scheduled(cron = "0/1 * * * * ?", every = "2m")
+    void checkEverySecondCron() {
+        LATCHES.get("cron").countDown();
+    }
+
+    @Scheduled(every = "1s")
+    void checkEverySecond() {
+        LATCHES.get("every").countDown();
+    }
+
+    @Scheduled(cron = "{simpleJobs.cron}")
+    void checkEverySecondCronConfig() {
+        LATCHES.get("cronConfig").countDown();
+    }
+
+    @Scheduled(every = "{simpleJobs.every}")
+    void checkEverySecondConfig() {
+        LATCHES.get("everyConfig").countDown();
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java b/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java
new file mode 100644
index 0000000000000..4ff4900073538
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/SimpleScheduledMethodDefaultPackageTest.java
@@ -0,0 +1,30 @@
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SimpleScheduledMethodDefaultPackageTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SimpleJobsDefaultPackage.class)
+                    .addAsResource(new StringAsset("simpleJobs.cron=0/1 * * * * ?\nsimpleJobs.every=1s"),
+                            "application.properties"));
+
+    @Test
+    public void testSimpleScheduledJobs() throws InterruptedException {
+        for (CountDownLatch latch : SimpleJobsDefaultPackage.LATCHES.values()) {
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java
new file mode 100644
index 0000000000000..02304039ba5d7
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/DuplicateIdentityExpressionTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.scheduler.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DuplicateIdentityExpressionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setExpectedException(IllegalStateException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DuplicateIdentityExpressionTest.InvalidBean.class)
+                    .addAsResource(new StringAsset("my.identity=my_name"),
+                            "application.properties"));
+
+    @Test
+    public void test() {
+    }
+
+    static class InvalidBean {
+
+        @Scheduled(every = "1s", identity = "{my.identity}")
+        @Scheduled(every = "1s", identity = "my_name")
+        void wrong() {
+        }
+
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java
new file mode 100644
index 0000000000000..c11bf8ce1e2e2
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/MissingConfigIdentityExpressionTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.scheduler.test;
+
+import java.util.NoSuchElementException;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MissingConfigIdentityExpressionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setExpectedException(NoSuchElementException.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MissingConfigIdentityExpressionTest.InvalidBean.class));
+
+    @Test
+    public void test() {
+    }
+
+    static class InvalidBean {
+
+        @Scheduled(every = "1s", identity = "{my.identity}")
+        void wrong() {
+        }
+
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java
new file mode 100644
index 0000000000000..0a2fd629bdb3d
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/PausedSchedulerTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.scheduler.test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.scheduler.Scheduler;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class PausedSchedulerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(PausedSchedulerTest.Jobs.class)
+                    .addAsResource(new StringAsset("quarkus.scheduler.enabled=true"),
+                            "application.properties"));
+
+    @Inject
+    Scheduler scheduler;
+
+    @Test
+    public void testSchedulerPauseMethod() throws InterruptedException {
+        scheduler.pause();
+        assertFalse(scheduler.isRunning());
+        assertFalse(Jobs.LATCH.await(3, TimeUnit.SECONDS));
+    }
+
+    static class Jobs {
+        static final CountDownLatch LATCH = new CountDownLatch(2);
+
+        @Scheduled(every = "1s")
+        void countDownSecond() {
+            LATCH.countDown();
+        }
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java
new file mode 100644
index 0000000000000..ddea8fe6a8ab1
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/SimpleIdentityTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.scheduler.test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.scheduler.Scheduled;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SimpleIdentityTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Jobs.class)
+                    .addAsResource(new StringAsset("jobs.identity=every_1s_another_name"),
+                            "application.properties"));
+
+    @Test
+    public void testJobsWithIdentity() throws InterruptedException {
+        // Only assert that the scheduled method is working fine
+        assertTrue(Jobs.LATCH.await(5, TimeUnit.SECONDS));
+    }
+
+    public static class Jobs {
+
+        static final CountDownLatch LATCH = new CountDownLatch(2);
+
+        @Scheduled(every = "1s", identity = "every_1s_name")
+        @Scheduled(every = "1s", identity = "{jobs.identity}")
+        void ping() {
+            LATCH.countDown();
+        }
+
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java
new file mode 100644
index 0000000000000..131db573eb115
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/BodyHandlerBean.java
@@ -0,0 +1,28 @@
+package io.quarkus.scheduler.test.devconsole;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import io.quarkus.runtime.configuration.ConfigInstantiator;
+import io.quarkus.vertx.http.runtime.HttpConfiguration;
+import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class BodyHandlerBean {
+
+    void setup(@Observes Router router) {
+        HttpConfiguration httpConfiguration = new HttpConfiguration();
+        ConfigInstantiator.handleObject(httpConfiguration);
+        Handler<RoutingContext> bodyHandler = new VertxHttpRecorder().createBodyHandler(httpConfiguration);
+        router.route().order(Integer.MIN_VALUE + 1).handler(new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext routingContext) {
+                routingContext.request().resume();
+                bodyHandler.handle(routingContext);
+            }
+        });
+    }
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskBodyHandlerTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskBodyHandlerTest.java
new file mode 100644
index 0000000000000..75ed3452d4dea
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskBodyHandlerTest.java
@@ -0,0 +1,38 @@
+package io.quarkus.scheduler.test.devconsole;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class DevConsoleRunScheduledTaskBodyHandlerTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest config = new QuarkusDevModeTest()
+            .setArchiveProducer(
+                    () -> ShrinkWrap.create(JavaArchive.class).addClasses(NeverRunTask.class, BodyHandlerBean.class));
+
+    @Test
+    public void testInvokeScheduledTask() {
+        RestAssured.with()
+                .get("empty")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("true"));
+        RestAssured.with().formParam("name", "io.quarkus.scheduler.test.devconsole.NeverRunTask#run")
+                .redirects().follow(false)
+                .post("q/dev/io.quarkus.quarkus-scheduler/schedules")
+                .then()
+                .statusCode(303);
+        RestAssured.with()
+                .get("status")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("task ran"));
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java
new file mode 100644
index 0000000000000..bca6940c38ef4
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/DevConsoleRunScheduledTaskTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.scheduler.test.devconsole;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class DevConsoleRunScheduledTaskTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest config = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(NeverRunTask.class));
+
+    @Test
+    public void testInvokeScheduledTask() {
+        RestAssured.with()
+                .get("empty")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("true"));
+        RestAssured.with().formParam("name", "io.quarkus.scheduler.test.devconsole.NeverRunTask#run")
+                .redirects().follow(false)
+                .post("q/dev/io.quarkus.quarkus-scheduler/schedules")
+                .then()
+                .statusCode(303);
+        RestAssured.with()
+                .get("status")
+                .then()
+                .statusCode(200)
+                .body(Matchers.equalTo("task ran"));
+    }
+
+}
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java
new file mode 100644
index 0000000000000..4b8416d89267d
--- /dev/null
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/devconsole/NeverRunTask.java
@@ -0,0 +1,42 @@
+package io.quarkus.scheduler.test.devconsole;
+
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+import javax.enterprise.event.Observes;
+
+import io.quarkus.scheduler.Scheduled;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+public class NeverRunTask {
+
+    private static final LinkedBlockingDeque<String> queue = new LinkedBlockingDeque<>();
+
+    public void setup(@Observes Router router) {
+        router.route("/status").blockingHandler(new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext event) {
+                try {
+                    event.response().end(queue.poll(10, TimeUnit.SECONDS));
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    event.fail(e);
+                }
+            }
+        });
+        router.route("/empty").handler(new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext event) {
+                event.response().end(Boolean.toString(queue.isEmpty()));
+            }
+        });
+    }
+
+    @Scheduled(every = "2h", delay = 2, delayUnit = TimeUnit.HOURS)
+    public void run() {
+        queue.add("task ran");
+    }
+
+}
diff --git a/extensions/scheduler/pom.xml b/extensions/scheduler/pom.xml
index 2131083d1f042..8b620bde33677 100644
--- a/extensions/scheduler/pom.xml
+++ b/extensions/scheduler/pom.xml
@@ -3,10 +3,10 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>quarkus-build-parent</artifactId>
+    <artifactId>quarkus-extensions-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../../build-parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/scheduler/runtime/pom.xml b/extensions/scheduler/runtime/pom.xml
index 6f34328851f05..2d36e533fe2f8 100644
--- a/extensions/scheduler/runtime/pom.xml
+++ b/extensions/scheduler/runtime/pom.xml
@@ -1,58 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>quarkus-scheduler-parent</artifactId>
-    <groupId>io.quarkus</groupId>
-    <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-scheduler-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>quarkus-scheduler</artifactId>
-  <name>Quarkus - Scheduler - Runtime</name>
-  <description>Schedule jobs and tasks</description>
-  <dependencies>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-arc</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>com.cronutils</groupId>
-        <artifactId>cron-utils</artifactId>
-        <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-            </exclusion>
-        </exclusions>
-    </dependency>
-    <dependency>
-        <groupId>org.jboss.slf4j</groupId>
-        <artifactId>slf4j-jboss-logging</artifactId>
-    </dependency>
-  </dependencies>
+    <artifactId>quarkus-scheduler</artifactId>
+    <name>Quarkus - Scheduler - Runtime</name>
+    <description>Schedule jobs and tasks</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.cronutils</groupId>
+            <artifactId>cron-utils</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>javax.el</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
+        </dependency>
+        <!-- DEV console dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-            <annotationProcessorPaths>
-                <path>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-extension-processor</artifactId>
-                    <version>${project.version}</version>
-                </path>
-            </annotationProcessorPaths>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java
index 9cf0f03661520..1bfff45c53732 100644
--- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/Scheduled.java
@@ -43,6 +43,10 @@
     /**
      * Optionally defines a unique identifier for this job.
      * <p>
+     * If the value starts with "&#123;" and ends with "&#125;" the scheduler attempts to find a corresponding config property
+     * and use the configured value instead: {@code &#64;Scheduled(identity = "{myservice.check.identity.expr}")}.
+     *
+     * <p>
      * If the value is not given, Quarkus will generate a unique id.
      * <p>
      * 
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerContext.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerContext.java
index 79ccabc5c0614..817086978de6e 100644
--- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerContext.java
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerContext.java
@@ -26,13 +26,4 @@ default ScheduledInvoker createInvoker(String invokerClassName) {
             throw new IllegalStateException("Unable to create invoker: " + invokerClassName, e);
         }
     }
-
-    static String getConfigProperty(String val) {
-        return val.substring(1, val.length() - 1);
-    }
-
-    static boolean isConfigValue(String val) {
-        val = val.trim();
-        return val.startsWith("{") && val.endsWith("}");
-    }
 }
\ No newline at end of file
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerRecorder.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerRecorder.java
index db78aabb2fc70..5c5a808336d69 100644
--- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerRecorder.java
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SchedulerRecorder.java
@@ -36,5 +36,4 @@ public List<ScheduledMethodMetadata> getScheduledMethods() {
             }
         };
     }
-
 }
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java
index d5c1aea3e6d8c..d7123be59bacb 100644
--- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SimpleScheduler.java
@@ -21,8 +21,6 @@
 import javax.inject.Singleton;
 import javax.interceptor.Interceptor;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.logging.Logger;
 import org.jboss.threads.JBossScheduledThreadPoolExecutor;
 
@@ -39,6 +37,7 @@
 import io.quarkus.scheduler.Scheduler;
 import io.quarkus.scheduler.SkippedExecution;
 import io.quarkus.scheduler.Trigger;
+import io.quarkus.scheduler.runtime.util.SchedulerUtils;
 
 @Typed(Scheduler.class)
 @Singleton
@@ -55,7 +54,7 @@ public class SimpleScheduler implements Scheduler {
     private final List<ScheduledTask> scheduledTasks;
     private final boolean enabled;
 
-    public SimpleScheduler(SchedulerContext context, Config config, SchedulerRuntimeConfig schedulerRuntimeConfig,
+    public SimpleScheduler(SchedulerContext context, SchedulerRuntimeConfig schedulerRuntimeConfig,
             Event<SkippedExecution> skippedExecutionEvent) {
         this.running = true;
         this.enabled = schedulerRuntimeConfig.enabled;
@@ -83,8 +82,7 @@ public void run() {
                 int nameSequence = 0;
                 for (Scheduled scheduled : method.getSchedules()) {
                     nameSequence++;
-                    SimpleTrigger trigger = createTrigger(method.getInvokerClassName(), parser, scheduled, nameSequence,
-                            config);
+                    SimpleTrigger trigger = createTrigger(method.getInvokerClassName(), parser, scheduled, nameSequence);
                     ScheduledInvoker invoker = context.createInvoker(method.getInvokerClassName());
                     if (scheduled.concurrentExecution() == ConcurrentExecution.SKIP) {
                         invoker = new SkipConcurrentExecutionInvoker(invoker, skippedExecutionEvent);
@@ -122,6 +120,7 @@ void stop() {
     void checkTriggers() {
         if (!running) {
             LOGGER.trace("Skip all triggers - scheduler paused");
+            return;
         }
         ZonedDateTime now = ZonedDateTime.now();
         for (ScheduledTask task : scheduledTasks) {
@@ -152,8 +151,8 @@ public boolean isRunning() {
         return enabled && running;
     }
 
-    SimpleTrigger createTrigger(String invokerClass, CronParser parser, Scheduled scheduled, int nameSequence, Config config) {
-        String id = scheduled.identity().trim();
+    SimpleTrigger createTrigger(String invokerClass, CronParser parser, Scheduled scheduled, int nameSequence) {
+        String id = SchedulerUtils.lookUpPropertyValue(scheduled.identity());
         if (id.isEmpty()) {
             id = nameSequence + "_" + invokerClass;
         }
@@ -162,17 +161,14 @@ SimpleTrigger createTrigger(String invokerClass, CronParser parser, Scheduled sc
         if (scheduled.delay() > 0) {
             millisToAdd = scheduled.delayUnit().toMillis(scheduled.delay());
         } else if (!scheduled.delayed().isEmpty()) {
-            millisToAdd = Math.abs(parseDuration(scheduled, scheduled.delayed(), "delayed").toMillis());
+            millisToAdd = SchedulerUtils.parseDelayedAsMillis(scheduled);
         }
         if (millisToAdd != null) {
             start = start.toInstant().plusMillis(millisToAdd).atZone(start.getZone());
         }
 
-        String cron = scheduled.cron().trim();
+        String cron = SchedulerUtils.lookUpPropertyValue(scheduled.cron());
         if (!cron.isEmpty()) {
-            if (SchedulerContext.isConfigValue(cron)) {
-                cron = config.getValue(SchedulerContext.getConfigProperty(cron), String.class);
-            }
             Cron cronExpr;
             try {
                 cronExpr = parser.parse(cron);
@@ -181,30 +177,12 @@ SimpleTrigger createTrigger(String invokerClass, CronParser parser, Scheduled sc
             }
             return new CronTrigger(id, start, cronExpr);
         } else if (!scheduled.every().isEmpty()) {
-            return new IntervalTrigger(id, start, Math.abs(parseDuration(scheduled, scheduled.every(), "every").toMillis()));
+            return new IntervalTrigger(id, start, SchedulerUtils.parseEveryAsMillis(scheduled));
         } else {
             throw new IllegalArgumentException("Invalid schedule configuration: " + scheduled);
         }
     }
 
-    // Keep it public so that we can reuse the logic in the quartz extension
-    public static Duration parseDuration(Scheduled scheduled, String value, String memberName) {
-        value = value.trim();
-        if (SchedulerContext.isConfigValue(value)) {
-            value = ConfigProviderResolver.instance().getConfig().getValue(SchedulerContext.getConfigProperty(value),
-                    String.class);
-        }
-        if (Character.isDigit(value.charAt(0))) {
-            value = "PT" + value;
-        }
-        try {
-            return Duration.parse(value);
-        } catch (Exception e) {
-            // This could only happen for config-based expressions
-            throw new IllegalStateException("Invalid " + memberName + "() expression on: " + scheduled, e);
-        }
-    }
-
     static class ScheduledTask {
 
         final SimpleTrigger trigger;
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SkipConcurrentExecutionInvoker.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SkipConcurrentExecutionInvoker.java
index 9ece757b62010..26b3658b47311 100644
--- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SkipConcurrentExecutionInvoker.java
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/SkipConcurrentExecutionInvoker.java
@@ -31,7 +31,7 @@ public SkipConcurrentExecutionInvoker(ScheduledInvoker delegate, Event<SkippedEx
     }
 
     @Override
-    public void invoke(ScheduledExecution execution) {
+    public void invoke(ScheduledExecution execution) throws Exception {
         if (running.compareAndSet(false, true)) {
             try {
                 delegate.invoke(execution);
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/devconsole/SchedulerDevConsoleRecorder.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/devconsole/SchedulerDevConsoleRecorder.java
new file mode 100644
index 0000000000000..391140c09e127
--- /dev/null
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/devconsole/SchedulerDevConsoleRecorder.java
@@ -0,0 +1,105 @@
+package io.quarkus.scheduler.runtime.devconsole;
+
+import java.time.Instant;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil.FlashMessageStatus;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.scheduler.ScheduledExecution;
+import io.quarkus.scheduler.Trigger;
+import io.quarkus.scheduler.runtime.ScheduledInvoker;
+import io.quarkus.scheduler.runtime.ScheduledMethodMetadata;
+import io.quarkus.scheduler.runtime.SchedulerContext;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class SchedulerDevConsoleRecorder {
+
+    private static final Logger LOG = Logger.getLogger(SchedulerDevConsoleRecorder.class);
+
+    public Handler<RoutingContext> invokeHandler() {
+        // the usual issue of Vert.x hanging on to the first TCCL and setting it on all its threads
+        final ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form) throws Exception {
+                String name = form.get("name");
+                SchedulerContext context = Arc.container().instance(SchedulerContext.class).get();
+                for (ScheduledMethodMetadata metadata : context.getScheduledMethods()) {
+                    if (metadata.getMethodDescription().equals(name)) {
+                        context.getExecutor().execute(new Runnable() {
+                            @Override
+                            public void run() {
+                                final ClassLoader previousCl = Thread.currentThread().getContextClassLoader();
+                                try {
+                                    Thread.currentThread().setContextClassLoader(currentCl);
+                                    ScheduledInvoker invoker = context
+                                            .createInvoker(metadata.getInvokerClassName());
+                                    invoker.invoke(new DevModeScheduledExecution());
+                                } catch (Exception e) {
+                                    LOG.error(
+                                            "Unable to invoke a @Scheduled method: "
+                                                    + metadata.getMethodDescription(),
+                                            e);
+                                } finally {
+                                    Thread.currentThread().setContextClassLoader(previousCl);
+                                }
+                            }
+                        });
+                        flashMessage(event, "Action invoked");
+                        return;
+                    }
+                }
+                flashMessage(event, "Action not found: " + name, FlashMessageStatus.ERROR);
+            }
+        };
+    }
+
+    private static class DevModeScheduledExecution implements ScheduledExecution {
+
+        private final Instant now;
+
+        DevModeScheduledExecution() {
+            super();
+            this.now = Instant.now();
+        }
+
+        @Override
+        public Trigger getTrigger() {
+            return new Trigger() {
+
+                @Override
+                public String getId() {
+                    return "dev-console";
+                }
+
+                @Override
+                public Instant getNextFireTime() {
+                    return null;
+                }
+
+                @Override
+                public Instant getPreviousFireTime() {
+                    return now;
+                }
+            };
+        }
+
+        @Override
+        public Instant getFireTime() {
+            return now;
+        }
+
+        @Override
+        public Instant getScheduledFireTime() {
+            return now;
+        }
+
+    }
+
+}
diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/util/SchedulerUtils.java b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/util/SchedulerUtils.java
new file mode 100644
index 0000000000000..ab954b47a378f
--- /dev/null
+++ b/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/util/SchedulerUtils.java
@@ -0,0 +1,83 @@
+package io.quarkus.scheduler.runtime.util;
+
+import java.time.Duration;
+
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+
+import io.quarkus.scheduler.Scheduled;
+
+/**
+ * Utilities class for scheduler extensions.
+ *
+ */
+public class SchedulerUtils {
+
+    private static final String DELAYED = "delayed";
+    private static final String EVERY = "every";
+
+    private SchedulerUtils() {
+
+    }
+
+    /**
+     * Parse the `@Scheduled(delayed = "")` field into milliseconds.
+     *
+     * @param scheduled annotation
+     * @return returns the duration in milliseconds.
+     */
+    public static long parseDelayedAsMillis(Scheduled scheduled) {
+        return parseDurationAsMillis(scheduled, scheduled.delayed(), DELAYED);
+    }
+
+    /**
+     * Parse the `@Scheduled(every = "")` field into milliseconds.
+     *
+     * @param scheduled annotation
+     * @return returns the duration in milliseconds.
+     */
+    public static long parseEveryAsMillis(Scheduled scheduled) {
+        return parseDurationAsMillis(scheduled, scheduled.every(), EVERY);
+    }
+
+    /**
+     * Looks up the property value by checking whether the value is a configuration key and resolves it if so.
+     *
+     * @param propertyValue property value to look up.
+     * @return the resolved property value.
+     */
+    public static String lookUpPropertyValue(String propertyValue) {
+        String value = propertyValue.trim();
+        if (!value.isEmpty() && isConfigValue(value)) {
+            value = ConfigProviderResolver.instance().getConfig().getValue(getConfigProperty(value), String.class);
+        }
+
+        return value;
+    }
+
+    public static boolean isConfigValue(String val) {
+        val = val.trim();
+        return val.startsWith("{") && val.endsWith("}");
+    }
+
+    private static String getConfigProperty(String val) {
+        return val.substring(1, val.length() - 1);
+    }
+
+    private static long parseDurationAsMillis(Scheduled scheduled, String value, String memberName) {
+        return Math.abs(parseDuration(scheduled, value, memberName).toMillis());
+    }
+
+    private static Duration parseDuration(Scheduled scheduled, String value, String memberName) {
+        value = lookUpPropertyValue(value);
+        if (Character.isDigit(value.charAt(0))) {
+            value = "PT" + value;
+        }
+
+        try {
+            return Duration.parse(value);
+        } catch (Exception e) {
+            // This could only happen for config-based expressions
+            throw new IllegalStateException("Invalid " + memberName + "() expression on: " + scheduled, e);
+        }
+    }
+}
diff --git a/extensions/security-jpa/deployment/pom.xml b/extensions/security-jpa/deployment/pom.xml
index 7489d3d2f3c61..519560c585513 100644
--- a/extensions/security-jpa/deployment/pom.xml
+++ b/extensions/security-jpa/deployment/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>quarkus-panache-common-deployment</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-undertow-deployment</artifactId>
diff --git a/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java b/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java
index baddd79490202..4fb7b6d070660 100644
--- a/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java
+++ b/extensions/security-jpa/deployment/src/main/java/io/quarkus/security/jpa/deployment/QuarkusSecurityJpaProcessor.java
@@ -37,14 +37,17 @@
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem;
+import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.identity.request.TrustedAuthenticationRequest;
 import io.quarkus.security.identity.request.UsernamePasswordAuthenticationRequest;
 import io.quarkus.security.jpa.Password;
+import io.quarkus.security.jpa.PasswordProvider;
 import io.quarkus.security.jpa.PasswordType;
 import io.quarkus.security.jpa.Roles;
 import io.quarkus.security.jpa.RolesValue;
@@ -109,9 +112,10 @@ void configureJpaAuthConfig(ApplicationIndexBuildItem index,
                     annotatedRoles);
             AnnotationInstance passAnnotation = jpaSecurityDefinition.password.annotation(DOTNAME_PASSWORD);
             AnnotationValue passwordType = passAnnotation.value();
+            AnnotationValue customPasswordProvider = passAnnotation.value("provider");
+
             generateIdentityProvider(index.getIndex(), jpaSecurityDefinition,
-                    passwordType != null ? passwordType.asEnum() : PasswordType.MCF.name(),
-                    beanProducer, panacheEntities);
+                    passwordType, customPasswordProvider, beanProducer, panacheEntities);
 
             generateTrustedIdentityProvider(index.getIndex(), jpaSecurityDefinition,
                     beanProducer, panacheEntities);
@@ -140,7 +144,8 @@ private AnnotationTarget getSingleAnnotatedElement(Index index, DotName annotati
         return annotations.get(0).target();
     }
 
-    private void generateIdentityProvider(Index index, JpaSecurityDefinition jpaSecurityDefinition, String passwordType,
+    private void generateIdentityProvider(Index index, JpaSecurityDefinition jpaSecurityDefinition,
+            AnnotationValue passwordTypeValue, AnnotationValue passwordProviderValue,
             BuildProducer<GeneratedBeanBuildItem> beanProducer, Set<String> panacheClasses) {
         GeneratedBeanGizmoAdaptor gizmoAdaptor = new GeneratedBeanGizmoAdaptor(beanProducer);
 
@@ -151,6 +156,10 @@ private void generateIdentityProvider(Index index, JpaSecurityDefinition jpaSecu
                 .classOutput(gizmoAdaptor)
                 .build()) {
             classCreator.addAnnotation(Singleton.class);
+            FieldDescriptor passwordProviderField = classCreator.getFieldCreator("passwordProvider", PasswordProvider.class)
+                    .setModifiers(Modifier.PRIVATE)
+                    .getFieldDescriptor();
+
             try (MethodCreator methodCreator = classCreator.getMethodCreator("authenticate", SecurityIdentity.class,
                     EntityManager.class, UsernamePasswordAuthenticationRequest.class)) {
                 methodCreator.setModifiers(Modifier.PUBLIC);
@@ -168,32 +177,59 @@ private void generateIdentityProvider(Index index, JpaSecurityDefinition jpaSecu
                 AssignableResultHandle userVar = methodCreator.createVariable(declaringClassTypeDescriptor);
                 methodCreator.assign(userVar, methodCreator.checkCast(user, declaringClassName));
 
-                // if(user == null) return null;
+                // if(user == null) throw new AuthenticationFailedException();
                 try (BytecodeCreator trueBranch = methodCreator.ifNull(userVar).trueBranch()) {
-                    trueBranch.returnValue(trueBranch.loadNull());
+                    ResultHandle exceptionInstance = trueBranch
+                            .newInstance(MethodDescriptor.ofConstructor(AuthenticationFailedException.class));
+                    trueBranch.throwException(exceptionInstance);
                 }
 
                 // :pass = user.pass | user.getPass()
                 ResultHandle pass = jpaSecurityDefinition.password.readValue(methodCreator, userVar);
-                String getPasswordMethod;
-                if (passwordType == null) {
-                    passwordType = PasswordType.MCF.name();
+
+                PasswordType passwordType = passwordTypeValue != null ? PasswordType.valueOf(passwordTypeValue.asEnum())
+                        : PasswordType.MCF;
+
+                if (passwordType == PasswordType.CUSTOM && passwordProviderValue == null) {
+                    throw new RuntimeException("Missing password provider for password type: " + passwordType);
                 }
-                switch (PasswordType.valueOf(passwordType)) {
+
+                ResultHandle objectToInvokeOn;
+                String passwordProviderClassStr;
+                String passwordProviderMethod;
+                switch (passwordType) {
+                    case CUSTOM:
+                        passwordProviderClassStr = passwordProviderValue.asString();
+                        passwordProviderMethod = "getPassword";
+                        ResultHandle passwordProviderInstanceField = methodCreator.readInstanceField(passwordProviderField,
+                                methodCreator.getThis());
+                        BytecodeCreator trueBranch = methodCreator.ifNull(passwordProviderInstanceField).trueBranch();
+                        ResultHandle passwordProviderInstance = trueBranch
+                                .newInstance(MethodDescriptor.ofConstructor(passwordProviderClassStr));
+                        trueBranch.writeInstanceField(passwordProviderField, trueBranch.getThis(), passwordProviderInstance);
+                        trueBranch.close();
+                        objectToInvokeOn = methodCreator.readInstanceField(passwordProviderField, methodCreator.getThis());
+                        break;
                     case CLEAR:
-                        getPasswordMethod = "getClearPassword";
+                        passwordProviderClassStr = name;
+                        passwordProviderMethod = "getClearPassword";
+                        objectToInvokeOn = methodCreator.getThis();
                         break;
                     case MCF:
-                        getPasswordMethod = "getMcfPassword";
+                        passwordProviderClassStr = name;
+                        passwordProviderMethod = "getMcfPassword";
+                        objectToInvokeOn = methodCreator.getThis();
                         break;
                     default:
                         throw new RuntimeException("Unknown password type: " + passwordType);
                 }
+
                 // :getPasswordMethod(:pass);
                 ResultHandle storedPassword = methodCreator.invokeVirtualMethod(
-                        MethodDescriptor.ofMethod(name, getPasswordMethod, org.wildfly.security.password.Password.class,
+                        MethodDescriptor.ofMethod(passwordProviderClassStr, passwordProviderMethod,
+                                org.wildfly.security.password.Password.class,
                                 String.class),
-                        methodCreator.getThis(), pass);
+                        objectToInvokeOn, pass);
 
                 // Builder builder = checkPassword(storedPassword, request);
                 ResultHandle builder = methodCreator.invokeVirtualMethod(MethodDescriptor.ofMethod(name, "checkPassword",
diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java
new file mode 100644
index 0000000000000..f98dc3c28b7be
--- /dev/null
+++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordMapperTest.java
@@ -0,0 +1,19 @@
+package io.quarkus.security.jpa;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CustomPasswordMapperTest extends JpaSecurityRealmTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addClasses(CustomPasswordUserEntity.class, CustomPasswordProvider.class)
+                    .addAsResource("custom-password-mapper/import.sql", "import.sql")
+                    .addAsResource("custom-password-mapper/application.properties", "application.properties"));
+
+}
diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java
new file mode 100644
index 0000000000000..7c01ea35bb754
--- /dev/null
+++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordProvider.java
@@ -0,0 +1,14 @@
+package io.quarkus.security.jpa;
+
+import javax.xml.bind.DatatypeConverter;
+
+import org.wildfly.security.password.Password;
+import org.wildfly.security.password.interfaces.SimpleDigestPassword;
+
+public class CustomPasswordProvider implements PasswordProvider {
+    @Override
+    public Password getPassword(String pass) {
+        byte[] digest = DatatypeConverter.parseHexBinary(pass);
+        return SimpleDigestPassword.createRaw(SimpleDigestPassword.ALGORITHM_SIMPLE_DIGEST_SHA_256, digest);
+    }
+}
diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java
new file mode 100644
index 0000000000000..f5d24c3188af1
--- /dev/null
+++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/CustomPasswordUserEntity.java
@@ -0,0 +1,27 @@
+package io.quarkus.security.jpa;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@UserDefinition
+@Table(name = "test_user")
+@Entity
+public class CustomPasswordUserEntity {
+    @Id
+    @GeneratedValue
+    public Long id;
+
+    @Column(name = "username")
+    @Username
+    public String name;
+
+    @Column(name = "password")
+    @Password(value = PasswordType.CUSTOM, provider = CustomPasswordProvider.class)
+    public String pass;
+
+    @Roles
+    public String role;
+}
diff --git a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/FormAuthJpaTestCase.java b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/FormAuthJpaTestCase.java
index 3ccdde220b595..e9c08cf48f0d7 100644
--- a/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/FormAuthJpaTestCase.java
+++ b/extensions/security-jpa/deployment/src/test/java/io/quarkus/security/jpa/FormAuthJpaTestCase.java
@@ -66,6 +66,19 @@ public void testFormBasedAuthSuccess() {
                 .header("location", containsString("/login"))
                 .cookie("quarkus-redirect-location", containsString("/servlet-secured"));
 
+        // test with a non existent user
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .formParam("j_username", "dummy")
+                .formParam("j_password", "dummy")
+                .post("/j_security_check")
+                .then()
+                .assertThat()
+                .statusCode(302);
+
         RestAssured
                 .given()
                 .filter(cookies)
diff --git a/extensions/security-jpa/deployment/src/test/resources/custom-password-mapper/application.properties b/extensions/security-jpa/deployment/src/test/resources/custom-password-mapper/application.properties
new file mode 100644
index 0000000000000..2552afd82beeb
--- /dev/null
+++ b/extensions/security-jpa/deployment/src/test/resources/custom-password-mapper/application.properties
@@ -0,0 +1,8 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=sa
+quarkus.datasource.password=sa
+quarkus.datasource.jdbc.url=jdbc:h2:mem:custom-password-mapper'
+
+quarkus.hibernate-orm.sql-load-script=import.sql
+quarkus.hibernate-orm.database.generation=drop-and-create
+#quarkus.hibernate-orm.log.sql=true
diff --git a/extensions/security-jpa/deployment/src/test/resources/custom-password-mapper/import.sql b/extensions/security-jpa/deployment/src/test/resources/custom-password-mapper/import.sql
new file mode 100644
index 0000000000000..a03c2d2438a45
--- /dev/null
+++ b/extensions/security-jpa/deployment/src/test/resources/custom-password-mapper/import.sql
@@ -0,0 +1,3 @@
+INSERT INTO test_user (id, username, password, role) VALUES (1, 'admin', '8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918', 'admin');
+INSERT INTO test_user (id, username, password, role) VALUES (2, 'user','04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb', 'user');
+INSERT INTO test_user (id, username, password, role) VALUES (3, 'noRoleUser','bc84dfdb831a33641357ef365ddafd8d2c2d190242893355dab9b33067e99083', '');
\ No newline at end of file
diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/Password.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/Password.java
index ad78d79fe4f82..2d1c302a75cb6 100644
--- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/Password.java
+++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/Password.java
@@ -22,4 +22,10 @@
      * Sets the password storage type. defaults to {@link PasswordType#MCF}.
      */
     PasswordType value() default PasswordType.MCF;
+
+    /**
+     * Sets a custom password provider when the type is {@link PasswordType#CUSTOM}
+     */
+    Class<? extends PasswordProvider> provider() default PasswordProvider.class;
+
 }
diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordProvider.java
new file mode 100644
index 0000000000000..10ac7d508896e
--- /dev/null
+++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordProvider.java
@@ -0,0 +1,10 @@
+package io.quarkus.security.jpa;
+
+import org.wildfly.security.password.Password;
+
+/**
+ * Provides the {@link Password} according to how the password is hashed in the database.
+ */
+public interface PasswordProvider {
+    Password getPassword(String pass);
+}
diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordType.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordType.java
index 62b5dc84ea3db..25975d3edbb21 100644
--- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordType.java
+++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/PasswordType.java
@@ -4,6 +4,10 @@
  * Describes how the password is hashed in the database.
  */
 public enum PasswordType {
+    /**
+     * The password is stored hashed using a custom format.
+     */
+    CUSTOM,
     /**
      * The password is stored hashed using bcrypt in the Modular Crypt Format.
      */
diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java
index 4f466a3cd0157..45fa5d261fbc5 100644
--- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java
+++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/AbstractJpaIdentityProvider.java
@@ -59,7 +59,7 @@ protected <T> T getSingleUser(Query query) {
     }
 
     protected Password getClearPassword(String pass) {
-        return ClearPassword.createRaw("clear", pass.toCharArray());
+        return ClearPassword.createRaw(ClearPassword.ALGORITHM_CLEAR, pass.toCharArray());
     }
 
     protected Password getMcfPassword(String pass) {
diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java
index 926b3ffafdfe9..8084098db9eea 100644
--- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java
+++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaIdentityProvider.java
@@ -4,11 +4,11 @@
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 
 import org.hibernate.FlushMode;
 import org.jboss.logging.Logger;
 
-import io.quarkus.hibernate.orm.runtime.JPAConfig;
 import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.identity.AuthenticationRequestContext;
 import io.quarkus.security.identity.IdentityProvider;
@@ -22,7 +22,7 @@ public abstract class JpaIdentityProvider extends AbstractJpaIdentityProvider
     private static Logger log = Logger.getLogger(JpaIdentityProvider.class);
 
     @Inject
-    JPAConfig jpaConfig;
+    EntityManagerFactory entityManagerFactory;
 
     @Override
     public Class<UsernamePasswordAuthenticationRequest> getRequestType() {
@@ -35,8 +35,7 @@ public Uni<SecurityIdentity> authenticate(UsernamePasswordAuthenticationRequest
         return context.runBlocking(new Supplier<SecurityIdentity>() {
             @Override
             public SecurityIdentity get() {
-                // FIXME: unit name
-                EntityManager em = jpaConfig.getEntityManagerFactory(null).createEntityManager();
+                EntityManager em = entityManagerFactory.createEntityManager();
                 ((org.hibernate.Session) em).setHibernateFlushMode(FlushMode.MANUAL);
                 ((org.hibernate.Session) em).setDefaultReadOnly(true);
                 try {
diff --git a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java
index 3a45480ebaba5..c966a4a50f351 100644
--- a/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java
+++ b/extensions/security-jpa/runtime/src/main/java/io/quarkus/security/jpa/runtime/JpaTrustedIdentityProvider.java
@@ -4,11 +4,11 @@
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 
 import org.hibernate.FlushMode;
 import org.jboss.logging.Logger;
 
-import io.quarkus.hibernate.orm.runtime.JPAConfig;
 import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.identity.AuthenticationRequestContext;
 import io.quarkus.security.identity.IdentityProvider;
@@ -22,7 +22,7 @@ public abstract class JpaTrustedIdentityProvider extends AbstractJpaIdentityProv
     private static Logger log = Logger.getLogger(JpaTrustedIdentityProvider.class);
 
     @Inject
-    JPAConfig jpaConfig;
+    EntityManagerFactory entityManagerFactory;
 
     @Override
     public Class<TrustedAuthenticationRequest> getRequestType() {
@@ -35,8 +35,7 @@ public Uni<SecurityIdentity> authenticate(TrustedAuthenticationRequest request,
         return context.runBlocking(new Supplier<SecurityIdentity>() {
             @Override
             public SecurityIdentity get() {
-                // FIXME: unit name
-                EntityManager em = jpaConfig.getEntityManagerFactory(null).createEntityManager();
+                EntityManager em = entityManagerFactory.createEntityManager();
                 ((org.hibernate.Session) em).setHibernateFlushMode(FlushMode.MANUAL);
                 ((org.hibernate.Session) em).setDefaultReadOnly(true);
                 try {
diff --git a/extensions/security/deployment/pom.xml b/extensions/security/deployment/pom.xml
index 9214343675a7a..b040e20e4cf75 100644
--- a/extensions/security/deployment/pom.xml
+++ b/extensions/security/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/AdditionalSecurityCheckBuildItem.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/AdditionalSecurityCheckBuildItem.java
index f0c33d40a0217..e375e13b05762 100644
--- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/AdditionalSecurityCheckBuildItem.java
+++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/AdditionalSecurityCheckBuildItem.java
@@ -1,12 +1,9 @@
 package io.quarkus.security.deployment;
 
-import java.util.function.Function;
-
 import org.jboss.jandex.MethodInfo;
 
 import io.quarkus.builder.item.MultiBuildItem;
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.security.runtime.interceptor.check.SecurityCheck;
 
 /**
  * Used as an integration point when extensions need to customize the security behavior of a bean
@@ -15,18 +12,18 @@
 public final class AdditionalSecurityCheckBuildItem extends MultiBuildItem {
 
     private final MethodInfo methodInfo;
-    private final Function<BytecodeCreator, ResultHandle> function;
+    private final SecurityCheck securityCheck;
 
-    public AdditionalSecurityCheckBuildItem(MethodInfo methodInfo, Function<BytecodeCreator, ResultHandle> function) {
+    public AdditionalSecurityCheckBuildItem(MethodInfo methodInfo, SecurityCheck securityCheck) {
         this.methodInfo = methodInfo;
-        this.function = function;
+        this.securityCheck = securityCheck;
     }
 
     public MethodInfo getMethodInfo() {
         return methodInfo;
     }
 
-    public Function<BytecodeCreator, ResultHandle> getSecurityCheckResultHandleCreator() {
-        return function;
+    public SecurityCheck getSecurityCheck() {
+        return securityCheck;
     }
 }
diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/BouncyCastleJsseProviderBuildItem.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/BouncyCastleJsseProviderBuildItem.java
new file mode 100644
index 0000000000000..5e990c84b1efb
--- /dev/null
+++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/BouncyCastleJsseProviderBuildItem.java
@@ -0,0 +1,20 @@
+package io.quarkus.security.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class BouncyCastleJsseProviderBuildItem extends SimpleBuildItem {
+    private final boolean inFipsMode;
+
+    public BouncyCastleJsseProviderBuildItem() {
+        this(false);
+    }
+
+    public BouncyCastleJsseProviderBuildItem(boolean inFipsMode) {
+        this.inFipsMode = inFipsMode;
+    }
+
+    public boolean isInFipsMode() {
+        return inFipsMode;
+    }
+
+}
diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/BouncyCastleProviderBuildItem.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/BouncyCastleProviderBuildItem.java
new file mode 100644
index 0000000000000..8818772a37c56
--- /dev/null
+++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/BouncyCastleProviderBuildItem.java
@@ -0,0 +1,19 @@
+package io.quarkus.security.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class BouncyCastleProviderBuildItem extends SimpleBuildItem {
+    private final boolean inFipsMode;
+
+    public BouncyCastleProviderBuildItem() {
+        this(false);
+    }
+
+    public BouncyCastleProviderBuildItem(boolean inFipsMode) {
+        this.inFipsMode = inFipsMode;
+    }
+
+    public boolean isInFipsMode() {
+        return inFipsMode;
+    }
+}
diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityCheckInstantiationUtil.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityCheckInstantiationUtil.java
deleted file mode 100644
index 774b1ce9f49e1..0000000000000
--- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityCheckInstantiationUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.quarkus.security.deployment;
-
-import static io.quarkus.gizmo.FieldDescriptor.of;
-import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
-
-import java.util.function.Function;
-
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.ResultHandle;
-import io.quarkus.security.runtime.interceptor.check.AuthenticatedCheck;
-import io.quarkus.security.runtime.interceptor.check.DenyAllCheck;
-import io.quarkus.security.runtime.interceptor.check.PermitAllCheck;
-import io.quarkus.security.runtime.interceptor.check.RolesAllowedCheck;
-
-public class SecurityCheckInstantiationUtil {
-
-    private SecurityCheckInstantiationUtil() {
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> rolesAllowedSecurityCheck(String... rolesAllowed) {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                if ((rolesAllowed == null)) {
-                    throw new IllegalStateException(
-                            "Cannot use a null array to create an instance of " + RolesAllowedCheck.class.getName());
-                }
-
-                ResultHandle rolesAllowedArgs = creator.newArray(String.class, rolesAllowed.length);
-                int i = 0;
-                for (String val : rolesAllowed) {
-                    creator.writeArrayValue(rolesAllowedArgs, i++, creator.load(val));
-                }
-                return creator.invokeStaticMethod(
-                        ofMethod(RolesAllowedCheck.class, "of", RolesAllowedCheck.class, String[].class), rolesAllowedArgs);
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> denyAllSecurityCheck() {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.readStaticField(of(DenyAllCheck.class, "INSTANCE", DenyAllCheck.class));
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> permitAllSecurityCheck() {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.readStaticField(of(PermitAllCheck.class, "INSTANCE", PermitAllCheck.class));
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> authenticatedSecurityCheck() {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.readStaticField(of(AuthenticatedCheck.class, "INSTANCE", AuthenticatedCheck.class));
-            }
-        };
-    }
-}
diff --git a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java
index 8744568fa58ce..e0a23311ca1ca 100644
--- a/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java
+++ b/extensions/security/deployment/src/main/java/io/quarkus/security/deployment/SecurityProcessor.java
@@ -1,11 +1,9 @@
 package io.quarkus.security.deployment;
 
-import static io.quarkus.security.deployment.SecurityCheckInstantiationUtil.authenticatedSecurityCheck;
-import static io.quarkus.security.deployment.SecurityCheckInstantiationUtil.denyAllSecurityCheck;
-import static io.quarkus.security.deployment.SecurityCheckInstantiationUtil.permitAllSecurityCheck;
-import static io.quarkus.security.deployment.SecurityCheckInstantiationUtil.rolesAllowedSecurityCheck;
-
+import java.io.IOException;
 import java.lang.reflect.Modifier;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.security.Provider;
 import java.security.Security;
 import java.util.ArrayList;
@@ -16,42 +14,46 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
-import io.quarkus.arc.deployment.BeanRegistrarBuildItem;
 import io.quarkus.arc.deployment.InterceptorBindingRegistrarBuildItem;
-import io.quarkus.arc.processor.BeanConfigurator;
-import io.quarkus.arc.processor.BeanRegistrar;
-import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.security.runtime.IdentityProviderManagerCreator;
 import io.quarkus.security.runtime.SecurityBuildTimeConfig;
+import io.quarkus.security.runtime.SecurityCheckRecorder;
 import io.quarkus.security.runtime.SecurityIdentityAssociation;
 import io.quarkus.security.runtime.SecurityIdentityProxy;
+import io.quarkus.security.runtime.SecurityProviderRecorder;
+import io.quarkus.security.runtime.SecurityProviderUtils;
 import io.quarkus.security.runtime.X509IdentityProvider;
 import io.quarkus.security.runtime.interceptor.AuthenticatedInterceptor;
 import io.quarkus.security.runtime.interceptor.DenyAllInterceptor;
@@ -72,31 +74,40 @@ public class SecurityProcessor {
     SecurityConfig security;
 
     /**
-     * Register the Elytron-provided password factory SPI implementation
-     *
+     * Create JCAProviderBuildItems for any configured provider names
      */
     @BuildStep
-    void services(BuildProducer<JCAProviderBuildItem> jcaProviders) {
-        // Create JCAProviderBuildItems for any configured provider names
-        for (String providerName : security.securityProviders.orElse(Collections.emptyList())) {
-            jcaProviders.produce(new JCAProviderBuildItem(providerName));
+    void produceJcaSecurityProviders(BuildProducer<JCAProviderBuildItem> jcaProviders,
+            BuildProducer<BouncyCastleProviderBuildItem> bouncyCastleProvider,
+            BuildProducer<BouncyCastleJsseProviderBuildItem> bouncyCastleJsseProvider) {
+        Set<String> providers = new HashSet<>(security.securityProviders.orElse(Collections.emptyList()));
+        for (String providerName : providers) {
+            if (SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_NAME.equals(providerName)) {
+                bouncyCastleProvider.produce(new BouncyCastleProviderBuildItem());
+            } else if (SecurityProviderUtils.BOUNCYCASTLE_JSSE_PROVIDER_NAME.equals(providerName)) {
+                bouncyCastleJsseProvider.produce(new BouncyCastleJsseProviderBuildItem());
+            } else if (SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_NAME.equals(providerName)) {
+                bouncyCastleProvider.produce(new BouncyCastleProviderBuildItem(true));
+            } else if (SecurityProviderUtils.BOUNCYCASTLE_FIPS_JSSE_PROVIDER_NAME.equals(providerName)) {
+                bouncyCastleJsseProvider.produce(new BouncyCastleJsseProviderBuildItem(true));
+            } else {
+                jcaProviders.produce(new JCAProviderBuildItem(providerName));
+            }
             log.debugf("Added providerName: %s", providerName);
         }
     }
 
-    @BuildStep
-    AdditionalBeanBuildItem authorizationController() {
-        return AdditionalBeanBuildItem.builder().addBeanClass(AuthorizationController.class).build();
-    }
-
     /**
      * Register the classes for reflection in the requested named providers
      *
      * @param classes - ReflectiveClassBuildItem producer
      * @param jcaProviders - JCAProviderBuildItem for requested providers
+     * @throws URISyntaxException
+     * @throws MalformedURLException
      */
     @BuildStep
-    void registerJCAProviders(BuildProducer<ReflectiveClassBuildItem> classes, List<JCAProviderBuildItem> jcaProviders) {
+    void registerJCAProvidersForReflection(BuildProducer<ReflectiveClassBuildItem> classes,
+            List<JCAProviderBuildItem> jcaProviders) throws IOException, URISyntaxException {
         for (JCAProviderBuildItem provider : jcaProviders) {
             List<String> providerClasses = registerProvider(provider.getProviderName());
             for (String className : providerClasses) {
@@ -106,11 +117,85 @@ void registerJCAProviders(BuildProducer<ReflectiveClassBuildItem> classes, List<
         }
     }
 
+    @BuildStep
+    void prepareBouncyCastleProviders(BuildProducer<ReflectiveClassBuildItem> reflection,
+            BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReInitialized,
+            Optional<BouncyCastleProviderBuildItem> bouncyCastleProvider,
+            Optional<BouncyCastleJsseProviderBuildItem> bouncyCastleJsseProvider) throws Exception {
+        if (bouncyCastleJsseProvider.isPresent()) {
+            reflection.produce(
+                    new ReflectiveClassBuildItem(true, true, SecurityProviderUtils.BOUNCYCASTLE_JSSE_PROVIDER_CLASS_NAME));
+            prepareBouncyCastleProvider(reflection, runtimeReInitialized, bouncyCastleJsseProvider.get().isInFipsMode());
+        } else if (bouncyCastleProvider.isPresent()) {
+            prepareBouncyCastleProvider(reflection, runtimeReInitialized, bouncyCastleProvider.get().isInFipsMode());
+        }
+    }
+
+    private static void prepareBouncyCastleProvider(BuildProducer<ReflectiveClassBuildItem> reflection,
+            BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReInitialized,
+            boolean inFipsMode) {
+        reflection.produce(new ReflectiveClassBuildItem(true, true,
+                inFipsMode ? SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_CLASS_NAME
+                        : SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME));
+        reflection.produce(new ReflectiveClassBuildItem(true, true,
+                "org.bouncycastle.jcajce.provider.asymmetric.rsa.PSSSignatureSpi"));
+        reflection.produce(new ReflectiveClassBuildItem(true, true,
+                "org.bouncycastle.jcajce.provider.asymmetric.rsa.PSSSignatureSpi$SHA256withRSA"));
+        runtimeReInitialized
+                .produce(new RuntimeReinitializedClassBuildItem("org.bouncycastle.crypto.CryptoServicesRegistrar"));
+        if (!inFipsMode) {
+            runtimeReInitialized
+                    .produce(new RuntimeReinitializedClassBuildItem("org.bouncycastle.jcajce.provider.drbg.DRBG$Default"));
+            runtimeReInitialized
+                    .produce(new RuntimeReinitializedClassBuildItem("org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV"));
+        }
+
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void recordBouncyCastleProviders(SecurityProviderRecorder recorder,
+            Optional<BouncyCastleProviderBuildItem> bouncyCastleProvider,
+            Optional<BouncyCastleJsseProviderBuildItem> bouncyCastleJsseProvider) {
+        if (bouncyCastleJsseProvider.isPresent()) {
+            if (bouncyCastleJsseProvider.get().isInFipsMode()) {
+                recorder.addBouncyCastleFipsJsseProvider();
+            } else {
+                recorder.addBouncyCastleJsseProvider();
+            }
+        } else if (bouncyCastleProvider.isPresent()) {
+            recorder.addBouncyCastleProvider(bouncyCastleProvider.get().isInFipsMode());
+        }
+    }
+
+    /**
+     * Determine the classes that make up the provider and its services
+     *
+     * @param providerName - JCA provider name
+     * @return class names that make up the provider and its services
+     */
+    private List<String> registerProvider(String providerName) {
+        List<String> providerClasses = new ArrayList<>();
+        Provider provider = Security.getProvider(providerName);
+        if (provider != null) {
+            providerClasses.add(provider.getClass().getName());
+            for (Provider.Service service : provider.getServices()) {
+                providerClasses.add(service.getClassName());
+                // Need to pull in the key classes
+                String supportedKeyClasses = service.getAttribute("SupportedKeyClasses");
+                if (supportedKeyClasses != null) {
+                    providerClasses.addAll(Arrays.asList(supportedKeyClasses.split("\\|")));
+                }
+            }
+        }
+        return providerClasses;
+    }
+
     @BuildStep
     void registerSecurityInterceptors(BuildProducer<InterceptorBindingRegistrarBuildItem> registrars,
             BuildProducer<AdditionalBeanBuildItem> beans) {
         registrars.produce(new InterceptorBindingRegistrarBuildItem(new SecurityAnnotationsRegistrar()));
-        Class[] interceptors = { AuthenticatedInterceptor.class, DenyAllInterceptor.class, PermitAllInterceptor.class,
+        Class<?>[] interceptors = { AuthenticatedInterceptor.class, DenyAllInterceptor.class, PermitAllInterceptor.class,
                 RolesAllowedInterceptor.class };
         beans.produce(new AdditionalBeanBuildItem(interceptors));
         beans.produce(new AdditionalBeanBuildItem(SecurityHandler.class, SecurityConstrainer.class));
@@ -141,10 +226,12 @@ void transformSecurityAnnotations(BuildProducer<AnnotationsTransformerBuildItem>
     }
 
     @BuildStep
-    void gatherSecurityChecks(BuildProducer<BeanRegistrarBuildItem> beanRegistrars,
+    @Record(ExecutionTime.STATIC_INIT)
+    void gatherSecurityChecks(BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             BeanArchiveIndexBuildItem beanArchiveBuildItem,
             BuildProducer<ApplicationClassPredicateBuildItem> classPredicate,
             List<AdditionalSecuredClassesBuildIem> additionalSecuredClasses,
+            SecurityCheckRecorder recorder,
             List<AdditionalSecurityCheckBuildItem> additionalSecurityChecks, SecurityBuildTimeConfig config) {
         classPredicate.produce(new ApplicationClassPredicateBuildItem(new SecurityCheckStorage.AppPredicate()));
 
@@ -157,82 +244,53 @@ void gatherSecurityChecks(BuildProducer<BeanRegistrarBuildItem> beanRegistrars,
             });
         }
 
-        beanRegistrars.produce(new BeanRegistrarBuildItem(new BeanRegistrar() {
-
-            @Override
-            public void register(RegistrationContext registrationContext) {
-                IndexView index = beanArchiveBuildItem.getIndex();
-                Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> securityChecks = gatherSecurityAnnotations(
-                        index, additionalSecured, config.denyUnannotated);
-                for (AdditionalSecurityCheckBuildItem additionalSecurityCheck : additionalSecurityChecks) {
-                    securityChecks.put(additionalSecurityCheck.getMethodInfo(),
-                            additionalSecurityCheck.getSecurityCheckResultHandleCreator());
-                }
+        IndexView index = beanArchiveBuildItem.getIndex();
+        Map<MethodInfo, SecurityCheck> securityChecks = gatherSecurityAnnotations(
+                index, additionalSecured, config.denyUnannotated, recorder);
+        for (AdditionalSecurityCheckBuildItem additionalSecurityCheck : additionalSecurityChecks) {
+            securityChecks.put(additionalSecurityCheck.getMethodInfo(),
+                    additionalSecurityCheck.getSecurityCheck());
+        }
 
-                DotName name = DotName.createSimple(SecurityCheckStorage.class.getName());
-
-                BeanConfigurator<Object> configurator = registrationContext.configure(name);
-                configurator.addType(name);
-                configurator.scope(BuiltinScope.APPLICATION.getInfo());
-                configurator.creator(creator -> {
-                    ResultHandle storageBuilder = creator
-                            .newInstance(MethodDescriptor.ofConstructor(SecurityCheckStorageBuilder.class));
-                    for (Map.Entry<MethodInfo, Function<BytecodeCreator, ResultHandle>> methodEntry : securityChecks
-                            .entrySet()) {
-                        registerSecuredMethod(storageBuilder, creator, methodEntry);
-                    }
-                    ResultHandle ret = creator.invokeVirtualMethod(
-                            MethodDescriptor.ofMethod(SecurityCheckStorageBuilder.class, "create",
-                                    SecurityCheckStorage.class),
-                            storageBuilder);
-                    creator.returnValue(ret);
-                });
-                configurator.done();
+        RuntimeValue<SecurityCheckStorageBuilder> builder = recorder.newBuilder();
+        for (Map.Entry<MethodInfo, SecurityCheck> methodEntry : securityChecks
+                .entrySet()) {
+            MethodInfo method = methodEntry.getKey();
+            String[] params = new String[method.parameters().size()];
+            for (int i = 0; i < method.parameters().size(); ++i) {
+                params[i] = method.parameters().get(i).name().toString();
             }
-        }));
-    }
-
-    private void registerSecuredMethod(ResultHandle checkStorage,
-            MethodCreator methodCreator,
-            Map.Entry<MethodInfo, Function<BytecodeCreator, ResultHandle>> methodEntry) {
-        MethodInfo methodInfo = methodEntry.getKey();
-        ResultHandle declaringClass = methodCreator.load(methodInfo.declaringClass().name().toString());
-        ResultHandle methodName = methodCreator.load(methodInfo.name());
-        ResultHandle methodParamTypes = paramTypes(methodCreator, methodInfo.parameters());
-
-        methodCreator.invokeVirtualMethod(
-                MethodDescriptor.ofMethod(SecurityCheckStorageBuilder.class, "registerCheck", void.class, String.class,
-                        String.class, String[].class, SecurityCheck.class),
-                checkStorage,
-                declaringClass, methodName, methodParamTypes, methodEntry.getValue().apply(methodCreator));
-    }
-
-    private ResultHandle paramTypes(MethodCreator ctor, List<Type> parameters) {
-        ResultHandle result = ctor.newArray(String.class, parameters.size());
-
-        for (int i = 0; i < parameters.size(); i++) {
-            ctor.writeArrayValue(result, i, ctor.load(parameters.get(i).name().toString()));
+            recorder.addMethod(builder, method.declaringClass().name().toString(), method.name(), params,
+                    methodEntry.getValue());
         }
-
-        return result;
+        recorder.create(builder);
+
+        syntheticBeans.produce(
+                SyntheticBeanBuildItem.configure(SecurityCheckStorage.class)
+                        .scope(ApplicationScoped.class)
+                        .creator(creator -> {
+                            ResultHandle ret = creator.invokeStaticMethod(MethodDescriptor.ofMethod(SecurityCheckRecorder.class,
+                                    "getStorage", SecurityCheckStorage.class));
+                            creator.returnValue(ret);
+                        }).done());
     }
 
-    private Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> gatherSecurityAnnotations(
+    private Map<MethodInfo, SecurityCheck> gatherSecurityAnnotations(
             IndexView index,
-            Map<DotName, ClassInfo> additionalSecuredClasses, boolean denyUnannotated) {
+            Map<DotName, ClassInfo> additionalSecuredClasses, boolean denyUnannotated, SecurityCheckRecorder recorder) {
 
         Map<MethodInfo, AnnotationInstance> methodToInstanceCollector = new HashMap<>();
         Map<ClassInfo, AnnotationInstance> classAnnotations = new HashMap<>();
-        Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> result = new HashMap<>(gatherSecurityAnnotations(
+        Map<MethodInfo, SecurityCheck> result = new HashMap<>(gatherSecurityAnnotations(
                 index, DotNames.ROLES_ALLOWED, methodToInstanceCollector, classAnnotations,
-                (instance -> rolesAllowedSecurityCheck(instance.value().asStringArray()))));
+                (instance -> recorder.rolesAllowed(instance.value().asStringArray()))));
         result.putAll(gatherSecurityAnnotations(index, DotNames.PERMIT_ALL, methodToInstanceCollector, classAnnotations,
-                (instance -> permitAllSecurityCheck())));
+                (instance -> recorder.permitAll())));
         result.putAll(gatherSecurityAnnotations(index, DotNames.AUTHENTICATED, methodToInstanceCollector, classAnnotations,
-                (instance -> authenticatedSecurityCheck())));
+                (instance -> recorder.authenticated())));
 
         result.putAll(gatherSecurityAnnotations(index, DotNames.DENY_ALL, methodToInstanceCollector, classAnnotations,
-                (instance -> denyAllSecurityCheck())));
+                (instance -> recorder.denyAll())));
 
         /*
          * Handle additional secured classes by adding the denyAll check to all public non-static methods
@@ -245,7 +303,7 @@ private Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> gatherSecurityA
                 }
                 AnnotationInstance alreadyExistingInstance = methodToInstanceCollector.get(methodInfo);
                 if ((alreadyExistingInstance == null)) {
-                    result.put(methodInfo, denyAllSecurityCheck());
+                    result.put(methodInfo, recorder.denyAll());
                 } else if (alreadyExistingInstance.target().kind() == AnnotationTarget.Kind.CLASS) {
                     throw new IllegalStateException("Class " + methodInfo.declaringClass()
                             + " should not have been added as an additional secured class");
@@ -270,7 +328,7 @@ private Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> gatherSecurityA
                     if (methodToInstanceCollector.containsKey(methodInfo)) { // the method already has a security check
                         continue;
                     }
-                    result.put(methodInfo, denyAllSecurityCheck());
+                    result.put(methodInfo, recorder.denyAll());
                 }
             }
         }
@@ -283,13 +341,13 @@ private boolean isPublicNonStaticNonConstructor(MethodInfo methodInfo) {
                 && !"<init>".equals(methodInfo.name());
     }
 
-    private Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> gatherSecurityAnnotations(
+    private Map<MethodInfo, SecurityCheck> gatherSecurityAnnotations(
             IndexView index, DotName dotName,
             Map<MethodInfo, AnnotationInstance> alreadyCheckedMethods,
             Map<ClassInfo, AnnotationInstance> classLevelAnnotations,
-            Function<AnnotationInstance, Function<BytecodeCreator, ResultHandle>> securityCheckInstanceCreator) {
+            Function<AnnotationInstance, SecurityCheck> securityCheckInstanceCreator) {
 
-        Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> result = new HashMap<>();
+        Map<MethodInfo, SecurityCheck> result = new HashMap<>();
 
         Collection<AnnotationInstance> instances = index.getAnnotations(dotName);
         // make sure we process annotations on methods first
@@ -331,30 +389,6 @@ private Map<MethodInfo, Function<BytecodeCreator, ResultHandle>> gatherSecurityA
         return result;
     }
 
-    /**
-     * Determine the classes that make up the provider and its services
-     *
-     * @param providerName - JCA provider name
-     * @return class names that make up the provider and its services
-     */
-    private List<String> registerProvider(String providerName) {
-        ArrayList<String> providerClasses = new ArrayList<>();
-        Provider provider = Security.getProvider(providerName);
-        providerClasses.add(provider.getClass().getName());
-        Set<Provider.Service> services = provider.getServices();
-        for (Provider.Service service : services) {
-            String serviceClass = service.getClassName();
-            providerClasses.add(serviceClass);
-            // Need to pull in the key classes
-            String supportedKeyClasses = service.getAttribute("SupportedKeyClasses");
-            if (supportedKeyClasses != null) {
-                String[] keyClasses = supportedKeyClasses.split("\\|");
-                providerClasses.addAll(Arrays.asList(keyClasses));
-            }
-        }
-        return providerClasses;
-    }
-
     @BuildStep
     CapabilityBuildItem capability() {
         return new CapabilityBuildItem(Capability.SECURITY);
@@ -372,4 +406,9 @@ void registerAdditionalBeans(BuildProducer<AdditionalBeanBuildItem> beans) {
         beans.produce(AdditionalBeanBuildItem.unremovableOf(SecurityIdentityProxy.class));
         beans.produce(AdditionalBeanBuildItem.unremovableOf(X509IdentityProvider.class));
     }
+
+    @BuildStep
+    AdditionalBeanBuildItem authorizationController() {
+        return AdditionalBeanBuildItem.builder().addBeanClass(AuthorizationController.class).build();
+    }
 }
diff --git a/extensions/security/pom.xml b/extensions/security/pom.xml
index 022f2c65b4252..5de52522bb462 100644
--- a/extensions/security/pom.xml
+++ b/extensions/security/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/security/runtime-spi/pom.xml b/extensions/security/runtime-spi/pom.xml
index 2f71d8bdae548..cffacf35a78d2 100644
--- a/extensions/security/runtime-spi/pom.xml
+++ b/extensions/security/runtime-spi/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/security/runtime/pom.xml b/extensions/security/runtime/pom.xml
index ca9190ddff144..89bf5f8051527 100644
--- a/extensions/security/runtime/pom.xml
+++ b/extensions/security/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,6 +28,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus.security</groupId>
@@ -44,6 +44,11 @@
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusIdentityProviderManagerImpl.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusIdentityProviderManagerImpl.java
index 3a80fd1f32c2d..8f3b64e2115e0 100644
--- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusIdentityProviderManagerImpl.java
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusIdentityProviderManagerImpl.java
@@ -37,7 +37,7 @@ public class QuarkusIdentityProviderManagerImpl implements IdentityProviderManag
     private final AuthenticationRequestContext blockingRequestContext = new AuthenticationRequestContext() {
         @Override
         public Uni<SecurityIdentity> runBlocking(Supplier<SecurityIdentity> function) {
-            return Uni.createFrom().deferred(new Supplier<Uni<SecurityIdentity>>() {
+            return Uni.createFrom().deferred(new Supplier<Uni<? extends SecurityIdentity>>() {
                 @Override
                 public Uni<SecurityIdentity> get() {
                     if (BlockingOperationControl.isBlockingAllowed()) {
@@ -86,15 +86,19 @@ public void run() {
      * @return The first identity provider that was registered with this type
      */
     public Uni<SecurityIdentity> authenticate(AuthenticationRequest request) {
-        List<IdentityProvider> providers = this.providers.get(request.getClass());
-        if (providers == null) {
-            return Uni.createFrom().failure(new IllegalArgumentException(
-                    "No IdentityProviders were registered to handle AuthenticationRequest " + request));
-        }
-        if (providers.size() == 1) {
-            return handleSingleProvider(providers.get(0), request);
+        try {
+            List<IdentityProvider> providers = this.providers.get(request.getClass());
+            if (providers == null) {
+                return Uni.createFrom().failure(new IllegalArgumentException(
+                        "No IdentityProviders were registered to handle AuthenticationRequest " + request));
+            }
+            if (providers.size() == 1) {
+                return handleSingleProvider(providers.get(0), request);
+            }
+            return handleProvider(0, (List) providers, request, blockingRequestContext);
+        } catch (Throwable t) {
+            return Uni.createFrom().failure(t);
         }
-        return handleProvider(0, (List) providers, request, blockingRequestContext);
     }
 
     private Uni<SecurityIdentity> handleSingleProvider(IdentityProvider identityProvider, AuthenticationRequest request) {
@@ -137,7 +141,7 @@ private <T extends AuthenticationRequest> Uni<SecurityIdentity> handleProvider(i
         }
         IdentityProvider<T> current = providers.get(pos);
         Uni<SecurityIdentity> cs = current.authenticate(request, context)
-                .onItem().transformToUni(new Function<SecurityIdentity, Uni<SecurityIdentity>>() {
+                .onItem().transformToUni(new Function<SecurityIdentity, Uni<? extends SecurityIdentity>>() {
                     @Override
                     public Uni<SecurityIdentity> apply(SecurityIdentity securityIdentity) {
                         if (securityIdentity != null) {
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java
index a51d2c043e7bf..54638f3d978f2 100644
--- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java
@@ -120,6 +120,14 @@ public static Builder builder() {
         return new Builder();
     }
 
+    public static Builder builder(SecurityIdentity identity) {
+        return new Builder()
+                .addAttributes(identity.getAttributes())
+                .addCredentials(identity.getCredentials())
+                .addRoles(identity.getRoles())
+                .setPrincipal(identity.getPrincipal());
+    }
+
     public static class Builder {
 
         Principal principal;
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityCheckRecorder.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityCheckRecorder.java
new file mode 100644
index 0000000000000..a467e2bf93e8e
--- /dev/null
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityCheckRecorder.java
@@ -0,0 +1,53 @@
+package io.quarkus.security.runtime;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.security.runtime.interceptor.SecurityCheckStorage;
+import io.quarkus.security.runtime.interceptor.SecurityCheckStorageBuilder;
+import io.quarkus.security.runtime.interceptor.check.AuthenticatedCheck;
+import io.quarkus.security.runtime.interceptor.check.DenyAllCheck;
+import io.quarkus.security.runtime.interceptor.check.PermitAllCheck;
+import io.quarkus.security.runtime.interceptor.check.RolesAllowedCheck;
+import io.quarkus.security.runtime.interceptor.check.SecurityCheck;
+
+@Recorder
+public class SecurityCheckRecorder {
+
+    private static volatile SecurityCheckStorage storage;
+
+    public static SecurityCheckStorage getStorage() {
+        return storage;
+    }
+
+    public SecurityCheck denyAll() {
+        return DenyAllCheck.INSTANCE;
+    }
+
+    public SecurityCheck permitAll() {
+        return PermitAllCheck.INSTANCE;
+    }
+
+    public SecurityCheck rolesAllowed(String... roles) {
+        return RolesAllowedCheck.of(roles);
+    }
+
+    public SecurityCheck authenticated() {
+        return AuthenticatedCheck.INSTANCE;
+    }
+
+    public RuntimeValue<SecurityCheckStorageBuilder> newBuilder() {
+        return new RuntimeValue<>(new SecurityCheckStorageBuilder());
+    }
+
+    public void addMethod(RuntimeValue<SecurityCheckStorageBuilder> builder, String className,
+            String methodName,
+            String[] parameterTypes,
+            SecurityCheck securityCheck) {
+        builder.getValue().registerCheck(className, methodName, parameterTypes, securityCheck);
+    }
+
+    public void create(RuntimeValue<SecurityCheckStorageBuilder> builder) {
+        storage = builder.getValue().create();
+    }
+
+}
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java
index 25e7628c9c925..c1af7b173816d 100644
--- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityIdentityAssociation.java
@@ -3,10 +3,10 @@
 import java.security.Principal;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
+import io.quarkus.runtime.BlockingOperationControl;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
@@ -36,7 +36,7 @@ public String getName() {
     }
 
     @Override
-    public void setIdentity(@Observes SecurityIdentity identity) {
+    public void setIdentity(SecurityIdentity identity) {
         this.identity = identity;
         this.deferredIdentity = null;
     }
@@ -48,14 +48,27 @@ public void setIdentity(Uni<SecurityIdentity> identity) {
     }
 
     public Uni<SecurityIdentity> getDeferredIdentity() {
-        return deferredIdentity;
+        if (deferredIdentity != null) {
+            return deferredIdentity;
+        } else if (identity != null) {
+            return Uni.createFrom().item(identity);
+        } else {
+            return deferredIdentity = identityProviderManager.authenticate(AnonymousAuthenticationRequest.INSTANCE);
+        }
     }
 
     @Override
     public SecurityIdentity getIdentity() {
         if (identity == null) {
             if (deferredIdentity != null) {
-                identity = deferredIdentity.await().indefinitely();
+                if (BlockingOperationControl.isBlockingAllowed()) {
+                    identity = deferredIdentity.await().indefinitely();
+                } else {
+                    throw new RuntimeException("Cannot call getIdentity() from the IO thread when lazy authentication " +
+                            "is in use, as resolving the identity may block the thread. Instead you should inject the " +
+                            "CurrentIdentityAssociation, call CurrentIdentityAssociation#getDeferredIdentity() and " +
+                            "subscribe to the Uni.");
+                }
             }
             if (identity == null) {
                 identity = identityProviderManager.authenticate(AnonymousAuthenticationRequest.INSTANCE).await().indefinitely();
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityProviderRecorder.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityProviderRecorder.java
new file mode 100644
index 0000000000000..01eb8e2c6bc88
--- /dev/null
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityProviderRecorder.java
@@ -0,0 +1,37 @@
+package io.quarkus.security.runtime;
+
+import static io.quarkus.security.runtime.SecurityProviderUtils.addProvider;
+import static io.quarkus.security.runtime.SecurityProviderUtils.findProviderIndex;
+import static io.quarkus.security.runtime.SecurityProviderUtils.insertProvider;
+import static io.quarkus.security.runtime.SecurityProviderUtils.loadProvider;
+import static io.quarkus.security.runtime.SecurityProviderUtils.loadProviderWithParams;
+
+import java.security.Provider;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class SecurityProviderRecorder {
+    public void addBouncyCastleProvider(boolean inFipsMode) {
+        final String providerName = inFipsMode ? SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_CLASS_NAME
+                : SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME;
+        addProvider(loadProvider(providerName));
+    }
+
+    public void addBouncyCastleJsseProvider() {
+        Provider bc = loadProvider(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME);
+        Provider bcJsse = loadProvider(SecurityProviderUtils.BOUNCYCASTLE_JSSE_PROVIDER_CLASS_NAME);
+        int sunJsseIndex = findProviderIndex(SecurityProviderUtils.SUN_JSSE_PROVIDER_NAME);
+        insertProvider(bc, sunJsseIndex);
+        insertProvider(bcJsse, sunJsseIndex + 1);
+    }
+
+    public void addBouncyCastleFipsJsseProvider() {
+        Provider bc = loadProvider(SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_CLASS_NAME);
+        int sunIndex = findProviderIndex(SecurityProviderUtils.SUN_PROVIDER_NAME);
+        insertProvider(bc, sunIndex);
+        Provider bcJsse = loadProviderWithParams(SecurityProviderUtils.BOUNCYCASTLE_JSSE_PROVIDER_CLASS_NAME,
+                new Class[] { boolean.class, Provider.class }, new Object[] { true, bc });
+        insertProvider(bcJsse, sunIndex + 1);
+    }
+}
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityProviderUtils.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityProviderUtils.java
new file mode 100644
index 0000000000000..c258bdae25fdb
--- /dev/null
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/SecurityProviderUtils.java
@@ -0,0 +1,72 @@
+package io.quarkus.security.runtime;
+
+import java.lang.reflect.Constructor;
+import java.security.Provider;
+import java.security.Security;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+
+public final class SecurityProviderUtils {
+    public static final String SUN_PROVIDER_NAME = "SUN";
+    public static final String SUN_JSSE_PROVIDER_NAME = "SunJSSE";
+    public static final String SUN_JSSE_PROVIDER_CLASS_NAME = "com.sun.net.ssl.internal.ssl.Provider";
+    public static final String BOUNCYCASTLE_PROVIDER_NAME = "BC";
+    public static final String BOUNCYCASTLE_JSSE_PROVIDER_NAME = BOUNCYCASTLE_PROVIDER_NAME + "JSSE";
+    public static final String BOUNCYCASTLE_FIPS_PROVIDER_NAME = "BCFIPS";
+    public static final String BOUNCYCASTLE_FIPS_JSSE_PROVIDER_NAME = BOUNCYCASTLE_FIPS_PROVIDER_NAME + "JSSE";
+    public static final String BOUNCYCASTLE_PROVIDER_CLASS_NAME = "org.bouncycastle.jce.provider.BouncyCastleProvider";
+    public static final String BOUNCYCASTLE_JSSE_PROVIDER_CLASS_NAME = "org.bouncycastle.jsse.provider.BouncyCastleJsseProvider";
+    public static final String BOUNCYCASTLE_FIPS_PROVIDER_CLASS_NAME = "org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider";
+
+    private SecurityProviderUtils() {
+
+    }
+
+    public static void addProvider(Provider provider) {
+        try {
+            Security.addProvider(provider);
+        } catch (Exception t) {
+            final String errorMessage = String.format("Security provider %s can not be added", provider.getName());
+            throw new ConfigurationException(errorMessage, t);
+        }
+    }
+
+    public static void insertProvider(Provider provider, int index) {
+        try {
+            Security.insertProviderAt(provider, index);
+        } catch (Exception t) {
+            final String errorMessage = String.format("Security provider %s can not be inserted", provider.getName());
+            throw new ConfigurationException(errorMessage, t);
+        }
+    }
+
+    public static Provider loadProvider(String providerClassName) {
+        try {
+            return (Provider) Thread.currentThread().getContextClassLoader().loadClass(providerClassName).newInstance();
+        } catch (Exception t) {
+            final String errorMessage = String.format("Security provider %s can not be registered", providerClassName);
+            throw new ConfigurationException(errorMessage, t);
+        }
+    }
+
+    public static Provider loadProviderWithParams(String providerClassName, Class<?>[] paramClasses, Object[] params) {
+        try {
+            Constructor<?> c = Thread.currentThread().getContextClassLoader().loadClass(providerClassName)
+                    .getConstructor(paramClasses);
+            return (Provider) c.newInstance(params);
+        } catch (Exception t) {
+            final String errorMessage = String.format("Security provider %s can not be registered", providerClassName);
+            throw new ConfigurationException(errorMessage, t);
+        }
+    }
+
+    public static int findProviderIndex(String providerName) {
+        Provider[] providers = Security.getProviders();
+        for (int i = 0; i < providers.length; i++) {
+            if (providerName.equals(providers[i].getName())) {
+                return i + 1;
+            }
+        }
+        return 1;
+    }
+}
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/SupplierRolesAllowedCheck.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/SupplierRolesAllowedCheck.java
new file mode 100644
index 0000000000000..156c9d983ca43
--- /dev/null
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/SupplierRolesAllowedCheck.java
@@ -0,0 +1,40 @@
+package io.quarkus.security.runtime.interceptor.check;
+
+import java.lang.reflect.Method;
+import java.util.function.Supplier;
+
+import io.quarkus.security.ForbiddenException;
+import io.quarkus.security.UnauthorizedException;
+import io.quarkus.security.identity.SecurityIdentity;
+
+public class SupplierRolesAllowedCheck implements SecurityCheck {
+
+    private final Supplier<String[]> allowedRolesSupplier;
+
+    private volatile String[] allowedRoles;
+
+    public SupplierRolesAllowedCheck(Supplier<String[]> allowedRolesSupplier) {
+        this.allowedRolesSupplier = allowedRolesSupplier;
+    }
+
+    @Override
+    public void apply(SecurityIdentity identity, Method method, Object[] parameters) {
+        if (allowedRoles == null) {
+            synchronized (this) {
+                if (allowedRoles == null) {
+                    allowedRoles = allowedRolesSupplier.get();
+                }
+            }
+        }
+        for (String role : allowedRoles) {
+            if (identity.hasRole(role) || ("**".equals(role) && !identity.isAnonymous())) {
+                return;
+            }
+        }
+        if (identity.isAnonymous()) {
+            throw new UnauthorizedException();
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+}
diff --git a/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java b/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java
new file mode 100644
index 0000000000000..c1704c16b5ef7
--- /dev/null
+++ b/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.security.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.security.credential.PasswordCredential;
+import io.quarkus.security.identity.SecurityIdentity;
+
+public class QuarkusSecurityIdentityTest {
+
+    @Test
+    public void testCopyIdentity() throws Exception {
+        SecurityIdentity identity1 = QuarkusSecurityIdentity.builder()
+                .setPrincipal(new QuarkusPrincipal("alice"))
+                .addRole("admin")
+                .addCredential(new PasswordCredential("password".toCharArray()))
+                .addAttribute("key", "value")
+                .build();
+
+        SecurityIdentity identity2 = QuarkusSecurityIdentity.builder(identity1).build();
+
+        assertEquals(identity1.getAttributes(), identity2.getAttributes());
+        assertEquals(identity1.getPrincipal(), identity2.getPrincipal());
+        assertEquals(identity1.getCredentials(), identity2.getCredentials());
+        assertEquals(identity1.getRoles(), identity2.getRoles());
+    }
+}
diff --git a/extensions/security/spi/pom.xml b/extensions/security/spi/pom.xml
index ffcb11b1be061..a3045dbbb5f9e 100644
--- a/extensions/security/spi/pom.xml
+++ b/extensions/security/spi/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,6 +17,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus.security</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/SecurityTransformerUtils.java b/extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java
similarity index 97%
rename from extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/SecurityTransformerUtils.java
rename to extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java
index 9a02dc7da4b86..34d5452a4d49d 100644
--- a/extensions/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/SecurityTransformerUtils.java
+++ b/extensions/security/spi/src/main/java/io/quarkus/security/spi/SecurityTransformerUtils.java
@@ -1,4 +1,4 @@
-package io.quarkus.resteasy.deployment;
+package io.quarkus.security.spi;
 
 import static java.util.Arrays.asList;
 
diff --git a/extensions/security/test-utils/pom.xml b/extensions/security/test-utils/pom.xml
index 8302ce60c8c2f..a9f36124f8775 100644
--- a/extensions/security/test-utils/pom.xml
+++ b/extensions/security/test-utils/pom.xml
@@ -6,13 +6,16 @@
         <artifactId>quarkus-security-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-security-test-utils</artifactId>
     <name>Quarkus - Security - Test Utilities</name>
 
+    <properties>
+        <enforce-test-deps-scope.skip>true</enforce-test-deps-scope.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/smallrye-context-propagation/deployment/pom.xml b/extensions/smallrye-context-propagation/deployment/pom.xml
index 283a65f17d206..1cc9af0cfcb62 100644
--- a/extensions/smallrye-context-propagation/deployment/pom.xml
+++ b/extensions/smallrye-context-propagation/deployment/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-smallrye-context-propagation-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java
index 6d59bfbb87ee8..209400682545e 100644
--- a/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java
+++ b/extensions/smallrye-context-propagation/deployment/src/main/java/io/quarkus/smallrye/context/deployment/SmallRyeContextPropagationProcessor.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.context.ManagedExecutor;
 import org.eclipse.microprofile.context.spi.ContextManagerExtension;
@@ -23,6 +23,7 @@
 import io.quarkus.deployment.util.ServiceUtil;
 import io.quarkus.smallrye.context.runtime.SmallRyeContextPropagationProvider;
 import io.quarkus.smallrye.context.runtime.SmallRyeContextPropagationRecorder;
+import io.smallrye.context.SmallRyeManagedExecutor;
 
 /**
  * The deployment processor for MP-CP applications
@@ -76,7 +77,11 @@ void build(SmallRyeContextPropagationRecorder recorder,
 
         // Synthetic bean for ManagedExecutor
         syntheticBeans.produce(
-                SyntheticBeanBuildItem.configure(ManagedExecutor.class).scope(Singleton.class).defaultBean().unremovable()
+                SyntheticBeanBuildItem.configure(SmallRyeManagedExecutor.class)
+                        .scope(ApplicationScoped.class)
+                        .addType(ManagedExecutor.class)
+                        .defaultBean()
+                        .unremovable()
                         .supplier(recorder.initializeManagedExecutor(executorBuildItem.getExecutorProxy()))
                         .setRuntimeInit().done());
 
diff --git a/extensions/smallrye-context-propagation/pom.xml b/extensions/smallrye-context-propagation/pom.xml
index 166819b3e5dde..3206cecd3aa44 100644
--- a/extensions/smallrye-context-propagation/pom.xml
+++ b/extensions/smallrye-context-propagation/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-context-propagation/runtime/pom.xml b/extensions/smallrye-context-propagation/runtime/pom.xml
index b0383953e4cce..5fedc6cb06eaf 100644
--- a/extensions/smallrye-context-propagation/runtime/pom.xml
+++ b/extensions/smallrye-context-propagation/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-context-propagation-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java
index bdafe1a0d7b96..8324186dbca2e 100644
--- a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java
+++ b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java
@@ -7,6 +7,7 @@
 import org.eclipse.microprofile.context.ThreadContext;
 
 import io.quarkus.arc.DefaultBean;
+import io.smallrye.context.SmallRyeThreadContext;
 
 @Dependent
 public class SmallRyeContextPropagationProvider {
@@ -14,8 +15,9 @@ public class SmallRyeContextPropagationProvider {
     @Produces
     @Singleton
     @DefaultBean
-    public ThreadContext getAllThreadContext() {
-        return ThreadContext.builder().propagated(ThreadContext.ALL_REMAINING).cleared().unchanged().build();
+    public SmallRyeThreadContext getAllThreadContext() {
+        return (SmallRyeThreadContext) ThreadContext.builder().propagated(ThreadContext.ALL_REMAINING).cleared().unchanged()
+                .build();
     }
 
 }
diff --git a/extensions/smallrye-fault-tolerance/deployment/pom.xml b/extensions/smallrye-fault-tolerance/deployment/pom.xml
index 84e5bdc1eefc8..bd3222d58a2d6 100644
--- a/extensions/smallrye-fault-tolerance/deployment/pom.xml
+++ b/extensions/smallrye-fault-tolerance/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-fault-tolerance-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,10 +29,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-fault-tolerance</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java
index 39f51b288f9d4..1318187f4b5e2 100644
--- a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java
+++ b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/SmallRyeFaultToleranceProcessor.java
@@ -2,6 +2,7 @@
 
 import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
 
@@ -35,8 +36,6 @@
 import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
-import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -49,6 +48,7 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
 import io.quarkus.smallrye.faulttolerance.runtime.NoopMetricRegistry;
 import io.quarkus.smallrye.faulttolerance.runtime.QuarkusFallbackHandlerProvider;
 import io.quarkus.smallrye.faulttolerance.runtime.QuarkusFaultToleranceOperationProvider;
@@ -80,7 +80,7 @@ public void build(BuildProducer<AnnotationsTransformerBuildItem> annotationsTran
             BuildProducer<FeatureBuildItem> feature, BuildProducer<AdditionalBeanBuildItem> additionalBean,
             BuildProducer<ServiceProviderBuildItem> serviceProvider,
             BuildProducer<BeanDefiningAnnotationBuildItem> additionalBda,
-            Capabilities capabilities,
+            Optional<MetricsCapabilityBuildItem> metricsCapability,
             BuildProducer<SystemPropertyBuildItem> systemProperty,
             CombinedIndexBuildItem combinedIndexBuildItem,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
@@ -150,7 +150,7 @@ public void transform(TransformationContext context) {
                 MetricsCollectorFactory.class);
         additionalBean.produce(builder.build());
 
-        if (!capabilities.isPresent(Capability.METRICS)) {
+        if (!metricsCapability.isPresent()) {
             //disable fault tolerance metrics with the MP sys props and provides a No-op metric registry.
             additionalBean.produce(AdditionalBeanBuildItem.builder().addBeanClass(NoopMetricRegistry.class).setRemovable()
                     .setDefaultScope(DotName.createSimple(Singleton.class.getName())).build());
diff --git a/extensions/smallrye-fault-tolerance/pom.xml b/extensions/smallrye-fault-tolerance/pom.xml
index 5888e8da32958..b297446b0d4d3 100644
--- a/extensions/smallrye-fault-tolerance/pom.xml
+++ b/extensions/smallrye-fault-tolerance/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-fault-tolerance/runtime/pom.xml b/extensions/smallrye-fault-tolerance/runtime/pom.xml
index a59c9f6aea6af..8554fedcd4066 100644
--- a/extensions/smallrye-fault-tolerance/runtime/pom.xml
+++ b/extensions/smallrye-fault-tolerance/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-fault-tolerance-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -56,6 +55,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java
deleted file mode 100644
index e5aa9b8c78987..0000000000000
--- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.smallrye.faulttolerance.runtime.graal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-public class FaultToleranceSubstitutions {
-}
-
-@TargetClass(className = "io.smallrye.faulttolerance.DefaultMethodFallbackProvider")
-final class Target_io_smallrye_faulttolerance_DefaultMethodFallbackProvider {
-
-    @TargetClass(className = "io.smallrye.faulttolerance.ExecutionContextWithInvocationContext")
-    static final class Target_io_smallrye_faulttolerance_ExecutionContextWithInvocationContext {
-
-    }
-
-    @Substitute
-    static Object getFallback(Method fallbackMethod,
-            Target_io_smallrye_faulttolerance_ExecutionContextWithInvocationContext ctx)
-            throws IllegalAccessException, InstantiationException, IllegalArgumentException, InvocationTargetException,
-            Throwable {
-        throw new RuntimeException("Not implemented in native mode");
-    }
-}
diff --git a/extensions/smallrye-graphql/deployment/pom.xml b/extensions/smallrye-graphql/deployment/pom.xml
index e3541a7e12c2c..cf6474ef19815 100644
--- a/extensions/smallrye-graphql/deployment/pom.xml
+++ b/extensions/smallrye-graphql/deployment/pom.xml
@@ -48,6 +48,11 @@
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-graphql-ui-graphiql</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation-deployment</artifactId>
+        </dependency>
         
         <!--  Test dependencies -->
         <dependency>
@@ -62,22 +67,27 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-opentracing-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-opentracing</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elytron-security</artifactId>
+            <artifactId>quarkus-elytron-security-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elytron-security-properties-file</artifactId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLBuildItem.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLBuildItem.java
new file mode 100644
index 0000000000000..11cc5e3f4e1cf
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLBuildItem.java
@@ -0,0 +1,22 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class SmallRyeGraphQLBuildItem extends SimpleBuildItem {
+
+    private final String graphqlUiFinalDestination;
+    private final String graphqlUiPath;
+
+    public SmallRyeGraphQLBuildItem(String graphqlUiFinalDestination, String graphqlUiPath) {
+        this.graphqlUiFinalDestination = graphqlUiFinalDestination;
+        this.graphqlUiPath = graphqlUiPath;
+    }
+
+    public String getGraphqlUiFinalDestination() {
+        return graphqlUiFinalDestination;
+    }
+
+    public String getGraphqlUiPath() {
+        return graphqlUiPath;
+    }
+}
\ No newline at end of file
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLConfig.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLConfig.java
index ab5e72ade0e55..481963c940d1c 100644
--- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLConfig.java
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLConfig.java
@@ -1,26 +1,54 @@
 package io.quarkus.smallrye.graphql.deployment;
 
+import java.util.Optional;
+
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.graphql.schema.helper.TypeAutoNameStrategy;
 
 @ConfigRoot(name = "smallrye-graphql")
 public class SmallRyeGraphQLConfig {
 
     /**
-     * The rootPath under which queries will be served. Default to /graphql
+     * The rootPath under which queries will be served. Default to graphql
+     * By default, this value will be resolved as a path relative to `${quarkus.http.root-path}`.
      */
-    @ConfigItem(defaultValue = "/graphql")
+    @ConfigItem(defaultValue = "graphql")
     String rootPath;
 
     /**
-     * Enable metrics
+     * Enable metrics. By default this will be enabled if the metrics extension is added.
+     */
+    @ConfigItem(name = "metrics.enabled")
+    Optional<Boolean> metricsEnabled;
+
+    /**
+     * Enable tracing. By default this will be enabled if the tracing extension is added.
+     */
+    @ConfigItem(name = "tracing.enabled")
+    Optional<Boolean> tracingEnabled;
+
+    /**
+     * Enable validation. By default this will be enabled if the Hibernate Validator extension is added.
+     */
+    @ConfigItem(name = "validation.enabled")
+    Optional<Boolean> validationEnabled;
+
+    /**
+     * Enable eventing. Allow you to receive events on bootstrap and execution.
+     */
+    @ConfigItem(name = "events.enabled", defaultValue = "false")
+    boolean eventsEnabled;
+
+    /**
+     * Change the type naming strategy.
      */
-    @ConfigItem(name = "metrics.enabled", defaultValue = "false")
-    boolean metricsEnabled;
+    @ConfigItem(defaultValue = "Default")
+    TypeAutoNameStrategy autoNameStrategy;
 
     /**
-     * UI configuration
+     * SmallRye GraphQL UI configuration
      */
     @ConfigItem
     @ConfigDocSection
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLInitializedBuildItem.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLInitializedBuildItem.java
new file mode 100644
index 0000000000000..d0000c5862aff
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLInitializedBuildItem.java
@@ -0,0 +1,17 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+
+final class SmallRyeGraphQLInitializedBuildItem extends SimpleBuildItem {
+
+    private final RuntimeValue<Boolean> initialized;
+
+    public SmallRyeGraphQLInitializedBuildItem(RuntimeValue<Boolean> initialized) {
+        this.initialized = initialized;
+    }
+
+    public RuntimeValue<Boolean> getInitialized() {
+        return initialized;
+    }
+}
\ No newline at end of file
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
index 12588bef28071..4eb7c535760b4 100644
--- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
@@ -1,25 +1,18 @@
 package io.quarkus.smallrye.graphql.deployment;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.logging.Logger;
 
@@ -28,17 +21,18 @@
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.model.AppDependency;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
@@ -49,17 +43,19 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
-import io.quarkus.deployment.util.FileUtil;
-import io.quarkus.deployment.util.IoUtil;
-import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.deployment.util.WebJarUtil;
 import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLRecorder;
+import io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLRuntimeConfig;
+import io.quarkus.vertx.http.deployment.BodyHandlerBuildItem;
 import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
-import io.quarkus.vertx.http.deployment.RequireBodyHandlerBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
-import io.quarkus.vertx.http.runtime.HandlerType;
 import io.smallrye.graphql.cdi.config.ConfigKey;
 import io.smallrye.graphql.cdi.config.GraphQLConfig;
 import io.smallrye.graphql.cdi.producer.GraphQLProducer;
@@ -67,13 +63,15 @@
 import io.smallrye.graphql.schema.SchemaBuilder;
 import io.smallrye.graphql.schema.model.Argument;
 import io.smallrye.graphql.schema.model.Field;
+import io.smallrye.graphql.schema.model.Group;
 import io.smallrye.graphql.schema.model.InputType;
 import io.smallrye.graphql.schema.model.InterfaceType;
 import io.smallrye.graphql.schema.model.Operation;
+import io.smallrye.graphql.schema.model.Reference;
 import io.smallrye.graphql.schema.model.Schema;
 import io.smallrye.graphql.schema.model.Type;
+import io.smallrye.graphql.spi.EventingService;
 import io.smallrye.graphql.spi.LookupService;
-import io.smallrye.graphql.spi.SchemaBuildingExtensionService;
 import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 
@@ -83,26 +81,49 @@
  */
 public class SmallRyeGraphQLProcessor {
     private static final Logger LOG = Logger.getLogger(SmallRyeGraphQLProcessor.class);
-    private static final String SCHEMA_PATH = "/schema.graphql";
-    private static final String SPI_PATH = "META-INF/services/";
+    private static final String SCHEMA_PATH = "schema.graphql";
+
+    // For Service integration
+    private static final String SERVICE_NOT_AVAILABLE_WARNING = "The %s property is true, but the %s extension is not present. SmallRye GraphQL %s will be disabled.";
+    private static final String TRUE = "true";
+    private static final String FALSE = "false";
 
     // For the UI
     private static final String GRAPHQL_UI_WEBJAR_GROUP_ID = "io.smallrye";
     private static final String GRAPHQL_UI_WEBJAR_ARTIFACT_ID = "smallrye-graphql-ui-graphiql";
-    private static final String GRAPHQL_UI_WEBJAR_PREFIX = "META-INF/resources/graphql-ui";
-    private static final String OWN_MEDIA_FOLDER = "META-INF/resources/";
+    private static final String GRAPHQL_UI_WEBJAR_PREFIX = "META-INF/resources/graphql-ui/";
     private static final String GRAPHQL_UI_FINAL_DESTINATION = "META-INF/graphql-ui-files";
-    private static final String TEMP_DIR_PREFIX = "quarkus-graphql-ui_" + System.nanoTime();
-    private static final List<String> IGNORE_LIST = Arrays.asList("logo.png", "favicon.ico");
     private static final String FILE_TO_UPDATE = "render.js";
-
-    SmallRyeGraphQLConfig quarkusConfig;
+    private static final String LINE_TO_UPDATE = "const api = '";
+    private static final String LINE_FORMAT = LINE_TO_UPDATE + "%s';";
+    private static final String UI_LINE_TO_UPDATE = "const ui = '";
+    private static final String UI_LINE_FORMAT = UI_LINE_TO_UPDATE + "%s';";
+
+    // Branding files to monitor for changes
+    private static final String BRANDING_DIR = "META-INF/branding/";
+    private static final String BRANDING_LOGO_GENERAL = BRANDING_DIR + "logo.png";
+    private static final String BRANDING_LOGO_MODULE = BRANDING_DIR + "smallrye-graphql-ui-graphiql.png";
+    private static final String BRANDING_STYLE_GENERAL = BRANDING_DIR + "style.css";
+    private static final String BRANDING_STYLE_MODULE = BRANDING_DIR + "smallrye-graphql-ui-graphiql.css";
+    private static final String BRANDING_FAVICON_GENERAL = BRANDING_DIR + "favicon.ico";
+    private static final String BRANDING_FAVICON_MODULE = BRANDING_DIR + "smallrye-graphql-ui-graphiql.ico";
 
     @BuildStep
     void feature(BuildProducer<FeatureBuildItem> featureProducer) {
         featureProducer.produce(new FeatureBuildItem(Feature.SMALLRYE_GRAPHQL));
     }
 
+    @BuildStep
+    List<HotDeploymentWatchedFileBuildItem> brandingFiles() {
+        return Stream.of(BRANDING_LOGO_GENERAL,
+                BRANDING_STYLE_GENERAL,
+                BRANDING_FAVICON_GENERAL,
+                BRANDING_LOGO_MODULE,
+                BRANDING_STYLE_MODULE,
+                BRANDING_FAVICON_MODULE).map(HotDeploymentWatchedFileBuildItem::new)
+                .collect(Collectors.toList());
+    }
+
     @BuildStep
     void additionalBeanDefiningAnnotation(BuildProducer<BeanDefiningAnnotationBuildItem> beanDefiningAnnotationProducer) {
         // Make ArC discover the beans marked with the @GraphQlApi qualifier
@@ -125,20 +146,10 @@ void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) {
     @BuildStep
     void registerNativeImageResources(BuildProducer<ServiceProviderBuildItem> serviceProvider) throws IOException {
         // Lookup Service (We use the one from the CDI Module)
-        String lookupService = SPI_PATH + LookupService.class.getName();
-        Set<String> lookupImplementations = ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(),
-                lookupService);
-        serviceProvider.produce(
-                new ServiceProviderBuildItem(LookupService.class.getName(), lookupImplementations.toArray(new String[0])));
-
-        // Schema Extension Service (We use the one from the CDI Module)
-        String schemaExtensionService = SPI_PATH + SchemaBuildingExtensionService.class.getName();
-        Set<String> schemaExtensionImplementations = ServiceUtil.classNamesNamedIn(
-                Thread.currentThread().getContextClassLoader(),
-                schemaExtensionService);
-        serviceProvider.produce(
-                new ServiceProviderBuildItem(SchemaBuildingExtensionService.class.getName(),
-                        schemaExtensionImplementations.toArray(new String[0])));
+        serviceProvider.produce(ServiceProviderBuildItem.allProvidersFromClassPath(LookupService.class.getName()));
+
+        // Eventing Service (We use the one from the CDI Module)
+        serviceProvider.produce(ServiceProviderBuildItem.allProvidersFromClassPath(EventingService.class.getName()));
     }
 
     @Record(ExecutionTime.STATIC_INIT)
@@ -146,64 +157,58 @@ void registerNativeImageResources(BuildProducer<ServiceProviderBuildItem> servic
     void buildExecutionService(
             BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchyProducer,
+            BuildProducer<SmallRyeGraphQLInitializedBuildItem> graphQLInitializedProducer,
             SmallRyeGraphQLRecorder recorder,
             BeanContainerBuildItem beanContainer,
-            CombinedIndexBuildItem combinedIndex) {
+            CombinedIndexBuildItem combinedIndex,
+            SmallRyeGraphQLConfig graphQLConfig) {
 
         IndexView index = combinedIndex.getIndex();
-        Schema schema = SchemaBuilder.build(index);
 
-        recorder.createExecutionService(beanContainer.getValue(), schema);
+        Schema schema = SchemaBuilder.build(index, graphQLConfig.autoNameStrategy);
+
+        RuntimeValue<Boolean> initialized = recorder.createExecutionService(beanContainer.getValue(), schema);
+        graphQLInitializedProducer.produce(new SmallRyeGraphQLInitializedBuildItem(initialized));
 
         // Make sure the complex object from the application can work in native mode
-        for (String c : getClassesToRegisterForReflection(schema)) {
-            DotName name = DotName.createSimple(c);
-            org.jboss.jandex.Type type = org.jboss.jandex.Type.create(name, org.jboss.jandex.Type.Kind.CLASS);
-            reflectiveHierarchyProducer.produce(new ReflectiveHierarchyBuildItem(type, index));
-        }
+        reflectiveClassProducer.produce(new ReflectiveClassBuildItem(true, true, getSchemaJavaClasses(schema)));
 
         // Make sure the GraphQL Java classes needed for introspection can work in native mode
         reflectiveClassProducer.produce(new ReflectiveClassBuildItem(true, true, getGraphQLJavaClasses()));
     }
 
+    @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    void activateMetrics(Capabilities capabilities,
-            SmallRyeGraphQLConfig smallRyeGraphQLConfig,
-            BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
-            BuildProducer<SystemPropertyBuildItem> systemProperties) {
-        if (smallRyeGraphQLConfig.metricsEnabled) {
-            if (capabilities.isPresent(Capability.METRICS)) {
-                unremovableBeans.produce(new UnremovableBeanBuildItem(
-                        new UnremovableBeanBuildItem.BeanClassNameExclusion("io.smallrye.metrics.MetricsRegistryImpl")));
-                unremovableBeans.produce(new UnremovableBeanBuildItem(
-                        new UnremovableBeanBuildItem.BeanClassNameExclusion("io.smallrye.metrics.MetricRegistries")));
-                systemProperties.produce(new SystemPropertyBuildItem("smallrye.graphql.metrics.enabled", "true"));
-            } else {
-                LOG.warn("The quarkus.smallrye-graphql.metrics.enabled property is true, but the quarkus-smallrye-metrics " +
-                        "dependency is not present.");
-                systemProperties.produce(new SystemPropertyBuildItem("smallrye.graphql.metrics.enabled", "false"));
-            }
-        } else {
-            systemProperties.produce(new SystemPropertyBuildItem("smallrye.graphql.metrics.enabled", "false"));
-        }
-    }
+    void buildSchemaEndpoint(
+            BuildProducer<RouteBuildItem> routeProducer,
+            HttpRootPathBuildItem httpRootPathBuildItem,
+            SmallRyeGraphQLInitializedBuildItem graphQLInitializedBuildItem,
+            SmallRyeGraphQLRecorder recorder,
+            SmallRyeGraphQLConfig graphQLConfig) {
+
+        Handler<RoutingContext> schemaHandler = recorder.schemaHandler(graphQLInitializedBuildItem.getInitialized());
+
+        routeProducer.produce(httpRootPathBuildItem.routeBuilder()
+                .nestedRoute(graphQLConfig.rootPath, SCHEMA_PATH)
+                .handler(schemaHandler)
+                .displayOnNotFoundPage("MicroProfile GraphQL Schema")
+                .blockingRoute()
+                .build());
 
-    @BuildStep
-    void requireBody(BuildProducer<RequireBodyHandlerBuildItem> requireBodyHandlerProducer) {
-        // Because we need to read the body
-        requireBodyHandlerProducer.produce(new RequireBodyHandlerBuildItem());
     }
 
-    @Record(ExecutionTime.STATIC_INIT)
+    @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    void buildEndpoints(
+    @Consume(BeanContainerBuildItem.class)
+    void buildExecutionEndpoint(
             BuildProducer<RouteBuildItem> routeProducer,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> notFoundPageDisplayableEndpointProducer,
-            LaunchModeBuildItem launchMode,
+            HttpRootPathBuildItem httpRootPathBuildItem,
+            SmallRyeGraphQLInitializedBuildItem graphQLInitializedBuildItem,
             SmallRyeGraphQLRecorder recorder,
             ShutdownContextBuildItem shutdownContext,
-            BeanContainerBuildItem beanContainerBuildItem // don't remove this - makes sure beanContainer is initialized
-    ) {
+            LaunchModeBuildItem launchMode,
+            BodyHandlerBuildItem bodyHandlerBuildItem,
+            SmallRyeGraphQLConfig graphQLConfig) {
 
         /*
          * <em>Ugly Hack</em>
@@ -217,43 +222,34 @@ void buildEndpoints(
         if (launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT) {
             recorder.setupClDevMode(shutdownContext);
         }
-        // add graphql endpoint for not found display in dev or test mode
-        if (launchMode.getLaunchMode().isDevOrTest()) {
-            notFoundPageDisplayableEndpointProducer
-                    .produce(new NotFoundPageDisplayableEndpointBuildItem(quarkusConfig.rootPath));
-            notFoundPageDisplayableEndpointProducer
-                    .produce(new NotFoundPageDisplayableEndpointBuildItem(quarkusConfig.rootPath + SCHEMA_PATH));
-        }
 
         Boolean allowGet = ConfigProvider.getConfig().getOptionalValue(ConfigKey.ALLOW_GET, boolean.class).orElse(false);
 
-        Handler<RoutingContext> executionHandler = recorder.executionHandler(allowGet);
-        routeProducer.produce(new RouteBuildItem(quarkusConfig.rootPath, executionHandler, HandlerType.BLOCKING));
+        Handler<RoutingContext> executionHandler = recorder.executionHandler(graphQLInitializedBuildItem.getInitialized(),
+                allowGet);
+        routeProducer.produce(httpRootPathBuildItem.routeBuilder()
+                .routeFunction(graphQLConfig.rootPath, recorder.routeFunction(bodyHandlerBuildItem.getHandler()))
+                .handler(executionHandler)
+                .routeConfigKey("quarkus.smallrye-graphql.root-path")
+                .displayOnNotFoundPage("MicroProfile GraphQL Endpoint")
+                .blockingRoute()
+                .build());
 
-        Handler<RoutingContext> schemaHandler = recorder.schemaHandler();
-        routeProducer.produce(
-                new RouteBuildItem(quarkusConfig.rootPath + SCHEMA_PATH, schemaHandler, HandlerType.BLOCKING));
     }
 
-    @BuildStep
-    void openTracingIntegration(Capabilities capabilities,
-            BuildProducer<SystemPropertyBuildItem> properties) {
-        if (capabilities.isPresent(Capability.SMALLRYE_OPENTRACING)) {
-            properties.produce(new SystemPropertyBuildItem("smallrye.graphql.tracing.enabled", "true"));
-        }
-    }
-
-    private Set<String> getClassesToRegisterForReflection(Schema schema) {
+    private String[] getSchemaJavaClasses(Schema schema) {
         // Unique list of classes we need to do reflection on
         Set<String> classes = new HashSet<>();
 
         classes.addAll(getOperationClassNames(schema.getQueries()));
+        classes.addAll(getOperationClassNames(schema.getGroupedQueries()));
         classes.addAll(getOperationClassNames(schema.getMutations()));
+        classes.addAll(getOperationClassNames(schema.getGroupedMutations()));
         classes.addAll(getTypeClassNames(schema.getTypes().values()));
         classes.addAll(getInputClassNames(schema.getInputs().values()));
         classes.addAll(getInterfaceClassNames(schema.getInterfaces().values()));
 
-        return classes;
+        return classes.toArray(new String[] {});
     }
 
     private Class[] getGraphQLJavaClasses() {
@@ -275,6 +271,7 @@ private Class[] getGraphQLJavaClasses() {
         classes.add(graphql.schema.GraphQLSchema.class);
         classes.add(graphql.schema.GraphQLTypeReference.class);
         classes.add(List.class);
+        classes.add(Collection.class);
         return classes.toArray(new Class[] {});
     }
 
@@ -283,9 +280,18 @@ private Set<String> getOperationClassNames(Set<Operation> operations) {
         for (Operation operation : operations) {
             classes.add(operation.getClassName());
             for (Argument argument : operation.getArguments()) {
-                classes.add(argument.getReference().getClassName());
+                classes.addAll(getAllReferenceClasses(argument.getReference()));
             }
-            classes.add(operation.getReference().getClassName());
+            classes.addAll(getAllReferenceClasses(operation.getReference()));
+        }
+        return classes;
+    }
+
+    private Set<String> getOperationClassNames(Map<Group, Set<Operation>> groupedOperations) {
+        Set<String> classes = new HashSet<>();
+        Collection<Set<Operation>> operations = groupedOperations.values();
+        for (Set<Operation> operationSet : operations) {
+            classes.addAll(getOperationClassNames(operationSet));
         }
         return classes;
     }
@@ -320,181 +326,225 @@ private Set<String> getInterfaceClassNames(Collection<InterfaceType> complexGrap
     private Set<String> getFieldClassNames(Map<String, Field> fields) {
         Set<String> classes = new HashSet<>();
         for (Field field : fields.values()) {
-            classes.add(field.getReference().getClassName());
+            classes.addAll(getAllReferenceClasses(field.getReference()));
         }
         return classes;
     }
 
-    @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    void registerGraphQLUiServletExtension(
-            BuildProducer<RouteBuildItem> routeProducer,
-            BuildProducer<GeneratedResourceBuildItem> generatedResourceProducer,
-            BuildProducer<NativeImageResourceBuildItem> nativeImageResourceProducer,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> notFoundPageDisplayableEndpointProducer,
-            SmallRyeGraphQLRecorder recorder,
-            LaunchModeBuildItem launchMode,
-            LiveReloadBuildItem liveReload,
-            HttpRootPathBuildItem httpRootPath,
-            CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception {
+    private Set<String> getAllReferenceClasses(Reference reference) {
+        Set<String> classes = new HashSet<>();
+        classes.add(reference.getClassName());
+        if (reference.getParametrizedTypeArguments() != null && !reference.getParametrizedTypeArguments().isEmpty()) {
 
-        if (!quarkusConfig.ui.enable) {
-            return;
+            Collection<Reference> parametrized = reference.getParametrizedTypeArguments().values();
+            for (Reference r : parametrized) {
+                classes.addAll(getAllReferenceClasses(r));
+            }
         }
-        if ("/".equals(quarkusConfig.ui.rootPath)) {
-            throw new ConfigurationError(
-                    "quarkus.smallrye-graphql.root-path-ui was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
+        return classes;
+    }
+
+    // Services Integrations
+
+    @BuildStep
+    void activateMetrics(Capabilities capabilities,
+            Optional<MetricsCapabilityBuildItem> metricsCapability,
+            SmallRyeGraphQLConfig graphQLConfig,
+            BuildProducer<SystemPropertyBuildItem> systemProperties,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
+
+        boolean activate = shouldActivateService(capabilities,
+                graphQLConfig.metricsEnabled,
+                metricsCapability.isPresent(),
+                "quarkus-smallrye-metrics",
+                "metrics",
+                "quarkus.smallrye-graphql.metrics.enabled");
+        if (activate) {
+            if (metricsCapability.isPresent() && metricsCapability.get().metricsSupported(MetricsFactory.MP_METRICS)) {
+                unremovableBeans.produce(UnremovableBeanBuildItem.beanClassNames("io.smallrye.metrics.MetricRegistries"));
+            }
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_METRICS, TRUE));
+        } else {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_METRICS, FALSE));
         }
+    }
 
-        String graphQLPath = httpRootPath.adjustPath(quarkusConfig.rootPath);
+    @BuildStep
+    void activateTracing(Capabilities capabilities,
+            SmallRyeGraphQLConfig graphQLConfig,
+            BuildProducer<SystemPropertyBuildItem> systemProperties) {
 
-        if (launchMode.getLaunchMode().isDevOrTest()) {
-            CachedGraphQLUI cached = liveReload.getContextObject(CachedGraphQLUI.class);
-            boolean extractionNeeded = cached == null;
+        boolean activate = shouldActivateService(capabilities,
+                graphQLConfig.tracingEnabled,
+                "quarkus-smallrye-opentracing",
+                Capability.OPENTRACING,
+                "quarkus.smallrye-graphql.tracing.enabled");
+        if (activate) {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_TRACING, TRUE));
+        } else {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_TRACING, FALSE));
+        }
+    }
 
-            if (cached != null && !cached.cachedGraphQLPath.equals(graphQLPath)) {
-                try {
-                    FileUtil.deleteDirectory(Paths.get(cached.cachedDirectory));
-                } catch (IOException e) {
-                    LOG.error("Failed to clean GraphQL UI temp directory on restart", e);
-                }
-                extractionNeeded = true;
-            }
-            if (extractionNeeded) {
-                if (cached == null) {
-                    cached = new CachedGraphQLUI();
-                    liveReload.setContextObject(CachedGraphQLUI.class, cached);
-                    Runtime.getRuntime().addShutdownHook(new Thread(cached, "GraphQL UI Shutdown Hook"));
-                }
-                try {
-                    AppArtifact artifact = getGraphQLUiArtifact(curateOutcomeBuildItem);
-                    Path tempDir = Files.createTempDirectory(TEMP_DIR_PREFIX).toRealPath();
-                    extractGraphQLUi(artifact, tempDir);
-                    updateApiUrl(tempDir.resolve(FILE_TO_UPDATE), graphQLPath);
-                    cached.cachedDirectory = tempDir.toAbsolutePath().toString();
-                    cached.cachedGraphQLPath = graphQLPath;
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
-            }
-            Handler<RoutingContext> handler = recorder.uiHandler(cached.cachedDirectory,
-                    httpRootPath.adjustPath(quarkusConfig.ui.rootPath));
-            routeProducer.produce(new RouteBuildItem(quarkusConfig.ui.rootPath, handler));
-            routeProducer.produce(new RouteBuildItem(quarkusConfig.ui.rootPath + "/*", handler));
-            notFoundPageDisplayableEndpointProducer
-                    .produce(new NotFoundPageDisplayableEndpointBuildItem(quarkusConfig.ui.rootPath + "/"));
-        } else if (quarkusConfig.ui.alwaysInclude) {
-            AppArtifact artifact = getGraphQLUiArtifact(curateOutcomeBuildItem);
-            //we are including in a production artifact
-            //just stick the files in the generated output
-            //we could do this for dev mode as well but then we need to extract them every time
-            for (Path p : artifact.getPaths()) {
-                File artifactFile = p.toFile();
-                try (JarFile jarFile = new JarFile(artifactFile)) {
-                    Enumeration<JarEntry> entries = jarFile.entries();
-
-                    while (entries.hasMoreElements()) {
-                        JarEntry entry = entries.nextElement();
-                        if (entry.getName().startsWith(GRAPHQL_UI_WEBJAR_PREFIX) && !entry.isDirectory()) {
-                            try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                                String filename = entry.getName().replace(GRAPHQL_UI_WEBJAR_PREFIX + "/", "");
-                                byte[] content = FileUtil.readFileContents(inputStream);
-                                if (entry.getName().endsWith(FILE_TO_UPDATE)) {
-                                    content = updateApiUrl(new String(content, StandardCharsets.UTF_8), graphQLPath)
-                                            .getBytes(StandardCharsets.UTF_8);
-                                }
-                                if (IGNORE_LIST.contains(filename)) {
-                                    ClassLoader classLoader = SmallRyeGraphQLProcessor.class.getClassLoader();
-                                    try (InputStream resourceAsStream = classLoader
-                                            .getResourceAsStream(OWN_MEDIA_FOLDER + filename)) {
-                                        content = IoUtil.readBytes(resourceAsStream);
-                                    }
-                                }
-
-                                String fileName = GRAPHQL_UI_FINAL_DESTINATION + "/" + filename;
-
-                                generatedResourceProducer
-                                        .produce(new GeneratedResourceBuildItem(fileName, content));
-
-                                nativeImageResourceProducer
-                                        .produce(new NativeImageResourceBuildItem(fileName));
-
-                            }
-                        }
-                    }
-                }
-            }
+    @BuildStep
+    void activateValidation(Capabilities capabilities,
+            SmallRyeGraphQLConfig graphQLConfig,
+            BuildProducer<SystemPropertyBuildItem> systemProperties) {
 
-            Handler<RoutingContext> handler = recorder
-                    .uiHandler(GRAPHQL_UI_FINAL_DESTINATION, httpRootPath.adjustPath(quarkusConfig.ui.rootPath));
-            routeProducer.produce(new RouteBuildItem(quarkusConfig.ui.rootPath, handler));
-            routeProducer.produce(new RouteBuildItem(quarkusConfig.ui.rootPath + "/*", handler));
+        boolean activate = shouldActivateService(capabilities,
+                graphQLConfig.validationEnabled,
+                "quarkus-hibernate-validator",
+                Capability.HIBERNATE_VALIDATOR,
+                "quarkus.smallrye-graphql.validation.enabled");
+        if (activate) {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_VALIDATION, TRUE));
+        } else {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_VALIDATION, FALSE));
         }
     }
 
-    private AppArtifact getGraphQLUiArtifact(CurateOutcomeBuildItem curateOutcomeBuildItem) {
-        for (AppDependency dep : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
-            if (dep.getArtifact().getArtifactId().equals(GRAPHQL_UI_WEBJAR_ARTIFACT_ID)
-                    && dep.getArtifact().getGroupId().equals(GRAPHQL_UI_WEBJAR_GROUP_ID)) {
-                return dep.getArtifact();
+    @BuildStep
+    void activateEventing(SmallRyeGraphQLConfig graphQLConfig, BuildProducer<SystemPropertyBuildItem> systemProperties) {
+        if (graphQLConfig.eventsEnabled) {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_EVENTS, TRUE));
+        } else {
+            systemProperties.produce(new SystemPropertyBuildItem(ConfigKey.ENABLE_EVENTS, FALSE));
+        }
+    }
+
+    private boolean shouldActivateService(Capabilities capabilities,
+            Optional<Boolean> serviceEnabled,
+            String linkedExtensionName,
+            Capability linkedCapability,
+            String configKey) {
+
+        return shouldActivateService(capabilities, serviceEnabled, capabilities.isPresent(linkedCapability),
+                linkedExtensionName, linkedCapability.getName(), configKey);
+    }
+
+    private boolean shouldActivateService(Capabilities capabilities,
+            Optional<Boolean> serviceEnabled,
+            boolean linkedCapabilityIsPresent,
+            String linkedExtensionName,
+            String linkedCapabilityName,
+            String configKey) {
+
+        if (serviceEnabled.isPresent()) {
+            // The user explicitly asked from something
+            boolean isEnabled = serviceEnabled.get();
+            if (isEnabled && !linkedCapabilityIsPresent) {
+                // Warn and disable
+                LOG.warnf(SERVICE_NOT_AVAILABLE_WARNING, configKey, linkedExtensionName, linkedCapabilityName);
             }
+            return (isEnabled && linkedCapabilityIsPresent);
+        } else {
+            // Auto dis/enable
+            return linkedCapabilityIsPresent;
         }
-        throw new RuntimeException("Could not find artifact " + GRAPHQL_UI_WEBJAR_GROUP_ID + ":" + GRAPHQL_UI_WEBJAR_ARTIFACT_ID
-                + " among the application dependencies");
     }
 
-    private void extractGraphQLUi(AppArtifact artifact, Path resourceDir) throws IOException {
-        for (Path p : artifact.getPaths()) {
-            File artifactFile = p.toFile();
-            try (JarFile jarFile = new JarFile(artifactFile)) {
-                Enumeration<JarEntry> entries = jarFile.entries();
-
-                while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    if (entry.getName().startsWith(GRAPHQL_UI_WEBJAR_PREFIX) && !entry.isDirectory()) {
-                        try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                            String filename = entry.getName().replace(GRAPHQL_UI_WEBJAR_PREFIX + "/", "");
-                            if (!IGNORE_LIST.contains(filename)) {
-                                Files.copy(inputStream, resourceDir.resolve(filename));
-                            }
-                        }
-                    }
+    // UI Related
+
+    @BuildStep
+    void getGraphqlUiFinalDestination(
+            BuildProducer<GeneratedResourceBuildItem> generatedResourceProducer,
+            BuildProducer<NativeImageResourceBuildItem> nativeImageResourceProducer,
+            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> notFoundPageDisplayableEndpointProducer,
+            BuildProducer<SmallRyeGraphQLBuildItem> smallRyeGraphQLBuildProducer,
+            HttpRootPathBuildItem httpRootPath,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            LaunchModeBuildItem launchMode,
+            SmallRyeGraphQLConfig graphQLConfig,
+            LiveReloadBuildItem liveReloadBuildItem) throws Exception {
+
+        if (shouldInclude(launchMode, graphQLConfig)) {
+
+            if ("/".equals(graphQLConfig.ui.rootPath)) {
+                throw new ConfigurationError(
+                        "quarkus.smallrye-graphql.root-path-ui was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
+            }
+
+            String graphQLPath = httpRootPath.resolvePath(graphQLConfig.rootPath);
+            String graphQLUiPath = nonApplicationRootPathBuildItem.resolvePath(graphQLConfig.ui.rootPath);
+
+            AppArtifact artifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, GRAPHQL_UI_WEBJAR_GROUP_ID,
+                    GRAPHQL_UI_WEBJAR_ARTIFACT_ID);
+            if (launchMode.getLaunchMode().isDevOrTest()) {
+                Path tempPath = WebJarUtil.copyResourcesForDevOrTest(curateOutcomeBuildItem, launchMode, artifact,
+                        GRAPHQL_UI_WEBJAR_PREFIX);
+                WebJarUtil.updateUrl(tempPath.resolve(FILE_TO_UPDATE), graphQLPath, LINE_TO_UPDATE, LINE_FORMAT);
+                WebJarUtil.updateUrl(tempPath.resolve(FILE_TO_UPDATE), graphQLUiPath,
+                        UI_LINE_TO_UPDATE, UI_LINE_FORMAT);
+
+                smallRyeGraphQLBuildProducer
+                        .produce(new SmallRyeGraphQLBuildItem(tempPath.toAbsolutePath().toString(), graphQLUiPath));
+
+                // Handle live reload of branding files
+                if (liveReloadBuildItem.isLiveReload() && !liveReloadBuildItem.getChangedResources().isEmpty()) {
+                    WebJarUtil.hotReloadBrandingChanges(curateOutcomeBuildItem, launchMode, artifact,
+                            liveReloadBuildItem.getChangedResources());
                 }
-                // Now add our own logo and favicon
-                ClassLoader classLoader = SmallRyeGraphQLProcessor.class.getClassLoader();
-                for (String ownMedia : IGNORE_LIST) {
-                    try (InputStream logo = classLoader.getResourceAsStream(OWN_MEDIA_FOLDER + ownMedia)) {
-                        Files.copy(logo, resourceDir.resolve(ownMedia));
+            } else {
+                Map<String, byte[]> files = WebJarUtil.copyResourcesForProduction(curateOutcomeBuildItem, artifact,
+                        GRAPHQL_UI_WEBJAR_PREFIX);
+
+                for (Map.Entry<String, byte[]> file : files.entrySet()) {
+
+                    String fileName = file.getKey();
+                    byte[] content = file.getValue();
+                    if (fileName.endsWith(FILE_TO_UPDATE)) {
+                        content = WebJarUtil
+                                .updateUrl(new String(content, StandardCharsets.UTF_8), graphQLPath, LINE_TO_UPDATE,
+                                        LINE_FORMAT)
+                                .getBytes(StandardCharsets.UTF_8);
+                        content = WebJarUtil
+                                .updateUrl(new String(content, StandardCharsets.UTF_8), graphQLUiPath,
+                                        UI_LINE_TO_UPDATE,
+                                        UI_LINE_FORMAT)
+                                .getBytes(StandardCharsets.UTF_8);
                     }
+                    fileName = GRAPHQL_UI_FINAL_DESTINATION + "/" + fileName;
+
+                    generatedResourceProducer.produce(new GeneratedResourceBuildItem(fileName, content));
+                    nativeImageResourceProducer.produce(new NativeImageResourceBuildItem(fileName));
                 }
+
+                smallRyeGraphQLBuildProducer.produce(new SmallRyeGraphQLBuildItem(GRAPHQL_UI_FINAL_DESTINATION, graphQLUiPath));
             }
         }
     }
 
-    private void updateApiUrl(Path renderJs, String graphqlPath) throws IOException {
-        String content = new String(Files.readAllBytes(renderJs), StandardCharsets.UTF_8);
-        String result = updateApiUrl(content, graphqlPath);
-        if (result != null) {
-            Files.write(renderJs, result.getBytes(StandardCharsets.UTF_8));
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void registerGraphQLUiHandler(
+            BuildProducer<RouteBuildItem> routeProducer,
+            SmallRyeGraphQLRecorder recorder,
+            SmallRyeGraphQLRuntimeConfig runtimeConfig,
+            SmallRyeGraphQLBuildItem smallRyeGraphQLBuildItem,
+            LaunchModeBuildItem launchMode,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            SmallRyeGraphQLConfig graphQLConfig) throws Exception {
+
+        if (shouldInclude(launchMode, graphQLConfig)) {
+            Handler<RoutingContext> handler = recorder.uiHandler(smallRyeGraphQLBuildItem.getGraphqlUiFinalDestination(),
+                    smallRyeGraphQLBuildItem.getGraphqlUiPath(), runtimeConfig);
+            routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .route(graphQLConfig.ui.rootPath)
+                    .routeConfigKey("quarkus.smallrye-graphql.ui.root-path")
+                    .displayOnNotFoundPage("MicroProfile GraphQL UI")
+                    .handler(handler)
+                    .requiresLegacyRedirect()
+                    .build());
+            routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .route(graphQLConfig.ui.rootPath + "/*")
+                    .handler(handler)
+                    .requiresLegacyRedirect()
+                    .build());
         }
     }
 
-    public String updateApiUrl(String original, String graphqlPath) {
-        return original.replace("const api = '/graphql';", "const api = '" + graphqlPath + "';");
-    }
-
-    private static final class CachedGraphQLUI implements Runnable {
-
-        String cachedGraphQLPath;
-        String cachedDirectory;
-
-        @Override
-        public void run() {
-            try {
-                FileUtil.deleteDirectory(Paths.get(cachedDirectory));
-            } catch (IOException e) {
-                LOG.error("Failed to clean GraphQL UI temp directory on shutdown", e);
-            }
-        }
+    private static boolean shouldInclude(LaunchModeBuildItem launchMode, SmallRyeGraphQLConfig graphQLConfig) {
+        return launchMode.getLaunchMode().isDevOrTest() || graphQLConfig.ui.alwaysInclude;
     }
 }
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLUIConfig.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLUIConfig.java
index 7b2b8a5994226..f90f7aef7f132 100644
--- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLUIConfig.java
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLUIConfig.java
@@ -9,8 +9,9 @@ public class SmallRyeGraphQLUIConfig {
     /**
      * The path where GraphQL UI is available.
      * The value `/` is not allowed as it blocks the application from serving anything else.
+     * By default, this URL will be resolved as a path relative to `${quarkus.http.non-application-root-path}`.
      */
-    @ConfigItem(defaultValue = "/graphql-ui")
+    @ConfigItem(defaultValue = "graphql-ui")
     String rootPath;
 
     /**
@@ -19,10 +20,4 @@ public class SmallRyeGraphQLUIConfig {
      */
     @ConfigItem(defaultValue = "false")
     boolean alwaysInclude;
-
-    /**
-     * If GraphQL UI should be enabled. By default, GraphQL UI is enabled.
-     */
-    @ConfigItem(defaultValue = "true")
-    boolean enable;
 }
diff --git a/extensions/smallrye-graphql/deployment/src/main/resources/META-INF/resources/logo.png b/extensions/smallrye-graphql/deployment/src/main/resources/META-INF/resources/logo.png
deleted file mode 100644
index b7685cc608b40..0000000000000
Binary files a/extensions/smallrye-graphql/deployment/src/main/resources/META-INF/resources/logo.png and /dev/null differ
diff --git a/extensions/smallrye-graphql/deployment/src/main/resources/dev-templates/embedded.html b/extensions/smallrye-graphql/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..772d905b9902b
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,7 @@
+<a href="{config:http-path('quarkus.smallrye-graphql.root-path')}/schema.graphql" class="badge badge-light">
+  <i class="fa fa-project-diagram fa-fw"></i>
+  GraphQL Schema</a>
+<br>
+<a href="{config:http-path('quarkus.smallrye-graphql.ui.root-path')}/" class="badge badge-light">
+  <i class="fa fa-project-diagram fa-fw"></i>
+  GraphQL UI</a>
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java
index 8b46c65397f3b..a90bf35a174de 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/AbstractGraphQLTest.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.json.Json;
@@ -61,9 +62,18 @@ protected JsonObject createRequestBody(String graphQL, JsonObject variables) {
     }
 
     protected static String getPropertyAsString() {
+        return getPropertyAsString(null);
+    }
+
+    protected static String getPropertyAsString(Map<String, String> otherProperties) {
         try {
+            Properties p = new Properties();
+            p.putAll(PROPERTIES);
             StringWriter writer = new StringWriter();
-            PROPERTIES.store(writer, "Test Properties");
+            if (otherProperties != null) {
+                p.putAll(otherProperties);
+            }
+            p.store(writer, "Test Properties");
             return writer.toString();
         } catch (IOException ex) {
             throw new RuntimeException(ex);
@@ -79,6 +89,6 @@ protected static String getPropertyAsString() {
     static {
         PROPERTIES.put("smallrye.graphql.allowGet", "true");
         PROPERTIES.put("smallrye.graphql.printDataFetcherException", "true");
-        //        PROPERTIES.put("quarkus.log.category.\"io.quarkus.arc.processor\".level", "DEBUG");
+        PROPERTIES.put("smallrye.graphql.events.enabled", "true");
     }
 }
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java
new file mode 100644
index 0000000000000..5ff4ffaf6a170
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/CompletionStageTest.java
@@ -0,0 +1,155 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON;
+import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.getPropertyAsString;
+
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
+import org.hamcrest.CoreMatchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.ResponseLoggingFilter;
+
+/**
+ * Make sure that CompletionStage works
+ */
+public class CompletionStageTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BookGraphQLApi.class, Book.class)
+                    .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testSourcePost() {
+        String booksRequest = getPayload("{\n" +
+                "    books {\n" +
+                "       title\n" +
+                "       published\n" +
+                "       buyLink\n" +
+                "       authors {\n" +
+                "           name\n" +
+                "           bornName\n" +
+                "       }\n" +
+                "    }\n" +
+                "}");
+
+        RestAssured.given()
+                .filter(new ResponseLoggingFilter())
+                .when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(booksRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString("Lord of the Flies"),
+                        CoreMatchers.containsString("https://www.amazon.com/s?k=Lord+of+the+Flies&i=stripbooks-intl-ship"), // Test source
+                        CoreMatchers.containsString("William Gerald Golding")); // Test batch
+
+    }
+
+    @GraphQLApi
+    public static class BookGraphQLApi {
+
+        @Query
+        public CompletionStage<List<Book>> getBooks() {
+            return CompletableFuture.supplyAsync(() -> new ArrayList<>(BOOKS.values()));
+        }
+
+        @Query
+        public CompletionStage<Book> getBook(String name) {
+            return CompletableFuture.supplyAsync(() -> BOOKS.get(name));
+        }
+
+        public CompletionStage<String> getBuyLink(@Source Book book) {
+            String title = book.title.replaceAll(" ", "+");
+            return CompletableFuture.supplyAsync(() -> String.format(AMAZON_SEARCH_FORMAT, title));
+        }
+
+        public CompletionStage<List<List<Author>>> getAuthors(@Source List<Book> books) {
+            List<List<Author>> authorsOfAllBooks = new ArrayList<>();
+            for (Book book : books) {
+                List<Author> authors = new ArrayList<>();
+                for (String name : book.authors) {
+                    authors.add(AUTHORS.get(name));
+                }
+                authorsOfAllBooks.add(authors);
+            }
+            return CompletableFuture.supplyAsync(() -> authorsOfAllBooks);
+        }
+
+        private static final String AMAZON_SEARCH_FORMAT = "https://www.amazon.com/s?k=%s&i=stripbooks-intl-ship";
+        private static Map<String, Book> BOOKS = new HashMap<>();
+        private static Map<String, Author> AUTHORS = new HashMap<>();
+        static {
+            Book book1 = new Book("0-571-05686-5", "Lord of the Flies", LocalDate.of(1954, Month.SEPTEMBER, 17),
+                    "William Golding");
+            BOOKS.put(book1.title, book1);
+            AUTHORS.put("William Golding", new Author("William Golding", "William Gerald Golding",
+                    LocalDate.of(1911, Month.SEPTEMBER, 19), "Newquay, Cornwall, England"));
+
+            Book book2 = new Book("0-582-53008-3", "Animal Farm", LocalDate.of(1945, Month.AUGUST, 17),
+                    "George Orwell");
+            BOOKS.put(book2.title, book2);
+            AUTHORS.put("George Orwell", new Author("George Orwell", "Eric Arthur Blair", LocalDate.of(1903, Month.JUNE, 25),
+                    "Motihari, Bengal Presidency, British India"));
+        }
+    }
+
+    public static class Book {
+        public String isbn;
+        public String title;
+        public LocalDate published;
+        public List<String> authors;
+
+        public Book() {
+        }
+
+        public Book(String isbn, String title, LocalDate published, String... authors) {
+            this.isbn = isbn;
+            this.title = title;
+            this.published = published;
+            this.authors = Arrays.asList(authors);
+        }
+    }
+
+    public static class Author {
+        public String name;
+        public String bornName;
+        public LocalDate birthDate;
+        public String birthPlace;
+
+        public Author() {
+        }
+
+        public Author(String name, String bornName, LocalDate birthDate, String birthPlace) {
+            this.name = name;
+            this.bornName = bornName;
+            this.birthDate = birthDate;
+            this.birthPlace = birthPlace;
+        }
+    }
+}
\ No newline at end of file
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java
new file mode 100644
index 0000000000000..7535660ca60fe
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLCDIContextPropagationTest.java
@@ -0,0 +1,188 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.context.ManagedExecutor;
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Name;
+import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+
+/**
+ * Testing scenarios which require CDI context propagation to work under the hood.
+ */
+public class GraphQLCDIContextPropagationTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestPojo.class, ResourceThatNeedsCdiContextPropagation.class)
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    /**
+     * Call a query which needs the CDI context to be propagated, because it is on a RequestScoped bean
+     * and involves retrieving a batch source field (these are retrieved asynchronously).
+     */
+    @Test
+    public void testCdiContextPropagationForBatchSources() {
+        String pingRequest = getPayload("{\n" +
+                "  pojos {\n" +
+                "    duplicatedMessage\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(pingRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.pojos.duplicatedMessage", Matchers.contains("AA", "BB"));
+    }
+
+    /**
+     * Same as above, but the batch source returns a list of CompletionStages.
+     */
+    @Test
+    public void testCdiContextPropagationForBatchSourcesAsync() {
+        String pingRequest = getPayload("{\n" +
+                "  pojos {\n" +
+                "    duplicatedMessageAsync\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(pingRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.pojos.duplicatedMessageAsync", Matchers.contains("AA", "BB"));
+    }
+
+    /**
+     * In this case, there is an asynchronous query and the application launches a CompletableFuture,
+     * therefore the application is responsible for propagating the context to that future.
+     */
+    @Test
+    public void testManualContextPropagation() {
+        String pingRequest = getPayload("{\n" +
+                "  pojo_manual_propagation {\n" +
+                "    message\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(pingRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.pojo_manual_propagation.message", Matchers.equalTo("A"));
+    }
+
+    @GraphQLApi
+    @ApplicationScoped
+    public static class ResourceThatNeedsCdiContextPropagation {
+
+        /**
+         * This is to make sure that `getPojos` and `duplicatedMessage` are called on the same class instance - they
+         * need to share the same CDI request context rather than create a new one for calling `duplicatedMessage`.
+         */
+        private volatile Long injectedBeanId;
+
+        @Inject
+        InjectedBean injectedBean;
+
+        @Inject
+        ManagedExecutor executor;
+
+        @Query("pojos")
+        public List<TestPojo> getPojos() {
+            this.injectedBeanId = injectedBean.getId();
+            List<TestPojo> pojos = new ArrayList<>();
+            pojos.add(new TestPojo("A"));
+            pojos.add(new TestPojo("B"));
+            return pojos;
+        }
+
+        @Query("pojo_manual_propagation")
+        public CompletionStage<TestPojo> getPojoWithProgrammaticContextPropagation() {
+            Long id = injectedBean.getId();
+            return executor.supplyAsync(
+                    () -> {
+                        if (!injectedBean.getId().equals(id)) {
+                            throw new IllegalStateException("The future was not executed in the correct request context");
+                        }
+                        return new TestPojo("A");
+                    });
+        }
+
+        /**
+         * This source field duplicates the message of a TestPojo (repeats it twice).
+         */
+        @Name("duplicatedMessage")
+        public List<String> duplicatedMessage(@Source List<TestPojo> pojos) {
+            if (!this.injectedBean.getId().equals(this.injectedBeanId)) {
+                throw new IllegalStateException("duplicatedMessage must be executed in the same request context as getPojos");
+            }
+            return pojos.stream()
+                    .map(pojo -> pojo.getMessage() + pojo.getMessage())
+                    .collect(Collectors.toList());
+        }
+
+        /**
+         * This source field duplicates the message of a TestPojo (repeats it twice) and does it asynchronously.
+         */
+        @Name("duplicatedMessageAsync")
+        public CompletionStage<List<String>> duplicatedMessageAsync(@Source List<TestPojo> pojos) {
+            if (!this.injectedBean.getId().equals(this.injectedBeanId)) {
+                throw new IllegalStateException(
+                        "duplicatedMessageAsync must be executed in the same request context as getPojos");
+            }
+            return CompletableFuture.completedFuture(pojos.stream()
+                    .map(pojo -> pojo.getMessage() + pojo.getMessage())
+                    .collect(Collectors.toList()));
+        }
+
+    }
+
+    @RequestScoped
+    public static class InjectedBean {
+
+        private Long id = ThreadLocalRandom.current().nextLong();
+
+        public Long getId() {
+            return id;
+        }
+    }
+
+}
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java
new file mode 100644
index 0000000000000..4ddaba5bceeab
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLGroupedTest.java
@@ -0,0 +1,115 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON;
+
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.microprofile.graphql.Description;
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Mutation;
+import org.eclipse.microprofile.graphql.Name;
+import org.eclipse.microprofile.graphql.Query;
+import org.hamcrest.CoreMatchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * Basic tests for Grouping.
+ */
+public class GraphQLGroupedTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BookGraphQLApi.class, Book.class)
+                    .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testSourcePost() {
+        String booksRequest = getPayload("{\n" +
+                "  books{\n" +
+                "    book(name:\"Lord of the Flies\"){\n" +
+                "      title\n" +
+                "      authors\n" +
+                "      published\n" +
+                "    }\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(booksRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString("Lord of the Flies"));
+
+    }
+
+    @GraphQLApi
+    @Name("books")
+    @Description("Allow all book releated APIs")
+    public static class BookGraphQLApi {
+
+        @Query
+        public List<Book> getAllBooks() {
+            return new ArrayList<>(BOOKS.values());
+        }
+
+        @Query
+        public Book getBook(String name) {
+            return BOOKS.get(name);
+        }
+
+        @Mutation
+        public Book addBook(Book book) {
+            BOOKS.put(book.title, book);
+            return book;
+        }
+
+        private static Map<String, Book> BOOKS = new HashMap<>();
+        static {
+            Book book1 = new Book("0-571-05686-5", "Lord of the Flies", LocalDate.of(1954, Month.SEPTEMBER, 17),
+                    "William Golding");
+            BOOKS.put(book1.title, book1);
+
+            Book book2 = new Book("0-582-53008-3", "Animal Farm", LocalDate.of(1945, Month.AUGUST, 17), "George Orwell");
+            BOOKS.put(book2.title, book2);
+        }
+    }
+
+    public static class Book {
+        public String isbn;
+        public String title;
+        public LocalDate published;
+        public List<String> authors;
+
+        public Book() {
+        }
+
+        public Book(String isbn, String title, LocalDate published, String... authors) {
+            this.isbn = isbn;
+            this.title = title;
+            this.published = published;
+            this.authors = Arrays.asList(authors);
+        }
+    }
+
+}
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java
new file mode 100644
index 0000000000000..6201d6f7fb828
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLNamingTest.java
@@ -0,0 +1,61 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+
+/**
+ * Basic tests. POST
+ */
+public class GraphQLNamingTest extends AbstractGraphQLTest {
+
+    private static final Logger LOG = Logger.getLogger(GraphQLNamingTest.class);
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
+                    .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testSchema() {
+        RequestSpecification request = RestAssured.given();
+        request.accept(MEDIATYPE_TEXT);
+        request.contentType(MEDIATYPE_TEXT);
+        Response response = request.get("/graphql/schema.graphql");
+        String body = response.body().asString();
+        LOG.error(body);
+
+        Assertions.assertEquals(200, response.statusCode());
+        Assertions.assertTrue(body.contains("\"Query root\""));
+        Assertions.assertTrue(body.contains("type Query {"));
+        Assertions.assertTrue(body.contains("ping: TestPojo"));
+        Assertions.assertTrue(body.contains("generics: TestGenericsPojo_String"));
+        Assertions.assertTrue(body.contains("type TestGenericsPojo_String {"));
+        Assertions.assertTrue(body.contains("enum SomeEnum {"));
+        Assertions.assertTrue(body.contains("enum TestPojoNumber {")); // This is the important part. TestPojo merged with Number
+    }
+
+    private static Map<String, String> configuration() {
+        Map<String, String> m = new HashMap<>();
+        m.put("quarkus.smallrye-graphql.auto-name-strategy", "MergeInnerClass");
+        m.put("quarkus.smallrye-graphql.events.enabled", "true");
+        return m;
+
+    }
+
+}
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java
index 6c1b8536325d0..eeb0b5b1c11ef 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTest.java
@@ -2,6 +2,9 @@
 
 import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.hamcrest.CoreMatchers;
 import org.jboss.logging.Logger;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -27,8 +30,8 @@ public class GraphQLTest extends AbstractGraphQLTest {
     @RegisterExtension
     static QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class)
-                    .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
+                    .addAsResource(new StringAsset(getPropertyAsString(configuration())), "application.properties")
                     .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
 
     @Test
@@ -44,7 +47,10 @@ public void testSchema() {
         Assertions.assertTrue(body.contains("\"Query root\""));
         Assertions.assertTrue(body.contains("type Query {"));
         Assertions.assertTrue(body.contains("ping: TestPojo"));
+        Assertions.assertTrue(body.contains("generics: TestGenericsPojo_String"));
+        Assertions.assertTrue(body.contains("type TestGenericsPojo_String {"));
         Assertions.assertTrue(body.contains("enum SomeEnum {"));
+        Assertions.assertTrue(body.contains("enum Number {"));
     }
 
     @Test
@@ -125,6 +131,27 @@ public void testSourcePost2() {
 
     }
 
+    @Test
+    public void testGenerics() {
+        String foosRequest = getPayload("{\n" +
+                "  generics {\n" +
+                "    message\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(foosRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString(
+                        "{\"data\":{\"generics\":{\"message\":\"I know it\"}}}"));
+    }
+
     @Test
     public void testContext() {
         String query = getPayload("{context}");
@@ -139,4 +166,10 @@ public void testContext() {
                 .and()
                 .body(CoreMatchers.containsString("{\"data\":{\"context\":\"/context\"}}"));
     }
+
+    private static Map<String, String> configuration() {
+        Map<String, String> m = new HashMap<>();
+        m.put("quarkus.smallrye-graphql.events.enabled", "true");
+        return m;
+    }
 }
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java
new file mode 100644
index 0000000000000..3173819b51459
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingDisabledTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * Test that the GraphQL extension does not activate OpenTracing capability within SmallRye GraphQL
+ * when there is no tracer enabled.
+ */
+public class GraphQLTracingDisabledTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
+                    .addAsResource(new StringAsset("quarkus.jaeger.enabled=false"), "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testTracing() {
+        // just check that querying works
+        pingTest();
+    }
+
+}
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java
index 6a19abf547522..5f31027dd2f46 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/GraphQLTracingTest.java
@@ -21,7 +21,7 @@ public class GraphQLTracingTest extends AbstractGraphQLTest {
     @RegisterExtension
     static QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class)
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
                     .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
 
     static MockTracer mockTracer = new MockTracer();
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java
index 7a04714c5bb5f..bdb2204588866 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java
@@ -20,7 +20,7 @@ public class HotReloadTest extends AbstractGraphQLTest {
     @RegisterExtension
     final static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class)
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
                     .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")
                     .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
 
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java
new file mode 100644
index 0000000000000..9cc2cd88553dd
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/InjectRoutingContextTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static org.hamcrest.Matchers.containsString;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Make sure that it is possible to inject and use the RoutingContext
+ * when processing GraphQL queries.
+ */
+public class InjectRoutingContextTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(InjectRoutingContext.class)
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void verifyRoutingContextCanBeInjected() {
+        String query = getPayload("{ foo }");
+        RestAssured.given()
+                .body(query)
+                .header("Tenant-Id", "123456")
+                .contentType(MEDIATYPE_JSON)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(containsString("123456"));
+    }
+
+    @GraphQLApi
+    public static class InjectRoutingContext {
+
+        @Inject
+        RoutingContext routingContext;
+
+        @Query
+        public String foo() {
+            return routingContext.request().getHeader("Tenant-Id");
+        }
+
+    }
+
+}
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java
index 74f362f36cdac..74c9e6c0d1bc6 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsDisabledTest.java
@@ -26,7 +26,7 @@ public class MetricsDisabledTest {
     @RegisterExtension
     static QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class)
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
                     .addAsResource(new StringAsset("quarkus.smallrye-graphql.metrics.enabled=false"), "application.properties")
                     .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
 
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java
index 7c24787b008c6..e5462a3fc794e 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/MetricsTest.java
@@ -3,14 +3,13 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import javax.inject.Inject;
 import javax.json.Json;
 import javax.json.JsonObject;
 
 import org.eclipse.microprofile.metrics.MetricID;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 import org.eclipse.microprofile.metrics.SimpleTimer;
-import org.eclipse.microprofile.metrics.annotation.RegistryType;
+import org.eclipse.microprofile.metrics.Tag;
 import org.hamcrest.CoreMatchers;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -21,24 +20,23 @@
 
 import io.quarkus.test.QuarkusUnitTest;
 import io.restassured.RestAssured;
+import io.smallrye.metrics.MetricRegistries;
 
 public class MetricsTest {
 
     @RegisterExtension
     static QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class)
+                    .addClasses(TestResource.class, TestPojo.class, TestRandom.class, TestGenericsPojo.class)
                     .addAsResource(new StringAsset("quarkus.smallrye-graphql.metrics.enabled=true"), "application.properties")
                     .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
 
-    @Inject
-    @RegistryType(type = MetricRegistry.Type.VENDOR)
-    MetricRegistry metricRegistry;
-
     // Run a Query and check that its corresponding metric is updated
     @Test
     public void testQuery() {
-        SimpleTimer metric = metricRegistry.getSimpleTimers().get(new MetricID("mp_graphql_Query_ping"));
+        MetricRegistry metricRegistry = MetricRegistries.get(MetricRegistry.Type.VENDOR);
+        SimpleTimer metric = metricRegistry.getSimpleTimers()
+                .get(new MetricID("mp_graphql", new Tag("type", "QUERY"), new Tag("name", "ping"), new Tag("source", "false")));
         assertNotNull(metric, "Metrics should be registered eagerly");
 
         String pingRequest = getPayload("{\n" +
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java
index d156ab94a277d..6f9ed1d431c78 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SecurityTest.java
@@ -4,11 +4,16 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import javax.annotation.security.RolesAllowed;
 import javax.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Name;
 import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -24,7 +29,7 @@ public class SecurityTest extends AbstractGraphQLTest {
     @RegisterExtension
     static QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(SecuredApi.class)
+                    .addClasses(SecuredApi.class, Foo.class)
                     .addAsResource("application-secured.properties", "application.properties")
                     .addAsResource("users.properties")
                     .addAsResource("roles.properties")
@@ -32,7 +37,21 @@ public class SecurityTest extends AbstractGraphQLTest {
 
     @Test
     public void testAuthenticatedUser() {
-        String query = getPayload("{ foo }");
+        String query = getPayload("{ foo { message} }");
+        RestAssured.given()
+                .header(new Header("Authorization", "Basic ZGF2aWQ6cXdlcnR5MTIz"))
+                .body(query)
+                .contentType(MEDIATYPE_JSON)
+                .post("/graphql/")
+                .then()
+                .assertThat()
+                .body("errors", nullValue())
+                .body("data.foo.message", equalTo("foo"));
+    }
+
+    @Test
+    public void testAuthenticatedUserWithSource() {
+        String query = getPayload("{ foo { bonusFoo } }");
         RestAssured.given()
                 .header(new Header("Authorization", "Basic ZGF2aWQ6cXdlcnR5MTIz"))
                 .body(query)
@@ -41,12 +60,12 @@ public void testAuthenticatedUser() {
                 .then()
                 .assertThat()
                 .body("errors", nullValue())
-                .body("data.foo", equalTo("foo"));
+                .body("data.foo.bonusFoo", equalTo("bonus"));
     }
 
     @Test
     public void testUnauthorizedRole() {
-        String query = getPayload("{ bar }");
+        String query = getPayload("{ bar { message } }");
         RestAssured.given()
                 .header(new Header("Authorization", "Basic ZGF2aWQ6cXdlcnR5MTIz"))
                 .body(query)
@@ -55,7 +74,43 @@ public void testUnauthorizedRole() {
                 .then()
                 .assertThat()
                 .body("errors", notNullValue())
-                .body("data.bar", nullValue());
+                .body("data.bar.message", nullValue());
+    }
+
+    /**
+     * Call a query that we are authorized to call, but within that, retrieve a source field that we're not authorized
+     * to retrieve.
+     */
+    @Test
+    public void testUnauthorizedForSource() {
+        String query = getPayload("{ foo { bonusBar } }");
+        RestAssured.given()
+                .header(new Header("Authorization", "Basic ZGF2aWQ6cXdlcnR5MTIz"))
+                .body(query)
+                .contentType(MEDIATYPE_JSON)
+                .post("/graphql/")
+                .then()
+                .assertThat()
+                .body("errors", notNullValue())
+                .body("data.foo.bonusBar", nullValue());
+    }
+
+    static class Foo {
+
+        private String message;
+
+        public Foo(String foo) {
+            this.message = foo;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
+
     }
 
     @GraphQLApi
@@ -64,14 +119,26 @@ public static class SecuredApi {
 
         @Query
         @RolesAllowed("fooRole")
-        public String foo() {
-            return "foo";
+        public Foo foo() {
+            return new Foo("foo");
+        }
+
+        @Name("bonusFoo")
+        @RolesAllowed("fooRole")
+        public List<String> bonusFoo(@Source List<Foo> foos) {
+            return foos.stream().map(foo -> "bonus").collect(Collectors.toList());
         }
 
         @Query
         @RolesAllowed("barRole")
-        public String bar() {
-            return "bar";
+        public Foo bar() {
+            return new Foo("bar");
+        }
+
+        @Name("bonusBar")
+        @RolesAllowed("barRole")
+        public List<String> bonusBar(@Source List<Foo> foos) {
+            return foos.stream().map(foo -> "bonus").collect(Collectors.toList());
         }
 
     }
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java
new file mode 100644
index 0000000000000..0d117b54bb53a
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLContextTestCase.java
@@ -0,0 +1,256 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.context.ManagedExecutor;
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Name;
+import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.smallrye.graphql.api.Context;
+
+public class SmallRyeGraphQLContextTestCase extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Dummy.class, ContextPropagationResource.class));
+
+    @Test
+    public void testAsyncQuery() {
+        String request = getPayload("{\n" +
+                "  testAsyncQuery {\n" +
+                "    stringField\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(request)
+                .post("/graphql")
+                .then()
+                .log()
+                .body(true)
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.testAsyncQuery.stringField", Matchers.equalTo("OK"));
+    }
+
+    @Test
+    public void testAsyncQueryWithAsyncSource() {
+        String request = getPayload("{\n" +
+                "  testAsyncQuery {\n" +
+                "    stringField\n" +
+                "    stringBatchSourceAsync\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(request)
+                .post("/graphql")
+                .then()
+                .log()
+                .body(true)
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.testAsyncQuery.stringField", Matchers.equalTo("OK"))
+                .body("data.testAsyncQuery.stringBatchSourceAsync", Matchers.equalTo("hello"));
+    }
+
+    @Test
+    public void testManualPropagation() {
+        String request = getPayload("{\n" +
+                "  testManualPropagation {\n" +
+                "    stringField\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(request)
+                .post("/graphql")
+                .then()
+                .log()
+                .body(true)
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.testManualPropagation.stringField", Matchers.equalTo("OK"));
+    }
+
+    @Test
+    public void testSourceMethods() {
+        String request = getPayload("{\n" +
+                "  testSourceMethods {\n" +
+                "    stringBatchSource,\n" +
+                "    numberBatchSource\n" +
+                "  }\n" +
+                "}");
+
+        RestAssured.given().when()
+                .accept(ContentType.JSON)
+                .contentType(ContentType.JSON)
+                .body(request)
+                .post("/graphql")
+                .then()
+                .log()
+                .body(true)
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body("data.testSourceMethods.stringBatchSource", Matchers.equalTo("hello"));
+    }
+
+    @GraphQLApi
+    @ApplicationScoped
+    public static class ContextPropagationResource {
+
+        @Inject
+        Instance<Context> context;
+
+        @Inject
+        ManagedExecutor managedExecutor;
+
+        @Query
+        public CompletableFuture<Dummy> testAsyncQuery() {
+            final String executionId = context.get().getExecutionId();
+            assertNotNull(executionId);
+            this.executionId = context.get().getExecutionId();
+            assertEquals("testAsyncQuery", context.get().getFieldName());
+            Dummy result = new Dummy();
+            result.setStringField("OK");
+            return CompletableFuture.completedFuture(result);
+        }
+
+        @Query
+        public Dummy testManualPropagation() throws ExecutionException, InterruptedException {
+            final String executionId = context.get().getExecutionId();
+            assertNotNull(executionId);
+
+            CompletableFuture<Integer> numberFuture = CompletableFuture.supplyAsync(() -> {
+                assertNotNull(context);
+                assertEquals(executionId, context.get().getExecutionId());
+                assertEquals("testManualPropagation", context.get().getFieldName());
+                return 42;
+            }, managedExecutor);
+
+            CompletableFuture<String> stringFuture = CompletableFuture.supplyAsync(() -> {
+                assertNotNull(context, "Context must to be available inside an async task");
+                assertEquals(executionId, context.get().getExecutionId(), "Execution ID must be the same inside an async task");
+                assertEquals("testManualPropagation", context.get().getFieldName());
+                return "OK";
+            }, managedExecutor);
+
+            Dummy result = new Dummy();
+            result.setNumberField(numberFuture.get());
+            result.setStringField(stringFuture.get());
+            return result;
+        }
+
+        private volatile String executionId;
+
+        @Query
+        public Dummy testSourceMethods() {
+            this.executionId = context.get().getExecutionId();
+            assertEquals("testSourceMethods", context.get().getFieldName());
+            return new Dummy();
+        }
+
+        @Name("stringBatchSource")
+        public List<String> stringBatchSource(@Source List<Dummy> source) {
+            assertEquals("stringBatchSource", context.get().getFieldName());
+            assertEquals(this.executionId, context.get().getExecutionId(), "Wrong execution ID propagated from the root query");
+
+            List<String> result = new ArrayList<>();
+            for (Dummy dummy : source) {
+                result.add("hello");
+            }
+            return result;
+        }
+
+        @Name("stringBatchSourceAsync")
+        public CompletionStage<List<String>> stringBatchSourceAsync(@Source List<Dummy> source) {
+            assertEquals("stringBatchSourceAsync", context.get().getFieldName());
+            assertEquals(this.executionId, context.get().getExecutionId(), "Wrong execution ID propagated from the root query");
+
+            List<String> result = new ArrayList<>();
+            for (Dummy dummy : source) {
+                result.add("hello");
+            }
+            return CompletableFuture.completedFuture(result);
+        }
+
+        @Name("numberBatchSource")
+        public List<Integer> numberBatchSource(@Source List<Dummy> source) {
+            assertEquals("numberBatchSource", context.get().getFieldName());
+            assertEquals(this.executionId, context.get().getExecutionId(), "Wrong execution ID propagated from the root query");
+
+            List<Integer> result = new ArrayList<>();
+            for (Dummy dummy : source) {
+                result.add(123);
+            }
+            return result;
+        }
+
+    }
+
+    public static class Dummy {
+
+        private String stringField;
+
+        private Integer numberField;
+
+        private Boolean booleanField;
+
+        public String getStringField() {
+            return stringField;
+        }
+
+        public void setStringField(String stringField) {
+            this.stringField = stringField;
+        }
+
+        public Integer getNumberField() {
+            return numberField;
+        }
+
+        public void setNumberField(Integer numberField) {
+            this.numberField = numberField;
+        }
+
+        public Boolean getBooleanField() {
+            return booleanField;
+        }
+
+        public void setBooleanField(Boolean booleanField) {
+            this.booleanField = booleanField;
+        }
+    }
+
+}
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestGenericsPojo.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestGenericsPojo.java
new file mode 100644
index 0000000000000..d6b0b15f3f5bd
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestGenericsPojo.java
@@ -0,0 +1,43 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Just a test pojo with generics
+ */
+public class TestGenericsPojo<T> {
+    private T message;
+    private List<String> list = Arrays.asList("aa", "bb", "cc");
+
+    public TestGenericsPojo() {
+        super();
+    }
+
+    public TestGenericsPojo(T message) {
+        super();
+        this.message = message;
+    }
+
+    public T getMessage() {
+        return message;
+    }
+
+    public void setMessage(T message) {
+        this.message = message;
+    }
+
+    public List<String> getList() {
+        return list;
+    }
+
+    public void setList(List<String> list) {
+        this.list = list;
+    }
+
+    @Override
+    public String toString() {
+        return "TestPojo{" + "message=" + message + ", list=" + list + '}';
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java
index 9324dd8a8a66e..65ff1aea16548 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java
@@ -10,6 +10,8 @@ public class TestPojo {
     private String message;
     private List<String> list = Arrays.asList("a", "b", "c");
 
+    private Number number;
+
     public TestPojo() {
         super();
     }
@@ -35,9 +37,22 @@ public void setList(List<String> list) {
         this.list = list;
     }
 
+    public Number getNumber() {
+        return number;
+    }
+
+    public void setNumber(Number number) {
+        this.number = number;
+    }
+
     @Override
     public String toString() {
-        return "TestPojo{" + "message=" + message + ", list=" + list + '}';
+        return "TestPojo{" + "message=" + message + ", list=" + list + ", number=" + number + '}';
     }
 
+    enum Number {
+        ONE,
+        TWO,
+        THREE
+    }
 }
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java
index 7c9c633fa8884..7f4751f7f5594 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestResource.java
@@ -41,6 +41,11 @@ public String getPathFromContext() {
         return context.getPath();
     }
 
+    @Query
+    public TestGenericsPojo<String> generics() {
+        return new TestGenericsPojo<>("I know it");
+    }
+
     @Mutation
     public TestPojo moo(String name) {
         return new TestPojo(name);
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java
new file mode 100644
index 0000000000000..4ede87250851a
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/UniTest.java
@@ -0,0 +1,153 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON;
+import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.getPropertyAsString;
+
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
+import org.hamcrest.CoreMatchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.ResponseLoggingFilter;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Make sure that Uni works
+ */
+public class UniTest extends AbstractGraphQLTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BookGraphQLApi.class, Book.class)
+                    .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testSourcePost() {
+        String booksRequest = getPayload("{\n" +
+                "    book(name:\"Lord of the Flies\"){\n" +
+                "       title\n" +
+                "       published\n" +
+                "       buyLink\n" +
+                "       authors {\n" +
+                "           name\n" +
+                "           bornName\n" +
+                "       }\n" +
+                "    }\n" +
+                "}");
+
+        RestAssured.given()
+                .filter(new ResponseLoggingFilter())
+                .when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(booksRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString("Lord of the Flies"),
+                        CoreMatchers.containsString("https://www.amazon.com/s?k=Lord+of+the+Flies&i=stripbooks-intl-ship"), // Test source
+                        CoreMatchers.containsString("William Gerald Golding")); // Test batch
+
+    }
+
+    @GraphQLApi
+    public static class BookGraphQLApi {
+
+        @Query
+        public Uni<Book> getBook(String name) {
+            return Uni.createFrom().item(() -> BOOKS.get(name));
+        }
+
+        public Uni<String> getBuyLink(@Source Book book) {
+            String title = book.title.replaceAll(" ", "+");
+            return Uni.createFrom().item(() -> String.format(AMAZON_SEARCH_FORMAT, title));
+        }
+
+        public Uni<List<List<Author>>> getAuthors(@Source List<Book> books) {
+            List<List<Author>> authorsOfAllBooks = new ArrayList<>();
+            for (Book book : books) {
+                List<Author> authors = new ArrayList<>();
+                for (String name : book.authors) {
+                    authors.add(AUTHORS.get(name));
+                }
+                authorsOfAllBooks.add(authors);
+            }
+            return Uni.createFrom().item(() -> authorsOfAllBooks);
+        }
+
+        private static final String AMAZON_SEARCH_FORMAT = "https://www.amazon.com/s?k=%s&i=stripbooks-intl-ship";
+        private static Map<String, Book> BOOKS = new HashMap<>();
+        private static Map<String, Author> AUTHORS = new HashMap<>();
+        static {
+            Book book1 = new Book("0-571-05686-5", "Lord of the Flies", LocalDate.of(1954, Month.SEPTEMBER, 17),
+                    "William Golding");
+            BOOKS.put(book1.title, book1);
+            AUTHORS.put("William Golding", new Author("William Golding", "William Gerald Golding",
+                    LocalDate.of(1911, Month.SEPTEMBER, 19), "Newquay, Cornwall, England"));
+
+            Book book2 = new Book("0-582-53008-3", "Animal Farm", LocalDate.of(1945, Month.AUGUST, 17), "George Orwell");
+            BOOKS.put(book2.title, book2);
+            AUTHORS.put("George Orwell", new Author("George Orwell", "Eric Arthur Blair", LocalDate.of(1903, Month.JUNE, 25),
+                    "Motihari, Bengal Presidency, British India"));
+        }
+    }
+
+    public static class Book {
+        public String isbn;
+        public String title;
+        public LocalDate published;
+        public List<String> authors;
+
+        public Book() {
+        }
+
+        public Book(String isbn, String title, LocalDate published, String... authors) {
+            this.isbn = isbn;
+            this.title = title;
+            this.published = published;
+            this.authors = Arrays.asList(authors);
+        }
+
+        @Override
+        public String toString() {
+            return "Book{" + "isbn=" + isbn + ", title=" + title + ", published=" + published + ", authors=" + authors + '}';
+        }
+    }
+
+    public static class Author {
+        public String name;
+        public String bornName;
+        public LocalDate birthDate;
+        public String birthPlace;
+
+        public Author() {
+        }
+
+        public Author(String name, String bornName, LocalDate birthDate, String birthPlace) {
+            this.name = name;
+            this.bornName = bornName;
+            this.birthDate = birthDate;
+            this.birthPlace = birthPlace;
+        }
+    }
+}
\ No newline at end of file
diff --git a/extensions/smallrye-graphql/pom.xml b/extensions/smallrye-graphql/pom.xml
index 2d8a7a3d78f0d..8ce1f9c3947da 100644
--- a/extensions/smallrye-graphql/pom.xml
+++ b/extensions/smallrye-graphql/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-graphql/runtime/pom.xml b/extensions/smallrye-graphql/runtime/pom.xml
index 9543d01f041da..2ddb6d7a45711 100644
--- a/extensions/smallrye-graphql/runtime/pom.xml
+++ b/extensions/smallrye-graphql/runtime/pom.xml
@@ -31,15 +31,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jsonb</artifactId>    
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-graphql-cdi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java
index beaaa961d6cf9..96e3f3adcb1e0 100644
--- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java
@@ -20,6 +20,8 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ManagedContext;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
 import io.smallrye.graphql.execution.ExecutionService;
 import io.vertx.core.Handler;
@@ -39,13 +41,16 @@ public class SmallRyeGraphQLExecutionHandler implements Handler<RoutingContext>
     private static final String OK = "OK";
     private volatile ExecutionService executionService;
     private final CurrentIdentityAssociation currentIdentityAssociation;
+    private final CurrentVertxRequest currentVertxRequest;
     private static final JsonBuilderFactory jsonObjectFactory = Json.createBuilderFactory(null);
     private static final JsonReaderFactory jsonReaderFactory = Json.createReaderFactory(null);
     private static final JsonWriterFactory jsonWriterFactory = Json.createWriterFactory(null);
 
-    public SmallRyeGraphQLExecutionHandler(boolean allowGet, CurrentIdentityAssociation currentIdentityAssociation) {
+    public SmallRyeGraphQLExecutionHandler(boolean allowGet, CurrentIdentityAssociation currentIdentityAssociation,
+            CurrentVertxRequest currentVertxRequest) {
         SmallRyeGraphQLExecutionHandler.allowGet = allowGet;
         this.currentIdentityAssociation = currentIdentityAssociation;
+        this.currentVertxRequest = currentVertxRequest;
     }
 
     @Override
@@ -65,8 +70,15 @@ public void handle(final RoutingContext ctx) {
 
     private void doHandle(final RoutingContext ctx) {
         if (currentIdentityAssociation != null) {
-            currentIdentityAssociation.setIdentity(QuarkusHttpUser.getSecurityIdentity(ctx, null));
+            QuarkusHttpUser existing = (QuarkusHttpUser) ctx.user();
+            if (existing != null) {
+                SecurityIdentity identity = existing.getSecurityIdentity();
+                currentIdentityAssociation.setIdentity(identity);
+            } else {
+                currentIdentityAssociation.setIdentity(QuarkusHttpUser.getSecurityIdentity(ctx, null));
+            }
         }
+        currentVertxRequest.setCurrent(ctx);
 
         HttpServerRequest request = ctx.request();
         HttpServerResponse response = ctx.response();
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLNoEndpointHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLNoEndpointHandler.java
new file mode 100644
index 0000000000000..3a28e2e68976f
--- /dev/null
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLNoEndpointHandler.java
@@ -0,0 +1,21 @@
+package io.quarkus.smallrye.graphql.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Handler that is used when no endpoint is available
+ */
+public class SmallRyeGraphQLNoEndpointHandler implements Handler<RoutingContext> {
+    private static final String CONTENT_TYPE = "text/plain; charset=UTF-8";
+    private static final String MESSAGE = "GraphQL Schema not generated. Make sure you have a GraphQL Endpoint. Go to https://quarkus.io/guides/microprofile-graphql to learn how";
+
+    @Override
+    public void handle(RoutingContext event) {
+        HttpServerResponse response = event.response();
+        response.headers().set(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE);
+        response.setStatusCode(404).end(MESSAGE);
+    }
+}
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLNotFoundHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLNotFoundHandler.java
new file mode 100644
index 0000000000000..e7731048cae66
--- /dev/null
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLNotFoundHandler.java
@@ -0,0 +1,17 @@
+package io.quarkus.smallrye.graphql.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Handling static when disabled
+ */
+public class SmallRyeGraphQLNotFoundHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        event.response().setStatusCode(404);
+        event.response().end();
+    }
+
+}
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRecorder.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRecorder.java
index a993ba90ad40f..4ed8144b50219 100644
--- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRecorder.java
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRecorder.java
@@ -1,68 +1,68 @@
 package io.quarkus.smallrye.graphql.runtime;
 
+import java.util.function.Consumer;
+
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.spi.CDI;
 
+import graphql.schema.GraphQLSchema;
 import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
 import io.quarkus.smallrye.graphql.runtime.spi.QuarkusClassloadingService;
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+import io.smallrye.graphql.cdi.config.GraphQLConfig;
 import io.smallrye.graphql.cdi.producer.GraphQLProducer;
 import io.smallrye.graphql.schema.model.Schema;
 import io.vertx.core.Handler;
-import io.vertx.core.http.HttpHeaders;
+import io.vertx.ext.web.Route;
 import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.StaticHandler;
 
 @Recorder
 public class SmallRyeGraphQLRecorder {
 
-    public void createExecutionService(BeanContainer beanContainer, Schema schema) {
+    public RuntimeValue<Boolean> createExecutionService(BeanContainer beanContainer, Schema schema) {
         GraphQLProducer graphQLProducer = beanContainer.instance(GraphQLProducer.class);
-        graphQLProducer.setSchema(schema);
-        graphQLProducer.initialize();
+        GraphQLConfig graphQLConfig = beanContainer.instance(GraphQLConfig.class);
+        GraphQLSchema graphQLSchema = graphQLProducer.initialize(schema, graphQLConfig);
+        return new RuntimeValue<>(graphQLSchema != null);
     }
 
-    public Handler<RoutingContext> executionHandler(boolean allowGet) {
-        Instance<CurrentIdentityAssociation> identityAssociations = CDI.current()
-                .select(CurrentIdentityAssociation.class);
-        CurrentIdentityAssociation association;
-        if (identityAssociations.isResolvable()) {
-            association = identityAssociations.get();
+    public Handler<RoutingContext> executionHandler(RuntimeValue<Boolean> initialized, boolean allowGet) {
+        if (initialized.getValue()) {
+            Instance<CurrentIdentityAssociation> identityAssociations = CDI.current()
+                    .select(CurrentIdentityAssociation.class);
+            CurrentIdentityAssociation association;
+            if (identityAssociations.isResolvable()) {
+                association = identityAssociations.get();
+            } else {
+                association = null;
+            }
+            CurrentVertxRequest currentVertxRequest = CDI.current().select(CurrentVertxRequest.class).get();
+            return new SmallRyeGraphQLExecutionHandler(allowGet, association, currentVertxRequest);
         } else {
-            association = null;
+            return new SmallRyeGraphQLNoEndpointHandler();
         }
-        return new SmallRyeGraphQLExecutionHandler(allowGet, association);
     }
 
-    public Handler<RoutingContext> schemaHandler() {
-        return new SmallRyeGraphQLSchemaHandler();
+    public Handler<RoutingContext> schemaHandler(RuntimeValue<Boolean> initialized) {
+        if (initialized.getValue()) {
+            return new SmallRyeGraphQLSchemaHandler();
+        } else {
+            return new SmallRyeGraphQLNoEndpointHandler();
+        }
     }
 
-    public Handler<RoutingContext> uiHandler(String graphqlUiFinalDestination, String graphqlUiPath) {
-
-        StaticHandler staticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
-                .setWebRoot(graphqlUiFinalDestination)
-                .setDefaultContentEncoding("UTF-8");
+    public Handler<RoutingContext> uiHandler(String graphqlUiFinalDestination,
+            String graphqlUiPath, SmallRyeGraphQLRuntimeConfig runtimeConfig) {
 
-        return new Handler<RoutingContext>() {
-            @Override
-            public void handle(RoutingContext event) {
-                if (event.normalisedPath().length() == graphqlUiPath.length()) {
-
-                    event.response().setStatusCode(302);
-                    event.response().headers().set(HttpHeaders.LOCATION, graphqlUiPath + "/");
-                    event.response().end();
-                    return;
-                } else if (event.normalisedPath().length() == graphqlUiPath.length() + 1) {
-                    event.reroute(graphqlUiPath + "/index.html");
-                    return;
-                }
-
-                staticHandler.handle(event);
-            }
-        };
+        if (runtimeConfig.enable) {
+            return new SmallRyeGraphQLStaticHandler(graphqlUiFinalDestination, graphqlUiPath);
+        } else {
+            return new SmallRyeGraphQLNotFoundHandler();
+        }
     }
 
     public void setupClDevMode(ShutdownContext shutdownContext) {
@@ -74,4 +74,13 @@ public void run() {
             }
         });
     }
+
+    public Consumer<Route> routeFunction(Handler<RoutingContext> bodyHandler) {
+        return new Consumer<Route>() {
+            @Override
+            public void accept(Route route) {
+                route.handler(bodyHandler);
+            }
+        };
+    }
 }
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRuntimeConfig.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRuntimeConfig.java
new file mode 100644
index 0000000000000..5b5661db06737
--- /dev/null
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLRuntimeConfig.java
@@ -0,0 +1,16 @@
+package io.quarkus.smallrye.graphql.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "smallrye-graphql", phase = ConfigPhase.RUN_TIME)
+public class SmallRyeGraphQLRuntimeConfig {
+
+    /**
+     * If GraphQL UI should be enabled. By default, GraphQL UI is enabled if it is included (see {@code always-include}).
+     */
+    @ConfigItem(name = "ui.enable", defaultValue = "true")
+    boolean enable;
+
+}
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java
index e22e7acb3a598..656150c562bd8 100644
--- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLSchemaHandler.java
@@ -21,13 +21,14 @@ public class SmallRyeGraphQLSchemaHandler implements Handler<RoutingContext> {
 
     @Override
     public void handle(RoutingContext event) {
+        HttpServerRequest request = event.request();
+        HttpServerResponse response = event.response();
+
         GraphQLSchema graphQLSchema = CDI.current().select(GraphQLSchema.class).get();
         SchemaPrinter schemaPrinter = CDI.current().select(SchemaPrinter.class).get();
 
         String schemaString = schemaPrinter.print(graphQLSchema);
 
-        HttpServerRequest request = event.request();
-        HttpServerResponse response = event.response();
         if (request.method().equals(HttpMethod.OPTIONS)) {
             response.headers().set(HttpHeaders.ALLOW, ALLOWED_METHODS);
         } else if (request.method().equals(HttpMethod.GET)) {
diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLStaticHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLStaticHandler.java
new file mode 100644
index 0000000000000..8e54c389e5127
--- /dev/null
+++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLStaticHandler.java
@@ -0,0 +1,60 @@
+package io.quarkus.smallrye.graphql.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.handler.StaticHandler;
+
+/**
+ * Handling static Health UI content
+ */
+public class SmallRyeGraphQLStaticHandler implements Handler<RoutingContext> {
+
+    private String graphqlUiFinalDestination;
+    private String graphqlUiPath;
+
+    public SmallRyeGraphQLStaticHandler() {
+    }
+
+    public SmallRyeGraphQLStaticHandler(String graphqlUiFinalDestination, String graphqlUiPath) {
+        this.graphqlUiFinalDestination = graphqlUiFinalDestination;
+        this.graphqlUiPath = graphqlUiPath;
+    }
+
+    public String getGraphqlUiFinalDestination() {
+        return graphqlUiFinalDestination;
+    }
+
+    public void setGraphqlUiFinalDestination(String graphqlUiFinalDestination) {
+        this.graphqlUiFinalDestination = graphqlUiFinalDestination;
+    }
+
+    public String getGraphqlUiPath() {
+        return graphqlUiPath;
+    }
+
+    public void setGraphqlUiPath(String graphqlUiPath) {
+        this.graphqlUiPath = graphqlUiPath;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        StaticHandler staticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
+                .setWebRoot(graphqlUiFinalDestination)
+                .setDefaultContentEncoding("UTF-8");
+
+        if (event.normalisedPath().length() == graphqlUiPath.length()) {
+
+            event.response().setStatusCode(302);
+            event.response().headers().set(HttpHeaders.LOCATION, graphqlUiPath + "/");
+            event.response().end();
+            return;
+        } else if (event.normalisedPath().length() == graphqlUiPath.length() + 1) {
+            event.reroute(graphqlUiPath + "/index.html");
+            return;
+        }
+
+        staticHandler.handle(event);
+    }
+
+}
diff --git a/extensions/smallrye-health/deployment/pom.xml b/extensions/smallrye-health/deployment/pom.xml
index ba726f393183a..8e331d54fe120 100644
--- a/extensions/smallrye-health/deployment/pom.xml
+++ b/extensions/smallrye-health/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-health-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,11 +33,18 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>smallrye-health-ui</artifactId>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -50,6 +56,16 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthBuildTimeConfig.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthBuildTimeConfig.java
index f6f272c2c068c..01491dc3addad 100644
--- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthBuildTimeConfig.java
+++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthBuildTimeConfig.java
@@ -10,4 +10,10 @@ public class HealthBuildTimeConfig {
      */
     @ConfigItem(name = "extensions.enabled", defaultValue = "true")
     public boolean extensionsEnabled;
+
+    /**
+     * Whether or not to include the Liveness and Readiness Health endpoints in the generated OpenAPI document
+     */
+    @ConfigItem(name = "openapi.included", defaultValue = "false")
+    public boolean openapiIncluded;
 }
diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java
new file mode 100644
index 0000000000000..96051e54fbc61
--- /dev/null
+++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java
@@ -0,0 +1,217 @@
+package io.quarkus.smallrye.health.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.microprofile.openapi.OASFilter;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+import org.eclipse.microprofile.openapi.models.Operation;
+import org.eclipse.microprofile.openapi.models.PathItem;
+import org.eclipse.microprofile.openapi.models.Paths;
+import org.eclipse.microprofile.openapi.models.media.Content;
+import org.eclipse.microprofile.openapi.models.media.MediaType;
+import org.eclipse.microprofile.openapi.models.media.Schema;
+import org.eclipse.microprofile.openapi.models.responses.APIResponse;
+import org.eclipse.microprofile.openapi.models.responses.APIResponses;
+
+import io.smallrye.openapi.api.models.ComponentsImpl;
+import io.smallrye.openapi.api.models.OperationImpl;
+import io.smallrye.openapi.api.models.PathItemImpl;
+import io.smallrye.openapi.api.models.PathsImpl;
+import io.smallrye.openapi.api.models.media.ContentImpl;
+import io.smallrye.openapi.api.models.media.MediaTypeImpl;
+import io.smallrye.openapi.api.models.media.SchemaImpl;
+import io.smallrye.openapi.api.models.responses.APIResponseImpl;
+import io.smallrye.openapi.api.models.responses.APIResponsesImpl;
+
+/**
+ * Create OpenAPI entries (if configured)
+ */
+public class HealthOpenAPIFilter implements OASFilter {
+    private static final List<String> MICROPROFILE_HEALTH_TAG = Collections.singletonList("MicroProfile Health");
+
+    private final String rootPath;
+    private final String livenessPath;
+    private final String readinessPath;
+
+    public HealthOpenAPIFilter(String rootPath, String livenessPath, String readinessPath) {
+        this.rootPath = rootPath;
+        this.livenessPath = livenessPath;
+        this.readinessPath = readinessPath;
+    }
+
+    @Override
+    public void filterOpenAPI(OpenAPI openAPI) {
+        if (openAPI.getComponents() == null) {
+            openAPI.setComponents(new ComponentsImpl());
+        }
+        openAPI.getComponents().addSchema("HealthCheckResponse", createHealthCheckResponse());
+        openAPI.getComponents().addSchema("State", createState());
+
+        if (openAPI.getPaths() == null) {
+            openAPI.setPaths(new PathsImpl());
+        }
+        Paths paths = openAPI.getPaths();
+
+        // Health
+        paths.addPathItem(rootPath, createHealthPathItem());
+
+        // Liveness
+        paths.addPathItem(livenessPath, createLivenessPathItem());
+
+        // Readiness
+        paths.addPathItem(readinessPath, createReadinessPathItem());
+    }
+
+    private PathItem createHealthPathItem() {
+        PathItem pathItem = new PathItemImpl();
+        pathItem.setDescription("MicroProfile Health Endpoint");
+        pathItem.setSummary(
+                "MicroProfile Health provides a way for your application to distribute information about its healthiness state to state whether or not it is able to function properly");
+        pathItem.setGET(createHealthOperation());
+        return pathItem;
+    }
+
+    private PathItem createLivenessPathItem() {
+        PathItem pathItem = new PathItemImpl();
+        pathItem.setDescription("MicroProfile Health - Liveness Endpoint");
+        pathItem.setSummary(
+                "Liveness checks are utilized to tell whether the application should be restarted");
+        pathItem.setGET(createLivenessOperation());
+        return pathItem;
+    }
+
+    private PathItem createReadinessPathItem() {
+        PathItem pathItem = new PathItemImpl();
+        pathItem.setDescription("MicroProfile Health - Readiness Endpoint");
+        pathItem.setSummary(
+                "Readiness checks are used to tell whether the application is able to process requests");
+        pathItem.setGET(createReadinessOperation());
+        return pathItem;
+    }
+
+    private Operation createHealthOperation() {
+        Operation operation = new OperationImpl();
+        operation.setDescription("Check the health of the application");
+        operation.setOperationId("microprofile_health_root");
+        operation.setTags(MICROPROFILE_HEALTH_TAG);
+        operation.setSummary("An aggregated view of the Liveness and Readiness of this application");
+        operation.setResponses(createAPIResponses());
+        return operation;
+    }
+
+    private Operation createLivenessOperation() {
+        Operation operation = new OperationImpl();
+        operation.setDescription("Check the liveness of the application");
+        operation.setOperationId("microprofile_health_liveness");
+        operation.setTags(MICROPROFILE_HEALTH_TAG);
+        operation.setSummary("The Liveness check of this application");
+        operation.setResponses(createAPIResponses());
+        return operation;
+    }
+
+    private Operation createReadinessOperation() {
+        Operation operation = new OperationImpl();
+        operation.setDescription("Check the readiness of the application");
+        operation.setOperationId("microprofile_health_readiness");
+        operation.setTags(MICROPROFILE_HEALTH_TAG);
+        operation.setSummary("The Readiness check of this application");
+        operation.setResponses(createAPIResponses());
+        return operation;
+    }
+
+    private APIResponses createAPIResponses() {
+        APIResponses responses = new APIResponsesImpl();
+        responses.addAPIResponse("200", createAPIResponse("OK"));
+        responses.addAPIResponse("503", createAPIResponse("Service Unavailable"));
+        responses.addAPIResponse("500", createAPIResponse("Internal Server Error"));
+        return responses;
+    }
+
+    private APIResponse createAPIResponse(String description) {
+        APIResponse response = new APIResponseImpl();
+        response.setDescription(description);
+        response.setContent(createContent());
+        return response;
+    }
+
+    private Content createContent() {
+        Content content = new ContentImpl();
+        content.addMediaType("application/json", createMediaType());
+        return content;
+    }
+
+    private MediaType createMediaType() {
+        MediaType mediaType = new MediaTypeImpl();
+        mediaType.setSchema(new SchemaImpl().ref("#/components/schemas/HealthCheckResponse"));
+        return mediaType;
+    }
+
+    /**
+     * HealthCheckResponse:
+     * type: object
+     * properties:
+     * data:
+     * type: object
+     * nullable: true
+     * name:
+     * type: string
+     * state:
+     * $ref: '#/components/schemas/State'
+     * 
+     * @return Schema representing HealthCheckResponse
+     */
+    private Schema createHealthCheckResponse() {
+        Schema schema = new SchemaImpl("HealthCheckResponse");
+        schema.setType(Schema.SchemaType.OBJECT);
+        schema.setProperties(createProperties());
+        return schema;
+    }
+
+    private Map<String, Schema> createProperties() {
+        Map<String, Schema> map = new HashMap<>();
+        map.put("data", createData());
+        map.put("name", createName());
+        map.put("state", new SchemaImpl().ref("#/components/schemas/State"));
+        return map;
+    }
+
+    private Schema createData() {
+        Schema schema = new SchemaImpl("data");
+        schema.setType(Schema.SchemaType.OBJECT);
+        schema.setNullable(Boolean.TRUE);
+        return schema;
+    }
+
+    private Schema createName() {
+        Schema schema = new SchemaImpl("name");
+        schema.setType(Schema.SchemaType.STRING);
+        return schema;
+    }
+
+    /**
+     * State:
+     * enum:
+     * - DOWN
+     * - UP
+     * type: string
+     * 
+     * @return Schema representing State
+     */
+    private Schema createState() {
+        Schema schema = new SchemaImpl("State");
+        schema.setEnumeration(createStateEnumValues());
+        schema.setType(Schema.SchemaType.STRING);
+        return schema;
+    }
+
+    private List<Object> createStateEnumValues() {
+        List<Object> values = new ArrayList<>();
+        values.add("DOWN");
+        values.add("UP");
+        return values;
+    }
+}
diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthBuildItem.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthBuildItem.java
new file mode 100644
index 0000000000000..8764414cadc35
--- /dev/null
+++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthBuildItem.java
@@ -0,0 +1,22 @@
+package io.quarkus.smallrye.health.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class SmallRyeHealthBuildItem extends SimpleBuildItem {
+
+    private final String healthUiFinalDestination;
+    private final String healthUiPath;
+
+    public SmallRyeHealthBuildItem(String healthUiFinalDestination, String healthUiPath) {
+        this.healthUiFinalDestination = healthUiFinalDestination;
+        this.healthUiPath = healthUiPath;
+    }
+
+    public String getHealthUiFinalDestination() {
+        return healthUiFinalDestination;
+    }
+
+    public String getHealthUiPath() {
+        return healthUiPath;
+    }
+}
\ No newline at end of file
diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthConfig.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthConfig.java
index 08104bf8c73bd..7cb60dfabf3fd 100644
--- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthConfig.java
+++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthConfig.java
@@ -9,30 +9,41 @@ public class SmallRyeHealthConfig {
 
     /**
      * Root path for health-checking endpoints.
+     * By default, this value will be resolved as a path relative to `${quarkus.http.non-application-root-path}`.
      */
-    @ConfigItem(defaultValue = "/health")
+    @ConfigItem(defaultValue = "health")
     String rootPath;
 
     /**
      * The relative path of the liveness health-checking endpoint.
+     * By default, this value will be resolved as a path relative to `${quarkus.smallrye-health.rootPath}`.
      */
-    @ConfigItem(defaultValue = "/live")
+    @ConfigItem(defaultValue = "live")
     String livenessPath;
 
     /**
      * The relative path of the readiness health-checking endpoint.
+     * By default, this value will be resolved as a path relative to `${quarkus.smallrye-health.rootPath}`.
      */
-    @ConfigItem(defaultValue = "/ready")
+    @ConfigItem(defaultValue = "ready")
     String readinessPath;
 
     /**
      * The relative path of the health group endpoint.
+     * By default, this value will be resolved as a path relative to `${quarkus.smallrye-health.rootPath}`.
      */
-    @ConfigItem(defaultValue = "/group")
+    @ConfigItem(defaultValue = "group")
     String groupPath;
 
     /**
-     * UI configuration
+     * The relative path of the wellness health-checking endpoint.
+     * By default, this value will be resolved as a path relative to `${quarkus.smallrye-health.rootPath}`.
+     */
+    @ConfigItem(defaultValue = "well")
+    String wellnessPath;
+
+    /**
+     * SmallRye Health UI configuration
      */
     @ConfigItem
     @ConfigDocSection
diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java
index 9af5262c90440..1dc1fb1af1fd5 100644
--- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java
+++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthProcessor.java
@@ -3,24 +3,19 @@
 import static io.quarkus.arc.processor.Annotations.containsAny;
 import static io.quarkus.arc.processor.Annotations.getAnnotations;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
+import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.health.Health;
@@ -30,6 +25,7 @@
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationTarget.Kind;
+import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.logging.Logger;
@@ -43,7 +39,8 @@
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -51,15 +48,15 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.ShutdownListenerBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.configuration.ConfigurationError;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
-import io.quarkus.deployment.util.FileUtil;
-import io.quarkus.deployment.util.IoUtil;
 import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.deployment.util.WebJarUtil;
 import io.quarkus.kubernetes.spi.KubernetesHealthLivenessPathBuildItem;
 import io.quarkus.kubernetes.spi.KubernetesHealthReadinessPathBuildItem;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
@@ -67,17 +64,18 @@
 import io.quarkus.smallrye.health.runtime.SmallRyeHealthGroupHandler;
 import io.quarkus.smallrye.health.runtime.SmallRyeHealthHandler;
 import io.quarkus.smallrye.health.runtime.SmallRyeHealthRecorder;
+import io.quarkus.smallrye.health.runtime.SmallRyeHealthRuntimeConfig;
 import io.quarkus.smallrye.health.runtime.SmallRyeIndividualHealthGroupHandler;
 import io.quarkus.smallrye.health.runtime.SmallRyeLivenessHandler;
 import io.quarkus.smallrye.health.runtime.SmallRyeReadinessHandler;
-import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.smallrye.health.runtime.SmallRyeWellnessHandler;
+import io.quarkus.smallrye.openapi.deployment.spi.AddToOpenAPIDefinitionBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
-import io.quarkus.vertx.http.runtime.HandlerType;
-import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
 import io.smallrye.health.SmallRyeHealthReporter;
 import io.smallrye.health.api.HealthGroup;
 import io.smallrye.health.api.HealthGroups;
+import io.smallrye.health.api.Wellness;
 import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 
@@ -89,24 +87,47 @@ class SmallRyeHealthProcessor {
     private static final DotName READINESS = DotName.createSimple(Readiness.class.getName());
     private static final DotName HEALTH_GROUP = DotName.createSimple(HealthGroup.class.getName());
     private static final DotName HEALTH_GROUPS = DotName.createSimple(HealthGroups.class.getName());
+    private static final DotName WELLNESS = DotName.createSimple(Wellness.class.getName());
     private static final DotName JAX_RS_PATH = DotName.createSimple("javax.ws.rs.Path");
 
     // For the UI
     private static final String HEALTH_UI_WEBJAR_GROUP_ID = "io.smallrye";
     private static final String HEALTH_UI_WEBJAR_ARTIFACT_ID = "smallrye-health-ui";
-    private static final String HEALTH_UI_WEBJAR_PREFIX = "META-INF/resources/health-ui";
-    private static final String OWN_MEDIA_FOLDER = "META-INF/resources/";
+    private static final String HEALTH_UI_WEBJAR_PREFIX = "META-INF/resources/health-ui/";
     private static final String HEALTH_UI_FINAL_DESTINATION = "META-INF/health-ui-files";
-    private static final String TEMP_DIR_PREFIX = "quarkus-health-ui_" + System.nanoTime();
-    private static final List<String> IGNORE_LIST = Arrays.asList("logo.png", "favicon.ico");
-    private static final String FILE_TO_UPDATE = "healthui.js";
-    /**
-     * The configuration for health checking.
-     */
-    SmallRyeHealthConfig health;
+    private static final String JS_FILE_TO_UPDATE = "healthui.js";
+    private static final String INDEX_FILE_TO_UPDATE = "index.html";
+
+    // Branding files to monitor for changes 
+    private static final String BRANDING_DIR = "META-INF/branding/";
+    private static final String BRANDING_LOGO_GENERAL = BRANDING_DIR + "logo.png";
+    private static final String BRANDING_LOGO_MODULE = BRANDING_DIR + "smallrye-health-ui.png";
+    private static final String BRANDING_STYLE_GENERAL = BRANDING_DIR + "style.css";
+    private static final String BRANDING_STYLE_MODULE = BRANDING_DIR + "smallrye-health-ui.css";
+    private static final String BRANDING_FAVICON_GENERAL = BRANDING_DIR + "favicon.ico";
+    private static final String BRANDING_FAVICON_MODULE = BRANDING_DIR + "smallrye-health-ui.ico";
+
+    static class OpenAPIIncluded implements BooleanSupplier {
+        HealthBuildTimeConfig config;
+
+        public boolean getAsBoolean() {
+            return config.openapiIncluded;
+        }
+    }
 
     HealthBuildTimeConfig config;
 
+    @BuildStep
+    List<HotDeploymentWatchedFileBuildItem> brandingFiles() {
+        return Stream.of(BRANDING_LOGO_GENERAL,
+                BRANDING_STYLE_GENERAL,
+                BRANDING_FAVICON_GENERAL,
+                BRANDING_LOGO_MODULE,
+                BRANDING_STYLE_MODULE,
+                BRANDING_FAVICON_MODULE).map(HotDeploymentWatchedFileBuildItem::new)
+                .collect(Collectors.toList());
+    }
+
     @BuildStep
     void healthCheck(BuildProducer<AdditionalBeanBuildItem> buildItemBuildProducer,
             List<HealthBuildItem> healthBuildItems) {
@@ -128,27 +149,19 @@ void healthCheck(BuildProducer<AdditionalBeanBuildItem> buildItemBuildProducer,
     void build(SmallRyeHealthRecorder recorder,
             BuildProducer<FeatureBuildItem> feature,
             BuildProducer<AdditionalBeanBuildItem> additionalBean,
-            BuildProducer<BeanDefiningAnnotationBuildItem> beanDefiningAnnotation,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
-            LaunchModeBuildItem launchModeBuildItem) throws IOException, ClassNotFoundException {
+            BuildProducer<BeanDefiningAnnotationBuildItem> beanDefiningAnnotation)
+            throws IOException, ClassNotFoundException {
 
         feature.produce(new FeatureBuildItem(Feature.SMALLRYE_HEALTH));
 
-        // add health endpoints to not found page
-        if (launchModeBuildItem.getLaunchMode().isDevOrTest()) {
-            displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(health.rootPath));
-            displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(health.rootPath + health.livenessPath));
-            displayableEndpoints
-                    .produce(new NotFoundPageDisplayableEndpointBuildItem(health.rootPath + health.readinessPath));
-            displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(health.rootPath + health.groupPath));
-        }
-
-        // Discover the beans annotated with @Health, @Liveness, @Readiness, @HealthGroup and @HealthGroups even if no scope is defined
+        // Discover the beans annotated with @Health, @Liveness, @Readiness, @HealthGroup,
+        // @HealthGroups and @Wellness even if no scope is defined
         beanDefiningAnnotation.produce(new BeanDefiningAnnotationBuildItem(HEALTH));
         beanDefiningAnnotation.produce(new BeanDefiningAnnotationBuildItem(LIVENESS));
         beanDefiningAnnotation.produce(new BeanDefiningAnnotationBuildItem(READINESS));
         beanDefiningAnnotation.produce(new BeanDefiningAnnotationBuildItem(HEALTH_GROUP));
         beanDefiningAnnotation.produce(new BeanDefiningAnnotationBuildItem(HEALTH_GROUPS));
+        beanDefiningAnnotation.produce(new BeanDefiningAnnotationBuildItem(WELLNESS));
 
         // Add additional beans
         additionalBean.produce(new AdditionalBeanBuildItem(SmallRyeHealthReporter.class));
@@ -175,26 +188,44 @@ void build(SmallRyeHealthRecorder recorder,
 
     @BuildStep
     public void defineHealthRoutes(BuildProducer<RouteBuildItem> routes,
-            BeanArchiveIndexBuildItem beanArchiveIndex) {
+            BeanArchiveIndexBuildItem beanArchiveIndex,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            SmallRyeHealthConfig healthConfig) {
         IndexView index = beanArchiveIndex.getIndex();
 
         // log a warning if users try to use MP Health annotations with JAX-RS @Path
         warnIfJaxRsPathUsed(index, LIVENESS);
         warnIfJaxRsPathUsed(index, READINESS);
         warnIfJaxRsPathUsed(index, HEALTH);
+        warnIfJaxRsPathUsed(index, WELLNESS);
 
         // Register the health handler
-        routes.produce(new RouteBuildItem(health.rootPath, new SmallRyeHealthHandler(), HandlerType.BLOCKING));
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route(healthConfig.rootPath)
+                .routeConfigKey("quarkus.smallrye-health.root-path")
+                .handler(new SmallRyeHealthHandler())
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage()
+                .blockingRoute()
+                .build());
 
         // Register the liveness handler
-        routes.produce(
-                new RouteBuildItem(health.rootPath + health.livenessPath, new SmallRyeLivenessHandler(),
-                        HandlerType.BLOCKING));
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .nestedRoute(healthConfig.rootPath, healthConfig.livenessPath)
+                .handler(new SmallRyeLivenessHandler())
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage()
+                .blockingRoute()
+                .build());
 
         // Register the readiness handler
-        routes.produce(
-                new RouteBuildItem(health.rootPath + health.readinessPath, new SmallRyeReadinessHandler(),
-                        HandlerType.BLOCKING));
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .nestedRoute(healthConfig.rootPath, healthConfig.readinessPath)
+                .handler(new SmallRyeReadinessHandler())
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage()
+                .blockingRoute()
+                .build());
 
         // Find all health groups
         Set<String> healthGroups = new HashSet<>();
@@ -210,15 +241,51 @@ public void defineHealthRoutes(BuildProducer<RouteBuildItem> routes,
         }
 
         // Register the health group handlers
-        routes.produce(
-                new RouteBuildItem(health.rootPath + health.groupPath, new SmallRyeHealthGroupHandler(),
-                        HandlerType.BLOCKING));
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .nestedRoute(healthConfig.rootPath, healthConfig.groupPath)
+                .handler(new SmallRyeHealthGroupHandler())
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage()
+                .blockingRoute()
+                .build());
 
         SmallRyeIndividualHealthGroupHandler handler = new SmallRyeIndividualHealthGroupHandler();
         for (String healthGroup : healthGroups) {
-            routes.produce(
-                    new RouteBuildItem(health.rootPath + health.groupPath + "/" + healthGroup,
-                            handler, HandlerType.BLOCKING));
+            routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .nestedRoute(healthConfig.rootPath, healthConfig.groupPath + "/" + healthGroup)
+                    .handler(handler)
+                    .requiresLegacyRedirect()
+                    .displayOnNotFoundPage()
+                    .blockingRoute()
+                    .build());
+        }
+
+        // Register the wellness handler
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .nestedRoute(healthConfig.rootPath, healthConfig.wellnessPath)
+                .handler(new SmallRyeWellnessHandler())
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage()
+                .blockingRoute()
+                .build());
+
+    }
+
+    @BuildStep(onlyIf = OpenAPIIncluded.class)
+    public void includeInOpenAPIEndpoint(BuildProducer<AddToOpenAPIDefinitionBuildItem> openAPIProducer,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            Capabilities capabilities,
+            SmallRyeHealthConfig healthConfig) {
+
+        // Add to OpenAPI if OpenAPI is available
+        if (capabilities.isPresent(Capability.SMALLRYE_OPENAPI)) {
+            String healthRootPath = nonApplicationRootPathBuildItem.resolvePath(healthConfig.rootPath);
+
+            HealthOpenAPIFilter filter = new HealthOpenAPIFilter(healthRootPath,
+                    nonApplicationRootPathBuildItem.resolveNestedPath(healthRootPath, healthConfig.livenessPath),
+                    nonApplicationRootPathBuildItem.resolveNestedPath(healthRootPath, healthConfig.readinessPath));
+
+            openAPIProducer.produce(new AddToOpenAPIDefinitionBuildItem(filter));
         }
     }
 
@@ -246,18 +313,17 @@ private void warnIfJaxRsPathUsed(IndexView index, DotName healthAnnotation) {
     }
 
     @BuildStep
-    public void kubernetes(HttpBuildTimeConfig httpConfig,
+    public void kubernetes(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            SmallRyeHealthConfig healthConfig,
             BuildProducer<KubernetesHealthLivenessPathBuildItem> livenessPathItemProducer,
             BuildProducer<KubernetesHealthReadinessPathBuildItem> readinessPathItemProducer) {
-        if (httpConfig.rootPath == null) {
-            livenessPathItemProducer.produce(new KubernetesHealthLivenessPathBuildItem(health.rootPath + health.livenessPath));
-            readinessPathItemProducer
-                    .produce(new KubernetesHealthReadinessPathBuildItem(health.rootPath + health.readinessPath));
-        } else {
-            String basePath = httpConfig.rootPath.replaceAll("/$", "") + health.rootPath;
-            livenessPathItemProducer.produce(new KubernetesHealthLivenessPathBuildItem(basePath + health.livenessPath));
-            readinessPathItemProducer.produce(new KubernetesHealthReadinessPathBuildItem(basePath + health.readinessPath));
-        }
+
+        livenessPathItemProducer.produce(
+                new KubernetesHealthLivenessPathBuildItem(
+                        nonApplicationRootPathBuildItem.resolveNestedPath(healthConfig.rootPath, healthConfig.livenessPath)));
+        readinessPathItemProducer.produce(
+                new KubernetesHealthReadinessPathBuildItem(
+                        nonApplicationRootPathBuildItem.resolveNestedPath(healthConfig.rootPath, healthConfig.readinessPath)));
     }
 
     @BuildStep
@@ -268,15 +334,23 @@ ShutdownListenerBuildItem shutdownListener() {
     @BuildStep
     AnnotationsTransformerBuildItem annotationTransformer(BeanArchiveIndexBuildItem beanArchiveIndex,
             CustomScopeAnnotationsBuildItem scopes) {
-        // Transform health checks that are not annotated with a scope or a stereotype
-        Set<DotName> stereotypes = beanArchiveIndex.getIndex().getAnnotations(DotNames.STEREOTYPE).stream()
-                .map(AnnotationInstance::name).collect(Collectors.toSet());
+
+        // Transform health checks that are not annotated with a scope or a stereotype with a default scope
+        Set<DotName> stereotypeAnnotations = new HashSet<>();
+        for (AnnotationInstance annotation : beanArchiveIndex.getIndex().getAnnotations(DotNames.STEREOTYPE)) {
+            ClassInfo annotationClass = beanArchiveIndex.getIndex().getClassByName(annotation.name());
+            if (annotationClass != null && scopes.isScopeIn(annotationClass.classAnnotations())) {
+                // Stereotype annotation with a default scope
+                stereotypeAnnotations.add(annotationClass.name());
+            }
+        }
         List<DotName> healthAnnotations = new ArrayList<>(5);
         healthAnnotations.add(HEALTH);
         healthAnnotations.add(LIVENESS);
         healthAnnotations.add(READINESS);
         healthAnnotations.add(HEALTH_GROUP);
         healthAnnotations.add(HEALTH_GROUPS);
+        healthAnnotations.add(WELLNESS);
 
         return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
 
@@ -293,7 +367,7 @@ public void transform(TransformationContext ctx) {
                 Collection<AnnotationInstance> annotations;
                 if (ctx.isClass()) {
                     annotations = ctx.getAnnotations();
-                    if (containsAny(annotations, stereotypes)) {
+                    if (containsAny(annotations, stereotypeAnnotations)) {
                         return;
                     }
                 } else {
@@ -311,177 +385,112 @@ public void transform(TransformationContext ctx) {
     }
 
     // UI
-
     @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
     void registerUiExtension(
-            BuildProducer<RouteBuildItem> routeProducer,
             BuildProducer<GeneratedResourceBuildItem> generatedResourceProducer,
             BuildProducer<NativeImageResourceBuildItem> nativeImageResourceProducer,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> notFoundPageDisplayableEndpointProducer,
-            SmallRyeHealthRecorder recorder,
+            BuildProducer<SmallRyeHealthBuildItem> smallRyeHealthBuildProducer,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            SmallRyeHealthConfig healthConfig,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
             LaunchModeBuildItem launchMode,
-            LiveReloadBuildItem liveReload,
-            HttpRootPathBuildItem httpRootPath,
-            CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception {
+            LiveReloadBuildItem liveReloadBuildItem) throws Exception {
 
-        if (!health.ui.enable) {
-            return;
-        }
-        if ("/".equals(health.ui.rootPath)) {
-            throw new ConfigurationError(
-                    "quarkus.smallrye-health.root-path-ui was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
-        }
+        if (shouldInclude(launchMode, healthConfig)) {
+
+            if ("/".equals(healthConfig.ui.rootPath)) {
+                throw new ConfigurationError(
+                        "quarkus.smallrye-health.root-path-ui was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
+            }
 
-        String healthPath = httpRootPath.adjustPath(health.rootPath);
+            String healthPath = nonApplicationRootPathBuildItem.resolvePath(healthConfig.rootPath);
+            String healthUiPath = nonApplicationRootPathBuildItem.resolvePath(healthConfig.ui.rootPath);
 
-        if (launchMode.getLaunchMode().isDevOrTest()) {
-            CachedHealthUI cached = liveReload.getContextObject(CachedHealthUI.class);
-            boolean extractionNeeded = cached == null;
+            AppArtifact artifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, HEALTH_UI_WEBJAR_GROUP_ID,
+                    HEALTH_UI_WEBJAR_ARTIFACT_ID);
 
-            if (cached != null && !cached.cachedHealthPath.equals(healthPath)) {
-                try {
-                    FileUtil.deleteDirectory(Paths.get(cached.cachedDirectory));
-                } catch (IOException e) {
-                    LOG.error("Failed to clean Health UI temp directory on restart", e);
-                }
-                extractionNeeded = true;
-            }
-            if (extractionNeeded) {
-                if (cached == null) {
-                    cached = new CachedHealthUI();
-                    liveReload.setContextObject(CachedHealthUI.class, cached);
-                    Runtime.getRuntime().addShutdownHook(new Thread(cached, "Health UI Shutdown Hook"));
-                }
-                try {
-                    AppArtifact artifact = getHealthUiArtifact(curateOutcomeBuildItem);
-                    Path tempDir = Files.createTempDirectory(TEMP_DIR_PREFIX).toRealPath();
-                    extractHealthUi(artifact, tempDir);
-                    updateApiUrl(tempDir.resolve(FILE_TO_UPDATE), healthPath);
-                    cached.cachedDirectory = tempDir.toAbsolutePath().toString();
-                    cached.cachedHealthPath = healthPath;
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
+            if (launchMode.getLaunchMode().isDevOrTest()) {
+                Path tempPath = WebJarUtil.copyResourcesForDevOrTest(curateOutcomeBuildItem, launchMode, artifact,
+                        HEALTH_UI_WEBJAR_PREFIX);
+                updateApiUrl(tempPath.resolve(JS_FILE_TO_UPDATE), healthPath);
+                updateApiUrl(tempPath.resolve(INDEX_FILE_TO_UPDATE), healthPath);
+
+                smallRyeHealthBuildProducer
+                        .produce(new SmallRyeHealthBuildItem(tempPath.toAbsolutePath().toString(), healthUiPath));
+
+                // Handle live reload of branding files
+                if (liveReloadBuildItem.isLiveReload() && !liveReloadBuildItem.getChangedResources().isEmpty()) {
+                    WebJarUtil.hotReloadBrandingChanges(curateOutcomeBuildItem, launchMode, artifact,
+                            liveReloadBuildItem.getChangedResources());
                 }
-            }
-            Handler<RoutingContext> handler = recorder.uiHandler(cached.cachedDirectory,
-                    httpRootPath.adjustPath(health.ui.rootPath));
-            routeProducer.produce(new RouteBuildItem(health.ui.rootPath, handler));
-            routeProducer.produce(new RouteBuildItem(health.ui.rootPath + "/*", handler));
-            notFoundPageDisplayableEndpointProducer
-                    .produce(new NotFoundPageDisplayableEndpointBuildItem(health.ui.rootPath + "/"));
-        } else if (health.ui.alwaysInclude) {
-            AppArtifact artifact = getHealthUiArtifact(curateOutcomeBuildItem);
-            //we are including in a production artifact
-            //just stick the files in the generated output
-            //we could do this for dev mode as well but then we need to extract them every time
-            for (Path p : artifact.getPaths()) {
-                File artifactFile = p.toFile();
-                try (JarFile jarFile = new JarFile(artifactFile)) {
-                    Enumeration<JarEntry> entries = jarFile.entries();
-
-                    while (entries.hasMoreElements()) {
-                        JarEntry entry = entries.nextElement();
-                        if (entry.getName().startsWith(HEALTH_UI_WEBJAR_PREFIX) && !entry.isDirectory()) {
-                            try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                                String filename = entry.getName().replace(HEALTH_UI_WEBJAR_PREFIX + "/", "");
-                                byte[] content = FileUtil.readFileContents(inputStream);
-                                if (entry.getName().endsWith(FILE_TO_UPDATE)) {
-                                    content = updateApiUrl(new String(content, StandardCharsets.UTF_8), healthPath)
-                                            .getBytes(StandardCharsets.UTF_8);
-                                }
-                                if (IGNORE_LIST.contains(filename)) {
-                                    ClassLoader classLoader = SmallRyeHealthProcessor.class.getClassLoader();
-                                    try (InputStream resourceAsStream = classLoader
-                                            .getResourceAsStream(OWN_MEDIA_FOLDER + filename)) {
-                                        content = IoUtil.readBytes(resourceAsStream);
-                                    }
-                                }
-
-                                String fileName = HEALTH_UI_FINAL_DESTINATION + "/" + filename;
-
-                                generatedResourceProducer
-                                        .produce(new GeneratedResourceBuildItem(fileName, content));
-
-                                nativeImageResourceProducer
-                                        .produce(new NativeImageResourceBuildItem(fileName));
-
-                            }
-                        }
+            } else {
+                Map<String, byte[]> files = WebJarUtil.copyResourcesForProduction(curateOutcomeBuildItem, artifact,
+                        HEALTH_UI_WEBJAR_PREFIX);
+
+                for (Map.Entry<String, byte[]> file : files.entrySet()) {
+
+                    String fileName = file.getKey();
+                    byte[] content = file.getValue();
+                    if (fileName.endsWith(JS_FILE_TO_UPDATE) || fileName.endsWith(INDEX_FILE_TO_UPDATE)) {
+                        content = updateApiUrl(new String(content, StandardCharsets.UTF_8), healthPath)
+                                .getBytes(StandardCharsets.UTF_8);
                     }
-                }
-            }
+                    fileName = HEALTH_UI_FINAL_DESTINATION + "/" + fileName;
 
-            Handler<RoutingContext> handler = recorder
-                    .uiHandler(HEALTH_UI_FINAL_DESTINATION, httpRootPath.adjustPath(health.ui.rootPath));
-            routeProducer.produce(new RouteBuildItem(health.ui.rootPath, handler));
-            routeProducer.produce(new RouteBuildItem(health.ui.rootPath + "/*", handler));
-        }
-    }
+                    generatedResourceProducer.produce(new GeneratedResourceBuildItem(fileName, content));
+                    nativeImageResourceProducer.produce(new NativeImageResourceBuildItem(fileName));
+                }
 
-    private AppArtifact getHealthUiArtifact(CurateOutcomeBuildItem curateOutcomeBuildItem) {
-        for (AppDependency dep : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
-            if (dep.getArtifact().getArtifactId().equals(HEALTH_UI_WEBJAR_ARTIFACT_ID)
-                    && dep.getArtifact().getGroupId().equals(HEALTH_UI_WEBJAR_GROUP_ID)) {
-                return dep.getArtifact();
+                smallRyeHealthBuildProducer.produce(new SmallRyeHealthBuildItem(HEALTH_UI_FINAL_DESTINATION, healthUiPath));
             }
         }
-        throw new RuntimeException("Could not find artifact " + HEALTH_UI_WEBJAR_GROUP_ID + ":" + HEALTH_UI_WEBJAR_ARTIFACT_ID
-                + " among the application dependencies");
     }
 
-    private void extractHealthUi(AppArtifact artifact, Path resourceDir) throws IOException {
-        for (Path p : artifact.getPaths()) {
-            File artifactFile = p.toFile();
-            try (JarFile jarFile = new JarFile(artifactFile)) {
-                Enumeration<JarEntry> entries = jarFile.entries();
-
-                while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    if (entry.getName().startsWith(HEALTH_UI_WEBJAR_PREFIX) && !entry.isDirectory()) {
-                        try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                            String filename = entry.getName().replace(HEALTH_UI_WEBJAR_PREFIX + "/", "");
-                            if (!IGNORE_LIST.contains(filename)) {
-                                Files.copy(inputStream, resourceDir.resolve(filename));
-                            }
-                        }
-                    }
-                }
-                // Now add our own logo and favicon
-                ClassLoader classLoader = SmallRyeHealthProcessor.class.getClassLoader();
-                for (String ownMedia : IGNORE_LIST) {
-                    try (InputStream logo = classLoader.getResourceAsStream(OWN_MEDIA_FOLDER + ownMedia)) {
-                        Files.copy(logo, resourceDir.resolve(ownMedia));
-                    }
-                }
-            }
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    void registerHealthUiHandler(
+            BuildProducer<RouteBuildItem> routeProducer,
+            SmallRyeHealthRecorder recorder,
+            SmallRyeHealthRuntimeConfig runtimeConfig,
+            SmallRyeHealthBuildItem smallRyeHealthBuildItem,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            LaunchModeBuildItem launchMode,
+            SmallRyeHealthConfig healthConfig) throws Exception {
+
+        if (shouldInclude(launchMode, healthConfig)) {
+            Handler<RoutingContext> handler = recorder.uiHandler(smallRyeHealthBuildItem.getHealthUiFinalDestination(),
+                    smallRyeHealthBuildItem.getHealthUiPath(), runtimeConfig);
+
+            routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .route(healthConfig.ui.rootPath)
+                    .routeConfigKey("quarkus.smallrye-health.ui.root-path")
+                    .displayOnNotFoundPage("Health UI")
+                    .requiresLegacyRedirect()
+                    .handler(handler)
+                    .build());
+            routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .route(healthConfig.ui.rootPath + "/*")
+                    .requiresLegacyRedirect()
+                    .handler(handler)
+                    .build());
         }
     }
 
-    private void updateApiUrl(Path healthUiJs, String healthPath) throws IOException {
-        String content = new String(Files.readAllBytes(healthUiJs), StandardCharsets.UTF_8);
+    private void updateApiUrl(Path fileToUpdate, String healthPath) throws IOException {
+        String content = new String(Files.readAllBytes(fileToUpdate), StandardCharsets.UTF_8);
         String result = updateApiUrl(content, healthPath);
         if (result != null) {
-            Files.write(healthUiJs, result.getBytes(StandardCharsets.UTF_8));
+            Files.write(fileToUpdate, result.getBytes(StandardCharsets.UTF_8));
         }
     }
 
+    // Replace health URL in static files
     public String updateApiUrl(String original, String healthPath) {
-        return original.replace("url = \"/health\";", "url = \"" + healthPath + "\";");
+        return original.replace("url = \"/health\";", "url = \"" + healthPath + "\";")
+                .replace("placeholder=\"/health\"", "placeholder=\"" + healthPath + "\"");
     }
 
-    private static final class CachedHealthUI implements Runnable {
-
-        String cachedHealthPath;
-        String cachedDirectory;
-
-        @Override
-        public void run() {
-            try {
-                FileUtil.deleteDirectory(Paths.get(cachedDirectory));
-            } catch (IOException e) {
-                LOG.error("Failed to clean Health UI temp directory on shutdown", e);
-            }
-        }
+    private static boolean shouldInclude(LaunchModeBuildItem launchMode, SmallRyeHealthConfig healthConfig) {
+        return launchMode.getLaunchMode().isDevOrTest() || healthConfig.ui.alwaysInclude;
     }
 }
diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthUIConfig.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthUIConfig.java
index f933dab442b70..be3861e301175 100644
--- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthUIConfig.java
+++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthUIConfig.java
@@ -8,8 +8,9 @@ public class SmallRyeHealthUIConfig {
     /**
      * The path where Health UI is available.
      * The value `/` is not allowed as it blocks the application from serving anything else.
+     * By default, this value will be resolved as a path relative to `${quarkus.http.non-application-root-path}`.
      */
-    @ConfigItem(defaultValue = "/health-ui")
+    @ConfigItem(defaultValue = "health-ui")
     String rootPath;
 
     /**
@@ -19,9 +20,4 @@ public class SmallRyeHealthUIConfig {
     @ConfigItem(defaultValue = "false")
     boolean alwaysInclude;
 
-    /**
-     * If Health UI should be enabled. By default, Health UI is enabled.
-     */
-    @ConfigItem(defaultValue = "true")
-    boolean enable;
 }
diff --git a/extensions/smallrye-health/deployment/src/main/resources/META-INF/resources/logo.png b/extensions/smallrye-health/deployment/src/main/resources/META-INF/resources/logo.png
deleted file mode 100644
index e5201c8bb4788..0000000000000
Binary files a/extensions/smallrye-health/deployment/src/main/resources/META-INF/resources/logo.png and /dev/null differ
diff --git a/extensions/smallrye-health/deployment/src/main/resources/dev-templates/embedded.html b/extensions/smallrye-health/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..36f058723ff00
--- /dev/null
+++ b/extensions/smallrye-health/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,7 @@
+<a href="{config:http-path('quarkus.smallrye-health.root-path')}" class="badge badge-light">
+  <i class="fa fa-stethoscope fa-fw"></i>
+  Health</a>
+<br>
+<a href="{config:http-path('quarkus.smallrye-health.ui.root-path')}/" class="badge badge-light">
+  <i class="fa fa-stethoscope fa-fw"></i>
+  Health UI</a>
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java
index 590514951ed18..f0f8df24e8099 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/DispatchedThreadTest.java
@@ -31,7 +31,7 @@ public class DispatchedThreadTest {
 
     @Test
     public void check() {
-        RestAssured.when().get("/health/live").then()
+        RestAssured.when().get("/q/health/live").then()
                 .body("status", is("UP"),
                         "checks.status", contains("UP"),
                         "checks.name", contains("my-liveness-check"),
@@ -39,7 +39,7 @@ public void check() {
                         "checks.data.thread[0]", not(stringContainsInOrder("loop")),
                         "checks.data.request[0]", is(true));
 
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .body("status", is("UP"),
                         "checks.status", contains("UP"),
                         "checks.name", contains("my-readiness-check"),
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java
index 46080336f115c..56cd5b0dcb594 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/FailingUnitTest.java
@@ -33,9 +33,9 @@ public class FailingUnitTest {
 
     @Test
     public void testHealthServlet() {
-        RestAssured.when().get("/health/live").then().statusCode(503);
-        RestAssured.when().get("/health/ready").then().statusCode(503);
-        RestAssured.when().get("/health").then().statusCode(503);
+        RestAssured.when().get("/q/health/live").then().statusCode(503);
+        RestAssured.when().get("/q/health/ready").then().statusCode(503);
+        RestAssured.when().get("/q/health").then().statusCode(503);
     }
 
     @Test
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java
index 38426e7e6b2e9..c7dd3f7983b3b 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckDefaultScopeTest.java
@@ -1,9 +1,19 @@
 package io.quarkus.smallrye.health.test;
 
 import static io.restassured.RestAssured.when;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.Stereotype;
+import javax.inject.Named;
+
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Liveness;
@@ -21,21 +31,21 @@ public class HealthCheckDefaultScopeTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(NoScopeCheck.class));
+                    .addClasses(NoScopeCheck.class, NoScopeStereotypeWithoutScopeCheck.class, MyStereotype.class));
 
     @Test
     public void testHealth() {
         // the health check does not set a content type so we need to force the parser
         try {
             RestAssured.defaultParser = Parser.JSON;
-            when().get("/health/live").then()
+            when().get("/q/health/live").then()
                     .body("status", is("UP"),
-                            "checks.status", contains("UP"),
-                            "checks.name", contains("noScope"));
-            when().get("/health/live").then()
+                            "checks.status", contains("UP", "UP"),
+                            "checks.name", contains("noScope", "noScopeStereotype"));
+            when().get("/q/health/live").then()
                     .body("status", is("DOWN"),
-                            "checks.status", contains("DOWN"),
-                            "checks.name", contains("noScope"));
+                            "checks.status", contains("DOWN", "DOWN"),
+                            "checks.name", contains("noScope", "noScopeStereotype"));
         } finally {
             RestAssured.reset();
         }
@@ -56,4 +66,27 @@ public HealthCheckResponse call() {
         }
     }
 
+    // No scope and stereotype without scope - @Singleton is used by default
+    @MyStereotype
+    @Liveness
+    static class NoScopeStereotypeWithoutScopeCheck implements HealthCheck {
+
+        volatile int counter = 0;
+
+        @Override
+        public HealthCheckResponse call() {
+            if (++counter > 1) {
+                return HealthCheckResponse.builder().down().name("noScopeStereotype").build();
+            }
+            return HealthCheckResponse.builder().up().name("noScopeStereotype").build();
+        }
+    }
+
+    @Named
+    @Stereotype
+    @Target({ TYPE, METHOD, FIELD })
+    @Retention(RUNTIME)
+    public @interface MyStereotype {
+    }
+
 }
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java
index ebd89744bce6c..17444fd7bd9b2 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthCheckProducerDefaultScopeTest.java
@@ -33,11 +33,11 @@ public void testHealth() {
         // the health check does not set a content type so we need to force the parser
         try {
             RestAssured.defaultParser = Parser.JSON;
-            when().get("/health/ready").then()
+            when().get("/q/health/ready").then()
                     .body("status", is("UP"),
                             "checks.status", contains("UP", "UP"),
                             "checks.name", containsInAnyOrder("alpha1", "bravo1"));
-            when().get("/health/ready").then()
+            when().get("/q/health/ready").then()
                     .body("status", is("UP"),
                             "checks.status", contains("UP", "UP"),
                             "checks.name", containsInAnyOrder("alpha1", "bravo2"));
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java
new file mode 100644
index 0000000000000..912f6fe7d498b
--- /dev/null
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthOpenAPITest.java
@@ -0,0 +1,40 @@
+package io.quarkus.smallrye.health.test;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class HealthOpenAPITest {
+
+    private static final String OPEN_API_PATH = "/q/openapi";
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BasicHealthCheck.class, OpenApiRoute.class)
+                    .addAsResource(new StringAsset("quarkus.health.openapi.included=true\n"
+                            + "quarkus.smallrye-openapi.store-schema-directory=target"), "application.properties")
+                    .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+
+    @Test
+    public void testOpenApiPathAccessResource() {
+
+        RestAssured.given().header("Accept", "application/json")
+                .when().get(OPEN_API_PATH)
+                .then()
+                .header("Content-Type", "application/json;charset=UTF-8")
+                .body("paths", Matchers.hasKey("/q/health/ready"))
+                .body("paths", Matchers.hasKey("/q/health/live"))
+                .body("paths", Matchers.hasKey("/q/health"))
+                .body("components.schemas.HealthCheckResponse.type", Matchers.equalTo("object"));
+
+    }
+
+}
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java
index e82fddf806de8..91475a28d6276 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/HealthUnitTest.java
@@ -26,7 +26,7 @@ public void testHealth() {
         // the health check does not set a content type so we need to force the parser
         try {
             RestAssured.defaultParser = Parser.JSON;
-            RestAssured.when().get("/health/live").then()
+            RestAssured.when().get("/q/health/live").then()
                     .body("status", is("UP"),
                             "checks.status", contains("UP"),
                             "checks.name", contains("basic"));
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java
new file mode 100644
index 0000000000000..7bfd1ab55ac67
--- /dev/null
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/OpenApiRoute.java
@@ -0,0 +1,20 @@
+package io.quarkus.smallrye.health.test;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.vertx.web.Route;
+import io.quarkus.vertx.web.RouteBase;
+import io.vertx.core.http.HttpMethod;
+
+/**
+ * A dummy test REST endpoint.
+ */
+@ApplicationScoped
+@RouteBase(path = "resource", consumes = "application/json", produces = "application/json")
+public class OpenApiRoute {
+
+    @Route(path = "/", methods = HttpMethod.GET)
+    public String root() {
+        return "resource";
+    }
+}
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java
new file mode 100644
index 0000000000000..678a956f96527
--- /dev/null
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/WellnessHealthCheckTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.smallrye.health.test;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
+import io.smallrye.health.api.Wellness;
+
+public class WellnessHealthCheckTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(WellnessHC.class));
+
+    @Test
+    public void testWellness() {
+        try {
+            RestAssured.defaultParser = Parser.JSON;
+            when().get("/q/health/well").then()
+                    .body("status", is("UP"),
+                            "checks.status", contains("UP"),
+                            "checks.name", contains(WellnessHC.class.getName()));
+        } finally {
+            RestAssured.reset();
+        }
+    }
+
+    @Wellness
+    static class WellnessHC implements HealthCheck {
+
+        @Override
+        public HealthCheckResponse call() {
+            return HealthCheckResponse.up(WellnessHC.class.getName());
+        }
+    }
+
+}
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java
index a1c4c6ccb3b7b..4068bb4e3adba 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/CustomConfigTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.graphql.deployment.ui;
+package io.quarkus.smallrye.health.test.ui;
 
 import static org.hamcrest.Matchers.containsString;
 
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java
index add09a72b82a3..76aad0f943cda 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/DisabledTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.graphql.deployment.ui;
+package io.quarkus.smallrye.health.test.ui;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
@@ -18,6 +18,6 @@ public class DisabledTest {
 
     @Test
     public void shouldUseDefaultConfig() {
-        RestAssured.when().get("/health-ui").then().statusCode(404);
+        RestAssured.when().get("/q/health-ui").then().statusCode(404);
     }
 }
diff --git a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java
index 8e51f227bbd55..56270d525a7d1 100644
--- a/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java
+++ b/extensions/smallrye-health/deployment/src/test/java/io/quarkus/smallrye/health/test/ui/ErroneousConfigTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.graphql.deployment.ui;
+package io.quarkus.smallrye.health.test.ui;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
diff --git a/extensions/smallrye-health/pom.xml b/extensions/smallrye-health/pom.xml
index 33c6afd106ef0..57e4d20e3848e 100644
--- a/extensions/smallrye-health/pom.xml
+++ b/extensions/smallrye-health/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-health/runtime/pom.xml b/extensions/smallrye-health/runtime/pom.xml
index 202b04877a145..05731aecef6cc 100644
--- a/extensions/smallrye-health/runtime/pom.xml
+++ b/extensions/smallrye-health/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-health-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,10 +18,6 @@
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-health</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.smallrye</groupId>
-            <artifactId>smallrye-health-ui</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-health-provided-checks</artifactId>
diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthNotFoundHandler.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthNotFoundHandler.java
new file mode 100644
index 0000000000000..a2521423b276e
--- /dev/null
+++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthNotFoundHandler.java
@@ -0,0 +1,17 @@
+package io.quarkus.smallrye.health.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Handling static when disabled
+ */
+public class SmallRyeHealthNotFoundHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        event.response().setStatusCode(404);
+        event.response().end();
+    }
+
+}
diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRecorder.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRecorder.java
index ef24518be6bf0..3f5a6ebfc652f 100644
--- a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRecorder.java
+++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRecorder.java
@@ -5,9 +5,7 @@
 
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.core.Handler;
-import io.vertx.core.http.HttpHeaders;
 import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.StaticHandler;
 
 @Recorder
 public class SmallRyeHealthRecorder {
@@ -21,28 +19,13 @@ public void registerHealthCheckResponseProvider(Class<? extends HealthCheckRespo
         }
     }
 
-    public Handler<RoutingContext> uiHandler(String healthUiFinalDestination, String healthUiPath) {
+    public Handler<RoutingContext> uiHandler(String healthUiFinalDestination, String healthUiPath,
+            SmallRyeHealthRuntimeConfig runtimeConfig) {
 
-        StaticHandler staticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
-                .setWebRoot(healthUiFinalDestination)
-                .setDefaultContentEncoding("UTF-8");
-
-        return new Handler<RoutingContext>() {
-            @Override
-            public void handle(RoutingContext event) {
-                if (event.normalisedPath().length() == healthUiPath.length()) {
-
-                    event.response().setStatusCode(302);
-                    event.response().headers().set(HttpHeaders.LOCATION, healthUiPath + "/");
-                    event.response().end();
-                    return;
-                } else if (event.normalisedPath().length() == healthUiPath.length() + 1) {
-                    event.reroute(healthUiPath + "/index.html");
-                    return;
-                }
-
-                staticHandler.handle(event);
-            }
-        };
+        if (runtimeConfig.enable) {
+            return new SmallRyeHealthStaticHandler(healthUiFinalDestination, healthUiPath);
+        } else {
+            return new SmallRyeHealthNotFoundHandler();
+        }
     }
 }
diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRuntimeConfig.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRuntimeConfig.java
new file mode 100644
index 0000000000000..72bf241ef81c8
--- /dev/null
+++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthRuntimeConfig.java
@@ -0,0 +1,15 @@
+package io.quarkus.smallrye.health.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "smallrye-health", phase = ConfigPhase.RUN_TIME)
+public class SmallRyeHealthRuntimeConfig {
+
+    /**
+     * If Health UI should be enabled. By default, Health UI is enabled if it is included (see {@code always-include}).
+     */
+    @ConfigItem(name = "ui.enable", defaultValue = "true")
+    boolean enable;
+}
diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthStaticHandler.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthStaticHandler.java
new file mode 100644
index 0000000000000..266d2cb33dcd5
--- /dev/null
+++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeHealthStaticHandler.java
@@ -0,0 +1,59 @@
+package io.quarkus.smallrye.health.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.handler.StaticHandler;
+
+/**
+ * Handling static Health UI content
+ */
+public class SmallRyeHealthStaticHandler implements Handler<RoutingContext> {
+
+    private String healthUiFinalDestination;
+    private String healthUiPath;
+
+    public SmallRyeHealthStaticHandler() {
+    }
+
+    public SmallRyeHealthStaticHandler(String healthUiFinalDestination, String healthUiPath) {
+        this.healthUiFinalDestination = healthUiFinalDestination;
+        this.healthUiPath = healthUiPath;
+    }
+
+    public String getHealthUiFinalDestination() {
+        return healthUiFinalDestination;
+    }
+
+    public void setHealthUiFinalDestination(String healthUiFinalDestination) {
+        this.healthUiFinalDestination = healthUiFinalDestination;
+    }
+
+    public String getHealthUiPath() {
+        return healthUiPath;
+    }
+
+    public void setHealthUiPath(String healthUiPath) {
+        this.healthUiPath = healthUiPath;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        StaticHandler staticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
+                .setWebRoot(healthUiFinalDestination)
+                .setDefaultContentEncoding("UTF-8");
+
+        if (event.normalisedPath().length() == healthUiPath.length()) {
+            event.response().setStatusCode(302);
+            event.response().headers().set(HttpHeaders.LOCATION, healthUiPath + "/");
+            event.response().end();
+            return;
+        } else if (event.normalisedPath().length() == healthUiPath.length() + 1) {
+            event.reroute(healthUiPath + "/index.html");
+            return;
+        }
+
+        staticHandler.handle(event);
+    }
+
+}
diff --git a/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeWellnessHandler.java b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeWellnessHandler.java
new file mode 100644
index 0000000000000..84ca3860c1cae
--- /dev/null
+++ b/extensions/smallrye-health/runtime/src/main/java/io/quarkus/smallrye/health/runtime/SmallRyeWellnessHandler.java
@@ -0,0 +1,13 @@
+package io.quarkus.smallrye.health.runtime;
+
+import io.smallrye.health.SmallRyeHealth;
+import io.smallrye.health.SmallRyeHealthReporter;
+import io.vertx.ext.web.RoutingContext;
+
+public class SmallRyeWellnessHandler extends SmallRyeHealthHandlerBase {
+
+    @Override
+    protected SmallRyeHealth getHealth(SmallRyeHealthReporter reporter, RoutingContext routingContext) {
+        return reporter.getWellness();
+    }
+}
diff --git a/extensions/smallrye-health/spi/pom.xml b/extensions/smallrye-health/spi/pom.xml
index e974104be02b1..059665333017c 100644
--- a/extensions/smallrye-health/spi/pom.xml
+++ b/extensions/smallrye-health/spi/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-health-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-jwt-build/deployment/pom.xml b/extensions/smallrye-jwt-build/deployment/pom.xml
new file mode 100644
index 0000000000000..7317a8485e090
--- /dev/null
+++ b/extensions/smallrye-jwt-build/deployment/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-smallrye-jwt-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+    <name>Quarkus - SmallRye JWT Build - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/smallrye-jwt-build/deployment/src/main/java/io/quarkus/smallrye/jwt/build/deployment/SmallRyeJwtBuildProcessor.java b/extensions/smallrye-jwt-build/deployment/src/main/java/io/quarkus/smallrye/jwt/build/deployment/SmallRyeJwtBuildProcessor.java
new file mode 100644
index 0000000000000..1ba25c1510bb1
--- /dev/null
+++ b/extensions/smallrye-jwt-build/deployment/src/main/java/io/quarkus/smallrye/jwt/build/deployment/SmallRyeJwtBuildProcessor.java
@@ -0,0 +1,18 @@
+package io.quarkus.smallrye.jwt.build.deployment;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.smallrye.jwt.algorithm.KeyEncryptionAlgorithm;
+import io.smallrye.jwt.algorithm.SignatureAlgorithm;
+import io.smallrye.jwt.build.impl.JwtProviderImpl;
+
+class SmallRyeJwtBuildProcessor {
+
+    @BuildStep
+    void addClassesForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, SignatureAlgorithm.class));
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, KeyEncryptionAlgorithm.class));
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, JwtProviderImpl.class));
+    }
+}
diff --git a/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java b/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java
new file mode 100644
index 0000000000000..7e1bb4a788e6b
--- /dev/null
+++ b/extensions/smallrye-jwt-build/deployment/src/test/java/io/quarkus/jwt/build/JwtBuildUnitTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.jwt.build;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.eclipse.microprofile.jwt.Claims;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.jwt.consumer.JwtConsumerBuilder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.jwt.build.Jwt;
+import io.smallrye.jwt.util.KeyUtils;
+
+public class JwtBuildUnitTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("publicKey.pem")
+                    .addAsResource("privateKey.pem")
+                    .addAsResource("application.properties"));
+
+    @Test
+    public void signToken() throws Exception {
+        String jwt = Jwt.preferredUserName("alice").sign();
+
+        JwtClaims jwtClaims = new JwtConsumerBuilder()
+                .setVerificationKey(KeyUtils.readPublicKey("/publicKey.pem"))
+                .build()
+                .processToClaims(jwt);
+        assertEquals("alice", jwtClaims.getClaimValue(Claims.preferred_username.name()));
+
+    }
+}
diff --git a/extensions/smallrye-jwt-build/deployment/src/test/resources/application.properties b/extensions/smallrye-jwt-build/deployment/src/test/resources/application.properties
new file mode 100644
index 0000000000000..c3359c755cfc6
--- /dev/null
+++ b/extensions/smallrye-jwt-build/deployment/src/test/resources/application.properties
@@ -0,0 +1,2 @@
+smallrye.jwt.sign.key-location=/privateKey.pem
+
diff --git a/extensions/smallrye-jwt-build/deployment/src/test/resources/privateKey.pem b/extensions/smallrye-jwt-build/deployment/src/test/resources/privateKey.pem
new file mode 100644
index 0000000000000..27543a434a1eb
--- /dev/null
+++ b/extensions/smallrye-jwt-build/deployment/src/test/resources/privateKey.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWK8UjyoHgPTLa
+PLQJ8SoXLLjpHSjtLxMqmzHnFscqhTVVaDpCRCb6e3Ii/WniQTWw8RA7vf4djz4H
+OzvlfBFNgvUGZHXDwnmGaNVaNzpHYFMEYBhE8VGGiveSkzqeLZI+Y02G6sQAfDtN
+qqzM/l5QX8X34oQFaTBW1r49nftvCpITiwJvWyhkWtXP9RP8sXi1im5Vi3dhupOh
+nelk5n0BfajUYIbfHA6ORzjHRbt7NtBl0L2J+0/FUdHyKs6KMlFGNw8O0Dq88qnM
+uXoLJiewhg9332W3DFMeOveel+//cvDnRsCRtPgd4sXFPHh+UShkso7+DRsChXa6
+oGGQD3GdAgMBAAECggEAAjfTSZwMHwvIXIDZB+yP+pemg4ryt84iMlbofclQV8hv
+6TsI4UGwcbKxFOM5VSYxbNOisb80qasb929gixsyBjsQ8284bhPJR7r0q8h1C+jY
+URA6S4pk8d/LmFakXwG9Tz6YPo3pJziuh48lzkFTk0xW2Dp4SLwtAptZY/+ZXyJ6
+96QXDrZKSSM99Jh9s7a0ST66WoxSS0UC51ak+Keb0KJ1jz4bIJ2C3r4rYlSu4hHB
+Y73GfkWORtQuyUDa9yDOem0/z0nr6pp+pBSXPLHADsqvZiIhxD/O0Xk5I6/zVHB3
+zuoQqLERk0WvA8FXz2o8AYwcQRY2g30eX9kU4uDQAQKBgQDmf7KGImUGitsEPepF
+KH5yLWYWqghHx6wfV+fdbBxoqn9WlwcQ7JbynIiVx8MX8/1lLCCe8v41ypu/eLtP
+iY1ev2IKdrUStvYRSsFigRkuPHUo1ajsGHQd+ucTDf58mn7kRLW1JGMeGxo/t32B
+m96Af6AiPWPEJuVfgGV0iwg+HQKBgQCmyPzL9M2rhYZn1AozRUguvlpmJHU2DpqS
+34Q+7x2Ghf7MgBUhqE0t3FAOxEC7IYBwHmeYOvFR8ZkVRKNF4gbnF9RtLdz0DMEG
+5qsMnvJUSQbNB1yVjUCnDAtElqiFRlQ/k0LgYkjKDY7LfciZl9uJRl0OSYeX/qG2
+tRW09tOpgQKBgBSGkpM3RN/MRayfBtmZvYjVWh3yjkI2GbHA1jj1g6IebLB9SnfL
+WbXJErCj1U+wvoPf5hfBc7m+jRgD3Eo86YXibQyZfY5pFIh9q7Ll5CQl5hj4zc4Y
+b16sFR+xQ1Q9Pcd+BuBWmSz5JOE/qcF869dthgkGhnfVLt/OQzqZluZRAoGAXQ09
+nT0TkmKIvlza5Af/YbTqEpq8mlBDhTYXPlWCD4+qvMWpBII1rSSBtftgcgca9XLB
+MXmRMbqtQeRtg4u7dishZVh1MeP7vbHsNLppUQT9Ol6lFPsd2xUpJDc6BkFat62d
+Xjr3iWNPC9E9nhPPdCNBv7reX7q81obpeXFMXgECgYEAmk2Qlus3OV0tfoNRqNpe
+Mb0teduf2+h3xaI1XDIzPVtZF35ELY/RkAHlmWRT4PCdR0zXDidE67L6XdJyecSt
+FdOUH8z5qUraVVebRFvJqf/oGsXc4+ex1ZKUTbY0wqY1y9E39yvB3MaTmZFuuqk8
+f3cg+fr8aou7pr9SHhJlZCU=
+-----END PRIVATE KEY-----
diff --git a/extensions/smallrye-jwt-build/deployment/src/test/resources/publicKey.pem b/extensions/smallrye-jwt-build/deployment/src/test/resources/publicKey.pem
new file mode 100644
index 0000000000000..6dc936fca3485
--- /dev/null
+++ b/extensions/smallrye-jwt-build/deployment/src/test/resources/publicKey.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlivFI8qB4D0y2jy0CfEq
+Fyy46R0o7S8TKpsx5xbHKoU1VWg6QkQm+ntyIv1p4kE1sPEQO73+HY8+Bzs75XwR
+TYL1BmR1w8J5hmjVWjc6R2BTBGAYRPFRhor3kpM6ni2SPmNNhurEAHw7TaqszP5e
+UF/F9+KEBWkwVta+PZ37bwqSE4sCb1soZFrVz/UT/LF4tYpuVYt3YbqToZ3pZOZ9
+AX2o1GCG3xwOjkc4x0W7ezbQZdC9iftPxVHR8irOijJRRjcPDtA6vPKpzLl6CyYn
+sIYPd99ltwxTHjr3npfv/3Lw50bAkbT4HeLFxTx4flEoZLKO/g0bAoV2uqBhkA9x
+nQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/extensions/smallrye-jwt-build/pom.xml b/extensions/smallrye-jwt-build/pom.xml
new file mode 100644
index 0000000000000..423fa273e1308
--- /dev/null
+++ b/extensions/smallrye-jwt-build/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-smallrye-jwt-build-parent</artifactId>
+    <name>Quarkus - SmallRye JWT Token Build</name>
+
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/smallrye-jwt-build/runtime/pom.xml b/extensions/smallrye-jwt-build/runtime/pom.xml
new file mode 100644
index 0000000000000..3a6e2fed97e13
--- /dev/null
+++ b/extensions/smallrye-jwt-build/runtime/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-smallrye-jwt-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-smallrye-jwt-build</artifactId>
+    <name>Quarkus - SmallRye JWT Token Build - Runtime</name>
+    <description>Create JSON Web Token with SmallRye JWT Build API</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>smallrye-jwt-build</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/smallrye-jwt-build/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-jwt-build/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..d936fa36fa35c
--- /dev/null
+++ b/extensions/smallrye-jwt-build/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,12 @@
+---
+name: "SmallRye JWT Build"
+metadata:
+  keywords:
+  - "smallrye-jwt"
+  - "smallrye-jwt-build"
+  - "jwt"
+  - "json-web-token"
+  guide: "https://quarkus.io/guides/security-jwt"
+  categories:
+  - "security"
+  status: "stable"
diff --git a/extensions/smallrye-jwt/deployment/pom.xml b/extensions/smallrye-jwt/deployment/pom.xml
index 650e8b134181f..a11304c63d5bb 100644
--- a/extensions/smallrye-jwt/deployment/pom.xml
+++ b/extensions/smallrye-jwt/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-jwt-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,6 +35,11 @@
             <artifactId>quarkus-smallrye-jwt</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java
index 670dd5bb28577..7a3fc6022f35e 100644
--- a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java
+++ b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java
@@ -32,16 +32,18 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.security.deployment.JCAProviderBuildItem;
 import io.quarkus.smallrye.jwt.runtime.auth.JWTAuthMechanism;
+import io.quarkus.smallrye.jwt.runtime.auth.JsonWebTokenCredentialProducer;
 import io.quarkus.smallrye.jwt.runtime.auth.JwtPrincipalProducer;
 import io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator;
 import io.quarkus.smallrye.jwt.runtime.auth.RawOptionalClaimCreator;
+import io.smallrye.jwt.algorithm.KeyEncryptionAlgorithm;
 import io.smallrye.jwt.algorithm.SignatureAlgorithm;
 import io.smallrye.jwt.auth.cdi.ClaimValueProducer;
 import io.smallrye.jwt.auth.cdi.CommonJwtProducer;
+import io.smallrye.jwt.auth.cdi.JWTCallerPrincipalFactoryProducer;
 import io.smallrye.jwt.auth.cdi.JsonValueProducer;
 import io.smallrye.jwt.auth.cdi.RawClaimTypeProducer;
 import io.smallrye.jwt.auth.principal.DefaultJWTParser;
-import io.smallrye.jwt.build.impl.JwtProviderImpl;
 import io.smallrye.jwt.config.JWTAuthContextInfoProvider;
 
 /**
@@ -72,6 +74,7 @@ void registerAdditionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBe
         if (config.enabled) {
             AdditionalBeanBuildItem.Builder unremovable = AdditionalBeanBuildItem.builder().setUnremovable();
             unremovable.addBeanClass(MpJwtValidator.class);
+            unremovable.addBeanClass(JsonWebTokenCredentialProducer.class);
             unremovable.addBeanClass(JWTAuthMechanism.class);
             unremovable.addBeanClass(ClaimValueProducer.class);
             additionalBeans.produce(unremovable.build());
@@ -83,11 +86,12 @@ void registerAdditionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBe
         removable.addBeanClass(RawClaimTypeProducer.class);
         removable.addBeanClass(JsonValueProducer.class);
         removable.addBeanClass(JwtPrincipalProducer.class);
+        removable.addBeanClass(JWTCallerPrincipalFactoryProducer.class);
         removable.addBeanClass(Claim.class);
         additionalBeans.produce(removable.build());
 
         reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, SignatureAlgorithm.class));
-        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, JwtProviderImpl.class));
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(true, true, KeyEncryptionAlgorithm.class));
     }
 
     /**
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java
new file mode 100644
index 0000000000000..b566c5d942083
--- /dev/null
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsCustomFactoryUnitTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.jwt.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DefaultGroupsCustomFactoryUnitTest {
+    private static Class<?>[] testClasses = {
+            DefaultGroupsEndpoint.class,
+            TestJWTCallerPrincipalFactory.class,
+            TokenUtils.class
+    };
+    /**
+     * The test generated JWT token string
+     */
+    private String token;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("privateKey.pem")
+                    .addAsResource("TokenUserGroup.json"));
+
+    @BeforeEach
+    public void generateToken() throws Exception {
+        token = TokenUtils.generateTokenString("/TokenUserGroup.json");
+    }
+
+    /**
+     * Validate a request with MP-JWT without a 'groups' claim is successful
+     * due to the default value being provided in the configuration
+     *
+     */
+    @Test
+    public void echoGroups() {
+        RestAssured.given().auth()
+                .oauth2(token)
+                .get("/endp/echo")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("User"));
+    }
+
+    @Test
+    public void echoGroupsWithParser() {
+        RestAssured.given().auth()
+                .oauth2(token)
+                .get("/endp/echo-parser")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("parser:User"));
+    }
+}
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java
new file mode 100644
index 0000000000000..39610a26c9db4
--- /dev/null
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsSignEncryptUnitTest.java
@@ -0,0 +1,54 @@
+package io.quarkus.jwt.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.smallrye.jwt.algorithm.KeyEncryptionAlgorithm;
+import io.smallrye.jwt.build.Jwt;
+
+public class DefaultGroupsSignEncryptUnitTest {
+    private static Class<?>[] testClasses = {
+            DefaultGroupsEndpoint.class,
+            TokenUtils.class
+    };
+    /**
+     * The test generated JWT token string
+     */
+    private String token;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("publicKey.pem")
+                    .addAsResource("privateKey.pem")
+                    .addAsResource("applicationDefaultGroupsSignEncrypt.properties", "application.properties"));
+
+    @BeforeEach
+    public void generateToken() throws Exception {
+        token = Jwt.issuer("https://server.example.com").innerSign()
+                .keyAlgorithm(KeyEncryptionAlgorithm.RSA_OAEP)
+                .encrypt();
+    }
+
+    /**
+     * Validate a request with MP-JWT without a 'groups' claim is successful
+     * due to the default value being provided in the configuration
+     *
+     */
+    @Test
+    public void echoGroups() {
+        RestAssured.given().auth()
+                .oauth2(token)
+                .get("/endp/echo")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("User"));
+    }
+}
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java
index 7d72d3988e049..c4a809b3c3d2a 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java
@@ -1,10 +1,9 @@
 package io.quarkus.jwt.test;
 
-import java.net.HttpURLConnection;
+import static org.hamcrest.Matchers.equalTo;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -43,23 +42,19 @@ public void generateToken() throws Exception {
      */
     @Test
     public void echoGroups() {
-        io.restassured.response.Response response = RestAssured.given().auth()
+        RestAssured.given().auth()
                 .oauth2(token)
-                .get("/endp/echo").andReturn();
-
-        Assertions.assertEquals(HttpURLConnection.HTTP_OK, response.getStatusCode());
-        String replyString = response.body().asString();
-        // The missing 'groups' claim's default value, 'User' is expected
-        Assertions.assertEquals("User", replyString);
+                .get("/endp/echo")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("User"));
     }
 
     @Test
     public void echoGroupsWithParser() {
-        io.restassured.response.Response response = RestAssured.given().auth()
+        RestAssured.given().auth()
                 .oauth2(token)
-                .get("/endp/echo-parser").andReturn();
-
-        Assertions.assertEquals(HttpURLConnection.HTTP_OK, response.getStatusCode());
-        Assertions.assertEquals("parser:User", response.body().asString());
+                .get("/endp/echo-parser")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("parser:User"));
     }
 }
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java
index 5b69d4f7893bf..1409f8bd6ced5 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java
@@ -21,7 +21,7 @@
 import io.restassured.response.Response;
 
 public class JwtAuthUnitTest {
-    private static Class[] testClasses = {
+    private static Class<?>[] testClasses = {
             JsonValuejectionEndpoint.class,
             TokenUtils.class
     };
@@ -30,9 +30,7 @@ public class JwtAuthUnitTest {
      */
     private String token;
     // Time claims in the token
-    private Long iatClaim;
     private Long authTimeClaim;
-    private Long expClaim;
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -47,9 +45,7 @@ public class JwtAuthUnitTest {
     public void generateToken() throws Exception {
         HashMap<String, Long> timeClaims = new HashMap<>();
         token = TokenUtils.generateTokenString("/Token1.json", null, timeClaims);
-        iatClaim = timeClaims.get(Claims.iat.name());
         authTimeClaim = timeClaims.get(Claims.auth_time.name());
-        expClaim = timeClaims.get(Claims.exp.name());
     }
 
     // Basic @ServletSecurity tests
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java
index 06389b779dd41..466420afa2459 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieDevModeTestCase.java
@@ -1,8 +1,9 @@
 package io.quarkus.jwt.test;
 
+import static org.hamcrest.Matchers.equalTo;
+
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -54,22 +55,18 @@ public void echoGroupsHotReplacement() throws Exception {
     }
 
     private void testOKResponse(String cookieName) {
-        io.restassured.response.Response response = RestAssured.given()
+        RestAssured.given()
                 .header("Cookie", cookieName + "=" + token)
-                .get("/endp/echo").andReturn();
-
-        Assertions.assertEquals(200, response.getStatusCode());
-        String replyString = response.body().asString();
-        // The missing 'groups' claim's default value, 'User' is expected
-        Assertions.assertEquals("User", replyString);
+                .get("/endp/echo")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("User"));
     }
 
     private void testBadResponse(String cookieName) {
-        io.restassured.response.Response response = RestAssured.given()
+        RestAssured.given()
                 .header("Cookie", cookieName + "=" + token)
-                .get("/endp/echo").andReturn();
-
-        Assertions.assertEquals(401, response.getStatusCode());
+                .get("/endp/echo")
+                .then().assertThat().statusCode(401);
     }
 
 }
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java
index ba3aee8239c87..ec7b0b9c3e723 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java
@@ -1,10 +1,9 @@
 package io.quarkus.jwt.test;
 
-import java.net.HttpURLConnection;
+import static org.hamcrest.Matchers.equalTo;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -42,13 +41,10 @@ public void generateToken() throws Exception {
      */
     @Test
     public void echoGroups() {
-        io.restassured.response.Response response = RestAssured.given()
+        RestAssured.given()
                 .header("Cookie", "cookie_a=" + token)
-                .get("/endp/echo").andReturn();
-
-        Assertions.assertEquals(HttpURLConnection.HTTP_OK, response.getStatusCode());
-        String replyString = response.body().asString();
-        // The missing 'groups' claim's default value, 'User' is expected
-        Assertions.assertEquals("User", replyString);
+                .get("/endp/echo")
+                .then().assertThat().statusCode(200)
+                .body(equalTo("User"));
     }
 }
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PKSubUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PKSubUnitTest.java
index 1e94ea7c2f64d..96150f9c7d42f 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PKSubUnitTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PKSubUnitTest.java
@@ -7,7 +7,7 @@
 
 import io.quarkus.smallrye.jwt.runtime.auth.PublicKeyProxy;
 import io.quarkus.smallrye.jwt.runtime.auth.PublicKeySubstitution;
-import io.smallrye.jwt.KeyUtils;
+import io.smallrye.jwt.util.KeyUtils;
 
 public class PKSubUnitTest {
     @Test
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java
index 1524d26fcf707..663d22249f62c 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionEndpoint.java
@@ -32,7 +32,6 @@
 @RequestScoped
 @RolesAllowed("Tester")
 public class PrincipalInjectionEndpoint {
-    private static final JsonString ANOYNMOUS = Json.createValue("anonymous");
 
     @Inject
     Principal principal;
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java
index faac40bad5509..4a0638ac3c145 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java
@@ -20,7 +20,7 @@
 import io.restassured.RestAssured;
 
 public class PrincipalInjectionUnitTest {
-    private static Class[] testClasses = {
+    private static Class<?>[] testClasses = {
             PrincipalInjectionEndpoint.class,
             TokenUtils.class
     };
@@ -29,9 +29,7 @@ public class PrincipalInjectionUnitTest {
      */
     private String token;
     // Time claims in the token
-    private Long iatClaim;
     private Long authTimeClaim;
-    private Long expClaim;
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -46,9 +44,7 @@ public class PrincipalInjectionUnitTest {
     public void generateToken() throws Exception {
         HashMap<String, Long> timeClaims = new HashMap<>();
         token = TokenUtils.generateTokenString("/Token1.json", null, timeClaims);
-        iatClaim = timeClaims.get(Claims.iat.name());
         authTimeClaim = timeClaims.get(Claims.auth_time.name());
-        expClaim = timeClaims.get(Claims.exp.name());
     }
 
     /**
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java
index b9983c650c2d8..7cb168c4cd48e 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java
@@ -3,7 +3,6 @@
 import java.net.HttpURLConnection;
 import java.util.HashMap;
 
-import org.eclipse.microprofile.jwt.Claims;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Assertions;
@@ -27,10 +26,6 @@ public class RolesAllowedUnitTest {
      * The test generated JWT token string
      */
     private String token;
-    // Time claims in the token
-    private Long iatClaim;
-    private Long authTimeClaim;
-    private Long expClaim;
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
@@ -46,9 +41,6 @@ public class RolesAllowedUnitTest {
     public void generateToken() throws Exception {
         HashMap<String, Long> timeClaims = new HashMap<>();
         token = TokenUtils.generateTokenString("/Token1.json", null, timeClaims);
-        iatClaim = timeClaims.get(Claims.iat.name());
-        authTimeClaim = timeClaims.get(Claims.auth_time.name());
-        expClaim = timeClaims.get(Claims.exp.name());
     }
 
     @Test()
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java
index b292728a65f46..159acd41839e9 100644
--- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/SmallRyeJwtDisabledTest.java
@@ -1,10 +1,7 @@
 package io.quarkus.jwt.test;
 
-import java.net.HttpURLConnection;
-
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -24,8 +21,6 @@ public class SmallRyeJwtDisabledTest {
 
     @Test
     public void serviceIsNotSecured() throws Exception {
-        io.restassured.response.Response response = RestAssured.given().get("/endp/echo").andReturn();
-
-        Assertions.assertEquals(HttpURLConnection.HTTP_FORBIDDEN, response.getStatusCode());
+        RestAssured.given().get("/endp/echo").then().assertThat().statusCode(403);
     }
 }
diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java
new file mode 100644
index 0000000000000..a3559f2cddfdd
--- /dev/null
+++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/TestJWTCallerPrincipalFactory.java
@@ -0,0 +1,31 @@
+package io.quarkus.jwt.test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.jwt.consumer.InvalidJwtException;
+
+import io.quarkus.arc.AlternativePriority;
+import io.smallrye.jwt.auth.principal.DefaultJWTCallerPrincipal;
+import io.smallrye.jwt.auth.principal.JWTAuthContextInfo;
+import io.smallrye.jwt.auth.principal.JWTCallerPrincipal;
+import io.smallrye.jwt.auth.principal.JWTCallerPrincipalFactory;
+import io.smallrye.jwt.auth.principal.ParseException;
+
+@ApplicationScoped
+@AlternativePriority(1)
+public class TestJWTCallerPrincipalFactory extends JWTCallerPrincipalFactory {
+
+    @Override
+    public JWTCallerPrincipal parse(String token, JWTAuthContextInfo authContextInfo) throws ParseException {
+        try {
+            String json = new String(Base64.getUrlDecoder().decode(token.split("\\.")[1]), StandardCharsets.UTF_8);
+            return new DefaultJWTCallerPrincipal(JwtClaims.parse(json));
+        } catch (InvalidJwtException ex) {
+            throw new ParseException(ex.getMessage());
+        }
+    }
+}
diff --git a/extensions/smallrye-jwt/deployment/src/test/resources/TokenUserGroup.json b/extensions/smallrye-jwt/deployment/src/test/resources/TokenUserGroup.json
new file mode 100644
index 0000000000000..db1a1c8c7df4c
--- /dev/null
+++ b/extensions/smallrye-jwt/deployment/src/test/resources/TokenUserGroup.json
@@ -0,0 +1,12 @@
+{
+  "iss": "https://server.example.com",
+  "jti": "a-123.2",
+  "sub": "24400320#2",
+  "upn": "jdoe2@example.com",
+  "preferred_username": "jdoe2",
+  "aud": "s6BhdRkqt3.2",
+  "exp": 1311281970,
+  "iat": 1311280970,
+  "auth_time": 1311280969,
+  "groups": ["User"]
+}
diff --git a/extensions/smallrye-jwt/deployment/src/test/resources/applicationDefaultGroupsSignEncrypt.properties b/extensions/smallrye-jwt/deployment/src/test/resources/applicationDefaultGroupsSignEncrypt.properties
new file mode 100644
index 0000000000000..618477ab15935
--- /dev/null
+++ b/extensions/smallrye-jwt/deployment/src/test/resources/applicationDefaultGroupsSignEncrypt.properties
@@ -0,0 +1,11 @@
+mp.jwt.verify.publickey.location=/publicKey.pem
+smallrye.jwt.decrypt.key.location=/privateKey.pem
+
+smallrye.jwt.sign.key-location=/privateKey.pem
+smallrye.jwt.encrypt.key-location=/publicKey.pem
+
+mp.jwt.verify.issuer=https://server.example.com
+smallrye.jwt.claims.groups=User
+
+quarkus.log.category."io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator".min-level=TRACE
+quarkus.log.category."io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator".level=TRACE
diff --git a/extensions/smallrye-jwt/pom.xml b/extensions/smallrye-jwt/pom.xml
index a85b0fee3689d..541e26245e122 100644
--- a/extensions/smallrye-jwt/pom.xml
+++ b/extensions/smallrye-jwt/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-jwt/runtime/pom.xml b/extensions/smallrye-jwt/runtime/pom.xml
index 6f275398da2a3..502c5031d0ea2 100644
--- a/extensions/smallrye-jwt/runtime/pom.xml
+++ b/extensions/smallrye-jwt/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-jwt-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +17,6 @@
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-jwt</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
@@ -43,15 +36,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jsonp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <artifactId>quarkus-smallrye-jwt-build</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-json-p-provider</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java
index 94f42562564d2..c3ebafd108f65 100644
--- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java
+++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JWTAuthMechanism.java
@@ -7,15 +7,11 @@
 import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.spi.CDI;
 import javax.inject.Inject;
 
-import org.eclipse.microprofile.jwt.JsonWebToken;
-
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
-import io.quarkus.security.credential.TokenCredential;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.identity.request.AuthenticationRequest;
@@ -24,7 +20,6 @@
 import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism;
 import io.quarkus.vertx.http.runtime.security.HttpCredentialTransport;
 import io.smallrye.jwt.auth.AbstractBearerTokenExtractor;
-import io.smallrye.jwt.auth.cdi.PrincipalProducer;
 import io.smallrye.jwt.auth.principal.JWTAuthContextInfo;
 import io.smallrye.mutiny.Uni;
 import io.vertx.ext.web.Cookie;
@@ -42,18 +37,13 @@ public class JWTAuthMechanism implements HttpAuthenticationMechanism {
     @Inject
     private JWTAuthContextInfo authContextInfo;
 
-    private void preparePrincipalProducer(JsonWebToken jwtPrincipal) {
-        PrincipalProducer principalProducer = CDI.current().select(PrincipalProducer.class).get();
-        principalProducer.setJsonWebToken(jwtPrincipal);
-    }
-
     @Override
     public Uni<SecurityIdentity> authenticate(RoutingContext context,
             IdentityProviderManager identityProviderManager) {
         String jwtToken = new VertxBearerTokenExtractor(authContextInfo, context).getBearerToken();
         if (jwtToken != null) {
             return identityProviderManager
-                    .authenticate(new TokenAuthenticationRequest(new TokenCredential(jwtToken, "bearer")));
+                    .authenticate(new TokenAuthenticationRequest(new JsonWebTokenCredential(jwtToken)));
         }
         return Uni.createFrom().optional(Optional.empty());
     }
diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredential.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredential.java
new file mode 100644
index 0000000000000..9a0e93e335870
--- /dev/null
+++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredential.java
@@ -0,0 +1,14 @@
+package io.quarkus.smallrye.jwt.runtime.auth;
+
+import io.quarkus.security.credential.TokenCredential;
+
+public class JsonWebTokenCredential extends TokenCredential {
+
+    public JsonWebTokenCredential() {
+        this(null);
+    }
+
+    public JsonWebTokenCredential(String token) {
+        super(token, "bearer");
+    }
+}
diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java
new file mode 100644
index 0000000000000..d493f982e4047
--- /dev/null
+++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JsonWebTokenCredentialProducer.java
@@ -0,0 +1,32 @@
+package io.quarkus.smallrye.jwt.runtime.auth;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.security.identity.SecurityIdentity;
+
+@RequestScoped
+public class JsonWebTokenCredentialProducer {
+    private static final Logger LOG = Logger.getLogger(JsonWebTokenCredentialProducer.class);
+    @Inject
+    SecurityIdentity identity;
+
+    /**
+     * The producer method for the current id token
+     *
+     * @return the id token
+     */
+    @Produces
+    @RequestScoped
+    JsonWebTokenCredential currentToken() {
+        JsonWebTokenCredential cred = identity.getCredential(JsonWebTokenCredential.class);
+        if (cred == null || cred.getToken() == null) {
+            LOG.trace("JsonWebToken is null");
+            cred = new JsonWebTokenCredential();
+        }
+        return cred;
+    }
+}
diff --git a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java
index a1c0924e599c6..47c31cb63b114 100644
--- a/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java
+++ b/extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/MpJwtValidator.java
@@ -52,6 +52,7 @@ public void accept(UniEmitter<? super SecurityIdentity> uniEmitter) {
                 try {
                     JsonWebToken jwtPrincipal = parser.parse(request.getToken().getToken());
                     uniEmitter.complete(QuarkusSecurityIdentity.builder().setPrincipal(jwtPrincipal)
+                            .addCredential(request.getToken())
                             .addRoles(jwtPrincipal.getGroups())
                             .addAttribute(SecurityIdentity.USER_ATTRIBUTE, jwtPrincipal).build());
 
diff --git a/extensions/smallrye-metrics/deployment/pom.xml b/extensions/smallrye-metrics/deployment/pom.xml
index 6ca7478caf45b..c98663c616353 100644
--- a/extensions/smallrye-metrics/deployment/pom.xml
+++ b/extensions/smallrye-metrics/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-metrics-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,6 +41,19 @@
             <groupId>org.eclipse.microprofile.metrics</groupId>
             <artifactId>microprofile-metrics-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-common-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+        </dependency>
+
 
         <!-- test dependencies -->
         <dependency>
diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java
new file mode 100644
index 0000000000000..d86b4d39fc021
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java
@@ -0,0 +1,83 @@
+package io.quarkus.smallrye.metrics.deployment;
+
+import java.util.Optional;
+import java.util.function.BooleanSupplier;
+
+import javax.servlet.DispatcherType;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.CustomContainerResponseFilterBuildItem;
+import io.quarkus.undertow.deployment.FilterBuildItem;
+
+/**
+ * If resteasy metrics are enabled, register additional filters specific to smallrye metrics.
+ *
+ */
+public class JaxRsMetricsProcessor {
+    static final String SMALLRYE_JAXRS_FILTER_CLASS_NAME = "io.smallrye.metrics.jaxrs.JaxRsMetricsFilter";
+    static final String SMALLRYE_JAXRS_SERVLET_FILTER_CLASS_NAME = "io.smallrye.metrics.jaxrs.JaxRsMetricsServletFilter";
+    static final String SMALLRYE_QUARKUS_RESTEASY_FILTER_CLASS_NAME = "io.quarkus.smallrye.metrics.runtime.QuarkusRestEasyMetricsFilter";
+    static final String SMALLRYE_QUARKUS_REST_FILTER_CLASS_NAME = "io.quarkus.smallrye.metrics.runtime.QuarkusRestMetricsFilter";
+    static final String RESTEASY_CONFIG_PROPERTY = "quarkus.resteasy.metrics.enabled"; // TODO: we probably want to remove this now...
+
+    static class RestMetricsEnabled implements BooleanSupplier {
+        SmallRyeMetricsProcessor.SmallRyeMetricsConfig smConfig;
+
+        public boolean getAsBoolean() {
+            boolean resteasyConfigEnabled = ConfigProvider.getConfig().getOptionalValue(RESTEASY_CONFIG_PROPERTY, boolean.class)
+                    .orElse(false);
+            return smConfig.extensionsEnabled && (smConfig.jaxrsEnabled || resteasyConfigEnabled);
+        }
+    }
+
+    // Ensure class is present (smallrye metrics extension) and resteasy metrics are enabled
+    @BuildStep(onlyIf = RestMetricsEnabled.class)
+    void enableMetrics(Optional<MetricsCapabilityBuildItem> metricsCapabilityBuildItem,
+            BuildProducer<ResteasyJaxrsProviderBuildItem> jaxRsProviders,
+            BuildProducer<FilterBuildItem> servletFilters,
+            BuildProducer<ContainerRequestFilterBuildItem> containerRequestFilters,
+            BuildProducer<CustomContainerResponseFilterBuildItem> customContainerResponseFilters,
+            Capabilities capabilities) {
+
+        warnIfDeprecatedResteasyPropertiesPresent();
+        if (metricsCapabilityBuildItem.isPresent()) {
+            if (capabilities.isPresent(Capability.SERVLET)) {
+                // if running with servlet, use the MetricsFilter implementation from SmallRye
+                jaxRsProviders.produce(
+                        new ResteasyJaxrsProviderBuildItem(SMALLRYE_JAXRS_FILTER_CLASS_NAME));
+                servletFilters.produce(
+                        FilterBuildItem.builder("metricsFilter", SMALLRYE_JAXRS_SERVLET_FILTER_CLASS_NAME)
+                                .setAsyncSupported(true)
+                                .addFilterUrlMapping("*", DispatcherType.FORWARD)
+                                .addFilterUrlMapping("*", DispatcherType.INCLUDE)
+                                .addFilterUrlMapping("*", DispatcherType.REQUEST)
+                                .addFilterUrlMapping("*", DispatcherType.ASYNC)
+                                .addFilterUrlMapping("*", DispatcherType.ERROR)
+                                .build());
+            } else if (capabilities.isPresent(Capability.RESTEASY)) {
+                jaxRsProviders.produce(
+                        new ResteasyJaxrsProviderBuildItem(SMALLRYE_QUARKUS_RESTEASY_FILTER_CLASS_NAME));
+            } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
+                customContainerResponseFilters
+                        .produce(new CustomContainerResponseFilterBuildItem(SMALLRYE_QUARKUS_REST_FILTER_CLASS_NAME));
+            }
+        }
+    }
+
+    private void warnIfDeprecatedResteasyPropertiesPresent() {
+        if (ConfigProvider.getConfig().getOptionalValue(RESTEASY_CONFIG_PROPERTY, boolean.class).isPresent()) {
+            SmallRyeMetricsProcessor.LOGGER.warn(
+                    "`quarkus.resteasy.metrics.enabled` is deprecated and will be removed in a future version. "
+                            + "Use `quarkus.smallrye-metrics.jaxrs.enabled` to enable metrics for REST endpoints "
+                            + "using the smallrye-metrics extension");
+        }
+    }
+}
diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java
index 0e36f87a851dd..310ae17e4d580 100644
--- a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java
+++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 import javax.enterprise.context.Dependent;
@@ -65,8 +64,11 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
 import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.deployment.metrics.MetricsFactoryConsumerBuildItem;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.quarkus.smallrye.metrics.deployment.jandex.JandexBeanInfoAdapter;
 import io.quarkus.smallrye.metrics.deployment.jandex.JandexMemberInfoAdapter;
 import io.quarkus.smallrye.metrics.deployment.spi.MetricBuildItem;
@@ -74,10 +76,9 @@
 import io.quarkus.smallrye.metrics.runtime.MetadataHolder;
 import io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsRecorder;
 import io.quarkus.smallrye.metrics.runtime.TagHolder;
-import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
-import io.quarkus.vertx.http.runtime.HandlerType;
 import io.smallrye.metrics.MetricProducer;
 import io.smallrye.metrics.MetricRegistries;
 import io.smallrye.metrics.MetricsRequestHandler;
@@ -90,11 +91,9 @@
 import io.smallrye.metrics.interceptors.MetricsInterceptor;
 import io.smallrye.metrics.interceptors.SimplyTimedInterceptor;
 import io.smallrye.metrics.interceptors.TimedInterceptor;
-import io.vertx.ext.web.Route;
-import io.vertx.ext.web.Router;
 
 public class SmallRyeMetricsProcessor {
-    private static final Logger LOGGER = Logger.getLogger("io.quarkus.smallrye.metrics.deployment.SmallRyeMetricsProcessor");
+    static final Logger LOGGER = Logger.getLogger("io.quarkus.smallrye.metrics.deployment.SmallRyeMetricsProcessor");
 
     @ConfigRoot(name = "smallrye-metrics")
     static final class SmallRyeMetricsConfig {
@@ -102,7 +101,7 @@ static final class SmallRyeMetricsConfig {
         /**
          * The path to the metrics handler.
          */
-        @ConfigItem(defaultValue = "/metrics")
+        @ConfigItem(defaultValue = "metrics")
         String path;
 
         /**
@@ -120,6 +119,15 @@ static final class SmallRyeMetricsConfig {
         @ConfigItem(name = "micrometer.compatibility")
         public boolean micrometerCompatibility;
 
+        /**
+         * Whether or not detailed JAX-RS metrics should be enabled.
+         * <p>
+         * See <a href=
+         * "https://github.com/eclipse/microprofile-metrics/blob/2.3.x/spec/src/main/asciidoc/required-metrics.adoc#optional-rest">MicroProfile
+         * Metrics: Optional REST metrics</a>.
+         */
+        @ConfigItem(name = "jaxrs.enabled", defaultValue = "false")
+        public boolean jaxrsEnabled;
     }
 
     SmallRyeMetricsConfig metrics;
@@ -129,22 +137,41 @@ MetricsConfigurationBuildItem metricsConfigurationBuildItem() {
         return new MetricsConfigurationBuildItem(metrics.path);
     }
 
+    @BuildStep
+    MetricsCapabilityBuildItem metricsCapabilityBuildItem(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
+        if (metrics.extensionsEnabled) {
+            return new MetricsCapabilityBuildItem(MetricsFactory.MP_METRICS::equals,
+                    nonApplicationRootPathBuildItem.resolvePath(metrics.path));
+        }
+        return null;
+    }
+
     @BuildStep
     @Record(STATIC_INIT)
     void createRoute(BuildProducer<RouteBuildItem> routes,
             SmallRyeMetricsRecorder recorder,
-            HttpRootPathBuildItem httpRoot,
+            NonApplicationRootPathBuildItem frameworkRoot,
             BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
-            LaunchModeBuildItem launchModeBuildItem) {
-        Function<Router, Route> route = recorder.route(metrics.path + (metrics.path.endsWith("/") ? "*" : "/*"));
-        Function<Router, Route> slash = recorder.route(metrics.path);
+            LaunchModeBuildItem launchModeBuildItem,
+            BeanContainerBuildItem beanContainer) {
 
         // add metrics endpoint for not found display in dev or test mode
         if (launchModeBuildItem.getLaunchMode().isDevOrTest()) {
             displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(metrics.path));
         }
-        routes.produce(new RouteBuildItem(route, recorder.handler(httpRoot.adjustPath(metrics.path)), HandlerType.BLOCKING));
-        routes.produce(new RouteBuildItem(slash, recorder.handler(httpRoot.adjustPath(metrics.path)), HandlerType.BLOCKING));
+        routes.produce(frameworkRoot.routeBuilder()
+                .route(metrics.path + (metrics.path.endsWith("/") ? "*" : "/*"))
+                .handler(recorder.handler(frameworkRoot.resolvePath(metrics.path)))
+                .requiresLegacyRedirect()
+                .blockingRoute()
+                .build());
+        routes.produce(frameworkRoot.routeBuilder()
+                .route(metrics.path)
+                .handler(recorder.handler(frameworkRoot.resolvePath(metrics.path)))
+                .displayOnNotFoundPage("Metrics")
+                .requiresLegacyRedirect()
+                .blockingRoute()
+                .build());
     }
 
     @BuildStep
@@ -452,8 +479,9 @@ public boolean test(io.quarkus.arc.processor.BeanInfo beanInfo) {
 
     @BuildStep
     @Record(RUNTIME_INIT)
-    void registerMetricsFromProducers(
+    void registerRuntimeExtensionMetrics(
             SmallRyeMetricsRecorder recorder,
+            List<MetricsFactoryConsumerBuildItem> metricsFactoryConsumerBuildItems,
             ValidationPhaseBuildItem validationPhase,
             BeanArchiveIndexBuildItem beanArchiveIndex) {
         IndexView index = beanArchiveIndex.getIndex();
@@ -495,6 +523,11 @@ void registerMetricsFromProducers(
                 }
             }
         }
+        for (MetricsFactoryConsumerBuildItem item : metricsFactoryConsumerBuildItems) {
+            if (item.executionTime() == RUNTIME_INIT) {
+                recorder.registerMetrics(item.getConsumer());
+            }
+        }
     }
 
     /**
@@ -504,6 +537,7 @@ void registerMetricsFromProducers(
     @Record(STATIC_INIT)
     void extensionMetrics(SmallRyeMetricsRecorder recorder,
             List<MetricBuildItem> additionalMetrics,
+            List<MetricsFactoryConsumerBuildItem> metricsFactoryConsumerBuildItems,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
         if (metrics.extensionsEnabled) {
             if (!additionalMetrics.isEmpty()) {
@@ -523,6 +557,12 @@ void extensionMetrics(SmallRyeMetricsRecorder recorder,
                             additionalMetric.getImplementor());
                 }
             }
+
+            for (MetricsFactoryConsumerBuildItem item : metricsFactoryConsumerBuildItems) {
+                if (item.executionTime() == STATIC_INIT) {
+                    recorder.registerMetrics(item.getConsumer());
+                }
+            }
         }
     }
 
diff --git a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/jandex/JandexBeanInfoAdapter.java b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/jandex/JandexBeanInfoAdapter.java
index 5333b41b56ea4..3fca4a2f4605f 100644
--- a/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/jandex/JandexBeanInfoAdapter.java
+++ b/extensions/smallrye-metrics/deployment/src/main/java/io/quarkus/smallrye/metrics/deployment/jandex/JandexBeanInfoAdapter.java
@@ -57,7 +57,7 @@ public BeanInfo convert(ClassInfo input) {
         }
 
         return new RawBeanInfo(input.simpleName(),
-                input.name().prefix().toString(),
+                input.name().prefix() == null ? "" : input.name().prefix().toString(),
                 annotations,
                 superClassInfo);
     }
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/CountedClassDefaultPackage.java b/extensions/smallrye-metrics/deployment/src/test/java/CountedClassDefaultPackage.java
new file mode 100644
index 0000000000000..3786c9acfadc6
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/test/java/CountedClassDefaultPackage.java
@@ -0,0 +1,10 @@
+import org.eclipse.microprofile.metrics.annotation.Counted;
+
+@Counted
+public class CountedClassDefaultPackage {
+
+    public void foo() {
+
+    }
+
+}
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java b/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java
new file mode 100644
index 0000000000000..2dca7443f4535
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/test/java/DefaultPackageMetricsTest.java
@@ -0,0 +1,38 @@
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DefaultPackageMetricsTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(CountedClassDefaultPackage.class));
+
+    @Inject
+    MetricRegistry metricRegistry;
+
+    @Inject
+    CountedClassDefaultPackage bean;
+
+    @Test
+    public void test() {
+        MetricID id_constructor = new MetricID(CountedClassDefaultPackage.class.getName() + ".CountedClassDefaultPackage");
+        assertTrue(metricRegistry.getCounters().containsKey(id_constructor));
+        MetricID id_method = new MetricID(CountedClassDefaultPackage.class.getName() + ".foo");
+        assertTrue(metricRegistry.getCounters().containsKey(id_method));
+        bean.foo();
+        assertEquals(1, metricRegistry.getCounters().get(id_method).getCount());
+    }
+
+}
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java
index cf021b6e50d20..5a9a0736694a7 100644
--- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/deployment/DevModeMetricsTest.java
@@ -1,7 +1,11 @@
 package io.quarkus.smallrye.metrics.deployment;
 
 import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+
+import java.io.File;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;
@@ -53,6 +57,9 @@ public Long getCounterValue(@PathParam("name") String name) {
     @RegisterExtension
     static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(
+                            new File("src/test/resources/config/jaxrs-metrics.properties"),
+                            "application.properties")
                     .addClasses(DevModeMetricsTest.class, MetricsResource.class));
 
     @Test
@@ -62,6 +69,10 @@ public void test() {
         when().get("/increment-counter").then().statusCode(204);
         when().get("/getvalue/mycounter").then().body(equalTo("2"));
 
+        // jax-rs metrics are disabled
+        when().get("/q/metrics").then()
+                .body(not(containsString("io.quarkus.smallrye.metrics.deployment.DevModeMetricsTest$MetricsResource")));
+
         // trigger a reload by adding a new metric (mycounter2)
         TEST.modifySourceFile(DevModeMetricsTest.class, (s) -> s.replaceFirst("MARKER-KEEP-ME",
                 "MARKER-KEEP-ME\n" +
@@ -71,6 +82,10 @@ public void test() {
                         "public void countedMethod2() {\n" +
                         "} //MARKER-END"));
 
+        // enable jax-rs metrics via quarkus.resteasy.metrics.enabled
+        TEST.modifyResourceFile("application.properties",
+                v -> v.replace("quarkus.resteasy.metrics.enabled=false", "quarkus.resteasy.metrics.enabled=true"));
+
         // check that the original mycounter is re-registered and its value is zero
         when().get("/getvalue/mycounter").then().body(equalTo("0"));
 
@@ -79,6 +94,15 @@ public void test() {
         when().get("/increment-counter2").then().statusCode(204);
         when().get("/getvalue/mycounter2").then().body(equalTo("1"));
 
+        // jax-rs metrics are enabled
+        when().get("/q/metrics").then()
+                .statusCode(200)
+                .body(containsString("io.quarkus.smallrye.metrics.deployment.DevModeMetricsTest$MetricsResource"));
+
+        // disable jax-rs metrics via quarkus.resteasy.metrics.enabled
+        TEST.modifyResourceFile("application.properties",
+                v -> v.replace("quarkus.resteasy.metrics.enabled=true", "quarkus.resteasy.metrics.enabled=false"));
+
         // trigger a reload by removing mycounter2 again
         TEST.modifySourceFile(DevModeMetricsTest.class,
                 (s) -> s.replaceFirst("//MARKER-KEEP-ME[\\s\\S]+?MARKER-END", ""));
@@ -86,6 +110,23 @@ public void test() {
         // verify that mycounter2 no longer exists
         when().get("/getvalue/mycounter2").then()
                 .statusCode(204);
+
+        // jax-rs metrics are disabled
+        when().get("/q/metrics").then()
+                .body(not(containsString("io.quarkus.smallrye.metrics.deployment.DevModeMetricsTest$MetricsResource")));
+
+        // enable jax-rs metrics via quarkus.resteasy.metrics.enabled
+        TEST.modifyResourceFile("application.properties",
+                v -> v.replace("quarkus.smallrye-metrics.jaxrs.enabled=false", "quarkus.smallrye-metrics.jaxrs.enabled=true"));
+
+        // verify that mycounter2 no longer exists
+        when().get("/getvalue/mycounter2").then()
+                .statusCode(204);
+
+        // jax-rs metrics are enabled
+        when().get("/q/metrics").then()
+                .body(containsString("io.quarkus.smallrye.metrics.deployment.DevModeMetricsTest$MetricsResource"));
+
     }
 
 }
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java
index f454e75e805ba..a993d0cf242b3 100644
--- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/jaxrs/JaxRsMetricsTestCase.java
@@ -25,7 +25,7 @@ public class JaxRsMetricsTestCase {
     @RegisterExtension
     static QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource(new StringAsset("quarkus.resteasy.metrics.enabled=true"),
+                    .addAsResource(new StringAsset("quarkus.smallrye-metrics.jaxrs.enabled=true"),
                             "application.properties")
                     .addClasses(MetricsResource.class));
 
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MeasureThis.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MeasureThis.java
new file mode 100644
index 0000000000000..7159683b8b5eb
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MeasureThis.java
@@ -0,0 +1,65 @@
+package io.quarkus.smallrye.metrics.test;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import io.quarkus.runtime.metrics.MetricsFactory;
+
+public class MeasureThis {
+    static LongAdder counter = new LongAdder();
+    static LongAdder gauge = new LongAdder();
+
+    static LongAdder runnableCount = new LongAdder();
+    static LongAdder callableCount = new LongAdder();
+    static LongAdder supplierCount = new LongAdder();
+
+    static Runnable wrappedRunnable;
+    static Callable<Long> wrappedCallable;
+    static Supplier<Long> wrappedSupplier;
+
+    static MetricsFactory.TimeRecorder timeRecorder;
+
+    static Consumer<MetricsFactory> registerMetrics() {
+        return new Consumer<MetricsFactory>() {
+            @Override
+            public void accept(MetricsFactory metricsFactory) {
+                metricsFactory.builder("count.me")
+                        .buildCounter(MeasureThis.counter::longValue);
+                metricsFactory.builder("gauge.supplier")
+                        .buildGauge(MeasureThis.gauge::doubleValue);
+
+                MeasureThis.wrappedRunnable = metricsFactory.builder("time.runnable")
+                        .buildTimer(new Runnable() {
+                            @Override
+                            public void run() {
+                                runnableCount.increment();
+                            }
+                        });
+
+                MeasureThis.wrappedCallable = metricsFactory.builder("time.callable")
+                        .buildTimer(new Callable<Long>() {
+                            @Override
+                            public Long call() throws Exception {
+                                callableCount.increment();
+                                return callableCount.sum();
+                            }
+                        });
+
+                MeasureThis.wrappedSupplier = metricsFactory.builder("time.supplier")
+                        .buildTimer(new Supplier<Long>() {
+                            @Override
+                            public Long get() {
+                                supplierCount.increment();
+                                return supplierCount.sum();
+                            }
+                        });
+
+                MeasureThis.timeRecorder = metricsFactory.builder("time.recorder")
+                        .buildTimer();
+            }
+        };
+    }
+
+}
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java
index 7c0542a12acc9..45e39d4969d6e 100644
--- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromExtensionTestCase.java
@@ -78,9 +78,8 @@ public void accept(BuildChainBuilder builder) {
     @Test
     public void testVendorRegistryType() {
         String[] metricNames = RestAssured.when().get("/get-counters").then().extract().as(String[].class);
-        assertThat(metricNames, Matchers.arrayContainingInAnyOrder(
-                "io.quarkus.smallrye.metrics.test.MetricResource.countMePlease",
-                "io.quarkus.smallrye.metrics.test.MetricResource.countMePlease2"));
+        assertThat(metricNames, Matchers.hasItemInArray("io.quarkus.smallrye.metrics.test.MetricResource.countMePlease"));
+        assertThat(metricNames, Matchers.hasItemInArray("io.quarkus.smallrye.metrics.test.MetricResource.countMePlease2"));
     }
 
     @Test
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java
new file mode 100644
index 0000000000000..340e41b855c08
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsFromMetricsFactoryTestCase.java
@@ -0,0 +1,63 @@
+package io.quarkus.smallrye.metrics.test;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.metrics.Counter;
+import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry;
+import org.eclipse.microprofile.metrics.SimpleTimer;
+import org.eclipse.microprofile.metrics.annotation.RegistryType;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsFactory;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MetricsFromMetricsFactoryTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(MeasureThis.class));
+
+    @Inject
+    @RegistryType(type = MetricRegistry.Type.VENDOR)
+    MetricRegistry metricRegistry;
+
+    @Test
+    public void testMetricFactoryCreatedMetrics() throws Exception {
+        SmallRyeMetricsFactory factory = new SmallRyeMetricsFactory();
+        MeasureThis.registerMetrics().accept(factory);
+
+        MeasureThis.counter.increment();
+        Counter counter = metricRegistry.counter("count.me");
+        Assertions.assertEquals(MeasureThis.counter.longValue(), counter.getCount());
+
+        MeasureThis.gauge.increment();
+        MetricID gaugeSupplier = new MetricID("gauge.supplier");
+        Gauge<Long> gauge = metricRegistry.getGauges().get(gaugeSupplier);
+        Assertions.assertEquals(MeasureThis.gauge.longValue(), (long) gauge.getValue());
+
+        MeasureThis.wrappedRunnable.run();
+        SimpleTimer timer = metricRegistry.simpleTimer("time.runnable");
+        Assertions.assertEquals(MeasureThis.runnableCount.longValue(), timer.getCount());
+
+        MeasureThis.wrappedCallable.call();
+        timer = metricRegistry.simpleTimer("time.callable");
+        Assertions.assertEquals(MeasureThis.callableCount.longValue(), timer.getCount());
+
+        MeasureThis.wrappedSupplier.get();
+        timer = metricRegistry.simpleTimer("time.supplier");
+        Assertions.assertEquals(MeasureThis.supplierCount.longValue(), timer.getCount());
+
+        MeasureThis.timeRecorder.update(10, TimeUnit.MINUTES);
+        timer = metricRegistry.simpleTimer("time.recorder");
+        Assertions.assertEquals(1, timer.getCount());
+    }
+}
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java
new file mode 100644
index 0000000000000..70be9b1bd0822
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MetricsHandlerPathTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.smallrye.metrics.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * Verify that the metrics handler works on the expected path
+ * when quarkus.http.root-path and quarkus.http.non-application-root-path are set.
+ */
+public class MetricsHandlerPathTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
+            .overrideConfigKey("quarkus.http.root-path", "/custom")
+            .overrideConfigKey("quarkus.http.non-application-root-path", "/framework");
+
+    @Test
+    public void testMetricsEndpointAccessibility() {
+        RestAssured.basePath = "/";
+        RestAssured.when()
+                // no need to prepend the /custom here because it will be reflected in RestAssured.basePath
+                .get("/framework/metrics")
+                .then()
+                .statusCode(200);
+    }
+
+}
diff --git a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java
index a53c4b118168e..56203bcd2a861 100644
--- a/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java
+++ b/extensions/smallrye-metrics/deployment/src/test/java/io/quarkus/smallrye/metrics/test/MicrometerMetricsCompatibilityModeTest.java
@@ -25,7 +25,7 @@ public class MicrometerMetricsCompatibilityModeTest {
 
     @Test
     public void verifyOpenMetricsExport() {
-        RestAssured.when().get("/metrics").then()
+        RestAssured.when().get("/q/metrics").then()
                 .body(containsString("jvm_memory_max_bytes{"),
                         containsString("jvm_memory_used_bytes{"),
                         containsString("jvm_memory_committed_bytes{"),
diff --git a/extensions/smallrye-metrics/deployment/src/test/resources/config/jaxrs-metrics.properties b/extensions/smallrye-metrics/deployment/src/test/resources/config/jaxrs-metrics.properties
new file mode 100644
index 0000000000000..12cc884ff4915
--- /dev/null
+++ b/extensions/smallrye-metrics/deployment/src/test/resources/config/jaxrs-metrics.properties
@@ -0,0 +1,2 @@
+quarkus.smallrye-metrics.jaxrs.enabled=false
+quarkus.resteasy.metrics.enabled=false
\ No newline at end of file
diff --git a/extensions/smallrye-metrics/pom.xml b/extensions/smallrye-metrics/pom.xml
index bec48c0748763..5264c96ec477e 100644
--- a/extensions/smallrye-metrics/pom.xml
+++ b/extensions/smallrye-metrics/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-metrics/runtime/pom.xml b/extensions/smallrye-metrics/runtime/pom.xml
index 795df878bc8f4..474cf810b5bb2 100644
--- a/extensions/smallrye-metrics/runtime/pom.xml
+++ b/extensions/smallrye-metrics/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-metrics-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,6 +43,11 @@
             <artifactId>quarkus-resteasy</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/FilterUtil.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/FilterUtil.java
new file mode 100644
index 0000000000000..d6fa0ebd07b2d
--- /dev/null
+++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/FilterUtil.java
@@ -0,0 +1,55 @@
+package io.quarkus.smallrye.metrics.runtime;
+
+import java.time.Duration;
+
+import org.eclipse.microprofile.metrics.Metadata;
+import org.eclipse.microprofile.metrics.MetricID;
+import org.eclipse.microprofile.metrics.MetricRegistry;
+import org.eclipse.microprofile.metrics.MetricUnits;
+import org.eclipse.microprofile.metrics.Tag;
+
+import io.smallrye.metrics.MetricRegistries;
+
+final class FilterUtil {
+
+    private FilterUtil() {
+    }
+
+    static void finishRequest(Long start, Class<?> resourceClass, String methodName, Class<?>[] parameterTypes) {
+        long value = System.nanoTime() - start;
+        MetricID metricID = getMetricID(resourceClass, methodName, parameterTypes);
+
+        MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.BASE);
+        if (!registry.getMetadata().containsKey(metricID.getName())) {
+            // if no metric with this name exists yet, register it
+            Metadata metadata = Metadata.builder()
+                    .withName(metricID.getName())
+                    .withDescription(
+                            "The number of invocations and total response time of this RESTful resource method since the start of the server.")
+                    .withUnit(MetricUnits.NANOSECONDS)
+                    .build();
+            registry.simpleTimer(metadata, metricID.getTagsAsArray());
+        }
+        registry.simpleTimer(metricID.getName(), metricID.getTagsAsArray())
+                .update(Duration.ofNanos(value));
+    }
+
+    private static MetricID getMetricID(Class<?> resourceClass, String methodName, Class<?>[] parameterTypes) {
+        Tag classTag = new Tag("class", resourceClass.getName());
+        StringBuilder sb = new StringBuilder();
+        for (Class<?> parameterType : parameterTypes) {
+            if (sb.length() > 0) {
+                sb.append("_");
+            }
+            if (parameterType.isArray()) {
+                sb.append(parameterType.getComponentType().getName()).append("[]");
+            } else {
+                sb.append(parameterType.getName());
+            }
+        }
+        String encodedParameterNames = sb.toString();
+        String methodTagValue = encodedParameterNames.isEmpty() ? methodName : methodName + "_" + encodedParameterNames;
+        Tag methodTag = new Tag("method", methodTagValue);
+        return new MetricID("REST.request", classTag, methodTag);
+    }
+}
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusJaxRsMetricsFilter.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusJaxRsMetricsFilter.java
deleted file mode 100644
index 20c3976576fba..0000000000000
--- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusJaxRsMetricsFilter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * 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 io.quarkus.smallrye.metrics.runtime;
-
-import java.lang.reflect.Method;
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import javax.enterprise.inject.spi.CDI;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Context;
-
-import org.eclipse.microprofile.metrics.Metadata;
-import org.eclipse.microprofile.metrics.MetricID;
-import org.eclipse.microprofile.metrics.MetricRegistry;
-import org.eclipse.microprofile.metrics.MetricUnits;
-import org.eclipse.microprofile.metrics.Tag;
-
-import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
-import io.smallrye.metrics.MetricRegistries;
-import io.vertx.ext.web.RoutingContext;
-
-/**
- * A JAX-RS filter that computes the REST.request metrics from REST traffic over time.
- * This one depends on Vert.x to be able to hook into response even in cases when the request ended with an unmapped exception.
- */
-public class QuarkusJaxRsMetricsFilter implements ContainerRequestFilter {
-
-    @Context
-    ResourceInfo resourceInfo;
-
-    @Override
-    public void filter(final ContainerRequestContext requestContext) {
-        Long start = System.nanoTime();
-        final Class<?> resourceClass = resourceInfo.getResourceClass();
-        final Method resourceMethod = resourceInfo.getResourceMethod();
-        /*
-         * The reason for using a Vert.x handler instead of ContainerResponseFilter is that
-         * RESTEasy does not call the response filter for requests that ended up with an unmapped exception.
-         * This way we can capture these responses as well and update the metrics accordingly.
-         */
-        RoutingContext routingContext = CDI.current().select(CurrentVertxRequest.class).get().getCurrent();
-        routingContext.addBodyEndHandler(
-                event -> finishRequest(start, resourceClass, resourceMethod));
-    }
-
-    private void finishRequest(Long start, Class<?> resourceClass, Method resourceMethod) {
-        long value = System.nanoTime() - start;
-        MetricID metricID = getMetricID(resourceClass, resourceMethod);
-
-        MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.BASE);
-        if (!registry.getMetadata().containsKey(metricID.getName())) {
-            // if no metric with this name exists yet, register it
-            Metadata metadata = Metadata.builder()
-                    .withName(metricID.getName())
-                    .withDescription(
-                            "The number of invocations and total response time of this RESTful resource method since the start of the server.")
-                    .withUnit(MetricUnits.NANOSECONDS)
-                    .build();
-            registry.simpleTimer(metadata, metricID.getTagsAsArray());
-        }
-        registry.simpleTimer(metricID.getName(), metricID.getTagsAsArray())
-                .update(Duration.ofNanos(value));
-    }
-
-    private MetricID getMetricID(Class<?> resourceClass, Method resourceMethod) {
-        Tag classTag = new Tag("class", resourceClass.getName());
-        String methodName = resourceMethod.getName();
-        String encodedParameterNames = Arrays.stream(resourceMethod.getParameterTypes())
-                .map(clazz -> {
-                    if (clazz.isArray()) {
-                        return clazz.getComponentType().getName() + "[]";
-                    } else {
-                        return clazz.getName();
-                    }
-                })
-                .collect(Collectors.joining("_"));
-        String methodTagValue = encodedParameterNames.isEmpty() ? methodName : methodName + "_" + encodedParameterNames;
-        Tag methodTag = new Tag("method", methodTagValue);
-        return new MetricID("REST.request", classTag, methodTag);
-    }
-
-}
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java
new file mode 100644
index 0000000000000..67a01d8447ac4
--- /dev/null
+++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestEasyMetricsFilter.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ * https://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 io.quarkus.smallrye.metrics.runtime;
+
+import java.lang.reflect.Method;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * A JAX-RS filter that computes the REST.request metrics from REST traffic over time.
+ * This one depends on Vert.x to be able to hook into response even in cases when the request ended with an unmapped exception.
+ */
+public class QuarkusRestEasyMetricsFilter implements ContainerRequestFilter {
+
+    @Context
+    ResourceInfo resourceInfo;
+
+    @Override
+    public void filter(final ContainerRequestContext requestContext) {
+        Long start = System.nanoTime();
+        final Class<?> resourceClass = resourceInfo.getResourceClass();
+        final Method resourceMethod = resourceInfo.getResourceMethod();
+        /*
+         * The reason for using a Vert.x handler instead of ContainerResponseFilter is that
+         * RESTEasy does not call the response filter for requests that ended up with an unmapped exception.
+         * This way we can capture these responses as well and update the metrics accordingly.
+         *
+         */
+        RoutingContext routingContext = CDI.current().select(CurrentVertxRequest.class).get().getCurrent();
+        routingContext.addBodyEndHandler(
+                event -> FilterUtil.finishRequest(start, resourceClass, resourceMethod.getName(),
+                        resourceMethod.getParameterTypes()));
+    }
+
+}
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java
new file mode 100644
index 0000000000000..92b8b65d72894
--- /dev/null
+++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/QuarkusRestMetricsFilter.java
@@ -0,0 +1,19 @@
+package io.quarkus.smallrye.metrics.runtime;
+
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+/**
+ * Quarkus REST does not suffer from the limitations mentioned in {@link QuarkusRestEasyMetricsFilter} so we can
+ * properly use a response filter in order to finish the request.
+ * Moreover we use the {@code @ServerResponseFilter} to make writing the filter even easier.
+ */
+public class QuarkusRestMetricsFilter {
+
+    @ServerResponseFilter
+    public void filter(SimpleResourceInfo simplifiedResourceInfo) {
+        FilterUtil.finishRequest(System.nanoTime(), simplifiedResourceInfo.getResourceClass(),
+                simplifiedResourceInfo.getMethodName(),
+                simplifiedResourceInfo.parameterTypes());
+    }
+}
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsFactory.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsFactory.java
new file mode 100644
index 0000000000000..9540909ef2566
--- /dev/null
+++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsFactory.java
@@ -0,0 +1,232 @@
+package io.quarkus.smallrye.metrics.runtime;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.eclipse.microprofile.metrics.Counter;
+import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.MetricRegistry;
+import org.eclipse.microprofile.metrics.MetricType;
+import org.eclipse.microprofile.metrics.SimpleTimer;
+import org.eclipse.microprofile.metrics.Tag;
+
+import io.quarkus.runtime.metrics.MetricsFactory;
+import io.smallrye.metrics.MetricRegistries;
+
+public class SmallRyeMetricsFactory implements MetricsFactory {
+    public boolean metricsSystemSupported(String name) {
+        return MetricsFactory.MP_METRICS.equals(name);
+    }
+
+    @Override
+    public MetricBuilder builder(String name, MetricsFactory.Type type) {
+        return new SmallRyeMetricBuilder(name, type);
+    }
+
+    static class SmallRyeMetricBuilder implements MetricsFactory.MetricBuilder {
+        final MetricRegistry registry;
+        final org.eclipse.microprofile.metrics.MetadataBuilder builder;
+        List<Tag> tags = new ArrayList<>();
+
+        SmallRyeMetricBuilder(String name, MetricsFactory.Type type) {
+            switch (type) {
+                case APPLICATION:
+                    registry = MetricRegistries.get(MetricRegistry.Type.APPLICATION);
+                    break;
+                case BASE:
+                    registry = MetricRegistries.get(MetricRegistry.Type.BASE);
+                    break;
+                default:
+                case VENDOR:
+                    registry = MetricRegistries.get(MetricRegistry.Type.VENDOR);
+                    break;
+            }
+            builder = org.eclipse.microprofile.metrics.Metadata.builder()
+                    .withName(name);
+        }
+
+        public MetricBuilder unit(String unit) {
+            builder.withUnit(unit);
+            return this;
+        }
+
+        @Override
+        public MetricBuilder tag(String key, String value) {
+            tags.add(new Tag(key, value));
+            return this;
+        }
+
+        @Override
+        public MetricBuilder description(String description) {
+            builder.withDescription(description);
+            return this;
+        }
+
+        @Override
+        public void buildCounter(Supplier<Number> countFunction) {
+            builder.withType(MetricType.COUNTER);
+            registry.register(builder.build(), new SmallRyeCounter(countFunction), tags.toArray(new Tag[0]));
+        }
+
+        @Override
+        public <T, R extends Number> void buildCounter(T obj, Function<T, R> countFunction) {
+            builder.withType(MetricType.COUNTER);
+            registry.register(builder.build(), new SmallRyeFunctionCounter<>(obj, countFunction), tags.toArray(new Tag[0]));
+        }
+
+        @Override
+        public void buildGauge(Supplier<Number> gaugeFunction) {
+            builder.withType(MetricType.GAUGE);
+            registry.register(builder.build(), new SmallRyeGauge(gaugeFunction), tags.toArray(new Tag[0]));
+        }
+
+        @Override
+        public <T, R extends Number> void buildGauge(T obj, Function<T, R> gaugeFunction) {
+            builder.withType(MetricType.GAUGE);
+            registry.register(builder.build(), new SmallRyeFunctionGauge<>(obj, gaugeFunction), tags.toArray(new Tag[0]));
+        }
+
+        @Override
+        public TimeRecorder buildTimer() {
+            builder.withType(MetricType.SIMPLE_TIMER);
+            SimpleTimer timer = registry.simpleTimer(builder.build(), tags.toArray(new Tag[0]));
+            return new SmallRyeTimeRecorder(timer);
+        }
+
+        @Override
+        public Runnable buildTimer(Runnable f) {
+            builder.withType(MetricType.SIMPLE_TIMER);
+            SimpleTimer timer = registry.simpleTimer(builder.build(), tags.toArray(new Tag[0]));
+            return new Runnable() {
+                @Override
+                public void run() {
+                    timer.time(f);
+                }
+            };
+        }
+
+        @Override
+        public <T> Callable<T> buildTimer(Callable<T> f) {
+            builder.withType(MetricType.SIMPLE_TIMER);
+            SimpleTimer timer = registry.simpleTimer(builder.build(), tags.toArray(new Tag[0]));
+            return new Callable<T>() {
+                @Override
+                public T call() throws Exception {
+                    return timer.time(f);
+                }
+            };
+        }
+
+        @Override
+        public <T> Supplier<T> buildTimer(Supplier<T> f) {
+            builder.withType(MetricType.SIMPLE_TIMER);
+            SimpleTimer timer = registry.simpleTimer(builder.build(), tags.toArray(new Tag[0]));
+            return new Supplier<T>() {
+                @Override
+                public T get() {
+                    SimpleTimer.Context ctx = timer.time();
+                    try {
+                        return f.get();
+                    } finally {
+                        ctx.stop();
+                    }
+                }
+            };
+        }
+    }
+
+    private static class SmallRyeCounter implements Counter {
+        final Supplier<Number> f;
+
+        SmallRyeCounter(Supplier<Number> f) {
+            this.f = f;
+        }
+
+        @Override
+        public void inc() {
+        }
+
+        @Override
+        public void inc(long l) {
+        }
+
+        @Override
+        public long getCount() {
+            return f.get().longValue();
+        }
+    }
+
+    private static class SmallRyeFunctionCounter<T, R extends Number> implements Counter {
+        final T obj;
+        final Function<T, R> f;
+
+        SmallRyeFunctionCounter(T obj, Function<T, R> f) {
+            this.obj = obj;
+            this.f = f;
+        }
+
+        @Override
+        public void inc() {
+        }
+
+        @Override
+        public void inc(long l) {
+        }
+
+        @Override
+        public long getCount() {
+            return f.apply(obj).longValue();
+        }
+    }
+
+    private static class SmallRyeGauge implements Gauge<Long> {
+        final Supplier<Number> f;
+
+        SmallRyeGauge(Supplier<Number> f) {
+            this.f = f;
+        }
+
+        @Override
+        public Long getValue() {
+            return f.get().longValue();
+        }
+    }
+
+    private static class SmallRyeFunctionGauge<T, R extends Number> implements Gauge<R> {
+        final T obj;
+        final Function<T, R> f;
+
+        SmallRyeFunctionGauge(T obj, Function<T, R> f) {
+            this.obj = obj;
+            this.f = f;
+        }
+
+        @Override
+        public R getValue() {
+            return f.apply(obj);
+        }
+    }
+
+    private static class SmallRyeTimeRecorder implements TimeRecorder {
+        SimpleTimer timer;
+
+        SmallRyeTimeRecorder(SimpleTimer timer) {
+            this.timer = timer;
+        }
+
+        @Override
+        public void update(Duration duration) {
+            timer.update(duration);
+        }
+
+        @Override
+        public void update(long duration, TimeUnit unit) {
+            timer.update(Duration.ofNanos(unit.toNanos(duration)));
+        }
+    }
+}
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java
index 7a361358b6d0d..d9db296a4fadd 100644
--- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java
+++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsHandler.java
@@ -1,6 +1,7 @@
 package io.quarkus.smallrye.metrics.runtime;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.stream.Stream;
 
 import javax.enterprise.inject.spi.CDI;
@@ -30,13 +31,20 @@ public void handle(RoutingContext routingContext) {
         HttpServerResponse response = routingContext.response();
         HttpServerRequest request = routingContext.request();
         Stream<String> acceptHeaders = request.headers().getAll("Accept").stream();
+        routingContext.currentRoute().getPath();
+        routingContext.mountPoint();
 
         try {
             internalHandler.handleRequest(request.path(), metricsPath, request.rawMethod(), acceptHeaders,
-                    (status, message, headers) -> {
-                        response.setStatusCode(status);
-                        headers.forEach(response::putHeader);
-                        response.end(Buffer.buffer(message));
+                    new MetricsRequestHandler.Responder() {
+                        @Override
+                        public void respondWith(int status, String message, Map<String, String> headers) throws IOException {
+                            response.setStatusCode(status);
+                            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                                response.putHeader(entry.getKey(), entry.getValue());
+                            }
+                            response.end(Buffer.buffer(message));
+                        }
                     });
         } catch (IOException e) {
             response.setStatusCode(503);
diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java
index 117370355e5d8..bf5651bc52ec3 100644
--- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java
+++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java
@@ -13,9 +13,10 @@
 import java.lang.management.ThreadMXBean;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Consumer;
 
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
 
 import org.eclipse.microprofile.metrics.ConcurrentGauge;
 import org.eclipse.microprofile.metrics.Counter;
@@ -38,16 +39,16 @@
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.smallrye.metrics.ExtendedMetadata;
 import io.smallrye.metrics.ExtendedMetadataBuilder;
 import io.smallrye.metrics.MetricRegistries;
+import io.smallrye.metrics.MetricsRequestHandler;
 import io.smallrye.metrics.TagsUtils;
 import io.smallrye.metrics.elementdesc.BeanInfo;
 import io.smallrye.metrics.elementdesc.MemberInfo;
 import io.smallrye.metrics.interceptors.MetricResolver;
 import io.smallrye.metrics.setup.MetricsMetadata;
-import io.vertx.ext.web.Route;
-import io.vertx.ext.web.Router;
 
 @Recorder
 public class SmallRyeMetricsRecorder {
@@ -84,18 +85,14 @@ public class SmallRyeMetricsRecorder {
     private static final String MEMORY_USED_HEAP = "memory.usedHeap";
     private static final String MEMORY_USED_NON_HEAP = "memory.usedNonHeap";
 
-    public Function<Router, Route> route(String name) {
-        return new Function<Router, Route>() {
-            @Override
-            public Route apply(Router router) {
-                return router.route(name);
-            }
-        };
-    }
+    private static final SmallRyeMetricsFactory factory = new SmallRyeMetricsFactory();
 
     public SmallRyeMetricsHandler handler(String metricsPath) {
         SmallRyeMetricsHandler handler = new SmallRyeMetricsHandler();
         handler.setMetricsPath(metricsPath);
+        // tell the metrics internal handler to not append CORS headers
+        // these will be handled by the Quarkus CORS filter, if enabled
+        CDI.current().select(MetricsRequestHandler.class).get().appendCorsHeaders(false);
         return handler;
     }
 
@@ -209,6 +206,12 @@ public void registerMetric(MetricRegistry.Type scope,
         }
     }
 
+    public void registerMetrics(Consumer<MetricsFactory> consumer) {
+        if (consumer != null) {
+            consumer.accept(factory);
+        }
+    }
+
     public void createRegistries(BeanContainer container) {
         MetricRegistries.get(MetricRegistry.Type.APPLICATION);
         MetricRegistries.get(MetricRegistry.Type.BASE);
@@ -1019,5 +1022,4 @@ private long getThreadStateCount(ThreadMXBean threadBean, Thread.State state) {
         }
         return count;
     }
-
 }
diff --git a/extensions/smallrye-metrics/spi/pom.xml b/extensions/smallrye-metrics/spi/pom.xml
index 8251341d57d35..10748df44fc71 100644
--- a/extensions/smallrye-metrics/spi/pom.xml
+++ b/extensions/smallrye-metrics/spi/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-metrics-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricBuildItem.java b/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricBuildItem.java
index 62a3982ef8d36..9e09865a2e990 100644
--- a/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricBuildItem.java
+++ b/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricBuildItem.java
@@ -10,6 +10,7 @@
 /**
  * Build item that is picked up by the SmallRye Metrics extension to register metrics required by other extensions.
  */
+@Deprecated
 public final class MetricBuildItem extends MultiBuildItem {
 
     private final Metadata metadata;
diff --git a/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricsConfigurationBuildItem.java b/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricsConfigurationBuildItem.java
index 7c8f434871cb0..7686de532a590 100644
--- a/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricsConfigurationBuildItem.java
+++ b/extensions/smallrye-metrics/spi/src/main/java/io/quarkus/smallrye/metrics/deployment/spi/MetricsConfigurationBuildItem.java
@@ -5,6 +5,7 @@
 /**
  * A build item that can be used by build steps that need to know the metrics configuration
  */
+@Deprecated
 public final class MetricsConfigurationBuildItem extends SimpleBuildItem {
 
     private final String path;
diff --git a/extensions/smallrye-openapi-common/deployment/pom.xml b/extensions/smallrye-openapi-common/deployment/pom.xml
index 3ed7f2e880b33..a3b59fa1c61d0 100644
--- a/extensions/smallrye-openapi-common/deployment/pom.xml
+++ b/extensions/smallrye-openapi-common/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-openapi-common-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java b/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java
index 61e0dcd882917..eb5bcd6bd5e95 100644
--- a/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java
+++ b/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java
@@ -1,5 +1,8 @@
 package io.quarkus.smallrye.openapi.common.deployment;
 
+import java.nio.file.Path;
+import java.util.Optional;
+
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
@@ -8,6 +11,79 @@ public final class SmallRyeOpenApiConfig {
     /**
      * The path at which to register the OpenAPI Servlet.
      */
-    @ConfigItem(defaultValue = "/openapi")
+    @ConfigItem(defaultValue = "openapi")
     public String path;
+
+    /**
+     * If set, the generated OpenAPI schema documents will be stored here on build.
+     * Both openapi.json and openapi.yaml will be stored here if this is set.
+     */
+    @ConfigItem
+    public Optional<Path> storeSchemaDirectory;
+
+    /**
+     * Add a certain SecurityScheme with config
+     */
+    public Optional<SecurityScheme> securityScheme;
+
+    /**
+     * Add a Security Scheme name to the generated OpenAPI document
+     */
+    @ConfigItem(defaultValue = "SecurityScheme")
+    public String securitySchemeName;
+
+    /**
+     * Add a description to the Security Scheme
+     */
+    @ConfigItem(defaultValue = "Authentication")
+    public String securitySchemeDescription;
+
+    /**
+     * Add a scheme value to the Basic HTTP Security Scheme
+     */
+    @ConfigItem(defaultValue = "basic")
+    public String basicSecuritySchemeValue;
+
+    /**
+     * Add a scheme value to the JWT Security Scheme
+     */
+    @ConfigItem(defaultValue = "bearer")
+    public String jwtSecuritySchemeValue;
+
+    /**
+     * Add a scheme value to the JWT Security Scheme
+     */
+    @ConfigItem(defaultValue = "JWT")
+    public String jwtBearerFormat;
+
+    /**
+     * Add a openIdConnectUrl value to the OIDC Security Scheme
+     */
+    @ConfigItem
+    public Optional<String> oidcOpenIdConnectUrl;
+
+    /**
+     * Add a implicit flow refreshUrl value to the OAuth2 Security Scheme
+     */
+    @ConfigItem
+    public Optional<String> oauth2ImplicitRefreshUrl;
+
+    /**
+     * Add an implicit flow authorizationUrl value to the OAuth2 Security Scheme
+     */
+    @ConfigItem
+    public Optional<String> oauth2ImplicitAuthorizationUrl;
+
+    /**
+     * Add an implicit flow tokenUrl value to the OAuth2 Security Scheme
+     */
+    @ConfigItem
+    public Optional<String> oauth2ImplicitTokenUrl;
+
+    public enum SecurityScheme {
+        basic,
+        jwt,
+        oidc,
+        oauth2Implicit
+    }
 }
diff --git a/extensions/smallrye-openapi-common/pom.xml b/extensions/smallrye-openapi-common/pom.xml
index d7b1498e77f35..45c394dfb9096 100644
--- a/extensions/smallrye-openapi-common/pom.xml
+++ b/extensions/smallrye-openapi-common/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-openapi/deployment/pom.xml b/extensions/smallrye-openapi/deployment/pom.xml
index 64fa6c172f71e..8a0efb4703ddc 100644
--- a/extensions/smallrye-openapi/deployment/pom.xml
+++ b/extensions/smallrye-openapi/deployment/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-smallrye-openapi-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -22,10 +21,18 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-vertx-http-deployment</artifactId>
     </dependency>
+    <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-smallrye-openapi-spi</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-server-common-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-common-spi</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-arc-deployment</artifactId>
diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/IgnoreDotNames.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/IgnoreDotNames.java
deleted file mode 100644
index 0fc1e0b8de68f..0000000000000
--- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/IgnoreDotNames.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.quarkus.smallrye.openapi.deployment;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import org.jboss.jandex.DotName;
-
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
-
-/**
- * Copied from resteasy-common, but changed to not depend on JAX-RS. This is so
- * that when open-api is used without scanning (so no JAX-RS) we do not pull in
- * the jax-rs dep
- */
-public final class IgnoreDotNames {
-
-    public static final IgnoreForReflectionPredicate IGNORE_FOR_REFLECTION_PREDICATE = new IgnoreForReflectionPredicate();
-
-    private static class IgnoreForReflectionPredicate implements Predicate<DotName> {
-
-        @Override
-        public boolean test(DotName name) {
-            return IgnoreDotNames.TYPES_IGNORED_FOR_REFLECTION.contains(name)
-                    || ReflectiveHierarchyBuildItem.DefaultIgnorePredicate.INSTANCE.test(name);
-        }
-    }
-
-    // Types ignored for reflection used by the RESTEasy and SmallRye REST client extensions.
-    private static final Set<DotName> TYPES_IGNORED_FOR_REFLECTION = new HashSet<>(Arrays.asList(
-            // javax.json
-            DotName.createSimple("javax.json.JsonObject"),
-            DotName.createSimple("javax.json.JsonArray"),
-            DotName.createSimple("javax.json.JsonValue"),
-            // Jackson
-            DotName.createSimple("com.fasterxml.jackson.databind.JsonNode"),
-            // JAX-RS
-            DotName.createSimple("javax.ws.rs.core.Response"),
-            DotName.createSimple("javax.ws.rs.core.Response.StatusType"),
-            DotName.createSimple("javax.ws.rs.container.AsyncResponse"),
-            DotName.createSimple("javax.ws.rs.core.StreamingOutput"),
-            DotName.createSimple("javax.ws.rs.core.Form"),
-            DotName.createSimple("javax.ws.rs.core.MultivaluedMap"),
-            // RESTEasy
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartInput"),
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput"),
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartOutput"),
-            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput"),
-            // Vert-x
-            DotName.createSimple("io.vertx.core.json.JsonArray"),
-            DotName.createSimple("io.vertx.core.json.JsonObject")));
-}
diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java
index dd90880e9a089..e15ea64f5b100 100644
--- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java
+++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/RESTEasyExtension.java
@@ -31,7 +31,8 @@ public RESTEasyExtension(IndexView index) {
 
     private void scanAsyncResponseProvidersFromServices() {
         try {
-            Class<?> asyncResponseProvider = Class.forName("org.jboss.resteasy.spi.AsyncResponseProvider");
+            Class<?> asyncResponseProvider = Class.forName("org.jboss.resteasy.spi.AsyncResponseProvider", false,
+                    Thread.currentThread().getContextClassLoader());
             // can't use the ServiceLoader API because Providers is not an interface
             for (String provider : ServiceUtil.classNamesNamedIn(getClass().getClassLoader(),
                     "META-INF/services/javax.ws.rs.ext.Providers")) {
@@ -46,7 +47,8 @@ private void scanAsyncResponseProvidersFromServices() {
 
     private void scanAsyncResponseProvidersFromClassName(Class<?> asyncResponseProviderClass, String name) {
         try {
-            Class<?> klass = Class.forName(name);
+            Class<?> klass = Class.forName(name, false,
+                    Thread.currentThread().getContextClassLoader());
             if (asyncResponseProviderClass.isAssignableFrom(klass)) {
                 for (java.lang.reflect.Type type : klass.getGenericInterfaces()) {
                     if (type instanceof java.lang.reflect.ParameterizedType) {
diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
index 6a37eeeb28644..ae5c533800bd2 100644
--- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
+++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
@@ -5,6 +5,8 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -29,6 +31,7 @@
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Type;
+import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
@@ -41,6 +44,7 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
@@ -51,19 +55,26 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyDotNames;
+import io.quarkus.resteasy.server.common.spi.AllowedJaxRsAnnotationPrefixBuildItem;
 import io.quarkus.resteasy.server.common.spi.ResteasyJaxrsConfigBuildItem;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig;
-import io.quarkus.smallrye.openapi.runtime.OpenApiDocumentProducer;
-import io.quarkus.smallrye.openapi.runtime.OpenApiHandler;
+import io.quarkus.smallrye.openapi.deployment.security.SecurityConfigFilter;
+import io.quarkus.smallrye.openapi.deployment.spi.AddToOpenAPIDefinitionBuildItem;
+import io.quarkus.smallrye.openapi.runtime.OpenApiConstants;
+import io.quarkus.smallrye.openapi.runtime.OpenApiDocumentService;
 import io.quarkus.smallrye.openapi.runtime.OpenApiRecorder;
+import io.quarkus.smallrye.openapi.runtime.OpenApiRuntimeConfig;
 import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
-import io.quarkus.vertx.http.runtime.HandlerType;
 import io.smallrye.openapi.api.OpenApiConfig;
 import io.smallrye.openapi.api.OpenApiConfigImpl;
 import io.smallrye.openapi.api.OpenApiDocument;
+import io.smallrye.openapi.api.models.OpenAPIImpl;
 import io.smallrye.openapi.runtime.OpenApiProcessor;
 import io.smallrye.openapi.runtime.OpenApiStaticFile;
 import io.smallrye.openapi.runtime.io.Format;
@@ -72,6 +83,8 @@
 import io.smallrye.openapi.runtime.scanner.FilteredIndexView;
 import io.smallrye.openapi.runtime.scanner.OpenApiAnnotationScanner;
 import io.smallrye.openapi.vertx.VertxConstants;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
 
 /**
  * The main OpenAPI Processor. This will scan for JAX-RS, Spring and Vert.x Annotations, and, if any, add supplied schemas.
@@ -79,6 +92,8 @@
  */
 public class SmallRyeOpenApiProcessor {
 
+    private static final Logger log = Logger.getLogger("io.quarkus.smallrye.openapi");
+
     private static final String META_INF_OPENAPI_YAML = "META-INF/openapi.yaml";
     private static final String WEB_INF_CLASSES_META_INF_OPENAPI_YAML = "WEB-INF/classes/META-INF/openapi.yaml";
     private static final String META_INF_OPENAPI_YML = "META-INF/openapi.yml";
@@ -97,8 +112,19 @@ public class SmallRyeOpenApiProcessor {
     private static final String OPENAPI_SCHEMA_ANY_OF = "anyOf";
     private static final String OPENAPI_SCHEMA_ALL_OF = "allOf";
     private static final String OPENAPI_SCHEMA_IMPLEMENTATION = "implementation";
+    private static final String JAX_RS = "JAX-RS";
+    private static final String SPRING = "Spring";
+    private static final String VERT_X = "Vert.x";
+
+    static {
+        System.setProperty(io.smallrye.openapi.api.constants.OpenApiConstants.DEFAULT_PRODUCES, "application/json");
+        System.setProperty(io.smallrye.openapi.api.constants.OpenApiConstants.DEFAULT_CONSUMES, "application/json");
+    }
 
-    SmallRyeOpenApiConfig openapi;
+    @BuildStep
+    CapabilityBuildItem capability() {
+        return new CapabilityBuildItem(Capability.SMALLRYE_OPENAPI);
+    }
 
     @BuildStep
     void contributeClassesToIndex(BuildProducer<AdditionalIndexedClassesBuildItem> additionalIndexedClasses) {
@@ -121,10 +147,14 @@ List<HotDeploymentWatchedFileBuildItem> configFiles() {
     }
 
     @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
+    @Record(ExecutionTime.RUNTIME_INIT)
     RouteBuildItem handler(LaunchModeBuildItem launch,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints, OpenApiRecorder recorder,
-            ShutdownContextBuildItem shutdownContext) {
+            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
+            OpenApiRecorder recorder,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            OpenApiRuntimeConfig openApiRuntimeConfig,
+            ShutdownContextBuildItem shutdownContext,
+            SmallRyeOpenApiConfig openApiConfig) {
         /*
          * <em>Ugly Hack</em>
          * In dev mode, we pass a classloader to load the up to date OpenAPI document.
@@ -138,14 +168,38 @@ RouteBuildItem handler(LaunchModeBuildItem launch,
          */
         if (launch.getLaunchMode() == LaunchMode.DEVELOPMENT) {
             recorder.setupClDevMode(shutdownContext);
-            displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(openapi.path));
         }
-        return new RouteBuildItem(openapi.path, new OpenApiHandler(), HandlerType.BLOCKING);
+
+        Handler<RoutingContext> handler = recorder.handler(openApiRuntimeConfig);
+        return nonApplicationRootPathBuildItem.routeBuilder()
+                .route(openApiConfig.path)
+                .routeConfigKey("quarkus.smallrye-openapi.path")
+                .handler(handler)
+                .displayOnNotFoundPage("Open API Schema document")
+                .requiresLegacyRedirect()
+                .blockingRoute()
+                .build();
     }
 
     @BuildStep
-    AdditionalBeanBuildItem beans() {
-        return new AdditionalBeanBuildItem(OpenApiDocumentProducer.class);
+    void addSecurityFilter(BuildProducer<AddToOpenAPIDefinitionBuildItem> addToOpenAPIDefinitionProducer,
+            SmallRyeOpenApiConfig config) {
+
+        addToOpenAPIDefinitionProducer
+                .produce(new AddToOpenAPIDefinitionBuildItem(new SecurityConfigFilter(config)));
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    void classLoaderHack(OpenApiRecorder recorder) {
+        recorder.classLoaderHack();
+    }
+
+    @BuildStep
+    void additionalBean(BuildProducer<AdditionalBeanBuildItem> additionalBeanProducer) {
+        additionalBeanProducer.produce(AdditionalBeanBuildItem.builder()
+                .addBeanClass(OpenApiDocumentService.class)
+                .setUnremovable().build());
     }
 
     @BuildStep
@@ -159,6 +213,13 @@ OpenApiFilteredIndexViewBuildItem smallryeOpenApiIndex(CombinedIndexBuildItem co
                         new OpenApiConfigImpl(ConfigProvider.getConfig())));
     }
 
+    @BuildStep
+    public List<AllowedJaxRsAnnotationPrefixBuildItem> registerJaxRsSupportedAnnotation() {
+        List<AllowedJaxRsAnnotationPrefixBuildItem> prefixes = new ArrayList<>();
+        prefixes.add(new AllowedJaxRsAnnotationPrefixBuildItem("org.eclipse.microprofile.openapi.annotations"));
+        return prefixes;
+    }
+
     @BuildStep
     public void registerOpenApiSchemaClassesForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
@@ -176,9 +237,8 @@ public void registerOpenApiSchemaClassesForReflection(BuildProducer<ReflectiveCl
                 if (typeTarget.kind() != AnnotationTarget.Kind.CLASS) {
                     continue;
                 }
-                reflectiveHierarchy
-                        .produce(new ReflectiveHierarchyBuildItem(Type.create(typeTarget.asClass().name(), Type.Kind.CLASS),
-                                IgnoreDotNames.IGNORE_FOR_REFLECTION_PREDICATE));
+                produceReflectiveHierarchy(reflectiveHierarchy, Type.create(typeTarget.asClass().name(), Type.Kind.CLASS),
+                        getClass().getSimpleName() + " > " + typeTarget.asClass().name());
             }
 
             // Generate reflection declaration from MP OpenAPI APIResponse schema definition
@@ -216,11 +276,13 @@ private void registerReflectionForApiResponseSchemaSerialization(BuildProducer<R
                 if (annotationValue == null) {
                     continue;
                 }
+
                 AnnotationInstance schema = annotationValue.asNested();
+                String source = getClass().getSimpleName() + " > " + schema.target();
+
                 AnnotationValue schemaImplementationClass = schema.value(OPENAPI_SCHEMA_IMPLEMENTATION);
                 if (schemaImplementationClass != null) {
-                    reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(schemaImplementationClass.asClass(),
-                            IgnoreDotNames.IGNORE_FOR_REFLECTION_PREDICATE));
+                    produceReflectiveHierarchy(reflectiveHierarchy, schemaImplementationClass.asClass(), source);
                 }
 
                 AnnotationValue schemaNotClass = schema.value(OPENAPI_SCHEMA_NOT);
@@ -228,29 +290,9 @@ private void registerReflectionForApiResponseSchemaSerialization(BuildProducer<R
                     reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, schemaNotClass.asString()));
                 }
 
-                AnnotationValue schemaOneOfClasses = schema.value(OPENAPI_SCHEMA_ONE_OF);
-                if (schemaOneOfClasses != null) {
-                    for (Type schemaOneOfClass : schemaOneOfClasses.asClassArray()) {
-                        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(schemaOneOfClass,
-                                IgnoreDotNames.IGNORE_FOR_REFLECTION_PREDICATE));
-                    }
-                }
-
-                AnnotationValue schemaAnyOfClasses = schema.value(OPENAPI_SCHEMA_ANY_OF);
-                if (schemaAnyOfClasses != null) {
-                    for (Type schemaAnyOfClass : schemaAnyOfClasses.asClassArray()) {
-                        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(schemaAnyOfClass,
-                                IgnoreDotNames.IGNORE_FOR_REFLECTION_PREDICATE));
-                    }
-                }
-
-                AnnotationValue schemaAllOfClasses = schema.value(OPENAPI_SCHEMA_ALL_OF);
-                if (schemaAllOfClasses != null) {
-                    for (Type schemaAllOfClass : schemaAllOfClasses.asClassArray()) {
-                        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(schemaAllOfClass,
-                                IgnoreDotNames.IGNORE_FOR_REFLECTION_PREDICATE));
-                    }
-                }
+                produceReflectiveHierarchy(reflectiveHierarchy, schema.value(OPENAPI_SCHEMA_ONE_OF), source);
+                produceReflectiveHierarchy(reflectiveHierarchy, schema.value(OPENAPI_SCHEMA_ANY_OF), source);
+                produceReflectiveHierarchy(reflectiveHierarchy, schema.value(OPENAPI_SCHEMA_ALL_OF), source);
             }
         }
     }
@@ -262,7 +304,10 @@ public void build(ApplicationArchivesBuildItem archivesBuildItem,
             BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
             OpenApiFilteredIndexViewBuildItem openApiFilteredIndexViewBuildItem,
             Capabilities capabilities,
+            List<AddToOpenAPIDefinitionBuildItem> openAPIBuildItems,
             HttpRootPathBuildItem httpRootPathBuildItem,
+            OutputTargetBuildItem out,
+            SmallRyeOpenApiConfig openApiConfig,
             Optional<ResteasyJaxrsConfigBuildItem> resteasyJaxrsConfig) throws Exception {
         FilteredIndexView index = openApiFilteredIndexViewBuildItem.getIndex();
 
@@ -274,15 +319,22 @@ public void build(ApplicationArchivesBuildItem archivesBuildItem,
         if (shouldScanAnnotations(capabilities, index)) {
             annotationModel = generateAnnotationModel(index, capabilities, httpRootPathBuildItem, resteasyJaxrsConfig);
         } else {
-            annotationModel = null;
+            annotationModel = new OpenAPIImpl();
         }
-        OpenApiDocument finalDocument = loadDocument(staticModel, annotationModel);
+        OpenApiDocument finalDocument = loadDocument(staticModel, annotationModel, openAPIBuildItems);
+
         for (Format format : Format.values()) {
-            String name = OpenApiHandler.BASE_NAME + format;
-            resourceBuildItemBuildProducer.produce(new GeneratedResourceBuildItem(name,
-                    OpenApiSerializer.serialize(finalDocument.get(), format).getBytes(StandardCharsets.UTF_8)));
+            String name = OpenApiConstants.BASE_NAME + format;
+            byte[] schemaDocument = OpenApiSerializer.serialize(finalDocument.get(), format).getBytes(StandardCharsets.UTF_8);
+            resourceBuildItemBuildProducer.produce(new GeneratedResourceBuildItem(name, schemaDocument));
             nativeImageResources.produce(new NativeImageResourceBuildItem(name));
         }
+
+        // Store the document if needed
+        boolean shouldStore = openApiConfig.storeSchemaDirectory.isPresent();
+        if (shouldStore) {
+            storeDocument(out, openApiConfig, staticModel, annotationModel, openAPIBuildItems);
+        }
     }
 
     @BuildStep
@@ -291,6 +343,49 @@ LogCleanupFilterBuildItem logCleanup() {
                 "OpenAPI document initialized:");
     }
 
+    private void produceReflectiveHierarchy(BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
+            AnnotationValue annotationValue, String source) {
+        if (annotationValue != null) {
+            for (Type type : annotationValue.asClassArray()) {
+                produceReflectiveHierarchy(reflectiveHierarchy, type, source);
+            }
+        }
+    }
+
+    private void produceReflectiveHierarchy(BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy, Type type,
+            String source) {
+        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                .type(type)
+                .ignoreTypePredicate(ResteasyDotNames.IGNORE_TYPE_FOR_REFLECTION_PREDICATE)
+                .ignoreFieldPredicate(ResteasyDotNames.IGNORE_FIELD_FOR_REFLECTION_PREDICATE)
+                .ignoreMethodPredicate(ResteasyDotNames.IGNORE_METHOD_FOR_REFLECTION_PREDICATE)
+                .source(source)
+                .build());
+    }
+
+    private void storeGeneratedSchema(SmallRyeOpenApiConfig openApiConfig, OutputTargetBuildItem out, byte[] schemaDocument,
+            Format format) throws IOException {
+        Path directory = openApiConfig.storeSchemaDirectory.get();
+
+        Path outputDirectory = out.getOutputDirectory();
+
+        if (!directory.isAbsolute() && outputDirectory != null) {
+            directory = Paths.get(outputDirectory.getParent().toString(), directory.toString());
+        }
+
+        if (!Files.exists(directory)) {
+            Files.createDirectories(directory);
+        }
+
+        Path file = Paths.get(directory.toString(), "openapi." + format.toString().toLowerCase());
+        if (!Files.exists(file)) {
+            Files.createFile(file);
+        }
+        Files.write(file, schemaDocument, StandardOpenOption.WRITE);
+
+        log.info("OpenAPI " + format.toString() + " saved: " + file.toString());
+    }
+
     private boolean shouldScanAnnotations(Capabilities capabilities, IndexView index) {
         // Disabled via config
         Config config = ConfigProvider.getConfig();
@@ -299,11 +394,12 @@ private boolean shouldScanAnnotations(Capabilities capabilities, IndexView index
             return false;
         }
 
-        // Only scan if either JaxRS, Spring Web or Vert.x Web (with @Route) is used
-        boolean isJaxrs = capabilities.isPresent(Capability.RESTEASY);
+        // Only scan if either RESTEasy, Quarkus REST, Spring Web or Vert.x Web (with @Route) is used
+        boolean isRestEasy = capabilities.isPresent(Capability.RESTEASY);
+        boolean isQuarkusRest = capabilities.isPresent(Capability.RESTEASY_REACTIVE);
         boolean isSpring = capabilities.isPresent(Capability.SPRING_WEB);
         boolean isVertx = isUsingVertxRoute(index);
-        return isJaxrs || isSpring || isVertx;
+        return isRestEasy || isQuarkusRest || isSpring || isVertx;
     }
 
     private boolean isUsingVertxRoute(IndexView index) {
@@ -336,6 +432,7 @@ private OpenAPI generateAnnotationModel(IndexView indexView, Capabilities capabi
         if (capabilities.isPresent(Capability.RESTEASY)) {
             extensions.add(new RESTEasyExtension(indexView));
         }
+        // TODO: add a Quarkus-REST specific extension that knows the Quarkus REST specific annotations as well as the fact that *param annotations aren't necessary
 
         String defaultPath;
         if (resteasyJaxrsConfig.isPresent()) {
@@ -347,7 +444,22 @@ private OpenAPI generateAnnotationModel(IndexView indexView, Capabilities capabi
             extensions.add(new CustomPathExtension(defaultPath));
         }
 
-        return new OpenApiAnnotationScanner(openApiConfig, indexView, extensions).scan();
+        OpenApiAnnotationScanner openApiAnnotationScanner = new OpenApiAnnotationScanner(openApiConfig, indexView, extensions);
+        return openApiAnnotationScanner.scan(getScanners(capabilities, indexView));
+    }
+
+    private String[] getScanners(Capabilities capabilities, IndexView index) {
+        List<String> scanners = new ArrayList<>();
+        if (capabilities.isPresent(Capability.RESTEASY) || capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
+            scanners.add(JAX_RS);
+        }
+        if (capabilities.isPresent(Capability.SPRING_WEB)) {
+            scanners.add(SPRING);
+        }
+        if (isUsingVertxRoute(index)) {
+            scanners.add(VERT_X);
+        }
+        return scanners.toArray(new String[] {});
     }
 
     private Result findStaticModel(ApplicationArchivesBuildItem archivesBuildItem) {
@@ -389,7 +501,38 @@ static class Result {
         }
     }
 
-    public OpenApiDocument loadDocument(OpenAPI staticModel, OpenAPI annotationModel) {
+    private OpenApiDocument loadDocument(OpenAPI staticModel, OpenAPI annotationModel,
+            List<AddToOpenAPIDefinitionBuildItem> openAPIBuildItems) {
+        OpenApiDocument document = prepareOpenApiDocument(staticModel, annotationModel, openAPIBuildItems);
+        document.initialize();
+        return document;
+    }
+
+    private void storeDocument(OutputTargetBuildItem out,
+            SmallRyeOpenApiConfig smallRyeOpenApiConfig,
+            OpenAPI staticModel,
+            OpenAPI annotationModel,
+            List<AddToOpenAPIDefinitionBuildItem> openAPIBuildItems) throws IOException {
+
+        Config config = ConfigProvider.getConfig();
+        OpenApiConfig openApiConfig = new OpenApiConfigImpl(config);
+
+        OpenApiDocument document = prepareOpenApiDocument(staticModel, annotationModel, openAPIBuildItems);
+
+        document.filter(filter(openApiConfig)); // This usually happens at runtime, so when storing we want to filter here too.
+        document.initialize();
+
+        for (Format format : Format.values()) {
+            String name = OpenApiConstants.BASE_NAME + format;
+            byte[] schemaDocument = OpenApiSerializer.serialize(document.get(), format).getBytes(StandardCharsets.UTF_8);
+            storeGeneratedSchema(smallRyeOpenApiConfig, out, schemaDocument, format);
+        }
+
+    }
+
+    private OpenApiDocument prepareOpenApiDocument(OpenAPI staticModel,
+            OpenAPI annotationModel,
+            List<AddToOpenAPIDefinitionBuildItem> openAPIBuildItems) {
         Config config = ConfigProvider.getConfig();
         OpenApiConfig openApiConfig = new OpenApiConfigImpl(config);
 
@@ -402,8 +545,10 @@ public OpenApiDocument loadDocument(OpenAPI staticModel, OpenAPI annotationModel
         }
         document.modelFromReader(readerModel);
         document.modelFromStaticFile(staticModel);
-        document.filter(filter(openApiConfig));
-        document.initialize();
+        for (AddToOpenAPIDefinitionBuildItem openAPIBuildItem : openAPIBuildItems) {
+            OASFilter otherExtensionFilter = openAPIBuildItem.getOASFilter();
+            document.filter(otherExtensionFilter);
+        }
         return document;
     }
 
@@ -418,4 +563,4 @@ private OASFilter filter(OpenApiConfig openApiConfig) {
         return OpenApiProcessor.getFilter(openApiConfig,
                 Thread.currentThread().getContextClassLoader());
     }
-}
\ No newline at end of file
+}
diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/security/SecurityConfigFilter.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/security/SecurityConfigFilter.java
new file mode 100644
index 0000000000000..6d7d60c68b3b5
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/security/SecurityConfigFilter.java
@@ -0,0 +1,97 @@
+package io.quarkus.smallrye.openapi.deployment.security;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.microprofile.openapi.OASFactory;
+import org.eclipse.microprofile.openapi.OASFilter;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+import org.eclipse.microprofile.openapi.models.security.OAuthFlow;
+import org.eclipse.microprofile.openapi.models.security.OAuthFlows;
+import org.eclipse.microprofile.openapi.models.security.SecurityScheme;
+import org.jboss.logging.Logger;
+
+import io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig;
+
+/**
+ * Add Basic Security via Config
+ */
+public class SecurityConfigFilter implements OASFilter {
+    private static final Logger log = Logger.getLogger("io.quarkus.smallrye.openapi");
+
+    private final SmallRyeOpenApiConfig config;
+
+    public SecurityConfigFilter(SmallRyeOpenApiConfig config) {
+        this.config = config;
+    }
+
+    @Override
+    public void filterOpenAPI(OpenAPI openAPI) {
+
+        if (config.securityScheme.isPresent()) {
+
+            // Make sure components are created
+            if (openAPI.getComponents() == null) {
+                openAPI.setComponents(OASFactory.createComponents());
+            }
+
+            Map<String, SecurityScheme> securitySchemes = new HashMap();
+
+            // Add any existing security
+            if (openAPI.getComponents().getSecuritySchemes() != null
+                    && !openAPI.getComponents().getSecuritySchemes().isEmpty()) {
+                securitySchemes.putAll(openAPI.getComponents().getSecuritySchemes());
+            }
+
+            SmallRyeOpenApiConfig.SecurityScheme securitySchemeOption = config.securityScheme.get();
+
+            SecurityScheme securityScheme = OASFactory.createSecurityScheme();
+            securityScheme.setDescription(config.securitySchemeDescription);
+
+            switch (securitySchemeOption) {
+                case basic:
+                    securityScheme.setType(SecurityScheme.Type.HTTP);
+                    securityScheme.setScheme(config.basicSecuritySchemeValue);
+                    break;
+                case jwt:
+                    securityScheme.setType(SecurityScheme.Type.HTTP);
+                    securityScheme.setScheme(config.jwtSecuritySchemeValue);
+                    securityScheme.setBearerFormat(config.jwtBearerFormat);
+                    break;
+                case oidc:
+                    securityScheme.setType(SecurityScheme.Type.OPENIDCONNECT);
+                    securityScheme.setOpenIdConnectUrl(config.oidcOpenIdConnectUrl.orElse(null));
+                    break;
+                case oauth2Implicit:
+                    securityScheme.setType(SecurityScheme.Type.OAUTH2);
+                    OAuthFlows oAuthFlows = OASFactory.createOAuthFlows();
+                    OAuthFlow oAuthFlow = OASFactory.createOAuthFlow();
+                    if (config.oauth2ImplicitAuthorizationUrl.isPresent()) {
+                        oAuthFlow.authorizationUrl(config.oauth2ImplicitAuthorizationUrl.get());
+                    }
+                    if (config.oauth2ImplicitRefreshUrl.isPresent()) {
+                        oAuthFlow.authorizationUrl(config.oauth2ImplicitRefreshUrl.get());
+                    }
+                    if (config.oauth2ImplicitTokenUrl.isPresent()) {
+                        oAuthFlow.tokenUrl(config.oauth2ImplicitTokenUrl.get());
+                    }
+                    oAuthFlow.setScopes(OASFactory.createScopes());
+                    oAuthFlows.setImplicit(oAuthFlow);
+                    securityScheme.setType(SecurityScheme.Type.OAUTH2);
+                    securityScheme.setFlows(oAuthFlows);
+                    break;
+            }
+            securitySchemes.put(config.securitySchemeName, securityScheme);
+            openAPI.getComponents().setSecuritySchemes(securitySchemes);
+        }
+
+        if (openAPI.getComponents() != null && openAPI.getComponents().getSecuritySchemes() != null) {
+
+            Map<String, SecurityScheme> securitySchemes = openAPI.getComponents().getSecuritySchemes();
+            if (securitySchemes.size() > 1) {
+                log.warn("Detected multiple Security Schemes, only one scheme is supported at the moment "
+                        + securitySchemes.keySet().toString());
+            }
+        }
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/main/resources/dev-templates/embedded.html b/extensions/smallrye-openapi/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..301c0af54e22a
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,7 @@
+<a href="{config:http-path('quarkus.smallrye-openapi.path')}" class="badge badge-light">
+  <i class="fa fa-map-signs fa-fw"></i>
+  OpenAPI</a>
+<br>
+<a href="{config:http-path('quarkus.swagger-ui.path')}/" class="badge badge-light">
+  <i class="fa fa-map-signs fa-fw"></i>
+  Swagger UI</a>
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java
index fe231bed73438..8b8071d3172dc 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/hotreload/OpenApiHotReloadTest.java
@@ -20,7 +20,7 @@ public class OpenApiHotReloadTest {
 
     @Test
     public void testAddingAndDeletingEndpoint() {
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"));
 
@@ -30,14 +30,14 @@ public void testAddingAndDeletingEndpoint() {
                         + " return \"bonjour\"; "
                         + "}"));
 
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"))
                 .body(containsString("/api/foo"));
 
         TEST.modifySourceFile("MyResource.java", s -> s.replace("foo", "bar"));
 
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"))
                 .body(not(containsString("/api/foo")))
@@ -45,7 +45,7 @@ public void testAddingAndDeletingEndpoint() {
 
         TEST.modifySourceFile("MyResource.java", s -> s.replace("@GET @Path(\"bar\")", ""));
 
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"))
                 .body(not(containsString("/api/foo")))
@@ -54,20 +54,20 @@ public void testAddingAndDeletingEndpoint() {
 
     @Test
     public void testAddingAndUpdatingResource() {
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"));
 
         TEST.addSourceFile(MySecondResource.class);
 
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"))
                 .body(containsString("/my-second-api"));
 
         TEST.modifySourceFile("MySecondResource.java", s -> s.replace("my-second-api", "/foo"));
 
-        RestAssured.get("/openapi").then()
+        RestAssured.get("/q/openapi").then()
                 .statusCode(200)
                 .body(containsString("/api"))
                 .body(not(containsString("/my-second-api")))
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java
new file mode 100644
index 0000000000000..9df6f3b6bcb48
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/BasicSecurityWithConfigTestCase.java
@@ -0,0 +1,36 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class BasicSecurityWithConfigTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
+                    .addAsResource(
+                            new StringAsset("quarkus.smallrye-openapi.security-scheme=basic\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-name=CompanyAuthentication\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-description=Basic Authentication"),
+
+                            "application.properties"));
+
+    @Test
+    public void testBasicAuthentication() {
+        RestAssured.given().header("Accept", "application/json")
+                .when().get("/q/openapi")
+                .then().body("components.securitySchemes.CompanyAuthentication", Matchers.hasEntry("type", "http"))
+                .and()
+                .body("components.securitySchemes.CompanyAuthentication",
+                        Matchers.hasEntry("description", "Basic Authentication"))
+                .and().body("components.securitySchemes.CompanyAuthentication", Matchers.hasEntry("scheme", "basic"));
+    }
+
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java
new file mode 100644
index 0000000000000..e6d751cdf85c3
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeResource.java
@@ -0,0 +1,31 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/greeting")
+public class DefaultContentTypeResource {
+
+    @GET
+    @Path("/hello")
+    public Greeting hello() {
+        return new Greeting("Hello there");
+    }
+
+    @POST
+    @Path("/hello")
+    public Greeting hello(Greeting greeting) {
+        return greeting;
+    }
+
+    @GET
+    @Path("/goodbye")
+    @Produces(MediaType.APPLICATION_XML)
+    public Greeting byebye() {
+        return new Greeting("Good Bye !");
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java
new file mode 100644
index 0000000000000..5d0913a294ecb
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/DefaultContentTypeTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DefaultContentTypeTest {
+    private static final String OPEN_API_PATH = "/q/openapi";
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(DefaultContentTypeResource.class, Greeting.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=target"),
+                            "application.properties"));
+
+    @Test
+    public void testOpenApiPathAccessResource() {
+        RestAssured.given().queryParam("format", "JSON")
+                .when().get(OPEN_API_PATH)
+                .then()
+                .header("Content-Type", "application/json;charset=UTF-8")
+                .body("paths.'/greeting/goodbye'.get.responses.'200'.content.'application/xml'.schema.$ref",
+                        Matchers.containsString("#/components/schemas/Greeting"))
+                .body("paths.'/greeting/hello'.get.responses.'200'.content.'application/json'.schema.$ref",
+                        Matchers.containsString("#/components/schemas/Greeting"))
+                .body("paths.'/greeting/hello'.post.responses.'200'.content.'application/json'.schema.$ref",
+                        Matchers.containsString("#/components/schemas/Greeting"));
+
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Greeting.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Greeting.java
new file mode 100644
index 0000000000000..63ba785a47b34
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Greeting.java
@@ -0,0 +1,14 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+public class Greeting {
+
+    private final String message;
+
+    public Greeting(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java
new file mode 100644
index 0000000000000..13606bdc01a88
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/JWTSecurityWithConfigTestCase.java
@@ -0,0 +1,37 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class JWTSecurityWithConfigTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
+                    .addAsResource(
+                            new StringAsset("quarkus.smallrye-openapi.security-scheme=jwt\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-name=JWTCompanyAuthentication\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-description=JWT Authentication"),
+
+                            "application.properties"));
+
+    @Test
+    public void testJWTAuthentication() {
+        RestAssured.given().header("Accept", "application/json")
+                .when().get("/q/openapi")
+                .then().body("components.securitySchemes.JWTCompanyAuthentication", Matchers.hasEntry("type", "http"))
+                .and()
+                .body("components.securitySchemes.JWTCompanyAuthentication",
+                        Matchers.hasEntry("description", "JWT Authentication"))
+                .and().body("components.securitySchemes.JWTCompanyAuthentication", Matchers.hasEntry("scheme", "bearer"))
+                .and().body("components.securitySchemes.JWTCompanyAuthentication", Matchers.hasEntry("bearerFormat", "JWT"));
+    }
+
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java
new file mode 100644
index 0000000000000..836d943232a6d
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/MyOASFilter.java
@@ -0,0 +1,24 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import java.util.Optional;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.openapi.OASFilter;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+
+/**
+ * Filter to add custom elements
+ */
+public class MyOASFilter implements OASFilter {
+
+    final Config config = ConfigProvider.getConfig();
+
+    @Override
+    public void filterOpenAPI(OpenAPI openAPI) {
+        Optional<String> maybeVersion = config.getOptionalValue("my.openapi.version", String.class);
+        String version = maybeVersion.orElse("3.0.3");
+        openAPI.setOpenapi(version);
+    }
+
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/NamingOASFilter.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/NamingOASFilter.java
new file mode 100644
index 0000000000000..a6084777672eb
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/NamingOASFilter.java
@@ -0,0 +1,22 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.eclipse.microprofile.openapi.OASFactory;
+import org.eclipse.microprofile.openapi.OASFilter;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+import org.eclipse.microprofile.openapi.models.info.Info;
+
+/**
+ * Filter to name the document
+ */
+public class NamingOASFilter implements OASFilter {
+
+    @Override
+    public void filterOpenAPI(OpenAPI openAPI) {
+
+        Info info = OASFactory.createInfo();
+        info.setTitle("Here my title from a filter");
+
+        openAPI.setInfo(info);
+    }
+
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java
new file mode 100644
index 0000000000000..adf5afa60cad4
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OIDCSecurityWithConfigTestCase.java
@@ -0,0 +1,37 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class OIDCSecurityWithConfigTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
+                    .addAsResource(
+                            new StringAsset("quarkus.smallrye-openapi.security-scheme=oidc\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-name=OIDCCompanyAuthentication\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-description=OIDC Authentication\n"
+                                    + "quarkus.smallrye-openapi.oidc-open-id-connect-url=http://localhost:8081/auth/realms/OpenAPIOIDC/.well-known/openid-configuration"),
+
+                            "application.properties"));
+
+    @Test
+    public void testOIDCAuthentication() {
+        RestAssured.given().header("Accept", "application/json")
+                .when().get("/q/openapi")
+                .then().body("components.securitySchemes.OIDCCompanyAuthentication", Matchers.hasEntry("type", "openIdConnect"))
+                .and()
+                .body("components.securitySchemes.OIDCCompanyAuthentication",
+                        Matchers.hasEntry("description", "OIDC Authentication"))
+                .and().body("components.securitySchemes.OIDCCompanyAuthentication", Matchers.hasEntry("openIdConnectUrl",
+                        "http://localhost:8081/auth/realms/OpenAPIOIDC/.well-known/openid-configuration"));
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java
new file mode 100644
index 0000000000000..0e9e218c82ed1
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/Oauth2ImplicitSecurityWithConfigTestCase.java
@@ -0,0 +1,34 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class Oauth2ImplicitSecurityWithConfigTestCase {
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
+                    .addAsResource(
+                            new StringAsset("quarkus.smallrye-openapi.security-scheme=oauth2Implicit\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-name=OAuth2CompanyAuthentication\n"
+                                    + "quarkus.smallrye-openapi.security-scheme-description=OAuth2 Authentication"),
+
+                            "application.properties"));
+
+    @Test
+    public void testOAuth2Authentication() {
+        RestAssured.given().header("Accept", "application/json")
+                .when().get("/q/openapi")
+                .then().body("components.securitySchemes.OAuth2CompanyAuthentication", Matchers.hasEntry("type", "oauth2"))
+                .and()
+                .body("components.securitySchemes.OAuth2CompanyAuthentication",
+                        Matchers.hasEntry("description", "OAuth2 Authentication"));
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java
index 11544c0c4b240..364c50e384cee 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiDefaultPathTestCase.java
@@ -2,6 +2,7 @@
 
 import org.hamcrest.Matchers;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -10,12 +11,14 @@
 import io.restassured.RestAssured;
 
 public class OpenApiDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class));
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=target"),
+                            "application.properties"));
 
     @Test
     public void testOpenApiPathAccessResource() {
@@ -34,7 +37,11 @@ public void testOpenApiPathAccessResource() {
                 .header("Content-Type", "application/json;charset=UTF-8")
                 .body("openapi", Matchers.startsWith("3.0"))
                 .body("info.title", Matchers.equalTo("Generated API"))
-                .body("paths", Matchers.hasKey("/resource"));
+                .body("tags.name[0]", Matchers.equalTo("test"))
+                .body("paths.'/resource'.get.servers[0]", Matchers.hasKey("url"))
+                .body("paths.'/resource'.get.security[0]", Matchers.hasKey("securityRequirement"))
+                .body("paths.'/resource'.get", Matchers.hasKey("x-openApiExtension"));
+
         RestAssured.given()
                 .when().options(OPEN_API_PATH)
                 .then().header("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS");
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java
index 47ff1250686fa..c5903ab613a4e 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiHttpRootDefaultPathTestCase.java
@@ -11,12 +11,12 @@
 import io.restassured.RestAssured;
 
 public class OpenApiHttpRootDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
                     .addAsResource(new StringAsset("quarkus.http.root-path=/foo"), "application.properties"));
 
     @Test
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java
index 35d6a2804ed7b..3ea5304666de2 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithSegmentsTestCase.java
@@ -15,7 +15,7 @@ public class OpenApiPathWithSegmentsTestCase {
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
                     .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=" + OPEN_API_PATH),
                             "application.properties"));
 
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java
index 9f11c179f1dd0..a8a34f7c2b17f 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiPathWithoutSegmentsTestCase.java
@@ -10,28 +10,28 @@
 import io.restassured.RestAssured;
 
 public class OpenApiPathWithoutSegmentsTestCase {
-    private static final String OPEN_API_PATH = "/path-without-segments";
+    private static final String OPEN_API_PATH = "path-without-segments";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
                     .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=" + OPEN_API_PATH),
                             "application.properties"));
 
     @Test
     public void testOpenApiPathAccessResource() {
         RestAssured.given().header("Accept", "application/yaml")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().queryParam("format", "YAML")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().header("Accept", "application/json")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
         RestAssured.given().queryParam("format", "JSON")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
     }
 }
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java
index 984a72bda1e1b..de854165f7505 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiResource.java
@@ -1,15 +1,32 @@
 package io.quarkus.smallrye.openapi.test.jaxrs;
 
+import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
 
+import org.eclipse.microprofile.openapi.annotations.extensions.Extension;
+import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement;
+import org.eclipse.microprofile.openapi.annotations.servers.Server;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+
 @Path("/resource")
+@Tag(name = "test")
+@Extension(name = "openApiExtension", value = "openApiExtensionValue")
+@SecurityRequirement(name = "securityRequirement", scopes = "securityRequirementScope")
+@Server(url = "serverUrl")
 public class OpenApiResource {
 
+    private ResourceBean resourceBean;
+
+    @Inject
+    public OpenApiResource(ResourceBean resourceBean) {
+        this.resourceBean = resourceBean;
+    }
+
     @GET
     public String root() {
-        return "resource";
+        return resourceBean.toString();
     }
 
     @GET
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java
new file mode 100644
index 0000000000000..45f8bf4c5ac67
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiRuntimeFilterTestCase.java
@@ -0,0 +1,32 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class OpenApiRuntimeFilterTestCase {
+    private static final String OPEN_API_PATH = "/q/openapi";
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class, MyOASFilter.class)
+                    .addAsResource(new StringAsset("mp.openapi.filter=io.quarkus.smallrye.openapi.test.jaxrs.MyOASFilter\n"
+                            + "my.openapi.version=3.1.0"),
+                            "application.properties"));
+
+    @Test
+    public void testOpenApiFilterResource() {
+        RestAssured.given().header("Accept", "application/json")
+                .when().get(OPEN_API_PATH)
+                .then()
+                .header("Content-Type", "application/json;charset=UTF-8")
+                .body("openapi", Matchers.startsWith("3.1.0"));
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java
new file mode 100644
index 0000000000000..532d419da52ec
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiStoreSchemaTestCase.java
@@ -0,0 +1,42 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.openapi.runtime.io.Format;
+
+public class OpenApiStoreSchemaTestCase {
+
+    private static String directory = "target/generated/jax-rs/";
+    private static final String OPEN_API_DOT = "openapi.";
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class, NamingOASFilter.class)
+                    .addAsResource(new StringAsset("mp.openapi.filter=io.quarkus.smallrye.openapi.test.jaxrs.NamingOASFilter\n"
+                            + "quarkus.smallrye-openapi.store-schema-directory=" + directory),
+                            "application.properties"));
+
+    @Test
+    public void testOpenApiPathAccessResource() throws IOException {
+        Path json = Paths.get(directory, OPEN_API_DOT + Format.JSON.toString().toLowerCase());
+        Assertions.assertTrue(Files.exists(json));
+        Path yaml = Paths.get(directory, OPEN_API_DOT + Format.YAML.toString().toLowerCase());
+        Assertions.assertTrue(Files.exists(yaml));
+
+        // Also check if the custom filter applied
+        String content = new String(Files.readAllBytes(json));
+        Assertions.assertTrue(content.contains(" \"title\" : \"Here my title from a filter\""));
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java
index 59d1b72e230ca..c81b59db2ce27 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithConfigTestCase.java
@@ -11,12 +11,12 @@
 import io.restassured.RestAssured;
 
 public class OpenApiWithConfigTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
                     .addAsManifestResource("test-openapi.yaml", "openapi.yaml")
                     .addAsResource(new StringAsset("mp.openapi.scan.disable=true\nmp.openapi.servers=https://api.acme.org/"),
                             "application.properties"));
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java
index d036920a5c566..21c569a6c1d1d 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathHttpRootDefaultPathTestCase.java
@@ -11,12 +11,12 @@
 import io.restassured.RestAssured;
 
 public class OpenApiWithResteasyPathHttpRootDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
                     .addAsResource(new StringAsset("quarkus.http.root-path=/http-root-path\n" +
                             "quarkus.resteasy.path=/resteasy-path"),
                             "application.properties"));
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java
index 1c33cea0f5eb5..17500ff6aa2ee 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/OpenApiWithResteasyPathTestCase.java
@@ -11,12 +11,12 @@
 import io.restassured.RestAssured;
 
 public class OpenApiWithResteasyPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(OpenApiResource.class)
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
                     .addAsResource(new StringAsset("quarkus.resteasy.path=/foo/bar"),
                             "application.properties"));
 
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java
new file mode 100644
index 0000000000000..0bbfcd90d41a3
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/ResourceBean.java
@@ -0,0 +1,11 @@
+package io.quarkus.smallrye.openapi.test.jaxrs;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class ResourceBean {
+    @Override
+    public String toString() {
+        return "resource";
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java
index 0ed44d67a3d51..eeb12e9dc260f 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/jaxrs/SwaggerAndOpenAPIWithCommonPrefixTest.java
@@ -19,13 +19,13 @@ public class SwaggerAndOpenAPIWithCommonPrefixTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(OpenApiResource.class)
-                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=/swagger"), "application.properties"));
+                    .addClasses(OpenApiResource.class, ResourceBean.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=swagger"), "application.properties"));
 
     @Test
     public void shouldWorkEvenWithCommonPrefix() {
-        RestAssured.when().get("/swagger-ui/index.html").then().statusCode(200).body(containsString("/swagger"));
-        RestAssured.when().get("/swagger").then().statusCode(200)
+        RestAssured.when().get("/q/swagger-ui/index.html").then().statusCode(200).body(containsString("/q/swagger"));
+        RestAssured.when().get("/q/swagger").then().statusCode(200)
                 .body(containsString("/resource"), containsString("QUERY_PARAM_1"));
     }
 }
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiDefaultPathTestCase.java
index fed3abcb987a4..bbe8fbe95f06f 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiDefaultPathTestCase.java
@@ -10,7 +10,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiHttpRootDefaultPathTestCase.java
index 020ecb7f7c006..949559709e7cf 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiHttpRootDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiHttpRootDefaultPathTestCase.java
@@ -11,7 +11,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiHttpRootDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiPathWithoutSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiPathWithoutSegmentsTestCase.java
index c66593dd16b96..d9094818eb9a0 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiPathWithoutSegmentsTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiPathWithoutSegmentsTestCase.java
@@ -10,7 +10,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiPathWithoutSegmentsTestCase {
-    private static final String OPEN_API_PATH = "/path-without-segments";
+    private static final String OPEN_API_PATH = "path-without-segments";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
@@ -22,16 +22,16 @@ public class OpenApiPathWithoutSegmentsTestCase {
     @Test
     public void testOpenApiPathAccessResource() {
         RestAssured.given().header("Accept", "application/yaml")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().queryParam("format", "YAML")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().header("Accept", "application/json")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
         RestAssured.given().queryParam("format", "JSON")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
     }
 }
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiStoreSchemaTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiStoreSchemaTestCase.java
new file mode 100644
index 0000000000000..9e3c3eb476c37
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiStoreSchemaTestCase.java
@@ -0,0 +1,36 @@
+package io.quarkus.smallrye.openapi.test.spring;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.openapi.runtime.io.Format;
+
+public class OpenApiStoreSchemaTestCase {
+
+    private static String directory = "target/generated/spring/";
+    private static final String OPEN_API_DOT = "openapi.";
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiController.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=" + directory),
+                            "application.properties"));
+
+    @Test
+    public void testOpenApiPathAccessResource() {
+        Path json = Paths.get(directory, OPEN_API_DOT + Format.JSON.toString().toLowerCase());
+        Assertions.assertTrue(Files.exists(json));
+        Path yaml = Paths.get(directory, OPEN_API_DOT + Format.YAML.toString().toLowerCase());
+        Assertions.assertTrue(Files.exists(yaml));
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiWithConfigTestCase.java
index 671b82eac985e..6c3657b0e45e5 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiWithConfigTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/OpenApiWithConfigTestCase.java
@@ -11,7 +11,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiWithConfigTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/SwaggerAndOpenAPIWithCommonPrefixTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/SwaggerAndOpenAPIWithCommonPrefixTest.java
index 1a44a4e06dd49..99973f8e17855 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/SwaggerAndOpenAPIWithCommonPrefixTest.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/spring/SwaggerAndOpenAPIWithCommonPrefixTest.java
@@ -20,12 +20,12 @@ public class SwaggerAndOpenAPIWithCommonPrefixTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(OpenApiController.class)
-                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=/swagger"), "application.properties"));
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=swagger"), "application.properties"));
 
     @Test
     public void shouldWorkEvenWithCommonPrefix() {
-        RestAssured.when().get("/swagger-ui/index.html").then().statusCode(200).body(containsString("/swagger"));
-        RestAssured.when().get("/swagger").then().statusCode(200)
+        RestAssured.when().get("/q/swagger-ui/index.html").then().statusCode(200).body(containsString("/q/swagger"));
+        RestAssured.when().get("/q/swagger").then().statusCode(200)
                 .body(containsString("/resource"), containsString("QUERY_PARAM_1"));
     }
 }
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java
index 6854c698b8fcc..5825bfdd7a6af 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiDefaultPathTestCase.java
@@ -10,7 +10,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java
index 035a4c36d843b..5a9b04d055d76 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiHttpRootDefaultPathTestCase.java
@@ -11,7 +11,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiHttpRootDefaultPathTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java
index ea70432bf77b6..b742edd7581c5 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithSegmentsTestCase.java
@@ -10,7 +10,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiPathWithSegmentsTestCase {
-    private static final String OPEN_API_PATH = "/path/with/segments";
+    private static final String OPEN_API_PATH = "path/with/segments";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
@@ -22,16 +22,16 @@ public class OpenApiPathWithSegmentsTestCase {
     @Test
     public void testOpenApiPathAccessResource() {
         RestAssured.given().header("Accept", "application/yaml")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().queryParam("format", "YAML")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().header("Accept", "application/json")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
         RestAssured.given().queryParam("format", "JSON")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
     }
 }
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java
index 70d2aec284029..ff26a8fd929c5 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiPathWithoutSegmentsTestCase.java
@@ -10,7 +10,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiPathWithoutSegmentsTestCase {
-    private static final String OPEN_API_PATH = "/path-without-segments";
+    private static final String OPEN_API_PATH = "path-without-segments";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
@@ -22,16 +22,16 @@ public class OpenApiPathWithoutSegmentsTestCase {
     @Test
     public void testOpenApiPathAccessResource() {
         RestAssured.given().header("Accept", "application/yaml")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().queryParam("format", "YAML")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/yaml;charset=UTF-8");
         RestAssured.given().header("Accept", "application/json")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
         RestAssured.given().queryParam("format", "JSON")
-                .when().get(OPEN_API_PATH)
+                .when().get("/q/" + OPEN_API_PATH)
                 .then().header("Content-Type", "application/json;charset=UTF-8");
     }
 }
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java
new file mode 100644
index 0000000000000..470e21cf13921
--- /dev/null
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiStoreSchemaTestCase.java
@@ -0,0 +1,36 @@
+package io.quarkus.smallrye.openapi.test.vertx;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.openapi.runtime.io.Format;
+
+public class OpenApiStoreSchemaTestCase {
+
+    private static String directory = "target/generated/vertx/";
+    private static final String OPEN_API_DOT = "openapi.";
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(OpenApiRoute.class)
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.store-schema-directory=" + directory),
+                            "application.properties"));
+
+    @Test
+    public void testOpenApiPathAccessResource() {
+        Path json = Paths.get(directory, OPEN_API_DOT + Format.JSON.toString().toLowerCase());
+        Assertions.assertTrue(Files.exists(json));
+        Path yaml = Paths.get(directory, OPEN_API_DOT + Format.YAML.toString().toLowerCase());
+        Assertions.assertTrue(Files.exists(yaml));
+    }
+}
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java
index 1b03f5e2961a6..d39013cf37770 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/OpenApiWithConfigTestCase.java
@@ -11,7 +11,7 @@
 import io.restassured.RestAssured;
 
 public class OpenApiWithConfigTestCase {
-    private static final String OPEN_API_PATH = "/openapi";
+    private static final String OPEN_API_PATH = "/q/openapi";
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
diff --git a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java
index 7f3ac9e0ebe8c..20fc632d57b2b 100644
--- a/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java
+++ b/extensions/smallrye-openapi/deployment/src/test/java/io/quarkus/smallrye/openapi/test/vertx/SwaggerAndOpenAPIWithCommonPrefixTest.java
@@ -20,12 +20,12 @@ public class SwaggerAndOpenAPIWithCommonPrefixTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(OpenApiRoute.class)
-                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=/swagger"), "application.properties"));
+                    .addAsResource(new StringAsset("quarkus.smallrye-openapi.path=swagger"), "application.properties"));
 
     @Test
     public void shouldWorkEvenWithCommonPrefix() {
-        RestAssured.when().get("/swagger-ui/index.html").then().statusCode(200).body(containsString("/swagger"));
-        RestAssured.when().get("/swagger").then().statusCode(200)
+        RestAssured.when().get("/q/swagger-ui/index.html").then().statusCode(200).body(containsString("/q/swagger"));
+        RestAssured.when().get("/q/swagger").then().statusCode(200)
                 .body(containsString("/resource"), containsString("QUERY_PARAM_1"));
     }
 }
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/pom.xml b/extensions/smallrye-openapi/pom.xml
index 7c2f9f978f32d..9f15b5fe6d077 100644
--- a/extensions/smallrye-openapi/pom.xml
+++ b/extensions/smallrye-openapi/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>quarkus-build-parent</artifactId>
+    <artifactId>quarkus-extensions-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../../build-parent/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,5 +16,6 @@
   <modules>
     <module>deployment</module>
     <module>runtime</module>
+    <module>spi</module>
   </modules>
 </project>
diff --git a/extensions/smallrye-openapi/runtime/pom.xml b/extensions/smallrye-openapi/runtime/pom.xml
index c929a03d4b55b..55e0ef2284a6e 100644
--- a/extensions/smallrye-openapi/runtime/pom.xml
+++ b/extensions/smallrye-openapi/runtime/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-smallrye-openapi-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConstants.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConstants.java
new file mode 100644
index 0000000000000..00b0929e9a4ce
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiConstants.java
@@ -0,0 +1,26 @@
+package io.quarkus.smallrye.openapi.runtime;
+
+public class OpenApiConstants {
+
+    /*
+     * <em>Ugly Hack</em>
+     * In dev mode, we receive a classloader to load the up to date OpenAPI document.
+     * This hack is required because using the TCCL would get an outdated version - the initial one.
+     * This is because the worker thread on which the handler is called captures the TCCL at creation time
+     * and does not allow updating it.
+     *
+     * This classloader must ONLY be used to load the OpenAPI document.
+     *
+     * In non dev mode, the TCCL is used.
+     *
+     * TODO: remove this once the vert.x class loader issues are resolved.
+     */
+    public static volatile ClassLoader classLoader;
+
+    public static final String GENERATED_DOC_BASE = "quarkus-generated-openapi-doc.";
+    public static final String BASE_NAME = "META-INF/" + GENERATED_DOC_BASE;
+
+    private OpenApiConstants() {
+    }
+
+}
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentProducer.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentProducer.java
deleted file mode 100644
index 74036c6f70d16..0000000000000
--- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentProducer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.quarkus.smallrye.openapi.runtime;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.openapi.models.OpenAPI;
-
-import io.smallrye.openapi.api.OpenApiConfig;
-import io.smallrye.openapi.api.OpenApiConfigImpl;
-import io.smallrye.openapi.api.OpenApiDocument;
-import io.smallrye.openapi.runtime.OpenApiProcessor;
-import io.smallrye.openapi.runtime.OpenApiStaticFile;
-import io.smallrye.openapi.runtime.io.Format;
-
-/**
- * @author Ken Finnigan
- */
-@ApplicationScoped
-public class OpenApiDocumentProducer {
-    private OpenApiDocument document;
-
-    /**
-     * We load the document from the generated JSON file, which should have all the annotations
-     *
-     * Most apps will likely just want to serve the OpenAPI doc, rather than inject it, which is why we generated the
-     * static file and parse it if required. The more Quarkus-like approach of serializing the doc to bytecode
-     * can result in a lot of bytecode, which will likely just be turned straight into a static file anyway.
-     */
-    @PostConstruct
-    void create() throws IOException {
-        try (InputStream is = getClass().getClassLoader()
-                .getResourceAsStream(OpenApiHandler.BASE_NAME + Format.JSON)) {
-            if (is != null) {
-                try (OpenApiStaticFile staticFile = new OpenApiStaticFile(is, Format.JSON)) {
-                    Config config = ConfigProvider.getConfig();
-                    OpenApiConfig openApiConfig = new OpenApiConfigImpl(config);
-
-                    OpenAPI readerModel = OpenApiProcessor.modelFromReader(openApiConfig,
-                            Thread.currentThread().getContextClassLoader());
-                    document = OpenApiDocument.INSTANCE;
-                    document.reset();
-                    document.config(openApiConfig);
-
-                    document.modelFromReader(readerModel);
-                    document.modelFromStaticFile(io.smallrye.openapi.runtime.OpenApiProcessor.modelFromStaticFile(staticFile));
-                    document.filter(OpenApiProcessor.getFilter(openApiConfig, Thread.currentThread().getContextClassLoader()));
-                    document.initialize();
-                }
-            }
-        }
-
-    }
-
-    @Produces
-    @Dependent
-    OpenApiDocument openApiDocument() {
-        return this.document;
-    }
-
-}
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java
new file mode 100644
index 0000000000000..ed51a442f5f39
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java
@@ -0,0 +1,75 @@
+package io.quarkus.smallrye.openapi.runtime;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.smallrye.openapi.api.OpenApiConfig;
+import io.smallrye.openapi.api.OpenApiConfigImpl;
+import io.smallrye.openapi.api.OpenApiDocument;
+import io.smallrye.openapi.runtime.OpenApiProcessor;
+import io.smallrye.openapi.runtime.OpenApiStaticFile;
+import io.smallrye.openapi.runtime.io.Format;
+import io.smallrye.openapi.runtime.io.OpenApiSerializer;
+
+/**
+ * Loads the document and make it available
+ */
+@ApplicationScoped
+public class OpenApiDocumentService {
+
+    private byte[] jsonDocument;
+    private byte[] yamlDocument;
+
+    @PostConstruct
+    void create() throws IOException {
+
+        ClassLoader cl = OpenApiConstants.classLoader == null ? Thread.currentThread().getContextClassLoader()
+                : OpenApiConstants.classLoader;
+        try (InputStream is = cl.getResourceAsStream(OpenApiConstants.BASE_NAME + Format.JSON)) {
+            if (is != null) {
+                try (OpenApiStaticFile staticFile = new OpenApiStaticFile(is, Format.JSON)) {
+                    Config config = ConfigProvider.getConfig();
+                    OpenApiConfig openApiConfig = new OpenApiConfigImpl(config);
+
+                    OpenApiDocument document = OpenApiDocument.INSTANCE;
+                    document.reset();
+                    document.config(openApiConfig);
+                    document.modelFromStaticFile(OpenApiProcessor.modelFromStaticFile(staticFile));
+                    document.filter(OpenApiProcessor.getFilter(openApiConfig, cl));
+                    document.initialize();
+
+                    this.jsonDocument = OpenApiSerializer.serialize(document.get(), Format.JSON)
+                            .getBytes(StandardCharsets.UTF_8);
+                    this.yamlDocument = OpenApiSerializer.serialize(document.get(), Format.YAML)
+                            .getBytes(StandardCharsets.UTF_8);
+                    document.reset();
+                    document = null;
+                }
+            } else {
+                throw new IOException("Could not find [" + OpenApiConstants.BASE_NAME + Format.JSON + "]");
+            }
+        }
+    }
+
+    public byte[] getJsonDocument() {
+        return jsonDocument;
+    }
+
+    public byte[] getYamlDocument() {
+        return yamlDocument;
+    }
+
+    public byte[] getDocument(Format format) {
+        if (format.equals(Format.JSON)) {
+            return getJsonDocument();
+        }
+        return getYamlDocument();
+    }
+}
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java
index 7ca70bce98414..17490611311f4 100644
--- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java
@@ -1,10 +1,10 @@
 package io.quarkus.smallrye.openapi.runtime;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import io.quarkus.arc.Arc;
 import io.smallrye.openapi.runtime.io.Format;
 import io.vertx.core.Handler;
 import io.vertx.core.buffer.Buffer;
@@ -14,49 +14,33 @@
 import io.vertx.ext.web.RoutingContext;
 
 /**
- * @author Ken Finnigan
+ * Handler that serve the OpenAPI document in either json or yaml format
  */
 public class OpenApiHandler implements Handler<RoutingContext> {
 
-    /*
-     * <em>Ugly Hack</em>
-     * In dev mode, we receive a classloader to load the up to date OpenAPI document.
-     * This hack is required because using the TCCL would get an outdated version - the initial one.
-     * This is because the worker thread on which the handler is called captures the TCCL at creation time
-     * and does not allow updating it.
-     *
-     * This classloader must ONLY be used to load the OpenAPI document.
-     *
-     * In non dev mode, the TCCL is used.
-     *
-     * TODO: remove this once the vert.x class loader issues are resolved.
-     */
-    public static volatile ClassLoader classLoader;
-
+    private volatile OpenApiDocumentService openApiDocumentService;
     private static final String ALLOWED_METHODS = "GET, HEAD, OPTIONS";
-
     private static final String QUERY_PARAM_FORMAT = "format";
+    private static final Map<String, String> RESPONSE_HEADERS = new HashMap<>();
 
-    public static final String GENERATED_DOC_BASE = "quarkus-generated-openapi-doc.";
-    public static final String BASE_NAME = "META-INF/" + GENERATED_DOC_BASE;
-
-    private static void addCorsResponseHeaders(HttpServerResponse response) {
-        response.headers().set("Access-Control-Allow-Origin", "*");
-        response.headers().set("Access-Control-Allow-Credentials", "true");
-        response.headers().set("Access-Control-Allow-Methods", ALLOWED_METHODS);
-        response.headers().set("Access-Control-Allow-Headers", "Content-Type, Authorization");
-        response.headers().set("Access-Control-Max-Age", "86400");
+    static {
+        RESPONSE_HEADERS.put("Access-Control-Allow-Origin", "*");
+        RESPONSE_HEADERS.put("Access-Control-Allow-Credentials", "true");
+        RESPONSE_HEADERS.put("Access-Control-Allow-Methods", ALLOWED_METHODS);
+        RESPONSE_HEADERS.put("Access-Control-Allow-Headers", "Content-Type, Authorization");
+        RESPONSE_HEADERS.put("Access-Control-Max-Age", "86400");
     }
 
     @Override
     public void handle(RoutingContext event) {
-        if (event.request().method().equals(HttpMethod.OPTIONS)) {
-            addCorsResponseHeaders(event.response());
-            event.response().headers().set("Allow", ALLOWED_METHODS);
+        HttpServerRequest req = event.request();
+        HttpServerResponse resp = event.response();
+
+        if (req.method().equals(HttpMethod.OPTIONS)) {
+            resp.headers().setAll(RESPONSE_HEADERS);
+            resp.headers().set("Allow", ALLOWED_METHODS);
             event.next();
         } else {
-            HttpServerRequest req = event.request();
-            HttpServerResponse resp = event.response();
             String accept = req.headers().get("Accept");
 
             List<String> formatParams = event.queryParam(QUERY_PARAM_FORMAT);
@@ -71,21 +55,17 @@ public void handle(RoutingContext event) {
                 format = Format.JSON;
             }
 
-            addCorsResponseHeaders(resp);
+            resp.headers().setAll(RESPONSE_HEADERS);
             resp.headers().set("Content-Type", format.getMimeType() + ";charset=UTF-8");
-            ClassLoader cl = classLoader == null ? Thread.currentThread().getContextClassLoader() : classLoader;
-            try (InputStream in = cl.getResourceAsStream(BASE_NAME + format)) {
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                int r;
-                byte[] buf = new byte[1024];
-                while ((r = in.read(buf)) > 0) {
-                    out.write(buf, 0, r);
-                }
-                resp.end(Buffer.buffer(out.toByteArray()));
-            } catch (IOException e) {
-                event.fail(e);
-            }
+            byte[] schemaDocument = getOpenApiDocumentService().getDocument(format);
+            resp.end(Buffer.buffer(schemaDocument));
+        }
+    }
 
+    private OpenApiDocumentService getOpenApiDocumentService() {
+        if (this.openApiDocumentService == null) {
+            this.openApiDocumentService = Arc.container().instance(OpenApiDocumentService.class).get();
         }
+        return this.openApiDocumentService;
     }
 }
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiNotFoundHandler.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiNotFoundHandler.java
new file mode 100644
index 0000000000000..8ab5b03fee0f3
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiNotFoundHandler.java
@@ -0,0 +1,17 @@
+package io.quarkus.smallrye.openapi.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Handling not found when disabled
+ */
+public class OpenApiNotFoundHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        event.response().setStatusCode(404);
+        event.response().end();
+    }
+
+}
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java
index 4055734d8c48f..28919339dbb9d 100644
--- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java
@@ -1,19 +1,77 @@
 package io.quarkus.smallrye.openapi.runtime;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.eclipse.microprofile.openapi.spi.OASFactoryResolver;
+
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
 
 @Recorder
 public class OpenApiRecorder {
 
+    public Handler<RoutingContext> handler(OpenApiRuntimeConfig runtimeConfig) {
+        if (runtimeConfig.enable) {
+            return new OpenApiHandler();
+        } else {
+            return new OpenApiNotFoundHandler();
+        }
+    }
+
     public void setupClDevMode(ShutdownContext shutdownContext) {
-        OpenApiHandler.classLoader = Thread.currentThread().getContextClassLoader();
+        OpenApiConstants.classLoader = Thread.currentThread().getContextClassLoader();
         shutdownContext.addShutdownTask(new Runnable() {
             @Override
             public void run() {
-                OpenApiHandler.classLoader = null;
+                OpenApiConstants.classLoader = null;
             }
         });
     }
 
+    /**
+     * ClassLoader hack to work around reactive streams API issue
+     * see https://github.com/eclipse/microprofile-open-api/pull/470
+     * <p>
+     * This must be deleted when it is fixed upstream
+     */
+    public void classLoaderHack() {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(new ClassLoader(null) {
+                @Override
+                public Class<?> loadClass(String name) throws ClassNotFoundException {
+                    return cl.loadClass(name);
+                }
+
+                @Override
+                protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                    return cl.loadClass(name);
+                }
+
+                @Override
+                public URL getResource(String name) {
+                    return cl.getResource(name);
+                }
+
+                @Override
+                public Enumeration<URL> getResources(String name) throws IOException {
+                    return cl.getResources(name);
+                }
+
+                @Override
+                public InputStream getResourceAsStream(String name) {
+                    return cl.getResourceAsStream(name);
+                }
+            });
+            OASFactoryResolver.instance();
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
+        }
+
+    }
 }
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRuntimeConfig.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRuntimeConfig.java
new file mode 100644
index 0000000000000..340f84c96bcab
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRuntimeConfig.java
@@ -0,0 +1,16 @@
+package io.quarkus.smallrye.openapi.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "smallrye-openapi", phase = ConfigPhase.RUN_TIME)
+public class OpenApiRuntimeConfig {
+
+    /**
+     * Enable the openapi endpoint. By default it's enabled.
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean enable;
+
+}
diff --git a/extensions/smallrye-openapi/spi/pom.xml b/extensions/smallrye-openapi/spi/pom.xml
new file mode 100644
index 0000000000000..c4e96d7af0544
--- /dev/null
+++ b/extensions/smallrye-openapi/spi/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-smallrye-openapi-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-smallrye-openapi-spi</artifactId>
+    <name>Quarkus - SmallRye OpenAPI - SPI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye</groupId>
+            <artifactId>smallrye-open-api-core</artifactId>
+        </dependency>
+        
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/spi/src/main/java/io/quarkus/smallrye/openapi/deployment/spi/AddToOpenAPIDefinitionBuildItem.java b/extensions/smallrye-openapi/spi/src/main/java/io/quarkus/smallrye/openapi/deployment/spi/AddToOpenAPIDefinitionBuildItem.java
new file mode 100644
index 0000000000000..64e5ead609213
--- /dev/null
+++ b/extensions/smallrye-openapi/spi/src/main/java/io/quarkus/smallrye/openapi/deployment/spi/AddToOpenAPIDefinitionBuildItem.java
@@ -0,0 +1,21 @@
+package io.quarkus.smallrye.openapi.deployment.spi;
+
+import org.eclipse.microprofile.openapi.OASFilter;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+public final class AddToOpenAPIDefinitionBuildItem extends MultiBuildItem {
+
+    private final OASFilter filter;
+
+    /**
+     * @param filter the filter to be applied when building the OpenAPI document
+     */
+    public AddToOpenAPIDefinitionBuildItem(OASFilter filter) {
+        this.filter = filter;
+    }
+
+    public OASFilter getOASFilter() {
+        return this.filter;
+    }
+}
diff --git a/extensions/smallrye-opentracing/deployment/pom.xml b/extensions/smallrye-opentracing/deployment/pom.xml
index d906e750e1ee4..8d5b5a09f8214 100644
--- a/extensions/smallrye-opentracing/deployment/pom.xml
+++ b/extensions/smallrye-opentracing/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-opentracing-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,11 +15,15 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
+            <artifactId>quarkus-resteasy-common-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <artifactId>quarkus-undertow-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java b/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java
index 45dfe461106ee..812c3be28d3d3 100644
--- a/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java
+++ b/extensions/smallrye-opentracing/deployment/src/main/java/io/quarkus/smallrye/opentracing/deployment/SmallRyeOpenTracingProcessor.java
@@ -17,7 +17,10 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
 import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.reactive.spi.CustomContainerResponseFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.DynamicFeatureBuildItem;
 import io.quarkus.smallrye.opentracing.runtime.QuarkusSmallRyeTracingDynamicFeature;
+import io.quarkus.smallrye.opentracing.runtime.QuarkusSmallRyeTracingStandaloneContainerResponseFilter;
 import io.quarkus.smallrye.opentracing.runtime.QuarkusSmallRyeTracingStandaloneVertxDynamicFeature;
 import io.quarkus.smallrye.opentracing.runtime.TracerProducer;
 import io.quarkus.undertow.deployment.FilterBuildItem;
@@ -39,6 +42,8 @@ ReflectiveMethodBuildItem registerMethod() throws Exception {
     void setupFilter(BuildProducer<ResteasyJaxrsProviderBuildItem> providers,
             BuildProducer<FilterBuildItem> filterProducer,
             BuildProducer<FeatureBuildItem> feature,
+            BuildProducer<CustomContainerResponseFilterBuildItem> customResponseFilters,
+            BuildProducer<DynamicFeatureBuildItem> dynamicFeatures,
             Capabilities capabilities) {
 
         feature.produce(new FeatureBuildItem(Feature.SMALLRYE_OPENTRACING));
@@ -55,10 +60,13 @@ void setupFilter(BuildProducer<ResteasyJaxrsProviderBuildItem> providers,
                     .addFilterUrlMapping("*", DispatcherType.ERROR)
                     .build();
             filterProducer.produce(filterInfo);
-        } else {
-            //otherwise we know we have RESTeasy on vert.x
+        } else if (capabilities.isPresent(Capability.RESTEASY)) {
             providers.produce(
                     new ResteasyJaxrsProviderBuildItem(QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.class.getName()));
+        } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
+            customResponseFilters.produce(new CustomContainerResponseFilterBuildItem(
+                    QuarkusSmallRyeTracingStandaloneContainerResponseFilter.class.getName()));
+            dynamicFeatures.produce(new DynamicFeatureBuildItem(QuarkusSmallRyeTracingDynamicFeature.class.getName()));
         }
     }
 
diff --git a/extensions/smallrye-opentracing/deployment/src/test/resources/application.properties b/extensions/smallrye-opentracing/deployment/src/test/resources/application.properties
index 74b027b727f1e..20c87a5e169ca 100644
--- a/extensions/smallrye-opentracing/deployment/src/test/resources/application.properties
+++ b/extensions/smallrye-opentracing/deployment/src/test/resources/application.properties
@@ -2,7 +2,6 @@ quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.driver=io.opentracing.contrib.jdbc.TracingDriver
 quarkus.datasource.jdbc.url=jdbc:tracing:h2:mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.log.sql=true
diff --git a/extensions/smallrye-opentracing/pom.xml b/extensions/smallrye-opentracing/pom.xml
index 9bc5f9bee2d43..e7c787b9a7fb1 100644
--- a/extensions/smallrye-opentracing/pom.xml
+++ b/extensions/smallrye-opentracing/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/smallrye-opentracing/runtime/pom.xml b/extensions/smallrye-opentracing/runtime/pom.xml
index 90dec9828a2e7..ba42ec5c40e6e 100644
--- a/extensions/smallrye-opentracing/runtime/pom.xml
+++ b/extensions/smallrye-opentracing/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-opentracing-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,6 +31,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!--
+            smallrye-opentracing depends on opentracing:jaxrs2 that defines JAXRS-API as provided.
+            So we need to add it in case we use opentracing without resteasy.
+            See https://github.com/opentracing-contrib/java-interceptors/issues/15
+        -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-fault-tolerance-tracing-propagation</artifactId>
@@ -48,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
+            <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -57,6 +65,12 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
+            <optional>true</optional> <!-- NOTE: This is a breaking change as RESTEasy has now become optional -->
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -69,10 +83,6 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/FilterUtil.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/FilterUtil.java
new file mode 100644
index 0000000000000..0449b4932a1b1
--- /dev/null
+++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/FilterUtil.java
@@ -0,0 +1,23 @@
+package io.quarkus.smallrye.opentracing.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.opentracing.Span;
+import io.opentracing.tag.Tags;
+
+final class FilterUtil {
+
+    private FilterUtil() {
+    }
+
+    static void addExceptionLogs(Span span, Throwable throwable) {
+        Tags.ERROR.set(span, true);
+        if (throwable != null) {
+            Map<String, Object> errorLogs = new HashMap<>(2);
+            errorLogs.put("event", Tags.ERROR.getKey());
+            errorLogs.put("error.object", throwable);
+            span.log(errorLogs);
+        }
+    }
+}
diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java
new file mode 100644
index 0000000000000..b27039937f1c6
--- /dev/null
+++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneContainerResponseFilter.java
@@ -0,0 +1,28 @@
+package io.quarkus.smallrye.opentracing.runtime;
+
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+
+import io.opentracing.contrib.jaxrs2.internal.SpanWrapper;
+import io.opentracing.tag.Tags;
+
+public class QuarkusSmallRyeTracingStandaloneContainerResponseFilter {
+
+    @ServerResponseFilter(priority = Priorities.HEADER_DECORATOR - 1) // this needs to be executed after ServerTracingFilter
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext, Throwable t) {
+        Object wrapperObj = requestContext.getProperty(SpanWrapper.PROPERTY_NAME);
+        if (!(wrapperObj instanceof SpanWrapper)) {
+            return;
+        }
+        SpanWrapper wrapper = (SpanWrapper) wrapperObj;
+        wrapper.getScope().close();
+        Tags.HTTP_STATUS.set(wrapper.get(), responseContext.getStatus());
+        if (t != null) {
+            FilterUtil.addExceptionLogs(wrapper.get(), t);
+        }
+        wrapper.finish();
+    }
+}
diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java
index 36c586228f560..fb7540cf40615 100644
--- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java
+++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/QuarkusSmallRyeTracingStandaloneVertxDynamicFeature.java
@@ -1,8 +1,6 @@
 package io.quarkus.smallrye.opentracing.runtime;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.enterprise.inject.spi.CDI;
 import javax.ws.rs.container.ContainerRequestContext;
@@ -12,7 +10,6 @@
 import javax.ws.rs.core.FeatureContext;
 import javax.ws.rs.ext.Provider;
 
-import io.opentracing.Span;
 import io.opentracing.contrib.jaxrs2.internal.SpanWrapper;
 import io.opentracing.tag.Tags;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
@@ -49,22 +46,12 @@ public void handle(Void event) {
                         wrapper.getScope().close();
                         Tags.HTTP_STATUS.set(wrapper.get(), routingContext.response().getStatusCode());
                         if (routingContext.failure() != null) {
-                            addExceptionLogs(wrapper.get(), routingContext.failure());
+                            FilterUtil.addExceptionLogs(wrapper.get(), routingContext.failure());
                         }
                         wrapper.finish();
                     }
                 }
             });
         }
-
-        private static void addExceptionLogs(Span span, Throwable throwable) {
-            Tags.ERROR.set(span, true);
-            if (throwable != null) {
-                Map<String, Object> errorLogs = new HashMap<>(2);
-                errorLogs.put("event", Tags.ERROR.getKey());
-                errorLogs.put("error.object", throwable);
-                span.log(errorLogs);
-            }
-        }
     }
 }
diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java
index e1c6fb2877a35..c0c33b5f62ee1 100644
--- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java
+++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java
@@ -1,6 +1,6 @@
 package io.quarkus.smallrye.opentracing.runtime.graal;
 
-import org.jboss.resteasy.microprofile.config.FilterConfigSource;
+import java.util.function.BooleanSupplier;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
@@ -9,7 +9,10 @@
 /**
  * see {@link Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource}
  */
-@TargetClass(value = FilterConfigSource.class, onlyWith = UndertowMissing.class)
+@TargetClass(className = "org.jboss.resteasy.microprofile.config.FilterConfigSource", onlyWith = {
+        UndertowMissing.class,
+        Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.FilterConfigSourceIsLoaded.class
+})
 final class Target_org_jboss_resteasy_microprofile_config_FilterConfigSource {
 
     @Alias
@@ -19,4 +22,17 @@ final class Target_org_jboss_resteasy_microprofile_config_FilterConfigSource {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
     private static Class<?> clazz;
+
+    static class FilterConfigSourceIsLoaded implements BooleanSupplier {
+
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName("org.jboss.resteasy.microprofile.config.FilterConfigSource");
+                return true;
+            } catch (ClassNotFoundException e) {
+                return false;
+            }
+        }
+    }
 }
diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java
index 31031035b53bb..0b00d1ae47fbe 100644
--- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java
+++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java
@@ -1,6 +1,6 @@
 package io.quarkus.smallrye.opentracing.runtime.graal;
 
-import org.jboss.resteasy.microprofile.config.ServletConfigSource;
+import java.util.function.BooleanSupplier;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
@@ -9,7 +9,10 @@
 /**
  * see {@link Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource}
  */
-@TargetClass(value = ServletConfigSource.class, onlyWith = UndertowMissing.class)
+@TargetClass(className = "org.jboss.resteasy.microprofile.config.ServletConfigSource", onlyWith = {
+        UndertowMissing.class,
+        Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.ServletConfigSourceIsLoaded.class,
+})
 final class Target_org_jboss_resteasy_microprofile_config_ServletConfigSource {
 
     @Alias
@@ -19,4 +22,17 @@ final class Target_org_jboss_resteasy_microprofile_config_ServletConfigSource {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
     private static Class<?> clazz;
+
+    static class ServletConfigSourceIsLoaded implements BooleanSupplier {
+
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName("org.jboss.resteasy.microprofile.config.ServletConfigSource");
+                return true;
+            } catch (ClassNotFoundException e) {
+                return false;
+            }
+        }
+    }
 }
diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java
index 34f9c4d82c402..90c4e52c3757d 100644
--- a/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java
+++ b/extensions/smallrye-opentracing/runtime/src/main/java/io/quarkus/smallrye/opentracing/runtime/graal/Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java
@@ -1,5 +1,7 @@
 package io.quarkus.smallrye.opentracing.runtime.graal;
 
+import java.util.function.BooleanSupplier;
+
 import org.jboss.resteasy.microprofile.config.ServletContextConfigSource;
 import org.jboss.resteasy.microprofile.config.ServletContextConfigSourceImpl;
 
@@ -17,8 +19,16 @@
  * GraalVM failing because the class cannot be instantiated.
  *
  * See https://github.com/quarkusio/quarkus/issues/9086
+ *
+ * Furthermore, we only reference the class by its name as not avoid having GraalVM fail if the class is not on classpath
+ * at all.
+ *
+ * See https://github.com/quarkusio/quarkus/issues/14876
  */
-@TargetClass(value = ServletContextConfigSource.class, onlyWith = UndertowMissing.class)
+@TargetClass(className = "org.jboss.resteasy.microprofile.config.ServletContextConfigSource", onlyWith = {
+        UndertowMissing.class,
+        Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.ServletContextConfigSourceIsLoaded.class
+})
 final class Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource {
 
     @Alias
@@ -28,4 +38,16 @@ final class Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSo
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
     private static Class<?> clazz;
+
+    static class ServletContextConfigSourceIsLoaded implements BooleanSupplier {
+        @Override
+        public boolean getAsBoolean() {
+            try {
+                Class.forName("org.jboss.resteasy.microprofile.config.ServletContextConfigSource");
+                return true;
+            } catch (ClassNotFoundException e) {
+                return false;
+            }
+        }
+    }
 }
diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml b/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml
index 895bfcccc30a6..a63e658293636 100644
--- a/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging-amqp/deployment/pom.xml
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/extensions/smallrye-reactive-messaging-amqp/pom.xml b/extensions/smallrye-reactive-messaging-amqp/pom.xml
index edbffe0daa4a6..8c0d42c64e5e7 100644
--- a/extensions/smallrye-reactive-messaging-amqp/pom.xml
+++ b/extensions/smallrye-reactive-messaging-amqp/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml b/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml
index 3a51cb126d342..4da979208c034 100644
--- a/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml
+++ b/extensions/smallrye-reactive-messaging-amqp/runtime/pom.xml
@@ -56,6 +56,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java
index 4ddc060e63c2d..3dbf037eb5b1a 100644
--- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java
+++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/SmallRyeReactiveMessagingKafkaProcessor.java
@@ -1,8 +1,11 @@
 package io.quarkus.smallrye.reactivemessaging.kafka.deployment;
 
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.vertx.kafka.client.consumer.impl.KafkaReadStreamImpl;
 
 public class SmallRyeReactiveMessagingKafkaProcessor {
 
@@ -10,4 +13,17 @@ public class SmallRyeReactiveMessagingKafkaProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_MESSAGING_KAFKA);
     }
+
+    @BuildStep
+    public void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        // Required for the throttled commit strategy
+        reflectiveClass.produce(
+                ReflectiveClassBuildItem.builder(KafkaReadStreamImpl.class)
+                        .fields(true)
+                        .methods(true)
+                        .constructors(true)
+                        .finalFieldsWritable(true)
+                        .build());
+    }
+
 }
diff --git a/extensions/smallrye-reactive-messaging-kafka/pom.xml b/extensions/smallrye-reactive-messaging-kafka/pom.xml
index 4b7a415d49c58..d8acb1fcd1a42 100644
--- a/extensions/smallrye-reactive-messaging-kafka/pom.xml
+++ b/extensions/smallrye-reactive-messaging-kafka/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml
index 0f0f0d843f7bf..99b971d83f9d8 100644
--- a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml
+++ b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml
@@ -72,6 +72,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/smallrye-reactive-messaging-mqtt/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/pom.xml
index 689894e5b9b63..48478275fa7e3 100644
--- a/extensions/smallrye-reactive-messaging-mqtt/pom.xml
+++ b/extensions/smallrye-reactive-messaging-mqtt/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml b/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml
index 9b42c3f319ab6..72c3e85d1083d 100644
--- a/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml
+++ b/extensions/smallrye-reactive-messaging-mqtt/runtime/pom.xml
@@ -52,6 +52,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/smallrye-reactive-messaging/deployment/pom.xml b/extensions/smallrye-reactive-messaging/deployment/pom.xml
index 44d80bfdbbf23..346c32de30da5 100644
--- a/extensions/smallrye-reactive-messaging/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging/deployment/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-smallrye-reactive-messaging-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -39,20 +38,11 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-vertx-deployment</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-smallrye-metrics-spi</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-vertx-http-deployment</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-vertx-http</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -84,11 +74,6 @@
       <artifactId>quarkus-resteasy-deployment</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ChannelBuildItem.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ChannelBuildItem.java
new file mode 100644
index 0000000000000..80366fdc774c4
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ChannelBuildItem.java
@@ -0,0 +1,31 @@
+package io.quarkus.smallrye.reactivemessaging.deployment;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.smallrye.reactive.messaging.extension.ChannelConfiguration;
+
+public final class ChannelBuildItem extends MultiBuildItem {
+
+    /**
+     * Creates a new instance of {@link ChannelBuildItem}.
+     *
+     * @param name the name of the injected channel
+     * @return the new {@link ChannelBuildItem}
+     */
+    static ChannelBuildItem of(String name) {
+        return new ChannelBuildItem(name);
+    }
+
+    /**
+     * The name of the channel.
+     */
+    private final String name;
+
+    public ChannelBuildItem(String name) {
+        this.name = name;
+    }
+
+    public ChannelConfiguration getChannelConfig() {
+        return new ChannelConfiguration(name);
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/EmitterBuildItem.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/EmitterBuildItem.java
index a38874becd62f..e82c8076ffdbd 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/EmitterBuildItem.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/EmitterBuildItem.java
@@ -9,12 +9,14 @@ public final class EmitterBuildItem extends MultiBuildItem {
      * Creates a new instance of {@link EmitterBuildItem} setting the overflow strategy.
      *
      * @param name the name of the stream
+     * @param isMutinyEmitter if the emitter is a {@link io.smallrye.reactive.messaging.MutinyEmitter}
      * @param overflow the overflow strategy
      * @param bufferSize the buffer size, if overflow is set to {@code BUFFER}
      * @return the new {@link EmitterBuildItem}
      */
-    static EmitterBuildItem of(String name, String overflow, int bufferSize, boolean hasBroadcast, int awaitSubscribers) {
-        return new EmitterBuildItem(name, overflow, bufferSize, hasBroadcast, awaitSubscribers);
+    static EmitterBuildItem of(String name, boolean isMutinyEmitter, String overflow, int bufferSize, boolean hasBroadcast,
+            int awaitSubscribers) {
+        return new EmitterBuildItem(name, isMutinyEmitter, overflow, bufferSize, hasBroadcast, awaitSubscribers);
     }
 
     /**
@@ -39,22 +41,29 @@ static EmitterBuildItem of(String name, String overflow, int bufferSize, boolean
      */
     private final boolean hasBroadcast;
 
+    /**
+     * Whether the emitter is a {@link io.smallrye.reactive.messaging.MutinyEmitter} or a regular (non-mutiny) emitter.
+     */
+    private final boolean isMutinyEmitter;
+
     /**
      * If the emitter uses the {@link io.smallrye.reactive.messaging.annotations.Broadcast} annotation, indicates the
      * number of subscribers to be expected before subscribing upstream.
      */
     private final int awaitSubscribers;
 
-    public EmitterBuildItem(String name, String overflow, int bufferSize, boolean hasBroadcast, int awaitSubscribers) {
+    public EmitterBuildItem(String name, boolean isMutinyEmitter, String overflow, int bufferSize, boolean hasBroadcast,
+            int awaitSubscribers) {
         this.name = name;
         this.overflow = overflow;
+        this.isMutinyEmitter = isMutinyEmitter;
         this.bufferSize = bufferSize;
         this.hasBroadcast = hasBroadcast;
         this.awaitSubscribers = hasBroadcast ? awaitSubscribers : -1;
     }
 
     public EmitterConfiguration getEmitterConfig() {
-        return new EmitterConfiguration(name, OnOverflowLiteral.create(overflow, bufferSize),
+        return new EmitterConfiguration(name, isMutinyEmitter, OnOverflowLiteral.create(overflow, bufferSize),
                 hasBroadcast ? new BroadcastLiteral(awaitSubscribers) : null);
     }
 
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java
index a7dc61be7a3a3..11bcb6d5e4c2c 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java
@@ -6,8 +6,10 @@
 import static io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames.INCOMING;
 import static io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames.MERGE;
 import static io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames.OUTGOING;
+import static io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames.SMALLRYE_BLOCKING;
 
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
@@ -26,12 +28,12 @@
 import io.smallrye.reactive.messaging.annotations.Blocking;
 import io.smallrye.reactive.messaging.annotations.Merge;
 
-final class QuarkusMediatorConfigurationUtil {
+public final class QuarkusMediatorConfigurationUtil {
 
     private QuarkusMediatorConfigurationUtil() {
     }
 
-    static QuarkusMediatorConfiguration create(MethodInfo methodInfo, BeanInfo bean,
+    public static QuarkusMediatorConfiguration create(MethodInfo methodInfo, BeanInfo bean,
             String generatedInvokerName, RecorderContext recorderContext, ClassLoader cl) {
 
         Class<?> returnTypeClass = load(methodInfo.returnType().name().toString(), cl);
@@ -81,7 +83,8 @@ static QuarkusMediatorConfiguration create(MethodInfo methodInfo, BeanInfo bean,
                 acknowledgment);
         configuration.setProduction(validationOutput.getProduction());
         configuration.setConsumption(validationOutput.getConsumption());
-        if (validationOutput.getUseBuilderTypes() != null) {
+        configuration.setIngestedPayloadType(validationOutput.getIngestedPayloadType());
+        if (validationOutput.getUseBuilderTypes()) {
             configuration.setUseBuilderTypes(validationOutput.getUseBuilderTypes());
         } else {
             configuration.setUseBuilderTypes(false);
@@ -89,44 +92,56 @@ static QuarkusMediatorConfiguration create(MethodInfo methodInfo, BeanInfo bean,
 
         if (acknowledgment == null) {
             acknowledgment = mediatorConfigurationSupport.processDefaultAcknowledgement(shape,
-                    validationOutput.getConsumption());
+                    validationOutput.getConsumption(), validationOutput.getProduction());
             configuration.setAcknowledgment(acknowledgment);
         }
 
-        configuration.setMerge(mediatorConfigurationSupport.processMerge(incomingValues, () -> {
-            AnnotationInstance instance = methodInfo.annotation(MERGE);
-            if (instance != null) {
-                AnnotationValue value = instance.value();
-                if (value == null) {
-                    return Merge.Mode.MERGE; // the default value of @Merge
+        configuration.setMerge(mediatorConfigurationSupport.processMerge(incomingValues, new Supplier<Merge.Mode>() {
+            @Override
+            public Merge.Mode get() {
+                AnnotationInstance instance = methodInfo.annotation(MERGE);
+                if (instance != null) {
+                    AnnotationValue value = instance.value();
+                    if (value == null) {
+                        return Merge.Mode.MERGE; // the default value of @Merge
+                    }
+                    return Merge.Mode.valueOf(value.asEnum());
                 }
-                return Merge.Mode.valueOf(value.asEnum());
+                return null;
             }
-            return null;
         }));
 
-        configuration.setBroadcastValue(mediatorConfigurationSupport.processBroadcast(outgoingValue, () -> {
-            AnnotationInstance instance = methodInfo.annotation(BROADCAST);
-            if (instance != null) {
-                AnnotationValue value = instance.value();
-                if (value == null) {
-                    return 0; // the default value of @Broadcast
-                }
-                return value.asInt();
-            }
-            return null;
-        }));
+        configuration.setBroadcastValue(mediatorConfigurationSupport.processBroadcast(outgoingValue,
+                new Supplier<Integer>() {
+                    @Override
+                    public Integer get() {
+                        AnnotationInstance instance = methodInfo.annotation(BROADCAST);
+                        if (instance != null) {
+                            AnnotationValue value = instance.value();
+                            if (value == null) {
+                                return 0; // the default value of @Broadcast
+                            }
+                            return value.asInt();
+                        }
+                        return null;
+                    }
+                }));
 
         AnnotationInstance blockingAnnotation = methodInfo.annotation(BLOCKING);
-        if (blockingAnnotation != null) {
+        AnnotationInstance smallryeBlockingAnnotation = methodInfo.annotation(SMALLRYE_BLOCKING);
+        if (blockingAnnotation != null || smallryeBlockingAnnotation != null) {
             mediatorConfigurationSupport.validateBlocking(validationOutput);
             configuration.setBlocking(true);
-            AnnotationValue ordered = blockingAnnotation.value("ordered");
-            configuration.setBlockingExecutionOrdered(ordered == null || ordered.asBoolean());
-            String poolName;
-            if (blockingAnnotation.value() != null &&
-                    !(poolName = blockingAnnotation.value().asString()).equals(Blocking.DEFAULT_WORKER_POOL)) {
-                configuration.setWorkerPoolName(poolName);
+            if (blockingAnnotation != null) {
+                AnnotationValue ordered = blockingAnnotation.value("ordered");
+                configuration.setBlockingExecutionOrdered(ordered == null || ordered.asBoolean());
+                String poolName;
+                if (blockingAnnotation.value() != null &&
+                        !(poolName = blockingAnnotation.value().asString()).equals(Blocking.DEFAULT_WORKER_POOL)) {
+                    configuration.setWorkerPoolName(poolName);
+                }
+            } else {
+                configuration.setBlockingExecutionOrdered(true);
             }
         }
 
@@ -192,7 +207,7 @@ private static String fullMethodName(MethodInfo methodInfo) {
         return methodInfo.declaringClass() + "#" + methodInfo.name();
     }
 
-    private static class ReturnTypeGenericTypeAssignable extends JandexGenericTypeAssignable {
+    public static class ReturnTypeGenericTypeAssignable extends JandexGenericTypeAssignable {
 
         public ReturnTypeGenericTypeAssignable(MethodInfo method, ClassLoader classLoader) {
             super(method.returnType(), classLoader);
@@ -223,18 +238,68 @@ public Result check(Class<?> target, int index) {
                 return Result.InvalidIndex;
             }
         }
+
+        @Override
+        public java.lang.reflect.Type getType(int index) {
+            Type t = extract(type, index);
+            if (t != null) {
+                return load(t.name().toString(), classLoader);
+            }
+            return null;
+        }
+
+        private Type extract(Type type, int index) {
+            if (type.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+                return null;
+            } else {
+                List<Type> arguments = type.asParameterizedType().arguments();
+                if (arguments.size() >= index + 1) {
+                    Type result = arguments.get(index);
+                    if (result.kind() == Type.Kind.WILDCARD_TYPE) {
+                        return null;
+                    }
+                    return result;
+                } else {
+                    return null;
+                }
+            }
+        }
+
+        @Override
+        public java.lang.reflect.Type getType(int index, int subIndex) {
+            Type generic = extract(type, index);
+            if (generic != null) {
+                Type t = extract(generic, subIndex);
+                if (t != null) {
+                    return load(t.name().toString(), classLoader);
+                }
+                return null;
+            } else {
+                return null;
+            }
+        }
     }
 
-    private static class AlwaysInvalidIndexGenericTypeAssignable
+    public static class AlwaysInvalidIndexGenericTypeAssignable
             implements MediatorConfigurationSupport.GenericTypeAssignable {
 
         @Override
         public Result check(Class<?> target, int index) {
             return Result.InvalidIndex;
         }
+
+        @Override
+        public java.lang.reflect.Type getType(int index) {
+            return null;
+        }
+
+        @Override
+        public java.lang.reflect.Type getType(int index, int subIndex) {
+            return null;
+        }
     }
 
-    private static class MethodParamGenericTypeAssignable extends JandexGenericTypeAssignable {
+    public static class MethodParamGenericTypeAssignable extends JandexGenericTypeAssignable {
 
         public MethodParamGenericTypeAssignable(MethodInfo method, int paramIndex, ClassLoader classLoader) {
             super(getGenericParameterType(method, paramIndex), classLoader);
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java
index bc3d85bf79752..5a63943e65e45 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/ReactiveMessagingDotNames.java
@@ -5,24 +5,29 @@
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 import org.jboss.jandex.DotName;
 
+import io.smallrye.reactive.messaging.MutinyEmitter;
 import io.smallrye.reactive.messaging.annotations.Blocking;
 import io.smallrye.reactive.messaging.annotations.Broadcast;
 import io.smallrye.reactive.messaging.annotations.Channel;
 import io.smallrye.reactive.messaging.annotations.Emitter;
+import io.smallrye.reactive.messaging.annotations.Incomings;
 import io.smallrye.reactive.messaging.annotations.Merge;
 import io.smallrye.reactive.messaging.annotations.OnOverflow;
-import io.smallrye.reactive.messaging.metrics.MetricDecorator;
 
 public final class ReactiveMessagingDotNames {
 
     static final DotName VOID = DotName.createSimple(void.class.getName());
     static final DotName INCOMING = DotName.createSimple(Incoming.class.getName());
+    static final DotName INCOMINGS = DotName.createSimple(Incomings.class.getName());
     static final DotName OUTGOING = DotName.createSimple(Outgoing.class.getName());
     static final DotName BLOCKING = DotName.createSimple(Blocking.class.getName());
-    static final DotName CHANNEL = DotName.createSimple(org.eclipse.microprofile.reactive.messaging.Channel.class.getName());
-    static final DotName LEGACY_CHANNEL = DotName.createSimple(Channel.class.getName());
-    static final DotName EMITTER = DotName.createSimple(org.eclipse.microprofile.reactive.messaging.Emitter.class.getName());
-    static final DotName LEGACY_EMITTER = DotName.createSimple(Emitter.class.getName());
+    public static final DotName CHANNEL = DotName
+            .createSimple(org.eclipse.microprofile.reactive.messaging.Channel.class.getName());
+    public static final DotName LEGACY_CHANNEL = DotName.createSimple(Channel.class.getName());
+    public static final DotName EMITTER = DotName
+            .createSimple(org.eclipse.microprofile.reactive.messaging.Emitter.class.getName());
+    public static final DotName MUTINY_EMITTER = DotName.createSimple(MutinyEmitter.class.getName());
+    public static final DotName LEGACY_EMITTER = DotName.createSimple(Emitter.class.getName());
     static final DotName ON_OVERFLOW = DotName
             .createSimple(org.eclipse.microprofile.reactive.messaging.OnOverflow.class.getName());
     static final DotName LEGACY_ON_OVERFLOW = DotName.createSimple(OnOverflow.class.getName());
@@ -30,7 +35,10 @@ public final class ReactiveMessagingDotNames {
     static final DotName MERGE = DotName.createSimple(Merge.class.getName());
     static final DotName BROADCAST = DotName.createSimple(Broadcast.class.getName());
 
-    static final DotName METRIC_DECORATOR = DotName.createSimple(MetricDecorator.class.getName());
+    static final DotName SMALLRYE_BLOCKING = DotName.createSimple(io.smallrye.common.annotation.Blocking.class.getName());
+
+    // Do not directly reference the MetricDecorator (due to its direct references to MP Metrics, which may not be present)
+    static final DotName METRIC_DECORATOR = DotName.createSimple("io.smallrye.reactive.messaging.metrics.MetricDecorator");
 
     // Used to detect REST endpoints and JAX-RS provider
     public static final DotName JAXRS_PATH = DotName.createSimple("javax.ws.rs.Path");
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java
index e70497f9384b6..fa7e77de33ceb 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java
@@ -1,21 +1,21 @@
 package io.quarkus.smallrye.reactivemessaging.deployment;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+import static io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames.BLOCKING;
+import static io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames.SMALLRYE_BLOCKING;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Supplier;
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Vetoed;
 import javax.enterprise.inject.spi.DeploymentException;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.spi.Connector;
 import org.jboss.jandex.AnnotationInstance;
@@ -30,20 +30,17 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.BeanDiscoveryFinishedBuildItem;
 import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.arc.deployment.TransformedAnnotationsBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion;
-import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem.ValidationErrorBuildItem;
-import io.quarkus.arc.processor.AnnotationStore;
 import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanInfo;
-import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.arc.processor.InjectionPointInfo;
-import io.quarkus.deployment.Capabilities;
-import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -52,6 +49,7 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
@@ -59,6 +57,7 @@
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.runtime.metrics.MetricsFactory;
 import io.quarkus.runtime.util.HashUtil;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
 import io.quarkus.smallrye.reactivemessaging.runtime.QuarkusMediatorConfiguration;
@@ -66,14 +65,15 @@
 import io.quarkus.smallrye.reactivemessaging.runtime.ReactiveMessagingConfiguration;
 import io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle;
 import io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingRecorder;
+import io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingRecorder.SmallRyeReactiveMessagingContext;
+import io.quarkus.smallrye.reactivemessaging.runtime.WorkerConfiguration;
 import io.smallrye.reactive.messaging.Invoker;
 import io.smallrye.reactive.messaging.annotations.Blocking;
+import io.smallrye.reactive.messaging.extension.ChannelConfiguration;
+import io.smallrye.reactive.messaging.extension.EmitterConfiguration;
 import io.smallrye.reactive.messaging.health.SmallRyeReactiveMessagingLivenessCheck;
 import io.smallrye.reactive.messaging.health.SmallRyeReactiveMessagingReadinessCheck;
 
-/**
- *
- */
 public class SmallRyeReactiveMessagingProcessor {
 
     private static final Logger LOGGER = Logger
@@ -128,120 +128,130 @@ public void transform(AnnotationsTransformer.TransformationContext ctx) {
     }
 
     @BuildStep
-    void validateBeanDeployment(
-            ValidationPhaseBuildItem validationPhase,
+    void collectComponents(BeanDiscoveryFinishedBuildItem beanDiscoveryFinished,
+            TransformedAnnotationsBuildItem transformedAnnotations,
             BuildProducer<MediatorBuildItem> mediatorMethods,
             BuildProducer<EmitterBuildItem> emitters,
-            BuildProducer<ValidationErrorBuildItem> errors) {
-
-        AnnotationStore annotationStore = validationPhase.getContext().get(BuildExtension.Key.ANNOTATION_STORE);
+            BuildProducer<ChannelBuildItem> channels,
+            BuildProducer<ValidationErrorBuildItem> validationErrors) {
 
         // We need to collect all business methods annotated with @Incoming/@Outgoing first
-        for (BeanInfo bean : validationPhase.getContext().beans().classBeans()) {
+        for (BeanInfo bean : beanDiscoveryFinished.beanStream().classBeans()) {
             // TODO: add support for inherited business methods
             for (MethodInfo method : bean.getTarget().get().asClass().methods()) {
-                AnnotationInstance incoming = annotationStore.getAnnotation(method,
+                // @Incoming is repeatable
+                AnnotationInstance incoming = transformedAnnotations.getAnnotation(method,
                         ReactiveMessagingDotNames.INCOMING);
-                AnnotationInstance outgoing = annotationStore.getAnnotation(method,
+                AnnotationInstance incomings = transformedAnnotations.getAnnotation(method,
+                        ReactiveMessagingDotNames.INCOMINGS);
+                AnnotationInstance outgoing = transformedAnnotations.getAnnotation(method,
                         ReactiveMessagingDotNames.OUTGOING);
-                AnnotationInstance blocking = annotationStore.getAnnotation(method,
-                        ReactiveMessagingDotNames.BLOCKING);
-                if (incoming != null || outgoing != null) {
+                AnnotationInstance blocking = transformedAnnotations.getAnnotation(method,
+                        BLOCKING);
+                if (incoming != null || incomings != null || outgoing != null) {
                     if (incoming != null && incoming.value().asString().isEmpty()) {
-                        validationPhase.getContext().addDeploymentProblem(
-                                new DeploymentException("Empty @Incoming annotation on method " + method));
+                        validationErrors.produce(new ValidationErrorBuildItem(
+                                new DeploymentException("Empty @Incoming annotation on method " + method)));
                     }
                     if (outgoing != null && outgoing.value().asString().isEmpty()) {
-                        validationPhase.getContext().addDeploymentProblem(
-                                new DeploymentException("Empty @Outgoing annotation on method " + method));
+                        validationErrors.produce(new ValidationErrorBuildItem(
+                                new DeploymentException("Empty @Outgoing annotation on method " + method)));
                     }
                     // TODO: validate method params and return type?
                     mediatorMethods.produce(new MediatorBuildItem(bean, method));
                     LOGGER.debugf("Found mediator business method %s declared on %s", method, bean);
                 } else if (blocking != null) {
-                    validationPhase.getContext().addDeploymentProblem(
+                    validationErrors.produce(new ValidationErrorBuildItem(
                             new DeploymentException(
-                                    "@Blocking used on " + method + " which has no @Incoming or @Outgoing annotation"));
+                                    "@Blocking used on " + method + " which has no @Incoming or @Outgoing annotation")));
                 }
             }
         }
 
-        for (InjectionPointInfo injectionPoint : validationPhase.getContext()
-                .get(BuildExtension.Key.INJECTION_POINTS)) {
-
-            Optional<AnnotationInstance> broadcast = annotationStore.getAnnotations(injectionPoint.getTarget())
-                    .stream()
-                    .filter(ai -> ReactiveMessagingDotNames.BROADCAST.equals(ai.name()))
-                    .filter(ai -> {
-                        if (ai.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER && injectionPoint
-                                .isParam()) {
-                            return ai.target().asMethodParameter().position() == injectionPoint.getPosition();
-                        }
-                        return true;
-                    })
-                    .findAny();
-
-            // New emitter from the spec.
-            if (injectionPoint.getRequiredType().name().equals(
-                    ReactiveMessagingDotNames.EMITTER)) {
-                AnnotationInstance instance = injectionPoint
-                        .getRequiredQualifier(ReactiveMessagingDotNames.CHANNEL);
-                if (instance == null) {
-                    validationPhase.getContext().addDeploymentProblem(
+        for (InjectionPointInfo injectionPoint : beanDiscoveryFinished.getInjectionPoints()) {
+            Optional<AnnotationInstance> broadcast = getAnnotation(transformedAnnotations, injectionPoint,
+                    ReactiveMessagingDotNames.BROADCAST);
+            Optional<AnnotationInstance> channel = getAnnotation(transformedAnnotations, injectionPoint,
+                    ReactiveMessagingDotNames.CHANNEL);
+            Optional<AnnotationInstance> legacyChannel = getAnnotation(transformedAnnotations, injectionPoint,
+                    ReactiveMessagingDotNames.LEGACY_CHANNEL);
+            boolean isEmitter = injectionPoint.getRequiredType().name().equals(ReactiveMessagingDotNames.EMITTER);
+            boolean isMutinyEmitter = injectionPoint.getRequiredType().name()
+                    .equals(ReactiveMessagingDotNames.MUTINY_EMITTER);
+            boolean isLegacyEmitter = injectionPoint.getRequiredType().name()
+                    .equals(ReactiveMessagingDotNames.LEGACY_EMITTER);
+
+            // New emitter from the spec, or Mutiny emitter
+            if (isEmitter || isMutinyEmitter) {
+                if (!channel.isPresent()) {
+                    validationErrors.produce(new ValidationErrorBuildItem(
                             new DeploymentException(
                                     "Invalid emitter injection - @Channel is required for " + injectionPoint
-                                            .getTargetInfo()));
+                                            .getTargetInfo())));
                 } else {
-                    String channelName = instance.value().asString();
-                    Optional<AnnotationInstance> overflow = annotationStore.getAnnotations(injectionPoint.getTarget())
-                            .stream()
-                            .filter(ai -> ReactiveMessagingDotNames.ON_OVERFLOW
-                                    .equals(ai.name()))
-                            .filter(ai -> {
-                                if (ai.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER && injectionPoint
-                                        .isParam()) {
-                                    return ai.target().asMethodParameter().position() == injectionPoint.getPosition();
-                                }
-                                return true;
-                            })
-                            .findAny();
-                    createEmitter(emitters, injectionPoint, channelName, overflow, broadcast);
+                    String channelName = channel.get().value().asString();
+                    Optional<AnnotationInstance> overflow = getAnnotation(transformedAnnotations, injectionPoint,
+                            ReactiveMessagingDotNames.ON_OVERFLOW);
+                    createEmitter(emitters,
+                            injectionPoint, channelName, overflow, broadcast);
                 }
             }
 
             // Deprecated Emitter from SmallRye (emitter, channel and on overflow have been added to the spec)
-            if (injectionPoint.getRequiredType().name()
-                    .equals(ReactiveMessagingDotNames.LEGACY_EMITTER)) {
-                AnnotationInstance instance = injectionPoint
-                        .getRequiredQualifier(ReactiveMessagingDotNames.LEGACY_CHANNEL);
-                if (instance == null) {
-                    validationPhase.getContext().addDeploymentProblem(
+            if (isLegacyEmitter) {
+                if (!legacyChannel.isPresent()) {
+                    validationErrors.produce(new ValidationErrorBuildItem(
                             new DeploymentException(
                                     "Invalid emitter injection - @Channel is required for " + injectionPoint
-                                            .getTargetInfo()));
+                                            .getTargetInfo())));
                 } else {
-                    String channelName = instance.value().asString();
-                    Optional<AnnotationInstance> overflow = annotationStore.getAnnotations(injectionPoint.getTarget())
-                            .stream()
-                            .filter(ai -> ReactiveMessagingDotNames.LEGACY_ON_OVERFLOW
-                                    .equals(ai.name()))
-                            .filter(ai -> {
-                                if (ai.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER && injectionPoint
-                                        .isParam()) {
-                                    return ai.target().asMethodParameter().position() == injectionPoint.getPosition();
-                                }
-                                return true;
-                            })
-                            .findAny();
-
+                    String channelName = legacyChannel.get().value().asString();
+                    Optional<AnnotationInstance> overflow = getAnnotation(transformedAnnotations, injectionPoint,
+                            ReactiveMessagingDotNames.LEGACY_ON_OVERFLOW);
                     createEmitter(emitters, injectionPoint, channelName, overflow, broadcast);
                 }
             }
+
+            if (channel.isPresent() && !(isEmitter || isMutinyEmitter)) {
+                String name = channel.get().value().asString();
+                if (name != null && !name.trim().isEmpty()) {
+                    channels.produce(ChannelBuildItem.of(name));
+                }
+            }
+
+            if (legacyChannel.isPresent() && !isLegacyEmitter) {
+                String name = legacyChannel.get().value().asString();
+                if (name != null && !name.trim().isEmpty()) {
+                    channels.produce(ChannelBuildItem.of(name));
+                }
+            }
         }
+
+    }
+
+    private Optional<AnnotationInstance> getAnnotation(TransformedAnnotationsBuildItem transformedAnnotations,
+            InjectionPointInfo injectionPoint,
+            DotName annotationName) {
+        Collection<AnnotationInstance> annotations = transformedAnnotations.getAnnotations(injectionPoint.getTarget());
+        for (AnnotationInstance annotation : annotations) {
+            if (annotationName.equals(annotation.name())) {
+                // For method parameter we must check the position
+                if (annotation.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER
+                        && injectionPoint.isParam()
+                        && annotation.target().asMethodParameter().position() == injectionPoint.getPosition()) {
+                    return Optional.of(annotation);
+                } else if (annotation.target().kind() != AnnotationTarget.Kind.METHOD_PARAMETER) {
+                    // For other kind, no need to check anything else
+                    return Optional.of(annotation);
+                }
+            }
+        }
+        return Optional.empty();
     }
 
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private void createEmitter(BuildProducer<EmitterBuildItem> emitters, InjectionPointInfo injectionPoint,
+    private void createEmitter(BuildProducer<EmitterBuildItem> emitters,
+            InjectionPointInfo injectionPoint,
             String channelName,
             Optional<AnnotationInstance> overflow,
             Optional<AnnotationInstance> broadcast) {
@@ -265,8 +275,11 @@ private void createEmitter(BuildProducer<EmitterBuildItem> emitters, InjectionPo
             strategy = annotation.value().asString();
         }
 
+        boolean isMutinyEmitter = injectionPoint.getRequiredType().name()
+                .equals(ReactiveMessagingDotNames.MUTINY_EMITTER);
         emitters.produce(
-                EmitterBuildItem.of(channelName, strategy, bufferSize, hasBroadcast, awaitSubscribers));
+                EmitterBuildItem
+                        .of(channelName, isMutinyEmitter, strategy, bufferSize, hasBroadcast, awaitSubscribers));
     }
 
     @BuildStep
@@ -282,11 +295,14 @@ public List<UnremovableBeanBuildItem> removalExclusions() {
 
     @BuildStep
     public void enableMetrics(BuildProducer<AnnotationsTransformerBuildItem> transformers,
-            Capabilities capabilities, ReactiveMessagingConfiguration configuration) {
-        boolean isMetricEnabled = capabilities.isPresent(Capability.METRICS) && configuration.metricsEnabled;
-        if (!isMetricEnabled) {
-            LOGGER.debug("Metric is disabled - vetoing the MetricDecorator");
-            // We veto the Metric Decorator
+            Optional<MetricsCapabilityBuildItem> metricsCapability,
+            ReactiveMessagingConfiguration configuration) {
+        boolean isMetricEnabled = metricsCapability.isPresent() && configuration.metricsEnabled;
+        boolean useMicrometer = isMetricEnabled && metricsCapability.get().metricsSupported(MetricsFactory.MICROMETER);
+        if (!isMetricEnabled || useMicrometer) {
+            LOGGER.debug("Metrics Enabled: " + isMetricEnabled + "; Using Micrometer: " + useMicrometer);
+
+            // Remove the MetricDecorator that requires the MP Metrics API
             AnnotationsTransformerBuildItem veto = new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
                 @Override
                 public boolean appliesTo(AnnotationTarget.Kind kind) {
@@ -295,9 +311,10 @@ public boolean appliesTo(AnnotationTarget.Kind kind) {
 
                 @Override
                 public void transform(AnnotationsTransformer.TransformationContext ctx) {
-                    if (ctx.isClass() && ctx.getTarget().asClass().name().equals(
-                            ReactiveMessagingDotNames.METRIC_DECORATOR)) {
-                        ctx.transform().add(Vetoed.class).done();
+                    if (ctx.getTarget().asClass().name().equals(ReactiveMessagingDotNames.METRIC_DECORATOR)) {
+                        ctx.transform()
+                                .removeAll()
+                                .add(Vetoed.class).done();
                     }
                 }
             });
@@ -306,27 +323,34 @@ public void transform(AnnotationsTransformer.TransformationContext ctx) {
     }
 
     @BuildStep
-    public void enableHealth(ReactiveMessagingBuildTimeConfig buildTimeConfig, BuildProducer<HealthBuildItem> producer) {
+    public void enableHealth(ReactiveMessagingBuildTimeConfig buildTimeConfig,
+            BuildProducer<HealthBuildItem> producer) {
         producer.produce(
-                new HealthBuildItem(SmallRyeReactiveMessagingLivenessCheck.class.getName(), buildTimeConfig.healthEnabled));
+                new HealthBuildItem(SmallRyeReactiveMessagingLivenessCheck.class.getName(),
+                        buildTimeConfig.healthEnabled));
         producer.produce(
-                new HealthBuildItem(SmallRyeReactiveMessagingReadinessCheck.class.getName(), buildTimeConfig.healthEnabled));
+                new HealthBuildItem(SmallRyeReactiveMessagingReadinessCheck.class.getName(),
+                        buildTimeConfig.healthEnabled));
     }
 
     @BuildStep
     @Record(STATIC_INIT)
     public void build(SmallRyeReactiveMessagingRecorder recorder, RecorderContext recorderContext,
-            BeanContainerBuildItem beanContainer,
+            BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             List<MediatorBuildItem> mediatorMethods,
             List<EmitterBuildItem> emitterFields,
+            List<ChannelBuildItem> channelFields,
             BuildProducer<GeneratedClassBuildItem> generatedClass,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             ReactiveMessagingConfiguration conf) {
 
-        List<QuarkusMediatorConfiguration> configurations = new ArrayList<>(mediatorMethods.size());
-
         ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
 
+        List<QuarkusMediatorConfiguration> mediatorConfigurations = new ArrayList<>(mediatorMethods.size());
+        List<WorkerConfiguration> workerConfigurations = new ArrayList<>();
+        List<EmitterConfiguration> emittersConfiguratons = new ArrayList<>();
+        List<ChannelConfiguration> channelConfigurations = new ArrayList<>();
+
         /*
          * Go through the collected MediatorMethods and build up the corresponding MediaConfiguration
          * This includes generating an invoker for each method
@@ -343,12 +367,15 @@ public void build(SmallRyeReactiveMessagingRecorder recorder, RecorderContext re
              */
             reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, generatedInvokerName));
 
-            if (methodInfo.hasAnnotation(ReactiveMessagingDotNames.BLOCKING)) {
-                AnnotationInstance blocking = methodInfo.annotation(ReactiveMessagingDotNames.BLOCKING);
-                String poolName = blocking.value() == null ? Blocking.DEFAULT_WORKER_POOL : blocking.value().asString();
-
-                recorder.configureWorkerPool(beanContainer.getValue(), methodInfo.declaringClass().toString(),
-                        methodInfo.name(), poolName);
+            if (methodInfo.hasAnnotation(BLOCKING) || methodInfo.hasAnnotation(SMALLRYE_BLOCKING)) {
+                // Just in case both annotation are used, use @Blocking value.
+                String poolName = Blocking.DEFAULT_WORKER_POOL;
+                if (methodInfo.hasAnnotation(ReactiveMessagingDotNames.BLOCKING)) {
+                    AnnotationInstance blocking = methodInfo.annotation(ReactiveMessagingDotNames.BLOCKING);
+                    poolName = blocking.value() == null ? Blocking.DEFAULT_WORKER_POOL : blocking.value().asString();
+                }
+                workerConfigurations.add(new WorkerConfiguration(methodInfo.declaringClass().toString(),
+                        methodInfo.name(), poolName));
             }
 
             try {
@@ -356,26 +383,23 @@ public void build(SmallRyeReactiveMessagingRecorder recorder, RecorderContext re
                         .create(methodInfo, bean,
                                 generatedInvokerName, recorderContext,
                                 Thread.currentThread().getContextClassLoader());
-                configurations.add(mediatorConfiguration);
+                mediatorConfigurations.add(mediatorConfiguration);
             } catch (IllegalArgumentException e) {
                 throw new DeploymentException(e); // needed to pass the TCK
             }
         }
-        recorder.registerMediators(configurations, beanContainer.getValue());
 
         for (EmitterBuildItem it : emitterFields) {
-            Config config = ConfigProvider.getConfig();
-            int defaultBufferSize = config.getOptionalValue("mp.messaging.emitter.default-buffer-size", Integer.class)
-                    .orElseGet(new Supplier<Integer>() {
-                        @Override
-                        public Integer get() {
-                            return config
-                                    .getOptionalValue("smallrye.messaging.emitter.default-buffer-size", Integer.class)
-                                    .orElse(127);
-                        }
-                    });
-            recorder.configureEmitter(beanContainer.getValue(), it.getEmitterConfig(), defaultBufferSize);
+            emittersConfiguratons.add(it.getEmitterConfig());
         }
+        for (ChannelBuildItem it : channelFields) {
+            channelConfigurations.add(it.getChannelConfig());
+        }
+
+        syntheticBeans.produce(SyntheticBeanBuildItem.configure(SmallRyeReactiveMessagingContext.class)
+                .supplier(recorder.createContext(mediatorConfigurations, workerConfigurations, emittersConfiguratons,
+                        channelConfigurations))
+                .done());
     }
 
     /**
@@ -408,8 +432,9 @@ private String generateInvoker(BeanInfo bean, MethodInfo method, ClassOutput cla
         for (Type i : method.parameters()) {
             sigBuilder.append(i.name().toString());
         }
-        String targetPackage = DotNames.packageName(bean.getImplClazz().name());
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + INVOKER_SUFFIX + "_" + method.name() + "_"
+        String targetPackage = DotNames.internalPackageNameWithTrailingSlash(bean.getImplClazz().name());
+        String generatedName = targetPackage + baseName
+                + INVOKER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString());
 
         try (ClassCreator invoker = ClassCreator.builder().classOutput(classOutput).className(generatedName)
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devconsole/DevConsoleProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devconsole/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..7e84c25dfa085
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devconsole/DevConsoleProcessor.java
@@ -0,0 +1,61 @@
+package io.quarkus.smallrye.reactivemessaging.deployment.devconsole;
+
+import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.jandex.AnnotationInstance;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanDiscoveryFinishedBuildItem;
+import io.quarkus.arc.processor.InjectionPointInfo;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames;
+import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.Connectors;
+import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevConsoleRecorder;
+import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevReactiveMessagingInfosSupplier;
+
+public class DevConsoleProcessor {
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public DevConsoleRuntimeTemplateInfoBuildItem collectInfos() {
+        return new DevConsoleRuntimeTemplateInfoBuildItem("reactiveMessagingInfos",
+                new DevReactiveMessagingInfosSupplier());
+    }
+
+    @Record(STATIC_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public void collectInjectionInfo(DevConsoleRecorder recorder, BeanDiscoveryFinishedBuildItem beanDiscoveryFinished) {
+        Map<String, String> emitters = new HashMap<>();
+        Map<String, String> channels = new HashMap<>();
+        for (InjectionPointInfo injectionPoint : beanDiscoveryFinished.getInjectionPoints()) {
+            AnnotationInstance channelAnnotation = injectionPoint.getRequiredQualifier(ReactiveMessagingDotNames.CHANNEL);
+            if (channelAnnotation == null) {
+                channelAnnotation = injectionPoint.getRequiredQualifier(ReactiveMessagingDotNames.LEGACY_CHANNEL);
+            }
+            boolean isEmitter = injectionPoint.getRequiredType().name().equals(ReactiveMessagingDotNames.EMITTER)
+                    || injectionPoint.getRequiredType().name()
+                            .equals(ReactiveMessagingDotNames.MUTINY_EMITTER)
+                    || injectionPoint.getRequiredType().name()
+                            .equals(ReactiveMessagingDotNames.LEGACY_EMITTER);
+            if (channelAnnotation != null) {
+                if (isEmitter) {
+                    emitters.put(channelAnnotation.value().asString(), injectionPoint.getTargetInfo());
+                } else {
+                    channels.put(channelAnnotation.value().asString(), injectionPoint.getTargetInfo());
+                }
+            }
+        }
+        recorder.setInjectionInfo(emitters, channels);
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    AdditionalBeanBuildItem beans() {
+        return AdditionalBeanBuildItem.unremovableOf(Connectors.class);
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/channels.html b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/channels.html
new file mode 100644
index 0000000000000..f611458dec230
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/channels.html
@@ -0,0 +1,44 @@
+{#include main fluid=true}
+  {#style}
+   .annotation {
+     color: gray;
+   }
+  {/style}
+  {#title}Channels{/title}
+  {#body}
+  <table class="table table-striped ">
+   <thead class="thead-dark">
+    <tr>
+      <th scope="col">#</th>
+      <th scope="col">Name</th>
+      <th scope="col">Publisher</th>
+      <th scope="col">Consumers</th>
+    </tr>
+   </thead>
+   <tbody>
+    {#for channel in info:reactiveMessagingInfos.channels}
+    <tr>
+      <td>{count}.</td>
+      <td><strong>{channel.name}</strong></td>
+      <td>{#componentDescription channel.publisher /}</td>
+      <td>
+        {#if channel.consumers}
+        {#when channel.consumers.size}
+          {#is 1}
+            {#componentDescription channel.consumers.get(0) /}
+          {#is > 1}
+            <ul>
+            {#for consumer in channel.consumers}
+              <li>{#componentDescription consumer /}</li> 
+            {/for}
+            </ul>
+          {#else}
+             N/A
+        {/when}
+        {/if}
+      </td>
+    {/for}
+   </tbody>
+  </table>
+  {/body}
+{/include}
\ No newline at end of file
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/embedded.html b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/embedded.html
new file mode 100644
index 0000000000000..24a6e88328be2
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/embedded.html
@@ -0,0 +1,4 @@
+<a href="{urlbase}/channels" class="badge badge-light">
+  <i class="fa fa-envelope"></i>
+  Channels <span class="badge badge-light">{info:reactiveMessagingInfos.channels.size}</span></a>
+<br>
\ No newline at end of file
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html
new file mode 100644
index 0000000000000..2bbf8919087c6
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html
@@ -0,0 +1,17 @@
+{#if it}
+{#when it.type}
+  {#case PUBLISHER}
+  <i class="fas fa-sign-out-alt"></i> Publisher:
+  {#case SUBSCRIBER}
+  <i class="fas fa-sign-in-alt"></i> Subscriber:
+  {#case PROCESSOR}
+  <i class="fas fa-exchange-alt"></i> Processor:
+  {#case CONNECTOR}
+  <i class="fas fa-plug"></i> Connector:
+  {#case EMITTER}
+  <i class="fas fa-syringe"></i> Emitter:
+  {#case CHANNEL}
+  <i class="fas fa-syringe"></i> Channel:
+{/when}
+{it.description.raw}
+{/if}
\ No newline at end of file
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelConsumer.java
deleted file mode 100644
index 4099e1c1da3c7..0000000000000
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelConsumer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.smallrye.reactivemessaging;
-
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.eclipse.microprofile.reactive.messaging.Channel;
-import org.eclipse.microprofile.reactive.messaging.Message;
-
-import io.reactivex.Flowable;
-
-@ApplicationScoped
-public class ChannelConsumer {
-
-    @Inject
-    @Channel("source")
-    Flowable<Message<String>> sourceStream;
-
-    public List<String> consume() {
-        return Flowable.fromPublisher(sourceStream)
-                .map(Message::getPayload)
-                .toList()
-                .blockingGet();
-    }
-
-}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedChannelConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedChannelConsumer.java
deleted file mode 100644
index 2c2db38b9402e..0000000000000
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedChannelConsumer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.smallrye.reactivemessaging;
-
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
-import org.eclipse.microprofile.reactive.messaging.Message;
-
-import io.reactivex.Flowable;
-import io.smallrye.reactive.messaging.annotations.Channel;
-
-@ApplicationScoped
-public class DeprecatedChannelConsumer {
-
-    @Inject
-    @Channel("source")
-    Flowable<Message<String>> sourceStream;
-
-    public List<String> consume() {
-        return Flowable.fromPublisher(sourceStream)
-                .map(Message::getPayload)
-                .toList()
-                .blockingGet();
-    }
-
-}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java
new file mode 100644
index 0000000000000..03c836a5f53dc
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest.java
@@ -0,0 +1,656 @@
+package io.quarkus.smallrye.reactivemessaging;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.stream.Collectors;
+
+import javax.enterprise.inject.spi.DefinitionException;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.streams.operators.ProcessorBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.Indexer;
+import org.jboss.jandex.MethodInfo;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.reactivestreams.Processor;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+
+import io.quarkus.smallrye.reactivemessaging.deployment.QuarkusMediatorConfigurationUtil;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.reactive.messaging.MediatorConfiguration;
+import io.smallrye.reactive.messaging.MediatorConfigurationSupport;
+import io.smallrye.reactive.messaging.Shape;
+
+@SuppressWarnings("ConstantConditions")
+public class MediatorConfigurationSupportTest {
+
+    private static ClassInfo classInfo;
+    private static ClassLoader classLoader;
+
+    @BeforeAll
+    static void index() throws IOException {
+        Indexer indexer = new Indexer();
+        indexer.index(MediatorConfigurationSupportTest.class.getClassLoader().getResourceAsStream(
+                "io/quarkus/smallrye/reactivemessaging/MediatorConfigurationSupportTest$ClassContainingAllSortsOfMethods.class"));
+        Index index = indexer.complete();
+        classInfo = index
+                .getClassByName(DotName.createSimple(ClassContainingAllSortsOfMethods.class.getName()));
+        classLoader = ClassContainingAllSortsOfMethods.class.getClassLoader();
+    }
+
+    private MediatorConfigurationSupport create(String method) {
+        for (MethodInfo m : classInfo.methods()) {
+            if (m.name().equalsIgnoreCase(method)) {
+                List<? extends Class<?>> list = m.parameters().stream().map(t -> load(t.name().toString()))
+                        .collect(Collectors.toList());
+                return new MediatorConfigurationSupport(
+                        method,
+                        load(m.returnType().name().toString()),
+                        list.toArray(new Class[0]),
+                        new QuarkusMediatorConfigurationUtil.ReturnTypeGenericTypeAssignable(m, classLoader),
+                        m.parameters().size() == 0
+                                ? new QuarkusMediatorConfigurationUtil.AlwaysInvalidIndexGenericTypeAssignable()
+                                : new QuarkusMediatorConfigurationUtil.MethodParamGenericTypeAssignable(m, 0,
+                                        classLoader));
+            }
+        }
+        fail("Unable to find method " + method);
+        return null;
+    }
+
+    public Class<?> load(String className) {
+        try {
+            if (className.equalsIgnoreCase("void")) {
+                return void.class;
+            }
+            return Class.forName(className, false, classLoader);
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Test
+    public void testPublishers() {
+        MediatorConfigurationSupport support = create("publisherPublisherOfMessage");
+        MediatorConfigurationSupport.ValidationOutput output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherMultiOfMessage");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherPublisherOfPayload");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherMultiOfPayload");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherPublisherBuilderOfMessage");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("publisherPublisherBuilderOfPayload");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("publisherGeneratePayload");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.INDIVIDUAL_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherGenerateMessage");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.INDIVIDUAL_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherGenerateCompletionStagePayload");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.COMPLETION_STAGE_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherGenerateCompletionStageMessage");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.COMPLETION_STAGE_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherGenerateUniPayload");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.UNI_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("publisherGenerateUniMessage");
+        output = support.validate(Shape.PUBLISHER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.NONE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.UNI_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isNull();
+        assertThat(output.getUseBuilderTypes()).isFalse();
+    }
+
+    @Test
+    public void testSubscribers() {
+        MediatorConfigurationSupport support = create("subscriberSubscriberOfMessage");
+        MediatorConfigurationSupport.ValidationOutput output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSubscriberOfPayload");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSubscriberBuilderOfMessage");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("subscriberSubscriberBuilderOfPayload");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        assertThatThrownBy(() -> create("subscriberSinkOfMessage").validate(Shape.SUBSCRIBER, null))
+                .isInstanceOf(DefinitionException.class);
+
+        support = create("subscriberSinkOfPayload");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSinkOfMessageCompletionStage");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSinkOfPayloadCompletionStage");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSinkOfMessageUni");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSinkOfPayloadUni");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSinkOfRawMessageCompletionStage");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("subscriberSinkOfWildcardMessageCompletionStage");
+        output = support.validate(Shape.SUBSCRIBER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.NONE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+    }
+
+    @Test
+    public void testProcessors() {
+        MediatorConfigurationSupport support = create("processorProcessorOfMessage");
+        MediatorConfigurationSupport.ValidationOutput output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessorOfPayload");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessorBuilderOfMessage");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("processorProcessorBuilderOfPayload");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("processorPublisherOfMessage");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorPublisherOfPayload");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorPublisherBuilderOfMessage");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("processorPublisherBuilderOfPayload");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(String.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("processorProcessMessage");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.INDIVIDUAL_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessPayload");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.INDIVIDUAL_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessMessageCompletionStage");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.COMPLETION_STAGE_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessPayloadCompletionStage");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.COMPLETION_STAGE_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessMessageUni");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.UNI_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessPayloadUni");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.UNI_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessMessageUniRaw");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.UNI_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("processorProcessMessageUniWildcard");
+        output = support.validate(Shape.PROCESSOR, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.UNI_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+    }
+
+    @Test
+    public void testStreamTransformers() {
+        MediatorConfigurationSupport support = create("transformerPublisherOfMessage");
+        MediatorConfigurationSupport.ValidationOutput output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("transformerPublisherOfPayload");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("transformerMultiOfMessage");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("transformerMultiOfPayload");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("transformerPublisherBuilderOfMessage");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("transformerPublisherBuilderOfPayload");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(Person.class);
+        assertThat(output.getUseBuilderTypes()).isTrue();
+
+        support = create("transformerPublisherOfMessageRaw");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        support = create("transformerPublisherOfMessageWildcard");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_MESSAGE);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_MESSAGE);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+
+        assertThatThrownBy(() -> create("transformerPublisherOfPayloadRaw").validate(Shape.STREAM_TRANSFORMER, null))
+                .isInstanceOf(DefinitionException.class);
+
+        support = create("transformerPublisherOfPayloadWildcard");
+        output = support.validate(Shape.STREAM_TRANSFORMER, null);
+        assertThat(output.getConsumption()).isEqualTo(MediatorConfiguration.Consumption.STREAM_OF_PAYLOAD);
+        assertThat(output.getProduction()).isEqualTo(MediatorConfiguration.Production.STREAM_OF_PAYLOAD);
+        assertThat(output.getIngestedPayloadType()).isEqualTo(null);
+        assertThat(output.getUseBuilderTypes()).isFalse();
+    }
+
+    static class ClassContainingAllSortsOfMethods {
+
+        // Publishers
+        Publisher<Message<Person>> publisherPublisherOfMessage() {
+            return null;
+        }
+
+        Multi<Message<Person>> publisherMultiOfMessage() {
+            return null;
+        }
+
+        Publisher<Person> publisherPublisherOfPayload() {
+            return null;
+        }
+
+        Multi<Person> publisherMultiOfPayload() {
+            return null;
+        }
+
+        PublisherBuilder<Message<Person>> publisherPublisherBuilderOfMessage() {
+            return null;
+        }
+
+        PublisherBuilder<Person> publisherPublisherBuilderOfPayload() {
+            return null;
+        }
+
+        Person publisherGeneratePayload() {
+            return null;
+        }
+
+        Message<Person> publisherGenerateMessage() {
+            return null;
+        }
+
+        CompletionStage<Person> publisherGenerateCompletionStagePayload() {
+            return null;
+        }
+
+        CompletionStage<Message<Person>> publisherGenerateCompletionStageMessage() {
+            return null;
+        }
+
+        Uni<Person> publisherGenerateUniPayload() {
+            return null;
+        }
+
+        Uni<Message<Person>> publisherGenerateUniMessage() {
+            return null;
+        }
+
+        // Subscribers
+        Subscriber<Message<Person>> subscriberSubscriberOfMessage() {
+            return null;
+        }
+
+        Subscriber<Person> subscriberSubscriberOfPayload() {
+            return null;
+        }
+
+        SubscriberBuilder<Message<Person>, Void> subscriberSubscriberBuilderOfMessage() {
+            return null;
+        }
+
+        SubscriberBuilder<Person, Void> subscriberSubscriberBuilderOfPayload() {
+            return null;
+        }
+
+        void subscriberSinkOfMessage(Message<Person> p) {
+            // Invalid
+        }
+
+        void subscriberSinkOfPayload(Person p) {
+
+        }
+
+        CompletionStage<Void> subscriberSinkOfMessageCompletionStage(Message<Person> p) {
+            return null;
+        }
+
+        CompletionStage<Void> subscriberSinkOfPayloadCompletionStage(Person p) {
+            return null;
+        }
+
+        Uni<Void> subscriberSinkOfMessageUni(Message<Person> p) {
+            return null;
+        }
+
+        Uni<Void> subscriberSinkOfPayloadUni(Person p) {
+            return null;
+        }
+
+        @SuppressWarnings("rawtypes")
+        CompletionStage<Void> subscriberSinkOfRawMessageCompletionStage(Message p) {
+            return null;
+        }
+
+        CompletionStage<Void> subscriberSinkOfWildcardMessageCompletionStage(Message<?> p) {
+            return null;
+        }
+
+        // Processors
+
+        Processor<Message<String>, Message<Person>> processorProcessorOfMessage() {
+            return null;
+        }
+
+        Processor<String, Person> processorProcessorOfPayload() {
+            return null;
+        }
+
+        ProcessorBuilder<Message<String>, Message<Person>> processorProcessorBuilderOfMessage() {
+            return null;
+        }
+
+        ProcessorBuilder<String, Person> processorProcessorBuilderOfPayload() {
+            return null;
+        }
+
+        Publisher<Message<Person>> processorPublisherOfMessage(Message<String> in) {
+            return null;
+        }
+
+        Publisher<Person> processorPublisherOfPayload(String in) {
+            return null;
+        }
+
+        PublisherBuilder<Message<Person>> processorPublisherBuilderOfMessage(Message<String> in) {
+            return null;
+        }
+
+        PublisherBuilder<Person> processorPublisherBuilderOfPayload(String in) {
+            return null;
+        }
+
+        Message<String> processorProcessMessage(Message<Person> in) {
+            return null;
+        }
+
+        String processorProcessPayload(Person in) {
+            return null;
+        }
+
+        CompletionStage<Message<String>> processorProcessMessageCompletionStage(Message<Person> in) {
+            return null;
+        }
+
+        CompletionStage<String> processorProcessPayloadCompletionStage(Person in) {
+            return null;
+        }
+
+        Uni<Message<String>> processorProcessMessageUni(Message<Person> in) {
+            return null;
+        }
+
+        Uni<String> processorProcessPayloadUni(Person in) {
+            return null;
+        }
+
+        Uni<Message<String>> processorProcessMessageUniRaw(Message in) {
+            return null;
+        }
+
+        Uni<Message<String>> processorProcessMessageUniWildcard(Message<?> in) {
+            return null;
+        }
+
+        // Transformers
+
+        Publisher<Message<String>> transformerPublisherOfMessage(Publisher<Message<Person>> in) {
+            return null;
+        }
+
+        Multi<Message<String>> transformerMultiOfMessage(Multi<Message<Person>> in) {
+            return null;
+        }
+
+        PublisherBuilder<Message<String>> transformerPublisherBuilderOfMessage(PublisherBuilder<Message<Person>> in) {
+            return null;
+        }
+
+        Publisher<String> transformerPublisherOfPayload(Publisher<Person> in) {
+            return null;
+        }
+
+        Multi<String> transformerMultiOfPayload(Multi<Person> in) {
+            return null;
+        }
+
+        PublisherBuilder<String> transformerPublisherBuilderOfPayload(PublisherBuilder<Person> in) {
+            return null;
+        }
+
+        @SuppressWarnings("rawtypes")
+        Publisher<Message<String>> transformerPublisherOfMessageRaw(Publisher<Message> in) {
+            return null;
+        }
+
+        Publisher<Message<String>> transformerPublisherOfMessageWildcard(Publisher<Message<?>> in) {
+            return null;
+        }
+
+        @SuppressWarnings("rawtypes")
+        Publisher<String> transformerPublisherOfPayloadRaw(Publisher in) {
+            // invalid
+            return null;
+        }
+
+        Publisher<String> transformerPublisherOfPayloadWildcard(Publisher<?> in) {
+            return null;
+        }
+
+    }
+
+    static class Person {
+
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java
index e739af6e0cfd6..18998f5ea6c7b 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ReactiveMessagingTest.java
@@ -12,6 +12,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.smallrye.reactivemessaging.channels.ChannelConsumer;
+import io.quarkus.smallrye.reactivemessaging.channels.EmitterExample;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class ReactiveMessagingTest {
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java
new file mode 100644
index 0000000000000..7e20b7e47864d
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/SmallRyeBlockingSubscriberTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.smallrye.reactivemessaging;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.reactivestreams.Publisher;
+
+import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingUsingSmallRyeBlocking;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+
+public class SmallRyeBlockingSubscriberTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ProduceIn.class, IncomingUsingSmallRyeBlocking.class)
+                    .addAsResource(
+                            new File("src/test/resources/config/worker-config.properties"),
+                            "application.properties"));
+
+    @Inject
+    IncomingUsingSmallRyeBlocking incoming;
+
+    @Test
+    public void testIncomingUsingRunOnWorkerThread() {
+        await().until(() -> incoming.list().size() == 6);
+        assertThat(incoming.list()).contains("a", "b", "c", "d", "e", "f");
+
+        List<String> threadNames = incoming.threads().stream().distinct()
+                .collect(Collectors.toList());
+        assertThat(threadNames.contains(Thread.currentThread().getName())).isFalse();
+        for (String name : threadNames) {
+            assertThat(name.startsWith("vert.x-worker-thread-")).isTrue();
+        }
+    }
+
+    @ApplicationScoped
+    public static class ProduceIn {
+        @Outgoing("in")
+        public Publisher<String> produce() {
+            return Multi.createFrom().items("a", "b", "c", "d", "e", "f");
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java
index 9101921562d33..4dfb5f12a9478 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingPublisherTest.java
@@ -1,14 +1,13 @@
 package io.quarkus.smallrye.reactivemessaging.blocking;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
-import org.eclipse.microprofile.reactive.messaging.Message;
-import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -16,33 +15,27 @@
 
 import io.quarkus.smallrye.reactivemessaging.blocking.beans.BeanReturningMessages;
 import io.quarkus.smallrye.reactivemessaging.blocking.beans.BeanReturningPayloads;
+import io.quarkus.smallrye.reactivemessaging.blocking.beans.InfiniteSubscriber;
 import io.quarkus.test.QuarkusUnitTest;
-import io.smallrye.reactive.messaging.ChannelRegistry;
 
 public class BlockingPublisherTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(BeanReturningPayloads.class, BeanReturningMessages.class));
+                    .addClasses(BeanReturningPayloads.class, BeanReturningMessages.class, InfiniteSubscriber.class));
 
     @Inject
     BeanReturningPayloads beanReturningPayloads;
     @Inject
     BeanReturningMessages beanReturningMessages;
+
     @Inject
-    ChannelRegistry channelRegistry;
+    InfiniteSubscriber subscriber;
 
     @Test
     public void testBlockingWhenProducingPayload() {
-        List<PublisherBuilder<? extends Message<?>>> producer = channelRegistry.getPublishers("infinite-producer-payload");
-        assertThat(producer).isNotEmpty();
-        List<Integer> list = producer.get(0).map(Message::getPayload)
-                .limit(5)
-                .map(i -> (Integer) i)
-                .toList().run().toCompletableFuture().join();
-        assertThat(list).containsExactly(1, 2, 3, 4, 5);
-
+        await().untilAsserted(() -> assertThat(subscriber.payloads()).containsExactly(1, 2, 3, 4));
         List<String> threadNames = beanReturningPayloads.threads().stream().distinct().collect(Collectors.toList());
         assertThat(threadNames.contains(Thread.currentThread().getName())).isFalse();
         for (String name : threadNames) {
@@ -52,14 +45,7 @@ public void testBlockingWhenProducingPayload() {
 
     @Test
     public void testBlockingWhenProducingMessages() {
-        List<PublisherBuilder<? extends Message<?>>> producer = channelRegistry.getPublishers("infinite-producer-msg");
-        assertThat(producer).isNotEmpty();
-        List<Integer> list = producer.get(0).map(Message::getPayload)
-                .limit(5)
-                .map(i -> (Integer) i)
-                .toList().run().toCompletableFuture().join();
-        assertThat(list).containsExactly(1, 2, 3, 4, 5);
-
+        await().untilAsserted(() -> assertThat(subscriber.messages()).containsExactly(1, 2, 3, 4));
         List<String> threadNames = beanReturningMessages.threads().stream().distinct().collect(Collectors.toList());
         assertThat(threadNames.contains(Thread.currentThread().getName())).isFalse();
         for (String name : threadNames) {
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java
index f90085e923ccd..58d118fc3d73f 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/BlockingSubscriberTest.java
@@ -21,6 +21,7 @@
 import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingCustomUnorderedBlockingBean;
 import io.quarkus.test.QuarkusUnitTest;
 import io.smallrye.mutiny.Multi;
+import io.smallrye.reactive.messaging.annotations.Broadcast;
 
 public class BlockingSubscriberTest {
     @RegisterExtension
@@ -72,6 +73,7 @@ public void testIncomingBlockingCustomPoolTwo() {
     @ApplicationScoped
     public static class ProduceIn {
         @Outgoing("in")
+        @Broadcast(2)
         public Publisher<String> produce() {
             return Multi.createFrom().items("a", "b", "c", "d", "e", "f");
         }
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java
new file mode 100644
index 0000000000000..1ffb6fa2b243f
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingPublisherTest.java
@@ -0,0 +1,55 @@
+package io.quarkus.smallrye.reactivemessaging.blocking;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.smallrye.reactivemessaging.blocking.beans.BeanReturningMessagesUsingSmallRyeBlocking;
+import io.quarkus.smallrye.reactivemessaging.blocking.beans.BeanReturningPayloadsUsingSmallRyeBlocking;
+import io.quarkus.smallrye.reactivemessaging.blocking.beans.InfiniteSubscriber;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class SmallRyeBlockingPublisherTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BeanReturningPayloadsUsingSmallRyeBlocking.class,
+                            BeanReturningMessagesUsingSmallRyeBlocking.class, InfiniteSubscriber.class));
+
+    @Inject
+    BeanReturningPayloadsUsingSmallRyeBlocking beanReturningPayloads;
+    @Inject
+    BeanReturningMessagesUsingSmallRyeBlocking beanReturningMessages;
+    @Inject
+    InfiniteSubscriber subscriber;
+
+    @Test
+    public void testBlockingWhenProducingPayload() {
+        await().untilAsserted(() -> assertThat(subscriber.payloads()).containsExactly(1, 2, 3, 4));
+        List<String> threadNames = beanReturningPayloads.threads().stream().distinct().collect(Collectors.toList());
+        assertThat(threadNames.contains(Thread.currentThread().getName())).isFalse();
+        for (String name : threadNames) {
+            assertThat(name.startsWith("vert.x-worker-thread-")).isTrue();
+        }
+    }
+
+    @Test
+    public void testBlockingWhenProducingMessages() {
+        await().untilAsserted(() -> assertThat(subscriber.messages()).containsExactly(1, 2, 3, 4));
+        List<String> threadNames = beanReturningMessages.threads().stream().distinct().collect(Collectors.toList());
+        assertThat(threadNames.contains(Thread.currentThread().getName())).isFalse();
+        for (String name : threadNames) {
+            assertThat(name.startsWith("vert.x-worker-thread-")).isTrue();
+        }
+    }
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java
new file mode 100644
index 0000000000000..90fce9af46cdf
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/SmallRyeBlockingSubscriberTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.smallrye.reactivemessaging.blocking;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.reactivestreams.Publisher;
+
+import io.quarkus.smallrye.reactivemessaging.blocking.beans.IncomingUsingSmallRyeBlocking;
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+
+public class SmallRyeBlockingSubscriberTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ProduceIn.class, IncomingUsingSmallRyeBlocking.class)
+                    .addAsResource(
+                            new File("src/test/resources/config/worker-config.properties"),
+                            "application.properties"));
+
+    @Inject
+    IncomingUsingSmallRyeBlocking incoming;
+
+    @Test
+    public void testIncomingUsingRunOnWorkerThread() {
+        await().until(() -> incoming.list().size() == 6);
+        assertThat(incoming.list()).contains("a", "b", "c", "d", "e", "f");
+
+        List<String> threadNames = incoming.threads().stream().distinct()
+                .collect(Collectors.toList());
+        assertThat(threadNames.contains(Thread.currentThread().getName())).isFalse();
+        for (String name : threadNames) {
+            assertThat(name.startsWith("vert.x-worker-thread-")).isTrue();
+        }
+    }
+
+    @ApplicationScoped
+    public static class ProduceIn {
+        @Outgoing("in")
+        public Publisher<String> produce() {
+            return Multi.createFrom().items("a", "b", "c", "d", "e", "f");
+        }
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java
index a1da02148eb50..661d5e351d641 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessages.java
@@ -13,8 +13,8 @@
 
 @ApplicationScoped
 public class BeanReturningMessages {
-    private AtomicInteger count = new AtomicInteger();
-    private List<String> threads = new CopyOnWriteArrayList<>();
+    private final AtomicInteger count = new AtomicInteger();
+    private final List<String> threads = new CopyOnWriteArrayList<>();
 
     @Blocking
     @Outgoing("infinite-producer-msg")
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java
new file mode 100644
index 0000000000000..70bdcd1ea2e6d
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningMessagesUsingSmallRyeBlocking.java
@@ -0,0 +1,34 @@
+package io.quarkus.smallrye.reactivemessaging.blocking.beans;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+
+import io.smallrye.common.annotation.Blocking;
+
+@ApplicationScoped
+public class BeanReturningMessagesUsingSmallRyeBlocking {
+    private final AtomicInteger count = new AtomicInteger();
+    private final List<String> threads = new CopyOnWriteArrayList<>();
+
+    @Blocking
+    @Outgoing("infinite-producer-msg")
+    public Message<Integer> create() {
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        threads.add(Thread.currentThread().getName());
+        return Message.of(count.incrementAndGet());
+    }
+
+    public List<String> threads() {
+        return threads;
+    }
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java
index d0102131d152e..56ff7c1665297 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloads.java
@@ -12,8 +12,8 @@
 
 @ApplicationScoped
 public class BeanReturningPayloads {
-    private AtomicInteger count = new AtomicInteger();
-    private List<String> threads = new CopyOnWriteArrayList<>();
+    private final AtomicInteger count = new AtomicInteger();
+    private final List<String> threads = new CopyOnWriteArrayList<>();
 
     @Blocking
     @Outgoing("infinite-producer-payload")
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java
new file mode 100644
index 0000000000000..e24b3265b556a
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/BeanReturningPayloadsUsingSmallRyeBlocking.java
@@ -0,0 +1,33 @@
+package io.quarkus.smallrye.reactivemessaging.blocking.beans;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+
+import io.smallrye.common.annotation.Blocking;
+
+@ApplicationScoped
+public class BeanReturningPayloadsUsingSmallRyeBlocking {
+    private final AtomicInteger count = new AtomicInteger();
+    private final List<String> threads = new CopyOnWriteArrayList<>();
+
+    @Blocking
+    @Outgoing("infinite-producer-payload")
+    public int create() {
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        threads.add(Thread.currentThread().getName());
+        return count.incrementAndGet();
+    }
+
+    public List<String> threads() {
+        return threads;
+    }
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java
new file mode 100644
index 0000000000000..9ca31331ea73f
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/IncomingUsingSmallRyeBlocking.java
@@ -0,0 +1,38 @@
+package io.quarkus.smallrye.reactivemessaging.blocking.beans;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+
+import io.smallrye.common.annotation.Blocking;
+
+@ApplicationScoped
+public class IncomingUsingSmallRyeBlocking {
+    private final List<String> list = new CopyOnWriteArrayList<>();
+    private final List<String> threads = new CopyOnWriteArrayList<>();
+
+    @Incoming("in")
+    @Blocking
+    public void consume(String s) {
+        if (s.equals("b") || s.equals("d") || s.equals("f")) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        threads.add(Thread.currentThread().getName());
+        list.add(s);
+    }
+
+    public List<String> list() {
+        return list;
+    }
+
+    public List<String> threads() {
+        return threads;
+    }
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java
new file mode 100644
index 0000000000000..81df71a8a8db0
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/blocking/beans/InfiniteSubscriber.java
@@ -0,0 +1,42 @@
+package io.quarkus.smallrye.reactivemessaging.blocking.beans;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.SubscriberBuilder;
+
+@ApplicationScoped
+public class InfiniteSubscriber {
+
+    private final List<Integer> payloads = new CopyOnWriteArrayList<>();
+    private final List<Integer> messages = new CopyOnWriteArrayList<>();
+
+    @Incoming("infinite-producer-payload")
+    public SubscriberBuilder<Integer, Void> consumeFourItems() {
+        return ReactiveStreams
+                .<Integer> builder()
+                .limit(4)
+                .forEach(payloads::add);
+    }
+
+    @Incoming("infinite-producer-msg")
+    public SubscriberBuilder<Integer, Void> consumeFourMessages() {
+        return ReactiveStreams
+                .<Integer> builder()
+                .limit(4)
+                .forEach(messages::add);
+    }
+
+    public List<Integer> payloads() {
+        return payloads;
+    }
+
+    public List<Integer> messages() {
+        return messages;
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java
new file mode 100644
index 0000000000000..f381e597bc495
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelConsumer.java
@@ -0,0 +1,35 @@
+package io.quarkus.smallrye.reactivemessaging.channels;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+
+import io.smallrye.mutiny.Multi;
+
+@ApplicationScoped
+public class ChannelConsumer {
+
+    @Inject
+    @Channel("source-channel")
+    Multi<Message<String>> sourceStream;
+
+    public List<String> consume() {
+        return sourceStream
+                .onItem().transform(Message::getPayload)
+                .collect().asList()
+                .await().indefinitely();
+    }
+
+    @Outgoing("source-channel")
+    public PublisherBuilder<String> source() {
+        return ReactiveStreams.of("hello", "with", "SmallRye", "reactive", "message");
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelEmitterWithOverflow.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java
similarity index 88%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelEmitterWithOverflow.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java
index c653a84a774d8..530d4e3a963df 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelEmitterWithOverflow.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflow.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -29,9 +29,9 @@ public void setEmitter(@Channel("sink-1") Emitter<String> sink1,
         this.emitterForSink2 = sink2;
     }
 
-    private List<String> list = new CopyOnWriteArrayList<>();
-    private List<String> sink1 = new CopyOnWriteArrayList<>();
-    private List<String> sink2 = new CopyOnWriteArrayList<>();
+    private final List<String> list = new CopyOnWriteArrayList<>();
+    private final List<String> sink1 = new CopyOnWriteArrayList<>();
+    private final List<String> sink2 = new CopyOnWriteArrayList<>();
 
     public void run() {
         emitter.send("a");
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelEmitterWithOverflowAndBroadcast.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java
similarity index 84%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelEmitterWithOverflowAndBroadcast.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java
index 87b592793c757..a1ddef78bfd8c 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/ChannelEmitterWithOverflowAndBroadcast.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/ChannelEmitterWithOverflowAndBroadcast.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -32,13 +32,13 @@ public void setEmitter(@Channel("sink-1") @Broadcast Emitter<String> sink1,
         this.emitterForSink2 = sink2;
     }
 
-    private List<String> list = new CopyOnWriteArrayList<>();
-    private List<String> sink1 = new CopyOnWriteArrayList<>();
-    private List<String> sink2 = new CopyOnWriteArrayList<>();
+    private final List<String> list = new CopyOnWriteArrayList<>();
+    private final List<String> sink1 = new CopyOnWriteArrayList<>();
+    private final List<String> sink2 = new CopyOnWriteArrayList<>();
 
-    private List<String> list2 = new CopyOnWriteArrayList<>();
-    private List<String> sink12 = new CopyOnWriteArrayList<>();
-    private List<String> sink22 = new CopyOnWriteArrayList<>();
+    private final List<String> list2 = new CopyOnWriteArrayList<>();
+    private final List<String> sink12 = new CopyOnWriteArrayList<>();
+    private final List<String> sink22 = new CopyOnWriteArrayList<>();
 
     public void run() {
         emitter.send("a");
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java
new file mode 100644
index 0000000000000..c0280c56bfbd4
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedChannelConsumer.java
@@ -0,0 +1,36 @@
+package io.quarkus.smallrye.reactivemessaging.channels;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.reactivestreams.Publisher;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.reactive.messaging.annotations.Channel;
+
+@ApplicationScoped
+public class DeprecatedChannelConsumer {
+
+    @Inject
+    @Channel("source-channel")
+    Publisher<Message<String>> sourceStream;
+
+    public List<String> consume() {
+        return Multi.createFrom().publisher(sourceStream)
+                .onItem().transform(Message::getPayload)
+                .collect().asList()
+                .await().indefinitely();
+    }
+
+    @Outgoing("source-channel")
+    public PublisherBuilder<String> source() {
+        return ReactiveStreams.of("hello", "with", "SmallRye", "reactive", "message");
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedEmitterExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java
similarity index 93%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedEmitterExample.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java
index 37cc2168c7274..c7f3163ca0ab1 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedEmitterExample.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedEmitterExample.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java
similarity index 93%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedInjectionTest.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java
index f6674e95e2538..8b901ae61d998 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/DeprecatedInjectionTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/DeprecatedInjectionTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.smallrye.reactivemessaging.SimpleBean;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class DeprecatedInjectionTest {
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java
similarity index 85%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterExample.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java
index c538f7d2ea40f..196ba75ef1d45 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterExample.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterExample.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -17,7 +17,7 @@ public class EmitterExample {
     @Channel("sink")
     Emitter<String> emitter;
 
-    private List<String> list = new CopyOnWriteArrayList<>();
+    private final List<String> list = new CopyOnWriteArrayList<>();
 
     public void run() {
         emitter.send("a");
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastAndSubscriberExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java
similarity index 95%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastAndSubscriberExample.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java
index f6e268d74c8d7..d4fa3f9edc95f 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastAndSubscriberExample.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberExample.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastAndSubscriberTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java
similarity index 95%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastAndSubscriberTest.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java
index 0d37dc879bf0b..cfdfd83f0504e 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastAndSubscriberTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastAndSubscriberTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastExample.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java
similarity index 95%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastExample.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java
index 2400c889b61cc..d1b393d14d80f 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastExample.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastExample.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java
similarity index 95%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastTest.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java
index 12961ac1b37db..1bf08e163836e 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithBroadcastTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithBroadcastTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithOverflowAndBroadcastTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java
similarity index 97%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithOverflowAndBroadcastTest.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java
index f5c6e86c30df0..eb719a44f7a83 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithOverflowAndBroadcastTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowAndBroadcastTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithOverflowTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java
similarity index 96%
rename from extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithOverflowTest.java
rename to extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java
index 229eb5540d05d..b155570f43c21 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/EmitterWithOverflowTest.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/EmitterWithOverflowTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging;
+package io.quarkus.smallrye.reactivemessaging.channels;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java
new file mode 100644
index 0000000000000..c613ce19d714a
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.smallrye.reactivemessaging.channels;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.reactive.messaging.MutinyEmitter;
+
+public class MutinyEmitterTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MutinyEmitterExample.class));
+
+    @Inject
+    MutinyEmitterExample example;
+
+    @Test
+    public void testMutinyEmitter() {
+        example.run();
+        List<String> list = example.list();
+        assertEquals(4, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+        assertEquals("c", list.get(2));
+        assertEquals("d", list.get(3));
+    }
+
+    @ApplicationScoped
+    public static class MutinyEmitterExample {
+
+        @Inject
+        @Channel("sink")
+        MutinyEmitter<String> emitter;
+
+        private final List<String> list = new CopyOnWriteArrayList<>();
+
+        public void run() {
+            // Payloads
+            emitter.send("a").await().atMost(Duration.ofSeconds(1));
+            emitter.sendAndForget("b");
+            emitter.sendAndAwait("c");
+
+            // Message
+            emitter.send(Message.of("d"));
+
+            emitter.complete();
+        }
+
+        @Incoming("sink")
+        public void consume(String s) {
+            list.add(s);
+        }
+
+        public List<String> list() {
+            return list;
+        }
+
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java
new file mode 100644
index 0000000000000..56dd8d146ba28
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithConstructorInjectionTest.java
@@ -0,0 +1,83 @@
+package io.quarkus.smallrye.reactivemessaging.channels;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.reactive.messaging.MutinyEmitter;
+import io.vertx.core.Vertx;
+
+public class MutinyEmitterWithConstructorInjectionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MutinyEmitterExampleWithConstructorInjection.class));
+
+    @Inject
+    MutinyEmitterExampleWithConstructorInjection example;
+
+    @Test
+    public void testMutinyEmitter() {
+        example.run();
+        List<String> list = example.list();
+        assertEquals(4, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+        assertEquals("c", list.get(2));
+        assertEquals("d", list.get(3));
+    }
+
+    @ApplicationScoped
+    public static class MutinyEmitterExampleWithConstructorInjection {
+
+        MutinyEmitter<String> emitter;
+
+        @SuppressWarnings("unused")
+        @Inject
+        public MutinyEmitterExampleWithConstructorInjection(
+                Vertx vertx, // Not used on purpose
+                @Channel("sink") MutinyEmitter<String> e) {
+            emitter = e;
+        }
+
+        private final List<String> list = new CopyOnWriteArrayList<>();
+
+        public void run() {
+            // Payloads
+            emitter.send("a").await().atMost(Duration.ofSeconds(1));
+            emitter.sendAndForget("b");
+            emitter.sendAndAwait("c");
+
+            // Message
+            emitter.send(Message.of("d"));
+
+            emitter.complete();
+        }
+
+        @Incoming("sink")
+        public void consume(String s) {
+            list.add(s);
+        }
+
+        public List<String> list() {
+            return list;
+        }
+
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java
new file mode 100644
index 0000000000000..6b7e7e76ad4ed
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/channels/MutinyEmitterWithParameterInjectionTest.java
@@ -0,0 +1,83 @@
+package io.quarkus.smallrye.reactivemessaging.channels;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.reactive.messaging.MutinyEmitter;
+import io.vertx.core.Vertx;
+
+public class MutinyEmitterWithParameterInjectionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MutinyEmitterExampleWithParameterInjection.class));
+
+    @Inject
+    MutinyEmitterExampleWithParameterInjection example;
+
+    @Test
+    public void testMutinyEmitter() {
+        example.run();
+        List<String> list = example.list();
+        assertEquals(4, list.size());
+        assertEquals("a", list.get(0));
+        assertEquals("b", list.get(1));
+        assertEquals("c", list.get(2));
+        assertEquals("d", list.get(3));
+    }
+
+    @ApplicationScoped
+    public static class MutinyEmitterExampleWithParameterInjection {
+
+        MutinyEmitter<String> emitter;
+
+        @SuppressWarnings("unused")
+        @Inject
+        public void inject(
+                Vertx vertx, // Not used on purpose
+                @Channel("sink") MutinyEmitter<String> e) {
+            emitter = e;
+        }
+
+        private final List<String> list = new CopyOnWriteArrayList<>();
+
+        public void run() {
+            // Payloads
+            emitter.send("a").await().atMost(Duration.ofSeconds(1));
+            emitter.sendAndForget("b");
+            emitter.sendAndAwait("c");
+
+            // Message
+            emitter.send(Message.of("d"));
+
+            emitter.complete();
+        }
+
+        @Incoming("sink")
+        public void consume(String s) {
+            list.add(s);
+        }
+
+        public List<String> list() {
+            return list;
+        }
+
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java
new file mode 100644
index 0000000000000..0d21803894fc7
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/converters/ConverterTest.java
@@ -0,0 +1,88 @@
+package io.quarkus.smallrye.reactivemessaging.converters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.reactive.messaging.MessageConverter;
+
+public class ConverterTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Person.class, MyAppUsingConverter.class, MyPersonConverter.class));
+
+    @Inject
+    MyAppUsingConverter app;
+
+    @Test
+    public void testConverter() {
+        assertThat(app.list()).hasSize(4);
+        assertThat(app.list().stream().map(new Function<Person, String>() {
+            @Override
+            public String apply(Person p) {
+                return p.name;
+            }
+        }).collect(Collectors.toList()))
+                .containsExactly("john", "paul", "ringo", "george");
+    }
+
+    public static class Person {
+        public final String name;
+
+        public Person(String name) {
+            this.name = name;
+        }
+    }
+
+    @ApplicationScoped
+    public static class MyAppUsingConverter {
+        List<Person> list = new ArrayList<>();
+
+        @Outgoing("people")
+        public Multi<String> getPeople() {
+            return Multi.createFrom().items("john", "paul", "ringo", "george");
+        }
+
+        @Incoming("people")
+        public void consume(Person p) {
+            list.add(p);
+        }
+
+        public List<Person> list() {
+            return list;
+        }
+    }
+
+    @ApplicationScoped
+    public static class MyPersonConverter implements MessageConverter {
+
+        @Override
+        public boolean canConvert(Message<?> in, Type target) {
+            return target.equals(Person.class) && in.getPayload().getClass().equals(String.class);
+        }
+
+        @Override
+        public Message<?> convert(Message<?> in, Type target) {
+            return in.withPayload(new Person((String) in.getPayload()));
+        }
+    }
+}
diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java
index cfb07a6a4376e..cddf04eddf867 100644
--- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java
+++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/hotreload/SomeSource.java
@@ -1,18 +1,25 @@
 package io.quarkus.smallrye.reactivemessaging.hotreload;
 
+import java.util.function.Function;
+
 import javax.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 
-import io.reactivex.Flowable;
+import io.smallrye.mutiny.Multi;
 
 @ApplicationScoped
 public class SomeSource {
 
     @Outgoing("my-source")
-    public Flowable<Integer> source() {
-        return Flowable.just(0, 1, 2, 3, 4, 5, 6, 7, 8)
-                .map(l -> l + 1);
+    public Multi<Integer> source() {
+        return Multi.createFrom().items(0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .map(new Function<Integer, Integer>() {
+                    @Override
+                    public Integer apply(Integer l) {
+                        return l + 1;
+                    }
+                });
     }
 
 }
diff --git a/extensions/smallrye-reactive-messaging/pom.xml b/extensions/smallrye-reactive-messaging/pom.xml
index 5a343eaffd0f4..10003767fc13c 100644
--- a/extensions/smallrye-reactive-messaging/pom.xml
+++ b/extensions/smallrye-reactive-messaging/pom.xml
@@ -3,10 +3,10 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-build-parent</artifactId>
+      <artifactId>quarkus-extensions-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
-      <relativePath>../../build-parent/pom.xml</relativePath>
+      <relativePath>../pom.xml</relativePath>
    </parent>
 
    <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/smallrye-reactive-messaging/runtime/pom.xml b/extensions/smallrye-reactive-messaging/runtime/pom.xml
index 79bc05b9d26d7..b6a3082d21630 100644
--- a/extensions/smallrye-reactive-messaging/runtime/pom.xml
+++ b/extensions/smallrye-reactive-messaging/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-smallrye-reactive-messaging-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>quarkus-smallrye-reactive-messaging</artifactId>
@@ -21,10 +20,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny-reactive-streams-operators</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx</artifactId>
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java
index e0e73b4e43a4a..a714b86e1b9e1 100644
--- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/QuarkusMediatorConfiguration.java
@@ -1,6 +1,7 @@
 package io.quarkus.smallrye.reactivemessaging.runtime;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,6 +51,8 @@ public class QuarkusMediatorConfiguration implements MediatorConfiguration {
 
     private String workerPoolName;
 
+    private Type ingestedPayload;
+
     public String getBeanId() {
         return beanId;
     }
@@ -194,13 +197,27 @@ public Class<? extends Invoker> getInvokerClass() {
         return invokerClass;
     }
 
+    @Override
+    public Type getIngestedPayloadType() {
+        return ingestedPayload;
+    }
+
+    public void setIngestedPayloadType(Type ingestedPayload) {
+        this.ingestedPayload = ingestedPayload;
+    }
+
     public void setInvokerClass(Class<? extends Invoker> invokerClass) {
         this.invokerClass = invokerClass;
     }
 
     @Override
     public String methodAsString() {
-        return getBean().getBeanClass().getName() + "#" + getMethodName();
+        if (Arc.container() != null) {
+            return getBean().getBeanClass().getName() + "#" + getMethodName();
+        } else {
+            return getMethodName();
+        }
+
     }
 
     @Override
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java
index 99637d216d59a..d2921610bf9af 100644
--- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java
@@ -8,7 +8,7 @@
 public class ReactiveMessagingConfiguration {
 
     /**
-     * Whether or not Reactive Messaging metrics are published in case the smallrye-metrics extension is present
+     * Whether or not Reactive Messaging metrics are published in case a metrics extension is present
      * (default to false).
      */
     @ConfigItem(name = "metrics.enabled")
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java
index fa7bc048a0f77..787b8871f5f39 100644
--- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java
@@ -1,12 +1,17 @@
 package io.quarkus.smallrye.reactivemessaging.runtime;
 
 import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Dependent;
+import javax.enterprise.context.Initialized;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.DeploymentException;
 import javax.inject.Inject;
+import javax.interceptor.Interceptor;
 
 import io.quarkus.runtime.StartupEvent;
+import io.smallrye.reactive.messaging.extension.ChannelConfiguration;
+import io.smallrye.reactive.messaging.extension.EmitterConfiguration;
 import io.smallrye.reactive.messaging.extension.MediatorManager;
 
 @Dependent
@@ -15,10 +20,28 @@ public class SmallRyeReactiveMessagingLifecycle {
     @Inject
     MediatorManager mediatorManager;
 
-    void onApplicationStart(@Observes @Priority(javax.interceptor.Interceptor.Priority.LIBRARY_BEFORE) StartupEvent event) {
+    void onStaticInit(@Observes @Initialized(ApplicationScoped.class) Object event,
+            SmallRyeReactiveMessagingRecorder.SmallRyeReactiveMessagingContext context,
+            QuarkusWorkerPoolRegistry workerPoolRegistry) {
+        mediatorManager.addAnalyzed(context.getMediatorConfigurations());
+        for (WorkerConfiguration worker : context.getWorkerConfigurations()) {
+            workerPoolRegistry.defineWorker(worker.getClassName(), worker.getMethodName(), worker.getPoolName());
+        }
+        for (EmitterConfiguration emitter : context.getEmitterConfigurations()) {
+            mediatorManager.addEmitter(emitter);
+        }
+        for (ChannelConfiguration channel : context.getChannelConfigurations()) {
+            mediatorManager.addChannel(channel);
+        }
+    }
+
+    void onApplicationStart(@Observes @Priority(Interceptor.Priority.LIBRARY_BEFORE) StartupEvent event) {
         try {
-            mediatorManager.initializeAndRun();
+            mediatorManager.start();
         } catch (Exception e) {
+            if (e instanceof DeploymentException) {
+                throw e;
+            }
             throw new DeploymentException(e);
         }
     }
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingRecorder.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingRecorder.java
index e590e99dd0658..98bbe0e448c61 100644
--- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingRecorder.java
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingRecorder.java
@@ -1,30 +1,57 @@
 package io.quarkus.smallrye.reactivemessaging.runtime;
 
 import java.util.List;
+import java.util.function.Supplier;
 
-import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.annotations.Recorder;
+import io.smallrye.reactive.messaging.extension.ChannelConfiguration;
 import io.smallrye.reactive.messaging.extension.EmitterConfiguration;
-import io.smallrye.reactive.messaging.extension.MediatorManager;
 
-/**
- * @author Martin Kouba
- */
 @Recorder
 public class SmallRyeReactiveMessagingRecorder {
 
-    public void configureEmitter(BeanContainer container, EmitterConfiguration ec, long defaultBufferSize) {
-        MediatorManager mediatorManager = container.instance(MediatorManager.class);
-        mediatorManager.initializeEmitter(ec, defaultBufferSize);
-    }
+    public Supplier<Object> createContext(List<QuarkusMediatorConfiguration> mediatorConfigurations,
+            List<WorkerConfiguration> workerConfigurations, List<EmitterConfiguration> emitterConfigurations,
+            List<ChannelConfiguration> channelConfigurations) {
+        return new Supplier<Object>() {
+
+            @Override
+            public Object get() {
+                return new SmallRyeReactiveMessagingContext() {
+
+                    @Override
+                    public List<WorkerConfiguration> getWorkerConfigurations() {
+                        return workerConfigurations;
+                    }
+
+                    @Override
+                    public List<QuarkusMediatorConfiguration> getMediatorConfigurations() {
+                        return mediatorConfigurations;
+                    }
+
+                    @Override
+                    public List<EmitterConfiguration> getEmitterConfigurations() {
+                        return emitterConfigurations;
+                    }
 
-    public void registerMediators(List<QuarkusMediatorConfiguration> configurations, BeanContainer container) {
-        MediatorManager mediatorManager = container.instance(MediatorManager.class);
-        mediatorManager.addAnalyzed(configurations);
+                    @Override
+                    public List<ChannelConfiguration> getChannelConfigurations() {
+                        return channelConfigurations;
+                    }
+                };
+            }
+        };
     }
 
-    public void configureWorkerPool(BeanContainer container, String className, String name, String poolName) {
-        QuarkusWorkerPoolRegistry registry = container.instance(QuarkusWorkerPoolRegistry.class);
-        registry.defineWorker(className, name, poolName);
+    public interface SmallRyeReactiveMessagingContext {
+
+        List<EmitterConfiguration> getEmitterConfigurations();
+
+        List<ChannelConfiguration> getChannelConfigurations();
+
+        List<QuarkusMediatorConfiguration> getMediatorConfigurations();
+
+        List<WorkerConfiguration> getWorkerConfigurations();
+
     }
 }
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/WorkerConfiguration.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/WorkerConfiguration.java
new file mode 100644
index 0000000000000..854bb1d09c49f
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/WorkerConfiguration.java
@@ -0,0 +1,44 @@
+package io.quarkus.smallrye.reactivemessaging.runtime;
+
+public class WorkerConfiguration {
+
+    private String className;
+
+    private String methodName;
+
+    private String poolName;
+
+    public WorkerConfiguration() {
+    }
+
+    public WorkerConfiguration(String className, String name, String poolName) {
+        this.className = className;
+        this.methodName = name;
+        this.poolName = poolName;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+
+    public String getPoolName() {
+        return poolName;
+    }
+
+    public void setPoolName(String poolName) {
+        this.poolName = poolName;
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java
new file mode 100644
index 0000000000000..84beb0402fd86
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/Connectors.java
@@ -0,0 +1,102 @@
+package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.config.Config;
+
+import io.quarkus.runtime.StartupEvent;
+import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevReactiveMessagingInfos.Component;
+import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevReactiveMessagingInfos.ComponentType;
+
+// we use a separate component due to weird class loading issues that occur when accessing config properties 
+@Singleton
+public class Connectors {
+
+    final Map<String, Component> incomingConnectors;
+    final Map<String, Component> outgoingConnectors;
+
+    public Connectors() {
+        incomingConnectors = new HashMap<>();
+        outgoingConnectors = new HashMap<>();
+    }
+
+    void collect(@Observes StartupEvent event, Config config) {
+
+        String outgoingPrefix = "mp.messaging.outgoing.";
+        String incomingPrefix = "mp.messaging.incoming.";
+        String connectorSuffix = ".connector";
+
+        List<String> sourceConnectorsProperties = new ArrayList<>();
+        List<String> sinkConnectorsProperties = new ArrayList<>();
+
+        for (String propertyName : config.getPropertyNames()) {
+            if (propertyName.startsWith(outgoingPrefix) && propertyName.endsWith(connectorSuffix)) {
+                sinkConnectorsProperties.add(propertyName);
+            } else if (propertyName.startsWith(incomingPrefix) && propertyName.endsWith(connectorSuffix)) {
+                sourceConnectorsProperties.add(propertyName);
+            }
+        }
+
+        for (String sink : sinkConnectorsProperties) {
+            String connector = config.getValue(sink, String.class);
+            String channel = sink.substring(outgoingPrefix.length(), sink.length() - connectorSuffix.length());
+            StringBuilder desc = new StringBuilder();
+            desc.append(connector);
+            desc.append("<ul>");
+            desc.append("<li>Config property: ");
+            desc.append(DevReactiveMessagingInfos.asCode(sink.substring(0, sink.length() - connectorSuffix.length())));
+            desc.append("</li>");
+            for (Entry<String, String> entry : getProperties(config, connectorSuffix, sink).entrySet()) {
+                desc.append("<li>");
+                desc.append(entry.getKey());
+                desc.append("=");
+                desc.append(entry.getValue());
+                desc.append("</li>");
+            }
+            desc.append("</ul>");
+            incomingConnectors.put(channel,
+                    new Component(ComponentType.CONNECTOR, desc.toString()));
+        }
+
+        for (String source : sourceConnectorsProperties) {
+            String connector = config.getValue(source, String.class);
+            String channel = source.substring(incomingPrefix.length(), source.length() - connectorSuffix.length());
+            StringBuilder desc = new StringBuilder();
+            desc.append(connector);
+            desc.append("<ul>");
+            desc.append("<li>Config property: ");
+            desc.append(DevReactiveMessagingInfos.asCode(source.substring(0, source.length() - connectorSuffix.length())));
+            desc.append("</li>");
+            for (Entry<String, String> entry : getProperties(config, connectorSuffix, source).entrySet()) {
+                desc.append("<li>");
+                desc.append(entry.getKey());
+                desc.append("=");
+                desc.append(entry.getValue());
+                desc.append("</li>");
+            }
+            desc.append("</ul>");
+            outgoingConnectors.put(channel,
+                    new Component(ComponentType.CONNECTOR, desc.toString()));
+        }
+    }
+
+    private Map<String, String> getProperties(Config config, String connectorSuffix, String connectorPropertyName) {
+        Map<String, String> properties = new HashMap<>();
+        String prefix = connectorPropertyName.substring(0, connectorPropertyName.length() - connectorSuffix.length());
+        for (String propertyName : config.getPropertyNames()) {
+            if (propertyName.startsWith(prefix) && !propertyName.equals(connectorPropertyName)) {
+                properties.put(propertyName.substring(prefix.length() + 1, propertyName.length()),
+                        config.getValue(propertyName, String.class));
+            }
+        }
+        return properties;
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevConsoleRecorder.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevConsoleRecorder.java
new file mode 100644
index 0000000000000..ac5363b9cb5c7
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevConsoleRecorder.java
@@ -0,0 +1,19 @@
+package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class DevConsoleRecorder {
+
+    static final Map<String, String> EMITTERS = new HashMap<>();
+    static final Map<String, String> CHANNELS = new HashMap<>();
+
+    public void setInjectionInfo(Map<String, String> emitters, Map<String, String> channels) {
+        EMITTERS.putAll(emitters);
+        CHANNELS.putAll(channels);
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfos.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfos.java
new file mode 100644
index 0000000000000..dfadf7e9be33f
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfos.java
@@ -0,0 +1,194 @@
+package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.impl.LazyValue;
+import io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingRecorder.SmallRyeReactiveMessagingContext;
+import io.smallrye.reactive.messaging.MediatorConfiguration;
+import io.smallrye.reactive.messaging.extension.ChannelConfiguration;
+import io.smallrye.reactive.messaging.extension.EmitterConfiguration;
+
+public class DevReactiveMessagingInfos {
+
+    // We must use a lazy value because MediatorManager is initialized when the app starts 
+    private final LazyValue<List<DevChannelInfo>> channels;
+
+    public DevReactiveMessagingInfos() {
+        this.channels = new LazyValue<>(new Supplier<List<DevChannelInfo>>() {
+
+            @Override
+            public List<DevChannelInfo> get() {
+                ArcContainer container = Arc.container();
+                SmallRyeReactiveMessagingContext context = container.instance(SmallRyeReactiveMessagingContext.class)
+                        .get();
+
+                // collect all channels
+                Map<String, Component> publishers = new HashMap<>();
+                Map<String, List<Component>> consumers = new HashMap<>();
+                Function<String, List<Component>> fun = e -> new ArrayList<>();
+
+                // Unfortunately, there is no easy way to obtain the connectors metadata
+                Connectors connectors = container.instance(Connectors.class).get();
+                for (Entry<String, Component> entry : connectors.outgoingConnectors.entrySet()) {
+                    publishers.put(entry.getKey(), entry.getValue());
+                }
+                for (Entry<String, Component> entry : connectors.incomingConnectors.entrySet()) {
+                    consumers.computeIfAbsent(entry.getKey(), fun)
+                            .add(entry.getValue());
+                }
+
+                for (EmitterConfiguration emitter : context.getEmitterConfigurations()) {
+                    publishers.put(emitter.name,
+                            new Component(ComponentType.EMITTER,
+                                    emitter.broadcast ? "<span class=\"annotation\">&#64;Broadcast</span> "
+                                            : "" + asCode(DevConsoleRecorder.EMITTERS.get(emitter.name))));
+                }
+                for (ChannelConfiguration channel : context.getChannelConfigurations()) {
+                    consumers.computeIfAbsent(channel.channelName, fun)
+                            .add(new Component(ComponentType.CHANNEL,
+                                    asCode(DevConsoleRecorder.CHANNELS.get(channel.channelName))));
+                }
+                for (MediatorConfiguration mediator : context.getMediatorConfigurations()) {
+                    boolean isProcessor = !mediator.getIncoming().isEmpty() && mediator.getOutgoing() != null;
+                    if (isProcessor) {
+                        publishers.put(mediator.getOutgoing(),
+                                new Component(ComponentType.PROCESSOR, asMethod(mediator.methodAsString())));
+                        for (String incoming : mediator.getIncoming()) {
+                            consumers.computeIfAbsent(incoming, fun)
+                                    .add(new Component(ComponentType.PROCESSOR,
+                                            asMethod(mediator.methodAsString())));
+                        }
+                    } else if (mediator.getOutgoing() != null) {
+                        StringBuilder builder = new StringBuilder();
+                        builder.append(asMethod(mediator.methodAsString()));
+                        if (mediator.getBroadcast()) {
+                            builder.append("[broadcast: true]");
+                        }
+                        publishers.put(mediator.getOutgoing(),
+                                new Component(ComponentType.PUBLISHER, builder.toString()));
+                    } else if (!mediator.getIncoming().isEmpty()) {
+                        for (String incoming : mediator.getIncoming()) {
+                            consumers.computeIfAbsent(incoming, fun)
+                                    .add(new Component(ComponentType.SUBSCRIBER,
+                                            asMethod(mediator.methodAsString())));
+                        }
+                    }
+                }
+
+                Set<String> channels = new HashSet<>();
+                channels.addAll(publishers.keySet());
+                channels.addAll(consumers.keySet());
+
+                List<DevChannelInfo> infos = new ArrayList<>();
+                for (String channel : channels) {
+                    infos.add(new DevChannelInfo(channel, publishers.get(channel), consumers.get(channel)));
+                }
+                Collections.sort(infos);
+                return infos;
+            }
+        });
+    }
+
+    static String asMethod(String value) {
+        return asCode(value + "()");
+    }
+
+    static String asCode(String value) {
+        return "<code>" + value + "</code>";
+    }
+
+    public List<DevChannelInfo> getChannels() {
+        return channels.get();
+    }
+
+    public static class DevChannelInfo implements Comparable<DevChannelInfo> {
+
+        private final String name;
+        private final Component publisher;
+        private final List<Component> consumers;
+
+        public DevChannelInfo(String name, Component publisher, List<Component> consumers) {
+            this.name = name;
+            this.publisher = publisher;
+            this.consumers = consumers != null ? consumers : Collections.emptyList();
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Component getPublisher() {
+            return publisher;
+        }
+
+        public List<Component> getConsumers() {
+            return consumers;
+        }
+
+        @Override
+        public int compareTo(DevChannelInfo other) {
+            if (publisher != other.publisher) {
+                if (other.publisher == null) {
+                    return -1;
+                }
+                if (publisher == null) {
+                    return 1;
+                }
+                // publisher connectors first
+                if (publisher.type != other.publisher.type) {
+                    return publisher.type == ComponentType.CONNECTOR ? -1 : 1;
+                }
+            }
+            // consumer connectors last
+            long consumerConnetors = consumers.stream().filter(Component::isConnector).count();
+            long otherConsumersConnectors = other.consumers.stream().filter(Component::isConnector).count();
+            if (consumerConnetors != otherConsumersConnectors) {
+                return Long.compare(otherConsumersConnectors, consumerConnetors);
+            }
+            if (publisher != other.publisher && publisher.type == ComponentType.CONNECTOR
+                    && other.publisher.type != ComponentType.CONNECTOR) {
+                return 1;
+            }
+            // alphabetically
+            return name.compareTo(other.name);
+        }
+
+    }
+
+    public static class Component {
+
+        public final ComponentType type;
+        public final String description;
+
+        public Component(ComponentType type, String description) {
+            this.type = type;
+            this.description = description;
+        }
+
+        boolean isConnector() {
+            return type == ComponentType.CONNECTOR;
+        }
+
+    }
+
+    public enum ComponentType {
+        CONNECTOR,
+        PROCESSOR,
+        PUBLISHER,
+        EMITTER,
+        CHANNEL,
+        SUBSCRIBER,
+    }
+
+}
diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfosSupplier.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfosSupplier.java
new file mode 100644
index 0000000000000..2ae717f634c93
--- /dev/null
+++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfosSupplier.java
@@ -0,0 +1,12 @@
+package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+
+import java.util.function.Supplier;
+
+public class DevReactiveMessagingInfosSupplier implements Supplier<DevReactiveMessagingInfos> {
+
+    @Override
+    public DevReactiveMessagingInfos get() {
+        return new DevReactiveMessagingInfos();
+    }
+
+}
diff --git a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesProcessor.java b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesProcessor.java
index e2f475ef4c963..0a208b187cb3b 100644
--- a/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesProcessor.java
+++ b/extensions/spring-boot-properties/deployment/src/main/java/io/quarkus/spring/boot/properties/deployment/ConfigurationPropertiesProcessor.java
@@ -6,6 +6,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import io.quarkus.arc.config.ConfigProperties;
+import io.quarkus.arc.deployment.ArcConfig;
 import io.quarkus.arc.deployment.configproperties.ConfigPropertiesMetadataBuildItem;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -15,8 +16,7 @@
 
 public class ConfigurationPropertiesProcessor {
 
-    private static final DotName CONFIGURATION_PROPERTIES_ANNOTATION = DotName
-            .createSimple(ConfigurationProperties.class.getName());
+    private static final DotName CONFIGURATION_PROPERTIES = DotName.createSimple(ConfigurationProperties.class.getName());
 
     @BuildStep
     public FeatureBuildItem registerFeature() {
@@ -24,35 +24,39 @@ public FeatureBuildItem registerFeature() {
     }
 
     @BuildStep
-    public void produceConfigPropertiesMetadata(CombinedIndexBuildItem combinedIndex,
+    public void produceConfigPropertiesMetadata(CombinedIndexBuildItem combinedIndex, ArcConfig arcConfig,
             BuildProducer<ConfigPropertiesMetadataBuildItem> configPropertiesMetadataProducer) {
-        combinedIndex.getIndex()
-                .getAnnotations(CONFIGURATION_PROPERTIES_ANNOTATION)
-                .stream()
-                .map(annotation -> createConfigPropertiesMetadata(annotation, combinedIndex.getIndex()))
-                .forEach(configPropertiesMetadataProducer::produce);
+        ConfigProperties.NamingStrategy namingStrategy = arcConfig.configPropertiesDefaultNamingStrategy;
+        for (AnnotationInstance annotation : combinedIndex.getIndex().getAnnotations(CONFIGURATION_PROPERTIES)) {
+            configPropertiesMetadataProducer.produce(
+                    createConfigPropertiesMetadata(annotation, combinedIndex.getIndex(), namingStrategy));
+        }
     }
 
-    private ConfigPropertiesMetadataBuildItem createConfigPropertiesMetadata(AnnotationInstance annotation, IndexView index) {
+    private ConfigPropertiesMetadataBuildItem createConfigPropertiesMetadata(AnnotationInstance annotation,
+            IndexView index, ConfigProperties.NamingStrategy namingStrategy) {
         switch (annotation.target().kind()) {
             case CLASS:
-                return createConfigPropertiesMetadataFromClass(annotation);
+                return createConfigPropertiesMetadataFromClass(annotation, namingStrategy);
             case METHOD:
-                return createConfigPropertiesMetadataFromMethod(annotation, index);
+                return createConfigPropertiesMetadataFromMethod(annotation, index, namingStrategy);
             default:
-                throw new IllegalArgumentException("Unsupported annotation target kind " + annotation.target().kind().name());
+                throw new IllegalArgumentException(
+                        "Unsupported annotation target kind " + annotation.target().kind().name());
         }
     }
 
-    private ConfigPropertiesMetadataBuildItem createConfigPropertiesMetadataFromClass(AnnotationInstance annotation) {
+    private ConfigPropertiesMetadataBuildItem createConfigPropertiesMetadataFromClass(AnnotationInstance annotation,
+            ConfigProperties.NamingStrategy namingStrategy) {
         return new ConfigPropertiesMetadataBuildItem(annotation.target().asClass(), getPrefix(annotation),
-                ConfigProperties.NamingStrategy.VERBATIM, true, false);
+                namingStrategy, true, false);
     }
 
     private ConfigPropertiesMetadataBuildItem createConfigPropertiesMetadataFromMethod(AnnotationInstance annotation,
-            IndexView index) {
-        return new ConfigPropertiesMetadataBuildItem(index.getClassByName(annotation.target().asMethod().returnType().name()),
-                getPrefix(annotation), ConfigProperties.NamingStrategy.VERBATIM, true, false);
+            IndexView index, ConfigProperties.NamingStrategy namingStrategy) {
+        return new ConfigPropertiesMetadataBuildItem(
+                index.getClassByName(annotation.target().asMethod().returnType().name()), getPrefix(annotation),
+                namingStrategy, true, false);
     }
 
     private String getPrefix(AnnotationInstance annotation) {
diff --git a/extensions/spring-boot-properties/pom.xml b/extensions/spring-boot-properties/pom.xml
index 8546e9bf55601..e3500dea8accb 100644
--- a/extensions/spring-boot-properties/pom.xml
+++ b/extensions/spring-boot-properties/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-boot-properties/runtime/pom.xml b/extensions/spring-boot-properties/runtime/pom.xml
index 5d3d0df380da4..00307bcc1de04 100644
--- a/extensions/spring-boot-properties/runtime/pom.xml
+++ b/extensions/spring-boot-properties/runtime/pom.xml
@@ -22,6 +22,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-core-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/spring-cache/deployment/src/main/java/io/quarkus/spring/cache/SpringCacheAnnotationsTransformer.java b/extensions/spring-cache/deployment/src/main/java/io/quarkus/spring/cache/SpringCacheAnnotationsTransformer.java
index 40bcb5872fa8c..b6bb65d28f961 100644
--- a/extensions/spring-cache/deployment/src/main/java/io/quarkus/spring/cache/SpringCacheAnnotationsTransformer.java
+++ b/extensions/spring-cache/deployment/src/main/java/io/quarkus/spring/cache/SpringCacheAnnotationsTransformer.java
@@ -15,21 +15,21 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.processor.AnnotationsTransformer;
+import io.quarkus.cache.CacheInvalidate;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheResult;
 import io.quarkus.cache.deployment.CacheDeploymentConstants;
-import io.quarkus.cache.runtime.CacheInvalidateAllInterceptorBinding;
-import io.quarkus.cache.runtime.CacheInvalidateInterceptorBinding;
-import io.quarkus.cache.runtime.CacheResultInterceptorBinding;
 
 public class SpringCacheAnnotationsTransformer implements AnnotationsTransformer {
 
     private static final Logger LOGGER = Logger.getLogger(SpringCacheAnnotationsTransformer.class);
 
     private static final DotName CACHE_RESULT_INTERCEPTOR_BINDING = DotName
-            .createSimple(CacheResultInterceptorBinding.class.getName());
+            .createSimple(CacheResult.class.getName());
     private static final DotName CACHE_INVALIDATE_INTERCEPTOR_BINDING = DotName
-            .createSimple(CacheInvalidateInterceptorBinding.class.getName());
+            .createSimple(CacheInvalidate.class.getName());
     private static final DotName CACHE_INVALIDATE_ALL_INTERCEPTOR_BINDING = DotName
-            .createSimple(CacheInvalidateAllInterceptorBinding.class.getName());
+            .createSimple(CacheInvalidateAll.class.getName());
 
     @Override
     public boolean appliesTo(AnnotationTarget.Kind kind) {
diff --git a/extensions/spring-cache/pom.xml b/extensions/spring-cache/pom.xml
index cc0b2de6b1308..8a8df385e7f58 100644
--- a/extensions/spring-cache/pom.xml
+++ b/extensions/spring-cache/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-cloud-config-client/deployment/pom.xml b/extensions/spring-cloud-config-client/deployment/pom.xml
index b9b66e07f1ba9..9375e3b285b2a 100644
--- a/extensions/spring-cloud-config-client/deployment/pom.xml
+++ b/extensions/spring-cloud-config-client/deployment/pom.xml
@@ -21,6 +21,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-cloud-config-client</artifactId>
diff --git a/extensions/spring-cloud-config-client/pom.xml b/extensions/spring-cloud-config-client/pom.xml
index bd9fbe4a5b908..f00cf81b4d015 100644
--- a/extensions/spring-cloud-config-client/pom.xml
+++ b/extensions/spring-cloud-config-client/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-cloud-config-client/runtime/pom.xml b/extensions/spring-cloud-config-client/runtime/pom.xml
index 5350c17e2be4a..f84cb85e5b547 100644
--- a/extensions/spring-cloud-config-client/runtime/pom.xml
+++ b/extensions/spring-cloud-config-client/runtime/pom.xml
@@ -19,14 +19,16 @@
             <artifactId>quarkus-arc</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
@@ -47,6 +49,12 @@
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
@@ -63,6 +71,10 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/DefaultSpringCloudConfigClientGateway.java b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/DefaultSpringCloudConfigClientGateway.java
deleted file mode 100644
index 12bc0949b9025..0000000000000
--- a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/DefaultSpringCloudConfigClientGateway.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package io.quarkus.spring.cloud.config.client.runtime;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-class DefaultSpringCloudConfigClientGateway implements SpringCloudConfigClientGateway {
-
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-    private final SpringCloudConfigClientConfig springCloudConfigClientConfig;
-    private final URI baseURI;
-
-    public DefaultSpringCloudConfigClientGateway(SpringCloudConfigClientConfig springCloudConfigClientConfig) {
-        this.springCloudConfigClientConfig = springCloudConfigClientConfig;
-        try {
-            this.baseURI = determineBaseUri(springCloudConfigClientConfig);
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException("Value: '" + springCloudConfigClientConfig.url
-                    + "' of property 'quarkus.spring-cloud-config.url' is invalid", e);
-        }
-    }
-
-    private URI determineBaseUri(SpringCloudConfigClientConfig springCloudConfigClientConfig) throws URISyntaxException {
-        String url = springCloudConfigClientConfig.url;
-        if (null == url || url.isEmpty()) {
-            throw new IllegalArgumentException(
-                    "The 'quarkus.spring-cloud-config.url' property cannot be empty");
-        }
-        if (url.endsWith("/")) {
-            return new URI(url.substring(0, url.length() - 1));
-        }
-        return new URI(url);
-    }
-
-    @Override
-    public Response exchange(String applicationName, String profile) throws Exception {
-        final RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectionRequestTimeout((int) springCloudConfigClientConfig.connectionTimeout.toMillis())
-                .setSocketTimeout((int) springCloudConfigClientConfig.readTimeout.toMillis())
-                .build();
-        final HttpClientBuilder httpClientBuilder = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig);
-        try (CloseableHttpClient client = httpClientBuilder.build()) {
-            final URI finalURI = finalURI(applicationName, profile);
-            final HttpGet request = new HttpGet(finalURI);
-            request.addHeader("Accept", "application/json");
-
-            HttpClientContext context = setupContext(finalURI);
-            try (CloseableHttpResponse response = client.execute(request, context)) {
-                if (response.getStatusLine().getStatusCode() != 200) {
-                    throw new RuntimeException("Got unexpected HTTP response code " + response.getStatusLine().getStatusCode()
-                            + " from " + finalURI);
-                }
-                final HttpEntity entity = response.getEntity();
-                if (entity == null) {
-                    throw new RuntimeException("Got empty HTTP response body " + finalURI);
-                }
-
-                return OBJECT_MAPPER.readValue(EntityUtils.toString(entity), Response.class);
-            }
-        }
-    }
-
-    private URI finalURI(String applicationName, String profile) throws URISyntaxException {
-        URIBuilder result = new URIBuilder(baseURI);
-        if (result.getPort() == -1) {
-            // we need to set the port otherwise auth case doesn't match the request
-            result.setPort(result.getScheme().equalsIgnoreCase("http") ? 80 : 443);
-        }
-        List<String> finalPathSegments = new ArrayList<>(result.getPathSegments());
-        finalPathSegments.add(applicationName);
-        finalPathSegments.add(profile);
-        result.setPathSegments(finalPathSegments);
-        return result.build();
-    }
-
-    private HttpClientContext setupContext(URI finalURI) {
-        final HttpClientContext context = HttpClientContext.create();
-        if ((baseURI.getUserInfo() != null) || springCloudConfigClientConfig.usernameAndPasswordSet()) {
-            final AuthCache authCache = InMemoryAuthCache.INSTANCE;
-            authCache.put(new HttpHost(finalURI.getHost(), finalURI.getPort(), finalURI.getScheme()), new BasicScheme());
-            context.setAuthCache(authCache);
-            if (springCloudConfigClientConfig.usernameAndPasswordSet()) {
-                final CredentialsProvider provider = new BasicCredentialsProvider();
-                final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
-                        springCloudConfigClientConfig.username.get(), springCloudConfigClientConfig.password.get());
-                provider.setCredentials(AuthScope.ANY, credentials);
-                context.setCredentialsProvider(provider);
-            }
-        }
-        return context;
-    }
-
-    /**
-     * We need this class in order to avoid the serialization that Apache HTTP client does by default
-     * and that does not work in GraalVM.
-     * We don't care about caching the auth result since one call is only ever going to be made in any case
-     */
-    private static class InMemoryAuthCache implements AuthCache {
-
-        static final InMemoryAuthCache INSTANCE = new InMemoryAuthCache();
-
-        private final Map<HttpHost, AuthScheme> map = new ConcurrentHashMap<>();
-
-        private InMemoryAuthCache() {
-        }
-
-        @Override
-        public void put(HttpHost host, AuthScheme authScheme) {
-            map.put(host, authScheme);
-        }
-
-        @Override
-        public AuthScheme get(HttpHost host) {
-            return map.get(host);
-        }
-
-        @Override
-        public void remove(HttpHost host) {
-            map.remove(host);
-        }
-
-        @Override
-        public void clear() {
-            map.clear();
-        }
-    };
-}
diff --git a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientConfig.java b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientConfig.java
index 0230dded1cff8..10c837b98d1c9 100644
--- a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientConfig.java
+++ b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientConfig.java
@@ -1,6 +1,8 @@
 package io.quarkus.spring.cloud.config.client.runtime;
 
+import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Map;
 import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -30,6 +32,14 @@ public class SpringCloudConfigClientConfig {
     @ConfigItem(defaultValue = "http://localhost:8888")
     public String url;
 
+    /**
+     * The label to be used to pull remote configuration properties.
+     * The default is set on the Spring Cloud Config Server
+     * (generally "master" when the server uses a Git backend).
+     */
+    @ConfigItem
+    public Optional<String> label;
+
     /**
      * The amount of time to wait when initially establishing a connection before giving up and timing out.
      * <p>
@@ -58,6 +68,51 @@ public class SpringCloudConfigClientConfig {
     @ConfigItem
     public Optional<String> password;
 
+    /**
+     * TrustStore to be used containing the SSL certificate used by the Config server
+     * Can be either a classpath resource or a file system path
+     */
+    @ConfigItem
+    public Optional<Path> trustStore;
+
+    /**
+     * Password of TrustStore to be used containing the SSL certificate used by the Config server
+     */
+    @ConfigItem
+    public Optional<String> trustStorePassword;
+
+    /**
+     * KeyStore to be used containing the SSL certificate for authentication with the Config server
+     * Can be either a classpath resource or a file system path
+     */
+    @ConfigItem
+    public Optional<Path> keyStore;
+
+    /**
+     * Password of KeyStore to be used containing the SSL certificate for authentication with the Config server
+     */
+    @ConfigItem
+    public Optional<String> keyStorePassword;
+
+    /**
+     * Password to recover key from KeyStore for SSL client authentication with the Config server
+     * If no value is provided, the key-store-password will be used
+     */
+    @ConfigItem
+    public Optional<String> keyPassword;
+
+    /**
+     * When using HTTPS and no keyStore has been specified, whether or not to trust all certificates
+     */
+    @ConfigItem(defaultValue = "false")
+    public boolean trustCerts;
+
+    /**
+     * Custom headers to pass the Spring Cloud Config Server when performing the HTTP request
+     */
+    @ConfigItem
+    public Map<String, String> headers;
+
     public boolean usernameAndPasswordSet() {
         return username.isPresent() && password.isPresent();
     }
diff --git a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGateway.java b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGateway.java
index 9463e39448332..492c7a816bcaa 100644
--- a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGateway.java
+++ b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGateway.java
@@ -1,6 +1,10 @@
 package io.quarkus.spring.cloud.config.client.runtime;
 
+import io.smallrye.mutiny.Uni;
+
 interface SpringCloudConfigClientGateway {
 
-    Response exchange(String applicationName, String profile) throws Exception;
+    Uni<Response> exchange(String applicationName, String profile) throws Exception;
+
+    void close();
 }
diff --git a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigServerClientConfigSourceProvider.java b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigServerClientConfigSourceProvider.java
index 5aaa2861bddc9..6efbf8e14d75b 100644
--- a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigServerClientConfigSourceProvider.java
+++ b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigServerClientConfigSourceProvider.java
@@ -28,23 +28,37 @@ public SpringCloudConfigServerClientConfigSourceProvider(SpringCloudConfigClient
         this.applicationName = applicationName;
         this.activeProfile = activeProfile;
 
-        springCloudConfigClientGateway = new DefaultSpringCloudConfigClientGateway(springCloudConfigClientConfig);
+        springCloudConfigClientGateway = new VertxSpringCloudConfigGateway(springCloudConfigClientConfig);
     }
 
     @Override
     public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
+        List<ConfigSource> result = new ArrayList<>();
         try {
-            final Response response = springCloudConfigClientGateway.exchange(applicationName, activeProfile);
-            final List<Response.PropertySource> propertySources = response.getPropertySources();
-            Collections.reverse(propertySources); // reverse the property sources so we can increment the ordinal from lower priority to higher
-            final List<ConfigSource> result = new ArrayList<>(propertySources.size());
-            for (int i = 0; i < propertySources.size(); i++) {
-                final Response.PropertySource propertySource = propertySources.get(i);
-                // Property sources obtained from Spring Cloud Config are expected to have a higher priority than even system properties
-                // 400 is the ordinal of SysPropConfigSource, so we use 450 here
-                result.add(new InMemoryConfigSource(450 + i, propertySource.getName(), propertySource.getSource()));
+            boolean connectionTimeoutIsGreaterThanZero = !springCloudConfigClientConfig.connectionTimeout.isNegative()
+                    && !springCloudConfigClientConfig.connectionTimeout.isZero();
+            boolean readTimeoutIsGreaterThanZero = !springCloudConfigClientConfig.readTimeout.isNegative()
+                    && !springCloudConfigClientConfig.readTimeout.isZero();
+            Response response;
+            // Check if configured timeouts are greater than zero in order to avoid an exception on atMost method
+            if (connectionTimeoutIsGreaterThanZero || readTimeoutIsGreaterThanZero)
+                response = springCloudConfigClientGateway.exchange(applicationName, activeProfile).await()
+                        .atMost(springCloudConfigClientConfig.connectionTimeout
+                                .plus(springCloudConfigClientConfig.readTimeout.multipliedBy(2)));
+            else {
+                response = springCloudConfigClientGateway.exchange(applicationName, activeProfile).await().indefinitely();
+            }
+            if (response != null) {
+                final List<Response.PropertySource> propertySources = response.getPropertySources();
+                Collections.reverse(propertySources); // reverse the property sources so we can increment the ordinal from lower priority to higher
+                for (int i = 0; i < propertySources.size(); i++) {
+                    final Response.PropertySource propertySource = propertySources.get(i);
+                    // Property sources obtained from Spring Cloud Config are expected to have a higher priority than even system properties
+                    // 400 is the ordinal of SysPropConfigSource, so we use 450 here
+                    result.add(new InMemoryConfigSource(450 + i, propertySource.getName(),
+                            propertySource.getSource()));
+                }
             }
-            return result;
         } catch (Exception e) {
             final String errorMessage = "Unable to obtain configuration from Spring Cloud Config Server at "
                     + springCloudConfigClientConfig.url;
@@ -54,7 +68,11 @@ public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
                 log.error(errorMessage, e);
                 return Collections.emptyList();
             }
+        } finally {
+            springCloudConfigClientGateway.close();
         }
+        return result;
+
     }
 
     private static final class InMemoryConfigSource implements ConfigSource {
diff --git a/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java
new file mode 100644
index 0000000000000..99aade4b0f2bf
--- /dev/null
+++ b/extensions/spring-cloud-config-client/runtime/src/main/java/io/quarkus/spring/cloud/config/client/runtime/VertxSpringCloudConfigGateway.java
@@ -0,0 +1,225 @@
+package io.quarkus.spring.cloud.config.client.runtime;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.jboss.logging.Logger;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.net.JksOptions;
+import io.vertx.core.net.KeyStoreOptionsBase;
+import io.vertx.core.net.PfxOptions;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.core.buffer.Buffer;
+import io.vertx.mutiny.ext.web.client.HttpRequest;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+public class VertxSpringCloudConfigGateway implements SpringCloudConfigClientGateway {
+
+    private static final Logger log = Logger.getLogger(VertxSpringCloudConfigGateway.class);
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    private static final String PKS_12 = "PKS12";
+    private static final String JKS = "JKS";
+
+    private final SpringCloudConfigClientConfig springCloudConfigClientConfig;
+    private final Vertx vertx;
+    private final WebClient webClient;
+    private final URI baseURI;
+
+    public VertxSpringCloudConfigGateway(SpringCloudConfigClientConfig springCloudConfigClientConfig) {
+        this.springCloudConfigClientConfig = springCloudConfigClientConfig;
+        try {
+            this.baseURI = determineBaseUri(springCloudConfigClientConfig);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Value: '" + springCloudConfigClientConfig.url
+                    + "' of property 'quarkus.spring-cloud-config.url' is invalid", e);
+        }
+        this.vertx = Vertx.vertx();
+        this.webClient = createHttpClient(vertx, springCloudConfigClientConfig);
+    }
+
+    public static WebClient createHttpClient(Vertx vertx, SpringCloudConfigClientConfig springCloudConfig) {
+
+        WebClientOptions webClientOptions = new WebClientOptions()
+                .setConnectTimeout((int) springCloudConfig.connectionTimeout.toMillis())
+                .setIdleTimeout((int) springCloudConfig.readTimeout.getSeconds());
+
+        boolean trustAll = springCloudConfig.trustCerts;
+        try {
+            if (springCloudConfig.trustStore.isPresent()) {
+                Path trustStorePath = springCloudConfig.trustStore.get();
+                String type = determineStoreType(trustStorePath);
+                KeyStoreOptionsBase storeOptions = storeOptions(trustStorePath, springCloudConfig.trustStorePassword,
+                        createStoreOptions(type));
+                if (isPfx(type)) {
+                    webClientOptions.setPfxTrustOptions((PfxOptions) storeOptions);
+                } else {
+                    webClientOptions.setTrustStoreOptions((JksOptions) storeOptions);
+                }
+            } else if (trustAll) {
+                skipVerify(webClientOptions);
+            } else if (springCloudConfig.keyStore.isPresent()) {
+                Path trustStorePath = springCloudConfig.keyStore.get();
+                String type = determineStoreType(trustStorePath);
+                KeyStoreOptionsBase storeOptions = storeOptions(trustStorePath, springCloudConfig.keyStorePassword,
+                        createStoreOptions(type));
+                if (isPfx(type)) {
+                    webClientOptions.setPfxTrustOptions((PfxOptions) storeOptions);
+                } else {
+                    webClientOptions.setTrustStoreOptions((JksOptions) storeOptions);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return WebClient.create(vertx, webClientOptions);
+    }
+
+    private static void skipVerify(WebClientOptions options) {
+        options.setTrustAll(true);
+        options.setVerifyHost(false);
+    }
+
+    private static KeyStoreOptionsBase createStoreOptions(String type) {
+        if (isPfx(type)) {
+            return new PfxOptions();
+        }
+        return new JksOptions();
+    }
+
+    private static boolean isPfx(String type) {
+        return PKS_12.equals(type);
+    }
+
+    private static <T extends KeyStoreOptionsBase> KeyStoreOptionsBase storeOptions(Path storePath,
+            Optional<String> storePassword, T store) throws Exception {
+        return store
+                .setPassword(storePassword.orElse(""))
+                .setValue(io.vertx.core.buffer.Buffer.buffer(storeBytes(storePath)));
+    }
+
+    private static String determineStoreType(Path keyStorePath) {
+        String pathName = keyStorePath.toString().toLowerCase();
+        if (pathName.endsWith(".p12") || pathName.endsWith(".pkcs12") || pathName.endsWith(".pfx")) {
+            return PKS_12;
+        }
+        return JKS;
+    }
+
+    private static byte[] storeBytes(Path keyStorePath)
+            throws Exception {
+        InputStream classPathResource = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream(keyStorePath.toString());
+        if (classPathResource != null) {
+            try (InputStream is = classPathResource) {
+                return allBytes(is);
+            }
+        } else {
+            try (InputStream is = Files.newInputStream(keyStorePath)) {
+                return allBytes(is);
+            }
+        }
+    }
+
+    private static byte[] allBytes(InputStream inputStream) throws Exception {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        int nRead;
+        byte[] data = new byte[1024];
+        while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
+            buffer.write(data, 0, nRead);
+        }
+        buffer.flush();
+        return buffer.toByteArray();
+    }
+
+    private URI determineBaseUri(SpringCloudConfigClientConfig springCloudConfigClientConfig) throws URISyntaxException {
+        String url = springCloudConfigClientConfig.url;
+        if (null == url || url.isEmpty()) {
+            throw new IllegalArgumentException(
+                    "The 'quarkus.spring-cloud-config.url' property cannot be empty");
+        }
+        if (url.endsWith("/")) {
+            return new URI(url.substring(0, url.length() - 1));
+        }
+        return new URI(url);
+    }
+
+    private String finalURI(String applicationName, String profile) throws URISyntaxException {
+        String path = baseURI.getPath();
+        List<String> finalPathSegments = new ArrayList<String>();
+        finalPathSegments.add(path);
+        finalPathSegments.add(applicationName);
+        finalPathSegments.add(profile);
+        if (springCloudConfigClientConfig.label.isPresent()) {
+            finalPathSegments.add(springCloudConfigClientConfig.label.get());
+        }
+        return finalPathSegments.stream().collect(Collectors.joining("/"));
+    }
+
+    @Override
+    public Uni<Response> exchange(String applicationName, String profile) throws Exception {
+        final String requestURI = finalURI(applicationName, profile);
+        String finalURI = getFinalURI(applicationName, profile);
+        HttpRequest<Buffer> request = webClient
+                .get(baseURI.getPort(), baseURI.getHost(), requestURI)
+                .ssl(baseURI.getScheme().contains("https") ? true : false)
+                .putHeader("Accept", "application/json");
+        if (springCloudConfigClientConfig.usernameAndPasswordSet()) {
+            request.basicAuthentication(springCloudConfigClientConfig.username.get(),
+                    springCloudConfigClientConfig.password.get());
+        }
+        for (Map.Entry<String, String> entry : springCloudConfigClientConfig.headers.entrySet()) {
+            request.putHeader(entry.getKey(), entry.getValue());
+        }
+        log.debug("Attempting to read configuration from '" + finalURI + "'.");
+        return request.send().map(r -> {
+            if (r.statusCode() != 200) {
+                throw new RuntimeException("Got unexpected HTTP response code " + r.statusCode()
+                        + " from " + finalURI);
+            } else {
+                String bodyAsString = r.bodyAsString();
+                if (bodyAsString.isEmpty()) {
+                    throw new RuntimeException("Got empty HTTP response body " + finalURI);
+                }
+                try {
+                    return OBJECT_MAPPER.readValue(bodyAsString, Response.class);
+                } catch (JsonProcessingException e) {
+                    throw new RuntimeException("Got unexpected error " + e.getOriginalMessage());
+                }
+            }
+        });
+    }
+
+    private String getFinalURI(String applicationName, String profile) {
+        String finalURI = baseURI.toString() + "/" + applicationName + "/" + profile;
+        if (springCloudConfigClientConfig.label.isPresent()) {
+            finalURI = "/" + springCloudConfigClientConfig.label.get();
+        }
+        return finalURI;
+    }
+
+    @Override
+    public void close() {
+        this.webClient.close();
+        this.vertx.closeAndAwait();
+    }
+
+}
diff --git a/extensions/spring-cloud-config-client/runtime/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGatewayTest.java b/extensions/spring-cloud-config-client/runtime/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGatewayTest.java
index 66c52062f60c9..b7efba10ebca1 100644
--- a/extensions/spring-cloud-config-client/runtime/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGatewayTest.java
+++ b/extensions/spring-cloud-config-client/runtime/src/test/java/io/quarkus/spring/cloud/config/client/runtime/SpringCloudConfigClientGatewayTest.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.time.Duration;
+import java.util.HashMap;
 import java.util.Optional;
 
 import org.apache.commons.io.IOUtils;
@@ -21,8 +22,9 @@ class SpringCloudConfigClientGatewayTest {
     private static final int MOCK_SERVER_PORT = 9300;
     private static final WireMockServer wireMockServer = new WireMockServer(MOCK_SERVER_PORT);
 
-    private final SpringCloudConfigClientGateway sut = new DefaultSpringCloudConfigClientGateway(
-            configForTesting());
+    private static final SpringCloudConfigClientConfig springCloudConfigClientConfig = configForTesting();
+    private final SpringCloudConfigClientGateway sut = new VertxSpringCloudConfigGateway(
+            springCloudConfigClientConfig);
 
     @BeforeAll
     static void start() {
@@ -38,10 +40,12 @@ static void stop() {
     void testBasicExchange() throws Exception {
         final String applicationName = "foo";
         final String profile = "dev";
-        wireMockServer.stubFor(WireMock.get(String.format("/%s/%s", applicationName, profile)).willReturn(WireMock
+        final String springCloudConfigUrl = String.format(
+                "/%s/%s/%s", applicationName, profile, springCloudConfigClientConfig.label.get());
+        wireMockServer.stubFor(WireMock.get(springCloudConfigUrl).willReturn(WireMock
                 .okJson(getJsonStringForApplicationAndProfile(applicationName, profile))));
 
-        final Response response = sut.exchange(applicationName, profile);
+        Response response = sut.exchange(applicationName, profile).await().indefinitely();
 
         assertThat(response).isNotNull().satisfies(r -> {
             assertThat(r.getName()).isEqualTo("foo");
@@ -72,10 +76,15 @@ private String getJsonStringForApplicationAndProfile(String applicationName, Str
     private static SpringCloudConfigClientConfig configForTesting() {
         SpringCloudConfigClientConfig springCloudConfigClientConfig = new SpringCloudConfigClientConfig();
         springCloudConfigClientConfig.url = "http://localhost:" + MOCK_SERVER_PORT;
+        springCloudConfigClientConfig.label = Optional.of("master");
         springCloudConfigClientConfig.connectionTimeout = Duration.ZERO;
         springCloudConfigClientConfig.readTimeout = Duration.ZERO;
         springCloudConfigClientConfig.username = Optional.empty();
         springCloudConfigClientConfig.password = Optional.empty();
+        springCloudConfigClientConfig.trustStore = Optional.empty();
+        springCloudConfigClientConfig.keyStore = Optional.empty();
+        springCloudConfigClientConfig.trustCerts = false;
+        springCloudConfigClientConfig.headers = new HashMap<>();
         return springCloudConfigClientConfig;
     }
 }
diff --git a/extensions/spring-data-jpa/deployment/pom.xml b/extensions/spring-data-jpa/deployment/pom.xml
index 6b177bfc1f4fc..26b6db74c2db5 100644
--- a/extensions/spring-data-jpa/deployment/pom.xml
+++ b/extensions/spring-data-jpa/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-data-jpa-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -40,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-h2</artifactId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -48,6 +47,11 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java
index 81e2d327c32e0..8566254fe2b0b 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/DotNames.java
@@ -1,14 +1,31 @@
 package io.quarkus.spring.data.deployment;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
+import java.sql.Blob;
+import java.sql.NClob;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.ZonedDateTime;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.stream.Stream;
 
+import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Version;
@@ -70,20 +87,81 @@ public final class DotNames {
     public static final DotName JPA_ID = DotName.createSimple(Id.class.getName());
     public static final DotName VERSION = DotName.createSimple(Version.class.getName());
     public static final DotName JPA_MAPPED_SUPERCLASS = DotName.createSimple(MappedSuperclass.class.getName());
+    public static final DotName JPA_ENTITY = DotName.createSimple(Entity.class.getName());;
     public static final DotName VOID = DotName.createSimple(void.class.getName());
     public static final DotName LONG = DotName.createSimple(Long.class.getName());
     public static final DotName PRIMITIVE_LONG = DotName.createSimple(long.class.getName());
     public static final DotName INTEGER = DotName.createSimple(Integer.class.getName());
     public static final DotName PRIMITIVE_INTEGER = DotName.createSimple(int.class.getName());
+    public static final DotName SHORT = DotName.createSimple(Short.class.getName());
+    public static final DotName PRIMITIVE_SHORT = DotName.createSimple(short.class.getName());
+    public static final DotName CHARACTER = DotName.createSimple(Character.class.getName());
+    public static final DotName PRIMITIVE_CHAR = DotName.createSimple(char.class.getName());
+    public static final DotName BYTE = DotName.createSimple(Byte.class.getName());
+    public static final DotName PRIMITIVE_BYTE = DotName.createSimple(byte.class.getName());
+    public static final DotName DOUBLE = DotName.createSimple(Double.class.getName());
+    public static final DotName PRIMITIVE_DOUBLE = DotName.createSimple(double.class.getName());
+    public static final DotName FLOAT = DotName.createSimple(Float.class.getName());
+    public static final DotName PRIMITIVE_FLOAT = DotName.createSimple(float.class.getName());
     public static final DotName BOOLEAN = DotName.createSimple(Boolean.class.getName());
     public static final DotName PRIMITIVE_BOOLEAN = DotName.createSimple(boolean.class.getName());
+    public static final DotName BIG_INTEGER = DotName.createSimple(BigInteger.class.getName());
+    public static final DotName BIG_DECIMAL = DotName.createSimple(BigDecimal.class.getName());
     public static final DotName STRING = DotName.createSimple(String.class.getName());
     public static final DotName ITERATOR = DotName.createSimple(Iterator.class.getName());
     public static final DotName COLLECTION = DotName.createSimple(Collection.class.getName());
     public static final DotName LIST = DotName.createSimple(List.class.getName());
+    public static final DotName SET = DotName.createSimple(Set.class.getName());
     public static final DotName STREAM = DotName.createSimple(Stream.class.getName());
     public static final DotName OPTIONAL = DotName.createSimple(Optional.class.getName());
     public static final DotName OBJECT = DotName.createSimple(Object.class.getName());
+    public static final DotName LOCALE = DotName.createSimple(Locale.class.getName());
+    public static final DotName TIMEZONE = DotName.createSimple(TimeZone.class.getName());
+    public static final DotName URL = DotName.createSimple(java.net.URL.class.getName());
+    public static final DotName CLASS = DotName.createSimple(Class.class.getName());
+    public static final DotName UUID = DotName.createSimple(java.util.UUID.class.getName());
+    public static final DotName BLOB = DotName.createSimple(java.sql.Blob.class.getName());
+    public static final DotName CLOB = DotName.createSimple(java.sql.Clob.class.getName());
+    public static final DotName NCLOB = DotName.createSimple(java.sql.NClob.class.getName());
+
+    // temporal types
+    public static final DotName UTIL_DATE = DotName.createSimple(java.util.Date.class.getName());
+    public static final DotName CALENDAR = DotName.createSimple(Calendar.class.getName());
+    // java.sql
+    public static final DotName SQL_DATE = DotName.createSimple(java.sql.Date.class.getName());
+    public static final DotName SQL_TIME = DotName.createSimple(java.sql.Time.class.getName());
+    public static final DotName SQL_TIMESTAMP = DotName.createSimple(java.sql.Timestamp.class.getName());
+    // java.time
+    public static final DotName LOCAL_DATE = DotName.createSimple(LocalDate.class.getName());
+    public static final DotName LOCAL_TIME = DotName.createSimple(LocalTime.class.getName());
+    public static final DotName LOCAL_DATETIME = DotName.createSimple(LocalDateTime.class.getName());
+    public static final DotName OFFSET_TIME = DotName.createSimple(OffsetTime.class.getName());
+    public static final DotName OFFSET_DATETIME = DotName.createSimple(OffsetDateTime.class.getName());
+    public static final DotName DURATION = DotName.createSimple(Duration.class.getName());
+    public static final DotName INSTANT = DotName.createSimple(Instant.class.getName());
+    public static final DotName ZONED_DATETIME = DotName.createSimple(ZonedDateTime.class.getName());
+
+    // https://docs.jboss.org/hibernate/stable/orm/userguide/html_single/Hibernate_User_Guide.html#basic
+    // Should be in sync with org.hibernate.type.BasicTypeRegistry
+    public static final Set<DotName> HIBERNATE_PROVIDED_BASIC_TYPES = new HashSet<>(Arrays.asList(
+            STRING, CLASS,
+            BOOLEAN, PRIMITIVE_BOOLEAN,
+            INTEGER, PRIMITIVE_INTEGER,
+            LONG, PRIMITIVE_LONG,
+            SHORT, PRIMITIVE_SHORT,
+            BYTE, PRIMITIVE_BYTE,
+            CHARACTER, PRIMITIVE_CHAR,
+            DOUBLE, PRIMITIVE_DOUBLE,
+            FLOAT, PRIMITIVE_FLOAT,
+            BIG_INTEGER, BIG_DECIMAL,
+            UTIL_DATE, CALENDAR,
+            SQL_DATE, SQL_TIME, SQL_TIMESTAMP,
+            LOCAL_DATE, LOCAL_TIME, LOCAL_DATETIME,
+            OFFSET_TIME, OFFSET_DATETIME,
+            DURATION, INSTANT,
+            ZONED_DATETIME, TIMEZONE,
+            LOCALE, URL, UUID,
+            BLOB, CLOB, NCLOB));
 
     private DotNames() {
     }
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/MethodNameParser.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/MethodNameParser.java
index 0f2e0cfa8f72a..9c275cdf77e4d 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/MethodNameParser.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/MethodNameParser.java
@@ -7,11 +7,10 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.ClassType;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
@@ -79,14 +78,16 @@ public enum QueryType {
 
     public Result parse(MethodInfo methodInfo) {
         String methodName = methodInfo.name();
+        ClassInfo repositoryClassInfo = methodInfo.declaringClass();
+        String repositoryMethodDescription = methodName + " of Repository " + repositoryClassInfo;
         QueryType queryType = getType(methodName);
         if (queryType == null) {
-            throw new UnableToParseMethodException("Repository method " + methodName + " cannot be parsed");
+            throw new UnableToParseMethodException("Method " + repositoryMethodDescription + " cannot be parsed");
         }
 
         int byIndex = methodName.indexOf("By");
         if ((byIndex == -1) || (byIndex + 2 >= methodName.length())) {
-            throw new UnableToParseMethodException("Repository method " + methodName + " cannot be parsed");
+            throw new UnableToParseMethodException("Method " + repositoryMethodDescription + " cannot be parsed");
         }
 
         // handle 'Top' and 'First'
@@ -104,17 +105,19 @@ public Result parse(MethodInfo methodInfo) {
                 }
             } catch (Exception e) {
                 throw new UnableToParseMethodException(
-                        "Unable to parse query with limiting results clause. Offending method is " + methodName);
+                        "Unable to parse query with limiting results clause. Offending method is "
+                                + repositoryMethodDescription + ".");
             }
         }
         if ((topCount != null) && (queryType != QueryType.SELECT)) {
             throw new UnableToParseMethodException(
-                    "When 'Top' or 'First' is specified, the query must be a find query. Offending method is " + methodName);
+                    "When 'Top' or 'First' is specified, the query must be a find query. Offending method is "
+                            + repositoryMethodDescription + ".");
         }
 
         if (methodName.substring(0, byIndex).contains("Distinct")) {
             throw new UnableToParseMethodException(
-                    "Distinct is not yet supported. Offending method is " + methodName);
+                    "Distinct is not yet supported. Offending method is " + repositoryMethodDescription + ".");
         }
 
         // handle 'AllIgnoreCase'
@@ -131,7 +134,7 @@ public Result parse(MethodInfo methodInfo) {
             int orderByIndex = afterByPart.indexOf(ORDER_BY);
             if (orderByIndex + ORDER_BY.length() == afterByPart.length()) {
                 throw new UnableToParseMethodException(
-                        "A field must by supplied after 'OrderBy' . Offending method is " + methodName);
+                        "A field must by supplied after 'OrderBy' . Offending method is " + repositoryMethodDescription + ".");
             }
             String afterOrderByPart = afterByPart.substring(orderByIndex + ORDER_BY.length());
             afterByPart = afterByPart.substring(0, orderByIndex);
@@ -148,7 +151,7 @@ public Result parse(MethodInfo methodInfo) {
                 throw new UnableToParseMethodException(
                         "Field " + orderField
                                 + " which was configured as the order field does not exist in the entity. Offending method is "
-                                + methodName);
+                                + repositoryMethodDescription + ".");
             }
 
             if (ascending) {
@@ -164,7 +167,7 @@ public Result parse(MethodInfo methodInfo) {
         if (containsAnd && containsOr) {
             throw new UnableToParseMethodException(
                     "'And' and 'Or' clauses cannot be mixed in a method name - Try specifying the Query with the @Query annotation. Offending method is "
-                            + methodName);
+                            + repositoryMethodDescription + ".");
         }
         if (containsAnd) {
             parts = Arrays.asList(afterByPart.split("And"));
@@ -172,6 +175,7 @@ public Result parse(MethodInfo methodInfo) {
             parts = Arrays.asList(afterByPart.split("Or"));
         }
 
+        MutableReference<List<ClassInfo>> mappedSuperClassInfoRef = MutableReference.of(mappedSuperClassInfos);
         StringBuilder where = new StringBuilder();
         int paramsCount = 0;
         for (String part : parts) {
@@ -192,61 +196,17 @@ public Result parse(MethodInfo methodInfo) {
             } else {
                 fieldName = lowerFirstLetter(part.replaceAll(operation, ""));
             }
-            FieldInfo fieldInfo = getField(fieldName);
+            FieldInfo fieldInfo = getFieldInfo(fieldName, entityClass, mappedSuperClassInfoRef);
             if (fieldInfo == null) {
-                String parsingExceptionMethod = "Entity " + entityClass + " does not contain a field named: " + part + ". " +
-                        "Offending method is " + methodName;
-
-                // determine if we are trying to use a field of one of the associated entities
-
-                int fieldEndIndex = -1;
-                for (int i = 1; i < fieldName.length() - 1; i++) {
-                    char c = fieldName.charAt(i);
-                    if ((c >= 'A' && c <= 'Z') || c == '_') {
-                        fieldEndIndex = i;
-                        break;
-                    }
-                }
-
-                if (fieldEndIndex == -1) {
-                    throw new UnableToParseMethodException(parsingExceptionMethod);
-                }
-
-                int associatedEntityFieldStartIndex = fieldName.charAt(fieldEndIndex) == '_' ? fieldEndIndex + 1
-                        : fieldEndIndex;
-                if (associatedEntityFieldStartIndex >= fieldName.length() - 1) {
-                    throw new UnableToParseMethodException(parsingExceptionMethod);
-                }
-
-                String simpleFieldName = fieldName.substring(0, fieldEndIndex);
-                String associatedEntityFieldName = lowerFirstLetter(fieldName.substring(associatedEntityFieldStartIndex));
-                fieldInfo = getField(simpleFieldName);
-                if ((fieldInfo == null) || !(fieldInfo.type() instanceof ClassType)) {
-                    throw new UnableToParseMethodException(parsingExceptionMethod);
-                }
-
-                ClassInfo associatedEntityClassInfo = indexView.getClassByName(fieldInfo.type().name());
-                if (associatedEntityClassInfo == null) {
-                    throw new IllegalStateException(
-                            "Entity class " + fieldInfo.type().name() + " was not part of the Quarkus index");
-                }
-                FieldInfo associatedEntityClassField = getAssociatedEntityClassField(associatedEntityFieldName,
-                        associatedEntityClassInfo);
-                if (associatedEntityClassField == null) {
-                    throw new UnableToParseMethodException(parsingExceptionMethod);
-                }
-
-                validateFieldWithOperation(operation, associatedEntityClassField, methodName);
-
-                // set the fieldName to the proper JPQL expression
-                fieldName = simpleFieldName + "." + associatedEntityFieldName;
-            } else {
-                validateFieldWithOperation(operation, fieldInfo, methodName);
+                StringBuilder fieldPathBuilder = new StringBuilder(fieldName.length() + 5);
+                fieldInfo = resolveNestedField(repositoryMethodDescription, fieldName, fieldPathBuilder);
+                fieldName = fieldPathBuilder.toString();
             }
+            validateFieldWithOperation(operation, fieldInfo, fieldName, repositoryMethodDescription);
             if ((ignoreCase || allIgnoreCase) && !DotNames.STRING.equals(fieldInfo.type().name())) {
                 throw new UnableToParseMethodException(
-                        "IgnoreCase cannot be specified for field" + fieldInfo.name() + " of method "
-                                + methodName + " because it is not a String type");
+                        "IgnoreCase cannot be specified for field" + fieldInfo.name() + " because it is not a String type. "
+                                + "Offending method is " + repositoryMethodDescription + ".");
             }
 
             if (where.length() > 0) {
@@ -256,12 +216,6 @@ public Result parse(MethodInfo methodInfo) {
             String upperPrefix = (ignoreCase || allIgnoreCase) ? "UPPER(" : "";
             String upperSuffix = (ignoreCase || allIgnoreCase) ? ")" : "";
 
-            // If the fieldName is not a field in the class and in camelcase format,
-            // then split it as hierarchy of fields
-            if (entityClass.field(fieldName) == null) {
-                fieldName = handleFieldsHierarchy(fieldName, fieldInfo);
-            }
-
             where.append(upperPrefix).append(fieldName).append(upperSuffix);
             if ((operation == null) || "Equals".equals(operation) || "Is".equals(operation)) {
                 paramsCount++;
@@ -375,72 +329,76 @@ public Result parse(MethodInfo methodInfo) {
                 topCount);
     }
 
-    private String handleFieldsHierarchy(String fieldName, FieldInfo currentField) {
-        StringBuilder finalName = new StringBuilder(fieldName);
-
-        Set<String> childFields = new HashSet<>();
-
-        childFields.addAll(entityClass.fields().stream()
-                .map(FieldInfo::name)
-                .collect(Collectors.toList()));
-
-        // Collecting the current class fields
-        ClassInfo currentClassInfo = indexView.getClassByName(currentField.type().name());
-
-        if (currentClassInfo != null) {
-            childFields.addAll(
-                    currentClassInfo.fields()
-                            .stream()
-                            .map(FieldInfo::name)
-                            .collect(Collectors.toList()));
-        }
-
-        // Collecting the inherited fields from the superclass of the actual class
-        DotName superClassName = entityClass.superClassType().name();
-        ClassInfo superClassInfo = indexView.getClassByName(superClassName);
-
-        ClassInfo classByName;
-
-        if (superClassName != null && superClassInfo != null && currentClassInfo != null &&
-                currentClassInfo.superClassType() != null &&
-                (classByName = indexView.getClassByName(currentClassInfo.superClassType().name())) != null) {
-
-            childFields.addAll(superClassInfo.fields()
-                    .stream()
-                    .map(FieldInfo::name).collect(Collectors.toList()));
-
-            childFields.addAll(classByName.fields()
-                    .stream()
-                    .map(FieldInfo::name).collect(Collectors.toList()));
+    /**
+     * See:
+     * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-property-expressions
+     */
+    private FieldInfo resolveNestedField(String repositoryMethodDescription, String fieldPathExpression,
+            StringBuilder fieldPathBuilder) {
+
+        String fieldNotResolvableMessage = "Entity " + this.entityClass + " does not contain a field named: "
+                + fieldPathExpression + ". ";
+        String offendingMethodMessage = "Offending method is " + repositoryMethodDescription + ".";
+
+        ClassInfo parentClassInfo = this.entityClass;
+        FieldInfo fieldInfo = null;
+
+        int fieldStartIndex = 0;
+        while (fieldStartIndex < fieldPathExpression.length()) {
+            if (fieldPathExpression.charAt(fieldStartIndex) == '_') {
+                fieldStartIndex++;
+                if (fieldStartIndex >= fieldPathExpression.length()) {
+                    throw new UnableToParseMethodException(fieldNotResolvableMessage + offendingMethodMessage);
+                }
+            }
+            MutableReference<List<ClassInfo>> parentSuperClassInfos = new MutableReference<>();
+            // the underscore character is treated as reserved character to manually define traversal points.
+            int firstSeparator = fieldPathExpression.indexOf('_', fieldStartIndex);
+            int fieldEndIndex = firstSeparator == -1 ? fieldPathExpression.length() : firstSeparator;
+            while (fieldEndIndex >= fieldStartIndex) {
+                String simpleFieldName = lowerFirstLetter(fieldPathExpression.substring(fieldStartIndex, fieldEndIndex));
+                fieldInfo = getFieldInfo(simpleFieldName, parentClassInfo, parentSuperClassInfos);
+                if (fieldInfo != null) {
+                    break;
+                }
+                fieldEndIndex = previousPotentialFieldEnd(fieldPathExpression, fieldStartIndex, fieldEndIndex);
+            }
+            if (fieldInfo == null) {
+                String detail = "";
+                if (fieldStartIndex > 0) {
+                    String notMatched = lowerFirstLetter(fieldPathExpression.substring(fieldStartIndex));
+                    detail = "Can not resolve " + parentClassInfo + "." + notMatched + ". ";
+                }
+                throw new UnableToParseMethodException(
+                        fieldNotResolvableMessage + detail + offendingMethodMessage);
+            }
+            if (fieldPathBuilder.length() > 0) {
+                fieldPathBuilder.append('.');
+            }
+            fieldPathBuilder.append(fieldInfo.name());
+            if (!isHibernateProvidedBasicType(fieldInfo.type().name())) {
+                parentClassInfo = indexView.getClassByName(fieldInfo.type().name());
+                if (parentClassInfo == null) {
+                    throw new IllegalStateException(
+                            "Entity class " + fieldInfo.type().name() + " referenced by "
+                                    + this.entityClass + "." + fieldPathBuilder
+                                    + " was not part of the Quarkus index. " + offendingMethodMessage);
+                }
+            }
+            fieldStartIndex = fieldEndIndex;
         }
 
-        // Collecting the inherited fields from the superclasses of the attributes
-        if (currentClassInfo != null && currentClassInfo.superClassType() != null
-                && (classByName = indexView.getClassByName(currentClassInfo.superClassType().name())) != null) {
-
-            childFields.addAll(
-                    classByName.fields()
-                            .stream()
-                            .map(FieldInfo::name).collect(Collectors.toList()));
-        }
+        return fieldInfo;
+    }
 
-        // Building the fieldName from the members classes and their superclasses
-        for (String fieldInf : childFields) {
-            if (StringUtils.containsIgnoreCase(fieldName, fieldInf)) {
-                String newValue = finalName.toString()
-                        .replaceAll("(?i)" + fieldInf, lowerFirstLetter(fieldInf) + ".");
-                finalName.delete(0, finalName.length());
-                finalName.append(newValue);
+    private int previousPotentialFieldEnd(String fieldName, int fieldStartIndex, int fieldEndIndexExclusive) {
+        for (int i = fieldEndIndexExclusive - 1; i > fieldStartIndex; i--) {
+            char c = fieldName.charAt(i);
+            if (c >= 'A' && c <= 'Z') {
+                return i;
             }
         }
-
-        // In some cases, the built hierarchy is ending by a joining point. so we need to remove it
-        if (finalName.toString().charAt(finalName.length() - 1) == '.') {
-            fieldName = finalName.toString().replaceAll(".$", "");
-        } else {
-            fieldName = finalName.toString();
-        }
-        return fieldName;
+        return -1;
     }
 
     /**
@@ -461,39 +419,20 @@ private boolean containsLogicOperator(String str, String operatorStr) {
         return Character.isUpperCase(str.charAt(index + operatorStr.length()));
     }
 
-    /**
-     * Looks for the field in either the class itself or in a superclass that is annotated with @MappedSuperClass
-     */
-    private FieldInfo getAssociatedEntityClassField(String associatedEntityFieldName, ClassInfo associatedEntityClassInfo) {
-        FieldInfo fieldInfo = associatedEntityClassInfo.field(associatedEntityFieldName);
-        if (fieldInfo != null) {
-            return fieldInfo;
-        }
-        if (DotNames.OBJECT.equals(associatedEntityClassInfo.superName())) {
-            return null;
-        }
-
-        ClassInfo superClassInfo = indexView.getClassByName(associatedEntityClassInfo.superName());
-        if (superClassInfo.classAnnotation(DotNames.JPA_MAPPED_SUPERCLASS) == null) {
-            return null;
-        }
-
-        return getAssociatedEntityClassField(associatedEntityFieldName, superClassInfo);
-    }
-
-    private void validateFieldWithOperation(String operation, FieldInfo fieldInfo, String methodName) {
+    private void validateFieldWithOperation(String operation, FieldInfo fieldInfo, String fieldPath,
+            String repositoryMethodDescription) {
         DotName fieldTypeDotName = fieldInfo.type().name();
         if (STRING_LIKE_OPERATIONS.contains(operation) && !DotNames.STRING.equals(fieldTypeDotName)) {
             throw new UnableToParseMethodException(
-                    operation + " cannot be specified for field" + fieldInfo.name() + " of method "
-                            + methodName + " because it is not a String type");
+                    operation + " cannot be specified for field" + fieldPath + " because it is not a String type. "
+                            + "Offending method is " + repositoryMethodDescription + ".");
         }
 
         if (BOOLEAN_OPERATIONS.contains(operation) && !DotNames.BOOLEAN.equals(fieldTypeDotName)
                 && !DotNames.PRIMITIVE_BOOLEAN.equals(fieldTypeDotName)) {
             throw new UnableToParseMethodException(
-                    operation + " cannot be specified for field" + fieldInfo.name() + " of method "
-                            + methodName + " because it is not a boolean type");
+                    operation + " cannot be specified for field" + fieldPath + " because it is not a boolean type. "
+                            + "Offending method is " + repositoryMethodDescription + ".");
         }
     }
 
@@ -546,7 +485,11 @@ private String lowerFirstLetter(String input) {
     }
 
     private String getEntityName() {
-        // TODO: not true?
+        AnnotationInstance annotationInstance = entityClass.classAnnotation(DotNames.JPA_ENTITY);
+        if (annotationInstance != null && annotationInstance.value("name") != null) {
+            AnnotationValue annotationValue = annotationInstance.value("name");
+            return annotationValue.asString().length() > 0 ? annotationValue.asString() : entityClass.simpleName();
+        }
         return entityClass.simpleName();
     }
 
@@ -564,16 +507,14 @@ private boolean entityContainsField(String fieldName) {
         return false;
     }
 
-    private FieldInfo getField(String fieldName) {
-        // Before validating the fieldInfo,
-        // we need to split the camelcase format and grab the first item
+    private FieldInfo getFieldInfo(String fieldName, ClassInfo entityClass,
+            MutableReference<List<ClassInfo>> mappedSuperClassInfos) {
         FieldInfo fieldInfo = entityClass.field(fieldName);
         if (fieldInfo == null) {
-            String[] camelCaseStrings = StringUtils.splitByCharacterTypeCamelCase(fieldName);
-            fieldInfo = entityClass.field(camelCaseStrings[0]);
-        }
-        if (fieldInfo == null) {
-            for (ClassInfo superClass : mappedSuperClassInfos) {
+            if (mappedSuperClassInfos.isEmpty()) {
+                mappedSuperClassInfos.set(getMappedSuperClassInfos(indexView, entityClass));
+            }
+            for (ClassInfo superClass : mappedSuperClassInfos.get()) {
                 fieldInfo = superClass.field(fieldName);
                 if (fieldInfo != null) {
                     break;
@@ -587,13 +528,13 @@ private List<ClassInfo> getMappedSuperClassInfos(IndexView indexView, ClassInfo
         List<ClassInfo> mappedSuperClassInfoElements = new ArrayList<>(3);
         Type superClassType = entityClass.superClassType();
         while (superClassType != null && !superClassType.name().equals(DotNames.OBJECT)) {
-            ClassInfo superClass = indexView.getClassByName(entityClass.superName());
+            ClassInfo superClass = indexView.getClassByName(superClassType.name());
             if (superClass.classAnnotation(DotNames.JPA_MAPPED_SUPERCLASS) != null) {
                 mappedSuperClassInfoElements.add(superClass);
             }
 
             if (superClassType.kind() == Kind.CLASS) {
-                superClassType = indexView.getClassByName(superClassType.name()).superClassType();
+                superClassType = superClass.superClassType();
             } else if (superClassType.kind() == Kind.PARAMETERIZED_TYPE) {
                 ParameterizedType parameterizedType = superClassType.asParameterizedType();
                 superClassType = parameterizedType.owner();
@@ -602,6 +543,37 @@ private List<ClassInfo> getMappedSuperClassInfos(IndexView indexView, ClassInfo
         return mappedSuperClassInfoElements;
     }
 
+    private boolean isHibernateProvidedBasicType(DotName dotName) {
+        return DotNames.HIBERNATE_PROVIDED_BASIC_TYPES.contains(dotName);
+    }
+
+    private static class MutableReference<T> {
+        private T reference;
+
+        public static <T> MutableReference<T> of(T reference) {
+            return new MutableReference<>(reference);
+        }
+
+        public MutableReference() {
+        }
+
+        private MutableReference(T reference) {
+            this.reference = reference;
+        }
+
+        public T get() {
+            return reference;
+        }
+
+        public void set(T value) {
+            this.reference = value;
+        }
+
+        public boolean isEmpty() {
+            return reference == null;
+        }
+    }
+
     public static class Result {
         private final ClassInfo entityClass;
         private final String query;
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java
index 60174501918ff..a41cfc8bfda0b 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/SpringDataJPAProcessor.java
@@ -41,6 +41,7 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.hibernate.orm.deployment.IgnorableNonIndexedClasses;
+import io.quarkus.hibernate.orm.panache.deployment.JavaJpaTypeBundle;
 import io.quarkus.spring.data.deployment.generate.SpringDataRepositoryCreator;
 
 public class SpringDataJPAProcessor {
@@ -100,11 +101,27 @@ void build(CombinedIndexBuildItem index,
 
         addRepositoryDefinitionInstances(indexView, interfacesExtendingRepository);
 
+        addInterfacesExtendingIntermediateRepositories(indexView, interfacesExtendingRepository);
+
         removeNoRepositoryBeanClasses(interfacesExtendingRepository);
         implementCrudRepositories(generatedBeans, generatedClasses, additionalBeans, reflectiveClasses,
                 interfacesExtendingRepository, indexView);
     }
 
+    private void addInterfacesExtendingIntermediateRepositories(IndexView indexView,
+            List<ClassInfo> interfacesExtendingRepository) {
+        Collection<DotName> noRepositoryBeanRepos = getAllNoRepositoryBeanInterfaces(indexView);
+        Iterator<DotName> iterator = noRepositoryBeanRepos.iterator();
+        while (iterator.hasNext()) {
+            DotName interfaceName = iterator.next();
+            if (DotNames.SUPPORTED_REPOSITORIES.contains(interfaceName)) {
+                iterator.remove();
+            }
+        }
+        List<ClassInfo> interfacesExtending = getAllInterfacesExtending(noRepositoryBeanRepos, indexView);
+        interfacesExtendingRepository.addAll(interfacesExtending);
+    }
+
     // classes annotated with @RepositoryDefinition behave exactly as if they extended Repository
     private void addRepositoryDefinitionInstances(IndexView indexView, List<ClassInfo> interfacesExtendingRepository) {
         Collection<AnnotationInstance> repositoryDefinitions = indexView
@@ -214,6 +231,23 @@ private List<ClassInfo> getAllInterfacesExtending(Collection<DotName> targets, I
         return result;
     }
 
+    private Collection<DotName> getAllNoRepositoryBeanInterfaces(IndexView index) {
+        Set<DotName> result = new HashSet<>();
+        Collection<ClassInfo> knownClasses = index.getKnownClasses();
+        for (ClassInfo clazz : knownClasses) {
+            if (!Modifier.isInterface(clazz.flags())) {
+                continue;
+            }
+            boolean found = false;
+            for (ClassInfo classInfo : knownClasses) {
+                if (classInfo.classAnnotation(DotNames.SPRING_DATA_NO_REPOSITORY_BEAN) != null) {
+                    result.add(classInfo.name());
+                }
+            }
+        }
+        return result;
+    }
+
     // generate a concrete class that will be used by Arc to resolve injection points
     private void implementCrudRepositories(BuildProducer<GeneratedBeanBuildItem> generatedBeans,
             BuildProducer<GeneratedClassBuildItem> generatedClasses,
@@ -233,10 +267,10 @@ private void implementCrudRepositories(BuildProducer<GeneratedBeanBuildItem> gen
                     // the generated classes that implement interfaces for holding custom query results need
                     // to be registered for reflection here since this is the only point where the generated class is known
                     reflectiveClasses.produce(new ReflectiveClassBuildItem(true, false, className));
-                }));
+                }), JavaJpaTypeBundle.BUNDLE);
 
         for (ClassInfo crudRepositoryToImplement : crudRepositoriesToImplement) {
-            repositoryCreator.implementCrudRepository(crudRepositoryToImplement);
+            repositoryCreator.implementCrudRepository(crudRepositoryToImplement, index);
         }
     }
 }
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java
index 90840ed6047a7..aac9d2acfa3fa 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/AbstractMethodsAdder.java
@@ -1,6 +1,8 @@
 package io.quarkus.spring.data.deployment.generate;
 
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -10,14 +12,20 @@
 
 import javax.persistence.NoResultException;
 
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.SliceImpl;
+import org.springframework.data.jpa.repository.Modifying;
 
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.FunctionCreator;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
@@ -25,7 +33,9 @@
 import io.quarkus.gizmo.TryBlock;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.panache.common.Page;
+import io.quarkus.runtime.util.HashUtil;
 import io.quarkus.spring.data.deployment.DotNames;
+import io.quarkus.spring.data.runtime.RepositorySupport;
 import io.quarkus.spring.data.runtime.TypesConverter;
 
 public abstract class AbstractMethodsAdder {
@@ -59,13 +69,12 @@ protected void handleBooleanReturnValue(BytecodeCreator methodCreator, ResultHan
 
     protected void generateFindQueryResultHandling(MethodCreator methodCreator, ResultHandle panacheQuery,
             Integer pageableParameterIndex, ClassInfo repositoryClassInfo, ClassInfo entityClassInfo,
-            DotName returnType, Integer limit, String methodName, DotName customResultType) {
+            DotName returnType, Integer limit, String methodName, DotName customResultType, String originalResultType) {
 
         ResultHandle page = null;
         if (limit != null) {
             // create a custom page object that will limit the results by the limit size
             page = methodCreator.newInstance(MethodDescriptor.ofConstructor(Page.class, int.class), methodCreator.load(limit));
-
         } else if (pageableParameterIndex != null) {
             page = methodCreator.invokeStaticMethod(
                     MethodDescriptor.ofMethod(TypesConverter.class, "toPanachePage", Page.class, Pageable.class),
@@ -91,8 +100,10 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
             ResultHandle singleResult = tryBlock.invokeInterfaceMethod(
                     MethodDescriptor.ofMethod(PanacheQuery.class, panacheQueryMethodToUse, Object.class),
                     panacheQuery);
+
             ResultHandle casted = tryBlock.checkCast(singleResult, entityClassInfo.name().toString());
             tryBlock.returnValue(casted);
+
             CatchBlockCreator catchBlock = tryBlock.addCatch(NoResultException.class);
             catchBlock.returnValue(catchBlock.loadNull());
 
@@ -109,17 +120,30 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
             ResultHandle singleResult = tryBlock.invokeInterfaceMethod(
                     MethodDescriptor.ofMethod(PanacheQuery.class, panacheQueryMethodToUse, Object.class),
                     panacheQuery);
-            ResultHandle casted = tryBlock.checkCast(singleResult, entityClassInfo.name().toString());
-            ResultHandle optional = tryBlock.invokeStaticMethod(
-                    MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class),
-                    casted);
-            tryBlock.returnValue(optional);
+
+            if (customResultType == null) {
+                ResultHandle casted = tryBlock.checkCast(singleResult, entityClassInfo.name().toString());
+                ResultHandle optional = tryBlock.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class),
+                        casted);
+                tryBlock.returnValue(optional);
+            } else {
+                ResultHandle customResult = tryBlock.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(customResultType.toString(), "convert_" + methodName,
+                                customResultType.toString(),
+                                originalResultType),
+                        singleResult);
+                ResultHandle optional = tryBlock.invokeStaticMethod(
+                        MethodDescriptor.ofMethod(Optional.class, "of", Optional.class, Object.class),
+                        customResult);
+                tryBlock.returnValue(optional);
+            }
             CatchBlockCreator catchBlock = tryBlock.addCatch(NoResultException.class);
             ResultHandle emptyOptional = catchBlock.invokeStaticMethod(
                     MethodDescriptor.ofMethod(Optional.class, "empty", Optional.class));
             catchBlock.returnValue(emptyOptional);
         } else if (DotNames.LIST.equals(returnType) || DotNames.COLLECTION.equals(returnType)
-                || DotNames.ITERATOR.equals(returnType)) {
+                || DotNames.SET.equals(returnType) || DotNames.ITERATOR.equals(returnType)) {
             ResultHandle list;
 
             if (customResultType == null) {
@@ -127,23 +151,25 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
                         MethodDescriptor.ofMethod(PanacheQuery.class, "list", List.class),
                         panacheQuery);
             } else {
+
                 ResultHandle stream = methodCreator.invokeInterfaceMethod(
                         MethodDescriptor.ofMethod(PanacheQuery.class, "stream", Stream.class),
                         panacheQuery);
 
-                // Function to convert Object[] to the custom type (using the generated static convert method)
-                FunctionCreator function = methodCreator.createFunction(Function.class);
-                BytecodeCreator funcBytecode = function.getBytecode();
+                // Function to convert `originResultType` (Object[] or entity class)
+                // to the custom type (using the generated static convert method)
+                FunctionCreator customResultMappingFunction = methodCreator.createFunction(Function.class);
+                BytecodeCreator funcBytecode = customResultMappingFunction.getBytecode();
                 ResultHandle obj = funcBytecode.invokeStaticMethod(
                         MethodDescriptor.ofMethod(customResultType.toString(), "convert_" + methodName,
                                 customResultType.toString(),
-                                Object[].class.getName()),
+                                originalResultType),
                         funcBytecode.getMethodParam(0));
                 funcBytecode.returnValue(obj);
 
                 stream = methodCreator.invokeInterfaceMethod(
                         MethodDescriptor.ofMethod(Stream.class, "map", Stream.class, Function.class),
-                        stream, function.getInstance());
+                        stream, customResultMappingFunction.getInstance());
 
                 // Re-collect the stream into a list
                 ResultHandle collector = methodCreator.invokeStaticMethod(
@@ -158,6 +184,10 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
                         MethodDescriptor.ofMethod(Iterable.class, "iterator", Iterator.class),
                         list);
                 methodCreator.returnValue(iterator);
+            } else if (DotNames.SET.equals(returnType)) {
+                ResultHandle set = methodCreator.newInstance(
+                        MethodDescriptor.ofConstructor(LinkedHashSet.class, Collection.class), list);
+                methodCreator.returnValue(set);
             }
             methodCreator.returnValue(list);
 
@@ -202,12 +232,32 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
             }
 
             methodCreator.returnValue(sliceResult);
-
-        } else if (isIntLongOrBoolean(returnType)) {
+        } else if (isHibernateSupportedReturnType(returnType)) {
             ResultHandle singleResult = methodCreator.invokeInterfaceMethod(
                     MethodDescriptor.ofMethod(PanacheQuery.class, "singleResult", Object.class),
                     panacheQuery);
             methodCreator.returnValue(singleResult);
+        } else if (customResultType != null) {
+            // when limit is specified we don't want to fail when there are multiple results, we just want to return the first one
+            String panacheQueryMethodToUse = (limit != null) ? "firstResult" : "singleResult";
+
+            TryBlock tryBlock = methodCreator.tryBlock();
+            ResultHandle singleResult = tryBlock.invokeInterfaceMethod(
+                    MethodDescriptor.ofMethod(PanacheQuery.class, panacheQueryMethodToUse, Object.class),
+                    panacheQuery);
+
+            ResultHandle customResult = tryBlock.invokeStaticMethod(
+                    MethodDescriptor.ofMethod(customResultType.toString(), "convert_" + methodName,
+                            customResultType.toString(),
+                            originalResultType),
+                    singleResult);
+
+            tryBlock.returnValue(customResult);
+
+            CatchBlockCreator catchBlock = tryBlock.addCatch(NoResultException.class);
+            catchBlock.returnValue(catchBlock.loadNull());
+
+            tryBlock.returnValue(customResult);
         } else {
             throw new IllegalArgumentException(
                     "Return type of method " + methodName + " of Repository " + repositoryClassInfo
@@ -215,9 +265,89 @@ protected void generateFindQueryResultHandling(MethodCreator methodCreator, Resu
         }
     }
 
-    protected boolean isIntLongOrBoolean(DotName dotName) {
-        return DotNames.BOOLEAN.equals(dotName) || DotNames.PRIMITIVE_BOOLEAN.equals(dotName)
-                || DotNames.INTEGER.equals(dotName) || DotNames.PRIMITIVE_INTEGER.equals(dotName)
-                || DotNames.LONG.equals(dotName) || DotNames.PRIMITIVE_LONG.equals(dotName);
+    /**
+     * Flush the underlying persistence context before executing the modifying query if enabled by {@link Modifying}
+     * annotation.
+     */
+    protected void handleFlushAutomatically(AnnotationInstance modifyingAnnotation, MethodCreator methodCreator,
+            FieldDescriptor entityClassFieldDescriptor) {
+        final AnnotationValue flushAutomatically = modifyingAnnotation != null ? modifyingAnnotation.value("flushAutomatically")
+                : null;
+        if (flushAutomatically != null && flushAutomatically.asBoolean()) {
+            methodCreator.invokeStaticMethod(
+                    MethodDescriptor.ofMethod(RepositorySupport.class, "flush", void.class, Class.class),
+                    methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()));
+        }
+    }
+
+    /**
+     * Clear the underlying persistence context after executing the modifying query if enabled by {@link Modifying}
+     * annotation.
+     */
+    protected void handleClearAutomatically(AnnotationInstance modifyingAnnotation, MethodCreator methodCreator,
+            FieldDescriptor entityClassFieldDescriptor) {
+        final AnnotationValue clearAutomatically = modifyingAnnotation != null ? modifyingAnnotation.value("clearAutomatically")
+                : null;
+        if (clearAutomatically != null && clearAutomatically.asBoolean()) {
+            methodCreator.invokeStaticMethod(
+                    MethodDescriptor.ofMethod(RepositorySupport.class, "clear", void.class, Class.class),
+                    methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()));
+        }
+    }
+
+    protected boolean isHibernateSupportedReturnType(DotName dotName) {
+        return dotName.equals(DotNames.OBJECT) || DotNames.HIBERNATE_PROVIDED_BASIC_TYPES.contains(dotName);
+    }
+
+    protected Type verifyQueryResultType(Type t, IndexView index) {
+        if (isHibernateSupportedReturnType(t.name())) {
+            return t;
+        }
+        if (t.kind() == Type.Kind.ARRAY) {
+            return verifyQueryResultType(t.asArrayType().component(), index);
+        } else if (t.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+            final List<Type> types = t.asParameterizedType().arguments();
+            if (types.size() == 1) {
+                return verifyQueryResultType(types.get(0), index);
+            } else {
+                for (Type type : types) {
+                    verifyQueryResultType(type, index);
+                }
+            }
+        } else {
+            final ClassInfo typeClass = index.getClassByName(t.name());
+            if (typeClass == null) {
+                throw new IllegalStateException(t.name() + " was not part of the Quarkus index");
+            }
+        }
+        return t;
+    }
+
+    protected DotName createSimpleInterfaceImpl(DotName ifaceName) {
+        String fullName = ifaceName.toString();
+
+        // package name: must be in the same package as the interface
+        final int index = fullName.lastIndexOf('.');
+        String packageName = "";
+        if (index > 0 && index < fullName.length() - 1) {
+            packageName = fullName.substring(0, index) + ".";
+        }
+
+        return DotName.createSimple(packageName
+                + (ifaceName.isInner() ? ifaceName.local() : ifaceName.withoutPackagePrefix()) + "_"
+                + HashUtil.sha1(ifaceName.toString()));
+    }
+
+    protected DotName getPrimitiveTypeName(DotName returnTypeName) {
+        if (DotNames.LONG.equals(returnTypeName)) {
+            return DotNames.PRIMITIVE_LONG;
+        }
+        if (DotNames.INTEGER.equals(returnTypeName)) {
+            return DotNames.PRIMITIVE_INTEGER;
+        }
+        if (DotNames.BOOLEAN.equals(returnTypeName)) {
+            return DotNames.PRIMITIVE_BOOLEAN;
+        }
+        return returnTypeName;
     }
 }
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java
index 21e1cdff82a32..0f34c735ddcf2 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/CustomQueryMethodsAdder.java
@@ -1,11 +1,15 @@
 package io.quarkus.spring.data.deployment.generate;
 
+import static io.quarkus.gizmo.FieldDescriptor.of;
+
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -20,7 +24,6 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
-import org.jboss.jandex.Type.Kind;
 
 import io.quarkus.deployment.bean.JavaBeanUtil;
 import io.quarkus.gizmo.ClassCreator;
@@ -30,10 +33,10 @@
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
 import io.quarkus.hibernate.orm.panache.runtime.AdditionalJpaOperations;
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
 import io.quarkus.panache.common.Parameters;
-import io.quarkus.runtime.util.HashUtil;
+import io.quarkus.panache.common.deployment.TypeBundle;
 import io.quarkus.spring.data.deployment.DotNames;
 import io.quarkus.spring.data.deployment.MethodNameParser;
 import io.quarkus.spring.data.runtime.TypesConverter;
@@ -46,15 +49,20 @@ public class CustomQueryMethodsAdder extends AbstractMethodsAdder {
     private static final Pattern SELECT_CLAUSE = Pattern.compile("select\\s+(.+)\\s+from", Pattern.CASE_INSENSITIVE);
     private static final Pattern FIELD_ALIAS = Pattern.compile(".*\\s+[as|AS]+\\s+([\\w\\.]+)");
     private static final Pattern FIELD_NAME = Pattern.compile("(\\w+).*");
+    private static final Pattern NAMED_PARAMETER = Pattern.compile("\\:(\\w+)\\b");
 
     private final IndexView index;
     private final ClassOutput nonBeansClassOutput;
     private final Consumer<String> customClassCreatedCallback;
+    private final FieldDescriptor operationsField;
 
-    public CustomQueryMethodsAdder(IndexView index, ClassOutput classOutput, Consumer<String> customClassCreatedCallback) {
+    public CustomQueryMethodsAdder(IndexView index, ClassOutput classOutput, Consumer<String> customClassCreatedCallback,
+            TypeBundle typeBundle) {
         this.index = index;
         this.nonBeansClassOutput = classOutput;
         this.customClassCreatedCallback = customClassCreatedCallback;
+        String operationsName = typeBundle.operations().dotName().toString();
+        operationsField = of(operationsName, "INSTANCE", operationsName);
     }
 
     public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescriptor, ClassInfo repositoryClassInfo,
@@ -143,8 +151,23 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
             try (MethodCreator methodCreator = classCreator.getMethodCreator(method.name(), methodReturnTypeDotName.toString(),
                     methodParameterTypesStr)) {
 
+                Set<String> usedNamedParameters = extractNamedParameters(queryString);
+                if (!usedNamedParameters.isEmpty()) {
+                    Set<String> missingParameters = new LinkedHashSet<>(usedNamedParameters);
+                    missingParameters.removeAll(namedParameterToIndex.keySet());
+                    if (!missingParameters.isEmpty()) {
+                        throw new IllegalArgumentException(
+                                method.name() + " of Repository " + repositoryClassInfo
+                                        + " is missing the named parameters " + missingParameters
+                                        + ", provided are " + namedParameterToIndex.keySet()
+                                        + ". Ensure that the parameters are correctly annotated with @Param.");
+                    }
+                }
                 if (isModifying) {
                     methodCreator.addAnnotation(Transactional.class);
+                    AnnotationInstance modifyingAnnotation = method.annotation(DotNames.SPRING_DATA_MODIFYING);
+                    handleFlushAutomatically(modifyingAnnotation, methodCreator, entityClassFieldDescriptor);
+
                     if (queryString.toLowerCase().startsWith("delete")) {
                         if (!DotNames.PRIMITIVE_LONG.equals(methodReturnTypeDotName)
                                 && !DotNames.LONG.equals(methodReturnTypeDotName)
@@ -161,21 +184,24 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                             ResultHandle parameters = generateParametersObject(namedParameterToIndex, methodCreator);
 
                             // call JpaOperations.delete
-                            deleteCount = methodCreator.invokeStaticMethod(
-                                    MethodDescriptor.ofMethod(JpaOperations.class, "delete", long.class,
+                            deleteCount = methodCreator.invokeVirtualMethod(
+                                    MethodDescriptor.ofMethod(AbstractJpaOperations.class, "delete", long.class,
                                             Class.class, String.class, Parameters.class),
+                                    methodCreator.readStaticField(operationsField),
                                     methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                                     methodCreator.load(deleteQueryString), parameters);
                         } else {
                             ResultHandle paramsArray = generateParamsArray(queryParameterIndexes, methodCreator);
 
                             // call JpaOperations.delete
-                            deleteCount = methodCreator.invokeStaticMethod(
-                                    MethodDescriptor.ofMethod(JpaOperations.class, "delete", long.class,
+                            deleteCount = methodCreator.invokeVirtualMethod(
+                                    MethodDescriptor.ofMethod(AbstractJpaOperations.class, "delete", long.class,
                                             Class.class, String.class, Object[].class),
+                                    methodCreator.readStaticField(operationsField),
                                     methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                                     methodCreator.load(deleteQueryString), paramsArray);
                         }
+                        handleClearAutomatically(modifyingAnnotation, methodCreator, entityClassFieldDescriptor);
 
                         if (DotNames.VOID.equals(methodReturnTypeDotName)) {
                             methodCreator.returnValue(null);
@@ -200,18 +226,21 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
 
                             // call JpaOperations.executeUpdate
                             updateCount = methodCreator.invokeStaticMethod(
-                                    MethodDescriptor.ofMethod(JpaOperations.class, "executeUpdate", int.class,
+                                    MethodDescriptor.ofMethod(AbstractJpaOperations.class, "executeUpdate", int.class,
                                             String.class, Map.class),
-                                    methodCreator.load(queryString), parametersMap);
+                                    methodCreator.load(queryString),
+                                    parametersMap);
                         } else {
                             ResultHandle paramsArray = generateParamsArray(queryParameterIndexes, methodCreator);
 
                             // call JpaOperations.executeUpdate
                             updateCount = methodCreator.invokeStaticMethod(
-                                    MethodDescriptor.ofMethod(JpaOperations.class, "executeUpdate", int.class,
-                                            String.class, Object[].class),
-                                    methodCreator.load(queryString), paramsArray);
+                                    MethodDescriptor.ofMethod(AbstractJpaOperations.class, "executeUpdate",
+                                            int.class, String.class, Object[].class),
+                                    methodCreator.load(queryString),
+                                    paramsArray);
                         }
+                        handleClearAutomatically(modifyingAnnotation, methodCreator, entityClassFieldDescriptor);
 
                         if (DotNames.VOID.equals(methodReturnTypeDotName)) {
                             methodCreator.returnValue(null);
@@ -244,12 +273,11 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
 
                     // Find the type of data used in the result
                     // e.g. method.returnType() is a List that may contain non-entity elements
-                    Type resultType = verifyQueryResultType(method.returnType());
+                    Type resultType = verifyQueryResultType(method.returnType(), index);
                     DotName customResultTypeName = resultType.name();
 
                     if (customResultTypeName.equals(entityClassInfo.name())
-                            || customResultTypeName.equals(DotNames.OBJECT)
-                            || isIntLongOrBoolean(customResultTypeName)) {
+                            || isHibernateSupportedReturnType(customResultTypeName)) {
                         // no special handling needed
                         customResultTypeName = null;
                     } else {
@@ -261,11 +289,11 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                         if (Modifier.isInterface(resultClassInfo.flags())) {
                             // Find the implementation name, and use that for subsequent query result generation
                             customResultTypeName = customResultTypeNames.computeIfAbsent(customResultTypeName,
-                                    k -> createImplDotName(resultType.name()));
+                                    k -> createSimpleInterfaceImpl(resultType.name()));
 
                             // Remember the parameters for this usage of the custom type, we'll deal with it later
                             customResultTypes.computeIfAbsent(customResultTypeName,
-                                    k -> new HashMap<String, List<String>>()).put(methodName, fieldNames);
+                                    k -> new HashMap<>()).put(methodName, fieldNames);
                         } else {
                             throw new IllegalArgumentException(
                                     "Query annotations may only use interfaces to map results to non-entity types. "
@@ -280,9 +308,10 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
 
                         // call JpaOperations.find()
                         panacheQuery = methodCreator.invokeStaticMethod(
-                                MethodDescriptor.ofMethod(AdditionalJpaOperations.class, "find", PanacheQuery.class,
-                                        Class.class, String.class, String.class, io.quarkus.panache.common.Sort.class,
-                                        Parameters.class),
+                                MethodDescriptor.ofMethod(AdditionalJpaOperations.class, "find",
+                                        PanacheQuery.class, AbstractJpaOperations.class, Class.class, String.class,
+                                        String.class, io.quarkus.panache.common.Sort.class, Parameters.class),
+                                methodCreator.readStaticField(operationsField),
                                 methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                                 methodCreator.load(queryString), methodCreator.load(countQueryString),
                                 generateSort(sortParameterIndex, methodCreator), parameters);
@@ -292,16 +321,18 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
 
                         // call JpaOperations.find()
                         panacheQuery = methodCreator.invokeStaticMethod(
-                                MethodDescriptor.ofMethod(AdditionalJpaOperations.class, "find", PanacheQuery.class,
-                                        Class.class, String.class, String.class, io.quarkus.panache.common.Sort.class,
-                                        Object[].class),
+                                MethodDescriptor.ofMethod(AdditionalJpaOperations.class, "find",
+                                        PanacheQuery.class, AbstractJpaOperations.class, Class.class, String.class,
+                                        String.class, io.quarkus.panache.common.Sort.class, Object[].class),
+                                methodCreator.readStaticField(operationsField),
                                 methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                                 methodCreator.load(queryString), methodCreator.load(countQueryString),
                                 generateSort(sortParameterIndex, methodCreator), paramsArray);
                     }
 
                     generateFindQueryResultHandling(methodCreator, panacheQuery, pageableParameterIndex, repositoryClassInfo,
-                            entityClassInfo, methodReturnTypeDotName, null, method.name(), customResultTypeName);
+                            entityClassInfo, methodReturnTypeDotName, null, method.name(), customResultTypeName,
+                            Object[].class.getName());
                 }
 
             }
@@ -315,6 +346,15 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
         }
     }
 
+    private Set<String> extractNamedParameters(String queryString) {
+        Set<String> namedParameters = new LinkedHashSet<>();
+        final Matcher matcher = NAMED_PARAMETER.matcher(queryString);
+        while (matcher.find()) {
+            namedParameters.add(matcher.group(1));
+        }
+        return namedParameters;
+    }
+
     // we currently only support the 'value' attribute of @Query
     private void verifyQueryAnnotation(AnnotationInstance queryInstance, String methodName, String repositoryName) {
         List<AnnotationValue> values = queryInstance.values();
@@ -363,35 +403,6 @@ private ResultHandle generateSort(Integer sortParameterIndex, MethodCreator meth
         return sort;
     }
 
-    // Make sure the return type is referencing a class we have indexed 
-    // somewhere along the way (e.g. non-entity return types in @Query methods)
-    // Unless it is some kind of collection containing multiple types, 
-    // return the type used in the query result.
-    private Type verifyQueryResultType(Type t) {
-        if (isIntLongOrBoolean(t.name())) {
-            return t;
-        }
-        if (t.kind() == Kind.ARRAY) {
-            return verifyQueryResultType(t.asArrayType().component());
-        } else if (t.kind() == Kind.PARAMETERIZED_TYPE) {
-            List<Type> list = t.asParameterizedType().arguments();
-            if (list.size() == 1) {
-                return verifyQueryResultType(list.get(0));
-            } else {
-                for (Type x : list) {
-                    verifyQueryResultType(x);
-                }
-                return t;
-            }
-        } else if (!DotNames.OBJECT.equals(t.name())) {
-            ClassInfo typeClassInfo = index.getClassByName(t.name());
-            if (typeClassInfo == null) {
-                throw new IllegalStateException(t.name() + " was not part of the Quarkus index");
-            }
-        }
-        return t;
-    }
-
     private List<String> getFieldNames(String queryString) {
         Matcher matcher = SELECT_CLAUSE.matcher(queryString);
         if (matcher.find()) {
@@ -418,21 +429,6 @@ private List<String> getFieldNames(String queryString) {
         return Collections.emptyList();
     }
 
-    private DotName createImplDotName(DotName ifaceName) {
-        String fullName = ifaceName.toString();
-
-        // package name: must be in the same package as the interface
-        final int index = fullName.lastIndexOf('.');
-        String packageName = "";
-        if (index > 0 && index < fullName.length() - 1) {
-            packageName = fullName.substring(0, index) + ".";
-        }
-
-        return DotName.createSimple(packageName
-                + (ifaceName.isInner() ? ifaceName.local() : ifaceName.withoutPackagePrefix()) + "_"
-                + HashUtil.sha1(ifaceName.toString()));
-    }
-
     private void generateCustomResultTypes(DotName interfaceName, DotName implName, Map<String, List<String>> queryMethods) {
 
         ClassInfo interfaceInfo = index.getClassByName(interfaceName);
@@ -511,18 +507,4 @@ private ResultHandle castReturnValue(MethodCreator methodCreator, ResultHandle r
         }
         return resultHandle;
     }
-
-    private DotName getPrimitiveTypeName(DotName returnTypeName) {
-        if (DotNames.LONG.equals(returnTypeName)) {
-            return DotNames.PRIMITIVE_LONG;
-        }
-        if (DotNames.INTEGER.equals(returnTypeName)) {
-            return DotNames.PRIMITIVE_INTEGER;
-        }
-        if (DotNames.BOOLEAN.equals(returnTypeName)) {
-            return DotNames.PRIMITIVE_BOOLEAN;
-        }
-        return returnTypeName;
-    }
-
 }
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java
index ba869756ea38c..cbdafe1cf5255 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/DerivedMethodsAdder.java
@@ -1,10 +1,17 @@
 package io.quarkus.spring.data.deployment.generate;
 
+import static io.quarkus.gizmo.FieldDescriptor.of;
+
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
 
 import javax.transaction.Transactional;
 
+import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
@@ -13,13 +20,17 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 
+import io.quarkus.deployment.bean.JavaBeanUtil;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
-import io.quarkus.hibernate.orm.panache.PanacheQuery;
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
+import io.quarkus.hibernate.orm.panache.runtime.AdditionalJpaOperations;
+import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.hibernate.common.runtime.PanacheJpaUtil;
 import io.quarkus.spring.data.deployment.DotNames;
 import io.quarkus.spring.data.deployment.MethodNameParser;
 import io.quarkus.spring.data.runtime.TypesConverter;
@@ -27,15 +38,37 @@
 public class DerivedMethodsAdder extends AbstractMethodsAdder {
 
     private final IndexView index;
+    private final String operationsName;
+    private final FieldDescriptor operationsField;
+    private final ClassOutput nonBeansClassOutput;
+    private final Consumer<String> projectionClassCreatedCallback;
 
-    public DerivedMethodsAdder(IndexView index) {
+    public DerivedMethodsAdder(IndexView index, TypeBundle typeBundle, ClassOutput nonBeansClassOutput,
+            Consumer<String> projectionClassCreatedCallback) {
         this.index = index;
+        operationsName = typeBundle.operations().dotName().toString();
+        operationsField = of(operationsName, "INSTANCE", operationsName);
+        this.nonBeansClassOutput = nonBeansClassOutput;
+        this.projectionClassCreatedCallback = projectionClassCreatedCallback;
     }
 
     public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescriptor,
             String generatedClassName, ClassInfo repositoryClassInfo, ClassInfo entityClassInfo) {
         MethodNameParser methodNameParser = new MethodNameParser(entityClassInfo, index);
-        for (MethodInfo method : repositoryClassInfo.methods()) {
+        List<MethodInfo> repoMethods = new ArrayList<>(repositoryClassInfo.methods());
+
+        // Remember custom return type methods: {resultType:[methodName]}
+        Map<DotName, List<String>> customResultTypes = new HashMap<>(3);
+        Map<DotName, DotName> customResultTypeImplNames = new HashMap<>(3);
+
+        //As intermediate interfaces are supported for spring data repositories, we need to search the methods declared in such interfaced and add them to the methods to implement list
+        for (DotName extendedInterface : repositoryClassInfo.interfaceNames()) {
+            if (GenerationUtil.isIntermediateRepository(extendedInterface, index)) {
+                List<MethodInfo> methods = index.getClassByName(extendedInterface).methods();
+                repoMethods.addAll(methods);
+            }
+        }
+        for (MethodInfo method : repoMethods) {
             if (method.annotation(DotNames.SPRING_DATA_QUERY) != null) { // handled by CustomQueryMethodsAdder
                 continue;
             }
@@ -44,6 +77,10 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                 continue;
             }
 
+            if (!Modifier.isAbstract(method.flags())) { // skip defaults methods
+                continue;
+            }
+
             Type returnType = method.returnType();
 
             List<Type> parameters = method.parameters();
@@ -106,7 +143,7 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                                         org.springframework.data.domain.Sort.class),
                                 methodCreator.getMethodParam(sortParameterIndex));
                     } else if (parseResult.getSort() != null) {
-                        finalQuery += JpaOperations.toOrderBy(parseResult.getSort());
+                        finalQuery += PanacheJpaUtil.toOrderBy(parseResult.getSort());
                     } else if (pageableParameterIndex != null) {
                         ResultHandle pageable = methodCreator.getMethodParam(pageableParameterIndex);
                         ResultHandle pageableSort = methodCreator.invokeInterfaceMethod(
@@ -120,14 +157,41 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                     }
 
                     // call JpaOperations.find()
-                    ResultHandle panacheQuery = methodCreator.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "find", PanacheQuery.class,
+                    ResultHandle panacheQuery = methodCreator.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "find", Object.class,
                                     Class.class, String.class, io.quarkus.panache.common.Sort.class, Object[].class),
+                            methodCreator.readStaticField(operationsField),
                             methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                             methodCreator.load(finalQuery), sort, paramsArray);
 
+                    Type resultType = verifyQueryResultType(method.returnType(), index);
+                    DotName customResultTypeName = resultType.name();
+
+                    if (customResultTypeName.equals(entityClassInfo.name())
+                            || isHibernateSupportedReturnType(customResultTypeName)) {
+                        // no special handling needed
+                        customResultTypeName = null;
+                    } else {
+                        // If the custom type is an interface, we need to generate the implementation
+                        ClassInfo resultClassInfo = index.getClassByName(customResultTypeName);
+                        if (Modifier.isInterface(resultClassInfo.flags())) {
+                            // Find the implementation name, and use that for subsequent query result generation
+                            customResultTypeName = customResultTypeImplNames.computeIfAbsent(customResultTypeName,
+                                    k -> createSimpleInterfaceImpl(resultType.name()));
+
+                            // Remember the parameters for this usage of the custom type, we'll deal with it later
+                            customResultTypes.computeIfAbsent(customResultTypeName,
+                                    k -> new ArrayList<>()).add(method.name());
+                        } else {
+                            throw new IllegalArgumentException(
+                                    method.name() + " of Repository " + repositoryClassInfo
+                                            + " can only use interfaces to map results to non-entity types.");
+                        }
+                    }
+
                     generateFindQueryResultHandling(methodCreator, panacheQuery, pageableParameterIndex, repositoryClassInfo,
-                            entityClassInfo, returnType.name(), parseResult.getTopCount(), method.name(), null);
+                            entityClassInfo, returnType.name(), parseResult.getTopCount(), method.name(), customResultTypeName,
+                            entityClassInfo.name().toString());
 
                 } else if (parseResult.getQueryType() == MethodNameParser.QueryType.COUNT) {
                     if (!DotNames.PRIMITIVE_LONG.equals(returnType.name()) && !DotNames.LONG.equals(returnType.name())) {
@@ -143,9 +207,10 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                     }
 
                     // call JpaOperations.count()
-                    ResultHandle count = methodCreator.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "count", long.class,
+                    ResultHandle count = methodCreator.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "count", long.class,
                                     Class.class, String.class, Object[].class),
+                            methodCreator.readStaticField(operationsField),
                             methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                             methodCreator.load(parseResult.getQuery()), paramsArray);
 
@@ -165,9 +230,10 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                     }
 
                     // call JpaOperations.exists()
-                    ResultHandle exists = methodCreator.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "exists", boolean.class,
+                    ResultHandle exists = methodCreator.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "exists", boolean.class,
                                     Class.class, String.class, Object[].class),
+                            methodCreator.readStaticField(operationsField),
                             methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                             methodCreator.load(parseResult.getQuery()), paramsArray);
 
@@ -188,13 +254,19 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                     }
                     methodCreator.addAnnotation(Transactional.class);
 
+                    AnnotationInstance modifyingAnnotation = method.annotation(DotNames.SPRING_DATA_MODIFYING);
+                    handleFlushAutomatically(modifyingAnnotation, methodCreator, entityClassFieldDescriptor);
+
                     // call JpaOperations.delete()
                     ResultHandle delete = methodCreator.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "delete", long.class,
-                                    Class.class, String.class, Object[].class),
+                            MethodDescriptor.ofMethod(AdditionalJpaOperations.class, "deleteWithCascade",
+                                    long.class, AbstractJpaOperations.class, Class.class, String.class, Object[].class),
+                            methodCreator.readStaticField(operationsField),
                             methodCreator.readInstanceField(entityClassFieldDescriptor, methodCreator.getThis()),
                             methodCreator.load(parseResult.getQuery()), paramsArray);
 
+                    handleClearAutomatically(modifyingAnnotation, methodCreator, entityClassFieldDescriptor);
+
                     if (DotNames.VOID.equals(returnType.name())) {
                         methodCreator.returnValue(null);
                     }
@@ -202,5 +274,81 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
                 }
             }
         }
+        for (Map.Entry<DotName, DotName> mapping : customResultTypeImplNames.entrySet()) {
+            DotName interfaceName = mapping.getKey();
+            DotName implName = mapping.getValue();
+            generateCustomResultTypes(interfaceName, implName, entityClassInfo, customResultTypes.get(implName));
+            projectionClassCreatedCallback.accept(implName.toString());
+        }
+    }
+
+    private void generateCustomResultTypes(DotName interfaceName, DotName implName, ClassInfo entityClassInfo,
+            List<String> queryMethods) {
+
+        ClassInfo interfaceInfo = index.getClassByName(interfaceName);
+
+        try (ClassCreator implClassCreator = ClassCreator.builder().classOutput(nonBeansClassOutput)
+                .interfaces(interfaceName.toString()).className(implName.toString())
+                .build()) {
+
+            Map<String, FieldDescriptor> fields = new HashMap<>(3);
+
+            for (MethodInfo method : interfaceInfo.methods()) {
+                String getterName = method.name();
+                String propertyName = JavaBeanUtil.getPropertyNameFromGetter(getterName);
+
+                Type returnType = method.returnType();
+                if (returnType.kind() == Type.Kind.VOID) {
+                    throw new IllegalArgumentException("Method " + method.name() + " of interface " + interfaceName
+                            + " is not a getter method since it returns void");
+                }
+                DotName fieldTypeName = getPrimitiveTypeName(returnType.name());
+
+                FieldDescriptor field = implClassCreator.getFieldCreator(propertyName, fieldTypeName.toString())
+                        .getFieldDescriptor();
+
+                // create getter (based on the interface)
+                try (MethodCreator getter = implClassCreator.getMethodCreator(getterName, returnType.toString())) {
+                    getter.setModifiers(Modifier.PUBLIC);
+                    getter.returnValue(getter.readInstanceField(field, getter.getThis()));
+                }
+
+                fields.put(getterName, field);
+            }
+
+            // Add static methods to convert from Object[] to this type
+            for (String queryMethod : queryMethods) {
+                try (MethodCreator convert = implClassCreator.getMethodCreator("convert_" + queryMethod,
+                        implName.toString(), entityClassInfo.name().toString())) {
+                    convert.setModifiers(Modifier.STATIC);
+
+                    ResultHandle newObject = convert.newInstance(MethodDescriptor.ofConstructor(implName.toString()));
+
+                    ResultHandle entity = convert.getMethodParam(0);
+                    final List<MethodInfo> availableMethods = entityClassInfo.methods();
+                    for (Map.Entry<String, FieldDescriptor> field : fields.entrySet()) {
+                        if (!getterExists(availableMethods, field.getKey())) {
+                            throw new IllegalArgumentException(field.getKey() + " method does not exists in "
+                                    + entityClassInfo.name().toString() + " class.");
+                        }
+
+                        FieldDescriptor f = field.getValue();
+                        convert.writeInstanceField(f, newObject, convert.invokeVirtualMethod(
+                                MethodDescriptor.ofMethod(entityClassInfo.name().toString(), field.getKey(), f.getType()),
+                                entity));
+                    }
+                    convert.returnValue(newObject);
+                }
+            }
+        }
+    }
+
+    private boolean getterExists(List<MethodInfo> methods, String getterName) {
+        for (MethodInfo method : methods) {
+            if (method.name().equals(getterName)) {
+                return true;
+            }
+        }
+        return false;
     }
 }
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/GenerationUtil.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/GenerationUtil.java
index cabec776f2410..3303d94361f87 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/GenerationUtil.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/GenerationUtil.java
@@ -20,16 +20,31 @@ public final class GenerationUtil {
     private GenerationUtil() {
     }
 
-    static List<DotName> extendedSpringDataRepos(ClassInfo repositoryToImplement) {
+    static List<DotName> extendedSpringDataRepos(ClassInfo repositoryToImplement, IndexView index) {
         List<DotName> result = new ArrayList<>();
         for (DotName interfaceName : repositoryToImplement.interfaceNames()) {
             if (DotNames.SUPPORTED_REPOSITORIES.contains(interfaceName)) {
                 result.add(interfaceName);
+            } else {
+                ClassInfo intermediateInterfaces = index.getClassByName(interfaceName);
+                List<DotName> dns = intermediateInterfaces.interfaceNames();
+                for (DotName in : dns) {
+                    result.addAll(extendedSpringDataRepos(intermediateInterfaces, index));
+                }
             }
         }
         return result;
     }
 
+    static boolean isIntermediateRepository(DotName interfaceName, IndexView indexView) {
+        if (!DotNames.SUPPORTED_REPOSITORIES.contains(interfaceName)) {
+            ClassInfo intermediateInterface = indexView.getClassByName(interfaceName);
+            List<DotName> extendedSpringDataRepos = extendedSpringDataRepos(intermediateInterface, indexView);
+            return DotNames.SUPPORTED_REPOSITORIES.stream().anyMatch(item -> extendedSpringDataRepos.contains(item));
+        }
+        return false;
+    }
+
     static Set<MethodInfo> interfaceMethods(Collection<DotName> interfaces, IndexView index) {
         Set<MethodInfo> result = new HashSet<>();
         for (DotName dotName : interfaces) {
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java
index 068ae382398d2..5dc6cb3c091e6 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/SpringDataRepositoryCreator.java
@@ -27,6 +27,7 @@
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.panache.common.deployment.TypeBundle;
 import io.quarkus.runtime.util.HashUtil;
 import io.quarkus.spring.data.deployment.DotNames;
 
@@ -40,19 +41,21 @@ public class SpringDataRepositoryCreator {
     private final CustomQueryMethodsAdder customQueryMethodsAdder;
 
     public SpringDataRepositoryCreator(ClassOutput classOutput, ClassOutput otherClassOutput, IndexView index,
-            Consumer<String> fragmentImplClassResolvedCallback, Consumer<String> customClassCreatedCallback) {
+            Consumer<String> fragmentImplClassResolvedCallback,
+            Consumer<String> customClassCreatedCallback, TypeBundle typeBundle) {
         this.classOutput = classOutput;
         this.index = index;
         this.fragmentMethodsAdder = new FragmentMethodsAdder(fragmentImplClassResolvedCallback, index);
-        this.stockMethodsAdder = new StockMethodsAdder(index);
-        this.derivedMethodsAdder = new DerivedMethodsAdder(index);
+        this.stockMethodsAdder = new StockMethodsAdder(index, typeBundle);
+        this.derivedMethodsAdder = new DerivedMethodsAdder(index, typeBundle, otherClassOutput, customClassCreatedCallback);
 
         // custom queries may generate non-bean classes
-        this.customQueryMethodsAdder = new CustomQueryMethodsAdder(index, otherClassOutput, customClassCreatedCallback);
+        this.customQueryMethodsAdder = new CustomQueryMethodsAdder(index, otherClassOutput, customClassCreatedCallback,
+                typeBundle);
     }
 
-    public void implementCrudRepository(ClassInfo repositoryToImplement) {
-        Map.Entry<DotName, DotName> extraTypesResult = extractIdAndEntityTypes(repositoryToImplement);
+    public void implementCrudRepository(ClassInfo repositoryToImplement, IndexView indexView) {
+        Map.Entry<DotName, DotName> extraTypesResult = extractIdAndEntityTypes(repositoryToImplement, indexView);
 
         String idTypeStr = extraTypesResult.getKey().toString();
         DotName entityDotName = extraTypesResult.getValue();
@@ -71,7 +74,8 @@ public void implementCrudRepository(ClassInfo repositoryToImplement) {
         List<DotName> interfaceNames = repositoryToImplement.interfaceNames();
         List<DotName> fragmentNamesToImplement = new ArrayList<>(interfaceNames.size());
         for (DotName interfaceName : interfaceNames) {
-            if (!DotNames.SUPPORTED_REPOSITORIES.contains(interfaceName)) {
+            if (!DotNames.SUPPORTED_REPOSITORIES.contains(interfaceName)
+                    && !GenerationUtil.isIntermediateRepository(interfaceName, indexView)) {
                 fragmentNamesToImplement.add(interfaceName);
             }
         }
@@ -116,7 +120,7 @@ public void implementCrudRepository(ClassInfo repositoryToImplement) {
         }
     }
 
-    private Map.Entry<DotName, DotName> extractIdAndEntityTypes(ClassInfo repositoryToImplement) {
+    private Map.Entry<DotName, DotName> extractIdAndEntityTypes(ClassInfo repositoryToImplement, IndexView indexView) {
         AnnotationInstance repositoryDefinitionInstance = repositoryToImplement
                 .classAnnotation(DotNames.SPRING_DATA_REPOSITORY_DEFINITION);
         if (repositoryDefinitionInstance != null) {
@@ -130,7 +134,7 @@ private Map.Entry<DotName, DotName> extractIdAndEntityTypes(ClassInfo repository
         // we need to pull the entity and ID types for the Spring Data generic types
         // we also need to make sure that the user didn't try to specify multiple different types
         // in the same interface (which is possible if only Repository is used)
-        for (DotName extendedSpringDataRepo : GenerationUtil.extendedSpringDataRepos(repositoryToImplement)) {
+        for (DotName extendedSpringDataRepo : GenerationUtil.extendedSpringDataRepos(repositoryToImplement, indexView)) {
             List<Type> types = JandexUtil.resolveTypeParameters(repositoryToImplement.name(), extendedSpringDataRepo, index);
             if (!(types.get(0) instanceof ClassType)) {
                 throw new IllegalArgumentException(
diff --git a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java
index c517473797d6f..5e36766fa9c42 100644
--- a/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java
+++ b/extensions/spring-data-jpa/deployment/src/main/java/io/quarkus/spring/data/deployment/generate/StockMethodsAdder.java
@@ -1,5 +1,6 @@
 package io.quarkus.spring.data.deployment.generate;
 
+import static io.quarkus.gizmo.FieldDescriptor.of;
 import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
 import java.lang.reflect.Modifier;
@@ -42,7 +43,9 @@
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.hibernate.orm.panache.PanacheQuery;
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
+import io.quarkus.hibernate.orm.panache.runtime.AdditionalJpaOperations;
+import io.quarkus.panache.common.deployment.TypeBundle;
 import io.quarkus.spring.data.deployment.DotNames;
 import io.quarkus.spring.data.runtime.FunctionalityNotImplemented;
 import io.quarkus.spring.data.runtime.RepositorySupport;
@@ -53,9 +56,12 @@ public class StockMethodsAdder {
     private static Set<MethodInfo> ALL_SPRING_DATA_REPOSITORY_METHODS = null;
 
     private final IndexView index;
+    private final FieldDescriptor operationsField;
 
-    public StockMethodsAdder(IndexView index) {
+    public StockMethodsAdder(IndexView index, TypeBundle typeBundle) {
         this.index = index;
+        String operationsName = typeBundle.operations().dotName().toString();
+        operationsField = of(operationsName, "INSTANCE", operationsName);
     }
 
     public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescriptor,
@@ -104,6 +110,8 @@ public void add(ClassCreator classCreator, FieldDescriptor entityClassFieldDescr
         generateDelete(classCreator, generatedClassName, entityTypeStr, allMethodsToBeImplementedToResult);
         generateDeleteAllWithIterable(classCreator, generatedClassName, entityTypeStr, allMethodsToBeImplementedToResult);
         generateDeleteAll(classCreator, entityClassFieldDescriptor, generatedClassName, allMethodsToBeImplementedToResult);
+        generateDeleteAllInBatch(classCreator, entityClassFieldDescriptor, generatedClassName,
+                allMethodsToBeImplementedToResult);
 
         handleUnimplementedMethods(classCreator, allMethodsToBeImplementedToResult);
     }
@@ -218,15 +226,16 @@ private boolean isPersistable(DotName entityDotName) {
     }
 
     private void generatePersistAndReturn(ResultHandle entity, BytecodeCreator bytecodeCreator) {
-        bytecodeCreator.invokeStaticMethod(
-                MethodDescriptor.ofMethod(JpaOperations.class, "persist", void.class, Object.class),
+        bytecodeCreator.invokeVirtualMethod(
+                MethodDescriptor.ofMethod(AbstractJpaOperations.class, "persist", void.class, Object.class),
+                bytecodeCreator.readStaticField(operationsField),
                 entity);
         bytecodeCreator.returnValue(entity);
     }
 
     private void generateMergeAndReturn(ResultHandle entity, BytecodeCreator bytecodeCreator) {
         ResultHandle entityManager = bytecodeCreator.invokeStaticMethod(
-                ofMethod(JpaOperations.class, "getEntityManager", EntityManager.class));
+                ofMethod(AbstractJpaOperations.class, "getEntityManager", EntityManager.class));
         entity = bytecodeCreator.invokeInterfaceMethod(
                 MethodDescriptor.ofMethod(EntityManager.class, "merge", Object.class, Object.class),
                 entityManager, entity);
@@ -243,7 +252,7 @@ private ResultHandle generateObtainValue(MethodCreator methodCreator, DotName en
         if (annotationTarget instanceof FieldInfo) {
             FieldInfo fieldInfo = annotationTarget.asField();
             if (Modifier.isPublic(fieldInfo.flags())) {
-                return methodCreator.readInstanceField(FieldDescriptor.of(fieldInfo), entity);
+                return methodCreator.readInstanceField(of(fieldInfo), entity);
             }
 
             String getterMethodName = JavaBeanUtil.getGetterName(fieldInfo.name(), fieldInfo.type().name());
@@ -292,8 +301,9 @@ private void generateSaveAndFlush(ClassCreator classCreator,
 
                     ResultHandle entity = saveAndFlush.getMethodParam(0);
                     entity = saveAndFlush.invokeVirtualMethod(save, saveAndFlush.getThis(), entity);
-                    saveAndFlush.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "flush", void.class));
+                    saveAndFlush.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "flush", void.class),
+                            saveAndFlush.readStaticField(operationsField));
                     saveAndFlush.returnValue(entity);
                 }
                 try (MethodCreator bridgeSave = classCreator.getMethodCreator(bridgeSaveAndFlushDescriptor)) {
@@ -383,8 +393,9 @@ private void generateFlush(ClassCreator classCreator, String generatedClassName,
             if (!classCreator.getExistingMethods().contains(flushDescriptor)) {
                 try (MethodCreator flush = classCreator.getMethodCreator(flushDescriptor)) {
                     flush.addAnnotation(Transactional.class);
-                    flush.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "flush", void.class));
+                    flush.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "flush", void.class),
+                            flush.readStaticField(operationsField));
                     flush.returnValue(null);
                 }
             }
@@ -410,9 +421,10 @@ private void generateFindById(ClassCreator classCreator, FieldDescriptor entityC
                     findById.setSignature(String.format("(L%s;)Ljava/util/Optional<L%s;>;",
                             idTypeStr.replace('.', '/'), entityTypeStr.replace('.', '/')));
                     ResultHandle id = findById.getMethodParam(0);
-                    ResultHandle entity = findById.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "findById", Object.class, Class.class,
+                    ResultHandle entity = findById.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "findById", Object.class, Class.class,
                                     Object.class),
+                            findById.readStaticField(operationsField),
                             findById.readInstanceField(entityClassFieldDescriptor, findById.getThis()), id);
                     ResultHandle optional = findById.invokeStaticMethod(
                             MethodDescriptor.ofMethod(Optional.class, "ofNullable", Optional.class, Object.class),
@@ -499,11 +511,13 @@ private void generateGetOne(ClassCreator classCreator, FieldDescriptor entityCla
 
             if (!classCreator.getExistingMethods().contains(getOneDescriptor)) {
                 try (MethodCreator findById = classCreator.getMethodCreator(getOneDescriptor)) {
-                    ResultHandle id = findById.getMethodParam(0);
-                    ResultHandle entity = findById.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(RepositorySupport.class, "getOne", Object.class, Class.class,
-                                    Object.class),
-                            findById.readInstanceField(entityClassFieldDescriptor, findById.getThis()), id);
+
+                    ResultHandle entity = findById.invokeStaticMethod(ofMethod(RepositorySupport.class, "getOne",
+                            Object.class, AbstractJpaOperations.class, Class.class, Object.class),
+                            findById.readStaticField(operationsField),
+                            findById.readInstanceField(entityClassFieldDescriptor, findById.getThis()),
+                            findById.getMethodParam(0));
+
                     findById.returnValue(entity);
                 }
                 try (MethodCreator bridgeGetOne = classCreator.getMethodCreator(bridgeGetOneDescriptor)) {
@@ -535,8 +549,9 @@ private void generateFindAll(ClassCreator classCreator, FieldDescriptor entityCl
                 try (MethodCreator findAll = classCreator.getMethodCreator(findAllDescriptor)) {
                     findAll.setSignature(String.format("()Ljava/util/List<L%s;>;",
                             entityTypeStr.replace('.', '/')));
-                    ResultHandle panacheQuery = findAll.invokeStaticMethod(
-                            ofMethod(JpaOperations.class, "findAll", PanacheQuery.class, Class.class),
+                    ResultHandle panacheQuery = findAll.invokeVirtualMethod(
+                            ofMethod(AbstractJpaOperations.class, "findAll", Object.class, Class.class),
+                            findAll.readStaticField(operationsField),
                             findAll.readInstanceField(entityClassFieldDescriptor, findAll.getThis()));
                     ResultHandle list = findAll.invokeInterfaceMethod(
                             ofMethod(PanacheQuery.class, "list", List.class),
@@ -576,9 +591,10 @@ private void generateFindAllWithSort(ClassCreator classCreator, FieldDescriptor
                                     org.springframework.data.domain.Sort.class),
                             findAll.getMethodParam(0));
 
-                    ResultHandle panacheQuery = findAll.invokeStaticMethod(
-                            ofMethod(JpaOperations.class, "findAll", PanacheQuery.class, Class.class,
+                    ResultHandle panacheQuery = findAll.invokeVirtualMethod(
+                            ofMethod(AbstractJpaOperations.class, "findAll", Object.class, Class.class,
                                     io.quarkus.panache.common.Sort.class),
+                            findAll.readStaticField(operationsField),
                             findAll.readInstanceField(entityClassFieldDescriptor, findAll.getThis()), sort);
                     ResultHandle list = findAll.invokeInterfaceMethod(
                             ofMethod(PanacheQuery.class, "list", List.class),
@@ -634,15 +650,17 @@ private void generateFindAllWithPageable(ClassCreator classCreator, FieldDescrip
                     BytecodeCreator sortNullFalse = sortNullBranch.falseBranch();
                     AssignableResultHandle panacheQueryVar = findAll.createVariable(PanacheQuery.class);
 
-                    ResultHandle panacheQueryWithoutSort = sortNullTrue.invokeStaticMethod(
-                            ofMethod(JpaOperations.class, "findAll", PanacheQuery.class, Class.class),
+                    ResultHandle panacheQueryWithoutSort = sortNullTrue.invokeVirtualMethod(
+                            ofMethod(AbstractJpaOperations.class, "findAll", Object.class, Class.class),
+                            sortNullTrue.readStaticField(operationsField),
                             sortNullTrue.readInstanceField(entityClassFieldDescriptor, sortNullTrue.getThis()));
                     sortNullTrue.assign(panacheQueryVar, panacheQueryWithoutSort);
                     sortNullTrue.breakScope();
 
-                    ResultHandle panacheQueryWithSort = sortNullFalse.invokeStaticMethod(
-                            ofMethod(JpaOperations.class, "findAll", PanacheQuery.class, Class.class,
+                    ResultHandle panacheQueryWithSort = sortNullFalse.invokeVirtualMethod(
+                            ofMethod(AbstractJpaOperations.class, "findAll", Object.class, Class.class,
                                     io.quarkus.panache.common.Sort.class),
+                            sortNullFalse.readStaticField(operationsField),
                             sortNullFalse.readInstanceField(entityClassFieldDescriptor, sortNullFalse.getThis()), panacheSort);
                     sortNullFalse.assign(panacheQueryVar, panacheQueryWithSort);
                     sortNullFalse.breakScope();
@@ -695,15 +713,20 @@ private void generateFindAllById(ClassCreator classCreator, FieldDescriptor enti
                     if ((idField != null) &&
                             (DotNames.LONG.equals(idField.type().name()) || DotNames.INTEGER.equals(idField.type().name())
                                     || DotNames.STRING.equals(idField.type().name()))) {
-                        list = findAllById.invokeStaticMethod(
-                                MethodDescriptor.ofMethod(RepositorySupport.class, "findByIds", List.class,
-                                        Class.class, String.class, Iterable.class),
-                                entityClass, findAllById.load(idField.name()), findAllById.getMethodParam(0));
+                        MethodDescriptor method = ofMethod(RepositorySupport.class, "findByIds",
+                                List.class, AbstractJpaOperations.class, Class.class, String.class,
+                                Iterable.class);
+                        list = findAllById.invokeStaticMethod(method,
+                                findAllById.readStaticField(operationsField),
+                                entityClass,
+                                findAllById.load(idField.name()), findAllById.getMethodParam(0));
                     } else {
                         list = findAllById.invokeStaticMethod(
-                                MethodDescriptor.ofMethod(RepositorySupport.class, "findByIds", List.class,
-                                        Class.class, Iterable.class),
-                                entityClass, findAllById.getMethodParam(0));
+                                MethodDescriptor.ofMethod(RepositorySupport.class, "findByIds",
+                                        List.class, AbstractJpaOperations.class, Class.class, Iterable.class),
+                                findAllById.readStaticField(operationsField),
+                                entityClass,
+                                findAllById.getMethodParam(0));
                     }
 
                     findAllById.returnValue(list);
@@ -746,8 +769,9 @@ private void generateCount(ClassCreator classCreator, FieldDescriptor entityClas
         if (allMethodsToBeImplementedToResult.containsKey(countDescriptor)) {
             if (!classCreator.getExistingMethods().contains(countDescriptor)) {
                 try (MethodCreator count = classCreator.getMethodCreator(countDescriptor)) {
-                    ResultHandle result = count.invokeStaticMethod(
-                            ofMethod(JpaOperations.class, "count", long.class, Class.class),
+                    ResultHandle result = count.invokeVirtualMethod(
+                            ofMethod(AbstractJpaOperations.class, "count", long.class, Class.class),
+                            count.readStaticField(operationsField),
                             count.readInstanceField(entityClassFieldDescriptor, count.getThis()));
                     count.returnValue(result);
                 }
@@ -775,10 +799,10 @@ private void generateDeleteById(ClassCreator classCreator, FieldDescriptor entit
                     ResultHandle entityClass = deleteById.readInstanceField(entityClassFieldDescriptor,
                             deleteById.getThis());
 
-                    ResultHandle deleted = deleteById.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "deleteById", boolean.class, Class.class,
-                                    Object.class),
-                            entityClass, id);
+                    ResultHandle deleted = deleteById.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "deleteById", boolean.class,
+                                    Class.class, Object.class),
+                            deleteById.readStaticField(operationsField), entityClass, id);
 
                     BranchResult deletedBranch = deleteById.ifNonZero(deleted);
                     BytecodeCreator deletedFalse = deletedBranch.falseBranch();
@@ -833,9 +857,9 @@ private void generateDelete(ClassCreator classCreator, String generatedClassName
                 try (MethodCreator delete = classCreator.getMethodCreator(deleteDescriptor)) {
                     delete.addAnnotation(Transactional.class);
                     ResultHandle entity = delete.getMethodParam(0);
-                    delete.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "delete", void.class, Object.class),
-                            entity);
+                    delete.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "delete", void.class, Object.class),
+                            delete.readStaticField(operationsField), entity);
                     delete.returnValue(null);
                 }
                 try (MethodCreator bridgeDelete = classCreator.getMethodCreator(bridgeDeleteDescriptor)) {
@@ -868,7 +892,9 @@ private void generateDeleteAllWithIterable(ClassCreator classCreator, String gen
                     deleteAll.addAnnotation(Transactional.class);
                     ResultHandle entities = deleteAll.getMethodParam(0);
                     deleteAll.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(RepositorySupport.class, "deleteAll", void.class, Iterable.class),
+                            MethodDescriptor.ofMethod(RepositorySupport.class, "deleteAll",
+                                    void.class, AbstractJpaOperations.class, Iterable.class),
+                            deleteAll.readStaticField(operationsField),
                             entities);
                     deleteAll.returnValue(null);
                 }
@@ -887,7 +913,9 @@ private void generateDeleteAll(ClassCreator classCreator, FieldDescriptor entity
                 try (MethodCreator deleteAll = classCreator.getMethodCreator(deleteAllDescriptor)) {
                     deleteAll.addAnnotation(Transactional.class);
                     deleteAll.invokeStaticMethod(
-                            MethodDescriptor.ofMethod(JpaOperations.class, "deleteAll", long.class, Class.class.getName()),
+                            MethodDescriptor.ofMethod(AdditionalJpaOperations.class, "deleteAllWithCascade", long.class,
+                                    AbstractJpaOperations.class, Class.class.getName()),
+                            deleteAll.readStaticField(operationsField),
                             deleteAll.readInstanceField(entityClassFieldDescriptor, deleteAll.getThis()));
                     deleteAll.returnValue(null);
                 }
@@ -896,6 +924,27 @@ private void generateDeleteAll(ClassCreator classCreator, FieldDescriptor entity
         }
     }
 
+    private void generateDeleteAllInBatch(ClassCreator classCreator, FieldDescriptor entityClassFieldDescriptor,
+            String generatedClassName, Map<MethodDescriptor, Boolean> allMethodsToBeImplementedToResult) {
+
+        MethodDescriptor deleteAllInBatchDescriptor = MethodDescriptor.ofMethod(generatedClassName, "deleteAllInBatch",
+                void.class);
+
+        if (allMethodsToBeImplementedToResult.containsKey(deleteAllInBatchDescriptor)) {
+            if (!classCreator.getExistingMethods().contains(deleteAllInBatchDescriptor)) {
+                try (MethodCreator deleteAll = classCreator.getMethodCreator(deleteAllInBatchDescriptor)) {
+                    deleteAll.addAnnotation(Transactional.class);
+                    ResultHandle result = deleteAll.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(AbstractJpaOperations.class, "deleteAll", long.class, Class.class),
+                            deleteAll.readStaticField(operationsField),
+                            deleteAll.readInstanceField(entityClassFieldDescriptor, deleteAll.getThis()));
+                    deleteAll.returnValue(result);
+                }
+            }
+            allMethodsToBeImplementedToResult.put(deleteAllInBatchDescriptor, true);
+        }
+    }
+
     private void handleUnimplementedMethods(ClassCreator classCreator,
             Map<MethodDescriptor, Boolean> allMethodsToBeImplementedToResult) {
         for (Map.Entry<MethodDescriptor, Boolean> entry : allMethodsToBeImplementedToResult.entrySet()) {
@@ -914,7 +963,7 @@ private void handleUnimplementedMethods(ClassCreator classCreator,
     }
 
     private Set<MethodInfo> methodsOfExtendedSpringDataRepositories(ClassInfo repositoryToImplement) {
-        return GenerationUtil.interfaceMethods(GenerationUtil.extendedSpringDataRepos(repositoryToImplement), index);
+        return GenerationUtil.interfaceMethods(GenerationUtil.extendedSpringDataRepos(repositoryToImplement, index), index);
     }
 
     // Spring Data allows users to add any of the methods of CrudRepository, PagingAndSortingRepository, JpaRepository
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java
new file mode 100644
index 0000000000000..7cb157b46a4f8
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeData.java
@@ -0,0 +1,97 @@
+package io.quarkus.spring.data.deployment;
+
+import java.math.BigDecimal;
+import java.net.URL;
+import java.time.Duration;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class BasicTypeData {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    private Double doubleValue;
+    private BigDecimal bigDecimalValue;
+    private Locale locale;
+    private TimeZone timeZone;
+    private java.net.URL url;
+    private Class clazz;
+    private java.util.UUID uuid;
+    private Duration duration;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public Double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(Double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+
+    public BigDecimal getBigDecimalValue() {
+        return bigDecimalValue;
+    }
+
+    public void setBigDecimalValue(BigDecimal bigDecimalValue) {
+        this.bigDecimalValue = bigDecimalValue;
+    }
+
+    public Locale getLocale() {
+        return locale;
+    }
+
+    public void setLocale(Locale locale) {
+        this.locale = locale;
+    }
+
+    public TimeZone getTimeZone() {
+        return timeZone;
+    }
+
+    public void setTimeZone(TimeZone timeZone) {
+        this.timeZone = timeZone;
+    }
+
+    public URL getUrl() {
+        return url;
+    }
+
+    public void setUrl(URL url) {
+        this.url = url;
+    }
+
+    public Class getClazz() {
+        return clazz;
+    }
+
+    public void setClazz(Class clazz) {
+        this.clazz = clazz;
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public Duration getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Duration duration) {
+        this.duration = duration;
+    }
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepository.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepository.java
new file mode 100644
index 0000000000000..6446259fb5145
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepository.java
@@ -0,0 +1,25 @@
+package io.quarkus.spring.data.deployment;
+
+import java.net.URL;
+import java.time.Duration;
+import java.util.Locale;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BasicTypeDataRepository extends JpaRepository<BasicTypeData, Integer> {
+
+    @Query("select doubleValue from BasicTypeData where url = ?1")
+    Double doubleByURL(URL url);
+
+    @Query("select duration from BasicTypeData where uuid = ?1")
+    Duration durationByUUID(UUID uuid);
+
+    @Query("select timeZone from BasicTypeData where locale = ?1")
+    Set<TimeZone> timeZonesByLocale(Locale locale);
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java
new file mode 100644
index 0000000000000..dcf461f8fbee1
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/BasicTypeDataRepositoryTest.java
@@ -0,0 +1,90 @@
+package io.quarkus.spring.data.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.time.Duration;
+import java.util.Locale;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+import org.assertj.core.data.Percentage;
+import org.hibernate.Hibernate;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class BasicTypeDataRepositoryTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(BasicTypeData.class, BasicTypeDataRepository.class))
+            .withConfigurationResource("application.properties");
+
+    private static final UUID uuid = UUID.randomUUID();
+    private static final String QUARKUS_URL = "https://quarkus.io/guides/spring-data-jpa";
+    private static final String DURATION = "PT828H19M54.656S";
+    private static final String TIME_ZONE = "CST";
+
+    @Inject
+    BasicTypeDataRepository repo;
+
+    @Test
+    @Order(1)
+    @Transactional
+    public void testInsert() throws Exception {
+        BasicTypeData item = populateData(new BasicTypeData());
+        repo.save(item);
+    }
+
+    @Test
+    @Order(2)
+    @Transactional
+    public void testDoubleByURL() throws Exception {
+        Double price = repo.doubleByURL(new URL(QUARKUS_URL));
+        assertThat(price).isCloseTo(Math.PI, Percentage.withPercentage(1));
+    }
+
+    @Test
+    @Order(3)
+    @Transactional
+    public void testDurationByUUID() {
+        Duration duration = repo.durationByUUID(uuid);
+        assertThat(duration).isEqualTo(Duration.parse(DURATION));
+    }
+
+    @Test
+    @Order(4)
+    @Transactional
+    public void testTimeZonesByLocale() {
+        final Set<TimeZone> timeZones = repo.timeZonesByLocale(Locale.TRADITIONAL_CHINESE);
+        assertThat(timeZones).isNotEmpty().contains(TimeZone.getTimeZone("CST"));
+    }
+
+    private BasicTypeData populateData(BasicTypeData basicTypeData) throws MalformedURLException {
+        basicTypeData.setDoubleValue(Math.PI);
+        basicTypeData.setBigDecimalValue(BigDecimal.valueOf(Math.PI * 2.0));
+        basicTypeData.setLocale(Locale.TRADITIONAL_CHINESE);
+        basicTypeData.setTimeZone(TimeZone.getTimeZone(TIME_ZONE));
+        basicTypeData.setUrl(new URL(QUARKUS_URL));
+        basicTypeData.setClazz(Hibernate.class);
+        basicTypeData.setUuid(uuid);
+        basicTypeData.setDuration(Duration.parse(DURATION));
+
+        return basicTypeData;
+    }
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/CustomQueryMissingNamedParamTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/CustomQueryMissingNamedParamTest.java
new file mode 100644
index 0000000000000..5d0454a99c4b4
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/CustomQueryMissingNamedParamTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.spring.data.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class CustomQueryMissingNamedParamTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("import_books.sql", "import.sql")
+                    .addClasses(Book.class, BookRepositoryNamedParameterWrongName.class))
+            .withConfigurationResource("application.properties")
+            .assertException(e -> assertThat(e).isInstanceOf(IllegalArgumentException.class)
+                    .hasMessageContaining("BookRepositoryNamedParameterWrongName is missing the named parameters [name], "
+                            + "provided are [wrong]"));
+
+    @Test
+    public void testNamedParameters() {
+        // an exception should be thrown
+    }
+
+    public interface BookRepositoryNamedParameterWrongName extends Repository<Book, Integer> {
+        // wrong @Param annotation
+        @Query(value = "FROM Book b WHERE b.name = :name")
+        List<Book> queryBookByNameWrongAnnotation(@Param("wrong") String name);
+    }
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java
new file mode 100644
index 0000000000000..1e777d8923f48
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/LoginEvent.java
@@ -0,0 +1,47 @@
+package io.quarkus.spring.data.deployment;
+
+import java.time.ZonedDateTime;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class LoginEvent {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @ManyToOne
+    private User user;
+
+    private ZonedDateTime zonedDateTime;
+
+    private boolean processed;
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public ZonedDateTime getZonedDateTime() {
+        return zonedDateTime;
+    }
+
+    public void setZonedDateTime(ZonedDateTime zonedDateTime) {
+        this.zonedDateTime = zonedDateTime;
+    }
+
+    public boolean isProcessed() {
+        return processed;
+    }
+
+    public void setProcessed(boolean processed) {
+        this.processed = processed;
+    }
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java
new file mode 100644
index 0000000000000..874cab3028af2
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/MethodNameParserTest.java
@@ -0,0 +1,124 @@
+package io.quarkus.spring.data.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.assertj.core.api.AbstractStringAssert;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
+import org.jboss.jandex.MethodInfo;
+import org.junit.jupiter.api.Test;
+
+public class MethodNameParserTest {
+
+    private final Class<?> repositoryClass = PersonRepository.class;
+    private final Class<?> entityClass = Person.class;
+    private final Class[] additionalClasses = new Class[] { Person.Address.class, Person.Country.class };
+
+    @Test
+    public void testFindAllByAddressZipCode() throws Exception {
+        MethodNameParser.Result result = parseMethod(repositoryClass, "findAllByAddressZipCode", entityClass,
+                additionalClasses);
+        assertThat(result).isNotNull();
+        assertSameClass(result.getEntityClass(), entityClass);
+        assertThat(result.getQuery()).isEqualTo("FROM Person WHERE address.zipCode = ?1");
+        assertThat(result.getParamCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void testFindAllByAddressCountry() throws Exception {
+        MethodNameParser.Result result = parseMethod(repositoryClass, "findAllByAddressCountry", entityClass,
+                additionalClasses);
+        assertThat(result).isNotNull();
+        assertSameClass(result.getEntityClass(), entityClass);
+        assertThat(result.getQuery()).isEqualTo("FROM Person WHERE addressCountry = ?1");
+        assertThat(result.getParamCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void testFindAllByAddress_Country() throws Exception {
+        MethodNameParser.Result result = parseMethod(repositoryClass, "findAllByAddress_Country", entityClass,
+                additionalClasses);
+        assertThat(result).isNotNull();
+        assertSameClass(result.getEntityClass(), entityClass);
+        assertThat(result.getQuery()).isEqualTo("FROM Person WHERE address.country = ?1");
+        assertThat(result.getParamCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void testFindAllByAddressCountryIsoCode() throws Exception {
+        UnableToParseMethodException exception = assertThrows(UnableToParseMethodException.class,
+                () -> parseMethod(repositoryClass, "findAllByAddressCountryIsoCode", entityClass, additionalClasses));
+        assertThat(exception).hasMessageContaining("Person does not contain a field named: addressCountryIsoCode");
+    }
+
+    @Test
+    public void testFindAllByAddress_CountryIsoCode() throws Exception {
+        MethodNameParser.Result result = parseMethod(repositoryClass, "findAllByAddress_CountryIsoCode", entityClass,
+                additionalClasses);
+        assertThat(result).isNotNull();
+        assertSameClass(result.getEntityClass(), entityClass);
+        assertThat(result.getQuery()).isEqualTo("FROM Person WHERE address.country.isoCode = ?1");
+        assertThat(result.getParamCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void testFindAllByAddress_Country_IsoCode() throws Exception {
+        MethodNameParser.Result result = parseMethod(repositoryClass, "findAllByAddress_Country_IsoCode", entityClass,
+                additionalClasses);
+        assertThat(result).isNotNull();
+        assertSameClass(result.getEntityClass(), entityClass);
+        assertThat(result.getQuery()).isEqualTo("FROM Person WHERE address.country.isoCode = ?1");
+        assertThat(result.getParamCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void testFindAllByAddress_CountryInvalid() throws Exception {
+        UnableToParseMethodException exception = assertThrows(UnableToParseMethodException.class,
+                () -> parseMethod(repositoryClass, "findAllByAddress_CountryInvalid", entityClass, additionalClasses));
+        assertThat(exception).hasMessageContaining("Person does not contain a field named: address_CountryInvalid");
+        assertThat(exception).hasMessageContaining("Country.invalid");
+    }
+
+    @Test
+    public void testFindAllBy_() throws Exception {
+        UnableToParseMethodException exception = assertThrows(UnableToParseMethodException.class,
+                () -> parseMethod(repositoryClass, "findAllBy_", entityClass, additionalClasses));
+        assertThat(exception).hasMessageContaining("Person does not contain a field named: _");
+    }
+
+    private AbstractStringAssert<?> assertSameClass(ClassInfo classInfo, Class<?> aClass) {
+        return assertThat(classInfo.name().toString()).isEqualTo(aClass.getName());
+    }
+
+    private MethodNameParser.Result parseMethod(Class<?> repositoryClass, String methodToParse,
+            Class<?> entityClass, Class<?>... additionalClasses) throws IOException {
+        IndexView indexView = index(ArrayUtils.addAll(additionalClasses, repositoryClass, entityClass));
+        DotName repository = DotName.createSimple(repositoryClass.getName());
+        DotName entity = DotName.createSimple(entityClass.getName());
+        ClassInfo entityClassInfo = indexView.getClassByName(entity);
+        ClassInfo repositoryClassInfo = indexView.getClassByName(repository);
+        MethodNameParser methodNameParser = new MethodNameParser(entityClassInfo, indexView);
+        MethodInfo repositoryMethod = repositoryClassInfo.firstMethod(methodToParse);
+        MethodNameParser.Result result = methodNameParser.parse(repositoryMethod);
+        return result;
+    }
+
+    public static Index index(Class<?>... classes) throws IOException {
+        Indexer indexer = new Indexer();
+        for (Class<?> clazz : classes) {
+            try (InputStream stream = MethodNameParserTest.class.getClassLoader()
+                    .getResourceAsStream(clazz.getName().replace('.', '/') + ".class")) {
+                indexer.index(stream);
+            }
+        }
+        return indexer.complete();
+    }
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java
new file mode 100644
index 0000000000000..d2cfdbd448875
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java
@@ -0,0 +1,105 @@
+package io.quarkus.spring.data.deployment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.ZonedDateTime;
+import java.util.Optional;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ModifyingQueryWithFlushAndClearTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("import_users.sql", "import.sql")
+                    .addClasses(User.class, LoginEvent.class, UserRepository.class))
+            .withConfigurationResource("application.properties");
+
+    @Inject
+    UserRepository repo;
+
+    @BeforeEach
+    @Transactional
+    public void setUp() {
+        final User user = getUser("JOHN");
+        user.setLoginCounter(0);
+        repo.save(user);
+    }
+
+    @Test
+    @Transactional
+    public void testNoAutoClear() {
+        getUser("JOHN"); // read user to attach it to entity manager
+
+        repo.incrementLoginCounterPlain("JOHN");
+
+        final User userAfterIncrement = getUser("JOHN"); // we get the cached entity
+        // the read doesn't re-read the incremented counter and is therefore equal to the old value
+        assertThat(userAfterIncrement.getLoginCounter()).isEqualTo(0);
+    }
+
+    @Test
+    @Transactional
+    public void testAutoClear() {
+        getUser("JOHN"); // read user to attach it to entity manager
+
+        repo.incrementLoginCounterAutoClear("JOHN");
+
+        final User userAfterIncrement = getUser("JOHN");
+        assertThat(userAfterIncrement.getLoginCounter()).isEqualTo(1);
+    }
+
+    @Test
+    @Transactional
+    public void testNoAutoFlush() {
+        final User user = getUser("JOHN");
+        createLoginEvent(user);
+
+        repo.processLoginEventsPlain();
+
+        final User verifyUser = getUser("JOHN");
+        // processLoginEvents did not see the new login event
+        final boolean allProcessed = verifyUser.getLoginEvents().stream()
+                .allMatch(loginEvent -> loginEvent.isProcessed());
+        assertThat(allProcessed).describedAs("all LoginEvents are marked as processed").isFalse();
+    }
+
+    @Test
+    @Transactional
+    public void testAutoFlush() {
+        final User user = getUser("JOHN");
+        createLoginEvent(user);
+
+        repo.processLoginEventsPlainAutoClearAndFlush();
+
+        final User verifyUser = getUser("JOHN");
+        final boolean allProcessed = verifyUser.getLoginEvents().stream()
+                .allMatch(loginEvent -> loginEvent.isProcessed());
+        assertThat(allProcessed).describedAs("all LoginEvents are marked as processed").isTrue();
+    }
+
+    private LoginEvent createLoginEvent(User user) {
+        final LoginEvent loginEvent = new LoginEvent();
+        loginEvent.setUser(user);
+        loginEvent.setZonedDateTime(ZonedDateTime.now());
+        user.addEvent(loginEvent);
+        return loginEvent;
+    }
+
+    private User getUser(String userId) {
+        final Optional<User> user = repo.findById(userId);
+        assertThat(user).describedAs("user <%s>", userId).isPresent();
+        return user.get();
+    }
+
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java
new file mode 100644
index 0000000000000..ecd339b23be09
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/Person.java
@@ -0,0 +1,33 @@
+package io.quarkus.spring.data.deployment;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+    @Id
+    private Integer id;
+
+    private Address address;
+
+    private String addressCountry;
+
+    @Entity
+    public static class Address {
+        @Id
+        private Integer id;
+
+        private String zipCode;
+
+        private Country country;
+    }
+
+    @Entity
+    public static class Country {
+        @Id
+        private Integer id;
+
+        private String isoCode;
+    }
+
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/PersonRepository.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/PersonRepository.java
new file mode 100644
index 0000000000000..8f8f32c5f27a2
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/PersonRepository.java
@@ -0,0 +1,25 @@
+package io.quarkus.spring.data.deployment;
+
+import java.util.List;
+
+import org.springframework.data.repository.Repository;
+
+// issue 13067:
+public interface PersonRepository extends Repository<Person, Integer> {
+
+    List<Person> findAllByAddressZipCode(String zipCode);
+
+    List<Person> findAllByAddressCountry(String zipCode);
+
+    List<Person> findAllByAddress_Country(String zipCode);
+
+    List<Person> findAllByAddressCountryIsoCode(String zipCode);
+
+    List<Person> findAllByAddress_CountryIsoCode(String zipCode);
+
+    List<Person> findAllByAddress_Country_IsoCode(String zipCode);
+
+    List<Person> findAllByAddress_CountryInvalid(String zipCode);
+
+    List<Person> findAllBy_(String zipCode);
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/QueryReturningCustomTypeBadAliasTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/QueryReturningCustomTypeBadAliasTest.java
index 256472ab12169..924728e03f9ab 100644
--- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/QueryReturningCustomTypeBadAliasTest.java
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/QueryReturningCustomTypeBadAliasTest.java
@@ -12,7 +12,7 @@ public class QueryReturningCustomTypeBadAliasTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
             () -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource("import.sql")
+                    .addAsResource("import_books.sql", "import.sql")
                     .addClasses(Book.class, BookRepositoryBadAlias.class))
             .withConfigurationResource("application.properties")
             .setExpectedException(IllegalArgumentException.class);
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java
new file mode 100644
index 0000000000000..9927a98ad8100
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/User.java
@@ -0,0 +1,64 @@
+package io.quarkus.spring.data.deployment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class User {
+
+    @Id
+    private String userId;
+    private String fullName;
+    private boolean active;
+    private int loginCounter;
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
+    private List<LoginEvent> loginEvents = new ArrayList<>();
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public int getLoginCounter() {
+        return loginCounter;
+    }
+
+    public void setLoginCounter(int loginCounter) {
+        this.loginCounter = loginCounter;
+    }
+
+    public void addEvent(LoginEvent loginEvent) {
+        this.loginEvents.add(loginEvent);
+    }
+
+    public List<LoginEvent> getLoginEvents() {
+        return loginEvents;
+    }
+
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/UserRepository.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/UserRepository.java
new file mode 100644
index 0000000000000..4252a1770442c
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/UserRepository.java
@@ -0,0 +1,24 @@
+package io.quarkus.spring.data.deployment;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+public interface UserRepository extends JpaRepository<User, String> {
+
+    @Modifying
+    @Query("UPDATE User u SET u.loginCounter = COALESCE(u.loginCounter, 0) + 1 WHERE u.userId = ?1")
+    void incrementLoginCounterPlain(String userId);
+
+    @Modifying(clearAutomatically = true)
+    @Query("UPDATE User u SET u.loginCounter = COALESCE(u.loginCounter, 0) + 1 WHERE u.userId = ?1")
+    void incrementLoginCounterAutoClear(String userId);
+
+    @Modifying
+    @Query("UPDATE LoginEvent e SET e.processed = true")
+    void processLoginEventsPlain();
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("UPDATE LoginEvent e SET e.processed = true")
+    void processLoginEventsPlainAutoClearAndFlush();
+}
diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java
index 883cd5812e762..ee214ad1a5595 100644
--- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java
+++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/devmode/RepositoryReloadTest.java
@@ -16,7 +16,7 @@ public class RepositoryReloadTest {
     static QuarkusDevModeTest TEST = new QuarkusDevModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource("application.properties")
-                    .addAsResource("import.sql")
+                    .addAsResource("import_books.sql", "import.sql")
                     .addClasses(Book.class, BookRepository.class, BookResource.class));
 
     @Test
diff --git a/extensions/spring-data-jpa/deployment/src/test/resources/import.sql b/extensions/spring-data-jpa/deployment/src/test/resources/import_books.sql
similarity index 100%
rename from extensions/spring-data-jpa/deployment/src/test/resources/import.sql
rename to extensions/spring-data-jpa/deployment/src/test/resources/import_books.sql
diff --git a/extensions/spring-data-jpa/deployment/src/test/resources/import_users.sql b/extensions/spring-data-jpa/deployment/src/test/resources/import_users.sql
new file mode 100644
index 0000000000000..9d622a8d08d49
--- /dev/null
+++ b/extensions/spring-data-jpa/deployment/src/test/resources/import_users.sql
@@ -0,0 +1 @@
+INSERT INTO user(userid, fullname, logincounter, active) VALUES ('JOHN', 'John Doe', 0, true);
\ No newline at end of file
diff --git a/extensions/spring-data-jpa/pom.xml b/extensions/spring-data-jpa/pom.xml
index a0802daf101be..854652008ad1d 100644
--- a/extensions/spring-data-jpa/pom.xml
+++ b/extensions/spring-data-jpa/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-data-jpa/runtime/pom.xml b/extensions/spring-data-jpa/runtime/pom.xml
index 1ff2a9f7aa0e6..d5b34f91444a0 100644
--- a/extensions/spring-data-jpa/runtime/pom.xml
+++ b/extensions/spring-data-jpa/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-data-jpa-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -23,6 +22,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-data-jpa-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-di</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-data-commons-api</artifactId>
diff --git a/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java b/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java
index 88f42a331688b..98e93c002edf4 100644
--- a/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java
+++ b/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java
@@ -4,18 +4,22 @@
 import java.util.List;
 import java.util.Objects;
 
-import io.quarkus.hibernate.orm.panache.runtime.JpaOperations;
+import javax.persistence.EntityManager;
+
+import io.quarkus.hibernate.orm.panache.PanacheQuery;
+import io.quarkus.hibernate.orm.panache.common.runtime.AbstractJpaOperations;
 
 public final class RepositorySupport {
 
     private RepositorySupport() {
     }
 
-    public static List<?> findByIds(Class<?> entityClass, Iterable<?> ids) {
+    public static List<?> findByIds(AbstractJpaOperations<PanacheQuery<?>> operations, Class<?> entityClass,
+            Iterable<?> ids) {
         Objects.requireNonNull(ids);
         List<Object> result = new ArrayList<>();
         for (Object id : ids) {
-            Object byId = JpaOperations.findById(entityClass, id);
+            Object byId = operations.findById(entityClass, id);
             if (byId != null) {
                 result.add(byId);
             }
@@ -23,18 +27,29 @@ public static List<?> findByIds(Class<?> entityClass, Iterable<?> ids) {
         return result;
     }
 
-    public static List<?> findByIds(Class<?> entityClass, String idField, Iterable<Long> ids) {
+    public static List<?> findByIds(AbstractJpaOperations<PanacheQuery<?>> operations, Class<?> entityClass,
+            String idField, Iterable<Long> ids) {
         Objects.requireNonNull(ids);
-        return JpaOperations.find(entityClass, String.format("%s in ?1", idField), ids).list();
+        return operations.find(entityClass, String.format("%s in ?1", idField), ids).list();
     }
 
-    public static void deleteAll(Iterable<?> entities) {
+    public static void deleteAll(AbstractJpaOperations<PanacheQuery<?>> operations, Iterable<?> entities) {
         for (Object entity : entities) {
-            JpaOperations.delete(entity);
+            operations.delete(entity);
         }
     }
 
-    public static Object getOne(Class<?> entityClass, Object id) {
-        return JpaOperations.getEntityManager().getReference(entityClass, id);
+    public static Object getOne(AbstractJpaOperations<PanacheQuery<?>> operations, Class<?> entityClass, Object id) {
+        return operations.getEntityManager().getReference(entityClass, id);
+    }
+
+    public static void clear(Class<?> clazz) {
+        EntityManager em = AbstractJpaOperations.getEntityManager(clazz);
+        em.clear();
+    }
+
+    public static void flush(Class<?> clazz) {
+        EntityManager em = AbstractJpaOperations.getEntityManager(clazz);
+        em.flush();
     }
 }
diff --git a/extensions/spring-data-rest/deployment/pom.xml b/extensions/spring-data-rest/deployment/pom.xml
new file mode 100644
index 0000000000000..e3abeaec08689
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-spring-data-rest-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-spring-data-rest-deployment</artifactId>
+    <name>Quarkus - Spring - Data REST - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-data-panache-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-jpa-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java
new file mode 100644
index 0000000000000..6a3edcba16031
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceImplementor.java
@@ -0,0 +1,47 @@
+package io.quarkus.spring.data.rest.deployment;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.rest.data.panache.RestDataResource;
+import io.quarkus.runtime.util.HashUtil;
+
+public class ResourceImplementor {
+
+    private static final Logger LOGGER = Logger.getLogger(ResourceImplementor.class);
+
+    private final ResourceMethodsImplementor methodsImplementor;
+
+    protected ResourceImplementor(ResourceMethodsImplementor methodsImplementor) {
+        this.methodsImplementor = methodsImplementor;
+    }
+
+    /**
+     * Implements {@link io.quarkus.rest.data.panache.RestDataResource} interfaces defined in a user application.
+     * Instances of this class are registered as beans and are later used in the generated JAX-RS controllers.
+     */
+    public String implement(ClassOutput classOutput, String resourceType, String entityType) {
+        String className = resourceType + "ResourceImpl_" + HashUtil.sha1(resourceType);
+        LOGGER.tracef("Starting generation of '%s'", className);
+        ClassCreator classCreator = ClassCreator.builder()
+                .classOutput(classOutput)
+                .className(className)
+                .interfaces(RestDataResource.class)
+                .build();
+
+        classCreator.addAnnotation(ApplicationScoped.class);
+        methodsImplementor.implementList(classCreator, resourceType);
+        methodsImplementor.implementListPageCount(classCreator, resourceType);
+        methodsImplementor.implementGet(classCreator, resourceType);
+        methodsImplementor.implementAdd(classCreator, resourceType);
+        methodsImplementor.implementUpdate(classCreator, resourceType, entityType);
+        methodsImplementor.implementDelete(classCreator, resourceType);
+
+        classCreator.close();
+        LOGGER.tracef("Completed generation of '%s'", className);
+        return className;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceMethodsImplementor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceMethodsImplementor.java
new file mode 100644
index 0000000000000..6e81dc5b74352
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourceMethodsImplementor.java
@@ -0,0 +1,18 @@
+package io.quarkus.spring.data.rest.deployment;
+
+import io.quarkus.gizmo.ClassCreator;
+
+public interface ResourceMethodsImplementor {
+
+    void implementList(ClassCreator classCreator, String repositoryInterface);
+
+    void implementListPageCount(ClassCreator classCreator, String repositoryInterface);
+
+    void implementGet(ClassCreator classCreator, String repositoryInterface);
+
+    void implementAdd(ClassCreator classCreator, String repositoryInterface);
+
+    void implementUpdate(ClassCreator classCreator, String repositoryInterface, String entityType);
+
+    void implementDelete(ClassCreator classCreator, String repositoryInterface);
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java
new file mode 100644
index 0000000000000..16bf0966e5a4a
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/ResourcePropertiesProvider.java
@@ -0,0 +1,118 @@
+package io.quarkus.spring.data.rest.deployment;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+import io.quarkus.rest.data.panache.deployment.properties.MethodProperties;
+import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
+import io.quarkus.rest.data.panache.deployment.utils.ResourceName;
+
+public abstract class ResourcePropertiesProvider {
+
+    private static final DotName REST_RESOURCE_ANNOTATION = DotName.createSimple(RestResource.class.getName());
+
+    private static final DotName REPOSITORY_REST_RESOURCE_ANNOTATION = DotName
+            .createSimple(RepositoryRestResource.class.getName());
+
+    private final IndexView index;
+
+    private final boolean paged;
+
+    public ResourcePropertiesProvider(IndexView index, boolean paged) {
+        this.index = index;
+        this.paged = paged;
+    }
+
+    protected abstract Map<String, Predicate<MethodInfo>> getMethodPredicates();
+
+    public ResourceProperties getResourceProperties(String interfaceName) {
+        DotName repositoryInterfaceName = DotName.createSimple(interfaceName);
+        AnnotationInstance annotation = findClassAnnotation(repositoryInterfaceName);
+        String resourcePath = getPath(annotation, ResourceName.fromClass(interfaceName));
+        String halCollectionName = getHalCollectionName(annotation, ResourceName.fromClass(interfaceName));
+
+        return new ResourceProperties(isExposed(annotation), resourcePath, paged, true, halCollectionName,
+                getMethodProperties(repositoryInterfaceName));
+    }
+
+    private Map<String, MethodProperties> getMethodProperties(DotName interfaceName) {
+        Map<String, MethodProperties> methodPropertiesMap = new HashMap<>();
+        for (Map.Entry<String, Predicate<MethodInfo>> method : getMethodPredicates().entrySet()) {
+            AnnotationInstance annotation = findMethodAnnotation(interfaceName, method.getValue());
+            if (annotation != null) {
+                methodPropertiesMap.putIfAbsent(method.getKey(), getMethodProperties(annotation));
+            }
+        }
+        return methodPropertiesMap;
+    }
+
+    private MethodProperties getMethodProperties(AnnotationInstance annotation) {
+        return new MethodProperties(isExposed(annotation), getPath(annotation, ""));
+    }
+
+    private AnnotationInstance findClassAnnotation(DotName interfaceName) {
+        ClassInfo classInfo = index.getClassByName(interfaceName);
+        if (classInfo == null) {
+            return null;
+        }
+        if (classInfo.classAnnotation(REPOSITORY_REST_RESOURCE_ANNOTATION) != null) {
+            return classInfo.classAnnotation(REPOSITORY_REST_RESOURCE_ANNOTATION);
+        }
+        if (classInfo.classAnnotation(REST_RESOURCE_ANNOTATION) != null) {
+            return classInfo.classAnnotation(REST_RESOURCE_ANNOTATION);
+        }
+        if (classInfo.superName() != null) {
+            return findClassAnnotation(classInfo.superName());
+        }
+        return null;
+    }
+
+    private AnnotationInstance findMethodAnnotation(DotName interfaceName, Predicate<MethodInfo> methodPredicate) {
+        ClassInfo classInfo = index.getClassByName(interfaceName);
+        if (classInfo == null) {
+            return null;
+        }
+        for (MethodInfo method : classInfo.methods()) {
+            if (methodPredicate.test(method)) {
+                if (method.hasAnnotation(REPOSITORY_REST_RESOURCE_ANNOTATION)) {
+                    return method.annotation(REPOSITORY_REST_RESOURCE_ANNOTATION);
+                } else if (method.hasAnnotation(REST_RESOURCE_ANNOTATION)) {
+                    return method.annotation(REST_RESOURCE_ANNOTATION);
+                }
+            }
+        }
+        if (classInfo.superName() != null) {
+            return findMethodAnnotation(classInfo.superName(), methodPredicate);
+        }
+        return null;
+    }
+
+    private boolean isExposed(AnnotationInstance annotation) {
+        return annotation == null
+                || annotation.value("exported") == null
+                || annotation.value("exported").asBoolean();
+    }
+
+    private String getPath(AnnotationInstance annotation, String defaultValue) {
+        if (annotation != null && annotation.value("path") != null) {
+            return annotation.value("path").asString();
+        }
+        return defaultValue;
+    }
+
+    private String getHalCollectionName(AnnotationInstance annotation, String defaultValue) {
+        if (annotation != null && annotation.value("collectionResourceRel") != null) {
+            return annotation.value("collectionResourceRel").asString();
+        }
+        return defaultValue;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java
new file mode 100644
index 0000000000000..437b0d7394828
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java
@@ -0,0 +1,152 @@
+package io.quarkus.spring.data.rest.deployment;
+
+import static io.quarkus.deployment.Feature.SPRING_DATA_REST;
+
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
+import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
+import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem;
+import io.quarkus.rest.data.panache.deployment.properties.ResourcePropertiesBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor;
+import io.quarkus.spring.data.rest.deployment.crud.CrudPropertiesProvider;
+import io.quarkus.spring.data.rest.deployment.paging.PagingAndSortingMethodsImplementor;
+import io.quarkus.spring.data.rest.deployment.paging.PagingAndSortingPropertiesProvider;
+import io.quarkus.spring.data.rest.runtime.RestDataPanacheExceptionMapper;
+
+class SpringDataRestProcessor {
+
+    private static final DotName CRUD_REPOSITORY_INTERFACE = DotName.createSimple(CrudRepository.class.getName());
+
+    private static final DotName PAGING_AND_SORTING_REPOSITORY_INTERFACE = DotName
+            .createSimple(PagingAndSortingRepository.class.getName());
+
+    private static final DotName JPA_REPOSITORY_INTERFACE = DotName.createSimple(JpaRepository.class.getName());
+
+    private static final List<DotName> EXCLUDED_INTERFACES = Arrays.asList(
+            CRUD_REPOSITORY_INTERFACE,
+            PAGING_AND_SORTING_REPOSITORY_INTERFACE,
+            JPA_REPOSITORY_INTERFACE);
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(SPRING_DATA_REST);
+    }
+
+    @BuildStep
+    ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() {
+        return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName());
+    }
+
+    @BuildStep
+    void registerCrudRepositories(CombinedIndexBuildItem indexBuildItem,
+            BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer,
+            BuildProducer<ResourcePropertiesBuildItem> resourcePropertiesProducer,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeansProducer) {
+        IndexView index = indexBuildItem.getIndex();
+
+        implementResources(implementationsProducer, restDataResourceProducer, resourcePropertiesProducer,
+                unremovableBeansProducer, new CrudMethodsImplementor(index), new CrudPropertiesProvider(index),
+                getRepositoriesToImplement(index, CRUD_REPOSITORY_INTERFACE));
+    }
+
+    @BuildStep
+    void registerPagingAndSortingRepositories(CombinedIndexBuildItem indexBuildItem,
+            BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer,
+            BuildProducer<ResourcePropertiesBuildItem> resourcePropertiesProducer,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeansProducer) {
+        IndexView index = indexBuildItem.getIndex();
+
+        implementResources(implementationsProducer, restDataResourceProducer, resourcePropertiesProducer,
+                unremovableBeansProducer, new PagingAndSortingMethodsImplementor(index),
+                new PagingAndSortingPropertiesProvider(index),
+                getRepositoriesToImplement(index, PAGING_AND_SORTING_REPOSITORY_INTERFACE, JPA_REPOSITORY_INTERFACE));
+    }
+
+    /**
+     * Implement the {@link io.quarkus.rest.data.panache.RestDataResource} interface for each given Spring Data
+     * repository and register its metadata and properties to be later picked up by the `rest-data-panache` extension.
+     */
+    private void implementResources(BuildProducer<GeneratedBeanBuildItem> implementationsProducer,
+            BuildProducer<RestDataResourceBuildItem> restDataResourceProducer,
+            BuildProducer<ResourcePropertiesBuildItem> resourcePropertiesProducer,
+            BuildProducer<UnremovableBeanBuildItem> unremovableBeansProducer,
+            ResourceMethodsImplementor methodsImplementor,
+            ResourcePropertiesProvider propertiesProvider,
+            List<ClassInfo> repositoriesToImplement) {
+        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
+        ResourceImplementor resourceImplementor = new ResourceImplementor(methodsImplementor);
+        for (ClassInfo classInfo : repositoriesToImplement) {
+            List<Type> generics = getGenericTypes(classInfo);
+            String repositoryInterface = classInfo.name().toString();
+            String entityType = generics.get(0).toString();
+            String idType = generics.get(1).toString();
+
+            String resourceClass = resourceImplementor.implement(classOutput, repositoryInterface, entityType);
+
+            // Register resource metadata so that a JAX-RS resource could be generated by the rest-data-panache
+            restDataResourceProducer.produce(new RestDataResourceBuildItem(
+                    new ResourceMetadata(resourceClass, repositoryInterface, entityType, idType)));
+            // Spring Data repositories use different annotations for configuration and we translate them for
+            // the rest-data-panache here.
+            resourcePropertiesProducer.produce(new ResourcePropertiesBuildItem(resourceClass,
+                    propertiesProvider.getResourceProperties(repositoryInterface)));
+            // Make sure that repository bean is not removed and will be injected to the generated resource
+            unremovableBeansProducer.produce(new UnremovableBeanBuildItem(
+                    new UnremovableBeanBuildItem.BeanTypeExclusion(DotName.createSimple(repositoryInterface))));
+        }
+    }
+
+    private List<ClassInfo> getRepositoriesToImplement(IndexView indexView, DotName... repositoryInterfaces) {
+        List<ClassInfo> result = new LinkedList<>();
+        for (DotName repositoryInterface : repositoryInterfaces) {
+            for (ClassInfo classInfo : indexView.getKnownDirectImplementors(repositoryInterface)) {
+                if (!hasImplementors(indexView, classInfo) && !EXCLUDED_INTERFACES.contains(classInfo.name())) {
+                    validateResource(classInfo);
+                    result.add(classInfo);
+                }
+            }
+        }
+        return result;
+    }
+
+    private boolean hasImplementors(IndexView index, ClassInfo classInfo) {
+        return !index.getKnownDirectImplementors(classInfo.name()).isEmpty();
+    }
+
+    private void validateResource(ClassInfo classInfo) {
+        if (!Modifier.isInterface(classInfo.flags())) {
+            throw new RuntimeException(classInfo.name() + " has to be an interface");
+        }
+    }
+
+    private List<Type> getGenericTypes(ClassInfo classInfo) {
+        return classInfo.interfaceTypes()
+                .stream()
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException(classInfo.toString() + " does not have generic types"))
+                .asParameterizedType()
+                .arguments();
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java
new file mode 100644
index 0000000000000..d24ce324cb1d4
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudMethodsImplementor.java
@@ -0,0 +1,140 @@
+package io.quarkus.spring.data.rest.deployment.crud;
+
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Optional;
+
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.springframework.data.repository.CrudRepository;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.rest.data.panache.deployment.Constants;
+import io.quarkus.spring.data.rest.deployment.ResourceMethodsImplementor;
+
+public class CrudMethodsImplementor implements ResourceMethodsImplementor {
+
+    public static final MethodDescriptor LIST = ofMethod(CrudRepository.class, "findAll", Iterable.class);
+
+    public static final MethodDescriptor GET = ofMethod(CrudRepository.class, "findById", Optional.class, Object.class);
+
+    public static final MethodDescriptor ADD = ofMethod(CrudRepository.class, "save", Object.class, Object.class);
+
+    public static final MethodDescriptor UPDATE = ofMethod(CrudRepository.class, "save", Object.class, Object.class);
+
+    public static final MethodDescriptor DELETE = ofMethod(CrudRepository.class, "deleteById", void.class, Object.class);
+
+    private final EntityClassHelper entityClassHelper;
+
+    public CrudMethodsImplementor(IndexView index) {
+        this.entityClassHelper = new EntityClassHelper(index);
+    }
+
+    public void implementList(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("list", List.class, Page.class, Sort.class);
+
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle result = methodCreator.invokeInterfaceMethod(LIST, repository);
+
+        methodCreator.returnValue(result);
+        methodCreator.close();
+    }
+
+    public void implementListPageCount(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(Constants.PAGE_COUNT_METHOD_PREFIX + "list",
+                int.class, Page.class);
+        methodCreator.throwException(RuntimeException.class, "Method not implemented");
+        methodCreator.close();
+    }
+
+    public void implementGet(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("get", Object.class, Object.class);
+
+        ResultHandle id = methodCreator.getMethodParam(0);
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle result = findById(methodCreator, id, repository);
+
+        methodCreator.returnValue(result);
+        methodCreator.close();
+    }
+
+    public void implementAdd(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("add", Object.class, Object.class);
+
+        ResultHandle entity = methodCreator.getMethodParam(0);
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle result = methodCreator.invokeInterfaceMethod(ADD, repository, entity);
+
+        methodCreator.returnValue(result);
+        methodCreator.close();
+    }
+
+    public void implementUpdate(ClassCreator classCreator, String repositoryInterface, String entityType) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("update", Object.class, Object.class, Object.class);
+
+        ResultHandle id = methodCreator.getMethodParam(0);
+        ResultHandle entity = methodCreator.getMethodParam(1);
+        // Set entity ID before executing an update to make sure that a requested object ID matches a given entity ID.
+        setId(methodCreator, entityType, entity, id);
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle result = methodCreator.invokeInterfaceMethod(UPDATE, repository, entity);
+
+        methodCreator.returnValue(result);
+        methodCreator.close();
+    }
+
+    public void implementDelete(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("delete", boolean.class, Object.class);
+
+        ResultHandle id = methodCreator.getMethodParam(0);
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle entity = findById(methodCreator, id, repository);
+        AssignableResultHandle result = methodCreator.createVariable(boolean.class);
+        BranchResult entityExists = methodCreator.ifNotNull(entity);
+        entityExists.trueBranch().invokeInterfaceMethod(DELETE, repository, id);
+        entityExists.trueBranch().assign(result, entityExists.trueBranch().load(true));
+        entityExists.falseBranch().assign(result, entityExists.falseBranch().load(false));
+
+        methodCreator.returnValue(result);
+        methodCreator.close();
+    }
+
+    private ResultHandle findById(BytecodeCreator creator, ResultHandle id, ResultHandle repository) {
+        ResultHandle optional = creator.invokeInterfaceMethod(GET, repository, id);
+        return creator.invokeVirtualMethod(ofMethod(Optional.class, "orElse", Object.class, Object.class),
+                optional, creator.loadNull());
+    }
+
+    private void setId(BytecodeCreator creator, String entityType, ResultHandle entity, ResultHandle id) {
+        FieldInfo idField = entityClassHelper.getIdField(entityType);
+        MethodDescriptor idSetter = entityClassHelper.getSetter(entityType, idField);
+        creator.invokeVirtualMethod(idSetter, entity, id);
+    }
+
+    protected ResultHandle getRepositoryInstance(BytecodeCreator creator, String repositoryInterface) {
+        ResultHandle arcContainer = creator.invokeStaticMethod(ofMethod(Arc.class, "container", ArcContainer.class));
+        ResultHandle instanceHandle = creator.invokeInterfaceMethod(
+                ofMethod(ArcContainer.class, "instance", InstanceHandle.class, Class.class, Annotation[].class),
+                arcContainer, creator.loadClass(repositoryInterface), creator.newArray(Annotation.class, 0));
+        ResultHandle instance = creator.invokeInterfaceMethod(
+                ofMethod(InstanceHandle.class, "get", Object.class), instanceHandle);
+        creator.ifNull(instance)
+                .trueBranch()
+                .throwException(RuntimeException.class, repositoryInterface + " instance was not found");
+
+        return instance;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudPropertiesProvider.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudPropertiesProvider.java
new file mode 100644
index 0000000000000..dbd34f1ee14f5
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/CrudPropertiesProvider.java
@@ -0,0 +1,34 @@
+package io.quarkus.spring.data.rest.deployment.crud;
+
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.ADD;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.DELETE;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.GET;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.LIST;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.UPDATE;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+import io.quarkus.spring.data.rest.deployment.ResourcePropertiesProvider;
+
+public class CrudPropertiesProvider extends ResourcePropertiesProvider {
+
+    public CrudPropertiesProvider(IndexView index) {
+        super(index, false);
+    }
+
+    protected Map<String, Predicate<MethodInfo>> getMethodPredicates() {
+        Map<String, Predicate<MethodInfo>> methodPredicates = new HashMap<>();
+        methodPredicates.put("list",
+                methodInfo -> methodInfo.name().equals(LIST.getName()) && methodInfo.parameters().isEmpty());
+        methodPredicates.put("get", methodInfo -> methodInfo.name().equals(GET.getName()));
+        methodPredicates.put("add", methodInfo -> methodInfo.name().equals(ADD.getName()));
+        methodPredicates.put("update", methodInfo -> methodInfo.name().equals(UPDATE.getName()));
+        methodPredicates.put("delete", methodInfo -> methodInfo.name().equals(DELETE.getName()));
+        return methodPredicates;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java
new file mode 100644
index 0000000000000..3161b2f1e44ba
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/crud/EntityClassHelper.java
@@ -0,0 +1,70 @@
+package io.quarkus.spring.data.rest.deployment.crud;
+
+import javax.persistence.Id;
+
+import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+import io.quarkus.deployment.bean.JavaBeanUtil;
+import io.quarkus.gizmo.MethodDescriptor;
+
+class EntityClassHelper {
+
+    private final IndexView index;
+
+    EntityClassHelper(IndexView index) {
+        this.index = index;
+    }
+
+    FieldInfo getIdField(String className) {
+        return getIdField(index.getClassByName(DotName.createSimple(className)));
+    }
+
+    private FieldInfo getIdField(ClassInfo classInfo) {
+        ClassInfo tmpClassInfo = classInfo;
+        while (tmpClassInfo != null) {
+            for (FieldInfo field : tmpClassInfo.fields()) {
+                if (field.hasAnnotation(DotName.createSimple(Id.class.getName()))) {
+                    return field;
+                }
+            }
+            if (tmpClassInfo.superName() != null) {
+                tmpClassInfo = index.getClassByName(tmpClassInfo.superName());
+            } else {
+                tmpClassInfo = null;
+            }
+        }
+        throw new IllegalArgumentException("Couldn't find id field of " + classInfo);
+    }
+
+    MethodDescriptor getSetter(String className, FieldInfo field) {
+        return getSetter(index.getClassByName(DotName.createSimple(className)), field);
+    }
+
+    private MethodDescriptor getSetter(ClassInfo entityClass, FieldInfo field) {
+        MethodDescriptor setter = getMethod(entityClass, JavaBeanUtil.getSetterName(field.name()), field.type());
+        if (setter != null) {
+            return setter;
+        }
+        return MethodDescriptor.ofMethod(entityClass.toString(),
+                EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + field.name(), void.class, field.type().name().toString());
+    }
+
+    private MethodDescriptor getMethod(ClassInfo entityClass, String name, Type... parameters) {
+        if (entityClass == null) {
+            return null;
+        }
+        MethodInfo methodInfo = entityClass.method(name, parameters);
+        if (methodInfo != null) {
+            return MethodDescriptor.of(methodInfo);
+        } else if (entityClass.superName() != null) {
+            return getMethod(index.getClassByName(entityClass.superName()), name, parameters);
+        }
+        return null;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/paging/PagingAndSortingMethodsImplementor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/paging/PagingAndSortingMethodsImplementor.java
new file mode 100644
index 0000000000000..3020ff34f35e2
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/paging/PagingAndSortingMethodsImplementor.java
@@ -0,0 +1,181 @@
+package io.quarkus.spring.data.rest.deployment.paging;
+
+import static io.quarkus.gizmo.FieldDescriptor.of;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.jandex.IndexView;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.panache.common.Page;
+import io.quarkus.rest.data.panache.deployment.Constants;
+import io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor;
+
+public class PagingAndSortingMethodsImplementor extends CrudMethodsImplementor {
+
+    public static final MethodDescriptor LIST_PAGED = ofMethod(PagingAndSortingRepository.class, "findAll",
+            org.springframework.data.domain.Page.class, Pageable.class);
+
+    private static final Class<?> PANACHE_PAGE = io.quarkus.panache.common.Page.class;
+
+    private static final Class<?> PANACHE_SORT = io.quarkus.panache.common.Sort.class;
+
+    private static final Class<?> PANACHE_COLUMN = io.quarkus.panache.common.Sort.Column.class;
+
+    private static final Class<?> PANACHE_DIRECTION = io.quarkus.panache.common.Sort.Direction.class;
+
+    public PagingAndSortingMethodsImplementor(IndexView index) {
+        super(index);
+    }
+
+    public void implementList(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator("list", List.class, Page.class,
+                io.quarkus.panache.common.Sort.class);
+
+        ResultHandle page = methodCreator.getMethodParam(0);
+        ResultHandle sort = methodCreator.getMethodParam(1);
+        ResultHandle pageable = toPageable(methodCreator, page, sort);
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle resultPage = methodCreator.invokeInterfaceMethod(LIST_PAGED, repository, pageable);
+        ResultHandle result = methodCreator.invokeInterfaceMethod(
+                ofMethod(org.springframework.data.domain.Page.class, "getContent", List.class), resultPage);
+
+        methodCreator.returnValue(result);
+        methodCreator.close();
+    }
+
+    public void implementListPageCount(ClassCreator classCreator, String repositoryInterface) {
+        MethodCreator methodCreator = classCreator.getMethodCreator(Constants.PAGE_COUNT_METHOD_PREFIX + "list",
+                int.class, Page.class);
+        ResultHandle page = methodCreator.getMethodParam(0);
+        ResultHandle pageable = toPageable(methodCreator, page);
+        ResultHandle repository = getRepositoryInstance(methodCreator, repositoryInterface);
+        ResultHandle resultPage = methodCreator.invokeInterfaceMethod(LIST_PAGED, repository, pageable);
+        ResultHandle pageCount = methodCreator.invokeInterfaceMethod(
+                ofMethod(org.springframework.data.domain.Page.class, "getTotalPages", int.class), resultPage);
+
+        methodCreator.returnValue(pageCount);
+        methodCreator.close();
+    }
+
+    /**
+     * <pre>
+     * Pageable toPageable(Page panachePage, io.quarkus.panache.common.Sort panacheSort) {
+     *     Sort springSort = toSpringSort(panacheSort);
+     *     return PageRequest.of(panachePage.index, panachePage.size, springSort);
+     * }
+     * </pre>
+     */
+    private ResultHandle toPageable(MethodCreator creator, ResultHandle panachePage, ResultHandle panacheSort) {
+        ResultHandle index = creator.readInstanceField(of(PANACHE_PAGE, "index", int.class), panachePage);
+        ResultHandle size = creator.readInstanceField(of(PANACHE_PAGE, "size", int.class), panachePage);
+        ResultHandle springSort = toSpringSort(creator, panacheSort);
+        return creator.invokeStaticMethod(
+                ofMethod(PageRequest.class, "of", PageRequest.class, int.class, int.class, Sort.class),
+                index, size, springSort);
+    }
+
+    /**
+     * <pre>
+     * Pageable toPageable(Page panachePage) {
+     *     return PageRequest.of(panachePage.index, panachePage.size);
+     * }
+     * </pre>
+     */
+    private ResultHandle toPageable(MethodCreator creator, ResultHandle panachePage) {
+        ResultHandle index = creator.readInstanceField(of(PANACHE_PAGE, "index", int.class), panachePage);
+        ResultHandle size = creator.readInstanceField(of(PANACHE_PAGE, "size", int.class), panachePage);
+        return creator.invokeStaticMethod(
+                ofMethod(PageRequest.class, "of", PageRequest.class, int.class, int.class), index, size);
+    }
+
+    /**
+     * <pre>
+     * Sort toSpringSort(io.quarkus.panache.common.Sort sort) {
+     *     Sort springSort;
+     *     springSort = Sort.unsorted();
+     *     List<io.quarkus.panache.common.Sort.Column> columns = sort.getColumns();
+     *     Iterator<io.quarkus.panache.common.Sort.Column> columnsIterator = columns.iterator();
+     *     while (columnsIterator.hasNext()) {
+     *         io.quarkus.panache.common.Sort.Column column = columnsIterator.next();
+     *         Sort.Order[] orderArray = new Sort.Order[1];
+     *         String columnName = column.getName();
+     *         io.quarkus.panache.common.Sort.Direction direction = column.getDirection();
+     *         io.quarkus.panache.common.Sort.Direction ascending = io.quarkus.panache.common.Sort.Direction
+     *                 .valueOf("Ascending");
+     *         if (ascending.equals(direction)) {
+     *             orderArray[0] = Sort.Order.asc(columnName);
+     *         } else {
+     *             orderArray[0] = Sort.Order.desc(columnName);
+     *         }
+     *         Sort subSort = Sort.by(orderArray);
+     *         springSort = subSort.and(subSort);
+     *     }
+     *     return springSort;
+     * }
+     * </pre>
+     */
+    private ResultHandle toSpringSort(MethodCreator creator, ResultHandle panacheSort) {
+        AssignableResultHandle springSort = creator.createVariable(Sort.class);
+        creator.assign(springSort, creator.invokeStaticMethod(ofMethod(Sort.class, "unsorted", Sort.class)));
+
+        // Loop through the columns
+        ResultHandle columns = creator.invokeVirtualMethod(
+                ofMethod(PANACHE_SORT, "getColumns", List.class), panacheSort);
+        ResultHandle columnsIterator = creator.invokeInterfaceMethod(
+                ofMethod(List.class, "iterator", Iterator.class), columns);
+        BytecodeCreator loopCreator = creator.whileLoop(c -> iteratorHasNext(c, columnsIterator)).block();
+        ResultHandle column = loopCreator.invokeInterfaceMethod(
+                ofMethod(Iterator.class, "next", Object.class), columnsIterator);
+        addColumn(loopCreator, springSort, column);
+
+        return springSort;
+    }
+
+    private BranchResult iteratorHasNext(BytecodeCreator creator, ResultHandle iterator) {
+        return creator.ifTrue(
+                creator.invokeInterfaceMethod(ofMethod(Iterator.class, "hasNext", boolean.class), iterator));
+    }
+
+    private void addColumn(BytecodeCreator creator, AssignableResultHandle springSort, ResultHandle column) {
+        ResultHandle orderArray = creator.newArray(Sort.Order.class, 1);
+        setOrder(creator, orderArray, column);
+        ResultHandle subSort = creator.invokeStaticMethod(
+                ofMethod(Sort.class, "by", Sort.class, Sort.Order[].class), orderArray);
+        creator.assign(springSort, creator.invokeVirtualMethod(
+                ofMethod(Sort.class, "and", Sort.class, Sort.class), springSort, subSort));
+    }
+
+    private void setOrder(BytecodeCreator creator, ResultHandle orderArray, ResultHandle column) {
+        ResultHandle columnName = creator.invokeVirtualMethod(
+                ofMethod(PANACHE_COLUMN, "getName", String.class), column);
+        ResultHandle direction = creator.invokeVirtualMethod(
+                ofMethod(PANACHE_COLUMN, "getDirection", PANACHE_DIRECTION), column);
+        BranchResult isAscendingBranch = isAscending(creator, direction);
+        isAscendingBranch.trueBranch()
+                .writeArrayValue(orderArray, 0, isAscendingBranch.trueBranch().invokeStaticMethod(
+                        ofMethod(Sort.Order.class, "asc", Sort.Order.class, String.class), columnName));
+        isAscendingBranch.falseBranch()
+                .writeArrayValue(orderArray, 0, isAscendingBranch.falseBranch().invokeStaticMethod(
+                        ofMethod(Sort.Order.class, "desc", Sort.Order.class, String.class), columnName));
+    }
+
+    private BranchResult isAscending(BytecodeCreator creator, ResultHandle panacheDirection) {
+        ResultHandle ascending = creator.invokeStaticMethod(
+                ofMethod(PANACHE_DIRECTION, "valueOf", PANACHE_DIRECTION, String.class), creator.load("Ascending"));
+        return creator.ifTrue(creator.invokeVirtualMethod(
+                ofMethod(PANACHE_DIRECTION, "equals", boolean.class, Object.class), ascending, panacheDirection));
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/paging/PagingAndSortingPropertiesProvider.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/paging/PagingAndSortingPropertiesProvider.java
new file mode 100644
index 0000000000000..695540c9da893
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/paging/PagingAndSortingPropertiesProvider.java
@@ -0,0 +1,39 @@
+package io.quarkus.spring.data.rest.deployment.paging;
+
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.ADD;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.DELETE;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.GET;
+import static io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor.UPDATE;
+import static io.quarkus.spring.data.rest.deployment.paging.PagingAndSortingMethodsImplementor.LIST_PAGED;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.springframework.data.domain.Pageable;
+
+import io.quarkus.spring.data.rest.deployment.ResourcePropertiesProvider;
+
+public class PagingAndSortingPropertiesProvider extends ResourcePropertiesProvider {
+
+    private static final DotName PAGEABLE = DotName.createSimple(Pageable.class.getName());
+
+    public PagingAndSortingPropertiesProvider(IndexView index) {
+        super(index, true);
+    }
+
+    protected Map<String, Predicate<MethodInfo>> getMethodPredicates() {
+        Map<String, Predicate<MethodInfo>> methodPredicates = new HashMap<>();
+        methodPredicates.put("list", methodInfo -> methodInfo.name().equals(LIST_PAGED.getName())
+                && methodInfo.parameters().size() == 1
+                && methodInfo.parameters().get(0).name().equals(PAGEABLE));
+        methodPredicates.put("get", methodInfo -> methodInfo.name().equals(GET.getName()));
+        methodPredicates.put("add", methodInfo -> methodInfo.name().equals(ADD.getName()));
+        methodPredicates.put("update", methodInfo -> methodInfo.name().equals(UPDATE.getName()));
+        methodPredicates.put("delete", methodInfo -> methodInfo.name().equals(DELETE.getName()));
+        return methodPredicates;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java
new file mode 100644
index 0000000000000..8c5b26290aca9
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/AbstractEntity.java
@@ -0,0 +1,19 @@
+package io.quarkus.spring.data.rest.crud;
+
+import java.io.Serializable;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class AbstractEntity<IdType extends Serializable> {
+
+    @Id
+    @GeneratedValue
+    private IdType id;
+
+    public IdType getId() {
+        return id;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java
new file mode 100644
index 0000000000000..13b96b3c94edd
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java
@@ -0,0 +1,231 @@
+package io.quarkus.spring.data.rest.crud;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+class DefaultCrudResourceTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AbstractEntity.class, Record.class, DefaultRecordsRepository.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    void shouldGet() {
+        given().accept("application/json")
+                .when().get("/default-records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")));
+    }
+
+    @Test
+    void shouldNotGetNonExistent() {
+        given().accept("application/json")
+                .when().get("/default-records/1000")
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldGetHal() {
+        given().accept("application/hal+json")
+                .when().get("/default-records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")))
+                .and().body("_links.add.href", endsWith("/default-records"))
+                .and().body("_links.list.href", endsWith("/default-records"))
+                .and().body("_links.self.href", endsWith("/default-records/1"))
+                .and().body("_links.update.href", endsWith("/default-records/1"))
+                .and().body("_links.remove.href", endsWith("/default-records/1"));
+    }
+
+    @Test
+    void shouldNotGetNonExistentHal() {
+        given().accept("application/hal+json")
+                .when().get("/default-records/1000")
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldList() {
+        given().accept("application/json")
+                .when().get("/default-records")
+                .then().statusCode(200)
+                .and().body("id", hasItems(1, 2))
+                .and().body("name", hasItems("first", "second"));
+    }
+
+    @Test
+    void shouldListHal() {
+        given().accept("application/hal+json")
+                .when().get("/default-records")
+                .then().statusCode(200)
+                .and().body("_embedded.default-records.id", hasItems(1, 2))
+                .and().body("_embedded.default-records.name", hasItems("first", "second"))
+                .and()
+                .body("_embedded.default-records._links.add.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.list.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.self.href",
+                        hasItems(endsWith("/default-records/1"), endsWith("/default-records/2")))
+                .and()
+                .body("_embedded.default-records._links.update.href",
+                        hasItems(endsWith("/default-records/1"), endsWith("/default-records/2")))
+                .and()
+                .body("_embedded.default-records._links.remove.href",
+                        hasItems(endsWith("/default-records/1"), endsWith("/default-records/2")))
+                .and().body("_links.add.href", endsWith("/default-records"))
+                .and().body("_links.list.href", endsWith("/default-records"));
+    }
+
+    @Test
+    void shouldCreate() {
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create\"}")
+                .when().post("/default-records")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+
+        String location = response.header("Location");
+        int id = Integer.parseInt(location.substring(response.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = response.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-create");
+
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-create")));
+    }
+
+    @Test
+    void shouldCreateHal() {
+        Response response = given().accept("application/hal+json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create-hal\"}")
+                .when().post("/default-records")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+
+        String location = response.header("Location");
+        int id = Integer.parseInt(location.substring(response.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = response.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-create-hal");
+        assertThat(body.getString("_links.add.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.list.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.self.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.update.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.remove.href")).endsWith("/default-records/" + id);
+
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-create-hal")));
+    }
+
+    @Test
+    void shouldCreateAndUpdate() {
+        Response createResponse = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"101\", \"name\": \"test-update-create\"}")
+                .when().put("/default-records/101")
+                .thenReturn();
+        assertThat(createResponse.statusCode()).isEqualTo(201);
+
+        String location = createResponse.header("Location");
+        int id = Integer.parseInt(location.substring(createResponse.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = createResponse.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-update-create");
+
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"" + id + "\", \"name\": \"test-update\"}")
+                .when().put(location)
+                .then()
+                .statusCode(204);
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-update")));
+    }
+
+    @Test
+    void shouldCreateAndUpdateHal() {
+        Response createResponse = given().accept("application/hal+json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"102\", \"name\": \"test-update-create-hal\"}")
+                .when().put("/default-records/102")
+                .thenReturn();
+        assertThat(createResponse.statusCode()).isEqualTo(201);
+
+        String location = createResponse.header("Location");
+        int id = Integer.parseInt(location.substring(createResponse.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = createResponse.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-update-create-hal");
+        assertThat(body.getString("_links.add.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.list.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.self.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.update.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.remove.href")).endsWith("/default-records/" + id);
+
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"" + id + "\", \"name\": \"test-update-hal\"}")
+                .when().put(location)
+                .then()
+                .statusCode(204);
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-update-hal")));
+    }
+
+    @Test
+    void shouldCreateAndDelete() {
+        Response createResponse = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-delete\"}")
+                .when().post("/default-records")
+                .thenReturn();
+        assertThat(createResponse.statusCode()).isEqualTo(201);
+
+        String location = createResponse.header("Location");
+        when().delete(location)
+                .then().statusCode(204);
+        when().get(location)
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldNotDeleteNonExistent() {
+        when().delete("/default-records/1000")
+                .then().statusCode(404);
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultRecordsRepository.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultRecordsRepository.java
new file mode 100644
index 0000000000000..4a42ccc574382
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultRecordsRepository.java
@@ -0,0 +1,6 @@
+package io.quarkus.spring.data.rest.crud;
+
+import org.springframework.data.repository.CrudRepository;
+
+public interface DefaultRecordsRepository extends CrudRepository<Record, Long> {
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java
new file mode 100644
index 0000000000000..782e2e379eecd
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedCrudResourceTest.java
@@ -0,0 +1,80 @@
+package io.quarkus.spring.data.rest.crud;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ModifiedCrudResourceTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AbstractEntity.class, Record.class, ModifiedRecordsRepository.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    void shouldGet() {
+        given().accept("application/json")
+                .when().get("/secret/records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")));
+    }
+
+    @Test
+    void shouldGetHal() {
+        given().accept("application/hal+json")
+                .when().get("/secret/records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")))
+                .and().body("_links.list.href", endsWith("/secret/records"))
+                .and().body("_links.self.href", endsWith("/secret/records/1"))
+                .and().body("_links.add.href", is(nullValue()))
+                .and().body("_links.update.href", is(nullValue()))
+                .and().body("_links.remove.href", is(nullValue()));
+    }
+
+    @Test
+    void shouldList() {
+        given().accept("application/json")
+                .when().get("/secret/records")
+                .then().statusCode(200)
+                .and().body("id", hasItems(1, 2))
+                .and().body("name", hasItems("first", "second"));
+    }
+
+    @Test
+    void shouldListHal() {
+        given().accept("application/hal+json")
+                .when().get("/secret/records")
+                .then().statusCode(200)
+                .and().body("_embedded.secret-records.id", hasItems(1, 2))
+                .and().body("_embedded.secret-records.name", hasItems("first", "second"))
+                .and()
+                .body("_embedded.secret-records._links.list.href",
+                        hasItems(endsWith("/secret/records"), endsWith("/secret/records")))
+                .and()
+                .body("_embedded.secret-records._links.self.href",
+                        hasItems(endsWith("/secret/records/1"), endsWith("/secret/records/2")))
+                .and()
+                .body("_embedded.secret-records._links.add.href", is(empty()))
+                .and()
+                .body("_embedded.secret-records._links.update.href", is(empty()))
+                .and()
+                .body("_embedded.secret-records._links.remove.href", is(empty()))
+                .and().body("_links.list.href", endsWith("/secret/records"))
+                .and().body("_links.add.href", is(nullValue()));
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedRecordsRepository.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedRecordsRepository.java
new file mode 100644
index 0000000000000..0522220a501a2
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/ModifiedRecordsRepository.java
@@ -0,0 +1,19 @@
+package io.quarkus.spring.data.rest.crud;
+
+import java.util.Optional;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+@RepositoryRestResource(exported = false, path = "secret", collectionResourceRel = "secret-records")
+public interface ModifiedRecordsRepository extends CrudRepository<Record, Long> {
+
+    @Override
+    @RestResource(path = "records")
+    Iterable<Record> findAll();
+
+    @Override
+    @RestResource(path = "records")
+    Optional<Record> findById(Long id);
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java
new file mode 100644
index 0000000000000..89b6797dbc49b
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/crud/Record.java
@@ -0,0 +1,17 @@
+package io.quarkus.spring.data.rest.crud;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Record extends AbstractEntity<Long> {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java
new file mode 100644
index 0000000000000..03745e2d8430f
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/AbstractEntity.java
@@ -0,0 +1,19 @@
+package io.quarkus.spring.data.rest.paged;
+
+import java.io.Serializable;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class AbstractEntity<IdType extends Serializable> {
+
+    @Id
+    @GeneratedValue
+    private IdType id;
+
+    public IdType getId() {
+        return id;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java
new file mode 100644
index 0000000000000..3eead5a4feed6
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultPagedResourceTest.java
@@ -0,0 +1,438 @@
+package io.quarkus.spring.data.rest.paged;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.Link;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.http.Header;
+import io.restassured.http.Headers;
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+class DefaultPagedResourceTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AbstractEntity.class, Record.class, DefaultRecordsRepository.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    void shouldGet() {
+        given().accept("application/json")
+                .when().get("/default-records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")));
+    }
+
+    @Test
+    void shouldNotGetNonExistent() {
+        given().accept("application/json")
+                .when().get("/default-records/1000")
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldGetHal() {
+        given().accept("application/hal+json")
+                .when().get("/default-records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")))
+                .and().body("_links.add.href", endsWith("/default-records"))
+                .and().body("_links.list.href", endsWith("/default-records"))
+                .and().body("_links.self.href", endsWith("/default-records/1"))
+                .and().body("_links.update.href", endsWith("/default-records/1"))
+                .and().body("_links.remove.href", endsWith("/default-records/1"));
+    }
+
+    @Test
+    void shouldNotGetNonExistentHal() {
+        given().accept("application/hal+json")
+                .when().get("/default-records/1000")
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldList() {
+        Response response = given().accept("application/json")
+                .when().get("/default-records")
+                .thenReturn();
+
+        assertThat(response.statusCode()).isEqualTo(200);
+        assertThat(response.body().jsonPath().getList("id")).contains(1, 2);
+        assertThat(response.body().jsonPath().getList("name")).contains("first", "second");
+
+        Map<String, String> expectedLinks = new HashMap<>(2);
+        expectedLinks.put("first", "/default-records?page=0&size=20");
+        expectedLinks.put("last", "/default-records?page=0&size=20");
+        assertLinks(response.headers(), expectedLinks);
+    }
+
+    @Test
+    void shouldListHal() {
+        given().accept("application/hal+json")
+                .when().get("/default-records")
+                .then().statusCode(200)
+                .and().body("_embedded.default-records.id", hasItems(1, 2))
+                .and().body("_embedded.default-records.name", hasItems("first", "second"))
+                .and()
+                .body("_embedded.default-records._links.add.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.list.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.self.href",
+                        hasItems(endsWith("/default-records/1"), endsWith("/default-records/2")))
+                .and()
+                .body("_embedded.default-records._links.update.href",
+                        hasItems(endsWith("/default-records/1"), endsWith("/default-records/2")))
+                .and()
+                .body("_embedded.default-records._links.remove.href",
+                        hasItems(endsWith("/default-records/1"), endsWith("/default-records/2")))
+                .and().body("_links.add.href", endsWith("/default-records"))
+                .and().body("_links.list.href", endsWith("/default-records"))
+                .and().body("_links.first.href", endsWith("/default-records?page=0&size=20"))
+                .and().body("_links.last.href", endsWith("/default-records?page=0&size=20"));
+    }
+
+    @Test
+    void shouldListFirstPage() {
+        Response initResponse = given().accept("application/json")
+                .when().get("/default-records")
+                .thenReturn();
+        List<Integer> ids = initResponse.body().jsonPath().getList("id");
+        List<String> names = initResponse.body().jsonPath().getList("name");
+        int lastPage = ids.size() - 1;
+
+        Response response = given().accept("application/json")
+                .and().queryParam("page", 0)
+                .and().queryParam("size", 1)
+                .when().get("/default-records")
+                .thenReturn();
+
+        assertThat(response.statusCode()).isEqualTo(200);
+        assertThat(response.body().jsonPath().getList("id")).containsOnly(ids.get(0));
+        assertThat(response.body().jsonPath().getList("name")).containsOnly(names.get(0));
+
+        Map<String, String> expectedLinks = new HashMap<>(3);
+        expectedLinks.put("first", "/default-records?page=0&size=1");
+        expectedLinks.put("last", "/default-records?page=" + lastPage + "&size=1");
+        expectedLinks.put("next", "/default-records?page=1&size=1");
+        assertLinks(response.headers(), expectedLinks);
+    }
+
+    @Test
+    void shouldListFirstPageHal() {
+        Response initResponse = given().accept("application/json")
+                .when().get("/default-records")
+                .thenReturn();
+        List<Integer> ids = initResponse.body().jsonPath().getList("id");
+        List<String> names = initResponse.body().jsonPath().getList("name");
+        int lastPage = ids.size() - 1;
+
+        given().accept("application/hal+json")
+                .and().queryParam("page", 0)
+                .and().queryParam("size", 1)
+                .when().get("/default-records")
+                .then().statusCode(200)
+                .and().body("_embedded.default-records.id", contains(ids.get(0)))
+                .and().body("_embedded.default-records.name", contains(names.get(0)))
+                .and()
+                .body("_embedded.default-records._links.add.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.list.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.self.href",
+                        contains(endsWith("/default-records/" + ids.get(0))))
+                .and()
+                .body("_embedded.default-records._links.update.href",
+                        contains(endsWith("/default-records/" + ids.get(0))))
+                .and()
+                .body("_embedded.default-records._links.remove.href",
+                        contains(endsWith("/default-records/" + ids.get(0))))
+                .and().body("_links.add.href", endsWith("/default-records"))
+                .and().body("_links.list.href", endsWith("/default-records"))
+                .and().body("_links.first.href", endsWith("/default-records?page=0&size=1"))
+                .and().body("_links.last.href", endsWith("/default-records?page=" + lastPage + "&size=1"))
+                .and().body("_links.next.href", endsWith("/default-records?page=1&size=1"));
+    }
+
+    @Test
+    void shouldListLastPage() {
+        Response initResponse = given().accept("application/json")
+                .when().get("/default-records")
+                .thenReturn();
+        List<Integer> ids = initResponse.body().jsonPath().getList("id");
+        List<String> names = initResponse.body().jsonPath().getList("name");
+        int lastPage = ids.size() - 1;
+
+        Response response = given().accept("application/json")
+                .and().queryParam("page", lastPage)
+                .and().queryParam("size", 1)
+                .when().get("/default-records")
+                .thenReturn();
+
+        assertThat(response.statusCode()).isEqualTo(200);
+        assertThat(response.body().jsonPath().getList("id")).containsOnly(ids.get(lastPage));
+        assertThat(response.body().jsonPath().getList("name")).containsOnly(names.get(lastPage));
+
+        Map<String, String> expectedLinks = new HashMap<>(3);
+        expectedLinks.put("first", "/default-records?page=0&size=1");
+        expectedLinks.put("last", "/default-records?page=" + lastPage + "&size=1");
+        expectedLinks.put("previous", "/default-records?page=" + (lastPage - 1) + "&size=1");
+        assertLinks(response.headers(), expectedLinks);
+    }
+
+    @Test
+    void shouldListLastPageHal() {
+        Response initResponse = given().accept("application/json")
+                .when().get("/default-records")
+                .thenReturn();
+        List<Integer> ids = initResponse.body().jsonPath().getList("id");
+        List<String> names = initResponse.body().jsonPath().getList("name");
+        int lastPage = ids.size() - 1;
+
+        given().accept("application/hal+json")
+                .and().queryParam("page", lastPage)
+                .and().queryParam("size", 1)
+                .when().get("/default-records")
+                .then().statusCode(200)
+                .and().body("_embedded.default-records.id", contains(ids.get(lastPage)))
+                .and().body("_embedded.default-records.name", contains(names.get(lastPage)))
+                .and()
+                .body("_embedded.default-records._links.add.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.list.href",
+                        hasItems(endsWith("/default-records"), endsWith("/default-records")))
+                .and()
+                .body("_embedded.default-records._links.self.href",
+                        contains(endsWith("/default-records/" + ids.get(lastPage))))
+                .and()
+                .body("_embedded.default-records._links.update.href",
+                        contains(endsWith("/default-records/" + ids.get(lastPage))))
+                .and()
+                .body("_embedded.default-records._links.remove.href",
+                        contains(endsWith("/default-records/" + ids.get(lastPage))))
+                .and().body("_links.add.href", endsWith("/default-records"))
+                .and().body("_links.list.href", endsWith("/default-records"))
+                .and().body("_links.first.href", endsWith("/default-records?page=0&size=1"))
+                .and().body("_links.last.href", endsWith("/default-records?page=" + lastPage + "&size=1"))
+                .and().body("_links.previous.href", endsWith("/default-records?page=" + (lastPage - 1) + "&size=1"));
+    }
+
+    @Test
+    void shouldNotGetNonExistentPage() {
+        given().accept("application/json")
+                .and().queryParam("page", 100)
+                .when().get("/default-records")
+                .then().statusCode(200)
+                .and().body("id", is(empty()));
+    }
+
+    @Test
+    void shouldNotGetNegativePageOrSize() {
+        given().accept("application/json")
+                .and().queryParam("page", -1)
+                .and().queryParam("size", -1)
+                .when().get("/default-records")
+                .then().statusCode(200)
+                // Invalid page and size parameters are replaced with defaults
+                .and().body("id", hasItems(1, 2));
+    }
+
+    @Test
+    void shouldListAscending() {
+        Response response = given().accept("application/json")
+                .when().get("/default-records?sort=name,id")
+                .thenReturn();
+
+        List<String> actualNames = response.body().jsonPath().getList("name");
+        List<String> expectedNames = new LinkedList<>(actualNames);
+        expectedNames.sort(Comparator.naturalOrder());
+        assertThat(actualNames).isEqualTo(expectedNames);
+    }
+
+    @Test
+    void shouldListDescending() {
+        Response response = given().accept("application/json")
+                .when().get("/default-records?sort=-name,id")
+                .thenReturn();
+
+        List<String> actualNames = response.body().jsonPath().getList("name");
+        List<String> expectedNames = new LinkedList<>(actualNames);
+        expectedNames.sort(Comparator.reverseOrder());
+        assertThat(actualNames).isEqualTo(expectedNames);
+    }
+
+    @Test
+    void shouldCreate() {
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create\"}")
+                .when().post("/default-records")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+
+        String location = response.header("Location");
+        int id = Integer.parseInt(location.substring(response.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = response.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-create");
+
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-create")));
+    }
+
+    @Test
+    void shouldCreateHal() {
+        Response response = given().accept("application/hal+json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create-hal\"}")
+                .when().post("/default-records")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+
+        String location = response.header("Location");
+        int id = Integer.parseInt(location.substring(response.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = response.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-create-hal");
+        assertThat(body.getString("_links.add.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.list.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.self.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.update.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.remove.href")).endsWith("/default-records/" + id);
+
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-create-hal")));
+    }
+
+    @Test
+    void shouldCreateAndUpdate() {
+        Response createResponse = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"101\", \"name\": \"test-update-create\"}")
+                .when().put("/default-records/101")
+                .thenReturn();
+        assertThat(createResponse.statusCode()).isEqualTo(201);
+
+        String location = createResponse.header("Location");
+        int id = Integer.parseInt(location.substring(createResponse.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = createResponse.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-update-create");
+
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"" + id + "\", \"name\": \"test-update\"}")
+                .when().put(location)
+                .then()
+                .statusCode(204);
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-update")));
+    }
+
+    @Test
+    void shouldCreateAndUpdateHal() {
+        Response createResponse = given().accept("application/hal+json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"102\", \"name\": \"test-update-create-hal\"}")
+                .when().put("/default-records/102")
+                .thenReturn();
+        assertThat(createResponse.statusCode()).isEqualTo(201);
+
+        String location = createResponse.header("Location");
+        int id = Integer.parseInt(location.substring(createResponse.header("Location").lastIndexOf("/") + 1));
+        JsonPath body = createResponse.body().jsonPath();
+        assertThat(body.getInt("id")).isEqualTo(id);
+        assertThat(body.getString("name")).isEqualTo("test-update-create-hal");
+        assertThat(body.getString("_links.add.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.list.href")).endsWith("/default-records");
+        assertThat(body.getString("_links.self.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.update.href")).endsWith("/default-records/" + id);
+        assertThat(body.getString("_links.remove.href")).endsWith("/default-records/" + id);
+
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"id\": \"" + id + "\", \"name\": \"test-update-hal\"}")
+                .when().put(location)
+                .then()
+                .statusCode(204);
+        given().accept("application/json")
+                .when().get(location)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(id)))
+                .and().body("name", is(equalTo("test-update-hal")));
+    }
+
+    @Test
+    void shouldCreateAndDelete() {
+        Response createResponse = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-delete\"}")
+                .when().post("/default-records")
+                .thenReturn();
+        assertThat(createResponse.statusCode()).isEqualTo(201);
+
+        String location = createResponse.header("Location");
+        when().delete(location)
+                .then().statusCode(204);
+        when().get(location)
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldNotDeleteNonExistent() {
+        when().delete("/default-records/1000")
+                .then().statusCode(404);
+    }
+
+    private void assertLinks(Headers headers, Map<String, String> expectedLinks) {
+        List<Link> links = new LinkedList<>();
+        for (Header header : headers.getList("Link")) {
+            links.add(Link.valueOf(header.getValue()));
+        }
+        assertThat(links).hasSize(expectedLinks.size());
+        for (Map.Entry<String, String> expectedLink : expectedLinks.entrySet()) {
+            assertThat(links).anySatisfy(link -> {
+                assertThat(link.getUri().toString()).endsWith(expectedLink.getValue());
+                assertThat(link.getRel()).isEqualTo(expectedLink.getKey());
+            });
+        }
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultRecordsRepository.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultRecordsRepository.java
new file mode 100644
index 0000000000000..475c33a2278b9
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/DefaultRecordsRepository.java
@@ -0,0 +1,6 @@
+package io.quarkus.spring.data.rest.paged;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface DefaultRecordsRepository extends PagingAndSortingRepository<Record, Long> {
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java
new file mode 100644
index 0000000000000..9a09f2445a430
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedPagedResourceTest.java
@@ -0,0 +1,107 @@
+package io.quarkus.spring.data.rest.paged;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ModifiedPagedResourceTest {
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AbstractEntity.class, Record.class, ModifiedRecordsRepository.class)
+                    .addAsResource("application.properties")
+                    .addAsResource("import.sql"));
+
+    @Test
+    void shouldGet() {
+        given().accept("application/json")
+                .when().get("/secret/records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")));
+    }
+
+    @Test
+    void shouldGetHal() {
+        given().accept("application/hal+json")
+                .when().get("/secret/records/1")
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(1)))
+                .and().body("name", is(equalTo("first")))
+                .and().body("_links.list.href", endsWith("/secret/records"))
+                .and().body("_links.self.href", endsWith("/secret/records/1"))
+                .and().body("_links.add.href", is(nullValue()))
+                .and().body("_links.update.href", is(nullValue()))
+                .and().body("_links.remove.href", is(nullValue()));
+    }
+
+    @Test
+    void shouldList() {
+        given().accept("application/json")
+                .when().get("/secret/records")
+                .then().statusCode(200)
+                .and().body("id", hasItems(1, 2))
+                .and().body("name", hasItems("first", "second"));
+    }
+
+    @Test
+    void shouldListHal() {
+        given().accept("application/hal+json")
+                .when().get("/secret/records")
+                .then().statusCode(200)
+                .and().body("_embedded.secret-records.id", hasItems(1, 2))
+                .and().body("_embedded.secret-records.name", hasItems("first", "second"))
+                .and()
+                .body("_embedded.secret-records._links.list.href",
+                        hasItems(endsWith("/secret/records"), endsWith("/secret/records")))
+                .and()
+                .body("_embedded.secret-records._links.self.href",
+                        hasItems(endsWith("/secret/records/1"), endsWith("/secret/records/2")))
+                .and()
+                .body("_embedded.secret-records._links.add.href", is(empty()))
+                .and()
+                .body("_embedded.secret-records._links.update.href", is(empty()))
+                .and()
+                .body("_embedded.secret-records._links.remove.href", is(empty()))
+                .and().body("_links.list.href", endsWith("/secret/records"))
+                .and().body("_links.add.href", is(nullValue()));
+    }
+
+    @Test
+    void shouldNotCreate() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create\"}")
+                .when().post("/secret/records")
+                .then().statusCode(405);
+    }
+
+    @Test
+    void shouldNotUpdate() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create\"}")
+                .when().put("/secret/records/1")
+                .then().statusCode(405);
+    }
+
+    @Test
+    void shouldNotDelete() {
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body("{\"name\": \"test-create\"}")
+                .when().delete("/secret/records/1")
+                .then().statusCode(405);
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedRecordsRepository.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedRecordsRepository.java
new file mode 100644
index 0000000000000..fd819a45b9b89
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/ModifiedRecordsRepository.java
@@ -0,0 +1,21 @@
+package io.quarkus.spring.data.rest.paged;
+
+import java.util.Optional;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+@RepositoryRestResource(exported = false, path = "secret", collectionResourceRel = "secret-records")
+public interface ModifiedRecordsRepository extends JpaRepository<Record, Long> {
+
+    @Override
+    @RestResource(path = "records")
+    Page<Record> findAll(Pageable pageable);
+
+    @Override
+    @RestResource(path = "records")
+    Optional<Record> findById(Long id);
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java
new file mode 100644
index 0000000000000..8a10c308e71c7
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/paged/Record.java
@@ -0,0 +1,17 @@
+package io.quarkus.spring.data.rest.paged;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Record extends AbstractEntity<Long> {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/extensions/spring-data-rest/deployment/src/test/resources/application.properties b/extensions/spring-data-rest/deployment/src/test/resources/application.properties
new file mode 100644
index 0000000000000..bc3d8dca4fd1a
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/resources/application.properties
@@ -0,0 +1,5 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/extensions/spring-data-rest/deployment/src/test/resources/import.sql b/extensions/spring-data-rest/deployment/src/test/resources/import.sql
new file mode 100644
index 0000000000000..4d40cab8e8f2f
--- /dev/null
+++ b/extensions/spring-data-rest/deployment/src/test/resources/import.sql
@@ -0,0 +1,2 @@
+insert into record(id, name) values (nextval('hibernate_sequence'), 'first');
+insert into record(id, name) values (nextval('hibernate_sequence'), 'second');
diff --git a/extensions/spring-data-rest/pom.xml b/extensions/spring-data-rest/pom.xml
new file mode 100644
index 0000000000000..e5f65f33fd643
--- /dev/null
+++ b/extensions/spring-data-rest/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-spring-data-rest-parent</artifactId>
+    <name>Quarkus - Spring Data REST</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+</project>
diff --git a/extensions/spring-data-rest/runtime/pom.xml b/extensions/spring-data-rest/runtime/pom.xml
new file mode 100644
index 0000000000000..f1c159c2fb303
--- /dev/null
+++ b/extensions/spring-data-rest/runtime/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-spring-data-rest-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-spring-data-rest</artifactId>
+    <name>Quarkus - Spring - Data REST - Runtime</name>
+    <description>Generate JAX-RS resources for a Spring Data application</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-data-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-rest-api</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <path>
+                                    <groupId>io.quarkus</groupId>
+                                    <artifactId>quarkus-extension-processor</artifactId>
+                                    <version>${project.version}</version>
+                                </path>
+                            </annotationProcessorPaths>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java b/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java
new file mode 100644
index 0000000000000..4275a62f2425e
--- /dev/null
+++ b/extensions/spring-data-rest/runtime/src/main/java/io/quarkus/spring/data/rest/runtime/RestDataPanacheExceptionMapper.java
@@ -0,0 +1,31 @@
+package io.quarkus.spring.data.rest.runtime;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.rest.data.panache.RestDataPanacheException;
+
+public class RestDataPanacheExceptionMapper implements ExceptionMapper<RestDataPanacheException> {
+
+    private static final Logger LOGGER = Logger.getLogger(RestDataPanacheExceptionMapper.class);
+
+    @Override
+    public Response toResponse(RestDataPanacheException exception) {
+        LOGGER.warnf(exception, "Mapping an unhandled %s", RestDataPanacheException.class.getSimpleName());
+        return throwableToResponse(exception, exception.getMessage());
+    }
+
+    private Response throwableToResponse(Throwable throwable, String message) {
+        if (throwable instanceof javax.validation.ConstraintViolationException) {
+            return Response.status(Response.Status.BAD_REQUEST.getStatusCode(), message).build();
+        }
+
+        if (throwable.getCause() != null) {
+            return throwableToResponse(throwable.getCause(), message);
+        }
+
+        return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), message).build();
+    };
+}
diff --git a/extensions/spring-data-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-data-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..2dff6210c1680
--- /dev/null
+++ b/extensions/spring-data-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,13 @@
+---
+name: "Quarkus Extension for Spring Data REST"
+metadata:
+  keywords:
+    - "spring-data"
+    - "spring-data-rest"
+    - "spring"
+    - "data"
+    - "rest"
+  guide: "https://quarkus.io/guides/spring-data-rest"
+  categories:
+    - "compatibility"
+  status: "experimental"
diff --git a/extensions/spring-di/deployment/pom.xml b/extensions/spring-di/deployment/pom.xml
index 244869fab7664..565c46f63bf0f 100644
--- a/extensions/spring-di/deployment/pom.xml
+++ b/extensions/spring-di/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-di-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -19,10 +18,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-di</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
diff --git a/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java b/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java
index 467e153e544ce..ac1cab78a2852 100644
--- a/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java
+++ b/extensions/spring-di/deployment/src/main/java/io/quarkus/spring/di/deployment/SpringDIProcessor.java
@@ -208,10 +208,16 @@ private DotName getScope(final AnnotationTarget target) {
         if (target.kind() == AnnotationTarget.Kind.CLASS) {
             if (target.asClass().classAnnotation(SPRING_SCOPE_ANNOTATION) != null) {
                 value = target.asClass().classAnnotation(SPRING_SCOPE_ANNOTATION).value();
+                if ((value == null) || value.asString().isEmpty()) {
+                    value = target.asClass().classAnnotation(SPRING_SCOPE_ANNOTATION).value("scopeName");
+                }
             }
         } else if (target.kind() == AnnotationTarget.Kind.METHOD) {
             if (target.asMethod().hasAnnotation(SPRING_SCOPE_ANNOTATION)) {
                 value = target.asMethod().annotation(SPRING_SCOPE_ANNOTATION).value();
+                if ((value == null) || value.asString().isEmpty()) {
+                    value = target.asMethod().annotation(SPRING_SCOPE_ANNOTATION).value("scopeName");
+                }
             }
         }
         if (value != null) {
diff --git a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java
index 625deb2d8f05f..5d79dea79c8bd 100644
--- a/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java
+++ b/extensions/spring-di/deployment/src/test/java/io/quarkus/spring/di/deployment/SpringDIProcessorTest.java
@@ -13,6 +13,7 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Dependent;
@@ -213,7 +214,7 @@ private IndexView getIndex(final Class<?>... classes) {
                 throw new IllegalStateException("Failed to index: " + className, e);
             }
         }
-        return BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), new BeanArchives.PersistentClassIndex(),
+        return BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), new ConcurrentHashMap<>(),
                 indexer.complete());
     }
 
diff --git a/extensions/spring-di/pom.xml b/extensions/spring-di/pom.xml
index 2087fb7ad0fa4..1065c9fc23c39 100644
--- a/extensions/spring-di/pom.xml
+++ b/extensions/spring-di/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-di/runtime/pom.xml b/extensions/spring-di/runtime/pom.xml
index 2c6abf5594957..fad9ac1c5f98a 100644
--- a/extensions/spring-di/runtime/pom.xml
+++ b/extensions/spring-di/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-di-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -27,6 +26,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-beans-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/extensions/spring-scheduled/deployment/pom.xml b/extensions/spring-scheduled/deployment/pom.xml
index ca8221a793856..a4cdf7c36953c 100644
--- a/extensions/spring-scheduled/deployment/pom.xml
+++ b/extensions/spring-scheduled/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-scheduled-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/spring-scheduled/deployment/src/main/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessor.java b/extensions/spring-scheduled/deployment/src/main/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessor.java
index 810c292a526ce..b749cf184a6bf 100644
--- a/extensions/spring-scheduled/deployment/src/main/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessor.java
+++ b/extensions/spring-scheduled/deployment/src/main/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessor.java
@@ -8,7 +8,6 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
@@ -26,7 +25,7 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.scheduler.deployment.ScheduledBusinessMethodItem;
-import io.quarkus.scheduler.runtime.SchedulerContext;
+import io.quarkus.scheduler.runtime.util.SchedulerUtils;
 
 /**
  * A simple processor that search for Spring Scheduled annotations in Beans and produce
@@ -166,9 +165,7 @@ private long valueOf(String paramName, String paramValueString) {
         long paramValue;
         if (paramValueString.startsWith("${")) {
             paramValueString = paramValueString.replace("${", "{").trim();
-            paramValueString = ConfigProviderResolver.instance().getConfig().getValue(
-                    SchedulerContext.getConfigProperty(paramValueString),
-                    String.class);
+            paramValueString = SchedulerUtils.lookUpPropertyValue(paramValueString);
         }
         try {
             paramValue = Long.valueOf(paramValueString);
diff --git a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java
index 4db14299e04df..ad55c1f7ece30 100644
--- a/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java
+++ b/extensions/spring-scheduled/deployment/src/test/java/io/quarkus/spring/scheduled/deployment/SpringScheduledProcessorTest.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -124,7 +125,7 @@ private IndexView getIndex(final Class<?>... classes) {
                 throw new IllegalStateException("Failed to index: " + className, e);
             }
         }
-        return BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), new BeanArchives.PersistentClassIndex(),
+        return BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(), new ConcurrentHashMap<>(),
                 indexer.complete());
     }
 
diff --git a/extensions/spring-scheduled/pom.xml b/extensions/spring-scheduled/pom.xml
index cc72f13b5fe8f..8a5e072a26612 100644
--- a/extensions/spring-scheduled/pom.xml
+++ b/extensions/spring-scheduled/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-scheduled/runtime/pom.xml b/extensions/spring-scheduled/runtime/pom.xml
index f672a427a69b0..3c523a93c33a0 100644
--- a/extensions/spring-scheduled/runtime/pom.xml
+++ b/extensions/spring-scheduled/runtime/pom.xml
@@ -6,7 +6,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-spring-scheduled-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/spring-scheduled/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-scheduled/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 2561765c2e7a1..d2dc0ecfd646d 100644
--- a/extensions/spring-scheduled/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/spring-scheduled/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,5 +1,4 @@
----
-name: "Quarkus Extension for Spring Scheduled "
+name: "Quarkus Extension for Spring Scheduled"
 metadata:
   keywords:
   - "spring-scheduled"
diff --git a/extensions/spring-security/deployment/pom.xml b/extensions/spring-security/deployment/pom.xml
index f8c0287427583..93a6cff70edef 100644
--- a/extensions/spring-security/deployment/pom.xml
+++ b/extensions/spring-security/deployment/pom.xml
@@ -7,7 +7,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-spring-security-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-spring-security-deployment</artifactId>
diff --git a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/HasRoleValueUtil.java b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/HasRoleValueUtil.java
index 723cc88d7e4b1..4dd1bdb2b415e 100644
--- a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/HasRoleValueUtil.java
+++ b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/HasRoleValueUtil.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.Modifier;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -12,9 +13,7 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 
-import io.quarkus.spring.security.deployment.roles.FromBeanHasRoleValueProducer;
-import io.quarkus.spring.security.deployment.roles.HasRoleValueProducer;
-import io.quarkus.spring.security.deployment.roles.StaticHasRoleValueProducer;
+import io.quarkus.spring.security.runtime.interceptor.SpringSecurityRecorder;
 
 final class HasRoleValueUtil {
 
@@ -24,11 +23,14 @@ final class HasRoleValueUtil {
     private HasRoleValueUtil() {
     }
 
-    static HasRoleValueProducer getHasRoleValueProducer(String hasRoleValue, MethodInfo methodInfo, IndexView index,
+    static Supplier<String[]> getHasRoleValueProducer(String hasRoleValue, MethodInfo methodInfo,
+            IndexView index,
             Map<String, DotName> springBeansNameToDotName,
-            Map<String, ClassInfo> springBeansNameToClassInfo, Set<String> beansReferencedInPreAuthorized) {
+            Map<String, ClassInfo> springBeansNameToClassInfo,
+            Set<String> beansReferencedInPreAuthorized,
+            SpringSecurityRecorder recorder) {
         if (hasRoleValue.startsWith("'") && hasRoleValue.endsWith("'")) {
-            return new StaticHasRoleValueProducer(hasRoleValue.replace("'", ""));
+            return recorder.staticHasRole(hasRoleValue.replace("'", ""));
         } else if (hasRoleValue.startsWith("@")) {
             Matcher beanFieldMatcher = BEAN_FIELD_PATTERN.matcher(hasRoleValue);
             if (!beanFieldMatcher.find()) {
@@ -41,6 +43,7 @@ static HasRoleValueProducer getHasRoleValueProducer(String hasRoleValue, MethodI
 
             String fieldName = beanFieldMatcher.group(2);
             FieldInfo fieldInfo = beanClassInfo.field(fieldName);
+            //TODO: detect normal scoped beans and throw an exception, as it will read the field from the proxy
             if ((fieldInfo == null) || !Modifier.isPublic(fieldInfo.flags())
                     || !DotNames.STRING.equals(fieldInfo.type().name())) {
                 throw new IllegalArgumentException("Bean named '" + beanName + "' found in expression '" + hasRoleValue
@@ -51,7 +54,7 @@ static HasRoleValueProducer getHasRoleValueProducer(String hasRoleValue, MethodI
 
             beansReferencedInPreAuthorized.add(fieldInfo.declaringClass().name().toString());
 
-            return new FromBeanHasRoleValueProducer(beanName, fieldInfo);
+            return recorder.fromBeanField(fieldInfo.declaringClass().name().toString(), fieldName);
         } else {
             throw SpringSecurityProcessorUtil.createGenericMalformedException(methodInfo, hasRoleValue);
         }
diff --git a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/PreAuthorizeSecurityCheckUtil.java b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/PreAuthorizeSecurityCheckUtil.java
deleted file mode 100644
index 1bcb10d9d7bc3..0000000000000
--- a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/PreAuthorizeSecurityCheckUtil.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package io.quarkus.spring.security.deployment;
-
-import static io.quarkus.gizmo.FieldDescriptor.of;
-import static io.quarkus.gizmo.MethodDescriptor.ofConstructor;
-import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.FieldDescriptor;
-import io.quarkus.gizmo.ResultHandle;
-import io.quarkus.security.runtime.interceptor.check.RolesAllowedCheck;
-import io.quarkus.security.runtime.interceptor.check.SecurityCheck;
-import io.quarkus.spring.security.deployment.roles.HasRoleValueProducer;
-import io.quarkus.spring.security.runtime.interceptor.check.AllDelegatingSecurityCheck;
-import io.quarkus.spring.security.runtime.interceptor.check.AnonymousCheck;
-import io.quarkus.spring.security.runtime.interceptor.check.AnyDelegatingSecurityCheck;
-import io.quarkus.spring.security.runtime.interceptor.check.PrincipalNameFromParameterObjectSecurityCheck;
-import io.quarkus.spring.security.runtime.interceptor.check.PrincipalNameFromParameterSecurityCheck;
-
-/**
- * Utility used to provide access to instances of the appropriate SecurityCheck classes
- */
-final class PreAuthorizeSecurityCheckUtil {
-
-    private PreAuthorizeSecurityCheckUtil() {
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> anonymousSecurityCheck() {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.readStaticField(of(AnonymousCheck.class, "INSTANCE", AnonymousCheck.class));
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> hasRoleSecurityCheck(
-            List<HasRoleValueProducer> hasRoleValueProducers) {
-        return new HasRoleSecurityCheck(hasRoleValueProducers);
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> principalNameFromParameterSecurityCheck(int index,
-            PrincipalNameFromParameterSecurityCheck.CheckType checkType) {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.invokeStaticMethod(
-                        ofMethod(PrincipalNameFromParameterSecurityCheck.class, "of",
-                                PrincipalNameFromParameterSecurityCheck.class, int.class,
-                                PrincipalNameFromParameterSecurityCheck.CheckType.class),
-                        creator.load(index),
-                        creator.readStaticField(FieldDescriptor.of(PrincipalNameFromParameterSecurityCheck.CheckType.class,
-                                checkType.toString(), PrincipalNameFromParameterSecurityCheck.CheckType.class)));
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> principalNameFromParameterObjectSecurityCheck(int index,
-            String expectedParameterClass, String stringPropertyAccessorClass, String propertyName) {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.invokeStaticMethod(
-                        ofMethod(PrincipalNameFromParameterObjectSecurityCheck.class, "of",
-                                PrincipalNameFromParameterObjectSecurityCheck.class, int.class, String.class, String.class,
-                                String.class),
-                        creator.load(index), creator.load(expectedParameterClass),
-                        creator.load(stringPropertyAccessorClass), creator.load(propertyName));
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> generateAllDelegatingSecurityCheck(
-            List<Function<BytecodeCreator, ResultHandle>> delegatesList) {
-        return generateDelegatingSecurityCheck(delegatesList, AllDelegatingSecurityCheck.class);
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> generateAnyDelegatingSecurityCheck(
-            List<Function<BytecodeCreator, ResultHandle>> delegatesList) {
-        return generateDelegatingSecurityCheck(delegatesList, AnyDelegatingSecurityCheck.class);
-    }
-
-    private static Function<BytecodeCreator, ResultHandle> generateDelegatingSecurityCheck(
-            List<Function<BytecodeCreator, ResultHandle>> delegatesList, Class<? extends SecurityCheck> securityCheckClass) {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                ResultHandle delegates = creator.newInstance(ofConstructor(ArrayList.class, int.class),
-                        creator.load(delegatesList.size()));
-                for (Function<BytecodeCreator, ResultHandle> delegateFunction : delegatesList) {
-                    ResultHandle delegate = delegateFunction.apply(creator);
-                    creator.invokeVirtualMethod(ofMethod(ArrayList.class, "add", boolean.class, Object.class), delegates,
-                            delegate);
-                }
-                return creator.newInstance(ofConstructor(securityCheckClass, List.class), delegates);
-            }
-        };
-    }
-
-    public static Function<BytecodeCreator, ResultHandle> beanMethodGeneratedSecurityCheck(String generatedClassName) {
-        return new Function<BytecodeCreator, ResultHandle>() {
-            @Override
-            public ResultHandle apply(BytecodeCreator creator) {
-                return creator.invokeStaticMethod(ofMethod(generatedClassName, "getInstance", generatedClassName));
-            }
-        };
-    }
-
-    private static class HasRoleSecurityCheck implements Function<BytecodeCreator, ResultHandle> {
-        private final List<HasRoleValueProducer> roleValueProducers;
-
-        private HasRoleSecurityCheck(List<HasRoleValueProducer> roleValueProducers) {
-            this.roleValueProducers = roleValueProducers;
-        }
-
-        @Override
-        public ResultHandle apply(BytecodeCreator creator) {
-            ResultHandle rolesAllowedArgs = creator.newArray(String.class, roleValueProducers.size());
-            int i = 0;
-            for (Function<BytecodeCreator, ResultHandle> roleValueProducer : roleValueProducers) {
-                creator.writeArrayValue(rolesAllowedArgs, i++, roleValueProducer.apply(creator));
-            }
-
-            return creator.invokeStaticMethod(
-                    ofMethod(RolesAllowedCheck.class, "of", RolesAllowedCheck.class, String[].class), rolesAllowedArgs);
-        }
-    }
-
-}
diff --git a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/SpringSecurityProcessor.java b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/SpringSecurityProcessor.java
index 7deac4526ddb0..1fa035ba13254 100644
--- a/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/SpringSecurityProcessor.java
+++ b/extensions/spring-security/deployment/src/main/java/io/quarkus/spring/security/deployment/SpringSecurityProcessor.java
@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -35,18 +35,19 @@
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.security.deployment.AdditionalSecurityCheckBuildItem;
-import io.quarkus.security.deployment.SecurityCheckInstantiationUtil;
 import io.quarkus.security.deployment.SecurityTransformerUtils;
+import io.quarkus.security.runtime.SecurityCheckRecorder;
+import io.quarkus.security.runtime.interceptor.check.SecurityCheck;
 import io.quarkus.spring.di.deployment.SpringBeanNameToDotNameBuildItem;
-import io.quarkus.spring.security.deployment.roles.HasRoleValueProducer;
 import io.quarkus.spring.security.runtime.interceptor.SpringPreauthorizeInterceptor;
 import io.quarkus.spring.security.runtime.interceptor.SpringSecuredInterceptor;
+import io.quarkus.spring.security.runtime.interceptor.SpringSecurityRecorder;
 import io.quarkus.spring.security.runtime.interceptor.check.PrincipalNameFromParameterSecurityCheck;
 
 class SpringSecurityProcessor {
@@ -77,8 +78,10 @@ void registerSecurityInterceptors(BuildProducer<InterceptorBindingRegistrarBuild
         beans.produce(new AdditionalBeanBuildItem(SpringPreauthorizeInterceptor.class));
     }
 
+    @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
     void addSpringSecuredSecurityCheck(CombinedIndexBuildItem index,
+            SecurityCheckRecorder securityCheckRecorder,
             BuildProducer<AdditionalSecurityCheckBuildItem> additionalSecurityCheckBuildItems) {
 
         Set<MethodInfo> methodsWithSecurityAnnotation = new HashSet<>();
@@ -95,7 +98,7 @@ void addSpringSecuredSecurityCheck(CombinedIndexBuildItem index,
                 checksStandardSecurity(instance, methodInfo);
                 checksStandardSecurity(instance, methodInfo.declaringClass());
                 additionalSecurityCheckBuildItems.produce(new AdditionalSecurityCheckBuildItem(methodInfo,
-                        SecurityCheckInstantiationUtil.rolesAllowedSecurityCheck(rolesAllowed)));
+                        securityCheckRecorder.rolesAllowed(rolesAllowed)));
                 methodsWithSecurityAnnotation.add(methodInfo);
             }
         }
@@ -120,7 +123,7 @@ void addSpringSecuredSecurityCheck(CombinedIndexBuildItem index,
                     }
                     if (!methodsWithSecurityAnnotation.contains(methodInfo)) {
                         additionalSecurityCheckBuildItems.produce(new AdditionalSecurityCheckBuildItem(methodInfo,
-                                SecurityCheckInstantiationUtil.rolesAllowedSecurityCheck(rolesAllowed)));
+                                securityCheckRecorder.rolesAllowed(rolesAllowed)));
                     }
                 }
             }
@@ -344,8 +347,11 @@ void generateNecessarySupportClasses(CombinedIndexBuildItem index,
         }
     }
 
+    @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
     void addSpringPreAuthorizeSecurityCheck(CombinedIndexBuildItem index,
+            SecurityCheckRecorder securityCheckRecorder,
+            SpringSecurityRecorder springSecurityRecorder,
             SpringPreAuthorizeAnnotatedMethodBuildItem springPreAuthorizeAnnotatedMethods,
             SpringBeanNameToDotNameBuildItem springBeanNames,
             BuildProducer<AdditionalSecurityCheckBuildItem> additionalSecurityChecks,
@@ -394,43 +400,43 @@ void addSpringPreAuthorizeSecurityCheck(CombinedIndexBuildItem index,
                 parts = value.split("(?i) or ");
             }
 
-            List<Function<BytecodeCreator, ResultHandle>> securityChecks = new ArrayList<>(parts.length);
+            List<SecurityCheck> securityChecks = new ArrayList<>(parts.length);
 
             for (String part : parts) {
                 part = part.trim();
                 if (part.equals("permitAll()")) {
-                    securityChecks.add(SecurityCheckInstantiationUtil.permitAllSecurityCheck());
+                    securityChecks.add(securityCheckRecorder.permitAll());
                 } else if (part.equals("denyAll()")) {
-                    securityChecks.add(SecurityCheckInstantiationUtil.denyAllSecurityCheck());
+                    securityChecks.add(securityCheckRecorder.denyAll());
                 } else if (part.equals("isAnonymous()")) {
-                    securityChecks.add(PreAuthorizeSecurityCheckUtil.anonymousSecurityCheck());
+                    securityChecks.add(springSecurityRecorder.anonymous());
                 } else if (part.replaceAll("\\s", "").equals("isAuthenticated()")) {
 
-                    securityChecks.add(SecurityCheckInstantiationUtil.authenticatedSecurityCheck());
+                    securityChecks.add(securityCheckRecorder.authenticated());
 
                 } else if (part.startsWith("hasRole(")) {
 
                     String hasRoleValue = part.replace("hasRole(", "").replace(")", "");
-                    HasRoleValueProducer hasRoleValueProducer = HasRoleValueUtil.getHasRoleValueProducer(hasRoleValue,
+                    Supplier<String[]> hasRoleValueProducer = HasRoleValueUtil.getHasRoleValueProducer(hasRoleValue,
                             methodInfo,
                             index.getIndex(), springBeansNameToDotName, springBeansNameToClassInfo,
-                            beansReferencedInPreAuthorized);
+                            beansReferencedInPreAuthorized,
+                            springSecurityRecorder);
                     securityChecks.add(
-                            PreAuthorizeSecurityCheckUtil
-                                    .hasRoleSecurityCheck(Collections.singletonList(hasRoleValueProducer)));
+                            springSecurityRecorder.rolesAllowed(Collections.singletonList(hasRoleValueProducer)));
 
                 } else if (part.startsWith("hasAnyRole(")) {
 
                     String hasRoleValues = part.replace("hasAnyRole(", "").replace(")", "");
                     String[] hasRoleParts = hasRoleValues.split(",");
-                    List<HasRoleValueProducer> hasRoleValueProducers = new ArrayList<>(hasRoleParts.length);
+                    List<Supplier<String[]>> hasRoleValueProducers = new ArrayList<>(hasRoleParts.length);
                     for (String hasRolePart : hasRoleParts) {
                         hasRoleValueProducers
                                 .add(HasRoleValueUtil.getHasRoleValueProducer(hasRolePart.trim(), methodInfo, index.getIndex(),
                                         springBeansNameToDotName,
-                                        springBeansNameToClassInfo, beansReferencedInPreAuthorized));
+                                        springBeansNameToClassInfo, beansReferencedInPreAuthorized, springSecurityRecorder));
                     }
-                    securityChecks.add(PreAuthorizeSecurityCheckUtil.hasRoleSecurityCheck(hasRoleValueProducers));
+                    securityChecks.add(springSecurityRecorder.rolesAllowed(hasRoleValueProducers));
 
                 } else if (part.matches(PARAMETER_EQ_PRINCIPAL_USERNAME_REGEX)) { // TODO this section needs to be improved
 
@@ -450,13 +456,11 @@ void addSpringPreAuthorizeSecurityCheck(CombinedIndexBuildItem index,
                                             + "' of class '" + methodInfo.declaringClass() + "' references method parameter '"
                                             + parameterNameAndIndex.getName() + "' which is not a string");
                         }
-
                         PrincipalNameFromParameterSecurityCheck.CheckType checkType = part.contains("==")
                                 ? PrincipalNameFromParameterSecurityCheck.CheckType.EQ
                                 : PrincipalNameFromParameterSecurityCheck.CheckType.NEQ;
-                        securityChecks.add(PreAuthorizeSecurityCheckUtil
+                        securityChecks.add(springSecurityRecorder
                                 .principalNameFromParameterSecurityCheck(parameterNameAndIndex.getIndex(), checkType));
-
                     } else {
                         /*
                          * In this the security check needs to check against a property of the method parameter.
@@ -468,7 +472,7 @@ void addSpringPreAuthorizeSecurityCheck(CombinedIndexBuildItem index,
                                 propertyName, index.getIndex(),
                                 part);
 
-                        securityChecks.add(PreAuthorizeSecurityCheckUtil.principalNameFromParameterObjectSecurityCheck(
+                        securityChecks.add(springSecurityRecorder.principalNameFromParameterObjectSecurityCheck(
                                 parameterNameAndIndex.getIndex(),
                                 stringPropertyAccessorData.getMatchingParameterClassInfo().name().toString(),
                                 StringPropertyAccessorGenerator
@@ -479,8 +483,7 @@ void addSpringPreAuthorizeSecurityCheck(CombinedIndexBuildItem index,
                     }
                 } else if (part.matches(SpringSecurityProcessorUtil.BASIC_BEAN_METHOD_INVOCATION_REGEX)) {
                     String generatedClassName = beanMethodInvocationGenerator.generateSecurityCheck(part, methodInfo);
-                    securityChecks.add(PreAuthorizeSecurityCheckUtil.beanMethodGeneratedSecurityCheck(
-                            generatedClassName));
+                    securityChecks.add(springSecurityRecorder.fromGeneratedClass(generatedClassName));
                 } else {
                     throw SpringSecurityProcessorUtil.createGenericMalformedException(methodInfo, part);
                 }
@@ -492,10 +495,10 @@ void addSpringPreAuthorizeSecurityCheck(CombinedIndexBuildItem index,
             } else {
                 if (containsAnd) {
                     additionalSecurityChecks.produce(new AdditionalSecurityCheckBuildItem(methodInfo,
-                            PreAuthorizeSecurityCheckUtil.generateAllDelegatingSecurityCheck(securityChecks)));
+                            springSecurityRecorder.allDelegating(securityChecks)));
                 } else if (containsOr) {
                     additionalSecurityChecks.produce(new AdditionalSecurityCheckBuildItem(methodInfo,
-                            PreAuthorizeSecurityCheckUtil.generateAnyDelegatingSecurityCheck(securityChecks)));
+                            springSecurityRecorder.anyDelegating(securityChecks)));
                 }
             }
         }
diff --git a/extensions/spring-security/pom.xml b/extensions/spring-security/pom.xml
index 6359a5339f96f..fc8468e71fdc2 100644
--- a/extensions/spring-security/pom.xml
+++ b/extensions/spring-security/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-spring-security-parent</artifactId>
diff --git a/extensions/spring-security/runtime/pom.xml b/extensions/spring-security/runtime/pom.xml
index ac142b4b1dfb8..19ce13c9d7fe4 100644
--- a/extensions/spring-security/runtime/pom.xml
+++ b/extensions/spring-security/runtime/pom.xml
@@ -7,7 +7,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-spring-security-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-spring-security</artifactId>
@@ -19,6 +18,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-di</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-spring-security-core-api</artifactId>
diff --git a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecurityRecorder.java b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecurityRecorder.java
new file mode 100644
index 0000000000000..21088706d7f61
--- /dev/null
+++ b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/SpringSecurityRecorder.java
@@ -0,0 +1,77 @@
+package io.quarkus.spring.security.runtime.interceptor;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.function.Supplier;
+
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.security.runtime.interceptor.check.SecurityCheck;
+import io.quarkus.security.runtime.interceptor.check.SupplierRolesAllowedCheck;
+import io.quarkus.spring.security.runtime.interceptor.check.AllDelegatingSecurityCheck;
+import io.quarkus.spring.security.runtime.interceptor.check.AnonymousCheck;
+import io.quarkus.spring.security.runtime.interceptor.check.AnyDelegatingSecurityCheck;
+import io.quarkus.spring.security.runtime.interceptor.check.CombinedRoleSupplier;
+import io.quarkus.spring.security.runtime.interceptor.check.FromBeanRoleSupplier;
+import io.quarkus.spring.security.runtime.interceptor.check.PrincipalNameFromParameterObjectSecurityCheck;
+import io.quarkus.spring.security.runtime.interceptor.check.PrincipalNameFromParameterSecurityCheck;
+
+@Recorder
+public class SpringSecurityRecorder {
+
+    public SecurityCheck anonymous() {
+        return AnonymousCheck.INSTANCE;
+    }
+
+    public SecurityCheck allDelegating(List<SecurityCheck> securityChecks) {
+        return new AllDelegatingSecurityCheck(securityChecks);
+    }
+
+    public SecurityCheck anyDelegating(List<SecurityCheck> securityChecks) {
+        return new AnyDelegatingSecurityCheck(securityChecks);
+    }
+
+    public Supplier<String[]> staticHasRole(String role) {
+        return new Supplier<String[]>() {
+            @Override
+            public String[] get() {
+                return new String[] { role };
+            }
+        };
+    }
+
+    public Supplier<String[]> fromBeanField(String className, String fieldName) {
+        try {
+            return new FromBeanRoleSupplier(Class.forName(className, false, Thread.currentThread().getContextClassLoader()),
+                    fieldName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public SecurityCheck rolesAllowed(List<Supplier<String[]>> delegates) {
+        return new SupplierRolesAllowedCheck(new CombinedRoleSupplier(delegates));
+    }
+
+    public SecurityCheck principalNameFromParameterSecurityCheck(int index,
+            PrincipalNameFromParameterSecurityCheck.CheckType type) {
+        return PrincipalNameFromParameterSecurityCheck.of(index, type);
+    }
+
+    public SecurityCheck fromGeneratedClass(String generatedClassName) {
+        try {
+            Class<?> type = Class.forName(generatedClassName, false, Thread.currentThread().getContextClassLoader());
+            //invoked at static init, no reflection registration required
+            Method m = type.getDeclaredMethod("getInstance");
+            return (SecurityCheck) m.invoke(null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public SecurityCheck principalNameFromParameterObjectSecurityCheck(int index, String expectedParameterClass,
+            String stringPropertyAccessorClass, String propertyName) {
+        return PrincipalNameFromParameterObjectSecurityCheck.of(index, expectedParameterClass, stringPropertyAccessorClass,
+                propertyName);
+    }
+}
diff --git a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/CombinedRoleSupplier.java b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/CombinedRoleSupplier.java
new file mode 100644
index 0000000000000..f23cacb40c79c
--- /dev/null
+++ b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/CombinedRoleSupplier.java
@@ -0,0 +1,25 @@
+package io.quarkus.spring.security.runtime.interceptor.check;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+public class CombinedRoleSupplier implements Supplier<String[]> {
+
+    private final List<Supplier<String[]>> delegates;
+
+    public CombinedRoleSupplier(List<Supplier<String[]>> delegates) {
+        this.delegates = delegates;
+    }
+
+    @Override
+    public String[] get() {
+        Set<String> ret = new LinkedHashSet<>();
+        for (Supplier<String[]> i : delegates) {
+            ret.addAll(Arrays.asList(i.get()));
+        }
+        return ret.toArray(new String[0]);
+    }
+}
diff --git a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/FromBeanRoleSupplier.java b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/FromBeanRoleSupplier.java
new file mode 100644
index 0000000000000..a5c030abee47c
--- /dev/null
+++ b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/FromBeanRoleSupplier.java
@@ -0,0 +1,40 @@
+package io.quarkus.spring.security.runtime.interceptor.check;
+
+import java.lang.reflect.Field;
+import java.util.function.Supplier;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ClientProxy;
+
+public class FromBeanRoleSupplier implements Supplier<String[]> {
+
+    private final Class<?> beanClass;
+    private final Field field;
+
+    public FromBeanRoleSupplier(Class<?> beanClass, String fieldName) {
+        this.beanClass = beanClass;
+        try {
+            //note that this is intiialized at static init time
+            //so no reflection registration required
+            this.field = beanClass.getField(fieldName);
+            if (field.getType() != String.class) {
+                throw new RuntimeException("Field was not of type String");
+            }
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String[] get() {
+        Object instance = Arc.container().select(beanClass).get();
+        if (instance instanceof ClientProxy) {
+            instance = ((ClientProxy) instance).arc_contextualInstance();
+        }
+        try {
+            return new String[] { (String) field.get(instance) };
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/PrincipalNameFromParameterObjectSecurityCheck.java b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/PrincipalNameFromParameterObjectSecurityCheck.java
index 848be36fc1c1b..21ddf73a279a5 100644
--- a/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/PrincipalNameFromParameterObjectSecurityCheck.java
+++ b/extensions/spring-security/runtime/src/main/java/io/quarkus/spring/security/runtime/interceptor/check/PrincipalNameFromParameterObjectSecurityCheck.java
@@ -34,9 +34,13 @@ private PrincipalNameFromParameterObjectSecurityCheck(int index, String expected
     }
 
     public static PrincipalNameFromParameterObjectSecurityCheck of(int index, String expectedParameterClass,
-            String stringPropertyAccessorClass, String propertyName) throws ClassNotFoundException {
-        return new PrincipalNameFromParameterObjectSecurityCheck(index, expectedParameterClass, stringPropertyAccessorClass,
-                propertyName);
+            String stringPropertyAccessorClass, String propertyName) {
+        try {
+            return new PrincipalNameFromParameterObjectSecurityCheck(index, expectedParameterClass, stringPropertyAccessorClass,
+                    propertyName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
diff --git a/extensions/spring-web/deployment/pom.xml b/extensions/spring-web/deployment/pom.xml
index 3b0015422dff8..6c3a08357e71c 100644
--- a/extensions/spring-web/deployment/pom.xml
+++ b/extensions/spring-web/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-web-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
index 619b354ce9a59..6f89ea5a6caff 100644
--- a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
+++ b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
@@ -36,7 +36,7 @@
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
-import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
 import io.quarkus.deployment.IsDevelopment;
@@ -110,7 +110,7 @@ FeatureBuildItem registerFeature() {
 
     @BuildStep
     CapabilityBuildItem capability() {
-        return new CapabilityBuildItem(Capabilities.SPRING_WEB);
+        return new CapabilityBuildItem(Capability.SPRING_WEB);
     }
 
     @BuildStep
diff --git a/extensions/spring-web/deployment/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java b/extensions/spring-web/deployment/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java
index 79ba71149e769..3ad617d1200a8 100644
--- a/extensions/spring-web/deployment/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java
+++ b/extensions/spring-web/deployment/src/test/java/io/quarkus/spring/web/test/MissingRestControllerTest.java
@@ -34,7 +34,7 @@ public class MissingRestControllerTest {
     public void testBuildLogs() {
         List<LogRecord> buildLogRecords = prodModeTestResults.getRetainedBuildLogRecords();
         assertThat(buildLogRecords).isNotEmpty();
-        assertThat(buildLogRecords).hasOnlyOneElementSatisfying(r -> {
+        assertThat(buildLogRecords).singleElement().satisfies(r -> {
             assertThat(r.getMessage())
                     .contains("a mapping annotation but the class itself")
                     .contains(NonAnnotatedController.class.getName())
diff --git a/extensions/spring-web/pom.xml b/extensions/spring-web/pom.xml
index d0fe1c900e1a2..b287523b966fc 100644
--- a/extensions/spring-web/pom.xml
+++ b/extensions/spring-web/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/spring-web/runtime/pom.xml b/extensions/spring-web/runtime/pom.xml
index 14c2269d84360..7651cd6d26f50 100644
--- a/extensions/spring-web/runtime/pom.xml
+++ b/extensions/spring-web/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-spring-web-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/spring-web/runtime/src/main/java/io/quarkus/spring/web/runtime/SpringWebEndpointProvider.java b/extensions/spring-web/runtime/src/main/java/io/quarkus/spring/web/runtime/SpringWebEndpointProvider.java
new file mode 100644
index 0000000000000..278a12287cfd1
--- /dev/null
+++ b/extensions/spring-web/runtime/src/main/java/io/quarkus/spring/web/runtime/SpringWebEndpointProvider.java
@@ -0,0 +1,75 @@
+package io.quarkus.spring.web.runtime;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
+
+public class SpringWebEndpointProvider implements TestHttpEndpointProvider {
+    @Override
+    public Function<Class<?>, String> endpointProvider() {
+        return new Function<Class<?>, String>() {
+            @Override
+            public String apply(Class<?> aClass) {
+                String[] paths = getPath(aClass);
+                if (paths == null) {
+                    return null;
+                }
+                String value;
+                if (paths.length == 0) {
+                    value = "";
+                } else {
+                    value = paths[0];
+                    if (value.startsWith("/")) {
+                        value = value.substring(1);
+                    }
+                }
+                //TODO: there is not really any way to handle @ApplicationPath, we could do something for @QuarkusTest apps but we can't for
+                //native apps, so we just have to document the limitation
+                String path = "/";
+                Optional<String> appPath = ConfigProvider.getConfig().getOptionalValue("quarkus.resteasy.path", String.class);
+                if (appPath.isPresent()) {
+                    path = appPath.get();
+                }
+                if (!path.endsWith("/")) {
+                    path = path + "/";
+                }
+                value = path + value;
+                return value;
+            }
+        };
+    }
+
+    private String[] getPath(Class<?> aClass) {
+        String[] value = null;
+        for (Annotation annotation : aClass.getAnnotations()) {
+            if (annotation.annotationType().getName().equals(RequestMapping.class.getName())) {
+                try {
+                    value = (String[]) annotation.annotationType().getMethod("value").invoke(annotation);
+                    break;
+                } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        if (value == null) {
+            for (Class<?> i : aClass.getInterfaces()) {
+                value = getPath(i);
+                if (value != null) {
+                    break;
+                }
+            }
+        }
+        if (value == null) {
+            if (aClass.getSuperclass() != Object.class) {
+                value = getPath(aClass.getSuperclass());
+            }
+        }
+        return value;
+    }
+}
diff --git a/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 4cfecc3dc96cf..98bc5d3eab823 100644
--- a/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/spring-web/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -1,4 +1,3 @@
----
 name: "Quarkus Extension for Spring Web API"
 metadata:
   keywords:
@@ -8,3 +7,12 @@ metadata:
   categories:
   - "compatibility"
   status: "preview"
+  codestart:
+    name: "spring-web"
+    kind: "example"
+    languages:
+      - "java"
+      - "kotlin"
+      - "scala"
+    artifact: "io.quarkus:quarkus-descriptor-json"
+
diff --git a/extensions/spring-web/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider b/extensions/spring-web/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
new file mode 100644
index 0000000000000..53616df228425
--- /dev/null
+++ b/extensions/spring-web/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
@@ -0,0 +1 @@
+io.quarkus.spring.web.runtime.SpringWebEndpointProvider
\ No newline at end of file
diff --git a/extensions/swagger-ui/deployment/pom.xml b/extensions/swagger-ui/deployment/pom.xml
index 9dc385902b659..5e767d27fc158 100644
--- a/extensions/swagger-ui/deployment/pom.xml
+++ b/extensions/swagger-ui/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-swagger-ui-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,8 +34,8 @@
             <artifactId>quarkus-swagger-ui</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.webjars</groupId>
-            <artifactId>swagger-ui</artifactId>
+            <groupId>io.smallrye</groupId>
+            <artifactId>smallrye-open-api-ui</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiBuildItem.java b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiBuildItem.java
new file mode 100644
index 0000000000000..e3df9e07a39ec
--- /dev/null
+++ b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiBuildItem.java
@@ -0,0 +1,22 @@
+package io.quarkus.swaggerui.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+public final class SwaggerUiBuildItem extends SimpleBuildItem {
+
+    private final String swaggerUiFinalDestination;
+    private final String swaggerUiPath;
+
+    public SwaggerUiBuildItem(String swaggerUiFinalDestination, String swaggerUiPath) {
+        this.swaggerUiFinalDestination = swaggerUiFinalDestination;
+        this.swaggerUiPath = swaggerUiPath;
+    }
+
+    public String getSwaggerUiFinalDestination() {
+        return swaggerUiFinalDestination;
+    }
+
+    public String getSwaggerUiPath() {
+        return swaggerUiPath;
+    }
+}
\ No newline at end of file
diff --git a/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java
new file mode 100644
index 0000000000000..7f50ce0c10e54
--- /dev/null
+++ b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiConfig.java
@@ -0,0 +1,354 @@
+package io.quarkus.swaggerui.deployment;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.openapi.ui.DocExpansion;
+import io.smallrye.openapi.ui.HttpMethod;
+import io.smallrye.openapi.ui.ThemeHref;
+
+@ConfigRoot
+public class SwaggerUiConfig {
+
+    /**
+     * The path where Swagger UI is available.
+     * <p>
+     * The value `/` is not allowed as it blocks the application from serving anything else.
+     * By default, this value will be resolved as a path relative to `${quarkus.http.non-application-root-path}`.
+     */
+    @ConfigItem(defaultValue = "swagger-ui")
+    String path;
+
+    /**
+     * If this should be included every time. By default this is only included when the application is running
+     * in dev mode.
+     */
+    @ConfigItem(defaultValue = "false")
+    boolean alwaysInclude;
+
+    /**
+     * The urls that will be included as options. By default the OpenAPI path will be used.
+     * Here you can override that and supply multiple urls that will appear in the TopBar plugin.
+     */
+    @ConfigItem
+    Map<String, String> urls;
+
+    /**
+     * If urls option is used, this will be the name of the default selection.
+     */
+    @ConfigItem
+    Optional<String> urlsPrimaryName;
+
+    /**
+     * The html title for the page.
+     */
+    @ConfigItem
+    Optional<String> title;
+
+    /**
+     * Swagger UI theme to be used.
+     */
+    @ConfigItem
+    Optional<ThemeHref> theme;
+
+    /**
+     * A footer for the html page. Nothing by default.
+     */
+    @ConfigItem
+    Optional<String> footer;
+
+    /**
+     * If set to true, enables deep linking for tags and operations.
+     */
+    @ConfigItem
+    Optional<Boolean> deepLinking;
+
+    /**
+     * Controls the display of operationId in operations list. The default is false.
+     */
+    @ConfigItem
+    Optional<Boolean> displayOperationId;
+
+    /**
+     * The default expansion depth for models (set to -1 completely hide the models).
+     */
+    @ConfigItem
+    OptionalInt defaultModelsExpandDepth;
+
+    /**
+     * The default expansion depth for the model on the model-example section.
+     */
+    @ConfigItem
+    OptionalInt defaultModelExpandDepth;
+
+    /**
+     * Controls how the model is shown when the API is first rendered.
+     */
+    @ConfigItem
+    Optional<String> defaultModelRendering;
+
+    /**
+     * Controls the display of the request duration (in milliseconds) for "Try it out" requests.
+     */
+    @ConfigItem
+    Optional<Boolean> displayRequestDuration;
+
+    /**
+     * Controls the default expansion setting for the operations and tags.
+     */
+    @ConfigItem
+    Optional<DocExpansion> docExpansion;
+
+    /**
+     * If set, enables filtering. The top bar will show an edit box that you can use to filter the tagged operations that
+     * are shown.
+     * Can be Boolean to enable or disable, or a string, in which case filtering will be enabled using that string as the
+     * filter expression.
+     * Filtering is case sensitive matching the filter expression anywhere inside the tag.
+     */
+    @ConfigItem
+    Optional<String> filter;
+
+    /**
+     * If set, limits the number of tagged operations displayed to at most this many. The default is to show all operations.
+     */
+    @ConfigItem
+    OptionalInt maxDisplayedTags;
+
+    /**
+     * Apply a sort to the operation list of each API.
+     * It can be 'alpha' (sort by paths alphanumerically), 'method' (sort by HTTP method) or a function (see
+     * Array.prototype.sort() to know how sort function works).
+     * Default is the order returned by the server unchanged.
+     */
+    @ConfigItem
+    Optional<String> operationsSorter;
+
+    /**
+     * Controls the display of vendor extension (x-) fields and values for Operations, Parameters, and Schema.
+     */
+    @ConfigItem
+    Optional<Boolean> showExtensions;
+
+    /**
+     * Controls the display of extensions (pattern, maxLength, minLength, maximum, minimum) fields and values for
+     * Parameters.
+     */
+    @ConfigItem
+    Optional<Boolean> showCommonExtensions;
+
+    /**
+     * Apply a sort to the tag list of each API.
+     * It can be 'alpha' (sort by paths alphanumerically) or a function (see Array.prototype.sort() to learn how to write a
+     * sort function).
+     * Two tag name strings are passed to the sorter for each pass. Default is the order determined by Swagger UI.
+     */
+    @ConfigItem
+    Optional<String> tagsSorter;
+
+    /**
+     * Provides a mechanism to be notified when Swagger UI has finished rendering a newly provided definition.
+     */
+    @ConfigItem
+    Optional<String> onComplete;
+
+    /**
+     * Set to false to deactivate syntax highlighting of payloads and cURL command, can be otherwise an object with the
+     * activate and theme properties.
+     */
+    @ConfigItem
+    Optional<String> syntaxHighlight;
+
+    /**
+     * OAuth redirect URL.
+     */
+    @ConfigItem
+    Optional<String> oauth2RedirectUrl;
+
+    /**
+     * MUST be a function. Function to intercept remote definition, "Try it out", and OAuth 2.0 requests.
+     * Accepts one argument requestInterceptor(request) and must return the modified request, or a Promise that resolves to
+     * the modified request.
+     */
+    @ConfigItem
+    Optional<String> requestInterceptor;
+
+    /**
+     * If set, MUST be an array of command line options available to the curl command.
+     * This can be set on the mutated request in the requestInterceptor function.
+     */
+    @ConfigItem
+    Optional<List<String>> requestCurlOptions;
+
+    /**
+     * MUST be a function. Function to intercept remote definition, "Try it out", and OAuth 2.0 responses.
+     * Accepts one argument responseInterceptor(response) and must return the modified response, or a Promise that resolves
+     * to the modified response.
+     */
+    @ConfigItem
+    Optional<String> responseInterceptor;
+
+    /**
+     * If set to true, uses the mutated request returned from a requestInterceptor to produce the curl command in the UI,
+     * otherwise the request before the requestInterceptor was applied is used.
+     */
+    @ConfigItem
+    Optional<Boolean> showMutatedRequest;
+
+    /**
+     * List of HTTP methods that have the "Try it out" feature enabled.
+     * An empty array disables "Try it out" for all operations. This does not filter the operations from the display.
+     */
+    @ConfigItem
+    Optional<List<HttpMethod>> supportedSubmitMethods;
+
+    /**
+     * By default, Swagger UI attempts to validate specs against swagger.io's online validator.
+     * You can use this parameter to set a different validator URL, for example for locally deployed validators (Validator
+     * Badge).
+     * Setting it to either none, 127.0.0.1 or localhost will disable validation.
+     */
+    @ConfigItem
+    Optional<String> validatorUrl;
+
+    /**
+     * If set to true, enables passing credentials, as defined in the Fetch standard, in CORS requests that are sent by the
+     * browser.
+     */
+    @ConfigItem
+    Optional<Boolean> withCredentials;
+
+    /**
+     * Function to set default values to each property in model. Accepts one argument modelPropertyMacro(property), property
+     * is immutable
+     */
+    @ConfigItem
+    Optional<String> modelPropertyMacro;
+
+    /**
+     * Function to set default value to parameters. Accepts two arguments parameterMacro(operation, parameter).
+     * Operation and parameter are objects passed for context, both remain immutable
+     */
+    @ConfigItem
+    Optional<String> parameterMacro;
+
+    /**
+     * If set to true, it persists authorization data and it would not be lost on browser close/refresh
+     */
+    @ConfigItem
+    Optional<Boolean> persistAuthorization;
+
+    /**
+     * The name of a component available via the plugin system to use as the top-level layout for Swagger UI.
+     */
+    @ConfigItem
+    Optional<String> layout;
+
+    /**
+     * A list of plugin functions to use in Swagger UI.
+     */
+    @ConfigItem
+    Optional<List<String>> plugins;
+
+    /**
+     * A list of presets to use in Swagger UI.
+     */
+    @ConfigItem
+    Optional<List<String>> presets;
+
+    /**
+     * OAuth default clientId - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthClientId;
+
+    /**
+     * OAuth default clientSecret - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthClientSecret;
+
+    /**
+     * OAuth1 Realm query parameter added to authorizationUrl and tokenUrl - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthRealm;
+
+    /**
+     * OAuth application name, displayed in authorization popup - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthAppName;
+
+    /**
+     * OAuth scope separator for passing scopes - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthScopeSeparator;
+
+    /**
+     * OAuth Scopes, separated using the oauthScopeSeparator - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthScopes;
+
+    /**
+     * OAuth additional query parameters added to authorizationUrl and tokenUrl - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<String> oauthAdditionalQueryStringParams;
+
+    /**
+     * OAuth only activated for the accessCode flow. During the authorization_code request to the tokenUrl, pass the Client
+     * Password using the HTTP Basic Authentication scheme - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<Boolean> oauthUseBasicAuthenticationWithAccessCodeGrant;
+
+    /**
+     * OAuth only applies to authorizatonCode flows. Proof Key for Code Exchange brings enhanced security for OAuth public
+     * clients - Used in the initOAuth method.
+     */
+    @ConfigItem
+    Optional<Boolean> oauthUsePkceWithAuthorizationCodeGrant;
+
+    /**
+     * Pre-authorize Basic Auth, programmatically set DefinitionKey for a Basic authorization scheme - Used in the
+     * preauthorizeBasic method.
+     */
+    @ConfigItem
+    Optional<String> preauthorizeBasicAuthDefinitionKey;
+
+    /**
+     * Pre-authorize Basic Auth, programmatically set Username for a Basic authorization scheme - Used in the preauthorizeBasic
+     * method.
+     */
+    @ConfigItem
+    Optional<String> preauthorizeBasicUsername;
+
+    /**
+     * Pre-authorize Basic Auth, programmatically set Password for a Basic authorization scheme - Used in the preauthorizeBasic
+     * method.
+     */
+    @ConfigItem
+    Optional<String> preauthorizeBasicPassword;
+
+    /**
+     * Pre-authorize ApiKey Auth, programmatically set DefinitionKey for an API key or Bearer authorization scheme - Used in the
+     * preauthorizeApiKey method.
+     */
+    @ConfigItem
+    Optional<String> preauthorizeApiKeyAuthDefinitionKey;
+
+    /**
+     * Pre-authorize ApiKey Auth, programmatically set ApiKeyValue for an API key or Bearer authorization scheme - Used in the
+     * preauthorizeApiKey method.
+     */
+    @ConfigItem
+    Optional<String> preauthorizeApiKeyApiKeyValue;
+
+}
diff --git a/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiProcessor.java b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiProcessor.java
index 1b450ee4fbfb6..c4e8f034e8242 100644
--- a/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiProcessor.java
+++ b/extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiProcessor.java
@@ -1,27 +1,15 @@
 package io.quarkus.swaggerui.deployment;
 
-import static java.lang.String.format;
-
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import org.jboss.logging.Logger;
-
-import io.quarkus.arc.deployment.BeanContainerBuildItem;
 import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.builder.Version;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -29,230 +17,370 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
+import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.configuration.ConfigurationError;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
-import io.quarkus.deployment.util.FileUtil;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.deployment.util.WebJarUtil;
 import io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig;
 import io.quarkus.swaggerui.runtime.SwaggerUiRecorder;
-import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.swaggerui.runtime.SwaggerUiRuntimeConfig;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.smallrye.openapi.ui.IndexHtmlCreator;
+import io.smallrye.openapi.ui.Option;
+import io.smallrye.openapi.ui.ThemeHref;
 import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 
 public class SwaggerUiProcessor {
 
-    private static final Logger log = Logger.getLogger(SwaggerUiProcessor.class.getName());
-
-    private static final String SWAGGER_UI_WEBJAR_GROUP_ID = "org.webjars";
-    private static final String SWAGGER_UI_WEBJAR_ARTIFACT_ID = "swagger-ui";
-    private static final String SWAGGER_UI_WEBJAR_PREFIX = "META-INF/resources/webjars/swagger-ui";
+    private static final String SWAGGER_UI_WEBJAR_GROUP_ID = "io.smallrye";
+    private static final String SWAGGER_UI_WEBJAR_ARTIFACT_ID = "smallrye-open-api-ui";
+    private static final String SWAGGER_UI_WEBJAR_PREFIX = "META-INF/resources/openapi-ui/";
     private static final String SWAGGER_UI_FINAL_DESTINATION = "META-INF/swagger-ui-files";
-    private static final Pattern SWAGGER_UI_DEFAULT_API_URL_PATTERN = Pattern.compile("(.* url: \")(.*)(\",.*)",
-            Pattern.DOTALL);
-    private static final String TEMP_DIR_PREFIX = "quarkus-swagger-ui_" + System.nanoTime();
 
-    /**
-     * The configuration for Swagger UI.
-     */
-    SwaggerUiConfig swaggerUiConfig;
-
-    SmallRyeOpenApiConfig openapi;
-
-    @Inject
-    private LaunchModeBuildItem launch;
+    // Branding files to monitor for changes
+    private static final String BRANDING_DIR = "META-INF/branding/";
+    private static final String BRANDING_LOGO_GENERAL = BRANDING_DIR + "logo.png";
+    private static final String BRANDING_LOGO_MODULE = BRANDING_DIR + "smallrye-open-api-ui.png";
+    private static final String BRANDING_STYLE_GENERAL = BRANDING_DIR + "style.css";
+    private static final String BRANDING_STYLE_MODULE = BRANDING_DIR + "smallrye-open-api-ui.css";
+    private static final String BRANDING_FAVICON_GENERAL = BRANDING_DIR + "favicon.ico";
+    private static final String BRANDING_FAVICON_MODULE = BRANDING_DIR + "smallrye-open-api-ui.ico";
 
     @BuildStep
-    void feature(BuildProducer<FeatureBuildItem> feature) {
-        if (swaggerUiConfig.enable && (launch.getLaunchMode().isDevOrTest() || swaggerUiConfig.alwaysInclude)) {
+    void feature(BuildProducer<FeatureBuildItem> feature,
+            LaunchModeBuildItem launchMode,
+            SwaggerUiConfig swaggerUiConfig) {
+        if (shouldInclude(launchMode, swaggerUiConfig)) {
             feature.produce(new FeatureBuildItem(Feature.SWAGGER_UI));
         }
     }
 
     @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    public void registerSwaggerUiServletExtension(SwaggerUiRecorder recorder,
-            BuildProducer<RouteBuildItem> routes,
-            BeanContainerBuildItem container,
+    List<HotDeploymentWatchedFileBuildItem> brandingFiles() {
+        return Stream.of(BRANDING_LOGO_GENERAL,
+                BRANDING_STYLE_GENERAL,
+                BRANDING_FAVICON_GENERAL,
+                BRANDING_LOGO_MODULE,
+                BRANDING_STYLE_MODULE,
+                BRANDING_FAVICON_MODULE).map(HotDeploymentWatchedFileBuildItem::new)
+                .collect(Collectors.toList());
+    }
+
+    @BuildStep
+    public void getSwaggerUiFinalDestination(
             BuildProducer<GeneratedResourceBuildItem> generatedResources,
             BuildProducer<NativeImageResourceBuildItem> nativeImageResourceBuildItemBuildProducer,
-            LiveReloadBuildItem liveReloadBuildItem,
-            HttpRootPathBuildItem httpRootPathBuildItem,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
-            CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception {
-
-        if ("/".equals(swaggerUiConfig.path)) {
-            throw new ConfigurationError(
-                    "quarkus.swagger-ui.path was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
-        }
+            BuildProducer<SwaggerUiBuildItem> swaggerUiBuildProducer,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            LaunchModeBuildItem launchMode,
+            SwaggerUiConfig swaggerUiConfig,
+            SmallRyeOpenApiConfig openapi,
+            LiveReloadBuildItem liveReloadBuildItem) throws Exception {
 
-        if (!swaggerUiConfig.enable) {
-            return;
-        }
+        if (shouldInclude(launchMode, swaggerUiConfig)) {
+            if ("/".equals(swaggerUiConfig.path)) {
+                throw new ConfigurationError(
+                        "quarkus.swagger-ui.path was set to \"/\", this is not allowed as it blocks the application from serving anything else.");
+            }
 
-        String openApiPath = httpRootPathBuildItem.adjustPath(openapi.path);
-        if (launch.getLaunchMode().isDevOrTest()) {
-            CachedSwaggerUI cached = liveReloadBuildItem.getContextObject(CachedSwaggerUI.class);
+            if (openapi.path.equalsIgnoreCase(swaggerUiConfig.path)) {
+                throw new ConfigurationError(
+                        "quarkus.smallrye-openapi.path and quarkus.swagger-ui.path was set to the same value, this is not allowed as the paths needs to be unique ["
+                                + openapi.path + "].");
 
-            boolean extractionNeeded = cached == null;
-            if (cached != null && !cached.cachedOpenAPIPath.equals(openApiPath)) {
-                try {
-                    FileUtil.deleteDirectory(Paths.get(cached.cachedDirectory));
-                } catch (IOException e) {
-                    log.error("Failed to clean Swagger UI temp directory on restart", e);
-                }
-                extractionNeeded = true;
             }
-            if (extractionNeeded) {
-                if (cached == null) {
-                    cached = new CachedSwaggerUI();
-                    liveReloadBuildItem.setContextObject(CachedSwaggerUI.class, cached);
-                    Runtime.getRuntime().addShutdownHook(new Thread(cached, "Swagger UI Shutdown Hook"));
-                }
-                try {
-                    AppArtifact artifact = getSwaggerUiArtifact(curateOutcomeBuildItem);
-                    Path tempDir = Files.createTempDirectory(TEMP_DIR_PREFIX).toRealPath();
-                    extractSwaggerUi(artifact, tempDir);
-                    updateApiUrl(tempDir.resolve("index.html"), openApiPath);
-                    cached.cachedDirectory = tempDir.toAbsolutePath().toString();
-                    cached.cachedOpenAPIPath = openApiPath;
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+
+            String openApiPath = nonApplicationRootPathBuildItem.resolvePath(openapi.path);
+            String swaggerUiPath = nonApplicationRootPathBuildItem.resolvePath(swaggerUiConfig.path);
+
+            AppArtifact artifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, SWAGGER_UI_WEBJAR_GROUP_ID,
+                    SWAGGER_UI_WEBJAR_ARTIFACT_ID);
+
+            if (launchMode.getLaunchMode().isDevOrTest()) {
+                Path tempPath = WebJarUtil.copyResourcesForDevOrTest(curateOutcomeBuildItem, launchMode, artifact,
+                        SWAGGER_UI_WEBJAR_PREFIX);
+                // Update index.html
+                WebJarUtil.updateFile(tempPath.resolve("index.html"),
+                        generateIndexHtml(openApiPath, swaggerUiPath, swaggerUiConfig));
+
+                swaggerUiBuildProducer.produce(new SwaggerUiBuildItem(tempPath.toAbsolutePath().toString(), swaggerUiPath));
+
+                // Handle live reload of branding files
+                if (liveReloadBuildItem.isLiveReload() && !liveReloadBuildItem.getChangedResources().isEmpty()) {
+                    WebJarUtil.hotReloadBrandingChanges(curateOutcomeBuildItem, launchMode, artifact,
+                            liveReloadBuildItem.getChangedResources());
                 }
-            }
-            Handler<RoutingContext> handler = recorder.handler(cached.cachedDirectory,
-                    httpRootPathBuildItem.adjustPath(swaggerUiConfig.path));
-            routes.produce(new RouteBuildItem(swaggerUiConfig.path, handler));
-            routes.produce(new RouteBuildItem(swaggerUiConfig.path + "/*", handler));
-            displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(swaggerUiConfig.path + "/"));
-        } else if (swaggerUiConfig.alwaysInclude) {
-            AppArtifact artifact = getSwaggerUiArtifact(curateOutcomeBuildItem);
-            //we are including in a production artifact
-            //just stick the files in the generated output
-            //we could do this for dev mode as well but then we need to extract them every time
-            final String versionedSwaggerUiWebjarPrefix = format("%s/%s/", SWAGGER_UI_WEBJAR_PREFIX, artifact.getVersion());
-            for (Path p : artifact.getPaths()) {
-                File artifactFile = p.toFile();
-                try (JarFile jarFile = new JarFile(artifactFile)) {
-                    Enumeration<JarEntry> entries = jarFile.entries();
-                    while (entries.hasMoreElements()) {
-                        JarEntry entry = entries.nextElement();
-                        if (entry.getName().startsWith(versionedSwaggerUiWebjarPrefix) && !entry.isDirectory()) {
-                            try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                                String filename = entry.getName().replace(versionedSwaggerUiWebjarPrefix, "");
-                                byte[] content = FileUtil.readFileContents(inputStream);
-                                if (entry.getName().endsWith("index.html")) {
-                                    content = updateApiUrl(new String(content, StandardCharsets.UTF_8), openApiPath)
-                                            .getBytes(StandardCharsets.UTF_8);
-                                }
-                                String fileName = SWAGGER_UI_FINAL_DESTINATION + "/" + filename;
-                                generatedResources
-                                        .produce(new GeneratedResourceBuildItem(fileName,
-                                                content));
-                                nativeImageResourceBuildItemBuildProducer.produce(new NativeImageResourceBuildItem(fileName));
-                            }
+            } else {
+                Map<String, byte[]> files = WebJarUtil.copyResourcesForProduction(curateOutcomeBuildItem, artifact,
+                        SWAGGER_UI_WEBJAR_PREFIX);
+                ThemeHref theme = swaggerUiConfig.theme.orElse(ThemeHref.feeling_blue);
+                for (Map.Entry<String, byte[]> file : files.entrySet()) {
+                    String fileName = file.getKey();
+                    // Make sure to only include the selected theme
+                    if (fileName.equals(theme.toString()) || !fileName.startsWith("theme-")) {
+                        byte[] content;
+                        if (fileName.endsWith("index.html")) {
+                            content = generateIndexHtml(openApiPath, swaggerUiPath, swaggerUiConfig);
+                        } else {
+                            content = file.getValue();
                         }
+                        fileName = SWAGGER_UI_FINAL_DESTINATION + "/" + fileName;
+                        generatedResources.produce(new GeneratedResourceBuildItem(fileName, content));
+                        nativeImageResourceBuildItemBuildProducer.produce(new NativeImageResourceBuildItem(fileName));
                     }
                 }
+                swaggerUiBuildProducer.produce(new SwaggerUiBuildItem(SWAGGER_UI_FINAL_DESTINATION, swaggerUiPath));
             }
-
-            Handler<RoutingContext> handler = recorder
-                    .handler(SWAGGER_UI_FINAL_DESTINATION, httpRootPathBuildItem.adjustPath(swaggerUiConfig.path));
-            routes.produce(new RouteBuildItem(swaggerUiConfig.path, handler));
-            routes.produce(new RouteBuildItem(swaggerUiConfig.path + "/*", handler));
         }
     }
 
-    private AppArtifact getSwaggerUiArtifact(CurateOutcomeBuildItem curateOutcomeBuildItem) {
-        for (AppDependency dep : curateOutcomeBuildItem.getEffectiveModel().getFullDeploymentDeps()) {
-            if (dep.getArtifact().getArtifactId().equals(SWAGGER_UI_WEBJAR_ARTIFACT_ID)
-                    && dep.getArtifact().getGroupId().equals(SWAGGER_UI_WEBJAR_GROUP_ID)) {
-                return dep.getArtifact();
-            }
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public void registerSwaggerUiHandler(SwaggerUiRecorder recorder,
+            BuildProducer<RouteBuildItem> routes,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            SwaggerUiBuildItem finalDestinationBuildItem,
+            SwaggerUiRuntimeConfig runtimeConfig,
+            LaunchModeBuildItem launchMode,
+            SwaggerUiConfig swaggerUiConfig) throws Exception {
+
+        if (shouldInclude(launchMode, swaggerUiConfig)) {
+            Handler<RoutingContext> handler = recorder.handler(finalDestinationBuildItem.getSwaggerUiFinalDestination(),
+                    finalDestinationBuildItem.getSwaggerUiPath(),
+                    runtimeConfig);
+
+            routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .route(swaggerUiConfig.path)
+                    .displayOnNotFoundPage("Open API UI")
+                    .routeConfigKey("quarkus.swagger-ui.path")
+                    .handler(handler)
+                    .requiresLegacyRedirect()
+                    .build());
+            routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                    .route(swaggerUiConfig.path + "/*")
+                    .handler(handler)
+                    .requiresLegacyRedirect()
+                    .build());
         }
-        throw new RuntimeException("Could not find artifact " + SWAGGER_UI_WEBJAR_GROUP_ID + ":" + SWAGGER_UI_WEBJAR_ARTIFACT_ID
-                + " among the application dependencies");
     }
 
-    private void extractSwaggerUi(AppArtifact artifact, Path resourceDir) throws IOException {
-        final String versionedSwaggerUiWebjarPrefix = format("%s/%s/", SWAGGER_UI_WEBJAR_PREFIX, artifact.getVersion());
-        for (Path p : artifact.getPaths()) {
-            File artifactFile = p.toFile();
-            try (JarFile jarFile = new JarFile(artifactFile)) {
-                Enumeration<JarEntry> entries = jarFile.entries();
-                while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    if (entry.getName().startsWith(versionedSwaggerUiWebjarPrefix) && !entry.isDirectory()) {
-                        try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                            String filename = entry.getName().replace(versionedSwaggerUiWebjarPrefix, "");
-                            Files.copy(inputStream, resourceDir.resolve(filename));
-                        }
-                    }
-                }
-            }
+    private byte[] generateIndexHtml(String openApiPath, String swaggerUiPath, SwaggerUiConfig swaggerUiConfig)
+            throws IOException {
+        Map<Option, String> options = new HashMap<>();
+        Map<String, String> urlsMap = null;
+
+        options.put(Option.selfHref, swaggerUiPath);
+
+        // Only add the url if the user did not specified urls
+        if (swaggerUiConfig.urls != null && !swaggerUiConfig.urls.isEmpty()) {
+            urlsMap = swaggerUiConfig.urls;
+        } else {
+            options.put(Option.url, openApiPath);
         }
-    }
 
-    private void updateApiUrl(Path indexHtml, String openApiPath) throws IOException {
-        String content = new String(Files.readAllBytes(indexHtml), StandardCharsets.UTF_8);
-        String result = updateApiUrl(content, openApiPath);
-        if (result != null) {
-            Files.write(indexHtml, result.getBytes(StandardCharsets.UTF_8));
+        if (swaggerUiConfig.title.isPresent()) {
+            options.put(Option.title, swaggerUiConfig.title.get());
+        } else {
+            options.put(Option.title, "OpenAPI UI (Powered by Quarkus " + Version.getVersion() + ")");
         }
-    }
 
-    public String updateApiUrl(String original, String openApiPath) {
+        if (swaggerUiConfig.theme.isPresent()) {
+            options.put(Option.themeHref, swaggerUiConfig.theme.get().toString());
+        }
 
-        Matcher uriMatcher = SWAGGER_UI_DEFAULT_API_URL_PATTERN.matcher(original);
-        if (uriMatcher.matches()) {
-            return uriMatcher.replaceFirst("$1" + openApiPath + "$3");
-        } else {
-            log.warn("Unable to replace the default URL of Swagger UI");
-            return null;
+        if (swaggerUiConfig.footer.isPresent()) {
+            options.put(Option.footer, swaggerUiConfig.footer.get());
         }
-    }
 
-    @ConfigRoot
-    static final class SwaggerUiConfig {
-        /**
-         * The path where Swagger UI is available.
-         * <p>
-         * The value `/` is not allowed as it blocks the application from serving anything else.
-         */
-        @ConfigItem(defaultValue = "/swagger-ui")
-        String path;
-
-        /**
-         * If this should be included every time. By default this is only included when the application is running
-         * in dev mode.
-         */
-        @ConfigItem
-        boolean alwaysInclude;
-
-        /**
-         * If Swagger UI should be enabled. By default, Swagger UI is enabled.
-         */
-        @ConfigItem(defaultValue = "true")
-        boolean enable;
-    }
+        if (swaggerUiConfig.deepLinking.isPresent()) {
+            options.put(Option.deepLinking, swaggerUiConfig.deepLinking.get().toString());
+        }
 
-    private static final class CachedSwaggerUI implements Runnable {
+        if (swaggerUiConfig.displayOperationId.isPresent()) {
+            options.put(Option.displayOperationId, swaggerUiConfig.displayOperationId.get().toString());
+        }
 
-        String cachedOpenAPIPath;
-        String cachedDirectory;
+        if (swaggerUiConfig.defaultModelsExpandDepth.isPresent()) {
+            options.put(Option.defaultModelsExpandDepth, String.valueOf(swaggerUiConfig.defaultModelsExpandDepth.getAsInt()));
+        }
 
-        @Override
-        public void run() {
-            try {
-                FileUtil.deleteDirectory(Paths.get(cachedDirectory));
-            } catch (IOException e) {
-                log.error("Failed to clean Swagger UI temp directory on shutdown", e);
-            }
+        if (swaggerUiConfig.defaultModelExpandDepth.isPresent()) {
+            options.put(Option.defaultModelExpandDepth, String.valueOf(swaggerUiConfig.defaultModelExpandDepth.getAsInt()));
+        }
+
+        if (swaggerUiConfig.defaultModelRendering.isPresent()) {
+            options.put(Option.defaultModelRendering, swaggerUiConfig.defaultModelRendering.get());
+        }
+
+        if (swaggerUiConfig.displayRequestDuration.isPresent()) {
+            options.put(Option.displayRequestDuration, swaggerUiConfig.displayRequestDuration.get().toString());
+        }
+
+        if (swaggerUiConfig.docExpansion.isPresent()) {
+            options.put(Option.docExpansion, swaggerUiConfig.docExpansion.get().toString());
+        }
+
+        if (swaggerUiConfig.filter.isPresent()) {
+            options.put(Option.filter, swaggerUiConfig.filter.get());
+        }
+
+        if (swaggerUiConfig.maxDisplayedTags.isPresent()) {
+            options.put(Option.maxDisplayedTags, String.valueOf(swaggerUiConfig.maxDisplayedTags.getAsInt()));
+        }
+
+        if (swaggerUiConfig.operationsSorter.isPresent()) {
+            options.put(Option.operationsSorter, swaggerUiConfig.operationsSorter.get());
+        }
+
+        if (swaggerUiConfig.showExtensions.isPresent()) {
+            options.put(Option.showExtensions, swaggerUiConfig.showExtensions.get().toString());
+        }
+
+        if (swaggerUiConfig.showCommonExtensions.isPresent()) {
+            options.put(Option.showCommonExtensions, swaggerUiConfig.showCommonExtensions.get().toString());
+        }
+
+        if (swaggerUiConfig.tagsSorter.isPresent()) {
+            options.put(Option.tagsSorter, swaggerUiConfig.tagsSorter.get());
+        }
+
+        if (swaggerUiConfig.onComplete.isPresent()) {
+            options.put(Option.onComplete, swaggerUiConfig.onComplete.get());
+        }
+
+        if (swaggerUiConfig.syntaxHighlight.isPresent()) {
+            options.put(Option.syntaxHighlight, swaggerUiConfig.syntaxHighlight.get());
+        }
+
+        if (swaggerUiConfig.oauth2RedirectUrl.isPresent()) {
+            options.put(Option.oauth2RedirectUrl, swaggerUiConfig.oauth2RedirectUrl.get());
+        }
+
+        if (swaggerUiConfig.requestInterceptor.isPresent()) {
+            options.put(Option.requestInterceptor, swaggerUiConfig.requestInterceptor.get());
+        }
+
+        if (swaggerUiConfig.requestCurlOptions.isPresent()) {
+            String requestCurlOptions = swaggerUiConfig.requestCurlOptions.get().toString();
+            options.put(Option.requestCurlOptions, requestCurlOptions);
+        }
+
+        if (swaggerUiConfig.responseInterceptor.isPresent()) {
+            options.put(Option.responseInterceptor, swaggerUiConfig.responseInterceptor.get());
+        }
+
+        if (swaggerUiConfig.showMutatedRequest.isPresent()) {
+            options.put(Option.showMutatedRequest, swaggerUiConfig.showMutatedRequest.get().toString());
+        }
+
+        if (swaggerUiConfig.supportedSubmitMethods.isPresent()) {
+            String httpMethods = swaggerUiConfig.supportedSubmitMethods.get().toString();
+            options.put(Option.supportedSubmitMethods, httpMethods);
+        }
+
+        if (swaggerUiConfig.validatorUrl.isPresent()) {
+            options.put(Option.validatorUrl, swaggerUiConfig.validatorUrl.get());
+        }
+
+        if (swaggerUiConfig.withCredentials.isPresent()) {
+            options.put(Option.withCredentials, swaggerUiConfig.withCredentials.get().toString());
+        }
+
+        if (swaggerUiConfig.modelPropertyMacro.isPresent()) {
+            options.put(Option.modelPropertyMacro, swaggerUiConfig.modelPropertyMacro.get());
         }
+
+        if (swaggerUiConfig.parameterMacro.isPresent()) {
+            options.put(Option.parameterMacro, swaggerUiConfig.parameterMacro.get());
+        }
+
+        if (swaggerUiConfig.persistAuthorization.isPresent()) {
+            options.put(Option.persistAuthorization, swaggerUiConfig.persistAuthorization.get().toString());
+        }
+
+        if (swaggerUiConfig.layout.isPresent()) {
+            options.put(Option.layout, swaggerUiConfig.layout.get());
+        }
+
+        if (swaggerUiConfig.plugins.isPresent()) {
+            String plugins = swaggerUiConfig.plugins.get().toString();
+            options.put(Option.plugins, plugins);
+        }
+
+        if (swaggerUiConfig.presets.isPresent()) {
+            String presets = swaggerUiConfig.presets.get().toString();
+            options.put(Option.presets, presets);
+        }
+
+        if (swaggerUiConfig.oauthClientId.isPresent()) {
+            String oauthClientId = swaggerUiConfig.oauthClientId.get();
+            options.put(Option.oauthClientId, oauthClientId);
+        }
+        if (swaggerUiConfig.oauthClientSecret.isPresent()) {
+            String oauthClientSecret = swaggerUiConfig.oauthClientSecret.get();
+            options.put(Option.oauthClientSecret, oauthClientSecret);
+        }
+        if (swaggerUiConfig.oauthRealm.isPresent()) {
+            String oauthRealm = swaggerUiConfig.oauthRealm.get();
+            options.put(Option.oauthRealm, oauthRealm);
+        }
+        if (swaggerUiConfig.oauthAppName.isPresent()) {
+            String oauthAppName = swaggerUiConfig.oauthAppName.get();
+            options.put(Option.oauthAppName, oauthAppName);
+        }
+        if (swaggerUiConfig.oauthScopeSeparator.isPresent()) {
+            String oauthScopeSeparator = swaggerUiConfig.oauthScopeSeparator.get();
+            options.put(Option.oauthScopeSeparator, oauthScopeSeparator);
+        }
+        if (swaggerUiConfig.oauthScopes.isPresent()) {
+            String oauthScopes = swaggerUiConfig.oauthScopes.get();
+            options.put(Option.oauthScopes, oauthScopes);
+        }
+        if (swaggerUiConfig.oauthAdditionalQueryStringParams.isPresent()) {
+            String oauthAdditionalQueryStringParams = swaggerUiConfig.oauthAdditionalQueryStringParams.get();
+            options.put(Option.oauthAdditionalQueryStringParams, oauthAdditionalQueryStringParams);
+        }
+        if (swaggerUiConfig.oauthUseBasicAuthenticationWithAccessCodeGrant.isPresent()) {
+            String oauthUseBasicAuthenticationWithAccessCodeGrant = swaggerUiConfig.oauthUseBasicAuthenticationWithAccessCodeGrant
+                    .get().toString();
+            options.put(Option.oauthUseBasicAuthenticationWithAccessCodeGrant, oauthUseBasicAuthenticationWithAccessCodeGrant);
+        }
+        if (swaggerUiConfig.oauthUsePkceWithAuthorizationCodeGrant.isPresent()) {
+            String oauthUsePkceWithAuthorizationCodeGrant = swaggerUiConfig.oauthUsePkceWithAuthorizationCodeGrant.get()
+                    .toString();
+            options.put(Option.oauthUsePkceWithAuthorizationCodeGrant, oauthUsePkceWithAuthorizationCodeGrant);
+        }
+        if (swaggerUiConfig.preauthorizeBasicAuthDefinitionKey.isPresent()) {
+            String preauthorizeBasicAuthDefinitionKey = swaggerUiConfig.preauthorizeBasicAuthDefinitionKey.get();
+            options.put(Option.preauthorizeBasicAuthDefinitionKey, preauthorizeBasicAuthDefinitionKey);
+        }
+        if (swaggerUiConfig.preauthorizeBasicUsername.isPresent()) {
+            String preauthorizeBasicUsername = swaggerUiConfig.preauthorizeBasicUsername.get();
+            options.put(Option.preauthorizeBasicUsername, preauthorizeBasicUsername);
+        }
+        if (swaggerUiConfig.preauthorizeBasicPassword.isPresent()) {
+            String preauthorizeBasicPassword = swaggerUiConfig.preauthorizeBasicPassword.get();
+            options.put(Option.preauthorizeBasicPassword, preauthorizeBasicPassword);
+        }
+        if (swaggerUiConfig.preauthorizeApiKeyAuthDefinitionKey.isPresent()) {
+            String preauthorizeApiKeyAuthDefinitionKey = swaggerUiConfig.preauthorizeApiKeyAuthDefinitionKey.get();
+            options.put(Option.preauthorizeApiKeyAuthDefinitionKey, preauthorizeApiKeyAuthDefinitionKey);
+        }
+        if (swaggerUiConfig.preauthorizeApiKeyApiKeyValue.isPresent()) {
+            String preauthorizeApiKeyApiKeyValue = swaggerUiConfig.preauthorizeApiKeyApiKeyValue.get();
+            options.put(Option.preauthorizeApiKeyApiKeyValue, preauthorizeApiKeyApiKeyValue);
+        }
+
+        return IndexHtmlCreator.createIndexHtml(urlsMap, swaggerUiConfig.urlsPrimaryName.orElse(null), options);
+    }
+
+    private static boolean shouldInclude(LaunchModeBuildItem launchMode, SwaggerUiConfig swaggerUiConfig) {
+        return launchMode.getLaunchMode().isDevOrTest() || swaggerUiConfig.alwaysInclude;
     }
 }
diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java
index e44ed275af59d..b1b228bc7288a 100644
--- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java
+++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/CustomHttpRootTest.java
@@ -20,7 +20,7 @@ public class CustomHttpRootTest {
 
     @Test
     public void shouldUseCustomConfig() {
-        RestAssured.when().get("/swagger-ui").then().statusCode(200).body(containsString("/foo/openapi"));
-        RestAssured.when().get("/swagger-ui/index.html").then().statusCode(200).body(containsString("/foo/openapi"));
+        RestAssured.when().get("/q/swagger-ui").then().statusCode(200).body(containsString("/q/openapi"));
+        RestAssured.when().get("/q/swagger-ui/index.html").then().statusCode(200).body(containsString("/q/openapi"));
     }
 }
diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java
index 0bbb66d34e410..dea20f36c7f1d 100644
--- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java
+++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/DisabledTest.java
@@ -18,7 +18,7 @@ public class DisabledTest {
 
     @Test
     public void shouldUseDefaultConfig() {
-        RestAssured.when().get("/swagger-ui").then().statusCode(404);
-        RestAssured.when().get("/swagger-ui/index.html").then().statusCode(404);
+        RestAssured.when().get("/q/swagger-ui").then().statusCode(404);
+        RestAssured.when().get("/q/swagger-ui/index.html").then().statusCode(404);
     }
 }
diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java
new file mode 100644
index 0000000000000..d658819488b7c
--- /dev/null
+++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/ErroneousConfigTest2.java
@@ -0,0 +1,26 @@
+package io.quarkus.swaggerui.deployment;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class ErroneousConfigTest2 {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setExpectedException(ConfigurationError.class)
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("quarkus.swagger-ui.path=/api\n"
+                            + "quarkus.smallrye-openapi.path=/api\n"), "application.properties"));
+
+    @Test
+    public void shouldNotStartApplicationIfSwaggerPathIsSameAsOpenAPIPath() {
+        Assertions.fail();
+    }
+}
diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java
index ec30617ed5aa0..a3184dca45b20 100644
--- a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java
+++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/NoConfigTest.java
@@ -18,8 +18,8 @@ public class NoConfigTest {
 
     @Test
     public void shouldUseDefaultConfig() {
-        RestAssured.when().get("/swagger-ui").then().statusCode(200).body(containsString("/openapi"));
-        RestAssured.when().get("/swagger-ui/index.html").then().statusCode(200).body(containsString("/openapi"));
+        RestAssured.when().get("/q/swagger-ui").then().statusCode(200).body(containsString("/openapi"));
+        RestAssured.when().get("/q/swagger-ui/index.html").then().statusCode(200).body(containsString("/openapi"));
 
     }
 }
diff --git a/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java
new file mode 100644
index 0000000000000..5b558948c740e
--- /dev/null
+++ b/extensions/swagger-ui/deployment/src/test/java/io/quarkus/swaggerui/deployment/SwaggerOptionsTest.java
@@ -0,0 +1,67 @@
+package io.quarkus.swaggerui.deployment;
+
+import static org.hamcrest.Matchers.containsString;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Properties;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class SwaggerOptionsTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(getPropertyAsString()), "application.properties"));
+
+    @Test
+    public void customOptions() {
+        RestAssured.when().get("/q/swagger-ui").then().statusCode(200)
+                .body(
+                        containsString("Testing title"),
+                        containsString("/openapi"),
+                        containsString("https://petstore.swagger.io/v2/swagger.json"),
+                        containsString("theme-newspaper.css"),
+                        containsString("docExpansion: 'full'"),
+                        containsString("oauth2RedirectUrl: '/somesecure/page/oauth.html'"),
+                        containsString("validatorUrl: 'localhost'"),
+                        containsString("displayRequestDuration: true"),
+                        containsString("supportedSubmitMethods: ['get', 'post']"),
+                        containsString("plugins: [Plugin1, Plugin2]"));
+
+    }
+
+    private static String getPropertyAsString() {
+        try {
+            Properties p = new Properties();
+            p.putAll(PROPERTIES);
+            StringWriter writer = new StringWriter();
+            p.store(writer, "Test Properties");
+            return writer.toString();
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    protected static final Properties PROPERTIES = new Properties();
+    static {
+        PROPERTIES.put("quarkus.swagger-ui.title", "Testing title");
+        PROPERTIES.put("quarkus.swagger-ui.urls.default", "/openapi");
+        PROPERTIES.put("quarkus.swagger-ui.urls.petstore", "https://petstore.swagger.io/v2/swagger.json");
+        PROPERTIES.put("quarkus.swagger-ui.doc-expansion", "full");
+        PROPERTIES.put("quarkus.swagger-ui.theme", "newspaper");
+        PROPERTIES.put("quarkus.swagger-ui.oauth2-redirect-url", "/somesecure/page/oauth.html");
+        PROPERTIES.put("quarkus.swagger-ui.validator-url", "localhost");
+        PROPERTIES.put("quarkus.swagger-ui.display-request-duration", "true");
+        PROPERTIES.put("quarkus.swagger-ui.supported-submit-methods", "get,post");
+        PROPERTIES.put("quarkus.swagger-ui.plugins", "Plugin1,Plugin2");
+    }
+}
diff --git a/extensions/swagger-ui/pom.xml b/extensions/swagger-ui/pom.xml
index f5e0005a66bf2..07d5ec17fe35f 100644
--- a/extensions/swagger-ui/pom.xml
+++ b/extensions/swagger-ui/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/swagger-ui/runtime/pom.xml b/extensions/swagger-ui/runtime/pom.xml
index dcad2198150d2..634ac75cfbe7e 100644
--- a/extensions/swagger-ui/runtime/pom.xml
+++ b/extensions/swagger-ui/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-swagger-ui-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiNotFoundHandler.java b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiNotFoundHandler.java
new file mode 100644
index 0000000000000..157b73e71442b
--- /dev/null
+++ b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiNotFoundHandler.java
@@ -0,0 +1,17 @@
+package io.quarkus.swaggerui.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Handling static when disabled
+ */
+public class SwaggerUiNotFoundHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        event.response().setStatusCode(404);
+        event.response().end();
+    }
+
+}
diff --git a/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRecorder.java b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRecorder.java
index 745e8122f276b..697bf8f559a75 100644
--- a/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRecorder.java
+++ b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRecorder.java
@@ -2,34 +2,18 @@
 
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.core.Handler;
-import io.vertx.core.http.HttpHeaders;
 import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.StaticHandler;
 
 @Recorder
 public class SwaggerUiRecorder {
-    public Handler<RoutingContext> handler(String swaggerUiFinalDestination, String swaggerUiPath) {
 
-        StaticHandler staticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
-                .setWebRoot(swaggerUiFinalDestination)
-                .setDefaultContentEncoding("UTF-8");
+    public Handler<RoutingContext> handler(String swaggerUiFinalDestination, String swaggerUiPath,
+            SwaggerUiRuntimeConfig runtimeConfig) {
 
-        return new Handler<RoutingContext>() {
-            @Override
-            public void handle(RoutingContext event) {
-                if (event.normalisedPath().length() == swaggerUiPath.length()) {
-
-                    event.response().setStatusCode(302);
-                    event.response().headers().set(HttpHeaders.LOCATION, swaggerUiPath + "/");
-                    event.response().end();
-                    return;
-                } else if (event.normalisedPath().length() == swaggerUiPath.length() + 1) {
-                    event.reroute(swaggerUiPath + "/index.html");
-                    return;
-                }
-
-                staticHandler.handle(event);
-            }
-        };
+        if (runtimeConfig.enable) {
+            return new SwaggerUiStaticHandler(swaggerUiFinalDestination, swaggerUiPath);
+        } else {
+            return new SwaggerUiNotFoundHandler();
+        }
     }
 }
diff --git a/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRuntimeConfig.java b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRuntimeConfig.java
new file mode 100644
index 0000000000000..41f1822224d39
--- /dev/null
+++ b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiRuntimeConfig.java
@@ -0,0 +1,17 @@
+package io.quarkus.swaggerui.runtime;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.RUN_TIME)
+public class SwaggerUiRuntimeConfig {
+
+    /**
+     * If Swagger UI is included, it should be enabled/disabled. By default, Swagger UI is enabled if it is included (see
+     * {@code always-include}).
+     */
+    @ConfigItem(defaultValue = "true")
+    boolean enable;
+
+}
diff --git a/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiStaticHandler.java b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiStaticHandler.java
new file mode 100644
index 0000000000000..ef45f6a73ff06
--- /dev/null
+++ b/extensions/swagger-ui/runtime/src/main/java/io/quarkus/swaggerui/runtime/SwaggerUiStaticHandler.java
@@ -0,0 +1,59 @@
+package io.quarkus.swaggerui.runtime;
+
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.handler.StaticHandler;
+
+/**
+ * Handling static Swagger UI content
+ */
+public class SwaggerUiStaticHandler implements Handler<RoutingContext> {
+
+    private String swaggerUiFinalDestination;
+    private String swaggerUiPath;
+
+    public SwaggerUiStaticHandler() {
+    }
+
+    public SwaggerUiStaticHandler(String swaggerUiFinalDestination, String swaggerUiPath) {
+        this.swaggerUiFinalDestination = swaggerUiFinalDestination;
+        this.swaggerUiPath = swaggerUiPath;
+    }
+
+    public String getSwaggerUiFinalDestination() {
+        return swaggerUiFinalDestination;
+    }
+
+    public void setSwaggerUiFinalDestination(String swaggerUiFinalDestination) {
+        this.swaggerUiFinalDestination = swaggerUiFinalDestination;
+    }
+
+    public String getSwaggerUiPath() {
+        return swaggerUiPath;
+    }
+
+    public void setSwaggerUiPath(String swaggerUiPath) {
+        this.swaggerUiPath = swaggerUiPath;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        StaticHandler staticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
+                .setWebRoot(swaggerUiFinalDestination)
+                .setDefaultContentEncoding("UTF-8");
+
+        if (event.normalisedPath().length() == swaggerUiPath.length()) {
+            event.response().setStatusCode(302);
+            event.response().headers().set(HttpHeaders.LOCATION, swaggerUiPath + "/");
+            event.response().end();
+            return;
+        } else if (event.normalisedPath().length() == swaggerUiPath.length() + 1) {
+            event.reroute(swaggerUiPath + "/index.html");
+            return;
+        }
+
+        staticHandler.handle(event);
+    }
+
+}
diff --git a/extensions/tika/deployment/pom.xml b/extensions/tika/deployment/pom.xml
index 51f7c974d015f..cb4f191e8b36f 100644
--- a/extensions/tika/deployment/pom.xml
+++ b/extensions/tika/deployment/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-tika-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,6 +29,16 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/tika/deployment/src/main/java/io/quarkus/tika/deployment/TikaProcessor.java b/extensions/tika/deployment/src/main/java/io/quarkus/tika/deployment/TikaProcessor.java
index b5fd7e076bda6..7ddfd2af4cbd9 100644
--- a/extensions/tika/deployment/src/main/java/io/quarkus/tika/deployment/TikaProcessor.java
+++ b/extensions/tika/deployment/src/main/java/io/quarkus/tika/deployment/TikaProcessor.java
@@ -28,6 +28,7 @@
 import io.quarkus.deployment.builditem.CapabilityBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.util.ServiceUtil;
@@ -85,10 +86,10 @@ public void registerTikaParsersResources(BuildProducer<NativeImageResourceBuildI
     }
 
     @BuildStep
-    public void registerPdfBoxResources(BuildProducer<NativeImageResourceBuildItem> resource) {
-        resource.produce(new NativeImageResourceBuildItem("org/apache/pdfbox/resources/glyphlist/additional.txt"));
-        resource.produce(new NativeImageResourceBuildItem("org/apache/pdfbox/resources/glyphlist/glyphlist.txt"));
-        resource.produce(new NativeImageResourceBuildItem("org/apache/pdfbox/resources/glyphlist/zapfdingbats.txt"));
+    public void registerPdfBoxResources(BuildProducer<NativeImageResourceDirectoryBuildItem> resource) {
+        resource.produce(new NativeImageResourceDirectoryBuildItem("org/apache/pdfbox/resources/glyphlist"));
+        resource.produce(new NativeImageResourceDirectoryBuildItem("org/apache/fontbox/cmap"));
+        resource.produce(new NativeImageResourceDirectoryBuildItem("org/apache/fontbox/unicode"));
     }
 
     @BuildStep
diff --git a/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaParserResource.java b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaParserResource.java
new file mode 100644
index 0000000000000..d6184b8b843fd
--- /dev/null
+++ b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaParserResource.java
@@ -0,0 +1,27 @@
+package io.quarkus.tika.deployment;
+
+import java.io.InputStream;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.tika.TikaParser;
+
+@Path("/parse")
+public class TikaParserResource {
+    @Inject
+    TikaParser parser;
+
+    @POST
+    @Path("/text")
+    @Consumes("application/pdf")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String extractText(InputStream stream) {
+        return parser.parse(stream).getText();
+    }
+
+}
diff --git a/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java
new file mode 100644
index 0000000000000..6a0a029978e20
--- /dev/null
+++ b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorDevModeTest.java
@@ -0,0 +1,55 @@
+package io.quarkus.tika.deployment;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class TikaProcessorDevModeTest {
+
+    private static Class<?>[] testClasses = {
+            TikaParserResource.class
+    };
+
+    @RegisterExtension
+    static final QuarkusDevModeTest test = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(testClasses)
+                    .addAsResource("tika-config.xml")
+                    .addAsResource("application-dev-mode.properties", "application.properties"));
+
+    @Test
+    public void testPdf() throws Exception {
+        RestAssured.given()
+                .when().header("Content-Type", "application/pdf")
+                .body(readQuarkusFile("quarkus.pdf"))
+                .post("/parse/text")
+                .then()
+                .statusCode(200)
+                .body(is("Hello Quarkus"));
+    }
+
+    private byte[] readQuarkusFile(String fileName) throws Exception {
+        try (InputStream is = getClass().getClassLoader().getResourceAsStream(fileName)) {
+            return readBytes(is);
+        }
+    }
+
+    static byte[] readBytes(InputStream is) throws Exception {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        byte[] buffer = new byte[4096];
+        int len;
+        while ((len = is.read(buffer)) != -1) {
+            os.write(buffer, 0, len);
+        }
+        return os.toByteArray();
+    }
+}
diff --git a/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorTest.java b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorTest.java
index 133e9e08217e2..7be30fd56126c 100644
--- a/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorTest.java
+++ b/extensions/tika/deployment/src/test/java/io/quarkus/tika/deployment/TikaProcessorTest.java
@@ -78,13 +78,13 @@ public void testUnresolvableCustomAbbreviation() throws Exception {
 
     @Test
     public void testAllSupportedParserNames() throws Exception {
-        assertEquals(69, getParserNames(null, null).size());
+        assertEquals(72, getParserNames(null, null).size());
     }
 
     @Test
     public void testSupportedParserNamesWithTikaConfigPath() throws Exception {
         Set<String> names = getParserNames("tika-config.xml", "pdf");
-        assertEquals(69, names.size());
+        assertEquals(72, names.size());
     }
 
     @Test
diff --git a/extensions/tika/deployment/src/test/resources/application-dev-mode.properties b/extensions/tika/deployment/src/test/resources/application-dev-mode.properties
new file mode 100644
index 0000000000000..b31af3818b872
--- /dev/null
+++ b/extensions/tika/deployment/src/test/resources/application-dev-mode.properties
@@ -0,0 +1 @@
+quarkus.tika.tika-config-path=tika-config.xml
diff --git a/extensions/tika/deployment/src/test/resources/quarkus.pdf b/extensions/tika/deployment/src/test/resources/quarkus.pdf
new file mode 100644
index 0000000000000..3d80300e5d861
Binary files /dev/null and b/extensions/tika/deployment/src/test/resources/quarkus.pdf differ
diff --git a/extensions/tika/deployment/src/test/resources/tika-config.xml b/extensions/tika/deployment/src/test/resources/tika-config.xml
new file mode 100644
index 0000000000000..e88fa74a04a37
--- /dev/null
+++ b/extensions/tika/deployment/src/test/resources/tika-config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<properties>
+  <parsers>
+    <parser class="org.apache.tika.parser.pdf.PDFParser">
+      <mime>application/pdf</mime>
+    </parser>
+  </parsers>
+</properties>
diff --git a/extensions/tika/pom.xml b/extensions/tika/pom.xml
index 9da3fe5185293..c7f81bc0fbabc 100644
--- a/extensions/tika/pom.xml
+++ b/extensions/tika/pom.xml
@@ -6,7 +6,7 @@
   ~ 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
+  ~     https://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,
@@ -19,10 +19,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/tika/runtime/pom.xml b/extensions/tika/runtime/pom.xml
index ca3b70f5d630c..f844829b966c1 100644
--- a/extensions/tika/runtime/pom.xml
+++ b/extensions/tika/runtime/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-tika-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,6 +44,10 @@
 	                <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -67,12 +70,17 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaContent.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaContent.java
index a0a6d9f93a8ce..319c3d76d5bdc 100644
--- a/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaContent.java
+++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaContent.java
@@ -43,7 +43,7 @@ public TikaMetadata getMetadata() {
      * Return the content of the embedded documents
      *
      * @return the list of the embedded documents, will be empty
-     *         if the current document has no embedded content or it has been appended to the master content
+     *         if the current document has no embedded content or it has been appended to the main content
      */
     public List<TikaContent> getEmbeddedContent() {
         return embeddedContent;
diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaParser.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaParser.java
index 29db6835c8a81..e28d111c214d8 100644
--- a/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaParser.java
+++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/TikaParser.java
@@ -84,15 +84,15 @@ protected TikaContent parseStream(InputStream entityStream, String contentType,
             try (InputStream tikaStream = TikaInputStream.get(entityStream)) {
                 parser.parse(tikaStream, tikaHandler, tikaMetadata, context);
                 if (this.appendEmbeddedContent) {
-                    // the embedded content if any has already been appended to the master content
+                    // the embedded content if any has already been appended to the main document content
                     return new TikaContent(tikaHandler == null ? null : tikaHandler.toString().trim(), convert(tikaMetadata));
                 } else {
                     RecursiveParserWrapperHandler rHandler = (RecursiveParserWrapperHandler) tikaHandler;
 
-                    // The metadata list represents the master and embedded content (text and metadata)
-                    // The first metadata in the list represents the master (outer) content
+                    // The metadata list represents the main document and embedded content (text and metadata)
+                    // The first metadata in the list represents the main document (outer) content
                     List<org.apache.tika.metadata.Metadata> allMetadata = rHandler.getMetadataList();
-                    String masterText = allMetadata.get(0).get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT);
+                    String mainDocumentText = allMetadata.get(0).get(AbstractRecursiveParserWrapperHandler.TIKA_CONTENT);
 
                     // Embedded (inner) content starts from the index 1.
                     List<TikaContent> embeddedContent = new LinkedList<>();
@@ -104,7 +104,7 @@ protected TikaContent parseStream(InputStream entityStream, String contentType,
                             embeddedContent.add(new TikaContent(embeddedText.trim(), convert(allMetadata.get(i))));
                         }
                     }
-                    return new TikaContent(masterText, convert(allMetadata.get(0)), embeddedContent);
+                    return new TikaContent(mainDocumentText, convert(allMetadata.get(0)), embeddedContent);
 
                 }
             }
@@ -118,14 +118,14 @@ protected TikaContent parseStream(InputStream entityStream, String contentType,
     private ContentHandler validateContentHandler(ContentHandler contentHandler) {
         if (!this.appendEmbeddedContent && !(contentHandler instanceof RecursiveParserWrapperHandler)) {
             throw new IllegalStateException(
-                    "The master and every embedded document will require a unique ContentHandler instance");
+                    "The main document and every embedded document will require a unique ContentHandler instance");
         }
         return contentHandler;
     }
 
     private ContentHandler createContentHandler() {
         // RecursiveParserWrapperHandler will use the factory to create a new ContentHandler
-        // for the master and each of the embedded documents
+        // for the main document and each of the embedded documents
         return this.appendEmbeddedContent ? new ToTextContentHandler()
                 : new RecursiveParserWrapperHandler(
                         new BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.TEXT, -1));
diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java
index 1069b37faad10..e7882e2bbdafc 100644
--- a/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java
+++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaConfiguration.java
@@ -67,7 +67,7 @@ public class TikaConfiguration {
 
     /**
      * Controls how the content of the embedded documents is parsed.
-     * By default it is appended to the master document content.
+     * By default it is appended to the main document content.
      * Setting this property to false makes the content of each of the embedded documents
      * available separately.
      */
diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaRecorder.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaRecorder.java
index ef449afba8f83..5b2d368a0c753 100644
--- a/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaRecorder.java
+++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/TikaRecorder.java
@@ -47,9 +47,7 @@ private static InputStream getTikaConfigStream(TikaConfiguration config, String
         // Load tika-config.xml resource
         InputStream is;
         if (config.tikaConfigPath.isPresent()) {
-            is = TikaRecorder.class.getResourceAsStream(
-                    config.tikaConfigPath.get().startsWith("/") ? config.tikaConfigPath.get()
-                            : "/" + config.tikaConfigPath.get());
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(config.tikaConfigPath.get());
             if (is == null) {
                 final String errorMessage = "tika-config.xml can not be found at " + config.tikaConfigPath.get();
                 throw new TikaParseException(errorMessage);
diff --git a/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java
new file mode 100644
index 0000000000000..151359302285c
--- /dev/null
+++ b/extensions/tika/runtime/src/main/java/io/quarkus/tika/runtime/graal/CleanerNotSupportedSubstitution.java
@@ -0,0 +1,29 @@
+package io.quarkus.tika.runtime.graal;
+
+@com.oracle.svm.core.annotate.Substitute
+@com.oracle.svm.core.annotate.TargetClass(className = "org.apache.poi.poifs.nio.CleanerUtil")
+public final class CleanerNotSupportedSubstitution {
+
+    /**
+     * <code>true</code>, if this platform supports unmapping mmapped files.
+     */
+    public static final boolean UNMAP_SUPPORTED = false;
+
+    /**
+     * if {@link #UNMAP_SUPPORTED} is {@code false}, this contains the reason
+     * why unmapping is not supported.
+     */
+    public static final String UNMAP_NOT_SUPPORTED_REASON = "Not supported on GraalVM native-image";
+
+    private static final org.apache.poi.poifs.nio.CleanerUtil.BufferCleaner CLEANER = null;
+
+    /**
+     * Reference to a BufferCleaner that does unmapping.
+     * 
+     * @return {@code null} if not supported.
+     */
+    public static org.apache.poi.poifs.nio.CleanerUtil.BufferCleaner getCleaner() {
+        return CLEANER;
+    }
+
+}
diff --git a/extensions/undertow-websockets/deployment/pom.xml b/extensions/undertow-websockets/deployment/pom.xml
deleted file mode 100644
index b5abc0dd243ce..0000000000000
--- a/extensions/undertow-websockets/deployment/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-undertow-websockets-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-undertow-websockets-deployment</artifactId>
-    <name>Quarkus - Undertow - WebSockets - Deployment</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-deployment</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-websockets</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${project.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/UndertowWebsocketProcessor.java b/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/UndertowWebsocketProcessor.java
deleted file mode 100644
index b2fda10dba0bb..0000000000000
--- a/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/UndertowWebsocketProcessor.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package io.quarkus.undertow.websockets.deployment;
-
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerApplicationConfig;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationValue;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
-import org.jboss.jandex.Type;
-
-import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
-import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.ExecutorBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.ServiceStartBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.runtime.annotations.ConfigRoot;
-import io.quarkus.undertow.deployment.ServletContextAttributeBuildItem;
-import io.quarkus.undertow.websockets.runtime.UndertowWebsocketRecorder;
-import io.undertow.websockets.jsr.DefaultContainerConfigurator;
-import io.undertow.websockets.jsr.JsrWebSocketFilter;
-import io.undertow.websockets.jsr.UndertowContainerProvider;
-import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
-
-public class UndertowWebsocketProcessor {
-
-    private static final DotName SERVER_ENDPOINT = DotName.createSimple(ServerEndpoint.class.getName());
-    private static final DotName CLIENT_ENDPOINT = DotName.createSimple(ClientEndpoint.class.getName());
-    private static final DotName SERVER_APPLICATION_CONFIG = DotName.createSimple(ServerApplicationConfig.class.getName());
-    private static final DotName ENDPOINT = DotName.createSimple(Endpoint.class.getName());
-
-    @BuildStep
-    void holdConfig(BuildProducer<FeatureBuildItem> feature, HotReloadConfig hotReloadConfig) {
-        feature.produce(new FeatureBuildItem(Feature.UNDERTOW_WEBSOCKETS));
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem registerConfiguratorServiceProvider() {
-        return new ServiceProviderBuildItem(ServerEndpointConfig.Configurator.class.getName(),
-                DefaultContainerConfigurator.class.getName());
-    }
-
-    @BuildStep
-    void scanForAnnotatedEndpoints(CombinedIndexBuildItem indexBuildItem,
-            BuildProducer<AnnotatedWebsocketEndpointBuildItem> annotatedProducer) {
-
-        final IndexView index = indexBuildItem.getIndex();
-
-        final Collection<AnnotationInstance> serverEndpoints = index.getAnnotations(SERVER_ENDPOINT);
-        for (AnnotationInstance endpoint : serverEndpoints) {
-            if (endpoint.target() instanceof ClassInfo) {
-                ClassInfo clazz = (ClassInfo) endpoint.target();
-                if (!Modifier.isAbstract(clazz.flags())) {
-                    annotatedProducer.produce(new AnnotatedWebsocketEndpointBuildItem(clazz.name().toString(), false));
-                }
-            }
-        }
-
-        final Collection<AnnotationInstance> clientEndpoints = index.getAnnotations(CLIENT_ENDPOINT);
-        for (AnnotationInstance endpoint : clientEndpoints) {
-            if (endpoint.target() instanceof ClassInfo) {
-                ClassInfo clazz = (ClassInfo) endpoint.target();
-                if (!Modifier.isAbstract(clazz.flags())) {
-                    annotatedProducer.produce(new AnnotatedWebsocketEndpointBuildItem(clazz.name().toString(), true));
-                }
-            }
-        }
-
-    }
-
-    @BuildStep
-    @Record(ExecutionTime.STATIC_INIT)
-    public ServletContextAttributeBuildItem deploy(final CombinedIndexBuildItem indexBuildItem,
-            UndertowWebsocketRecorder recorder,
-            BuildProducer<ReflectiveClassBuildItem> reflection,
-            List<AnnotatedWebsocketEndpointBuildItem> annotatedEndpoints,
-            WebsocketConfig websocketConfig) throws Exception {
-
-        final Set<String> endpoints = new HashSet<>();
-        final Set<String> config = new HashSet<>();
-
-        final IndexView index = indexBuildItem.getIndex();
-        final Collection<ClassInfo> subclasses = index.getAllKnownImplementors(SERVER_APPLICATION_CONFIG);
-
-        for (final ClassInfo clazz : subclasses) {
-            if (!Modifier.isAbstract(clazz.flags())) {
-                config.add(clazz.name().toString());
-            }
-        }
-
-        final Collection<ClassInfo> epClasses = index.getAllKnownSubclasses(ENDPOINT);
-
-        for (final ClassInfo clazz : epClasses) {
-            if (!Modifier.isAbstract(clazz.flags())) {
-                endpoints.add(clazz.name().toString());
-            }
-        }
-        if (annotatedEndpoints.isEmpty() &&
-                endpoints.isEmpty() &&
-                config.isEmpty()) {
-            return null;
-        }
-        Set<String> annotated = new HashSet<>();
-        for (AnnotatedWebsocketEndpointBuildItem i : annotatedEndpoints) {
-            annotated.add(i.className);
-        }
-        reflection.produce(
-                new ReflectiveClassBuildItem(true, false, annotated.toArray(new String[annotated.size()])));
-        reflection.produce(new ReflectiveClassBuildItem(false, false, JsrWebSocketFilter.class.getName()));
-
-        registerCodersForReflection(reflection, index.getAnnotations(SERVER_ENDPOINT));
-        registerCodersForReflection(reflection, index.getAnnotations(CLIENT_ENDPOINT));
-
-        reflection.produce(
-                new ReflectiveClassBuildItem(true, true, ClientEndpointConfig.Configurator.class.getName()));
-
-        return new ServletContextAttributeBuildItem(WebSocketDeploymentInfo.ATTRIBUTE_NAME,
-                recorder.createDeploymentInfo(annotated, endpoints, config, websocketConfig.maxFrameSize,
-                        websocketConfig.dispatchToWorker));
-    }
-
-    private void registerCodersForReflection(BuildProducer<ReflectiveClassBuildItem> reflection,
-            Collection<AnnotationInstance> endpoints) {
-        for (AnnotationInstance endpoint : endpoints) {
-            if (endpoint.target() instanceof ClassInfo) {
-                ClassInfo clazz = (ClassInfo) endpoint.target();
-                if (!Modifier.isAbstract(clazz.flags())) {
-                    registerForReflection(reflection, endpoint.value("encoders"));
-                    registerForReflection(reflection, endpoint.value("decoders"));
-                }
-            }
-        }
-    }
-
-    private void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflection, AnnotationValue types) {
-        if (types != null && types.asClassArray() != null) {
-            for (Type type : types.asClassArray()) {
-                reflection.produce(new ReflectiveClassBuildItem(true, false, type.name().toString()));
-            }
-        }
-    }
-
-    @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    ServiceStartBuildItem setupWorker(UndertowWebsocketRecorder recorder, ExecutorBuildItem exec) {
-        recorder.setupWorker(exec.getExecutorProxy());
-        return new ServiceStartBuildItem("Websockets");
-    }
-
-    @BuildStep
-    ServiceProviderBuildItem registerContainerProviderService() {
-        return new ServiceProviderBuildItem(ContainerProvider.class.getName(),
-                UndertowContainerProvider.class.getName());
-    }
-
-    @BuildStep
-    void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> annotations) {
-        annotations.produce(new BeanDefiningAnnotationBuildItem(SERVER_ENDPOINT));
-        annotations.produce(new BeanDefiningAnnotationBuildItem(ENDPOINT));
-        annotations.produce(new BeanDefiningAnnotationBuildItem(CLIENT_ENDPOINT));
-    }
-
-    @ConfigRoot
-    static class HotReloadConfig {
-
-        /**
-         * The security key for remote hot deployment
-         */
-        Optional<String> password;
-
-        /**
-         * The remote URL to connect to
-         */
-        Optional<String> url;
-    }
-}
diff --git a/extensions/undertow-websockets/pom.xml b/extensions/undertow-websockets/pom.xml
deleted file mode 100644
index 88573d47be1ae..0000000000000
--- a/extensions/undertow-websockets/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-build-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-undertow-websockets-parent</artifactId>
-    <name>Quarkus - Undertow - WebSockets</name>
-    <packaging>pom</packaging>
-    <modules>
-        <module>deployment</module>
-        <module>runtime</module>
-    </modules>
-
-</project>
diff --git a/extensions/undertow-websockets/runtime/pom.xml b/extensions/undertow-websockets/runtime/pom.xml
deleted file mode 100644
index ffa7dfaec6d4c..0000000000000
--- a/extensions/undertow-websockets/runtime/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-undertow-websockets-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-undertow-websockets</artifactId>
-    <name>Quarkus - Undertow - WebSockets - Runtime</name>
-    <description>WebSocket communication channel support</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus.http</groupId>
-            <artifactId>quarkus-http-websockets-jsr</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.websocket</groupId>
-                    <artifactId>
-                        jboss-websocket-api_1.1_spec
-                    </artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.websocket</groupId>
-            <artifactId>jakarta.websocket-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-                <configuration>
-                    <excludedArtifacts>
-                        <excludedArtifact>org.jboss.spec.javax.websocket:jboss-websocket-api_1.0_spec</excludedArtifact>
-                        <excludedArtifact>org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec</excludedArtifact>
-                        <excludedArtifact>javax.websocket:javax.websocket-api</excludedArtifact>
-                    </excludedArtifacts>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>io.quarkus</groupId>
-                            <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${project.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/extensions/undertow-websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/UndertowWebsocketRecorder.java b/extensions/undertow-websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/UndertowWebsocketRecorder.java
deleted file mode 100644
index ec0197d1e977c..0000000000000
--- a/extensions/undertow-websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/UndertowWebsocketRecorder.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.quarkus.undertow.websockets.runtime;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.Executor;
-
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerApplicationConfig;
-import javax.websocket.server.ServerEndpointConfig;
-
-import org.jboss.logging.Logger;
-
-import io.quarkus.runtime.annotations.Recorder;
-import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
-
-@Recorder
-public class UndertowWebsocketRecorder {
-
-    private static final Logger log = Logger.getLogger(UndertowWebsocketRecorder.class);
-
-    public void setupWorker(Executor executor) {
-        ExecutorSupplier.executor = executor;
-    }
-
-    @SuppressWarnings("unchecked")
-    public WebSocketDeploymentInfo createDeploymentInfo(Set<String> annotatedEndpoints, Set<String> endpoints,
-            Set<String> serverApplicationConfigClasses, int maxFrameSize, boolean dispatchToWorker) {
-        WebSocketDeploymentInfo container = new WebSocketDeploymentInfo();
-        container.setMaxFrameSize(maxFrameSize);
-        container.setDispatchToWorkerThread(dispatchToWorker);
-        container.setExecutor(new ExecutorSupplier());
-        Set<Class<? extends Endpoint>> allScannedEndpointImplementations = new HashSet<>();
-        for (String i : endpoints) {
-            try {
-                allScannedEndpointImplementations.add(
-                        (Class<? extends Endpoint>) Class.forName(i, true, Thread.currentThread().getContextClassLoader()));
-            } catch (Exception e) {
-                log.error("Could not initialize websocket class " + i, e);
-            }
-        }
-        Set<Class<?>> allScannedAnnotatedEndpoints = new HashSet<>();
-        for (String i : annotatedEndpoints) {
-            try {
-                allScannedAnnotatedEndpoints.add(Class.forName(i, true, Thread.currentThread().getContextClassLoader()));
-            } catch (Exception e) {
-                log.error("Could not initialize websocket class " + i, e);
-            }
-        }
-        Set<Class<?>> newAnnotatatedEndpoints = new HashSet<>();
-        Set<ServerEndpointConfig> serverEndpointConfigurations = new HashSet<>();
-
-        final Set<ServerApplicationConfig> configInstances = new HashSet<>();
-        for (String clazzName : serverApplicationConfigClasses) {
-            try {
-                configInstances.add((ServerApplicationConfig) Class
-                        .forName(clazzName, true, Thread.currentThread().getContextClassLoader()).newInstance());
-            } catch (Exception e) {
-                log.error("Could not initialize websocket config class " + clazzName, e);
-            }
-        }
-
-        if (!configInstances.isEmpty()) {
-            for (ServerApplicationConfig config : configInstances) {
-                Set<Class<?>> returnedEndpoints = config.getAnnotatedEndpointClasses(allScannedAnnotatedEndpoints);
-                if (returnedEndpoints != null) {
-                    newAnnotatatedEndpoints.addAll(returnedEndpoints);
-                }
-                Set<ServerEndpointConfig> endpointConfigs = config.getEndpointConfigs(allScannedEndpointImplementations);
-                if (endpointConfigs != null) {
-                    serverEndpointConfigurations.addAll(endpointConfigs);
-                }
-            }
-        } else {
-            newAnnotatatedEndpoints.addAll(allScannedAnnotatedEndpoints);
-        }
-
-        //annotated endpoints first
-        for (Class<?> endpoint : newAnnotatatedEndpoints) {
-            if (endpoint != null) {
-                container.addEndpoint(endpoint);
-            }
-        }
-
-        for (final ServerEndpointConfig endpoint : serverEndpointConfigurations) {
-            if (endpoint != null) {
-                container.addEndpoint(endpoint);
-            }
-        }
-        return container;
-    }
-
-}
diff --git a/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml
deleted file mode 100644
index 2a682c06070c2..0000000000000
--- a/extensions/undertow-websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: "Undertow WebSockets"
-metadata:
-  short-name: "websockets"
-  keywords:
-  - "undertow-websockets"
-  - "undertow-websocket"
-  - "websocket"
-  - "websockets"
-  - "web-socket"
-  - "web-sockets"
-  - "http"
-  guide: "https://quarkus.io/guides/websockets"
-  categories:
-  - "web"
-  status: "stable"
diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
index bdcb9072f4585..ec274333d457c 100644
--- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
+++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
@@ -26,6 +26,7 @@
 import javax.inject.Inject;
 import javax.servlet.ServletContainerInitializer;
 import javax.servlet.ServletContext;
+import javax.servlet.SessionTrackingMode;
 import javax.servlet.annotation.HandlesTypes;
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.ServletSecurity;
@@ -57,6 +58,7 @@
 import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
 import org.jboss.metadata.web.spec.AnnotationMetaData;
 import org.jboss.metadata.web.spec.AnnotationsMetaData;
+import org.jboss.metadata.web.spec.CookieConfigMetaData;
 import org.jboss.metadata.web.spec.DispatcherType;
 import org.jboss.metadata.web.spec.EmptyRoleSemanticType;
 import org.jboss.metadata.web.spec.FilterMappingMetaData;
@@ -71,15 +73,17 @@
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.metadata.web.spec.ServletSecurityMetaData;
 import org.jboss.metadata.web.spec.ServletsMetaData;
+import org.jboss.metadata.web.spec.SessionConfigMetaData;
 import org.jboss.metadata.web.spec.TransportGuaranteeType;
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.arc.deployment.ContextRegistrarBuildItem;
+import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem;
+import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem.ContextConfiguratorBuildItem;
+import io.quarkus.arc.deployment.CustomScopeBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
-import io.quarkus.arc.processor.ContextRegistrar;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -119,6 +123,7 @@
 import io.undertow.servlet.api.SecurityConstraint;
 import io.undertow.servlet.api.ServletInfo;
 import io.undertow.servlet.api.ServletSecurityInfo;
+import io.undertow.servlet.api.ServletSessionConfig;
 import io.undertow.servlet.api.WebResourceCollection;
 import io.undertow.servlet.handlers.DefaultServlet;
 import io.vertx.core.Handler;
@@ -182,22 +187,26 @@ public ServiceStartBuildItem boot(UndertowDeploymentRecorder recorder,
 
     @BuildStep
     void integrateCdi(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
-            BuildProducer<ContextRegistrarBuildItem> contextRegistrars,
             BuildProducer<ListenerBuildItem> listeners,
             Capabilities capabilities) {
         additionalBeans.produce(new AdditionalBeanBuildItem(ServletProducer.class));
         if (capabilities.isPresent(Capability.SECURITY)) {
             additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(ServletHttpSecurityPolicy.class));
         }
-        contextRegistrars.produce(new ContextRegistrarBuildItem(new ContextRegistrar() {
-            @Override
-            public void register(RegistrationContext registrationContext) {
-                registrationContext.configure(SessionScoped.class).normal().contextClass(HttpSessionContext.class).done();
-            }
-        }, SessionScoped.class));
         listeners.produce(new ListenerBuildItem(HttpSessionContext.class.getName()));
     }
 
+    @BuildStep
+    ContextConfiguratorBuildItem registerContext(ContextRegistrationPhaseBuildItem phase) {
+        return new ContextConfiguratorBuildItem(
+                phase.getContext().configure(SessionScoped.class).normal().contextClass(HttpSessionContext.class));
+    }
+
+    @BuildStep
+    CustomScopeBuildItem customScope() {
+        return new CustomScopeBuildItem(DotName.createSimple(SessionScoped.class.getName()));
+    }
+
     /**
      * Register the undertow-handlers.conf file
      */
@@ -258,6 +267,19 @@ public List<ServletContainerInitializerBuildItem> servletContainerInitializer(
                         for (ClassInfo classInfo : combinedIndexBuildItem.getIndex().getAllKnownImplementors(typeName)) {
                             handledTypes.add(classInfo.name().toString());
                         }
+                        for (AnnotationInstance annotationInstance : combinedIndexBuildItem.getIndex()
+                                .getAnnotations(typeName)) {
+                            if (annotationInstance.target().kind() == AnnotationTarget.Kind.CLASS) {
+                                handledTypes.add(annotationInstance.target().asClass().name().toString());
+                            } else if (annotationInstance.target().kind() == AnnotationTarget.Kind.METHOD) {
+                                handledTypes.add(annotationInstance.target().asMethod().declaringClass().name().toString());
+                            } else if (annotationInstance.target().kind() == AnnotationTarget.Kind.FIELD) {
+                                handledTypes.add(annotationInstance.target().asField().declaringClass().name().toString());
+                            } else if (annotationInstance.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER) {
+                                handledTypes.add(annotationInstance.target().asMethodParameter().method().declaringClass()
+                                        .name().toString());
+                            }
+                        }
                     }
                 }
                 ret.add(new ServletContainerInitializerBuildItem(initializer, handledTypes));
@@ -322,7 +344,8 @@ public ServletDeploymentManagerBuildItem build(List<ServletBuildItem> servlets,
                 knownPaths.knownDirectories,
                 launchMode.getLaunchMode(), shutdownContext, contextPath, httpBuildTimeConfig.rootPath,
                 servletConfig.defaultCharset, webMetaData.getRequestCharacterEncoding(),
-                webMetaData.getResponseCharacterEncoding(), httpBuildTimeConfig.auth.proactive);
+                webMetaData.getResponseCharacterEncoding(), httpBuildTimeConfig.auth.proactive,
+                webMetaData.getWelcomeFileList() != null ? webMetaData.getWelcomeFileList().getWelcomeFiles() : null);
 
         if (webMetaData.getContextParams() != null) {
             for (ParamValueMetaData i : webMetaData.getContextParams()) {
@@ -417,14 +440,29 @@ public ServletDeploymentManagerBuildItem build(List<ServletBuildItem> servlets,
         }
         if (webMetaData.getFilterMappings() != null) {
             for (FilterMappingMetaData mapping : webMetaData.getFilterMappings()) {
-                for (String m : mapping.getUrlPatterns()) {
-                    if (mapping.getDispatchers() == null || mapping.getDispatchers().isEmpty()) {
-                        recorder.addFilterURLMapping(deployment, mapping.getFilterName(), m, REQUEST);
-                    } else {
-
-                        for (DispatcherType dispatcher : mapping.getDispatchers()) {
-                            recorder.addFilterURLMapping(deployment, mapping.getFilterName(), m,
-                                    javax.servlet.DispatcherType.valueOf(dispatcher.name()));
+                List<String> urlPatterns = mapping.getUrlPatterns();
+                List<String> servletNames = mapping.getServletNames();
+                if (urlPatterns != null && !urlPatterns.isEmpty()) {
+                    for (String m : urlPatterns) {
+                        if (mapping.getDispatchers() == null || mapping.getDispatchers().isEmpty()) {
+                            recorder.addFilterURLMapping(deployment, mapping.getFilterName(), m, REQUEST);
+                        } else {
+                            for (DispatcherType dispatcher : mapping.getDispatchers()) {
+                                recorder.addFilterURLMapping(deployment, mapping.getFilterName(), m,
+                                        javax.servlet.DispatcherType.valueOf(dispatcher.name()));
+                            }
+                        }
+                    }
+                } else if (servletNames != null && !servletNames.isEmpty()) {
+                    // No URL Patterns found, map to servlet name instead
+                    for (String name : servletNames) {
+                        if (mapping.getDispatchers() == null || mapping.getDispatchers().isEmpty()) {
+                            recorder.addFilterServletNameMapping(deployment, mapping.getFilterName(), name, REQUEST);
+                        } else {
+                            for (DispatcherType dispatcher : mapping.getDispatchers()) {
+                                recorder.addFilterServletNameMapping(deployment, mapping.getFilterName(), name,
+                                        javax.servlet.DispatcherType.valueOf(dispatcher.name()));
+                            }
                         }
                     }
                 }
@@ -540,6 +578,25 @@ public ServletDeploymentManagerBuildItem build(List<ServletBuildItem> servlets,
             recorder.addServletContainerInitializer(deployment,
                     (Class<? extends ServletContainerInitializer>) context.classProxy(sci.sciClass), handlesTypes);
         }
+        SessionConfigMetaData sessionConfig = webMetaData.getSessionConfig();
+        if (sessionConfig != null) {
+            if (sessionConfig.getSessionTimeoutSet()) {
+                recorder.setSessionTimeout(deployment, sessionConfig.getSessionTimeout());
+            }
+            CookieConfigMetaData cc = sessionConfig.getCookieConfig();
+            if (sessionConfig.getSessionTrackingModes() != null || cc != null) {
+                ServletSessionConfig config = recorder.sessionConfig(deployment);
+                if (sessionConfig.getSessionTrackingModes() != null) {
+                    recorder.setSessionTracking(config, sessionConfig.getSessionTrackingModes().stream()
+                            .map(s -> SessionTrackingMode.valueOf(s.toString())).collect(Collectors.toSet()));
+                }
+                if (cc != null) {
+                    recorder.setSessionCookieConfig(config, cc.getName(), cc.getPath(), cc.getComment(), cc.getDomain(),
+                            cc.getHttpOnlySet() ? cc.getHttpOnly() : null, cc.getMaxAgeSet() ? cc.getMaxAge() : null,
+                            cc.getSecureSet() ? cc.getSecure() : null);
+                }
+            }
+        }
 
         return new ServletDeploymentManagerBuildItem(
                 recorder.bootServletContainer(deployment, bc.getValue(), launchMode.getLaunchMode(), shutdownContext));
@@ -991,14 +1048,17 @@ protected DescriptionGroupMetaData getDescriptionGroup(String description, Strin
         if (description.length() > 0 || displayName.length() > 0 || smallIcon.length() > 0 || largeIcon.length() > 0) {
             dg = new DescriptionGroupMetaData();
             Descriptions descriptions = getDescription(description);
-            if (descriptions != null)
+            if (descriptions != null) {
                 dg.setDescriptions(descriptions);
+            }
             DisplayNames displayNames = getDisplayName(displayName);
-            if (displayNames != null)
+            if (displayNames != null) {
                 dg.setDisplayNames(displayNames);
+            }
             Icons icons = getIcons(smallIcon, largeIcon);
-            if (icons != null)
+            if (icons != null) {
                 dg.setIcons(icons);
+            }
         }
         return dg;
     }
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedSCIClass.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedSCIClass.java
new file mode 100644
index 0000000000000..58e224377aaa6
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/AnnotatedSCIClass.java
@@ -0,0 +1,5 @@
+package io.quarkus.undertow.test;
+
+@SCIAnnotation
+public class AnnotatedSCIClass {
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java
index b8ca8c59da65b..27748f1e78ca0 100644
--- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/LazyAuthRolesAllowedServletTestCase.java
@@ -22,7 +22,7 @@ public class LazyAuthRolesAllowedServletTestCase {
                             TestIdentityProvider.class,
                             TestIdentityController.class)
                     .addAsResource(new StringAsset("quarkus.http.auth.proactive=false\n"),
-                            "application.properties"));;
+                            "application.properties"));
 
     @BeforeAll
     public static void setupUsers() {
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java
new file mode 100644
index 0000000000000..00ed5a091f162
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MaxParametersTestCase.java
@@ -0,0 +1,54 @@
+package io.quarkus.undertow.test;
+
+import java.net.SocketTimeoutException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+/**
+ * Tests the quarkus.servlet.max-parameters setting.
+ */
+public class MaxParametersTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestServlet.class, TestGreeter.class)
+                    .addAsResource(new StringAsset("quarkus.servlet.max-parameters=10"), "application.properties"));
+
+    @Test
+    public void testSmallRequest() {
+        RestAssured.given()
+                .params(generateParameters(10))
+                .get("/test")
+                .then().statusCode(200).body(Matchers.equalTo("test servlet"));
+    }
+
+    @Test
+    public void testLargeRequest() {
+        // A throw of io.undertow.util.ParameterLimitException causes Undertow to close the
+        // connection immediately without responding to the HTTP request.
+        Assertions.assertThrows(SocketTimeoutException.class, () -> RestAssured.given()
+                .params(generateParameters(11))
+                .get("/test")
+                .then().statusCode(414));
+    }
+
+    private static Map<String, String> generateParameters(int count) {
+        Map<String, String> params = new HashMap<>();
+        for (int i = 0; i < count; i++) {
+            params.put(String.format("q%d", i), String.format("%d", i));
+        }
+        return params;
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java
index 866c96e69b36f..89b04b381aba6 100644
--- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/MultipartConfigTestCase.java
@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletException;
@@ -15,7 +16,6 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
 
-import org.apache.commons.codec.Charsets;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -48,7 +48,7 @@ public void execute(BuildContext context) {
     @ParameterizedTest
     @ValueSource(strings = { "/foo", "/servlet-item" })
     public void testMultipartConfig(String path) {
-        given().multiPart("file", "random.txt", "Some random file".getBytes(Charsets.UTF_8))
+        given().multiPart("file", "random.txt", "Some random file".getBytes(StandardCharsets.UTF_8))
                 .when().post(path).then()
                 .statusCode(201)
                 .body(is("OK"));
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java
new file mode 100644
index 0000000000000..dcec0f2b11c20
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NamedServlet.java
@@ -0,0 +1,19 @@
+package io.quarkus.undertow.test;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "named", urlPatterns = "/named")
+public class NamedServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.getWriter().write("Hello World");
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java
new file mode 100644
index 0000000000000..9fc3ebb813533
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/NoUrlPatternWebFilter.java
@@ -0,0 +1,20 @@
+package io.quarkus.undertow.test;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+
+@WebFilter(filterName = "MyFilter", servletNames = "named", asyncSupported = true)
+public class NoUrlPatternWebFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        response.getWriter().write("Goodbye");
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SCIAnnotation.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SCIAnnotation.java
new file mode 100644
index 0000000000000..3999e9bb53440
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/SCIAnnotation.java
@@ -0,0 +1,8 @@
+package io.quarkus.undertow.test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SCIAnnotation {
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java
index 4e0f3f4a5480e..a5afd782c96e9 100644
--- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletContainerInitializerTestCase.java
@@ -1,6 +1,6 @@
 package io.quarkus.undertow.test;
 
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.containsString;
 
 import javax.servlet.ServletContainerInitializer;
 
@@ -18,13 +18,15 @@ public class ServletContainerInitializerTestCase {
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsServiceProvider(ServletContainerInitializer.class, TestSCI.class)
-                    .addClasses(SCIInterface.class, SCIImplementation.class, TestSCI.class));
+                    .addClasses(SCIInterface.class, SCIImplementation.class, TestSCI.class, SCIAnnotation.class,
+                            AnnotatedSCIClass.class));
 
     @Test
     public void testSci() {
         RestAssured.when().get("/sci").then()
                 .statusCode(200)
-                .body(is("io.quarkus.undertow.test.SCIImplementation"));
+                .body(containsString("io.quarkus.undertow.test.SCIImplementation"),
+                        containsString("io.quarkus.undertow.test.AnnotatedSCIClass"));
     }
 
 }
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java
index fe6ec89534256..0f953ce8f16ef 100644
--- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/TestSCI.java
@@ -12,14 +12,16 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-@HandlesTypes(SCIInterface.class)
+@HandlesTypes({ SCIInterface.class, SCIAnnotation.class })
 public class TestSCI implements ServletContainerInitializer {
     @Override
     public void onStartup(Set<Class<?>> c, ServletContext ctx) throws ServletException {
         ServletRegistration.Dynamic info = ctx.addServlet("test", new HttpServlet() {
             @Override
             protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-                resp.getWriter().write(c.iterator().next().getName());
+                for (Class<?> i : c) {
+                    resp.getWriter().println(i.getName());
+                }
             }
         });
         info.addMapping("/sci");
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java
new file mode 100644
index 0000000000000..6e837e3b0144f
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/WebFilterWithNoUrlPatternTestCase.java
@@ -0,0 +1,26 @@
+package io.quarkus.undertow.test;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class WebFilterWithNoUrlPatternTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(NoUrlPatternWebFilter.class, NamedServlet.class));
+
+    @Test
+    public void testFilterWithNoUrlPattern() {
+        when().get("/named").then()
+                .statusCode(200)
+                .body(is("Goodbye"));
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java
new file mode 100644
index 0000000000000..f31155bd2b847
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/Counter.java
@@ -0,0 +1,21 @@
+package io.quarkus.undertow.test.builtinbeans;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.SessionScoped;
+
+@SessionScoped
+class Counter {
+
+    AtomicInteger counter;
+
+    @PostConstruct
+    void init() {
+        counter = new AtomicInteger();
+    }
+
+    int incrementAndGet() {
+        return counter.incrementAndGet();
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java
new file mode 100644
index 0000000000000..79065f3455373
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanInjectingBean.java
@@ -0,0 +1,40 @@
+package io.quarkus.undertow.test.builtinbeans;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+@Dependent
+class ServletBuiltinBeanInjectingBean {
+
+    @Inject
+    HttpServletRequest request;
+
+    @Inject
+    HttpSession session;
+
+    @Inject
+    ServletContext context;
+
+    public void verifyRequest() {
+        assertEquals(true, request.getRequestURI().contains("/request"));
+        assertEquals(request.getParameter("foo"), "bar");
+    }
+
+    public void verifySession(boolean isNew) {
+        assertEquals(isNew, session.isNew());
+        assertEquals(session.getAttribute("foo"), "bar");
+        session.setMaxInactiveInterval(60);
+    }
+
+    public void verifyServletContext() {
+        assertEquals(context.getAttribute("foo"), "bar");
+        assertNotNull(context.getServletRegistration("testServlet"));
+        assertEquals(context.getServletRegistration("testServlet").getClassName(), TestServlet.class.getName());
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java
new file mode 100644
index 0000000000000..f7454e5516b4e
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/ServletBuiltinBeanTestCase.java
@@ -0,0 +1,75 @@
+package io.quarkus.undertow.test.builtinbeans;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.response.Response;
+
+public class ServletBuiltinBeanTestCase {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(TestServlet.class,
+                    ServletBuiltinBeanInjectingBean.class, Counter.class));
+
+    @Test
+    public void testHttpServletRequest() {
+        String uri = "/foo/request";
+        given().param("foo", "bar")
+                .when().get(uri)
+                .then()
+                .statusCode(200)
+                .body(is("foo=bar"));
+    }
+
+    @Test
+    public void testHttpSession() {
+        String uri = "/foo/session";
+
+        Response response = when().get(uri);
+        response.then()
+                .statusCode(200)
+                .body(is("foo=bar"))
+                .header("counter", "1");
+        String sessionId = response.sessionId();
+
+        // another request reusing sessionId
+        given().sessionId(sessionId)
+                .when().get(uri)
+                .then()
+                .statusCode(200)
+                .body(is("foo=bar"))
+                .header("counter", "2");
+
+        // Destroy session
+        given().sessionId(sessionId).param("destroy", "true")
+                .when().get(uri)
+                .then()
+                .statusCode(200);
+
+        // New session
+        response = when().get(uri);
+        response.then()
+                .statusCode(200)
+                .body(is("foo=bar"))
+                .header("counter", "1");
+        assertNotEquals(sessionId, response.sessionId());
+    }
+
+    @Test
+    public void testServletContext() {
+        String uri = "/foo/context";
+        when().get(uri)
+                .then()
+                .statusCode(200)
+                .body(is("foo=bar"));
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java
new file mode 100644
index 0000000000000..ebc2b73c64c38
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/builtinbeans/TestServlet.java
@@ -0,0 +1,48 @@
+package io.quarkus.undertow.test.builtinbeans;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+@SuppressWarnings("serial")
+@WebServlet(urlPatterns = "/foo/*", name = "testServlet")
+public class TestServlet extends HttpServlet {
+
+    @Inject
+    ServletBuiltinBeanInjectingBean bean;
+
+    @Inject
+    Counter counter;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        if (req.getRequestURI().contains("/request")) {
+            bean.verifyRequest();
+            resp.getWriter().write("foo=bar");
+        }
+        if (req.getRequestURI().endsWith("/session")) {
+            if (req.getParameter("destroy") != null) {
+                req.getSession().invalidate();
+            } else {
+                HttpSession session = req.getSession();
+                if (session.isNew()) {
+                    session.setAttribute("foo", "bar");
+                }
+                bean.verifySession(session.isNew());
+                resp.setIntHeader("counter", counter.incrementAndGet());
+                resp.getWriter().write("foo=bar");
+            }
+        }
+        if (req.getRequestURI().endsWith("/context")) {
+            req.getSession().getServletContext().setAttribute("foo", "bar");
+            bean.verifyServletContext();
+            resp.getWriter().write("foo=bar");
+        }
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java
new file mode 100644
index 0000000000000..4078cb053d17f
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java
@@ -0,0 +1,97 @@
+package io.quarkus.undertow.test.push;
+
+import java.io.File;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpClientResponse;
+import io.vertx.core.http.HttpVersion;
+import io.vertx.core.net.JdkSSLEngineOptions;
+
+public class Http2ServerPushTestCase {
+
+    @TestHTTPResource(value = "/push", ssl = true)
+    URL sslUrl;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(ServerPushServlet.class, MessageServlet.class)
+                    .addAsResource(new File("src/test/resources/ssl-jks.conf"), "application.properties")
+                    .addAsResource(new File("src/test/resources/server-keystore.jks"), "server-keystore.jks"));
+
+    @Test
+    public void testServerPush() throws Exception {
+        Assumptions.assumeTrue(JdkSSLEngineOptions.isAlpnAvailable()); //don't run on JDK8
+        Vertx vertx = Vertx.vertx();
+        try {
+            HttpClientOptions options = new HttpClientOptions().setSsl(true).setUseAlpn(true)
+                    .setProtocolVersion(HttpVersion.HTTP_2).setVerifyHost(false).setTrustAll(true);
+
+            final CompletableFuture<String> pushedPath = new CompletableFuture<>();
+            final CompletableFuture<String> pushedBody = new CompletableFuture<>();
+
+            HttpClientRequest request = vertx.createHttpClient(options)
+                    .get(sslUrl.getPort(), sslUrl.getHost(), sslUrl.getPath());
+            request.pushHandler(new Handler<HttpClientRequest>() {
+                @Override
+                public void handle(HttpClientRequest event) {
+                    pushedPath.complete(event.path());
+                    event.handler(new Handler<HttpClientResponse>() {
+                        @Override
+                        public void handle(HttpClientResponse event) {
+                            event.bodyHandler(new Handler<Buffer>() {
+                                @Override
+                                public void handle(Buffer event) {
+                                    pushedBody.complete(new String(event.getBytes(), StandardCharsets.UTF_8));
+                                }
+                            });
+                            event.exceptionHandler(new Handler<Throwable>() {
+                                @Override
+                                public void handle(Throwable event) {
+                                    pushedBody.completeExceptionally(event);
+                                    pushedPath.completeExceptionally(event);
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+            request.handler(new Handler<HttpClientResponse>() {
+                @Override
+                public void handle(HttpClientResponse event) {
+                    event.endHandler(new Handler<Void>() {
+                        @Override
+                        public void handle(Void event) {
+
+                        }
+                    });
+                }
+            });
+            request.end();
+            Assertions.assertEquals("/pushed", pushedPath.get(10, TimeUnit.SECONDS));
+            Assertions.assertEquals("pushed-body", pushedBody.get(10, TimeUnit.SECONDS));
+
+        } finally {
+            vertx.close();
+        }
+
+    }
+
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java
new file mode 100644
index 0000000000000..a6a5542c2e320
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/MessageServlet.java
@@ -0,0 +1,18 @@
+package io.quarkus.undertow.test.push;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(urlPatterns = "/pushed")
+public class MessageServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.getWriter().print("pushed-body");
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java
new file mode 100644
index 0000000000000..49a6a3c5559cc
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/ServerPushServlet.java
@@ -0,0 +1,20 @@
+package io.quarkus.undertow.test.push;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(urlPatterns = "/push")
+public class ServerPushServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        req.newPushBuilder()
+                .path("pushed")
+                .push();
+    }
+}
diff --git a/extensions/undertow/deployment/src/test/resources/server-keystore.jks b/extensions/undertow/deployment/src/test/resources/server-keystore.jks
new file mode 100644
index 0000000000000..da33e8e7a1668
Binary files /dev/null and b/extensions/undertow/deployment/src/test/resources/server-keystore.jks differ
diff --git a/extensions/undertow/deployment/src/test/resources/ssl-jks.conf b/extensions/undertow/deployment/src/test/resources/ssl-jks.conf
new file mode 100644
index 0000000000000..1aa9d96edb51c
--- /dev/null
+++ b/extensions/undertow/deployment/src/test/resources/ssl-jks.conf
@@ -0,0 +1,3 @@
+# Enable SSL, configure the key store
+quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
+quarkus.http.ssl.certificate.key-store-password=secret
\ No newline at end of file
diff --git a/extensions/undertow/pom.xml b/extensions/undertow/pom.xml
index 9c72ddbb481f2..7c0d3091b638c 100644
--- a/extensions/undertow/pom.xml
+++ b/extensions/undertow/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/undertow/runtime/pom.xml b/extensions/undertow/runtime/pom.xml
index 23ffdce0a8858..9bdee9ea0ac3a 100644
--- a/extensions/undertow/runtime/pom.xml
+++ b/extensions/undertow/runtime/pom.xml
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus.http</groupId>
diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java
index c1075406071e7..56ca17ffaa3f6 100644
--- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java
+++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletProducer.java
@@ -5,6 +5,7 @@
 import javax.inject.Singleton;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import io.undertow.servlet.handlers.ServletRequestContext;
 
@@ -22,4 +23,10 @@ HttpServletRequest request() {
     HttpServletResponse response() {
         return (HttpServletResponse) ServletRequestContext.requireCurrent().getServletResponse();
     }
+
+    @Produces
+    @RequestScoped
+    HttpSession session() {
+        return request().getSession();
+    }
 }
diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletRuntimeConfig.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletRuntimeConfig.java
index 311cdfa100714..759afe35f9b45 100644
--- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletRuntimeConfig.java
+++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/ServletRuntimeConfig.java
@@ -26,4 +26,11 @@ public class ServletRuntimeConfig {
     @ConfigItem
     Optional<Boolean> directBuffers;
 
+    /**
+     * The maximum number of HTTP request parameters permitted for Servlet requests.
+     *
+     * If a client sends more than this number of parameters in a request, the connection is closed.
+     */
+    @ConfigItem(defaultValue = "1000")
+    int maxParameters;
 }
diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
index 28b75eb175a78..dc09f4c24777a 100644
--- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
+++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
@@ -28,6 +28,7 @@
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.SessionTrackingMode;
 
 import org.jboss.logging.Logger;
 
@@ -46,11 +47,15 @@
 import io.quarkus.security.ForbiddenException;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
+import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
 import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
 import io.undertow.httpcore.BufferAllocator;
 import io.undertow.httpcore.StatusCodes;
+import io.undertow.httpcore.UndertowOptionMap;
+import io.undertow.httpcore.UndertowOptions;
 import io.undertow.security.api.AuthenticationMode;
 import io.undertow.security.api.NotificationReceiver;
 import io.undertow.security.api.SecurityNotification;
@@ -84,6 +89,7 @@
 import io.undertow.servlet.api.ServletContainerInitializerInfo;
 import io.undertow.servlet.api.ServletInfo;
 import io.undertow.servlet.api.ServletSecurityInfo;
+import io.undertow.servlet.api.ServletSessionConfig;
 import io.undertow.servlet.api.ThreadSetupHandler;
 import io.undertow.servlet.api.TransportGuaranteeType;
 import io.undertow.servlet.api.WebResourceCollection;
@@ -151,7 +157,8 @@ public static void setHotDeploymentResources(List<Path> resources) {
 
     public RuntimeValue<DeploymentInfo> createDeployment(String name, Set<String> knownFile, Set<String> knownDirectories,
             LaunchMode launchMode, ShutdownContext context, String contextPath, String httpRootPath, String defaultCharset,
-            String requestCharacterEncoding, String responseCharacterEncoding, boolean proactiveAuth) {
+            String requestCharacterEncoding, String responseCharacterEncoding, boolean proactiveAuth,
+            List<String> welcomeFiles) {
         String realMountPoint;
         if (contextPath.equals("/")) {
             realMountPoint = httpRootPath;
@@ -196,7 +203,12 @@ public RuntimeValue<DeploymentInfo> createDeployment(String name, Set<String> kn
         }
         d.setResourceManager(resourceManager);
 
-        d.addWelcomePages("index.html", "index.htm");
+        if (welcomeFiles != null) {
+            // if available, use welcome-files from web.xml
+            d.addWelcomePages(welcomeFiles);
+        } else {
+            d.addWelcomePages("index.html", "index.htm");
+        }
 
         d.addServlet(new ServletInfo(ServletPathMatches.DEFAULT_SERVLET_NAME, DefaultServlet.class).setAsyncSupported(true));
         for (HandlerWrapper i : hotDeploymentWrappers) {
@@ -204,23 +216,14 @@ public RuntimeValue<DeploymentInfo> createDeployment(String name, Set<String> kn
         }
         d.addAuthenticationMechanism("QUARKUS", new ImmediateAuthenticationMechanismFactory(QuarkusAuthMechanism.INSTANCE));
         d.setLoginConfig(new LoginConfig("QUARKUS", "QUARKUS"));
-        context.addShutdownTask(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    d.getResourceManager().close();
-                } catch (IOException e) {
-                    log.error("Failed to close Servlet ResourceManager", e);
-                }
-            }
-        });
+        context.addShutdownTask(new ShutdownContext.CloseRunnable(d.getResourceManager()));
 
         d.addNotificationReceiver(new NotificationReceiver() {
             @Override
             public void handleNotification(SecurityNotification notification) {
                 if (notification.getEventType() == SecurityNotification.EventType.AUTHENTICATED) {
                     QuarkusUndertowAccount account = (QuarkusUndertowAccount) notification.getAccount();
-                    CDI.current().getBeanManager().fireEvent(account.getSecurityIdentity());
+                    CDI.current().select(CurrentIdentityAssociation.class).get().setIdentity(account.getSecurityIdentity());
                 }
             }
         });
@@ -370,20 +373,34 @@ public void run() {
         UndertowBufferAllocator allocator = new UndertowBufferAllocator(
                 servletRuntimeConfig.directBuffers.orElse(DEFAULT_DIRECT_BUFFERS), (int) servletRuntimeConfig.bufferSize
                         .orElse(new MemorySize(BigInteger.valueOf(DEFAULT_BUFFER_SIZE))).asLongValue());
+
+        UndertowOptionMap.Builder undertowOptions = UndertowOptionMap.builder();
+        undertowOptions.set(UndertowOptions.MAX_PARAMETERS, servletRuntimeConfig.maxParameters);
+        UndertowOptionMap undertowOptionMap = undertowOptions.getMap();
+
         return new Handler<RoutingContext>() {
             @Override
             public void handle(RoutingContext event) {
-                event.request().pause();
+                if (!event.request().isEnded()) {
+                    event.request().pause();
+                }
+
                 //we handle auth failure directly
                 event.remove(QuarkusHttpUser.AUTH_FAILURE_HANDLER);
+
                 VertxHttpExchange exchange = new VertxHttpExchange(event.request(), allocator, executorService, event,
                         event.getBody());
+                exchange.setPushHandler(VertxHttpRecorder.getRootHandler());
+
                 Optional<MemorySize> maxBodySize = httpConfiguration.limits.maxBodySize;
                 if (maxBodySize.isPresent()) {
                     exchange.setMaxEntitySize(maxBodySize.get().asLongValue());
                 }
                 Duration readTimeout = httpConfiguration.readTimeout;
                 exchange.setReadTimeout(readTimeout.toMillis());
+
+                exchange.setUndertowOptions(undertowOptionMap);
+
                 //we eagerly dispatch to the exector, as Undertow needs to be blocking anyway
                 //its actually possible to be on a different IO thread at this point which confuses Undertow
                 //see https://github.com/quarkusio/quarkus/issues/7782
@@ -558,8 +575,13 @@ public T call(HttpServerExchange exchange, C context) throws Exception {
                                 currentVertxRequest.setCurrent(rc);
 
                                 if (association != null) {
-                                    association
-                                            .setIdentity(QuarkusHttpUser.getSecurityIdentity(rc, null));
+                                    QuarkusHttpUser existing = (QuarkusHttpUser) rc.user();
+                                    if (existing != null) {
+                                        SecurityIdentity identity = existing.getSecurityIdentity();
+                                        association.setIdentity(identity);
+                                    } else {
+                                        association.setIdentity(QuarkusHttpUser.getSecurityIdentity(rc, null));
+                                    }
                                 }
 
                                 return action.call(exchange, context);
@@ -636,6 +658,45 @@ public void addSecurityConstraint(RuntimeValue<DeploymentInfo> deployment, Secur
 
     }
 
+    public void setSessionTimeout(RuntimeValue<DeploymentInfo> deployment, int sessionTimeout) {
+        deployment.getValue().setDefaultSessionTimeout(sessionTimeout * 60);
+    }
+
+    public ServletSessionConfig sessionConfig(RuntimeValue<DeploymentInfo> deployment) {
+        ServletSessionConfig config = new ServletSessionConfig();
+        deployment.getValue().setServletSessionConfig(config);
+        return config;
+    }
+
+    public void setSessionTracking(ServletSessionConfig config, Set<SessionTrackingMode> modes) {
+        config.setSessionTrackingModes(modes);
+    }
+
+    public void setSessionCookieConfig(ServletSessionConfig config, String name, String path, String comment, String domain,
+            Boolean httpOnly, Integer maxAge, Boolean secure) {
+        if (name != null) {
+            config.setName(name);
+        }
+        if (path != null) {
+            config.setPath(path);
+        }
+        if (comment != null) {
+            config.setComment(comment);
+        }
+        if (domain != null) {
+            config.setDomain(domain);
+        }
+        if (httpOnly != null) {
+            config.setHttpOnly(httpOnly);
+        }
+        if (maxAge != null) {
+            config.setMaxAge(maxAge);
+        }
+        if (secure != null) {
+            config.setSecure(secure);
+        }
+    }
+
     /**
      * we can't have SecureRandom in the native image heap, so we need to lazy init
      */
diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java
new file mode 100644
index 0000000000000..5fa77ba9d043e
--- /dev/null
+++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowTestHttpProvider.java
@@ -0,0 +1,57 @@
+package io.quarkus.undertow.runtime;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Optional;
+import java.util.function.Function;
+
+import javax.servlet.annotation.WebServlet;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
+
+public class UndertowTestHttpProvider implements TestHttpEndpointProvider {
+    @Override
+    public Function<Class<?>, String> endpointProvider() {
+        return new Function<Class<?>, String>() {
+            @Override
+            public String apply(Class<?> aClass) {
+                String value = null;
+                for (Annotation annotation : aClass.getAnnotations()) {
+                    if (annotation.annotationType().getName().equals(WebServlet.class.getName())) {
+                        try {
+                            String[] patterns = (String[]) annotation.annotationType().getMethod("urlPatterns")
+                                    .invoke(annotation);
+                            if (patterns.length > 0) {
+                                value = patterns[0];
+                            }
+                        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }
+                if (value == null) {
+                    return null;
+                }
+                if (value.endsWith("/*")) {
+                    value = value.substring(0, value.length() - 1);
+                }
+                if (value.startsWith("/")) {
+                    value = value.substring(1);
+                }
+                String path = "/";
+                Optional<String> appPath = ConfigProvider.getConfig().getOptionalValue("quarkus.servlet.context-path",
+                        String.class);
+                if (appPath.isPresent()) {
+                    path = appPath.get();
+                }
+                if (!path.endsWith("/")) {
+                    path = path + "/";
+                }
+                value = path + value;
+                return value;
+            }
+        };
+    }
+}
diff --git a/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 30f3c8b83a1bd..e4bb452f865ea 100644
--- a/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/undertow/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -5,7 +5,7 @@ metadata:
   keywords:
   - "undertow"
   - "servlet"
+  - "http"
   categories:
   - "web"
-  - "http"
   status: "stable"
diff --git a/extensions/undertow/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider b/extensions/undertow/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
new file mode 100644
index 0000000000000..f1abc59e8c339
--- /dev/null
+++ b/extensions/undertow/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
@@ -0,0 +1 @@
+io.quarkus.undertow.runtime.UndertowTestHttpProvider
\ No newline at end of file
diff --git a/extensions/vault/deployment/pom.xml b/extensions/vault/deployment/pom.xml
index 30e05df671ae6..d351575d6122a 100644
--- a/extensions/vault/deployment/pom.xml
+++ b/extensions/vault/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vault-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +33,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-credentials-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health-spi</artifactId>
diff --git a/extensions/vault/deployment/src/main/java/io/quarkus/vault/VaultProcessor.java b/extensions/vault/deployment/src/main/java/io/quarkus/vault/VaultProcessor.java
index d39daaeb49270..a4415fadae92f 100644
--- a/extensions/vault/deployment/src/main/java/io/quarkus/vault/VaultProcessor.java
+++ b/extensions/vault/deployment/src/main/java/io/quarkus/vault/VaultProcessor.java
@@ -1,7 +1,5 @@
 package io.quarkus.vault;
 
-import java.util.OptionalInt;
-
 import org.jboss.jandex.DotName;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
@@ -13,21 +11,46 @@
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.RunTimeConfigurationSourceBuildItem;
+import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
+import io.quarkus.deployment.builditem.RunTimeConfigurationSourceValueBuildItem;
 import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.smallrye.health.deployment.spi.HealthBuildItem;
 import io.quarkus.vault.runtime.Base64StringDeserializer;
 import io.quarkus.vault.runtime.Base64StringSerializer;
+import io.quarkus.vault.runtime.VaultAuthManager;
+import io.quarkus.vault.runtime.VaultConfigHolder;
+import io.quarkus.vault.runtime.VaultCredentialsProvider;
+import io.quarkus.vault.runtime.VaultDbManager;
+import io.quarkus.vault.runtime.VaultKubernetesAuthManager;
+import io.quarkus.vault.runtime.VaultKvManager;
 import io.quarkus.vault.runtime.VaultRecorder;
-import io.quarkus.vault.runtime.VaultServiceProducer;
+import io.quarkus.vault.runtime.VaultSystemBackendManager;
+import io.quarkus.vault.runtime.VaultTOTPManager;
+import io.quarkus.vault.runtime.VaultTransitManager;
+import io.quarkus.vault.runtime.client.VertxVaultClient;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalAppRoleAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalKubernetesAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalTokenAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalUserpassAuthMethod;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.VaultModel;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalDatabaseSecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalKvV1SecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalKvV2SecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalTOPTSecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalTransitSecretEngine;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 import io.quarkus.vault.runtime.config.VaultBuildTimeConfig;
-import io.quarkus.vault.runtime.config.VaultConfigSource;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.health.VaultHealthCheck;
 
 public class VaultProcessor {
 
+    @BuildStep
+    void addDependencies(BuildProducer<IndexDependencyBuildItem> indexDependency) {
+        indexDependency.produce(new IndexDependencyBuildItem("io.quarkus", "quarkus-vault-model"));
+    }
+
     @BuildStep
     void build(
             BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
@@ -50,31 +73,41 @@ void build(
         sslNativeSupport.produce(new ExtensionSslNativeSupportBuildItem(Feature.VAULT));
     }
 
-    @BuildStep
-    void setUpConfigFile(BuildProducer<RunTimeConfigurationSourceBuildItem> configSourceConsumer) {
-        configSourceConsumer.produce(new RunTimeConfigurationSourceBuildItem(
-                VaultConfigSource.class.getName(), OptionalInt.of(150)));
-    }
-
     @BuildStep
     AdditionalBeanBuildItem registerAdditionalBeans() {
         return new AdditionalBeanBuildItem.Builder()
                 .setUnremovable()
-                .addBeanClass(VaultServiceProducer.class)
-                .addBeanClass(VaultKVSecretEngine.class)
+                .addBeanClass(VaultCredentialsProvider.class)
+                .addBeanClass(VaultKvManager.class)
+                .addBeanClass(VaultTransitManager.class)
+                .addBeanClass(VaultTOTPManager.class)
+                .addBeanClass(VaultSystemBackendManager.class)
+                .addBeanClass(VaultKubernetesAuthManager.class)
+                .addBeanClass(VaultAuthManager.class)
+                .addBeanClass(VaultDbManager.class)
+                .addBeanClass(VertxVaultClient.class)
+                .addBeanClass(VaultConfigHolder.class)
+                .addBeanClass(VaultInternalKvV1SecretEngine.class)
+                .addBeanClass(VaultInternalKvV2SecretEngine.class)
+                .addBeanClass(VaultInternalTransitSecretEngine.class)
+                .addBeanClass(VaultInternalTOPTSecretEngine.class)
+                .addBeanClass(VaultInternalSystemBackend.class)
+                .addBeanClass(VaultInternalAppRoleAuthMethod.class)
+                .addBeanClass(VaultInternalKubernetesAuthMethod.class)
+                .addBeanClass(VaultInternalTokenAuthMethod.class)
+                .addBeanClass(VaultInternalUserpassAuthMethod.class)
+                .addBeanClass(VaultInternalDatabaseSecretEngine.class)
                 .build();
     }
 
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    void configure(VaultRecorder recorder, VaultBuildTimeConfig buildTimeConfig, VaultRuntimeConfig serverConfig) {
-        recorder.configureRuntimeProperties(buildTimeConfig, serverConfig);
+    RunTimeConfigurationSourceValueBuildItem init(VaultRecorder recorder, VaultBootstrapConfig vaultBootstrapConfig) {
+        return new RunTimeConfigurationSourceValueBuildItem(recorder.configure(vaultBootstrapConfig));
     }
 
     @BuildStep
     HealthBuildItem addHealthCheck(VaultBuildTimeConfig config) {
-        return new HealthBuildItem("io.quarkus.vault.runtime.health.VaultHealthCheck",
-                config.health.enabled);
+        return new HealthBuildItem(VaultHealthCheck.class.getName(), config.health.enabled);
     }
-
 }
diff --git a/extensions/vault/model/pom.xml b/extensions/vault/model/pom.xml
new file mode 100644
index 0000000000000..59b984306018c
--- /dev/null
+++ b/extensions/vault/model/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-vault-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <!--
+    This module contains all jaxrs parameter and result classes used to call Vault endpoints.
+    They need to be in a separate module so that they can be indexed, without the VaultHealthCheck,
+    which is an optional dependency of the runtime moduée.
+    All model classes should be enabled for reflection, as they will be managed by jackson.
+    -->
+    <artifactId>quarkus-vault-model</artifactId>
+    <name>Quarkus - Vault - Model</name>
+    <description>Hashicorp Vault API model classes</description>
+    <dependencies>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/Base64String.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/Base64String.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/Base64String.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/Base64String.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/Base64StringDeserializer.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/Base64StringDeserializer.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/Base64StringDeserializer.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/Base64StringDeserializer.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/Base64StringSerializer.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/Base64StringSerializer.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/Base64StringSerializer.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/Base64StringSerializer.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/StringHelper.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/StringHelper.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/StringHelper.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/StringHelper.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultDTO.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultDTO.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultDTO.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultDTO.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultLookupData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultLookupData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultLookupData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/AbstractVaultLookupData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/VaultModel.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/VaultModel.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/VaultModel.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/VaultModel.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/WrapInfo.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/WrapInfo.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/WrapInfo.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/WrapInfo.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/AbstractVaultAuthAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/AbstractVaultAuthAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/AbstractVaultAuthAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/AbstractVaultAuthAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuthMetadata.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuthMetadata.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuthMetadata.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthAuthMetadata.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleAuthBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretID.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretID.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretID.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretID.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretIDData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretIDData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretIDData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultAppRoleGenerateNewSecretIDData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuthMetadata.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuthMetadata.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuthMetadata.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthAuthMetadata.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthConfigResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthListRolesResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthReadRoleResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthReadRoleResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthReadRoleResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthReadRoleResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthRoleData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthRoleData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthRoleData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultKubernetesAuthRoleData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelf.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelf.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelf.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelf.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelfData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelfData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelfData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultLookupSelfData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelf.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelf.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelf.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelf.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultRenewSelfBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreate.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreate.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreate.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreate.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreateAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreateAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreateAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultTokenCreateAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuth.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuth.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuth.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuth.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuthMetadata.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuthMetadata.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuthMetadata.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthAuthMetadata.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/auth/VaultUserPassAuthBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentials.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentials.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentials.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentials.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentialsData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentialsData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentialsData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/database/VaultDatabaseCredentialsData.java
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvListSecrets.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvListSecrets.java
new file mode 100644
index 0000000000000..24933ea0a49ef
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvListSecrets.java
@@ -0,0 +1,22 @@
+package io.quarkus.vault.runtime.client.dto.kv;
+
+import io.quarkus.vault.runtime.client.dto.AbstractVaultDTO;
+
+/**
+ * {
+ * "request_id": "1c4eef43-196a-495c-25d2-f76e1e8c0032",
+ * "lease_id": "",
+ * "renewable": false,
+ * "lease_duration": 0,
+ * "data": {
+ * "keys": [
+ * "world"
+ * ]
+ * },
+ * "wrap_info": null,
+ * "warnings": null,
+ * "auth": null
+ * }
+ */
+public class VaultKvListSecrets extends AbstractVaultDTO<VaultKvListSecretsData, Object> {
+}
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvListSecretsData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvListSecretsData.java
new file mode 100644
index 0000000000000..db3143b16597a
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvListSecretsData.java
@@ -0,0 +1,11 @@
+package io.quarkus.vault.runtime.client.dto.kv;
+
+import java.util.List;
+
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultKvListSecretsData implements VaultModel {
+
+    public List<String> keys;
+
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV1.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV1.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV1.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV1.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Data.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Data.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Data.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Data.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Metadata.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Metadata.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Metadata.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Metadata.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Write.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Write.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Write.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2Write.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/kv/VaultKvSecretV2WriteData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultHealthResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultHealthResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultHealthResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultHealthResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitResponse.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitResponse.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitResponse.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultInitResponse.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookup.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookup.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookup.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookup.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookupData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookupData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookupData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultLeasesLookupData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultListPolicyResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultPolicyResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultRenewLease.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultRenewLease.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultRenewLease.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultRenewLease.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultSealStatusResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultSealStatusResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultSealStatusResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultSealStatusResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultUnwrapBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultUnwrapBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultUnwrapBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultUnwrapBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultWrapResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultWrapResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultWrapResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/sys/VaultWrapResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyBody.java
similarity index 93%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyBody.java
index 6ac0739a573c0..724179fe4dc47 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyBody.java
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyBody.java
@@ -1,5 +1,6 @@
 package io.quarkus.vault.runtime.client.dto.totp;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.quarkus.vault.runtime.client.dto.VaultModel;
@@ -27,6 +28,7 @@ public class VaultTOTPCreateKeyBody implements VaultModel {
     @JsonProperty("qr_size")
     public Integer qrSize;
 
+    @JsonIgnore
     public boolean isProducingOutput() {
         // When exported is not set, by default is true
         return is(exported, true) && is(generate, false);
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPCreateKeyResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPGenerateCodeResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPListKeysResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPReadKeyResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/totp/VaultTOTPValidateCodeResult.java
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitCreateKeyBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitCreateKeyBody.java
new file mode 100644
index 0000000000000..cf41929722ac3
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitCreateKeyBody.java
@@ -0,0 +1,16 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultTransitCreateKeyBody implements VaultModel {
+
+    @JsonProperty("convergent_encryption")
+    public String convergentEncryption;
+    public Boolean derived;
+    public Boolean exportable;
+    @JsonProperty("allow_plaintext_backup")
+    public Boolean allowPlaintextBackup;
+    public String type;
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecrypt.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecrypt.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecrypt.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecrypt.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBatchInput.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBatchInput.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBatchInput.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBatchInput.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptDataBatchResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptDataBatchResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptDataBatchResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitDecryptDataBatchResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncrypt.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncrypt.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncrypt.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncrypt.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBatchInput.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBatchInput.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBatchInput.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBatchInput.java
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBody.java
new file mode 100644
index 0000000000000..5af97b3a14c1d
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBody.java
@@ -0,0 +1,25 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.quarkus.vault.runtime.Base64String;
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultTransitEncryptBody implements VaultModel {
+
+    public String name;
+    public Base64String plaintext;
+    public Base64String context;
+    public Base64String nonce;
+    @JsonProperty("key_version")
+    public Integer keyVersion;
+    public String type;
+    @JsonProperty("convergent_encryption")
+    public String convergentEncryption;
+
+    @JsonProperty("batch_input")
+    public List<VaultTransitEncryptBatchInput> batchInput;
+
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptData.java
similarity index 86%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptData.java
index 3cae705e449b1..0c84d904b703c 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptData.java
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptData.java
@@ -8,6 +8,8 @@
 
 public class VaultTransitEncryptData implements VaultModel {
 
+    public String ciphertext;
+    public String error;
     @JsonProperty("batch_results")
     public List<VaultTransitEncryptDataBatchResult> batchResults;
 
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptDataBatchResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptDataBatchResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptDataBatchResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptDataBatchResult.java
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyConfigBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyConfigBody.java
new file mode 100644
index 0000000000000..3c8c8fc65d10b
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyConfigBody.java
@@ -0,0 +1,18 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultTransitKeyConfigBody implements VaultModel {
+
+    @JsonProperty("min_decryption_version")
+    public Integer minDecryptionVersion;
+    @JsonProperty("min_encryption_version")
+    public Integer minEncryptionVersion;
+    @JsonProperty("deletion_allowed")
+    public Boolean deletionAllowed;
+    public Boolean exportable;
+    @JsonProperty("allow_plaintext_backup")
+    public Boolean allowPlaintextBackup;
+}
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyExport.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyExport.java
new file mode 100644
index 0000000000000..adb76290d1216
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyExport.java
@@ -0,0 +1,6 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import io.quarkus.vault.runtime.client.dto.AbstractVaultDTO;
+
+public class VaultTransitKeyExport extends AbstractVaultDTO<VaultTransitKeyExportData, Object> {
+}
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyExportData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyExportData.java
new file mode 100644
index 0000000000000..51ab8e35ee296
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitKeyExportData.java
@@ -0,0 +1,11 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import java.util.Map;
+
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultTransitKeyExportData implements VaultModel {
+
+    public String name;
+    public Map<String, String> keys;
+}
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitListKeysData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitListKeysData.java
new file mode 100644
index 0000000000000..79f0bf7db42d0
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitListKeysData.java
@@ -0,0 +1,10 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import java.util.List;
+
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultTransitListKeysData implements VaultModel {
+
+    public List<String> keys;
+}
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitListKeysResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitListKeysResult.java
new file mode 100644
index 0000000000000..8749cde747454
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitListKeysResult.java
@@ -0,0 +1,6 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import io.quarkus.vault.runtime.client.dto.AbstractVaultDTO;
+
+public class VaultTransitListKeysResult extends AbstractVaultDTO<VaultTransitListKeysData, Object> {
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRandomData.java
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitReadKeyData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitReadKeyData.java
new file mode 100644
index 0000000000000..5f619fe81d64c
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitReadKeyData.java
@@ -0,0 +1,32 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.quarkus.vault.runtime.client.dto.VaultModel;
+
+public class VaultTransitReadKeyData implements VaultModel {
+
+    public String detail;
+    @JsonProperty(value = "deletion_allowed")
+    public boolean deletionAllowed;
+    public boolean derived;
+    public boolean exportable;
+    @JsonProperty(value = "allow_plaintext_backup")
+    public boolean allowPlaintextBackup;
+    public Map<String, Integer> keys;
+    @JsonProperty(value = "min_decryption_version")
+    public int minDecryptionVersion;
+    @JsonProperty(value = "min_encryption_version")
+    public int minEncryptionVersion;
+    public String name;
+    @JsonProperty(value = "supports_encryption")
+    public boolean supportsEncryption;
+    @JsonProperty(value = "supports_decryption")
+    public boolean supportsDecryption;
+    @JsonProperty(value = "supports_derivation")
+    public boolean supportsDerivation;
+    @JsonProperty(value = "supports_signing")
+    public boolean supportsSigning;
+}
diff --git a/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitReadKeyResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitReadKeyResult.java
new file mode 100644
index 0000000000000..df8e7d4904814
--- /dev/null
+++ b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitReadKeyResult.java
@@ -0,0 +1,6 @@
+package io.quarkus.vault.runtime.client.dto.transit;
+
+import io.quarkus.vault.runtime.client.dto.AbstractVaultDTO;
+
+public class VaultTransitReadKeyResult extends AbstractVaultDTO<VaultTransitReadKeyData, Object> {
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBatchInput.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBatchInput.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBatchInput.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBatchInput.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitRewrapBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSign.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSign.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSign.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSign.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBatchInput.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBatchInput.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBatchInput.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBatchInput.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignDataBatchResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignDataBatchResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignDataBatchResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitSignDataBatchResult.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerify.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerify.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerify.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerify.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBatchInput.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBatchInput.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBatchInput.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBatchInput.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBody.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBody.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBody.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyBody.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyData.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyData.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyData.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyData.java
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyDataBatchResult.java b/extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyDataBatchResult.java
similarity index 100%
rename from extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyDataBatchResult.java
rename to extensions/vault/model/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitVerifyDataBatchResult.java
diff --git a/extensions/vault/pom.xml b/extensions/vault/pom.xml
index 2e0fde4b1b040..2afd7d5acecdc 100644
--- a/extensions/vault/pom.xml
+++ b/extensions/vault/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,6 +16,7 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
+        <module>model</module>
     </modules>
 
 </project>
diff --git a/extensions/vault/runtime/pom.xml b/extensions/vault/runtime/pom.xml
index 252bd333149be..64ec71dddf15e 100644
--- a/extensions/vault/runtime/pom.xml
+++ b/extensions/vault/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vault-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,18 +18,26 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jackson</artifactId>
+            <artifactId>quarkus-mutiny</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus.arc</groupId>
             <artifactId>arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vault-model</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-credentials</artifactId>
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultKVSecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultKVSecretEngine.java
index 36e2c3571c62b..f95a6b3bb1c04 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultKVSecretEngine.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultKVSecretEngine.java
@@ -1,14 +1,15 @@
 package io.quarkus.vault;
 
+import java.util.List;
 import java.util.Map;
 
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 
 /**
  * This service provides access to the kv secret engine, taking care of authentication,
  * and token extension or renewal, according to ttl and max-ttl.
  *
- * @see VaultRuntimeConfig
+ * @see VaultBootstrapConfig
  */
 public interface VaultKVSecretEngine {
 
@@ -23,7 +24,7 @@ public interface VaultKVSecretEngine {
     /**
      * Writes the secret at the given path. If the path does not exist, the secret will
      * be created. If not the new secret will be merged with the existing one.
-     * 
+     *
      * @param path in Vault, without the kv engine mount path
      * @param secret to write at path
      */
@@ -32,9 +33,17 @@ public interface VaultKVSecretEngine {
     /**
      * Deletes the secret at the given path. It has no effect if no secret is currently
      * stored at path.
-     * 
+     *
      * @param path to delete
      */
     void deleteSecret(String path);
 
+    /**
+     * List all paths under the specified path.
+     *
+     * @param path to list
+     * @return list of subpaths
+     */
+    List<String> listSecrets(String path);
+
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultSystemBackendEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultSystemBackendEngine.java
index eb394989d6dd2..c625500cadb6d 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultSystemBackendEngine.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultSystemBackendEngine.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 import io.quarkus.vault.sys.VaultHealth;
 import io.quarkus.vault.sys.VaultHealthStatus;
 import io.quarkus.vault.sys.VaultInit;
@@ -11,7 +11,7 @@
 /**
  * This service provides access to the system backend.
  *
- * @see VaultRuntimeConfig
+ * @see VaultBootstrapConfig
  */
 public interface VaultSystemBackendEngine {
 
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitExportKeyType.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitExportKeyType.java
new file mode 100644
index 0000000000000..c500d2be003ed
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitExportKeyType.java
@@ -0,0 +1,10 @@
+package io.quarkus.vault;
+
+/**
+ * key type used in transit key export
+ */
+public enum VaultTransitExportKeyType {
+    encryption,
+    signing,
+    hmac
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitKeyDetail.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitKeyDetail.java
new file mode 100644
index 0000000000000..a995d2c314812
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitKeyDetail.java
@@ -0,0 +1,137 @@
+package io.quarkus.vault;
+
+import java.util.Map;
+
+public class VaultTransitKeyDetail {
+
+    private String name;
+    private String detail;
+    private boolean deletionAllowed;
+    private boolean derived;
+    private boolean exportable;
+    private boolean allowPlaintextBackup;
+    private Map<String, Integer> keys;
+    private int minDecryptionVersion;
+    private int minEncryptionVersion;
+    private boolean supportsEncryption;
+    private boolean supportsDecryption;
+    private boolean supportsDerivation;
+    private boolean supportsSigning;
+
+    public String getName() {
+        return name;
+    }
+
+    public VaultTransitKeyDetail setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public VaultTransitKeyDetail setDetail(String detail) {
+        this.detail = detail;
+        return this;
+    }
+
+    public boolean isDeletionAllowed() {
+        return deletionAllowed;
+    }
+
+    public VaultTransitKeyDetail setDeletionAllowed(boolean deletionAllowed) {
+        this.deletionAllowed = deletionAllowed;
+        return this;
+    }
+
+    public boolean isDerived() {
+        return derived;
+    }
+
+    public VaultTransitKeyDetail setDerived(boolean derived) {
+        this.derived = derived;
+        return this;
+    }
+
+    public boolean isExportable() {
+        return exportable;
+    }
+
+    public VaultTransitKeyDetail setExportable(boolean exportable) {
+        this.exportable = exportable;
+        return this;
+    }
+
+    public boolean isAllowPlaintextBackup() {
+        return allowPlaintextBackup;
+    }
+
+    public VaultTransitKeyDetail setAllowPlaintextBackup(boolean allowPlaintextBackup) {
+        this.allowPlaintextBackup = allowPlaintextBackup;
+        return this;
+    }
+
+    public Map<String, Integer> getKeys() {
+        return keys;
+    }
+
+    public VaultTransitKeyDetail setKeys(Map<String, Integer> keys) {
+        this.keys = keys;
+        return this;
+    }
+
+    public int getMinDecryptionVersion() {
+        return minDecryptionVersion;
+    }
+
+    public VaultTransitKeyDetail setMinDecryptionVersion(int minDecryptionVersion) {
+        this.minDecryptionVersion = minDecryptionVersion;
+        return this;
+    }
+
+    public int getMinEncryptionVersion() {
+        return minEncryptionVersion;
+    }
+
+    public VaultTransitKeyDetail setMinEncryptionVersion(int minEncryptionVersion) {
+        this.minEncryptionVersion = minEncryptionVersion;
+        return this;
+    }
+
+    public boolean isSupportsEncryption() {
+        return supportsEncryption;
+    }
+
+    public VaultTransitKeyDetail setSupportsEncryption(boolean supportsEncryption) {
+        this.supportsEncryption = supportsEncryption;
+        return this;
+    }
+
+    public boolean isSupportsDecryption() {
+        return supportsDecryption;
+    }
+
+    public VaultTransitKeyDetail setSupportsDecryption(boolean supportsDecryption) {
+        this.supportsDecryption = supportsDecryption;
+        return this;
+    }
+
+    public boolean isSupportsDerivation() {
+        return supportsDerivation;
+    }
+
+    public VaultTransitKeyDetail setSupportsDerivation(boolean supportsDerivation) {
+        this.supportsDerivation = supportsDerivation;
+        return this;
+    }
+
+    public boolean isSupportsSigning() {
+        return supportsSigning;
+    }
+
+    public VaultTransitKeyDetail setSupportsSigning(boolean supportsSigning) {
+        this.supportsSigning = supportsSigning;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitSecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitSecretEngine.java
index 2ed185e4bbd4f..9312af1b967e0 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitSecretEngine.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/VaultTransitSecretEngine.java
@@ -6,6 +6,8 @@
 import io.quarkus.vault.transit.ClearData;
 import io.quarkus.vault.transit.DecryptionRequest;
 import io.quarkus.vault.transit.EncryptionRequest;
+import io.quarkus.vault.transit.KeyConfigRequestDetail;
+import io.quarkus.vault.transit.KeyCreationRequestDetail;
 import io.quarkus.vault.transit.RewrappingRequest;
 import io.quarkus.vault.transit.SigningInput;
 import io.quarkus.vault.transit.SigningRequest;
@@ -14,12 +16,13 @@
 import io.quarkus.vault.transit.VaultEncryptionBatchException;
 import io.quarkus.vault.transit.VaultRewrappingBatchException;
 import io.quarkus.vault.transit.VaultSigningBatchException;
+import io.quarkus.vault.transit.VaultTransitKeyExportDetail;
 import io.quarkus.vault.transit.VaultVerificationBatchException;
 import io.quarkus.vault.transit.VerificationRequest;
 
 /**
  * A service that interacts with Hashicorp's Vault Transit secret engine to encrypt, decrypt and sign arbitrary data.
- * 
+ *
  * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#transit-secrets-engine">Transit Secrets Engine</a>
  */
 public interface VaultTransitSecretEngine {
@@ -30,11 +33,11 @@ public interface VaultTransitSecretEngine {
      * {@code encrypt(keyName, ClearData.from(clearData), null);}
      * <p>
      * This method is usually used in conjunction with {@link #decrypt(String, String)}
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#encrypt-data">encrypt data</a>
+     *
      * @param keyName the key to encrypt the data with
      * @param clearData the string to encrypt
      * @return cipher text
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#encrypt-data">encrypt data</a>
      */
     String encrypt(String keyName, String clearData);
 
@@ -43,12 +46,12 @@ public interface VaultTransitSecretEngine {
      * If the key does not exist, and the policy specifies a create capability the key will be lazily created
      * (i.e. upsert). The key can be further customized by specifying transit encryption-key configuration
      * properties.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#encrypt-data">encrypt data</a>
+     *
      * @param keyName the key to encrypt the data with
      * @param clearData the data to encrypt
      * @param transitContext optional transit context used for key derivation
      * @return cipher text
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#encrypt-data">encrypt data</a>
      */
     String encrypt(String keyName, ClearData clearData, TransitContext transitContext);
 
@@ -57,33 +60,33 @@ public interface VaultTransitSecretEngine {
      * Each element shall specify the data to encrypt, an optional key version
      * and an optional transit context, used for key derivation if applicable.
      * If any error occurs, the service will throw a {@link VaultEncryptionBatchException}
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#encrypt-data">encrypt data</a>
+     *
      * @param keyName the key to encrypt the data with
      * @param requests the list of elements to encrypt
      * @return a map of each request and its corresponding cipher text
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#encrypt-data">encrypt data</a>
      */
     Map<EncryptionRequest, String> encrypt(String keyName, List<EncryptionRequest> requests);
 
     /**
      * Decrypt the encrypted data with the specified key, and return unencrypted data.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#decrypt-data">decrypt data</a>
+     *
      * @param keyName the key that was used to encrypt the original data
      * @param ciphertext the encrypted data
      * @return the unencrypted data
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#decrypt-data">decrypt data</a>
      */
     ClearData decrypt(String keyName, String ciphertext);
 
     /**
      * Decrypt the encrypted data with the specified key and a transit context used for key derivation.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#decrypt-data">decrypt data</a>
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#derived">create key derived attribute</a>
+     *
      * @param keyName the key that was used to encrypt the original data
      * @param ciphertext data to decrypt
      * @param transitContext optional transit context used for key derivation
      * @return the unencrypted data
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#decrypt-data">decrypt data</a>
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#derived">create key derived attribute</a>
      */
     ClearData decrypt(String keyName, String ciphertext, TransitContext transitContext);
 
@@ -91,38 +94,38 @@ public interface VaultTransitSecretEngine {
      * Decrypt a list of encrypted data items. Each item shall specify the encrypted data plus an optional transit
      * context used for key derivation (if applicable).
      * If any error occurs, the service will throw a {@link VaultDecryptionBatchException}
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#decrypt-data">decrypt data</a>
+     *
      * @param keyName the key that was used to encrypt the original data
      * @param requests the list of encrypted data items
      * @return a map of each request with its corresponding decrypted data item
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#decrypt-data">decrypt data</a>
      */
     Map<DecryptionRequest, ClearData> decrypt(String keyName, List<DecryptionRequest> requests);
 
     /**
      * Reencrypt into a new cipher text a cipher text that was obtained from encryption using an old key version
      * with the last key version
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#rewrap-data">rewrap data</a>
-     * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#working-set-management">working set
-     *      management</a>
+     *
      * @param keyName the encryption key that was used for the previous encryption
      * @param ciphertext the old cipher text that needs rewrapping
      * @return the reencrypted cipher text with last key version as a new cipher text
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#rewrap-data">rewrap data</a>
+     * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#working-set-management">working set
+     *      management</a>
      */
     String rewrap(String keyName, String ciphertext);
 
     /**
      * Reencrypt into a new cipher text a cipher text that was obtained from encryption using an old key version
      * with the last key version and an optional transit context used for key derivation
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#rewrap-data">rewrap data</a>
-     * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#working-set-management">working set
-     *      management</a>
+     *
      * @param keyName the encryption key that was used for the previous encryption
      * @param ciphertext the old cipher text that needs rewrapping
      * @param transitContext optional transit context used for key derivation
      * @return the reencrypted cipher text with last key version as a new cipher text
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#rewrap-data">rewrap data</a>
+     * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#working-set-management">working set
+     *      management</a>
      */
     String rewrap(String keyName, String ciphertext, TransitContext transitContext);
 
@@ -131,34 +134,34 @@ public interface VaultTransitSecretEngine {
      * Each item shall specify a cipher text to reencrypt, an optional key version, and an optional transit context
      * used for key derivation, if applicable.
      * If any error occurs, the service will throw a {@link VaultRewrappingBatchException}
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#rewrap-data">rewrap data</a>
-     * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#working-set-management">working set
-     *      management</a>
+     *
      * @param keyName the encryption key that was used for the previous encryptions
      * @param requests the list of items to reencrypt
      * @return a map of each request with its corresponding reencrypted data item
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#rewrap-data">rewrap data</a>
+     * @see <a href="https://www.vaultproject.io/docs/secrets/transit/index.html#working-set-management">working set
+     *      management</a>
      */
     Map<RewrappingRequest, String> rewrap(String keyName, List<RewrappingRequest> requests);
 
     /**
      * Sign an input string with the specified key.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#sign-data">sign data</a>
+     *
      * @param keyName the signing key to use
      * @param input String to sign
      * @return the signature
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#sign-data">sign data</a>
      */
     String sign(String keyName, String input);
 
     /**
      * Sign the input with the specified key and an optional transit context used for key derivation, if applicable.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#sign-data">sign data</a>
+     *
      * @param keyName the signing key to use
      * @param input data to sign
      * @param transitContext optional transit context used for key derivation
      * @return the signature
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#sign-data">sign data</a>
      */
     String sign(String keyName, SigningInput input, TransitContext transitContext);
 
@@ -166,34 +169,34 @@ public interface VaultTransitSecretEngine {
      * Sign a list of inputs items. Each item shall specify the input to sign, an optional key version, and
      * an optional transit context used for ky derivation, if applicable.
      * If any error occurs, the service will throw a {@link VaultSigningBatchException}
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#sign-data">sign data</a>
+     *
      * @param keyName the signing key to use
      * @param requests the list of inputs to sign
      * @return a map of each request with its corresponding signature item
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#sign-data">sign data</a>
      */
     Map<SigningRequest, String> sign(String keyName, List<SigningRequest> requests);
 
     /**
      * Checks that the signature was obtained from signing the input with the specified key.
      * The service will throw a {@link VaultException} if this is not the case.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#verify-signed-data">verify signed data</a>
+     *
      * @param keyName the key that was used to sign the input
      * @param signature the signature obtained from one of the sign methods
      * @param input the original input data
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#verify-signed-data">verify signed data</a>
      */
     void verifySignature(String keyName, String signature, String input);
 
     /**
      * Checks that the signature was obtained from signing the input with the specified key.
      * The service will throw a {@link VaultException} if this is not the case.
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#verify-signed-data">verify signed data</a>
+     *
      * @param keyName the key that was used to sign the input
      * @param signature the signature obtained from one of the sign methods
      * @param input the original input data
      * @param transitContext optional transit context used for key derivation
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#verify-signed-data">verify signed data</a>
      */
     void verifySignature(String keyName, String signature, SigningInput input, TransitContext transitContext);
 
@@ -202,11 +205,67 @@ public interface VaultTransitSecretEngine {
      * against, and an optional transit context used for key derivation, if applicable.
      * If the signature does not match, or if any other error occurs,
      * the service will throw a {@link VaultVerificationBatchException}
-     * 
-     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#verify-signed-data">verify signed data</a>
+     *
      * @param keyName the key that was used to sign the input
      * @param requests a list of items specifying an input and a signature to match against
+     * @see <a href="https://www.vaultproject.io/api/secret/transit/index.html#verify-signed-data">verify signed data</a>
      */
     void verifySignature(String keyName, List<VerificationRequest> requests);
 
+    // --- admin operations
+
+    /**
+     * Create a new Transit key.
+     * 
+     * @param keyName key name
+     * @param detail key creation detail or null
+     * @see <a href="https://www.vaultproject.io/api-docs/secret/transit#create-key">create key</a>
+     */
+    void createKey(String keyName, KeyCreationRequestDetail detail);
+
+    /**
+     * Update the configuration of a Transit key. The key must exist.
+     * 
+     * @param keyName key name
+     * @param detail key configuration detail
+     * @see <a href="https://www.vaultproject.io/api-docs/secret/transit#update-key-configuration">update key configuration</a>
+     */
+    void updateKeyConfiguration(String keyName, KeyConfigRequestDetail detail);
+
+    /**
+     * Delete a Transit key. Key must have been configured with deletion allowed. The key must exist.
+     * 
+     * @param keyName key name
+     * @see <a href="https://www.vaultproject.io/api-docs/secret/transit#delete-key">delete key</a>
+     */
+    void deleteKey(String keyName);
+
+    /**
+     * Export a Transit Key. Key must have made exportable through creation or configuration update.
+     * The key must exist.
+     * 
+     * @param keyName name of the key
+     * @param keyType key type
+     * @param keyVersion null, "latest" or a valid version number as a String. If null all versions will be returned
+     * @return All specified key versions
+     * @see <a href="https://www.vaultproject.io/api-docs/secret/transit#export-key">export key</a>
+     */
+    VaultTransitKeyExportDetail exportKey(String keyName, VaultTransitExportKeyType keyType, String keyVersion);
+
+    /**
+     * Read the configuration of a Transit key.
+     * 
+     * @param keyName key name
+     * @return key detail, or null if the key does not exist
+     * @see <a href="https://www.vaultproject.io/api-docs/secret/transit#read-key">read key</a>
+     */
+    VaultTransitKeyDetail readKey(String keyName);
+
+    /**
+     * List all Transit keys.
+     *
+     * @return key names
+     * @see <a href="https://www.vaultproject.io/api-docs/secret/transit#list-keys">list keys</a>
+     */
+    List<String> listKeys();
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultAuthManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultAuthManager.java
index 9babebce0ecba..97f73aaa79af3 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultAuthManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultAuthManager.java
@@ -17,11 +17,17 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
+import javax.inject.Singleton;
+
 import org.jboss.logging.Logger;
 
 import io.quarkus.vault.VaultException;
-import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalAppRoleAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalKubernetesAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalTokenAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalUserpassAuthMethod;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.auth.AbstractVaultAuthAuth;
 import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleGenerateNewSecretID;
 import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthAuth;
@@ -30,40 +36,58 @@
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV1;
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2;
 import io.quarkus.vault.runtime.config.VaultAuthenticationType;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 
 /**
  * Handles authentication. Supports revocation and renewal.
  */
+@Singleton
 public class VaultAuthManager {
 
     private static final Logger log = Logger.getLogger(VaultAuthManager.class.getName());
+
     public static final String USERPASS_WRAPPING_TOKEN_PASSWORD_KEY = "password";
 
-    private VaultRuntimeConfig serverConfig;
-    private VaultClient vaultClient;
     private AtomicReference<VaultToken> loginCache = new AtomicReference<>(null);
     private Map<String, String> wrappedCache = new ConcurrentHashMap<>();
     private Semaphore unwrapSem = new Semaphore(1);
+    private VaultConfigHolder vaultConfigHolder;
+    private VaultInternalSystemBackend vaultInternalSystemBackend;
+    private VaultInternalAppRoleAuthMethod vaultInternalAppRoleAuthMethod;
+    private VaultInternalKubernetesAuthMethod vaultInternalKubernetesAuthMethod;
+    private VaultInternalUserpassAuthMethod vaultInternalUserpassAuthMethod;
+    private VaultInternalTokenAuthMethod vaultInternalTokenAuthMethod;
+
+    VaultAuthManager(VaultConfigHolder vaultConfigHolder, VaultInternalSystemBackend vaultInternalSystemBackend,
+            VaultInternalAppRoleAuthMethod vaultInternalAppRoleAuthMethod,
+            VaultInternalKubernetesAuthMethod vaultInternalKubernetesAuthMethod,
+            VaultInternalUserpassAuthMethod vaultInternalUserpassAuthMethod,
+            VaultInternalTokenAuthMethod vaultInternalTokenAuthMethod) {
+        this.vaultConfigHolder = vaultConfigHolder;
+        this.vaultInternalSystemBackend = vaultInternalSystemBackend;
+        this.vaultInternalAppRoleAuthMethod = vaultInternalAppRoleAuthMethod;
+        this.vaultInternalKubernetesAuthMethod = vaultInternalKubernetesAuthMethod;
+        this.vaultInternalUserpassAuthMethod = vaultInternalUserpassAuthMethod;
+        this.vaultInternalTokenAuthMethod = vaultInternalTokenAuthMethod;
+    }
 
-    public VaultAuthManager(VaultClient vaultClient, VaultRuntimeConfig serverConfig) {
-        this.vaultClient = vaultClient;
-        this.serverConfig = serverConfig;
+    private VaultBootstrapConfig getConfig() {
+        return vaultConfigHolder.getVaultBootstrapConfig();
     }
 
     public String getClientToken() {
-        return serverConfig.authentication.isDirectClientToken() ? getDirectClientToken() : login().clientToken;
+        return getConfig().authentication.isDirectClientToken() ? getDirectClientToken() : login().clientToken;
     }
 
     private String getDirectClientToken() {
 
-        Optional<String> clientTokenOption = serverConfig.authentication.clientToken;
+        Optional<String> clientTokenOption = getConfig().authentication.clientToken;
         if (clientTokenOption.isPresent()) {
             return clientTokenOption.get();
         }
 
         return unwrapWrappingTokenOnce("client token",
-                serverConfig.authentication.clientTokenWrappingToken.get(), unwrap -> unwrap.auth.clientToken,
+                getConfig().authentication.clientTokenWrappingToken.get(), unwrap -> unwrap.auth.clientToken,
                 VaultTokenCreate.class);
     }
 
@@ -83,12 +107,12 @@ public VaultToken login(VaultToken currentVaultToken) {
         }
 
         // extend clientToken if necessary
-        if (vaultToken != null && vaultToken.shouldExtend(serverConfig.renewGracePeriod)) {
+        if (vaultToken != null && vaultToken.shouldExtend(getConfig().renewGracePeriod)) {
             vaultToken = extend(vaultToken.clientToken);
         }
 
         // create new clientToken if necessary
-        if (vaultToken == null || vaultToken.isExpired() || vaultToken.expiresSoon(serverConfig.renewGracePeriod)) {
+        if (vaultToken == null || vaultToken.isExpired() || vaultToken.expiresSoon(getConfig().renewGracePeriod)) {
             vaultToken = vaultLogin();
         }
 
@@ -97,7 +121,7 @@ public VaultToken login(VaultToken currentVaultToken) {
 
     private VaultToken validate(VaultToken vaultToken) {
         try {
-            vaultClient.lookupSelf(vaultToken.clientToken);
+            vaultInternalTokenAuthMethod.lookupSelf(vaultToken.clientToken);
             return vaultToken;
         } catch (VaultClientException e) {
             if (e.getStatus() == 403) { // forbidden
@@ -110,17 +134,18 @@ private VaultToken validate(VaultToken vaultToken) {
     }
 
     private VaultToken extend(String clientToken) {
-        VaultRenewSelfAuth auth = vaultClient.renewSelf(clientToken, null).auth;
+        VaultRenewSelfAuth auth = vaultInternalTokenAuthMethod.renewSelf(clientToken, null).auth;
         VaultToken vaultToken = new VaultToken(auth.clientToken, auth.renewable, auth.leaseDurationSecs);
         sanityCheck(vaultToken);
-        log.debug("extended login token: " + vaultToken.getConfidentialInfo(serverConfig.logConfidentialityLevel));
+        log.debug("extended login token: " + vaultToken.getConfidentialInfo(getConfig().logConfidentialityLevel));
         return vaultToken;
     }
 
     private VaultToken vaultLogin() {
-        VaultToken vaultToken = login(serverConfig.getAuthenticationType());
+        VaultToken vaultToken = login(getConfig().getAuthenticationType());
         sanityCheck(vaultToken);
-        log.debug("created new login token: " + vaultToken.getConfidentialInfo(serverConfig.logConfidentialityLevel));
+        log.debug(
+                "created new login token: " + vaultToken.getConfidentialInfo(getConfig().logConfidentialityLevel));
         return vaultToken;
     }
 
@@ -129,15 +154,15 @@ private VaultToken login(VaultAuthenticationType type) {
         if (type == KUBERNETES) {
             auth = loginKubernetes();
         } else if (type == USERPASS) {
-            String username = serverConfig.authentication.userpass.username.get();
+            String username = getConfig().authentication.userpass.username.get();
             String password = getPassword();
-            auth = vaultClient.loginUserPass(username, password).auth;
+            auth = vaultInternalUserpassAuthMethod.login(username, password).auth;
         } else if (type == APPROLE) {
-            String roleId = serverConfig.authentication.appRole.roleId.get();
+            String roleId = getConfig().authentication.appRole.roleId.get();
             String secretId = getSecretId();
-            auth = vaultClient.loginAppRole(roleId, secretId).auth;
+            auth = vaultInternalAppRoleAuthMethod.login(roleId, secretId).auth;
         } else {
-            throw new UnsupportedOperationException("unknown authType " + serverConfig.getAuthenticationType());
+            throw new UnsupportedOperationException("unknown authType " + getConfig().getAuthenticationType());
         }
 
         return new VaultToken(auth.clientToken, auth.renewable, auth.leaseDurationSecs);
@@ -145,25 +170,25 @@ private VaultToken login(VaultAuthenticationType type) {
 
     private String getSecretId() {
 
-        Optional<String> secretIdOption = serverConfig.authentication.appRole.secretId;
+        Optional<String> secretIdOption = getConfig().authentication.appRole.secretId;
         if (secretIdOption.isPresent()) {
             return secretIdOption.get();
         }
 
         return unwrapWrappingTokenOnce("secret id",
-                serverConfig.authentication.appRole.secretIdWrappingToken.get(), unwrap -> unwrap.data.secretId,
+                getConfig().authentication.appRole.secretIdWrappingToken.get(), unwrap -> unwrap.data.secretId,
                 VaultAppRoleGenerateNewSecretID.class);
     }
 
     private String getPassword() {
 
-        Optional<String> passwordOption = serverConfig.authentication.userpass.password;
+        Optional<String> passwordOption = getConfig().authentication.userpass.password;
         if (passwordOption.isPresent()) {
             return passwordOption.get();
         }
 
-        String wrappingToken = serverConfig.authentication.userpass.passwordWrappingToken.get();
-        if (serverConfig.kvSecretEngineVersion == 1) {
+        String wrappingToken = getConfig().authentication.userpass.passwordWrappingToken.get();
+        if (getConfig().kvSecretEngineVersion == 1) {
             Function<VaultKvSecretV1, String> f = unwrap -> unwrap.data.get(USERPASS_WRAPPING_TOKEN_PASSWORD_KEY);
             return unwrapWrappingTokenOnce("password", wrappingToken, f, VaultKvSecretV1.class);
         } else {
@@ -196,7 +221,7 @@ private <T> String unwrapWrappingTokenOnce(String type, String wrappingToken,
                 T unwrap;
 
                 try {
-                    unwrap = vaultClient.unwrap(wrappingToken, clazz);
+                    unwrap = vaultInternalSystemBackend.unwrap(wrappingToken, clazz);
                 } catch (VaultClientException e) {
                     if (e.getStatus() == 400) {
                         String message = "wrapping token is not valid or does not exist; " +
@@ -212,7 +237,7 @@ private <T> String unwrapWrappingTokenOnce(String type, String wrappingToken,
 
                 wrappedValue = f.apply(unwrap);
                 wrappedCache.put(wrappingToken, wrappedValue);
-                String displayValue = serverConfig.logConfidentialityLevel.maskWithTolerance(wrappedValue, LOW);
+                String displayValue = getConfig().logConfidentialityLevel.maskWithTolerance(wrappedValue, LOW);
                 log.debug("unwrapped " + type + ": " + displayValue);
                 return wrappedValue;
 
@@ -225,10 +250,10 @@ private <T> String unwrapWrappingTokenOnce(String type, String wrappingToken,
     }
 
     private VaultKubernetesAuthAuth loginKubernetes() {
-        String jwt = new String(read(serverConfig.authentication.kubernetes.jwtTokenPath), StandardCharsets.UTF_8);
-        log.debug("authenticate with jwt at: " + serverConfig.authentication.kubernetes.jwtTokenPath + " => "
-                + serverConfig.logConfidentialityLevel.maskWithTolerance(jwt, LOW));
-        return vaultClient.loginKubernetes(serverConfig.authentication.kubernetes.role.get(), jwt).auth;
+        String jwt = new String(read(getConfig().authentication.kubernetes.jwtTokenPath), StandardCharsets.UTF_8);
+        log.debug("authenticate with jwt at: " + getConfig().authentication.kubernetes.jwtTokenPath + " => "
+                + getConfig().logConfidentialityLevel.maskWithTolerance(jwt, LOW));
+        return vaultInternalKubernetesAuthMethod.login(getConfig().authentication.kubernetes.role.get(), jwt).auth;
     }
 
     private byte[] read(String path) {
@@ -240,7 +265,7 @@ private byte[] read(String path) {
     }
 
     private void sanityCheck(VaultToken vaultToken) {
-        vaultToken.leaseDurationSanityCheck("auth", serverConfig.renewGracePeriod);
+        vaultToken.leaseDurationSanityCheck("auth", getConfig().renewGracePeriod);
     }
 
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultConfigHolder.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultConfigHolder.java
new file mode 100644
index 0000000000000..2c92811f939c6
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultConfigHolder.java
@@ -0,0 +1,20 @@
+package io.quarkus.vault.runtime;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
+
+@Singleton
+public class VaultConfigHolder {
+
+    private VaultBootstrapConfig vaultBootstrapConfig;
+
+    public VaultBootstrapConfig getVaultBootstrapConfig() {
+        return vaultBootstrapConfig;
+    }
+
+    public VaultConfigHolder setVaultBootstrapConfig(VaultBootstrapConfig vaultBootstrapConfig) {
+        this.vaultBootstrapConfig = vaultBootstrapConfig;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultCredentialsProvider.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultCredentialsProvider.java
index 29cdbbdcf5ded..cf6d6212b7ad1 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultCredentialsProvider.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultCredentialsProvider.java
@@ -3,28 +3,31 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import io.quarkus.credentials.CredentialsProvider;
 import io.quarkus.vault.VaultException;
+import io.quarkus.vault.VaultKVSecretEngine;
 import io.quarkus.vault.runtime.config.CredentialsProviderConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 
+@ApplicationScoped
+@Named("vault-credentials-provider")
 public class VaultCredentialsProvider implements CredentialsProvider {
 
-    private VaultKvManager vaultKvManager;
+    @Inject
+    private VaultKVSecretEngine vaultKVSecretEngine;
+    @Inject
     private VaultDbManager vaultDbManager;
-    private VaultRuntimeConfig serverConfig;
-
-    public VaultCredentialsProvider(VaultRuntimeConfig serverConfig, VaultKvManager vaultKvManager,
-            VaultDbManager vaultDbManager) {
-        this.serverConfig = serverConfig;
-        this.vaultKvManager = vaultKvManager;
-        this.vaultDbManager = vaultDbManager;
-    }
+    @Inject
+    private VaultConfigHolder vaultConfigHolder;
 
     @Override
     public Map<String, String> getCredentials(String credentialsProviderName) {
 
-        CredentialsProviderConfig config = serverConfig.credentialsProvider.get(credentialsProviderName);
+        CredentialsProviderConfig config = getConfig().credentialsProvider.get(credentialsProviderName);
 
         if (config == null) {
             throw new VaultException("unknown credentials provider with name " + credentialsProviderName);
@@ -35,7 +38,7 @@ public Map<String, String> getCredentials(String credentialsProviderName) {
         }
 
         if (config.kvPath.isPresent()) {
-            String password = vaultKvManager.readSecret(config.kvPath.get()).get(config.kvKey);
+            String password = vaultKVSecretEngine.readSecret(config.kvPath.get()).get(config.kvKey);
             Map<String, String> result = new HashMap<>();
             result.put(PASSWORD_PROPERTY_NAME, password);
             return result;
@@ -43,7 +46,9 @@ public Map<String, String> getCredentials(String credentialsProviderName) {
 
         throw new VaultException(
                 "one of database-credentials-role or kv-path is required on credentials provider " + credentialsProviderName);
-
     }
 
+    private VaultBootstrapConfig getConfig() {
+        return vaultConfigHolder.getVaultBootstrapConfig();
+    }
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultDbManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultDbManager.java
index 95de9d98e7c35..adf3e6b274c14 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultDbManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultDbManager.java
@@ -7,27 +7,39 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.inject.Singleton;
+
 import org.jboss.logging.Logger;
 
-import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentials;
 import io.quarkus.vault.runtime.client.dto.sys.VaultRenewLease;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalDatabaseSecretEngine;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 
+@Singleton
 public class VaultDbManager {
 
     private static final Logger log = Logger.getLogger(VaultDbManager.class.getName());
 
     ConcurrentHashMap<String, VaultDynamicDatabaseCredentials> credentialsCache = new ConcurrentHashMap<>();
     private VaultAuthManager vaultAuthManager;
-    private VaultClient vaultClient;
-    private VaultRuntimeConfig serverConfig;
-
-    public VaultDbManager(VaultAuthManager vaultAuthManager, VaultClient vaultClient, VaultRuntimeConfig serverConfig) {
+    private VaultConfigHolder vaultConfigHolder;
+    private VaultInternalSystemBackend vaultInternalSystemBackend;
+    private VaultInternalDatabaseSecretEngine vaultInternalDatabaseSecretEngine;
+
+    public VaultDbManager(VaultConfigHolder vaultConfigHolder, VaultAuthManager vaultAuthManager,
+            VaultInternalSystemBackend vaultInternalSystemBackend,
+            VaultInternalDatabaseSecretEngine vaultInternalDatabaseSecretEngine) {
+        this.vaultConfigHolder = vaultConfigHolder;
         this.vaultAuthManager = vaultAuthManager;
-        this.vaultClient = vaultClient;
-        this.serverConfig = serverConfig;
+        this.vaultInternalSystemBackend = vaultInternalSystemBackend;
+        this.vaultInternalDatabaseSecretEngine = vaultInternalDatabaseSecretEngine;
+    }
+
+    private VaultBootstrapConfig getConfig() {
+        return vaultConfigHolder.getVaultBootstrapConfig();
     }
 
     public Map<String, String> getDynamicDbCredentials(String databaseCredentialsRole) {
@@ -53,12 +65,13 @@ public VaultDynamicDatabaseCredentials getCredentials(VaultDynamicDatabaseCreden
         }
 
         // extend lease if necessary
-        if (credentials != null && credentials.shouldExtend(serverConfig.renewGracePeriod)) {
+        if (credentials != null && credentials.shouldExtend(getConfig().renewGracePeriod)) {
             credentials = extend(credentials, clientToken, databaseCredentialsRole);
         }
 
         // create lease if necessary
-        if (credentials == null || credentials.isExpired() || credentials.expiresSoon(serverConfig.renewGracePeriod)) {
+        if (credentials == null || credentials.isExpired()
+                || credentials.expiresSoon(getConfig().renewGracePeriod)) {
             credentials = create(clientToken, databaseCredentialsRole);
         }
 
@@ -67,7 +80,7 @@ public VaultDynamicDatabaseCredentials getCredentials(VaultDynamicDatabaseCreden
 
     private VaultDynamicDatabaseCredentials validate(VaultDynamicDatabaseCredentials credentials, String clientToken) {
         try {
-            vaultClient.lookupLease(clientToken, credentials.leaseId);
+            vaultInternalSystemBackend.lookupLease(clientToken, credentials.leaseId);
             return credentials;
         } catch (VaultClientException e) {
             if (e.getStatus() == 400) { // bad request
@@ -81,18 +94,18 @@ private VaultDynamicDatabaseCredentials validate(VaultDynamicDatabaseCredentials
 
     private VaultDynamicDatabaseCredentials extend(VaultDynamicDatabaseCredentials currentCredentials, String clientToken,
             String databaseCredentialsRole) {
-        VaultRenewLease vaultRenewLease = vaultClient.renewLease(clientToken, currentCredentials.leaseId);
+        VaultRenewLease vaultRenewLease = vaultInternalSystemBackend.renewLease(clientToken, currentCredentials.leaseId);
         LeaseBase lease = new LeaseBase(vaultRenewLease.leaseId, vaultRenewLease.renewable, vaultRenewLease.leaseDurationSecs);
         VaultDynamicDatabaseCredentials credentials = new VaultDynamicDatabaseCredentials(lease, currentCredentials.username,
                 currentCredentials.password);
         sanityCheck(credentials, databaseCredentialsRole);
         log.debug("extended " + databaseCredentialsRole + " credentials with: "
-                + credentials.getConfidentialInfo(serverConfig.logConfidentialityLevel));
+                + credentials.getConfidentialInfo(getConfig().logConfidentialityLevel));
         return credentials;
     }
 
     private VaultDynamicDatabaseCredentials create(String clientToken, String databaseCredentialsRole) {
-        VaultDatabaseCredentials vaultDatabaseCredentials = vaultClient.generateDatabaseCredentials(clientToken,
+        VaultDatabaseCredentials vaultDatabaseCredentials = vaultInternalDatabaseSecretEngine.generateCredentials(clientToken,
                 databaseCredentialsRole);
         LeaseBase lease = new LeaseBase(vaultDatabaseCredentials.leaseId, vaultDatabaseCredentials.renewable,
                 vaultDatabaseCredentials.leaseDurationSecs);
@@ -100,13 +113,12 @@ private VaultDynamicDatabaseCredentials create(String clientToken, String databa
                 vaultDatabaseCredentials.data.username,
                 vaultDatabaseCredentials.data.password);
         log.debug("generated " + databaseCredentialsRole + " credentials: "
-                + credentials.getConfidentialInfo(serverConfig.logConfidentialityLevel));
+                + credentials.getConfidentialInfo(getConfig().logConfidentialityLevel));
         sanityCheck(credentials, databaseCredentialsRole);
         return credentials;
     }
 
     private void sanityCheck(VaultDynamicDatabaseCredentials credentials, String databaseCredentialsRole) {
-        credentials.leaseDurationSanityCheck(databaseCredentialsRole, serverConfig.renewGracePeriod);
+        credentials.leaseDurationSanityCheck(databaseCredentialsRole, getConfig().renewGracePeriod);
     }
-
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKubernetesAuthManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKubernetesAuthManager.java
index 895983ee69d8a..7e5a280eb0c54 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKubernetesAuthManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKubernetesAuthManager.java
@@ -3,28 +3,29 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import io.quarkus.vault.VaultKubernetesAuthService;
 import io.quarkus.vault.auth.VaultKubernetesAuthConfig;
 import io.quarkus.vault.auth.VaultKubernetesAuthRole;
-import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalKubernetesAuthMethod;
 import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigData;
 import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthRoleData;
 
+@ApplicationScoped
 public class VaultKubernetesAuthManager implements VaultKubernetesAuthService {
 
-    private final VaultAuthManager vaultAuthManager;
-    private final VaultClient vaultClient;
-
-    public VaultKubernetesAuthManager(VaultAuthManager vaultAuthManager, VaultClient vaultClient) {
-        this.vaultAuthManager = vaultAuthManager;
-        this.vaultClient = vaultClient;
-    }
+    @Inject
+    private VaultAuthManager vaultAuthManager;
+    @Inject
+    private VaultInternalKubernetesAuthMethod vaultInternalKubernetesAuthMethod;
 
     @Override
     public void configure(VaultKubernetesAuthConfig config) {
         String token = vaultAuthManager.getClientToken();
-        vaultClient.configureKubernetesAuth(token, new VaultKubernetesAuthConfigData()
+        vaultInternalKubernetesAuthMethod.configureAuth(token, new VaultKubernetesAuthConfigData()
                 .setIssuer(config.issuer)
                 .setKubernetesCaCert(config.kubernetesCaCert)
                 .setKubernetesHost(config.kubernetesHost)
@@ -35,7 +36,7 @@ public void configure(VaultKubernetesAuthConfig config) {
     @Override
     public VaultKubernetesAuthConfig getConfig() {
         String token = vaultAuthManager.getClientToken();
-        VaultKubernetesAuthConfigData data = vaultClient.readKubernetesAuthConfig(token).data;
+        VaultKubernetesAuthConfigData data = vaultInternalKubernetesAuthMethod.readAuthConfig(token).data;
         return new VaultKubernetesAuthConfig()
                 .setKubernetesCaCert(data.kubernetesCaCert)
                 .setKubernetesHost(data.kubernetesHost)
@@ -46,7 +47,7 @@ public VaultKubernetesAuthConfig getConfig() {
 
     public VaultKubernetesAuthRole getRole(String name) {
         String token = vaultAuthManager.getClientToken();
-        VaultKubernetesAuthRoleData role = vaultClient.getVaultKubernetesAuthRole(token, name).data;
+        VaultKubernetesAuthRoleData role = vaultInternalKubernetesAuthMethod.getVaultAuthRole(token, name).data;
         return new VaultKubernetesAuthRole()
                 .setBoundServiceAccountNames(role.boundServiceAccountNames)
                 .setBoundServiceAccountNamespaces(role.boundServiceAccountNamespaces)
@@ -77,14 +78,14 @@ public void createRole(String name, VaultKubernetesAuthRole role) {
                 .setTokenNumUses(role.tokenNumUses)
                 .setTokenPeriod(role.tokenPeriod)
                 .setTokenType(role.tokenType);
-        vaultClient.createKubernetesAuthRole(token, name, body);
+        vaultInternalKubernetesAuthMethod.createAuthRole(token, name, body);
     }
 
     @Override
     public List<String> getRoles() {
         try {
             String token = vaultAuthManager.getClientToken();
-            return vaultClient.listKubernetesAuthRoles(token).data.keys;
+            return vaultInternalKubernetesAuthMethod.listAuthRoles(token).data.keys;
         } catch (VaultClientException e) {
             if (e.getStatus() == 404) {
                 return Collections.emptyList();
@@ -97,7 +98,6 @@ public List<String> getRoles() {
     @Override
     public void deleteRole(String name) {
         String token = vaultAuthManager.getClientToken();
-        vaultClient.deleteKubernetesAuthRoles(token, name);
+        vaultInternalKubernetesAuthMethod.deleteAuthRoles(token, name);
     }
-
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKvManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKvManager.java
index 9c13f48dd9723..ad7609219eb44 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKvManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultKvManager.java
@@ -1,37 +1,46 @@
 package io.quarkus.vault.runtime;
 
+import java.util.List;
 import java.util.Map;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import io.quarkus.vault.VaultKVSecretEngine;
-import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV1;
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2;
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2WriteBody;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalKvV1SecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalKvV2SecretEngine;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 
+@ApplicationScoped
 public class VaultKvManager implements VaultKVSecretEngine {
 
+    @Inject
     private VaultAuthManager vaultAuthManager;
-    private VaultClient vaultClient;
-    private VaultRuntimeConfig serverConfig;
+    @Inject
+    private VaultConfigHolder vaultConfigHolder;
+    @Inject
+    private VaultInternalKvV1SecretEngine vaultInternalKvV1SecretEngine;
+    @Inject
+    private VaultInternalKvV2SecretEngine vaultInternalKvV2SecretEngine;
 
-    public VaultKvManager(VaultAuthManager vaultAuthManager, VaultClient vaultClient, VaultRuntimeConfig serverConfig) {
-        this.vaultAuthManager = vaultAuthManager;
-        this.vaultClient = vaultClient;
-        this.serverConfig = serverConfig;
+    private VaultBootstrapConfig getConfig() {
+        return vaultConfigHolder.getVaultBootstrapConfig();
     }
 
     @Override
     public Map<String, String> readSecret(String path) {
 
         String clientToken = vaultAuthManager.getClientToken();
-        String mount = serverConfig.kvSecretEngineMountPath;
+        String mount = getConfig().kvSecretEngineMountPath;
 
-        if (serverConfig.kvSecretEngineVersion == 1) {
-            VaultKvSecretV1 secretV1 = vaultClient.getSecretV1(clientToken, mount, path);
+        if (isV1()) {
+            VaultKvSecretV1 secretV1 = vaultInternalKvV1SecretEngine.getSecret(clientToken, mount, path);
             return secretV1.data;
         } else {
-            VaultKvSecretV2 secretV2 = vaultClient.getSecretV2(clientToken, mount, path);
+            VaultKvSecretV2 secretV2 = vaultInternalKvV2SecretEngine.getSecret(clientToken, mount, path);
             return secretV2.data.data;
         }
     }
@@ -40,26 +49,40 @@ public Map<String, String> readSecret(String path) {
     public void writeSecret(String path, Map<String, String> secret) {
 
         String clientToken = vaultAuthManager.getClientToken();
-        String mount = serverConfig.kvSecretEngineMountPath;
+        String mount = getConfig().kvSecretEngineMountPath;
 
-        if (serverConfig.kvSecretEngineVersion == 1) {
-            vaultClient.writeSecretV1(clientToken, mount, path, secret);
+        if (isV1()) {
+            vaultInternalKvV1SecretEngine.writeSecret(clientToken, mount, path, secret);
         } else {
             VaultKvSecretV2WriteBody body = new VaultKvSecretV2WriteBody();
             body.data = secret;
-            vaultClient.writeSecretV2(clientToken, mount, path, body);
+            vaultInternalKvV2SecretEngine.writeSecret(clientToken, mount, path, body);
         }
     }
 
     @Override
     public void deleteSecret(String path) {
         String clientToken = vaultAuthManager.getClientToken();
-        String mount = serverConfig.kvSecretEngineMountPath;
+        String mount = getConfig().kvSecretEngineMountPath;
 
-        if (serverConfig.kvSecretEngineVersion == 1) {
-            vaultClient.deleteSecretV1(clientToken, mount, path);
+        if (isV1()) {
+            vaultInternalKvV1SecretEngine.deleteSecret(clientToken, mount, path);
         } else {
-            vaultClient.deleteSecretV2(clientToken, mount, path);
+            vaultInternalKvV2SecretEngine.deleteSecret(clientToken, mount, path);
         }
     }
+
+    @Override
+    public List<String> listSecrets(String path) {
+        String clientToken = vaultAuthManager.getClientToken();
+        String mount = getConfig().kvSecretEngineMountPath;
+
+        return (isV1()
+                ? vaultInternalKvV1SecretEngine.listSecrets(clientToken, mount, path)
+                : vaultInternalKvV2SecretEngine.listSecrets(clientToken, mount, path)).data.keys;
+    }
+
+    private boolean isV1() {
+        return getConfig().kvSecretEngineVersion == 1;
+    }
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultManager.java
deleted file mode 100644
index 1e16877d988bd..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultManager.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package io.quarkus.vault.runtime;
-
-import io.quarkus.vault.runtime.client.OkHttpVaultClient;
-import io.quarkus.vault.runtime.client.VaultClient;
-import io.quarkus.vault.runtime.config.VaultBuildTimeConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
-
-public class VaultManager {
-
-    private static volatile VaultManager instance;
-
-    private VaultRuntimeConfig serverConfig;
-    private VaultBuildTimeConfig buildTimeConfig;
-
-    private VaultClient vaultClient;
-    private VaultAuthManager vaultAuthManager;
-    private VaultKvManager vaultKvManager;
-    private VaultDbManager vaultDbManager;
-    private VaultTransitManager vaultTransitManager;
-    private VaultCredentialsProvider vaultCredentialsProvider;
-    private VaultTOTPManager vaultTOTPManager;
-    private VaultSystemBackendManager vaultSystemBackendManager;
-    private VaultKubernetesAuthManager vaultKubernetesAuthManager;
-
-    public static VaultManager getInstance() {
-        return instance;
-    }
-
-    public static void init(VaultBuildTimeConfig buildTimeConfig, VaultRuntimeConfig serverConfig) {
-        if (instance == null) {
-            instance = new VaultManager(buildTimeConfig, serverConfig);
-        }
-    }
-
-    public static void reset() {
-        instance = null;
-    }
-
-    public VaultManager(VaultBuildTimeConfig vaultBuildTimeConfig, VaultRuntimeConfig serverConfig) {
-        this(vaultBuildTimeConfig, serverConfig, new OkHttpVaultClient(serverConfig));
-    }
-
-    public VaultManager(VaultBuildTimeConfig vaultBuildTimeConfig, VaultRuntimeConfig serverConfig, VaultClient vaultClient) {
-        this.serverConfig = serverConfig;
-        this.vaultClient = vaultClient;
-        this.buildTimeConfig = vaultBuildTimeConfig;
-        this.vaultAuthManager = new VaultAuthManager(this.vaultClient, serverConfig);
-        this.vaultKvManager = new VaultKvManager(this.vaultAuthManager, this.vaultClient, serverConfig);
-        this.vaultDbManager = new VaultDbManager(this.vaultAuthManager, this.vaultClient, serverConfig);
-        this.vaultTransitManager = new VaultTransitManager(this.vaultAuthManager, this.vaultClient, serverConfig);
-        this.vaultCredentialsProvider = new VaultCredentialsProvider(serverConfig, this.vaultKvManager, this.vaultDbManager);
-        this.vaultTOTPManager = new VaultTOTPManager(this.vaultAuthManager, this.vaultClient);
-        this.vaultSystemBackendManager = new VaultSystemBackendManager(this.buildTimeConfig, this.vaultAuthManager,
-                this.vaultClient);
-        this.vaultKubernetesAuthManager = new VaultKubernetesAuthManager(this.vaultAuthManager, this.vaultClient);
-    }
-
-    public VaultClient getVaultClient() {
-        return vaultClient;
-    }
-
-    public VaultAuthManager getVaultAuthManager() {
-        return vaultAuthManager;
-    }
-
-    public VaultDbManager getVaultDbManager() {
-        return vaultDbManager;
-    }
-
-    public VaultKvManager getVaultKvManager() {
-        return vaultKvManager;
-    }
-
-    public VaultTOTPManager getVaultTOTPManager() {
-        return vaultTOTPManager;
-    }
-
-    public VaultTransitManager getVaultTransitManager() {
-        return vaultTransitManager;
-    }
-
-    public VaultCredentialsProvider getVaultCredentialsProvider() {
-        return vaultCredentialsProvider;
-    }
-
-    public VaultRuntimeConfig getServerConfig() {
-        return serverConfig;
-    }
-
-    public VaultBuildTimeConfig getBuildTimeConfig() {
-        return buildTimeConfig;
-    }
-
-    public VaultSystemBackendManager getVaultSystemBackendManager() {
-        return vaultSystemBackendManager;
-    }
-
-    public VaultKubernetesAuthManager getVaultKubernetesAuthManager() {
-        return vaultKubernetesAuthManager;
-    }
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultRecorder.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultRecorder.java
index 1578de99956f7..a4762bb192b65 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultRecorder.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultRecorder.java
@@ -1,24 +1,41 @@
 package io.quarkus.vault.runtime;
 
+import static java.util.Collections.emptyList;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
-import io.quarkus.vault.runtime.config.VaultBuildTimeConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.client.VertxVaultClient;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
+import io.quarkus.vault.runtime.config.VaultConfigSourceProvider;
 
 @Recorder
 public class VaultRecorder {
 
     private static final Logger log = Logger.getLogger(VaultRecorder.class);
 
-    public void configureRuntimeProperties(VaultBuildTimeConfig vaultBuildTimeConfig, VaultRuntimeConfig vaultRuntimeConfig) {
+    private static final EmptyConfigSourceProvider EMPTY = new EmptyConfigSourceProvider();
 
-        if (vaultRuntimeConfig.url.isPresent()) {
-            VaultServiceProducer producer = Arc.container().instance(VaultServiceProducer.class).get();
-            producer.setVaultConfigs(vaultBuildTimeConfig, vaultRuntimeConfig);
+    private static class EmptyConfigSourceProvider implements ConfigSourceProvider {
+        @Override
+        public Iterable<ConfigSource> getConfigSources(ClassLoader classLoader) {
+            return emptyList();
         }
-
     }
 
+    public RuntimeValue<ConfigSourceProvider> configure(VaultBootstrapConfig vaultBootstrapConfig) {
+        ConfigSourceProvider configSourceProvider = EMPTY;
+        if (vaultBootstrapConfig.url.isPresent()) {
+            ArcContainer container = Arc.container();
+            container.instance(VaultConfigHolder.class).get().setVaultBootstrapConfig(vaultBootstrapConfig);
+            container.instance(VertxVaultClient.class).get().init();
+            configSourceProvider = new VaultConfigSourceProvider(vaultBootstrapConfig);
+        }
+        return new RuntimeValue<>(configSourceProvider);
+    }
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultServiceProducer.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultServiceProducer.java
deleted file mode 100644
index 06e4c5a40ed1a..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultServiceProducer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.quarkus.vault.runtime;
-
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-
-import io.quarkus.credentials.CredentialsProvider;
-import io.quarkus.vault.VaultKVSecretEngine;
-import io.quarkus.vault.VaultSystemBackendEngine;
-import io.quarkus.vault.VaultTOTPSecretEngine;
-import io.quarkus.vault.VaultTransitSecretEngine;
-import io.quarkus.vault.runtime.config.VaultBuildTimeConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
-
-@ApplicationScoped
-public class VaultServiceProducer {
-
-    @Produces
-    @ApplicationScoped
-    public VaultSystemBackendEngine createVaultSystemBackendEngine() {
-        return VaultManager.getInstance().getVaultSystemBackendManager();
-    }
-
-    @Produces
-    @ApplicationScoped
-    public VaultKVSecretEngine createKVSecretEngine() {
-        return VaultManager.getInstance().getVaultKvManager();
-    }
-
-    @Produces
-    @ApplicationScoped
-    public VaultTransitSecretEngine createTransitSecretEngine() {
-        return VaultManager.getInstance().getVaultTransitManager();
-    }
-
-    @Produces
-    @ApplicationScoped
-    public VaultTOTPSecretEngine createVaultTOTPSecretEngine() {
-        return VaultManager.getInstance().getVaultTOTPManager();
-    }
-
-    @Produces
-    @ApplicationScoped
-    public VaultKubernetesAuthManager createVaultKubernetesAuthManager() {
-        return VaultManager.getInstance().getVaultKubernetesAuthManager();
-    }
-
-    @Produces
-    @ApplicationScoped
-    @Named("vault-credentials-provider")
-    public CredentialsProvider createCredentialsProvider() {
-        return VaultManager.getInstance().getVaultCredentialsProvider();
-    }
-
-    @PreDestroy
-    public void close() {
-        VaultManager.reset();
-    }
-
-    public void setVaultConfigs(VaultBuildTimeConfig buildTimeConfig, VaultRuntimeConfig serverConfig) {
-        VaultManager.init(buildTimeConfig, serverConfig);
-    }
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultSystemBackendManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultSystemBackendManager.java
index 2bd32e5de02e4..721f88a72cd25 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultSystemBackendManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultSystemBackendManager.java
@@ -2,8 +2,11 @@
 
 import java.util.List;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import io.quarkus.vault.VaultSystemBackendEngine;
-import io.quarkus.vault.runtime.client.VaultClient;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.sys.VaultHealthResult;
 import io.quarkus.vault.runtime.client.dto.sys.VaultInitResponse;
 import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyBody;
@@ -14,25 +17,20 @@
 import io.quarkus.vault.sys.VaultInit;
 import io.quarkus.vault.sys.VaultSealStatus;
 
+@ApplicationScoped
 public class VaultSystemBackendManager implements VaultSystemBackendEngine {
 
-    private VaultClient vaultClient;
+    @Inject
     private VaultBuildTimeConfig buildTimeConfig;
+    @Inject
     private VaultAuthManager vaultAuthManager;
-
-    public VaultSystemBackendManager(VaultBuildTimeConfig buildTimeConfig, VaultAuthManager vaultAuthManager,
-            VaultClient vaultClient) {
-        this.vaultClient = vaultClient;
-        this.buildTimeConfig = buildTimeConfig;
-        this.vaultAuthManager = vaultAuthManager;
-    }
+    @Inject
+    private VaultInternalSystemBackend vaultInternalSystemBackend;
 
     @Override
     public VaultInit init(int secretShares, int secretThreshold) {
-        final VaultInitResponse init = this.vaultClient.init(secretShares, secretThreshold);
-
-        final VaultInit vaultInit = new VaultInit(init.keys, init.keysBase64, init.rootToken);
-        return vaultInit;
+        final VaultInitResponse init = vaultInternalSystemBackend.init(secretShares, secretThreshold);
+        return new VaultInit(init.keys, init.keysBase64, init.rootToken);
     }
 
     @Override
@@ -68,7 +66,7 @@ public VaultHealthStatus healthStatus() {
 
     @Override
     public VaultSealStatus sealStatus() {
-        final VaultSealStatusResult vaultSealStatusResult = this.vaultClient.systemSealStatus();
+        final VaultSealStatusResult vaultSealStatusResult = vaultInternalSystemBackend.systemSealStatus();
 
         final VaultSealStatus vaultSealStatus = new VaultSealStatus();
         vaultSealStatus.setClusterId(vaultSealStatusResult.clusterId);
@@ -88,7 +86,7 @@ public VaultSealStatus sealStatus() {
     }
 
     private VaultHealthStatus healthStatus(boolean isStandByOk, boolean isPerfStandByOk) {
-        final VaultHealthResult vaultHealthResult = this.vaultClient.systemHealthStatus(isStandByOk, isPerfStandByOk);
+        final VaultHealthResult vaultHealthResult = vaultInternalSystemBackend.systemHealthStatus(isStandByOk, isPerfStandByOk);
 
         final VaultHealthStatus vaultHealthStatus = new VaultHealthStatus();
         vaultHealthStatus.setClusterId(vaultHealthResult.clusterId);
@@ -106,31 +104,31 @@ private VaultHealthStatus healthStatus(boolean isStandByOk, boolean isPerfStandB
     }
 
     private VaultHealth health(boolean isStandByOk, boolean isPerfStandByOk) {
-        final int systemHealthStatusCode = this.vaultClient.systemHealth(isStandByOk, isPerfStandByOk);
+        final int systemHealthStatusCode = vaultInternalSystemBackend.systemHealth(isStandByOk, isPerfStandByOk);
         return new VaultHealth(systemHealthStatusCode);
     }
 
     @Override
     public String getPolicyRules(String name) {
         String token = vaultAuthManager.getClientToken();
-        return vaultClient.getPolicy(token, name).data.rules;
+        return vaultInternalSystemBackend.getPolicy(token, name).data.rules;
     }
 
     @Override
     public void createUpdatePolicy(String name, String policy) {
         String token = vaultAuthManager.getClientToken();
-        vaultClient.createUpdatePolicy(token, name, new VaultPolicyBody(policy));
+        vaultInternalSystemBackend.createUpdatePolicy(token, name, new VaultPolicyBody(policy));
     }
 
     @Override
     public void deletePolicy(String name) {
         String token = vaultAuthManager.getClientToken();
-        vaultClient.deletePolicy(token, name);
+        vaultInternalSystemBackend.deletePolicy(token, name);
     }
 
     @Override
     public List<String> getPolicies() {
         String token = vaultAuthManager.getClientToken();
-        return vaultClient.listPolicies(token).data.policies;
+        return vaultInternalSystemBackend.listPolicies(token).data.policies;
     }
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTOTPManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTOTPManager.java
index a1f933879c91b..97c6fc0f421f4 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTOTPManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTOTPManager.java
@@ -4,25 +4,26 @@
 import java.util.List;
 import java.util.Optional;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import io.quarkus.vault.VaultTOTPSecretEngine;
-import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
 import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyBody;
 import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyResult;
 import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPReadKeyResult;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalTOPTSecretEngine;
 import io.quarkus.vault.secrets.totp.CreateKeyParameters;
 import io.quarkus.vault.secrets.totp.KeyConfiguration;
 import io.quarkus.vault.secrets.totp.KeyDefinition;
 
+@ApplicationScoped
 public class VaultTOTPManager implements VaultTOTPSecretEngine {
 
+    @Inject
     private VaultAuthManager vaultAuthManager;
-    private VaultClient vaultClient;
-
-    public VaultTOTPManager(VaultAuthManager vaultAuthManager, VaultClient vaultClient) {
-        this.vaultAuthManager = vaultAuthManager;
-        this.vaultClient = vaultClient;
-    }
+    @Inject
+    private VaultInternalTOPTSecretEngine vaultInternalTOPTSecretEngine;
 
     @Override
     public Optional<KeyDefinition> createKey(String name, CreateKeyParameters createKeyParameters) {
@@ -41,15 +42,14 @@ public Optional<KeyDefinition> createKey(String name, CreateKeyParameters create
         body.skew = createKeyParameters.getSkew();
         body.url = createKeyParameters.getUrl();
 
-        final VaultTOTPCreateKeyResult result = this.vaultClient
-                .createTOTPKey(getToken(), name, body);
+        final VaultTOTPCreateKeyResult result = vaultInternalTOPTSecretEngine.createTOTPKey(getToken(), name, body);
 
         return result == null ? Optional.empty() : Optional.of(new KeyDefinition(result.data.barcode, result.data.url));
     }
 
     @Override
     public KeyConfiguration readKey(String name) {
-        final VaultTOTPReadKeyResult result = this.vaultClient.readTOTPKey(getToken(), name);
+        final VaultTOTPReadKeyResult result = vaultInternalTOPTSecretEngine.readTOTPKey(getToken(), name);
         return new KeyConfiguration(result.data.accountName,
                 result.data.algorithm, result.data.digits,
                 result.data.issuer, result.data.period);
@@ -58,7 +58,7 @@ public KeyConfiguration readKey(String name) {
     @Override
     public List<String> listKeys() {
         try {
-            return this.vaultClient.listTOTPKeys(getToken()).data.keys;
+            return vaultInternalTOPTSecretEngine.listTOTPKeys(getToken()).data.keys;
         } catch (VaultClientException e) {
             if (e.getStatus() == 404) {
                 return Collections.emptyList();
@@ -69,17 +69,17 @@ public List<String> listKeys() {
 
     @Override
     public void deleteKey(String name) {
-        this.vaultClient.deleteTOTPKey(getToken(), name);
+        vaultInternalTOPTSecretEngine.deleteTOTPKey(getToken(), name);
     }
 
     @Override
     public String generateCode(String name) {
-        return this.vaultClient.generateTOTPCode(getToken(), name).data.code;
+        return vaultInternalTOPTSecretEngine.generateTOTPCode(getToken(), name).data.code;
     }
 
     @Override
     public boolean validateCode(String name, String code) {
-        return this.vaultClient.validateTOTPCode(getToken(), name, code).data.valid;
+        return vaultInternalTOPTSecretEngine.validateTOTPCode(getToken(), name, code).data.valid;
     }
 
     private String getToken() {
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java
index c8fba2e314c6f..2d1c72054ef73 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java
@@ -8,15 +8,22 @@
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
 
+import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.IntStream;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import io.quarkus.vault.VaultException;
+import io.quarkus.vault.VaultTransitExportKeyType;
+import io.quarkus.vault.VaultTransitKeyDetail;
 import io.quarkus.vault.VaultTransitSecretEngine;
-import io.quarkus.vault.runtime.client.VaultClient;
+import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitCreateKeyBody;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecrypt;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecryptBatchInput;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecryptBody;
@@ -25,6 +32,9 @@
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncryptBatchInput;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncryptBody;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncryptDataBatchResult;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitKeyConfigBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitKeyExport;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitReadKeyData;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitRewrapBatchInput;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitRewrapBody;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSign;
@@ -35,8 +45,9 @@
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBatchInput;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBody;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyDataBatchResult;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalTransitSecretEngine;
 import io.quarkus.vault.runtime.config.TransitKeyConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 import io.quarkus.vault.runtime.transit.DecryptionResult;
 import io.quarkus.vault.runtime.transit.EncryptionResult;
 import io.quarkus.vault.runtime.transit.SigningResult;
@@ -45,6 +56,8 @@
 import io.quarkus.vault.transit.ClearData;
 import io.quarkus.vault.transit.DecryptionRequest;
 import io.quarkus.vault.transit.EncryptionRequest;
+import io.quarkus.vault.transit.KeyConfigRequestDetail;
+import io.quarkus.vault.transit.KeyCreationRequestDetail;
 import io.quarkus.vault.transit.RewrappingRequest;
 import io.quarkus.vault.transit.SigningInput;
 import io.quarkus.vault.transit.SigningRequest;
@@ -53,19 +66,22 @@
 import io.quarkus.vault.transit.VaultEncryptionBatchException;
 import io.quarkus.vault.transit.VaultRewrappingBatchException;
 import io.quarkus.vault.transit.VaultSigningBatchException;
+import io.quarkus.vault.transit.VaultTransitKeyExportDetail;
 import io.quarkus.vault.transit.VaultVerificationBatchException;
 import io.quarkus.vault.transit.VerificationRequest;
 
+@ApplicationScoped
 public class VaultTransitManager implements VaultTransitSecretEngine {
 
+    @Inject
     private VaultAuthManager vaultAuthManager;
-    private VaultClient vaultClient;
-    private VaultRuntimeConfig serverConfig;
+    @Inject
+    private VaultConfigHolder vaultConfigHolder;
+    @Inject
+    private VaultInternalTransitSecretEngine vaultInternalTransitSecretEngine;
 
-    public VaultTransitManager(VaultAuthManager vaultAuthManager, VaultClient vaultClient, VaultRuntimeConfig serverConfig) {
-        this.vaultAuthManager = vaultAuthManager;
-        this.vaultClient = vaultClient;
-        this.serverConfig = serverConfig;
+    private VaultBootstrapConfig getConfig() {
+        return vaultConfigHolder.getVaultBootstrapConfig();
     }
 
     @Override
@@ -79,8 +95,41 @@ public String encrypt(String keyName, ClearData clearData, TransitContext transi
         return encryptBatch(keyName, singletonList(item)).get(0).getValueOrElseError();
     }
 
+    // workaround https://github.com/hashicorp/vault/issues/10232
+    private String encrypt(String keyName, EncryptionRequest request) {
+        VaultTransitEncryptBody body = new VaultTransitEncryptBody();
+        body.plaintext = Base64String.from(request.getData().getValue());
+        body.context = Base64String.from(request.getContext());
+        body.keyVersion = request.getKeyVersion();
+
+        TransitKeyConfig config = getTransitConfig(keyName);
+        if (config != null) {
+            keyName = config.name.orElse(keyName);
+            body.type = config.type.orElse(null);
+            body.convergentEncryption = config.convergentEncryption.orElse(null);
+        }
+        VaultTransitEncrypt encrypt = vaultInternalTransitSecretEngine.encrypt(getToken(), keyName, body);
+        EncryptionResult result = new EncryptionResult(encrypt.data.ciphertext, encrypt.data.error);
+        if (result.isInError()) {
+            Map<EncryptionRequest, EncryptionResult> errorMap = new HashMap<>();
+            errorMap.put(request, result);
+            throw new VaultEncryptionBatchException("encryption error with key " + keyName, errorMap);
+        }
+        return result.getValue();
+    }
+
+    private TransitKeyConfig getTransitConfig(String keyName) {
+        return getConfig().transit.key.get(keyName);
+    }
+
     @Override
     public Map<EncryptionRequest, String> encrypt(String keyName, List<EncryptionRequest> requests) {
+        if (requests.size() == 1) {
+            EncryptionRequest request = requests.get(0);
+            Map<EncryptionRequest, String> result = new HashMap<>();
+            result.put(request, encrypt(keyName, request));
+            return result;
+        }
         List<EncryptionResult> results = encryptBatch(keyName, requests);
         checkBatchErrors(results,
                 errors -> new VaultEncryptionBatchException(errors + " encryption errors", zip(requests, results)));
@@ -92,14 +141,14 @@ private List<EncryptionResult> encryptBatch(String keyName, List<EncryptionReque
         VaultTransitEncryptBody body = new VaultTransitEncryptBody();
         body.batchInput = requests.stream().map(this::getVaultTransitEncryptBatchInput).collect(toList());
 
-        TransitKeyConfig config = serverConfig.transit.key.get(keyName);
+        TransitKeyConfig config = getTransitConfig(keyName);
         if (config != null) {
             keyName = config.name.orElse(keyName);
             body.type = config.type.orElse(null);
             body.convergentEncryption = config.convergentEncryption.orElse(null);
         }
 
-        VaultTransitEncrypt encrypt = vaultClient.encrypt(getToken(), keyName, body);
+        VaultTransitEncrypt encrypt = vaultInternalTransitSecretEngine.encrypt(getToken(), keyName, body);
         return encrypt.data.batchResults.stream().map(this::getVaultTransitEncryptBatchResult).collect(toList());
     }
 
@@ -126,12 +175,12 @@ private List<DecryptionResult> decryptBatch(String keyName, List<DecryptionReque
         VaultTransitDecryptBody body = new VaultTransitDecryptBody();
         body.batchInput = requests.stream().map(this::getVaultTransitDecryptBatchInput).collect(toList());
 
-        TransitKeyConfig config = serverConfig.transit.key.get(keyName);
+        TransitKeyConfig config = getTransitConfig(keyName);
         if (config != null) {
             keyName = config.name.orElse(keyName);
         }
 
-        VaultTransitDecrypt decrypt = vaultClient.decrypt(getToken(), keyName, body);
+        VaultTransitDecrypt decrypt = vaultInternalTransitSecretEngine.decrypt(getToken(), keyName, body);
         return decrypt.data.batchResults.stream().map(this::getVaultTransitDecryptBatchResult).collect(toList());
     }
 
@@ -161,12 +210,12 @@ private List<EncryptionResult> rewrapBatch(String keyName, List<RewrappingReques
         VaultTransitRewrapBody body = new VaultTransitRewrapBody();
         body.batchInput = requests.stream().map(this::getVaultTransitRewrapBatchInput).collect(toList());
 
-        TransitKeyConfig config = serverConfig.transit.key.get(keyName);
+        TransitKeyConfig config = getTransitConfig(keyName);
         if (config != null) {
             keyName = config.name.orElse(keyName);
         }
 
-        VaultTransitEncrypt encrypt = vaultClient.rewrap(getToken(), keyName, body);
+        VaultTransitEncrypt encrypt = vaultInternalTransitSecretEngine.rewrap(getToken(), keyName, body);
         return encrypt.data.batchResults.stream().map(this::getVaultTransitEncryptBatchResult).collect(toList());
     }
 
@@ -210,7 +259,7 @@ private void signBatch(String keyName, int keyVersion, List<SigningRequestResult
                 .map(this::getVaultTransitSignBatchInput)
                 .collect(toList());
 
-        TransitKeyConfig config = serverConfig.transit.key.get(keyName);
+        TransitKeyConfig config = getTransitConfig(keyName);
         if (config != null) {
             keyName = config.name.orElse(keyName);
             hashAlgorithm = config.hashAlgorithm.orElse(null);
@@ -218,7 +267,7 @@ private void signBatch(String keyName, int keyVersion, List<SigningRequestResult
             body.prehashed = config.prehashed.orElse(null);
         }
 
-        VaultTransitSign sign = vaultClient.sign(getToken(), keyName, hashAlgorithm, body);
+        VaultTransitSign sign = vaultInternalTransitSecretEngine.sign(getToken(), keyName, hashAlgorithm, body);
 
         for (int i = 0; i < pairs.size(); i++) {
             VaultTransitSignDataBatchResult result = sign.data.batchResults.get(i);
@@ -256,7 +305,7 @@ private List<VerificationResult> verifyBatch(String keyName, List<VerificationRe
         VaultTransitVerifyBody body = new VaultTransitVerifyBody();
         body.batchInput = requests.stream().map(this::getVaultTransitVerifyBatchInput).collect(toList());
 
-        TransitKeyConfig config = serverConfig.transit.key.get(keyName);
+        TransitKeyConfig config = getTransitConfig(keyName);
         if (config != null) {
             keyName = config.name.orElse(keyName);
             hashAlgorithm = config.hashAlgorithm.orElse(null);
@@ -264,10 +313,86 @@ private List<VerificationResult> verifyBatch(String keyName, List<VerificationRe
             body.signatureAlgorithm = config.signatureAlgorithm.orElse(null);
         }
 
-        VaultTransitVerify verify = vaultClient.verify(getToken(), keyName, hashAlgorithm, body);
+        VaultTransitVerify verify = vaultInternalTransitSecretEngine.verify(getToken(), keyName, hashAlgorithm, body);
         return verify.data.batchResults.stream().map(this::getVaultTransitVerifyBatchResult).collect(toList());
     }
 
+    @Override
+    public void createKey(String keyName, KeyCreationRequestDetail detail) {
+        VaultTransitCreateKeyBody body = new VaultTransitCreateKeyBody();
+        if (detail != null) {
+            body.allowPlaintextBackup = detail.getAllowPlaintextBackup();
+            body.convergentEncryption = detail.getConvergentEncryption();
+            body.derived = detail.getDerived();
+            body.exportable = detail.getExportable();
+            body.type = detail.getType();
+        }
+        vaultInternalTransitSecretEngine.createTransitKey(getToken(), keyName, body);
+    }
+
+    @Override
+    public void updateKeyConfiguration(String keyName, KeyConfigRequestDetail detail) {
+        VaultTransitKeyConfigBody body = new VaultTransitKeyConfigBody();
+        body.allowPlaintextBackup = detail.getAllowPlaintextBackup();
+        body.deletionAllowed = detail.getDeletionAllowed();
+        body.minEncryptionVersion = detail.getMinEncryptionVersion();
+        body.minDecryptionVersion = detail.getMinDecryptionVersion();
+        body.exportable = detail.getExportable();
+        vaultInternalTransitSecretEngine.updateTransitKeyConfiguration(getToken(), keyName, body);
+    }
+
+    @Override
+    public void deleteKey(String keyName) {
+        vaultInternalTransitSecretEngine.deleteTransitKey(getToken(), keyName);
+    }
+
+    @Override
+    public VaultTransitKeyExportDetail exportKey(String keyName, VaultTransitExportKeyType keyType, String keyVersion) {
+        VaultTransitKeyExport keyExport = vaultInternalTransitSecretEngine.exportTransitKey(getToken(), keyType.name() + "-key",
+                keyName,
+                keyVersion);
+        VaultTransitKeyExportDetail detail = new VaultTransitKeyExportDetail();
+        detail.setName(keyExport.data.name);
+        detail.setKeys(keyExport.data.keys);
+        return detail;
+    }
+
+    @Override
+    public VaultTransitKeyDetail readKey(String keyName) {
+        try {
+            return map(vaultInternalTransitSecretEngine.readTransitKey(getToken(), keyName).data);
+        } catch (VaultClientException e) {
+            if (e.getStatus() == 404) {
+                return null;
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    @Override
+    public List<String> listKeys() {
+        return vaultInternalTransitSecretEngine.listTransitKeys(getToken()).data.keys;
+    }
+
+    protected VaultTransitKeyDetail map(VaultTransitReadKeyData data) {
+        VaultTransitKeyDetail result = new VaultTransitKeyDetail();
+        result.setDetail(data.detail);
+        result.setDeletionAllowed(data.deletionAllowed);
+        result.setDerived(data.derived);
+        result.setExportable(data.exportable);
+        result.setAllowPlaintextBackup(data.allowPlaintextBackup);
+        result.setKeys(data.keys);
+        result.setMinDecryptionVersion(data.minDecryptionVersion);
+        result.setMinEncryptionVersion(data.minEncryptionVersion);
+        result.setName(data.name);
+        result.setSupportsEncryption(data.supportsEncryption);
+        result.setSupportsDecryption(data.supportsDecryption);
+        result.setSupportsDerivation(data.supportsDerivation);
+        result.setSupportsSigning(data.supportsSigning);
+        return result;
+    }
+
     // ---
 
     private void checkBatchErrors(List<? extends VaultTransitBatchResult> results,
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/CertificateHelper.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/CertificateHelper.java
deleted file mode 100644
index 9d0a8a902343f..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/CertificateHelper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.quarkus.vault.runtime.client;
-
-import static javax.net.ssl.TrustManagerFactory.getDefaultAlgorithm;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-
-public class CertificateHelper {
-
-    private static String CERT_BUNDLE_PATTERN = "-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----";
-    private static Pattern certBundlePattern = Pattern.compile(CERT_BUNDLE_PATTERN, Pattern.DOTALL);
-
-    public static TrustManager[] createTrustManagers(String cacert) throws GeneralSecurityException, IOException {
-
-        CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-
-        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        keyStore.load(null);
-
-        String certBundle = new String(Files.readAllBytes(Paths.get(cacert)), StandardCharsets.UTF_8);
-        int start = 0;
-        int count = 0;
-        Matcher matcher = certBundlePattern.matcher(certBundle);
-
-        while (matcher.find(start)) {
-            ByteArrayInputStream inStream = new ByteArrayInputStream(matcher.group().getBytes(StandardCharsets.UTF_8));
-            X509Certificate certificate = (X509Certificate) certificateFactory.generateCertificate(inStream);
-            keyStore.setCertificateEntry("cert_" + count++, certificate);
-            start = matcher.end();
-        }
-
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(getDefaultAlgorithm());
-        trustManagerFactory.init(keyStore);
-        return trustManagerFactory.getTrustManagers();
-    }
-
-    public static SSLContext createSslContext(TrustManager[] trustManagers) throws GeneralSecurityException {
-        SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
-        sslContext.init(new KeyManager[0], trustManagers, null);
-        return sslContext;
-    }
-
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/MutinyVertxClientFactory.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/MutinyVertxClientFactory.java
new file mode 100644
index 0000000000000..b4ebe50c3fa29
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/MutinyVertxClientFactory.java
@@ -0,0 +1,48 @@
+package io.quarkus.vault.runtime.client;
+
+import static io.quarkus.vault.runtime.config.VaultAuthenticationType.KUBERNETES;
+import static io.quarkus.vault.runtime.config.VaultBootstrapConfig.KUBERNETES_CACERT;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
+import io.vertx.core.net.PemTrustOptions;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+public class MutinyVertxClientFactory {
+
+    private static final Logger log = Logger.getLogger(MutinyVertxClientFactory.class.getName());
+
+    public static WebClient createHttpClient(Vertx vertx, VaultBootstrapConfig vaultBootstrapConfig, TlsConfig tlsConfig) {
+
+        WebClientOptions options = new WebClientOptions()
+                .setConnectTimeout((int) vaultBootstrapConfig.connectTimeout.toMillis())
+                .setIdleTimeout((int) vaultBootstrapConfig.readTimeout.getSeconds());
+
+        boolean trustAll = vaultBootstrapConfig.tls.skipVerify.orElseGet(() -> tlsConfig.trustAll);
+        if (trustAll) {
+            skipVerify(options);
+        } else if (vaultBootstrapConfig.tls.caCert.isPresent()) {
+            cacert(options, vaultBootstrapConfig.tls.caCert.get());
+        } else if (vaultBootstrapConfig.getAuthenticationType() == KUBERNETES
+                && vaultBootstrapConfig.tls.useKubernetesCaCert) {
+            cacert(options, KUBERNETES_CACERT);
+        }
+
+        return WebClient.create(vertx, options);
+    }
+
+    private static void cacert(WebClientOptions options, String cacert) {
+        log.debug("configure tls with " + cacert);
+        options.setTrustOptions(new PemTrustOptions().addCertPath(cacert));
+    }
+
+    private static void skipVerify(WebClientOptions options) {
+        log.debug("configure tls with skip-verify");
+        options.setTrustAll(true);
+        options.setVerifyHost(false);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/OkHttpClientFactory.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/OkHttpClientFactory.java
deleted file mode 100644
index 1f31b075d05dd..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/OkHttpClientFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.quarkus.vault.runtime.client;
-
-import static io.quarkus.vault.runtime.client.CertificateHelper.createSslContext;
-import static io.quarkus.vault.runtime.client.CertificateHelper.createTrustManagers;
-import static io.quarkus.vault.runtime.config.VaultAuthenticationType.KUBERNETES;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.KUBERNETES_CACERT;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import org.jboss.logging.Logger;
-
-import io.quarkus.vault.VaultException;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
-import okhttp3.OkHttpClient;
-
-public class OkHttpClientFactory {
-
-    private static final Logger log = Logger.getLogger(OkHttpClientFactory.class.getName());
-
-    public static OkHttpClient createHttpClient(VaultRuntimeConfig serverConfig) {
-
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
-                .connectTimeout(serverConfig.connectTimeout)
-                .readTimeout(serverConfig.readTimeout);
-
-        try {
-            if (serverConfig.tls.skipVerify) {
-                skipVerify(builder);
-            } else if (serverConfig.tls.caCert.isPresent()) {
-                cacert(builder, serverConfig.tls.caCert.get());
-            } else if (serverConfig.getAuthenticationType() == KUBERNETES && serverConfig.tls.useKubernetesCaCert) {
-                cacert(builder, KUBERNETES_CACERT);
-            }
-        } catch (GeneralSecurityException | IOException e) {
-            throw new VaultException(e);
-        }
-
-        return builder.build();
-
-    }
-
-    private static void cacert(OkHttpClient.Builder builder, String cacert) throws GeneralSecurityException, IOException {
-        log.debug("create SSLSocketFactory with tls " + cacert);
-        sslSocketFactory(builder, createTrustManagers(cacert));
-    }
-
-    private static void skipVerify(OkHttpClient.Builder builder) throws GeneralSecurityException {
-        log.debug("create SSLSocketFactory with tls.skip-verify");
-        builder.hostnameVerifier((hostname, session) -> true);
-        sslSocketFactory(builder, new TrustManager[] { new TrustAllTrustManager() });
-    }
-
-    private static void sslSocketFactory(OkHttpClient.Builder builder, TrustManager[] trustManagers)
-            throws GeneralSecurityException {
-        SSLContext sslContext = createSslContext(trustManagers);
-        SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-        builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustManagers[0]);
-    }
-
-    static class TrustAllTrustManager implements X509TrustManager {
-        @Override
-        public void checkClientTrusted(X509Certificate[] chain, String authType) {
-        }
-
-        @Override
-        public void checkServerTrusted(X509Certificate[] chain, String authType) {
-        }
-
-        @Override
-        public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[] {};
-        }
-    }
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/OkHttpVaultClient.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/OkHttpVaultClient.java
deleted file mode 100644
index 24f8682e9f459..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/OkHttpVaultClient.java
+++ /dev/null
@@ -1,486 +0,0 @@
-package io.quarkus.vault.runtime.client;
-
-import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
-import static io.quarkus.vault.runtime.client.OkHttpClientFactory.createHttpClient;
-import static java.util.Collections.emptyMap;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.logging.Logger;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.quarkus.vault.VaultException;
-import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleAuth;
-import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleAuthBody;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuth;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthBody;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigData;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigResult;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthListRolesResult;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthReadRoleResult;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthRoleData;
-import io.quarkus.vault.runtime.client.dto.auth.VaultLookupSelf;
-import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelf;
-import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelfBody;
-import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuth;
-import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuthBody;
-import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentials;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV1;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2Write;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2WriteBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultHealthResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultInitBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultInitResponse;
-import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesLookup;
-import io.quarkus.vault.runtime.client.dto.sys.VaultListPolicyResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultRenewLease;
-import io.quarkus.vault.runtime.client.dto.sys.VaultSealStatusResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultUnwrapBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultWrapResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyBody;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPGenerateCodeResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPListKeysResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPReadKeyResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPValidateCodeBody;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPValidateCodeResult;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecrypt;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecryptBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncrypt;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncryptBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitRewrapBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSign;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSignBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerify;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBody;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
-import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-public class OkHttpVaultClient implements VaultClient {
-
-    private static final Logger log = Logger.getLogger(OkHttpVaultClient.class);
-
-    public static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
-
-    private OkHttpClient client;
-    private URL url;
-    private String kubernetesAuthMountPath;
-    private ObjectMapper mapper = new ObjectMapper();
-
-    public OkHttpVaultClient(VaultRuntimeConfig serverConfig) {
-        this.client = createHttpClient(serverConfig);
-        this.url = serverConfig.url.get();
-        this.mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
-        this.mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-
-        this.kubernetesAuthMountPath = serverConfig.authentication.kubernetes.authMountPath;
-    }
-
-    @Override
-    public VaultUserPassAuth loginUserPass(String user, String password) {
-        VaultUserPassAuthBody body = new VaultUserPassAuthBody(password);
-        return post("auth/userpass/login/" + user, null, body, VaultUserPassAuth.class);
-    }
-
-    @Override
-    public VaultKubernetesAuth loginKubernetes(String role, String jwt) {
-        VaultKubernetesAuthBody body = new VaultKubernetesAuthBody(role, jwt);
-        return post(kubernetesAuthMountPath + "/login", null, body, VaultKubernetesAuth.class);
-    }
-
-    @Override
-    public void createKubernetesAuthRole(String token, String name, VaultKubernetesAuthRoleData body) {
-        post(kubernetesAuthMountPath + "/role/" + name, token, body, 204);
-    }
-
-    @Override
-    public VaultKubernetesAuthReadRoleResult getVaultKubernetesAuthRole(String token, String name) {
-        return get(kubernetesAuthMountPath + "/role/" + name, token, VaultKubernetesAuthReadRoleResult.class);
-    }
-
-    @Override
-    public VaultKubernetesAuthListRolesResult listKubernetesAuthRoles(String token) {
-        return list(kubernetesAuthMountPath + "/role", token, VaultKubernetesAuthListRolesResult.class);
-    }
-
-    @Override
-    public void deleteKubernetesAuthRoles(String token, String name) {
-        delete(kubernetesAuthMountPath + "/role/" + name, token, 204);
-    }
-
-    @Override
-    public void configureKubernetesAuth(String token, VaultKubernetesAuthConfigData config) {
-        post(kubernetesAuthMountPath + "/config", token, config, 204);
-    }
-
-    @Override
-    public VaultKubernetesAuthConfigResult readKubernetesAuthConfig(String token) {
-        return get(kubernetesAuthMountPath + "/config", token, VaultKubernetesAuthConfigResult.class);
-    }
-
-    @Override
-    public VaultAppRoleAuth loginAppRole(String roleId, String secretId) {
-        VaultAppRoleAuthBody body = new VaultAppRoleAuthBody(roleId, secretId);
-        return post("auth/approle/login", null, body, VaultAppRoleAuth.class);
-    }
-
-    @Override
-    public VaultKvSecretV1 getSecretV1(String token, String secretEnginePath, String path) {
-        return get(secretEnginePath + "/" + path, token, VaultKvSecretV1.class);
-    }
-
-    @Override
-    public VaultKvSecretV2 getSecretV2(String token, String secretEnginePath, String path) {
-        return get(secretEnginePath + "/data/" + path, token, VaultKvSecretV2.class);
-    }
-
-    @Override
-    public void writeSecretV1(String token, String secretEnginePath, String path, Map<String, String> secret) {
-        post(secretEnginePath + "/" + path, token, secret, null, 204);
-    }
-
-    @Override
-    public void writeSecretV2(String token, String secretEnginePath, String path, VaultKvSecretV2WriteBody body) {
-        post(secretEnginePath + "/data/" + path, token, body, VaultKvSecretV2Write.class);
-    }
-
-    @Override
-    public void deleteSecretV1(String token, String secretEnginePath, String path) {
-        delete(secretEnginePath + "/" + path, token, 204);
-    }
-
-    @Override
-    public void deleteSecretV2(String token, String secretEnginePath, String path) {
-        delete(secretEnginePath + "/data/" + path, token, 204);
-    }
-
-    @Override
-    public VaultRenewSelf renewSelf(String token, String increment) {
-        VaultRenewSelfBody body = new VaultRenewSelfBody(increment);
-        return post("auth/token/renew-self", token, body, VaultRenewSelf.class);
-    }
-
-    @Override
-    public VaultLookupSelf lookupSelf(String token) {
-        return get("auth/token/lookup-self", token, VaultLookupSelf.class);
-    }
-
-    @Override
-    public VaultLeasesLookup lookupLease(String token, String leaseId) {
-        VaultLeasesBody body = new VaultLeasesBody(leaseId);
-        return put("sys/leases/lookup", token, body, VaultLeasesLookup.class);
-    }
-
-    @Override
-    public VaultRenewLease renewLease(String token, String leaseId) {
-        VaultLeasesBody body = new VaultLeasesBody(leaseId);
-        return put("sys/leases/renew", token, body, VaultRenewLease.class);
-    }
-
-    @Override
-    public VaultDatabaseCredentials generateDatabaseCredentials(String token, String databaseCredentialsRole) {
-        return get("database/creds/" + databaseCredentialsRole, token, VaultDatabaseCredentials.class);
-    }
-
-    @Override
-    public VaultTransitEncrypt encrypt(String token, String keyName, VaultTransitEncryptBody body) {
-        return post("transit/encrypt/" + keyName, token, body, VaultTransitEncrypt.class);
-    }
-
-    @Override
-    public VaultTransitDecrypt decrypt(String token, String keyName, VaultTransitDecryptBody body) {
-        return post("transit/decrypt/" + keyName, token, body, VaultTransitDecrypt.class);
-    }
-
-    @Override
-    public VaultTransitSign sign(String token, String keyName, String hashAlgorithm,
-            VaultTransitSignBody body) {
-        String path = "transit/sign/" + keyName + (hashAlgorithm == null ? "" : "/" + hashAlgorithm);
-        return post(path, token, body, VaultTransitSign.class);
-    }
-
-    @Override
-    public VaultTransitVerify verify(String token, String keyName, String hashAlgorithm, VaultTransitVerifyBody body) {
-        String path = "transit/verify/" + keyName + (hashAlgorithm == null ? "" : "/" + hashAlgorithm);
-        return post(path, token, body, VaultTransitVerify.class);
-    }
-
-    @Override
-    public VaultTransitEncrypt rewrap(String token, String keyName, VaultTransitRewrapBody body) {
-        return post("transit/rewrap/" + keyName, token, body, VaultTransitEncrypt.class);
-    }
-
-    @Override
-    public VaultTOTPCreateKeyResult createTOTPKey(String token, String keyName,
-            VaultTOTPCreateKeyBody body) {
-        String path = "totp/keys/" + keyName;
-
-        // Depending on parameters it might produce an output or not
-        if (body.isProducingOutput()) {
-            return post(path, token, body, VaultTOTPCreateKeyResult.class, 200);
-        } else {
-            post(path, token, body, 204);
-            return null;
-        }
-    }
-
-    @Override
-    public VaultTOTPReadKeyResult readTOTPKey(String token, String keyName) {
-        String path = "totp/keys/" + keyName;
-        return get(path, token, VaultTOTPReadKeyResult.class);
-    }
-
-    @Override
-    public VaultTOTPListKeysResult listTOTPKeys(String token) {
-        return list("totp/keys", token, VaultTOTPListKeysResult.class);
-    }
-
-    @Override
-    public void deleteTOTPKey(String token, String keyName) {
-        String path = "totp/keys/" + keyName;
-        delete(path, token, 204);
-    }
-
-    @Override
-    public VaultTOTPGenerateCodeResult generateTOTPCode(String token, String keyName) {
-        String path = "totp/code/" + keyName;
-        return get(path, token, VaultTOTPGenerateCodeResult.class);
-    }
-
-    @Override
-    public VaultTOTPValidateCodeResult validateTOTPCode(String token, String keyName,
-            String code) {
-        String path = "totp/code/" + keyName;
-        VaultTOTPValidateCodeBody body = new VaultTOTPValidateCodeBody(code);
-        return post(path, token, body, VaultTOTPValidateCodeResult.class);
-    }
-
-    @Override
-    public int systemHealth(boolean isStandByOk, boolean isPerfStandByOk) {
-        Map<String, String> queryParams = getHealthParams(isStandByOk, isPerfStandByOk);
-
-        return head("sys/health", queryParams);
-    }
-
-    @Override
-    public VaultHealthResult systemHealthStatus(boolean isStandByOk, boolean isPerfStandByOk) {
-        Map<String, String> queryParams = getHealthParams(isStandByOk, isPerfStandByOk);
-        return get("sys/health", queryParams, VaultHealthResult.class);
-    }
-
-    @Override
-    public VaultSealStatusResult systemSealStatus() {
-        return get("sys/seal-status", emptyMap(), VaultSealStatusResult.class);
-    }
-
-    @Override
-    public VaultInitResponse init(int secretShares, int secretThreshold) {
-        VaultInitBody body = new VaultInitBody(secretShares, secretThreshold);
-        return put("sys/init", body, VaultInitResponse.class);
-    }
-
-    public VaultWrapResult wrap(String token, long ttl, Object object) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("X-Vault-Wrap-TTL", "" + ttl);
-        return post("sys/wrapping/wrap", token, headers, object, VaultWrapResult.class);
-    }
-
-    @Override
-    public <T> T unwrap(String wrappingToken, Class<T> resultClass) {
-        return post("sys/wrapping/unwrap", wrappingToken, VaultUnwrapBody.EMPTY, resultClass);
-    }
-
-    @Override
-    public VaultPolicyResult getPolicy(String token, String name) {
-        return get("sys/policy/" + name, token, VaultPolicyResult.class);
-    }
-
-    @Override
-    public void createUpdatePolicy(String token, String name, VaultPolicyBody body) {
-        put("sys/policy/" + name, token, body, 204);
-    }
-
-    @Override
-    public VaultListPolicyResult listPolicies(String token) {
-        return get("sys/policy", token, VaultListPolicyResult.class);
-    }
-
-    @Override
-    public void deletePolicy(String token, String name) {
-        delete("sys/policy/" + name, token, 204);
-    }
-
-    // ---
-
-    protected <T> T list(String path, String token, Class<T> resultClass) {
-        Request request = builder(path, token).method("LIST", null).build();
-        return exec(request, resultClass);
-    }
-
-    protected <T> T delete(String path, String token, int expectedCode) {
-        Request request = builder(path, token).delete().build();
-        return exec(request, expectedCode);
-    }
-
-    protected <T> T post(String path, String token, Object body, Class<T> resultClass, int expectedCode) {
-        Request request = builder(path, token).post(requestBody(body)).build();
-        return exec(request, resultClass, expectedCode);
-    }
-
-    protected <T> T post(String path, String token, Object body, Class<T> resultClass) {
-        return post(path, token, emptyMap(), body, resultClass);
-    }
-
-    protected <T> T post(String path, String token, Map<String, String> headers, Object body, Class<T> resultClass) {
-        Request.Builder builder = builder(path, token).post(requestBody(body));
-        headers.forEach(builder::header);
-        Request request = builder.build();
-        return exec(request, resultClass);
-    }
-
-    protected <T> T post(String path, String token, Object body, int expectedCode) {
-        Request request = builder(path, token).post(requestBody(body)).build();
-        return exec(request, expectedCode);
-    }
-
-    protected <T> T put(String path, String token, Object body, int expectedCode) {
-        Request request = builder(path, token).put(requestBody(body)).build();
-        return exec(request, expectedCode);
-    }
-
-    protected <T> T put(String path, String token, Object body, Class<T> resultClass) {
-        Request request = builder(path, token).put(requestBody(body)).build();
-        return exec(request, resultClass);
-    }
-
-    protected <T> T put(String path, Object body, Class<T> resultClass) {
-        Request request = builder(path).put(requestBody(body)).build();
-        return exec(request, resultClass);
-    }
-
-    protected <T> T get(String path, String token, Class<T> resultClass) {
-        Request request = builder(path, token).get().build();
-        return exec(request, resultClass);
-    }
-
-    protected <T> T get(String path, Map<String, String> queryParams, Class<T> resultClass) {
-        final Request request = builder(path, queryParams).get().build();
-        return exec(request, resultClass);
-    }
-
-    protected int head(String path) {
-        final Request request = builder(path).head().build();
-        return exec(request);
-    }
-
-    protected int head(String path, Map<String, String> queryParams) {
-        final Request request = builder(path, queryParams).head().build();
-        return exec(request);
-    }
-
-    private <T> T exec(Request request, Class<T> resultClass) {
-        return exec(request, resultClass, 200);
-    }
-
-    private <T> T exec(Request request, int expectedCode) {
-        return exec(request, null, expectedCode);
-    }
-
-    private <T> T exec(Request request, Class<T> resultClass, int expectedCode) {
-        try (Response response = client.newCall(request).execute()) {
-            if (response.code() != expectedCode) {
-                throwVaultException(response);
-            }
-            String jsonBody = response.body().string();
-            return resultClass == null ? null : mapper.readValue(jsonBody, resultClass);
-        } catch (IOException e) {
-            throw new VaultException(e);
-        }
-    }
-
-    private int exec(Request request) {
-        try (Response response = client.newCall(request).execute()) {
-            return response.code();
-        } catch (IOException e) {
-            throw new VaultException(e);
-        }
-    }
-
-    private void throwVaultException(Response response) {
-        String body = null;
-        try {
-            body = response.body().string();
-        } catch (Exception e) {
-            // ignore
-        }
-        throw new VaultClientException(response.code(), body);
-    }
-
-    private Request.Builder builder(String path, String token) {
-        Request.Builder builder = new Request.Builder().url(getUrl(path));
-        if (token != null) {
-            builder.header(X_VAULT_TOKEN, token);
-        }
-        return builder;
-    }
-
-    private Request.Builder builder(String path) {
-        Request.Builder builder = new Request.Builder().url(getUrl(path));
-        return builder;
-    }
-
-    private Request.Builder builder(String path, Map<String, String> queryParams) {
-        HttpUrl.Builder httpBuilder = HttpUrl.parse(getUrl(path).toExternalForm()).newBuilder();
-        if (queryParams != null) {
-            queryParams.forEach((name, value) -> httpBuilder.addQueryParameter(name, value));
-        }
-        Request.Builder builder = new Request.Builder().url(httpBuilder.build());
-        return builder;
-    }
-
-    private RequestBody requestBody(Object body) {
-        try {
-            return RequestBody.create(JSON, mapper.writeValueAsString(body));
-        } catch (JsonProcessingException e) {
-            throw new VaultException(e);
-        }
-    }
-
-    private URL getUrl(String path) {
-        try {
-            return new URL(this.url, API_VERSION + "/" + path);
-        } catch (MalformedURLException e) {
-            throw new VaultException(e);
-        }
-    }
-
-    private Map<String, String> getHealthParams(boolean isStandByOk, boolean isPerfStandByOk) {
-        Map<String, String> queryParams = new HashMap<>();
-        if (isStandByOk) {
-            queryParams.put("standbyok", "true");
-        }
-
-        if (isPerfStandByOk) {
-            queryParams.put("perfstandbyok", "true");
-        }
-
-        return queryParams;
-    }
-
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultClient.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultClient.java
index a229ff6fe74cf..5efcf0ad7d1cd 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultClient.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultClient.java
@@ -2,132 +2,37 @@
 
 import java.util.Map;
 
-import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleAuth;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuth;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigData;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigResult;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthListRolesResult;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthReadRoleResult;
-import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthRoleData;
-import io.quarkus.vault.runtime.client.dto.auth.VaultLookupSelf;
-import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelf;
-import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuth;
-import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentials;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV1;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2;
-import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2WriteBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultHealthResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultInitResponse;
-import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesLookup;
-import io.quarkus.vault.runtime.client.dto.sys.VaultListPolicyResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyBody;
-import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultRenewLease;
-import io.quarkus.vault.runtime.client.dto.sys.VaultSealStatusResult;
-import io.quarkus.vault.runtime.client.dto.sys.VaultWrapResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyBody;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPGenerateCodeResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPListKeysResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPReadKeyResult;
-import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPValidateCodeResult;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecrypt;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecryptBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncrypt;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncryptBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitRewrapBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSign;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSignBody;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerify;
-import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBody;
-
 public interface VaultClient {
 
     String X_VAULT_TOKEN = "X-Vault-Token";
+    String X_VAULT_NAMESPACE = "X-Vault-Namespace";
     String API_VERSION = "v1";
 
-    VaultUserPassAuth loginUserPass(String user, String password);
-
-    VaultKubernetesAuth loginKubernetes(String role, String jwt);
-
-    void createKubernetesAuthRole(String token, String name, VaultKubernetesAuthRoleData body);
-
-    VaultKubernetesAuthReadRoleResult getVaultKubernetesAuthRole(String token, String name);
-
-    VaultKubernetesAuthListRolesResult listKubernetesAuthRoles(String token);
-
-    void deleteKubernetesAuthRoles(String token, String name);
-
-    void configureKubernetesAuth(String token, VaultKubernetesAuthConfigData config);
-
-    VaultKubernetesAuthConfigResult readKubernetesAuthConfig(String token);
-
-    VaultAppRoleAuth loginAppRole(String roleId, String secretId);
-
-    VaultRenewSelf renewSelf(String token, String increment);
-
-    VaultLookupSelf lookupSelf(String token);
-
-    VaultLeasesLookup lookupLease(String token, String leaseId);
-
-    VaultRenewLease renewLease(String token, String leaseId);
-
-    VaultKvSecretV1 getSecretV1(String token, String secretEnginePath, String path);
-
-    VaultKvSecretV2 getSecretV2(String token, String secretEnginePath, String path);
-
-    void writeSecretV1(String token, String secretEnginePath, String path, Map<String, String> values);
-
-    void writeSecretV2(String token, String secretEnginePath, String path, VaultKvSecretV2WriteBody body);
-
-    void deleteSecretV1(String token, String secretEnginePath, String path);
-
-    void deleteSecretV2(String token, String secretEnginePath, String path);
-
-    VaultDatabaseCredentials generateDatabaseCredentials(String token, String databaseCredentialsRole);
-
-    VaultTransitEncrypt encrypt(String token, String keyName, VaultTransitEncryptBody body);
-
-    VaultTransitDecrypt decrypt(String token, String keyName, VaultTransitDecryptBody body);
-
-    VaultTransitSign sign(String token, String keyName, String hashAlgorithm,
-            VaultTransitSignBody body);
-
-    VaultTransitVerify verify(String token, String keyName, String hashAlgorithm,
-            VaultTransitVerifyBody body);
-
-    VaultTransitEncrypt rewrap(String token, String keyName, VaultTransitRewrapBody body);
-
-    VaultTOTPCreateKeyResult createTOTPKey(String token, String keyName, VaultTOTPCreateKeyBody vaultTOTPCreateKeyBody);
-
-    VaultTOTPReadKeyResult readTOTPKey(String token, String keyName);
-
-    VaultTOTPListKeysResult listTOTPKeys(String token);
-
-    void deleteTOTPKey(String token, String keyName);
+    <T> T put(String path, String token, Object body, int expectedCode);
 
-    VaultTOTPGenerateCodeResult generateTOTPCode(String token, String keyName);
+    <T> T list(String path, String token, Class<T> resultClass);
 
-    VaultTOTPValidateCodeResult validateTOTPCode(String token, String keyName, String code);
+    <T> T delete(String path, String token, int expectedCode);
 
-    int systemHealth(boolean isStandByOk, boolean isPerfStandByOk);
+    <T> T post(String path, String token, Object body, Class<T> resultClass, int expectedCode);
 
-    VaultHealthResult systemHealthStatus(boolean isStandByOk, boolean isPerfStandByOk);
+    <T> T post(String path, String token, Object body, Class<T> resultClass);
 
-    VaultSealStatusResult systemSealStatus();
+    <T> T post(String path, String token, Map<String, String> headers, Object body, Class<T> resultClass);
 
-    VaultInitResponse init(int secretShares, int secretThreshold);
+    <T> T post(String path, String token, Object body, int expectedCode);
 
-    VaultWrapResult wrap(String token, long ttl, Object object);
+    <T> T put(String path, String token, Object body, Class<T> resultClass);
 
-    <T> T unwrap(String wrappingToken, Class<T> resultClass);
+    <T> T put(String path, Object body, Class<T> resultClass);
 
-    VaultPolicyResult getPolicy(String token, String name);
+    <T> T get(String path, String token, Class<T> resultClass);
 
-    void createUpdatePolicy(String token, String name, VaultPolicyBody body);
+    <T> T get(String path, Map<String, String> queryParams, Class<T> resultClass);
 
-    VaultListPolicyResult listPolicies(String token);
+    int head(String path);
 
-    void deletePolicy(String token, String name);
+    int head(String path, Map<String, String> queryParams);
 
+    void close();
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultInternalBase.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultInternalBase.java
new file mode 100644
index 0000000000000..48c9c410fd08d
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VaultInternalBase.java
@@ -0,0 +1,14 @@
+package io.quarkus.vault.runtime.client;
+
+import javax.inject.Inject;
+
+public abstract class VaultInternalBase {
+
+    @Inject
+    protected VaultClient vaultClient;
+
+    public VaultInternalBase setVaultClient(VaultClient vaultClient) {
+        this.vaultClient = vaultClient;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VertxVaultClient.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VertxVaultClient.java
new file mode 100644
index 0000000000000..ec69a0f47bf6f
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/VertxVaultClient.java
@@ -0,0 +1,238 @@
+package io.quarkus.vault.runtime.client;
+
+import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+import static io.quarkus.vault.runtime.client.MutinyVertxClientFactory.createHttpClient;
+import static java.util.Collections.emptyMap;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import javax.annotation.PreDestroy;
+import javax.inject.Singleton;
+
+import org.jboss.logging.Logger;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.vault.VaultException;
+import io.quarkus.vault.runtime.VaultConfigHolder;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.core.buffer.Buffer;
+import io.vertx.mutiny.ext.web.client.HttpRequest;
+import io.vertx.mutiny.ext.web.client.HttpResponse;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+@Singleton
+public class VertxVaultClient implements VaultClient {
+
+    private static final Logger log = Logger.getLogger(VertxVaultClient.class);
+
+    private static final List<String> ROOT_NAMESPACE_API = Arrays.asList("sys/init", "sys/license", "sys/leader", "sys/health",
+            "sys/metrics", "sys/config/state", "sys/host-info", "sys/key-status", "sys/storage", "sys/storage/raft");
+
+    private final Vertx vertx;
+    private URL baseUrl;
+    private final TlsConfig tlsConfig;
+    private final VaultConfigHolder vaultConfigHolder;
+    private WebClient webClient;
+
+    ObjectMapper mapper = new ObjectMapper();
+
+    public VertxVaultClient(VaultConfigHolder vaultConfigHolder, TlsConfig tlsConfig) {
+        this.vaultConfigHolder = vaultConfigHolder;
+        this.tlsConfig = tlsConfig;
+        this.mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+        this.mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        this.vertx = Vertx.vertx();
+    }
+
+    public void init() {
+        VaultBootstrapConfig config = vaultConfigHolder.getVaultBootstrapConfig();
+        this.webClient = createHttpClient(vertx, config, tlsConfig);
+        this.baseUrl = config.url.orElseThrow(() -> new VaultException("no vault url provided"));
+    }
+
+    @PreDestroy
+    @Override
+    public void close() {
+        try {
+            if (webClient != null) {
+                webClient.close();
+            }
+        } finally {
+            vertx.close();
+        }
+    }
+
+    // ---
+
+    public <T> T put(String path, String token, Object body, int expectedCode) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.PUT);
+        return exec(request, body, null, expectedCode);
+    }
+
+    public <T> T list(String path, String token, Class<T> resultClass) {
+        HttpRequest<Buffer> request = builder(path, token).rawMethod("LIST");
+        return exec(request, resultClass);
+    }
+
+    public <T> T delete(String path, String token, int expectedCode) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.DELETE);
+        return exec(request, expectedCode);
+    }
+
+    public <T> T post(String path, String token, Object body, Class<T> resultClass, int expectedCode) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.POST);
+        return exec(request, body, resultClass, expectedCode);
+    }
+
+    public <T> T post(String path, String token, Object body, Class<T> resultClass) {
+        return post(path, token, emptyMap(), body, resultClass);
+    }
+
+    public <T> T post(String path, String token, Map<String, String> headers, Object body, Class<T> resultClass) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.POST);
+        headers.forEach(request::putHeader);
+        return exec(request, body, resultClass);
+    }
+
+    public <T> T post(String path, String token, Object body, int expectedCode) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.POST);
+        return exec(request, body, null, expectedCode);
+    }
+
+    public <T> T put(String path, String token, Object body, Class<T> resultClass) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.PUT);
+        return exec(request, body, resultClass);
+    }
+
+    public <T> T put(String path, Object body, Class<T> resultClass) {
+        HttpRequest<Buffer> request = builder(path).method(HttpMethod.PUT);
+        return exec(request, body, resultClass);
+    }
+
+    public <T> T get(String path, String token, Class<T> resultClass) {
+        HttpRequest<Buffer> request = builder(path, token).method(HttpMethod.GET);
+        return exec(request, resultClass);
+    }
+
+    public <T> T get(String path, Map<String, String> queryParams, Class<T> resultClass) {
+        final HttpRequest<Buffer> request = builder(path, queryParams).method(HttpMethod.GET);
+        return exec(request, resultClass);
+    }
+
+    public int head(String path) {
+        final HttpRequest<Buffer> request = builder(path).method(HttpMethod.HEAD);
+        return exec(request);
+    }
+
+    public int head(String path, Map<String, String> queryParams) {
+        final HttpRequest<Buffer> request = builder(path, queryParams).method(HttpMethod.HEAD);
+        return exec(request);
+    }
+
+    private <T> T exec(HttpRequest<Buffer> request, Class<T> resultClass) {
+        return exec(request, null, resultClass, 200);
+    }
+
+    private <T> T exec(HttpRequest<Buffer> request, int expectedCode) {
+        return exec(request, null, null, expectedCode);
+    }
+
+    private <T> T exec(HttpRequest<Buffer> request, Object body, Class<T> resultClass) {
+        return exec(request, body, resultClass, 200);
+    }
+
+    private <T> T exec(HttpRequest<Buffer> request, Object body, Class<T> resultClass, int expectedCode) {
+        try {
+            Uni<HttpResponse<Buffer>> uni = body == null ? request.send()
+                    : request.sendBuffer(Buffer.buffer(requestBody(body)));
+            HttpResponse<Buffer> response = uni.await().atMost(getRequestTimeout());
+
+            if (response.statusCode() != expectedCode) {
+                throwVaultException(response);
+            }
+            Buffer responseBuffer = response.body();
+            if (responseBuffer != null) {
+                return resultClass == null ? null : mapper.readValue(responseBuffer.toString(), resultClass);
+            } else {
+                return null;
+            }
+        } catch (JsonProcessingException e) {
+            throw new VaultException(e);
+        }
+    }
+
+    private Duration getRequestTimeout() {
+        return vaultConfigHolder.getVaultBootstrapConfig().readTimeout;
+    }
+
+    private int exec(HttpRequest<Buffer> request) {
+        return request.send().await().atMost(getRequestTimeout()).statusCode();
+    }
+
+    private void throwVaultException(HttpResponse<Buffer> response) {
+        String body = null;
+        try {
+            body = response.body().toString();
+        } catch (Exception e) {
+            // ignore
+        }
+        throw new VaultClientException(response.statusCode(), body);
+    }
+
+    private HttpRequest<Buffer> builder(String path, String token) {
+        HttpRequest<Buffer> request = builder(path);
+        if (token != null) {
+            request.putHeader(X_VAULT_TOKEN, token);
+        }
+        Optional<String> namespace = vaultConfigHolder.getVaultBootstrapConfig().enterprise.namespace;
+        if (namespace.isPresent() && !isRootNamespaceAPI(path)) {
+            request.putHeader(X_VAULT_NAMESPACE, namespace.get());
+        }
+        return request;
+    }
+
+    private boolean isRootNamespaceAPI(String path) {
+        return ROOT_NAMESPACE_API.stream().anyMatch(path::startsWith);
+    }
+
+    private HttpRequest<Buffer> builder(String path) {
+        return webClient.getAbs(getUrl(path).toString());
+    }
+
+    private HttpRequest<Buffer> builder(String path, Map<String, String> queryParams) {
+        HttpRequest<Buffer> request = builder(path);
+        if (queryParams != null) {
+            queryParams.forEach(request::addQueryParam);
+        }
+        return request;
+    }
+
+    private String requestBody(Object body) {
+        try {
+            return mapper.writeValueAsString(body);
+        } catch (JsonProcessingException e) {
+            throw new VaultException(e);
+        }
+    }
+
+    private URL getUrl(String path) {
+        try {
+            return new URL(baseUrl, API_VERSION + "/" + path);
+        } catch (MalformedURLException e) {
+            throw new VaultException(e);
+        }
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalAppRoleAuthMethod.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalAppRoleAuthMethod.java
new file mode 100644
index 0000000000000..7b1597bbcf70b
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalAppRoleAuthMethod.java
@@ -0,0 +1,16 @@
+package io.quarkus.vault.runtime.client.authmethod;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleAuth;
+import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleAuthBody;
+
+@Singleton
+public class VaultInternalAppRoleAuthMethod extends VaultInternalBase {
+
+    public VaultAppRoleAuth login(String roleId, String secretId) {
+        VaultAppRoleAuthBody body = new VaultAppRoleAuthBody(roleId, secretId);
+        return vaultClient.post("auth/approle/login", null, body, VaultAppRoleAuth.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalKubernetesAuthMethod.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalKubernetesAuthMethod.java
new file mode 100644
index 0000000000000..47abed7f3aefa
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalKubernetesAuthMethod.java
@@ -0,0 +1,59 @@
+package io.quarkus.vault.runtime.client.authmethod;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.VaultConfigHolder;
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuth;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthBody;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigData;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthConfigResult;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthListRolesResult;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthReadRoleResult;
+import io.quarkus.vault.runtime.client.dto.auth.VaultKubernetesAuthRoleData;
+
+@Singleton
+public class VaultInternalKubernetesAuthMethod extends VaultInternalBase {
+
+    @Inject
+    private VaultConfigHolder vaultConfigHolder;
+
+    private String getKubernetesAuthMountPath() {
+        return vaultConfigHolder.getVaultBootstrapConfig().authentication.kubernetes.authMountPath;
+    }
+
+    public VaultKubernetesAuth login(String role, String jwt) {
+        VaultKubernetesAuthBody body = new VaultKubernetesAuthBody(role, jwt);
+        return vaultClient.post(getKubernetesAuthMountPath() + "/login", null, body, VaultKubernetesAuth.class);
+    }
+
+    public void createAuthRole(String token, String name, VaultKubernetesAuthRoleData body) {
+        vaultClient.post(getKubernetesAuthMountPath() + "/role/" + name, token, body, 204);
+    }
+
+    public VaultKubernetesAuthReadRoleResult getVaultAuthRole(String token, String name) {
+        return vaultClient.get(getKubernetesAuthMountPath() + "/role/" + name, token, VaultKubernetesAuthReadRoleResult.class);
+    }
+
+    public VaultKubernetesAuthListRolesResult listAuthRoles(String token) {
+        return vaultClient.list(getKubernetesAuthMountPath() + "/role", token, VaultKubernetesAuthListRolesResult.class);
+    }
+
+    public void deleteAuthRoles(String token, String name) {
+        vaultClient.delete(getKubernetesAuthMountPath() + "/role/" + name, token, 204);
+    }
+
+    public void configureAuth(String token, VaultKubernetesAuthConfigData config) {
+        vaultClient.post(getKubernetesAuthMountPath() + "/config", token, config, 204);
+    }
+
+    public VaultKubernetesAuthConfigResult readAuthConfig(String token) {
+        return vaultClient.get(getKubernetesAuthMountPath() + "/config", token, VaultKubernetesAuthConfigResult.class);
+    }
+
+    public VaultInternalKubernetesAuthMethod setVaultConfigHolder(VaultConfigHolder vaultConfigHolder) {
+        this.vaultConfigHolder = vaultConfigHolder;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalTokenAuthMethod.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalTokenAuthMethod.java
new file mode 100644
index 0000000000000..9d0a2ee058fb4
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalTokenAuthMethod.java
@@ -0,0 +1,21 @@
+package io.quarkus.vault.runtime.client.authmethod;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.auth.VaultLookupSelf;
+import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelf;
+import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelfBody;
+
+@Singleton
+public class VaultInternalTokenAuthMethod extends VaultInternalBase {
+
+    public VaultRenewSelf renewSelf(String token, String increment) {
+        VaultRenewSelfBody body = new VaultRenewSelfBody(increment);
+        return vaultClient.post("auth/token/renew-self", token, body, VaultRenewSelf.class);
+    }
+
+    public VaultLookupSelf lookupSelf(String token) {
+        return vaultClient.get("auth/token/lookup-self", token, VaultLookupSelf.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalUserpassAuthMethod.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalUserpassAuthMethod.java
new file mode 100644
index 0000000000000..4e51d162e77aa
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/authmethod/VaultInternalUserpassAuthMethod.java
@@ -0,0 +1,16 @@
+package io.quarkus.vault.runtime.client.authmethod;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuth;
+import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuthBody;
+
+@Singleton
+public class VaultInternalUserpassAuthMethod extends VaultInternalBase {
+
+    public VaultUserPassAuth login(String user, String password) {
+        VaultUserPassAuthBody body = new VaultUserPassAuthBody(password);
+        return vaultClient.post("auth/userpass/login/" + user, null, body, VaultUserPassAuth.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/backend/VaultInternalSystemBackend.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/backend/VaultInternalSystemBackend.java
new file mode 100644
index 0000000000000..22f2f09330a8f
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/backend/VaultInternalSystemBackend.java
@@ -0,0 +1,96 @@
+package io.quarkus.vault.runtime.client.backend;
+
+import static java.util.Collections.emptyMap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.sys.VaultHealthResult;
+import io.quarkus.vault.runtime.client.dto.sys.VaultInitBody;
+import io.quarkus.vault.runtime.client.dto.sys.VaultInitResponse;
+import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesBody;
+import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesLookup;
+import io.quarkus.vault.runtime.client.dto.sys.VaultListPolicyResult;
+import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyBody;
+import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyResult;
+import io.quarkus.vault.runtime.client.dto.sys.VaultRenewLease;
+import io.quarkus.vault.runtime.client.dto.sys.VaultSealStatusResult;
+import io.quarkus.vault.runtime.client.dto.sys.VaultUnwrapBody;
+import io.quarkus.vault.runtime.client.dto.sys.VaultWrapResult;
+
+@Singleton
+public class VaultInternalSystemBackend extends VaultInternalBase {
+
+    public int systemHealth(boolean isStandByOk, boolean isPerfStandByOk) {
+        Map<String, String> queryParams = getHealthParams(isStandByOk, isPerfStandByOk);
+        return vaultClient.head("sys/health", queryParams);
+    }
+
+    public VaultHealthResult systemHealthStatus(boolean isStandByOk, boolean isPerfStandByOk) {
+        Map<String, String> queryParams = getHealthParams(isStandByOk, isPerfStandByOk);
+        return vaultClient.get("sys/health", queryParams, VaultHealthResult.class);
+    }
+
+    public VaultSealStatusResult systemSealStatus() {
+        return vaultClient.get("sys/seal-status", emptyMap(), VaultSealStatusResult.class);
+    }
+
+    public VaultInitResponse init(int secretShares, int secretThreshold) {
+        VaultInitBody body = new VaultInitBody(secretShares, secretThreshold);
+        return vaultClient.put("sys/init", body, VaultInitResponse.class);
+    }
+
+    public VaultWrapResult wrap(String token, long ttl, Object object) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("X-Vault-Wrap-TTL", "" + ttl);
+        return vaultClient.post("sys/wrapping/wrap", token, headers, object, VaultWrapResult.class);
+    }
+
+    public <T> T unwrap(String wrappingToken, Class<T> resultClass) {
+        return vaultClient.post("sys/wrapping/unwrap", wrappingToken, VaultUnwrapBody.EMPTY, resultClass);
+    }
+
+    public VaultPolicyResult getPolicy(String token, String name) {
+        return vaultClient.get("sys/policy/" + name, token, VaultPolicyResult.class);
+    }
+
+    public void createUpdatePolicy(String token, String name, VaultPolicyBody body) {
+        vaultClient.put("sys/policy/" + name, token, body, 204);
+    }
+
+    public VaultListPolicyResult listPolicies(String token) {
+        return vaultClient.get("sys/policy", token, VaultListPolicyResult.class);
+    }
+
+    public void deletePolicy(String token, String name) {
+        vaultClient.delete("sys/policy/" + name, token, 204);
+    }
+
+    public VaultLeasesLookup lookupLease(String token, String leaseId) {
+        VaultLeasesBody body = new VaultLeasesBody(leaseId);
+        return vaultClient.put("sys/leases/lookup", token, body, VaultLeasesLookup.class);
+    }
+
+    public VaultRenewLease renewLease(String token, String leaseId) {
+        VaultLeasesBody body = new VaultLeasesBody(leaseId);
+        return vaultClient.put("sys/leases/renew", token, body, VaultRenewLease.class);
+    }
+
+    // ---
+
+    private Map<String, String> getHealthParams(boolean isStandByOk, boolean isPerfStandByOk) {
+        Map<String, String> queryParams = new HashMap<>();
+        if (isStandByOk) {
+            queryParams.put("standbyok", "true");
+        }
+
+        if (isPerfStandByOk) {
+            queryParams.put("perfstandbyok", "true");
+        }
+
+        return queryParams;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBody.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBody.java
deleted file mode 100644
index cdc8901ddf674..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/dto/transit/VaultTransitEncryptBody.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.quarkus.vault.runtime.client.dto.transit;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import io.quarkus.vault.runtime.client.dto.VaultModel;
-
-public class VaultTransitEncryptBody implements VaultModel {
-
-    public String type;
-    @JsonProperty("convergent_encryption")
-    public String convergentEncryption;
-
-    @JsonProperty("batch_input")
-    public List<VaultTransitEncryptBatchInput> batchInput;
-
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalDatabaseSecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalDatabaseSecretEngine.java
new file mode 100644
index 0000000000000..19d6faa7bd9ee
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalDatabaseSecretEngine.java
@@ -0,0 +1,14 @@
+package io.quarkus.vault.runtime.client.secretengine;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentials;
+
+@Singleton
+public class VaultInternalDatabaseSecretEngine extends VaultInternalBase {
+
+    public VaultDatabaseCredentials generateCredentials(String token, String databaseCredentialsRole) {
+        return vaultClient.get("database/creds/" + databaseCredentialsRole, token, VaultDatabaseCredentials.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalKvV1SecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalKvV1SecretEngine.java
new file mode 100644
index 0000000000000..5d1b626286a80
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalKvV1SecretEngine.java
@@ -0,0 +1,29 @@
+package io.quarkus.vault.runtime.client.secretengine;
+
+import java.util.Map;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvListSecrets;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV1;
+
+@Singleton
+public class VaultInternalKvV1SecretEngine extends VaultInternalBase {
+
+    public void deleteSecret(String token, String secretEnginePath, String path) {
+        vaultClient.delete(secretEnginePath + "/" + path, token, 204);
+    }
+
+    public void writeSecret(String token, String secretEnginePath, String path, Map<String, String> secret) {
+        vaultClient.post(secretEnginePath + "/" + path, token, secret, null, 204);
+    }
+
+    public VaultKvSecretV1 getSecret(String token, String secretEnginePath, String path) {
+        return vaultClient.get(secretEnginePath + "/" + path, token, VaultKvSecretV1.class);
+    }
+
+    public VaultKvListSecrets listSecrets(String token, String secretEnginePath, String path) {
+        return vaultClient.list(secretEnginePath + "/" + path, token, VaultKvListSecrets.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalKvV2SecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalKvV2SecretEngine.java
new file mode 100644
index 0000000000000..fe88fa30be617
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalKvV2SecretEngine.java
@@ -0,0 +1,29 @@
+package io.quarkus.vault.runtime.client.secretengine;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvListSecrets;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2Write;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2WriteBody;
+
+@Singleton
+public class VaultInternalKvV2SecretEngine extends VaultInternalBase {
+
+    public VaultKvSecretV2 getSecret(String token, String secretEnginePath, String path) {
+        return vaultClient.get(secretEnginePath + "/data/" + path, token, VaultKvSecretV2.class);
+    }
+
+    public void writeSecret(String token, String secretEnginePath, String path, VaultKvSecretV2WriteBody body) {
+        vaultClient.post(secretEnginePath + "/data/" + path, token, body, VaultKvSecretV2Write.class);
+    }
+
+    public void deleteSecret(String token, String secretEnginePath, String path) {
+        vaultClient.delete(secretEnginePath + "/data/" + path, token, 204);
+    }
+
+    public VaultKvListSecrets listSecrets(String token, String secretEnginePath, String path) {
+        return vaultClient.list(secretEnginePath + "/metadata/" + path, token, VaultKvListSecrets.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalTOPTSecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalTOPTSecretEngine.java
new file mode 100644
index 0000000000000..c1534f6794cc9
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalTOPTSecretEngine.java
@@ -0,0 +1,53 @@
+package io.quarkus.vault.runtime.client.secretengine;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyBody;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPCreateKeyResult;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPGenerateCodeResult;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPListKeysResult;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPReadKeyResult;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPValidateCodeBody;
+import io.quarkus.vault.runtime.client.dto.totp.VaultTOTPValidateCodeResult;
+
+@Singleton
+public class VaultInternalTOPTSecretEngine extends VaultInternalBase {
+
+    public VaultTOTPCreateKeyResult createTOTPKey(String token, String keyName, VaultTOTPCreateKeyBody body) {
+        String path = "totp/keys/" + keyName;
+
+        // Depending on parameters it might produce an output or not
+        if (body.isProducingOutput()) {
+            return vaultClient.post(path, token, body, VaultTOTPCreateKeyResult.class, 200);
+        } else {
+            vaultClient.post(path, token, body, 204);
+            return null;
+        }
+    }
+
+    public VaultTOTPReadKeyResult readTOTPKey(String token, String keyName) {
+        String path = "totp/keys/" + keyName;
+        return vaultClient.get(path, token, VaultTOTPReadKeyResult.class);
+    }
+
+    public VaultTOTPListKeysResult listTOTPKeys(String token) {
+        return vaultClient.list("totp/keys", token, VaultTOTPListKeysResult.class);
+    }
+
+    public void deleteTOTPKey(String token, String keyName) {
+        String path = "totp/keys/" + keyName;
+        vaultClient.delete(path, token, 204);
+    }
+
+    public VaultTOTPGenerateCodeResult generateTOTPCode(String token, String keyName) {
+        String path = "totp/code/" + keyName;
+        return vaultClient.get(path, token, VaultTOTPGenerateCodeResult.class);
+    }
+
+    public VaultTOTPValidateCodeResult validateTOTPCode(String token, String keyName, String code) {
+        String path = "totp/code/" + keyName;
+        VaultTOTPValidateCodeBody body = new VaultTOTPValidateCodeBody(code);
+        return vaultClient.post(path, token, body, VaultTOTPValidateCodeResult.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalTransitSecretEngine.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalTransitSecretEngine.java
new file mode 100644
index 0000000000000..5eb7e0f7a7ed4
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/client/secretengine/VaultInternalTransitSecretEngine.java
@@ -0,0 +1,70 @@
+package io.quarkus.vault.runtime.client.secretengine;
+
+import javax.inject.Singleton;
+
+import io.quarkus.vault.runtime.client.VaultInternalBase;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitCreateKeyBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecrypt;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitDecryptBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncrypt;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitEncryptBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitKeyConfigBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitKeyExport;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitListKeysResult;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitReadKeyResult;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitRewrapBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSign;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitSignBody;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerify;
+import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBody;
+
+@Singleton
+public class VaultInternalTransitSecretEngine extends VaultInternalBase {
+
+    public void updateTransitKeyConfiguration(String token, String keyName, VaultTransitKeyConfigBody body) {
+        vaultClient.post("transit/keys/" + keyName + "/config", token, body, 204);
+    }
+
+    public void createTransitKey(String token, String keyName, VaultTransitCreateKeyBody body) {
+        vaultClient.post("transit/keys/" + keyName, token, body, 204);
+    }
+
+    public void deleteTransitKey(String token, String keyName) {
+        vaultClient.delete("transit/keys/" + keyName, token, 204);
+    }
+
+    public VaultTransitKeyExport exportTransitKey(String token, String keyType, String keyName, String version) {
+        String path = "transit/export/" + keyType + "/" + keyName + (version != null ? "/" + version : "");
+        return vaultClient.get(path, token, VaultTransitKeyExport.class);
+    }
+
+    public VaultTransitReadKeyResult readTransitKey(String token, String keyName) {
+        return vaultClient.get("transit/keys/" + keyName, token, VaultTransitReadKeyResult.class);
+    }
+
+    public VaultTransitListKeysResult listTransitKeys(String token) {
+        return vaultClient.list("transit/keys", token, VaultTransitListKeysResult.class);
+    }
+
+    public VaultTransitEncrypt encrypt(String token, String keyName, VaultTransitEncryptBody body) {
+        return vaultClient.post("transit/encrypt/" + keyName, token, body, VaultTransitEncrypt.class);
+    }
+
+    public VaultTransitDecrypt decrypt(String token, String keyName, VaultTransitDecryptBody body) {
+        return vaultClient.post("transit/decrypt/" + keyName, token, body, VaultTransitDecrypt.class);
+    }
+
+    public VaultTransitSign sign(String token, String keyName, String hashAlgorithm, VaultTransitSignBody body) {
+        String path = "transit/sign/" + keyName + (hashAlgorithm == null ? "" : "/" + hashAlgorithm);
+        return vaultClient.post(path, token, body, VaultTransitSign.class);
+    }
+
+    public VaultTransitVerify verify(String token, String keyName, String hashAlgorithm, VaultTransitVerifyBody body) {
+        String path = "transit/verify/" + keyName + (hashAlgorithm == null ? "" : "/" + hashAlgorithm);
+        return vaultClient.post(path, token, body, VaultTransitVerify.class);
+    }
+
+    public VaultTransitEncrypt rewrap(String token, String keyName, VaultTransitRewrapBody body) {
+        return vaultClient.post("transit/rewrap/" + keyName, token, body, VaultTransitEncrypt.class);
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/HealthConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/HealthConfig.java
index 01dc2e5351a91..01df251816584 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/HealthConfig.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/HealthConfig.java
@@ -25,4 +25,12 @@ public class HealthConfig {
     @ConfigItem
     public boolean performanceStandByOk;
 
+    @Override
+    public String toString() {
+        return "HealthConfig{" +
+                "enabled=" + enabled +
+                ", standByOk=" + standByOk +
+                ", performanceStandByOk=" + performanceStandByOk +
+                '}';
+    }
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBootstrapConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBootstrapConfig.java
new file mode 100644
index 0000000000000..5f82842529cff
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBootstrapConfig.java
@@ -0,0 +1,320 @@
+package io.quarkus.vault.runtime.config;
+
+import static io.quarkus.vault.runtime.LogConfidentialityLevel.LOW;
+import static io.quarkus.vault.runtime.LogConfidentialityLevel.MEDIUM;
+import static io.quarkus.vault.runtime.config.VaultAuthenticationType.APPROLE;
+import static io.quarkus.vault.runtime.config.VaultAuthenticationType.KUBERNETES;
+import static io.quarkus.vault.runtime.config.VaultAuthenticationType.USERPASS;
+
+import java.net.URL;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigDocMapKey;
+import io.quarkus.runtime.annotations.ConfigDocSection;
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.vault.runtime.LogConfidentialityLevel;
+
+@ConfigRoot(name = VaultBootstrapConfig.NAME, phase = ConfigPhase.BOOTSTRAP)
+public class VaultBootstrapConfig {
+
+    public static final String NAME = "vault";
+    public static final String DEFAULT_CONFIG_ORDINAL = "270";
+    public static final String DEFAULT_KUBERNETES_JWT_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+    public static final String DEFAULT_KV_SECRET_ENGINE_MOUNT_PATH = "secret";
+    public static final String KV_SECRET_ENGINE_VERSION_V2 = "2";
+    public static final String DEFAULT_RENEW_GRACE_PERIOD = "1H";
+    public static final String DEFAULT_SECRET_CONFIG_CACHE_PERIOD = "10M";
+    public static final String KUBERNETES_CACERT = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
+    public static final String DEFAULT_CONNECT_TIMEOUT = "5S";
+    public static final String DEFAULT_READ_TIMEOUT = "1S";
+    public static final String DEFAULT_TLS_USE_KUBERNETES_CACERT = "true";
+    public static final String DEFAULT_KUBERNETES_AUTH_MOUNT_PATH = "auth/kubernetes";
+
+    /**
+     * Microprofile Config ordinal.
+     * <p>
+     * This is provided as an alternative to the `config_ordinal` property defined by the specification, to
+     * make it easier and more natural for applications to override the default ordinal.
+     * <p>
+     * The default value is higher than the file system or jar ordinals, but lower than env vars.
+     */
+    @ConfigItem(defaultValue = DEFAULT_CONFIG_ORDINAL)
+    public int configOrdinal;
+
+    /**
+     * Vault server url.
+     * <p>
+     * Example: https://localhost:8200
+     * <p>
+     * See also the documentation for the `kv-secret-engine-mount-path` property for some insights on how
+     * the full Vault url gets built.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Optional<URL> url;
+
+    /**
+     * Vault Enterprise
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public VaultEnterpriseConfig enterprise;
+
+    /**
+     * Authentication
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public VaultAuthenticationConfig authentication;
+
+    /**
+     * Renew grace period duration.
+     * <p>
+     * This value if used to extend a lease before it expires its ttl, or recreate a new lease before the current
+     * lease reaches its max_ttl.
+     * By default Vault leaseDuration is equal to 7 days (ie: 168h or 604800s).
+     * If a connection pool maxLifetime is set, it is reasonable to set the renewGracePeriod to be greater
+     * than the maxLifetime, so that we are sure we get a chance to renew leases before we reach the ttl.
+     * In any case you need to make sure there will be attempts to fetch secrets within the renewGracePeriod,
+     * because that is when the renewals will happen. This is particularly important for db dynamic secrets
+     * because if the lease reaches its ttl or max_ttl, the password of the db user will become invalid and
+     * it will be not longer possible to log in.
+     * This value should also be smaller than the ttl, otherwise that would mean that we would try to recreate
+     * leases all the time.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = DEFAULT_RENEW_GRACE_PERIOD)
+    public Duration renewGracePeriod;
+
+    /**
+     * Vault config source cache period.
+     * <p>
+     * Properties fetched from vault as MP config will be kept in a cache, and will not be fetched from vault
+     * again until the expiration of that period.
+     * This property is ignored if `secret-config-kv-path` is not set.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = DEFAULT_SECRET_CONFIG_CACHE_PERIOD)
+    public Duration secretConfigCachePeriod;
+
+    // @formatter:off
+    /**
+     * List of comma separated vault paths in kv store,
+     * where all properties will be available as MP config properties **as-is**, with no prefix.
+     * <p>
+     * For instance, if vault contains property `foo`, it will be made available to the
+     * quarkus application as `@ConfigProperty(name = "foo") String foo;`
+     * <p>
+     * If 2 paths contain the same property, the last path will win.
+     * <p>
+     * For instance if
+     * <p>
+     * * `secret/base-config` contains `foo=bar` and
+     * * `secret/myapp/config` contains `foo=myappbar`, then
+     * <p>
+     * `@ConfigProperty(name = "foo") String foo` will have value `myappbar`
+     * with application properties `quarkus.vault.secret-config-kv-path=base-config,myapp/config`
+     * <p>
+     * See also the documentation for the `kv-secret-engine-mount-path` property for some insights on how
+     * the full Vault url gets built.
+     *
+     * @asciidoclet
+     */
+    // @formatter:on
+    @ConfigItem
+    public Optional<List<String>> secretConfigKvPath;
+
+    /**
+     * KV store paths configuration.
+     */
+    @ConfigItem(name = "secret-config-kv-path")
+    @ConfigDocMapKey("prefix")
+    public Map<String, KvPathConfig> secretConfigKvPathPrefix;
+
+    /**
+     * Used to hide confidential infos, for logging in particular.
+     * Possible values are:
+     * <p>
+     * * low: display all secrets.
+     * * medium: display only usernames and lease ids (ie: passwords and tokens are masked).
+     * * high: hide lease ids and dynamic credentials username.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = "medium")
+    public LogConfidentialityLevel logConfidentialityLevel;
+
+    /**
+     * Kv secret engine version.
+     * <p>
+     * see https://www.vaultproject.io/docs/secrets/kv/index.html
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = KV_SECRET_ENGINE_VERSION_V2)
+    public int kvSecretEngineVersion;
+
+    /**
+     * KV secret engine path.
+     * <p>
+     * This value is used when building the url path in the KV secret engine programmatic access
+     * (i.e. `VaultKVSecretEngine`) and the vault config source (i.e. fetching configuration properties from Vault).
+     * <p>
+     * For a v2 KV secret engine (default - see `kv-secret-engine-version property`)
+     * the full url is built from the expression `<url>/v1/</kv-secret-engine-mount-path>/data/...`.
+     * <p>
+     * With property `quarkus.vault.url=https://localhost:8200`, the following call
+     * `vaultKVSecretEngine.readSecret("foo/bar")` would lead eventually to a `GET` on Vault with the following
+     * url: `https://localhost:8200/v1/secret/data/foo/bar`.
+     * <p>
+     * With a KV secret engine v1, the url changes to: `<url>/v1/</kv-secret-engine-mount-path>/...`.
+     * <p>
+     * The same logic is applied to the Vault config source. With `quarkus.vault.secret-config-kv-path=config/myapp`
+     * The secret properties would be fetched from Vault using a `GET` on
+     * `https://localhost:8200/v1/secret/data/config/myapp` for a KV secret engine v2 (or
+     * `https://localhost:8200/v1/secret/config/myapp` for a KV secret engine v1).
+     * <p>
+     * see https://www.vaultproject.io/docs/secrets/kv/index.html
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = DEFAULT_KV_SECRET_ENGINE_MOUNT_PATH)
+    public String kvSecretEngineMountPath;
+
+    /**
+     * TLS
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public VaultTlsConfig tls;
+
+    /**
+     * Timeout to establish a connection with Vault.
+     */
+    @ConfigItem(defaultValue = DEFAULT_CONNECT_TIMEOUT)
+    public Duration connectTimeout;
+
+    /**
+     * Request timeout on Vault.
+     */
+    @ConfigItem(defaultValue = DEFAULT_READ_TIMEOUT)
+    public Duration readTimeout;
+
+    /**
+     * List of named credentials providers, such as: `quarkus.vault.credentials-provider.foo.kv-path=mypath`
+     * <p>
+     * This defines a credentials provider `foo` returning key `password` from vault path `mypath`.
+     * Once defined, this provider can be used in credentials consumers, such as the Agroal connection pool.
+     * <p>
+     * Example: `quarkus.datasource.credentials-provider=foo`
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Map<String, CredentialsProviderConfig> credentialsProvider;
+
+    /**
+     * Transit Engine
+     */
+    @ConfigItem
+    @ConfigDocSection
+    public VaultTransitConfig transit;
+
+    public VaultAuthenticationType getAuthenticationType() {
+        if (authentication.kubernetes.role.isPresent()) {
+            return KUBERNETES;
+        } else if (authentication.isUserpass()) {
+            return USERPASS;
+        } else if (authentication.isAppRole()) {
+            return APPROLE;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "VaultRuntimeConfig{" +
+                "url=" + url +
+                ", kubernetesAuthenticationMountPath=" + authentication.kubernetes.authMountPath +
+                ", kubernetesAuthenticationRole="
+                + logConfidentialityLevel.maskWithTolerance(authentication.kubernetes.role.orElse(""), MEDIUM) +
+                ", kubernetesJwtTokenPath='" + authentication.kubernetes.jwtTokenPath + '\'' +
+                ", userpassUsername='"
+                + logConfidentialityLevel.maskWithTolerance(authentication.userpass.username.orElse(""), MEDIUM)
+                + '\'' +
+                ", userpassPassword='"
+                + logConfidentialityLevel.maskWithTolerance(authentication.userpass.password.orElse(""), LOW) + '\''
+                +
+                ", appRoleRoleId='"
+                + logConfidentialityLevel.maskWithTolerance(authentication.appRole.roleId.orElse(""), MEDIUM) + '\'' +
+                ", appRoleSecretId='"
+                + logConfidentialityLevel.maskWithTolerance(authentication.appRole.secretId.orElse(""), LOW) + '\'' +
+                ", appRoleSecretIdWrappingToken='"
+                + logConfidentialityLevel.maskWithTolerance(authentication.appRole.secretIdWrappingToken.orElse(""), LOW) + '\''
+                +
+                ", clientToken=" + logConfidentialityLevel.maskWithTolerance(authentication.clientToken.orElse(""), LOW) +
+                ", clientTokenWrappingToken="
+                + logConfidentialityLevel.maskWithTolerance(authentication.clientTokenWrappingToken.orElse(""), LOW) +
+                ", renewGracePeriod=" + renewGracePeriod +
+                ", cachePeriod=" + secretConfigCachePeriod +
+                ", logConfidentialityLevel=" + logConfidentialityLevel +
+                ", kvSecretEngineVersion=" + kvSecretEngineVersion +
+                ", kvSecretEngineMountPath='" + kvSecretEngineMountPath + '\'' +
+                ", tlsSkipVerify=" + tls.skipVerify +
+                ", tlsCaCert=" + tls.caCert +
+                ", connectTimeout=" + connectTimeout +
+                ", readTimeout=" + readTimeout +
+                '}';
+    }
+
+    @ConfigGroup
+    public static class KvPathConfig {
+        // @formatter:off
+        /**
+         * List of comma separated vault paths in kv store,
+         * where all properties will be available as **prefixed** MP config properties.
+         * <p>
+         * For instance if the application properties contains
+         * `quarkus.vault.secret-config-kv-path.myprefix=config`, and
+         * vault path `secret/config` contains `foo=bar`, then `myprefix.foo`
+         * will be available in the MP config.
+         * <p>
+         * If the same property is available in 2 different paths for the same prefix, the last one
+         * will win.
+         * <p>
+         * See also the documentation for the `quarkus.vault.kv-secret-engine-mount-path` property for some insights on how
+         * the full Vault url gets built.
+         *
+         * @asciidoclet
+         */
+        // @formatter:on
+        @ConfigItem(name = ConfigItem.PARENT)
+        List<String> paths;
+
+        public KvPathConfig(List<String> paths) {
+            this.paths = paths;
+        }
+
+        public KvPathConfig() {
+            paths = Collections.emptyList();
+        }
+
+        @Override
+        public String toString() {
+            return "SecretConfigKvPathConfig{" +
+                    "paths=" + paths +
+                    '}';
+        }
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBuildTimeConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBuildTimeConfig.java
index 1dc2f713ab612..c821f3c73df60 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBuildTimeConfig.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultBuildTimeConfig.java
@@ -15,4 +15,10 @@ public class VaultBuildTimeConfig {
     @ConfigDocSection
     public HealthConfig health;
 
+    @Override
+    public String toString() {
+        return "VaultBuildTimeConfig{" +
+                "health=" + health +
+                '}';
+    }
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java
index a7caf48362787..439f467bb6161 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java
@@ -1,83 +1,39 @@
 package io.quarkus.vault.runtime.config;
 
-import static io.quarkus.credentials.CredentialsProvider.PASSWORD_PROPERTY_NAME;
-import static io.quarkus.vault.runtime.LogConfidentialityLevel.MEDIUM;
 import static io.quarkus.vault.runtime.config.VaultCacheEntry.tryReturnLastKnownValue;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_CONNECT_TIMEOUT;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_KUBERNETES_AUTH_MOUNT_PATH;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_KUBERNETES_JWT_TOKEN_PATH;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_KV_SECRET_ENGINE_MOUNT_PATH;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_READ_TIMEOUT;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_RENEW_GRACE_PERIOD;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_SECRET_CONFIG_CACHE_PERIOD;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_TLS_SKIP_VERIFY;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_TLS_USE_KUBERNETES_CACERT;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.KV_SECRET_ENGINE_VERSION_V2;
-import static java.lang.Boolean.parseBoolean;
-import static java.lang.Integer.parseInt;
 import static java.util.Collections.emptyMap;
-import static java.util.Optional.empty;
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.time.Duration;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.jboss.logging.Logger;
 
-import io.quarkus.runtime.configuration.DurationConverter;
-import io.quarkus.vault.VaultException;
-import io.quarkus.vault.runtime.LogConfidentialityLevel;
-import io.quarkus.vault.runtime.VaultManager;
+import io.quarkus.arc.Arc;
+import io.quarkus.vault.VaultKVSecretEngine;
 
 public class VaultConfigSource implements ConfigSource {
 
     private static final Logger log = Logger.getLogger(VaultConfigSource.class);
 
-    private static final String PROPERTY_PREFIX = "quarkus.vault.";
-    public static final Pattern CREDENTIALS_PATTERN = Pattern.compile("^quarkus\\.vault\\.credentials-provider\\.([^.]+)\\.");
-    public static final Pattern TRANSIT_KEY_PATTERN = Pattern.compile("^quarkus\\.vault\\.transit.key\\.([^.]+)\\.");
-    public static final Pattern SECRET_CONFIG_KV_PATH_PATTERN = Pattern
-            .compile("^quarkus\\.vault\\.secret-config-kv-path\\.([^.]+)$");
-
     private AtomicReference<VaultCacheEntry<Map<String, String>>> cache = new AtomicReference<>(null);
-    private AtomicReference<VaultRuntimeConfig> serverConfig = new AtomicReference<>(null);
-    private AtomicReference<VaultBuildTimeConfig> buildServerConfig = new AtomicReference<>(null);
-
-    private AtomicBoolean init = new AtomicBoolean(false);
-    private int ordinal;
-    private DurationConverter durationConverter = new DurationConverter();
+    private VaultBootstrapConfig vaultBootstrapConfig;
 
-    public VaultConfigSource(int ordinal) {
-        this.ordinal = ordinal;
+    public VaultConfigSource(VaultBootstrapConfig vaultBootstrapConfig) {
+        this.vaultBootstrapConfig = vaultBootstrapConfig;
     }
 
     @Override
     public String getName() {
-        return "vault";
+        return VaultBootstrapConfig.NAME;
     }
 
     @Override
     public int getOrdinal() {
-        return ordinal;
+        return vaultBootstrapConfig.configOrdinal;
     }
 
     /**
@@ -92,22 +48,13 @@ public Map<String, String> getProperties() {
 
     @Override
     public String getValue(String propertyName) {
-
-        VaultRuntimeConfig serverConfig = getRuntimeConfig();
-
-        if (!serverConfig.url.isPresent()) {
-            return null;
-        }
-
-        return getSecretConfig().get(propertyName);
+        return vaultBootstrapConfig.url.isPresent() ? getSecretConfig().get(propertyName) : null;
     }
 
     private Map<String, String> getSecretConfig() {
 
-        VaultRuntimeConfig serverConfig = getRuntimeConfig();
-
         VaultCacheEntry<Map<String, String>> cacheEntry = cache.get();
-        if (cacheEntry != null && cacheEntry.youngerThan(serverConfig.secretConfigCachePeriod)) {
+        if (cacheEntry != null && cacheEntry.youngerThan(vaultBootstrapConfig.secretConfigCachePeriod)) {
             return cacheEntry.getValue();
         }
 
@@ -115,13 +62,10 @@ private Map<String, String> getSecretConfig() {
 
         try {
             // default kv paths
-            if (serverConfig.secretConfigKvPath.isPresent()) {
-                fetchSecrets(serverConfig.secretConfigKvPath.get(), null, properties);
-            }
+            vaultBootstrapConfig.secretConfigKvPath.ifPresent(strings -> fetchSecrets(strings, null, properties));
 
             // prefixed kv paths
-            serverConfig.secretConfigKvPrefixPath.entrySet()
-                    .forEach(entry -> fetchSecrets(entry.getValue(), entry.getKey(), properties));
+            vaultBootstrapConfig.secretConfigKvPathPrefix.forEach((key, value) -> fetchSecrets(value.paths, key, properties));
 
             log.debug("loaded " + properties.size() + " properties from vault");
         } catch (RuntimeException e) {
@@ -138,8 +82,11 @@ private void fetchSecrets(List<String> paths, String prefix, Map<String, String>
     }
 
     private Map<String, String> fetchSecrets(String path, String prefix) {
-        VaultManager instance = getVaultManager();
-        return instance == null ? emptyMap() : prefixMap(instance.getVaultKvManager().readSecret(path), prefix);
+        return prefixMap(getVaultKVSecretEngine().readSecret(path), prefix);
+    }
+
+    private VaultKVSecretEngine getVaultKVSecretEngine() {
+        return Arc.container().instance(VaultKVSecretEngine.class).get();
     }
 
     private Map<String, String> prefixMap(Map<String, String> map, String prefix) {
@@ -147,218 +94,4 @@ private Map<String, String> prefixMap(Map<String, String> map, String prefix) {
                 ? map
                 : map.entrySet().stream().collect(toMap(entry -> prefix + "." + entry.getKey(), Map.Entry::getValue));
     }
-
-    // ---
-
-    private VaultManager getVaultManager() {
-
-        VaultBuildTimeConfig buildTimeConfig = getBuildtimeConfig();
-        VaultRuntimeConfig serverConfig = getRuntimeConfig();
-
-        // init at most once
-        if (init.compareAndSet(false, true)) {
-            VaultManager.init(buildTimeConfig, serverConfig);
-        }
-
-        return VaultManager.getInstance();
-    }
-
-    private VaultRuntimeConfig getRuntimeConfig() {
-        return getConfig(this.serverConfig, () -> loadRuntimeConfig(), "runtime");
-    }
-
-    private VaultBuildTimeConfig getBuildtimeConfig() {
-        return getConfig(this.buildServerConfig, () -> loadBuildtimeConfig(), "buildtime");
-    }
-
-    private <T> T getConfig(AtomicReference<T> ref, Supplier<T> supplier, String name) {
-        T config = ref.get();
-        if (config != null) {
-            return config;
-        } else {
-            config = supplier.get();
-            log.debug("loaded vault " + name + " config " + config);
-            ref.set(config);
-            return ref.get();
-        }
-    }
-
-    // need to recode config loading since we are at the config source level
-    private VaultBuildTimeConfig loadBuildtimeConfig() {
-        VaultBuildTimeConfig vaultBuildTimeConfig = new VaultBuildTimeConfig();
-        vaultBuildTimeConfig.health = new HealthConfig();
-
-        vaultBuildTimeConfig.health.enabled = parseBoolean(
-                getVaultProperty("health.enabled", "false"));
-
-        vaultBuildTimeConfig.health.standByOk = parseBoolean(
-                getVaultProperty("health.stand-by-ok", "false"));
-        vaultBuildTimeConfig.health.performanceStandByOk = parseBoolean(
-                getVaultProperty("health.performance-stand-by-ok", "false"));
-
-        return vaultBuildTimeConfig;
-    }
-
-    // need to recode config loading since we are at the config source level
-    private VaultRuntimeConfig loadRuntimeConfig() {
-
-        VaultRuntimeConfig serverConfig = new VaultRuntimeConfig();
-        serverConfig.tls = new VaultTlsConfig();
-        serverConfig.transit = new VaultTransitConfig();
-        serverConfig.authentication = new VaultAuthenticationConfig();
-        serverConfig.authentication.userpass = new VaultUserpassAuthenticationConfig();
-        serverConfig.authentication.appRole = new VaultAppRoleAuthenticationConfig();
-        serverConfig.authentication.kubernetes = new VaultKubernetesAuthenticationConfig();
-        serverConfig.url = newURL(getOptionalVaultProperty("url"));
-        serverConfig.authentication.clientToken = getOptionalVaultProperty("authentication.client-token");
-        serverConfig.authentication.clientTokenWrappingToken = getOptionalVaultProperty(
-                "authentication.client-token-wrapping-token");
-        serverConfig.authentication.kubernetes.role = getOptionalVaultProperty("authentication.kubernetes.role");
-        serverConfig.authentication.kubernetes.jwtTokenPath = getVaultProperty("authentication.kubernetes.jwt-token-path",
-                DEFAULT_KUBERNETES_JWT_TOKEN_PATH);
-        serverConfig.authentication.kubernetes.authMountPath = getVaultProperty("authentication.kubernetes.auth-mount-path",
-                DEFAULT_KUBERNETES_AUTH_MOUNT_PATH);
-        serverConfig.authentication.userpass.username = getOptionalVaultProperty("authentication.userpass.username");
-        serverConfig.authentication.userpass.password = getOptionalVaultProperty("authentication.userpass.password");
-        serverConfig.authentication.userpass.passwordWrappingToken = getOptionalVaultProperty(
-                "authentication.userpass.password-wrapping-token");
-        serverConfig.authentication.appRole.roleId = getOptionalVaultProperty("authentication.app-role.role-id");
-        serverConfig.authentication.appRole.secretId = getOptionalVaultProperty("authentication.app-role.secret-id");
-        serverConfig.authentication.appRole.secretIdWrappingToken = getOptionalVaultProperty(
-                "authentication.app-role.secret-id-wrapping-token");
-        serverConfig.renewGracePeriod = getVaultDuration("renew-grace-period", DEFAULT_RENEW_GRACE_PERIOD);
-        serverConfig.secretConfigCachePeriod = getVaultDuration("secret-config-cache-period",
-                DEFAULT_SECRET_CONFIG_CACHE_PERIOD);
-        serverConfig.logConfidentialityLevel = LogConfidentialityLevel
-                .valueOf(getVaultProperty("log-confidentiality-level", MEDIUM.name()).toUpperCase());
-        serverConfig.kvSecretEngineVersion = parseInt(
-                getVaultProperty("kv-secret-engine-version", KV_SECRET_ENGINE_VERSION_V2));
-        serverConfig.kvSecretEngineMountPath = getVaultProperty("kv-secret-engine-mount-path",
-                DEFAULT_KV_SECRET_ENGINE_MOUNT_PATH);
-        serverConfig.secretConfigKvPath = getOptionalListProperty("secret-config-kv-path");
-        serverConfig.tls.skipVerify = parseBoolean(getVaultProperty("tls.skip-verify", DEFAULT_TLS_SKIP_VERIFY));
-        serverConfig.tls.useKubernetesCaCert = parseBoolean(
-                getVaultProperty("tls.use-kubernetes-ca-cert", DEFAULT_TLS_USE_KUBERNETES_CACERT));
-        serverConfig.tls.caCert = getOptionalVaultProperty("tls.ca-cert");
-        serverConfig.connectTimeout = getVaultDuration("connect-timeout", DEFAULT_CONNECT_TIMEOUT);
-        serverConfig.readTimeout = getVaultDuration("read-timeout", DEFAULT_READ_TIMEOUT);
-
-        serverConfig.credentialsProvider = createCredentialProviderConfigParser().getConfig();
-        serverConfig.transit.key = createTransitKeyConfigParser().getConfig();
-        serverConfig.secretConfigKvPrefixPath = getSecretConfigKvPrefixPaths();
-
-        return serverConfig;
-    }
-
-    private VaultMapConfigParser<CredentialsProviderConfig> createCredentialProviderConfigParser() {
-        return new VaultMapConfigParser<>(CREDENTIALS_PATTERN, this::getCredentialsProviderConfig, getConfigSourceStream());
-    }
-
-    private CredentialsProviderConfig getCredentialsProviderConfig(String name) {
-        String prefix = "credentials-provider." + name;
-        CredentialsProviderConfig config = new CredentialsProviderConfig();
-        config.databaseCredentialsRole = getOptionalVaultProperty(prefix + ".database-credentials-role");
-        config.kvPath = getOptionalVaultProperty(prefix + ".kv-path");
-        config.kvKey = getVaultProperty(prefix + ".kv-key", PASSWORD_PROPERTY_NAME);
-        return config;
-    }
-
-    private VaultMapConfigParser<TransitKeyConfig> createTransitKeyConfigParser() {
-        return new VaultMapConfigParser<>(TRANSIT_KEY_PATTERN, this::getTransitKeyConfig, getConfigSourceStream());
-    }
-
-    private TransitKeyConfig getTransitKeyConfig(String name) {
-        String prefix = "transit.key." + name;
-        TransitKeyConfig config = new TransitKeyConfig();
-        config.name = getOptionalVaultProperty(prefix + ".name");
-        config.hashAlgorithm = getOptionalVaultProperty(prefix + ".hash-algorithm");
-        config.signatureAlgorithm = getOptionalVaultProperty(prefix + ".signature-algorithm");
-        config.type = getOptionalVaultProperty(prefix + ".type");
-        config.convergentEncryption = getOptionalVaultProperty(prefix + ".convergent-encryption");
-        Optional<String> prehashed = getOptionalVaultProperty(prefix + ".prehashed");
-        config.prehashed = Optional.ofNullable(prehashed.isPresent() ? Boolean.parseBoolean(prehashed.get()) : null);
-        return config;
-    }
-
-    private Optional<List<String>> getOptionalListProperty(String name) {
-
-        Optional<String> optionalVaultProperty = getOptionalVaultProperty(name);
-        if (!optionalVaultProperty.isPresent()) {
-            return empty();
-        }
-
-        String[] split = optionalVaultProperty.get().split(",");
-        return Optional.of(Arrays.stream(split)
-                .map(String::trim)
-                .filter(s -> !s.isEmpty())
-                .collect(toList()));
-    }
-
-    private Optional<URL> newURL(Optional<String> url) {
-        try {
-            return Optional.ofNullable(url.isPresent() ? new URL(url.get()) : null);
-        } catch (MalformedURLException e) {
-            throw new VaultException(e);
-        }
-    }
-
-    private Optional<String> getOptionalVaultProperty(String key) {
-        return Optional.ofNullable(getVaultProperty(key, null));
-    }
-
-    private Duration getVaultDuration(String key, String defaultValue) {
-        return durationConverter.convert(getVaultProperty(key, defaultValue));
-    }
-
-    private String getVaultProperty(String key, String defaultValue) {
-        String propertyName = PROPERTY_PREFIX + key;
-
-        return getConfigSourceStream()
-                .map(configSource -> configSource.getValue(propertyName))
-                .filter(value -> value != null && value.length() != 0)
-                .map(String::trim)
-                .findFirst()
-                .orElse(defaultValue);
-    }
-
-    private Map<String, List<String>> getSecretConfigKvPrefixPaths() {
-
-        return getConfigSourceStream()
-                .flatMap(configSource -> configSource.getPropertyNames().stream())
-                .map(this::getSecretConfigKvPrefixPathName)
-                .filter(Objects::nonNull)
-                .distinct()
-                .map(this::createNameSecretConfigKvPrefixPathPair)
-                .collect(toMap(SimpleEntry::getKey, SimpleEntry::getValue));
-    }
-
-    private Stream<ConfigSource> getConfigSourceStream() {
-        Config config = ConfigProviderResolver.instance().getConfig();
-        return StreamSupport.stream(config.getConfigSources().spliterator(), false).filter(this::retain);
-    }
-
-    private boolean retain(ConfigSource configSource) {
-        String other;
-        try {
-            other = configSource.getName();
-        } catch (NullPointerException e) {
-            // FIXME at org.jboss.resteasy.microprofile.config.BaseServletConfigSource.getName(BaseServletConfigSource.java:51)
-            other = null;
-        }
-        return !getName().equals(other);
-    }
-
-    private SimpleEntry<String, List<String>> createNameSecretConfigKvPrefixPathPair(String name) {
-        return new SimpleEntry<>(name, getSecretConfigKvPrefixPath(name));
-    }
-
-    private String getSecretConfigKvPrefixPathName(String propertyName) {
-        Matcher matcher = SECRET_CONFIG_KV_PATH_PATTERN.matcher(propertyName);
-        return matcher.find() ? matcher.group(1) : null;
-    }
-
-    private List<String> getSecretConfigKvPrefixPath(String prefixName) {
-        return getOptionalListProperty("secret-config-kv-path." + prefixName).get();
-    }
-
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSourceProvider.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSourceProvider.java
new file mode 100644
index 0000000000000..95326ec6b391b
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSourceProvider.java
@@ -0,0 +1,23 @@
+package io.quarkus.vault.runtime.config;
+
+import java.util.Arrays;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+import org.eclipse.microprofile.config.spi.ConfigSourceProvider;
+import org.jboss.logging.Logger;
+
+public class VaultConfigSourceProvider implements ConfigSourceProvider {
+
+    private static final Logger log = Logger.getLogger(VaultConfigSourceProvider.class);
+
+    private VaultBootstrapConfig vaultBootstrapConfig;
+
+    public VaultConfigSourceProvider(VaultBootstrapConfig vaultBootstrapConfig) {
+        this.vaultBootstrapConfig = vaultBootstrapConfig;
+    }
+
+    @Override
+    public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) {
+        return Arrays.asList(new VaultConfigSource(vaultBootstrapConfig));
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultEnterpriseConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultEnterpriseConfig.java
new file mode 100644
index 0000000000000..6d575b948b707
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultEnterpriseConfig.java
@@ -0,0 +1,22 @@
+package io.quarkus.vault.runtime.config;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class VaultEnterpriseConfig {
+
+    /**
+     * Vault Enterprise namespace
+     * <p>
+     * If set, this will add a `X-Vault-Namespace` header to all requests sent to the Vault server.
+     * <p>
+     * See https://www.vaultproject.io/docs/enterprise/namespaces
+     *
+     * @asciidoclet
+     */
+    @ConfigItem
+    public Optional<String> namespace;
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultKubernetesAuthenticationConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultKubernetesAuthenticationConfig.java
index c7b4f07bcb1bc..52b624f7a7544 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultKubernetesAuthenticationConfig.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultKubernetesAuthenticationConfig.java
@@ -1,7 +1,7 @@
 package io.quarkus.vault.runtime.config;
 
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_KUBERNETES_AUTH_MOUNT_PATH;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_KUBERNETES_JWT_TOKEN_PATH;
+import static io.quarkus.vault.runtime.config.VaultBootstrapConfig.DEFAULT_KUBERNETES_AUTH_MOUNT_PATH;
+import static io.quarkus.vault.runtime.config.VaultBootstrapConfig.DEFAULT_KUBERNETES_JWT_TOKEN_PATH;
 
 import java.util.Optional;
 
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultRuntimeConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultRuntimeConfig.java
deleted file mode 100644
index 879f02ad1bd43..0000000000000
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultRuntimeConfig.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package io.quarkus.vault.runtime.config;
-
-import static io.quarkus.vault.runtime.LogConfidentialityLevel.LOW;
-import static io.quarkus.vault.runtime.LogConfidentialityLevel.MEDIUM;
-import static io.quarkus.vault.runtime.config.VaultAuthenticationType.APPROLE;
-import static io.quarkus.vault.runtime.config.VaultAuthenticationType.KUBERNETES;
-import static io.quarkus.vault.runtime.config.VaultAuthenticationType.USERPASS;
-
-import java.net.URL;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigItem;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
-import io.quarkus.vault.runtime.LogConfidentialityLevel;
-
-@ConfigRoot(name = "vault", phase = ConfigPhase.RUN_TIME)
-public class VaultRuntimeConfig {
-
-    public static final String DEFAULT_KUBERNETES_JWT_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
-    public static final String DEFAULT_KV_SECRET_ENGINE_MOUNT_PATH = "secret";
-    public static final String KV_SECRET_ENGINE_VERSION_V1 = "1";
-    public static final String KV_SECRET_ENGINE_VERSION_V2 = "2";
-    public static final String DEFAULT_RENEW_GRACE_PERIOD = "1H";
-    public static final String DEFAULT_SECRET_CONFIG_CACHE_PERIOD = "10M";
-    public static final String KUBERNETES_CACERT = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
-    public static final String DEFAULT_CONNECT_TIMEOUT = "5S";
-    public static final String DEFAULT_READ_TIMEOUT = "1S";
-    public static final String DEFAULT_TLS_SKIP_VERIFY = "false";
-    public static final String DEFAULT_TLS_USE_KUBERNETES_CACERT = "true";
-    public static final String DEFAULT_KUBERNETES_AUTH_MOUNT_PATH = "auth/kubernetes";
-
-    /**
-     * Vault server url.
-     * <p>
-     * Example: https://localhost:8200
-     * <p>
-     * See also the documentation for the `kv-secret-engine-mount-path` property for some insights on how
-     * the full Vault url gets built.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem
-    public Optional<URL> url;
-
-    /**
-     * Authentication
-     */
-    @ConfigItem
-    @ConfigDocSection
-    public VaultAuthenticationConfig authentication;
-
-    /**
-     * Renew grace period duration.
-     * <p>
-     * This value if used to extend a lease before it expires its ttl, or recreate a new lease before the current
-     * lease reaches its max_ttl.
-     * By default Vault leaseDuration is equal to 7 days (ie: 168h or 604800s).
-     * If a connection pool maxLifetime is set, it is reasonable to set the renewGracePeriod to be greater
-     * than the maxLifetime, so that we are sure we get a chance to renew leases before we reach the ttl.
-     * In any case you need to make sure there will be attempts to fetch secrets within the renewGracePeriod,
-     * because that is when the renewals will happen. This is particularly important for db dynamic secrets
-     * because if the lease reaches its ttl or max_ttl, the password of the db user will become invalid and
-     * it will be not longer possible to log in.
-     * This value should also be smaller than the ttl, otherwise that would mean that we would try to recreate
-     * leases all the time.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(defaultValue = DEFAULT_RENEW_GRACE_PERIOD)
-    public Duration renewGracePeriod;
-
-    /**
-     * Vault config source cache period.
-     * <p>
-     * Properties fetched from vault as MP config will be kept in a cache, and will not be fetched from vault
-     * again until the expiration of that period.
-     * This property is ignored if `secret-config-kv-path` is not set.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(defaultValue = DEFAULT_SECRET_CONFIG_CACHE_PERIOD)
-    public Duration secretConfigCachePeriod;
-
-    // @formatter:off
-    /**
-     * List of comma separated vault paths in kv store,
-     * where all properties will be available as MP config properties **as-is**, with no prefix.
-     * <p>
-     * For instance, if vault contains property `foo`, it will be made available to the
-     * quarkus application as `@ConfigProperty(name = "foo") String foo;`
-     * <p>
-     * If 2 paths contain the same property, the last path will win.
-     * <p>
-     * For instance if
-     * <p>
-     * * `secret/base-config` contains `foo=bar` and
-     * * `secret/myapp/config` contains `foo=myappbar`, then
-     * <p>
-     * `@ConfigProperty(name = "foo") String foo` will have value `myappbar`
-     * with application properties `quarkus.vault.secret-config-kv-path=base-config,myapp/config`
-     * <p>
-     * See also the documentation for the `kv-secret-engine-mount-path` property for some insights on how
-     * the full Vault url gets built.
-     *
-     * @asciidoclet
-     */
-    // @formatter:on
-    @ConfigItem
-    public Optional<List<String>> secretConfigKvPath;
-
-    // @formatter:off
-    /**
-     * List of comma separated vault paths in kv store,
-     * where all properties will be available as **prefixed** MP config properties.
-     * <p>
-     * For instance if the application properties contains
-     * `quarkus.vault.secret-config-kv-path.myprefix=config`, and
-     * vault path `secret/config` contains `foo=bar`, then `myprefix.foo`
-     * will be available in the MP config.
-     * <p>
-     * If the same property is available in 2 different paths for the same prefix, the last one
-     * will win.
-     * <p>
-     * See also the documentation for the `kv-secret-engine-mount-path` property for some insights on how
-     * the full Vault url gets built.
-     *
-     * @asciidoclet
-     */
-    // @formatter:on
-    @ConfigItem(name = "secret-config-kv-path.\"prefix\"")
-    public Map<String, List<String>> secretConfigKvPrefixPath;
-
-    /**
-     * Used to hide confidential infos, for logging in particular.
-     * Possible values are:
-     * <p>
-     * * low: display all secrets.
-     * * medium: display only usernames and lease ids (ie: passwords and tokens are masked).
-     * * high: hide lease ids and dynamic credentials username.
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(defaultValue = "medium")
-    public LogConfidentialityLevel logConfidentialityLevel;
-
-    /**
-     * Kv secret engine version.
-     * <p>
-     * see https://www.vaultproject.io/docs/secrets/kv/index.html
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(defaultValue = KV_SECRET_ENGINE_VERSION_V2)
-    public int kvSecretEngineVersion;
-
-    /**
-     * KV secret engine path.
-     * <p>
-     * This value is used when building the url path in the KV secret engine programmatic access
-     * (i.e. `VaultKVSecretEngine`) and the vault config source (i.e. fetching configuration properties from Vault).
-     * <p>
-     * For a v2 KV secret engine (default - see `kv-secret-engine-version property`)
-     * the full url is built from the expression `<url>/v1/</kv-secret-engine-mount-path>/data/...`.
-     * <p>
-     * With property `quarkus.vault.url=https://localhost:8200`, the following call
-     * `vaultKVSecretEngine.readSecret("foo/bar")` would lead eventually to a `GET` on Vault with the following
-     * url: `https://localhost:8200/v1/secret/data/foo/bar`.
-     * <p>
-     * With a KV secret engine v1, the url changes to: `<url>/v1/</kv-secret-engine-mount-path>/...`.
-     * <p>
-     * The same logic is applied to the Vault config source. With `quarkus.vault.secret-config-kv-path=config/myapp`
-     * The secret properties would be fetched from Vault using a `GET` on
-     * `https://localhost:8200/v1/secret/data/config/myapp` for a KV secret engine v2 (or
-     * `https://localhost:8200/v1/secret/config/myapp` for a KV secret engine v1).
-     * <p>
-     * see https://www.vaultproject.io/docs/secrets/kv/index.html
-     *
-     * @asciidoclet
-     */
-    @ConfigItem(defaultValue = DEFAULT_KV_SECRET_ENGINE_MOUNT_PATH)
-    public String kvSecretEngineMountPath;
-
-    /**
-     * TLS
-     */
-    @ConfigItem
-    @ConfigDocSection
-    public VaultTlsConfig tls;
-
-    /**
-     * Timeout to establish a connection with Vault.
-     */
-    @ConfigItem(defaultValue = DEFAULT_CONNECT_TIMEOUT)
-    public Duration connectTimeout;
-
-    /**
-     * Request timeout on Vault.
-     */
-    @ConfigItem(defaultValue = DEFAULT_READ_TIMEOUT)
-    public Duration readTimeout;
-
-    /**
-     * List of named credentials providers, such as: `quarkus.vault.credentials-provider.foo.kv-path=mypath`
-     * <p>
-     * This defines a credentials provider `foo` returning key `password` from vault path `mypath`.
-     * Once defined, this provider can be used in credentials consumers, such as the Agroal connection pool.
-     * <p>
-     * Example: `quarkus.datasource.credentials-provider=foo`
-     *
-     * @asciidoclet
-     */
-    @ConfigItem
-    public Map<String, CredentialsProviderConfig> credentialsProvider;
-
-    /**
-     * Transit Engine
-     */
-    @ConfigItem
-    @ConfigDocSection
-    public VaultTransitConfig transit;
-
-    public VaultAuthenticationType getAuthenticationType() {
-        if (authentication.kubernetes.role.isPresent()) {
-            return KUBERNETES;
-        } else if (authentication.isUserpass()) {
-            return USERPASS;
-        } else if (authentication.isAppRole()) {
-            return APPROLE;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "VaultRuntimeConfig{" +
-                "url=" + url +
-                ", kubernetesAuthenticationMountPath=" + authentication.kubernetes.authMountPath +
-                ", kubernetesAuthenticationRole="
-                + logConfidentialityLevel.maskWithTolerance(authentication.kubernetes.role.orElse(""), MEDIUM) +
-                ", kubernetesJwtTokenPath='" + authentication.kubernetes.jwtTokenPath + '\'' +
-                ", userpassUsername='"
-                + logConfidentialityLevel.maskWithTolerance(authentication.userpass.username.orElse(""), MEDIUM)
-                + '\'' +
-                ", userpassPassword='"
-                + logConfidentialityLevel.maskWithTolerance(authentication.userpass.password.orElse(""), LOW) + '\''
-                +
-                ", appRoleRoleId='"
-                + logConfidentialityLevel.maskWithTolerance(authentication.appRole.roleId.orElse(""), MEDIUM) + '\'' +
-                ", appRoleSecretId='"
-                + logConfidentialityLevel.maskWithTolerance(authentication.appRole.secretId.orElse(""), LOW) + '\'' +
-                ", appRoleSecretIdWrappingToken='"
-                + logConfidentialityLevel.maskWithTolerance(authentication.appRole.secretIdWrappingToken.orElse(""), LOW) + '\''
-                +
-                ", clientToken=" + logConfidentialityLevel.maskWithTolerance(authentication.clientToken.orElse(""), LOW) +
-                ", clientTokenWrappingToken="
-                + logConfidentialityLevel.maskWithTolerance(authentication.clientTokenWrappingToken.orElse(""), LOW) +
-                ", renewGracePeriod=" + renewGracePeriod +
-                ", cachePeriod=" + secretConfigCachePeriod +
-                ", logConfidentialityLevel=" + logConfidentialityLevel +
-                ", kvSecretEngineVersion=" + kvSecretEngineVersion +
-                ", kvSecretEngineMountPath='" + kvSecretEngineMountPath + '\'' +
-                ", tlsSkipVerify=" + tls.skipVerify +
-                ", tlsCaCert=" + tls.caCert +
-                ", connectTimeout=" + connectTimeout +
-                ", readTimeout=" + readTimeout +
-                '}';
-    }
-
-}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultTlsConfig.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultTlsConfig.java
index ae253f46d85a8..a865ff8d43897 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultTlsConfig.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultTlsConfig.java
@@ -1,7 +1,6 @@
 package io.quarkus.vault.runtime.config;
 
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_TLS_SKIP_VERIFY;
-import static io.quarkus.vault.runtime.config.VaultRuntimeConfig.DEFAULT_TLS_USE_KUBERNETES_CACERT;
+import static io.quarkus.vault.runtime.config.VaultBootstrapConfig.DEFAULT_TLS_USE_KUBERNETES_CACERT;
 
 import java.util.Optional;
 
@@ -18,8 +17,8 @@ public class VaultTlsConfig {
      * certificate presented by Vault. This is discouraged in production because it allows man in the middle
      * type of attacks.
      */
-    @ConfigItem(defaultValue = DEFAULT_TLS_SKIP_VERIFY)
-    public boolean skipVerify;
+    @ConfigItem
+    public Optional<Boolean> skipVerify = Optional.empty();
 
     /**
      * Certificate bundle used to validate TLS communications with Vault.
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/health/VaultHealthCheck.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/health/VaultHealthCheck.java
index fe48f38bfd69f..c7b795129a258 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/health/VaultHealthCheck.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/health/VaultHealthCheck.java
@@ -1,7 +1,7 @@
 package io.quarkus.vault.runtime.health;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
@@ -12,7 +12,7 @@
 import io.quarkus.vault.sys.VaultHealth;
 
 @Readiness
-@ApplicationScoped
+@Singleton
 public class VaultHealthCheck implements HealthCheck {
 
     @Inject
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/KeyConfigRequestDetail.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/KeyConfigRequestDetail.java
new file mode 100644
index 0000000000000..5ba3f83595f06
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/KeyConfigRequestDetail.java
@@ -0,0 +1,55 @@
+package io.quarkus.vault.transit;
+
+public class KeyConfigRequestDetail {
+
+    public Integer minDecryptionVersion;
+    public Integer minEncryptionVersion;
+    public Boolean deletionAllowed;
+    public Boolean exportable;
+    public Boolean allowPlaintextBackup;
+
+    public Integer getMinDecryptionVersion() {
+        return minDecryptionVersion;
+    }
+
+    public KeyConfigRequestDetail setMinDecryptionVersion(Integer minDecryptionVersion) {
+        this.minDecryptionVersion = minDecryptionVersion;
+        return this;
+    }
+
+    public Integer getMinEncryptionVersion() {
+        return minEncryptionVersion;
+    }
+
+    public KeyConfigRequestDetail setMinEncryptionVersion(Integer minEncryptionVersion) {
+        this.minEncryptionVersion = minEncryptionVersion;
+        return this;
+    }
+
+    public Boolean getDeletionAllowed() {
+        return deletionAllowed;
+    }
+
+    public KeyConfigRequestDetail setDeletionAllowed(Boolean deletionAllowed) {
+        this.deletionAllowed = deletionAllowed;
+        return this;
+    }
+
+    public Boolean getExportable() {
+        return exportable;
+    }
+
+    public KeyConfigRequestDetail setExportable(Boolean exportable) {
+        this.exportable = exportable;
+        return this;
+    }
+
+    public Boolean getAllowPlaintextBackup() {
+        return allowPlaintextBackup;
+    }
+
+    public KeyConfigRequestDetail setAllowPlaintextBackup(Boolean allowPlaintextBackup) {
+        this.allowPlaintextBackup = allowPlaintextBackup;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/KeyCreationRequestDetail.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/KeyCreationRequestDetail.java
new file mode 100644
index 0000000000000..53b834690c196
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/KeyCreationRequestDetail.java
@@ -0,0 +1,55 @@
+package io.quarkus.vault.transit;
+
+public class KeyCreationRequestDetail {
+
+    public String convergentEncryption;
+    public Boolean derived;
+    public Boolean exportable;
+    public Boolean allowPlaintextBackup;
+    public String type;
+
+    public String getConvergentEncryption() {
+        return convergentEncryption;
+    }
+
+    public KeyCreationRequestDetail setConvergentEncryption(String convergentEncryption) {
+        this.convergentEncryption = convergentEncryption;
+        return this;
+    }
+
+    public Boolean getDerived() {
+        return derived;
+    }
+
+    public KeyCreationRequestDetail setDerived(Boolean derived) {
+        this.derived = derived;
+        return this;
+    }
+
+    public Boolean getExportable() {
+        return exportable;
+    }
+
+    public KeyCreationRequestDetail setExportable(Boolean exportable) {
+        this.exportable = exportable;
+        return this;
+    }
+
+    public Boolean getAllowPlaintextBackup() {
+        return allowPlaintextBackup;
+    }
+
+    public KeyCreationRequestDetail setAllowPlaintextBackup(Boolean allowPlaintextBackup) {
+        this.allowPlaintextBackup = allowPlaintextBackup;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public KeyCreationRequestDetail setType(String type) {
+        this.type = type;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/VaultTransitKeyExportDetail.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/VaultTransitKeyExportDetail.java
new file mode 100644
index 0000000000000..136380b7c9edf
--- /dev/null
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/VaultTransitKeyExportDetail.java
@@ -0,0 +1,27 @@
+package io.quarkus.vault.transit;
+
+import java.util.Map;
+
+public class VaultTransitKeyExportDetail {
+
+    private String name;
+    private Map<String, String> keys;
+
+    public String getName() {
+        return name;
+    }
+
+    public VaultTransitKeyExportDetail setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Map<String, String> getKeys() {
+        return keys;
+    }
+
+    public VaultTransitKeyExportDetail setKeys(Map<String, String> keys) {
+        this.keys = keys;
+        return this;
+    }
+}
diff --git a/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultAuthManagerTest.java b/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultAuthManagerTest.java
index 6dea66650bcf0..24e9dd84173de 100644
--- a/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultAuthManagerTest.java
+++ b/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultAuthManagerTest.java
@@ -9,10 +9,18 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.vault.runtime.client.OkHttpVaultClient;
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.VertxVaultClient;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalAppRoleAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalKubernetesAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalTokenAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalUserpassAuthMethod;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.auth.VaultLookupSelf;
 import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelf;
 import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelfAuth;
@@ -20,21 +28,31 @@
 import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuthAuth;
 import io.quarkus.vault.runtime.config.VaultAppRoleAuthenticationConfig;
 import io.quarkus.vault.runtime.config.VaultAuthenticationConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 import io.quarkus.vault.runtime.config.VaultKubernetesAuthenticationConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
 import io.quarkus.vault.runtime.config.VaultTlsConfig;
 import io.quarkus.vault.runtime.config.VaultUserpassAuthenticationConfig;
 
 public class VaultAuthManagerTest {
 
-    VaultRuntimeConfig config = createConfig();
+    VaultBootstrapConfig config = createConfig();
+    TlsConfig tlsConfig = new TlsConfig();
     AtomicBoolean lookupSelfShouldReturn403 = new AtomicBoolean(false);
-    OkHttpVaultClient vaultClient = createVaultClient();
-    VaultAuthManager vaultAuthManager = new VaultAuthManager(vaultClient, config);
+    VaultConfigHolder vaultConfigHolder = new VaultConfigHolder().setVaultBootstrapConfig(config);
+    VaultClient vaultClient = createVaultClient();
+    VaultAuthManager vaultAuthManager = new VaultAuthManager(vaultConfigHolder,
+            new VaultInternalSystemBackend(), new VaultInternalAppRoleAuthMethod(),
+            new VaultInternalKubernetesAuthMethod(), createUserpassAuthMethod(),
+            createTokenAuthMethod());
     VaultUserPassAuth vaultUserPassAuth = new VaultUserPassAuth();
     VaultLookupSelf vaultLookupSelf = new VaultLookupSelf();
     VaultRenewSelf vaultRenewSelf = new VaultRenewSelf();
 
+    @AfterEach
+    public void after() {
+        vaultClient.close();
+    }
+
     @Test
     public void login() {
 
@@ -87,9 +105,9 @@ public void login() {
         assertEquals("6", token.clientToken, "expires soon");
     }
 
-    private VaultRuntimeConfig createConfig() {
+    private VaultBootstrapConfig createConfig() {
         try {
-            VaultRuntimeConfig config = new VaultRuntimeConfig();
+            VaultBootstrapConfig config = new VaultBootstrapConfig();
             config.tls = new VaultTlsConfig();
             config.authentication = new VaultAuthenticationConfig();
             config.authentication.kubernetes = new VaultKubernetesAuthenticationConfig();
@@ -107,7 +125,7 @@ private VaultRuntimeConfig createConfig() {
             config.authentication.userpass.passwordWrappingToken = Optional.empty();
             config.connectTimeout = Duration.ofSeconds(1);
             config.readTimeout = Duration.ofSeconds(1);
-            config.tls.skipVerify = true;
+            config.tls.skipVerify = Optional.of(true);
             config.logConfidentialityLevel = LogConfidentialityLevel.LOW;
             config.renewGracePeriod = Duration.ofSeconds(3);
             return config;
@@ -116,13 +134,14 @@ private VaultRuntimeConfig createConfig() {
         }
     }
 
-    private OkHttpVaultClient createVaultClient() {
-        return new OkHttpVaultClient(config) {
-            @Override
-            public VaultUserPassAuth loginUserPass(String user, String password) {
-                return vaultUserPassAuth;
-            }
+    private VaultClient createVaultClient() {
+        VertxVaultClient vaultClient = new VertxVaultClient(vaultConfigHolder, tlsConfig);
+        vaultClient.init();
+        return vaultClient;
+    }
 
+    private VaultInternalTokenAuthMethod createTokenAuthMethod() {
+        return new VaultInternalTokenAuthMethod() {
             @Override
             public VaultLookupSelf lookupSelf(String token) {
                 if (lookupSelfShouldReturn403.get()) {
@@ -138,4 +157,12 @@ public VaultRenewSelf renewSelf(String token, String increment) {
         };
     }
 
+    private VaultInternalUserpassAuthMethod createUserpassAuthMethod() {
+        return new VaultInternalUserpassAuthMethod() {
+            @Override
+            public VaultUserPassAuth login(String user, String password) {
+                return vaultUserPassAuth;
+            }
+        };
+    }
 }
diff --git a/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultDbManagerTest.java b/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultDbManagerTest.java
index 2487eac9d33c8..3437587327e03 100644
--- a/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultDbManagerTest.java
+++ b/extensions/vault/runtime/src/test/java/io/quarkus/vault/runtime/VaultDbManagerTest.java
@@ -12,34 +12,56 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.vault.runtime.client.OkHttpVaultClient;
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.VertxVaultClient;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalAppRoleAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalKubernetesAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalTokenAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalUserpassAuthMethod;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentials;
 import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentialsData;
 import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesLookup;
 import io.quarkus.vault.runtime.client.dto.sys.VaultRenewLease;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalDatabaseSecretEngine;
 import io.quarkus.vault.runtime.config.VaultAppRoleAuthenticationConfig;
 import io.quarkus.vault.runtime.config.VaultAuthenticationConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
 import io.quarkus.vault.runtime.config.VaultKubernetesAuthenticationConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
 import io.quarkus.vault.runtime.config.VaultTlsConfig;
 import io.quarkus.vault.runtime.config.VaultUserpassAuthenticationConfig;
 
 public class VaultDbManagerTest {
 
-    VaultRuntimeConfig config = createConfig();
+    VaultBootstrapConfig config = createConfig();
+    TlsConfig tlsConfig = new TlsConfig();
     VaultDatabaseCredentials credentials = new VaultDatabaseCredentials();
     VaultLeasesLookup vaultLeasesLookup = new VaultLeasesLookup();
     AtomicBoolean lookupLeaseShouldReturn400 = new AtomicBoolean(false);
     VaultRenewLease vaultRenewLease = new VaultRenewLease();
-    OkHttpVaultClient vaultClient = createVaultClient();
-    VaultAuthManager vaultAuthManager = new VaultAuthManager(vaultClient, config);
-    VaultDbManager vaultDbManager = new VaultDbManager(vaultAuthManager, vaultClient, config);
+    VaultConfigHolder vaultConfigHolder = new VaultConfigHolder().setVaultBootstrapConfig(config);
+    VaultClient vaultClient = createVaultClient();
+    VaultInternalSystemBackend vaultInternalSystemBackend = createSystemBackend();
+    VaultInternalDatabaseSecretEngine vaultInternalDatabaseSecretEngine = createVaultInternalDatabaseSecretEngine();
+    VaultAuthManager vaultAuthManager = new VaultAuthManager(vaultConfigHolder, vaultInternalSystemBackend,
+            new VaultInternalAppRoleAuthMethod(),
+            new VaultInternalKubernetesAuthMethod(),
+            new VaultInternalUserpassAuthMethod(), new VaultInternalTokenAuthMethod());
+    VaultDbManager vaultDbManager = new VaultDbManager(vaultConfigHolder, vaultAuthManager,
+            vaultInternalSystemBackend, vaultInternalDatabaseSecretEngine);
     String mydbrole = "mydbrole";
     String mylease = "mylease";
 
+    @AfterEach
+    public void after() {
+        vaultClient.close();
+    }
+
     @Test
     public void getDynamicDbCredentials() {
 
@@ -93,9 +115,9 @@ public void getDynamicDbCredentials() {
         assertEquals("sinclair5", properties.get(PASSWORD_PROPERTY_NAME), "reaching max-ttl");
     }
 
-    private VaultRuntimeConfig createConfig() {
+    private VaultBootstrapConfig createConfig() {
         try {
-            VaultRuntimeConfig config = new VaultRuntimeConfig();
+            VaultBootstrapConfig config = new VaultBootstrapConfig();
             config.tls = new VaultTlsConfig();
             config.authentication = new VaultAuthenticationConfig();
             config.authentication.kubernetes = new VaultKubernetesAuthenticationConfig();
@@ -113,7 +135,7 @@ private VaultRuntimeConfig createConfig() {
             config.authentication.userpass.passwordWrappingToken = Optional.empty();
             config.connectTimeout = Duration.ofSeconds(1);
             config.readTimeout = Duration.ofSeconds(1);
-            config.tls.skipVerify = true;
+            config.tls.skipVerify = Optional.of(true);
             config.logConfidentialityLevel = LogConfidentialityLevel.LOW;
             config.renewGracePeriod = Duration.ofSeconds(3);
             return config;
@@ -122,13 +144,23 @@ private VaultRuntimeConfig createConfig() {
         }
     }
 
-    private OkHttpVaultClient createVaultClient() {
-        return new OkHttpVaultClient(config) {
+    private VaultClient createVaultClient() {
+        VertxVaultClient vaultClient = new VertxVaultClient(vaultConfigHolder, tlsConfig);
+        vaultClient.init();
+        return vaultClient;
+    }
+
+    private VaultInternalDatabaseSecretEngine createVaultInternalDatabaseSecretEngine() {
+        return new VaultInternalDatabaseSecretEngine() {
             @Override
-            public VaultDatabaseCredentials generateDatabaseCredentials(String token, String databaseCredentialsRole) {
+            public VaultDatabaseCredentials generateCredentials(String token, String databaseCredentialsRole) {
                 return credentials;
             }
+        };
+    }
 
+    private VaultInternalSystemBackend createSystemBackend() {
+        return new VaultInternalSystemBackend() {
             @Override
             public VaultLeasesLookup lookupLease(String token, String leaseId) {
                 if (lookupLeaseShouldReturn400.get()) {
@@ -143,5 +175,4 @@ public VaultRenewLease renewLease(String token, String leaseId) {
             }
         };
     }
-
 }
diff --git a/extensions/vertx-core/deployment/pom.xml b/extensions/vertx-core/deployment/pom.xml
index 801c8b351ab0c..4e6214b7a1c83 100644
--- a/extensions/vertx-core/deployment/pom.xml
+++ b/extensions/vertx-core/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-core-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/vertx-core/deployment/src/test/java/io/quarkus/vertx/core/deployment/VerticleWithClassNameDeploymentTest.java b/extensions/vertx-core/deployment/src/test/java/io/quarkus/vertx/core/deployment/VerticleWithClassNameDeploymentTest.java
index 00ea7573c5ec9..3461793f16258 100644
--- a/extensions/vertx-core/deployment/src/test/java/io/quarkus/vertx/core/deployment/VerticleWithClassNameDeploymentTest.java
+++ b/extensions/vertx-core/deployment/src/test/java/io/quarkus/vertx/core/deployment/VerticleWithClassNameDeploymentTest.java
@@ -33,7 +33,7 @@ public class VerticleWithClassNameDeploymentTest {
     public void testDeploymentOfVerticleUsingClassName() {
         String resp1 = RestAssured.get("http://localhost:8080").asString();
         String resp2 = RestAssured.get("http://localhost:8080").asString();
-        Assertions.assertTrue(resp1.startsWith("OK"));
+        Assertions.assertTrue(resp1.startsWith("OK"), resp1);
         Assertions.assertTrue(resp2.startsWith("OK"));
         Assertions.assertNotEquals(resp1, resp2);
     }
diff --git a/extensions/vertx-core/pom.xml b/extensions/vertx-core/pom.xml
index 491faf6654a0d..6712a08239c35 100644
--- a/extensions/vertx-core/pom.xml
+++ b/extensions/vertx-core/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/vertx-core/runtime/pom.xml b/extensions/vertx-core/runtime/pom.xml
index 2afd9beb29026..749bd3f65d090 100644
--- a/extensions/vertx-core/runtime/pom.xml
+++ b/extensions/vertx-core/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-core-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,6 +43,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxBufferImpl.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxBufferImpl.java
new file mode 100644
index 0000000000000..427db5abe5db4
--- /dev/null
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxBufferImpl.java
@@ -0,0 +1,490 @@
+package io.quarkus.vertx.core.runtime;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.impl.Arguments;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+
+public class VertxBufferImpl implements Buffer {
+
+    private ByteBuf buffer;
+
+    public VertxBufferImpl(ByteBuf buffer) {
+        this.buffer = buffer;
+    }
+
+    public String toString() {
+        return buffer.toString(StandardCharsets.UTF_8);
+    }
+
+    public String toString(String enc) {
+        return buffer.toString(Charset.forName(enc));
+    }
+
+    public String toString(Charset enc) {
+        return buffer.toString(enc);
+    }
+
+    @Override
+    public JsonObject toJsonObject() {
+        return new JsonObject(this);
+    }
+
+    @Override
+    public JsonArray toJsonArray() {
+        return new JsonArray(this);
+    }
+
+    public byte getByte(int pos) {
+        return buffer.getByte(pos);
+    }
+
+    public short getUnsignedByte(int pos) {
+        return buffer.getUnsignedByte(pos);
+    }
+
+    public int getInt(int pos) {
+        return buffer.getInt(pos);
+    }
+
+    public int getIntLE(int pos) {
+        return buffer.getIntLE(pos);
+    }
+
+    public long getUnsignedInt(int pos) {
+        return buffer.getUnsignedInt(pos);
+    }
+
+    public long getUnsignedIntLE(int pos) {
+        return buffer.getUnsignedIntLE(pos);
+    }
+
+    public long getLong(int pos) {
+        return buffer.getLong(pos);
+    }
+
+    public long getLongLE(int pos) {
+        return buffer.getLongLE(pos);
+    }
+
+    public double getDouble(int pos) {
+        return buffer.getDouble(pos);
+    }
+
+    public float getFloat(int pos) {
+        return buffer.getFloat(pos);
+    }
+
+    public short getShort(int pos) {
+        return buffer.getShort(pos);
+    }
+
+    public short getShortLE(int pos) {
+        return buffer.getShortLE(pos);
+    }
+
+    public int getUnsignedShort(int pos) {
+        return buffer.getUnsignedShort(pos);
+    }
+
+    public int getUnsignedShortLE(int pos) {
+        return buffer.getUnsignedShortLE(pos);
+    }
+
+    public int getMedium(int pos) {
+        return buffer.getMedium(pos);
+    }
+
+    public int getMediumLE(int pos) {
+        return buffer.getMediumLE(pos);
+    }
+
+    public int getUnsignedMedium(int pos) {
+        return buffer.getUnsignedMedium(pos);
+    }
+
+    public int getUnsignedMediumLE(int pos) {
+        return buffer.getUnsignedMediumLE(pos);
+    }
+
+    public byte[] getBytes() {
+        byte[] arr = new byte[buffer.writerIndex()];
+        buffer.getBytes(0, arr);
+        return arr;
+    }
+
+    public byte[] getBytes(int start, int end) {
+        Arguments.require(end >= start, "end must be greater or equal than start");
+        byte[] arr = new byte[end - start];
+        buffer.getBytes(start, arr, 0, end - start);
+        return arr;
+    }
+
+    @Override
+    public Buffer getBytes(byte[] dst) {
+        return getBytes(dst, 0);
+    }
+
+    @Override
+    public Buffer getBytes(byte[] dst, int dstIndex) {
+        return getBytes(0, buffer.writerIndex(), dst, dstIndex);
+    }
+
+    @Override
+    public Buffer getBytes(int start, int end, byte[] dst) {
+        return getBytes(start, end, dst, 0);
+    }
+
+    @Override
+    public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
+        Arguments.require(end >= start, "end must be greater or equal than start");
+        buffer.getBytes(start, dst, dstIndex, end - start);
+        return this;
+    }
+
+    public Buffer getBuffer(int start, int end) {
+        return new VertxBufferImpl(Unpooled.wrappedBuffer(getBytes(start, end)));
+    }
+
+    public String getString(int start, int end, String enc) {
+        byte[] bytes = getBytes(start, end);
+        Charset cs = Charset.forName(enc);
+        return new String(bytes, cs);
+    }
+
+    public String getString(int start, int end) {
+        byte[] bytes = getBytes(start, end);
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
+
+    public Buffer appendBuffer(Buffer buff) {
+        buffer.writeBytes(buff.getByteBuf());
+        return this;
+    }
+
+    public Buffer appendBuffer(Buffer buff, int offset, int len) {
+        ByteBuf byteBuf = buff.getByteBuf();
+        int from = byteBuf.readerIndex() + offset;
+        buffer.writeBytes(byteBuf, from, len);
+        return this;
+    }
+
+    public Buffer appendBytes(byte[] bytes) {
+        buffer.writeBytes(bytes);
+        return this;
+    }
+
+    public Buffer appendBytes(byte[] bytes, int offset, int len) {
+        buffer.writeBytes(bytes, offset, len);
+        return this;
+    }
+
+    public Buffer appendByte(byte b) {
+        buffer.writeByte(b);
+        return this;
+    }
+
+    public Buffer appendUnsignedByte(short b) {
+        buffer.writeByte(b);
+        return this;
+    }
+
+    public Buffer appendInt(int i) {
+        buffer.writeInt(i);
+        return this;
+    }
+
+    public Buffer appendIntLE(int i) {
+        buffer.writeIntLE(i);
+        return this;
+    }
+
+    public Buffer appendUnsignedInt(long i) {
+        buffer.writeInt((int) i);
+        return this;
+    }
+
+    public Buffer appendUnsignedIntLE(long i) {
+        buffer.writeIntLE((int) i);
+        return this;
+    }
+
+    public Buffer appendMedium(int i) {
+        buffer.writeMedium(i);
+        return this;
+    }
+
+    public Buffer appendMediumLE(int i) {
+        buffer.writeMediumLE(i);
+        return this;
+    }
+
+    public Buffer appendLong(long l) {
+        buffer.writeLong(l);
+        return this;
+    }
+
+    public Buffer appendLongLE(long l) {
+        buffer.writeLongLE(l);
+        return this;
+    }
+
+    public Buffer appendShort(short s) {
+        buffer.writeShort(s);
+        return this;
+    }
+
+    public Buffer appendShortLE(short s) {
+        buffer.writeShortLE(s);
+        return this;
+    }
+
+    public Buffer appendUnsignedShort(int s) {
+        buffer.writeShort(s);
+        return this;
+    }
+
+    public Buffer appendUnsignedShortLE(int s) {
+        buffer.writeShortLE(s);
+        return this;
+    }
+
+    public Buffer appendFloat(float f) {
+        buffer.writeFloat(f);
+        return this;
+    }
+
+    public Buffer appendDouble(double d) {
+        buffer.writeDouble(d);
+        return this;
+    }
+
+    public Buffer appendString(String str, String enc) {
+        return append(str, Charset.forName(Objects.requireNonNull(enc)));
+    }
+
+    public Buffer appendString(String str) {
+        return append(str, CharsetUtil.UTF_8);
+    }
+
+    public Buffer setByte(int pos, byte b) {
+        ensureWritable(pos, 1);
+        buffer.setByte(pos, b);
+        return this;
+    }
+
+    public Buffer setUnsignedByte(int pos, short b) {
+        ensureWritable(pos, 1);
+        buffer.setByte(pos, b);
+        return this;
+    }
+
+    public Buffer setInt(int pos, int i) {
+        ensureWritable(pos, 4);
+        buffer.setInt(pos, i);
+        return this;
+    }
+
+    public Buffer setIntLE(int pos, int i) {
+        ensureWritable(pos, 4);
+        buffer.setIntLE(pos, i);
+        return this;
+    }
+
+    public Buffer setUnsignedInt(int pos, long i) {
+        ensureWritable(pos, 4);
+        buffer.setInt(pos, (int) i);
+        return this;
+    }
+
+    public Buffer setUnsignedIntLE(int pos, long i) {
+        ensureWritable(pos, 4);
+        buffer.setIntLE(pos, (int) i);
+        return this;
+    }
+
+    public Buffer setMedium(int pos, int i) {
+        ensureWritable(pos, 3);
+        buffer.setMedium(pos, i);
+        return this;
+    }
+
+    public Buffer setMediumLE(int pos, int i) {
+        ensureWritable(pos, 3);
+        buffer.setMediumLE(pos, i);
+        return this;
+    }
+
+    public Buffer setLong(int pos, long l) {
+        ensureWritable(pos, 8);
+        buffer.setLong(pos, l);
+        return this;
+    }
+
+    public Buffer setLongLE(int pos, long l) {
+        ensureWritable(pos, 8);
+        buffer.setLongLE(pos, l);
+        return this;
+    }
+
+    public Buffer setDouble(int pos, double d) {
+        ensureWritable(pos, 8);
+        buffer.setDouble(pos, d);
+        return this;
+    }
+
+    public Buffer setFloat(int pos, float f) {
+        ensureWritable(pos, 4);
+        buffer.setFloat(pos, f);
+        return this;
+    }
+
+    public Buffer setShort(int pos, short s) {
+        ensureWritable(pos, 2);
+        buffer.setShort(pos, s);
+        return this;
+    }
+
+    public Buffer setShortLE(int pos, short s) {
+        ensureWritable(pos, 2);
+        buffer.setShortLE(pos, s);
+        return this;
+    }
+
+    public Buffer setUnsignedShort(int pos, int s) {
+        ensureWritable(pos, 2);
+        buffer.setShort(pos, s);
+        return this;
+    }
+
+    public Buffer setUnsignedShortLE(int pos, int s) {
+        ensureWritable(pos, 2);
+        buffer.setShortLE(pos, s);
+        return this;
+    }
+
+    public Buffer setBuffer(int pos, Buffer b) {
+        ensureWritable(pos, b.length());
+        buffer.setBytes(pos, b.getByteBuf());
+        return this;
+    }
+
+    public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
+        ensureWritable(pos, len);
+        ByteBuf byteBuf = b.getByteBuf();
+        buffer.setBytes(pos, byteBuf, byteBuf.readerIndex() + offset, len);
+        return this;
+    }
+
+    public VertxBufferImpl setBytes(int pos, ByteBuffer b) {
+        ensureWritable(pos, b.limit());
+        buffer.setBytes(pos, b);
+        return this;
+    }
+
+    public Buffer setBytes(int pos, byte[] b) {
+        ensureWritable(pos, b.length);
+        buffer.setBytes(pos, b);
+        return this;
+    }
+
+    public Buffer setBytes(int pos, byte[] b, int offset, int len) {
+        ensureWritable(pos, len);
+        buffer.setBytes(pos, b, offset, len);
+        return this;
+    }
+
+    public Buffer setString(int pos, String str) {
+        return setBytes(pos, str, CharsetUtil.UTF_8);
+    }
+
+    public Buffer setString(int pos, String str, String enc) {
+        return setBytes(pos, str, Charset.forName(enc));
+    }
+
+    public int length() {
+        return buffer.writerIndex();
+    }
+
+    public Buffer copy() {
+        return new VertxBufferImpl(buffer.copy());
+    }
+
+    public Buffer slice() {
+        return new VertxBufferImpl(buffer.slice());
+    }
+
+    public Buffer slice(int start, int end) {
+        return new VertxBufferImpl(buffer.slice(start, end - start));
+    }
+
+    public ByteBuf getByteBuf() {
+        // Return a duplicate so the Buffer can be written multiple times.
+        // See #648
+        return buffer;
+    }
+
+    private Buffer append(String str, Charset charset) {
+        byte[] bytes = str.getBytes(charset);
+        buffer.writeBytes(bytes);
+        return this;
+    }
+
+    private Buffer setBytes(int pos, String str, Charset charset) {
+        byte[] bytes = str.getBytes(charset);
+        ensureWritable(pos, bytes.length);
+        buffer.setBytes(pos, bytes);
+        return this;
+    }
+
+    private void ensureWritable(int pos, int len) {
+        int ni = pos + len;
+        int cap = buffer.capacity();
+        int over = ni - cap;
+        if (over > 0) {
+            buffer.writerIndex(cap);
+            buffer.ensureWritable(over);
+        }
+        //We have to make sure that the writerindex is always positioned on the last bit of data set in the buffer
+        if (ni > buffer.writerIndex()) {
+            buffer.writerIndex(ni);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        VertxBufferImpl buffer1 = (VertxBufferImpl) o;
+        return buffer != null ? buffer.equals(buffer1.buffer) : buffer1.buffer == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return buffer != null ? buffer.hashCode() : 0;
+    }
+
+    @Override
+    public void writeToBuffer(Buffer buff) {
+        buff.appendInt(this.length());
+        buff.appendBuffer(this);
+    }
+
+    @Override
+    public int readFromBuffer(int pos, Buffer buffer) {
+        int len = buffer.getInt(pos);
+        Buffer b = buffer.getBuffer(pos + 4, pos + 4 + len);
+        this.buffer = b.getByteBuf();
+        return pos + 4 + len;
+    }
+}
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java
index dc8c171c56722..adf16ee6d25f7 100644
--- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java
@@ -8,12 +8,12 @@
 import static io.vertx.core.file.impl.FileResolver.CACHE_DIR_BASE_PROP_NAME;
 
 import java.io.File;
-import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -26,10 +26,12 @@
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.FastThreadLocal;
 import io.quarkus.runtime.IOThreadDetector;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.core.runtime.config.AddressResolverConfiguration;
 import io.quarkus.vertx.core.runtime.config.ClusterConfiguration;
 import io.quarkus.vertx.core.runtime.config.EventBusConfiguration;
 import io.quarkus.vertx.core.runtime.config.VertxConfiguration;
@@ -39,6 +41,7 @@
 import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
+import io.vertx.core.dns.AddressResolverOptions;
 import io.vertx.core.eventbus.EventBusOptions;
 import io.vertx.core.file.FileSystemOptions;
 import io.vertx.core.http.ClientAuth;
@@ -49,6 +52,7 @@
 public class VertxCoreRecorder {
 
     private static final Logger LOGGER = Logger.getLogger(VertxCoreRecorder.class.getName());
+    public static final String VERTX_CACHE = "vertx-cache";
 
     static volatile VertxSupplier vertx;
 
@@ -63,7 +67,7 @@ public class VertxCoreRecorder {
     public Supplier<Vertx> configureVertx(VertxConfiguration config,
             LaunchMode launchMode, ShutdownContext shutdown, List<Consumer<VertxOptions>> customizers) {
         if (launchMode != LaunchMode.DEVELOPMENT) {
-            vertx = new VertxSupplier(config, customizers);
+            vertx = new VertxSupplier(config, customizers, shutdown);
             // we need this to be part of the last shutdown tasks because closing it early (basically before Arc)
             // could cause problem to beans that rely on Vert.x and contain shutdown tasks
             shutdown.addLastShutdownTask(new Runnable() {
@@ -74,7 +78,7 @@ public void run() {
             });
         } else {
             if (vertx == null) {
-                vertx = new VertxSupplier(config, customizers);
+                vertx = new VertxSupplier(config, customizers, shutdown);
             } else if (vertx.v != null) {
                 tryCleanTccl(vertx.v);
             }
@@ -170,12 +174,12 @@ public static Supplier<Vertx> getVertx() {
         return vertx;
     }
 
-    public static Vertx initialize(VertxConfiguration conf, VertxOptionsCustomizer customizer) {
+    public static Vertx initialize(VertxConfiguration conf, VertxOptionsCustomizer customizer, ShutdownContext shutdown) {
 
         VertxOptions options = new VertxOptions();
 
         if (conf != null) {
-            convertToVertxOptions(conf, options, true);
+            convertToVertxOptions(conf, options, true, shutdown);
         }
 
         // Allow extension customizers to do their thing
@@ -186,17 +190,26 @@ public static Vertx initialize(VertxConfiguration conf, VertxOptionsCustomizer c
         Vertx vertx;
         if (options.getEventBusOptions().isClustered()) {
             CompletableFuture<Vertx> latch = new CompletableFuture<>();
-            Vertx.clusteredVertx(options, ar -> {
-                if (ar.failed()) {
-                    latch.completeExceptionally(ar.cause());
-                } else {
-                    latch.complete(ar.result());
+            Vertx.clusteredVertx(options, new Handler<AsyncResult<Vertx>>() {
+                @Override
+                public void handle(AsyncResult<Vertx> ar) {
+                    if (ar.failed()) {
+                        latch.completeExceptionally(ar.cause());
+                    } else {
+                        latch.complete(ar.result());
+                    }
                 }
             });
             vertx = latch.join();
         } else {
             vertx = Vertx.vertx(options);
         }
+        vertx.exceptionHandler(new Handler<Throwable>() {
+            @Override
+            public void handle(Throwable error) {
+                LOGGER.error("Uncaught exception received by Vert.x", error);
+            }
+        });
         return logVertxInitialization(vertx);
     }
 
@@ -205,20 +218,49 @@ private static Vertx logVertxInitialization(Vertx vertx) {
         return vertx;
     }
 
-    private static VertxOptions convertToVertxOptions(VertxConfiguration conf, VertxOptions options, boolean allowClustering) {
+    private static VertxOptions convertToVertxOptions(VertxConfiguration conf, VertxOptions options, boolean allowClustering,
+            ShutdownContext shutdown) {
 
         if (!conf.useAsyncDNS) {
             System.setProperty(ResolverProvider.DISABLE_DNS_RESOLVER_PROP_NAME, "true");
         }
 
+        setAddressResolverOptions(conf, options);
+
         if (allowClustering) {
             // Order matters, as the cluster options modifies the event bus options.
             setEventBusOptions(conf, options);
             initializeClusterOptions(conf, options);
         }
 
-        String fileCacheDir = System.getProperty(CACHE_DIR_BASE_PROP_NAME,
-                System.getProperty("java.io.tmpdir", ".") + File.separator + "vertx-cache");
+        String fileCacheDir = System.getProperty(CACHE_DIR_BASE_PROP_NAME);
+        if (fileCacheDir == null) {
+            File tmp = new File(System.getProperty("java.io.tmpdir", ".") + File.separator + VERTX_CACHE);
+            if (!tmp.isDirectory()) {
+                if (!tmp.mkdirs()) {
+                    LOGGER.warnf("Unable to create Vert.x cache directory : %s", tmp.getAbsolutePath());
+                }
+                if (!(tmp.setReadable(true, false) && tmp.setWritable(true, false))) {
+                    LOGGER.warnf("Unable to make the Vert.x cache directory (%s) world readable and writable",
+                            tmp.getAbsolutePath());
+                }
+            }
+
+            File cache = getRandomDirectory(tmp);
+            LOGGER.debugf("Vert.x Cache configured to: %s", cache.getAbsolutePath());
+            fileCacheDir = cache.getAbsolutePath();
+            if (shutdown != null) {
+                shutdown.addLastShutdownTask(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Recursively delete the created directory and all the files
+                        deleteDirectory(cache);
+                        // We do not delete the vertx-cache directory on purpose, as it could be used concurrently by
+                        // another application. In the worse case, it's just an empty directory.
+                    }
+                });
+            }
+        }
 
         options.setFileSystemOptions(new FileSystemOptions()
                 .setFileCachingEnabled(conf.caching)
@@ -235,17 +277,11 @@ private static VertxOptions convertToVertxOptions(VertxConfiguration conf, Vertx
             options.setEventLoopPoolSize(calculateDefaultIOThreads());
         }
 
-        Optional<Duration> maxEventLoopExecuteTime = conf.maxEventLoopExecuteTime;
-        if (maxEventLoopExecuteTime.isPresent()) {
-            options.setMaxEventLoopExecuteTime(maxEventLoopExecuteTime.get().toMillis());
-            options.setMaxEventLoopExecuteTimeUnit(TimeUnit.MILLISECONDS);
-        }
+        options.setMaxEventLoopExecuteTime(conf.maxEventLoopExecuteTime.toMillis());
+        options.setMaxEventLoopExecuteTimeUnit(TimeUnit.MILLISECONDS);
 
-        Optional<Duration> maxWorkerExecuteTime = conf.maxWorkerExecuteTime;
-        if (maxWorkerExecuteTime.isPresent()) {
-            options.setMaxWorkerExecuteTime(maxWorkerExecuteTime.get().toMillis());
-            options.setMaxWorkerExecuteTimeUnit(TimeUnit.MILLISECONDS);
-        }
+        options.setMaxWorkerExecuteTime(conf.maxWorkerExecuteTime.toMillis());
+        options.setMaxWorkerExecuteTimeUnit(TimeUnit.MILLISECONDS);
 
         options.setWarningExceptionTime(conf.warningExceptionTime.toNanos());
 
@@ -254,6 +290,16 @@ private static VertxOptions convertToVertxOptions(VertxConfiguration conf, Vertx
         return options;
     }
 
+    private static File getRandomDirectory(File tmp) {
+        long random = Math.abs(UUID.randomUUID().getMostSignificantBits());
+        File cache = new File(tmp, Long.toString(random));
+        if (cache.isDirectory()) {
+            // Do not reuse an existing directory.
+            return getRandomDirectory(tmp);
+        }
+        return cache;
+    }
+
     private static int calculateDefaultIOThreads() {
         //we only allow one event loop per 10mb of ram at the most
         //its hard to say what this number should be, but it is also obvious
@@ -269,13 +315,18 @@ private static int calculateDefaultIOThreads() {
 
     void destroy() {
         if (vertx != null && vertx.v != null) {
+            // Netty attaches a ThreadLocal to the main thread that can leak the QuarkusClassLoader which can be problematic in dev or test mode
+            FastThreadLocal.destroy();
             CountDownLatch latch = new CountDownLatch(1);
             AtomicReference<Throwable> problem = new AtomicReference<>();
-            vertx.v.close(ar -> {
-                if (ar.failed()) {
-                    problem.set(ar.cause());
+            vertx.v.close(new Handler<AsyncResult<Void>>() {
+                @Override
+                public void handle(AsyncResult<Void> ar) {
+                    if (ar.failed()) {
+                        problem.set(ar.cause());
+                    }
+                    latch.countDown();
                 }
-                latch.countDown();
             });
             try {
                 latch.await();
@@ -284,7 +335,7 @@ void destroy() {
                 }
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-                throw new IllegalStateException("Interrupted when closing Vert.x instance", e);
+                throw new IllegalStateException("Exception when closing Vert.x instance", e);
             }
             vertx = null;
         }
@@ -342,6 +393,16 @@ private static void setEventBusOptions(VertxConfiguration conf, VertxOptions opt
         options.setEventBusOptions(opts);
     }
 
+    private static void setAddressResolverOptions(VertxConfiguration conf, VertxOptions options) {
+        AddressResolverConfiguration ar = conf.resolver;
+        AddressResolverOptions opts = new AddressResolverOptions();
+        opts.setCacheMaxTimeToLive(ar.cacheMaxTimeToLive);
+        opts.setCacheMinTimeToLive(ar.cacheMinTimeToLive);
+        opts.setCacheNegativeTimeToLive(ar.cacheNegativeTimeToLive);
+
+        options.setAddressResolverOptions(opts);
+    }
+
     public Supplier<EventLoopGroup> bossSupplier() {
         return new Supplier<EventLoopGroup>() {
             @Override
@@ -376,20 +437,28 @@ public Integer get() {
         };
     }
 
+    public static Supplier<Vertx> recoverFailedStart(VertxConfiguration config) {
+        return vertx = new VertxSupplier(config, Collections.emptyList(), null);
+
+    }
+
     static class VertxSupplier implements Supplier<Vertx> {
         final VertxConfiguration config;
         final VertxOptionsCustomizer customizer;
+        final ShutdownContext shutdown;
         Vertx v;
 
-        VertxSupplier(VertxConfiguration config, List<Consumer<VertxOptions>> customizers) {
+        VertxSupplier(VertxConfiguration config, List<Consumer<VertxOptions>> customizers,
+                ShutdownContext shutdown) {
             this.config = config;
             this.customizer = new VertxOptionsCustomizer(customizers);
+            this.shutdown = shutdown;
         }
 
         @Override
         public synchronized Vertx get() {
             if (v == null) {
-                v = initialize(config, customizer);
+                v = initialize(config, customizer, shutdown);
             }
             return v;
         }
@@ -413,4 +482,14 @@ VertxOptions customize(VertxOptions options) {
     public static void setWebDeploymentId(String webDeploymentId) {
         VertxCoreRecorder.webDeploymentId = webDeploymentId;
     }
+
+    private static void deleteDirectory(File directory) {
+        File[] children = directory.listFiles();
+        if (children != null) {
+            for (File child : children) {
+                deleteDirectory(child);
+            }
+        }
+        directory.delete();
+    }
 }
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/AddressResolverConfiguration.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/AddressResolverConfiguration.java
new file mode 100644
index 0000000000000..813e275836dfb
--- /dev/null
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/AddressResolverConfiguration.java
@@ -0,0 +1,29 @@
+package io.quarkus.vertx.core.runtime.config;
+
+import io.quarkus.runtime.annotations.ConfigGroup;
+import io.quarkus.runtime.annotations.ConfigItem;
+
+@ConfigGroup
+public class AddressResolverConfiguration {
+
+    /**
+     * The maximum amount of time in seconds that a successfully resolved address will be cached.
+     * <p>
+     * If not set explicitly, resolved addresses may be cached forever.
+     */
+    @ConfigItem(defaultValue = "2147483647")
+    public int cacheMaxTimeToLive;
+
+    /**
+     * The minimum amount of time in seconds that a successfully resolved address will be cached.
+     */
+    @ConfigItem(defaultValue = "0")
+    public int cacheMinTimeToLive;
+
+    /**
+     * The amount of time in seconds that an unsuccessful attempt to resolve an address will be cached.
+     */
+    @ConfigItem(defaultValue = "0")
+    public int cacheNegativeTimeToLive;
+
+}
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/JksConfiguration.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/JksConfiguration.java
index 77ec9e0d44919..762b6f3e3cf84 100644
--- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/JksConfiguration.java
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/JksConfiguration.java
@@ -12,17 +12,17 @@ public class JksConfiguration {
      * JKS config is disabled by default.
      */
     @ConfigItem(name = ConfigItem.PARENT, defaultValue = "false")
-    public boolean enabled;
+    public boolean enabled = false;
 
     /**
      * Path of the key file (JKS format).
      */
     @ConfigItem
-    public Optional<String> path;
+    public Optional<String> path = Optional.empty();
 
     /**
      * Password of the key file.
      */
     @ConfigItem
-    public Optional<String> password;
+    public Optional<String> password = Optional.empty();
 }
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemKeyCertConfiguration.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemKeyCertConfiguration.java
index 1240450427af4..b244c1653247c 100644
--- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemKeyCertConfiguration.java
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemKeyCertConfiguration.java
@@ -13,18 +13,18 @@ public class PemKeyCertConfiguration {
      * PEM Key/cert config is disabled by default.
      */
     @ConfigItem(name = ConfigItem.PARENT, defaultValue = "false")
-    public boolean enabled;
+    public boolean enabled = false;
 
     /**
      * Comma-separated list of the path to the key files (Pem format).
      */
     @ConfigItem
-    public Optional<List<String>> keys;
+    public Optional<List<String>> keys = Optional.empty();
 
     /**
      * Comma-separated list of the path to the certificate files (Pem format).
      */
     @ConfigItem
-    public Optional<List<String>> certs;
+    public Optional<List<String>> certs = Optional.empty();
 
 }
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemTrustCertConfiguration.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemTrustCertConfiguration.java
index 998ceae2922dc..6605e927e12c6 100644
--- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemTrustCertConfiguration.java
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemTrustCertConfiguration.java
@@ -13,12 +13,12 @@ public class PemTrustCertConfiguration {
      * PEM Trust config is disabled by default.
      */
     @ConfigItem(name = ConfigItem.PARENT, defaultValue = "false")
-    public boolean enabled;
+    public boolean enabled = false;
 
     /**
      * Comma-separated list of the trust certificate files (Pem format).
      */
     @ConfigItem
-    public Optional<List<String>> certs;
+    public Optional<List<String>> certs = Optional.empty();
 
 }
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PfxConfiguration.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PfxConfiguration.java
index 4e4256805905b..abe0e181fdc28 100644
--- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PfxConfiguration.java
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PfxConfiguration.java
@@ -12,17 +12,17 @@ public class PfxConfiguration {
      * PFX config is disabled by default.
      */
     @ConfigItem(name = ConfigItem.PARENT, defaultValue = "false")
-    public boolean enabled;
+    public boolean enabled = false;
 
     /**
      * Path to the key file (PFX format).
      */
     @ConfigItem
-    public Optional<String> path;
+    public Optional<String> path = Optional.empty();
 
     /**
      * Password of the key.
      */
     @ConfigItem
-    public Optional<String> password;
+    public Optional<String> password = Optional.empty();
 }
diff --git a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/VertxConfiguration.java b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/VertxConfiguration.java
index 8612a757a0d24..040c37cd325a3 100644
--- a/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/VertxConfiguration.java
+++ b/extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/VertxConfiguration.java
@@ -1,7 +1,6 @@
 package io.quarkus.vertx.core.runtime.config;
 
 import java.time.Duration;
-import java.util.Optional;
 import java.util.OptionalInt;
 
 import io.quarkus.runtime.annotations.ConfigItem;
@@ -31,10 +30,9 @@ public class VertxConfiguration {
 
     /**
      * The maximum amount of time the event loop can be blocked.
-     * Default is 2s.
      */
-    @ConfigItem
-    public Optional<Duration> maxEventLoopExecuteTime;
+    @ConfigItem(defaultValue = "2")
+    public Duration maxEventLoopExecuteTime;
 
     /**
      * The amount of time before a warning is displayed if the event loop is blocked.
@@ -50,10 +48,9 @@ public class VertxConfiguration {
 
     /**
      * The maximum amount of time the worker thread can be blocked.
-     * Default is 10s.
      */
-    @ConfigItem
-    public Optional<Duration> maxWorkerExecuteTime;
+    @ConfigItem(defaultValue = "60")
+    public Duration maxWorkerExecuteTime;
 
     /**
      * The size of the internal thread pool (used for the file system).
@@ -79,6 +76,12 @@ public class VertxConfiguration {
     @ConfigItem
     public ClusterConfiguration cluster;
 
+    /**
+     * The address resolver configuration.
+     */
+    @ConfigItem
+    public AddressResolverConfiguration resolver;
+
     /**
      * Enable or disable native transport
      */
diff --git a/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java b/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java
index 314ea25821939..3a0605f67c4fe 100644
--- a/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java
+++ b/extensions/vertx-core/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.vertx.core.runtime.VertxCoreRecorder.VertxOptionsCustomizer;
+import io.quarkus.vertx.core.runtime.config.AddressResolverConfiguration;
 import io.quarkus.vertx.core.runtime.config.ClusterConfiguration;
 import io.quarkus.vertx.core.runtime.config.EventBusConfiguration;
 import io.quarkus.vertx.core.runtime.config.JksConfiguration;
@@ -22,6 +23,7 @@
 import io.quarkus.vertx.core.runtime.config.VertxConfiguration;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
+import io.vertx.core.dns.AddressResolverOptions;
 
 public class VertxCoreProducerTest {
 
@@ -53,7 +55,7 @@ public void shouldEnableClustering() {
         configuration.cluster = cc;
 
         try {
-            VertxCoreRecorder.initialize(configuration, null);
+            VertxCoreRecorder.initialize(configuration, null, null);
             Assertions.fail("It should not have a cluster manager on the classpath, and so fail the creation");
         } catch (IllegalStateException e) {
             Assertions.assertTrue(e.getMessage().contains("No ClusterManagerFactory"),
@@ -61,6 +63,28 @@ public void shouldEnableClustering() {
         }
     }
 
+    @Test
+    public void shouldConfigureAddressResolver() {
+        VertxConfiguration configuration = createDefaultConfiguration();
+        AddressResolverConfiguration ar = configuration.resolver;
+        ar.cacheMaxTimeToLive = 3;
+        ar.cacheNegativeTimeToLive = 1;
+
+        VertxOptionsCustomizer customizers = new VertxOptionsCustomizer(Arrays.asList(
+                new Consumer<VertxOptions>() {
+                    @Override
+                    public void accept(VertxOptions vertxOptions) {
+                        Assertions.assertEquals(3, vertxOptions.getAddressResolverOptions().getCacheMaxTimeToLive());
+                        Assertions.assertEquals(
+                                AddressResolverOptions.DEFAULT_CACHE_MIN_TIME_TO_LIVE,
+                                vertxOptions.getAddressResolverOptions().getCacheMinTimeToLive());
+                        Assertions.assertEquals(1, vertxOptions.getAddressResolverOptions().getCacheNegativeTimeToLive());
+                    }
+                }));
+
+        VertxCoreRecorder.initialize(configuration, customizers, null);
+    }
+
     @Test
     public void shouldInvokeCustomizers() {
         final AtomicBoolean called = new AtomicBoolean(false);
@@ -71,7 +95,7 @@ public void accept(VertxOptions vertxOptions) {
                         called.set(true);
                     }
                 }));
-        Vertx v = VertxCoreRecorder.initialize(createDefaultConfiguration(), customizers);
+        Vertx v = VertxCoreRecorder.initialize(createDefaultConfiguration(), customizers, null);
         Assertions.assertTrue(called.get(), "Customizer should get called during initialization");
     }
 
@@ -80,10 +104,10 @@ private VertxConfiguration createDefaultConfiguration() {
         vc.caching = true;
         vc.classpathResolving = true;
         vc.eventLoopsPoolSize = OptionalInt.empty();
-        vc.maxEventLoopExecuteTime = Optional.of(Duration.ofSeconds(2));
+        vc.maxEventLoopExecuteTime = Duration.ofSeconds(2);
         vc.warningExceptionTime = Duration.ofSeconds(2);
         vc.workerPoolSize = 20;
-        vc.maxWorkerExecuteTime = Optional.of(Duration.ofSeconds(1));
+        vc.maxWorkerExecuteTime = Duration.ofSeconds(1);
         vc.internalBlockingPoolSize = 20;
         vc.useAsyncDNS = false;
         vc.preferNativeTransport = false;
@@ -129,6 +153,10 @@ private VertxConfiguration createDefaultConfiguration() {
         vc.cluster.clustered = false;
         vc.cluster.pingInterval = Duration.ofSeconds(20);
         vc.cluster.pingReplyInterval = Duration.ofSeconds(20);
+        vc.resolver = new AddressResolverConfiguration();
+        vc.resolver.cacheMaxTimeToLive = Integer.MAX_VALUE;
+        vc.resolver.cacheMinTimeToLive = 0;
+        vc.resolver.cacheNegativeTimeToLive = 0;
         return vc;
     }
 }
diff --git a/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlConfig.java b/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlConfig.java
index 179f070cfb603..ecc6596581c90 100644
--- a/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlConfig.java
+++ b/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlConfig.java
@@ -26,7 +26,7 @@ public static class VertxGraphqlUiConfig {
          * <p>
          * The value `/` is not allowed as it blocks the application from serving anything else.
          */
-        @ConfigItem(defaultValue = "/graphql-ui")
+        @ConfigItem(defaultValue = "graphql-ui")
         String path;
     }
 }
diff --git a/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java b/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
index 1d80b073d28d5..8c00ac69b8bb4 100644
--- a/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
+++ b/extensions/vertx-graphql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
@@ -16,9 +16,9 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.vertx.graphql.runtime.VertxGraphqlRecorder;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
 import io.quarkus.vertx.http.deployment.WebsocketSubProtocolsBuildItem;
-import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
 import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.graphql.impl.GraphQLBatch;
@@ -50,7 +50,8 @@ List<ReflectiveClassBuildItem> registerForReflection() {
     @Record(ExecutionTime.STATIC_INIT)
     void registerVertxGraphqlUI(VertxGraphqlRecorder recorder,
             BuildProducer<NativeImageResourceDirectoryBuildItem> nativeResourcesProducer, VertxGraphqlConfig config,
-            LaunchModeBuildItem launchMode, BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
+            LaunchModeBuildItem launchMode,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
             BuildProducer<RouteBuildItem> routes) {
 
         boolean includeVertxGraphqlUi = launchMode.getLaunchMode().isDevOrTest() || config.ui.alwaysInclude;
@@ -66,10 +67,19 @@ void registerVertxGraphqlUI(VertxGraphqlRecorder recorder,
                             + "\", this is not allowed as it blocks the application from serving anything else.");
         }
 
-        Handler<RoutingContext> handler = recorder.handler(path);
-        routes.produce(new RouteBuildItem(path, handler));
-        routes.produce(new RouteBuildItem(path + "/*", handler));
-        displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(path + "/"));
+        Handler<RoutingContext> handler = recorder.handler();
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route(path)
+                .handler(handler)
+                .requiresLegacyRedirect()
+                .displayOnNotFoundPage("GraphQL UI")
+                .build());
+        routes.produce(
+                nonApplicationRootPathBuildItem.routeBuilder()
+                        .route(path + "/*")
+                        .handler(handler)
+                        .requiresLegacyRedirect()
+                        .build());
         nativeResourcesProducer.produce(new NativeImageResourceDirectoryBuildItem("io/vertx/ext/web/handler/graphiql"));
     }
 }
diff --git a/extensions/vertx-graphql/runtime/src/main/java/io/quarkus/vertx/graphql/runtime/VertxGraphqlRecorder.java b/extensions/vertx-graphql/runtime/src/main/java/io/quarkus/vertx/graphql/runtime/VertxGraphqlRecorder.java
index a720daf837cc3..1ed8d191ceb35 100644
--- a/extensions/vertx-graphql/runtime/src/main/java/io/quarkus/vertx/graphql/runtime/VertxGraphqlRecorder.java
+++ b/extensions/vertx-graphql/runtime/src/main/java/io/quarkus/vertx/graphql/runtime/VertxGraphqlRecorder.java
@@ -9,7 +9,7 @@
 
 @Recorder
 public class VertxGraphqlRecorder {
-    public Handler<RoutingContext> handler(String path) {
+    public Handler<RoutingContext> handler() {
 
         GraphiQLHandlerOptions options = new GraphiQLHandlerOptions();
         options.setEnabled(true);
@@ -19,10 +19,11 @@ public Handler<RoutingContext> handler(String path) {
         return new Handler<RoutingContext>() {
             @Override
             public void handle(RoutingContext event) {
-                if (event.normalisedPath().length() == path.length()) {
-
+                if (event.normalisedPath().length() == (event.currentRoute().getPath().length()
+                        + (event.mountPoint() == null ? 0 : event.mountPoint().length() - 1))) {
                     event.response().setStatusCode(302);
-                    event.response().headers().set(HttpHeaders.LOCATION, path + "/");
+                    event.response().headers().set(HttpHeaders.LOCATION, (event.mountPoint() == null ? "" : event.mountPoint())
+                            + event.currentRoute().getPath().substring(1) + "/");
                     event.response().end();
                     return;
                 }
diff --git a/extensions/vertx-graphql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/vertx-graphql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..369891a5e4de7
--- /dev/null
+++ b/extensions/vertx-graphql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,12 @@
+---
+name: "Eclipse Vert.x GraphQL"
+metadata:
+  keywords:
+  - "eclipse"
+  - "vertx"
+  - "vert.x"
+  - "graphql"
+  - "vertx-graphql"
+  categories:
+    - "web"
+  status: "stable"
diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml
index 8aec622429865..662c528339c9a 100644
--- a/extensions/vertx-http/deployment/pom.xml
+++ b/extensions/vertx-http/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,31 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-spi</artifactId>
         </dependency>
+        <!-- Used for the dev console. Note that there is no corresponding runtime dependency -->
+        <dependency>
+            <groupId>io.quarkus.qute</groupId>
+            <artifactId>qute-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+        <!-- Webjars for the UI -->
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>font-awesome</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -78,6 +102,88 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            
+            <!-- So we don't have to keep a version of these javascript libs in our repo -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-ui</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <!-- Bootstrap -->
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>bootstrap</artifactId>
+                                    <version>${webjar.bootstrap.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes/dev-static/css/</outputDirectory>
+                                    <includes>**/bootstrap.min.css, **/bootstrap.min.css.map</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
+                                    </fileMappers>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>bootstrap</artifactId>
+                                    <version>${webjar.bootstrap.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes/dev-static/js/</outputDirectory>
+                                    <includes>**/bootstrap.bundle.min.js, **/bootstrap.bundle.min.js.map</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
+                                    </fileMappers>
+                                </artifactItem>
+                                <!-- JQuery -->
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>jquery</artifactId>
+                                    <version>${webjar.jquery.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes/dev-static/js/</outputDirectory>
+                                    <includes>**/jquery.min.js, **/jquery.min.js.map</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
+                                    </fileMappers>
+                                </artifactItem>
+                                <!-- Font awesome -->
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>font-awesome</artifactId>
+                                    <version>${webjar.font-awesome.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes/dev-static/fontawesome/css</outputDirectory>
+                                    <includes>**/css/all.min.css</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
+                                    </fileMappers>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>font-awesome</artifactId>
+                                    <version>${webjar.font-awesome.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes/dev-static/fontawesome/webfonts</outputDirectory>
+                                    <includes>**/webfonts/**.*</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.FlattenFileMapper/>
+                                    </fileMappers>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java
index 91548d820f4b5..28b897640ce6d 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItem.java
@@ -1,26 +1,194 @@
 package io.quarkus.vertx.http.deployment;
 
+import java.net.URI;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
 import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.deployment.util.UriNormalizationUtil;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.console.ConfiguredPathInfo;
+import io.quarkus.vertx.http.runtime.HandlerType;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Route;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
 
 public final class HttpRootPathBuildItem extends SimpleBuildItem {
 
-    private final String rootPath;
+    /**
+     * Normalized from quarkus.http.root-path.
+     * This path will always end in a slash
+     */
+    private final URI rootPath;
 
     public HttpRootPathBuildItem(String rootPath) {
-        this.rootPath = rootPath;
+        this.rootPath = UriNormalizationUtil.toURI(rootPath, true);
     }
 
+    /**
+     * Return normalized Http root path configured from {@literal quarkus.http.root-path}.
+     * This path will always end in a slash.
+     * <p>
+     * Use {@link #resolvePath(String)} if you need to construct a Uri from the Http root path.
+     *
+     * @return Normalized Http root path ending with a slash
+     * @see #resolvePath(String)
+     */
     public String getRootPath() {
-        return rootPath;
+        return rootPath.getPath();
     }
 
+    /**
+     * Adjusts the path in relation to `quarkus.http.root-path`.
+     * Any leading slash will be removed to resolve relatively.
+     *
+     * @deprecated Use {@code resolvePath} instead. Do not use this method. Will be removed in Quarkus 2.0
+     */
     public String adjustPath(String path) {
-        if (!path.startsWith("/")) {
-            throw new IllegalArgumentException("Path must start with /");
+        return resolvePath(path.startsWith("/") ? path.substring(1) : path);
+    }
+
+    /**
+     * Resolve path into an absolute path.
+     * If path is relative, it will be resolved against `quarkus.http.root-path`.
+     * An absolute path will be normalized and returned.
+     * <p>
+     * Given {@literal quarkus.http.root-path=/}
+     * <ul>
+     * <li>{@code resolvePath("foo")} will return {@literal /foo}</li>
+     * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * </ul>
+     * Given {@literal quarkus.http.root-path=/app}
+     * <ul>
+     * <li>{@code resolvePath("foo")} will return {@literal /app/foo}</li>
+     * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * </ul>
+     * <p>
+     * The returned path will not end with a slash.
+     *
+     * @param path Path to be resolved to an absolute path.
+     * @return An absolute path not ending with a slash
+     * @see UriNormalizationUtil#normalizeWithBase(URI, String, boolean)
+     */
+    public String resolvePath(String path) {
+        return UriNormalizationUtil.normalizeWithBase(rootPath, path, false).getPath();
+    }
+
+    public HttpRootPathBuildItem.Builder routeBuilder() {
+        return new HttpRootPathBuildItem.Builder(this);
+    }
+
+    public static class Builder extends RouteBuildItem.Builder {
+        private final HttpRootPathBuildItem buildItem;
+        private RouteBuildItem.RouteType routeType = RouteBuildItem.RouteType.APPLICATION_ROUTE;
+        private String path;
+
+        Builder(HttpRootPathBuildItem buildItem) {
+            this.buildItem = buildItem;
+        }
+
+        @Override
+        public Builder routeFunction(Function<Router, Route> routeFunction) {
+            throw new RuntimeException(
+                    "This method is not supported using this builder. Use #routeFunction(String, Consumer<Route>)");
+        }
+
+        public Builder routeFunction(String route, Consumer<Route> routeFunction) {
+            route = super.absolutePath = buildItem.resolvePath(route);
+
+            if (route.startsWith(buildItem.getRootPath())) {
+                // relative to http root (leading slash for vert.x route)
+                this.path = "/" + UriNormalizationUtil.relativize(buildItem.getRootPath(), route);
+                this.routeType = RouteBuildItem.RouteType.APPLICATION_ROUTE;
+            } else if (route.startsWith("/")) {
+                // absolute path
+                this.path = route;
+                this.routeType = RouteBuildItem.RouteType.ABSOLUTE_ROUTE;
+            }
+
+            super.routeFunction(this.path, routeFunction);
+            return this;
+        }
+
+        @Override
+        public Builder route(String route) {
+            routeFunction(route, null);
+            return this;
+        }
+
+        public Builder nestedRoute(String baseRoute, String subRoute) {
+            if (subRoute.startsWith("/")) {
+                routeFunction(subRoute, null);
+                return this;
+            }
+
+            baseRoute = baseRoute.endsWith("/") ? baseRoute : baseRoute + "/";
+            routeFunction(baseRoute + subRoute, null);
+            return this;
+        }
+
+        @Override
+        public Builder handler(Handler<RoutingContext> handler) {
+            super.handler(handler);
+            return this;
+        }
+
+        @Override
+        public Builder handlerType(HandlerType handlerType) {
+            super.handlerType(handlerType);
+            return this;
+        }
+
+        @Override
+        public Builder blockingRoute() {
+            super.blockingRoute();
+            return this;
+        }
+
+        @Override
+        public Builder failureRoute() {
+            super.failureRoute();
+            return this;
+        }
+
+        @Override
+        public Builder displayOnNotFoundPage() {
+            super.displayOnNotFoundPage();
+            return this;
+        }
+
+        @Override
+        public Builder displayOnNotFoundPage(String notFoundPageTitle) {
+            super.displayOnNotFoundPage(notFoundPageTitle);
+            return this;
+        }
+
+        @Override
+        public Builder displayOnNotFoundPage(String notFoundPageTitle, String notFoundPagePath) {
+            super.displayOnNotFoundPage(notFoundPageTitle, notFoundPagePath);
+            return this;
+        }
+
+        @Override
+        public Builder routeConfigKey(String attributeName) {
+            super.routeConfigKey(attributeName);
+            return this;
         }
-        if (rootPath.equals("/")) {
-            return path;
+
+        @Override
+        public RouteBuildItem build() {
+            return new RouteBuildItem(this, routeType, false);
+        }
+
+        @Override
+        protected ConfiguredPathInfo getRouteConfigInfo() {
+            return super.getRouteConfigInfo();
+        }
+
+        @Override
+        protected NotFoundPageDisplayableEndpointBuildItem getNotFoundEndpoint() {
+            return super.getNotFoundEndpoint();
         }
-        return rootPath + path;
     }
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/NonApplicationRootPathBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/NonApplicationRootPathBuildItem.java
new file mode 100644
index 0000000000000..e16242c878c30
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/NonApplicationRootPathBuildItem.java
@@ -0,0 +1,313 @@
+package io.quarkus.vertx.http.deployment;
+
+import java.net.URI;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.deployment.util.UriNormalizationUtil;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.console.ConfiguredPathInfo;
+import io.quarkus.vertx.http.runtime.HandlerType;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Route;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+public final class NonApplicationRootPathBuildItem extends SimpleBuildItem {
+    /**
+     * Normalized of quarkus.http.root-path.
+     * Must end in a slash
+     */
+    final URI httpRootPath;
+
+    /**
+     * Normalized from quarkus.http.non-application-root-path
+     */
+    final URI nonApplicationRootPath;
+
+    /**
+     * Non-Application root path is distinct from HTTP root path.
+     */
+    final boolean dedicatedRouterRequired;
+
+    final boolean attachedToMainRouter;
+
+    public NonApplicationRootPathBuildItem(String httpRootPath, String nonApplicationRootPath) {
+        // Presume value always starts with a slash and is normalized
+        this.httpRootPath = UriNormalizationUtil.toURI(httpRootPath, true);
+
+        this.nonApplicationRootPath = UriNormalizationUtil.normalizeWithBase(this.httpRootPath, nonApplicationRootPath,
+                true);
+
+        this.dedicatedRouterRequired = !this.nonApplicationRootPath.getPath().equals(this.httpRootPath.getPath());
+
+        // Is the non-application root path underneath the http root path. Do we add non-application root to main router or not.
+        this.attachedToMainRouter = this.nonApplicationRootPath.getPath().startsWith(this.httpRootPath.getPath());
+    }
+
+    /**
+     * Is a dedicated router required for non-application endpoints.
+     *
+     * @return boolean
+     */
+    public boolean isDedicatedRouterRequired() {
+        return dedicatedRouterRequired;
+    }
+
+    public boolean isAttachedToMainRouter() {
+        return attachedToMainRouter;
+    }
+
+    /**
+     * Path to the Non-application root for use with Vert.x Routers,
+     * has a leading slash.
+     * <p>
+     * If it's under the HTTP Root, return a path relative to HTTP Root.
+     * Otherwise, return an absolute path.
+     *
+     * @return String Path suitable for use with Vert.x Router. It has a leading slash
+     */
+    String getVertxRouterPath() {
+        if (attachedToMainRouter) {
+            return "/" + UriNormalizationUtil.relativize(httpRootPath.getPath(), nonApplicationRootPath.getPath());
+        } else {
+            return getNonApplicationRootPath();
+        }
+    }
+
+    public String getNormalizedHttpRootPath() {
+        return httpRootPath.getPath();
+    }
+
+    /**
+     * Return normalized root path configured from {@literal quarkus.http.root-path}
+     * and {quarkus.http.non-application-root-path}.
+     * This path will always end in a slash.
+     * <p>
+     * Use {@link #resolvePath(String)} if you need to construct a URI for
+     * a non-application endpoint.
+     *
+     * @return Normalized non-application root path ending with a slash
+     * @see #resolvePath(String)
+     */
+    public String getNonApplicationRootPath() {
+        return nonApplicationRootPath.getPath();
+    }
+
+    /**
+     * Resolve path into an absolute path.
+     * If path is relative, it will be resolved against `quarkus.http.non-application-root-path`.
+     * An absolute path will be normalized and returned.
+     * <p>
+     * Given {@literal quarkus.http.root-path=/} and
+     * {@literal quarkus.http.non-application-root-path="q"}
+     * <ul>
+     * <li>{@code resolvePath("foo")} will return {@literal /q/foo}</li>
+     * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * </ul>
+     * <p>
+     * Given {@literal quarkus.http.root-path=/} and
+     * {@literal quarkus.http.non-application-root-path="/q"}
+     * <ul>
+     * <li>{@code resolvePath("foo")} will return {@literal /q/foo}</li>
+     * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * </ul>
+     * Given {@literal quarkus.http.root-path=/app} and
+     * {@literal quarkus.http.non-application-root-path="q"}
+     * <ul>
+     * <li>{@code resolvePath("foo")} will return {@literal /app/q/foo}</li>
+     * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * </ul>
+     * Given {@literal quarkus.http.root-path=/app} and
+     * {@literal quarkus.http.non-application-root-path="/q"}
+     * <ul>
+     * <li>{@code resolvePath("foo")} will return {@literal /q/foo}</li>
+     * <li>{@code resolvePath("/foo")} will return {@literal /foo}</li>
+     * </ul>
+     * <p>
+     * The returned path will not end with a slash.
+     *
+     * @param path Path to be resolved to an absolute path.
+     * @return An absolute path not ending with a slash
+     * @see UriNormalizationUtil#normalizeWithBase(URI, String, boolean)
+     * @throws IllegalArgumentException if path is null or empty
+     */
+    public String resolvePath(String path) {
+        if (path == null || path.trim().isEmpty()) {
+            throw new IllegalArgumentException("Specified path can not be empty");
+        }
+        return UriNormalizationUtil.normalizeWithBase(nonApplicationRootPath, path, false).getPath();
+    }
+
+    /**
+     * Resolve a base path and a sub-resource against the non-application root.
+     * This will call resolvePath on the base path (to establish a fully-resolved,
+     * absolute path), and then will resolve the subRoute against that resolved path.
+     * This allows a configured subpath to be configured (consistently)
+     * as an absolute URI.
+     * 
+     * Given {@literal quarkus.http.root-path=/} and
+     * {@literal quarkus.http.non-application-root-path="q"}
+     * <ul>
+     * <li>{@code resolveNestedPath("foo", "a")} will return {@literal /q/foo/a}</li>
+     * <li>{@code resolveNestedPath("foo", "/a)} will return {@literal /a}</li>
+     * </ul>
+     * <p>
+     * The returned path will not end with a slash.
+     *
+     * @param path Path to be resolved to an absolute path.
+     * @return An absolute path not ending with a slash
+     * @see UriNormalizationUtil#normalizeWithBase(URI, String, boolean)
+     * @see #resolvePath(String)
+     * @throws IllegalArgumentException if path is null or empty
+     */
+    public String resolveNestedPath(String path, String subRoute) {
+        if (path == null || path.trim().isEmpty()) {
+            throw new IllegalArgumentException("Specified path can not be empty");
+        }
+        URI base = UriNormalizationUtil.normalizeWithBase(nonApplicationRootPath, path, true);
+        return UriNormalizationUtil.normalizeWithBase(base, subRoute, false).getPath();
+    }
+
+    public Builder routeBuilder() {
+        return new Builder(this);
+    }
+
+    /**
+     * Per non-application endpoint instance.
+     */
+    public static class Builder extends RouteBuildItem.Builder {
+        private final NonApplicationRootPathBuildItem buildItem;
+        private boolean requiresLegacyRedirect = false;
+        private RouteBuildItem.RouteType routeType = RouteBuildItem.RouteType.FRAMEWORK_ROUTE;
+        private String path;
+
+        Builder(NonApplicationRootPathBuildItem buildItem) {
+            this.buildItem = buildItem;
+        }
+
+        @Override
+        public Builder routeFunction(Function<Router, Route> routeFunction) {
+            throw new RuntimeException(
+                    "This method is not supported using this builder. Use #routeFunction(String, Consumer<Route>)");
+        }
+
+        public Builder routeFunction(String route, Consumer<Route> routeFunction) {
+            route = super.absolutePath = buildItem.resolvePath(route);
+
+            boolean isFrameworkRoute = buildItem.dedicatedRouterRequired
+                    && route.startsWith(buildItem.getNonApplicationRootPath());
+
+            if (isFrameworkRoute) {
+                // relative non-application root (leading slash for vert.x)
+                this.path = "/" + UriNormalizationUtil.relativize(buildItem.getNonApplicationRootPath(), route);
+                this.routeType = RouteBuildItem.RouteType.FRAMEWORK_ROUTE;
+            } else if (route.startsWith(buildItem.httpRootPath.getPath())) {
+                // relative to http root (leading slash for vert.x route)
+                this.path = "/" + UriNormalizationUtil.relativize(buildItem.httpRootPath.getPath(), route);
+                this.routeType = RouteBuildItem.RouteType.APPLICATION_ROUTE;
+            } else if (route.startsWith("/")) {
+                // absolute path
+                this.path = route;
+                this.routeType = RouteBuildItem.RouteType.ABSOLUTE_ROUTE;
+            }
+
+            super.routeFunction(this.path, routeFunction);
+            return this;
+        }
+
+        @Override
+        public Builder route(String route) {
+            routeFunction(route, null);
+            return this;
+        }
+
+        public Builder nestedRoute(String baseRoute, String subRoute) {
+            if (subRoute.startsWith("/")) {
+                routeFunction(subRoute, null);
+                return this;
+            }
+
+            baseRoute = baseRoute.endsWith("/") ? baseRoute : baseRoute + "/";
+            routeFunction(baseRoute + subRoute, null);
+            return this;
+        }
+
+        /**
+         * @deprecated This will be removed in Quarkus 2.0, don't use unless you have to.
+         */
+        @Deprecated
+        public Builder requiresLegacyRedirect() {
+            this.requiresLegacyRedirect = true;
+            return this;
+        }
+
+        @Override
+        public Builder handler(Handler<RoutingContext> handler) {
+            super.handler(handler);
+            return this;
+        }
+
+        @Override
+        public Builder handlerType(HandlerType handlerType) {
+            super.handlerType(handlerType);
+            return this;
+        }
+
+        @Override
+        public Builder blockingRoute() {
+            super.blockingRoute();
+            return this;
+        }
+
+        @Override
+        public Builder failureRoute() {
+            super.failureRoute();
+            return this;
+        }
+
+        @Override
+        public Builder displayOnNotFoundPage() {
+            super.displayOnNotFoundPage();
+            return this;
+        }
+
+        @Override
+        public Builder displayOnNotFoundPage(String notFoundPageTitle) {
+            super.displayOnNotFoundPage(notFoundPageTitle);
+            return this;
+        }
+
+        @Override
+        public Builder displayOnNotFoundPage(String notFoundPageTitle, String notFoundPagePath) {
+            super.displayOnNotFoundPage(notFoundPageTitle, notFoundPagePath);
+            return this;
+        }
+
+        @Override
+        public Builder routeConfigKey(String attributeName) {
+            super.routeConfigKey(attributeName);
+            return this;
+        }
+
+        @Override
+        public RouteBuildItem build() {
+            // If path is same as absolute, we don't enable legacy redirect
+            if (requiresLegacyRedirect && path.equals(super.absolutePath)) {
+                requiresLegacyRedirect = false;
+            }
+            return new RouteBuildItem(this, routeType, requiresLegacyRedirect);
+        }
+
+        @Override
+        protected ConfiguredPathInfo getRouteConfigInfo() {
+            return super.getRouteConfigInfo();
+        }
+
+        @Override
+        protected NotFoundPageDisplayableEndpointBuildItem getNotFoundEndpoint() {
+            return super.getNotFoundEndpoint();
+        }
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RouteBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RouteBuildItem.java
index 544e93d6db884..f3bf8101515bb 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RouteBuildItem.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RouteBuildItem.java
@@ -1,8 +1,11 @@
 package io.quarkus.vertx.http.deployment;
 
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.console.ConfiguredPathInfo;
 import io.quarkus.vertx.http.runtime.BasicRoute;
 import io.quarkus.vertx.http.runtime.HandlerType;
 import io.vertx.core.Handler;
@@ -12,42 +15,82 @@
 
 public final class RouteBuildItem extends MultiBuildItem {
 
+    public static Builder builder() {
+        return new Builder();
+    }
+
     private final Function<Router, Route> routeFunction;
     private final Handler<RoutingContext> handler;
     private final HandlerType type;
+    private final RouteType routeType;
+    private final boolean requiresLegacyRedirect;
+    private final NotFoundPageDisplayableEndpointBuildItem notFoundPageDisplayableEndpoint;
+    private final ConfiguredPathInfo devConsoleResolvedPathBuildItem;
 
+    /**
+     * @deprecated Use the Builder instead.
+     */
     @Deprecated
-    public RouteBuildItem(Function<Router, Route> routeFunction, Handler<RoutingContext> handler, HandlerType type,
-            boolean resume) {
+    public RouteBuildItem(Function<Router, Route> routeFunction, Handler<RoutingContext> handler, HandlerType type) {
         this.routeFunction = routeFunction;
         this.handler = handler;
         this.type = type;
+        this.routeType = RouteType.APPLICATION_ROUTE;
+        this.requiresLegacyRedirect = false;
+        this.notFoundPageDisplayableEndpoint = null;
+        this.devConsoleResolvedPathBuildItem = null;
     }
 
-    public RouteBuildItem(Function<Router, Route> routeFunction, Handler<RoutingContext> handler, HandlerType type) {
-        this(routeFunction, handler, type, true);
-    }
-
+    /**
+     * @deprecated Use the Builder instead.
+     */
+    @Deprecated
     public RouteBuildItem(Function<Router, Route> routeFunction, Handler<RoutingContext> handler) {
         this(routeFunction, handler, HandlerType.NORMAL);
     }
 
+    /**
+     * @deprecated Use the Builder instead.
+     */
+    @Deprecated
     public RouteBuildItem(String route, Handler<RoutingContext> handler, HandlerType type, boolean resume) {
-        this(new BasicRoute(route), handler, type, resume);
+        this(new BasicRoute(route), handler, type);
     }
 
+    /**
+     * @deprecated Use the Builder instead.
+     */
+    @Deprecated
     public RouteBuildItem(String route, Handler<RoutingContext> handler, HandlerType type) {
         this(new BasicRoute(route), handler, type);
     }
 
+    /**
+     * @deprecated Use the Builder instead.
+     */
+    @Deprecated
     public RouteBuildItem(String route, Handler<RoutingContext> handler, boolean resume) {
-        this(new BasicRoute(route), handler, HandlerType.NORMAL, resume);
+        this(new BasicRoute(route), handler, HandlerType.NORMAL);
     }
 
+    /**
+     * @deprecated Use the Builder instead.
+     */
+    @Deprecated
     public RouteBuildItem(String route, Handler<RoutingContext> handler) {
         this(new BasicRoute(route), handler);
     }
 
+    RouteBuildItem(Builder builder, RouteType routeType, boolean requiresLegacyRedirect) {
+        this.routeFunction = builder.routeFunction;
+        this.handler = builder.handler;
+        this.type = builder.type;
+        this.routeType = routeType;
+        this.requiresLegacyRedirect = requiresLegacyRedirect;
+        this.notFoundPageDisplayableEndpoint = builder.getNotFoundEndpoint();
+        this.devConsoleResolvedPathBuildItem = builder.getRouteConfigInfo();
+    }
+
     public Handler<RoutingContext> getHandler() {
         return handler;
     }
@@ -59,4 +102,177 @@ public HandlerType getType() {
     public Function<Router, Route> getRouteFunction() {
         return routeFunction;
     }
+
+    public boolean isFrameworkRoute() {
+        return routeType.equals(RouteType.FRAMEWORK_ROUTE);
+    }
+
+    public boolean isApplicationRoute() {
+        return routeType.equals(RouteType.APPLICATION_ROUTE);
+    }
+
+    public boolean isAbsoluteRoute() {
+        return routeType.equals(RouteType.ABSOLUTE_ROUTE);
+    }
+
+    public boolean isRequiresLegacyRedirect() {
+        return requiresLegacyRedirect;
+    }
+
+    public NotFoundPageDisplayableEndpointBuildItem getNotFoundPageDisplayableEndpoint() {
+        return notFoundPageDisplayableEndpoint;
+    }
+
+    public ConfiguredPathInfo getDevConsoleResolvedPath() {
+        return devConsoleResolvedPathBuildItem;
+    }
+
+    public enum RouteType {
+        FRAMEWORK_ROUTE,
+        APPLICATION_ROUTE,
+        ABSOLUTE_ROUTE
+    }
+
+    /**
+     * HttpRootPathBuildItem.Builder and NonApplicationRootPathBuildItem.Builder extend this.
+     * Please verify the extended builders behavior when changing this one.
+     */
+    public static class Builder {
+        protected Function<Router, Route> routeFunction;
+        protected Handler<RoutingContext> handler;
+        protected HandlerType type = HandlerType.NORMAL;
+        protected boolean displayOnNotFoundPage;
+        protected String notFoundPageTitle;
+        protected String notFoundPagePath;
+        protected String routePath;
+        protected String routeConfigKey;
+        protected String absolutePath;
+
+        /**
+         * Use HttpRootPathBuildItem and NonApplicationRootPathBuildItem to
+         * ensure paths are constructed/normalized correctly
+         *
+         * @deprecated
+         * @see HttpRootPathBuildItem#routeBuilder()
+         * @see NonApplicationRootPathBuildItem#routeBuilder()
+         */
+        @Deprecated
+        public Builder() {
+        }
+
+        /**
+         * {@link #routeFunction(String, Consumer)} should be used instead
+         *
+         * @param routeFunction
+         * @see #routeFunction(String, Consumer)
+         */
+        @Deprecated
+        public Builder routeFunction(Function<Router, Route> routeFunction) {
+            this.routeFunction = routeFunction;
+            return this;
+        }
+
+        /**
+         * @param path A normalized path (e.g. use HttpRootPathBuildItem to construct/resolve the path value) defining
+         *        the route. This path this is also used on the "Not Found" page in dev mode.
+         * @param routeFunction a Consumer of Route
+         */
+        public Builder routeFunction(String path, Consumer<Route> routeFunction) {
+            this.routeFunction = new BasicRoute(path, null, routeFunction);
+            this.notFoundPagePath = this.routePath = path;
+            return this;
+        }
+
+        /**
+         * @param route A normalized path used to define a basic route
+         *        (e.g. use HttpRootPathBuildItem to construct/resolve the path value). This path this is also
+         *        used on the "Not Found" page in dev mode.
+         */
+        public Builder route(String route) {
+            this.routeFunction = new BasicRoute(route);
+            this.notFoundPagePath = this.routePath = route;
+            return this;
+        }
+
+        public Builder handler(Handler<RoutingContext> handler) {
+            this.handler = handler;
+            return this;
+        }
+
+        public Builder handlerType(HandlerType handlerType) {
+            this.type = handlerType;
+            return this;
+        }
+
+        public Builder blockingRoute() {
+            this.type = HandlerType.BLOCKING;
+            return this;
+        }
+
+        public Builder failureRoute() {
+            this.type = HandlerType.FAILURE;
+            return this;
+        }
+
+        public Builder displayOnNotFoundPage() {
+            this.displayOnNotFoundPage = true;
+            return this;
+        }
+
+        public Builder displayOnNotFoundPage(String notFoundPageTitle) {
+            this.displayOnNotFoundPage = true;
+            this.notFoundPageTitle = notFoundPageTitle;
+            return this;
+        }
+
+        /**
+         * @deprecated Specify the path as part of defining the route
+         * @see #route(String)
+         * @see #routeFunction(String, Consumer)
+         */
+        @Deprecated
+        public Builder displayOnNotFoundPage(String notFoundPageTitle, String notFoundPagePath) {
+            this.displayOnNotFoundPage = true;
+            this.notFoundPageTitle = notFoundPageTitle;
+            this.notFoundPagePath = notFoundPagePath;
+            return this;
+        }
+
+        public Builder routeConfigKey(String attributeName) {
+            this.routeConfigKey = attributeName;
+            return this;
+        }
+
+        public RouteBuildItem build() {
+            return new RouteBuildItem(this, RouteType.APPLICATION_ROUTE, false);
+        }
+
+        protected ConfiguredPathInfo getRouteConfigInfo() {
+            if (routeConfigKey == null) {
+                return null;
+            }
+            if (routePath == null) {
+                throw new RuntimeException("Cannot discover value of " + routeConfigKey
+                        + " as no explicit path was specified and a route function is in use");
+            }
+            if (absolutePath != null) {
+                return new ConfiguredPathInfo(routeConfigKey, absolutePath, true);
+            }
+            return new ConfiguredPathInfo(routeConfigKey, routePath, false);
+        }
+
+        protected NotFoundPageDisplayableEndpointBuildItem getNotFoundEndpoint() {
+            if (!displayOnNotFoundPage) {
+                return null;
+            }
+            if (notFoundPagePath == null) {
+                throw new RuntimeException("Cannot display " + routeFunction
+                        + " on not found page as no explicit path was specified and a route function is in use");
+            }
+            if (absolutePath != null) {
+                return new NotFoundPageDisplayableEndpointBuildItem(absolutePath, notFoundPageTitle, true);
+            }
+            return new NotFoundPageDisplayableEndpointBuildItem(notFoundPagePath, notFoundPageTitle, false);
+        }
+    }
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/StaticResourcesProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/StaticResourcesProcessor.java
index 609e0b659698d..4560c6c721949 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/StaticResourcesProcessor.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/StaticResourcesProcessor.java
@@ -107,9 +107,19 @@ private void collectKnownPaths(Path resource, Set<String> knownPaths) {
                 @Override
                 public FileVisitResult visitFile(Path p, BasicFileAttributes attrs)
                         throws IOException {
+                    String simpleName = p.getFileName().toString();
                     String file = resource.relativize(p).toString();
-                    if (file.equals("index.html") || file.equals("index.htm")) {
-                        knownPaths.add("/");
+                    if (simpleName.equals("index.html") || simpleName.equals("index.htm")) {
+                        Path parent = resource.relativize(p).getParent();
+                        if (parent == null) {
+                            knownPaths.add("/");
+                        } else {
+                            String parentString = parent.toString();
+                            if (!parentString.startsWith("/")) {
+                                parentString = "/" + parentString;
+                            }
+                            knownPaths.add(parentString + "/");
+                        }
                     }
                     if (!file.startsWith("/")) {
                         file = "/" + file;
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
index 818bc05666dda..347fa4fc38dca 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
@@ -1,14 +1,18 @@
 package io.quarkus.vertx.http.deployment;
 
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.CodeSource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -25,6 +29,8 @@
 import io.quarkus.deployment.builditem.ApplicationStartBuildItem;
 import io.quarkus.deployment.builditem.ExecutorBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.LogCategoryBuildItem;
+import io.quarkus.deployment.builditem.RunTimeConfigurationSourceBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.builditem.ShutdownListenerBuildItem;
@@ -41,9 +47,11 @@
 import io.quarkus.vertx.core.deployment.CoreVertxBuildItem;
 import io.quarkus.vertx.core.deployment.EventLoopCountBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.HttpRemoteDevClientProvider;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
+import io.quarkus.vertx.http.runtime.HttpHostConfigSource;
 import io.quarkus.vertx.http.runtime.RouterProducer;
 import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
 import io.quarkus.vertx.http.runtime.attribute.ExchangeAttributeBuilder;
@@ -51,6 +59,7 @@
 import io.quarkus.vertx.http.runtime.filters.Filter;
 import io.quarkus.vertx.http.runtime.filters.GracefulShutdownFilter;
 import io.vertx.core.Handler;
+import io.vertx.core.http.impl.HttpServerRequestImpl;
 import io.vertx.core.impl.VertxImpl;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
@@ -59,11 +68,23 @@ class VertxHttpProcessor {
 
     private static final Logger logger = Logger.getLogger(VertxHttpProcessor.class);
 
+    @BuildStep
+    LogCategoryBuildItem logging() {
+        //this log is only used to log an error about an incorrect URI, which results in a 400 response
+        //we don't want to log this
+        return new LogCategoryBuildItem(HttpServerRequestImpl.class.getName(), Level.OFF);
+    }
+
     @BuildStep
     HttpRootPathBuildItem httpRoot(HttpBuildTimeConfig httpBuildTimeConfig) {
         return new HttpRootPathBuildItem(httpBuildTimeConfig.rootPath);
     }
 
+    @BuildStep
+    NonApplicationRootPathBuildItem frameworkRoot(HttpBuildTimeConfig httpBuildTimeConfig) {
+        return new NonApplicationRootPathBuildItem(httpBuildTimeConfig.rootPath, httpBuildTimeConfig.nonApplicationRootPath);
+    }
+
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     FilterBuildItem cors(CORSRecorder recorder, HttpConfiguration configuration) {
@@ -98,19 +119,72 @@ public KubernetesPortBuildItem kubernetes() {
         return new KubernetesPortBuildItem(port, "http");
     }
 
+    @BuildStep
+    void notFoundRoutes(
+            List<RouteBuildItem> routes,
+            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> notFound) {
+        for (RouteBuildItem i : routes) {
+            if (i.getNotFoundPageDisplayableEndpoint() != null) {
+                notFound.produce(i.getNotFoundPageDisplayableEndpoint());
+            }
+        }
+    }
+
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     VertxWebRouterBuildItem initializeRouter(VertxHttpRecorder recorder,
             CoreVertxBuildItem vertx,
             List<RouteBuildItem> routes,
+            HttpBuildTimeConfig httpBuildTimeConfig,
+            NonApplicationRootPathBuildItem nonApplicationRootPath,
             ShutdownContextBuildItem shutdown) {
 
-        RuntimeValue<Router> router = recorder.initializeRouter(vertx.getVertx());
+        RuntimeValue<Router> httpRouteRouter = recorder.initializeRouter(vertx.getVertx());
+        RuntimeValue<Router> frameworkRouter = null;
+        RuntimeValue<Router> mainRouter = null;
+
+        List<RouteBuildItem> redirectRoutes = new ArrayList<>();
+        boolean frameworkRouterCreated = false;
+        boolean mainRouterCreated = false;
+
         for (RouteBuildItem route : routes) {
-            recorder.addRoute(router, route.getRouteFunction(), route.getHandler(), route.getType());
+            if (nonApplicationRootPath.isDedicatedRouterRequired() && route.isFrameworkRoute()) {
+                // Non-application endpoints on a separate path
+                if (!frameworkRouterCreated) {
+                    frameworkRouter = recorder.initializeRouter(vertx.getVertx());
+                    frameworkRouterCreated = true;
+                }
+
+                recorder.addRoute(frameworkRouter, route.getRouteFunction(), route.getHandler(), route.getType());
+
+                if (httpBuildTimeConfig.redirectToNonApplicationRootPath && route.isRequiresLegacyRedirect()) {
+                    redirectRoutes.add(route);
+                }
+            } else if (route.isAbsoluteRoute()) {
+                // Add Route to "/"
+                if (!mainRouterCreated) {
+                    mainRouter = recorder.initializeRouter(vertx.getVertx());
+                    mainRouterCreated = true;
+                }
+                recorder.addRoute(mainRouter, route.getRouteFunction(), route.getHandler(), route.getType());
+            } else {
+                // Add Route to "/${quarkus.http.root-path}/
+                recorder.addRoute(httpRouteRouter, route.getRouteFunction(), route.getHandler(), route.getType());
+            }
+        }
+
+        if (frameworkRouterCreated) {
+            if (redirectRoutes.size() > 0) {
+                recorder.setNonApplicationRedirectHandler(nonApplicationRootPath.getNonApplicationRootPath(),
+                        nonApplicationRootPath.getNormalizedHttpRootPath());
+
+                redirectRoutes.forEach(route -> recorder.addRoute(httpRouteRouter, route.getRouteFunction(),
+                        recorder.getNonApplicationRedirectHandler(),
+                        route.getType()));
+            }
         }
 
-        return new VertxWebRouterBuildItem(router);
+        return new VertxWebRouterBuildItem(httpRouteRouter, mainRouter, frameworkRouter);
     }
 
     @BuildStep
@@ -125,7 +199,8 @@ ServiceStartBuildItem finalizeRouter(
             VertxHttpRecorder recorder, BeanContainerBuildItem beanContainer, CoreVertxBuildItem vertx,
             LaunchModeBuildItem launchMode,
             List<DefaultRouteBuildItem> defaultRoutes, List<FilterBuildItem> filters,
-            VertxWebRouterBuildItem router,
+            VertxWebRouterBuildItem httpRouteRouter,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
             HttpBuildTimeConfig httpBuildTimeConfig, HttpConfiguration httpConfiguration,
             List<RequireBodyHandlerBuildItem> requireBodyHandlerBuildItems,
             BodyHandlerBuildItem bodyHandlerBuildItem,
@@ -160,9 +235,30 @@ ServiceStartBuildItem finalizeRouter(
         Handler<RoutingContext> bodyHandler = !requireBodyHandlerBuildItems.isEmpty() ? bodyHandlerBuildItem.getHandler()
                 : null;
 
+        Optional<RuntimeValue<Router>> mainRouter = httpRouteRouter.getMainRouter() != null
+                ? Optional.of(httpRouteRouter.getMainRouter())
+                : Optional.empty();
+
+        if (httpRouteRouter.getFrameworkRouter() != null) {
+            if (nonApplicationRootPathBuildItem.isAttachedToMainRouter()) {
+                // Mount nested framework router
+                recorder.mountFrameworkRouter(httpRouteRouter.getHttpRouter(),
+                        httpRouteRouter.getFrameworkRouter(),
+                        nonApplicationRootPathBuildItem.getVertxRouterPath());
+            } else {
+                // Create main router, not mounted under application router
+                if (!mainRouter.isPresent()) {
+                    mainRouter = Optional.of(recorder.initializeRouter(vertx.getVertx()));
+                }
+                // Mount independent framework router under new main router
+                recorder.mountFrameworkRouter(mainRouter.get(), httpRouteRouter.getFrameworkRouter(),
+                        nonApplicationRootPathBuildItem.getVertxRouterPath());
+            }
+        }
+
         recorder.finalizeRouter(beanContainer.getValue(),
                 defaultRoute.map(DefaultRouteBuildItem::getRoute).orElse(null),
-                listOfFilters, vertx.getVertx(), lrc, router.getRouter(), httpBuildTimeConfig.rootPath,
+                listOfFilters, vertx.getVertx(), lrc, mainRouter, httpRouteRouter.getHttpRouter(), httpBuildTimeConfig.rootPath,
                 launchMode.getLaunchMode(),
                 !requireBodyHandlerBuildItems.isEmpty(), bodyHandler, httpConfiguration, gracefulShutdownFilter,
                 shutdownConfig, executorBuildItem.getExecutorProxy());
@@ -170,6 +266,13 @@ ServiceStartBuildItem finalizeRouter(
         return new ServiceStartBuildItem("vertx-http");
     }
 
+    @BuildStep
+    void hostDefault(BuildProducer<RunTimeConfigurationSourceBuildItem> serviceProviderBuildItem) {
+        serviceProviderBuildItem
+                .produce(new RunTimeConfigurationSourceBuildItem(HttpHostConfigSource.class.getName(),
+                        OptionalInt.of(Integer.MIN_VALUE)));
+    }
+
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
     void openSocket(ApplicationStartBuildItem start,
@@ -217,7 +320,8 @@ void registerExchangeAttributeBuilders(final BuildProducer<ServiceProviderBuildI
             logger.debug("Skipping registration of service providers for " + ExchangeAttributeBuilder.class);
             return;
         }
-        try (final FileSystem jarFileSystem = ZipUtils.newFileSystem(codeSource.getLocation().toURI(),
+        try (final FileSystem jarFileSystem = ZipUtils.newFileSystem(
+                new URI("jar", codeSource.getLocation().toURI().toString(), null),
                 Collections.emptyMap())) {
             final Path serviceDescriptorFilePath = jarFileSystem.getPath("META-INF", "services",
                     "io.quarkus.vertx.http.runtime.attribute.ExchangeAttributeBuilder");
@@ -236,4 +340,5 @@ void registerExchangeAttributeBuilders(final BuildProducer<ServiceProviderBuildI
             throw new BuildException(e, Collections.emptyList());
         }
     }
+
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxWebRouterBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxWebRouterBuildItem.java
index b8f559340854a..dea1d1cec4060 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxWebRouterBuildItem.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxWebRouterBuildItem.java
@@ -6,13 +6,45 @@
 
 public final class VertxWebRouterBuildItem extends SimpleBuildItem {
 
-    private RuntimeValue<Router> router;
+    private RuntimeValue<Router> httpRouter;
+    private RuntimeValue<Router> mainRouter;
+    private RuntimeValue<Router> frameworkRouter;
 
-    VertxWebRouterBuildItem(RuntimeValue<Router> router) {
-        this.router = router;
+    VertxWebRouterBuildItem(RuntimeValue<Router> httpRouter, RuntimeValue<Router> mainRouter,
+            RuntimeValue<Router> frameworkRouter) {
+        this.httpRouter = httpRouter;
+        this.mainRouter = mainRouter;
+        this.frameworkRouter = frameworkRouter;
     }
 
+    /**
+     * @deprected Use {@link #getHttpRouter()}
+     */
+    @Deprecated
     public RuntimeValue<Router> getRouter() {
-        return router;
+        return getHttpRouter();
+    }
+
+    public RuntimeValue<Router> getHttpRouter() {
+        return httpRouter;
+    }
+
+    /**
+     * Will be {@code null} if `${quarkus.http.root-path}` is {@literal /}.
+     *
+     * @return RuntimeValue<Router>
+     */
+    RuntimeValue<Router> getMainRouter() {
+        return mainRouter;
+    }
+
+    /**
+     * Will be {@code null} if {@code ${quarkus.http.root-path}} is the same as
+     * {@code ${quarkus.http.non-application-root-path}}.
+     *
+     * @return RuntimeValue<Router>
+     */
+    RuntimeValue<Router> getFrameworkRouter() {
+        return frameworkRouter;
     }
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java
new file mode 100644
index 0000000000000..90a9a0df72eea
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java
@@ -0,0 +1,80 @@
+package io.quarkus.vertx.http.deployment.devmode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.arc.deployment.ArcConfig;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.runtime.devmode.ArcDevRecorder;
+
+public class ArcDevProcessor {
+
+    @Record(ExecutionTime.RUNTIME_INIT)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    void registerRoutes(ArcConfig arcConfig, ArcDevRecorder recorder,
+            BuildProducer<RouteBuildItem> routes,
+            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
+        String basePath = "arc";
+        String beansPath = basePath + "/beans";
+        String removedBeansPath = basePath + "/removed-beans";
+        String observersPath = basePath + "/observers";
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route(basePath)
+                .displayOnNotFoundPage("CDI Overview")
+                .handler(recorder.createSummaryHandler(getConfigProperties(arcConfig))).build());
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route(beansPath)
+                .displayOnNotFoundPage("Active CDI Beans")
+                .handler(recorder.createBeansHandler()).build());
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route(removedBeansPath)
+                .displayOnNotFoundPage("Removed CDI Beans")
+                .handler(recorder.createRemovedBeansHandler()).build());
+        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route(observersPath)
+                .displayOnNotFoundPage("Active CDI Observers")
+                .handler(recorder.createObserversHandler()).build());
+    }
+
+    // Note that we can't turn ArcConfig into BUILD_AND_RUN_TIME_FIXED because it's referencing IndexDependencyConfig
+    // And we can't split the config due to compatibility reasons 
+    private Map<String, String> getConfigProperties(ArcConfig arcConfig) {
+        Map<String, String> props = new HashMap<>();
+        props.put("quarkus.arc.remove-unused-beans", arcConfig.removeUnusedBeans);
+        props.put("quarkus.arc.unremovable-types", arcConfig.unremovableTypes.map(Object::toString).orElse(""));
+        props.put("quarkus.arc.detect-unused-false-positives", "" + arcConfig.detectUnusedFalsePositives);
+        props.put("quarkus.arc.transform-unproxyable-classes", "" + arcConfig.transformUnproxyableClasses);
+        props.put("quarkus.arc.auto-inject-fields", "" + arcConfig.autoInjectFields);
+        props.put("quarkus.arc.auto-producer-methods", "" + arcConfig.autoProducerMethods);
+        props.put("quarkus.arc.selected-alternatives", "" + arcConfig.selectedAlternatives.map(Object::toString).orElse(""));
+        props.put("quarkus.arc.exclude-types", "" + arcConfig.excludeTypes.map(Object::toString).orElse(""));
+        props.put("quarkus.arc.config-properties-default-naming-strategy",
+                "" + arcConfig.configPropertiesDefaultNamingStrategy.toString());
+        return props;
+    }
+
+    // NOTE: we can't add this build step to the ArC extension as it would cause a cyclic dependency
+    @BuildStep
+    @Record(value = ExecutionTime.STATIC_INIT, optional = true)
+    DevConsoleRouteBuildItem eventsEndpoint(ArcDevRecorder recorder) {
+        return new DevConsoleRouteBuildItem("io.quarkus", "quarkus-arc", "events", "POST",
+                recorder.events());
+    }
+
+    // NOTE: we can't add this build step to the ArC extension as it would cause a cyclic dependency
+    @BuildStep
+    @Record(value = ExecutionTime.STATIC_INIT, optional = true)
+    DevConsoleRouteBuildItem invocationsEndpoint(ArcDevRecorder recorder) {
+        return new DevConsoleRouteBuildItem("io.quarkus", "quarkus-arc", "invocations", "POST",
+                recorder.invocations());
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcEndpointProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcEndpointProcessor.java
deleted file mode 100644
index f084c4e4b5606..0000000000000
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcEndpointProcessor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.vertx.http.deployment.devmode;
-
-import io.quarkus.deployment.IsDevelopment;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
-import io.quarkus.vertx.http.runtime.devmode.ArcEndpointRecorder;
-
-public class ArcEndpointProcessor {
-
-    @Record(ExecutionTime.RUNTIME_INIT)
-    @BuildStep(onlyIf = IsDevelopment.class)
-    void registerRoutes(HttpBuildTimeConfig config, ArcEndpointRecorder recorder, BuildProducer<RouteBuildItem> routes,
-            BuildProducer<NotFoundPageDisplayableEndpointBuildItem> displayableEndpoints) {
-        String basePath = config.consolePath + "/arc";
-        String beansPath = basePath + "/beans";
-        String observersPath = basePath + "/observers";
-        routes.produce(new RouteBuildItem(beansPath, recorder.createBeansHandler()));
-        routes.produce(new RouteBuildItem(observersPath, recorder.createObserversHandler()));
-        displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(beansPath));
-        displayableEndpoints.produce(new NotFoundPageDisplayableEndpointBuildItem(observersPath));
-    }
-
-}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java
index b8ef26edd92d7..5053eeb97f4bb 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClient.java
@@ -10,6 +10,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -33,10 +34,12 @@ public class HttpRemoteDevClient implements RemoteDevClient {
 
     private final String url;
     private final String password;
+    private final long reconnectTimeoutMillis;
 
-    public HttpRemoteDevClient(String url, String password) {
+    public HttpRemoteDevClient(String url, String password, Duration reconnectTimeout) {
         this.url = url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
         this.password = password;
+        this.reconnectTimeoutMillis = reconnectTimeout.toMillis();
     }
 
     @Override
@@ -65,6 +68,7 @@ private class Session implements Closeable, Runnable {
         private final Thread httpThread;
         private final String url;
         private final URL devUrl;
+        private final URL probeUrl;
         int errorCount;
 
         private Session(RemoteDevState initialState,
@@ -74,6 +78,7 @@ private Session(RemoteDevState initialState,
             this.initialConnectFunction = initialConnectFunction;
             this.changeRequestFunction = changeRequestFunction;
             devUrl = new URL(HttpRemoteDevClient.this.url + RemoteSyncHandler.DEV);
+            probeUrl = new URL(HttpRemoteDevClient.this.url + RemoteSyncHandler.PROBE);
             url = HttpRemoteDevClient.this.url;
             httpThread = new Thread(this, "Remote dev client thread");
             httpThread.start();
@@ -122,6 +127,10 @@ private String doConnect(RemoteDevState initialState, Function<Set<String>, Map<
             connection.getOutputStream().write(initialData);
             connection.getOutputStream().close();
             String session = connection.getHeaderField(RemoteSyncHandler.QUARKUS_SESSION);
+            String error = connection.getHeaderField(RemoteSyncHandler.QUARKUS_ERROR);
+            if (error != null) {
+                throw new IOException("Server did not start a remote dev session: " + error);
+            }
             if (session == null) {
                 throw new IOException("Server did not start a remote dev session");
             }
@@ -240,15 +249,17 @@ public void run() {
         private String waitForRestart(RemoteDevState initialState,
                 Function<Set<String>, Map<String, byte[]>> initialConnectFunction) {
 
-            long timeout = System.currentTimeMillis() + 30000;
+            long timeout = System.currentTimeMillis() + reconnectTimeoutMillis;
             try {
-                Thread.sleep(1000);
+                Thread.sleep(500);
             } catch (InterruptedException e) {
 
             }
             while (System.currentTimeMillis() < timeout) {
                 try {
-                    HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+                    HttpURLConnection connection = (HttpURLConnection) probeUrl.openConnection();
+                    connection.setRequestMethod("POST");
+                    connection.addRequestProperty(HttpHeaders.CONTENT_TYPE.toString(), RemoteSyncHandler.APPLICATION_QUARKUS);
                     IoUtil.readBytes(connection.getInputStream());
                     return doConnect(initialState, initialConnectFunction);
                 } catch (IOException e) {
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClientProvider.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClientProvider.java
index c0c1976a7e975..7aab647be5f86 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClientProvider.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/HttpRemoteDevClientProvider.java
@@ -28,9 +28,10 @@ public Optional<RemoteDevClient> getClient() {
             return Optional.empty();
         }
         if (!liveReloadConfig.password.isPresent()) {
-            log.warn(
+            throw new RuntimeException(
                     "Live reload URL set but no password, remote dev requires a password, set quarkus.live-reload.password on both server and client");
         }
-        return Optional.of(new HttpRemoteDevClient(liveReloadConfig.url.get(), liveReloadConfig.password.get()));
+        return Optional.of(new HttpRemoteDevClient(liveReloadConfig.url.get(), liveReloadConfig.password.get(),
+                liveReloadConfig.connectTimeout));
     }
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/NotFoundPageDisplayableEndpointBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/NotFoundPageDisplayableEndpointBuildItem.java
index d97756c578cb7..638db01bcf52a 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/NotFoundPageDisplayableEndpointBuildItem.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/NotFoundPageDisplayableEndpointBuildItem.java
@@ -1,15 +1,45 @@
 package io.quarkus.vertx.http.deployment.devmode;
 
 import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.runtime.TemplateHtmlBuilder;
+import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
 
 final public class NotFoundPageDisplayableEndpointBuildItem extends MultiBuildItem {
     private final String endpoint;
+    private final String description;
+    private final boolean absolutePath;
 
-    public NotFoundPageDisplayableEndpointBuildItem(String endpoint) {
+    public NotFoundPageDisplayableEndpointBuildItem(String endpoint, String description) {
+        this(endpoint, description, false);
+    }
+
+    public NotFoundPageDisplayableEndpointBuildItem(String endpoint, String description, boolean isAbsolutePath) {
         this.endpoint = endpoint;
+        this.description = description;
+        this.absolutePath = isAbsolutePath;
+    }
+
+    public NotFoundPageDisplayableEndpointBuildItem(String endpoint) {
+        this(endpoint, null);
     }
 
     public String getEndpoint() {
         return endpoint;
     }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public boolean isAbsolutePath() {
+        return absolutePath;
+    }
+
+    public String getEndpoint(HttpRootPathBuildItem httpRoot) {
+        if (absolutePath) {
+            return endpoint;
+        } else {
+            return TemplateHtmlBuilder.adjustRoot(httpRoot.getRootPath(), endpoint);
+        }
+    }
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/RouteDescriptionBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/RouteDescriptionBuildItem.java
new file mode 100644
index 0000000000000..6af91cc5138ae
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/RouteDescriptionBuildItem.java
@@ -0,0 +1,27 @@
+package io.quarkus.vertx.http.deployment.devmode;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
+
+public final class RouteDescriptionBuildItem extends MultiBuildItem {
+
+    private RouteDescription description;
+
+    public RouteDescriptionBuildItem(String javaMethod, String path, String httpMethod, String[] produces, String[] consumes) {
+        RouteDescription description = new RouteDescription();
+        description.setJavaMethod(javaMethod);
+        description.setPath(path);
+        description.setHttpMethod(httpMethod);
+        description.setProduces(produces.length == 0 ? null : Arrays.stream(produces).collect(Collectors.joining(", ")));
+        description.setConsumes(consumes.length == 0 ? null : Arrays.stream(consumes).collect(Collectors.joining(", ")));
+        this.description = description;
+    }
+
+    public RouteDescription getDescription() {
+        return description;
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java
new file mode 100644
index 0000000000000..d4083f30145a7
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java
@@ -0,0 +1,96 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;
+
+import java.io.BufferedWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import io.quarkus.arc.runtime.ConfigRecorder;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ConfigDescriptionBuildItem;
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.vertx.http.runtime.devmode.ConfigDescription;
+import io.quarkus.vertx.http.runtime.devmode.ConfigDescriptionsSupplier;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+public class ConfigEditorProcessor {
+    @BuildStep(onlyIf = IsDevelopment.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public DevConsoleRuntimeTemplateInfoBuildItem config(ConfigRecorder recorder,
+            List<ConfigDescriptionBuildItem> configDescriptionBuildItems) {
+        List<ConfigDescription> configDescriptions = new ArrayList<>();
+        for (ConfigDescriptionBuildItem item : configDescriptionBuildItems) {
+            configDescriptions.add(
+                    new ConfigDescription(item.getPropertyName(), item.getDocs(), item.getDefaultValue()));
+        }
+        return new DevConsoleRuntimeTemplateInfoBuildItem("config", new ConfigDescriptionsSupplier(configDescriptions));
+    }
+
+    @BuildStep
+    DevConsoleRouteBuildItem handlePost() {
+        return new DevConsoleRouteBuildItem("config", "POST", new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form) throws Exception {
+                String name = event.request().getFormAttribute("name");
+                String value = event.request().getFormAttribute("value");
+
+                List<Path> resourcesDir = DevConsoleManager.getHotReplacementContext().getResourcesDir();
+                if (resourcesDir.isEmpty()) {
+                    throw new IllegalStateException("Unable to manage configurations - no resource directory found");
+                }
+
+                // In the current project only
+                Path path = resourcesDir.get(0);
+                Path configPath = path.resolve("application.properties");
+                if (!Files.exists(configPath)) {
+                    configPath = Files.createFile(path.resolve("application.properties"));
+                }
+
+                String profile = ProfileManager.getActiveProfile();
+                name = !profile.equals(DEVELOPMENT.getDefaultProfile()) ? "%" + profile + "." + name : name;
+                List<String> lines = Files.readAllLines(configPath);
+                int nameLine = -1;
+                for (int i = 0, linesSize = lines.size(); i < linesSize; i++) {
+                    final String line = lines.get(i);
+                    if (line.startsWith(name + "=")) {
+                        nameLine = i;
+                        break;
+                    }
+                }
+
+                if (nameLine != -1) {
+                    if (value.isEmpty()) {
+                        lines.remove(nameLine);
+                    } else {
+                        lines.set(nameLine, name + "=" + value);
+                    }
+                } else {
+                    if (!value.isEmpty()) {
+                        lines.add(name + "=" + value);
+                    }
+                }
+
+                try (BufferedWriter writer = Files.newBufferedWriter(configPath)) {
+                    for (String i : lines) {
+                        writer.write(i);
+                        writer.newLine();
+                    }
+                }
+
+                DevConsoleManager.getHotReplacementContext().doScan(true);
+                flashMessage(event, "Configuration updated");
+            }
+        });
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfiguredPathInfo.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfiguredPathInfo.java
new file mode 100644
index 0000000000000..a522178d15ab9
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfiguredPathInfo.java
@@ -0,0 +1,37 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import io.quarkus.runtime.TemplateHtmlBuilder;
+import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+
+public class ConfiguredPathInfo {
+    private final String name;
+    private final String endpointPath;
+    private final boolean absolutePath;
+
+    public ConfiguredPathInfo(String name, String endpointPath, boolean isAbsolutePath) {
+        this.name = name;
+        this.endpointPath = endpointPath;
+        this.absolutePath = isAbsolutePath;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEndpointPath(HttpRootPathBuildItem httpRoot) {
+        if (absolutePath) {
+            return endpointPath;
+        } else {
+            return TemplateHtmlBuilder.adjustRoot(httpRoot.getRootPath(), endpointPath);
+        }
+    }
+
+    public String getEndpointPath(NonApplicationRootPathBuildItem nonAppRoot) {
+        if (absolutePath) {
+            return endpointPath;
+        } else {
+            return TemplateHtmlBuilder.adjustRoot(nonAppRoot.getNormalizedHttpRootPath(), endpointPath);
+        }
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java
new file mode 100644
index 0000000000000..c5f28a37aab0e
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java
@@ -0,0 +1,174 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.function.BiFunction;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.yaml.snakeyaml.Yaml;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.quarkus.builder.Version;
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil;
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateInstance;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * This is a Handler running in the Dev Vert.x instance (which is loaded by the Augmentation ClassLoader)
+ * and has access to build time stuff
+ */
+public class DevConsole implements Handler<RoutingContext> {
+
+    static final ThreadLocal<String> currentExtension = new ThreadLocal<>();
+    private static final Comparator<Map<String, Object>> EXTENSION_COMPARATOR = Comparator
+            .comparing(m -> ((String) m.get("name")));
+
+    final Engine engine;
+    final Map<String, Map<String, Object>> extensions = new HashMap<>();
+
+    final Map<String, Object> globalData = new HashMap<>();
+
+    final Config config = ConfigProvider.getConfig();
+
+    DevConsole(Engine engine, String httpRootPath, String frameworkRootPath) {
+        this.engine = engine;
+        // Both of these paths will end in slash
+        this.globalData.put("httpRootPath", httpRootPath);
+        this.globalData.put("frameworkRootPath", frameworkRootPath);
+
+        // This includes the dev segment, but does not include a trailing slash (for append)
+        this.globalData.put("devRootAppend", frameworkRootPath + "dev");
+
+        this.globalData.put("quarkusVersion", Version.getVersion());
+        this.globalData.put("applicationName", config.getOptionalValue("quarkus.application.name", String.class).orElse(""));
+        this.globalData.put("applicationVersion",
+                config.getOptionalValue("quarkus.application.version", String.class).orElse(""));
+
+        try {
+            Enumeration<URL> extensionDescriptors = getClass().getClassLoader()
+                    .getResources("/META-INF/quarkus-extension.yaml");
+            Yaml yaml = new Yaml();
+            while (extensionDescriptors.hasMoreElements()) {
+                URL extensionDescriptor = extensionDescriptors.nextElement();
+                String desc = readURL(extensionDescriptor);
+                Map<String, Object> loaded = yaml.load(desc);
+                String artifactId = (String) loaded.get("artifact-id");
+                String groupId = (String) loaded.get("group-id");
+                String namespace = groupId + "." + artifactId;
+                extensions.put(namespace, loaded);
+            }
+        } catch (IOException x) {
+            throw new RuntimeException(x);
+        }
+    }
+
+    @Override
+    public void handle(RoutingContext ctx) {
+        String path = ctx.normalisedPath().substring(ctx.mountPoint().length());
+        if (path.isEmpty() || path.equals("/")) {
+            sendMainPage(ctx);
+        } else {
+            int nsIndex = path.indexOf("/");
+            if (nsIndex == -1) {
+                ctx.response().setStatusCode(404).end();
+                return;
+            }
+            String namespace = path.substring(0, nsIndex);
+            currentExtension.set(namespace);
+            Template devTemplate = engine.getTemplate(path);
+            if (devTemplate != null) {
+                String extName = getExtensionName(namespace);
+                ctx.response().setStatusCode(200).headers().set(HttpHeaderNames.CONTENT_TYPE, "text/html; charset=UTF-8");
+                TemplateInstance devTemplateInstance = devTemplate
+                        .data("currentExtensionName", extName)
+                        .data("flash", FlashScopeUtil.getFlash(ctx))
+                        .data("currentRequest", ctx.request());
+                renderTemplate(ctx, devTemplateInstance);
+            } else {
+                ctx.next();
+            }
+        }
+    }
+
+    private String getExtensionName(String namespace) {
+        Map<String, Object> map = extensions.get(namespace);
+        if (map == null)
+            return null;
+        return (String) map.get("name");
+    }
+
+    protected void renderTemplate(RoutingContext event, TemplateInstance template) {
+        // Add some global variables
+        for (Map.Entry<String, Object> global : globalData.entrySet()) {
+            template.data(global.getKey(), global.getValue());
+        }
+
+        template.renderAsync().handle(new BiFunction<String, Throwable, Object>() {
+            @Override
+            public Object apply(String s, Throwable throwable) {
+                if (throwable != null) {
+                    event.fail(throwable);
+                } else {
+                    event.response().end(s);
+                }
+                return null;
+            }
+        });
+    }
+
+    public void sendMainPage(RoutingContext event) {
+        Template devTemplate = engine.getTemplate("index");
+        List<Map<String, Object>> actionableExtensions = new ArrayList<>();
+        List<Map<String, Object>> nonActionableExtensions = new ArrayList<>();
+        for (Map<String, Object> loaded : this.extensions.values()) {
+            @SuppressWarnings("unchecked")
+            Map<String, Object> metadata = (Map<String, Object>) loaded.get("metadata");
+            String artifactId = (String) loaded.get("artifact-id");
+            String groupId = (String) loaded.get("group-id");
+            currentExtension.set(groupId + "." + artifactId); // needed because the template of the extension is going to be read
+            Template simpleTemplate = engine.getTemplate(groupId + "." + artifactId + "/embedded.html");
+            boolean hasConsoleEntry = simpleTemplate != null;
+            boolean hasGuide = metadata.containsKey("guide");
+            loaded.put("hasConsoleEntry", hasConsoleEntry);
+            loaded.put("hasGuide", hasGuide);
+            if (hasConsoleEntry || hasGuide) {
+                if (hasConsoleEntry) {
+                    Map<String, Object> data = new HashMap<>();
+                    data.putAll(globalData);
+                    data.put("urlbase", groupId + "." + artifactId);
+                    String result = simpleTemplate.render(data);
+                    loaded.put("_dev", result);
+                    actionableExtensions.add(loaded);
+                } else {
+                    nonActionableExtensions.add(loaded);
+                }
+            }
+        }
+        actionableExtensions.sort(EXTENSION_COMPARATOR);
+        nonActionableExtensions.sort(EXTENSION_COMPARATOR);
+        TemplateInstance instance = devTemplate.data("actionableExtensions", actionableExtensions)
+                .data("nonActionableExtensions", nonActionableExtensions).data("flash", FlashScopeUtil.getFlash(event));
+        renderTemplate(event, instance);
+    }
+
+    private static String readURL(URL url) throws IOException {
+        try (Scanner scanner = new Scanner(url.openStream(),
+                StandardCharsets.UTF_8.toString())) {
+            scanner.useDelimiter("\\A");
+            return scanner.hasNext() ? scanner.next() : null;
+        }
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleHttpHandler.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleHttpHandler.java
new file mode 100644
index 0000000000000..3a494421af5f2
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleHttpHandler.java
@@ -0,0 +1,159 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+import org.jboss.logging.Logger;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.FileRegion;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DefaultLastHttpContent;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.ReferenceCountUtil;
+import io.quarkus.dev.console.DevConsoleRequest;
+import io.quarkus.dev.console.DevConsoleResponse;
+import io.quarkus.netty.runtime.virtual.VirtualAddress;
+import io.quarkus.netty.runtime.virtual.VirtualClientConnection;
+import io.quarkus.netty.runtime.virtual.VirtualResponseHandler;
+import io.quarkus.vertx.http.runtime.QuarkusHttpHeaders;
+
+/**
+ * The idea here is to dispatch the DevConsoleRequest into the Netty event loop that powers the Dev Vert.x instance.
+ *
+ * Although this is loaded by the Augmentation ClassLoader at build time,
+ * it however works because all of the classes part its signature are loaded by the System ClassLoader
+ * which is the same for build steps and runtime code (DevConsoleRequest is a part of the devmode-spi which
+ * is a parent first dependency thus also loaded by the System ClassLoader).
+ */
+@SuppressWarnings("unused")
+public class DevConsoleHttpHandler implements Consumer<DevConsoleRequest> {
+    private static final Logger log = Logger.getLogger(DevConsoleHttpHandler.class);
+    public static VirtualAddress QUARKUS_DEV_CONSOLE = new VirtualAddress("quarkus-dev-console");
+
+    private static final int BUFFER_SIZE = 8096;
+
+    @Override
+    public void accept(DevConsoleRequest request) {
+        try {
+            nettyDispatch(request);
+        } catch (Exception e) {
+            request.getResponse().completeExceptionally(e);
+        }
+
+    }
+
+    private class NettyResponseHandler implements VirtualResponseHandler {
+        ByteArrayOutputStream baos;
+        WritableByteChannel byteChannel;
+        final DevConsoleRequest request;
+        final DevConsoleResponse responseBuilder = new DevConsoleResponse();
+
+        public NettyResponseHandler(DevConsoleRequest request) {
+            this.request = request;
+        }
+
+        public CompletableFuture<DevConsoleResponse> getFuture() {
+            return request.getResponse();
+        }
+
+        @Override
+        public void handleMessage(Object msg) {
+            try {
+                //log.info("Got message: " + msg.getClass().getName());
+
+                if (msg instanceof HttpResponse) {
+                    HttpResponse res = (HttpResponse) msg;
+                    responseBuilder.setStatus(res.status().code());
+
+                    for (String name : res.headers().names()) {
+                        responseBuilder.getHeaders().put(name, res.headers().getAll(name));
+                    }
+                }
+                if (msg instanceof HttpContent) {
+                    HttpContent content = (HttpContent) msg;
+                    int readable = content.content().readableBytes();
+                    if (baos == null && readable > 0) {
+                        baos = createByteStream();
+                    }
+                    for (int i = 0; i < readable; i++) {
+                        baos.write(content.content().readByte());
+                    }
+                }
+                if (msg instanceof FileRegion) {
+                    FileRegion file = (FileRegion) msg;
+                    if (file.count() > 0 && file.transferred() < file.count()) {
+                        if (baos == null)
+                            baos = createByteStream();
+                        if (byteChannel == null)
+                            byteChannel = Channels.newChannel(baos);
+                        file.transferTo(byteChannel, file.transferred());
+                    }
+                }
+                if (msg instanceof LastHttpContent) {
+                    if (baos != null) {
+                        responseBuilder.setBody(baos.toByteArray());
+                    }
+                    getFuture().complete(responseBuilder);
+                }
+            } catch (Throwable ex) {
+                getFuture().completeExceptionally(ex);
+            } finally {
+                if (msg != null) {
+                    ReferenceCountUtil.release(msg);
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+            if (!getFuture().isDone()) {
+                getFuture().completeExceptionally(new RuntimeException("Connection closed"));
+            }
+        }
+    }
+
+    private void nettyDispatch(DevConsoleRequest request)
+            throws Exception {
+        String uri = request.getUri();
+        QuarkusHttpHeaders quarkusHeaders = new QuarkusHttpHeaders();
+        DefaultHttpRequest nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1,
+                HttpMethod.valueOf(request.getMethod()), uri, quarkusHeaders);
+        for (Map.Entry<String, List<String>> i : request.getHeaders().entrySet()) {
+            nettyRequest.headers().add(i.getKey(), i.getValue());
+        }
+        if (!nettyRequest.headers().contains(HttpHeaderNames.HOST)) {
+            nettyRequest.headers().add(HttpHeaderNames.HOST, "localhost");
+        }
+
+        HttpContent requestContent = LastHttpContent.EMPTY_LAST_CONTENT;
+        if (request.getBody() != null) {
+            ByteBuf body = Unpooled.wrappedBuffer(request.getBody());
+            requestContent = new DefaultLastHttpContent(body);
+        }
+        NettyResponseHandler handler = new NettyResponseHandler(request);
+        VirtualClientConnection connection = VirtualClientConnection.connect(handler, QUARKUS_DEV_CONSOLE,
+                null);
+
+        connection.sendMessage(nettyRequest);
+        connection.sendMessage(requestContent);
+    }
+
+    private ByteArrayOutputStream createByteStream() {
+        ByteArrayOutputStream baos;
+        baos = new ByteArrayOutputStream(BUFFER_SIZE);
+        return baos;
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java
new file mode 100644
index 0000000000000..8210a8f9d6ec3
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java
@@ -0,0 +1,825 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.Consume;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.builditem.LogHandlerBuildItem;
+import io.quarkus.deployment.builditem.ServiceStartBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.ide.EffectiveIdeBuildItem;
+import io.quarkus.deployment.ide.Ide;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
+import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.deployment.recording.BytecodeRecorderImpl;
+import io.quarkus.deployment.util.ArtifactInfoUtil;
+import io.quarkus.deployment.util.WebJarUtil;
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.dev.spi.DevModeType;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
+import io.quarkus.netty.runtime.virtual.VirtualChannel;
+import io.quarkus.netty.runtime.virtual.VirtualServerChannel;
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.EngineBuilder;
+import io.quarkus.qute.EvalContext;
+import io.quarkus.qute.Expression;
+import io.quarkus.qute.HtmlEscaper;
+import io.quarkus.qute.NamespaceResolver;
+import io.quarkus.qute.RawString;
+import io.quarkus.qute.ReflectionValueResolver;
+import io.quarkus.qute.ResultMapper;
+import io.quarkus.qute.Results;
+import io.quarkus.qute.Results.Result;
+import io.quarkus.qute.TemplateException;
+import io.quarkus.qute.TemplateLocator;
+import io.quarkus.qute.TemplateNode.Origin;
+import io.quarkus.qute.UserTagSectionHelper;
+import io.quarkus.qute.ValueResolver;
+import io.quarkus.qute.ValueResolvers;
+import io.quarkus.qute.Variant;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.TemplateHtmlBuilder;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.runtime.devmode.DevConsoleFilter;
+import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
+import io.quarkus.vertx.http.runtime.devmode.RedirectHandler;
+import io.quarkus.vertx.http.runtime.devmode.RuntimeDevConsoleRoute;
+import io.quarkus.vertx.http.runtime.logstream.HistoryHandler;
+import io.quarkus.vertx.http.runtime.logstream.LogStreamRecorder;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.impl.Http1xServerConnection;
+import io.vertx.core.impl.ContextInternal;
+import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.impl.VertxHandler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+public class DevConsoleProcessor {
+
+    private static final Logger log = Logger.getLogger(DevConsoleProcessor.class);
+
+    private static final String STATIC_RESOURCES_PATH = "dev-static/";
+    private static final Object EMPTY = new Object();
+
+    // FIXME: config, take from Qute?
+    private static final String[] suffixes = new String[] { "html", "txt" };
+    protected static volatile ServerBootstrap virtualBootstrap;
+    protected static volatile Vertx devConsoleVertx;
+    protected static volatile Channel channel;
+    static Router router;
+    static Router mainRouter;
+
+    public static void initializeVirtual() {
+        if (virtualBootstrap != null) {
+            return;
+        }
+        devConsoleVertx = Vertx.vertx();
+        VertxInternal vertx = (VertxInternal) devConsoleVertx;
+        QuarkusClassLoader ccl = (QuarkusClassLoader) DevConsoleProcessor.class.getClassLoader();
+        ccl.addCloseTask(new Runnable() {
+            @Override
+            public void run() {
+                virtualBootstrap = null;
+                if (devConsoleVertx != null) {
+                    devConsoleVertx.close();
+                    devConsoleVertx = null;
+                }
+                if (channel != null) {
+                    try {
+                        channel.close().sync();
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException("failed to close virtual http");
+                    }
+                }
+            }
+        });
+        virtualBootstrap = new ServerBootstrap();
+        virtualBootstrap.group(vertx.getEventLoopGroup())
+                .channel(VirtualServerChannel.class)
+                .handler(new ChannelInitializer<VirtualServerChannel>() {
+                    @Override
+                    public void initChannel(VirtualServerChannel ch) throws Exception {
+                        //ch.pipeline().addLast(new LoggingHandler(LogLevel.INFO));
+                    }
+                })
+                .childHandler(new ChannelInitializer<VirtualChannel>() {
+                    @Override
+                    public void initChannel(VirtualChannel ch) throws Exception {
+                        ContextInternal context = (ContextInternal) vertx
+                                .createEventLoopContext(null, null, new JsonObject(),
+                                        Thread.currentThread().getContextClassLoader());
+                        VertxHandler<Http1xServerConnection> handler = VertxHandler.create(context, chctx -> {
+                            Http1xServerConnection conn = new Http1xServerConnection(
+                                    context.owner(),
+                                    null,
+                                    new HttpServerOptions(),
+                                    chctx,
+                                    context,
+                                    "localhost",
+                                    null);
+                            conn.handler(new Handler<HttpServerRequest>() {
+                                @Override
+                                public void handle(HttpServerRequest event) {
+                                    mainRouter.handle(event);
+                                }
+                            });
+                            return conn;
+                        });
+                        ch.pipeline().addLast("handler", handler);
+                    }
+                });
+
+        // Start the server.
+        try {
+            ChannelFuture future = virtualBootstrap.bind(DevConsoleHttpHandler.QUARKUS_DEV_CONSOLE);
+            future.sync();
+            channel = future.channel();
+        } catch (InterruptedException e) {
+            throw new RuntimeException("failed to bind virtual http");
+        }
+
+    }
+
+    protected static void newRouter(Engine engine,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
+
+        // "/" or "/myroot/"
+        String httpRootPath = nonApplicationRootPathBuildItem.getNormalizedHttpRootPath();
+        // "/" or "/myroot/" or "/q/" or "/myroot/q/"
+        String frameworkRootPath = nonApplicationRootPathBuildItem.getNonApplicationRootPath();
+
+        Handler<RoutingContext> errorHandler = new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext event) {
+                String message = "Dev console request failed";
+                log.error(message, event.failure());
+                event.response().headers().set(HttpHeaderNames.CONTENT_TYPE, "text/html; charset=utf-8");
+                event.response().end(
+                        new TemplateHtmlBuilder("Internal Server Error", message, message).stack(event.failure()).toString());
+            }
+        };
+        router = Router.router(devConsoleVertx);
+        router.errorHandler(500, errorHandler);
+        router.route()
+                .order(Integer.MIN_VALUE)
+                .handler(new FlashScopeHandler());
+        router.route().method(HttpMethod.GET)
+                .order(Integer.MIN_VALUE + 1)
+                .handler(new DevConsole(engine, httpRootPath, frameworkRootPath));
+        mainRouter = Router.router(devConsoleVertx);
+        mainRouter.errorHandler(500, errorHandler);
+        mainRouter.route(nonApplicationRootPathBuildItem.resolvePath("dev/*")).subRouter(router);
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public ServiceStartBuildItem buildTimeTemplates(List<DevConsoleTemplateInfoBuildItem> items,
+            CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        Map<String, Map<String, Object>> results = new HashMap<>();
+        for (DevConsoleTemplateInfoBuildItem i : items) {
+            Entry<String, String> groupAndArtifact = i.groupIdAndArtifactId(curateOutcomeBuildItem);
+            Map<String, Object> map = results.computeIfAbsent(groupAndArtifact.getKey() + "." + groupAndArtifact.getValue(),
+                    (s) -> new HashMap<>());
+            map.put(i.getName(), i.getObject());
+        }
+        DevConsoleManager.setTemplateInfo(results);
+        return null;
+    }
+
+    @BuildStep
+    DevTemplateVariantsBuildItem collectTemplateVariants(List<DevTemplatePathBuildItem> templatePaths) throws IOException {
+        Set<String> allPaths = templatePaths.stream().map(DevTemplatePathBuildItem::getPath).collect(Collectors.toSet());
+        // item -> [item.html, item.txt]
+        // ItemResource/item -> -> [ItemResource/item.html, ItemResource/item.xml]
+        Map<String, List<String>> baseToVariants = new HashMap<>();
+        for (String path : allPaths) {
+            int idx = path.lastIndexOf('.');
+            if (idx != -1) {
+                String base = path.substring(0, idx);
+                List<String> variants = baseToVariants.get(base);
+                if (variants == null) {
+                    variants = new ArrayList<>();
+                    baseToVariants.put(base, variants);
+                }
+                variants.add(path);
+            }
+        }
+        return new DevTemplateVariantsBuildItem(baseToVariants);
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public void runtimeTemplates(List<DevConsoleRuntimeTemplateInfoBuildItem> items, DevConsoleRecorder recorder,
+            List<ServiceStartBuildItem> gate) {
+        for (DevConsoleRuntimeTemplateInfoBuildItem i : items) {
+            recorder.addInfo(i.getGroupId(), i.getArtifactId(), i.getName(), i.getObject());
+        }
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    @Record(ExecutionTime.STATIC_INIT)
+    public HistoryHandlerBuildItem handler(BuildProducer<LogHandlerBuildItem> logHandlerBuildItemBuildProducer,
+            LogStreamRecorder recorder, DevUIConfig devUiConfig) {
+        RuntimeValue<Optional<HistoryHandler>> handler = recorder.handler(devUiConfig.historySize);
+        logHandlerBuildItemBuildProducer.produce(new LogHandlerBuildItem((RuntimeValue) handler));
+        return new HistoryHandlerBuildItem(handler);
+    }
+
+    @Consume(LoggingSetupBuildItem.class)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public ServiceStartBuildItem setupDeploymentSideHandling(List<DevTemplatePathBuildItem> devTemplatePaths,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            BuildSystemTargetBuildItem buildSystemTargetBuildItem,
+            Optional<EffectiveIdeBuildItem> effectiveIdeBuildItem,
+            List<RouteBuildItem> allRoutes,
+            List<DevConsoleRouteBuildItem> routes,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, LaunchModeBuildItem launchModeBuildItem) {
+        if (launchModeBuildItem.getDevModeType().orElse(null) != DevModeType.LOCAL) {
+            return null;
+        }
+
+        initializeVirtual();
+        Engine quteEngine = buildEngine(devTemplatePaths,
+                allRoutes,
+                buildSystemTargetBuildItem,
+                effectiveIdeBuildItem,
+                nonApplicationRootPathBuildItem,
+                launchModeBuildItem);
+        newRouter(quteEngine, nonApplicationRootPathBuildItem);
+
+        for (DevConsoleRouteBuildItem i : routes) {
+            Entry<String, String> groupAndArtifact = i.groupIdAndArtifactId(curateOutcomeBuildItem);
+            // deployment side handling
+            if (!(i.getHandler() instanceof BytecodeRecorderImpl.ReturnedProxy)) {
+                router.route(HttpMethod.valueOf(i.getMethod()),
+                        "/" + groupAndArtifact.getKey() + "." + groupAndArtifact.getValue() + "/" + i.getPath())
+                        .handler(i.getHandler());
+            }
+        }
+
+        return null;
+    }
+
+    @Record(ExecutionTime.RUNTIME_INIT)
+    @Consume(LoggingSetupBuildItem.class)
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public void setupDevConsoleRoutes(
+            DevConsoleRecorder recorder,
+            LogStreamRecorder logStreamRecorder,
+            List<DevConsoleRouteBuildItem> routes,
+            CurateOutcomeBuildItem curateOutcomeBuildItem,
+            HistoryHandlerBuildItem historyHandlerBuildItem,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            LaunchModeBuildItem launchModeBuildItem,
+            ShutdownContextBuildItem shutdownContext,
+            BuildProducer<RouteBuildItem> routeBuildItemBuildProducer) throws IOException {
+        if (launchModeBuildItem.getDevModeType().orElse(null) != DevModeType.LOCAL) {
+            return;
+        }
+
+        // Add the static resources
+        AppArtifact devConsoleResourcesArtifact = WebJarUtil.getAppArtifact(curateOutcomeBuildItem, "io.quarkus",
+                "quarkus-vertx-http-deployment");
+
+        Path devConsoleStaticResourcesDeploymentPath = WebJarUtil.copyResourcesForDevOrTest(curateOutcomeBuildItem,
+                launchModeBuildItem,
+                devConsoleResourcesArtifact, STATIC_RESOURCES_PATH);
+
+        routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route("dev/resources/*")
+                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(), shutdownContext))
+                .build());
+
+        // Add the log stream
+        routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route("dev/logstream")
+                .handler(logStreamRecorder.websocketHandler(historyHandlerBuildItem.value))
+                .build());
+
+        for (DevConsoleRouteBuildItem i : routes) {
+            Entry<String, String> groupAndArtifact = i.groupIdAndArtifactId(curateOutcomeBuildItem);
+            // if the handler is a proxy, then that means it's been produced by a recorder and therefore belongs in the regular runtime Vert.x instance
+            // otherwise this is handled in the setupDeploymentSideHandling method
+            if (i.getHandler() instanceof BytecodeRecorderImpl.ReturnedProxy) {
+                routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                        .routeFunction(
+                                "dev/" + groupAndArtifact.getKey() + "." + groupAndArtifact.getValue() + "/" + i.getPath(),
+                                new RuntimeDevConsoleRoute(i.getMethod()))
+                        .handler(i.getHandler())
+                        .build());
+            }
+        }
+
+        DevConsoleManager.registerHandler(new DevConsoleHttpHandler());
+        //must be last so the above routes have precedence
+        routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route("dev/*")
+                .handler(new DevConsoleFilter())
+                .build());
+        routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
+                .route("dev")
+                .displayOnNotFoundPage("Dev UI")
+                .handler(new RedirectHandler())
+                .build());
+    }
+
+    @BuildStep
+    void builder(Optional<EffectiveIdeBuildItem> effectiveIdeBuildItem, BuildProducer<DevConsoleRouteBuildItem> producer) {
+        if (effectiveIdeBuildItem.isPresent()) {
+            producer.produce(new DevConsoleRouteBuildItem("openInIDE", "POST",
+                    new OpenIdeHandler(effectiveIdeBuildItem.get().getIde())));
+        }
+    }
+
+    private Engine buildEngine(List<DevTemplatePathBuildItem> devTemplatePaths,
+            List<RouteBuildItem> allRoutes,
+            BuildSystemTargetBuildItem buildSystemTargetBuildItem,
+            Optional<EffectiveIdeBuildItem> effectiveIdeBuildItem,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, LaunchModeBuildItem launchModeBuildItem) {
+        EngineBuilder builder = Engine.builder().addDefaults();
+
+        // Escape some characters for HTML templates
+        builder.addResultMapper(new HtmlEscaper());
+
+        builder.addValueResolver(new ReflectionValueResolver())
+                .addValueResolver(new JsonObjectValueResolver())
+                .addValueResolver(new MultiMapValueResolver())
+                .addValueResolver(ValueResolvers.rawResolver())
+                .addNamespaceResolver(NamespaceResolver.builder("ideInfo")
+                        .resolve(new IdeInfoContextFunction(buildSystemTargetBuildItem, effectiveIdeBuildItem,
+                                launchModeBuildItem))
+                        .build())
+                .addNamespaceResolver(NamespaceResolver.builder("info").resolve(ctx -> {
+                    String ext = DevConsole.currentExtension.get();
+                    if (ext == null) {
+                        return Results.Result.NOT_FOUND;
+                    }
+                    Map<String, Object> map = DevConsoleManager.getTemplateInfo().get(ext);
+                    if (map == null) {
+                        return Results.Result.NOT_FOUND;
+                    }
+                    Object result = map.get(ctx.getName());
+                    return result == null ? Results.Result.NOT_FOUND : result;
+                }).build());
+
+        // Create map of resolved paths
+        Map<String, String> resolvedPaths = new HashMap<>();
+        for (RouteBuildItem item : allRoutes) {
+            ConfiguredPathInfo resolvedPathBuildItem = item.getDevConsoleResolvedPath();
+            if (resolvedPathBuildItem != null) {
+                resolvedPaths.put(resolvedPathBuildItem.getName(),
+                        resolvedPathBuildItem.getEndpointPath(nonApplicationRootPathBuildItem));
+            }
+        }
+
+        // {config:property('quarkus.lambda.handler')}
+        // {config:http-path('quarkus.smallrye-graphql.ui.root-path')}
+        // Note that the output value is always string!
+        builder.addNamespaceResolver(NamespaceResolver.builder("config").resolveAsync(ctx -> {
+            List<Expression> params = ctx.getParams();
+            if (params.size() != 1 || (!ctx.getName().equals("property") && !ctx.getName().equals("http-path"))) {
+                return Results.NOT_FOUND;
+            }
+            if (ctx.getName().equals("http-path")) {
+                return ctx.evaluate(params.get(0)).thenCompose(propertyName -> {
+                    String value = resolvedPaths.get(propertyName.toString());
+                    return CompletableFuture.completedFuture(value != null ? value : Result.NOT_FOUND);
+                });
+            } else {
+                return ctx.evaluate(params.get(0)).thenCompose(propertyName -> {
+                    Optional<String> val = ConfigProvider.getConfig().getOptionalValue(propertyName.toString(), String.class);
+                    return CompletableFuture.completedFuture(val.isPresent() ? val.get() : Result.NOT_FOUND);
+                });
+            }
+        }).build());
+
+        // JavaDoc formatting
+        builder.addValueResolver(new JavaDocResolver());
+
+        // Add templates and tags
+        Map<String, String> templates = new HashMap<>();
+        for (DevTemplatePathBuildItem devTemplatePath : devTemplatePaths) {
+            templates.put(devTemplatePath.getPath(), devTemplatePath.getContents());
+            if (devTemplatePath.isTag()) {
+                // Strip suffix, item.html -> item
+                String tagName = devTemplatePath.getTagName();
+                builder.addSectionHelper(new UserTagSectionHelper.Factory(tagName, devTemplatePath.getPath()));
+            }
+        }
+        builder.addLocator(id -> locateTemplate(id, templates));
+
+        builder.addResultMapper(new ResultMapper() {
+            @Override
+            public int getPriority() {
+                // The priority must be higher than the one used for HtmlEscaper
+                return 10;
+            }
+
+            @Override
+            public boolean appliesTo(Origin origin, Object result) {
+                return result.equals(Result.NOT_FOUND);
+            }
+
+            @Override
+            public String map(Object result, Expression expression) {
+                Origin origin = expression.getOrigin();
+                throw new TemplateException(origin,
+                        String.format("Property not found in expression {%s} in template %s on line %s",
+                                expression.toOriginalString(),
+                                origin.getTemplateId(), origin.getLine()));
+            }
+        });
+        builder.addResultMapper(new ResultMapper() {
+            @Override
+            public int getPriority() {
+                // The priority must be higher than the one used for HtmlEscaper
+                return 10;
+            }
+
+            @Override
+            public boolean appliesTo(Origin origin, Object result) {
+                return result.equals(EMPTY);
+            }
+
+            @Override
+            public String map(Object result, Expression expression) {
+                return "<<unset>>";
+            }
+        });
+
+        Engine engine = builder.build();
+
+        // pre-load all templates
+        for (DevTemplatePathBuildItem devTemplatePath : devTemplatePaths) {
+            if (!devTemplatePath.isTag()) {
+                engine.getTemplate(devTemplatePath.getPath());
+            }
+        }
+        return engine;
+    }
+
+    private static Optional<TemplateLocator.TemplateLocation> locateTemplate(String id, Map<String, String> templates) {
+        String template = templates.get(id);
+        if (template == null) {
+            // Try path with suffixes
+            for (String suffix : suffixes) {
+                id = id + "." + suffix;
+                template = templates.get(id);
+                if (template != null) {
+                    break;
+                }
+            }
+        }
+
+        if (template == null)
+            return Optional.empty();
+
+        String templateName = id;
+        String finalTemplate = template;
+        return Optional.of(new TemplateLocator.TemplateLocation() {
+            @Override
+            public Reader read() {
+                return new StringReader(finalTemplate);
+            }
+
+            @Override
+            public Optional<Variant> getVariant() {
+                Variant variant = null;
+                String fileName = templateName;
+                int slashIdx = fileName.lastIndexOf('/');
+                if (slashIdx != -1) {
+                    fileName = fileName.substring(slashIdx, fileName.length());
+                }
+                int dotIdx = fileName.lastIndexOf('.');
+                if (dotIdx != -1) {
+                    String suffix = fileName.substring(dotIdx + 1, fileName.length());
+                    if (suffix.equalsIgnoreCase("json")) {
+                        variant = Variant.forContentType(Variant.APPLICATION_JSON);
+                    } else {
+                        String contentType = URLConnection.getFileNameMap().getContentTypeFor(fileName);
+                        if (contentType != null) {
+                            variant = Variant.forContentType(contentType);
+                        }
+                    }
+                }
+                return Optional.ofNullable(variant);
+            }
+        });
+    }
+
+    @BuildStep
+    void collectTemplates(BuildProducer<DevTemplatePathBuildItem> devTemplatePaths) {
+        try {
+            ClassLoader classLoader = DevConsoleProcessor.class.getClassLoader();
+            Enumeration<URL> devTemplateURLs = classLoader.getResources("/dev-templates");
+            while (devTemplateURLs.hasMoreElements()) {
+                String devTemplatesURL = devTemplateURLs.nextElement().toExternalForm();
+                if (devTemplatesURL.startsWith("jar:file:") && devTemplatesURL.endsWith("!/dev-templates")) {
+                    String jarPath = devTemplatesURL.substring(9, devTemplatesURL.length() - 15);
+                    if (File.separatorChar == '\\') {
+                        // on Windows this will be /C:/some/path, so turn it into C:\some\path
+                        jarPath = jarPath.substring(1).replace('/', '\\');
+                    }
+                    try (FileSystem fs = FileSystems
+                            .newFileSystem(Paths.get(URLDecoder.decode(jarPath, StandardCharsets.UTF_8.name())), classLoader)) {
+                        scanTemplates(fs, devTemplatePaths);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void scanTemplates(FileSystem fs, BuildProducer<DevTemplatePathBuildItem> devTemplatePaths) throws IOException {
+        Entry<String, String> entry = ArtifactInfoUtil.groupIdAndArtifactId(fs);
+        if (entry == null) {
+            throw new RuntimeException("Artifact at " + fs + " is missing pom metadata");
+        }
+        String prefix;
+        // don't move stuff for our "root" dev console artifact, since it includes the main template
+        if (entry.getKey().equals("io.quarkus")
+                && entry.getValue().equals("quarkus-vertx-http"))
+            prefix = "";
+        else
+            prefix = entry.getKey() + "." + entry.getValue() + "/";
+        for (Path root : fs.getRootDirectories()) {
+            Path devTemplatesPath = fs.getPath("/dev-templates");
+            Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                    if (dir.toString().equals("/") || dir.startsWith(devTemplatesPath))
+                        return FileVisitResult.CONTINUE;
+                    return FileVisitResult.SKIP_SUBTREE;
+                }
+
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    String contents = new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
+                    // don't move tags yet, since we don't know how to use them afterwards
+                    String relativePath = devTemplatesPath.relativize(file).toString();
+                    String correctedPath;
+                    if (relativePath.startsWith(DevTemplatePathBuildItem.TAGS))
+                        correctedPath = relativePath;
+                    else
+                        correctedPath = prefix + relativePath;
+                    devTemplatePaths
+                            .produce(new DevTemplatePathBuildItem(correctedPath, contents));
+                    return super.visitFile(file, attrs);
+                }
+            });
+        }
+    }
+
+    public static class JavaDocResolver implements ValueResolver {
+
+        private final Pattern codePattern = Pattern.compile("(\\{@code )([^}]+)(\\})");
+        private final Pattern linkPattern = Pattern.compile("(\\{@link )([^}]+)(\\})");
+
+        @Override
+        public boolean appliesTo(EvalContext context) {
+            return context.getBase() instanceof String && context.getName().equals("fmtJavadoc");
+        }
+
+        @Override
+        public CompletionStage<Object> resolve(EvalContext context) {
+            String val = context.getBase().toString();
+            // Replace {@code} and {@link}
+            val = codePattern.matcher(val).replaceAll("<code>$2</code>");
+            val = linkPattern.matcher(val).replaceAll("<code>$2</code>");
+            // Add br before @see and @deprecated
+            val = val.replace("@see", "<br><strong>@see</strong>").replace("@deprecated",
+                    "<br><strong>@deprecated</strong>");
+            // No need to escape special characters
+            return CompletableFuture.completedFuture(new RawString(val));
+        }
+    }
+
+    public static final class HistoryHandlerBuildItem extends SimpleBuildItem {
+        final RuntimeValue<Optional<HistoryHandler>> value;
+
+        public HistoryHandlerBuildItem(RuntimeValue<Optional<HistoryHandler>> value) {
+            this.value = value;
+        }
+    }
+
+    private static class DetectPackageFileVisitor extends SimpleFileVisitor<Path> {
+        private final List<String> paths;
+
+        public DetectPackageFileVisitor(List<String> paths) {
+            this.paths = paths;
+        }
+
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+            boolean hasRegularFiles = false;
+            File[] files = dir.toFile().listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isFile()) {
+                        hasRegularFiles = true;
+                        break;
+                    }
+                }
+            }
+            if (hasRegularFiles) {
+                paths.add(dir.toAbsolutePath().toString());
+            }
+            return FileVisitResult.CONTINUE;
+        }
+    }
+
+    private static class IdeInfoContextFunction implements Function<EvalContext, Object> {
+
+        private static final String[] SUPPORTED_LANGS = { "java", "kotlin" };
+
+        private final Optional<EffectiveIdeBuildItem> effectiveIdeBuildItem;
+        private final Path srcMainPath;
+        private final boolean disable;
+
+        public IdeInfoContextFunction(BuildSystemTargetBuildItem buildSystemTargetBuildItem,
+                Optional<EffectiveIdeBuildItem> effectiveIdeBuildItem,
+                LaunchModeBuildItem launchModeBuildItem) {
+            this.effectiveIdeBuildItem = effectiveIdeBuildItem;
+            srcMainPath = buildSystemTargetBuildItem.getOutputDirectory().getParent().resolve("src").resolve("main");
+            disable = launchModeBuildItem.getDevModeType().orElse(DevModeType.LOCAL) != DevModeType.LOCAL;
+        }
+
+        @Override
+        public Object apply(EvalContext ctx) {
+            String ctxName = ctx.getName();
+
+            if (ctxName.equals("sourcePackages")) {
+                if (disable) {
+                    return Collections.emptyList(); // we need this here because the result needs to be iterable
+                }
+                Map<String, List<String>> sourcePackagesByLang = new HashMap<>();
+
+                for (String lang : SUPPORTED_LANGS) {
+                    List<String> packages = sourcePackagesForLang(srcMainPath, lang);
+                    if (!packages.isEmpty()) {
+                        sourcePackagesByLang.put(lang, packages);
+                    }
+                }
+                return sourcePackagesByLang;
+            }
+
+            if (disable) { // all the other values are Strings
+                return EMPTY;
+            }
+
+            switch (ctxName) {
+                case "srcMainPath": {
+                    return srcMainPath.toAbsolutePath().toString();
+                }
+                case "ideLinkType":
+                    if (!effectiveIdeBuildItem.isPresent()) {
+                        return "none";
+                    }
+                    return effectiveIdeBuildItem.get().getIde().equals(Ide.VSCODE) ? "client" : "server";
+                case "ideClientLinkFormat":
+                    if (!effectiveIdeBuildItem.isPresent()) {
+                        return "unused";
+                    }
+                    if (effectiveIdeBuildItem.get().getIde() == Ide.VSCODE) {
+                        return "vscode://file/{0}:{1}";
+                    } else {
+                        return "unused";
+                    }
+                case "ideServerLinkEndpoint":
+                    if (!effectiveIdeBuildItem.isPresent()) {
+                        return "unused";
+                    }
+                    return "/io.quarkus.quarkus-vertx-http/openInIDE";
+            }
+            return Results.Result.NOT_FOUND;
+        }
+
+        /**
+         * Return the most general packages used in the application
+         *
+         * TODO: this likely covers almost all typical use cases, but probably needs some tweaks for extreme corner cases
+         */
+        private List<String> sourcePackagesForLang(Path srcMainPath, String lang) {
+            Path langPath = srcMainPath.resolve(lang);
+            if (!Files.exists(langPath)) {
+                return Collections.emptyList();
+            }
+            File[] rootFiles = langPath.toFile().listFiles();
+            List<Path> rootPackages = new ArrayList<>(1);
+            if (rootFiles != null) {
+                for (File rootFile : rootFiles) {
+                    if (rootFile.isDirectory()) {
+                        rootPackages.add(rootFile.toPath());
+                    }
+                }
+            }
+            if (rootPackages.isEmpty()) {
+                return Collections.emptyList();
+            }
+            List<String> result = new ArrayList<>(rootPackages.size());
+            for (Path rootPackage : rootPackages) {
+                List<String> paths = new ArrayList<>();
+                SimpleFileVisitor<Path> simpleFileVisitor = new DetectPackageFileVisitor(paths);
+                try {
+                    Files.walkFileTree(rootPackage, simpleFileVisitor);
+                    if (paths.isEmpty()) {
+                        continue;
+                    }
+                    String commonPath = commonPath(paths);
+                    String rootPackageStr = commonPath.replace(langPath.toAbsolutePath().toString(), "")
+                            .replace(File.separator, ".");
+                    if (rootPackageStr.startsWith(".")) {
+                        rootPackageStr = rootPackageStr.substring(1);
+                    }
+                    if (rootPackageStr.endsWith(".")) {
+                        rootPackageStr = rootPackageStr.substring(0, rootPackageStr.length() - 1);
+                    }
+                    result.add(rootPackageStr);
+                } catch (IOException e) {
+                    log.debug("Unable to determine the sources directories", e);
+                    // just ignore it as it's not critical for the DevUI functionality
+                }
+            }
+            return result;
+        }
+
+        private String commonPath(List<String> paths) {
+            String commonPath = "";
+            List<String[]> dirs = new ArrayList<>(paths.size());
+            for (int i = 0; i < paths.size(); i++) {
+                dirs.add(i, paths.get(i).split(File.separator));
+            }
+            for (int j = 0; j < dirs.get(0).length; j++) {
+                String thisDir = dirs.get(0)[j]; // grab the next directory name in the first path
+                boolean allMatched = true;
+                for (int i = 1; i < dirs.size() && allMatched; i++) { // look at the other paths
+                    if (dirs.get(i).length < j) { //there is no directory
+                        allMatched = false;
+                        break;
+                    }
+                    allMatched = dirs.get(i)[j].equals(thisDir); //check if it matched
+                }
+                if (allMatched) {
+                    commonPath += thisDir + File.separator;
+                } else {
+                    break;
+                }
+            }
+            return commonPath;
+        }
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevTemplatePathBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevTemplatePathBuildItem.java
new file mode 100644
index 0000000000000..d86a33079ffc2
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevTemplatePathBuildItem.java
@@ -0,0 +1,58 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Represents a dev template path.
+ */
+public final class DevTemplatePathBuildItem extends MultiBuildItem {
+
+    static final String TAGS = "tags/";
+
+    private final String path;
+    private final String contents;
+
+    public DevTemplatePathBuildItem(String path, String contents) {
+        this.path = path;
+        this.contents = contents;
+    }
+
+    /**
+     * Uses the {@code /} path separator.
+     * 
+     * @return the path relative to the template root
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Returns the template contents
+     * 
+     * @return the template contents
+     */
+    public String getContents() {
+        return contents;
+    }
+
+    /**
+     * 
+     * @return {@code true} if it represents a user tag, {@code false} otherwise
+     */
+    public boolean isTag() {
+        return path.startsWith(TAGS);
+    }
+
+    public boolean isRegular() {
+        return !isTag();
+    }
+
+    public String getTagName() {
+        int end = path.lastIndexOf('.');
+        if (end == -1) {
+            end = path.length();
+        }
+        return path.substring(TAGS.length(), end);
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevTemplateVariantsBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevTemplateVariantsBuildItem.java
new file mode 100644
index 0000000000000..a847c2b87334d
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevTemplateVariantsBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.util.List;
+import java.util.Map;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Holds all dev template variants found.
+ */
+public final class DevTemplateVariantsBuildItem extends SimpleBuildItem {
+
+    private final Map<String, List<String>> variants;
+
+    public DevTemplateVariantsBuildItem(Map<String, List<String>> variants) {
+        this.variants = variants;
+    }
+
+    public Map<String, List<String>> getVariants() {
+        return variants;
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevUIConfig.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevUIConfig.java
new file mode 100644
index 0000000000000..634a1d9d7dd5a
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevUIConfig.java
@@ -0,0 +1,15 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(name = "dev-ui")
+public class DevUIConfig {
+
+    /**
+     * The number of history log entries to remember.
+     */
+    @ConfigItem(defaultValue = "50")
+    public int historySize;
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/FlashScopeHandler.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/FlashScopeHandler.java
new file mode 100644
index 0000000000000..78bc7bc161ff7
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/FlashScopeHandler.java
@@ -0,0 +1,15 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import io.quarkus.devconsole.runtime.spi.FlashScopeUtil;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+public class FlashScopeHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        FlashScopeUtil.handleFlashCookie(event);
+        event.next();
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/JsonObjectValueResolver.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/JsonObjectValueResolver.java
new file mode 100644
index 0000000000000..a031f7f50ef7c
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/JsonObjectValueResolver.java
@@ -0,0 +1,48 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import io.quarkus.qute.EvalContext;
+import io.quarkus.qute.Results;
+import io.quarkus.qute.ValueResolver;
+import io.vertx.core.json.JsonObject;
+
+public class JsonObjectValueResolver implements ValueResolver {
+
+    public boolean appliesTo(EvalContext context) {
+        return ValueResolver.matchClass(context, JsonObject.class);
+    }
+
+    @Override
+    public CompletionStage<Object> resolve(EvalContext context) {
+        JsonObject jsonObject = (JsonObject) context.getBase();
+        switch (context.getName()) {
+            case "fieldNames":
+            case "fields":
+                return CompletableFuture.completedFuture(jsonObject.fieldNames());
+            case "size":
+                return CompletableFuture.completedFuture(jsonObject.size());
+            case "empty":
+            case "isEmpty":
+                return CompletableFuture.completedFuture(jsonObject.isEmpty());
+            case "get":
+                if (context.getParams().size() == 1) {
+                    return context.evaluate(context.getParams().get(0)).thenCompose(k -> {
+                        return CompletableFuture.completedFuture(jsonObject.getValue((String) k));
+                    });
+                }
+            case "containsKey":
+                if (context.getParams().size() == 1) {
+                    return context.evaluate(context.getParams().get(0)).thenCompose(k -> {
+                        return CompletableFuture.completedFuture(jsonObject.containsKey((String) k));
+                    });
+                }
+            default:
+                return jsonObject.containsKey(context.getName())
+                        ? CompletableFuture.completedFuture(jsonObject.getValue(context.getName()))
+                        : Results.NOT_FOUND;
+        }
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/MultiMapValueResolver.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/MultiMapValueResolver.java
new file mode 100644
index 0000000000000..cb77002273601
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/MultiMapValueResolver.java
@@ -0,0 +1,53 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import io.quarkus.qute.EvalContext;
+import io.quarkus.qute.Results;
+import io.quarkus.qute.ValueResolver;
+import io.vertx.core.MultiMap;
+
+public class MultiMapValueResolver implements ValueResolver {
+
+    public boolean appliesTo(EvalContext context) {
+        return ValueResolver.matchClass(context, MultiMap.class);
+    }
+
+    @Override
+    public CompletionStage<Object> resolve(EvalContext context) {
+        MultiMap multiMap = (MultiMap) context.getBase();
+        switch (context.getName()) {
+            case "names":
+                return CompletableFuture.completedFuture(multiMap.names());
+            case "size":
+                return CompletableFuture.completedFuture(multiMap.size());
+            case "empty":
+            case "isEmpty":
+                return CompletableFuture.completedFuture(multiMap.isEmpty());
+            case "get":
+                if (context.getParams().size() == 1) {
+                    return context.evaluate(context.getParams().get(0)).thenCompose(k -> {
+                        return CompletableFuture.completedFuture(multiMap.get((String) k));
+                    });
+                }
+            case "getAll":
+                if (context.getParams().size() == 1) {
+                    return context.evaluate(context.getParams().get(0)).thenCompose(k -> {
+                        return CompletableFuture.completedFuture(multiMap.getAll((String) k));
+                    });
+                }
+            case "contains":
+                if (context.getParams().size() == 1) {
+                    return context.evaluate(context.getParams().get(0)).thenCompose(k -> {
+                        return CompletableFuture.completedFuture(multiMap.contains((String) k));
+                    });
+                }
+            default:
+                return multiMap.contains(context.getName())
+                        ? CompletableFuture.completedFuture(multiMap.get(context.getName()))
+                        : Results.NOT_FOUND;
+        }
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/OpenIdeHandler.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/OpenIdeHandler.java
new file mode 100644
index 0000000000000..ca9612022dd9a
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/OpenIdeHandler.java
@@ -0,0 +1,87 @@
+package io.quarkus.vertx.http.deployment.devmode.console;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.deployment.ide.Ide;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * The purpose of this class is to open a class in the IDE on the server-side - meaning the machine
+ * that is running the Quarkus application itself
+ */
+public class OpenIdeHandler extends DevConsolePostHandler {
+
+    private static final Logger log = Logger.getLogger(OpenIdeHandler.class);
+    private static final Map<String, String> LANG_TO_EXT = new HashMap<>();
+    static {
+        LANG_TO_EXT.put("java", "java");
+        LANG_TO_EXT.put("kotlin", "kt");
+    }
+
+    private final Ide ide;
+
+    public OpenIdeHandler(Ide ide) {
+        this.ide = ide;
+    }
+
+    @Override
+    protected void dispatch(RoutingContext routingContext, MultiMap form) {
+        String className = form.get("className");
+        String lang = form.get("lang");
+        String srcMainPath = form.get("srcMainPath");
+        String line = form.get("line");
+
+        if (isNullOrEmpty(className) || isNullOrEmpty(lang) || isNullOrEmpty(srcMainPath)) {
+            routingContext.fail(400);
+        }
+
+        if (ide != null) {
+            typicalProcessLaunch(routingContext, className, lang, srcMainPath, line, ide.getExecutable());
+        } else {
+            log.debug("Unhandled IDE : " + ide);
+            routingContext.fail(500);
+        }
+    }
+
+    private void typicalProcessLaunch(RoutingContext routingContext, String className, String lang, String srcMainPath,
+            String line, String binary) {
+        String arg = toFileName(className, lang, srcMainPath);
+        if (!isNullOrEmpty(line)) {
+            arg = arg + ":" + line;
+        }
+        launchInIDE(Arrays.asList(binary, arg), routingContext);
+    }
+
+    private String toFileName(String className, String lang, String srcMainPath) {
+        // TODO: handler inner classes
+        return srcMainPath + File.separator + lang + File.separator
+                + (className.replace('.', File.separatorChar) + "." + LANG_TO_EXT.get(lang));
+
+    }
+
+    protected void launchInIDE(List<String> command, RoutingContext routingContext) {
+        new Thread(new Runnable() {
+            public void run() {
+                try {
+                    new ProcessBuilder(command).inheritIO().start().waitFor(10, TimeUnit.SECONDS);
+                    routingContext.response().setStatusCode(200).end();
+                } catch (Exception e) {
+                    routingContext.fail(e);
+                }
+            }
+        }, "Launch in IDE Action").start();
+    }
+
+    private boolean isNullOrEmpty(String arg) {
+        return arg == null || arg.isEmpty();
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/css/dev-console.css b/extensions/vertx-http/deployment/src/main/resources/dev-static/css/dev-console.css
new file mode 100644
index 0000000000000..72d8496593523
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/css/dev-console.css
@@ -0,0 +1,62 @@
+.quarkus-logo {
+    margin-right: 15px;
+}
+
+.main-container {
+    margin-top: 1em;
+    margin-bottom: 4em;
+}
+
+.cards-index {
+    padding-top: 1em;
+}
+
+.navbar-brand {
+    margin-right: 0.9rem;
+}
+
+.navbar-brand img {
+    border-right: 1px solid darkgrey;
+    padding-right: 10px;
+    margin-right: 5px;
+}
+
+.navbar-text {
+    font-size: 0.9em;
+    position: absolute;
+    right: 5px;
+    bottom: 9px;
+}
+
+.navbar {
+    justify-content: unset;
+}
+
+#navbar-title:hover {
+    color: #4695eb !important;
+}
+
+#navbar-subtitle {
+    padding-top: 6px;
+    color: #4695eb;
+}
+
+.breadcrumb-separator {
+    margin-right: 2px;
+    margin-left: 4px;
+}
+
+.breadcrumb {
+    border-radius: 0px;
+    background-color: #f5f5f5;
+    border-bottom: 1px solid #ddd;
+    box-shadow: 0 0 6px 0px rgba(0, 0, 0, 0.2);
+}
+
+h1 {
+    margin-bottom: 0.75em;
+}
+
+.package-name {
+    color: dimgray;
+}
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/css/logstream.css b/extensions/vertx-http/deployment/src/main/resources/dev-static/css/logstream.css
new file mode 100644
index 0000000000000..0cf8480c752c4
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/css/logstream.css
@@ -0,0 +1,91 @@
+
+#logstreamFooter {
+    background: #343a40;
+    overflow-y: auto;
+    height: unset;
+}
+
+.logstreamIcon:hover {
+    color: #3366ac !important;
+    cursor: pointer;
+}
+
+.logstreamFilteredOut {
+    display: none;
+}
+
+
+#logstreamLogTerminalText {
+    font-size: 0.9em;
+}
+
+#logstreamLogTerminal {
+    padding-bottom: 5px;
+    line-height: 1.00;
+    padding-left: 6px;
+    padding-right: 6px;
+    padding-bottom: 6px;
+}
+
+#logstreamFollowLogButton {
+    position: fixed;
+    color: green;
+    margin-top: 5px;
+    right: 23px;
+    cursor: pointer;
+}
+
+#logstreamInformationSection {
+    position: fixed;
+    color: white;
+    font-size: 1.6em;
+    right: 23px;
+    bottom: 5px;
+}
+
+.logstreamStopLogHr {
+    margin-top: 10px;
+    border-top: 1px dashed #3366ac;
+}
+
+#logstreamManagerNav {
+    border-bottom: 1px solid #414850;
+    max-height: 32px;
+    position: absolute;
+    width: 100%;
+    top: 0px;
+}
+
+#logstreamManagerNavAppInfo, #logstreamManagerNavBrand {
+    display: none;
+}
+
+#logstreamViewLogButton, #logstreamHideLogButton {
+    color: #9a9da0;
+    font-size:0.73em;
+}
+
+#logstreamHideLogButton {
+    position: absolute;
+    right: 6px;
+    bottom: -3px;
+}
+
+#logstreamResizeButton {
+    position: absolute;
+    right: 50%;
+    bottom: -3px;
+}
+
+#logstreamResizeButton:hover {
+    color: #3366ac !important;
+    cursor: row-resize !important;
+}
+
+#logstreamViewLogButtonIcon:hover {
+    color: #3366ac !important;
+}
+
+.clickable-app-class:hover {
+    cursor:pointer;
+}
diff --git a/extensions/smallrye-health/deployment/src/main/resources/META-INF/resources/favicon.ico b/extensions/vertx-http/deployment/src/main/resources/dev-static/images/favicon.ico
similarity index 100%
rename from extensions/smallrye-health/deployment/src/main/resources/META-INF/resources/favicon.ico
rename to extensions/vertx-http/deployment/src/main/resources/dev-static/images/favicon.ico
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/images/quarkus_icon_rgb_reverse.svg b/extensions/vertx-http/deployment/src/main/resources/dev-static/images/quarkus_icon_rgb_reverse.svg
new file mode 100644
index 0000000000000..1969e1e886af3
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/images/quarkus_icon_rgb_reverse.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><defs><style>.cls-1{fill:#4695eb;}.cls-2{fill:#ff004a;}.cls-3{fill:#fff;}</style></defs><title>quarkus_icon_rgb_1024px_reverse</title><polygon class="cls-1" points="669.34 180.57 512 271.41 669.34 362.25 669.34 180.57"/><polygon class="cls-2" points="354.66 180.57 354.66 362.25 512 271.41 354.66 180.57"/><polygon class="cls-3" points="669.34 362.25 512 271.41 354.66 362.25 512 453.09 669.34 362.25"/><polygon class="cls-1" points="188.76 467.93 346.1 558.76 346.1 377.09 188.76 467.93"/><polygon class="cls-2" points="346.1 740.44 503.43 649.6 346.1 558.76 346.1 740.44"/><polygon class="cls-3" points="346.1 377.09 346.1 558.76 503.43 649.6 503.43 467.93 346.1 377.09"/><polygon class="cls-1" points="677.9 740.44 677.9 558.76 520.57 649.6 677.9 740.44"/><polygon class="cls-2" points="835.24 467.93 677.9 377.09 677.9 558.76 835.24 467.93"/><polygon class="cls-3" points="520.57 649.6 677.9 558.76 677.9 377.09 520.57 467.93 520.57 649.6"/><path class="cls-1" d="M853.47,1H170.53C77.29,1,1,77.29,1,170.53V853.47C1,946.71,77.29,1023,170.53,1023h467.7L512,716.39,420.42,910H170.53C139.9,910,114,884.1,114,853.47V170.53C114,139.9,139.9,114,170.53,114H853.47C884.1,114,910,139.9,910,170.53V853.47C910,884.1,884.1,910,853.47,910H705.28l46.52,113H853.47c93.24,0,169.53-76.29,169.53-169.53V170.53C1023,77.29,946.71,1,853.47,1Z"/></svg>
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js
new file mode 100644
index 0000000000000..67cde3a3ddd32
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js
@@ -0,0 +1,803 @@
+var myself = $('script[src*=logstream]');
+
+// Get the non application root path
+var frameworkRootPath = myself.attr('data-frameworkRootPath');   
+if (typeof frameworkRootPath === "undefined" ) {
+    var pathname = window.location.pathname;
+    var frameworkRootPath = pathname.substr(0, pathname.indexOf('/dev/'));
+}
+// Get the streaming path
+var streamingPath = myself.attr('data-streamingPath');
+if (typeof streamingPath === "undefined" ) {
+   var streamingPath = "/dev/logstream";
+}
+// See if we should show on start
+var showOnStart = myself.attr('data-showOnStart');   
+if (typeof showOnStart === "undefined" ) {
+   var showOnStart = false;
+}
+
+var zoom = 0.90;
+var linespace = 1.00;
+var tabspace = 1;
+var increment = 0.05;
+
+var webSocket;
+var tab = "&nbsp;";
+var space = "&nbsp;";
+
+var isRunning = true;
+var logScrolling = true;
+
+var filter = "";
+
+var localstoragekey = "quarkus_logging_manager_state";
+
+$('document').ready(function () {
+    if(!showOnStart){
+        hideLog();
+    }
+    loadSettings();
+    
+    openSocket();
+    // Make sure we stop the connection when the browser close
+    window.onbeforeunload = function () {
+        closeSocket();
+    };
+    
+    logstreamResizeButton.addEventListener("mousedown", function(e){
+        m_pos = e.y;
+        document.addEventListener("mousemove", resize, false);   
+    }, false);
+
+    document.addEventListener("mouseup", function(){
+        document.removeEventListener("mousemove", resize, false);
+    }, false);
+    
+    logstreamStopStartButton.addEventListener("click", stopStartEvent);
+    logstreamClearLogButton.addEventListener("click", clearScreenEvent);
+    logstreamZoomOutButton.addEventListener("click", zoomOutEvent);
+    logstreamZoomInButton.addEventListener("click", zoomInEvent);
+    logstreamFollowLogButton.addEventListener("click", followLogEvent);
+    logstreamFilterModalInputButton.addEventListener("click", applyFilter);
+    
+    addControlCListener();
+    addEnterListener();
+    addScrollListener();
+    addLineSpaceListener();
+    addTabSizeListener();
+    
+    $('[data-toggle="tooltip"]').tooltip();    
+
+    logstreamFilterModalInput.addEventListener("keyup", function(event) {
+        if (event.keyCode === 13) {
+            event.preventDefault();
+            logstreamFilterModalInputButton.click();
+        }
+    });
+    
+    $('#logstreamFilterModal').on('shown.bs.modal', function () {
+        $('#logstreamFilterModalInput').trigger('focus');
+    });
+    
+    // save settings on hide
+    document.addEventListener('visibilitychange', function() {
+        if (document.visibilityState == 'hidden') { 
+            saveSettings();
+        }
+    });
+    
+});
+
+function loadSettings(){
+    if (localstoragekey in localStorage) {
+        var state = JSON.parse(localStorage.getItem(localstoragekey));
+
+        zoom = state.zoom;
+        applyZoom();
+
+        linespace = state.linespace;
+        applyLineSpacing();
+
+        tabspace = state.tabspace;
+        applyTabSpacing();
+
+        logScrolling = state.logScrolling;
+        applyFollowLog();
+
+        $("#logstreamFilterModalInput").val(state.filter);
+        applyFilter();
+        
+        $('#logstreamColumnsModalLevelIconSwitch').prop('checked', state.levelIconSwitch);
+        $('#logstreamColumnsModalSequenceNumberSwitch').prop('checked', state.sequenceNumberSwitch);
+        $('#logstreamColumnsModalDateSwitch').prop('checked', state.dateSwitch);
+        $('#logstreamColumnsModalTimeSwitch').prop('checked', state.timeSwitch);
+        $('#logstreamColumnsModalLevelSwitch').prop('checked', state.levelSwitch);
+        $('#logstreamColumnsModalSourceClassFullAbbreviatedSwitch').prop('checked', state.sourceClassFullAbbreviatedSwitch);
+        $('#logstreamColumnsModalSourceClassFullSwitch').prop('checked', state.sourceClassFullSwitch);
+        $('#logstreamColumnsModalSourceClassSwitch').prop('checked', state.sourceClassSwitch);
+        $('#logstreamColumnsModalSourceMethodNameSwitch').prop('checked', state.sourceMethodNameSwitch);
+        $('#logstreamColumnsModalThreadIdSwitch').prop('checked', state.threadIdSwitch);
+        $('#logstreamColumnsModalThreadNameSwitch').prop('checked', state.threadNameSwitch);
+        $('#logstreamColumnsModalMessageSwitch').prop('checked', state.messageSwitch);
+        $('#logstreamColumnsModalHostNameSwitch').prop("checked", state.hostNameSwitch);
+        $('#logstreamColumnsModalLoggerNameAbbreviatedSwitch').prop("checked", state.loggerNameAbbreviatedSwitch);
+        $('#logstreamColumnsModalLoggerNameSwitch').prop("checked", state.loggerNameSwitch);
+        $('#logstreamColumnsModalLoggerClassNameSwitch').prop("checked", state.loggerClassNameSwitch);
+        $('#logstreamColumnsModalSourceFileNameSwitch').prop("checked", state.sourceFileNameSwitch);
+        $('#logstreamColumnsModalSourceLineNumberSwitch').prop("checked", state.sourceLineNumberSwitch);
+        $('#logstreamColumnsModalProcessIdSwitch').prop("checked", state.processIdSwitch);
+        $('#logstreamColumnsModalProcessNameSwitch').prop("checked", state.processNameSwitch);
+    }    
+}
+
+function saveSettings(){
+    // Running state
+    var state = {
+        "zoom": zoom,
+        "linespace": linespace,
+        "tabspace": tabspace,
+        "logScrolling": logScrolling,
+        "filter": filter,
+        "levelIconSwitch": $('#logstreamColumnsModalLevelIconSwitch').is(":checked"),
+        "sequenceNumberSwitch": $('#logstreamColumnsModalSequenceNumberSwitch').is(":checked"),
+        "dateSwitch": $('#logstreamColumnsModalDateSwitch').is(":checked"),
+        "timeSwitch": $('#logstreamColumnsModalTimeSwitch').is(":checked"),
+        "levelSwitch": $('#logstreamColumnsModalLevelSwitch').is(":checked"),
+        "sourceClassFullAbbreviatedSwitch": $('#logstreamColumnsModalSourceClassFullAbbreviatedSwitch').is(":checked"),
+        "sourceClassFullSwitch": $('#logstreamColumnsModalSourceClassFullSwitch').is(":checked"),
+        "sourceClassSwitch": $('#logstreamColumnsModalSourceClassSwitch').is(":checked"),
+        "sourceMethodNameSwitch": $('#logstreamColumnsModalSourceMethodNameSwitch').is(":checked"),
+        "threadIdSwitch": $('#logstreamColumnsModalThreadIdSwitch').is(":checked"),
+        "threadNameSwitch": $('#logstreamColumnsModalThreadNameSwitch').is(":checked"),
+        "messageSwitch": $('#logstreamColumnsModalMessageSwitch').is(":checked"),
+        "hostNameSwitch": $('#logstreamColumnsModalHostNameSwitch').is(":checked"),
+        "loggerNameAbbreviatedSwitch": $('#logstreamColumnsModalLoggerNameAbbreviatedSwitch').is(":checked"),
+        "loggerNameSwitch": $('#logstreamColumnsModalLoggerNameSwitch').is(":checked"),
+        "loggerClassNameSwitch": $('#logstreamColumnsModalLoggerClassNameSwitch').is(":checked"),
+        "sourceFileNameSwitch": $('#logstreamColumnsModalSourceFileNameSwitch').is(":checked"),
+        "sourceLineNumberSwitch": $('#logstreamColumnsModalSourceLineNumberSwitch').is(":checked"),
+        "processIdSwitch": $('#logstreamColumnsModalProcessIdSwitch').is(":checked"),
+        "processNameSwitch": $('#logstreamColumnsModalProcessNameSwitch').is(":checked")
+    };
+
+    localStorage.setItem(localstoragekey, JSON.stringify(state));
+}
+
+function showLog(){
+    $("#logstreamFooter").css("height", "33vh");
+    $("#logstreamManager").show();
+    $("#logstreamViewLogButton").hide();
+    $("#logstreamHideLogButton").show();
+    var element = document.getElementById("logstreamManager");
+    element.scrollIntoView({block: "end"});
+}
+
+function hideLog(){
+    $("#logstreamFooter").css("height", "unset");
+    $("#logstreamViewLogButton").show();
+    $("#logstreamHideLogButton").hide();
+    $("#logstreamManager").hide();
+}
+
+function resize(e){
+    const dx = m_pos - e.y;
+    m_pos = e.y;
+    const panel = document.getElementById("logstreamFooter");
+    panel.style.height = (parseInt(getComputedStyle(panel, '').height) + dx) + "px";
+}
+
+function addControlCListener(){
+    // Add listener to stop
+    var ctrlDown = false,
+            ctrlKey = 17,
+            cmdKey = 91,
+            cKey = 67;
+
+    $(document).keydown(function (e) {
+        if (e.keyCode === ctrlKey || e.keyCode === cmdKey)
+            ctrlDown = true;
+    }).keyup(function (e) {
+        if (e.keyCode === ctrlKey || e.keyCode === cmdKey)
+            ctrlDown = false;
+    });
+
+    $(document).keydown(function (e) {
+        if (ctrlDown && (e.keyCode === cKey))stopLog();
+    });
+}
+
+function addScrollListener(){
+    $(document).on('mousewheel DOMMouseScroll', function(event) {
+        if (event.shiftKey) {
+            if( event.originalEvent.detail > 0 || event.originalEvent.wheelDelta < 0 ) {
+                zoomOutEvent();
+            } else {
+                zoomInEvent();
+            }
+            return false;
+        }
+    });
+}
+
+function addLineSpaceListener(){
+    $(document).keydown(function (event) {
+        if (event.shiftKey && event.keyCode === 38) {
+            lineSpaceIncreaseEvent();
+        }else if (event.shiftKey && event.keyCode === 40) {
+            lineSpaceDecreaseEvent();
+        }
+    });
+}
+
+function addTabSizeListener(){
+    $(document).keydown(function (event) {
+        if (event.shiftKey && event.keyCode === 39) {
+            tabSpaceIncreaseEvent();
+        }else if (event.shiftKey && event.keyCode === 37) {
+            tabSpaceDecreaseEvent();
+        }
+    });
+}
+
+function addEnterListener(){
+    $(document).keydown(function (e) {
+        if (e.keyCode === 13 && !$('#logstreamFilterModal').hasClass('show')){
+            writeResponse("</br>");
+            var element = document.getElementById("logstreamLogTerminal");
+            element.scrollIntoView({block: "end"});
+        } 
+    });
+}
+
+function stopStartEvent() {
+    if (isRunning) {
+        stopLog();
+    } else {
+        startLog();
+    }
+}
+
+function stopLog() {
+    webSocket.send("stop");
+    writeResponse("<hr class='logstreamStopLogHr'/>");
+
+    logstreamStopStartButton.innerHTML = "<i class='fas fa-play'></i>";
+    $("#logstreamFollowLogButton").hide();
+    isRunning = false;
+}
+
+function startLog() {
+    webSocket.send("start");
+
+    logstreamStopStartButton.innerHTML = "<i class='fas fa-stop'></i>";
+    $("#logstreamFollowLogButton").show();
+    isRunning = true;
+}
+
+function clearScreenEvent() {
+    logstreamLogTerminalText.innerHTML = "";
+}
+
+function applyLineSpacing(){
+    $('#logstreamLogTerminal').css("line-height", linespace);
+}
+
+function applyTabSpacing(){
+    if(tabspace === null || isNaN(tabspace))tabspace = 1;
+    tab = "";
+    for (i = 0; i < tabspace; i++) {
+        tab = tab + space;
+    };
+}
+
+function lineSpaceDecreaseEvent() {
+    linespace = parseFloat(linespace) - parseFloat(increment);
+    linespace = parseFloat(linespace).toFixed(2);
+    showInfoMessage("<i class='fas fa-text-height'></i>" + space  + linespace);
+    applyLineSpacing();
+}
+
+function lineSpaceIncreaseEvent() {
+    linespace = parseFloat(linespace) + parseFloat(increment);
+    linespace = parseFloat(linespace).toFixed(2);
+    showInfoMessage("<i class='fas fa-text-height'></i>" + space  + linespace);
+    applyLineSpacing();
+}
+
+function tabSpaceDecreaseEvent() {
+    if(tabspace>1){
+        tabspace = tabspace - 1;
+        showInfoMessage("<i class='fas fa-text-width'></i>" + space  + tabspace);
+        applyTabSpacing();
+    }
+}
+
+function tabSpaceIncreaseEvent() {
+    tabspace = tabspace + 1;
+    showInfoMessage("<i class='fas fa-text-width'></i>" + space  + tabspace);
+    applyTabSpacing();
+}
+
+function applyZoom(){
+    $('#logstreamLogTerminalText').css("font-size", zoom + "em");
+}
+
+function zoomOutEvent() {
+    zoom = parseFloat(zoom) - parseFloat(increment);
+    zoom = parseFloat(zoom).toFixed(2);
+    showInfoMessage("<i class='fas fa-search-minus'></i>" + space  + zoom);
+    applyZoom();
+}
+
+function zoomInEvent() {
+    zoom = parseFloat(zoom) + parseFloat(increment);
+    zoom = parseFloat(zoom).toFixed(2);
+    showInfoMessage("<i class='fas fa-search-plus'></i>" + space  + zoom);
+    applyZoom();
+}
+
+function showInfoMessage(msg){
+    $('#logstreamInformationSection').empty().show().html(msg).delay(3000).fadeOut(300);
+}
+
+function followLogEvent() {
+    logScrolling = !logScrolling;
+    applyFollowLog();
+}
+
+function applyFollowLog(){
+    if (logScrolling) {
+        $("#logstreamFollowLogButtonIcon").addClass("text-success");
+        $("#logstreamFollowLogButtonIcon").addClass("fa-spin");
+        showInfoMessage("<i class='fas fa-check-circle'></i>" + space  + "Autoscroll ON");
+    }else{
+        $("#logstreamFollowLogButtonIcon").removeClass("text-success");
+        $("#logstreamFollowLogButtonIcon").removeClass("fa-spin");
+        showInfoMessage("<i class='fas fa-times-circle'></i>" + space  + "Autoscroll OFF");
+    }
+}
+
+function scrollToTop() {
+    logScrolling = false;
+}
+
+function scrollToBottom() {
+    logScrolling = true;
+}
+
+function applyFilter(){
+    filter = $("#logstreamFilterModalInput").val();
+    if(filter===""){
+        clearFilter();
+    }else{
+        logstreamCurrentFilter.innerHTML = "<span style='border-bottom: 1px dotted;'>" + filter + " <i class='fas fa-times-circle' onclick='clearFilter();'></i></span>";
+        
+        var currentlines = $("#logstreamLogTerminalText").html().split('<!-- logline -->');
+        
+        var filteredHtml = "";
+        var i;
+        for (i = 0; i < currentlines.length; i++) {
+            var htmlline = currentlines[i];
+            filteredHtml = filteredHtml + getLogLine(htmlline) + "<!-- logline -->";
+        } 
+        
+        logstreamLogTerminalText.innerHTML = "";
+        writeResponse(filteredHtml);
+    }
+    $('#logstreamFilterModal').modal('hide');
+}
+
+function getLogLine(htmlline){
+    if(filter===""){
+        return htmlline;
+    }else{
+        
+        var textline = $(htmlline).text();
+        if(textline.includes(filter)){
+            return htmlline;
+        }else{
+            return htmlline.replace('<span>', '<span class="logstreamFilteredOut">');
+        }
+    }
+}
+
+function clearFilter(){
+    filter = "";
+    $("#logstreamFilterModalInput").val("");
+    logstreamCurrentFilter.innerHTML = "";
+    
+    var currentlines = $("#logstreamLogTerminalText").html().split('<!-- logline -->');
+        
+    var filteredHtml = "";
+    var i;
+    for (i = 0; i < currentlines.length; i++) {
+        var htmlline = currentlines[i].replace('<span class="logstreamFilteredOut">', '<span>');
+        filteredHtml = filteredHtml + htmlline + "<!-- logline -->";
+    } 
+
+    logstreamLogTerminalText.innerHTML = "";
+    writeResponse(filteredHtml);
+}
+
+function getLevelIcon(level) {
+    if($('#logstreamColumnsModalLevelIconSwitch').is(":checked")){
+        level = level.toUpperCase();
+        if (level === "WARNING" || level === "WARN")
+            return "<i class='levelicon text-warning fas fa-exclamation-circle'></i>" + tab;
+        if (level === "SEVERE" || level === "ERROR")
+            return "<i class='levelicon text-danger fas fa-radiation'></i>" + tab;
+        if (level === "INFO")
+            return "<i class='levelicon text-primary fas fa-info-circle'></i>" + tab;
+        if (level === "DEBUG")
+            return "<i class='levelicon text-secondary fas fa-bug'></i>" + tab;
+
+        return "<i class='levelicon fas fa-circle'></i>" + tab;
+    }
+    return "";
+}
+
+function getHostName(hostName) {
+    if($('#logstreamColumnsModalHostNameSwitch').is(":checked")){
+        return hostName + tab;
+    }
+    return "";
+}
+
+function getSequenceNumber(sequenceNumber){
+    if($('#logstreamColumnsModalSequenceNumberSwitch').is(":checked")){
+        return "<span class='badge badge-info'>" + sequenceNumber + "</span>" + tab;   
+    }
+    return "";
+}
+
+function getDateString(timestamp){
+    if($('#logstreamColumnsModalDateSwitch').is(":checked")){
+      return timestamp.slice(0, 10) + space;
+    }
+    return "";
+}
+
+function getTimeString(timestamp){
+    if($('#logstreamColumnsModalTimeSwitch').is(":checked")){
+        return timestamp.slice(11, 23).replace(".", ",") + tab;
+    }
+    return "";
+}
+
+function getLevelText(level) {
+    if($('#logstreamColumnsModalLevelSwitch').is(":checked")){
+        level = level.toUpperCase();
+        if (level === "WARNING" || level === "WARN")
+            return "<span class='text-warning'>WARN" + space + "</span>" + tab;
+        if (level === "SEVERE" || level === "ERROR")
+            return "<span class='text-danger'>ERROR</span>" + tab;
+        if (level === "INFO")
+            return "<span class='text-primary'>INFO" + space + "</span>" + tab;
+        if (level === "DEBUG")
+            return "<span class='text-secondary'>DEBUG</span>" + tab;
+
+        return level + tab;
+    }
+    return "";
+}
+
+function getLoggerNameAbbreviated(loggerNameAbbreviated){
+    if($('#logstreamColumnsModalLoggerNameAbbreviatedSwitch').is(":checked")){
+        return "<span class='text-primary'>[" + loggerNameAbbreviated + "]</span>" + tab;
+    }
+    return "";
+}
+
+function getLoggerName(loggerName){
+    if($('#logstreamColumnsModalLoggerNameSwitch').is(":checked")){
+        return "<span class='text-primary'>[" + loggerName + "]</span>" + tab;
+    }
+    return "";
+}
+
+function getLoggerClassName(loggerClassName){
+    if($('#logstreamColumnsModalLoggerClassNameSwitch').is(":checked")){
+        return "<span class='text-info'>[" + loggerClassName + "]</span>" + tab;
+    }
+    return "";
+}
+
+function getClassFullAbbreviatedName(sourceClassNameFull, lineNumber, sourceClassNameFullShort) {
+    if($('#logstreamColumnsModalSourceClassFullAbbreviatedSwitch').is(":checked")){
+        if (isClickableClassName(sourceClassNameFull)) {
+            return makeClickableClassNameLink(sourceClassNameFull, lineNumber, sourceClassNameFullShort);
+        }
+        return "<span class='text-secondary'>[" + sourceClassNameFullShort + "]</span>" + tab;
+    }
+    return "";
+}
+
+function getFullClassName(sourceClassNameFull, lineNumber) {
+    if($('#logstreamColumnsModalSourceClassFullSwitch').is(":checked")){
+        if (isClickableClassName(sourceClassNameFull)) {
+            return makeClickableClassNameLink(sourceClassNameFull, lineNumber, sourceClassNameFull);
+        }
+        return "<span class='text-secondary'>[" + sourceClassNameFull + "]</span>" + tab;
+    }
+    return "";
+}
+
+function getClassName(sourceClassNameFull, lineNumber, className) {
+    if($('#logstreamColumnsModalSourceClassSwitch').is(":checked")){
+        if (isClickableClassName(sourceClassNameFull)) {
+            return makeClickableClassNameLink(sourceClassNameFull, lineNumber, className);
+        }
+        return "<span class='text-secondary'>[" + className + "]</span>" + tab;
+    }
+    return "";
+}
+
+function isClickableClassName(className){
+    if (className !== undefined && appClassLang(className) && ideKnown()) {
+        return true;
+    }
+    return false;
+}
+
+function makeClickableClassNameLink(className, lineNumber, display){
+    return "<a class='text-secondary clickable-app-class' onclick='openInIDE(\"" + className + "\",\"" + lineNumber + "\");'>[" + display + "]</a>" + tab;
+}
+
+function getMethodName(methodName) {
+    if($('#logstreamColumnsModalSourceMethodNameSwitch').is(":checked")){
+        return methodName + tab;
+    }
+    return "";
+}
+
+function getFileName(fileName){
+    if($('#logstreamColumnsModalSourceFileNameSwitch').is(":checked")){
+        return "<span class='text-monospace'>" + fileName + "</span>" + space;
+    }
+    return "";
+}
+
+function getLineNumber(lineNumber){
+    if($('#logstreamColumnsModalSourceLineNumberSwitch').is(":checked")){
+        return "<span class='text-monospace'>(line: " + lineNumber + ")</span>" + tab;
+    }
+    return "";
+}
+
+function getProcessId(processName, processId) {
+    if($('#logstreamColumnsModalProcessIdSwitch').is(":checked")){
+        return "<span class='text-info' data-toggle='tooltip' data-placement='top' title='Process Name: " + processName + "'>(" + processId + ")</span>" + tab;
+    }
+    return "";
+}
+
+function getProcessName(processName, processId) {
+    if($('#logstreamColumnsModalProcessNameSwitch').is(":checked")){
+        return "<span class='text-info' data-toggle='tooltip' data-placement='top' title='Process Id: " + processId + "'>(" + processName + ")</span>" + tab;
+    }
+    return "";
+}
+
+function getThreadId(threadName, threadId) {
+    if($('#logstreamColumnsModalThreadIdSwitch').is(":checked")){
+        return "<span class='text-success' data-toggle='tooltip' data-placement='top' title='Thread Name: " + threadName + "'>(" + threadId + ")</span>" + tab;
+    }
+    return "";
+}
+
+function getThreadName(threadName, threadId) {
+    if($('#logstreamColumnsModalThreadNameSwitch').is(":checked")){
+        return "<span class='text-success' data-toggle='tooltip' data-placement='top' title='Thread Id: " + threadId + "'>(" + threadName + ")</span>" + tab;
+    }
+    return "";
+}
+
+function getLogMessage(message){
+    if($('#logstreamColumnsModalMessageSwitch').is(":checked")){
+        if(message.includes("http://")){
+            message = makeLink(message, "http://");
+        }
+        if(message.includes("https://")){
+            message = makeLink(message, "https://");
+        }
+        return message;
+    }
+    return "";
+}
+
+function makeLink(message, protocol){
+    var url = message.substring(message.indexOf(protocol));
+    if(url.includes(" ")){
+        url = url.substr(0,url.indexOf(' '));
+    }
+    var link = "<a href='" + url + "' class='text-primary' target='_blank'>" + url + "</a>";
+
+    return message.replace(url, link);    
+}
+
+function enhanceStacktrace(stacktrace) {
+    var enhanceStacktrace = [];
+    var lines = stacktrace.split('\n');
+    for (var i = 0; i < lines.length; i++) {
+        var line = lines[i].trim();
+        if (line) {
+            var startWithAt = line.startsWith("at ");
+            if (!startWithAt) {
+                var parts = line.split(":");
+                line = "<b>" + parts[0] + ":</b>" + parts[1];
+            } else {
+                if(!line.includes(".zig")){
+                    var parts = line.split(" ");
+                    // Make it clickable
+                    var classMethodFileNumber = parts[1];
+                    var classMethodFileNumberSplit = classMethodFileNumber.split("(");
+                    var classMethod = classMethodFileNumberSplit[0];
+                    var fileNumber = classMethodFileNumberSplit[1];
+                    givenClassName = classMethod.substring(0, classMethod.lastIndexOf('.'));
+                    if(isClickableClassName(givenClassName)){
+                        lineNumber = fileNumber.substring(fileNumber.lastIndexOf(':') + 1, fileNumber.lastIndexOf(')'));
+                        line = "<a class='text-wrap text-danger clickable-app-class' onclick='openInIDE(\"" + givenClassName + "\",\"" + lineNumber + "\");'><b>" + line + "</b></a>";
+                    }
+                }
+                line = space + space + space + space + space + space + line;
+            }
+        }
+        enhanceStacktrace.push(line + '<br/>');
+    }
+    var newStacktrace = enhanceStacktrace.join('');
+    return "<span class=\"text-wrap text-danger\">" + newStacktrace + "</span>";
+}
+
+function writeResponse(text) {
+    var logfile = $('#logstreamLogTerminalText');
+    logfile.append(text);
+    if (logScrolling) {
+        var element = document.getElementById("logstreamLogTerminal");
+        element.scrollIntoView({block: "end"});
+    }
+    // TODO: Trim the top if it gets too big ?
+}
+
+function openSocket() {
+    // Ensures only one connection is open at a time
+    if (webSocket !== undefined && webSocket.readyState !== WebSocket.CLOSED) {
+        writeResponse("Already connected...");
+        return;
+    }
+    // Create a new instance of the websocket
+    var new_uri;
+    if (window.location.protocol === "https:") {
+        new_uri = "wss:";
+    } else {
+        new_uri = "ws:";
+    }
+    
+    new_uri += "//" + window.location.host + frameworkRootPath + streamingPath;
+    webSocket = new WebSocket(new_uri);
+
+    webSocket.onmessage = function (event) {
+        var json = JSON.parse(event.data);
+        
+        if(json.type === "logLine"){
+            messageLog(json);
+        }else if(json.type === "init"){
+            populateLoggerLevelModal(json.loggers,json.levels);
+        }
+    };
+
+    webSocket.onclose = function () {
+        saveSettings();
+        if (isRunning) {
+            stopLog();
+        }
+        writeResponse("Connection closed<br/>");
+    };
+
+    function messageLog(json) {
+        
+        var timestamp = new Date(json.timestamp);
+        var level = json.level;
+        var isoDateTime = new Date(timestamp.getTime() - (timestamp.getTimezoneOffset() * 60000)).toISOString();
+        
+        var htmlLine = "<span>" 
+                + getLevelIcon(level)
+                + getSequenceNumber(json.sequenceNumber)
+                + getHostName(json.hostName)
+                + getDateString(isoDateTime)
+                + getTimeString(isoDateTime)
+                + getLevelText(level)
+                + getLoggerNameAbbreviated(json.loggerNameShort)
+                + getLoggerName(json.loggerName)
+                + getLoggerClassName(json.loggerClassName)        
+                + getClassFullAbbreviatedName(json.sourceClassNameFull, json.sourceLineNumber,json.sourceClassNameFullShort)
+                + getFullClassName(json.sourceClassNameFull,json.sourceLineNumber)
+                + getClassName(json.sourceClassNameFull,json.sourceLineNumber,json.sourceClassName)
+                + getMethodName(json.sourceMethodName)
+                + getFileName(json.sourceFileName)
+                + getLineNumber(json.sourceLineNumber)
+                + getProcessId(json.processName, json.processId)
+                + getProcessName(json.processName, json.ProcessId)
+                + getThreadId(json.threadName, json.threadId)
+                + getThreadName(json.threadName, json.threadId)
+                + getLogMessage(json.formattedMessage) + "<br/>";
+                
+        if (json.stacktrace) {
+            for (var i in json.stacktrace) {
+                var stacktrace = enhanceStacktrace(json.stacktrace[i]);
+                htmlLine = htmlLine + stacktrace;
+            }
+        }
+        
+        htmlLine = htmlLine + "</span><!-- logline -->";
+        
+        if(filter!=""){
+            writeResponse(getLogLine(htmlLine));
+        }else{
+            writeResponse(htmlLine);
+        }   
+    }
+}
+
+function closeSocket() {
+    webSocket.close();
+}
+
+function populateLoggerLevelModal(loggerNamesArray, levelNamesArray){
+    var tbodyLevels = $('#logstreamLogLevelsModalTableBody');
+    
+    // Populate the dropdown
+    for (var i = 0; i < loggerNamesArray.length; i++) {
+        var row = "<tr><td id='" + createLevelRowId(loggerNamesArray[i].name) + "' class=" + getTextClass(loggerNamesArray[i].effectiveLevel) + ">" + loggerNamesArray[i].name + "</td><td>" + createDropdown(loggerNamesArray[i].name, loggerNamesArray[i].effectiveLevel,levelNamesArray) + "</td></tr>";
+        tbodyLevels.append(row);
+    }
+    
+    $('select').on('change', function() {
+        changeLogLevel(this.value, $(this).find('option:selected').text());
+    });
+    
+    populated = true;
+}
+
+function createLevelRowId(logger){
+    var name = logger + "_row";
+    return name.replaceAll(".", "_");
+}
+
+function getTextClass(level){
+    level = level.toUpperCase();
+    if (level === "WARNING" || level === "WARN")
+        return "text-warning";
+    if (level === "SEVERE" || level === "ERROR")
+        return "text-danger";
+    if (level === "INFO")
+        return "text-primary";
+    if (level === "DEBUG")
+        return "text-secondary";
+
+    return "";
+}
+
+function createDropdown(name, level, levelNamesArray){
+    
+    var dd = "<select class='custom-select custom-select-sm'>";
+    // Populate the dropdown
+    for (var i = 0; i < levelNamesArray.length; i++) {
+        var selected = "";
+        if(level === levelNamesArray[i]){
+            selected = "selected";
+        }
+        dd = dd + "<option " + selected + " value='" + name + "'>" + levelNamesArray[i] +"</option>";
+    }
+    dd = dd + "</select>";
+    
+    return dd;
+}
+
+function changeLogLevel(val,text){
+    webSocket.send("update|" + val + "|" + text);
+    // Also change the style of the row
+    var id = createLevelRowId(val);
+    $('#' + id).removeClass();
+    $('#' + id).addClass(getTextClass(text));    
+}
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/index.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/index.html
new file mode 100644
index 0000000000000..676fe54069c72
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/index.html
@@ -0,0 +1,36 @@
+{#include main}
+  {#title}Dev UI{/title}
+  {#body}
+   <div class="cards-index">
+   <div class="row row-cols-1 row-cols-md-4">
+   <div class="col mb-4">
+       <div class="card h-100 shadow">
+           <div class="card-header bg-primary text-light">
+               Configuration 
+               <a href="https://quarkus.io/guides/config" class="text-light float-right" title="Guide">
+                   <i class="fa fa-book"></i>
+               </a>
+           </div>
+           <div class="card-body">
+               <p class="card-text">
+                   <a href="io.quarkus.quarkus-vertx-http/config" class="badge badge-light">
+                   <i class="fa fa-edit fa-fw"></i>
+                   Config Editor</a>
+               </p>
+           </div>
+       </div>
+   </div>
+   {#each actionableExtensions}
+       {#actionableExtension it/}
+   {/each}
+   </div>
+   {#if nonActionableExtensions.size() > 0}
+   <hr/>
+   <div class="row row-cols-1 row-cols-md-4">
+   {#each nonActionableExtensions}
+       {#nonActionableExtension it/}
+   {/each}
+   {/if}
+   </div>
+  {/body}
+{/include}
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html
new file mode 100644
index 0000000000000..366de87aa28a9
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html
@@ -0,0 +1,162 @@
+{#include main fluid=true}
+{#style}
+table {
+    table-layout:fixed;
+    width:100%;
+}
+
+td {
+  word-wrap:break-word;
+  word-break:break-all;
+}
+
+#tables{
+    padding-bottom: 40px;
+}
+
+.formInputButton:hover {
+    color: #3366ac !important;
+    cursor: pointer;
+}
+
+#filterInputGroup {
+    padding-bottom: 10px;
+}
+{/style}
+
+{#script}
+$(document).ready(function(){    
+  $("#filterInput").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $(".configTable tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+
+  $(".configInput").on("keyup", function(event) {
+    event.preventDefault();
+    if (event.keyCode === 13) {
+        event.preventDefault();
+        changeInputValue(event.target.id);
+    }
+  });
+
+  $(function () {
+    $('[data-toggle="tooltip"]').tooltip()
+  });
+
+});
+
+function clearFilterInput(){
+    $("#filterInput").val("");
+    $(".configTable tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf("") > -1)
+    });
+}
+
+function changeInputValue(name){
+    var $el = $("input[id='" + name + "']");
+    var $tr = $("tr[id='tr-" + name + "']");
+    
+    var value = $el.val();
+    $.post("",
+        {
+          name: name,
+          value: value
+        },
+        function(data, status){
+            if(status === "success"){
+                changeBackgroundColor("#76be6b", $el);
+                
+                $('#configTable1 tr:last').after($tr);
+                
+            }else{
+                changeBackgroundColor("#ff6366", $el);
+            }
+        });
+
+}
+
+function changeBackgroundColor(color, element){
+    var x = 3000;
+    var originalColor = element.css("background");
+
+    element.css("background", color);
+        setTimeout(function(){
+        element.css("background", originalColor);
+    }, x);
+}
+
+{/script}
+
+{#title}Config Editor{/title}
+{#body}
+
+<!-- Filter input -->
+<div id="filterInputGroup" class="input-group">
+    <div class="input-group-prepend">
+        <span class="input-group-text" id="filterInputPrepend"><i class="fas fa-filter"></i></span>
+    </div>
+    <input id="filterInput" type="text" class="form-control" aria-describedby="filterInputPrepend" placeholder="Search...">
+    <div class="input-group-append">
+        <span class="input-group-text formInputButton" onclick="clearFilterInput();"><i class="fas fa-times"></i></span> 
+    </div>
+</div>
+
+<div id="tables" class="table-responsive">
+    <table class="table">
+        <thead class="thead-dark">
+            <tr>
+                <th scope="col">Property</th>
+                <th scope="col">Value</th>
+                <th scope="col">Description</th>
+            </tr>
+        </thead>
+    </table>
+    
+    {#for configsource in info:config}
+
+    <div class="card">
+        <div class="card-header bg-primary text-light">
+            <h5>
+                {configsource.key}
+            </h5>
+        </div>
+        
+        <table id="configTable{count}" class="table">
+
+            <tbody class="configTable">
+
+                {#for item in configsource.value}
+                <tr id="tr-{item.configValue.name}">
+
+                    <td>
+                        {item.configValue.name}
+                    </td>
+                    <td>
+                        {#if configsource.key.editable}
+                        <div class="input-group" {#if item.defaultValue}data-toggle="tooltip" data-placement="top" title="Default value: {item.defaultValue}"{/if}>
+                            <input id="{item.configValue.name}" type="text" name="value" class="form-control configInput" value="{item.configValue.value}"/>
+                            <div class="input-group-append">
+                                <span class="input-group-text formInputButton" onclick="changeInputValue('{item.configValue.name}');"><i class="fas fa-check text-success"></i></span>
+                            </div>
+                        </div>
+                        {#else}
+                            {item.configValue.value}
+                        {/if}
+                    </td>
+                    <td>
+                        {#if item.description.fmtJavadoc && item.description.fmtJavadoc != 'NOT_FOUND'}
+                            {item.description.fmtJavadoc}
+                        {/if}    
+                    </td>
+                </tr>
+                {/for}
+            </tbody>
+        </table>
+    </div>
+    {/for}
+</div>
+
+{/body}
+{/include}
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanager.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanager.html
new file mode 100644
index 0000000000000..098cf170b15d5
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanager.html
@@ -0,0 +1,214 @@
+<div id="logstreamFooter" class="footer fixed-bottom">
+    <button id="logstreamViewLogButton" type="button" class="btn float-right" onclick="showLog();">
+        <i id="logstreamViewLogButtonIcon" class="fas fa-caret-up fa-lg" data-toggle='tooltip' data-placement='left' title='Show Log'></i>
+    </button>
+
+    <div id="logstreamManager">
+        <nav id="logstreamManagerNav" class="navbar position-sticky navbar-expand-lg navbar-dark bg-dark">
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#logstreamManagerNavText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="logstreamManagerNavText">
+                <ul class="navbar-nav mr-auto">
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Stop log stream">
+                        <a id="logstreamStopStartButton" class="logstreamIcon nav-link"><i class="fas fa-stop"></i></a>
+                    </li>
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Clear log">
+                        <a id="logstreamClearLogButton" class="logstreamIcon nav-link"><i class="fas fa-trash-alt"></i></a>
+                    </li>
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Zoom out">
+                        <a id="logstreamZoomOutButton" class="logstreamIcon nav-link"><i class="fas fa-search-minus"></i></a>
+                    </li>
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Zoom in">
+                        <a id="logstreamZoomInButton" class="logstreamIcon nav-link"><i class="fas fa-search-plus"></i></a>
+                    </li>
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Log levels">
+                        <a id="logstreamLogLevelsButton" class="logstreamIcon nav-link" data-toggle="modal" data-target="#logstreamLogLevelsModal"><i class="fas fa-layer-group"></i></a>
+                    </li>
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Columns">
+                        <a id="logstreamColumnsButton" class="logstreamIcon nav-link" data-toggle="modal" data-target="#logstreamColumnsModal"><i class="fas fa-columns"></i></a>
+                    </li>
+                    <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Filter">
+                        <a id="logstreamFilterButton" class="logstreamIcon nav-link" data-toggle="modal" data-target="#logstreamFilterModal"><i class="fas fa-filter"></i></a>
+                    </li>
+                    <li id="logstreamCurrentFilter" class="navbar-text">
+                    </li>
+                    <li id="logstreamResizeButton" class="nav-item"><a class="nav-link"><i class="fas fa-arrows-alt-v"></i></a></li>
+                    <li id="logstreamHideLogButton" class="nav-item" data-toggle="tooltip" data-placement="left" title="Hide Log"><a class="logstreamIcon nav-link" onclick="hideLog();"><i class="fas fa-caret-down fa-lg"></i></a></li>
+                </ul>
+            </div>
+        </nav>
+
+        <div id="logstreamManagerLog">
+            <a id="logstreamInformationSection"></a>
+            <a id="logstreamFollowLogButton" data-toggle="tooltip" data-placement="left" title="Follow log (auto scroll)"><i id="logstreamFollowLogButtonIcon" class="text-success fas fa-circle-notch fa-spin"></i></a>
+            <div id="logstreamLogTerminal" class="bg-dark text-light ">
+                <samp id="logstreamLogTerminalText" class="text-wrap">
+                </samp>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+
+<!-- Filter -->
+<div class="modal fade" id="logstreamFilterModal" tabindex="-1" aria-labelledby="logstreamFilterModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog modal-dialog-centered modal-sl">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="logstreamFilterModalLabel">Filter</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text" id="logstreamFilterModalInputIcon"><i class="fas fa-filter"></i></span>
+                    </div>
+                    <input id="logstreamFilterModalInput" type="text" class="form-control" placeholder="Filter log" aria-label="Filter" aria-describedby="logstreamFilterModalInputIcon">
+                    <div class="input-group-append">
+                        <button id="logstreamFilterModalInputButton" type="button" class="btn btn-success">Apply</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Levels -->
+<div class="modal fade" id="logstreamLogLevelsModal" tabindex="-1" aria-labelledby="logstreamLogLevelsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="logstreamLogLevelsModalLabel">Log Levels</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <table class="table table-hover table-sm">
+                    <tbody id="logstreamLogLevelsModalTableBody">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Columns -->
+<div class="modal fade" id="logstreamColumnsModal" tabindex="-1" aria-labelledby="logstreamColumnsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-sm">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="logstreamColumnsModalLabel">Columns</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalLevelIconSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLevelIconSwitch">Log Level Icon</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSequenceNumberSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSequenceNumberSwitch">Sequence Number</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalHostNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalHostNameSwitch">Host Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalDateSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalDateSwitch">Date</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalTimeSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalTimeSwitch">Time</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalLevelSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLevelSwitch">Log Level</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalLoggerNameAbbreviatedSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLoggerNameAbbreviatedSwitch">Logger Name (Abbreviated)</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalLoggerNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLoggerNameSwitch">Logger Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalLoggerClassNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLoggerClassNameSwitch">Logger Class Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceClassFullAbbreviatedSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceClassFullAbbreviatedSwitch">Full Class Name (Abbreviated)</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceClassFullSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceClassFullSwitch">Full Class Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceClassSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceClassSwitch">Class Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceMethodNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceMethodNameSwitch">Method Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceFileNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceFileNameSwitch">File Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceLineNumberSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceLineNumberSwitch">Line Number</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalProcessIdSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalProcessIdSwitch">Process Id</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalProcessNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalProcessNameSwitch">Process Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalThreadIdSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalThreadIdSwitch">Thread Id</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalThreadNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalThreadNameSwitch">Thread Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalMessageSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalMessageSwitch">Log message</label>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerLog.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerLog.html
new file mode 100644
index 0000000000000..d0b4df6ebc237
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerLog.html
@@ -0,0 +1,8 @@
+<div id="logstreamManagerLog">
+    <a id="logstreamInformationSection"></a>
+    <a id="logstreamFollowLogButton" data-toggle="tooltip" data-placement="left" title="Follow log (auto scroll)"><i id="logstreamFollowLogButtonIcon" class="text-success fas fa-circle-notch fa-spin"></i></a>
+    <div id="logstreamLogTerminal" class="bg-dark text-light ">
+        <samp id="logstreamLogTerminalText" class="text-wrap">
+        </samp>
+    </div>
+</div>
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerModals.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerModals.html
new file mode 100644
index 0000000000000..9acc9f907811b
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerModals.html
@@ -0,0 +1,160 @@
+<!-- Filter -->
+<div class="modal fade" id="logstreamFilterModal" tabindex="-1" aria-labelledby="logstreamFilterModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog modal-dialog-centered modal-sl">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="logstreamFilterModalLabel">Filter</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text" id="logstreamFilterModalInputIcon"><i class="fas fa-filter"></i></span>
+                    </div>
+                    <input id="logstreamFilterModalInput" type="text" class="form-control" placeholder="Filter log" aria-label="Filter" aria-describedby="logstreamFilterModalInputIcon">
+                    <div class="input-group-append">
+                        <button id="logstreamFilterModalInputButton" type="button" class="btn btn-success">Apply</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Levels -->
+<div class="modal fade" id="logstreamLogLevelsModal" tabindex="-1" aria-labelledby="logstreamLogLevelsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable modal-xl">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="logstreamLogLevelsModalLabel">Log Levels</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <table class="table table-hover table-sm">
+                    <tbody id="logstreamLogLevelsModalTableBody">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Columns -->
+<div class="modal fade" id="logstreamColumnsModal" tabindex="-1" aria-labelledby="logstreamColumnsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-sm">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="logstreamColumnsModalLabel">Columns</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalLevelIconSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLevelIconSwitch">Log Level Icon</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSequenceNumberSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSequenceNumberSwitch">Sequence Number</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalHostNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalHostNameSwitch">Host Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalDateSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalDateSwitch">Date</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalTimeSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalTimeSwitch">Time</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalLevelSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLevelSwitch">Log Level</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalLoggerNameAbbreviatedSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLoggerNameAbbreviatedSwitch">Logger Name (Abbreviated)</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalLoggerNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLoggerNameSwitch">Logger Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalLoggerClassNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalLoggerClassNameSwitch">Logger Class Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceClassFullAbbreviatedSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceClassFullAbbreviatedSwitch">Full Class Name (Abbreviated)</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceClassFullSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceClassFullSwitch">Full Class Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceClassSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceClassSwitch">Class Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceMethodNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceMethodNameSwitch">Method Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceFileNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceFileNameSwitch">File Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalSourceLineNumberSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalSourceLineNumberSwitch">Line Number</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalProcessIdSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalProcessIdSwitch">Process Id</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalProcessNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalProcessNameSwitch">Process Name</label>
+                </div>
+                
+                <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="logstreamColumnsModalThreadIdSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalThreadIdSwitch">Thread Id</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalThreadNameSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalThreadNameSwitch">Thread Name</label>
+                </div>
+
+                <div class="custom-control custom-switch">
+                    <input checked type="checkbox" class="custom-control-input" id="logstreamColumnsModalMessageSwitch">
+                    <label class="custom-control-label" for="logstreamColumnsModalMessageSwitch">Log message</label>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerNav.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerNav.html
new file mode 100644
index 0000000000000..7aabed2c9dfee
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/logmanagerNav.html
@@ -0,0 +1,38 @@
+<nav id="logstreamManagerNav" class="navbar position-sticky navbar-expand-lg navbar-dark bg-dark">
+    <a id="logstreamManagerNavBrand" class="navbar-brand" href="">
+        <img src="{devRootAppend}/resources/images/quarkus_icon_rgb_reverse.svg" width="40" height="30" class="d-inline-block align-middle" alt="Quarkus"/>
+        <span id="navbar_title" class="align-middle">Logging manager</span>
+    </a>
+    <div class="collapse navbar-collapse" id="logstreamManagerNavText">
+        <ul class="navbar-nav mr-auto">
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Stop log stream">
+                <a id="logstreamStopStartButton" class="logstreamIcon nav-link"><i class="fas fa-stop"></i></a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Clear log">
+                <a id="logstreamClearLogButton" class="logstreamIcon nav-link"><i class="fas fa-trash-alt"></i></a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Zoom out">
+                <a id="logstreamZoomOutButton" class="logstreamIcon nav-link"><i class="fas fa-search-minus"></i></a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Zoom in">
+                <a id="logstreamZoomInButton" class="logstreamIcon nav-link"><i class="fas fa-search-plus"></i></a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Log levels">
+                <a id="logstreamLogLevelsButton" class="logstreamIcon nav-link" data-toggle="modal" data-target="#logstreamLogLevelsModal"><i class="fas fa-layer-group"></i></a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Columns">
+                <a id="logstreamColumnsButton" class="logstreamIcon nav-link" data-toggle="modal" data-target="#logstreamColumnsModal"><i class="fas fa-columns"></i></a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="Filter">
+                <a id="logstreamFilterButton" class="logstreamIcon nav-link" data-toggle="modal" data-target="#logstreamFilterModal"><i class="fas fa-filter"></i></a>
+            </li>
+            <li id="logstreamCurrentFilter" class="navbar-text">
+            </li>
+            <li id="logstreamResizeButton" class="nav-item"><a class="nav-link"><i class="fas fa-arrows-alt-v"></i></a></li>
+            <li id="logstreamHideLogButton" class="nav-item" data-toggle="tooltip" data-placement="left" title="Hide Log"><a class="logstreamIcon nav-link" onclick="hideLog();"><i class="fas fa-caret-down fa-lg"></i></a></li>
+        </ul>
+    </div>
+    <span id="logstreamManagerNavAppInfo" class="navbar-text">
+      {applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion})
+    </span>
+</nav> 
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html
new file mode 100644
index 0000000000000..88832d3a76bb2
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <!-- Required meta tags -->
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+  <!-- Bootstrap CSS -->
+  <link rel="stylesheet" href="{devRootAppend}/resources/css/bootstrap.min.css">
+  <link rel="stylesheet" href="{devRootAppend}/resources/fontawesome/css/all.min.css">
+  <link rel="stylesheet" href="{devRootAppend}/resources/css/dev-console.css?2">
+  <link rel="stylesheet" href="{devRootAppend}/resources/css/logstream.css">
+  
+  <link rel="shortcut icon" type="image/png" href="{devRootAppend}/resources/images/favicon.ico" >
+  
+  <style>
+  {#insert style/}
+  </style>
+  
+  <title>
+    {#if currentExtensionName && currentExtensionName != 'Eclipse Vert.x - HTTP'}
+      {currentExtensionName} ›
+    {/if}
+    {#insert title/}
+    {#if applicationName and applicationVersion} | {applicationName} {applicationVersion}{/if}
+  </title>
+ </head>
+ <body>
+  
+  <nav class="navbar sticky-top navbar-dark bg-dark">
+    <a class="navbar-brand" href="{devRootAppend}/">
+      <img src="{devRootAppend}/resources/images/quarkus_icon_rgb_reverse.svg" width="40" height="30" class="d-inline-block align-middle" alt="Quarkus"/>
+      <span id="navbar-title" class="align-middle">Dev UI</span>
+    </a>
+    {#if currentExtensionName}
+    <span id="navbar-subtitle" class="navbar-nav">
+      <span class="navbar-item">
+      {#if currentExtensionName == 'Eclipse Vert.x - HTTP'}
+        <i class="fas fa-chevron-right fa-sm breadcrumb-separator"></i> {#insert title/}
+      {#else}
+        <i class="fas fa-chevron-right fa-sm breadcrumb-separator"></i> {currentExtensionName} <i class="fas fa-chevron-right fa-sm breadcrumb-separator"></i> {#insert title/}
+      {/if}
+      </span>
+    </span>   
+    {/}  
+    <span class="navbar-text">
+      {#if applicationName and applicationVersion}{applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion}){/if}
+    </span>
+  </nav>
+
+  <div class="container{#if fluid}-fluid{/if} main-container">
+    
+   {#if flash['message']}
+     <div class="alert alert-{flash['message']['class']} show fade" role="alert" data-timer="{flash['displayTime']}">
+      {flash['message']['text']}
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+     </div>
+   {/if}
+   {#insert body/}
+  </div>
+
+    <div id="logstreamFooter" class="footer fixed-bottom">
+
+    <button id="logstreamViewLogButton" type="button" class="btn float-right" onclick="showLog();">
+        <i id="logstreamViewLogButtonIcon" class="fas fa-caret-up fa-lg" data-toggle='tooltip' data-placement='left' title='Show Log'></i>
+    </button>
+    <div id="logstreamManager">
+        {#include logmanagerNav}{/include}
+        {#include logmanagerLog}{/include}
+    </div>
+  </div>
+  {#include logmanagerModals}{/include}
+
+  <script src="{devRootAppend}/resources/js/jquery.min.js"></script>
+  <script src="{devRootAppend}/resources/js/bootstrap.bundle.min.js"></script>
+  <script src="{devRootAppend}/resources/js/logstream.js"></script>
+  <script>
+  {|
+    if (jQuery(".alert").length) {
+     // dismiss alert
+     jQuery(function() {
+       window.setTimeout(function(){
+         jQuery(".alert").alert("close");
+       }, jQuery(".alert").data("timer"));
+     });
+    }
+  |}
+    var sourceMap = \{\};
+  {#for sourcePackageEntry in ideInfo:sourcePackages}
+    var {sourcePackageEntry.key}Packages = [];
+    {#for rootPackage in sourcePackageEntry.value}
+    {sourcePackageEntry.key}Packages.push("{rootPackage}")
+    {/for}
+    sourceMap["{sourcePackageEntry.key}"] = {sourcePackageEntry.key}Packages;
+  {/for}
+
+    var srcMainPath = "{ideInfo:srcMainPath}";
+    var ideLinkType = "{ideInfo:ideLinkType}";
+    var ideClientLinkFormat = "{ideInfo:ideClientLinkFormat}";
+    var ideServerLinkEndpoint = "{ideInfo:ideServerLinkEndpoint}";
+    var devRootAppend = "{devRootAppend}";
+
+  {|
+
+    var langToExt = {"java": "java", "kotlin": "kt"};
+
+    function ideKnown() {
+      return (ideLinkType == "client") || (ideLinkType == "server");
+    }
+
+    // if the class is an application class, return the source language it was written in
+    // or null if the class is not an application class
+    function appClassLang(className) {
+      for (var key in sourceMap){
+        if (sourceMap.hasOwnProperty(key)) {
+          var packages = sourceMap[key];
+          for (var i = 0; i < packages.length; i++) {
+            if (className.startsWith(packages[i] + ".")) {
+              return key;
+            }
+          }
+        }
+      }
+      return null;
+    }
+
+    function openInIDE(className, line) {
+      var lang = appClassLang(className);
+      if (lang == null) {
+        console.error("Unable to determine file name of class: '" + className + "'");
+        return;
+      }
+      var fileName = className.replaceAll(".", "/") + "." + langToExt[lang];
+      if (ideLinkType == "client") {
+        var location = ideClientLinkFormat.replace("{0}", srcMainPath + "/" + lang + "/" + fileName);
+        if (line) {
+           location = location.replace("{1}", line);
+        } else {
+            location = location.replace(":{1}", "");
+        }
+        window.location = location;
+        return;
+      } else if (ideLinkType == "server") {
+
+        var fd = new FormData();
+        fd.append('className', className);
+        fd.append('lang', lang);
+        fd.append('srcMainPath', srcMainPath);
+        if (line) {
+         fd.append('line', line);
+        }
+
+        $.ajax({
+          url: window.location.protocol + "//" + window.location.host + devRootAppend + ideServerLinkEndpoint,
+          data: fd,
+          processData: false,
+          contentType: false,
+          type: 'POST'
+        }).fail(function() {
+            console.error("Unable to open class: '" + className + "' in the IDE. See server logs for more information");
+        });
+      } else {
+         console.error("Unknown IDE link type: " + ideLinkType);
+      }
+    }
+  |}
+
+  {#insert script /}
+  </script>
+ </body>
+</html>
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/actionableExtension.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/actionableExtension.html
new file mode 100644
index 0000000000000..f3300eee5f8c7
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/actionableExtension.html
@@ -0,0 +1,22 @@
+<div class="col mb-4">
+    <div class="card h-100 shadow">
+        <div class="card-header bg-primary text-light">
+            {it['name']}
+            {#if it['metadata'] && it['metadata']['guide']}
+            <a href="{it['metadata']['guide']}" class="text-light float-right" title="Guide"><i class="fa fa-book"></i></a>
+            {/if}
+        </div>
+        <div class="card-body">
+            <p class="card-text">
+                {#if it['metadata'] && it['metadata']['status'] == 'experimental'}
+                <span class="float-right badge badge-warning">EXPERIMENTAL</span>
+                {/if}
+                <span class="card-subtitle mb-2 text-muted">{it['description']}</span>
+                <br/>
+                {#if it['_dev']}
+                {it['_dev'].raw}
+                {/if}
+            </p>
+        </div>
+    </div>
+</div>
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html
new file mode 100644
index 0000000000000..44ddffadb4575
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html
@@ -0,0 +1,24 @@
+{#if it['metadata'] && it['metadata']['unlisted'] != true}
+<div class="col mb-4">
+    <div class="card h-100">
+        <div class="card-header">
+            {it['name']}
+            {#if it['metadata'] && it['metadata']['guide']}
+            <a href="{it['metadata']['guide']}" class="text-muted float-right" title="Guide"><i class="fa fa-book"></i></a>
+            {/if}
+        </div>
+        <div class="card-body">
+            <p class="card-text">
+                {#if it['metadata'] && it['metadata']['status'] == 'experimental'}
+                <span class="float-right badge badge-warning">EXPERIMENTAL</span>
+                {/if}
+                <span class="card-subtitle mb-2 text-muted">{it['description']}</span>
+                <br/>
+                {#if it['_dev']}
+                {it['_dev'].raw}
+                {/if}
+            </p>
+        </div>
+    </div>
+</div>
+{/if}
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java
new file mode 100644
index 0000000000000..c41f8441dc8c2
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/BadRequestTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.vertx.http;
+
+import java.net.Socket;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.deployment.util.IoUtil;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class BadRequestTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @TestHTTPResource
+    URI uri;
+
+    @Test
+    public void test() throws Exception {
+        //we need to manually send a bad request
+        //most clients will escape a bad request for you
+        try (Socket s = new Socket(uri.getHost(), uri.getPort())) {
+            s.getOutputStream().write("GET /foo?name=Iva%n HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n"
+                    .getBytes(StandardCharsets.UTF_8));
+            String result = new String(IoUtil.readBytes(s.getInputStream()), StandardCharsets.UTF_8);
+            Assertions.assertTrue(result.contains("HTTP/1.1 400 Bad Request\r\n"));
+        }
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java
new file mode 100644
index 0000000000000..4384a442e9986
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/CompressionTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.vertx.http;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.vertx.ext.web.Router;
+
+public class CompressionTest {
+    private static final String APP_PROPS = "" +
+            "quarkus.http.enable-compression=true\n";
+
+    static String longString;
+    static {
+
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 1000; ++i) {
+            sb.append("Hello World;");
+        }
+        longString = sb.toString();
+    }
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties")
+                    .addClasses(BeanRegisteringRouteUsingObserves.class));
+
+    @Test
+    public void test() throws Exception {
+        // RestAssured is aware of quarkus.http.root-path
+        // If this changes then please modify quarkus-azure-functions-http maven archetype to reflect this
+        // in its test classes
+        RestAssured.given().get("/compress").then().statusCode(200)
+                .header("content-encoding", "gzip")
+                .header("content-length", Matchers.not(Matchers.equalTo(Integer.toString(longString.length()))))
+                .body(Matchers.equalTo(longString));
+
+        RestAssured.given().get("/nocompress").then().statusCode(200)
+                .header("content-encoding", "identity")
+                .header("content-length", Matchers.equalTo(Integer.toString(longString.length())))
+                .body(Matchers.equalTo(longString));
+    }
+
+    @ApplicationScoped
+    static class BeanRegisteringRouteUsingObserves {
+
+        public void register(@Observes Router router) {
+
+            router.route("/compress").handler(rc -> {
+                rc.response().end(longString);
+            });
+            router.route("/nocompress").handler(rc -> {
+                rc.response().headers().set("content-encoding", "identity");
+                rc.response().end(longString);
+            });
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java
index 42436f95513c9..8a6582fc7095c 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ConfigureForwardedHeadersTest.java
@@ -18,7 +18,7 @@ public class ConfigureForwardedHeadersTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(ForwardedHandlerInitializer.class)
-                    .addAsResource(new StringAsset("quarkus.http.proxy-address-forwarding=true\n" +
+                    .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
                             "quarkus.http.proxy.enable-forwarded-host=true\n" +
                             "quarkus.http.proxy.enable-forwarded-prefix=true\n" +
                             "quarkus.http.proxy.forwarded-host-header=X-Forwarded-Server\n" +
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedForHeaderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedForHeaderTest.java
index 03744af1bca42..d06e24b4066db 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedForHeaderTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedForHeaderTest.java
@@ -16,23 +16,93 @@ public class ForwardedForHeaderTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(ForwardedHandlerInitializer.class)
-                    .addAsResource(new StringAsset("quarkus.http.proxy-address-forwarding=true\n" +
-                            "quarkus.http.proxy.enable-forwarded-host=true\n"),
-                            "application.properties"));
+            .setArchiveProducer(
+                    () -> ShrinkWrap.create(JavaArchive.class).addClasses(ForwardedHandlerInitializer.class)
+                            .addAsResource(
+                                    new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n"
+                                            + "quarkus.http.proxy.enable-forwarded-host=true\n"),
+                                    "application.properties"));
 
     @Test
     public void test() {
         assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
 
-        RestAssured.given()
-                .header("X-Forwarded-Proto", "https")
-                .header("X-Forwarded-For", "backend:4444")
-                .header("X-Forwarded-Host", "somehost")
-                .get("/forward")
-                .then()
+        RestAssured.given().header("X-Forwarded-Proto", "https").header("X-Forwarded-For", "backend:4444")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
                 .body(Matchers.equalTo("https|somehost|backend:4444"));
     }
 
+    @Test
+    public void testIPV4WithPort() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https").header("X-Forwarded-For", "192.168.42.123:4444")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
+                .body(Matchers.equalTo("https|somehost|192.168.42.123:4444"));
+    }
+
+    @Test
+    public void testIPV4NoPort() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https").header("X-Forwarded-For", "192.168.42.123")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
+                .body(Matchers.containsString("192.168.42.123"));
+    }
+
+    @Test
+    public void testIPV6() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https")
+                .header("X-Forwarded-For", "2001:db8:85a3:8d3:1319:8a2e:370:12").header("X-Forwarded-Host", "somehost")
+                .get("/forward").then().body(Matchers.containsString("2001:db8:85a3:8d3:1319:8a2e:370:12"));
+    }
+
+    @Test
+    public void testIPV6HexEnding() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https")
+                .header("X-Forwarded-For", "2001:db8:85a3:8d3:1319:8a2e:370:ac").header("X-Forwarded-Host", "somehost")
+                .get("/forward").then().body(Matchers.containsString("2001:db8:85a3:8d3:1319:8a2e:370:ac"));
+    }
+
+    @Test
+    public void testIPV6Compressed() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https").header("X-Forwarded-For", "2001:db8:85a3::12")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
+                .body(Matchers.containsString("2001:db8:85a3::12"));
+    }
+
+    @Test
+    public void testIPV6AnotherCompressed() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https").header("X-Forwarded-For", "2001:db8:85a3::")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
+                .body(Matchers.containsString("2001:db8:85a3::"));
+    }
+
+    @Test
+    public void testIPV6WithPort() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https")
+                .header("X-Forwarded-For", "[2001:db8:85a3:8d3:1319:8a2e:370:ac]:101")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
+                .body(Matchers.containsString("[2001:db8:85a3:8d3:1319:8a2e:370:ac]:101"));
+    }
+
+    @Test
+    public void testIPV6CompressedWithPort() {
+        assertThat(RestAssured.get("/forward").asString()).startsWith("http|");
+
+        RestAssured.given().header("X-Forwarded-Proto", "https").header("X-Forwarded-For", "[2001:db8:85a3:8d3::]:101")
+                .header("X-Forwarded-Host", "somehost").get("/forward").then()
+                .body(Matchers.containsString("[2001:db8:85a3:8d3::]:101"));
+    }
+
 }
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java
index 94c03833f6d0d..7d55203cbdc0a 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedHeaderTest.java
@@ -18,8 +18,8 @@ public class ForwardedHeaderTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(ForwardedHandlerInitializer.class)
-                    .addAsResource(new StringAsset("quarkus.http.proxy-address-forwarding=true\n" +
-                            "quarkus.http.allow-forwarded=true"),
+                    .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
+                            "quarkus.http.proxy.allow-forwarded=true"),
                             "application.properties"));
 
     @Test
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java
index a90875c85e04f..3cc78596070cb 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ForwardedPrefixHeaderTest.java
@@ -18,7 +18,7 @@ public class ForwardedPrefixHeaderTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(ForwardedHandlerInitializer.class)
-                    .addAsResource(new StringAsset("quarkus.http.proxy-address-forwarding=true\n" +
+                    .addAsResource(new StringAsset("quarkus.http.proxy.proxy-address-forwarding=true\n" +
                             "quarkus.http.proxy.enable-forwarded-prefix=true\n"),
                             "application.properties"));
 
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java
new file mode 100644
index 0000000000000..b73a2bf0d103c
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationAndRootPathTest.java
@@ -0,0 +1,87 @@
+package io.quarkus.vertx.http;
+
+import java.util.function.Consumer;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Singleton;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.restassured.RestAssured;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+public class NonApplicationAndRootPathTest {
+    private static final String APP_PROPS = "" +
+            "quarkus.http.root-path=/api\n";
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties")
+                    .addClasses(MyObserver.class))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(new BuildStep() {
+                    @Override
+                    public void execute(BuildContext context) {
+                        NonApplicationRootPathBuildItem buildItem = context.consume(NonApplicationRootPathBuildItem.class);
+                        context.produce(buildItem.routeBuilder()
+                                .route("non-app-relative")
+                                .handler(new MyHandler())
+                                .blockingRoute()
+                                .requiresLegacyRedirect()
+                                .build());
+                    }
+                }).produces(RouteBuildItem.class)
+                        .consumes(NonApplicationRootPathBuildItem.class)
+                        .build();
+            }
+        };
+    }
+
+    public static class MyHandler implements Handler<RoutingContext> {
+        @Override
+        public void handle(RoutingContext routingContext) {
+            routingContext.response()
+                    .setStatusCode(200)
+                    .end(routingContext.request().path());
+        }
+    }
+
+    @Test
+    public void testNonApplicationEndpointOnRootPathWithRedirect() {
+        // Note RestAssured knows the path prefix is /api
+        RestAssured.given().get("/non-app-relative").then().statusCode(200).body(Matchers.equalTo("/api/q/non-app-relative"));
+    }
+
+    @Test
+    public void testNonApplicationEndpointDirect() {
+        // Note RestAssured knows the path prefix is /api
+        RestAssured.given().get("/q/non-app-relative").then().statusCode(200).body(Matchers.equalTo("/api/q/non-app-relative"));
+    }
+
+    @Singleton
+    static class MyObserver {
+
+        void test(@Observes String event) {
+            //Do Nothing
+        }
+
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java
new file mode 100644
index 0000000000000..2873c533f58b1
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationEscapeTest.java
@@ -0,0 +1,136 @@
+package io.quarkus.vertx.http;
+
+import java.net.URL;
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.awaitility.Awaitility;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.client.HttpResponse;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.predicate.ResponsePredicate;
+
+public class NonApplicationEscapeTest {
+    private static final String APP_PROPS = "" +
+            "quarkus.http.root-path=/api\n" +
+            "quarkus.http.non-application-root-path=${quarkus.http.root-path}\n";
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties")
+                    .addClasses(MyObserver.class))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(new BuildStep() {
+                    @Override
+                    public void execute(BuildContext context) {
+                        NonApplicationRootPathBuildItem buildItem = context.consume(NonApplicationRootPathBuildItem.class);
+                        context.produce(buildItem.routeBuilder()
+                                .route("/non-app-absolute")
+                                .handler(new MyHandler())
+                                .blockingRoute()
+                                .requiresLegacyRedirect()
+                                .build());
+                    }
+                }).produces(RouteBuildItem.class)
+                        .consumes(NonApplicationRootPathBuildItem.class)
+                        .build();
+            }
+        };
+    }
+
+    @TestHTTPResource("/")
+    URL uri;
+
+    @Inject
+    Vertx vertx;
+
+    public static class MyHandler implements Handler<RoutingContext> {
+        @Override
+        public void handle(RoutingContext routingContext) {
+            routingContext.response()
+                    .setStatusCode(200)
+                    .end(routingContext.request().query() != null
+                            ? routingContext.request().path() + "?" + routingContext.request().query()
+                            : routingContext.request().path());
+        }
+    }
+
+    @Test
+    public void testNonApplicationEndpointEscaped() {
+        AtomicReference<String> result = new AtomicReference<>();
+
+        WebClient.create(vertx)
+                .get(uri.getPort(), uri.getHost(), "/non-app-absolute")
+                .expect(ResponsePredicate.SC_OK)
+                .send(ar -> {
+                    if (ar.succeeded()) {
+                        HttpResponse<Buffer> response = ar.result();
+                        result.set(response.bodyAsString());
+                    } else {
+                        result.set(ar.cause().getMessage());
+                    }
+                });
+
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> result.get() != null);
+
+        Assertions.assertEquals("/non-app-absolute", result.get());
+    }
+
+    @Test
+    public void testNonApplicationEndpointWithQueryEscaped() {
+        AtomicReference<String> result = new AtomicReference<>();
+
+        WebClient.create(vertx)
+                .get(uri.getPort(), uri.getHost(), "/non-app-absolute?query=true")
+                .expect(ResponsePredicate.SC_OK)
+                .send(ar -> {
+                    if (ar.succeeded()) {
+                        HttpResponse<Buffer> response = ar.result();
+                        result.set(response.bodyAsString());
+                    } else {
+                        result.set(ar.cause().getMessage());
+                    }
+                });
+
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> result.get() != null);
+
+        Assertions.assertEquals("/non-app-absolute?query=true", result.get());
+    }
+
+    @Singleton
+    static class MyObserver {
+
+        void test(@Observes String event) {
+            //Do Nothing
+        }
+
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java
new file mode 100644
index 0000000000000..3cbd535370d15
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/NonApplicationRootPathSiblingTest.java
@@ -0,0 +1,82 @@
+package io.quarkus.vertx.http;
+
+import java.util.function.Consumer;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Singleton;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.builder.BuildContext;
+import io.quarkus.builder.BuildStep;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.restassured.RestAssured;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+public class NonApplicationRootPathSiblingTest {
+    private static final String APP_PROPS = "" +
+            "quarkus.http.root-path=/api\n" +
+            "quarkus.http.non-application-root-path=${quarkus.http.root-path}";
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties")
+                    .addClasses(MyObserver.class))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    static Consumer<BuildChainBuilder> buildCustomizer() {
+        return new Consumer<BuildChainBuilder>() {
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(new BuildStep() {
+                    @Override
+                    public void execute(BuildContext context) {
+                        NonApplicationRootPathBuildItem buildItem = context.consume(NonApplicationRootPathBuildItem.class);
+                        context.produce(buildItem.routeBuilder()
+                                .route("non-app-relative")
+                                .handler(new MyHandler())
+                                .blockingRoute()
+                                .requiresLegacyRedirect()
+                                .build());
+                    }
+                }).produces(RouteBuildItem.class)
+                        .consumes(NonApplicationRootPathBuildItem.class)
+                        .build();
+            }
+        };
+    }
+
+    public static class MyHandler implements Handler<RoutingContext> {
+        @Override
+        public void handle(RoutingContext routingContext) {
+            routingContext.response()
+                    .setStatusCode(200)
+                    .end(routingContext.request().path());
+        }
+    }
+
+    @Test
+    public void testNonApplicationEndpoint() {
+        // Note RestAssured knows the path prefix is /api
+        RestAssured.given().get("/non-app-relative").then().statusCode(200).body(Matchers.equalTo("/api/non-app-relative"));
+    }
+
+    @Singleton
+    static class MyObserver {
+
+        void test(@Observes String event) {
+            //Do Nothing
+        }
+
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java
index 77cb488d53958..48dcb1ec16185 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/RandomPortTest.java
@@ -4,6 +4,11 @@
 
 import java.net.URL;
 
+import javax.enterprise.event.Observes;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.hamcrest.Matchers;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -12,14 +17,16 @@
 
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.http.TestHTTPResource;
-import io.quarkus.vertx.http.cors.BeanRegisteringRoute;
+import io.restassured.RestAssured;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
 
 public class RandomPortTest {
 
     @RegisterExtension
     static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClass(BeanRegisteringRoute.class)
                     .addAsResource(new StringAsset("quarkus.http.test-port=0"),
                             "application.properties"));
 
@@ -31,4 +38,31 @@ public void portShouldNotBeZero() {
         assertThat(url.getPort()).isNotZero();
     }
 
+    @Test
+    public void testActualPortAccessibleToApp() {
+        RestAssured.get("/test").then().body(Matchers.equalTo(Integer.toString(url.getPort())));
+        RestAssured.get("/app").then().body(Matchers.equalTo(Integer.toString(url.getPort())));
+    }
+
+    public static class AppClass {
+
+        @ConfigProperty(name = "quarkus.http.port")
+        String port;
+
+        public void route(@Observes Router router) {
+            router.route("/test").handler(new Handler<RoutingContext>() {
+                @Override
+                public void handle(RoutingContext event) {
+                    event.response().end(System.getProperty("quarkus.http.test-port"));
+                }
+            });
+            router.route("/app").handler(new Handler<RoutingContext>() {
+                @Override
+                public void handle(RoutingContext event) {
+                    event.response().end(ConfigProvider.getConfig().getValue("quarkus.http.port", String.class));
+                }
+            });
+        }
+    }
+
 }
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/accesslog/AccessLogFileTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/accesslog/AccessLogFileTestCase.java
index 3ff5beafd3ab5..978ed572b4f37 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/accesslog/AccessLogFileTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/accesslog/AccessLogFileTestCase.java
@@ -5,7 +5,7 @@
  * 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
+ *     https://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.
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSSecurityTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSSecurityTestCase.java
new file mode 100644
index 0000000000000..61978f8b7ca98
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSSecurityTestCase.java
@@ -0,0 +1,150 @@
+package io.quarkus.vertx.http.cors;
+
+import static io.restassured.RestAssured.given;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.http.security.PathHandler;
+
+public class CORSSecurityTestCase {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.cors=true\n" +
+            "quarkus.http.cors.methods=GET, OPTIONS, POST\n" +
+            "quarkus.http.auth.basic=true\n" +
+            "quarkus.http.auth.policy.r1.roles-allowed=test\n" +
+            "quarkus.http.auth.permission.roles1.paths=/test\n" +
+            "quarkus.http.auth.permission.roles1.policy=r1\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier<JavaArchive>() {
+        @Override
+        public JavaArchive get() {
+            return ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestIdentityProvider.class, TestIdentityController.class, PathHandler.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties");
+        }
+    });
+
+    @BeforeAll
+    public static void setup() {
+        TestIdentityController.resetRoles().add("test", "test", "test").add("user", "user", "user");
+    }
+
+    @Test
+    @DisplayName("Handles a preflight CORS request correctly")
+    public void corsPreflightTest() {
+        String origin = "http://custom.origin.quarkus";
+        String methods = "GET,POST";
+        String headers = "X-Custom";
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "test")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "wrongpassword")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("user", "user")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+    }
+
+    @Test
+    @DisplayName("Handles a direct CORS request correctly")
+    public void corsNoPreflightTest() {
+        String origin = "http://custom.origin.quarkus";
+        String methods = "GET,POST";
+        String headers = "X-Custom";
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .log().headers()
+                .get("/test").then()
+                .statusCode(401)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "test")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers)
+                .body(Matchers.equalTo("test:/test"));
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "wrongpassword")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(401)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("user", "user")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(403)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSWildcardSecurityTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSWildcardSecurityTestCase.java
new file mode 100644
index 0000000000000..0430e0e880130
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSWildcardSecurityTestCase.java
@@ -0,0 +1,149 @@
+package io.quarkus.vertx.http.cors;
+
+import static io.restassured.RestAssured.given;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.http.security.PathHandler;
+
+public class CORSWildcardSecurityTestCase {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.cors=true\n" +
+            "quarkus.http.auth.basic=true\n" +
+            "quarkus.http.auth.policy.r1.roles-allowed=test\n" +
+            "quarkus.http.auth.permission.roles1.paths=/test\n" +
+            "quarkus.http.auth.permission.roles1.policy=r1\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier<JavaArchive>() {
+        @Override
+        public JavaArchive get() {
+            return ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestIdentityProvider.class, TestIdentityController.class, PathHandler.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties");
+        }
+    });
+
+    @BeforeAll
+    public static void setup() {
+        TestIdentityController.resetRoles().add("test", "test", "test").add("user", "user", "user");
+    }
+
+    @Test
+    @DisplayName("Handles a preflight CORS request correctly")
+    public void corsPreflightTest() {
+        String origin = "http://custom.origin.quarkus";
+        String methods = "GET,POST";
+        String headers = "X-Custom";
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "test")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "wrongpassword")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("user", "user")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+    }
+
+    @Test
+    @DisplayName("Handles a direct CORS request correctly")
+    public void corsNoPreflightTest() {
+        String origin = "http://custom.origin.quarkus";
+        String methods = "GET,POST";
+        String headers = "X-Custom";
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .log().headers()
+                .get("/test").then()
+                .statusCode(401)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "test")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers)
+                .body(Matchers.equalTo("test:/test"));
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "wrongpassword")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(401)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("user", "user")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(403)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSWildcardStarSecurityTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSWildcardStarSecurityTestCase.java
new file mode 100644
index 0000000000000..51498f4e75e11
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CORSWildcardStarSecurityTestCase.java
@@ -0,0 +1,153 @@
+package io.quarkus.vertx.http.cors;
+
+import static io.restassured.RestAssured.given;
+
+import java.util.function.Supplier;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.http.security.PathHandler;
+
+public class CORSWildcardStarSecurityTestCase {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.cors=true\n" +
+            "quarkus.http.cors.methods=*\n" +
+            "quarkus.http.cors.origins=*\n" +
+            "quarkus.http.cors.headers=*\n" +
+            "quarkus.http.auth.basic=true\n" +
+            "quarkus.http.auth.policy.r1.roles-allowed=test\n" +
+            "quarkus.http.auth.permission.roles1.paths=/test\n" +
+            "quarkus.http.auth.permission.roles1.policy=r1\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier<JavaArchive>() {
+        @Override
+        public JavaArchive get() {
+            return ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestIdentityProvider.class, TestIdentityController.class, PathHandler.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties");
+        }
+    });
+
+    @BeforeAll
+    public static void setup() {
+        TestIdentityController.resetRoles().add("test", "test", "test").add("user", "user", "user");
+    }
+
+    @Test
+    @DisplayName("Handles a preflight CORS request correctly")
+    public void corsPreflightTest() {
+        String origin = "http://custom.origin.quarkus";
+        String methods = "GET,POST,OPTIONS,DELETE";
+        String headers = "X-Custom,B-Custom,Test-Headers";
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "test")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "wrongpassword")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("user", "user")
+                .options("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+    }
+
+    @Test
+    @DisplayName("Handles a direct CORS request correctly")
+    public void corsNoPreflightTest() {
+        String origin = "http://custom.origin.quarkus";
+        String methods = "GET,POST,OPTIONS,DELETE";
+        String headers = "X-Custom,B-Custom,Test-Headers";
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .log().headers()
+                .get("/test").then()
+                .statusCode(401)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "test")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(200)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers)
+                .body(Matchers.equalTo("test:/test"));
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("test", "wrongpassword")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(401)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+
+        given().header("Origin", origin)
+                .header("Access-Control-Request-Method", methods)
+                .header("Access-Control-Request-Headers", headers)
+                .when()
+                .auth().basic("user", "user")
+                .log().headers()
+                .get("/test").then()
+                .statusCode(403)
+                .header("Access-Control-Allow-Origin", origin)
+                .header("Access-Control-Allow-Methods", methods)
+                .header("Access-Control-Allow-Headers", headers);
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java
deleted file mode 100644
index 9dfc1d79a04fd..0000000000000
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package io.quarkus.vertx.http.cors;
-
-import static io.restassured.RestAssured.given;
-
-import java.util.function.Supplier;
-
-import org.hamcrest.Matchers;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.security.test.utils.TestIdentityController;
-import io.quarkus.security.test.utils.TestIdentityProvider;
-import io.quarkus.test.QuarkusUnitTest;
-import io.quarkus.vertx.http.security.PathHandler;
-
-public class CoresSecurityTestCase {
-
-    private static final String APP_PROPS = "" +
-            "quarkus.http.cors=true\n" +
-            "quarkus.http.cors.methods=GET, OPTIONS, POST\n" +
-            "quarkus.http.auth.basic=true\n" +
-            "quarkus.http.auth.policy.r1.roles-allowed=test\n" +
-            "quarkus.http.auth.permission.roles1.paths=/test\n" +
-            "quarkus.http.auth.permission.roles1.policy=r1\n";
-
-    @RegisterExtension
-    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier<JavaArchive>() {
-        @Override
-        public JavaArchive get() {
-            return ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestIdentityProvider.class, TestIdentityController.class, PathHandler.class)
-                    .addAsResource(new StringAsset(APP_PROPS), "application.properties");
-        }
-    });
-
-    @BeforeAll
-    public static void setup() {
-        TestIdentityController.resetRoles().add("test", "test", "test").add("user", "user", "user");
-    }
-
-    @Test
-    @DisplayName("Handles a preflight CORS request correctly")
-    public void corsPreflightTest() {
-        String origin = "http://custom.origin.quarkus";
-        String methods = "GET,POST";
-        String headers = "X-Custom";
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .options("/test").then()
-                .statusCode(200)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .auth().basic("test", "test")
-                .options("/test").then()
-                .statusCode(200)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .auth().basic("test", "wrongpassword")
-                .options("/test").then()
-                .statusCode(200)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .auth().basic("user", "user")
-                .options("/test").then()
-                .statusCode(200)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-    }
-
-    @Test
-    @DisplayName("Handles a direct CORS request correctly")
-    public void corsNoPreflightTest() {
-        String origin = "http://custom.origin.quarkus";
-        String methods = "GET,POST";
-        String headers = "X-Custom";
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .log().headers()
-                .get("/test").then()
-                .statusCode(401)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .auth().basic("test", "test")
-                .log().headers()
-                .get("/test").then()
-                .statusCode(200)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers)
-                .body(Matchers.equalTo("test:/test"));
-
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .auth().basic("test", "wrongpassword")
-                .log().headers()
-                .get("/test").then()
-                .statusCode(401)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-
-        given().header("Origin", origin)
-                .header("Access-Control-Request-Method", methods)
-                .header("Access-Control-Request-Headers", headers)
-                .when()
-                .auth().basic("user", "user")
-                .log().headers()
-                .get("/test").then()
-                .statusCode(403)
-                .header("Access-Control-Allow-Origin", origin)
-                .header("Access-Control-Allow-Methods", methods)
-                .header("Access-Control-Allow-Headers", headers);
-    }
-}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java
new file mode 100644
index 0000000000000..456675376bf6b
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/HttpRootPathBuildItemTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.vertx.http.deployment;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class HttpRootPathBuildItemTest {
+    @Test
+    void testResolvePathWithSlash() {
+        HttpRootPathBuildItem buildItem = new HttpRootPathBuildItem("/");
+
+        Assertions.assertEquals("/", buildItem.resolvePath(""));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buildItem.resolvePath("../foo"));
+    }
+
+    @Test
+    void testResolvePathWithSlashApp() {
+        HttpRootPathBuildItem buildItem = new HttpRootPathBuildItem("/app");
+
+        Assertions.assertEquals("/app/", buildItem.resolvePath(""));
+        Assertions.assertEquals("/app/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+    }
+
+    @Test
+    void testResolveResolvedPath() {
+        HttpRootPathBuildItem buildItem = new HttpRootPathBuildItem("/app");
+        Assertions.assertEquals("/app", buildItem.resolvePath("/app"));
+        Assertions.assertEquals("/app/foo", buildItem.resolvePath("/app/foo"));
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/NonApplicationRootPathBuildItemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/NonApplicationRootPathBuildItemTest.java
new file mode 100644
index 0000000000000..4844ba60a7ba8
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/deployment/NonApplicationRootPathBuildItemTest.java
@@ -0,0 +1,101 @@
+package io.quarkus.vertx.http.deployment;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class NonApplicationRootPathBuildItemTest {
+    @Test
+    void testResolvePathWithSlashRelativeQ() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/", "q");
+        Assertions.assertTrue(buildItem.isDedicatedRouterRequired());
+        Assertions.assertTrue(buildItem.attachedToMainRouter);
+        Assertions.assertEquals("/q/", buildItem.getVertxRouterPath());
+        Assertions.assertEquals("/", buildItem.httpRootPath.getPath());
+        Assertions.assertEquals("/q/", buildItem.nonApplicationRootPath.getPath());
+        Assertions.assertNotEquals(buildItem.httpRootPath, buildItem.nonApplicationRootPath);
+
+        Assertions.assertEquals("/q/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/q/foo/sub/path", buildItem.resolvePath("foo/sub/path"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+        Assertions.assertEquals("/foo/sub/path", buildItem.resolvePath("/foo/sub/path"));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buildItem.resolvePath("../foo"));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buildItem.resolvePath(""));
+    }
+
+    @Test
+    void testResolvePathWithSlashAbsoluteQ() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/", "/q");
+        Assertions.assertTrue(buildItem.isDedicatedRouterRequired());
+        Assertions.assertTrue(buildItem.attachedToMainRouter);
+        Assertions.assertEquals("/q/", buildItem.getVertxRouterPath());
+        Assertions.assertEquals("/", buildItem.httpRootPath.getPath());
+        Assertions.assertEquals("/q/", buildItem.nonApplicationRootPath.getPath());
+        Assertions.assertNotEquals(buildItem.httpRootPath, buildItem.nonApplicationRootPath);
+
+        Assertions.assertEquals("/q/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+    }
+
+    @Test
+    void testResolvePathWithSlashAppWithRelativeQ() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/app", "q");
+        Assertions.assertTrue(buildItem.isDedicatedRouterRequired());
+        Assertions.assertTrue(buildItem.attachedToMainRouter);
+        Assertions.assertEquals("/q/", buildItem.getVertxRouterPath());
+        Assertions.assertEquals("/app/", buildItem.httpRootPath.getPath());
+        Assertions.assertEquals("/app/q/", buildItem.nonApplicationRootPath.getPath());
+        Assertions.assertNotEquals(buildItem.httpRootPath, buildItem.nonApplicationRootPath);
+
+        Assertions.assertEquals("/app/q/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+    }
+
+    @Test
+    void testResolvePathWithSlashAppWithAbsoluteQ() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/app", "/q");
+        Assertions.assertTrue(buildItem.isDedicatedRouterRequired());
+        Assertions.assertFalse(buildItem.attachedToMainRouter);
+        Assertions.assertEquals("/q/", buildItem.getVertxRouterPath());
+        Assertions.assertEquals("/app/", buildItem.httpRootPath.getPath());
+        Assertions.assertEquals("/q/", buildItem.nonApplicationRootPath.getPath());
+        Assertions.assertNotEquals(buildItem.httpRootPath, buildItem.nonApplicationRootPath);
+
+        Assertions.assertEquals("/q/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+    }
+
+    @Test
+    void testResolvePathWithSlashEmpty() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/", "");
+        Assertions.assertFalse(buildItem.isDedicatedRouterRequired());
+        Assertions.assertTrue(buildItem.attachedToMainRouter);
+        Assertions.assertEquals("/", buildItem.getVertxRouterPath());
+        Assertions.assertEquals("/", buildItem.httpRootPath.getPath());
+        Assertions.assertEquals("/", buildItem.nonApplicationRootPath.getPath());
+        Assertions.assertEquals(buildItem.httpRootPath, buildItem.nonApplicationRootPath);
+
+        Assertions.assertEquals("/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+    }
+
+    @Test
+    void testResolvePathWithSlashWithSlash() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/", "/");
+        Assertions.assertFalse(buildItem.isDedicatedRouterRequired());
+        Assertions.assertTrue(buildItem.attachedToMainRouter);
+        Assertions.assertEquals("/", buildItem.getVertxRouterPath());
+        Assertions.assertEquals("/", buildItem.httpRootPath.getPath());
+        Assertions.assertEquals("/", buildItem.nonApplicationRootPath.getPath());
+        Assertions.assertEquals(buildItem.httpRootPath, buildItem.nonApplicationRootPath);
+
+        Assertions.assertEquals("/foo", buildItem.resolvePath("foo"));
+        Assertions.assertEquals("/foo", buildItem.resolvePath("/foo"));
+    }
+
+    @Test
+    void testResolvePathWithSlashWithSlashQWithWildcards() {
+        NonApplicationRootPathBuildItem buildItem = new NonApplicationRootPathBuildItem("/", "/q");
+        Assertions.assertEquals("/q/foo/*", buildItem.resolvePath("foo/*"));
+        Assertions.assertEquals("/foo/*", buildItem.resolvePath("/foo/*"));
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java
new file mode 100644
index 0000000000000..8c475ba3ea1f6
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/BodyHandlerBean.java
@@ -0,0 +1,28 @@
+package io.quarkus.vertx.http.devconsole;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import io.quarkus.runtime.configuration.ConfigInstantiator;
+import io.quarkus.vertx.http.runtime.HttpConfiguration;
+import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class BodyHandlerBean {
+
+    void setup(@Observes Router router) {
+        HttpConfiguration httpConfiguration = new HttpConfiguration();
+        ConfigInstantiator.handleObject(httpConfiguration);
+        Handler<RoutingContext> bodyHandler = new VertxHttpRecorder().createBodyHandler(httpConfiguration);
+        router.route().order(Integer.MIN_VALUE + 1).handler(new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext routingContext) {
+                routingContext.request().resume();
+                bodyHandler.handle(routingContext);
+            }
+        });
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java
new file mode 100644
index 0000000000000..63d1875761d79
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.vertx.http.devconsole;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+/**
+ * This tests that the dev console still works with this extension present (i.e. with a RequireBodyHandlerBuildItem being
+ * produced)
+ * <p>
+ * The config editor is a deployment side handler, so this test that the deployment side functions of the dev console
+ * handle body handlers correctly.
+ */
+public class DevConsoleConfigEditorBodyHandlerTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest config = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClass(BodyHandlerBean.class));
+
+    @Test
+    public void testChangeHttpRoute() {
+        RestAssured.with()
+                .get("q/arc/beans")
+                .then()
+                .statusCode(200);
+        RestAssured.with().formParam("name", "quarkus.http.root-path").formParam("value", "/foo")
+                .redirects().follow(false)
+                .post("q/dev/io.quarkus.quarkus-vertx-http/config")
+                .then()
+                .statusCode(303);
+        RestAssured.with()
+                .get("q/arc/beans")
+                .then()
+                .statusCode(404);
+        RestAssured.with()
+                .get("foo/q/arc/beans")
+                .then()
+                .statusCode(200);
+
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java
new file mode 100644
index 0000000000000..e1e0237e94adb
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java
@@ -0,0 +1,55 @@
+package io.quarkus.vertx.http.devconsole;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class DevConsoleConfigEditorTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest config = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void testChangeHttpRoute() {
+        RestAssured.with()
+                .get("q/arc/beans")
+                .then()
+                .statusCode(200);
+        RestAssured.with().formParam("name", "quarkus.http.root-path").formParam("value", "/foo")
+                .redirects().follow(false)
+                .post("q/dev/io.quarkus.quarkus-vertx-http/config")
+                .then()
+                .statusCode(303);
+        RestAssured.with()
+                .get("q/arc/beans")
+                .then()
+                .statusCode(404);
+        RestAssured.with()
+                .get("foo/q/arc/beans")
+                .then()
+                .statusCode(200);
+
+    }
+
+    @Test
+    public void testSetEmptyValue() {
+        RestAssured.with()
+                .get("q/arc/beans")
+                .then()
+                .statusCode(200);
+        RestAssured.with().formParam("name", "quarkus.http.root-path").formParam("value", "")
+                .redirects().follow(false)
+                .post("q/dev/io.quarkus.quarkus-vertx-http/config")
+                .then()
+                .statusCode(303);
+        RestAssured.with()
+                .get("q/arc/beans")
+                .then()
+                .statusCode(200);
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/JavaDocResolverTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/JavaDocResolverTest.java
new file mode 100644
index 0000000000000..0149a9e9f50e4
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/JavaDocResolverTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.vertx.http.devconsole;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.qute.Engine;
+import io.quarkus.vertx.http.deployment.devmode.console.DevConsoleProcessor.JavaDocResolver;
+
+public class JavaDocResolverTest {
+
+    @Test
+    public void testResolver() {
+        Engine engine = Engine.builder().addDefaults().addValueResolver(new JavaDocResolver()).build();
+        assertEquals("<code>java.lang.Foo</code>::<code>Class#getSimpleName()</code>\n"
+                + " <br><strong>@see</strong> Foo\n"
+                + " <br><strong>@deprecated</strong> For some reason",
+                engine.parse("{foo.fmtJavadoc}")
+                        .data("foo",
+                                "{@code java.lang.Foo}::{@link Class#getSimpleName()}\n @see Foo\n @deprecated For some reason")
+                        .render().trim());
+
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java
index 177b2077bf6d2..f9d1410b820e1 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ArcEndpointTest.java
@@ -70,7 +70,7 @@ void onStart(@Observes StartupEvent event) {
         }
 
         void addConfigRoute(@Observes Router router) {
-            router.route("/console-path").handler(rc -> rc.response().end(httpConfig.consolePath));
+            router.route("/console-path").handler(rc -> rc.response().end(httpConfig.nonApplicationRootPath));
         }
 
     }
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java
new file mode 100644
index 0000000000000..7a768ea96149b
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadArtifactTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.vertx.http.devmode;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+/**
+ * tests the reload-dependencies option
+ */
+public class LiveReloadArtifactTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest test = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("quarkus.class-loading.reloadable-artifacts=io.vertx:vertx-web-client\n"),
+                            "application.properties")
+                    .addClasses(LiveReloadEndpoint.class));
+
+    @Test
+    public void test() {
+        String firstClassToString = RestAssured.get("/test").then().statusCode(200).extract().body().asString();
+        test.modifySourceFile(LiveReloadEndpoint.class, s -> s.replace("\"/test\"", "\"/test2\""));
+
+        String secondClassToString = RestAssured.get("/test2").then().statusCode(200).extract().body().asString();
+        Assertions.assertNotEquals(firstClassToString, secondClassToString);
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java
new file mode 100644
index 0000000000000..26b1f112b56d0
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/LiveReloadEndpoint.java
@@ -0,0 +1,26 @@
+package io.quarkus.vertx.http.devmode;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.client.HttpRequest;
+import io.vertx.ext.web.client.WebClient;
+
+@Named
+@ApplicationScoped
+public class LiveReloadEndpoint {
+
+    @Inject
+    HttpBuildTimeConfig httpConfig;
+
+    void addConfigRoute(@Observes Router router) {
+        router.route("/test")
+                .produces("text/plain")
+                .handler(rc -> rc.response().end(WebClient.class.hashCode() + "-" + HttpRequest.class.hashCode()));
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java
new file mode 100644
index 0000000000000..f970ce0d2766f
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstArtifactTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.vertx.http.devmode;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+/**
+ * tests the parent first artifacts option
+ */
+public class ParentFirstArtifactTest {
+
+    @RegisterExtension
+    static final QuarkusDevModeTest test = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource(new StringAsset("quarkus.class-loading.parent-first-artifacts=io.vertx:vertx-web-client\n"),
+                            "application.properties")
+                    .addClasses(ParentFirstEndpoint.class));
+
+    @Test
+    public void test() {
+        String firstClassToString = RestAssured.get("/test").then().statusCode(200).extract().body().asString();
+        Assertions.assertEquals("false", firstClassToString);
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java
new file mode 100644
index 0000000000000..ee3b727a80a88
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devmode/ParentFirstEndpoint.java
@@ -0,0 +1,27 @@
+package io.quarkus.vertx.http.devmode;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.client.WebClient;
+
+@Named
+@ApplicationScoped
+public class ParentFirstEndpoint {
+
+    @Inject
+    HttpBuildTimeConfig httpConfig;
+
+    void addConfigRoute(@Observes Router router) {
+        router.route("/test")
+                .produces("text/plain")
+                .handler(rc -> rc.response()
+                        .end(WebClient.class.getClassLoader() instanceof QuarkusClassLoader ? "true" : "false"));
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java
new file mode 100644
index 0000000000000..8d528f304b58e
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DisabledPermissionTestCase.java
@@ -0,0 +1,152 @@
+package io.quarkus.vertx.http.security;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class DisabledPermissionTestCase {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.auth.basic=true\n" +
+            "quarkus.http.auth.permission.test1.paths=/default\n" +
+            "quarkus.http.auth.permission.test1.policy=authenticated\n" +
+
+            "quarkus.http.auth.permission.test2.enabled=false\n" +
+            "quarkus.http.auth.permission.test2.paths=/disabled\n" +
+            "quarkus.http.auth.permission.test2.policy=deny\n" +
+
+            "quarkus.http.auth.permission.test3.enabled=true\n" +
+            "quarkus.http.auth.permission.test3.paths=/enabled\n" +
+            "quarkus.http.auth.permission.test3.policy=permit\n" +
+
+            "quarkus.http.auth.permission.test4.enabled=true\n" +
+            "quarkus.http.auth.permission.test4.paths=/restricted\n" +
+            "quarkus.http.auth.permission.test4.methods=GET\n" +
+            "quarkus.http.auth.permission.test4.policy=authenticated\n" +
+
+            "quarkus.http.auth.permission.test5.enabled=false\n" +
+            "quarkus.http.auth.permission.test5.paths=/unrestricted\n" +
+            "quarkus.http.auth.permission.test5.methods=GET\n" +
+            "quarkus.http.auth.permission.test5.policy=authenticated\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .addClasses(
+                    TestIdentityController.class,
+                    TestIdentityProvider.class,
+                    PathHandler.class)
+            .addAsResource(new StringAsset(APP_PROPS), "application.properties"));
+
+    @BeforeAll
+    public static void setup() {
+        TestIdentityController.resetRoles().add("test", "test", "test");
+    }
+
+    @Test
+    public void testAnonymousDenied() {
+        RestAssured
+                .given()
+                .when()
+                .get("/default")
+                .then()
+                .assertThat()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testAnonymousAllowed() {
+        RestAssured
+                .given()
+                .when()
+                .get("/enabled")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo(":/enabled"));
+    }
+
+    @Test
+    public void testDefaultEnabled() {
+        RestAssured
+                .given()
+                .auth()
+                .preemptive()
+                .basic("test", "test")
+                .when()
+                .get("/default")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo("test:/default"));
+    }
+
+    @Test
+    public void testDisabled() {
+        RestAssured
+                .given()
+                .auth()
+                .preemptive()
+                .basic("test", "test")
+                .when()
+                .get("/disabled")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo("test:/disabled"));
+    }
+
+    @Test
+    public void testEnabled() {
+        RestAssured
+                .given()
+                .auth()
+                .preemptive()
+                .basic("test", "test")
+                .when()
+                .get("/enabled")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo("test:/enabled"));
+    }
+
+    @Test
+    public void testRestricted() {
+        RestAssured
+                .given()
+                .auth()
+                .preemptive()
+                .basic("test", "test")
+                .when()
+                .post("/restricted")
+                .then()
+                .assertThat()
+                .statusCode(403);
+    }
+
+    @Test
+    public void testUnrestricted() {
+        RestAssured
+                .given()
+                .auth()
+                .preemptive()
+                .basic("test", "test")
+                .when()
+                .get("/unrestricted")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo("test:/unrestricted"));
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailedIdentityProviderTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailedIdentityProviderTestCase.java
new file mode 100644
index 0000000000000..b2be3eb5fc182
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailedIdentityProviderTestCase.java
@@ -0,0 +1,47 @@
+package io.quarkus.vertx.http.security;
+
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class FailedIdentityProviderTestCase {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.auth.basic=true\n" +
+            "quarkus.http.auth.policy.r1.roles-allowed=admin\n" +
+            "quarkus.http.auth.permission.roles1.paths=/admin\n" +
+            "quarkus.http.auth.permission.roles1.policy=r1\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier<JavaArchive>() {
+        @Override
+        public JavaArchive get() {
+            return ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FailingIdentityProvider.class,
+                            PathHandler.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties");
+        }
+    });
+
+    @Test
+    public void testBasicBasedAuthSuccess() {
+        RestAssured
+                .given()
+                .auth().preemptive().basic("admin", "admin")
+                .redirects().follow(false)
+                .when()
+                .get("/admin")
+                .then()
+                .assertThat()
+                .statusCode(401);
+
+    }
+
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java
new file mode 100644
index 0000000000000..db46d3a08d521
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FailingIdentityProvider.java
@@ -0,0 +1,24 @@
+package io.quarkus.vertx.http.security;
+
+import javax.inject.Singleton;
+
+import io.quarkus.security.AuthenticationFailedException;
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.quarkus.security.identity.IdentityProvider;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.identity.request.UsernamePasswordAuthenticationRequest;
+import io.smallrye.mutiny.Uni;
+
+@Singleton
+public class FailingIdentityProvider implements IdentityProvider<UsernamePasswordAuthenticationRequest> {
+    @Override
+    public Class<UsernamePasswordAuthenticationRequest> getRequestType() {
+        return UsernamePasswordAuthenticationRequest.class;
+    }
+
+    @Override
+    public Uni<SecurityIdentity> authenticate(UsernamePasswordAuthenticationRequest request,
+            AuthenticationRequestContext context) {
+        throw new AuthenticationFailedException("FAILED");
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthParametersTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthParametersTestCase.java
new file mode 100644
index 0000000000000..d557dbcea03c6
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthParametersTestCase.java
@@ -0,0 +1,135 @@
+package io.quarkus.vertx.http.security;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.util.function.Supplier;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.filter.cookie.CookieFilter;
+import io.restassured.matcher.RestAssuredMatchers;
+
+public class FormAuthParametersTestCase {
+
+    private static final String APP_PROPS = "" +
+            "quarkus.http.auth.form.enabled=true\n" +
+            "quarkus.http.auth.form.login-page=login\n" +
+            "quarkus.http.auth.form.post-location=auth\n" +
+            "quarkus.http.auth.form.username-parameter=username\n" +
+            "quarkus.http.auth.form.password-parameter=password\n" +
+            "quarkus.http.auth.form.location-cookie=redirect-location\n" +
+            "quarkus.http.auth.form.error-page=error\n" +
+            "quarkus.http.auth.form.landing-page=landing\n" +
+            "quarkus.http.auth.policy.r1.roles-allowed=admin\n" +
+            "quarkus.http.auth.permission.roles1.paths=/admin\n" +
+            "quarkus.http.auth.permission.roles1.policy=r1\n";
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier<JavaArchive>() {
+        @Override
+        public JavaArchive get() {
+            return ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, TestIdentityController.class,
+                            PathHandler.class)
+                    .addAsResource(new StringAsset(APP_PROPS), "application.properties");
+        }
+    });
+
+    @BeforeAll
+    public static void setup() {
+        TestIdentityController.resetRoles()
+                .add("admin", "admin", "admin");
+    }
+
+    @Test
+    public void testFormBasedAuthSuccess() {
+        CookieFilter cookies = new CookieFilter();
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .get("/admin")
+                .then()
+                .assertThat()
+                .statusCode(302)
+                .header("location", containsString("/login"))
+                .cookie("redirect-location",
+                        RestAssuredMatchers.detailedCookie().value(containsString("/admin")).secured(false));
+
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .formParam("username", "admin")
+                .formParam("password", "admin")
+                .post("/auth")
+                .then()
+                .assertThat()
+                .statusCode(302)
+                .header("location", containsString("/admin"))
+                .cookie("quarkus-credential",
+                        RestAssuredMatchers.detailedCookie().value(notNullValue()).secured(false));
+
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .get("/admin")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo("admin:/admin"));
+
+    }
+
+    @Test
+    public void testFormBasedAuthSuccessLandingPage() {
+        CookieFilter cookies = new CookieFilter();
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .formParam("username", "admin")
+                .formParam("password", "admin")
+                .post("/auth")
+                .then()
+                .assertThat()
+                .statusCode(302)
+                .header("location", containsString("/landing"))
+                .cookie("quarkus-credential", notNullValue());
+
+    }
+
+    @Test
+    public void testFormAuthFailure() {
+        CookieFilter cookies = new CookieFilter();
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .formParam("username", "admin")
+                .formParam("password", "wrongpassword")
+                .post("/auth")
+                .then()
+                .assertThat()
+                .statusCode(302)
+                .header("location", containsString("/error"));
+
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java
index b61dd75a9f80d..e2983588465fb 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java
@@ -18,6 +18,7 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.restassured.RestAssured;
 import io.restassured.filter.cookie.CookieFilter;
+import io.restassured.matcher.RestAssuredMatchers;
 
 public class FormAuthTestCase {
 
@@ -44,7 +45,8 @@ public JavaArchive get() {
     @BeforeAll
     public static void setup() {
         TestIdentityController.resetRoles()
-                .add("admin", "admin", "admin");
+                .add("admin", "admin", "admin")
+                .add("test", "test", "admin");
     }
 
     @Test
@@ -60,7 +62,8 @@ public void testFormBasedAuthSuccess() {
                 .assertThat()
                 .statusCode(302)
                 .header("location", containsString("/login"))
-                .cookie("quarkus-redirect-location", containsString("/admin"));
+                .cookie("quarkus-redirect-location",
+                        RestAssuredMatchers.detailedCookie().value(containsString("/admin")).secured(false));
 
         RestAssured
                 .given()
@@ -74,7 +77,8 @@ public void testFormBasedAuthSuccess() {
                 .assertThat()
                 .statusCode(302)
                 .header("location", containsString("/admin"))
-                .cookie("quarkus-credential", notNullValue());
+                .cookie("quarkus-credential",
+                        RestAssuredMatchers.detailedCookie().value(notNullValue()).secured(false));
 
         RestAssured
                 .given()
@@ -87,6 +91,33 @@ public void testFormBasedAuthSuccess() {
                 .statusCode(200)
                 .body(equalTo("admin:/admin"));
 
+        //now authenticate with a different user
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .formParam("j_username", "test")
+                .formParam("j_password", "test")
+                .post("/j_security_check")
+                .then()
+                .assertThat()
+                .statusCode(302)
+                .header("location", containsString("/admin"))
+                .cookie("quarkus-credential",
+                        RestAssuredMatchers.detailedCookie().value(notNullValue()).secured(false));
+
+        RestAssured
+                .given()
+                .filter(cookies)
+                .redirects().follow(false)
+                .when()
+                .get("/admin")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .body(equalTo("test:/admin"));
+
     }
 
     @Test
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java
new file mode 100644
index 0000000000000..f722f16cc575b
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/MtlsRequestBasicAuthTest.java
@@ -0,0 +1,80 @@
+package io.quarkus.vertx.http.security;
+
+import static org.hamcrest.Matchers.is;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.security.test.utils.TestIdentityController;
+import io.quarkus.security.test.utils.TestIdentityProvider;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
+import io.restassured.RestAssured;
+import io.vertx.ext.web.Router;
+
+public class MtlsRequestBasicAuthTest {
+
+    @TestHTTPResource(value = "/mtls", ssl = true)
+    URL url;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyBean.class)
+                    .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, TestIdentityController.class)
+                    .addAsResource("conf/mtls/mtls-basic-jks.conf", "application.properties")
+                    .addAsResource("conf/mtls/server-keystore.jks", "server-keystore.jks")
+                    .addAsResource("conf/mtls/server-truststore.jks", "server-truststore.jks"));
+
+    @BeforeAll
+    public static void setup() {
+        TestIdentityController.resetRoles()
+                .add("admin", "admin", "admin");
+    }
+
+    @Test
+    public void testClientAuthentication() {
+        RestAssured.given()
+                .keyStore(new File("src/test/resources/conf/mtls/client-keystore.jks"), "password")
+                .trustStore(new File("src/test/resources/conf/mtls/client-truststore.jks"), "password")
+                .get(url).then().statusCode(200).body(is("CN=client,OU=cert,O=quarkus,L=city,ST=state,C=AU"));
+    }
+
+    @Test
+    public void testNoClientCert() {
+        RestAssured.given()
+                .trustStore(new File("src/test/resources/conf/mtls/client-truststore.jks"), "password")
+                .get(url).then().statusCode(200).body(is(""));
+    }
+
+    @Test
+    public void testNoClientCertBasicAuth() {
+        RestAssured.given()
+                .auth()
+                .preemptive()
+                .basic("admin", "admin")
+                .trustStore(new File("src/test/resources/conf/mtls/client-truststore.jks"), "password")
+                .get(url).then().statusCode(200).body(is("admin"));
+    }
+
+    @ApplicationScoped
+    static class MyBean {
+
+        public void register(@Observes Router router) {
+            router.get("/mtls").handler(rc -> {
+                rc.response().end(QuarkusHttpUser.class.cast(rc.user()).getSecurityIdentity().getPrincipal().getName());
+            });
+        }
+
+    }
+}
diff --git a/extensions/vertx-http/deployment/src/test/resources/conf/cors-config-full.properties b/extensions/vertx-http/deployment/src/test/resources/conf/cors-config-full.properties
index 39e28d6451772..f335c05c9090d 100644
--- a/extensions/vertx-http/deployment/src/test/resources/conf/cors-config-full.properties
+++ b/extensions/vertx-http/deployment/src/test/resources/conf/cors-config-full.properties
@@ -1,6 +1,6 @@
 quarkus.http.cors=true
-quarkus.http.cors.origins=http://custom.origin.quarkus,http://www.quarkus.io
-quarkus.http.cors.methods=GET,PUT,POST
+quarkus.http.cors.origins=http://custom.origin.quarkus, http://www.quarkus.io
+quarkus.http.cors.methods=GET, PUT, POST
 quarkus.http.cors.headers=X-Custom
 quarkus.http.cors.exposed-headers=Content-Disposition
 quarkus.http.cors.access-control-max-age=24H
diff --git a/extensions/vertx-http/deployment/src/test/resources/conf/mtls/mtls-basic-jks.conf b/extensions/vertx-http/deployment/src/test/resources/conf/mtls/mtls-basic-jks.conf
new file mode 100644
index 0000000000000..9cdaf4679f8e7
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/test/resources/conf/mtls/mtls-basic-jks.conf
@@ -0,0 +1,7 @@
+quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
+quarkus.http.ssl.certificate.key-store-password=secret
+quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks
+quarkus.http.ssl.certificate.trust-store-password=password
+quarkus.http.ssl.client-auth=REQUEST
+quarkus.http.auth.basic=true
+quarkus.http.auth.proactive=true
\ No newline at end of file
diff --git a/extensions/vertx-http/dev-console-runtime-spi/pom.xml b/extensions/vertx-http/dev-console-runtime-spi/pom.xml
new file mode 100644
index 0000000000000..6e4f77f31f734
--- /dev/null
+++ b/extensions/vertx-http/dev-console-runtime-spi/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-vertx-http-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
+    <name>Quarkus - Vert.x - HTTP - Dev Console Runtime SPI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.arc</groupId>
+            <artifactId>arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/extensions/vertx-http/dev-console-runtime-spi/src/main/java/io/quarkus/devconsole/runtime/spi/DevConsolePostHandler.java b/extensions/vertx-http/dev-console-runtime-spi/src/main/java/io/quarkus/devconsole/runtime/spi/DevConsolePostHandler.java
new file mode 100644
index 0000000000000..fb062a7a2174d
--- /dev/null
+++ b/extensions/vertx-http/dev-console-runtime-spi/src/main/java/io/quarkus/devconsole/runtime/spi/DevConsolePostHandler.java
@@ -0,0 +1,104 @@
+package io.quarkus.devconsole.runtime.spi;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.core.http.impl.headers.VertxHttpHeaders;
+import io.vertx.ext.web.RoutingContext;
+
+public abstract class DevConsolePostHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        if (event.getBody() != null) {
+            //really simple form data decoder
+            //but we can't really re-use the netty one
+            String data = event.getBodyAsString();
+            String[] parts = data.split("&");
+            MultiMap post = new VertxHttpHeaders();
+            for (String i : parts) {
+                String[] pair = i.split("=");
+                try {
+                    post.add(URLDecoder.decode(pair[0], StandardCharsets.UTF_8.name()),
+                            URLDecoder.decode(pair[1], StandardCharsets.UTF_8.name()));
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            dispatch(event, post);
+        } else {
+            event.request().setExpectMultipart(true);
+            event.request().endHandler(new Handler<Void>() {
+                @Override
+                public void handle(Void ignore) {
+                    dispatch(event, event.request().formAttributes());
+                }
+            });
+        }
+    }
+
+    protected void dispatch(RoutingContext event, MultiMap form) {
+        try {
+            handlePost(event, form);
+            actionSuccess(event);
+            return;
+        } catch (NotImplementedException e) {
+            // just go on and do async
+        } catch (Exception e) {
+            event.fail(e);
+        }
+
+        try {
+            new Thread(new Runnable() {
+                public void run() {
+                    try {
+                        handlePostAsync(event, form);
+                        actionSuccess(event);
+                    } catch (Exception e) {
+                        event.fail(e);
+                    }
+                }
+            }, "DEV Console action").start();
+            return;
+        } catch (NotImplementedException e) {
+            throw new RuntimeException("One of handlePost or handleAsyncPost must be implemented");
+        } catch (Exception e) {
+            event.fail(e);
+        }
+    }
+
+    private void actionSuccess(RoutingContext event) {
+        event.response().setStatusCode(HttpResponseStatus.SEE_OTHER.code()).headers()
+                .set(HttpHeaderNames.LOCATION, event.request().absoluteURI());
+        event.response().end();
+    }
+
+    protected void flashMessage(RoutingContext event, String message) {
+        FlashScopeUtil.setFlashMessage(event, message);
+    }
+
+    protected void flashMessage(RoutingContext event, String message, Duration displayTime) {
+        FlashScopeUtil.setFlashMessage(event, message, displayTime);
+    }
+
+    protected void flashMessage(RoutingContext event, String message, FlashScopeUtil.FlashMessageStatus messageStatus) {
+        FlashScopeUtil.setFlashMessage(event, message, messageStatus, null);
+    }
+
+    private static class NotImplementedException extends RuntimeException {
+    }
+
+    protected void handlePost(RoutingContext event, MultiMap form) throws Exception {
+        throw new NotImplementedException();
+    }
+
+    protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception {
+        throw new NotImplementedException();
+    }
+}
diff --git a/extensions/vertx-http/dev-console-runtime-spi/src/main/java/io/quarkus/devconsole/runtime/spi/FlashScopeUtil.java b/extensions/vertx-http/dev-console-runtime-spi/src/main/java/io/quarkus/devconsole/runtime/spi/FlashScopeUtil.java
new file mode 100644
index 0000000000000..42791ad49bfa7
--- /dev/null
+++ b/extensions/vertx-http/dev-console-runtime-spi/src/main/java/io/quarkus/devconsole/runtime/spi/FlashScopeUtil.java
@@ -0,0 +1,91 @@
+package io.quarkus.devconsole.runtime.spi;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.UncheckedIOException;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.vertx.core.http.Cookie;
+import io.vertx.ext.web.RoutingContext;
+
+public class FlashScopeUtil {
+    private final static String FLASH_COOKIE_NAME = "_flash";
+    private final static String FLASH_CONTEXT_DATA_NAME = "flash";
+
+    public static void setFlash(RoutingContext event, Map<String, Object> data) {
+        event.response().addCookie(
+                Cookie.cookie(FLASH_COOKIE_NAME, Base64.getEncoder().encodeToString(marshallMap(data))));
+    }
+
+    public static Object getFlash(RoutingContext event) {
+        return event.data().get(FLASH_CONTEXT_DATA_NAME);
+    }
+
+    public static void handleFlashCookie(RoutingContext event) {
+        Cookie cookie = event.request().getCookie(FLASH_COOKIE_NAME);
+        event.response().removeCookie(FLASH_COOKIE_NAME);
+        if (cookie != null) {
+            Map<String, Object> data = unmarshallMap(Base64.getDecoder().decode(cookie.getValue().getBytes()));
+            event.data().put(FLASH_CONTEXT_DATA_NAME, data);
+        }
+    }
+
+    // we don't use json because quarkus-vertx-http does not depend on Jackson databind and therefore the
+    // stardard vert.x encoding methods fail
+
+    private static byte[] marshallMap(Map<String, Object> data) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+            oos.writeObject(data);
+            return baos.toByteArray();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> unmarshallMap(byte[] data) {
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
+                ObjectInputStream oos = new ObjectInputStream(bais)) {
+            return (Map<String, Object>) oos.readObject();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public enum FlashMessageStatus {
+        SUCCESS("success"),
+        ERROR("danger");
+
+        public final String cssClass;
+
+        FlashMessageStatus(String cssClass) {
+            this.cssClass = cssClass;
+        }
+    }
+
+    public static void setFlashMessage(RoutingContext event, String message) {
+        setFlashMessage(event, message, FlashMessageStatus.SUCCESS, null);
+    }
+
+    public static void setFlashMessage(RoutingContext event, String message, Duration displayTime) {
+        setFlashMessage(event, message, FlashMessageStatus.SUCCESS, displayTime);
+    }
+
+    public static void setFlashMessage(RoutingContext event, String message, FlashMessageStatus messageStatus,
+            Duration displayTime) {
+        Map<String, Object> data = new HashMap<>();
+        Map<String, String> messageData = new HashMap<>();
+        messageData.put("text", message);
+        messageData.put("class", messageStatus.cssClass);
+        data.put("message", messageData);
+        data.put("displayTime", displayTime != null ? displayTime.toMillis() : 2000);
+        setFlash(event, data);
+    }
+}
diff --git a/extensions/vertx-http/dev-console-spi/pom.xml b/extensions/vertx-http/dev-console-spi/pom.xml
new file mode 100644
index 0000000000000..a2b838691e34b
--- /dev/null
+++ b/extensions/vertx-http/dev-console-spi/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-vertx-http-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
+    <name>Quarkus - Vert.x - HTTP - Dev Console SPI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.arc</groupId>
+            <artifactId>arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java
new file mode 100644
index 0000000000000..bf2c2966d225c
--- /dev/null
+++ b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java
@@ -0,0 +1,77 @@
+package io.quarkus.devconsole.spi;
+
+import java.util.AbstractMap;
+import java.util.Map;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.deployment.util.ArtifactInfoUtil;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * A route for handling requests in the dev console.
+ * <p>
+ * Routes are registered under /q/dev/{groupId}.{artifactId}/
+ * <p>
+ * This handler executes in the deployment class loader.
+ */
+public final class DevConsoleRouteBuildItem extends MultiBuildItem {
+
+    private final String groupId;
+    private final String artifactId;
+    private final String path;
+    private final String method;
+    private final Class<?> callerClass;
+    private final Handler<RoutingContext> handler;
+
+    public DevConsoleRouteBuildItem(String groupId, String artifactId, String path, String method,
+            Handler<RoutingContext> handler) {
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.path = path;
+        this.method = method;
+        this.handler = handler;
+        this.callerClass = null;
+    }
+
+    public DevConsoleRouteBuildItem(String path, String method,
+            Handler<RoutingContext> handler) {
+        String callerClassName = new RuntimeException().getStackTrace()[1].getClassName();
+        try {
+            callerClass = Thread.currentThread().getContextClassLoader().loadClass(callerClassName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        this.groupId = null;
+        this.artifactId = null;
+        this.path = path;
+        this.method = method;
+        this.handler = handler;
+    }
+
+    /**
+     * Gets the group id and artifact ID. This needs the curate result to map the calling class to the
+     * artifact that contains it in some situations (namely in dev mode tests).
+     */
+    public Map.Entry<String, String> groupIdAndArtifactId(CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        if (callerClass == null) {
+            return new AbstractMap.SimpleEntry<>(groupId, artifactId);
+        } else {
+            return ArtifactInfoUtil.groupIdAndArtifactId(callerClass, curateOutcomeBuildItem);
+        }
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public Handler<RoutingContext> getHandler() {
+        return handler;
+    }
+
+}
diff --git a/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRuntimeTemplateInfoBuildItem.java b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRuntimeTemplateInfoBuildItem.java
new file mode 100644
index 0000000000000..72417a0b8d813
--- /dev/null
+++ b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRuntimeTemplateInfoBuildItem.java
@@ -0,0 +1,61 @@
+package io.quarkus.devconsole.spi;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.deployment.util.ArtifactInfoUtil;
+
+/**
+ * Information that can be directly displayed in dev console templates, using the info: prefix
+ *
+ * This is scoped to the extension that produced it, to prevent namespace clashes.
+ *
+ * This value will be evaluated at runtime, so can contain info that is produced from recorders
+ */
+public final class DevConsoleRuntimeTemplateInfoBuildItem extends MultiBuildItem {
+
+    private final String groupId;
+    private final String artifactId;
+    private final String name;
+    private final Supplier<? extends Object> object;
+
+    public DevConsoleRuntimeTemplateInfoBuildItem(String groupId, String artifactId, String name,
+            Supplier<? extends Object> object) {
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.name = name;
+        this.object = object;
+    }
+
+    public DevConsoleRuntimeTemplateInfoBuildItem(String name, Supplier<? extends Object> object) {
+        String callerClassName = new RuntimeException().getStackTrace()[1].getClassName();
+        Class<?> callerClass = null;
+        try {
+            callerClass = Thread.currentThread().getContextClassLoader().loadClass(callerClassName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        Map.Entry<String, String> info = ArtifactInfoUtil.groupIdAndArtifactId(callerClass);
+        this.groupId = info.getKey();
+        this.artifactId = info.getValue();
+        this.name = name;
+        this.object = object;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Supplier<? extends Object> getObject() {
+        return object;
+    }
+}
diff --git a/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleTemplateInfoBuildItem.java b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleTemplateInfoBuildItem.java
new file mode 100644
index 0000000000000..a9755368bb5eb
--- /dev/null
+++ b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleTemplateInfoBuildItem.java
@@ -0,0 +1,46 @@
+package io.quarkus.devconsole.spi;
+
+import java.util.Map;
+
+import io.quarkus.builder.item.MultiBuildItem;
+import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
+import io.quarkus.deployment.util.ArtifactInfoUtil;
+
+/**
+ * Information that can be directly displayed in dev console templates, using the info: prefix
+ * <p>
+ * This is scoped to the extension that produced it, to prevent namespace clashes
+ */
+public final class DevConsoleTemplateInfoBuildItem extends MultiBuildItem {
+
+    private final String name;
+    private final Object object;
+    private final Class<?> callerClass;
+
+    public DevConsoleTemplateInfoBuildItem(String name, Object object) {
+        String callerClassName = new RuntimeException().getStackTrace()[1].getClassName();
+        try {
+            callerClass = Thread.currentThread().getContextClassLoader().loadClass(callerClassName);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        this.name = name;
+        this.object = object;
+    }
+
+    /**
+     * Gets the group id and artifact ID. This needs the curate result to map the calling class to the
+     * artifact that contains it in some situations (namely in dev mode tests).
+     */
+    public Map.Entry<String, String> groupIdAndArtifactId(CurateOutcomeBuildItem curateOutcomeBuildItem) {
+        return ArtifactInfoUtil.groupIdAndArtifactId(callerClass, curateOutcomeBuildItem);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Object getObject() {
+        return object;
+    }
+}
diff --git a/extensions/vertx-http/pom.xml b/extensions/vertx-http/pom.xml
index d081033378c30..931c4d040c286 100644
--- a/extensions/vertx-http/pom.xml
+++ b/extensions/vertx-http/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,5 +16,7 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
+        <module>dev-console-spi</module>
+        <module>dev-console-runtime-spi</module>
     </modules>
 </project>
diff --git a/extensions/vertx-http/runtime/pom.xml b/extensions/vertx-http/runtime/pom.xml
index 8c46a6ea1869e..c251da302bd9d 100644
--- a/extensions/vertx-http/runtime/pom.xml
+++ b/extensions/vertx-http/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-http-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-development-mode-spi</artifactId>
+            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus.security</groupId>
@@ -36,10 +35,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-core</artifactId>
@@ -54,6 +49,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -64,6 +60,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AccessLogConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AccessLogConfig.java
index 926c4d5a60c07..1bc16a316aaac 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AccessLogConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AccessLogConfig.java
@@ -15,27 +15,17 @@ public class AccessLogConfig {
     public boolean enabled;
 
     /**
-     * The access log pattern:
+     * The access log pattern.
      *
-     * If this is the string 'common', 'combined' or 'long' then this will use one of the specified named formats:
-     * <ul>
-     * <li>
-     * common:<br />
-     * %h %l %u %t "%r" %s %b
-     * </li>
-     * <li>
-     * combined:<br />
-     * %h %l %u %t "%r" %s %b "%{i,Referer}" "%{i,User-Agent}"
-     * </li>
-     * <li>
-     * long:<br />
-     * %r<br />
-     * %{ALL_REQUEST_HEADERS}<br />
-     * </li>
-     * </ul>
+     * If this is the string `common`, `combined` or `long` then this will use one of the specified named formats:
+     *
+     * - common: `%h %l %u %t "%r" %s %b`
+     * - combined: `%h %l %u %t "%r" %s %b "%{i,Referer}" "%{i,User-Agent}"`
+     * - long: `%r\n%{ALL_REQUEST_HEADERS}`
      *
      * Otherwise consult the Quarkus documentation for the full list of variables that can be used.
      *
+     * @asciidoclet
      */
     @ConfigItem(defaultValue = "common")
     public String pattern;
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BasicRoute.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BasicRoute.java
index 181e5cbd8d761..064145e894d45 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BasicRoute.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BasicRoute.java
@@ -1,5 +1,6 @@
 package io.quarkus.vertx.http.runtime;
 
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import io.vertx.ext.web.Route;
@@ -11,6 +12,8 @@ public class BasicRoute implements Function<Router, Route> {
 
     private Integer order;
 
+    private Consumer<Route> customizer;
+
     public BasicRoute(String path) {
         this(path, null);
     }
@@ -20,6 +23,12 @@ public BasicRoute(String path, Integer order) {
         this.order = order;
     }
 
+    public BasicRoute(String path, Integer order, Consumer<Route> customizer) {
+        this.path = path;
+        this.order = order;
+        this.customizer = customizer;
+    }
+
     public BasicRoute() {
     }
 
@@ -39,12 +48,24 @@ public void setOrder(Integer order) {
         this.order = order;
     }
 
+    public Consumer<Route> getCustomizer() {
+        return customizer;
+    }
+
+    public BasicRoute setCustomizer(Consumer<Route> customizer) {
+        this.customizer = customizer;
+        return this;
+    }
+
     @Override
     public Route apply(Router router) {
         Route route = router.route(path);
         if (order != null) {
             route.order(order);
         }
+        if (customizer != null) {
+            customizer.accept(route);
+        }
         return route;
     }
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BodyConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BodyConfig.java
index 7d458e7e0b6c6..648bb1f6fd4d8 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BodyConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/BodyConfig.java
@@ -26,7 +26,7 @@ public class BodyConfig {
      * <p>
      * Either an absolute path or a path relative to the current directory of the application process.
      */
-    @ConfigItem(defaultValue = "file-uploads")
+    @ConfigItem(defaultValue = "${java.io.tmpdir}/uploads")
     public String uploadsDirectory;
 
     /**
@@ -44,7 +44,7 @@ public class BodyConfig {
      * If {@code true} the uploaded files stored in {@code quarkus.http.body-handler.uploads-directory} will be removed
      * after handling the request. Otherwise the files will be left there forever.
      */
-    @ConfigItem
+    @ConfigItem(defaultValue = "true")
     public boolean deleteUploadedFilesOnEnd;
 
     /**
@@ -55,4 +55,4 @@ public class BodyConfig {
      */
     @ConfigItem
     public boolean preallocateBodyBuffer;
-}
\ No newline at end of file
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
index a465eef97e34e..d56d4b28d6405 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CertificateConfig.java
@@ -36,6 +36,13 @@ public class CertificateConfig {
     @ConfigItem
     public Optional<String> keyStoreFileType;
 
+    /**
+     * An optional parameter to specify a provider of the key store file. If not given, the provider is automatically detected
+     * based on the key store file type.
+     */
+    @ConfigItem
+    public Optional<String> keyStoreProvider;
+
     /**
      * A parameter to specify the password of the key store file. If not given, the default ("password") is used.
      */
@@ -55,6 +62,13 @@ public class CertificateConfig {
     @ConfigItem
     public Optional<String> trustStoreFileType;
 
+    /**
+     * An optional parameter to specify a provider of the trust store file. If not given, the provider is automatically detected
+     * based on the trust store file type.
+     */
+    @ConfigItem
+    public Optional<String> trustStoreProvider;
+
     /**
      * A parameter to specify the password of the trust store file.
      */
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java
index 2588f1a13485a..421d961a0a731 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/CurrentVertxRequest.java
@@ -8,7 +8,8 @@
 @RequestScoped
 public class CurrentVertxRequest {
 
-    public RoutingContext current;
+    private RoutingContext current;
+    private Object otherHttpContextObject;
 
     @Produces
     @RequestScoped
@@ -21,4 +22,17 @@ public CurrentVertxRequest setCurrent(RoutingContext current) {
         return this;
     }
 
+    public CurrentVertxRequest setCurrent(RoutingContext current, Object otherHttpContextObject) {
+        this.current = current;
+        this.otherHttpContextObject = otherHttpContextObject;
+        return this;
+    }
+
+    public Object getOtherHttpContextObject() {
+        return otherHttpContextObject;
+    }
+
+    public void setOtherHttpContextObject(Object otherHttpContextObject) {
+        this.otherHttpContextObject = otherHttpContextObject;
+    }
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/FormAuthConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/FormAuthConfig.java
index 3f0a1803e0284..ffaa09f939e45 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/FormAuthConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/FormAuthConfig.java
@@ -22,6 +22,24 @@ public class FormAuthConfig {
     @ConfigItem(defaultValue = "/login.html")
     public String loginPage;
 
+    /**
+     * The post location.
+     */
+    @ConfigItem(defaultValue = "/j_security_check")
+    public String postLocation;
+
+    /**
+     * The username field name.
+     */
+    @ConfigItem(defaultValue = "j_username")
+    public String usernameParameter;
+
+    /**
+     * The password field name.
+     */
+    @ConfigItem(defaultValue = "j_password")
+    public String passwordParameter;
+
     /**
      * The error page
      */
@@ -41,6 +59,13 @@ public class FormAuthConfig {
     @ConfigItem(defaultValue = "true")
     public boolean redirectAfterLogin;
 
+    /**
+     * Option to control the name of the cookie used to redirect the user back
+     * to where he want to get access to.
+     */
+    @ConfigItem(defaultValue = "quarkus-redirect-location")
+    public String locationCookie;
+
     /**
      * The inactivity (idle) timeout
      *
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java
index 995c72ca97cf1..5392a3c89ed35 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java
@@ -178,36 +178,53 @@ private void calculate() {
     }
 
     private void setHostAndPort(String hostToParse, int defaultPort) {
-        int portSeparatorIdx = hostToParse.lastIndexOf(':');
-        if (portSeparatorIdx > hostToParse.lastIndexOf(']')) {
-            host = hostToParse.substring(0, portSeparatorIdx);
-            delegate.headers().set(HttpHeaders.HOST, host);
-            port = parsePort(hostToParse.substring(portSeparatorIdx + 1), defaultPort);
-        } else {
-            host = hostToParse;
-            port = -1;
+        if (hostToParse == null) {
+            hostToParse = "";
         }
+        String[] hostAndPort = parseHostAndPort(hostToParse);
+        host = hostAndPort[0];
+        delegate.headers().set(HttpHeaders.HOST, host);
+        port = parsePort(hostAndPort[1], defaultPort);
     }
 
     private SocketAddress parseFor(String forToParse, int defaultPort) {
-        String host = forToParse;
-        int port = defaultPort;
-        int portSeparatorIdx = forToParse.lastIndexOf(':');
-        if (portSeparatorIdx > forToParse.lastIndexOf(']')) {
-            host = forToParse.substring(0, portSeparatorIdx);
-            port = parsePort(forToParse.substring(portSeparatorIdx + 1), defaultPort);
-        }
-
+        String[] hostAndPort = parseHostAndPort(forToParse);
+        String host = hostAndPort[0];
+        int port = parsePort(hostAndPort[1], defaultPort);
         return new SocketAddressImpl(port, host);
     }
 
+    /**
+     * Returns a String[] of 2 elements, with the first being the host and the second the port
+     */
+    private String[] parseHostAndPort(String hostToParse) {
+        String[] hostAndPort = { hostToParse, "" };
+        int portSeparatorIdx = hostToParse.lastIndexOf(':');
+        int squareBracketIdx = hostToParse.lastIndexOf(']');
+        if ((squareBracketIdx > -1 && portSeparatorIdx > squareBracketIdx)) {
+            // ipv6 with port
+            hostAndPort[0] = hostToParse.substring(0, portSeparatorIdx);
+            hostAndPort[1] = hostToParse.substring(portSeparatorIdx + 1);
+        } else {
+            long numberOfColons = hostToParse.chars().filter(ch -> ch == ':').count();
+            if (numberOfColons == 1 && !hostToParse.endsWith(":")) {
+                // ipv4 with port
+                hostAndPort[0] = hostToParse.substring(0, portSeparatorIdx);
+                hostAndPort[1] = hostToParse.substring(portSeparatorIdx + 1);
+            }
+        }
+        return hostAndPort;
+    }
+
     private int parsePort(String portToParse, int defaultPort) {
-        try {
-            return Integer.parseInt(portToParse);
-        } catch (NumberFormatException ignored) {
-            log.error("Failed to parse a port from \"forwarded\"-type headers.");
-            return defaultPort;
+        if (portToParse != null && portToParse.length() > 0) {
+            try {
+                return Integer.parseInt(portToParse);
+            } catch (NumberFormatException ignored) {
+                log.error("Failed to parse a port from \"forwarded\"-type headers.");
+            }
         }
+        return defaultPort;
     }
 
     private String appendPrefixToUri(String prefix, String uri) {
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java
index 4e9b881c9e900..172a24288d0ad 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java
@@ -31,8 +31,41 @@ public class HttpBuildTimeConfig {
     public boolean virtual;
 
     /**
-     * The HTTP console path. Various debug/development endpoints are deployed under this path.
+     * A common root path for non-application endpoints. Various extension-provided endpoints such as metrics, health,
+     * and openapi are deployed under this path by default.
+     *
+     * * Relative path (Default, `q`) ->
+     * Non-application endpoints will be served from
+     * `${quarkus.http.root-path}/${quarkus.http.non-application-root-path}`.
+     * * Absolute path (`/q`) ->
+     * Non-application endpoints will be served from the specified path.
+     * * `${quarkus.http.root-path}` -> Setting this path to the same value as HTTP root path disables
+     * this root path. All extension-provided endpoints will be served from `${quarkus.http.root-path}`.
+     * 
+     * @asciidoclet
      */
-    @ConfigItem(defaultValue = "/quarkus")
-    public String consolePath;
+    @ConfigItem(defaultValue = "q")
+    public String nonApplicationRootPath;
+
+    /**
+     * Provide redirect endpoints for extension-provided endpoints existing prior to Quarkus 1.11.
+     * This will trigger HTTP 301 Redirects for the following:
+     *
+     * * `/graphql-ui`
+     * * `/health`
+     * * `/health-ui`
+     * * `/metrics`
+     * * `/openapi`
+     * * `/swagger-ui`
+     *
+     * Default is `true` for Quarkus 1.11.x to facilitate transition to name-spaced URIs using
+     * `${quarkus.http.non-application-root-path}`.
+     *
+     * Quarkus 1.13 will change the default to `false`,
+     * and the config item will be removed in Quarkus 2.0.
+     *
+     * @asciidoclet
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean redirectToNonApplicationRootPath;
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpConfiguration.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpConfiguration.java
index db5ebb47ade4d..549dc2b4cbbfe 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpConfiguration.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpConfiguration.java
@@ -34,8 +34,14 @@ public class HttpConfiguration {
 
     /**
      * The HTTP host
+     *
+     * In dev/test mode this defaults to localhost, in prod mode this defaults to 0.0.0.0
+     *
+     * Defaulting to 0.0.0.0 makes it easier to deploy Quarkus to container, however it
+     * is not suitable for dev/test mode as other people on the network can connect to your
+     * development machine.
      */
-    @ConfigItem(defaultValue = "0.0.0.0")
+    @ConfigItem
     public String host;
 
     /**
@@ -203,6 +209,19 @@ public class HttpConfiguration {
     @ConfigItem
     public Map<String, SameSiteCookieConfig> sameSiteCookie;
 
+    /**
+     * If responses should be compressed.
+     *
+     * Note that this will attempt to compress all responses, to avoid compressing
+     * already compressed content (such as images) you need to set the following header:
+     * 
+     * Content-Encoding: identity
+     * 
+     * Which will tell vert.x not to compress the response.
+     */
+    @ConfigItem
+    public boolean enableCompression;
+
     public ProxyConfig proxy;
 
     public int determinePort(LaunchMode launchMode) {
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpHostConfigSource.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpHostConfigSource.java
new file mode 100644
index 0000000000000..d2d700a78d97b
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpHostConfigSource.java
@@ -0,0 +1,54 @@
+package io.quarkus.vertx.http.runtime;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
+import io.quarkus.runtime.LaunchMode;
+
+/**
+ * Sets the default host config value, depending on the launch mode.
+ * <p>
+ * This can't be done with a normal default, is it changes based on the mode,
+ * so instead it is provided as a low priority config source.
+ */
+public class HttpHostConfigSource implements ConfigSource, Serializable {
+
+    public static final String QUARKUS_HTTP_HOST = "quarkus.http.host";
+    private static final String ALL_INTERFACES = "0.0.0.0";
+
+    private final int priority;
+
+    public HttpHostConfigSource(int priority) {
+        this.priority = priority;
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        return Collections.singletonMap(QUARKUS_HTTP_HOST, getValue(QUARKUS_HTTP_HOST));
+    }
+
+    @Override
+    public int getOrdinal() {
+        return priority;
+    }
+
+    @Override
+    public String getValue(String propertyName) {
+        if (propertyName.equals(QUARKUS_HTTP_HOST)) {
+            if (LaunchMode.isRemoteDev()) {
+                // in remote-dev mode we need to listen on all interfaces
+                return ALL_INTERFACES;
+            }
+            return LaunchMode.current().isDevOrTest() ? "localhost" : ALL_INTERFACES;
+        }
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return "Quarkus HTTP Host Default Value";
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyConfig.java
index cd4860dddaf93..b5feb89fb2eef 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyConfig.java
@@ -4,6 +4,8 @@
 
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConvertWith;
+import io.quarkus.runtime.configuration.TrimmedStringConverter;
 
 @ConfigGroup
 public class PolicyConfig {
@@ -12,5 +14,6 @@ public class PolicyConfig {
      * The roles that are allowed to access resources protected by this policy
      */
     @ConfigItem
+    @ConvertWith(TrimmedStringConverter.class)
     public List<String> rolesAllowed;
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyMappingConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyMappingConfig.java
index 7d59ce7132944..87705c6b0754c 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyMappingConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/PolicyMappingConfig.java
@@ -9,6 +9,14 @@
 @ConfigGroup
 public class PolicyMappingConfig {
 
+    /**
+     * Determines whether the entire permission set is enabled, or not.
+     * 
+     * By default, if the permission set is defined, it is enabled.
+     */
+    @ConfigItem
+    public Optional<Boolean> enabled;
+
     /**
      * The HTTP policy that this permission set is linked to.
      *
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java
index 53ab429bda678..10246ca5d814c 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java
@@ -71,9 +71,17 @@ public void accept(Throwable throwable) {
             return;
         }
         if (event.failure() instanceof AuthenticationFailedException) {
-            return; //handled elsewhere
+            //generally this should be handled elsewhere
+            //but if we get to this point bad things have happened
+            //so it is better to send a response than to hang
+            event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end();
+            return;
+        }
+
+        if (!event.response().headWritten()) {
+            event.response().setStatusCode(event.statusCode() > 0 ? event.statusCode() : 500);
         }
-        event.response().setStatusCode(500);
+
         String uuid = BASE_ID + ERROR_COUNT.incrementAndGet();
         String details = "";
         String stack = "";
@@ -95,9 +103,13 @@ public void accept(Throwable throwable) {
         String accept = event.request().getHeader("Accept");
         if (accept != null && accept.contains("application/json")) {
             event.response().headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json; charset=utf-8");
-            String escapedStack = stack.replace(System.lineSeparator(), "\\n").replace("\"", "\\\"");
-            StringBuilder jsonPayload = new StringBuilder("{\"details\":\"").append(details).append("\",\"stack\":\"")
-                    .append(escapedStack).append("\"}");
+            String escapedDetails = escapeJsonString(details);
+            String escapedStack = escapeJsonString(stack);
+            StringBuilder jsonPayload = new StringBuilder("{\"details\":\"")
+                    .append(escapedDetails)
+                    .append("\",\"stack\":\"")
+                    .append(escapedStack)
+                    .append("\"}");
             event.response().end(jsonPayload.toString());
         } else {
             //We default to HTML representation
@@ -114,12 +126,12 @@ private static String generateStackTrace(final Throwable exception) {
         StringWriter stringWriter = new StringWriter();
         exception.printStackTrace(new PrintWriter(stringWriter));
 
-        return escapeHtml(stringWriter.toString().trim());
+        return stringWriter.toString().trim();
     }
 
     private static String generateHeaderMessage(final Throwable exception, String uuid) {
-        return escapeHtml(String.format("Error handling %s, %s: %s", uuid, exception.getClass().getName(),
-                extractFirstLine(exception.getMessage())));
+        return String.format("Error handling %s, %s: %s", uuid, exception.getClass().getName(),
+                extractFirstLine(exception.getMessage()));
     }
 
     private static String extractFirstLine(final String message) {
@@ -131,15 +143,37 @@ private static String extractFirstLine(final String message) {
         return lines[0].trim();
     }
 
-    private static String escapeHtml(final String bodyText) {
-        if (bodyText == null) {
-            return "null";
+    static String escapeJsonString(final String text) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            char ch = text.charAt(i);
+            switch (ch) {
+                case '"':
+                    sb.append("\\\"");
+                    break;
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                case '\b':
+                    sb.append("\\b");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                default:
+                    sb.append(ch);
+            }
         }
-
-        return bodyText
-                .replace("&", "&amp;")
-                .replace("<", "&lt;")
-                .replace(">", "&gt;");
+        return sb.toString();
     }
 
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusHttpHeaders.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusHttpHeaders.java
new file mode 100644
index 0000000000000..8e7bf304a25d6
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusHttpHeaders.java
@@ -0,0 +1,598 @@
+package io.quarkus.vertx.http.runtime;
+
+import static io.netty.handler.codec.http.HttpConstants.COLON;
+import static io.netty.handler.codec.http.HttpConstants.CR;
+import static io.netty.handler.codec.http.HttpConstants.LF;
+import static io.netty.handler.codec.http.HttpConstants.SP;
+import static io.netty.util.AsciiString.CASE_INSENSITIVE_HASHER;
+import static io.netty.util.AsciiString.CASE_SENSITIVE_HASHER;
+
+import java.util.AbstractMap;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.util.AsciiString;
+import io.netty.util.CharsetUtil;
+import io.netty.util.HashingStrategy;
+import io.vertx.core.MultiMap;
+import io.vertx.core.http.impl.HttpUtils;
+
+/**
+ * Used to allow propagation of context objects from intra-JVM request producers
+ */
+public final class QuarkusHttpHeaders extends HttpHeaders implements MultiMap {
+
+    private Map<Class<?>, Object> contextObjects;
+
+    @Override
+    public MultiMap setAll(MultiMap headers) {
+        return set0(headers);
+    }
+
+    @Override
+    public MultiMap setAll(Map<String, String> headers) {
+        return set0(headers.entrySet());
+    }
+
+    @Override
+    public int size() {
+        return names().size();
+    }
+
+    private final QuarkusHttpHeaders.MapEntry[] entries = new QuarkusHttpHeaders.MapEntry[16];
+    private final QuarkusHttpHeaders.MapEntry head = new QuarkusHttpHeaders.MapEntry();
+
+    public QuarkusHttpHeaders() {
+        head.before = head.after = head;
+    }
+
+    @Override
+    public QuarkusHttpHeaders add(CharSequence name, CharSequence value) {
+        Objects.requireNonNull(value);
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        add0(h, i, name, value);
+        return this;
+    }
+
+    @Override
+    public QuarkusHttpHeaders add(CharSequence name, Object value) {
+        return add(name, (CharSequence) value);
+    }
+
+    @Override
+    public HttpHeaders add(String name, Object value) {
+        return add((CharSequence) name, (CharSequence) value);
+    }
+
+    @Override
+    public QuarkusHttpHeaders add(String name, String strVal) {
+        return add((CharSequence) name, strVal);
+    }
+
+    @Override
+    public QuarkusHttpHeaders add(CharSequence name, Iterable values) {
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        for (Object vstr : values) {
+            add0(h, i, name, (String) vstr);
+        }
+        return this;
+    }
+
+    @Override
+    public QuarkusHttpHeaders add(String name, Iterable values) {
+        return add((CharSequence) name, values);
+    }
+
+    @Override
+    public MultiMap addAll(MultiMap headers) {
+        return addAll(headers.entries());
+    }
+
+    @Override
+    public MultiMap addAll(Map<String, String> map) {
+        return addAll(map.entrySet());
+    }
+
+    private MultiMap addAll(Iterable<Map.Entry<String, String>> headers) {
+        for (Map.Entry<String, String> entry : headers) {
+            add(entry.getKey(), entry.getValue());
+        }
+        return this;
+    }
+
+    @Override
+    public QuarkusHttpHeaders remove(CharSequence name) {
+        Objects.requireNonNull(name, "name");
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        remove0(h, i, name);
+        return this;
+    }
+
+    @Override
+    public QuarkusHttpHeaders remove(final String name) {
+        return remove((CharSequence) name);
+    }
+
+    @Override
+    public QuarkusHttpHeaders set(CharSequence name, CharSequence value) {
+        return set0(name, value);
+    }
+
+    @Override
+    public QuarkusHttpHeaders set(String name, String value) {
+        return set((CharSequence) name, value);
+    }
+
+    @Override
+    public QuarkusHttpHeaders set(String name, Object value) {
+        return set((CharSequence) name, (CharSequence) value);
+    }
+
+    @Override
+    public QuarkusHttpHeaders set(CharSequence name, Object value) {
+        return set(name, (CharSequence) value);
+    }
+
+    @Override
+    public QuarkusHttpHeaders set(CharSequence name, Iterable values) {
+        Objects.requireNonNull(values, "values");
+
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+
+        remove0(h, i, name);
+        for (Object v : values) {
+            if (v == null) {
+                break;
+            }
+            add0(h, i, name, (CharSequence) v);
+        }
+
+        return this;
+    }
+
+    @Override
+    public QuarkusHttpHeaders set(String name, Iterable values) {
+        return set((CharSequence) name, values);
+    }
+
+    @Override
+    public boolean contains(CharSequence name, CharSequence value, boolean ignoreCase) {
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        QuarkusHttpHeaders.MapEntry e = entries[i];
+        HashingStrategy<CharSequence> strategy = ignoreCase ? CASE_INSENSITIVE_HASHER : CASE_SENSITIVE_HASHER;
+        while (e != null) {
+            CharSequence key = e.key;
+            if (e.hash == h && (name == key || AsciiString.contentEqualsIgnoreCase(name, key))) {
+                if (strategy.equals(value, e.getValue())) {
+                    return true;
+                }
+            }
+            e = e.next;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean contains(String name, String value, boolean ignoreCase) {
+        return contains((CharSequence) name, value, ignoreCase);
+    }
+
+    @Override
+    public boolean contains(CharSequence name) {
+        return get0(name) != null;
+    }
+
+    @Override
+    public boolean contains(String name) {
+        return contains((CharSequence) name);
+    }
+
+    @Override
+    public String get(CharSequence name) {
+        Objects.requireNonNull(name, "name");
+        CharSequence ret = get0(name);
+        return ret != null ? ret.toString() : null;
+    }
+
+    @Override
+    public String get(String name) {
+        return get((CharSequence) name);
+    }
+
+    @Override
+    public List<String> getAll(CharSequence name) {
+        Objects.requireNonNull(name, "name");
+
+        LinkedList<String> values = new LinkedList<>();
+
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        QuarkusHttpHeaders.MapEntry e = entries[i];
+        while (e != null) {
+            CharSequence key = e.key;
+            if (e.hash == h && (name == key || AsciiString.contentEqualsIgnoreCase(name, key))) {
+                values.addFirst(e.getValue().toString());
+            }
+            e = e.next;
+        }
+        return values;
+    }
+
+    @Override
+    public List<String> getAll(String name) {
+        return getAll((CharSequence) name);
+    }
+
+    @Override
+    public void forEach(Consumer<? super Map.Entry<String, String>> action) {
+        QuarkusHttpHeaders.MapEntry e = head.after;
+        while (e != head) {
+            action.accept(new AbstractMap.SimpleEntry<>(e.key.toString(), e.value.toString()));
+            e = e.after;
+        }
+    }
+
+    @Override
+    public List<Map.Entry<String, String>> entries() {
+        return MultiMap.super.entries();
+    }
+
+    @Override
+    public Iterator<Map.Entry<String, String>> iterator() {
+        return new Iterator<Map.Entry<String, String>>() {
+            MapEntry curr = head;
+
+            @Override
+            public boolean hasNext() {
+                return curr.after != head;
+            }
+
+            @Override
+            public Map.Entry<String, String> next() {
+                MapEntry next = curr.after;
+                if (next == head) {
+                    throw new NoSuchElementException();
+                }
+                curr = next;
+                return new Map.Entry<String, String>() {
+                    @Override
+                    public String getKey() {
+                        return next.key.toString();
+                    }
+
+                    @Override
+                    public String getValue() {
+                        return next.value.toString();
+                    }
+
+                    @Override
+                    public String setValue(String value) {
+                        return next.setValue(value).toString();
+                    }
+
+                    @Override
+                    public String toString() {
+                        return getKey() + ": " + getValue();
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return head == head.after;
+    }
+
+    @Override
+    public Set<String> names() {
+        Set<String> names = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        QuarkusHttpHeaders.MapEntry e = head.after;
+        while (e != head) {
+            names.add(e.getKey().toString());
+            e = e.after;
+        }
+        return names;
+    }
+
+    @Override
+    public QuarkusHttpHeaders clear() {
+        for (int i = 0; i < entries.length; i++) {
+            entries[i] = null;
+        }
+        head.before = head.after = head;
+        return this;
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : this) {
+            sb.append(entry).append('\n');
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public Integer getInt(CharSequence name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int getInt(CharSequence name, int defaultValue) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Short getShort(CharSequence name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public short getShort(CharSequence name, short defaultValue) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Long getTimeMillis(CharSequence name) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long getTimeMillis(CharSequence name, long defaultValue) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Iterator<Map.Entry<CharSequence, CharSequence>> iteratorCharSequence() {
+        return new Iterator<Map.Entry<CharSequence, CharSequence>>() {
+            QuarkusHttpHeaders.MapEntry current = head.after;
+
+            @Override
+            public boolean hasNext() {
+                return current != head;
+            }
+
+            @Override
+            public Map.Entry<CharSequence, CharSequence> next() {
+                Map.Entry<CharSequence, CharSequence> next = current;
+                current = current.after;
+                return next;
+            }
+        };
+    }
+
+    @Override
+    public HttpHeaders addInt(CharSequence name, int value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public HttpHeaders addShort(CharSequence name, short value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public HttpHeaders setInt(CharSequence name, int value) {
+        return set(name, Integer.toString(value));
+    }
+
+    @Override
+    public HttpHeaders setShort(CharSequence name, short value) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void encode(ByteBuf buf) {
+        QuarkusHttpHeaders.MapEntry current = head.after;
+        while (current != head) {
+            encoderHeader(current.key, current.value, buf);
+            current = current.after;
+        }
+    }
+
+    private static final int COLON_AND_SPACE_SHORT = (COLON << 8) | SP;
+    static final int CRLF_SHORT = (CR << 8) | LF;
+
+    static void encoderHeader(CharSequence name, CharSequence value, ByteBuf buf) {
+        final int nameLen = name.length();
+        final int valueLen = value.length();
+        final int entryLen = nameLen + valueLen + 4;
+        buf.ensureWritable(entryLen);
+        int offset = buf.writerIndex();
+        writeAscii(buf, offset, name);
+        offset += nameLen;
+        ByteBufUtil.setShortBE(buf, offset, COLON_AND_SPACE_SHORT);
+        offset += 2;
+        writeAscii(buf, offset, value);
+        offset += valueLen;
+        ByteBufUtil.setShortBE(buf, offset, CRLF_SHORT);
+        offset += 2;
+        buf.writerIndex(offset);
+    }
+
+    private static void writeAscii(ByteBuf buf, int offset, CharSequence value) {
+        if (value instanceof AsciiString) {
+            ByteBufUtil.copy((AsciiString) value, 0, buf, offset, value.length());
+        } else {
+            buf.setCharSequence(offset, value, CharsetUtil.US_ASCII);
+        }
+    }
+
+    private static final class MapEntry implements Map.Entry<CharSequence, CharSequence> {
+        final int hash;
+        final CharSequence key;
+        CharSequence value;
+        QuarkusHttpHeaders.MapEntry next;
+        QuarkusHttpHeaders.MapEntry before, after;
+
+        MapEntry() {
+            this.hash = -1;
+            this.key = null;
+            this.value = null;
+        }
+
+        MapEntry(int hash, CharSequence key, CharSequence value) {
+            this.hash = hash;
+            this.key = key;
+            this.value = value;
+        }
+
+        void remove() {
+            before.after = after;
+            after.before = before;
+        }
+
+        void addBefore(QuarkusHttpHeaders.MapEntry e) {
+            after = e;
+            before = e.before;
+            before.after = this;
+            after.before = this;
+        }
+
+        @Override
+        public CharSequence getKey() {
+            return key;
+        }
+
+        @Override
+        public CharSequence getValue() {
+            return value;
+        }
+
+        @Override
+        public CharSequence setValue(CharSequence value) {
+            Objects.requireNonNull(value, "value");
+            if (!io.vertx.core.http.HttpHeaders.DISABLE_HTTP_HEADERS_VALIDATION) {
+                HttpUtils.validateHeaderValue(value);
+            }
+            CharSequence oldValue = this.value;
+            this.value = value;
+            return oldValue;
+        }
+
+        @Override
+        public String toString() {
+            return getKey() + "=" + getValue();
+        }
+    }
+
+    private void remove0(int h, int i, CharSequence name) {
+        QuarkusHttpHeaders.MapEntry e = entries[i];
+        if (e == null) {
+            return;
+        }
+
+        for (;;) {
+            CharSequence key = e.key;
+            if (e.hash == h && (name == key || AsciiString.contentEqualsIgnoreCase(name, key))) {
+                e.remove();
+                QuarkusHttpHeaders.MapEntry next = e.next;
+                if (next != null) {
+                    entries[i] = next;
+                    e = next;
+                } else {
+                    entries[i] = null;
+                    return;
+                }
+            } else {
+                break;
+            }
+        }
+
+        for (;;) {
+            QuarkusHttpHeaders.MapEntry next = e.next;
+            if (next == null) {
+                break;
+            }
+            CharSequence key = next.key;
+            if (next.hash == h && (name == key || AsciiString.contentEqualsIgnoreCase(name, key))) {
+                e.next = next.next;
+                next.remove();
+            } else {
+                e = next;
+            }
+        }
+    }
+
+    private void add0(int h, int i, final CharSequence name, final CharSequence value) {
+        if (!io.vertx.core.http.HttpHeaders.DISABLE_HTTP_HEADERS_VALIDATION) {
+            HttpUtils.validateHeader(name, value);
+        }
+        // Update the hash table.
+        QuarkusHttpHeaders.MapEntry e = entries[i];
+        QuarkusHttpHeaders.MapEntry newEntry;
+        entries[i] = newEntry = new QuarkusHttpHeaders.MapEntry(h, name, value);
+        newEntry.next = e;
+
+        // Update the linked list.
+        newEntry.addBefore(head);
+    }
+
+    private QuarkusHttpHeaders set0(final CharSequence name, final CharSequence strVal) {
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        remove0(h, i, name);
+        if (strVal != null) {
+            add0(h, i, name, strVal);
+        }
+        return this;
+    }
+
+    private CharSequence get0(CharSequence name) {
+        int h = AsciiString.hashCode(name);
+        int i = h & 0x0000000F;
+        QuarkusHttpHeaders.MapEntry e = entries[i];
+        CharSequence value = null;
+        while (e != null) {
+            CharSequence key = e.key;
+            if (e.hash == h && (name == key || AsciiString.contentEqualsIgnoreCase(name, key))) {
+                value = e.getValue();
+            }
+            e = e.next;
+        }
+        return value;
+    }
+
+    private MultiMap set0(Iterable<Map.Entry<String, String>> map) {
+        clear();
+        for (Map.Entry<String, String> entry : map) {
+            add(entry.getKey(), entry.getValue());
+        }
+        return this;
+    }
+
+    public Map<Class<?>, Object> getContextObjects() {
+        if (contextObjects == null) {
+            return Collections.emptyMap();
+        }
+        return contextObjects;
+    }
+
+    public <T> QuarkusHttpHeaders setContextObject(Class<T> key, T type) {
+        if (contextObjects == null) {
+            contextObjects = new HashMap<>();
+        }
+        this.contextObjects.put(key, type);
+        return this;
+    }
+
+    public <T> T getContextObject(Class<T> key) {
+        return (T) getContextObjects().get(key);
+    }
+}
\ No newline at end of file
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/StaticResourcesRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/StaticResourcesRecorder.java
index 9fb213e27e2ad..9dbca79a5143c 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/StaticResourcesRecorder.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/StaticResourcesRecorder.java
@@ -52,6 +52,7 @@ public Consumer<Route> start() {
             }
         }
         if (!knownPaths.isEmpty()) {
+            ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
             StaticHandler staticHandler = StaticHandler.create(META_INF_RESOURCES).setDefaultContentEncoding("UTF-8");
             handlers.add(ctx -> {
                 String rel = ctx.mountPoint() == null ? ctx.normalisedPath()
@@ -59,6 +60,8 @@ public Consumer<Route> start() {
                 if (knownPaths.contains(rel)) {
                     staticHandler.handle(ctx);
                 } else {
+                    // make sure we don't lose the correct TCCL to Vert.x...
+                    Thread.currentThread().setContextClassLoader(currentCl);
                     ctx.next();
                 }
             });
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java
index c2cbaf82bc514..3e70939cd6bc7 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java
@@ -4,13 +4,17 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
@@ -85,9 +89,8 @@
 import io.vertx.core.impl.VertxInternal;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.JdkSSLEngineOptions;
-import io.vertx.core.net.JksOptions;
+import io.vertx.core.net.KeyStoreOptions;
 import io.vertx.core.net.PemKeyCertOptions;
-import io.vertx.core.net.PfxOptions;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.core.net.impl.ConnectionBase;
 import io.vertx.core.net.impl.VertxHandler;
@@ -119,15 +122,31 @@ public class VertxHttpRecorder {
 
     private static volatile Handler<HttpServerRequest> rootHandler;
 
+    private static volatile Handler<RoutingContext> nonApplicationRedirectHandler;
+
+    private static volatile int actualHttpPort = -1;
+    private static volatile int actualHttpsPort = -1;
+
+    public static final String GET = "GET";
     private static final Handler<HttpServerRequest> ACTUAL_ROOT = new Handler<HttpServerRequest>() {
         @Override
         public void handle(HttpServerRequest httpServerRequest) {
+            try {
+                // we simply need to know if the URI is valid
+                new URI(httpServerRequest.uri());
+            } catch (URISyntaxException e) {
+                httpServerRequest.response().setStatusCode(400).end();
+                return;
+            }
             //we need to pause the request to make sure that data does
             //not arrive before handlers have a chance to install a read handler
             //as it is possible filters such as the auth filter can do blocking tasks
             //as the underlying handler has not had a chance to install a read handler yet
             //and data that arrives while the blocking task is being processed will be lost
-            httpServerRequest.pause();
+            if (!httpServerRequest.rawMethod().equals(GET)) {
+                //we don't pause for GET requests, as there is no data
+                httpServerRequest.pause();
+            }
             Handler<HttpServerRequest> rh = VertxHttpRecorder.rootHandler;
             if (rh != null) {
                 rh.handle(httpServerRequest);
@@ -169,7 +188,7 @@ public static void startServerAfterFailedStart() {
         if (supplier == null) {
             VertxConfiguration vertxConfiguration = new VertxConfiguration();
             ConfigInstantiator.handleObject(vertxConfiguration);
-            vertx = VertxCoreRecorder.initialize(vertxConfiguration, null);
+            vertx = VertxCoreRecorder.recoverFailedStart(vertxConfiguration).get();
         } else {
             vertx = supplier.get();
         }
@@ -179,11 +198,23 @@ public static void startServerAfterFailedStart() {
             ConfigInstantiator.handleObject(buildConfig);
             HttpConfiguration config = new HttpConfiguration();
             ConfigInstantiator.handleObject(config);
+            if (config.host == null) {
+                //HttpHostConfigSource does not come into play here
+                config.host = "localhost";
+            }
             Router router = Router.router(vertx);
             if (hotReplacementHandler != null) {
                 router.route().order(Integer.MIN_VALUE).blockingHandler(hotReplacementHandler);
             }
-            rootHandler = router;
+
+            Handler<HttpServerRequest> root = router;
+            LiveReloadConfig liveReloadConfig = new LiveReloadConfig();
+            ConfigInstantiator.handleObject(liveReloadConfig);
+            if (liveReloadConfig.password.isPresent()
+                    && hotReplacementContext.getDevModeType() == DevModeType.REMOTE_SERVER_SIDE) {
+                root = remoteSyncHandler = new RemoteSyncHandler(liveReloadConfig.password.get(), root, hotReplacementContext);
+            }
+            rootHandler = root;
 
             //we can't really do
             doServerStart(vertx, buildConfig, config, LaunchMode.DEVELOPMENT, new Supplier<Integer>() {
@@ -226,15 +257,20 @@ public void startServer(Supplier<Vertx> vertx, ShutdownContext shutdown,
         }
     }
 
+    public void mountFrameworkRouter(RuntimeValue<Router> mainRouter, RuntimeValue<Router> frameworkRouter,
+            String frameworkPath) {
+        mainRouter.getValue().mountSubRouter(frameworkPath, frameworkRouter.getValue());
+    }
+
     public void finalizeRouter(BeanContainer container, Consumer<Route> defaultRouteHandler,
             List<Filter> filterList, Supplier<Vertx> vertx,
-            LiveReloadConfig liveReloadConfig,
-            RuntimeValue<Router> runtimeValue, String rootPath, LaunchMode launchMode, boolean requireBodyHandler,
+            LiveReloadConfig liveReloadConfig, Optional<RuntimeValue<Router>> mainRouterRuntimeValue,
+            RuntimeValue<Router> httpRouterRuntimeValue, String rootPath, LaunchMode launchMode, boolean requireBodyHandler,
             Handler<RoutingContext> bodyHandler, HttpConfiguration httpConfiguration,
             GracefulShutdownFilter gracefulShutdownFilter, ShutdownConfig shutdownConfig,
             Executor executor) {
         // install the default route at the end
-        Router router = runtimeValue.getValue();
+        Router httpRouteRouter = httpRouterRuntimeValue.getValue();
 
         //allow the router to be modified programmatically
         Event<Object> event = Arc.container().beanManager().getEvent();
@@ -246,26 +282,26 @@ public void finalizeRouter(BeanContainer container, Consumer<Route> defaultRoute
         filterList.addAll(filters.getFilters());
 
         // Then, fire the resuming router
-        event.select(Router.class).fire(router);
+        event.select(Router.class).fire(httpRouteRouter);
 
         for (Filter filter : filterList) {
             if (filter.getHandler() != null) {
                 // Filters with high priority gets called first.
-                router.route().order(-1 * filter.getPriority()).handler(filter.getHandler());
+                httpRouteRouter.route().order(-1 * filter.getPriority()).handler(filter.getHandler());
             }
         }
 
         if (defaultRouteHandler != null) {
-            defaultRouteHandler.accept(router.route().order(DEFAULT_ROUTE_ORDER));
+            defaultRouteHandler.accept(httpRouteRouter.route().order(DEFAULT_ROUTE_ORDER));
         }
 
-        container.instance(RouterProducer.class).initialize(router);
-        router.route().last().failureHandler(new QuarkusErrorHandler(launchMode.isDevOrTest()));
+        container.instance(RouterProducer.class).initialize(httpRouteRouter);
+        httpRouteRouter.route().last().failureHandler(new QuarkusErrorHandler(launchMode.isDevOrTest()));
 
         if (requireBodyHandler) {
             //if this is set then everything needs the body handler installed
             //TODO: config etc
-            router.route().order(Integer.MIN_VALUE + 1).handler(new Handler<RoutingContext>() {
+            httpRouteRouter.route().order(Integer.MIN_VALUE + 1).handler(new Handler<RoutingContext>() {
                 @Override
                 public void handle(RoutingContext routingContext) {
                     routingContext.request().resume();
@@ -277,7 +313,7 @@ public void handle(RoutingContext routingContext) {
         if (httpConfiguration.limits.maxBodySize.isPresent()) {
             long limit = httpConfiguration.limits.maxBodySize.get().asLongValue();
             Long limitObj = limit;
-            router.route().order(-2).handler(new Handler<RoutingContext>() {
+            httpRouteRouter.route().order(-2).handler(new Handler<RoutingContext>() {
                 @Override
                 public void handle(RoutingContext event) {
                     String lengthString = event.request().headers().get(HttpHeaderNames.CONTENT_LENGTH);
@@ -309,7 +345,7 @@ public void handle(Void e) {
             if (hotReplacementHandler != null) {
                 //recorders are always executed in the current CL
                 ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
-                router.route().order(Integer.MIN_VALUE).handler(new Handler<RoutingContext>() {
+                httpRouteRouter.route().order(Integer.MIN_VALUE).handler(new Handler<RoutingContext>() {
                     @Override
                     public void handle(RoutingContext event) {
                         Thread.currentThread().setContextClassLoader(currentCl);
@@ -317,10 +353,11 @@ public void handle(RoutingContext event) {
                     }
                 });
             }
-            root = router;
+            root = httpRouteRouter;
         } else {
-            Router mainRouter = Router.router(vertx.get());
-            mainRouter.mountSubRouter(rootPath, router);
+            Router mainRouter = mainRouterRuntimeValue.isPresent() ? mainRouterRuntimeValue.get().getValue()
+                    : Router.router(vertx.get());
+            mainRouter.mountSubRouter(rootPath, httpRouteRouter);
             if (hotReplacementHandler != null) {
                 ClassLoader currentCl = Thread.currentThread().getContextClassLoader();
                 mainRouter.route().order(Integer.MIN_VALUE).handler(new Handler<RoutingContext>() {
@@ -364,7 +401,7 @@ public void handle(HttpServerRequest event) {
                 receiver = new JBossLoggingAccessLogReceiver(accessLog.category);
             }
             AccessLogHandler handler = new AccessLogHandler(receiver, accessLog.pattern, getClass().getClassLoader());
-            router.route().order(Integer.MIN_VALUE).handler(handler);
+            httpRouteRouter.route().order(Integer.MIN_VALUE).handler(handler);
             quarkusWrapperNeeded = true;
         }
 
@@ -393,7 +430,7 @@ public void handle(HttpServerRequest event) {
             }
         };
         if (httpConfiguration.recordRequestStartTime) {
-            router.route().order(Integer.MIN_VALUE).handler(new Handler<RoutingContext>() {
+            httpRouteRouter.route().order(Integer.MIN_VALUE).handler(new Handler<RoutingContext>() {
                 @Override
                 public void handle(RoutingContext event) {
                     event.put(REQUEST_START_TIME, System.nanoTime());
@@ -429,7 +466,6 @@ private static void doServerStart(Vertx vertx, HttpBuildTimeConfig httpBuildTime
         HttpServerOptions httpServerOptions = createHttpServerOptions(httpConfiguration, launchMode, websocketSubProtocols);
         HttpServerOptions domainSocketOptions = createDomainSocketOptions(httpConfiguration, websocketSubProtocols);
         HttpServerOptions sslConfig = createSslOptions(httpBuildTimeConfig, httpConfiguration, launchMode);
-        ForwardingProxyOptions forwardingProxyOptions = ForwardingProxyOptions.from(httpConfiguration);
 
         if (httpConfiguration.insecureRequests != HttpConfiguration.InsecureRequests.ENABLED && sslConfig == null) {
             throw new IllegalStateException("Cannot set quarkus.http.redirect-insecure-requests without enabling SSL.");
@@ -509,7 +545,7 @@ private static void setHttpServerTiming(InsecureRequests insecureRequests, HttpS
 
         if (httpServerOptions != null && !InsecureRequests.DISABLED.equals(insecureRequests)) {
             serverListeningMessage += String.format(
-                    "http://%s:%s", httpServerOptions.getHost(), httpServerOptions.getPort());
+                    "http://%s:%s", httpServerOptions.getHost(), actualHttpPort);
             socketCount++;
         }
 
@@ -517,7 +553,7 @@ private static void setHttpServerTiming(InsecureRequests insecureRequests, HttpS
             if (socketCount > 0) {
                 serverListeningMessage += " and ";
             }
-            serverListeningMessage += String.format("https://%s:%s", sslConfig.getHost(), sslConfig.getPort());
+            serverListeningMessage += String.format("https://%s:%s", sslConfig.getHost(), actualHttpsPort);
             socketCount++;
         }
 
@@ -574,26 +610,13 @@ private static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeC
             }
 
             byte[] data = getFileContent(keyStorePath);
-            switch (type) {
-                case "pkcs12": {
-                    PfxOptions options = new PfxOptions()
-                            .setPassword(keystorePassword)
-                            .setValue(Buffer.buffer(data));
-                    serverOptions.setPfxKeyCertOptions(options);
-                    break;
-                }
-                case "jks": {
-                    JksOptions options = new JksOptions()
-                            .setPassword(keystorePassword)
-                            .setValue(Buffer.buffer(data));
-                    serverOptions.setKeyStoreOptions(options);
-                    break;
-                }
-                default:
-                    throw new IllegalArgumentException(
-                            "Unknown keystore type: " + type + " valid types are jks or pkcs12");
-            }
-
+            final Optional<String> keyStoreProvider = sslConfig.certificate.keyStoreProvider;
+            KeyStoreOptions options = new KeyStoreOptions()
+                    .setPassword(keystorePassword)
+                    .setValue(Buffer.buffer(data))
+                    .setType(type.toUpperCase())
+                    .setProvider(keyStoreProvider.orElse(null));
+            serverOptions.setKeyCertOptions(options);
         } else {
             return null;
         }
@@ -611,7 +634,7 @@ private static HttpServerOptions createSslOptions(HttpBuildTimeConfig buildTimeC
                 type = findKeystoreFileType(trustStoreFilePath);
             }
             createTrustStoreOptions(trustStoreFilePath, trustStorePassword.get(), type,
-                    serverOptions);
+                    sslConfig.certificate.trustStoreProvider.orElse(null), serverOptions);
         }
 
         for (String cipher : sslConfig.cipherSuites.orElse(Collections.emptyList())) {
@@ -662,27 +685,14 @@ private static void createPemKeyCertOptions(Path certFile, Path keyFile,
     }
 
     private static void createTrustStoreOptions(Path trustStoreFile, String trustStorePassword,
-            String trustStoreFileType, HttpServerOptions serverOptions) throws IOException {
+            String trustStoreFileType, String trustStoreProvider, HttpServerOptions serverOptions) throws IOException {
         byte[] data = getFileContent(trustStoreFile);
-        switch (trustStoreFileType) {
-            case "pkcs12": {
-                PfxOptions options = new PfxOptions()
-                        .setPassword(trustStorePassword)
-                        .setValue(Buffer.buffer(data));
-                serverOptions.setPfxTrustOptions(options);
-                break;
-            }
-            case "jks": {
-                JksOptions options = new JksOptions()
-                        .setPassword(trustStorePassword)
-                        .setValue(Buffer.buffer(data));
-                serverOptions.setTrustStoreOptions(options);
-                break;
-            }
-            default:
-                throw new IllegalArgumentException(
-                        "Unknown truststore type: " + trustStoreFileType + " valid types are jks or pkcs12");
-        }
+        KeyStoreOptions options = new KeyStoreOptions()
+                .setPassword(trustStorePassword)
+                .setValue(Buffer.buffer(data))
+                .setType(trustStoreFileType.toUpperCase())
+                .setProvider(trustStoreProvider);
+        serverOptions.setTrustOptions(options);
     }
 
     private static String findKeystoreFileType(Path storePath) {
@@ -722,6 +732,7 @@ private static HttpServerOptions createHttpServerOptions(HttpConfiguration httpC
         options.setTcpQuickAck(httpConfiguration.tcpQuickAck);
         options.setTcpCork(httpConfiguration.tcpCork);
         options.setTcpFastOpen(httpConfiguration.tcpFastOpen);
+        options.setCompressionSupported(httpConfiguration.enableCompression);
         options.setMaxInitialLineLength(httpConfiguration.limits.maxInitialLineLength);
         return options;
     }
@@ -769,6 +780,31 @@ public void addRoute(RuntimeValue<Router> router, Function<Router, Route> route,
         }
     }
 
+    public void setNonApplicationRedirectHandler(String nonApplicationPath, String rootPath) {
+        nonApplicationRedirectHandler = new Handler<RoutingContext>() {
+            @Override
+            public void handle(RoutingContext context) {
+                String absoluteURI = context.request().path();
+                String target = absoluteURI.substring(rootPath.length());
+                String redirectTo = nonApplicationPath + target;
+
+                String query = context.request().query();
+                if (query != null && !query.isEmpty()) {
+                    redirectTo += '?' + query;
+                }
+
+                context.response()
+                        .setStatusCode(HttpResponseStatus.MOVED_PERMANENTLY.code())
+                        .putHeader(HttpHeaderNames.LOCATION, redirectTo)
+                        .end();
+            }
+        };
+    }
+
+    public Handler<RoutingContext> getNonApplicationRedirectHandler() {
+        return nonApplicationRedirectHandler;
+    }
+
     public GracefulShutdownFilter createGracefulShutdownHandler() {
         return new GracefulShutdownFilter();
     }
@@ -784,6 +820,7 @@ private static class WebDeploymentVerticle extends AbstractVerticle {
         private final LaunchMode launchMode;
         private volatile boolean clearHttpProperty = false;
         private volatile boolean clearHttpsProperty = false;
+        private volatile Map<String, String> portPropertiesToRestore;
         private final HttpConfiguration.InsecureRequests insecureRequests;
 
         public WebDeploymentVerticle(HttpServerOptions httpOptions, HttpServerOptions httpsOptions,
@@ -890,23 +927,44 @@ private void setupTcpHttpServer(HttpServer httpServer, HttpServerOptions options
                             schema = "https";
                         } else {
                             clearHttpProperty = true;
+                            actualHttpPort = actualPort;
                             schema = "http";
                         }
+                        portPropertiesToRestore = new HashMap<>();
                         String portPropertyValue = String.valueOf(actualPort);
-                        String portPropertyName = (launchMode == LaunchMode.TEST ? "quarkus." + schema + ".test-port"
-                                : "quarkus." + schema + ".port");
-                        System.setProperty(portPropertyName, portPropertyValue);
+                        //we always set the .port property, even if we are in test mode, so this will always
+                        //reflect the current port
+                        String portPropertyName = "quarkus." + schema + ".port";
+                        String prevPortPropertyValue = System.setProperty(portPropertyName, portPropertyValue);
+                        if (!Objects.equals(prevPortPropertyValue, portPropertyValue)) {
+                            portPropertiesToRestore.put(portPropertyName, prevPortPropertyValue);
+                        }
+                        if (launchMode == LaunchMode.TEST) {
+                            //we also set the test-port property in a test
+                            String testPropName = "quarkus." + schema + ".test-port";
+                            String prevTestPropPrevValue = System.setProperty(testPropName, portPropertyValue);
+                            if (!Objects.equals(prevTestPropPrevValue, portPropertyValue)) {
+                                portPropertiesToRestore.put(testPropName, prevTestPropPrevValue);
+                            }
+                        }
                         if (launchMode.isDevOrTest()) {
                             // set the profile property as well to make sure we don't have any inconsistencies
-                            System.setProperty(propertyWithProfilePrefix(portPropertyName),
-                                    portPropertyValue);
+                            portPropertyName = propertyWithProfilePrefix(portPropertyName);
+                            prevPortPropertyValue = System.setProperty(portPropertyName, portPropertyValue);
+                            if (!Objects.equals(prevPortPropertyValue, portPropertyValue)) {
+                                portPropertiesToRestore.put(portPropertyName, prevPortPropertyValue);
+                            }
                         }
-                        // Set in HttpOptions to output the port in the Timing class
-                        options.setPort(actualPort);
+                    }
+                    if (https) {
+                        actualHttpsPort = actualPort;
+                    } else {
+                        actualHttpPort = actualPort;
                     }
                     if (remainingCount.decrementAndGet() == 0) {
                         startFuture.complete(null);
                     }
+
                 }
             });
         }
@@ -928,6 +986,15 @@ public void stop(Future<Void> stopFuture) {
                     System.clearProperty(propertyWithProfilePrefix(portPropertyName));
                 }
             }
+            if (portPropertiesToRestore != null) {
+                for (Map.Entry<String, String> entry : portPropertiesToRestore.entrySet()) {
+                    if (entry.getValue() == null) {
+                        System.clearProperty(entry.getKey());
+                    } else {
+                        System.setProperty(entry.getKey(), entry.getValue());
+                    }
+                }
+            }
 
             final AtomicInteger remainingCount = new AtomicInteger(0);
             if (httpServer != null) {
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java
index d3c6637ab3e96..ff829f45e37a1 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxInputStream.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
+import java.nio.channels.ClosedChannelException;
 import java.util.ArrayDeque;
 import java.util.Deque;
 
@@ -15,19 +16,35 @@
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.net.impl.ConnectionBase;
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxInputStream extends InputStream {
 
+    public static final String CONTINUE = "100-continue";
     private final VertxBlockingInput exchange;
 
     private boolean closed;
     private boolean finished;
     private ByteBuf pooled;
     private final long limit;
+    private ContinueState continueState = ContinueState.NONE;
 
-    public VertxInputStream(RoutingContext request, long timeout) throws IOException {
+    public VertxInputStream(RoutingContext request, long timeout) {
+        this.exchange = new VertxBlockingInput(request.request(), timeout);
+        Long limitObj = request.get(VertxHttpRecorder.MAX_REQUEST_SIZE_KEY);
+        if (limitObj == null) {
+            limit = -1;
+        } else {
+            limit = limitObj;
+        }
+        String expect = request.request().getHeader(HttpHeaderNames.EXPECT);
+        if (expect != null && expect.equalsIgnoreCase(CONTINUE)) {
+            continueState = ContinueState.REQUIRED;
+        }
+    }
 
+    public VertxInputStream(RoutingContext request, long timeout, ByteBuf existing) {
         this.exchange = new VertxBlockingInput(request.request(), timeout);
         Long limitObj = request.get(VertxHttpRecorder.MAX_REQUEST_SIZE_KEY);
         if (limitObj == null) {
@@ -35,6 +52,7 @@ public VertxInputStream(RoutingContext request, long timeout) throws IOException
         } else {
             limit = limitObj;
         }
+        this.pooled = existing;
     }
 
     @Override
@@ -57,6 +75,10 @@ public int read(final byte[] b, final int off, final int len) throws IOException
         if (closed) {
             throw new IOException("Stream is closed");
         }
+        if (continueState == ContinueState.REQUIRED) {
+            continueState = ContinueState.SENT;
+            exchange.request.response().writeContinue();
+        }
         readIntoBuffer();
         if (limit > 0 && exchange.request.bytesRead() > limit) {
             HttpServerResponse response = exchange.request.response();
@@ -150,49 +172,54 @@ public static class VertxBlockingInput implements Handler<Buffer> {
         protected Throwable readException;
         private final long timeout;
 
-        public VertxBlockingInput(HttpServerRequest request, long timeout) throws IOException {
+        public VertxBlockingInput(HttpServerRequest request, long timeout) {
             this.request = request;
             this.timeout = timeout;
-            if (!request.isEnded()) {
-                request.pause();
-                request.handler(this);
-                request.endHandler(new Handler<Void>() {
-                    @Override
-                    public void handle(Void event) {
-                        synchronized (request.connection()) {
-                            eof = true;
-                            if (waiting) {
-                                request.connection().notify();
+            final ConnectionBase connection = (ConnectionBase) request.connection();
+            synchronized (connection) {
+                if (!connection.channel().isOpen()) {
+                    readException = new ClosedChannelException();
+                } else if (!request.isEnded()) {
+                    request.pause();
+                    request.handler(this);
+                    request.endHandler(new Handler<Void>() {
+                        @Override
+                        public void handle(Void event) {
+                            synchronized (connection) {
+                                eof = true;
+                                if (waiting) {
+                                    connection.notify();
+                                }
                             }
                         }
-                    }
-                });
-                request.exceptionHandler(new Handler<Throwable>() {
-                    @Override
-                    public void handle(Throwable event) {
-                        synchronized (request.connection()) {
-                            readException = new IOException(event);
-                            if (input1 != null) {
-                                input1.getByteBuf().release();
-                                input1 = null;
-                            }
-                            if (inputOverflow != null) {
-                                Buffer d = inputOverflow.poll();
-                                while (d != null) {
-                                    d.getByteBuf().release();
-                                    d = inputOverflow.poll();
+                    });
+                    request.exceptionHandler(new Handler<Throwable>() {
+                        @Override
+                        public void handle(Throwable event) {
+                            synchronized (connection) {
+                                readException = new IOException(event);
+                                if (input1 != null) {
+                                    input1.getByteBuf().release();
+                                    input1 = null;
+                                }
+                                if (inputOverflow != null) {
+                                    Buffer d = inputOverflow.poll();
+                                    while (d != null) {
+                                        d.getByteBuf().release();
+                                        d = inputOverflow.poll();
+                                    }
+                                }
+                                if (waiting) {
+                                    connection.notify();
                                 }
-                            }
-                            if (waiting) {
-                                request.connection().notify();
                             }
                         }
-                    }
 
-                });
-                request.fetch(1);
-            } else {
-                eof = true;
+                    });
+                    request.fetch(1);
+                } else {
+                    eof = true;
+                }
             }
         }
 
@@ -271,4 +298,9 @@ public int readBytesAvailable() {
         }
     }
 
+    enum ContinueState {
+        NONE,
+        REQUIRED,
+        SENT;
+    }
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSConfig.java
index b42197b414f24..7f25b62176285 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSConfig.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSConfig.java
@@ -6,7 +6,8 @@
 
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import io.vertx.core.http.HttpMethod;
+import io.quarkus.runtime.annotations.ConvertWith;
+import io.quarkus.runtime.configuration.TrimmedStringConverter;
 
 @ConfigGroup
 public class CORSConfig {
@@ -20,6 +21,7 @@ public class CORSConfig {
      * default: returns any requested origin as valid
      */
     @ConfigItem
+    @ConvertWith(TrimmedStringConverter.class)
     public Optional<List<String>> origins;
 
     /**
@@ -31,7 +33,8 @@ public class CORSConfig {
      * default: returns any requested method as valid
      */
     @ConfigItem
-    public Optional<List<HttpMethod>> methods;
+    @ConvertWith(TrimmedStringConverter.class)
+    public Optional<List<String>> methods;
 
     /**
      * HTTP headers allowed for CORS
@@ -42,6 +45,7 @@ public class CORSConfig {
      * default: returns any requested header as valid
      */
     @ConfigItem
+    @ConvertWith(TrimmedStringConverter.class)
     public Optional<List<String>> headers;
 
     /**
@@ -52,6 +56,7 @@ public class CORSConfig {
      * default: empty
      */
     @ConfigItem
+    @ConvertWith(TrimmedStringConverter.class)
     public Optional<List<String>> exposedHeaders;
 
     /**
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java
index 29cee851b47d7..4630c97b00d85 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/cors/CORSFilter.java
@@ -6,6 +6,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpHeaders;
@@ -26,8 +27,17 @@ public CORSFilter(CORSConfig corsConfig) {
         this.corsConfig = corsConfig;
     }
 
+    public static boolean isConfiguredWithWildcard(Optional<List<String>> optionalList) {
+        if (optionalList == null || !optionalList.isPresent()) {
+            return true;
+        }
+
+        List<String> list = optionalList.get();
+        return list.isEmpty() || (list.size() == 1 && "*".equals(list.get(0)));
+    }
+
     private void processRequestedHeaders(HttpServerResponse response, String allowHeadersValue) {
-        if (!corsConfig.headers.isPresent()) {
+        if (isConfiguredWithWildcard(corsConfig.headers)) {
             response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, allowHeadersValue);
         } else {
             List<String> requestedHeaders = new ArrayList<>();
@@ -49,7 +59,7 @@ private void processRequestedHeaders(HttpServerResponse response, String allowHe
     }
 
     private void processMethods(HttpServerResponse response, String allowMethodsValue) {
-        if (!corsConfig.methods.isPresent()) {
+        if (isConfiguredWithWildcard(corsConfig.methods)) {
             response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, allowMethodsValue);
         } else {
             List<String> requestedMethods = new ArrayList<>();
@@ -58,7 +68,9 @@ private void processMethods(HttpServerResponse response, String allowMethodsValu
             }
 
             List<String> validRequestedMethods = new ArrayList<>();
-            for (HttpMethod configMethod : corsConfig.methods.get()) {
+            List<HttpMethod> methods = corsConfig.methods.get().stream().map(HttpMethod::valueOf)
+                    .collect(Collectors.toList());
+            for (HttpMethod configMethod : methods) {
                 if (requestedMethods.contains(configMethod.name().toLowerCase())) {
                     validRequestedMethods.add(configMethod.name());
                 }
@@ -91,7 +103,7 @@ public void handle(RoutingContext event) {
                 processRequestedHeaders(response, requestedHeaders);
             }
 
-            boolean allowsOrigin = !corsConfig.origins.isPresent() || corsConfig.origins.get().contains(origin);
+            boolean allowsOrigin = isConfiguredWithWildcard(corsConfig.origins) || corsConfig.origins.get().contains(origin);
 
             if (allowsOrigin) {
                 response.headers().set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, origin);
@@ -105,7 +117,7 @@ public void handle(RoutingContext event) {
 
             final Optional<List<String>> exposedHeaders = corsConfig.exposedHeaders;
 
-            if (exposedHeaders.isPresent()) {
+            if (!isConfiguredWithWildcard(exposedHeaders)) {
                 response.headers().set(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS,
                         String.join(",", exposedHeaders.orElse(Collections.emptyList())));
             }
@@ -121,4 +133,4 @@ public void handle(RoutingContext event) {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/AdditionalRouteDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/AdditionalRouteDescription.java
new file mode 100644
index 0000000000000..88a0718cb587b
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/AdditionalRouteDescription.java
@@ -0,0 +1,36 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+public class AdditionalRouteDescription implements Comparable<AdditionalRouteDescription> {
+    private String uri;
+    private String description;
+
+    // for bytecode recorder
+    public AdditionalRouteDescription() {
+    }
+
+    public AdditionalRouteDescription(String uri, String description) {
+        this.uri = uri;
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    @Override
+    public int compareTo(AdditionalRouteDescription o) {
+        return uri.compareTo(o.uri);
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java
new file mode 100644
index 0000000000000..6b4722063f99c
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java
@@ -0,0 +1,240 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InjectableObserverMethod;
+import io.quarkus.arc.RemovedBean;
+import io.quarkus.arc.impl.ArcContainerImpl;
+import io.quarkus.arc.runtime.devconsole.EventsMonitor;
+import io.quarkus.arc.runtime.devconsole.InvocationsMonitor;
+import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.http.runtime.devmode.Json.JsonArrayBuilder;
+import io.quarkus.vertx.http.runtime.devmode.Json.JsonObjectBuilder;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class ArcDevRecorder {
+
+    public Handler<RoutingContext> createSummaryHandler(Map<String, String> configProperties) {
+        return new Handler<RoutingContext>() {
+
+            @Override
+            public void handle(RoutingContext ctx) {
+                ctx.response().putHeader("Content-Type", "application/json");
+                ArcContainerImpl container = ArcContainerImpl.instance();
+                JsonObjectBuilder summary = Json.object();
+                summary.put("beans", container.getBeans().size());
+                summary.put("removedBeans", container.getRemovedBeans().size());
+                summary.put("observers", container.getObservers().size());
+                summary.put("interceptors", container.getInterceptors().size());
+                JsonArrayBuilder scopes = Json.array();
+                container.getScopes().stream().map(Class::getName).forEach(scopes::add);
+                summary.put("scopes", scopes);
+                JsonObjectBuilder config = Json.object();
+                for (Entry<String, String> entry : configProperties.entrySet()) {
+                    if (entry.getValue().equals("true") || entry.getValue().equals("false")) {
+                        config.put(entry.getKey(), Boolean.parseBoolean(entry.getValue()));
+                    } else {
+                        config.put(entry.getKey(), entry.getValue());
+                    }
+                }
+                summary.put("config", config);
+                JsonObjectBuilder links = Json.object();
+                links.put("beans", "/quarkus/arc/beans");
+                links.put("observers", "/quarkus/arc/observers");
+                links.put("removed-beans", "/quarkus/arc/removed-beans");
+                summary.put("links", links);
+                ctx.response().end(summary.build());
+            }
+        };
+    }
+
+    public Handler<RoutingContext> createBeansHandler() {
+        return new Handler<RoutingContext>() {
+
+            @Override
+            public void handle(RoutingContext ctx) {
+                ctx.response().putHeader("Content-Type", "application/json");
+
+                ArcContainerImpl container = ArcContainerImpl.instance();
+                List<InjectableBean<?>> beans = container.getBeans();
+                beans.addAll(container.getInterceptors());
+
+                String kindParam = ctx.request().getParam("kind");
+                InjectableBean.Kind kind = kindParam != null ? InjectableBean.Kind.from(kindParam.toUpperCase()) : null;
+                String scopeEndsWith = ctx.request().getParam("scope");
+                String beanClassStartsWith = ctx.request().getParam("beanClass");
+
+                for (Iterator<InjectableBean<?>> it = beans.iterator(); it.hasNext();) {
+                    InjectableBean<?> injectableBean = it.next();
+                    if (kind != null && !kind.equals(injectableBean.getKind())) {
+                        it.remove();
+                    }
+                    if (scopeEndsWith != null && !injectableBean.getScope().getName().endsWith(scopeEndsWith)) {
+                        it.remove();
+                    }
+                    if (beanClassStartsWith != null
+                            && !injectableBean.getBeanClass().getName().startsWith(beanClassStartsWith)) {
+                        it.remove();
+                    }
+                }
+
+                JsonArrayBuilder array = Json.array();
+                for (InjectableBean<?> injectableBean : beans) {
+                    JsonObjectBuilder bean = Json.object();
+                    bean.put("id", injectableBean.getIdentifier());
+                    bean.put("kind", injectableBean.getKind().toString());
+                    bean.put("generatedClass", injectableBean.getClass().getName());
+                    bean.put("beanClass", injectableBean.getBeanClass().getName());
+                    JsonArrayBuilder types = Json.array();
+                    for (Type beanType : injectableBean.getTypes()) {
+                        types.add(beanType.getTypeName());
+                    }
+                    bean.put("types", types);
+                    JsonArrayBuilder qualifiers = Json.array();
+                    for (Annotation qualifier : injectableBean.getQualifiers()) {
+                        if (qualifier.annotationType().equals(Any.class) || qualifier.annotationType().equals(Default.class)) {
+                            qualifiers.add("@" + qualifier.annotationType().getSimpleName());
+                        } else {
+                            qualifiers.add(qualifier.toString());
+                        }
+                    }
+                    bean.put("qualifiers", qualifiers);
+                    bean.put("scope", injectableBean.getScope().getName());
+
+                    if (injectableBean.getDeclaringBean() != null) {
+                        bean.put("declaringBean", injectableBean.getDeclaringBean().getIdentifier());
+                    }
+                    if (injectableBean.getName() != null) {
+                        bean.put("name", injectableBean.getName());
+                    }
+                    if (injectableBean.isAlternative()) {
+                        bean.put("alternativePriority", injectableBean.getAlternativePriority());
+                    }
+                    if (injectableBean.isDefaultBean()) {
+                        bean.put("isDefault", true);
+                    }
+                    array.add(bean);
+                }
+                ctx.response().end(array.build());
+            }
+        };
+    }
+
+    public Handler<RoutingContext> createObserversHandler() {
+        return new Handler<RoutingContext>() {
+
+            @Override
+            public void handle(RoutingContext ctx) {
+                ctx.response().putHeader("Content-Type", "application/json");
+
+                ArcContainerImpl container = ArcContainerImpl.instance();
+                List<InjectableObserverMethod<?>> observers = container.getObservers();
+
+                JsonArrayBuilder array = Json.array();
+                for (InjectableObserverMethod<?> injectableObserver : observers) {
+                    JsonObjectBuilder observer = Json.object();
+                    observer.put("generatedClass", injectableObserver.getClass().getName());
+                    observer.put("observedType", injectableObserver.getObservedType().getTypeName());
+                    if (!injectableObserver.getObservedQualifiers().isEmpty()) {
+                        JsonArrayBuilder qualifiers = Json.array();
+                        for (Annotation qualifier : injectableObserver.getObservedQualifiers()) {
+                            qualifiers.add(qualifier.toString());
+                        }
+                        observer.put("qualifiers", qualifiers);
+                    }
+                    observer.put("priority", injectableObserver.getPriority());
+                    observer.put("reception", injectableObserver.getReception().toString());
+                    observer.put("transactionPhase", injectableObserver.getTransactionPhase().toString());
+                    observer.put("async", injectableObserver.isAsync());
+                    if (injectableObserver.getDeclaringBeanIdentifier() != null) {
+                        observer.put("declaringBean", injectableObserver.getDeclaringBeanIdentifier());
+                    }
+                    array.add(observer);
+                }
+                ctx.response().end(array.build());
+            }
+        };
+    }
+
+    public Handler<RoutingContext> createRemovedBeansHandler() {
+        return new Handler<RoutingContext>() {
+
+            @Override
+            public void handle(RoutingContext ctx) {
+                ArcContainerImpl container = ArcContainerImpl.instance();
+                ctx.response().putHeader("Content-Type", "application/json");
+                JsonArrayBuilder removed = Json.array();
+                for (RemovedBean removedBean : container.getRemovedBeans()) {
+                    JsonObjectBuilder bean = Json.object();
+                    bean.put("kind", removedBean.getKind().toString());
+                    bean.put("description", removedBean.getDescription());
+                    JsonArrayBuilder types = Json.array();
+                    for (Type beanType : removedBean.getTypes()) {
+                        types.add(beanType instanceof Class ? ((Class<?>) beanType).getName() : beanType.toString());
+                    }
+                    // java.lang.Object is always skipped
+                    types.add(Object.class.getName());
+                    bean.put("types", types);
+                    JsonArrayBuilder qualifiers = Json.array();
+                    for (Annotation qualifier : removedBean.getQualifiers()) {
+                        if (qualifier.annotationType().equals(Any.class) || qualifier.annotationType().equals(Default.class)) {
+                            qualifiers.add("@" + qualifier.annotationType().getSimpleName());
+                        } else {
+                            qualifiers.add(qualifier.toString());
+                        }
+                    }
+                    bean.put("qualifiers", qualifiers);
+                    removed.add(bean);
+                }
+                ctx.response().end(removed.build());
+            }
+        };
+    }
+
+    // NOTE: we can't add this recorder to the ArC extension as it would cause a cyclic dependency
+    public Handler<RoutingContext> events() {
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form)
+                    throws Exception {
+                String action = form.get("action");
+                if ("skipContext".equals(action)) {
+                    Arc.container().instance(EventsMonitor.class).get().toggleSkipContextEvents();
+                } else {
+                    Arc.container().instance(EventsMonitor.class).get().clear();
+                }
+            }
+        };
+    }
+
+    // NOTE: we can't add this recorder to the ArC extension as it would cause a cyclic dependency
+    public Handler<RoutingContext> invocations() {
+        return new DevConsolePostHandler() {
+            @Override
+            protected void handlePost(RoutingContext event, MultiMap form)
+                    throws Exception {
+                String action = form.get("action");
+                if ("filterOutQuarkusBeans".equals(action)) {
+                    Arc.container().instance(InvocationsMonitor.class).get().toggleFilterOutQuarkusBeans();
+                } else {
+                    Arc.container().instance(InvocationsMonitor.class).get().clear();
+                }
+            }
+        };
+    }
+
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcEndpointRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcEndpointRecorder.java
deleted file mode 100644
index ad0c4c5dec82c..0000000000000
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcEndpointRecorder.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package io.quarkus.vertx.http.runtime.devmode;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-
-import io.quarkus.arc.InjectableBean;
-import io.quarkus.arc.InjectableObserverMethod;
-import io.quarkus.arc.impl.ArcContainerImpl;
-import io.quarkus.runtime.annotations.Recorder;
-import io.quarkus.vertx.http.runtime.devmode.Json.JsonArrayBuilder;
-import io.quarkus.vertx.http.runtime.devmode.Json.JsonObjectBuilder;
-import io.vertx.core.Handler;
-import io.vertx.ext.web.RoutingContext;
-
-@Recorder
-public class ArcEndpointRecorder {
-
-    public Handler<RoutingContext> createBeansHandler() {
-        return new Handler<RoutingContext>() {
-
-            @Override
-            public void handle(RoutingContext ctx) {
-                ctx.response().putHeader("Content-Type", "application/json");
-
-                ArcContainerImpl container = ArcContainerImpl.instance();
-                List<InjectableBean<?>> beans = container.getBeans();
-                beans.addAll(container.getInterceptors());
-
-                String kindParam = ctx.request().getParam("kind");
-                InjectableBean.Kind kind = kindParam != null ? InjectableBean.Kind.valueOf(kindParam) : null;
-                String scopeEndsWith = ctx.request().getParam("scope");
-                String beanClassStartsWith = ctx.request().getParam("beanClass");
-
-                for (Iterator<InjectableBean<?>> it = beans.iterator(); it.hasNext();) {
-                    InjectableBean<?> injectableBean = it.next();
-                    if (kind != null && !kind.equals(injectableBean.getKind())) {
-                        it.remove();
-                    }
-                    if (scopeEndsWith != null && !injectableBean.getScope().getName().endsWith(scopeEndsWith)) {
-                        it.remove();
-                    }
-                    if (beanClassStartsWith != null
-                            && !injectableBean.getBeanClass().getName().startsWith(beanClassStartsWith)) {
-                        it.remove();
-                    }
-                }
-
-                JsonArrayBuilder array = Json.array();
-                for (InjectableBean<?> injectableBean : beans) {
-                    JsonObjectBuilder bean = Json.object();
-                    bean.put("id", injectableBean.getIdentifier());
-                    bean.put("kind", injectableBean.getKind().toString());
-                    bean.put("generatedClass", injectableBean.getClass().getName());
-                    bean.put("beanClass", injectableBean.getBeanClass().getName());
-                    JsonArrayBuilder types = Json.array();
-                    for (Type beanType : injectableBean.getTypes()) {
-                        types.add(beanType.getTypeName());
-                    }
-                    bean.put("types", types);
-                    JsonArrayBuilder qualifiers = Json.array();
-                    for (Annotation qualifier : injectableBean.getQualifiers()) {
-                        if (qualifier.annotationType().equals(Any.class) || qualifier.annotationType().equals(Default.class)) {
-                            qualifiers.add("@" + qualifier.annotationType().getSimpleName());
-                        } else {
-                            qualifiers.add(qualifier.toString());
-                        }
-                    }
-                    bean.put("qualifiers", qualifiers);
-                    bean.put("scope", injectableBean.getScope().getName());
-
-                    if (injectableBean.getDeclaringBean() != null) {
-                        bean.put("declaringBean", injectableBean.getDeclaringBean().getIdentifier());
-                    }
-                    if (injectableBean.getName() != null) {
-                        bean.put("name", injectableBean.getName());
-                    }
-                    if (injectableBean.isAlternative()) {
-                        bean.put("alternativePriority", injectableBean.getAlternativePriority());
-                    }
-                    if (injectableBean.isDefaultBean()) {
-                        bean.put("isDefault", true);
-                    }
-                    array.add(bean);
-                }
-                ctx.response().end(array.build());
-            }
-        };
-    }
-
-    public Handler<RoutingContext> createObserversHandler() {
-        return new Handler<RoutingContext>() {
-
-            @Override
-            public void handle(RoutingContext ctx) {
-                ctx.response().putHeader("Content-Type", "application/json");
-
-                ArcContainerImpl container = ArcContainerImpl.instance();
-                List<InjectableObserverMethod<?>> observers = container.getObservers();
-
-                JsonArrayBuilder array = Json.array();
-                for (InjectableObserverMethod<?> injectableObserver : observers) {
-                    JsonObjectBuilder observer = Json.object();
-                    observer.put("generatedClass", injectableObserver.getClass().getName());
-                    observer.put("observedType", injectableObserver.getObservedType().getTypeName());
-                    if (!injectableObserver.getObservedQualifiers().isEmpty()) {
-                        JsonArrayBuilder qualifiers = Json.array();
-                        for (Annotation qualifier : injectableObserver.getObservedQualifiers()) {
-                            qualifiers.add(qualifier.toString());
-                        }
-                        observer.put("qualifiers", qualifiers);
-                    }
-                    observer.put("priority", injectableObserver.getPriority());
-                    observer.put("reception", injectableObserver.getReception().toString());
-                    observer.put("transactionPhase", injectableObserver.getTransactionPhase().toString());
-                    observer.put("async", injectableObserver.isAsync());
-                    if (injectableObserver.getDeclaringBeanIdentifier() != null) {
-                        observer.put("declaringBean", injectableObserver.getDeclaringBeanIdentifier());
-                    }
-                    array.add(observer);
-                }
-                ctx.response().end(array.build());
-            }
-        };
-    }
-
-}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java
new file mode 100644
index 0000000000000..4c7451ad9cc49
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java
@@ -0,0 +1,71 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import io.smallrye.config.ConfigValue;
+
+public class ConfigDescription implements Comparable<ConfigDescription> {
+    private String name;
+    private String description;
+    private String defaultValue;
+    private ConfigValue configValue;
+
+    public ConfigDescription() {
+    }
+
+    public ConfigDescription(final String name, final String description, final String defaultValue) {
+        this.name = name;
+        this.description = description;
+        this.defaultValue = defaultValue;
+    }
+
+    public ConfigDescription(
+            final String name,
+            final String description,
+            final String defaultValue,
+            final ConfigValue configValue) {
+        this.name = name;
+        this.description = description;
+        this.defaultValue = defaultValue;
+        this.configValue = configValue;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(final String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public ConfigValue getConfigValue() {
+        return configValue;
+    }
+
+    public void setConfigValue(final ConfigValue configValue) {
+        this.configValue = configValue;
+    }
+
+    @Override
+    public int compareTo(ConfigDescription o) {
+        int ordinal = Integer.compare(o.configValue.getConfigSourceOrdinal(), this.configValue.getConfigSourceOrdinal());
+        if (ordinal == 0) {
+            return this.configValue.getName().compareTo(o.configValue.getName());
+        }
+        return ordinal;
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java
new file mode 100644
index 0000000000000..19c63ec1f50f1
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java
@@ -0,0 +1,79 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import static io.smallrye.config.Expressions.withoutExpansion;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Supplier;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
+import io.smallrye.config.ConfigValue;
+import io.smallrye.config.SmallRyeConfig;
+
+public class ConfigDescriptionsSupplier implements Supplier<Map<ConfigSourceName, List<ConfigDescription>>> {
+
+    private List<ConfigDescription> configDescriptions;
+
+    public ConfigDescriptionsSupplier() {
+    }
+
+    public ConfigDescriptionsSupplier(final List<ConfigDescription> configDescriptions) {
+        this.configDescriptions = configDescriptions;
+    }
+
+    @Override
+    public Map<ConfigSourceName, List<ConfigDescription>> get() {
+
+        Map<ConfigSourceName, List<ConfigDescription>> ordered = new TreeMap<>();
+        List<String> properties = new ArrayList<>();
+        SmallRyeConfig current = (SmallRyeConfig) ConfigProvider.getConfig();
+
+        for (ConfigDescription item : configDescriptions) {
+            properties.add(item.getName());
+            item.setConfigValue(current.getConfigValue(item.getName()));
+
+            String configSourceName = item.getConfigValue().getConfigSourceName();
+            int configSourceOrdinal = item.getConfigValue().getConfigSourceOrdinal();
+
+            ordered.putIfAbsent(new ConfigSourceName(configSourceName, configSourceOrdinal), new ArrayList<>());
+            ordered.get(new ConfigSourceName(configSourceName, configSourceOrdinal)).add(item);
+        }
+
+        for (ConfigSource configSource : current.getConfigSources()) {
+            if (configSource.getName().equals("PropertiesConfigSource[source=Build system]")) {
+                properties.addAll(configSource.getPropertyNames());
+            }
+        }
+
+        withoutExpansion(() -> {
+            for (String propertyName : current.getPropertyNames()) {
+                if (properties.contains(propertyName)) {
+                    continue;
+                }
+
+                ConfigDescription item = new ConfigDescription(propertyName, null, null, current.getConfigValue(propertyName));
+                ConfigValue configValue = current.getConfigValue(propertyName);
+                ConfigSourceName csn = new ConfigSourceName(configValue.getConfigSourceName(),
+                        configValue.getConfigSourceOrdinal());
+                ordered.putIfAbsent(csn, new ArrayList<>());
+                ordered.get(csn).add(item);
+
+                configDescriptions.add(item);
+            }
+        });
+
+        return ordered;
+    }
+
+    public List<ConfigDescription> getConfigDescriptions() {
+        return configDescriptions;
+    }
+
+    public void setConfigDescriptions(final List<ConfigDescription> configDescriptions) {
+        this.configDescriptions = configDescriptions;
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigSourceName.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigSourceName.java
new file mode 100644
index 0000000000000..1dbd3d050cd6e
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigSourceName.java
@@ -0,0 +1,140 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import java.util.Objects;
+
+public class ConfigSourceName implements Comparable<ConfigSourceName> {
+    private static final String APPLICATION_PROPERTIES_CONFIG_SOURCE = "PropertiesConfigSource[source=application.properties]";
+    private static final String SYSTEM_PROPERTIES_CONFIG_SOURCE = "SysPropConfigSource";
+    private static final String ENVIRONMENT_CONFIG_SOURCE = "EnvConfigSource";
+    private static final String PROPERTIES_CONFIG_SOURCE = "PropertiesConfigSource";
+    private static final String DEFAULT_VALUES = "default values";
+    private static final String SOURCE = "[source=";
+    private static final int SOURCE_LENGTH = SOURCE.length();
+
+    private int order;
+    private String name;
+    private String displayName;
+    private int ordinal;
+    private boolean editable;
+
+    public ConfigSourceName() {
+    }
+
+    public ConfigSourceName(String name, int ordinal) {
+        if (name == null)
+            name = "Other";
+        this.name = name;
+        this.ordinal = ordinal;
+        this.order = createOrder();
+        this.displayName = createDisplayName();
+        this.editable = createEditable();
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+
+    public void setOrdinal(int ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public boolean isEditable() {
+        return editable;
+    }
+
+    public void setEditable(boolean editable) {
+        this.editable = editable;
+    }
+
+    private String createDisplayName() {
+        if (name.contains(SOURCE)) {
+            return name.substring(name.indexOf(SOURCE) + SOURCE_LENGTH, name.length() - 1);
+        } else if (name.equals(DEFAULT_VALUES)) {
+            return "Default values";
+        } else if (name.equals(SYSTEM_PROPERTIES_CONFIG_SOURCE)) {
+            return "System properties";
+        } else if (name.equals(ENVIRONMENT_CONFIG_SOURCE)) {
+            return "Environment variables";
+        }
+        return name;
+    }
+
+    private int createOrder() {
+        if (name.equals(APPLICATION_PROPERTIES_CONFIG_SOURCE)) {
+            return 1;
+        } else if (name.startsWith(PROPERTIES_CONFIG_SOURCE)) {
+            return 2;
+        } else if (name.equals(DEFAULT_VALUES)) {
+            return 3;
+        } else if (name.equals(SYSTEM_PROPERTIES_CONFIG_SOURCE)) {
+            return 9;
+        } else if (name.equals(ENVIRONMENT_CONFIG_SOURCE)) {
+            return 10;
+        }
+
+        return 5;
+    }
+
+    private boolean createEditable() {
+        return this.ordinal <= 250;
+    }
+
+    @Override
+    public int compareTo(ConfigSourceName o) {
+        return Integer.compare(this.order, o.order);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 89 * hash + Objects.hashCode(this.name);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final ConfigSourceName other = (ConfigSourceName) obj;
+        if (!Objects.equals(this.name, other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return displayName;
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java
new file mode 100644
index 0000000000000..65f73d410e747
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java
@@ -0,0 +1,81 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiFunction;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.dev.console.DevConsoleRequest;
+import io.quarkus.dev.console.DevConsoleResponse;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * This is a Handler running in the regular runtime Vert.x instance
+ * and what it does is to take the Vert.x request coming from client (under /q/dev/)
+ * and create the DevConsoleRequest that ends up being sent to the Netty Virtual Channel
+ * which is eventually piped into the Netty event loop that powers the Dev Vert.x instance.
+ */
+public class DevConsoleFilter implements Handler<RoutingContext> {
+
+    private static final Logger log = Logger.getLogger(DevConsoleFilter.class);
+
+    @Override
+    public void handle(RoutingContext event) {
+        Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        for (Map.Entry<String, String> entry : event.request().headers()) {
+            headers.put(entry.getKey(), event.request().headers().getAll(entry.getKey()));
+        }
+        if (event.getBody() != null) {
+            DevConsoleRequest request = new DevConsoleRequest(event.request().rawMethod(), event.request().uri(), headers,
+                    event.getBody().getBytes());
+            setupFuture(event, request.getResponse());
+            DevConsoleManager.sentRequest(request);
+        } else if (event.request().isEnded()) {
+            DevConsoleRequest request = new DevConsoleRequest(event.request().rawMethod(), event.request().uri(), headers,
+                    new byte[0]);
+            setupFuture(event, request.getResponse());
+            DevConsoleManager.sentRequest(request);
+        } else {
+            event.request().bodyHandler(new Handler<Buffer>() {
+                @Override
+                public void handle(Buffer body) {
+                    DevConsoleRequest request = new DevConsoleRequest(event.request().rawMethod(), event.request().uri(),
+                            headers, body.getBytes());
+                    setupFuture(event, request.getResponse());
+                    DevConsoleManager.sentRequest(request);
+                }
+            });
+        }
+
+    }
+
+    private void setupFuture(RoutingContext event, CompletableFuture<DevConsoleResponse> response) {
+        response.handle(new BiFunction<DevConsoleResponse, Throwable, Object>() {
+            @Override
+            public Object apply(DevConsoleResponse devConsoleResponse, Throwable throwable) {
+                if (throwable != null) {
+                    log.error("Failed to handle dev console request", throwable);
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    throwable.printStackTrace(new PrintWriter(baos));
+                    event.response().setStatusCode(500).end(Buffer.buffer(baos.toByteArray()));
+                } else {
+                    for (Map.Entry<String, List<String>> entry : devConsoleResponse.getHeaders().entrySet()) {
+                        event.response().headers().add(entry.getKey(), entry.getValue());
+                    }
+                    event.response().setStatusCode(devConsoleResponse.getStatus())
+                            .end(Buffer.buffer(devConsoleResponse.getBody()));
+                }
+                return null;
+            }
+        });
+
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java
new file mode 100644
index 0000000000000..7b0d3bb98511b
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java
@@ -0,0 +1,77 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.dev.console.DevConsoleManager;
+import io.quarkus.runtime.ShutdownContext;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class DevConsoleRecorder {
+
+    private static final Logger LOG = Logger.getLogger(DevConsoleRecorder.class);
+
+    public void addInfo(String groupId, String artifactId, String name, Supplier<? extends Object> supplier) {
+        Map<String, Map<String, Object>> info = DevConsoleManager.getTemplateInfo();
+        Map<String, Object> data = info.computeIfAbsent(groupId + "." + artifactId,
+                new Function<String, Map<String, Object>>() {
+                    @Override
+                    public Map<String, Object> apply(String s) {
+                        return new HashMap<>();
+                    }
+                });
+        data.put(name, supplier.get());
+    }
+
+    public Handler<RoutingContext> devConsoleHandler(String devConsoleFinalDestination,
+            ShutdownContext shutdownContext) {
+        shutdownContext.addShutdownTask(new CleanupDevConsoleTempDirectory(devConsoleFinalDestination));
+
+        return new DevConsoleStaticHandler(devConsoleFinalDestination);
+    }
+
+    private static final class CleanupDevConsoleTempDirectory implements Runnable {
+
+        private final Path devConsoleFinalDestination;
+
+        private CleanupDevConsoleTempDirectory(String devConsoleFinalDestination) {
+            this.devConsoleFinalDestination = Paths.get(devConsoleFinalDestination);
+        }
+
+        @Override
+        public void run() {
+            try {
+                Files.walkFileTree(devConsoleFinalDestination,
+                        new SimpleFileVisitor<Path>() {
+                            @Override
+                            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                                Files.delete(dir);
+                                return FileVisitResult.CONTINUE;
+                            }
+
+                            @Override
+                            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                                Files.delete(file);
+                                return FileVisitResult.CONTINUE;
+                            }
+                        });
+            } catch (IOException e) {
+                LOG.error("Error cleaning up DEV Console temporary directory: " + devConsoleFinalDestination, e);
+            }
+        }
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleStaticHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleStaticHandler.java
new file mode 100644
index 0000000000000..a9b8ff5f67295
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleStaticHandler.java
@@ -0,0 +1,49 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.handler.StaticHandler;
+
+public class DevConsoleStaticHandler implements Handler<RoutingContext> {
+
+    private String devConsoleFinalDestination;
+    private volatile StaticHandler staticHandler;
+
+    public DevConsoleStaticHandler() {
+    }
+
+    public DevConsoleStaticHandler(String devConsoleFinalDestination) {
+        this.devConsoleFinalDestination = devConsoleFinalDestination;
+    }
+
+    public String getDevConsoleFinalDestination() {
+        return devConsoleFinalDestination;
+    }
+
+    public void setDevConsoleFinalDestination(String devConsoleFinalDestination) {
+        this.devConsoleFinalDestination = devConsoleFinalDestination;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        getStaticHandler().handle(event);
+    }
+
+    private StaticHandler getStaticHandler() {
+        if (staticHandler != null) {
+            return staticHandler;
+        }
+
+        synchronized (this) {
+            StaticHandler localStaticHandler = staticHandler;
+            if (localStaticHandler == null) {
+                localStaticHandler = StaticHandler.create().setAllowRootFileSystemAccess(true)
+                        .setWebRoot(devConsoleFinalDestination)
+                        .setDefaultContentEncoding("UTF-8");
+                staticHandler = localStaticHandler;
+            }
+
+            return localStaticHandler;
+        }
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/Json.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/Json.java
index bd1c6ad41746e..ce0296b832dcd 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/Json.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/Json.java
@@ -178,6 +178,13 @@ public JsonArrayBuilder add(Long value) {
             return this;
         }
 
+        public JsonArrayBuilder addAll(List<JsonObjectBuilder> value) {
+            if (value != null && !value.isEmpty()) {
+                values.addAll(value);
+            }
+            return this;
+        }
+
         private void addInternal(Object value) {
             if (value != null) {
                 values.add(value);
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RedirectHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RedirectHandler.java
new file mode 100644
index 0000000000000..1bae99646484d
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RedirectHandler.java
@@ -0,0 +1,15 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+public class RedirectHandler implements Handler<RoutingContext> {
+
+    @Override
+    public void handle(RoutingContext event) {
+        event.response().setStatusCode(HttpResponseStatus.TEMPORARY_REDIRECT.code())
+                .putHeader(HttpHeaderNames.LOCATION, event.request().absoluteURI() + "/").end();
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RemoteSyncHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RemoteSyncHandler.java
index 28db2f20e4f6a..566d261d01c2d 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RemoteSyncHandler.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RemoteSyncHandler.java
@@ -14,9 +14,10 @@
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.quarkus.dev.spi.HotReplacementContext;
 import io.quarkus.dev.spi.RemoteDevState;
-import io.quarkus.runtime.ExecutorRecorder;
 import io.quarkus.runtime.util.HashUtil;
+import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
 import io.vertx.core.Handler;
+import io.vertx.core.Promise;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
@@ -28,9 +29,11 @@ public class RemoteSyncHandler implements Handler<HttpServerRequest> {
 
     public static final String APPLICATION_QUARKUS = "application/quarkus-live-reload";
     public static final String QUARKUS_SESSION = "X-Quarkus-Session";
+    public static final String QUARKUS_ERROR = "X-Quarkus-Error";
     public static final String QUARKUS_SESSION_COUNT = "X-Quarkus-Count";
     public static final String CONNECT = "/connect";
     public static final String DEV = "/dev";
+    public static final String PROBE = "/probe"; //used to check that the server is back up after restart
 
     final String password;
     final Handler<HttpServerRequest> next;
@@ -77,12 +80,16 @@ public void handle(HttpServerRequest event) {
         final String type = event.headers().get(HttpHeaderNames.CONTENT_TYPE);
         if (APPLICATION_QUARKUS.equals(type)) {
             currentSessionTimeout = time + 60000;
-            ExecutorRecorder.getCurrent().execute(new Runnable() {
+            VertxCoreRecorder.getVertx().get().executeBlocking(new Handler<Promise<Object>>() {
                 @Override
-                public void run() {
-                    handleRequest(event);
+                public void handle(Promise<Object> promise) {
+                    try {
+                        handleRequest(event);
+                    } finally {
+                        promise.complete();
+                    }
                 }
-            });
+            }, null);
             return;
         }
         next.handle(event);
@@ -98,11 +105,17 @@ private void handleRequest(HttpServerRequest event) {
                 handleDev(event);
             } else if (event.path().equals(CONNECT)) {
                 handleConnect(event);
+            } else if (event.path().equals(PROBE)) {
+                event.response().end();
             } else {
-                event.response().setStatusCode(404).end();
+                event.response().putHeader(QUARKUS_ERROR, "Unknown path " + event.path()
+                        + " make sure your remote dev URL is pointing to the context root for your Quarkus instance, and not to a sub path.")
+                        .setStatusCode(404).end();
             }
         } else {
-            event.response().setStatusCode(404).end();
+            event.response()
+                    .putHeader(QUARKUS_ERROR, "Unknown method " + event.method() + " this is not a valid remote dev request")
+                    .setStatusCode(405).end();
         }
 
     }
@@ -114,9 +127,9 @@ public void handle(Buffer b) {
                 if (checkSession(event, b.getBytes())) {
                     return;
                 }
-                ExecutorRecorder.getCurrent().execute(new Runnable() {
+                VertxCoreRecorder.getVertx().get().executeBlocking(new Handler<Promise<Object>>() {
                     @Override
-                    public void run() {
+                    public void handle(Promise<Object> promise) {
                         try {
                             Throwable problem = (Throwable) new ObjectInputStream(new ByteArrayInputStream(b.getBytes()))
                                     .readObject();
@@ -144,10 +157,11 @@ public void run() {
                         } catch (Exception e) {
                             log.error("Connect failed", e);
                             event.response().setStatusCode(500).end();
+                        } finally {
+                            promise.complete();
                         }
                     }
-                });
-
+                }, null);
             }
         }).exceptionHandler(new Handler<Throwable>() {
             @Override
@@ -169,7 +183,7 @@ public void handle(Buffer b) {
                     String compare = HashUtil.sha256(bodyHash + password);
                     if (!compare.equals(rp)) {
                         log.error("Incorrect password");
-                        event.response().setStatusCode(401).end();
+                        event.response().putHeader(QUARKUS_ERROR, "Incorrect password").setStatusCode(401).end();
                         return;
                     }
                     SecureRandom r = new SecureRandom();
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ReplacementDebugPage.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ReplacementDebugPage.java
index bbe5964fb9d39..2c245e5655499 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ReplacementDebugPage.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ReplacementDebugPage.java
@@ -1,6 +1,10 @@
 package io.quarkus.vertx.http.runtime.devmode;
 
+import java.util.function.Function;
+
+import io.quarkus.dev.ErrorPageGenerators;
 import io.quarkus.runtime.TemplateHtmlBuilder;
+import io.quarkus.runtime.util.ExceptionUtil;
 
 /**
  * Generates an error page with a stack trace.
@@ -8,11 +12,18 @@
 public class ReplacementDebugPage {
 
     public static String generateHtml(final Throwable exception) {
+        Throwable rootCause = ExceptionUtil.getRootCause(exception);
+        if (rootCause == null) {
+            rootCause = exception;
+        }
+        Function<Throwable, String> generator = ErrorPageGenerators.get(rootCause.getClass().getName());
+        if (generator != null) {
+            return generator.apply(rootCause);
+        }
+        // Default error page
         TemplateHtmlBuilder builder = new TemplateHtmlBuilder("Error restarting Quarkus", exception.getClass().getName(),
                 generateHeaderMessage(exception));
-
         builder.stack(exception);
-
         return builder.toString();
     }
 
@@ -28,4 +39,5 @@ private static String extractFirstLine(final String message) {
         String[] lines = message.split("\\r?\\n");
         return lines[0].trim();
     }
+
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RouteDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RouteDescription.java
new file mode 100644
index 0000000000000..d436049e9d060
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RouteDescription.java
@@ -0,0 +1,51 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+public class RouteDescription {
+
+    private String javaMethod;
+    private String path;
+    private String httpMethod;
+    private String produces;
+    private String consumes;
+
+    public String getJavaMethod() {
+        return javaMethod;
+    }
+
+    public void setJavaMethod(String javaMethod) {
+        this.javaMethod = javaMethod;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public void setHttpMethod(String httpMethod) {
+        this.httpMethod = httpMethod;
+    }
+
+    public String getProduces() {
+        return produces;
+    }
+
+    public void setProduces(String produces) {
+        this.produces = produces;
+    }
+
+    public String getConsumes() {
+        return consumes;
+    }
+
+    public void setConsumes(String consumes) {
+        this.consumes = consumes;
+    }
+
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RuntimeDevConsoleRoute.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RuntimeDevConsoleRoute.java
new file mode 100644
index 0000000000000..ff5a05a705691
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RuntimeDevConsoleRoute.java
@@ -0,0 +1,33 @@
+package io.quarkus.vertx.http.runtime.devmode;
+
+import java.util.function.Consumer;
+
+import io.vertx.core.http.HttpMethod;
+import io.vertx.ext.web.Route;
+
+public class RuntimeDevConsoleRoute implements Consumer<Route> {
+
+    private String method;
+
+    public RuntimeDevConsoleRoute() {
+    }
+
+    public RuntimeDevConsoleRoute(String method) {
+        this.method = method;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public RuntimeDevConsoleRoute setMethod(String method) {
+        this.method = method;
+        return this;
+    }
+
+    @Override
+    public void accept(Route route) {
+        route.method(HttpMethod.valueOf(method))
+                .order(-100);
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java
index dd531a7a0520b..8b658a5509d25 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java
@@ -14,11 +14,9 @@ public class StaticResourcesHotReplacementSetup implements HotReplacementSetup {
     @Override
     public void setupHotDeployment(HotReplacementContext context) {
         List<Path> resources = new ArrayList<>();
+        addPathIfContainsStaticResources(resources, context.getClassesDir());
         for (Path resourceDir : context.getResourcesDir()) {
-            Path resource = resourceDir.resolve(StaticResourcesRecorder.META_INF_RESOURCES);
-            if (Files.exists(resource)) {
-                resources.add(resource);
-            }
+            addPathIfContainsStaticResources(resources, resourceDir);
         }
         StaticResourcesRecorder.setHotDeploymentResources(resources);
     }
@@ -31,4 +29,12 @@ public void handleFailedInitialStart() {
     public void close() {
         StaticResourcesRecorder.setHotDeploymentResources(null);
     }
+
+    private void addPathIfContainsStaticResources(List<Path> resources, Path resourceDir) {
+        Path resource = resourceDir.resolve(StaticResourcesRecorder.META_INF_RESOURCES);
+        if (Files.exists(resource)) {
+            resources.add(resource);
+        }
+    }
+
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/VertxHttpHotReplacementSetup.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/VertxHttpHotReplacementSetup.java
index ebd44fafeaae5..01cab4bf5738d 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/VertxHttpHotReplacementSetup.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/VertxHttpHotReplacementSetup.java
@@ -1,5 +1,6 @@
 package io.quarkus.vertx.http.runtime.devmode;
 
+import io.quarkus.dev.ErrorPageGenerators;
 import io.quarkus.dev.spi.HotReplacementContext;
 import io.quarkus.dev.spi.HotReplacementSetup;
 import io.quarkus.vertx.http.runtime.VertxHttpRecorder;
@@ -100,6 +101,7 @@ public static void handleDeploymentProblem(RoutingContext routingContext, final
 
     @Override
     public void close() {
+        ErrorPageGenerators.clear();
         VertxHttpRecorder.shutDownDevMode();
     }
 }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogHandler.java
index 234f2723eb99b..bc08866e85839 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogHandler.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogHandler.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogReceiver.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogReceiver.java
index ef3750d1c18c9..242834d6ea356 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogReceiver.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/AccessLogReceiver.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/DefaultAccessLogReceiver.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/DefaultAccessLogReceiver.java
index 0985ab9cb3adf..b77b56b4c33ab 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/DefaultAccessLogReceiver.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/DefaultAccessLogReceiver.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/JBossLoggingAccessLogReceiver.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/JBossLoggingAccessLogReceiver.java
index d9dcdfa05558a..facb0af965e41 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/JBossLoggingAccessLogReceiver.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/JBossLoggingAccessLogReceiver.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/LogFileHeaderGenerator.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/LogFileHeaderGenerator.java
index e2c71b8e52718..10402240041d5 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/LogFileHeaderGenerator.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/accesslog/LogFileHeaderGenerator.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/HistoryHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/HistoryHandler.java
new file mode 100644
index 0000000000000..46c05852eb374
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/HistoryHandler.java
@@ -0,0 +1,61 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.logging.Level;
+
+import org.jboss.logmanager.ExtHandler;
+import org.jboss.logmanager.ExtLogRecord;
+
+/**
+ * Log handler for Logger Manager
+ */
+public class HistoryHandler extends ExtHandler {
+    private final LinkedBlockingQueue<ExtLogRecord> history;
+
+    public HistoryHandler() {
+        this(50);
+    }
+
+    public HistoryHandler(int size) {
+        this.history = new LinkedBlockingQueue<>(size);
+        setLevel(Level.INFO);
+        setFormatter(new JsonFormatter());
+    }
+
+    @Override
+    public final void doPublish(final ExtLogRecord record) {
+        // Don't log empty messages
+        if (record.getMessage() == null || record.getMessage().isEmpty()) {
+            return;
+        }
+
+        if (isLoggable(record)) {
+            synchronized (this) {
+                try {
+                    if (history.remainingCapacity() == 0) {
+                        history.take();
+                    }
+                    history.add(record);
+                } catch (InterruptedException ex) {
+                    ex.printStackTrace();
+                }
+            }
+
+        }
+
+    }
+
+    public boolean hasHistory() {
+        return !history.isEmpty();
+    }
+
+    public List<ExtLogRecord> getHistory() {
+        return new ArrayList<>(history);
+    }
+
+    public void clearHistory() {
+        this.history.clear();
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/JsonFormatter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/JsonFormatter.java
new file mode 100644
index 0000000000000..4c27991f292a1
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/JsonFormatter.java
@@ -0,0 +1,149 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.logmanager.ExtFormatter;
+import org.jboss.logmanager.ExtLogRecord;
+
+import io.quarkus.vertx.http.runtime.devmode.Json;
+
+/**
+ * Formatting log records into a json format
+ */
+public class JsonFormatter extends ExtFormatter {
+
+    @Override
+    public String format(final ExtLogRecord logRecord) {
+        return toJsonObject(logRecord).build();
+    }
+
+    private Json.JsonObjectBuilder toJsonObject(ExtLogRecord logRecord) {
+        String formattedMessage = formatMessage(logRecord);
+
+        Json.JsonObjectBuilder jsonObject = Json.object();
+
+        jsonObject.put(TYPE, LOG_LINE);
+        if (logRecord.getLoggerName() != null) {
+            jsonObject.put(LOGGER_NAME_SHORT, getShortFullClassName(logRecord.getLoggerName(), ""));
+            jsonObject.put(LOGGER_NAME, logRecord.getLoggerName());
+        }
+        if (logRecord.getLoggerClassName() != null) {
+            jsonObject.put(LOGGER_CLASS_NAME, logRecord.getLoggerClassName());
+        }
+        if (logRecord.getHostName() != null) {
+            jsonObject.put(HOST_NAME, logRecord.getHostName());
+        }
+        if (logRecord.getLevel() != null) {
+            jsonObject.put(LEVEL, logRecord.getLevel().getName());
+        }
+        if (formattedMessage != null) {
+            jsonObject.put(FORMATTED_MESSAGE, formattedMessage);
+        }
+        if (logRecord.getMessage() != null) {
+            jsonObject.put(MESSAGE, logRecord.getMessage());
+        }
+        jsonObject.put(SOURCE_LINE_NUMBER, logRecord.getSourceLineNumber());
+        if (logRecord.getSourceClassName() != null) {
+            String justClassName = getJustClassName(logRecord.getSourceClassName());
+            jsonObject.put(SOURCE_CLASS_NAME_FULL_SHORT, getShortFullClassName(logRecord.getSourceClassName(), justClassName));
+            jsonObject.put(SOURCE_CLASS_NAME_FULL, logRecord.getSourceClassName());
+            jsonObject.put(SOURCE_CLASS_NAME, justClassName);
+        }
+        if (logRecord.getSourceFileName() != null) {
+            jsonObject.put(SOURCE_FILE_NAME, logRecord.getSourceFileName());
+        }
+        if (logRecord.getSourceMethodName() != null) {
+            jsonObject.put(SOURCE_METHOD_NAME, logRecord.getSourceMethodName());
+        }
+        if (logRecord.getThrown() != null) {
+            jsonObject.put(STACKTRACE, getStacktraces(logRecord.getThrown()));
+        }
+        jsonObject.put(THREAD_ID, logRecord.getThreadID());
+        jsonObject.put(THREAD_NAME, logRecord.getThreadName());
+        jsonObject.put(PROCESS_ID, logRecord.getProcessId());
+        jsonObject.put(PROCESS_NAME, logRecord.getProcessName());
+        jsonObject.put(TIMESTAMP, logRecord.getMillis());
+        jsonObject.put(SEQUENCE_NUMBER, logRecord.getSequenceNumber());
+        return jsonObject;
+    }
+
+    private Json.JsonArrayBuilder getStacktraces(Throwable t) {
+        List<String> traces = new LinkedList<>();
+        addStacktrace(traces, t);
+
+        Json.JsonArrayBuilder jsonArray = Json.array();
+
+        traces.forEach((trace) -> {
+            jsonArray.add(trace);
+        });
+        return jsonArray;
+    }
+
+    private void addStacktrace(List<String> traces, Throwable t) {
+        traces.add(getStacktrace(t));
+        if (t.getCause() != null)
+            addStacktrace(traces, t.getCause());
+    }
+
+    private String getStacktrace(Throwable t) {
+        try (StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw)) {
+            t.printStackTrace(pw);
+            return sw.toString();
+        } catch (IOException ex) {
+            return null;
+        }
+    }
+
+    private String getJustClassName(String fullName) {
+        int lastDot = fullName.lastIndexOf(DOT) + 1;
+        return fullName.substring(lastDot);
+    }
+
+    private String getShortFullClassName(String fullName, String justClassName) {
+        String[] parts = fullName.split("\\" + DOT);
+        try (StringWriter buffer = new StringWriter()) {
+            for (int i = 0; i < parts.length - 1; i++) {
+                String part = parts[i];
+                if (part.equals(justClassName) || part.length() < 3) {
+                    buffer.write(part);
+                } else {
+                    buffer.write(part.substring(0, 3));
+                }
+                buffer.write(DOT);
+            }
+            buffer.write(parts[parts.length - 1]);
+            return buffer.toString();
+        } catch (IOException ex) {
+            return fullName;
+        }
+    }
+
+    private static final String TYPE = "type";
+    private static final String LEVEL = "level";
+    private static final String MESSAGE = "message";
+    private static final String FORMATTED_MESSAGE = "formattedMessage";
+    private static final String LOGGER_NAME_SHORT = "loggerNameShort";
+    private static final String LOGGER_NAME = "loggerName";
+    private static final String LOGGER_CLASS_NAME = "loggerClassName";
+    private static final String HOST_NAME = "hostName";
+    private static final String SOURCE_LINE_NUMBER = "sourceLineNumber";
+    private static final String SOURCE_CLASS_NAME_FULL = "sourceClassNameFull";
+    private static final String SOURCE_CLASS_NAME_FULL_SHORT = "sourceClassNameFullShort";
+    private static final String SOURCE_CLASS_NAME = "sourceClassName";
+    private static final String SOURCE_FILE_NAME = "sourceFileName";
+    private static final String SOURCE_METHOD_NAME = "sourceMethodName";
+    private static final String THREAD_ID = "threadId";
+    private static final String THREAD_NAME = "threadName";
+    private static final String PROCESS_ID = "processId";
+    private static final String PROCESS_NAME = "processName";
+    private static final String TIMESTAMP = "timestamp";
+    private static final String STACKTRACE = "stacktrace";
+    private static final String SEQUENCE_NUMBER = "sequenceNumber";
+    private static final String DOT = ".";
+    private static final String LOG_LINE = "logLine";
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogController.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogController.java
new file mode 100644
index 0000000000000..68cf8a466de11
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogController.java
@@ -0,0 +1,121 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import static org.jboss.logmanager.Level.ALL;
+import static org.jboss.logmanager.Level.CONFIG;
+import static org.jboss.logmanager.Level.DEBUG;
+import static org.jboss.logmanager.Level.ERROR;
+import static org.jboss.logmanager.Level.FATAL;
+import static org.jboss.logmanager.Level.FINE;
+import static org.jboss.logmanager.Level.FINER;
+import static org.jboss.logmanager.Level.FINEST;
+import static org.jboss.logmanager.Level.INFO;
+import static org.jboss.logmanager.Level.OFF;
+import static org.jboss.logmanager.Level.SEVERE;
+import static org.jboss.logmanager.Level.TRACE;
+import static org.jboss.logmanager.Level.WARN;
+import static org.jboss.logmanager.Level.WARNING;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.jboss.logmanager.Level;
+import org.jboss.logmanager.LogContext;
+import org.jboss.logmanager.Logger;
+
+import io.quarkus.vertx.http.runtime.devmode.Json;
+
+/**
+ * Allow controlling to the log levels
+ */
+public class LogController {
+    private static final org.jboss.logging.Logger LOG = org.jboss.logging.Logger.getLogger(LogController.class);
+
+    private LogController() {
+    }
+
+    public static Json.JsonArrayBuilder getLevels() {
+        Json.JsonArrayBuilder array = Json.array();
+        for (String level : LEVELS) {
+            array.add(level);
+        }
+        return array;
+    }
+
+    public static Json.JsonArrayBuilder getLoggers() {
+        LogContext logContext = LogContext.getLogContext();
+        TreeMap<String, Json.JsonObjectBuilder> loggerMap = new TreeMap<>();
+
+        Enumeration<String> loggerNames = logContext.getLoggerNames();
+        while (loggerNames.hasMoreElements()) {
+            String loggerName = loggerNames.nextElement();
+            Json.JsonObjectBuilder jsonObject = getLogger(loggerName);
+            if (jsonObject != null) {
+                loggerMap.put(loggerName, jsonObject);
+            }
+        }
+
+        List<Json.JsonObjectBuilder> orderedLoggers = new ArrayList<>(loggerMap.values());
+        Json.JsonArrayBuilder jsonArray = Json.array();
+        jsonArray.addAll(orderedLoggers);
+        return jsonArray;
+    }
+
+    public static Json.JsonObjectBuilder getLogger(String loggerName) {
+        LogContext logContext = LogContext.getLogContext();
+        if (loggerName != null && !loggerName.isEmpty()) {
+            Logger logger = logContext.getLogger(loggerName);
+            Json.JsonObjectBuilder jsonObject = Json.object();
+            jsonObject.put("name", loggerName);
+            jsonObject.put("effectiveLevel", getEffectiveLogLevel(logger));
+            jsonObject.put("configuredLevel", getConfiguredLogLevel(logger));
+            return jsonObject;
+        }
+        return null;
+    }
+
+    public static void updateLogLevel(String loggerName, String levelValue) {
+        LogContext logContext = LogContext.getLogContext();
+        Logger logger = logContext.getLogger(loggerName);
+        if (logger != null) {
+            java.util.logging.Level level = Level.parse(levelValue);
+            logger.setLevel(level);
+            LOG.info("Log level updated [" + loggerName + "] changed to [" + levelValue + "]");
+        }
+    }
+
+    private static String getConfiguredLogLevel(Logger logger) {
+        java.util.logging.Level level = logger.getLevel();
+        return level != null ? level.getName() : null;
+    }
+
+    private static String getEffectiveLogLevel(Logger logger) {
+        if (logger == null) {
+            return null;
+        }
+        if (logger.getLevel() != null) {
+            return logger.getLevel().getName();
+        }
+        return getEffectiveLogLevel(logger.getParent());
+    }
+
+    public static final List<String> LEVELS = new ArrayList<>();
+
+    static {
+        LEVELS.add(OFF.getName());
+        LEVELS.add(SEVERE.getName());
+        LEVELS.add(ERROR.getName());
+        LEVELS.add(FATAL.getName());
+        LEVELS.add(WARNING.getName());
+        LEVELS.add(WARN.getName());
+        LEVELS.add(INFO.getName());
+        LEVELS.add(DEBUG.getName());
+        LEVELS.add(TRACE.getName());
+        LEVELS.add(CONFIG.getName());
+        LEVELS.add(FINE.getName());
+        LEVELS.add(FINER.getName());
+        LEVELS.add(FINEST.getName());
+        LEVELS.add(ALL.getName());
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogStreamRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogStreamRecorder.java
new file mode 100644
index 0000000000000..48f869b75dbb8
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogStreamRecorder.java
@@ -0,0 +1,22 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import java.util.Optional;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class LogStreamRecorder {
+
+    public RuntimeValue<Optional<HistoryHandler>> handler(int size) {
+        return new RuntimeValue<>(Optional.of(new HistoryHandler(size)));
+    }
+
+    public Handler<RoutingContext> websocketHandler(RuntimeValue<Optional<HistoryHandler>> historyHandler) {
+        //we need to make sure this is created after logging
+        //is initialized, as it sets up a handler
+        return new LogStreamWebSocket(historyHandler.getValue().get());
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogStreamWebSocket.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogStreamWebSocket.java
new file mode 100644
index 0000000000000..6fcdb3f6a2409
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/LogStreamWebSocket.java
@@ -0,0 +1,184 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jboss.logmanager.ExtHandler;
+import org.jboss.logmanager.ExtLogRecord;
+import org.jboss.logmanager.LogContext;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.quarkus.vertx.http.runtime.devmode.Json;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Stream the log in json format over ws
+ */
+public class LogStreamWebSocket implements Handler<RoutingContext> {
+    private static final Logger log = Logger.getLogger(LogStreamWebSocket.class.getName());
+    private final HistoryHandler historyHandler;
+
+    private final String initMessage;
+
+    private final ExtHandler rootHandler;
+    private final org.jboss.logmanager.Logger rootLogger;
+
+    public LogStreamWebSocket(HistoryHandler historyHandler) {
+        this.historyHandler = historyHandler;
+        // Add history handler
+        final LogContext logContext = LogContext.getLogContext();
+        rootLogger = logContext.getLogger("");
+        rootHandler = findCorrectHandler(rootLogger.getHandlers());
+        initMessage = createInitMessage();
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        if ("websocket".equalsIgnoreCase(event.request().getHeader(HttpHeaderNames.UPGRADE))) {
+            event.request().toWebSocket(new Handler<AsyncResult<ServerWebSocket>>() {
+                @Override
+                public void handle(AsyncResult<ServerWebSocket> event) {
+                    if (event.succeeded()) {
+                        ServerWebSocket socket = event.result();
+                        SessionState state = new SessionState();
+                        WebSocketHandler webSocketHandler = new WebSocketHandler(socket);
+                        state.handler = webSocketHandler;
+                        state.session = socket;
+                        socket.closeHandler(new Handler<Void>() {
+                            @Override
+                            public void handle(Void event) {
+                                stop(state);
+                            }
+                        });
+                        socket.textMessageHandler(new Handler<String>() {
+                            @Override
+                            public void handle(String event) {
+                                onMessage(event, state);
+                            }
+                        });
+                        socket.writeTextMessage(initMessage.toString());
+                        start(state);
+                    } else {
+                        log.log(Level.SEVERE, "Failed to connect to log server", event.cause());
+                    }
+                }
+            });
+        } else {
+            event.next();
+        }
+
+    }
+
+    static class SessionState {
+        ServerWebSocket session;
+        ExtHandler handler;
+        boolean started;
+    }
+
+    public void onMessage(String message, SessionState session) {
+        if (message != null && !message.isEmpty()) {
+            if (message.equalsIgnoreCase(START)) {
+                start(session);
+            } else if (message.equalsIgnoreCase(STOP)) {
+                stop(session);
+            } else if (message.startsWith(UPDATE)) {
+                update(message);
+            }
+        }
+    }
+
+    private void start(SessionState session) {
+        if (!session.started) {
+            session.started = true;
+            rootLogger.addHandler(session.handler);
+
+            // Polulate history
+            if (historyHandler.hasHistory()) {
+                List<ExtLogRecord> history = historyHandler.getHistory();
+                for (ExtLogRecord lr : history) {
+                    session.handler.publish(lr);
+                }
+            }
+        }
+    }
+
+    private void stop(SessionState session) {
+        rootLogger.removeHandler(session.handler);
+        session.started = false;
+    }
+
+    private void update(String message) {
+        String[] p = message.split("\\|");
+        if (p.length == 3) {
+            String loggerName = p[1];
+            String levelVal = p[2];
+            LogController.updateLogLevel(loggerName, levelVal);
+        }
+    }
+
+    private void addHandler(ExtHandler extHandler) {
+        if (rootHandler != null) {
+            rootHandler.addHandler(extHandler);
+        } else {
+            rootLogger.addHandler(extHandler);
+        }
+    }
+
+    private void removeHandler(ExtHandler extHandler) {
+        if (rootHandler != null) {
+            rootHandler.removeHandler(extHandler);
+        } else {
+            rootLogger.removeHandler(extHandler);
+        }
+    }
+
+    private ExtHandler findCorrectHandler(java.util.logging.Handler[] handlers) {
+        for (java.util.logging.Handler h : handlers) {
+            if (h instanceof ExtHandler) {
+                ExtHandler exth = (ExtHandler) h;
+                ExtHandler consoleLogger = getConsoleHandler(exth.getHandlers());
+                if (consoleLogger != null) {
+                    return exth;
+                }
+            }
+        }
+        // Else return first ext handler
+        for (java.util.logging.Handler h : handlers) {
+            if (h instanceof ExtHandler) {
+                return (ExtHandler) h;
+            }
+        }
+        return null;
+    }
+
+    private ExtHandler getConsoleHandler(java.util.logging.Handler[] handlers) {
+        if (handlers != null && handlers.length > 0) {
+            for (java.util.logging.Handler h : handlers) {
+
+                if (h.getClass().equals(org.jboss.logmanager.handlers.ConsoleHandler.class)) {
+                    return (ExtHandler) h;
+                }
+            }
+        }
+        return null;
+    }
+
+    private String createInitMessage() {
+        Json.JsonObjectBuilder initMessage = Json.object();
+        initMessage.put(TYPE, INIT);
+        initMessage.put("loggers", LogController.getLoggers());
+        initMessage.put("levels", LogController.getLevels());
+        return initMessage.build();
+    }
+
+    private static final String TYPE = "type";
+    private static final String INIT = "init";
+    private static final String START = "start";
+    private static final String STOP = "stop";
+    private static final String UPDATE = "update";
+
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/WebSocketHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/WebSocketHandler.java
new file mode 100644
index 0000000000000..8e8917c4e95b6
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/logstream/WebSocketHandler.java
@@ -0,0 +1,37 @@
+package io.quarkus.vertx.http.runtime.logstream;
+
+import org.jboss.logmanager.ExtHandler;
+import org.jboss.logmanager.ExtLogRecord;
+
+import io.vertx.core.http.ServerWebSocket;
+
+/**
+ * Log handler for Logger Manager
+ */
+public class WebSocketHandler extends ExtHandler {
+
+    private final ServerWebSocket session;
+
+    public WebSocketHandler(ServerWebSocket session) {
+        this.session = session;
+        setFormatter(new JsonFormatter());
+    }
+
+    @Override
+    public final void doPublish(final ExtLogRecord record) {
+        // Don't log empty messages
+        if (record.getMessage() == null || record.getMessage().isEmpty()) {
+            return;
+        }
+
+        if (session != null && isLoggable(record)) {
+            String message = getFormatter().format(record);
+            try {
+                session.writeTextMessage(message);
+            } catch (Throwable ex) {
+                session.close();
+            }
+        }
+
+    }
+}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/AuthenticationCompletionException.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/AuthenticationCompletionException.java
deleted file mode 100644
index e979ad69239a7..0000000000000
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/AuthenticationCompletionException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.vertx.http.runtime.security;
-
-/**
- * Exception indicating that a user authentication flow has not been completed and no further challenge is required.
- * For example, it is used to avoid the redirect loops during an OIDC authorization code flow after the user has
- * already authenticated at the IDP site but the redirect back to Quarkus has the invalid state parameter or cookie
- * or if the code flow can not be completed.
- */
-public class AuthenticationCompletionException extends RuntimeException {
-
-    public AuthenticationCompletionException() {
-
-    }
-
-    public AuthenticationCompletionException(String errorMessage) {
-        this(errorMessage, null);
-    }
-
-    public AuthenticationCompletionException(Throwable cause) {
-        this(null, cause);
-    }
-
-    public AuthenticationCompletionException(String errorMessage, Throwable cause) {
-        super(errorMessage, cause);
-    }
-}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/AuthenticationRedirectException.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/AuthenticationRedirectException.java
deleted file mode 100644
index e1f9062ee3f63..0000000000000
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/AuthenticationRedirectException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.quarkus.vertx.http.runtime.security;
-
-/**
- * Exception indicating that a redirect is required for the authentication flow to complete.
- * For example, it can be used during an OIDC authorization code flow to redirect a user to
- * the original request URI.
- */
-public class AuthenticationRedirectException extends RuntimeException {
-
-    int code;
-    String redirectUri;
-
-    public AuthenticationRedirectException(String redirectUri) {
-        this(302, redirectUri);
-    }
-
-    public AuthenticationRedirectException(int code, String redirectUri) {
-        this.code = code;
-        this.redirectUri = redirectUri;
-    }
-
-    public AuthenticationRedirectException(Boolean autoRedirect, String redirectUri) {
-        this(autoRedirect ? 302 : 444, redirectUri);
-    }
-
-    public int getCode() {
-        return this.code;
-    }
-
-    public String getRedirectUri() {
-        return redirectUri;
-    }
-}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java
index e641dc6bf3303..21377fa1057cc 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java
index e0b2e65a238e5..9f839a0fb9fe4 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/FormAuthenticationMechanism.java
@@ -27,20 +27,25 @@ public class FormAuthenticationMechanism implements HttpAuthenticationMechanism
 
     private static final Logger log = Logger.getLogger(FormAuthenticationMechanism.class);
 
-    public static final String DEFAULT_POST_LOCATION = "/j_security_check";
-
     private final String loginPage;
     private final String errorPage;
-    private final String postLocation = DEFAULT_POST_LOCATION;
-    private final String locationCookie = "quarkus-redirect-location";
+    private final String postLocation;
+    private final String usernameParameter;
+    private final String passwordParameter;
+    private final String locationCookie;
     private final String landingPage;
     private final boolean redirectAfterLogin;
 
     private final PersistentLoginManager loginManager;
 
-    public FormAuthenticationMechanism(String loginPage, String errorPage, String landingPage, boolean redirectAfterLogin,
-            PersistentLoginManager loginManager) {
+    public FormAuthenticationMechanism(String loginPage, String postLocation,
+            String usernameParameter, String passwordParameter, String errorPage, String landingPage,
+            boolean redirectAfterLogin, String locationCookie, PersistentLoginManager loginManager) {
         this.loginPage = loginPage;
+        this.postLocation = postLocation;
+        this.usernameParameter = usernameParameter;
+        this.passwordParameter = passwordParameter;
+        this.locationCookie = locationCookie;
         this.errorPage = errorPage;
         this.landingPage = landingPage;
         this.redirectAfterLogin = redirectAfterLogin;
@@ -59,8 +64,8 @@ public void handle(Void event) {
                         try {
                             MultiMap res = exchange.request().formAttributes();
 
-                            final String jUsername = res.get("j_username");
-                            final String jPassword = res.get("j_password");
+                            final String jUsername = res.get(usernameParameter);
+                            final String jPassword = res.get(passwordParameter);
                             if (jUsername == null || jPassword == null) {
                                 log.debugf(
                                         "Could not authenticate as username or password was not present in the posted result for %s",
@@ -74,17 +79,22 @@ public void handle(Void event) {
                                     .subscribe().with(new Consumer<SecurityIdentity>() {
                                         @Override
                                         public void accept(SecurityIdentity identity) {
-                                            loginManager.save(identity, exchange, null);
-                                            if (redirectAfterLogin || exchange.getCookie(locationCookie) != null) {
-                                                handleRedirectBack(exchange);
-                                                //we  have authenticated, but we want to just redirect back to the original page
-                                                //so we don't actually authenticate the current request
-                                                //instead we have just set a cookie so the redirected request will be authenticated
-                                            } else {
-                                                exchange.response().setStatusCode(200);
-                                                exchange.response().end();
+                                            try {
+                                                loginManager.save(identity, exchange, null, exchange.request().isSSL());
+                                                if (redirectAfterLogin || exchange.getCookie(locationCookie) != null) {
+                                                    handleRedirectBack(exchange);
+                                                    //we  have authenticated, but we want to just redirect back to the original page
+                                                    //so we don't actually authenticate the current request
+                                                    //instead we have just set a cookie so the redirected request will be authenticated
+                                                } else {
+                                                    exchange.response().setStatusCode(200);
+                                                    exchange.response().end();
+                                                }
+                                                uniEmitter.complete(null);
+                                            } catch (Throwable t) {
+                                                log.error("Unable to complete post authentication", t);
+                                                uniEmitter.fail(t);
                                             }
-                                            uniEmitter.complete(null);
                                         }
                                     }, new Consumer<Throwable>() {
                                         @Override
@@ -106,6 +116,7 @@ protected void handleRedirectBack(final RoutingContext exchange) {
         Cookie redirect = exchange.getCookie(locationCookie);
         String location;
         if (redirect != null) {
+            redirect.setSecure(exchange.request().isSSL());
             location = redirect.getValue();
             exchange.response().addCookie(redirect.setMaxAge(0));
         } else {
@@ -117,7 +128,8 @@ protected void handleRedirectBack(final RoutingContext exchange) {
     }
 
     protected void storeInitialLocation(final RoutingContext exchange) {
-        exchange.response().addCookie(Cookie.cookie(locationCookie, exchange.request().absoluteURI()).setPath("/"));
+        exchange.response().addCookie(Cookie.cookie(locationCookie, exchange.request().absoluteURI())
+                .setPath("/").setSecure(exchange.request().isSSL()));
     }
 
     protected void servePage(final RoutingContext exchange, final String location) {
@@ -140,21 +152,21 @@ static Uni<ChallengeData> getRedirect(final RoutingContext exchange, final Strin
     public Uni<SecurityIdentity> authenticate(RoutingContext context,
             IdentityProviderManager identityProviderManager) {
 
-        PersistentLoginManager.RestoreResult result = loginManager.restore(context);
-        if (result != null) {
-            Uni<SecurityIdentity> ret = identityProviderManager
-                    .authenticate(new TrustedAuthenticationRequest(result.getPrincipal()));
-            return ret.onItem().invoke(new Consumer<SecurityIdentity>() {
-                @Override
-                public void accept(SecurityIdentity securityIdentity) {
-                    loginManager.save(securityIdentity, context, result);
-                }
-            });
-        }
-
         if (context.normalisedPath().endsWith(postLocation) && context.request().method().equals(HttpMethod.POST)) {
+            //we always re-auth if it is a post to the auth URL
             return runFormAuth(context, identityProviderManager);
         } else {
+            PersistentLoginManager.RestoreResult result = loginManager.restore(context);
+            if (result != null) {
+                Uni<SecurityIdentity> ret = identityProviderManager
+                        .authenticate(new TrustedAuthenticationRequest(result.getPrincipal()));
+                return ret.onItem().invoke(new Consumer<SecurityIdentity>() {
+                    @Override
+                    public void accept(SecurityIdentity securityIdentity) {
+                        loginManager.save(securityIdentity, context, result, context.request().isSSL());
+                    }
+                });
+            }
             return Uni.createFrom().optional(Optional.empty());
         }
     }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java
index 2ac07738454ab..26c50cb1910d4 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpAuthenticator.java
@@ -100,7 +100,7 @@ public Uni<SecurityIdentity> attemptAuthentication(RoutingContext routingContext
         Uni<SecurityIdentity> result = mechanisms[0].authenticate(routingContext, identityProviderManager);
         for (int i = 1; i < mechanisms.length; ++i) {
             HttpAuthenticationMechanism mech = mechanisms[i];
-            result = result.onItem().transformToUni(new Function<SecurityIdentity, Uni<SecurityIdentity>>() {
+            result = result.onItem().transformToUni(new Function<SecurityIdentity, Uni<? extends SecurityIdentity>>() {
                 @Override
                 public Uni<SecurityIdentity> apply(SecurityIdentity data) {
                     if (data != null) {
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java
index 0d7a57e37b767..af43ab529a1f4 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java
@@ -16,7 +16,9 @@
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.arc.runtime.BeanContainerListener;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.security.AuthenticationCompletionException;
 import io.quarkus.security.AuthenticationFailedException;
+import io.quarkus.security.AuthenticationRedirectException;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.identity.request.AnonymousAuthenticationRequest;
 import io.quarkus.vertx.http.runtime.FormAuthConfig;
@@ -70,7 +72,9 @@ public void accept(RoutingContext routingContext, Throwable throwable) {
                             authenticator.sendChallenge(event).subscribe().with(new Consumer<Boolean>() {
                                 @Override
                                 public void accept(Boolean aBoolean) {
-                                    event.response().end();
+                                    if (!event.response().ended()) {
+                                        event.response().end();
+                                    }
                                 }
                             }, new Consumer<Throwable>() {
                                 @Override
@@ -94,7 +98,7 @@ public void accept(Throwable throwable) {
                     }
                 });
 
-                Uni<SecurityIdentity> potentialUser = authenticator.attemptAuthentication(event).cache();
+                Uni<SecurityIdentity> potentialUser = authenticator.attemptAuthentication(event).memoize().indefinitely();
                 if (proactiveAuthentication) {
                     potentialUser
                             .subscribe().withSubscriber(new UniSubscriber<SecurityIdentity>() {
@@ -164,7 +168,7 @@ public Uni<? extends SecurityIdentity> apply(SecurityIdentity securityIdentity)
                                     }
                                     return Uni.createFrom().item(securityIdentity);
                                 }
-                            }).on().termination(new Functions.TriConsumer<SecurityIdentity, Throwable, Boolean>() {
+                            }).onTermination().invoke(new Functions.TriConsumer<SecurityIdentity, Throwable, Boolean>() {
                                 @Override
                                 public void accept(SecurityIdentity identity, Throwable throwable, Boolean aBoolean) {
                                     if (identity != null) {
@@ -182,7 +186,7 @@ public void accept(SecurityIdentity identity, Throwable throwable, Boolean aBool
                                         }
                                     }
                                 }
-                            }).cache();
+                            }).memoize().indefinitely();
                     event.put(QuarkusHttpUser.DEFERRED_IDENTITY_KEY, lazyUser);
                     event.next();
                 }
@@ -252,8 +256,13 @@ public FormAuthenticationMechanism get() {
                 String loginPage = form.loginPage.startsWith("/") ? form.loginPage : "/" + form.loginPage;
                 String errorPage = form.errorPage.startsWith("/") ? form.errorPage : "/" + form.errorPage;
                 String landingPage = form.landingPage.startsWith("/") ? form.landingPage : "/" + form.landingPage;
+                String postLocation = form.postLocation.startsWith("/") ? form.postLocation : "/" + form.postLocation;
+                String usernameParameter = form.usernameParameter;
+                String passwordParameter = form.passwordParameter;
+                String locationCookie = form.locationCookie;
                 boolean redirectAfterLogin = form.redirectAfterLogin;
-                return new FormAuthenticationMechanism(loginPage, errorPage, landingPage, redirectAfterLogin, loginManager);
+                return new FormAuthenticationMechanism(loginPage, postLocation, usernameParameter, passwordParameter,
+                        errorPage, landingPage, redirectAfterLogin, locationCookie, loginManager);
             }
         };
     }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/MtlsAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/MtlsAuthenticationMechanism.java
index b9eb8174530ff..0f71baca1c4d5 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/MtlsAuthenticationMechanism.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/MtlsAuthenticationMechanism.java
@@ -7,7 +7,7 @@
  * 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
+ *     https://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,
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java
index eb3fa95fe1488..b7464147b50cb 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PathMatchingHttpSecurityPolicy.java
@@ -83,25 +83,27 @@ void init(HttpBuildTimeConfig config, Map<String, Supplier<HttpSecurityPolicy>>
                 throw new RuntimeException("Unable to find HTTP security policy " + entry.getValue().policy);
             }
 
-            for (String path : entry.getValue().paths.orElse(Collections.emptyList())) {
-                path = path.trim();
-                if (tempMap.containsKey(path)) {
-                    HttpMatcher m = new HttpMatcher(new HashSet<>(entry.getValue().methods.orElse(Collections.emptyList())),
-                            checker);
-                    tempMap.get(path).add(m);
-                } else {
-                    HttpMatcher m = new HttpMatcher(new HashSet<>(entry.getValue().methods.orElse(Collections.emptyList())),
-                            checker);
-                    List<HttpMatcher> perms = new ArrayList<>();
-                    tempMap.put(path, perms);
-                    perms.add(m);
-                    if (path.endsWith("/*")) {
-                        String stripped = path.substring(0, path.length() - 2);
-                        pathMatcher.addPrefixPath(stripped.isEmpty() ? "/" : stripped, perms);
-                    } else if (path.endsWith("*")) {
-                        pathMatcher.addPrefixPath(path.substring(0, path.length() - 1), perms);
+            if (entry.getValue().enabled.orElse(Boolean.TRUE)) {
+                for (String path : entry.getValue().paths.orElse(Collections.emptyList())) {
+                    path = path.trim();
+                    if (tempMap.containsKey(path)) {
+                        HttpMatcher m = new HttpMatcher(new HashSet<>(entry.getValue().methods.orElse(Collections.emptyList())),
+                                checker);
+                        tempMap.get(path).add(m);
                     } else {
-                        pathMatcher.addExactPath(path, perms);
+                        HttpMatcher m = new HttpMatcher(new HashSet<>(entry.getValue().methods.orElse(Collections.emptyList())),
+                                checker);
+                        List<HttpMatcher> perms = new ArrayList<>();
+                        tempMap.put(path, perms);
+                        perms.add(m);
+                        if (path.endsWith("/*")) {
+                            String stripped = path.substring(0, path.length() - 2);
+                            pathMatcher.addPrefixPath(stripped.isEmpty() ? "/" : stripped, perms);
+                        } else if (path.endsWith("*")) {
+                            pathMatcher.addPrefixPath(path.substring(0, path.length() - 1), perms);
+                        } else {
+                            pathMatcher.addExactPath(path, perms);
+                        }
                     }
                 }
             }
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PersistentLoginManager.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PersistentLoginManager.java
index f6da62631fb87..580e771af0a1d 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PersistentLoginManager.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/PersistentLoginManager.java
@@ -37,10 +37,10 @@ public class PersistentLoginManager {
     private final long newCookieIntervalMillis;
 
     public PersistentLoginManager(String encryptionKey, String cookieName, long timeoutMillis, long newCookieIntervalMillis) {
+        this.cookieName = cookieName;
+        this.newCookieIntervalMillis = newCookieIntervalMillis;
+        this.timeoutMillis = timeoutMillis;
         try {
-            this.cookieName = cookieName;
-            this.newCookieIntervalMillis = newCookieIntervalMillis;
-            this.timeoutMillis = timeoutMillis;
             if (encryptionKey == null) {
                 this.secretKey = KeyGenerator.getInstance("AES").generateKey();
             } else if (encryptionKey.length() < 16) {
@@ -99,7 +99,7 @@ public RestoreResult restore(RoutingContext context) {
         }
     }
 
-    public void save(SecurityIdentity identity, RoutingContext context, RestoreResult restoreResult) {
+    public void save(SecurityIdentity identity, RoutingContext context, RestoreResult restoreResult, boolean secureCookie) {
         if (restoreResult != null) {
             if (!restoreResult.newCookieNeeded) {
                 return;
@@ -122,7 +122,7 @@ public void save(SecurityIdentity identity, RoutingContext context, RestoreResul
             message.put(iv);
             message.put(encrypted);
             String cookieValue = Base64.getEncoder().encodeToString(message.array());
-            context.addCookie(Cookie.cookie(cookieName, cookieValue).setPath("/"));
+            context.addCookie(Cookie.cookie(cookieName, cookieValue).setPath("/").setSecure(secureCookie));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandlerTest.java b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandlerTest.java
new file mode 100644
index 0000000000000..721cde5b029f1
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandlerTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.vertx.http.runtime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.vertx.core.json.Json;
+
+class QuarkusErrorHandlerTest {
+
+    @Test
+    public void string_with_tab_should_be_correctly_escaped() {
+        String initial = "String with a tab\tcharacter";
+        String json = QuarkusErrorHandler.escapeJsonString(initial);
+        String parsed = Json.decodeValue('"' + json + '"', String.class);
+        assertEquals(initial, parsed);
+    }
+
+    @Test
+    public void string_with_backslash_should_be_correctly_escaped() {
+        String initial = "String with a backslash \\ character";
+        String json = QuarkusErrorHandler.escapeJsonString(initial);
+        String parsed = Json.decodeValue('"' + json + '"', String.class);
+        assertEquals(initial, parsed);
+    }
+
+    @Test
+    public void string_with_quotes_should_be_correctly_escaped() {
+        String initial = "String with \"quoted text\"";
+        String json = QuarkusErrorHandler.escapeJsonString(initial);
+        String parsed = Json.decodeValue('"' + json + '"', String.class);
+        assertEquals(initial, parsed);
+    }
+
+}
diff --git a/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/cors/CORSFilterTest.java b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/cors/CORSFilterTest.java
new file mode 100644
index 0000000000000..d94e005e57d35
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/cors/CORSFilterTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.vertx.http.runtime.cors;
+
+import static io.quarkus.vertx.http.runtime.cors.CORSFilter.isConfiguredWithWildcard;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class CORSFilterTest {
+
+    @Test
+    public void isConfiguredWithWildcardTest() {
+        Assertions.assertTrue(isConfiguredWithWildcard(Optional.empty()));
+        Assertions.assertTrue(isConfiguredWithWildcard(Optional.of(Collections.EMPTY_LIST)));
+        Assertions.assertTrue(isConfiguredWithWildcard(Optional.of(Collections.singletonList("*"))));
+
+        Assertions.assertFalse(isConfiguredWithWildcard(Optional.of(Arrays.asList("PUT", "GET", "POST"))));
+        Assertions.assertFalse(isConfiguredWithWildcard(Optional.of(Arrays.asList("http://localhost:8080/", "*"))));
+        Assertions.assertFalse(isConfiguredWithWildcard(Optional.of(Collections.singletonList("http://localhost:8080/"))));
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/pom.xml b/extensions/vertx-web/deployment/pom.xml
index af68e87fef09f..5171a7c17c0b8 100644
--- a/extensions/vertx-web/deployment/pom.xml
+++ b/extensions/vertx-web/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-web-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,10 +25,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-spi</artifactId>
+        </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-security</artifactId>
+            <artifactId>quarkus-security-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -37,6 +40,11 @@
             <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java
index 7d2cc1435bbbb..a46028c85546d 100644
--- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java
+++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/DotNames.java
@@ -11,6 +11,7 @@
 import io.quarkus.vertx.web.RouteBase;
 import io.quarkus.vertx.web.RouteFilter;
 import io.quarkus.vertx.web.RoutingExchange;
+import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.buffer.Buffer;
@@ -25,15 +26,14 @@ final class DotNames {
     static final DotName UNI = DotName.createSimple(Uni.class.getName());
     static final DotName MULTI = DotName.createSimple(Multi.class.getName());
     static final DotName BUFFER = DotName.createSimple(Buffer.class.getName());
-    static final DotName RX_HTTP_SERVER_RESPONSE = DotName
-            .createSimple(io.vertx.reactivex.core.http.HttpServerResponse.class.getName());
-    static final DotName RX_HTTP_SERVER_REQUEST = DotName
-            .createSimple(io.vertx.reactivex.core.http.HttpServerRequest.class.getName());
+    static final DotName MUTINY_BUFFER = DotName.createSimple(io.vertx.mutiny.core.buffer.Buffer.class.getName());
     static final DotName HTTP_SERVER_RESPONSE = DotName.createSimple(HttpServerResponse.class.getName());
     static final DotName HTTP_SERVER_REQUEST = DotName.createSimple(HttpServerRequest.class.getName());
+    static final DotName MUTINY_HTTP_SERVER_RESPONSE = DotName.createSimple(
+            io.vertx.mutiny.core.http.HttpServerResponse.class.getName());
+    static final DotName MUTINY_HTTP_SERVER_REQUEST = DotName.createSimple(
+            io.vertx.mutiny.core.http.HttpServerRequest.class.getName());
     static final DotName ROUTING_EXCHANGE = DotName.createSimple(RoutingExchange.class.getName());
-    static final DotName RX_ROUTING_CONTEXT = DotName
-            .createSimple(io.vertx.reactivex.ext.web.RoutingContext.class.getName());
     static final DotName ROUTING_CONTEXT = DotName.createSimple(RoutingContext.class.getName());
     static final DotName BODY = DotName.createSimple(Body.class.getName());
     static final DotName HEADER = DotName.createSimple(Header.class.getName());
@@ -45,5 +45,8 @@ final class DotNames {
     static final DotName JSON_OBJECT = DotName.createSimple(JsonObject.class.getName());
     static final DotName JSON_ARRAY = DotName.createSimple(JsonArray.class.getName());
     static final DotName LIST = DotName.createSimple(List.class.getName());
+    static final DotName EXCEPTION = DotName.createSimple(Exception.class.getName());
+    static final DotName THROWABLE = DotName.createSimple(Throwable.class.getName());
+    static final DotName BLOCKING = DotName.createSimple(Blocking.class.getName());
 
 }
diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java
index 61fc82b4162f5..492ccaac49f33 100644
--- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java
+++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/HandlerDescriptor.java
@@ -1,18 +1,25 @@
 package io.quarkus.vertx.web.deployment;
 
-import org.jboss.jandex.DotName;
+import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 
+import io.quarkus.hibernate.validator.spi.BeanValidationAnnotationsBuildItem;
+import io.quarkus.vertx.http.runtime.HandlerType;
+
 /**
  * Describe a request handler.
  */
 class HandlerDescriptor {
 
     private final MethodInfo method;
+    private final BeanValidationAnnotationsBuildItem validationAnnotations;
+    private final HandlerType handlerType;
 
-    HandlerDescriptor(MethodInfo method) {
+    HandlerDescriptor(MethodInfo method, BeanValidationAnnotationsBuildItem bvAnnotations, HandlerType handlerType) {
         this.method = method;
+        this.validationAnnotations = bvAnnotations;
+        this.handlerType = handlerType;
     }
 
     Type getReturnType() {
@@ -31,6 +38,37 @@ boolean isReturningMulti() {
         return method.returnType().name().equals(DotNames.MULTI);
     }
 
+    /**
+     * @return {@code true} if the method is annotated with a constraint or {@code @Valid} or any parameter has such kind of
+     *         annotation.
+     */
+    boolean requireValidation() {
+        if (validationAnnotations == null) {
+            return false;
+        }
+        for (AnnotationInstance annotation : method.annotations()) {
+            if (validationAnnotations.getAllAnnotations().contains(annotation.name())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return {@code true} if the method is annotated with {@code @Valid}.
+     */
+    boolean isProducedResponseValidated() {
+        if (validationAnnotations == null) {
+            return false;
+        }
+        for (AnnotationInstance annotation : method.annotations()) {
+            if (validationAnnotations.getValidAnnotation().equals(annotation.name())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     Type getContentType() {
         if (isReturningVoid()) {
             return null;
@@ -60,21 +98,16 @@ boolean isContentTypeBuffer() {
         return type.name().equals(DotNames.BUFFER);
     }
 
-    boolean isContentTypeRxBuffer() {
+    boolean isContentTypeMutinyBuffer() {
         Type type = getContentType();
         if (type == null) {
             return false;
         }
-        return type.name()
-                .equals(DotName.createSimple(io.vertx.reactivex.core.buffer.Buffer.class.getName()));
+        return type.name().equals(DotNames.MUTINY_BUFFER);
     }
 
-    boolean isContentTypeMutinyBuffer() {
-        Type type = getContentType();
-        if (type == null) {
-            return false;
-        }
-        return type.name().equals(DotName.createSimple(io.vertx.mutiny.core.buffer.Buffer.class.getName()));
+    HandlerType getHandlerType() {
+        return handlerType;
     }
 
 }
diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java
index ed63d6c1eb430..0f436ac10466b 100644
--- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java
+++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/Methods.java
@@ -1,7 +1,10 @@
 package io.quarkus.vertx.web.deployment;
 
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Consumer;
 
 import javax.enterprise.context.spi.Context;
@@ -15,13 +18,18 @@
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableContext;
 import io.quarkus.arc.InjectableReferenceProvider;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.FieldCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.vertx.web.runtime.MultiJsonArraySupport;
 import io.quarkus.vertx.web.runtime.MultiSseSupport;
 import io.quarkus.vertx.web.runtime.MultiSupport;
+import io.quarkus.vertx.web.runtime.RouteHandler;
 import io.quarkus.vertx.web.runtime.RouteHandlers;
+import io.quarkus.vertx.web.runtime.ValidationSupport;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.groups.UniSubscribe;
@@ -66,12 +74,14 @@ class Methods {
             .ofMethod(HttpServerRequest.class, "params", MultiMap.class);
     static final MethodDescriptor REQUEST_HEADERS = MethodDescriptor
             .ofMethod(HttpServerRequest.class, "headers", MultiMap.class);
-
     static final MethodDescriptor RESPONSE = MethodDescriptor
             .ofMethod(RoutingContext.class, "response", HttpServerResponse.class);
-
     static final MethodDescriptor FAIL = MethodDescriptor
             .ofMethod(RoutingContext.class, "fail", Void.TYPE, Throwable.class);
+    static final MethodDescriptor FAILURE = MethodDescriptor
+            .ofMethod(RoutingContext.class, "failure", Throwable.class);
+    static final MethodDescriptor NEXT = MethodDescriptor
+            .ofMethod(RoutingContext.class, "next", void.class);
 
     static final MethodDescriptor UNI_SUBSCRIBE = MethodDescriptor.ofMethod(Uni.class, "subscribe", UniSubscribe.class);
     static final MethodDescriptor UNI_SUBSCRIBE_WITH = MethodDescriptor
@@ -83,8 +93,6 @@ class Methods {
             Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_SUBSCRIBE_BUFFER = MethodDescriptor.ofMethod(MultiSupport.class, "subscribeBuffer",
             Void.TYPE, Multi.class, RoutingContext.class);
-    static final MethodDescriptor MULTI_SUBSCRIBE_RX_BUFFER = MethodDescriptor.ofMethod(MultiSupport.class, "subscribeRxBuffer",
-            Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_SUBSCRIBE_MUTINY_BUFFER = MethodDescriptor.ofMethod(MultiSupport.class,
             "subscribeMutinyBuffer", Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_SUBSCRIBE_OBJECT = MethodDescriptor.ofMethod(MultiSupport.class, "subscribeObject",
@@ -97,9 +105,6 @@ class Methods {
     static final MethodDescriptor MULTI_SSE_SUBSCRIBE_BUFFER = MethodDescriptor.ofMethod(MultiSseSupport.class,
             "subscribeBuffer",
             Void.TYPE, Multi.class, RoutingContext.class);
-    static final MethodDescriptor MULTI_SSE_SUBSCRIBE_RX_BUFFER = MethodDescriptor.ofMethod(MultiSseSupport.class,
-            "subscribeRxBuffer",
-            Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_SSE_SUBSCRIBE_MUTINY_BUFFER = MethodDescriptor.ofMethod(MultiSseSupport.class,
             "subscribeMutinyBuffer", Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_SSE_SUBSCRIBE_OBJECT = MethodDescriptor.ofMethod(MultiSseSupport.class,
@@ -114,8 +119,6 @@ class Methods {
             "subscribeString", Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_JSON_SUBSCRIBE_BUFFER = MethodDescriptor.ofMethod(MultiJsonArraySupport.class,
             "subscribeBuffer", Void.TYPE, Multi.class, RoutingContext.class);
-    static final MethodDescriptor MULTI_JSON_SUBSCRIBE_RX_BUFFER = MethodDescriptor.ofMethod(MultiJsonArraySupport.class,
-            "subscribeRxBuffer", Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_JSON_SUBSCRIBE_MUTINY_BUFFER = MethodDescriptor.ofMethod(MultiJsonArraySupport.class,
             "subscribeMutinyBuffer", Void.TYPE, Multi.class, RoutingContext.class);
     static final MethodDescriptor MULTI_JSON_SUBSCRIBE_OBJECT = MethodDescriptor.ofMethod(MultiJsonArraySupport.class,
@@ -130,9 +133,6 @@ class Methods {
             .ofMethod(HttpServerResponse.class, "end", Void.TYPE, Buffer.class);
     static final MethodDescriptor SET_STATUS = MethodDescriptor
             .ofMethod(HttpServerResponse.class, "setStatusCode", HttpServerResponse.class, Integer.TYPE);
-    static final MethodDescriptor RX_GET_DELEGATE = MethodDescriptor
-            .ofMethod(io.vertx.reactivex.core.buffer.Buffer.class, "getDelegate", Buffer.class);
-
     static final MethodDescriptor MUTINY_GET_DELEGATE = MethodDescriptor
             .ofMethod(io.vertx.mutiny.core.buffer.Buffer.class, "getDelegate", Buffer.class);
     static final MethodDescriptor JSON_ENCODE = MethodDescriptor
@@ -160,14 +160,57 @@ class Methods {
             .ofMethod(InjectableBean.class, "destroy",
                     void.class, Object.class,
                     CreationalContext.class);
-    static final MethodDescriptor OBJECT_CONSTRUCTOR = MethodDescriptor.ofConstructor(Object.class);
+    static final MethodDescriptor ROUTE_HANDLER_CONSTRUCTOR = MethodDescriptor.ofConstructor(RouteHandler.class);
 
     static final MethodDescriptor ROUTE_HANDLERS_SET_CONTENT_TYPE = MethodDescriptor
-            .ofMethod(RouteHandlers.class, "setContentType", void.class, RoutingContext.class);
+            .ofMethod(RouteHandlers.class, "setContentType", void.class, RoutingContext.class, String.class);
 
     static final MethodDescriptor OPTIONAL_OF_NULLABLE = MethodDescriptor
             .ofMethod(Optional.class, "ofNullable", Optional.class, Object.class);
 
+    static final String VALIDATION_VALIDATOR = "javax.validation.Validator";
+    static final String VALIDATION_CONSTRAINT_VIOLATION_EXCEPTION = "javax.validation.ConstraintViolationException";
+
+    static final MethodDescriptor VALIDATION_GET_VALIDATOR = MethodDescriptor.ofMethod(ValidationSupport.class, "getValidator",
+            "javax.validation.Validator", ArcContainer.class);
+    static final MethodDescriptor VALIDATION_MAP_VIOLATIONS_TO_JSON = MethodDescriptor
+            .ofMethod(ValidationSupport.class, "mapViolationsToJson", String.class, Set.class,
+                    HttpServerResponse.class);
+    static final MethodDescriptor VALIDATION_HANDLE_VIOLATION_EXCEPTION = MethodDescriptor
+            .ofMethod(ValidationSupport.class.getName(), "handleViolationException",
+                    Void.TYPE.getName(), Methods.VALIDATION_CONSTRAINT_VIOLATION_EXCEPTION,
+                    RoutingContext.class.getName());
+
+    static final MethodDescriptor VALIDATOR_VALIDATE = MethodDescriptor
+            .ofMethod("javax.validation.Validator", "validate", "java.util.Set",
+                    Object.class, Class[].class);
+    static final MethodDescriptor SET_IS_EMPTY = MethodDescriptor.ofMethod(Set.class, "isEmpty", Boolean.TYPE);
+
+    static final MethodDescriptor IS_ASSIGNABLE_FROM = MethodDescriptor.ofMethod(Class.class, "isAssignableFrom",
+            boolean.class, Class.class);
+    static final MethodDescriptor GET_CLASS = MethodDescriptor.ofMethod(Object.class, "getClass", Class.class);
+
+    static final MethodDescriptor STRING_CHAR_AT = MethodDescriptor.ofMethod(String.class, "charAt", int.class);
+    static final MethodDescriptor INTEGER_VALUE_OF = MethodDescriptor.ofMethod(Integer.class, "valueOf", Integer.class,
+            String.class);
+    static final MethodDescriptor LONG_VALUE_OF = MethodDescriptor.ofMethod(Long.class, "valueOf", Long.class, String.class);
+    static final MethodDescriptor BOOLEAN_VALUE_OF = MethodDescriptor.ofMethod(Boolean.class, "valueOf", Boolean.class,
+            String.class);
+    static final MethodDescriptor CHARACTER_VALUE_OF = MethodDescriptor.ofMethod(Character.class, "valueOf", Character.class,
+            char.class);
+    static final MethodDescriptor FLOAT_VALUE_OF = MethodDescriptor.ofMethod(Float.class, "valueOf", Float.class, String.class);
+    static final MethodDescriptor DOUBLE_VALUE_OF = MethodDescriptor.ofMethod(Double.class, "valueOf", Double.class,
+            String.class);
+    static final MethodDescriptor SHORT_VALUE_OF = MethodDescriptor.ofMethod(Short.class, "valueOf", Short.class, String.class);
+    static final MethodDescriptor BYTE_VALUE_OF = MethodDescriptor.ofMethod(Byte.class, "valueOf", Byte.class, String.class);
+
+    static final MethodDescriptor COLLECTION_SIZE = MethodDescriptor.ofMethod(Collection.class, "size", int.class);
+    static final MethodDescriptor COLLECTION_ITERATOR = MethodDescriptor.ofMethod(Collection.class, "iterator", Iterator.class);
+    static final MethodDescriptor COLLECTION_ADD = MethodDescriptor.ofMethod(Collection.class, "add", boolean.class,
+            Object.class);
+    static final MethodDescriptor ITERATOR_NEXT = MethodDescriptor.ofMethod(Iterator.class, "next", Object.class);
+    static final MethodDescriptor ITERATOR_HAS_NEXT = MethodDescriptor.ofMethod(Iterator.class, "hasNext", boolean.class);
+
     private Methods() {
         // Avoid direct instantiation
     }
@@ -189,8 +232,7 @@ static ResultHandle createNpeBecauseItemIfNull(BytecodeCreator writer) {
     }
 
     static MethodDescriptor getEndMethodForContentType(HandlerDescriptor descriptor) {
-        if (descriptor.isContentTypeBuffer() || descriptor.isContentTypeRxBuffer() || descriptor
-                .isContentTypeMutinyBuffer()) {
+        if (descriptor.isContentTypeBuffer() || descriptor.isContentTypeMutinyBuffer()) {
             return END_WITH_BUFFER;
         }
         return END_WITH_STRING;
@@ -204,4 +246,43 @@ static void setContentTypeToJson(ResultHandle response, BytecodeCreator invoke)
         branch.invokeInterfaceMethod(MULTIMAP_SET, headers, ct, branch.load("application/json"));
         branch.close();
     }
+
+    /**
+     * Generate the following code:
+     *
+     * <pre>
+     * String s = null;
+     * Set<ConstraintViolation<Object>> violations = validator.validate(res);
+     * if (!violations.isEmpty()) {
+     *    s = ValidationSupport.mapViolationsToJson(violations, response);
+     * } else {
+     *    s = res.encode()
+     * }
+     * </pre>
+     */
+    public static ResultHandle validateProducedItem(ResultHandle response, BytecodeCreator writer, ResultHandle res,
+            FieldCreator validatorField, ResultHandle owner) {
+
+        AssignableResultHandle result = writer.createVariable(String.class);
+        writer.assign(result, writer.loadNull());
+
+        ResultHandle validator = writer.readInstanceField(validatorField.getFieldDescriptor(), owner);
+        ResultHandle violations = writer.invokeInterfaceMethod(
+                VALIDATOR_VALIDATE, validator, res, writer.newArray(Class.class, 0));
+
+        ResultHandle isEmpty = writer.invokeInterfaceMethod(SET_IS_EMPTY, violations);
+        BranchResult ifNoViolations = writer.ifTrue(isEmpty);
+
+        ResultHandle encoded = ifNoViolations.trueBranch().invokeStaticMethod(JSON_ENCODE, res);
+        ifNoViolations.trueBranch().assign(result, encoded);
+        ifNoViolations.trueBranch().close();
+
+        ResultHandle json = ifNoViolations.falseBranch().invokeStaticMethod(VALIDATION_MAP_VIOLATIONS_TO_JSON, violations,
+                response);
+        ifNoViolations.falseBranch().assign(result, json);
+        ifNoViolations.falseBranch().close();
+
+        return result;
+
+    }
 }
diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java
index e5bf83a03fa66..add7a48d162c6 100644
--- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java
+++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java
@@ -1,10 +1,10 @@
 package io.quarkus.vertx.web.deployment;
 
-import static io.quarkus.vertx.web.deployment.DotNames.PARAM;
+import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
 import static org.objectweb.asm.Opcodes.ACC_FINAL;
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -17,13 +17,16 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Contextual;
-import javax.inject.Singleton;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
@@ -39,9 +42,8 @@
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableContext;
-import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.AutoAddScopeBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
-import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
 import io.quarkus.arc.deployment.TransformedAnnotationsBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
@@ -49,24 +51,29 @@
 import io.quarkus.arc.impl.CreationalContextImpl;
 import io.quarkus.arc.processor.AnnotationStore;
 import io.quarkus.arc.processor.Annotations;
-import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.arc.processor.BuildExtension;
 import io.quarkus.arc.processor.BuiltinScope;
+import io.quarkus.deployment.Capabilities;
+import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
+import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.gizmo.FieldCreator;
@@ -74,19 +81,31 @@
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
+import io.quarkus.gizmo.WhileLoop;
+import io.quarkus.hibernate.validator.spi.BeanValidationAnnotationsBuildItem;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.TemplateHtmlBuilder;
 import io.quarkus.runtime.util.HashUtil;
 import io.quarkus.vertx.http.deployment.FilterBuildItem;
+import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RequireBodyHandlerBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.deployment.VertxWebRouterBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.devmode.RouteDescriptionBuildItem;
 import io.quarkus.vertx.http.runtime.HandlerType;
-import io.quarkus.vertx.web.Header;
 import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
 import io.quarkus.vertx.web.RouteFilter;
 import io.quarkus.vertx.web.runtime.RouteHandler;
 import io.quarkus.vertx.web.runtime.RouteMatcher;
 import io.quarkus.vertx.web.runtime.RoutingExchangeImpl;
 import io.quarkus.vertx.web.runtime.UniFailureCallback;
 import io.quarkus.vertx.web.runtime.VertxWebRecorder;
+import io.quarkus.vertx.web.runtime.devmode.ResourceNotFoundRecorder;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
@@ -105,10 +124,13 @@ class VertxWebProcessor {
     private static final String VALUE_CONSUMES = "consumes";
     private static final String VALUE_METHODS = "methods";
     private static final String VALUE_ORDER = "order";
+    private static final String VALUE_TYPE = "type";
     private static final String SLASH = "/";
 
     private static final List<ParameterInjector> PARAM_INJECTORS = initParamInjectors();
 
+    private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("[a-zA-Z_0-9]+");
+
     @BuildStep
     FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.VERTX_WEB);
@@ -116,14 +138,18 @@ FeatureBuildItem feature() {
 
     @BuildStep
     void unremovableBeans(BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
-        unremovableBeans.produce(UnremovableBeanBuildItem.beanClassAnnotation(io.quarkus.vertx.web.deployment.DotNames.ROUTE));
-        unremovableBeans.produce(UnremovableBeanBuildItem.beanClassAnnotation(io.quarkus.vertx.web.deployment.DotNames.ROUTES));
         unremovableBeans
-                .produce(UnremovableBeanBuildItem.beanClassAnnotation(io.quarkus.vertx.web.deployment.DotNames.ROUTE_FILTER));
+                .produce(UnremovableBeanBuildItem.beanClassAnnotation(io.quarkus.vertx.web.deployment.DotNames.ROUTE));
+        unremovableBeans
+                .produce(UnremovableBeanBuildItem.beanClassAnnotation(io.quarkus.vertx.web.deployment.DotNames.ROUTES));
+        unremovableBeans
+                .produce(UnremovableBeanBuildItem
+                        .beanClassAnnotation(io.quarkus.vertx.web.deployment.DotNames.ROUTE_FILTER));
     }
 
     @BuildStep
     void validateBeanDeployment(
+            BeanArchiveIndexBuildItem beanArchive,
             ValidationPhaseBuildItem validationPhase,
             TransformedAnnotationsBuildItem transformedAnnotations,
             BuildProducer<AnnotatedRouteHandlerBuildItem> routeHandlerBusinessMethods,
@@ -142,15 +168,17 @@ void validateBeanDeployment(
                 AnnotationInstance routeAnnotation = annotationStore.getAnnotation(method,
                         io.quarkus.vertx.web.deployment.DotNames.ROUTE);
                 if (routeAnnotation != null) {
-                    validateRouteMethod(bean, method, transformedAnnotations);
+                    validateRouteMethod(bean, method, transformedAnnotations, beanArchive.getIndex(), routeAnnotation);
                     routes.add(routeAnnotation);
                 }
                 if (routes.isEmpty()) {
                     AnnotationInstance routesAnnotation = annotationStore.getAnnotation(method,
                             io.quarkus.vertx.web.deployment.DotNames.ROUTES);
                     if (routesAnnotation != null) {
-                        validateRouteMethod(bean, method, transformedAnnotations);
-                        Collections.addAll(routes, routesAnnotation.value().asNestedArray());
+                        for (AnnotationInstance annotation : routesAnnotation.value().asNestedArray()) {
+                            validateRouteMethod(bean, method, transformedAnnotations, beanArchive.getIndex(), annotation);
+                            routes.add(annotation);
+                        }
                     }
                 }
                 if (!routes.isEmpty()) {
@@ -198,11 +226,30 @@ void addAdditionalRoutes(
             List<RequireBodyHandlerBuildItem> bodyHandlerRequired,
             BeanArchiveIndexBuildItem beanArchive,
             TransformedAnnotationsBuildItem transformedAnnotations,
-            ShutdownContextBuildItem shutdown) throws IOException {
-
-        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
+            ShutdownContextBuildItem shutdown,
+            LaunchModeBuildItem launchMode,
+            BuildProducer<RouteDescriptionBuildItem> descriptions,
+            Capabilities capabilities,
+            Optional<BeanValidationAnnotationsBuildItem> beanValidationAnnotations,
+            List<ApplicationClassPredicateBuildItem> predicates) {
+
+        Predicate<String> appClassPredicate = new Predicate<String>() {
+            @Override
+            public boolean test(String name) {
+                int idx = name.lastIndexOf(HANDLER_SUFFIX);
+                String className = idx != -1 ? name.substring(0, idx) : name;
+                for (ApplicationClassPredicateBuildItem i : predicates) {
+                    if (i.test(className)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        };
+        ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, appClassPredicate);
         IndexView index = beanArchive.getIndex();
         Map<RouteMatcher, MethodInfo> matchers = new HashMap<>();
+        boolean validatorAvailable = capabilities.isPresent(Capability.HIBERNATE_VALIDATOR);
 
         for (AnnotatedRouteHandlerBuildItem businessMethod : routeHandlerBusinessMethods) {
             AnnotationInstance routeBaseAnnotation = businessMethod.getRouteBase();
@@ -232,14 +279,6 @@ void addAdditionalRoutes(
             for (AnnotationInstance route : businessMethod.getRoutes()) {
                 String routeString = route.toString(true);
                 Handler<RoutingContext> routeHandler = routeHandlers.get(routeString);
-                if (routeHandler == null) {
-                    String handlerClass = generateHandler(new HandlerDescriptor(businessMethod.getMethod()),
-                            businessMethod.getBean(), businessMethod.getMethod(), classOutput, transformedAnnotations,
-                            routeString, reflectiveHierarchy);
-                    reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, handlerClass));
-                    routeHandler = recorder.createHandler(handlerClass);
-                    routeHandlers.put(routeString, routeHandler);
-                }
 
                 AnnotationValue regexValue = route.value(VALUE_REGEX);
                 AnnotationValue pathValue = route.value(VALUE_PATH);
@@ -252,28 +291,45 @@ void addAdditionalRoutes(
                 String regex = null;
                 String[] produces = producesValue.asStringArray();
                 String[] consumes = consumesValue.asStringArray();
+
+                AnnotationValue typeValue = route.value(VALUE_TYPE);
+                Route.HandlerType routeHandlerType = typeValue == null ? Route.HandlerType.NORMAL
+                        : Route.HandlerType.from(typeValue.asEnum());
                 HttpMethod[] methods = Arrays.stream(methodsValue.asEnumArray()).map(HttpMethod::valueOf)
                         .toArray(HttpMethod[]::new);
                 Integer order = orderValue.asInt();
 
                 if (regexValue == null) {
                     if (pathPrefix != null) {
-                        StringBuilder prefixedPath = new StringBuilder();
-                        prefixedPath.append(pathPrefix);
+                        // A path prefix is set
+                        StringBuilder prefixed = new StringBuilder();
+                        prefixed.append(pathPrefix);
                         if (pathValue == null) {
-                            prefixedPath.append(SLASH);
-                            prefixedPath.append(dashify(businessMethod.getMethod().name()));
+                            // No path param set - use the method name for non-failure handlers
+                            if (routeHandlerType != Route.HandlerType.FAILURE) {
+                                prefixed.append(SLASH);
+                                prefixed.append(dashify(businessMethod.getMethod().name()));
+                            }
                         } else {
+                            // Path param set
                             if (!pathValue.asString().startsWith(SLASH)) {
-                                prefixedPath.append(SLASH);
+                                prefixed.append(SLASH);
                             }
-                            prefixedPath.append(pathValue.asString());
+                            prefixed.append(pathValue.asString());
                         }
-                        path = prefixedPath.toString();
+                        path = prefixed.toString();
                     } else {
-                        path = pathValue != null ? pathValue.asString() : dashify(businessMethod.getMethod().name());
+                        if (pathValue == null) {
+                            // No path param set - use the method name for non-failure handlers
+                            if (routeHandlerType != Route.HandlerType.FAILURE) {
+                                path = dashify(businessMethod.getMethod().name());
+                            }
+                        } else {
+                            // Path param set
+                            path = pathValue.asString();
+                        }
                     }
-                    if (!path.startsWith(SLASH)) {
+                    if (path != null && !path.startsWith(SLASH)) {
                         path = SLASH + path;
                     }
                 } else {
@@ -287,36 +343,72 @@ void addAdditionalRoutes(
                     consumes = baseConsumes;
                 }
 
-                RouteMatcher matcher = new RouteMatcher(path, regex, produces, consumes, methods, order);
-                matchers.put(matcher, businessMethod.getMethod());
-                Function<Router, io.vertx.ext.web.Route> routeFunction = recorder.createRouteFunction(matcher,
-                        bodyHandler.getHandler());
-                AnnotationValue typeValue = route.value("type");
                 HandlerType handlerType = HandlerType.NORMAL;
                 if (typeValue != null) {
-                    String typeString = typeValue.asEnum();
-                    switch (typeString) {
-                        case "NORMAL":
+                    switch (routeHandlerType) {
+                        case NORMAL:
                             handlerType = HandlerType.NORMAL;
                             break;
-                        case "BLOCKING":
+                        case BLOCKING:
                             handlerType = HandlerType.BLOCKING;
                             break;
-                        case "FAILURE":
+                        case FAILURE:
                             handlerType = HandlerType.FAILURE;
                             break;
                         default:
-                            throw new IllegalStateException("Unkown type " + typeString);
+                            throw new IllegalStateException("Unknown type " + routeHandlerType);
                     }
                 }
+
+                if (businessMethod.getMethod().annotation(DotNames.BLOCKING) != null) {
+                    if (handlerType == HandlerType.NORMAL) {
+                        handlerType = HandlerType.BLOCKING;
+                    } else if (handlerType == HandlerType.FAILURE) {
+                        throw new IllegalStateException(
+                                "Invalid combination - a reactive route cannot use @Blocking and use the type `failure` at the same time: "
+                                        + businessMethod.getMethod().toString());
+                    }
+                }
+
+                if (routeHandler == null) {
+                    String handlerClass = generateHandler(
+                            new HandlerDescriptor(businessMethod.getMethod(), beanValidationAnnotations.orElse(null),
+                                    handlerType),
+                            businessMethod.getBean(), businessMethod.getMethod(), classOutput, transformedAnnotations,
+                            routeString, reflectiveHierarchy, produces.length > 0 ? produces[0] : null,
+                            validatorAvailable, index);
+                    reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, handlerClass));
+                    routeHandler = recorder.createHandler(handlerClass);
+                    routeHandlers.put(routeString, routeHandler);
+                }
+
+                RouteMatcher matcher = new RouteMatcher(path, regex, produces, consumes, methods, order);
+                matchers.put(matcher, businessMethod.getMethod());
+                Function<Router, io.vertx.ext.web.Route> routeFunction = recorder.createRouteFunction(matcher,
+                        bodyHandler.getHandler());
+
                 routeProducer.produce(new RouteBuildItem(routeFunction, routeHandler, handlerType));
+
+                if (launchMode.getLaunchMode().equals(LaunchMode.DEVELOPMENT)) {
+                    if (methods.length == 0) {
+                        // No explicit method declared - match all methods
+                        methods = HttpMethod.values();
+                    }
+                    descriptions.produce(new RouteDescriptionBuildItem(
+                            businessMethod.getMethod().declaringClass().name().withoutPackagePrefix() + "#"
+                                    + businessMethod.getMethod().name() + "()",
+                            regex != null ? regex : path,
+                            Arrays.stream(methods).map(Object::toString).collect(Collectors.joining(", ")), produces,
+                            consumes));
+                }
             }
         }
 
         for (AnnotatedRouteFilterBuildItem filterMethod : routeFilterBusinessMethods) {
-            String handlerClass = generateHandler(new HandlerDescriptor(filterMethod.getMethod()),
+            String handlerClass = generateHandler(
+                    new HandlerDescriptor(filterMethod.getMethod(), beanValidationAnnotations.orElse(null), HandlerType.NORMAL),
                     filterMethod.getBean(), filterMethod.getMethod(), classOutput, transformedAnnotations,
-                    filterMethod.getRouteFilter().toString(true), reflectiveHierarchy);
+                    filterMethod.getRouteFilter().toString(true), reflectiveHierarchy, null, validatorAvailable, index);
             reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, handlerClass));
             Handler<RoutingContext> routingHandler = recorder.createHandler(handlerClass);
             AnnotationValue priorityValue = filterMethod.getRouteFilter().value();
@@ -325,35 +417,33 @@ void addAdditionalRoutes(
         }
 
         detectConflictingRoutes(matchers);
+    }
 
-        recorder.clearCacheOnShutdown(shutdown);
+    @BuildStep(onlyIf = IsDevelopment.class)
+    @Record(RUNTIME_INIT)
+    void routeNotFound(Capabilities capabilities, ResourceNotFoundRecorder recorder, VertxWebRouterBuildItem router,
+            List<RouteDescriptionBuildItem> descriptions,
+            HttpRootPathBuildItem httpRoot,
+            List<NotFoundPageDisplayableEndpointBuildItem> additionalEndpoints) {
+        if (capabilities.isMissing(Capability.RESTEASY)) {
+            // Register a special error handler if JAX-RS not available
+            recorder.registerNotFoundHandler(router.getHttpRouter(), httpRoot.getRootPath(),
+                    descriptions.stream().map(RouteDescriptionBuildItem::getDescription).collect(Collectors.toList()),
+                    additionalEndpoints.stream()
+                            .map(s -> s.isAbsolutePath() ? s.getEndpoint()
+                                    : TemplateHtmlBuilder.adjustRoot(httpRoot.getRootPath(), s.getEndpoint()))
+                            .collect(Collectors.toList()));
+        }
     }
 
     @BuildStep
-    AnnotationsTransformerBuildItem annotationTransformer(CustomScopeAnnotationsBuildItem scopes) {
-        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
-            @Override
-            public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind kind) {
-                return kind == org.jboss.jandex.AnnotationTarget.Kind.CLASS;
-            }
-
-            @Override
-            public void transform(TransformationContext context) {
-                if (!scopes.isScopeIn(context.getAnnotations())) {
-                    // Class with no scope annotation but with a method annotated with @Route, @RouteFilter
-                    ClassInfo target = context.getTarget().asClass();
-                    if (target.annotations().containsKey(io.quarkus.vertx.web.deployment.DotNames.ROUTE)
-                            || target.annotations().containsKey(io.quarkus.vertx.web.deployment.DotNames.ROUTES)
-                            || target.annotations().containsKey(io.quarkus.vertx.web.deployment.DotNames.ROUTE_FILTER)) {
-                        LOGGER.debugf(
-                                "Found route handler business methods on a class %s with no scope annotation - adding @Singleton",
-                                context.getTarget());
-                        context.transform().add(Singleton.class).done();
-                    }
-                }
-            }
-        });
+    AutoAddScopeBuildItem autoAddScope() {
+        return AutoAddScopeBuildItem.builder()
+                .containsAnnotations(io.quarkus.vertx.web.deployment.DotNames.ROUTE,
+                        io.quarkus.vertx.web.deployment.DotNames.ROUTES,
+                        io.quarkus.vertx.web.deployment.DotNames.ROUTE_FILTER)
+                .defaultScope(BuiltinScope.SINGLETON)
+                .reason("Found route handler business methods").build();
     }
 
     private void validateRouteFilterMethod(BeanInfo bean, MethodInfo method) {
@@ -362,14 +452,16 @@ private void validateRouteFilterMethod(BeanInfo bean, MethodInfo method) {
                     String.format("Route filter method must return void [method: %s, bean: %s]", method, bean));
         }
         List<Type> params = method.parameters();
-        if (params.size() != 1 || !params.get(0).name().equals(io.quarkus.vertx.web.deployment.DotNames.ROUTING_CONTEXT)) {
+        if (params.size() != 1 || !params.get(0).name()
+                .equals(io.quarkus.vertx.web.deployment.DotNames.ROUTING_CONTEXT)) {
             throw new IllegalStateException(String.format(
                     "Route filter method must accept exactly one parameter of type %s: %s [method: %s, bean: %s]",
                     io.quarkus.vertx.web.deployment.DotNames.ROUTING_CONTEXT, params, method, bean));
         }
     }
 
-    private void validateRouteMethod(BeanInfo bean, MethodInfo method, TransformedAnnotationsBuildItem transformedAnnotations) {
+    private void validateRouteMethod(BeanInfo bean, MethodInfo method,
+            TransformedAnnotationsBuildItem transformedAnnotations, IndexView index, AnnotationInstance routeAnnotation) {
         List<Type> params = method.parameters();
         if (params.isEmpty()) {
             if (method.returnType().kind() == Kind.VOID && params.isEmpty()) {
@@ -378,6 +470,10 @@ private void validateRouteMethod(BeanInfo bean, MethodInfo method, TransformedAn
                         method, bean));
             }
         } else {
+            AnnotationValue typeValue = routeAnnotation.value(VALUE_TYPE);
+            Route.HandlerType handlerType = typeValue == null ? Route.HandlerType.NORMAL
+                    : Route.HandlerType.from(typeValue.asEnum());
+
             if ((method.returnType().name().equals(io.quarkus.vertx.web.deployment.DotNames.UNI)
                     || method.returnType().name().equals(io.quarkus.vertx.web.deployment.DotNames.MULTI))
                     && method.returnType().kind() == Kind.CLASS) {
@@ -386,29 +482,70 @@ private void validateRouteMethod(BeanInfo bean, MethodInfo method, TransformedAn
                                 "Route business method returning a Uni/Multi must have a generic parameter [method: %s, bean: %s]",
                                 method, bean));
             }
+            boolean canEndResponse = false;
             int idx = 0;
+            int failureParams = 0;
             for (Type paramType : params) {
-                Set<AnnotationInstance> paramAnnotations = Annotations.getParameterAnnotations(transformedAnnotations, method,
-                        idx);
-                List<ParameterInjector> injectors = getMatchingInjectors(paramType, paramAnnotations);
+                Set<AnnotationInstance> paramAnnotations = Annotations
+                        .getParameterAnnotations(transformedAnnotations, method,
+                                idx);
+                List<ParameterInjector> injectors = getMatchingInjectors(paramType, paramAnnotations, index);
                 if (injectors.isEmpty()) {
                     throw new IllegalStateException(String.format(
-                            "No parameter injector found for parameter %s of route method %s declared on %s", idx, method,
+                            "No parameter injector found for parameter %s of route method %s declared on %s", idx,
+                            method,
                             bean));
                 }
                 if (injectors.size() > 1) {
                     throw new IllegalStateException(String.format(
-                            "Multiple parameter injectors found for parameter %s of route method %s declared on %s", idx,
+                            "Multiple parameter injectors found for parameter %s of route method %s declared on %s",
+                            idx,
                             method, bean));
                 }
+                ParameterInjector injector = injectors.get(0);
+                if (injector.getTargetHandlerType() != null
+                        && !injector.getTargetHandlerType().equals(handlerType)) {
+                    throw new IllegalStateException(String.format(
+                            "HandlerType.%s is not legal for parameter %s of route method %s declared on %s",
+                            injector.getTargetHandlerType(), idx, method, bean));
+                }
+
+                // A param injector may validate the parameter annotations
+                injector.validate(bean, method, routeAnnotation, paramType, paramAnnotations);
+
+                if (injector.canEndResponse) {
+                    canEndResponse = true;
+                }
+
+                if (Route.HandlerType.FAILURE == handlerType && isThrowable(paramType, index)) {
+                    failureParams++;
+                }
                 idx++;
             }
+
+            if (method.returnType().kind() == Kind.VOID && !canEndResponse) {
+                throw new IllegalStateException(String.format(
+                        "Route method that returns void must accept at least one parameter that can end the response [method: %s, bean: %s]",
+                        method, bean));
+            }
+
+            if (failureParams > 1) {
+                throw new IllegalStateException(String.format(
+                        "A failure handler may only define one failure parameter - route method %s declared on %s",
+                        method, bean));
+            }
         }
     }
 
     private String generateHandler(HandlerDescriptor desc, BeanInfo bean, MethodInfo method, ClassOutput classOutput,
             TransformedAnnotationsBuildItem transformedAnnotations, String hashSuffix,
-            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy, String defaultProduces,
+            boolean validatorAvailable, IndexView index) {
+
+        if (desc.requireValidation() && !validatorAvailable) {
+            throw new IllegalStateException(
+                    "A route requires validation, but the Hibernate Validator extension is not present");
+        }
 
         String baseName;
         if (bean.getImplClazz().enclosingClass() != null) {
@@ -417,18 +554,19 @@ private String generateHandler(HandlerDescriptor desc, BeanInfo bean, MethodInfo
         } else {
             baseName = io.quarkus.arc.processor.DotNames.simpleName(bean.getImplClazz().name());
         }
-        String targetPackage = io.quarkus.arc.processor.DotNames.packageName(bean.getImplClazz().name());
+        String targetPackage = io.quarkus.arc.processor.DotNames
+                .internalPackageNameWithTrailingSlash(bean.getImplClazz().name());
 
         StringBuilder sigBuilder = new StringBuilder();
         sigBuilder.append(method.name()).append("_").append(method.returnType().name().toString());
         for (Type i : method.parameters()) {
             sigBuilder.append(i.name().toString());
         }
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + HANDLER_SUFFIX + "_" + method.name() + "_"
+        String generatedName = targetPackage + baseName + HANDLER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString() + hashSuffix);
 
         ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)
-                .interfaces(RouteHandler.class).build();
+                .superClass(RouteHandler.class).build();
 
         // Initialized state
         FieldCreator beanField = invokerCreator.getFieldCreator("bean", InjectableBean.class)
@@ -444,9 +582,16 @@ private String generateHandler(HandlerDescriptor desc, BeanInfo bean, MethodInfo
                     .setModifiers(ACC_PRIVATE | ACC_FINAL);
         }
 
-        implementConstructor(bean, invokerCreator, beanField, contextField, containerField);
-        implementInvoke(desc, bean, method, invokerCreator, beanField, contextField, containerField, transformedAnnotations,
-                reflectiveHierarchy);
+        FieldCreator validatorField = null;
+        if (desc.isProducedResponseValidated()) {
+            // If the produced item needs to be validated, we inject the Validator
+            validatorField = invokerCreator.getFieldCreator("validator", Methods.VALIDATION_VALIDATOR)
+                    .setModifiers(ACC_PUBLIC | ACC_FINAL);
+        }
+
+        implementConstructor(bean, invokerCreator, beanField, contextField, containerField, validatorField);
+        implementInvoke(desc, bean, method, invokerCreator, beanField, contextField, containerField, validatorField,
+                transformedAnnotations, reflectiveHierarchy, defaultProduces, index);
 
         invokerCreator.close();
         return generatedName.replace('/', '.');
@@ -454,10 +599,10 @@ private String generateHandler(HandlerDescriptor desc, BeanInfo bean, MethodInfo
 
     void implementConstructor(BeanInfo bean, ClassCreator invokerCreator, FieldCreator beanField,
             FieldCreator contextField,
-            FieldCreator containerField) {
+            FieldCreator containerField, FieldCreator validatorField) {
         MethodCreator constructor = invokerCreator.getMethodCreator("<init>", void.class);
         // Invoke super()
-        constructor.invokeSpecialMethod(Methods.OBJECT_CONSTRUCTOR, constructor.getThis());
+        constructor.invokeSpecialMethod(Methods.ROUTE_HANDLER_CONSTRUCTOR, constructor.getThis());
 
         ResultHandle containerHandle = constructor
                 .invokeStaticMethod(Methods.ARC_CONTAINER);
@@ -476,13 +621,19 @@ void implementConstructor(BeanInfo bean, ClassCreator invokerCreator, FieldCreat
         } else {
             constructor.writeInstanceField(containerField.getFieldDescriptor(), constructor.getThis(), containerHandle);
         }
+
+        if (validatorField != null) {
+            constructor.writeInstanceField(validatorField.getFieldDescriptor(), constructor.getThis(),
+                    constructor.invokeStaticMethod(Methods.VALIDATION_GET_VALIDATOR, containerHandle));
+        }
+
         constructor.returnValue(null);
     }
 
     void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo method, ClassCreator invokerCreator,
-            FieldCreator beanField, FieldCreator contextField, FieldCreator containerField,
+            FieldCreator beanField, FieldCreator contextField, FieldCreator containerField, FieldCreator validatorField,
             TransformedAnnotationsBuildItem transformedAnnotations,
-            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
+            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy, String defaultProduces, IndexView index) {
         // The descriptor is: void invoke(RoutingContext rc)
         MethodCreator invoke = invokerCreator.getMethodCreator("invoke", void.class, RoutingContext.class);
         ResultHandle beanHandle = invoke.readInstanceField(beanField.getFieldDescriptor(), invoke.getThis());
@@ -514,8 +665,9 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
                         "Context not active: " + bean.getScope().getDotName());
             }
             // First try to obtain the bean via Context.get(bean)
-            invoke.assign(beanInstanceHandle, invoke.invokeInterfaceMethod(Methods.CONTEXT_GET_IF_PRESENT, contextInvokeHandle,
-                    beanHandle));
+            invoke.assign(beanInstanceHandle,
+                    invoke.invokeInterfaceMethod(Methods.CONTEXT_GET_IF_PRESENT, contextInvokeHandle,
+                            beanHandle));
             // If not present, try Context.get(bean,creationalContext)
             BytecodeCreator doesNotExist = invoke.ifNull(beanInstanceHandle).trueBranch();
             doesNotExist.assign(beanInstanceHandle,
@@ -533,10 +685,12 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
 
         int idx = 0;
         for (Type paramType : parameters) {
-            Set<AnnotationInstance> paramAnnotations = Annotations.getParameterAnnotations(transformedAnnotations, method, idx);
+            Set<AnnotationInstance> paramAnnotations = Annotations
+                    .getParameterAnnotations(transformedAnnotations, method, idx);
             // At this point we can be sure that a matching injector is available
-            paramHandles[idx] = getMatchingInjectors(paramType, paramAnnotations).get(0).getResultHandle(method, paramType,
-                    paramAnnotations, routingContext, invoke, idx, reflectiveHierarchy);
+            paramHandles[idx] = getMatchingInjectors(paramType, paramAnnotations, index).get(0)
+                    .getResultHandle(method, paramType,
+                            paramAnnotations, routingContext, invoke, idx, reflectiveHierarchy);
             parameterTypes[idx] = paramType.name().toString();
             idx++;
         }
@@ -544,11 +698,56 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
         MethodDescriptor methodDescriptor = MethodDescriptor
                 .ofMethod(bean.getImplClazz().name().toString(), method.name(), returnType, parameterTypes);
 
-        // Invoke the business method handler
-        ResultHandle res = invoke.invokeVirtualMethod(methodDescriptor, beanInstanceHandle, paramHandles);
-
         // If no content-type header is set then try to use the most acceptable content type
-        invoke.invokeStaticMethod(Methods.ROUTE_HANDLERS_SET_CONTENT_TYPE, routingContext);
+        // the business method can override this manually if required
+        invoke.invokeStaticMethod(Methods.ROUTE_HANDLERS_SET_CONTENT_TYPE, routingContext,
+                defaultProduces == null ? invoke.loadNull() : invoke.load(defaultProduces));
+
+        // For failure handlers attempt to match the failure type
+        if (descriptor.getHandlerType() == HandlerType.FAILURE) {
+            Type failureType = getFailureType(parameters, index);
+            if (failureType != null) {
+                ResultHandle failure = invoke.invokeInterfaceMethod(Methods.FAILURE, routingContext);
+                BytecodeCreator failureIsNull = invoke.ifNull(failure).trueBranch();
+                failureIsNull.invokeInterfaceMethod(Methods.NEXT, routingContext);
+                failureIsNull.returnValue(null);
+                ResultHandle failureClass = invoke.invokeVirtualMethod(Methods.GET_CLASS, failure);
+                BytecodeCreator failureTypeIsNotAssignable = invoke
+                        .ifFalse(invoke.invokeVirtualMethod(Methods.IS_ASSIGNABLE_FROM,
+                                invoke.loadClass(failureType.name().toString()), failureClass))
+                        .trueBranch();
+                failureTypeIsNotAssignable.invokeInterfaceMethod(Methods.NEXT, routingContext);
+                failureTypeIsNotAssignable.returnValue(null);
+            }
+        }
+
+        // Invoke the business method handler
+        AssignableResultHandle res;
+        if (descriptor.isReturningUni()) {
+            res = invoke.createVariable(Uni.class);
+        } else if (descriptor.isReturningMulti()) {
+            res = invoke.createVariable(Multi.class);
+        } else {
+            res = invoke.createVariable(Object.class);
+        }
+        invoke.assign(res, invoke.loadNull());
+        if (!descriptor.requireValidation()) {
+            ResultHandle value = invoke.invokeVirtualMethod(methodDescriptor, beanInstanceHandle, paramHandles);
+            if (value != null) {
+                invoke.assign(res, value);
+            }
+        } else {
+            TryBlock block = invoke.tryBlock();
+            ResultHandle value = block.invokeVirtualMethod(methodDescriptor, beanInstanceHandle, paramHandles);
+            if (value != null) {
+                block.assign(res, value);
+            }
+            CatchBlockCreator caught = block.addCatch(Methods.VALIDATION_CONSTRAINT_VIOLATION_EXCEPTION);
+            caught.invokeStaticMethod(
+                    Methods.VALIDATION_HANDLE_VIOLATION_EXCEPTION,
+                    caught.getCaughtException(), invoke.getMethodParam(0));
+            caught.returnValue(caught.loadNull());
+        }
 
         // Get the response: HttpServerResponse response = rc.response()
         MethodDescriptor end = Methods.getEndMethodForContentType(descriptor);
@@ -562,7 +761,9 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
             // If the provided item is not null, if it's a string or buffer, the response.end method is used to write the response
             // If the provided item is not null, and it's an object, the item is mapped to JSON and written into the response
 
-            FunctionCreator successCallback = getUniOnItemCallback(descriptor, invoke, routingContext, end, response);
+            FunctionCreator successCallback = getUniOnItemCallback(descriptor, invoke, routingContext, end, response,
+                    validatorField);
+
             ResultHandle failureCallback = getUniOnFailureCallback(invoke, routingContext);
 
             ResultHandle sub = invoke.invokeInterfaceMethod(Methods.UNI_SUBSCRIBE, res);
@@ -572,7 +773,6 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
             registerForReflection(descriptor.getContentType(), reflectiveHierarchy);
 
         } else if (descriptor.isReturningMulti()) {
-
             // 3 cases - regular multi vs. sse multi vs. json array multi, we need to check the type.
             BranchResult isItSSE = invoke.ifTrue(invoke.invokeStaticMethod(Methods.IS_SSE, res));
             BytecodeCreator isSSE = isItSSE.trueBranch();
@@ -584,6 +784,7 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
             BytecodeCreator isJson = isItJson.trueBranch();
             handleJsonArrayMulti(descriptor, isJson, routingContext, res);
             isJson.close();
+
             BytecodeCreator isRegular = isItJson.falseBranch();
             handleRegularMulti(descriptor, isRegular, routingContext, res);
             isRegular.close();
@@ -597,7 +798,9 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
             // If the method returned null, we fail
             // If the method returns string or buffer, the response.end method is used to write the response
             // If the method returns an object, the result is mapped to JSON and written into the response
-            ResultHandle content = getContentToWrite(descriptor, response, res, invoke);
+
+            ResultHandle content = getContentToWrite(descriptor, response, res, invoke, validatorField,
+                    invoke.getThis());
             invoke.invokeInterfaceMethod(end, response, content);
 
             registerForReflection(descriptor.getContentType(), reflectiveHierarchy);
@@ -611,16 +814,44 @@ void implementInvoke(HandlerDescriptor descriptor, BeanInfo bean, MethodInfo met
         invoke.returnValue(null);
     }
 
-    private static final List<DotName> TYPES_IGNORED_FOR_REFLECTION = Arrays.asList(io.quarkus.arc.processor.DotNames.STRING,
-            DotNames.BUFFER, DotNames.JSON_ARRAY, DotNames.JSON_OBJECT);
+    private Type getFailureType(List<Type> parameters, IndexView index) {
+        for (Type paramType : parameters) {
+            if (isThrowable(paramType, index)) {
+                return paramType;
+            }
+        }
+        return null;
+    }
+
+    private static boolean isThrowable(Type paramType, IndexView index) {
+        ClassInfo aClass = index.getClassByName(paramType.name());
+        while (aClass != null) {
+            if (aClass.superName() == null) {
+                break;
+            }
+            if (DotNames.EXCEPTION.equals(aClass.superName()) || DotNames.THROWABLE.equals(aClass.superName())) {
+                return true;
+            }
+            aClass = index.getClassByName(aClass.superName());
+        }
+        return false;
+    }
+
+    private static final List<DotName> TYPES_IGNORED_FOR_REFLECTION = Arrays
+            .asList(io.quarkus.arc.processor.DotNames.STRING,
+                    DotNames.BUFFER, DotNames.JSON_ARRAY, DotNames.JSON_OBJECT);
 
     private static void registerForReflection(Type contentType,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
         if (TYPES_IGNORED_FOR_REFLECTION.contains(contentType.name())) {
             return;
         }
-        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem(contentType,
-                ReflectiveHierarchyBuildItem.DefaultIgnorePredicate.INSTANCE.or(TYPES_IGNORED_FOR_REFLECTION::contains)));
+        reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
+                .type(contentType)
+                .ignoreTypePredicate(ReflectiveHierarchyBuildItem.DefaultIgnoreTypePredicate.INSTANCE
+                        .or(TYPES_IGNORED_FOR_REFLECTION::contains))
+                .source(VertxWebProcessor.class.getSimpleName() + " > " + contentType)
+                .build());
     }
 
     private void handleRegularMulti(HandlerDescriptor descriptor, BytecodeCreator writer, ResultHandle rc,
@@ -640,8 +871,6 @@ private void handleRegularMulti(HandlerDescriptor descriptor, BytecodeCreator wr
             writer.invokeStaticMethod(Methods.MULTI_SUBSCRIBE_BUFFER, res, rc);
         } else if (descriptor.isContentTypeMutinyBuffer()) {
             writer.invokeStaticMethod(Methods.MULTI_SUBSCRIBE_MUTINY_BUFFER, res, rc);
-        } else if (descriptor.isContentTypeRxBuffer()) {
-            writer.invokeStaticMethod(Methods.MULTI_SUBSCRIBE_RX_BUFFER, res, rc);
         } else if (descriptor.isContentTypeString()) {
             writer.invokeStaticMethod(Methods.MULTI_SUBSCRIBE_STRING, res, rc);
         } else { // Multi<Object> - encode to json.
@@ -666,8 +895,6 @@ private void handleSSEMulti(HandlerDescriptor descriptor, BytecodeCreator writer
             writer.invokeStaticMethod(Methods.MULTI_SSE_SUBSCRIBE_BUFFER, res, rc);
         } else if (descriptor.isContentTypeMutinyBuffer()) {
             writer.invokeStaticMethod(Methods.MULTI_SSE_SUBSCRIBE_MUTINY_BUFFER, res, rc);
-        } else if (descriptor.isContentTypeRxBuffer()) {
-            writer.invokeStaticMethod(Methods.MULTI_SSE_SUBSCRIBE_RX_BUFFER, res, rc);
         } else if (descriptor.isContentTypeString()) {
             writer.invokeStaticMethod(Methods.MULTI_SSE_SUBSCRIBE_STRING, res, rc);
         } else { // Multi<Object> - encode to json.
@@ -691,8 +918,7 @@ private void handleJsonArrayMulti(HandlerDescriptor descriptor, BytecodeCreator
             writer.invokeStaticMethod(Methods.MULTI_JSON_SUBSCRIBE_VOID, res, rc);
         } else if (descriptor.isContentTypeString()) {
             writer.invokeStaticMethod(Methods.MULTI_JSON_SUBSCRIBE_STRING, res, rc);
-        } else if (descriptor.isContentTypeBuffer() || descriptor.isContentTypeRxBuffer()
-                || descriptor.isContentTypeMutinyBuffer()) {
+        } else if (descriptor.isContentTypeBuffer() || descriptor.isContentTypeMutinyBuffer()) {
             writer.invokeStaticMethod(Methods.MULTI_JSON_FAIL, rc);
         } else { // Multi<Object> - encode to json.
             writer.invokeStaticMethod(Methods.MULTI_JSON_SUBSCRIBE_OBJECT, res, rc);
@@ -701,28 +927,28 @@ private void handleJsonArrayMulti(HandlerDescriptor descriptor, BytecodeCreator
 
     /**
      * Generates the following function depending on the payload type
-     *
+     * <p>
      * If the method returns a {@code Uni<Void>}
-     * 
+     *
      * <pre>
      *     item -> rc.response().setStatusCode(204).end();
      * </pre>
-     *
+     * <p>
      * If the method returns a {@code Uni<Buffer>}:
-     * 
+     *
      * <pre>
      *     item -> {
      *       if (item != null) {
-     *          Buffer buffer = getBuffer(item); // Manage RX and Mutiny buffer
+     *          Buffer buffer = getBuffer(item); // Manage Mutiny buffer
      *          rc.response().end(buffer);
      *       } else {
      *           rc.fail(new NullPointerException(...);
      *       }
      *     }
      * </pre>
-     *
+     * <p>
      * If the method returns a {@code Uni<String>} :
-     * 
+     *
      * <pre>
      *     item -> {
      *       if (item != null) {
@@ -732,9 +958,9 @@ private void handleJsonArrayMulti(HandlerDescriptor descriptor, BytecodeCreator
      *       }
      *     }
      * </pre>
-     *
+     * <p>
      * If the method returns a {@code Uni<T>} :
-     * 
+     *
      * <pre>
      *     item -> {
      *       if (item != null) {
@@ -745,7 +971,7 @@ private void handleJsonArrayMulti(HandlerDescriptor descriptor, BytecodeCreator
      *       }
      *     }
      * </pre>
-     *
+     * <p>
      * This last version also set the {@code content-type} header to {@code application/json }if not set.
      *
      * @param descriptor the method descriptor
@@ -753,10 +979,11 @@ private void handleJsonArrayMulti(HandlerDescriptor descriptor, BytecodeCreator
      * @param rc the reference to the routing context variable
      * @param end the end method to use
      * @param response the reference to the response variable
+     * @param validatorField the validator field if validation is enabled
      * @return the function creator
      */
     private FunctionCreator getUniOnItemCallback(HandlerDescriptor descriptor, MethodCreator invoke, ResultHandle rc,
-            MethodDescriptor end, ResultHandle response) {
+            MethodDescriptor end, ResultHandle response, FieldCreator validatorField) {
         FunctionCreator callback = invoke.createFunction(Consumer.class);
         BytecodeCreator creator = callback.getBytecode();
         if (Methods.isNoContent(descriptor)) { // Uni<Void> - so return a 204.
@@ -768,7 +995,8 @@ private FunctionCreator getUniOnItemCallback(HandlerDescriptor descriptor, Metho
             BranchResult isItemNull = creator.ifNull(item);
 
             BytecodeCreator itemIfNotNull = isItemNull.falseBranch();
-            ResultHandle content = getContentToWrite(descriptor, response, item, itemIfNotNull);
+            ResultHandle content = getContentToWrite(descriptor, response, item, itemIfNotNull, validatorField,
+                    invoke.getThis());
             itemIfNotNull.invokeInterfaceMethod(end, response, content);
             itemIfNotNull.close();
 
@@ -782,30 +1010,32 @@ private FunctionCreator getUniOnItemCallback(HandlerDescriptor descriptor, Metho
     }
 
     private ResultHandle getUniOnFailureCallback(MethodCreator writer, ResultHandle routingContext) {
-        // new UniFailureCallback(ctx)
         return writer.newInstance(MethodDescriptor.ofConstructor(UniFailureCallback.class, RoutingContext.class),
                 routingContext);
     }
 
     private ResultHandle getContentToWrite(HandlerDescriptor descriptor, ResultHandle response, ResultHandle res,
-            BytecodeCreator writer) {
+            BytecodeCreator writer, FieldCreator validatorField, ResultHandle owner) {
         if (descriptor.isContentTypeString() || descriptor.isContentTypeBuffer()) {
             return res;
         }
 
-        if (descriptor.isContentTypeRxBuffer()) {
-            return writer.invokeVirtualMethod(Methods.RX_GET_DELEGATE, res);
-        }
-
         if (descriptor.isContentTypeMutinyBuffer()) {
             return writer.invokeVirtualMethod(Methods.MUTINY_GET_DELEGATE, res);
         }
 
         // Encode to Json
         Methods.setContentTypeToJson(response, writer);
-        return writer.invokeStaticMethod(Methods.JSON_ENCODE, res);
+        // Validate res if needed
+        if (descriptor.isProducedResponseValidated()) {
+            return Methods.validateProducedItem(response, writer, res, validatorField, owner);
+        } else {
+            return writer.invokeStaticMethod(Methods.JSON_ENCODE, res);
+        }
+
     }
 
+    // De-camel-case the name and then join the segments with hyphens
     private static String dashify(String value) {
         StringBuilder ret = new StringBuilder();
         char[] chars = value.toCharArray();
@@ -823,7 +1053,7 @@ private void detectConflictingRoutes(Map<RouteMatcher, MethodInfo> matchers) {
         if (matchers.isEmpty()) {
             return;
         }
-        // First we need to group matchers that could potentially match the same request 
+        // First we need to group matchers that could potentially match the same request
         Set<LinkedHashSet<RouteMatcher>> groups = new HashSet<>();
         for (Iterator<Entry<RouteMatcher, MethodInfo>> iterator = matchers.entrySet().iterator(); iterator
                 .hasNext();) {
@@ -903,10 +1133,11 @@ static boolean canMatchSameRequest(RouteMatcher m1, RouteMatcher m2) {
         return true;
     }
 
-    private List<ParameterInjector> getMatchingInjectors(Type paramType, Set<AnnotationInstance> paramAnnotations) {
+    private List<ParameterInjector> getMatchingInjectors(Type paramType, Set<AnnotationInstance> paramAnnotations,
+            IndexView index) {
         List<ParameterInjector> injectors = new ArrayList<>();
         for (ParameterInjector injector : PARAM_INJECTORS) {
-            if (injector.matches(paramType, paramAnnotations)) {
+            if (injector.matches(paramType, paramAnnotations, index)) {
                 injectors.add(injector);
             }
         }
@@ -916,42 +1147,31 @@ private List<ParameterInjector> getMatchingInjectors(Type paramType, Set<Annotat
     static List<ParameterInjector> initParamInjectors() {
         List<ParameterInjector> injectors = new ArrayList<>();
 
-        injectors.add(ParameterInjector.builder().matchType(io.quarkus.vertx.web.deployment.DotNames.ROUTING_CONTEXT)
-                .resultHandleProvider(new ResultHandleProvider() {
-                    @Override
-                    public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
-                            ResultHandle routingContext, MethodCreator invoke, int position,
-                            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
-                        return routingContext;
-                    }
-                }).build());
-
-        injectors.add(ParameterInjector.builder().matchType(DotNames.RX_ROUTING_CONTEXT)
-                .resultHandleProvider(new ResultHandleProvider() {
-                    @Override
-                    public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
-                            ResultHandle routingContext, MethodCreator invoke, int position,
-                            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
-                        return invoke.newInstance(
-                                MethodDescriptor
-                                        .ofConstructor(io.vertx.reactivex.ext.web.RoutingContext.class, RoutingContext.class),
-                                routingContext);
-                    }
-                }).build());
+        injectors.add(
+                ParameterInjector.builder().canEndResponse().matchType(io.quarkus.vertx.web.deployment.DotNames.ROUTING_CONTEXT)
+                        .resultHandleProvider(new ResultHandleProvider() {
+                            @Override
+                            public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
+                                    ResultHandle routingContext, MethodCreator invoke, int position,
+                                    BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
+                                return routingContext;
+                            }
+                        }).build());
 
-        injectors.add(ParameterInjector.builder().matchType(DotNames.ROUTING_EXCHANGE)
+        injectors.add(ParameterInjector.builder().canEndResponse().matchType(DotNames.ROUTING_EXCHANGE)
                 .resultHandleProvider(new ResultHandleProvider() {
                     @Override
                     public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
                             ResultHandle routingContext, MethodCreator invoke, int position,
                             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
                         return invoke
-                                .newInstance(MethodDescriptor.ofConstructor(RoutingExchangeImpl.class, RoutingContext.class),
+                                .newInstance(
+                                        MethodDescriptor.ofConstructor(RoutingExchangeImpl.class, RoutingContext.class),
                                         routingContext);
                     }
                 }).build());
 
-        injectors.add(ParameterInjector.builder().matchType(DotNames.HTTP_SERVER_REQUEST)
+        injectors.add(ParameterInjector.builder().canEndResponse().matchType(DotNames.HTTP_SERVER_REQUEST)
                 .resultHandleProvider(new ResultHandleProvider() {
                     @Override
                     public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
@@ -963,7 +1183,7 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                     }
                 }).build());
 
-        injectors.add(ParameterInjector.builder().matchType(DotNames.HTTP_SERVER_RESPONSE)
+        injectors.add(ParameterInjector.builder().canEndResponse().matchType(DotNames.HTTP_SERVER_RESPONSE)
                 .resultHandleProvider(new ResultHandleProvider() {
                     @Override
                     public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
@@ -975,7 +1195,7 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                     }
                 }).build());
 
-        injectors.add(ParameterInjector.builder().matchType(DotNames.RX_HTTP_SERVER_REQUEST)
+        injectors.add(ParameterInjector.builder().canEndResponse().matchType(DotNames.MUTINY_HTTP_SERVER_REQUEST)
                 .resultHandleProvider(new ResultHandleProvider() {
                     @Override
                     public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
@@ -983,7 +1203,7 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
                         return invoke.newInstance(
                                 MethodDescriptor
-                                        .ofConstructor(io.vertx.reactivex.core.http.HttpServerRequest.class,
+                                        .ofConstructor(io.vertx.mutiny.core.http.HttpServerRequest.class,
                                                 HttpServerRequest.class),
                                 invoke
                                         .invokeInterfaceMethod(Methods.REQUEST,
@@ -992,15 +1212,16 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                 }).build());
 
         injectors
-                .add(ParameterInjector.builder().matchType(DotNames.RX_HTTP_SERVER_RESPONSE)
+                .add(ParameterInjector.builder().canEndResponse().matchType(DotNames.MUTINY_HTTP_SERVER_RESPONSE)
                         .resultHandleProvider(new ResultHandleProvider() {
                             @Override
-                            public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
+                            public ResultHandle get(MethodInfo method, Type paramType,
+                                    Set<AnnotationInstance> annotations,
                                     ResultHandle routingContext, MethodCreator invoke, int position,
                                     BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
                                 return invoke.newInstance(
                                         MethodDescriptor
-                                                .ofConstructor(io.vertx.reactivex.core.http.HttpServerResponse.class,
+                                                .ofConstructor(io.vertx.mutiny.core.http.HttpServerResponse.class,
                                                         HttpServerResponse.class),
                                         invoke
                                                 .invokeInterfaceMethod(Methods.RESPONSE,
@@ -1008,90 +1229,48 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                             }
                         }).build());
 
-        injectors.add(ParameterInjector.builder().matchType(io.quarkus.arc.processor.DotNames.STRING)
-                .matchType(ParameterizedType.create(io.quarkus.arc.processor.DotNames.OPTIONAL,
-                        new Type[] { Type.create(io.quarkus.arc.processor.DotNames.STRING, Kind.CLASS) }, null))
-                .matchType(ParameterizedType.create(DotNames.LIST,
-                        new Type[] { Type.create(io.quarkus.arc.processor.DotNames.STRING, Kind.CLASS) }, null))
-                .requireAnnotations(PARAM)
-                .resultHandleProvider(new ResultHandleProvider() {
+        injectors.add(ParameterInjector.builder().matchPrimitiveWrappers()
+                .matchType(io.quarkus.arc.processor.DotNames.STRING)
+                .matchOptionalOf(io.quarkus.arc.processor.DotNames.STRING)
+                .matchListOf(io.quarkus.arc.processor.DotNames.STRING)
+                .requireAnnotations(DotNames.PARAM)
+                .resultHandleProvider(
+                        new ParamAndHeaderProvider(DotNames.PARAM, Methods.REQUEST_PARAMS, Methods.REQUEST_GET_PARAM))
+                .validate(new ParamValidator() {
                     @Override
-                    public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
-                            ResultHandle routingContext, MethodCreator invoke, int position,
-                            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
-                        AnnotationValue paramAnnotationValue = Annotations
-                                .find(annotations, PARAM).value();
-                        String paramName = paramAnnotationValue != null ? paramAnnotationValue.asString() : null;
-                        if (paramName == null || paramName.equals(Param.ELEMENT_NAME)) {
-                            paramName = method.parameterName(position);
-                        }
-                        if (paramName == null) {
-                            throw parameterNameNotAvailable(position, method);
-                        }
-                        ResultHandle paramHandle;
-                        if (paramType.name().equals(DotNames.LIST)) {
-                            // routingContext.request().params().getAll(paramName)
-                            paramHandle = invoke.invokeInterfaceMethod(Methods.MULTIMAP_GET_ALL,
-                                    invoke.invokeInterfaceMethod(Methods.REQUEST_PARAMS, invoke
-                                            .invokeInterfaceMethod(Methods.REQUEST,
-                                                    routingContext)),
-                                    invoke.load(paramName));
-                        } else {
-                            // routingContext.request().getParam(paramName)
-                            paramHandle = invoke.invokeInterfaceMethod(Methods.REQUEST_GET_PARAM, invoke
-                                    .invokeInterfaceMethod(Methods.REQUEST,
-                                            routingContext),
-                                    invoke.load(paramName));
-                            if (paramType.name().equals(io.quarkus.arc.processor.DotNames.OPTIONAL)) {
-                                paramHandle = invoke.invokeStaticMethod(Methods.OPTIONAL_OF_NULLABLE, paramHandle);
+                    public void validate(BeanInfo bean, MethodInfo method, AnnotationInstance routeAnnotation, Type paramType,
+                            Set<AnnotationInstance> paramAnnotations) {
+                        AnnotationInstance paramAnnotation = Annotations.find(paramAnnotations, DotNames.PARAM);
+                        AnnotationValue paramNameValue = paramAnnotation.value();
+                        if (paramNameValue != null && !paramNameValue.asString().equals(Param.ELEMENT_NAME)) {
+                            String paramName = paramNameValue.asString();
+                            AnnotationValue regexValue = routeAnnotation.value(VALUE_REGEX);
+                            AnnotationValue pathValue = routeAnnotation.value(VALUE_PATH);
+                            if (regexValue == null && pathValue != null) {
+                                String path = pathValue.asString();
+                                // Validate the name if used as a path parameter
+                                if (path.contains(":" + paramName) && !PATH_PARAM_PATTERN.matcher(paramName).matches()) {
+                                    // TODO This requirement should be relaxed in vertx 4.0.3+
+                                    // https://github.com/vert-x3/vertx-web/pull/1881
+                                    throw new IllegalStateException(String.format(
+                                            "A path param name must only contain word characters (a-zA-Z_0-9): %s [route method %s declared on %s]",
+                                            paramName,
+                                            method, bean.getBeanClass()));
+                                }
                             }
                         }
-                        return paramHandle;
                     }
-                }).build());
+                })
+                .build());
 
-        injectors.add(ParameterInjector.builder().matchType(io.quarkus.arc.processor.DotNames.STRING)
-                .matchType(ParameterizedType.create(io.quarkus.arc.processor.DotNames.OPTIONAL,
-                        new Type[] { Type.create(io.quarkus.arc.processor.DotNames.STRING, Kind.CLASS) }, null))
-                .matchType(ParameterizedType.create(DotNames.LIST,
-                        new Type[] { Type.create(io.quarkus.arc.processor.DotNames.STRING, Kind.CLASS) }, null))
+        injectors.add(ParameterInjector.builder().matchPrimitiveWrappers()
+                .matchType(io.quarkus.arc.processor.DotNames.STRING)
+                .matchOptionalOf(io.quarkus.arc.processor.DotNames.STRING)
+                .matchListOf(io.quarkus.arc.processor.DotNames.STRING)
                 .requireAnnotations(DotNames.HEADER)
-                .resultHandleProvider(new ResultHandleProvider() {
-                    @Override
-                    public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
-                            ResultHandle routingContext, MethodCreator invoke, int position,
-                            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
-                        AnnotationValue paramAnnotationValue = Annotations
-                                .find(annotations, DotNames.HEADER).value();
-                        String paramName = paramAnnotationValue != null ? paramAnnotationValue.asString() : null;
-                        if (paramName == null || paramName.equals(Header.ELEMENT_NAME)) {
-                            paramName = method.parameterName(position);
-                        }
-                        if (paramName == null) {
-                            throw parameterNameNotAvailable(position, method);
-                        }
-                        ResultHandle paramHandle;
-                        if (paramType.name().equals(DotNames.LIST)) {
-                            // routingContext.request().headers().getAll(paramName)
-                            paramHandle = invoke.invokeInterfaceMethod(Methods.MULTIMAP_GET_ALL,
-                                    invoke.invokeInterfaceMethod(Methods.REQUEST_HEADERS, invoke
-                                            .invokeInterfaceMethod(Methods.REQUEST,
-                                                    routingContext)),
-                                    invoke.load(paramName));
-                        } else {
-                            // routingContext.request().getHeader(paramName)
-                            paramHandle = invoke.invokeInterfaceMethod(Methods.REQUEST_GET_HEADER, invoke
-                                    .invokeInterfaceMethod(Methods.REQUEST,
-                                            routingContext),
-                                    invoke.load(paramName));
-                            if (paramType.name().equals(io.quarkus.arc.processor.DotNames.OPTIONAL)) {
-                                paramHandle = invoke.invokeStaticMethod(Methods.OPTIONAL_OF_NULLABLE, paramHandle);
-                            }
-
-                        }
-                        return paramHandle;
-                    }
-                }).build());
+                .resultHandleProvider(
+                        new ParamAndHeaderProvider(DotNames.HEADER, Methods.REQUEST_HEADERS, Methods.REQUEST_GET_HEADER))
+                .build());
 
         injectors
                 .add(ParameterInjector.builder()
@@ -1102,7 +1281,8 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                         .requireAnnotations(DotNames.BODY)
                         .resultHandleProvider(new ResultHandleProvider() {
                             @Override
-                            public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
+                            public ResultHandle get(MethodInfo method, Type paramType,
+                                    Set<AnnotationInstance> annotations,
                                     ResultHandle routingContext, MethodCreator invoke, int position,
                                     BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
                                 if (paramType.name().equals(io.quarkus.arc.processor.DotNames.STRING)) {
@@ -1128,7 +1308,8 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                         .requireAnnotations(DotNames.BODY)
                         .resultHandleProvider(new ResultHandleProvider() {
                             @Override
-                            public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
+                            public ResultHandle get(MethodInfo method, Type paramType,
+                                    Set<AnnotationInstance> annotations,
                                     ResultHandle routingContext, MethodCreator invoke, int position,
                                     BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
                                 registerForReflection(paramType, reflectiveHierarchy);
@@ -1146,13 +1327,112 @@ public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstanc
                             }
                         }).build());
 
+        // Add injector for failures
+        injectors.add(ParameterInjector.builder().targetHandlerType(Route.HandlerType.FAILURE)
+                .match(new TriPredicate<Type, Set<AnnotationInstance>, IndexView>() {
+                    @Override
+                    public boolean test(Type paramType, Set<AnnotationInstance> paramAnnotations, IndexView index) {
+                        return isThrowable(paramType, index) && !Annotations.contains(paramAnnotations, DotNames.BODY);
+                    }
+                }).resultHandleProvider(new ResultHandleProvider() {
+                    @Override
+                    public ResultHandle get(MethodInfo method, Type paramType,
+                            Set<AnnotationInstance> annotations,
+                            ResultHandle routingContext, MethodCreator invoke, int position,
+                            BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
+                        return invoke.invokeInterfaceMethod(Methods.FAILURE, routingContext);
+                    }
+                }).build());
+
         return injectors;
     }
 
     private static IllegalStateException parameterNameNotAvailable(int position, MethodInfo method) {
-        return new IllegalStateException("Unable to determine the name of the parameter at position " + position + " in method "
-                + method.declaringClass().name() + "#" + method.name()
-                + "() - compile the class with debug info enabled (-g) or parameter names recorded (-parameters), or specify the appropriate annotation value");
+        return new IllegalStateException(
+                "Unable to determine the name of the parameter at position " + position + " in method "
+                        + method.declaringClass().name() + "#" + method.name()
+                        + "() - compile the class with debug info enabled (-g) or parameter names recorded (-parameters), or specify the appropriate annotation value");
+
+    }
+
+    private static class ParamAndHeaderProvider implements ResultHandleProvider {
+
+        private final DotName annotationName;
+        private final MethodDescriptor multiMapAccessor;
+        private final MethodDescriptor valueAccessor;
+
+        public ParamAndHeaderProvider(DotName annotationName, MethodDescriptor multiMapAccessor,
+                MethodDescriptor valueAccessor) {
+            this.annotationName = annotationName;
+            this.multiMapAccessor = multiMapAccessor;
+            this.valueAccessor = valueAccessor;
+        }
+
+        @Override
+        public ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
+                ResultHandle routingContext, MethodCreator invoke, int position,
+                BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy) {
+            AnnotationValue paramAnnotationValue = Annotations
+                    .find(annotations, annotationName).value();
+            String paramName = paramAnnotationValue != null ? paramAnnotationValue.asString() : null;
+            if (paramName == null || paramName.equals(Param.ELEMENT_NAME)) {
+                paramName = method.parameterName(position);
+            }
+            if (paramName == null) {
+                throw parameterNameNotAvailable(position, method);
+            }
+            AssignableResultHandle paramHandle = invoke.createVariable(Object.class);
+            if (paramType.name().equals(DotNames.LIST)) {
+                Type wrappedType = paramType.asParameterizedType().arguments().get(0);
+                // List<String> params = routingContext.request().params().getAll(paramName)
+                invoke.assign(paramHandle, invoke.invokeInterfaceMethod(Methods.MULTIMAP_GET_ALL,
+                        invoke.invokeInterfaceMethod(multiMapAccessor, invoke
+                                .invokeInterfaceMethod(Methods.REQUEST,
+                                        routingContext)),
+                        invoke.load(paramName)));
+                if (!wrappedType.name()
+                        .equals(io.quarkus.arc.processor.DotNames.STRING)) {
+                    // Iterate over the list and convert wrapped values
+                    ResultHandle results = invoke.newInstance(
+                            MethodDescriptor.ofConstructor(ArrayList.class, int.class),
+                            invoke.invokeInterfaceMethod(Methods.COLLECTION_SIZE, paramHandle));
+                    ResultHandle iterator = invoke.invokeInterfaceMethod(Methods.COLLECTION_ITERATOR, paramHandle);
+                    WhileLoop loop = invoke.whileLoop(new Function<BytecodeCreator, BranchResult>() {
+                        @Override
+                        public BranchResult apply(BytecodeCreator bc) {
+                            return bc.ifTrue(bc.invokeInterfaceMethod(Methods.ITERATOR_HAS_NEXT, iterator));
+                        }
+                    });
+                    BytecodeCreator block = loop.block();
+                    AssignableResultHandle element = block.createVariable(Object.class);
+                    block.assign(element, block.invokeInterfaceMethod(Methods.ITERATOR_NEXT, iterator));
+                    convertPrimitiveAndSet(element, wrappedType, block, method, position);
+                    block.invokeInterfaceMethod(Methods.COLLECTION_ADD, results, element);
+                    invoke.assign(paramHandle, results);
+                }
+            } else {
+                // Object param = routingContext.request().getParam(paramName)
+                invoke.assign(paramHandle, invoke.invokeInterfaceMethod(valueAccessor, invoke
+                        .invokeInterfaceMethod(Methods.REQUEST,
+                                routingContext),
+                        invoke.load(paramName)));
+                if (paramType.name().equals(io.quarkus.arc.processor.DotNames.OPTIONAL)) {
+                    Type wrappedType = paramType.asParameterizedType().arguments().get(0);
+                    if (!wrappedType.name()
+                            .equals(io.quarkus.arc.processor.DotNames.STRING)) {
+                        convertPrimitiveAndSet(paramHandle, wrappedType, invoke, method,
+                                position);
+                    }
+                    invoke.assign(paramHandle,
+                            invoke.invokeStaticMethod(Methods.OPTIONAL_OF_NULLABLE, paramHandle));
+                } else {
+                    if (!paramType.name().equals(io.quarkus.arc.processor.DotNames.STRING)) {
+                        convertPrimitiveAndSet(paramHandle, paramType, invoke, method, position);
+                    }
+                }
+            }
+            return paramHandle;
+        }
 
     }
 
@@ -1162,65 +1442,92 @@ static Builder builder() {
             return new Builder();
         }
 
-        final List<Type> matchTypes;
-        final List<Type> skipTypes;
-        final List<DotName> requiredAnnotationNames;
+        final TriPredicate<Type, Set<AnnotationInstance>, IndexView> predicate;
         final ResultHandleProvider provider;
+        final Route.HandlerType targetHandlerType;
+        final ParamValidator validator;
+        final boolean canEndResponse;
 
         ParameterInjector(ParameterInjector.Builder builder) {
-            this.matchTypes = builder.matchTypes;
-            this.skipTypes = builder.skipTypes;
-            this.requiredAnnotationNames = builder.requiredAnnotationNames;
-            this.provider = builder.provider;
-        }
+            if (builder.predicate != null) {
+                this.predicate = builder.predicate;
+            } else {
+                this.predicate = new TriPredicate<Type, Set<AnnotationInstance>, IndexView>() {
+                    final List<Type> matchTypes = builder.matchTypes;
+                    final List<Type> skipTypes = builder.skipTypes;
+                    final List<DotName> requiredAnnotationNames = builder.requiredAnnotationNames;
 
-        boolean matches(Type paramType, Set<AnnotationInstance> paramAnnotations) {
-            // First iterate over all types that should be skipped
-            if (skipTypes != null) {
-                for (Type skipType : skipTypes) {
-                    if (skipType.kind() != paramType.kind()) {
-                        continue;
-                    }
-                    if (skipType.kind() == Kind.CLASS && skipType.name().equals(paramType.name())) {
-                        return false;
-                    }
-                    if (skipType.kind() == Kind.PARAMETERIZED_TYPE && skipType.name().equals(paramType.name())
-                            && skipType.asParameterizedType().arguments().equals(paramType.asParameterizedType().arguments())) {
-                        return false;
-                    }
-                }
-            }
-            // Match any of the specified types
-            if (matchTypes != null) {
-                boolean matches = false;
-                for (Type matchType : matchTypes) {
-                    if (matchType.kind() != paramType.kind()) {
-                        continue;
-                    }
-                    if (matchType.kind() == Kind.CLASS && matchType.name().equals(paramType.name())) {
-                        matches = true;
-                        break;
-                    }
-                    if (matchType.kind() == Kind.PARAMETERIZED_TYPE && matchType.name().equals(paramType.name())
-                            && matchType.asParameterizedType().arguments()
-                                    .equals(paramType.asParameterizedType().arguments())) {
-                        matches = true;
-                        break;
+                    @Override
+                    public boolean test(Type paramType, Set<AnnotationInstance> paramAnnotations, IndexView index) {
+                        // First iterate over all types that should be skipped
+                        if (skipTypes != null) {
+                            for (Type skipType : skipTypes) {
+                                if (skipType.kind() != paramType.kind()) {
+                                    continue;
+                                }
+                                if (skipType.kind() == Kind.CLASS && skipType.name().equals(paramType.name())) {
+                                    return false;
+                                }
+                                if (skipType.kind() == Kind.PARAMETERIZED_TYPE && skipType.name().equals(paramType.name())
+                                        && skipType.asParameterizedType().arguments()
+                                                .equals(paramType.asParameterizedType().arguments())) {
+                                    return false;
+                                }
+                            }
+                        }
+                        // Match any of the specified types
+                        if (matchTypes != null) {
+                            boolean matches = false;
+                            for (Type matchType : matchTypes) {
+                                if (matchType.kind() != paramType.kind()) {
+                                    continue;
+                                }
+                                if (matchType.kind() == Kind.CLASS && matchType.name().equals(paramType.name())) {
+                                    matches = true;
+                                    break;
+                                }
+                                if (matchType.kind() == Kind.PARAMETERIZED_TYPE && matchType.name().equals(paramType.name())
+                                        && matchType.asParameterizedType().arguments()
+                                                .equals(paramType.asParameterizedType().arguments())) {
+                                    matches = true;
+                                    break;
+                                }
+                            }
+                            if (!matches) {
+                                return false;
+                            }
+                        }
+                        // Find required annotations if specified
+                        if (!requiredAnnotationNames.isEmpty()) {
+                            for (DotName annotationName : requiredAnnotationNames) {
+                                if (!Annotations.contains(paramAnnotations, annotationName)) {
+                                    return false;
+                                }
+                            }
+                        }
+                        return true;
                     }
-                }
-                if (!matches) {
-                    return false;
-                }
+                };
             }
-            // Find required annotations if specified
-            if (!requiredAnnotationNames.isEmpty()) {
-                for (DotName annotationName : requiredAnnotationNames) {
-                    if (!Annotations.contains(paramAnnotations, annotationName)) {
-                        return false;
-                    }
-                }
+            this.provider = builder.provider;
+            this.targetHandlerType = builder.targetHandlerType;
+            this.validator = builder.validator;
+            this.canEndResponse = builder.canEndResponse;
+        }
+
+        boolean matches(Type paramType, Set<AnnotationInstance> paramAnnotations, IndexView index) {
+            return predicate.test(paramType, paramAnnotations, index);
+        }
+
+        Route.HandlerType getTargetHandlerType() {
+            return targetHandlerType;
+        }
+
+        void validate(BeanInfo bean, MethodInfo method, AnnotationInstance routeInstance, Type paramType,
+                Set<AnnotationInstance> paramAnnotations) {
+            if (validator != null) {
+                validator.validate(bean, method, routeInstance, paramType, paramAnnotations);
             }
-            return true;
         }
 
         ResultHandle getResultHandle(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
@@ -1229,21 +1536,17 @@ ResultHandle getResultHandle(MethodInfo method, Type paramType, Set<AnnotationIn
             return provider.get(method, paramType, annotations, routingContext, invoke, position, reflectiveHierarchy);
         }
 
-        @Override
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append("ParameterInjector [matchTypes=").append(matchTypes).append(", skipTypes=").append(skipTypes)
-                    .append(", requiredAnnotationNames=")
-                    .append(requiredAnnotationNames).append("]");
-            return builder.toString();
-        }
-
         static class Builder {
 
+            // An injector could provide either a custom predicate or match/skip types and required annotations
+            TriPredicate<Type, Set<AnnotationInstance>, IndexView> predicate;
             List<Type> matchTypes;
             List<Type> skipTypes;
             List<DotName> requiredAnnotationNames = Collections.emptyList();
             ResultHandleProvider provider;
+            Route.HandlerType targetHandlerType;
+            ParamValidator validator;
+            boolean canEndResponse;
 
             Builder matchType(DotName className) {
                 return matchType(Type.create(className, Kind.CLASS));
@@ -1257,6 +1560,38 @@ Builder matchType(Type type) {
                 return this;
             }
 
+            Builder matchPrimitiveWrappers() {
+                List<DotName> primitiveNames = Arrays.asList(io.quarkus.arc.processor.DotNames.INTEGER,
+                        io.quarkus.arc.processor.DotNames.LONG, io.quarkus.arc.processor.DotNames.SHORT,
+                        io.quarkus.arc.processor.DotNames.BOOLEAN, io.quarkus.arc.processor.DotNames.BYTE,
+                        io.quarkus.arc.processor.DotNames.CHARACTER, io.quarkus.arc.processor.DotNames.DOUBLE,
+                        io.quarkus.arc.processor.DotNames.FLOAT);
+                for (DotName name : primitiveNames) {
+                    matchType(name);
+                    matchOptionalOf(name);
+                    matchListOf(name);
+                }
+                return this;
+            }
+
+            Builder matchOptionalOf(DotName className) {
+                return matchOptionalOf(Type.create(className, Kind.CLASS));
+            }
+
+            Builder matchListOf(DotName className) {
+                return matchListOf(Type.create(className, Kind.CLASS));
+            }
+
+            Builder matchOptionalOf(Type type) {
+                return matchType(ParameterizedType.create(io.quarkus.arc.processor.DotNames.OPTIONAL,
+                        new Type[] { type }, null));
+            }
+
+            Builder matchListOf(Type type) {
+                return matchType(ParameterizedType.create(DotNames.LIST,
+                        new Type[] { type }, null));
+            }
+
             Builder skipType(DotName className) {
                 return skipType(Type.create(className, Kind.CLASS));
             }
@@ -1279,6 +1614,26 @@ Builder resultHandleProvider(ResultHandleProvider provider) {
                 return this;
             }
 
+            Builder match(TriPredicate<Type, Set<AnnotationInstance>, IndexView> predicate) {
+                this.predicate = predicate;
+                return this;
+            }
+
+            Builder targetHandlerType(Route.HandlerType handlerType) {
+                this.targetHandlerType = handlerType;
+                return this;
+            }
+
+            Builder validate(ParamValidator validator) {
+                this.validator = validator;
+                return this;
+            }
+
+            Builder canEndResponse() {
+                this.canEndResponse = true;
+                return this;
+            }
+
             ParameterInjector build() {
                 return new ParameterInjector(this);
             }
@@ -1287,6 +1642,53 @@ ParameterInjector build() {
 
     }
 
+    static void convertPrimitiveAndSet(AssignableResultHandle paramHandle, Type paramType, BytecodeCreator invoke,
+            MethodInfo method, int position) {
+        // For example:
+        // if(param != null) {
+        //    try {
+        //       param = Long.valueOf(param);
+        //    } catch(Throwable e) {
+        //       ...
+        //    }
+        // }
+        BytecodeCreator notNull = invoke.ifNotNull(paramHandle).trueBranch();
+        TryBlock tryBlock = notNull.tryBlock();
+        CatchBlockCreator catchBlock = tryBlock.addCatch(Throwable.class);
+        catchBlock.throwException(IllegalArgumentException.class,
+                "Error converting parameter at position " + position + " of method " + method,
+                catchBlock.getCaughtException());
+
+        if (paramType.name().equals(io.quarkus.arc.processor.DotNames.INTEGER)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.INTEGER_VALUE_OF,
+                    paramHandle));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.LONG)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.LONG_VALUE_OF,
+                    paramHandle));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.BOOLEAN)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.BOOLEAN_VALUE_OF,
+                    paramHandle));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.CHARACTER)) {
+            ResultHandle firstChar = tryBlock.invokeVirtualMethod(Methods.STRING_CHAR_AT, paramHandle, tryBlock.load(0));
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.CHARACTER_VALUE_OF,
+                    firstChar));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.FLOAT)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.FLOAT_VALUE_OF,
+                    paramHandle));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.DOUBLE)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.DOUBLE_VALUE_OF,
+                    paramHandle));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.BYTE)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.BYTE_VALUE_OF,
+                    paramHandle));
+        } else if (paramType.name().equals(io.quarkus.arc.processor.DotNames.SHORT)) {
+            tryBlock.assign(paramHandle, tryBlock.invokeStaticMethod(Methods.SHORT_VALUE_OF,
+                    paramHandle));
+        } else {
+            throw new IllegalArgumentException("Unsupported param type: " + paramType);
+        }
+    }
+
     interface ResultHandleProvider {
 
         ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> annotations,
@@ -1295,4 +1697,19 @@ ResultHandle get(MethodInfo method, Type paramType, Set<AnnotationInstance> anno
 
     }
 
+    @FunctionalInterface
+    interface TriPredicate<A, B, C> {
+
+        boolean test(A a, B b, C c);
+
+    }
+
+    @FunctionalInterface
+    interface ParamValidator {
+
+        void validate(BeanInfo bean, MethodInfo method, AnnotationInstance routeAnnotation, Type paramType,
+                Set<AnnotationInstance> paramAnnotations);
+
+    }
+
 }
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DeleteUploadedFilesOnEndTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DeleteUploadedFilesOnEndTest.java
index 3d1930dfd9122..cd39a752cc1bc 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DeleteUploadedFilesOnEndTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DeleteUploadedFilesOnEndTest.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java
index 0e9fd36e1e1cd..f9177eda2e8fe 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/DisabledUploadsTest.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java
index c2d0ef263f291..75702fa5ffd16 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/SimpleRouteTest.java
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.vertx.ConsumeEvent;
 import io.vertx.core.eventbus.EventBus;
@@ -42,7 +43,6 @@ public class SimpleRouteTest {
     public void testSimpleRoute() {
         when().get("/hello").then().statusCode(200).body(is("Hello world!"));
         when().get("/no-slash").then().statusCode(200).body(is("Hello world!"));
-        when().get("/rx-hello").then().statusCode(200).body(is("Hello world!"));
         when().get("/bzuk").then().statusCode(200).body(is("Hello world!"));
         when().get("/hello-event-bus?name=ping").then().statusCode(200).body(is("Hello PING!"));
         when().get("/foo?name=foo").then().statusCode(200).body(is("Hello foo!"));
@@ -54,6 +54,7 @@ public void testSimpleRoute() {
         given().contentType("text/plain").body("world")
                 .post("/body").then().body(is("Hello world!"));
         when().get("/request").then().statusCode(200).body(is("HellO!"));
+        when().get("/inject?foo=Hey").then().statusCode(200).body(is("Hey"));
     }
 
     @Test
@@ -63,11 +64,20 @@ public void testSecuredRoute() {
         given().auth().basic("alice", "alice").get("/secured").then().statusCode(200);
     }
 
+    @Test
+    public void testSecurityIdentityInjection() {
+        when().get("/security-identity").then().statusCode(200).body(is(""));
+        given().auth().preemptive().basic("alice", "alice").get("/security-identity").then().statusCode(200).body(is("alice"));
+    }
+
     static class SimpleBean {
 
         @Inject
         Transformer transformer;
 
+        @Inject
+        SecurityIdentity securityIdentity;
+
         @Route(path = "/hello")
         @Route(path = "/foo")
         @Route(path = "no-slash")
@@ -82,10 +92,10 @@ void secure(RoutingContext context) {
             context.response().setStatusCode(200).end();
         }
 
-        @Route(path = "/rx-hello")
-        void rxHello(io.vertx.reactivex.ext.web.RoutingContext context) {
-            String name = context.request().getParam("name");
-            context.response().setStatusCode(200).end("Hello " + (name != null ? name : "world") + "!");
+        @Route(path = "/security-identity")
+        //we are just testing that this does not throw an exception, see https://github.com/quarkusio/quarkus/issues/13835
+        void secIdentity(RoutingContext context) {
+            context.response().setStatusCode(200).end(securityIdentity.getPrincipal().getName());
         }
 
         @Route // path is derived from the method name
@@ -108,6 +118,11 @@ void request(RoutingContext context) {
             context.response().setStatusCode(200).end(transformer.transform("Hello!"));
         }
 
+        @Route
+        void inject(RoutingExchange exchange) {
+            exchange.ok(transformer.getFoo());
+        }
+
     }
 
     static class SimpleRoutesBean {
@@ -157,10 +172,17 @@ String generate(String name) {
     @RequestScoped
     static class Transformer {
 
+        @Inject
+        RoutingContext context;
+
         String transform(String message) {
             return message.replace('o', 'O');
         }
 
+        String getFoo() {
+            return context.request().getParam("foo");
+        }
+
     }
 
 }
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java
index 2570f9bc29899..35470b2e82100 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/UploadsDirectoryTest.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
@@ -40,7 +40,8 @@ public class UploadsDirectoryTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(Routes.class)
                     .addAsResource(new StringAsset(
-                            "quarkus.http.body.uploads-directory = " + UPLOADS_DIR + "\n"),
+                            "quarkus.http.body.uploads-directory = " + UPLOADS_DIR
+                                    + "\nquarkus.http.body.delete-uploaded-files-on-end=false\n"),
                             "application.properties"));
 
     @Test
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java
new file mode 100644
index 0000000000000..25fc6d08d56c3
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/blocking/BlockingRouteTest.java
@@ -0,0 +1,61 @@
+package io.quarkus.vertx.web.blocking;
+
+import static io.restassured.RestAssured.get;
+import static org.hamcrest.Matchers.containsString;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Route;
+import io.smallrye.common.annotation.Blocking;
+import io.vertx.core.http.HttpMethod;
+
+public class BlockingRouteTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyRoutes.class));
+
+    @Test
+    public void testBlockingRoutes() {
+        get("/non-blocking")
+                .then().statusCode(200)
+                .body(containsString("nonBlocking-"), containsString("eventloop"));
+
+        get("/blocking")
+                .then().statusCode(200)
+                .body(containsString("blocking-"), containsString("worker"));
+
+        get("/worker")
+                .then().statusCode(200)
+                .body(containsString("worker-"), containsString("worker"));
+    }
+
+    @ApplicationScoped
+    public static class MyRoutes {
+
+        @Route(methods = HttpMethod.GET, path = "/non-blocking")
+        public String nonBlocking() {
+            return "nonBlocking-" + Thread.currentThread().getName();
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/blocking", type = Route.HandlerType.BLOCKING)
+        public String blocking() {
+            return "blocking-" + Thread.currentThread().getName();
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/worker")
+        @Blocking
+        public String worker() {
+            return "worker-" + Thread.currentThread().getName();
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java
new file mode 100644
index 0000000000000..84c1f19293a83
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerPathTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.vertx.web.failure;
+
+import static io.quarkus.vertx.web.Route.HandlerType.FAILURE;
+import static io.restassured.RestAssured.get;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+import io.vertx.core.http.HttpServerResponse;
+
+public class FailureHandlerPathTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Routes.class));
+
+    @Test
+    public void test() {
+        get("/fail").then().statusCode(500).body(is("no-path"));
+    }
+
+    public static class Routes {
+
+        @Route
+        String fail(@Param String type) {
+            throw new RuntimeException("Unknown!");
+        }
+
+        // this path should not match
+        @Route(path = "/liaf", type = FAILURE, order = 1)
+        void onFailure(HttpServerResponse response) {
+            response.setStatusCode(501).end("liaf");
+        }
+
+        @Route(type = FAILURE, order = 2)
+        void onFailureNoPath(HttpServerResponse response) {
+            response.setStatusCode(500).end("no-path");
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java
new file mode 100644
index 0000000000000..09951465f873b
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/FailureHandlerTest.java
@@ -0,0 +1,53 @@
+package io.quarkus.vertx.web.failure;
+
+import static io.quarkus.vertx.web.Route.HandlerType.FAILURE;
+import static io.restassured.RestAssured.get;
+import static org.hamcrest.Matchers.is;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+import io.vertx.core.http.HttpServerResponse;
+
+public class FailureHandlerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Routes.class));
+
+    @Test
+    public void test() {
+        get("/fail?type=unsupported").then().statusCode(501).body(is("Unsupported!"));
+        get("/fail").then().statusCode(500).body(is("Unknown!"));
+    }
+
+    public static class Routes {
+
+        @Route
+        String fail(@Param String type) {
+            if ("unsupported".equals(type)) {
+                throw new UnsupportedOperationException("Unsupported!");
+            } else {
+                throw new RuntimeException("Unknown!");
+            }
+        }
+
+        @Route(path = "/fail", type = FAILURE, order = 1)
+        void uoe(UnsupportedOperationException e, HttpServerResponse response) {
+            response.setStatusCode(501).end(e.getMessage());
+        }
+
+        @Route(type = FAILURE, order = 2)
+        void re(RuntimeException e, HttpServerResponse response) {
+            response.setStatusCode(500).end(e.getMessage());
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java
new file mode 100644
index 0000000000000..c73276bbf56f3
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/MultipleThrowableParamsFailureHandlerTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.vertx.web.failure;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+import io.quarkus.vertx.web.Route.HandlerType;
+
+public class MultipleThrowableParamsFailureHandlerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Routes.class))
+            .setExpectedException(IllegalStateException.class);
+
+    @Test
+    public void testValidationFailed() {
+        fail();
+    }
+
+    public static class Routes {
+
+        @Route(type = HandlerType.FAILURE)
+        void fail(UnsupportedOperationException e1, @Param String type, RuntimeException e2) {
+            throw new RuntimeException("Unknown!");
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java
new file mode 100644
index 0000000000000..2d43bd1b0e3be
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/failure/ThrowableParamNormalHandlerTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.vertx.web.failure;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+
+public class ThrowableParamNormalHandlerTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Routes.class))
+            .setExpectedException(IllegalStateException.class);
+
+    @Test
+    public void testValidationFailed() {
+        fail();
+    }
+
+    public static class Routes {
+
+        @Route
+        void fail(UnsupportedOperationException e, @Param String type) {
+            throw new RuntimeException("Unknown!");
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java
new file mode 100644
index 0000000000000..1b15b98b24b45
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/filter/UserFilterRequestContextPropagationTest.java
@@ -0,0 +1,67 @@
+package io.quarkus.vertx.web.filter;
+
+import static org.hamcrest.Matchers.is;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Route;
+import io.quarkus.vertx.web.RouteFilter;
+import io.restassured.RestAssured;
+import io.vertx.ext.web.RoutingContext;
+
+public class UserFilterRequestContextPropagationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(FilterAndRoute.class, RequestFoo.class));
+
+    @Test
+    public void test() {
+        RestAssured.post("/hello").then().statusCode(200)
+                .body(is("11"));
+    }
+
+    public static class FilterAndRoute {
+
+        @Inject
+        RequestFoo foo;
+
+        @RouteFilter
+        void filter1(RoutingContext rc) {
+            foo.setState(11);
+            rc.next();
+        }
+
+        @Route(path = "hello")
+        void hello(RoutingContext ctx) {
+            ctx.response().end("" + foo.getState());
+        }
+
+    }
+
+    @RequestScoped
+    static class RequestFoo {
+
+        private AtomicInteger state = new AtomicInteger(-1);
+
+        void setState(int value) {
+            this.state.set(value);
+        }
+
+        public int getState() {
+            return state.get();
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java
index 0ada706fdb6cd..551f395597c5c 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/MultiRouteTest.java
@@ -41,7 +41,6 @@ public void testMultiRoute() {
         when().get("/buffers").then().statusCode(200).body(is("Buffer Buffer Buffer."));
         when().get("/buffers-and-fail").then().statusCode(200).body(containsString("Buffer"));
 
-        when().get("/rx-buffer").then().statusCode(200).body(is("BufferBuffer"));
         when().get("/mutiny-buffer").then().statusCode(200).body(is("BufferBuffer"));
 
         when().get("/void").then().statusCode(204).body(hasLength(0));
@@ -102,12 +101,6 @@ Multi<Buffer> buffersAndFail(RoutingContext context) {
 
         }
 
-        @Route(path = "rx-buffer")
-        Multi<io.vertx.reactivex.core.buffer.Buffer> bufferRx(RoutingContext context) {
-            return Multi.createFrom().items(io.vertx.reactivex.core.buffer.Buffer.buffer("Buffer"),
-                    io.vertx.reactivex.core.buffer.Buffer.buffer("Buffer"));
-        }
-
         @Route(path = "mutiny-buffer")
         Multi<io.vertx.mutiny.core.buffer.Buffer> bufferMutiny(RoutingContext context) {
             return Multi.createFrom().items(io.vertx.mutiny.core.buffer.Buffer.buffer("Buffer"),
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java
index ffedf65a83c06..6c998dbf1a106 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java
@@ -54,10 +54,6 @@ public void testSSEMultiRoute() {
                 .body(is("data: Buffer\nid: 0\n\ndata: Buffer\nid: 1\n\ndata: Buffer.\nid: 2\n\n"))
                 .header("content-type", is("text/event-stream"));
 
-        when().get("/rx-buffer").then().statusCode(200)
-                .body(is("data: Buffer\nid: 0\n\ndata: RX\nid: 1\n\n"))
-                .header("content-type", is("text/event-stream"));
-
         when().get("/mutiny-buffer").then().statusCode(200)
                 .body(is("data: Buffer\nid: 0\n\ndata: Mutiny\nid: 1\n\n"))
                 .header("content-type", is("text/event-stream"));
@@ -150,13 +146,6 @@ Multi<Buffer> buffers(RoutingContext context) {
                     .items(Buffer.buffer("Buffer"), Buffer.buffer("Buffer"), Buffer.buffer("Buffer.")));
         }
 
-        @Route(path = "rx-buffer")
-        Multi<io.vertx.reactivex.core.buffer.Buffer> bufferRx(RoutingContext context) {
-            return ReactiveRoutes
-                    .asEventStream(Multi.createFrom().items(io.vertx.reactivex.core.buffer.Buffer.buffer("Buffer"),
-                            io.vertx.reactivex.core.buffer.Buffer.buffer("RX")));
-        }
-
         @Route(path = "mutiny-buffer")
         Multi<io.vertx.mutiny.core.buffer.Buffer> bufferMutiny(RoutingContext context) {
             return ReactiveRoutes
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java
index 8357a73d2ed6c..8cb553a645a2a 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SyncRouteTest.java
@@ -3,13 +3,26 @@
 import static io.restassured.RestAssured.when;
 import static org.hamcrest.Matchers.*;
 
+import java.net.URL;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.stream.JsonParser;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.vertx.web.Route;
+import io.quarkus.vertx.web.RoutingExchange;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.web.RoutingContext;
 
@@ -19,6 +32,9 @@ public class SyncRouteTest {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class));
 
+    @TestHTTPResource
+    URL url;
+
     @Test
     public void testSynchronousRoute() {
         when().get("hello-sync").then().statusCode(200)
@@ -28,9 +44,6 @@ public void testSynchronousRoute() {
         when().get("hello-buffer-sync").then().statusCode(200).body(is("Sync Buffer"))
                 .header("content-type", is(nullValue()));
 
-        when().get("hello-buffer-rx-sync").then().statusCode(200).body(is("Sync RX Buffer"))
-                .header("content-type", is(nullValue()));
-
         when().get("hello-buffer-mutiny-sync").then().statusCode(200).body(is("Sync Mutiny Buffer"))
                 .header("content-type", is(nullValue()));
 
@@ -49,6 +62,21 @@ public void testSynchronousRoute() {
                 .body(containsString("boom"));
     }
 
+    //https://github.com/quarkusio/quarkus/issues/10960
+    @Test
+    public void testNoAcceptHeaderContentType() throws Exception {
+        //RESTAssured always sets an Accept header
+        try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
+            CloseableHttpResponse res = client.execute(new HttpGet(this.url.toExternalForm() + "/default-content-type"));
+            JsonParser parser = Json.createParser(res.getEntity().getContent());
+            parser.next();
+            JsonObject obj = parser.getObject();
+            Assertions.assertEquals("neo", obj.getString("name"));
+            Assertions.assertEquals(12345, obj.getInt("id"));
+            Assertions.assertEquals("application/json", res.getFirstHeader("content-type").getValue());
+        }
+    }
+
     static class SimpleBean {
 
         @Route(path = "hello-sync")
@@ -61,11 +89,6 @@ Buffer helloBufferSync(RoutingContext context) {
             return Buffer.buffer("Sync Buffer");
         }
 
-        @Route(path = "hello-buffer-rx-sync")
-        io.vertx.reactivex.core.buffer.Buffer helloRxBufferSync() {
-            return io.vertx.reactivex.core.buffer.Buffer.buffer("Sync RX Buffer");
-        }
-
         @Route(path = "hello-buffer-mutiny-sync")
         io.vertx.mutiny.core.buffer.Buffer helloMutinyBufferSync(RoutingContext context) {
             return io.vertx.mutiny.core.buffer.Buffer.buffer("Sync Mutiny Buffer");
@@ -87,6 +110,13 @@ Person getPersonUtf8(RoutingContext context) {
             return new Person("neo", 12345);
         }
 
+        @Route(path = "default-content-type", produces = "application/json")
+        void hi(RoutingExchange routing) {
+            routing.ok(new io.vertx.core.json.JsonObject()
+                    .put("name", "neo")
+                    .put("id", 12345).encode());
+        }
+
     }
 
     static class Person {
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java
index 74ce304ff5c5f..87e52fb81b31b 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/UniRouteTest.java
@@ -28,7 +28,6 @@ public void testUniRoute() {
         when().get("/hello").then().statusCode(200).body(is("Hello world!"));
         when().get("/hello-buffer").then().statusCode(200).body(is("Buffer"));
         when().get("/hello-on-pool").then().statusCode(200).body(is("Pool"));
-        when().get("/hello-rx-buffer").then().statusCode(200).body(is("RX Buffer"));
         when().get("/hello-mutiny-buffer").then().statusCode(200).body(is("Mutiny Buffer"));
 
         when().get("/person").then().statusCode(200)
@@ -61,11 +60,6 @@ Uni<Buffer> helloWithBuffer(RoutingContext context) {
             return Uni.createFrom().item(Buffer.buffer("Buffer"));
         }
 
-        @Route(path = "hello-rx-buffer")
-        Uni<io.vertx.reactivex.core.buffer.Buffer> helloWithRxBuffer(RoutingContext context) {
-            return Uni.createFrom().item(io.vertx.reactivex.core.buffer.Buffer.buffer("RX Buffer"));
-        }
-
         @Route(path = "hello-mutiny-buffer")
         Uni<io.vertx.mutiny.core.buffer.Buffer> helloWithMutinyBuffer(RoutingContext context) {
             return Uni.createFrom().item(io.vertx.mutiny.core.buffer.Buffer.buffer("Mutiny Buffer"));
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java
new file mode 100644
index 0000000000000..60add339eaa78
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/InvalidPathParameterNameTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.vertx.web.params;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+
+public class InvalidPathParameterNameTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SimpleBean.class))
+            .setExpectedException(IllegalStateException.class);
+
+    @Test
+    public void testValidationFailed() {
+        fail();
+    }
+
+    static class SimpleBean {
+
+        @Route(path = "/hello/:my-param")
+        String hello(@Param("my-param") String param) {
+            return param;
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java
index 8f7b97667a44d..21aec7fce7ef2 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/RouteMethodParametersTest.java
@@ -37,10 +37,9 @@ public class RouteMethodParametersTest {
 
     @Test
     public void testRoutes() {
-        //RestAssured.filters(new RequestLoggingFilter(), new ResponseLoggingFilter());
         when().get("/hello").then().statusCode(200).body(is("Hello world!"));
         when().get("/hello-response").then().statusCode(200).body(is("Hello world!"));
-        when().get("/hello-rx-response").then().statusCode(200).body(is("Hello world!"));
+        when().get("/hello-mutiny-response").then().statusCode(200).body(is("Hello world!"));
         when().get("/hello-response-nonvoid?name=foo").then().statusCode(200).body(is("Hello foo!"));
         when().get("/hello-all").then().statusCode(200).body(is("ok"));
         when().get("/hello-params?name=foo&identifier=10").then().statusCode(200).body(is("Hello foo! Your id is 10"));
@@ -48,7 +47,8 @@ public void testRoutes() {
                 .body(is("Hello 42! Your name is foo and id is 10"));
         when().get("/hello-multiple-params?id=foo&id=10").then().statusCode(200)
                 .body(is("foo,10"));
-        given().header("My-Header", "fooooo").get("/hello-header").then().statusCode(200).body(is("fooooo"));
+        given().header("My-Header", "fooooo").header("My-Number-Header", "10000").get("/hello-header").then().statusCode(200)
+                .body(is("fooooo=10000"));
         given().header("My-Header", "fooooo").header("My-Header", "baaar").get("/hello-multiple-headers").then().statusCode(200)
                 .body(is("fooooo,baaar"));
         given().contentType("application/json").body("{\"name\":\"Eleven\"}")
@@ -67,6 +67,12 @@ public void testRoutes() {
         given().contentType("application/json").body("{\"name\":\"Eleven\"}")
                 .post("/hello-body-pojo?id=13").then().statusCode(200).body("name", is("Eleven"))
                 .body("id", is(13));
+        when().get("/hello-params-conversion?id=22&size=100&valid=false&doubles=2").then().statusCode(200)
+                .body(is("id=22,size=100,valid=false,doubles=[2.0]"));
+        when().get("/hello-param-conversion-optional").then().statusCode(200)
+                .body(is("hello 42"));
+        when().get("/hello-param-conversion-optional?id=1").then().statusCode(200)
+                .body(is("hello 1"));
     }
 
     static class SimpleBean {
@@ -82,9 +88,9 @@ void hello2(HttpServerResponse response) {
             response.setStatusCode(200).end("Hello world!");
         }
 
-        @Route(path = "/hello-rx-response")
-        void hello3(io.vertx.reactivex.core.http.HttpServerResponse response) {
-            response.setStatusCode(200).end("Hello world!");
+        @Route(path = "/hello-mutiny-response")
+        void hello3(io.vertx.mutiny.core.http.HttpServerResponse response) {
+            response.setStatusCode(200).endAndForget("Hello world!");
         }
 
         @Route(path = "/hello-response-nonvoid")
@@ -93,11 +99,11 @@ String hello4(HttpServerRequest request) {
         }
 
         @Route(path = "/hello-all")
-        String hello5(io.vertx.reactivex.core.http.HttpServerResponse rxResponse, RoutingContext routingContext,
+        String hello5(io.vertx.mutiny.core.http.HttpServerResponse mutinyResp, RoutingContext routingContext,
                 RoutingExchange routingExchange, HttpServerRequest request, HttpServerResponse response,
-                io.vertx.reactivex.core.http.HttpServerRequest rxRequest) {
-            assertNotNull(rxRequest);
-            assertNotNull(rxResponse);
+                io.vertx.mutiny.core.http.HttpServerRequest mutinyReq) {
+            assertNotNull(mutinyReq);
+            assertNotNull(mutinyResp);
             assertNotNull(routingContext);
             assertNotNull(routingExchange);
             assertNotNull(request);
@@ -121,9 +127,10 @@ String helloMultipleParams(@Param("id") List<String> ids) {
         }
 
         @Route
-        String helloHeader(@Header("My-Header") String myHeader, @Header Optional<String> missingHeader) {
+        String helloHeader(@Header("My-Header") String myHeader, @Header Optional<String> missingHeader,
+                @Header("My-Number-Header") Long numberHeader) {
             assertFalse(missingHeader.isPresent());
-            return myHeader;
+            return myHeader + "=" + numberHeader;
         }
 
         @Route
@@ -157,6 +164,21 @@ Person helloBodyPojo(@Body Person person, @Param("id") Optional<String> primaryK
             return person;
         }
 
+        @Route
+        String helloParamsConversion(@Param Integer id, @Param Long size, @Param Boolean valid, @Param List<Double> doubles) {
+            return String.format("id=%s,size=%s,valid=%s,doubles=%s", id, size, valid, doubles);
+        }
+
+        @Route
+        String helloParamConversionOptional(@Param Optional<Integer> id) {
+            return "hello " + id.orElse(42);
+        }
+
+        @Route
+        String helloParamConversionFailure(@Param Integer id) {
+            return "hello " + id;
+        }
+
     }
 
     public static class Person {
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java
new file mode 100644
index 0000000000000..19acf89dcb20c
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/params/VoidInvalidParameterTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.vertx.web.params;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+
+public class VoidInvalidParameterTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(SimpleBean.class))
+            .setExpectedException(IllegalStateException.class);
+
+    @Test
+    public void testValidationFailed() {
+        fail();
+    }
+
+    static class SimpleBean {
+
+        @Route
+        void hello(@Param("myParam") String param) {
+            // This route is illegal - it's not possible to end the response
+        }
+
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java
new file mode 100644
index 0000000000000..076870147fc59
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/MultiValidationTest.java
@@ -0,0 +1,94 @@
+package io.quarkus.vertx.web.validation;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.emptyString;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+import io.smallrye.mutiny.Multi;
+import io.vertx.core.http.HttpMethod;
+
+public class MultiValidationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyRoutes.class));
+
+    @Test
+    public void test() {
+
+        // Valid parameter
+        given()
+                .queryParam("name", "neo")
+                .when()
+                .get("/query")
+                .then().statusCode(200);
+
+        // Input parameter violation - JSON
+        given()
+                .header("Accept", "application/json")
+                .queryParam("name", "doesNotMatch")
+                .when()
+                .get("/query")
+                .then().statusCode(400)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(400))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", containsString("name"))
+                .body("violations[0].message", is(not(emptyString())));
+
+        // Input parameter violation - HTML
+        given()
+                .queryParam("name", "doesNotMatch")
+                .when()
+                .get("/query")
+                .then().statusCode(400)
+                .body(containsString("ConstraintViolation"))
+                .body(is(not(emptyString())));
+    }
+
+    @ApplicationScoped
+    public static class MyRoutes {
+
+        @Route(methods = HttpMethod.GET, path = "/query")
+        public Multi<Greeting> getGreetingWithName(@Pattern(regexp = "ne.*") @NotNull @Param("name") String name) {
+            return Multi.createFrom().item(new Greeting(name, "hi"));
+        }
+
+    }
+
+    public static class Greeting {
+
+        private String name;
+        private String welcome;
+
+        public Greeting(String name, String welcome) {
+            this.name = name;
+            this.welcome = welcome;
+        }
+
+        @Length(min = 4)
+        public String getName() {
+            return name;
+        }
+
+        @Length(min = 4)
+        public String getWelcome() {
+            return welcome;
+        }
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java
new file mode 100644
index 0000000000000..c91452984e754
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/SyncValidationTest.java
@@ -0,0 +1,149 @@
+package io.quarkus.vertx.web.validation;
+
+import static io.restassured.RestAssured.get;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.emptyString;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+import io.vertx.core.http.HttpMethod;
+
+public class SyncValidationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyRoutes.class));
+
+    @Test
+    public void test() {
+        // Valid result
+        get("/valid").then().statusCode(200)
+                .body("name", is("luke"))
+                .body("welcome", is("hello"));
+
+        // Valid parameter
+        given()
+                .queryParam("name", "neo")
+                .when()
+                .get("/query")
+                .then().statusCode(200);
+
+        // JSON output
+        given()
+                .header("Accept", "application/json")
+                .when()
+                .get("/invalid")
+                .then()
+                .statusCode(500)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(500))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", containsString("name"))
+                .body("violations[0].message", is(not(emptyString())));
+
+        // HTML output
+        get("/invalid")
+                .then()
+                .statusCode(500)
+                .body(containsString("ConstraintViolation"), is(not(emptyString())));
+
+        given()
+                .header("Accept", "application/json")
+                .when()
+                .get("/invalid2").then().statusCode(500)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(500))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", anyOf(containsString("name"), containsString("welcome")))
+                .body("violations[0].message", is(not(emptyString())))
+                .body("violations[1].field", anyOf(containsString("name"), containsString("welcome")))
+                .body("violations[1].message", is(not(emptyString())));
+
+        // Input parameter violation - JSON
+        given()
+                .header("Accept", "application/json")
+                .queryParam("name", "doesNotMatch")
+                .when()
+                .get("/query")
+                .then().statusCode(400)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(400))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", containsString("name"))
+                .body("violations[0].message", is(not(emptyString())));
+
+        // Input parameter violation - HTML
+        given()
+                .queryParam("name", "doesNotMatch")
+                .when()
+                .get("/query")
+                .then().statusCode(400)
+                .body(containsString("ConstraintViolation"))
+                .body(is(not(emptyString())));
+    }
+
+    @ApplicationScoped
+    public static class MyRoutes {
+
+        @Route(methods = HttpMethod.GET, path = "/valid")
+        public Greeting getValidGreeting() {
+            return new Greeting("luke", "hello");
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/invalid")
+        @Valid
+        public Greeting getInvalidValidGreeting() {
+            return new Greeting("neo", "hello");
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/invalid2")
+        public @Valid Greeting getDoubleInValidGreeting() {
+            return new Greeting("neo", "hi");
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/query")
+        public Greeting getGreetingWithName(@Pattern(regexp = "ne.*") @NotNull @Param("name") String name) {
+            return new Greeting(name, "hi");
+        }
+
+    }
+
+    public static class Greeting {
+
+        private String name;
+        private String welcome;
+
+        public Greeting(String name, String welcome) {
+            this.name = name;
+            this.welcome = welcome;
+        }
+
+        @Length(min = 4)
+        public String getName() {
+            return name;
+        }
+
+        @Length(min = 4)
+        public String getWelcome() {
+            return welcome;
+        }
+    }
+
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java
new file mode 100644
index 0000000000000..2f00103ca5731
--- /dev/null
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/validation/UniValidationTest.java
@@ -0,0 +1,147 @@
+package io.quarkus.vertx.web.validation;
+
+import static io.restassured.RestAssured.get;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.emptyString;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Length;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.web.Param;
+import io.quarkus.vertx.web.Route;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpMethod;
+
+public class UniValidationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(MyRoutes.class));
+
+    @Test
+    public void test() {
+        // Valid result
+        get("/valid").then().statusCode(200)
+                .body("name", is("luke"))
+                .body("welcome", is("hello"));
+
+        // Valid parameter
+        given()
+                .queryParam("name", "neo")
+                .when()
+                .get("/query")
+                .then().statusCode(200);
+
+        // JSON output
+        given()
+                .header("Accept", "application/json")
+                .when()
+                .get("/invalid")
+                .then()
+                .statusCode(500)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(500))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", containsString("name"))
+                .body("violations[0].message", is(not(emptyString())));
+
+        // JSON output as it\s a Uni of object
+        given()
+                .when()
+                .get("/invalid")
+                .then()
+                .statusCode(500)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(500))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", containsString("name"))
+                .body("violations[0].message", is(not(emptyString())));
+
+        given()
+                .header("Accept", "application/json")
+                .when()
+                .get("/invalid2").then().statusCode(500)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(500))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", anyOf(containsString("name"), containsString("welcome")))
+                .body("violations[0].message", is(not(emptyString())))
+                .body("violations[1].field", anyOf(containsString("name"), containsString("welcome")))
+                .body("violations[1].message", is(not(emptyString())));
+
+        // Input parameter violation - JSON
+        given()
+                .header("Accept", "application/json")
+                .queryParam("name", "doesNotMatch")
+                .when()
+                .get("/query")
+                .then().statusCode(400)
+                .body("title", containsString("Constraint Violation"))
+                .body("status", is(400))
+                .body("details", containsString("validation constraint violations"))
+                .body("violations[0].field", containsString("name"))
+                .body("violations[0].message", is(not(emptyString())));
+    }
+
+    @ApplicationScoped
+    public static class MyRoutes {
+
+        @Route(methods = HttpMethod.GET, path = "/valid")
+        public Uni<Greeting> getValidGreeting() {
+            return Uni.createFrom().item(new Greeting("luke", "hello"));
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/invalid")
+        @Valid
+        public Uni<Greeting> getInvalidValidGreeting() {
+            return Uni.createFrom().item(new Greeting("neo", "hello"));
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/invalid2")
+        public @Valid Uni<Greeting> getDoubleInValidGreeting() {
+            return Uni.createFrom().item(new Greeting("neo", "hi"));
+        }
+
+        @Route(methods = HttpMethod.GET, path = "/query")
+        public Uni<Greeting> getGreetingWithName(@Pattern(regexp = "ne.*") @NotNull @Param("name") String name) {
+            return Uni.createFrom().item(new Greeting(name, "hi"));
+        }
+
+    }
+
+    public static class Greeting {
+
+        private String name;
+        private String welcome;
+
+        public Greeting(String name, String welcome) {
+            this.name = name;
+            this.welcome = welcome;
+        }
+
+        @Length(min = 4)
+        public String getName() {
+            return name;
+        }
+
+        @Length(min = 4)
+        public String getWelcome() {
+            return welcome;
+        }
+    }
+
+}
diff --git a/extensions/vertx-web/pom.xml b/extensions/vertx-web/pom.xml
index 067f98fc274cb..44f3a5b9cd911 100644
--- a/extensions/vertx-web/pom.xml
+++ b/extensions/vertx-web/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/vertx-web/runtime/pom.xml b/extensions/vertx-web/runtime/pom.xml
index 624d9acf59fe0..1eb0511d65e01 100644
--- a/extensions/vertx-web/runtime/pom.xml
+++ b/extensions/vertx-web/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-web-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,6 +21,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-http</artifactId>
@@ -40,6 +43,11 @@
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/Route.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/Route.java
index 634e29dc11065..4babf15934452 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/Route.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/Route.java
@@ -19,12 +19,12 @@
  * The annotated method can accept arguments of the following types:
  * <ul>
  * <li>{@code io.vertx.ext.web.RoutingContext}</li>
- * <li>{@code io.vertx.reactivex.ext.web.RoutingContext}</li>
+ * <li>{@code io.vertx.mutiny.ext.web.RoutingContext}</li>
  * <li>{@code io.quarkus.vertx.web.RoutingExchange}</li>
  * <li>{@code io.vertx.core.http.HttpServerRequest}</li>
  * <li>{@code io.vertx.core.http.HttpServerResponse}</li>
- * <li>{@code io.vertx.reactivex.core.http.HttpServerRequest}</li>
- * <li>{@code io.vertx.reactivex.core.http.HttpServerResponse}</li>
+ * <li>{@code io.vertx.mutiny.core.http.HttpServerRequest}</li>
+ * <li>{@code io.vertx.mutiny.core.http.HttpServerResponse}</li>
  * </ul>
  * Furthermore, it is possible to inject the request parameters into a method parameter annotated with
  * {@link io.quarkus.vertx.web.Param}:
@@ -67,13 +67,16 @@
  *  </code>
  * </pre>
  * 
- * If the annotated method returns {@code void} then it has to accept at least one argument.
+ * If the annotated method returns {@code void} then it has to accept at least one argument that makes it possible to end the
+ * response, for example {@link RoutingContext}.
  * If the annotated method does not return {@code void} then the arguments are optional.
  * <p>
  * If both {@link #path()} and {@link #regex()} are set the regular expression is used for matching.
  * <p>
- * If neither {@link #path()} nor {@link #regex()} is set the route will match a path derived from the name of the
- * method. This is done by de-camel-casing the name and then joining the segments with hyphens.
+ * If neither {@link #path()} nor {@link #regex()} is specified and the handler type is not {@link HandlerType#FAILURE} then the
+ * route will match a path derived from the name of the method. This is done by de-camel-casing the name and then joining the
+ * segments
+ * with hyphens.
  */
 @Repeatable(Routes.class)
 @Retention(RetentionPolicy.RUNTIME)
@@ -110,7 +113,7 @@
     /**
      * If set to a positive number, it indicates the place of the route in the chain.
      * 
-     * @see io.vertx.ext.web.Route#order()
+     * @see io.vertx.ext.web.Route#order(int)
      */
     int order() default 0;
 
@@ -118,6 +121,9 @@
      * Used for content-based routing.
      * <p>
      * If no {@code Content-Type} header is set then try to use the most acceptable content type.
+     *
+     * If the request does not contain an 'Accept' header and no content type is explicitly set in the
+     * handler then the content type will be set to the first content type in the array.
      * 
      * @see io.vertx.ext.web.Route#produces(String)
      * @see RoutingContext#getAcceptableContentType()
@@ -136,7 +142,7 @@
     enum HandlerType {
 
         /**
-         * A request handler.
+         * A non-blocking request handler.
          *
          * @see io.vertx.ext.web.Route#handler(Handler)
          */
@@ -148,11 +154,35 @@ enum HandlerType {
          */
         BLOCKING,
         /**
-         * A failure handler.
-         *
+         * A failure handler can declare a single method parameter whose type extends {@link Throwable}. The type of the
+         * parameter is used to match the result of {@link RoutingContext#failure()}.
+         * 
+         * <pre>
+         * <code>
+         *  class Routes {
+         *     {@literal @Route(type = HandlerType.FAILURE)}
+         *     void unsupported(UnsupportedOperationException e, HttpServerResponse response) {
+         *        response.setStatusCode(501).end(e.getMessage());
+         *     }
+         *  }
+         *  </code>
+         * </pre>
+         * 
+         * <p>
+         * If a failure handler declares neither a path nor a regex then the route matches all requests.
+         * 
          * @see io.vertx.ext.web.Route#failureHandler(Handler)
          */
-        FAILURE
+        FAILURE;
+
+        public static HandlerType from(String value) {
+            for (HandlerType handlerType : values()) {
+                if (handlerType.toString().equals(value)) {
+                    return handlerType;
+                }
+            }
+            return null;
+        }
 
     }
 
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/RoutingExchange.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/RoutingExchange.java
index ffa5869f200c7..d689457978609 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/RoutingExchange.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/RoutingExchange.java
@@ -11,8 +11,14 @@
  */
 public interface RoutingExchange {
 
+    /**
+     * @return the underlying Vert.x routing context.
+     */
     RoutingContext context();
 
+    /**
+     * @return the HTTP request object
+     */
     default HttpServerRequest request() {
         return context().request();
     }
@@ -29,7 +35,7 @@ default Optional<String> getParam(String paramName) {
 
     /**
      * 
-     * @param paramName
+     * @param headerName
      * @return the first header value with the specified name
      * @see HttpServerRequest#getHeader(CharSequence)
      */
@@ -37,22 +43,48 @@ default Optional<String> getHeader(CharSequence headerName) {
         return Optional.ofNullable(request().getHeader(headerName));
     }
 
+    /**
+     * @return the HTTP response object
+     */
     default HttpServerResponse response() {
         return context().response();
     }
 
+    /**
+     * Set the response status code to 200 and return the response.
+     * You must call <code>HttpServerResponse.end()</code> afterwards to end the response.
+     * 
+     * @return the HTTP response object
+     */
     default HttpServerResponse ok() {
         return response().setStatusCode(200);
     }
 
+    /**
+     * Set the response status code to 200, write a chunk of data to the response then ends it.
+     * 
+     * @param chunk
+     */
     default void ok(String chunk) {
         ok().end(chunk);
     }
 
+    /**
+     * Set the response status code to 200 and return the response.
+     * You must call <code>HttpServerResponse.end()</code> afterwards to end the response.
+     * 
+     * @return the HTTP response object
+     */
     default HttpServerResponse serverError() {
         return response().setStatusCode(500);
     }
 
+    /**
+     * Set the response status code to 200 and return the response.
+     * You must call <code>HttpServerResponse.end()</code> afterwards to end the response.
+     * 
+     * @return the HTTP response object
+     */
     default HttpServerResponse notFound() {
         return response().setStatusCode(404);
     }
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java
index d1f18782bec90..11962e9bdd75c 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSseSupport.java
@@ -131,15 +131,6 @@ public Buffer apply(io.vertx.mutiny.core.buffer.Buffer b) {
         }), rc);
     }
 
-    public static void subscribeRxBuffer(Multi<io.vertx.reactivex.core.buffer.Buffer> multi, RoutingContext rc) {
-        subscribeBuffer(multi.map(new Function<io.vertx.reactivex.core.buffer.Buffer, Buffer>() {
-            @Override
-            public Buffer apply(io.vertx.reactivex.core.buffer.Buffer b) {
-                return b.getDelegate();
-            }
-        }), rc);
-    }
-
     public static void subscribeObject(Multi<Object> multi, RoutingContext rc) {
         AtomicLong count = new AtomicLong();
         write(multi.map(new Function<Object, Buffer>() {
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java
index 91ec3db62ed0f..58634cd62469f 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/MultiSupport.java
@@ -102,15 +102,6 @@ public Buffer apply(io.vertx.mutiny.core.buffer.Buffer b) {
         }), rc);
     }
 
-    public static void subscribeRxBuffer(Multi<io.vertx.reactivex.core.buffer.Buffer> multi, RoutingContext rc) {
-        subscribeBuffer(multi.map(new Function<io.vertx.reactivex.core.buffer.Buffer, Buffer>() {
-            @Override
-            public Buffer apply(io.vertx.reactivex.core.buffer.Buffer b) {
-                return b.getDelegate();
-            }
-        }), rc);
-    }
-
     public static void subscribeObject(Multi<Object> multi, RoutingContext rc) {
         subscribeBuffer(multi.map(new Function<Object, Buffer>() {
             @Override
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/ReactiveRoutesTestHttpProvider.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/ReactiveRoutesTestHttpProvider.java
new file mode 100644
index 0000000000000..c310a7b1d8989
--- /dev/null
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/ReactiveRoutesTestHttpProvider.java
@@ -0,0 +1,36 @@
+package io.quarkus.vertx.web.runtime;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.util.function.Function;
+
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
+import io.quarkus.vertx.web.RouteBase;
+
+public class ReactiveRoutesTestHttpProvider implements TestHttpEndpointProvider {
+    @Override
+    public Function<Class<?>, String> endpointProvider() {
+        return new Function<Class<?>, String>() {
+            @Override
+            public String apply(Class<?> aClass) {
+                String value = null;
+                for (Annotation annotation : aClass.getAnnotations()) {
+                    if (annotation.annotationType().getName().equals(RouteBase.class.getName())) {
+                        try {
+                            value = (String) annotation.annotationType().getMethod("path").invoke(annotation);
+                        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }
+                if ((value == null) || value.isEmpty()) {
+                    return null;
+                }
+                if (!value.startsWith("/")) {
+                    value = "/" + value;
+                }
+                return value;
+            }
+        };
+    }
+}
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java
index 024d5dd14751c..04493b8656b6f 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandler.java
@@ -1,8 +1,13 @@
 package io.quarkus.vertx.web.runtime;
 
+import javax.enterprise.event.Event;
+
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.InjectableContext;
+import io.quarkus.arc.InjectableContext.ContextState;
 import io.quarkus.arc.ManagedContext;
+import io.quarkus.security.identity.CurrentIdentityAssociation;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.quarkus.vertx.http.runtime.security.QuarkusHttpUser;
 import io.quarkus.vertx.web.Route;
 import io.vertx.core.AsyncResult;
@@ -11,45 +16,84 @@
 
 /**
  * Handles invocation of a reactive route.
- * 
+ *
  * @see Route
  */
-public interface RouteHandler extends Handler<RoutingContext> {
+public abstract class RouteHandler implements Handler<RoutingContext> {
+
+    private static final String REQUEST_CONTEXT_STATE = "__cdi_req_ctx";
+
+    private final Event<SecurityIdentity> securityIdentityEvent;
+    private final CurrentIdentityAssociation currentIdentityAssociation;
+    private final CurrentVertxRequest currentVertxRequest;
+    private final ManagedContext requestContext;
+
+    public RouteHandler() {
+        this.securityIdentityEvent = Arc.container().beanManager().getEvent().select(SecurityIdentity.class);
+        this.currentVertxRequest = Arc.container().instance(CurrentVertxRequest.class).get();
+        this.requestContext = Arc.container().requestContext();
+        this.currentIdentityAssociation = Arc.container().instance(CurrentIdentityAssociation.class).get();
+    }
 
     /**
      * Invokes the route method.
-     * 
+     *
      * @param context
      */
-    void invoke(RoutingContext context);
+    public abstract void invoke(RoutingContext context);
 
     @Override
-    default void handle(RoutingContext context) {
+    public void handle(RoutingContext context) {
         QuarkusHttpUser user = (QuarkusHttpUser) context.user();
-        ManagedContext requestContext = Arc.container().requestContext();
         //todo: how should we handle non-proactive authentication here?
         if (requestContext.isActive()) {
+            if (currentIdentityAssociation != null) {
+                if (user != null) {
+                    SecurityIdentity identity = user.getSecurityIdentity();
+                    currentIdentityAssociation.setIdentity(identity);
+                } else {
+                    currentIdentityAssociation.setIdentity(QuarkusHttpUser.getSecurityIdentity(context, null));
+                }
+            }
             if (user != null) {
-                RouteHandlers.fireSecurityIdentity(user.getSecurityIdentity());
+                securityIdentityEvent.fire(user.getSecurityIdentity());
             }
             invoke(context);
         } else {
             try {
-                // Activate the context, i.e. set the thread locals
-                requestContext.activate();
+                // First attempt to obtain the request context state.
+                // If there is a route filter and the request can have body (POST, PUT, etc.) the route 
+                // method is invoked asynchronously (once all data are read). 
+                // However, the request context is activated by the filter and we need to make sure 
+                // the same context is then used in the route method
+                ContextState state = context.get(REQUEST_CONTEXT_STATE);
+                // Activate the context, i.e. set the thread locals, state can be null
+                requestContext.activate(state);
+                currentVertxRequest.setCurrent(context);
+                if (currentIdentityAssociation != null) {
+                    if (user != null) {
+                        SecurityIdentity identity = user.getSecurityIdentity();
+                        currentIdentityAssociation.setIdentity(identity);
+                    } else {
+                        currentIdentityAssociation.setIdentity(QuarkusHttpUser.getSecurityIdentity(context, null));
+                    }
+                }
                 if (user != null) {
-                    RouteHandlers.fireSecurityIdentity(user.getSecurityIdentity());
+                    securityIdentityEvent.fire(user.getSecurityIdentity());
+                }
+                if (state == null) {
+                    // Reactive routes can use async processing (e.g. mutiny Uni/Multi) and context propagation
+                    // 1. Store the state (which is basically a shared Map instance)
+                    // 2. Terminate the context correcly when the response is disposed or an exception is thrown 
+                    final ContextState endState = requestContext.getState();
+                    context.put(REQUEST_CONTEXT_STATE, endState);
+                    context.addEndHandler(new Handler<AsyncResult<Void>>() {
+                        @Override
+                        public void handle(AsyncResult<Void> result) {
+                            requestContext.destroy(endState);
+                        }
+                    });
                 }
-                // Reactive routes can use async processing (e.g. mutiny Uni/Multi) and context propagation
-                // 1. Store the state (which is basically a shared Map instance)
-                // 2. Terminate the context correcly when the response is disposed or an exception is thrown 
-                InjectableContext.ContextState state = requestContext.getState();
-                context.addEndHandler(new Handler<AsyncResult<Void>>() {
-                    @Override
-                    public void handle(AsyncResult<Void> result) {
-                        requestContext.destroy(state);
-                    }
-                });
                 invoke(context);
             } finally {
                 // Deactivate the context, i.e. cleanup the thread locals
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandlers.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandlers.java
index a2f37cac5b35d..6303c0be1c785 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandlers.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/RouteHandlers.java
@@ -1,10 +1,6 @@
 package io.quarkus.vertx.web.runtime;
 
-import javax.enterprise.event.Event;
-
-import io.quarkus.arc.Arc;
-import io.quarkus.arc.impl.LazyValue;
-import io.quarkus.security.identity.SecurityIdentity;
+import io.vertx.core.Handler;
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
 
@@ -15,29 +11,22 @@ private RouteHandlers() {
 
     static final String CONTENT_TYPE = "content-type";
 
-    private static final LazyValue<Event<SecurityIdentity>> SECURITY_IDENTITY_EVENT = new LazyValue<>(
-            RouteHandlers::createEvent);
-
-    public static void setContentType(RoutingContext context) {
+    public static void setContentType(RoutingContext context, String defaultContentType) {
         HttpServerResponse response = context.response();
-        if (response.headers().get(CONTENT_TYPE) == null) {
-            String acceptableContentType = context.getAcceptableContentType();
-            if (acceptableContentType != null) {
-                response.putHeader(CONTENT_TYPE, acceptableContentType);
+        context.addHeadersEndHandler(new Handler<Void>() {
+            @Override
+            public void handle(Void aVoid) {
+                //use a listener to set the content type if it has not been set
+                if (response.headers().get(CONTENT_TYPE) == null) {
+                    String acceptableContentType = context.getAcceptableContentType();
+                    if (acceptableContentType != null) {
+                        response.putHeader(CONTENT_TYPE, acceptableContentType);
+                    } else if (defaultContentType != null) {
+                        response.putHeader(CONTENT_TYPE, defaultContentType);
+                    }
+                }
             }
-        }
-    }
-
-    static void fireSecurityIdentity(SecurityIdentity identity) {
-        SECURITY_IDENTITY_EVENT.get().fire(identity);
-    }
-
-    static void clear() {
-        SECURITY_IDENTITY_EVENT.clear();
-    }
-
-    private static Event<SecurityIdentity> createEvent() {
-        return Arc.container().beanManager().getEvent().select(SecurityIdentity.class);
+        });
     }
 
 }
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java
new file mode 100644
index 0000000000000..259568625c4e8
--- /dev/null
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/ValidationSupport.java
@@ -0,0 +1,87 @@
+package io.quarkus.vertx.web.runtime;
+
+import java.util.Set;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validator;
+
+import io.quarkus.arc.ArcContainer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+public class ValidationSupport {
+
+    public static final String APPLICATION_JSON = "application/json";
+    public static final String ACCEPT_HEADER = "Accept";
+    public static final String PROBLEM_TITLE = "title";
+    public static final String PROBLEM_DETAIL = "details";
+    public static final String PROBLEM_FIELD = "field";
+    public static final String PROBLEM_MESSAGE = "message";
+    public static final String PROBLEM_STATUS = "status";
+    public static final String PROBLEM_VIOLATIONS = "violations";
+
+    private ValidationSupport() {
+        // Avoid direct instantiation
+    }
+
+    public static Validator getValidator(ArcContainer container) {
+        return container.instance(Validator.class).get();
+    }
+
+    public static String mapViolationsToJson(Set<ConstraintViolation<?>> violations, HttpServerResponse response) {
+        response.setStatusCode(500);
+        JsonObject json = generateJsonResponse(violations, true);
+        return json.encode();
+    }
+
+    /**
+     * Generates a JSON response following https://opensource.zalando.com/problem/constraint-violation/
+     * 
+     * @param violations the violations
+     * @return the json object
+     */
+    private static JsonObject generateJsonResponse(Set<ConstraintViolation<?>> violations, boolean violationInProducedItem) {
+        JsonObject json = new JsonObject()
+                .put(PROBLEM_TITLE, "Constraint Violation")
+                .put(PROBLEM_DETAIL, "validation constraint violations");
+
+        JsonArray array = new JsonArray();
+        boolean isProduced = false;
+        for (ConstraintViolation<?> cv : violations) {
+            if (cv.getExecutableReturnValue() != null) {
+                isProduced = true;
+            }
+            JsonObject violation = new JsonObject();
+            violation.put(PROBLEM_FIELD, cv.getPropertyPath().toString());
+            violation.put(PROBLEM_MESSAGE, cv.getMessage());
+            array.add(violation);
+        }
+        json.put(PROBLEM_STATUS, isProduced || violationInProducedItem ? 500 : 400);
+        json.put(PROBLEM_VIOLATIONS, array);
+        return json;
+    }
+
+    public static void handleViolationException(ConstraintViolationException ex, RoutingContext rc) {
+        String accept = rc.request().getHeader(ACCEPT_HEADER);
+        if (accept != null && accept.contains(APPLICATION_JSON)) {
+            rc.response().putHeader(RouteHandlers.CONTENT_TYPE, APPLICATION_JSON);
+            JsonObject json = generateJsonResponse(ex.getConstraintViolations(), false);
+            rc.response().setStatusCode(json.getInteger(PROBLEM_STATUS));
+            rc.response().end(json.encode());
+        } else {
+            // Check status
+            int status = 400;
+            for (ConstraintViolation<?> constraintViolation : ex.getConstraintViolations()) {
+                if (constraintViolation.getExecutableReturnValue() != null) {
+                    status = 500;
+                    break;
+                }
+            }
+            // If not JSON just fails.
+            rc.fail(status, ex);
+        }
+    }
+}
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/VertxWebRecorder.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/VertxWebRecorder.java
index 031b3b0eaf077..716a29b5a22b6 100644
--- a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/VertxWebRecorder.java
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/VertxWebRecorder.java
@@ -3,7 +3,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.function.Function;
 
-import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.quarkus.vertx.http.runtime.RouterProducer;
 import io.vertx.core.Handler;
@@ -70,13 +69,4 @@ public io.vertx.ext.web.Route apply(Router router) {
         };
     }
 
-    public void clearCacheOnShutdown(ShutdownContext shutdown) {
-        shutdown.addShutdownTask(new Runnable() {
-            @Override
-            public void run() {
-                RouteHandlers.clear();
-            }
-        });
-    }
-
 }
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundHandler.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundHandler.java
new file mode 100644
index 0000000000000..e465c96531a73
--- /dev/null
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundHandler.java
@@ -0,0 +1,61 @@
+package io.quarkus.vertx.web.runtime.devmode;
+
+import static io.quarkus.runtime.TemplateHtmlBuilder.adjustRoot;
+
+import java.util.List;
+
+import io.quarkus.runtime.TemplateHtmlBuilder;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * Lists all routes when no route matches the path in the dev mode.
+ */
+public class ResourceNotFoundHandler implements Handler<RoutingContext> {
+
+    private final String httpRoot;
+    private final List<RouteDescription> routes;
+    private final List<String> additionalEndpoints;
+
+    public ResourceNotFoundHandler(String httpRoot, List<RouteDescription> routes,
+            List<String> additionalEndpoints) {
+        this.httpRoot = httpRoot;
+        this.routes = routes;
+        this.additionalEndpoints = additionalEndpoints;
+    }
+
+    @Override
+    public void handle(RoutingContext routingContext) {
+        TemplateHtmlBuilder builder = new TemplateHtmlBuilder("404 - Resource Not Found", "", "No resources discovered");
+        builder.resourcesStart("Reactive Routes");
+        builder.resourceStart();
+        for (RouteDescription route : routes) {
+            builder.method(route.getHttpMethod(),
+                    route.getPath() != null ? TemplateHtmlBuilder.adjustRoot(httpRoot, route.getPath()) : "/*");
+            builder.listItem(route.getJavaMethod());
+            if (route.getConsumes() != null) {
+                builder.consumes(route.getConsumes());
+            }
+            if (route.getProduces() != null) {
+                builder.produces(route.getProduces());
+            }
+            builder.methodEnd();
+        }
+        builder.resourceEnd();
+        builder.resourcesEnd();
+
+        if (!additionalEndpoints.isEmpty()) {
+            builder.resourcesStart("Additional endpoints");
+            for (String additionalEndpoint : additionalEndpoints) {
+                builder.staticResourcePath(additionalEndpoint);
+            }
+            builder.resourcesEnd();
+        }
+        routingContext.response()
+                .setStatusCode(404)
+                .putHeader("content-type", "text/html; charset=utf-8")
+                .end(builder.toString());
+    }
+
+}
diff --git a/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundRecorder.java b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundRecorder.java
new file mode 100644
index 0000000000000..ecd34140abfe4
--- /dev/null
+++ b/extensions/vertx-web/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundRecorder.java
@@ -0,0 +1,18 @@
+package io.quarkus.vertx.web.runtime.devmode;
+
+import java.util.List;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.http.runtime.devmode.RouteDescription;
+import io.vertx.ext.web.Router;
+
+@Recorder
+public class ResourceNotFoundRecorder {
+
+    public void registerNotFoundHandler(RuntimeValue<Router> router, String httpRoot, List<RouteDescription> reactiveRoutes,
+            List<String> additionalEndpoints) {
+        router.getValue().errorHandler(404, new ResourceNotFoundHandler(httpRoot, reactiveRoutes, additionalEndpoints));
+    }
+
+}
diff --git a/extensions/vertx-web/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider b/extensions/vertx-web/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
new file mode 100644
index 0000000000000..49cbdc788af6a
--- /dev/null
+++ b/extensions/vertx-web/runtime/src/main/resources/META-INF/services/io.quarkus.runtime.test.TestHttpEndpointProvider
@@ -0,0 +1 @@
+io.quarkus.vertx.web.runtime.ReactiveRoutesTestHttpProvider
diff --git a/extensions/vertx/deployment/pom.xml b/extensions/vertx/deployment/pom.xml
index 6a2ef081fd342..4f2dd5c3b81d0 100644
--- a/extensions/vertx/deployment/pom.xml
+++ b/extensions/vertx/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusCodecProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusCodecProcessor.java
index 8b2e5b4735897..cf884d3940cc8 100644
--- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusCodecProcessor.java
+++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusCodecProcessor.java
@@ -1,12 +1,10 @@
 package io.quarkus.vertx.deployment;
 
-import static io.quarkus.vertx.deployment.VertxConstants.AXLE_MESSAGE;
 import static io.quarkus.vertx.deployment.VertxConstants.COMPLETION_STAGE;
 import static io.quarkus.vertx.deployment.VertxConstants.CONSUME_EVENT;
 import static io.quarkus.vertx.deployment.VertxConstants.LOCAL_EVENT_BUS_CODEC;
 import static io.quarkus.vertx.deployment.VertxConstants.MESSAGE;
 import static io.quarkus.vertx.deployment.VertxConstants.MUTINY_MESSAGE;
-import static io.quarkus.vertx.deployment.VertxConstants.RX_MESSAGE;
 import static io.quarkus.vertx.deployment.VertxConstants.UNI;
 
 import java.util.Arrays;
@@ -14,8 +12,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import javax.inject.Inject;
+import java.util.function.Consumer;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -39,13 +36,11 @@ public class EventBusCodecProcessor {
 
     private static final Logger LOGGER = Logger.getLogger(EventBusCodecProcessor.class.getName());
 
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-
     @BuildStep
     public void registerCodecs(
             BeanArchiveIndexBuildItem beanArchiveIndexBuildItem,
-            BuildProducer<MessageCodecBuildItem> messageCodecs) {
+            BuildProducer<MessageCodecBuildItem> messageCodecs,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
 
         final IndexView index = beanArchiveIndexBuildItem.getIndex();
         Collection<AnnotationInstance> consumeEventAnnotationInstances = index.getAnnotations(CONSUME_EVENT);
@@ -100,7 +95,12 @@ public void registerCodecs(
 
         // Register codec classes for reflection.
         codecByTypes.values().stream().map(DotName::toString).distinct()
-                .forEach(name -> reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, name)));
+                .forEach(new Consumer<String>() {
+                    @Override
+                    public void accept(String name) {
+                        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, name));
+                    }
+                });
     }
 
     private static final List<String> BUILT_IN_CODECS = Arrays.asList(
@@ -123,9 +123,7 @@ public void registerCodecs(
 
             // Buffers classes
             Buffer.class.getName(),
-            io.vertx.mutiny.core.buffer.Buffer.class.getName(),
-            io.vertx.axle.core.buffer.Buffer.class.getName(),
-            io.vertx.reactivex.core.buffer.Buffer.class.getName());
+            io.vertx.mutiny.core.buffer.Buffer.class.getName());
 
     private static Type extractPayloadTypeFromReturn(MethodInfo method) {
         Type returnType = method.returnType();
@@ -184,8 +182,6 @@ private static boolean hasBuiltInCodec(Type type) {
      */
     private static boolean isMessageClass(ParameterizedType type) {
         return type.name().equals(MESSAGE)
-                || type.name().equals(RX_MESSAGE)
-                || type.name().equals(AXLE_MESSAGE)
                 || type.name().equals(MUTINY_MESSAGE);
     }
 }
diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java
index 8453f76106172..b5d97cbe628e0 100644
--- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java
+++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java
@@ -1,17 +1,21 @@
 package io.quarkus.vertx.deployment;
 
-import static io.quarkus.vertx.deployment.VertxConstants.*;
+import static io.quarkus.vertx.deployment.VertxConstants.COMPLETION_STAGE;
+import static io.quarkus.vertx.deployment.VertxConstants.MESSAGE;
+import static io.quarkus.vertx.deployment.VertxConstants.MUTINY_MESSAGE;
+import static io.quarkus.vertx.deployment.VertxConstants.UNI;
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 
-import java.lang.annotation.Annotation;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.DotName;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
-import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
@@ -20,61 +24,38 @@
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.arc.processor.DotNames;
-import io.quarkus.gizmo.AssignableResultHandle;
-import io.quarkus.gizmo.BranchResult;
-import io.quarkus.gizmo.BytecodeCreator;
-import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
-import io.quarkus.gizmo.FunctionCreator;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
-import io.quarkus.gizmo.TryBlock;
 import io.quarkus.runtime.util.HashUtil;
-import io.quarkus.vertx.ConsumeEvent;
 import io.quarkus.vertx.runtime.EventConsumerInvoker;
+import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
 import io.vertx.core.eventbus.Message;
 
 class EventBusConsumer {
+
     private static final String INVOKER_SUFFIX = "_VertxInvoker";
+
+    private static final MethodDescriptor INVOKER_CONSTRUCTOR = MethodDescriptor
+            .ofConstructor(EventConsumerInvoker.class);
     private static final MethodDescriptor ARC_CONTAINER = MethodDescriptor
             .ofMethod(Arc.class, "container", ArcContainer.class);
     private static final MethodDescriptor INSTANCE_HANDLE_GET = MethodDescriptor.ofMethod(InstanceHandle.class, "get",
             Object.class);
-    private static final MethodDescriptor ARC_CONTAINER_INSTANCE_FOR_TYPE = MethodDescriptor
-            .ofMethod(ArcContainer.class,
-                    "instance", InstanceHandle.class,
-                    Class.class, Annotation[].class);
-    private static final MethodDescriptor VERTX_EXECUTE_BLOCKING = MethodDescriptor.ofMethod(Vertx.class,
-            "executeBlocking", void.class, Handler.class, boolean.class, Handler.class);
-    private static final MethodDescriptor FUTURE_COMPLETE = MethodDescriptor.ofMethod(Future.class,
-            "complete", void.class, Object.class);
-    private static final MethodDescriptor FUTURE_FAIL = MethodDescriptor.ofMethod(Future.class,
-            "fail", void.class, Throwable.class);
     private static final MethodDescriptor ARC_CONTAINER_BEAN = MethodDescriptor.ofMethod(ArcContainer.class, "bean",
             InjectableBean.class, String.class);
     private static final MethodDescriptor ARC_CONTAINER_INSTANCE_FOR_BEAN = MethodDescriptor
             .ofMethod(ArcContainer.class,
                     "instance", InstanceHandle.class,
                     InjectableBean.class);
-    private static final MethodDescriptor RX_MESSAGE_NEW_INSTANCE = MethodDescriptor.ofMethod(
-            io.vertx.reactivex.core.eventbus.Message.class,
-            "newInstance", io.vertx.reactivex.core.eventbus.Message.class, Message.class);
-    private static final MethodDescriptor AXLE_MESSAGE_NEW_INSTANCE = MethodDescriptor.ofMethod(
-            io.vertx.axle.core.eventbus.Message.class,
-            "newInstance", io.vertx.axle.core.eventbus.Message.class, Message.class);
     private static final MethodDescriptor MUTINY_MESSAGE_NEW_INSTANCE = MethodDescriptor.ofMethod(
             io.vertx.mutiny.core.eventbus.Message.class,
             "newInstance", io.vertx.mutiny.core.eventbus.Message.class, Message.class);
-    private static final MethodDescriptor MESSAGE_REPLY = MethodDescriptor.ofMethod(Message.class, "reply", void.class,
-            Object.class);
-    private static final MethodDescriptor MESSAGE_FAIL = MethodDescriptor.ofMethod(Message.class, "fail", void.class,
-            Integer.TYPE, String.class);
     private static final MethodDescriptor MESSAGE_BODY = MethodDescriptor.ofMethod(Message.class, "body", Object.class);
     private static final MethodDescriptor INSTANCE_HANDLE_DESTROY = MethodDescriptor
             .ofMethod(InstanceHandle.class, "destroy",
@@ -85,6 +66,9 @@ class EventBusConsumer {
             .ofMethod(Uni.class, "subscribeAsCompletionStage", CompletableFuture.class);
     protected static final MethodDescriptor THROWABLE_GET_MESSAGE = MethodDescriptor
             .ofMethod(Throwable.class, "getMessage", String.class);
+    protected static final MethodDescriptor THROWABLE_TO_STRING = MethodDescriptor
+            .ofMethod(Throwable.class, "toString", String.class);
+    protected static final DotName BLOCKING = DotName.createSimple(Blocking.class.getName());
 
     static String generateInvoker(BeanInfo bean, MethodInfo method,
             AnnotationInstance consumeEvent,
@@ -97,89 +81,80 @@ static String generateInvoker(BeanInfo bean, MethodInfo method,
         } else {
             baseName = DotNames.simpleName(bean.getImplClazz().name());
         }
-        String targetPackage = DotNames.packageName(bean.getImplClazz().name());
+        String targetPackage = DotNames.internalPackageNameWithTrailingSlash(bean.getImplClazz().name());
 
         StringBuilder sigBuilder = new StringBuilder();
         sigBuilder.append(method.name()).append("_").append(method.returnType().name().toString());
         for (Type i : method.parameters()) {
             sigBuilder.append(i.name().toString());
         }
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + INVOKER_SUFFIX + "_" + method.name() + "_"
+        String generatedName = targetPackage + baseName + INVOKER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString());
 
-        ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)
-                .interfaces(EventConsumerInvoker.class).build();
+        boolean blocking;
+        AnnotationValue blockingValue = consumeEvent.value("blocking");
+        blocking = method.hasAnnotation(BLOCKING) || (blockingValue != null && blockingValue.asBoolean());
 
-        // The method descriptor is: void invokeBean(Object message)
-        MethodCreator invoke = invokerCreator.getMethodCreator("invokeBean", void.class, Object.class);
-        ResultHandle containerHandle = invoke.invokeStaticMethod(ARC_CONTAINER);
+        ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)
+                .superClass(EventConsumerInvoker.class).build();
 
-        AnnotationValue blocking = consumeEvent.value("blocking");
-        if (blocking != null && blocking.asBoolean()) {
-            // Blocking operation must be performed on a worker thread
-            ResultHandle vertxHandle = invoke
-                    .invokeInterfaceMethod(INSTANCE_HANDLE_GET,
-                            invoke.invokeInterfaceMethod(ARC_CONTAINER_INSTANCE_FOR_TYPE, containerHandle,
-                                    invoke.loadClass(Vertx.class),
-                                    invoke.newArray(Annotation.class.getName(), invoke.load(0))));
+        // Initialized state
+        FieldCreator beanField = invokerCreator.getFieldCreator("bean", InjectableBean.class)
+                .setModifiers(ACC_PRIVATE | ACC_FINAL);
+        FieldCreator containerField = invokerCreator.getFieldCreator("container", ArcContainer.class)
+                .setModifiers(ACC_PRIVATE | ACC_FINAL);
 
-            FunctionCreator func = invoke.createFunction(Handler.class);
-            BytecodeCreator funcBytecode = func.getBytecode();
-            AssignableResultHandle messageHandle = funcBytecode.createVariable(Message.class);
-            funcBytecode.assign(messageHandle, invoke.getMethodParam(0));
-            TryBlock tryBlock = funcBytecode.tryBlock();
-            invoke(bean, method, messageHandle, tryBlock);
-            tryBlock.invokeInterfaceMethod(FUTURE_COMPLETE, funcBytecode.getMethodParam(0), tryBlock.loadNull());
-            CatchBlockCreator catchBlock = tryBlock.addCatch(Exception.class);
-            catchBlock.invokeInterfaceMethod(FUTURE_FAIL, funcBytecode.getMethodParam(0), catchBlock.getMethodParam(0));
-            funcBytecode.returnValue(null);
+        if (blocking) {
+            MethodCreator isBlocking = invokerCreator.getMethodCreator("isBlocking", boolean.class);
+            isBlocking.returnValue(isBlocking.load(true));
+        }
 
-            invoke.invokeInterfaceMethod(VERTX_EXECUTE_BLOCKING, vertxHandle, func.getInstance(), invoke.load(false),
-                    invoke.loadNull());
-        } else {
-            invoke(bean, method, invoke.getMethodParam(0), invoke);
+        AnnotationValue orderedValue = consumeEvent.value("ordered");
+        boolean ordered = orderedValue != null && orderedValue.asBoolean();
+        if (ordered) {
+            MethodCreator isOrdered = invokerCreator.getMethodCreator("isOrdered", boolean.class);
+            isOrdered.returnValue(isOrdered.load(true));
         }
-        invoke.returnValue(null);
+
+        implementConstructor(bean, invokerCreator, beanField, containerField);
+        implementInvoke(bean, method, invokerCreator, beanField.getFieldDescriptor(), containerField.getFieldDescriptor());
+
         invokerCreator.close();
         return generatedName.replace('/', '.');
     }
 
-    /**
-     * This method generates the following code:
-     * {@code
-     * Logger.getLogger(EventBusConsumer.class.getName()).warn(...);
-     * }
-     * It prints a deprecation method if the method annotated with {@link io.quarkus.vertx.ConsumeEvent} uses a
-     * deprecated type.
-     *
-     * @param invoke the invoker
-     * @param method the method using the deprecated type
-     * @param deprecatedClass the deprecated type
-     */
-    private static void logDeprecation(BytecodeCreator invoke, MethodInfo method, String deprecatedClass) {
-        String msg = String
-                .format("The `%s.%s` method is using the deprecated `%s` class. This class will be removed in a "
-                        + "future version. It is recommended to switch to `%s`",
-                        method.declaringClass().name(), method.name(), deprecatedClass,
-                        io.vertx.mutiny.core.eventbus.Message.class.getName());
-        ResultHandle loggerName = invoke.load(EventBusConsumer.class.getName());
-        ResultHandle message = invoke.load(msg);
-        MethodDescriptor getLoggerMethod = MethodDescriptor
-                .ofMethod(Logger.class, "getLogger", Logger.class, String.class);
-        ResultHandle logger = invoke
-                .invokeStaticMethod(getLoggerMethod, loggerName);
-        MethodDescriptor warnMethod = MethodDescriptor.ofMethod(Logger.class, "warn", Void.TYPE, Object.class);
-        invoke.invokeVirtualMethod(warnMethod, logger, message);
+    static void implementConstructor(BeanInfo bean, ClassCreator invokerCreator, FieldCreator beanField,
+            FieldCreator containerField) {
+        MethodCreator constructor = invokerCreator.getMethodCreator("<init>", void.class);
+        // Invoke super()
+        constructor.invokeSpecialMethod(INVOKER_CONSTRUCTOR, constructor.getThis());
+
+        ResultHandle containerHandle = constructor
+                .invokeStaticMethod(ARC_CONTAINER);
+        ResultHandle beanHandle = constructor.invokeInterfaceMethod(
+                ARC_CONTAINER_BEAN,
+                containerHandle, constructor.load(bean.getIdentifier()));
+        constructor.writeInstanceField(beanField.getFieldDescriptor(), constructor.getThis(), beanHandle);
+        constructor.writeInstanceField(containerField.getFieldDescriptor(), constructor.getThis(), containerHandle);
+        constructor.returnValue(null);
     }
 
-    private static void invoke(BeanInfo bean, MethodInfo method, ResultHandle messageHandle, BytecodeCreator invoke) {
-        ResultHandle containerHandle = invoke.invokeStaticMethod(ARC_CONTAINER);
-        ResultHandle beanHandle = invoke.invokeInterfaceMethod(ARC_CONTAINER_BEAN, containerHandle,
-                invoke.load(bean.getIdentifier()));
+    private static void implementInvoke(BeanInfo bean, MethodInfo method, ClassCreator invokerCreator,
+            FieldDescriptor beanField,
+            FieldDescriptor containerField) {
+
+        // The method descriptor is: CompletionStage invokeBean(Message message)
+        MethodCreator invoke = invokerCreator.getMethodCreator("invokeBean", Object.class, Message.class)
+                .addException(Exception.class);
+
+        ResultHandle containerHandle = invoke.readInstanceField(containerField, invoke.getThis());
+        ResultHandle beanHandle = invoke.readInstanceField(beanField, invoke.getThis());
         ResultHandle instanceHandle = invoke.invokeInterfaceMethod(ARC_CONTAINER_INSTANCE_FOR_BEAN, containerHandle,
                 beanHandle);
         ResultHandle beanInstanceHandle = invoke
                 .invokeInterfaceMethod(INSTANCE_HANDLE_GET, instanceHandle);
+        ResultHandle messageHandle = invoke.getMethodParam(0);
+        ResultHandle result;
 
         Type paramType = method.parameters().get(0);
         if (paramType.name().equals(MESSAGE)) {
@@ -188,22 +163,7 @@ private static void invoke(BeanInfo bean, MethodInfo method, ResultHandle messag
                     MethodDescriptor
                             .ofMethod(bean.getImplClazz().name().toString(), method.name(), void.class, Message.class),
                     beanInstanceHandle, messageHandle);
-        } else if (paramType.name().equals(RX_MESSAGE)) {
-            // io.vertx.reactivex.core.eventbus.Message
-            logDeprecation(invoke, method, RX_MESSAGE.toString());
-            ResultHandle rxMessageHandle = invoke.invokeStaticMethod(RX_MESSAGE_NEW_INSTANCE, messageHandle);
-            invoke.invokeVirtualMethod(
-                    MethodDescriptor.ofMethod(bean.getImplClazz().name().toString(), method.name(), void.class,
-                            io.vertx.reactivex.core.eventbus.Message.class),
-                    beanInstanceHandle, rxMessageHandle);
-        } else if (paramType.name().equals(AXLE_MESSAGE)) {
-            // io.vertx.axle.core.eventbus.Message
-            logDeprecation(invoke, method, AXLE_MESSAGE.toString());
-            ResultHandle axleMessageHandle = invoke.invokeStaticMethod(AXLE_MESSAGE_NEW_INSTANCE, messageHandle);
-            invoke.invokeVirtualMethod(
-                    MethodDescriptor.ofMethod(bean.getImplClazz().name().toString(), method.name(), void.class,
-                            io.vertx.axle.core.eventbus.Message.class),
-                    beanInstanceHandle, axleMessageHandle);
+            result = invoke.loadNull();
         } else if (paramType.name().equals(MUTINY_MESSAGE)) {
             // io.vertx.mutiny.core.eventbus.Message
             ResultHandle mutinyMessageHandle = invoke.invokeStaticMethod(MUTINY_MESSAGE_NEW_INSTANCE, messageHandle);
@@ -211,30 +171,26 @@ private static void invoke(BeanInfo bean, MethodInfo method, ResultHandle messag
                     MethodDescriptor.ofMethod(bean.getImplClazz().name().toString(), method.name(), void.class,
                             io.vertx.mutiny.core.eventbus.Message.class),
                     beanInstanceHandle, mutinyMessageHandle);
+            result = invoke.loadNull();
         } else {
             // Parameter is payload
             ResultHandle bodyHandle = invoke.invokeInterfaceMethod(MESSAGE_BODY, messageHandle);
-            ResultHandle replyHandle = invoke.invokeVirtualMethod(
+            ResultHandle returnHandle = invoke.invokeVirtualMethod(
                     MethodDescriptor.ofMethod(bean.getImplClazz().name().toString(), method.name(),
                             method.returnType().name().toString(), paramType.name().toString()),
                     beanInstanceHandle, bodyHandle);
-            if (replyHandle != null) {
+            if (returnHandle != null) {
                 if (method.returnType().name().equals(COMPLETION_STAGE)) {
-                    FunctionCreator handler = generateWhenCompleteHandler(messageHandle, invoke);
-                    invoke.invokeInterfaceMethod(
-                            WHEN_COMPLETE,
-                            replyHandle, handler.getInstance());
+                    result = returnHandle;
                 } else if (method.returnType().name().equals(UNI)) {
-                    // If the return type is Uni use uni.subscribeAsCompletionStage().whenComplete(...)
-                    FunctionCreator handler = generateWhenCompleteHandler(messageHandle, invoke);
-                    ResultHandle subscribedCompletionStage = invoke.invokeInterfaceMethod(SUBSCRIBE_AS_COMPLETION_STAGE,
-                            replyHandle);
-                    invoke.invokeInterfaceMethod(WHEN_COMPLETE,
-                            subscribedCompletionStage, handler.getInstance());
+                    result = invoke.invokeInterfaceMethod(SUBSCRIBE_AS_COMPLETION_STAGE,
+                            returnHandle);
                 } else {
                     // Message.reply(returnValue)
-                    invoke.invokeInterfaceMethod(MESSAGE_REPLY, messageHandle, replyHandle);
+                    result = returnHandle;
                 }
+            } else {
+                result = invoke.loadNull();
             }
         }
 
@@ -242,58 +198,8 @@ private static void invoke(BeanInfo bean, MethodInfo method, ResultHandle messag
         if (BuiltinScope.DEPENDENT.is(bean.getScope())) {
             invoke.invokeInterfaceMethod(INSTANCE_HANDLE_DESTROY, instanceHandle);
         }
-    }
-
-    /**
-     * If the return type is CompletionStage use:
-     * <code><pre>
-     * cs.whenComplete((whenResult, whenFailure) -> {
-     *  if (failure != null) {
-     *         message.fail(status, whenFailure.getMessage());
-     *  } else {
-     *         message.reply(whenResult);
-     *  }
-     * })
-     * </pre></code>
-     *
-     * @param messageHandle the message variable
-     * @param invoke the bytecode creator
-     * @return the function
-     */
-    private static FunctionCreator generateWhenCompleteHandler(ResultHandle messageHandle, BytecodeCreator invoke) {
-        FunctionCreator handler = invoke.createFunction(BiConsumer.class);
-        BytecodeCreator bytecode = handler.getBytecode();
-
-        // This avoid having to check cast in the branches
-        AssignableResultHandle whenResult = bytecode.createVariable(Object.class);
-        bytecode.assign(whenResult, bytecode.getMethodParam(0));
-        AssignableResultHandle whenFailure = bytecode.createVariable(Exception.class);
-        bytecode.assign(whenFailure, bytecode.getMethodParam(1));
-        AssignableResultHandle message = bytecode.createVariable(Message.class);
-        bytecode.assign(message, messageHandle);
-
-        BranchResult ifFailureIfNull = bytecode.ifNull(whenFailure);
-        // failure is not null branch - message.fail(failureStatus, failure.getMessage())
-        // In this branch we use the EXPLICIT FAILURE CODE
-        BytecodeCreator failureIsNotNull = ifFailureIfNull.falseBranch();
-        ResultHandle failureStatus = failureIsNotNull.load(ConsumeEvent.EXPLICIT_FAILURE_CODE);
-        ResultHandle failureMessage = failureIsNotNull
-                .invokeVirtualMethod(THROWABLE_GET_MESSAGE, whenFailure);
-        failureIsNotNull.invokeInterfaceMethod(
-                MESSAGE_FAIL,
-                message,
-                failureStatus,
-                failureMessage);
-
-        // failure is null branch - message.reply(reply))
-        BytecodeCreator failureIsNull = ifFailureIfNull.trueBranch();
-        failureIsNull.invokeInterfaceMethod(
-                MESSAGE_REPLY,
-                messageHandle,
-                whenResult);
 
-        bytecode.returnValue(null);
-        return handler;
+        invoke.returnValue(result);
     }
 
     private EventBusConsumer() {
diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxConstants.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxConstants.java
index fdfa3669b1bf1..b766009e4789a 100644
--- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxConstants.java
+++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxConstants.java
@@ -12,10 +12,6 @@
 public class VertxConstants {
 
     static final DotName MESSAGE = DotName.createSimple(Message.class.getName());
-    static final DotName RX_MESSAGE = DotName
-            .createSimple(io.vertx.reactivex.core.eventbus.Message.class.getName());
-    static final DotName AXLE_MESSAGE = DotName
-            .createSimple(io.vertx.axle.core.eventbus.Message.class.getName());
     static final DotName MUTINY_MESSAGE = DotName
             .createSimple(io.vertx.mutiny.core.eventbus.Message.class.getName());
     static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
index 6d602b3f0cefe..260db97a9147a 100644
--- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
+++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
@@ -6,9 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
@@ -17,16 +14,15 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
+import io.quarkus.arc.deployment.AutoAddScopeBuildItem;
 import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
 import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem;
-import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion;
 import io.quarkus.arc.processor.AnnotationStore;
-import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanInfo;
 import io.quarkus.arc.processor.BuildExtension;
+import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.GeneratedClassGizmoAdaptor;
@@ -54,9 +50,6 @@ class VertxProcessor {
 
     private static final Logger LOGGER = Logger.getLogger(VertxProcessor.class.getName());
 
-    @Inject
-    BuildProducer<ReflectiveClassBuildItem> reflectiveClass;
-
     @BuildStep
     void featureAndCapability(BuildProducer<FeatureBuildItem> feature, BuildProducer<CapabilityBuildItem> capability) {
         feature.produce(new FeatureBuildItem(Feature.VERTX));
@@ -74,7 +67,7 @@ VertxBuildItem build(CoreVertxBuildItem vertx, VertxRecorder recorder,
             List<EventConsumerBusinessMethodItem> messageConsumerBusinessMethods,
             BuildProducer<GeneratedClassBuildItem> generatedClass,
             AnnotationProxyBuildItem annotationProxy, LaunchModeBuildItem launchMode, ShutdownContextBuildItem shutdown,
-            BuildProducer<ServiceStartBuildItem> serviceStart,
+            BuildProducer<ServiceStartBuildItem> serviceStart, BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             List<MessageCodecBuildItem> codecs, RecorderContext recorderContext) {
         Map<String, ConsumeEvent> messageConsumerConfigurations = new HashMap<>();
         ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, true);
@@ -133,37 +126,15 @@ void collectEventConsumers(
     }
 
     @BuildStep
-    AnnotationsTransformerBuildItem annotationTransformer(CustomScopeAnnotationsBuildItem scopes) {
-        return new AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
-            @Override
-            public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind kind) {
-                return kind == org.jboss.jandex.AnnotationTarget.Kind.CLASS;
-            }
-
-            @Override
-            public void transform(TransformationContext context) {
-                if (!scopes.isScopeIn(context.getAnnotations())
-                        && context.getTarget().asClass().annotations().containsKey(CONSUME_EVENT)) {
-                    // Class with no built-in scope annotation but with a method annotated with @ConsumeMessage
-                    LOGGER.debugf(
-                            "Found event consumer business methods on a class %s with no scope annotation - adding @Singleton",
-                            context.getTarget());
-                    context.transform().add(Singleton.class).done();
-                }
-            }
-        });
+    AutoAddScopeBuildItem autoAddScope() {
+        // Add @Singleton to a class with no scope annotation but with a method annotated with @ConsumeEvent
+        return AutoAddScopeBuildItem.builder().containsAnnotations(CONSUME_EVENT).defaultScope(BuiltinScope.SINGLETON)
+                .reason("Found event consumer business methods").build();
     }
 
     @BuildStep
     void registerVerticleClasses(CombinedIndexBuildItem indexBuildItem,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
-        // RX Verticles
-        for (ClassInfo ci : indexBuildItem.getIndex()
-                .getAllKnownSubclasses(DotName.createSimple(io.vertx.reactivex.core.AbstractVerticle.class.getName()))) {
-            reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, ci.toString()));
-        }
-
         // Mutiny Verticles
         for (ClassInfo ci : indexBuildItem.getIndex()
                 .getAllKnownSubclasses(DotName.createSimple(io.smallrye.mutiny.vertx.core.AbstractVerticle.class.getName()))) {
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/AxleCodecRegistrationTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/AxleCodecRegistrationTest.java
deleted file mode 100644
index f1a71d02ad2d2..0000000000000
--- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/AxleCodecRegistrationTest.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package io.quarkus.vertx;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import io.vertx.axle.core.Vertx;
-import io.vertx.axle.core.eventbus.Message;
-
-public class AxleCodecRegistrationTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap
-                    .create(JavaArchive.class).addClasses(EventBusConsumers.class));
-
-    @Inject
-    EventBusConsumers bean;
-
-    @Inject
-    Vertx vertx;
-
-    @Test
-    public void testReceptionOfString() {
-        String address = "address-1";
-        vertx.eventBus().send(address, "a");
-        vertx.eventBus().send(address, "b");
-        vertx.eventBus().send(address, "c");
-        await().until(() -> bean.getAddress1().size() == 3);
-    }
-
-    @Test
-    public void testReceptionOfStringAndSendingNothing() {
-        String address = "address-2";
-        vertx.eventBus().send(address, "a");
-        vertx.eventBus().send(address, "b");
-        vertx.eventBus().send(address, "c");
-        await().until(() -> bean.getAddress2().size() == 3);
-
-        List<Message<?>> messages = new CopyOnWriteArrayList<>();
-        vertx.eventBus().request(address, "d").thenAccept(messages::add);
-        vertx.eventBus().request(address, "e").thenAccept(messages::add);
-        await().until(() -> messages.size() == 2);
-        assertThat(messages.get(0).body()).isNull();
-        assertThat(messages.get(1).body()).isNull();
-    }
-
-    @Test
-    public void testWithPrimitiveTypes() {
-        String address = "address-3";
-        List<Message<Long>> messages = new CopyOnWriteArrayList<>();
-        vertx.eventBus().<Long> request(address, 1).thenAccept(messages::add);
-        vertx.eventBus().<Long> request(address, 2).thenAccept(messages::add);
-        await().until(() -> messages.size() == 2);
-        assertThat(messages.get(0).body()).isBetween(1L, 4L);
-        assertThat(messages.get(1).body()).isBetween(1L, 4L);
-    }
-
-    @Test
-    public void testWithPrimitiveTypesAndCompletionStage() {
-        String address = "address-4";
-        List<Message<Long>> messages = new CopyOnWriteArrayList<>();
-        vertx.eventBus().<Long> request(address, 1).thenAccept(messages::add);
-        vertx.eventBus().<Long> request(address, 2).thenAccept(messages::add);
-        await().until(() -> messages.size() == 2);
-        assertThat(messages.get(0).body()).isBetween(1L, 4L);
-        assertThat(messages.get(1).body()).isBetween(1L, 4L);
-    }
-
-    @Test
-    public void testCodecRegistrationBasedOnParameterType() {
-        String address = "address-5";
-        vertx.eventBus().send(address, new CustomType1("foo"));
-        vertx.eventBus().send(address, new CustomType1("bar"));
-        vertx.eventBus().send(address, new CustomType1("baz"));
-
-        await().until(() -> bean.getSink().size() == 3);
-
-        Set<String> set = bean.getSink().stream().map(x -> (CustomType1) x).map(CustomType1::getName)
-                .collect(Collectors.toSet());
-        assertThat(set).contains("foo", "bar", "baz");
-
-        bean.getSink().clear();
-        address = "address-6";
-        vertx.eventBus().send(address, new CustomType1("foo-x"));
-        vertx.eventBus().send(address, new CustomType1("bar-x"));
-        vertx.eventBus().send(address, new CustomType1("baz-x"));
-
-        await().until(() -> bean.getSink().size() == 3);
-        set = bean.getSink().stream().map(x -> (CustomType1) x).map(CustomType1::getName)
-                .collect(Collectors.toSet());
-        assertThat(set).contains("foo-x", "bar-x", "baz-x");
-    }
-
-    @Test
-    public void testCodecRegistrationBasedOnReturnType() {
-        String address = "address-7";
-        List<CustomType3> list = new CopyOnWriteArrayList<>();
-        vertx.eventBus().<CustomType3> request(address, "foo").thenApply(Message::body).thenAccept(list::add);
-        vertx.eventBus().<CustomType3> request(address, "bar").thenApply(Message::body).thenAccept(list::add);
-        vertx.eventBus().<CustomType3> request(address, "baz").thenApply(Message::body).thenAccept(list::add);
-
-        await().until(() -> list.size() == 3);
-
-        Set<String> set = list.stream().map(CustomType3::getName).collect(Collectors.toSet());
-        assertThat(set).contains("foo", "bar", "baz");
-
-    }
-
-    @Test
-    public void testCodecRegistrationBasedOnReturnTypeWithCompletionStage() {
-        String address = "address-8";
-        List<CustomType4> list = new CopyOnWriteArrayList<>();
-        vertx.eventBus().<CustomType4> request(address, "foo").thenApply(Message::body).thenAccept(list::add);
-        vertx.eventBus().<CustomType4> request(address, "bar").thenApply(Message::body).thenAccept(list::add);
-        vertx.eventBus().<CustomType4> request(address, "baz").thenApply(Message::body).thenAccept(list::add);
-
-        await().until(() -> list.size() == 3);
-
-        Set<String> set = list.stream().map(CustomType4::getName).collect(Collectors.toSet());
-        assertThat(set).contains("foo", "bar", "baz");
-
-    }
-
-    @SuppressWarnings("unused")
-    static class EventBusConsumers {
-
-        private List<String> address1 = new CopyOnWriteArrayList<>();
-        private List<String> address2 = new CopyOnWriteArrayList<>();
-
-        public List<String> getAddress1() {
-            return address1;
-        }
-
-        public List<String> getAddress2() {
-            return address2;
-        }
-
-        @ConsumeEvent("address-1")
-        void listenAddress1(String message) {
-            address1.add(message);
-        }
-
-        @ConsumeEvent("address-2")
-        CompletionStage<Void> listenAddress2(String message) {
-            address2.add(message);
-            return CompletableFuture.completedFuture(null);
-        }
-
-        @ConsumeEvent("address-3")
-        long listenAddress3(int i) {
-            return (long) (i + 1);
-        }
-
-        @ConsumeEvent("address-4")
-        CompletionStage<Long> listenAddress4(int i) {
-            return CompletableFuture.completedFuture((long) (i + 1));
-        }
-
-        List<Object> sink = new CopyOnWriteArrayList<>();
-
-        @ConsumeEvent("address-5")
-        void codecRegistrationBasedOnParam(CustomType1 ct) {
-            sink.add(ct);
-        }
-
-        @ConsumeEvent("address-6")
-        void codecRegistrationBasedOnParam(Message<CustomType2> ct) {
-            sink.add(ct.body());
-        }
-
-        @ConsumeEvent("address-7")
-        CustomType3 codecRegistrationBasedReturnType(String n) {
-            return new CustomType3(n);
-        }
-
-        @ConsumeEvent("address-8")
-        CompletionStage<CustomType4> codecRegistrationBasedReturnTypeAndCS(String n) {
-            return CompletableFuture.completedFuture(new CustomType4(n));
-        }
-
-        public List<Object> getSink() {
-            return sink;
-        }
-
-    }
-
-    static class CustomType1 {
-        private final String name;
-
-        CustomType1(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public String toString() {
-            return "CustomType1{" +
-                    "name='" + name + '\'' +
-                    '}';
-        }
-    }
-
-    static class CustomType2 {
-        private final String name;
-
-        CustomType2(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    static class CustomType3 {
-        private final String name;
-
-        CustomType3(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    static class CustomType4 {
-        private final String name;
-
-        CustomType4(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-}
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/AxleCodecTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/AxleCodecTest.java
deleted file mode 100644
index b7d076639d810..0000000000000
--- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/AxleCodecTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package io.quarkus.vertx;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-import javax.inject.Inject;
-
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import io.vertx.axle.core.Vertx;
-import io.vertx.axle.core.eventbus.Message;
-
-public class AxleCodecTest {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap
-                    .create(JavaArchive.class).addClasses(MyBean.class, MyNonLocalBean.class,
-                            MyPetCodec.class, Person.class, Pet.class));
-
-    @Inject
-    MyBean bean;
-
-    /**
-     * Bean setting the consumption to be non-local.
-     * So, the user must configure the codec explicitly.
-     */
-    @Inject
-    MyNonLocalBean nonLocalBean;
-
-    @Inject
-    Vertx vertx;
-
-    @Test
-    public void testWithGenericCodec() {
-        Greeting hello = vertx.eventBus().<Greeting> request("person", new Person("bob", "morane"))
-                .thenApply(Message::body)
-                .toCompletableFuture().join();
-        assertThat(hello.getMessage()).isEqualTo("Hello bob morane");
-    }
-
-    @Test
-    public void testWithUserCodec() {
-        Greeting hello = vertx.eventBus().<Greeting> request("pet", new Pet("neo", "rabbit"))
-                .thenApply(Message::body)
-                .toCompletableFuture().join();
-        assertThat(hello.getMessage()).isEqualTo("Hello NEO");
-    }
-
-    @Test
-    public void testWithUserCodecNonLocal() {
-        Greeting hello = vertx.eventBus().<Greeting> request("nl-pet", new Pet("neo", "rabbit"))
-                .thenApply(Message::body)
-                .toCompletableFuture().join();
-        assertThat(hello.getMessage()).isEqualTo("Non Local Hello NEO");
-    }
-
-    static class Greeting {
-        private final String message;
-
-        Greeting(String message) {
-            this.message = message;
-        }
-
-        String getMessage() {
-            return message;
-        }
-    }
-
-    static class MyBean {
-        @ConsumeEvent("person")
-        public CompletionStage<Greeting> hello(Person p) {
-            return CompletableFuture.completedFuture(new Greeting("Hello " + p.getFirstName() + " " + p.getLastName()));
-        }
-
-        @ConsumeEvent(value = "pet", codec = MyPetCodec.class)
-        public CompletionStage<Greeting> hello(Pet p) {
-            return CompletableFuture.completedFuture(new Greeting("Hello " + p.getName()));
-        }
-    }
-
-    static class MyNonLocalBean {
-        @ConsumeEvent(value = "nl-pet", codec = MyPetCodec.class, local = false)
-        public CompletionStage<Greeting> hello(Pet p) {
-            return CompletableFuture.completedFuture(new Greeting("Non Local Hello " + p.getName()));
-        }
-    }
-
-}
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java
index 7f99c4c3087d3..fb80a50822d90 100644
--- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java
+++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/VertxInjectionTest.java
@@ -41,12 +41,6 @@ public static class MyBeanUsingVertx {
         @Inject
         Vertx vertx;
 
-        @Inject
-        io.vertx.axle.core.Vertx axle;
-
-        @Inject
-        io.vertx.reactivex.core.Vertx rx;
-
         @Inject
         io.vertx.mutiny.core.Vertx mutiny;
 
@@ -58,8 +52,6 @@ public boolean verify() {
 
         public void init(@Observes StartupEvent ev) {
             Assertions.assertNotNull(vertx);
-            Assertions.assertNotNull(axle);
-            Assertions.assertNotNull(rx);
             Assertions.assertNotNull(mutiny);
             ok = true;
         }
@@ -71,12 +63,6 @@ public static class MyBeanUsingEventBus {
         @Inject
         EventBus vertx;
 
-        @Inject
-        io.vertx.axle.core.eventbus.EventBus axle;
-
-        @Inject
-        io.vertx.reactivex.core.eventbus.EventBus rx;
-
         @Inject
         io.vertx.mutiny.core.eventbus.EventBus mutiny;
 
@@ -88,8 +74,6 @@ public boolean verify() {
 
         public void init(@Observes StartupEvent ev) {
             Assertions.assertNotNull(vertx);
-            Assertions.assertNotNull(axle);
-            Assertions.assertNotNull(rx);
             Assertions.assertNotNull(mutiny);
             ok = true;
         }
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java
index 690600230cf71..915097d4adb13 100644
--- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java
+++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerFailureTest.java
@@ -20,6 +20,8 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.vertx.ConsumeEvent;
 import io.smallrye.mutiny.Uni;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.eventbus.Message;
 import io.vertx.core.eventbus.ReplyException;
@@ -33,6 +35,9 @@ public class MessageConsumerFailureTest {
     @Inject
     SimpleBean simpleBean;
 
+    @Inject
+    Vertx vertx;
+
     @Inject
     EventBus eventBus;
 
@@ -44,6 +49,37 @@ public void testFailure() throws InterruptedException {
         verifyFailure("foo-completion-stage-failure", "boom", true);
         verifyFailure("foo-uni", "java.lang.NullPointerException: Something is null", false);
         verifyFailure("foo-uni-failure", "boom", true);
+
+        verifyFailure("foo-blocking", "java.lang.IllegalStateException: Red is dead", false);
+        verifyFailure("foo-message-blocking", "java.lang.NullPointerException", false);
+        verifyFailure("foo-completion-stage-blocking", "java.lang.NullPointerException: Something is null", false);
+        verifyFailure("foo-completion-stage-failure-blocking", "boom", true);
+        verifyFailure("foo-uni-blocking", "java.lang.NullPointerException: Something is null", false);
+        verifyFailure("foo-uni-failure-blocking", "boom", true);
+    }
+
+    @Test
+    public void testFailureNoReplyHandler() throws InterruptedException {
+        Handler<Throwable> oldHandler = vertx.exceptionHandler();
+        try {
+            BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
+            vertx.exceptionHandler(new Handler<Throwable>() {
+                @Override
+                public void handle(Throwable event) {
+                    try {
+                        synchronizer.put(event);
+                    } catch (InterruptedException e) {
+                        throw new IllegalStateException(e);
+                    }
+                }
+            });
+            eventBus.send("foo", "bar");
+            Object ret = synchronizer.poll(2, TimeUnit.SECONDS);
+            assertTrue(ret instanceof IllegalStateException);
+            assertEquals("Foo is dead", ((IllegalStateException) ret).getMessage());
+        } finally {
+            vertx.exceptionHandler(oldHandler);
+        }
     }
 
     void verifyFailure(String address, String expectedMessage, boolean explicit) throws InterruptedException {
@@ -104,6 +140,37 @@ Uni<String> failedUni(String message) {
             return Uni.createFrom().failure(new IOException("boom"));
         }
 
+        @ConsumeEvent(value = "foo-blocking", blocking = true)
+        String failBlocking(String message) {
+            throw new IllegalStateException("Red is dead");
+        }
+
+        @ConsumeEvent(value = "foo-message-blocking", blocking = true)
+        void failMessageBlocking(Message<String> message) {
+            throw new NullPointerException();
+        }
+
+        @ConsumeEvent(value = "foo-completion-stage-blocking", blocking = true)
+        CompletionStage<String> failCompletionStageBlocking(String message) {
+            throw new NullPointerException("Something is null");
+        }
+
+        @ConsumeEvent(value = "foo-completion-stage-failure-blocking", blocking = true)
+        CompletionStage<String> failedCompletionStageBlocking(String message) {
+            CompletableFuture<String> future = new CompletableFuture<>();
+            future.completeExceptionally(new IOException("boom"));
+            return future;
+        }
+
+        @ConsumeEvent(value = "foo-uni-blocking", blocking = true)
+        Uni<String> failUniBlocking(String message) {
+            throw new NullPointerException("Something is null");
+        }
+
+        @ConsumeEvent(value = "foo-uni-failure-blocking", blocking = true)
+        Uni<String> failedUniBlocking(String message) {
+            return Uni.createFrom().failure(new IOException("boom"));
+        }
     }
 
 }
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java
index 8aaf218d531a2..7106ff2f66c60 100644
--- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java
+++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/MessageConsumerMethodTest.java
@@ -21,9 +21,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.arc.Arc;
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.vertx.ConsumeEvent;
+import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.Context;
 import io.vertx.core.eventbus.EventBus;
@@ -38,9 +38,11 @@ public class MessageConsumerMethodTest {
     @Inject
     SimpleBean simpleBean;
 
+    @Inject
+    EventBus eventBus;
+
     @Test
     public void testSend() throws InterruptedException {
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
         eventBus.request("foo", "hello", ar -> {
             if (ar.succeeded()) {
@@ -58,7 +60,6 @@ public void testSend() throws InterruptedException {
 
     @Test
     public void testSendAsync() throws InterruptedException {
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
         eventBus.request("foo-async", "hello", ar -> {
             if (ar.succeeded()) {
@@ -76,7 +77,6 @@ public void testSendAsync() throws InterruptedException {
 
     @Test
     public void testSendAsyncUni() throws InterruptedException {
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
         eventBus.request("foo-async-uni", "hello-uni", ar -> {
             if (ar.succeeded()) {
@@ -94,7 +94,6 @@ public void testSendAsyncUni() throws InterruptedException {
 
     @Test
     public void testSendDefaultAddress() throws InterruptedException {
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
         eventBus.request("io.quarkus.vertx.deployment.MessageConsumerMethodTest$SimpleBean", "Hello", ar -> {
             if (ar.succeeded()) {
@@ -112,7 +111,6 @@ public void testSendDefaultAddress() throws InterruptedException {
 
     @Test
     public void testRequestContext() throws InterruptedException {
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
         eventBus.request("request", "Martin", ar -> {
             if (ar.succeeded()) {
@@ -128,10 +126,26 @@ public void testRequestContext() throws InterruptedException {
         assertEquals("MArtin", synchronizer.poll(2, TimeUnit.SECONDS));
     }
 
+    @Test
+    public void testBlockingRequestContext() throws InterruptedException {
+        BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
+        eventBus.request("blocking-request", "Lu", ar -> {
+            if (ar.succeeded()) {
+                try {
+                    synchronizer.put(ar.result().body());
+                } catch (InterruptedException e) {
+                    fail(e);
+                }
+            } else {
+                fail(ar.cause());
+            }
+        });
+        assertEquals("Lu", synchronizer.poll(2, TimeUnit.SECONDS));
+    }
+
     @Test
     public void testPublish() throws InterruptedException {
         SimpleBean.MESSAGES.clear();
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         SimpleBean.latch = new CountDownLatch(2);
         eventBus.publish("pub", "Hello");
         SimpleBean.latch.await(2, TimeUnit.SECONDS);
@@ -142,7 +156,6 @@ public void testPublish() throws InterruptedException {
     @Test
     public void testBlockingConsumer() throws InterruptedException {
         SimpleBean.MESSAGES.clear();
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         SimpleBean.latch = new CountDownLatch(1);
         eventBus.publish("blocking", "Hello");
         SimpleBean.latch.await(2, TimeUnit.SECONDS);
@@ -152,33 +165,23 @@ public void testBlockingConsumer() throws InterruptedException {
     }
 
     @Test
-    public void testPublishRx() throws InterruptedException {
-        SimpleBean.MESSAGES.clear();
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
-        SimpleBean.latch = new CountDownLatch(1);
-        eventBus.publish("pub-rx", "Hello");
-        SimpleBean.latch.await(2, TimeUnit.SECONDS);
-        assertTrue(SimpleBean.MESSAGES.contains("HELLO"));
-    }
-
-    @Test
-    public void testPublishAxle() throws InterruptedException {
+    public void testPublishMutiny() throws InterruptedException {
         SimpleBean.MESSAGES.clear();
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         SimpleBean.latch = new CountDownLatch(1);
-        eventBus.publish("pub-axle", "Hello");
+        eventBus.publish("pub-mutiny", "Hello");
         SimpleBean.latch.await(2, TimeUnit.SECONDS);
         assertTrue(SimpleBean.MESSAGES.contains("HELLO"));
     }
 
     @Test
-    public void testPublishMutiny() throws InterruptedException {
+    public void testBlockingConsumerUsingSmallRyeBlocking() throws InterruptedException {
         SimpleBean.MESSAGES.clear();
-        EventBus eventBus = Arc.container().instance(EventBus.class).get();
         SimpleBean.latch = new CountDownLatch(1);
-        eventBus.publish("pub-mutiny", "Hello");
+        eventBus.publish("worker", "Hello");
         SimpleBean.latch.await(2, TimeUnit.SECONDS);
-        assertTrue(SimpleBean.MESSAGES.contains("HELLO"));
+        assertEquals(1, SimpleBean.MESSAGES.size());
+        String message = SimpleBean.MESSAGES.get(0);
+        assertTrue(message.contains("hello::true"));
     }
 
     static class SimpleBean {
@@ -228,26 +231,27 @@ void consumeBlocking(String message) {
             latch.countDown();
         }
 
-        @ConsumeEvent("pub-axle")
-        void consume(io.vertx.axle.core.eventbus.Message<String> message) {
+        @ConsumeEvent("pub-mutiny")
+        void consume(io.vertx.mutiny.core.eventbus.Message<String> message) {
             MESSAGES.add(message.body().toUpperCase());
             latch.countDown();
         }
 
-        @ConsumeEvent("pub-rx")
-        void consume(io.vertx.reactivex.core.eventbus.Message<String> message) {
-            MESSAGES.add(message.body().toUpperCase());
-            latch.countDown();
+        @ConsumeEvent("request")
+        String requestContextActive(String message) {
+            return transformer.transform(message);
         }
 
-        @ConsumeEvent("pub-mutiny")
-        void consume(io.vertx.mutiny.core.eventbus.Message<String> message) {
-            MESSAGES.add(message.body().toUpperCase());
+        @ConsumeEvent(value = "worker")
+        @Blocking
+        void consumeBlockingUsingRunOnWorkerThread(String message) {
+            MESSAGES.add(message.toLowerCase() + "::" + Context.isOnWorkerThread());
             latch.countDown();
         }
 
-        @ConsumeEvent("request")
-        String requestContextActive(String message) {
+        @Blocking
+        @ConsumeEvent("blocking-request")
+        String blockingRequestContextActive(String message) {
             return transformer.transform(message);
         }
     }
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java
new file mode 100644
index 0000000000000..c09f420eb1a2b
--- /dev/null
+++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/RequestContextTerminationTest.java
@@ -0,0 +1,104 @@
+package io.quarkus.vertx.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.vertx.ConsumeEvent;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.eventbus.EventBus;
+
+public class RequestContextTerminationTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(SimpleBean.class));
+
+    @Inject
+    EventBus eventBus;
+
+    @Test
+    public void testTermination() throws InterruptedException {
+        assertTerminated("foo");
+        assertTerminated("foo-cs");
+        assertTerminated("foo-uni");
+    }
+
+    void assertTerminated(String address) throws InterruptedException {
+        BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
+        Converter.DESTROYED.set(false);
+        eventBus.request(address, "bongo", ar -> {
+            if (ar.succeeded()) {
+                try {
+                    synchronizer.put(ar.result().body());
+                } catch (InterruptedException e) {
+                    fail(e);
+                }
+            } else {
+                fail(ar.cause());
+            }
+        });
+        assertEquals("BONGO", synchronizer.poll(2, TimeUnit.SECONDS));
+        assertTrue(Converter.DESTROYED.get());
+    }
+
+    @Test
+    public void testFailureNoReplyHandler() throws InterruptedException {
+    }
+
+    static class SimpleBean {
+
+        @Inject
+        Converter converter;
+
+        @ConsumeEvent("foo")
+        String foo(String message) {
+            return converter.convert(message);
+        }
+
+        @ConsumeEvent("foo-cs")
+        CompletionStage<String> asyncFoo(String message) {
+            return CompletableFuture.completedFuture(converter.convert(message));
+        }
+
+        @ConsumeEvent("foo-uni")
+        Uni<String> asyncFooUni(String message) {
+            return Uni.createFrom().item(converter.convert(message));
+        }
+
+    }
+
+    @RequestScoped
+    static class Converter {
+
+        static final AtomicBoolean DESTROYED = new AtomicBoolean();
+
+        String convert(String val) {
+            return val.toUpperCase();
+        }
+
+        @PreDestroy
+        void destroy() {
+            DESTROYED.set(true);
+        }
+
+    }
+
+}
diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java
index f87d891deeef3..b870e649d42e7 100644
--- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java
+++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/deployment/VertxProducerTest.java
@@ -14,7 +14,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
-import io.vertx.axle.core.buffer.Buffer;
 import io.vertx.core.Vertx;
 
 public class VertxProducerTest {
@@ -24,8 +23,6 @@ public class VertxProducerTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource(new File("src/test/resources/lorem.txt"), "files/lorem.txt")
                     .addClasses(BeanUsingBareVertx.class)
-                    .addClasses(BeanUsingAxleVertx.class)
-                    .addClasses(BeanUsingRXVertx.class)
                     .addClasses(BeanUsingMutinyVertx.class));
 
     @Inject
@@ -34,17 +31,9 @@ public class VertxProducerTest {
     @Inject
     BeanUsingMutinyVertx beanUsingMutiny;
 
-    @Inject
-    BeanUsingAxleVertx beanUsingAxle;
-
-    @Inject
-    BeanUsingRXVertx beanUsingRx;
-
     @Test
     public void testVertxInjection() throws Exception {
         beanUsingVertx.verify();
-        beanUsingAxle.verify();
-        beanUsingRx.verify();
         beanUsingMutiny.verify();
     }
 
@@ -68,36 +57,6 @@ public void verify() throws Exception {
 
     }
 
-    @ApplicationScoped
-    static class BeanUsingAxleVertx {
-
-        @Inject
-        io.vertx.axle.core.Vertx vertx;
-
-        public void verify() throws Exception {
-            CountDownLatch latch = new CountDownLatch(1);
-            CompletionStage<Buffer> stage = vertx.fileSystem().readFile("files/lorem.txt");
-            stage.thenAccept(buffer -> latch.countDown());
-            latch.await(5, TimeUnit.SECONDS);
-        }
-
-    }
-
-    @ApplicationScoped
-    static class BeanUsingRXVertx {
-
-        @Inject
-        io.vertx.reactivex.core.Vertx vertx;
-
-        public void verify() throws Exception {
-            CountDownLatch latch = new CountDownLatch(1);
-            vertx.fileSystem().rxReadFile("src/test/resources/lorem.txt")
-                    .subscribe(buffer -> latch.countDown());
-            latch.await(5, TimeUnit.SECONDS);
-        }
-
-    }
-
     @ApplicationScoped
     static class BeanUsingMutinyVertx {
 
diff --git a/extensions/vertx/pom.xml b/extensions/vertx/pom.xml
index a80af0bb3d27e..9cb20b8b18786 100644
--- a/extensions/vertx/pom.xml
+++ b/extensions/vertx/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/vertx/runtime/pom.xml b/extensions/vertx/runtime/pom.xml
index 94163bd03c5d5..8db0494009ebb 100644
--- a/extensions/vertx/runtime/pom.xml
+++ b/extensions/vertx/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-vertx-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,32 +34,8 @@
             <artifactId>quarkus-vertx-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>smallrye-axle-generator</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.smallrye.reactive</groupId>
-                    <artifactId>smallrye-reactive-streams-operators</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.vertx</groupId>
-                    <artifactId>vertx-codegen</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.smallrye.reactive</groupId>
-            <artifactId>smallrye-axle-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.smallrye.reactive</groupId>
-                    <artifactId>smallrye-reactive-streams-operators</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-rx-java2</artifactId>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -74,6 +49,7 @@
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java
index 0020c381a430c..e9a870edb293c 100644
--- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java
+++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java
@@ -83,12 +83,19 @@
      */
     boolean blocking() default false;
 
+    /**
+     * @return {@code true} if the <em>blocking</em> consumption of the event must be ordered, meaning that the method
+     *         won't be called concurrently. Instead it serializes all the invocations based on the event order.
+     *         {@code ordered} must be used in conjunction with {@code blocking=true} or {@code @Blocking}.
+     * @see io.vertx.core.Vertx#executeBlocking(io.vertx.core.Handler, boolean, io.vertx.core.Handler)
+     */
+    boolean ordered() default false;
+
     /**
      * 
      * @return {@code null} if it should use a default MessageCodec
      * @see io.quarkus.vertx.LocalEventBusCodec
      */
-    @SuppressWarnings("rawtypes")
     Class<? extends MessageCodec> codec() default LocalEventBusCodec.class;
 
 }
diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java
index 234012d266f7b..38acccc61684f 100644
--- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java
+++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java
@@ -1,12 +1,124 @@
 package io.quarkus.vertx.runtime;
 
-import io.quarkus.arc.runtime.BeanInvoker;
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableContext.ContextState;
+import io.quarkus.arc.ManagedContext;
 import io.quarkus.vertx.ConsumeEvent;
 import io.vertx.core.eventbus.Message;
 
 /**
  * Invokes a business method annotated with {@link ConsumeEvent}.
  */
-public interface EventConsumerInvoker extends BeanInvoker<Message<Object>> {
+public abstract class EventConsumerInvoker {
+
+    public boolean isBlocking() {
+        return false;
+    }
+
+    public boolean isOrdered() {
+        return false;
+    }
+
+    public void invoke(Message<Object> message) throws Exception {
+        ManagedContext requestContext = Arc.container().requestContext();
+        if (requestContext.isActive()) {
+            Object ret = invokeBean(message);
+            if (ret != null) {
+                if (ret instanceof CompletionStage) {
+                    ((CompletionStage<?>) ret).whenComplete(new RequestActiveConsumer(message));
+                } else {
+                    message.reply(ret);
+                }
+            }
+        } else {
+            // Activate the request context
+            requestContext.activate();
+            Object ret;
+            try {
+                ret = invokeBean(message);
+            } catch (Exception e) {
+                // Terminate the request context and re-throw the exception
+                requestContext.terminate();
+                throw e;
+            }
+            if (ret == null) {
+                // No result - just terminate
+                requestContext.terminate();
+            } else {
+                if (ret instanceof CompletionStage) {
+                    // Capture the state, deactivate and destroy the context when the computation completes
+                    ContextState endState = requestContext.getState();
+                    requestContext.deactivate();
+                    ((CompletionStage<?>) ret).whenComplete(new RequestActivatedConsumer(message, requestContext, endState));
+                } else {
+                    // No async computation - just terminate and set reply
+                    requestContext.terminate();
+                    message.reply(ret);
+                }
+            }
+        }
+    }
+
+    protected abstract Object invokeBean(Message<Object> message) throws Exception;
+
+    private static class RequestActiveConsumer implements BiConsumer<Object, Throwable> {
+
+        private final Message<Object> message;
+
+        RequestActiveConsumer(Message<Object> message) {
+            this.message = message;
+        }
+
+        @Override
+        public void accept(Object result, Throwable failure) {
+            if (failure != null) {
+                if (message.replyAddress() == null) {
+                    // No reply handler
+                    throw VertxRecorder.wrapIfNecessary(failure);
+                } else {
+                    message.fail(ConsumeEvent.EXPLICIT_FAILURE_CODE, failure.getMessage());
+                }
+            } else {
+                message.reply(result);
+            }
+        }
+
+    }
+
+    private static class RequestActivatedConsumer implements BiConsumer<Object, Throwable> {
+
+        private final Message<Object> message;
+        private final ManagedContext requestContext;
+        private final ContextState endState;
+
+        public RequestActivatedConsumer(Message<Object> message, ManagedContext requestContext, ContextState endState) {
+            this.message = message;
+            this.requestContext = requestContext;
+            this.endState = endState;
+        }
+
+        @Override
+        public void accept(Object result, Throwable failure) {
+            try {
+                requestContext.destroy(endState);
+            } catch (Exception e) {
+                throw VertxRecorder.wrapIfNecessary(e);
+            }
+            if (failure != null) {
+                if (message.replyAddress() == null) {
+                    // No reply handler
+                    throw VertxRecorder.wrapIfNecessary(failure);
+                } else {
+                    message.fail(ConsumeEvent.EXPLICIT_FAILURE_CODE, failure.getMessage());
+                }
+            } else {
+                message.reply(result);
+            }
+        }
+
+    }
 
 }
diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java
index a5640bda6da8e..fecb75c286eec 100644
--- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java
+++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxProducer.java
@@ -19,13 +19,11 @@
 import io.vertx.core.eventbus.EventBus;
 
 /**
- * Expose the Vert.x event bus and produces Mutiny, Axle (Deprecated) and Rx Vert.x (Deprecated) instances.
+ * Expose the Vert.x event bus and produces Mutiny instances.
  * <p>
  * The original Vert.x instance is coming from the core artifact.
  *
- * IMPORTANT: The Axle and RxJava 2 API are now deprecated. It is recommended to switch to the Mutiny API.
- * 
- * IMPL NOTE: There is no need to cache the mutiny/axle/rx wrappers locally because the bean instances are stored in the
+ * IMPL NOTE: There is no need to cache the mutiny locally because the bean instances are stored in the
  * singleton context, i.e. the producer method is only called once.
  */
 @ApplicationScoped
@@ -45,46 +43,6 @@ public io.vertx.mutiny.core.Vertx mutiny(Vertx vertx) {
         return io.vertx.mutiny.core.Vertx.newInstance(vertx);
     }
 
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.axle.core.Vertx axle(Vertx vertx) {
-        LOGGER.warn(
-                "`io.vertx.axle.core.Vertx` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.core.Vertx`");
-        return io.vertx.axle.core.Vertx.newInstance(vertx);
-    }
-
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.reactivex.core.Vertx rx(Vertx vertx) {
-        LOGGER.warn(
-                "`io.vertx.reactivex.core.Vertx` is deprecated  and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.core.Vertx`");
-        return io.vertx.reactivex.core.Vertx.newInstance(vertx);
-    }
-
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.axle.core.eventbus.EventBus axleEventBus(io.vertx.axle.core.Vertx axle) {
-        LOGGER.warn(
-                "`io.vertx.axle.core.eventbus.EventBus` is deprecated and will be removed in a future version - it is "
-                        + "recommended to switch to `io.vertx.mutiny.core.eventbus.EventBus`");
-        return axle.eventBus();
-    }
-
-    @Singleton
-    @Produces
-    @Deprecated
-    public io.vertx.reactivex.core.eventbus.EventBus rxEventBus(io.vertx.reactivex.core.Vertx rx) {
-        LOGGER.warn(
-                "`io.vertx.reactivex.core.eventbus.EventBus` is deprecated and will be removed in a future version - it "
-                        + "is recommended to switch to `io.vertx.mutiny.core.eventbus.EventBus`");
-        return rx.eventBus();
-    }
-
     @Singleton
     @Produces
     public io.vertx.mutiny.core.eventbus.EventBus mutinyEventBus(io.vertx.mutiny.core.Vertx mutiny) {
diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java
index 466b423bcbf8e..54de1a6856f8c 100644
--- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java
+++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java
@@ -18,6 +18,7 @@
 import io.quarkus.vertx.ConsumeEvent;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
+import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.eventbus.Message;
@@ -81,10 +82,34 @@ void registerMessageConsumers(Map<String, ConsumeEvent> messageConsumerConfigura
                 consumer.handler(new Handler<Message<Object>>() {
                     @Override
                     public void handle(Message<Object> m) {
-                        try {
-                            invoker.invoke(m);
-                        } catch (Throwable e) {
-                            m.fail(ConsumeEvent.FAILURE_CODE, e.toString());
+                        if (invoker.isBlocking()) {
+                            vertx.executeBlocking(new Handler<Promise<Object>>() {
+                                @Override
+                                public void handle(Promise<Object> event) {
+                                    try {
+                                        invoker.invoke(m);
+                                    } catch (Exception e) {
+                                        if (m.replyAddress() == null) {
+                                            // No reply handler
+                                            throw wrapIfNecessary(e);
+                                        } else {
+                                            m.fail(ConsumeEvent.FAILURE_CODE, e.toString());
+                                        }
+                                    }
+                                    event.complete();
+                                }
+                            }, invoker.isOrdered(), null);
+                        } else {
+                            try {
+                                invoker.invoke(m);
+                            } catch (Exception e) {
+                                if (m.replyAddress() == null) {
+                                    // No reply handler
+                                    throw wrapIfNecessary(e);
+                                } else {
+                                    m.fail(ConsumeEvent.FAILURE_CODE, e.toString());
+                                }
+                            }
                         }
                     }
                 });
@@ -108,6 +133,16 @@ public void handle(AsyncResult<Void> ar) {
         }
     }
 
+    static RuntimeException wrapIfNecessary(Throwable e) {
+        if (e instanceof Error) {
+            throw (Error) e;
+        } else if (e instanceof RuntimeException) {
+            return (RuntimeException) e;
+        } else {
+            return new RuntimeException(e);
+        }
+    }
+
     void unregisterMessageConsumers() {
         CountDownLatch latch = new CountDownLatch(messageConsumers.size());
         for (MessageConsumer<?> messageConsumer : messageConsumers) {
diff --git a/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/runtime/VertxProducerTest.java b/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/runtime/VertxProducerTest.java
index 1868eb04ee4f2..557f0d4096965 100644
--- a/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/runtime/VertxProducerTest.java
+++ b/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/runtime/VertxProducerTest.java
@@ -28,20 +28,12 @@ public void tearDown() {
 
     @Test
     public void shouldNotFailWithoutConfig() {
-        verifyProducer(VertxCoreRecorder.initialize(null, null));
+        verifyProducer(VertxCoreRecorder.initialize(null, null, null));
     }
 
     private void verifyProducer(Vertx v) {
         assertThat(producer.eventbus(v)).isNotNull();
 
-        assertThat(producer.axle(v)).isNotNull();
-        assertFalse(producer.axle(v).isClustered());
-        assertThat(producer.axleEventBus(producer.axle(v))).isNotNull();
-
-        assertThat(producer.rx(v)).isNotNull();
-        assertFalse(producer.rx(v).isClustered());
-        assertThat(producer.rxEventBus(producer.rx(v))).isNotNull();
-
         assertThat(producer.mutiny(v)).isNotNull();
         assertFalse(producer.mutiny(v).isClustered());
         assertThat(producer.mutinyEventBus(producer.mutiny(v))).isNotNull();
diff --git a/extensions/webjars-locator/deployment/pom.xml b/extensions/webjars-locator/deployment/pom.xml
index d811025644c7d..518a7d6256f10 100644
--- a/extensions/webjars-locator/deployment/pom.xml
+++ b/extensions/webjars-locator/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-webjars-locator-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -56,11 +55,16 @@
           <version>2.24.0</version>
           <scope>test</scope>
         </dependency>
-        
-        <!-- DevMode has no setForcedDependencies, so need to add resteasy extension here -->
+        <dependency>
+            <groupId>org.webjars.bowergithub.dc-js</groupId>
+            <artifactId>dc.js</artifactId>
+            <version>3.0.6</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
           <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-resteasy</artifactId>
+          <artifactId>quarkus-resteasy-deployment</artifactId>
+          <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java
index 4cb0be025cd4f..41b798c0d83ed 100644
--- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java
+++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java
@@ -63,6 +63,10 @@ public void testDevMode() {
         RestAssured.get("/webjars/momentjs/2.25.0/min/moment.min.js").then()
                 .statusCode(404);
 
+        // Test webjar that does not have a version in the jar path
+        RestAssured.get("/webjars/dcjs/dc.min.js").then()
+                .statusCode(200);
+
         // Change a source file
         test.modifySourceFile(PostResource.class, s -> s.replace("Hello:", "Hi:"));
 
diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java
index 4dc47d8197b43..9b5c64a02df52 100644
--- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java
+++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java
@@ -23,9 +23,7 @@ public class WebJarLocatorTest {
                     .addAsResource(new StringAsset("<html>Hello!<html>"), META_INF_RESOURCES + "/index.html")
                     .addAsResource(new StringAsset("Test"), META_INF_RESOURCES + "/some/path/test.txt"))
             .setForcedDependencies(Arrays.asList(new AppArtifact("org.webjars", "jquery", "3.4.1"),
-                    new AppArtifact("org.webjars", "momentjs", "2.24.0"),
-                    // We require another extension to provide basic web server capabilities
-                    new AppArtifact("io.quarkus", "quarkus-resteasy", "999-SNAPSHOT")));
+                    new AppArtifact("org.webjars", "momentjs", "2.24.0")));
 
     @Test
     public void test() {
@@ -61,5 +59,9 @@ public void test() {
                 .statusCode(404);
         RestAssured.get("/webjars/momentjs/2.25.0/min/moment.min.js").then()
                 .statusCode(404);
+
+        // Test webjar that does not have a version in the jar path
+        RestAssured.get("/webjars/dcjs/dc.min.js").then()
+                .statusCode(200);
     }
 }
diff --git a/extensions/webjars-locator/pom.xml b/extensions/webjars-locator/pom.xml
index 65754e69541ef..62e69ce2dd90b 100644
--- a/extensions/webjars-locator/pom.xml
+++ b/extensions/webjars-locator/pom.xml
@@ -3,10 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-build-parent</artifactId>
+        <artifactId>quarkus-extensions-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../build-parent/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/webjars-locator/runtime/pom.xml b/extensions/webjars-locator/runtime/pom.xml
index eec53719fef2a..684c3f4588b53 100644
--- a/extensions/webjars-locator/runtime/pom.xml
+++ b/extensions/webjars-locator/runtime/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-webjars-locator-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/extensions/webjars-locator/runtime/src/main/java/io/quarkus/webjar/locator/runtime/WebJarLocatorRecorder.java b/extensions/webjars-locator/runtime/src/main/java/io/quarkus/webjar/locator/runtime/WebJarLocatorRecorder.java
index cc74660508b77..2e7360518e065 100644
--- a/extensions/webjars-locator/runtime/src/main/java/io/quarkus/webjar/locator/runtime/WebJarLocatorRecorder.java
+++ b/extensions/webjars-locator/runtime/src/main/java/io/quarkus/webjar/locator/runtime/WebJarLocatorRecorder.java
@@ -22,7 +22,8 @@ public Handler<RoutingContext> getHandler(String webjarsRootUrl, Map<String, Str
                         endOfVersion = rest.length();
                     }
                     String nextPathEntry = rest.substring(rest.indexOf('/') + 1, endOfVersion);
-                    if (nextPathEntry.equals(webjarNameToVersionMap.get(webjar))) {
+                    if (webjarNameToVersionMap.get(webjar) == null
+                            || nextPathEntry.equals(webjarNameToVersionMap.get(webjar))) {
                         // go to the next handler (which should be the static resource handler, if one exists)
                         event.next();
                     } else {
diff --git a/extensions/websockets/deployment/pom.xml b/extensions/websockets/deployment/pom.xml
new file mode 100644
index 0000000000000..de6210c18e7a0
--- /dev/null
+++ b/extensions/websockets/deployment/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-websockets-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-websockets-deployment</artifactId>
+    <name>Quarkus - WebSockets - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/AnnotatedWebsocketEndpointBuildItem.java b/extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/AnnotatedWebsocketEndpointBuildItem.java
similarity index 100%
rename from extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/AnnotatedWebsocketEndpointBuildItem.java
rename to extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/AnnotatedWebsocketEndpointBuildItem.java
diff --git a/extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketConfig.java b/extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketConfig.java
similarity index 100%
rename from extensions/undertow-websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketConfig.java
rename to extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketConfig.java
diff --git a/extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketProcessor.java b/extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketProcessor.java
new file mode 100644
index 0000000000000..4f57ffdcc2117
--- /dev/null
+++ b/extensions/websockets/deployment/src/main/java/io/quarkus/undertow/websockets/deployment/WebsocketProcessor.java
@@ -0,0 +1,199 @@
+package io.quarkus.undertow.websockets.deployment;
+
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.ClientEndpointConfig;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Endpoint;
+import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerEndpoint;
+import javax.websocket.server.ServerEndpointConfig;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.ExecutorBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.ServiceStartBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import io.quarkus.netty.deployment.EventLoopSupplierBuildItem;
+import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.undertow.websockets.runtime.WebsocketRecorder;
+import io.quarkus.vertx.http.deployment.FilterBuildItem;
+import io.undertow.websockets.DefaultContainerConfigurator;
+import io.undertow.websockets.UndertowContainerProvider;
+
+public class WebsocketProcessor {
+
+    private static final DotName SERVER_ENDPOINT = DotName.createSimple(ServerEndpoint.class.getName());
+    private static final DotName CLIENT_ENDPOINT = DotName.createSimple(ClientEndpoint.class.getName());
+    private static final DotName SERVER_APPLICATION_CONFIG = DotName.createSimple(ServerApplicationConfig.class.getName());
+    private static final DotName ENDPOINT = DotName.createSimple(Endpoint.class.getName());
+
+    @BuildStep
+    void holdConfig(BuildProducer<FeatureBuildItem> feature, HotReloadConfig hotReloadConfig) {
+        feature.produce(new FeatureBuildItem(Feature.WEBSOCKETS));
+    }
+
+    @BuildStep
+    ServiceProviderBuildItem registerConfiguratorServiceProvider() {
+        return new ServiceProviderBuildItem(ServerEndpointConfig.Configurator.class.getName(),
+                DefaultContainerConfigurator.class.getName());
+    }
+
+    @BuildStep
+    void scanForAnnotatedEndpoints(CombinedIndexBuildItem indexBuildItem,
+            BuildProducer<AnnotatedWebsocketEndpointBuildItem> annotatedProducer) {
+
+        final IndexView index = indexBuildItem.getIndex();
+
+        final Collection<AnnotationInstance> serverEndpoints = index.getAnnotations(SERVER_ENDPOINT);
+        for (AnnotationInstance endpoint : serverEndpoints) {
+            if (endpoint.target() instanceof ClassInfo) {
+                ClassInfo clazz = (ClassInfo) endpoint.target();
+                if (!Modifier.isAbstract(clazz.flags())) {
+                    annotatedProducer.produce(new AnnotatedWebsocketEndpointBuildItem(clazz.name().toString(), false));
+                }
+            }
+        }
+
+        final Collection<AnnotationInstance> clientEndpoints = index.getAnnotations(CLIENT_ENDPOINT);
+        for (AnnotationInstance endpoint : clientEndpoints) {
+            if (endpoint.target() instanceof ClassInfo) {
+                ClassInfo clazz = (ClassInfo) endpoint.target();
+                if (!Modifier.isAbstract(clazz.flags())) {
+                    annotatedProducer.produce(new AnnotatedWebsocketEndpointBuildItem(clazz.name().toString(), true));
+                }
+            }
+        }
+
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    public FilterBuildItem deploy(final CombinedIndexBuildItem indexBuildItem,
+            WebsocketRecorder recorder,
+            BuildProducer<ReflectiveClassBuildItem> reflection,
+            EventLoopSupplierBuildItem eventLoopSupplierBuildItem,
+            List<AnnotatedWebsocketEndpointBuildItem> annotatedEndpoints,
+            BeanContainerBuildItem beanContainerBuildItem,
+            WebsocketConfig websocketConfig) throws Exception {
+
+        final Set<String> endpoints = new HashSet<>();
+        final Set<String> config = new HashSet<>();
+
+        final IndexView index = indexBuildItem.getIndex();
+        final Collection<ClassInfo> subclasses = index.getAllKnownImplementors(SERVER_APPLICATION_CONFIG);
+
+        for (final ClassInfo clazz : subclasses) {
+            if (!Modifier.isAbstract(clazz.flags())) {
+                config.add(clazz.name().toString());
+            }
+        }
+
+        final Collection<ClassInfo> epClasses = index.getAllKnownSubclasses(ENDPOINT);
+
+        for (final ClassInfo clazz : epClasses) {
+            if (!Modifier.isAbstract(clazz.flags())) {
+                endpoints.add(clazz.name().toString());
+            }
+        }
+        if (annotatedEndpoints.isEmpty() &&
+                endpoints.isEmpty() &&
+                config.isEmpty()) {
+            return null;
+        }
+        Set<String> annotated = new HashSet<>();
+        for (AnnotatedWebsocketEndpointBuildItem i : annotatedEndpoints) {
+            annotated.add(i.className);
+        }
+        reflection.produce(
+                new ReflectiveClassBuildItem(true, false, annotated.toArray(new String[annotated.size()])));
+
+        registerCodersForReflection(reflection, index.getAnnotations(SERVER_ENDPOINT));
+        registerCodersForReflection(reflection, index.getAnnotations(CLIENT_ENDPOINT));
+
+        reflection.produce(
+                new ReflectiveClassBuildItem(true, true, ClientEndpointConfig.Configurator.class.getName()));
+
+        return new FilterBuildItem(
+                recorder.createHandler(beanContainerBuildItem.getValue(), eventLoopSupplierBuildItem.getMainSupplier(),
+                        recorder.createDeploymentInfo(annotated, endpoints, config, websocketConfig.maxFrameSize,
+                                websocketConfig.dispatchToWorker)),
+                100);
+    }
+
+    private void registerCodersForReflection(BuildProducer<ReflectiveClassBuildItem> reflection,
+            Collection<AnnotationInstance> endpoints) {
+        for (AnnotationInstance endpoint : endpoints) {
+            if (endpoint.target() instanceof ClassInfo) {
+                ClassInfo clazz = (ClassInfo) endpoint.target();
+                if (!Modifier.isAbstract(clazz.flags())) {
+                    registerForReflection(reflection, endpoint.value("encoders"));
+                    registerForReflection(reflection, endpoint.value("decoders"));
+                }
+            }
+        }
+    }
+
+    private void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflection, AnnotationValue types) {
+        if (types != null && types.asClassArray() != null) {
+            for (Type type : types.asClassArray()) {
+                reflection.produce(new ReflectiveClassBuildItem(true, false, type.name().toString()));
+            }
+        }
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    ServiceStartBuildItem setupWorker(WebsocketRecorder recorder, ExecutorBuildItem exec) {
+        recorder.setupWorker(exec.getExecutorProxy());
+        return new ServiceStartBuildItem("Websockets");
+    }
+
+    @BuildStep
+    ServiceProviderBuildItem registerContainerProviderService() {
+        return new ServiceProviderBuildItem(ContainerProvider.class.getName(),
+                UndertowContainerProvider.class.getName());
+    }
+
+    @BuildStep
+    void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> annotations) {
+        annotations.produce(new BeanDefiningAnnotationBuildItem(SERVER_ENDPOINT));
+        annotations.produce(new BeanDefiningAnnotationBuildItem(ENDPOINT));
+        annotations.produce(new BeanDefiningAnnotationBuildItem(CLIENT_ENDPOINT));
+    }
+
+    @ConfigRoot
+    static class HotReloadConfig {
+
+        /**
+         * The security key for remote hot deployment
+         */
+        Optional<String> password;
+
+        /**
+         * The remote URL to connect to
+         */
+        Optional<String> url;
+    }
+}
diff --git a/extensions/undertow-websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoService.java b/extensions/websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoService.java
similarity index 100%
rename from extensions/undertow-websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoService.java
rename to extensions/websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoService.java
diff --git a/extensions/undertow-websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoWebSocket.java b/extensions/websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoWebSocket.java
similarity index 100%
rename from extensions/undertow-websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoWebSocket.java
rename to extensions/websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/EchoWebSocket.java
diff --git a/extensions/undertow-websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/WebsocketDevModeTestCase.java b/extensions/websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/WebsocketDevModeTestCase.java
similarity index 100%
rename from extensions/undertow-websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/WebsocketDevModeTestCase.java
rename to extensions/websockets/deployment/src/test/java/io/quarkus/undertow/websockets/test/WebsocketDevModeTestCase.java
diff --git a/extensions/websockets/legacy/pom.xml b/extensions/websockets/legacy/pom.xml
new file mode 100644
index 0000000000000..fe4614d65c932
--- /dev/null
+++ b/extensions/websockets/legacy/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-websockets-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-undertow-websockets</artifactId>
+    <name>Quarkus - Undertow - WebSockets - Legacy Compat Artifact</name>
+    <description>Legacy artifact, use quarkus-websockets instead</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/extensions/websockets/pom.xml b/extensions/websockets/pom.xml
new file mode 100644
index 0000000000000..0a7778dece2d6
--- /dev/null
+++ b/extensions/websockets/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-websockets-parent</artifactId>
+    <name>Quarkus - WebSockets</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+        <module>legacy</module>
+    </modules>
+
+</project>
diff --git a/extensions/websockets/runtime/pom.xml b/extensions/websockets/runtime/pom.xml
new file mode 100644
index 0000000000000..a38e19a71c492
--- /dev/null
+++ b/extensions/websockets/runtime/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-websockets-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-websockets</artifactId>
+    <name>Quarkus - WebSockets - Runtime</name>
+    <description>WebSocket communication channel support</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.http</groupId>
+            <artifactId>quarkus-http-websocket-vertx</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.spec.javax.websocket</groupId>
+                    <artifactId>
+                        jboss-websocket-api_1.1_spec
+                    </artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.websocket</groupId>
+            <artifactId>jakarta.websocket-api</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <excludedArtifacts>
+                        <excludedArtifact>org.jboss.spec.javax.websocket:jboss-websocket-api_1.0_spec</excludedArtifact>
+                        <excludedArtifact>org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec</excludedArtifact>
+                        <excludedArtifact>javax.websocket:javax.websocket-api</excludedArtifact>
+                    </excludedArtifacts>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/extensions/undertow-websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/ExecutorSupplier.java b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/ExecutorSupplier.java
similarity index 100%
rename from extensions/undertow-websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/ExecutorSupplier.java
rename to extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/ExecutorSupplier.java
diff --git a/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java
new file mode 100644
index 0000000000000..fc5c834d8acd1
--- /dev/null
+++ b/extensions/websockets/runtime/src/main/java/io/quarkus/undertow/websockets/runtime/WebsocketRecorder.java
@@ -0,0 +1,165 @@
+package io.quarkus.undertow.websockets.runtime;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.function.Supplier;
+
+import javax.websocket.DeploymentException;
+import javax.websocket.Endpoint;
+import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerEndpointConfig;
+
+import org.jboss.logging.Logger;
+
+import io.netty.channel.EventLoopGroup;
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ManagedContext;
+import io.quarkus.arc.runtime.BeanContainer;
+import io.quarkus.runtime.ExecutorRecorder;
+import io.quarkus.runtime.annotations.Recorder;
+import io.undertow.websockets.WebSocketDeploymentInfo;
+import io.undertow.websockets.util.ContextSetupHandler;
+import io.undertow.websockets.util.ObjectFactory;
+import io.undertow.websockets.util.ObjectHandle;
+import io.undertow.websockets.util.ObjectIntrospecter;
+import io.undertow.websockets.vertx.VertxServerWebSocketContainer;
+import io.undertow.websockets.vertx.VertxWebSocketHandler;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+@Recorder
+public class WebsocketRecorder {
+
+    private static final Logger log = Logger.getLogger(WebsocketRecorder.class);
+
+    public void setupWorker(Executor executor) {
+        ExecutorSupplier.executor = executor;
+    }
+
+    @SuppressWarnings("unchecked")
+    public WebSocketDeploymentInfo createDeploymentInfo(Set<String> annotatedEndpoints, Set<String> endpoints,
+            Set<String> serverApplicationConfigClasses, int maxFrameSize, boolean dispatchToWorker) {
+        WebSocketDeploymentInfo container = new WebSocketDeploymentInfo();
+        container.setMaxFrameSize(maxFrameSize);
+        container.setDispatchToWorkerThread(dispatchToWorker);
+        container.setExecutor(new ExecutorSupplier());
+        Set<Class<? extends Endpoint>> allScannedEndpointImplementations = new HashSet<>();
+        for (String i : endpoints) {
+            try {
+                allScannedEndpointImplementations.add(
+                        (Class<? extends Endpoint>) Class.forName(i, true, Thread.currentThread().getContextClassLoader()));
+            } catch (Exception e) {
+                log.error("Could not initialize websocket class " + i, e);
+            }
+        }
+        Set<Class<?>> allScannedAnnotatedEndpoints = new HashSet<>();
+        for (String i : annotatedEndpoints) {
+            try {
+                allScannedAnnotatedEndpoints.add(Class.forName(i, true, Thread.currentThread().getContextClassLoader()));
+            } catch (Exception e) {
+                log.error("Could not initialize websocket class " + i, e);
+            }
+        }
+        Set<Class<?>> newAnnotatedEndpoints = new HashSet<>();
+        Set<ServerEndpointConfig> serverEndpointConfigurations = new HashSet<>();
+
+        final Set<ServerApplicationConfig> configInstances = new HashSet<>();
+        for (String clazzName : serverApplicationConfigClasses) {
+            try {
+                configInstances.add((ServerApplicationConfig) Class
+                        .forName(clazzName, true, Thread.currentThread().getContextClassLoader()).newInstance());
+            } catch (Exception e) {
+                log.error("Could not initialize websocket config class " + clazzName, e);
+            }
+        }
+
+        if (!configInstances.isEmpty()) {
+            for (ServerApplicationConfig config : configInstances) {
+                Set<Class<?>> returnedEndpoints = config.getAnnotatedEndpointClasses(allScannedAnnotatedEndpoints);
+                if (returnedEndpoints != null) {
+                    newAnnotatedEndpoints.addAll(returnedEndpoints);
+                }
+                Set<ServerEndpointConfig> endpointConfigs = config.getEndpointConfigs(allScannedEndpointImplementations);
+                if (endpointConfigs != null) {
+                    serverEndpointConfigurations.addAll(endpointConfigs);
+                }
+            }
+        } else {
+            newAnnotatedEndpoints.addAll(allScannedAnnotatedEndpoints);
+        }
+
+        //annotated endpoints first
+        for (Class<?> endpoint : newAnnotatedEndpoints) {
+            if (endpoint != null) {
+                container.addEndpoint(endpoint);
+            }
+        }
+
+        for (final ServerEndpointConfig endpoint : serverEndpointConfigurations) {
+            if (endpoint != null) {
+                container.addEndpoint(endpoint);
+            }
+        }
+        return container;
+    }
+
+    public Handler<RoutingContext> createHandler(BeanContainer beanContainer, Supplier<EventLoopGroup> eventLoopGroupSupplier,
+            WebSocketDeploymentInfo info) throws DeploymentException {
+        ManagedContext requestContext = Arc.container().requestContext();
+        VertxServerWebSocketContainer container = new VertxServerWebSocketContainer(new ObjectIntrospecter() {
+            @Override
+            public <T> ObjectFactory<T> createInstanceFactory(Class<T> clazz) {
+                BeanContainer.Factory<T> factory = beanContainer.instanceFactory(clazz);
+                return new ObjectFactory<T>() {
+                    @Override
+                    public ObjectHandle<T> createInstance() {
+                        BeanContainer.Instance<T> instance = factory.create();
+                        return new ObjectHandle<T>() {
+                            @Override
+                            public T getInstance() {
+                                return instance.get();
+                            }
+
+                            @Override
+                            public void release() {
+                                instance.close();
+                            }
+                        };
+                    }
+                };
+            }
+        }, Thread.currentThread().getContextClassLoader(), eventLoopGroupSupplier,
+                Collections.singletonList(new ContextSetupHandler() {
+                    @Override
+                    public <T, C> Action<T, C> create(Action<T, C> action) {
+                        return new Action<T, C>() {
+                            @Override
+                            public T call(C context) throws Exception {
+                                requestContext.activate();
+                                try {
+                                    return action.call(context);
+                                } finally {
+                                    requestContext.terminate();
+                                }
+                            }
+                        };
+                    }
+                }), false,
+                new Supplier<Executor>() {
+                    @Override
+                    public Executor get() {
+                        return ExecutorRecorder.getCurrent();
+                    }
+                });
+        for (Class<?> i : info.getAnnotatedEndpoints()) {
+            container.addEndpoint(i);
+        }
+        for (ServerEndpointConfig i : info.getProgramaticEndpoints()) {
+            container.addEndpoint(i);
+        }
+        return new VertxWebSocketHandler(container, info);
+    }
+
+}
diff --git a/extensions/websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..cda7e43db787a
--- /dev/null
+++ b/extensions/websockets/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,18 @@
+name: "WebSockets"
+metadata:
+  short-name: "websockets"
+  keywords:
+  - "websocket"
+  - "websockets"
+  - "web-socket"
+  - "web-sockets"
+  - "http"
+  guide: "https://quarkus.io/guides/websockets"
+  categories:
+  - "web"
+  status: "stable"
+  codestart:
+    name: "undertow-websockets"
+    kind: "example"
+    languages: "java"
+    artifact: "io.quarkus:quarkus-descriptor-json"
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index 29e3b0e62f261..7951a88ff4ab0 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
     <groupId>io.quarkus.arc</groupId>
     <artifactId>arc-parent</artifactId>
@@ -19,7 +19,7 @@
         <license>
             <name>Apache License, Version 2.0</name>
             <distribution>repo</distribution>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
         </license>
     </licenses>
 
@@ -37,13 +37,13 @@
         <!-- Versions -->
         <version.cdi>2.0.2</version.cdi>
         <version.jta>1.3.3</version.jta>
-        <version.jandex>2.2.1.Final</version.jandex>
-        <version.junit5>5.6.1</version.junit5>
+        <version.jandex>2.2.3.Final</version.jandex>
+        <version.junit5>5.7.1</version.junit5>
         <version.maven>3.6.3</version.maven>
-        <version.assertj>3.16.1</version.assertj>
+        <version.assertj>3.19.0</version.assertj>
         <version.jboss-logging>3.3.2.Final</version.jboss-logging>
         <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
-        <version.gizmo>1.0.4.Final</version.gizmo>
+        <version.gizmo>1.0.7.Final</version.gizmo>
         <version.jpa>2.2.3</version.jpa>
 
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
@@ -90,13 +90,16 @@
                 <version>${version.gizmo}</version>
             </dependency>
 
+            <!-- JUnit 5 dependencies, imported as a BOM -->
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
                 <version>${version.junit5}</version>
-                <scope>test</scope>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
 
+
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
@@ -234,7 +237,8 @@
                                             <exclude>commons-logging:commons-logging-api</exclude>
                                             <exclude>org.springframework:spring-jcl</exclude>
                                             <exclude>org.slf4j:jcl-over-slf4j</exclude>
-                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logging instead) -->
+                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logmanager instead) -->
+                                            <exclude>org.jboss.slf4j:slf4j-jboss-logging</exclude>
                                             <exclude>org.slf4j:slf4j-simple</exclude>
                                             <exclude>org.slf4j:slf4j-nop</exclude>
                                             <exclude>org.slf4j:slf4j-jdk14</exclude>
@@ -260,7 +264,7 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.12.1</version>
+                    <version>2.14.0</version>
                     <dependencies>
                         <dependency>
                             <artifactId>quarkus-ide-config</artifactId>
@@ -277,7 +281,7 @@
                 <plugin>
                     <groupId>net.revelc.code</groupId>
                     <artifactId>impsort-maven-plugin</artifactId>
-                    <version>1.4.1</version>
+                    <version>1.6.0</version>
                     <configuration>
                         <removeUnused>true</removeUnused>
                         <skip>${format.skip}</skip>
@@ -299,6 +303,16 @@
     </distributionManagement>
 
     <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
         <profile>
             <id>quick-build</id>
             <activation>
@@ -316,6 +330,21 @@
                 <defaultGoal>clean install</defaultGoal>
             </build>
         </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -326,7 +355,7 @@
                         <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
diff --git a/independent-projects/arc/processor/pom.xml b/independent-projects/arc/processor/pom.xml
index e3f939e93a590..d676b0aa9fd2b 100644
--- a/independent-projects/arc/processor/pom.xml
+++ b/independent-projects/arc/processor/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus.arc</groupId>
         <artifactId>arc-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>arc-processor</artifactId>
@@ -49,6 +48,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java
index 1d9f0588bb843..d4c828174829f 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java
@@ -89,8 +89,8 @@ protected String getPackageName(BeanInfo bean) {
             }
         }
         String packageName = DotNames.packageName(providerTypeName);
-        if (packageName.isEmpty() || packageName.startsWith("java.")) {
-            // It is not possible to place a class in a JDK package or in default package
+        if (packageName.startsWith("java.")) {
+            // It is not possible to place a class in a JDK package
             packageName = DEFAULT_PACKAGE;
         }
         return packageName;
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java
new file mode 100644
index 0000000000000..4602c12ea37b9
--- /dev/null
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AsmUtilCopy.java
@@ -0,0 +1,278 @@
+package io.quarkus.arc.processor;
+
+import java.util.List;
+import java.util.function.Function;
+import org.jboss.jandex.ArrayType;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.PrimitiveType.Primitive;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.TypeVariable;
+
+/**
+ * Copy of quarkus-core AsmUtil for some methods, with a tweak on the ARG_MAPPER (not name->String anymore) and
+ * methods for getting a class signature and knowing if a signature is required.
+ */
+public class AsmUtilCopy {
+
+    private final static Function<TypeVariable, Type> NO_ARG_MAPPER = new Function<TypeVariable, Type>() {
+        @Override
+        public Type apply(TypeVariable t) {
+            return null;
+        }
+    };
+
+    /**
+     * Returns the Java bytecode signature of a given Jandex MethodInfo with no type argument mappings.
+     * For example, given this method:
+     * 
+     * <pre>
+     * {@code
+     * public class Foo<T> {
+     *  public <R> List<R> method(int a, T t){...} 
+     * }
+     * }
+     * </pre>
+     * 
+     * This will return <tt>&lt;R:Ljava/lang/Object;>(ITT;)Ljava/util/List&lt;TR;>;</tt>.
+     * 
+     * @param method the method you want the signature for.
+     * @return a bytecode signature for that method.
+     */
+    public static String getSignature(MethodInfo method) {
+        return getSignature(method, NO_ARG_MAPPER);
+    }
+
+    /**
+     * Returns the Java bytecode signature of a given Jandex MethodInfo using the given type argument mappings.
+     * For example, given this method:
+     * 
+     * <pre>
+     * {@code
+     * public class Foo<T> {
+     *  public <R> List<R> method(int a, T t){...} 
+     * }
+     * }
+     * </pre>
+     * 
+     * This will return <tt>&lt;R:Ljava/lang/Object;>(ILjava/lang/Integer;)Ljava/util/List&lt;TR;>;</tt> if
+     * your {@code typeArgMapper} contains {@code T=Ljava/lang/Integer;}.
+     * 
+     * @param method the method you want the signature for.
+     * @param typeArgMapper a mapping between type variables and their resolved type.
+     * @return a bytecode signature for that method.
+     */
+    public static String getSignature(MethodInfo method, Function<TypeVariable, Type> typeArgMapper) {
+        List<Type> parameters = method.parameters();
+
+        StringBuilder signature = new StringBuilder("");
+        toSignature(signature, method.typeParameters(), typeArgMapper, false);
+        signature.append("(");
+        for (Type type : parameters) {
+            toSignature(signature, type, typeArgMapper, false);
+        }
+        signature.append(")");
+        toSignature(signature, method.returnType(), typeArgMapper, false);
+        return signature.toString();
+    }
+
+    private static void toSignature(StringBuilder sb, Type type, Function<TypeVariable, Type> typeArgMapper, boolean erased) {
+        switch (type.kind()) {
+            case ARRAY:
+                ArrayType arrayType = type.asArrayType();
+                for (int i = 0; i < arrayType.dimensions(); i++)
+                    sb.append("[");
+                toSignature(sb, arrayType.component(), typeArgMapper, erased);
+                break;
+            case CLASS:
+                sb.append("L");
+                sb.append(type.asClassType().name().toString().replace('.', '/'));
+                sb.append(";");
+                break;
+            case PARAMETERIZED_TYPE:
+                ParameterizedType parameterizedType = type.asParameterizedType();
+                sb.append("L");
+                // FIXME: support owner type
+                sb.append(parameterizedType.name().toString().replace('.', '/'));
+                if (!erased && !parameterizedType.arguments().isEmpty()) {
+                    sb.append("<");
+                    List<Type> arguments = parameterizedType.arguments();
+                    for (int i = 0; i < arguments.size(); i++) {
+                        Type argType = arguments.get(i);
+                        toSignature(sb, argType, typeArgMapper, erased);
+                    }
+                    sb.append(">");
+                }
+                sb.append(";");
+                break;
+            case PRIMITIVE:
+                Primitive primitive = type.asPrimitiveType().primitive();
+                switch (primitive) {
+                    case BOOLEAN:
+                        sb.append('Z');
+                        break;
+                    case BYTE:
+                        sb.append('B');
+                        break;
+                    case CHAR:
+                        sb.append('C');
+                        break;
+                    case DOUBLE:
+                        sb.append('D');
+                        break;
+                    case FLOAT:
+                        sb.append('F');
+                        break;
+                    case INT:
+                        sb.append('I');
+                        break;
+                    case LONG:
+                        sb.append('J');
+                        break;
+                    case SHORT:
+                        sb.append('S');
+                        break;
+                }
+                break;
+            case TYPE_VARIABLE:
+                TypeVariable typeVariable = type.asTypeVariable();
+                Type mappedType = typeArgMapper.apply(typeVariable);
+                if (mappedType != null)
+                    toSignature(sb, mappedType, typeArgMapper, erased);
+                else if (erased)
+                    toSignature(sb, typeVariable.bounds().get(0), typeArgMapper, erased);
+                else
+                    sb.append("T").append(typeVariable.identifier()).append(";");
+                break;
+            case UNRESOLVED_TYPE_VARIABLE:
+                // FIXME: ??
+                break;
+            case VOID:
+                sb.append("V");
+                break;
+            case WILDCARD_TYPE:
+                if (!erased) {
+                    sb.append("*");
+                }
+                break;
+            default:
+                break;
+
+        }
+    }
+
+    /**
+     * Returns the Java bytecode signature of a given Jandex Class using the given type argument mappings.
+     * For example, given this class:
+     * 
+     * <pre>
+     * {@code
+     * public class Foo<R> extends Bar<R> implements List<String> {
+     * }
+     * </pre>
+     * 
+     * This will return <tt>&lt;R:Ljava/lang/Object;>LBar&lt;TR;>;Ljava/util/List&lt;Ljava/lang/String;>;</tt>.
+     * 
+     * @param klass the class you want the signature for.
+     * 
+     * @return a bytecode signature for that class.
+     */
+    public static String getSignature(ClassInfo klass) {
+        return getSignature(klass, NO_ARG_MAPPER);
+    }
+
+    /**
+     * Returns the Java bytecode signature of a given Jandex Class using the given type argument mappings.
+     * For example, given this class:
+     * 
+     * <pre>
+     * {@code
+     * public class Foo<R> extends Bar<R> implements List<String> {
+     * }
+     * </pre>
+     * 
+     * This will return <tt>&lt;R:Ljava/lang/Object;>LBar&lt;TR;>;Ljava/util/List&lt;Ljava/lang/String;>;</tt>.
+     * 
+     * @param klass the class you want the signature for.
+     * 
+     * @param typeArgMapper a mapping between type variables and their resolved type.
+     * @return a bytecode signature for that class.
+     */
+    public static String getSignature(ClassInfo klass, Function<TypeVariable, Type> typeArgMapper) {
+        StringBuilder signature = new StringBuilder("");
+        toSignature(signature, klass.typeParameters(), typeArgMapper, false);
+        toSignature(signature, klass.superClassType(), typeArgMapper, false);
+        for (Type superinterface : klass.interfaceTypes()) {
+            toSignature(signature, superinterface, typeArgMapper, false);
+        }
+        return signature.toString();
+    }
+
+    private static void toSignature(StringBuilder sb, List<TypeVariable> typeParameters,
+            Function<TypeVariable, Type> typeArgMapper, boolean b) {
+        for (TypeVariable typeVariable : typeParameters) {
+            if (sb.length() == 0)
+                sb.append("<");
+            else
+                sb.append(",");
+            sb.append(typeVariable.identifier()).append(":");
+            // FIXME: only use the first bound
+            toSignature(sb, typeVariable.bounds().get(0), typeArgMapper, false);
+        }
+        if (sb.length() > 0)
+            sb.append(">");
+    }
+
+    /**
+     * Returns true if the given class has type parameters or if its superclass or superinterfaces require a signature
+     */
+    public static boolean needsSignature(ClassInfo klass) {
+        if (!klass.typeParameters().isEmpty()
+                || needsSignature(klass.superClassType())) {
+            return true;
+        }
+        for (Type type : klass.interfaceTypes()) {
+            if (needsSignature(type))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if the given method has type parameters or if its return type or parameter types require a signature
+     */
+    public static boolean needsSignature(MethodInfo method) {
+        if (!method.typeParameters().isEmpty()
+                || needsSignature(method.returnType())) {
+            return true;
+        }
+        for (Type type : method.parameters()) {
+            if (needsSignature(type))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if the given type contains parameterized types, type variables or wildcards
+     */
+    private static boolean needsSignature(Type type) {
+        if (type == null) {
+            return false;
+        }
+        switch (type.kind()) {
+            case ARRAY:
+            case CLASS:
+            case PRIMITIVE:
+            case VOID:
+            default:
+                return false;
+            case PARAMETERIZED_TYPE:
+            case TYPE_VARIABLE:
+            case UNRESOLVED_TYPE_VARIABLE:
+            case WILDCARD_TYPE:
+                return true;
+        }
+    }
+}
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
index 56ce8f311528f..2e2203cd67eac 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
@@ -16,8 +16,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 import javax.enterprise.context.BeforeDestroyed;
 import javax.enterprise.context.Destroyed;
 import javax.enterprise.context.Initialized;
@@ -46,7 +44,8 @@ public final class BeanArchives {
      * @param applicationIndexes
      * @return the final bean archive index
      */
-    public static IndexView buildBeanArchiveIndex(ClassLoader deploymentClassLoader, PersistentClassIndex persistentClassIndex,
+    public static IndexView buildBeanArchiveIndex(ClassLoader deploymentClassLoader,
+            Map<DotName, Optional<ClassInfo>> persistentClassIndex,
             IndexView... applicationIndexes) {
         List<IndexView> indexes = new ArrayList<>();
         Collections.addAll(indexes, applicationIndexes);
@@ -83,25 +82,16 @@ static class IndexWrapper implements IndexView {
         private final ClassLoader deploymentClassLoader;
         final Map<DotName, Optional<ClassInfo>> additionalClasses;
 
-        public IndexWrapper(IndexView index, ClassLoader deploymentClassLoader, PersistentClassIndex persistentClassIndex) {
+        public IndexWrapper(IndexView index, ClassLoader deploymentClassLoader,
+                Map<DotName, Optional<ClassInfo>> additionalClasses) {
             this.index = index;
             this.deploymentClassLoader = deploymentClassLoader;
-            this.additionalClasses = persistentClassIndex.additionalClasses;
+            this.additionalClasses = additionalClasses;
         }
 
         @Override
         public Collection<ClassInfo> getKnownClasses() {
-            if (additionalClasses.isEmpty()) {
-                return index.getKnownClasses();
-            }
-            Collection<ClassInfo> known = index.getKnownClasses();
-            Collection<ClassInfo> additional = additionalClasses.values().stream().filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .collect(Collectors.toList());
-            List<ClassInfo> all = new ArrayList<>(known.size() + additional.size());
-            all.addAll(known);
-            all.addAll(additional);
-            return all;
+            return index.getKnownClasses();
         }
 
         @Override
@@ -254,6 +244,9 @@ static boolean index(Indexer indexer, String className) {
 
     static boolean index(Indexer indexer, String className, ClassLoader classLoader) {
         boolean result = false;
+        if (Types.isPrimitiveClassName(className)) {
+            return false;
+        }
         try (InputStream stream = classLoader
                 .getResourceAsStream(className.replace('.', '/') + ".class")) {
             if (stream != null) {
@@ -267,10 +260,4 @@ static boolean index(Indexer indexer, String className, ClassLoader classLoader)
         }
         return result;
     }
-
-    public static class PersistentClassIndex {
-
-        final Map<DotName, Optional<ClassInfo>> additionalClasses = new ConcurrentHashMap<>();
-    }
-
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java
index 6306a2ac3097f..0d4e41ce96c1d 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java
@@ -44,7 +44,7 @@ protected BeanConfigurator<T> self() {
      */
     public void done() {
         if (consumed.compareAndSet(false, true)) {
-            ClassInfo implClass = getClassByName(beanDeployment.getIndex(), Objects.requireNonNull(implClazz));
+            ClassInfo implClass = getClassByName(beanDeployment.getBeanArchiveIndex(), Objects.requireNonNull(implClazz));
             if (implClass == null) {
                 throw new IllegalStateException("Unable to find the bean class in the index: " + implClazz);
             }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java
index ec88d6e85c35e..c5f30c1e8b1b4 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfiguratorBase.java
@@ -2,6 +2,7 @@
 
 import io.quarkus.arc.BeanCreator;
 import io.quarkus.arc.BeanDestroyer;
+import io.quarkus.arc.InjectableReferenceProvider;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
@@ -12,7 +13,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import javax.enterprise.context.NormalScope;
@@ -135,8 +135,13 @@ public B scope(ScopeInfo scope) {
 
     public B scope(Class<? extends Annotation> scope) {
         DotName scopeName = DotName.createSimple(scope.getName());
-        this.scope = Optional.ofNullable(BuiltinScope.from(scopeName)).map(BuiltinScope::getInfo).orElse(new ScopeInfo(
-                scopeName, scope.isAnnotationPresent(NormalScope.class), scope.isAnnotationPresent(Inherited.class)));
+        BuiltinScope builtinScope = BuiltinScope.from(scopeName);
+        if (builtinScope != null) {
+            this.scope = builtinScope.getInfo();
+        } else {
+            this.scope = new ScopeInfo(scopeName, scope.isAnnotationPresent(NormalScope.class),
+                    scope.isAnnotationPresent(Inherited.class));
+        }
         return self();
     }
 
@@ -145,6 +150,17 @@ public B name(String name) {
         return self();
     }
 
+    /**
+     * Unlike for the {@link #name(String)} method a new {@link javax.inject.Named} qualifier with the specified value is added
+     * to the configured bean.
+     * 
+     * @param name
+     * @return self
+     */
+    public B named(String name) {
+        return name(name).addQualifier().annotation(DotNames.NAMED).addValue("value", name).done();
+    }
+
     public B defaultBean() {
         this.defaultBean = true;
         return self();
@@ -190,6 +206,16 @@ public B param(String name, boolean value) {
         return self();
     }
 
+    /**
+     * The provider type is the "real" type of the bean instance created via
+     * {@link InjectableReferenceProvider#get(CreationalContext)}.
+     * <p>
+     * The container attempts to derive the provider type from the implementation class. However, in some cases it's better to
+     * specify it manually.
+     * 
+     * @param providerType
+     * @return self
+     */
     public B providerType(Type providerType) {
         this.providerType = providerType;
         return self();
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
index 9c5408a7eda91..c42aa1a1bb37a 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
@@ -56,16 +56,17 @@ public class BeanDeployment {
 
     private final BuildContextImpl buildContext;
 
-    private final IndexView index;
+    private final IndexView beanArchiveIndex;
 
-    private final Map<DotName, ClassInfo> qualifiers;
+    private final IndexView applicationIndex;
 
+    private final Map<DotName, ClassInfo> qualifiers;
     private final Map<DotName, ClassInfo> repeatingQualifierAnnotations;
+    private final Map<DotName, Set<String>> qualifierNonbindingMembers;
 
     private final Map<DotName, ClassInfo> interceptorBindings;
-
-    private final Map<DotName, Set<String>> nonBindingFields;
-
+    private final Map<DotName, ClassInfo> repeatingInterceptorBindingAnnotations;
+    private final Map<DotName, Set<String>> interceptorNonbindingMembers;
     private final Map<DotName, Set<AnnotationInstance>> transitiveInterceptorBindings;
 
     private final Map<DotName, StereotypeInfo> stereotypes;
@@ -76,7 +77,7 @@ public class BeanDeployment {
 
     private final List<ObserverInfo> observers;
 
-    private final BeanResolver beanResolver;
+    final BeanResolverImpl beanResolver;
 
     private final InterceptorResolver interceptorResolver;
 
@@ -108,7 +109,7 @@ public class BeanDeployment {
 
     private final List<Predicate<ClassInfo>> excludeTypes;
 
-    BeanDeployment(IndexView index, BuildContextImpl buildContext, BeanProcessor.Builder builder) {
+    BeanDeployment(BuildContextImpl buildContext, BeanProcessor.Builder builder) {
         this.buildContext = buildContext;
         Set<BeanDefiningAnnotation> beanDefiningAnnotations = new HashSet<>();
         if (builder.additionalBeanDefiningAnnotations != null) {
@@ -116,7 +117,8 @@ public class BeanDeployment {
         }
         this.beanDefiningAnnotations = beanDefiningAnnotations;
         this.resourceAnnotations = new HashSet<>(builder.resourceAnnotations);
-        this.index = index;
+        this.beanArchiveIndex = builder.beanArchiveIndex;
+        this.applicationIndex = builder.applicationIndex;
         this.annotationStore = new AnnotationStore(initAndSort(builder.annotationTransformers, buildContext), buildContext);
         if (buildContext != null) {
             buildContext.putInternal(Key.ANNOTATION_STORE.asString(), annotationStore);
@@ -127,34 +129,50 @@ public class BeanDeployment {
         this.removeUnusedBeans = builder.removeUnusedBeans;
         this.unusedExclusions = removeUnusedBeans ? new ArrayList<>(builder.removalExclusions) : null;
         this.removedBeans = new CopyOnWriteArraySet<>();
-
         this.customContexts = new ConcurrentHashMap<>();
 
-        this.qualifiers = findQualifiers(index);
-        this.repeatingQualifierAnnotations = findContainerAnnotations(qualifiers, index);
+        this.excludeTypes = builder.excludeTypes != null ? new ArrayList<>(builder.excludeTypes) : Collections.emptyList();
+
+        qualifierNonbindingMembers = new HashMap<>();
+        qualifiers = findQualifiers(this.beanArchiveIndex);
+        for (QualifierRegistrar registrar : builder.qualifierRegistrars) {
+            for (Map.Entry<DotName, Set<String>> entry : registrar.getAdditionalQualifiers().entrySet()) {
+                DotName dotName = entry.getKey();
+                ClassInfo classInfo = getClassByName(this.beanArchiveIndex, dotName);
+                if (classInfo != null) {
+                    if (entry.getValue() != null) {
+                        qualifierNonbindingMembers.put(dotName, entry.getValue());
+                    }
+                    this.qualifiers.put(dotName, classInfo);
+                }
+            }
+        }
+        repeatingQualifierAnnotations = findContainerAnnotations(qualifiers, this.beanArchiveIndex);
         buildContextPut(Key.QUALIFIERS.asString(), Collections.unmodifiableMap(qualifiers));
 
-        this.interceptorBindings = findInterceptorBindings(index);
-        this.nonBindingFields = new HashMap<>();
-        for (InterceptorBindingRegistrar registrar : builder.additionalInterceptorBindingRegistrars) {
-            for (Map.Entry<DotName, Set<String>> bindingEntry : registrar.registerAdditionalBindings().entrySet()) {
-                DotName dotName = bindingEntry.getKey();
-                ClassInfo classInfo = getClassByName(index, dotName);
+        interceptorNonbindingMembers = new HashMap<>();
+        interceptorBindings = findInterceptorBindings(this.beanArchiveIndex);
+        for (InterceptorBindingRegistrar registrar : builder.interceptorBindingRegistrars) {
+            for (Map.Entry<DotName, Set<String>> entry : registrar.registerAdditionalBindings().entrySet()) {
+                DotName dotName = entry.getKey();
+                ClassInfo classInfo = getClassByName(this.beanArchiveIndex, dotName);
                 if (classInfo != null) {
-                    if (bindingEntry.getValue() != null) {
-                        nonBindingFields.put(dotName, bindingEntry.getValue());
+                    if (entry.getValue() != null) {
+                        interceptorNonbindingMembers.put(dotName, entry.getValue());
                     }
                     interceptorBindings.put(dotName, classInfo);
                 }
             }
         }
+        repeatingInterceptorBindingAnnotations = findContainerAnnotations(interceptorBindings, this.beanArchiveIndex);
         buildContextPut(Key.INTERCEPTOR_BINDINGS.asString(), Collections.unmodifiableMap(interceptorBindings));
 
-        this.stereotypes = findStereotypes(index, interceptorBindings, beanDefiningAnnotations, customContexts,
+        this.stereotypes = findStereotypes(this.beanArchiveIndex, interceptorBindings, beanDefiningAnnotations, customContexts,
                 builder.additionalStereotypes, annotationStore);
         buildContextPut(Key.STEREOTYPES.asString(), Collections.unmodifiableMap(stereotypes));
 
-        this.transitiveInterceptorBindings = findTransitiveInterceptorBindigs(interceptorBindings.keySet(), index,
+        this.transitiveInterceptorBindings = findTransitiveInterceptorBindigs(interceptorBindings.keySet(),
+                this.beanArchiveIndex,
                 new HashMap<>(), interceptorBindings, annotationStore);
 
         this.injectionPoints = new CopyOnWriteArrayList<>();
@@ -162,12 +180,11 @@ public class BeanDeployment {
         this.beans = new CopyOnWriteArrayList<>();
         this.observers = new CopyOnWriteArrayList<>();
 
-        this.beanResolver = new BeanResolver(this);
+        this.beanResolver = new BeanResolverImpl(this);
         this.interceptorResolver = new InterceptorResolver(this);
         this.transformUnproxyableClasses = builder.transformUnproxyableClasses;
         this.jtaCapabilities = builder.jtaCapabilities;
         this.alternativePriorities = builder.alternativePriorities;
-        this.excludeTypes = builder.excludeTypes != null ? new ArrayList<>(builder.excludeTypes) : Collections.emptyList();
     }
 
     ContextRegistrar.RegistrationContext registerCustomContexts(List<ContextRegistrar> contextRegistrars) {
@@ -195,12 +212,15 @@ public ContextConfigurator configure(Class<? extends Annotation> scopeAnnotation
         for (ContextRegistrar contextRegistrar : contextRegistrars) {
             contextRegistrar.register(registrationContext);
         }
+        return registrationContext;
+    }
+
+    void registerScopes() {
         if (buildContext != null) {
             List<ScopeInfo> allScopes = Arrays.stream(BuiltinScope.values()).map(i -> i.getInfo()).collect(Collectors.toList());
             allScopes.addAll(customContexts.keySet());
             buildContext.putInternal(Key.SCOPES.asString(), Collections.unmodifiableList(allScopes));
         }
-        return registrationContext;
     }
 
     BeanRegistrar.RegistrationContext registerBeans(List<BeanRegistrar> beanRegistrars) {
@@ -217,7 +237,8 @@ BeanRegistrar.RegistrationContext registerBeans(List<BeanRegistrar> beanRegistra
         return registerSyntheticBeans(beanRegistrars, buildContext);
     }
 
-    void init(Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
+    void init(Consumer<BytecodeTransformer> bytecodeTransformerConsumer,
+            List<Predicate<BeanInfo>> additionalUnusedBeanExclusions) {
         long start = System.currentTimeMillis();
 
         // Collect dependency resolution errors
@@ -232,6 +253,10 @@ void init(Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
             interceptor.init(errors, bytecodeTransformerConsumer, transformUnproxyableClasses);
         }
         processErrors(errors);
+        List<Predicate<BeanInfo>> allUnusedExclusions = new ArrayList<>(additionalUnusedBeanExclusions);
+        if (unusedExclusions != null) {
+            allUnusedExclusions.addAll(unusedExclusions);
+        }
 
         if (removeUnusedBeans) {
             long removalStart = System.currentTimeMillis();
@@ -257,7 +282,7 @@ void init(Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
                     continue test;
                 }
                 // Custom exclusions
-                for (Predicate<BeanInfo> exclusion : unusedExclusions) {
+                for (Predicate<BeanInfo> exclusion : allUnusedExclusions) {
                     if (exclusion.test(bean)) {
                         continue test;
                     }
@@ -344,26 +369,58 @@ public Collection<ClassInfo> getQualifiers() {
         return Collections.unmodifiableCollection(qualifiers.values());
     }
 
+    Map<DotName, Set<String>> getQualifierNonbindingMembers() {
+        return qualifierNonbindingMembers;
+    }
+
     public Collection<ClassInfo> getInterceptorBindings() {
         return Collections.unmodifiableCollection(interceptorBindings.values());
     }
 
+    public Collection<InjectionPointInfo> getInjectionPoints() {
+        return Collections.unmodifiableList(injectionPoints);
+    }
+
     public Collection<ObserverInfo> getObservers() {
-        return observers;
+        return Collections.unmodifiableList(observers);
     }
 
     public Collection<InterceptorInfo> getInterceptors() {
-        return interceptors;
+        return Collections.unmodifiableList(interceptors);
+    }
+
+    public Collection<StereotypeInfo> getStereotypes() {
+        return Collections.unmodifiableCollection(stereotypes.values());
     }
 
-    public IndexView getIndex() {
-        return index;
+    /**
+     * This index was used to discover components (beans, interceptors, qualifiers, etc.) and during type-safe resolution.
+     * 
+     * @return the bean archive index
+     */
+    public IndexView getBeanArchiveIndex() {
+        return beanArchiveIndex;
     }
 
-    BeanResolver getBeanResolver() {
+    /**
+     * This index is optional and is used to discover types during type-safe resolution.
+     * <p>
+     * Some types may not be part of the bean archive index but are still needed during type-safe resolution.
+     * 
+     * @return the application index or {@code null}
+     */
+    public IndexView getApplicationIndex() {
+        return applicationIndex;
+    }
+
+    public BeanResolver getBeanResolver() {
         return beanResolver;
     }
 
+    boolean hasApplicationIndex() {
+        return applicationIndex != null;
+    }
+
     public InterceptorResolver getInterceptorResolver() {
         return interceptorResolver;
     }
@@ -375,27 +432,49 @@ ClassInfo getQualifier(DotName name) {
     /**
      * Extracts qualifiers from given annotation instance.
      * This returns a collection because in case of repeating qualifiers there can be multiple.
-     * For most instances this will be a singleton instance (if given annotatation is a qualifier) or an empty list for
+     * For most instances this will be a singleton instance (if given annotation is a qualifier) or an empty list for
      * cases where the annotation is not a qualifier.
      *
-     * @param annotation instance to be inspected
+     * @param annotation annotation to be inspected
      * @return a collection of qualifiers or an empty collection
      */
     Collection<AnnotationInstance> extractQualifiers(AnnotationInstance annotation) {
+        return extractAnnotations(annotation, qualifiers, repeatingQualifierAnnotations);
+    }
+
+    /**
+     * Extracts interceptor bindings from given annotation instance.
+     * This returns a collection because in case of repeating interceptor bindings there can be multiple.
+     * For most instances this will be a singleton instance (if given annotation is an interceptor binding) or
+     * an empty list for cases where the annotation is not an interceptor binding.
+     *
+     * @param annotation annotation to be inspected
+     * @return a collection of interceptor bindings or an empty collection
+     */
+    Collection<AnnotationInstance> extractInterceptorBindings(AnnotationInstance annotation) {
+        return extractAnnotations(annotation, interceptorBindings, repeatingInterceptorBindingAnnotations);
+    }
+
+    private static Collection<AnnotationInstance> extractAnnotations(AnnotationInstance annotation,
+            Map<DotName, ClassInfo> singulars, Map<DotName, ClassInfo> repeatables) {
         DotName annotationName = annotation.name();
-        if (qualifiers.get(annotationName) != null) {
+        if (singulars.get(annotationName) != null) {
             return Collections.singleton(annotation);
         } else {
-            if (repeatingQualifierAnnotations.get(annotationName) != null) {
-                // container annotation, we need to extract actual qualifiers
+            if (repeatables.get(annotationName) != null) {
+                // repeatable, we need to extract actual annotations
                 return new ArrayList<>(Arrays.asList(annotation.value().asNestedArray()));
             } else {
-                // neither qualifier, nor container annotation, return empty collection
+                // neither singular nor repeatable, return empty collection
                 return Collections.emptyList();
             }
         }
     }
 
+    BeanResolverImpl beanResolver() {
+        return beanResolver;
+    }
+
     ClassInfo getInterceptorBinding(DotName name) {
         return interceptorBindings.get(name);
     }
@@ -424,7 +503,7 @@ public Collection<AnnotationInstance> getAnnotations(AnnotationTarget target) {
         return annotationStore.getAnnotations(target);
     }
 
-    AnnotationInstance getAnnotation(AnnotationTarget target, DotName name) {
+    public AnnotationInstance getAnnotation(AnnotationTarget target, DotName name) {
         return annotationStore.getAnnotation(target, name);
     }
 
@@ -452,31 +531,40 @@ private void buildContextPut(String key, Object value) {
         }
     }
 
-    private static Map<DotName, ClassInfo> findQualifiers(IndexView index) {
+    private Map<DotName, ClassInfo> findQualifiers(IndexView index) {
         Map<DotName, ClassInfo> qualifiers = new HashMap<>();
         for (AnnotationInstance qualifier : index.getAnnotations(DotNames.QUALIFIER)) {
-            qualifiers.put(qualifier.target().asClass().name(), qualifier.target().asClass());
+            ClassInfo qualifierClass = qualifier.target().asClass();
+            if (isExcluded(qualifierClass)) {
+                continue;
+            }
+            qualifiers.put(qualifierClass.name(), qualifierClass);
         }
         return qualifiers;
     }
 
-    private static Map<DotName, ClassInfo> findContainerAnnotations(Map<DotName, ClassInfo> qualifiers, IndexView index) {
+    private Map<DotName, ClassInfo> findContainerAnnotations(Map<DotName, ClassInfo> annotations, IndexView index) {
         Map<DotName, ClassInfo> containerAnnotations = new HashMap<>();
-        for (ClassInfo qualifier : qualifiers.values()) {
-            AnnotationInstance instance = qualifier.classAnnotation(DotNames.REPEATABLE);
-            if (instance != null) {
-                DotName annotationName = instance.value().asClass().name();
-                containerAnnotations.put(annotationName, getClassByName(index, annotationName));
+        for (ClassInfo annotation : annotations.values()) {
+            AnnotationInstance repeatableMetaAnnotation = annotation.classAnnotation(DotNames.REPEATABLE);
+            if (repeatableMetaAnnotation != null) {
+                DotName containerAnnotationName = repeatableMetaAnnotation.value().asClass().name();
+                ClassInfo containerClass = getClassByName(index, containerAnnotationName);
+                containerAnnotations.put(containerAnnotationName, containerClass);
             }
         }
         return containerAnnotations;
     }
 
-    private static Map<DotName, ClassInfo> findInterceptorBindings(IndexView index) {
+    private Map<DotName, ClassInfo> findInterceptorBindings(IndexView index) {
         Map<DotName, ClassInfo> bindings = new HashMap<>();
         // Note: doesn't use AnnotationStore, this will operate on classes without applying annotation transformers
         for (AnnotationInstance binding : index.getAnnotations(DotNames.INTERCEPTOR_BINDING)) {
-            bindings.put(binding.target().asClass().name(), binding.target().asClass());
+            ClassInfo bindingClass = binding.target().asClass();
+            if (isExcluded(bindingClass)) {
+                continue;
+            }
+            bindings.put(bindingClass.name(), bindingClass);
         }
         return bindings;
     }
@@ -521,7 +609,7 @@ private static Set<AnnotationInstance> recursiveBuild(DotName name,
         return result;
     }
 
-    private static Map<DotName, StereotypeInfo> findStereotypes(IndexView index, Map<DotName, ClassInfo> interceptorBindings,
+    private Map<DotName, StereotypeInfo> findStereotypes(IndexView index, Map<DotName, ClassInfo> interceptorBindings,
             Collection<BeanDefiningAnnotation> additionalBeanDefiningAnnotations,
             Map<ScopeInfo, Function<MethodCreator, ResultHandle>> customContexts,
             Map<DotName, Collection<AnnotationInstance>> additionalStereotypes, AnnotationStore annotationStore) {
@@ -534,7 +622,7 @@ private static Map<DotName, StereotypeInfo> findStereotypes(IndexView index, Map
         for (AnnotationInstance stereotype : stereotypeAnnotations) {
             final DotName stereotypeName = stereotype.target().asClass().name();
             ClassInfo stereotypeClass = getClassByName(index, stereotypeName);
-            if (stereotypeClass != null) {
+            if (stereotypeClass != null && !isExcluded(stereotypeClass)) {
 
                 boolean isAlternative = false;
                 Integer alternativePriority = null;
@@ -625,13 +713,12 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
         Map<MethodInfo, Set<ClassInfo>> syncObserverMethods = new HashMap<>();
         Map<MethodInfo, Set<ClassInfo>> asyncObserverMethods = new HashMap<>();
         // Stereotypes excluding additional BeanDefiningAnnotations
-        List<DotName> realStereotypes = this.stereotypes.entrySet().stream()
-                .filter(e -> !e.getValue().isAdditionalBeanDefiningAnnotation()
-                        && !e.getValue().isAdditionalStereotypeBuildItem())
-                .map(Entry::getKey)
-                .collect(Collectors.toList());
+        Set<DotName> realStereotypes = this.stereotypes.values().stream()
+                .filter(StereotypeInfo::isGenuine)
+                .map(StereotypeInfo::getName)
+                .collect(Collectors.toSet());
 
-        for (ClassInfo beanClass : index.getKnownClasses()) {
+        for (ClassInfo beanClass : beanArchiveIndex.getKnownClasses()) {
 
             if (Modifier.isInterface(beanClass.flags()) || Modifier.isAbstract(beanClass.flags())
             // Replace with ClassInfo#isAnnotation() and ClassInfo#isEnum() when using Jandex 2.1.4+
@@ -716,24 +803,22 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
 
             // inherited stuff
             ClassInfo aClass = beanClass;
-            Set<ClassInfo> scannedClasses = new HashSet<>();
-            Set<MethodInfo> methods = new HashSet<>();
+            Set<Methods.MethodKey> methods = new HashSet<>();
             while (aClass != null) {
-                if (!scannedClasses.add(aClass)) {
-                    continue;
-                }
                 for (MethodInfo method : aClass.methods()) {
-                    if (Methods.isSynthetic(method) || Methods.isOverriden(method, methods)) {
+                    Methods.MethodKey methodDescriptor = new Methods.MethodKey(method);
+                    if (Methods.isSynthetic(method) || Methods.isOverriden(methodDescriptor, methods)) {
                         continue;
                     }
-                    methods.add(method);
-                    if (annotationStore.getAnnotations(method).isEmpty()) {
+                    methods.add(methodDescriptor);
+                    Collection<AnnotationInstance> methodAnnotations = annotationStore.getAnnotations(method);
+                    if (methodAnnotations.isEmpty()) {
                         continue;
                     }
                     // Verify that non-producer methods are not annotated with stereotypes
                     // only account for 'real' stereotypes that are not additional BeanDefiningAnnotations
                     if (!annotationStore.hasAnnotation(method, DotNames.PRODUCES)) {
-                        for (AnnotationInstance i : annotationStore.getAnnotations(method)) {
+                        for (AnnotationInstance i : methodAnnotations) {
                             if (realStereotypes.contains(i.name())) {
                                 throw new DefinitionException(
                                         "Method " + method + " of class " + beanClass
@@ -766,11 +851,10 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
                         }
                     }
                 }
-                Type superType = aClass.superClassType();
-                aClass = superType != null && !superType.name().equals(DotNames.OBJECT)
-                        && CLASS_TYPES.contains(superType.kind())
-                                ? getClassByName(index, superType.name())
-                                : null;
+                DotName superType = aClass.superName();
+                aClass = superType != null && !superType.equals(DotNames.OBJECT)
+                        ? getClassByName(beanArchiveIndex, superType)
+                        : null;
             }
             for (FieldInfo field : beanClass.fields()) {
                 if (annotationStore.hasAnnotation(field, DotNames.PRODUCES)) {
@@ -915,7 +999,7 @@ private DisposerInfo findDisposer(BeanInfo declaringBean, AnnotationTarget annot
             if (disposer.getDeclaringBean().equals(declaringBean)) {
                 boolean hasQualifier = true;
                 for (AnnotationInstance disposerQualifier : disposer.getDisposedParameterQualifiers()) {
-                    if (!Beans.hasQualifier(getQualifier(disposerQualifier.name()), disposerQualifier, qualifiers)) {
+                    if (!Beans.hasQualifier(declaringBean.getDeployment(), disposerQualifier, qualifiers)) {
                         hasQualifier = false;
                     }
                 }
@@ -966,6 +1050,13 @@ io.quarkus.arc.processor.ObserverRegistrar.RegistrationContext registerSynthetic
     }
 
     private void addSyntheticBean(BeanInfo bean) {
+        for (BeanInfo b : beans) {
+            if (b.getIdentifier().equals(bean.getIdentifier())) {
+                throw new IllegalStateException(
+                        "A synthetic bean with identifier " + bean.getIdentifier() + " is already registered: "
+                                + b);
+            }
+        }
         beans.add(bean);
     }
 
@@ -1005,15 +1096,15 @@ static void processErrors(List<Throwable> errors) {
     }
 
     private List<InterceptorInfo> findInterceptors(List<InjectionPointInfo> injectionPoints) {
-        Set<ClassInfo> interceptorClasses = new HashSet<>();
-        for (AnnotationInstance annotation : index.getAnnotations(DotNames.INTERCEPTOR)) {
+        Map<DotName, ClassInfo> interceptorClasses = new HashMap<>();
+        for (AnnotationInstance annotation : beanArchiveIndex.getAnnotations(DotNames.INTERCEPTOR)) {
             if (Kind.CLASS.equals(annotation.target().kind())) {
-                interceptorClasses.add(annotation.target().asClass());
+                interceptorClasses.put(annotation.target().asClass().name(), annotation.target().asClass());
             }
         }
         List<InterceptorInfo> interceptors = new ArrayList<>();
-        for (ClassInfo interceptorClass : interceptorClasses) {
-            if (annotationStore.hasAnnotation(interceptorClass, DotNames.VETOED)) {
+        for (ClassInfo interceptorClass : interceptorClasses.values()) {
+            if (annotationStore.hasAnnotation(interceptorClass, DotNames.VETOED) || isExcluded(interceptorClass)) {
                 // Skip vetoed interceptors
                 continue;
             }
@@ -1035,6 +1126,7 @@ private void validateBeans(List<Throwable> errors, List<BeanDeploymentValidator>
             Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
 
         Map<String, List<BeanInfo>> namedBeans = new HashMap<>();
+        Set<DotName> classesReceivingNoArgsCtor = new HashSet<>();
 
         for (BeanInfo bean : beans) {
             if (bean.getName() != null) {
@@ -1045,7 +1137,7 @@ private void validateBeans(List<Throwable> errors, List<BeanDeploymentValidator>
                 }
                 named.add(bean);
             }
-            bean.validate(errors, validators, bytecodeTransformerConsumer);
+            bean.validate(errors, validators, bytecodeTransformerConsumer, classesReceivingNoArgsCtor);
         }
 
         if (!namedBeans.isEmpty()) {
@@ -1064,8 +1156,12 @@ private void validateBeans(List<Throwable> errors, List<BeanDeploymentValidator>
         }
     }
 
-    public Set<String> getNonBindingFields(DotName name) {
-        return nonBindingFields.getOrDefault(name, Collections.emptySet());
+    public Set<String> getInterceptorNonbindingMembers(DotName name) {
+        return interceptorNonbindingMembers.getOrDefault(name, Collections.emptySet());
+    }
+
+    public Set<String> getQualifierNonbindingMembers(DotName name) {
+        return qualifierNonbindingMembers.getOrDefault(name, Collections.emptySet());
     }
 
     private static class ValidationContextImpl implements ValidationContext {
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java
index b4b1f7cdc62b9..3a22329e6f121 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeploymentValidator.java
@@ -1,5 +1,6 @@
 package io.quarkus.arc.processor;
 
+import java.util.Collection;
 import java.util.List;
 import javax.enterprise.inject.spi.DeploymentException;
 
@@ -40,6 +41,10 @@ interface ValidationContext extends BuildContext {
          */
         BeanStream removedBeans();
 
+        default Collection<InjectionPointInfo> getInjectionPoints() {
+            return get(BuildExtension.Key.INJECTION_POINTS);
+        }
+
     }
 
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
index 1f8a6f3ccefcd..a1e9908c466d6 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
@@ -9,7 +9,6 @@
 
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableInterceptor;
-import io.quarkus.arc.InjectableReferenceProvider;
 import io.quarkus.arc.impl.CreationalContextImpl;
 import io.quarkus.arc.impl.CurrentInjectionPointProvider;
 import io.quarkus.arc.impl.InitializedInterceptor;
@@ -50,7 +49,6 @@
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.inject.TransientReference;
 import javax.enterprise.inject.literal.InjectLiteral;
 import javax.enterprise.inject.spi.InterceptionType;
 import javax.interceptor.InvocationContext;
@@ -70,9 +68,7 @@
 public class BeanGenerator extends AbstractGenerator {
 
     static final String BEAN_SUFFIX = "_Bean";
-
     static final String PRODUCER_METHOD_SUFFIX = "_ProducerMethod";
-
     static final String PRODUCER_FIELD_SUFFIX = "_ProducerField";
 
     protected static final String FIELD_NAME_DECLARING_PROVIDER_SUPPLIER = "declaringProviderSupplier";
@@ -143,8 +139,7 @@ Collection<Resource> generateSyntheticBean(BeanInfo bean) {
         baseNameBuilder.append(SYNTHETIC_SUFFIX);
         String baseName = baseNameBuilder.toString();
 
-        Type providerType = bean.getProviderType();
-        String providerTypeName = providerType.name().toString();
+        ProviderType providerType = new ProviderType(bean.getProviderType());
         String targetPackage = getPackageName(bean);
         String generatedName = generatedNameFromTarget(targetPackage, baseName, BEAN_SUFFIX);
         beanToGeneratedName.put(bean, generatedName);
@@ -218,13 +213,14 @@ Collection<Resource> generateSyntheticBean(BeanInfo bean) {
         implementGetIdentifier(bean, beanCreator);
         implementSupplierGet(beanCreator);
         if (!bean.hasDefaultDestroy()) {
-            implementDestroy(bean, beanCreator, providerTypeName, Collections.emptyMap(), reflectionRegistration,
+            implementDestroy(bean, beanCreator, providerType, Collections.emptyMap(), reflectionRegistration,
                     isApplicationClass, baseName);
         }
-        implementCreate(classOutput, beanCreator, bean, providerTypeName, baseName, Collections.emptyMap(),
+        implementCreate(classOutput, beanCreator, bean, providerType, baseName,
+                Collections.emptyMap(),
                 Collections.emptyMap(), reflectionRegistration,
                 targetPackage, isApplicationClass);
-        implementGet(bean, beanCreator, providerTypeName, baseName);
+        implementGet(bean, beanCreator, providerType, baseName);
 
         implementGetTypes(beanCreator, beanTypes.getFieldDescriptor());
         if (!BuiltinScope.isDefault(bean.getScope())) {
@@ -245,6 +241,8 @@ Collection<Resource> generateSyntheticBean(BeanInfo bean) {
             implementIsDefaultBean(bean, beanCreator);
         }
         implementGetKind(beanCreator, InjectableBean.Kind.SYNTHETIC);
+        implementEquals(bean, beanCreator);
+        implementHashCode(bean, beanCreator);
 
         beanCreator.close();
         return classOutput.getResources();
@@ -258,8 +256,7 @@ Collection<Resource> generateClassBean(BeanInfo bean, ClassInfo beanClass) {
         } else {
             baseName = DotNames.simpleName(beanClass);
         }
-        Type providerType = bean.getProviderType();
-        String providerTypeName = providerType.name().toString();
+        ProviderType providerType = new ProviderType(bean.getProviderType());
         String targetPackage = DotNames.packageName(providerType.name());
         String generatedName = generatedNameFromTarget(targetPackage, baseName, BEAN_SUFFIX);
         beanToGeneratedName.put(bean, generatedName);
@@ -303,13 +300,15 @@ Collection<Resource> generateClassBean(BeanInfo bean, ClassInfo beanClass) {
         implementGetIdentifier(bean, beanCreator);
         implementSupplierGet(beanCreator);
         if (!bean.hasDefaultDestroy()) {
-            implementDestroy(bean, beanCreator, providerTypeName, injectionPointToProviderSupplierField, reflectionRegistration,
+            implementDestroy(bean, beanCreator, providerType, injectionPointToProviderSupplierField,
+                    reflectionRegistration,
                     isApplicationClass, baseName);
         }
-        implementCreate(classOutput, beanCreator, bean, providerTypeName, baseName, injectionPointToProviderSupplierField,
+        implementCreate(classOutput, beanCreator, bean, providerType, baseName,
+                injectionPointToProviderSupplierField,
                 interceptorToProviderSupplierField,
                 reflectionRegistration, targetPackage, isApplicationClass);
-        implementGet(bean, beanCreator, providerTypeName, baseName);
+        implementGet(bean, beanCreator, providerType, baseName);
 
         implementGetTypes(beanCreator, beanTypes.getFieldDescriptor());
         if (!BuiltinScope.isDefault(bean.getScope())) {
@@ -330,6 +329,9 @@ Collection<Resource> generateClassBean(BeanInfo bean, ClassInfo beanClass) {
             implementIsDefaultBean(bean, beanCreator);
         }
 
+        implementEquals(bean, beanCreator);
+        implementHashCode(bean, beanCreator);
+
         beanCreator.close();
         return classOutput.getResources();
     }
@@ -345,7 +347,7 @@ Collection<Resource> generateProducerMethodBean(BeanInfo bean, MethodInfo produc
             declaringClassBase = DotNames.simpleName(declaringClass);
         }
 
-        Type providerType = bean.getProviderType();
+        ProviderType providerType = new ProviderType(bean.getProviderType());
         StringBuilder sigBuilder = new StringBuilder();
         sigBuilder.append(producerMethod.name())
                 .append(UNDERSCORE)
@@ -357,7 +359,6 @@ Collection<Resource> generateProducerMethodBean(BeanInfo bean, MethodInfo produc
 
         String baseName = declaringClassBase + PRODUCER_METHOD_SUFFIX + UNDERSCORE + producerMethod.name() + UNDERSCORE
                 + Hashes.sha1(sigBuilder.toString());
-        String providerTypeName = providerType.name().toString();
         String targetPackage = DotNames.packageName(declaringClass.name());
         String generatedName = generatedNameFromTarget(targetPackage, baseName, BEAN_SUFFIX);
         beanToGeneratedName.put(bean, generatedName);
@@ -400,13 +401,14 @@ Collection<Resource> generateProducerMethodBean(BeanInfo bean, MethodInfo produc
         implementGetIdentifier(bean, beanCreator);
         implementSupplierGet(beanCreator);
         if (!bean.hasDefaultDestroy()) {
-            implementDestroy(bean, beanCreator, providerTypeName, injectionPointToProviderField, reflectionRegistration,
+            implementDestroy(bean, beanCreator, providerType, injectionPointToProviderField, reflectionRegistration,
                     isApplicationClass, baseName);
         }
-        implementCreate(classOutput, beanCreator, bean, providerTypeName, baseName, injectionPointToProviderField,
+        implementCreate(classOutput, beanCreator, bean, providerType, baseName,
+                injectionPointToProviderField,
                 Collections.emptyMap(),
                 reflectionRegistration, targetPackage, isApplicationClass);
-        implementGet(bean, beanCreator, providerTypeName, baseName);
+        implementGet(bean, beanCreator, providerType, baseName);
 
         implementGetTypes(beanCreator, beanTypes.getFieldDescriptor());
         if (!BuiltinScope.isDefault(bean.getScope())) {
@@ -428,6 +430,8 @@ Collection<Resource> generateProducerMethodBean(BeanInfo bean, MethodInfo produc
             implementIsDefaultBean(bean, beanCreator);
         }
         implementGetKind(beanCreator, InjectableBean.Kind.PRODUCER_METHOD);
+        implementEquals(bean, beanCreator);
+        implementHashCode(bean, beanCreator);
 
         beanCreator.close();
         return classOutput.getResources();
@@ -444,9 +448,8 @@ Collection<Resource> generateProducerFieldBean(BeanInfo bean, FieldInfo producer
             declaringClassBase = DotNames.simpleName(declaringClass);
         }
 
-        Type providerType = bean.getProviderType();
+        ProviderType providerType = new ProviderType(bean.getProviderType());
         String baseName = declaringClassBase + PRODUCER_FIELD_SUFFIX + UNDERSCORE + producerField.name();
-        String providerTypeName = providerType.name().toString();
         String targetPackage = DotNames.packageName(declaringClass.name());
         String generatedName = generatedNameFromTarget(targetPackage, baseName, BEAN_SUFFIX);
         beanToGeneratedName.put(bean, generatedName);
@@ -485,12 +488,14 @@ Collection<Resource> generateProducerFieldBean(BeanInfo bean, FieldInfo producer
         implementGetIdentifier(bean, beanCreator);
         implementSupplierGet(beanCreator);
         if (!bean.hasDefaultDestroy()) {
-            implementDestroy(bean, beanCreator, providerTypeName, null, reflectionRegistration, isApplicationClass, baseName);
+            implementDestroy(bean, beanCreator, providerType, null, reflectionRegistration, isApplicationClass,
+                    baseName);
         }
-        implementCreate(classOutput, beanCreator, bean, providerTypeName, baseName, Collections.emptyMap(),
+        implementCreate(classOutput, beanCreator, bean, providerType, baseName,
+                Collections.emptyMap(),
                 Collections.emptyMap(), reflectionRegistration,
                 targetPackage, isApplicationClass);
-        implementGet(bean, beanCreator, providerTypeName, baseName);
+        implementGet(bean, beanCreator, providerType, baseName);
 
         implementGetTypes(beanCreator, beanTypes.getFieldDescriptor());
         if (!BuiltinScope.isDefault(bean.getScope())) {
@@ -512,6 +517,8 @@ Collection<Resource> generateProducerFieldBean(BeanInfo bean, FieldInfo producer
             implementIsDefaultBean(bean, beanCreator);
         }
         implementGetKind(beanCreator, InjectableBean.Kind.PRODUCER_FIELD);
+        implementEquals(bean, beanCreator);
+        implementHashCode(bean, beanCreator);
 
         beanCreator.close();
         return classOutput.getResources();
@@ -715,11 +722,12 @@ protected MethodCreator initConstructor(ClassOutput classOutput, ClassCreator be
         return constructor;
     }
 
-    protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, String providerTypeName,
+    protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, ProviderType providerType,
             Map<InjectionPointInfo, String> injectionPointToProviderField, ReflectionRegistration reflectionRegistration,
             boolean isApplicationClass, String baseName) {
 
-        MethodCreator destroy = beanCreator.getMethodCreator("destroy", void.class, providerTypeName, CreationalContext.class)
+        MethodCreator destroy = beanCreator
+                .getMethodCreator("destroy", void.class, providerType.descriptorName(), CreationalContext.class)
                 .setModifiers(ACC_PUBLIC);
 
         if (bean.isClassBean()) {
@@ -736,7 +744,7 @@ protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, String
                 // PreDestroy callbacks
                 List<MethodInfo> preDestroyCallbacks = Beans.getCallbacks(bean.getTarget().get().asClass(),
                         DotNames.PRE_DESTROY,
-                        bean.getDeployment().getIndex());
+                        bean.getDeployment().getBeanArchiveIndex());
                 for (MethodInfo callback : preDestroyCallbacks) {
                     if (Modifier.isPrivate(callback.flags())) {
                         privateMembers.add(isApplicationClass, String.format("@PreDestroy callback %s#%s()",
@@ -846,25 +854,25 @@ protected void implementDestroy(BeanInfo bean, ClassCreator beanCreator, String
                 bridgeDestroy.getMethodParam(1)));
     }
 
-    protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean, String providerTypeName,
+    protected void implementCreate(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean, ProviderType providerType,
             String baseName,
             Map<InjectionPointInfo, String> injectionPointToProviderSupplierField,
             Map<InterceptorInfo, String> interceptorToProviderSupplierField,
             ReflectionRegistration reflectionRegistration, String targetPackage, boolean isApplicationClass) {
 
-        MethodCreator create = beanCreator.getMethodCreator("create", providerTypeName, CreationalContext.class)
+        MethodCreator create = beanCreator.getMethodCreator("create", providerType.descriptorName(), CreationalContext.class)
                 .setModifiers(ACC_PUBLIC);
 
         if (bean.isClassBean()) {
-            implementCreateForClassBean(classOutput, beanCreator, bean, providerTypeName, baseName,
+            implementCreateForClassBean(classOutput, beanCreator, bean, providerType, baseName,
                     injectionPointToProviderSupplierField, interceptorToProviderSupplierField, reflectionRegistration,
                     targetPackage, isApplicationClass, create);
         } else if (bean.isProducerMethod()) {
-            implementCreateForProducerMethod(classOutput, beanCreator, bean, providerTypeName, baseName,
+            implementCreateForProducerMethod(classOutput, beanCreator, bean, providerType, baseName,
                     injectionPointToProviderSupplierField, interceptorToProviderSupplierField, reflectionRegistration,
                     targetPackage, isApplicationClass, create);
         } else if (bean.isProducerField()) {
-            implementCreateForProducerField(classOutput, beanCreator, bean, providerTypeName, baseName,
+            implementCreateForProducerField(classOutput, beanCreator, bean, providerType, baseName,
                     injectionPointToProviderSupplierField, interceptorToProviderSupplierField, reflectionRegistration,
                     targetPackage, isApplicationClass, create);
         } else if (bean.isSynthetic()) {
@@ -982,7 +990,7 @@ private ResultHandle newInstanceHandle(BeanInfo bean, ClassCreator beanCreator,
                 String[] paramTypes = new String[injectionPoints.size()];
                 for (ListIterator<InjectionPointInfo> iterator = injectionPoints.listIterator(); iterator.hasNext();) {
                     InjectionPointInfo injectionPoint = iterator.next();
-                    paramTypes[iterator.previousIndex()] = injectionPoint.getRequiredType().name().toString();
+                    paramTypes[iterator.previousIndex()] = DescriptorUtils.typeToString(injectionPoint.getRequiredType());
                 }
                 return creator.newInstance(MethodDescriptor.ofConstructor(providerTypeName, paramTypes),
                         providerHandles.toArray(new ResultHandle[0]));
@@ -1007,11 +1015,11 @@ private ResultHandle newInstanceHandle(BeanInfo bean, ClassCreator beanCreator,
     }
 
     void implementCreateForProducerField(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean,
-            String providerTypeName, String baseName, Map<InjectionPointInfo, String> injectionPointToProviderSupplierField,
+            ProviderType providerType, String baseName, Map<InjectionPointInfo, String> injectionPointToProviderSupplierField,
             Map<InterceptorInfo, String> interceptorToProviderSupplierField, ReflectionRegistration reflectionRegistration,
             String targetPackage, boolean isApplicationClass, MethodCreator create) {
 
-        AssignableResultHandle instanceHandle = create.createVariable(DescriptorUtils.extToInt(providerTypeName));
+        AssignableResultHandle instanceHandle = create.createVariable(DescriptorUtils.extToInt(providerType.className()));
         // instance = declaringProviderSupplier.get().get(new CreationalContextImpl<>()).field
 
         FieldInfo producerField = bean.getTarget().get().asField();
@@ -1073,15 +1081,14 @@ void implementCreateForProducerField(ClassOutput classOutput, ClassCreator beanC
     }
 
     void implementCreateForProducerMethod(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean,
-            String providerTypeName,
-            String baseName, Map<InjectionPointInfo, String> injectionPointToProviderSupplierField,
+            ProviderType providerType, String baseName, Map<InjectionPointInfo, String> injectionPointToProviderSupplierField,
             Map<InterceptorInfo, String> interceptorToProviderSupplierField, ReflectionRegistration reflectionRegistration,
             String targetPackage, boolean isApplicationClass, MethodCreator create) {
 
         AssignableResultHandle instanceHandle;
 
         MethodInfo producerMethod = bean.getTarget().get().asMethod();
-        instanceHandle = create.createVariable(DescriptorUtils.extToInt(providerTypeName));
+        instanceHandle = create.createVariable(DescriptorUtils.extToInt(providerType.className()));
         // instance = declaringProviderSupplier.get().get(new CreationalContextImpl<>()).produce()
         ResultHandle ctxHandle = create.newInstance(
                 MethodDescriptor.ofConstructor(CreationalContextImpl.class, Contextual.class), create.getThis());
@@ -1174,7 +1181,8 @@ void implementCreateForProducerMethod(ClassOutput classOutput, ClassCreator bean
         create.returnValue(instanceHandle);
     }
 
-    void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean, String providerTypeName,
+    void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean,
+            ProviderType providerType,
             String baseName, Map<InjectionPointInfo, String> injectionPointToProviderSupplierField,
             Map<InterceptorInfo, String> interceptorToProviderSupplierField,
             ReflectionRegistration reflectionRegistration, String targetPackage, boolean isApplicationClass,
@@ -1274,7 +1282,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
 
         // AroundConstruct lifecycle callback interceptors
         InterceptionInfo aroundConstructs = bean.getLifecycleInterceptors(InterceptionType.AROUND_CONSTRUCT);
-        instanceHandle = create.createVariable(DescriptorUtils.extToInt(providerTypeName));
+        instanceHandle = create.createVariable(DescriptorUtils.extToInt(providerType.className()));
         if (!aroundConstructs.isEmpty()) {
             Optional<Injection> constructorInjection = bean.getConstructorInjection();
             ResultHandle constructorHandle;
@@ -1284,7 +1292,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
                     paramTypes.add(injectionPoint.getRequiredType().name().toString());
                 }
                 ResultHandle[] paramsHandles = new ResultHandle[2];
-                paramsHandles[0] = create.loadClass(providerTypeName);
+                paramsHandles[0] = create.loadClass(providerType.className());
                 ResultHandle paramsArray = create.newArray(Class.class, create.load(paramTypes.size()));
                 for (ListIterator<String> iterator = paramTypes.listIterator(); iterator.hasNext();) {
                     create.writeArrayValue(paramsArray, iterator.nextIndex(), create.loadClass(iterator.next()));
@@ -1296,7 +1304,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
             } else {
                 // constructor = Reflections.findConstructor(Foo.class)
                 ResultHandle[] paramsHandles = new ResultHandle[2];
-                paramsHandles[0] = create.loadClass(providerTypeName);
+                paramsHandles[0] = create.loadClass(providerType.className());
                 paramsHandles[1] = create.newArray(Class.class, create.load(0));
                 constructorHandle = create.invokeStaticMethod(MethodDescriptors.REFLECTIONS_FIND_CONSTRUCTOR,
                         paramsHandles);
@@ -1313,7 +1321,8 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
             // Supplier<Object> forward = () -> new SimpleBean_Subclass(ctx,lifecycleInterceptorProvider1)
             FunctionCreator func = create.createFunction(Supplier.class);
             BytecodeCreator funcBytecode = func.getBytecode();
-            ResultHandle retHandle = newInstanceHandle(bean, beanCreator, funcBytecode, create, providerTypeName, baseName,
+            ResultHandle retHandle = newInstanceHandle(bean, beanCreator, funcBytecode, create, providerType.className(),
+                    baseName,
                     providerHandles,
                     reflectionRegistration, isApplicationClass);
             // Destroy injected transient references
@@ -1347,11 +1356,12 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
 
         } else {
             List<TransientReference> transientReferences = new ArrayList<>();
-            create.assign(instanceHandle, newInstanceHandle(bean, beanCreator, create, create, providerTypeName, baseName,
-                    newProviderHandles(bean, beanCreator, create, injectionPointToProviderSupplierField,
-                            interceptorToProviderSupplierField,
-                            interceptorToWrap, transientReferences),
-                    reflectionRegistration, isApplicationClass));
+            create.assign(instanceHandle,
+                    newInstanceHandle(bean, beanCreator, create, create, providerType.className(), baseName,
+                            newProviderHandles(bean, beanCreator, create, injectionPointToProviderSupplierField,
+                                    interceptorToProviderSupplierField,
+                                    interceptorToWrap, transientReferences),
+                            reflectionRegistration, isApplicationClass));
             // Destroy injected transient references
             destroyTransientReferences(create, transientReferences);
         }
@@ -1384,10 +1394,9 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
 
             } else {
                 // We cannot use injectionPoint.getRequiredType() because it might be a resolved parameterize type and we could get NoSuchFieldError
-                String fieldType = injectionPoint.getTarget().asField().type().name().toString();
                 tryBlock.writeInstanceField(
-                        FieldDescriptor.of(providerTypeName, injectedField.name(),
-                                fieldType),
+                        FieldDescriptor.of(injectedField.declaringClass().name().toString(), injectedField.name(),
+                                DescriptorUtils.typeToString(injectionPoint.getTarget().asField().type())),
                         instanceHandle, referenceHandle);
             }
             CatchBlockCreator catchBlock = tryBlock.addCatch(RuntimeException.class);
@@ -1477,7 +1486,7 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
         if (!bean.isInterceptor()) {
             List<MethodInfo> postConstructCallbacks = Beans.getCallbacks(bean.getTarget().get().asClass(),
                     DotNames.POST_CONSTRUCT,
-                    bean.getDeployment().getIndex());
+                    bean.getDeployment().getBeanArchiveIndex());
             for (MethodInfo callback : postConstructCallbacks) {
                 if (isReflectionFallbackNeeded(callback, targetPackage)) {
                     if (Modifier.isPrivate(callback.flags())) {
@@ -1498,22 +1507,16 @@ void implementCreateForClassBean(ClassOutput classOutput, ClassCreator beanCreat
         create.returnValue(instanceHandle);
     }
 
-    /**
-     *
-     * @param bean
-     * @param beanCreator
-     * @param providerTypeName
-     * @see InjectableReferenceProvider#get(CreationalContext)
-     */
-    protected void implementGet(BeanInfo bean, ClassCreator beanCreator, String providerTypeName, String baseName) {
+    protected void implementGet(BeanInfo bean, ClassCreator beanCreator, ProviderType providerType, String baseName) {
 
-        MethodCreator get = beanCreator.getMethodCreator("get", providerTypeName, CreationalContext.class)
+        MethodCreator get = beanCreator.getMethodCreator("get", providerType.descriptorName(), CreationalContext.class)
                 .setModifiers(ACC_PUBLIC);
 
         if (BuiltinScope.DEPENDENT.is(bean.getScope())) {
             // Foo instance = create(ctx)
             ResultHandle instance = get.invokeVirtualMethod(
-                    MethodDescriptor.ofMethod(beanCreator.getClassName(), "create", providerTypeName, CreationalContext.class),
+                    MethodDescriptor.ofMethod(beanCreator.getClassName(), "create", providerType.descriptorName(),
+                            CreationalContext.class),
                     get.getThis(),
                     get.getMethodParam(0));
 
@@ -1525,7 +1528,7 @@ protected void implementGet(BeanInfo bean, ClassCreator beanCreator, String prov
                 canBeOptimized = bean.getLifecycleInterceptors(InterceptionType.PRE_DESTROY).isEmpty()
                         && Beans.getCallbacks(bean.getTarget().get().asClass(),
                                 DotNames.PRE_DESTROY,
-                                bean.getDeployment().getIndex()).isEmpty();
+                                bean.getDeployment().getBeanArchiveIndex()).isEmpty();
             } else if (bean.isProducerMethod() || bean.isProducerField()) {
                 canBeOptimized = bean.getDisposer() == null;
             }
@@ -1561,7 +1564,8 @@ protected void implementGet(BeanInfo bean, ClassCreator beanCreator, String prov
                     get.getThis()));
         } else {
             ResultHandle instance = get.invokeVirtualMethod(
-                    MethodDescriptor.ofMethod(beanCreator.getClassName(), "create", providerTypeName, CreationalContext.class),
+                    MethodDescriptor.ofMethod(beanCreator.getClassName(), "create", providerType.descriptorName(),
+                            CreationalContext.class),
                     get.getThis(),
                     get.getMethodParam(0));
             get.returnValue(instance);
@@ -1606,6 +1610,35 @@ protected void implementGetIdentifier(BeanInfo bean, ClassCreator beanCreator) {
         getScope.returnValue(getScope.load(bean.getIdentifier()));
     }
 
+    protected void implementEquals(BeanInfo bean, ClassCreator beanCreator) {
+        MethodCreator equals = beanCreator.getMethodCreator("equals", boolean.class, Object.class).setModifiers(ACC_PUBLIC);
+        // if (this == obj) {
+        //    return true;
+        // }
+        equals.ifTrue(equals.invokeStaticMethod(MethodDescriptors.OBJECTS_REFERENCE_EQUALS, equals.getThis(),
+                equals.getMethodParam(0))).trueBranch().returnValue(equals.load(true));
+        // if (obj == null) {
+        //    return false;
+        // }
+        equals.ifNull(equals.getMethodParam(0)).trueBranch().returnValue(equals.load(false));
+        // if (!(obj instanceof InjectableBean)) {
+        //    return false;
+        // }
+        equals.ifFalse(equals.instanceOf(equals.getMethodParam(0), InjectableBean.class)).trueBranch()
+                .returnValue(equals.load(false));
+        // return identifier.equals(((InjectableBean) obj).getIdentifier());
+        ResultHandle injectableBean = equals.checkCast(equals.getMethodParam(0), InjectableBean.class);
+        ResultHandle otherIdentifier = equals.invokeInterfaceMethod(MethodDescriptors.GET_IDENTIFIER, injectableBean);
+        equals.returnValue(equals.invokeVirtualMethod(MethodDescriptors.OBJECT_EQUALS, equals.load(bean.getIdentifier()),
+                otherIdentifier));
+    }
+
+    protected void implementHashCode(BeanInfo bean, ClassCreator beanCreator) {
+        MethodCreator hashCode = beanCreator.getMethodCreator("hashCode", int.class).setModifiers(ACC_PUBLIC);
+        final ResultHandle constantHashCodeResult = hashCode.load(bean.getIdentifier().hashCode());
+        hashCode.returnValue(constantHashCodeResult);
+    }
+
     /**
      *
      * @param bean
@@ -1674,7 +1707,14 @@ protected void implementSupplierGet(ClassCreator beanCreator) {
     }
 
     private String getProxyTypeName(BeanInfo bean, String baseName) {
-        return getPackageName(bean) + "." + baseName + ClientProxyGenerator.CLIENT_PROXY_SUFFIX;
+        StringBuilder proxyTypeName = new StringBuilder();
+        proxyTypeName.append(getPackageName(bean));
+        if (proxyTypeName.length() > 0) {
+            proxyTypeName.append(".");
+        }
+        proxyTypeName.append(baseName);
+        proxyTypeName.append(ClientProxyGenerator.CLIENT_PROXY_SUFFIX);
+        return proxyTypeName.toString();
     }
 
     private ResultHandle wrapCurrentInjectionPoint(ClassOutput classOutput, ClassCreator beanCreator, BeanInfo bean,
@@ -1781,7 +1821,7 @@ static ResultHandle collectInjectionPointAnnotations(ClassOutput classOutput, Cl
                         .readStaticField(FieldDescriptor.of(InjectLiteral.class, "INSTANCE", InjectLiteral.class));
             } else {
                 // Create annotation literal if needed
-                ClassInfo literalClass = getClassByName(beanDeployment.getIndex(), annotation.name());
+                ClassInfo literalClass = getClassByName(beanDeployment.getBeanArchiveIndex(), annotation.name());
                 annotationHandle = annotationLiterals.process(constructor,
                         classOutput, literalClass, annotation,
                         Types.getPackageName(beanCreator.getClassName()));
@@ -1840,4 +1880,38 @@ public TransientReference(ResultHandle provider, ResultHandle contextualInstance
 
     }
 
+    /**
+     * 
+     * @see InjectableReferenceProvider
+     */
+    static final class ProviderType {
+
+        private final Type type;
+
+        public ProviderType(Type type) {
+            this.type = type;
+        }
+
+        DotName name() {
+            return type.name();
+        }
+
+        /**
+         * 
+         * @return the class name, e.g. {@code org.acme.Foo}
+         */
+        String className() {
+            return type.name().toString();
+        }
+
+        /**
+         * 
+         * @return the name used in JVM descriptors, e.g. {@code Lorg/acme/Foo;}
+         */
+        String descriptorName() {
+            return DescriptorUtils.typeToString(type);
+        }
+
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
index 46958c80e3285..e4db190374e42 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
@@ -29,8 +29,7 @@
 import org.jboss.jandex.Type;
 
 /**
- *
- * @author Martin Kouba
+ * Represents a CDI bean at build time.
  */
 public class BeanInfo implements InjectionTargetInfo {
 
@@ -205,7 +204,7 @@ BeanDeployment getDeployment() {
         return beanDeployment;
     }
 
-    Type getProviderType() {
+    public Type getProviderType() {
         return providerType;
     }
 
@@ -281,7 +280,8 @@ boolean hasDefaultDestroy() {
         }
         if (isClassBean()) {
             return getLifecycleInterceptors(InterceptionType.PRE_DESTROY).isEmpty()
-                    && Beans.getCallbacks(target.get().asClass(), DotNames.PRE_DESTROY, beanDeployment.getIndex()).isEmpty();
+                    && Beans.getCallbacks(target.get().asClass(), DotNames.PRE_DESTROY, beanDeployment.getBeanArchiveIndex())
+                            .isEmpty();
         } else {
             return disposer == null && destroyerConsumer == null;
         }
@@ -338,6 +338,22 @@ public boolean isDefaultBean() {
         return defaultBean;
     }
 
+    /**
+     * @param requiredType
+     * @param requiredQualifiers
+     * @return {@code true} if this bean is assignable to the required type and qualifiers
+     */
+    public boolean isAssignableTo(Type requiredType, AnnotationInstance... requiredQualifiers) {
+        Set<AnnotationInstance> qualifiers;
+        if (requiredQualifiers.length == 0) {
+            qualifiers = Collections.emptySet();
+        } else {
+            qualifiers = new HashSet<>();
+            Collections.addAll(qualifiers, requiredQualifiers);
+        }
+        return Beans.matches(this, requiredType, qualifiers);
+    }
+
     Consumer<MethodCreator> getCreatorConsumer() {
         return creatorConsumer;
     }
@@ -351,8 +367,8 @@ Map<String, Object> getParams() {
     }
 
     void validate(List<Throwable> errors, List<BeanDeploymentValidator> validators,
-            Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
-        Beans.validateBean(this, errors, validators, bytecodeTransformerConsumer);
+            Consumer<BytecodeTransformer> bytecodeTransformerConsumer, Set<DotName> classesReceivingNoArgsCtor) {
+        Beans.validateBean(this, errors, validators, bytecodeTransformerConsumer, classesReceivingNoArgsCtor);
     }
 
     void init(List<Throwable> errors, Consumer<BytecodeTransformer> bytecodeTransformerConsumer,
@@ -450,9 +466,9 @@ private void addClassLevelBindings(ClassInfo classInfo, Collection<AnnotationIns
         beanDeployment.getAnnotations(classInfo).stream()
                 .filter(a -> beanDeployment.getInterceptorBinding(a.name()) != null
                         && bindings.stream().noneMatch(e -> e.name().equals(a.name())))
-                .forEach(a -> bindings.add(a));
+                .forEach(bindings::add);
         if (classInfo.superClassType() != null && !classInfo.superClassType().name().equals(DotNames.OBJECT)) {
-            ClassInfo superClass = getClassByName(beanDeployment.getIndex(), classInfo.superName());
+            ClassInfo superClass = getClassByName(beanDeployment.getBeanArchiveIndex(), classInfo.superName());
             if (superClass != null) {
                 addClassLevelBindings(superClass, bindings);
             }
@@ -469,9 +485,8 @@ private void addConstructorLevelBindings(ClassInfo classInfo, Collection<Annotat
         }
         if (constructor != null) {
             beanDeployment.getAnnotations(constructor).stream()
-                    .filter(a -> beanDeployment.getInterceptorBinding(a.name()) != null
-                            && bindings.stream().noneMatch(e -> e.name().equals(a.name())))
-                    .forEach(a -> bindings.add(a));
+                    .flatMap(a -> beanDeployment.extractInterceptorBindings(a).stream())
+                    .forEach(bindings::add);
         }
     }
 
@@ -495,7 +510,7 @@ public String toString() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(identifier);
+        return identifier.hashCode();
     }
 
     @Override
@@ -536,9 +551,9 @@ private ClassInfo initImplClazz(AnnotationTarget target, BeanDeployment beanDepl
             case CLASS:
                 return target.asClass();
             case FIELD:
-                return getClassByName(beanDeployment.getIndex(), target.asField().type());
+                return getClassByName(beanDeployment.getBeanArchiveIndex(), target.asField().type());
             case METHOD:
-                return getClassByName(beanDeployment.getIndex(), target.asMethod().returnType());
+                return getClassByName(beanDeployment.getBeanArchiveIndex(), target.asMethod().returnType());
             default:
                 break;
         }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java
index 1b6a56b256da9..30d4a75803262 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanProcessor.java
@@ -34,6 +34,7 @@
  *
  * <ol>
  * <li>{@link #registerCustomContexts()}</li>
+ * <li>{@link #registerScopes()}</li>
  * <li>{@link #registerBeans()}</li>
  * <li>{@link #initialize(Consumer)}</li>
  * <li>{@link #validate(Consumer)}</li>
@@ -84,13 +85,13 @@ private BeanProcessor(Builder builder) {
 
         // Initialize all build processors
         buildContext = new BuildContextImpl();
-        buildContext.putInternal(Key.INDEX.asString(), builder.index);
+        buildContext.putInternal(Key.INDEX.asString(), builder.beanArchiveIndex);
 
         this.beanRegistrars = initAndSort(builder.beanRegistrars, buildContext);
         this.observerRegistrars = initAndSort(builder.observerRegistrars, buildContext);
         this.contextRegistrars = initAndSort(builder.contextRegistrars, buildContext);
         this.beanDeploymentValidators = initAndSort(builder.beanDeploymentValidators, buildContext);
-        this.beanDeployment = new BeanDeployment(builder.index, buildContext, builder);
+        this.beanDeployment = new BeanDeployment(buildContext, builder);
 
         // Make it configurable if we find that the set of annotations needs to grow
         this.injectionPointAnnotationsPredicate = annotationName -> !annotationName.equals(DotNames.DEPRECATED);
@@ -100,6 +101,10 @@ public ContextRegistrar.RegistrationContext registerCustomContexts() {
         return beanDeployment.registerCustomContexts(contextRegistrars);
     }
 
+    public void registerScopes() {
+        beanDeployment.registerScopes();
+    }
+
     /**
      * Analyze the deployment and register all beans and observers declared on the classes. Furthermore, register all synthetic
      * beans provided by bean registrars.
@@ -117,9 +122,11 @@ public ObserverRegistrar.RegistrationContext registerSyntheticObservers() {
     /**
      *
      * @param bytecodeTransformerConsumer Used to register a bytecode transformation
+     * @param additionalUnusedBeanExclusions Additional predicates to exclude unused beans
      */
-    public void initialize(Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
-        beanDeployment.init(bytecodeTransformerConsumer);
+    public void initialize(Consumer<BytecodeTransformer> bytecodeTransformerConsumer,
+            List<Predicate<BeanInfo>> additionalUnusedBeanExclusions) {
+        beanDeployment.init(bytecodeTransformerConsumer, additionalUnusedBeanExclusions);
     }
 
     /**
@@ -136,7 +143,7 @@ public void processValidationErrors(BeanDeploymentValidator.ValidationContext va
     }
 
     public List<Resource> generateResources(ReflectionRegistration reflectionRegistration, Set<String> existingClasses,
-            Consumer<BytecodeTransformer> bytecodeTransformerConsumer)
+            Consumer<BytecodeTransformer> bytecodeTransformerConsumer, boolean detectUnusedFalsePositives)
             throws IOException {
         if (reflectionRegistration == null) {
             reflectionRegistration = this.reflectionRegistration;
@@ -157,7 +164,7 @@ public List<Resource> generateResources(ReflectionRegistration reflectionRegistr
                 generateSources, reflectionRegistration, existingClasses);
         ObserverGenerator observerGenerator = new ObserverGenerator(annotationLiterals, applicationClassPredicate,
                 privateMembers, generateSources, reflectionRegistration, existingClasses, observerToGeneratedName,
-                injectionPointAnnotationsPredicate);
+                injectionPointAnnotationsPredicate, allowMocking);
         AnnotationLiteralGenerator annotationLiteralsGenerator = new AnnotationLiteralGenerator(generateSources);
 
         List<Resource> resources = new ArrayList<>();
@@ -199,7 +206,8 @@ public List<Resource> generateResources(ReflectionRegistration reflectionRegistr
 
         // Generate _ComponentsProvider
         resources.addAll(
-                new ComponentsProviderGenerator(annotationLiterals, generateSources).generate(name, beanDeployment,
+                new ComponentsProviderGenerator(annotationLiterals, generateSources, detectUnusedFalsePositives).generate(name,
+                        beanDeployment,
                         beanToGeneratedName,
                         observerToGeneratedName));
 
@@ -233,64 +241,108 @@ public void accept(BytecodeTransformer transformer) {
             }
         };
         registerCustomContexts();
+        registerScopes();
         registerBeans();
         registerSyntheticObservers();
-        initialize(unsupportedBytecodeTransformer);
+        initialize(unsupportedBytecodeTransformer, Collections.emptyList());
         ValidationContext validationContext = validate(unsupportedBytecodeTransformer);
         processValidationErrors(validationContext);
-        generateResources(null, new HashSet<>(), unsupportedBytecodeTransformer);
+        generateResources(null, new HashSet<>(), unsupportedBytecodeTransformer, true);
         return beanDeployment;
     }
 
     public static class Builder {
 
-        String name = DEFAULT_NAME;
+        String name;
+        IndexView beanArchiveIndex;
+        IndexView applicationIndex;
+        Collection<BeanDefiningAnnotation> additionalBeanDefiningAnnotations;
+        Map<DotName, Collection<AnnotationInstance>> additionalStereotypes;
+        ResourceOutput output;
+        boolean sharedAnnotationLiterals;
+        ReflectionRegistration reflectionRegistration;
+
+        final List<DotName> resourceAnnotations;
+        final List<AnnotationsTransformer> annotationTransformers;
+        final List<InjectionPointsTransformer> injectionPointTransformers;
+        final List<ObserverTransformer> observerTransformers;
+        final List<BeanRegistrar> beanRegistrars;
+        final List<ObserverRegistrar> observerRegistrars;
+        final List<ContextRegistrar> contextRegistrars;
+        final List<QualifierRegistrar> qualifierRegistrars;
+        final List<InterceptorBindingRegistrar> interceptorBindingRegistrars;
+        final List<BeanDeploymentValidator> beanDeploymentValidators;
 
-        IndexView index;
+        boolean removeUnusedBeans = false;
+        final List<Predicate<BeanInfo>> removalExclusions;
 
-        Collection<BeanDefiningAnnotation> additionalBeanDefiningAnnotations = Collections.emptySet();
-        Map<DotName, Collection<AnnotationInstance>> additionalStereotypes = Collections.emptyMap();
+        boolean generateSources;
+        boolean jtaCapabilities;
+        boolean transformUnproxyableClasses;
+        boolean allowMocking;
 
-        ResourceOutput output;
+        AlternativePriorities alternativePriorities;
+        final List<Predicate<ClassInfo>> excludeTypes;
 
-        boolean sharedAnnotationLiterals = true;
-        ReflectionRegistration reflectionRegistration = ReflectionRegistration.NOOP;
+        Predicate<DotName> applicationClassPredicate;
 
-        final List<DotName> resourceAnnotations = new ArrayList<>();
-        final List<AnnotationsTransformer> annotationTransformers = new ArrayList<>();
-        final List<InjectionPointsTransformer> injectionPointTransformers = new ArrayList<>();
-        final List<ObserverTransformer> observerTransformers = new ArrayList<>();
-        final List<BeanRegistrar> beanRegistrars = new ArrayList<>();
-        final List<ObserverRegistrar> observerRegistrars = new ArrayList<>();
-        final List<ContextRegistrar> contextRegistrars = new ArrayList<>();
-        final List<InterceptorBindingRegistrar> additionalInterceptorBindingRegistrars = new ArrayList<>();
-        final List<BeanDeploymentValidator> beanDeploymentValidators = new ArrayList<>();
+        public Builder() {
+            name = DEFAULT_NAME;
+            additionalBeanDefiningAnnotations = Collections.emptySet();
+            additionalStereotypes = Collections.emptyMap();
+            sharedAnnotationLiterals = true;
+            reflectionRegistration = ReflectionRegistration.NOOP;
+            resourceAnnotations = new ArrayList<>();
+            annotationTransformers = new ArrayList<>();
+            injectionPointTransformers = new ArrayList<>();
+            observerTransformers = new ArrayList<>();
+            beanRegistrars = new ArrayList<>();
+            observerRegistrars = new ArrayList<>();
+            contextRegistrars = new ArrayList<>();
+            qualifierRegistrars = new ArrayList<>();
+            interceptorBindingRegistrars = new ArrayList<>();
+            beanDeploymentValidators = new ArrayList<>();
 
-        boolean removeUnusedBeans = false;
-        final List<Predicate<BeanInfo>> removalExclusions = new ArrayList<>();
+            removeUnusedBeans = false;
+            removalExclusions = new ArrayList<>();
 
-        boolean generateSources = false;
-        boolean jtaCapabilities = false;
-        boolean transformUnproxyableClasses = false;
-        boolean allowMocking = false;
+            generateSources = false;
+            jtaCapabilities = false;
+            transformUnproxyableClasses = false;
+            allowMocking = false;
 
-        AlternativePriorities alternativePriorities;
-        List<Predicate<ClassInfo>> excludeTypes = new ArrayList<>();
+            excludeTypes = new ArrayList<>();
 
-        private Predicate<DotName> applicationClassPredicate = new Predicate<DotName>() {
-            @Override
-            public boolean test(DotName dotName) {
-                return true;
-            }
-        };
+            applicationClassPredicate = dn -> true;
+        }
 
         public Builder setName(String name) {
             this.name = name;
             return this;
         }
 
-        public Builder setIndex(IndexView index) {
-            this.index = index;
+        /**
+         * Set the bean archive index. This index is mandatory and is used to discover components (beans, interceptors,
+         * qualifiers, etc.) and during type-safe resolution.
+         * 
+         * @param beanArchiveIndex
+         * @return self
+         */
+        public Builder setBeanArchiveIndex(IndexView beanArchiveIndex) {
+            this.beanArchiveIndex = beanArchiveIndex;
+            return this;
+        }
+
+        /**
+         * Set the application index. This index is optional and is also used to discover types during type-safe resolution.
+         * <p>
+         * Some types may not be part of the bean archive index but are still needed during type-safe resolution.
+         * 
+         * @param applicationIndex
+         * @return self
+         */
+        public Builder setApplicationIndex(IndexView applicationIndex) {
+            this.applicationIndex = applicationIndex;
             return this;
         }
 
@@ -307,8 +359,13 @@ public Builder setAdditionalStereotypes(Map<DotName, Collection<AnnotationInstan
             return this;
         }
 
-        public Builder addInterceptorbindingRegistrar(InterceptorBindingRegistrar bindingRegistrar) {
-            this.additionalInterceptorBindingRegistrars.add(bindingRegistrar);
+        public Builder addQualifierRegistrar(QualifierRegistrar qualifierRegistrar) {
+            this.qualifierRegistrars.add(qualifierRegistrar);
+            return this;
+        }
+
+        public Builder addInterceptorBindingRegistrar(InterceptorBindingRegistrar bindingRegistrar) {
+            this.interceptorBindingRegistrars.add(bindingRegistrar);
             return this;
         }
 
@@ -396,7 +453,7 @@ public void setAllowMocking(boolean allowMocking) {
          * </ul>
          *
          * @param removeUnusedBeans
-         * @return
+         * @return self
          */
         public Builder setRemoveUnusedBeans(boolean removeUnusedBeans) {
             this.removeUnusedBeans = removeUnusedBeans;
@@ -404,13 +461,14 @@ public Builder setRemoveUnusedBeans(boolean removeUnusedBeans) {
         }
 
         /**
+         * Exclude unused beans that match the given predicate from removal.
          *
-         * @param exclusion
+         * @param predicate
          * @return self
          * @see #setRemoveUnusedBeans(boolean)
          */
-        public Builder addRemovalExclusion(Predicate<BeanInfo> exclusion) {
-            this.removalExclusions.add(exclusion);
+        public Builder addRemovalExclusion(Predicate<BeanInfo> predicate) {
+            this.removalExclusions.add(predicate);
             return this;
         }
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java
index 03c0ad2366ff0..53c0057364a16 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanRegistrar.java
@@ -3,7 +3,7 @@
 import org.jboss.jandex.DotName;
 
 /**
- * Allows a build-time extension to register synthetic beans and observers.
+ * Allows a build-time extension to register synthetic beans.
  *
  * @author Martin Kouba
  */
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java
index debc15a8f725e..171b28a69d3b0 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolver.java
@@ -1,308 +1,33 @@
 package io.quarkus.arc.processor;
 
-import static java.util.Collections.singletonList;
-import static org.jboss.jandex.Type.Kind.ARRAY;
-import static org.jboss.jandex.Type.Kind.CLASS;
-import static org.jboss.jandex.Type.Kind.PARAMETERIZED_TYPE;
-import static org.jboss.jandex.Type.Kind.TYPE_VARIABLE;
-import static org.jboss.jandex.Type.Kind.WILDCARD_TYPE;
-
-import io.quarkus.arc.processor.InjectionPointInfo.TypeAndQualifiers;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
-import org.jboss.jandex.ClassInfo;
-import org.jboss.jandex.ClassType;
-import org.jboss.jandex.DotName;
+import javax.enterprise.inject.AmbiguousResolutionException;
+import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.Type;
-import org.jboss.jandex.Type.Kind;
-import org.jboss.jandex.TypeVariable;
-import org.jboss.jandex.WildcardType;
 
 /**
- *
- * @author Martin Kouba
+ * Implements type-safe resolution rules.
  */
-class BeanResolver {
-
-    private final BeanDeployment beanDeployment;
-
-    private final ConcurrentMap<DotName, Set<DotName>> assignableFromMap;
-
-    private final Function<DotName, Set<DotName>> assignableFromMapFunction;
-
-    private final Map<TypeAndQualifiers, List<BeanInfo>> resolved;
-
-    public BeanResolver(BeanDeployment beanDeployment) {
-        this.beanDeployment = beanDeployment;
-        this.assignableFromMap = new ConcurrentHashMap<>();
-        this.assignableFromMapFunction = name -> {
-            Set<DotName> assignables = new HashSet<>();
-            Collection<ClassInfo> subclasses = beanDeployment.getIndex().getAllKnownSubclasses(name);
-            for (ClassInfo subclass : subclasses) {
-                assignables.add(subclass.name());
-            }
-            Collection<ClassInfo> implementors = beanDeployment.getIndex().getAllKnownImplementors(name);
-            for (ClassInfo implementor : implementors) {
-                assignables.add(implementor.name());
-            }
-            return assignables;
-        };
-        this.resolved = new ConcurrentHashMap<>();
-    }
-
-    List<BeanInfo> resolve(TypeAndQualifiers typeAndQualifiers) {
-        return resolved.computeIfAbsent(typeAndQualifiers, this::findMatching);
-    }
-
-    private List<BeanInfo> findMatching(TypeAndQualifiers typeAndQualifiers) {
-        List<BeanInfo> resolved = new ArrayList<>();
-        for (BeanInfo b : beanDeployment.getBeans()) {
-            if (Beans.matches(b, typeAndQualifiers)) {
-                resolved.add(b);
-            }
-        }
-        return resolved.isEmpty() ? Collections.emptyList() : resolved;
-    }
-
-    List<BeanInfo> findTypeMatching(Type type) {
-        List<BeanInfo> resolved = new ArrayList<>();
-        for (BeanInfo b : beanDeployment.getBeans()) {
-            if (Beans.matchesType(b, type)) {
-                resolved.add(b);
-            }
-        }
-        return resolved.isEmpty() ? Collections.emptyList() : resolved;
-    }
-
-    boolean matches(Type requiredType, Type beanType) {
-        return matchesNoBoxing(Types.box(requiredType), Types.box(beanType));
-    }
-
-    boolean matchesNoBoxing(Type requiredType, Type beanType) {
-        if (requiredType == beanType) {
-            return true;
-        }
-
-        if (ARRAY.equals(requiredType.kind())) {
-            if (ARRAY.equals(beanType.kind())) {
-                // Array types are considered to match only if their element types are identical
-                return matchesNoBoxing(requiredType.asArrayType().component(), beanType.asArrayType().component());
-            }
-        } else if (CLASS.equals(requiredType.kind())) {
-            if (CLASS.equals(beanType.kind())) {
-                return requiredType.name().equals(beanType.name());
-            } else if (PARAMETERIZED_TYPE.equals(beanType.kind())) {
-                // A parameterized bean type is considered assignable to a raw required type if the raw types
-                // are identical and all type parameters of the bean type are either unbounded type variables or
-                // java.lang.Object.
-                if (!requiredType.name().equals(beanType.asParameterizedType().name())) {
-                    return false;
-                }
-                return containsUnboundedTypeVariablesOrObjects(beanType.asParameterizedType().arguments());
-            }
-        } else if (PARAMETERIZED_TYPE.equals(requiredType.kind())) {
-            if (CLASS.equals(beanType.kind())) {
-                // A raw bean type is considered assignable to a parameterized required type if the raw types are
-                // identical and all type parameters of the required type are either unbounded type variables or
-                // java.lang.Object.
-                if (!beanType.name().equals(requiredType.asParameterizedType().name())) {
-                    return false;
-                }
-                return containsUnboundedTypeVariablesOrObjects(requiredType.asParameterizedType().arguments());
-            } else if (PARAMETERIZED_TYPE.equals(beanType.kind())) {
-                // A parameterized bean type is considered assignable to a parameterized required type if they have
-                // identical raw type and for each parameter.
-                if (!requiredType.name().equals(beanType.name())) {
-                    return false;
-                }
-                List<Type> requiredTypeArguments = requiredType.asParameterizedType().arguments();
-                List<Type> beanTypeArguments = beanType.asParameterizedType().arguments();
-                if (requiredTypeArguments.size() != beanTypeArguments.size()) {
-                    throw new IllegalArgumentException("Invalid argument combination " + requiredType + "; " + beanType);
-                }
-                for (int i = 0; i < requiredTypeArguments.size(); i++) {
-                    if (!parametersMatch(requiredTypeArguments.get(i), beanTypeArguments.get(i))) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        } else if (WILDCARD_TYPE.equals(requiredType.kind())) {
-            return parametersMatch(requiredType, beanType);
-        }
-        return false;
-    }
-
-    boolean parametersMatch(Type requiredParameter, Type beanParameter) {
-        if (isActualType(requiredParameter) && isActualType(beanParameter)) {
-            /*
-             * the required type parameter and the bean type parameter are actual types with identical raw type, and, if the
-             * type is parameterized, the bean
-             * type parameter is assignable to the required type parameter according to these rules, or
-             */
-            return matches(requiredParameter, beanParameter);
-        }
-        if (WILDCARD_TYPE.equals(requiredParameter.kind()) && isActualType(beanParameter)) {
-            /*
-             * the required type parameter is a wildcard, the bean type parameter is an actual type and the actual type is
-             * assignable to the upper bound, if
-             * any, of the wildcard and assignable from the lower bound, if any, of the wildcard, or
-             */
-            return parametersMatch(requiredParameter.asWildcardType(), beanParameter);
-        }
-        if (WILDCARD_TYPE.equals(requiredParameter.kind()) && TYPE_VARIABLE.equals(beanParameter.kind())) {
-            /*
-             * the required type parameter is a wildcard, the bean type parameter is a type variable and the upper bound of the
-             * type variable is assignable to
-             * or assignable from the upper bound, if any, of the wildcard and assignable from the lower bound, if any, of the
-             * wildcard, or
-             */
-            return parametersMatch(requiredParameter.asWildcardType(), beanParameter.asTypeVariable());
-        }
-        if (isActualType(requiredParameter) && TYPE_VARIABLE.equals(beanParameter.kind())) {
-            /*
-             * the required type parameter is an actual type, the bean type parameter is a type variable and the actual type is
-             * assignable to the upper bound,
-             * if any, of the type variable, or
-             */
-            return parametersMatch(requiredParameter, beanParameter.asTypeVariable());
-        }
-        if (TYPE_VARIABLE.equals(requiredParameter.kind()) && TYPE_VARIABLE.equals(beanParameter.kind())) {
-            /*
-             * the required type parameter and the bean type parameter are both type variables and the upper bound of the
-             * required type parameter is assignable
-             * to the upper bound, if any, of the bean type parameter
-             */
-            return parametersMatch(requiredParameter.asTypeVariable(), beanParameter.asTypeVariable());
-        }
-        return false;
-    }
-
-    boolean parametersMatch(WildcardType requiredParameter, Type beanParameter) {
-        return (lowerBoundsOfWildcardMatch(beanParameter, requiredParameter)
-                && upperBoundsOfWildcardMatch(requiredParameter, beanParameter));
-    }
-
-    boolean parametersMatch(WildcardType requiredParameter, TypeVariable beanParameter) {
-        List<Type> beanParameterBounds = getUppermostTypeVariableBounds(beanParameter);
-        if (!lowerBoundsOfWildcardMatch(beanParameterBounds, requiredParameter)) {
-            return false;
-        }
-
-        List<Type> requiredUpperBounds = Collections.singletonList(requiredParameter.extendsBound());
-        // upper bound of the type variable is assignable to OR assignable from the upper bound of the wildcard
-        return (boundsMatch(requiredUpperBounds, beanParameterBounds) || boundsMatch(beanParameterBounds, requiredUpperBounds));
-    }
-
-    boolean parametersMatch(Type requiredParameter, TypeVariable beanParameter) {
-        for (Type bound : getUppermostTypeVariableBounds(beanParameter)) {
-            if (!isAssignableFrom(bound, requiredParameter)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    boolean parametersMatch(TypeVariable requiredParameter, TypeVariable beanParameter) {
-        return boundsMatch(getUppermostTypeVariableBounds(beanParameter), getUppermostTypeVariableBounds(requiredParameter));
-    }
+public interface BeanResolver {
 
     /**
-     * Returns <tt>true</tt> iff for each bound T, there is at least one bound from <tt>stricterBounds</tt> assignable to T.
-     * This reflects that
-     * <tt>stricterBounds</tt> are at least as strict as <tt>bounds</tt> are.
+     * Note that this method does not attempt to resolve the ambiguity.
+     * 
+     * @param requiredType
+     * @param requiredQualifiers
+     * @return the set of beans which have the given required type and qualifiers
+     * @see #resolveAmbiguity(Set)
      */
-    boolean boundsMatch(List<Type> bounds, List<Type> stricterBounds) {
-        // getUppermostBounds to make sure that both arrays of bounds contain ONLY ACTUAL TYPES! otherwise, the CovariantTypes
-        // assignability rules do not reflect our needs
-        bounds = getUppermostBounds(bounds);
-        stricterBounds = getUppermostBounds(stricterBounds);
-        for (Type bound : bounds) {
-            for (Type stricterBound : stricterBounds) {
-                if (!isAssignableFrom(bound, stricterBound)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    boolean isAssignableFrom(Type type1, Type type2) {
-        // java.lang.Object is assignable from any type
-        if (type1.name().equals(DotNames.OBJECT)) {
-            return true;
-        }
-        // type1 is the same as type2
-        if (type1.name().equals(type2.name())) {
-            return true;
-        }
-        // type1 is a superclass
-        return assignableFromMap.computeIfAbsent(type1.name(), assignableFromMapFunction).contains(type2.name());
-    }
-
-    boolean lowerBoundsOfWildcardMatch(Type parameter, WildcardType requiredParameter) {
-        return lowerBoundsOfWildcardMatch(singletonList(parameter), requiredParameter);
-    }
+    Set<BeanInfo> resolveBeans(Type requiredType, AnnotationInstance... requiredQualifiers);
 
-    boolean lowerBoundsOfWildcardMatch(List<Type> beanParameterBounds, WildcardType requiredParameter) {
-        if (requiredParameter.superBound() != null) {
-            if (!boundsMatch(beanParameterBounds, singletonList(requiredParameter.superBound()))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    boolean upperBoundsOfWildcardMatch(WildcardType requiredParameter, Type parameter) {
-        return boundsMatch(singletonList(requiredParameter.extendsBound()), singletonList(parameter));
-    }
-
-    /*
-     * TypeVariable bounds are treated specially - CDI assignability rules are applied. Standard Java covariant assignability
-     * rules are applied to all other
-     * types of bounds. This is not explicitly mentioned in the specification but is implied.
+    /**
+     * Apply the ambiguous dependency resolution rules.
+     * 
+     * @param beans
+     * @return the resolved bean, or null
+     * @throws AmbiguousResolutionException
+     * @see {@link #resolveBeans(Type, AnnotationInstance...)}
      */
-    List<Type> getUppermostTypeVariableBounds(TypeVariable bound) {
-        if (TYPE_VARIABLE.equals(bound.bounds().get(0).kind())) {
-            return getUppermostTypeVariableBounds(bound.bounds().get(0).asTypeVariable());
-        }
-        return bound.bounds();
-    }
-
-    List<Type> getUppermostBounds(List<Type> bounds) {
-        // if a type variable (or wildcard) declares a bound which is a type variable, it can declare no other bound
-        if (TYPE_VARIABLE.equals(bounds.get(0).kind())) {
-            return getUppermostTypeVariableBounds(bounds.get(0).asTypeVariable());
-        }
-        return bounds;
-    }
-
-    static boolean isActualType(Type type) {
-        return CLASS.equals(type.kind()) || PARAMETERIZED_TYPE.equals(type.kind()) || ARRAY.equals(type.kind());
-    }
-
-    static boolean containsUnboundedTypeVariablesOrObjects(List<Type> types) {
-        for (Type type : types) {
-            if (ClassType.OBJECT_TYPE.equals(type)) {
-                continue;
-            }
-            if (Kind.TYPE_VARIABLE.equals(type.kind())) {
-                List<Type> bounds = type.asTypeVariable().bounds();
-                if (bounds.isEmpty() || bounds.size() == 1 && ClassType.OBJECT_TYPE.equals(bounds.get(0))) {
-                    continue;
-                }
-            }
-            return false;
-        }
-        return true;
-    }
+    BeanInfo resolveAmbiguity(Set<BeanInfo> beans);
 
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java
new file mode 100644
index 0000000000000..90d60969b1d27
--- /dev/null
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanResolverImpl.java
@@ -0,0 +1,352 @@
+package io.quarkus.arc.processor;
+
+import static java.util.Collections.singletonList;
+import static org.jboss.jandex.Type.Kind.ARRAY;
+import static org.jboss.jandex.Type.Kind.CLASS;
+import static org.jboss.jandex.Type.Kind.PARAMETERIZED_TYPE;
+import static org.jboss.jandex.Type.Kind.TYPE_VARIABLE;
+import static org.jboss.jandex.Type.Kind.WILDCARD_TYPE;
+
+import io.quarkus.arc.processor.InjectionPointInfo.TypeAndQualifiers;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+import javax.enterprise.inject.AmbiguousResolutionException;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.ClassType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.jboss.jandex.TypeVariable;
+import org.jboss.jandex.WildcardType;
+
+class BeanResolverImpl implements BeanResolver {
+
+    private final BeanDeployment beanDeployment;
+
+    private final ConcurrentMap<DotName, Set<DotName>> assignableFromMap;
+
+    private final Function<DotName, Set<DotName>> assignableFromMapFunction;
+
+    private final Map<TypeAndQualifiers, List<BeanInfo>> resolved;
+
+    BeanResolverImpl(BeanDeployment beanDeployment) {
+        this.beanDeployment = beanDeployment;
+        this.assignableFromMap = new ConcurrentHashMap<>();
+        this.assignableFromMapFunction = name -> {
+            Set<DotName> assignables = new HashSet<>();
+            for (ClassInfo subclass : beanDeployment.getBeanArchiveIndex().getAllKnownSubclasses(name)) {
+                assignables.add(subclass.name());
+            }
+            for (ClassInfo implementor : beanDeployment.getBeanArchiveIndex().getAllKnownImplementors(name)) {
+                assignables.add(implementor.name());
+            }
+            if (beanDeployment.hasApplicationIndex()) {
+                for (ClassInfo subclass : beanDeployment.getApplicationIndex().getAllKnownSubclasses(name)) {
+                    assignables.add(subclass.name());
+                }
+                for (ClassInfo implementor : beanDeployment.getApplicationIndex().getAllKnownImplementors(name)) {
+                    assignables.add(implementor.name());
+                }
+            }
+            return assignables;
+        };
+        this.resolved = new ConcurrentHashMap<>();
+    }
+
+    @Override
+    public Set<BeanInfo> resolveBeans(Type requiredType, AnnotationInstance... requiredQualifiers) {
+        Objects.requireNonNull(requiredType, "Required type must not be null");
+        Set<AnnotationInstance> qualifiers;
+        if (requiredQualifiers.length == 0) {
+            qualifiers = Collections.emptySet();
+        } else {
+            qualifiers = new HashSet<>();
+            Collections.addAll(qualifiers, requiredQualifiers);
+        }
+        TypeAndQualifiers typeAndQualifiers = new TypeAndQualifiers(requiredType, qualifiers);
+        // Note that this method must not cache the results beacause it can be used before synthetic components are registered
+        List<BeanInfo> beans = findMatching(typeAndQualifiers);
+        Set<BeanInfo> ret;
+        if (beans.isEmpty()) {
+            ret = Collections.emptySet();
+        } else if (beans.size() == 1) {
+            ret = Collections.singleton(beans.get(0));
+        } else {
+            ret = new HashSet<>(beans);
+        }
+        return ret;
+    }
+
+    @Override
+    public BeanInfo resolveAmbiguity(Set<BeanInfo> beans) {
+        if (beans == null || beans.isEmpty()) {
+            return null;
+        }
+        if (beans.size() > 1) {
+            BeanInfo selected = Beans.resolveAmbiguity(beans);
+            if (selected != null) {
+                return selected;
+            }
+            throw new AmbiguousResolutionException(beans.toString());
+        } else {
+            return beans.iterator().next();
+        }
+    }
+
+    List<BeanInfo> resolve(TypeAndQualifiers typeAndQualifiers) {
+        return resolved.computeIfAbsent(typeAndQualifiers, this::findMatching);
+    }
+
+    private List<BeanInfo> findMatching(TypeAndQualifiers typeAndQualifiers) {
+        List<BeanInfo> resolved = new ArrayList<>();
+        for (BeanInfo b : beanDeployment.getBeans()) {
+            if (Beans.matches(b, typeAndQualifiers)) {
+                resolved.add(b);
+            }
+        }
+        return resolved.isEmpty() ? Collections.emptyList() : resolved;
+    }
+
+    List<BeanInfo> findTypeMatching(Type type) {
+        List<BeanInfo> resolved = new ArrayList<>();
+        for (BeanInfo b : beanDeployment.getBeans()) {
+            if (Beans.matchesType(b, type)) {
+                resolved.add(b);
+            }
+        }
+        return resolved.isEmpty() ? Collections.emptyList() : resolved;
+    }
+
+    boolean matches(Type requiredType, Type beanType) {
+        return matchesNoBoxing(Types.box(requiredType), Types.box(beanType));
+    }
+
+    boolean matchesNoBoxing(Type requiredType, Type beanType) {
+        if (requiredType == beanType) {
+            return true;
+        }
+
+        if (ARRAY.equals(requiredType.kind())) {
+            if (ARRAY.equals(beanType.kind())) {
+                // Array types are considered to match only if their element types are identical
+                return matchesNoBoxing(requiredType.asArrayType().component(), beanType.asArrayType().component());
+            }
+        } else if (CLASS.equals(requiredType.kind())) {
+            if (CLASS.equals(beanType.kind())) {
+                return requiredType.name().equals(beanType.name());
+            } else if (PARAMETERIZED_TYPE.equals(beanType.kind())) {
+                // A parameterized bean type is considered assignable to a raw required type if the raw types
+                // are identical and all type parameters of the bean type are either unbounded type variables or
+                // java.lang.Object.
+                if (!requiredType.name().equals(beanType.asParameterizedType().name())) {
+                    return false;
+                }
+                return containsUnboundedTypeVariablesOrObjects(beanType.asParameterizedType().arguments());
+            }
+        } else if (PARAMETERIZED_TYPE.equals(requiredType.kind())) {
+            if (CLASS.equals(beanType.kind())) {
+                // A raw bean type is considered assignable to a parameterized required type if the raw types are
+                // identical and all type parameters of the required type are either unbounded type variables or
+                // java.lang.Object.
+                if (!beanType.name().equals(requiredType.asParameterizedType().name())) {
+                    return false;
+                }
+                return containsUnboundedTypeVariablesOrObjects(requiredType.asParameterizedType().arguments());
+            } else if (PARAMETERIZED_TYPE.equals(beanType.kind())) {
+                // A parameterized bean type is considered assignable to a parameterized required type if they have
+                // identical raw type and for each parameter.
+                if (!requiredType.name().equals(beanType.name())) {
+                    return false;
+                }
+                List<Type> requiredTypeArguments = requiredType.asParameterizedType().arguments();
+                List<Type> beanTypeArguments = beanType.asParameterizedType().arguments();
+                if (requiredTypeArguments.size() != beanTypeArguments.size()) {
+                    throw new IllegalArgumentException("Invalid argument combination " + requiredType + "; " + beanType);
+                }
+                for (int i = 0; i < requiredTypeArguments.size(); i++) {
+                    if (!parametersMatch(requiredTypeArguments.get(i), beanTypeArguments.get(i))) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        } else if (WILDCARD_TYPE.equals(requiredType.kind())) {
+            return parametersMatch(requiredType, beanType);
+        }
+        return false;
+    }
+
+    boolean parametersMatch(Type requiredParameter, Type beanParameter) {
+        if (isActualType(requiredParameter) && isActualType(beanParameter)) {
+            /*
+             * the required type parameter and the bean type parameter are actual types with identical raw type, and, if the
+             * type is parameterized, the bean
+             * type parameter is assignable to the required type parameter according to these rules, or
+             */
+            return matches(requiredParameter, beanParameter);
+        }
+        if (WILDCARD_TYPE.equals(requiredParameter.kind()) && isActualType(beanParameter)) {
+            /*
+             * the required type parameter is a wildcard, the bean type parameter is an actual type and the actual type is
+             * assignable to the upper bound, if
+             * any, of the wildcard and assignable from the lower bound, if any, of the wildcard, or
+             */
+            return parametersMatch(requiredParameter.asWildcardType(), beanParameter);
+        }
+        if (WILDCARD_TYPE.equals(requiredParameter.kind()) && TYPE_VARIABLE.equals(beanParameter.kind())) {
+            /*
+             * the required type parameter is a wildcard, the bean type parameter is a type variable and the upper bound of the
+             * type variable is assignable to
+             * or assignable from the upper bound, if any, of the wildcard and assignable from the lower bound, if any, of the
+             * wildcard, or
+             */
+            return parametersMatch(requiredParameter.asWildcardType(), beanParameter.asTypeVariable());
+        }
+        if (isActualType(requiredParameter) && TYPE_VARIABLE.equals(beanParameter.kind())) {
+            /*
+             * the required type parameter is an actual type, the bean type parameter is a type variable and the actual type is
+             * assignable to the upper bound,
+             * if any, of the type variable, or
+             */
+            return parametersMatch(requiredParameter, beanParameter.asTypeVariable());
+        }
+        if (TYPE_VARIABLE.equals(requiredParameter.kind()) && TYPE_VARIABLE.equals(beanParameter.kind())) {
+            /*
+             * the required type parameter and the bean type parameter are both type variables and the upper bound of the
+             * required type parameter is assignable
+             * to the upper bound, if any, of the bean type parameter
+             */
+            return parametersMatch(requiredParameter.asTypeVariable(), beanParameter.asTypeVariable());
+        }
+        return false;
+    }
+
+    boolean parametersMatch(WildcardType requiredParameter, Type beanParameter) {
+        return (lowerBoundsOfWildcardMatch(beanParameter, requiredParameter)
+                && upperBoundsOfWildcardMatch(requiredParameter, beanParameter));
+    }
+
+    boolean parametersMatch(WildcardType requiredParameter, TypeVariable beanParameter) {
+        List<Type> beanParameterBounds = getUppermostTypeVariableBounds(beanParameter);
+        if (!lowerBoundsOfWildcardMatch(beanParameterBounds, requiredParameter)) {
+            return false;
+        }
+
+        List<Type> requiredUpperBounds = Collections.singletonList(requiredParameter.extendsBound());
+        // upper bound of the type variable is assignable to OR assignable from the upper bound of the wildcard
+        return (boundsMatch(requiredUpperBounds, beanParameterBounds) || boundsMatch(beanParameterBounds, requiredUpperBounds));
+    }
+
+    boolean parametersMatch(Type requiredParameter, TypeVariable beanParameter) {
+        for (Type bound : getUppermostTypeVariableBounds(beanParameter)) {
+            if (!isAssignableFrom(bound, requiredParameter)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    boolean parametersMatch(TypeVariable requiredParameter, TypeVariable beanParameter) {
+        return boundsMatch(getUppermostTypeVariableBounds(beanParameter), getUppermostTypeVariableBounds(requiredParameter));
+    }
+
+    /**
+     * Returns <tt>true</tt> iff for each bound T, there is at least one bound from <tt>stricterBounds</tt> assignable to T.
+     * This reflects that
+     * <tt>stricterBounds</tt> are at least as strict as <tt>bounds</tt> are.
+     */
+    boolean boundsMatch(List<Type> bounds, List<Type> stricterBounds) {
+        // getUppermostBounds to make sure that both arrays of bounds contain ONLY ACTUAL TYPES! otherwise, the CovariantTypes
+        // assignability rules do not reflect our needs
+        bounds = getUppermostBounds(bounds);
+        stricterBounds = getUppermostBounds(stricterBounds);
+        for (Type bound : bounds) {
+            for (Type stricterBound : stricterBounds) {
+                if (!isAssignableFrom(bound, stricterBound)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    boolean isAssignableFrom(Type type1, Type type2) {
+        // java.lang.Object is assignable from any type
+        if (type1.name().equals(DotNames.OBJECT)) {
+            return true;
+        }
+        // type1 is the same as type2
+        if (type1.name().equals(type2.name())) {
+            return true;
+        }
+        // type1 is a superclass
+        return assignableFromMap.computeIfAbsent(type1.name(), assignableFromMapFunction).contains(type2.name());
+    }
+
+    boolean lowerBoundsOfWildcardMatch(Type parameter, WildcardType requiredParameter) {
+        return lowerBoundsOfWildcardMatch(singletonList(parameter), requiredParameter);
+    }
+
+    boolean lowerBoundsOfWildcardMatch(List<Type> beanParameterBounds, WildcardType requiredParameter) {
+        if (requiredParameter.superBound() != null) {
+            if (!boundsMatch(beanParameterBounds, singletonList(requiredParameter.superBound()))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    boolean upperBoundsOfWildcardMatch(WildcardType requiredParameter, Type parameter) {
+        return boundsMatch(singletonList(requiredParameter.extendsBound()), singletonList(parameter));
+    }
+
+    /*
+     * TypeVariable bounds are treated specially - CDI assignability rules are applied. Standard Java covariant assignability
+     * rules are applied to all other
+     * types of bounds. This is not explicitly mentioned in the specification but is implied.
+     */
+    List<Type> getUppermostTypeVariableBounds(TypeVariable bound) {
+        if (TYPE_VARIABLE.equals(bound.bounds().get(0).kind())) {
+            return getUppermostTypeVariableBounds(bound.bounds().get(0).asTypeVariable());
+        }
+        return bound.bounds();
+    }
+
+    List<Type> getUppermostBounds(List<Type> bounds) {
+        // if a type variable (or wildcard) declares a bound which is a type variable, it can declare no other bound
+        if (TYPE_VARIABLE.equals(bounds.get(0).kind())) {
+            return getUppermostTypeVariableBounds(bounds.get(0).asTypeVariable());
+        }
+        return bounds;
+    }
+
+    static boolean isActualType(Type type) {
+        return CLASS.equals(type.kind()) || PARAMETERIZED_TYPE.equals(type.kind()) || ARRAY.equals(type.kind());
+    }
+
+    static boolean containsUnboundedTypeVariablesOrObjects(List<Type> types) {
+        for (Type type : types) {
+            if (ClassType.OBJECT_TYPE.equals(type)) {
+                continue;
+            }
+            if (Kind.TYPE_VARIABLE.equals(type.kind())) {
+                List<Type> bounds = type.asTypeVariable().bounds();
+                if (bounds.isEmpty() || bounds.size() == 1 && ClassType.OBJECT_TYPE.equals(bounds.get(0))) {
+                    continue;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java
index baec444fb1926..d3d742e95318f 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanStream.java
@@ -10,6 +10,7 @@
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
 
@@ -256,6 +257,17 @@ public BeanStream alternativeBeans() {
         return this;
     }
 
+    /**
+     * 
+     * @param requiredType
+     * @param requiredQualifiers
+     * @return the new stream of beans assignable to the required type and qualifiers
+     */
+    public BeanStream assignableTo(Type requiredType, AnnotationInstance... requiredQualifiers) {
+        stream = stream.filter(bean -> bean.isAssignableTo(requiredType, requiredQualifiers));
+        return this;
+    }
+
     /**
      * Terminal operation.
      * 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java
index 7f7cd2521fa58..223b4fc93206d 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Beans.java
@@ -42,12 +42,6 @@ final class Beans {
     private Beans() {
     }
 
-    /**
-     *
-     * @param beanClass
-     * @param beanDeployment
-     * @return a new bean info
-     */
     static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployment, InjectionPointModifier transformer) {
         Set<AnnotationInstance> qualifiers = new HashSet<>();
         List<ScopeInfo> scopes = new ArrayList<>();
@@ -65,6 +59,7 @@ static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployme
                     name = nameValue.asString();
                 } else {
                     name = getDefaultName(beanClass);
+                    annotation = normalizedNamedQualifier(name, annotation);
                 }
             }
             Collection<AnnotationInstance> qualifierCollection = beanDeployment.extractQualifiers(annotation);
@@ -135,7 +130,7 @@ static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployme
             alternativePriority = initAlternativePriority(beanClass, alternativePriority, stereotypes, beanDeployment);
             if (alternativePriority == null) {
                 // after all attempts, priority is still null, bean will be ignored
-                LOGGER.infof(
+                LOGGER.debugf(
                         "Ignoring bean defined via %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives",
                         beanClass.name());
                 return null;
@@ -151,7 +146,7 @@ static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployme
     private static ScopeInfo inheritScope(ClassInfo beanClass, BeanDeployment beanDeployment) {
         DotName superClassName = beanClass.superName();
         while (!superClassName.equals(DotNames.OBJECT)) {
-            ClassInfo classFromIndex = getClassByName(beanDeployment.getIndex(), superClassName);
+            ClassInfo classFromIndex = getClassByName(beanDeployment.getBeanArchiveIndex(), superClassName);
             if (classFromIndex == null) {
                 // class not in index
                 LOGGER.warnf("Unable to determine scope for bean %s using inheritance because its super class " +
@@ -171,14 +166,6 @@ private static ScopeInfo inheritScope(ClassInfo beanClass, BeanDeployment beanDe
         return null;
     }
 
-    /**
-     *
-     * @param producerMethod
-     * @param declaringBean
-     * @param beanDeployment
-     * @param disposer
-     * @return a new bean info
-     */
     static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declaringBean, BeanDeployment beanDeployment,
             DisposerInfo disposer, InjectionPointModifier transformer) {
         Set<AnnotationInstance> qualifiers = new HashSet<>();
@@ -202,6 +189,7 @@ static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declari
                     name = nameValue.asString();
                 } else {
                     name = getDefaultName(producerMethod);
+                    annotation = normalizedNamedQualifier(name, annotation);
                 }
             }
             Collection<AnnotationInstance> qualifierCollection = beanDeployment.extractQualifiers(annotation);
@@ -259,11 +247,10 @@ static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declari
                 alternativePriority = declaringBean.getAlternativePriority();
             }
             alternativePriority = initAlternativePriority(producerMethod, alternativePriority, stereotypes, beanDeployment);
-            // after all attempts, priority is still null
             if (alternativePriority == null) {
                 // after all attempts, priority is still null, bean will be ignored
-                LOGGER.infof(
-                        "Ignoring producer method %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives",
+                LOGGER.debugf(
+                        "Ignoring producer method %s - declared as an @Alternative but not selected by @AlternativePriority or quarkus.arc.selected-alternatives",
                         declaringBean.getTarget().get().asClass().name() + "#" + producerMethod.name());
                 return null;
             }
@@ -275,14 +262,6 @@ static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declari
         return bean;
     }
 
-    /**
-     *
-     * @param producerField
-     * @param declaringBean
-     * @param beanDeployment
-     * @param disposer
-     * @return a new bean info
-     */
     static BeanInfo createProducerField(FieldInfo producerField, BeanInfo declaringBean, BeanDeployment beanDeployment,
             DisposerInfo disposer) {
         Set<AnnotationInstance> qualifiers = new HashSet<>();
@@ -301,6 +280,7 @@ static BeanInfo createProducerField(FieldInfo producerField, BeanInfo declaringB
                     name = nameValue.asString();
                 } else {
                     name = producerField.name();
+                    annotation = normalizedNamedQualifier(name, annotation);
                 }
             }
             Collection<AnnotationInstance> qualifierCollection = beanDeployment.extractQualifiers(annotation);
@@ -361,10 +341,9 @@ static BeanInfo createProducerField(FieldInfo producerField, BeanInfo declaringB
             // after all attempts, priority is still null
             if (alternativePriority == null) {
                 LOGGER.debugf(
-                        "Ignoring producer field %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives",
+                        "Ignoring producer field %s - declared as an @Alternative but not selected by @AlternativePriority or quarkus.arc.selected-alternatives",
                         producerField);
                 return null;
-
             }
         }
 
@@ -373,6 +352,13 @@ static BeanInfo createProducerField(FieldInfo producerField, BeanInfo declaringB
         return bean;
     }
 
+    private static AnnotationInstance normalizedNamedQualifier(String defaultedName, AnnotationInstance originalAnnotation) {
+        // Replace @Named("") with @Named("foo")
+        // This is not explicitly defined by the spec but better align with the RI behavior
+        return AnnotationInstance.create(DotNames.NAMED, originalAnnotation.target(),
+                Collections.singletonList(AnnotationValue.createStringValue("value", defaultedName)));
+    }
+
     private static DefinitionException multipleScopesFound(String baseMessage, List<ScopeInfo> scopes) {
         return new DefinitionException(baseMessage + " declares multiple scope type annotations: "
                 + scopes.stream().map(s -> s.getDotName().toString()).collect(Collectors.joining(", ")));
@@ -442,12 +428,16 @@ private static String initStereotypeName(List<StereotypeInfo> stereotypes, Annot
     }
 
     static boolean matches(BeanInfo bean, TypeAndQualifiers typeAndQualifiers) {
-        // Bean has all the required qualifiers and  a bean type that matches the required type
-        return hasQualifiers(bean, typeAndQualifiers.qualifiers) && matchesType(bean, typeAndQualifiers.type);
+        return matches(bean, typeAndQualifiers.type, typeAndQualifiers.qualifiers);
+    }
+
+    static boolean matches(BeanInfo bean, Type requiredType, Set<AnnotationInstance> requiredQualifiers) {
+        // Bean has all the required qualifiers and a bean type that matches the required type
+        return hasQualifiers(bean, requiredQualifiers) && matchesType(bean, requiredType);
     }
 
     static boolean matchesType(BeanInfo bean, Type requiredType) {
-        BeanResolver beanResolver = bean.getDeployment().getBeanResolver();
+        BeanResolverImpl beanResolver = bean.getDeployment().beanResolver;
         for (Type beanType : bean.getTypes()) {
             if (beanResolver.matches(requiredType, beanType)) {
                 return true;
@@ -473,10 +463,10 @@ static void resolveInjectionPoint(BeanDeployment deployment, InjectionTargetInfo
             // Skip built-in beans
             return;
         }
-        List<BeanInfo> resolved = deployment.getBeanResolver().resolve(injectionPoint.getTypeAndQualifiers());
+        List<BeanInfo> resolved = deployment.beanResolver.resolve(injectionPoint.getTypeAndQualifiers());
         BeanInfo selected = null;
         if (resolved.isEmpty()) {
-            List<BeanInfo> typeMatching = deployment.getBeanResolver().findTypeMatching(injectionPoint.getRequiredType());
+            List<BeanInfo> typeMatching = deployment.beanResolver.findTypeMatching(injectionPoint.getRequiredType());
 
             StringBuilder message = new StringBuilder("Unsatisfied dependency for type ");
             addStandardErroneousDependencyMessage(target, injectionPoint, message);
@@ -521,7 +511,7 @@ private static void addStandardErroneousDependencyMessage(InjectionTargetInfo ta
         message.append(target);
     }
 
-    static BeanInfo resolveAmbiguity(List<BeanInfo> resolved) {
+    static BeanInfo resolveAmbiguity(Collection<BeanInfo> resolved) {
         List<BeanInfo> resolvedAmbiguity = new ArrayList<>(resolved);
         // First eliminate default beans
         for (Iterator<BeanInfo> iterator = resolvedAmbiguity.iterator(); iterator.hasNext();) {
@@ -603,22 +593,25 @@ static boolean hasQualifiers(BeanInfo bean, Iterable<AnnotationInstance> require
     }
 
     static boolean hasQualifier(BeanInfo bean, AnnotationInstance required) {
-        return hasQualifier(bean.getDeployment().getQualifier(required.name()), required, bean.getQualifiers());
+        return hasQualifier(bean.getDeployment(), required, bean.getQualifiers());
     }
 
-    static boolean hasQualifier(ClassInfo requiredInfo, AnnotationInstance required,
+    static boolean hasQualifier(BeanDeployment beanDeployment, AnnotationInstance requiredQualifier,
             Collection<AnnotationInstance> qualifiers) {
-        List<AnnotationValue> binding = new ArrayList<>();
-        for (AnnotationValue val : required.values()) {
-            if (!requiredInfo.method(val.name()).hasAnnotation(DotNames.NONBINDING)) {
-                binding.add(val);
+        ClassInfo requiredClazz = beanDeployment.getQualifier(requiredQualifier.name());
+        List<AnnotationValue> values = new ArrayList<>();
+        Set<String> nonBindingFields = beanDeployment.getQualifierNonbindingMembers(requiredQualifier.name());
+        for (AnnotationValue val : requiredQualifier.values()) {
+            if (!requiredClazz.method(val.name()).hasAnnotation(DotNames.NONBINDING)
+                    && !nonBindingFields.contains(val.name())) {
+                values.add(val);
             }
         }
         for (AnnotationInstance qualifier : qualifiers) {
-            if (required.name().equals(qualifier.name())) {
+            if (requiredQualifier.name().equals(qualifier.name())) {
                 // Must have the same annotation member value for each member which is not annotated @Nonbinding
                 boolean matches = true;
-                for (AnnotationValue value : binding) {
+                for (AnnotationValue value : values) {
                     if (!value.equals(qualifier.value(value.name()))) {
                         matches = false;
                         break;
@@ -655,7 +648,7 @@ static void analyzeType(Type type, BeanDeployment beanDeployment) {
     }
 
     static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploymentValidator> validators,
-            Consumer<BytecodeTransformer> bytecodeTransformerConsumer) {
+            Consumer<BytecodeTransformer> bytecodeTransformerConsumer, Set<DotName> classesReceivingNoArgsCtor) {
 
         if (bean.isClassBean()) {
             ClassInfo beanClass = bean.getTarget().get().asClass();
@@ -680,7 +673,7 @@ static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploym
                 if (bean.getDeployment().transformUnproxyableClasses) {
                     DotName superName = beanClass.superName();
                     if (!DotNames.OBJECT.equals(superName)) {
-                        ClassInfo superClass = bean.getDeployment().getIndex().getClassByName(beanClass.superName());
+                        ClassInfo superClass = bean.getDeployment().getBeanArchiveIndex().getClassByName(beanClass.superName());
                         if (superClass == null || !superClass.hasNoArgsConstructor()) {
                             // Bean class extends a class without no-args constructor
                             // It is not possible to generate a no-args constructor reliably
@@ -688,9 +681,13 @@ static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploym
                         }
                     }
                     if (superName != null) {
-                        String superClassName = superName.toString().replace('.', '/');
-                        bytecodeTransformerConsumer.accept(new BytecodeTransformer(beanClass.name().toString(),
-                                new NoArgConstructorTransformFunction(superClassName)));
+                        if (!classesReceivingNoArgsCtor.contains(beanClass.name())) {
+                            String superClassName = superName.toString().replace('.', '/');
+                            bytecodeTransformerConsumer.accept(new BytecodeTransformer(beanClass.name().toString(),
+                                    new NoArgConstructorTransformFunction(superClassName)));
+                            classesReceivingNoArgsCtor.add(beanClass.name());
+                        }
+
                     } else {
                         errors.add(new DeploymentException(
                                 "It's not possible to add a synthetic constructor with no parameters to the unproxyable bean class: "
@@ -720,7 +717,7 @@ static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploym
             }
 
         } else if (bean.isProducerField() || bean.isProducerMethod()) {
-            ClassInfo returnTypeClass = getClassByName(bean.getDeployment().getIndex(),
+            ClassInfo returnTypeClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(),
                     bean.isProducerMethod() ? bean.getTarget().get().asMethod().returnType()
                             : bean.getTarget().get().asField().type());
             // can be null for primitive types
@@ -743,7 +740,8 @@ static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploym
                     if (bean.getDeployment().transformUnproxyableClasses) {
                         DotName superName = returnTypeClass.superName();
                         if (!DotNames.OBJECT.equals(superName)) {
-                            ClassInfo superClass = bean.getDeployment().getIndex().getClassByName(returnTypeClass.superName());
+                            ClassInfo superClass = bean.getDeployment().getBeanArchiveIndex()
+                                    .getClassByName(returnTypeClass.superName());
                             if (superClass == null || !superClass.hasNoArgsConstructor()) {
                                 // Bean class extends a class without no-args constructor
                                 // It is not possible to generate a no-args constructor reliably
@@ -751,9 +749,12 @@ static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploym
                             }
                         }
                         if (superName != null) {
-                            String superClassName = superName.toString().replace('.', '/');
-                            bytecodeTransformerConsumer.accept(new BytecodeTransformer(returnTypeClass.name().toString(),
-                                    new NoArgConstructorTransformFunction(superClassName)));
+                            if (!classesReceivingNoArgsCtor.contains(returnTypeClass.name())) {
+                                String superClassName = superName.toString().replace('.', '/');
+                                bytecodeTransformerConsumer.accept(new BytecodeTransformer(returnTypeClass.name().toString(),
+                                        new NoArgConstructorTransformFunction(superClassName)));
+                                classesReceivingNoArgsCtor.add(returnTypeClass.name());
+                            }
                         } else {
                             errors.add(new DeploymentException(String
                                     .format("It's not possible to add a synthetic constructor with no parameters to the unproxyable return type of "
@@ -778,6 +779,40 @@ static void validateBean(BeanInfo bean, List<Throwable> errors, List<BeanDeploym
                     }
                 }
             }
+        } else if (bean.isSynthetic()) {
+            // this is for synthetic beans that need to be proxied but their classes don't have no-args constructor
+            ClassInfo beanClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), bean.getBeanClass());
+            MethodInfo noArgsConstructor = beanClass.method(Methods.INIT);
+            if (bean.getScope().isNormal() && !Modifier.isInterface(beanClass.flags()) && noArgsConstructor == null) {
+                if (bean.getDeployment().transformUnproxyableClasses) {
+                    DotName superName = beanClass.superName();
+                    if (!DotNames.OBJECT.equals(superName)) {
+                        ClassInfo superClass = bean.getDeployment().getBeanArchiveIndex().getClassByName(beanClass.superName());
+                        if (superClass == null || !superClass.hasNoArgsConstructor()) {
+                            // Bean class extends a class without no-args constructor
+                            // It is not possible to generate a no-args constructor reliably
+                            superName = null;
+                        }
+                    }
+                    if (superName != null) {
+                        if (!classesReceivingNoArgsCtor.contains(beanClass.name())) {
+                            String superClassName = superName.toString().replace('.', '/');
+                            bytecodeTransformerConsumer.accept(new BytecodeTransformer(beanClass.name().toString(),
+                                    new NoArgConstructorTransformFunction(superClassName)));
+                            classesReceivingNoArgsCtor.add(beanClass.name());
+                        }
+                    } else {
+                        errors.add(new DeploymentException(
+                                "It's not possible to add a synthetic constructor with no parameters to the unproxyable bean class: "
+                                        +
+                                        beanClass));
+                    }
+                } else {
+                    errors.add(new DeploymentException(String
+                            .format("Normal scoped beans must declare a non-private constructor with no parameters: %s",
+                                    bean)));
+                }
+            }
         }
     }
 
@@ -787,7 +822,7 @@ private static void fetchType(Type type, BeanDeployment beanDeployment) {
         }
         if (type.kind() == Type.Kind.CLASS) {
             // Index the class additionally if needed
-            getClassByName(beanDeployment.getIndex(), type.name());
+            getClassByName(beanDeployment.getBeanArchiveIndex(), type.name());
         } else {
             analyzeType(type, beanDeployment);
         }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java
index 0c24459d0b379..98eb601bc4f3c 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuildExtension.java
@@ -59,7 +59,7 @@ interface Key<T> {
         static Key<Collection<ScopeInfo>> SCOPES = new SimpleKey<>(BUILT_IN_PREFIX + "scopes");
         static Key<Map<DotName, ClassInfo>> QUALIFIERS = new SimpleKey<>(BUILT_IN_PREFIX + "qualifiers");
         static Key<Map<DotName, ClassInfo>> INTERCEPTOR_BINDINGS = new SimpleKey<>(BUILT_IN_PREFIX + "interceptorBindings");
-        static Key<Map<DotName, ClassInfo>> STEREOTYPES = new SimpleKey<>(BUILT_IN_PREFIX + "stereotypes");
+        static Key<Map<DotName, StereotypeInfo>> STEREOTYPES = new SimpleKey<>(BUILT_IN_PREFIX + "stereotypes");
 
         String asString();
     }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
index 86b750ef53d5a..0a056df71f367 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
@@ -95,7 +95,7 @@ enum BuiltinBean {
                 ctx.constructor.getThis(),
                 beanProviderSupplier);
     }, ip -> {
-        return isCdiAndRawTypeMatches(ip, DotNames.BEAN) && ip.hasDefaultedQualifier();
+        return isCdiAndRawTypeMatches(ip, DotNames.BEAN, DotNames.INJECTABLE_BEAN) && ip.hasDefaultedQualifier();
     }, DotNames.BEAN),
     INTERCEPTED_BEAN(ctx -> {
         if (!(ctx.targetInfo instanceof InterceptorInfo)) {
@@ -112,7 +112,7 @@ enum BuiltinBean {
                 ctx.constructor.getThis(),
                 interceptedBeanMetadataProviderSupplier);
     }, ip -> {
-        return isCdiAndRawTypeMatches(ip, DotNames.BEAN) && !ip.hasDefaultedQualifier()
+        return isCdiAndRawTypeMatches(ip, DotNames.BEAN, DotNames.INJECTABLE_BEAN) && !ip.hasDefaultedQualifier()
                 && ip.getRequiredQualifiers().size() == 1
                 && ip.getRequiredQualifiers().iterator().next().name().equals(DotNames.INTERCEPTED);
     }, DotNames.BEAN),
@@ -168,7 +168,7 @@ enum BuiltinBean {
         if (!ctx.injectionPoint.getRequiredQualifiers().isEmpty()) {
             for (AnnotationInstance annotation : ctx.injectionPoint.getRequiredQualifiers()) {
                 // Create annotation literal first
-                ClassInfo annotationClass = getClassByName(ctx.beanDeployment.getIndex(), annotation.name());
+                ClassInfo annotationClass = getClassByName(ctx.beanDeployment.getBeanArchiveIndex(), annotation.name());
                 ctx.constructor.invokeInterfaceMethod(MethodDescriptors.SET_ADD, annotations,
                         ctx.annotationLiterals.process(ctx.constructor, ctx.classOutput,
                                 annotationClass, annotation,
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java
index 97a7948ae3213..55c342c873e05 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinScope.java
@@ -30,9 +30,9 @@ public DotName getName() {
         return info.getDotName();
     }
 
-    public static BuiltinScope from(DotName name) {
+    public static BuiltinScope from(DotName scopeAnnotationName) {
         for (BuiltinScope scope : BuiltinScope.values()) {
-            if (scope.getInfo().getDotName().equals(name)) {
+            if (scope.getInfo().getDotName().equals(scopeAnnotationName)) {
                 return scope;
             }
         }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
index 08bd3a582b9fa..4410f808f41d8 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
@@ -8,10 +8,9 @@
 import io.quarkus.arc.ClientProxy;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableContext;
-import io.quarkus.arc.MockableProxy;
-import io.quarkus.arc.impl.CreationalContextImpl;
+import io.quarkus.arc.impl.Mockable;
+import io.quarkus.arc.processor.BeanGenerator.ProviderType;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
-import io.quarkus.gizmo.AssignableResultHandle;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.DescriptorUtils;
@@ -31,13 +30,12 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.spi.Contextual;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
+import org.jboss.jandex.TypeVariable;
 
 /**
  *
@@ -48,6 +46,8 @@ public class ClientProxyGenerator extends AbstractGenerator {
     static final String CLIENT_PROXY_SUFFIX = "_ClientProxy";
 
     static final String DELEGATE_METHOD_NAME = "arc$delegate";
+    static final String SET_MOCK_METHOD_NAME = "arc$setMock";
+    static final String CLEAR_MOCK_METHOD_NAME = "arc$clearMock";
     static final String GET_CONTEXTUAL_INSTANCE_METHOD_NAME = "arc_contextualInstance";
     static final String GET_BEAN = "arc_bean";
     static final String BEAN_FIELD = "bean";
@@ -82,9 +82,8 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
         ResourceClassOutput classOutput = new ResourceClassOutput(applicationClassPredicate.test(bean.getBeanClass()),
                 generateSources);
 
-        Type providerType = bean.getProviderType();
-        ClassInfo providerClass = getClassByName(bean.getDeployment().getIndex(), providerType.name());
-        String providerTypeName = providerClass.name().toString();
+        ProviderType providerType = new ProviderType(bean.getProviderType());
+        ClassInfo providerClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), providerType.name());
         String baseName = getBaseName(bean, beanClassName);
         String targetPackage = getPackageName(bean);
         String generatedName = generatedNameFromTarget(targetPackage, baseName, CLIENT_PROXY_SUFFIX);
@@ -100,21 +99,26 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
 
         if (Modifier.isInterface(providerClass.flags())) {
             isInterface = true;
-            interfaces.add(providerTypeName);
+            interfaces.add(providerType.className());
         } else {
-            superClass = providerTypeName;
+            superClass = providerType.className();
         }
         if (mockable) {
-            interfaces.add(MockableProxy.class.getName());
+            interfaces.add(Mockable.class.getName());
         }
 
         ClassCreator clientProxy = ClassCreator.builder().classOutput(classOutput).className(generatedName)
                 .superClass(superClass)
                 .interfaces(interfaces.toArray(new String[0])).build();
+        if (AsmUtilCopy.needsSignature(providerClass)) {
+            clientProxy.setSignature(AsmUtilCopy.getSignature(providerClass));
+        }
+        Map<ClassInfo, Map<TypeVariable, Type>> resolvedTypeVariables = Types.resolvedTypeVariables(providerClass,
+                bean.getDeployment());
         FieldCreator beanField = clientProxy.getFieldCreator(BEAN_FIELD, DescriptorUtils.extToInt(beanClassName))
                 .setModifiers(ACC_PRIVATE | ACC_FINAL);
         if (mockable) {
-            clientProxy.getFieldCreator(MOCK_FIELD, Object.class).setModifiers(ACC_PRIVATE | ACC_VOLATILE);
+            clientProxy.getFieldCreator(MOCK_FIELD, providerType.descriptorName()).setModifiers(ACC_PRIVATE | ACC_VOLATILE);
         }
         FieldCreator contextField = null;
         if (BuiltinScope.APPLICATION.is(bean.getScope())) {
@@ -125,17 +129,30 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
 
         createConstructor(clientProxy, beanClassName, superClass, beanField.getFieldDescriptor(),
                 contextField != null ? contextField.getFieldDescriptor() : null);
-        implementDelegate(clientProxy, providerTypeName, beanField.getFieldDescriptor(), bean);
-        implementGetContextualInstance(clientProxy, providerTypeName);
+        implementDelegate(clientProxy, providerType, beanField.getFieldDescriptor(), bean);
+        implementGetContextualInstance(clientProxy, providerType);
         implementGetBean(clientProxy, beanField.getFieldDescriptor());
         if (mockable) {
-            implementMockMethods(clientProxy);
+            implementMockMethods(clientProxy, providerType);
         }
 
         for (MethodInfo method : getDelegatingMethods(bean, bytecodeTransformerConsumer, transformUnproxyableClasses)) {
 
             MethodDescriptor originalMethodDescriptor = MethodDescriptor.of(method);
             MethodCreator forward = clientProxy.getMethodCreator(originalMethodDescriptor);
+            if (AsmUtilCopy.needsSignature(method)) {
+                Map<TypeVariable, Type> methodClassVariables = resolvedTypeVariables.get(method.declaringClass());
+                String signature = AsmUtilCopy.getSignature(method, typeVariable -> {
+                    if (methodClassVariables != null) {
+                        Type ret = methodClassVariables.get(typeVariable);
+                        // let's not map a TV to itself
+                        if (ret != typeVariable)
+                            return ret;
+                    }
+                    return null;
+                });
+                forward.setSignature(signature);
+            }
 
             // Exceptions
             for (Type exception : method.exceptions()) {
@@ -167,7 +184,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
             ResultHandle delegate = forward
                     .invokeVirtualMethod(
                             MethodDescriptor.ofMethod(generatedName, DELEGATE_METHOD_NAME,
-                                    DescriptorUtils.typeToString(providerType)),
+                                    providerType.descriptorName()),
                             forward.getThis());
             ResultHandle ret;
 
@@ -200,7 +217,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
             } else {
                 // make sure we do not use the original method descriptor as it could point to
                 // a default interface method containing class: make sure we invoke it on the provider type.
-                MethodDescriptor virtualMethod = MethodDescriptor.ofMethod(providerTypeName,
+                MethodDescriptor virtualMethod = MethodDescriptor.ofMethod(providerType.className(),
                         originalMethodDescriptor.getName(),
                         originalMethodDescriptor.getReturnType(),
                         originalMethodDescriptor.getParameterTypes());
@@ -214,17 +231,19 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName,
         return classOutput.getResources();
     }
 
-    private void implementMockMethods(ClassCreator clientProxy) {
+    private void implementMockMethods(ClassCreator clientProxy, ProviderType providerType) {
         MethodCreator clear = clientProxy
-                .getMethodCreator(MethodDescriptor.ofMethod(clientProxy.getClassName(), "quarkus$$clearMock", void.class));
-        clear.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, Object.class), clear.getThis(),
+                .getMethodCreator(MethodDescriptor.ofMethod(clientProxy.getClassName(), CLEAR_MOCK_METHOD_NAME, void.class));
+        clear.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, providerType.descriptorName()),
+                clear.getThis(),
                 clear.loadNull());
         clear.returnValue(null);
 
         MethodCreator set = clientProxy
                 .getMethodCreator(
-                        MethodDescriptor.ofMethod(clientProxy.getClassName(), "quarkus$$setMock", void.class, Object.class));
-        set.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, Object.class), set.getThis(),
+                        MethodDescriptor.ofMethod(clientProxy.getClassName(), SET_MOCK_METHOD_NAME, void.class, Object.class));
+        set.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, providerType.descriptorName()),
+                set.getThis(),
                 set.getMethodParam(0));
         set.returnValue(null);
     }
@@ -245,59 +264,40 @@ void createConstructor(ClassCreator clientProxy, String beanClassName, String su
         creator.returnValue(null);
     }
 
-    void implementDelegate(ClassCreator clientProxy, String providerTypeName, FieldDescriptor beanField, BeanInfo bean) {
-        MethodCreator creator = clientProxy.getMethodCreator(DELEGATE_METHOD_NAME, providerTypeName)
+    void implementDelegate(ClassCreator clientProxy, ProviderType providerType, FieldDescriptor beanField, BeanInfo bean) {
+        MethodCreator creator = clientProxy.getMethodCreator(DELEGATE_METHOD_NAME, providerType.descriptorName())
                 .setModifiers(Modifier.PRIVATE);
         if (mockable) {
             //if mockable and mocked just return the mock
             ResultHandle mock = creator.readInstanceField(
-                    FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, Object.class.getName()), creator.getThis());
+                    FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, providerType.descriptorName()),
+                    creator.getThis());
             BytecodeCreator falseBranch = creator.ifNull(mock).falseBranch();
-            falseBranch.returnValue(falseBranch.checkCast(mock, providerTypeName));
+            falseBranch.returnValue(falseBranch.checkCast(mock, providerType.className()));
         }
 
         ResultHandle beanHandle = creator.readInstanceField(beanField, creator.getThis());
-        ResultHandle contextHandle;
 
         if (BuiltinScope.APPLICATION.is(bean.getScope())) {
-            // Application context stored in a field and is always active
-            contextHandle = creator.readInstanceField(
-                    FieldDescriptor.of(clientProxy.getClassName(), CONTEXT_FIELD, InjectableContext.class), creator.getThis());
+            // Application context is stored in a field and is always active
+            creator.returnValue(creator.invokeStaticMethod(MethodDescriptors.CLIENT_PROXIES_GET_APP_SCOPED_DELEGATE,
+                    creator.readInstanceField(
+                            FieldDescriptor.of(clientProxy.getClassName(), CONTEXT_FIELD, InjectableContext.class),
+                            creator.getThis()),
+                    beanHandle));
         } else {
-            // Arc.container()
-            ResultHandle container = creator.invokeStaticMethod(MethodDescriptors.ARC_CONTAINER);
-            // bean.getScope()
-            ResultHandle scope = creator
-                    .invokeInterfaceMethod(MethodDescriptor.ofMethod(InjectableBean.class, "getScope", Class.class),
-                            beanHandle);
-            // getContext()
-            contextHandle = creator.invokeInterfaceMethod(MethodDescriptors.ARC_CONTAINER_GET_ACTIVE_CONTEXT,
-                    container, scope);
-
-            BytecodeCreator inactiveBranch = creator.ifNull(contextHandle).trueBranch();
-            ResultHandle exception = inactiveBranch.newInstance(
-                    MethodDescriptor.ofConstructor(ContextNotActiveException.class, String.class),
-                    inactiveBranch.invokeVirtualMethod(MethodDescriptors.OBJECT_TO_STRING, scope));
-            inactiveBranch.throwException(exception);
+            creator.returnValue(creator.invokeStaticMethod(MethodDescriptors.CLIENT_PROXIES_GET_DELEGATE,
+                    beanHandle));
         }
-
-        AssignableResultHandle ret = creator.createVariable(Object.class);
-        creator.assign(ret, creator.invokeInterfaceMethod(MethodDescriptors.CONTEXT_GET_IF_PRESENT, contextHandle, beanHandle));
-        BytecodeCreator isNullBranch = creator.ifNull(ret).trueBranch();
-        // Create a new contextual instance - new CreationalContextImpl<>()
-        ResultHandle creationContext = isNullBranch
-                .newInstance(MethodDescriptor.ofConstructor(CreationalContextImpl.class, Contextual.class), beanHandle);
-        isNullBranch.assign(ret,
-                isNullBranch.invokeInterfaceMethod(MethodDescriptors.CONTEXT_GET, contextHandle, beanHandle, creationContext));
-        creator.returnValue(ret);
     }
 
-    void implementGetContextualInstance(ClassCreator clientProxy, String providerTypeName) {
+    void implementGetContextualInstance(ClassCreator clientProxy, ProviderType providerType) {
         MethodCreator creator = clientProxy.getMethodCreator(GET_CONTEXTUAL_INSTANCE_METHOD_NAME, Object.class)
                 .setModifiers(Modifier.PUBLIC);
         creator.returnValue(
                 creator.invokeVirtualMethod(
-                        MethodDescriptor.ofMethod(clientProxy.getClassName(), DELEGATE_METHOD_NAME, providerTypeName),
+                        MethodDescriptor.ofMethod(clientProxy.getClassName(), DELEGATE_METHOD_NAME,
+                                providerType.descriptorName()),
                         creator.getThis()));
     }
 
@@ -314,7 +314,7 @@ Collection<MethodInfo> getDelegatingMethods(BeanInfo bean, Consumer<BytecodeTran
         if (bean.isClassBean()) {
             Set<Methods.NameAndDescriptor> methodsFromWhichToRemoveFinal = new HashSet<>();
             ClassInfo classInfo = bean.getTarget().get().asClass();
-            Methods.addDelegatingMethods(bean.getDeployment().getIndex(), classInfo,
+            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), classInfo,
                     methods, methodsFromWhichToRemoveFinal, transformUnproxyableClasses);
             if (!methodsFromWhichToRemoveFinal.isEmpty()) {
                 String className = classInfo.name().toString();
@@ -323,16 +323,16 @@ Collection<MethodInfo> getDelegatingMethods(BeanInfo bean, Consumer<BytecodeTran
             }
         } else if (bean.isProducerMethod()) {
             MethodInfo producerMethod = bean.getTarget().get().asMethod();
-            ClassInfo returnTypeClass = getClassByName(bean.getDeployment().getIndex(), producerMethod.returnType());
-            Methods.addDelegatingMethods(bean.getDeployment().getIndex(), returnTypeClass, methods, null,
+            ClassInfo returnTypeClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), producerMethod.returnType());
+            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), returnTypeClass, methods, null,
                     transformUnproxyableClasses);
         } else if (bean.isProducerField()) {
             FieldInfo producerField = bean.getTarget().get().asField();
-            ClassInfo fieldClass = getClassByName(bean.getDeployment().getIndex(), producerField.type());
-            Methods.addDelegatingMethods(bean.getDeployment().getIndex(), fieldClass, methods, null,
+            ClassInfo fieldClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), producerField.type());
+            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), fieldClass, methods, null,
                     transformUnproxyableClasses);
         } else if (bean.isSynthetic()) {
-            Methods.addDelegatingMethods(bean.getDeployment().getIndex(), bean.getImplClazz(), methods, null,
+            Methods.addDelegatingMethods(bean.getDeployment().getBeanArchiveIndex(), bean.getImplClazz(), methods, null,
                     transformUnproxyableClasses);
         }
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
index 6d77b403dd5ce..21f054215555b 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
@@ -7,8 +7,11 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.Components;
 import io.quarkus.arc.ComponentsProvider;
+import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
 import io.quarkus.gizmo.ResultHandle;
@@ -40,13 +43,17 @@ public class ComponentsProviderGenerator extends AbstractGenerator {
     static final String COMPONENTS_PROVIDER_SUFFIX = "_ComponentsProvider";
     static final String SETUP_PACKAGE = Arc.class.getPackage().getName() + ".setup";
     static final String ADD_OBSERVERS = "addObservers";
+    static final String ADD_REMOVED_BEANS = "addRemovedBeans";
     static final String ADD_BEANS = "addBeans";
 
-    protected final AnnotationLiteralProcessor annotationLiterals;
+    private final AnnotationLiteralProcessor annotationLiterals;
+    private final boolean detectUnusedFalsePositives;
 
-    public ComponentsProviderGenerator(AnnotationLiteralProcessor annotationLiterals, boolean generateSources) {
+    public ComponentsProviderGenerator(AnnotationLiteralProcessor annotationLiterals, boolean generateSources,
+            boolean detectUnusedFalsePositives) {
         super(generateSources);
         this.annotationLiterals = annotationLiterals;
+        this.detectUnusedFalsePositives = detectUnusedFalsePositives;
     }
 
     /**
@@ -81,7 +88,7 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be
         processBeans(componentsProvider, getComponents, beanIdToBeanHandle, beanToInjections, beanToGeneratedName,
                 beanDeployment);
 
-        // Break observers processing into multiple ddObservers() methods
+        // Break observers processing into multiple addObservers() methods
         ResultHandle observersHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(ArrayList.class));
         processObservers(componentsProvider, getComponents, beanDeployment, beanIdToBeanHandle, observersHandle,
                 observerToGeneratedName);
@@ -111,10 +118,29 @@ Collection<Resource> generate(String name, BeanDeployment beanDeployment, Map<Be
                 MethodDescriptor.ofMethod(Map.class, "values", Collection.class),
                 beanIdToBeanHandle);
 
+        // Break removed beans processing into multiple addRemovedBeans() methods
+        ResultHandle removedBeansHandle = getComponents.newInstance(MethodDescriptor.ofConstructor(ArrayList.class));
+        if (detectUnusedFalsePositives) {
+            processRemovedBeans(componentsProvider, getComponents, removedBeansHandle, beanDeployment, classOutput);
+        }
+
+        // Qualifier non-binding members
+        ResultHandle qualifiersNonbindingMembers = getComponents.newInstance(MethodDescriptor.ofConstructor(HashMap.class));
+        for (Entry<DotName, Set<String>> entry : beanDeployment.getQualifierNonbindingMembers().entrySet()) {
+            ResultHandle nonbindingMembers = getComponents.newInstance(MethodDescriptor.ofConstructor(HashSet.class));
+            for (String member : entry.getValue()) {
+                getComponents.invokeInterfaceMethod(MethodDescriptors.SET_ADD, nonbindingMembers,
+                        getComponents.load(member));
+            }
+            getComponents.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, qualifiersNonbindingMembers,
+                    getComponents.load(entry.getKey().toString()), nonbindingMembers);
+        }
+
         ResultHandle componentsHandle = getComponents.newInstance(
                 MethodDescriptor.ofConstructor(Components.class, Collection.class, Collection.class, Collection.class,
-                        Map.class),
-                beansHandle, observersHandle, contextsHandle, transitiveBindingsHandle);
+                        Map.class, Collection.class, Map.class),
+                beansHandle, observersHandle, contextsHandle, transitiveBindingsHandle, removedBeansHandle,
+                qualifiersNonbindingMembers);
         getComponents.returnValue(componentsHandle);
 
         // Finally write the bytecode
@@ -134,7 +160,8 @@ private void processBeans(ClassCreator componentsProvider, MethodCreator getComp
             Map<BeanInfo, String> beanToGeneratedName, BeanDeployment beanDeployment) {
 
         Set<BeanInfo> processed = new HashSet<>();
-        BeanAdder beanAdder = new BeanAdder(componentsProvider, getComponents, processed);
+        BeanAdder beanAdder = new BeanAdder(componentsProvider, getComponents, processed, beanIdToBeanHandle,
+                beanToGeneratedName);
 
         // - iterate over beanToInjections entries and process beans for which all dependencies are already present in the map
         // - when a bean is processed the map entry is removed
@@ -176,12 +203,12 @@ private void processBeans(ClassCreator componentsProvider, MethodCreator getComp
         // Finally process beans and interceptors that are not dependencies
         for (BeanInfo bean : beanDeployment.getBeans()) {
             if (!processed.contains(bean)) {
-                beanAdder.addBean(bean, beanIdToBeanHandle, beanToGeneratedName);
+                beanAdder.addComponent(bean);
             }
         }
         for (BeanInfo interceptor : beanDeployment.getInterceptors()) {
             if (!processed.contains(interceptor)) {
-                beanAdder.addBean(interceptor, beanIdToBeanHandle, beanToGeneratedName);
+                beanAdder.addComponent(interceptor);
             }
         }
 
@@ -191,9 +218,20 @@ private void processBeans(ClassCreator componentsProvider, MethodCreator getComp
 
     private void processObservers(ClassCreator componentsProvider, MethodCreator getComponents, BeanDeployment beanDeployment,
             ResultHandle beanIdToBeanHandle, ResultHandle observersHandle, Map<ObserverInfo, String> observerToGeneratedName) {
-        try (ObserverAdder observerAdder = new ObserverAdder(componentsProvider, getComponents)) {
+        try (ObserverAdder observerAdder = new ObserverAdder(componentsProvider, getComponents, observerToGeneratedName,
+                beanIdToBeanHandle, observersHandle)) {
             for (ObserverInfo observer : beanDeployment.getObservers()) {
-                observerAdder.addObserver(observer, beanIdToBeanHandle, observersHandle, observerToGeneratedName);
+                observerAdder.addComponent(observer);
+            }
+        }
+    }
+
+    private void processRemovedBeans(ClassCreator componentsProvider, MethodCreator getComponents,
+            ResultHandle removedBeansHandle, BeanDeployment beanDeployment, ClassOutput classOutput) {
+        try (RemovedBeanAdder removedBeanAdder = new RemovedBeanAdder(componentsProvider, getComponents, removedBeansHandle,
+                classOutput)) {
+            for (BeanInfo remnovedBean : beanDeployment.getRemovedBeans()) {
+                removedBeanAdder.addComponent(remnovedBean);
             }
         }
     }
@@ -247,7 +285,7 @@ private boolean addBeans(BeanAdder beanAdder,
             BeanInfo bean = entry.getKey();
             if (filter.test(bean)) {
                 iterator.remove();
-                beanAdder.addBean(bean, beanIdToBeanHandle, beanToGeneratedName);
+                beanAdder.addComponent(bean);
                 processed.add(bean);
                 stuck = false;
             }
@@ -265,50 +303,40 @@ private boolean isDependency(BeanInfo bean, Map<BeanInfo, List<BeanInfo>> beanTo
         return false;
     }
 
-    static class ObserverAdder implements AutoCloseable {
+    static class ObserverAdder extends ComponentAdder<ObserverInfo> {
 
-        private static final int GROUP_LIMIT = 30;
-        private int group;
-        private int observersAdded;
-        private MethodCreator addObserversMethod;
-        private final MethodCreator getComponentsMethod;
-        private final ClassCreator componentsProvider;
+        private final Map<ObserverInfo, String> observerToGeneratedName;
+        private final ResultHandle beanIdToBeanHandle;
+        private final ResultHandle observersHandle;
 
-        public ObserverAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod) {
-            this.group = 1;
-            this.getComponentsMethod = getComponentsMethod;
-            this.componentsProvider = componentsProvider;
+        ObserverAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod,
+                Map<ObserverInfo, String> observerToGeneratedName, ResultHandle beanIdToBeanHandle,
+                ResultHandle observersHandle) {
+            super(getComponentsMethod, componentsProvider);
+            this.observerToGeneratedName = observerToGeneratedName;
+            this.beanIdToBeanHandle = beanIdToBeanHandle;
+            this.observersHandle = observersHandle;
         }
 
-        public void close() {
-            if (addObserversMethod != null) {
-                addObserversMethod.returnValue(null);
-            }
+        @Override
+        MethodCreator newAddMethod() {
+            return componentsProvider
+                    .getMethodCreator(ADD_OBSERVERS + group++, void.class, Map.class, List.class)
+                    .setModifiers(ACC_PRIVATE);
         }
 
-        void addObserver(ObserverInfo observer, ResultHandle beanIdToBeanHandle, ResultHandle observersHandle,
-                Map<ObserverInfo, String> observerToGeneratedName) {
-
-            if (addObserversMethod == null || observersAdded >= GROUP_LIMIT) {
-                if (addObserversMethod != null) {
-                    addObserversMethod.returnValue(null);
-                }
-                observersAdded = 0;
-                // First add next addObservers(map) method
-                addObserversMethod = componentsProvider
-                        .getMethodCreator(ADD_OBSERVERS + group++, void.class, Map.class, List.class)
-                        .setModifiers(ACC_PRIVATE);
-                // Invoke addObservers(map) inside the getComponents() method
-                getComponentsMethod.invokeVirtualMethod(
-                        MethodDescriptor.ofMethod(componentsProvider.getClassName(),
-                                addObserversMethod.getMethodDescriptor().getName(), void.class, Map.class, List.class),
-                        getComponentsMethod.getThis(), beanIdToBeanHandle, observersHandle);
-            }
-            observersAdded++;
+        @Override
+        void invokeAddMethod() {
+            getComponentsMethod.invokeVirtualMethod(
+                    MethodDescriptor.ofMethod(componentsProvider.getClassName(),
+                            addMethod.getMethodDescriptor().getName(), void.class, Map.class, List.class),
+                    getComponentsMethod.getThis(), beanIdToBeanHandle, observersHandle);
+        }
 
-            // Append to the addObservers() method body
-            beanIdToBeanHandle = addObserversMethod.getMethodParam(0);
-            observersHandle = addObserversMethod.getMethodParam(1);
+        @Override
+        void addComponentInternal(ObserverInfo observer) {
+            ResultHandle beanIdToBeanHandle = addMethod.getMethodParam(0);
+            ResultHandle observersHandle = addMethod.getMethodParam(1);
 
             String observerType = observerToGeneratedName.get(observer);
             List<ResultHandle> params = new ArrayList<>();
@@ -319,67 +347,168 @@ void addObserver(ObserverInfo observer, ResultHandle beanIdToBeanHandle, ResultH
                         .filter(ip -> !BuiltinBean.resolvesTo(ip))
                         .collect(toList());
                 // First param - declaring bean
-                params.add(addObserversMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
-                        beanIdToBeanHandle, addObserversMethod.load(observer.getDeclaringBean().getIdentifier())));
+                params.add(addMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
+                        beanIdToBeanHandle, addMethod.load(observer.getDeclaringBean().getIdentifier())));
                 paramTypes.add(Type.getDescriptor(Supplier.class));
                 for (InjectionPointInfo injectionPoint : injectionPoints) {
-                    params.add(addObserversMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
-                            beanIdToBeanHandle, addObserversMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
+                    params.add(addMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
+                            beanIdToBeanHandle, addMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
                     paramTypes.add(Type.getDescriptor(Supplier.class));
                 }
             }
-            ResultHandle observerInstance = addObserversMethod.newInstance(
+            ResultHandle observerInstance = addMethod.newInstance(
                     MethodDescriptor.ofConstructor(observerType, paramTypes.toArray(new String[0])),
                     params.toArray(new ResultHandle[0]));
-            addObserversMethod.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, observersHandle, observerInstance);
+            addMethod.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, observersHandle, observerInstance);
         }
 
     }
 
-    static class BeanAdder implements AutoCloseable {
+    class RemovedBeanAdder extends ComponentAdder<BeanInfo> {
 
-        private static final int GROUP_LIMIT = 30;
-        private int group;
-        private int beansWritten;
-        private MethodCreator addBeansMethod;
-        private final MethodCreator getComponentsMethod;
-        private final ClassCreator componentsProvider;
-        private final Set<BeanInfo> processedBeans;
+        private final ResultHandle removedBeansHandle;
+        private final ClassOutput classOutput;
+        private ResultHandle tccl;
 
-        public BeanAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod, Set<BeanInfo> processed) {
-            this.group = 1;
-            this.getComponentsMethod = getComponentsMethod;
-            this.componentsProvider = componentsProvider;
-            this.processedBeans = processed;
+        public RemovedBeanAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod,
+                ResultHandle removedBeansHandle, ClassOutput classOutput) {
+            super(getComponentsMethod, componentsProvider);
+            this.removedBeansHandle = removedBeansHandle;
+            this.classOutput = classOutput;
         }
 
-        public void close() {
-            if (addBeansMethod != null) {
-                addBeansMethod.returnValue(null);
-            }
+        @Override
+        MethodCreator newAddMethod() {
+            MethodCreator addMethod = componentsProvider.getMethodCreator(ADD_REMOVED_BEANS + group++, void.class, List.class)
+                    .setModifiers(ACC_PRIVATE);
+            // Get the TCCL - we will use it later
+            ResultHandle currentThread = addMethod
+                    .invokeStaticMethod(MethodDescriptors.THREAD_CURRENT_THREAD);
+            tccl = addMethod.invokeVirtualMethod(MethodDescriptors.THREAD_GET_TCCL, currentThread);
+            return addMethod;
         }
 
-        void addBean(BeanInfo bean, ResultHandle beanIdToBeanHandle,
-                Map<BeanInfo, String> beanToGeneratedName) {
+        @Override
+        void invokeAddMethod() {
+            getComponentsMethod.invokeVirtualMethod(
+                    MethodDescriptor.ofMethod(componentsProvider.getClassName(),
+                            addMethod.getMethodDescriptor().getName(), void.class, List.class),
+                    getComponentsMethod.getThis(), removedBeansHandle);
+        }
+
+        @Override
+        void addComponentInternal(BeanInfo removedBean) {
+
+            ResultHandle removedBeansHandle = addMethod.getMethodParam(0);
 
-            if (addBeansMethod == null || beansWritten >= GROUP_LIMIT) {
-                if (addBeansMethod != null) {
-                    addBeansMethod.returnValue(null);
+            // Bean types
+            ResultHandle typesHandle = addMethod.newInstance(MethodDescriptor.ofConstructor(HashSet.class));
+            for (org.jboss.jandex.Type type : removedBean.getTypes()) {
+                if (DotNames.OBJECT.equals(type.name())) {
+                    // Skip java.lang.Object
+                    continue;
+                }
+                ResultHandle typeHandle;
+                try {
+                    typeHandle = Types.getTypeHandle(addMethod, type, tccl);
+                } catch (IllegalArgumentException e) {
+                    throw new IllegalStateException(
+                            "Unable to construct the type handle for " + removedBean + ": " + e.getMessage());
+                }
+                addMethod.invokeInterfaceMethod(MethodDescriptors.SET_ADD, typesHandle, typeHandle);
+            }
+
+            // Qualifiers
+            ResultHandle qualifiersHandle;
+            if (!removedBean.getQualifiers().isEmpty() && !removedBean.hasDefaultQualifiers()) {
+
+                qualifiersHandle = addMethod.newInstance(MethodDescriptor.ofConstructor(HashSet.class));
+
+                for (AnnotationInstance qualifierAnnotation : removedBean.getQualifiers()) {
+                    if (DotNames.ANY.equals(qualifierAnnotation.name())) {
+                        // Skip @Any
+                        continue;
+                    }
+                    BuiltinQualifier qualifier = BuiltinQualifier.of(qualifierAnnotation);
+                    if (qualifier != null) {
+                        addMethod.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiersHandle,
+                                qualifier.getLiteralInstance(addMethod));
+                    } else {
+                        // Create annotation literal first
+                        ClassInfo qualifierClass = removedBean.getDeployment().getQualifier(qualifierAnnotation.name());
+                        addMethod.invokeInterfaceMethod(MethodDescriptors.SET_ADD, qualifiersHandle,
+                                annotationLiterals.process(addMethod, classOutput,
+                                        qualifierClass, qualifierAnnotation,
+                                        Types.getPackageName(componentsProvider.getClassName())));
+                    }
                 }
-                beansWritten = 0;
-                // First add next addBeans(map) method
-                addBeansMethod = componentsProvider.getMethodCreator(ADD_BEANS + group++, void.class, Map.class)
-                        .setModifiers(ACC_PRIVATE);
-                // Invoke addBeans(map) inside the getComponents() method
-                getComponentsMethod.invokeVirtualMethod(
-                        MethodDescriptor.ofMethod(componentsProvider.getClassName(),
-                                addBeansMethod.getMethodDescriptor().getName(), void.class, Map.class),
-                        getComponentsMethod.getThis(), beanIdToBeanHandle);
+                qualifiersHandle = addMethod
+                        .invokeStaticMethod(MethodDescriptors.COLLECTIONS_UNMODIFIABLE_SET, qualifiersHandle);
+            } else {
+                qualifiersHandle = addMethod.loadNull();
             }
-            beansWritten++;
 
-            // Append to the addBeans() method body
-            beanIdToBeanHandle = addBeansMethod.getMethodParam(0);
+            InjectableBean.Kind kind;
+            String description = null;
+            if (removedBean.isClassBean()) {
+                kind = null;
+                description = removedBean.getTarget().get().toString();
+            } else if (removedBean.isProducerField()) {
+                kind = InjectableBean.Kind.PRODUCER_FIELD;
+                description = removedBean.getTarget().get().asField().declaringClass().name() + "#"
+                        + removedBean.getTarget().get().asField().name();
+            } else if (removedBean.isProducerMethod()) {
+                kind = InjectableBean.Kind.PRODUCER_METHOD;
+                description = removedBean.getTarget().get().asMethod().declaringClass().name() + "#"
+                        + removedBean.getTarget().get().asMethod().name() + "()";
+            } else {
+                // Interceptors are never removed
+                kind = InjectableBean.Kind.SYNTHETIC;
+            }
+
+            ResultHandle kindHandle = kind != null ? addMethod.readStaticField(
+                    FieldDescriptor.of(InjectableBean.Kind.class, kind.toString(), InjectableBean.Kind.class))
+                    : addMethod.loadNull();
+            ResultHandle removedBeanHandle = addMethod.newInstance(MethodDescriptors.REMOVED_BEAN_IMPL,
+                    kindHandle, description != null ? addMethod.load(description) : addMethod.loadNull(),
+                    typesHandle,
+                    qualifiersHandle);
+            addMethod.invokeInterfaceMethod(MethodDescriptors.LIST_ADD, removedBeansHandle, removedBeanHandle);
+        }
+
+    }
+
+    static class BeanAdder extends ComponentAdder<BeanInfo> {
+
+        private final Set<BeanInfo> processedBeans;
+        private final ResultHandle beanIdToBeanHandle;
+        private final Map<BeanInfo, String> beanToGeneratedName;
+
+        public BeanAdder(ClassCreator componentsProvider, MethodCreator getComponentsMethod, Set<BeanInfo> processed,
+                ResultHandle beanIdToBeanHandle, Map<BeanInfo, String> beanToGeneratedName) {
+            super(getComponentsMethod, componentsProvider);
+            this.processedBeans = processed;
+            this.beanIdToBeanHandle = beanIdToBeanHandle;
+            this.beanToGeneratedName = beanToGeneratedName;
+        }
+
+        @Override
+        MethodCreator newAddMethod() {
+            return componentsProvider.getMethodCreator(ADD_BEANS + group++, void.class, Map.class)
+                    .setModifiers(ACC_PRIVATE);
+        }
+
+        @Override
+        void invokeAddMethod() {
+            getComponentsMethod.invokeVirtualMethod(
+                    MethodDescriptor.ofMethod(componentsProvider.getClassName(),
+                            addMethod.getMethodDescriptor().getName(), void.class, Map.class),
+                    getComponentsMethod.getThis(), beanIdToBeanHandle);
+        }
+
+        @Override
+        void addComponentInternal(BeanInfo bean) {
+            ResultHandle beanIdToBeanHandle = addMethod.getMethodParam(0);
             String beanType = beanToGeneratedName.get(bean);
             if (beanType == null) {
                 throw new IllegalStateException("No bean type found for: " + bean);
@@ -396,19 +525,19 @@ void addBean(BeanInfo bean, ResultHandle beanIdToBeanHandle,
                             "Declaring bean of a producer bean is not available - most probably an unsupported circular dependency use case \n - declaring bean: "
                                     + bean.getDeclaringBean() + "\n - producer bean: " + bean);
                 }
-                params.add(addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
-                        beanIdToBeanHandle, addBeansMethod.load(bean.getDeclaringBean().getIdentifier())));
+                params.add(addMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
+                        beanIdToBeanHandle, addMethod.load(bean.getDeclaringBean().getIdentifier())));
                 paramTypes.add(Type.getDescriptor(Supplier.class));
             }
             for (InjectionPointInfo injectionPoint : injectionPoints) {
                 if (processedBeans.contains(injectionPoint.getResolvedBean())) {
-                    params.add(addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
-                            beanIdToBeanHandle, addBeansMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
+                    params.add(addMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
+                            beanIdToBeanHandle, addMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
                 } else {
                     // Dependency was not processed yet - use MapValueSupplier
-                    params.add(addBeansMethod.newInstance(
+                    params.add(addMethod.newInstance(
                             MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR,
-                            beanIdToBeanHandle, addBeansMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
+                            beanIdToBeanHandle, addMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
                 }
                 paramTypes.add(Type.getDescriptor(Supplier.class));
             }
@@ -417,35 +546,82 @@ void addBean(BeanInfo bean, ResultHandle beanIdToBeanHandle,
                     if (BuiltinBean.resolvesTo(injectionPoint)) {
                         continue;
                     }
-                    params.add(addBeansMethod.newInstance(
+                    params.add(addMethod.newInstance(
                             MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR,
-                            beanIdToBeanHandle, addBeansMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
+                            beanIdToBeanHandle, addMethod.load(injectionPoint.getResolvedBean().getIdentifier())));
                     paramTypes.add(Type.getDescriptor(Supplier.class));
                 }
             }
             for (InterceptorInfo interceptor : bean.getBoundInterceptors()) {
                 if (processedBeans.contains(interceptor)) {
-                    params.add(addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
-                            beanIdToBeanHandle, addBeansMethod.load(interceptor.getIdentifier())));
+                    params.add(addMethod.invokeInterfaceMethod(MethodDescriptors.MAP_GET,
+                            beanIdToBeanHandle, addMethod.load(interceptor.getIdentifier())));
                 } else {
                     // Bound interceptor was not processed yet - use MapValueSupplier
-                    params.add(addBeansMethod.newInstance(
+                    params.add(addMethod.newInstance(
                             MethodDescriptors.MAP_VALUE_SUPPLIER_CONSTRUCTOR,
-                            beanIdToBeanHandle, addBeansMethod.load(interceptor.getIdentifier())));
+                            beanIdToBeanHandle, addMethod.load(interceptor.getIdentifier())));
                 }
                 paramTypes.add(Type.getDescriptor(Supplier.class));
             }
 
             // Foo_Bean bean = new Foo_Bean(bean3)
-            ResultHandle beanInstance = addBeansMethod.newInstance(
+            ResultHandle beanInstance = addMethod.newInstance(
                     MethodDescriptor.ofConstructor(beanType, paramTypes.toArray(new String[0])),
                     params.toArray(new ResultHandle[0]));
             // beans.put(id, bean)
-            final ResultHandle beanIdHandle = addBeansMethod.load(bean.getIdentifier());
-            addBeansMethod.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, beanIdToBeanHandle, beanIdHandle,
+            final ResultHandle beanIdHandle = addMethod.load(bean.getIdentifier());
+            addMethod.invokeInterfaceMethod(MethodDescriptors.MAP_PUT, beanIdToBeanHandle, beanIdHandle,
                     beanInstance);
         }
 
     }
 
+    static abstract class ComponentAdder<T extends InjectionTargetInfo> implements AutoCloseable {
+
+        private static final int GROUP_LIMIT = 30;
+        protected int group;
+        private int componentsAdded;
+        protected MethodCreator addMethod;
+        protected final MethodCreator getComponentsMethod;
+        protected final ClassCreator componentsProvider;
+
+        public ComponentAdder(MethodCreator getComponentsMethod, ClassCreator componentsProvider) {
+            this.group = 1;
+            this.getComponentsMethod = getComponentsMethod;
+            this.componentsProvider = componentsProvider;
+        }
+
+        public void close() {
+            if (addMethod != null) {
+                addMethod.returnValue(null);
+            }
+        }
+
+        void addComponent(T component) {
+
+            if (addMethod == null || componentsAdded >= GROUP_LIMIT) {
+                if (addMethod != null) {
+                    addMethod.returnValue(null);
+                }
+                componentsAdded = 0;
+                // First add next addX() method
+                addMethod = newAddMethod();
+                // Invoke addX() inside the getComponents() method
+                invokeAddMethod();
+            }
+            componentsAdded++;
+
+            // Append component to the addX() method body
+            addComponentInternal(component);
+        }
+
+        abstract MethodCreator newAddMethod();
+
+        abstract void invokeAddMethod();
+
+        abstract void addComponentInternal(T component);
+
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
index 20502b999dd72..3c4909a0b9ffe 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
@@ -2,13 +2,18 @@
 
 import io.quarkus.arc.AlternativePriority;
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableInstance;
 import io.quarkus.arc.impl.ComputingCache;
 import java.lang.annotation.Repeatable;
 import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Initialized;
 import javax.enterprise.context.control.ActivateRequestContext;
 import javax.enterprise.event.Event;
@@ -41,6 +46,7 @@
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 
@@ -72,6 +78,7 @@ public final class DotNames {
     public static final DotName DEFAULT = create(Default.class);
     public static final DotName ANY = create(Any.class);
     public static final DotName BEAN = create(Bean.class);
+    public static final DotName INJECTABLE_BEAN = create(InjectableBean.class);
     public static final DotName BEAN_MANAGER = create(BeanManager.class);
     public static final DotName EVENT = create(Event.class);
     public static final DotName EVENT_METADATA = create(EventMetadata.class);
@@ -79,6 +86,7 @@ public final class DotNames {
     public static final DotName ALTERNATIVE_PRIORITY = create(AlternativePriority.class);
     public static final DotName DEFAULT_BEAN = create(DefaultBean.class);
     public static final DotName SINGLETON = create(Singleton.class);
+    public static final DotName APPLICATION_SCOPED = create(ApplicationScoped.class);
     public static final DotName STEREOTYPE = create(Stereotype.class);
     public static final DotName TYPED = create(Typed.class);
     public static final DotName VETOED = create(Vetoed.class);
@@ -86,11 +94,15 @@ public final class DotNames {
     public static final DotName ENUM = create(Enum.class);
     public static final DotName EXTENSION = create(Extension.class);
     public static final DotName OPTIONAL = create(Optional.class);
+    public static final DotName OPTIONAL_INT = create(OptionalInt.class);
+    public static final DotName OPTIONAL_LONG = create(OptionalLong.class);
+    public static final DotName OPTIONAL_DOUBLE = create(OptionalDouble.class);
     public static final DotName NAMED = create(Named.class);
     public static final DotName ACTIVATE_REQUEST_CONTEXT = create(ActivateRequestContext.class);
     public static final DotName TRANSACTION_PHASE = create(TransactionPhase.class);
     public static final DotName INITIALIZED = create(Initialized.class);
     public static final DotName TRANSIENT_REFERENCE = create(TransientReference.class);
+    public static final DotName INVOCATION_CONTEXT = create(InvocationContext.class);
 
     public static final DotName BOOLEAN = create(Boolean.class);
     public static final DotName BYTE = create(Byte.class);
@@ -111,7 +123,7 @@ private DotNames() {
      * Note that this method does not attempt to detect a nested class because the computing cache is shared with the
      * {@link #create(String)} variant and so the results would be inconsistent. Therefore, this method should only be used for
      * top-level classes.
-     * 
+     *
      * @param clazz
      * @return the computed dot name
      */
@@ -123,7 +135,7 @@ static DotName create(Class<?> clazz) {
      * Note that the dollar sign is a valid character for class names so we cannot detect a nested class here. Therefore, this
      * method returns a dot name for which {@link DotName#local()} returns {@code Foo$Bar} for the parameter
      * "com.foo.Foo$Bar".
-     * 
+     *
      * @param name
      * @return the computed dot name
      */
@@ -139,7 +151,6 @@ static DotName create(String name) {
     }
 
     /**
-     * 
      * @param clazz
      * @return the simple name for the given top-level or nested class
      */
@@ -169,7 +180,7 @@ public static String simpleName(DotName dotName) {
      * method returns "Foo$Bar" for the parameter "com.foo.Foo$Bar". Use {@link #simpleName(ClassInfo)} when you need to
      * distinguish
      * the nested classes.
-     * 
+     *
      * @param name
      * @return the simple name
      */
@@ -186,4 +197,20 @@ public static String packageName(DotName dotName) {
         return name.substring(0, index);
     }
 
+    /**
+     * Returns a package name with a trailing '/'. If the class is in the default package then this returns
+     * the empty string.
+     * <p>
+     * This method should be used to determine the package to generate classes in to ensure the default package is handled
+     * correctly.
+     */
+    public static String internalPackageNameWithTrailingSlash(DotName dotName) {
+        String name = dotName.toString();
+        int index = name.lastIndexOf('.');
+        if (index == -1) {
+            return "";
+        }
+        return name.substring(0, index).replace(".", "/") + "/";
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java
index d97612ed9bacc..a474c0f044dde 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Injection.java
@@ -130,7 +130,7 @@ private static void forClassBean(ClassInfo beanClass, ClassInfo classInfo, BeanD
         }
 
         if (!classInfo.superName().equals(DotNames.OBJECT)) {
-            ClassInfo info = getClassByName(beanDeployment.getIndex(), classInfo.superName());
+            ClassInfo info = getClassByName(beanDeployment.getBeanArchiveIndex(), classInfo.superName());
             if (info != null) {
                 forClassBean(beanClass, info, beanDeployment, injections, transformer, true);
             }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java
index 993324e7ecf44..a26da991c5894 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java
@@ -1,6 +1,5 @@
 package io.quarkus.arc.processor;
 
-import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName;
 import static org.objectweb.asm.Opcodes.ACC_FINAL;
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
@@ -58,7 +57,7 @@ public InterceptorGenerator(AnnotationLiteralProcessor annotationLiterals, Predi
      */
     Collection<Resource> generate(InterceptorInfo interceptor) {
 
-        Type providerType = interceptor.getProviderType();
+        ProviderType providerType = new ProviderType(interceptor.getProviderType());
         ClassInfo interceptorClass = interceptor.getTarget().get().asClass();
         String baseName;
         if (interceptorClass.enclosingClass() != null) {
@@ -66,8 +65,6 @@ Collection<Resource> generate(InterceptorInfo interceptor) {
         } else {
             baseName = DotNames.simpleName(interceptorClass);
         }
-        ClassInfo providerClass = getClassByName(interceptor.getDeployment().getIndex(), providerType.name());
-        String providerTypeName = providerClass.name().toString();
         String targetPackage = DotNames.packageName(providerType.name());
         String generatedName = generatedNameFromTarget(targetPackage, baseName, BEAN_SUFFIX);
         beanToGeneratedName.put(interceptor, generatedName);
@@ -100,10 +97,11 @@ Collection<Resource> generate(InterceptorInfo interceptor) {
 
         implementGetIdentifier(interceptor, interceptorCreator);
         implementSupplierGet(interceptorCreator);
-        implementCreate(classOutput, interceptorCreator, interceptor, providerTypeName, baseName, injectionPointToProviderField,
+        implementCreate(classOutput, interceptorCreator, interceptor, providerType, baseName,
+                injectionPointToProviderField,
                 interceptorToProviderField,
                 reflectionRegistration, targetPackage, isApplicationClass);
-        implementGet(interceptor, interceptorCreator, providerTypeName, baseName);
+        implementGet(interceptor, interceptorCreator, providerType, baseName);
         implementGetTypes(interceptorCreator, beanTypes.getFieldDescriptor());
         implementGetBeanClass(interceptor, interceptorCreator);
         // Interceptors are always @Dependent and have always default qualifiers
@@ -111,9 +109,12 @@ Collection<Resource> generate(InterceptorInfo interceptor) {
         // InjectableInterceptor methods
         implementGetInterceptorBindings(interceptorCreator, bindings.getFieldDescriptor());
         implementIntercepts(interceptorCreator, interceptor);
-        implementIntercept(interceptorCreator, interceptor, providerTypeName, reflectionRegistration, isApplicationClass);
+        implementIntercept(interceptorCreator, interceptor, providerType, reflectionRegistration, isApplicationClass);
         implementGetPriority(interceptorCreator, interceptor);
 
+        implementEquals(interceptor, interceptorCreator);
+        implementHashCode(interceptor, interceptorCreator);
+
         interceptorCreator.close();
         return classOutput.getResources();
 
@@ -192,25 +193,25 @@ private void addIntercepts(InterceptorInfo interceptor, InterceptionType interce
      *
      * @see InjectableInterceptor#intercept(InterceptionType, Object, javax.interceptor.InvocationContext)
      */
-    protected void implementIntercept(ClassCreator creator, InterceptorInfo interceptor, String providerTypeName,
+    protected void implementIntercept(ClassCreator creator, InterceptorInfo interceptor, ProviderType providerType,
             ReflectionRegistration reflectionRegistration, boolean isApplicationClass) {
         MethodCreator intercept = creator
                 .getMethodCreator("intercept", Object.class, InterceptionType.class, Object.class, InvocationContext.class)
                 .setModifiers(ACC_PUBLIC).addException(Exception.class);
 
-        addIntercept(intercept, interceptor.getAroundInvoke(), InterceptionType.AROUND_INVOKE, providerTypeName,
+        addIntercept(intercept, interceptor.getAroundInvoke(), InterceptionType.AROUND_INVOKE, providerType,
                 reflectionRegistration, isApplicationClass);
-        addIntercept(intercept, interceptor.getPostConstruct(), InterceptionType.POST_CONSTRUCT, providerTypeName,
+        addIntercept(intercept, interceptor.getPostConstruct(), InterceptionType.POST_CONSTRUCT, providerType,
                 reflectionRegistration, isApplicationClass);
-        addIntercept(intercept, interceptor.getPreDestroy(), InterceptionType.PRE_DESTROY, providerTypeName,
+        addIntercept(intercept, interceptor.getPreDestroy(), InterceptionType.PRE_DESTROY, providerType,
                 reflectionRegistration, isApplicationClass);
-        addIntercept(intercept, interceptor.getAroundConstruct(), InterceptionType.AROUND_CONSTRUCT, providerTypeName,
+        addIntercept(intercept, interceptor.getAroundConstruct(), InterceptionType.AROUND_CONSTRUCT, providerType,
                 reflectionRegistration, isApplicationClass);
         intercept.returnValue(intercept.loadNull());
     }
 
     private void addIntercept(MethodCreator intercept, MethodInfo interceptorMethod, InterceptionType interceptionType,
-            String providerTypeName,
+            ProviderType providerType,
             ReflectionRegistration reflectionRegistration, boolean isApplicationClass) {
         if (interceptorMethod != null) {
             ResultHandle enumValue = intercept
@@ -222,10 +223,9 @@ private void addIntercept(MethodCreator intercept, MethodInfo interceptorMethod,
             Class<?> retType = null;
             if (InterceptionType.AROUND_INVOKE.equals(interceptionType)) {
                 retType = Object.class;
-            } else if (InterceptionType.AROUND_CONSTRUCT.equals(interceptionType)) {
-                retType = interceptorMethod.returnType().kind().equals(Type.Kind.VOID) ? void.class : Object.class;
             } else {
-                retType = void.class;
+                // @PostConstruct, @PreDestroy, @AroundConstruct
+                retType = interceptorMethod.returnType().kind().equals(Type.Kind.VOID) ? void.class : Object.class;
             }
             ResultHandle ret;
             if (Modifier.isPrivate(interceptorMethod.flags())) {
@@ -245,7 +245,8 @@ private void addIntercept(MethodCreator intercept, MethodInfo interceptorMethod,
                         trueBranch.load(interceptorMethod.name()), paramTypesArray, intercept.getMethodParam(1), argsArray);
             } else {
                 ret = trueBranch.invokeVirtualMethod(
-                        MethodDescriptor.ofMethod(providerTypeName, interceptorMethod.name(), retType, InvocationContext.class),
+                        MethodDescriptor.ofMethod(providerType.className(), interceptorMethod.name(), retType,
+                                InvocationContext.class),
                         intercept.getMethodParam(1), intercept.getMethodParam(2));
             }
             trueBranch.returnValue(InterceptionType.AROUND_INVOKE.equals(interceptionType) ? ret : trueBranch.loadNull());
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
index 929c0addf006f..a4f62c25d5147 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
@@ -1,5 +1,9 @@
 package io.quarkus.arc.processor;
 
+import static io.quarkus.arc.processor.IndexClassLookupUtils.getClassByName;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -7,6 +11,7 @@
 import javax.enterprise.inject.spi.InterceptionType;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
@@ -47,44 +52,61 @@ public class InterceptorInfo extends BeanInfo implements Comparable<InterceptorI
                 null, null, null, Collections.emptyList(), null, false);
         this.bindings = bindings;
         this.priority = priority;
-        MethodInfo aroundInvoke = null;
-        MethodInfo aroundConstruct = null;
-        MethodInfo postConstruct = null;
-        MethodInfo preDestroy = null;
-        for (MethodInfo method : target.asClass().methods()) {
-            if (aroundInvoke == null && method.hasAnnotation(DotNames.AROUND_INVOKE)) {
-                aroundInvoke = method;
-            } else if (method.hasAnnotation(DotNames.AROUND_CONSTRUCT)) {
-                // validate compliance with rules for AroundConstruct methods
-                if (!method.parameters().equals(Collections.singletonList(
-                        Type.create(DotName.createSimple("javax.interceptor.InvocationContext"), Type.Kind.CLASS)))) {
-                    throw new IllegalStateException(
-                            "@AroundConstruct must have exactly one argument of type javax.interceptor.InvocationContext, but method "
-                                    + method.asMethod() + " declared by " + method.declaringClass()
-                                    + " violates this.");
+        List<MethodInfo> aroundInvokes = new ArrayList<>();
+        List<MethodInfo> aroundConstructs = new ArrayList<>();
+        List<MethodInfo> postConstructs = new ArrayList<>();
+        List<MethodInfo> preDestroys = new ArrayList<>();
+
+        ClassInfo aClass = target.asClass();
+        while (aClass != null) {
+            for (MethodInfo method : aClass.methods()) {
+                if (Modifier.isStatic(method.flags())) {
+                    continue;
+                }
+                if (method.hasAnnotation(DotNames.AROUND_INVOKE)) {
+                    aroundInvokes.add(validateSignature(method));
+                }
+                if (method.hasAnnotation(DotNames.AROUND_CONSTRUCT)) {
+                    aroundConstructs.add(validateSignature(method));
                 }
-                if (!method.returnType().kind().equals(Type.Kind.VOID) &&
-                        !method.returnType().name().equals(DotNames.OBJECT)) {
-                    throw new IllegalStateException("Return type of @AroundConstruct method must be Object or void, but method "
-                            + method.asMethod() + " declared by " + method.declaringClass()
-                            + " violates this.");
+                if (method.hasAnnotation(DotNames.POST_CONSTRUCT)) {
+                    postConstructs.add(validateSignature(method));
+                }
+                if (method.hasAnnotation(DotNames.PRE_DESTROY)) {
+                    preDestroys.add(validateSignature(method));
                 }
-                aroundConstruct = method;
-            } else if (postConstruct == null && method.hasAnnotation(DotNames.POST_CONSTRUCT)) {
-                postConstruct = method;
-            } else if (preDestroy == null && method.hasAnnotation(DotNames.PRE_DESTROY)) {
-                preDestroy = method;
             }
+
+            DotName superTypeName = aClass.superName();
+            aClass = superTypeName == null || DotNames.OBJECT.equals(superTypeName) ? null
+                    : getClassByName(beanDeployment.getBeanArchiveIndex(), superTypeName);
         }
-        this.aroundInvoke = aroundInvoke;
-        this.aroundConstruct = aroundConstruct;
-        this.postConstruct = postConstruct;
-        this.preDestroy = preDestroy;
+
+        this.aroundInvoke = aroundInvokes.isEmpty() ? null : aroundInvokes.get(0);
+        this.aroundConstruct = aroundConstructs.isEmpty() ? null : aroundConstructs.get(0);
+        this.postConstruct = postConstructs.isEmpty() ? null : postConstructs.get(0);
+        this.preDestroy = preDestroys.isEmpty() ? null : preDestroys.get(0);
         if (aroundConstruct == null && aroundInvoke == null && preDestroy == null && postConstruct == null) {
             LOGGER.warnf("%s declares no around-invoke method nor a lifecycle callback!", this);
         }
     }
 
+    private MethodInfo validateSignature(MethodInfo method) {
+        List<Type> parameters = method.parameters();
+        if (parameters.size() != 1 || !parameters.get(0).name().equals(DotNames.INVOCATION_CONTEXT)) {
+            throw new IllegalStateException(
+                    "An interceptor method must accept exactly one parameter of type javax.interceptor.InvocationContext: "
+                            + method + " declared on " + method.declaringClass());
+        }
+        if (!method.returnType().kind().equals(Type.Kind.VOID) &&
+                !method.returnType().name().equals(DotNames.OBJECT)) {
+            throw new IllegalStateException(
+                    "The return type of an interceptor method must be java.lang.Object or void: "
+                            + method + " declared on " + method.declaringClass());
+        }
+        return method;
+    }
+
     public Set<AnnotationInstance> getBindings() {
         return bindings;
     }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java
index b9b4e7f182ff9..5a61a52eeecf6 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorResolver.java
@@ -10,7 +10,7 @@
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 
-public class InterceptorResolver {
+public final class InterceptorResolver {
 
     private final BeanDeployment beanDeployment;
 
@@ -82,12 +82,13 @@ private boolean isInterceptorBinding(AnnotationInstance interceptorBinding, Anno
         if (candidate.name().equals(interceptorBinding.name())) {
             // Must have the same annotation member value for each member which is not annotated @Nonbinding
             boolean matches = true;
-            Set<String> nonBindingFields = beanDeployment.getNonBindingFields(interceptorBinding.name());
-            for (AnnotationValue value : candidate.valuesWithDefaults(beanDeployment.getIndex())) {
+            Set<String> nonBindingFields = beanDeployment.getInterceptorNonbindingMembers(interceptorBinding.name());
+            for (AnnotationValue value : candidate.valuesWithDefaults(beanDeployment.getBeanArchiveIndex())) {
                 String annotationField = value.name();
                 if (!interceptorBindingClass.method(annotationField).hasAnnotation(DotNames.NONBINDING)
                         && !nonBindingFields.contains(annotationField)
-                        && !value.equals(interceptorBinding.valueWithDefault(beanDeployment.getIndex(), annotationField))) {
+                        && !value.equals(
+                                interceptorBinding.valueWithDefault(beanDeployment.getBeanArchiveIndex(), annotationField))) {
                     matches = false;
                     break;
                 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java
index 182121277f344..474ad3ef79280 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Interceptors.java
@@ -27,15 +27,15 @@ static InterceptorInfo createInterceptor(ClassInfo interceptorClass, BeanDeploym
         Integer priority = 0;
         boolean priorityDeclared = false;
         for (AnnotationInstance annotation : store.getAnnotations(interceptorClass)) {
-            if (beanDeployment.getInterceptorBinding(annotation.name()) != null) {
-                bindings.add(annotation);
-                // can also be a transitive binding
-                Set<AnnotationInstance> transitiveInterceptorBindings = beanDeployment
-                        .getTransitiveInterceptorBindings(annotation.name());
-                if (transitiveInterceptorBindings != null) {
-                    bindings.addAll(transitiveInterceptorBindings);
-                }
-            } else if (annotation.name().equals(DotNames.PRIORITY)) {
+            bindings.addAll(beanDeployment.extractInterceptorBindings(annotation));
+            // can also be a transitive binding
+            Set<AnnotationInstance> transitiveInterceptorBindings = beanDeployment
+                    .getTransitiveInterceptorBindings(annotation.name());
+            if (transitiveInterceptorBindings != null) {
+                bindings.addAll(transitiveInterceptorBindings);
+            }
+
+            if (annotation.name().equals(DotNames.PRIORITY)) {
                 priority = annotation.value().asInt();
                 priorityDeclared = true;
             }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java
index aa3352c08c3b6..6e2e68273bfb5 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java
@@ -4,9 +4,11 @@
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.ClientProxy;
 import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InjectableBean.Kind;
 import io.quarkus.arc.InjectableContext;
 import io.quarkus.arc.InjectableInterceptor;
 import io.quarkus.arc.InjectableReferenceProvider;
+import io.quarkus.arc.impl.ClientProxies;
 import io.quarkus.arc.impl.CreationalContextImpl;
 import io.quarkus.arc.impl.FixedValueSupplier;
 import io.quarkus.arc.impl.InjectableReferenceProviders;
@@ -14,7 +16,9 @@
 import io.quarkus.arc.impl.InterceptorInvocation;
 import io.quarkus.arc.impl.InvocationContexts;
 import io.quarkus.arc.impl.MapValueSupplier;
+import io.quarkus.arc.impl.Objects;
 import io.quarkus.arc.impl.Reflections;
+import io.quarkus.arc.impl.RemovedBeanImpl;
 import io.quarkus.gizmo.MethodDescriptor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -75,10 +79,15 @@ public final class MethodDescriptors {
     public static final MethodDescriptor OBJECT_EQUALS = MethodDescriptor.ofMethod(Object.class, "equals", boolean.class,
             Object.class);
 
+    public static final MethodDescriptor OBJECT_HASH_CODE = MethodDescriptor.ofMethod(Object.class, "hashCode", int.class);
+
     public static final MethodDescriptor OBJECT_TO_STRING = MethodDescriptor.ofMethod(Object.class, "toString", String.class);
 
     public static final MethodDescriptor OBJECT_CONSTRUCTOR = MethodDescriptor.ofConstructor(Object.class);
 
+    public static final MethodDescriptor OBJECTS_REFERENCE_EQUALS = MethodDescriptor.ofMethod(Objects.class, "referenceEquals",
+            boolean.class, Object.class, Object.class);
+
     public static final MethodDescriptor INTERCEPTOR_INVOCATION_POST_CONSTRUCT = MethodDescriptor.ofMethod(
             InterceptorInvocation.class,
             "postConstruct",
@@ -231,6 +240,15 @@ public final class MethodDescriptors {
             String.class,
             boolean.class, ClassLoader.class);
 
+    public static final MethodDescriptor REMOVED_BEAN_IMPL = MethodDescriptor.ofConstructor(RemovedBeanImpl.class, Kind.class,
+            String.class, Set.class, Set.class);
+
+    public static final MethodDescriptor CLIENT_PROXIES_GET_APP_SCOPED_DELEGATE = MethodDescriptor.ofMethod(ClientProxies.class,
+            "getApplicationScopedDelegate", Object.class, InjectableContext.class, InjectableBean.class);
+
+    public static final MethodDescriptor CLIENT_PROXIES_GET_DELEGATE = MethodDescriptor.ofMethod(ClientProxies.class,
+            "getDelegate", Object.class, InjectableBean.class);
+
     private MethodDescriptors() {
     }
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
index 52bde54593077..d747ece6a63f7 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
@@ -14,6 +14,7 @@
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
@@ -21,6 +22,7 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
 import org.jboss.jandex.TypeVariable;
 import org.jboss.logging.Logger;
 import org.objectweb.asm.ClassVisitor;
@@ -40,6 +42,8 @@ final class Methods {
     public static final String CLINIT = "<clinit>";
     // copied from java.lang.reflect.Modifier.SYNTHETIC
     static final int SYNTHETIC = 0x00001000;
+    // copied from java.lang.reflect.Modifier.BRIDGE
+    static final int BRIDGE = 0x00000040;
     public static final String TO_STRING = "toString";
 
     private static final List<String> IGNORED_METHODS = initIgnoredMethods();
@@ -58,6 +62,10 @@ static boolean isSynthetic(MethodInfo method) {
         return (method.flags() & SYNTHETIC) != 0;
     }
 
+    static boolean isBridge(MethodInfo method) {
+        return (method.flags() & BRIDGE) != 0;
+    }
+
     static void addDelegatingMethods(IndexView index, ClassInfo classInfo, Map<MethodKey, MethodInfo> methods,
             Set<NameAndDescriptor> methodsFromWhichToRemoveFinal, boolean transformUnproxyableClasses) {
         // TODO support interfaces default methods
@@ -134,23 +142,37 @@ static Set<MethodInfo> addInterceptedMethodCandidates(BeanDeployment beanDeploym
             Map<MethodKey, Set<AnnotationInstance>> candidates,
             List<AnnotationInstance> classLevelBindings, Consumer<BytecodeTransformer> bytecodeTransformerConsumer,
             boolean transformUnproxyableClasses) {
+        return addInterceptedMethodCandidates(beanDeployment, classInfo, candidates, classLevelBindings,
+                bytecodeTransformerConsumer, transformUnproxyableClasses, new SubclassSkipPredicate(), false);
+    }
+
+    static Set<MethodInfo> addInterceptedMethodCandidates(BeanDeployment beanDeployment, ClassInfo classInfo,
+            Map<MethodKey, Set<AnnotationInstance>> candidates,
+            List<AnnotationInstance> classLevelBindings, Consumer<BytecodeTransformer> bytecodeTransformerConsumer,
+            boolean transformUnproxyableClasses, SubclassSkipPredicate skipPredicate, boolean ignoreMethodLevelBindings) {
 
         Set<NameAndDescriptor> methodsFromWhichToRemoveFinal = new HashSet<>();
         Set<MethodInfo> finalMethodsFoundAndNotChanged = new HashSet<>();
+        skipPredicate.startProcessing(classInfo);
+
         for (MethodInfo method : classInfo.methods()) {
-            if (skipForSubclass(method)) {
+            if (skipPredicate.test(method)) {
                 continue;
             }
-            Collection<AnnotationInstance> methodAnnnotations = beanDeployment.getAnnotations(method);
-            List<AnnotationInstance> methodLevelBindings = methodAnnnotations.stream()
-                    .filter(a -> beanDeployment.getInterceptorBinding(a.name()) != null)
-                    .collect(Collectors.toList());
             Set<AnnotationInstance> merged = new HashSet<>();
-            merged.addAll(methodLevelBindings);
-            for (AnnotationInstance classLevelBinding : classLevelBindings) {
-                if (methodLevelBindings.isEmpty()
-                        || methodLevelBindings.stream().noneMatch(a -> classLevelBinding.name().equals(a.name()))) {
-                    merged.add(classLevelBinding);
+            if (ignoreMethodLevelBindings) {
+                merged.addAll(classLevelBindings);
+            } else {
+                Collection<AnnotationInstance> methodAnnnotations = beanDeployment.getAnnotations(method);
+                List<AnnotationInstance> methodLevelBindings = methodAnnnotations.stream()
+                        .flatMap(a -> beanDeployment.extractInterceptorBindings(a).stream())
+                        .collect(Collectors.toList());
+                merged.addAll(methodLevelBindings);
+                for (AnnotationInstance classLevelBinding : classLevelBindings) {
+                    if (methodLevelBindings.isEmpty()
+                            || methodLevelBindings.stream().noneMatch(a -> classLevelBinding.name().equals(a.name()))) {
+                        merged.add(classLevelBinding);
+                    }
                 }
             }
             if (!merged.isEmpty()) {
@@ -168,24 +190,31 @@ static Set<MethodInfo> addInterceptedMethodCandidates(BeanDeployment beanDeploym
                 }
             }
         }
+        skipPredicate.methodsProcessed();
+
         if (!methodsFromWhichToRemoveFinal.isEmpty()) {
             bytecodeTransformerConsumer.accept(
                     new BytecodeTransformer(classInfo.name().toString(),
                             new RemoveFinalFromMethod(classInfo.name().toString(), methodsFromWhichToRemoveFinal)));
         }
-        if (classInfo.superClassType() != null) {
-            ClassInfo superClassInfo = getClassByName(beanDeployment.getIndex(), classInfo.superName());
+
+        if (!classInfo.superName().equals(DotNames.OBJECT)) {
+            ClassInfo superClassInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), classInfo.superName());
             if (superClassInfo != null) {
-                finalMethodsFoundAndNotChanged.addAll(addInterceptedMethodCandidates(beanDeployment, superClassInfo, candidates,
-                        classLevelBindings, bytecodeTransformerConsumer, transformUnproxyableClasses));
+                finalMethodsFoundAndNotChanged
+                        .addAll(addInterceptedMethodCandidates(beanDeployment, superClassInfo, candidates,
+                                classLevelBindings, bytecodeTransformerConsumer, transformUnproxyableClasses, skipPredicate,
+                                ignoreMethodLevelBindings));
             }
         }
+
         for (DotName i : classInfo.interfaceNames()) {
-            ClassInfo interfaceInfo = getClassByName(beanDeployment.getIndex(), i);
+            ClassInfo interfaceInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), i);
             if (interfaceInfo != null) {
                 //interfaces can't have final methods
                 addInterceptedMethodCandidates(beanDeployment, interfaceInfo, candidates,
-                        classLevelBindings, bytecodeTransformerConsumer, transformUnproxyableClasses);
+                        classLevelBindings, bytecodeTransformerConsumer, transformUnproxyableClasses,
+                        skipPredicate, true);
             }
         }
         return finalMethodsFoundAndNotChanged;
@@ -228,20 +257,6 @@ public int hashCode() {
         }
     }
 
-    private static boolean skipForSubclass(MethodInfo method) {
-        if (Modifier.isStatic(method.flags())) {
-            return true;
-        }
-        if (IGNORED_METHODS.contains(method.name())) {
-            return true;
-        }
-        if (method.declaringClass().name().equals(DotNames.OBJECT)) {
-            return true;
-        }
-        // We intentionally do not skip final methods here - these are handled later
-        return false;
-    }
-
     static class MethodKey {
 
         final String name;
@@ -298,6 +313,10 @@ static boolean isOverriden(MethodInfo method, Collection<MethodInfo> previousMet
         return false;
     }
 
+    static boolean isOverriden(Methods.MethodKey method, Collection<Methods.MethodKey> previousMethods) {
+        return previousMethods.contains(method);
+    }
+
     static boolean matchesSignature(MethodInfo method, MethodInfo subclassMethod) {
         if (!method.name().equals(subclassMethod.name())) {
             return false;
@@ -369,4 +388,151 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
         }
     }
 
+    /**
+     * This stateful predicate can be used to skip methods that should not be added to the generated subclass.
+     * <p>
+     * Don't forget to call {@link SubclassSkipPredicate#startProcessing(ClassInfo)} before the methods are processed and
+     * {@link SubclassSkipPredicate#methodsProcessed()} afterwards.
+     */
+    static class SubclassSkipPredicate implements Predicate<MethodInfo> {
+
+        private ClassInfo clazz;
+        private List<MethodInfo> regularMethods;
+        private Set<MethodInfo> bridgeMethods = new HashSet<>();
+
+        void startProcessing(ClassInfo clazz) {
+            this.clazz = clazz;
+            this.regularMethods = new ArrayList<>();
+            for (MethodInfo method : clazz.methods()) {
+                if (!Modifier.isAbstract(method.flags()) && !method.isSynthetic() && !isBridge(method)) {
+                    regularMethods.add(method);
+                }
+            }
+        }
+
+        void methodsProcessed() {
+            for (MethodInfo method : clazz.methods()) {
+                if (isBridge(method)) {
+                    bridgeMethods.add(method);
+                }
+            }
+        }
+
+        @Override
+        public boolean test(MethodInfo method) {
+            if (isBridge(method)) {
+                // Skip bridge methods that have a corresponding "implementation method" on the same class
+                // The algorithm we use to detect these methods is best effort, i.e. there might be use cases where the detection fails
+                return hasImplementation(method);
+            }
+            if (isOverridenByBridgeMethod(method)) {
+                return true;
+            }
+            if (Modifier.isStatic(method.flags())) {
+                return true;
+            }
+            if (IGNORED_METHODS.contains(method.name())) {
+                return true;
+            }
+            if (method.declaringClass().name().equals(DotNames.OBJECT)) {
+                return true;
+            }
+            if (Modifier.isInterface(clazz.flags()) && Modifier.isInterface(method.declaringClass().flags())
+                    && Modifier.isPublic(method.flags())
+                    && !Modifier.isAbstract(method.flags()) && !Modifier.isStatic(method.flags())) {
+                // Do not skip default methods - public non-abstract instance methods declared in an interface
+                return false;
+            }
+            // Note that we intentionally do not skip final methods here - these are handled later
+            return false;
+        }
+
+        private boolean hasImplementation(MethodInfo bridge) {
+            for (MethodInfo declaredMethod : regularMethods) {
+                if (bridge.name().equals(declaredMethod.name())) {
+                    List<Type> params = declaredMethod.parameters();
+                    List<Type> bridgeParams = bridge.parameters();
+                    if (params.size() != bridgeParams.size()) {
+                        continue;
+                    }
+                    boolean paramsNotMatching = false;
+                    for (int i = 0; i < bridgeParams.size(); i++) {
+                        Type bridgeParam = bridgeParams.get(i);
+                        Type param = params.get(i);
+                        if (param.name().equals(bridgeParam.name())
+                                || bridgeParam.name().equals(DotNames.OBJECT)) {
+                            continue;
+                        } else {
+                            paramsNotMatching = true;
+                            break;
+                        }
+                    }
+                    if (paramsNotMatching) {
+                        continue;
+                    }
+                    if (!Modifier.isInterface(clazz.flags())) {
+                        if (bridge.returnType().name().equals(DotNames.OBJECT) || Modifier.isAbstract(declaredMethod.flags())) {
+                            // bridge method with matching signature has Object as return type
+                            // or the method we compare against is abstract meaning the bridge overrides it
+                            // both cases are a match
+                            return true;
+                        } else {
+                            // as a last resort, we simply check equality of return Type
+                            return bridge.returnType().name().equals(declaredMethod.returnType().name());
+                        }
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private boolean isOverridenByBridgeMethod(MethodInfo method) {
+            for (MethodInfo bridge : bridgeMethods) {
+                if (method.name().equals(bridge.name()) && parametersMatch(method, bridge)) {
+                    if (Modifier.isInterface(clazz.flags())) {
+                        // For interfaces we do not consider return types when going through processed bridge methods
+                        return true;
+                    } else {
+                        // Test return type
+                        if (bridge.returnType().name().equals(DotNames.OBJECT) || Modifier.isAbstract(method.flags())) {
+                            // bridge method with matching signature has Object as return type
+                            // or the method we compare against is abstract meaning the bridge overrides it
+                            // both cases are a match
+                            return true;
+                        } else {
+                            if (bridge.returnType().kind() == Kind.CLASS
+                                    && method.returnType().kind() == Kind.TYPE_VARIABLE) {
+                                // in this case we have encountered a bridge method with specific return type in subclass
+                                // and we are observing a TypeVariable return type in superclass, this is a match
+                                return true;
+                            } else {
+                                // as a last resort, we simply check equality of return Type
+                                return bridge.returnType().equals(method.returnType());
+                            }
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        private boolean parametersMatch(MethodInfo method, MethodInfo bridge) {
+            List<Type> params = method.parameters();
+            List<Type> bridgeParams = bridge.parameters();
+            if (bridgeParams.size() != params.size()) {
+                return false;
+            }
+            for (int i = 0; i < params.size(); i++) {
+                Type param = params.get(i);
+                Type bridgeParam = bridgeParams.get(i);
+                // Compare the raw type names
+                if (!bridgeParam.name().equals(param.name())) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java
index 29565b93f7a8a..e5869a93fc458 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java
@@ -1,13 +1,16 @@
 package io.quarkus.arc.processor;
 
+import static io.quarkus.arc.processor.ClientProxyGenerator.MOCK_FIELD;
 import static org.objectweb.asm.Opcodes.ACC_FINAL;
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACC_VOLATILE;
 
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableObserverMethod;
 import io.quarkus.arc.impl.CreationalContextImpl;
 import io.quarkus.arc.impl.CurrentInjectionPointProvider;
+import io.quarkus.arc.impl.Mockable;
 import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector;
 import io.quarkus.arc.processor.BuiltinBean.GeneratorContext;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
@@ -66,11 +69,12 @@ public class ObserverGenerator extends AbstractGenerator {
     private final Set<String> existingClasses;
     private final Map<ObserverInfo, String> observerToGeneratedName;
     private final Predicate<DotName> injectionPointAnnotationsPredicate;
+    private final boolean mockable;
 
     public ObserverGenerator(AnnotationLiteralProcessor annotationLiterals, Predicate<DotName> applicationClassPredicate,
             PrivateMembersCollector privateMembers, boolean generateSources, ReflectionRegistration reflectionRegistration,
             Set<String> existingClasses, Map<ObserverInfo, String> observerToGeneratedName,
-            Predicate<DotName> injectionPointAnnotationsPredicate) {
+            Predicate<DotName> injectionPointAnnotationsPredicate, boolean mockable) {
         super(generateSources);
         this.annotationLiterals = annotationLiterals;
         this.applicationClassPredicate = applicationClassPredicate;
@@ -79,6 +83,7 @@ public ObserverGenerator(AnnotationLiteralProcessor annotationLiterals, Predicat
         this.existingClasses = existingClasses;
         this.observerToGeneratedName = observerToGeneratedName;
         this.injectionPointAnnotationsPredicate = injectionPointAnnotationsPredicate;
+        this.mockable = mockable;
     }
 
     /**
@@ -164,8 +169,14 @@ Collection<Resource> generate(ObserverInfo observer) {
                 name -> name.equals(generatedName) ? SpecialType.OBSERVER : null, generateSources);
 
         // Foo_Observer_fooMethod_hash implements ObserverMethod<T>
+        List<Class<?>> interfaces = new ArrayList<>();
+        interfaces.add(InjectableObserverMethod.class);
+        if (mockable) {
+            // Observers declared on mocked beans can be disabled during tests
+            interfaces.add(Mockable.class);
+        }
         ClassCreator observerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)
-                .interfaces(InjectableObserverMethod.class)
+                .interfaces(interfaces.toArray((new Class[0])))
                 .build();
 
         // Fields
@@ -175,6 +186,9 @@ Collection<Resource> generate(ObserverInfo observer) {
         if (!observer.getQualifiers().isEmpty()) {
             observedQualifiers = observerCreator.getFieldCreator(QUALIFIERS, Set.class).setModifiers(ACC_PRIVATE | ACC_FINAL);
         }
+        if (mockable) {
+            observerCreator.getFieldCreator(MOCK_FIELD, boolean.class).setModifiers(ACC_PRIVATE | ACC_VOLATILE);
+        }
 
         Map<InjectionPointInfo, String> injectionPointToProviderField = new HashMap<>();
         initMaps(observer, injectionPointToProviderField);
@@ -202,6 +216,10 @@ Collection<Resource> generate(ObserverInfo observer) {
         }
         implementGetDeclaringBeanIdentifier(observerCreator, observer.getDeclaringBean());
 
+        if (mockable) {
+            implementMockMethods(observerCreator);
+        }
+
         observerCreator.close();
         return classOutput.getResources();
     }
@@ -269,6 +287,14 @@ protected void implementNotify(ObserverInfo observer, ClassCreator observerCreat
         MethodCreator notify = observerCreator.getMethodCreator("notify", void.class, EventContext.class)
                 .setModifiers(ACC_PUBLIC);
 
+        if (mockable) {
+            // If mockable and mocked then just return from the method
+            ResultHandle mock = notify.readInstanceField(
+                    FieldDescriptor.of(observerCreator.getClassName(), MOCK_FIELD, boolean.class.getName()),
+                    notify.getThis());
+            notify.ifTrue(mock).trueBranch().returnValue(null);
+        }
+
         if (observer.isSynthetic()) {
             // Synthetic observers generate the notify method themselves
             observer.getNotify().accept(notify);
@@ -547,7 +573,33 @@ protected void createConstructor(ClassOutput classOutput, ClassCreator observerC
                     unmodifiableQualifiersHandle);
         }
 
+        if (mockable) {
+            constructor.writeInstanceField(
+                    FieldDescriptor.of(observerCreator.getClassName(), MOCK_FIELD, boolean.class.getName()),
+                    constructor.getThis(),
+                    constructor.load(false));
+        }
+
         constructor.returnValue(null);
     }
 
+    private void implementMockMethods(ClassCreator observerCreator) {
+        MethodCreator clear = observerCreator
+                .getMethodCreator(MethodDescriptor.ofMethod(observerCreator.getClassName(),
+                        ClientProxyGenerator.CLEAR_MOCK_METHOD_NAME, void.class));
+        clear.writeInstanceField(FieldDescriptor.of(observerCreator.getClassName(), MOCK_FIELD, boolean.class),
+                clear.getThis(),
+                clear.load(false));
+        clear.returnValue(null);
+        MethodCreator set = observerCreator
+                .getMethodCreator(
+                        MethodDescriptor.ofMethod(observerCreator.getClassName(), ClientProxyGenerator.SET_MOCK_METHOD_NAME,
+                                void.class,
+                                Object.class));
+        set.writeInstanceField(FieldDescriptor.of(observerCreator.getClassName(), MOCK_FIELD, boolean.class),
+                set.getThis(),
+                set.load(true));
+        set.returnValue(null);
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java
index 85391b1a207ef..298109e92dbf1 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java
@@ -99,7 +99,7 @@ static ObserverInfo create(String id, BeanDeployment beanDeployment, DotName bea
             } else {
                 info = beanClass.toString();
             }
-            LOGGER.warnf("The observer %s#%s makes use of '%s' transactional observers but no " +
+            LOGGER.warnf("The observer %s makes use of %s transactional observers but no " +
                     "JTA capabilities were detected.", info, transactionPhase);
         }
         return new ObserverInfo(id, beanDeployment, beanClass, declaringBean, observerMethod, injection, eventParameter,
@@ -293,7 +293,7 @@ static Set<AnnotationInstance> initQualifiers(BeanDeployment beanDeployment, Met
         return qualifiers;
     }
 
-    int getPriority() {
+    public int getPriority() {
         return priority;
     }
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java
new file mode 100644
index 0000000000000..106eeb28f948d
--- /dev/null
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/QualifierRegistrar.java
@@ -0,0 +1,18 @@
+package io.quarkus.arc.processor;
+
+import java.util.Map;
+import java.util.Set;
+import javax.inject.Qualifier;
+import org.jboss.jandex.DotName;
+
+/**
+ * Makes it possible to turn an annotation into a qualifier without adding a {@link Qualifier} annotation to it.
+ */
+public interface QualifierRegistrar extends BuildExtension {
+
+    /**
+     * Returns a map of additional qualifers where the key represents the annotation type and the value is an optional set of
+     * non-binding members.
+     */
+    Map<DotName, Set<String>> getAdditionalQualifiers();
+}
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java
index 3c7d96d06d57e..13e841e14c1c7 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
 
 public class StereotypeInfo {
 
@@ -61,6 +62,10 @@ public ClassInfo getTarget() {
         return target;
     }
 
+    public DotName getName() {
+        return target.name();
+    }
+
     public boolean isAdditionalBeanDefiningAnnotation() {
         return isAdditionalBeanDefiningAnnotation;
     }
@@ -68,4 +73,9 @@ public boolean isAdditionalBeanDefiningAnnotation() {
     public boolean isAdditionalStereotypeBuildItem() {
         return isAdditionalStereotypeBuildItem;
     }
+
+    public boolean isGenuine() {
+        return !isAdditionalBeanDefiningAnnotation && !isAdditionalStereotypeBuildItem;
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
index f53ef50ccccf1..5591741333d70 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
@@ -75,7 +75,8 @@ public class SubclassGenerator extends AbstractGenerator {
     private final Set<String> existingClasses;
 
     static String generatedName(DotName providerTypeName, String baseName) {
-        return DotNames.packageName(providerTypeName).replace('.', '/') + "/" + baseName + SUBCLASS_SUFFIX;
+        String packageName = DotNames.internalPackageNameWithTrailingSlash(providerTypeName);
+        return packageName + baseName + SUBCLASS_SUFFIX;
     }
 
     private final AnnotationLiteralProcessor annotationLiterals;
@@ -103,7 +104,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName) {
                 generateSources);
 
         Type providerType = bean.getProviderType();
-        ClassInfo providerClass = getClassByName(bean.getDeployment().getIndex(), providerType.name());
+        ClassInfo providerClass = getClassByName(bean.getDeployment().getBeanArchiveIndex(), providerType.name());
         String providerTypeName = providerClass.name().toString();
         String baseName = getBaseName(bean, beanClassName);
         String generatedName = generatedName(providerType.name(), baseName);
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java
index d092300cf035f..b7c7685092823 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java
@@ -19,6 +19,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
+import javax.enterprise.inject.spi.DefinitionException;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationValue;
@@ -39,12 +40,25 @@
  *
  * @author Martin Kouba
  */
-final class Types {
+public final class Types {
 
     static final Logger LOGGER = Logger.getLogger(Types.class);
 
     private static final Type OBJECT_TYPE = Type.create(DotNames.OBJECT, Kind.CLASS);
 
+    private static final Set<String> PRIMITIVE_CLASS_NAMES = new HashSet<>();
+
+    static {
+        PRIMITIVE_CLASS_NAMES.add("byte");
+        PRIMITIVE_CLASS_NAMES.add("char");
+        PRIMITIVE_CLASS_NAMES.add("double");
+        PRIMITIVE_CLASS_NAMES.add("float");
+        PRIMITIVE_CLASS_NAMES.add("int");
+        PRIMITIVE_CLASS_NAMES.add("long");
+        PRIMITIVE_CLASS_NAMES.add("short");
+        PRIMITIVE_CLASS_NAMES.add("boolean");
+    }
+
     // we ban these interfaces because they are new to Java 12 and are used by java.lang.String which
     // means that they cannot be included in bytecode if we want to have application built with Java 12+ but targeting Java 8 - 11
     // actually run on those older versions
@@ -85,15 +99,7 @@ static ResultHandle getTypeHandle(BytecodeCreator creator, Type type, ResultHand
             // E.g. List<String> -> new ParameterizedTypeImpl(List.class, String.class)
             ParameterizedType parameterizedType = type.asParameterizedType();
 
-            List<Type> arguments = parameterizedType.arguments();
-            ResultHandle typeArgsHandle = creator.newArray(java.lang.reflect.Type.class, creator.load(arguments.size()));
-            for (int i = 0; i < arguments.size(); i++) {
-                creator.writeArrayValue(typeArgsHandle, i, getTypeHandle(creator, arguments.get(i), tccl));
-            }
-            return creator.newInstance(
-                    MethodDescriptor.ofConstructor(ParameterizedTypeImpl.class, java.lang.reflect.Type.class,
-                            java.lang.reflect.Type[].class),
-                    doLoadClass(creator, parameterizedType.name().toString(), tccl), typeArgsHandle);
+            return getParameterizedType(creator, tccl, parameterizedType);
 
         } else if (Kind.ARRAY.equals(type.kind())) {
             Type componentType = type.asArrayType().component();
@@ -142,6 +148,19 @@ static ResultHandle getTypeHandle(BytecodeCreator creator, Type type, ResultHand
         }
     }
 
+    public static ResultHandle getParameterizedType(BytecodeCreator creator, ResultHandle tccl,
+            ParameterizedType parameterizedType) {
+        List<Type> arguments = parameterizedType.arguments();
+        ResultHandle typeArgsHandle = creator.newArray(java.lang.reflect.Type.class, creator.load(arguments.size()));
+        for (int i = 0; i < arguments.size(); i++) {
+            creator.writeArrayValue(typeArgsHandle, i, getTypeHandle(creator, arguments.get(i), tccl));
+        }
+        return creator.newInstance(
+                MethodDescriptor.ofConstructor(ParameterizedTypeImpl.class, java.lang.reflect.Type.class,
+                        java.lang.reflect.Type[].class),
+                doLoadClass(creator, parameterizedType.name().toString(), tccl), typeArgsHandle);
+    }
+
     private static ResultHandle doLoadClass(BytecodeCreator creator, String className, ResultHandle tccl) {
         //we need to use Class.forName as the class may be package private
         if (tccl == null) {
@@ -164,13 +183,16 @@ static Type getProviderType(ClassInfo classInfo) {
     static Set<Type> getProducerMethodTypeClosure(MethodInfo producerMethod, BeanDeployment beanDeployment) {
         Set<Type> types;
         Type returnType = producerMethod.returnType();
+        if (returnType.kind() == Kind.TYPE_VARIABLE) {
+            throw new DefinitionException("A type variable is not a legal bean type: " + producerMethod);
+        }
         if (returnType.kind() == Kind.PRIMITIVE || returnType.kind() == Kind.ARRAY) {
             types = new HashSet<>();
             types.add(returnType);
             types.add(OBJECT_TYPE);
             return types;
         } else {
-            ClassInfo returnTypeClassInfo = getClassByName(beanDeployment.getIndex(), returnType);
+            ClassInfo returnTypeClassInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), returnType);
             if (returnTypeClassInfo == null) {
                 throw new IllegalArgumentException(
                         "Producer method return type not found in index: " + producerMethod.returnType().name());
@@ -180,7 +202,7 @@ static Set<Type> getProducerMethodTypeClosure(MethodInfo producerMethod, BeanDep
             } else if (Kind.PARAMETERIZED_TYPE.equals(returnType.kind())) {
                 types = getTypeClosure(returnTypeClassInfo, producerMethod,
                         buildResolvedMap(returnType.asParameterizedType().arguments(), returnTypeClassInfo.typeParameters(),
-                                Collections.emptyMap(), beanDeployment.getIndex()),
+                                Collections.emptyMap(), beanDeployment.getBeanArchiveIndex()),
                         beanDeployment, null);
             } else {
                 throw new IllegalArgumentException("Unsupported return type");
@@ -192,12 +214,15 @@ static Set<Type> getProducerMethodTypeClosure(MethodInfo producerMethod, BeanDep
     static Set<Type> getProducerFieldTypeClosure(FieldInfo producerField, BeanDeployment beanDeployment) {
         Set<Type> types;
         Type fieldType = producerField.type();
+        if (fieldType.kind() == Kind.TYPE_VARIABLE) {
+            throw new DefinitionException("A type variable is not a legal bean type: " + producerField);
+        }
         if (fieldType.kind() == Kind.PRIMITIVE || fieldType.kind() == Kind.ARRAY) {
             types = new HashSet<>();
             types.add(fieldType);
             types.add(OBJECT_TYPE);
         } else {
-            ClassInfo fieldClassInfo = getClassByName(beanDeployment.getIndex(), producerField.type());
+            ClassInfo fieldClassInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), producerField.type());
             if (fieldClassInfo == null) {
                 throw new IllegalArgumentException("Producer field type not found in index: " + producerField.type().name());
             }
@@ -206,7 +231,7 @@ static Set<Type> getProducerFieldTypeClosure(FieldInfo producerField, BeanDeploy
             } else if (Kind.PARAMETERIZED_TYPE.equals(fieldType.kind())) {
                 types = getTypeClosure(fieldClassInfo, producerField,
                         buildResolvedMap(fieldType.asParameterizedType().arguments(), fieldClassInfo.typeParameters(),
-                                Collections.emptyMap(), beanDeployment.getIndex()),
+                                Collections.emptyMap(), beanDeployment.getBeanArchiveIndex()),
                         beanDeployment, null);
             } else {
                 throw new IllegalArgumentException("Unsupported return type");
@@ -222,7 +247,7 @@ static Set<Type> getClassBeanTypeClosure(ClassInfo classInfo, BeanDeployment bea
             types = getTypeClosure(classInfo, null, Collections.emptyMap(), beanDeployment, null);
         } else {
             types = getTypeClosure(classInfo, null, buildResolvedMap(typeParameters, typeParameters,
-                    Collections.emptyMap(), beanDeployment.getIndex()), beanDeployment, null);
+                    Collections.emptyMap(), beanDeployment.getBeanArchiveIndex()), beanDeployment, null);
         }
         return restrictBeanTypes(types, beanDeployment.getAnnotations(classInfo));
     }
@@ -269,12 +294,12 @@ static Set<Type> getTypeClosure(ClassInfo classInfo, AnnotationTarget producerFi
             if (BANNED_INTERFACE_TYPES.contains(interfaceType.name())) {
                 continue;
             }
-            ClassInfo interfaceClassInfo = getClassByName(beanDeployment.getIndex(), interfaceType.name());
+            ClassInfo interfaceClassInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), interfaceType.name());
             if (interfaceClassInfo != null) {
                 Map<TypeVariable, Type> resolved = Collections.emptyMap();
                 if (Kind.PARAMETERIZED_TYPE.equals(interfaceType.kind())) {
                     resolved = buildResolvedMap(interfaceType.asParameterizedType().arguments(),
-                            interfaceClassInfo.typeParameters(), resolvedTypeParameters, beanDeployment.getIndex());
+                            interfaceClassInfo.typeParameters(), resolvedTypeParameters, beanDeployment.getBeanArchiveIndex());
                 }
                 types.addAll(getTypeClosure(interfaceClassInfo, producerFieldOrMethod, resolved, beanDeployment,
                         resolvedTypeVariablesConsumer));
@@ -282,13 +307,13 @@ static Set<Type> getTypeClosure(ClassInfo classInfo, AnnotationTarget producerFi
         }
         // Superclass
         if (classInfo.superClassType() != null) {
-            ClassInfo superClassInfo = getClassByName(beanDeployment.getIndex(), classInfo.superName());
+            ClassInfo superClassInfo = getClassByName(beanDeployment.getBeanArchiveIndex(), classInfo.superName());
             if (superClassInfo != null) {
                 Map<TypeVariable, Type> resolved = Collections.emptyMap();
                 if (Kind.PARAMETERIZED_TYPE.equals(classInfo.superClassType().kind())) {
                     resolved = buildResolvedMap(classInfo.superClassType().asParameterizedType().arguments(),
                             superClassInfo.typeParameters(),
-                            resolvedTypeParameters, beanDeployment.getIndex());
+                            resolvedTypeParameters, beanDeployment.getBeanArchiveIndex());
                 }
                 types.addAll(getTypeClosure(superClassInfo, producerFieldOrMethod, resolved, beanDeployment,
                         resolvedTypeVariablesConsumer));
@@ -398,4 +423,8 @@ static Type box(Primitive primitive) {
         }
     }
 
+    static boolean isPrimitiveClassName(String className) {
+        return PRIMITIVE_CLASS_NAMES.contains(className);
+    }
+
 }
diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AsmUtilCopyTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AsmUtilCopyTest.java
new file mode 100644
index 0000000000000..e11239251d128
--- /dev/null
+++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/AsmUtilCopyTest.java
@@ -0,0 +1,15 @@
+package io.quarkus.arc.processor;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+
+public class AsmUtilCopyTest {
+
+    @Test
+    public void testNeedsSignature() throws IOException {
+        assertFalse(AsmUtilCopy.needsSignature(Basics.index(Object.class).getClassByName(DotNames.OBJECT)));
+    }
+
+}
diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java
index 12bddc9e90371..7cc59d4899d83 100644
--- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java
+++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoInjectionsTest.java
@@ -40,7 +40,7 @@ public void testInjections() throws IOException {
         Type listStringType = ParameterizedType.create(name(List.class),
                 new Type[] { Type.create(name(String.class), Kind.CLASS) }, null);
 
-        BeanDeployment deployment = BeanProcessor.builder().setIndex(index).build().getBeanDeployment();
+        BeanDeployment deployment = BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment();
         deployment.registerCustomContexts(Collections.emptyList());
         deployment.registerBeans(Collections.emptyList());
         BeanInfo barBean = deployment.getBeans().stream().filter(b -> b.getTarget().get().equals(barClass)).findFirst().get();
diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java
index c000f4b729fe9..9243557ae4fa8 100644
--- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java
+++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoQualifiersTest.java
@@ -34,7 +34,8 @@ public void testQualifiers() throws IOException {
         DotName fooQualifierName = name(FooQualifier.class);
         ClassInfo fooClass = index.getClassByName(fooName);
 
-        BeanInfo bean = Beans.createClassBean(fooClass, BeanProcessor.builder().setIndex(index).build().getBeanDeployment(),
+        BeanInfo bean = Beans.createClassBean(fooClass,
+                BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment(),
                 null);
 
         AnnotationInstance requiredFooQualifier = index.getAnnotations(fooQualifierName).stream()
diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java
index c5278cbec82a0..f37e30b9f7a46 100644
--- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java
+++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/BeanInfoTypesTest.java
@@ -35,7 +35,7 @@ public void testResolver() throws IOException {
                 Collection.class, List.class,
                 Iterable.class, Object.class, String.class);
 
-        BeanDeployment deployment = BeanProcessor.builder().setIndex(index).build().getBeanDeployment();
+        BeanDeployment deployment = BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment();
         DotName fooName = name(Foo.class);
 
         ClassInfo fooClass = index.getClassByName(fooName);
diff --git a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java
index 320d82da4fbd2..4a3fbd59ea94c 100644
--- a/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java
+++ b/independent-projects/arc/processor/src/test/java/io/quarkus/arc/processor/TypesTest.java
@@ -32,7 +32,7 @@ public void testGetTypeClosure() throws IOException {
         DotName producerName = DotName.createSimple(Producer.class.getName());
         ClassInfo fooClass = index.getClassByName(fooName);
         Map<ClassInfo, Map<TypeVariable, Type>> resolvedTypeVariables = new HashMap<>();
-        BeanDeployment dummyDeployment = BeanProcessor.builder().setIndex(index).build().getBeanDeployment();
+        BeanDeployment dummyDeployment = BeanProcessor.builder().setBeanArchiveIndex(index).build().getBeanDeployment();
 
         // Baz, Foo<String>, Object
         Set<Type> bazTypes = Types.getTypeClosure(index.getClassByName(bazName), null,
diff --git a/independent-projects/arc/runtime/pom.xml b/independent-projects/arc/runtime/pom.xml
index 30b822d7999eb..c2c91fb3e0817 100644
--- a/independent-projects/arc/runtime/pom.xml
+++ b/independent-projects/arc/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus.arc</groupId>
         <artifactId>arc-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>arc</artifactId>
@@ -34,6 +33,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java
index 4bb1fcebff563..9bd2d0733ae5d 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcContainer.java
@@ -2,6 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
+import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
@@ -28,6 +29,13 @@ public interface ArcContainer {
      */
     InjectableContext getActiveContext(Class<? extends Annotation> scopeType);
 
+    /**
+     * 
+     * @param scopeType
+     * @return the matching context objects, never null
+     */
+    Collection<InjectableContext> getContexts(Class<? extends Annotation> scopeType);
+
     /**
      * 
      * @return the set of all supported scopes
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java
index 70a729b11ac64..914b8350f75b7 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/Components.java
@@ -2,23 +2,35 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
 public final class Components {
 
     private final Collection<InjectableBean<?>> beans;
+    private final Collection<RemovedBean> removedBeans;
     private final Collection<InjectableObserverMethod<?>> observers;
     private final Collection<InjectableContext> contexts;
     private final Map<Class<? extends Annotation>, Set<Annotation>> transitiveInterceptorBindings;
+    private final Map<String, Set<String>> qualifierNonbindingMembers;
 
     public Components(Collection<InjectableBean<?>> beans, Collection<InjectableObserverMethod<?>> observers,
             Collection<InjectableContext> contexts,
             Map<Class<? extends Annotation>, Set<Annotation>> transitiveInterceptorBindings) {
+        this(beans, observers, contexts, transitiveInterceptorBindings, Collections.emptyList(), Collections.emptyMap());
+    }
+
+    public Components(Collection<InjectableBean<?>> beans, Collection<InjectableObserverMethod<?>> observers,
+            Collection<InjectableContext> contexts,
+            Map<Class<? extends Annotation>, Set<Annotation>> transitiveInterceptorBindings,
+            Collection<RemovedBean> removedBeans, Map<String, Set<String>> qualifierNonbindingMembers) {
         this.beans = beans;
         this.observers = observers;
         this.contexts = contexts;
         this.transitiveInterceptorBindings = transitiveInterceptorBindings;
+        this.removedBeans = removedBeans;
+        this.qualifierNonbindingMembers = qualifierNonbindingMembers;
     }
 
     public Collection<InjectableBean<?>> getBeans() {
@@ -37,4 +49,12 @@ public Map<Class<? extends Annotation>, Set<Annotation>> getTransitiveIntercepto
         return transitiveInterceptorBindings;
     }
 
+    public Collection<RemovedBean> getRemovedBeans() {
+        return removedBeans;
+    }
+
+    public Map<String, Set<String>> getQualifierNonbindingMembers() {
+        return qualifierNonbindingMembers;
+    }
+
 }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ComponentsProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ComponentsProvider.java
index a5de4ab63c015..af2f893e65705 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ComponentsProvider.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ComponentsProvider.java
@@ -1,8 +1,7 @@
 package io.quarkus.arc;
 
 /**
- *
- * @author Martin Kouba
+ * Service provider interface used to colllect the runtime components.
  */
 public interface ComponentsProvider {
 
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java
index d234e0fe4226d..82056176b17b2 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableBean.java
@@ -120,7 +120,16 @@ enum Kind {
         PRODUCER_FIELD,
         PRODUCER_METHOD,
         SYNTHETIC,
-        INTERCEPTOR
+        INTERCEPTOR;
+
+        public static Kind from(String value) {
+            for (Kind kind : values()) {
+                if (kind.toString().equals(value)) {
+                    return kind;
+                }
+            }
+            return null;
+        }
 
     }
 
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java
index bab63d5ef0c1f..24cfee0323e93 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InjectableContext.java
@@ -1,14 +1,16 @@
 package io.quarkus.arc;
 
 import java.util.Map;
+import java.util.function.Function;
 import javax.enterprise.context.NormalScope;
 import javax.enterprise.context.spi.AlterableContext;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
 
 /**
- * A context implementing this interface allows to capture and view its state via {@link ContextState}.
- * It also allows user to destroy all contextual instances within this context.
- *
- * @author Martin Kouba
+ * A context implementing this interface makes it possible to capture and view its state via the {@link ContextState}.
+ * 
+ * It also allows users to destroy all contextual instances within this context.
  */
 public interface InjectableContext extends AlterableContext {
 
@@ -22,6 +24,30 @@ public interface InjectableContext extends AlterableContext {
      */
     ContextState getState();
 
+    /**
+     * If the context is active then return an existing instance of certain contextual type or create a new instance, otherwise
+     * return a null value.
+     * 
+     * This allows for the {@link #isActive()} check and the actual creation to happen in a single method, which gives a
+     * performance benefit by performing fewer thread local operations.
+     *
+     * @param <T> the type of contextual type
+     * @param contextual the contextual type
+     * @param creationalContextFunction the creational context function
+     * @return the contextual instance, or a null value
+     */
+    default <T> T getIfActive(Contextual<T> contextual,
+            Function<Contextual<T>, CreationalContext<T>> creationalContextFunction) {
+        if (!isActive()) {
+            return null;
+        }
+        T result = get(contextual);
+        if (result != null) {
+            return result;
+        }
+        return get(contextual, creationalContextFunction.apply(contextual));
+    }
+
     /**
      * Destroy all contextual instances from the given state.
      * <p>
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/MockableProxy.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/MockableProxy.java
deleted file mode 100644
index 93e66ffd20941..0000000000000
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/MockableProxy.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.quarkus.arc;
-
-/**
- * An interface that client proxies will implement when running in test mode.
- *
- * This allows normal scoped beans to be easily mocked for tests.
- */
-public interface MockableProxy {
-
-    void quarkus$$setMock(Object instance);
-
-    void quarkus$$clearMock();
-}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/RemovedBean.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/RemovedBean.java
new file mode 100644
index 0000000000000..6693975ca80b4
--- /dev/null
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/RemovedBean.java
@@ -0,0 +1,32 @@
+package io.quarkus.arc;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+/**
+ * An unused bean removed during the build process.
+ */
+public interface RemovedBean {
+
+    /**
+     * @return the kind of the bean
+     */
+    InjectableBean.Kind getKind();
+
+    /**
+     * @return the description
+     */
+    String getDescription();
+
+    /**
+     * @return the bean types
+     */
+    public Set<Type> getTypes();
+
+    /**
+     * @return the qualifiers
+     */
+    public Set<Annotation> getQualifiers();
+
+}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java
index 3436a5bb13e24..71f02863d0854 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java
@@ -5,30 +5,37 @@
 import io.quarkus.arc.InjectableContext;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 
 abstract class AbstractSharedContext implements InjectableContext, InjectableContext.ContextState {
 
-    private final ComputingCache<Key<?>, ContextInstanceHandle<?>> instances;
+    private final ComputingCache<String, ContextInstanceHandle<?>> instances;
 
     public AbstractSharedContext() {
-        this.instances = new ComputingCache<>(AbstractSharedContext::createInstanceHandle);
+        this.instances = new ComputingCache<>();
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) {
-        return (T) instances.getValue(new Key<>(contextual, creationalContext)).get();
+        InjectableBean<T> bean = (InjectableBean<T>) contextual;
+        return (T) instances.computeIfAbsent(bean.getIdentifier(), new Supplier<ContextInstanceHandle<?>>() {
+            @Override
+            public ContextInstanceHandle<?> get() {
+                return createInstanceHandle(bean, creationalContext);
+            }
+        }).get();
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public <T> T get(Contextual<T> contextual) {
-        ContextInstanceHandle<?> handle = instances.getValueIfPresent(new Key<>(contextual, null));
+        InjectableBean<T> bean = (InjectableBean<T>) contextual;
+        ContextInstanceHandle<?> handle = instances.getValueIfPresent(bean.getIdentifier());
         return handle != null ? (T) handle.get() : null;
     }
 
@@ -50,7 +57,8 @@ public boolean isActive() {
 
     @Override
     public void destroy(Contextual<?> contextual) {
-        ContextInstanceHandle<?> handle = instances.remove(new Key<>(contextual, null));
+        InjectableBean<?> bean = (InjectableBean<?>) contextual;
+        ContextInstanceHandle<?> handle = instances.remove(bean.getIdentifier());
         if (handle != null) {
             handle.destroy();
         }
@@ -83,50 +91,9 @@ public void destroy(ContextState state) {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static ContextInstanceHandle createInstanceHandle(Key key) {
-        InjectableBean<?> bean = (InjectableBean<?>) key.contextual;
-        return new ContextInstanceHandleImpl(bean, bean.create(key.creationalContext), key.creationalContext);
-    }
-
-    private static final class Key<T> {
-
-        private final Contextual<T> contextual;
-        private final CreationalContext<T> creationalContext;
-
-        Key(Contextual<T> contextual, CreationalContext<T> creationalContext) {
-            this.contextual = Objects.requireNonNull(contextual);
-            this.creationalContext = creationalContext;
-        }
-
-        @Override
-        public int hashCode() {
-            return contextual.hashCode();
-        }
-
-        @SuppressWarnings("rawtypes")
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (!(obj instanceof Key)) {
-                return false;
-            }
-            Key other = (Key) obj;
-            if (!contextual.equals(other.contextual)) {
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return "Key for " + contextual;
-        }
-
+    private static <T> ContextInstanceHandle createInstanceHandle(InjectableBean<T> bean,
+            CreationalContext<T> creationalContext) {
+        return new ContextInstanceHandleImpl(bean, bean.create(creationalContext), creationalContext);
     }
 
 }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java
index b2aa3e8cb50e5..e471e5e930f53 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcContainerImpl.java
@@ -11,6 +11,7 @@
 import io.quarkus.arc.InjectableObserverMethod;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.ManagedContext;
+import io.quarkus.arc.RemovedBean;
 import io.quarkus.arc.ResourceReferenceProvider;
 import io.quarkus.arc.impl.ArcCDIProvider.ArcCDI;
 import java.lang.annotation.Annotation;
@@ -18,13 +19,14 @@
 import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.Set;
@@ -57,10 +59,6 @@
 import javax.inject.Singleton;
 import org.jboss.logging.Logger;
 
-/**
- *
- * @author Martin Kouba
- */
 public class ArcContainerImpl implements ArcContainer {
 
     private static final Logger LOGGER = Logger.getLogger(ArcContainerImpl.class.getPackage().getName());
@@ -71,12 +69,13 @@ public class ArcContainerImpl implements ArcContainer {
     private final AtomicBoolean running;
 
     private final List<InjectableBean<?>> beans;
+    private final List<RemovedBean> removedBeans;
     private final List<InjectableInterceptor<?>> interceptors;
     private final List<InjectableObserverMethod<?>> observers;
     private final Map<Class<? extends Annotation>, Set<Annotation>> transitiveInterceptorBindings;
+    private final Map<String, Set<String>> qualifierNonbindingMembers;
 
-    // List of "ambiguous" contexts that could share a scope
-    private final List<InjectableContext> contexts;
+    private final Map<Class<? extends Annotation>, Collection<InjectableContext>> contexts;
     private final ManagedContext requestContext;
     private final InjectableContext applicationContext;
     private final InjectableContext singletonContext;
@@ -95,15 +94,19 @@ public ArcContainerImpl() {
         id = "" + ID_GENERATOR.incrementAndGet();
         running = new AtomicBoolean(true);
         beans = new ArrayList<>();
+        removedBeans = new ArrayList<>();
         interceptors = new ArrayList<>();
         observers = new ArrayList<>();
         transitiveInterceptorBindings = new HashMap<>();
+        qualifierNonbindingMembers = new HashMap<>();
 
         applicationContext = new ApplicationContext();
         singletonContext = new SingletonContext();
         requestContext = new RequestContext();
-        contexts = new ArrayList<>();
-        contexts.add(requestContext);
+        contexts = new HashMap<>();
+        putContext(requestContext);
+        putContext(applicationContext);
+        putContext(singletonContext);
 
         for (ComponentsProvider componentsProvider : ServiceLoader.load(ComponentsProvider.class)) {
             Components components = componentsProvider.getComponents();
@@ -114,6 +117,7 @@ public ArcContainerImpl() {
                     beans.add(bean);
                 }
             }
+            removedBeans.addAll(components.getRemovedBeans());
             observers.addAll(components.getObservers());
             // Add custom contexts
             for (InjectableContext context : components.getContexts()) {
@@ -125,12 +129,10 @@ public ArcContainerImpl() {
                     throw new IllegalStateException(
                             "Failed to register a context - built-in singleton context is always active: " + context);
                 }
-                contexts.add(context);
-            }
-            for (Entry<Class<? extends Annotation>, Set<Annotation>> entry : components.getTransitiveInterceptorBindings()
-                    .entrySet()) {
-                transitiveInterceptorBindings.put(entry.getKey(), entry.getValue());
+                putContext(context);
             }
+            transitiveInterceptorBindings.putAll(components.getTransitiveInterceptorBindings());
+            qualifierNonbindingMembers.putAll(components.getQualifierNonbindingMembers());
         }
         // register built-in beans
         addBuiltInBeans();
@@ -148,6 +150,17 @@ public ArcContainerImpl() {
         instance = InstanceImpl.of(Object.class, Collections.emptySet());
     }
 
+    private void putContext(InjectableContext context) {
+        Collection<InjectableContext> values = contexts.get(context.getScope());
+        if (values == null) {
+            contexts.put(context.getScope(), Collections.singleton(context));
+        } else {
+            List<InjectableContext> multi = new LinkedList<>(values);
+            multi.add(context);
+            contexts.put(context.getScope(), Collections.unmodifiableList(multi));
+        }
+    }
+
     private void addBuiltInBeans() {
         // BeanManager, Event<?>, Instance<?>
         beans.add(new BeanManagerBean());
@@ -176,27 +189,31 @@ public InjectableContext getActiveContext(Class<? extends Annotation> scopeType)
         } else if (Singleton.class.equals(scopeType)) {
             return singletonContext;
         }
-        List<InjectableContext> active = new ArrayList<>();
-        for (InjectableContext context : contexts) {
-            if (scopeType.equals(context.getScope()) && context.isActive()) {
-                active.add(context);
+        Collection<InjectableContext> contextsForScope = contexts.get(scopeType);
+        InjectableContext selected = null;
+        if (contextsForScope != null) {
+            for (InjectableContext context : contextsForScope) {
+                if (context.isActive()) {
+                    if (selected != null) {
+                        throw new IllegalArgumentException(
+                                "More than one context object for the given scope: " + selected + " " + context);
+                    }
+                    selected = context;
+                }
             }
         }
-        if (active.isEmpty()) {
-            return null;
-        } else if (active.size() == 1) {
-            return active.get(0);
-        }
-        throw new IllegalArgumentException("More than one context object for the given scope: " + active);
+        return selected;
+    }
+
+    @Override
+    public Collection<InjectableContext> getContexts(Class<? extends Annotation> scopeType) {
+        requireRunning();
+        return contexts.getOrDefault(scopeType, Collections.emptyList());
     }
 
     @Override
     public Set<Class<? extends Annotation>> getScopes() {
-        Set<Class<? extends Annotation>> scopes = contexts.stream().map(InjectableContext::getScope)
-                .collect(Collectors.toSet());
-        scopes.add(ApplicationScoped.class);
-        scopes.add(Singleton.class);
-        return scopes;
+        return contexts.keySet().stream().collect(Collectors.toSet());
     }
 
     @Override
@@ -356,6 +373,7 @@ public synchronized void shutdown() {
             Reflections.clearCaches();
             contexts.clear();
             beans.clear();
+            removedBeans.clear();
             resolved.clear();
             observers.clear();
             running.set(false);
@@ -369,6 +387,10 @@ public List<InjectableBean<?>> getBeans() {
         return new ArrayList<>(beans);
     }
 
+    public List<RemovedBean> getRemovedBeans() {
+        return Collections.unmodifiableList(removedBeans);
+    }
+
     public List<InjectableInterceptor<?>> getInterceptors() {
         return new ArrayList<>(interceptors);
     }
@@ -454,16 +476,24 @@ boolean isScope(Class<? extends Annotation> annotationType) {
         if (annotationType.isAnnotationPresent(Scope.class) || annotationType.isAnnotationPresent(NormalScope.class)) {
             return true;
         }
-        return contexts.stream().map(InjectableContext::getScope).filter(annotationType::equals).findAny().isPresent();
+        for (Class<? extends Annotation> scopeType : contexts.keySet()) {
+            if (scopeType.equals(annotationType)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     boolean isNormalScope(Class<? extends Annotation> annotationType) {
         if (annotationType.isAnnotationPresent(NormalScope.class)) {
             return true;
         }
-        for (InjectableContext context : contexts) {
-            if (context.getScope().equals(annotationType) && context.isNormal()) {
-                return true;
+        Collection<InjectableContext> injectableContexts = contexts.get(annotationType);
+        if (injectableContexts != null) {
+            for (InjectableContext context : injectableContexts) {
+                if (context.isNormal()) {
+                    return true;
+                }
             }
         }
         return false;
@@ -580,12 +610,39 @@ private static Integer getAlternativePriority(InjectableBean<?> bean) {
     }
 
     List<InjectableBean<?>> getMatchingBeans(Resolvable resolvable) {
-        List<InjectableBean<?>> matching = new ArrayList<>();
+        List<InjectableBean<?>> matching = new LinkedList<>();
         for (InjectableBean<?> bean : beans) {
             if (matches(bean, resolvable.requiredType, resolvable.qualifiers)) {
                 matching.add(bean);
             }
         }
+        if (matching.isEmpty() && !removedBeans.isEmpty()) {
+            List<RemovedBean> removedMatching = new LinkedList<>();
+            for (RemovedBean removedBean : removedBeans) {
+                if (matches(removedBean.getTypes(), removedBean.getQualifiers(), resolvable.requiredType,
+                        resolvable.qualifiers)) {
+                    removedMatching.add(removedBean);
+                }
+            }
+            if (!removedMatching.isEmpty()) {
+                String separator = "====================";
+                String msg = "\n%1$s%1$s%1$s%1$s\n"
+                        + "CDI: programmatic lookup problem detected\n"
+                        + "-----------------------------------------\n"
+                        + "At least one bean matched the required type and qualifiers but was marked as unused and removed during build\n"
+                        + "Removed beans:\n\t- %2$s\n"
+                        + "Required type: %3$s\n"
+                        + "Required qualifiers: %4$s\n"
+                        + "Solutions:\n"
+                        + "\t- Application developers can eliminate false positives via the @Unremovable annotation\n"
+                        + "\t- Extensions can eliminate false positives via build items, e.g. using the UnremovableBeanBuildItem\n"
+                        + "\t- See also https://quarkus.io/guides/cdi-reference#remove_unused_beans\n"
+                        + "%1$s%1$s%1$s%1$s\n";
+                LOGGER.warnf(msg, separator,
+                        removedMatching.stream().map(Object::toString).collect(Collectors.joining("\n\t- ")),
+                        resolvable.requiredType, Arrays.toString(resolvable.qualifiers));
+            }
+        }
         return matching;
     }
 
@@ -623,7 +680,7 @@ <T> List<InjectableObserverMethod<? super T>> resolveObservers(Type eventType, S
         for (InjectableObserverMethod<?> observer : observers) {
             if (EventTypeAssignabilityRules.matches(observer.getObservedType(), eventTypes)) {
                 if (observer.getObservedQualifiers().isEmpty()
-                        || Qualifiers.isSubset(observer.getObservedQualifiers(), eventQualifiers)) {
+                        || Qualifiers.isSubset(observer.getObservedQualifiers(), eventQualifiers, qualifierNonbindingMembers)) {
                     resolvedObservers.add((InjectableObserverMethod<? super T>) observer);
                 }
             }
@@ -661,7 +718,7 @@ private boolean hasAllInterceptionBindings(InjectableInterceptor<?> interceptor,
         // The method or constructor has all the interceptor bindings of the interceptor
         for (Annotation binding : interceptor.getInterceptorBindings()) {
             // The resolution rules are the same for qualifiers
-            if (!Qualifiers.hasQualifier(bindings, binding)) {
+            if (!Qualifiers.hasQualifier(bindings, binding, qualifierNonbindingMembers)) {
                 return false;
             }
         }
@@ -683,10 +740,14 @@ Set<InjectableBean<?>> getResolvedBeans(Type requiredType, Annotation... qualifi
     }
 
     private boolean matches(InjectableBean<?> bean, Type requiredType, Annotation... qualifiers) {
-        if (!BeanTypeAssignabilityRules.matches(requiredType, bean.getTypes())) {
+        return matches(bean.getTypes(), bean.getQualifiers(), requiredType, qualifiers);
+    }
+
+    private boolean matches(Set<Type> beanTypes, Set<Annotation> beanQualifiers, Type requiredType, Annotation... qualifiers) {
+        if (!BeanTypeAssignabilityRules.matches(requiredType, beanTypes)) {
             return false;
         }
-        return Qualifiers.hasQualifiers(bean, qualifiers);
+        return Qualifiers.hasQualifiers(beanQualifiers, qualifierNonbindingMembers, qualifiers);
     }
 
     static ArcContainerImpl unwrap(ArcContainer container) {
@@ -697,6 +758,36 @@ static ArcContainerImpl unwrap(ArcContainer container) {
         }
     }
 
+    public static void mockObservers(String beanIdentifier, boolean mock) {
+        instance().mockObserversFor(beanIdentifier, mock);
+    }
+
+    private void mockObserversFor(String beanIdentifier, boolean mock) {
+        for (InjectableObserverMethod<?> observer : observers) {
+            if (observer instanceof Mockable && beanIdentifier.equals(observer.getDeclaringBeanIdentifier())) {
+                Mockable mockable = (Mockable) observer;
+                if (mock) {
+                    mockable.arc$setMock(null);
+                } else {
+                    mockable.arc$clearMock();
+                }
+            }
+        }
+    }
+
+    public void mockObserversFor(Class<?> beanClass, boolean mock) {
+        for (InjectableObserverMethod<?> observer : observers) {
+            if (observer instanceof Mockable && beanClass.equals(observer.getBeanClass())) {
+                Mockable mockable = (Mockable) observer;
+                if (mock) {
+                    mockable.arc$setMock(null);
+                } else {
+                    mockable.arc$clearMock();
+                }
+            }
+        }
+    }
+
     public static ArcContainerImpl instance() {
         return unwrap(Arc.container());
     }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java
index fb9eb259ccc8e..bcf8dbd020443 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java
@@ -19,6 +19,7 @@
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Stereotype;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.enterprise.inject.spi.AnnotatedField;
 import javax.enterprise.inject.spi.AnnotatedMember;
@@ -172,17 +173,22 @@ public boolean isInterceptorBinding(Class<? extends Annotation> annotationType)
 
     @Override
     public boolean isStereotype(Class<? extends Annotation> annotationType) {
-        throw new UnsupportedOperationException();
+        //best effort, in theory an extension could change this but this is an edge case
+        return annotationType.isAnnotationPresent(Stereotype.class);
     }
 
     @Override
     public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> bindingType) {
-        throw new UnsupportedOperationException();
+        //best effort, in theory an extension could change this its better than nothing
+        //it could also return annotations that aren't bindings
+        return new HashSet<>(Arrays.asList(bindingType.getAnnotations()));
     }
 
     @Override
     public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype) {
-        throw new UnsupportedOperationException();
+        //best effort, in theory an extension could change this its better than nothing
+        //it could also return annotations that aren't metadata
+        return new HashSet<>(Arrays.asList(stereotype.getAnnotations()));
     }
 
     @Override
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java
new file mode 100644
index 0000000000000..da0b25fe09c49
--- /dev/null
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ClientProxies.java
@@ -0,0 +1,49 @@
+package io.quarkus.arc.impl;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
+import io.quarkus.arc.InjectableContext;
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.Contextual;
+
+public final class ClientProxies {
+
+    private ClientProxies() {
+    }
+
+    public static <T> T getApplicationScopedDelegate(InjectableContext applicationContext, InjectableBean<T> bean) {
+        T result = applicationContext.get(bean);
+        if (result == null) {
+            result = applicationContext.get(bean, newCreationalContext(bean));
+        }
+        return result;
+    }
+
+    public static <T> T getDelegate(InjectableBean<T> bean) {
+        Iterable<InjectableContext> contexts = Arc.container().getContexts(bean.getScope());
+        T result = null;
+        InjectableContext selectedContext = null;
+        for (InjectableContext context : contexts) {
+            if (result != null) {
+                if (context.isActive()) {
+                    throw new IllegalArgumentException(
+                            "More than one context object for the given scope: " + selectedContext + " " + context);
+                }
+            } else {
+                result = context.getIfActive(bean, ClientProxies::newCreationalContext);
+                if (result != null) {
+                    selectedContext = context;
+                }
+            }
+        }
+        if (result == null) {
+            throw new ContextNotActiveException();
+        }
+        return result;
+    }
+
+    private static <T> CreationalContextImpl<T> newCreationalContext(Contextual<T> contextual) {
+        return new CreationalContextImpl<>(contextual);
+    }
+
+}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CollectionHelpers.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CollectionHelpers.java
new file mode 100644
index 0000000000000..53feb332cb8e3
--- /dev/null
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CollectionHelpers.java
@@ -0,0 +1,29 @@
+package io.quarkus.arc.impl;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Inspired from Hibernate Validator: a couple tricks
+ * to minimize retained memory from long living, small collections.
+ */
+final class CollectionHelpers {
+
+    CollectionHelpers() {
+        //do not instantiate
+    }
+
+    static <T> Set<T> toImmutableSmallSet(Set<T> set) {
+        if (set == null)
+            return null;
+        switch (set.size()) {
+            case 0:
+                return Collections.emptySet();
+            case 1:
+                return Collections.singleton(set.iterator().next());
+            default:
+                return Collections.unmodifiableSet(set);
+        }
+    }
+
+}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ComputingCache.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ComputingCache.java
index b6f91f80826c9..149316d2b8ace 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ComputingCache.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ComputingCache.java
@@ -8,6 +8,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 /**
@@ -21,18 +22,45 @@
 public class ComputingCache<K, V> {
 
     private final ConcurrentMap<K, LazyValue<V>> map;
+    private final Function<K, V> computingFunction;
 
-    private final Function<K, LazyValue<V>> function;
+    /**
+     * Note that {@link #getValue(Object)} cannot be used if no default computing function is specified.
+     */
+    public ComputingCache() {
+        this(null);
+    }
 
     public ComputingCache(Function<K, V> computingFunction) {
         this.map = new ConcurrentHashMap<>();
-        this.function = new CacheFunction(computingFunction);
+        this.computingFunction = computingFunction;
     }
 
     public V getValue(K key) {
+        return computeIfAbsent(key, computingFunction);
+    }
+
+    public V getValueIfPresent(K key) {
+        LazyValue<V> value = map.get(key);
+        return value != null ? value.getIfPresent() : null;
+    }
+
+    public V computeIfAbsent(K key, Function<? super K, ? extends V> computingFunction) {
+        return computeIfAbsent(key, new Supplier<V>() {
+            @Override
+            public V get() {
+                return computingFunction.apply(key);
+            }
+        });
+    }
+
+    public V computeIfAbsent(K key, Supplier<V> supplier) {
+        if (supplier == null) {
+            throw new IllegalStateException("Computing function not defined");
+        }
         LazyValue<V> value = map.get(key);
         if (value == null) {
-            value = function.apply(key);
+            value = new LazyValue<V>(supplier);
             LazyValue<V> previous = map.putIfAbsent(key, value);
             if (previous != null) {
                 value = previous;
@@ -41,11 +69,6 @@ public V getValue(K key) {
         return value.get();
     }
 
-    public V getValueIfPresent(K key) {
-        LazyValue<V> value = map.get(key);
-        return value != null ? value.getIfPresent() : null;
-    }
-
     public V remove(K key) {
         LazyValue<V> previous = map.remove(key);
         return previous != null ? previous.get() : null;
@@ -86,19 +109,4 @@ public boolean isEmpty() {
         return map.isEmpty();
     }
 
-    class CacheFunction implements Function<K, LazyValue<V>> {
-
-        private final Function<K, V> computingFunction;
-
-        public CacheFunction(Function<K, V> computingFunction) {
-            this.computingFunction = computingFunction;
-        }
-
-        @Override
-        public LazyValue<V> apply(K key) {
-            return new LazyValue<V>(() -> computingFunction.apply(key));
-        }
-
-    }
-
 }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java
index dbab8d8c4ab8f..4bdd2f9b69ffc 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CreationalContextImpl.java
@@ -4,9 +4,9 @@
 import io.quarkus.arc.InjectableReferenceProvider;
 import io.quarkus.arc.InstanceHandle;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Function;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 
@@ -16,11 +16,11 @@
  *
  * @param <T>
  */
-public class CreationalContextImpl<T> implements CreationalContext<T> {
+public class CreationalContextImpl<T> implements CreationalContext<T>, Function<Contextual<T>, CreationalContext<T>> {
 
     private final Contextual<T> contextual;
     private final CreationalContextImpl<?> parent;
-    private final List<InstanceHandle<?>> dependentInstances;
+    private List<InstanceHandle<?>> dependentInstances;
 
     public CreationalContextImpl(Contextual<T> contextual) {
         this(contextual, null);
@@ -29,29 +29,34 @@ public CreationalContextImpl(Contextual<T> contextual) {
     public CreationalContextImpl(Contextual<T> contextual, CreationalContextImpl<?> parent) {
         this.contextual = contextual;
         this.parent = parent;
-        this.dependentInstances = Collections.synchronizedList(new ArrayList<>());
+        this.dependentInstances = null;
     }
 
     public <I> void addDependentInstance(InjectableBean<I> bean, I instance, CreationalContext<I> ctx) {
         addDependentInstance(new InstanceHandleImpl<I>(bean, instance, ctx));
     }
 
-    public <I> void addDependentInstance(InstanceHandle<I> instanceHandle) {
+    public synchronized <I> void addDependentInstance(InstanceHandle<I> instanceHandle) {
+        if (dependentInstances == null) {
+            dependentInstances = new ArrayList<>();
+        }
         dependentInstances.add(instanceHandle);
     }
 
-    public boolean hasDependentInstances() {
-        return !dependentInstances.isEmpty();
+    public synchronized boolean hasDependentInstances() {
+        return dependentInstances != null && !dependentInstances.isEmpty();
     }
 
     void destroyDependentInstance(Object dependentInstance) {
-        synchronized (dependentInstances) {
-            for (Iterator<InstanceHandle<?>> iterator = dependentInstances.iterator(); iterator.hasNext();) {
-                InstanceHandle<?> instanceHandle = iterator.next();
-                if (instanceHandle.get() == dependentInstance) {
-                    instanceHandle.destroy();
-                    iterator.remove();
-                    break;
+        synchronized (this) {
+            if (dependentInstances != null) {
+                for (Iterator<InstanceHandle<?>> iterator = dependentInstances.iterator(); iterator.hasNext();) {
+                    InstanceHandle<?> instanceHandle = iterator.next();
+                    if (instanceHandle.get() == dependentInstance) {
+                        instanceHandle.destroy();
+                        iterator.remove();
+                        break;
+                    }
                 }
             }
         }
@@ -64,9 +69,11 @@ public void push(T incompleteInstance) {
 
     @Override
     public void release() {
-        synchronized (dependentInstances) {
-            for (InstanceHandle<?> instance : dependentInstances) {
-                instance.destroy();
+        synchronized (this) {
+            if (dependentInstances != null) {
+                for (InstanceHandle<?> instance : dependentInstances) {
+                    instance.destroy();
+                }
             }
         }
     }
@@ -86,6 +93,11 @@ public <C> CreationalContextImpl<C> child(Contextual<C> contextual) {
         return new CreationalContextImpl<>(contextual, this);
     }
 
+    @Override
+    public CreationalContext<T> apply(Contextual<T> contextual) {
+        return this;
+    }
+
     public static <T> CreationalContextImpl<T> unwrap(CreationalContext<T> ctx) {
         if (ctx instanceof CreationalContextImpl) {
             return (CreationalContextImpl<T>) ctx;
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java
index 36683721b688a..90715ddc59d0c 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/CurrentInjectionPointProvider.java
@@ -184,7 +184,7 @@ static abstract class AnnotatedBase implements Annotated {
 
         AnnotatedBase(Type baseType, Set<Annotation> annotations) {
             this.baseType = baseType;
-            this.annotations = annotations;
+            this.annotations = CollectionHelpers.toImmutableSmallSet(annotations);
         }
 
         @Override
@@ -231,7 +231,7 @@ public Set<Annotation> getAnnotations() {
             if (annotations == null) {
                 throw new UnsupportedOperationException();
             }
-            return Collections.unmodifiableSet(annotations);
+            return annotations;
         }
 
         @Override
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java
index 5ae23c6bb4e40..1b87e2ab997f2 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java
@@ -66,6 +66,7 @@ class EventImpl<T> implements Event<T> {
 
     @Override
     public void fire(T event) {
+        Objects.requireNonNull(event, "Event cannot be null");
         getNotifier(event.getClass()).notify(event, ObserverExceptionHandler.IMMEDIATE_HANDLER, false);
     }
 
@@ -191,9 +192,9 @@ private void handleExceptions(ObserverExceptionHandler handler) {
                 exception = new CompletionException(handledExceptions.get(0));
             } else {
                 exception = new CompletionException(null);
-            }
-            for (Throwable handledException : handledExceptions) {
-                exception.addSuppressed(handledException);
+                for (Throwable handledException : handledExceptions) {
+                    exception.addSuppressed(handledException);
+                }
             }
             throw exception;
         }
@@ -462,7 +463,7 @@ public boolean matches(int status) {
          * Indicates whether the given status code passed in during {@link Synchronization#beforeCompletion()} or
          * {@link Synchronization#afterCompletion(int)}
          * matches this status.
-         * 
+         *
          * @param status the given status code
          * @return true if the status code matches
          */
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Mockable.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Mockable.java
new file mode 100644
index 0000000000000..013df98be4fcf
--- /dev/null
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Mockable.java
@@ -0,0 +1,13 @@
+package io.quarkus.arc.impl;
+
+/**
+ * An interface implemented by mockable components when running in test mode.
+ * <p>
+ * This allows normal scoped beans to be easily mocked for tests.
+ */
+public interface Mockable {
+
+    void arc$setMock(Object instance);
+
+    void arc$clearMock();
+}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Objects.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Objects.java
new file mode 100644
index 0000000000000..9f45b93f56c62
--- /dev/null
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Objects.java
@@ -0,0 +1,12 @@
+package io.quarkus.arc.impl;
+
+public final class Objects {
+
+    private Objects() {
+    }
+
+    // https://github.com/quarkusio/gizmo/issues/50
+    public static boolean referenceEquals(Object obj1, Object obj2) {
+        return obj1 == obj2;
+    }
+}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java
index e81505180b521..c3e799d8c1d3b 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/Qualifiers.java
@@ -1,12 +1,12 @@
 package io.quarkus.arc.impl;
 
-import io.quarkus.arc.InjectableBean;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
@@ -34,20 +34,18 @@ static void verify(Annotation... qualifiers) {
         }
     }
 
-    static boolean hasQualifiers(InjectableBean<?> bean, Annotation... requiredQualifiers) {
+    static boolean hasQualifiers(Set<Annotation> beanQualifiers, Map<String, Set<String>> qualifierNonbindingMembers,
+            Annotation... requiredQualifiers) {
         for (Annotation qualifier : requiredQualifiers) {
-            if (!hasQualifier(bean, qualifier)) {
+            if (!hasQualifier(beanQualifiers, qualifier, qualifierNonbindingMembers)) {
                 return false;
             }
         }
         return true;
     }
 
-    static boolean hasQualifier(InjectableBean<?> bean, Annotation requiredQualifier) {
-        return hasQualifier(bean.getQualifiers(), requiredQualifier);
-    }
-
-    static boolean hasQualifier(Iterable<Annotation> qualifiers, Annotation requiredQualifier) {
+    static boolean hasQualifier(Iterable<Annotation> qualifiers, Annotation requiredQualifier,
+            Map<String, Set<String>> qualifierNonbindingMembers) {
 
         Class<? extends Annotation> requiredQualifierClass = requiredQualifier.annotationType();
         Method[] members = requiredQualifierClass.getDeclaredMethods();
@@ -62,6 +60,12 @@ static boolean hasQualifier(Iterable<Annotation> qualifiers, Annotation required
                 if (value.isAnnotationPresent(Nonbinding.class)) {
                     continue;
                 }
+                if (!qualifierNonbindingMembers.isEmpty()) {
+                    Set<String> nonbindingMembers = qualifierNonbindingMembers.get(qualifierClass.getName());
+                    if (nonbindingMembers != null && nonbindingMembers.contains(value.getName())) {
+                        continue;
+                    }
+                }
                 Object val1 = invoke(value, requiredQualifier);
                 Object val2 = invoke(value, qualifier);
                 if (val1.getClass().isArray()) {
@@ -81,9 +85,10 @@ static boolean hasQualifier(Iterable<Annotation> qualifiers, Annotation required
         return false;
     }
 
-    static boolean isSubset(Set<Annotation> observedQualifiers, Set<Annotation> eventQualifiers) {
+    static boolean isSubset(Set<Annotation> observedQualifiers, Set<Annotation> eventQualifiers,
+            Map<String, Set<String>> qualifierNonbindingMembers) {
         for (Annotation required : observedQualifiers) {
-            if (!hasQualifier(eventQualifiers, required)) {
+            if (!hasQualifier(eventQualifiers, required, qualifierNonbindingMembers)) {
                 return false;
             }
         }
@@ -94,7 +99,7 @@ private static Set<Annotation> initDefaultQualifiers() {
         Set<Annotation> qualifiers = new HashSet<>();
         qualifiers.add(Default.Literal.INSTANCE);
         qualifiers.add(Any.Literal.INSTANCE);
-        return qualifiers;
+        return Collections.unmodifiableSet(qualifiers);
     }
 
     private static Object invoke(Method method, Object instance) {
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java
new file mode 100644
index 0000000000000..972ce561c7ff7
--- /dev/null
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RemovedBeanImpl.java
@@ -0,0 +1,52 @@
+package io.quarkus.arc.impl;
+
+import io.quarkus.arc.InjectableBean.Kind;
+import io.quarkus.arc.RemovedBean;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+public final class RemovedBeanImpl implements RemovedBean {
+
+    private final Kind kind;
+    private final String description;
+    private final Set<Type> types;
+    private final Set<Annotation> qualifiers;
+
+    public RemovedBeanImpl(Kind kind, String description, Set<Type> types, Set<Annotation> qualifiers) {
+        this.kind = kind != null ? kind : Kind.CLASS;
+        this.description = description;
+        this.types = CollectionHelpers.toImmutableSmallSet(types);
+        this.qualifiers = qualifiers != null ? CollectionHelpers.toImmutableSmallSet(qualifiers)
+                : Qualifiers.DEFAULT_QUALIFIERS;
+    }
+
+    @Override
+    public Kind getKind() {
+        return kind;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public Set<Type> getTypes() {
+        return types;
+    }
+
+    @Override
+    public Set<Annotation> getQualifiers() {
+        return qualifiers;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append(kind).append(" bean ").append(description).append(" [types=")
+                .append(types).append(", qualifiers=").append(qualifiers).append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java
index ee38bdc9ef476..39ed6e839a56d 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/RequestContext.java
@@ -2,15 +2,16 @@
 
 import io.quarkus.arc.ContextInstanceHandle;
 import io.quarkus.arc.InjectableBean;
-import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.ManagedContext;
 import io.quarkus.arc.impl.EventImpl.Notifier;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.enterprise.context.BeforeDestroyed;
 import javax.enterprise.context.ContextNotActiveException;
@@ -51,28 +52,47 @@ public Class<? extends Annotation> getScope() {
 
     @SuppressWarnings("unchecked")
     @Override
-    public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) {
-        if (contextual == null) {
-            throw new IllegalArgumentException("Contextual parameter must not be null");
-        }
+    public <T> T getIfActive(Contextual<T> contextual, Function<Contextual<T>, CreationalContext<T>> creationalContextFun) {
+        Objects.requireNonNull(contextual, "Contextual must not be null");
+        Objects.requireNonNull(creationalContextFun, "CreationalContext supplier must not be null");
         Map<Contextual<?>, ContextInstanceHandle<?>> ctx = currentContext.get();
         if (ctx == null) {
             // Thread local not set - context is not active!
-            throw new ContextNotActiveException();
+            return null;
         }
         ContextInstanceHandle<T> instance = (ContextInstanceHandle<T>) ctx.get(contextual);
-        if (instance == null && creationalContext != null) {
+        if (instance == null) {
+            CreationalContext<T> creationalContext = creationalContextFun.apply(contextual);
             // Bean instance does not exist - create one if we have CreationalContext
             instance = new ContextInstanceHandleImpl<T>((InjectableBean<T>) contextual,
                     contextual.create(creationalContext), creationalContext);
             ctx.put(contextual, instance);
         }
-        return instance != null ? instance.get() : null;
+        return instance.get();
     }
 
+    @Override
+    public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext) {
+        T result = getIfActive(contextual,
+                CreationalContextImpl.unwrap(Objects.requireNonNull(creationalContext, "CreationalContext must not be null")));
+        if (result == null) {
+            // Thread local not set - context is not active!
+            throw new ContextNotActiveException();
+        }
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T get(Contextual<T> contextual) {
-        return get(contextual, null);
+        Objects.requireNonNull(contextual, "Contextual must not be null");
+        Map<Contextual<?>, ContextInstanceHandle<?>> ctx = currentContext.get();
+        if (ctx == null) {
+            // Thread local not set - context is not active!
+            throw new ContextNotActiveException();
+        }
+        ContextInstanceHandle<T> instance = (ContextInstanceHandle<T>) ctx.get(contextual);
+        return instance == null ? null : instance.get();
     }
 
     @Override
@@ -103,7 +123,7 @@ public void activate(ContextState initialState) {
             if (initialState instanceof RequestContextState) {
                 currentContext.set(((RequestContextState) initialState).value);
             } else {
-                throw new IllegalArgumentException("Invalid inital state: " + initialState.getClass().getName());
+                throw new IllegalArgumentException("Invalid initial state: " + initialState.getClass().getName());
             }
         }
     }
@@ -146,13 +166,8 @@ private void destroy(Map<Contextual<?>, ContextInstanceHandle<?>> currentContext
                 } catch (Exception e) {
                     LOGGER.warn("An error occurred during delivery of the @BeforeDestroyed(RequestScoped.class) event", e);
                 }
-                for (InstanceHandle<?> instance : currentContext.values()) {
-                    try {
-                        instance.destroy();
-                    } catch (Exception e) {
-                        throw new IllegalStateException("Unable to destroy instance" + instance.get(), e);
-                    }
-                }
+                //Performance: avoid an iterator on the map elements
+                currentContext.forEach(this::destroyContextElement);
                 // Fire an event with qualifier @Destroyed(RequestScoped.class) if there are any observers for it
                 try {
                     fireIfNotEmpty(destroyedNotifier);
@@ -164,6 +179,14 @@ private void destroy(Map<Contextual<?>, ContextInstanceHandle<?>> currentContext
         }
     }
 
+    private void destroyContextElement(Contextual<?> contextual, ContextInstanceHandle<?> contextInstanceHandle) {
+        try {
+            contextInstanceHandle.destroy();
+        } catch (Exception e) {
+            throw new IllegalStateException("Unable to destroy instance" + contextInstanceHandle.get(), e);
+        }
+    }
+
     private void fireIfNotEmpty(LazyValue<Notifier<Object>> value) {
         Notifier<Object> notifier = value.get();
         if (!notifier.isEmpty()) {
diff --git a/independent-projects/arc/runtime/src/test/resources/META-INF/services/org.jboss.weld.arc.BeanProvider b/independent-projects/arc/runtime/src/test/resources/META-INF/services/org.jboss.weld.arc.BeanProvider
index 3826b822df0ea..8a6c812515c35 100644
--- a/independent-projects/arc/runtime/src/test/resources/META-INF/services/org.jboss.weld.arc.BeanProvider
+++ b/independent-projects/arc/runtime/src/test/resources/META-INF/services/org.jboss.weld.arc.BeanProvider
@@ -5,7 +5,7 @@
 # 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
+#     https://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,
@@ -21,7 +21,7 @@
 # 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
+#     https://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,
diff --git a/independent-projects/arc/tests/pom.xml b/independent-projects/arc/tests/pom.xml
index d010b85aa8901..f0ca7dd18de33 100644
--- a/independent-projects/arc/tests/pom.xml
+++ b/independent-projects/arc/tests/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus.arc</groupId>
         <artifactId>arc-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>arc-tests</artifactId>
@@ -33,6 +32,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -40,19 +40,6 @@
             <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.annotation.versioning</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java
index 9e68b64c2a732..a4ac9d0625cdc 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java
@@ -15,6 +15,7 @@
 import io.quarkus.arc.processor.InterceptorBindingRegistrar;
 import io.quarkus.arc.processor.ObserverRegistrar;
 import io.quarkus.arc.processor.ObserverTransformer;
+import io.quarkus.arc.processor.QualifierRegistrar;
 import io.quarkus.arc.processor.ResourceOutput;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,6 +30,7 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -65,10 +67,12 @@ public static class Builder {
 
         private final List<Class<?>> resourceReferenceProviders;
         private final List<Class<?>> beanClasses;
+        private final List<Class<?>> additionalClasses;
         private final List<Class<? extends Annotation>> resourceAnnotations;
         private final List<BeanRegistrar> beanRegistrars;
         private final List<ObserverRegistrar> observerRegistrars;
         private final List<ContextRegistrar> contextRegistrars;
+        private final List<QualifierRegistrar> qualifierRegistrars;
         private final List<InterceptorBindingRegistrar> interceptorBindingRegistrars;
         private final List<AnnotationsTransformer> annotationsTransformers;
         private final List<InjectionPointsTransformer> injectionsPointsTransformers;
@@ -82,10 +86,12 @@ public static class Builder {
         public Builder() {
             resourceReferenceProviders = new ArrayList<>();
             beanClasses = new ArrayList<>();
+            additionalClasses = new ArrayList<>();
             resourceAnnotations = new ArrayList<>();
             beanRegistrars = new ArrayList<>();
             observerRegistrars = new ArrayList<>();
             contextRegistrars = new ArrayList<>();
+            qualifierRegistrars = new ArrayList<>();
             interceptorBindingRegistrars = new ArrayList<>();
             annotationsTransformers = new ArrayList<>();
             injectionsPointsTransformers = new ArrayList<>();
@@ -104,6 +110,11 @@ public Builder beanClasses(Class<?>... beanClasses) {
             return this;
         }
 
+        public Builder additionalClasses(Class<?>... additionalClasses) {
+            Collections.addAll(this.additionalClasses, additionalClasses);
+            return this;
+        }
+
         @SafeVarargs
         public final Builder resourceAnnotations(Class<? extends Annotation>... resourceAnnotations) {
             Collections.addAll(this.resourceAnnotations, resourceAnnotations);
@@ -140,6 +151,11 @@ public Builder observerTransformers(ObserverTransformer... transformers) {
             return this;
         }
 
+        public Builder qualifierRegistrars(QualifierRegistrar... registrars) {
+            Collections.addAll(this.qualifierRegistrars, registrars);
+            return this;
+        }
+
         public Builder interceptorBindingRegistrars(InterceptorBindingRegistrar... registrars) {
             Collections.addAll(this.interceptorBindingRegistrars, registrars);
             return this;
@@ -179,23 +195,18 @@ public ArcTestContainer build() {
     private final List<Class<?>> resourceReferenceProviders;
 
     private final List<Class<?>> beanClasses;
+    private final List<Class<?>> additionalClasses;
 
     private final List<Class<? extends Annotation>> resourceAnnotations;
 
     private final List<BeanRegistrar> beanRegistrars;
-
     private final List<ObserverRegistrar> observerRegistrars;
-
     private final List<ContextRegistrar> contextRegistrars;
-
-    List<InterceptorBindingRegistrar> bindingRegistrars;
-
+    private final List<QualifierRegistrar> qualifierRegistrars;
+    private final List<InterceptorBindingRegistrar> interceptorBindingRegistrars;
     private final List<AnnotationsTransformer> annotationsTransformers;
-
     private final List<InjectionPointsTransformer> injectionPointsTransformers;
-
     private final List<ObserverTransformer> observerTransformers;
-
     private final List<BeanDeploymentValidator> beanDeploymentValidators;
 
     private final boolean shouldFail;
@@ -209,11 +220,13 @@ public ArcTestContainer build() {
     public ArcTestContainer(Class<?>... beanClasses) {
         this.resourceReferenceProviders = Collections.emptyList();
         this.beanClasses = Arrays.asList(beanClasses);
+        this.additionalClasses = Collections.emptyList();
         this.resourceAnnotations = Collections.emptyList();
         this.beanRegistrars = Collections.emptyList();
         this.observerRegistrars = Collections.emptyList();
         this.contextRegistrars = Collections.emptyList();
-        this.bindingRegistrars = Collections.emptyList();
+        this.interceptorBindingRegistrars = Collections.emptyList();
+        this.qualifierRegistrars = Collections.emptyList();
         this.annotationsTransformers = Collections.emptyList();
         this.injectionPointsTransformers = Collections.emptyList();
         this.observerTransformers = Collections.emptyList();
@@ -228,11 +241,13 @@ public ArcTestContainer(Class<?>... beanClasses) {
     public ArcTestContainer(Builder builder) {
         this.resourceReferenceProviders = builder.resourceReferenceProviders;
         this.beanClasses = builder.beanClasses;
+        this.additionalClasses = builder.additionalClasses;
         this.resourceAnnotations = builder.resourceAnnotations;
         this.beanRegistrars = builder.beanRegistrars;
         this.observerRegistrars = builder.observerRegistrars;
         this.contextRegistrars = builder.contextRegistrars;
-        this.bindingRegistrars = builder.interceptorBindingRegistrars;
+        this.qualifierRegistrars = builder.qualifierRegistrars;
+        this.interceptorBindingRegistrars = builder.interceptorBindingRegistrars;
         this.annotationsTransformers = builder.annotationsTransformers;
         this.injectionPointsTransformers = builder.injectionsPointsTransformers;
         this.observerTransformers = builder.observerTransformers;
@@ -294,13 +309,24 @@ private ClassLoader init(ExtensionContext context) {
         Arc.shutdown();
 
         // Build index
-        Index index;
+        Index beanArchiveIndex;
         try {
-            index = index(beanClasses);
+            beanArchiveIndex = index(beanClasses);
         } catch (IOException e) {
             throw new IllegalStateException("Failed to create index", e);
         }
 
+        Index applicationIndex;
+        if (additionalClasses.isEmpty()) {
+            applicationIndex = null;
+        } else {
+            try {
+                applicationIndex = index(additionalClasses);
+            } catch (IOException e) {
+                throw new IllegalStateException("Failed to create index", e);
+            }
+        }
+
         ClassLoader old = Thread.currentThread()
                 .getContextClassLoader();
 
@@ -331,8 +357,9 @@ private ClassLoader init(ExtensionContext context) {
 
             BeanProcessor.Builder builder = BeanProcessor.builder()
                     .setName(testClass.getSimpleName())
-                    .setIndex(BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(),
-                            new BeanArchives.PersistentClassIndex(), index));
+                    .setBeanArchiveIndex(BeanArchives.buildBeanArchiveIndex(getClass().getClassLoader(),
+                            new ConcurrentHashMap<>(), beanArchiveIndex))
+                    .setApplicationIndex(applicationIndex);
             if (!resourceAnnotations.isEmpty()) {
                 builder.addResourceAnnotations(resourceAnnotations.stream()
                         .map(c -> DotName.createSimple(c.getName()))
@@ -341,7 +368,8 @@ private ClassLoader init(ExtensionContext context) {
             beanRegistrars.forEach(builder::addBeanRegistrar);
             observerRegistrars.forEach(builder::addObserverRegistrar);
             contextRegistrars.forEach(builder::addContextRegistrar);
-            bindingRegistrars.forEach(builder::addInterceptorbindingRegistrar);
+            qualifierRegistrars.forEach(builder::addQualifierRegistrar);
+            interceptorBindingRegistrars.forEach(builder::addInterceptorBindingRegistrar);
             annotationsTransformers.forEach(builder::addAnnotationTransformer);
             injectionPointsTransformers.forEach(builder::addInjectionPointTransformer);
             observerTransformers.forEach(builder::addObserverTransformer);
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java
index 0119a9c5f3212..98bab1fd35e40 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/beanmanager/BeanManagerTest.java
@@ -6,10 +6,10 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.wildfly.common.Assert.assertFalse;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ManagedContext;
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java
index 544126979f1dd..dec25178504ed 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/BeanRegistrarTest.java
@@ -27,6 +27,8 @@
 import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Qualifier;
 import javax.inject.Singleton;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -107,6 +109,13 @@ public void register(RegistrationContext context) {
                     .creator(StringCreator.class).addQualifier().annotation(NextQualifier.class).addValue("name", "Roman")
                     .addValue("age", 42)
                     .addValue("classes", new Class[] { String.class }).done().unremovable().done();
+
+            uselessBean = context.beans()
+                    .assignableTo(
+                            Type.create(DotName.createSimple(UselessBean.class.getName()), org.jboss.jandex.Type.Kind.CLASS))
+                    .firstResult();
+            assertTrue(uselessBean.isPresent());
+            assertEquals(UselessBean.class.getName(), uselessBean.get().getBeanClass().toString());
         }
 
     }
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java
new file mode 100644
index 0000000000000..05a0a0c2542d5
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/beans/SyntheticBeanCollisionTest.java
@@ -0,0 +1,51 @@
+package io.quarkus.arc.test.buildextension.beans;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.arc.BeanCreator;
+import io.quarkus.arc.processor.BeanRegistrar;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.util.Map;
+import javax.enterprise.context.spi.CreationalContext;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class SyntheticBeanCollisionTest {
+
+    public static volatile boolean beanDestroyerInvoked = false;
+
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder()
+            .beanRegistrars(new TestRegistrar()).shouldFail().build();
+
+    @Test
+    public void testFailure() {
+        assertNotNull(container.getFailure());
+        assertTrue(container.getFailure().getMessage().contains("A synthetic bean with identifier"),
+                container.getFailure().getMessage());
+    }
+
+    static class TestRegistrar implements BeanRegistrar {
+
+        @Override
+        public void register(RegistrationContext context) {
+            context.configure(String.class).unremovable().types(String.class).param("name", "Frantisek")
+                    .creator(StringCreator.class).done();
+
+            context.configure(String.class).unremovable().types(String.class).param("name", "Martin")
+                    .creator(StringCreator.class).done();
+        }
+
+    }
+
+    public static class StringCreator implements BeanCreator<String> {
+
+        @Override
+        public String create(CreationalContext<String> creationalContext, Map<String, Object> params) {
+            return "Hello " + params.get("name") + "!";
+        }
+
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java
new file mode 100644
index 0000000000000..46658ef7d0b43
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/buildextension/qualifiers/AdditionalQualifiersTest.java
@@ -0,0 +1,157 @@
+package io.quarkus.arc.test.buildextension.qualifiers;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.processor.QualifierRegistrar;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Singleton;
+import org.jboss.jandex.DotName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class AdditionalQualifiersTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder()
+            .beanClasses(ToBeQualifier.class,
+                    ToBeQualifierWithBindingField.class,
+                    ToBeQualifierWithNonBindingField.class, Alpha.class, Bravo.class, Charlie.class)
+            .qualifierRegistrars(new QualifierRegistrar() {
+
+                @Override
+                public Map<DotName, Set<String>> getAdditionalQualifiers() {
+                    Map<DotName, Set<String>> qualifiers = new HashMap<>();
+                    qualifiers.put(DotName.createSimple(ToBeQualifier.class.getName()), Collections.emptySet());
+                    qualifiers.put(DotName.createSimple(ToBeQualifierWithNonBindingField.class.getName()),
+                            Collections.singleton("foo"));
+                    qualifiers.put(DotName.createSimple(ToBeQualifierWithBindingField.class.getName()),
+                            Collections.singleton("value"));
+                    return qualifiers;
+                }
+            })
+            .build();
+
+    @SuppressWarnings("serial")
+    @Test
+    public void testQualifierWasRegistered() {
+        ArcContainer container = Arc.container();
+        assertTrue(container.select(Alpha.class).isUnsatisfied());
+        assertTrue(container.select(Alpha.class, new ToBeQualifierLiteral() {
+        }).isResolvable());
+        assertTrue(container.select(Bravo.class).isUnsatisfied());
+        assertTrue(container.select(Bravo.class, new ToBeQualifierWithNonBindingFieldLiteral() {
+            @Override
+            public String foo() {
+                return "blik";
+            }
+
+        }).isResolvable());
+        assertTrue(container.select(Charlie.class).isUnsatisfied());
+        assertTrue(container.select(Charlie.class, new ToBeQualifierWithBindingFieldLiteral() {
+            @Override
+            public String value() {
+                return "ignored";
+            }
+
+            @Override
+            public int age() {
+                return 10;
+            }
+
+        }).isResolvable());
+        assertTrue(container.select(Charlie.class, new ToBeQualifierWithBindingFieldLiteral() {
+            @Override
+            public String value() {
+                return "ignored";
+            }
+
+            @Override
+            public int age() {
+                // this should be binding!
+                return 1;
+            }
+
+        }).isUnsatisfied());
+    }
+
+    @ToBeQualifier
+    @Singleton
+    static class Alpha {
+
+    }
+
+    @ToBeQualifierWithNonBindingField(foo = "bzzzz")
+    @Singleton
+    static class Bravo {
+
+    }
+
+    // value should be ignore but age is used during resolution
+    @ToBeQualifierWithBindingField(value = "bzzzz", age = 20)
+    @ToBeQualifierWithBindingField(value = "nok", age = 10)
+    @Singleton
+    static class Charlie {
+
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    public @interface ToBeQualifier {
+
+    }
+
+    @SuppressWarnings("serial")
+    public abstract class ToBeQualifierLiteral extends AnnotationLiteral<ToBeQualifier> implements ToBeQualifier {
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    public @interface ToBeQualifierWithNonBindingField {
+        String foo();
+    }
+
+    @SuppressWarnings("serial")
+    public abstract class ToBeQualifierWithNonBindingFieldLiteral extends AnnotationLiteral<ToBeQualifierWithNonBindingField>
+            implements ToBeQualifierWithNonBindingField {
+    }
+
+    @Repeatable(ToBeQualifierWithBindingField.Container.class)
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    public @interface ToBeQualifierWithBindingField {
+
+        String value();
+
+        int age();
+
+        @Retention(RetentionPolicy.RUNTIME)
+        @Target({ TYPE, METHOD, FIELD, PARAMETER })
+        public @interface Container {
+
+            ToBeQualifierWithBindingField[] value();
+
+        }
+    }
+
+    @SuppressWarnings("serial")
+    public abstract class ToBeQualifierWithBindingFieldLiteral extends AnnotationLiteral<ToBeQualifierWithBindingField>
+            implements ToBeQualifierWithBindingField {
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java
new file mode 100644
index 0000000000000..ca43a536541e6
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/index/AdditionalIndexTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.arc.test.index;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.util.ArrayList;
+import java.util.List;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class AdditionalIndexTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder()
+            .beanClasses(Client.class, SuperProducer.class, SuperClazz.class)
+            // SubClazz is not part of the bean archive index
+            .additionalClasses(SubClazz.class).build();
+
+    @Test
+    public void testTypesafeResolution() {
+        Client client = Arc.container().instance(Client.class).get();
+        // Test that the build does not fail and we're able to inject the producer
+        assertTrue(client.list.isEmpty());
+    }
+
+    @Dependent
+    static class Client {
+
+        // This injection point should be satisfied by SuperProducer#produce()
+        // because SubClazz extends SuperClazz
+        @Inject
+        List<SubClazz> list;
+    }
+
+    public static class SuperProducer {
+
+        @Produces
+        <T extends SuperClazz> List<T> produce() {
+            return new ArrayList<>();
+        }
+
+    }
+
+    public static class SuperClazz {
+
+        public void ping() {
+        }
+    }
+
+    public static class SubClazz extends SuperClazz {
+
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java
index 5c36e3f213cd3..28faa0ab50e97 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/erroneous/CircularInjectionNotSupportedTest.java
@@ -1,12 +1,12 @@
 package io.quarkus.arc.test.injection.erroneous;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.quarkus.arc.test.ArcTestContainer;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.wildfly.common.Assert;
 
 public class CircularInjectionNotSupportedTest {
 
@@ -17,8 +17,7 @@ public class CircularInjectionNotSupportedTest {
     @Test
     public void testExceptionThrown() {
         Throwable error = container.getFailure();
-        Assertions.assertNotNull(error);
-        Assert.assertTrue(error instanceof IllegalStateException);
+        assertThat(error).isInstanceOf(IllegalStateException.class);
     }
 
     static abstract class AbstractServiceImpl {
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java
index 4e0f771599d3f..b5fbf998c8390 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/injection/superclass/SuperclassInjectionTest.java
@@ -49,6 +49,13 @@ public void testSuperclassDifferentPackage() {
         assertEquals(5, ids.size(), () -> "Wrong number of ids: " + ids);
     }
 
+    @Test
+    public void testFieldSameName() {
+        CombineHarvester combineHarvester = Arc.container().instance(CombineHarvester.class).get();
+        assertNotNull(combineHarvester.getCombineHead());
+        assertNotNull(combineHarvester.getSuperHead());
+    }
+
     @Dependent
     public static class Head {
 
@@ -72,15 +79,29 @@ static class SuperCombineHarvester extends FooHarvester {
     @ApplicationScoped
     static class CombineHarvester extends SuperHarvester {
 
+        @Inject
+        Head sameName;
+
+        Head getCombineHead() {
+            return sameName;
+        }
+
     }
 
     public static class SuperHarvester {
 
+        @Inject
+        Head sameName;
+
         private Head head1;
 
         @Inject
         Head head2;
 
+        Head getSuperHead() {
+            return sameName;
+        }
+
         @Inject
         void setHead(Head head) {
             this.head1 = head;
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java
index f8d6856d61867..16bc65b40439d 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/Counter.java
@@ -8,15 +8,15 @@ public class Counter {
 
     private AtomicInteger counter = new AtomicInteger();
 
-    int incrementAndGet() {
+    public int incrementAndGet() {
         return counter.incrementAndGet();
     }
 
-    void reset() {
+    public void reset() {
         counter.set(0);
     }
 
-    int get() {
+    public int get() {
         return counter.get();
     }
 
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java
new file mode 100644
index 0000000000000..0fe18aab02fef
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/InheritedRepeatableInterceptorBindingTest.java
@@ -0,0 +1,146 @@
+package io.quarkus.arc.test.interceptors.bindings.repeatable;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/**
+ * Tests usage of inherited repeating interceptor binding.
+ */
+public class InheritedRepeatableInterceptorBindingTest {
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyBinding.class, MyBinding.List.class,
+            SuperclassWithMethodLevelBindings.class, MethodInterceptedBean.class, IncrementingInterceptor.class);
+
+    @BeforeEach
+    public void setUp() {
+        IncrementingInterceptor.AROUND_CONSTRUCT.set(false);
+        IncrementingInterceptor.POST_CONSTRUCT.set(false);
+        IncrementingInterceptor.PRE_DESTROY.set(false);
+    }
+
+    @Test
+    public void methodLevelInterceptor() {
+        MethodInterceptedBean bean = Arc.container().instance(MethodInterceptedBean.class).get();
+
+        assertEquals(10, bean.foo());
+        assertEquals(21, bean.foobar());
+        assertEquals(30, bean.foobaz());
+        assertEquals(41, bean.foobarbaz());
+        assertEquals(50, bean.nonannotated());
+
+        // interceptor bindings are not inherited for constructors
+        assertFalse(IncrementingInterceptor.AROUND_CONSTRUCT.get());
+
+        // post-construct and pre-destroy interceptors aren't called,
+        // because there are no class-level interceptor bindings
+        assertFalse(IncrementingInterceptor.POST_CONSTRUCT.get());
+        assertFalse(IncrementingInterceptor.PRE_DESTROY.get());
+    }
+
+    @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR })
+    @Retention(RetentionPolicy.RUNTIME)
+    @Repeatable(MyBinding.List.class)
+    @Inherited
+    @InterceptorBinding
+    @interface MyBinding {
+        String value();
+
+        @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR })
+        @Retention(RetentionPolicy.RUNTIME)
+        @Inherited
+        @interface List {
+            MyBinding[] value();
+        }
+    }
+
+    @ApplicationScoped
+    static class SuperclassWithMethodLevelBindings {
+        @MyBinding("foo")
+        @MyBinding("bar")
+        public SuperclassWithMethodLevelBindings() {
+        }
+
+        @MyBinding("foo")
+        public int foo() {
+            return 10;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("bar")
+        public int foobar() {
+            return 20;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("baz")
+        public int foobaz() {
+            return 30;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("bar")
+        @MyBinding("baz")
+        public int foobarbaz() {
+            return 40;
+        }
+
+        public int nonannotated() {
+            return 50;
+        }
+    }
+
+    @ApplicationScoped
+    static class MethodInterceptedBean extends SuperclassWithMethodLevelBindings {
+    }
+
+    @Interceptor
+    @MyBinding("foo")
+    @MyBinding("bar")
+    static class IncrementingInterceptor {
+        static final AtomicBoolean AROUND_CONSTRUCT = new AtomicBoolean(false);
+        static final AtomicBoolean POST_CONSTRUCT = new AtomicBoolean(false);
+        static final AtomicBoolean PRE_DESTROY = new AtomicBoolean(false);
+
+        @AroundConstruct
+        public void aroundConstruct(InvocationContext ctx) throws Exception {
+            AROUND_CONSTRUCT.set(true);
+            ctx.proceed();
+        }
+
+        @PostConstruct
+        public void postConstruct(InvocationContext ctx) {
+            POST_CONSTRUCT.set(true);
+        }
+
+        @PreDestroy
+        public void preDestroy(InvocationContext ctx) {
+            PRE_DESTROY.set(true);
+        }
+
+        @AroundInvoke
+        public Object intercept(InvocationContext ctx) throws Exception {
+            return ((Integer) ctx.proceed()) + 1;
+        }
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java
new file mode 100644
index 0000000000000..938f60e60f899
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingTest.java
@@ -0,0 +1,142 @@
+package io.quarkus.arc.test.interceptors.bindings.repeatable;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/**
+ * Tests repeating interceptor binding usage.
+ */
+public class RepeatableInterceptorBindingTest {
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyBinding.class, MyBinding.List.class,
+            MethodInterceptedBean.class, IncrementingInterceptor.class);
+
+    @BeforeEach
+    public void setUp() {
+        IncrementingInterceptor.AROUND_CONSTRUCT.set(false);
+        IncrementingInterceptor.POST_CONSTRUCT.set(false);
+        IncrementingInterceptor.PRE_DESTROY.set(false);
+    }
+
+    @Test
+    public void methodLevelInterceptor() {
+        MethodInterceptedBean bean = Arc.container().instance(MethodInterceptedBean.class).get();
+
+        assertEquals(10, bean.foo());
+        assertEquals(21, bean.foobar());
+        assertEquals(30, bean.foobaz());
+        assertEquals(41, bean.foobarbaz());
+        assertEquals(50, bean.nonannotated());
+
+        // the instance is created lazily (the bean is @ApplicationScoped),
+        // so the around construct interceptor is also called lazily,
+        // when the first method call is made on the client proxy
+        assertTrue(IncrementingInterceptor.AROUND_CONSTRUCT.get());
+
+        // post-construct and pre-destroy interceptors aren't called,
+        // because there are no class-level interceptor bindings
+        assertFalse(IncrementingInterceptor.POST_CONSTRUCT.get());
+        assertFalse(IncrementingInterceptor.PRE_DESTROY.get());
+    }
+
+    @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR })
+    @Retention(RetentionPolicy.RUNTIME)
+    @Repeatable(MyBinding.List.class)
+    @InterceptorBinding
+    @interface MyBinding {
+        String value();
+
+        @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR })
+        @Retention(RetentionPolicy.RUNTIME)
+        @interface List {
+            MyBinding[] value();
+        }
+    }
+
+    @ApplicationScoped
+    static class MethodInterceptedBean {
+        @MyBinding("foo")
+        @MyBinding("bar")
+        public MethodInterceptedBean() {
+        }
+
+        @MyBinding("foo")
+        public int foo() {
+            return 10;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("bar")
+        public int foobar() {
+            return 20;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("baz")
+        public int foobaz() {
+            return 30;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("bar")
+        @MyBinding("baz")
+        public int foobarbaz() {
+            return 40;
+        }
+
+        public int nonannotated() {
+            return 50;
+        }
+    }
+
+    @Interceptor
+    @MyBinding("foo")
+    @MyBinding("bar")
+    static class IncrementingInterceptor {
+        static final AtomicBoolean AROUND_CONSTRUCT = new AtomicBoolean(false);
+        static final AtomicBoolean POST_CONSTRUCT = new AtomicBoolean(false);
+        static final AtomicBoolean PRE_DESTROY = new AtomicBoolean(false);
+
+        @AroundConstruct
+        public void aroundConstruct(InvocationContext ctx) throws Exception {
+            AROUND_CONSTRUCT.set(true);
+            ctx.proceed();
+        }
+
+        @PostConstruct
+        public void postConstruct(InvocationContext ctx) {
+            POST_CONSTRUCT.set(true);
+        }
+
+        @PreDestroy
+        public void preDestroy(InvocationContext ctx) {
+            PRE_DESTROY.set(true);
+        }
+
+        @AroundInvoke
+        public Object intercept(InvocationContext ctx) throws Exception {
+            return ((Integer) ctx.proceed()) + 1;
+        }
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java
new file mode 100644
index 0000000000000..1659dc6b138b9
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bindings/repeatable/RepeatableInterceptorBindingWithNonbindingAttributeTest.java
@@ -0,0 +1,144 @@
+package io.quarkus.arc.test.interceptors.bindings.repeatable;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.util.Nonbinding;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/**
+ * Tests repeating interceptor binding usage, with a nonbinding annotation attribute.
+ */
+public class RepeatableInterceptorBindingWithNonbindingAttributeTest {
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyBinding.class, MyBinding.List.class,
+            MethodInterceptedBean.class, IncrementingInterceptor.class);
+
+    @BeforeEach
+    public void setUp() {
+        IncrementingInterceptor.AROUND_CONSTRUCT.set(false);
+        IncrementingInterceptor.POST_CONSTRUCT.set(false);
+        IncrementingInterceptor.PRE_DESTROY.set(false);
+    }
+
+    @Test
+    public void methodLevelInterceptor() {
+        MethodInterceptedBean bean = Arc.container().instance(MethodInterceptedBean.class).get();
+
+        assertEquals(11, bean.foo());
+        assertEquals(21, bean.foobar());
+        assertEquals(31, bean.foobaz());
+        assertEquals(41, bean.foobarbaz());
+        assertEquals(50, bean.nonannotated());
+
+        // the instance is created lazily (the bean is @ApplicationScoped),
+        // so the around construct interceptor is also called lazily,
+        // when the first method call is made on the client proxy
+        assertTrue(IncrementingInterceptor.AROUND_CONSTRUCT.get());
+
+        // post-construct and pre-destroy interceptors aren't called,
+        // because there are no class-level interceptor bindings
+        assertFalse(IncrementingInterceptor.POST_CONSTRUCT.get());
+        assertFalse(IncrementingInterceptor.PRE_DESTROY.get());
+    }
+
+    @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR })
+    @Retention(RetentionPolicy.RUNTIME)
+    @Repeatable(MyBinding.List.class)
+    @InterceptorBinding
+    @interface MyBinding {
+        @Nonbinding
+        String value();
+
+        @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR })
+        @Retention(RetentionPolicy.RUNTIME)
+        @interface List {
+            MyBinding[] value();
+        }
+    }
+
+    @ApplicationScoped
+    static class MethodInterceptedBean {
+        @MyBinding("foo")
+        @MyBinding("bar")
+        public MethodInterceptedBean() {
+        }
+
+        @MyBinding("foo")
+        public int foo() {
+            return 10;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("bar")
+        public int foobar() {
+            return 20;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("baz")
+        public int foobaz() {
+            return 30;
+        }
+
+        @MyBinding("foo")
+        @MyBinding("bar")
+        @MyBinding("baz")
+        public int foobarbaz() {
+            return 40;
+        }
+
+        public int nonannotated() {
+            return 50;
+        }
+    }
+
+    @Interceptor
+    @MyBinding("foo")
+    @MyBinding("bar")
+    static class IncrementingInterceptor {
+        static final AtomicBoolean AROUND_CONSTRUCT = new AtomicBoolean(false);
+        static final AtomicBoolean POST_CONSTRUCT = new AtomicBoolean(false);
+        static final AtomicBoolean PRE_DESTROY = new AtomicBoolean(false);
+
+        @AroundConstruct
+        public void aroundConstruct(InvocationContext ctx) throws Exception {
+            AROUND_CONSTRUCT.set(true);
+            ctx.proceed();
+        }
+
+        @PostConstruct
+        public void postConstruct(InvocationContext ctx) {
+            POST_CONSTRUCT.set(true);
+        }
+
+        @PreDestroy
+        public void preDestroy(InvocationContext ctx) {
+            PRE_DESTROY.set(true);
+        }
+
+        @AroundInvoke
+        public Object intercept(InvocationContext ctx) throws Exception {
+            return ((Integer) ctx.proceed()) + 1;
+        }
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/AbstractResource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/AbstractResource.java
new file mode 100644
index 0000000000000..614a6b441aa50
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/AbstractResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.arc.test.interceptors.bridge;
+
+public abstract class AbstractResource<T> {
+
+    public String create(T dto) {
+        return dto.toString();
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java
new file mode 100644
index 0000000000000..a36f16860f924
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/BridgeMethodInterceptionTest.java
@@ -0,0 +1,126 @@
+package io.quarkus.arc.test.interceptors.bridge;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.test.ArcTestContainer;
+import io.quarkus.arc.test.interceptors.Counter;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Singleton;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class BridgeMethodInterceptionTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(Base.class, Submarine.class, Ubot.class, Ponorka.class,
+            Counter.class, Simple.class, SimpleInterceptor.class, ExampleApi.class, ExampleResource.class,
+            AbstractResource.class);
+
+    @Test
+    public void testInterception() {
+        ArcContainer container = Arc.container();
+        Counter counter = container.instance(Counter.class).get();
+
+        counter.reset();
+        Submarine submarine = container.instance(Submarine.class).get();
+        assertEquals("foo", submarine.echo("foo"));
+        assertEquals(Submarine.class.getSimpleName(), submarine.getName());
+        assertEquals(2, counter.get());
+        // Now let's invoke the bridge method...
+        Base<String> base = submarine;
+        assertEquals("foo", base.echo("foo"));
+        assertEquals(Submarine.class.getSimpleName(), base.getName());
+        assertEquals(4, counter.get());
+
+        counter.reset();
+        Ubot ubot = container.instance(Ubot.class).get();
+        assertEquals("1", ubot.echo(1));
+        assertEquals(42, ubot.getName());
+        assertEquals(2, counter.get());
+        Base<Integer> baseUbot = ubot;
+        assertEquals("1", baseUbot.echo(1));
+        assertEquals(42, ubot.getName());
+        assertEquals(4, counter.get());
+
+        counter.reset();
+        Ponorka ponorka = container.instance(Ponorka.class).get();
+        assertEquals("TRUE", ponorka.echo(true));
+        assertNull(ponorka.getName());
+        assertEquals(2, counter.get());
+        Base<Boolean> basePonorka = ponorka;
+        assertEquals("TRUE", basePonorka.echo(true));
+        assertNull(basePonorka.getName());
+        assertEquals(4, counter.get());
+    }
+
+    @Test
+    public void testHierarchyWithInterface() {
+        ArcContainer container = Arc.container();
+        Counter counter = container.instance(Counter.class).get();
+
+        counter.reset();
+        ExampleResource exampleResource = container.instance(ExampleResource.class).get();
+        assertEquals("foo", exampleResource.create("foo"));
+        assertEquals(1, counter.get());
+
+        counter.reset();
+        ExampleApi exampleApi = container.instance(ExampleApi.class).get();
+        assertEquals("foo", exampleApi.create("foo"));
+        assertEquals(1, counter.get());
+    }
+
+    static class Base<T> {
+
+        String echo(T payload) {
+            return payload.toString().toUpperCase();
+        }
+
+        T getName() {
+            return null;
+        }
+
+    }
+
+    @ApplicationScoped
+    static class Submarine extends Base<String> {
+
+        @Simple
+        @Override
+        String echo(String payload) {
+            return payload.toString();
+        }
+
+        @Simple
+        @Override
+        String getName() {
+            return Submarine.class.getSimpleName();
+        }
+
+    }
+
+    @Simple
+    @ApplicationScoped
+    static class Ubot extends Base<Integer> {
+
+        @Override
+        String echo(Integer payload) {
+            return payload.toString();
+        }
+
+        @Override
+        Integer getName() {
+            return 42;
+        }
+
+    }
+
+    @Simple
+    @Singleton
+    static class Ponorka extends Base<Boolean> {
+
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleApi.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleApi.java
new file mode 100644
index 0000000000000..dbd5f010e6548
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleApi.java
@@ -0,0 +1,6 @@
+package io.quarkus.arc.test.interceptors.bridge;
+
+public interface ExampleApi {
+
+    String create(String dto);
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java
new file mode 100644
index 0000000000000..eb30f70205c28
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/ExampleResource.java
@@ -0,0 +1,15 @@
+package io.quarkus.arc.test.interceptors.bridge;
+
+import java.util.List;
+import javax.inject.Singleton;
+
+@Singleton
+@Simple
+public class ExampleResource extends AbstractResource<String> implements ExampleApi {
+
+    // Just to try to confuse our bridge method impl. algorithm 
+    public String create(List<Object> dtos) {
+        return dtos.toString();
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java
new file mode 100644
index 0000000000000..bb90455fc115e
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/Simple.java
@@ -0,0 +1,18 @@
+package io.quarkus.arc.test.interceptors.bridge;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+public @interface Simple {
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java
new file mode 100644
index 0000000000000..992d56b961327
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/bridge/SimpleInterceptor.java
@@ -0,0 +1,23 @@
+package io.quarkus.arc.test.interceptors.bridge;
+
+import io.quarkus.arc.test.interceptors.Counter;
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Simple
+@Priority(1)
+@Interceptor
+public class SimpleInterceptor {
+
+    @Inject
+    Counter counter;
+
+    @AroundInvoke
+    Object mySuperCoolAroundInvoke(InvocationContext ctx) throws Exception {
+        counter.incrementAndGet();
+        return ctx.proceed();
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java
index 50959ad2eb16e..40e07646c3623 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodBean.java
@@ -6,7 +6,13 @@
 @ABinding
 public class DefaultMethodBean implements DefaultMethodInterface {
 
+    @NextBinding
     public String hello() {
         return "hello";
     }
+
+    @Override
+    public String ping() {
+        return "pong";
+    }
 }
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java
index fc7dc5ec40223..4bd08a1acd39f 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterceptorTest.java
@@ -11,8 +11,8 @@
 public class DefaultMethodInterceptorTest {
 
     @RegisterExtension
-    public ArcTestContainer container = new ArcTestContainer(ABinding.class, DefaultMethodBean.class,
-            DefaultMethodInterface.class, MessageInterceptor.class);
+    public ArcTestContainer container = new ArcTestContainer(ABinding.class, NextBinding.class, DefaultMethodBean.class,
+            DefaultMethodInterface.class, MessageInterceptor.class, NextInterceptor.class);
 
     @Test
     public void testInterception() {
@@ -20,8 +20,9 @@ public void testInterception() {
 
         InstanceHandle<DefaultMethodBean> handle = arc.instance(DefaultMethodBean.class);
         DefaultMethodBean simpleBean = handle.get();
-        Assertions.assertEquals("intercepted:hello", simpleBean.hello());
+        Assertions.assertEquals("intercepted:next:hello", simpleBean.hello());
         Assertions.assertEquals("intercepted:default method", simpleBean.defaultMethod());
+        Assertions.assertEquals("intercepted:pong", simpleBean.ping());
     }
 
 }
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterface.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterface.java
index a5e1d1d207bb7..b1c440fbd6ae7 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterface.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/DefaultMethodInterface.java
@@ -2,7 +2,11 @@
 
 public interface DefaultMethodInterface {
 
+    @NextBinding // This annotation should be ignored
     default String defaultMethod() {
         return "default method";
     }
+
+    @NextBinding // This annotation should be ignored
+    String ping();
 }
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java
new file mode 100644
index 0000000000000..565f74bb31012
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextBinding.java
@@ -0,0 +1,18 @@
+package io.quarkus.arc.test.interceptors.defaultmethod;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+public @interface NextBinding {
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java
new file mode 100644
index 0000000000000..201867f822310
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/defaultmethod/NextInterceptor.java
@@ -0,0 +1,17 @@
+package io.quarkus.arc.test.interceptors.defaultmethod;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@NextBinding
+@Interceptor
+@Priority(1)
+public class NextInterceptor {
+
+    @AroundInvoke
+    public Object invoke(InvocationContext context) throws Exception {
+        return "next:" + context.proceed();
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java
new file mode 100644
index 0000000000000..38add15da746d
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor1.java
@@ -0,0 +1,17 @@
+package io.quarkus.arc.test.interceptors.inheritance;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@One
+@Interceptor
+public class Interceptor1 extends OverridenInterceptor {
+
+    @AroundInvoke
+    @Override
+    public Object intercept(InvocationContext ctx) throws Exception {
+        return ctx.proceed() + "1";
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java
new file mode 100644
index 0000000000000..9d234aece3464
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Interceptor2.java
@@ -0,0 +1,9 @@
+package io.quarkus.arc.test.interceptors.inheritance;
+
+import javax.interceptor.Interceptor;
+
+@Two
+@Interceptor
+public class Interceptor2 extends OverridenInterceptor {
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java
new file mode 100644
index 0000000000000..6088b8a5d4095
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/InterceptorSuperclassTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.arc.test.interceptors.inheritance;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.test.ArcTestContainer;
+import javax.enterprise.context.ApplicationScoped;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/**
+ * "Around-invoke methods may be defined on interceptor classes and/or the target class and/or super-
+ * classes of the target class or the interceptor classes. However, only one around-invoke method may be
+ * defined on a given class."
+ */
+public class InterceptorSuperclassTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(Interceptor1.class, Interceptor2.class, One.class, Two.class,
+            OverridenInterceptor.class, Fool.class);
+
+    @Test
+    public void testInterception() {
+        Fool fool = Arc.container().instance(Fool.class).get();
+        assertEquals("ping1", fool.pingOne());
+        assertEquals("pingoverriden", fool.pingTwo());
+    }
+
+    @ApplicationScoped
+    public static class Fool {
+
+        @One
+        String pingOne() {
+            return "ping";
+        }
+
+        @Two
+        String pingTwo() {
+            return "ping";
+        }
+
+    }
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java
new file mode 100644
index 0000000000000..07908f4a77a7d
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/One.java
@@ -0,0 +1,18 @@
+package io.quarkus.arc.test.interceptors.inheritance;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+public @interface One {
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java
new file mode 100644
index 0000000000000..8a1e03f6c6f81
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/OverridenInterceptor.java
@@ -0,0 +1,12 @@
+package io.quarkus.arc.test.interceptors.inheritance;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+public class OverridenInterceptor {
+
+    @AroundInvoke
+    public Object intercept(InvocationContext ctx) throws Exception {
+        return ctx.proceed() + "overriden";
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java
new file mode 100644
index 0000000000000..c052c2d11e067
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/inheritance/Two.java
@@ -0,0 +1,18 @@
+package io.quarkus.arc.test.interceptors.inheritance;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+public @interface Two {
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java
new file mode 100644
index 0000000000000..18ff3718cfeb5
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/BusinessLifecycleInterceptorTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.arc.test.interceptors.mixed;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Priority;
+import javax.enterprise.context.Dependent;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class BusinessLifecycleInterceptorTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyTransactional.class, SimpleBean.class,
+            SimpleInterceptor.class);
+
+    public static final AtomicInteger INTERCEPTORS_CALLED = new AtomicInteger();
+
+    @Test
+    public void testInterception() {
+        InstanceHandle<SimpleBean> instance = Arc.container().instance(SimpleBean.class);
+        SimpleBean simpleBean = instance.get();
+        assertEquals(1, INTERCEPTORS_CALLED.get());
+        assertEquals(2, simpleBean.ping());
+        assertEquals(2, INTERCEPTORS_CALLED.get());
+    }
+
+    @Dependent
+    @MyTransactional
+    static class SimpleBean {
+
+        int ping() {
+            return 0;
+        }
+
+    }
+
+    @Priority(1)
+    @MyTransactional
+    @Interceptor
+    public static class SimpleInterceptor {
+
+        @PostConstruct
+        @PreDestroy
+        @AroundInvoke
+        Object intercept(InvocationContext ctx) throws Exception {
+            return INTERCEPTORS_CALLED.incrementAndGet();
+        }
+
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java
new file mode 100644
index 0000000000000..5533bf2ad6fb9
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/mixed/MyTransactional.java
@@ -0,0 +1,16 @@
+package io.quarkus.arc.test.interceptors.mixed;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+@Target({ TYPE, CONSTRUCTOR })
+@Retention(RUNTIME)
+@InterceptorBinding
+public @interface MyTransactional {
+
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java
index 5e06927ee9e8a..78ae066230d06 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/name/NameResolutionTest.java
@@ -7,6 +7,7 @@
 import io.quarkus.arc.test.ArcTestContainer;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.literal.NamedLiteral;
 import javax.inject.Named;
 import javax.inject.Singleton;
 import org.junit.jupiter.api.Test;
@@ -24,6 +25,8 @@ public void testBeanNames() {
         assertEquals(12345, Arc.container().instance("bongo").get());
         assertEquals("bing", Arc.container().instance("producedBing").get());
         assertEquals(1, Arc.container().beanManager().getBeans("bongo").size());
+        // Test that for defaulted name the @Named qualifier is replaced the defaulted value
+        assertEquals("bing", Arc.container().instance(String.class, NamedLiteral.of("producedBing")).get());
     }
 
     @Named("A")
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java
index cdd687d10492d..2948e6cfc0c4a 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeAlternativeTest.java
@@ -1,10 +1,13 @@
 package io.quarkus.arc.test.stereotypes;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.test.ArcTestContainer;
-import io.quarkus.test.Mock;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -116,4 +119,17 @@ public String ping() {
         }
     }
 
+    /**
+     * The built-in stereotype intended for use with mock beans injected in tests.
+     */
+    @Priority(1)
+    @Dependent
+    @Alternative
+    @Stereotype
+    @Target({ TYPE, METHOD, FIELD })
+    @Retention(RUNTIME)
+    public @interface Mock {
+
+    }
+
 }
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java
index aa68f17b9de13..310539a0adc05 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInterceptorTest.java
@@ -10,6 +10,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -25,6 +28,14 @@ public void testStereotype() {
         assertEquals("interceptedOK", Arc.container().instance(IamIntercepted.class).get().getId());
     }
 
+    @Test
+    public void testStereotypeBeanManager() {
+        BeanManager beanManager = CDI.current().getBeanManager();
+        Assertions.assertTrue(beanManager.isStereotype(BeIntercepted.class));
+        Assertions.assertFalse(beanManager.isStereotype(SimpleBinding.class));
+
+    }
+
     @SimpleBinding
     @Documented
     @Stereotype
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java
index 974fde05bdb14..3d021bda5413e 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/unused/RemoveUnusedBeansTest.java
@@ -6,6 +6,7 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.impl.ArcContainerImpl;
 import io.quarkus.arc.test.ArcTestContainer;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -61,6 +62,7 @@ public void testRemoval() {
         // Producer is unused, declaring bean is only used via Instance
         assertTrue(container.instance(UsedViaInstanceWithUnusedProducer.class).isAvailable());
         assertFalse(container.instance(Long.class).isAvailable());
+        assertFalse(ArcContainerImpl.instance().getRemovedBeans().isEmpty());
     }
 
     @Dependent
@@ -190,7 +192,7 @@ BigInteger unusedNumber() {
     static class UsedViaInstanceWithUnusedProducer {
 
         @Produces
-        Long unusedLong = new Long(0);
+        Long unusedLong = Long.valueOf(0);
     }
 
     @Singleton
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java
index 79c9c5d61a1ee..7b106025ebb86 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java
@@ -11,6 +11,14 @@ public interface BootstrapConstants {
     String SERIALIZED_APP_MODEL = "quarkus-internal.serialized-app-model.path";
     String DESCRIPTOR_FILE_NAME = "quarkus-extension.properties";
 
+    /**
+     * Constant for sharing the additional mappings between test-sources and the corresponding application-sources.
+     * The Gradle plugin populates this data which is then read by the PathTestHelper when executing tests.
+     */
+    String TEST_TO_MAIN_MAPPINGS = "TEST_TO_MAIN_MAPPINGS";
+
+    String OUTPUT_SOURCES_DIR = "OUTPUT_SOURCES_DIR";
+
     @Deprecated
     String EXTENSION_PROPS_JSON_FILE_NAME = "quarkus-extension.json";
 
@@ -28,4 +36,9 @@ public interface BootstrapConstants {
     String EMPTY = "";
     String JAR = AppArtifactCoords.TYPE_JAR;
     String POM = AppArtifactCoords.TYPE_POM;
+
+    String PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX = "-quarkus-platform-descriptor";
+    String PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX = "-quarkus-platform-properties";
+
+    String PLATFORM_PROPERTY_PREFIX = "platform.";
 }
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java
index 54065a7b2b4ce..264ebd9ec2b69 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifact.java
@@ -12,6 +12,10 @@ public class AppArtifact extends AppArtifactCoords implements Serializable {
 
     protected PathsCollection paths;
 
+    public AppArtifact(AppArtifactCoords coords) {
+        this(coords.getGroupId(), coords.getArtifactId(), coords.getClassifier(), coords.getType(), coords.getVersion());
+    }
+
     public AppArtifact(String groupId, String artifactId, String version) {
         super(groupId, artifactId, version);
     }
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java
index a9c1a96ef67b8..de336cb2d6efe 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java
@@ -70,7 +70,7 @@ protected static String[] split(String str, String[] parts, int fromIndex) {
     protected final String classifier;
     protected final String type;
 
-    protected AppArtifactKey(String[] parts) {
+    public AppArtifactKey(String[] parts) {
         this.groupId = parts[0];
         this.artifactId = parts[1];
         if (parts.length == 2 || parts[2] == null) {
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java
index 2f7688f7774ed..6776c1f07a340 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppModel.java
@@ -3,8 +3,10 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -19,6 +21,7 @@
 public class AppModel implements Serializable {
 
     public static final String PARENT_FIRST_ARTIFACTS = "parent-first-artifacts";
+    public static final String RUNNER_PARENT_FIRST_ARTIFACTS = "runner-parent-first-artifacts";
     public static final String EXCLUDED_ARTIFACTS = "excluded-artifacts";
     public static final String LESSER_PRIORITY_ARTIFACTS = "lesser-priority-artifacts";
 
@@ -43,6 +46,11 @@ public class AppModel implements Serializable {
 
     private final Set<AppArtifactKey> parentFirstArtifacts;
 
+    /**
+     * These artifacts have effect on the RunnerClassLoader
+     */
+    private final Set<AppArtifactKey> runnerParentFirstArtifacts;
+
     private final Set<AppArtifactKey> lesserPriorityArtifacts;
 
     /**
@@ -52,16 +60,35 @@ public class AppModel implements Serializable {
      */
     private final Set<AppArtifactKey> localProjectArtifacts;
 
+    private final Map<String, String> platformProperties;
+
     private AppModel(AppArtifact appArtifact, List<AppDependency> runtimeDeps, List<AppDependency> deploymentDeps,
             List<AppDependency> fullDeploymentDeps, Set<AppArtifactKey> parentFirstArtifacts,
-            Set<AppArtifactKey> lesserPriorityArtifacts, Set<AppArtifactKey> localProjectArtifacts) {
+            Set<AppArtifactKey> runnerParentFirstArtifacts, Set<AppArtifactKey> lesserPriorityArtifacts,
+            Set<AppArtifactKey> localProjectArtifacts) {
+        this(appArtifact, runtimeDeps, deploymentDeps, fullDeploymentDeps, parentFirstArtifacts, runnerParentFirstArtifacts,
+                lesserPriorityArtifacts,
+                localProjectArtifacts, Collections.emptyMap());
+    }
+
+    private AppModel(AppArtifact appArtifact, List<AppDependency> runtimeDeps, List<AppDependency> deploymentDeps,
+            List<AppDependency> fullDeploymentDeps, Set<AppArtifactKey> parentFirstArtifacts,
+            Set<AppArtifactKey> runnerParentFirstArtifacts, Set<AppArtifactKey> lesserPriorityArtifacts,
+            Set<AppArtifactKey> localProjectArtifacts,
+            Map<String, String> platformProperties) {
         this.appArtifact = appArtifact;
         this.runtimeDeps = runtimeDeps;
         this.deploymentDeps = deploymentDeps;
         this.fullDeploymentDeps = fullDeploymentDeps;
         this.parentFirstArtifacts = parentFirstArtifacts;
+        this.runnerParentFirstArtifacts = runnerParentFirstArtifacts;
         this.lesserPriorityArtifacts = lesserPriorityArtifacts;
         this.localProjectArtifacts = localProjectArtifacts;
+        this.platformProperties = platformProperties;
+    }
+
+    public Map<String, String> getPlatformProperties() {
+        return platformProperties;
     }
 
     public AppArtifact getAppArtifact() {
@@ -92,6 +119,10 @@ public Set<AppArtifactKey> getParentFirstArtifacts() {
         return parentFirstArtifacts;
     }
 
+    public Set<AppArtifactKey> getRunnerParentFirstArtifacts() {
+        return runnerParentFirstArtifacts;
+    }
+
     public Set<AppArtifactKey> getLesserPriorityArtifacts() {
         return lesserPriorityArtifacts;
     }
@@ -108,6 +139,7 @@ public String toString() {
                 ", fullDeploymentDeps=" + fullDeploymentDeps +
                 ", runtimeDeps=" + runtimeDeps +
                 ", parentFirstArtifacts=" + parentFirstArtifacts +
+                ", runnerParentFirstArtifacts=" + runnerParentFirstArtifacts +
                 '}';
     }
 
@@ -119,15 +151,26 @@ public static class Builder {
         private final List<AppDependency> fullDeploymentDeps = new ArrayList<>();
         private final List<AppDependency> runtimeDeps = new ArrayList<>();
         private final Set<AppArtifactKey> parentFirstArtifacts = new HashSet<>();
+        private final Set<AppArtifactKey> runnerParentFirstArtifacts = new HashSet<>();
         private final Set<AppArtifactKey> excludedArtifacts = new HashSet<>();
         private final Set<AppArtifactKey> lesserPriorityArtifacts = new HashSet<>();
         private final Set<AppArtifactKey> localProjectArtifacts = new HashSet<>();
+        private Map<String, String> platformProperties = Collections.emptyMap();
 
         public Builder setAppArtifact(AppArtifact appArtifact) {
             this.appArtifact = appArtifact;
             return this;
         }
 
+        public Builder addPlatformProperties(Map<String, String> platformProperties) {
+            if (this.platformProperties.isEmpty()) {
+                this.platformProperties = platformProperties;
+            } else {
+                this.platformProperties.putAll(platformProperties);
+            }
+            return this;
+        }
+
         public Builder addDeploymentDep(AppDependency dep) {
             this.deploymentDeps.add(dep);
             return this;
@@ -168,6 +211,16 @@ public Builder addParentFirstArtifacts(List<AppArtifactKey> deps) {
             return this;
         }
 
+        public Builder addRunnerParentFirstArtifact(AppArtifactKey deps) {
+            this.runnerParentFirstArtifacts.add(deps);
+            return this;
+        }
+
+        public Builder addRunnerParentFirstArtifacts(List<AppArtifactKey> deps) {
+            this.runnerParentFirstArtifacts.addAll(deps);
+            return this;
+        }
+
         public Builder addExcludedArtifact(AppArtifactKey deps) {
             this.excludedArtifacts.add(deps);
             return this;
@@ -211,6 +264,13 @@ public void handleExtensionProperties(Properties props, String extension) {
                     parentFirstArtifacts.add(new AppArtifactKey(artifact.split(":")));
                 }
             }
+            String runnerParentFirst = props.getProperty(RUNNER_PARENT_FIRST_ARTIFACTS);
+            if (runnerParentFirst != null) {
+                String[] artifacts = runnerParentFirst.split(",");
+                for (String artifact : artifacts) {
+                    runnerParentFirstArtifacts.add(new AppArtifactKey(artifact.split(":")));
+                }
+            }
             String excluded = props.getProperty(EXCLUDED_ARTIFACTS);
             if (excluded != null) {
                 String[] artifacts = excluded.split(",");
@@ -244,7 +304,8 @@ public AppModel build() {
             List<AppDependency> fullDeploymentDeps = this.fullDeploymentDeps.stream().filter(includePredicate)
                     .collect(Collectors.toList());
             AppModel appModel = new AppModel(appArtifact, runtimeDeps, deploymentDeps, fullDeploymentDeps,
-                    parentFirstArtifacts, lesserPriorityArtifacts, localProjectArtifacts);
+                    parentFirstArtifacts, runnerParentFirstArtifacts, lesserPriorityArtifacts, localProjectArtifacts,
+                    platformProperties);
             log.debugf("Created AppModel %s", appModel);
             return appModel;
 
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PersistentAppModel.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PersistentAppModel.java
index 5d71ddba7d985..5a0efa6bd7b24 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PersistentAppModel.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/PersistentAppModel.java
@@ -4,14 +4,16 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * A representation of AppModel, that has been serialized to disk for an existing application.
- *
+ * <p>
  * This needs a slightly different representation than AppModel
  */
 public class PersistentAppModel implements Serializable {
@@ -19,32 +21,39 @@ public class PersistentAppModel implements Serializable {
     private final String baseName;
     private final SerializedDep appArtifact;
 
-    private final List<SerializedDep> deploymentDeps = new ArrayList<>();
-    private final List<SerializedDep> fullDeploymentDeps = new ArrayList<>();
-    private final List<SerializedDep> runtimeDeps = new ArrayList<>();
-    private final Set<AppArtifactKey> parentFirstArtifacts = new HashSet<>();
-    private final Set<AppArtifactKey> lesserPriorityArtifacts = new HashSet<>();
-    private final Set<AppArtifactKey> localProjectArtifacts = new HashSet<>();
-    private final String userProvidersDirectory;
+    private List<SerializedDep> deploymentDeps;
+    private List<SerializedDep> fullDeploymentDeps;
+    private List<SerializedDep> runtimeDeps;
+    private Set<AppArtifactKey> parentFirstArtifacts;
+    private Set<AppArtifactKey> runnerParentFirstArtifacts;
+    private Set<AppArtifactKey> lesserPriorityArtifacts;
+    private Set<AppArtifactKey> localProjectArtifacts;
+    private Map<String, String> platformProperties;
+    private String userProvidersDirectory;
 
     public PersistentAppModel(String baseName, Map<AppArtifactKey, List<String>> paths, AppModel appModel,
             String userProvidersDirectory, String appArchivePath) {
         this.baseName = baseName;
         this.userProvidersDirectory = userProvidersDirectory;
         appArtifact = new SerializedDep(appModel.getAppArtifact(), paths);
-        appArtifact.paths = Collections.singletonList(appArchivePath);
+        appArtifact.paths = Collections.singletonList(appArchivePath.replace("\\", "/"));
+        deploymentDeps = new ArrayList<>(appModel.getDeploymentDependencies().size());
         for (AppDependency i : appModel.getDeploymentDependencies()) {
             deploymentDeps.add(new SerializedDep(i, paths));
         }
+        fullDeploymentDeps = new ArrayList<>(appModel.getFullDeploymentDeps().size());
         for (AppDependency i : appModel.getFullDeploymentDeps()) {
             fullDeploymentDeps.add(new SerializedDep(i, paths));
         }
+        runtimeDeps = new ArrayList<>(appModel.getUserDependencies().size());
         for (AppDependency i : appModel.getUserDependencies()) {
             runtimeDeps.add(new SerializedDep(i, paths));
         }
-        localProjectArtifacts.addAll(appModel.getLocalProjectArtifacts());
-        parentFirstArtifacts.addAll(appModel.getParentFirstArtifacts());
-        lesserPriorityArtifacts.addAll(appModel.getLesserPriorityArtifacts());
+        platformProperties = new HashMap<>(appModel.getPlatformProperties());
+        localProjectArtifacts = new HashSet<>(appModel.getLocalProjectArtifacts());
+        parentFirstArtifacts = new HashSet<>(appModel.getParentFirstArtifacts());
+        runnerParentFirstArtifacts = new HashSet<>(appModel.getRunnerParentFirstArtifacts());
+        lesserPriorityArtifacts = new HashSet<>(appModel.getLesserPriorityArtifacts());
     }
 
     public String getUserProvidersDirectory() {
@@ -67,12 +76,16 @@ public AppModel getAppModel(Path root) {
         for (AppArtifactKey i : parentFirstArtifacts) {
             model.addParentFirstArtifact(i);
         }
+        for (AppArtifactKey i : runnerParentFirstArtifacts) {
+            model.addRunnerParentFirstArtifact(i);
+        }
         for (AppArtifactKey i : lesserPriorityArtifacts) {
             model.addLesserPriorityArtifact(i);
         }
         for (AppArtifactKey i : localProjectArtifacts) {
             model.addLocalProjectArtifact(i);
         }
+        model.addPlatformProperties(platformProperties);
         return model.build();
     }
 
@@ -88,7 +101,11 @@ public SerializedDep(AppArtifact dependency, Map<AppArtifactKey, List<String>> p
             super(dependency.getGroupId(), dependency.getArtifactId(),
                     dependency.getClassifier(), dependency.getType(),
                     dependency.getVersion());
-            this.paths = paths.get(dependency.getKey());
+            List<String> pathList = paths.get(dependency.getKey());
+            if (pathList == null) {
+                pathList = Collections.emptyList();
+            }
+            this.paths = pathList.stream().map(s -> s.replace("\\", "/")).collect(Collectors.toList());
         }
 
         public SerializedDep(AppDependency dependency, Map<AppArtifactKey, List<String>> paths) {
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/IoUtils.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/IoUtils.java
index 7f51d1bbbb601..5d670153fb7b0 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/IoUtils.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/IoUtils.java
@@ -6,6 +6,7 @@
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.DirectoryStream;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileVisitOption;
 import java.nio.file.FileVisitResult;
@@ -17,6 +18,7 @@
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.EnumSet;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -89,6 +91,32 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e)
         }
     }
 
+    /**
+     * Creates a new empty directory or empties an existing one.
+     * 
+     * @param dir directory
+     * @throws IOException in case of a failure
+     */
+    public static void createOrEmptyDir(Path dir) throws IOException {
+        Objects.requireNonNull(dir);
+        if (!Files.exists(dir)) {
+            Files.createDirectories(dir);
+            return;
+        }
+        if (!Files.isDirectory(dir)) {
+            throw new IllegalArgumentException(dir + " is not a directory");
+        }
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+            for (Path p : stream) {
+                if (Files.isDirectory(p)) {
+                    recursiveDelete(p);
+                } else {
+                    Files.delete(p);
+                }
+            }
+        }
+    }
+
     public static Path copy(Path source, Path target) throws IOException {
         if (Files.isDirectory(source)) {
             Files.createDirectories(target);
diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/PropertyUtils.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/PropertyUtils.java
index ed387ae3a0f6e..ae163f7d9581e 100644
--- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/PropertyUtils.java
+++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/util/PropertyUtils.java
@@ -21,7 +21,7 @@ private PropertyUtils() {
     }
 
     public static boolean isWindows() {
-        return getProperty(OS_NAME).toLowerCase(Locale.ENGLISH).indexOf(WINDOWS) >= 0;
+        return getProperty(OS_NAME).toLowerCase(Locale.ENGLISH).contains(WINDOWS);
     }
 
     public static String getUserHome() {
diff --git a/independent-projects/bootstrap/core/pom.xml b/independent-projects/bootstrap/core/pom.xml
index 9c6639a993f6a..2e6e3d7549302 100644
--- a/independent-projects/bootstrap/core/pom.xml
+++ b/independent-projects/bootstrap/core/pom.xml
@@ -22,14 +22,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-gradle-resolver</artifactId>
         </dependency>
         <dependency>
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-io</artifactId>
-	</dependency>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -44,6 +44,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java
index 2593bcea18d3b..ffaa17e4becf6 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapAppModelFactory.java
@@ -203,6 +203,12 @@ private BootstrapMavenContext createBootstrapMavenContext() throws AppModelResol
         if (mvnContext != null) {
             return mvnContext;
         }
+        if (mavenArtifactResolver != null) {
+            mvnContext = mavenArtifactResolver.getMavenContext();
+            if (mvnContext != null) {
+                return mvnContext;
+            }
+        }
         final BootstrapMavenContextConfig<?> config = BootstrapMavenContext.config();
         if (offline != null) {
             config.setOffline(offline);
@@ -217,32 +223,32 @@ private BootstrapMavenContext createBootstrapMavenContext() throws AppModelResol
     }
 
     public CurationResult resolveAppModel() throws BootstrapException {
-        if (test || devMode) {
-            //gradle tests and dev encode the result on the class path
-            final String serializedModel = System.getProperty(BootstrapConstants.SERIALIZED_APP_MODEL);
-            if (serializedModel != null) {
-                final Path p = Paths.get(serializedModel);
-                if (Files.exists(p)) {
-                    try (InputStream existing = Files.newInputStream(Paths.get(serializedModel))) {
-                        final AppModel appModel = (AppModel) new ObjectInputStream(existing).readObject();
-                        return new CurationResult(appModel);
-                    } catch (IOException | ClassNotFoundException e) {
-                        log.error("Failed to load serialized app mode", e);
-                    }
-                    IoUtils.recursiveDelete(p);
-                } else {
-                    log.error("Failed to locate serialized application model at " + serializedModel);
+        // gradle tests and dev encode the result on the class path
+        final String serializedModel = System.getProperty(BootstrapConstants.SERIALIZED_APP_MODEL);
+        if (serializedModel != null) {
+            final Path p = Paths.get(serializedModel);
+            if (Files.exists(p)) {
+                try (InputStream existing = Files.newInputStream(Paths.get(serializedModel))) {
+                    final AppModel appModel = (AppModel) new ObjectInputStream(existing).readObject();
+                    return new CurationResult(appModel);
+                } catch (IOException | ClassNotFoundException e) {
+                    log.error("Failed to load serialized app mode", e);
                 }
+                IoUtils.recursiveDelete(p);
+            } else {
+                log.error("Failed to locate serialized application model at " + serializedModel);
             }
         }
 
-        if (projectRoot != null && !Files.isDirectory(projectRoot)) {
+        // Massive hack to dected zipped/jar
+        if (projectRoot != null
+                && (!Files.isDirectory(projectRoot) || projectRoot.getFileSystem().getClass().getName().contains("Zip"))) {
             return createAppModelForJar(projectRoot);
         }
 
+        AppArtifact appArtifact = this.appArtifact;
         try {
             LocalProject localProject = null;
-            AppArtifact appArtifact = this.appArtifact;
             if (appArtifact == null) {
                 if (projectRoot == null) {
                     throw new IllegalArgumentException(
@@ -381,6 +387,7 @@ private CurationResult createAppModelForJar(Path appArtifactPath) {
                     initialDepsList = modelResolver.resolveModel(appArtifact);
                 }
             } else {
+                //we need some way to figure out dependencies here
                 initialDepsList = modelResolver.resolveManagedModel(appArtifact, Collections.emptyList(), managingProject,
                         localArtifacts);
             }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java
index 5dcd7803c8237..c69cfaa18591c 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/IDELauncherImpl.java
@@ -3,42 +3,48 @@
 import io.quarkus.bootstrap.app.AdditionalDependency;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.devmode.DependenciesFilter;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
 import io.quarkus.bootstrap.resolver.model.QuarkusModel;
 import io.quarkus.bootstrap.resolver.model.WorkspaceModule;
 import io.quarkus.bootstrap.util.QuarkusModelHelper;
 import io.quarkus.bootstrap.utils.BuildToolHelper;
+import java.io.Closeable;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Map;
 
 /**
  * IDE entry point.
- * 
+ * <p>
  * This is launched from the core/launcher module. To avoid any shading issues core/launcher unpacks all its dependencies
  * into the jar file, then uses a custom class loader load them.
- * 
  */
-@SuppressWarnings("unused")
-public class IDELauncherImpl {
-
-    public static void launch(Path projectRoot, Map<String, Object> context) {
+public class IDELauncherImpl implements Closeable {
 
+    public static Closeable launch(Path projectRoot, Map<String, Object> context) {
         try {
             //todo : proper support for everything
             final QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder()
-                    .setApplicationRoot(projectRoot)
                     .setBaseClassLoader(IDELauncherImpl.class.getClassLoader())
-                    .setProjectRoot(projectRoot)
                     .setIsolateDeployment(true)
-                    .setMode(QuarkusBootstrap.Mode.DEV);
+                    .setMode(QuarkusBootstrap.Mode.DEV)
+                    .setTargetDirectory(projectRoot.getParent());
 
-            if (!BuildToolHelper.isMavenProject(projectRoot)) {
+            if (BuildToolHelper.isGradleProject(projectRoot)) {
                 final QuarkusModel quarkusModel = BuildToolHelper.enableGradleAppModelForDevMode(projectRoot);
-                // Gradle uses a different output directory for classes, we override the one used by the IDE
+                context.put(QuarkusModelHelper.SERIALIZED_QUARKUS_MODEL,
+                        QuarkusModelHelper.serializeQuarkusModel(quarkusModel));
+
                 final WorkspaceModule launchingModule = quarkusModel.getWorkspace().getMainModule();
                 Path launchingModulePath = QuarkusModelHelper.getClassPath(launchingModule);
-
+                // Gradle uses a different output directory for classes, we override the one used by the IDE
                 builder.setProjectRoot(launchingModulePath)
-                        .setApplicationRoot(launchingModulePath);
+                        .setApplicationRoot(launchingModulePath)
+                        .setTargetDirectory(launchingModule.getBuildDir().toPath());
 
                 for (WorkspaceModule additionalModule : quarkusModel.getWorkspace().getAllModules()) {
                     if (!additionalModule.getArtifactCoords().equals(launchingModule.getArtifactCoords())) {
@@ -49,15 +55,50 @@ public static void launch(Path projectRoot, Map<String, Object> context) {
                                 additionalModule.getSourceSet().getResourceDirectory().toPath(), true, false));
                     }
                 }
-            }
+            } else {
+                builder.setApplicationRoot(projectRoot)
+                        .setProjectRoot(projectRoot);
+
+                final LocalProject currentProject = LocalProject.loadWorkspace(projectRoot);
+                context.put("app-project", currentProject);
 
-            CuratedApplication app = builder
-                    .build().bootstrap();
+                final BootstrapMavenContext mvnCtx = new BootstrapMavenContext(
+                        BootstrapMavenContext.config().setCurrentProject(currentProject));
+                final MavenArtifactResolver mvnResolver = new MavenArtifactResolver(mvnCtx);
+                builder.setMavenArtifactResolver(mvnResolver);
+
+                DependenciesFilter.filterNotReloadableDependencies(currentProject, mvnResolver)
+                        .forEach(p -> builder
+                                .addLocalArtifact(new AppArtifactKey(p.getGroupId(), p.getArtifactId(), null, "jar")));
+            }
 
-            app.runInAugmentClassLoader("io.quarkus.deployment.dev.IDEDevModeMain", context);
+            final CuratedApplication curatedApp = builder.build().bootstrap();
+            final Object appInstance = curatedApp.runInAugmentClassLoader("io.quarkus.deployment.dev.IDEDevModeMain", context);
+            return new IDELauncherImpl(curatedApp,
+                    appInstance == null ? null : appInstance instanceof Closeable ? (Closeable) appInstance : null);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
+    private final CuratedApplication curatedApp;
+    private final Closeable runningApp;
+
+    private IDELauncherImpl(CuratedApplication curatedApp, Closeable runningApp) {
+        this.curatedApp = curatedApp;
+        this.runningApp = runningApp;
+    }
+
+    @Override
+    public void close() throws IOException {
+        try {
+            if (runningApp != null) {
+                runningApp.close();
+            }
+        } finally {
+            if (curatedApp != null) {
+                curatedApp.close();
+            }
+        }
+    }
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ArtifactResult.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ArtifactResult.java
index a14715de68f86..640bc85b18df8 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ArtifactResult.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ArtifactResult.java
@@ -7,12 +7,12 @@ public class ArtifactResult {
 
     private final Path path;
     private final String type;
-    private final Map<String, Path> additionalPaths;
+    private final Map<String, Object> metadata;
 
-    public ArtifactResult(Path path, String type, Map<String, Path> additionalPaths) {
+    public ArtifactResult(Path path, String type, Map<String, Object> metadata) {
         this.path = path;
         this.type = type;
-        this.additionalPaths = additionalPaths;
+        this.metadata = metadata;
     }
 
     public Path getPath() {
@@ -23,7 +23,7 @@ public String getType() {
         return type;
     }
 
-    public Map<String, Path> getAdditionalPaths() {
-        return additionalPaths;
+    public Map<String, Object> getMetadata() {
+        return metadata;
     }
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentAction.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentAction.java
index a52e1b4eb8a8f..608dbc77499f1 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentAction.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentAction.java
@@ -3,9 +3,22 @@
 import java.util.Set;
 
 public interface AugmentAction {
+
+    /**
+     * Performs a custom augmentation run, asking for the outputs provided in finalOutputs, and passing them to the
+     * resultConsumer
+     *
+     * @param resultConsumer The name of a {@code BiConsumer<Object, BuildResult>} class that will be instantiated to handle the
+     *        result
+     * @param context An additional context object that is passed as-is to the result consumer
+     * @param finalOutputs The names of the build items to ask for as part of the build
+     */
+    void performCustomBuild(String resultConsumer, Object context, String... finalOutputs);
+
     AugmentResult createProductionApplication();
 
     StartupAction createInitialRuntimeApplication();
 
-    StartupAction reloadExistingApplication(boolean hasStartedSuccessfully, Set<String> changedResources);
+    StartupAction reloadExistingApplication(boolean hasStartedSuccessfully, Set<String> changedResources,
+            ClassChangeInformation classChangeInformation);
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentResult.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentResult.java
index fa2246362b390..cecfeb7343860 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentResult.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/AugmentResult.java
@@ -1,7 +1,10 @@
 package io.quarkus.bootstrap.app;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * The result of an augmentation that builds an application
@@ -28,4 +31,17 @@ public JarResult getJar() {
     public Path getNativeResult() {
         return nativeImagePath;
     }
+
+    public List<ArtifactResult> resultsMatchingType(Predicate<String> typePredicate) {
+        if (results == null) {
+            return Collections.emptyList();
+        }
+        List<ArtifactResult> res = new ArrayList<>(1);
+        for (ArtifactResult result : results) {
+            if (typePredicate.test(result.getType())) {
+                res.add(result);
+            }
+        }
+        return res;
+    }
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/BootstrapProfile.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/BootstrapProfile.java
new file mode 100644
index 0000000000000..b4b346ed4d345
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/BootstrapProfile.java
@@ -0,0 +1,65 @@
+package io.quarkus.bootstrap.app;
+
+/**
+ * Mirror of the logic in ProfileManager, but this is needed pre-bootstrap so there is nowhere to really share it.
+ *
+ * This is only used for reading the class loading config
+ */
+public class BootstrapProfile {
+
+    public static final String QUARKUS_PROFILE_ENV = "QUARKUS_PROFILE";
+    public static final String QUARKUS_PROFILE_PROP = "quarkus.profile";
+    public static final String QUARKUS_TEST_PROFILE_PROP = "quarkus.test.profile";
+    private static final String BACKWARD_COMPATIBLE_QUARKUS_PROFILE_PROP = "quarkus-profile";
+    public static final String DEV = "dev";
+    public static final String PROD = "prod";
+    public static final String TEST = "test";
+
+    private static String runtimeDefaultProfile = null;
+
+    public static void setRuntimeDefaultProfile(final String profile) {
+        runtimeDefaultProfile = profile;
+    }
+
+    public static String getActiveProfile(QuarkusBootstrap.Mode mode) {
+        if (mode == QuarkusBootstrap.Mode.TEST) {
+            String profile = System.getProperty(QUARKUS_TEST_PROFILE_PROP);
+            if (profile != null) {
+                return profile;
+            }
+            return "test";
+        }
+
+        String profile = System.getProperty(QUARKUS_PROFILE_PROP);
+        if (profile != null) {
+            return profile;
+        }
+
+        profile = System.getProperty(BACKWARD_COMPATIBLE_QUARKUS_PROFILE_PROP);
+        if (profile != null) {
+            return profile;
+        }
+
+        profile = System.getenv(QUARKUS_PROFILE_ENV);
+        if (profile != null) {
+            return profile;
+        }
+
+        profile = runtimeDefaultProfile;
+        if (profile != null) {
+            return profile;
+        }
+        switch (mode) {
+            case REMOTE_DEV_SERVER:
+            case DEV:
+                return DEV;
+            case REMOTE_DEV_CLIENT:
+            case PROD:
+                return PROD;
+            case TEST:
+                return TEST;
+            default:
+                throw new RuntimeException("unknown mode:" + mode);
+        }
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ClassChangeInformation.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ClassChangeInformation.java
new file mode 100644
index 0000000000000..1c9b1418356ca
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ClassChangeInformation.java
@@ -0,0 +1,29 @@
+package io.quarkus.bootstrap.app;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class ClassChangeInformation {
+
+    private final Set<String> changedClasses;
+    private final Set<String> deletedClasses;
+    private final Set<String> addedClasses;
+
+    public ClassChangeInformation(Set<String> changedClasses, Set<String> deletedClasses, Set<String> addedClasses) {
+        this.changedClasses = changedClasses;
+        this.deletedClasses = deletedClasses;
+        this.addedClasses = addedClasses;
+    }
+
+    public Set<String> getChangedClasses() {
+        return Collections.unmodifiableSet(changedClasses);
+    }
+
+    public Set<String> getDeletedClasses() {
+        return Collections.unmodifiableSet(deletedClasses);
+    }
+
+    public Set<String> getAddedClasses() {
+        return Collections.unmodifiableSet(addedClasses);
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java
new file mode 100644
index 0000000000000..bbaf15ed0da2d
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/ConfiguredClassLoading.java
@@ -0,0 +1,16 @@
+package io.quarkus.bootstrap.app;
+
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import java.io.Serializable;
+import java.util.Set;
+
+public class ConfiguredClassLoading implements Serializable {
+
+    public final Set<AppArtifactKey> parentFirstArtifacts;
+    public final Set<AppArtifactKey> reloadableArtifacts;
+
+    public ConfiguredClassLoading(Set<AppArtifactKey> parentFirstArtifacts, Set<AppArtifactKey> reloadableArtifacts) {
+        this.parentFirstArtifacts = parentFirstArtifacts;
+        this.reloadableArtifacts = reloadableArtifacts;
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java
index dda42e7a72d96..d5f590c8df88c 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java
@@ -8,7 +8,6 @@
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.bootstrap.model.AppDependency;
 import io.quarkus.bootstrap.model.AppModel;
-import java.io.Closeable;
 import java.io.Serializable;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -19,11 +18,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
-import org.objectweb.asm.ClassVisitor;
 
 /**
  * The result of the curate step that is done by QuarkusBootstrap.
@@ -32,7 +28,7 @@
  *
  *
  */
-public class CuratedApplication implements Serializable, Closeable {
+public class CuratedApplication implements Serializable, AutoCloseable {
 
     private static final String AUGMENTOR = "io.quarkus.runner.bootstrap.AugmentActionImpl";
 
@@ -56,13 +52,16 @@ public class CuratedApplication implements Serializable, Closeable {
 
     private final QuarkusBootstrap quarkusBootstrap;
     private final CurationResult curationResult;
+    private final ConfiguredClassLoading configuredClassLoading;
 
     final AppModel appModel;
 
-    CuratedApplication(QuarkusBootstrap quarkusBootstrap, CurationResult curationResult) {
+    CuratedApplication(QuarkusBootstrap quarkusBootstrap, CurationResult curationResult,
+            ConfiguredClassLoading configuredClassLoading) {
         this.quarkusBootstrap = quarkusBootstrap;
         this.curationResult = curationResult;
         this.appModel = curationResult.getAppModel();
+        this.configuredClassLoading = configuredClassLoading;
     }
 
     public AppModel getAppModel() {
@@ -85,10 +84,6 @@ public Object runInAugmentClassLoader(String consumerName, Map<String, Object> p
         return runInCl(consumerName, params, getAugmentClassLoader());
     }
 
-    public Object runInBaseRuntimeClassLoader(String consumerName, Map<String, Object> params) {
-        return runInCl(consumerName, params, getBaseRuntimeClassLoader());
-    }
-
     public CurationResult getCurationResult() {
         return curationResult;
     }
@@ -162,7 +157,8 @@ private synchronized void processCpElement(AppArtifact artifact, Consumer<ClassP
 
     private void addCpElement(QuarkusClassLoader.Builder builder, AppArtifact dep, ClassPathElement element) {
         final AppArtifactKey key = dep.getKey();
-        if (appModel.getParentFirstArtifacts().contains(key)) {
+        if (appModel.getParentFirstArtifacts().contains(key)
+                || configuredClassLoading.parentFirstArtifacts.contains(dep.getKey())) {
             //we always load this from the parent if it is available, as this acts as a bridge between the running
             //app and the dev mode code
             builder.addParentFirstElement(element);
@@ -177,6 +173,7 @@ public synchronized QuarkusClassLoader getAugmentClassLoader() {
             //first run, we need to build all the class loaders
             QuarkusClassLoader.Builder builder = QuarkusClassLoader.builder("Augmentation Class Loader",
                     quarkusBootstrap.getBaseClassLoader(), !quarkusBootstrap.isIsolateDeployment());
+            builder.addClassLoaderEventListeners(quarkusBootstrap.getClassLoaderEventListeners());
             //we want a class loader that can load the deployment artifacts and all their dependencies, but not
             //any of the runtime artifacts, or user classes
             //this will load any deployment artifacts from the parent CL if they are present
@@ -205,6 +202,7 @@ public synchronized QuarkusClassLoader getBaseRuntimeClassLoader() {
         if (baseRuntimeClassLoader == null) {
             QuarkusClassLoader.Builder builder = QuarkusClassLoader.builder("Quarkus Base Runtime ClassLoader",
                     quarkusBootstrap.getBaseClassLoader(), false);
+            builder.addClassLoaderEventListeners(quarkusBootstrap.getClassLoaderEventListeners());
             if (quarkusBootstrap.getMode() == QuarkusBootstrap.Mode.TEST) {
                 //in test mode we have everything in the base class loader
                 //there is no need to restart so there is no need for an additional CL
@@ -232,6 +230,9 @@ public synchronized QuarkusClassLoader getBaseRuntimeClassLoader() {
                 if (isHotReloadable(dependency.getArtifact(), hotReloadPaths)) {
                     continue;
                 }
+                if (configuredClassLoading.reloadableArtifacts.contains(dependency.getArtifact().getKey())) {
+                    continue;
+                }
                 processCpElement(dependency.getArtifact(), element -> addCpElement(builder, dependency.getArtifact(), element));
             }
 
@@ -253,12 +254,15 @@ public QuarkusClassLoader createDeploymentClassLoader() {
         //first run, we need to build all the class loaders
         QuarkusClassLoader.Builder builder = QuarkusClassLoader.builder("Deployment Class Loader",
                 getAugmentClassLoader(), false)
+                .addClassLoaderEventListeners(quarkusBootstrap.getClassLoaderEventListeners())
                 .setAggregateParentResources(true);
 
         for (Path root : quarkusBootstrap.getApplicationRoot()) {
             builder.addElement(ClassPathElement.fromPath(root));
         }
 
+        builder.setResettableElement(new MemoryClassPathElement(Collections.emptyMap()));
+
         //additional user class path elements first
         for (AdditionalDependency i : quarkusBootstrap.getAdditionalApplicationArchives()) {
             for (Path root : i.getArchivePath()) {
@@ -269,19 +273,16 @@ public QuarkusClassLoader createDeploymentClassLoader() {
     }
 
     public QuarkusClassLoader createRuntimeClassLoader(QuarkusClassLoader loader,
-            Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers,
-            Map<String, Predicate<byte[]>> transformerPredicates,
-            ClassLoader deploymentClassLoader, Map<String, byte[]> resources) {
+            Map<String, byte[]> resources, Map<String, byte[]> transformedClasses) {
         QuarkusClassLoader.Builder builder = QuarkusClassLoader.builder("Quarkus Runtime ClassLoader",
                 loader, false)
                 .setAggregateParentResources(true);
-        builder.setTransformerPredicates(transformerPredicates);
-        builder.setTransformerClassLoader(deploymentClassLoader);
+        builder.setTransformedClasses(transformedClasses);
 
+        builder.addElement(new MemoryClassPathElement(resources));
         for (Path root : quarkusBootstrap.getApplicationRoot()) {
             builder.addElement(ClassPathElement.fromPath(root));
         }
-        builder.addElement(new MemoryClassPathElement(resources));
 
         for (AdditionalDependency i : getQuarkusBootstrap().getAdditionalApplicationArchives()) {
             if (i.isHotReloadable()) {
@@ -290,7 +291,11 @@ public QuarkusClassLoader createRuntimeClassLoader(QuarkusClassLoader loader,
                 }
             }
         }
-        builder.setBytecodeTransformers(bytecodeTransformers);
+        for (AppDependency dependency : appModel.getUserDependencies()) {
+            if (configuredClassLoading.reloadableArtifacts.contains(dependency.getArtifact().getKey())) {
+                processCpElement(dependency.getArtifact(), element -> addCpElement(builder, dependency.getArtifact(), element));
+            }
+        }
         return builder.build();
     }
 
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/JarResult.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/JarResult.java
index c9bd1b903f556..0a0f5a27d3c01 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/JarResult.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/JarResult.java
@@ -8,12 +8,14 @@ public final class JarResult {
     private final Path originalArtifact;
     private final Path libraryDir;
     private final String type;
+    private final String classifier;
 
-    public JarResult(Path path, Path originalArtifact, Path libraryDir, String type) {
+    public JarResult(Path path, Path originalArtifact, Path libraryDir, String type, String classifier) {
         this.path = path;
         this.originalArtifact = originalArtifact;
         this.libraryDir = libraryDir;
         this.type = type;
+        this.classifier = classifier;
     }
 
     public boolean isUberJar() {
@@ -36,4 +38,7 @@ public String getType() {
         return type;
     }
 
+    public String getClassifier() {
+        return classifier;
+    }
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java
index 47e7f8e215acc..fc3053874641d 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/QuarkusBootstrap.java
@@ -2,6 +2,7 @@
 
 import io.quarkus.bootstrap.BootstrapAppModelFactory;
 import io.quarkus.bootstrap.BootstrapException;
+import io.quarkus.bootstrap.classloading.ClassLoaderEventListener;
 import io.quarkus.bootstrap.model.AppArtifact;
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.bootstrap.model.AppDependency;
@@ -12,7 +13,10 @@
 import io.quarkus.bootstrap.resolver.update.DependenciesOrigin;
 import io.quarkus.bootstrap.resolver.update.VersionUpdate;
 import io.quarkus.bootstrap.resolver.update.VersionUpdateNumber;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,7 +31,6 @@
  * The entry point for starting/building a Quarkus application. This class sets up the base class loading
  * architecture. Once this has been established control is passed into the new class loaders
  * to allow for customisation of the boot process.
- *
  */
 public class QuarkusBootstrap implements Serializable {
 
@@ -85,6 +88,7 @@ public class QuarkusBootstrap implements Serializable {
     private final AppModel existingModel;
     private final boolean rebuild;
     private final Set<AppArtifactKey> localArtifacts;
+    private final List<ClassLoaderEventListener> classLoadListeners;
 
     private QuarkusBootstrap(Builder builder) {
         this.applicationRoot = builder.applicationRoot;
@@ -113,6 +117,7 @@ private QuarkusBootstrap(Builder builder) {
         this.existingModel = builder.existingModel;
         this.rebuild = builder.rebuild;
         this.localArtifacts = new HashSet<>(builder.localArtifacts);
+        this.classLoadListeners = builder.classLoadListeners;
     }
 
     public CuratedApplication bootstrap() throws BootstrapException {
@@ -120,7 +125,7 @@ public CuratedApplication bootstrap() throws BootstrapException {
         //once we have this it is up to augment to set up the class loader to actually use them
 
         if (existingModel != null) {
-            return new CuratedApplication(this, new CurationResult(existingModel));
+            return new CuratedApplication(this, new CurationResult(existingModel), createClassLoadingConfig());
         }
         //first we check for updates
         if (mode != Mode.PROD) {
@@ -155,7 +160,48 @@ public CuratedApplication bootstrap() throws BootstrapException {
                 appModelFactory.setEnableClasspathCache(true);
             }
         }
-        return new CuratedApplication(this, appModelFactory.resolveAppModel());
+        return new CuratedApplication(this, appModelFactory.resolveAppModel(), createClassLoadingConfig());
+    }
+
+    private ConfiguredClassLoading createClassLoadingConfig() {
+        //look for an application.properties
+        for (Path path : applicationRoot) {
+            Path props = path.resolve("application.properties");
+            if (Files.exists(props)) {
+                try (InputStream in = Files.newInputStream(props)) {
+                    Properties p = new Properties();
+                    p.load(in);
+                    Set<AppArtifactKey> parentFirst = toArtifactSet(
+                            p.getProperty(selectKey("quarkus.class-loading.parent-first-artifacts", p)));
+                    Set<AppArtifactKey> liveReloadable = toArtifactSet(
+                            p.getProperty(selectKey("quarkus.class-loading.reloadable-artifacts", p)));
+                    return new ConfiguredClassLoading(parentFirst, liveReloadable);
+                } catch (IOException e) {
+                    throw new RuntimeException("Failed to load bootstrap classloading config from application.properties", e);
+                }
+            }
+        }
+        return new ConfiguredClassLoading(Collections.emptySet(), Collections.emptySet());
+    }
+
+    private String selectKey(String base, Properties p) {
+        String profile = BootstrapProfile.getActiveProfile(mode);
+        String profileKey = "%" + profile + "." + base;
+        if (p.containsKey(profileKey)) {
+            return profileKey;
+        }
+        return base;
+    }
+
+    private Set<AppArtifactKey> toArtifactSet(String config) {
+        if (config == null) {
+            return new HashSet<>();
+        }
+        Set<AppArtifactKey> ret = new HashSet<>();
+        for (String i : config.split(",")) {
+            ret.add(new AppArtifactKey(i.split(":")));
+        }
+        return ret;
     }
 
     public AppModelResolver getAppModelResolver() {
@@ -219,7 +265,48 @@ public boolean isRebuild() {
         return rebuild;
     }
 
+    public List<ClassLoaderEventListener> getClassLoaderEventListeners() {
+        return this.classLoadListeners;
+    }
+
+    public Builder clonedBuilder() {
+        Builder builder = new Builder()
+                .setBaseName(baseName)
+                .setProjectRoot(projectRoot)
+                .setBaseClassLoader(baseClassLoader)
+                .setBuildSystemProperties(buildSystemProperties)
+                .setMode(mode)
+                .setTest(test)
+                .setLocalProjectDiscovery(localProjectDiscovery)
+                .setTargetDirectory(targetDirectory)
+                .setAppModelResolver(appModelResolver)
+                .setVersionUpdateNumber(versionUpdateNumber)
+                .setVersionUpdate(versionUpdate)
+                .setDependenciesOrigin(dependenciesOrigin)
+                .setIsolateDeployment(isolateDeployment)
+                .setMavenArtifactResolver(mavenArtifactResolver)
+                .setManagingProject(managingProject)
+                .setForcedDependencies(new ArrayList<>(forcedDependencies))
+                .setDisableClasspathCache(disableClasspathCache)
+                .addClassLoaderEventListeners(classLoadListeners)
+                .setExistingModel(existingModel);
+        if (appArtifact != null) {
+            builder.setAppArtifact(appArtifact);
+        } else {
+            builder.setApplicationRoot(applicationRoot);
+        }
+        if (offline != null) {
+            builder.setOffline(offline);
+        }
+        builder.additionalApplicationArchives.addAll(additionalApplicationArchives);
+        builder.additionalDeploymentArchives.addAll(additionalDeploymentArchives);
+        builder.excludeFromClassPath.addAll(excludeFromClassPath);
+        builder.localArtifacts.addAll(localArtifacts);
+        return builder;
+    }
+
     public static class Builder {
+        public List<ClassLoaderEventListener> classLoadListeners = new ArrayList<>();
         boolean rebuild;
         PathsCollection applicationRoot;
         String baseName;
@@ -379,10 +466,10 @@ public Builder setManagingProject(AppArtifact managingProject) {
 
         /**
          * If the deployment should use an isolated (aka parent last) classloader.
-         *
+         * <p>
          * For tests this is generally false, as we want to share the base class path so that the
          * test extension code can integrate with the deployment.
-         *
+         * <p>
          * TODO: should this always be true?
          *
          * @param isolateDeployment
@@ -433,11 +520,18 @@ public Builder setRebuild(boolean value) {
             this.rebuild = value;
             return this;
         }
+
+        public Builder addClassLoaderEventListeners(List<ClassLoaderEventListener> classLoadListeners) {
+            this.classLoadListeners.addAll(classLoadListeners);
+            return this;
+        }
     }
 
     public enum Mode {
         DEV,
         TEST,
-        PROD;
+        PROD,
+        REMOTE_DEV_SERVER,
+        REMOTE_DEV_CLIENT;
     }
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassLoaderEventListener.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassLoaderEventListener.java
new file mode 100644
index 0000000000000..be6677707b7a3
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassLoaderEventListener.java
@@ -0,0 +1,26 @@
+package io.quarkus.bootstrap.classloading;
+
+/**
+ * You can register classloader event listeners during our integration tests
+ * to verify / count certain events.
+ * This is useful, for example, to verify that certain classes or resources
+ * are not being loaded; which in turn allows us to write regression tests
+ * for certain optimisations.
+ * Limitations: we don't intercept the system classloader, and the same operation
+ * might be observed multiple times when multiple classloaders are chained.
+ */
+public interface ClassLoaderEventListener {
+
+    default void enumeratingResourceURLs(String resourceName, String classLoaderName) {
+    }
+
+    default void gettingURLFromResource(String resourceName, String classLoaderName) {
+    }
+
+    default void openResourceStream(String resourceName, String classLoaderName) {
+    }
+
+    default void loadClass(String className, String classLoaderName) {
+    }
+
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassLoaderLimiter.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassLoaderLimiter.java
new file mode 100644
index 0000000000000..c7a905bd97dd9
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassLoaderLimiter.java
@@ -0,0 +1,207 @@
+package io.quarkus.bootstrap.classloading;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public final class ClassLoaderLimiter implements ClassLoaderEventListener {
+
+    //Store which classloader (by name) has loaded each resource as it helps diagnostics
+    private final ConcurrentMap<String, String> atMostOnceResourcesLoaded = new ConcurrentHashMap();
+    private final ConcurrentMap<String, String> allResourcesLoaded = new ConcurrentHashMap();
+
+    private final Set<String> vetoedResources;
+    private final Set<String> vetoedClasses;
+    private final Set<String> atMostOnceResources;
+    private final Set<String> onHitPrintStacktrace;
+    private final boolean traceAllResourceLoad;
+
+    private ClassLoaderLimiter(Builder builder) {
+        vetoedClasses = builder.vetoedClasses;
+        vetoedResources = builder.vetoedResources;
+        atMostOnceResources = builder.atMostOnceResources;
+        onHitPrintStacktrace = builder.onHitPrintStacktrace;
+        traceAllResourceLoad = builder.traceAllResourceLoad;
+    }
+
+    @Override
+    public void openResourceStream(String resourceName, String classLoaderName) {
+        Objects.requireNonNull(resourceName);
+        Objects.requireNonNull(classLoaderName);
+        if (traceAllResourceLoad) {
+            System.out.println("Opening resource: " + resourceName);
+        }
+        if (onHitPrintStacktrace.contains(resourceName)) {
+            final RuntimeException e = new RuntimeException("Tracing load of resource: " + resourceName);
+            e.printStackTrace();
+        }
+        if (vetoedResources.contains(resourceName)) {
+            throw new IllegalStateException(
+                    "Attempted to load vetoed resource '" + resourceName + "' from classloader " + classLoaderName);
+        }
+        if (atMostOnceResources.contains(resourceName)) {
+            final String previousLoadEvent = atMostOnceResourcesLoaded.put(resourceName, classLoaderName);
+            if (previousLoadEvent != null) {
+                throw new IllegalStateException("Resource being loaded more than once: " + resourceName + ".\n" +
+                        "Attempted load by " + classLoaderName + ", recorded previous load by " + previousLoadEvent);
+            }
+        }
+        if (resourceName.endsWith(".class")) {
+            //Skip further tracking on classes as it would create unnecessary noise
+            return;
+        }
+        final String previousLoad = allResourcesLoaded.put(resourceName, classLoaderName);
+        if (previousLoad != null) {
+            //This diagnostic has no flag, as it's generally useful, doesn't throw exceptions, and should
+            //generally not log much at all.
+            System.out.println(
+                    "Resource loaded multiple times: " + resourceName + ". Currently being loaded by " + classLoaderName +
+                            ", previous loaded by " + previousLoad);
+        }
+    }
+
+    @Override
+    public void loadClass(String className, String classLoaderName) {
+        if (vetoedClasses.contains(className)) {
+            throw new IllegalStateException(
+                    "Attempted to load vetoed class '" + className + "' from classloader " + classLoaderName);
+        }
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private final Set<String> vetoedResources = new TreeSet<>();
+        private final Set<String> vetoedClasses = new TreeSet<>();
+        private final Set<String> atMostOnceResources = new TreeSet<>();
+        private final Set<String> onHitPrintStacktrace = new TreeSet<>();
+        private boolean traceAllResourceLoad = false;
+
+        private Builder() {
+            //private constructor to encourage using the builder() method.
+        }
+
+        /**
+         * List a resource name as one that you don't expect to be loaded ever.
+         * If there is an attempt of loading the matched resource, a runtime exception will be thrown instead:
+         * useful for running integration tests to verify your assumptions.
+         *
+         * Limitations: if the resource is being loaded using the bootstrap classloader we
+         * can't check it; some frameworks explicitly request using the base classloader
+         * for resource loading (or even use the Filesystem API), so they can't be tested via this method.
+         *
+         * @param resourceFullName the resource name
+         * @return this, for method chaining.
+         */
+        public Builder neverLoadedResource(String resourceFullName) {
+            Objects.requireNonNull(resourceFullName);
+            final boolean add = vetoedResources.add(resourceFullName);
+            if (!add) {
+                throw new ClassLoaderLimiterConsistencyException(
+                        "resource listed multiple times as never loaded: " + resourceFullName);
+            }
+            if (atMostOnceResources.contains(resourceFullName)) {
+                throw new ClassLoaderLimiterConsistencyException(
+                        resourceFullName + " is being listed both as never loaded and as at most once");
+            }
+            return this;
+        }
+
+        /**
+         * List a fully qualified class name as one that you don't expect to be loaded ever.
+         * If there is an attempt of loading the matched class, a runtime exception will be thrown instead:
+         * useful for running integration tests to verify your assumptions.
+         *
+         * DO NOT list the name by doing using <code>literal.class.getName()</code> as this will implicitly get you
+         * to load the class during the test, and produce a failure.
+         *
+         * Limitations: if the class is being loaded using the bootstrap classloader we
+         * can't check it. Most Quarkus extensions and frameworks will not use the bootstrap classloader,
+         * but some code could make use of it explicitly.
+         *
+         * @param vetoedClassName the fully qualified class name
+         * @return this, for method chaining.
+         */
+        public Builder neverLoadedClassName(String vetoedClassName) {
+            Objects.requireNonNull(vetoedClassName);
+            final boolean add = vetoedClasses.add(vetoedClassName);
+            if (!add)
+                throw new ClassLoaderLimiterConsistencyException(
+                        "never loaded class listed multiple times: " + vetoedClassName);
+            return this;
+        }
+
+        /**
+         * Useful to check that a resource is being loaded only once, or never.
+         * If there is an attempt of loading the matched resource more than once, a runtime exception will be thrown instead:
+         * useful for running integration tests to verify your assumptions.
+         *
+         * Limitations: if the resource is being loaded using the bootstrap classloader we
+         * can't check it; some frameworks explicitly request using the base classloader
+         * for resource loading (or even use the Filesystem API), so they can't be tested via this method.
+         * Additionally, some frameworks will load the same resource but in different Quarkus build
+         * phases (which map to different classloaders); such cases will count as multiple times
+         * so it might not be suited to test this way.
+         *
+         * @param resourceFullName the resource name
+         * @return this, for method chaining.
+         */
+        public Builder loadedAtMostOnceResource(String resourceFullName) {
+            Objects.requireNonNull(resourceFullName);
+            final boolean add = atMostOnceResources.add(resourceFullName);
+            if (!add)
+                throw new ClassLoaderLimiterConsistencyException(
+                        "resource listed multiple times as loaded at most once: " + resourceFullName);
+            if (vetoedResources.contains(resourceFullName)) {
+                throw new ClassLoaderLimiterConsistencyException(
+                        resourceFullName + " is being listed both as never loaded and as at most once");
+            }
+            return this;
+        }
+
+        /**
+         * When the specified resource is loaded, print a full stack trace on System out.
+         * This is not useful for testing, but handy to trace were a certain load is coming from,
+         * should you need to diagnose a failing expectation.
+         *
+         * @param resourceFullName
+         * @return this, for method chaining.
+         */
+        public Builder produceStackTraceOnLoad(String resourceFullName) {
+            Objects.requireNonNull(resourceFullName);
+            final boolean add = onHitPrintStacktrace.add(resourceFullName);
+            if (!add)
+                throw new ClassLoaderLimiterConsistencyException(
+                        "resource listed multiple times to produce a stacktrace: " + resourceFullName);
+            return this;
+        }
+
+        /**
+         * Simply log all resource loading events. Useful to get an idea of which resources are being loaded;
+         * Note it includes resources being used to load classes.
+         *
+         * @param enable
+         * @return this, for method chaining.
+         */
+        public Builder traceAllResourceLoad(boolean enable) {
+            traceAllResourceLoad = enable;
+            return this;
+        }
+
+        public ClassLoaderLimiter build() {
+            return new ClassLoaderLimiter(this);
+        }
+
+    }
+
+    public static class ClassLoaderLimiterConsistencyException extends IllegalArgumentException {
+        public ClassLoaderLimiterConsistencyException(String detail) {
+            super("ClassLoaderLimiter definition inconsistency: " + detail);
+        }
+    }
+
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java
index 251ea050b9c7d..8ce92e2f85006 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathElement.java
@@ -1,7 +1,6 @@
 package io.quarkus.bootstrap.classloading;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.ProtectionDomain;
@@ -78,7 +77,7 @@ public Manifest getManifest() {
         }
 
         @Override
-        public void close() throws IOException {
+        public void close() {
 
         }
     };
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java
new file mode 100644
index 0000000000000..99176b1dff7a4
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/DriverRemover.java
@@ -0,0 +1,33 @@
+package io.quarkus.bootstrap.classloading;
+
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Enumeration;
+import org.jboss.logging.Logger;
+
+public class DriverRemover implements Runnable {
+
+    private static final Logger log = Logger.getLogger(DriverRemover.class);
+
+    final ClassLoader goingAwayCl;
+
+    public DriverRemover(ClassLoader goingAwayCl) {
+        this.goingAwayCl = goingAwayCl;
+    }
+
+    @Override
+    public void run() {
+        Enumeration<Driver> drivers = DriverManager.getDrivers();
+        while (drivers.hasMoreElements()) {
+            Driver driver = drivers.nextElement();
+            try {
+                if (driver.getClass().getClassLoader() == goingAwayCl) {
+                    DriverManager.deregisterDriver(driver);
+                }
+            } catch (SQLException t) {
+                log.error("Failed to deregister driver", t);
+            }
+        }
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java
index e3d0cb0779ebc..b7bdb8fb9818b 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/JarClassPathElement.java
@@ -8,8 +8,8 @@
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.UncheckedIOException;
+import java.lang.reflect.Method;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
@@ -18,7 +18,11 @@
 import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Function;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -30,18 +34,42 @@
  */
 public class JarClassPathElement implements ClassPathElement {
 
+    private static final int JAVA_VERSION;
+
+    static {
+        int version = 8;
+        try {
+            Method versionMethod = Runtime.class.getMethod("version");
+            Object v = versionMethod.invoke(null);
+            List<Integer> list = (List<Integer>) v.getClass().getMethod("version").invoke(v);
+            version = list.get(0);
+        } catch (Exception e) {
+            //version 8
+        }
+        JAVA_VERSION = version;
+    }
+
     private static final Logger log = Logger.getLogger(JarClassPathElement.class);
+    public static final String META_INF_VERSIONS = "META-INF/versions/";
+
     private final File file;
     private final URL jarPath;
     private final Path root;
-    private JarFile jarFile;
-    private boolean closed;
+    private final Lock readLock;
+    private final Lock writeLock;
+
+    //Closing the jarFile requires the exclusive lock, while reading data from the jarFile requires the shared lock.
+    private final JarFile jarFile;
+    private volatile boolean closed;
 
     public JarClassPathElement(Path root) {
         try {
             jarPath = root.toUri().toURL();
             this.root = root;
             jarFile = JarFiles.create(file = root.toFile());
+            ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
+            this.readLock = readWriteLock.readLock();
+            this.writeLock = readWriteLock.writeLock();
         } catch (IOException e) {
             throw new UncheckedIOException("Error while reading file as JAR: " + root, e);
         }
@@ -119,16 +147,21 @@ public boolean isDirectory() {
     }
 
     private <T> T withJarFile(Function<JarFile, T> func) {
-        if (closed) {
-            //we still need this to work if it is closed, so shutdown hooks work
-            //once it is closed it simply does not hold on to any resources
-            try (JarFile jarFile = JarFiles.create(file)) {
+        readLock.lock();
+        try {
+            if (closed) {
+                //we still need this to work if it is closed, so shutdown hooks work
+                //once it is closed it simply does not hold on to any resources
+                try (JarFile jarFile = JarFiles.create(file)) {
+                    return func.apply(jarFile);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
                 return func.apply(jarFile);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
             }
-        } else {
-            return func.apply(jarFile);
+        } finally {
+            readLock.unlock();
         }
     }
 
@@ -147,6 +180,26 @@ public Set<String> apply(JarFile jarFile) {
                         paths.add(entry.getName());
                     }
                 }
+                //multi release jars can add additional entries
+                if (JarFiles.isMultiRelease(jarFile)) {
+                    Set<String> copy = new HashSet<>(paths);
+                    for (String i : copy) {
+                        if (i.startsWith(META_INF_VERSIONS)) {
+                            String part = i.substring(META_INF_VERSIONS.length());
+                            int slash = part.indexOf("/");
+                            if (slash != -1) {
+                                try {
+                                    int ver = Integer.parseInt(part.substring(0, slash));
+                                    if (ver <= JAVA_VERSION) {
+                                        paths.add(part.substring(slash + 1));
+                                    }
+                                } catch (NumberFormatException e) {
+                                    log.debug("Failed to parse META-INF/versions entry", e);
+                                }
+                            }
+                        }
+                    }
+                }
                 return paths;
             }
         }));
@@ -154,16 +207,14 @@ public Set<String> apply(JarFile jarFile) {
 
     @Override
     public ProtectionDomain getProtectionDomain(ClassLoader classLoader) {
-        URL url = null;
+        final URL url;
         try {
-            URI uri = new URI("jar:file", null, jarPath.getPath() + "!/", null);
-            url = uri.toURL();
+            url = jarPath.toURI().toURL();
         } catch (URISyntaxException | MalformedURLException e) {
             throw new RuntimeException("Unable to create protection domain for " + jarPath, e);
         }
         CodeSource codesource = new CodeSource(url, (Certificate[]) null);
-        ProtectionDomain protectionDomain = new ProtectionDomain(codesource, null, classLoader, null);
-        return protectionDomain;
+        return new ProtectionDomain(codesource, null, classLoader, null);
     }
 
     @Override
@@ -183,8 +234,13 @@ public Manifest apply(JarFile jarFile) {
 
     @Override
     public void close() throws IOException {
-        closed = true;
-        jarFile.close();
+        writeLock.lock();
+        try {
+            jarFile.close();
+            closed = true;
+        } finally {
+            writeLock.unlock();
+        }
     }
 
     public static byte[] readStreamContents(InputStream inputStream) throws IOException {
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java
index 00e9579101bb2..9fcfed8c85a76 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java
@@ -1,16 +1,14 @@
 package io.quarkus.bootstrap.classloading;
 
-import io.quarkus.bootstrap.BootstrapDebug;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.ProtectionDomain;
+import java.sql.Driver;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,23 +18,16 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import org.jboss.logging.Logger;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
 
 /**
- * The ClassLoader used for non production Quarkus applications (i.e. dev and test mode). Production
- * applications use a flat classpath so just use the system class loader.
- *
- *
+ * The ClassLoader used for non production Quarkus applications (i.e. dev and test mode).
  */
 public class QuarkusClassLoader extends ClassLoader implements Closeable {
 
@@ -51,6 +42,7 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable {
     private final String name;
     private final List<ClassPathElement> elements;
     private final ConcurrentMap<ClassPathElement, ProtectionDomain> protectionDomains = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, Package> definedPackages = new ConcurrentHashMap<>();
     private final ClassLoader parent;
     /**
      * If this is true it will attempt to load from the parent first
@@ -60,6 +52,7 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable {
     private final List<ClassPathElement> bannedElements;
     private final List<ClassPathElement> parentFirstElements;
     private final List<ClassPathElement> lesserPriorityElements;
+    private final List<ClassLoaderEventListener> classLoaderEventListeners;
 
     /**
      * The element that holds resettable in-memory classses.
@@ -75,11 +68,9 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable {
      *
      */
     private volatile MemoryClassPathElement resettableElement;
-
-    private volatile Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers;
-    private volatile Map<String, Predicate<byte[]>> transformerPredicates;
-    private volatile ClassLoader transformerClassLoader;
+    private volatile MemoryClassPathElement transformedClasses;
     private volatile ClassLoaderState state;
+    private final List<Runnable> closeTasks = new ArrayList<>();
 
     static final ClassLoader PLATFORM_CLASS_LOADER;
 
@@ -93,28 +84,23 @@ public class QuarkusClassLoader extends ClassLoader implements Closeable {
         PLATFORM_CLASS_LOADER = cl;
     }
 
+    private boolean closed;
+    private volatile boolean driverLoaded;
+
     private QuarkusClassLoader(Builder builder) {
-        //we need the parent to be null
-        //as MP has super broken class loading where it attempts to resolve stuff from the parent
-        //will hopefully be fixed in 1.4
-        //e.g. https://github.com/eclipse/microprofile-config/issues/390
-        //e.g. https://github.com/eclipse/microprofile-reactive-streams-operators/pull/130
-        //to further complicate things we also have https://github.com/quarkusio/quarkus/issues/8985
-        //where getParent must work to load JDK services on JDK9+
-        //to get around this we pass in the platform ClassLoader, if it exists
-        super(PLATFORM_CLASS_LOADER);
+        super(new GetPackageBlockingClassLoader(builder.parent));
         this.name = builder.name;
         this.elements = builder.elements;
-        this.bytecodeTransformers = builder.bytecodeTransformers;
-        this.transformerPredicates = builder.transformerPredicates;
         this.bannedElements = builder.bannedElements;
         this.parentFirstElements = builder.parentFirstElements;
         this.lesserPriorityElements = builder.lesserPriorityElements;
         this.parent = builder.parent;
         this.parentFirst = builder.parentFirst;
         this.resettableElement = builder.resettableElement;
-        this.transformerClassLoader = builder.transformerClassLoader;
+        this.transformedClasses = new MemoryClassPathElement(builder.transformedClasses);
         this.aggregateParentResources = builder.aggregateParentResources;
+        this.classLoaderEventListeners = builder.classLoaderEventListeners.isEmpty() ? Collections.emptyList()
+                : builder.classLoaderEventListeners;
     }
 
     public static Builder builder(String name, ClassLoader parent, boolean parentFirst) {
@@ -135,24 +121,22 @@ private boolean parentFirst(String name, ClassLoaderState state) {
         return parentFirst || state.parentFirstResources.contains(name);
     }
 
-    public void reset(Map<String, byte[]> resources,
-            Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers,
-            Map<String, Predicate<byte[]>> transformerPredicates,
-            ClassLoader transformerClassLoader) {
+    public void reset(Map<String, byte[]> generatedResources, Map<String, byte[]> transformedClasses) {
         if (resettableElement == null) {
             throw new IllegalStateException("Classloader is not resettable");
         }
-        this.transformerClassLoader = transformerClassLoader;
         synchronized (this) {
-            this.transformerPredicates = transformerPredicates;
-            resettableElement.reset(resources);
-            this.bytecodeTransformers = bytecodeTransformers;
+            this.transformedClasses = new MemoryClassPathElement(transformedClasses);
+            resettableElement.reset(generatedResources);
             state = null;
         }
     }
 
     @Override
     public Enumeration<URL> getResources(String unsanitisedName) throws IOException {
+        for (ClassLoaderEventListener l : classLoaderEventListeners) {
+            l.enumeratingResourceURLs(unsanitisedName, this.name);
+        }
         boolean endsWithTrailingSlash = unsanitisedName.endsWith("/");
         ClassLoaderState state = getState();
         String name = sanitizeName(unsanitisedName);
@@ -234,11 +218,15 @@ private ClassLoaderState getState() {
                                 throw new RuntimeException(
                                         "Resources cannot start with /, " + i + " is incorrect provided by " + element);
                             }
-                            List<ClassPathElement> list = elementMap.get(i);
-                            if (list == null) {
-                                elementMap.put(i, list = new ArrayList<>());
+                            if (transformedClasses.getResource(i) != null) {
+                                elementMap.put(i, Collections.singletonList(transformedClasses));
+                            } else {
+                                List<ClassPathElement> list = elementMap.get(i);
+                                if (list == null) {
+                                    elementMap.put(i, list = new ArrayList<>());
+                                }
+                                list.add(element);
                             }
-                            list.add(element);
                         }
                     }
                     Map<String, ClassPathElement[]> finalElements = new HashMap<>();
@@ -278,9 +266,12 @@ private ClassLoaderState getState() {
     }
 
     @Override
-    public URL getResource(String unsantisedName) {
-        boolean endsWithTrailingSlash = unsantisedName.endsWith("/");
-        String name = sanitizeName(unsantisedName);
+    public URL getResource(String unsanitisedName) {
+        for (ClassLoaderEventListener l : classLoaderEventListeners) {
+            l.gettingURLFromResource(unsanitisedName, this.name);
+        }
+        boolean endsWithTrailingSlash = unsanitisedName.endsWith("/");
+        String name = sanitizeName(unsanitisedName);
         ClassLoaderState state = getState();
         if (state.bannedResources.contains(name)) {
             return null;
@@ -314,11 +305,14 @@ public URL getResource(String unsantisedName) {
                 }
             }
         }
-        return parent.getResource(unsantisedName);
+        return parent.getResource(unsanitisedName);
     }
 
     @Override
     public InputStream getResourceAsStream(String unsanitisedName) {
+        for (ClassLoaderEventListener l : classLoaderEventListeners) {
+            l.openResourceStream(unsanitisedName, this.name);
+        }
         String name = sanitizeName(unsanitisedName);
         ClassLoaderState state = getState();
         if (state.bannedResources.contains(name)) {
@@ -334,6 +328,17 @@ public InputStream getResourceAsStream(String unsanitisedName) {
             for (ClassPathElement i : elements) {
                 ClassPathResource res = i.getResource(name);
                 if (res != null) {
+                    if (res.isDirectory()) {
+                        try {
+                            return res.getUrl().openStream();
+                        } catch (IOException e) {
+                            log.debug("Ignoring exception that occurred while opening a stream for resource " + unsanitisedName,
+                                    e);
+                            // behave like how java.lang.ClassLoader#getResourceAsStream() behaves
+                            // and don't propagate the exception
+                            continue;
+                        }
+                    }
                     return new ByteArrayInputStream(res.getData());
                 }
             }
@@ -360,11 +365,17 @@ protected Class<?> findClass(String moduleName, String name) {
 
     @Override
     public Class<?> loadClass(String name) throws ClassNotFoundException {
+        for (ClassLoaderEventListener l : classLoaderEventListeners) {
+            l.loadClass(name, this.name);
+        }
         return loadClass(name, false);
     }
 
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        for (ClassLoaderEventListener l : classLoaderEventListeners) {
+            l.loadClass(name, this.name);
+        }
         if (name.startsWith(JAVA)) {
             return parent.loadClass(name);
         }
@@ -396,29 +407,13 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
                     ClassPathResource classPathElementResource = classPathElement.getResource(resourceName);
                     if (classPathElementResource != null) { //can happen if the class loader was closed
                         byte[] data = classPathElementResource.getData();
-                        List<BiFunction<String, ClassVisitor, ClassVisitor>> transformers = bytecodeTransformers.get(name);
-                        Map<String, Predicate<byte[]>> constPoolEntries = transformerPredicates;
-                        if (transformers != null) {
-                            data = handleTransform(name, data, transformers, constPoolEntries);
-
-                            if (BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR != null) {
-                                File debugPath = new File(BootstrapDebug.DEBUG_TRANSFORMED_CLASSES_DIR);
-                                if (!debugPath.exists()) {
-                                    debugPath.mkdir();
-                                }
-                                File classFile = new File(debugPath, name.replace(".", "/") + ".class");
-                                classFile.getParentFile().mkdirs();
-                                try (FileOutputStream classWriter = new FileOutputStream(classFile)) {
-                                    classWriter.write(data);
-                                } catch (Exception e) {
-                                    log.errorf(e, "Failed to write transformed class %s", name);
-                                }
-                                log.infof("Wrote transformed class to %s", classFile.getAbsolutePath());
-                            }
-                        }
                         definePackage(name, classPathElement);
-                        return defineClass(name, data, 0, data.length,
+                        Class<?> cl = defineClass(name, data, 0, data.length,
                                 protectionDomains.computeIfAbsent(classPathElement, (ce) -> ce.getProtectionDomain(this)));
+                        if (Driver.class.isAssignableFrom(cl)) {
+                            driverLoaded = true;
+                        }
+                        return cl;
                     }
                 }
 
@@ -438,23 +433,25 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
 
     private void definePackage(String name, ClassPathElement classPathElement) {
         final String pkgName = getPackageNameFromClassName(name);
-        if ((pkgName != null) && getPackage(pkgName) == null) {
+        //we can't use getPackage here
+        //if can return a package from the parent
+        if ((pkgName != null) && definedPackages.get(pkgName) == null) {
             synchronized (getClassLoadingLock(pkgName)) {
-                if (getPackage(pkgName) == null) {
+                if (definedPackages.get(pkgName) == null) {
                     Manifest mf = classPathElement.getManifest();
                     if (mf != null) {
                         Attributes ma = mf.getMainAttributes();
-                        definePackage(pkgName, ma.getValue(Attributes.Name.SPECIFICATION_TITLE),
+                        definedPackages.put(pkgName, definePackage(pkgName, ma.getValue(Attributes.Name.SPECIFICATION_TITLE),
                                 ma.getValue(Attributes.Name.SPECIFICATION_VERSION),
                                 ma.getValue(Attributes.Name.SPECIFICATION_VENDOR),
                                 ma.getValue(Attributes.Name.IMPLEMENTATION_TITLE),
                                 ma.getValue(Attributes.Name.IMPLEMENTATION_VERSION),
-                                ma.getValue(Attributes.Name.IMPLEMENTATION_VENDOR), null);
+                                ma.getValue(Attributes.Name.IMPLEMENTATION_VENDOR), null));
                         return;
                     }
 
                     // this could certainly be improved to use the actual manifest
-                    definePackage(pkgName, null, null, null, null, null, null, null);
+                    definedPackages.put(pkgName, definePackage(pkgName, null, null, null, null, null, null, null));
                 }
             }
         }
@@ -488,47 +485,54 @@ public List<ClassPathElement> getElementsWithResource(String name, boolean local
         return ret;
     }
 
-    private byte[] handleTransform(String name, byte[] bytes,
-            List<BiFunction<String, ClassVisitor, ClassVisitor>> transformers,
-            Map<String, Predicate<byte[]>> transformerPredicates) {
-        if (transformerPredicates.containsKey(name)) {
-            if (!transformerPredicates.get(name).test(bytes)) {
-                return bytes;
-            }
-        }
-        ClassReader cr = new ClassReader(bytes);
-        ClassWriter writer = new ClassWriter(cr, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
-
-            @Override
-            protected ClassLoader getClassLoader() {
-                return transformerClassLoader;
-            }
-        };
-        ClassVisitor visitor = writer;
-        for (BiFunction<String, ClassVisitor, ClassVisitor> i : transformers) {
-            visitor = i.apply(name, visitor);
-        }
-        cr.accept(visitor, 0);
-        return writer.toByteArray();
-    }
-
     @SuppressWarnings("unused")
     public Class<?> visibleDefineClass(String name, byte[] b, int off, int len) throws ClassFormatError {
         return super.defineClass(name, b, off, len);
     }
 
+    public void addCloseTask(Runnable task) {
+        closeTasks.add(task);
+    }
+
     @Override
     public void close() {
+        synchronized (this) {
+            if (closed) {
+                return;
+            }
+            closed = true;
+        }
+        for (Runnable i : closeTasks) {
+            try {
+                i.run();
+            } catch (Throwable t) {
+                log.error("Failed to run close task", t);
+            }
+        }
+        if (driverLoaded) {
+            //DriverManager only lets you remove drivers with the same CL as the caller
+            //so we need do define the cleaner in this class loader
+            try (InputStream is = getClass().getResourceAsStream("DriverRemover.class")) {
+                byte[] data = JarClassPathElement.readStreamContents(is);
+                Runnable r = (Runnable) defineClass(DriverRemover.class.getName(), data, 0, data.length)
+                        .getConstructor(ClassLoader.class).newInstance(this);
+                r.run();
+            } catch (Exception e) {
+                log.debug("Failed to clean up DB drivers");
+            }
+        }
         for (ClassPathElement element : elements) {
             //note that this is a 'soft' close
             //all resources are closed, however the CL can still be used
             //but after close no resources will be held past the scope of an operation
             try (ClassPathElement ignored = element) {
-
+                //the close() operation is implied by the try-with syntax
             } catch (Exception e) {
                 log.error("Failed to close " + element, e);
             }
         }
+        ResourceBundle.clearCache(this);
+
     }
 
     @Override
@@ -543,12 +547,11 @@ public static class Builder {
         final List<ClassPathElement> bannedElements = new ArrayList<>();
         final List<ClassPathElement> parentFirstElements = new ArrayList<>();
         final List<ClassPathElement> lesserPriorityElements = new ArrayList<>();
-        Map<String, Predicate<byte[]>> transformerPredicates = Collections.emptyMap();
-        Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers = Collections.emptyMap();
         final boolean parentFirst;
         MemoryClassPathElement resettableElement;
-        private volatile ClassLoader transformerClassLoader;
+        private Map<String, byte[]> transformedClasses = Collections.emptyMap();
         boolean aggregateParentResources;
+        private final ArrayList<ClassLoaderEventListener> classLoaderEventListeners = new ArrayList<>(5);
 
         public Builder(String name, ClassLoader parent, boolean parentFirst) {
             this.name = name;
@@ -642,29 +645,6 @@ public Builder addLesserPriorityElement(ClassPathElement element) {
             return this;
         }
 
-        /**
-         * Sets any bytecode transformers that should be applied to this Class Loader
-         *
-         * @param bytecodeTransformers
-         */
-        public void setBytecodeTransformers(
-                Map<String, List<BiFunction<String, ClassVisitor, ClassVisitor>>> bytecodeTransformers) {
-            if (bytecodeTransformers == null) {
-                this.bytecodeTransformers = Collections.emptyMap();
-            } else {
-                this.bytecodeTransformers = bytecodeTransformers;
-            }
-        }
-
-        /**
-         * Sets const pool entries that need to be present for a class to be transformed. This optimisation
-         * allows for transformation to be skipped if the scanner detects that no transformation is required.
-         */
-        public Builder setTransformerPredicates(Map<String, Predicate<byte[]>> transformerPredicates) {
-            this.transformerPredicates = transformerPredicates;
-            return this;
-        }
-
         /**
          * If this is true then a getResources call will always include the parent resources.
          *
@@ -677,8 +657,13 @@ public Builder setAggregateParentResources(boolean aggregateParentResources) {
             return this;
         }
 
-        public Builder setTransformerClassLoader(ClassLoader transformerClassLoader) {
-            this.transformerClassLoader = transformerClassLoader;
+        public Builder setTransformedClasses(Map<String, byte[]> transformedClasses) {
+            this.transformedClasses = transformedClasses;
+            return this;
+        }
+
+        public Builder addClassLoaderEventListeners(List<ClassLoaderEventListener> classLoadListeners) {
+            this.classLoaderEventListeners.addAll(classLoadListeners);
             return this;
         }
 
@@ -693,8 +678,10 @@ public QuarkusClassLoader build() {
                     elements.add(0, resettableElement);
                 }
             }
+            this.classLoaderEventListeners.trimToSize();
             return new QuarkusClassLoader(this);
         }
+
     }
 
     public ClassLoader parent() {
@@ -714,4 +701,24 @@ static final class ClassLoaderState {
             this.parentFirstResources = parentFirstResources;
         }
     }
+
+    /**
+     * Horrible JDK8 hack
+     *
+     * getPackage() on JDK8 will always delegate to the parent, so QuarkusClassLoader will never define a package,
+     * which can cause issues if you then try and read package annotations as they will be from the wrong ClassLoader.
+     *
+     * We add this ClassLoader into the mix to block the getPackage() delegation.
+     */
+    private static class GetPackageBlockingClassLoader extends ClassLoader {
+
+        protected GetPackageBlockingClassLoader(ClassLoader parent) {
+            super(parent);
+        }
+
+        @Override
+        protected Package getPackage(String name) {
+            return null;
+        }
+    }
 }
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java
new file mode 100644
index 0000000000000..24f486b5a6201
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/devmode/DependenciesFilter.java
@@ -0,0 +1,150 @@
+package io.quarkus.bootstrap.devmode;
+
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionException;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.DependencyVisitor;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.util.artifact.JavaScopes;
+import org.eclipse.aether.util.graph.visitor.TreeDependencyVisitor;
+import org.jboss.logging.Logger;
+
+public class DependenciesFilter {
+
+    private static final Logger log = Logger.getLogger(DependenciesFilter.class);
+
+    public static List<LocalProject> filterNotReloadableDependencies(LocalProject localProject,
+            MavenArtifactResolver mvnResolver) throws BootstrapMavenException {
+        final AppArtifact appArtifact = localProject.getAppArtifact("jar");
+        final List<Artifact> projectDeps = new ArrayList<>();
+        mvnResolver
+                .resolveDependencies(
+                        new DefaultArtifact(appArtifact.getGroupId(), appArtifact.getArtifactId(),
+                                appArtifact.getClassifier(), appArtifact.getType(), appArtifact.getVersion()),
+                        Collections.emptyList())
+                .getRoot().accept(new TreeDependencyVisitor(new DependencyVisitor() {
+                    @Override
+                    public boolean visitEnter(DependencyNode node) {
+                        final Dependency dep = node.getDependency();
+                        if (dep != null && dep.getArtifact().getFile().isDirectory()) {
+                            org.eclipse.aether.artifact.Artifact a = dep.getArtifact();
+                            final org.apache.maven.artifact.DefaultArtifact mvnArtifact = new org.apache.maven.artifact.DefaultArtifact(
+                                    a.getGroupId(), a.getArtifactId(), a.getVersion(), dep.getScope(), a.getExtension(),
+                                    a.getClassifier(), new DefaultArtifactHandler("jar"));
+                            mvnArtifact.setFile(a.getFile());
+                            projectDeps.add(mvnArtifact);
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public boolean visitLeave(DependencyNode node) {
+                        return true;
+                    }
+                }));
+        return filterNotReloadableDependencies(localProject, projectDeps, mvnResolver.getSystem(),
+                mvnResolver.getSession(), mvnResolver.getRepositories());
+    }
+
+    public static List<LocalProject> filterNotReloadableDependencies(LocalProject localProject,
+            Iterable<Artifact> projectDeps,
+            RepositorySystem repoSystem,
+            RepositorySystemSession repoSession,
+            List<RemoteRepository> repos) {
+        final LocalWorkspace workspace = localProject.getWorkspace();
+        if (workspace == null) {
+            return Collections.singletonList(localProject);
+        }
+
+        List<LocalProject> ret = new ArrayList<>();
+        Set<AppArtifactKey> extensionsAndDeps = new HashSet<>();
+
+        ret.add(localProject);
+        for (Artifact a : projectDeps) {
+            final AppArtifactKey depKey = new AppArtifactKey(a.getGroupId(), a.getArtifactId());
+            final LocalProject project = workspace.getProject(depKey);
+            if (project == null) {
+                continue;
+            }
+            if (!project.getVersion().equals(a.getVersion())) {
+                log.warn(depKey + " is excluded from live coding since the application depends on version "
+                        + a.getVersion() + " while the version present in the workspace is " + project.getVersion());
+                continue;
+            }
+
+            if (project.getClassesDir() != null &&
+            //if this project also contains Quarkus extensions we do no want to include these in the discovery
+            //a bit of an edge case, but if you try and include a sample project with your extension you will
+            //run into problems without this
+                    (Files.exists(project.getClassesDir().resolve("META-INF/quarkus-extension.properties")) ||
+                            Files.exists(project.getClassesDir().resolve("META-INF/quarkus-build-steps.list")))) {
+                // TODO add the deployment deps
+                extensionDepWarning(depKey);
+                try {
+                    final DependencyNode depRoot = repoSystem.collectDependencies(repoSession, new CollectRequest()
+                            .setRoot(new org.eclipse.aether.graph.Dependency(
+                                    new DefaultArtifact(a.getGroupId(), a.getArtifactId(),
+                                            a.getClassifier(), a.getArtifactHandler().getExtension(), a.getVersion()),
+                                    JavaScopes.RUNTIME))
+                            .setRepositories(repos)).getRoot();
+                    depRoot.accept(new DependencyVisitor() {
+                        @Override
+                        public boolean visitEnter(DependencyNode node) {
+                            final org.eclipse.aether.artifact.Artifact artifact = node.getArtifact();
+                            if ("jar".equals(artifact.getExtension())) {
+                                extensionsAndDeps.add(new AppArtifactKey(artifact.getGroupId(), artifact.getArtifactId()));
+                            }
+                            return true;
+                        }
+
+                        @Override
+                        public boolean visitLeave(DependencyNode node) {
+                            return true;
+                        }
+                    });
+                } catch (DependencyCollectionException e) {
+                    throw new RuntimeException("Failed to collect dependencies for " + a, e);
+                }
+            } else {
+                ret.add(project);
+            }
+        }
+
+        if (extensionsAndDeps.isEmpty()) {
+            return ret;
+        }
+
+        Iterator<LocalProject> iterator = ret.iterator();
+        while (iterator.hasNext()) {
+            final LocalProject localDep = iterator.next();
+            if (extensionsAndDeps.contains(localDep.getKey())) {
+                extensionDepWarning(localDep.getKey());
+                iterator.remove();
+            }
+        }
+        return ret;
+    }
+
+    private static void extensionDepWarning(AppArtifactKey key) {
+        log.warn("Local Quarkus extension dependency " + key + " will not be hot-reloadable");
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java
new file mode 100644
index 0000000000000..b61633c83073e
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java
@@ -0,0 +1,103 @@
+package io.quarkus.bootstrap.jbang;
+
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.eclipse.aether.repository.RemoteRepository;
+
+public class JBangBuilderImpl {
+    public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<Map.Entry<String, String>> repositories,
+            List<Map.Entry<String, Path>> dependencies,
+            boolean nativeImage) {
+        final MavenArtifactResolver quarkusResolver;
+        try {
+            final BootstrapMavenContext mvnCtx = new BootstrapMavenContext(BootstrapMavenContext.config()
+                    .setCurrentProject(pomFile.getParent().toString()));
+            final List<RemoteRepository> remoteRepos = new ArrayList<>(mvnCtx.getRemoteRepositories());
+
+            repositories.forEach(repo -> {
+                remoteRepos.add(new RemoteRepository.Builder(repo.getKey(), "default", repo.getValue()).build());
+            });
+
+            quarkusResolver = MavenArtifactResolver.builder()
+                    .setRepositorySystem(mvnCtx.getRepositorySystem())
+                    .setRepositorySystemSession(mvnCtx.getRepositorySystemSession())
+                    .setRemoteRepositoryManager(mvnCtx.getRemoteRepositoryManager())
+                    .setRemoteRepositories(remoteRepos)
+                    .build();
+        } catch (BootstrapMavenException e) {
+            throw new IllegalStateException("Failed to initialize Quarkus bootstrap Maven resolver", e);
+        }
+
+        try {
+            Path target = Files.createTempDirectory("quarkus-jbang");
+            AppArtifact appArtifact = new AppArtifact("dev.jbang.user", "quarkus", null, "jar", "999-SNAPSHOT");
+            appArtifact.setPath(appClasses);
+            final QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder()
+                    .setBaseClassLoader(JBangBuilderImpl.class.getClassLoader())
+                    .setMavenArtifactResolver(quarkusResolver)
+                    .setProjectRoot(pomFile.getParent())
+                    .setTargetDirectory(target)
+                    .setManagingProject(new AppArtifact("io.quarkus", "quarkus-bom", "", "pom", getQuarkusVersion()))
+                    .setForcedDependencies(dependencies.stream().map(s -> {
+                        String[] parts = s.getKey().split(":");
+                        AppArtifact artifact;
+                        if (parts.length == 3) {
+                            artifact = new AppArtifact(parts[0], parts[1], parts[2]);
+                        } else if (parts.length == 4) {
+                            artifact = new AppArtifact(parts[0], parts[1], null, parts[2], parts[3]);
+                        } else if (parts.length == 5) {
+                            artifact = new AppArtifact(parts[0], parts[1], parts[3], parts[2], parts[4]);
+                        } else {
+                            throw new RuntimeException("Invalid artifact " + s.getKey());
+                        }
+                        artifact.setPath(s.getValue());
+                        return new AppDependency(artifact, "compile");
+                    }).collect(Collectors.toList()))
+                    .setAppArtifact(appArtifact)
+                    .setIsolateDeployment(true)
+                    .setMode(QuarkusBootstrap.Mode.PROD);
+
+            CuratedApplication app = builder
+                    .build().bootstrap();
+
+            if (nativeImage) {
+                System.setProperty("quarkus.package.type", "native");
+            }
+            Map<String, Object> output = new HashMap<>();
+            app.runInAugmentClassLoader("io.quarkus.deployment.jbang.JBangAugmentorImpl", output);
+            return output;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static String getQuarkusVersion() {
+        try (InputStream in = JBangBuilderImpl.class.getClassLoader().getResourceAsStream("quarkus-version.txt")) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            byte[] buf = new byte[10];
+            int r;
+            while ((r = in.read(buf)) > 0) {
+                out.write(buf, 0, r);
+            }
+            return new String(out.toByteArray(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java
new file mode 100644
index 0000000000000..2868f0eb07ca1
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangDevModeLauncherImpl.java
@@ -0,0 +1,164 @@
+package io.quarkus.bootstrap.jbang;
+
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppDependency;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+/**
+ * JBang Dev mode entry point.
+ * <p>
+ * This is launched from the core/launcher module. To avoid any shading issues core/launcher unpacks all its dependencies
+ * into the jar file, then uses a custom class loader load them.
+ */
+public class JBangDevModeLauncherImpl implements Closeable {
+
+    public static Closeable main(String... args) {
+        System.clearProperty("quarkus.dev"); //avoid unknown config key warnings
+        System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager");
+
+        URL url = JBangDevModeLauncherImpl.class.getClassLoader().getResource("jbang-dev.dat");
+        String jarFilePath = url.getPath().substring(5, url.getPath().indexOf("!"));
+
+        try (DataInputStream contextStream = new DataInputStream(
+                JBangDevModeLauncherImpl.class.getClassLoader().getResourceAsStream("jbang-dev.dat"))) {
+            String pomContents = contextStream.readUTF();
+            Path sourceFile = Paths.get(contextStream.readUTF());
+            int depCount = contextStream.readInt();
+            Map<String, Path> deps = new HashMap<>();
+            for (int i = 0; i < depCount; ++i) {
+                String name = contextStream.readUTF();
+                Path path = Paths.get(contextStream.readUTF());
+                deps.put(name, path);
+            }
+            Path projectRoot = Files.createTempDirectory("quarkus-jbang");
+            try (OutputStream out = Files.newOutputStream(projectRoot.resolve("pom.xml"))) {
+                out.write(pomContents.getBytes(StandardCharsets.UTF_8));
+            }
+            Path targetClasses = projectRoot.resolve("target/classes");
+            Files.createDirectories(targetClasses);
+
+            try (ZipFile fz = new ZipFile(new File(jarFilePath))) {
+                Enumeration<? extends ZipEntry> entries = fz.entries();
+                while (entries.hasMoreElements()) {
+                    ZipEntry entry = entries.nextElement();
+                    Path path = targetClasses.resolve(entry.getName());
+                    if (entry.isDirectory()) {
+                        Files.createDirectories(path);
+                    } else {
+                        Files.createDirectories(path.getParent());
+                        Files.copy(fz.getInputStream(entry), path);
+                        Files.setLastModifiedTime(path, entry.getLastModifiedTime());
+                    }
+                }
+            }
+
+            Path srcDir = projectRoot.resolve("src/main/java");
+            Files.createDirectories(srcDir);
+            Files.createSymbolicLink(srcDir.resolve(sourceFile.getFileName().toString()), sourceFile);
+            final LocalProject currentProject = LocalProject.loadWorkspace(projectRoot);
+            AppArtifact appArtifact = currentProject.getAppArtifact("jar");
+            appArtifact.setPath(targetClasses);
+
+            //todo : proper support for everything
+            final QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder()
+                    .setBaseClassLoader(JBangDevModeLauncherImpl.class.getClassLoader())
+                    .setIsolateDeployment(true)
+                    .setMode(QuarkusBootstrap.Mode.DEV)
+                    .setTargetDirectory(targetClasses)
+                    .setAppArtifact(appArtifact)
+                    .setManagingProject(new AppArtifact("io.quarkus", "quarkus-bom", "", "pom", getQuarkusVersion()))
+                    .setForcedDependencies(deps.entrySet().stream().map(s -> {
+                        String[] parts = s.getKey().split(":");
+                        AppArtifact artifact;
+                        if (parts.length == 3) {
+                            artifact = new AppArtifact(parts[0], parts[1], parts[2]);
+                        } else if (parts.length == 4) {
+                            artifact = new AppArtifact(parts[0], parts[1], null, parts[2], parts[3]);
+                        } else if (parts.length == 5) {
+                            artifact = new AppArtifact(parts[0], parts[1], parts[3], parts[2], parts[4]);
+                        } else {
+                            throw new RuntimeException("Invalid artifact " + s);
+                        }
+                        artifact.setPath(s.getValue());
+                        return new AppDependency(artifact, "compile");
+                    }).collect(Collectors.toList()))
+                    .setApplicationRoot(targetClasses)
+                    .setProjectRoot(projectRoot);
+
+            Map<String, Object> context = new HashMap<>();
+            context.put("app-project", currentProject);
+            context.put("args", args);
+            context.put("app-classes", targetClasses);
+
+            final BootstrapMavenContext mvnCtx = new BootstrapMavenContext(
+                    BootstrapMavenContext.config().setCurrentProject(currentProject));
+            final MavenArtifactResolver mvnResolver = new MavenArtifactResolver(mvnCtx);
+            builder.setMavenArtifactResolver(mvnResolver);
+            currentProject.getAppArtifact("jar").setPath(targetClasses);
+
+            final CuratedApplication curatedApp = builder.build().bootstrap();
+            final Object appInstance = curatedApp.runInAugmentClassLoader("io.quarkus.deployment.dev.IDEDevModeMain", context);
+            return new JBangDevModeLauncherImpl(curatedApp,
+                    appInstance == null ? null : appInstance instanceof Closeable ? (Closeable) appInstance : null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private final CuratedApplication curatedApp;
+    private final Closeable runningApp;
+
+    private JBangDevModeLauncherImpl(CuratedApplication curatedApp, Closeable runningApp) {
+        this.curatedApp = curatedApp;
+        this.runningApp = runningApp;
+    }
+
+    @Override
+    public void close() throws IOException {
+        try {
+            if (runningApp != null) {
+                runningApp.close();
+            }
+        } finally {
+            if (curatedApp != null) {
+                curatedApp.close();
+            }
+        }
+    }
+
+    private static String getQuarkusVersion() {
+        try (InputStream in = JBangDevModeLauncherImpl.class.getClassLoader().getResourceAsStream("quarkus-version.txt")) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            byte[] buf = new byte[10];
+            int r;
+            while ((r = in.read(buf)) > 0) {
+                out.write(buf, 0, r);
+            }
+            return new String(out.toByteArray(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java
index babc69bd05341..d067c4a3a30da 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/utils/BuildToolHelper.java
@@ -1,6 +1,8 @@
 package io.quarkus.bootstrap.utils;
 
 import static io.quarkus.bootstrap.util.QuarkusModelHelper.DEVMODE_REQUIRED_TASKS;
+import static io.quarkus.bootstrap.util.QuarkusModelHelper.ENABLE_JAR_PACKAGING;
+import static io.quarkus.bootstrap.util.QuarkusModelHelper.TEST_REQUIRED_TASKS;
 
 import io.quarkus.bootstrap.resolver.AppModelResolverException;
 import io.quarkus.bootstrap.resolver.QuarkusGradleModelFactory;
@@ -9,24 +11,37 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
+import org.jboss.logging.Logger;
 
 /**
  * Helper class used to expose build tool used by the project
  */
 public class BuildToolHelper {
 
+    private static final Logger log = Logger.getLogger(BuildToolHelper.class);
+
     public enum BuildTool {
         MAVEN("pom.xml"),
-        GRADLE("build.gradle");
+        GRADLE("build.gradle", "build.gradle.kts");
 
-        private final String buildFile;
+        private final String[] buildFiles;
 
-        BuildTool(String buildFile) {
-            this.buildFile = buildFile;
+        BuildTool(String... buildFile) {
+            this.buildFiles = buildFile;
         }
 
-        public String getBuildFile() {
-            return buildFile;
+        public String[] getBuildFiles() {
+            return buildFiles;
+        }
+
+        public boolean exists(Path root) {
+            for (String buildFile : buildFiles) {
+                if (Files.exists(root.resolve(buildFile))) {
+                    return true;
+                }
+            }
+            return false;
         }
     }
 
@@ -34,24 +49,33 @@ private BuildToolHelper() {
 
     }
 
-    public static boolean isMavenProject(Path project) {
+    public static BuildTool findBuildTool(Path project) {
         Path currentPath = project;
         while (currentPath != null) {
-            if (Files.exists(currentPath.resolve(BuildTool.MAVEN.getBuildFile()))) {
-                return true;
+            if (BuildTool.MAVEN.exists(currentPath)) {
+                return BuildTool.MAVEN;
             }
-            if (Files.exists(currentPath.resolve(BuildTool.GRADLE.getBuildFile()))) {
-                return false;
+            if (BuildTool.GRADLE.exists(currentPath)) {
+                return BuildTool.GRADLE;
             }
             currentPath = currentPath.getParent();
         }
-        return false;
+        log.warnv("Unable to find a build tool in {0} or in any parent.", project.toString());
+        return null;
+    }
+
+    public static boolean isMavenProject(Path project) {
+        return findBuildTool(project) == BuildTool.MAVEN;
+    }
+
+    public static boolean isGradleProject(Path project) {
+        return findBuildTool(project) == BuildTool.GRADLE;
     }
 
     public static Path getBuildFile(Path project, BuildTool tool) {
         Path currentPath = project;
         while (currentPath != null) {
-            if (Files.exists(currentPath.resolve(tool.getBuildFile()))) {
+            if (tool.exists(currentPath)) {
                 return currentPath;
             }
             currentPath = currentPath.getParent();
@@ -59,25 +83,32 @@ public static Path getBuildFile(Path project, BuildTool tool) {
         return null;
     }
 
-    public static QuarkusModel enableGradleAppModel(Path projectRoot, String mode)
+    public static QuarkusModel enableGradleAppModelForTest(Path projectRoot)
+            throws IOException, AppModelResolverException {
+        // We enable jar packaging since we want test-fixtures as jars
+        return enableGradleAppModel(projectRoot, "TEST", ENABLE_JAR_PACKAGING, TEST_REQUIRED_TASKS);
+    }
+
+    public static QuarkusModel enableGradleAppModel(Path projectRoot, String mode, List<String> jvmArgs, String... tasks)
             throws IOException, AppModelResolverException {
-        if (isMavenProject(projectRoot)) {
-            return null;
+        if (isGradleProject(projectRoot)) {
+            final QuarkusModel model = QuarkusGradleModelFactory.create(getBuildFile(projectRoot, BuildTool.GRADLE).toFile(),
+                    mode, jvmArgs, tasks);
+            QuarkusModelHelper.exportModel(model);
+            return model;
         }
-        final QuarkusModel model = QuarkusGradleModelFactory.create(getBuildFile(projectRoot, BuildTool.GRADLE).toFile(),
-                mode);
-        QuarkusModelHelper.exportModel(model);
-        return model;
+        return null;
     }
 
-    public static QuarkusModel enableGradleAppModelForDevMode(Path projectRoot) throws IOException, AppModelResolverException {
-        if (isMavenProject(projectRoot)) {
-            return null;
+    public static QuarkusModel enableGradleAppModelForDevMode(Path projectRoot)
+            throws IOException, AppModelResolverException {
+        if (isGradleProject(projectRoot)) {
+            final QuarkusModel model = QuarkusGradleModelFactory
+                    .createForTasks(getBuildFile(projectRoot, BuildTool.GRADLE).toFile(), DEVMODE_REQUIRED_TASKS);
+            QuarkusModelHelper.exportModel(model);
+            return model;
         }
-        final QuarkusModel model = QuarkusGradleModelFactory
-                .createForTasks(getBuildFile(projectRoot, BuildTool.GRADLE).toFile(), DEVMODE_REQUIRED_TASKS);
-        QuarkusModelHelper.exportModel(model);
-        return model;
+        return null;
     }
 
 }
diff --git a/independent-projects/bootstrap/core/src/main/resources/quarkus-version.txt b/independent-projects/bootstrap/core/src/main/resources/quarkus-version.txt
new file mode 100644
index 0000000000000..f2ab45c3b0ef0
--- /dev/null
+++ b/independent-projects/bootstrap/core/src/main/resources/quarkus-version.txt
@@ -0,0 +1 @@
+${project.version}
\ No newline at end of file
diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java
index d9d91d65aee74..611d70bc06df7 100644
--- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java
+++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/classloader/ClassLoadingResourceUrlTestCase.java
@@ -4,6 +4,7 @@
 import io.quarkus.bootstrap.classloading.JarClassPathElement;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.bootstrap.util.IoUtils;
+import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -51,6 +52,36 @@ public void testUrlReturnedFromClassLoaderDirectory() throws Exception {
         }
     }
 
+    /**
+     * Test that {@link QuarkusClassLoader#getResourceAsStream(String)} returns a stream for directory
+     * resources
+     *
+     * @throws Exception
+     * @see <a href="https://github.com/quarkusio/quarkus/issues/11707"/>
+     */
+    @Test
+    public void testResourceAsStreamForDirectory() throws Exception {
+        final JavaArchive jar = ShrinkWrap.create(JavaArchive.class)
+                .add(new StringAsset("a"), "a.txt")
+                .add(new StringAsset("b"), "b/b.txt");
+        final Path tmpDir = Files.createTempDirectory("test");
+        try {
+            jar.as(ExplodedExporter.class).exportExploded(tmpDir.toFile(), "tmpcltest");
+            final ClassLoader cl = QuarkusClassLoader.builder("test", getClass().getClassLoader(), false)
+                    .addElement(new DirectoryClassPathElement(tmpDir.resolve("tmpcltest")))
+                    .build();
+
+            try (final InputStream is = cl.getResourceAsStream("b/")) {
+                Assertions.assertNotNull(is, "InputStream is null for a directory resource");
+            }
+            try (final InputStream is = cl.getResourceAsStream("b")) {
+                Assertions.assertNotNull(is, "InputStream is null for a directory resource");
+            }
+        } finally {
+            IoUtils.recursiveDelete(tmpDir);
+        }
+    }
+
     /**
      * URLClassLoader will return URL's that end with a / if the call to getResource ends with a /
      */
diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java
index 63c2477a8b3ab..eeb73815d29e7 100644
--- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java
+++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java
@@ -60,17 +60,21 @@ protected TsArtifact install(TsArtifact dep, boolean collected) {
     }
 
     protected TsArtifact install(TsArtifact dep, String collectedInScope) {
-        return install(dep, null, collectedInScope);
+        return install(dep, null, collectedInScope, false);
+    }
+
+    protected TsArtifact install(TsArtifact dep, String collectedInScope, boolean optional) {
+        return install(dep, null, collectedInScope, optional);
     }
 
     protected TsArtifact install(TsArtifact dep, Path p, boolean collected) {
-        return install(dep, p, collected ? "compile" : null);
+        return install(dep, p, collected ? "compile" : null, false);
     }
 
-    protected TsArtifact install(TsArtifact dep, Path p, String collectedInScope) {
+    protected TsArtifact install(TsArtifact dep, Path p, String collectedInScope, boolean optional) {
         install(dep, p);
         if (collectedInScope != null) {
-            addCollectedDep(dep, collectedInScope, false);
+            addCollectedDep(dep, collectedInScope, optional);
         }
         return dep;
     }
diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java
index 0c0ce53933351..ca5ed97db1539 100644
--- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java
+++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java
@@ -58,7 +58,7 @@ protected boolean cleanWorkDir() {
 
     protected BootstrapAppModelResolver initResolver(LocalProject currentProject) throws Exception {
         return new BootstrapAppModelResolver(MavenArtifactResolver.builder()
-                .setRepoHome(repoHome)
+                .setLocalRepository(repoHome.toString())
                 .setOffline(true)
                 .setWorkspaceDiscovery(false)
                 .setCurrentProject(currentProject)
diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java
index 79a62fd4fe59b..e65a602d63c7d 100644
--- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java
+++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsArtifact.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import java.util.function.Supplier;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
@@ -112,12 +113,28 @@ public TsArtifact addDependency(TsArtifact dep) {
         return addDependency(new TsDependency(dep));
     }
 
+    public TsArtifact addDependency(TsArtifact dep, TsArtifact... excludes) {
+        return addDependency(new TsDependency(dep).exclude(excludes));
+    }
+
     public TsArtifact addDependency(TsQuarkusExt dep) {
+        return addDependency(dep, false);
+    }
+
+    public TsArtifact addDependency(TsQuarkusExt dep, boolean optional) {
+        return addDependency(dep, () -> new TsDependency(dep.getRuntime(), optional));
+    }
+
+    public TsArtifact addDependency(TsQuarkusExt dep, TsArtifact... excludes) {
+        return addDependency(dep, () -> new TsDependency(dep.getRuntime(), false).exclude(excludes));
+    }
+
+    private TsArtifact addDependency(TsQuarkusExt dep, Supplier<TsDependency> dependencyFactory) {
         if (extDeps.isEmpty()) {
             extDeps = new ArrayList<>(1);
         }
         extDeps.add(dep);
-        return addDependency(new TsDependency(dep.getRuntime()));
+        return addDependency(dependencyFactory.get());
     }
 
     public TsArtifact addDependency(TsDependency dep) {
diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java
index fb34a24c61995..25577c3a3642d 100644
--- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java
+++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsDependency.java
@@ -51,6 +51,13 @@ public TsDependency exclude(TsArtifact artifact) {
         return this;
     }
 
+    public TsDependency exclude(TsArtifact... artifacts) {
+        for (TsArtifact artifact : artifacts) {
+            exclude(artifact);
+        }
+        return this;
+    }
+
     public Dependency toPomDependency() {
         final Dependency dep = new Dependency();
         dep.setGroupId(artifact.groupId);
diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/OnlyDirectOptionalDepsAreCollectedTestCase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/OnlyDirectOptionalDepsAreCollectedTestCase.java
index 8503b4cc858be..619d5b8bd4f8f 100644
--- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/OnlyDirectOptionalDepsAreCollectedTestCase.java
+++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/test/OnlyDirectOptionalDepsAreCollectedTestCase.java
@@ -15,10 +15,14 @@ protected void setupDependencies() {
         installAsDep(new TsDependency(new TsArtifact("required-dep-a"), "compile"), true);
         installAsDep(new TsDependency(new TsArtifact("required-dep-b"), "runtime"), true);
 
+        final TsArtifact nonOptionalCommon = new TsArtifact("non-optional-common");
+        install(nonOptionalCommon, "compile", true);
+
         installAsDep(
                 new TsDependency(
                         new TsArtifact("optional-dep")
                                 .addDependency(new TsDependency(new TsArtifact("common", "1"), true))
+                                .addDependency(new TsDependency(nonOptionalCommon, false))
                                 .addDependency(new TsDependency(new TsArtifact("other", "1"), true)),
                         true),
                 true);
diff --git a/independent-projects/bootstrap/gradle-resolver/pom.xml b/independent-projects/bootstrap/gradle-resolver/pom.xml
index 288d1ffe8bad0..c571163817ff0 100644
--- a/independent-projects/bootstrap/gradle-resolver/pom.xml
+++ b/independent-projects/bootstrap/gradle-resolver/pom.xml
@@ -22,9 +22,13 @@
             <groupId>org.gradle</groupId>
             <artifactId>gradle-tooling-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -32,4 +36,53 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <!--
+                 We are bundling the Gradle Tooling API classes
+                 to avoid the need to configure the gradle libs artifact repository
+                 in Quarkus application projects to be able to resolve it.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.gradle:gradle-tooling-api</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>gradle-dependencies</id>
+            <name>Gradle releases repository</name>
+            <url>https://repo.gradle.org/gradle/libs-releases</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+</project>
diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java
index 8f025f98f159f..46db36ca3cb52 100644
--- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java
+++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/QuarkusGradleModelFactory.java
@@ -2,16 +2,24 @@
 
 import io.quarkus.bootstrap.resolver.model.QuarkusModel;
 import java.io.File;
+import java.util.Collections;
+import java.util.List;
 import org.gradle.tooling.GradleConnector;
 import org.gradle.tooling.ModelBuilder;
 import org.gradle.tooling.ProjectConnection;
 
 public class QuarkusGradleModelFactory {
 
-    public static QuarkusModel create(File projectDir, String mode) {
+    public static QuarkusModel create(File projectDir, String mode, String... tasks) {
+        return create(projectDir, mode, Collections.emptyList(), tasks);
+    }
+
+    public static QuarkusModel create(File projectDir, String mode, List<String> jvmArgs, String... tasks) {
         try (ProjectConnection connection = GradleConnector.newConnector()
                 .forProjectDirectory(projectDir)
                 .connect()) {
+            connection.newBuild().forTasks(tasks).addJvmArguments(jvmArgs).run();
+
             return connection.action(new QuarkusModelBuildAction(mode)).run();
         }
     }
@@ -21,7 +29,9 @@ public static QuarkusModel createForTasks(File projectDir, String... tasks) {
                 .forProjectDirectory(projectDir)
                 .connect()) {
             final ModelBuilder<QuarkusModel> modelBuilder = connection.model(QuarkusModel.class);
-            modelBuilder.forTasks(tasks);
+            if (tasks.length != 0) {
+                modelBuilder.forTasks(tasks);
+            }
             return modelBuilder.get();
         }
     }
diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/QuarkusModel.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/QuarkusModel.java
index 735a74cec8a2e..0bbce30921df5 100644
--- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/QuarkusModel.java
+++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/QuarkusModel.java
@@ -1,13 +1,17 @@
 package io.quarkus.bootstrap.resolver.model;
 
-import java.util.Set;
+import java.util.List;
+import java.util.Map;
 
 public interface QuarkusModel {
 
     Workspace getWorkspace();
 
-    Set<Dependency> getAppDependencies();
+    List<Dependency> getAppDependencies();
 
-    Set<Dependency> getExtensionDependencies();
+    List<Dependency> getExtensionDependencies();
 
+    List<Dependency> getEnforcedPlatformDependencies();
+
+    Map<String, String> getPlatformProperties();
 }
diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/QuarkusModelImpl.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/QuarkusModelImpl.java
index 3dd21461a4da0..4c6fdfc3facf4 100644
--- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/QuarkusModelImpl.java
+++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/QuarkusModelImpl.java
@@ -4,20 +4,35 @@
 import io.quarkus.bootstrap.resolver.model.QuarkusModel;
 import io.quarkus.bootstrap.resolver.model.Workspace;
 import java.io.Serializable;
-import java.util.Set;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 public class QuarkusModelImpl implements QuarkusModel, Serializable {
 
     private final Workspace workspace;
-    private final Set<Dependency> appDependencies;
-    private final Set<Dependency> extensionDependencies;
+    private final List<Dependency> appDependencies;
+    private final List<Dependency> extensionDependencies;
+    private final List<Dependency> enforcedPlatformDependencies;
+    private final Map<String, String> platformProperties;
 
     public QuarkusModelImpl(Workspace workspace,
-            Set<Dependency> appDependencies,
-            Set<Dependency> extensionDependencies) {
+            List<Dependency> appDependencies,
+            List<Dependency> extensionDependencies,
+            List<Dependency> enforcedPlatformDependencies) {
+        this(workspace, appDependencies, extensionDependencies, enforcedPlatformDependencies, Collections.emptyMap());
+    }
+
+    public QuarkusModelImpl(Workspace workspace,
+            List<Dependency> appDependencies,
+            List<Dependency> extensionDependencies,
+            List<Dependency> enforcedPlatformDependencies,
+            Map<String, String> platformProperties) {
         this.workspace = workspace;
         this.appDependencies = appDependencies;
         this.extensionDependencies = extensionDependencies;
+        this.enforcedPlatformDependencies = enforcedPlatformDependencies;
+        this.platformProperties = platformProperties;
     }
 
     @Override
@@ -26,12 +41,22 @@ public Workspace getWorkspace() {
     }
 
     @Override
-    public Set<Dependency> getAppDependencies() {
+    public List<Dependency> getAppDependencies() {
         return appDependencies;
     }
 
     @Override
-    public Set<Dependency> getExtensionDependencies() {
+    public List<Dependency> getExtensionDependencies() {
         return extensionDependencies;
     }
+
+    @Override
+    public List<Dependency> getEnforcedPlatformDependencies() {
+        return enforcedPlatformDependencies;
+    }
+
+    @Override
+    public Map<String, String> getPlatformProperties() {
+        return platformProperties;
+    }
 }
diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/SourceSetImpl.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/SourceSetImpl.java
index d8a052accb667..acb4d5e372345 100644
--- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/SourceSetImpl.java
+++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/SourceSetImpl.java
@@ -3,19 +3,28 @@
 import io.quarkus.bootstrap.resolver.model.SourceSet;
 import java.io.File;
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SourceSetImpl implements SourceSet, Serializable {
 
-    private final Set<File> sourceDirectories;
-    private final File resourceDirectory;
+    private Set<File> sourceDirectories = new HashSet<>();
+    private File resourceDirectory;
 
     public SourceSetImpl(Set<File> sourceDirectories, File resourceDirectory) {
-        this.sourceDirectories = sourceDirectories;
+        this.sourceDirectories.addAll(sourceDirectories);
         this.resourceDirectory = resourceDirectory;
     }
 
+    public SourceSetImpl(Set<File> sourceDirectories) {
+        this.sourceDirectories.addAll(sourceDirectories);
+    }
+
+    public void addSourceDirectories(Set<File> files) {
+        sourceDirectories.addAll(files);
+    }
+
     @Override
     public Set<File> getSourceDirectories() {
         return sourceDirectories;
diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/WorkspaceImpl.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/WorkspaceImpl.java
index bba576057fc4a..339aacaebc6f6 100644
--- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/WorkspaceImpl.java
+++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/resolver/model/impl/WorkspaceImpl.java
@@ -35,4 +35,5 @@ public Collection<WorkspaceModule> getAllModules() {
     public WorkspaceModule getModule(ArtifactCoords key) {
         return modules.get(key);
     }
+
 }
diff --git a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java
index c90a7d07ef4c8..28efff18280f2 100644
--- a/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java
+++ b/independent-projects/bootstrap/gradle-resolver/src/main/java/io/quarkus/bootstrap/util/QuarkusModelHelper.java
@@ -15,6 +15,8 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
@@ -22,6 +24,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +38,11 @@ private QuarkusModelHelper() {
 
     }
 
+    public final static String SERIALIZED_QUARKUS_MODEL = "quarkus-internal.serialized-quarkus-model.path";
     public final static String[] DEVMODE_REQUIRED_TASKS = new String[] { "classes" };
+    public final static String[] TEST_REQUIRED_TASKS = new String[] { "classes", "testClasses" };
+    public final static List<String> ENABLE_JAR_PACKAGING = Collections
+            .singletonList("-Dorg.gradle.java.compile-classpath-packaging=true");
 
     public static void exportModel(QuarkusModel model) throws AppModelResolverException, IOException {
         Path serializedModel = QuarkusModelHelper
@@ -55,6 +62,28 @@ public static Path serializeAppModel(QuarkusModel model) throws AppModelResolver
         return serializedModel;
     }
 
+    public static Path serializeQuarkusModel(QuarkusModel model) throws IOException {
+        final Path serializedModel = File.createTempFile("quarkus-model", ".dat").toPath();
+        try (ObjectOutputStream out = new ObjectOutputStream(Files.newOutputStream(serializedModel))) {
+            out.writeObject(model);
+        }
+        return serializedModel;
+    }
+
+    public static QuarkusModel deserializeQuarkusModel(Path modelPath) throws BootstrapGradleException {
+        if (Files.exists(modelPath)) {
+            try (InputStream existing = Files.newInputStream(modelPath);
+                    ObjectInputStream object = new ObjectInputStream(existing)) {
+                QuarkusModel model = (QuarkusModel) object.readObject();
+                IoUtils.recursiveDelete(modelPath);
+                return model;
+            } catch (IOException | ClassNotFoundException e) {
+                throw new BootstrapGradleException("Failed to deserialize quarkus model", e);
+            }
+        }
+        throw new BootstrapGradleException("Unable to locate quarkus model");
+    }
+
     public static Path getClassPath(WorkspaceModule model) throws BootstrapGradleException {
         // TODO handle multiple class directory
         final Optional<Path> classDir = model.getSourceSet().getSourceDirectories().stream().filter(File::exists)
@@ -109,12 +138,23 @@ public static AppModel convert(QuarkusModel model, AppArtifact appArtifact) thro
             WorkspaceModule module = model.getWorkspace().getMainModule();
             module.getSourceSet().getSourceDirectories().stream().filter(File::exists).map(File::toPath)
                     .forEach(paths::add);
-            if (module.getSourceSet().getResourceDirectory().exists()) {
-                paths.add(module.getSourceSet().getResourceDirectory().toPath());
+            File resourceDirectory = module.getSourceSet().getResourceDirectory();
+            if (resourceDirectory != null && resourceDirectory.exists()) {
+                paths.add(resourceDirectory.toPath());
             }
             appArtifact.setPaths(paths.build());
         }
 
+        for (WorkspaceModule module : model.getWorkspace().getAllModules()) {
+            final ArtifactCoords coords = module.getArtifactCoords();
+            appBuilder.addLocalProjectArtifact(
+                    new AppArtifactKey(coords.getGroupId(), coords.getArtifactId(), null, coords.getType()));
+        }
+
+        if (!model.getPlatformProperties().isEmpty()) {
+            appBuilder.addPlatformProperties(model.getPlatformProperties());
+        }
+
         appBuilder.addRuntimeDeps(userDeps)
                 .addFullDeploymentDeps(fullDeploymentDeps)
                 .addDeploymentDeps(deploymentDeps)
@@ -123,10 +163,14 @@ public static AppModel convert(QuarkusModel model, AppArtifact appArtifact) thro
     }
 
     public static AppDependency toAppDependency(Dependency dependency) {
+        return new AppDependency(toAppArtifact(dependency), "runtime");
+    }
+
+    private static AppArtifact toAppArtifact(Dependency dependency) {
         AppArtifact artifact = new AppArtifact(dependency.getGroupId(), dependency.getName(), dependency.getClassifier(),
                 dependency.getType(), dependency.getVersion());
         artifact.setPaths(QuarkusModelHelper.toPathsCollection(dependency.getPaths()));
-        return new AppDependency(artifact, "runtime");
+        return artifact;
     }
 
     public static PathsCollection toPathsCollection(Collection<File> files) {
diff --git a/independent-projects/bootstrap/maven-plugin/pom.xml b/independent-projects/bootstrap/maven-plugin/pom.xml
index 45cdff43bf5b0..3196ea87ffc86 100644
--- a/independent-projects/bootstrap/maven-plugin/pom.xml
+++ b/independent-projects/bootstrap/maven-plugin/pom.xml
@@ -6,7 +6,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-bootstrap-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
     <name>Quarkus - Bootstrap - Maven plugin</name>
@@ -16,6 +15,21 @@
     </properties>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-component-metadata</artifactId>
+                <version>2.1.0</version>
+                <configuration>
+                    <staticMetadataDirectory>${basedir}/target/filtered-resources/META-INF/plexus</staticMetadataDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-metadata</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
@@ -42,6 +56,12 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-bootstrap-gradle-resolver</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -65,6 +85,10 @@
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/AbstractTreeMojo.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/AbstractTreeMojo.java
index 829b84cb12a28..5971390b59e4f 100644
--- a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/AbstractTreeMojo.java
+++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/AbstractTreeMojo.java
@@ -2,59 +2,29 @@
 
 import io.quarkus.bootstrap.model.AppArtifact;
 import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import java.util.List;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.repository.RemoteRepository;
 
 public class AbstractTreeMojo extends AbstractMojo {
-    /**
-     * The entry point to Aether, i.e. the component doing all the work.
-     *
-     * @component
-     */
-    @Component
-    protected RepositorySystem repoSystem;
-
-    /**
-     * The current repository/network configuration of Maven.
-     *
-     * @parameter default-value="${repositorySystemSession}"
-     * @readonly
-     */
-    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
-    protected RepositorySystemSession repoSession;
-
-    /**
-     * The project's remote repositories to use for the resolution of artifacts and their dependencies.
-     *
-     * @parameter default-value="${project.remoteProjectRepositories}"
-     * @readonly
-     */
-    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true)
-    protected List<RemoteRepository> repos;
 
     @Parameter(defaultValue = "${project}", readonly = true, required = true)
     protected MavenProject project;
 
+    protected MavenArtifactResolver resolver;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        final AppArtifact appArtifact = new AppArtifact(project.getGroupId(), project.getArtifactId(), project.getVersion());
+        final AppArtifact appArtifact = new AppArtifact(project.getGroupId(), project.getArtifactId(), null, "pom",
+                project.getVersion());
         final BootstrapAppModelResolver modelResolver;
         try {
-            modelResolver = new BootstrapAppModelResolver(
-                    MavenArtifactResolver.builder()
-                            .setRepositorySystem(repoSystem)
-                            .setRepositorySystemSession(repoSession)
-                            .setRemoteRepositories(repos)
-                            .build());
+            modelResolver = new BootstrapAppModelResolver(resolver());
             setupResolver(modelResolver);
             modelResolver.setBuildTreeLogger(s -> getLog().info(s));
             modelResolver.resolveModel(appArtifact);
@@ -63,6 +33,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
+    protected MavenArtifactResolver resolver() throws BootstrapMavenException {
+        return resolver == null ? resolver = new MavenArtifactResolver(new BootstrapMavenContext()) : resolver;
+    }
+
     protected void setupResolver(BootstrapAppModelResolver modelResolver) {
     }
 }
diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java
new file mode 100644
index 0000000000000..dc431e42efb59
--- /dev/null
+++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java
@@ -0,0 +1,36 @@
+package io.quarkus.maven;
+
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.codehaus.plexus.component.annotations.Component;
+
+@Component(role = BootstrapWorkspaceProvider.class, instantiationStrategy = "singleton")
+public class BootstrapWorkspaceProvider {
+
+    private final Path base;
+    private boolean loaded;
+    private LocalProject origin;
+
+    public BootstrapWorkspaceProvider() {
+        // load the workspace lazily on request, in case the component is injected but the logic using it is skipped 
+        base = Paths.get("").normalize().toAbsolutePath();
+    }
+
+    public LocalProject origin() {
+        if (!loaded) {
+            try {
+                origin = LocalProject.loadWorkspace(base);
+            } catch (BootstrapMavenException e) {
+            }
+            loaded = true;
+        }
+        return origin;
+    }
+
+    public LocalWorkspace workspace() {
+        return origin().getWorkspace();
+    }
+}
diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BuildTreeMojo.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BuildTreeMojo.java
index cf56f6e3c1119..af95e9110cec1 100644
--- a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BuildTreeMojo.java
+++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BuildTreeMojo.java
@@ -10,6 +10,6 @@
 /**
  * Displays Quarkus application build dependency tree including the deployment ones.
  */
-@Mojo(name = "build-tree", defaultPhase = LifecyclePhase.NONE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
+@Mojo(name = "build-tree", defaultPhase = LifecyclePhase.NONE, requiresDependencyResolution = ResolutionScope.NONE)
 public class BuildTreeMojo extends AbstractTreeMojo {
 }
diff --git a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
index 2ba76397c6ba2..4a3024af6bac7 100644
--- a/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
+++ b/independent-projects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -1,18 +1,22 @@
 package io.quarkus.maven;
 
-import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.json.JsonReadFeature;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.bootstrap.model.AppModel;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -23,12 +27,14 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Set;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -47,6 +53,7 @@
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.graph.DependencyVisitor;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.resolution.ArtifactDescriptorException;
 import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
@@ -64,11 +71,12 @@
  *
  * @author Alexey Loubyansky
  */
-@Mojo(name = "extension-descriptor", defaultPhase = LifecyclePhase.PROCESS_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
+@Mojo(name = "extension-descriptor", defaultPhase = LifecyclePhase.PROCESS_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
 public class ExtensionDescriptorMojo extends AbstractMojo {
 
     private static final String GROUP_ID = "group-id";
     private static final String ARTIFACT_ID = "artifact-id";
+    private static final String METADATA = "metadata";
 
     /**
      * The entry point to Aether, i.e. the component doing all the work.
@@ -78,6 +86,12 @@ public class ExtensionDescriptorMojo extends AbstractMojo {
     @Component
     private RepositorySystem repoSystem;
 
+    @Component
+    RemoteRepositoryManager remoteRepoManager;
+
+    @Component
+    BootstrapWorkspaceProvider workpaceProvider;
+
     /**
      * The current repository/network configuration of Maven.
      *
@@ -130,6 +144,15 @@ public class ExtensionDescriptorMojo extends AbstractMojo {
     @Parameter
     List<String> parentFirstArtifacts;
 
+    /**
+     * Artifacts that are always loaded parent when the fast-jar is used. This is an advanced option
+     * and should only be used if you are sure that this is the correct solution for the use case.
+     *
+     * A possible example of this would be logging libraries, as these need to be loaded by the system class loader.
+     */
+    @Parameter
+    List<String> runnerParentFirstArtifacts;
+
     /**
      * Artifacts that will only be used to load a class or resource if no other normal element exists.
      * This is an advanced option that should only be used when there is a case of multiple jars
@@ -141,6 +164,14 @@ public class ExtensionDescriptorMojo extends AbstractMojo {
     @Parameter(required = false, defaultValue = "${skipExtensionValidation}")
     private boolean skipExtensionValidation;
 
+    @Parameter(required = false, defaultValue = "${ignoreNotDetectedQuarkusCoreVersion")
+    boolean ignoreNotDetectedQuarkusCoreVersion;
+
+    AppArtifactCoords deploymentCoords;
+    CollectResult collectedDeploymentDeps;
+
+    MavenArtifactResolver resolver;
+
     @Override
     public void execute() throws MojoExecutionException {
 
@@ -157,6 +188,11 @@ public void execute() throws MojoExecutionException {
             props.put(AppModel.PARENT_FIRST_ARTIFACTS, val);
         }
 
+        if (runnerParentFirstArtifacts != null && !runnerParentFirstArtifacts.isEmpty()) {
+            String val = String.join(",", runnerParentFirstArtifacts);
+            props.put(AppModel.RUNNER_PARENT_FIRST_ARTIFACTS, val);
+        }
+
         if (excludedArtifacts != null && !excludedArtifacts.isEmpty()) {
             String val = String.join(",", excludedArtifacts);
             props.put(AppModel.EXCLUDED_ARTIFACTS, val);
@@ -253,6 +289,8 @@ public void execute() throws MojoExecutionException {
             extObject.put("description", project.getDescription());
         }
 
+        setBuiltWithQuarkusCoreVersion(mapper, extObject);
+
         final DefaultPrettyPrinter prettyPrinter = new DefaultPrettyPrinter();
         prettyPrinter.indentArraysWith(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE);
 
@@ -265,19 +303,35 @@ public void execute() throws MojoExecutionException {
         }
     }
 
-    private void validateExtensionDeps() throws MojoExecutionException {
+    private void setBuiltWithQuarkusCoreVersion(ObjectMapper mapper, ObjectNode extObject) throws MojoExecutionException {
+        final QuarkusCoreDeploymentVersionLocator coreVersionLocator = new QuarkusCoreDeploymentVersionLocator();
+        collectDeploymentDeps().getRoot().accept(coreVersionLocator);
+        if (coreVersionLocator.coreVersion != null) {
+            ObjectNode metadata;
+            JsonNode mvalue = extObject.get(METADATA);
+            if (mvalue != null && mvalue.isObject()) {
+                metadata = (ObjectNode) mvalue;
+            } else {
+                metadata = mapper.createObjectNode();
+            }
+            metadata.put("built-with-quarkus-core", coreVersionLocator.coreVersion);
+            extObject.set(METADATA, metadata);
+        } else if (!ignoreNotDetectedQuarkusCoreVersion) {
+            throw new MojoExecutionException("Failed to determine the Quarkus core version used to build the extension");
+        }
 
-        final AppArtifactCoords deploymentCoords = AppArtifactCoords.fromString(deployment);
+    }
+
+    private void validateExtensionDeps() throws MojoExecutionException {
 
-        final AppArtifactKey rootDeploymentGact = deploymentCoords.getKey();
-        final Node rootDeployment = new Node(null, rootDeploymentGact, 2);
+        final AppArtifactKey rootDeploymentGact = getDeploymentCoords().getKey();
+        final RootNode rootDeployment = new RootNode(rootDeploymentGact, 2);
         final Artifact artifact = project.getArtifact();
         final Node rootRuntime = rootDeployment.newChild(new AppArtifactKey(artifact.getGroupId(), artifact.getArtifactId(),
                 artifact.getClassifier(), artifact.getType()), 1);
 
-        final Map<AppArtifactKey, Node> expectedExtensionDeps = new HashMap<>();
-        expectedExtensionDeps.put(rootDeploymentGact, rootDeployment);
-        expectedExtensionDeps.put(rootRuntime.gact, rootRuntime);
+        rootDeployment.expectedDeploymentNodes.put(rootDeployment.gact, rootDeployment);
+        rootDeployment.expectedDeploymentNodes.put(rootRuntime.gact, rootRuntime);
         // collect transitive extension deps
         final DependencyResult resolvedDeps;
 
@@ -293,101 +347,250 @@ private void validateExtensionDeps() throws MojoExecutionException {
             throw new MojoExecutionException("Failed to resolve dependencies of " + project.getArtifact(), e);
         }
 
-        final AtomicInteger extDepsTotal = new AtomicInteger(2);
-        resolvedDeps.getRoot().accept(new DependencyVisitor() {
-            Node currentNode = rootDeployment;
-            int currentNodeId = rootDeployment.id;
-
-            @Override
-            public boolean visitEnter(DependencyNode node) {
-                ++currentNodeId;
-                org.eclipse.aether.artifact.Artifact a = node.getArtifact();
-                final File f = a.getFile();
-                // if it hasn't been packaged yet, we skip it, we are not packaging yet
-                if (isAnalyzable(f)) {
-                    try (FileSystem fs = FileSystems.newFileSystem(f.toPath(), (ClassLoader) null)) {
-                        final Path extDescr = fs.getPath(BootstrapConstants.DESCRIPTOR_PATH);
-                        if (Files.exists(extDescr)) {
-                            final Properties props = new Properties();
-                            try (BufferedReader reader = Files.newBufferedReader(extDescr)) {
-                                props.load(reader);
-                            }
-                            final String deploymentStr = props.getProperty(BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT);
-                            if (deploymentStr == null) {
-                                throw new IllegalStateException("Quarkus extension runtime artifact " + a + " is missing "
-                                        + BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT + " property in its "
-                                        + BootstrapConstants.DESCRIPTOR_PATH);
-                            }
-                            currentNode = currentNode.newChild(AppArtifactCoords.fromString(deploymentStr).getKey(),
-                                    currentNodeId);
-                            expectedExtensionDeps.put(currentNode.gact, currentNode);
-                            extDepsTotal.incrementAndGet();
-                        }
-                    } catch (IOException e) {
-                        throw new IllegalStateException("Failed to read " + f, e);
+        for (DependencyNode node : resolvedDeps.getRoot().getChildren()) {
+            rootDeployment.directRuntimeDeps.add(toKey(node.getArtifact()));
+        }
+        visitRuntimeDeps(rootDeployment, rootDeployment, rootDeployment.id, resolvedDeps.getRoot());
+
+        final DependencyNode deploymentNode = collectDeploymentDeps().getRoot();
+        visitDeploymentDeps(rootDeployment, deploymentNode);
+
+        if (rootDeployment.hasErrors()) {
+            final Log log = getLog();
+            log.error("Quarkus Extension Dependency Verification Error");
+
+            final StringBuilder buf = new StringBuilder();
+
+            if (rootDeployment.deploymentDepsTotal != 0) {
+                log.error("Deployment artifact " + getDeploymentCoords() +
+                        " was found to be missing dependencies on the Quarkus extension artifacts marked with '-' below:");
+                final List<AppArtifactKey> missing = rootDeployment.collectMissingDeploymentDeps(log);
+                buf.append("Deployment artifact ");
+                buf.append(getDeploymentCoords());
+                buf.append(" is missing the following dependencies from its configuration: ");
+                final Iterator<AppArtifactKey> i = missing.iterator();
+                buf.append(i.next());
+                while (i.hasNext()) {
+                    buf.append(", ").append(i.next());
+                }
+            }
+
+            if (!rootDeployment.deploymentsOnRtCp.isEmpty()) {
+                if (rootDeployment.runtimeCp > 0) {
+                    log.error("The following deployment artifact(s) appear on the runtime classpath: ");
+                    rootDeployment.collectDeploymentsOnRtCp(log);
+                }
+                if (buf.length() > 0) {
+                    buf.append(System.lineSeparator());
+                }
+                buf.append("The following deployment artifact(s) appear on the runtime classpath: ");
+                final Iterator<AppArtifactKey> i = rootDeployment.deploymentsOnRtCp.iterator();
+                buf.append(i.next());
+                while (i.hasNext()) {
+                    buf.append(", ").append(i.next());
+                }
+            }
+
+            if (!rootDeployment.unexpectedDeploymentDeps.isEmpty()) {
+                final List<AppArtifactKey> unexpectedRtDeps = new ArrayList<>(0);
+                final List<AppArtifactKey> unexpectedDeploymentDeps = new ArrayList<>(0);
+                for (Map.Entry<AppArtifactKey, org.eclipse.aether.artifact.Artifact> e : rootDeployment.unexpectedDeploymentDeps
+                        .entrySet()) {
+                    if (rootDeployment.allDeploymentDeps.contains(e.getKey())) {
+                        unexpectedDeploymentDeps.add(e.getKey());
+                    } else {
+                        unexpectedRtDeps.add(toKey(e.getValue()));
                     }
                 }
-                return true;
+
+                if (!unexpectedRtDeps.isEmpty()) {
+                    if (buf.length() > 0) {
+                        buf.append(System.lineSeparator());
+                    }
+                    buf.append("The deployment artifact " + rootDeploymentGact
+                            + " depends on the following Quarkus extension runtime artifacts that weren't found among the dependencies of "
+                            + project.getArtifact() + ":");
+                    for (AppArtifactKey a : unexpectedRtDeps) {
+                        buf.append(' ').append(a);
+                    }
+                    log.error("The deployment artifact " + rootDeploymentGact
+                            + " depends on the following Quarkus extension runtime artifacts that weren't found among the dependencies of "
+                            + project.getArtifact() + ":");
+                    highlightInTree(deploymentNode, unexpectedRtDeps);
+                }
+
+                if (!unexpectedDeploymentDeps.isEmpty()) {
+                    if (buf.length() > 0) {
+                        buf.append(System.lineSeparator());
+                    }
+                    buf.append("The deployment artifact " + rootDeploymentGact
+                            + " depends on the following Quarkus extension deployment artifacts whose corresponding runtime artifacts were not found among the dependencies of "
+                            + project.getArtifact() + ":");
+                    for (AppArtifactKey a : unexpectedDeploymentDeps) {
+                        buf.append(' ').append(a);
+                    }
+                    log.error("The deployment artifact " + rootDeploymentGact
+                            + " depends on the following Quarkus extension deployment artifacts whose corresponding runtime artifacts were not found among the dependencies of "
+                            + project.getArtifact() + ":");
+                    highlightInTree(deploymentNode, unexpectedDeploymentDeps);
+                }
             }
 
-            @Override
-            public boolean visitLeave(DependencyNode node) {
-                if (currentNodeId == currentNode.id && currentNode.parent != null) {
-                    currentNode = currentNode.parent;
+            throw new MojoExecutionException(buf.toString());
+        }
+
+    }
+
+    private void highlightInTree(DependencyNode node, Collection<AppArtifactKey> keys) {
+        highlightInTree(0, node, keys, new HashSet<>(), new StringBuilder(), new ArrayList<>());
+    }
+
+    private void highlightInTree(int depth, DependencyNode node, Collection<AppArtifactKey> keysToHighlight,
+            Set<AppArtifactKey> visited, StringBuilder buf, List<String> branch) {
+        final AppArtifactKey key = toKey(node.getArtifact());
+        if (!visited.add(key)) {
+            return;
+        }
+        buf.setLength(0);
+        final boolean highlighted = keysToHighlight.contains(key);
+        if (highlighted) {
+            buf.append('*');
+        } else {
+            buf.append(' ');
+        }
+        for (int i = 0; i < depth; ++i) {
+            buf.append("  ");
+        }
+        buf.append(node.getArtifact());
+        branch.add(buf.toString());
+        if (!highlighted) {
+            for (DependencyNode child : node.getChildren()) {
+                highlightInTree(depth + 1, child, keysToHighlight, visited, buf, branch);
+            }
+        } else {
+            for (String line : branch) {
+                getLog().error(line);
+            }
+        }
+        branch.remove(branch.size() - 1);
+    }
+
+    private void visitDeploymentDeps(RootNode rootDeployment, DependencyNode dep) throws MojoExecutionException {
+        for (DependencyNode child : dep.getChildren()) {
+            visitDeploymentDep(rootDeployment, child);
+        }
+    }
+
+    private void visitDeploymentDep(RootNode rootDeployment, DependencyNode dep) throws MojoExecutionException {
+        org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
+        if (artifact == null) {
+            return;
+        }
+        final AppArtifactKey key = toKey(artifact);
+        if (!rootDeployment.allDeploymentDeps.add(key)) {
+            return;
+        }
+        final Node node = rootDeployment.expectedDeploymentNodes.get(key);
+        if (node != null && !node.present) {
+            node.present = true;
+            --rootDeployment.deploymentDepsTotal;
+        } else if (!rootDeployment.allRtDeps.contains(key)) {
+            final AppArtifactKey deployment = getDeploymentKey(artifact);
+            if (deployment != null) {
+                rootDeployment.unexpectedDeploymentDeps.put(deployment, artifact);
+            }
+        }
+        visitDeploymentDeps(rootDeployment, dep);
+    }
+
+    private void visitRuntimeDep(RootNode root, Node currentNode, int currentId,
+            DependencyNode node) throws MojoExecutionException {
+        final org.eclipse.aether.artifact.Artifact a = node.getArtifact();
+        root.allRtDeps.add(toKey(a));
+        final AppArtifactKey deployment = getDeploymentKey(a);
+        if (deployment != null) {
+            currentNode = currentNode.newChild(deployment, ++currentId);
+            root.expectedDeploymentNodes.put(currentNode.gact, currentNode);
+            ++root.deploymentDepsTotal;
+            if (root.allRtDeps.contains(deployment)) {
+                root.deploymentsOnRtCp.add(deployment);
+                if (root.directRuntimeDeps.contains(deployment)) {
+                    currentNode.runtimeCp = 2; // actual rt dep
+                    Node n = currentNode.parent;
+                    while (n != null) {
+                        if (n.runtimeCp != 0) {
+                            break;
+                        } else {
+                            n.runtimeCp = 1; // path to the actual rt dep
+                        }
+                        n = n.parent;
+                    }
                 }
-                --currentNodeId;
-                return true;
             }
-        });
+        }
+        visitRuntimeDeps(root, currentNode, currentId, node);
+    }
 
-        final CollectResult collectedDeploymentDeps;
+    private void visitRuntimeDeps(RootNode root, Node currentNode, int currentId, DependencyNode node)
+            throws MojoExecutionException {
+        for (DependencyNode child : node.getChildren()) {
+            visitRuntimeDep(root, currentNode, currentId, child);
+        }
+    }
+
+    private AppArtifactKey getDeploymentKey(org.eclipse.aether.artifact.Artifact a) throws MojoExecutionException {
+        final File f;
         try {
-            collectedDeploymentDeps = repoSystem.collectDependencies(repoSession,
-                    newCollectRequest(new DefaultArtifact(deploymentCoords.getGroupId(), deploymentCoords.getArtifactId(),
-                            deploymentCoords.getClassifier(), deploymentCoords.getType(), deploymentCoords.getVersion())));
+            f = resolve(a);
         } catch (Exception e) {
-            throw new MojoExecutionException("Failed to collect dependencies of deployment artifact " + deploymentCoords, e);
+            getLog().warn("Failed to resolve " + a);
+            return null;
         }
-
-        collectedDeploymentDeps.getRoot().accept(new DependencyVisitor() {
-            @Override
-            public boolean visitEnter(DependencyNode dep) {
-                org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
-                if (artifact == null) {
-                    return true;
-                }
-                final Node node = expectedExtensionDeps.get(new AppArtifactKey(artifact.getGroupId(), artifact.getArtifactId(),
-                        artifact.getClassifier(), artifact.getExtension()));
-                if (node != null && !node.included) {
-                    node.included = true;
-                    extDepsTotal.decrementAndGet();
+        // if it hasn't been packaged yet, we skip it, we are not packaging yet
+        if (isAnalyzable(f)) {
+            try (FileSystem fs = FileSystems.newFileSystem(f.toPath(), (ClassLoader) null)) {
+                final Path extDescr = fs.getPath(BootstrapConstants.DESCRIPTOR_PATH);
+                if (Files.exists(extDescr)) {
+                    final Properties props = new Properties();
+                    try (BufferedReader reader = Files.newBufferedReader(extDescr)) {
+                        props.load(reader);
+                    }
+                    final String deploymentStr = props.getProperty(BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT);
+                    if (deploymentStr == null) {
+                        throw new IllegalStateException("Quarkus extension runtime artifact " + a + " is missing "
+                                + BootstrapConstants.PROP_DEPLOYMENT_ARTIFACT + " property in its "
+                                + BootstrapConstants.DESCRIPTOR_PATH);
+                    }
+                    return AppArtifactCoords.fromString(deploymentStr).getKey();
                 }
-                return true;
+            } catch (Throwable e) {
+                throw new IllegalStateException("Failed to read " + f, e);
             }
+        }
+        return null;
+    }
 
-            @Override
-            public boolean visitLeave(DependencyNode node) {
-                return true;
-            }
-        });
+    private static AppArtifactKey toKey(org.eclipse.aether.artifact.Artifact a) {
+        return new AppArtifactKey(a.getGroupId(), a.getArtifactId(), a.getClassifier(), a.getExtension());
+    }
 
-        if (extDepsTotal.intValue() != 0) {
-            final Log log = getLog();
-            log.error("Quarkus Extension Dependency Verification Error");
-            log.error("Deployment artifact " + deploymentCoords +
-                    " was found to be missing dependencies on Quarkus extension artifacts marked with '-' below:");
-            final List<AppArtifactKey> missing = rootDeployment.collectMissing(log);
-            final StringBuilder buf = new StringBuilder();
-            buf.append("Deployment artifact ");
-            buf.append(deploymentCoords);
-            buf.append(" is missing the following dependencies from its configuration: ");
-            final Iterator<AppArtifactKey> i = missing.iterator();
-            buf.append(i.next());
-            while (i.hasNext()) {
-                buf.append(", ").append(i.next());
+    private CollectResult collectDeploymentDeps() throws MojoExecutionException {
+        if (collectedDeploymentDeps == null) {
+            final AppArtifactCoords deploymentCoords = getDeploymentCoords();
+            try {
+                collectedDeploymentDeps = repoSystem.collectDependencies(repoSession,
+                        newCollectRequest(new DefaultArtifact(deploymentCoords.getGroupId(), deploymentCoords.getArtifactId(),
+                                deploymentCoords.getClassifier(), deploymentCoords.getType(), deploymentCoords.getVersion())));
+            } catch (Exception e) {
+                throw new MojoExecutionException("Failed to collect dependencies of deployment artifact " + deploymentCoords,
+                        e);
             }
-            throw new MojoExecutionException(buf.toString());
         }
+        return collectedDeploymentDeps;
+    }
+
+    private AppArtifactCoords getDeploymentCoords() {
+        return deploymentCoords == null ? deploymentCoords = AppArtifactCoords.fromString(deployment) : deploymentCoords;
     }
 
     private CollectRequest newCollectRequest(DefaultArtifact projectArtifact) throws MojoExecutionException {
@@ -436,7 +639,7 @@ private void transformLegacyToNew(final Path output, ObjectNode extObject, Objec
             extObject.remove("artifactId");
         }
 
-        JsonNode mvalue = extObject.get("metadata");
+        JsonNode mvalue = extObject.get(METADATA);
         if (mvalue != null && mvalue.isObject()) {
             metadata = (ObjectNode) mvalue;
         } else {
@@ -458,7 +661,7 @@ private void transformLegacyToNew(final Path output, ObjectNode extObject, Objec
             extObject.remove("shortName");
         }
 
-        extObject.set("metadata", metadata);
+        extObject.set(METADATA, metadata);
 
     }
 
@@ -480,11 +683,59 @@ private ObjectMapper getMapper(boolean yaml) {
         if (yaml) {
             YAMLFactory yf = new YAMLFactory();
             return new ObjectMapper(yf)
-                    .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+                    .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE);
         } else {
-            return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT)
-                    .enable(JsonParser.Feature.ALLOW_COMMENTS).enable(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS)
-                    .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
+            return JsonMapper.builder()
+                    .enable(SerializationFeature.INDENT_OUTPUT)
+                    .enable(JsonReadFeature.ALLOW_JAVA_COMMENTS)
+                    .enable(JsonReadFeature.ALLOW_LEADING_ZEROS_FOR_NUMBERS)
+                    .propertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE)
+                    .build();
+        }
+    }
+
+    private static final class QuarkusCoreDeploymentVersionLocator implements DependencyVisitor {
+        String coreVersion;
+        private boolean skipTheRest;
+
+        @Override
+        public boolean visitEnter(DependencyNode dep) {
+            if (skipTheRest) {
+                return false;
+            }
+            org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
+            if (artifact != null && artifact.getArtifactId().equals("quarkus-core")) {
+                coreVersion = artifact.getVersion();
+                if ("io.quarkus".equals(artifact.getGroupId())) {
+                    skipTheRest = true;
+                }
+            }
+            return skipTheRest ? false : true;
+        }
+
+        @Override
+        public boolean visitLeave(DependencyNode node) {
+            return skipTheRest ? false : true;
+        }
+    }
+
+    private static class RootNode extends Node {
+
+        final Map<AppArtifactKey, Node> expectedDeploymentNodes = new HashMap<>();
+        final Set<AppArtifactKey> directRuntimeDeps = new HashSet<>();
+        final Set<AppArtifactKey> allRtDeps = new HashSet<>();
+        final Set<AppArtifactKey> allDeploymentDeps = new HashSet<>();
+        final Map<AppArtifactKey, org.eclipse.aether.artifact.Artifact> unexpectedDeploymentDeps = new HashMap<>(0);
+
+        int deploymentDepsTotal = 1;
+        List<AppArtifactKey> deploymentsOnRtCp = new ArrayList<>(0);
+
+        RootNode(AppArtifactKey gact, int id) {
+            super(null, gact, id);
+        }
+
+        boolean hasErrors() {
+            return deploymentDepsTotal != 0 || runtimeCp != 0 || !unexpectedDeploymentDeps.isEmpty();
         }
     }
 
@@ -492,7 +743,8 @@ private static class Node {
         final Node parent;
         final AppArtifactKey gact;
         final int id;
-        boolean included;
+        boolean present;
+        int runtimeCp;
         List<Node> children = new ArrayList<>(0);
 
         Node(Node parent, AppArtifactKey gact, int id) {
@@ -507,29 +759,89 @@ Node newChild(AppArtifactKey gact, int id) {
             return child;
         }
 
-        List<AppArtifactKey> collectMissing(Log log) {
+        List<AppArtifactKey> collectMissingDeploymentDeps(Log log) {
             final List<AppArtifactKey> missing = new ArrayList<>();
-            collectMissing(log, 0, missing);
+            handleChildren(log, 0, missing, (log1, depth, n, collected) -> {
+                final StringBuilder buf = new StringBuilder();
+                if (n.present) {
+                    buf.append('+');
+                } else {
+                    buf.append('-');
+                    collected.add(n.gact);
+                }
+                buf.append(' ');
+                for (int i = 0; i < depth; ++i) {
+                    buf.append("    ");
+                }
+                buf.append(n.gact);
+                log1.error(buf.toString());
+            });
             return missing;
         }
 
-        private void collectMissing(Log log, int depth, List<AppArtifactKey> missing) {
-            final StringBuilder buf = new StringBuilder();
-            if (included) {
-                buf.append('+');
-            } else {
-                buf.append('-');
-                missing.add(gact);
-            }
-            buf.append(' ');
-            for (int i = 0; i < depth; ++i) {
-                buf.append("    ");
-            }
-            buf.append(gact);
-            log.error(buf.toString());
+        List<AppArtifactKey> collectDeploymentsOnRtCp(Log log) {
+            final List<AppArtifactKey> missing = new ArrayList<>();
+            handleChildren(log, 0, missing, (log1, depth, n, collected) -> {
+                if (n.runtimeCp == 0) {
+                    return;
+                }
+                final StringBuilder buf = new StringBuilder();
+                if (n.runtimeCp == 1) {
+                    buf.append(' ');
+                } else {
+                    buf.append('*');
+                    collected.add(n.gact);
+                }
+                buf.append(' ');
+                for (int i = 0; i < depth; ++i) {
+                    buf.append("    ");
+                }
+                buf.append(n.gact);
+                log1.error(buf.toString());
+            });
+            return missing;
+        }
+
+        private void handle(Log log, int depth, List<AppArtifactKey> collected, NodeHandler handler) {
+            handler.handle(log, depth, this, collected);
+            handleChildren(log, depth, collected, handler);
+        }
+
+        private void handleChildren(Log log, int depth, List<AppArtifactKey> collected, NodeHandler handler) {
             for (Node child : children) {
-                child.collectMissing(log, depth + 1, missing);
+                child.handle(log, depth + 1, collected, handler);
+            }
+        }
+    }
+
+    private static interface NodeHandler {
+        void handle(Log log, int depth, Node n, List<AppArtifactKey> collected);
+    }
+
+    private MavenArtifactResolver resolver() throws MojoExecutionException {
+        if (resolver == null) {
+            try {
+                final BootstrapMavenContext ctx = new BootstrapMavenContext(BootstrapMavenContext.config()
+                        .setRepositorySystem(repoSystem)
+                        .setRemoteRepositoryManager(remoteRepoManager)
+                        .setRepositorySystemSession(repoSession)
+                        .setRemoteRepositories(repos)
+                        .setCurrentProject(workpaceProvider.origin()));
+                resolver = new MavenArtifactResolver(ctx);
+            } catch (BootstrapMavenException e) {
+                throw new MojoExecutionException("Failed to initialize Maven artifact resolver", e);
             }
         }
+        return resolver;
+    }
+
+    private File resolve(org.eclipse.aether.artifact.Artifact a) throws MojoExecutionException {
+        try {
+            return resolver().resolve(a).getArtifact().getFile();
+        } catch (MojoExecutionException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new MojoExecutionException("Failed to resolve " + a, e);
+        }
     }
 }
diff --git a/independent-projects/bootstrap/maven-plugin/src/test/java/io/quarkus/maven/TreeMojoTestBase.java b/independent-projects/bootstrap/maven-plugin/src/test/java/io/quarkus/maven/TreeMojoTestBase.java
index d55b7a51b415d..fcf9969458c85 100644
--- a/independent-projects/bootstrap/maven-plugin/src/test/java/io/quarkus/maven/TreeMojoTestBase.java
+++ b/independent-projects/bootstrap/maven-plugin/src/test/java/io/quarkus/maven/TreeMojoTestBase.java
@@ -42,7 +42,7 @@ public void setup() throws Exception {
 
         mvnResolver = MavenArtifactResolver.builder()
                 .setOffline(true)
-                .setRepoHome(repoHome)
+                .setLocalRepository(repoHome.toString())
                 .setRemoteRepositories(Collections.emptyList())
                 .build();
 
@@ -86,10 +86,7 @@ public void test() throws Exception {
                 app.getType(), app.getClassifier(), new DefaultArtifactHandler("jar")));
         mojo.project.setModel(appModel);
         mojo.project.setOriginalModel(appModel);
-
-        mojo.repoSystem = mvnResolver.getSystem();
-        mojo.repoSession = mvnResolver.getSession();
-        mojo.repos = mvnResolver.getRepositories();
+        mojo.resolver = mvnResolver;
 
         final Path mojoLog = workDir.resolve("mojo.log");
         final PrintStream defaultOut = System.out;
diff --git a/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.build-tree b/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.build-tree
index d200674abf166..4d106eb51fa75 100644
--- a/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.build-tree
+++ b/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.build-tree
@@ -1,4 +1,4 @@
-[info] io.quarkus.bootstrap.test:test-app:jar:1
+[info] io.quarkus.bootstrap.test:test-app:pom:1
 [info] ├─ io.quarkus.bootstrap.test:artifact-with-classifier:jar:classifier:1 (compile)
 [info] ├─ io.quarkus.bootstrap.test:test-ext2-deployment:jar:1 (compile)
 [info] │  ├─ io.quarkus.bootstrap.test:test-ext2:jar:1 (compile)
diff --git a/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.dev-mode-tree b/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.dev-mode-tree
index 4028beaf21278..f564bf06bd1bd 100644
--- a/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.dev-mode-tree
+++ b/independent-projects/bootstrap/maven-plugin/src/test/resources/test-app-1.jar.dev-mode-tree
@@ -1,4 +1,4 @@
-[info] io.quarkus.bootstrap.test:test-app:jar:1
+[info] io.quarkus.bootstrap.test:test-app:pom:1
 [info] ├─ io.quarkus.bootstrap.test:artifact-with-classifier:jar:classifier:1 (compile)
 [info] ├─ io.quarkus.bootstrap.test:test-ext2-deployment:jar:1 (compile)
 [info] │  ├─ io.quarkus.bootstrap.test:test-ext2:jar:1 (compile)
diff --git a/independent-projects/bootstrap/maven-resolver/pom.xml b/independent-projects/bootstrap/maven-resolver/pom.xml
index 52e96826928a5..9e9d72ee36dbf 100644
--- a/independent-projects/bootstrap/maven-resolver/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/pom.xml
@@ -18,13 +18,21 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-app-model</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>jboss-logmanager-embedded</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
index 42ee7146494d4..6e3d864336a41 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
@@ -1,5 +1,6 @@
 package io.quarkus.bootstrap.resolver;
 
+import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.bootstrap.BootstrapDependencyProcessingException;
 import io.quarkus.bootstrap.model.AppArtifact;
 import io.quarkus.bootstrap.model.AppArtifactKey;
@@ -11,11 +12,17 @@
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.bootstrap.resolver.maven.SimpleDependencyGraphTransformationContext;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.function.Consumer;
 import org.eclipse.aether.RepositoryException;
@@ -36,7 +43,6 @@
 import org.eclipse.aether.version.Version;
 
 /**
- *
  * @author Alexey Loubyansky
  */
 public class BootstrapAppModelResolver implements AppModelResolver {
@@ -135,7 +141,8 @@ public AppModel resolveModel(AppArtifact appArtifact) throws AppModelResolverExc
 
     @Override
     public AppModel resolveModel(AppArtifact appArtifact, List<AppDependency> directDeps) throws AppModelResolverException {
-        return resolveManagedModel(appArtifact, directDeps, null, Collections.emptySet());
+        return resolveManagedModel(appArtifact, directDeps,
+                null, Collections.emptySet());
     }
 
     @Override
@@ -218,12 +225,14 @@ public boolean visitLeave(DependencyNode node) {
             }
             managedDeps = mergedManagedDeps;
         }
+
         final List<RemoteRepository> repos = mvn.aggregateRepositories(managedRepos,
                 mvn.newResolutionRepositories(appArtifactDescr.getRepositories()));
 
-        final DeploymentInjectingDependencyVisitor deploymentInjector = new DeploymentInjectingDependencyVisitor(mvn,
-                managedDeps, repos, appBuilder);
+        final DeploymentInjectingDependencyVisitor deploymentInjector;
         try {
+            deploymentInjector = new DeploymentInjectingDependencyVisitor(mvn,
+                    managedDeps, repos, appBuilder);
             deploymentInjector.injectDeploymentDependencies(resolvedDeps);
         } catch (BootstrapDependencyProcessingException e) {
             throw new AppModelResolverException(
@@ -264,6 +273,8 @@ public boolean visitLeave(DependencyNode node) {
             }
         }
 
+        collectPlatformProperties(appBuilder, managedDeps);
+
         List<AppDependency> fullDeploymentDeps = new ArrayList<>(userDeps.size() + deploymentDeps.size());
         fullDeploymentDeps.addAll(userDeps);
         fullDeploymentDeps.addAll(deploymentDeps);
@@ -280,6 +291,60 @@ public boolean visitLeave(DependencyNode node) {
                 .build();
     }
 
+    private void collectPlatformProperties(AppModel.Builder appBuilder, List<Dependency> managedDeps)
+            throws AppModelResolverException {
+        final Set<AppArtifactKey> descriptorKeys = new HashSet<>(4);
+        final Set<AppArtifactKey> propertyKeys = new HashSet<>(2);
+        final Map<String, String> collectedProps = new HashMap<String, String>();
+        for (Dependency d : managedDeps) {
+            final Artifact artifact = d.getArtifact();
+            final String extension = artifact.getExtension();
+            final String artifactId = artifact.getArtifactId();
+            if ("json".equals(extension)
+                    && artifactId.endsWith(BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)) {
+                descriptorKeys.add(new AppArtifactKey(artifact.getGroupId(),
+                        artifactId.substring(0,
+                                artifactId.length() - BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX.length()),
+                        artifact.getVersion()));
+            } else if ("properties".equals(artifact.getExtension())
+                    && artifactId.endsWith(BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX)) {
+                final Path propsPath = mvn.resolve(artifact).getArtifact().getFile().toPath();
+                final Properties props = new Properties();
+                try (InputStream is = Files.newInputStream(propsPath)) {
+                    props.load(is);
+                } catch (IOException e) {
+                    throw new AppModelResolverException("Failed to read properties from " + propsPath, e);
+                }
+                for (Map.Entry<?, ?> prop : props.entrySet()) {
+                    final String name = String.valueOf(prop.getKey());
+                    if (name.startsWith(BootstrapConstants.PLATFORM_PROPERTY_PREFIX)) {
+                        collectedProps.putIfAbsent(prop.getKey().toString(), prop.getValue().toString());
+                    }
+                }
+                propertyKeys.add(new AppArtifactKey(artifact.getGroupId(),
+                        artifactId.substring(0,
+                                artifactId.length() - BootstrapConstants.PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX.length()),
+                        artifact.getVersion()));
+            }
+        }
+        if (!descriptorKeys.containsAll(propertyKeys)) {
+            final StringBuilder buf = new StringBuilder();
+            buf.append(
+                    "The Quarkus platform properties applied to the project are missing the corresponding Quarkus platform BOM imports:");
+            final int l = buf.length();
+            for (AppArtifactKey key : propertyKeys) {
+                if (!descriptorKeys.contains(key)) {
+                    if (l - buf.length() < 0) {
+                        buf.append(',');
+                    }
+                    buf.append(' ').append(key);
+                }
+            }
+            throw new AppModelResolverException(buf.toString());
+        }
+        appBuilder.addPlatformProperties(collectedProps);
+    }
+
     @Override
     public List<String> listLaterVersions(AppArtifact appArtifact, String upToVersion, boolean inclusive)
             throws AppModelResolverException {
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java
index 1af4f29bf95b8..c6767c20834fa 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java
@@ -20,7 +20,9 @@
 import java.util.Properties;
 import java.util.function.Supplier;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.cli.transfer.BatchModeMavenTransferListener;
 import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
+import org.apache.maven.cli.transfer.QuietMavenTransferListener;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.building.ModelBuilder;
 import org.apache.maven.model.building.ModelProblemCollector;
@@ -68,6 +70,7 @@
 import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
 import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
 import org.eclipse.aether.spi.connector.transport.TransporterFactory;
+import org.eclipse.aether.transfer.TransferListener;
 import org.eclipse.aether.transport.wagon.WagonConfigurator;
 import org.eclipse.aether.transport.wagon.WagonProvider;
 import org.eclipse.aether.transport.wagon.WagonTransporterFactory;
@@ -86,7 +89,6 @@ public class BootstrapMavenContext {
     private static final String DEFAULT_REMOTE_REPO_URL = "https://repo.maven.apache.org/maven2";
     private static final String MAVEN_DOT_HOME = "maven.home";
     private static final String MAVEN_HOME = "MAVEN_HOME";
-    private static final String MAVEN_PROJECTBASEDIR = "MAVEN_PROJECTBASEDIR";
     private static final String MAVEN_SETTINGS = "maven.settings";
     private static final String SETTINGS_XML = "settings.xml";
 
@@ -111,6 +113,7 @@ public class BootstrapMavenContext {
     private Boolean currentProjectExists;
     private DefaultServiceLocator serviceLocator;
     private String alternatePomName;
+    private Path rootProjectDir;
 
     public static BootstrapMavenContextConfig<?> config() {
         return new BootstrapMavenContextConfig<>();
@@ -136,6 +139,7 @@ public BootstrapMavenContext(BootstrapMavenContextConfig<?> config)
         this.remoteRepos = config.remoteRepos;
         this.remoteRepoManager = config.remoteRepoManager;
         this.cliOptions = config.cliOptions;
+        this.rootProjectDir = config.rootProjectDir;
         if (config.currentProject != null) {
             this.currentProject = config.currentProject;
             this.currentPom = currentProject.getRawModel().getPomFile().toPath();
@@ -144,20 +148,7 @@ public BootstrapMavenContext(BootstrapMavenContextConfig<?> config)
             currentProject = resolveCurrentProject();
             this.workspace = currentProject == null ? null : currentProject.getWorkspace();
         }
-        userSettings = config.userSettings == null
-                ? resolveSettingsFile(getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_USER_SETTINGS),
-                        () -> {
-                            final String quarkusMavenSettings = PropertyUtils.getProperty(MAVEN_SETTINGS);
-                            return quarkusMavenSettings == null ? new File(userMavenConfigurationHome, SETTINGS_XML)
-                                    : new File(quarkusMavenSettings);
-                        })
-                : config.userSettings;
-        globalSettings = resolveSettingsFile(getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_GLOBAL_SETTINGS),
-                () -> {
-                    final String envM2Home = System.getenv(MAVEN_HOME);
-                    return new File(PropertyUtils.getProperty(MAVEN_DOT_HOME, envM2Home != null ? envM2Home : ""),
-                            "conf/settings.xml");
-                });
+        userSettings = config.userSettings;
     }
 
     public AppArtifact getCurrentProjectArtifact(String extension) throws BootstrapMavenException {
@@ -185,11 +176,41 @@ public BootstrapMavenOptions getCliOptions() {
     }
 
     public File getUserSettings() {
-        return userSettings;
+        return userSettings == null
+                ? userSettings = resolveSettingsFile(
+                        getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_USER_SETTINGS),
+                        () -> {
+                            final String quarkusMavenSettings = getProperty(MAVEN_SETTINGS);
+                            return quarkusMavenSettings == null ? new File(userMavenConfigurationHome, SETTINGS_XML)
+                                    : new File(quarkusMavenSettings);
+                        })
+                : userSettings;
+    }
+
+    private String getProperty(String name) {
+        String value = PropertyUtils.getProperty(name);
+        if (value != null) {
+            return value;
+        }
+        final Properties props = getCliOptions().getSystemProperties();
+        return props == null ? null : props.getProperty(name);
     }
 
     public File getGlobalSettings() {
-        return globalSettings;
+        return globalSettings == null
+                ? globalSettings = resolveSettingsFile(
+                        getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_GLOBAL_SETTINGS),
+                        () -> {
+                            String mavenHome = getProperty(MAVEN_DOT_HOME);
+                            if (mavenHome == null) {
+                                mavenHome = System.getenv(MAVEN_HOME);
+                                if (mavenHome == null) {
+                                    mavenHome = "";
+                                }
+                            }
+                            return new File(mavenHome, "conf/settings.xml");
+                        })
+                : globalSettings;
     }
 
     public boolean isOffline() throws BootstrapMavenException {
@@ -215,13 +236,20 @@ public Settings getEffectiveSettings() throws BootstrapMavenException {
             return settings;
         }
 
+        final DefaultSettingsBuildingRequest settingsRequest = new DefaultSettingsBuildingRequest()
+                .setSystemProperties(System.getProperties())
+                .setUserSettingsFile(getUserSettings())
+                .setGlobalSettingsFile(getGlobalSettings());
+
+        final Properties cmdLineProps = getCliOptions().getSystemProperties();
+        if (cmdLineProps != null) {
+            settingsRequest.setUserProperties(cmdLineProps);
+        }
+
         final Settings effectiveSettings;
         try {
             final SettingsBuildingResult result = new DefaultSettingsBuilderFactory()
-                    .newInstance().build(new DefaultSettingsBuildingRequest()
-                            .setSystemProperties(System.getProperties())
-                            .setUserSettingsFile(getUserSettings())
-                            .setGlobalSettingsFile(getGlobalSettings()));
+                    .newInstance().build(settingsRequest);
             final List<SettingsProblem> problems = result.getProblems();
             if (!problems.isEmpty()) {
                 for (SettingsProblem problem : problems) {
@@ -254,12 +282,12 @@ private LocalProject resolveCurrentProject() throws BootstrapMavenException {
         }
     }
 
-    public static String resolveLocalRepo(Settings settings) {
+    private String resolveLocalRepo(Settings settings) {
         String localRepo = System.getenv("QUARKUS_LOCAL_REPO");
         if (localRepo != null) {
             return localRepo;
         }
-        localRepo = PropertyUtils.getProperty("maven.repo.local");
+        localRepo = getProperty("maven.repo.local");
         if (localRepo != null) {
             return localRepo;
         }
@@ -267,27 +295,43 @@ public static String resolveLocalRepo(Settings settings) {
         return localRepo == null ? new File(userMavenConfigurationHome, "repository").getAbsolutePath() : localRepo;
     }
 
-    private static File resolveSettingsFile(String settingsArg, Supplier<File> supplier) {
+    private File resolveSettingsFile(String settingsArg, Supplier<File> supplier) {
         File userSettings;
         if (settingsArg != null) {
             userSettings = new File(settingsArg);
             if (userSettings.exists()) {
                 return userSettings;
             }
-            String base = System.getenv("MAVEN_PROJECTBASEDIR"); // Root project base dir
-            if (base != null) {
-                userSettings = new File(base, settingsArg);
-                if (userSettings.exists()) {
-                    return userSettings;
-                }
+            if (userSettings.isAbsolute()) {
+                return null;
             }
-            base = PropertyUtils.getProperty(BASEDIR); // current module project base dir
-            if (base != null) {
-                userSettings = new File(base, settingsArg);
-                if (userSettings.exists()) {
-                    return userSettings;
+
+            // in case the settings path is a relative one we check whether the pom path is also a relative one
+            // in which case we can resolve the settings path relative to the project directory
+            // otherwise, we don't have a clue what the settings path is relative to
+            String alternatePomDir = getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_POM_FILE);
+            if (alternatePomDir != null) {
+                File tmp = new File(alternatePomDir);
+                if (tmp.isAbsolute()) {
+                    alternatePomDir = null;
+                } else {
+                    if (!tmp.isDirectory()) {
+                        tmp = tmp.getParentFile();
+                    }
+                    alternatePomDir = tmp.toString();
                 }
             }
+
+            // Root project base dir
+            userSettings = resolveSettingsFile(settingsArg, alternatePomDir, System.getenv("MAVEN_PROJECTBASEDIR"));
+            if (userSettings != null) {
+                return userSettings;
+            }
+            // current module project base dir
+            userSettings = resolveSettingsFile(settingsArg, alternatePomDir, PropertyUtils.getProperty(BASEDIR));
+            if (userSettings != null) {
+                return userSettings;
+            }
             userSettings = new File(PropertyUtils.getUserHome(), settingsArg);
             if (userSettings.exists()) {
                 return userSettings;
@@ -297,6 +341,25 @@ private static File resolveSettingsFile(String settingsArg, Supplier<File> suppl
         return userSettings.exists() ? userSettings : null;
     }
 
+    private File resolveSettingsFile(String settingsArg, String alternatePomDir, String projectBaseDir) {
+        if (projectBaseDir == null) {
+            return null;
+        }
+        File userSettings;
+        if (alternatePomDir != null && projectBaseDir.endsWith(alternatePomDir)) {
+            userSettings = new File(projectBaseDir.substring(0, projectBaseDir.length() - alternatePomDir.length()),
+                    settingsArg);
+            if (userSettings.exists()) {
+                return userSettings;
+            }
+        }
+        userSettings = new File(projectBaseDir, settingsArg);
+        if (userSettings.exists()) {
+            return userSettings;
+        }
+        return null;
+    }
+
     private DefaultRepositorySystemSession newRepositorySystemSession() throws BootstrapMavenException {
         final DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
         final Settings settings = getEffectiveSettings();
@@ -386,7 +449,16 @@ private DefaultRepositorySystemSession newRepositorySystemSession() throws Boots
         }
 
         if (session.getTransferListener() == null && artifactTransferLogging) {
-            session.setTransferListener(new ConsoleMavenTransferListener(System.out, true));
+            TransferListener transferListener;
+            if (mvnArgs.hasOption(BootstrapMavenOptions.NO_TRANSFER_PROGRESS)) {
+                transferListener = new QuietMavenTransferListener();
+            } else if (mvnArgs.hasOption(BootstrapMavenOptions.BATCH_MODE)) {
+                transferListener = new BatchModeMavenTransferListener(System.out);
+            } else {
+                transferListener = new ConsoleMavenTransferListener(System.out, true);
+            }
+
+            session.setTransferListener(transferListener);
         }
 
         return session;
@@ -721,24 +793,10 @@ public Path getCurrentProjectBaseDir() {
     }
 
     public Path getRootProjectBaseDir() {
-        final String rootBaseDir = System.getenv(MAVEN_PROJECTBASEDIR);
-        if (rootBaseDir == null) {
-            return null;
-        }
-        // if the alternate POM was set (not on the CLI) and its base dir does not match the base dir
-        // set by the Maven process then the root project set by the Maven process is probably not relevant too
-        if (alternatePomName != null) {
-            final Path currentPom = getCurrentProjectPomOrNull();
-            if (currentPom == null || !getCurrentProjectBaseDir().equals(currentPom.getParent())) {
-                return null;
-            }
-        }
-        final Path rootProjectBaseDirPath = Paths.get(rootBaseDir);
-        // if the root project dir set by the Maven process (through the env variable) doesn't have a pom.xml
-        // then it probably isn't relevant
-        if (!Files.exists(rootProjectBaseDirPath.resolve("pom.xml"))) {
-            return null;
-        }
-        return rootProjectBaseDirPath;
+        // originally we checked for MAVEN_PROJECTBASEDIR which is set by the mvn script
+        // and points to the first parent containing '.mvn' dir but it's not consistent
+        // with how Maven discovers the workspace and also created issues testing the Quarkus platform
+        // due to its specific FS layout
+        return rootProjectDir;
     }
 }
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java
index 26bd0cfad2df0..64cf7b57d49c8 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java
@@ -26,6 +26,7 @@ public class BootstrapMavenContextConfig<T extends BootstrapMavenContextConfig<?
     protected File userSettings;
     protected boolean artifactTransferLogging = true;
     protected BootstrapMavenOptions cliOptions;
+    protected Path rootProjectDir;
 
     /**
      * Local repository location
@@ -183,6 +184,18 @@ public Path getPomForDirOrNull(Path basedir) {
         return BootstrapMavenContext.getPomForDirOrNull(basedir, altPom == null ? null : Paths.get(altPom));
     }
 
+    /**
+     * Root project directory.
+     *
+     * @param rootProjectDir root project directory
+     * @return this instance
+     */
+    @SuppressWarnings("unchecked")
+    public T setRootProjectDir(Path rootProjectDir) {
+        this.rootProjectDir = rootProjectDir;
+        return (T) this;
+    }
+
     private BootstrapMavenOptions getInitializedCliOptions() {
         return cliOptions == null ? cliOptions = BootstrapMavenOptions.newInstance() : cliOptions;
     }
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java
index e3a09f82d6fee..baf7038db120d 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java
@@ -136,10 +136,7 @@ private void visitLeave(DependencyNode node) {
         if (deploymentNode != null) {
             if (runtimeNode == null && !appDeps.contains(new AppArtifactKey(artifact.getGroupId(),
                     artifact.getArtifactId(), artifact.getClassifier(), artifact.getExtension()))) {
-                //we never want optional deps on the deployment CP
-                if (!node.getDependency().isOptional()) {
-                    deploymentDepNodes.add(node);
-                }
+                deploymentDepNodes.add(node);
             } else if (runtimeNode == node) {
                 runtimeNode = null;
                 runtimeArtifact = null;
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java
new file mode 100644
index 0000000000000..10265d65be10f
--- /dev/null
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentDependencySelector.java
@@ -0,0 +1,28 @@
+package io.quarkus.bootstrap.resolver.maven;
+
+import org.eclipse.aether.collection.DependencyCollectionContext;
+import org.eclipse.aether.collection.DependencySelector;
+import org.eclipse.aether.graph.Dependency;
+
+class DeploymentDependencySelector implements DependencySelector {
+
+    private final DependencySelector delegate;
+
+    public DeploymentDependencySelector(DependencySelector delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public boolean selectDependency(Dependency dependency) {
+        if (dependency.isOptional()) {
+            return false;
+        }
+        return delegate.selectDependency(dependency);
+    }
+
+    @Override
+    public DependencySelector deriveChildSelector(DependencyCollectionContext context) {
+        final DependencySelector newDelegate = delegate.deriveChildSelector(context);
+        return newDelegate == null ? null : new DeploymentDependencySelector(newDelegate);
+    }
+}
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
index a72db431465c0..500fa7823a7f0 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
@@ -12,13 +12,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.Exclusion;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.jboss.logging.Logger;
@@ -48,8 +51,24 @@ public static Artifact getRuntimeArtifact(DependencyNode dep) {
     private final AppModel.Builder appBuilder;
 
     public DeploymentInjectingDependencyVisitor(MavenArtifactResolver resolver, List<Dependency> managedDeps,
-            List<RemoteRepository> mainRepos, AppModel.Builder appBuilder) {
-        this.resolver = resolver;
+            List<RemoteRepository> mainRepos, AppModel.Builder appBuilder) throws BootstrapDependencyProcessingException {
+        // we need to be able to take into account whether the deployment dependencies are on an optional dependency branch
+        // for that we are going to use a custom dependency selector and re-initialize the resolver to use it
+        final DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(resolver.getSession());
+        final DeploymentDependencySelector depSelector = new DeploymentDependencySelector(session.getDependencySelector());
+        session.setDependencySelector(depSelector);
+        try {
+            this.resolver = new MavenArtifactResolver(new BootstrapMavenContext(BootstrapMavenContext.config()
+                    .setRepositorySystem(resolver.getSystem())
+                    .setRepositorySystemSession(session)
+                    .setRemoteRepositories(resolver.getRepositories())
+                    .setRemoteRepositoryManager(resolver.getRemoteRepositoryManager())
+                    .setWorkspaceDiscovery(false)));
+        } catch (BootstrapMavenException e) {
+            throw new BootstrapDependencyProcessingException("Failed to initialize deployment dependencies resolver",
+                    e);
+        }
+
         this.managedDeps = managedDeps.isEmpty() ? new ArrayList<>() : managedDeps;
         this.mainRepos = mainRepos;
         this.appBuilder = appBuilder;
@@ -63,7 +82,8 @@ public void injectDeploymentDependencies(DependencyNode root) throws BootstrapDe
         collectRuntimeExtensions(root.getChildren());
         // resolve and inject deployment dependencies
         for (DependencyNode rtNode : runtimeNodes) {
-            replaceWith(rtNode, collectDependencies((Artifact) rtNode.getData().get(QUARKUS_DEPLOYMENT_ARTIFACT)));
+            replaceWith(rtNode, collectDependencies((Artifact) rtNode.getData().get(QUARKUS_DEPLOYMENT_ARTIFACT),
+                    rtNode.getDependency().getExclusions()));
         }
     }
 
@@ -93,7 +113,7 @@ private void collectRuntimeExtensions(DependencyNode node) {
         } catch (DeploymentInjectionException e) {
             throw e;
         } catch (Exception t) {
-            throw new DeploymentInjectionException("Failed to inject extension deplpyment dependencies", t);
+            throw new DeploymentInjectionException("Failed to inject extension deployment dependencies", t);
         } finally {
             collectExtensions = parentCollectsExtensions;
         }
@@ -152,11 +172,14 @@ private void replaceWith(DependencyNode originalNode, DependencyNode newNode)
         originalNode.setChildren(children);
     }
 
-    private DependencyNode collectDependencies(Artifact artifact) throws BootstrapDependencyProcessingException {
+    private DependencyNode collectDependencies(Artifact artifact, Collection<Exclusion> exclusions)
+            throws BootstrapDependencyProcessingException {
         try {
-            return managedDeps.isEmpty() ? resolver.collectDependencies(artifact, Collections.emptyList(), mainRepos).getRoot()
+            return managedDeps.isEmpty()
+                    ? resolver.collectDependencies(artifact, Collections.emptyList(), mainRepos, exclusions).getRoot()
                     : resolver
-                            .collectManagedDependencies(artifact, Collections.emptyList(), managedDeps, mainRepos, "test",
+                            .collectManagedDependencies(artifact, Collections.emptyList(), managedDeps, mainRepos, exclusions,
+                                    "test",
                                     "provided")
                             .getRoot();
         } catch (AppModelResolverException e) {
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java
index c02f3119c9d8e..4a2e108a3cf95 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenArtifactResolver.java
@@ -4,6 +4,8 @@
 package io.quarkus.bootstrap.resolver.maven;
 
 import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.AppModelResolverException;
+import io.quarkus.bootstrap.util.PropertyUtils;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -19,15 +21,16 @@
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.collection.CollectResult;
 import org.eclipse.aether.collection.DependencyCollectionException;
 import org.eclipse.aether.graph.DefaultDependencyNode;
 import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.Exclusion;
 import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.installation.InstallRequest;
 import org.eclipse.aether.installation.InstallationException;
-import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.resolution.ArtifactDescriptorException;
 import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
@@ -44,6 +47,7 @@
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
+import org.eclipse.aether.version.Version;
 
 /**
  *
@@ -51,36 +55,18 @@
  */
 public class MavenArtifactResolver {
 
+    private static final String SECONDARY_LOCAL_REPO_PROP = "io.quarkus.maven.secondary-local-repo";
+
     public static class Builder extends BootstrapMavenContextConfig<Builder> {
 
-        private boolean reTryFailedResolutionsAgainstDefaultLocalRepo;
+        private Path secondaryLocalRepo;
 
         private Builder() {
             super();
         }
 
-        /**
-         * In case custom local repository location is configured using {@link #setRepoHome(Path)},
-         * this method can be used to enable artifact resolutions that failed for the configured
-         * custom local repository to be re-tried against the default user local repository before
-         * failing.
-         * <p>
-         * NOTE: the default behavior is <b>not</b> to use the default user local repository as the fallback one.
-         *
-         * @param value true if the failed resolution requests should be re-tried against the default
-         *        user local repo before failing
-         *
-         * @return this builder instance
-         */
-        public Builder setReTryFailedResolutionsAgainstDefaultLocalRepo(boolean value) {
-            this.reTryFailedResolutionsAgainstDefaultLocalRepo = value;
-            return this;
-        }
-
-        public Builder setRepoHome(Path home) {
-            if (home != null) {
-                setLocalRepository(home.toString());
-            }
+        public Builder setSecondaryLocalRepo(Path secondaryLocalRepo) {
+            this.secondaryLocalRepo = secondaryLocalRepo;
             return this;
         }
 
@@ -93,6 +79,7 @@ public static Builder builder() {
         return new Builder();
     }
 
+    protected final BootstrapMavenContext context;
     protected final RepositorySystem repoSystem;
     protected final RepositorySystemSession repoSession;
     protected final List<RemoteRepository> remoteRepos;
@@ -100,25 +87,30 @@ public static Builder builder() {
     protected final RemoteRepositoryManager remoteRepoManager;
 
     private MavenArtifactResolver(Builder builder) throws BootstrapMavenException {
-        final BootstrapMavenContext mvnSettings = new BootstrapMavenContext(builder);
-        this.repoSystem = mvnSettings.getRepositorySystem();
+        this.context = new BootstrapMavenContext(builder);
+        this.repoSystem = context.getRepositorySystem();
 
-        final RepositorySystemSession session = mvnSettings.getRepositorySystemSession();
-        if (builder.localRepo != null && builder.reTryFailedResolutionsAgainstDefaultLocalRepo) {
+        final RepositorySystemSession session = context.getRepositorySystemSession();
+        final String secondaryRepo = PropertyUtils.getProperty(SECONDARY_LOCAL_REPO_PROP);
+        if (secondaryRepo != null) {
+            builder.secondaryLocalRepo = Paths.get(secondaryRepo);
+        }
+        if (builder.secondaryLocalRepo != null) {
             localRepoManager = new MavenLocalRepositoryManager(
-                    repoSystem.newLocalRepositoryManager(session, new LocalRepository(builder.localRepo)),
-                    Paths.get(BootstrapMavenContext.resolveLocalRepo(mvnSettings.getEffectiveSettings())));
+                    session.getLocalRepositoryManager(),
+                    builder.secondaryLocalRepo);
             this.repoSession = new DefaultRepositorySystemSession(session).setLocalRepositoryManager(localRepoManager);
         } else {
             this.repoSession = session;
             localRepoManager = null;
         }
 
-        this.remoteRepos = mvnSettings.getRemoteRepositories();
-        this.remoteRepoManager = mvnSettings.getRemoteRepositoryManager();
+        this.remoteRepos = context.getRemoteRepositories();
+        this.remoteRepoManager = context.getRemoteRepositoryManager();
     }
 
     public MavenArtifactResolver(BootstrapMavenContext mvnSettings) throws BootstrapMavenException {
+        this.context = mvnSettings;
         this.repoSystem = mvnSettings.getRepositorySystem();
         this.repoSession = mvnSettings.getRepositorySystemSession();
         localRepoManager = null;
@@ -126,6 +118,14 @@ public MavenArtifactResolver(BootstrapMavenContext mvnSettings) throws Bootstrap
         this.remoteRepoManager = mvnSettings.getRemoteRepositoryManager();
     }
 
+    public BootstrapMavenContext getMavenContext() {
+        return context;
+    }
+
+    public RemoteRepositoryManager getRemoteRepositoryManager() {
+        return remoteRepoManager;
+    }
+
     public MavenLocalRepositoryManager getLocalRepositoryManager() {
         return localRepoManager;
     }
@@ -208,13 +208,38 @@ public VersionRangeResult resolveVersionRange(Artifact artifact) throws Bootstra
         }
     }
 
+    public String getLatestVersionFromRange(Artifact artifact, String range) throws AppModelResolverException {
+        return getLatest(resolveVersionRange(new DefaultArtifact(artifact.getGroupId(), artifact.getArtifactId(),
+                artifact.getClassifier(), artifact.getExtension(), range)));
+    }
+
+    private String getLatest(final VersionRangeResult rangeResult) {
+        final List<Version> versions = rangeResult.getVersions();
+        if (versions.isEmpty()) {
+            return null;
+        }
+        Version next = versions.get(0);
+        for (int i = 1; i < versions.size(); ++i) {
+            final Version candidate = versions.get(i);
+            if (candidate.compareTo(next) > 0) {
+                next = candidate;
+            }
+        }
+        return next.toString();
+    }
+
     public CollectResult collectDependencies(Artifact artifact, List<Dependency> deps) throws BootstrapMavenException {
         return collectDependencies(artifact, deps, Collections.emptyList());
     }
 
     public CollectResult collectDependencies(Artifact artifact, List<Dependency> deps, List<RemoteRepository> mainRepos)
             throws BootstrapMavenException {
-        final CollectRequest request = newCollectRequest(artifact, mainRepos);
+        return collectDependencies(artifact, deps, mainRepos, Collections.emptyList());
+    }
+
+    public CollectResult collectDependencies(Artifact artifact, List<Dependency> deps, List<RemoteRepository> mainRepos,
+            Collection<Exclusion> exclusions) throws BootstrapMavenException {
+        final CollectRequest request = newCollectRequest(artifact, mainRepos, exclusions);
         request.setDependencies(deps);
         try {
             return repoSystem.collectDependencies(repoSession, request);
@@ -274,10 +299,11 @@ public DependencyResult toDependencyTree(List<Dependency> deps, List<RemoteRepos
     }
 
     public CollectResult collectManagedDependencies(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps,
-            List<RemoteRepository> mainRepos, String... excludedScopes) throws BootstrapMavenException {
+            List<RemoteRepository> mainRepos, Collection<Exclusion> exclusions, String... excludedScopes)
+            throws BootstrapMavenException {
         try {
             return repoSystem.collectDependencies(repoSession,
-                    newCollectManagedRequest(artifact, deps, managedDeps, mainRepos, excludedScopes));
+                    newCollectManagedRequest(artifact, deps, managedDeps, mainRepos, exclusions, excludedScopes));
         } catch (DependencyCollectionException e) {
             throw new BootstrapMavenException("Failed to collect dependencies for " + artifact, e);
         }
@@ -285,6 +311,12 @@ public CollectResult collectManagedDependencies(Artifact artifact, List<Dependen
 
     private CollectRequest newCollectManagedRequest(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps,
             List<RemoteRepository> mainRepos, String... excludedScopes) throws BootstrapMavenException {
+        return newCollectManagedRequest(artifact, deps, managedDeps, mainRepos, Collections.emptyList(), excludedScopes);
+    }
+
+    private CollectRequest newCollectManagedRequest(Artifact artifact, List<Dependency> deps, List<Dependency> managedDeps,
+            List<RemoteRepository> mainRepos, Collection<Exclusion> exclusions, String... excludedScopes)
+            throws BootstrapMavenException {
         final List<RemoteRepository> aggregatedRepos = aggregateRepositories(mainRepos, remoteRepos);
         final ArtifactDescriptorResult descr = resolveDescriptorInternal(artifact, aggregatedRepos);
         Collection<String> excluded;
@@ -325,11 +357,16 @@ private CollectRequest newCollectManagedRequest(Artifact artifact, List<Dependen
             }
         }
 
-        return new CollectRequest()
-                .setRootArtifact(artifact)
+        final CollectRequest request = new CollectRequest()
                 .setDependencies(mergeDeps(deps, originalDeps, managedVersions))
                 .setManagedDependencies(mergedManagedDeps)
                 .setRepositories(aggregateRepositories(aggregatedRepos, newResolutionRepositories(descr.getRepositories())));
+        if (exclusions.isEmpty()) {
+            request.setRootArtifact(artifact);
+        } else {
+            request.setRoot(new Dependency(artifact, JavaScopes.COMPILE, false, exclusions));
+        }
+        return request;
     }
 
     public List<RemoteRepository> newResolutionRepositories(List<RemoteRepository> repos) {
@@ -349,10 +386,14 @@ public void install(Artifact artifact) throws BootstrapMavenException {
         }
     }
 
-    private CollectRequest newCollectRequest(Artifact artifact, List<RemoteRepository> mainRepos)
-            throws BootstrapMavenException {
+    private CollectRequest newCollectRequest(Artifact artifact, List<RemoteRepository> mainRepos) {
+        return newCollectRequest(artifact, mainRepos, Collections.emptyList());
+    }
+
+    private CollectRequest newCollectRequest(Artifact artifact, List<RemoteRepository> mainRepos,
+            Collection<Exclusion> exclusions) {
         return new CollectRequest()
-                .setRoot(new Dependency(artifact, JavaScopes.RUNTIME))
+                .setRoot(new Dependency(artifact, JavaScopes.RUNTIME, false, exclusions))
                 .setRepositories(aggregateRepositories(mainRepos, remoteRepos));
     }
 
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java
index b59764b9340ee..bf1b4ab3f8985 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenLocalRepositoryManager.java
@@ -24,19 +24,13 @@
 public class MavenLocalRepositoryManager implements LocalRepositoryManager {
 
     private final LocalRepositoryManager delegate;
-    private final Path userLocalRepo;
-    private final Path appCreatorRepo;
-    private final boolean relinkResolvedArtifacts;
+    private final Path secondaryRepo;
+    private final Path originalRepo;
 
-    public MavenLocalRepositoryManager(LocalRepositoryManager delegate, Path userLocalRepo) {
-        this(delegate, userLocalRepo, false);
-    }
-
-    public MavenLocalRepositoryManager(LocalRepositoryManager delegate, Path userLocalRepo, boolean relinkResolvedArtifacts) {
+    public MavenLocalRepositoryManager(LocalRepositoryManager delegate, Path secondaryRepo) {
         this.delegate = delegate;
-        this.userLocalRepo = userLocalRepo;
-        this.appCreatorRepo = delegate.getRepository().getBasedir().toPath();
-        this.relinkResolvedArtifacts = relinkResolvedArtifacts;
+        this.secondaryRepo = secondaryRepo;
+        this.originalRepo = delegate.getRepository().getBasedir().toPath();
     }
 
     @Override
@@ -65,7 +59,7 @@ public String getPathForRemoteMetadata(Metadata metadata, RemoteRepository repos
     }
 
     public void relink(String groupId, String artifactId, String classifier, String type, String version, Path p) {
-        final Path creatorRepoPath = getLocalPath(appCreatorRepo, groupId, artifactId, classifier, type, version);
+        final Path creatorRepoPath = getLocalPath(originalRepo, groupId, artifactId, classifier, type, version);
         try {
             IoUtils.copy(p, creatorRepoPath);
         } catch (IOException e) {
@@ -80,23 +74,12 @@ public LocalArtifactResult find(RepositorySystemSession session, LocalArtifactRe
             return result;
         }
         final Artifact artifact = request.getArtifact();
-        final Path userRepoPath = getLocalPath(userLocalRepo, artifact.getGroupId(), artifact.getArtifactId(),
+        final Path secondaryLocation = getLocalPath(secondaryRepo, artifact.getGroupId(), artifact.getArtifactId(),
                 artifact.getClassifier(), artifact.getExtension(), artifact.getVersion());
-        if (!Files.exists(userRepoPath)) {
+        if (!Files.exists(secondaryLocation)) {
             return result;
         }
-        if (relinkResolvedArtifacts) {
-            final Path creatorRepoPath = getLocalPath(appCreatorRepo, artifact.getGroupId(), artifact.getArtifactId(),
-                    artifact.getClassifier(), artifact.getExtension(), artifact.getVersion());
-            try {
-                IoUtils.copy(userRepoPath, creatorRepoPath);
-            } catch (IOException e) {
-                throw new IllegalStateException("Failed to copy " + userRepoPath + " to a staging repo", e);
-            }
-            result.setFile(creatorRepoPath.toFile());
-        } else {
-            result.setFile(userRepoPath.toFile());
-        }
+        result.setFile(secondaryLocation.toFile());
         artifact.setFile(result.getFile());
         result.setAvailable(true);
         return result;
@@ -114,23 +97,12 @@ public LocalMetadataResult find(RepositorySystemSession session, LocalMetadataRe
             return result;
         }
         final Metadata metadata = request.getMetadata();
-        final Path userRepoPath = getMetadataPath(userLocalRepo, metadata.getGroupId(), metadata.getArtifactId(),
+        final Path userRepoPath = getMetadataPath(secondaryRepo, metadata.getGroupId(), metadata.getArtifactId(),
                 metadata.getType(), metadata.getVersion());
         if (!Files.exists(userRepoPath)) {
             return result;
         }
-        if (relinkResolvedArtifacts) {
-            final Path creatorRepoPath = getMetadataPath(appCreatorRepo, metadata.getGroupId(), metadata.getArtifactId(),
-                    metadata.getType(), metadata.getVersion());
-            try {
-                IoUtils.copy(userRepoPath, creatorRepoPath);
-            } catch (IOException e) {
-                throw new IllegalStateException("Failed to copy " + userRepoPath + " to a staging repo", e);
-            }
-            result.setFile(creatorRepoPath.toFile());
-        } else {
-            result.setFile(userRepoPath.toFile());
-        }
+        result.setFile(userRepoPath.toFile());
         metadata.setFile(result.getFile());
         return result;
     }
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java
index 40d55d859f87c..5f79c610ec866 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptions.java
@@ -14,9 +14,12 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.CommandLineUtils;
 
 /**
  * This class resolves relevant Maven command line options in case it's called
@@ -39,12 +42,22 @@ public class BootstrapMavenOptions {
     public static final String UPDATE_SNAPSHOTS = "U";
     public static final String CHECKSUM_FAILURE_POLICY = "C";
     public static final String CHECKSUM_WARNING_POLICY = "c";
+    public static final String BATCH_MODE = "B";
+    public static final String NO_TRANSFER_PROGRESS = "ntp";
+    public static final String SYSTEM_PROPERTY = "D";
 
     public static Map<String, Object> parse(String cmdLine) {
         if (cmdLine == null) {
             return Collections.emptyMap();
         }
-        final String[] args = cmdLine.split("\\s+");
+
+        final String[] args;
+        try {
+            args = CommandLineUtils.translateCommandline(cmdLine);
+        } catch (CommandLineException e) {
+            throw new IllegalArgumentException("Invalid command line: " + cmdLine, e);
+        }
+
         if (args.length == 0) {
             return Collections.emptyMap();
         }
@@ -108,7 +121,24 @@ public static BootstrapMavenOptions newInstance(String cmdLine) {
 
     public static String getMavenCmdLine() {
         final String mvnCmd = PropertyUtils.getProperty(QUARKUS_INTERNAL_MAVEN_CMD_LINE_ARGS);
-        return mvnCmd == null ? System.getenv(MAVEN_CMD_LINE_ARGS) : mvnCmd;
+        if (mvnCmd != null) {
+            return mvnCmd;
+        }
+        final String mvnLine = System.getenv(MAVEN_CMD_LINE_ARGS);
+        if (mvnLine == null) {
+            // if the maven command line isn't available we are not checking for MAVEN_OPTS
+            return null;
+        }
+        final String mvnOpts = System.getenv("MAVEN_OPTS");
+        if (mvnOpts == null || mvnOpts.isEmpty()) {
+            return mvnLine;
+        }
+        final StringBuilder buf = new StringBuilder(mvnLine.length() + mvnOpts.length() + 1);
+        buf.append(mvnOpts);
+        if (!Character.isWhitespace(mvnLine.charAt(0))) {
+            buf.append(' ');
+        }
+        return buf.append(mvnLine).toString();
     }
 
     private final Map<String, Object> options;
@@ -139,6 +169,10 @@ public String[] getOptionValues(String name) {
         return new String[] { o.toString() };
     }
 
+    public Properties getSystemProperties() {
+        return (Properties) options.get(SYSTEM_PROPERTY);
+    }
+
     public boolean isEmpty() {
         return options.isEmpty();
     }
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java
index 56e4474c616e7..354f9ffb82874 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/options/BootstrapMavenOptionsParser.java
@@ -1,7 +1,10 @@
 package io.quarkus.bootstrap.resolver.maven.options;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
 import org.apache.maven.cli.CLIManager;
@@ -9,6 +12,88 @@
 public class BootstrapMavenOptionsParser {
 
     public static Map<String, Object> parse(String[] args) {
+
+        List<String> argsWoProps = null;
+
+        // the CLIManager doesn't seem to properly parse -D properties, it's missing the value separator config option
+        // here we are separating the user properties from the rest and passing only the non-system property args to the CLIManager
+        Properties userProps = null;
+        int argI = 0;
+        while (argI < args.length) {
+            final String arg = args[argI++];
+            if (!arg.startsWith("-D")) {
+                if (argsWoProps != null) {
+                    argsWoProps.add(arg);
+                }
+                continue;
+            }
+
+            if (argsWoProps == null) {
+                argsWoProps = new ArrayList<>(args.length);
+                for (int i = 0; i < argI - 1; ++i) {
+                    argsWoProps.add(args[i]);
+                }
+            }
+
+            if (userProps == null) {
+                userProps = new Properties();
+            }
+            final String expr;
+            if (arg.length() == 2) {
+                // it means there was a space after -D
+                if (argI == args.length) {
+                    break;
+                }
+                expr = args[argI++];
+            } else {
+                expr = arg.substring(2);
+            }
+
+            int equals = expr.indexOf('=');
+            String name;
+            String parsedValue;
+            if (equals < 0) {
+                name = expr;
+                parsedValue = null;
+            } else {
+                name = expr.substring(0, equals);
+                parsedValue = expr.substring(equals + 1);
+            }
+
+            final String systemValue = System.getProperty(name);
+            if (systemValue == null) {
+                // the property could be coming from MAVEN_OPTS
+                userProps.setProperty(name, parsedValue == null ? "true" : parsedValue);
+            } else {
+                userProps.setProperty(name, systemValue);
+                if (parsedValue != null && !systemValue.equals(parsedValue)) {
+                    // this could be a value with a whitespace, in which case it will appear broken into tokens
+                    int valueI = 0;
+                    int parsedI = argI;
+                    while (valueI < systemValue.length()) {
+                        if (Character.isWhitespace(systemValue.charAt(valueI))) {
+                            ++valueI;
+                            continue;
+                        }
+                        if (!systemValue.startsWith(parsedValue, valueI)) {
+                            break;
+                        }
+                        argI = parsedI;
+                        valueI += parsedValue.length();
+                        if (parsedI < args.length) {
+                            parsedValue = args[parsedI++];
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (argsWoProps != null) {
+            args = argsWoProps.toArray(new String[0]);
+        }
+
         final CommandLine cmdLine;
         try {
             cmdLine = new CLIManager().parse(args);
@@ -27,7 +112,12 @@ public static Map<String, Object> parse(String[] args) {
         putBoolean(cmdLine, map, CLIManager.UPDATE_SNAPSHOTS);
         putBoolean(cmdLine, map, CLIManager.CHECKSUM_FAILURE_POLICY);
         putBoolean(cmdLine, map, CLIManager.CHECKSUM_WARNING_POLICY);
+        putBoolean(cmdLine, map, CLIManager.BATCH_MODE);
+        putBoolean(cmdLine, map, CLIManager.NO_TRANSFER_PROGRESS);
 
+        if (userProps != null) {
+            put(map, String.valueOf(CLIManager.SET_SYSTEM_PROPERTY), userProps);
+        }
         return map;
     }
 
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java
index c59b16f844528..ebfb7b6753a51 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java
@@ -36,6 +36,8 @@ private static class WorkspaceLoader {
         private final Map<Path, Model> cachedModels = new HashMap<>();
         private final Path currentProjectPom;
         private Path workspaceRootPom;
+        // indicates whetehr the workspace root pom has been resolved or provided by the caller
+        private boolean workspaceRootResolved;
 
         private WorkspaceLoader(Path currentProjectPom) throws BootstrapMavenException {
             this.currentProjectPom = isPom(currentProjectPom) ? currentProjectPom
@@ -73,10 +75,10 @@ void setWorkspaceRootPom(Path rootPom) {
         }
 
         private Path getWorkspaceRootPom() throws BootstrapMavenException {
-            return workspaceRootPom == null ? workspaceRootPom = resolveWorkspaceRootPom() : workspaceRootPom;
+            return workspaceRootPom == null ? workspaceRootPom = resolveWorkspaceRootPom(false) : workspaceRootPom;
         }
 
-        private Path resolveWorkspaceRootPom() throws BootstrapMavenException {
+        private Path resolveWorkspaceRootPom(boolean stopAtCached) throws BootstrapMavenException {
             Path rootPom = null;
             Path projectPom = currentProjectPom;
             Model model = model(projectPom);
@@ -105,11 +107,15 @@ private Path resolveWorkspaceRootPom() throws BootstrapMavenException {
                     } else {
                         // if the parent is not at the top of the FS tree, it might have already been parsed
                         model = null;
-                        for (Map.Entry<Path, Model> entry : cachedModels.entrySet()) {
-                            // we are looking for the root dir of the workspace
-                            if (rootPom.getNameCount() > entry.getKey().getNameCount()) {
-                                rootPom = entry.getValue().getPomFile().toPath();
+                        if (!stopAtCached) {
+                            for (Map.Entry<Path, Model> entry : cachedModels.entrySet()) {
+                                // we are looking for the root dir of the workspace
+                                if (rootPom.getNameCount() > entry.getKey().getNameCount()) {
+                                    rootPom = entry.getValue().getPomFile().toPath();
+                                }
                             }
+                            // it is supposed to be the root pom
+                            workspaceRootResolved = true;
                         }
                     }
                 }
@@ -118,10 +124,22 @@ private Path resolveWorkspaceRootPom() throws BootstrapMavenException {
         }
 
         LocalProject load() throws BootstrapMavenException {
-            load(null, getWorkspaceRootPom());
+            final Path rootPom = getWorkspaceRootPom();
+            load(null, rootPom);
             if (workspace.getCurrentProject() == null) {
-                if (!currentProjectPom.equals(getWorkspaceRootPom())) {
-                    load(null, currentProjectPom);
+                if (!currentProjectPom.equals(rootPom)) {
+                    // if the root pom wasn't resolved but provided we are going to try to navigate
+                    // to the very top pom that hasn't already been loaded
+                    if (!workspaceRootResolved) {
+                        final Path resolvedRootPom = resolveWorkspaceRootPom(true);
+                        if (!rootPom.equals(resolvedRootPom)) {
+                            load(null, resolvedRootPom);
+                        }
+                    }
+                    // if the project still wasn't found, we load it directly
+                    if (workspace.getCurrentProject() == null) {
+                        load(null, currentProjectPom);
+                    }
                 }
                 if (workspace.getCurrentProject() == null) {
                     throw new BootstrapMavenException(
@@ -137,8 +155,13 @@ private void load(LocalProject parent, Path pom) throws BootstrapMavenException
             if (parent != null) {
                 parent.modules.add(project);
             }
-            if (workspace.getCurrentProject() == null && currentProjectPom.getParent().equals(project.getDir())) {
-                workspace.setCurrentProject(project);
+            try {
+                if (workspace.getCurrentProject() == null
+                        && Files.isSameFile(currentProjectPom.getParent(), project.getDir())) {
+                    workspace.setCurrentProject(project);
+                }
+            } catch (IOException e) {
+                throw new BootstrapMavenException("Failed to load current project", e);
             }
             final List<String> modules = project.getRawModel().getModules();
             if (!modules.isEmpty()) {
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java
index e4be1893c8fef..53c35fe8b54ac 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalWorkspace.java
@@ -18,6 +18,7 @@
 import org.apache.maven.model.resolution.UnresolvableModelException;
 import org.apache.maven.model.resolution.WorkspaceModelResolver;
 import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.repository.WorkspaceRepository;
 
@@ -70,12 +71,10 @@ public int getId() {
     @Override
     public Model resolveRawModel(String groupId, String artifactId, String versionConstraint)
             throws UnresolvableModelException {
-        final LocalProject project = getProject(groupId, artifactId);
-        return project != null
-                && (versionConstraint == null
-                        || versionConstraint.equals(ModelUtils.getVersion(project.getRawModel())))
-                                ? project.getRawModel()
-                                : null;
+        if (findArtifact(new DefaultArtifact(groupId, artifactId, null, "pom", versionConstraint)) != null) {
+            return getProject(groupId, artifactId).getRawModel();
+        }
+        return null;
     }
 
     @Override
@@ -116,42 +115,60 @@ public File findArtifact(Artifact artifact) {
         }
         final String type = artifact.getExtension();
         if (type.equals(AppArtifactCoords.TYPE_JAR)) {
-            final Path classesDir = lp.getClassesDir();
-            if (Files.exists(classesDir)) {
-                return classesDir.toFile();
+            Path path = lp.getClassesDir();
+            if (Files.exists(path)) {
+                return path.toFile();
             }
 
             // it could be a project with no sources/resources, in which case Maven will create an empty JAR
             // if it has previously been packaged we can return it
-            final Path path = lp.getOutputDir().resolve(getFileName(artifact));
+            path = lp.getOutputDir().resolve(getFileName(artifact));
             if (Files.exists(path)) {
                 return path.toFile();
             }
 
-            // If the project has neither sources nor resources directories then it is an empty JAR.
-            // If this method returns null then the Maven resolver will attempt to resolve the artifact from a repository
-            // which may fail if the artifact hasn't been installed yet.
-            // Here we are checking whether the artifact exists in the local repo first (Quarkus CI creates a Maven repo cache
-            // first and then runs tests using '-pl' in the clean project). If the artifact exists in the local repo we return null,
-            // so the Maven resolver will succeed resolving it from the repo.
-            // If the artifact does not exist in the local repo, we are creating an empty classes directory in the target directory.
-            if (!Files.exists(lp.getSourcesSourcesDir())
-                    && !Files.exists(lp.getResourcesSourcesDir())
-                    && !isFoundInLocalRepo(artifact)) {
-                try {
-                    Files.createDirectories(classesDir);
-                    return classesDir.toFile();
-                } catch (IOException e) {
-                    // ignore and return null
-                }
+            path = emptyJarOutput(lp, artifact);
+            if (path != null) {
+                return path.toFile();
             }
 
             // otherwise, this project hasn't been built yet
         } else if (type.equals(AppArtifactCoords.TYPE_POM)) {
             final File pom = lp.getRawModel().getPomFile();
-            if (pom.exists()) {
+            // if the pom exists we should also check whether the main artifact can also be resolved from the workspace
+            if (pom.exists() && ("pom".equals(lp.getRawModel().getPackaging())
+                    || Files.exists(lp.getOutputDir())
+                    || emptyJarOutput(lp, artifact) != null)) {
                 return pom;
             }
+        } else {
+            // check whether the artifact exists in the project's output dir
+            final Path path = lp.getOutputDir().resolve(getFileName(artifact));
+            if (Files.exists(path)) {
+                return path.toFile();
+            }
+        }
+        return null;
+    }
+
+    private Path emptyJarOutput(LocalProject lp, Artifact artifact) {
+        // If the project has neither sources nor resources directories then it is an empty JAR.
+        // If this method returns null then the Maven resolver will attempt to resolve the artifact from a repository
+        // which may fail if the artifact hasn't been installed yet.
+        // Here we are checking whether the artifact exists in the local repo first (Quarkus CI creates a Maven repo cache
+        // first and then runs tests using '-pl' in the clean project). If the artifact exists in the local repo we return null,
+        // so the Maven resolver will succeed resolving it from the repo.
+        // If the artifact does not exist in the local repo, we are creating an empty classes directory in the target directory.
+        if (!Files.exists(lp.getSourcesSourcesDir())
+                && !Files.exists(lp.getResourcesSourcesDir())
+                && !isFoundInLocalRepo(artifact)) {
+            try {
+                final Path classesDir = lp.getClassesDir();
+                Files.createDirectories(classesDir);
+                return classesDir;
+            } catch (IOException e) {
+                // ignore and return null
+            }
         }
         return null;
     }
@@ -171,7 +188,7 @@ private boolean isFoundInLocalRepo(Artifact artifact) {
         return Files.exists(p);
     }
 
-    private static String getFileName(Artifact artifact) {
+    public static String getFileName(Artifact artifact) {
         final StringBuilder fileName = new StringBuilder();
         fileName.append(artifact.getArtifactId()).append('-').append(artifact.getVersion());
         if (!artifact.getClassifier().isEmpty()) {
@@ -193,17 +210,15 @@ private String getLocalRepo() {
 
     @Override
     public List<String> findVersions(Artifact artifact) {
-        if (lastFindVersionsKey != null && artifact.getVersion().equals(lastFindVersions.get(0))
-                && lastFindVersionsKey.getArtifactId().equals(artifact.getArtifactId())
+        if (lastFindVersionsKey != null && lastFindVersionsKey.getArtifactId().equals(artifact.getArtifactId())
+                && artifact.getVersion().equals(lastFindVersions.get(0))
                 && lastFindVersionsKey.getGroupId().equals(artifact.getGroupId())) {
             return lastFindVersions;
         }
-        lastFindVersionsKey = new AppArtifactKey(artifact.getGroupId(), artifact.getArtifactId());
-        final LocalProject lp = getProject(lastFindVersionsKey);
-        if (lp == null || !lp.getVersion().equals(artifact.getVersion())) {
-            lastFindVersionsKey = null;
+        if (findArtifact(artifact) == null) {
             return Collections.emptyList();
         }
+        lastFindVersionsKey = new AppArtifactKey(artifact.getGroupId(), artifact.getArtifactId());
         return lastFindVersions = Collections.singletonList(artifact.getVersion());
     }
 
diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java
index ee78b8526ff6a..5a478fb72ffd1 100644
--- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/ModelUtils.java
@@ -71,10 +71,9 @@ public static AppArtifact getStateArtifact(AppArtifact appArtifact) {
      * @param deps POM model application dependencies
      * @param appDeps resolved application dependencies
      * @return dependencies that can be checked for updates
-     * @throws AppCreatorException in case of a failure
      */
     public static List<AppDependency> getUpdateCandidates(List<Dependency> deps, List<AppDependency> appDeps,
-            Set<String> groupIds) throws IOException {
+            Set<String> groupIds) {
         final Map<AppArtifactKey, AppDependency> appDepMap = new LinkedHashMap<>(appDeps.size());
         for (AppDependency appDep : appDeps) {
             final AppArtifact appArt = appDep.getArtifact();
@@ -121,15 +120,22 @@ public static AppArtifact resolveAppArtifact(Path appJar) throws IOException {
                                 final Path propsPath = artifactIdPath.resolve("pom.properties");
                                 if (Files.exists(propsPath)) {
                                     final Properties props = loadPomProps(appJar, artifactIdPath);
-                                    return new AppArtifact(props.getProperty("groupId"), props.getProperty("artifactId"),
+                                    AppArtifact appArtifact = new AppArtifact(props.getProperty("groupId"),
+                                            props.getProperty("artifactId"),
                                             props.getProperty("version"));
+                                    appArtifact.setPath(appJar);
+                                    return appArtifact;
                                 }
                             }
                         }
                     }
                 }
             }
-            throw new IOException("Failed to located META-INF/maven/<groupId>/<artifactId>/pom.properties in " + appJar);
+            AppArtifact appArtifact = new AppArtifact("unknown", "unknown",
+                    "1.0-SNAPSHOT");
+            appArtifact.setPath(appJar);
+
+            return appArtifact;
         }
     }
 
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java
index 6344d8e02162c..fdd6334caadc3 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BasicPomReposEffectivePomTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import java.nio.file.Files;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +12,7 @@ public class BasicPomReposEffectivePomTest extends BootstrapMavenContextTestBase
     @Test
     public void basicPomRepos() throws Exception {
         final BootstrapMavenContext mvn = bootstrapMavenContextForProject("effective-pom/basic-pom-repos");
+        Files.createDirectories(mvn.getCurrentProjectBaseDir().resolve("target"));
         assertEquals(
                 Arrays.asList(
                         newRepo("central", "https://pom.central"),
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java
index 7537056c061e2..3f99cea1fbc30 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/BootstrapMavenOptionsTest.java
@@ -4,6 +4,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
+import java.util.Properties;
+import org.apache.maven.cli.CLIManager;
 import org.junit.jupiter.api.Test;
 
 public class BootstrapMavenOptionsTest {
@@ -58,7 +60,68 @@ public void testChecksumWarningPolicy() throws Exception {
         assertTrue(parseOptions.hasOption(BootstrapMavenOptions.CHECKSUM_WARNING_POLICY));
     }
 
+    @Test
+    public void testBatchMode() {
+        assertEquals("" + CLIManager.BATCH_MODE, BootstrapMavenOptions.BATCH_MODE);
+        assertTrue(parseOptions("clean install -B").hasOption(BootstrapMavenOptions.BATCH_MODE));
+        assertTrue(parseOptions("clean install --batch-mode").hasOption(BootstrapMavenOptions.BATCH_MODE));
+    }
+
+    @Test
+    public void testNoTransferProgress() {
+        assertEquals(CLIManager.NO_TRANSFER_PROGRESS, BootstrapMavenOptions.NO_TRANSFER_PROGRESS);
+        assertTrue(parseOptions("clean install -ntp").hasOption(BootstrapMavenOptions.NO_TRANSFER_PROGRESS));
+        assertTrue(parseOptions("clean install --no-transfer-progress").hasOption(BootstrapMavenOptions.NO_TRANSFER_PROGRESS));
+    }
+
+    @Test
+    public void testSystemPropertiesWithWhitespaces() throws Exception {
+        try (AutoCloseable whiteSpace = setProperty("white.space", " value with spaces ");
+                AutoCloseable nested = setProperty("nested", "  -Dnested=other ");
+                AutoCloseable noValue = setProperty("no-value", "");
+                AutoCloseable mix = setProperty("quarkus.args", "get abc -u foo --password foo-bar")) {
+            final BootstrapMavenOptions parseOptions = parseOptions("package " + whiteSpace + nested + noValue + " " + mix);
+            final Properties userProps = parseOptions.getSystemProperties();
+            assertEquals(" value with spaces ", userProps.getProperty("white.space"));
+            assertEquals("  -Dnested=other ", userProps.getProperty("nested"));
+            assertEquals("", userProps.getProperty("no-value"));
+            assertEquals("get abc -u foo --password foo-bar", userProps.getProperty("quarkus.args"));
+            assertEquals(4, userProps.size());
+        }
+    }
+
     private BootstrapMavenOptions parseOptions(String line) {
         return BootstrapMavenOptions.newInstance(line);
     }
+
+    private static AutoCloseable setProperty(String name, String value) {
+        return new AutoCloseable() {
+            final boolean clear;
+            final String original;
+            {
+                clear = !System.getProperties().containsKey(name);
+                original = System.setProperty(name, value);
+            }
+
+            @Override
+            public void close() throws Exception {
+                if (clear) {
+                    System.clearProperty(name);
+                } else {
+                    System.setProperty(name, original);
+                }
+            }
+
+            @Override
+            public String toString() {
+                final StringBuilder buf = new StringBuilder();
+                buf.append("-D").append(name);
+                if (value != null && !value.isEmpty()) {
+                    buf.append('=');
+                    buf.append(value);
+                }
+                return buf.toString();
+            }
+        };
+    }
 }
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java
index c19d24aec339d..13a575e5799ad 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/CentralRepoOverridesEffectivePomTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import java.nio.file.Files;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +12,7 @@ public class CentralRepoOverridesEffectivePomTest extends BootstrapMavenContextT
     @Test
     public void basicPomRepos() throws Exception {
         final BootstrapMavenContext mvn = bootstrapMavenContextForProject("effective-pom/central-repo-overrides");
+        Files.createDirectories(mvn.getCurrentProjectBaseDir().resolve("target"));
         assertEquals(
                 Arrays.asList(
                         newRepo("central", "https://settings.central"),
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java
index 84dda9f40d2dc..ae42d9b071bde 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomProfileReposEffectivePomTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import java.nio.file.Files;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 
@@ -12,6 +13,7 @@ public class PomProfileReposEffectivePomTest extends BootstrapMavenContextTestBa
     public void basicPomRepos() throws Exception {
         setSystemProp("another-profile", "yes");
         final BootstrapMavenContext mvn = bootstrapMavenContextForProject("effective-pom/pom-profile-repos");
+        Files.createDirectories(mvn.getCurrentProjectBaseDir().resolve("target"));
         assertEquals(
                 Arrays.asList(
                         newRepo("another-profile-repo", "https://another-profile.repo"),
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java
index 0f1d5a92b4ece..24d05bb7f83eb 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/PomReposMirroredTest.java
@@ -7,6 +7,7 @@
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
@@ -37,6 +38,7 @@ protected BootstrapMavenContextConfig<?> initBootstrapMavenContextConfig() throw
     @Test
     public void basicPomRepos() throws Exception {
         final BootstrapMavenContext mvn = bootstrapMavenContextWithSettings("custom-settings/pom-repos-mirrored");
+        Files.createDirectories(mvn.getCurrentProjectBaseDir().resolve("target"));
 
         final List<RemoteRepository> repos = mvn.getRemoteRepositories();
         assertEquals(1, repos.size());
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java
index 6482e87e8db41..7ba2d65514f1b 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SettingsProfileReposAndPomReposEffectivePomTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import java.nio.file.Files;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +12,7 @@ public class SettingsProfileReposAndPomReposEffectivePomTest extends BootstrapMa
     @Test
     public void settingsProfileReposAndPomRepos() throws Exception {
         final BootstrapMavenContext mvn = bootstrapMavenContextForProject("effective-pom/settings-profile-and-pom-repos");
+        Files.createDirectories(mvn.getCurrentProjectBaseDir().resolve("target"));
         assertEquals(
                 Arrays.asList(
                         newRepo("settings-central", "https://settings.central"),
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java
index ea843b3e270cf..4e9e849343632 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/resolver/maven/test/SubmodulePomReposEffectivePomTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import java.nio.file.Files;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +12,7 @@ public class SubmodulePomReposEffectivePomTest extends BootstrapMavenContextTest
     @Test
     public void basicPomRepos() throws Exception {
         final BootstrapMavenContext mvn = bootstrapMavenContextForProject("effective-pom/submodule-repos/module");
+        Files.createDirectories(mvn.getCurrentProjectBaseDir().resolve("target"));
         assertEquals(
                 Arrays.asList(
                         newRepo("module-pom-repo", "https://module-pom.repo"),
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java
index e3057e31c800c..e5623297b80a0 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java
+++ b/independent-projects/bootstrap/maven-resolver/src/test/java/io/quarkus/bootstrap/workspace/test/LocalWorkspaceDiscoveryTest.java
@@ -10,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
 import io.quarkus.bootstrap.util.IoUtils;
@@ -116,6 +117,27 @@ public static void cleanup() {
         IoUtils.recursiveDelete(workDir);
     }
 
+    @Test
+    public void loadWorkspaceWithDirBreaks() throws Exception {
+        final URL projectUrl = Thread.currentThread().getContextClassLoader().getResource("workspace-with-dir-breaks/root");
+        assertNotNull(projectUrl);
+        final Path rootProjectDir = Paths.get(projectUrl.toURI());
+        assertTrue(Files.exists(rootProjectDir));
+        final Path nestedProjectDir = rootProjectDir.resolve("module1/break/nested-project/module1");
+        assertTrue(Files.exists(nestedProjectDir));
+
+        final LocalWorkspace ws = new BootstrapMavenContext(BootstrapMavenContext.config()
+                .setRootProjectDir(rootProjectDir)
+                .setCurrentProject(nestedProjectDir.toString()))
+                        .getWorkspace();
+
+        assertNotNull(ws.getProject("org.acme", "nested-project-module1"));
+        assertNotNull(ws.getProject("org.acme", "nested-project-parent"));
+        assertNotNull(ws.getProject("org.acme", "root-module1"));
+        assertNotNull(ws.getProject("org.acme", "root"));
+        assertEquals(4, ws.getProjects().size());
+    }
+
     @Test
     public void loadWorkspaceFromRootDirWithParentInChildDir() throws Exception {
         final URL projectUrl = Thread.currentThread().getContextClassLoader().getResource("workspace-parent-is-not-root-dir");
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/build-directories/multimodule/runner/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/build-directories/multimodule/runner/pom.xml
index 6bbad54d5e452..25a114a73fcf2 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/build-directories/multimodule/runner/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/build-directories/multimodule/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>multimodule-main</artifactId>
 
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/pom.xml
index 117e215629459..e879ab815263e 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root</artifactId>
         <version>1.0</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-module1</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/submodule/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/submodule/pom.xml
index 3e0e21aa61255..1b5499461145b 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/submodule/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module1/submodule/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root-module1</artifactId>
         <version>1.0</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-submodule</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module2/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module2/pom.xml
index c0c5cf8446d8b..08824c47376d1 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module2/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-alternate-pom/root/module2/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root</artifactId>
         <version>1.0</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-module2</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-changelist/root/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-changelist/root/module1/pom.xml
index f4537bbf4663e..62f30038ddb37 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-changelist/root/module1/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-changelist/root/module1/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root</artifactId>
         <version>${changelist}</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-module1</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-multiple/root/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-multiple/root/module1/pom.xml
index 33fd0fd52fbd1..02c7f9b84057a 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-multiple/root/module1/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-multiple/root/module1/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root</artifactId>
         <version>${revision}${sha1}${changelist}</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-module1</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-revision/root/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-revision/root/module1/pom.xml
index 9f14f092b78f3..0da285a2af202 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-revision/root/module1/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-revision/root/module1/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root</artifactId>
         <version>${revision}</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-module1</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-sha1/root/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-sha1/root/module1/pom.xml
index aded96c526d14..50068f2bf6963 100644
--- a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-sha1/root/module1/pom.xml
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-sha1/root/module1/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>root</artifactId>
         <version>${sha1}</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>root-module1</artifactId>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/break/nested-project/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/break/nested-project/module1/pom.xml
new file mode 100644
index 0000000000000..73abeb860fdf9
--- /dev/null
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/break/nested-project/module1/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>nested-project-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>nested-project-module1</artifactId>
+</project>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/break/nested-project/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/break/nested-project/pom.xml
new file mode 100644
index 0000000000000..aceacea919e5f
--- /dev/null
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/break/nested-project/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>root-module1</artifactId>
+        <version>1.0</version>
+        <relativePath/>
+    </parent>
+
+    <artifactId>nested-project-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>module1</module>
+    </modules>
+
+</project>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/pom.xml
new file mode 100644
index 0000000000000..579e463972376
--- /dev/null
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/module1/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>root</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>root-module1</artifactId>
+</project>
diff --git a/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/pom.xml b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/pom.xml
new file mode 100644
index 0000000000000..4b6d30d45ede5
--- /dev/null
+++ b/independent-projects/bootstrap/maven-resolver/src/test/resources/workspace-with-dir-breaks/root/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.acme</groupId>
+    <artifactId>root</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>module1</module>
+    </modules>
+
+</project>
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index 49fc1342851ed..596389e3ead50 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-bootstrap-parent</artifactId>
@@ -16,7 +16,7 @@
         <license>
             <name>Apache License, Version 2.0</name>
             <distribution>repo</distribution>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
         </license>
     </licenses>
     <properties>
@@ -26,7 +26,7 @@
         <!-- Versions -->
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.3.2.Final</jboss-logging.version>
-        <junit.jupiter.version>5.6.2</junit.jupiter.version>
+        <junit.jupiter.version>5.7.1</junit.jupiter.version>
         <maven-core.version>3.6.3</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.3.4</sisu.version><!-- Keep in sync with maven-core.version -->
         <maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
@@ -35,21 +35,21 @@
         <plexus-cypher.version>1.7</plexus-cypher.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
-        <jackson.version>2.11.1</jackson.version>
+        <jackson.version>2.12.1</jackson.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
         <jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
         <jakarta.inject-api.version>1.0</jakarta.inject-api.version>
-        <commons-lang.version>3.9</commons-lang.version>
-        <guava.version>27.0.1-jre</guava.version>
-        <asm.version>8.0.1</asm.version>
+        <commons-lang.version>3.12.0</commons-lang.version>
+        <guava.version>30.1-jre</guava.version>
         <shrinkwrap-depchain.version>1.2.6</shrinkwrap-depchain.version>
-        <jboss-logmanager-embedded.version>1.0.4</jboss-logmanager-embedded.version>
-        <slf4j-jboss-logging.version>1.2.0.Final</slf4j-jboss-logging.version>
-        <graal-sdk.version>20.1.0</graal-sdk.version>
+        <jboss-logmanager-embedded.version>1.0.5</jboss-logmanager-embedded.version>
+        <slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
+        <slf4j-api.version>1.7.30</slf4j-api.version>
+        <graal-sdk.version>21.0.0</graal-sdk.version>
         <plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
-        <smallrye-common.version>1.1.0</smallrye-common.version>
-        <gradle-tooling.version>6.5</gradle-tooling.version>
+        <smallrye-common.version>1.5.0</smallrye-common.version>
+        <gradle-tooling.version>6.8.3</gradle-tooling.version>
     </properties>
     <modules>
         <module>app-model</module>
@@ -61,11 +61,6 @@
     </modules>
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>${asm.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -330,8 +325,13 @@
             </dependency>
             <dependency>
                 <groupId>org.jboss.slf4j</groupId>
-                <artifactId>slf4j-jboss-logging</artifactId>
-                <version>${slf4j-jboss-logging.version}</version>
+                <artifactId>slf4j-jboss-logmanager</artifactId>
+                <version>${slf4j-jboss-logmanager.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
@@ -366,10 +366,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- Smallrye Common dependencies, imported as a BOM -->
             <dependency>
                 <groupId>io.smallrye.common</groupId>
-                <artifactId>smallrye-common-io</artifactId>
+                <artifactId>smallrye-common-bom</artifactId>
                 <version>${smallrye-common.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -453,7 +456,8 @@
                                             <exclude>commons-logging:commons-logging-api</exclude>
                                             <exclude>org.springframework:spring-jcl</exclude>
                                             <exclude>org.slf4j:jcl-over-slf4j</exclude>
-                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logging instead) -->
+                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logmanager instead) -->
+                                            <exclude>org.jboss.slf4j:slf4j-jboss-logging</exclude>
                                             <exclude>org.slf4j:slf4j-simple</exclude>
                                             <exclude>org.slf4j:slf4j-nop</exclude>
                                             <exclude>org.slf4j:slf4j-jdk14</exclude>
@@ -479,7 +483,7 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.12.1</version>
+                    <version>2.14.0</version>
                     <dependencies>
                         <dependency>
                             <artifactId>quarkus-ide-config</artifactId>
@@ -496,7 +500,7 @@
                 <plugin>
                     <groupId>net.revelc.code</groupId>
                     <artifactId>impsort-maven-plugin</artifactId>
-                    <version>1.4.1</version>
+                    <version>1.6.0</version>
                     <configuration>
                         <removeUnused>true</removeUnused>
                         <skip>${format.skip}</skip>
@@ -517,15 +521,17 @@
         </repository>
     </distributionManagement>
 
-    <repositories>
-        <repository>
-            <id>gradle-dependencies</id>
-            <name>Gradle releases repository</name>
-            <url>https://repo.gradle.org/gradle/libs-releases</url>
-        </repository>
-    </repositories>
-
     <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
         <profile>
             <id>quick-build</id>
             <activation>
@@ -543,6 +549,21 @@
                 <defaultGoal>clean install</defaultGoal>
             </build>
         </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -553,7 +574,7 @@
                         <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
diff --git a/independent-projects/bootstrap/runner/pom.xml b/independent-projects/bootstrap/runner/pom.xml
index 11e0dc084a262..4d57c3edab7ee 100644
--- a/independent-projects/bootstrap/runner/pom.xml
+++ b/independent-projects/bootstrap/runner/pom.xml
@@ -20,8 +20,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.graalvm.sdk</groupId>
-            <artifactId>graal-sdk</artifactId>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-io</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logmanager</groupId>
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/graal/ImageInfo.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/graal/ImageInfo.java
new file mode 100644
index 0000000000000..349f4b33b7ad7
--- /dev/null
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/graal/ImageInfo.java
@@ -0,0 +1,17 @@
+package io.quarkus.bootstrap.graal;
+
+/**
+ * This class essentially contains the same code as {@code org.graalvm.nativeimage.ImageInfo}
+ * but we copy it here as we don't want to have to depend {@code org.graalvm.sdk:graal-sdk}
+ * and make it a runtimeParentFirst artifact
+ */
+public final class ImageInfo {
+
+    public static boolean inImageRuntimeCode() {
+        return "runtime".equals(System.getProperty("org.graalvm.nativeimage.imagecode"));
+    }
+
+    public static boolean inImageBuildtimeCode() {
+        return "buildtime".equals(System.getProperty("org.graalvm.nativeimage.imagecode"));
+    }
+}
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java
index 54e2ad661bd0a..f15c3d93c2c4e 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/InitialConfigurator.java
@@ -1,39 +1,18 @@
 package io.quarkus.bootstrap.logging;
 
+import io.quarkus.bootstrap.graal.ImageInfo;
 import java.util.logging.Handler;
 import java.util.logging.Level;
-import org.graalvm.nativeimage.ImageInfo;
 import org.jboss.logmanager.EmbeddedConfigurator;
 import org.jboss.logmanager.formatters.PatternFormatter;
 import org.jboss.logmanager.handlers.ConsoleHandler;
-import org.jboss.logmanager.handlers.DelayedHandler;
 
 /**
  *
  */
 public final class InitialConfigurator implements EmbeddedConfigurator {
 
-    public static final DelayedHandler DELAYED_HANDLER;
-
-    static {
-        //a hack around class loading
-        //this is always loaded in the root class loader with jboss-logmanager,
-        //however it may also be loaded in an isolated CL when running in dev
-        //or test mode. If it is in an isolated CL we load the handler from
-        //the class on the system class loader so they are equal
-        //TODO: should this class go in its own module and be excluded from isolated class loading?
-        DelayedHandler handler = new DelayedHandler();
-        ClassLoader cl = InitialConfigurator.class.getClassLoader();
-        try {
-            Class<?> root = Class.forName(InitialConfigurator.class.getName(), false, ClassLoader.getSystemClassLoader());
-            if (root.getClassLoader() != cl) {
-                handler = (DelayedHandler) root.getDeclaredField("DELAYED_HANDLER").get(null);
-            }
-        } catch (Exception e) {
-            //ignore, happens on native image build
-        }
-        DELAYED_HANDLER = handler;
-    }
+    public static final QuarkusDelayedHandler DELAYED_HANDLER = new QuarkusDelayedHandler();
 
     @Override
     public Level getMinimumLevelOf(final String loggerName) {
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java
new file mode 100644
index 0000000000000..b39f29a5d57fd
--- /dev/null
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2018 Red Hat, Inc.
+ *
+ * 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 io.quarkus.bootstrap.logging;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+import java.util.logging.ErrorManager;
+import java.util.logging.Formatter;
+import java.util.logging.Handler;
+import java.util.logging.Logger;
+import org.jboss.logmanager.ExtHandler;
+import org.jboss.logmanager.ExtLogRecord;
+import org.jboss.logmanager.StandardOutputStreams;
+import org.jboss.logmanager.formatters.PatternFormatter;
+
+/**
+ * A handler that queues messages until it's at least one child handler is {@linkplain #addHandler(Handler) added} or
+ * {@linkplain #setHandlers(Handler[]) set}. If the children handlers are {@linkplain #clearHandlers() cleared} then
+ * the handler is no longer considered activated and messages will once again be queued.
+ */
+@SuppressWarnings({ "unused", "WeakerAccess" })
+public class QuarkusDelayedHandler extends ExtHandler {
+
+    private final Deque<ExtLogRecord> logRecords = new ArrayDeque<>();
+    private final List<Runnable> logCloseTasks = new ArrayList<>();
+
+    private final int queueLimit;
+    private volatile boolean buildTimeLoggingActivated = false;
+    private volatile boolean activated = false;
+    private volatile boolean callerCalculationRequired = false;
+
+    public QuarkusDelayedHandler() {
+        this(4000);
+    }
+
+    public QuarkusDelayedHandler(final int queueLimit) {
+        this.queueLimit = queueLimit;
+    }
+
+    @Override
+    protected void doPublish(final ExtLogRecord record) {
+        // If activated just delegate
+        if (activated) {
+            publishToNestedHandlers(record);
+            super.doPublish(record);
+        } else {
+            synchronized (this) {
+                // Check one more time to see if we've been activated before queuing the messages
+                if (activated || buildTimeLoggingActivated) {
+                    publishToNestedHandlers(record);
+                    super.doPublish(record);
+                } else {
+                    // Determine whether the queue was overrun
+                    if (logRecords.size() >= queueLimit) {
+                        reportError(
+                                "The delayed handler's queue was overrun and log record(s) were lost. Did you forget to configure logging?",
+                                null, ErrorManager.WRITE_FAILURE);
+                        return;
+                    }
+                    // Determine if we need to calculate the caller information before we queue the record
+                    if (isCallerCalculationRequired()) {
+                        // prepare record to move to another thread
+                        record.copyAll();
+                    } else {
+                        // Disable the caller calculation since it's been determined we won't be using it
+                        record.disableCallerCalculation();
+                        // Copy the MDC over
+                        record.copyMdc();
+                    }
+                    logRecords.addLast(record);
+                }
+            }
+        }
+    }
+
+    @Override
+    public final void close() throws SecurityException {
+        synchronized (this) {
+            if (!logRecords.isEmpty()) {
+                Formatter formatter = getFormatter();
+                if (formatter == null) {
+                    formatter = new PatternFormatter("%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n");
+                }
+                StandardOutputStreams.printError("The DelayedHandler was closed before any children handlers were " +
+                        "configured. Messages will be written to stderr.");
+                // Always attempt to drain the queue
+                ExtLogRecord record;
+                while ((record = logRecords.pollFirst()) != null) {
+                    StandardOutputStreams.printError(formatter.format(record));
+                }
+            }
+        }
+        activated = false;
+        super.close();
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Note that once this is invoked the handler will be activated and the messages will no longer be queued. If more
+     * than one child handler is required the {@link #setHandlers(Handler[])} should be used.
+     * </p>
+     *
+     * @see #setHandlers(Handler[])
+     */
+    @Override
+    public void addHandler(final Handler handler) throws SecurityException {
+        super.addHandler(handler);
+        activate();
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Note that once this is invoked the handler will be activated and the messages will no longer be queued.
+     * </p>
+     */
+    @Override
+    public Handler[] setHandlers(final Handler[] newHandlers) throws SecurityException {
+        final Handler[] result = super.setHandlers(newHandlers);
+        activate();
+        return result;
+    }
+
+    public void addLoggingCloseTask(Runnable runnable) {
+        logCloseTasks.add(runnable);
+    }
+
+    public synchronized Handler[] setBuildTimeHandlers(final Handler[] newHandlers) throws SecurityException {
+        final Handler[] result = super.setHandlers(newHandlers);
+        buildTimeLoggingActivated = true;
+        ExtLogRecord record;
+        while ((record = logRecords.pollFirst()) != null) {
+            if (isEnabled() && isLoggable(record) && Logger.getLogger(record.getLoggerName()).isLoggable(record.getLevel())) {
+                publishToNestedHandlers(record);
+            }
+        }
+        return result;
+    }
+
+    public synchronized void buildTimeComplete() {
+        buildTimeLoggingActivated = false;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Note that if the last child handler is removed the handler will no longer be activated and the messages will
+     * again be queued.
+     * </p>
+     *
+     * @see #clearHandlers()
+     */
+    @Override
+    public void removeHandler(final Handler handler) throws SecurityException {
+        super.removeHandler(handler);
+        activated = handlers.length != 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Note that once this is invoked the handler will no longer be activated and messages will again be queued.
+     * </p>
+     *
+     * @see #removeHandler(Handler)
+     */
+    @Override
+    public Handler[] clearHandlers() throws SecurityException {
+        activated = false;
+        for (Runnable i : logCloseTasks) {
+            i.run();
+        }
+        return super.clearHandlers();
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * This can be overridden to always require the caller calculation by setting the
+     * {@link #setCallerCalculationRequired(boolean)} value to {@code true}.
+     * </p>
+     *
+     * @see #setCallerCalculationRequired(boolean)
+     */
+    @Override
+    public boolean isCallerCalculationRequired() {
+        return callerCalculationRequired || super.isCallerCalculationRequired();
+    }
+
+    /**
+     * Sets whether or not {@linkplain ExtLogRecord#copyAll() caller information} will be required when formatting
+     * records.
+     * <p>
+     * If set to {@code true} the {@linkplain ExtLogRecord#copyAll() caller information} will be calculated for each
+     * record that is placed in the queue. A value of {@code false} means the
+     * {@link super#isCallerCalculationRequired()} will be used.
+     * </p>
+     * <p>
+     * Note that the caller information is only attempted to be calculated when the handler has not been activated. Once
+     * activated it's up to the {@linkplain #getHandlers() children handlers} to determine how the record is processed.
+     * </p>
+     *
+     * @param callerCalculationRequired {@code true} if the {@linkplain ExtLogRecord#copyAll() caller information}
+     *        should always be calculated before the record is being placed in the queue
+     */
+    public void setCallerCalculationRequired(final boolean callerCalculationRequired) {
+        this.callerCalculationRequired = callerCalculationRequired;
+    }
+
+    /**
+     * Indicates whether or not this handler has been activated.
+     *
+     * @return {@code true} if the handler has been activated, otherwise {@code false}
+     */
+    public final boolean isActivated() {
+        return activated;
+    }
+
+    private synchronized void activate() {
+        // Always attempt to drain the queue
+        ExtLogRecord record;
+        while ((record = logRecords.pollFirst()) != null) {
+            if (isEnabled() && isLoggable(record) && Logger.getLogger(record.getLoggerName()).isLoggable(record.getLevel())) {
+                publishToNestedHandlers(record);
+            }
+        }
+        activated = true;
+    }
+}
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/ClassLoadingResource.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/ClassLoadingResource.java
index 1e344e5fff6a4..58bae161452b2 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/ClassLoadingResource.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/ClassLoadingResource.java
@@ -5,14 +5,35 @@
 
 public interface ClassLoadingResource {
 
+    /**
+     * A lifecycle hook that should be called when the ClassLoader to which this resource belongs to
+     * is constructed
+     */
+    void init(ClassLoader runnerClassLoader);
+
     byte[] getResourceData(String resource);
 
     URL getResourceURL(String resource);
 
     ManifestInfo getManifestInfo();
 
-    ProtectionDomain getProtectionDomain(ClassLoader runnerClassLoader);
+    /**
+     * This can only be called after {@code init} has been called
+     */
+    ProtectionDomain getProtectionDomain();
 
     void close();
 
+    /**
+     * This is an optional hint to release internal caches, if possible.
+     * It is different than {@link #close()} as it's possible that
+     * this ClassLoadingResource will still be used after this,
+     * so it needs to be able to rebuild any lost state in case of need.
+     * However one can assume that when this is invoked, there is
+     * some reasonable expectation that this resource is no longer going
+     * to be necessary.
+     */
+    default void resetInternalCaches() {
+        //no-op
+    }
 }
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java
index 84a3c1b8154c5..f0af84755c227 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/JarResource.java
@@ -1,5 +1,7 @@
 package io.quarkus.bootstrap.runner;
 
+import io.smallrye.common.io.jar.JarEntries;
+import io.smallrye.common.io.jar.JarFiles;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -10,6 +12,11 @@
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 import java.security.cert.Certificate;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -20,50 +27,99 @@ public class JarResource implements ClassLoadingResource {
 
     private final ManifestInfo manifestInfo;
     private final Path jarPath;
-    private volatile ZipFile zipFile;
+
+    private final Lock readLock;
+    private final Lock writeLock;
+
+    private volatile ProtectionDomain protectionDomain;
+
+    //Guarded by the read/write lock; open/close operations on the JarFile require the exclusive lock,
+    //while using an existing open reference can use the shared lock.
+    //If a lock is acquired, and as long as it's owned, we ensure that the zipFile reference
+    //points to an open JarFile instance, and read operations are valid.
+    //To close the jar, the exclusive lock must be owned, and reference will be set to null before releasing it.
+    //Likewise, opening a JarFile requires the exclusive lock.
+    private volatile JarFile zipFile;
 
     public JarResource(ManifestInfo manifestInfo, Path jarPath) {
         this.manifestInfo = manifestInfo;
         this.jarPath = jarPath;
+        final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
+        this.readLock = readWriteLock.readLock();
+        this.writeLock = readWriteLock.writeLock();
     }
 
     @Override
-    public byte[] getResourceData(String resource) {
-        ZipFile zipFile = file();
-        ZipEntry entry = zipFile.getEntry(resource);
-        if (entry == null) {
-            return null;
+    public void init(ClassLoader runnerClassLoader) {
+        final URL url;
+        try {
+            String path = jarPath.toAbsolutePath().toString();
+            if (!path.startsWith("/")) {
+                path = '/' + path;
+            }
+            URI uri = new URI("file", null, path, null);
+            url = uri.toURL();
+        } catch (URISyntaxException | MalformedURLException e) {
+            throw new RuntimeException("Unable to create protection domain for " + jarPath, e);
         }
-        try (InputStream is = zipFile.getInputStream(entry)) {
-            byte[] data = new byte[(int) entry.getSize()];
-            int pos = 0;
-            int rem = data.length;
-            while (rem > 0) {
-                int read = is.read(data, pos, rem);
-                if (read == -1) {
-                    throw new RuntimeException("Failed to read all data for " + resource);
+        this.protectionDomain = new ProtectionDomain(new CodeSource(url, (Certificate[]) null), null, runnerClassLoader, null);
+    }
+
+    @Override
+    public byte[] getResourceData(String resource) {
+        final ZipFile zipFile = readLockAcquireAndGetJarReference();
+        try {
+            ZipEntry entry = zipFile.getEntry(resource);
+            if (entry == null) {
+                return null;
+            }
+            try (InputStream is = zipFile.getInputStream(entry)) {
+                byte[] data = new byte[(int) entry.getSize()];
+                int pos = 0;
+                int rem = data.length;
+                while (rem > 0) {
+                    int read = is.read(data, pos, rem);
+                    if (read == -1) {
+                        throw new RuntimeException("Failed to read all data for " + resource);
+                    }
+                    pos += read;
+                    rem -= read;
                 }
-                pos += read;
-                rem -= read;
+                return data;
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to read zip entry " + resource, e);
             }
-            return data;
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to read zip entry " + resource, e);
+        } finally {
+            readLock.unlock();
         }
     }
 
     @Override
     public URL getResourceURL(String resource) {
-        ZipFile zipFile = file();
-        ZipEntry entry = zipFile.getEntry(resource);
-        if (entry == null) {
-            return null;
-        }
+        final JarFile jarFile = readLockAcquireAndGetJarReference();
         try {
-            URI jarUri = jarPath.toUri();
-            return new URL("jar", null, jarUri.getScheme() + ":" + jarUri.getPath() + "!/" + resource);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
+            JarEntry entry = jarFile.getJarEntry(resource);
+            if (entry == null) {
+                return null;
+            }
+            try {
+                String realName = JarEntries.getRealName(entry);
+                // Avoid ending the URL with / to avoid breaking compatibility
+                if (realName.endsWith("/")) {
+                    realName = realName.substring(0, realName.length() - 1);
+                }
+                final URI jarUri = jarPath.toUri();
+                // first create a URI which includes both the jar file path and the relative resource name
+                // and then invoke a toURL on it. The URI reconstruction allows for any encoding to be done
+                // for the "path" which includes the "realName"
+                final URL resUrl = new URI(jarUri.getScheme(), jarUri.getPath() + "!/" + realName, null).toURL();
+                // wrap it up into a "jar" protocol URL
+                return new URL("jar", null, resUrl.getProtocol() + ':' + resUrl.getPath());
+            } catch (MalformedURLException | URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+        } finally {
+            readLock.unlock();
         }
     }
 
@@ -73,46 +129,77 @@ public ManifestInfo getManifestInfo() {
     }
 
     @Override
-    public ProtectionDomain getProtectionDomain(ClassLoader classLoader) {
-        URL url = null;
-        try {
-            String path = jarPath.toAbsolutePath().toString();
-            if (!path.startsWith("/")) {
-                path = "/" + path;
+    public ProtectionDomain getProtectionDomain() {
+        return protectionDomain;
+    }
+
+    private JarFile readLockAcquireAndGetJarReference() {
+        while (true) {
+            readLock.lock();
+            final JarFile zipFileLocal = this.zipFile;
+            if (zipFileLocal != null) {
+                //Expected fast path: returns a reference to the open JarFile while owning the readLock
+                return zipFileLocal;
+            } else {
+                //This Lock implementation doesn't allow upgrading a readLock to a writeLock, so release it
+                //as we're going to need the WriteLock.
+                readLock.unlock();
+                //trigger the JarFile being (re)opened.
+                ensureJarFileIsOpen();
+                //Now since we no longer own any lock, we need to try again to obtain the readLock
+                //and check for the reference still being valid.
+                //This exposes us to a race with closing the just-opened JarFile;
+                //however this should be extremely rare, so we can trust we won't loop much;
+                //A counter doesn't seem necessary, as in fact we know that methods close()
+                //and resetInternalCaches() are invoked each at most once, which limits the amount
+                //of loops here in practice.
             }
-            URI uri = new URI("jar:file", null, path + "!/", null);
-            url = uri.toURL();
-        } catch (URISyntaxException | MalformedURLException e) {
-            throw new RuntimeException("Unable to create protection domain for " + jarPath, e);
         }
-        CodeSource codesource = new CodeSource(url, (Certificate[]) null);
-        ProtectionDomain protectionDomain = new ProtectionDomain(codesource, null, classLoader, null);
-        return protectionDomain;
     }
 
-    private ZipFile file() {
-        if (zipFile == null) {
-            synchronized (this) {
-                if (zipFile == null) {
-                    try {
-                        return zipFile = new ZipFile(jarPath.toFile());
-                    } catch (IOException e) {
-                        throw new RuntimeException("Failed to open " + jarPath, e);
-                    }
+    private void ensureJarFileIsOpen() {
+        writeLock.lock();
+        try {
+            if (this.zipFile == null) {
+                try {
+                    this.zipFile = JarFiles.create(jarPath.toFile());
+                } catch (IOException e) {
+                    throw new RuntimeException("Failed to open " + jarPath, e);
                 }
             }
+        } finally {
+            writeLock.unlock();
         }
-        return zipFile;
     }
 
     @Override
     public void close() {
-        if (zipFile != null) {
-            try {
-                zipFile.close();
-            } catch (IOException e) {
-                //ignore
+        writeLock.lock();
+        try {
+            final JarFile zipFileLocal = this.zipFile;
+            if (zipFileLocal != null) {
+                try {
+                    zipFileLocal.close();
+                } catch (IOException e) {
+                    //ignore
+                }
+                this.zipFile = null;
             }
+        } finally {
+            writeLock.unlock();
         }
     }
+
+    @Override
+    public void resetInternalCaches() {
+        //Currently same implementations as #close
+        close();
+    }
+
+    @Override
+    public String toString() {
+        return "JarResource{" +
+                jarPath.getFileName() +
+                '}';
+    }
 }
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java
index 5c886b3a0f1ce..68f962ff14a7a 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/QuarkusEntryPoint.java
@@ -1,5 +1,6 @@
 package io.quarkus.bootstrap.runner;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,17 +36,18 @@ private static void doRun(Object args) throws IOException, ClassNotFoundExceptio
         } else if (Boolean.getBoolean("quarkus.launch.rebuild")) {
             doReaugment(appRoot);
         } else {
-            SerializedApplication app = null;
-            try (InputStream in = Files.newInputStream(appRoot.resolve(QUARKUS_APPLICATION_DAT))) {
+            SerializedApplication app;
+            // the magic number here is close to the smallest possible dat file
+            try (InputStream in = new BufferedInputStream(Files.newInputStream(appRoot.resolve(QUARKUS_APPLICATION_DAT)),
+                    24_576)) {
                 app = SerializedApplication.read(in, appRoot);
+            }
+            try {
                 Thread.currentThread().setContextClassLoader(app.getRunnerClassLoader());
                 Class<?> mainClass = app.getRunnerClassLoader().loadClass(app.getMainClass());
                 mainClass.getMethod("main", String[].class).invoke(null, args);
-
             } finally {
-                if (app != null) {
-                    app.getRunnerClassLoader().close();
-                }
+                app.getRunnerClassLoader().close();
             }
         }
     }
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java
index d6bf167acdbb4..1c7df58a82b09 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java
@@ -1,22 +1,27 @@
 package io.quarkus.bootstrap.runner;
 
-import java.io.IOException;
 import java.net.URL;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
 
 /**
- * Classloader used for production application, using the multi jar strategy
+ * Classloader used with the fast-jar package type.
+ *
+ * This ClassLoader takes advantage of the fact that Quarkus knows the entire classpath when the application is built,
+ * and thus can index the location of classes and resources (with the result being written during the build to a binary file and
+ * read at application startup).
+ * The advantage this has over the JDK's default System ClassLoader is that it knows which jars contain the requested
+ * classes and resources and thus does not have to iterate over all the jars on the classpath
+ * (which is slow and takes up heap space as the jars need to be kept open), but instead can go directly to the
+ * jar(s) containing the requested class or resource.
+ * The implementation also contains optimizations that allow the ClassLoader to keep a minimum number of jars open
+ * while also preventing the lookup of the entire classpath for missing resources in known directories (like META-INF/services).
  */
-public class RunnerClassLoader extends ClassLoader {
+public final class RunnerClassLoader extends ClassLoader {
 
     /**
      * A map of resources by dir name. Root dir/default package is represented by the empty string
@@ -24,18 +29,30 @@ public class RunnerClassLoader extends ClassLoader {
     private final Map<String, ClassLoadingResource[]> resourceDirectoryMap;
 
     private final Set<String> parentFirstPackages;
+    private final Set<String> nonExistentResources;
+    // the following two fields go hand in hand - they need to both be populated from the same data
+    // in order for the resource loading to work properly
+    private final Set<String> fullyIndexedDirectories;
+    private final Map<String, ClassLoadingResource[]> directlyIndexedResourcesIndexMap;
 
-    private final ConcurrentMap<ClassLoadingResource, ProtectionDomain> protectionDomains = new ConcurrentHashMap<>();
+    //Mutations protected by synchronization on the field value itself:
+    private final ClassLoadingResource[] currentlyBufferedResources = new ClassLoadingResource[4];//Experimentally found to be a reasonable number
+    //Protected by synchronization on the above field, as they are related.
+    private boolean postBootPhase = false;
 
     static {
         registerAsParallelCapable();
     }
 
     RunnerClassLoader(ClassLoader parent, Map<String, ClassLoadingResource[]> resourceDirectoryMap,
-            Set<String> parentFirstPackages) {
+            Set<String> parentFirstPackages, Set<String> nonExistentResources,
+            Set<String> fullyIndexedDirectories, Map<String, ClassLoadingResource[]> directlyIndexedResourcesIndexMap) {
         super(parent);
         this.resourceDirectoryMap = resourceDirectoryMap;
         this.parentFirstPackages = parentFirstPackages;
+        this.nonExistentResources = nonExistentResources;
+        this.fullyIndexedDirectories = fullyIndexedDirectories;
+        this.directlyIndexedResourcesIndexMap = directlyIndexedResourcesIndexMap;
     }
 
     @Override
@@ -53,49 +70,84 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce
         }
         String packageName = getPackageNameFromClassName(name);
         if (parentFirstPackages.contains(packageName)) {
-            return getParent().loadClass(name);
+            try {
+                return getParent().loadClass(name);
+            } catch (ClassNotFoundException e) {
+                //fall through
+            }
         }
         synchronized (getClassLoadingLock(name)) {
             Class<?> loaded = findLoadedClass(name);
             if (loaded != null) {
                 return loaded;
             }
-            ClassLoadingResource[] resources;
+            final ClassLoadingResource[] resources;
             if (packageName == null) {
                 resources = resourceDirectoryMap.get("");
             } else {
-                String dirName = packageName.replace(".", "/");
+                String dirName = packageName.replace('.', '/');
                 resources = resourceDirectoryMap.get(dirName);
             }
             if (resources != null) {
-                String classResource = name.replace(".", "/") + ".class";
+                String classResource = name.replace('.', '/') + ".class";
                 for (ClassLoadingResource resource : resources) {
+                    accessingResource(resource);
                     byte[] data = resource.getResourceData(classResource);
                     if (data == null) {
                         continue;
                     }
                     definePackage(packageName, resources);
-                    return defineClass(name, data, 0, data.length,
-                            protectionDomains.computeIfAbsent(resource, new Function<ClassLoadingResource, ProtectionDomain>() {
-                                @Override
-                                public ProtectionDomain apply(ClassLoadingResource ce) {
-                                    return ce.getProtectionDomain(RunnerClassLoader.this);
-                                }
-                            }));
+                    return defineClass(name, data, 0, data.length, resource.getProtectionDomain());
                 }
             }
         }
         return getParent().loadClass(name);
+    }
 
+    private void accessingResource(final ClassLoadingResource resource) {
+        final ClassLoadingResource toEvict;
+        synchronized (this.currentlyBufferedResources) {
+            if (!postBootPhase) {
+                //We only want to limit the jar buffers after the initial bootstrap has been completed
+                return;
+            }
+            // This is not a cache aiming to accurately retain the most hot resources:
+            // it's too small to benefit from traditional hit metrics,
+            // we rather prefer to keep it very light.
+            if (currentlyBufferedResources[0] == resource) {
+                //it's already on the head of the cache: nothing to be done.
+                return;
+            }
+            for (int i = 1; i < currentlyBufferedResources.length; i++) {
+                final ClassLoadingResource currentI = currentlyBufferedResources[i];
+                if (currentI == resource || currentI == null) {
+                    //it was already cached, or we found an empty slot: bubble it up by one position to give it a boost
+                    final ClassLoadingResource previous = currentlyBufferedResources[i - 1];
+                    currentlyBufferedResources[i - 1] = resource;
+                    currentlyBufferedResources[i] = previous;
+                    return;
+                }
+            }
+            // else, we drop one element from the cache,
+            // and inserting the latest resource on the tail:
+            toEvict = currentlyBufferedResources[currentlyBufferedResources.length - 1];
+            currentlyBufferedResources[currentlyBufferedResources.length - 1] = resource;
+        }
+        // Finally, release the cache for the dropped element:
+        toEvict.resetInternalCaches();
     }
 
     @Override
     protected URL findResource(String name) {
         name = sanitizeName(name);
+        if (nonExistentResources.contains(name)) {
+            return null;
+        }
         ClassLoadingResource[] resources = getClassLoadingResources(name);
         if (resources == null)
             return null;
         for (ClassLoadingResource resource : resources) {
+            accessingResource(resource);
             URL data = resource.getResourceURL(name);
             if (data != null) {
                 return data;
@@ -104,21 +156,28 @@ protected URL findResource(String name) {
         return null;
     }
 
-    private String sanitizeName(String name) {
-        if (name.startsWith("/")) {
+    private String sanitizeName(final String name) {
+        if (name.length() > 0 && name.charAt(0) == '/') {
             return name.substring(1);
         }
         return name;
     }
 
-    private ClassLoadingResource[] getClassLoadingResources(String name) {
+    private ClassLoadingResource[] getClassLoadingResources(final String name) {
+        ClassLoadingResource[] resources = directlyIndexedResourcesIndexMap.get(name);
+        if (resources != null) {
+            return resources;
+        }
         String dirName = getDirNameFromResourceName(name);
-        ClassLoadingResource[] resources;
         if (dirName == null) {
-            resources = resourceDirectoryMap.get("");
-        } else {
-            resources = resourceDirectoryMap.get(dirName);
+            dirName = "";
+        }
+        if (!dirName.equals(name) && fullyIndexedDirectories.contains(dirName)) {
+            // If we arrive here, we know that resource being queried belongs to one of the fully indexed directories
+            // Had that resource existed however, it would have been present in directlyIndexedResourcesIndexMap
+            return null;
         }
+        resources = resourceDirectoryMap.get(dirName);
         if (resources == null) {
             // the resource could itself be a directory
             resources = resourceDirectoryMap.get(name);
@@ -127,13 +186,17 @@ private ClassLoadingResource[] getClassLoadingResources(String name) {
     }
 
     @Override
-    protected Enumeration<URL> findResources(String name) throws IOException {
+    protected Enumeration<URL> findResources(String name) {
         name = sanitizeName(name);
+        if (nonExistentResources.contains(name)) {
+            return Collections.emptyEnumeration();
+        }
         ClassLoadingResource[] resources = getClassLoadingResources(name);
         if (resources == null)
-            return null;
+            return Collections.emptyEnumeration();
         List<URL> urls = new ArrayList<>();
         for (ClassLoadingResource resource : resources) {
+            accessingResource(resource);
             URL data = resource.getResourceURL(name);
             if (data != null) {
                 urls.add(data);
@@ -210,4 +273,15 @@ public void close() {
             }
         }
     }
+
+    public void resetInternalCaches() {
+        synchronized (this.currentlyBufferedResources) {
+            for (Map.Entry<String, ClassLoadingResource[]> entry : resourceDirectoryMap.entrySet()) {
+                for (ClassLoadingResource i : entry.getValue()) {
+                    i.resetInternalCaches();
+                }
+            }
+            this.postBootPhase = true;
+        }
+    }
 }
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/SerializedApplication.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/SerializedApplication.java
index 97c29b116a536..23d25656fe96e 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/SerializedApplication.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/SerializedApplication.java
@@ -10,9 +10,13 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -29,8 +33,12 @@
  */
 public class SerializedApplication {
 
+    public static final String META_INF_VERSIONS = "META-INF/versions/";
+    // the files immediately (i.e. not recursively) under these paths should all be indexed
+    private static final Set<String> FULLY_INDEXED_PATHS = new LinkedHashSet<>(Arrays.asList("", "META-INF/services"));
+
     private static final int MAGIC = 0XF0315432;
-    private static final int VERSION = 1;
+    private static final int VERSION = 2;
 
     private final RunnerClassLoader runnerClassLoader;
     private final String mainClass;
@@ -49,26 +57,43 @@ public String getMainClass() {
     }
 
     public static void write(OutputStream outputStream, String mainClass, Path applicationRoot, List<Path> classPath,
-            List<Path> parentFirst)
+            List<Path> parentFirst, List<String> nonExistentResources)
             throws IOException {
         try (DataOutputStream data = new DataOutputStream(outputStream)) {
             data.writeInt(MAGIC);
             data.writeInt(VERSION);
             data.writeUTF(mainClass);
-            data.writeInt(classPath.size());
-            for (Path jar : classPath) {
-                String relativePath = applicationRoot.relativize(jar).toString().replace("\\", "/");
+            data.writeShort(classPath.size());
+            Map<String, List<Integer>> directlyIndexedResourcesToCPJarIndex = new HashMap<>();
+            for (int i = 0; i < classPath.size(); i++) {
+                Path jar = classPath.get(i);
+                String relativePath = applicationRoot.relativize(jar).toString().replace('\\', '/');
                 data.writeUTF(relativePath);
-                writeJar(data, jar);
+                Collection<String> resources = writeJar(data, jar);
+                for (String resource : resources) {
+                    directlyIndexedResourcesToCPJarIndex.computeIfAbsent(resource, s -> new ArrayList<>()).add(i);
+                }
             }
             Set<String> parentFirstPackages = new HashSet<>();
 
             for (Path jar : parentFirst) {
                 collectPackages(jar, parentFirstPackages);
             }
-            data.writeInt(parentFirstPackages.size());
+            data.writeShort(parentFirstPackages.size());
             for (String p : parentFirstPackages) {
-                data.writeUTF(p.replace("/", ".").replace("\\", "."));
+                data.writeUTF(p.replace('/', '.').replace('\\', '.'));
+            }
+            data.writeShort(nonExistentResources.size());
+            for (String nonExistentResource : nonExistentResources) {
+                data.writeUTF(nonExistentResource);
+            }
+            data.writeShort(directlyIndexedResourcesToCPJarIndex.size());
+            for (Map.Entry<String, List<Integer>> entry : directlyIndexedResourcesToCPJarIndex.entrySet()) {
+                data.writeUTF(entry.getKey());
+                data.writeShort(entry.getValue().size());
+                for (Integer index : entry.getValue()) {
+                    data.writeShort(index);
+                }
             }
             data.flush();
         }
@@ -85,8 +110,9 @@ public static SerializedApplication read(InputStream inputStream, Path appRoot)
             String mainClass = in.readUTF();
             Map<String, ClassLoadingResource[]> resourceDirectoryMap = new HashMap<>();
             Set<String> parentFirstPackages = new HashSet<>();
-            int numPaths = in.readInt();
-            for (int pathCount = 0; pathCount < numPaths; ++pathCount) {
+            int numPaths = in.readUnsignedShort();
+            ClassLoadingResource[] allClassLoadingResources = new ClassLoadingResource[numPaths];
+            for (int pathCount = 0; pathCount < numPaths; pathCount++) {
                 String path = in.readUTF();
                 boolean hasManifest = in.readBoolean();
                 ManifestInfo info = null;
@@ -95,27 +121,60 @@ public static SerializedApplication read(InputStream inputStream, Path appRoot)
                             readNullableString(in), readNullableString(in), readNullableString(in));
                 }
                 JarResource resource = new JarResource(info, appRoot.resolve(path));
-                int numDirs = in.readInt();
+                allClassLoadingResources[pathCount] = resource;
+                int numDirs = in.readUnsignedShort();
                 for (int i = 0; i < numDirs; ++i) {
                     String dir = in.readUTF();
-                    ClassLoadingResource[] existing = resourceDirectoryMap.get(dir);
-                    if (existing == null) {
-                        resourceDirectoryMap.put(dir, new ClassLoadingResource[] { resource });
-                    } else {
-                        ClassLoadingResource[] newResources = new ClassLoadingResource[existing.length + 1];
-                        System.arraycopy(existing, 0, newResources, 0, existing.length);
-                        newResources[existing.length] = resource;
-                        resourceDirectoryMap.put(dir, newResources);
+                    int j = dir.indexOf('/');
+                    while (j >= 0) {
+                        addResourceDir(dir.substring(0, j), resource, resourceDirectoryMap);
+                        j = dir.indexOf('/', j + 1);
                     }
+                    addResourceDir(dir, resource, resourceDirectoryMap);
                 }
             }
-            int packages = in.readInt();
+            int packages = in.readUnsignedShort();
             for (int i = 0; i < packages; ++i) {
                 parentFirstPackages.add(in.readUTF());
             }
-            return new SerializedApplication(
-                    new RunnerClassLoader(ClassLoader.getSystemClassLoader(), resourceDirectoryMap, parentFirstPackages),
-                    mainClass);
+            Set<String> nonExistentResources = new HashSet<>();
+            int nonExistentResourcesSize = in.readUnsignedShort();
+            for (int i = 0; i < nonExistentResourcesSize; i++) {
+                nonExistentResources.add(in.readUTF());
+            }
+            // this map is populated correctly because the JarResource entries are added to allClassLoadingResources
+            // in the same order as the classpath was written during the writing of the index
+            Map<String, ClassLoadingResource[]> directlyIndexedResourcesIndexMap = new HashMap<>();
+            int directlyIndexedSize = in.readUnsignedShort();
+            for (int i = 0; i < directlyIndexedSize; i++) {
+                String resource = in.readUTF();
+                int indexesSize = in.readUnsignedShort();
+                ClassLoadingResource[] matchingResources = new ClassLoadingResource[indexesSize];
+                for (int j = 0; j < indexesSize; j++) {
+                    matchingResources[j] = allClassLoadingResources[in.readUnsignedShort()];
+                }
+                directlyIndexedResourcesIndexMap.put(resource, matchingResources);
+            }
+            RunnerClassLoader runnerClassLoader = new RunnerClassLoader(ClassLoader.getSystemClassLoader(),
+                    resourceDirectoryMap, parentFirstPackages,
+                    nonExistentResources, FULLY_INDEXED_PATHS, directlyIndexedResourcesIndexMap);
+            for (ClassLoadingResource classLoadingResource : allClassLoadingResources) {
+                classLoadingResource.init(runnerClassLoader);
+            }
+            return new SerializedApplication(runnerClassLoader, mainClass);
+        }
+    }
+
+    private static void addResourceDir(String dir, JarResource resource,
+            Map<String, ClassLoadingResource[]> resourceDirectoryMap) {
+        ClassLoadingResource[] existing = resourceDirectoryMap.get(dir);
+        if (existing == null) {
+            resourceDirectoryMap.put(dir, new ClassLoadingResource[] { resource });
+        } else {
+            ClassLoadingResource[] newResources = new ClassLoadingResource[existing.length + 1];
+            System.arraycopy(existing, 0, newResources, 0, existing.length);
+            newResources[existing.length] = resource;
+            resourceDirectoryMap.put(dir, newResources);
         }
     }
 
@@ -126,7 +185,11 @@ private static String readNullableString(DataInputStream in) throws IOException
         return null;
     }
 
-    private static void writeJar(DataOutputStream out, Path jar) throws IOException {
+    /**
+     * @return a List of all resources that exist in the paths that we desire to have fully indexed
+     *         (configured via {@code FULLY_INDEXED_PATHS})
+     */
+    private static List<String> writeJar(DataOutputStream out, Path jar) throws IOException {
         try (JarFile zip = new JarFile(jar.toFile())) {
             Manifest manifest = zip.getManifest();
             if (manifest == null) {
@@ -148,27 +211,59 @@ private static void writeJar(DataOutputStream out, Path jar) throws IOException
             }
 
             Set<String> dirs = new HashSet<>();
+            Map<String, List<String>> fullyIndexedPaths = new HashMap<>();
             Enumeration<? extends ZipEntry> entries = zip.entries();
-            boolean hasDefaultPackge = false;
+            boolean hasDefaultPackage = false;
             while (entries.hasMoreElements()) {
                 ZipEntry entry = entries.nextElement();
                 if (!entry.getName().contains("/")) {
-                    hasDefaultPackge = true;
+                    hasDefaultPackage = true;
+                    if (!entry.getName().isEmpty() && FULLY_INDEXED_PATHS.contains("")) {
+                        fullyIndexedPaths.computeIfAbsent("", s -> new ArrayList<>(10)).add(entry.getName());
+                    }
                 } else if (!entry.isDirectory()) {
                     //some jars don't have correct directory entries
                     //so we look at the file paths instead
                     //looking at you h2
                     final int index = entry.getName().lastIndexOf('/');
                     dirs.add(entry.getName().substring(0, index));
+
+                    if (entry.getName().startsWith(META_INF_VERSIONS)) {
+                        //multi release jar
+                        //we add all packages here
+                        //they may no be relevant for some versions, but that is fine
+                        String part = entry.getName().substring(META_INF_VERSIONS.length());
+                        int slash = part.indexOf("/");
+                        if (slash != -1) {
+                            final int subIndex = part.lastIndexOf('/');
+                            if (subIndex != slash) {
+                                dirs.add(part.substring(slash + 1, subIndex));
+                            }
+                        }
+                    }
+
+                    for (String path : FULLY_INDEXED_PATHS) {
+                        if (path.isEmpty()) {
+                            continue;
+                        }
+                        if (entry.getName().startsWith(path)) {
+                            fullyIndexedPaths.computeIfAbsent(path, s -> new ArrayList<>(10)).add(entry.getName());
+                        }
+                    }
                 }
             }
-            if (hasDefaultPackge) {
+            if (hasDefaultPackage) {
                 dirs.add("");
             }
-            out.writeInt(dirs.size());
+            out.writeShort(dirs.size());
             for (String i : dirs) {
                 out.writeUTF(i);
             }
+            List<String> result = new ArrayList<>();
+            for (List<String> values : fullyIndexedPaths.values()) {
+                result.addAll(values);
+            }
+            return result;
         }
     }
 
diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java
index 0cc3ff2f26651..0d171c2aaa3b4 100644
--- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java
+++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java
@@ -1,9 +1,9 @@
 package io.quarkus.bootstrap.runner;
 
+import io.quarkus.bootstrap.graal.ImageInfo;
 import io.quarkus.bootstrap.logging.InitialConfigurator;
 import java.math.BigDecimal;
 import java.util.logging.Handler;
-import org.graalvm.nativeimage.ImageInfo;
 import org.jboss.logging.Logger;
 
 /**
diff --git a/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java b/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java
new file mode 100644
index 0000000000000..44a617491fb8b
--- /dev/null
+++ b/independent-projects/bootstrap/runner/src/test/java/io/quarkus/bootstrap/runner/JarResourceTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.bootstrap.runner;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests {@link JarResource}
+ */
+public class JarResourceTest {
+
+    /**
+     * Tests that the URL(s) returned from {@link JarResource#getResourceURL(String)} are properly encoded and can be used
+     * to open connection to the URL to read data
+     */
+    @Test
+    public void testResourceURLEncoding() throws Exception {
+        final JavaArchive jar = ShrinkWrap.create(JavaArchive.class);
+        final String[] files = new String[] { "a.txt", "a b.txt", ",;~!@#$%^&().txt" };
+        for (final String file : files) {
+            jar.add(new StringAsset("hello"), file);
+        }
+        final Path testDir = Files.createTempDirectory("test");
+        // create a child dir with special characters
+        final Path specialCharDir = Files.createDirectory(Paths.get(testDir.toString(), ",;~!@#$%^&()"));
+        final Path jarFilePath = Files.createTempFile(specialCharDir, "test", "quarkus-test.jar");
+        // create a jar file under the directory which has the special characters
+        jar.as(ZipExporter.class).exportTo(jarFilePath.toFile(), true);
+        final JarResource jarResource = new JarResource(null, jarFilePath);
+        for (final String resource : files) {
+            final URL url = jarResource.getResourceURL(resource);
+            Assertions.assertNotNull(url, resource + " is missing in jar");
+            // check that opening the resource URL works and data can be read
+            final URLConnection conn = url.openConnection();
+            try (final InputStream is = conn.getInputStream()) {
+                drainFully(is);
+            }
+        }
+    }
+
+    private static void drainFully(final InputStream inputStream) throws IOException {
+        int read = -1;
+        final byte[] data = new byte[1024];
+        while ((read = inputStream.read(data)) != -1) {
+        }
+    }
+}
diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml
new file mode 100644
index 0000000000000..2f74ec7a213d0
--- /dev/null
+++ b/independent-projects/enforcer-rules/pom.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>37</version>
+    </parent>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-enforcer-rules</artifactId>
+    <name>Quarkus - Enforcer Rules</name>
+    <version>999-SNAPSHOT</version>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <distribution>repo</distribution>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+
+        <enforcer-api.version>3.0.0-M3</enforcer-api.version>
+        <maven-invoker-plugin.version>3.2.1</maven-invoker-plugin.version>
+        <maven-core.version>3.6.3</maven-core.version>
+
+        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven.enforcer</groupId>
+            <artifactId>enforcer-api</artifactId>
+            <version>${enforcer-api.version}</version>
+            <scope>provided</scope>
+            <!-- avoid dependencyConvergence issues -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.sisu</groupId>
+                    <artifactId>org.eclipse.sisu.plexus</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven-core.version}</version>
+            <scope>provided</scope>
+            <!-- avoid dependencyConvergence issues -->
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>${maven-invoker-plugin.version}</version>
+                <!-- http://maven.apache.org/plugins/maven-invoker-plugin/usage.html -->
+                <configuration>
+                    <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                    <settingsFile>src/it/settings.xml</settingsFile>
+                    <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                    <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>install</goal>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+                <version>2.14.0</version>
+                <dependencies>
+                    <dependency>
+                        <artifactId>quarkus-ide-config</artifactId>
+                        <groupId>io.quarkus</groupId>
+                        <version>${project.version}</version>
+                    </dependency>
+                  </dependencies>
+                <configuration>
+                    <configFile>eclipse-format.xml</configFile>
+                    <lineEnding>LF</lineEnding>
+                    <skip>${format.skip}</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code</groupId>
+                <artifactId>impsort-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <removeUnused>true</removeUnused>
+                    <skip>${format.skip}</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>sonatype-nexus-releases</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>quick-build</id>
+            <activation>
+                <property>
+                    <name>quickly</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+                <invoker.skip>true</invoker.skip>   <!-- maven-invoker-plugin -->
+            </properties>
+            <build>
+                <defaultGoal>clean install</defaultGoal>
+            </build>
+        </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+                <invoker.skip>true</invoker.skip>   <!-- maven-invoker-plugin -->
+            </properties>
+        </profile>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>${nexus-staging-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <serverId>ossrh</serverId>
+                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                            <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
+                            need to add and edit the following profile: <profile> <id>release</id> <properties>
+                            <gpg.useagent>false</gpg.useagent> <gpg.executable>/usr/local/Cellar/gnupg@1.4/1.4.23_1/bin/gpg1</gpg.executable>
+                            <- use gpg1 on Mac OS X <gpg.homedir>~/.gnupg</gpg.homedir> <- Update to
+                            your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase
+                            </properties> </profile> -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>format</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>!no-format</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.revelc.code.formatter</groupId>
+                        <artifactId>formatter-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>format</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>net.revelc.code</groupId>
+                        <artifactId>impsort-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sort-imports</id>
+                                <goals>
+                                    <goal>sort</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <removeUnused>true</removeUnused>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>validate</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>no-format</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.revelc.code.formatter</groupId>
+                        <artifactId>formatter-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>validate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>net.revelc.code</groupId>
+                        <artifactId>impsort-maven-plugin</artifactId>
+                        <configuration>
+                            <removeUnused>true</removeUnused>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>check-imports</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/independent-projects/enforcer-rules/src/it/settings.xml b/independent-projects/enforcer-rules/src/it/settings.xml
new file mode 100644
index 0000000000000..dc17d1928ddef
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!-- http://maven.apache.org/plugins/maven-invoker-plugin/examples/fast-use.html -->
+<settings>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/deployment/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/deployment/pom.xml
new file mode 100644
index 0000000000000..186fc5139e300
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/deployment/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-ext1-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext1-deployment</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext1</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/pom.xml
new file mode 100644
index 0000000000000..91af3199c8ed8
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-extensions</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext1-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/runtime/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/runtime/pom.xml
new file mode 100644
index 0000000000000..b5ed38c767baf
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/runtime/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-ext1-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext1</artifactId>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/runtime/src/main/resources/META-INF/quarkus-extension.properties b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/runtime/src/main/resources/META-INF/quarkus-extension.properties
new file mode 100644
index 0000000000000..06cec50531a09
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext1/runtime/src/main/resources/META-INF/quarkus-extension.properties
@@ -0,0 +1 @@
+deployment-artifact=io.quarkus\:quarkus-enforcer-rules-smoketest-ext1-deployment\:1.0-SNAPSHOT
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/deployment/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/deployment/pom.xml
new file mode 100644
index 0000000000000..adf5804c7c916
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/deployment/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-ext2-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext2-deployment</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext1-deployment</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/pom.xml
new file mode 100644
index 0000000000000..b86b1849f8c84
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-extensions</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext2-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/runtime/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/runtime/pom.xml
new file mode 100644
index 0000000000000..4e9edf19d94bb
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/runtime/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-ext2-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext2</artifactId>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/runtime/src/main/resources/META-INF/quarkus-extension.properties b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/runtime/src/main/resources/META-INF/quarkus-extension.properties
new file mode 100644
index 0000000000000..8ed0d15e12931
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext2/runtime/src/main/resources/META-INF/quarkus-extension.properties
@@ -0,0 +1 @@
+deployment-artifact=io.quarkus\:quarkus-enforcer-rules-smoketest-ext2-deployment\:1.0-SNAPSHOT
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/deployment/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/deployment/pom.xml
new file mode 100644
index 0000000000000..447de1749d31b
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/deployment/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-ext3-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext3-deployment</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext3</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext1</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/pom.xml
new file mode 100644
index 0000000000000..bd8577ab3739c
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-extensions</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext3-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/runtime/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/runtime/pom.xml
new file mode 100644
index 0000000000000..4c0697b1e8006
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/runtime/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-ext3-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-ext3</artifactId>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/runtime/src/main/resources/META-INF/quarkus-extension.properties b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/runtime/src/main/resources/META-INF/quarkus-extension.properties
new file mode 100644
index 0000000000000..3f6acf5975698
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/ext3/runtime/src/main/resources/META-INF/quarkus-extension.properties
@@ -0,0 +1 @@
+deployment-artifact=io.quarkus\:quarkus-enforcer-rules-smoketest-ext3-deployment\:1.0-SNAPSHOT
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/extensions/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/extensions/pom.xml
new file mode 100644
index 0000000000000..d062a60032d8c
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/extensions/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-extensions</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>ext1</module>
+        <module>ext2</module>
+        <module>ext3</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>BansRuntimeDependency</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-deployment-deps</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <bansRuntimeDependency implementation="io.quarkus.enforcer.BansRuntimeDependency"/>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>@project.groupId@</groupId>
+                                <artifactId>@project.artifactId@</artifactId>
+                                <version>@project.version@</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/ext1/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/ext1/pom.xml
new file mode 100644
index 0000000000000..b7a1c45ee91d5
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/ext1/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-integration-tests</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-integration-tests-ext1</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext1</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext1-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>SuperfluousDeploymentDep</id>
+            <dependencies>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-enforcer-rules-smoketest-ext2-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/ext2/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/ext2/pom.xml
new file mode 100644
index 0000000000000..e5f0660fbe6bd
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/ext2/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest-integration-tests</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-integration-tests-ext2</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-enforcer-rules-smoketest-ext2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/pom.xml
new file mode 100644
index 0000000000000..4765261aad1ad
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/integration-tests/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-enforcer-rules-smoketest</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-enforcer-rules-smoketest-integration-tests</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>ext1</module>
+        <module>ext2</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-deployment-deps</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requiresMinimalDeploymentDependency implementation="io.quarkus.enforcer.RequiresMinimalDeploymentDependency"/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>@project.groupId@</groupId>
+                        <artifactId>@project.artifactId@</artifactId>
+                        <version>@project.version@</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/invoker.properties b/independent-projects/enforcer-rules/src/it/smoketest/invoker.properties
new file mode 100644
index 0000000000000..c96e72c92e8ed
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/invoker.properties
@@ -0,0 +1,15 @@
+invoker.name.1 = Test build ok without enforcer
+invoker.goals.1 = package -Denforcer.skip
+invoker.buildResult.1 = success
+
+invoker.name.2 = Test BansRuntimeDependency failure
+invoker.goals.2 = package -PBansRuntimeDependency
+invoker.buildResult.2 = failure
+
+invoker.name.3 = Test RequiresMinimalDeploymentDependency failure: missing dependency
+invoker.goals.3 = package
+invoker.buildResult.3 = failure
+
+invoker.name.4 = Test RequiresMinimalDeploymentDependency failure: superfluous dependency
+invoker.goals.4 = package -PSuperfluousDeploymentDep
+invoker.buildResult.4 = failure
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/pom.xml b/independent-projects/enforcer-rules/src/it/smoketest/pom.xml
new file mode 100644
index 0000000000000..17c2f6101525e
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>37</version>
+    </parent>
+
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-enforcer-rules-smoketest</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>extensions</module>
+        <module>integration-tests</module>
+    </modules>
+
+    <!-- note: rule is configured in integration-tests/pom.xml -->
+</project>
\ No newline at end of file
diff --git a/independent-projects/enforcer-rules/src/it/smoketest/verify.groovy b/independent-projects/enforcer-rules/src/it/smoketest/verify.groovy
new file mode 100644
index 0000000000000..073f4e5d6b988
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/it/smoketest/verify.groovy
@@ -0,0 +1,19 @@
+File buildLog = new File( basedir, 'build.log' )
+
+// Test BansRuntimeDependency failure
+assert buildLog.text.contains( 'quarkus-enforcer-rules-smoketest-ext2-deployment ... SUCCESS' )
+assert buildLog.text.contains( 'quarkus-enforcer-rules-smoketest-ext3-deployment ... FAILURE' )
+assert buildLog.text.contains( 'BansRuntimeDependency failed with message' )
+
+// Test RequiresMinimalDeploymentDependency failure: missing dependency
+assert buildLog.text.contains( 'quarkus-enforcer-rules-smoketest-integration-tests-ext1 SUCCESS' )
+assert buildLog.text.contains( 'quarkus-enforcer-rules-smoketest-integration-tests-ext2 FAILURE' )
+assert buildLog.text.contains( 'RequiresMinimalDeploymentDependency failed with message' )
+assert buildLog.text.contains( '1 minimal *-deployment dependencies are missing' )
+assert buildLog.text.contains( '<artifactId>quarkus-enforcer-rules-smoketest-ext2-deployment</artifactId>' )
+
+// Test RequiresMinimalDeploymentDependency failure: superfluous dependency
+assert buildLog.text.contains( 'quarkus-enforcer-rules-smoketest-integration-tests-ext1 FAILURE' )
+assert buildLog.text.contains( 'RequiresMinimalDeploymentDependency failed with message' )
+assert buildLog.text.contains( '1 minimal *-deployment dependencies are superfluous' )
+assert buildLog.text.contains( '    io.quarkus:quarkus-enforcer-rules-smoketest-ext2-deployment:1.0-SNAPSHOT' )
diff --git a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java
new file mode 100644
index 0000000000000..347f947368717
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/BansRuntimeDependency.java
@@ -0,0 +1,42 @@
+package io.quarkus.enforcer;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Bans from a deployment module of an extension all runtime dependencies to "foreign" extensions.
+ */
+public class BansRuntimeDependency extends DeploymentDependencyRuleSupport {
+
+    @Override
+    protected void execute(MavenProject project, Map<String, Artifact> nonDeploymentArtifactsByGAV,
+            Map<String, Dependency> directDepsByGAV)
+            throws EnforcerRuleException {
+
+        String runtimeArtifactId = project.getArtifactId().replace(DEPLOYMENT_ARTIFACT_ID_SUFFIX, "");
+        List<String> illegalRuntimeGAVs = nonDeploymentArtifactsByGAV.entrySet().parallelStream()
+                .filter(entry -> directDepsByGAV.containsKey(entry.getKey())) // only direct deps
+                .filter(entry -> !entry.getValue().getArtifactId().equals(runtimeArtifactId)) // "own" runtime dep is alowed
+                .filter(entry -> parseDeploymentGAV(entry.getKey(), entry.getValue()).isPresent())
+                .map(entry -> entry.getValue().getArtifactId())
+                .sorted()
+                .collect(Collectors.toList());
+
+        if (!illegalRuntimeGAVs.isEmpty()) {
+            throw new EnforcerRuleException(illegalRuntimeGAVs.size()
+                    + " illegal runtime dependencies found that have to be replaced with their "
+                    + DEPLOYMENT_ARTIFACT_ID_SUFFIX + " counterparts:\n\t"
+                    + illegalRuntimeGAVs.stream().collect(Collectors.joining("\n\t")));
+        }
+    }
+
+    @Override
+    protected boolean isCheckRequired(MavenProject project) {
+        return project.getArtifactId().endsWith(DEPLOYMENT_ARTIFACT_ID_SUFFIX);
+    }
+}
diff --git a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java
new file mode 100644
index 0000000000000..734d5a149351f
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java
@@ -0,0 +1,146 @@
+package io.quarkus.enforcer;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.enforcer.rule.api.EnforcerLevel;
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRule2;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+
+public abstract class DeploymentDependencyRuleSupport implements EnforcerRule2 {
+
+    protected static final String GROUP_ID_PREFIX = "io.quarkus";
+    protected static final String DEPLOYMENT_ARTIFACT_ID_SUFFIX = "-deployment";
+
+    private static final String EXT_PROPERTIES_PATH = "META-INF/quarkus-extension.properties";
+    private static final Map<String, Optional<String>> DEPLOYMENT_GAV_CACHE = new ConcurrentHashMap<>();
+
+    protected Log logger;
+
+    private EnforcerLevel level = EnforcerLevel.ERROR;
+
+    @Override
+    public final EnforcerLevel getLevel() {
+        return level;
+    }
+
+    public final void setLevel(EnforcerLevel level) {
+        this.level = level;
+    }
+
+    @Override
+    public final void execute(EnforcerRuleHelper helper) throws EnforcerRuleException {
+        logger = helper.getLog();
+
+        MavenProject project;
+        try {
+            project = (MavenProject) helper.evaluate("${project}");
+        } catch (ExpressionEvaluationException e) {
+            throw new IllegalStateException("Failed to get project from EnforcerRuleHelper", e);
+        }
+
+        if (!isCheckRequired(project)) {
+            return;
+        }
+        // general notes:
+        // - "artifacts" are needed to retrieve the actual jar files
+        // - "dependencies" are needed to limit the scope to only the direct dependencies of the current module
+        //   and to check for the proper scope, type and exclusions
+        // - parents are not gathered here since it is expected that the rule is also active for those parents
+        //   or those parents are not relevant
+
+        Map<String, Artifact> nonDeploymentArtifactsByGAV = project.getArtifacts().stream()
+                .filter(artifact -> "jar".equals(artifact.getType()))
+                .filter(artifact -> artifact.getGroupId().startsWith(GROUP_ID_PREFIX))
+                .filter(artifact -> !artifact.getArtifactId().endsWith(DEPLOYMENT_ARTIFACT_ID_SUFFIX))
+                .collect(Collectors.toMap(this::buildGAVKey, a -> a));
+
+        // Skip if artifacts are not resolved.
+        // To avoid this "soft exit", explicit resolving would be necessary but that is pretty elaborate in an enforcer rule.
+        // If the build goal is "late" enough, artifacts for the respective scope *will* be resolved automatically.
+        if (nonDeploymentArtifactsByGAV.values().stream().anyMatch(artifact -> !artifact.isResolved())) {
+            logger.warn("Skipping rule " + RequiresMinimalDeploymentDependency.class.getSimpleName()
+                    + ": Artifacts are not resolved, consider using a later build goal like 'package'.");
+            return;
+        }
+
+        Map<String, Dependency> directDepsByGAV = project.getDependencies().stream()
+                .filter(d -> d.getGroupId().startsWith(GROUP_ID_PREFIX))
+                .collect(Collectors.toMap(d -> d.getGroupId() + ":" + d.getArtifactId() + ":" + d.getVersion(), d -> d,
+                        (a, b) -> a));
+
+        execute(project, nonDeploymentArtifactsByGAV, directDepsByGAV);
+    }
+
+    protected abstract void execute(MavenProject project, Map<String, Artifact> nonDeploymentArtifactsByGAV,
+            Map<String, Dependency> directDepsByGAV)
+            throws EnforcerRuleException;
+
+    protected final String buildGAVKey(Artifact artifact) {
+        return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion();
+    }
+
+    protected final Optional<String> parseDeploymentGAV(String gav, Artifact artifact) {
+        return DEPLOYMENT_GAV_CACHE.computeIfAbsent(gav, k -> parseDeploymentGAV(artifact));
+    }
+
+    private Optional<String> parseDeploymentGAV(Artifact artifact) {
+        File artifactFile = artifact.getFile();
+        if (artifactFile == null || !artifactFile.exists()) {
+            throw new IllegalStateException("Artifact file not found for " + artifact);
+        }
+
+        Properties extProperties = new Properties();
+        try (ZipFile zipFile = new ZipFile(artifactFile)) {
+            ZipEntry entry = zipFile.getEntry(EXT_PROPERTIES_PATH);
+            if (entry == null) {
+                return Optional.empty();
+            }
+            extProperties.load(new InputStreamReader(zipFile.getInputStream(entry), StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to read " + EXT_PROPERTIES_PATH + " from " + artifactFile, e);
+        }
+
+        String deploymentGAV = extProperties.getProperty("deployment-artifact");
+        if (deploymentGAV == null) {
+            throw new IllegalStateException(
+                    "deployment-artifact artifact not found in " + EXT_PROPERTIES_PATH + " from " + artifactFile);
+        }
+        return Optional.of(deploymentGAV);
+    }
+
+    protected boolean isCheckRequired(MavenProject project) {
+        return true;
+    }
+
+    @Override
+    public final boolean isCacheable() {
+        return false;
+    }
+
+    @Override
+    public final boolean isResultValid(EnforcerRule cachedRule) {
+        return false;
+    }
+
+    @Override
+    public final String getCacheId() {
+        return null;
+    }
+}
diff --git a/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java
new file mode 100644
index 0000000000000..7c951a830317a
--- /dev/null
+++ b/independent-projects/enforcer-rules/src/main/java/io/quarkus/enforcer/RequiresMinimalDeploymentDependency.java
@@ -0,0 +1,93 @@
+package io.quarkus.enforcer;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Enforces that for each direct "runtime" dependency the current project also defines a direct minimal "*-deployment"
+ * dependency to produce a consistent build order.
+ */
+public class RequiresMinimalDeploymentDependency extends DeploymentDependencyRuleSupport {
+
+    private static final String REQ_TYPE = "pom";
+    private static final String REQ_SCOPE = "test";
+
+    private static final String DEP_TEMPLATE = "        <dependency>\n"
+            + "            <groupId>%s</groupId>\n"
+            + "            <artifactId>%s</artifactId>\n"
+            + "            <version>${project.version}</version>\n"
+            + "            <type>" + REQ_TYPE + "</type>\n"
+            + "            <scope>" + REQ_SCOPE + "</scope>\n"
+            + "            <exclusions>\n"
+            + "                <exclusion>\n"
+            + "                    <groupId>*</groupId>\n"
+            + "                    <artifactId>*</artifactId>\n"
+            + "                </exclusion>\n"
+            + "            </exclusions>\n"
+            + "        </dependency>";
+
+    @Override
+    public void execute(MavenProject project, Map<String, Artifact> nonDeploymentArtifactsByGAV,
+            Map<String, Dependency> directDepsByGAV)
+            throws EnforcerRuleException {
+
+        String projArtifactKey = buildGAVKey(project.getArtifact());
+
+        Set<String> existingUnmatchedDeploymentDeps = directDepsByGAV.entrySet().stream()
+                .filter(entry -> entry.getKey().contains(DEPLOYMENT_ARTIFACT_ID_SUFFIX))
+                .filter(entry -> REQ_TYPE.equals(entry.getValue().getType()))
+                .filter(entry -> REQ_SCOPE.equals(entry.getValue().getScope()))
+                .filter(entry -> entry.getValue().getExclusions().stream()
+                        .anyMatch(excl -> "*".equals(excl.getGroupId()) && "*".equals(excl.getArtifactId())))
+                .map(Entry::getKey)
+                .collect(Collectors.toSet());
+
+        List<String> missingDeploymentDeps = nonDeploymentArtifactsByGAV.entrySet().parallelStream()
+                .filter(entry -> directDepsByGAV.containsKey(entry.getKey())) // only direct deps
+                .map(entry -> parseDeploymentGAV(entry.getKey(), entry.getValue()))
+                .sequential()
+                .filter(optDeploymentGAV -> optDeploymentGAV
+                        .map(deploymentGAV -> !isMinDeploymentDepPresent(deploymentGAV, projArtifactKey,
+                                existingUnmatchedDeploymentDeps))
+                        .orElse(false))
+                .map(Optional::get)
+                .sorted()
+                .collect(Collectors.toList());
+
+        if (!missingDeploymentDeps.isEmpty()) {
+            String requiredDeps = missingDeploymentDeps.stream()
+                    .map(gav -> (Object[]) gav.split(":"))
+                    .map(gavArray -> String.format(DEP_TEMPLATE, gavArray))
+                    .collect(Collectors.joining("\n"));
+            throw new EnforcerRuleException(missingDeploymentDeps.size()
+                    + " minimal *-deployment dependencies are missing/configured incorrectly:\n"
+                    + "    " + missingDeploymentDeps.stream().collect(Collectors.joining("\n    "))
+                    + "\n\nTo fix this issue, add the following dependencies to pom.xml:\n\n"
+                    + "        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->\n"
+                    + requiredDeps);
+        }
+        if (!existingUnmatchedDeploymentDeps.isEmpty()) {
+            String superfluousDeps = existingUnmatchedDeploymentDeps.stream()
+                    .map(gav -> "    " + gav)
+                    .sorted()
+                    .collect(Collectors.joining("\n"));
+            throw new EnforcerRuleException(existingUnmatchedDeploymentDeps.size()
+                    + " minimal *-deployment dependencies are superfluous and must be removed from pom.xml:\n"
+                    + superfluousDeps);
+        }
+    }
+
+    private boolean isMinDeploymentDepPresent(String deploymentGAV, String projArtifactKey,
+            Set<String> existingDeploymentDeps) {
+        return deploymentGAV.equals(projArtifactKey) // special case: current project itself is the "required dependency"
+                || existingDeploymentDeps.remove(deploymentGAV);
+    }
+}
diff --git a/independent-projects/ide-config/pom.xml b/independent-projects/ide-config/pom.xml
index 12e545afb7d41..a720f7613cf47 100644
--- a/independent-projects/ide-config/pom.xml
+++ b/independent-projects/ide-config/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-      <parent>
-            <groupId>org.jboss</groupId>
-            <artifactId>jboss-parent</artifactId>
-            <version>36</version>
-        </parent>
-         <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>37</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-ide-config</artifactId>
@@ -19,7 +19,7 @@
         <license>
             <name>Apache License, Version 2.0</name>
             <distribution>repo</distribution>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
         </license>
     </licenses>
 
@@ -64,6 +64,48 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>quick-build</id>
+            <activation>
+                <property>
+                    <name>quickly</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+            <build>
+                <defaultGoal>clean install</defaultGoal>
+            </build>
+        </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -74,7 +116,7 @@
                         <version>${version.nexus-staging-maven-plugin}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
diff --git a/independent-projects/qute/core/pom.xml b/independent-projects/qute/core/pom.xml
index 1053950850c13..861df929a504c 100644
--- a/independent-projects/qute/core/pom.xml
+++ b/independent-projects/qute/core/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus.qute</groupId>
         <artifactId>qute-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>qute-core</artifactId>
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/CheckedTemplate.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/CheckedTemplate.java
new file mode 100644
index 0000000000000..b253cc3b9ad13
--- /dev/null
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/CheckedTemplate.java
@@ -0,0 +1,85 @@
+package io.quarkus.qute;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * If you place this annotation on a class, all its <code>native static</code> methods will be used to declare
+ * templates and the list of parameters they require.
+ * <p>
+ * The name of a method and the base path are used to locate the template contents.
+ * By default, the base path is derived from the annotation target:
+ * <ul>
+ * <li>If this is placed on a static nested class of an enclosing class with a simple name <code>X</code>, a
+ * <code>native static</code> method of the name <code>foo</code> will refer to a template at the path <code>X/foo</code>
+ * (template file extensions are
+ * not part of the method name) relative to the templates root.</li>
+ * <li>If this is placed on a top-level class, a <code>native static</code> method of the name <code>foo</code> will refer to a
+ * template at the path <code>foo</code> (template file extensions are
+ * not part of the method name) at the toplevel of the templates root.</li>
+ * </ul>
+ * The base path can be also specified via {@link #basePath()}.
+ * <p>
+ * Each parameter of the <code>native static</code> will be used to validate the template at build time, to
+ * make sure that those parameters are used properly in a type-safe manner. The return type of each
+ * <code>native static</code> method should be {@link TemplateInstance}.
+ * <p>
+ * Example:
+ * <p>
+ * 
+ * <pre>
+ * &#64;Path("item")
+ * public class ItemResource {
+ * 
+ *     &#64;CheckedTemplate
+ *     static class Templates {
+ *         // defines a template at ItemResource/item, taking an Item parameter named item
+ *         static native TemplateInstance item(Item item);
+ *     }
+ * 
+ *     &#64;GET
+ *     &#64;Path("{id}")
+ *     &#64;Produces(MediaType.TEXT_HTML)
+ *     public TemplateInstance get(@PathParam("id") Integer id) {
+ *         // instantiate that template and pass it the required template parameter
+ *         return Templates.item(service.findItem(id));
+ *     }
+ * }
+ * </pre>
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface CheckedTemplate {
+
+    /**
+     * Constant value for {@link #basePath()} indicating that the default strategy should be used.
+     */
+    String DEFAULTED = "<<defaulted>>";
+
+    /**
+     * Example:
+     * 
+     * <pre>
+     * &#64;Path("item")
+     * public class ItemResource {
+     * 
+     *     &#64;CheckedTemplate(basePath = "items_v1")
+     *     static class Templates {
+     *         // defines a template at items_v1/item
+     *         static native TemplateInstance item(Item item);
+     * 
+     *         // defines a template at items_v1/allItems
+     *         static native TemplateInstance allItems(List&lt;Item&gt; items);
+     *     }
+     * }
+     * </pre>
+     * 
+     * @return the base path relative to the templates root
+     */
+    String basePath() default DEFAULTED;
+
+}
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Engine.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Engine.java
index b2b8db68b515c..e738fa08387ad 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Engine.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Engine.java
@@ -27,7 +27,7 @@ static EngineBuilder builder() {
      * @return the template
      */
     default Template parse(String content) {
-        return parse(content, null);
+        return parse(content, null, null);
     }
 
     /**
@@ -40,7 +40,7 @@ default Template parse(String content) {
      * @return the template
      */
     default Template parse(String content, Variant variant) {
-        return parse(content, null, null);
+        return parse(content, variant, null);
     }
 
     /**
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java
index be57cf4d1b6ea..3d7919831b69c 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java
@@ -1,13 +1,5 @@
 package io.quarkus.qute;
 
-import static io.quarkus.qute.ValueResolvers.collectionResolver;
-import static io.quarkus.qute.ValueResolvers.mapEntryResolver;
-import static io.quarkus.qute.ValueResolvers.mapResolver;
-import static io.quarkus.qute.ValueResolvers.mapperResolver;
-import static io.quarkus.qute.ValueResolvers.orResolver;
-import static io.quarkus.qute.ValueResolvers.thisResolver;
-import static io.quarkus.qute.ValueResolvers.trueResolver;
-
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -62,7 +54,7 @@ public EngineBuilder addSectionHelper(String name, SectionHelperFactory<?> facto
     public EngineBuilder addDefaultSectionHelpers() {
         return addSectionHelpers(new IfSectionHelper.Factory(), new LoopSectionHelper.Factory(),
                 new WithSectionHelper.Factory(), new IncludeSectionHelper.Factory(), new InsertSectionHelper.Factory(),
-                new SetSectionHelper.Factory());
+                new SetSectionHelper.Factory(), new WhenSectionHelper.Factory());
     }
 
     public EngineBuilder addValueResolver(Supplier<ValueResolver> resolverSupplier) {
@@ -87,8 +79,11 @@ public EngineBuilder addValueResolver(ValueResolver resolver) {
      * @return self
      */
     public EngineBuilder addDefaultValueResolvers() {
-        return addValueResolvers(mapResolver(), mapperResolver(), mapEntryResolver(), collectionResolver(),
-                thisResolver(), orResolver(), trueResolver());
+        return addValueResolvers(ValueResolvers.mapResolver(), ValueResolvers.mapperResolver(),
+                ValueResolvers.mapEntryResolver(), ValueResolvers.collectionResolver(), ValueResolvers.listResolver(),
+                ValueResolvers.thisResolver(), ValueResolvers.orResolver(), ValueResolvers.trueResolver(),
+                ValueResolvers.logicalAndResolver(), ValueResolvers.logicalOrResolver(), ValueResolvers.orEmpty(),
+                ValueResolvers.arrayResolver());
     }
 
     public EngineBuilder addDefaults() {
@@ -99,7 +94,7 @@ public EngineBuilder addNamespaceResolver(NamespaceResolver resolver) {
         for (NamespaceResolver namespaceResolver : namespaceResolvers) {
             if (namespaceResolver.getNamespace().equals(resolver.getNamespace())) {
                 throw new IllegalArgumentException(
-                        String.format("Namespace %s is already handled by %s", resolver.getNamespace()));
+                        String.format("Namespace %s is already handled by %s", resolver.getNamespace(), namespaceResolver));
             }
         }
         this.namespaceResolvers.add(resolver);
@@ -139,8 +134,10 @@ public EngineBuilder computeSectionHelper(Function<String, SectionHelperFactory<
     }
 
     /**
-     * Specify whether the parser should remove standalone lines from the output. A standalone line is a line that contains
-     * only section tags, parameter declarations and whitespace characters.
+     * Specify whether the parser should remove standalone lines from the output.
+     * <p>
+     * A standalone line is a line that contains at least one section tag, parameter declaration, or comment but no expression
+     * and no non-whitespace character.
      * 
      * @param value
      * @return self
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java
index 58b832d56c075..003ac4b586d6a 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineImpl.java
@@ -54,13 +54,14 @@ class EngineImpl implements Engine {
     @Override
     public Template parse(String content, Variant variant, String id) {
         String generatedId = generateId();
-        return newParser(id).parse(new StringReader(content), Optional.ofNullable(variant), generatedId, generatedId);
+        return newParser(id != null ? id : generatedId, new StringReader(content), Optional.ofNullable(variant), generatedId)
+                .parse();
     }
 
-    private Parser newParser(String id) {
-        Parser parser = new Parser(this);
+    private Parser newParser(String id, Reader reader, Optional<Variant> variant, String generatedId) {
+        Parser parser = new Parser(this, reader, id, generatedId, variant);
         for (ParserHook parserHook : parserHooks) {
-            parserHook.beforeParsing(parser, id);
+            parserHook.beforeParsing(parser);
         }
         return parser;
     }
@@ -121,7 +122,7 @@ private Template load(String id) {
             Optional<TemplateLocation> location = locator.locate(id);
             if (location.isPresent()) {
                 try (Reader r = location.get().read()) {
-                    return newParser(id).parse(ensureBufferedReader(r), location.get().getVariant(), id, generateId());
+                    return newParser(id, ensureBufferedReader(r), location.get().getVariant(), generateId()).parse();
                 } catch (IOException e) {
                     LOGGER.warn("Unable to close the reader for " + id, e);
                 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalContext.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalContext.java
index fc52488b2c69a..5bf28609a42a2 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalContext.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvalContext.java
@@ -6,7 +6,7 @@
 /**
  * Evaluation context of a specific part of an expression.
  * 
- * @see Expression
+ * @see Expression.Part
  */
 public interface EvalContext {
 
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatedParams.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatedParams.java
index a78c90a32841e..5cb99d715642d 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatedParams.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatedParams.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Array;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -10,6 +11,14 @@
 @SuppressWarnings("rawtypes")
 public final class EvaluatedParams {
 
+    static final EvaluatedParams EMPTY;
+
+    static {
+        CompletableFuture<Void> empty = new CompletableFuture<Void>();
+        empty.complete(null);
+        EMPTY = new EvaluatedParams(empty, new CompletableFuture<?>[0]);
+    }
+
     /**
      * 
      * @param context
@@ -17,12 +26,42 @@ public final class EvaluatedParams {
      */
     public static EvaluatedParams evaluate(EvalContext context) {
         List<Expression> params = context.getParams();
-        if (params.size() == 1) {
+        if (params.isEmpty()) {
+            return EMPTY;
+        } else if (params.size() == 1) {
             return new EvaluatedParams(context.evaluate(params.get(0)));
         }
-        CompletableFuture<?>[] results = new CompletableFuture<?>[params.size()];
+        CompletableFuture<?>[] allResults = new CompletableFuture<?>[params.size()];
+        List<CompletableFuture<?>> results = new LinkedList<>();
         int i = 0;
         Iterator<Expression> it = params.iterator();
+        while (it.hasNext()) {
+            Expression expression = it.next();
+            CompletableFuture<Object> result = context.evaluate(expression).toCompletableFuture();
+            allResults[i++] = result;
+            if (!expression.isLiteral()) {
+                results.add(result);
+            }
+        }
+        return new EvaluatedParams(CompletableFuture.allOf(results.toArray(new CompletableFuture[0])), allResults);
+    }
+
+    public static EvaluatedParams evaluateMessageKey(EvalContext context) {
+        List<Expression> params = context.getParams();
+        if (params.isEmpty()) {
+            throw new IllegalArgumentException("No params to evaluate");
+        }
+        return new EvaluatedParams(context.evaluate(params.get(0)));
+    }
+
+    public static EvaluatedParams evaluateMessageParams(EvalContext context) {
+        List<Expression> params = context.getParams();
+        if (params.size() < 2) {
+            return EMPTY;
+        }
+        CompletableFuture<?>[] results = new CompletableFuture<?>[params.size() - 1];
+        int i = 0;
+        Iterator<Expression> it = params.subList(1, params.size()).iterator();
         while (it.hasNext()) {
             results[i++] = context.evaluate(it.next()).toCompletableFuture();
         }
@@ -55,7 +94,12 @@ public Object getResult(int index) throws InterruptedException, ExecutionExcepti
      * @throws ExecutionException
      */
     public boolean parameterTypesMatch(boolean varargs, Class<?>[] types) throws InterruptedException, ExecutionException {
-        if (types.length != results.length) {
+        // Check the number of parameters and replace the last param type with component type if needed
+        if (types.length == results.length) {
+            if (varargs) {
+                types[types.length - 1] = types[types.length - 1].getComponentType();
+            }
+        } else {
             if (varargs) {
                 int diff = types.length - results.length;
                 if (diff == 1) {
@@ -65,7 +109,6 @@ public boolean parameterTypesMatch(boolean varargs, Class<?>[] types) throws Int
                     return false;
                 }
                 // diff < 1
-                // Replace the last param type with component type
                 Class<?> varargsType = types[types.length - 1];
                 types[types.length - 1] = varargsType.getComponentType();
             } else {
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java
index b0488e968adbf..434091c667e01 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EvaluatorImpl.java
@@ -1,7 +1,9 @@
 package io.quarkus.qute;
 
 import io.quarkus.qute.Expression.Part;
+import io.quarkus.qute.ExpressionImpl.PartImpl;
 import io.quarkus.qute.Results.Result;
+import io.smallrye.mutiny.Uni;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -38,7 +40,7 @@ public CompletionStage<Object> evaluate(Expression expression, ResolutionContext
                 if (parts.hasNext()) {
                     return resolveReference(false, r, parts, resolutionContext);
                 } else {
-                    return CompletableFuture.completedFuture(r);
+                    return toCompletionStage(r);
                 }
             });
         } else {
@@ -71,62 +73,98 @@ private CompletionStage<Object> resolveReference(boolean tryParent, Object ref,
         EvalContextImpl evalContext = new EvalContextImpl(tryParent, ref, part, resolutionContext);
         if (!parts.hasNext()) {
             // The last part - no need to compose
-            return resolve(evalContext, resolvers.iterator());
+            return resolve(evalContext, null, true);
         } else {
             // Next part - no need to try the parent context/outer scope
-            return resolve(evalContext, resolvers.iterator())
+            return resolve(evalContext, null, true)
                     .thenCompose(r -> resolveReference(false, r, parts, resolutionContext));
         }
     }
 
-    private CompletionStage<Object> resolve(EvalContextImpl evalContext, Iterator<ValueResolver> resolvers) {
-        if (!resolvers.hasNext()) {
+    private CompletionStage<Object> resolve(EvalContextImpl evalContext, Iterator<ValueResolver> resolvers,
+            boolean tryCachedResolver) {
+
+        if (tryCachedResolver) {
+            // Try the cached resolver first
+            ValueResolver cachedResolver = evalContext.getCachedResolver();
+            if (cachedResolver != null && cachedResolver.appliesTo(evalContext)) {
+                return cachedResolver.resolve(evalContext).thenCompose(r -> {
+                    if (Result.NOT_FOUND.equals(r)) {
+                        return resolve(evalContext, null, false);
+                    } else {
+                        return toCompletionStage(r);
+                    }
+                });
+            }
+        }
+
+        if (resolvers == null) {
+            // Iterate the resolvers lazily 
+            resolvers = this.resolvers.iterator();
+        }
+
+        ValueResolver applicableResolver = null;
+        while (applicableResolver == null && resolvers.hasNext()) {
+            ValueResolver next = resolvers.next();
+            if (next.appliesTo(evalContext)) {
+                applicableResolver = next;
+            }
+        }
+        if (applicableResolver == null) {
             ResolutionContext parent = evalContext.resolutionContext.getParent();
             if (evalContext.tryParent && parent != null) {
                 // Continue with parent context
                 return resolve(
-                        new EvalContextImpl(true, parent.getData(), evalContext.name, evalContext.params, parent),
-                        this.resolvers.iterator());
+                        new EvalContextImpl(true, parent.getData(), parent,
+                                evalContext.part),
+                        null, false);
             }
             LOGGER.tracef("Unable to resolve %s", evalContext);
             return Results.NOT_FOUND;
         }
-        ValueResolver resolver = resolvers.next();
-        if (resolver.appliesTo(evalContext)) {
-            return resolver.resolve(evalContext).thenCompose(r -> {
-                if (Result.NOT_FOUND.equals(r)) {
-                    return resolve(evalContext, resolvers);
-                } else {
-                    return CompletableFuture.completedFuture(r);
-                }
-            });
-        } else {
-            // Try next resolver
-            return resolve(evalContext, resolvers);
+
+        final Iterator<ValueResolver> remainingResolvers = resolvers;
+        final ValueResolver foundResolver = applicableResolver;
+        return applicableResolver.resolve(evalContext).thenCompose(r -> {
+            if (Result.NOT_FOUND.equals(r)) {
+                // Result not found - try the next resolver
+                return resolve(evalContext, remainingResolvers, false);
+            } else {
+                // Cache the first resolver where a result is found
+                evalContext.setCachedResolver(foundResolver);
+                return toCompletionStage(r);
+            }
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    private CompletionStage<Object> toCompletionStage(Object result) {
+        if (result instanceof CompletionStage) {
+            // If the result is a completion stage return it as is
+            return (CompletionStage<Object>) result;
+        } else if (result instanceof Uni) {
+            // Subscribe to the Uni
+            return ((Uni<Object>) result).subscribeAsCompletionStage();
         }
+        return CompletableFuture.completedFuture(result);
     }
 
     static class EvalContextImpl implements EvalContext {
 
         final boolean tryParent;
         final Object base;
-        final String name;
-        final List<Expression> params;
         final ResolutionContext resolutionContext;
+        final PartImpl part;
 
         EvalContextImpl(boolean tryParent, Object base, Part part, ResolutionContext resolutionContext) {
-            this(tryParent, base, part.getName(),
-                    part.isVirtualMethod() ? part.asVirtualMethod().getParameters() : Collections.emptyList(),
-                    resolutionContext);
+            this(tryParent, base, resolutionContext, part);
         }
 
-        EvalContextImpl(boolean tryParent, Object base, String name, List<Expression> params,
-                ResolutionContext resolutionContext) {
+        EvalContextImpl(boolean tryParent, Object base, ResolutionContext resolutionContext, Part part) {
             this.tryParent = tryParent;
             this.base = base;
             this.resolutionContext = resolutionContext;
-            this.params = params;
-            this.name = name;
+            this.part = (PartImpl) part;
         }
 
         @Override
@@ -136,12 +174,12 @@ public Object getBase() {
 
         @Override
         public String getName() {
-            return name;
+            return part.getName();
         }
 
         @Override
         public List<Expression> getParams() {
-            return params;
+            return part.isVirtualMethod() ? part.asVirtualMethod().getParameters() : Collections.emptyList();
         }
 
         @Override
@@ -159,11 +197,19 @@ public Object getAttribute(String key) {
             return resolutionContext.getAttribute(key);
         }
 
+        ValueResolver getCachedResolver() {
+            return part.cachedResolver;
+        }
+
+        void setCachedResolver(ValueResolver valueResolver) {
+            part.cachedResolver = valueResolver;
+        }
+
         @Override
         public String toString() {
             StringBuilder builder = new StringBuilder();
             builder.append("EvalContextImpl [tryParent=").append(tryParent).append(", base=").append(base).append(", name=")
-                    .append(name).append(", params=").append(params).append("]");
+                    .append(getBase()).append(", params=").append(getParams()).append("]");
             return builder.toString();
         }
 
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java
index 6d8dfc0e869d0..2cd5551132eb5 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expression.java
@@ -64,6 +64,13 @@ default boolean hasTypeInfo() {
         return getParts().get(0).getTypeInfo() != null;
     }
 
+    /**
+     * The id must be unique for the template.
+     * 
+     * @return the generated id or {@code -1} for an expression that was not created by a parser
+     */
+    int getGeneratedId();
+
     /**
      * 
      * @see Expression#getParts()
@@ -72,7 +79,7 @@ interface Part {
 
         /**
          * 
-         * @return the name of the property or virtual method
+         * @return the name of a property or virtual method
          */
         String getName();
 
@@ -82,9 +89,9 @@ interface Part {
          * <li>type info that represents a fully qualified type name (including type parameters) -
          * {@code |TYPE_INFO|<section-hint>};
          * for example {@code |org.acme.Foo|},
-         * {@code |java.util.List<org.acme.Label>|} and {@code |org.acme.Foo|<for-element>}</li>
-         * <li>property; for example {@code foo} and {@code foo<for-element>}</li>
-         * <li>virtual method; for example {@code foo.call(|org.acme.Bar|)}</li>
+         * {@code |java.util.List<org.acme.Label>|} and {@code |org.acme.Foo|<when#123>}</li>
+         * <li>property; for example {@code foo} and {@code foo<loop#123>}</li>
+         * <li>virtual method; for example {@code foo.call(bar)} and {@code foo.getNames(10)<loop-element>}</li>
          * </ul>
          * 
          * @return the type check info
@@ -96,7 +103,7 @@ default boolean isVirtualMethod() {
         }
 
         default VirtualMethodPart asVirtualMethod() {
-            throw new IllegalArgumentException("Not a virtual method");
+            throw new IllegalStateException("Not a virtual method: " + toString() + " [typeInfo: " + getTypeInfo() + "]");
         }
 
     }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java
index 75897a8bbf107..7bc29bb0ba086 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionImpl.java
@@ -9,139 +9,23 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-/**
- * 
- */
 final class ExpressionImpl implements Expression {
 
-    static class VirtualMethodExpressionPartImpl extends ExpressionPartImpl implements VirtualMethodPart {
-
-        private final List<Expression> parameters;
-
-        VirtualMethodExpressionPartImpl(String name, List<Expression> parameters) {
-            super(name, null);
-            this.parameters = parameters;
-        }
-
-        public List<Expression> getParameters() {
-            return parameters;
-        }
-
-        @Override
-        public boolean isVirtualMethod() {
-            return true;
-        }
-
-        @Override
-        public VirtualMethodPart asVirtualMethod() {
-            return this;
-        }
-
-        @Override
-        public String getTypeInfo() {
-            return toString();
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + Objects.hash(parameters);
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            VirtualMethodExpressionPartImpl other = (VirtualMethodExpressionPartImpl) obj;
-            return Objects.equals(parameters, other.parameters);
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder builder = new StringBuilder();
-            builder.append(name).append("(");
-            for (Iterator<Expression> iterator = parameters.iterator(); iterator.hasNext();) {
-                Expression expression = iterator.next();
-                builder.append(expression.toOriginalString());
-                if (iterator.hasNext()) {
-                    builder.append(",");
-                }
-            }
-            builder.append(")");
-            return builder.toString();
-        }
-
-    }
-
-    static class ExpressionPartImpl implements Part {
-
-        protected final String name;
-        protected final String typeInfo;
-
-        ExpressionPartImpl(String name, String typeInfo) {
-            this.name = name;
-            this.typeInfo = typeInfo;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getTypeInfo() {
-            return typeInfo;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(name, typeInfo);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            ExpressionPartImpl other = (ExpressionPartImpl) obj;
-            return Objects.equals(name, other.name) && Objects.equals(typeInfo, other.typeInfo);
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
-
-    }
-
-    static final ExpressionImpl EMPTY = new ExpressionImpl(null, Collections.emptyList(), null, null);
+    static final ExpressionImpl EMPTY = new ExpressionImpl(0, null, Collections.emptyList(), null, null);
 
     /**
      * 
      * @param value
-     * @return a non-contextual expression
+     * @return a new expression
      */
     static ExpressionImpl from(String value) {
         if (value == null || value.isEmpty()) {
             return EMPTY;
         }
-        return Parser.parseExpression(value, Scope.EMPTY, Parser.SYNTHETIC_ORIGIN);
+        return Parser.parseExpression(ExpressionImpl::syntheticId, value, Scope.EMPTY, Parser.SYNTHETIC_ORIGIN);
     }
 
-    static ExpressionImpl literalFrom(String literal) {
+    static ExpressionImpl literalFrom(int id, String literal) {
         if (literal == null || literal.isEmpty()) {
             return EMPTY;
         }
@@ -149,27 +33,33 @@ static ExpressionImpl literalFrom(String literal) {
         if (literalValue == null) {
             throw new IllegalArgumentException("Not a literal value: " + literal);
         }
-        return literal(literal, literalValue, Parser.SYNTHETIC_ORIGIN);
+        return literal(id, literal, literalValue, Parser.SYNTHETIC_ORIGIN);
     }
 
-    static ExpressionImpl literal(String literal, Object value, Origin origin) {
+    static ExpressionImpl literal(int id, String literal, Object value, Origin origin) {
         if (literal == null) {
             throw new IllegalArgumentException("Literal must not be null");
         }
-        return new ExpressionImpl(null,
-                Collections.singletonList(new ExpressionPartImpl(literal,
+        return new ExpressionImpl(id, null,
+                Collections.singletonList(new PartImpl(literal,
                         value != null
                                 ? Expressions.TYPE_INFO_SEPARATOR + value.getClass().getName() + Expressions.TYPE_INFO_SEPARATOR
                                 : null)),
                 value, origin);
     }
 
+    static Integer syntheticId() {
+        return -1;
+    }
+
+    private final int id;
     private final String namespace;
     private final List<Part> parts;
     private final CompletableFuture<Object> literal;
     private final Origin origin;
 
-    ExpressionImpl(String namespace, List<Part> parts, Object literal, Origin origin) {
+    ExpressionImpl(int id, String namespace, List<Part> parts, Object literal, Origin origin) {
+        this.id = id;
         this.namespace = namespace;
         this.parts = parts;
         this.literal = literal != Result.NOT_FOUND ? CompletableFuture.completedFuture(literal) : null;
@@ -197,24 +87,30 @@ public Origin getOrigin() {
         return origin;
     }
 
+    @Override
+    public int getGeneratedId() {
+        return id;
+    }
+
     @Override
     public int hashCode() {
-        return Objects.hash(toOriginalString());
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Objects.hashCode(toOriginalString());
+        result = prime * result + Objects.hashCode(origin);
+        return result;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
-        if (obj == null) {
+        if (obj == null)
             return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (getClass() != obj.getClass())
             return false;
-        }
         ExpressionImpl other = (ExpressionImpl) obj;
-        return Objects.equals(toOriginalString(), other.toOriginalString());
+        return Objects.equals(toOriginalString(), other.toOriginalString()) && Objects.equals(origin, other.origin);
     }
 
     @Override
@@ -252,4 +148,131 @@ private Object literalValue() {
         return null;
     }
 
+    static class VirtualMethodPartImpl extends PartImpl implements VirtualMethodPart {
+
+        private final List<Expression> parameters;
+
+        VirtualMethodPartImpl(String name, List<Expression> parameters, String lastPartHint) {
+            super(name, buildTypeInfo(name, parameters, lastPartHint));
+            this.parameters = parameters;
+        }
+
+        public List<Expression> getParameters() {
+            return parameters;
+        }
+
+        @Override
+        public boolean isVirtualMethod() {
+            return true;
+        }
+
+        @Override
+        public VirtualMethodPart asVirtualMethod() {
+            return this;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = super.hashCode();
+            result = prime * result + Objects.hash(parameters);
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!super.equals(obj)) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            VirtualMethodPartImpl other = (VirtualMethodPartImpl) obj;
+            return Objects.equals(parameters, other.parameters);
+        }
+
+        @Override
+        public String toString() {
+            return buildTypeInfo(name, parameters, null);
+        }
+
+        private static String buildTypeInfo(String name, List<Expression> parameters, String lastPartHint) {
+            StringBuilder builder = new StringBuilder();
+            builder.append(name).append("(");
+            for (Iterator<Expression> iterator = parameters.iterator(); iterator.hasNext();) {
+                Expression expression = iterator.next();
+                builder.append(expression.toOriginalString());
+                if (iterator.hasNext()) {
+                    builder.append(",");
+                }
+            }
+            builder.append(")");
+            if (lastPartHint != null) {
+                builder.append(lastPartHint);
+            }
+            return builder.toString();
+        }
+
+    }
+
+    static class PartImpl implements Part {
+
+        protected final String name;
+        protected final String typeInfo;
+        protected volatile ValueResolver cachedResolver;
+
+        PartImpl(String name, String typeInfo) {
+            this.name = name;
+            this.typeInfo = typeInfo;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getTypeInfo() {
+            return typeInfo;
+        }
+
+        void setCachedResolver(ValueResolver resolver) {
+            ValueResolver last = this.cachedResolver;
+            if (last != null) {
+                return;
+            }
+            synchronized (this) {
+                if (this.cachedResolver == null) {
+                    this.cachedResolver = resolver;
+                }
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(name, typeInfo);
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            PartImpl other = (PartImpl) obj;
+            return Objects.equals(name, other.name) && Objects.equals(typeInfo, other.typeInfo);
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+    }
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java
index 8bf58f9b741c3..182afdbbc80c2 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ExpressionNode.java
@@ -1,7 +1,7 @@
 package io.quarkus.qute;
 
 import java.util.Collections;
-import java.util.Set;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
@@ -41,12 +41,17 @@ public Origin getOrigin() {
         return origin;
     }
 
+    @Override
+    public boolean isConstant() {
+        return expression.isLiteral();
+    }
+
     Engine getEngine() {
         return engine;
     }
 
-    public Set<Expression> getExpressions() {
-        return Collections.singleton(expression);
+    public List<Expression> getExpressions() {
+        return Collections.singletonList(expression);
     }
 
     @Override
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java
index 534c282decb1a..4d7d08cf5fc71 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Expressions.java
@@ -2,7 +2,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public final class Expressions {
@@ -11,6 +10,8 @@ public final class Expressions {
 
     static final String LEFT_BRACKET = "(";
     static final String RIGHT_BRACKET = ")";
+    static final String SQUARE_LEFT_BRACKET = "[";
+    static final String SQUARE_RIGHT_BRACKET = "]";
     public static final char TYPE_INFO_SEPARATOR = '|';
 
     private Expressions() {
@@ -20,6 +21,10 @@ public static boolean isVirtualMethod(String value) {
         return value.indexOf(LEFT_BRACKET) != -1;
     }
 
+    public static boolean isBracketNotation(String value) {
+        return value.startsWith(SQUARE_LEFT_BRACKET);
+    }
+
     public static String parseVirtualMethodName(String value) {
         int start = value.indexOf(LEFT_BRACKET);
         return value.substring(0, start);
@@ -29,17 +34,24 @@ public static List<String> parseVirtualMethodParams(String value) {
         int start = value.indexOf(LEFT_BRACKET);
         if (start != -1 && value.endsWith(RIGHT_BRACKET)) {
             String params = value.substring(start + 1, value.length() - 1);
-            return splitParts(params, Expressions::isParamSeparator, Parser::isStringLiteralSeparator);
+            return splitParts(params, PARAMS_SPLIT_CONFIG);
         }
         throw new IllegalArgumentException("Not a virtual method: " + value);
     }
 
+    public static String parseBracketContent(String value) {
+        if (value.endsWith(SQUARE_RIGHT_BRACKET)) {
+            return value.substring(1, value.length() - 1);
+        }
+        throw new IllegalArgumentException("Not a bracket notation expression: " + value);
+    }
+
     public static String buildVirtualMethodSignature(String name, List<String> params) {
         return name + LEFT_BRACKET + params.stream().collect(Collectors.joining(",")) + RIGHT_BRACKET;
     }
 
     public static List<String> splitParts(String value) {
-        return splitParts(value, Parser::isSeparator, Parser::isStringLiteralSeparator);
+        return splitParts(value, DEFAULT_SPLIT_CONFIG);
     }
 
     /**
@@ -48,43 +60,41 @@ public static List<String> splitParts(String value) {
      * @return the parts
      */
     public static List<String> splitTypeInfoParts(String value) {
-        return splitParts(value, Parser::isSeparator, new Predicate<Character>() {
-
-            @Override
-            public boolean test(Character t) {
-                return t == TYPE_INFO_SEPARATOR;
-            }
-        }.or(Parser::isStringLiteralSeparator));
+        return splitParts(value, TYPE_INFO_SPLIT_CONFIG);
     }
 
-    public static List<String> splitParts(String value, Predicate<Character> separatorPredicate,
-            Predicate<Character> literalSeparatorPredicate) {
+    public static List<String> splitParts(String value, SplitConfig splitConfig) {
         if (value == null || value.isEmpty()) {
             return Collections.emptyList();
         }
         boolean literal = false;
-        boolean separator = false;
+        char separator = 0;
         byte infix = 0;
         byte brackets = 0;
-        ImmutableList.Builder<String> builder = ImmutableList.builder();
+        ImmutableList.Builder<String> parts = ImmutableList.builder();
         StringBuilder buffer = new StringBuilder();
         for (int i = 0; i < value.length(); i++) {
             char c = value.charAt(i);
-            if (separatorPredicate.test(c)) {
-                // Adjacent separators are ignored
-                if (!separator) {
+            if (splitConfig.isSeparator(c)) {
+                // Adjacent separators may be ignored
+                if (separator == 0 || separator != c) {
                     if (!literal && brackets == 0) {
-                        if (buffer.length() > 0) {
-                            builder.add(buffer.toString());
+                        if (splitConfig.shouldPrependSeparator(c)) {
+                            buffer.append(c);
+                        }
+                        if (addPart(buffer, parts)) {
                             buffer = new StringBuilder();
                         }
-                        separator = true;
+                        if (splitConfig.shouldAppendSeparator(c)) {
+                            buffer.append(c);
+                        }
+                        separator = c;
                     } else {
                         buffer.append(c);
                     }
                 }
             } else {
-                if (literalSeparatorPredicate.test(c)) {
+                if (splitConfig.isLiteralSeparator(c)) {
                     literal = !literal;
                 }
                 // Non-separator char
@@ -98,13 +108,13 @@ public static List<String> splitParts(String value, Predicate<Character> separat
                             // Next infix method
                             infix = 1;
                             buffer.append(RIGHT_BRACKET);
-                            builder.add(buffer.toString());
-                            buffer = new StringBuilder();
+                            if (addPart(buffer, parts)) {
+                                buffer = new StringBuilder();
+                            }
                         } else {
                             // First space - start infix method
                             infix++;
-                            if (buffer.length() > 0) {
-                                builder.add(buffer.toString());
+                            if (addPart(buffer, parts)) {
                                 buffer = new StringBuilder();
                             }
                         }
@@ -116,24 +126,91 @@ public static List<String> splitParts(String value, Predicate<Character> separat
                         }
                         buffer.append(c);
                     }
-                    separator = false;
+                    separator = 0;
                 } else {
                     buffer.append(c);
-                    separator = false;
+                    separator = 0;
                 }
             }
         }
         if (infix > 0) {
             buffer.append(RIGHT_BRACKET);
         }
-        if (buffer.length() > 0) {
-            builder.add(buffer.toString());
+        addPart(buffer, parts);
+        return parts.build();
+    }
+
+    /**
+     * 
+     * @param buffer
+     * @param parts
+     * @return true if a new buffer should be created
+     */
+    private static boolean addPart(StringBuilder buffer, ImmutableList.Builder<String> parts) {
+        if (buffer.length() == 0) {
+            return false;
         }
-        return builder.build();
+        String val = buffer.toString().trim();
+        if (!val.isEmpty()) {
+            parts.add(val);
+        }
+        return true;
     }
 
-    private static boolean isParamSeparator(char candidate) {
-        return ',' == candidate;
+    private static final SplitConfig DEFAULT_SPLIT_CONFIG = new DefaultSplitConfig();
+
+    private static final SplitConfig PARAMS_SPLIT_CONFIG = new SplitConfig() {
+
+        @Override
+        public boolean isSeparator(char candidate) {
+            return ',' == candidate;
+        }
+
+    };
+
+    private static final SplitConfig TYPE_INFO_SPLIT_CONFIG = new DefaultSplitConfig() {
+
+        @Override
+        public boolean isLiteralSeparator(char candidate) {
+            return candidate == TYPE_INFO_SEPARATOR || LiteralSupport.isStringLiteralSeparator(candidate);
+        }
+    };
+
+    private static class DefaultSplitConfig implements SplitConfig {
+
+        @Override
+        public boolean isSeparator(char candidate) {
+            return candidate == '.' || candidate == '[' || candidate == ']';
+        }
+
+        @Override
+        public boolean shouldPrependSeparator(char candidate) {
+            return candidate == ']';
+        }
+
+        @Override
+        public boolean shouldAppendSeparator(char candidate) {
+            return candidate == '[';
+        }
+
+    }
+
+    interface SplitConfig {
+
+        boolean isSeparator(char candidate);
+
+        default boolean isLiteralSeparator(char candidate) {
+            return LiteralSupport.isStringLiteralSeparator(candidate);
+        }
+
+        default boolean shouldPrependSeparator(char candidate) {
+            return false;
+        }
+
+        default boolean shouldAppendSeparator(char candidate) {
+            return false;
+        }
+
     }
 
 }
diff --git a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/HtmlEscaper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java
similarity index 84%
rename from extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/HtmlEscaper.java
rename to independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java
index e127dcc613fbf..5788c7e2656f6 100644
--- a/extensions/qute/runtime/src/main/java/io/quarkus/qute/runtime/HtmlEscaper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/HtmlEscaper.java
@@ -1,15 +1,10 @@
-package io.quarkus.qute.runtime;
+package io.quarkus.qute;
 
+import io.quarkus.qute.TemplateNode.Origin;
 import java.util.Objects;
 import java.util.Optional;
 
-import io.quarkus.qute.Expression;
-import io.quarkus.qute.RawString;
-import io.quarkus.qute.ResultMapper;
-import io.quarkus.qute.TemplateNode.Origin;
-import io.quarkus.qute.Variant;
-
-class HtmlEscaper implements ResultMapper {
+public class HtmlEscaper implements ResultMapper {
 
     @Override
     public boolean appliesTo(Origin origin, Object result) {
@@ -43,8 +38,8 @@ String escape(CharSequence value) {
     }
 
     static boolean requiresDefaultEscaping(Variant variant) {
-        return variant.mediaType != null
-                ? (Variant.TEXT_HTML.equals(variant.mediaType) || Variant.TEXT_XML.equals(variant.mediaType))
+        return variant.getContentType() != null
+                ? (Variant.TEXT_HTML.equals(variant.getContentType()) || Variant.TEXT_XML.equals(variant.getContentType()))
                 : false;
     }
 
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java
index 3cdc5a4f302f8..4b4d9f742f591 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IfSectionHelper.java
@@ -45,7 +45,7 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
             IfBlock block = blocks.get(0);
             return block.condition.evaluate(context).thenCompose(r -> {
                 if (isFalsy(r)) {
-                    return CompletableFuture.completedFuture(ResultNode.NOOP);
+                    return ResultNode.NOOP;
                 } else {
                     return context.execute(block.block, context.resolutionContext());
                 }
@@ -66,7 +66,7 @@ private CompletionStage<ResultNode> resolveBlocks(SectionResolutionContext conte
                 if (blocks.hasNext()) {
                     return resolveBlocks(context, blocks);
                 }
-                return CompletableFuture.completedFuture(ResultNode.NOOP);
+                return ResultNode.NOOP;
             } else {
                 return context.execute(block.block, context.resolutionContext());
             }
@@ -191,6 +191,11 @@ public Operator getOperator() {
             return operator;
         }
 
+        @Override
+        public String toString() {
+            return "OperandCondition [operator=" + operator + ", expression=" + expression.toOriginalString() + "]";
+        }
+
     }
 
     static class CompositeCondition implements Condition {
@@ -272,6 +277,11 @@ public boolean isEmpty() {
             return conditions.isEmpty();
         }
 
+        @Override
+        public String toString() {
+            return "CompositeCondition [conditions=" + conditions.size() + ", operator=" + operator + "]";
+        }
+
     }
 
     enum Operator {
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IncludeSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IncludeSectionHelper.java
index b60e65830c776..ed8e2c100d13f 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/IncludeSectionHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/IncludeSectionHelper.java
@@ -1,8 +1,13 @@
 package io.quarkus.qute;
 
+import static io.quarkus.qute.Futures.evaluateParams;
+
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
 
@@ -12,15 +17,46 @@ public class IncludeSectionHelper implements SectionHelper {
 
     private final Supplier<Template> templateSupplier;
     private final Map<String, SectionBlock> extendingBlocks;
+    private final Map<String, Expression> parameters;
 
-    public IncludeSectionHelper(Supplier<Template> templateSupplier, Map<String, SectionBlock> extendingBlocks) {
+    public IncludeSectionHelper(Supplier<Template> templateSupplier, Map<String, SectionBlock> extendingBlocks,
+            Map<String, Expression> parameters) {
         this.templateSupplier = templateSupplier;
         this.extendingBlocks = extendingBlocks;
+        this.parameters = parameters;
     }
 
     @Override
     public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
-        return ((TemplateImpl) templateSupplier.get()).root.resolve(context.resolutionContext().createChild(extendingBlocks));
+        if (parameters.isEmpty()) {
+            return ((TemplateImpl) templateSupplier.get()).root
+                    .resolve(context.resolutionContext().createChild(null, extendingBlocks));
+        } else {
+            CompletableFuture<ResultNode> result = new CompletableFuture<>();
+            evaluateParams(parameters, context.resolutionContext()).whenComplete((evaluatedParams, t1) -> {
+                if (t1 != null) {
+                    result.completeExceptionally(t1);
+                } else {
+                    try {
+                        // Execute the template with the params as the root context object
+                        TemplateImpl tagTemplate = (TemplateImpl) templateSupplier.get();
+                        tagTemplate.root
+                                .resolve(context.resolutionContext().createChild(Mapper.wrap(evaluatedParams), extendingBlocks))
+                                .whenComplete((resultNode, t2) -> {
+                                    if (t2 != null) {
+                                        result.completeExceptionally(t2);
+                                    } else {
+                                        result.complete(resultNode);
+                                    }
+                                });
+                    } catch (Throwable e) {
+                        result.completeExceptionally(e);
+                    }
+                }
+            });
+            return result;
+        }
+
     }
 
     public static class Factory implements SectionHelperFactory<IncludeSectionHelper> {
@@ -42,22 +78,43 @@ public boolean treatUnknownSectionsAsBlocks() {
 
         @Override
         public IncludeSectionHelper initialize(SectionInitContext context) {
+
             Map<String, SectionBlock> extendingBlocks = new HashMap<>();
-            for (SectionBlock block : context.getBlocks().subList(1, context.getBlocks().size())) {
-                extendingBlocks.put(block.label, block);
+            if (context.getBlocks().size() > 1) {
+                for (SectionBlock block : context.getBlocks().subList(1, context.getBlocks().size())) {
+                    extendingBlocks.put(block.label, block);
+                }
             }
-            return new IncludeSectionHelper(new Supplier<Template>() {
 
+            Map<String, Expression> params;
+            if (context.getParameters().size() == 1) {
+                params = Collections.emptyMap();
+            } else {
+                params = new HashMap<>();
+                for (Entry<String, String> entry : context.getParameters().entrySet()) {
+                    if (!entry.getKey().equals(TEMPLATE)) {
+                        params.put(entry.getKey(), context.parseValue(entry.getValue()));
+                    }
+                }
+            }
+
+            String templateParam = context.getParameter(TEMPLATE);
+            if (LiteralSupport.isStringLiteralSeparator(templateParam.charAt(0))) {
+                templateParam = templateParam.substring(1, templateParam.length() - 1);
+            }
+            final String templateId = templateParam;
+            final Engine engine = context.getEngine();
+
+            return new IncludeSectionHelper(new Supplier<Template>() {
                 @Override
                 public Template get() {
-                    String name = context.getParameter(TEMPLATE);
-                    Template template = context.getEngine().getTemplate(name);
+                    Template template = engine.getTemplate(templateId);
                     if (template == null) {
-                        throw new IllegalStateException("Template not found: " + name);
+                        throw new TemplateException("Template not found: " + templateId);
                     }
                     return template;
                 }
-            }, extendingBlocks);
+            }, extendingBlocks, params);
         }
 
     }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java
index f8eb7ef6cdee9..4409747aec3c5 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LiteralSupport.java
@@ -23,7 +23,7 @@ static Object getLiteralValue(String literal) {
             return Result.NOT_FOUND;
         }
         Object value = Result.NOT_FOUND;
-        if (Parser.isStringLiteralSeparator(literal.charAt(0))) {
+        if (isStringLiteralSeparator(literal.charAt(0))) {
             value = literal.substring(1, literal.length() - 1);
         } else if (literal.equals("true")) {
             value = Boolean.TRUE;
@@ -67,4 +67,14 @@ static Object getLiteralValue(String literal) {
         return value;
     }
 
+    /**
+     *
+     * @param character
+     * @return <code>true</code> if the char is a string literal separator,
+     *         <code>false</code> otherwise
+     */
+    static boolean isStringLiteralSeparator(char character) {
+        return character == '"' || character == '\'';
+    }
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Location.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Location.java
new file mode 100644
index 0000000000000..3af2207c869ef
--- /dev/null
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Location.java
@@ -0,0 +1,24 @@
+package io.quarkus.qute;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Qualifies an injected template. The {@link #value()} is used to locate the template; it represents the path relative from
+ * the base path.
+ */
+@Retention(RUNTIME)
+@Target({ FIELD, PARAMETER, METHOD })
+public @interface Location {
+
+    /**
+     * @return the path relative from the base path, must be a non-empty string
+     */
+    String value();
+
+}
\ No newline at end of file
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java
index ad7554cce88b7..999562da72add 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/LoopSectionHelper.java
@@ -2,16 +2,14 @@
 
 import static io.quarkus.qute.Parameter.EMPTY;
 
-import io.quarkus.qute.Results.Result;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -47,21 +45,24 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
                 results.add(nextElement(iterator.next(), idx++, iterator.hasNext(), context));
             }
             if (results.isEmpty()) {
-                return CompletableFuture.completedFuture(ResultNode.NOOP);
+                return ResultNode.NOOP;
+            }
+            if (results.size() == 1) {
+                return results.get(0);
             }
             CompletableFuture<ResultNode> result = new CompletableFuture<>();
-            CompletableFuture<ResultNode>[] all = new CompletableFuture[results.size()];
+            CompletableFuture<ResultNode>[] allResults = new CompletableFuture[results.size()];
             idx = 0;
             for (CompletionStage<ResultNode> r : results) {
-                all[idx++] = r.toCompletableFuture();
+                allResults[idx++] = r.toCompletableFuture();
             }
             CompletableFuture
-                    .allOf(all)
+                    .allOf(allResults)
                     .whenComplete((v, t) -> {
                         if (t != null) {
                             result.completeExceptionally(t);
                         } else {
-                            result.complete(new MultiResultNode(all));
+                            result.complete(new MultiResultNode(allResults));
                         }
                     });
             return result;
@@ -80,7 +81,13 @@ private Iterator<?> extractIterator(Object it) {
         } else if (it instanceof Integer) {
             return IntStream.rangeClosed(1, (Integer) it).iterator();
         } else if (it.getClass().isArray()) {
-            return Arrays.stream((Object[]) it).iterator();
+            int length = Array.getLength(it);
+            List<Object> elements = new ArrayList<>(length);
+            for (int i = 0; i < length; i++) {
+                // The val is automatically wrapped for primitive types
+                elements.add(Array.get(it, i));
+            }
+            return elements.iterator();
         } else {
             throw new TemplateException(String.format(
                     "Loop section error in template %s on line %s: [%s] resolved to [%s] which is not iterable",
@@ -90,16 +97,15 @@ private Iterator<?> extractIterator(Object it) {
     }
 
     CompletionStage<ResultNode> nextElement(Object element, int index, boolean hasNext, SectionResolutionContext context) {
-        AtomicReference<ResolutionContext> resolutionContextHolder = new AtomicReference<>();
         ResolutionContext child = context.resolutionContext().createChild(new IterationElement(alias, element, index, hasNext),
                 null);
-        resolutionContextHolder.set(child);
         return context.execute(child);
     }
 
     public static class Factory implements SectionHelperFactory<LoopSectionHelper> {
 
-        public static final String HINT = "<for-element>";
+        public static final String HINT_ELEMENT = "<loop-element>";
+        public static final String HINT_PREFIX = "<loop#";
         private static final String ALIAS = "alias";
         private static final String IN = "in";
         private static final String ITERABLE = "iterable";
@@ -130,17 +136,23 @@ public Scope initializeBlock(Scope previousScope, BlockInfo block) {
                 if (iterable == null) {
                     iterable = ValueResolvers.THIS;
                 }
+                // foo.items becomes |org.acme.Foo|.items<loop-element>
+                previousScope.setLastPartHint(HINT_ELEMENT);
                 Expression iterableExpr = block.addExpression(ITERABLE, iterable);
+                previousScope.setLastPartHint(null);
+
                 String alias = block.getParameters().get(ALIAS);
-                if (iterableExpr.getParts().get(0).getTypeInfo() != null) {
+
+                if (iterableExpr.hasTypeInfo()) {
+                    // it.name becomes it<loop#123>.name
                     alias = alias.equals(Parameter.EMPTY) ? DEFAULT_ALIAS : alias;
                     Scope newScope = new Scope(previousScope);
-                    newScope.put(alias, iterableExpr.collectTypeInfo() + HINT);
+                    newScope.putBinding(alias, alias + HINT_PREFIX + iterableExpr.getGeneratedId() + ">");
                     return newScope;
                 } else {
                     // Make sure we do not try to validate against the parent context
                     Scope newScope = new Scope(previousScope);
-                    newScope.put(alias, null);
+                    newScope.putBinding(alias, null);
                     return newScope;
                 }
             } else {
@@ -151,43 +163,47 @@ public Scope initializeBlock(Scope previousScope, BlockInfo block) {
 
     static class IterationElement implements Mapper {
 
+        static final CompletableFuture<Object> EVEN = CompletableFuture.completedFuture("even");
+        static final CompletableFuture<Object> ODD = CompletableFuture.completedFuture("odd");
+
         final String alias;
-        final Object element;
+        final CompletableFuture<Object> element;
         final int index;
         final boolean hasNext;
 
         public IterationElement(String alias, Object element, int index, boolean hasNext) {
             this.alias = alias;
-            this.element = element;
+            this.element = CompletableFuture.completedFuture(element);
             this.index = index;
             this.hasNext = hasNext;
         }
 
         @Override
-        public Object get(String key) {
+        public CompletionStage<Object> getAsync(String key) {
             if (alias.equals(key)) {
                 return element;
             }
             // Iteration metadata
             switch (key) {
                 case "count":
-                    return index + 1;
+                    return CompletableFuture.completedFuture(index + 1);
                 case "index":
-                    return index;
+                    return CompletableFuture.completedFuture(index);
                 case "indexParity":
-                    return index % 2 != 0 ? "even" : "odd";
+                    return index % 2 != 0 ? EVEN : ODD;
                 case "hasNext":
-                    return hasNext;
+                    return hasNext ? Results.TRUE : Results.FALSE;
                 case "isOdd":
                 case "odd":
-                    return index % 2 == 0;
+                    return (index % 2 == 0) ? Results.TRUE : Results.FALSE;
                 case "isEven":
                 case "even":
-                    return index % 2 != 0;
+                    return (index % 2 != 0) ? Results.TRUE : Results.FALSE;
                 default:
-                    return Result.NOT_FOUND;
+                    return Results.NOT_FOUND;
             }
         }
+
     }
 
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Mapper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Mapper.java
index 595b6109aacae..1d5a42fd28330 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Mapper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Mapper.java
@@ -1,13 +1,52 @@
 package io.quarkus.qute;
 
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
 /**
- * Maps keys to values in a similar way to {@link java.util.Map}. The difference is that it could be stateless, ie. the lookup
- * may be performed dynamically.
+ * Maps keys to values in a similar way to {@link java.util.Map}. The difference is that a mapper could be stateless, i.e. the
+ * lookup may be performed dynamically.
  * 
  * @see ValueResolvers#mapperResolver()
  */
 public interface Mapper {
 
-    Object get(String key);
+    default Object get(String key) {
+        return null;
+    }
+
+    default CompletionStage<Object> getAsync(String key) {
+        return CompletableFuture.completedFuture(get(key));
+    }
+
+    /**
+     * 
+     * @param key
+     * @return {@code true} if the mapper should be applied to the specified key
+     */
+    default boolean appliesTo(String key) {
+        return true;
+    }
+
+    /**
+     * 
+     * @param map
+     * @return a mapper that wraps the given map
+     */
+    static Mapper wrap(Map<String, ?> map) {
+        return new Mapper() {
+
+            @Override
+            public boolean appliesTo(String key) {
+                return map.containsKey(key);
+            }
+
+            @Override
+            public Object get(String key) {
+                return map.get(key);
+            }
+        };
+    }
 
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/MultiResultNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/MultiResultNode.java
index 8f6124cb0d481..03978ae487ed9 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/MultiResultNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/MultiResultNode.java
@@ -12,7 +12,7 @@ public class MultiResultNode implements ResultNode {
     private final ResultNode[] results;
 
     public MultiResultNode(CompletableFuture<ResultNode>[] futures) {
-        ResultNode[] results = new ResultNode[futures.length];
+        results = new ResultNode[futures.length];
         for (int i = 0; i < futures.length; i++) {
             try {
                 results[i] = futures[i].get();
@@ -20,7 +20,6 @@ public MultiResultNode(CompletableFuture<ResultNode>[] futures) {
                 throw new IllegalStateException(e);
             }
         }
-        this.results = results;
     }
 
     @Override
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParameterDeclarationNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParameterDeclarationNode.java
index 054c32f1ba870..7dd809b63ea9a 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParameterDeclarationNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParameterDeclarationNode.java
@@ -1,18 +1,34 @@
 package io.quarkus.qute;
 
-import java.util.function.Consumer;
+import java.util.concurrent.CompletionStage;
 
 /**
  * Template parameter declaration.
+ * <p>
+ * This node is only used when removing standalone lines.
  */
-public class ParameterDeclarationNode extends TextNode {
+public class ParameterDeclarationNode implements TemplateNode {
+
+    private final String value;
+    private final Origin origin;
 
     public ParameterDeclarationNode(String value, Origin origin) {
-        super(value, origin);
+        this.value = value;
+        this.origin = origin;
+    }
+
+    @Override
+    public CompletionStage<ResultNode> resolve(ResolutionContext context) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getValue() {
+        return value;
     }
 
     @Override
-    public void process(Consumer<String> consumer) {
+    public Origin getOrigin() {
+        return origin;
     }
 
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java
index 087669db37d15..b064438332050 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java
@@ -2,13 +2,15 @@
 
 import io.quarkus.qute.Expression.Part;
 import io.quarkus.qute.Results.Result;
-import io.quarkus.qute.SectionHelper.SectionResolutionContext;
 import io.quarkus.qute.SectionHelperFactory.ParametersInfo;
 import io.quarkus.qute.TemplateNode.Origin;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
+import java.nio.CharBuffer;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -19,7 +21,9 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.jboss.logging.Logger;
 
@@ -31,15 +35,18 @@ class Parser implements Function<String, Expression>, ParserHelper {
     private static final Logger LOGGER = Logger.getLogger(Parser.class);
     private static final String ROOT_HELPER_NAME = "$root";
 
-    static final Origin SYNTHETIC_ORIGIN = new OriginImpl(0, 0, "<<synthetic>>", "<<synthetic>>", Optional.empty());
+    static final Origin SYNTHETIC_ORIGIN = new OriginImpl(0, 0, 0, "<<synthetic>>", "<<synthetic>>", Optional.empty());
 
     private static final char START_DELIMITER = '{';
     private static final char END_DELIMITER = '}';
     private static final char COMMENT_DELIMITER = '!';
-    private static final char CDATA_START_DELIMITER = '[';
-    private static final char CDATA_END_DELIMITER = ']';
+    private static final char CDATA_START_DELIMITER = '|';
+    private static final char CDATA_START_DELIMITER_OLD = '[';
+    private static final char CDATA_END_DELIMITER = '|';
+    private static final char CDATA_END_DELIMITER_OLD = ']';
     private static final char UNDERSCORE = '_';
     private static final char ESCAPE_CHAR = '\\';
+    private static final char NAMESPACE_SEPARATOR = ':';
 
     // Linux, BDS, etc.
     private static final char LINE_SEPARATOR_LF = '\n';
@@ -51,6 +58,11 @@ class Parser implements Function<String, Expression>, ParserHelper {
     static final char END_COMPOSITE_PARAM = ')';
 
     private final EngineImpl engine;
+    private final Reader reader;
+    private final Optional<Variant> variant;
+    private final String templateId;
+    private final String generatedId;
+
     private StringBuilder buffer;
     private State state;
     private int line;
@@ -61,17 +73,21 @@ class Parser implements Function<String, Expression>, ParserHelper {
     private final Deque<Scope> scopeStack;
     private int sectionBlockIdx;
     private boolean ignoreContent;
-    private String id;
-    private String generatedId;
-    private Optional<Variant> variant;
+    private AtomicInteger expressionIdGenerator;
+    private final List<Function<String, String>> contentFilters;
 
-    public Parser(EngineImpl engine) {
+    public Parser(EngineImpl engine, Reader reader, String templateId, String generatedId, Optional<Variant> variant) {
         this.engine = engine;
+        this.templateId = templateId;
+        this.generatedId = generatedId;
+        this.variant = variant;
+        this.reader = reader;
+
         this.state = State.TEXT;
         this.buffer = new StringBuilder();
         this.sectionStack = new ArrayDeque<>();
         this.sectionStack
-                .addFirst(SectionNode.builder(ROOT_HELPER_NAME, origin())
+                .addFirst(SectionNode.builder(ROOT_HELPER_NAME, origin(0))
                         .setEngine(engine)
                         .setHelperFactory(ROOT_SECTION_HELPER_FACTORY));
         this.sectionBlockStack = new ArrayDeque<>();
@@ -83,6 +99,8 @@ public Parser(EngineImpl engine) {
         this.scopeStack.addFirst(new Scope(null));
         this.line = 1;
         this.lineCharacter = 1;
+        this.expressionIdGenerator = new AtomicInteger();
+        this.contentFilters = new ArrayList<>(5);
     }
 
     static class RootSectionHelperFactory implements SectionHelperFactory<SectionHelper> {
@@ -99,14 +117,21 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
         }
     }
 
-    Template parse(Reader reader, Optional<Variant> variant, String id, String generatedId) {
+    Template parse() {
         long start = System.currentTimeMillis();
-        this.id = id;
-        this.generatedId = generatedId;
-        this.variant = variant;
+        Reader r = reader;
+
         try {
+            if (!contentFilters.isEmpty()) {
+                String contents = toString(reader);
+                for (Function<String, String> filter : contentFilters) {
+                    contents = filter.apply(contents);
+                }
+                r = new StringReader(contents);
+            }
+
             int val;
-            while ((val = reader.read()) != -1) {
+            while ((val = r.read()) != -1) {
                 processCharacter((char) val);
                 lineCharacter++;
             }
@@ -116,8 +141,17 @@ Template parse(Reader reader, Optional<Variant> variant, String id, String gener
                     // Flush the last text segment
                     flushText();
                 } else {
+                    String reason;
+                    if (state == State.TAG_INSIDE_STRING_LITERAL) {
+                        reason = "unterminated string literal";
+                    } else if (state == State.TAG_INSIDE) {
+                        reason = "unterminated tag";
+                    } else {
+                        reason = "unexpected state [" + state + "]";
+                    }
                     throw parserError(
-                            "unexpected non-text buffer at the end of the template - probably an unterminated tag: " + buffer);
+                            "unexpected non-text buffer at the end of the template - " + reason + ": "
+                                    + buffer);
                 }
             }
 
@@ -135,8 +169,9 @@ Template parse(Reader reader, Optional<Variant> variant, String id, String gener
             root.addBlock(part.build());
             TemplateImpl template = new TemplateImpl(engine, root.build(), generatedId, variant);
 
+            Set<TemplateNode> nodesToRemove;
             if (engine.removeStandaloneLines) {
-                Set<TemplateNode> nodesToRemove = new HashSet<>();
+                nodesToRemove = new HashSet<>();
                 List<List<TemplateNode>> lines = readLines(template.root);
                 for (List<TemplateNode> line : lines) {
                     if (isStandalone(line)) {
@@ -148,8 +183,10 @@ Template parse(Reader reader, Optional<Variant> variant, String id, String gener
                         }
                     }
                 }
-                template.root.removeNodes(nodesToRemove);
+            } else {
+                nodesToRemove = Collections.emptySet();
             }
+            template.root.optimizeNodes(nodesToRemove);
 
             LOGGER.tracef("Parsing finished in %s ms", System.currentTimeMillis() - start);
             return template;
@@ -170,6 +207,9 @@ private void processCharacter(char character) {
             case TAG_INSIDE:
                 tag(character);
                 break;
+            case TAG_INSIDE_STRING_LITERAL:
+                tagStringLiteral(character);
+                break;
             case COMMENT:
                 comment(character);
                 break;
@@ -228,13 +268,18 @@ private void comment(char character) {
             // End of comment
             state = State.TEXT;
             buffer = new StringBuilder();
+            if (engine.removeStandaloneLines) {
+                // Add a dummy comment block to detect standalone lines
+                sectionBlockStack.peek().addNode(COMMENT_NODE);
+            }
         } else {
             buffer.append(character);
         }
     }
 
     private void cdata(char character) {
-        if (character == END_DELIMITER && buffer.length() > 0 && buffer.charAt(buffer.length() - 1) == CDATA_END_DELIMITER) {
+        if (character == END_DELIMITER && buffer.length() > 0
+                && isCdataEnd(buffer.charAt(buffer.length() - 1))) {
             // End of cdata
             state = State.TEXT;
             buffer.deleteCharAt(buffer.length() - 1);
@@ -244,14 +289,28 @@ private void cdata(char character) {
         }
     }
 
+    private boolean isCdataEnd(char character) {
+        return character == CDATA_END_DELIMITER || character == CDATA_END_DELIMITER_OLD;
+    }
+
     private void tag(char character) {
-        if (character == END_DELIMITER) {
+        if (LiteralSupport.isStringLiteralSeparator(character)) {
+            state = State.TAG_INSIDE_STRING_LITERAL;
+            buffer.append(character);
+        } else if (character == END_DELIMITER) {
             flushTag();
         } else {
             buffer.append(character);
         }
     }
 
+    private void tagStringLiteral(char character) {
+        if (LiteralSupport.isStringLiteralSeparator(character)) {
+            state = State.TAG_INSIDE;
+        }
+        buffer.append(character);
+    }
+
     private void tagCandidate(char character) {
         if (isValidIdentifierStart(character)) {
             // Real tag start, flush text if any
@@ -259,7 +318,7 @@ private void tagCandidate(char character) {
             if (character == COMMENT_DELIMITER) {
                 buffer.append(character);
                 state = State.COMMENT;
-            } else if (character == CDATA_START_DELIMITER) {
+            } else if (character == CDATA_START_DELIMITER || character == CDATA_START_DELIMITER_OLD) {
                 state = State.CDATA;
             } else {
                 buffer.append(character);
@@ -280,11 +339,26 @@ private void tagCandidate(char character) {
     private boolean isValidIdentifierStart(char character) {
         // A valid identifier must start with a digit, alphabet, underscore, comment delimiter, cdata start delimiter or a tag command (e.g. # for sections)
         return Tag.isCommand(character) || character == COMMENT_DELIMITER || character == CDATA_START_DELIMITER
+                || character == CDATA_START_DELIMITER_OLD
                 || character == UNDERSCORE
                 || Character.isDigit(character)
                 || Character.isAlphabetic(character);
     }
 
+    static boolean isValidIdentifier(String value) {
+        int offset = 0;
+        int length = value.length();
+        while (offset < length) {
+            int c = value.codePointAt(offset);
+            if (!Character.isWhitespace(c)) {
+                offset += Character.charCount(c);
+                continue;
+            }
+            return false;
+        }
+        return true;
+    }
+
     private boolean isLineSeparatorStart(char character) {
         return character == LINE_SEPARATOR_CR || character == LINE_SEPARATOR_LF;
     }
@@ -292,7 +366,7 @@ private boolean isLineSeparatorStart(char character) {
     private void flushText() {
         if (buffer.length() > 0 && !ignoreContent) {
             SectionBlock.Builder block = sectionBlockStack.peek();
-            block.addNode(new TextNode(buffer.toString(), origin()));
+            block.addNode(new TextNode(buffer.toString(), origin(0)));
         }
         this.buffer = new StringBuilder();
     }
@@ -300,7 +374,7 @@ private void flushText() {
     private void flushNextLine() {
         if (buffer.length() > 0 && !ignoreContent) {
             SectionBlock.Builder block = sectionBlockStack.peek();
-            block.addNode(new LineSeparatorNode(buffer.toString(), origin()));
+            block.addNode(new LineSeparatorNode(buffer.toString(), origin(0)));
         }
         this.buffer = new StringBuilder();
         line++;
@@ -341,7 +415,7 @@ private void flushTag() {
                 }
                 // Add the new block
                 SectionBlock.Builder block = SectionBlock.builder("" + sectionBlockIdx++, this, this::parserError)
-                        .setOrigin(origin());
+                        .setOrigin(origin(0));
                 sectionBlockStack.addFirst(block.setLabel(sectionName));
                 processParams(tag, sectionName, iter);
 
@@ -362,7 +436,7 @@ private void flushTag() {
                 paramsStack.addFirst(factory.getParameters());
                 SectionBlock.Builder mainBlock = SectionBlock
                         .builder(SectionHelperFactory.MAIN_BLOCK_NAME, this, this::parserError)
-                        .setOrigin(origin());
+                        .setOrigin(origin(0));
                 sectionBlockStack.addFirst(mainBlock);
                 processParams(tag, SectionHelperFactory.MAIN_BLOCK_NAME, iter);
 
@@ -370,7 +444,7 @@ private void flushTag() {
                 Scope currentScope = scopeStack.peek();
                 Scope newScope = factory.initializeBlock(currentScope, mainBlock);
                 SectionNode.Builder sectionNode = SectionNode
-                        .builder(sectionName, origin())
+                        .builder(sectionName, origin(0))
                         .setEngine(engine)
                         .setHelperFactory(factory);
 
@@ -431,23 +505,23 @@ private void flushTag() {
             int spaceIdx = content.indexOf(" ");
             String key = content.substring(spaceIdx + 1, content.length());
             String value = content.substring(1, spaceIdx);
-            currentScope.put(key, Expressions.TYPE_INFO_SEPARATOR + value + Expressions.TYPE_INFO_SEPARATOR);
-            sectionBlockStack.peek().addNode(new ParameterDeclarationNode(content, origin()));
+            currentScope.putBinding(key, Expressions.TYPE_INFO_SEPARATOR + value + Expressions.TYPE_INFO_SEPARATOR);
+            sectionBlockStack.peek().addNode(new ParameterDeclarationNode(content, origin(0)));
 
         } else {
-            sectionBlockStack.peek().addNode(new ExpressionNode(apply(content), engine, origin()));
+            sectionBlockStack.peek().addNode(new ExpressionNode(apply(content), engine, origin(content.length() + 1)));
         }
         this.buffer = new StringBuilder();
     }
 
     private TemplateException parserError(String message) {
         StringBuilder builder = new StringBuilder("Parser error");
-        if (!id.equals(generatedId)) {
-            builder.append(" in template [").append(id).append("]");
+        if (!templateId.equals(generatedId)) {
+            builder.append(" in template [").append(templateId).append("]");
         }
         builder.append(" on line ").append(line).append(": ")
                 .append(message);
-        return new TemplateException(origin(),
+        return new TemplateException(origin(0),
                 builder.toString());
     }
 
@@ -457,7 +531,11 @@ private void processParams(String tag, String label, Iterator<String> iter) {
         List<String> paramValues = new ArrayList<>();
 
         while (iter.hasNext()) {
-            paramValues.add(iter.next());
+            // Ignore whitespace strings
+            String val = iter.next().trim();
+            if (!val.isEmpty()) {
+                paramValues.add(val);
+            }
         }
         if (paramValues.size() > factoryParams.size()) {
             LOGGER.debugf("Too many params [label=%s, params=%s, factoryParams=%s]", label, paramValues, factoryParams);
@@ -520,12 +598,15 @@ private void processParams(String tag, String label, Iterator<String> iter) {
      *
      * @param part
      * @return the index of an equals char outside of any string literal,
-     *         <code>-1</code> if no such char is found
+     *         <code>-1</code> if no such char is found or if the part represents a composite param
      */
     static int getFirstDeterminingEqualsCharPosition(String part) {
+        if (!part.isEmpty() && part.charAt(0) == START_COMPOSITE_PARAM) {
+            return -1;
+        }
         boolean stringLiteral = false;
         for (int i = 0; i < part.length(); i++) {
-            if (isStringLiteralSeparator(part.charAt(i))) {
+            if (LiteralSupport.isStringLiteralSeparator(part.charAt(i))) {
                 if (i == 0) {
                     // The first char is a string literal separator
                     return -1;
@@ -564,7 +645,7 @@ static Iterator<String> splitSectionParams(String content, Function<String, Runt
                 }
             } else {
                 if (composite == 0
-                        && isStringLiteralSeparator(c)) {
+                        && LiteralSupport.isStringLiteralSeparator(c)) {
                     stringLiteral = !stringLiteral;
                 } else if (!stringLiteral
                         && isCompositeStart(c) && (i == 0 || space || composite > 0
@@ -624,6 +705,7 @@ enum State {
 
         TEXT,
         TAG_INSIDE,
+        TAG_INSIDE_STRING_LITERAL,
         TAG_CANDIDATE,
         COMMENT,
         ESCAPE,
@@ -632,18 +714,23 @@ enum State {
 
     }
 
-    static ExpressionImpl parseExpression(String value, Scope scope, Origin origin) {
+    static ExpressionImpl parseExpression(Supplier<Integer> idGenerator, String value, Scope scope, Origin origin) {
         if (value == null || value.isEmpty()) {
             return ExpressionImpl.EMPTY;
         }
         String namespace = null;
-        int namespaceIdx = value.indexOf(':');
+        int namespaceIdx = value.indexOf(NAMESPACE_SEPARATOR);
         int spaceIdx = value.indexOf(' ');
         int bracketIdx = value.indexOf('(');
 
         List<String> strParts;
-        if (namespaceIdx != -1 && (spaceIdx == -1 || namespaceIdx < spaceIdx)
-                && (bracketIdx == -1 || namespaceIdx < bracketIdx)) {
+        if (namespaceIdx != -1
+                // No space or colon before the space
+                && (spaceIdx == -1 || namespaceIdx < spaceIdx)
+                // No bracket or colon before the bracket
+                && (bracketIdx == -1 || namespaceIdx < bracketIdx)
+                // No string literal
+                && !LiteralSupport.isStringLiteralSeparator(value.charAt(0))) {
             // Expression that starts with a namespace
             strParts = Expressions.splitParts(value.substring(namespaceIdx + 1, value.length()));
             namespace = value.substring(0, namespaceIdx);
@@ -653,55 +740,82 @@ static ExpressionImpl parseExpression(String value, Scope scope, Origin origin)
                 String literal = strParts.get(0);
                 Object literalValue = LiteralSupport.getLiteralValue(literal);
                 if (!Result.NOT_FOUND.equals(literalValue)) {
-                    return ExpressionImpl.literal(literal, literalValue, origin);
+                    return ExpressionImpl.literal(idGenerator.get(), literal, literalValue, origin);
                 }
             }
         }
         List<Part> parts = new ArrayList<>(strParts.size());
         Part first = null;
-        for (String strPart : strParts) {
-            Part part = createPart(namespace, first, strPart, scope, origin);
+        Iterator<String> strPartsIterator = strParts.iterator();
+        while (strPartsIterator.hasNext()) {
+            Part part = createPart(idGenerator, namespace, first, strPartsIterator, scope, origin);
+            if (!isValidIdentifier(part.getName())) {
+                StringBuilder builder = new StringBuilder("Invalid identifier found [");
+                builder.append(value).append("]");
+                if (!origin.getTemplateId().equals(origin.getTemplateGeneratedId())) {
+                    builder.append(" in template [").append(origin.getTemplateId()).append("]");
+                }
+                builder.append(" on line ").append(origin.getLine());
+                throw new TemplateException(builder.toString());
+            }
             if (first == null) {
                 first = part;
             }
             parts.add(part);
         }
-        return new ExpressionImpl(namespace, parts, Result.NOT_FOUND, origin);
+        return new ExpressionImpl(idGenerator.get(), namespace, parts, Result.NOT_FOUND, origin);
     }
 
-    private static Part createPart(String namespace, Part first, String value, Scope scope, Origin origin) {
+    private static Part createPart(Supplier<Integer> idGenerator, String namespace, Part first,
+            Iterator<String> strPartsIterator, Scope scope,
+            Origin origin) {
+        String value = strPartsIterator.next();
         if (Expressions.isVirtualMethod(value)) {
             String name = Expressions.parseVirtualMethodName(value);
             List<String> strParams = new ArrayList<>(Expressions.parseVirtualMethodParams(value));
             List<Expression> params = new ArrayList<>(strParams.size());
             for (String strParam : strParams) {
-                params.add(parseExpression(strParam.trim(), scope, origin));
+                params.add(parseExpression(idGenerator, strParam.trim(), scope, origin));
+            }
+            // Note that an expression may never start with a virtual method
+            String lastPartHint = strPartsIterator.hasNext() ? null : scope.getLastPartHint();
+            return new ExpressionImpl.VirtualMethodPartImpl(name, params, lastPartHint);
+        }
+        // Try to parse the literal for bracket notation
+        if (Expressions.isBracketNotation(value)) {
+            value = Expressions.parseBracketContent(value);
+            Object literal = LiteralSupport.getLiteralValue(value);
+            if (literal != null && !Result.NOT_FOUND.equals(literal)) {
+                value = literal.toString();
+            } else {
+                StringBuilder builder = new StringBuilder(literal == null ? "Null" : "Non-literal");
+                builder.append(" value used in bracket notation [").append(value).append("]");
+                if (!origin.getTemplateId().equals(origin.getTemplateGeneratedId())) {
+                    builder.append(" in template [").append(origin.getTemplateId()).append("]");
+                }
+                builder.append(" on line ").append(origin.getLine());
+                throw new TemplateException(builder.toString());
             }
-            return new ExpressionImpl.VirtualMethodExpressionPartImpl(name, params);
         }
+
         String typeInfo = null;
         if (namespace != null) {
-            typeInfo = value;
+            // If a namespace is used and it's the first part then prepend the value with the namespace
+            // For example foo -> inject:foo
+            typeInfo = first != null ? value : namespace + NAMESPACE_SEPARATOR + value;
         } else if (first == null) {
-            typeInfo = scope.getBindingType(value);
+            // No namespace used and it's the first part
+            // Try to find the binding type for the first part of the expression
+            typeInfo = scope.getBinding(value);
         } else if (first.getTypeInfo() != null) {
+            // No namespace and not the first part
             typeInfo = value;
         }
-        return new ExpressionImpl.ExpressionPartImpl(value, typeInfo);
-    }
-
-    static boolean isSeparator(char candidate) {
-        return candidate == '.' || candidate == '[' || candidate == ']';
-    }
-
-    /**
-     *
-     * @param character
-     * @return <code>true</code> if the char is a string literal separator,
-     *         <code>false</code> otherwise
-     */
-    static boolean isStringLiteralSeparator(char character) {
-        return character == '"' || character == '\'';
+        if (typeInfo != null && !strPartsIterator.hasNext() && scope.getLastPartHint() != null) {
+            // If the type info present then append hint to the last part
+            typeInfo += scope.getLastPartHint();
+        }
+        return new ExpressionImpl.PartImpl(value, typeInfo);
     }
 
     static boolean isLeftBracket(char character) {
@@ -714,11 +828,11 @@ static boolean isRightBracket(char character) {
 
     @Override
     public ExpressionImpl apply(String value) {
-        return parseExpression(value, scopeStack.peek(), origin());
+        return parseExpression(expressionIdGenerator::incrementAndGet, value, scopeStack.peek(), origin(value.length() + 1));
     }
 
-    Origin origin() {
-        return new OriginImpl(line, lineCharacter, id, generatedId, variant);
+    Origin origin(int lineCharacterOffset) {
+        return new OriginImpl(line, lineCharacter - lineCharacterOffset, lineCharacter, templateId, generatedId, variant);
     }
 
     private List<List<TemplateNode>> readLines(SectionNode rootNode) {
@@ -766,7 +880,8 @@ private boolean isStandalone(List<TemplateNode> line) {
             if (node instanceof ExpressionNode) {
                 // Line contains an expression
                 return false;
-            } else if (node instanceof SectionNode || node instanceof ParameterDeclarationNode || node instanceof BlockNode) {
+            } else if (node instanceof SectionNode || node instanceof ParameterDeclarationNode || node == BLOCK_NODE
+                    || node == COMMENT_NODE) {
                 maybeStandalone = true;
             } else if (node instanceof TextNode) {
                 if (!isBlank(((TextNode) node).getValue())) {
@@ -794,17 +909,32 @@ private boolean isBlank(CharSequence val) {
         return true;
     }
 
+    private static String toString(Reader in)
+            throws IOException {
+        StringBuilder out = new StringBuilder();
+        CharBuffer buffer = CharBuffer.allocate(8192);
+        while (in.read(buffer) != -1) {
+            buffer.flip();
+            out.append(buffer);
+            buffer.clear();
+        }
+        return out.toString();
+    }
+
     static class OriginImpl implements Origin {
 
         private final int line;
-        private final int lineCharacter;
+        private final int lineCharacterStart;
+        private final int lineCharacterEnd;
         private final String templateId;
         private final String templateGeneratedId;
         private final Optional<Variant> variant;
 
-        OriginImpl(int line, int lineCharacter, String templateId, String templateGeneratedId, Optional<Variant> variant) {
+        OriginImpl(int line, int lineCharacterStart, int lineCharacterEnd, String templateId, String templateGeneratedId,
+                Optional<Variant> variant) {
             this.line = line;
-            this.lineCharacter = lineCharacter;
+            this.lineCharacterStart = lineCharacterStart;
+            this.lineCharacterEnd = lineCharacterEnd;
             this.templateId = templateId;
             this.templateGeneratedId = templateGeneratedId;
             this.variant = variant;
@@ -816,8 +946,13 @@ public int getLine() {
         }
 
         @Override
-        public int getLineCharacter() {
-            return lineCharacter;
+        public int getLineCharacterStart() {
+            return lineCharacterStart;
+        }
+
+        @Override
+        public int getLineCharacterEnd() {
+            return lineCharacterEnd;
         }
 
         @Override
@@ -865,21 +1000,38 @@ public String toString() {
 
     }
 
+    @Override
+    public String getTemplateId() {
+        return templateId;
+    }
+
     @Override
     public void addParameter(String name, String type) {
         // {@org.acme.Foo foo}
         Scope currentScope = scopeStack.peek();
-        currentScope.put(name, Expressions.TYPE_INFO_SEPARATOR + type + Expressions.TYPE_INFO_SEPARATOR);
+        currentScope.putBinding(name, Expressions.TYPE_INFO_SEPARATOR + type + Expressions.TYPE_INFO_SEPARATOR);
     }
 
+    @Override
+    public void addContentFilter(Function<String, String> filter) {
+        contentFilters.add(filter);
+    }
+
+    private static final SectionHelper ROOT_SECTION_HELPER = new SectionHelper() {
+        @Override
+        public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
+            return context.execute();
+        }
+    };
     private static final SectionHelperFactory<SectionHelper> ROOT_SECTION_HELPER_FACTORY = new SectionHelperFactory<SectionHelper>() {
         @Override
         public SectionHelper initialize(SectionInitContext context) {
-            return SectionResolutionContext::execute;
+            return ROOT_SECTION_HELPER;
         }
     };
 
     private static final BlockNode BLOCK_NODE = new BlockNode();
+    static final CommentNode COMMENT_NODE = new CommentNode();
 
     // A dummy node for section blocks, it's only used when removing standalone lines
     private static class BlockNode implements TemplateNode {
@@ -896,4 +1048,19 @@ public Origin getOrigin() {
 
     }
 
+    // A dummy node for comments, it's only used when removing standalone lines
+    static class CommentNode implements TemplateNode {
+
+        @Override
+        public CompletionStage<ResultNode> resolve(ResolutionContext context) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Origin getOrigin() {
+            throw new UnsupportedOperationException();
+        }
+
+    }
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHelper.java
index f8b0fc4bf8dad..79d68ff67f34e 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHelper.java
@@ -1,5 +1,28 @@
 package io.quarkus.qute;
 
+import java.util.function.Function;
+
 public interface ParserHelper {
-    public void addParameter(String name, String type);
+
+    /**
+     * 
+     * @return the template id
+     */
+    String getTemplateId();
+
+    /**
+     * Adds an <em>implicit</em> parameter declaration. This an alternative approach to <em>explicit</em> parameter declarations
+     * used directly in the templates, e.g. <code>{@org.acme.Foo foo}</code>.
+     * 
+     * @param name
+     * @param type
+     */
+    void addParameter(String name, String type);
+
+    /**
+     * The filter is used before the template contents is parsed.
+     * 
+     * @param filter
+     */
+    void addContentFilter(Function<String, String> filter);
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHook.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHook.java
index 1cc53ca0e6325..2191a56357b73 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHook.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ParserHook.java
@@ -2,6 +2,10 @@
 
 public interface ParserHook {
 
-    void beforeParsing(ParserHelper parser, String id);
+    /**
+     * 
+     * @param parserHelper
+     */
+    void beforeParsing(ParserHelper parserHelper);
 
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ReflectionValueResolver.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ReflectionValueResolver.java
index b025a09ba4b3b..b73328237337e 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ReflectionValueResolver.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ReflectionValueResolver.java
@@ -4,6 +4,9 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -22,6 +25,7 @@ public class ReflectionValueResolver implements ValueResolver {
 
     public static final String GET_PREFIX = "get";
     public static final String IS_PREFIX = "is";
+    public static final String HAS_PREFIX = "has";
 
     @Override
     public int getPriority() {
@@ -92,39 +96,48 @@ private static Optional<MemberWrapper> findWrapper(MemberKey key) {
     }
 
     private static Method findMethod(Class<?> clazz, String name) {
-
         Objects.requireNonNull(clazz);
         Objects.requireNonNull(name);
 
         Method foundMatch = null;
-        Method foundGetMatch = null;
-        Method foundIsMatch = null;
-
-        for (Method method : clazz.getMethods()) {
-
-            if (!isMethodValid(method)) {
-                continue;
+        Method foundGetterMatch = null;
+        Method foundBooleanMatch = null;
+
+        // Explore interface methods first...
+        List<Class<?>> classes = new ArrayList<>();
+        Collections.addAll(classes, clazz.getInterfaces());
+        Class<?> superClass = clazz.getSuperclass();
+        while (superClass != null) {
+            Collections.addAll(classes, superClass.getInterfaces());
+            superClass = superClass.getSuperclass();
+        }
+        classes.add(clazz);
+
+        for (Class<?> clazzToTest : classes) {
+            for (Method method : clazzToTest.getMethods()) {
+                if (!isMethodValid(method)) {
+                    continue;
+                }
+                if (method.isBridge()) {
+                    continue;
+                }
+                if (name.equals(method.getName())) {
+                    foundMatch = method;
+                } else if (matchesPrefix(name, method.getName(),
+                        GET_PREFIX)) {
+                    foundGetterMatch = method;
+                } else if (isBoolean(method.getReturnType()) && (matchesPrefix(name, method.getName(),
+                        IS_PREFIX) || matchesPrefix(name, method.getName(), HAS_PREFIX))) {
+                    foundBooleanMatch = method;
+                }
             }
-
-            if (method.isBridge()) {
-                continue;
+            if (foundMatch == null) {
+                foundMatch = (foundGetterMatch != null ? foundGetterMatch : foundBooleanMatch);
             }
-
-            if (name.equals(method.getName())) {
-                foundMatch = method;
-            } else if (matchesPrefix(name, method.getName(),
-                    GET_PREFIX)) {
-                foundGetMatch = method;
-            } else if (matchesPrefix(name, method.getName(),
-                    IS_PREFIX)) {
-                foundIsMatch = method;
+            if (foundMatch != null) {
+                break;
             }
         }
-
-        if (foundMatch == null) {
-            foundMatch = (foundGetMatch != null ? foundGetMatch : foundIsMatch);
-        }
-
         return foundMatch;
     }
 
@@ -163,6 +176,10 @@ private static boolean matchesPrefix(String name, String methodName,
                 && decapitalize(methodName.substring(prefix.length(), methodName.length())).equals(name);
     }
 
+    private static boolean isBoolean(Class<?> type) {
+        return type.equals(Boolean.class) || type.equals(boolean.class);
+    }
+
     static String decapitalize(String name) {
         if (name == null || name.length() == 0) {
             return name;
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContext.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContext.java
index 46069289468fb..f5247926e6fde 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContext.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContext.java
@@ -26,21 +26,13 @@ public interface ResolutionContext {
     CompletionStage<Object> evaluate(Expression expression);
 
     /**
-     * Create a child resolution context with the specified data and namespace resolvers.
+     * Create a child resolution context.
      * 
      * @param data
-     * @param namespaceResolversFactories
-     * @return a new child resolution context
-     */
-    ResolutionContext createChild(Object data, List<NamespaceResolver> namespaceResolvers);
-
-    /**
-     * Create a child resolution context with the specifiec extending blocks.
-     * 
      * @param extendingBlocks
      * @return a new child resolution context
      */
-    ResolutionContext createChild(Map<String, SectionBlock> extendingBlocks);
+    ResolutionContext createChild(Object data, Map<String, SectionBlock> extendingBlocks);
 
     /**
      * 
@@ -75,4 +67,10 @@ public interface ResolutionContext {
      */
     Object getAttribute(String key);
 
+    /**
+     * 
+     * @return the evaluator
+     */
+    Evaluator getEvaluator();
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContextImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContextImpl.java
index 6fda451418ba6..6543cfee24138 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContextImpl.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResolutionContextImpl.java
@@ -6,16 +6,14 @@
 
 class ResolutionContextImpl implements ResolutionContext {
 
-    private final ResolutionContextImpl parent;
     private final Object data;
     private final List<NamespaceResolver> namespaceResolvers;
     private final Evaluator evaluator;
     private final Map<String, SectionBlock> extendingBlocks;
     private final TemplateInstance templateInstance;
 
-    ResolutionContextImpl(ResolutionContextImpl parent, Object data, List<NamespaceResolver> namespaceResolvers,
+    ResolutionContextImpl(Object data, List<NamespaceResolver> namespaceResolvers,
             Evaluator evaluator, Map<String, SectionBlock> extendingBlocks, TemplateInstance templateInstance) {
-        this.parent = parent;
         this.data = data;
         this.namespaceResolvers = namespaceResolvers;
         this.evaluator = evaluator;
@@ -34,13 +32,8 @@ public CompletionStage<Object> evaluate(Expression expression) {
     }
 
     @Override
-    public ResolutionContext createChild(Object data, List<NamespaceResolver> namespaceResolvers) {
-        return new ResolutionContextImpl(this, data, namespaceResolvers, evaluator, null, templateInstance);
-    }
-
-    @Override
-    public ResolutionContext createChild(Map<String, SectionBlock> extendingBlocks) {
-        return new ResolutionContextImpl(this, data, namespaceResolvers, evaluator, extendingBlocks, templateInstance);
+    public ResolutionContext createChild(Object data, Map<String, SectionBlock> extendingBlocks) {
+        return new ChildResolutionContext(this, data, extendingBlocks);
     }
 
     @Override
@@ -55,19 +48,13 @@ public List<NamespaceResolver> getNamespaceResolvers() {
 
     @Override
     public ResolutionContextImpl getParent() {
-        return parent;
+        return null;
     }
 
     @Override
     public SectionBlock getExtendingBlock(String name) {
         if (extendingBlocks != null) {
-            SectionBlock block = extendingBlocks.get(name);
-            if (block != null) {
-                return block;
-            }
-            if (parent != null) {
-                return parent.getExtendingBlock(name);
-            }
+            return extendingBlocks.get(name);
         }
         return null;
     }
@@ -77,4 +64,78 @@ public Object getAttribute(String key) {
         return templateInstance.getAttribute(key);
     }
 
+    @Override
+    public Evaluator getEvaluator() {
+        return evaluator;
+    }
+
+    static class ChildResolutionContext implements ResolutionContext {
+
+        private final ResolutionContext parent;
+        private final Object data;
+        private final Map<String, SectionBlock> extendingBlocks;
+
+        public ChildResolutionContext(ResolutionContext parent, Object data, Map<String, SectionBlock> extendingBlocks) {
+            this.parent = parent;
+            this.data = data;
+            this.extendingBlocks = extendingBlocks;
+        }
+
+        @Override
+        public CompletionStage<Object> evaluate(String expression) {
+            return evaluate(ExpressionImpl.from(expression));
+        }
+
+        @Override
+        public CompletionStage<Object> evaluate(Expression expression) {
+            // Make sure we use the correct resolution context
+            return getEvaluator().evaluate(expression, this);
+        }
+
+        @Override
+        public ResolutionContext createChild(Object data, Map<String, SectionBlock> extendingBlocks) {
+            return new ChildResolutionContext(this, data, extendingBlocks);
+        }
+
+        @Override
+        public Object getData() {
+            return data;
+        }
+
+        @Override
+        public List<NamespaceResolver> getNamespaceResolvers() {
+            return parent.getNamespaceResolvers();
+        }
+
+        @Override
+        public ResolutionContext getParent() {
+            return parent;
+        }
+
+        @Override
+        public SectionBlock getExtendingBlock(String name) {
+            if (extendingBlocks != null) {
+                SectionBlock block = extendingBlocks.get(name);
+                if (block != null) {
+                    return block;
+                }
+                if (parent != null) {
+                    return parent.getExtendingBlock(name);
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public Object getAttribute(String key) {
+            return parent.getAttribute(key);
+        }
+
+        @Override
+        public Evaluator getEvaluator() {
+            return parent.getEvaluator();
+        }
+
+    }
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResultNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResultNode.java
index 118aeb6fc791b..671cac7694684 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResultNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ResultNode.java
@@ -1,5 +1,6 @@
 package io.quarkus.qute;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 /**
@@ -7,12 +8,11 @@
  */
 public interface ResultNode {
 
-    static ResultNode NOOP = new ResultNode() {
-
+    static CompletableFuture<ResultNode> NOOP = CompletableFuture.completedFuture(new ResultNode() {
         @Override
         public void process(Consumer<String> resultConsumer) {
         }
-    };
+    });
 
     /**
      * 
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Results.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Results.java
index 7eea6bc5d175d..f6feae2b8a7d3 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Results.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Results.java
@@ -9,6 +9,8 @@
 public final class Results {
 
     public static final CompletionStage<Object> NOT_FOUND = CompletableFuture.completedFuture(Result.NOT_FOUND);
+    public static final CompletableFuture<Object> FALSE = CompletableFuture.completedFuture(false);
+    public static final CompletableFuture<Object> TRUE = CompletableFuture.completedFuture(true);
 
     private Results() {
     }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Scope.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Scope.java
index e8cc826b16f3a..9f11ccc2b9181 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Scope.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Scope.java
@@ -7,35 +7,57 @@ public class Scope {
 
     public static final Scope EMPTY = new Scope(null) {
         @Override
-        public void put(String binding, String type) {
+        public void putBinding(String binding, String type) {
             throw new UnsupportedOperationException("Immutable empty scope");
         }
     };
 
-    private Scope parentScope;
+    private final Scope parentScope;
     private Map<String, String> bindings;
+    private Map<String, Object> attributes;
+    // TODO: add proper API to handle this
+    private String lastPartHint;
 
     public Scope(Scope parentScope) {
         this.parentScope = parentScope;
     }
 
-    public void put(String binding, String type) {
+    public void putBinding(String binding, String type) {
         if (bindings == null)
             bindings = new HashMap<>();
         bindings.put(binding, type);
     }
 
-    public String getBindingType(String binding) {
+    public String getBinding(String binding) {
         // we can contain null types to override outer scopes
         if (bindings != null
                 && bindings.containsKey(binding))
             return bindings.get(binding);
-        return parentScope != null ? parentScope.getBindingType(binding) : null;
+        return parentScope != null ? parentScope.getBinding(binding) : null;
     }
 
     public String getBindingTypeOrDefault(String binding, String defaultValue) {
-        String type = getBindingType(binding);
+        String type = getBinding(binding);
         return type != null ? type : defaultValue;
     }
 
+    public void putAttribute(String name, Object value) {
+        if (attributes == null) {
+            attributes = new HashMap<>();
+        }
+        attributes.put(name, value);
+    }
+
+    public Object getAttribute(String name) {
+        return attributes != null ? attributes.get(name) : null;
+    }
+
+    public String getLastPartHint() {
+        return lastPartHint;
+    }
+
+    public void setLastPartHint(String lastPartHint) {
+        this.lastPartHint = lastPartHint;
+    }
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java
index 7d6ea6ac10558..7bd99bb5afb4b 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionBlock.java
@@ -4,7 +4,6 @@
 import io.quarkus.qute.TemplateNode.Origin;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,7 +27,7 @@ public final class SectionBlock {
      */
     public final String label;
     /**
-     * Map of parsed parameters.
+     * An ordered map of parsed parameters.
      */
     public final Map<String, String> parameters;
 
@@ -39,7 +38,7 @@ public final class SectionBlock {
      */
     List<TemplateNode> nodes;
 
-    SectionBlock(Origin origin, String id, String label, Map<String, String> parameters,
+    public SectionBlock(Origin origin, String id, String label, Map<String, String> parameters,
             Map<String, Expression> expressions,
             List<TemplateNode> nodes) {
         this.origin = origin;
@@ -54,8 +53,8 @@ public boolean isEmpty() {
         return nodes.isEmpty();
     }
 
-    Set<Expression> getExpressions() {
-        Set<Expression> expressions = new HashSet<>();
+    List<Expression> getExpressions() {
+        List<Expression> expressions = new ArrayList<>();
         expressions.addAll(this.expressions.values());
         for (TemplateNode node : nodes) {
             expressions.addAll(node.getExpressions());
@@ -71,17 +70,52 @@ public String toString() {
         return builder.toString();
     }
 
-    void removeNodes(Set<TemplateNode> nodesToRemove) {
-        ImmutableList.Builder<TemplateNode> builder = ImmutableList.builder();
+    void optimizeNodes(Set<TemplateNode> nodesToRemove) {
+        List<TemplateNode> effectiveNodes = new ArrayList<>();
         for (TemplateNode node : nodes) {
             if (node instanceof SectionNode) {
-                builder.add(node);
-                ((SectionNode) node).removeNodes(nodesToRemove);
-            } else if (!nodesToRemove.contains(node)) {
-                builder.add(node);
+                effectiveNodes.add(node);
+                ((SectionNode) node).optimizeNodes(nodesToRemove);
+            } else if (node != Parser.COMMENT_NODE && !(node instanceof ParameterDeclarationNode)
+                    && (nodesToRemove.isEmpty() || !nodesToRemove.contains(node))) {
+                // Ignore comments, param declarations and nodes for removal
+                effectiveNodes.add(node);
             }
         }
-        nodes = builder.build();
+        // Collapse adjacent text and line separator nodes
+        List<TemplateNode> finalNodes = new ArrayList<>();
+        List<TextNode> group = null;
+        for (TemplateNode node : effectiveNodes) {
+            if (node instanceof TextNode) {
+                if (group == null) {
+                    group = new ArrayList<>();
+                }
+                group.add((TextNode) node);
+            } else {
+                if (group != null) {
+                    collapseGroup(group, finalNodes);
+                    group = null;
+                }
+                finalNodes.add(node);
+            }
+        }
+        if (group != null) {
+            collapseGroup(group, finalNodes);
+        }
+        nodes = ImmutableList.copyOf(finalNodes);
+    }
+
+    private void collapseGroup(List<TextNode> group, List<TemplateNode> finalNodes) {
+        if (group.size() > 1) {
+            // Collapse the group...
+            StringBuilder val = new StringBuilder();
+            for (TextNode textNode : group) {
+                val.append(textNode.getValue());
+            }
+            finalNodes.add(new TextNode(val.toString(), group.get(0).getOrigin()));
+        } else {
+            finalNodes.add(group.get(0));
+        }
     }
 
     static SectionBlock.Builder builder(String id, Function<String, Expression> expressionFunc,
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelper.java
index 2f74ccefcb704..9d2002688ca09 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelper.java
@@ -22,6 +22,10 @@ public interface SectionHelper {
      */
     public interface SectionResolutionContext {
 
+        /**
+         * 
+         * @return the current resolution context
+         */
         ResolutionContext resolutionContext();
 
         /**
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java
index 0d83cd3f77f5b..3862f02e0f573 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionHelperFactory.java
@@ -89,6 +89,14 @@ default boolean hasParameter(String name) {
             return getParameters().containsKey(name);
         }
 
+        /**
+         * Parse and register an expression for the specified parameter.
+         * 
+         * @param param
+         * @param value
+         * @return a new expression
+         * @see SectionInitContext#getExpression(String)
+         */
         Expression addExpression(String param, String value);
 
     }
@@ -98,6 +106,10 @@ default boolean hasParameter(String name) {
      */
     public interface SectionInitContext extends ParserDelegate {
 
+        /**
+         * 
+         * @return the parameters of the main block
+         */
         default public Map<String, String> getParameters() {
             return getBlocks().get(0).parameters;
         }
@@ -110,8 +122,20 @@ default public String getParameter(String name) {
             return getParameters().get(name);
         }
 
+        /**
+         * 
+         * @param parameterName
+         * @return an expression registered for the specified param name, or {@code null}
+         * @see BlockInfo#addExpression(String, String)
+         */
         public Expression getExpression(String parameterName);
 
+        /**
+         * Parse the specified value. The expression is not registered in the template.
+         * 
+         * @param value
+         * @return a new expression
+         */
         public Expression parseValue(String value);
 
         public List<SectionBlock> getBlocks();
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java
index e537ab6745767..ce302862dfd4e 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SectionNode.java
@@ -2,7 +2,7 @@
 
 import io.quarkus.qute.SectionHelper.SectionResolutionContext;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -38,9 +38,9 @@ public Origin getOrigin() {
         return origin;
     }
 
-    void removeNodes(Set<TemplateNode> nodes) {
+    void optimizeNodes(Set<TemplateNode> nodes) {
         for (SectionBlock block : blocks) {
-            block.removeNodes(nodes);
+            block.optimizeNodes(nodes);
         }
     }
 
@@ -52,8 +52,8 @@ public String toString() {
         return builder.toString();
     }
 
-    public Set<Expression> getExpressions() {
-        Set<Expression> expressions = new HashSet<>();
+    public List<Expression> getExpressions() {
+        List<Expression> expressions = new ArrayList<>();
         for (SectionBlock block : blocks) {
             expressions.addAll(block.getExpressions());
         }
@@ -121,25 +121,41 @@ public CompletionStage<ResultNode> execute(SectionBlock block, ResolutionContext
                 // Use the main block
                 block = blocks.get(0);
             }
-            if (block.nodes.size() == 1) {
+            int size = block.nodes.size();
+            if (size == 1) {
                 return block.nodes.get(0).resolve(context);
             }
             CompletableFuture<ResultNode> result = new CompletableFuture<ResultNode>();
             @SuppressWarnings("unchecked")
-            CompletableFuture<ResultNode>[] results = new CompletableFuture[block.nodes.size()];
+            CompletableFuture<ResultNode>[] allResults = new CompletableFuture[size];
+            List<CompletableFuture<ResultNode>> asyncResults = new LinkedList<>();
             int idx = 0;
             for (TemplateNode node : block.nodes) {
-                results[idx++] = node.resolve(context).toCompletableFuture();
+                CompletableFuture<ResultNode> nodeResult = node.resolve(context).toCompletableFuture();
+                allResults[idx++] = nodeResult;
+                if (node.isConstant()) {
+                    continue;
+                }
+                asyncResults.add(nodeResult);
+            }
+            if (asyncResults.isEmpty()) {
+                result.complete(new MultiResultNode(allResults));
+            } else {
+                CompletionStage<?> cs;
+                if (asyncResults.size() == 1) {
+                    cs = asyncResults.get(0);
+                } else {
+                    cs = CompletableFuture
+                            .allOf(asyncResults.toArray(new CompletableFuture[0]));
+                }
+                cs.whenComplete((v, t) -> {
+                    if (t != null) {
+                        result.completeExceptionally(t);
+                    } else {
+                        result.complete(new MultiResultNode(allResults));
+                    }
+                });
             }
-            CompletableFuture
-                    .allOf(results)
-                    .whenComplete((v, t) -> {
-                        if (t != null) {
-                            result.completeExceptionally(t);
-                        } else {
-                            result.complete(new MultiResultNode(results));
-                        }
-                    });
             return result;
         }
 
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SetSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SetSectionHelper.java
index c26802e6065c3..a35663a29d979 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SetSectionHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SetSectionHelper.java
@@ -31,7 +31,7 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
                 result.completeExceptionally(t);
             } else {
                 // Execute the main block with the params as the current context object
-                context.execute(context.resolutionContext().createChild(r, null)).whenComplete((r2, t2) -> {
+                context.execute(context.resolutionContext().createChild(Mapper.wrap(r), null)).whenComplete((r2, t2) -> {
                     if (t2 != null) {
                         result.completeExceptionally(t2);
                     } else {
@@ -45,6 +45,8 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
 
     public static class Factory implements SectionHelperFactory<SetSectionHelper> {
 
+        public static final String HINT_PREFIX = "<set#";
+
         @Override
         public List<String> getDefaultAliases() {
             return ImmutableList.of(SET, LET);
@@ -68,7 +70,12 @@ public Scope initializeBlock(Scope previousScope, BlockInfo block) {
                 Scope newScope = new Scope(previousScope);
                 for (Entry<String, String> entry : block.getParameters().entrySet()) {
                     Expression expr = block.addExpression(entry.getKey(), entry.getValue());
-                    newScope.put(entry.getKey(), expr.collectTypeInfo());
+                    if (expr.hasTypeInfo()) {
+                        // item.name becomes item<set#1>.name
+                        newScope.putBinding(entry.getKey(), entry.getKey() + HINT_PREFIX + expr.getGeneratedId() + ">");
+                    } else {
+                        newScope.putBinding(entry.getKey(), null);
+                    }
                 }
                 return newScope;
             } else {
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SingleResultNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SingleResultNode.java
index a5dbfe95d9fa3..f8b2a824da2a8 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/SingleResultNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/SingleResultNode.java
@@ -1,6 +1,5 @@
 package io.quarkus.qute;
 
-import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -9,24 +8,21 @@
 public class SingleResultNode implements ResultNode {
 
     private final Object value;
-    private final ExpressionImpl expression;
-    private final List<ResultMapper> mappers;
+    private final ExpressionNode expressionNode;
 
     public SingleResultNode(Object value, ExpressionNode expressionNode) {
         this.value = value;
-        this.mappers = expressionNode.getEngine().getResultMappers().isEmpty() ? null
-                : expressionNode.getEngine().getResultMappers();
-        this.expression = this.mappers != null ? expressionNode.expression : null;
+        this.expressionNode = expressionNode.getEngine().getResultMappers().isEmpty() ? null : expressionNode;
     }
 
     @Override
     public void process(Consumer<String> consumer) {
         if (value != null) {
             String result = null;
-            if (mappers != null) {
-                for (ResultMapper mapper : mappers) {
-                    if (mapper.appliesTo(expression.getOrigin(), value)) {
-                        result = mapper.map(value, expression);
+            if (expressionNode != null) {
+                for (ResultMapper mapper : expressionNode.getEngine().getResultMappers()) {
+                    if (mapper.appliesTo(expressionNode.expression.getOrigin(), value)) {
+                        result = mapper.map(value, expressionNode.expression);
                         break;
                     }
                 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Template.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Template.java
index 84adbb57157c2..710a74dcd5018 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Template.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Template.java
@@ -1,7 +1,7 @@
 package io.quarkus.qute;
 
+import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 
 /**
  * Represents an immutable template definition.
@@ -10,15 +10,13 @@
  * <ol>
  * <li>Create a new template instance via {@link #instance()} or any convenient method</li>
  * <li>Set the model data</li>
- * <li>Trigger rendering with {@link TemplateInstance#render()}, {@link TemplateInstance#renderAsync()},
- * {@link TemplateInstance#consume(java.util.function.Consumer)} or subscribe to a publisher returned from
- * {@link TemplateInstance#publisher()}</li>
+ * <li>Trigger rendering with {@link TemplateInstance#render()} or any other convenient methods</li>
  * </ol>
  */
 public interface Template {
 
     /**
-     * Template instance represents a rendering configuration.
+     * Create a new template instance to configure the model data.
      * 
      * @return a new template instance
      */
@@ -44,6 +42,69 @@ default TemplateInstance data(String key, Object data) {
         return instance().data(key, data);
     }
 
+    /**
+     * 
+     * @param key1
+     * @param data1
+     * @param key2
+     * @param data2
+     * @return a new template instance
+     */
+    default TemplateInstance data(String key1, Object data1, String key2, Object data2) {
+        return instance().data(key1, data1).data(key2, data2);
+    }
+
+    /**
+     * 
+     * @param key1
+     * @param data1
+     * @param key2
+     * @param data2
+     * @param key3
+     * @param data3
+     * @return a new template instance
+     */
+    default TemplateInstance data(String key1, Object data1, String key2, Object data2, String key3, Object data3) {
+        return instance().data(key1, data1).data(key2, data2).data(key3, data3);
+    }
+
+    /**
+     * 
+     * @param key1
+     * @param data1
+     * @param key2
+     * @param data2
+     * @param key3
+     * @param data3
+     * @param key4
+     * @param data4
+     * @return a new template instance
+     */
+    default TemplateInstance data(String key1, Object data1, String key2, Object data2, String key3, Object data3, String key4,
+            Object data4) {
+        return instance().data(key1, data1).data(key2, data2).data(key3, data3).data(key4, data4);
+    }
+
+    /**
+     * 
+     * @param key1
+     * @param data1
+     * @param key2
+     * @param data2
+     * @param key3
+     * @param data3
+     * @param key4
+     * @param data4
+     * @param key5
+     * @param data5
+     * @return a new template instance
+     * 
+     */
+    default TemplateInstance data(String key1, Object data1, String key2, Object data2, String key3, Object data3, String key4,
+            Object data4, String key5, Object data5) {
+        return instance().data(key1, data1).data(key2, data2).data(key3, data3).data(key4, data4).data(key5, data5);
+    }
+
     default String render(Object data) {
         return data(data).render();
     }
@@ -54,9 +115,9 @@ default String render() {
 
     /**
      * 
-     * @return an immutable set of expressions used in the template
+     * @return an immutable list of expressions used in the template
      */
-    Set<Expression> getExpressions();
+    List<Expression> getExpressions();
 
     /**
      * The id is unique for the engine instance.
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateExtension.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateExtension.java
index 34518baba2e06..e4e06ed7d43ce 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateExtension.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateExtension.java
@@ -1,6 +1,7 @@
 package io.quarkus.qute;
 
 import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -8,29 +9,53 @@
 import java.lang.annotation.Target;
 
 /**
- * A value resolver is automatically generated for a method annotated with this annotation. If declared on a class a value
- * resolver is generated for every non-private static method declared on the class. Methods that do not meet the following
- * requirements are ignored.
+ * Instructs a fully integrated environment to generate a {@link ValueResolver} for a method annotated with this annotation.
+ * <p>
+ * If declared on a class a value resolver is generated for every non-private static method declared on the class. Method-level
+ * annotations override the behavior defined on the class. Methods that do not meet the following requirements are ignored.
+ * 
  * <p>
  * A template extension method:
  * <ul>
+ * <li>must not be private</li>
  * <li>must be static,</li>
- * <li>must not return {@code void},</li>
- * <li>must accept at least one parameter.</li>
- * <p>
- * The class of the first parameter is used to match the base object.
- * <p>
- * By default, the method name is used to match the property name. However, it is possible to specify the matching name with
- * {@link #matchName()}. A special constant - {@link #ANY} - may be used to specify that the extension method matches any name.
- * In that case, the method must declare at least two parameters and the second parameter must be a string.
+ * <li>must not return {@code void}.</li>
+ * </ul>
+ * 
+ * If there is no namespace defined the class of the first parameter that is not annotated with {@link TemplateAttribute} is
+ * used to match the base object. Otherwise the namespace is used to match an expression.
  * 
  * <pre>
  * {@literal @}TemplateExtension
  * static BigDecimal discountedPrice(Item item) {
- *    // this method matches {item.discountedPrice}
+ *    // this method matches {item.discountedPrice} iff "item" resolves to an object assignable to "Item" 
  *    return item.getPrice().multiply(new BigDecimal("0.9"));
  * }
  * </pre>
+ * 
+ * By default, the method name is used to match the property name. However, it is possible to specify the matching name with
+ * {@link #matchName()}.
+ * 
+ * <pre>
+ * {@literal @}TemplateExtension(matchName = "discounted")
+ * static BigDecimal discountedPrice(Item item) {
+ *    // this method matches {item.discounted} iff "item" resolves to an object assignable to "Item" 
+ *    return item.getPrice().multiply(new BigDecimal("0.9"));
+ * }
+ * </pre>
+ * 
+ * A special constant - {@link #ANY} - may be used to specify that the extension method matches any name.
+ * It is also possible to match the name against a regular expression specified in {@link #matchRegex()}. In both cases, an
+ * additional string method parameter must be used to pass the property name. If both {@link #matchName()} and
+ * {@link #matchRegex()} are set the regular expression is used for matching.
+ * 
+ * <pre>
+ * {@literal @}TemplateExtension(matchName = "*")
+ * static String itemProperty(Item item, String name) {
+ *    // this method matches {item.foo} iff "item" resolves to an object assignable to "Item"
+ *    // the value of the "name" parameter is "foo"
+ * }
+ * </pre>
  */
 @Retention(RUNTIME)
 @Target({ METHOD, TYPE })
@@ -57,10 +82,57 @@
      */
     String matchName() default METHOD_NAME;
 
+    /**
+     * 
+     * @return the regex is used to match the property name
+     */
+    String matchRegex() default "";
+
     /**
      * 
      * @return the priority used by the generated value resolver
      */
     int priority() default DEFAULT_PRIORITY;
 
+    /**
+     * If not empty a namespace resolver is generated instead.
+     * <p>
+     * Template extension methods that share the same namespace and are declared on the same class are grouped in one resolver
+     * and ordered by {@link #priority()}. The first matching extension method is used to resolve an expression. Template
+     * extension methods declared on different classes cannot share the same namespace.
+     * 
+     * @return the namespace
+     */
+    String namespace() default "";
+
+    /**
+     * Used to annotated a template extension method parameter that should be obtained via
+     * {@link TemplateInstance#getAttribute(String)}. The parameter type must be {@link java.lang.Object}.
+     * 
+     * <pre>
+    * {@literal @}TemplateExtension
+    * static BigDecimal discountedPrice(Item item, {@literal @}TemplateAttribute Object locale) {
+    *    // this method matches {item.discountedPrice}
+    *    // ... do some locale-aware formatting
+    * }
+     * </pre>
+     */
+    @Retention(RUNTIME)
+    @Target(PARAMETER)
+    @interface TemplateAttribute {
+
+        /**
+         * Constant value for {@link #value()} indicating that the name of the annotated parameter should be used as-is.
+         */
+        String PARAMETER_NAME = "<<parameter name>>";
+
+        /**
+         * 
+         * @return the key used to obtain the attribute
+         * @see TemplateInstance#getAttribute(String)
+         */
+        String value() default PARAMETER_NAME;
+
+    }
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java
index 848c171148679..f20cab52b3330 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java
@@ -1,9 +1,9 @@
 package io.quarkus.qute;
 
 import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
@@ -31,7 +31,7 @@ public TemplateInstance instance() {
     }
 
     @Override
-    public Set<Expression> getExpressions() {
+    public List<Expression> getExpressions() {
         return root.getExpressions();
     }
 
@@ -79,6 +79,11 @@ public Multi<String> createMulti() {
                     }));
         }
 
+        @Override
+        public Uni<String> createUni() {
+            return Uni.createFrom().completionStage(this::renderAsync);
+        }
+
         @Override
         public CompletionStage<String> renderAsync() {
             StringBuilder builder = new StringBuilder();
@@ -95,7 +100,7 @@ private CompletionStage<Void> renderData(Object data, Consumer<String> consumer)
             DataNamespaceResolver dataResolver = new DataNamespaceResolver();
             List<NamespaceResolver> namespaceResolvers = ImmutableList.<NamespaceResolver> builder()
                     .addAll(engine.getNamespaceResolvers()).add(dataResolver).build();
-            ResolutionContext rootContext = new ResolutionContextImpl(null, data, namespaceResolvers,
+            ResolutionContext rootContext = new ResolutionContextImpl(data, namespaceResolvers,
                     engine.getEvaluator(), null, this);
             dataResolver.rootContext = rootContext;
             // Async resolution
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java
index de39258923ff7..05616a4dea1cf 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateInstance.java
@@ -1,9 +1,9 @@
 package io.quarkus.qute;
 
 import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
-import org.reactivestreams.Publisher;
 
 /**
  * Represents an instance of {@link Template}.
@@ -76,23 +76,25 @@ public interface TemplateInstance {
     CompletionStage<String> renderAsync();
 
     /**
-     * Each subscription triggers rendering.
+     * Create a new {@link Multi} that can be used to consume chunks of the rendered template. In particular, each item
+     * represents a part of the rendered template.
+     * <p>
+     * This operation does not trigger rendering. Instead, each subscription triggers a new rendering of the template.
      * 
-     * @return a publisher that can be used to consume chunks of the rendered template
-     * @throws UnsupportedOperationException If no {@link PublisherFactory} service provider is found
-     * @deprecated Use {@link #createMulti()} instead
+     * @return a new Multi
+     * @see Multi#subscribe()
      */
-    @Deprecated
-    default Publisher<String> publisher() {
-        return createMulti();
-    }
+    Multi<String> createMulti();
 
     /**
-     * Each subscription triggers rendering.
+     * Create a new {@link Uni} that can be used to consume the rendered template.
+     * <p>
+     * This operation does not trigger rendering. Instead, each subscription triggers a new rendering of the template.
      * 
-     * @return a Multi that can be used to consume chunks of the rendered template
+     * @return a new Uni
+     * @see Uni#subscribe()
      */
-    Multi<String> createMulti();
+    Uni<String> createUni();
 
     /**
      * Triggers rendering.
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateNode.java
index c71e55081ad5c..2036805350ebb 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateNode.java
@@ -1,8 +1,8 @@
 package io.quarkus.qute;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.CompletionStage;
 
 /**
@@ -19,10 +19,10 @@ public interface TemplateNode {
 
     /**
      * 
-     * @return a set of expressions
+     * @return a list of expressions
      */
-    default Set<Expression> getExpressions() {
-        return Collections.emptySet();
+    default List<Expression> getExpressions() {
+        return Collections.emptyList();
     }
 
     /**
@@ -31,14 +31,42 @@ default Set<Expression> getExpressions() {
      */
     Origin getOrigin();
 
+    /**
+     * 
+     * @return {@code true} if the node represents a constant
+     */
+    default boolean isConstant() {
+        return false;
+    }
+
     /**
      * Represents an origin of a template node.
      */
     public interface Origin {
 
+        /**
+         * 
+         * @return the line where the node can be found
+         */
         int getLine();
 
-        int getLineCharacter();
+        /**
+         * Note that this information is not available for all nodes.
+         * <p>
+         * However, it's always available for an expression node.
+         * 
+         * @return the line character the node starts
+         */
+        int getLineCharacterStart();
+
+        /**
+         * Note that this information is not available for all nodes.
+         * <p>
+         * However, it's always available for an expression node.
+         * 
+         * @return the line character the node ends
+         */
+        int getLineCharacterEnd();
 
         String getTemplateId();
 
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TextNode.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TextNode.java
index a2bd049567e0e..1e1d252ca4207 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/TextNode.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/TextNode.java
@@ -28,6 +28,11 @@ public Origin getOrigin() {
         return origin;
     }
 
+    @Override
+    public boolean isConstant() {
+        return true;
+    }
+
     public String getValue() {
         return value;
     }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/UserTagSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/UserTagSectionHelper.java
index 6f7cc225352e4..12bb5e4befdb8 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/UserTagSectionHelper.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/UserTagSectionHelper.java
@@ -5,10 +5,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 public class UserTagSectionHelper implements SectionHelper {
 
@@ -35,12 +35,13 @@ public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
                 if (!isEmpty) {
                     // Execute the nested content first and make it accessible via the "nested-content" key 
                     evaluatedParams.put(NESTED_CONTENT,
-                            context.execute(context.resolutionContext().createChild(new HashMap<>(evaluatedParams), null)));
+                            context.execute(
+                                    context.resolutionContext().createChild(Mapper.wrap(evaluatedParams), null)));
                 }
                 try {
                     // Execute the template with the params as the root context object
                     TemplateImpl tagTemplate = (TemplateImpl) templateSupplier.get();
-                    tagTemplate.root.resolve(context.resolutionContext().createChild(evaluatedParams, null))
+                    tagTemplate.root.resolve(context.resolutionContext().createChild(Mapper.wrap(evaluatedParams), null))
                             .whenComplete((resultNode, t2) -> {
                                 if (t2 != null) {
                                     result.completeExceptionally(t2);
@@ -83,18 +84,20 @@ public ParametersInfo getParameters() {
 
         @Override
         public UserTagSectionHelper initialize(SectionInitContext context) {
-
-            Map<String, Expression> params = context.getParameters().entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> context.parseValue(e.getValue())));
+            Map<String, Expression> params = new HashMap<>();
+            for (Entry<String, String> entry : context.getParameters().entrySet()) {
+                params.put(entry.getKey(), context.parseValue(entry.getValue()));
+            }
             boolean isEmpty = context.getBlocks().size() == 1 && context.getBlocks().get(0).isEmpty();
+            final Engine engine = context.getEngine();
 
             return new UserTagSectionHelper(new Supplier<Template>() {
 
                 @Override
                 public Template get() {
-                    Template template = context.getEngine().getTemplate(templateId);
+                    Template template = engine.getTemplate(templateId);
                     if (template == null) {
-                        throw new IllegalStateException("Tag template not found: " + templateId);
+                        throw new TemplateException("Tag template not found: " + templateId);
                     }
                     return template;
                 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolver.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolver.java
index d3b01b4e15b99..8e7aee9340aad 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolver.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolver.java
@@ -21,6 +21,14 @@ default boolean appliesTo(EvalContext context) {
         return true;
     }
 
+    /**
+     * 
+     * @return a new builder
+     */
+    static ValueResolverBuilder builder() {
+        return new ValueResolverBuilder();
+    }
+
     // Utility methods
 
     static boolean matchClass(EvalContext ctx, Class<?> clazz) {
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolverBuilder.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolverBuilder.java
new file mode 100644
index 0000000000000..e1699be578428
--- /dev/null
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolverBuilder.java
@@ -0,0 +1,185 @@
+package io.quarkus.qute;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * Builder for {@link ValueResolver}.
+ */
+public final class ValueResolverBuilder {
+
+    private int priority;
+    private Predicate<EvalContext> appliesTo;
+    private Function<EvalContext, CompletionStage<Object>> resolve;
+
+    ValueResolverBuilder() {
+        priority = ValueResolver.DEFAULT_PRIORITY;
+    }
+
+    public ValueResolverBuilder priority(int value) {
+        this.priority = value;
+        return this;
+    }
+
+    /**
+     * And applies to a part of an expression where the base class is assignable to the specified class.
+     * <p>
+     * The {@link ValueResolver#appliesTo(EvalContext)} logic defined earlier is replaced with a composite predicate.
+     * 
+     * @param name
+     * @return self
+     */
+    public ValueResolverBuilder applyToBaseClass(Class<?> baseClass) {
+        Predicate<EvalContext> p = new Predicate<EvalContext>() {
+
+            @Override
+            public boolean test(EvalContext ec) {
+                return ValueResolver.matchClass(ec, baseClass);
+            }
+        };
+        if (appliesTo != null) {
+            appliesTo = appliesTo.and(p);
+        } else {
+            appliesTo = p;
+        }
+        return this;
+    }
+
+    /**
+     * And applies to a part of an expression where the name is equal to the specified value.
+     * <p>
+     * The {@link ValueResolver#appliesTo(EvalContext)} logic defined earlier is replaced with a composite predicate.
+     * 
+     * @param name
+     * @return self
+     */
+    public ValueResolverBuilder applyToName(String name) {
+        Predicate<EvalContext> p = new Predicate<EvalContext>() {
+
+            @Override
+            public boolean test(EvalContext ec) {
+                return ec.getName().equals(name);
+            }
+        };
+        if (appliesTo != null) {
+            appliesTo = appliesTo.and(p);
+        } else {
+            appliesTo = p;
+        }
+        return this;
+    }
+
+    /**
+     * And applies to a part of an expression where the number of parameters is equal to zero.
+     * <p>
+     * The {@link ValueResolver#appliesTo(EvalContext)} logic defined earlier is replaced with a composite predicate.
+     * 
+     * @return self
+     */
+    public ValueResolverBuilder applyToNoParameters() {
+        Predicate<EvalContext> p = new Predicate<EvalContext>() {
+
+            @Override
+            public boolean test(EvalContext ec) {
+                return ec.getParams().size() == 0;
+            }
+        };
+        if (appliesTo != null) {
+            appliesTo = appliesTo.and(p);
+        } else {
+            appliesTo = p;
+        }
+        return this;
+    }
+
+    /**
+     * And applies to a part of an expression where the number of parameters is equal to the specified size.
+     * <p>
+     * The {@link ValueResolver#appliesTo(EvalContext)} logic defined earlier is replaced with a composite predicate.
+     * 
+     * @param size
+     * @return self
+     */
+    public ValueResolverBuilder applyToParameters(int size) {
+        Predicate<EvalContext> p = new Predicate<EvalContext>() {
+
+            @Override
+            public boolean test(EvalContext ec) {
+                return ec.getParams().size() == size;
+            }
+        };
+        if (appliesTo != null) {
+            appliesTo = appliesTo.and(p);
+        } else {
+            appliesTo = p;
+        }
+        return this;
+    }
+
+    /**
+     * The {@link ValueResolver#appliesTo(EvalContext)} logic defined earlier is replaced with the specified predicate.
+     * 
+     * @param predicate
+     * @return self
+     */
+    public ValueResolverBuilder appliesTo(Predicate<EvalContext> predicate) {
+        this.appliesTo = predicate;
+        return this;
+    }
+
+    public ValueResolverBuilder resolveSync(Function<EvalContext, Object> fun) {
+        this.resolve = new Function<EvalContext, CompletionStage<Object>>() {
+            @Override
+            public CompletionStage<Object> apply(EvalContext context) {
+                return CompletableFuture.completedFuture(fun.apply(context));
+            }
+        };
+        return this;
+    }
+
+    public ValueResolverBuilder resolveAsync(Function<EvalContext, CompletionStage<Object>> fun) {
+        this.resolve = fun;
+        return this;
+    }
+
+    public ValueResolverBuilder resolveWith(Object value) {
+        return resolveAsync(ec -> CompletableFuture.completedFuture(value));
+    }
+
+    public ValueResolver build() {
+        return new ValueResolverImpl(priority, appliesTo, resolve);
+    }
+
+    private static final class ValueResolverImpl implements ValueResolver {
+
+        private final int priority;
+        private final Predicate<EvalContext> appliesTo;
+        private final Function<EvalContext, CompletionStage<Object>> resolve;
+
+        public ValueResolverImpl(int priority, Predicate<EvalContext> appliesTo,
+                Function<EvalContext, CompletionStage<Object>> resolve) {
+            this.priority = priority;
+            this.appliesTo = appliesTo;
+            this.resolve = resolve;
+        }
+
+        @Override
+        public int getPriority() {
+            return priority;
+        }
+
+        @Override
+        public boolean appliesTo(EvalContext context) {
+            return appliesTo != null ? appliesTo.test(context) : true;
+        }
+
+        @Override
+        public CompletionStage<Object> resolve(EvalContext context) {
+            return resolve.apply(context);
+        }
+
+    }
+
+}
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java
index dfea812c226b5..fefd93a678e6f 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/ValueResolvers.java
@@ -3,11 +3,16 @@
 import static io.quarkus.qute.Booleans.isFalsy;
 
 import io.quarkus.qute.Results.Result;
+import java.lang.reflect.Array;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
 
 /**
  * Common value resolvers.
@@ -31,6 +36,20 @@ public CompletionStage<Object> resolve(EvalContext context) {
         };
     }
 
+    public static ValueResolver listResolver() {
+        return new ValueResolver() {
+
+            public boolean appliesTo(EvalContext context) {
+                return ValueResolver.matchClass(context, List.class);
+            }
+
+            @Override
+            public CompletionStage<Object> resolve(EvalContext context) {
+                return listResolveAsync(context);
+            }
+        };
+    }
+
     public static ValueResolver collectionResolver() {
         return new ValueResolver() {
 
@@ -60,7 +79,7 @@ public CompletionStage<Object> resolve(EvalContext context) {
     }
 
     /**
-     * Returns the default value if the base object is null or {@link Result#NOT_FOUND}.
+     * Returns the default value if the base object is null or {@link Result#NOT_FOUND} and the base object otherwise.
      * 
      * {@code foo.or(bar)}, {@code foo or true}, {@code name ?: 'elvis'}
      */
@@ -93,6 +112,29 @@ public CompletionStage<Object> resolve(EvalContext context) {
     }
 
     /**
+     * Return an empty list if the base object is null or {@link Result#NOT_FOUND}.
+     */
+    public static ValueResolver orEmpty() {
+        CompletionStage<Object> empty = CompletableFuture.completedFuture(Collections.emptyList());
+        return new ValueResolver() {
+
+            public boolean appliesTo(EvalContext context) {
+                return context.getParams().isEmpty() && context.getName().equals("orEmpty");
+            }
+
+            @Override
+            public CompletionStage<Object> resolve(EvalContext context) {
+                if (context.getBase() == null || Results.Result.NOT_FOUND.equals(context.getBase())) {
+                    return empty;
+                }
+                return CompletableFuture.completedFuture(context.getBase());
+            }
+        };
+    }
+
+    /**
+     * Returns {@link Result#NOT_FOUND} if the base object is falsy and the base object otherwise.
+     * <p>
      * Can be used together with {@link #orResolver()} to form a ternary operator.
      * 
      * {@code person.isElvis ? 'elvis' : notElvis}
@@ -101,8 +143,16 @@ public static ValueResolver trueResolver() {
         return new ValueResolver() {
 
             public boolean appliesTo(EvalContext context) {
-                return context.getParams().size() == 1
-                        && ("?".equals(context.getName()));
+                if (context.getParams().size() != 1) {
+                    return false;
+                }
+                switch (context.getName()) {
+                    case "?":
+                    case "ifTruthy":
+                        return true;
+                    default:
+                        return false;
+                }
             }
 
             @Override
@@ -149,7 +199,10 @@ public static ValueResolver mapperResolver() {
         return new ValueResolver() {
 
             public boolean appliesTo(EvalContext context) {
-                return context.getBase() instanceof Mapper;
+                if (context.getBase() instanceof Mapper && context.getParams().isEmpty()) {
+                    return ((Mapper) context.getBase()).appliesTo(context.getName());
+                }
+                return false;
             }
 
             @Override
@@ -161,12 +214,120 @@ public int getPriority() {
             @Override
             public CompletionStage<Object> resolve(EvalContext context) {
                 Mapper mapper = (Mapper) context.getBase();
-                return CompletableFuture.completedFuture(mapper.get(context.getName()));
+                return mapper.getAsync(context.getName());
             }
 
         };
     }
 
+    /**
+     * Performs conditional AND on the base object and the first parameter.
+     * It's a short-circuiting operation - the parameter is only evaluated if needed.
+     * 
+     * @see Booleans#isFalsy(Object)
+     */
+    public static ValueResolver logicalAndResolver() {
+        return new ValueResolver() {
+
+            public boolean appliesTo(EvalContext context) {
+                return context.getBase() != null && context.getParams().size() == 1
+                        && ("&&".equals(context.getName()));
+            }
+
+            @Override
+            public CompletionStage<Object> resolve(EvalContext context) {
+                boolean baseIsFalsy = Booleans.isFalsy(context.getBase());
+                return baseIsFalsy ? CompletableFuture.completedFuture(false)
+                        : context.evaluate(context.getParams().get(0)).thenApply(new Function<Object, Object>() {
+                            @Override
+                            public Object apply(Object booleanParam) {
+                                return !Booleans.isFalsy(booleanParam);
+                            }
+                        });
+            }
+
+        };
+    }
+
+    /**
+     * Performs conditional OR on the base object and the first parameter.
+     * It's a short-circuiting operation - the parameter is only evaluated if needed.
+     * 
+     * @see Booleans#isFalsy(Object)
+     */
+    public static ValueResolver logicalOrResolver() {
+        return new ValueResolver() {
+
+            public boolean appliesTo(EvalContext context) {
+                return context.getBase() != null && context.getParams().size() == 1
+                        && ("||".equals(context.getName()));
+            }
+
+            @Override
+            public CompletionStage<Object> resolve(EvalContext context) {
+                boolean baseIsFalsy = Booleans.isFalsy(context.getBase());
+                return !baseIsFalsy ? CompletableFuture.completedFuture(true)
+                        : context.evaluate(context.getParams().get(0)).thenApply(new Function<Object, Object>() {
+                            @Override
+                            public Object apply(Object booleanParam) {
+                                return !Booleans.isFalsy(booleanParam);
+                            }
+                        });
+            }
+
+        };
+    }
+
+    public static ValueResolver arrayResolver() {
+        return new ValueResolver() {
+
+            public boolean appliesTo(EvalContext context) {
+                return context.getBase() != null && context.getBase().getClass().isArray();
+            }
+
+            @Override
+            public CompletionStage<Object> resolve(EvalContext context) {
+                String name = context.getName();
+                if (name.equals("length")) {
+                    return CompletableFuture.completedFuture(Array.getLength(context.getBase()));
+                } else if (name.equals("get")) {
+                    if (context.getParams().isEmpty()) {
+                        throw new IllegalArgumentException("Index parameter is missing");
+                    }
+                    Expression indexExpr = context.getParams().get(0);
+                    if (indexExpr.isLiteral()) {
+                        Object literalValue;
+                        try {
+                            literalValue = indexExpr.getLiteralValue().get();
+                            if (literalValue instanceof Integer) {
+                                return CompletableFuture.completedFuture(Array.get(context.getBase(), (Integer) literalValue));
+                            }
+                            return Results.NOT_FOUND;
+                        } catch (InterruptedException | ExecutionException e) {
+                            throw new RuntimeException(e);
+                        }
+                    } else {
+                        return context.evaluate(indexExpr).thenCompose(idx -> {
+                            if (idx instanceof Integer) {
+                                return CompletableFuture.completedFuture(Array.get(context.getBase(), (Integer) idx));
+                            }
+                            return Results.NOT_FOUND;
+                        });
+                    }
+                } else {
+                    // Try to use the name as an index
+                    int index;
+                    try {
+                        index = Integer.parseInt(name);
+                    } catch (NumberFormatException e) {
+                        return Results.NOT_FOUND;
+                    }
+                    return CompletableFuture.completedFuture(Array.get(context.getBase(), index));
+                }
+            }
+        };
+    }
+
     // helper methods
 
     private static CompletionStage<Object> collectionResolveAsync(EvalContext context) {
@@ -188,6 +349,30 @@ private static CompletionStage<Object> collectionResolveAsync(EvalContext contex
         }
     }
 
+    private static CompletionStage<Object> listResolveAsync(EvalContext context) {
+        List<?> list = (List<?>) context.getBase();
+        switch (context.getName()) {
+            case "get":
+                if (context.getParams().size() == 1) {
+                    return context.evaluate(context.getParams().get(0))
+                            .thenApply(r -> {
+                                try {
+                                    int idx = r instanceof Integer ? (Integer) r : Integer.valueOf(r.toString());
+                                    if (idx >= list.size()) {
+                                        // Be consistent with property resolvers
+                                        return Result.NOT_FOUND;
+                                    }
+                                    return list.get(idx);
+                                } catch (NumberFormatException e) {
+                                    return Result.NOT_FOUND;
+                                }
+                            });
+                }
+            default:
+                return Results.NOT_FOUND;
+        }
+    }
+
     private static Object entryResolve(Entry<?, ?> entry, String name) {
         switch (name) {
             case "key":
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Variant.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Variant.java
index a457d8a1bd5f9..92f78db66ef02 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/Variant.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/Variant.java
@@ -8,24 +8,44 @@
  */
 public final class Variant {
 
+    public static Variant forContentType(String contentType) {
+        return new Variant(null, contentType, null);
+    }
+
     public final static String TEXT_HTML = "text/html";
     public final static String TEXT_PLAIN = "text/plain";
     public final static String TEXT_XML = "text/xml";
     public final static String APPLICATION_JSON = "application/json";
 
-    public final Locale locale;
-    public final String mediaType;
-    public final String encoding;
+    private final Locale locale;
+    private final String contentType;
+    private final String encoding;
 
-    public Variant(Locale locale, String mediaType, String encoding) {
+    public Variant(Locale locale, String contentType, String encoding) {
         this.locale = locale;
-        this.mediaType = mediaType;
+        this.contentType = contentType;
         this.encoding = encoding;
     }
 
+    public Locale getLocale() {
+        return locale;
+    }
+
+    public String getMediaType() {
+        return getContentType();
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
     @Override
     public int hashCode() {
-        return Objects.hash(encoding, locale, mediaType);
+        return Objects.hash(encoding, locale, contentType);
     }
 
     @Override
@@ -41,7 +61,15 @@ public boolean equals(Object obj) {
         }
         Variant other = (Variant) obj;
         return Objects.equals(encoding, other.encoding) && Objects.equals(locale, other.locale)
-                && Objects.equals(mediaType, other.mediaType);
+                && Objects.equals(contentType, other.contentType);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Variant [locale=").append(locale).append(", contentType=").append(contentType).append(", encoding=")
+                .append(encoding).append("]");
+        return builder.toString();
     }
 
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java
new file mode 100644
index 0000000000000..1038bcb62b0ac
--- /dev/null
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/WhenSectionHelper.java
@@ -0,0 +1,383 @@
+package io.quarkus.qute;
+
+import io.quarkus.qute.IfSectionHelper.Operator;
+import io.quarkus.qute.SectionHelperFactory.SectionInitContext;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * Basic {@code when/switch} statement.
+ */
+public class WhenSectionHelper implements SectionHelper {
+
+    private static final String VALUE = "value";
+    private static final String WHEN = "when";
+    private static final String SWITCH = "switch";
+    private static final String IS = "is";
+    private static final String CASE = "case";
+    private static final String ELSE = "else";
+
+    private final Expression value;
+    private final List<CaseBlock> caseBlocks;
+
+    WhenSectionHelper(SectionInitContext context) {
+        this.value = context.getExpression(VALUE);
+        ImmutableList.Builder<CaseBlock> builder = ImmutableList.builder();
+        for (SectionBlock block : context.getBlocks()) {
+            if (!SectionHelperFactory.MAIN_BLOCK_NAME.equals(block.label)) {
+                switch (block.label) {
+                    case IS:
+                    case CASE:
+                    case ELSE:
+                        builder.add(new CaseBlock(block, context));
+                        break;
+                    case SectionHelperFactory.MAIN_BLOCK_NAME:
+                        break;
+                    default:
+                        // This should never happen
+                        throw new TemplateException("Invalid block: " + block);
+                }
+
+            }
+        }
+        this.caseBlocks = builder.build();
+    }
+
+    @Override
+    public CompletionStage<ResultNode> resolve(SectionResolutionContext context) {
+        return context.resolutionContext().evaluate(value)
+                .thenCompose(value -> {
+                    if (value != null && value.getClass().isEnum()) {
+                        return resolveEnumCaseBlocks(context, value, caseBlocks);
+                    }
+                    return resolveCaseBlocks(context, value, caseBlocks.iterator());
+                });
+    }
+
+    CompletionStage<ResultNode> resolveCaseBlocks(SectionResolutionContext context, Object value,
+            Iterator<CaseBlock> caseBlocks) {
+        CaseBlock caseBlock = caseBlocks.next();
+        return caseBlock.resolve(context, value).thenCompose(r -> {
+            if (r) {
+                return context.execute(caseBlock.block, context.resolutionContext());
+            } else {
+                if (caseBlocks.hasNext()) {
+                    return resolveCaseBlocks(context, value, caseBlocks);
+                } else {
+                    return ResultNode.NOOP;
+                }
+            }
+        });
+    }
+
+    CompletionStage<ResultNode> resolveEnumCaseBlocks(SectionResolutionContext context, Object value,
+            List<CaseBlock> caseBlocks) {
+        for (CaseBlock caseBlock : caseBlocks) {
+            if (caseBlock.resolveEnum(context, value)) {
+                return context.execute(caseBlock.block, context.resolutionContext());
+            }
+        }
+        return ResultNode.NOOP;
+    }
+
+    public static class Factory implements SectionHelperFactory<WhenSectionHelper> {
+
+        public static final String HINT_PREFIX = "<when#";
+        private static final String VALUE_EXPR_ID = "<<value-expr-id>>";
+
+        @Override
+        public List<String> getDefaultAliases() {
+            return ImmutableList.of(WHEN, SWITCH);
+        }
+
+        @Override
+        public ParametersInfo getParameters() {
+            return ParametersInfo.builder().addParameter(VALUE).build();
+        }
+
+        @Override
+        public WhenSectionHelper initialize(SectionInitContext context) {
+            return new WhenSectionHelper(context);
+        }
+
+        @Override
+        public List<String> getBlockLabels() {
+            return ImmutableList.of(IS, CASE, ELSE);
+        }
+
+        @Override
+        public Scope initializeBlock(Scope previousScope, BlockInfo block) {
+            if (block.getLabel().equals(MAIN_BLOCK_NAME)) {
+                String value = block.getParameters().get(VALUE);
+                if (value == null) {
+                    throw new IllegalStateException("Value param not present");
+                }
+                Expression valueExpr = block.addExpression(VALUE, value);
+                if (valueExpr.hasTypeInfo()) {
+                    // If type info is available we do add the expression id 
+                    previousScope.putAttribute(VALUE_EXPR_ID, valueExpr.getGeneratedId());
+                }
+            } else if (ELSE.equals(block.getLabel())) {
+                // No special handling required for "else"
+            } else if (IS.equals(block.getLabel()) || CASE.equals(block.getLabel())) {
+                Object valueExprId = previousScope.getAttribute(VALUE_EXPR_ID);
+                int added = 0;
+                Iterator<String> it = block.getParameters().values().iterator();
+                while (it.hasNext()) {
+                    String param = it.next();
+                    if (added == 0 && it.hasNext()) {
+                        // Skip the operator param
+                        continue;
+                    }
+                    added++;
+                    if (valueExprId != null) {
+                        // This could be an enum switch - we need to add a hint in order to validate the enum constants properly 
+                        String previousBinding = previousScope.getBinding(param);
+                        String newBinding = previousBinding;
+                        if (newBinding == null) {
+                            newBinding = param;
+                        }
+                        // Append hint to the existing binding if needed
+                        // E.g. ON -> ON<when:12345>
+                        newBinding += HINT_PREFIX + valueExprId + ">";
+                        previousScope.putBinding(param, newBinding);
+                        block.addExpression(param, param);
+                        previousScope.putBinding(param, previousBinding);
+                    } else {
+                        block.addExpression(param, param);
+                    }
+                }
+            } else {
+                throw block.createParserError("Invalid case block used in a {#when} section: " + block.getLabel());
+            }
+            return previousScope;
+        }
+
+    }
+
+    enum CaseOperator {
+
+        EQ(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer params) {
+                return params == 1;
+            }
+        }),
+        NE("not", "ne", "!="),
+        GT("gt", ">"),
+        GE("ge", ">="),
+        LE("le", "<="),
+        LT("lt", "<"),
+        IN(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer params) {
+                return params >= 1;
+            }
+        }, "in"),
+        NOT_IN(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer params) {
+                return params >= 1;
+            }
+        }, "!in", "ni");
+
+        final Predicate<Integer> params;
+        final List<String> aliases;
+
+        CaseOperator(String... aliases) {
+            this(new Predicate<Integer>() {
+                @Override
+                public boolean test(Integer params) {
+                    return params == 1;
+                }
+            }, aliases);
+        }
+
+        CaseOperator(Predicate<Integer> paramsTest, String... aliases) {
+            this.params = paramsTest;
+            this.aliases = Arrays.asList(aliases);
+        }
+
+        static CaseOperator from(Collection<String> blockParams) {
+            if (blockParams.size() == 1) {
+                return EQ;
+            } else if (blockParams.size() > 1) {
+                // The first param is the operator name
+                Iterator<String> iterator = blockParams.iterator();
+                String name = iterator.next();
+                for (CaseOperator op : values()) {
+                    if (!op.params.test(blockParams.size() - 1)) {
+                        continue;
+                    }
+                    for (String alias : op.aliases) {
+                        if (alias.equals(name)) {
+                            return op;
+                        }
+                    }
+
+                }
+            }
+            return null;
+        }
+
+        boolean evaluate(Object value, List<?> params) {
+            switch (this) {
+                case EQ:
+                    return Objects.equals(value, params.get(0));
+                case NE:
+                    return !Objects.equals(value, params.get(0));
+                case GE:
+                case GT:
+                case LE:
+                case LT:
+                    return compare(value, params.get(0));
+                case IN:
+                    return params.contains(value);
+                case NOT_IN:
+                    return !params.contains(value);
+                default:
+                    throw new TemplateException("Not a legal operator: " + this);
+            }
+        }
+
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        boolean compare(Object op1, Object op2) {
+            if (op1 == null || op2 == null) {
+                throw new TemplateException("Unable to compare null operands [op1=" + op1 + ", op2=" + op2 + "]");
+            }
+            Comparable c1;
+            Comparable c2;
+            if (op1 instanceof Comparable && op1.getClass().equals(op2.getClass())) {
+                c1 = (Comparable) op1;
+                c2 = (Comparable) op2;
+            } else {
+                c1 = Operator.getDecimal(op1);
+                c2 = Operator.getDecimal(op2);
+            }
+            int result = c1.compareTo(c2);
+            switch (this) {
+                case GE:
+                    return result >= 0;
+                case GT:
+                    return result > 0;
+                case LE:
+                    return result <= 0;
+                case LT:
+                    return result < 0;
+                default:
+                    return false;
+            }
+        }
+
+    }
+
+    static class CaseBlock {
+
+        private final SectionBlock block;
+        private final CaseOperator caseOperator;
+        private final List<Expression> params;
+
+        public CaseBlock(SectionBlock block, SectionInitContext context) {
+            this.block = block;
+            this.caseOperator = CaseOperator.from(block.parameters.values());
+            ImmutableList.Builder<Expression> builder = ImmutableList.builder();
+            Iterator<String> iterator = block.parameters.values().iterator();
+            if (block.parameters.size() > 1) {
+                // Skip the first param -> operator
+                iterator.next();
+            }
+            while (iterator.hasNext()) {
+                builder.add(context.parseValue(iterator.next()));
+            }
+            this.params = builder.build();
+        }
+
+        CompletionStage<Boolean> resolve(SectionResolutionContext context, Object value) {
+            if (params.isEmpty()) {
+                return CompletableFuture.completedFuture(true);
+            } else if (params.size() == 1) {
+                Expression paramExpr = params.get(0);
+                if (paramExpr.isLiteral()) {
+                    // A param is very often a literal.. no need for async constructs
+                    try {
+                        return CompletableFuture.completedFuture(
+                                caseOperator.evaluate(value, Collections.singletonList(paramExpr.getLiteralValue().get())));
+                    } catch (InterruptedException | ExecutionException e) {
+                        throw new IllegalStateException(e);
+                    }
+                }
+                return context.resolutionContext().evaluate(paramExpr)
+                        .thenApply(p -> caseOperator.evaluate(value, Collections.singletonList(p)));
+            } else {
+                // in, not in
+                CompletableFuture<?>[] allResults = new CompletableFuture<?>[params.size()];
+                List<CompletableFuture<?>> results = new LinkedList<>();
+                int i = 0;
+                Iterator<Expression> it = params.iterator();
+                while (it.hasNext()) {
+                    Expression expression = it.next();
+                    CompletableFuture<Object> result = context.resolutionContext().evaluate(expression).toCompletableFuture();
+                    allResults[i++] = result;
+                    if (!expression.isLiteral()) {
+                        results.add(result);
+                    }
+                }
+                if (results.isEmpty()) {
+                    // Parameters are literals only
+                    return CompletableFuture.completedFuture(caseOperator.evaluate(value,
+                            Arrays.stream(allResults).map(t1 -> {
+                                try {
+                                    return t1.get();
+                                } catch (InterruptedException | ExecutionException e) {
+                                    throw new IllegalStateException(e);
+                                }
+                            }).collect(Collectors.toList())));
+                }
+                return CompletableFuture.allOf(results.toArray(new CompletableFuture[0]))
+                        .thenApply(new Function<Void, Boolean>() {
+                            @Override
+                            public Boolean apply(Void t) {
+                                return caseOperator.evaluate(value,
+                                        Arrays.stream(allResults).map(t1 -> {
+                                            try {
+                                                return t1.get();
+                                            } catch (InterruptedException | ExecutionException e) {
+                                                throw new IllegalStateException(e);
+                                            }
+                                        }).collect(Collectors.toList()));
+                            }
+                        });
+            }
+        }
+
+        boolean resolveEnum(SectionResolutionContext context, Object value) {
+            if (params.isEmpty()) {
+                return true;
+            }
+            String enumValue = value.toString();
+            if (params.size() == 1) {
+                // case enum value with the current value
+                return caseOperator.evaluate(enumValue, Collections.singletonList(params.get(0).toOriginalString()));
+            } else {
+                List<String> paramValues = new ArrayList<>(params.size());
+                for (Expression param : params) {
+                    paramValues.add(param.toOriginalString());
+                }
+                return caseOperator.evaluate(enumValue, paramValues);
+            }
+        }
+
+    }
+}
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ArrayResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ArrayResolverTest.java
new file mode 100644
index 0000000000000..60951bcf53327
--- /dev/null
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ArrayResolverTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.qute;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+
+public class ArrayResolverTest {
+
+    @Test
+    public void testArrays() {
+        Engine engine = Engine.builder().addDefaults().build();
+
+        int[] int1 = { 1, 2, 3 };
+
+        assertEquals("3", engine.parse("{array.length}").data("array", int1).render());
+        assertEquals("2", engine.parse("{array.1}").data("array", int1).render());
+        assertEquals("3", engine.parse("{array.get(2)}").data("array", int1).render());
+        assertEquals("NOT_FOUND", engine.parse("{array.get('foo')}").data("array", int1).render());
+        assertEquals("3", engine.parse("{array.get(last)}").data("array", int1, "last", 2).render());
+        assertEquals("1", engine.parse("{array[0]}").data("array", int1).render());
+
+        long[][] long2 = { { 1l, 2l }, { 3l, 4l }, {} };
+
+        assertEquals("3", engine.parse("{array.length}").data("array", long2).render());
+        assertEquals("2", engine.parse("{array.1.length}").data("array", long2).render());
+        assertEquals("2", engine.parse("{array.get(0).get(1)}").data("array", long2).render());
+        assertEquals("1", engine.parse("{array[0][0]}").data("array", long2).render());
+        assertEquals("0", engine.parse("{array[2].length}").data("array", long2).render());
+
+        try {
+            engine.parse("{array.get(10)}").data("array", long2).render();
+            fail();
+        } catch (Exception expected) {
+            assertTrue(expected instanceof ArrayIndexOutOfBoundsException, expected.toString());
+        }
+
+        try {
+            engine.parse("{array.get()}").data("array", long2).render();
+            fail();
+        } catch (Exception expected) {
+            assertTrue(expected instanceof IllegalArgumentException, expected.toString());
+        }
+    }
+
+}
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java
index 7c8669f0fdb77..6c1cec270496f 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/BooleansTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.qute;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -49,4 +50,18 @@ public void testIsFalsy() {
         assertFalse(Booleans.isFalsy(new AtomicBoolean(true)));
     }
 
+    @Test
+    public void testLogicalOperators() {
+        Engine engine = Engine.builder().addDefaults()
+                .addValueResolvers(ValueResolvers.logicalAndResolver(), ValueResolvers.logicalOrResolver())
+                .build();
+        assertEquals("true", engine.parse("{foo && bar}").data("foo", true).data("bar", 1).render());
+        assertEquals("true", engine.parse("{foo && bar && baz}").data("foo", true).data("bar", 1).data("baz", true).render());
+        assertEquals("false",
+                engine.parse("{foo && bar && baz}").data("foo", true).data("bar", 1).data("baz", false).render());
+        assertEquals("true", engine.parse("{foo || bar}").data("foo", true).data("bar", 0).render());
+        assertEquals("false", engine.parse("{foo || bar || baz}").data("foo", false).data("bar", 0)
+                .data("baz", Collections.emptyList()).render());
+    }
+
 }
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/CreateMultiTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/CreateMultiTest.java
deleted file mode 100644
index df8af520b6150..0000000000000
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/CreateMultiTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.quarkus.qute;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import io.smallrye.mutiny.Multi;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.Test;
-
-public class CreateMultiTest {
-
-    @Test
-    public void test() throws InterruptedException {
-        Engine engine = Engine.builder().addDefaultSectionHelpers().addDefaultValueResolvers().build();
-        Template template = engine.parse("{#each}{it}{/}");
-        List<String> data = Arrays.asList("foo", "foo", "alpha");
-        Multi<String> multi = template.instance().data(data).createMulti();
-
-        assertMulti(multi, "foofooalpha");
-        assertMulti(multi.transform().byDroppingDuplicates(), "fooalpha");
-        assertMulti(multi.transform().byTakingFirstItems(1), "foo");
-    }
-
-    private void assertMulti(Multi<String> multi, String expected) throws InterruptedException {
-        StringBuilder builder = new StringBuilder();
-        CountDownLatch latch = new CountDownLatch(1);
-        multi
-                .subscribe().with(
-                        builder::append,
-                        latch::countDown);
-        if (latch.await(2, TimeUnit.SECONDS)) {
-            assertEquals(expected, builder.toString());
-        } else {
-            fail();
-        }
-    }
-
-}
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java
index 6b8365a9b6a64..2f4635c60e6d5 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ExpressionTest.java
@@ -3,6 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import io.quarkus.qute.Expression.Part;
 import java.util.Arrays;
@@ -15,9 +17,10 @@ public class ExpressionTest {
 
     @Test
     public void testExpressions() throws InterruptedException, ExecutionException {
-        verify("data:name.value", "data", null, name("name", "name"), name("value", "value"));
-        verify("name.value", null, null, name("name"), name("value"));
-        verify("name[value]", null, null, name("name"), name("value"));
+        verify("data:name.value", "data", null, name("name", "data:name"), name("value", "value"));
+        verify("data:getName('value')", "data", null, virtualMethod("getName", ExpressionImpl.from("'value'")));
+        // ignore adjacent separators
+        verify("name..value", null, null, name("name"), name("value"));
         verify("0", null, CompletableFuture.completedFuture(Integer.valueOf(0)), name("0", "|java.lang.Integer|"));
         verify("false", null, CompletableFuture.completedFuture(Boolean.FALSE), name("false", "|java.lang.Boolean|"));
         verify("null", null, CompletableFuture.completedFuture(null), name("null"));
@@ -26,18 +29,38 @@ public void testExpressions() throws InterruptedException, ExecutionException {
         verify("item.name or 'John'", null, null, name("item"), name("name"),
                 virtualMethod("or", ExpressionImpl.from("'John'")));
         verify("name.func('John', 1)", null, null, name("name"),
-                virtualMethod("func", ExpressionImpl.literalFrom("'John'"), ExpressionImpl.literalFrom("1")));
+                virtualMethod("func", ExpressionImpl.literalFrom(-1, "'John'"), ExpressionImpl.literalFrom(-1, "1")));
         verify("name ?: 'John Bug'", null, null, name("name"),
-                virtualMethod("?:", ExpressionImpl.literalFrom("'John Bug'")));
-        verify("name ? 'John' : 'Bug'", null, null, name("name"), virtualMethod("?", ExpressionImpl.literalFrom("'John'")),
-                virtualMethod(":", ExpressionImpl.literalFrom("'Bug'")));
+                virtualMethod("?:", ExpressionImpl.literalFrom(-1, "'John Bug'")));
+        verify("name ? 'John' : 'Bug'", null, null, name("name"), virtualMethod("?", ExpressionImpl.literalFrom(-1, "'John'")),
+                virtualMethod(":", ExpressionImpl.literalFrom(-1, "'Bug'")));
         verify("name.func(data:foo)", null, null, name("name"), virtualMethod("func", ExpressionImpl.from("data:foo")));
-        verify("this.getList(5).size", null, null, name("this"), virtualMethod("getList", ExpressionImpl.literalFrom("5")),
+        verify("this.getList(5).size", null, null, name("this"), virtualMethod("getList", ExpressionImpl.literalFrom(-1, "5")),
                 name("size"));
         verify("foo.call(bar.baz)", null, null, name("foo"), virtualMethod("call", ExpressionImpl.from("bar.baz")));
         verify("foo.call(bar.call(1))", null, null, name("foo"), virtualMethod("call", ExpressionImpl.from("bar.call(1)")));
         verify("foo.call(bar.alpha(1),bar.alpha('ping'))", null, null, name("foo"),
                 virtualMethod("call", ExpressionImpl.from("bar.alpha(1)"), ExpressionImpl.from("bar.alpha('ping')")));
+        verify("'foo:bar'", null, CompletableFuture.completedFuture("foo:bar"), name("'foo:bar'", "|java.lang.String|"));
+        // bracket notation
+        // ignore adjacent separators
+        verify("name[['value']", null, null, name("name"), name("value"));
+        verify("name[false]]", null, null, name("name"), name("false"));
+        verify("name[1l]", null, null, name("name"), name("1"));
+        try {
+            verify("name['value'][1][null]", null, null);
+            fail();
+        } catch (TemplateException expected) {
+            assertTrue(expected.getMessage().contains("Null value"));
+        }
+        try {
+            verify("name[value]", null, null);
+            fail();
+        } catch (TemplateException expected) {
+            assertTrue(expected.getMessage().contains("Non-literal value"));
+        }
+        //verify("name[1l]['foo']", null, null, name("name"), name("1"), name("foo"));
+        verify("foo[\"name.dot\"].value", null, null, name("foo"), name("name.dot"), name("value"));
     }
 
     @Test
@@ -89,11 +112,11 @@ private Part name(String name) {
     }
 
     private Part name(String name, String typeInfo) {
-        return new ExpressionImpl.ExpressionPartImpl(name, typeInfo);
+        return new ExpressionImpl.PartImpl(name, typeInfo);
     }
 
     private Part virtualMethod(String name, Expression... params) {
-        return new ExpressionImpl.VirtualMethodExpressionPartImpl(name, Arrays.asList(params));
+        return new ExpressionImpl.VirtualMethodPartImpl(name, Arrays.asList(params), null);
     }
 
 }
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java
index a74475bce62d2..ada00970a24ae 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/GlobalNamespaceResolverTest.java
@@ -15,7 +15,14 @@ public void tesNamespaceResolver() {
 
                     @Override
                     public CompletionStage<Object> resolve(EvalContext context) {
-                        return context.getName().equals("foo") ? CompletableFuture.completedFuture("bar") : Results.NOT_FOUND;
+                        if (!context.getName().equals("foo")) {
+                            return Results.NOT_FOUND;
+                        }
+                        CompletableFuture<Object> ret = new CompletableFuture<>();
+                        context.evaluate(context.getParams().get(0)).whenComplete((r, e) -> {
+                            ret.complete(r);
+                        });
+                        return ret;
                     }
 
                     @Override
@@ -25,7 +32,7 @@ public String getNamespace() {
                 })
                 .build();
 
-        assertEquals("bar", engine.parse("{global:foo}").render(null));
+        assertEquals("bar", engine.parse("{global:foo('bar')}").render(null));
     }
 
 }
diff --git a/extensions/qute/runtime/src/test/java/io/quarkus/qute/runtime/HtmlEscaperTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java
similarity index 89%
rename from extensions/qute/runtime/src/test/java/io/quarkus/qute/runtime/HtmlEscaperTest.java
rename to independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java
index dc42cc1fd05db..9f24a043e1fff 100644
--- a/extensions/qute/runtime/src/test/java/io/quarkus/qute/runtime/HtmlEscaperTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/HtmlEscaperTest.java
@@ -1,19 +1,15 @@
-package io.quarkus.qute.runtime;
+package io.quarkus.qute;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import io.quarkus.qute.TemplateNode.Origin;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Optional;
-
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.qute.RawString;
-import io.quarkus.qute.TemplateNode.Origin;
-import io.quarkus.qute.Variant;
-
 public class HtmlEscaperTest {
 
     @Test
@@ -37,7 +33,12 @@ public String getTemplateGeneratedId() {
             }
 
             @Override
-            public int getLineCharacter() {
+            public int getLineCharacterStart() {
+                return 0;
+            }
+
+            @Override
+            public int getLineCharacterEnd() {
                 return 0;
             }
 
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java
index 4ad57315d65d4..497d3bf6ccd47 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IfSectionTest.java
@@ -76,6 +76,37 @@ public void testCompositeParameters() {
         assertEquals("OK", engine.parse("{#if (foo || false || true) && (true)}OK{/if}").render());
         assertEquals("NOK", engine.parse("{#if foo || false}OK{#else}NOK{/if}").render());
         assertEquals("OK", engine.parse("{#if false || (foo || (false || true))}OK{#else}NOK{/if}").render());
+        assertEquals("NOK", engine.parse("{#if (true && false)}OK{#else}NOK{/if}").render());
+        assertEquals("OK", engine.parse("{#if true && true}OK{#else}NOK{/if}").render());
+        assertEquals("NOK", engine.parse("{#if true && false}OK{#else}NOK{/if}").render());
+        assertEquals("NOK", engine.parse("{#if false && true}OK{#else}NOK{/if}").render());
+        assertEquals("OK", engine.parse("{#if true and (true or false)}OK{#else}NOK{/if}").render());
+        assertEquals("NOK", engine.parse("{#if true and (true == false)}OK{#else}NOK{/if}").render());
+        assertEquals("OK", engine.parse("{#if true && (false == false)}OK{#else}NOK{/if}").render());
+
+        Map<String, String> foo = new HashMap<>();
+        foo.put("bar", "something");
+        assertEquals("NOK",
+                engine.parse("{#if foo.bar != 'something' && foo.bar != 'other'}OK{#else}NOK{/if}").data("foo", foo).render());
+        assertEquals("OK",
+                engine.parse("{#if foo.bar != 'nothing' && foo.bar != 'other'}OK{#else}NOK{/if}").data("foo", foo).render());
+        assertEquals("OK",
+                engine.parse("{#if foo.bar == 'something' || foo.bar != 'other'}OK{#else}NOK{/if}").data("foo", foo).render());
+        assertEquals("OK", engine.parse("{#if (foo.bar == 'something') || (foo.bar == 'other')}OK{#else}NOK{/if}")
+                .data("foo", foo).render());
+
+        Map<String, String> qual = new HashMap<>();
+        Template template = engine.parse(
+                "{#if qual.name != 'javax.inject.Named' \n"
+                        + "          && qual.name != 'javax.enterprise.inject.Any'\n"
+                        + "          && qual.name != 'javax.enterprise.inject.Default'}{qual.name}{/if}");
+        qual.put("name", "org.acme.MyQual");
+        assertEquals("org.acme.MyQual", template
+                .data("qual", qual).render());
+        qual.put("name", "javax.enterprise.inject.Any");
+        assertEquals("", template
+                .data("qual", qual).render());
+
     }
 
     @Test
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java
index 86c71176e0fcc..a5fa68f6af12f 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/IncludeTest.java
@@ -101,4 +101,18 @@ public void testIncludeStandaloneLines() {
                         + "{/include}").render());
     }
 
+    @Test
+    public void testEmptyInclude() {
+        Engine engine = Engine.builder().addDefaults().build();
+        engine.putTemplate("bar/fool.html", engine.parse("{foo} and {that}"));
+        assertEquals("1 and true", engine.parse("{#include bar/fool.html that=true /}").data("foo", 1).render());
+    }
+
+    @Test
+    public void testInsertParam() {
+        Engine engine = Engine.builder().addDefaults().build();
+        engine.putTemplate("super", engine.parse("{#insert header}default header{/insert} and {#insert footer}{that}{/}"));
+        assertEquals("1 and 1", engine.parse("{#include 'super' that=foo}{#header}{that}{/}{/}").data("foo", 1).render());
+    }
+
 }
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java
index 81927449353b5..00bd8b4b233ea 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MapResolverTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 
@@ -10,16 +10,20 @@ public class MapResolverTest {
 
     @Test
     public void tesMapResolver() {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new LinkedHashMap<>();
         map.put("name", "Lu");
+        map.put("foo.bar", "Ondrej");
 
         Engine engine = Engine.builder()
                 .addSectionHelper(new LoopSectionHelper.Factory())
                 .addDefaultValueResolvers()
                 .build();
 
-        assertEquals("Lu,1,false,true,name",
-                engine.parse("{this.name},{this.size},{this.empty},{this.containsKey('name')},{#each this.keys}{it}{/each}")
+        assertEquals("Lu,Lu,2,false,true,namefoo.bar::Ondrej,Ondrej",
+                engine.parse(
+                        "{this.name},{this['name']},{this.size},{this.empty},{this.containsKey('name')},"
+                                + "{#each this.keys}{it}{/each}"
+                                + "::{this.get('foo.bar')},{this['foo.bar']}")
                         .render(map));
     }
 
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java
new file mode 100644
index 0000000000000..145fb3d64733d
--- /dev/null
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/MutinyTest.java
@@ -0,0 +1,81 @@
+package io.quarkus.qute;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+
+public class MutinyTest {
+
+    @Test
+    public void testCreateMulti() throws InterruptedException {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#each}{it}{/}");
+        List<String> data = Arrays.asList("foo", "foo", "alpha");
+        Multi<String> multi = template.data(data).createMulti();
+
+        assertMulti(multi, "foofooalpha");
+        assertMulti(multi.transform().byDroppingDuplicates(), "fooalpha");
+        assertMulti(multi.transform().byTakingFirstItems(1), "foo");
+    }
+
+    @Test
+    public void testCreateUni() throws InterruptedException {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#each}{it}{/}");
+        List<Object> data = new ArrayList<>(Arrays.asList("foo", "foo", "alpha"));
+        Uni<String> uni = template.data(data).createUni();
+
+        BlockingQueue<Object> synchronizer = new LinkedBlockingQueue<>();
+
+        uni.subscribe().with(synchronizer::add);
+        assertEquals("foofooalpha", synchronizer.poll(2, TimeUnit.SECONDS));
+
+        data.remove(0);
+        uni.subscribe().with(synchronizer::add);
+        assertEquals("fooalpha", synchronizer.poll(2, TimeUnit.SECONDS));
+
+        data.add(new Object() {
+            @Override
+            public String toString() {
+                throw new IllegalStateException("foo");
+            }
+
+        });
+        uni.subscribe().with(synchronizer::add, synchronizer::add);
+        assertEquals(IllegalStateException.class, synchronizer.poll(2, TimeUnit.SECONDS).getClass());
+    }
+
+    @Test
+    public void testUniResolution() {
+        Engine engine = Engine.builder().addDefaults().addValueResolver(new ReflectionValueResolver()).build();
+        Template template = engine.parse("{foo.toLowerCase}::{#each items}{count}.{it}{#if hasNext},{/if}{/each}");
+        Uni<Object> fooUni = Uni.createFrom().item("FOO");
+        Uni<List<String>> itemsUni = Uni.createFrom().item(() -> Arrays.asList("foo", "bar", "baz"));
+        assertEquals("foo::1.foo,2.bar,3.baz", template.data("foo", fooUni, "items", itemsUni).render());
+    }
+
+    private void assertMulti(Multi<String> multi, String expected) throws InterruptedException {
+        StringBuilder builder = new StringBuilder();
+        CountDownLatch latch = new CountDownLatch(1);
+        multi
+                .subscribe().with(
+                        builder::append,
+                        latch::countDown);
+        if (latch.await(2, TimeUnit.SECONDS)) {
+            assertEquals(expected, builder.toString());
+        } else {
+            fail();
+        }
+    }
+
+}
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java
index 4a76f49215130..2c6f55e69a26a 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ParserTest.java
@@ -11,10 +11,12 @@
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import org.junit.jupiter.api.Test;
 
 public class ParserTest {
@@ -66,6 +68,7 @@ public void testTypeInfos() {
                 .build();
         Template template = engine.parse("{@org.acme.Foo foo}"
                 + "{@java.util.List<org.acme.Label> labels}"
+                + "{@org.acme.Machine machine}"
                 + "{foo.name}"
                 + "{#for item in foo.items}"
                 + "{item.name}{bar.name}"
@@ -74,31 +77,45 @@ public void testTypeInfos() {
                 + "{it.name}"
                 + "{/each}"
                 + "{inject:bean.name}"
-                + "{#each inject:bean.labels}"
+                + "{#each inject:bean.labels('foo')}"
                 + "{it.value}"
                 + "{/each}"
                 + "{#set baz=foo.bar}"
                 + "{baz.name}"
+                + "{baz.getName(baz.age)}"
                 + "{/set}"
                 + "{#for foo in foos}"
                 + "{foo.baz}"
                 + "{/for}"
-                + "{foo.call(labels,bar)}");
-        Set<Expression> expressions = template.getExpressions();
+                + "{foo.call(labels,bar)}"
+                + "{#when machine.status}{#is OK}..{#is NOK}{/when}");
+        List<Expression> expressions = template.getExpressions();
 
         assertExpr(expressions, "foo.name", 2, "|org.acme.Foo|.name");
-        assertExpr(expressions, "foo.items", 2, "|org.acme.Foo|.items");
-        assertExpr(expressions, "item.name", 2, "|org.acme.Foo|.items<for-element>.name");
+
+        Expression fooItems = find(expressions, "foo.items");
+        assertExpr(expressions, "foo.items", 2, "|org.acme.Foo|.items<loop-element>");
+        assertExpr(expressions, "item.name", 2, "item<loop#" + fooItems.getGeneratedId() + ">.name");
         assertExpr(expressions, "bar.name", 2, null);
-        assertExpr(expressions, "labels", 1, "|java.util.List<org.acme.Label>|");
-        assertExpr(expressions, "it.name", 2, "|java.util.List<org.acme.Label>|<for-element>.name");
-        assertExpr(expressions, "inject:bean.name", 2, "bean.name");
-        assertExpr(expressions, "inject:bean.labels", 2, "bean.labels");
-        assertExpr(expressions, "it.value", 2, "bean.labels<for-element>.value");
+
+        Expression labels = find(expressions, "labels");
+        assertExpr(expressions, "labels", 1, "|java.util.List<org.acme.Label>|<loop-element>");
+        assertExpr(expressions, "it.name", 2, "it<loop#" + labels.getGeneratedId() + ">.name");
+
+        assertExpr(expressions, "inject:bean.name", 2, "inject:bean.name");
+
+        Expression beanLabels = find(expressions, "inject:bean.labels('foo')");
+        assertExpr(expressions, "inject:bean.labels('foo')", 2, "inject:bean.labels('foo')<loop-element>");
+        assertExpr(expressions, "it.value", 2, "it<loop#" + beanLabels.getGeneratedId() + ">.value");
+
+        Expression fooBar = find(expressions, "foo.bar");
         assertExpr(expressions, "foo.bar", 2, "|org.acme.Foo|.bar");
-        assertExpr(expressions, "baz.name", 2, "|org.acme.Foo|.bar.name");
+        assertExpr(expressions, "baz.name", 2, "baz<set#" + fooBar.getGeneratedId() + ">.name");
         assertExpr(expressions, "foo.baz", 2, null);
         assertExpr(expressions, "foo.call(labels,bar)", 2, "|org.acme.Foo|.call(labels,bar)");
+
+        Expression machineStatusExpr = find(expressions, "machine.status");
+        assertExpr(expressions, "OK", 1, "OK<when#" + machineStatusExpr.getGeneratedId() + ">");
     }
 
     @Test
@@ -113,8 +130,14 @@ public void testLines() {
                 + "{#for item in foo.items}\n\n"
                 + "{item.name}"
                 + "{/}");
-        assertEquals(6, find(template.getExpressions(), "foo.items").getOrigin().getLine());
-        assertEquals(8, find(template.getExpressions(), "item.name").getOrigin().getLine());
+        Origin fooItemsOrigin = find(template.getExpressions(), "foo.items").getOrigin();
+        assertEquals(6, fooItemsOrigin.getLine());
+        assertEquals(14, fooItemsOrigin.getLineCharacterStart());
+        assertEquals(24, fooItemsOrigin.getLineCharacterEnd());
+        Origin itemNameOrigin = find(template.getExpressions(), "item.name").getOrigin();
+        assertEquals(8, itemNameOrigin.getLine());
+        assertEquals(1, itemNameOrigin.getLineCharacterStart());
+        assertEquals(11, itemNameOrigin.getLineCharacterEnd());
     }
 
     @Test
@@ -160,16 +183,22 @@ public void testSectionParameters() {
                 "user.loggedIn");
         assertParams("this.get('name') is null", "this.get('name')", "is", "null");
         assertParserError("{#if 'foo is null}{/}",
-                "Parser error on line 1: unterminated string literal or composite parameter detected for [#if 'foo is null]",
+                "Parser error on line 1: unexpected non-text buffer at the end of the template - unterminated string literal: #if 'foo is null}{/}",
                 1);
         assertParserError("{#if (foo || bar}{/}",
                 "Parser error on line 1: unterminated string literal or composite parameter detected for [#if (foo || bar]", 1);
+        assertParams("item.name == 'foo' and item.name is false", "item.name", "==", "'foo'", "and", "item.name", "is",
+                "false");
+        assertParams("(item.name == 'foo') and (item.name is false)", "(item.name == 'foo')", "and", "(item.name is false)");
+        assertParams("(item.name != 'foo') || (item.name == false)", "(item.name != 'foo')", "||", "(item.name == false)");
     }
 
     @Test
     public void testWhitespace() {
         Engine engine = Engine.builder().addDefaults().build();
         assertEquals("Hello world", engine.parse("{#if true  }Hello {name }{/if  }").data("name", "world").render());
+        assertEquals("Hello world", engine.parse("{#if true \n }Hello {name }{/if  }").data("name", "world").render());
+        assertEquals("Hello world", engine.parse("{#if true \n || false}Hello {name }{/if  }").data("name", "world").render());
         assertEquals("Hello world", engine.parse("Hello {name ?: 'world'  }").render());
     }
 
@@ -186,6 +215,11 @@ public void testCdata() {
                 + jsSnippet
                 + "]}").data("name", "world").render());
         assertEquals("Hello world <strong>", engine.parse("Hello {name} {[<strong>]}").data("name", "world").render());
+        assertEquals("Hello world <script>const foo = function(){alert('bar');};</script>", engine.parse("Hello {name} {|"
+                + jsSnippet
+                + "|}").data("name", "world").render());
+        assertEquals("Hello world <strong>", engine.parse("Hello {name} {|<strong>|}").data("name", "world").render());
+        assertEquals("Hello {name} world", engine.parse("Hello{| {name} |}{name}").data("name", "world").render());
     }
 
     @Test
@@ -193,6 +227,7 @@ public void testRemoveStandaloneLines() {
         Engine engine = Engine.builder().addDefaults().removeStandaloneLines(true).build();
         String content = "{@java.lang.String foo}\n" // -> standalone
                 + "\n"
+                + " {! My comment !} \n"
                 + "  {#for i in 5}\n" // -> standalone
                 + "{index}:\n"
                 + "{/} "; // -> standalone
@@ -200,6 +235,136 @@ public void testRemoveStandaloneLines() {
         assertEquals("bar\n", engine.parse("{foo}\n").data("foo", "bar").render());
     }
 
+    @Test
+    public void testValidIdentifiers() {
+        assertTrue(Parser.isValidIdentifier("foo"));
+        assertTrue(Parser.isValidIdentifier("_foo"));
+        assertTrue(Parser.isValidIdentifier("foo$$bar"));
+        assertTrue(Parser.isValidIdentifier("1Foo_$"));
+        assertTrue(Parser.isValidIdentifier("1"));
+        assertTrue(Parser.isValidIdentifier("1?"));
+        assertTrue(Parser.isValidIdentifier("1:"));
+        assertTrue(Parser.isValidIdentifier("-foo"));
+        assertTrue(Parser.isValidIdentifier("foo["));
+        assertTrue(Parser.isValidIdentifier("foo^"));
+        Engine engine = Engine.builder().addDefaults().build();
+        try {
+            engine.parse("{foo\nfoo}");
+            fail();
+        } catch (Exception expected) {
+            assertTrue(expected.getMessage().contains("Invalid identifier found"), expected.toString());
+        }
+    }
+
+    @Test
+    public void testTextNodeCollapse() {
+        TemplateImpl template = (TemplateImpl) Engine.builder().addDefaults().build().parse("Hello\nworld!{foo}next");
+        List<TemplateNode> rootNodes = template.root.blocks.get(0).nodes;
+        assertEquals(3, rootNodes.size());
+        assertEquals("Hello\nworld!", ((TextNode) rootNodes.get(0)).getValue());
+        assertEquals(1, ((ExpressionNode) rootNodes.get(1)).getExpressions().size());
+        assertEquals("next", ((TextNode) rootNodes.get(2)).getValue());
+    }
+
+    @Test
+    public void testGetExpressions() {
+        Template template = Engine.builder().addDefaults().build()
+                .parse("{foo}{#each items}{it.name}{#for foo in foos}{foo.name}{/for}{/each}");
+        List<Expression> expressions = template.getExpressions();
+        assertEquals("foo", expressions.get(0).toOriginalString());
+        assertEquals("items", expressions.get(1).toOriginalString());
+        assertEquals("it.name", expressions.get(2).toOriginalString());
+        assertEquals("foos", expressions.get(3).toOriginalString());
+        assertEquals("foo.name", expressions.get(4).toOriginalString());
+    }
+
+    @Test
+    public void testParserHook() {
+        Template template = Engine.builder().addDefaults().addParserHook(new ParserHook() {
+            @Override
+            public void beforeParsing(ParserHelper parserHelper) {
+                parserHelper.addContentFilter(contents -> contents.replace("bard", "bar"));
+                parserHelper.addContentFilter(contents -> contents.replace("${", "$\\{"));
+            }
+        }).build().parse("${foo}::{bard}");
+        assertEquals("${foo}::true", template.data("bar", true).render());
+    }
+
+    @Test
+    public void testStringLiteralWithTagEndDelimiter() {
+        Engine engine = Engine.builder().addDefaults().addValueResolver(ValueResolver.builder().applyToBaseClass(String.class)
+                .applyToName("lines").resolveSync(ctx -> ctx.getBase().toString().split("\\n")).build()).build();
+        Map<String, String> map = new HashMap<>();
+        map.put("path", "/foo/bar");
+        Template template = engine.parse("{#for line in map.get('{foo}').lines.orEmpty}{line}{/for}");
+        assertEquals("", template.data("map", map).render());
+        template = engine.parse("{#for line in map.get(foo).lines}{line}{/for}");
+        assertEquals("/foo/bar", template.data("map", map, "foo", "path").render());
+
+        assertParserError("{#if map.get(\"{foo})}Bye...{/if}",
+                "Parser error on line 1: unexpected non-text buffer at the end of the template - unterminated string literal: #if map.get(\"{foo})}Bye...{/if}",
+                1);
+    }
+
+    @Test
+    public void testNestedHintValidation() {
+        Engine engine = Engine.builder().addDefaults().addValueResolver(new ReflectionValueResolver()).build();
+        Template loopLetLet = engine.parse("{@org.acme.Foo foo}"
+                + "{#for item in foo.items}"
+                + "{#let names=item.names}"
+                + "{#let size=names.size}"
+                + "{size}"
+                + "{/let}"
+                + "{/let}"
+                + "{/for}");
+        List<Expression> expressions = loopLetLet.getExpressions();
+        assertExpr(expressions, "foo.items", 2, "|org.acme.Foo|.items<loop-element>");
+        Expression itemNames = find(expressions, "item.names");
+        assertExpr(expressions, "names.size", 2, "names<set#" + itemNames.getGeneratedId() + ">.size");
+        Expression namesSize = find(expressions, "names.size");
+        assertExpr(expressions, "size", 1, "size<set#" + namesSize.getGeneratedId() + ">");
+        assertEquals("2", loopLetLet.data("foo", new Foo()).render());
+
+        Template loopLetLoopLet = engine.parse("{@org.acme.Foo foo}"
+                + "{#for item in foo.items}"
+                + "{#let names=item.names}"
+                + "{#for name in names}"
+                + "{#let upperCase=name.toUpperCase}"
+                + ":{upperCase.length}"
+                + "{/let}"
+                + "{/for}"
+                + "{/let}"
+                + "{/for}");
+        expressions = loopLetLoopLet.getExpressions();
+        assertExpr(expressions, "foo.items", 2, "|org.acme.Foo|.items<loop-element>");
+        Expression fooItems = find(expressions, "foo.items");
+        assertExpr(expressions, "item.names", 2, "item<loop#" + fooItems.getGeneratedId() + ">.names");
+        itemNames = find(expressions, "item.names");
+        // Note the 2 hints...
+        assertExpr(expressions, "names", 1, "names<set#" + itemNames.getGeneratedId() + "><loop-element>");
+        Expression names = find(expressions, "names");
+        assertExpr(expressions, "name.toUpperCase", 2, "name<loop#" + names.getGeneratedId() + ">.toUpperCase");
+        Expression nameToUpperCase = find(expressions, "name.toUpperCase");
+        assertExpr(expressions, "upperCase.length", 2, "upperCase<set#" + nameToUpperCase.getGeneratedId() + ">.length");
+        assertEquals(":3:5", loopLetLoopLet.data("foo", new Foo()).render());
+    }
+
+    public static class Foo {
+
+        public List<Item> getItems() {
+            return Collections.singletonList(new Item());
+        }
+
+    }
+
+    public static class Item {
+
+        public List<String> getNames() {
+            return Arrays.asList("foo", "bzink");
+        }
+
+    }
+
     private void assertParserError(String template, String message, int line) {
         Engine engine = Engine.builder().addDefaultSectionHelpers().build();
         try {
@@ -208,19 +373,18 @@ private void assertParserError(String template, String message, int line) {
         } catch (TemplateException expected) {
             assertNotNull(expected.getOrigin());
             assertEquals(line, expected.getOrigin().getLine(), "Wrong line");
-            assertEquals(message,
-                    expected.getMessage());
+            assertEquals(message, expected.getMessage());
         }
     }
 
-    private void assertExpr(Set<Expression> expressions, String value, int parts, String typeInfo) {
+    private void assertExpr(List<Expression> expressions, String value, int parts, String typeInfo) {
         Expression expr = find(expressions, value);
         assertEquals(parts, expr.getParts().size());
         assertEquals(typeInfo,
                 expr.collectTypeInfo());
     }
 
-    private Expression find(Set<Expression> expressions, String val) {
+    private Expression find(List<Expression> expressions, String val) {
         return expressions.stream().filter(e -> e.toOriginalString().equals(val)).findAny().get();
     }
 
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java
new file mode 100644
index 0000000000000..e9223aa693683
--- /dev/null
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ReflectionResolverTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.qute;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Map;
+import java.util.TreeMap;
+import org.junit.jupiter.api.Test;
+
+public class ReflectionResolverTest {
+
+    @Test
+    public void testReflectionResolver() {
+        Map<Integer, String> treeMap = new TreeMap<>(Integer::compare);
+        treeMap.put(2, "bar");
+        treeMap.put(1, "foo");
+        assertEquals("foo", Engine.builder().addDefaults().addValueResolver(new ReflectionValueResolver()).build()
+                .parse("{map.entrySet.iterator.next.value}").data("map", treeMap).render());
+    }
+
+}
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java
index 870fd1787dc03..960b061f9088d 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SetSectionTest.java
@@ -10,14 +10,25 @@ public class SetSectionTest {
     public void testSet() {
         Engine engine = Engine.builder().addDefaults().build();
         assertEquals("NOT_FOUND - true:mix",
-                engine.parse("{foo} - {#set foo=true bar='mix'}{foo}:{bar}{/}").instance().render());
+                engine.parse("{foo} - {#set foo=true bar='mix'}{foo}:{bar}{/}").render());
     }
 
     @Test
     public void testLet() {
         Engine engine = Engine.builder().addDefaults().build();
-        assertEquals("NOT_FOUND - true:mix:what?!",
-                engine.parse("{foo} - {#let foo=true bar='mix'}{foo}:{bar}:{baz}{/}").data("baz", "what?!").render());
+        assertEquals("NOT_FOUND:what?! - true:mix:what?!",
+                engine.parse("{foo}:{baz} - {#let foo=true bar='mix'}{foo}:{bar}:{baz}{/}").data("baz", "what?!").render());
+    }
+
+    @Test
+    public void testLiterals() {
+        Engine engine = Engine.builder().addDefaults().addValueResolver(new ReflectionValueResolver()).build();
+        assertEquals("1::4::Andy::false",
+                engine.parse(
+                        "{#let foo=1 bar='qute' baz=name.or('Andy') alpha=name.ifTruthy('true').or('false')}"
+                                + "{#for i in foo}{count}{/for}::{bar.length}::{baz}::{alpha}"
+                                + "{/let}")
+                        .render());
     }
 
 }
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java
index 4f9a932fbd7c4..f1c8b3154e68b 100644
--- a/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/SimpleTest.java
@@ -52,7 +52,7 @@ public CompletionStage<Object> resolve(EvalContext context) {
 
         }).build();
 
-        Template template = engine.parse("{this.get(0)}");
+        Template template = engine.parse("{get(0)}");
         assertEquals("moon", template.render(ImmutableList.of("moon")));
     }
 
@@ -208,4 +208,22 @@ public String map(Object result, Expression expression) {
             assertEquals("Not found: foo", expected.getMessage());
         }
     }
+
+    @Test
+    public void testConvenientDataMethods() {
+        Engine engine = Engine.builder().addDefaults().build();
+        assertEquals("1:2", engine.parse("{d1}:{d2}").data("d1", 1, "d2", 2).render());
+        assertEquals("1:2:3", engine.parse("{d1}:{d2}:{d3}").data("d1", 1, "d2", 2, "d3", 3).render());
+        assertEquals("1:2:3:4", engine.parse("{d1}:{d2}:{d3}:{d4}").data("d1", 1, "d2", 2, "d3", 3, "d4", 4).render());
+        assertEquals("1:2:3:4:5",
+                engine.parse("{d1}:{d2}:{d3}:{d4}:{d5}").data("d1", 1, "d2", 2, "d3", 3, "d4", 4, "d5", 5).render());
+    }
+
+    @Test
+    public void testOrEmpty() {
+        Engine engine = Engine.builder().addDefaults().build();
+        assertEquals("STARTEND::STARTJackEND",
+                engine.parse("START{#for pet in pets.orEmpty}...{/for}END::START{#for dog in dogs.orEmpty}{dog}{/for}END")
+                        .data("pets", null, "dogs", Collections.singleton("Jack")).render());
+    }
 }
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/State.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/State.java
new file mode 100644
index 0000000000000..c0aee578af965
--- /dev/null
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/State.java
@@ -0,0 +1,10 @@
+package io.quarkus.qute;
+
+enum State {
+
+    ON,
+    OFF,
+    BROKEN,
+    UNKNOWN
+
+}
\ No newline at end of file
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/ValueResolverBuilderTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ValueResolverBuilderTest.java
new file mode 100644
index 0000000000000..7c40f1b522237
--- /dev/null
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/ValueResolverBuilderTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.qute;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.concurrent.CompletableFuture;
+import org.junit.jupiter.api.Test;
+
+public class ValueResolverBuilderTest {
+
+    @Test
+    public void testBuilder() {
+        Engine engine = Engine.builder().addDefaults()
+                .addValueResolver(ValueResolver.builder()
+                        .appliesTo(ec -> ec.getName().equals("foo"))
+                        .resolveSync(ec -> "bar")
+                        .build())
+                .addValueResolver(ValueResolver.builder()
+                        .applyToName("name")
+                        .resolveWith("Spok")
+                        .build())
+                .addValueResolver(ValueResolver.builder()
+                        .applyToName("age")
+                        .resolveWith(1)
+                        .priority(1)
+                        .build())
+                .addValueResolver(ValueResolver.builder()
+                        .applyToName("age")
+                        .resolveWith(10)
+                        .priority(10)
+                        .build())
+                .addValueResolver(ValueResolver.builder()
+                        .applyToBaseClass(String.class)
+                        .applyToName("reverse")
+                        .resolveSync(ec -> new StringBuilder(ec.getBase().toString()).reverse())
+                        .build())
+                .addValueResolver(ValueResolver.builder()
+                        .applyToBaseClass(String.class)
+                        .applyToName("upper")
+                        .applyToNoParameters()
+                        .resolveAsync(ec -> CompletableFuture.completedFuture(ec.getBase().toString().toUpperCase()))
+                        .build())
+                .addValueResolver(ValueResolver.builder()
+                        .applyToBaseClass(String.class)
+                        .applyToName("upper")
+                        .applyToParameters(1)
+                        .resolveAsync(ec -> {
+                            return ec.evaluate(ec.getParams().get(0)).thenApply(r -> {
+                                return ec.getBase().toString().substring((int) r).toUpperCase();
+                            });
+                        })
+                        .build())
+                .build();
+
+        assertEquals("bar", engine.parse("{foo}").render());
+        assertEquals("Spok", engine.parse("{name}").render());
+        assertEquals("10", engine.parse("{age}").render());
+        assertEquals("zab", engine.parse("{val.reverse}").data("val", "baz").render());
+        assertEquals("BAZ", engine.parse("{val.upper}").data("val", "baz").render());
+        assertEquals("AZ", engine.parse("{val.upper(1)}").data("val", "baz").render());
+    }
+
+}
diff --git a/independent-projects/qute/core/src/test/java/io/quarkus/qute/WhenSectionTest.java b/independent-projects/qute/core/src/test/java/io/quarkus/qute/WhenSectionTest.java
new file mode 100644
index 0000000000000..f784f5059dc6c
--- /dev/null
+++ b/independent-projects/qute/core/src/test/java/io/quarkus/qute/WhenSectionTest.java
@@ -0,0 +1,109 @@
+package io.quarkus.qute;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class WhenSectionTest {
+
+    @Test
+    public void testWhen() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#when testVal}"
+                + "{#is 'foo'}"
+                + "Foo"
+                + "{#is 'bar'}"
+                + "Bar"
+                + "{#else}"
+                + "None"
+                + "{/when}");
+        assertEquals("Foo", template.data("testVal", "foo").render());
+        assertEquals("Bar", template.data("testVal", "bar").render());
+        assertEquals("None", template.data("testVal", 1).render());
+    }
+
+    @Test
+    public void testWhenNumber() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#when numVal}"
+                + "{#is in 1 7 9}"
+                + "0:{numVal}"
+                + "{#is > 10}"
+                + "1:{numVal}"
+                + "{#is < 10}"
+                + "2:{numVal}"
+                + "{/when}");
+        assertEquals("0:7", template.data("numVal", 7).render());
+        assertEquals("1:12", template.data("numVal", 12).render());
+        assertEquals("2:3", template.data("numVal", 3).render());
+    }
+
+    @Test
+    public void testSwitch() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template1 = engine.parse("{#switch testVal}{#case 1}1P{#case 2}2P{#else}0P{/switch}");
+        assertEquals("2P", template1.data("testVal", 2).render());
+        assertEquals("1P", template1.data("testVal", 1).render());
+        assertEquals("0P", template1.data("testVal", 20).render());
+    }
+
+    @Test
+    public void testSwitchEnum() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#switch state}{#case ON}1{#case OFF}0{#case BROKEN}-1{#else}none{/switch}");
+        assertEquals("1", template.data("state", State.ON).render());
+        assertEquals("0", template.data("state", State.OFF).render());
+        assertEquals("-1", template.data("state", State.BROKEN).render());
+        assertEquals("none", template.data("state", State.UNKNOWN).render());
+        assertEquals("none", template.data("state", null).render());
+    }
+
+    @Test
+    public void testWhenEnum() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#when state}{#is in ON OFF}valid{#case BROKEN}invalid{#else}none{/when}");
+        assertEquals("valid", template.data("state", State.ON).render());
+        assertEquals("valid", template.data("state", State.OFF).render());
+        assertEquals("invalid", template.data("state", State.BROKEN).render());
+        assertEquals("none", template.data("state", State.UNKNOWN).render());
+        assertEquals("none", template.data("state", null).render());
+    }
+
+    @Test
+    public void testWhenNot() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template template = engine.parse("{#when testVal}"
+                + "{#is not 'foo'}"
+                + "Not a Foo"
+                + "{#else}"
+                + "Foo"
+                + "{/when}");
+        assertEquals("Not a Foo", template.data("testVal", 1).render());
+        assertEquals("Not a Foo", template.data("testVal", "fooo").render());
+        assertEquals("Foo", template.data("testVal", "foo").render());
+    }
+
+    @Test
+    public void testInNotIn() {
+        Engine engine = Engine.builder().addDefaults().build();
+        Template templateIn = engine.parse("{#when testVal}"
+                + "{#is in 'foo' itemName 'bar'}"
+                + "In!"
+                + "{#else}"
+                + "Not in!"
+                + "{/when}");
+        assertEquals("In!", templateIn.data("testVal", "foo").data("itemName", null).render());
+        assertEquals("In!", templateIn.data("testVal", "baz").data("itemName", "baz").render());
+        assertEquals("Not in!", templateIn.data("testVal", "never").data("itemName", null).render());
+        Template templateNotIn = engine.parse("{#when testVal}"
+                + "{#is !in 'foo' itemName 'bar'}"
+                + "Not in!"
+                + "{#else}"
+                + "In!"
+                + "{/when}");
+        assertEquals("Not in!", templateNotIn.data("testVal", "foos").data("itemName", null).render());
+        assertEquals("Not in!", templateNotIn.data("testVal", "bazz").data("itemName", "baz").render());
+        assertEquals("In!", templateNotIn.data("testVal", "baz").data("itemName", "baz").render());
+    }
+
+}
diff --git a/independent-projects/qute/generator/pom.xml b/independent-projects/qute/generator/pom.xml
index 57edddb4aab5a..113e3850ba46b 100644
--- a/independent-projects/qute/generator/pom.xml
+++ b/independent-projects/qute/generator/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus.qute</groupId>
         <artifactId>qute-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>qute-generator</artifactId>
diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java
index 26a5a58c32b0b..5825f422767d4 100644
--- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java
+++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/Descriptors.java
@@ -12,6 +12,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public final class Descriptors {
 
@@ -27,6 +29,8 @@ private Descriptors() {
     public static final MethodDescriptor GET_NAME = MethodDescriptor.ofMethod(EvalContext.class, "getName", String.class);
     public static final MethodDescriptor GET_BASE = MethodDescriptor.ofMethod(EvalContext.class, "getBase", Object.class);
     public static final MethodDescriptor GET_PARAMS = MethodDescriptor.ofMethod(EvalContext.class, "getParams", List.class);
+    public static final MethodDescriptor GET_ATTRIBUTE = MethodDescriptor.ofMethod(EvalContext.class, "getAttribute",
+            Object.class, String.class);
     public static final MethodDescriptor EVALUATE = MethodDescriptor.ofMethod(EvalContext.class, "evaluate",
             CompletionStage.class, Expression.class);
     static final MethodDescriptor LIST_GET = MethodDescriptor.ofMethod(List.class, "get", Object.class, int.class);
@@ -57,6 +61,16 @@ private Descriptors() {
             "evaluate",
             EvaluatedParams.class,
             EvalContext.class);
+    public static final MethodDescriptor EVALUATED_PARAMS_EVALUATE_MESSAGE_KEY = MethodDescriptor.ofMethod(
+            EvaluatedParams.class,
+            "evaluateMessageKey",
+            EvaluatedParams.class,
+            EvalContext.class);
+    public static final MethodDescriptor EVALUATED_PARAMS_EVALUATE_MESSAGE_PARAMS = MethodDescriptor.ofMethod(
+            EvaluatedParams.class,
+            "evaluateMessageParams",
+            EvaluatedParams.class,
+            EvalContext.class);
     public static final MethodDescriptor EVALUATED_PARAMS_GET_RESULT = MethodDescriptor.ofMethod(EvaluatedParams.class,
             "getResult",
             Object.class,
@@ -66,6 +80,12 @@ private Descriptors() {
     static final MethodDescriptor EVALUATED_PARAMS_GET_VARARGS_RESULTS = MethodDescriptor.ofMethod(EvaluatedParams.class,
             "getVarargsResults", Object.class, int.class,
             Class.class);
+    public static final MethodDescriptor PATTERN_COMPILE = MethodDescriptor.ofMethod(Pattern.class, "compile", Pattern.class,
+            String.class);
+    public static final MethodDescriptor PATTERN_MATCHER = MethodDescriptor.ofMethod(Pattern.class, "matcher", Matcher.class,
+            CharSequence.class);
+    public static final MethodDescriptor MATCHER_MATCHES = MethodDescriptor.ofMethod(Matcher.class, "matches", boolean.class);
+    public static final MethodDescriptor OBJECT_CONSTRUCTOR = MethodDescriptor.ofConstructor(Object.class);
 
     public static final FieldDescriptor RESULTS_NOT_FOUND = FieldDescriptor.of(Results.class, "NOT_FOUND",
             CompletionStage.class);
diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java
new file mode 100644
index 0000000000000..61df03a094cf0
--- /dev/null
+++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/DotNames.java
@@ -0,0 +1,20 @@
+package io.quarkus.qute.generator;
+
+import java.util.concurrent.CompletionStage;
+import org.jboss.jandex.DotName;
+
+final class DotNames {
+
+    static final DotName BOOLEAN = DotName.createSimple(Boolean.class.getName());
+    static final DotName BYTE = DotName.createSimple(Byte.class.getName());
+    static final DotName CHARACTER = DotName.createSimple(Character.class.getName());
+    static final DotName DOUBLE = DotName.createSimple(Double.class.getName());
+    static final DotName FLOAT = DotName.createSimple(Float.class.getName());
+    static final DotName INTEGER = DotName.createSimple(Integer.class.getName());
+    static final DotName LONG = DotName.createSimple(Long.class.getName());
+    static final DotName SHORT = DotName.createSimple(Short.class.getName());
+    static final DotName STRING = DotName.createSimple(String.class.getName());
+    static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
+    static final DotName OBJECT = DotName.createSimple(Object.class.getName());
+
+}
diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java
index 6a6f71d0f3b14..e7a2a7e428949 100644
--- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java
+++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ExtensionMethodGenerator.java
@@ -3,6 +3,8 @@
 import static io.quarkus.qute.generator.ValueResolverGenerator.generatedNameFromTarget;
 import static io.quarkus.qute.generator.ValueResolverGenerator.packageName;
 import static io.quarkus.qute.generator.ValueResolverGenerator.simpleName;
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 
 import io.quarkus.gizmo.AssignableResultHandle;
@@ -11,6 +13,7 @@
 import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.FunctionCreator;
 import io.quarkus.gizmo.MethodCreator;
 import io.quarkus.gizmo.MethodDescriptor;
@@ -18,24 +21,33 @@
 import io.quarkus.gizmo.TryBlock;
 import io.quarkus.qute.EvalContext;
 import io.quarkus.qute.EvaluatedParams;
+import io.quarkus.qute.NamespaceResolver;
+import io.quarkus.qute.TemplateException;
 import io.quarkus.qute.TemplateExtension;
 import io.quarkus.qute.ValueResolver;
 import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
+import java.util.regex.Pattern;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.PrimitiveType.Primitive;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.Type.Kind;
 
@@ -43,21 +55,27 @@
  * Generates value resolvers for static extension methods.
  * 
  * @see ValueResolver
+ * @see NamespaceResolver
  */
 public class ExtensionMethodGenerator {
 
     public static final DotName TEMPLATE_EXTENSION = DotName.createSimple(TemplateExtension.class.getName());
-    static final DotName STRING = DotName.createSimple(String.class.getName());
-
+    public static final DotName TEMPLATE_ATTRIBUTE = DotName.createSimple(TemplateExtension.TemplateAttribute.class.getName());
     public static final String SUFFIX = "_Extension" + ValueResolverGenerator.SUFFIX;
+    public static final String NAMESPACE_SUFFIX = "_Namespace" + SUFFIX;
 
-    private static final String MATCH_NAME = "matchName";
-    private static final String PRIORITY = "priority";
+    public static final String MATCH_NAME = "matchName";
+    public static final String MATCH_REGEX = "matchRegex";
+    public static final String PRIORITY = "priority";
+    public static final String NAMESPACE = "namespace";
+    public static final String PATTERN = "pattern";
 
     private final Set<String> generatedTypes;
     private final ClassOutput classOutput;
+    private final IndexView index;
 
-    public ExtensionMethodGenerator(ClassOutput classOutput) {
+    public ExtensionMethodGenerator(IndexView index, ClassOutput classOutput) {
+        this.index = index;
         this.classOutput = classOutput;
         this.generatedTypes = new HashSet<>();
     }
@@ -66,24 +84,30 @@ public Set<String> getGeneratedTypes() {
         return generatedTypes;
     }
 
-    public static void validate(MethodInfo method) {
+    public static void validate(MethodInfo method, String namespace) {
         if (!Modifier.isStatic(method.flags())) {
-            throw new IllegalStateException("Template extension method must be static: " + method);
+            throw new IllegalStateException(
+                    "Template extension method declared on " + method.declaringClass().name() + "  must be static: " + method);
         }
         if (method.returnType().kind() == Kind.VOID) {
-            throw new IllegalStateException("Template extension method must not return void: " + method);
+            throw new IllegalStateException("Template extension method declared on " + method.declaringClass().name()
+                    + " must not return void: " + method);
         }
-        if (method.parameters().isEmpty()) {
-            throw new IllegalStateException("Template extension method must declare at least one parameter: " + method);
+        if (Modifier.isPrivate(method.flags())) {
+            throw new IllegalStateException("Template extension method declared on " + method.declaringClass().name()
+                    + " must not be private: " + method);
         }
     }
 
-    public void generate(MethodInfo method, String matchName, Integer priority) {
+    public void generate(MethodInfo method, String matchName, String matchRegex, Integer priority) {
+
+        AnnotationInstance extensionAnnotation = method.annotation(TEMPLATE_EXTENSION);
+        List<Type> parameters = method.parameters();
 
         // Validate the method first
-        validate(method);
+        // NOTE: this method is never used for namespace extension methods
+        validate(method, null);
         ClassInfo declaringClass = method.declaringClass();
-        AnnotationInstance extensionAnnotation = method.annotation(TEMPLATE_EXTENSION);
 
         if (matchName == null && extensionAnnotation != null) {
             // No explicit name defined, try annotation
@@ -95,15 +119,6 @@ public void generate(MethodInfo method, String matchName, Integer priority) {
         if (matchName == null || matchName.equals(TemplateExtension.METHOD_NAME)) {
             matchName = method.name();
         }
-        List<Type> parameters = method.parameters();
-        if (matchName.equals(TemplateExtension.ANY)) {
-            // Special constant used - the second parameter must be a string
-            if (parameters.size() < 2 || !parameters.get(1).name().equals(STRING)) {
-                throw new IllegalStateException(
-                        "Template extension method matching multiple names must declare at least two parameters and the second parameter must be string: "
-                                + method);
-            }
-        }
 
         if (priority == null && extensionAnnotation != null) {
             // No explicit priority set, try annotation
@@ -116,6 +131,22 @@ public void generate(MethodInfo method, String matchName, Integer priority) {
             priority = TemplateExtension.DEFAULT_PRIORITY;
         }
 
+        if (matchRegex == null && extensionAnnotation != null) {
+            AnnotationValue matchRegexValue = extensionAnnotation.value(MATCH_REGEX);
+            if (matchRegexValue != null) {
+                matchRegex = matchRegexValue.asString();
+            }
+        }
+
+        if (matchRegex != null || matchName.equals(TemplateExtension.ANY)) {
+            // A string parameter is needed to match the name
+            if (parameters.size() < 2 || !parameters.get(1).name().equals(DotNames.STRING)) {
+                throw new TemplateException(
+                        "A template extension method matching multiple names or a regular expression must declare at least two parameters and the second parameter must be string: "
+                                + method);
+            }
+        }
+
         String baseName;
         if (declaringClass.enclosingClass() != null) {
             baseName = simpleName(declaringClass.enclosingClass()) + ValueResolverGenerator.NESTED_SEPARATOR
@@ -132,83 +163,124 @@ public void generate(MethodInfo method, String matchName, Integer priority) {
         ClassCreator valueResolver = ClassCreator.builder().classOutput(classOutput).className(generatedName)
                 .interfaces(ValueResolver.class).build();
 
+        FieldDescriptor patternField = null;
+        if (matchRegex != null && !matchRegex.isEmpty()) {
+            patternField = valueResolver.getFieldCreator(PATTERN, Pattern.class)
+                    .setModifiers(ACC_PRIVATE | ACC_FINAL).getFieldDescriptor();
+            MethodCreator constructor = valueResolver.getMethodCreator("<init>", "V");
+            // Invoke super()
+            constructor.invokeSpecialMethod(Descriptors.OBJECT_CONSTRUCTOR, constructor.getThis());
+            // Compile the regex pattern
+            constructor.writeInstanceField(patternField, constructor.getThis(),
+                    constructor.invokeStaticMethod(Descriptors.PATTERN_COMPILE, constructor.load(matchRegex)));
+            constructor.returnValue(null);
+        }
+
         implementGetPriority(valueResolver, priority);
-        implementAppliesTo(valueResolver, method, matchName);
-        implementResolve(valueResolver, declaringClass, method, matchName);
+
+        Parameters params = new Parameters(method, patternField != null || matchName.equals(TemplateExtension.ANY), false);
+        implementAppliesTo(valueResolver, method, matchName, patternField, params);
+        implementResolve(valueResolver, declaringClass, method, matchName, patternField, params);
 
         valueResolver.close();
     }
 
+    public NamespaceResolverCreator createNamespaceResolver(ClassInfo declaringClass, String namespace) {
+        return new NamespaceResolverCreator(declaringClass, namespace);
+    }
+
+    private void implementGetNamespace(ClassCreator namespaceResolver, String namespace) {
+        MethodCreator getNamespace = namespaceResolver.getMethodCreator("getNamespace", String.class)
+                .setModifiers(ACC_PUBLIC);
+        getNamespace.returnValue(getNamespace.load(namespace));
+    }
+
     private void implementGetPriority(ClassCreator valueResolver, int priority) {
         MethodCreator getPriority = valueResolver.getMethodCreator("getPriority", int.class)
                 .setModifiers(ACC_PUBLIC);
         getPriority.returnValue(getPriority.load(priority));
     }
 
-    private void implementResolve(ClassCreator valueResolver, ClassInfo declaringClass, MethodInfo method, String matchName) {
+    private void implementResolve(ClassCreator valueResolver, ClassInfo declaringClass, MethodInfo method, String matchName,
+            FieldDescriptor patternField, Parameters params) {
         MethodCreator resolve = valueResolver.getMethodCreator("resolve", CompletionStage.class, EvalContext.class)
                 .setModifiers(ACC_PUBLIC);
 
         ResultHandle evalContext = resolve.getMethodParam(0);
         ResultHandle base = resolve.invokeInterfaceMethod(Descriptors.GET_BASE, evalContext);
-        boolean matchAny = matchName.equals(TemplateExtension.ANY);
-        List<Type> parameters = method.parameters();
+        boolean matchAnyOrRegex = patternField != null || matchName.equals(TemplateExtension.ANY);
+        boolean returnsCompletionStage = method.returnType().kind() != Kind.PRIMITIVE && ValueResolverGenerator
+                .hasCompletionStageInTypeClosure(index.getClassByName(method.returnType().name()), index);
 
         ResultHandle ret;
-        int paramSize = parameters.size();
-        if (paramSize == 1 || (paramSize == 2 && matchAny)) {
-            ResultHandle[] args = new ResultHandle[paramSize];
-            args[0] = base;
-            if (matchAny) {
-                args[1] = resolve.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
+        if (!params.needsEvaluation()) {
+            // No parameter needs to be evaluated
+            ResultHandle[] args = new ResultHandle[params.size()];
+            for (int i = 0; i < params.size(); i++) {
+                Param param = params.get(i);
+                if (param.kind == ParamKind.BASE) {
+                    args[i] = base;
+                } else if (param.kind == ParamKind.NAME) {
+                    args[i] = resolve.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
+                } else if (param.kind == ParamKind.ATTR) {
+                    args[i] = resolve.invokeInterfaceMethod(Descriptors.GET_ATTRIBUTE, evalContext, resolve.load(param.name));
+                }
             }
-            ret = resolve.invokeStaticMethod(Descriptors.COMPLETED_FUTURE, resolve
+            // Invoke the extension method
+            ResultHandle result = resolve
                     .invokeStaticMethod(MethodDescriptor.ofMethod(declaringClass.name().toString(), method.name(),
                             method.returnType().name().toString(),
-                            parameters.stream().map(p -> p.name().toString()).collect(Collectors.toList()).toArray()),
-                            args));
+                            params.parameterTypesAsStringArray()),
+                            args);
+            if (returnsCompletionStage) {
+                ret = result;
+            } else {
+                ret = resolve.invokeStaticMethod(Descriptors.COMPLETED_FUTURE, result);
+            }
         } else {
             ret = resolve
                     .newInstance(MethodDescriptor.ofConstructor(CompletableFuture.class));
-            // The real number of evaluated params, i.e. skip the base object and name if matchAny==true
-            int realParamSize = paramSize - (matchAny ? 2 : 1);
-
             // Evaluate params first
             ResultHandle name = resolve.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
             // The CompletionStage upon which we invoke whenComplete()
-            ResultHandle evaluatedParams = resolve.invokeStaticMethod(Descriptors.EVALUATED_PARAMS_EVALUATE,
+            ResultHandle evaluatedParamsHandle = resolve.invokeStaticMethod(Descriptors.EVALUATED_PARAMS_EVALUATE,
                     evalContext);
-            ResultHandle paramsReady = resolve.readInstanceField(Descriptors.EVALUATED_PARAMS_STAGE,
-                    evaluatedParams);
+            ResultHandle paramsReadyHandle = resolve.readInstanceField(Descriptors.EVALUATED_PARAMS_STAGE,
+                    evaluatedParamsHandle);
 
             // Function that is called when params are evaluated
             FunctionCreator whenCompleteFun = resolve.createFunction(BiConsumer.class);
-            resolve.invokeInterfaceMethod(Descriptors.CF_WHEN_COMPLETE, paramsReady, whenCompleteFun.getInstance());
+            resolve.invokeInterfaceMethod(Descriptors.CF_WHEN_COMPLETE, paramsReadyHandle, whenCompleteFun.getInstance());
             BytecodeCreator whenComplete = whenCompleteFun.getBytecode();
             AssignableResultHandle whenBase = whenComplete.createVariable(Object.class);
             whenComplete.assign(whenBase, base);
             AssignableResultHandle whenName = null;
-            if (matchAny) {
+            if (matchAnyOrRegex) {
                 whenName = whenComplete.createVariable(String.class);
                 whenComplete.assign(whenName, name);
             }
             AssignableResultHandle whenRet = whenComplete.createVariable(CompletableFuture.class);
             whenComplete.assign(whenRet, ret);
             AssignableResultHandle whenEvaluatedParams = whenComplete.createVariable(EvaluatedParams.class);
-            whenComplete.assign(whenEvaluatedParams, evaluatedParams);
+            whenComplete.assign(whenEvaluatedParams, evaluatedParamsHandle);
+            AssignableResultHandle whenEvalContext = null;
+            if (params.getFirst(ParamKind.ATTR) != null) {
+                whenEvalContext = whenComplete.createVariable(EvalContext.class);
+                whenComplete.assign(whenEvalContext, evalContext);
+            }
 
             BranchResult throwableIsNull = whenComplete.ifNull(whenComplete.getMethodParam(1));
-
             BytecodeCreator success = throwableIsNull.trueBranch();
+            boolean isVarArgs = ValueResolverGenerator.isVarArgs(method);
 
             // Check type parameters and return NO_RESULT if failed
-            ResultHandle paramTypesHandle = success.newArray(Class.class, realParamSize);
+            List<Param> evaluated = params.evaluated();
+            ResultHandle paramTypesHandle = success.newArray(Class.class, evaluated.size());
             int idx = 0;
-            for (Type parameterType : parameters.subList(paramSize - realParamSize, paramSize)) {
+            for (Param p : evaluated) {
                 success.writeArrayValue(paramTypesHandle, idx++,
-                        ValueResolverGenerator.loadParamType(success, parameterType));
+                        ValueResolverGenerator.loadParamType(success, p.type));
             }
-            boolean isVarArgs = ValueResolverGenerator.isVarArgs(method);
             BytecodeCreator typeMatchFailed = success
                     .ifNonZero(success.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_PARAM_TYPES_MATCH,
                             whenEvaluatedParams, success.load(isVarArgs), paramTypesHandle))
@@ -225,43 +297,41 @@ private void implementResolve(ClassCreator valueResolver, ClassInfo declaringCla
             exception.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE_EXCEPTIONALLY, whenRet,
                     exception.getCaughtException());
 
-            // Collect the params:
-            // 0 - matched base object
-            // 1 - name, if matching any name
-            // n -1 - adapted arg for varargs methods
-            ResultHandle[] args = new ResultHandle[paramSize];
-            int shift = 1;
-            args[0] = whenBase;
-            if (matchAny) {
-                args[1] = whenName;
-                shift++;
-            }
-            if (isVarArgs) {
-                // For varargs the number of results may be higher than the number of method params
-                // First get the regular params
-                for (int i = 0; i < realParamSize - 1; i++) {
-                    ResultHandle resultHandle = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_RESULT,
-                            whenEvaluatedParams, tryCatch.load(i));
-                    args[i + shift] = resultHandle;
-                }
-                // Then we need to create an array for the last argument
-                Type varargsParam = parameters.get(paramSize - 1);
-                ResultHandle componentType = tryCatch.loadClass(varargsParam.asArrayType().component().name().toString());
-                ResultHandle varargsResults = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS,
-                        evaluatedParams, tryCatch.load(realParamSize), componentType);
-                args[realParamSize] = varargsResults;
-            } else {
-                for (int i = 0; i < realParamSize; i++) {
-                    args[i + shift] = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_RESULT,
-                            evaluatedParams,
-                            tryCatch.load(i));
+            // Collect the params
+            ResultHandle[] args = new ResultHandle[params.size()];
+            int evalIdx = 0;
+            int lastIdx = params.size() - 1;
+            for (int i = 0; i < params.size(); i++) {
+                Param param = params.get(i);
+                if (param.kind == ParamKind.BASE) {
+                    args[i] = whenBase;
+                } else if (param.kind == ParamKind.NAME) {
+                    args[i] = whenName;
+                } else if (param.kind == ParamKind.ATTR) {
+                    args[i] = tryCatch.invokeInterfaceMethod(Descriptors.GET_ATTRIBUTE, whenEvalContext,
+                            tryCatch.load(param.name));
+                } else {
+                    if (isVarArgs && i == lastIdx) {
+                        // Last param is varargs
+                        Type varargsParam = params.get(lastIdx).type;
+                        ResultHandle componentType = tryCatch
+                                .loadClass(varargsParam.asArrayType().component().name().toString());
+                        ResultHandle varargsResults = tryCatch.invokeVirtualMethod(
+                                Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS,
+                                evaluatedParamsHandle, tryCatch.load(evaluated.size()), componentType);
+                        args[i] = varargsResults;
+                    } else {
+                        args[i] = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_RESULT,
+                                whenEvaluatedParams, tryCatch.load(evalIdx++));
+                    }
                 }
             }
 
+            // Invoke the extension method
             ResultHandle invokeRet = tryCatch
                     .invokeStaticMethod(MethodDescriptor.ofMethod(declaringClass.name().toString(), method.name(),
                             method.returnType().name().toString(),
-                            method.parameters().stream().map(p -> p.name().toString()).collect(Collectors.toList()).toArray()),
+                            params.parameterTypesAsStringArray()),
                             args);
             tryCatch.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE, whenRet, invokeRet);
 
@@ -274,14 +344,13 @@ private void implementResolve(ClassCreator valueResolver, ClassInfo declaringCla
         resolve.returnValue(ret);
     }
 
-    private void implementAppliesTo(ClassCreator valueResolver, MethodInfo method, String matchName) {
+    private void implementAppliesTo(ClassCreator valueResolver, MethodInfo method, String matchName,
+            FieldDescriptor patternField, Parameters params) {
         MethodCreator appliesTo = valueResolver.getMethodCreator("appliesTo", boolean.class, EvalContext.class)
                 .setModifiers(ACC_PUBLIC);
 
-        List<Type> parameters = method.parameters();
-        boolean matchAny = matchName.equals(TemplateExtension.ANY);
+        boolean matchAny = patternField == null && matchName.equals(TemplateExtension.ANY);
         boolean isVarArgs = ValueResolverGenerator.isVarArgs(method);
-        int realParamSize = parameters.size() - (matchAny ? 2 : 1);
         ResultHandle evalContext = appliesTo.getMethodParam(0);
         ResultHandle base = appliesTo.invokeInterfaceMethod(Descriptors.GET_BASE, evalContext);
         ResultHandle name = appliesTo.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
@@ -290,7 +359,8 @@ private void implementAppliesTo(ClassCreator valueResolver, MethodInfo method, S
 
         // Test base object class
         ResultHandle baseClass = appliesTo.invokeVirtualMethod(Descriptors.GET_CLASS, base);
-        ResultHandle testClass = appliesTo.loadClass(parameters.get(0).name().toString());
+        // Perform autoboxing for primitives
+        ResultHandle testClass = appliesTo.loadClass(box(params.getFirst(ParamKind.BASE).type).name().toString());
         ResultHandle baseClassTest = appliesTo.invokeVirtualMethod(Descriptors.IS_ASSIGNABLE_FROM, testClass,
                 baseClass);
         BytecodeCreator baseNotAssignable = appliesTo.ifTrue(baseClassTest).falseBranch();
@@ -298,22 +368,35 @@ private void implementAppliesTo(ClassCreator valueResolver, MethodInfo method, S
 
         // Test property name
         if (!matchAny) {
-            ResultHandle nameTest = appliesTo.invokeVirtualMethod(Descriptors.EQUALS, name,
-                    appliesTo.load(matchName));
-            BytecodeCreator nameNotMatched = appliesTo.ifTrue(nameTest).falseBranch();
-            nameNotMatched.returnValue(nameNotMatched.load(false));
+            if (patternField != null) {
+                // if (!pattern.matcher(value).match()) {
+                //   return false;
+                // }
+                ResultHandle pattern = appliesTo.readInstanceField(patternField, appliesTo.getThis());
+                ResultHandle matcher = appliesTo.invokeVirtualMethod(Descriptors.PATTERN_MATCHER, pattern, name);
+                BytecodeCreator nameNotMatched = appliesTo
+                        .ifFalse(appliesTo.invokeVirtualMethod(Descriptors.MATCHER_MATCHES, matcher)).trueBranch();
+                nameNotMatched.returnValue(appliesTo.load(false));
+            } else {
+                ResultHandle nameTest = appliesTo.invokeVirtualMethod(Descriptors.EQUALS, name,
+                        appliesTo.load(matchName));
+                BytecodeCreator nameNotMatched = appliesTo.ifTrue(nameTest).falseBranch();
+                nameNotMatched.returnValue(nameNotMatched.load(false));
+            }
         }
 
         // Test number of parameters
-        if (!isVarArgs || realParamSize > 1) {
-            ResultHandle params = appliesTo.invokeInterfaceMethod(Descriptors.GET_PARAMS, evalContext);
-            ResultHandle paramsCount = appliesTo.invokeInterfaceMethod(Descriptors.COLLECTION_SIZE, params);
+        int evaluatedParamsSize = params.evaluated().size();
+        if (!isVarArgs || evaluatedParamsSize > 1) {
+            ResultHandle paramsHandle = appliesTo.invokeInterfaceMethod(Descriptors.GET_PARAMS, evalContext);
+            ResultHandle paramsCount = appliesTo.invokeInterfaceMethod(Descriptors.COLLECTION_SIZE, paramsHandle);
             BytecodeCreator paramsNotMatching;
             if (isVarArgs) {
                 // For varargs methods match the minimal number of params
-                paramsNotMatching = appliesTo.ifIntegerGreaterThan(appliesTo.load(realParamSize - 1), paramsCount).trueBranch();
+                paramsNotMatching = appliesTo.ifIntegerGreaterThan(appliesTo.load(evaluatedParamsSize - 1), paramsCount)
+                        .trueBranch();
             } else {
-                paramsNotMatching = appliesTo.ifIntegerEqual(appliesTo.load(realParamSize), paramsCount).falseBranch();
+                paramsNotMatching = appliesTo.ifIntegerEqual(appliesTo.load(evaluatedParamsSize), paramsCount).falseBranch();
             }
             paramsNotMatching.returnValue(paramsNotMatching.load(false));
         }
@@ -321,6 +404,233 @@ private void implementAppliesTo(ClassCreator valueResolver, MethodInfo method, S
         appliesTo.returnValue(appliesTo.load(true));
     }
 
+    public class NamespaceResolverCreator implements AutoCloseable {
+
+        private final ClassCreator namespaceResolver;
+
+        public NamespaceResolverCreator(ClassInfo declaringClass, String namespace) {
+            String baseName;
+            if (declaringClass.enclosingClass() != null) {
+                baseName = simpleName(declaringClass.enclosingClass()) + ValueResolverGenerator.NESTED_SEPARATOR
+                        + simpleName(declaringClass);
+            } else {
+                baseName = simpleName(declaringClass);
+            }
+            String targetPackage = packageName(declaringClass.name());
+
+            String suffix = NAMESPACE_SUFFIX + sha1(namespace);
+            String generatedName = generatedNameFromTarget(targetPackage, baseName, suffix);
+            generatedTypes.add(generatedName.replace('/', '.'));
+
+            this.namespaceResolver = ClassCreator.builder().classOutput(classOutput).className(generatedName)
+                    .interfaces(NamespaceResolver.class).build();
+
+            implementGetNamespace(namespaceResolver, namespace);
+        }
+
+        public ResolveCreator implementResolve() {
+            return new ResolveCreator();
+        }
+
+        @Override
+        public void close() {
+            namespaceResolver.close();
+        }
+
+        public class ResolveCreator implements AutoCloseable {
+
+            private final MethodCreator resolve;
+            private final MethodCreator constructor;
+            private final ResultHandle evalContext;
+            private final ResultHandle name;
+            private final ResultHandle paramsHandle;
+            private final ResultHandle paramsCount;
+
+            public ResolveCreator() {
+                this.resolve = namespaceResolver.getMethodCreator("resolve", CompletionStage.class, EvalContext.class)
+                        .setModifiers(ACC_PUBLIC);
+                this.evalContext = resolve.getMethodParam(0);
+                this.name = resolve.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
+                this.paramsHandle = resolve.invokeInterfaceMethod(Descriptors.GET_PARAMS, evalContext);
+                this.paramsCount = resolve.invokeInterfaceMethod(Descriptors.COLLECTION_SIZE, paramsHandle);
+                this.constructor = namespaceResolver.getMethodCreator("<init>", "V");
+                // Invoke super()
+                this.constructor.invokeSpecialMethod(Descriptors.OBJECT_CONSTRUCTOR, constructor.getThis());
+            }
+
+            public void addMethod(MethodInfo method, String matchName, String matchRegex) {
+                FieldDescriptor patternField = null;
+                if (matchRegex != null && !matchRegex.isEmpty()) {
+                    patternField = namespaceResolver.getFieldCreator(PATTERN + "_" + sha1(method.toString()), Pattern.class)
+                            .setModifiers(ACC_PRIVATE | ACC_FINAL).getFieldDescriptor();
+                    constructor.writeInstanceField(patternField, constructor.getThis(),
+                            constructor.invokeStaticMethod(Descriptors.PATTERN_COMPILE, constructor.load(matchRegex)));
+                }
+
+                boolean matchAnyOrRegex = patternField != null || matchName.equals(TemplateExtension.ANY);
+                Parameters params = new Parameters(method, matchAnyOrRegex, true);
+
+                BytecodeCreator matchScope = createNamespaceExtensionMatchScope(resolve, method, params.evaluated().size(),
+                        matchName,
+                        patternField, name,
+                        paramsHandle, paramsCount);
+
+                if (!params.needsEvaluation()) {
+                    ResultHandle[] args = new ResultHandle[params.size()];
+                    for (int i = 0; i < params.size(); i++) {
+                        Param param = params.get(i);
+                        if (param.kind == ParamKind.NAME) {
+                            args[i] = name;
+                        } else if (param.kind == ParamKind.ATTR) {
+                            args[i] = matchScope.invokeInterfaceMethod(Descriptors.GET_ATTRIBUTE, evalContext,
+                                    matchScope.load(param.name));
+                        }
+                    }
+                    matchScope.returnValue(matchScope.invokeStaticMethod(Descriptors.COMPLETED_FUTURE,
+                            matchScope.invokeStaticMethod(MethodDescriptor.of(method), args)));
+                } else {
+                    ResultHandle ret = matchScope.newInstance(MethodDescriptor.ofConstructor(CompletableFuture.class));
+
+                    // Evaluate params first
+                    // The CompletionStage upon which we invoke whenComplete()
+                    ResultHandle evaluatedParamsHandle = matchScope.invokeStaticMethod(Descriptors.EVALUATED_PARAMS_EVALUATE,
+                            evalContext);
+                    ResultHandle paramsReadyHandle = matchScope.readInstanceField(Descriptors.EVALUATED_PARAMS_STAGE,
+                            evaluatedParamsHandle);
+
+                    // Function that is called when params are evaluated
+                    FunctionCreator whenCompleteFun = matchScope.createFunction(BiConsumer.class);
+                    matchScope.invokeInterfaceMethod(Descriptors.CF_WHEN_COMPLETE, paramsReadyHandle,
+                            whenCompleteFun.getInstance());
+                    BytecodeCreator whenComplete = whenCompleteFun.getBytecode();
+                    AssignableResultHandle whenName = null;
+                    if (matchAnyOrRegex) {
+                        whenName = whenComplete.createVariable(String.class);
+                        whenComplete.assign(whenName, name);
+                    }
+                    AssignableResultHandle whenRet = whenComplete.createVariable(CompletableFuture.class);
+                    whenComplete.assign(whenRet, ret);
+                    AssignableResultHandle whenEvaluatedParams = whenComplete.createVariable(EvaluatedParams.class);
+                    whenComplete.assign(whenEvaluatedParams, evaluatedParamsHandle);
+                    AssignableResultHandle whenEvalContext = null;
+                    if (params.getFirst(ParamKind.ATTR) != null) {
+                        whenEvalContext = whenComplete.createVariable(EvalContext.class);
+                        whenComplete.assign(whenEvalContext, evalContext);
+                    }
+
+                    BranchResult throwableIsNull = whenComplete.ifNull(whenComplete.getMethodParam(1));
+                    BytecodeCreator success = throwableIsNull.trueBranch();
+                    boolean isVarArgs = ValueResolverGenerator.isVarArgs(method);
+
+                    // Check type parameters and return NO_RESULT if failed
+                    List<Param> evaluated = params.evaluated();
+                    ResultHandle paramTypesHandle = success.newArray(Class.class, evaluated.size());
+                    int idx = 0;
+                    for (Param p : evaluated) {
+                        success.writeArrayValue(paramTypesHandle, idx++,
+                                ValueResolverGenerator.loadParamType(success, p.type));
+                    }
+                    BytecodeCreator typeMatchFailed = success
+                            .ifTrue(success.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_PARAM_TYPES_MATCH,
+                                    whenEvaluatedParams, success.load(isVarArgs), paramTypesHandle))
+                            .falseBranch();
+                    typeMatchFailed.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE, whenRet,
+                            typeMatchFailed.readStaticField(Descriptors.RESULT_NOT_FOUND));
+                    typeMatchFailed.returnValue(null);
+
+                    // try
+                    TryBlock tryCatch = success.tryBlock();
+                    // catch (Throwable e)
+                    CatchBlockCreator exception = tryCatch.addCatch(Throwable.class);
+                    // CompletableFuture.completeExceptionally(Throwable)
+                    exception.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE_EXCEPTIONALLY, whenRet,
+                            exception.getCaughtException());
+
+                    // Collect the params
+                    ResultHandle[] args = new ResultHandle[params.size()];
+                    int evalIdx = 0;
+                    int lastIdx = params.size() - 1;
+                    for (int i = 0; i < params.size(); i++) {
+                        Param param = params.get(i);
+                        if (param.kind == ParamKind.NAME) {
+                            args[i] = whenName;
+                        } else if (param.kind == ParamKind.ATTR) {
+                            args[i] = tryCatch.invokeInterfaceMethod(Descriptors.GET_ATTRIBUTE, whenEvalContext,
+                                    tryCatch.load(param.name));
+                        } else {
+                            if (isVarArgs && i == lastIdx) {
+                                // Last param is varargs
+                                Type varargsParam = params.get(lastIdx).type;
+                                ResultHandle componentType = tryCatch
+                                        .loadClass(varargsParam.asArrayType().component().name().toString());
+                                ResultHandle varargsResults = tryCatch.invokeVirtualMethod(
+                                        Descriptors.EVALUATED_PARAMS_GET_VARARGS_RESULTS,
+                                        whenEvaluatedParams, tryCatch.load(evaluated.size()), componentType);
+                                args[i] = varargsResults;
+                            } else {
+                                args[i] = tryCatch.invokeVirtualMethod(Descriptors.EVALUATED_PARAMS_GET_RESULT,
+                                        whenEvaluatedParams, tryCatch.load(evalIdx++));
+                            }
+                        }
+                    }
+
+                    ResultHandle invokeRet = tryCatch.invokeStaticMethod(MethodDescriptor.of(method), args);
+                    tryCatch.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE, whenRet, invokeRet);
+
+                    BytecodeCreator failure = throwableIsNull.falseBranch();
+                    failure.invokeVirtualMethod(Descriptors.COMPLETABLE_FUTURE_COMPLETE_EXCEPTIONALLY, whenRet,
+                            whenComplete.getMethodParam(1));
+                    whenComplete.returnValue(null);
+
+                    matchScope.returnValue(ret);
+                }
+            }
+
+            @Override
+            public void close() {
+                constructor.returnValue(null);
+                resolve.returnValue(resolve.readStaticField(Descriptors.RESULTS_NOT_FOUND));
+            }
+
+        }
+
+    }
+
+    private BytecodeCreator createNamespaceExtensionMatchScope(BytecodeCreator bytecodeCreator, MethodInfo method,
+            int realParamSize, String matchName, FieldDescriptor patternField, ResultHandle name, ResultHandle params,
+            ResultHandle paramsCount) {
+
+        boolean matchAny = patternField == null && matchName.equals(TemplateExtension.ANY);
+        boolean isVarArgs = ValueResolverGenerator.isVarArgs(method);
+
+        BytecodeCreator matchScope = bytecodeCreator.createScope();
+        // Test property name
+        if (!matchAny) {
+            if (patternField != null) {
+                ResultHandle pattern = matchScope.readInstanceField(patternField, matchScope.getThis());
+                ResultHandle matcher = matchScope.invokeVirtualMethod(Descriptors.PATTERN_MATCHER, pattern, name);
+                matchScope.ifFalse(matchScope.invokeVirtualMethod(Descriptors.MATCHER_MATCHES, matcher)).trueBranch()
+                        .breakScope(matchScope);
+            } else {
+                matchScope.ifTrue(matchScope.invokeVirtualMethod(Descriptors.EQUALS,
+                        matchScope.load(matchName),
+                        name))
+                        .falseBranch().breakScope(matchScope);
+            }
+        }
+        // Test number of parameters
+        if (!isVarArgs || realParamSize > 1) {
+            if (isVarArgs) {
+                // For varargs methods match the minimal number of params
+                matchScope.ifIntegerLessEqual(matchScope.load(realParamSize - 1), paramsCount).falseBranch()
+                        .breakScope(matchScope);
+            } else {
+                matchScope.ifIntegerEqual(matchScope.load(realParamSize), paramsCount).falseBranch().breakScope(matchScope);
+            }
+        }
+        return matchScope;
+    }
+
     static String sha1(String value) {
         try {
             MessageDigest md = MessageDigest.getInstance("SHA-1");
@@ -335,4 +645,188 @@ static String sha1(String value) {
         }
     }
 
+    static Type box(Type type) {
+        if (type.kind() == Kind.PRIMITIVE) {
+            return box(type.asPrimitiveType().primitive());
+        }
+        return type;
+    }
+
+    static Type box(Primitive primitive) {
+        switch (primitive) {
+            case BOOLEAN:
+                return Type.create(DotNames.BOOLEAN, Kind.CLASS);
+            case DOUBLE:
+                return Type.create(DotNames.DOUBLE, Kind.CLASS);
+            case FLOAT:
+                return Type.create(DotNames.FLOAT, Kind.CLASS);
+            case LONG:
+                return Type.create(DotNames.LONG, Kind.CLASS);
+            case INT:
+                return Type.create(DotNames.INTEGER, Kind.CLASS);
+            case BYTE:
+                return Type.create(DotNames.BYTE, Kind.CLASS);
+            case CHAR:
+                return Type.create(DotNames.CHARACTER, Kind.CLASS);
+            case SHORT:
+                return Type.create(DotNames.SHORT, Kind.CLASS);
+            default:
+                throw new IllegalArgumentException("Unsupported primitive: " + primitive);
+        }
+    }
+
+    static class Parameters implements Iterable<Param> {
+
+        final List<Param> params;
+
+        Parameters(MethodInfo method, boolean matchAnyOrRegex, boolean hasNamespace) {
+            List<Type> parameters = method.parameters();
+            Map<Integer, String> attributeParamNames = new HashMap<>();
+            for (AnnotationInstance annotation : method.annotations()) {
+                if (annotation.target().kind() == org.jboss.jandex.AnnotationTarget.Kind.METHOD_PARAMETER
+                        && annotation.name().equals(TEMPLATE_ATTRIBUTE)) {
+                    AnnotationValue value = annotation.value();
+                    int position = (int) annotation.target().asMethodParameter().position();
+                    String name = value != null ? value.asString() : method.parameterName(position);
+                    if (name == null) {
+                        throw new TemplateException("Parameter names not recorded for " + method.declaringClass().name()
+                                + ": compile the class with -parameters");
+                    }
+                    attributeParamNames.put(position, name);
+                }
+            }
+            List<Param> params = new ArrayList<>(parameters.size());
+            int indexed = 0;
+            for (int i = 0; i < parameters.size(); i++) {
+                if (attributeParamNames.containsKey(i)) {
+                    params.add(new Param(attributeParamNames.get(i), parameters.get(i), i, ParamKind.ATTR));
+                } else if (indexed == 0) {
+                    indexed++;
+                    if (hasNamespace) {
+                        // Namespace and matches any or regex - first indexed param is the name
+                        if (matchAnyOrRegex) {
+                            params.add(new Param(method.parameterName(i), parameters.get(i), i, ParamKind.NAME));
+                        } else {
+                            params.add(new Param(method.parameterName(i), parameters.get(i), i, ParamKind.EVAL));
+                        }
+                    } else {
+                        // No namespace but matches any or regex
+                        params.add(new Param(method.parameterName(i), parameters.get(i), i, ParamKind.BASE));
+                    }
+                } else if (indexed == 1 && !hasNamespace && matchAnyOrRegex) {
+                    indexed++;
+                    params.add(new Param(method.parameterName(i), parameters.get(i), i, ParamKind.NAME));
+                } else {
+                    indexed++;
+                    params.add(new Param(method.parameterName(i), parameters.get(i), i, ParamKind.EVAL));
+                }
+            }
+            this.params = params;
+
+            if (matchAnyOrRegex) {
+                Param nameParam = getFirst(ParamKind.NAME);
+                if (nameParam == null || !nameParam.type.name().equals(DotNames.STRING)) {
+                    throw new IllegalStateException(
+                            "Template extension method declared on " + method.declaringClass().name()
+                                    + " must accept at least one string parameter to match the name: " + method);
+                }
+            }
+            if (!hasNamespace && getFirst(ParamKind.BASE) == null) {
+                throw new IllegalStateException(
+                        "Template extension method declared on " + method.declaringClass().name()
+                                + " must accept at least one parameter to match the base object: " + method);
+            }
+
+            for (Param param : params) {
+                if (param.kind == ParamKind.ATTR && !param.type.name().equals(DotNames.OBJECT)) {
+                    throw new IllegalStateException(
+                            "Template extension method parameter annotated with @TemplateAttribute declared on "
+                                    + method.declaringClass().name()
+                                    + " must be of type java.lang.Object: " + method);
+                }
+            }
+        }
+
+        String[] parameterTypesAsStringArray() {
+            String[] types = new String[params.size()];
+            for (int i = 0; i < params.size(); i++) {
+                types[i] = params.get(i).type.name().toString();
+            }
+            return types;
+        }
+
+        Param getFirst(ParamKind kind) {
+            for (Param param : params) {
+                if (param.kind == kind) {
+                    return param;
+                }
+            }
+            return null;
+        }
+
+        Param get(int index) {
+            return params.get(index);
+        }
+
+        int size() {
+            return params.size();
+        }
+
+        boolean needsEvaluation() {
+            for (Param param : params) {
+                if (param.kind == ParamKind.EVAL) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        List<Param> evaluated() {
+            if (params.isEmpty()) {
+                return Collections.emptyList();
+            }
+            List<Param> evaluated = new ArrayList<>();
+            for (Param param : params) {
+                if (param.kind == ParamKind.EVAL) {
+                    evaluated.add(param);
+                }
+            }
+            return evaluated;
+        }
+
+        @Override
+        public Iterator<Param> iterator() {
+            return params.iterator();
+        }
+
+    }
+
+    static class Param {
+
+        final String name;
+        final Type type;
+        final int position;
+        final ParamKind kind;
+
+        public Param(String name, Type type, int position, ParamKind paramKind) {
+            this.name = name;
+            this.type = type;
+            this.position = position;
+            this.kind = paramKind;
+        }
+
+        @Override
+        public String toString() {
+            return "Param [name=" + name + ", type=" + type + ", position=" + position + ", kind=" + kind + "]";
+        }
+
+    }
+
+    enum ParamKind {
+        BASE,
+        NAME,
+        ATTR,
+        EVAL
+    }
+
 }
diff --git a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
index 480fa6b62abba..99286d98c69f1 100644
--- a/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
+++ b/independent-projects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
@@ -8,6 +8,7 @@
 import io.quarkus.gizmo.CatchBlockCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.DescriptorUtils;
 import io.quarkus.gizmo.FieldDescriptor;
 import io.quarkus.gizmo.FunctionCreator;
 import io.quarkus.gizmo.MethodCreator;
@@ -22,9 +23,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -33,6 +34,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -45,6 +47,7 @@
 import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.PrimitiveType;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
 
@@ -62,66 +65,116 @@ public static Builder builder() {
     public static final DotName TEMPLATE_DATA = DotName.createSimple(TemplateData.class.getName());
     public static final DotName TEMPLATE_DATA_CONTAINER = DotName.createSimple(TemplateData.Container.class.getName());
 
-    private static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
-    private static final DotName OBJECT = DotName.createSimple(Object.class.getName());
-
     public static final String SUFFIX = "_ValueResolver";
     public static final String NESTED_SEPARATOR = "$_";
 
     private static final Logger LOGGER = Logger.getLogger(ValueResolverGenerator.class);
 
-    private static final String GET_PREFIX = "get";
-    private static final String IS_PREFIX = "is";
+    public static final String GET_PREFIX = "get";
+    public static final String IS_PREFIX = "is";
+    public static final String HAS_PREFIX = "has";
 
+    public static final String TARGET = "target";
     public static final String IGNORE_SUPERCLASSES = "ignoreSuperclasses";
     public static final String IGNORE = "ignore";
     public static final String PROPERTIES = "properties";
 
     public static final int DEFAULT_PRIORITY = 10;
 
-    private final Set<String> analyzedTypes;
     private final Set<String> generatedTypes;
     private final IndexView index;
     private final ClassOutput classOutput;
-    private final Map<DotName, AnnotationInstance> uncontrolled;
+    private final Map<DotName, ClassInfo> nameToClass;
+    private final Map<DotName, AnnotationInstance> nameToTemplateData;
 
-    /**
-     * 
-     * @param index
-     * @param classOutput
-     * @param uncontrolled The map of {@link TemplateData} metadata for classes that are not controlled by the client
-     */
-    ValueResolverGenerator(IndexView index, ClassOutput classOutput, Map<DotName, AnnotationInstance> uncontrolled) {
-        this.analyzedTypes = new HashSet<>();
+    private Function<ClassInfo, Function<FieldInfo, String>> forceGettersFunction;
+
+    ValueResolverGenerator(IndexView index, ClassOutput classOutput, Map<DotName, ClassInfo> nameToClass,
+            Map<DotName, AnnotationInstance> nameToTemplateData,
+            Function<ClassInfo, Function<FieldInfo, String>> forceGettersFunction) {
         this.generatedTypes = new HashSet<>();
         this.classOutput = classOutput;
         this.index = index;
-        this.uncontrolled = uncontrolled != null ? uncontrolled : Collections.emptyMap();
+        this.nameToClass = new HashMap<>(nameToClass);
+        this.nameToTemplateData = new HashMap<>(nameToTemplateData);
+        this.forceGettersFunction = forceGettersFunction;
     }
 
     public Set<String> getGeneratedTypes() {
         return generatedTypes;
     }
 
-    public Set<String> getAnalyzedTypes() {
-        return analyzedTypes;
-    }
+    /**
+     * Generate value resolvers for all classes added via {@link Builder#addClass(ClassInfo, AnnotationInstance)}.
+     */
+    public void generate() {
+
+        // Map superclasses to direct subclasses
+        // Foo extends Baz, Bar extends Baz = Baz -> Foo, Bar
+        Map<DotName, Set<DotName>> superToSub = new HashMap<>();
+        for (Entry<DotName, ClassInfo> entry : nameToClass.entrySet()) {
+            DotName superName = entry.getValue().superName();
+            if (superName != null && !DotNames.OBJECT.equals(superName)) {
+                superToSub.computeIfAbsent(superName, name -> new HashSet<>()).add(entry.getKey());
+            }
+        }
 
-    public void generate(ClassInfo clazz) {
-        Objects.requireNonNull(clazz);
-        String clazzName = clazz.name().toString();
-        if (analyzedTypes.contains(clazzName)) {
-            return;
+        // We do not expect more than 10 levels...
+        int priority = DEFAULT_PRIORITY;
+        // Remaining classes to process
+        Map<DotName, ClassInfo> remaining = new HashMap<>(this.nameToClass);
+
+        while (!remaining.isEmpty()) {
+            // Generate resolvers for classes not extended in the current set
+            Map<DotName, Set<DotName>> superToSubRemovals = new HashMap<>();
+            for (Iterator<Entry<DotName, ClassInfo>> it = remaining.entrySet().iterator(); it.hasNext();) {
+                Entry<DotName, ClassInfo> entry = it.next();
+                if (!superToSub.containsKey(entry.getKey())) {
+                    // Generate the resolver
+                    generate(entry.getKey(), priority);
+                    // Queue a class removal
+                    DotName superName = entry.getValue().superName();
+                    if (superName != null && !DotNames.OBJECT.equals(superName)) {
+                        superToSubRemovals.computeIfAbsent(superName, name -> new HashSet<>()).add(entry.getKey());
+                    }
+                    // Remove the processed binding
+                    it.remove();
+                }
+            }
+            // Remove the processed classes from the map
+            for (Entry<DotName, Set<DotName>> entry : superToSubRemovals.entrySet()) {
+                Set<DotName> subs = superToSub.get(entry.getKey());
+                if (subs != null) {
+                    subs.removeAll(entry.getValue());
+                    if (subs.isEmpty()) {
+                        superToSub.remove(entry.getKey());
+                    }
+                }
+            }
+            // Lower the priority for extended classes
+            priority--;
         }
-        analyzedTypes.add(clazzName);
+    }
+
+    private void generate(DotName className, int priority) {
+
+        ClassInfo clazz = nameToClass.get(className);
+        String clazzName = className.toString();
         boolean ignoreSuperclasses = false;
 
-        // @TemplateData declared on class takes precedence
-        AnnotationInstance templateData = clazz.classAnnotation(TEMPLATE_DATA);
+        AnnotationInstance templateData = nameToTemplateData.get(className);
         if (templateData == null) {
-            // Try to find @TemplateData declared on other classes
-            templateData = uncontrolled.get(clazz.name());
-        } else {
+            // @TemplateData declared on the class
+            for (AnnotationInstance annotation : clazz.classAnnotations()) {
+                if (annotation.name().equals(TEMPLATE_DATA)) {
+                    AnnotationValue targetValue = annotation.value(TARGET);
+                    if (targetValue == null || targetValue.asClass().name().equals(className)) {
+                        templateData = annotation;
+                    }
+                }
+            }
+        }
+        if (templateData != null) {
             AnnotationValue ignoreSuperclassesValue = templateData.value(IGNORE_SUPERCLASSES);
             if (ignoreSuperclassesValue != null) {
                 ignoreSuperclasses = ignoreSuperclassesValue.asBoolean();
@@ -145,31 +198,21 @@ public void generate(ClassInfo clazz) {
         ClassCreator valueResolver = ClassCreator.builder().classOutput(classOutput).className(generatedName)
                 .interfaces(ValueResolver.class).build();
 
-        implementGetPriority(valueResolver);
+        implementGetPriority(valueResolver, priority);
         implementAppliesTo(valueResolver, clazz);
-        implementResolve(valueResolver, clazzName, clazz, filters);
+        implementResolve(valueResolver, clazzName, clazz, filters, ignoreSuperclasses);
 
         valueResolver.close();
-
-        DotName superName = clazz.superName();
-        if (!ignoreSuperclasses && (superName != null && !superName.equals(OBJECT))) {
-            ClassInfo superClass = index.getClassByName(clazz.superClassType().name());
-            if (superClass != null) {
-                generate(superClass);
-            } else {
-                LOGGER.warnf("Skipping super class %s - not found in the index", clazz.superClassType());
-            }
-        }
     }
 
-    private void implementGetPriority(ClassCreator valueResolver) {
+    private void implementGetPriority(ClassCreator valueResolver, int priority) {
         MethodCreator getPriority = valueResolver.getMethodCreator("getPriority", int.class)
                 .setModifiers(ACC_PUBLIC);
-        getPriority.returnValue(getPriority.load(DEFAULT_PRIORITY));
+        getPriority.returnValue(getPriority.load(priority));
     }
 
     private void implementResolve(ClassCreator valueResolver, String clazzName, ClassInfo clazz,
-            Predicate<AnnotationTarget> filter) {
+            Predicate<AnnotationTarget> filter, boolean ignoreSuperclasses) {
         MethodCreator resolve = valueResolver.getMethodCreator("resolve", CompletionStage.class, EvalContext.class)
                 .setModifiers(ACC_PUBLIC);
 
@@ -178,46 +221,82 @@ private void implementResolve(ClassCreator valueResolver, String clazzName, Clas
         ResultHandle name = resolve.invokeInterfaceMethod(Descriptors.GET_NAME, evalContext);
         ResultHandle params = resolve.invokeInterfaceMethod(Descriptors.GET_PARAMS, evalContext);
         ResultHandle paramsCount = resolve.invokeInterfaceMethod(Descriptors.COLLECTION_SIZE, params);
+        Function<FieldInfo, String> fieldToGetterFun = forceGettersFunction != null ? forceGettersFunction.apply(clazz) : null;
+
+        // First collect and sort methods (getters must come before is/has properties, etc.)
+        List<MethodKey> methods = clazz.methods().stream().filter(filter::test).map(MethodKey::new).sorted()
+                .collect(Collectors.toList());
+        if (!ignoreSuperclasses) {
+            DotName superName = clazz.superName();
+            while (superName != null && !superName.equals(DotNames.OBJECT)) {
+                ClassInfo superClass = index.getClassByName(superName);
+                if (superClass != null) {
+                    methods.addAll(
+                            superClass.methods().stream().filter(filter::test).map(MethodKey::new).collect(Collectors.toSet()));
+                    superName = superClass.superName();
+                } else {
+                    superName = null;
+                    LOGGER.warnf("Skipping super class %s - not found in the index", clazz.superClassType());
+                }
+            }
+        }
 
-        // Fields
         List<FieldInfo> fields = clazz.fields().stream().filter(filter::test).collect(Collectors.toList());
         if (!fields.isEmpty()) {
             BytecodeCreator zeroParamsBranch = resolve.ifNonZero(paramsCount).falseBranch();
             for (FieldInfo field : fields) {
-                LOGGER.debugf("Field added: %s", field);
-                // Match field name
-                BytecodeCreator fieldMatch = zeroParamsBranch
-                        .ifNonZero(
-                                zeroParamsBranch.invokeVirtualMethod(Descriptors.EQUALS,
-                                        resolve.load(field.name()), name))
-                        .trueBranch();
-                ResultHandle value;
-                if (Modifier.isStatic(field.flags())) {
-                    value = fieldMatch
-                            .readStaticField(FieldDescriptor.of(clazzName, field.name(), field.type().name().toString()));
+                String getterName = fieldToGetterFun != null ? fieldToGetterFun.apply(field) : null;
+                if (getterName != null && noneMethodMatches(methods, getterName)) {
+                    LOGGER.debugf("Forced getter added: %s", field);
+                    BytecodeCreator getterMatch = zeroParamsBranch.createScope();
+                    // Match the getter name
+                    BytecodeCreator notMatched = getterMatch.ifNonZero(getterMatch.invokeVirtualMethod(Descriptors.EQUALS,
+                            getterMatch.load(getterName),
+                            name))
+                            .falseBranch();
+                    // Match the property name
+                    notMatched.ifNonZero(notMatched.invokeVirtualMethod(Descriptors.EQUALS,
+                            notMatched.load(field.name()),
+                            name)).falseBranch().breakScope(getterMatch);
+                    ResultHandle value = getterMatch.invokeVirtualMethod(
+                            MethodDescriptor.ofMethod(clazz.name().toString(), getterName,
+                                    DescriptorUtils.typeToString(field.type())),
+                            base);
+                    getterMatch.returnValue(getterMatch.invokeStaticMethod(Descriptors.COMPLETED_FUTURE, value));
                 } else {
-                    value = fieldMatch
-                            .readInstanceField(FieldDescriptor.of(clazzName, field.name(), field.type().name().toString()),
-                                    base);
+                    LOGGER.debugf("Field added: %s", field);
+                    // Match field name
+                    BytecodeCreator fieldMatch = zeroParamsBranch
+                            .ifNonZero(
+                                    zeroParamsBranch.invokeVirtualMethod(Descriptors.EQUALS,
+                                            resolve.load(field.name()), name))
+                            .trueBranch();
+                    ResultHandle value;
+                    if (Modifier.isStatic(field.flags())) {
+                        value = fieldMatch
+                                .readStaticField(FieldDescriptor.of(clazzName, field.name(), field.type().name().toString()));
+                    } else {
+                        value = fieldMatch
+                                .readInstanceField(FieldDescriptor.of(clazzName, field.name(), field.type().name().toString()),
+                                        base);
+                    }
+                    fieldMatch.returnValue(fieldMatch.invokeStaticMethod(Descriptors.COMPLETED_FUTURE, value));
                 }
-                fieldMatch.returnValue(fieldMatch.invokeStaticMethod(Descriptors.COMPLETED_FUTURE, value));
             }
         }
 
-        List<MethodInfo> methods = clazz.methods().stream().filter(filter::test).collect(Collectors.toList());
         if (!methods.isEmpty()) {
-
             // name, number of params -> list of methods
             Map<Match, List<MethodInfo>> matches = new HashMap<>();
             Map<Match, List<MethodInfo>> varargsMatches = new HashMap<>();
 
-            for (MethodInfo method : methods) {
-
+            for (MethodKey methodKey : methods) {
+                MethodInfo method = methodKey.method;
                 List<Type> methodParams = method.parameters();
                 if (methodParams.isEmpty()) {
                     // No params - just invoke the method
                     LOGGER.debugf("Method added %s", method);
-                    try (BytecodeCreator matchScope = createMatchScope(resolve, method.name(), 0, name,
+                    try (BytecodeCreator matchScope = createMatchScope(resolve, method.name(), 0, method.returnType(), name,
                             params, paramsCount)) {
                         ResultHandle ret;
                         boolean hasCompletionStage = !skipMemberType(method.returnType())
@@ -304,7 +383,8 @@ private void matchMethod(MethodInfo method, ClassInfo clazz, MethodCreator resol
 
         LOGGER.debugf("Method added %s", method);
 
-        BytecodeCreator matchScope = createMatchScope(resolve, method.name(), methodParams.size(), name, params,
+        BytecodeCreator matchScope = createMatchScope(resolve, method.name(), methodParams.size(), method.returnType(), name,
+                params,
                 paramsCount);
 
         // Invoke the method
@@ -420,7 +500,7 @@ private void matchMethods(String matchName, int matchParamsCount, Collection<Met
             ResultHandle evalContext) {
 
         LOGGER.debugf("Methods added %s", methods);
-        BytecodeCreator matchScope = createMatchScope(resolve, matchName, matchParamsCount,
+        BytecodeCreator matchScope = createMatchScope(resolve, matchName, matchParamsCount, null,
                 name, params,
                 paramsCount);
         ResultHandle ret = matchScope
@@ -587,7 +667,7 @@ static ResultHandle loadParamType(BytecodeCreator creator, Type paramType) {
     }
 
     private BytecodeCreator createMatchScope(BytecodeCreator bytecodeCreator, String methodName, int methodParams,
-            ResultHandle name, ResultHandle params, ResultHandle paramsCount) {
+            Type returnType, ResultHandle name, ResultHandle params, ResultHandle paramsCount) {
 
         BytecodeCreator matchScope = bytecodeCreator.createScope();
         // Match name
@@ -596,7 +676,7 @@ private BytecodeCreator createMatchScope(BytecodeCreator bytecodeCreator, String
                 name))
                 .falseBranch();
         // Match the property name for getters,  ie. "foo" for "getFoo"
-        if (methodParams == 0 && isGetterName(methodName)) {
+        if (methodParams == 0 && isGetterName(methodName, returnType)) {
             notMatched.ifNonZero(notMatched.invokeVirtualMethod(Descriptors.EQUALS,
                     notMatched.load(getPropertyName(methodName)),
                     name)).falseBranch().breakScope(matchScope);
@@ -606,7 +686,6 @@ private BytecodeCreator createMatchScope(BytecodeCreator bytecodeCreator, String
         // Match number of params
         if (methodParams >= 0) {
             matchScope.ifIntegerEqual(matchScope.load(methodParams), paramsCount).falseBranch().breakScope(matchScope);
-
         }
         return matchScope;
     }
@@ -633,7 +712,9 @@ public static class Builder {
 
         private IndexView index;
         private ClassOutput classOutput;
-        private Map<DotName, AnnotationInstance> uncontrolled;
+        private final Map<DotName, ClassInfo> nameToClass = new HashMap<>();
+        private final Map<DotName, AnnotationInstance> nameToTemplateData = new HashMap<>();
+        private Function<ClassInfo, Function<FieldInfo, String>> forceGettersFunction;
 
         public Builder setIndex(IndexView index) {
             this.index = index;
@@ -645,13 +726,36 @@ public Builder setClassOutput(ClassOutput classOutput) {
             return this;
         }
 
-        public Builder setUncontrolled(Map<DotName, AnnotationInstance> uncontrolled) {
-            this.uncontrolled = uncontrolled;
+        /**
+         * The function returns:
+         * <ul>
+         * <li>a function that returns the getter name for a specific field or {@code null} if getter should not be forced for
+         * the given field</li>
+         * <li>{@code null} if getters are not forced for the given class</li>
+         * </ul>
+         * 
+         * @param forceGettersFunction
+         * @return self
+         */
+        public Builder setForceGettersFunction(Function<ClassInfo, Function<FieldInfo, String>> forceGettersFunction) {
+            this.forceGettersFunction = forceGettersFunction;
+            return this;
+        }
+
+        public Builder addClass(ClassInfo clazz) {
+            return addClass(clazz, null);
+        }
+
+        public Builder addClass(ClassInfo clazz, AnnotationInstance templateData) {
+            this.nameToClass.put(clazz.name(), clazz);
+            if (templateData != null) {
+                this.nameToTemplateData.put(clazz.name(), templateData);
+            }
             return this;
         }
 
         public ValueResolverGenerator build() {
-            return new ValueResolverGenerator(index, classOutput, uncontrolled);
+            return new ValueResolverGenerator(index, classOutput, nameToClass, nameToTemplateData, forceGettersFunction);
         }
 
     }
@@ -714,7 +818,7 @@ static boolean defaultFilter(AnnotationTarget target) {
                         && !method.name().equals("<clinit>");
             case FIELD:
                 FieldInfo field = target.asField();
-                return Modifier.isPublic(field.flags()) && !Modifier.isStatic(field.flags());
+                return Modifier.isPublic(field.flags()) && !Modifier.isStatic(field.flags()) && !isSynthetic(field.flags());
             default:
                 throw new IllegalArgumentException("Unsupported annotation target");
         }
@@ -724,17 +828,27 @@ public static boolean isSynthetic(int mod) {
         return (mod & 0x00001000) != 0;
     }
 
-    static boolean isGetterName(String name) {
-        return name.startsWith(GET_PREFIX) || name.startsWith(IS_PREFIX);
+    static boolean isGetterName(String name, Type returnType) {
+        if (name.startsWith(GET_PREFIX)) {
+            return true;
+        }
+        if (returnType == null
+                || (returnType.name().equals(PrimitiveType.BOOLEAN.name()) || returnType.name().equals(DotNames.BOOLEAN))) {
+            return name.startsWith(IS_PREFIX) || name.startsWith(HAS_PREFIX);
+        }
+        return false;
     }
 
     public static String getPropertyName(String methodName) {
+        String propertyName = methodName;
         if (methodName.startsWith(GET_PREFIX)) {
-            return decapitalize(methodName.substring(GET_PREFIX.length(), methodName.length()));
+            propertyName = methodName.substring(GET_PREFIX.length(), methodName.length());
         } else if (methodName.startsWith(IS_PREFIX)) {
-            return decapitalize(methodName.substring(IS_PREFIX.length(), methodName.length()));
+            propertyName = methodName.substring(IS_PREFIX.length(), methodName.length());
+        } else if (methodName.startsWith(HAS_PREFIX)) {
+            propertyName = methodName.substring(HAS_PREFIX.length(), methodName.length());
         }
-        return methodName;
+        return decapitalize(propertyName);
     }
 
     static String decapitalize(String name) {
@@ -750,6 +864,18 @@ static String decapitalize(String name) {
         return new String(chars);
     }
 
+    public static String capitalize(String name) {
+        if (name == null || name.length() == 0) {
+            return name;
+        }
+        if (Character.isUpperCase(name.charAt(0))) {
+            return name;
+        }
+        char chars[] = name.toCharArray();
+        chars[0] = Character.toUpperCase(chars[0]);
+        return new String(chars);
+    }
+
     /**
      * 
      * @param clazz
@@ -807,14 +933,28 @@ static String generatedNameFromTarget(String targetPackage, String baseName, Str
         }
     }
 
-    static boolean hasCompletionStageInTypeClosure(ClassInfo classInfo,
+    private static boolean noneMethodMatches(List<MethodKey> methods, String name) {
+        for (MethodKey method : methods) {
+            if (method.name.equals(name)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean hasCompletionStageInTypeClosure(ClassInfo classInfo,
+            IndexView index) {
+        return hasClassInTypeClosure(classInfo, DotNames.COMPLETION_STAGE, index);
+    }
+
+    public static boolean hasClassInTypeClosure(ClassInfo classInfo, DotName className,
             IndexView index) {
 
         if (classInfo == null) {
             // TODO cannot perform analysis
             return false;
         }
-        if (classInfo.name().equals(COMPLETION_STAGE)) {
+        if (classInfo.name().equals(className)) {
             return true;
         }
         // Interfaces
@@ -827,7 +967,7 @@ static boolean hasCompletionStageInTypeClosure(ClassInfo classInfo,
         // Superclass
         if (classInfo.superClassType() != null) {
             ClassInfo superClassInfo = index.getClassByName(classInfo.superName());
-            if (superClassInfo != null && hasCompletionStageInTypeClosure(superClassInfo, index)) {
+            if (superClassInfo != null && hasClassInTypeClosure(superClassInfo, className, index)) {
                 return true;
             }
         }
@@ -870,4 +1010,73 @@ public boolean equals(Object obj) {
 
     }
 
+    static class MethodKey implements Comparable<MethodKey> {
+
+        final String name;
+        final List<DotName> params;
+        final MethodInfo method;
+
+        public MethodKey(MethodInfo method) {
+            this.method = method;
+            this.name = method.name();
+            this.params = new ArrayList<>();
+            for (Type i : method.parameters()) {
+                params.add(i.name());
+            }
+        }
+
+        public MethodInfo getMethod() {
+            return method;
+        }
+
+        @Override
+        public int compareTo(MethodKey other) {
+            // compare the name, then number of params and param type names 
+            int res = name.compareTo(other.name);
+            if (res == 0) {
+                res = Integer.compare(params.size(), other.params.size());
+                if (res == 0) {
+                    for (int i = 0; i < params.size(); i++) {
+                        res = params.get(i).compareTo(other.params.get(i));
+                        if (res != 0) {
+                            break;
+                        }
+                    }
+                }
+            }
+            return res;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((name == null) ? 0 : name.hashCode());
+            result = prime * result + ((params == null) ? 0 : params.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (!(obj instanceof MethodKey)) {
+                return false;
+            }
+            MethodKey other = (MethodKey) obj;
+            if (!name.equals(other.name)) {
+                return false;
+            }
+            if (!params.equals(other.params)) {
+                return false;
+            }
+            return true;
+        }
+
+    }
+
 }
diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/TestEvalContext.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/TestEvalContext.java
index a14bfe34dba33..9deeb6e977238 100644
--- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/TestEvalContext.java
+++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/TestEvalContext.java
@@ -17,7 +17,7 @@ public TestEvalContext(Object base, String name,
             Function<Expression, CompletionStage<Object>> evaluate, String... params) {
         this.base = base;
         this.name = name;
-        this.params = Arrays.stream(params).map(p -> Parser.parseExpression(p, Scope.EMPTY, null))
+        this.params = Arrays.stream(params).map(p -> Parser.parseExpression(() -> -1, p, Scope.EMPTY, null))
                 .collect(Collectors.toList());
         this.evaluate = evaluate;
     }
@@ -39,7 +39,7 @@ public List<Expression> getParams() {
 
     @Override
     public CompletionStage<Object> evaluate(String expression) {
-        return evaluate(Parser.parseExpression(expression, Scope.EMPTY, null));
+        return evaluate(Parser.parseExpression(() -> -1, expression, Scope.EMPTY, null));
     }
 
     @Override
diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java
new file mode 100644
index 0000000000000..2f84a6eec683b
--- /dev/null
+++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MethodKeyTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.qute.generator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.quarkus.qute.generator.ValueResolverGenerator.MethodKey;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.PrimitiveType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.junit.jupiter.api.Test;
+
+public class MethodKeyTest {
+
+    @Test
+    public void testSorting() throws IOException {
+        IndexView index = SimpleGeneratorTest.index(MyService.class);
+        ClassInfo myServiceClass = index.getClassByName(DotName.createSimple(MyService.class.getName()));
+        MethodKey getName = new MethodKey(myServiceClass.method("getName"));
+        MethodKey hasName = new MethodKey(myServiceClass.method("hasName"));
+        MethodKey isActive = new MethodKey(myServiceClass.method("isActive"));
+        MethodKey getList1 = new MethodKey(myServiceClass.method("getList", PrimitiveType.INT));
+        MethodKey getList2 = new MethodKey(myServiceClass.method("getList", PrimitiveType.INT,
+                Type.create(DotName.createSimple(String.class.getName()), Kind.CLASS)));
+        MethodKey getList3 = new MethodKey(
+                myServiceClass.method("getList", Type.create(DotName.createSimple(String.class.getName()), Kind.CLASS)));
+        List<MethodKey> keys = Arrays.asList(hasName, getList3, getList2, getList1, isActive, getName);
+        Collections.sort(keys);
+        assertEquals("getList", keys.get(0).name);
+        assertEquals(1, keys.get(0).params.size());
+        assertEquals("int", keys.get(0).params.get(0).toString());
+        assertEquals("getList", keys.get(1).name);
+        assertEquals(1, keys.get(1).params.size());
+        assertEquals("java.lang.String", keys.get(1).params.get(0).toString());
+        assertEquals("getList", keys.get(2).name);
+        assertEquals(2, keys.get(2).params.size());
+        assertEquals("getName", keys.get(3).name);
+        assertEquals("hasName", keys.get(4).name);
+        assertEquals("isActive", keys.get(5).name);
+
+    }
+
+}
diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java
index 8bc484030393a..1a6078b9fbb70 100644
--- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java
+++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/MyService.java
@@ -28,10 +28,18 @@ public String getName() {
         return null;
     }
 
+    public boolean hasName() {
+        return name != null;
+    }
+
     public boolean isActive() {
         return true;
     }
 
+    public boolean hasItems() {
+        return false;
+    }
+
     public List<String> getList(int limit, String dummy) {
         AtomicInteger idx = new AtomicInteger(0);
         return Stream.generate(() -> "" + idx.getAndIncrement())
@@ -75,4 +83,20 @@ public static List<String> getDummyVarargs(MyService service, int limit, String.
         return dummies.length > limit ? Collections.emptyList() : Arrays.asList(dummies);
     }
 
+    public static List<String> getDummyMatchAnyLike(MyService service, String name, int limit) {
+        return Collections.emptyList();
+    }
+
+    public static List<String> getDummyNamespaceLike(String name, int... limit) {
+        return Collections.emptyList();
+    }
+
+    public static List<String> getDummyNamespaceRegexLike(String name, String names) {
+        return Collections.emptyList();
+    }
+
+    public static String quark() {
+        return "ok";
+    }
+
 }
diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java
new file mode 100644
index 0000000000000..486d1dda304bd
--- /dev/null
+++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/ParametersTest.java
@@ -0,0 +1,75 @@
+package io.quarkus.qute.generator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.qute.generator.ExtensionMethodGenerator.ParamKind;
+import io.quarkus.qute.generator.ExtensionMethodGenerator.Parameters;
+import java.io.IOException;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.PrimitiveType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.junit.jupiter.api.Test;
+
+public class ParametersTest {
+
+    @Test
+    public void testParameters() throws IOException {
+        IndexView index = SimpleGeneratorTest.index(MyService.class);
+        DotName myServiceName = DotName.createSimple(MyService.class.getName());
+        ClassInfo myServiceClass = index.getClassByName(myServiceName);
+
+        MethodInfo getDummy1 = myServiceClass.method("getDummy", Type.create(myServiceName, Kind.CLASS), PrimitiveType.INT,
+                Type.create(DotNames.STRING, Kind.CLASS));
+        Parameters params = new Parameters(getDummy1, false, false);
+        assertEquals(3, params.size());
+        assertEquals(2, params.evaluated().size());
+        assertTrue(params.needsEvaluation());
+        assertEquals(myServiceName, params.get(0).type.name());
+        assertNotNull(params.getFirst(ParamKind.BASE));
+        assertNull(params.getFirst(ParamKind.NAME));
+
+        MethodInfo getDummyMatchAnyLike = myServiceClass.method("getDummyMatchAnyLike",
+                Type.create(myServiceName, Kind.CLASS), Type.create(DotNames.STRING, Kind.CLASS), PrimitiveType.INT);
+        params = new Parameters(getDummyMatchAnyLike, true, false);
+        assertEquals(3, params.size());
+        assertEquals(1, params.evaluated().size());
+        assertTrue(params.needsEvaluation());
+        assertNotNull(params.getFirst(ParamKind.BASE));
+        assertNotNull(params.getFirst(ParamKind.NAME));
+
+        MethodInfo getDummyNamespaceLike = myServiceClass.method("getDummyNamespaceLike",
+                Type.create(DotNames.STRING, Kind.CLASS), Type.create(DotName.createSimple(int[].class.getName()), Kind.ARRAY));
+        params = new Parameters(getDummyNamespaceLike, false, true);
+        assertEquals(2, params.size());
+        assertEquals(2, params.evaluated().size());
+        assertTrue(params.needsEvaluation());
+        assertNull(params.getFirst(ParamKind.BASE));
+        assertNull(params.getFirst(ParamKind.NAME));
+
+        MethodInfo getDummyNamespaceRegexLike = myServiceClass.method("getDummyNamespaceRegexLike",
+                Type.create(DotNames.STRING, Kind.CLASS), Type.create(DotNames.STRING, Kind.CLASS));
+        params = new Parameters(getDummyNamespaceRegexLike, true, true);
+        assertEquals(2, params.size());
+        assertEquals(1, params.evaluated().size());
+        assertTrue(params.needsEvaluation());
+        assertNull(params.getFirst(ParamKind.BASE));
+        assertNotNull(params.getFirst(ParamKind.NAME));
+
+        MethodInfo quark = myServiceClass.method("quark");
+        params = new Parameters(quark, false, true);
+        assertEquals(0, params.size());
+        assertEquals(0, params.evaluated().size());
+        assertFalse(params.needsEvaluation());
+        assertNull(params.getFirst(ParamKind.BASE));
+        assertNull(params.getFirst(ParamKind.NAME));
+    }
+
+}
diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java
index f90c1eddd8aee..a109f5ecd2da2 100644
--- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java
+++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/SimpleGeneratorTest.java
@@ -9,7 +9,7 @@
 import io.quarkus.qute.ValueResolver;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -37,28 +37,31 @@ public static void init() throws IOException {
         Index index = index(MyService.class, PublicMyService.class, BaseService.class, MyItem.class, String.class,
                 CompletionStage.class,
                 List.class);
-        ValueResolverGenerator generator = new ValueResolverGenerator(index, classOutput, Collections.emptyMap());
         ClassInfo myServiceClazz = index.getClassByName(DotName.createSimple(MyService.class.getName()));
-        generator.generate(myServiceClazz);
-        generator.generate(index.getClassByName(DotName.createSimple(PublicMyService.class.getName())));
-        generator.generate(index.getClassByName(DotName.createSimple(MyItem.class.getName())));
-        generator.generate(index.getClassByName(DotName.createSimple(String.class.getName())));
-        generator.generate(index.getClassByName(DotName.createSimple(List.class.getName())));
+        ValueResolverGenerator generator = ValueResolverGenerator.builder().setIndex(index).setClassOutput(classOutput)
+                .addClass(myServiceClazz)
+                .addClass(index.getClassByName(DotName.createSimple(PublicMyService.class.getName())))
+                .addClass(index.getClassByName(DotName.createSimple(MyItem.class.getName())))
+                .addClass(index.getClassByName(DotName.createSimple(String.class.getName())))
+                .addClass(index.getClassByName(DotName.createSimple(List.class.getName())))
+                .build();
+
+        generator.generate();
         generatedTypes.addAll(generator.getGeneratedTypes());
 
-        ExtensionMethodGenerator extensionMethodGenerator = new ExtensionMethodGenerator(classOutput);
+        ExtensionMethodGenerator extensionMethodGenerator = new ExtensionMethodGenerator(index, classOutput);
         MethodInfo extensionMethod = index.getClassByName(DotName.createSimple(MyService.class.getName())).method(
                 "getDummy", Type.create(myServiceClazz.name(), Kind.CLASS), PrimitiveType.INT,
                 Type.create(DotName.createSimple(String.class.getName()), Kind.CLASS));
-        extensionMethodGenerator.generate(extensionMethod, null, null);
+        extensionMethodGenerator.generate(extensionMethod, null, null, null);
         extensionMethod = index.getClassByName(DotName.createSimple(MyService.class.getName())).method(
                 "getDummy", Type.create(myServiceClazz.name(), Kind.CLASS), PrimitiveType.INT,
                 PrimitiveType.LONG);
-        extensionMethodGenerator.generate(extensionMethod, null, null);
+        extensionMethodGenerator.generate(extensionMethod, null, null, null);
         extensionMethod = index.getClassByName(DotName.createSimple(MyService.class.getName())).method(
                 "getDummyVarargs", Type.create(myServiceClazz.name(), Kind.CLASS), PrimitiveType.INT,
                 Type.create(DotName.createSimple("[L" + String.class.getName() + ";"), Kind.ARRAY));
-        extensionMethodGenerator.generate(extensionMethod, null, null);
+        extensionMethodGenerator.generate(extensionMethod, null, null, null);
         generatedTypes.addAll(extensionMethodGenerator.getGeneratedTypes());
     }
 
@@ -66,7 +69,7 @@ public static void init() throws IOException {
     public void testGenerator() throws Exception {
         Class<?> clazz = SimpleGeneratorTest.class.getClassLoader()
                 .loadClass("io.quarkus.qute.generator.MyService_ValueResolver");
-        ValueResolver resolver = (ValueResolver) clazz.newInstance();
+        ValueResolver resolver = (ValueResolver) clazz.getDeclaredConstructor().newInstance();
         assertEquals("Foo",
                 resolver.resolve(new TestEvalContext(new MyService(), "getName", null))
                         .toCompletableFuture().get(1, TimeUnit.SECONDS).toString());
@@ -102,6 +105,9 @@ public void testWithEngine() throws Exception {
         }
         Engine engine = builder.build();
         assertEquals(" FOO ", engine.parse("{#if isActive} {name.toUpperCase} {/if}").render(new MyService()));
+        assertEquals(" FOO ", engine.parse("{#if active} {name.toUpperCase} {/if}").render(new MyService()));
+        assertEquals(" FOO ", engine.parse("{#if !hasItems} {name.toUpperCase} {/if}").render(new MyService()));
+        assertEquals(" FOO ", engine.parse("{#if !items} {name.toUpperCase} {/if}").render(new MyService()));
         assertEquals("OK", engine.parse("{#if this.getList(5).size == 5}OK{/if}").render(new MyService()));
         assertEquals("2", engine.parse("{this.getListVarargs('foo','bar').size}").render(new MyService()));
         assertEquals("NOT_FOUND", engine.parse("{this.getAnotherTestName(1)}").render(new MyService()));
@@ -125,16 +131,17 @@ public void testWithEngine() throws Exception {
     }
 
     private ValueResolver newResolver(String className)
-            throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+            throws ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException,
+            InvocationTargetException, NoSuchMethodException, SecurityException {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         if (cl == null) {
             cl = SimpleGeneratorTest.class.getClassLoader();
         }
         Class<?> clazz = cl.loadClass(className);
-        return (ValueResolver) clazz.newInstance();
+        return (ValueResolver) clazz.getDeclaredConstructor().newInstance();
     }
 
-    private static Index index(Class<?>... classes) throws IOException {
+    static Index index(Class<?>... classes) throws IOException {
         Indexer indexer = new Indexer();
         for (Class<?> clazz : classes) {
             try (InputStream stream = SimpleGeneratorTest.class.getClassLoader()
diff --git a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java
index b69cd707c8ace..f0784cd22e271 100644
--- a/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java
+++ b/independent-projects/qute/generator/src/test/java/io/quarkus/qute/generator/TestClassOutput.java
@@ -5,7 +5,7 @@
  * 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
+ *     https://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,
diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml
index 5ccb65784df1c..5fdd3a28bff00 100644
--- a/independent-projects/qute/pom.xml
+++ b/independent-projects/qute/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
     <groupId>io.quarkus.qute</groupId>
     <artifactId>qute-parent</artifactId>
@@ -15,32 +15,32 @@
     <version>999-SNAPSHOT</version>
 
     <name>Qute - Parent</name>
-    
+
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
             <distribution>repo</distribution>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
         </license>
     </licenses>
-    
+
     <scm>
         <url>https://github.com/quarkusio/quarkus</url>
         <connection>scm:git:git@github.com:quarkusio/quarkus.git</connection>
         <developerConnection>scm:git:git@github.com:quarkusio/quarkus.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
-    
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <version.junit>5.6.2</version.junit>
-        <version.gizmo>1.0.4.Final</version.gizmo>
+        <version.junit>5.7.1</version.junit>
+        <version.gizmo>1.0.7.Final</version.gizmo>
         <version.jboss-logging>3.3.2.Final</version.jboss-logging>
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
         <version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
-        <version.smallrye-mutiny>0.7.0</version.smallrye-mutiny>
+        <version.smallrye-mutiny>0.14.0</version.smallrye-mutiny>
     </properties>
 
     <modules>
@@ -165,7 +165,8 @@
                                             <exclude>commons-logging:commons-logging-api</exclude>
                                             <exclude>org.springframework:spring-jcl</exclude>
                                             <exclude>org.slf4j:jcl-over-slf4j</exclude>
-                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logging instead) -->
+                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logmanager instead) -->
+                                            <exclude>org.jboss.slf4j:slf4j-jboss-logging</exclude>
                                             <exclude>org.slf4j:slf4j-simple</exclude>
                                             <exclude>org.slf4j:slf4j-nop</exclude>
                                             <exclude>org.slf4j:slf4j-jdk14</exclude>
@@ -191,7 +192,7 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.12.1</version>
+                    <version>2.14.0</version>
                     <dependencies>
                         <dependency>
                             <artifactId>quarkus-ide-config</artifactId>
@@ -208,7 +209,7 @@
                 <plugin>
                     <groupId>net.revelc.code</groupId>
                     <artifactId>impsort-maven-plugin</artifactId>
-                    <version>1.4.1</version>
+                    <version>1.6.0</version>
                     <configuration>
                         <removeUnused>true</removeUnused>
                         <skip>${format.skip}</skip>
@@ -217,7 +218,7 @@
             </plugins>
         </pluginManagement>
     </build>
-    
+
     <distributionManagement>
         <snapshotRepository>
             <id>sonatype-nexus-snapshots</id>
@@ -230,6 +231,16 @@
     </distributionManagement>
 
     <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
         <profile>
             <id>quick-build</id>
             <activation>
@@ -247,6 +258,21 @@
                 <defaultGoal>clean install</defaultGoal>
             </build>
         </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -257,7 +283,7 @@
                         <version>${version.nexus-staging-maven-plugin}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
diff --git a/independent-projects/resteasy-reactive/client/pom.xml b/independent-projects/resteasy-reactive/client/pom.xml
new file mode 100644
index 0000000000000..0444fff4b1bef
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-client-parent</artifactId>
+    <name>RESTEasy Reactive - Client Parent </name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>processor</module>
+    </modules>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/client/processor/pom.xml b/independent-projects/resteasy-reactive/client/processor/pom.xml
new file mode 100644
index 0000000000000..9b0ee6c18fc2f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/processor/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-client-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-client-processor</artifactId>
+    <name>RESTEasy Reactive - Client - Processor</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jandex</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.gizmo</groupId>
+            <artifactId>gizmo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/client/runtime/pom.xml b/independent-projects/resteasy-reactive/client/runtime/pom.xml
new file mode 100644
index 0000000000000..5011fc6cb19cb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-client-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-client</artifactId>
+    <name>RESTEasy Reactive - Client - Runtime</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/InvalidRestClientDefinitionException.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/InvalidRestClientDefinitionException.java
new file mode 100644
index 0000000000000..baf5cd0757f99
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/InvalidRestClientDefinitionException.java
@@ -0,0 +1,8 @@
+package org.jboss.resteasy.reactive.client.api;
+
+public class InvalidRestClientDefinitionException extends RuntimeException {
+
+    public InvalidRestClientDefinitionException(String message) {
+        super(message);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/QuarkusRestClientProperties.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/QuarkusRestClientProperties.java
new file mode 100644
index 0000000000000..aa85a9222767f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/QuarkusRestClientProperties.java
@@ -0,0 +1,6 @@
+package org.jboss.resteasy.reactive.client.api;
+
+public class QuarkusRestClientProperties {
+    public static final String CONNECT_TIMEOUT = "io.quarkus.rest.client.connect-timeout";
+    public static final String READ_TIMEOUT = "io.quarkus.rest.client.read-timeout";
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java
new file mode 100644
index 0000000000000..c5be4dd5ebe67
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java
@@ -0,0 +1,35 @@
+package org.jboss.resteasy.reactive.client.api;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+/**
+ * Subclass of {@link WebApplicationException} for use by clients, which forbids setting a response that
+ * would be used by the server.
+ * FIXME: I'd rather this be disjoint from WebApplicationException, so we could store the response info
+ * for client usage. Perhaps we can store it in an alternate field?
+ */
+@SuppressWarnings("serial")
+public class WebClientApplicationException extends WebApplicationException {
+
+    public WebClientApplicationException() {
+        super();
+    }
+
+    public WebClientApplicationException(String reason) {
+        super(reason);
+    }
+
+    public WebClientApplicationException(Throwable t) {
+        super(t);
+    }
+
+    public WebClientApplicationException(String reason, Throwable t) {
+        super(reason, t);
+    }
+
+    @Override
+    public final Response getResponse() {
+        return null;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientErrorHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientErrorHandler.java
new file mode 100644
index 0000000000000..dc4a868d0f705
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientErrorHandler.java
@@ -0,0 +1,16 @@
+package org.jboss.resteasy.reactive.client.handlers;
+
+import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+
+/**
+ * Simple error handler that fails the result
+ */
+public class ClientErrorHandler implements ClientRestHandler {
+    @Override
+    public void handle(RestClientRequestContext requestContext) throws Exception {
+        if (requestContext.getThrowable() != null) {
+            requestContext.getResult().completeExceptionally(requestContext.getThrowable());
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFiltersRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFiltersRestHandler.java
new file mode 100644
index 0000000000000..ae4930800a7cd
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientRequestFiltersRestHandler.java
@@ -0,0 +1,36 @@
+package org.jboss.resteasy.reactive.client.handlers;
+
+import java.util.List;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.ClientRequestFilter;
+import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl;
+import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+
+public class ClientRequestFiltersRestHandler implements ClientRestHandler {
+    @Override
+    public void handle(RestClientRequestContext context) throws Exception {
+
+        List<ClientRequestFilter> filters = context.getConfiguration().getRequestFilters();
+        if (!filters.isEmpty()) {
+            ClientRequestContextImpl requestContext = context.getOrCreateClientRequestContext();
+            for (ClientRequestFilter filter : filters) {
+                try {
+                    filter.filter(requestContext);
+                } catch (Exception x) {
+                    if (x.getMessage() != null) {
+                        throw new ProcessingException(x.getMessage(), x);
+                    } else {
+                        throw new ProcessingException(x);
+                    }
+                }
+                if (requestContext.getAbortedWith() != null) {
+                    context.setResponseStatus(requestContext.getAbortedWith().getStatus());
+                    context.setResponseHeaders(requestContext.getAbortedWith().getStringHeaders());
+                    context.setResponseReasonPhrase(requestContext.getAbortedWith().getStatusInfo().getReasonPhrase());
+                    return;
+                }
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseRestHandler.java
new file mode 100644
index 0000000000000..f1763656cb46f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientResponseRestHandler.java
@@ -0,0 +1,103 @@
+package org.jboss.resteasy.reactive.client.handlers;
+
+import io.vertx.core.buffer.Buffer;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.List;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.client.api.WebClientApplicationException;
+import org.jboss.resteasy.reactive.client.impl.ClientRequestContextImpl;
+import org.jboss.resteasy.reactive.client.impl.ClientResponseBuilderImpl;
+import org.jboss.resteasy.reactive.client.impl.ClientResponseContextImpl;
+import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
+
+public class ClientResponseRestHandler implements ClientRestHandler {
+    @Override
+    public void handle(RestClientRequestContext context) throws Exception {
+        ClientResponseContextImpl responseContext = new ClientResponseContextImpl(context);
+        if (context.isCheckSuccessfulFamily()
+                && (responseContext.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL)) {
+            throw new WebClientApplicationException("Server response status was: " + responseContext.getStatus());
+        }
+        ClientRequestContextImpl requestContext = context.getClientRequestContext();
+        // the spec doesn't really say this, but the TCK checks that the abortWith entity ends up read
+        // so we have to write it, but without filters/interceptors
+        if (requestContext != null && requestContext.getAbortedWith() != null) {
+            setExistingEntity(requestContext.getAbortedWith(), responseContext, context);
+        }
+
+        List<ClientResponseFilter> filters = context.getConfiguration().getResponseFilters();
+        if (!filters.isEmpty()) {
+            // FIXME: pretty sure we'll have to mark it as immutable in this phase, but the spec is not verbose about this
+            // the server does it.
+            for (ClientResponseFilter filter : filters) {
+                try {
+                    filter.filter(requestContext, responseContext);
+                } catch (WebApplicationException | ProcessingException x) {
+                    throw x;
+                } catch (Exception x) {
+                    throw new ProcessingException(x);
+                }
+            }
+        }
+        ResponseImpl build = mapToResponse(context, responseContext);
+        context.getResult().complete(build);
+    }
+
+    public static ResponseImpl mapToResponse(RestClientRequestContext context, ClientResponseContextImpl responseContext)
+            throws IOException {
+        ClientResponseBuilderImpl builder = new ClientResponseBuilderImpl();
+        builder.status(responseContext.getStatus(), responseContext.getReasonPhrase());
+        builder.setAllHeaders(responseContext.getHeaders());
+        builder.invocationState(context);
+        if (context.isResponseTypeSpecified()) { // this case means that a specific response type was requested
+            Object entity = context.readEntity(responseContext.getEntityStream(),
+                    context.getResponseType(),
+                    responseContext.getMediaType(),
+                    // FIXME: we have strings, it wants objects, perhaps there's
+                    // an Object->String conversion too many
+                    (MultivaluedMap) responseContext.getHeaders());
+            if (entity != null) {
+                builder.entity(entity);
+            }
+        } else {
+            // in this case no specific response type was requested so we just prepare the stream
+            // the users of the response are meant to use readEntity
+            builder.entityStream(responseContext.getEntityStream());
+        }
+        return builder.build();
+    }
+
+    private void setExistingEntity(Response abortedWith, ClientResponseContextImpl responseContext,
+            RestClientRequestContext restClientRequestContext) throws IOException {
+        Object value = abortedWith.getEntity();
+        if (value == null) {
+            responseContext.setEntityStream(null);
+            return;
+        }
+        Entity entity;
+        if (value instanceof Entity) {
+            entity = (Entity) value;
+        } else {
+            MediaType mediaType = abortedWith.getMediaType();
+            if (mediaType == null) {
+                // FIXME: surely this is wrong, perhaps we can use the expected response type?
+                mediaType = MediaType.TEXT_PLAIN_TYPE;
+            }
+            entity = Entity.entity(value, mediaType);
+        }
+        // FIXME: pass headers?
+        Buffer buffer = restClientRequestContext.writeEntity(entity, (MultivaluedMap) Serialisers.EMPTY_MULTI_MAP,
+                Serialisers.NO_WRITER_INTERCEPTOR);
+        responseContext.setEntityStream(new ByteArrayInputStream(buffer.getBytes()));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java
new file mode 100644
index 0000000000000..f657e3c8f3c98
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java
@@ -0,0 +1,118 @@
+package org.jboss.resteasy.reactive.client.handlers;
+
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpClientResponse;
+import io.vertx.core.http.HttpMethod;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Variant;
+import org.jboss.resteasy.reactive.client.impl.AsyncInvokerImpl;
+import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+
+public class ClientSendRequestHandler implements ClientRestHandler {
+    @Override
+    public void handle(RestClientRequestContext requestContext) throws Exception {
+        if (requestContext.getAbortedWith() != null) {
+            return;
+        }
+        requestContext.suspend();
+        HttpClientRequest httpClientRequest = createRequest(requestContext);
+        Buffer actualEntity = setRequestHeadersAndPrepareBody(httpClientRequest, requestContext);
+        httpClientRequest.handler(new Handler<HttpClientResponse>() {
+            @Override
+            public void handle(HttpClientResponse clientResponse) {
+                try {
+                    requestContext.initialiseResponse(clientResponse);
+                    if (!requestContext.isRegisterBodyHandler()) {
+                        clientResponse.pause();
+                        requestContext.resume();
+                    } else {
+                        clientResponse.bodyHandler(new Handler<Buffer>() {
+                            @Override
+                            public void handle(Buffer buffer) {
+                                try {
+                                    if (buffer.length() > 0) {
+                                        requestContext.setResponseEntityStream(new ByteArrayInputStream(buffer.getBytes()));
+                                    } else {
+                                        requestContext.setResponseEntityStream(null);
+                                    }
+                                    requestContext.resume();
+                                } catch (Throwable t) {
+                                    requestContext.resume(t);
+                                }
+                            }
+                        });
+                    }
+                } catch (Throwable t) {
+                    requestContext.resume(t);
+                }
+            }
+        });
+        httpClientRequest.exceptionHandler(new Handler<Throwable>() {
+            @Override
+            public void handle(Throwable event) {
+                if (event instanceof IOException) {
+                    requestContext.resume(new ProcessingException(event));
+                } else {
+                    requestContext.resume(event);
+                }
+            }
+        });
+        if (actualEntity == AsyncInvokerImpl.EMPTY_BUFFER) {
+            httpClientRequest.end();
+        } else {
+            httpClientRequest.end(actualEntity);
+        }
+
+    }
+
+    public <T> HttpClientRequest createRequest(RestClientRequestContext state) {
+        HttpClient httpClient = state.getHttpClient();
+        URI uri = state.getUri();
+        HttpClientRequest httpClientRequest = httpClient.request(HttpMethod.valueOf(state.getHttpMethod()), uri.getPort(),
+                uri.getHost(),
+                uri.getPath() + (uri.getQuery() == null ? "" : "?" + uri.getQuery()));
+        state.setHttpClientRequest(httpClientRequest);
+        return httpClientRequest;
+    }
+
+    private <T> Buffer setRequestHeadersAndPrepareBody(HttpClientRequest httpClientRequest, RestClientRequestContext state)
+            throws IOException {
+        MultivaluedMap<String, String> headerMap = state.getRequestHeaders().asMap();
+        Buffer actualEntity = AsyncInvokerImpl.EMPTY_BUFFER;
+        Entity<?> entity = state.getEntity();
+        if (entity != null) {
+            // no need to set the entity.getMediaType, it comes from the variant
+            if (entity.getVariant() != null) {
+                Variant v = entity.getVariant();
+                headerMap.putSingle(HttpHeaders.CONTENT_TYPE, v.getMediaType().toString());
+                if (v.getLanguageString() != null)
+                    headerMap.putSingle(HttpHeaders.CONTENT_LANGUAGE, v.getLanguageString());
+                if (v.getEncoding() != null)
+                    headerMap.putSingle(HttpHeaders.CONTENT_ENCODING, v.getEncoding());
+            }
+
+            actualEntity = state.writeEntity(entity, headerMap,
+                    state.getConfiguration().getWriterInterceptors().toArray(Serialisers.NO_WRITER_INTERCEPTOR));
+        }
+        // set the Vertx headers after we've run the interceptors because they can modify them
+        MultiMap vertxHttpHeaders = httpClientRequest.headers();
+        for (Map.Entry<String, List<String>> entry : headerMap.entrySet()) {
+            vertxHttpHeaders.add(entry.getKey(), entry.getValue());
+        }
+        return actualEntity;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java
new file mode 100644
index 0000000000000..6735403fade76
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractClientInterceptorContextImpl.java
@@ -0,0 +1,92 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.InterceptorContext;
+
+public abstract class AbstractClientInterceptorContextImpl implements InterceptorContext {
+
+    protected MediaType mediaType;
+    protected Type entityType;
+    protected Class<?> entityClass;
+    protected Annotation[] annotations;
+    protected Map<String, Object> properties;
+
+    public AbstractClientInterceptorContextImpl(Annotation[] annotations, Class<?> entityClass, Type entityType,
+            MediaType mediaType, Map<String, Object> properties) {
+        this.annotations = annotations;
+        this.entityClass = entityClass;
+        this.entityType = entityType;
+        this.mediaType = mediaType;
+        this.properties = properties;
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return properties.get(name);
+    }
+
+    @Override
+    public Collection<String> getPropertyNames() {
+        // TCK says the property names need to be immutable
+        return Collections.unmodifiableSet(properties.keySet());
+    }
+
+    @Override
+    public void setProperty(String name, Object object) {
+        properties.put(name, object);
+    }
+
+    @Override
+    public void removeProperty(String name) {
+        properties.remove(name);
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        return annotations;
+    }
+
+    @Override
+    public void setAnnotations(Annotation[] annotations) {
+        Objects.requireNonNull(annotations);
+        this.annotations = annotations;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return entityClass;
+    }
+
+    @Override
+    public void setType(Class<?> type) {
+        entityClass = type;
+        // FIXME: invalidate generic type?
+    }
+
+    @Override
+    public Type getGenericType() {
+        return entityType;
+    }
+
+    @Override
+    public void setGenericType(Type genericType) {
+        // FIXME: invalidate entity class?
+        entityType = genericType;
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    @Override
+    public void setMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java
new file mode 100644
index 0000000000000..91f4cefe15dcf
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AbstractRxInvoker.java
@@ -0,0 +1,128 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.RxInvoker;
+import javax.ws.rs.core.GenericType;
+
+public abstract class AbstractRxInvoker<T> implements RxInvoker<T> {
+
+    @Override
+    public T get() {
+        return method("GET");
+    }
+
+    @Override
+    public <R> T get(Class<R> responseType) {
+        return method("GET", responseType);
+    }
+
+    @Override
+    public <R> T get(GenericType<R> responseType) {
+        return method("GET", responseType);
+    }
+
+    @Override
+    public T put(Entity<?> entity) {
+        return method("PUT");
+    }
+
+    @Override
+    public <R> T put(Entity<?> entity, Class<R> responseType) {
+        return method("PUT", entity, responseType);
+    }
+
+    @Override
+    public <R> T put(Entity<?> entity, GenericType<R> responseType) {
+        return method("PUT", entity, responseType);
+    }
+
+    @Override
+    public T post(Entity<?> entity) {
+        return method("POST");
+    }
+
+    @Override
+    public <R> T post(Entity<?> entity, Class<R> responseType) {
+        return method("PUT", entity, responseType);
+    }
+
+    @Override
+    public <R> T post(Entity<?> entity, GenericType<R> responseType) {
+        return method("PUT", entity, responseType);
+    }
+
+    @Override
+    public T delete() {
+        return method("DELETE");
+    }
+
+    @Override
+    public <R> T delete(Class<R> responseType) {
+        return method("DELETE", responseType);
+    }
+
+    @Override
+    public <R> T delete(GenericType<R> responseType) {
+        return method("DELETE", responseType);
+    }
+
+    @Override
+    public T head() {
+        return method("HEAD");
+    }
+
+    @Override
+    public T options() {
+        return method("OPTIONS");
+    }
+
+    @Override
+    public <R> T options(Class<R> responseType) {
+        return method("OPTIONS", responseType);
+    }
+
+    @Override
+    public <R> T options(GenericType<R> responseType) {
+        return method("OPTIONS", responseType);
+    }
+
+    @Override
+    public T trace() {
+        return method("TRACE");
+    }
+
+    @Override
+    public <R> T trace(Class<R> responseType) {
+        return method("TRACE", responseType);
+    }
+
+    @Override
+    public <R> T trace(GenericType<R> responseType) {
+        return method("TRACE", responseType);
+    }
+
+    @Override
+    public T method(String name) {
+        return method(name, (GenericType<?>) null);
+    }
+
+    @Override
+    public <R> T method(String name, Class<R> responseType) {
+        return method(name, new GenericType<>(responseType));
+    }
+
+    @Override
+    public <R> T method(String name, GenericType<R> responseType) {
+        return method(name, null, responseType);
+    }
+
+    @Override
+    public T method(String name, Entity<?> entity) {
+        return method(name, entity, (GenericType<?>) null);
+    }
+
+    @Override
+    public <R> T method(String name, Entity<?> entity, Class<R> responseType) {
+        return method(name, entity, new GenericType<>(responseType));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java
new file mode 100644
index 0000000000000..454a18c8aa1a8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/AsyncInvokerImpl.java
@@ -0,0 +1,288 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClient;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import javax.ws.rs.client.AsyncInvoker;
+import javax.ws.rs.client.CompletionStageRxInvoker;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.InvocationCallback;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.util.types.Types;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class AsyncInvokerImpl implements AsyncInvoker, CompletionStageRxInvoker {
+
+    public static final Buffer EMPTY_BUFFER = Buffer.buffer(new byte[0]);
+
+    final HttpClient httpClient;
+    final URI uri;
+    final RequestSpec requestSpec;
+    final Map<String, Object> properties;
+    final ClientImpl restClient;
+    final ClientRestHandler[] handlerChain;
+    final ClientRestHandler[] abortHandlerChain;
+    final ThreadSetupAction requestContext;
+
+    public AsyncInvokerImpl(ClientImpl restClient, HttpClient httpClient, URI uri, RequestSpec requestSpec,
+            Map<String, Object> properties, ClientRestHandler[] handlerChain, ClientRestHandler[] abortHandlerChain,
+            ThreadSetupAction requestContext) {
+        this.restClient = restClient;
+        this.httpClient = httpClient;
+        this.uri = uri;
+        this.requestSpec = new RequestSpec(requestSpec);
+        this.properties = new HashMap<>(properties);
+        this.handlerChain = handlerChain;
+        this.abortHandlerChain = abortHandlerChain;
+        this.requestContext = requestContext;
+    }
+
+    public Map<String, Object> getProperties() {
+        return properties;
+    }
+
+    @Override
+    public CompletableFuture<Response> get() {
+        return method("GET");
+    }
+
+    @Override
+    public <T> CompletableFuture<T> get(Class<T> responseType) {
+        return method("GET", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> get(GenericType<T> responseType) {
+        return method("GET", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> get(InvocationCallback<T> callback) {
+        return method("GET", callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> put(Entity<?> entity) {
+        return method("PUT", entity);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> put(Entity<?> entity, Class<T> responseType) {
+        return method("PUT", entity, responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> put(Entity<?> entity, GenericType<T> responseType) {
+        return method("PUT", entity, responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> put(Entity<?> entity, InvocationCallback<T> callback) {
+        return method("PUT", entity, callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> post(Entity<?> entity) {
+        return method("POST", entity);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> post(Entity<?> entity, Class<T> responseType) {
+        return method("POST", entity, responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> post(Entity<?> entity, GenericType<T> responseType) {
+        return method("POST", entity, responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> post(Entity<?> entity, InvocationCallback<T> callback) {
+        return method("POST", entity, callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> delete() {
+        return method("DELETE");
+    }
+
+    @Override
+    public <T> CompletableFuture<T> delete(Class<T> responseType) {
+        return method("DELETE", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> delete(GenericType<T> responseType) {
+        return method("DELETE", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> delete(InvocationCallback<T> callback) {
+        return method("DELETE", callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> head() {
+        return method("HEAD");
+    }
+
+    @Override
+    public Future<Response> head(InvocationCallback<Response> callback) {
+        return method("HEAD", callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> options() {
+        return method("OPTIONS");
+    }
+
+    @Override
+    public <T> CompletableFuture<T> options(Class<T> responseType) {
+        return method("OPTIONS", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> options(GenericType<T> responseType) {
+        return method("OPTIONS", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> options(InvocationCallback<T> callback) {
+        return method("OPTIONS", callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> trace() {
+        return method("TRACE");
+    }
+
+    @Override
+    public <T> CompletableFuture<T> trace(Class<T> responseType) {
+        return method("TRACE", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> trace(GenericType<T> responseType) {
+        return method("TRACE", responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> trace(InvocationCallback<T> callback) {
+        return method("TRACE", callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> method(String name) {
+        return performRequestInternal(name, null, null);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> method(String name, Class<T> responseType) {
+        return mapResponse(performRequestInternal(name, null, new GenericType<>(responseType)), responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> method(String name, GenericType<T> responseType) {
+        return mapResponse(performRequestInternal(name, null, responseType), responseType.getRawType());
+    }
+
+    @Override
+    public <T> CompletableFuture<T> method(String name, InvocationCallback<T> callback) {
+        return method(name, null, callback);
+    }
+
+    @Override
+    public CompletableFuture<Response> method(String name, Entity<?> entity) {
+        return performRequestInternal(name, entity, null);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> method(String name, Entity<?> entity, Class<T> responseType) {
+        CompletableFuture<Response> response = performRequestInternal(name, entity, new GenericType<>(responseType));
+        return mapResponse(response, responseType);
+    }
+
+    @Override
+    public <T> CompletableFuture<T> method(String name, Entity<?> entity, GenericType<T> responseType) {
+        //we default to String if no return type specified
+        CompletableFuture<Response> response = performRequestInternal(name, entity,
+                responseType == null ? new GenericType<>(String.class) : responseType);
+        return mapResponse(response, responseType == null ? String.class : responseType.getRawType());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> CompletableFuture<T> method(String name, Entity<?> entity, InvocationCallback<T> callback) {
+        GenericType<Object> genericType = new GenericType<>(getInvocationCallbackType(callback));
+        CompletableFuture<T> cf;
+        if (genericType.getRawType().equals(Response.class)) {
+            cf = (CompletableFuture<T>) performRequestInternal(name, entity, null);
+        } else {
+            cf = mapResponse(performRequestInternal(name, entity, genericType), genericType.getRawType());
+        }
+
+        cf.whenComplete(new BiConsumer<T, Throwable>() {
+            @Override
+            public void accept(T t, Throwable throwable) {
+                if (throwable != null) {
+                    callback.failed(throwable);
+                } else {
+                    callback.completed(t);
+                }
+            }
+        });
+
+        return cf;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private <T> CompletableFuture<Response> performRequestInternal(String httpMethodName, Entity<?> entity,
+            GenericType<?> responseType) {
+        return (CompletableFuture) performRequestInternal(httpMethodName, entity, responseType, true).getResult();
+    }
+
+    RestClientRequestContext performRequestInternal(String httpMethodName, Entity<?> entity, GenericType<?> responseType,
+            boolean registerBodyHandler) {
+        RestClientRequestContext restClientRequestContext = new RestClientRequestContext(restClient, httpClient, httpMethodName,
+                uri, requestSpec.configuration, requestSpec.headers,
+                entity, responseType, registerBodyHandler, properties, handlerChain, abortHandlerChain, requestContext);
+        restClientRequestContext.run();
+        return restClientRequestContext;
+    }
+
+    private <T> Type getInvocationCallbackType(InvocationCallback<T> callback) {
+        Class<?> knownFromBuildTime = restClient.getClientContext().getGenericTypeMapping()
+                .forInvocationCallback(callback.getClass());
+        if (knownFromBuildTime != null) {
+            return knownFromBuildTime;
+        }
+
+        Type[] typeInfo = Types.getActualTypeArgumentsOfAnInterface(callback.getClass(), InvocationCallback.class);
+        if (typeInfo.length == 1) {
+            return typeInfo[0];
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> CompletableFuture<T> mapResponse(CompletableFuture<Response> res, Class<?> responseType) {
+        if (responseType.equals(Response.class)) {
+            return (CompletableFuture<T>) res;
+        }
+        return res.thenApply(new Function<Response, T>() {
+            @Override
+            public T apply(Response response) {
+                return (T) response.getEntity();
+            }
+        });
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java
new file mode 100644
index 0000000000000..9e66a2e858688
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java
@@ -0,0 +1,202 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.CONNECT_TIMEOUT;
+import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.READ_TIMEOUT;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.net.JksOptions;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Configuration;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.client.spi.ClientContextResolver;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+
+public class ClientBuilderImpl extends ClientBuilder {
+
+    private static final Logger log = Logger.getLogger(ClientBuilderImpl.class);
+
+    private static final ClientContextResolver CLIENT_CONTEXT_RESOLVER = ClientContextResolver.getInstance();
+    private static final char[] EMPTY_CHAR_ARARAY = new char[0];
+
+    private ConfigurationImpl configuration;
+    private HostnameVerifier hostnameVerifier;
+    private KeyStore keyStore;
+    private char[] keystorePassword;
+    private SSLContext sslContext;
+    private KeyStore trustStore;
+    private HttpClientOptions httpClientOptions = new HttpClientOptions();
+
+    @Override
+    public ClientBuilder withConfig(Configuration config) {
+        this.configuration = new ConfigurationImpl(config);
+        return this;
+    }
+
+    @Override
+    public ClientBuilder sslContext(SSLContext sslContext) {
+        // TODO
+        throw new RuntimeException("Specifying SSLContext is not supported at the moment");
+    }
+
+    @Override
+    public ClientBuilder keyStore(KeyStore keyStore, char[] password) {
+        this.keyStore = keyStore;
+        this.keystorePassword = password;
+        return this;
+    }
+
+    @Override
+    public ClientBuilder trustStore(KeyStore trustStore) {
+        this.trustStore = trustStore;
+        return this;
+    }
+
+    @Override
+    public ClientBuilder hostnameVerifier(HostnameVerifier verifier) {
+        this.hostnameVerifier = verifier;
+        return this;
+    }
+
+    @Override
+    public ClientBuilder executorService(ExecutorService executorService) {
+        return this;
+    }
+
+    @Override
+    public ClientBuilder scheduledExecutorService(ScheduledExecutorService scheduledExecutorService) {
+        return this;
+    }
+
+    @Override
+    public ClientBuilder connectTimeout(long timeout, TimeUnit unit) {
+        configuration.property(CONNECT_TIMEOUT, (int) unit.toMillis(timeout));
+        return this;
+    }
+
+    @Override
+    public ClientBuilder readTimeout(long timeout, TimeUnit unit) {
+        configuration.property(READ_TIMEOUT, unit.toMillis(timeout));
+        return this;
+    }
+
+    public ClientBuilder httpClientOptions(HttpClientOptions httpClientOptions) {
+        this.httpClientOptions = httpClientOptions;
+        return this;
+    }
+
+    @Override
+    public ClientImpl build() {
+        Buffer keyStore = asBuffer(this.keyStore, keystorePassword);
+        Buffer trustStore = asBuffer(this.trustStore, EMPTY_CHAR_ARARAY);
+
+        HttpClientOptions options = httpClientOptions == null ? new HttpClientOptions() : httpClientOptions;
+
+        if (keyStore != null || trustStore != null) {
+            options = options.setSsl(true);
+            if (keyStore != null) {
+                JksOptions jks = new JksOptions();
+                jks.setValue(keyStore);
+                jks.setPassword(new String(keystorePassword));
+                options = options.setKeyStoreOptions(jks);
+            }
+            if (trustStore != null) {
+                JksOptions jks = new JksOptions();
+                jks.setValue(trustStore);
+                jks.setPassword("");
+                options.setTrustStoreOptions(jks);
+            }
+        }
+
+        return new ClientImpl(httpClientOptions,
+                configuration,
+                CLIENT_CONTEXT_RESOLVER.resolve(Thread.currentThread().getContextClassLoader()),
+                hostnameVerifier,
+                sslContext);
+
+    }
+
+    private Buffer asBuffer(KeyStore keyStore, char[] password) {
+        if (keyStore != null) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            try {
+                keyStore.store(out, password);
+                return Buffer.buffer(out.toByteArray());
+            } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException e) {
+                log.error("Failed to translate keystore to vert.x keystore", e);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Configuration getConfiguration() {
+        return configuration;
+    }
+
+    @Override
+    public ClientBuilder property(String name, Object value) {
+        configuration.property(name, value);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Class<?> componentClass) {
+        configuration.register(componentClass);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Class<?> componentClass, int priority) {
+        configuration.register(componentClass, priority);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Class<?> componentClass, Class<?>... contracts) {
+        configuration.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+        configuration.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Object component) {
+        configuration.register(component);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Object component, int priority) {
+        configuration.register(component, priority);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Object component, Class<?>... contracts) {
+        configuration.register(component, contracts);
+        return this;
+    }
+
+    @Override
+    public ClientBuilderImpl register(Object component, Map<Class<?>, Integer> contracts) {
+        configuration.register(component, contracts);
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java
new file mode 100644
index 0000000000000..03536185af50c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java
@@ -0,0 +1,1464 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.CONNECT_TIMEOUT;
+
+import io.netty.channel.EventLoopGroup;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Context;
+import io.vertx.core.DeploymentOptions;
+import io.vertx.core.Future;
+import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
+import io.vertx.core.Promise;
+import io.vertx.core.TimeoutStream;
+import io.vertx.core.Verticle;
+import io.vertx.core.Vertx;
+import io.vertx.core.WorkerExecutor;
+import io.vertx.core.datagram.DatagramSocket;
+import io.vertx.core.datagram.DatagramSocketOptions;
+import io.vertx.core.dns.DnsClient;
+import io.vertx.core.dns.DnsClientOptions;
+import io.vertx.core.eventbus.EventBus;
+import io.vertx.core.file.FileSystem;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpClientResponse;
+import io.vertx.core.http.HttpConnection;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServer;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.http.RequestOptions;
+import io.vertx.core.http.WebSocket;
+import io.vertx.core.http.WebSocketConnectOptions;
+import io.vertx.core.http.WebsocketVersion;
+import io.vertx.core.net.NetClient;
+import io.vertx.core.net.NetClientOptions;
+import io.vertx.core.net.NetServer;
+import io.vertx.core.net.NetServerOptions;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.core.shareddata.SharedData;
+import io.vertx.core.spi.VerticleFactory;
+import io.vertx.core.streams.ReadStream;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.UriBuilder;
+import org.jboss.resteasy.reactive.client.handlers.ClientErrorHandler;
+import org.jboss.resteasy.reactive.client.handlers.ClientRequestFiltersRestHandler;
+import org.jboss.resteasy.reactive.client.handlers.ClientResponseRestHandler;
+import org.jboss.resteasy.reactive.client.handlers.ClientSendRequestHandler;
+import org.jboss.resteasy.reactive.client.spi.ClientContext;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+
+public class ClientImpl implements Client {
+
+    private static final int DEFAULT_CONNECT_TIMEOUT = 15000;
+
+    final ClientContext clientContext;
+    final boolean closeVertx;
+    final HttpClient httpClient;
+    final ConfigurationImpl configuration;
+    final HostnameVerifier hostnameVerifier;
+    final SSLContext sslContext;
+    private boolean isClosed;
+    final ClientRestHandler[] handlerChain;
+    final ClientRestHandler[] abortHandlerChain;
+    final Vertx vertx;
+
+    public ClientImpl(HttpClientOptions options, ConfigurationImpl configuration, ClientContext clientContext,
+            HostnameVerifier hostnameVerifier,
+            SSLContext sslContext) {
+        // TODO: ssl context
+        // TODO: hostnameVerifier
+        this.configuration = configuration != null ? configuration : new ConfigurationImpl(RuntimeType.CLIENT);
+        this.clientContext = clientContext;
+        this.hostnameVerifier = hostnameVerifier;
+        this.sslContext = sslContext;
+        Supplier<Vertx> vertx = clientContext.getVertx();
+        if (vertx != null) {
+            this.vertx = vertx.get();
+            closeVertx = false;
+        } else {
+            this.vertx = new LazyVertx(new Supplier<Vertx>() {
+                @Override
+                public Vertx get() {
+                    return Vertx.vertx();
+                }
+            });
+            closeVertx = true;
+        }
+        Object connectTimeoutMs = configuration == null ? null : configuration.getProperty(CONNECT_TIMEOUT);
+        if (connectTimeoutMs == null) {
+            options.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
+        } else {
+            options.setConnectTimeout((int) connectTimeoutMs);
+        }
+        this.httpClient = this.vertx.createHttpClient(options);
+        abortHandlerChain = new ClientRestHandler[] { new ClientErrorHandler() };
+        handlerChain = new ClientRestHandler[] { new ClientRequestFiltersRestHandler(), new ClientSendRequestHandler(),
+                new ClientResponseRestHandler() };
+    }
+
+    public ClientContext getClientContext() {
+        return clientContext;
+    }
+
+    @Override
+    public void close() {
+        if (isClosed)
+            return;
+        isClosed = true;
+        httpClient.close();
+        if (closeVertx) {
+            vertx.close();
+        }
+    }
+
+    void abortIfClosed() {
+        if (isClosed)
+            throw new IllegalStateException("Client is closed");
+    }
+
+    @Override
+    public WebTarget target(String uri) {
+        // close is checked in the other target call
+        Objects.requireNonNull(uri);
+        return target(UriBuilder.fromUri(uri));
+    }
+
+    @Override
+    public WebTarget target(URI uri) {
+        // close is checked in the other target call
+        Objects.requireNonNull(uri);
+        return target(UriBuilder.fromUri(uri));
+    }
+
+    @Override
+    public WebTarget target(UriBuilder uriBuilder) {
+        abortIfClosed();
+        Objects.requireNonNull(uriBuilder);
+        return new WebTargetImpl(this, httpClient, uriBuilder, new ConfigurationImpl(configuration), handlerChain,
+                abortHandlerChain, null);
+    }
+
+    @Override
+    public WebTarget target(Link link) {
+        // close is checked in the other target call
+        Objects.requireNonNull(link);
+        return target(UriBuilder.fromLink(link));
+    }
+
+    @Override
+    public Invocation.Builder invocation(Link link) {
+        abortIfClosed();
+        Objects.requireNonNull(link);
+        Builder request = target(link).request();
+        if (link.getType() != null)
+            request.accept(link.getType());
+        return request;
+    }
+
+    @Override
+    public SSLContext getSslContext() {
+        abortIfClosed();
+        return sslContext;
+    }
+
+    @Override
+    public HostnameVerifier getHostnameVerifier() {
+        abortIfClosed();
+        return hostnameVerifier;
+    }
+
+    @Override
+    public ConfigurationImpl getConfiguration() {
+        abortIfClosed();
+        return configuration;
+    }
+
+    @Override
+    public Client property(String name, Object value) {
+        abortIfClosed();
+        configuration.property(name, value);
+        return this;
+    }
+
+    @Override
+    public Client register(Class<?> componentClass) {
+        abortIfClosed();
+        configuration.register(componentClass);
+        return this;
+    }
+
+    @Override
+    public Client register(Class<?> componentClass, int priority) {
+        abortIfClosed();
+        configuration.register(componentClass, priority);
+        return this;
+    }
+
+    @Override
+    public Client register(Class<?> componentClass, Class<?>... contracts) {
+        abortIfClosed();
+        configuration.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public Client register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+        abortIfClosed();
+        configuration.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public Client register(Object component) {
+        abortIfClosed();
+        configuration.register(component);
+        return this;
+    }
+
+    @Override
+    public Client register(Object component, int priority) {
+        abortIfClosed();
+        configuration.register(component, priority);
+        return this;
+    }
+
+    @Override
+    public Client register(Object component, Class<?>... contracts) {
+        abortIfClosed();
+        configuration.register(component, contracts);
+        return this;
+    }
+
+    @Override
+    public Client register(Object component, Map<Class<?>, Integer> contracts) {
+        abortIfClosed();
+        configuration.register(component, contracts);
+        return this;
+    }
+
+    Vertx getVertx() {
+        return vertx;
+    }
+
+    /**
+     * The point of this class is to not obtain a Vertx reference unless it's absolutely necessary.
+     * We do this in order to avoid needing a Vertx object unless an proper client request is made.
+     * This saves us the need from needing to close the Vertx object.
+     */
+    private static class LazyVertx implements Vertx {
+        private final Supplier<Vertx> supplier;
+        private volatile Vertx supplied = null;
+
+        LazyVertx(Supplier<Vertx> supplier) {
+            this.supplier = supplier;
+        }
+
+        private Vertx getDelegate() {
+            if (supplied == null) {
+                supplied = supplier.get();
+            }
+            return supplied;
+        }
+
+        @Override
+        public Context getOrCreateContext() {
+            return getDelegate().getOrCreateContext();
+        }
+
+        @Override
+        public NetServer createNetServer(NetServerOptions netServerOptions) {
+            return getDelegate().createNetServer(netServerOptions);
+        }
+
+        @Override
+        public NetServer createNetServer() {
+            return getDelegate().createNetServer();
+        }
+
+        @Override
+        public NetClient createNetClient(NetClientOptions netClientOptions) {
+            return getDelegate().createNetClient(netClientOptions);
+        }
+
+        @Override
+        public NetClient createNetClient() {
+            return getDelegate().createNetClient();
+        }
+
+        @Override
+        public HttpServer createHttpServer(HttpServerOptions httpServerOptions) {
+            return getDelegate().createHttpServer(httpServerOptions);
+        }
+
+        @Override
+        public HttpServer createHttpServer() {
+            return getDelegate().createHttpServer();
+        }
+
+        @Override
+        public HttpClient createHttpClient(HttpClientOptions httpClientOptions) {
+            return new LazyHttpClient(new Supplier<HttpClient>() {
+                @Override
+                public HttpClient get() {
+                    return getDelegate().createHttpClient(httpClientOptions);
+                }
+            });
+        }
+
+        @Override
+        public HttpClient createHttpClient() {
+            return new LazyHttpClient(new Supplier<HttpClient>() {
+                @Override
+                public HttpClient get() {
+                    return getDelegate().createHttpClient();
+                }
+            });
+        }
+
+        @Override
+        public DatagramSocket createDatagramSocket(DatagramSocketOptions datagramSocketOptions) {
+            return getDelegate().createDatagramSocket(datagramSocketOptions);
+        }
+
+        @Override
+        public DatagramSocket createDatagramSocket() {
+            return getDelegate().createDatagramSocket();
+        }
+
+        @Override
+        public FileSystem fileSystem() {
+            return getDelegate().fileSystem();
+        }
+
+        @Override
+        public EventBus eventBus() {
+            return getDelegate().eventBus();
+        }
+
+        @Override
+        public DnsClient createDnsClient(int i, String s) {
+            return getDelegate().createDnsClient(i, s);
+        }
+
+        @Override
+        public DnsClient createDnsClient() {
+            return getDelegate().createDnsClient();
+        }
+
+        @Override
+        public DnsClient createDnsClient(DnsClientOptions dnsClientOptions) {
+            return getDelegate().createDnsClient(dnsClientOptions);
+        }
+
+        @Override
+        public SharedData sharedData() {
+            return getDelegate().sharedData();
+        }
+
+        @Override
+        public long setTimer(long l, Handler<Long> handler) {
+            return getDelegate().setTimer(l, handler);
+        }
+
+        @Override
+        public TimeoutStream timerStream(long l) {
+            return getDelegate().timerStream(l);
+        }
+
+        @Override
+        public long setPeriodic(long l, Handler<Long> handler) {
+            return getDelegate().setPeriodic(l, handler);
+        }
+
+        @Override
+        public TimeoutStream periodicStream(long l) {
+            return getDelegate().periodicStream(l);
+        }
+
+        @Override
+        public boolean cancelTimer(long l) {
+            return getDelegate().cancelTimer(l);
+        }
+
+        @Override
+        public void runOnContext(Handler<Void> handler) {
+            getDelegate().runOnContext(handler);
+        }
+
+        @Override
+        public void close() {
+            if (supplied != null) { // no need to close if we never obtained a reference
+                getDelegate().close();
+            }
+        }
+
+        @Override
+        public void close(Handler<AsyncResult<Void>> handler) {
+            if (supplied != null) { // no need to close if we never obtained a reference
+                getDelegate().close(handler);
+            }
+        }
+
+        @Override
+        public void deployVerticle(Verticle verticle) {
+            getDelegate().deployVerticle(verticle);
+        }
+
+        @Override
+        public void deployVerticle(Verticle verticle, Handler<AsyncResult<String>> handler) {
+            getDelegate().deployVerticle(verticle, handler);
+        }
+
+        @Override
+        public void deployVerticle(Verticle verticle, DeploymentOptions deploymentOptions) {
+            getDelegate().deployVerticle(verticle, deploymentOptions);
+        }
+
+        @Override
+        public void deployVerticle(Class<? extends Verticle> aClass, DeploymentOptions deploymentOptions) {
+            getDelegate().deployVerticle(aClass, deploymentOptions);
+        }
+
+        @Override
+        public void deployVerticle(Supplier<Verticle> supplier, DeploymentOptions deploymentOptions) {
+            getDelegate().deployVerticle(supplier, deploymentOptions);
+        }
+
+        @Override
+        public void deployVerticle(Verticle verticle, DeploymentOptions deploymentOptions,
+                Handler<AsyncResult<String>> handler) {
+            getDelegate().deployVerticle(verticle, deploymentOptions, handler);
+        }
+
+        @Override
+        public void deployVerticle(Class<? extends Verticle> aClass, DeploymentOptions deploymentOptions,
+                Handler<AsyncResult<String>> handler) {
+            getDelegate().deployVerticle(aClass, deploymentOptions, handler);
+        }
+
+        @Override
+        public void deployVerticle(Supplier<Verticle> supplier, DeploymentOptions deploymentOptions,
+                Handler<AsyncResult<String>> handler) {
+            getDelegate().deployVerticle(supplier, deploymentOptions, handler);
+        }
+
+        @Override
+        public void deployVerticle(String s) {
+            getDelegate().deployVerticle(s);
+        }
+
+        @Override
+        public void deployVerticle(String s, Handler<AsyncResult<String>> handler) {
+            getDelegate().deployVerticle(s, handler);
+        }
+
+        @Override
+        public void deployVerticle(String s, DeploymentOptions deploymentOptions) {
+            getDelegate().deployVerticle(s, deploymentOptions);
+        }
+
+        @Override
+        public void deployVerticle(String s, DeploymentOptions deploymentOptions, Handler<AsyncResult<String>> handler) {
+            getDelegate().deployVerticle(s, deploymentOptions, handler);
+        }
+
+        @Override
+        public void undeploy(String s) {
+            getDelegate().undeploy(s);
+        }
+
+        @Override
+        public void undeploy(String s, Handler<AsyncResult<Void>> handler) {
+            getDelegate().undeploy(s, handler);
+        }
+
+        @Override
+        public Set<String> deploymentIDs() {
+            return getDelegate().deploymentIDs();
+        }
+
+        @Override
+        public void registerVerticleFactory(VerticleFactory verticleFactory) {
+            getDelegate().registerVerticleFactory(verticleFactory);
+        }
+
+        @Override
+        public void unregisterVerticleFactory(VerticleFactory verticleFactory) {
+            getDelegate().unregisterVerticleFactory(verticleFactory);
+        }
+
+        @Override
+        public Set<VerticleFactory> verticleFactories() {
+            return getDelegate().verticleFactories();
+        }
+
+        @Override
+        public boolean isClustered() {
+            return getDelegate().isClustered();
+        }
+
+        @Override
+        public <T> void executeBlocking(Handler<Promise<T>> handler, boolean b, Handler<AsyncResult<T>> handler1) {
+            getDelegate().executeBlocking(handler, b, handler1);
+        }
+
+        @Override
+        public <T> void executeBlocking(Handler<Promise<T>> handler, Handler<AsyncResult<T>> handler1) {
+            getDelegate().executeBlocking(handler, handler1);
+        }
+
+        @Override
+        public EventLoopGroup nettyEventLoopGroup() {
+            return getDelegate().nettyEventLoopGroup();
+        }
+
+        @Override
+        public WorkerExecutor createSharedWorkerExecutor(String s) {
+            return getDelegate().createSharedWorkerExecutor(s);
+        }
+
+        @Override
+        public WorkerExecutor createSharedWorkerExecutor(String s, int i) {
+            return getDelegate().createSharedWorkerExecutor(s, i);
+        }
+
+        @Override
+        public WorkerExecutor createSharedWorkerExecutor(String s, int i, long l) {
+            return getDelegate().createSharedWorkerExecutor(s, i, l);
+        }
+
+        @Override
+        public WorkerExecutor createSharedWorkerExecutor(String s, int i, long l, TimeUnit timeUnit) {
+            return getDelegate().createSharedWorkerExecutor(s, i, l, timeUnit);
+        }
+
+        @Override
+        public boolean isNativeTransportEnabled() {
+            return getDelegate().isNativeTransportEnabled();
+        }
+
+        @Override
+        public Vertx exceptionHandler(Handler<Throwable> handler) {
+            return getDelegate().exceptionHandler(handler);
+        }
+
+        @Override
+        public Handler<Throwable> exceptionHandler() {
+            return getDelegate().exceptionHandler();
+        }
+
+        @Override
+        public boolean isMetricsEnabled() {
+            return getDelegate().isMetricsEnabled();
+        }
+
+        private static class LazyHttpClient implements HttpClient {
+            private final Supplier<HttpClient> supplier;
+            private volatile HttpClient supplied = null;
+
+            LazyHttpClient(Supplier<HttpClient> supplier) {
+                this.supplier = supplier;
+            }
+
+            private HttpClient getDelegate() {
+                if (supplied == null) {
+                    supplied = supplier.get();
+                }
+                return supplied;
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, SocketAddress socketAddress,
+                    RequestOptions requestOptions) {
+                return getDelegate().request(httpMethod, socketAddress, requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, RequestOptions requestOptions) {
+                return getDelegate().request(httpMethod, requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, int i, String s, String s1) {
+                return getDelegate().request(httpMethod, i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, SocketAddress socketAddress, int i, String s, String s1) {
+                return getDelegate().request(httpMethod, socketAddress, i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, String s, String s1) {
+                return getDelegate().request(httpMethod, s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest request(HttpMethod httpMethod, RequestOptions requestOptions,
+                    Handler<HttpClientResponse> handler) {
+                return getDelegate().request(httpMethod, requestOptions, handler);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, SocketAddress socketAddress, RequestOptions requestOptions,
+                    Handler<HttpClientResponse> handler) {
+                return getDelegate().request(httpMethod, socketAddress, requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest request(HttpMethod httpMethod, int i, String s, String s1,
+                    Handler<HttpClientResponse> handler) {
+                return getDelegate().request(httpMethod, i, s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, SocketAddress socketAddress, int i, String s, String s1,
+                    Handler<HttpClientResponse> handler) {
+                return getDelegate().request(httpMethod, socketAddress, i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest request(HttpMethod httpMethod, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().request(httpMethod, s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest request(HttpMethod httpMethod, String s) {
+                return getDelegate().request(httpMethod, s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest request(HttpMethod httpMethod, String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().request(httpMethod, s, handler);
+            }
+
+            @Override
+            public HttpClientRequest requestAbs(HttpMethod httpMethod, String s) {
+                return getDelegate().requestAbs(httpMethod, s);
+            }
+
+            @Override
+            public HttpClientRequest requestAbs(HttpMethod httpMethod, SocketAddress socketAddress, String s) {
+                return getDelegate().requestAbs(httpMethod, socketAddress, s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest requestAbs(HttpMethod httpMethod, String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().requestAbs(httpMethod, s, handler);
+            }
+
+            @Override
+            public HttpClientRequest requestAbs(HttpMethod httpMethod, SocketAddress socketAddress, String s,
+                    Handler<HttpClientResponse> handler) {
+                return getDelegate().requestAbs(httpMethod, socketAddress, s, handler);
+            }
+
+            @Override
+            public HttpClientRequest get(RequestOptions requestOptions) {
+                return getDelegate().get(requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest get(int i, String s, String s1) {
+                return getDelegate().get(i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest get(String s, String s1) {
+                return getDelegate().get(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest get(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().get(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest get(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().get(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest get(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().get(s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest get(String s) {
+                return getDelegate().get(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest get(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().get(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest getAbs(String s) {
+                return getDelegate().getAbs(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest getAbs(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().getAbs(s, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient getNow(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().getNow(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient getNow(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().getNow(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient getNow(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().getNow(s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient getNow(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().getNow(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest post(RequestOptions requestOptions) {
+                return getDelegate().post(requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest post(int i, String s, String s1) {
+                return getDelegate().post(i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest post(String s, String s1) {
+                return getDelegate().post(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest post(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().post(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest post(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().post(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest post(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().post(s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest post(String s) {
+                return getDelegate().post(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest post(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().post(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest postAbs(String s) {
+                return getDelegate().postAbs(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest postAbs(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().postAbs(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest head(RequestOptions requestOptions) {
+                return getDelegate().head(requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest head(int i, String s, String s1) {
+                return getDelegate().head(i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest head(String s, String s1) {
+                return getDelegate().head(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest head(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().head(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest head(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().head(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest head(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().head(s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest head(String s) {
+                return getDelegate().head(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest head(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().head(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest headAbs(String s) {
+                return getDelegate().headAbs(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest headAbs(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().headAbs(s, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient headNow(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().headNow(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient headNow(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().headNow(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient headNow(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().headNow(s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient headNow(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().headNow(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest options(RequestOptions requestOptions) {
+                return getDelegate().options(requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest options(int i, String s, String s1) {
+                return getDelegate().options(i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest options(String s, String s1) {
+                return getDelegate().options(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest options(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().options(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest options(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().options(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest options(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().options(s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest options(String s) {
+                return getDelegate().options(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest options(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().options(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest optionsAbs(String s) {
+                return getDelegate().optionsAbs(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest optionsAbs(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().optionsAbs(s, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient optionsNow(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().optionsNow(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient optionsNow(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().optionsNow(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient optionsNow(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().optionsNow(s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient optionsNow(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().optionsNow(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest put(RequestOptions requestOptions) {
+                return getDelegate().put(requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest put(int i, String s, String s1) {
+                return getDelegate().put(i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest put(String s, String s1) {
+                return getDelegate().put(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest put(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().put(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest put(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().put(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest put(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().put(s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest put(String s) {
+                return getDelegate().put(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest put(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().put(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest putAbs(String s) {
+                return getDelegate().putAbs(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest putAbs(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().putAbs(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest delete(RequestOptions requestOptions) {
+                return getDelegate().delete(requestOptions);
+            }
+
+            @Override
+            public HttpClientRequest delete(int i, String s, String s1) {
+                return getDelegate().delete(i, s, s1);
+            }
+
+            @Override
+            public HttpClientRequest delete(String s, String s1) {
+                return getDelegate().delete(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest delete(RequestOptions requestOptions, Handler<HttpClientResponse> handler) {
+                return getDelegate().delete(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest delete(int i, String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().delete(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest delete(String s, String s1, Handler<HttpClientResponse> handler) {
+                return getDelegate().delete(s, s1, handler);
+            }
+
+            @Override
+            public HttpClientRequest delete(String s) {
+                return getDelegate().delete(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest delete(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().delete(s, handler);
+            }
+
+            @Override
+            public HttpClientRequest deleteAbs(String s) {
+                return getDelegate().deleteAbs(s);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClientRequest deleteAbs(String s, Handler<HttpClientResponse> handler) {
+                return getDelegate().deleteAbs(s, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, Handler<WebSocket> handler) {
+                return getDelegate().websocket(requestOptions, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, Handler<WebSocket> handler) {
+                return getDelegate().websocket(i, s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, Handler<WebSocket> handler,
+                    Handler<Throwable> handler1) {
+                return getDelegate().websocket(requestOptions, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(i, s, s1, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, s1, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, MultiMap multiMap, Handler<WebSocket> handler) {
+                return getDelegate().websocket(requestOptions, multiMap, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, MultiMap multiMap, Handler<WebSocket> handler) {
+                return getDelegate().websocket(i, s, s1, multiMap, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, MultiMap multiMap, Handler<WebSocket> handler,
+                    Handler<Throwable> handler1) {
+                return getDelegate().websocket(requestOptions, multiMap, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, MultiMap multiMap, Handler<WebSocket> handler,
+                    Handler<Throwable> handler1) {
+                return getDelegate().websocket(i, s, s1, multiMap, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, MultiMap multiMap, Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, s1, multiMap, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, MultiMap multiMap, Handler<WebSocket> handler,
+                    Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, s1, multiMap, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler) {
+                return getDelegate().websocket(requestOptions, multiMap, websocketVersion, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler) {
+                return getDelegate().websocket(i, s, s1, multiMap, websocketVersion, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(requestOptions, multiMap, websocketVersion, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(i, s, s1, multiMap, websocketVersion, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, s1, multiMap, websocketVersion, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, s1, multiMap, websocketVersion, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    String s, Handler<WebSocket> handler) {
+                return getDelegate().websocket(requestOptions, multiMap, websocketVersion, s, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    String s2, Handler<WebSocket> handler) {
+                return getDelegate().websocket(i, s, s1, multiMap, websocketVersion, s2, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocketAbs(String s, MultiMap multiMap, WebsocketVersion websocketVersion, String s1,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocketAbs(s, multiMap, websocketVersion, s1, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(RequestOptions requestOptions, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    String s, Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(requestOptions, multiMap, websocketVersion, s, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(int i, String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    String s2, Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(i, s, s1, multiMap, websocketVersion, s2, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion, String s2,
+                    Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, s1, multiMap, websocketVersion, s2, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, String s1, MultiMap multiMap, WebsocketVersion websocketVersion, String s2,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, s1, multiMap, websocketVersion, s2, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, MultiMap multiMap, Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, multiMap, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, MultiMap multiMap, Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, multiMap, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, multiMap, websocketVersion, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, multiMap, websocketVersion, handler, handler1);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, MultiMap multiMap, WebsocketVersion websocketVersion, String s1,
+                    Handler<WebSocket> handler) {
+                return getDelegate().websocket(s, multiMap, websocketVersion, s1, handler);
+            }
+
+            @Override
+            @Deprecated
+            public HttpClient websocket(String s, MultiMap multiMap, WebsocketVersion websocketVersion, String s1,
+                    Handler<WebSocket> handler, Handler<Throwable> handler1) {
+                return getDelegate().websocket(s, multiMap, websocketVersion, s1, handler, handler1);
+            }
+
+            @Override
+            public void webSocket(int i, String s, String s1, Handler<AsyncResult<WebSocket>> handler) {
+                getDelegate().webSocket(i, s, s1, handler);
+            }
+
+            @Override
+            public void webSocket(String s, String s1, Handler<AsyncResult<WebSocket>> handler) {
+                getDelegate().webSocket(s, s1, handler);
+            }
+
+            @Override
+            public void webSocket(String s, Handler<AsyncResult<WebSocket>> handler) {
+                getDelegate().webSocket(s, handler);
+            }
+
+            @Override
+            public void webSocket(WebSocketConnectOptions webSocketConnectOptions, Handler<AsyncResult<WebSocket>> handler) {
+                getDelegate().webSocket(webSocketConnectOptions, handler);
+            }
+
+            @Override
+            public void webSocketAbs(String s, MultiMap multiMap, WebsocketVersion websocketVersion, List<String> list,
+                    Handler<AsyncResult<WebSocket>> handler) {
+                getDelegate().webSocketAbs(s, multiMap, websocketVersion, list, handler);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(RequestOptions requestOptions) {
+                return getDelegate().websocketStream(requestOptions);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(int i, String s, String s1) {
+                return getDelegate().websocketStream(i, s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, String s1) {
+                return getDelegate().websocketStream(s, s1);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(RequestOptions requestOptions, MultiMap multiMap) {
+                return getDelegate().websocketStream(requestOptions, multiMap);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(int i, String s, String s1, MultiMap multiMap) {
+                return getDelegate().websocketStream(i, s, s1, multiMap);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, String s1, MultiMap multiMap) {
+                return getDelegate().websocketStream(s, s1, multiMap);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(RequestOptions requestOptions, MultiMap multiMap,
+                    WebsocketVersion websocketVersion) {
+                return getDelegate().websocketStream(requestOptions, multiMap, websocketVersion);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(int i, String s, String s1, MultiMap multiMap,
+                    WebsocketVersion websocketVersion) {
+                return getDelegate().websocketStream(i, s, s1, multiMap, websocketVersion);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, String s1, MultiMap multiMap,
+                    WebsocketVersion websocketVersion) {
+                return getDelegate().websocketStream(s, s1, multiMap, websocketVersion);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStreamAbs(String s, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    String s1) {
+                return getDelegate().websocketStreamAbs(s, multiMap, websocketVersion, s1);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(RequestOptions requestOptions, MultiMap multiMap,
+                    WebsocketVersion websocketVersion, String s) {
+                return getDelegate().websocketStream(requestOptions, multiMap, websocketVersion, s);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(int i, String s, String s1, MultiMap multiMap,
+                    WebsocketVersion websocketVersion, String s2) {
+                return getDelegate().websocketStream(i, s, s1, multiMap, websocketVersion, s2);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, String s1, MultiMap multiMap,
+                    WebsocketVersion websocketVersion, String s2) {
+                return getDelegate().websocketStream(s, s1, multiMap, websocketVersion, s2);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s) {
+                return getDelegate().websocketStream(s);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, MultiMap multiMap) {
+                return getDelegate().websocketStream(s, multiMap);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, MultiMap multiMap, WebsocketVersion websocketVersion) {
+                return getDelegate().websocketStream(s, multiMap, websocketVersion);
+            }
+
+            @Override
+            @Deprecated
+            public ReadStream<WebSocket> websocketStream(String s, MultiMap multiMap, WebsocketVersion websocketVersion,
+                    String s1) {
+                return getDelegate().websocketStream(s, multiMap, websocketVersion, s1);
+            }
+
+            @Override
+            public HttpClient connectionHandler(Handler<HttpConnection> handler) {
+                return getDelegate().connectionHandler(handler);
+            }
+
+            @Override
+            public HttpClient redirectHandler(Function<HttpClientResponse, Future<HttpClientRequest>> function) {
+                return getDelegate().redirectHandler(function);
+            }
+
+            @Override
+            public Function<HttpClientResponse, Future<HttpClientRequest>> redirectHandler() {
+                return getDelegate().redirectHandler();
+            }
+
+            @Override
+            public void close() {
+                if (supplied != null) { // no need to close if we never obtained a reference
+                    getDelegate().close();
+                }
+            }
+
+            @Override
+            public boolean isMetricsEnabled() {
+                return getDelegate().isMetricsEnabled();
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java
new file mode 100644
index 0000000000000..aef0e9721a344
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientProxies.java
@@ -0,0 +1,30 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.util.Map;
+import java.util.function.Function;
+import javax.ws.rs.client.WebTarget;
+import org.jboss.resteasy.reactive.client.api.InvalidRestClientDefinitionException;
+
+public class ClientProxies {
+
+    final Map<Class<?>, Function<WebTarget, ?>> clientProxies;
+    private final Map<Class<?>, String> failures;
+
+    public ClientProxies(Map<Class<?>, Function<WebTarget, ?>> clientProxies, Map<Class<?>, String> failures) {
+        this.clientProxies = clientProxies;
+        this.failures = failures;
+    }
+
+    public <T> T get(Class<?> clazz, WebTarget webTarget) {
+        Function<WebTarget, ?> function = clientProxies.get(clazz);
+        if (function == null) {
+            String failure = failures.get(clazz);
+            if (failure != null) {
+                throw new InvalidRestClientDefinitionException("Failed to generate client for class " + clazz + failure);
+            } else {
+                throw new IllegalArgumentException("Not a REST client interface: " + clazz);
+            }
+        }
+        return (T) function.apply(webTarget);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java
new file mode 100644
index 0000000000000..86641275cc520
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientReaderInterceptorContextImpl.java
@@ -0,0 +1,84 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+
+public class ClientReaderInterceptorContextImpl extends AbstractClientInterceptorContextImpl
+        implements ReaderInterceptorContext {
+
+    final ConfigurationImpl configuration;
+    final Serialisers serialisers;
+    InputStream inputStream;
+    boolean done = false;
+    private int index = 0;
+    private final ReaderInterceptor[] interceptors;
+    private final MultivaluedMap<String, String> headers = new CaseInsensitiveMap<>();
+
+    public ClientReaderInterceptorContextImpl(Annotation[] annotations, Class<?> entityClass, Type entityType,
+            MediaType mediaType,
+            Map<String, Object> properties, MultivaluedMap<String, String> headers,
+            ConfigurationImpl configuration, Serialisers serialisers, InputStream inputStream,
+            ReaderInterceptor[] interceptors) {
+        super(annotations, entityClass, entityType, mediaType, properties);
+        this.configuration = configuration;
+        this.serialisers = serialisers;
+        this.inputStream = inputStream;
+        this.interceptors = interceptors;
+        this.headers.putAll(headers);
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Override
+    public Object proceed() throws IOException, WebApplicationException {
+        if (index == interceptors.length) {
+            List<MessageBodyReader<?>> readers = serialisers.findReaders(configuration, entityClass, mediaType,
+                    RuntimeType.CLIENT);
+            for (MessageBodyReader<?> reader : readers) {
+                if (reader.isReadable(entityClass, entityType, annotations, mediaType)) {
+                    try {
+                        return ((MessageBodyReader) reader).readFrom(entityClass, entityType, annotations, mediaType, headers,
+                                inputStream);
+                    } catch (IOException e) {
+                        throw new ProcessingException(e);
+                    }
+                }
+            }
+            // Spec says to throw this
+            throw new ProcessingException(
+                    "Request could not be mapped to type " + entityType);
+        } else {
+            return interceptors[index++].aroundReadFrom(this);
+        }
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+
+    @Override
+    public void setInputStream(InputStream is) {
+        this.inputStream = is;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getHeaders() {
+        return headers;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java
new file mode 100644
index 0000000000000..9346ac2fe427a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestContextImpl.java
@@ -0,0 +1,464 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.NotImplementedYet;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+
+public class ClientRequestContextImpl implements ClientRequestContext {
+
+    private final Client client;
+    private final ConfigurationImpl configuration;
+    private final RestClientRequestContext restClientRequestContext;
+    private final ClientRequestHeadersMap headersMap;
+    private OutputStream entityStream;
+
+    public ClientRequestContextImpl(RestClientRequestContext restClientRequestContext, ClientImpl client,
+            ConfigurationImpl configuration) {
+        this.restClientRequestContext = restClientRequestContext;
+        this.client = client;
+        this.configuration = configuration;
+        this.headersMap = new ClientRequestHeadersMap(); //restClientRequestContext.requestHeaders.getHeaders()
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return restClientRequestContext.properties.get(name);
+    }
+
+    @Override
+    public Collection<String> getPropertyNames() {
+        // TCK says the property names need to be immutable
+        return Collections.unmodifiableSet(restClientRequestContext.properties.keySet());
+    }
+
+    @Override
+    public void setProperty(String name, Object object) {
+        restClientRequestContext.properties.put(name, object);
+    }
+
+    @Override
+    public void removeProperty(String name) {
+        restClientRequestContext.properties.remove(name);
+    }
+
+    @Override
+    public URI getUri() {
+        return restClientRequestContext.uri;
+    }
+
+    @Override
+    public void setUri(URI uri) {
+        restClientRequestContext.uri = uri;
+    }
+
+    @Override
+    public String getMethod() {
+        return restClientRequestContext.httpMethod;
+    }
+
+    @Override
+    public void setMethod(String method) {
+        restClientRequestContext.httpMethod = method;
+    }
+
+    @Override
+    public MultivaluedMap<String, Object> getHeaders() {
+        return headersMap;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getStringHeaders() {
+        CaseInsensitiveMap<String> map = new CaseInsensitiveMap<String>();
+        for (Map.Entry<String, List<Object>> entry : headersMap.entrySet()) {
+            for (Object obj : entry.getValue()) {
+                map.add(entry.getKey(), HeaderUtil.headerToString(obj));
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return HeaderUtil.getHeaderString(headersMap, name);
+    }
+
+    @Override
+    public Date getDate() {
+        return HeaderUtil.getDate(headersMap);
+    }
+
+    @Override
+    public Locale getLanguage() {
+        // those come from the entity
+        return restClientRequestContext.entity != null ? restClientRequestContext.entity.getLanguage() : null;
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        // those come from the entity
+        return restClientRequestContext.entity != null ? restClientRequestContext.entity.getMediaType() : null;
+    }
+
+    @Override
+    public List<MediaType> getAcceptableMediaTypes() {
+        List<MediaType> acceptableMediaTypes = HeaderUtil.getAcceptableMediaTypes(headersMap);
+        if (acceptableMediaTypes.isEmpty()) {
+            return singletonList(MediaType.WILDCARD_TYPE);
+        }
+        return acceptableMediaTypes;
+    }
+
+    @Override
+    public List<Locale> getAcceptableLanguages() {
+        return HeaderUtil.getAcceptableLanguages(headersMap);
+    }
+
+    @Override
+    public Map<String, Cookie> getCookies() {
+        return HeaderUtil.getCookies(headersMap);
+    }
+
+    @Override
+    public boolean hasEntity() {
+        return restClientRequestContext.entity != null;
+    }
+
+    @Override
+    public Object getEntity() {
+        Entity<?> entity = restClientRequestContext.entity;
+        if (entity != null) {
+            Object ret = entity.getEntity();
+            if (ret instanceof GenericEntity) {
+                return ((GenericEntity<?>) ret).getEntity();
+            }
+            return ret;
+        }
+        return null;
+    }
+
+    @Override
+    public Class<?> getEntityClass() {
+        Entity<?> entity = restClientRequestContext.entity;
+        if (entity != null) {
+            Object ret = entity.getEntity();
+            if (ret instanceof GenericEntity) {
+                return ((GenericEntity<?>) ret).getRawType();
+            }
+            return ret.getClass();
+        }
+        return null;
+    }
+
+    @Override
+    public Type getEntityType() {
+        Entity<?> entity = restClientRequestContext.entity;
+        if (entity != null) {
+            Object ret = entity.getEntity();
+            if (ret instanceof GenericEntity) {
+                return ((GenericEntity<?>) ret).getType();
+            }
+            return ret.getClass();
+        }
+        return null;
+    }
+
+    @Override
+    public void setEntity(Object entity) {
+        setEntity(entity, Serialisers.NO_ANNOTATION, null);
+    }
+
+    @Override
+    public void setEntity(Object entity, Annotation[] annotations, MediaType mediaType) {
+        restClientRequestContext.setEntity(entity, annotations, mediaType);
+    }
+
+    @Override
+    public Annotation[] getEntityAnnotations() {
+        return restClientRequestContext.entity != null ? restClientRequestContext.entity.getAnnotations()
+                : Serialisers.NO_ANNOTATION;
+    }
+
+    @Override
+    public OutputStream getEntityStream() {
+        throw new NotImplementedYet();
+    }
+
+    @Override
+    public void setEntityStream(OutputStream outputStream) {
+        throw new NotImplementedYet();
+    }
+
+    @Override
+    public Client getClient() {
+        return client;
+    }
+
+    @Override
+    public Configuration getConfiguration() {
+        return configuration;
+    }
+
+    @Override
+    public void abortWith(Response response) {
+        restClientRequestContext.setAbortedWith(response);
+    }
+
+    public RestClientRequestContext getRestClientRequestContext() {
+        return restClientRequestContext;
+    }
+
+    public Response getAbortedWith() {
+        return restClientRequestContext.getAbortedWith();
+    }
+
+    private class ClientRequestHeadersMap implements MultivaluedMap<String, Object> {
+
+        public static final String CONTENT_TYPE = "Content-Type";
+
+        @Override
+        public void putSingle(String key, Object value) {
+            restClientRequestContext.requestHeaders.getHeaders().putSingle(key, value);
+        }
+
+        @Override
+        public void add(String key, Object value) {
+            restClientRequestContext.requestHeaders.getHeaders().add(key, value);
+        }
+
+        @Override
+        public Object getFirst(String key) {
+            return restClientRequestContext.requestHeaders.getHeaders().getFirst(key);
+        }
+
+        @Override
+        public void addAll(String key, Object... newValues) {
+            restClientRequestContext.requestHeaders.getHeaders().addAll(key, newValues);
+        }
+
+        @Override
+        public void addAll(String key, List<Object> valueList) {
+            restClientRequestContext.requestHeaders.getHeaders().addAll(key, valueList);
+        }
+
+        @Override
+        public void addFirst(String key, Object value) {
+            restClientRequestContext.requestHeaders.getHeaders().addFirst(key, value);
+        }
+
+        @Override
+        public boolean equalsIgnoreValueOrder(MultivaluedMap<String, Object> otherMap) {
+            if (this == otherMap) {
+                return true;
+            }
+            CaseInsensitiveMap<Object> headers = restClientRequestContext.requestHeaders.getHeaders();
+
+            boolean contentTypeMatched = false;
+            int checkedKeyCount = 0;
+            for (Entry<String, List<Object>> otherEntry : otherMap.entrySet()) {
+                checkedKeyCount++;
+                if (otherEntry.getKey().equalsIgnoreCase(CONTENT_TYPE)) {
+                    contentTypeMatched = true;
+                    List<Object> contentTypes = headers.get(CONTENT_TYPE);
+
+                    if (contentTypes == null) {
+                        String mediaType = mediaType();
+                        if (mediaType != null) {
+                            contentTypes = singletonList(mediaType);
+                        } else {
+                            contentTypes = emptyList();
+                        }
+                    }
+                    for (Object value : otherEntry.getValue()) {
+                        if (!contentTypes.contains(value)) {
+                            return false;
+                        }
+                    }
+                } else {
+                    List<Object> otherValues = otherEntry.getValue();
+                    List<Object> values = headers.get(otherEntry.getKey());
+                    if (otherValues.size() != values.size()) {
+                        return false;
+                    }
+                    for (Object value : otherValues) {
+                        if (!values.contains(value)) {
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            if (!contentTypeMatched && (headers.containsKey(CONTENT_TYPE) || mediaType() != null)) {
+                return false;
+            }
+
+            return checkedKeyCount == headers.keySet().size();
+        }
+
+        @Override
+        public int size() {
+            CaseInsensitiveMap<Object> headers = restClientRequestContext.requestHeaders.getHeaders();
+            return headers.containsKey(CONTENT_TYPE) ? headers.size() : headers.size() + 1;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return restClientRequestContext.requestHeaders.getHeaders().isEmpty() &&
+                    (restClientRequestContext.entity == null || restClientRequestContext.entity.getMediaType() == null);
+        }
+
+        @Override
+        public boolean containsKey(Object key) {
+            return restClientRequestContext.requestHeaders.getHeaders().containsKey(key) ||
+                    (isContentType(key) && restClientRequestContext.entity.getMediaType() != null);
+        }
+
+        @Override
+        public boolean containsValue(Object value) {
+            return restClientRequestContext.requestHeaders.getHeaders().containsValue(value)
+                    || (mediaType() != null && mediaType().equals(value));
+        }
+
+        @Override
+        public List<Object> get(Object key) {
+            List<Object> result = restClientRequestContext.requestHeaders.getHeaders().get(key);
+            String mediaType = mediaType();
+            if (result == null && isContentType(key) && mediaType != null) {
+                result = new ArrayList<>(singletonList(mediaType));
+            }
+            return result;
+        }
+
+        @Override
+        public List<Object> put(String key, List<Object> value) {
+            return restClientRequestContext.requestHeaders.getHeaders().put(key, value);
+        }
+
+        @Override
+        public List<Object> remove(Object key) {
+            return restClientRequestContext.requestHeaders.getHeaders().remove(key);
+        }
+
+        @Override
+        public void putAll(Map<? extends String, ? extends List<Object>> m) {
+            restClientRequestContext.requestHeaders.getHeaders().putAll(m);
+        }
+
+        @Override
+        public void clear() {
+            restClientRequestContext.requestHeaders.getHeaders().clear();
+        }
+
+        @Override
+        public Set<String> keySet() {
+            Set<String> keys = restClientRequestContext.requestHeaders.getHeaders().keySet();
+            if (keys.contains(HttpHeaders.CONTENT_TYPE) || mediaType() == null) {
+                return keys;
+            } else {
+                Set<String> keysWithContentType = new TreeSet<>();
+                // TODO this is a copy of the set, it should be a set "connected" to the underlying map
+                keysWithContentType.add(HttpHeaders.CONTENT_TYPE);
+                keysWithContentType.addAll(keys);
+                return keysWithContentType;
+            }
+        }
+
+        @Override
+        public Collection<List<Object>> values() {
+            CaseInsensitiveMap<Object> headers = restClientRequestContext.requestHeaders.getHeaders();
+            Collection<List<Object>> values = headers.values();
+            if (headers.containsKey(HttpHeaders.CONTENT_TYPE) || mediaType() == null) {
+                return values;
+            } else {
+                ArrayList<List<Object>> result = new ArrayList<>(values);
+                result.add(singletonList(mediaType()));
+                return result;
+            }
+        }
+
+        @Override
+        public Set<Entry<String, List<Object>>> entrySet() {
+            CaseInsensitiveMap<Object> headers = restClientRequestContext.requestHeaders.getHeaders();
+            Set<Entry<String, List<Object>>> entries = headers.entrySet();
+            if (headers.containsKey(HttpHeaders.CONTENT_TYPE) || mediaType() == null) {
+                return entries;
+            } else {
+                return new AbstractSet<Entry<String, List<Object>>>() {
+                    @Override
+                    public Iterator<Entry<String, List<Object>>> iterator() {
+                        final AtomicBoolean contentTypeReturned = new AtomicBoolean(false);
+                        Iterator<Entry<String, List<Object>>> iterator = entries.iterator();
+                        return new Iterator<Entry<String, List<Object>>>() {
+                            @Override
+                            public boolean hasNext() {
+                                return iterator.hasNext() || !contentTypeReturned.get();
+                            }
+
+                            @Override
+                            public Entry<String, List<Object>> next() {
+                                if (iterator.hasNext()) {
+                                    return iterator.next();
+                                } else if (!contentTypeReturned.get()) {
+                                    contentTypeReturned.set(true);
+                                    return new AbstractMap.SimpleEntry<>(HttpHeaders.CONTENT_TYPE, singletonList(mediaType()));
+                                } else {
+                                    throw new NoSuchElementException();
+                                }
+                            }
+                        };
+                    }
+
+                    @Override
+                    public int size() {
+                        return entries.size() + 1;
+                    }
+                };
+            }
+        }
+
+        private boolean isContentType(Object key) {
+            return key instanceof String && ((String) key).equalsIgnoreCase(HttpHeaders.CONTENT_TYPE);
+        }
+
+        private String mediaType() {
+            Entity<?> entity = restClientRequestContext.entity;
+            return entity == null
+                    ? null
+                    : entity.getMediaType() == null
+                            ? null
+                            : entity.getMediaType().toString();
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java
new file mode 100644
index 0000000000000..6e5145b61644f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientRequestHeaders.java
@@ -0,0 +1,186 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class ClientRequestHeaders {
+    protected CaseInsensitiveMap<Object> headers = new CaseInsensitiveMap<Object>();
+    protected ConfigurationImpl configuration;
+
+    public ClientRequestHeaders(final ConfigurationImpl configuration) {
+        this.configuration = configuration;
+    }
+
+    public CaseInsensitiveMap<Object> getHeaders() {
+        return headers;
+    }
+
+    public void setHeaders(MultivaluedMap<String, Object> newHeaders) {
+        headers.clear();
+        if (newHeaders == null)
+            return;
+        headers.putAll(newHeaders);
+    }
+
+    public void setLanguage(Locale language) {
+        //if this already set by HeaderParamProcessor
+        if (this.getHeader(HttpHeaders.CONTENT_LANGUAGE) != null) {
+            return;
+        }
+        if (language == null) {
+            headers.remove(HttpHeaders.CONTENT_LANGUAGE);
+            return;
+        }
+        headers.putSingle(HttpHeaders.CONTENT_LANGUAGE, language);
+    }
+
+    public void setLanguage(String language) {
+        setLanguage(new Locale(language));
+    }
+
+    public void setMediaType(MediaType mediaType) {
+        if (mediaType == null) {
+            headers.remove(HttpHeaders.CONTENT_TYPE);
+            return;
+        }
+        headers.putSingle(HttpHeaders.CONTENT_TYPE, mediaType);
+    }
+
+    public void acceptLanguage(Locale... locales) {
+        String accept = (String) headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE);
+        StringBuilder builder = buildAcceptString(accept, locales);
+        headers.putSingle(HttpHeaders.ACCEPT_LANGUAGE, builder.toString());
+    }
+
+    public void acceptLanguage(String... locales) {
+        String accept = (String) headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE);
+        StringBuilder builder = buildAcceptString(accept, locales);
+        headers.putSingle(HttpHeaders.ACCEPT_LANGUAGE, builder.toString());
+    }
+
+    private StringBuilder buildAcceptString(String accept, Object[] items) {
+        StringBuilder builder = new StringBuilder();
+        if (accept != null)
+            builder.append(accept).append(", ");
+
+        boolean isFirst = true;
+        for (Object l : items) {
+            if (isFirst) {
+                isFirst = false;
+            } else {
+                builder.append(", ");
+            }
+            builder.append(HeaderUtil.headerToString(l));
+        }
+        return builder;
+    }
+
+    public void acceptEncoding(String... encodings) {
+        String accept = (String) headers.getFirst(HttpHeaders.ACCEPT_ENCODING);
+        StringBuilder builder = buildAcceptString(accept, encodings);
+        headers.putSingle(HttpHeaders.ACCEPT_ENCODING, builder.toString());
+    }
+
+    public void accept(String... types) {
+        String accept = (String) headers.getFirst(HttpHeaders.ACCEPT);
+        StringBuilder builder = buildAcceptString(accept, types);
+        headers.putSingle(HttpHeaders.ACCEPT, builder.toString());
+    }
+
+    public void accept(MediaType... types) {
+        String accept = (String) headers.getFirst(HttpHeaders.ACCEPT);
+        StringBuilder builder = buildAcceptString(accept, types);
+        headers.putSingle(HttpHeaders.ACCEPT, builder.toString());
+    }
+
+    public void cookie(Cookie cookie) {
+        if (!(Cookie.class.equals(cookie.getClass()))) {
+            cookie = new Cookie(cookie.getName(), cookie.getValue(), cookie.getPath(), cookie.getDomain(), cookie.getVersion());
+        }
+        headers.add(HttpHeaders.COOKIE, cookie);
+    }
+
+    public void allow(String... methods) {
+        HeaderUtil.setAllow(this.headers, methods);
+    }
+
+    public void allow(Set<String> methods) {
+        HeaderUtil.setAllow(headers, methods);
+    }
+
+    public void cacheControl(CacheControl cacheControl) {
+        headers.putSingle(HttpHeaders.CACHE_CONTROL, cacheControl);
+    }
+
+    public void header(String name, Object value) {
+        if (value == null) {
+            headers.remove(name);
+            return;
+        }
+        if (name.equalsIgnoreCase(HttpHeaders.ACCEPT))
+            accept(HeaderUtil.headerToString(value));
+        else if (name.equalsIgnoreCase(HttpHeaders.ACCEPT_ENCODING))
+            acceptEncoding(HeaderUtil.headerToString(value));
+        else if (name.equalsIgnoreCase(HttpHeaders.ACCEPT_LANGUAGE))
+            acceptLanguage(HeaderUtil.headerToString(value));
+        else
+            headers.add(name, value);
+    }
+
+    public Date getDate() {
+        return HeaderUtil.getDate(headers);
+    }
+
+    public String getHeader(String name) {
+        return HeaderUtil.getHeaderString(headers, name);
+    }
+
+    public MultivaluedMap<String, String> asMap() {
+        CaseInsensitiveMap<String> map = new CaseInsensitiveMap<String>();
+        for (Map.Entry<String, List<Object>> entry : headers.entrySet()) {
+            for (Object obj : entry.getValue()) {
+                map.add(entry.getKey(), HeaderUtil.headerToString(obj));
+            }
+        }
+        return map;
+    }
+
+    public Locale getLanguage() {
+        return HeaderUtil.getLanguage(headers);
+    }
+
+    public int getLength() {
+        return HeaderUtil.getLength(headers);
+    }
+
+    public MediaType getMediaType() {
+        return HeaderUtil.getMediaType(headers);
+    }
+
+    public List<MediaType> getAcceptableMediaTypes() {
+        return HeaderUtil.getAcceptableMediaTypes(headers);
+    }
+
+    public List<Locale> getAcceptableLanguages() {
+        return HeaderUtil.getAcceptableLanguages(headers);
+    }
+
+    public Map<String, Cookie> getCookies() {
+        return HeaderUtil.getCookies(headers);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java
new file mode 100644
index 0000000000000..667f440d8e3b4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseBuilderImpl.java
@@ -0,0 +1,49 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.io.InputStream;
+import java.net.URI;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.NotImplementedYet;
+import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder;
+import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
+
+public class ClientResponseBuilderImpl extends AbstractResponseBuilder { //TODO: should not extend the server version
+
+    InputStream entityStream;
+    RestClientRequestContext restClientRequestContext;
+
+    public ClientResponseBuilderImpl invocationState(RestClientRequestContext restClientRequestContext) {
+        this.restClientRequestContext = restClientRequestContext;
+        return this;
+    }
+
+    public ClientResponseBuilderImpl entityStream(InputStream entityStream) {
+        this.entityStream = entityStream;
+        return this;
+    }
+
+    @Override
+    protected AbstractResponseBuilder doClone() {
+        return new ClientResponseBuilderImpl();
+    }
+
+    @Override
+    public ResponseImpl build() {
+        ClientResponseImpl response = new ClientResponseImpl();
+        populateResponse(response);
+        response.restClientRequestContext = restClientRequestContext;
+        response.setEntityStream(entityStream);
+        return response;
+    }
+
+    @Override
+    public Response.ResponseBuilder contentLocation(URI location) {
+        //TODO: needs some thinking
+        throw new NotImplementedYet();
+    }
+
+    @Override
+    public Response.ResponseBuilder location(URI location) {
+        throw new NotImplementedYet();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java
new file mode 100644
index 0000000000000..9833fe97616c6
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseContextImpl.java
@@ -0,0 +1,162 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.Link.Builder;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response.StatusType;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.headers.LinkHeaders;
+import org.jboss.resteasy.reactive.common.jaxrs.StatusTypeImpl;
+
+public class ClientResponseContextImpl implements ClientResponseContext {
+
+    private final RestClientRequestContext state;
+
+    public ClientResponseContextImpl(RestClientRequestContext state) {
+        this.state = state;
+    }
+
+    public String getReasonPhrase() {
+        return state.getResponseReasonPhrase();
+    }
+
+    public ClientResponseContextImpl setReasonPhrase(String reasonPhrase) {
+        state.setResponseReasonPhrase(reasonPhrase);
+        return this;
+    }
+
+    public ClientResponseContextImpl setHeaders(MultivaluedMap<String, String> headers) {
+        state.setResponseHeaders(headers);
+        return this;
+    }
+
+    @Override
+    public int getStatus() {
+        return state.getResponseStatus();
+    }
+
+    @Override
+    public void setStatus(int code) {
+        state.setResponseStatus(code);
+    }
+
+    @Override
+    public StatusType getStatusInfo() {
+        return new StatusTypeImpl(state.getResponseStatus(), state.getResponseReasonPhrase());
+    }
+
+    @Override
+    public void setStatusInfo(StatusType statusInfo) {
+        state.setResponseStatus(statusInfo.getStatusCode())
+                .setResponseReasonPhrase(statusInfo.getReasonPhrase());
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getHeaders() {
+        return state.getResponseHeaders();
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return HeaderUtil.getHeaderString(state.getResponseHeaders(), name);
+    }
+
+    @Override
+    public Set<String> getAllowedMethods() {
+        return HeaderUtil.getAllowedMethods(state.getResponseHeaders());
+    }
+
+    @Override
+    public Date getDate() {
+        return HeaderUtil.getDate(state.getResponseHeaders());
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return HeaderUtil.getLanguage(state.getResponseHeaders());
+    }
+
+    @Override
+    public int getLength() {
+        return HeaderUtil.getLength(state.getResponseHeaders());
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return HeaderUtil.getMediaType(state.getResponseHeaders());
+    }
+
+    @Override
+    public Map<String, NewCookie> getCookies() {
+        return HeaderUtil.getNewCookies(state.getResponseHeaders());
+    }
+
+    @Override
+    public EntityTag getEntityTag() {
+        return HeaderUtil.getEntityTag(state.getResponseHeaders());
+    }
+
+    @Override
+    public Date getLastModified() {
+        return HeaderUtil.getLastModified(state.getResponseHeaders());
+    }
+
+    @Override
+    public URI getLocation() {
+        return HeaderUtil.getLocation(state.getResponseHeaders());
+    }
+
+    private LinkHeaders getLinkHeaders() {
+        return new LinkHeaders((MultivaluedMap) state.getResponseHeaders());
+    }
+
+    @Override
+    public Set<Link> getLinks() {
+        return new HashSet<>(getLinkHeaders().getLinks());
+    }
+
+    @Override
+    public boolean hasLink(String relation) {
+        return getLinkHeaders().getLinkByRelationship(relation) != null;
+    }
+
+    @Override
+    public Link getLink(String relation) {
+        return getLinkHeaders().getLinkByRelationship(relation);
+    }
+
+    @Override
+    public Builder getLinkBuilder(String relation) {
+        Link link = getLinkHeaders().getLinkByRelationship(relation);
+        if (link == null) {
+            return null;
+        }
+        return Link.fromLink(link);
+    }
+
+    @Override
+    public boolean hasEntity() {
+        return state.getResponseEntityStream() != null;
+    }
+
+    @Override
+    public InputStream getEntityStream() {
+        return state.getResponseEntityStream();
+    }
+
+    @Override
+    public void setEntityStream(InputStream input) {
+        state.setResponseEntityStream(input);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java
new file mode 100644
index 0000000000000..f86f53d59b1dc
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientResponseImpl.java
@@ -0,0 +1,68 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
+import org.jboss.resteasy.reactive.common.util.EmptyInputStream;
+
+/**
+ * This is the Response class client response
+ * object with more deserialising powers than user-created responses @{link {@link ResponseImpl}.
+ */
+public class ClientResponseImpl extends ResponseImpl {
+
+    RestClientRequestContext restClientRequestContext;
+
+    @SuppressWarnings({ "unchecked" })
+    protected <T> T readEntity(Class<T> entityType, Type genericType, Annotation[] annotations) {
+        // TODO: we probably need better state handling
+        if (entity != null && entityType.isInstance(entity)) {
+            // Note that this works if entityType is InputStream where we return it without closing it, as per spec
+            return (T) entity;
+        }
+
+        checkClosed();
+
+        // apparently we're trying to re-read it here, even if we already have an entity, as long as it's not the right
+        // type
+        // Note that this will get us the entity if it's an InputStream because setEntity checks that
+        InputStream entityStream = getEntityStream();
+        if (entityStream == null) {
+            entityStream = new EmptyInputStream();
+        }
+
+        // it's possible we already read it for a different type, so try to reset it
+        try {
+            if (buffered) {
+                entityStream.reset();
+            } else if (consumed) {
+                throw new IllegalStateException(
+                        "Entity stream has already been read and is not buffered: call Reponse.bufferEntity()");
+            }
+        } catch (IOException e) {
+            throw new ProcessingException(e);
+        }
+
+        // Spec says to return the input stream as-is, without closing it, if that's what we want
+        if (InputStream.class.isAssignableFrom(entityType)) {
+            return (T) entityStream;
+        }
+
+        MediaType mediaType = getMediaType();
+        try {
+            entity = ClientSerialisers.invokeClientReader(annotations, entityType, genericType, mediaType,
+                    restClientRequestContext.properties, getStringHeaders(),
+                    restClientRequestContext.getRestClient().getClientContext().getSerialisers(),
+                    entityStream, restClientRequestContext.getReaderInterceptors(), restClientRequestContext.configuration);
+            consumed = true;
+            close();
+            return (T) entity;
+        } catch (IOException e) {
+            throw new ProcessingException(e);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java
new file mode 100644
index 0000000000000..d85b3eed941eb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientSerialisers.java
@@ -0,0 +1,144 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.buffer.Buffer;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Map;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonValue;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.client.providers.serialisers.ClientDefaultTextPlainBodyHandler;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.providers.serialisers.BooleanMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.ByteArrayMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.CharArrayMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.CharacterMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.FileBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.FormUrlEncodedProvider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.InputStreamMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.NumberMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.ReaderBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.StringMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonArrayHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonObjectHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler;
+
+public class ClientSerialisers extends Serialisers {
+
+    public static BuiltinReader[] BUILTIN_READERS = new BuiltinReader[] {
+            new BuiltinReader(String.class, StringMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinReader(Boolean.class, BooleanMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinReader(Character.class, CharacterMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinReader(Number.class, NumberMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinReader(InputStream.class, InputStreamMessageBodyHandler.class, MediaType.WILDCARD),
+            new BuiltinReader(Reader.class, ReaderBodyHandler.class, MediaType.WILDCARD),
+            new BuiltinReader(File.class, FileBodyHandler.class, MediaType.WILDCARD),
+
+            new BuiltinReader(byte[].class, ByteArrayMessageBodyHandler.class, MediaType.WILDCARD),
+            new BuiltinReader(MultivaluedMap.class, FormUrlEncodedProvider.class, MediaType.APPLICATION_FORM_URLENCODED,
+                    RuntimeType.CLIENT),
+            new BuiltinReader(Object.class, ClientDefaultTextPlainBodyHandler.class, MediaType.TEXT_PLAIN, RuntimeType.CLIENT),
+            new BuiltinReader(JsonArray.class, JsonArrayHandler.class, MediaType.APPLICATION_JSON, RuntimeType.CLIENT),
+            new BuiltinReader(JsonObject.class, JsonObjectHandler.class, MediaType.APPLICATION_JSON, RuntimeType.CLIENT),
+            new BuiltinReader(JsonValue.class, JsonValueHandler.class, MediaType.APPLICATION_JSON, RuntimeType.CLIENT)
+    };
+    public static BuiltinWriter[] BUILTIN_WRITERS = new BuiltinWriter[] {
+            new BuiltinWriter(String.class, StringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Number.class, StringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Boolean.class, StringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Character.class, StringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Object.class, StringMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(char[].class, CharArrayMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(byte[].class, ByteArrayMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            //            new BuiltinWriter(Buffer.class, VertxBufferMessageBodyWriter.class,
+            //                    MediaType.WILDCARD),
+            new BuiltinWriter(MultivaluedMap.class, FormUrlEncodedProvider.class,
+                    MediaType.APPLICATION_FORM_URLENCODED),
+            new BuiltinWriter(InputStream.class, InputStreamMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(Reader.class, ReaderBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(File.class, FileBodyHandler.class,
+                    MediaType.WILDCARD),
+    };
+
+    // FIXME: pass InvocationState to wrap args?
+    public static Buffer invokeClientWriter(Entity<?> entity, Object entityObject, Class<?> entityClass, Type entityType,
+            MultivaluedMap<String, String> headerMap, MessageBodyWriter writer, WriterInterceptor[] writerInterceptors,
+            Map<String, Object> properties, Serialisers serialisers, ConfigurationImpl configuration)
+            throws IOException {
+
+        if (writer.isWriteable(entityClass, entityType, entity.getAnnotations(), entity.getMediaType())) {
+            if (writerInterceptors == null) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                writer.writeTo(entityObject, entityClass, entityType, entity.getAnnotations(),
+                        entity.getMediaType(), headerMap, baos);
+                return Buffer.buffer(baos.toByteArray());
+            } else {
+                return runClientWriterInterceptors(entityObject, entityClass, entityType, entity.getAnnotations(),
+                        entity.getMediaType(), headerMap, writer, writerInterceptors, properties, serialisers,
+                        configuration);
+            }
+        }
+
+        return null;
+    }
+
+    public static Buffer runClientWriterInterceptors(Object entity, Class<?> entityClass, Type entityType,
+            Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> headers, MessageBodyWriter writer,
+            WriterInterceptor[] writerInterceptors, Map<String, Object> properties, Serialisers serialisers,
+            ConfigurationImpl configuration) throws IOException {
+        ClientWriterInterceptorContextImpl wc = new ClientWriterInterceptorContextImpl(writerInterceptors, writer,
+                annotations, entityClass, entityType, entity, mediaType, headers, properties, serialisers, configuration);
+        wc.proceed();
+        return wc.getResult();
+    }
+
+    public static Object invokeClientReader(Annotation[] annotations, Class<?> entityClass, Type entityType,
+            MediaType mediaType, Map<String, Object> properties,
+            MultivaluedMap metadata, Serialisers serialisers, InputStream in, ReaderInterceptor[] interceptors,
+            ConfigurationImpl configuration)
+            throws WebApplicationException, IOException {
+        // FIXME: perhaps optimise for when we have no interceptor?
+        ClientReaderInterceptorContextImpl context = new ClientReaderInterceptorContextImpl(annotations,
+                entityClass, entityType, mediaType,
+                properties, metadata, configuration, serialisers, in, interceptors);
+        return context.proceed();
+    }
+
+    @Override
+    public BuiltinWriter[] getBultinWriters() {
+        return BUILTIN_WRITERS;
+    }
+
+    @Override
+    public BuiltinReader[] getBultinReaders() {
+        return BUILTIN_READERS;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java
new file mode 100644
index 0000000000000..b32750c1aa3ba
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientWriterInterceptorContextImpl.java
@@ -0,0 +1,123 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.buffer.Buffer;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.ext.WriterInterceptorContext;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+
+public class ClientWriterInterceptorContextImpl extends AbstractClientInterceptorContextImpl
+        implements WriterInterceptorContext {
+
+    private final ByteArrayOutputStream baos = new ByteArrayOutputStream(); //TODO: real bloocking IO
+    boolean done = false;
+    private int index = 0;
+    private OutputStream outputStream = baos;
+    private final Serialisers serialisers;
+    private final ConfigurationImpl configuration;
+    // as the interceptors can change the type or mediaType, when that happens we need to find a new reader/writer
+    protected boolean rediscoveryNeeded = false;
+
+    private MultivaluedMap<String, String> headers;
+    private Object entity;
+    private MessageBodyWriter writer;
+    private WriterInterceptor[] interceptors;
+
+    private Buffer result;
+
+    public ClientWriterInterceptorContextImpl(WriterInterceptor[] writerInterceptors, MessageBodyWriter writer,
+            Annotation[] annotations, Class<?> entityClass, Type entityType, Object entity,
+            MediaType mediaType, MultivaluedMap<String, String> headers, Map<String, Object> properties,
+            Serialisers serialisers, ConfigurationImpl configuration) {
+        super(annotations, entityClass, entityType, mediaType, properties);
+        this.interceptors = writerInterceptors;
+        this.writer = writer;
+        this.entity = entity;
+        this.headers = headers;
+        this.serialisers = serialisers;
+        this.configuration = configuration;
+    }
+
+    @Override
+    public void proceed() throws IOException, WebApplicationException {
+        if (index == interceptors.length) {
+            MessageBodyWriter effectiveWriter = writer;
+            if (rediscoveryNeeded) {
+                List<MessageBodyWriter<?>> newWriters = serialisers.findWriters(configuration, entityClass, mediaType,
+                        RuntimeType.CLIENT);
+                if (newWriters.isEmpty()) {
+                    // FIXME: exception?
+                    return;
+                }
+                effectiveWriter = newWriters.get(0);
+            }
+            effectiveWriter.writeTo(entity, entityClass, entityType,
+                    annotations, mediaType, headers, outputStream);
+            outputStream.close();
+            result = Buffer.buffer(baos.toByteArray());
+            done = true;
+        } else {
+            interceptors[index++].aroundWriteTo(this);
+        }
+    }
+
+    @Override
+    public Object getEntity() {
+        return entity;
+    }
+
+    @Override
+    public void setEntity(Object entity) {
+        // FIXME: invalidate entityclass/type?
+        this.entity = entity;
+    }
+
+    @Override
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    @Override
+    public void setOutputStream(OutputStream os) {
+        this.outputStream = os;
+    }
+
+    @Override
+    public MultivaluedMap<String, Object> getHeaders() {
+        return (MultivaluedMap) headers;
+    }
+
+    public Buffer getResult() {
+        return result;
+    }
+
+    @Override
+    public void setType(Class<?> type) {
+        if ((this.entityClass != type) && (type != null)) {
+            rediscoveryNeeded = true;
+        }
+        this.entityClass = type;
+        // FIXME: invalidate generic type?
+    }
+
+    @Override
+    public void setMediaType(MediaType mediaType) {
+        if (this.mediaType != mediaType) {
+            rediscoveryNeeded = true;
+        }
+        this.mediaType = mediaType;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java
new file mode 100644
index 0000000000000..5e46b1a19f782
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/DefaultClientContext.java
@@ -0,0 +1,52 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.Vertx;
+import java.util.Collections;
+import java.util.function.Supplier;
+import javax.ws.rs.RuntimeType;
+import org.jboss.resteasy.reactive.client.spi.ClientContext;
+import org.jboss.resteasy.reactive.client.spi.ClientContextResolver;
+import org.jboss.resteasy.reactive.common.core.GenericTypeMapping;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+
+public class DefaultClientContext implements ClientContext {
+
+    public static DefaultClientContext INSTANCE = new DefaultClientContext();
+    public static final ClientContextResolver RESOLVER = new ClientContextResolver() {
+        @Override
+        public ClientContext resolve(ClassLoader classLoader) {
+            return INSTANCE;
+        }
+    };
+
+    final GenericTypeMapping genericTypeMapping;
+    final Serialisers serialisers;
+    final ClientProxies clientProxies;
+
+    public DefaultClientContext() {
+        serialisers = new ClientSerialisers();
+        serialisers.registerBuiltins(RuntimeType.CLIENT);
+        clientProxies = new ClientProxies(Collections.emptyMap(), Collections.emptyMap());
+        genericTypeMapping = new GenericTypeMapping();
+    }
+
+    @Override
+    public Serialisers getSerialisers() {
+        return serialisers;
+    }
+
+    @Override
+    public GenericTypeMapping getGenericTypeMapping() {
+        return genericTypeMapping;
+    }
+
+    @Override
+    public Supplier<Vertx> getVertx() {
+        return null;
+    }
+
+    @Override
+    public ClientProxies getClientProxies() {
+        return clientProxies;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java
new file mode 100644
index 0000000000000..65f2e43c53905
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InboundSseEventImpl.java
@@ -0,0 +1,164 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEvent;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+
+public class InboundSseEventImpl implements InboundSseEvent {
+
+    private String id;
+    private String name;
+    private String comment;
+    private String data;
+    private MediaType mediaType;
+    private long reconnectDelay = SseEvent.RECONNECT_NOT_SET;
+    private Serialisers serialisers;
+    private ConfigurationImpl configuration;
+
+    public InboundSseEventImpl(ConfigurationImpl configuration, Serialisers serialisers) {
+        this.configuration = configuration;
+        this.serialisers = serialisers;
+    }
+
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    public InboundSseEventImpl setMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
+        return this;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public InboundSseEventImpl setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public InboundSseEventImpl setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public String getComment() {
+        return comment;
+    }
+
+    public InboundSseEventImpl setComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    @Override
+    public long getReconnectDelay() {
+        return reconnectDelay;
+    }
+
+    @Override
+    public boolean isReconnectDelaySet() {
+        return reconnectDelay != -1;
+    }
+
+    public InboundSseEventImpl setReconnectDelay(long reconnectDelay) {
+        this.reconnectDelay = reconnectDelay;
+        return this;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return data == null || data.isEmpty();
+    }
+
+    @Override
+    public String readData() {
+        return data;
+    }
+
+    public InboundSseEventImpl setData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    @Override
+    public <T> T readData(Class<T> type) {
+        return readData(type, mediaType);
+    }
+
+    @Override
+    public <T> T readData(GenericType<T> type) {
+        return readData(type, mediaType);
+    }
+
+    @Override
+    public <T> T readData(Class<T> messageType, MediaType mediaType) {
+        return readData(new GenericType<T>(messageType), mediaType);
+    }
+
+    @Override
+    public <T> T readData(GenericType<T> type, MediaType mediaType) {
+        InputStream in = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
+        try {
+            return (T) ClientSerialisers.invokeClientReader(null, type.getRawType(), type.getType(),
+                    mediaType, null, Serialisers.EMPTY_MULTI_MAP,
+                    serialisers, in, Serialisers.NO_READER_INTERCEPTOR, configuration);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "InboundSseEvent[data: " + data
+                + ", name: " + name
+                + ", id: " + id
+                + ", comment: " + comment
+                + ", mediaType: " + mediaType
+                + ", reconnectDelay: " + reconnectDelay
+                + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Objects.hash(mediaType, comment, data, id, name);
+        result = prime * result + (int) (reconnectDelay ^ (reconnectDelay >>> 32));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (obj instanceof InboundSseEventImpl == false)
+            return false;
+        InboundSseEventImpl other = (InboundSseEventImpl) obj;
+        return Objects.equals(getComment(), other.getComment())
+                && Objects.equals(getMediaType(), other.getMediaType())
+                && Objects.equals(getId(), other.getId())
+                && Objects.equals(getName(), other.getName())
+                && getReconnectDelay() == other.getReconnectDelay()
+                && Objects.equals(readData(), other.readData());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java
new file mode 100644
index 0000000000000..260dab217f19d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java
@@ -0,0 +1,347 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import static org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties.READ_TIMEOUT;
+
+import io.vertx.core.http.HttpClient;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.CompletionStageRxInvoker;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.RxInvoker;
+import javax.ws.rs.client.RxInvokerProvider;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class InvocationBuilderImpl implements Invocation.Builder {
+
+    private static final long DEFAULT_READ_TIMEOUT = 30_000L;
+
+    final URI uri;
+    final HttpClient httpClient;
+    final WebTargetImpl target;
+    final RequestSpec requestSpec;
+    final Map<String, Object> properties = new HashMap<>();
+    final ClientImpl restClient;
+    final ClientRestHandler[] handlerChain;
+    final ClientRestHandler[] abortHandlerChain;
+    final ThreadSetupAction requestContext;
+    final long readTimeoutMs;
+
+    public InvocationBuilderImpl(URI uri, ClientImpl restClient, HttpClient httpClient,
+            WebTargetImpl target,
+            ConfigurationImpl configuration, ClientRestHandler[] handlerChain,
+            ClientRestHandler[] abortHandlerChain, ThreadSetupAction requestContext) {
+        this.uri = uri;
+        this.restClient = restClient;
+        this.httpClient = httpClient;
+        this.target = target;
+        this.requestSpec = new RequestSpec(configuration);
+        this.handlerChain = handlerChain;
+        this.abortHandlerChain = abortHandlerChain;
+        this.requestContext = requestContext;
+        Object readTimeoutMs = configuration.getProperty(READ_TIMEOUT);
+        if (readTimeoutMs == null) {
+            this.readTimeoutMs = DEFAULT_READ_TIMEOUT;
+        } else {
+            this.readTimeoutMs = (long) readTimeoutMs;
+        }
+    }
+
+    @Override
+    public Invocation build(String method) {
+        return new InvocationImpl(method, async(), null);
+    }
+
+    @Override
+    public Invocation build(String method, Entity<?> entity) {
+        return new InvocationImpl(method, async(), entity);
+    }
+
+    @Override
+    public Invocation buildGet() {
+        return build("GET");
+    }
+
+    @Override
+    public Invocation buildDelete() {
+        return build("DELETE");
+    }
+
+    @Override
+    public Invocation buildPost(Entity<?> entity) {
+        return build("POST", entity);
+    }
+
+    @Override
+    public Invocation buildPut(Entity<?> entity) {
+        return build("PUT", entity);
+    }
+
+    @Override
+    public AsyncInvokerImpl async() {
+        return new AsyncInvokerImpl(restClient, httpClient, uri, requestSpec,
+                properties, handlerChain, abortHandlerChain, requestContext);
+    }
+
+    @Override
+    public Invocation.Builder accept(String... mediaTypes) {
+        requestSpec.headers.accept(mediaTypes);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder accept(MediaType... mediaTypes) {
+        requestSpec.headers.accept(mediaTypes);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder acceptLanguage(Locale... locales) {
+        requestSpec.headers.acceptLanguage(locales);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder acceptLanguage(String... locales) {
+        requestSpec.headers.acceptLanguage(locales);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder acceptEncoding(String... encodings) {
+        requestSpec.headers.acceptEncoding(encodings);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder cookie(Cookie cookie) {
+        requestSpec.headers.cookie(cookie);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder cookie(String name, String value) {
+        requestSpec.headers.cookie(new Cookie(name, value));
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder cacheControl(CacheControl cacheControl) {
+        requestSpec.headers.cacheControl(cacheControl);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder header(String name, Object value) {
+        requestSpec.headers.header(name, value);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder headers(MultivaluedMap<String, Object> headers) {
+        requestSpec.headers.setHeaders(headers);
+        return this;
+    }
+
+    @Override
+    public Invocation.Builder property(String name, Object value) {
+        properties.put(name, value);
+        return this;
+    }
+
+    @Override
+    public CompletionStageRxInvoker rx() {
+        return new AsyncInvokerImpl(restClient, httpClient, uri, requestSpec,
+                properties, handlerChain, abortHandlerChain, requestContext);
+    }
+
+    @Override
+    public <T extends RxInvoker> T rx(Class<T> clazz) {
+        if (clazz == MultiInvoker.class) {
+            return (T) new MultiInvoker(target);
+        } else if (clazz == UniInvoker.class) {
+            return (T) new UniInvoker(target);
+        }
+        RxInvokerProvider<?> invokerProvider = requestSpec.configuration.getRxInvokerProvider(clazz);
+        if (invokerProvider != null) {
+            // FIXME: should pass the Quarkus executor here, but MP-CP or not?
+            return (T) invokerProvider.getRxInvoker(this, null);
+        }
+        // TCK says we could throw IllegalStateException, or not, it doesn't discriminate, and the spec doesn't say
+        return null;
+    }
+
+    @Override
+    public Response get() {
+        return unwrap(async().get());
+    }
+
+    private <T> T unwrap(CompletableFuture<T> c) {
+        try {
+            return c.get(readTimeoutMs, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException | TimeoutException e) {
+            throw new ProcessingException(e);
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof ProcessingException) {
+                throw (ProcessingException) e.getCause();
+            }
+            if (e.getCause() instanceof WebApplicationException) {
+                throw (WebApplicationException) e.getCause();
+            }
+            throw new ProcessingException(e.getCause().getMessage(), e.getCause());
+        }
+    }
+
+    @Override
+    public <T> T get(Class<T> responseType) {
+        return unwrap(async().get(responseType));
+    }
+
+    @Override
+    public <T> T get(GenericType<T> responseType) {
+        return unwrap(async().get(responseType));
+    }
+
+    @Override
+    public Response put(Entity<?> entity) {
+        return unwrap(async().put(entity));
+    }
+
+    @Override
+    public <T> T put(Entity<?> entity, Class<T> responseType) {
+        return unwrap(async().put(entity, responseType));
+    }
+
+    @Override
+    public <T> T put(Entity<?> entity, GenericType<T> responseType) {
+        return unwrap(async().put(entity, responseType));
+    }
+
+    @Override
+    public Response post(Entity<?> entity) {
+        return unwrap(async().post(entity));
+    }
+
+    @Override
+    public <T> T post(Entity<?> entity, Class<T> responseType) {
+        return unwrap(async().post(entity, responseType));
+    }
+
+    @Override
+    public <T> T post(Entity<?> entity, GenericType<T> responseType) {
+        return unwrap(async().post(entity, responseType));
+    }
+
+    @Override
+    public Response delete() {
+        return unwrap(async().delete());
+    }
+
+    @Override
+    public <T> T delete(Class<T> responseType) {
+        return unwrap(async().delete(responseType));
+    }
+
+    @Override
+    public <T> T delete(GenericType<T> responseType) {
+        return unwrap(async().delete(responseType));
+    }
+
+    @Override
+    public Response head() {
+        return unwrap(async().head());
+    }
+
+    @Override
+    public Response options() {
+        return unwrap(async().options());
+    }
+
+    @Override
+    public <T> T options(Class<T> responseType) {
+        return unwrap(async().options(responseType));
+    }
+
+    @Override
+    public <T> T options(GenericType<T> responseType) {
+        return unwrap(async().options(responseType));
+    }
+
+    @Override
+    public Response trace() {
+        return unwrap(async().trace());
+    }
+
+    @Override
+    public <T> T trace(Class<T> responseType) {
+        return unwrap(async().trace(responseType));
+    }
+
+    @Override
+    public <T> T trace(GenericType<T> responseType) {
+        return unwrap(async().trace(responseType));
+    }
+
+    @Override
+    public Response method(String name) {
+        return unwrap(async().method(name));
+    }
+
+    @Override
+    public <T> T method(String name, Class<T> responseType) {
+        return unwrap(async().method(name, responseType));
+    }
+
+    @Override
+    public <T> T method(String name, GenericType<T> responseType) {
+        return unwrap(async().method(name, responseType));
+    }
+
+    @Override
+    public Response method(String name, Entity<?> entity) {
+        return unwrap(async().method(name, entity));
+    }
+
+    @Override
+    public <T> T method(String name, Entity<?> entity, Class<T> responseType) {
+        return unwrap(async().method(name, entity, responseType));
+    }
+
+    @Override
+    public <T> T method(String name, Entity<?> entity, GenericType<T> responseType) {
+        return unwrap(async().method(name, entity, responseType));
+    }
+
+    public WebTargetImpl getTarget() {
+        return target;
+    }
+
+    public void setChunked(boolean chunked) {
+        this.requestSpec.chunked = chunked;
+    }
+
+    public boolean getChunked() {
+        return requestSpec.chunked;
+    }
+
+    public ClientRequestHeaders getHeaders() {
+        return requestSpec.headers;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java
new file mode 100644
index 0000000000000..983fe532ac6f9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationImpl.java
@@ -0,0 +1,98 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.InvocationCallback;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Response;
+
+public class InvocationImpl implements Invocation {
+
+    final AsyncInvokerImpl invoker;
+    final String method;
+    final Entity<?> entity;
+
+    public InvocationImpl(String method, AsyncInvokerImpl invoker, Entity<?> entity) {
+        this.invoker = invoker;
+        this.method = method;
+        this.entity = entity;
+    }
+
+    @Override
+    public Invocation property(String name, Object value) {
+        invoker.properties.put(name, value);
+        return this;
+    }
+
+    @Override
+    public Response invoke() {
+        try {
+            return invoker.method(method, entity).get();
+        } catch (InterruptedException e) {
+            throw new ProcessingException(e);
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof ProcessingException) {
+                throw (ProcessingException) e.getCause();
+            }
+            throw new RuntimeException(e.getCause());
+        }
+    }
+
+    @Override
+    public <T> T invoke(Class<T> responseType) {
+        try {
+            return invoker.method(method, entity, responseType).get();
+        } catch (InterruptedException e) {
+            throw new ProcessingException(e);
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof ProcessingException) {
+                throw (ProcessingException) e.getCause();
+            }
+            if (e.getCause() instanceof WebApplicationException) {
+                throw (WebApplicationException) e.getCause();
+            }
+            throw new RuntimeException(e.getCause());
+        }
+    }
+
+    @Override
+    public <T> T invoke(GenericType<T> responseType) {
+        try {
+            return invoker.method(method, entity, responseType).get();
+        } catch (InterruptedException e) {
+            throw new ProcessingException(e);
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof ProcessingException) {
+                throw (ProcessingException) e.getCause();
+            }
+            if (e.getCause() instanceof WebApplicationException) {
+                throw (WebApplicationException) e.getCause();
+            }
+            throw new RuntimeException(e.getCause());
+        }
+    }
+
+    @Override
+    public Future<Response> submit() {
+        return invoker.method(method, entity);
+    }
+
+    @Override
+    public <T> Future<T> submit(Class<T> responseType) {
+        return invoker.method(method, entity, responseType);
+    }
+
+    @Override
+    public <T> Future<T> submit(GenericType<T> responseType) {
+        return invoker.method(method, entity, responseType);
+    }
+
+    @Override
+    public <T> Future<T> submit(InvocationCallback<T> callback) {
+        return invoker.method(method, entity, callback);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java
new file mode 100644
index 0000000000000..192e11eeea04d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/MultiInvoker.java
@@ -0,0 +1,189 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.subscription.MultiEmitter;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClientResponse;
+import io.vertx.core.http.HttpConnection;
+import io.vertx.core.net.impl.ConnectionBase;
+import java.io.ByteArrayInputStream;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.client.impl.MultiInvoker.MultiRequest;
+
+public class MultiInvoker extends AbstractRxInvoker<Multi<?>> {
+
+    private WebTargetImpl target;
+
+    public MultiInvoker(WebTargetImpl target) {
+        this.target = target;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <R> Multi<R> get(Class<R> responseType) {
+        return (Multi<R>) super.get(responseType);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <R> Multi<R> get(GenericType<R> responseType) {
+        return (Multi<R>) super.get(responseType);
+    }
+
+    /**
+     * We need this class to work around a bug in Mutiny where we can register our cancel listener
+     * after the subscription is cancelled and we never get notified
+     * See https://github.com/smallrye/smallrye-mutiny/issues/417
+     */
+    static class MultiRequest<R> {
+
+        private final AtomicReference<Runnable> onCancel = new AtomicReference<>();
+
+        private MultiEmitter<? super R> emitter;
+
+        private static final Runnable CLEARED = () -> {
+        };
+
+        public MultiRequest(MultiEmitter<? super R> emitter) {
+            this.emitter = emitter;
+            emitter.onTermination(() -> {
+                if (emitter.isCancelled()) {
+                    this.cancel();
+                }
+            });
+        }
+
+        public boolean isCancelled() {
+            return onCancel.get() == CLEARED;
+        }
+
+        private void cancel() {
+            Runnable action = onCancel.getAndSet(CLEARED);
+            if (action != null && action != CLEARED) {
+                action.run();
+            }
+        }
+
+        public void onCancel(Runnable onCancel) {
+            if (this.onCancel.compareAndSet(null, onCancel)) {
+                // this was a first set
+            } else if (this.onCancel.get() == CLEARED) {
+                // already cleared
+                if (onCancel != null)
+                    onCancel.run();
+            } else {
+                // it was already set
+                throw new IllegalArgumentException("onCancel was already called");
+            }
+        }
+    }
+
+    @Override
+    public <R> Multi<R> method(String name, Entity<?> entity, GenericType<R> responseType) {
+        AsyncInvokerImpl invoker = (AsyncInvokerImpl) target.request().rx();
+        // FIXME: backpressure setting?
+        return Multi.createFrom().emitter(emitter -> {
+            MultiRequest<R> multiRequest = new MultiRequest<>(emitter);
+            RestClientRequestContext restClientRequestContext = invoker.performRequestInternal(name, entity, responseType,
+                    false);
+            restClientRequestContext.getResult().handle((response, connectionError) -> {
+                if (connectionError != null) {
+                    emitter.fail(connectionError);
+                } else {
+                    HttpClientResponse vertxResponse = restClientRequestContext.getVertxClientResponse();
+                    if (!emitter.isCancelled()) {
+                        // FIXME: this is probably not good enough
+                        if (response.getStatus() == 200
+                                && MediaType.SERVER_SENT_EVENTS_TYPE.isCompatible(response.getMediaType())) {
+                            registerForSse(multiRequest, responseType, response, vertxResponse);
+                        } else {
+                            // read stuff in chunks
+                            registerForChunks(multiRequest, restClientRequestContext, responseType, response, vertxResponse);
+                        }
+                        vertxResponse.resume();
+                    } else {
+                        vertxResponse.request().connection().close();
+                    }
+                }
+                return null;
+            });
+        });
+    }
+
+    private <R> void registerForSse(MultiRequest<? super R> multiRequest,
+            GenericType<R> responseType,
+            Response response,
+            HttpClientResponse vertxResponse) {
+        // honestly, isn't reconnect contradictory with completion?
+        // FIXME: Reconnect settings?
+        // For now we don't want multi to reconnect
+        SseEventSourceImpl sseSource = new SseEventSourceImpl(target, Integer.MAX_VALUE, TimeUnit.SECONDS);
+        // FIXME: deal with cancellation
+        sseSource.register(event -> {
+            // DO NOT pass the response mime type because it's SSE: let the event pick between the X-SSE-Content-Type header or
+            // the content-type SSE field
+            multiRequest.emitter.emit((R) event.readData(responseType));
+        }, error -> {
+            multiRequest.emitter.fail(error);
+        }, () -> {
+            multiRequest.emitter.complete();
+        });
+        // watch for user cancelling
+        multiRequest.onCancel(() -> {
+            sseSource.close();
+        });
+        sseSource.registerAfterRequest(vertxResponse);
+    }
+
+    private <R> void registerForChunks(MultiRequest<? super R> multiRequest,
+            RestClientRequestContext restClientRequestContext,
+            GenericType<R> responseType,
+            Response response,
+            HttpClientResponse vertxClientResponse) {
+        // make sure we get exceptions on the response, like close events, otherwise they
+        // will be logged as errors by vertx
+        vertxClientResponse.exceptionHandler(t -> {
+            if (t == ConnectionBase.CLOSED_EXCEPTION) {
+                // we can ignore this one since we registered a closeHandler
+            } else {
+                multiRequest.emitter.fail(t);
+            }
+        });
+        HttpConnection connection = vertxClientResponse.request().connection();
+        // this captures the server closing
+        connection.closeHandler(v -> {
+            multiRequest.emitter.complete();
+        });
+        vertxClientResponse.handler(new Handler<Buffer>() {
+            @Override
+            public void handle(Buffer buffer) {
+                try {
+                    ByteArrayInputStream in = new ByteArrayInputStream(buffer.getBytes());
+                    R item = restClientRequestContext.readEntity(in, responseType, response.getMediaType(),
+                            response.getMetadata());
+                    multiRequest.emitter.emit(item);
+                } catch (Throwable t) {
+                    // FIXME: probably close the client too? watch out that it doesn't call our close handler
+                    // which calls emitter.complete()
+                    multiRequest.emitter.fail(t);
+                }
+            }
+        });
+        // this captures the end of the response
+        // FIXME: won't this call complete twice()?
+        vertxClientResponse.endHandler(v -> {
+            multiRequest.emitter.complete();
+        });
+        // watch for user cancelling
+        multiRequest.onCancel(() -> {
+            vertxClientResponse.request().connection().close();
+        });
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/NeedsMoreDataException.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/NeedsMoreDataException.java
new file mode 100644
index 0000000000000..622caaad7110a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/NeedsMoreDataException.java
@@ -0,0 +1,5 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+public class NeedsMoreDataException extends RuntimeException {
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RequestSpec.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RequestSpec.java
new file mode 100644
index 0000000000000..68ffe463b6249
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RequestSpec.java
@@ -0,0 +1,22 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+
+public class RequestSpec {
+    final ConfigurationImpl configuration;
+    final ClientRequestHeaders headers;
+
+    boolean chunked;
+
+    public RequestSpec(ConfigurationImpl configuration) {
+        this.configuration = configuration;
+        headers = new ClientRequestHeaders(configuration);
+    }
+
+    public RequestSpec(RequestSpec requestSpec) {
+        this.configuration = requestSpec.configuration;
+        this.headers = new ClientRequestHeaders(configuration);
+        this.headers.headers.putAll(requestSpec.headers.headers);
+        this.chunked = requestSpec.chunked;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java
new file mode 100644
index 0000000000000..e3f0b784c2a0e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java
@@ -0,0 +1,347 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.MultiMap;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpClientResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+/**
+ * This is a stateful invocation, you can't invoke it twice.
+ */
+public class RestClientRequestContext extends AbstractResteasyReactiveContext<RestClientRequestContext, ClientRestHandler> {
+
+    private final HttpClient httpClient;
+    // Changeable by the request filter
+    String httpMethod;
+    // Changeable by the request filter
+    URI uri;
+    // Changeable by the request filter
+    Entity<?> entity;
+    GenericType<?> responseType;
+    private boolean responseTypeSpecified;
+    private final ClientImpl restClient;
+    final ClientRequestHeaders requestHeaders;
+    final ConfigurationImpl configuration;
+    private final boolean registerBodyHandler;
+    // will be used to check if we need to throw a WebApplicationException
+    // see Javadoc of javax.ws.rs.client.Invocation or javax.ws.rs.client.SyncInvoker
+    private final boolean checkSuccessfulFamily;
+    private final CompletableFuture<ResponseImpl> result;
+    /**
+     * Only initialised if we have request or response filters
+     */
+    /**
+     * Only initialised once we get the response
+     */
+    private HttpClientResponse vertxClientResponse;
+    // Changed by the request filter
+    Map<String, Object> properties;
+    private HttpClientRequest httpClientRequest;
+
+    private int responseStatus;
+    private String responseReasonPhrase;
+    private MultivaluedMap<String, String> responseHeaders;
+    private ClientRequestContextImpl clientRequestContext;
+    private InputStream responseEntityStream;
+    private Response abortedWith;
+
+    public RestClientRequestContext(ClientImpl restClient,
+            HttpClient httpClient, String httpMethod, URI uri,
+            ConfigurationImpl configuration, ClientRequestHeaders requestHeaders,
+            Entity<?> entity, GenericType<?> responseType, boolean registerBodyHandler, Map<String, Object> properties,
+            ClientRestHandler[] handlerChain,
+            ClientRestHandler[] abortHandlerChain,
+            ThreadSetupAction requestContext) {
+        super(handlerChain, abortHandlerChain, requestContext);
+        this.restClient = restClient;
+        this.httpClient = httpClient;
+        this.httpMethod = httpMethod;
+        this.uri = uri;
+        this.requestHeaders = requestHeaders;
+        this.configuration = configuration;
+        this.entity = entity;
+        if (responseType == null) {
+            this.responseType = new GenericType<>(String.class);
+            this.checkSuccessfulFamily = false;
+            this.responseTypeSpecified = false;
+        } else {
+            this.responseType = responseType;
+            boolean isJaxResponse = responseType.getRawType().equals(Response.class);
+            this.checkSuccessfulFamily = !isJaxResponse;
+            this.responseTypeSpecified = !isJaxResponse;
+        }
+        this.registerBodyHandler = registerBodyHandler;
+        this.result = new CompletableFuture<>();
+        // each invocation gets a new set of properties based on the JAX-RS invoker
+        this.properties = new HashMap<>(properties);
+    }
+
+    public void abort() {
+        restart(abortHandlerChain);
+    }
+
+    public <T> T readEntity(InputStream in,
+            GenericType<T> responseType, MediaType mediaType,
+            MultivaluedMap<String, Object> metadata)
+            throws IOException {
+        if (in == null)
+            return null;
+        return (T) ClientSerialisers.invokeClientReader(null, responseType.getRawType(), responseType.getType(),
+                mediaType, properties, metadata, restClient.getClientContext().getSerialisers(), in, getReaderInterceptors(),
+                configuration);
+    }
+
+    ReaderInterceptor[] getReaderInterceptors() {
+        return configuration.getReaderInterceptors().toArray(Serialisers.NO_READER_INTERCEPTOR);
+    }
+
+    public void initialiseResponse(HttpClientResponse vertxResponse) {
+        MultivaluedMap<String, String> headers = new CaseInsensitiveMap<>();
+        MultiMap vertxHeaders = vertxResponse.headers();
+        for (String i : vertxHeaders.names()) {
+            headers.addAll(i, vertxHeaders.getAll(i));
+        }
+        this.vertxClientResponse = vertxResponse;
+        responseStatus = vertxResponse.statusCode();
+        responseReasonPhrase = vertxResponse.statusMessage();
+        responseHeaders = headers;
+    }
+
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    public ClientRequestContextImpl getClientRequestContext() {
+        return clientRequestContext;
+    }
+
+    public ClientRequestContextImpl getOrCreateClientRequestContext() {
+        if (clientRequestContext == null) {
+            clientRequestContext = new ClientRequestContextImpl(this, this.getRestClient(), this.getConfiguration());
+        }
+        return clientRequestContext;
+    }
+
+    public Buffer writeEntity(Entity<?> entity, MultivaluedMap<String, String> headerMap, WriterInterceptor[] interceptors)
+            throws IOException {
+        Object entityObject = entity.getEntity();
+        Class<?> entityClass;
+        Type entityType;
+        if (entityObject instanceof GenericEntity) {
+            GenericEntity<?> genericEntity = (GenericEntity<?>) entityObject;
+            entityClass = genericEntity.getRawType();
+            entityType = genericEntity.getType();
+            entityObject = genericEntity.getEntity();
+        } else {
+            entityType = entityClass = entityObject.getClass();
+        }
+        List<MessageBodyWriter<?>> writers = restClient.getClientContext().getSerialisers().findWriters(configuration,
+                entityClass, entity.getMediaType(),
+                RuntimeType.CLIENT);
+        for (MessageBodyWriter<?> w : writers) {
+            Buffer ret = ClientSerialisers.invokeClientWriter(entity, entityObject, entityClass, entityType, headerMap, w,
+                    interceptors, properties, restClient.getClientContext().getSerialisers(), configuration);
+            if (ret != null) {
+                return ret;
+            }
+        }
+        // FIXME: exception?
+        return null;
+    }
+
+    public void setEntity(Object entity, Annotation[] annotations, MediaType mediaType) {
+        this.entity = Entity.entity(entity, mediaType, annotations);
+    }
+
+    public CompletableFuture<ResponseImpl> getResult() {
+        return result;
+    }
+
+    public HttpClientResponse getVertxClientResponse() {
+        return vertxClientResponse;
+    }
+
+    @Override
+    protected Executor getEventLoop() {
+        if (httpClientRequest == null) {
+            return restClient.getVertx().nettyEventLoopGroup().next();
+        } else {
+            return new Executor() {
+                @Override
+                public void execute(Runnable command) {
+                    command.run();
+                }
+            };
+        }
+    }
+
+    public HttpClientRequest getHttpClientRequest() {
+        return httpClientRequest;
+    }
+
+    public RestClientRequestContext setHttpClientRequest(HttpClientRequest httpClientRequest) {
+        this.httpClientRequest = httpClientRequest;
+        return this;
+    }
+
+    @Override
+    protected void handleRequestScopeActivation() {
+
+    }
+
+    @Override
+    protected void restarted(boolean keepTarget) {
+
+    }
+
+    @Override
+    public void close() {
+        super.close();
+        if (!result.isDone()) {
+            result.completeExceptionally(new IllegalStateException("Client request did not complete")); //should never happen
+        }
+    }
+
+    @Override
+    protected void handleUnrecoverableError(Throwable throwable) {
+        result.completeExceptionally(throwable);
+    }
+
+    public ConfigurationImpl getConfiguration() {
+        return configuration;
+    }
+
+    public ClientImpl getRestClient() {
+        return restClient;
+    }
+
+    public int getResponseStatus() {
+        return responseStatus;
+    }
+
+    public RestClientRequestContext setResponseStatus(int responseStatus) {
+        this.responseStatus = responseStatus;
+        return this;
+    }
+
+    public String getResponseReasonPhrase() {
+        return responseReasonPhrase;
+    }
+
+    public RestClientRequestContext setResponseReasonPhrase(String responseReasonPhrase) {
+        this.responseReasonPhrase = responseReasonPhrase;
+        return this;
+    }
+
+    public MultivaluedMap<String, String> getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    public RestClientRequestContext setResponseHeaders(MultivaluedMap<String, String> responseHeaders) {
+        this.responseHeaders = responseHeaders;
+        return this;
+    }
+
+    public boolean isCheckSuccessfulFamily() {
+        return checkSuccessfulFamily;
+    }
+
+    public boolean isResponseTypeSpecified() {
+        return responseTypeSpecified;
+    }
+
+    public RestClientRequestContext setResponseTypeSpecified(boolean responseTypeSpecified) {
+        this.responseTypeSpecified = responseTypeSpecified;
+        return this;
+    }
+
+    public GenericType<?> getResponseType() {
+        return responseType;
+    }
+
+    public RestClientRequestContext setResponseType(GenericType<?> responseType) {
+        this.responseType = responseType;
+        return this;
+    }
+
+    public ClientRequestHeaders getRequestHeaders() {
+        return requestHeaders;
+    }
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public RestClientRequestContext setHttpMethod(String httpMethod) {
+        this.httpMethod = httpMethod;
+        return this;
+    }
+
+    public URI getUri() {
+        return uri;
+    }
+
+    public RestClientRequestContext setUri(URI uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    public Entity<?> getEntity() {
+        return entity;
+    }
+
+    public RestClientRequestContext setEntity(Entity<?> entity) {
+        this.entity = entity;
+        return this;
+    }
+
+    public boolean isRegisterBodyHandler() {
+        return registerBodyHandler;
+    }
+
+    public InputStream getResponseEntityStream() {
+        return responseEntityStream;
+    }
+
+    public RestClientRequestContext setResponseEntityStream(InputStream responseEntityStream) {
+        this.responseEntityStream = responseEntityStream;
+        return this;
+    }
+
+    public Response getAbortedWith() {
+        return abortedWith;
+    }
+
+    public RestClientRequestContext setAbortedWith(Response abortedWith) {
+        this.abortedWith = abortedWith;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java
new file mode 100644
index 0000000000000..a55f743844a68
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceBuilderImpl.java
@@ -0,0 +1,37 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.sse.SseEventSource;
+import javax.ws.rs.sse.SseEventSource.Builder;
+
+public class SseEventSourceBuilderImpl extends SseEventSource.Builder {
+
+    private WebTarget endpoint;
+    // defaults set by spec
+    private TimeUnit reconnectUnit = TimeUnit.MILLISECONDS;
+    private long reconnectDelay = 500;
+
+    @Override
+    protected Builder target(WebTarget endpoint) {
+        this.endpoint = endpoint;
+        return this;
+    }
+
+    @Override
+    public Builder reconnectingEvery(long delay, TimeUnit unit) {
+        Objects.requireNonNull(unit);
+        if (delay <= 0)
+            throw new IllegalArgumentException("Delay must be > 0: " + delay);
+        this.reconnectDelay = delay;
+        this.reconnectUnit = unit;
+        return this;
+    }
+
+    @Override
+    public SseEventSource build() {
+        return new SseEventSourceImpl((WebTargetImpl) endpoint, reconnectDelay, reconnectUnit);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java
new file mode 100644
index 0000000000000..98f3b5bc71dce
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseEventSourceImpl.java
@@ -0,0 +1,238 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpClientResponse;
+import io.vertx.core.http.HttpConnection;
+import io.vertx.core.net.impl.ConnectionBase;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.sse.InboundSseEvent;
+import javax.ws.rs.sse.SseEventSource;
+import org.jboss.resteasy.reactive.common.util.CommonSseUtil;
+
+public class SseEventSourceImpl implements SseEventSource, Handler<Long> {
+
+    private TimeUnit reconnectUnit;
+    private long reconnectDelay;
+
+    private WebTargetImpl webTarget;
+    // this tracks user request to open/close
+    private volatile boolean isOpen;
+    // this tracks whether we have a connection open
+    private volatile boolean isInProgress;
+
+    private List<Consumer<InboundSseEvent>> consumers = new ArrayList<>();
+    private List<Consumer<Throwable>> errorListeners = new ArrayList<>();
+    private List<Runnable> completionListeners = new ArrayList<>();
+    private HttpConnection connection;
+    private SseParser sseParser;
+    private long timerId = -1;
+    private boolean receivedClientClose;
+
+    public SseEventSourceImpl(WebTargetImpl webTarget, long reconnectDelay, TimeUnit reconnectUnit) {
+        // tests set a null endpoint
+        Objects.requireNonNull(reconnectUnit);
+        if (reconnectDelay <= 0)
+            throw new IllegalArgumentException("Delay must be > 0: " + reconnectDelay);
+        this.webTarget = webTarget;
+        this.reconnectDelay = reconnectDelay;
+        this.reconnectUnit = reconnectUnit;
+        this.sseParser = new SseParser(this);
+    }
+
+    WebTargetImpl getWebTarget() {
+        return webTarget;
+    }
+
+    @Override
+    public synchronized void register(Consumer<InboundSseEvent> onEvent) {
+        consumers.add(onEvent);
+    }
+
+    @Override
+    public synchronized void register(Consumer<InboundSseEvent> onEvent, Consumer<Throwable> onError) {
+        consumers.add(onEvent);
+        errorListeners.add(onError);
+    }
+
+    @Override
+    public synchronized void register(Consumer<InboundSseEvent> onEvent, Consumer<Throwable> onError, Runnable onComplete) {
+        consumers.add(onEvent);
+        errorListeners.add(onError);
+        completionListeners.add(onComplete);
+    }
+
+    @Override
+    public synchronized void open() {
+        if (isOpen)
+            return;
+        isOpen = true;
+        connect();
+    }
+
+    // CALL WITH THE LOCK
+    private void connect() {
+        if (isInProgress)
+            return;
+        isInProgress = true;
+        // ignore previous client closes
+        receivedClientClose = false;
+        AsyncInvokerImpl invoker = (AsyncInvokerImpl) webTarget.request().rx();
+        RestClientRequestContext restClientRequestContext = invoker.performRequestInternal("GET", null, null, false);
+        restClientRequestContext.getResult().handle((response, throwable) -> {
+            // errors during connection don't currently lead to a retry
+            if (throwable != null) {
+                receiveThrowable(throwable);
+                notifyCompletion();
+            } else if (response.getStatus() != Response.Status.OK.getStatusCode()) {
+                receiveThrowable(new RuntimeException("HTTP call unsuccessful: " + response.getStatus()));
+                notifyCompletion();
+            } else if (!MediaType.SERVER_SENT_EVENTS_TYPE.isCompatible(response.getMediaType())) {
+                receiveThrowable(
+                        new RuntimeException("HTTP call did not return an SSE media type: " + response.getMediaType()));
+                notifyCompletion();
+            } else {
+                registerOnClient(restClientRequestContext.getVertxClientResponse());
+            }
+            return null;
+        });
+    }
+
+    /**
+     * Allows the HTTP client to register for SSE after it has made the request
+     */
+    synchronized void registerAfterRequest(HttpClientResponse vertxClientResponse) {
+        if (isOpen)
+            throw new IllegalStateException("Was already open");
+        isOpen = true;
+        registerOnClient(vertxClientResponse);
+    }
+
+    private void registerOnClient(HttpClientResponse vertxClientResponse) {
+        // make sure we get exceptions on the response, like close events, otherwise they
+        // will be logged as errors by vertx
+        vertxClientResponse.exceptionHandler(t -> {
+            if (t == ConnectionBase.CLOSED_EXCEPTION) {
+                // we can ignore this one since we registered a closeHandler
+            } else {
+                receiveThrowable(t);
+            }
+        });
+        // since we registered our exception handler, let's remove the request exception handler
+        // that is set in ClientSendRequestHandler
+        vertxClientResponse.request().exceptionHandler(null);
+        connection = vertxClientResponse.request().connection();
+        connection.closeHandler(v -> {
+            close(true);
+        });
+        String sseContentTypeHeader = vertxClientResponse.getHeader(CommonSseUtil.SSE_CONTENT_TYPE);
+        sseParser.setSseContentTypeHeader(sseContentTypeHeader);
+        vertxClientResponse.handler(sseParser);
+        vertxClientResponse.endHandler(v -> {
+            close(true);
+        });
+        vertxClientResponse.resume();
+    }
+
+    private void receiveThrowable(Throwable throwable) {
+        for (Consumer<Throwable> errorListener : errorListeners) {
+            errorListener.accept(throwable);
+        }
+    }
+
+    @Override
+    public boolean isOpen() {
+        return isOpen;
+    }
+
+    @Override
+    public boolean close(long timeout, TimeUnit unit) {
+        close(false);
+        return true;
+    }
+
+    private synchronized void close(boolean clientClosed) {
+        if (!isOpen) {
+            return;
+        }
+        if (clientClosed) {
+            // do not react more than once on client closing
+            if (this.receivedClientClose) {
+                return;
+            }
+        }
+        // it's possible that the client closed our connection, then we registered a reconnect timer
+        // and then the user is closing us, so we don't have a connection yet
+        if (connection != null) {
+            connection.close();
+        }
+        connection = null;
+        isInProgress = false;
+        boolean notifyCompletion = true;
+        if (!clientClosed) {
+            isOpen = false;
+            if (receivedClientClose) {
+                // do not notify completion if we already did as part of the client closing
+                notifyCompletion = false;
+            }
+        } else {
+            receivedClientClose = true;
+        }
+        if (notifyCompletion) {
+            // notify completion before reconnecting
+            notifyCompletion();
+        }
+        Vertx vertx = webTarget.getRestClient().getVertx();
+        // did we already try to reconnect?
+        if (timerId != -1) {
+            // cancel any previous timer
+            vertx.cancelTimer(timerId);
+            timerId = -1;
+        }
+        // schedule a new reconnect if the client closed us
+        if (clientClosed) {
+            timerId = vertx.setTimer(TimeUnit.MILLISECONDS.convert(reconnectDelay, reconnectUnit), this);
+        }
+    }
+
+    private synchronized void notifyCompletion() {
+        for (Runnable runnable : completionListeners) {
+            runnable.run();
+        }
+    }
+
+    public synchronized void fireEvent(InboundSseEventImpl event) {
+        // spec says to do this
+        if (event.isReconnectDelaySet()) {
+            reconnectDelay = event.getReconnectDelay();
+            reconnectUnit = TimeUnit.MILLISECONDS;
+        }
+        for (Consumer<InboundSseEvent> consumer : consumers) {
+            consumer.accept(event);
+        }
+    }
+
+    @Override
+    public synchronized void handle(Long event) {
+        // ignore a timeout if it's not the last one we set
+        if (timerId != event.longValue()) {
+            return;
+        }
+        // also ignore a reconnect order if the user closed this
+        if (!isOpen) {
+            return;
+        }
+        connect();
+    }
+
+    // For tests
+    public SseParser getSseParser() {
+        return sseParser;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java
new file mode 100644
index 0000000000000..336b87551ae8a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/SseParser.java
@@ -0,0 +1,344 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import java.nio.charset.StandardCharsets;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.SseEvent;
+
+public class SseParser implements Handler<Buffer> {
+
+    private static final byte CR = '\r';
+    private static final byte LF = '\n';
+    private static final byte COLON = ':';
+    private static final byte SPACE = ' ';
+
+    /**
+     * Will be non-empty while parsing. When not parsing, may hold partial data from the last chunk received
+     */
+    private byte[] bytes;
+    /**
+     * Index in {@link #bytes} where we're parsing, or where we should resume parsing partial data if not parsing.
+     */
+    private int i;
+
+    /**
+     * Holds the current event's comment data as we read them
+     */
+    private StringBuffer commentBuffer = new StringBuffer();
+    /**
+     * Holds the current event's field name as we read a field
+     */
+    private StringBuffer nameBuffer = new StringBuffer();
+    /**
+     * Holds the current event's field value as we read a field
+     */
+    private StringBuffer valueBuffer = new StringBuffer();
+    /**
+     * True if we're at the very beginning of the data stream and could see a BOM
+     */
+    private boolean firstByte = true;
+
+    /**
+     * The event type we're reading. Defaults to "message" and changes with "event" fields
+     */
+    private String eventType;
+    /**
+     * The content type we're reading. Defaults to the X-Sse-Element-Type header and changes with the "content-type" fields
+     */
+    private String contentType;
+    /**
+     * The content type we're reading. Defaults to the X-Sse-Element-Type header
+     */
+    private String contentTypeHeader;
+    /**
+     * The event data we're reading. Defaults to "" and changes with "data" fields
+     */
+    private StringBuffer dataBuffer = new StringBuffer();
+    /**
+     * The event's last id we're reading. Defaults to null and changes with "id" fields (cannot be reset)
+     */
+    private String lastEventId;
+    /**
+     * The event connect time we're reading. Defaults to -1 and changes with "retry" fields (in ms)
+     */
+    private long eventReconnectTime = SseEvent.RECONNECT_NOT_SET;
+    private SseEventSourceImpl sseEventSource;
+
+    public SseParser(SseEventSourceImpl sseEventSource) {
+        this.sseEventSource = sseEventSource;
+    }
+
+    public void setSseContentTypeHeader(String sseContentTypeHeader) {
+        this.contentTypeHeader = sseContentTypeHeader;
+    }
+
+    @Override
+    public void handle(Buffer event) {
+        byte[] newBytes = event.getBytes();
+        // check if we have partial data remaining
+        if (bytes != null) {
+            // concat old and new data
+            byte[] totalBytes = new byte[bytes.length - i + newBytes.length];
+            System.arraycopy(bytes, i, totalBytes, 0, bytes.length - i);
+            System.arraycopy(newBytes, 0, totalBytes, bytes.length - i, newBytes.length);
+            bytes = totalBytes;
+        } else {
+            bytes = newBytes;
+        }
+        i = 0;
+
+        while (hasByte()) {
+            boolean lastFirstByte = firstByte;
+            nameBuffer.setLength(0);
+            valueBuffer.setLength(0);
+            commentBuffer.setLength(0);
+            dataBuffer.setLength(0);
+            contentType = contentTypeHeader;
+            // SSE spec says default is "message" but JAX-RS says null
+            eventType = null;
+            eventReconnectTime = SseEvent.RECONNECT_NOT_SET;
+            // SSE spec says ID is persistent
+
+            int lastEventStart = i;
+            try {
+                parseEvent();
+            } catch (NeedsMoreDataException x) {
+                // save the remaining bytes for later
+                i = lastEventStart;
+                // be ready to rescan the BOM, but only if we didn't already see it in a previous event
+                firstByte = lastFirstByte;
+                return;
+            }
+        }
+        // we ate all the data
+        bytes = null;
+    }
+
+    private void parseEvent() {
+        // optional BOM
+        if (firstByte && i == 0 && 1 < bytes.length) {
+            if (bytes[0] == (byte) 0xFE
+                    && bytes[1] == (byte) 0xFF) {
+                i = 2;
+            }
+        }
+        // comment or field
+        while (hasByte()) {
+            int c = readChar();
+            firstByte = false;
+            if (c == COLON) {
+                parseComment();
+            } else if (isNameChar(c)) {
+                parseField(c);
+            } else if (isEofWithSideEffect(c)) {
+                dispatchEvent();
+                return;
+            } else {
+                throw illegalEventException();
+            }
+        }
+    }
+
+    private void dispatchEvent() {
+        // ignore empty events
+        if (dataBuffer.length() == 0)
+            return;
+        WebTargetImpl webTarget = sseEventSource.getWebTarget();
+        InboundSseEventImpl event;
+        // tests don't set a web target, and we don't want them to end up starting vertx just to test parsing
+        if (webTarget != null)
+            event = new InboundSseEventImpl(webTarget.getConfiguration(),
+                    webTarget.getSerialisers());
+        else
+            event = new InboundSseEventImpl(null, null);
+        // SSE spec says empty string is the default, but JAX-RS says null if not specified
+        event.setComment(commentBuffer.length() == 0 ? null : commentBuffer.toString());
+        // SSE spec says empty string is the default, but JAX-RS says null if not specified
+        event.setId(lastEventId);
+        event.setData(dataBuffer.toString());
+        // SSE spec says "message" is the default, but JAX-RS says null if not specified
+        event.setName(eventType);
+        event.setReconnectDelay(eventReconnectTime);
+        event.setMediaType(contentType != null ? MediaType.valueOf(contentType) : null);
+        sseEventSource.fireEvent(event);
+    }
+
+    private byte peekByte() {
+        return bytes[i];
+    }
+
+    private byte readByte() {
+        if (i >= bytes.length)
+            throw new NeedsMoreDataException();
+        return bytes[i++];
+    }
+
+    private boolean hasByte() {
+        return i < bytes.length;
+    }
+
+    private void parseComment() {
+        // comment       = colon *any-char end-of-line
+        while (true) {
+            int c = readChar();
+            if (isAnyChar(c)) {
+                commentBuffer.appendCodePoint(c);
+            } else if (isEofWithSideEffect(c)) {
+                // we're done
+                return;
+            } else {
+                throw illegalEventException();
+            }
+        }
+    }
+
+    private void parseField(int c) {
+        boolean readingName = true;
+        nameBuffer.appendCodePoint(c);
+        // field         = 1*name-char [ colon [ space ] *any-char ] end-of-line
+        while (true) {
+            c = readChar();
+            if (isEofWithSideEffect(c)) {
+                // the colon is optional, so is the data, which we treat as an empty string
+                processField(nameBuffer.toString(), valueBuffer.toString());
+                nameBuffer.setLength(0);
+                valueBuffer.setLength(0);
+                // we're done
+                return;
+            }
+            if (readingName && isNameChar(c)) {
+                nameBuffer.appendCodePoint(c);
+            } else if (readingName && c == COLON) {
+                readingName = false;
+                // optional space
+                if (hasByte() && peekByte() == SPACE) {
+                    i++;
+                }
+            } else if (!readingName && isAnyChar(c)) {
+                valueBuffer.appendCodePoint(c);
+            } else {
+                throw illegalEventException();
+            }
+        }
+    }
+
+    private void processField(String name, String value) {
+        switch (name) {
+            case "event":
+                eventType = value;
+                break;
+            case "content-type":
+                contentType = value;
+                break;
+            case "data":
+                if (dataBuffer.length() > 0) {
+                    dataBuffer.append((char) LF);
+                }
+                dataBuffer.append(value);
+                break;
+            case "id":
+                if (value.indexOf(0) == -1) {
+                    lastEventId = value;
+                }
+                break;
+            case "retry":
+                try {
+                    eventReconnectTime = Long.parseUnsignedLong(value, 10);
+                } catch (NumberFormatException x) {
+                    // spec says to ignore it
+                }
+                break;
+            // default is to ignore the field
+        }
+    }
+
+    private boolean isEofWithSideEffect(int c) {
+        if (c == CR) {
+            // eat a LF if there's one left
+            // FIXME: if our buffer cuts here that's a bad spot
+            if (hasByte() && peekByte() == LF) {
+                i++;
+            }
+            // we're done
+            return true;
+        } else if (c == LF) {
+            // we're done
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isAnyChar(int c) {
+        return (c >= 0x0000 && c <= 0x0009)
+                || (c >= 0x000B && c <= 0x000C)
+                || (c >= 0x000E && c <= 0x10_FFFF);
+    }
+
+    private boolean isNameChar(int c) {
+        return (c >= 0x0000 && c <= 0x0009)
+                || (c >= 0x000B && c <= 0x000C)
+                || (c >= 0x000E && c <= 0x0039)
+                || (c >= 0x003B && c <= 0x10_FFFF);
+    }
+
+    private int readChar() {
+        byte b0 = readByte();
+        // single byte
+        if ((b0 & 0b1000_0000) == 0) {
+            return b0;
+        }
+        // two bytes
+        if ((b0 & 0b1110_0000) == 0b1100_0000) {
+            byte b1 = readByte();
+            if ((b1 & 0b1100_0000) != 0b1000_0000) {
+                throw utf8Exception();
+            }
+            return ((b0 & 0b0001_1111) << 6)
+                    | (b1 & 0b0011_1111);
+        }
+        // three bytes
+        if ((b0 & 0b1111_0000) == 0b1110_0000) {
+            byte b1 = readByte();
+            if ((b1 & 0b1100_0000) != 0b1000_0000) {
+                throw utf8Exception();
+            }
+            byte b2 = readByte();
+            if ((b2 & 0b1100_0000) != 0b1000_0000) {
+                throw utf8Exception();
+            }
+            return ((b0 & 0b0000_1111) << 12)
+                    | ((b1 & 0b0011_1111) << 6)
+                    | (b2 & 0b0011_1111);
+        }
+        // four bytes
+        if ((b0 & 0b1111_1000) == 0b1111_0000) {
+            byte b1 = readByte();
+            if ((b1 & 0b1100_0000) != 0b1000_0000) {
+                throw utf8Exception();
+            }
+            byte b2 = readByte();
+            if ((b2 & 0b1100_0000) != 0b1000_0000) {
+                throw utf8Exception();
+            }
+            byte b3 = readByte();
+            if ((b3 & 0b1100_0000) != 0b1000_0000) {
+                throw utf8Exception();
+            }
+            return ((b0 & 0b0000_0111) << 18)
+                    | ((b1 & 0b0011_1111) << 12)
+                    | ((b2 & 0b0011_1111) << 6)
+                    | (b3 & 0b0011_1111);
+        }
+        throw utf8Exception();
+    }
+
+    private IllegalStateException utf8Exception() {
+        return new IllegalStateException("Illegal UTF8 input");
+    }
+
+    private IllegalStateException illegalEventException() {
+        return new IllegalStateException("Illegal Server-Sent Event input at byte index " + i + " while parsing: "
+                + new String(bytes, StandardCharsets.UTF_8));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java
new file mode 100644
index 0000000000000..335231f54d82e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java
@@ -0,0 +1,21 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.smallrye.mutiny.Uni;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericType;
+
+public class UniInvoker extends AbstractRxInvoker<Uni<?>> {
+
+    private WebTargetImpl target;
+
+    public UniInvoker(WebTargetImpl target) {
+        this.target = target;
+    }
+
+    @Override
+    public <R> Uni<R> method(String name, Entity<?> entity, GenericType<R> responseType) {
+        AsyncInvokerImpl invoker = (AsyncInvokerImpl) target.request().rx();
+        return Uni.createFrom().completionStage(invoker.method(name, entity, responseType));
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java
new file mode 100644
index 0000000000000..9dec50d39b725
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java
@@ -0,0 +1,386 @@
+package org.jboss.resteasy.reactive.client.impl;
+
+import io.vertx.core.http.HttpClient;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriBuilder;
+import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class WebTargetImpl implements WebTarget {
+
+    protected UriBuilder uriBuilder;
+    private final HttpClient client;
+    private final ConfigurationImpl configuration;
+    private boolean chunked = false;
+    private final ClientImpl restClient;
+    final ClientRestHandler[] handlerChain;
+    final ClientRestHandler[] abortHandlerChain;
+    final ThreadSetupAction requestContext;
+
+    public WebTargetImpl(ClientImpl restClient, HttpClient client, UriBuilder uriBuilder,
+            ConfigurationImpl configuration,
+            ClientRestHandler[] handlerChain, ClientRestHandler[] abortHandlerChain, ThreadSetupAction requestContext) {
+        this.restClient = restClient;
+        this.client = client;
+        this.uriBuilder = uriBuilder;
+        this.configuration = configuration;
+        this.handlerChain = handlerChain;
+        this.abortHandlerChain = abortHandlerChain;
+        this.requestContext = requestContext;
+    }
+
+    /**
+     * Get a new UriBuilder explicitly using RESTEasy implementation
+     * (instead of running UriBuilder.fromUri(uri) which relies on
+     * current registered JAX-RS implementation)
+     *
+     * @param uri
+     * @return
+     */
+    private static UriBuilder uriBuilderFromUri(URI uri) {
+        return new UriBuilderImpl().uri(uri);
+    }
+
+    private static UriBuilder uriBuilderFromUri(String uri) {
+        return new UriBuilderImpl().uri(uri);
+    }
+
+    @Override
+    public WebTargetImpl clone() {
+        abortIfClosed();
+        UriBuilder copy = uriBuilder.clone();
+        return newInstance(client, copy, configuration);
+    }
+
+    @Override
+    public URI getUri() {
+        abortIfClosed();
+        return uriBuilder.build();
+    }
+
+    @Override
+    public UriBuilder getUriBuilder() {
+        abortIfClosed();
+        return uriBuilder.clone();
+    }
+
+    @Override
+    public ConfigurationImpl getConfiguration() {
+        abortIfClosed();
+        return configuration;
+    }
+
+    @Override
+    public WebTargetImpl path(String path) throws NullPointerException {
+        abortIfClosed();
+        if (path == null)
+            throw new NullPointerException("Param was null");
+        UriBuilder copy = uriBuilder.clone().path(path);
+        return newInstance(client, copy, configuration);
+    }
+
+    @Override
+    public WebTargetImpl resolveTemplate(String name, Object value) throws NullPointerException {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+        if (value == null)
+            throw new NullPointerException("Param was null");
+        String val = configuration.toString(value);
+        UriBuilder copy = uriBuilder.clone().resolveTemplate(name, val);
+        WebTargetImpl target = newInstance(client, copy, configuration);
+        return target;
+    }
+
+    @Override
+    public WebTargetImpl resolveTemplates(Map<String, Object> templateValues) throws NullPointerException {
+        abortIfClosed();
+        if (templateValues == null)
+            throw new NullPointerException("Param was null");
+        if (templateValues.isEmpty())
+            return this;
+        Map<String, Object> vals = new HashMap<String, Object>();
+        for (Map.Entry<String, Object> entry : templateValues.entrySet()) {
+            if (entry.getKey() == null || entry.getValue() == null)
+                throw new NullPointerException("Param was null");
+            String val = configuration.toString(entry.getValue());
+            vals.put(entry.getKey(), val);
+        }
+        UriBuilder copy = uriBuilder.clone().resolveTemplates(vals);
+        WebTargetImpl target = newInstance(client, copy, configuration);
+        return target;
+    }
+
+    @Override
+    public WebTargetImpl resolveTemplate(String name, Object value, boolean encodeSlashInPath)
+            throws NullPointerException {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+        if (value == null)
+            throw new NullPointerException("Param was null");
+        String val = configuration.toString(value);
+        UriBuilder copy = uriBuilder.clone().resolveTemplate(name, val, encodeSlashInPath);
+        WebTargetImpl target = newInstance(client, copy, configuration);
+        return target;
+    }
+
+    @Override
+    public WebTargetImpl resolveTemplateFromEncoded(String name, Object value) throws NullPointerException {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+        if (value == null)
+            throw new NullPointerException("Param was null");
+        String val = configuration.toString(value);
+        UriBuilder copy = uriBuilder.clone().resolveTemplateFromEncoded(name, val);
+        WebTargetImpl target = newInstance(client, copy, configuration);
+        return target;
+    }
+
+    @Override
+    public WebTargetImpl resolveTemplatesFromEncoded(Map<String, Object> templateValues) throws NullPointerException {
+        abortIfClosed();
+        if (templateValues == null)
+            throw new NullPointerException("Param was null");
+        if (templateValues.isEmpty())
+            return this;
+        Map<String, Object> vals = new HashMap<String, Object>();
+        for (Map.Entry<String, Object> entry : templateValues.entrySet()) {
+            if (entry.getKey() == null || entry.getValue() == null)
+                throw new NullPointerException("Param was null");
+            String val = configuration.toString(entry.getValue());
+            vals.put(entry.getKey(), val);
+        }
+        UriBuilder copy = uriBuilder.clone().resolveTemplatesFromEncoded(vals);
+        WebTargetImpl target = newInstance(client, copy, configuration);
+        return target;
+    }
+
+    @Override
+    public WebTargetImpl resolveTemplates(Map<String, Object> templateValues, boolean encodeSlashInPath)
+            throws NullPointerException {
+        abortIfClosed();
+        if (templateValues == null)
+            throw new NullPointerException("Param was null");
+        if (templateValues.isEmpty())
+            return this;
+        Map<String, Object> vals = new HashMap<String, Object>();
+        for (Map.Entry<String, Object> entry : templateValues.entrySet()) {
+            if (entry.getKey() == null || entry.getValue() == null)
+                throw new NullPointerException("Param was null");
+            String val = configuration.toString(entry.getValue());
+            vals.put(entry.getKey(), val);
+        }
+        UriBuilder copy = uriBuilder.clone().resolveTemplates(vals, encodeSlashInPath);
+        WebTargetImpl target = newInstance(client, copy, configuration);
+        return target;
+    }
+
+    @Override
+    public WebTargetImpl matrixParam(String name, Object... values) throws NullPointerException {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+        UriBuilder copy = uriBuilder.clone();
+        if (values.length == 1 && values[0] == null) {
+            copy.replaceMatrixParam(name, (Object[]) null);
+        } else {
+            String[] stringValues = toStringValues(values);
+            copy.matrixParam(name, (Object[]) stringValues);
+        }
+        return newInstance(client, copy, configuration);
+    }
+
+    private String[] toStringValues(Object[] values) {
+        String[] stringValues = new String[values.length];
+        for (int i = 0; i < stringValues.length; i++) {
+            stringValues[i] = configuration.toString(values[i]);
+        }
+        return stringValues;
+    }
+
+    @Override
+    public WebTargetImpl queryParam(String name, Object... values) throws NullPointerException {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+        UriBuilder copy = uriBuilder.clone();
+        if (values == null || (values.length == 1 && values[0] == null)) {
+            copy.replaceQueryParam(name, (Object[]) null);
+        } else {
+            String[] stringValues = toStringValues(values);
+            copy.queryParam(name, (Object[]) stringValues);
+        }
+        return newInstance(client, copy, configuration);
+    }
+
+    public WebTargetImpl queryParams(MultivaluedMap<String, Object> parameters)
+            throws IllegalArgumentException, NullPointerException {
+        abortIfClosed();
+        if (parameters == null)
+            throw new NullPointerException("Param was null");
+        UriBuilder copy = uriBuilder.clone();
+        for (Map.Entry<String, List<Object>> entry : parameters.entrySet()) {
+            String[] stringValues = toStringValues(entry.getValue().toArray());
+            copy.queryParam(entry.getKey(), (Object[]) stringValues);
+        }
+        return newInstance(client, copy, configuration);
+    }
+
+    public WebTargetImpl queryParamNoTemplate(String name, Object... values) throws NullPointerException {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+
+        //The whole array can be represented as one object, so we need to cast it to array of objects
+        if (values.length == 1 && values[0].getClass().isArray() && !values[0].getClass().getComponentType().isPrimitive()) {
+            values = (Object[]) values[0];
+        }
+
+        String[] stringValues = toStringValues(values);
+        UriBuilderImpl copy;
+        if (uriBuilder instanceof UriBuilderImpl) {
+            copy = (UriBuilderImpl) uriBuilder.clone();
+        } else {
+            copy = UriBuilderImpl.fromTemplate(uriBuilder.toTemplate());
+        }
+
+        copy.clientQueryParam(name, (Object[]) stringValues);
+        return newInstance(client, copy, configuration);
+    }
+
+    protected WebTargetImpl newInstance(HttpClient client, UriBuilder uriBuilder,
+            ConfigurationImpl configuration) {
+        return new WebTargetImpl(restClient, client, uriBuilder, configuration, handlerChain, abortHandlerChain,
+                requestContext);
+    }
+
+    @Override
+    public Invocation.Builder request() {
+        abortIfClosed();
+        InvocationBuilderImpl builder = createQuarkusRestInvocationBuilder(client, uriBuilder, configuration);
+        builder.setChunked(chunked);
+        return builder;
+    }
+
+    @Override
+    public Invocation.Builder request(String... acceptedResponseTypes) {
+        abortIfClosed();
+        InvocationBuilderImpl builder = createQuarkusRestInvocationBuilder(client, uriBuilder, configuration);
+        builder.getHeaders().accept(acceptedResponseTypes);
+        builder.setChunked(chunked);
+        return builder;
+    }
+
+    @Override
+    public Invocation.Builder request(MediaType... acceptedResponseTypes) {
+        abortIfClosed();
+        InvocationBuilderImpl builder = createQuarkusRestInvocationBuilder(client, uriBuilder, configuration);
+        builder.getHeaders().accept(acceptedResponseTypes);
+        builder.setChunked(chunked);
+        return builder;
+    }
+
+    private void abortIfClosed() {
+        restClient.abortIfClosed();
+    }
+
+    protected InvocationBuilderImpl createQuarkusRestInvocationBuilder(HttpClient client, UriBuilder uri,
+            ConfigurationImpl configuration) {
+        return new InvocationBuilderImpl(uri.build(), restClient, client, this, configuration, handlerChain,
+                abortHandlerChain, requestContext);
+    }
+
+    @Override
+    public WebTargetImpl property(String name, Object value) {
+        abortIfClosed();
+        if (name == null)
+            throw new NullPointerException("Param was null");
+        configuration.property(name, value);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Class<?> componentClass) {
+        abortIfClosed();
+        configuration.register(componentClass);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Class<?> componentClass, int priority) {
+        abortIfClosed();
+        configuration.register(componentClass, priority);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Class<?> componentClass, Class<?>... contracts) {
+        abortIfClosed();
+        configuration.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+        abortIfClosed();
+        configuration.register(componentClass, contracts);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Object component) {
+        abortIfClosed();
+        configuration.register(component);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Object component, int priority) {
+        abortIfClosed();
+        configuration.register(component, priority);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Object component, Class<?>... contracts) {
+        abortIfClosed();
+        configuration.register(component, contracts);
+        return this;
+    }
+
+    @Override
+    public WebTargetImpl register(Object component, Map<Class<?>, Integer> contracts) {
+        abortIfClosed();
+        configuration.register(component, contracts);
+        return this;
+    }
+
+    public WebTargetImpl setChunked(boolean chunked) {
+        this.chunked = chunked;
+        return this;
+    }
+
+    public <T> T proxy(Class<?> clazz) {
+        return restClient.getClientContext().getClientProxies().get(clazz, this);
+    }
+
+    public ClientImpl getRestClient() {
+        return restClient;
+    }
+
+    Serialisers getSerialisers() {
+        return restClient.getClientContext().getSerialisers();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java
new file mode 100644
index 0000000000000..228002751a848
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/providers/serialisers/ClientDefaultTextPlainBodyHandler.java
@@ -0,0 +1,19 @@
+package org.jboss.resteasy.reactive.client.providers.serialisers;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.NoContentException;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler;
+
+@Provider
+@Consumes("text/plain")
+public class ClientDefaultTextPlainBodyHandler extends DefaultTextPlainBodyHandler {
+
+    @Override
+    protected void validateInput(String input) throws ProcessingException {
+        if (input.isEmpty()) {
+            throw new ProcessingException(new NoContentException("Input was empty"));
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java
new file mode 100644
index 0000000000000..72e0cca965c5e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContext.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.client.spi;
+
+import io.vertx.core.Vertx;
+import java.util.function.Supplier;
+import org.jboss.resteasy.reactive.client.impl.ClientProxies;
+import org.jboss.resteasy.reactive.common.core.GenericTypeMapping;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+
+public interface ClientContext {
+    Serialisers getSerialisers();
+
+    GenericTypeMapping getGenericTypeMapping();
+
+    Supplier<Vertx> getVertx();
+
+    ClientProxies getClientProxies();
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java
new file mode 100644
index 0000000000000..63d8c3f613c41
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientContextResolver.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.client.spi;
+
+import java.util.ServiceLoader;
+import org.jboss.resteasy.reactive.client.impl.DefaultClientContext;
+
+public interface ClientContextResolver {
+
+    ClientContext resolve(ClassLoader classLoader);
+
+    static ClientContextResolver getInstance() {
+        ServiceLoader<ClientContextResolver> services = ServiceLoader.load(ClientContextResolver.class,
+                Thread.currentThread().getContextClassLoader());
+        ClientContextResolver selected = null;
+        for (ClientContextResolver i : services) {
+            if (selected != null) {
+                throw new RuntimeException("More than one ClientContextResolver implementation, " + selected + " and " + i);
+            }
+            selected = i;
+        }
+        if (selected == null) {
+            return DefaultClientContext.RESOLVER;
+        }
+        return selected;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientRestHandler.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientRestHandler.java
new file mode 100644
index 0000000000000..299a7f9b334b7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/spi/ClientRestHandler.java
@@ -0,0 +1,7 @@
+package org.jboss.resteasy.reactive.client.spi;
+
+import org.jboss.resteasy.reactive.client.impl.RestClientRequestContext;
+import org.jboss.resteasy.reactive.spi.RestHandler;
+
+public interface ClientRestHandler extends RestHandler<RestClientRequestContext> {
+}
diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder b/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder
new file mode 100644
index 0000000000000..979182844d3aa
--- /dev/null
+++ b/independent-projects/resteasy-reactive/client/runtime/src/main/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder
@@ -0,0 +1 @@
+org.jboss.resteasy.reactive.client.impl.SseEventSourceBuilderImpl
diff --git a/independent-projects/resteasy-reactive/common/pom.xml b/independent-projects/resteasy-reactive/common/pom.xml
new file mode 100644
index 0000000000000..38dac6ab379a9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-common-parent</artifactId>
+    <name>RESTEasy Reactive - Common Parent </name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>processor</module>
+    </modules>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/common/processor/pom.xml b/independent-projects/resteasy-reactive/common/processor/pom.xml
new file mode 100644
index 0000000000000..37eea267b9199
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-common-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-common-processor</artifactId>
+    <name>RESTEasy Reactive - Common Processor</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jandex</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus.gizmo</groupId>
+            <artifactId>gizmo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java
new file mode 100644
index 0000000000000..40a49d6e1ddd5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriter.java
@@ -0,0 +1,71 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.util.Objects;
+import javax.ws.rs.RuntimeType;
+
+public interface AdditionalReaderWriter {
+
+    default void add(Class<?> handlerClass, String mediaType, Class<?> entityClass) {
+        add(handlerClass, mediaType, entityClass, null);
+    }
+
+    void add(Class<?> handlerClass, String mediaType, Class<?> entityClass, RuntimeType constraint);
+
+    class Entry {
+        private final Class<?> handlerClass;
+        private final String mediaType;
+        private final Class<?> entityClass;
+        private final RuntimeType constraint;
+
+        public Entry(Class<?> handlerClass, String mediaType, Class<?> entityClass) {
+            this(handlerClass, mediaType, entityClass, null);
+        }
+
+        public Entry(Class<?> handlerClass, String mediaType, Class<?> entityClass,
+                RuntimeType constraint) {
+            this.handlerClass = Objects.requireNonNull(handlerClass);
+            this.mediaType = Objects.requireNonNull(mediaType);
+            this.entityClass = Objects.requireNonNull(entityClass);
+            this.constraint = constraint;
+        }
+
+        public Class<?> getHandlerClass() {
+            return handlerClass;
+        }
+
+        public String getMediaType() {
+            return mediaType;
+        }
+
+        public Class<?> getEntityClass() {
+            return entityClass;
+        }
+
+        public RuntimeType getConstraint() {
+            return constraint;
+        }
+
+        public boolean matchesIgnoringConstraint(Entry other) {
+            return handlerClass.equals(other.handlerClass) && entityClass.equals(other.entityClass)
+                    && mediaType.equals(other.mediaType);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+            Entry entry = (Entry) o;
+            return handlerClass.equals(entry.handlerClass) &&
+                    mediaType.equals(entry.mediaType) &&
+                    entityClass.equals(entry.entityClass) &&
+                    constraint == entry.constraint;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(handlerClass, mediaType, entityClass, constraint);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java
new file mode 100644
index 0000000000000..1380a71a0d5f1
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaderWriterCommon.java
@@ -0,0 +1,43 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.ws.rs.RuntimeType;
+
+@SuppressWarnings({ "rawtypes" })
+abstract class AdditionalReaderWriterCommon implements AdditionalReaderWriter {
+
+    private final List<Entry> entries = new ArrayList<>();
+
+    public void add(Class handlerClass, String mediaType, Class entityClass,
+            RuntimeType constraint) {
+
+        Entry newEntry = new Entry(handlerClass, mediaType, entityClass, constraint);
+
+        // we first attempt to "merge" readers if we encounter the same reader needed for both client and server
+        Entry matchingEntryIgnoringConstraint = null;
+        for (Entry entry : entries) {
+            if (entry.matchesIgnoringConstraint(newEntry)) {
+                matchingEntryIgnoringConstraint = entry;
+                break;
+            }
+        }
+        if (matchingEntryIgnoringConstraint != null) {
+            if (matchingEntryIgnoringConstraint.getConstraint() != newEntry.getConstraint()) {
+                // in this case we have a MessageBodyReader that applies to both client and server so
+                // we remove the existing entity and replace it with one that has no constraint
+                entries.remove(matchingEntryIgnoringConstraint);
+                entries.add(new Entry(handlerClass, mediaType, entityClass, null));
+            } else {
+                // nothing to do since the entries match completely
+            }
+        } else {
+            entries.add(newEntry);
+        }
+    }
+
+    public List<Entry> get() {
+        return entries;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaders.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaders.java
new file mode 100644
index 0000000000000..6fca280a951d6
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalReaders.java
@@ -0,0 +1,5 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+public class AdditionalReaders extends AdditionalReaderWriterCommon {
+
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalWriters.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalWriters.java
new file mode 100644
index 0000000000000..101b997313e32
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AdditionalWriters.java
@@ -0,0 +1,5 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+public class AdditionalWriters extends AdditionalReaderWriterCommon {
+
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java
new file mode 100644
index 0000000000000..dc66f3b6bb255
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/AsmUtil.java
@@ -0,0 +1,672 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import static java.util.Arrays.asList;
+import static org.objectweb.asm.Type.BOOLEAN_TYPE;
+import static org.objectweb.asm.Type.BYTE_TYPE;
+import static org.objectweb.asm.Type.CHAR_TYPE;
+import static org.objectweb.asm.Type.FLOAT_TYPE;
+import static org.objectweb.asm.Type.INT_TYPE;
+import static org.objectweb.asm.Type.LONG_TYPE;
+import static org.objectweb.asm.Type.SHORT_TYPE;
+import static org.objectweb.asm.Type.VOID_TYPE;
+import static org.objectweb.asm.Type.getType;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import org.jboss.jandex.ArrayType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.PrimitiveType.Primitive;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.jboss.jandex.TypeVariable;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/**
+ * A collection of ASM and Jandex utilities.
+ * NOTE: this has a copy in AsmUtilCopy in arc-processor with some extra methods for knowing if we need a
+ * signature and getting the signature of a class.
+ */
+public class AsmUtil {
+
+    public static final List<org.objectweb.asm.Type> PRIMITIVES = asList(
+            VOID_TYPE,
+            BOOLEAN_TYPE,
+            CHAR_TYPE,
+            BYTE_TYPE,
+            SHORT_TYPE,
+            INT_TYPE,
+            FLOAT_TYPE,
+            LONG_TYPE);
+    public static final List<org.objectweb.asm.Type> WRAPPERS = asList(
+            getType(Void.class),
+            getType(Boolean.class),
+            getType(Character.class),
+            getType(Byte.class),
+            getType(Short.class),
+            getType(Integer.class),
+            getType(Float.class),
+            getType(Long.class));
+    public static final Map<org.objectweb.asm.Type, org.objectweb.asm.Type> WRAPPER_TO_PRIMITIVE = new HashMap<>();
+
+    static {
+        for (int i = 0; i < AsmUtil.PRIMITIVES.size(); i++) {
+            AsmUtil.WRAPPER_TO_PRIMITIVE.put(AsmUtil.WRAPPERS.get(i), AsmUtil.PRIMITIVES.get(i));
+        }
+    }
+
+    public static org.objectweb.asm.Type autobox(org.objectweb.asm.Type primitive) {
+        return WRAPPERS.get(primitive.getSort());
+    }
+
+    /**
+     * Returns the Java bytecode signature of a given Jandex MethodInfo using the given type argument mappings.
+     * For example, given this method:
+     * 
+     * <pre>
+     * {@code
+     * public class Foo<T> {
+     *  public <R> List<R> method(int a, T t){...} 
+     * }
+     * }
+     * </pre>
+     * 
+     * This will return <tt>&lt;R:Ljava/lang/Object;>(ILjava/lang/Integer;)Ljava/util/List&lt;TR;>;</tt> if
+     * your {@code typeArgMapper} contains {@code T=Ljava/lang/Integer;}.
+     * 
+     * @param method the method you want the signature for.
+     * @param typeArgMapper a mapping between type argument names and their bytecode signature.
+     * @return a bytecode signature for that method.
+     */
+    public static String getSignature(MethodInfo method, Function<String, String> typeArgMapper) {
+        List<Type> parameters = method.parameters();
+
+        StringBuilder signature = new StringBuilder("");
+        for (TypeVariable typeVariable : method.typeParameters()) {
+            if (signature.length() == 0)
+                signature.append("<");
+            else
+                signature.append(",");
+            signature.append(typeVariable.identifier()).append(":");
+            // FIXME: only use the first bound
+            toSignature(signature, typeVariable.bounds().get(0), typeArgMapper, false);
+        }
+        if (signature.length() > 0)
+            signature.append(">");
+        signature.append("(");
+        for (Type type : parameters) {
+            toSignature(signature, type, typeArgMapper, false);
+        }
+        signature.append(")");
+        toSignature(signature, method.returnType(), typeArgMapper, false);
+        return signature.toString();
+    }
+
+    /**
+     * Returns the Java bytecode descriptor of a given Jandex MethodInfo using the given type argument mappings.
+     * For example, given this method:
+     * 
+     * <pre>
+     * {@code
+     * public class Foo<T> {
+     *  public <R> List<R> method(int a, T t){...} 
+     * }
+     * }
+     * </pre>
+     * 
+     * This will return <tt>(ILjava/lang/Integer;)Ljava/util/List;</tt> if
+     * your {@code typeArgMapper} contains {@code T=Ljava/lang/Integer;}.
+     * 
+     * @param method the method you want the descriptor for.
+     * @param typeArgMapper a mapping between type argument names and their bytecode descriptor.
+     * @return a bytecode descriptor for that method.
+     */
+    public static String getDescriptor(MethodInfo method, Function<String, String> typeArgMapper) {
+        List<Type> parameters = method.parameters();
+
+        StringBuilder descriptor = new StringBuilder("(");
+        for (Type type : parameters) {
+            toSignature(descriptor, type, typeArgMapper, true);
+        }
+        descriptor.append(")");
+        toSignature(descriptor, method.returnType(), typeArgMapper, true);
+        return descriptor.toString();
+    }
+
+    /**
+     * Returns the Java bytecode descriptor of a given Jandex Type using the given type argument mappings.
+     * For example, given this type: <tt>List&lt;T></tt>, this will return <tt>Ljava/util/List;</tt> if
+     * your {@code typeArgMapper} contains {@code T=Ljava/lang/Integer;}.
+     * 
+     * @param type the type you want the descriptor for.
+     * @param typeArgMapper a mapping between type argument names and their bytecode descriptor.
+     * @return a bytecode descriptor for that type.
+     */
+    public static String getDescriptor(Type type, Function<String, String> typeArgMapper) {
+        StringBuilder sb = new StringBuilder();
+        toSignature(sb, type, typeArgMapper, true);
+        return sb.toString();
+    }
+
+    /**
+     * Returns the Java bytecode signature of a given Jandex Type using the given type argument mappings.
+     * For example, given this type: <tt>List&lt;T></tt>, this will return <tt>Ljava/util/List&lt;Ljava/lang/Integer;>;</tt> if
+     * your {@code typeArgMapper} contains {@code T=Ljava/lang/Integer;}.
+     * 
+     * @param type the type you want the signature for.
+     * @param typeArgMapper a mapping between type argument names and their bytecode descriptor.
+     * @return a bytecode signature for that type.
+     */
+    public static String getSignature(Type type, Function<String, String> typeArgMapper) {
+        StringBuilder sb = new StringBuilder();
+        toSignature(sb, type, typeArgMapper, false);
+        return sb.toString();
+    }
+
+    private static void toSignature(StringBuilder sb, Type type, Function<String, String> typeArgMapper, boolean erased) {
+        switch (type.kind()) {
+            case ARRAY:
+                ArrayType arrayType = type.asArrayType();
+                for (int i = 0; i < arrayType.dimensions(); i++)
+                    sb.append("[");
+                toSignature(sb, arrayType.component(), typeArgMapper, erased);
+                break;
+            case CLASS:
+                sb.append("L");
+                sb.append(type.asClassType().name().toString().replace('.', '/'));
+                sb.append(";");
+                break;
+            case PARAMETERIZED_TYPE:
+                ParameterizedType parameterizedType = type.asParameterizedType();
+                sb.append("L");
+                // FIXME: support owner type
+                sb.append(parameterizedType.name().toString().replace('.', '/'));
+                if (!erased && !parameterizedType.arguments().isEmpty()) {
+                    sb.append("<");
+                    List<Type> arguments = parameterizedType.arguments();
+                    for (int i = 0; i < arguments.size(); i++) {
+                        Type argType = arguments.get(i);
+                        toSignature(sb, argType, typeArgMapper, erased);
+                    }
+                    sb.append(">");
+                }
+                sb.append(";");
+                break;
+            case PRIMITIVE:
+                Primitive primitive = type.asPrimitiveType().primitive();
+                switch (primitive) {
+                    case BOOLEAN:
+                        sb.append('Z');
+                        break;
+                    case BYTE:
+                        sb.append('B');
+                        break;
+                    case CHAR:
+                        sb.append('C');
+                        break;
+                    case DOUBLE:
+                        sb.append('D');
+                        break;
+                    case FLOAT:
+                        sb.append('F');
+                        break;
+                    case INT:
+                        sb.append('I');
+                        break;
+                    case LONG:
+                        sb.append('J');
+                        break;
+                    case SHORT:
+                        sb.append('S');
+                        break;
+                }
+                break;
+            case TYPE_VARIABLE:
+                TypeVariable typeVariable = type.asTypeVariable();
+                String mappedSignature = typeArgMapper.apply(typeVariable.identifier());
+                if (mappedSignature != null)
+                    sb.append(mappedSignature);
+                else if (erased)
+                    toSignature(sb, typeVariable.bounds().get(0), typeArgMapper, erased);
+                else
+                    sb.append("T").append(typeVariable.identifier()).append(";");
+                break;
+            case UNRESOLVED_TYPE_VARIABLE:
+                // FIXME: ??
+                break;
+            case VOID:
+                sb.append("V");
+                break;
+            case WILDCARD_TYPE:
+                if (!erased) {
+                    sb.append("*");
+                }
+                break;
+            default:
+                break;
+
+        }
+    }
+
+    /**
+     * Returns a return bytecode instruction suitable for the given return type descriptor. This will return
+     * specialised return instructions <tt>IRETURN, LRETURN, FRETURN, DRETURN, RETURN</tt> for primitives/void,
+     * and <tt>ARETURN</tt> otherwise;
+     * 
+     * @param typeDescriptor the return type descriptor.
+     * @return the correct bytecode return instruction for that return type descriptor.
+     */
+    public static int getReturnInstruction(String typeDescriptor) {
+        switch (typeDescriptor) {
+            case "Z":
+            case "B":
+            case "C":
+            case "S":
+            case "I":
+                return Opcodes.IRETURN;
+            case "J":
+                return Opcodes.LRETURN;
+            case "F":
+                return Opcodes.FRETURN;
+            case "D":
+                return Opcodes.DRETURN;
+            case "V":
+                return Opcodes.RETURN;
+            default:
+                return Opcodes.ARETURN;
+        }
+    }
+
+    /**
+     * Returns a return bytecode instruction suitable for the given return Jandex Type. This will return
+     * specialised return instructions <tt>IRETURN, LRETURN, FRETURN, DRETURN, RETURN</tt> for primitives/void,
+     * and <tt>ARETURN</tt> otherwise;
+     * 
+     * @param typeDescriptor the return Jandex Type.
+     * @return the correct bytecode return instruction for that return type descriptor.
+     */
+    public static int getReturnInstruction(Type jandexType) {
+        if (jandexType.kind() == Kind.PRIMITIVE) {
+            switch (jandexType.asPrimitiveType().primitive()) {
+                case BOOLEAN:
+                case BYTE:
+                case SHORT:
+                case INT:
+                case CHAR:
+                    return Opcodes.IRETURN;
+                case DOUBLE:
+                    return Opcodes.DRETURN;
+                case FLOAT:
+                    return Opcodes.FRETURN;
+                case LONG:
+                    return Opcodes.LRETURN;
+                default:
+                    throw new IllegalArgumentException("Unknown primitive type: " + jandexType);
+            }
+        } else if (jandexType.kind() == Kind.VOID) {
+            return Opcodes.RETURN;
+        }
+        return Opcodes.ARETURN;
+    }
+
+    /**
+     * Invokes the proper LDC Class Constant instructions for the given Jandex Type. This will properly create LDC instructions
+     * for array types, class/parameterized classes, and primitive types by loading their equivalent <tt>TYPE</tt>
+     * constants in their box types, as well as type variables (using the first bound or Object) and Void.
+     * 
+     * @param mv The MethodVisitor on which to visit the LDC instructions
+     * @param jandexType the Jandex Type whose Class Constant to load.
+     */
+    public static void visitLdc(MethodVisitor mv, Type jandexType) {
+        switch (jandexType.kind()) {
+            case ARRAY:
+                mv.visitLdcInsn(org.objectweb.asm.Type.getType(jandexType.name().toString('/').replace('.', '/')));
+                break;
+            case CLASS:
+            case PARAMETERIZED_TYPE:
+                mv.visitLdcInsn(org.objectweb.asm.Type.getType("L" + jandexType.name().toString('/') + ";"));
+                break;
+            case PRIMITIVE:
+                switch (jandexType.asPrimitiveType().primitive()) {
+                    case BOOLEAN:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Boolean", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case BYTE:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Byte", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case CHAR:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Character", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case DOUBLE:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Double", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case FLOAT:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Float", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case INT:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Integer", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case LONG:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Long", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    case SHORT:
+                        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Short", "TYPE", "Ljava/lang/Class;");
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Unknown primitive type: " + jandexType);
+                }
+                break;
+            case TYPE_VARIABLE:
+                List<Type> bounds = jandexType.asTypeVariable().bounds();
+                if (bounds.isEmpty())
+                    mv.visitLdcInsn(org.objectweb.asm.Type.getType(Object.class));
+                else
+                    visitLdc(mv, bounds.get(0));
+                break;
+            case UNRESOLVED_TYPE_VARIABLE:
+                mv.visitLdcInsn(org.objectweb.asm.Type.getType(Object.class));
+                break;
+            case VOID:
+                mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Void", "TYPE", "Ljava/lang/Class;");
+                break;
+            case WILDCARD_TYPE:
+                visitLdc(mv, jandexType.asWildcardType().extendsBound());
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown jandex type: " + jandexType);
+        }
+    }
+
+    /**
+     * Calls the right boxing method for the given Jandex Type if it is a primitive.
+     * 
+     * @param mv The MethodVisitor on which to visit the boxing instructions
+     * @param jandexType The Jandex Type to box if it is a primitive.
+     */
+    public static void boxIfRequired(MethodVisitor mv, Type jandexType) {
+        if (jandexType.kind() == Kind.PRIMITIVE) {
+            switch (jandexType.asPrimitiveType().primitive()) {
+                case BOOLEAN:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Boolean", "valueOf", "(Z)Ljava/lang/Boolean;", false);
+                    break;
+                case BYTE:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Byte", "valueOf", "(B)Ljava/lang/Byte;", false);
+                    break;
+                case CHAR:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Character", "valueOf", "(C)Ljava/lang/Character;",
+                            false);
+                    break;
+                case DOUBLE:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;", false);
+                    break;
+                case FLOAT:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Float", "valueOf", "(F)Ljava/lang/Float;", false);
+                    break;
+                case INT:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false);
+                    break;
+                case LONG:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Long", "valueOf", "(J)Ljava/lang/Long;", false);
+                    break;
+                case SHORT:
+                    mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Short", "valueOf", "(S)Ljava/lang/Short;", false);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown primitive type: " + jandexType);
+            }
+        }
+    }
+
+    /**
+     * Returns the bytecode instruction to load the given Jandex Type. This returns the specialised
+     * bytecodes <tt>ILOAD, DLOAD, FLOAD and LLOAD</tt> for primitives, or <tt>ALOAD</tt> otherwise.
+     * 
+     * @param jandexType The Jandex Type whose load instruction to return.
+     * @return The bytecode instruction to load the given Jandex Type.
+     */
+    public static int getLoadOpcode(Type jandexType) {
+        if (jandexType.kind() == Kind.PRIMITIVE) {
+            switch (jandexType.asPrimitiveType().primitive()) {
+                case BOOLEAN:
+                case BYTE:
+                case SHORT:
+                case INT:
+                case CHAR:
+                    return Opcodes.ILOAD;
+                case DOUBLE:
+                    return Opcodes.DLOAD;
+                case FLOAT:
+                    return Opcodes.FLOAD;
+                case LONG:
+                    return Opcodes.LLOAD;
+                default:
+                    throw new IllegalArgumentException("Unknown primitive type: " + jandexType);
+            }
+        }
+        return Opcodes.ALOAD;
+    }
+
+    /**
+     * Calls the right unboxing method for the given Jandex Type if it is a primitive.
+     * 
+     * @param mv The MethodVisitor on which to visit the unboxing instructions
+     * @param jandexType The Jandex Type to unbox if it is a primitive.
+     */
+    public static void unboxIfRequired(MethodVisitor mv, Type jandexType) {
+        if (jandexType.kind() == Kind.PRIMITIVE) {
+            switch (jandexType.asPrimitiveType().primitive()) {
+                case BOOLEAN:
+                    unbox(mv, "java/lang/Boolean", "booleanValue", "Z");
+                    break;
+                case BYTE:
+                    unbox(mv, "java/lang/Byte", "byteValue", "B");
+                    break;
+                case CHAR:
+                    unbox(mv, "java/lang/Character", "charValue", "C");
+                    break;
+                case DOUBLE:
+                    unbox(mv, "java/lang/Double", "doubleValue", "D");
+                    break;
+                case FLOAT:
+                    unbox(mv, "java/lang/Float", "floatValue", "F");
+                    break;
+                case INT:
+                    unbox(mv, "java/lang/Integer", "intValue", "I");
+                    break;
+                case LONG:
+                    unbox(mv, "java/lang/Long", "longValue", "J");
+                    break;
+                case SHORT:
+                    unbox(mv, "java/lang/Short", "shortValue", "S");
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown primitive type: " + jandexType);
+            }
+        }
+    }
+
+    /**
+     * Calls the right unboxing method for the given Jandex Type if it is a primitive.
+     *
+     * @param mv The MethodVisitor on which to visit the unboxing instructions
+     * @param type The Jandex Type to unbox if it is a primitive.
+     */
+    public static void unboxIfRequired(MethodVisitor mv, org.objectweb.asm.Type type) {
+        if (type.getSort() <= org.objectweb.asm.Type.DOUBLE) {
+            switch (type.getSort()) {
+                case org.objectweb.asm.Type.BOOLEAN:
+                    unbox(mv, "java/lang/Boolean", "booleanValue", "Z");
+                    break;
+                case org.objectweb.asm.Type.BYTE:
+                    unbox(mv, "java/lang/Byte", "byteValue", "B");
+                    break;
+                case org.objectweb.asm.Type.CHAR:
+                    unbox(mv, "java/lang/Character", "charValue", "C");
+                    break;
+                case org.objectweb.asm.Type.DOUBLE:
+                    unbox(mv, "java/lang/Double", "doubleValue", "D");
+                    break;
+                case org.objectweb.asm.Type.FLOAT:
+                    unbox(mv, "java/lang/Float", "floatValue", "F");
+                    break;
+                case org.objectweb.asm.Type.INT:
+                    unbox(mv, "java/lang/Integer", "intValue", "I");
+                    break;
+                case org.objectweb.asm.Type.LONG:
+                    unbox(mv, "java/lang/Long", "longValue", "J");
+                    break;
+                case org.objectweb.asm.Type.SHORT:
+                    unbox(mv, "java/lang/Short", "shortValue", "S");
+                    break;
+            }
+        }
+    }
+
+    private static void unbox(MethodVisitor mv, String owner, String methodName, String returnTypeSignature) {
+        mv.visitTypeInsn(Opcodes.CHECKCAST, owner);
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, owner, methodName, "()" + returnTypeSignature, false);
+    }
+
+    /**
+     * Returns the Jandex Types of the parameters of the given method descriptor.
+     * 
+     * @param methodDescriptor a method descriptor
+     * @return the list of Jandex Type objects representing the parameters of the given method descriptor.
+     */
+    public static Type[] getParameterTypes(String methodDescriptor) {
+        String argsSignature = methodDescriptor.substring(methodDescriptor.indexOf('(') + 1, methodDescriptor.lastIndexOf(')'));
+        List<Type> args = new ArrayList<>();
+        char[] chars = argsSignature.toCharArray();
+        int dimensions = 0;
+        int start = 0;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+            switch (c) {
+                case 'Z':
+                    args.add(Type.create(DotName.createSimple("boolean"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'B':
+                    args.add(Type.create(DotName.createSimple("byte"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'C':
+                    args.add(Type.create(DotName.createSimple("char"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'D':
+                    args.add(Type.create(DotName.createSimple("double"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'F':
+                    args.add(Type.create(DotName.createSimple("float"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'I':
+                    args.add(Type.create(DotName.createSimple("int"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'J':
+                    args.add(Type.create(DotName.createSimple("long"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'S':
+                    args.add(Type.create(DotName.createSimple("short"),
+                            dimensions > 0 ? Kind.ARRAY : Kind.PRIMITIVE));
+                    dimensions = 0;
+                    start = i + 1;
+                    break;
+                case 'L':
+                    int end = argsSignature.indexOf(';', i);
+                    String binaryName = argsSignature.substring(i + 1, end);
+                    // arrays take the entire signature
+                    if (dimensions > 0) {
+                        args.add(Type.create(DotName.createSimple(argsSignature.substring(start, end + 1).replace('/', '.')),
+                                Kind.ARRAY));
+                        dimensions = 0;
+                    } else {
+                        // class names take only the binary name
+                        args.add(Type.create(DotName.createSimple(binaryName.replace('/', '.')), Kind.CLASS));
+                    }
+                    i = end; // we will have a ++ to get after the ;
+                    start = i + 1;
+                    break;
+                case '[':
+                    dimensions++;
+                    break;
+                default:
+                    throw new IllegalStateException("Invalid signature char: " + c);
+            }
+        }
+        return args.toArray(new Type[0]);
+    }
+
+    /**
+     * Returns the number of underlying bytecode parameters taken by the given Jandex parameter Type.
+     * This will be 2 for doubles and longs, 1 otherwise.
+     * 
+     * @param paramType the Jandex parameter Type
+     * @return the number of underlying bytecode parameters required.
+     */
+    public static int getParameterSize(Type paramType) {
+        if (paramType.kind() == Kind.PRIMITIVE) {
+            switch (paramType.asPrimitiveType().primitive()) {
+                case DOUBLE:
+                case LONG:
+                    return 2;
+            }
+        }
+        return 1;
+    }
+
+    /**
+     * Prints the value pushed on the stack (must be an Object) by the given <tt>valuePusher</tt>
+     * to STDERR.
+     * 
+     * @param mv The MethodVisitor to forward printing to.
+     * @param valuePusher The function to invoke to push an Object to print on the stack.
+     */
+    public static void printValueOnStderr(MethodVisitor mv, Runnable valuePusher) {
+        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "err", "Ljava/io/PrintStream;");
+        valuePusher.run();
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println",
+                "(Ljava/lang/Object;)V", false);
+    }
+
+    /**
+     * Copy the parameter names to the given MethodVisitor, unless we don't have parameter name info
+     * 
+     * @param mv the visitor to copy to
+     * @param method the method to copy from
+     */
+    public static void copyParameterNames(MethodVisitor mv, MethodInfo method) {
+        int parameterSize = method.parameters().size();
+        if (parameterSize > 0) {
+            // perhaps we don't have parameter names
+            if (method.parameterName(0) == null)
+                return;
+            for (int i = 0; i < parameterSize; i++) {
+                mv.visitParameter(method.parameterName(i), 0 /* modifiers */);
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java
new file mode 100644
index 0000000000000..2a1c97565dcf6
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/DefaultProducesHandler.java
@@ -0,0 +1,54 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import javax.ws.rs.core.MediaType;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig;
+
+public interface DefaultProducesHandler {
+
+    List<MediaType> handle(Context context);
+
+    interface Context {
+        Type nonAsyncReturnType();
+
+        IndexView index();
+
+        ResteasyReactiveConfig config();
+    }
+
+    class Noop implements DefaultProducesHandler {
+
+        public static Noop INSTANCE = new Noop();
+
+        private Noop() {
+        }
+
+        @Override
+        public List<MediaType> handle(Context context) {
+            return Collections.emptyList();
+        }
+    }
+
+    class DelegatingDefaultProducesHandler implements DefaultProducesHandler {
+        private final List<DefaultProducesHandler> delegates;
+
+        public DelegatingDefaultProducesHandler(List<DefaultProducesHandler> delegates) {
+            this.delegates = Objects.requireNonNull(delegates);
+        }
+
+        @Override
+        public List<MediaType> handle(Context context) {
+            for (DefaultProducesHandler delegate : delegates) {
+                List<MediaType> result = delegate.handle(context);
+                if ((result != null) && !result.isEmpty()) {
+                    return result;
+                }
+            }
+            return Collections.emptyList();
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java
new file mode 100644
index 0000000000000..3c8a9bc461dac
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java
@@ -0,0 +1,1064 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BEAN_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BIG_DECIMAL;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BIG_INTEGER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BLOCKING;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.BOOLEAN;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CHARACTER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COMPLETION_STAGE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONSUMES;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONTEXT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.COOKIE_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.DEFAULT_VALUE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.DOUBLE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.FLOAT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.FORM_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.HEADER_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.INTEGER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.LIST;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.LOCAL_DATE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.LONG;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.MATRIX_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.MULTI;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.MULTI_PART_FORM_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.NON_BLOCKING;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.OPTIONAL;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PATH;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PATH_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PATH_SEGMENT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRIMITIVE_BOOLEAN;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRIMITIVE_CHAR;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRIMITIVE_DOUBLE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRIMITIVE_FLOAT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRIMITIVE_INTEGER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRIMITIVE_LONG;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRODUCES;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.QUERY_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_COOKIE_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_FORM_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_HEADER_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_MATRIX_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_PATH_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_QUERY_PARAM;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.REST_SSE_ELEMENT_TYPE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SET;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SORTED_SET;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.STRING;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.SUSPENDED;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.UNI;
+
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.SseEventSink;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.ClassType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.jboss.jandex.TypeVariable;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig;
+import org.jboss.resteasy.reactive.common.model.InjectableBean;
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.common.model.ResourceClass;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.common.util.URLUtils;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public abstract class EndpointIndexer<T extends EndpointIndexer<T, PARAM, METHOD>, PARAM extends IndexedParameter<PARAM>, METHOD extends ResourceMethod> {
+
+    protected static final Map<String, String> primitiveTypes;
+    private static final Map<DotName, Class<?>> supportedReaderJavaTypes;
+    // NOTE: sync with ContextProducer and ContextParamExtractor
+    private static final Set<DotName> CONTEXT_TYPES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+            // spec
+            ResteasyReactiveDotNames.URI_INFO,
+            ResteasyReactiveDotNames.HTTP_HEADERS,
+            ResteasyReactiveDotNames.REQUEST,
+            ResteasyReactiveDotNames.SECURITY_CONTEXT,
+            ResteasyReactiveDotNames.PROVIDERS,
+            ResteasyReactiveDotNames.RESOURCE_CONTEXT,
+            ResteasyReactiveDotNames.CONFIGURATION,
+            ResteasyReactiveDotNames.SSE,
+            ResteasyReactiveDotNames.SSE_EVENT_SINK,
+            // extras
+            ResteasyReactiveDotNames.SERVER_REQUEST_CONTEXT,
+            DotName.createSimple("org.jboss.resteasy.reactive.server.SimpleResourceInfo"), //TODO: fixme
+            ResteasyReactiveDotNames.RESOURCE_INFO)));
+
+    protected static final Logger log = Logger.getLogger(EndpointIndexer.class);
+    protected static final String[] EMPTY_STRING_ARRAY = new String[] {};
+    private static final String[] PRODUCES_PLAIN_TEXT_NEGOTIATED = new String[] { MediaType.TEXT_PLAIN, MediaType.WILDCARD };
+    private static final String[] PRODUCES_PLAIN_TEXT = new String[] { MediaType.TEXT_PLAIN };
+    public static final String CDI_WRAPPER_SUFFIX = "$$CDIWrapper";
+
+    static {
+        Map<String, String> prims = new HashMap<>();
+        prims.put(byte.class.getName(), Byte.class.getName());
+        prims.put(Byte.class.getName(), Byte.class.getName());
+        prims.put(boolean.class.getName(), Boolean.class.getName());
+        prims.put(Boolean.class.getName(), Boolean.class.getName());
+        prims.put(char.class.getName(), Character.class.getName());
+        prims.put(Character.class.getName(), Character.class.getName());
+        prims.put(short.class.getName(), Short.class.getName());
+        prims.put(Short.class.getName(), Short.class.getName());
+        prims.put(int.class.getName(), Integer.class.getName());
+        prims.put(Integer.class.getName(), Integer.class.getName());
+        prims.put(float.class.getName(), Float.class.getName());
+        prims.put(Float.class.getName(), Float.class.getName());
+        prims.put(double.class.getName(), Double.class.getName());
+        prims.put(Double.class.getName(), Double.class.getName());
+        prims.put(long.class.getName(), Long.class.getName());
+        prims.put(Long.class.getName(), Long.class.getName());
+        primitiveTypes = Collections.unmodifiableMap(prims);
+
+        Map<DotName, Class<?>> supportedReaderJavaTps = new HashMap<>();
+        supportedReaderJavaTps.put(PRIMITIVE_BOOLEAN, boolean.class);
+        supportedReaderJavaTps.put(PRIMITIVE_DOUBLE, double.class);
+        supportedReaderJavaTps.put(PRIMITIVE_FLOAT, float.class);
+        supportedReaderJavaTps.put(PRIMITIVE_LONG, long.class);
+        supportedReaderJavaTps.put(PRIMITIVE_INTEGER, int.class);
+        supportedReaderJavaTps.put(PRIMITIVE_CHAR, char.class);
+        supportedReaderJavaTps.put(BOOLEAN, Boolean.class);
+        supportedReaderJavaTps.put(DOUBLE, Double.class);
+        supportedReaderJavaTps.put(FLOAT, Float.class);
+        supportedReaderJavaTps.put(LONG, Long.class);
+        supportedReaderJavaTps.put(INTEGER, Integer.class);
+        supportedReaderJavaTps.put(CHARACTER, Character.class);
+        supportedReaderJavaTps.put(BIG_DECIMAL, BigDecimal.class);
+        supportedReaderJavaTps.put(BIG_INTEGER, BigInteger.class);
+        supportedReaderJavaTypes = Collections.unmodifiableMap(supportedReaderJavaTps);
+    }
+
+    protected final IndexView index;
+    protected final Map<String, String> existingConverters;
+    protected final Map<String, InjectableBean> injectableBeans;
+    protected final boolean hasRuntimeConverters;
+
+    private final Map<DotName, String> scannedResourcePaths;
+    protected final ResteasyReactiveConfig config;
+    protected final AdditionalReaders additionalReaders;
+    private final Map<DotName, String> httpAnnotationToMethod;
+    private final AdditionalWriters additionalWriters;
+    private final boolean defaultBlocking;
+    private final Map<DotName, Map<String, String>> classLevelExceptionMappers;
+    private final Function<String, BeanFactory<Object>> factoryCreator;
+    private final Consumer<Map.Entry<MethodInfo, ResourceMethod>> resourceMethodCallback;
+
+    protected EndpointIndexer(Builder<T, ?, METHOD> builder) {
+        this.index = builder.index;
+        this.existingConverters = builder.existingConverters;
+        this.scannedResourcePaths = builder.scannedResourcePaths;
+        this.config = builder.config;
+        this.additionalReaders = builder.additionalReaders;
+        this.httpAnnotationToMethod = builder.httpAnnotationToMethod;
+        this.injectableBeans = builder.injectableBeans;
+        this.additionalWriters = builder.additionalWriters;
+        this.hasRuntimeConverters = builder.hasRuntimeConverters;
+        this.defaultBlocking = builder.defaultBlocking;
+        this.classLevelExceptionMappers = builder.classLevelExceptionMappers;
+        this.factoryCreator = builder.factoryCreator;
+        this.resourceMethodCallback = builder.resourceMethodCallback;
+    }
+
+    public ResourceClass createEndpoints(ClassInfo classInfo) {
+        try {
+            String path = scannedResourcePaths.get(classInfo.name());
+            ResourceClass clazz = new ResourceClass();
+            clazz.setClassName(classInfo.name().toString());
+            if (path != null) {
+                if (path.endsWith("/")) {
+                    path = path.substring(0, path.length() - 1);
+                }
+                if (!path.startsWith("/")) {
+                    path = "/" + path;
+                }
+                clazz.setPath(path);
+            }
+            clazz.setFactory(factoryCreator.apply(classInfo.name().toString()));
+            Map<String, String> classLevelExceptionMappers = this.classLevelExceptionMappers.get(classInfo.name());
+            if (classLevelExceptionMappers != null) {
+                clazz.setClassLevelExceptionMappers(classLevelExceptionMappers);
+            }
+            List<ResourceMethod> methods = createEndpoints(classInfo, classInfo, new HashSet<>(),
+                    clazz.getPathParameters());
+            clazz.getMethods().addAll(methods);
+
+            // get an InjectableBean view of our class
+            InjectableBean injectableBean = scanInjectableBean(classInfo, classInfo,
+                    existingConverters,
+                    additionalReaders, injectableBeans, hasRuntimeConverters);
+
+            // at this point we've scanned the class and its bean infos, which can have form params
+            if (injectableBean.isFormParamRequired()) {
+                clazz.setFormParamRequired(true);
+                // we must propagate this to all our methods, regardless of what they thought they required
+                for (ResourceMethod method : methods) {
+                    method.setFormParamRequired(true);
+                }
+            }
+            if (injectableBean.isInjectionRequired()) {
+                clazz.setPerRequestResource(true);
+            }
+
+            return clazz;
+        } catch (Exception e) {
+            if (Modifier.isInterface(classInfo.flags()) || Modifier.isAbstract(classInfo.flags())) {
+                //kinda bogus, but we just ignore failed interfaces for now
+                //they can have methods that are not valid until they are actually extended by a concrete type
+                log.debug("Ignoring interface " + classInfo.name(), e);
+                return null;
+            }
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected abstract METHOD createResourceMethod(MethodInfo info, Map<String, Object> methodContext);
+
+    protected List<ResourceMethod> createEndpoints(ClassInfo currentClassInfo,
+            ClassInfo actualEndpointInfo, Set<String> seenMethods,
+            Set<String> pathParameters) {
+
+        // $$CDIWrapper suffix is used to generate CDI beans from interfaces, we don't want to create endpoints for them:
+        if (currentClassInfo.name().toString().endsWith(CDI_WRAPPER_SUFFIX)) {
+            return Collections.emptyList();
+        }
+
+        List<ResourceMethod> ret = new ArrayList<>();
+        String[] classProduces = extractProducesConsumesValues(currentClassInfo.classAnnotation(PRODUCES));
+        String[] classConsumes = extractProducesConsumesValues(currentClassInfo.classAnnotation(CONSUMES));
+        String classSseElementType = null;
+        AnnotationInstance classSseElementTypeAnnotation = currentClassInfo.classAnnotation(REST_SSE_ELEMENT_TYPE);
+        if (classSseElementTypeAnnotation != null) {
+            classSseElementType = classSseElementTypeAnnotation.value().asString();
+        }
+        Set<String> classNameBindings = NameBindingUtil.nameBindingNames(index, currentClassInfo);
+
+        for (DotName httpMethod : httpAnnotationToMethod.keySet()) {
+            List<AnnotationInstance> foundMethods = currentClassInfo.annotations().get(httpMethod);
+            if (foundMethods != null) {
+                for (AnnotationInstance annotation : foundMethods) {
+                    MethodInfo info = annotation.target().asMethod();
+                    if (!hasProperModifiers(info)) {
+                        continue;
+                    }
+                    validateHttpAnnotations(info);
+                    String descriptor = methodDescriptor(info);
+                    if (seenMethods.contains(descriptor)) {
+                        continue;
+                    }
+                    seenMethods.add(descriptor);
+                    String methodPath = readStringValue(info.annotation(PATH));
+                    if (methodPath != null) {
+                        if (!methodPath.startsWith("/")) {
+                            methodPath = "/" + methodPath;
+                        }
+                    } else {
+                        methodPath = "";
+                    }
+                    ResourceMethod method = createResourceMethod(currentClassInfo, actualEndpointInfo,
+                            classProduces, classConsumes, classNameBindings, httpMethod, info, methodPath, pathParameters,
+                            classSseElementType);
+
+                    ret.add(method);
+                }
+            }
+        }
+        //now resource locator methods
+        List<AnnotationInstance> foundMethods = currentClassInfo.annotations().get(PATH);
+        if (foundMethods != null) {
+            for (AnnotationInstance annotation : foundMethods) {
+                if (annotation.target().kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo info = annotation.target().asMethod();
+                    if (!hasProperModifiers(info)) {
+                        continue;
+                    }
+                    String descriptor = methodDescriptor(info);
+                    if (seenMethods.contains(descriptor)) {
+                        continue;
+                    }
+                    seenMethods.add(descriptor);
+                    String methodPath = readStringValue(annotation);
+                    if (methodPath != null) {
+                        if (!methodPath.startsWith("/")) {
+                            methodPath = "/" + methodPath;
+                        }
+                        if (methodPath.endsWith("/")) {
+                            methodPath = methodPath.substring(0, methodPath.length() - 1);
+                        }
+                    }
+                    ResourceMethod method = createResourceMethod(currentClassInfo, actualEndpointInfo,
+                            classProduces, classConsumes, classNameBindings, null, info, methodPath,
+                            pathParameters, classSseElementType);
+                    ret.add(method);
+                }
+            }
+        }
+
+        DotName superClassName = currentClassInfo.superName();
+        if (superClassName != null && !superClassName.equals(ResteasyReactiveDotNames.OBJECT)) {
+            ClassInfo superClass = index.getClassByName(superClassName);
+            if (superClass != null) {
+                ret.addAll(createEndpoints(superClass, actualEndpointInfo, seenMethods,
+                        pathParameters));
+            }
+        }
+        List<DotName> interfaces = currentClassInfo.interfaceNames();
+        for (DotName i : interfaces) {
+            ClassInfo superClass = index.getClassByName(i);
+            if (superClass != null) {
+                ret.addAll(createEndpoints(superClass, actualEndpointInfo, seenMethods,
+                        pathParameters));
+            }
+        }
+        return ret;
+    }
+
+    private void validateHttpAnnotations(MethodInfo info) {
+        List<AnnotationInstance> annotationInstances = info.annotations();
+        Set<DotName> allMethodAnnotations = new HashSet<>(annotationInstances.size());
+        for (AnnotationInstance instance : annotationInstances) {
+            allMethodAnnotations.add(instance.name());
+        }
+        int httpAnnotationCount = 0;
+        for (DotName dotName : allMethodAnnotations) {
+            if (httpAnnotationToMethod.containsKey(dotName)) {
+                httpAnnotationCount++;
+            }
+            if (httpAnnotationCount > 1) {
+                throw new DeploymentException("Method '" + info.name() + "' of class '" + info.declaringClass().name()
+                        + "' contains multiple HTTP method annotations.");
+            }
+        }
+    }
+
+    private boolean hasProperModifiers(MethodInfo info) {
+        if ((info.flags() & Modifier.PUBLIC) == 0) {
+            log.warn("Method '" + info.name() + " of Resource class '" + info.declaringClass().name()
+                    + "' it not public and will therefore be ignored");
+            return false;
+        }
+        if ((info.flags() & Modifier.STATIC) != 0) {
+            log.warn("Method '" + info.name() + " of Resource class '" + info.declaringClass().name()
+                    + "' it static and will therefore be ignored");
+            return false;
+        }
+        return true;
+    }
+
+    private ResourceMethod createResourceMethod(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo,
+            String[] classProduces, String[] classConsumes, Set<String> classNameBindings, DotName httpMethod, MethodInfo info,
+            String methodPath,
+            Set<String> classPathParameters, String classSseElementType) {
+        try {
+            Map<String, Object> methodContext = new HashMap<>();
+            Set<String> pathParameters = new HashSet<>(classPathParameters);
+            URLUtils.parsePathParameters(methodPath, pathParameters);
+            Map<DotName, AnnotationInstance>[] parameterAnnotations = new Map[info.parameters().size()];
+            MethodParameter[] methodParameters = new MethodParameter[info.parameters()
+                    .size()];
+            for (int paramPos = 0; paramPos < info.parameters().size(); ++paramPos) {
+                parameterAnnotations[paramPos] = new HashMap<>();
+            }
+            for (AnnotationInstance i : info.annotations()) {
+                if (i.target().kind() == AnnotationTarget.Kind.METHOD_PARAMETER) {
+                    parameterAnnotations[i.target().asMethodParameter().position()].put(i.name(), i);
+                }
+            }
+            String[] consumes = extractProducesConsumesValues(info.annotation(CONSUMES), classConsumes);
+            boolean suspended = false;
+            boolean sse = false;
+            boolean formParamRequired = false;
+            boolean multipart = false;
+            boolean hasBodyParam = false;
+            TypeArgMapper typeArgMapper = new TypeArgMapper(info.declaringClass(), index);
+            for (int i = 0; i < methodParameters.length; ++i) {
+                Map<DotName, AnnotationInstance> anns = parameterAnnotations[i];
+                boolean encoded = anns.containsKey(ResteasyReactiveDotNames.ENCODED);
+                Type paramType = info.parameters().get(i);
+                String errorLocation = "method " + info + " on class " + info.declaringClass();
+
+                PARAM parameterResult = extractParameterInfo(currentClassInfo, actualEndpointInfo,
+                        existingConverters, additionalReaders,
+                        anns, paramType, errorLocation, false, hasRuntimeConverters, pathParameters, info.parameterName(i),
+                        methodContext);
+                suspended |= parameterResult.isSuspended();
+                sse |= parameterResult.isSse();
+                String name = parameterResult.getName();
+                String defaultValue = parameterResult.getDefaultValue();
+                ParameterType type = parameterResult.getType();
+                if (type == ParameterType.BODY) {
+                    if (hasBodyParam)
+                        throw new RuntimeException(
+                                "Resource method " + info + " can only have a single body parameter: " + info.parameterName(i));
+                    hasBodyParam = true;
+                }
+                String elementType = parameterResult.getElementType();
+                boolean single = parameterResult.isSingle();
+                if (defaultValue == null && paramType.kind() == Type.Kind.PRIMITIVE) {
+                    defaultValue = "0";
+                }
+                methodParameters[i] = createMethodParameter(currentClassInfo, actualEndpointInfo, encoded, paramType,
+                        parameterResult, name, defaultValue, type, elementType, single,
+                        AsmUtil.getSignature(paramType, typeArgMapper));
+
+                if (type == ParameterType.BEAN) {
+                    // transform the bean param
+                    formParamRequired |= handleBeanParam(actualEndpointInfo, paramType, methodParameters, i);
+                } else if (type == ParameterType.FORM) {
+                    formParamRequired = true;
+                } else if (type == ParameterType.MULTI_PART_FORM) {
+                    multipart = true;
+                    ClassInfo multipartClassInfo = index.getClassByName(paramType.name());
+                    handleMultipart(multipartClassInfo);
+                }
+            }
+
+            if (multipart) {
+                if (hasBodyParam) {
+                    throw new RuntimeException(
+                            "'@MultipartForm' cannot be used in a resource method that contains a body parameter. Offending method is '"
+                                    + info.declaringClass().name() + "#" + info.toString() + "'");
+                }
+                boolean validConsumes = false;
+                if (consumes != null) {
+                    for (String c : consumes) {
+                        if (c.equals(MediaType.MULTIPART_FORM_DATA)) {
+                            validConsumes = true;
+                            break;
+                        }
+                    }
+                }
+                // TODO: does it make sense to default to MediaType.MULTIPART_FORM_DATA when no consumes is set?
+                if (!validConsumes) {
+                    throw new RuntimeException(
+                            "'@MultipartForm' can only be used on methods that annotated with '@Consumes(MediaType.MULTIPART_FORM_DATA)'. Offending method is '"
+                                    + info.declaringClass().name() + "#" + info.toString() + "'");
+                }
+            }
+
+            Type nonAsyncReturnType = getNonAsyncReturnType(info.returnType());
+            addWriterForType(additionalWriters, nonAsyncReturnType);
+
+            String[] produces = extractProducesConsumesValues(info.annotation(PRODUCES), classProduces);
+            produces = applyDefaultProduces(produces, nonAsyncReturnType);
+
+            String sseElementType = classSseElementType;
+            AnnotationInstance sseElementTypeAnnotation = info.annotation(REST_SSE_ELEMENT_TYPE);
+            if (sseElementTypeAnnotation != null) {
+                sseElementType = sseElementTypeAnnotation.value().asString();
+            }
+            Set<String> nameBindingNames = nameBindingNames(info, classNameBindings);
+            boolean blocking = defaultBlocking;
+            AnnotationInstance blockingAnnotation = getInheritableAnnotation(info, BLOCKING);
+            if (blockingAnnotation != null) {
+                blocking = true;
+            } else {
+                AnnotationInstance nonBlockingAnnotation = getInheritableAnnotation(info, NON_BLOCKING);
+                if (nonBlockingAnnotation != null) {
+                    blocking = false;
+                }
+            }
+
+            ResourceMethod method = createResourceMethod(info, methodContext)
+                    .setHttpMethod(httpMethod == null ? null : httpAnnotationToMethod.get(httpMethod))
+                    .setPath(methodPath)
+                    .setConsumes(consumes)
+                    .setProduces(produces)
+                    .setNameBindingNames(nameBindingNames)
+                    .setName(info.name())
+                    .setBlocking(blocking)
+                    .setSuspended(suspended)
+                    .setSse(sse)
+                    .setSseElementType(sseElementType)
+                    .setFormParamRequired(formParamRequired)
+                    .setMultipart(multipart)
+                    .setParameters(methodParameters)
+                    .setSimpleReturnType(toClassName(info.returnType(), currentClassInfo, actualEndpointInfo, index))
+                    // FIXME: resolved arguments ?
+                    .setReturnType(determineReturnType(info, typeArgMapper, currentClassInfo, actualEndpointInfo, index));
+            handleAdditionalMethodProcessing((METHOD) method, currentClassInfo, info);
+            if (resourceMethodCallback != null) {
+                resourceMethodCallback.accept(new AbstractMap.SimpleEntry<>(info, method));
+            }
+            return method;
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to process method " + info.declaringClass().name() + "#" + info.toString(), e);
+        }
+    }
+
+    protected void handleMultipart(ClassInfo multipartClassInfo) {
+
+    }
+
+    private String determineReturnType(MethodInfo info, TypeArgMapper typeArgMapper, ClassInfo currentClassInfo,
+            ClassInfo actualEndpointInfo, IndexView index) {
+        Type type = info.returnType();
+        if (type.kind() == Type.Kind.TYPE_VARIABLE) {
+            type = resolveTypeVariable(type.asTypeVariable(), currentClassInfo, actualEndpointInfo, index);
+        }
+        return AsmUtil.getSignature(type, typeArgMapper);
+    }
+
+    protected abstract boolean handleBeanParam(ClassInfo actualEndpointInfo, Type paramType, MethodParameter[] methodParameters,
+            int i);
+
+    protected void handleAdditionalMethodProcessing(METHOD method, ClassInfo currentClassInfo, MethodInfo info) {
+
+    }
+
+    protected abstract InjectableBean scanInjectableBean(ClassInfo currentClassInfo,
+            ClassInfo actualEndpointInfo,
+            Map<String, String> existingConverters,
+            AdditionalReaders additionalReaders,
+            Map<String, InjectableBean> injectableBeans,
+            boolean hasRuntimeConverters);
+
+    protected abstract MethodParameter createMethodParameter(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo,
+            boolean encoded, Type paramType, PARAM parameterResult, String name, String defaultValue,
+            ParameterType type, String elementType, boolean single, String signature);
+
+    private String[] applyDefaultProduces(String[] produces, Type nonAsyncReturnType) {
+        if (produces != null && produces.length != 0)
+            return produces;
+        return applyAdditionalDefaults(nonAsyncReturnType);
+    }
+
+    protected String[] applyAdditionalDefaults(Type nonAsyncReturnType) {
+        // FIXME: primitives
+        if (STRING.equals(nonAsyncReturnType.name()))
+            return config.isSingleDefaultProduces() ? PRODUCES_PLAIN_TEXT : PRODUCES_PLAIN_TEXT_NEGOTIATED;
+        return EMPTY_STRING_ARRAY;
+    }
+
+    private Type getNonAsyncReturnType(Type returnType) {
+        switch (returnType.kind()) {
+            case ARRAY:
+            case CLASS:
+            case PRIMITIVE:
+            case VOID:
+                return returnType;
+            case PARAMETERIZED_TYPE:
+                // NOTE: same code in QuarkusRestRecorder.getNonAsyncReturnType
+                ParameterizedType parameterizedType = returnType.asParameterizedType();
+                if (COMPLETION_STAGE.equals(parameterizedType.name())
+                        || UNI.equals(parameterizedType.name())
+                        || MULTI.equals(parameterizedType.name())) {
+                    return parameterizedType.arguments().get(0);
+                }
+                return returnType;
+            default:
+        }
+        return returnType;
+        // FIXME: should be an exception, but we have incomplete support for generics ATM, so we still
+        // have some unresolved type vars and they do pass _some_ tests 
+        //        throw new UnsupportedOperationException("Endpoint return type not supported yet: " + returnType);
+    }
+
+    protected abstract void addWriterForType(AdditionalWriters additionalWriters, Type paramType);
+
+    protected abstract void addReaderForType(AdditionalReaders additionalReaders, Type paramType);
+
+    @SuppressWarnings("unchecked")
+    private static <T> Class<T> getSupportedReaderJavaClass(Type paramType) {
+        Class<T> result = (Class<T>) supportedReaderJavaTypes.get(paramType.name());
+        return Objects.requireNonNull(result);
+    }
+
+    private static AnnotationInstance getInheritableAnnotation(MethodInfo info, DotName name) {
+        // try method first, class second
+        AnnotationInstance annotation = info.annotation(name);
+        if (annotation == null) {
+            annotation = info.declaringClass().classAnnotation(name);
+        }
+        return annotation;
+    }
+
+    private static String methodDescriptor(MethodInfo info) {
+        return info.name() + ":" + AsmUtil.getDescriptor(info, s -> null);
+    }
+
+    private static boolean moreThanOne(AnnotationInstance... annotations) {
+        boolean oneNonNull = false;
+        for (AnnotationInstance annotation : annotations) {
+            if (annotation != null) {
+                if (oneNonNull)
+                    return true;
+                oneNonNull = true;
+            }
+        }
+        return false;
+    }
+
+    private static String[] extractProducesConsumesValues(AnnotationInstance annotation, String[] defaultValue) {
+        String[] read = extractProducesConsumesValues(annotation);
+        if (read == null) {
+            return defaultValue;
+        }
+        return read;
+    }
+
+    private static String[] extractProducesConsumesValues(AnnotationInstance annotation) {
+        if (annotation == null) {
+            return null;
+        }
+
+        String[] originalStrings;
+        AnnotationValue value = annotation.value();
+        if (value == null) {
+            originalStrings = new String[] { MediaType.WILDCARD };
+        } else {
+            originalStrings = value.asStringArray();
+        }
+
+        if (originalStrings.length > 0) {
+            List<String> result = new ArrayList<>(originalStrings.length);
+            for (String s : originalStrings) {
+                String[] trimmed = s.split(","); // spec says that the value can be a comma separated list...
+                for (String t : trimmed) {
+                    result.add(t.trim());
+                }
+            }
+            return result.toArray(new String[0]);
+        } else {
+            return originalStrings;
+        }
+
+    }
+
+    public static String readStringValue(AnnotationInstance annotationInstance) {
+        String classProduces = null;
+        if (annotationInstance != null) {
+            classProduces = annotationInstance.value().asString();
+        }
+        return classProduces;
+    }
+
+    protected static String toClassName(Type indexType, ClassInfo currentClass, ClassInfo actualEndpointClass,
+            IndexView indexView) {
+        switch (indexType.kind()) {
+            case VOID:
+                return "void";
+            case CLASS:
+                return indexType.asClassType().name().toString();
+            case PRIMITIVE:
+                return indexType.asPrimitiveType().primitive().name().toLowerCase(Locale.ENGLISH);
+            case PARAMETERIZED_TYPE:
+                return indexType.asParameterizedType().name().toString();
+            case ARRAY:
+                return indexType.asArrayType().name().toString();
+            case TYPE_VARIABLE:
+                TypeVariable typeVariable = indexType.asTypeVariable();
+                if (typeVariable.bounds().isEmpty()) {
+                    return Object.class.getName();
+                }
+
+                return toClassName(resolveTypeVariable(typeVariable, currentClass, actualEndpointClass, indexView),
+                        currentClass, actualEndpointClass, indexView);
+            default:
+                throw new RuntimeException("Unknown parameter type " + indexType);
+        }
+    }
+
+    private static Type resolveTypeVariable(TypeVariable typeVariable, ClassInfo currentClass, ClassInfo actualEndpointClass,
+            IndexView indexView) {
+        if (typeVariable.bounds().isEmpty()) {
+            return Type.create(DotName.createSimple(Object.class.getName()), Kind.CLASS);
+        }
+        int pos = -1;
+        List<TypeVariable> typeVariables = currentClass.typeParameters();
+        for (int i = 0; i < typeVariables.size(); ++i) {
+            if (typeVariables.get(i).identifier().equals(typeVariable.identifier())) {
+                pos = i;
+                break;
+            }
+        }
+        if (pos != -1) {
+            List<Type> params = JandexUtil.resolveTypeParameters(actualEndpointClass.name(), currentClass.name(),
+                    indexView);
+
+            Type resolved = params.get(pos);
+            if (resolved.kind() != Type.Kind.TYPE_VARIABLE
+                    || !resolved.asTypeVariable().identifier().equals(typeVariable.identifier())) {
+                return resolved;
+            }
+        }
+
+        return typeVariable.bounds().get(0);
+    }
+
+    private static String appendPath(String prefix, String suffix) {
+        if (prefix == null) {
+            return suffix;
+        } else if (suffix == null) {
+            return prefix;
+        }
+        if ((prefix.endsWith("/") && !suffix.startsWith("/")) ||
+                (!prefix.endsWith("/") && suffix.startsWith("/"))) {
+            return prefix + suffix;
+        } else if (prefix.endsWith("/")) {
+            return prefix.substring(0, prefix.length() - 1) + suffix;
+        } else {
+            return prefix + "/" + suffix;
+        }
+    }
+
+    protected abstract PARAM createIndexedParam();
+
+    public PARAM extractParameterInfo(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo,
+            Map<String, String> existingConverters, AdditionalReaders additionalReaders,
+            Map<DotName, AnnotationInstance> anns, Type paramType, String errorLocation, boolean field,
+            boolean hasRuntimeConverters, Set<String> pathParameters, String sourceName,
+            Map<String, Object> methodContext) {
+        PARAM builder = createIndexedParam()
+                .setCurrentClassInfo(currentClassInfo)
+                .setActualEndpointInfo(actualEndpointInfo)
+                .setExistingConverters(existingConverters)
+                .setAdditionalReaders(additionalReaders)
+                .setAnns(anns)
+                .setParamType(paramType)
+                .setErrorLocation(errorLocation)
+                .setField(field)
+                .setHasRuntimeConverters(hasRuntimeConverters)
+                .setPathParameters(pathParameters)
+                .setSourceName(sourceName);
+
+        AnnotationInstance beanParam = anns.get(BEAN_PARAM);
+        AnnotationInstance multiPartFormParam = anns.get(MULTI_PART_FORM_PARAM);
+        AnnotationInstance pathParam = anns.get(PATH_PARAM);
+        AnnotationInstance queryParam = anns.get(QUERY_PARAM);
+        AnnotationInstance headerParam = anns.get(HEADER_PARAM);
+        AnnotationInstance formParam = anns.get(FORM_PARAM);
+        AnnotationInstance matrixParam = anns.get(MATRIX_PARAM);
+        AnnotationInstance cookieParam = anns.get(COOKIE_PARAM);
+        AnnotationInstance restPathParam = anns.get(REST_PATH_PARAM);
+        AnnotationInstance restQueryParam = anns.get(REST_QUERY_PARAM);
+        AnnotationInstance restHeaderParam = anns.get(REST_HEADER_PARAM);
+        AnnotationInstance restFormParam = anns.get(REST_FORM_PARAM);
+        AnnotationInstance restMatrixParam = anns.get(REST_MATRIX_PARAM);
+        AnnotationInstance restCookieParam = anns.get(REST_COOKIE_PARAM);
+        AnnotationInstance contextParam = anns.get(CONTEXT);
+        AnnotationInstance defaultValueAnnotation = anns.get(DEFAULT_VALUE);
+        AnnotationInstance suspendedAnnotation = anns.get(SUSPENDED);
+        boolean convertible = false;
+        if (defaultValueAnnotation != null) {
+            builder.setDefaultValue(defaultValueAnnotation.value().asString());
+        }
+        if (handleCustomParameter(anns, builder, paramType, field, methodContext)) {
+            return builder;
+        } else if (moreThanOne(pathParam, queryParam, headerParam, formParam, cookieParam, contextParam, beanParam,
+                restPathParam, restQueryParam, restHeaderParam, restFormParam, restCookieParam)) {
+            throw new RuntimeException(
+                    "Cannot have more than one of @PathParam, @QueryParam, @HeaderParam, @FormParam, @CookieParam, @BeanParam, @Context on "
+                            + errorLocation);
+        } else if (pathParam != null) {
+            builder.setName(pathParam.value().asString());
+            builder.setType(ParameterType.PATH);
+            convertible = true;
+        } else if (restPathParam != null) {
+            builder.setName(valueOrDefault(restPathParam.value(), sourceName));
+            builder.setType(ParameterType.PATH);
+            convertible = true;
+        } else if (queryParam != null) {
+            builder.setName(queryParam.value().asString());
+            builder.setType(ParameterType.QUERY);
+            convertible = true;
+        } else if (restQueryParam != null) {
+            builder.setName(valueOrDefault(restQueryParam.value(), sourceName));
+            builder.setType(ParameterType.QUERY);
+            convertible = true;
+        } else if (cookieParam != null) {
+            builder.setName(cookieParam.value().asString());
+            builder.setType(ParameterType.COOKIE);
+            convertible = true;
+        } else if (restCookieParam != null) {
+            builder.setName(valueOrDefault(restCookieParam.value(), sourceName));
+            builder.setType(ParameterType.COOKIE);
+            convertible = true;
+        } else if (headerParam != null) {
+            builder.setName(headerParam.value().asString());
+            builder.setType(ParameterType.HEADER);
+            convertible = true;
+        } else if (restHeaderParam != null) {
+            builder.setName(valueOrDefault(restHeaderParam.value(), sourceName));
+            builder.setType(ParameterType.HEADER);
+            convertible = true;
+        } else if (formParam != null) {
+            builder.setName(formParam.value().asString());
+            builder.setType(ParameterType.FORM);
+            convertible = true;
+        } else if (restFormParam != null) {
+            builder.setName(valueOrDefault(restFormParam.value(), sourceName));
+            builder.setType(ParameterType.FORM);
+            convertible = true;
+        } else if (matrixParam != null) {
+            builder.setName(matrixParam.value().asString());
+            builder.setType(ParameterType.MATRIX);
+            convertible = true;
+        } else if (restMatrixParam != null) {
+            builder.setName(valueOrDefault(restMatrixParam.value(), sourceName));
+            builder.setType(ParameterType.MATRIX);
+            convertible = true;
+        } else if (contextParam != null) {
+            //this is handled by CDI
+            if (field) {
+                return builder;
+            }
+            // no name required
+            builder.setType(ParameterType.CONTEXT);
+        } else if (beanParam != null) {
+            // no name required
+            builder.setType(ParameterType.BEAN);
+        } else if (multiPartFormParam != null) {
+            builder.setType(ParameterType.MULTI_PART_FORM);
+        } else if (suspendedAnnotation != null) {
+            // no name required
+            builder.setType(ParameterType.ASYNC_RESPONSE);
+            builder.setSuspended(true);
+        } else {
+            // auto context parameters
+            if (!field
+                    && paramType.kind() == Kind.CLASS
+                    && isContextType(paramType.asClassType())) {
+                // no name required
+                builder.setType(ParameterType.CONTEXT);
+            } else if (!field && pathParameters.contains(sourceName)) {
+                builder.setName(sourceName);
+                builder.setType(ParameterType.PATH);
+                convertible = true;
+            } else {
+                //un-annotated field
+                //just ignore it
+                if (field) {
+                    return builder;
+                }
+                builder.setType(ParameterType.BODY);
+            }
+        }
+        builder.setSingle(true);
+        boolean typeHandled = false;
+        String elementType = null;
+        final ParameterType type = builder.getType();
+        if (paramType.kind() == Type.Kind.PARAMETERIZED_TYPE) {
+            ParameterizedType pt = paramType.asParameterizedType();
+            if (pt.name().equals(LIST)) {
+                typeHandled = true;
+                builder.setSingle(false);
+                elementType = toClassName(pt.arguments().get(0), currentClassInfo, actualEndpointInfo, index);
+                if (convertible) {
+                    handleListParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType);
+                }
+            } else if (pt.name().equals(SET)) {
+                typeHandled = true;
+                builder.setSingle(false);
+                elementType = toClassName(pt.arguments().get(0), currentClassInfo, actualEndpointInfo, index);
+                if (convertible) {
+                    handleSetParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType);
+                }
+            } else if (pt.name().equals(SORTED_SET)) {
+                typeHandled = true;
+                builder.setSingle(false);
+                elementType = toClassName(pt.arguments().get(0), currentClassInfo, actualEndpointInfo, index);
+                if (convertible) {
+                    handleSortedSetParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType);
+                }
+            } else if (pt.name().equals(OPTIONAL)) {
+                typeHandled = true;
+                elementType = toClassName(pt.arguments().get(0), currentClassInfo, actualEndpointInfo, index);
+                if (convertible) {
+                    handleOptionalParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType);
+                }
+                builder.setOptional(true);
+            } else if (convertible) {
+                throw new RuntimeException("Invalid parameter type '" + pt + "' used on method " + errorLocation);
+            }
+        } else if ((paramType.name().equals(PATH_SEGMENT)) && (type == ParameterType.PATH)) {
+            elementType = paramType.name().toString();
+            handlePathSegmentParam(builder);
+            typeHandled = true;
+        } else if ((paramType.name().equals(LOCAL_DATE)) && (type == ParameterType.PATH || type == ParameterType.QUERY)) {
+            elementType = paramType.name().toString();
+            handleLocalDateParam(builder);
+            typeHandled = true;
+        }
+
+        if (!typeHandled) {
+            elementType = toClassName(paramType, currentClassInfo, actualEndpointInfo, index);
+            addReaderForType(additionalReaders, paramType);
+
+            if (type != ParameterType.CONTEXT && type != ParameterType.BEAN && type != ParameterType.BODY
+                    && type != ParameterType.ASYNC_RESPONSE && type != ParameterType.MULTI_PART_FORM) {
+                handleOtherParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType);
+            }
+            if (type == ParameterType.CONTEXT && elementType.equals(SseEventSink.class.getName())) {
+                builder.setSse(true);
+            }
+        }
+        if (suspendedAnnotation != null && !elementType.equals(AsyncResponse.class.getName())) {
+            throw new RuntimeException("Can only inject AsyncResponse on methods marked @Suspended");
+        }
+        builder.setElementType(elementType);
+        return builder;
+    }
+
+    protected boolean handleCustomParameter(Map<DotName, AnnotationInstance> anns, PARAM builder, Type paramType, boolean field,
+            Map<String, Object> methodContext) {
+        return false;
+    }
+
+    protected void handlePathSegmentParam(PARAM builder) {
+    }
+
+    protected void handleLocalDateParam(PARAM builder) {
+    }
+
+    protected void handleOtherParam(Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters,
+            PARAM builder, String elementType) {
+    }
+
+    protected void handleSortedSetParam(Map<String, String> existingConverters, String errorLocation,
+            boolean hasRuntimeConverters, PARAM builder, String elementType) {
+    }
+
+    protected void handleOptionalParam(Map<String, String> existingConverters, String errorLocation,
+            boolean hasRuntimeConverters, PARAM builder, String elementType) {
+    }
+
+    protected void handleSetParam(Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters,
+            PARAM builder, String elementType) {
+    }
+
+    protected void handleListParam(Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters,
+            PARAM builder, String elementType) {
+    }
+
+    protected boolean isContextType(ClassType klass) {
+        return CONTEXT_TYPES.contains(klass.name());
+    }
+
+    private String valueOrDefault(AnnotationValue annotation, String defaultValue) {
+        if (annotation == null)
+            return defaultValue;
+        String val = annotation.asString();
+        return val != null && !val.isEmpty() ? val : defaultValue;
+    }
+
+    public Set<String> nameBindingNames(ClassInfo selectedAppClass) {
+        return NameBindingUtil.nameBindingNames(index, selectedAppClass);
+    }
+
+    public Set<String> nameBindingNames(MethodInfo methodInfo, Set<String> forClass) {
+        return NameBindingUtil.nameBindingNames(index, methodInfo, forClass);
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static abstract class Builder<T extends EndpointIndexer<T, ?, METHOD>, B extends Builder<T, B, METHOD>, METHOD extends ResourceMethod> {
+        private Function<String, BeanFactory<Object>> factoryCreator = new ReflectionBeanFactoryCreator();
+        private boolean defaultBlocking;
+        private IndexView index;
+        private Map<String, String> existingConverters;
+        private Map<DotName, String> scannedResourcePaths;
+        private ResteasyReactiveConfig config;
+        private AdditionalReaders additionalReaders;
+        private Map<DotName, String> httpAnnotationToMethod;
+        private Map<String, InjectableBean> injectableBeans;
+        private AdditionalWriters additionalWriters;
+        private boolean hasRuntimeConverters;
+        private Map<DotName, Map<String, String>> classLevelExceptionMappers;
+        private Consumer<Map.Entry<MethodInfo, ResourceMethod>> resourceMethodCallback;
+
+        public B setDefaultBlocking(boolean defaultBlocking) {
+            this.defaultBlocking = defaultBlocking;
+            return (B) this;
+        }
+
+        public B setHasRuntimeConverters(boolean hasRuntimeConverters) {
+            this.hasRuntimeConverters = hasRuntimeConverters;
+            return (B) this;
+        }
+
+        public B setIndex(IndexView index) {
+            this.index = index;
+            return (B) this;
+        }
+
+        public B setExistingConverters(Map<String, String> existingConverters) {
+            this.existingConverters = existingConverters;
+            return (B) this;
+        }
+
+        public B setScannedResourcePaths(Map<DotName, String> scannedResourcePaths) {
+            this.scannedResourcePaths = scannedResourcePaths;
+            return (B) this;
+        }
+
+        public B setFactoryCreator(Function<String, BeanFactory<Object>> factoryCreator) {
+            this.factoryCreator = factoryCreator;
+            return (B) this;
+        }
+
+        public B setConfig(ResteasyReactiveConfig config) {
+            this.config = config;
+            return (B) this;
+        }
+
+        public B setAdditionalReaders(AdditionalReaders additionalReaders) {
+            this.additionalReaders = additionalReaders;
+            return (B) this;
+        }
+
+        public B setHttpAnnotationToMethod(Map<DotName, String> httpAnnotationToMethod) {
+            this.httpAnnotationToMethod = httpAnnotationToMethod;
+            return (B) this;
+        }
+
+        public B setInjectableBeans(Map<String, InjectableBean> injectableBeans) {
+            this.injectableBeans = injectableBeans;
+            return (B) this;
+        }
+
+        public B setAdditionalWriters(AdditionalWriters additionalWriters) {
+            this.additionalWriters = additionalWriters;
+            return (B) this;
+        }
+
+        public B setClassLevelExceptionMappers(Map<DotName, Map<String, String>> classLevelExceptionMappers) {
+            this.classLevelExceptionMappers = classLevelExceptionMappers;
+            return (B) this;
+        }
+
+        public B setResourceMethodCallback(Consumer<Map.Entry<MethodInfo, ResourceMethod>> resourceMethodCallback) {
+            this.resourceMethodCallback = resourceMethodCallback;
+            return (B) this;
+        }
+
+        public abstract T build();
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/HashUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/HashUtil.java
new file mode 100644
index 0000000000000..0fd5dc157e78f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/HashUtil.java
@@ -0,0 +1,47 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public final class HashUtil {
+
+    private HashUtil() {
+    }
+
+    public static String sha1(String value) {
+        return sha1(value.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public static String sha1(byte[] value) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            byte[] digest = md.digest(value);
+            StringBuilder sb = new StringBuilder(40);
+            for (int i = 0; i < digest.length; ++i) {
+                sb.append(Integer.toHexString((digest[i] & 0xFF) | 0x100).substring(1, 3));
+            }
+            return sb.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public static String sha256(String value) {
+        return sha256(value.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public static String sha256(byte[] value) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] digest = md.digest(value);
+            StringBuilder sb = new StringBuilder(40);
+            for (int i = 0; i < digest.length; ++i) {
+                sb.append(Integer.toHexString((digest[i] & 0xFF) | 0x100).substring(1, 3));
+            }
+            return sb.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java
new file mode 100644
index 0000000000000..18d98c36bb535
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/IndexedParameter.java
@@ -0,0 +1,210 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.util.Map;
+import java.util.Set;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+
+public class IndexedParameter<T extends IndexedParameter<T>> {
+    protected ClassInfo currentClassInfo;
+    protected ClassInfo actualEndpointInfo;
+    protected Map<String, String> existingConverters;
+    protected AdditionalReaders additionalReaders;
+    protected Map<DotName, AnnotationInstance> anns;
+    protected Type paramType;
+    protected String errorLocation;
+    protected boolean hasRuntimeConverters;
+    protected Set<String> pathParameters;
+    protected String sourceName;
+    protected boolean field;
+    protected boolean suspended;
+    protected boolean sse;
+    protected String name;
+    protected String defaultValue;
+    protected ParameterType type;
+    protected String elementType;
+    protected boolean single;
+    protected boolean optional;
+
+    public boolean isObtainedAsCollection() {
+        return !single
+                && (type == ParameterType.HEADER
+                        || type == ParameterType.MATRIX
+                        || type == ParameterType.FORM
+                        || type == ParameterType.QUERY);
+    }
+
+    public ClassInfo getCurrentClassInfo() {
+        return currentClassInfo;
+    }
+
+    public T setCurrentClassInfo(ClassInfo currentClassInfo) {
+        this.currentClassInfo = currentClassInfo;
+        return (T) this;
+    }
+
+    public ClassInfo getActualEndpointInfo() {
+        return actualEndpointInfo;
+    }
+
+    public T setActualEndpointInfo(ClassInfo actualEndpointInfo) {
+        this.actualEndpointInfo = actualEndpointInfo;
+        return (T) this;
+    }
+
+    public Map<String, String> getExistingConverters() {
+        return existingConverters;
+    }
+
+    public T setExistingConverters(Map<String, String> existingConverters) {
+        this.existingConverters = existingConverters;
+        return (T) this;
+    }
+
+    public AdditionalReaders getAdditionalReaders() {
+        return additionalReaders;
+    }
+
+    public T setAdditionalReaders(AdditionalReaders additionalReaders) {
+        this.additionalReaders = additionalReaders;
+        return (T) this;
+    }
+
+    public Map<DotName, AnnotationInstance> getAnns() {
+        return anns;
+    }
+
+    public T setAnns(Map<DotName, AnnotationInstance> anns) {
+        this.anns = anns;
+        return (T) this;
+    }
+
+    public Type getParamType() {
+        return paramType;
+    }
+
+    public T setParamType(Type paramType) {
+        this.paramType = paramType;
+        return (T) this;
+    }
+
+    public String getErrorLocation() {
+        return errorLocation;
+    }
+
+    public T setErrorLocation(String errorLocation) {
+        this.errorLocation = errorLocation;
+        return (T) this;
+    }
+
+    public boolean isHasRuntimeConverters() {
+        return hasRuntimeConverters;
+    }
+
+    public T setHasRuntimeConverters(boolean hasRuntimeConverters) {
+        this.hasRuntimeConverters = hasRuntimeConverters;
+        return (T) this;
+    }
+
+    public Set<String> getPathParameters() {
+        return pathParameters;
+    }
+
+    public T setPathParameters(Set<String> pathParameters) {
+        this.pathParameters = pathParameters;
+        return (T) this;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public T setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+        return (T) this;
+    }
+
+    public boolean isField() {
+        return field;
+    }
+
+    public T setField(boolean field) {
+        this.field = field;
+        return (T) this;
+    }
+
+    public boolean isSuspended() {
+        return suspended;
+    }
+
+    public T setSuspended(boolean suspended) {
+        this.suspended = suspended;
+        return (T) this;
+    }
+
+    public boolean isSse() {
+        return sse;
+    }
+
+    public T setSse(boolean sse) {
+        this.sse = sse;
+        return (T) this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public T setName(String name) {
+        this.name = name;
+        return (T) this;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public T setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+        return (T) this;
+    }
+
+    public ParameterType getType() {
+        return type;
+    }
+
+    public T setType(ParameterType type) {
+        this.type = type;
+        return (T) this;
+    }
+
+    public String getElementType() {
+        return elementType;
+    }
+
+    public T setElementType(String elementType) {
+        this.elementType = elementType;
+        return (T) this;
+    }
+
+    public boolean isSingle() {
+        return single;
+    }
+
+    public T setSingle(boolean single) {
+        this.single = single;
+        return (T) this;
+    }
+
+    public boolean isOptional() {
+        return optional;
+    }
+
+    public T setOptional(boolean optional) {
+        this.optional = optional;
+        return (T) this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java
new file mode 100644
index 0000000000000..879bb8088b9c8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/JandexUtil.java
@@ -0,0 +1,372 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ArrayType;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.ClassType;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
+import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.Type.Kind;
+import org.jboss.jandex.TypeVariable;
+
+/**
+ * A collection of Jandex utility methods.
+ */
+public final class JandexUtil {
+
+    public final static DotName DOTNAME_OBJECT = DotName.createSimple(Object.class.getName());
+
+    private JandexUtil() {
+    }
+
+    public static Index createIndex(Path path) {
+        Indexer indexer = new Indexer();
+        try (Stream<Path> files = Files.walk(path)) {
+            files.forEach(new Consumer<Path>() {
+                @Override
+                public void accept(Path path) {
+                    if (path.toString().endsWith(".class")) {
+                        try (InputStream in = Files.newInputStream(path)) {
+                            indexer.index(in);
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }
+            });
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return indexer.complete();
+    }
+
+    /**
+     * Returns the captured generic types of an interface given a class that at some point in the class
+     * hierarchy implements the interface.
+     *
+     * The list contains the types in the same order as they are generic parameters defined on the interface
+     *
+     * A result is only returned if and only if all the generics where captured. If any of them where not defined by the class
+     * an exception is thrown.
+     *
+     * Also note that all parts of the class/interface hierarchy must be in the supplied index
+     *
+     * As an example, imagine the following class:
+     *
+     * <pre>
+     *
+     * class MyList implements List&lt;String&gt; {
+     *     ...
+     * }
+     *
+     * </pre>
+     *
+     * If we call
+     *
+     * <pre>
+     *
+     * JandexUtil.resolveTypeParameters(DotName.createSimple(MyList.class.getName()),
+     *         DotName.createSimple(List.class.getName()), index)
+     *
+     * </pre>
+     *
+     * then the result will contain a single element of class ClassType whose name() would return a DotName for String
+     */
+    public static List<Type> resolveTypeParameters(DotName input, DotName target, IndexView index) {
+        final ClassInfo inputClassInfo = fetchFromIndex(input, index);
+
+        Type startingType = getType(inputClassInfo, index);
+        final List<Type> result = findParametersRecursively(startingType, target,
+                new HashSet<>(), index);
+        // null means not found
+        if (result == null) {
+            return Collections.emptyList();
+        }
+
+        return result;
+    }
+
+    /**
+     * Creates a type for a ClassInfo
+     */
+    private static Type getType(ClassInfo inputClassInfo, IndexView index) {
+        List<TypeVariable> typeParameters = inputClassInfo.typeParameters();
+        if (typeParameters.isEmpty())
+            return ClassType.create(inputClassInfo.name(), Kind.CLASS);
+        Type owner = null;
+        // ignore owners for non-static classes
+        if (inputClassInfo.enclosingClass() != null && !Modifier.isStatic(inputClassInfo.flags())) {
+            owner = getType(fetchFromIndex(inputClassInfo.enclosingClass(), index), index);
+        }
+        return ParameterizedType.create(inputClassInfo.name(), typeParameters.toArray(new Type[0]), owner);
+    }
+
+    /**
+     * Finds the type arguments passed from the starting type to the given target type, mapping
+     * generics when found, on the way down. Returns null if not found.
+     */
+    private static List<Type> findParametersRecursively(Type type, DotName target,
+            Set<DotName> visitedTypes, IndexView index) {
+        DotName name = type.name();
+        // cache results first
+        if (!visitedTypes.add(name)) {
+            return null;
+        }
+
+        // always end at Object
+        if (DOTNAME_OBJECT.equals(name)) {
+            return null;
+        }
+
+        final ClassInfo inputClassInfo = fetchFromIndex(name, index);
+
+        // look at the current type
+        if (target.equals(name)) {
+            Type thisType = getType(inputClassInfo, index);
+            if (thisType.kind() == Kind.CLASS)
+                return Collections.emptyList();
+            else
+                return thisType.asParameterizedType().arguments();
+        }
+
+        // superclasses first
+        Type superClassType = inputClassInfo.superClassType();
+        List<Type> superResult = findParametersRecursively(superClassType, target, visitedTypes, index);
+        if (superResult != null) {
+            // map any returned type parameters to our type arguments on the way down
+            return mapTypeArguments(superClassType, superResult, index);
+        }
+
+        // interfaces second
+        for (Type interfaceType : inputClassInfo.interfaceTypes()) {
+            List<Type> ret = findParametersRecursively(interfaceType, target, visitedTypes, index);
+            if (ret != null) {
+                // map any returned type parameters to our type arguments on the way down
+                return mapTypeArguments(interfaceType, ret, index);
+            }
+        }
+
+        // not found
+        return null;
+    }
+
+    /**
+     * Maps any type parameters in typeArgumentsFromSupertype from the type parameters declared in appliedType's declaration
+     * to the type arguments we passed in appliedType
+     */
+    private static List<Type> mapTypeArguments(Type appliedType, List<Type> typeArgumentsFromSupertype, IndexView index) {
+        // no type arguments to map
+        if (typeArgumentsFromSupertype.isEmpty()) {
+            return typeArgumentsFromSupertype;
+        }
+        // extra easy if all the type args don't contain any type parameters
+        if (!containsTypeParameters(typeArgumentsFromSupertype)) {
+            return typeArgumentsFromSupertype;
+        }
+
+        // this can't fail since we got a result
+        ClassInfo superType = fetchFromIndex(appliedType.name(), index);
+
+        // if our supertype has no type parameters, we don't need any mapping
+        if (superType.typeParameters().isEmpty()) {
+            return typeArgumentsFromSupertype;
+        }
+
+        // figure out which arguments we passed to the supertype
+        List<Type> appliedArguments;
+
+        // we passed them explicitely
+        if (appliedType.kind() == Kind.PARAMETERIZED_TYPE) {
+            appliedArguments = appliedType.asParameterizedType().arguments();
+        } else {
+            // raw supertype: use bounds
+            appliedArguments = new ArrayList<>(superType.typeParameters().size());
+            for (TypeVariable typeVariable : superType.typeParameters()) {
+                if (!typeVariable.bounds().isEmpty()) {
+                    appliedArguments.add(typeVariable.bounds().get(0));
+                } else {
+                    appliedArguments.add(ClassType.create(DOTNAME_OBJECT, Kind.CLASS));
+                }
+            }
+        }
+
+        // it's a problem if we got different arguments to the parameters declared
+        if (appliedArguments.size() != superType.typeParameters().size()) {
+            throw new IllegalArgumentException("Our supertype instance " + appliedType
+                    + " does not match supertype declared arguments: " + superType.typeParameters());
+        }
+        // build the mapping
+        Map<String, Type> mapping = new HashMap<>();
+        for (int i = 0; i < superType.typeParameters().size(); i++) {
+            TypeVariable typeParameter = superType.typeParameters().get(i);
+            mapping.put(typeParameter.identifier(), appliedArguments.get(i));
+        }
+        // and map
+        return mapGenerics(typeArgumentsFromSupertype, mapping);
+    }
+
+    private static boolean containsTypeParameters(List<Type> typeArgumentsFromSupertype) {
+        for (Type type : typeArgumentsFromSupertype) {
+            if (containsTypeParameters(type)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean containsTypeParameters(Type type) {
+        switch (type.kind()) {
+            case ARRAY:
+                return containsTypeParameters(type.asArrayType().component());
+            case PARAMETERIZED_TYPE:
+                ParameterizedType parameterizedType = type.asParameterizedType();
+                if (parameterizedType.owner() != null
+                        && containsTypeParameters(parameterizedType.owner()))
+                    return true;
+                return containsTypeParameters(parameterizedType.arguments());
+            case TYPE_VARIABLE:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private static List<Type> mapGenerics(List<Type> types, Map<String, Type> mapping) {
+        List<Type> ret = new ArrayList<>(types.size());
+        for (Type type : types) {
+            ret.add(mapGenerics(type, mapping));
+        }
+        return ret;
+    }
+
+    private static Type mapGenerics(Type type, Map<String, Type> mapping) {
+        switch (type.kind()) {
+            case ARRAY:
+                ArrayType arrayType = type.asArrayType();
+                return ArrayType.create(mapGenerics(arrayType.component(), mapping), arrayType.dimensions());
+            case CLASS:
+                return type;
+            case PARAMETERIZED_TYPE:
+                ParameterizedType parameterizedType = type.asParameterizedType();
+                Type owner = null;
+                if (parameterizedType.owner() != null) {
+                    owner = mapGenerics(parameterizedType.owner(), mapping);
+                }
+                return ParameterizedType.create(parameterizedType.name(),
+                        mapGenerics(parameterizedType.arguments(), mapping).toArray(new Type[0]), owner);
+            case TYPE_VARIABLE:
+                Type ret = mapping.get(type.asTypeVariable().identifier());
+                if (ret == null) {
+                    throw new IllegalArgumentException("Missing type argument mapping for " + type);
+                }
+                return ret;
+            default:
+                throw new IllegalArgumentException("Illegal type in hierarchy: " + type);
+        }
+    }
+
+    private static ClassInfo fetchFromIndex(DotName dotName, IndexView index) {
+        final ClassInfo classInfo = index.getClassByName(dotName);
+        if (classInfo == null) {
+            throw new IllegalArgumentException("Class " + dotName + " was not found in the index");
+        }
+        return classInfo;
+    }
+
+    /**
+     * Returns the enclosing class of the given annotation instance. For field or method annotations this
+     * will return the enclosing class. For parameters, this will return the enclosing class of the enclosing
+     * method. For classes it will return the class itself.
+     *
+     * @param annotationInstance the annotation whose enclosing class to look up.
+     * @return the enclosing class.
+     */
+    public static ClassInfo getEnclosingClass(AnnotationInstance annotationInstance) {
+        switch (annotationInstance.target().kind()) {
+            case FIELD:
+                return annotationInstance.target().asField().declaringClass();
+            case METHOD:
+                return annotationInstance.target().asMethod().declaringClass();
+            case METHOD_PARAMETER:
+                return annotationInstance.target().asMethodParameter().method().declaringClass();
+            case CLASS:
+                return annotationInstance.target().asClass();
+            case TYPE:
+                return annotationInstance.target().asType().asClass(); // TODO is it legal here or should I throw ?
+            default:
+                throw new RuntimeException(); // this should not occur
+        }
+    }
+
+    /**
+     * Returns true if the given Jandex ClassInfo is a subclass of the given <tt>parentName</tt>. Note that this will
+     * not check interfaces.
+     *
+     * @param index the index to use to look up super classes.
+     * @param info the ClassInfo we want to check.
+     * @param parentName the name of the superclass we want to find.
+     * @return true if the given ClassInfo has <tt>parentName</tt> as a superclass.
+     * @throws RuntimeException if one of the superclasses is not indexed.
+     */
+    public static boolean isSubclassOf(IndexView index, ClassInfo info, DotName parentName) {
+        if (info.superName().equals(DOTNAME_OBJECT)) {
+            return false;
+        }
+        if (info.superName().equals(parentName)) {
+            return true;
+        }
+
+        // climb up the hierarchy of classes
+        Type superType = info.superClassType();
+        ClassInfo superClass = index.getClassByName(superType.name());
+        if (superClass == null) {
+            // this can happens if the parent is not inside the Jandex index
+            throw new RuntimeException("The class " + superType.name() + " is not inside the Jandex index");
+        }
+        return isSubclassOf(index, superClass, parentName);
+    }
+
+    @SuppressWarnings("incomplete-switch")
+    public static String getBoxedTypeName(Type type) {
+        switch (type.kind()) {
+            case PRIMITIVE:
+                switch (type.asPrimitiveType().primitive()) {
+                    case BOOLEAN:
+                        return "java.lang.Boolean";
+                    case BYTE:
+                        return "java.lang.Byte";
+                    case CHAR:
+                        return "java.lang.Character";
+                    case DOUBLE:
+                        return "java.lang.Double";
+                    case FLOAT:
+                        return "java.lang.Float";
+                    case INT:
+                        return "java.lang.Integer";
+                    case LONG:
+                        return "java.lang.Long";
+                    case SHORT:
+                        return "java.lang.Short";
+                }
+        }
+        return type.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java
new file mode 100644
index 0000000000000..28eafb38d31c4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/NameBindingUtil.java
@@ -0,0 +1,62 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.CONSUMES;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.NAME_BINDING;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PATH;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PRODUCES;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+public class NameBindingUtil {
+
+    /**
+     * Returns the class names of the {@code @NameBinding} annotations or null if non are present
+     */
+    public static Set<String> nameBindingNames(IndexView index, ClassInfo classInfo) {
+        return nameBindingNames(index, instanceDotNames(classInfo.classAnnotations()));
+    }
+
+    public static Set<String> nameBindingNames(IndexView index, MethodInfo methodInfo, Set<String> forClass) {
+        Set<String> fromMethod = nameBindingNames(index, instanceDotNames(methodInfo.annotations()));
+        if (fromMethod.isEmpty()) {
+            return forClass;
+        }
+        fromMethod.addAll(forClass);
+        return fromMethod;
+    }
+
+    private static List<DotName> instanceDotNames(Collection<AnnotationInstance> instances) {
+        List<DotName> result = new ArrayList<>(instances.size());
+        for (AnnotationInstance instance : instances) {
+            result.add(instance.name());
+        }
+        return result;
+    }
+
+    private static Set<String> nameBindingNames(IndexView index, Collection<DotName> annotations) {
+        Set<String> result = new HashSet<>();
+        for (DotName classAnnotationDotName : annotations) {
+            if (classAnnotationDotName.equals(PATH) || classAnnotationDotName.equals(CONSUMES)
+                    || classAnnotationDotName.equals(PRODUCES)) {
+                continue;
+            }
+            ClassInfo classAnnotation = index.getClassByName(classAnnotationDotName);
+            if (classAnnotation == null) {
+                continue;
+            }
+            if (classAnnotation.classAnnotation(NAME_BINDING) != null) {
+                result.add(classAnnotation.name().toString());
+            }
+        }
+        return result;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java
new file mode 100644
index 0000000000000..db9d9f3f0f206
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/ResteasyReactiveDotNames.java
@@ -0,0 +1,248 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import io.smallrye.common.annotation.Blocking;
+import io.smallrye.common.annotation.NonBlocking;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.concurrent.CompletionStage;
+import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Vetoed;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.BeanParam;
+import javax.ws.rs.ConstrainedTo;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.CookieParam;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.Encoded;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.MatrixParam;
+import javax.ws.rs.NameBinding;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.InvocationCallback;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.Providers;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.sse.Sse;
+import javax.ws.rs.sse.SseEventSink;
+import org.jboss.jandex.DotName;
+import org.jboss.resteasy.reactive.MultipartForm;
+import org.jboss.resteasy.reactive.RestCookie;
+import org.jboss.resteasy.reactive.RestForm;
+import org.jboss.resteasy.reactive.RestHeader;
+import org.jboss.resteasy.reactive.RestMatrix;
+import org.jboss.resteasy.reactive.RestPath;
+import org.jboss.resteasy.reactive.RestQuery;
+import org.jboss.resteasy.reactive.RestSseElementType;
+
+public final class ResteasyReactiveDotNames {
+
+    // injectable @Context types
+    public static final DotName URI_INFO = DotName.createSimple(UriInfo.class.getName());
+    public static final DotName HTTP_HEADERS = DotName.createSimple(HttpHeaders.class.getName());
+    public static final DotName REQUEST = DotName.createSimple(Request.class.getName());
+    public static final DotName RESPONSE = DotName.createSimple(Response.class.getName());
+    public static final DotName SECURITY_CONTEXT = DotName.createSimple(SecurityContext.class.getName());
+    public static final DotName PROVIDERS = DotName.createSimple(Providers.class.getName());
+    public static final DotName RESOURCE_CONTEXT = DotName.createSimple(ResourceContext.class.getName());
+    public static final DotName CONFIGURATION = DotName.createSimple(Configuration.class.getName());
+    public static final DotName SSE = DotName.createSimple(Sse.class.getName());
+    public static final DotName SSE_EVENT_SINK = DotName.createSimple(SseEventSink.class.getName());
+    public static final DotName RESOURCE_INFO = DotName.createSimple(ResourceInfo.class.getName());
+    public static final DotName SERVER_REQUEST_CONTEXT = DotName
+            .createSimple("org.jboss.resteasy.reactive.server.spi.ServerRequestContext");
+
+    public static final DotName REST_SSE_ELEMENT_TYPE = DotName.createSimple(RestSseElementType.class.getName());
+    public static final DotName CONSUMES = DotName.createSimple(Consumes.class.getName());
+    public static final DotName PRODUCES = DotName.createSimple(Produces.class.getName());
+    public static final DotName PROVIDER = DotName.createSimple(Provider.class.getName());
+    public static final DotName BEAN_PARAM = DotName.createSimple(BeanParam.class.getName());
+    public static final DotName PATH_PARAM = DotName.createSimple(PathParam.class.getName());
+    public static final DotName QUERY_PARAM = DotName.createSimple(QueryParam.class.getName());
+    public static final DotName HEADER_PARAM = DotName.createSimple(HeaderParam.class.getName());
+    public static final DotName FORM_PARAM = DotName.createSimple(FormParam.class.getName());
+    public static final DotName MATRIX_PARAM = DotName.createSimple(MatrixParam.class.getName());
+    public static final DotName COOKIE_PARAM = DotName.createSimple(CookieParam.class.getName());
+    public static final DotName REST_PATH_PARAM = DotName.createSimple(RestPath.class.getName());
+    public static final DotName REST_QUERY_PARAM = DotName.createSimple(RestQuery.class.getName());
+    public static final DotName REST_HEADER_PARAM = DotName.createSimple(RestHeader.class.getName());
+    public static final DotName REST_FORM_PARAM = DotName.createSimple(RestForm.class.getName());
+    public static final DotName MULTI_PART_FORM_PARAM = DotName.createSimple(MultipartForm.class.getName());
+    public static final DotName REST_MATRIX_PARAM = DotName.createSimple(RestMatrix.class.getName());
+    public static final DotName REST_COOKIE_PARAM = DotName.createSimple(RestCookie.class.getName());
+    public static final DotName GET = DotName.createSimple(javax.ws.rs.GET.class.getName());
+    public static final DotName HEAD = DotName.createSimple(javax.ws.rs.HEAD.class.getName());
+    public static final DotName DELETE = DotName.createSimple(javax.ws.rs.DELETE.class.getName());
+    public static final DotName OPTIONS = DotName.createSimple(javax.ws.rs.OPTIONS.class.getName());
+    public static final DotName PATCH = DotName.createSimple(javax.ws.rs.PATCH.class.getName());
+    public static final DotName POST = DotName.createSimple(javax.ws.rs.POST.class.getName());
+    public static final DotName PUT = DotName.createSimple(javax.ws.rs.PUT.class.getName());
+    public static final DotName HTTP_METHOD = DotName.createSimple(javax.ws.rs.HttpMethod.class.getName());
+    public static final DotName APPLICATION_PATH = DotName.createSimple(ApplicationPath.class.getName());
+    public static final DotName PATH = DotName.createSimple(Path.class.getName());
+    public static final DotName PARAM_CONVERTER_PROVIDER = DotName.createSimple(ParamConverterProvider.class.getName());
+    public static final DotName FEATURE = DotName.createSimple(Feature.class.getName());
+    public static final DotName DYNAMIC_FEATURE = DotName.createSimple(DynamicFeature.class.getName());
+    public static final DotName CONTEXT = DotName.createSimple(Context.class.getName());
+    public static final DotName CDI_INJECT = DotName.createSimple(Inject.class.getName());
+    public static final DotName PRIORITY = DotName.createSimple(Priority.class.getName());
+    public static final DotName APPLICATION = DotName.createSimple(Application.class.getName());
+    public static final DotName CONTAINER_REQUEST_FILTER = DotName.createSimple(ContainerRequestFilter.class.getName());
+    public static final DotName CONTAINER_RESPONSE_FILTER = DotName.createSimple(ContainerResponseFilter.class.getName());
+    public static final DotName EXCEPTION_MAPPER = DotName.createSimple(ExceptionMapper.class.getName());
+    public static final DotName CONTEXT_RESOLVER = DotName.createSimple(ContextResolver.class.getName());
+    public static final DotName MESSAGE_BODY_WRITER = DotName.createSimple(MessageBodyWriter.class.getName());
+    public static final DotName WRITER_INTERCEPTOR = DotName.createSimple(WriterInterceptor.class.getName());
+    public static final DotName READER_INTERCEPTOR = DotName.createSimple(ReaderInterceptor.class.getName());
+    public static final DotName MESSAGE_BODY_READER = DotName.createSimple(MessageBodyReader.class.getName());
+    public static final DotName CONSTRAINED_TO = DotName.createSimple(ConstrainedTo.class.getName());
+    public static final DotName DEFAULT_VALUE = DotName.createSimple(DefaultValue.class.getName());
+    public static final DotName NAME_BINDING = DotName.createSimple(NameBinding.class.getName());
+    public static final DotName VETOED = DotName.createSimple(Vetoed.class.getName());
+    public static final DotName APPLICATION_SCOPED = DotName.createSimple(ApplicationScoped.class.getName());
+    public static final DotName SINGLETON = DotName.createSimple(Singleton.class.getName());
+    public static final DotName REQUEST_SCOPED = DotName.createSimple(RequestScoped.class.getName());
+    public static final DotName WEB_APPLICATION_EXCEPTION = DotName.createSimple(WebApplicationException.class.getName());
+
+    public static final DotName INVOCATION_CALLBACK = DotName.createSimple(InvocationCallback.class.getName());
+
+    public static final DotName BLOCKING = DotName.createSimple(Blocking.class.getName());
+    public static final DotName NON_BLOCKING = DotName.createSimple(NonBlocking.class.getName());
+    public static final DotName SUSPENDED = DotName.createSimple(Suspended.class.getName());
+    public static final DotName PRE_MATCHING = DotName.createSimple(PreMatching.class.getName());
+
+    public static final DotName COLLECTION = DotName.createSimple(Collection.class.getName());
+    public static final DotName LIST = DotName.createSimple(List.class.getName());
+    public static final DotName SET = DotName.createSimple(Set.class.getName());
+    public static final DotName SORTED_SET = DotName.createSimple(SortedSet.class.getName());
+    public static final DotName MAP = DotName.createSimple(Map.class.getName());
+    public static final DotName MULTI_VALUED_MAP = DotName.createSimple(MultivaluedMap.class.getName());
+    public static final DotName PATH_SEGMENT = DotName.createSimple(PathSegment.class.getName());
+    public static final DotName LOCAL_DATE = DotName.createSimple(LocalDate.class.getName());
+
+    public static final DotName UNI = DotName.createSimple(Uni.class.getName());
+    public static final DotName MULTI = DotName.createSimple(Multi.class.getName());
+    public static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
+
+    public static final DotName INTEGER = DotName.createSimple(Integer.class.getName());
+    public static final DotName LONG = DotName.createSimple(Long.class.getName());
+    public static final DotName FLOAT = DotName.createSimple(Float.class.getName());
+    public static final DotName DOUBLE = DotName.createSimple(Double.class.getName());
+    public static final DotName BOOLEAN = DotName.createSimple(Boolean.class.getName());
+    public static final DotName CHARACTER = DotName.createSimple(Character.class.getName());
+    public static final DotName BIG_DECIMAL = DotName.createSimple(BigDecimal.class.getName());
+    public static final DotName BIG_INTEGER = DotName.createSimple(BigInteger.class.getName());
+    public static final DotName VOID = DotName.createSimple(Void.class.getName());
+    public static final DotName OPTIONAL = DotName.createSimple(Optional.class.getName());
+
+    public static final DotName PRIMITIVE_INTEGER = DotName.createSimple(int.class.getName());
+    public static final DotName PRIMITIVE_LONG = DotName.createSimple(long.class.getName());
+    public static final DotName PRIMITIVE_FLOAT = DotName.createSimple(float.class.getName());
+    public static final DotName PRIMITIVE_DOUBLE = DotName.createSimple(double.class.getName());
+    public static final DotName PRIMITIVE_BOOLEAN = DotName.createSimple(boolean.class.getName());
+    public static final DotName PRIMITIVE_CHAR = DotName.createSimple(char.class.getName());
+
+    public static final DotName STRING = DotName.createSimple(String.class.getName());
+    public static final DotName BYTE_ARRAY_DOT_NAME = DotName.createSimple(byte[].class.getName());
+    public static final DotName INPUT_STREAM = DotName.createSimple(InputStream.class.getName());
+    public static final DotName OUTPUT_STREAM = DotName.createSimple(OutputStream.class.getName());
+    public static final DotName THROWABLE = DotName.createSimple(Throwable.class.getName());
+
+    public static final DotName JSONP_JSON_OBJECT = DotName.createSimple(javax.json.JsonObject.class.getName());
+    public static final DotName JSONP_JSON_ARRAY = DotName.createSimple(javax.json.JsonArray.class.getName());
+    public static final DotName JSONP_JSON_STRUCTURE = DotName.createSimple(javax.json.JsonStructure.class.getName());
+    public static final DotName JSONP_JSON_NUMBER = DotName.createSimple(javax.json.JsonNumber.class.getName());
+    public static final DotName JSONP_JSON_VALUE = DotName.createSimple(javax.json.JsonValue.class.getName());
+    public static final DotName JSONP_JSON_STRING = DotName.createSimple(javax.json.JsonString.class.getName());
+
+    public static final DotName CONTAINER_REQUEST_CONTEXT = DotName.createSimple(ContainerRequestContext.class.getName());
+    public static final DotName CONTAINER_RESPONSE_CONTEXT = DotName.createSimple(ContainerResponseContext.class.getName());
+
+    public static final Set<DotName> RESOURCE_CTOR_PARAMS_THAT_NEED_HANDLING = new HashSet<>(
+            Arrays.asList(QUERY_PARAM, HEADER_PARAM, PATH_PARAM, MATRIX_PARAM, COOKIE_PARAM));
+
+    public static final DotName ENCODED = DotName.createSimple(Encoded.class.getName());
+
+    public static final DotName QUARKUS_REST_CONTAINER_RESPONSE_FILTER = DotName
+            .createSimple("org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerResponseFilter");
+    public static final DotName QUARKUS_REST_CONTAINER_REQUEST_FILTER = DotName
+            .createSimple("org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestFilter");
+    public static final DotName OBJECT = DotName.createSimple(Object.class.getName());
+
+    // TODO: fix this hack by moving all the logic that handles this annotation to the server processor
+    public static final DotName SERVER_EXCEPTION_MAPPER = DotName
+            .createSimple("org.jboss.resteasy.reactive.server.ServerExceptionMapper");
+    // Types ignored for reflection used by the RESTEasy and SmallRye REST client extensions.
+    private static final Set<DotName> TYPES_IGNORED_FOR_REFLECTION = new HashSet<>(Arrays.asList(
+            // javax.json
+            DotName.createSimple("javax.json.JsonObject"),
+            DotName.createSimple("javax.json.JsonArray"),
+            DotName.createSimple("javax.json.JsonValue"),
+
+            // Jackson
+            DotName.createSimple("com.fasterxml.jackson.databind.JsonNode"),
+
+            // JAX-RS
+            DotName.createSimple("javax.ws.rs.core.Response"),
+            DotName.createSimple("javax.ws.rs.container.AsyncResponse"),
+            DotName.createSimple("javax.ws.rs.core.StreamingOutput"),
+            DotName.createSimple("javax.ws.rs.core.Form"),
+            DotName.createSimple("javax.ws.rs.core.MultivaluedMap"),
+
+            // RESTEasy
+            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartInput"),
+            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput"),
+            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartOutput"),
+            DotName.createSimple("org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput"),
+
+            // Vert-x
+            DotName.createSimple("io.vertx.core.json.JsonArray"),
+            DotName.createSimple("io.vertx.core.json.JsonObject")));
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java
new file mode 100644
index 0000000000000..65c4f6a89f810
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/TypeArgMapper.java
@@ -0,0 +1,53 @@
+package org.jboss.resteasy.reactive.common.processor;
+
+import java.util.List;
+import java.util.function.Function;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.jboss.jandex.TypeVariable;
+
+public class TypeArgMapper implements Function<String, String> {
+    private final ClassInfo declaringClass;
+    private final IndexView index;
+
+    public TypeArgMapper(ClassInfo declaringClass, IndexView index) {
+        this.declaringClass = declaringClass;
+        this.index = index;
+    }
+
+    @Override
+    public String apply(String v) {
+        //we attempt to resolve type variables
+        ClassInfo declarer = declaringClass;
+        int pos = -1;
+        for (;;) {
+            if (declarer == null) {
+                return null;
+            }
+            List<TypeVariable> typeParameters = declarer.typeParameters();
+            for (int i = 0; i < typeParameters.size(); i++) {
+                TypeVariable tv = typeParameters.get(i);
+                if (tv.identifier().equals(v)) {
+                    pos = i;
+                }
+            }
+            if (pos != -1) {
+                break;
+            }
+            declarer = index.getClassByName(declarer.superName());
+        }
+        Type type = JandexUtil
+                .resolveTypeParameters(declaringClass.name(), declarer.name(), index)
+                .get(pos);
+        if (type.kind() == Type.Kind.TYPE_VARIABLE && type.asTypeVariable().identifier().equals(v)) {
+            List<Type> bounds = type.asTypeVariable().bounds();
+            if (bounds.isEmpty()) {
+                return "Ljava/lang/Object;";
+            }
+            return AsmUtil.getSignature(bounds.get(0), this);
+        } else {
+            return AsmUtil.getSignature(type, this);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java
new file mode 100644
index 0000000000000..0761609485ffb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ApplicationScanningResult.java
@@ -0,0 +1,96 @@
+package org.jboss.resteasy.reactive.common.processor.scanning;
+
+import java.util.Set;
+import javax.ws.rs.core.Application;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+
+public final class ApplicationScanningResult {
+
+    final Set<String> allowedClasses;
+    final Set<String> singletonClasses;
+    final Set<String> excludedClasses;
+    final Set<String> globalNameBindings;
+    final boolean filterClasses;
+    final Application application;
+    final ClassInfo selectedAppClass;
+    final boolean blocking;
+
+    public ApplicationScanningResult(Set<String> allowedClasses, Set<String> singletonClasses, Set<String> excludedClasses,
+            Set<String> globalNameBindings, boolean filterClasses, Application application,
+            ClassInfo selectedAppClass, boolean blocking) {
+        this.allowedClasses = allowedClasses;
+        this.singletonClasses = singletonClasses;
+        this.excludedClasses = excludedClasses;
+        this.globalNameBindings = globalNameBindings;
+        this.filterClasses = filterClasses;
+        this.application = application;
+        this.selectedAppClass = selectedAppClass;
+        this.blocking = blocking;
+    }
+
+    public KeepProviderResult keepProvider(ClassInfo providerClass) {
+        if (filterClasses) {
+            // we don't care about provider annotations, they're manually registered (but for the server only)
+            if (allowedClasses.isEmpty()) {
+                // we only have only classes to exclude
+                return excludedClasses.contains(providerClass.name().toString()) ? KeepProviderResult.DISCARD
+                        : KeepProviderResult.SERVER_ONLY;
+            }
+            return allowedClasses.contains(providerClass.name().toString()) ? KeepProviderResult.SERVER_ONLY
+                    : KeepProviderResult.DISCARD;
+        }
+        return providerClass.classAnnotation(ResteasyReactiveDotNames.PROVIDER) != null ? KeepProviderResult.NORMAL
+                : KeepProviderResult.DISCARD;
+    }
+
+    public boolean keepClass(String className) {
+        if (filterClasses) {
+            if (allowedClasses.isEmpty()) {
+                // we only have only classes to exclude
+                return !excludedClasses.contains(className);
+            }
+            return allowedClasses.contains(className);
+        }
+        return true;
+    }
+
+    public Set<String> getAllowedClasses() {
+        return allowedClasses;
+    }
+
+    public Set<String> getExcludedClasses() {
+        return excludedClasses;
+    }
+
+    public Set<String> getSingletonClasses() {
+        return singletonClasses;
+    }
+
+    public Set<String> getGlobalNameBindings() {
+        return globalNameBindings;
+    }
+
+    public boolean isFilterClasses() {
+        return filterClasses;
+    }
+
+    public Application getApplication() {
+        return application;
+    }
+
+    public ClassInfo getSelectedAppClass() {
+        return selectedAppClass;
+    }
+
+    public boolean isBlocking() {
+        return blocking;
+    }
+
+    public enum KeepProviderResult {
+        NORMAL,
+        SERVER_ONLY,
+        DISCARD
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java
new file mode 100644
index 0000000000000..1ee97904e8c38
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResourceScanningResult.java
@@ -0,0 +1,81 @@
+package org.jboss.resteasy.reactive.common.processor.scanning;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+
+public final class ResourceScanningResult {
+
+    private final IndexView index;
+    final Map<DotName, ClassInfo> scannedResources;
+    final Map<DotName, String> scannedResourcePaths;
+    final Map<DotName, ClassInfo> possibleSubResources;
+    final Map<DotName, String> pathInterfaces;
+    final Map<DotName, String> clientInterfaces;
+    final Map<DotName, MethodInfo> resourcesThatNeedCustomProducer;
+    final Set<String> beanParams;
+    final Map<DotName, String> httpAnnotationToMethod;
+    final List<MethodInfo> classLevelExceptionMappers;
+
+    public ResourceScanningResult(IndexView index, Map<DotName, ClassInfo> scannedResources,
+            Map<DotName, String> scannedResourcePaths,
+            Map<DotName, ClassInfo> possibleSubResources, Map<DotName, String> pathInterfaces,
+            Map<DotName, String> clientInterfaces,
+            Map<DotName, MethodInfo> resourcesThatNeedCustomProducer,
+            Set<String> beanParams, Map<DotName, String> httpAnnotationToMethod, List<MethodInfo> classLevelExceptionMappers) {
+        this.index = index;
+        this.scannedResources = scannedResources;
+        this.scannedResourcePaths = scannedResourcePaths;
+        this.possibleSubResources = possibleSubResources;
+        this.pathInterfaces = pathInterfaces;
+        this.clientInterfaces = clientInterfaces;
+        this.resourcesThatNeedCustomProducer = resourcesThatNeedCustomProducer;
+        this.beanParams = beanParams;
+        this.httpAnnotationToMethod = httpAnnotationToMethod;
+        this.classLevelExceptionMappers = classLevelExceptionMappers;
+    }
+
+    public IndexView getIndex() {
+        return index;
+    }
+
+    public Map<DotName, ClassInfo> getScannedResources() {
+        return scannedResources;
+    }
+
+    public Map<DotName, String> getScannedResourcePaths() {
+        return scannedResourcePaths;
+    }
+
+    public Map<DotName, ClassInfo> getPossibleSubResources() {
+        return possibleSubResources;
+    }
+
+    public Map<DotName, String> getPathInterfaces() {
+        return pathInterfaces;
+    }
+
+    public Map<DotName, String> getClientInterfaces() {
+        return clientInterfaces;
+    }
+
+    public Map<DotName, MethodInfo> getResourcesThatNeedCustomProducer() {
+        return resourcesThatNeedCustomProducer;
+    }
+
+    public Set<String> getBeanParams() {
+        return beanParams;
+    }
+
+    public Map<DotName, String> getHttpAnnotationToMethod() {
+        return httpAnnotationToMethod;
+    }
+
+    public List<MethodInfo> getClassLevelExceptionMappers() {
+        return classLevelExceptionMappers;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java
new file mode 100644
index 0000000000000..d456ef77e4567
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveInterceptorScanner.java
@@ -0,0 +1,119 @@
+package org.jboss.resteasy.reactive.common.processor.scanning;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.resteasy.reactive.common.model.InterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.PreMatchInterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptor;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.processor.NameBindingUtil;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+/**
+ * Scanner that is responsible for scanning for interceptor classes, such as container filters and IO interceptors
+ */
+public class ResteasyReactiveInterceptorScanner {
+
+    private ResteasyReactiveInterceptorScanner() {
+
+    }
+
+    /**
+     * Creates a fully populated resource interceptors instance, that are created via reflection.
+     */
+    public static ResourceInterceptors createResourceInterceptors(IndexView indexView, ApplicationScanningResult result) {
+        return createResourceInterceptors(indexView, result, new ReflectionBeanFactoryCreator());
+    }
+
+    /**
+     * Creates a fully populated resource interceptors instance, that are created via the provided factory creator
+     */
+    public static ResourceInterceptors createResourceInterceptors(IndexView indexView, ApplicationScanningResult result,
+            Function<String, BeanFactory<?>> factoryCreator) {
+        ResourceInterceptors interceptors = new ResourceInterceptors();
+        scanForInterceptors(interceptors, indexView, result);
+        scanForIOInterceptors(interceptors, indexView, result);
+        interceptors.initializeDefaultFactories(factoryCreator);
+        return interceptors;
+    }
+
+    public static void scanForInterceptors(ResourceInterceptors interceptors, IndexView index,
+            ApplicationScanningResult applicationScanningResult) {
+        //the quarkus version of these filters will not be in the index
+        //so you need an explicit check for both
+        Collection<ClassInfo> containerResponseFilters = new HashSet<>(index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.CONTAINER_RESPONSE_FILTER));
+        containerResponseFilters.addAll(index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.QUARKUS_REST_CONTAINER_RESPONSE_FILTER));
+        Collection<ClassInfo> containerRequestFilters = new HashSet<>(index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.CONTAINER_REQUEST_FILTER));
+        containerRequestFilters.addAll(index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.QUARKUS_REST_CONTAINER_REQUEST_FILTER));
+        for (ClassInfo filterClass : containerRequestFilters) {
+            handleDiscoveredInterceptor(applicationScanningResult, interceptors.getContainerRequestFilters(),
+                    index, filterClass);
+        }
+        for (ClassInfo filterClass : containerResponseFilters) {
+            handleDiscoveredInterceptor(applicationScanningResult, interceptors.getContainerResponseFilters(),
+                    index, filterClass);
+        }
+    }
+
+    public static void scanForIOInterceptors(ResourceInterceptors interceptors, IndexView index,
+            ApplicationScanningResult applicationScanningResult) {
+        Collection<ClassInfo> readerInterceptors = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.READER_INTERCEPTOR);
+        Collection<ClassInfo> writerInterceptors = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.WRITER_INTERCEPTOR);
+
+        for (ClassInfo filterClass : writerInterceptors) {
+            handleDiscoveredInterceptor(applicationScanningResult, interceptors.getWriterInterceptors(), index, filterClass);
+        }
+        for (ClassInfo filterClass : readerInterceptors) {
+            handleDiscoveredInterceptor(applicationScanningResult, interceptors.getReaderInterceptors(), index, filterClass);
+        }
+    }
+
+    private static <T> void handleDiscoveredInterceptor(
+            ApplicationScanningResult applicationResultBuildItem, InterceptorContainer<T> interceptorContainer, IndexView index,
+            ClassInfo filterClass) {
+        ApplicationScanningResult.KeepProviderResult keepProviderResult = applicationResultBuildItem.keepProvider(filterClass);
+        if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+            ResourceInterceptor<T> interceptor = interceptorContainer.create();
+            interceptor.setClassName(filterClass.name().toString());
+            interceptor.setNameBindingNames(NameBindingUtil.nameBindingNames(index, filterClass));
+            AnnotationInstance priorityInstance = filterClass.classAnnotation(ResteasyReactiveDotNames.PRIORITY);
+            if (priorityInstance != null) {
+                interceptor.setPriority(priorityInstance.value().asInt());
+            }
+            if (interceptorContainer instanceof PreMatchInterceptorContainer
+                    && filterClass.classAnnotation(ResteasyReactiveDotNames.PRE_MATCHING) != null) {
+                ((PreMatchInterceptorContainer<T>) interceptorContainer).addPreMatchInterceptor(interceptor);
+            } else {
+                Set<String> nameBindingNames = interceptor.getNameBindingNames();
+                if (nameBindingNames.isEmpty()
+                        || namePresent(nameBindingNames, applicationResultBuildItem.getGlobalNameBindings())) {
+                    interceptorContainer.addGlobalRequestInterceptor(interceptor);
+                } else {
+                    interceptorContainer.addNameRequestInterceptor(interceptor);
+                }
+            }
+        }
+    }
+
+    private static boolean namePresent(Set<String> nameBindingNames, Set<String> globalNameBindings) {
+        for (String i : globalNameBindings) {
+            if (nameBindingNames.contains(i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java
new file mode 100644
index 0000000000000..6f29e1e62a4d2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java
@@ -0,0 +1,303 @@
+package org.jboss.resteasy.reactive.common.processor.scanning;
+
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.DELETE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.GET;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.HEAD;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.OPTIONS;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PATCH;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.POST;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.PUT;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.ws.rs.core.Application;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.processor.NameBindingUtil;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+
+public class ResteasyReactiveScanner {
+
+    public static final Map<DotName, String> BUILTIN_HTTP_ANNOTATIONS_TO_METHOD;
+
+    static {
+        Map<DotName, String> map = new HashMap<>();
+        map.put(GET, "GET");
+        map.put(POST, "POST");
+        map.put(HEAD, "HEAD");
+        map.put(PUT, "PUT");
+        map.put(DELETE, "DELETE");
+        map.put(PATCH, "PATCH");
+        map.put(OPTIONS, "OPTIONS");
+        BUILTIN_HTTP_ANNOTATIONS_TO_METHOD = Collections.unmodifiableMap(map);
+    }
+
+    public static ApplicationScanningResult scanForApplicationClass(IndexView index, Set<String> excludedClasses) {
+        Collection<ClassInfo> applications = index
+                .getAllKnownSubclasses(ResteasyReactiveDotNames.APPLICATION);
+        Set<String> allowedClasses = new HashSet<>();
+        Set<String> singletonClasses = new HashSet<>();
+        Set<String> globalNameBindings = new HashSet<>();
+        boolean filterClasses = !excludedClasses.isEmpty();
+        Application application = null;
+        ClassInfo selectedAppClass = null;
+        boolean blocking = false;
+        for (ClassInfo applicationClassInfo : applications) {
+            if (selectedAppClass != null) {
+                throw new RuntimeException("More than one Application class: " + applications);
+            }
+            selectedAppClass = applicationClassInfo;
+            // FIXME: yell if there's more than one
+            String applicationClass = applicationClassInfo.name().toString();
+            try {
+                Class<?> appClass = Thread.currentThread().getContextClassLoader().loadClass(applicationClass);
+                application = (Application) appClass.getConstructor().newInstance();
+                Set<Class<?>> classes = application.getClasses();
+                if (!classes.isEmpty()) {
+                    for (Class<?> klass : classes) {
+                        allowedClasses.add(klass.getName());
+                    }
+                    filterClasses = true;
+                }
+                classes = application.getSingletons().stream().map(Object::getClass).collect(Collectors.toSet());
+                if (!classes.isEmpty()) {
+                    for (Class<?> klass : classes) {
+                        allowedClasses.add(klass.getName());
+                        singletonClasses.add(klass.getName());
+                    }
+                    filterClasses = true;
+                }
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException
+                    | InvocationTargetException e) {
+                throw new RuntimeException("Unable to handle class: " + applicationClass, e);
+            }
+            if (applicationClassInfo.classAnnotation(ResteasyReactiveDotNames.BLOCKING) != null) {
+                blocking = true;
+            } else if (applicationClassInfo.classAnnotation(ResteasyReactiveDotNames.NON_BLOCKING) != null) {
+                blocking = false;
+            }
+        }
+        if (selectedAppClass != null) {
+            globalNameBindings = NameBindingUtil.nameBindingNames(index, selectedAppClass);
+        }
+        return new ApplicationScanningResult(allowedClasses, singletonClasses, excludedClasses, globalNameBindings,
+                filterClasses, application,
+                selectedAppClass, blocking);
+    }
+
+    public static ResourceScanningResult scanResources(
+            IndexView index) {
+        Collection<AnnotationInstance> paths = index.getAnnotations(ResteasyReactiveDotNames.PATH);
+
+        Collection<AnnotationInstance> allPaths = new ArrayList<>(paths);
+
+        if (allPaths.isEmpty()) {
+            // no detected @Path, bail out
+            return null;
+        }
+
+        Map<DotName, ClassInfo> scannedResources = new HashMap<>();
+        Map<DotName, String> scannedResourcePaths = new HashMap<>();
+        Map<DotName, ClassInfo> possibleSubResources = new HashMap<>();
+        Map<DotName, String> pathInterfaces = new HashMap<>();
+        Map<DotName, MethodInfo> resourcesThatNeedCustomProducer = new HashMap<>();
+        List<MethodInfo> methodExceptionMappers = new ArrayList<>();
+
+        Set<DotName> interfacesWithPathOnMethods = new HashSet<>();
+
+        for (AnnotationInstance annotation : allPaths) {
+            if (annotation.target().kind() == AnnotationTarget.Kind.CLASS) {
+                ClassInfo clazz = annotation.target().asClass();
+                if (!Modifier.isInterface(clazz.flags())) {
+                    scannedResources.put(clazz.name(), clazz);
+                    scannedResourcePaths.put(clazz.name(), annotation.value().asString());
+                } else {
+                    pathInterfaces.put(clazz.name(), annotation.value().asString());
+                }
+                MethodInfo ctor = hasJaxRsCtorParams(clazz);
+                if (ctor != null) {
+                    resourcesThatNeedCustomProducer.put(clazz.name(), ctor);
+                }
+                List<AnnotationInstance> exceptionMapperAnnotationInstances = clazz.annotations()
+                        .get(ResteasyReactiveDotNames.SERVER_EXCEPTION_MAPPER);
+                if (exceptionMapperAnnotationInstances != null) {
+                    for (AnnotationInstance instance : exceptionMapperAnnotationInstances) {
+                        if (instance.target().kind() != AnnotationTarget.Kind.METHOD) {
+                            continue;
+                        }
+                        methodExceptionMappers.add(instance.target().asMethod());
+                    }
+                }
+            } else if (annotation.target().kind() == AnnotationTarget.Kind.METHOD) {
+                ClassInfo clazz = annotation.target().asMethod().declaringClass();
+                if (Modifier.isInterface(clazz.flags())) {
+                    interfacesWithPathOnMethods.add(clazz.name());
+                }
+            }
+        }
+
+        Map<DotName, String> clientInterfaces = new HashMap<>(pathInterfaces);
+        // for clients it is enough to have @PATH annotations on methods only
+        for (DotName interfaceName : interfacesWithPathOnMethods) {
+            if (!clientInterfaces.containsKey(interfaceName)) {
+                clientInterfaces.put(interfaceName, "");
+            }
+        }
+
+        Map<DotName, String> clientInterfaceSubtypes = new HashMap<>();
+        for (DotName interfaceName : clientInterfaces.keySet()) {
+            addClientSubInterfaces(interfaceName, index, clientInterfaceSubtypes, clientInterfaces);
+        }
+        clientInterfaces.putAll(clientInterfaceSubtypes);
+
+        for (Map.Entry<DotName, String> i : pathInterfaces.entrySet()) {
+            for (ClassInfo clazz : index.getAllKnownImplementors(i.getKey())) {
+                if (!Modifier.isAbstract(clazz.flags())) {
+                    if ((clazz.enclosingClass() == null || Modifier.isStatic(clazz.flags())) &&
+                            clazz.enclosingMethod() == null) {
+                        if (!scannedResources.containsKey(clazz.name())) {
+                            scannedResources.put(clazz.name(), clazz);
+                            scannedResourcePaths.put(clazz.name(), i.getValue());
+                        }
+                    }
+                }
+            }
+        }
+
+        Map<DotName, String> httpAnnotationToMethod = new HashMap<>(BUILTIN_HTTP_ANNOTATIONS_TO_METHOD);
+        Collection<AnnotationInstance> httpMethodInstances = index.getAnnotations(ResteasyReactiveDotNames.HTTP_METHOD);
+        for (AnnotationInstance httpMethodInstance : httpMethodInstances) {
+            if (httpMethodInstance.target().kind() != AnnotationTarget.Kind.CLASS) {
+                continue;
+            }
+            httpAnnotationToMethod.put(httpMethodInstance.target().asClass().name(), httpMethodInstance.value().asString());
+        }
+
+        // for clients it is also enough to only have @GET, @POST, etc on methods and no PATH whatsoever
+        Set<DotName> methodAnnotations = httpAnnotationToMethod.keySet();
+        for (DotName methodAnnotation : methodAnnotations) {
+            for (AnnotationInstance methodAnnotationInstance : index.getAnnotations(methodAnnotation)) {
+                if (methodAnnotationInstance.target().kind() == AnnotationTarget.Kind.METHOD) {
+                    MethodInfo annotatedMethod = methodAnnotationInstance.target().asMethod();
+                    ClassInfo classWithJaxrsMethod = annotatedMethod.declaringClass();
+                    if (Modifier.isAbstract(annotatedMethod.flags())
+                            && Modifier.isAbstract(classWithJaxrsMethod.flags())
+                            && !clientInterfaces.containsKey(classWithJaxrsMethod.name())) {
+                        clientInterfaces.put(classWithJaxrsMethod.name(), "");
+                    }
+                }
+            }
+        }
+
+        Set<String> beanParams = new HashSet<>();
+
+        Set<ClassInfo> beanParamAsBeanUsers = new HashSet<>(scannedResources.values());
+        beanParamAsBeanUsers.addAll(possibleSubResources.values());
+
+        Collection<AnnotationInstance> unregisteredBeanParamAnnotations = new ArrayList<>(
+                index.getAnnotations(ResteasyReactiveDotNames.BEAN_PARAM));
+        boolean newBeanParamsRegistered;
+        do {
+            newBeanParamsRegistered = false;
+            for (Iterator<AnnotationInstance> iterator = unregisteredBeanParamAnnotations.iterator(); iterator.hasNext();) {
+                AnnotationInstance beanParamAnnotation = iterator.next();
+                AnnotationTarget target = beanParamAnnotation.target();
+                // FIXME: this isn't right wrt generics
+                switch (target.kind()) {
+                    case FIELD:
+                        FieldInfo field = target.asField();
+                        ClassInfo beanParamDeclaringClass = field.declaringClass();
+                        if (beanParamAsBeanUsers.contains(beanParamDeclaringClass)
+                                || beanParams.contains(beanParamDeclaringClass.name().toString())) {
+                            newBeanParamsRegistered |= beanParams.add(field.type().name().toString());
+                            iterator.remove();
+                        }
+                        break;
+                    case METHOD:
+                        MethodInfo setterMethod = target.asMethod();
+                        if (beanParamAsBeanUsers.contains(setterMethod.declaringClass())
+                                || beanParams.contains(setterMethod.declaringClass().name().toString())) {
+                            Type setterParamType = setterMethod.parameters().get(0);
+
+                            newBeanParamsRegistered |= beanParams.add(setterParamType.name().toString());
+                            iterator.remove();
+                        }
+                        break;
+                    case METHOD_PARAMETER:
+                        MethodInfo method = target.asMethodParameter().method();
+                        if (beanParamAsBeanUsers.contains(method.declaringClass())
+                                || beanParams.contains(method.declaringClass().name().toString())) {
+                            int paramIndex = target.asMethodParameter().position();
+                            Type paramType = method.parameters().get(paramIndex);
+                            newBeanParamsRegistered |= beanParams.add(paramType.name().toString());
+                            iterator.remove();
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        } while (newBeanParamsRegistered);
+
+        return new ResourceScanningResult(index, scannedResources,
+                scannedResourcePaths, possibleSubResources, pathInterfaces, clientInterfaces, resourcesThatNeedCustomProducer,
+                beanParams,
+                httpAnnotationToMethod, methodExceptionMappers);
+    }
+
+    private static void addClientSubInterfaces(DotName interfaceName, IndexView index,
+            Map<DotName, String> clientInterfaceSubtypes, Map<DotName, String> clientInterfaces) {
+        Collection<ClassInfo> subclasses = index.getKnownDirectImplementors(interfaceName);
+        for (ClassInfo subclass : subclasses) {
+            if (!clientInterfaces.containsKey(subclass.name()) && Modifier.isInterface(subclass.flags())
+                    && !clientInterfaceSubtypes.containsKey(subclass.name())) {
+                clientInterfaceSubtypes.put(subclass.name(), clientInterfaces.get(interfaceName));
+                addClientSubInterfaces(subclass.name(), index, clientInterfaceSubtypes, clientInterfaces);
+            }
+        }
+
+    }
+
+    private static MethodInfo hasJaxRsCtorParams(ClassInfo classInfo) {
+        List<MethodInfo> methods = classInfo.methods();
+        List<MethodInfo> ctors = new ArrayList<>();
+        for (MethodInfo method : methods) {
+            if (method.name().equals("<init>")) {
+                ctors.add(method);
+            }
+        }
+        if (ctors.size() != 1) { // we only need to deal with a single ctor here
+            return null;
+        }
+        MethodInfo ctor = ctors.get(0);
+        if (ctor.parameters().size() == 0) { // default ctor - we don't need to do anything
+            return null;
+        }
+
+        boolean needsHandling = false;
+        for (DotName dotName : ResteasyReactiveDotNames.RESOURCE_CTOR_PARAMS_THAT_NEED_HANDLING) {
+            if (ctor.hasAnnotation(dotName)) {
+                needsHandling = true;
+                break;
+            }
+        }
+        return needsHandling ? ctor : null;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/pom.xml b/independent-projects/resteasy-reactive/common/runtime/pom.xml
new file mode 100644
index 0000000000000..b5efcbae4070b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-common-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-common</artifactId>
+    <name>RESTEasy Reactive - Common Runtime</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-annotation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java
new file mode 100644
index 0000000000000..b977dd8ef1c86
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/MultipartForm.java
@@ -0,0 +1,23 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to be used on POJOs meant to map to the various parts of
+ * of {@code multipart/form-data} HTTP bodies.
+ * Each part of the POJO that should be mapped to a part of the body should be annotated with {@link RestForm}.
+ * In order to facilitate conversion to the field's body type, {@link PartType} should be used to determine the media
+ * type of the corresponding body part.
+ *
+ * It's important to take caution when using such POJOs to read via {@link org.jboss.resteasy.reactive.multipart.FileUpload},
+ * {@code java.io.File} or {@code java.nio.file.Path} uploaded files in a blocking manner, that the resource method should be
+ * annotated with {@link io.smallrye.common.annotation.Blocking}.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.PARAMETER })
+public @interface MultipartForm {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/PartType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/PartType.java
new file mode 100644
index 0000000000000..8b1cc932a9ed7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/PartType.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Used on fields of {@link MultipartForm} POJOs to designate the media type the corresponding body part maps to.
+ */
+@Target({ ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface PartType {
+    String value();
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestCookie.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestCookie.java
new file mode 100644
index 0000000000000..4619050c00d92
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestCookie.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Equivalent of CookieParam but with optional name.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+public @interface RestCookie {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestForm.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestForm.java
new file mode 100644
index 0000000000000..642853c13298d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestForm.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Equivalent of FormParam but with optional name.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+public @interface RestForm {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestHeader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestHeader.java
new file mode 100644
index 0000000000000..2fd5bacab57e3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestHeader.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Equivalent of HeaderParam but with optional name.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+public @interface RestHeader {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestMatrix.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestMatrix.java
new file mode 100644
index 0000000000000..588a63236e53d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestMatrix.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Equivalent of MatrixParam but with optional name.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+public @interface RestMatrix {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestPath.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestPath.java
new file mode 100644
index 0000000000000..08a19f65e9a28
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestPath.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Equivalent of PathParam but with optional name.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+public @interface RestPath {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestQuery.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestQuery.java
new file mode 100644
index 0000000000000..528d7b9313bb0
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestQuery.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Equivalent of QueryParam but with optional name.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+public @interface RestQuery {
+    String value() default "";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestSseElementType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestSseElementType.java
new file mode 100644
index 0000000000000..b6d8cf5e197d4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/RestSseElementType.java
@@ -0,0 +1,19 @@
+package org.jboss.resteasy.reactive;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Defines the MIME type of each SSE element in the annotated stream.
+ */
+@Inherited
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RestSseElementType {
+    String value();
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/NotImplementedYet.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/NotImplementedYet.java
new file mode 100644
index 0000000000000..aeebe1fc447a9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/NotImplementedYet.java
@@ -0,0 +1,5 @@
+package org.jboss.resteasy.reactive.common;
+
+public class NotImplementedYet extends RuntimeException {
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/ResteasyReactiveConfig.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/ResteasyReactiveConfig.java
new file mode 100644
index 0000000000000..b4fa16b4c48a2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/ResteasyReactiveConfig.java
@@ -0,0 +1,59 @@
+package org.jboss.resteasy.reactive.common;
+
+public class ResteasyReactiveConfig {
+
+    /**
+     * The amount of memory that can be used to buffer input before switching to
+     * blocking IO.
+     */
+    private long inputBufferSize;
+
+    /**
+     * By default we assume a default produced media type of "text/plain"
+     * for String endpoint return types. If this is disabled, the default
+     * produced media type will be "[text/plain, *&sol;*]" which is more
+     * expensive due to negotiation.
+     */
+    private boolean singleDefaultProduces;
+
+    /**
+     * When one of the quarkus-resteasy-reactive-jackson or quarkus-resteasy-reactive-jsonb extension are active
+     * and the result type of an endpoint is an application class or one of {@code Collection}, {@code List}, {@code Set} or
+     * {@code Map}, we assume the default return type is "application/json".
+     */
+    private boolean defaultProduces;
+
+    // we need this (and the setters) due to Bytecode Recording
+    public ResteasyReactiveConfig() {
+    }
+
+    public ResteasyReactiveConfig(long inputBufferSize, boolean singleDefaultProduces, boolean defaultProduces) {
+        this.inputBufferSize = inputBufferSize;
+        this.singleDefaultProduces = singleDefaultProduces;
+        this.defaultProduces = defaultProduces;
+    }
+
+    public long getInputBufferSize() {
+        return inputBufferSize;
+    }
+
+    public void setInputBufferSize(long inputBufferSize) {
+        this.inputBufferSize = inputBufferSize;
+    }
+
+    public boolean isSingleDefaultProduces() {
+        return singleDefaultProduces;
+    }
+
+    public void setSingleDefaultProduces(boolean singleDefaultProduces) {
+        this.singleDefaultProduces = singleDefaultProduces;
+    }
+
+    public boolean isDefaultProduces() {
+        return defaultProduces;
+    }
+
+    public void setDefaultProduces(boolean defaultProduces) {
+        this.defaultProduces = defaultProduces;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java
new file mode 100644
index 0000000000000..7626d1a03dc88
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/AbstractResteasyReactiveContext.java
@@ -0,0 +1,340 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import javax.ws.rs.container.CompletionCallback;
+import javax.ws.rs.container.ConnectionCallback;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.spi.RestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public abstract class AbstractResteasyReactiveContext<T extends AbstractResteasyReactiveContext<T, H>, H extends RestHandler<T>>
+        implements Runnable, Closeable, ResteasyReactiveCallbackContext {
+    protected static final Logger log = Logger.getLogger(AbstractResteasyReactiveContext.class);
+    protected H[] handlers;
+    protected H[] abortHandlerChain;
+    protected int position;
+    protected Throwable throwable;
+    private boolean suspended = false;
+    private volatile boolean requestScopeActivated = false;
+    private volatile boolean running = false;
+    private volatile Executor executor; // ephemerally set by handlers to signal that we resume, it needs to be on this executor
+    private volatile Executor lastExecutor; // contains the last executor which was provided during resume - needed to submit there if suspended again
+    private Map<String, Object> properties;
+    private final ThreadSetupAction requestContext;
+    private ThreadSetupAction.ThreadState currentRequestScope;
+    private List<CompletionCallback> completionCallbacks;
+    private List<ConnectionCallback> connectionCallbacks;
+
+    public AbstractResteasyReactiveContext(H[] handlerChain, H[] abortHandlerChain, ThreadSetupAction requestContext) {
+        this.handlers = handlerChain;
+        this.abortHandlerChain = abortHandlerChain;
+        this.requestContext = requestContext;
+    }
+
+    public void suspend() {
+        suspended = true;
+    }
+
+    public void resume() {
+        resume((Executor) null);
+    }
+
+    public synchronized void resume(Throwable throwable) {
+        handleException(throwable);
+        resume((Executor) null);
+    }
+
+    public synchronized void resume(Throwable throwable, boolean keepTarget) {
+        handleException(throwable, keepTarget);
+        resume((Executor) null);
+    }
+
+    public synchronized void resume(Executor executor) {
+        if (running) {
+            this.executor = executor;
+            if (executor == null) {
+                suspended = false;
+            } else {
+                this.lastExecutor = executor;
+            }
+        } else {
+            suspended = false;
+            if (executor == null) {
+                if (lastExecutor == null) {
+                    getEventLoop().execute(this);
+                } else {
+                    // we need to do this to ensure that if we suspended while not on the event-loop,
+                    // that we come back on a thread from this executor
+                    lastExecutor.execute(this);
+                }
+            } else {
+                executor.execute(this);
+            }
+        }
+    }
+
+    public H[] getAbortHandlerChain() {
+        return abortHandlerChain;
+    }
+
+    public T setAbortHandlerChain(H[] abortHandlerChain) {
+        this.abortHandlerChain = abortHandlerChain;
+        return (T) this;
+    }
+
+    public void close() {
+        //TODO: do we even have any other resources to close?
+        if (currentRequestScope != null) {
+            currentRequestScope.close();
+        }
+        onComplete(throwable);
+    }
+
+    public Throwable getThrowable() {
+        return throwable;
+    }
+
+    protected abstract Executor getEventLoop();
+
+    protected boolean isRequestScopeManagementRequired() {
+        return true;
+    }
+
+    @Override
+    public void run() {
+        running = true;
+        boolean submittedToExecutor = false;
+        //if this is a blocking target we don't activate for the initial non-blocking part
+        //unless there are pre-mapping filters as these may require CDI
+        boolean disasociateRequestScope = false;
+        try {
+            while (position < handlers.length) {
+                int pos = position;
+                position++; //increment before, as reset may reset it to zero
+                try {
+                    handlers[pos].handle((T) this);
+                    if (suspended) {
+                        Executor exec = null;
+                        synchronized (this) {
+                            if (isRequestScopeManagementRequired()) {
+                                if (requestScopeActivated) {
+                                    if (position != handlers.length) {
+                                        disasociateRequestScope = true;
+                                    }
+                                    requestScopeActivated = false;
+                                }
+                            } else {
+                                requestScopeActivated = false;
+                                requestScopeDeactivated();
+                            }
+                            if (this.executor != null) {
+                                //resume happened in the meantime
+                                suspended = false;
+                                exec = this.executor;
+                                // prevent future suspensions from re-submitting the task
+                                this.executor = null;
+                            } else if (suspended) {
+                                running = false;
+                                return;
+                            }
+                        }
+                        if (exec != null) {
+                            //outside sync block
+                            exec.execute(this);
+                            submittedToExecutor = true;
+                            return;
+                        }
+                    }
+                } catch (Throwable t) {
+                    boolean over = handlers == abortHandlerChain;
+                    handleException(t);
+                    if (over) {
+                        running = false;
+                        return;
+                    }
+                }
+            }
+            running = false;
+        } catch (Throwable t) {
+            handleUnrecoverableError(t);
+            running = false;
+        } finally {
+            // we need to make sure we don't close the underlying stream in the event loop if the task
+            // has been offloaded to the executor
+            if (position == handlers.length && !suspended && !submittedToExecutor) {
+                close();
+            } else {
+                if (disasociateRequestScope) {
+                    requestScopeDeactivated();
+                    currentRequestScope.deactivate();
+                }
+                beginAsyncProcessing();
+            }
+        }
+    }
+
+    protected void beginAsyncProcessing() {
+
+    }
+
+    protected void requestScopeDeactivated() {
+
+    }
+
+    public void requireCDIRequestScope() {
+        if (!running) {
+            throw new RuntimeException("Cannot be called when outside a handler chain");
+        }
+        if (requestScopeActivated) {
+            return;
+        }
+        requestScopeActivated = true;
+        if (isRequestScopeManagementRequired()) {
+            if (currentRequestScope == null) {
+                currentRequestScope = requestContext.activateInitial();
+            } else {
+                currentRequestScope.activate();
+            }
+        } else {
+            currentRequestScope = requestContext.currentState();
+        }
+        handleRequestScopeActivation();
+    }
+
+    protected abstract void handleRequestScopeActivation();
+
+    /**
+     * Restarts handler chain processing on a chain that does not target a specific resource
+     * <p>
+     * Generally used to abort processing.
+     *
+     * @param newHandlerChain The new handler chain
+     */
+    public void restart(H[] newHandlerChain) {
+        restart(newHandlerChain, false);
+    }
+
+    public void restart(H[] newHandlerChain, boolean keepTarget) {
+        this.handlers = newHandlerChain;
+        position = 0;
+        restarted(keepTarget);
+    }
+
+    protected abstract void restarted(boolean keepTarget);
+
+    public boolean isSuspended() {
+        return suspended;
+    }
+
+    public T setSuspended(boolean suspended) {
+        this.suspended = suspended;
+        return (T) this;
+    }
+
+    public boolean isRunning() {
+        return running;
+    }
+
+    public T setRunning(boolean running) {
+        this.running = running;
+        return (T) this;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public T setPosition(int position) {
+        this.position = position;
+        return (T) this;
+    }
+
+    public H[] getHandlers() {
+        return handlers;
+    }
+
+    /**
+     * If we are on the abort chain already, send a 500. If not, turn the throwable into
+     * a response result and switch to the abort chain
+     */
+    public void handleException(Throwable t) {
+        if (handlers == abortHandlerChain) {
+            handleUnrecoverableError(t);
+        } else {
+            this.throwable = t;
+            restart(abortHandlerChain);
+        }
+    }
+
+    public void handleException(Throwable t, boolean keepSameTarget) {
+        if (handlers == abortHandlerChain) {
+            handleUnrecoverableError(t);
+        } else {
+            this.throwable = t;
+            restart(abortHandlerChain, keepSameTarget);
+        }
+    }
+
+    protected abstract void handleUnrecoverableError(Throwable throwable);
+
+    public Object getProperty(String name) {
+        if (properties == null) {
+            return null;
+        }
+        return properties.get(name);
+    }
+
+    public Collection<String> getPropertyNames() {
+        if (properties == null) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableSet(properties.keySet());
+    }
+
+    public void setProperty(String name, Object object) {
+        if (object == null) {
+            removeProperty(name);
+            return;
+        }
+        if (properties == null) {
+            properties = new HashMap<>();
+        }
+        properties.put(name, object);
+    }
+
+    public void removeProperty(String name) {
+        if (properties == null) {
+            return;
+        }
+        properties.remove(name);
+    }
+
+    synchronized void onComplete(Throwable throwable) {
+        if (completionCallbacks != null) {
+            for (CompletionCallback callback : completionCallbacks) {
+                callback.onComplete(throwable);
+            }
+        }
+    }
+
+    @Override
+    public synchronized void registerCompletionCallback(CompletionCallback callback) {
+        if (completionCallbacks == null)
+            completionCallbacks = new ArrayList<>();
+        completionCallbacks.add(callback);
+    }
+
+    @Override
+    public synchronized void registerConnectionCallback(ConnectionCallback callback) {
+        if (connectionCallbacks == null)
+            connectionCallbacks = new ArrayList<>();
+        connectionCallbacks.add(callback);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java
new file mode 100644
index 0000000000000..819f9385bc489
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/GenericTypeMapping.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.client.InvocationCallback;
+
+public class GenericTypeMapping {
+
+    private Map<Class<? extends InvocationCallback<?>>, Class<?>> invocationCallbacks = new HashMap<>();
+
+    public <T> void addInvocationCallback(Class<? extends InvocationCallback<T>> clazz, Class<T> resolvedType) {
+        invocationCallbacks.put(clazz, resolvedType);
+    }
+
+    public Class<?> forInvocationCallback(Class<?> clazz) {
+        return invocationCallbacks.get(clazz);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java
new file mode 100644
index 0000000000000..1f46c570b8fd4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/LazyUnmanagedBeanFactory.java
@@ -0,0 +1,37 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import java.util.function.Supplier;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class LazyUnmanagedBeanFactory<T> implements BeanFactory<T> {
+
+    private final Supplier<T> instanceSupplier;
+    private volatile T instance = null;
+
+    public LazyUnmanagedBeanFactory(Supplier<T> instanceSupplier) {
+        this.instanceSupplier = instanceSupplier;
+    }
+
+    @Override
+    public String toString() {
+        return "UnmanagedBeanFactory[" + instanceSupplier + "]";
+    }
+
+    @Override
+    public BeanInstance<T> createInstance() {
+        return new BeanInstance<T>() {
+            @Override
+            public T getInstance() {
+                if (instance == null) {
+                    instance = instanceSupplier.get();
+                }
+                return instance;
+            }
+
+            @Override
+            public void close() {
+
+            }
+        };
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java
new file mode 100644
index 0000000000000..9faed0d618b48
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResponseBuilderFactory.java
@@ -0,0 +1,11 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import javax.ws.rs.core.Response;
+
+public interface ResponseBuilderFactory {
+
+    Response.ResponseBuilder create();
+
+    int priority();
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java
new file mode 100644
index 0000000000000..364601cd03c23
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/ResteasyReactiveCallbackContext.java
@@ -0,0 +1,10 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import javax.ws.rs.container.CompletionCallback;
+import javax.ws.rs.container.ConnectionCallback;
+
+public interface ResteasyReactiveCallbackContext {
+    public void registerCompletionCallback(CompletionCallback callback);
+
+    public void registerConnectionCallback(ConnectionCallback callback);
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java
new file mode 100644
index 0000000000000..2b8430fb36fc4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/Serialisers.java
@@ -0,0 +1,329 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedMap;
+
+public abstract class Serialisers {
+    public static final Annotation[] NO_ANNOTATION = new Annotation[0];
+    public static final ReaderInterceptor[] NO_READER_INTERCEPTOR = new ReaderInterceptor[0];
+    public static final MultivaluedMap<String, Object> EMPTY_MULTI_MAP = new QuarkusMultivaluedHashMap<>();
+    public static final WriterInterceptor[] NO_WRITER_INTERCEPTOR = new WriterInterceptor[0];
+    protected static final Map<Class<?>, Class<?>> primitivesToWrappers = new HashMap<>();
+    // FIXME: spec says we should use generic type, but not sure how to pass that type from Jandex to reflection
+    protected final QuarkusMultivaluedMap<Class<?>, ResourceWriter> writers = new QuarkusMultivaluedHashMap<>();
+    protected final QuarkusMultivaluedMap<Class<?>, ResourceReader> readers = new QuarkusMultivaluedHashMap<>();
+
+    public List<MessageBodyReader<?>> findReaders(ConfigurationImpl configuration, Class<?> entityType,
+            MediaType mediaType) {
+        return findReaders(configuration, entityType, mediaType, null);
+    }
+
+    public List<MessageBodyReader<?>> findReaders(ConfigurationImpl configuration, Class<?> entityType,
+            MediaType mediaType, RuntimeType runtimeType) {
+        List<MediaType> mt = Collections.singletonList(mediaType);
+        List<MessageBodyReader<?>> ret = new ArrayList<>();
+        Deque<Class<?>> toProcess = new LinkedList<>();
+        Class<?> klass = entityType;
+        if (primitivesToWrappers.containsKey(klass))
+            klass = primitivesToWrappers.get(klass);
+        QuarkusMultivaluedMap<Class<?>, ResourceReader> readers;
+        if (configuration != null && !configuration.getResourceReaders().isEmpty()) {
+            readers = new QuarkusMultivaluedHashMap<>();
+            readers.addAll(configuration.getResourceReaders());
+            readers.addAll(this.readers);
+        } else {
+            readers = this.readers;
+        }
+        do {
+            Collections.addAll(toProcess, klass.getInterfaces());
+            if (klass == Object.class || klass.getSuperclass() == null) {
+                //spec extension, look for interfaces as well
+                //we match interfaces before Object
+                Set<Class<?>> seen = new HashSet<>(toProcess);
+                while (!toProcess.isEmpty()) {
+                    Class<?> iface = toProcess.poll();
+                    List<ResourceReader> goodTypeReaders = readers.get(iface);
+                    readerLookup(mediaType, runtimeType, mt, ret, goodTypeReaders);
+                    for (Class<?> i : iface.getInterfaces()) {
+                        if (!seen.contains(i)) {
+                            seen.add(i);
+                            toProcess.add(i);
+                        }
+                    }
+                }
+            }
+            List<ResourceReader> goodTypeReaders = readers.get(klass);
+            readerLookup(mediaType, runtimeType, mt, ret, goodTypeReaders);
+            if (klass.isInterface()) {
+                klass = Object.class;
+            } else {
+                klass = klass.getSuperclass();
+            }
+        } while (klass != null);
+
+        return ret;
+    }
+
+    private void readerLookup(MediaType mediaType, RuntimeType runtimeType, List<MediaType> mt, List<MessageBodyReader<?>> ret,
+            List<ResourceReader> goodTypeReaders) {
+        if (goodTypeReaders != null && !goodTypeReaders.isEmpty()) {
+            List<ResourceReader> mediaTypeMatchingReaders = new ArrayList<>(goodTypeReaders.size());
+            for (int i = 0; i < goodTypeReaders.size(); i++) {
+                ResourceReader goodTypeReader = goodTypeReaders.get(i);
+                if (!goodTypeReader.matchesRuntimeType(runtimeType)) {
+                    continue;
+                }
+                MediaType match = MediaTypeHelper.getFirstMatch(mt, goodTypeReader.mediaTypes());
+                if (match != null || mediaType == null) {
+                    mediaTypeMatchingReaders.add(goodTypeReader);
+                }
+            }
+            mediaTypeMatchingReaders.sort(ResourceReader.ResourceReaderComparator.INSTANCE);
+            for (ResourceReader mediaTypeMatchingReader : mediaTypeMatchingReaders) {
+                ret.add(mediaTypeMatchingReader.instance());
+            }
+        }
+    }
+
+    public <T> void addWriter(Class<T> entityClass, ResourceWriter writer) {
+        writers.add(entityClass, writer);
+    }
+
+    public <T> void addReader(Class<T> entityClass, ResourceReader reader) {
+        readers.add(entityClass, reader);
+    }
+
+    public List<MessageBodyWriter<?>> findBuildTimeWriters(Class<?> entityType, RuntimeType runtimeType,
+            List<MediaType> produces) {
+        if (Response.class.isAssignableFrom(entityType)) {
+            return Collections.emptyList();
+        }
+        Class<?> klass = entityType;
+        if (primitivesToWrappers.containsKey(klass))
+            klass = primitivesToWrappers.get(klass);
+        //first we check to make sure that the return type is build time selectable
+        //this fails when there are eligible writers for a sub type of the entity type
+        //e.g. if the entity type is Object and there are mappers for String then we
+        //can't determine the type at build time
+        for (Map.Entry<Class<?>, List<ResourceWriter>> entry : writers.entrySet()) {
+            if (klass.isAssignableFrom(entry.getKey()) && !entry.getKey().equals(klass)) {
+                //this is a writer registered under a sub type
+                //check to see if the media type is relevant
+                if (produces == null || produces.isEmpty()) {
+                    return null;
+                } else {
+                    List<ResourceWriter> writers = entry.getValue();
+                    for (int i = 0; i < writers.size(); i++) {
+                        MediaType match = MediaTypeHelper.getFirstMatch(produces, writers.get(i).mediaTypes());
+                        if (match != null) {
+                            return null;
+                        }
+                    }
+                }
+            }
+
+        }
+        return toMessageBodyWriters(findResourceWriters(writers, klass, produces, runtimeType));
+    }
+
+    protected List<ResourceWriter> findResourceWriters(QuarkusMultivaluedMap<Class<?>, ResourceWriter> writers, Class<?> klass,
+            List<MediaType> produces, RuntimeType runtimeType) {
+        List<ResourceWriter> ret = new ArrayList<>();
+        Deque<Class<?>> toProcess = new LinkedList<>();
+        do {
+            if (klass == Object.class) {
+                //spec extension, look for interfaces as well
+                //we match interfaces before Object
+                Set<Class<?>> seen = new HashSet<>(toProcess);
+                while (!toProcess.isEmpty()) {
+                    Class<?> iface = toProcess.poll();
+                    List<ResourceWriter> goodTypeWriters = writers.get(iface);
+                    writerLookup(runtimeType, produces, ret, goodTypeWriters);
+                    for (Class<?> i : iface.getInterfaces()) {
+                        if (!seen.contains(i)) {
+                            seen.add(i);
+                            toProcess.add(i);
+                        }
+                    }
+                }
+            }
+            List<ResourceWriter> goodTypeWriters = writers.get(klass);
+            writerLookup(runtimeType, produces, ret, goodTypeWriters);
+            toProcess.addAll(Arrays.asList(klass.getInterfaces()));
+            // if we're an interface, pretend our superclass is Object to get us through the same logic as a class
+            if (klass.isInterface())
+                klass = Object.class;
+            else
+                klass = klass.getSuperclass();
+        } while (klass != null);
+
+        return ret;
+    }
+
+    @SuppressWarnings("rawtypes")
+    protected List<MessageBodyWriter<?>> toMessageBodyWriters(List<ResourceWriter> resourceWriters) {
+        List<MessageBodyWriter<?>> ret = new ArrayList<>(resourceWriters.size());
+        Set<Class<? extends MessageBodyWriter>> alreadySeenClasses = new HashSet<>(resourceWriters.size());
+        for (ResourceWriter resourceWriter : resourceWriters) {
+            MessageBodyWriter<?> instance = resourceWriter.instance();
+            Class<? extends MessageBodyWriter> instanceClass = instance.getClass();
+            if (alreadySeenClasses.contains(instanceClass)) {
+                continue;
+            }
+            ret.add(instance);
+            alreadySeenClasses.add(instanceClass);
+        }
+        return ret;
+    }
+
+    private void writerLookup(RuntimeType runtimeType, List<MediaType> mt, List<ResourceWriter> ret,
+            List<ResourceWriter> goodTypeWriters) {
+        if (goodTypeWriters != null && !goodTypeWriters.isEmpty()) {
+            List<ResourceWriter> mediaTypeMatchingWriters = new ArrayList<>(goodTypeWriters.size());
+            for (int i = 0; i < goodTypeWriters.size(); i++) {
+                ResourceWriter goodTypeWriter = goodTypeWriters.get(i);
+                if (!goodTypeWriter.matchesRuntimeType(runtimeType)) {
+                    continue;
+                }
+                MediaType match = MediaTypeHelper.getFirstMatch(mt, goodTypeWriter.mediaTypes());
+                if (match != null) {
+                    mediaTypeMatchingWriters.add(goodTypeWriter);
+                }
+            }
+            // we sort here because the spec mentions that the writers closer to the requested java type are tried first
+            mediaTypeMatchingWriters.sort(ResourceWriter.ResourceWriterComparator.INSTANCE);
+            ret.addAll(mediaTypeMatchingWriters);
+        }
+    }
+
+    public abstract BuiltinWriter[] getBultinWriters();
+
+    public abstract BuiltinReader[] getBultinReaders();
+
+    public void registerBuiltins(RuntimeType constraint) {
+        for (BuiltinWriter builtinWriter : getBultinWriters()) {
+            if (builtinWriter.constraint == null || builtinWriter.constraint == constraint) {
+                MessageBodyWriter<?> writer;
+                try {
+                    writer = builtinWriter.writerClass.newInstance();
+                } catch (InstantiationException | IllegalAccessException e) {
+                    e.printStackTrace();
+                    continue;
+                }
+                ResourceWriter resourceWriter = new ResourceWriter();
+                resourceWriter.setConstraint(builtinWriter.constraint);
+                resourceWriter.setMediaTypeStrings(Collections.singletonList(builtinWriter.mediaType));
+                // FIXME: we could still support beans
+                resourceWriter.setFactory(new UnmanagedBeanFactory<MessageBodyWriter<?>>(writer));
+                addWriter(builtinWriter.entityClass, resourceWriter);
+            }
+        }
+        for (BuiltinReader builtinReader : getBultinReaders()) {
+            if (builtinReader.constraint == null || builtinReader.constraint == constraint) {
+                MessageBodyReader<?> reader;
+                try {
+                    reader = builtinReader.readerClass.newInstance();
+                } catch (InstantiationException | IllegalAccessException e) {
+                    e.printStackTrace();
+                    continue;
+                }
+                ResourceReader resourceReader = new ResourceReader();
+                resourceReader.setConstraint(builtinReader.constraint);
+                resourceReader.setMediaTypeStrings(Collections.singletonList(builtinReader.mediaType));
+                // FIXME: we could still support beans
+                resourceReader.setFactory(new UnmanagedBeanFactory<MessageBodyReader<?>>(reader));
+                addReader(builtinReader.entityClass, resourceReader);
+            }
+        }
+    }
+
+    public List<MessageBodyWriter<?>> findWriters(ConfigurationImpl configuration, Class<?> entityType,
+            MediaType resolvedMediaType) {
+        return findWriters(configuration, entityType, resolvedMediaType, null);
+    }
+
+    public List<MessageBodyWriter<?>> findWriters(ConfigurationImpl configuration, Class<?> entityType,
+            MediaType resolvedMediaType, RuntimeType runtimeType) {
+        // FIXME: invocation is very different between client and server, where the server doesn't treat GenericEntity specially
+        // it's probably missing from there, while the client handles it upstack
+        List<MediaType> mt = Collections.singletonList(resolvedMediaType);
+        Class<?> klass = entityType;
+        if (primitivesToWrappers.containsKey(klass))
+            klass = primitivesToWrappers.get(klass);
+        QuarkusMultivaluedMap<Class<?>, ResourceWriter> writers;
+        if (configuration != null && !configuration.getResourceWriters().isEmpty()) {
+            writers = new QuarkusMultivaluedHashMap<>();
+            writers.addAll(configuration.getResourceWriters());
+            for (Map.Entry<Class<?>, List<ResourceWriter>> writersEntry : this.writers.entrySet()) {
+                writers.addAll(writersEntry.getKey(), writersEntry.getValue());
+            }
+        } else {
+            writers = this.writers;
+        }
+
+        return toMessageBodyWriters(findResourceWriters(writers, klass, mt, runtimeType));
+    }
+
+    public static class Builtin {
+        public final Class<?> entityClass;
+        public final String mediaType;
+        public final RuntimeType constraint;
+
+        public Builtin(Class<?> entityClass, String mediaType, RuntimeType constraint) {
+            this.entityClass = entityClass;
+            this.mediaType = mediaType;
+            this.constraint = constraint;
+        }
+    }
+
+    public static class BuiltinWriter extends Builtin {
+        public final Class<? extends MessageBodyWriter<?>> writerClass;
+
+        public BuiltinWriter(Class<?> entityClass, Class<? extends MessageBodyWriter<?>> writerClass, String mediaType) {
+            this(entityClass, writerClass, mediaType, null);
+        }
+
+        public BuiltinWriter(Class<?> entityClass, Class<? extends MessageBodyWriter<?>> writerClass, String mediaType,
+                RuntimeType constraint) {
+            super(entityClass, mediaType, constraint);
+            this.writerClass = writerClass;
+        }
+    }
+
+    public static class BuiltinReader extends Builtin {
+        public final Class<? extends MessageBodyReader<?>> readerClass;
+
+        public BuiltinReader(Class<?> entityClass, Class<? extends MessageBodyReader<?>> readerClass, String mediaType) {
+            this(entityClass, readerClass, mediaType, null);
+        }
+
+        public BuiltinReader(Class<?> entityClass, Class<? extends MessageBodyReader<?>> readerClass, String mediaType,
+                RuntimeType constraint) {
+            super(entityClass, mediaType, constraint);
+            this.readerClass = readerClass;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java
new file mode 100644
index 0000000000000..1a4b5273015f8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/SingletonBeanFactory.java
@@ -0,0 +1,56 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class SingletonBeanFactory<T> implements BeanFactory<T> {
+
+    static final Map<String, Object> INSTANCES = new ConcurrentHashMap<>();
+
+    private String className;
+
+    public SingletonBeanFactory(String className) {
+        this.className = className;
+    }
+
+    public SingletonBeanFactory() {
+    }
+
+    @Override
+    public String toString() {
+        return "SingletonBeanFactory[" + className + "]";
+    }
+
+    @Override
+    public BeanInstance<T> createInstance() {
+        Object instance = INSTANCES.get(className);
+        if (instance == null) {
+            throw new RuntimeException("Singleton for " + className + " not found.");
+        }
+        return new BeanInstance<T>() {
+            @Override
+            public T getInstance() {
+                return (T) instance;
+            }
+
+            @Override
+            public void close() {
+
+            }
+        };
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public SingletonBeanFactory<T> setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    public static void setInstance(String className, Object instance) {
+        INSTANCES.put(className, instance);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnmanagedBeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnmanagedBeanFactory.java
new file mode 100644
index 0000000000000..be91ec05a8ee6
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/core/UnmanagedBeanFactory.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.common.core;
+
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class UnmanagedBeanFactory<T> implements BeanFactory<T> {
+
+    private final T instance;
+
+    public UnmanagedBeanFactory(T instance) {
+        this.instance = instance;
+    }
+
+    @Override
+    public String toString() {
+        return "UnmanagedBeanFactory[" + instance + "]";
+    }
+
+    @Override
+    public BeanInstance<T> createInstance() {
+        return new BeanInstance<T>() {
+            @Override
+            public T getInstance() {
+                return instance;
+            }
+
+            @Override
+            public void close() {
+
+            }
+        };
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java
new file mode 100644
index 0000000000000..10e436c1c63d4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CacheControlDelegate.java
@@ -0,0 +1,132 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.List;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.ExtendedCacheControl;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class CacheControlDelegate implements RuntimeDelegate.HeaderDelegate<CacheControl> {
+    public static final CacheControlDelegate INSTANCE = new CacheControlDelegate();
+
+    public CacheControl fromString(String value) throws IllegalArgumentException {
+        if (value == null)
+            throw new IllegalArgumentException("Param was null");
+        ExtendedCacheControl result = new ExtendedCacheControl();
+        result.setNoTransform(false);
+
+        String[] directives = value.split(",");
+        for (String directive : directives) {
+            directive = directive.trim();
+
+            String[] nv = directive.split("=");
+            String name = nv[0].trim();
+            String val = null;
+            if (nv.length > 1) {
+                val = nv[1].trim();
+                if (val.startsWith("\""))
+                    val = val.substring(1);
+                if (val.endsWith("\""))
+                    val = val.substring(0, val.length() - 1);
+            }
+
+            String lowercase = name.toLowerCase();
+            if ("no-cache".equals(lowercase)) {
+                result.setNoCache(true);
+                if (val != null && !"".equals(val)) {
+                    result.getNoCacheFields().add(val);
+                }
+            } else if ("private".equals(lowercase)) {
+                result.setPrivate(true);
+                if (val != null && !"".equals(val)) {
+                    result.getPrivateFields().add(val);
+                }
+            } else if ("no-store".equals(lowercase)) {
+                result.setNoStore(true);
+            } else if ("max-age".equals(lowercase)) {
+                if (val == null)
+                    throw new IllegalArgumentException("null max age");
+                result.setMaxAge(Integer.valueOf(val));
+            } else if ("s-maxage".equals(lowercase)) {
+                if (val == null)
+                    throw new IllegalArgumentException("null s-maxage");
+                result.setSMaxAge(Integer.valueOf(val));
+            } else if ("no-transform".equals(lowercase)) {
+                result.setNoTransform(true);
+            } else if ("must-revalidate".equals(lowercase)) {
+                result.setMustRevalidate(true);
+            } else if ("proxy-revalidate".equals(lowercase)) {
+                result.setProxyRevalidate(true);
+            } else if ("public".equals(lowercase)) {
+                result.setPublic(true);
+            } else {
+                if (val == null)
+                    val = "";
+                result.getCacheExtension().put(name, val);
+            }
+        }
+        return result;
+    }
+
+    private static StringBuffer addDirective(String directive, StringBuffer buffer) {
+        if (buffer.length() > 0)
+            buffer.append(", ");
+        buffer.append(directive);
+        return buffer;
+    }
+
+    public String toString(CacheControl value) {
+        if (value == null)
+            throw new IllegalArgumentException("param was null");
+        StringBuffer buffer = new StringBuffer();
+        if (value.isNoCache()) {
+            List<String> fields = value.getNoCacheFields();
+            if (fields.size() < 1) {
+                addDirective("no-cache", buffer);
+            } else {
+                for (String field : value.getNoCacheFields()) {
+                    addDirective("no-cache", buffer).append("=\"").append(field).append("\"");
+                }
+            }
+        }
+        if (value instanceof ExtendedCacheControl) {
+            ExtendedCacheControl ecc = (ExtendedCacheControl) value;
+            if (ecc.isPublic()) {
+                addDirective("public", buffer);
+            }
+        }
+        if (value.isMustRevalidate())
+            addDirective("must-revalidate", buffer);
+        if (value.isNoTransform())
+            addDirective("no-transform", buffer);
+        if (value.isNoStore())
+            addDirective("no-store", buffer);
+        if (value.isProxyRevalidate())
+            addDirective("proxy-revalidate", buffer);
+        if (value.getSMaxAge() > -1)
+            addDirective("s-maxage", buffer).append("=").append(value.getSMaxAge());
+        if (value.getMaxAge() > -1)
+            addDirective("max-age", buffer).append("=").append(value.getMaxAge());
+        if (value.isPrivate()) {
+            List<String> fields = value.getPrivateFields();
+            if (fields.size() < 1)
+                addDirective("private", buffer);
+            else {
+                for (String field : value.getPrivateFields()) {
+                    addDirective("private", buffer).append("=\"").append(field).append("\"");
+                }
+            }
+        }
+        for (String key : value.getCacheExtension().keySet()) {
+            String val = value.getCacheExtension().get(key);
+            addDirective(key, buffer);
+            if (val != null && !"".equals(val)) {
+                buffer.append("=\"").append(val).append("\"");
+            }
+        }
+        return buffer.toString();
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java
new file mode 100644
index 0000000000000..f4f70248f14e4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/CookieHeaderDelegate.java
@@ -0,0 +1,23 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.CookieParser;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class CookieHeaderDelegate implements RuntimeDelegate.HeaderDelegate<Cookie> {
+    public static final CookieHeaderDelegate INSTANCE = new CookieHeaderDelegate();
+
+    public Cookie fromString(String value) throws IllegalArgumentException {
+        return CookieParser.parseCookies(value).get(0);
+    }
+
+    public String toString(Cookie value) {
+        StringBuffer buf = new StringBuffer();
+        ServerCookie.appendCookieValue(buf, 0, value.getName(), value.getValue(), value.getPath(), value.getDomain(), null, -1,
+                false);
+        return buf.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java
new file mode 100644
index 0000000000000..fda5a162aeae3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/DateDelegate.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.Date;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.DateUtil;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class DateDelegate implements RuntimeDelegate.HeaderDelegate<Date> {
+    public static final DateDelegate INSTANCE = new DateDelegate();
+
+    @Override
+    public Date fromString(String value) {
+        if (value == null)
+            throw new IllegalArgumentException("Param was null");
+        return DateUtil.parseDate(value);
+    }
+
+    @Override
+    public String toString(Date value) {
+        if (value == null)
+            throw new IllegalArgumentException("Param was null");
+        return DateUtil.formatDate(value);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java
new file mode 100644
index 0000000000000..6510d625e2b3c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/EntityTagDelegate.java
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class EntityTagDelegate implements RuntimeDelegate.HeaderDelegate<EntityTag> {
+    public static final EntityTagDelegate INSTANCE = new EntityTagDelegate();
+
+    public EntityTag fromString(String value) throws IllegalArgumentException {
+        if (value == null)
+            throw new IllegalArgumentException("param was null");
+        boolean weakTag = false;
+        if (value.startsWith("W/")) {
+            weakTag = true;
+            value = value.substring(2);
+        }
+        if (value.startsWith("\"")) {
+            value = value.substring(1);
+        }
+        if (value.endsWith("\"")) {
+            value = value.substring(0, value.length() - 1);
+        }
+        return new EntityTag(value, weakTag);
+    }
+
+    public String toString(EntityTag value) {
+        String weak = value.isWeak() ? "W/" : "";
+        return weak + '"' + value.getValue() + '"';
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java
new file mode 100644
index 0000000000000..2cd8d6925d2b7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/HeaderUtil.java
@@ -0,0 +1,308 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.CookieParser;
+import org.jboss.resteasy.reactive.common.util.DateUtil;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.WeightedLanguage;
+
+/**
+ * These work for MultivaluedMap with String and Object
+ */
+public class HeaderUtil {
+
+    public static String headerToString(Object obj) {
+        if (obj instanceof String) {
+            return (String) obj;
+        } else {
+            // TODO: we probably want a more direct way to get the delegate instead of going through all the indirection
+            return RuntimeDelegate.getInstance().createHeaderDelegate((Class<Object>) obj.getClass()).toString(obj);
+        }
+    }
+
+    public static Set<String> getAllowedMethods(MultivaluedMap<String, ? extends Object> headers) {
+        List<? extends Object> allowed = headers.get(HttpHeaders.ALLOW);
+        if ((allowed == null) || allowed.isEmpty()) {
+            return Collections.emptySet();
+        }
+        Set<String> allowedMethods = new HashSet<>();
+        for (Object header : allowed) {
+            if (header instanceof String) {
+                String stringHeader = ((String) header);
+                if (stringHeader.indexOf(',') != -1) {
+                    for (String str : stringHeader.split(",")) {
+                        String trimmed = str.trim();
+                        if (!trimmed.isEmpty()) {
+                            allowedMethods.add(trimmed.toUpperCase());
+                        }
+                    }
+                } else {
+                    allowedMethods.add(stringHeader.trim().toUpperCase());
+                }
+            } else {
+                allowedMethods.add(HeaderUtil.headerToString(header).toUpperCase());
+            }
+        }
+        return allowedMethods;
+    }
+
+    public static Date getDate(MultivaluedMap<String, ? extends Object> headers) {
+        return firstHeaderToDate(HttpHeaders.DATE, headers);
+    }
+
+    public static Date getLastModified(MultivaluedMap<String, ? extends Object> headers) {
+        return firstHeaderToDate(HttpHeaders.LAST_MODIFIED, headers);
+    }
+
+    private static Date firstHeaderToDate(String date, MultivaluedMap<String, ? extends Object> headers) {
+        Object d = headers.getFirst(date);
+        if (d == null)
+            return null;
+        if (d instanceof Date)
+            return (Date) d;
+        return DateUtil.parseDate(d.toString());
+    }
+
+    public static URI getLocation(MultivaluedMap<String, ? extends Object> headers) {
+        Object uri = headers.getFirst(HttpHeaders.LOCATION);
+        if (uri == null) {
+            return null;
+        }
+        if (uri instanceof URI) {
+            return (URI) uri;
+        }
+        String str = null;
+        if (uri instanceof String) {
+            str = (String) uri;
+        } else {
+            str = HeaderUtil.headerToString(uri);
+        }
+        return URI.create(str);
+    }
+
+    public static MediaType getMediaType(MultivaluedMap<String, ? extends Object> headers) {
+        Object first = headers.getFirst(HttpHeaders.CONTENT_TYPE);
+        if (first instanceof String) {
+            String contentType = (String) first;
+            return MediaType.valueOf(contentType);
+        } else {
+            return (MediaType) first;
+        }
+    }
+
+    public static Locale getLanguage(MultivaluedMap<String, ? extends Object> headers) {
+        Object obj = headers.getFirst(HttpHeaders.CONTENT_LANGUAGE);
+        if (obj == null) {
+            return null;
+        }
+        if (obj instanceof Locale) {
+            return (Locale) obj;
+        }
+        return Locale.forLanguageTag(HeaderUtil.headerToString(obj));
+    }
+
+    public static int getLength(MultivaluedMap<String, ? extends Object> headers) {
+        Object obj = headers.getFirst(HttpHeaders.CONTENT_LENGTH);
+        if (obj == null) {
+            return -1;
+        }
+        if (obj instanceof Integer) {
+            return (Integer) obj;
+        }
+        return Integer.parseInt(HeaderUtil.headerToString(obj));
+    }
+
+    public static Map<String, Cookie> getCookies(MultivaluedMap<String, ? extends Object> headers) {
+        List list = headers.get(HttpHeaders.COOKIE);
+        if (list == null)
+            return Collections.emptyMap();
+        Map<String, Cookie> cookies = new HashMap<String, Cookie>();
+        for (Object obj : list) {
+            if (obj instanceof Cookie) {
+                Cookie cookie = (Cookie) obj;
+                cookies.put(cookie.getName(), cookie);
+            } else {
+                String str = headerToString(obj);
+                for (Cookie cookie : CookieParser.parseCookies(str)) {
+                    cookies.put(cookie.getName(), cookie);
+                }
+            }
+        }
+        return cookies;
+    }
+
+    public static Map<String, NewCookie> getNewCookies(MultivaluedMap<String, ? extends Object> headers) {
+        List<?> list = headers.get(HttpHeaders.SET_COOKIE);
+        if ((list == null) || list.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<String, NewCookie> cookies = new HashMap<>();
+        for (Object obj : list) {
+            if (obj instanceof NewCookie) {
+                NewCookie cookie = (NewCookie) obj;
+                cookies.put(cookie.getName(), cookie);
+            } else {
+                String str = HeaderUtil.headerToString(obj);
+                NewCookie cookie = NewCookie.valueOf(str);
+                cookies.put(cookie.getName(), cookie);
+            }
+        }
+        return cookies;
+    }
+
+    public static EntityTag getEntityTag(MultivaluedMap<String, ? extends Object> headers) {
+        Object d = headers.getFirst(HttpHeaders.ETAG);
+        if (d == null) {
+            return null;
+        }
+        if (d instanceof EntityTag) {
+            return (EntityTag) d;
+        }
+        return EntityTag.valueOf(HeaderUtil.headerToString(d));
+    }
+
+    public static String getHeaderString(MultivaluedMap<String, ? extends Object> headers, String name) {
+        List<? extends Object> list = headers.get(name);
+        if (list == null) {
+            return null;
+        }
+        if (list.size() == 1) {
+            return headerToString(list.get(0));
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Object s : list) {
+            if (sb.length() > 0) {
+                sb.append(",");
+            }
+            sb.append(headerToString(s));
+        }
+        return sb.toString();
+    }
+
+    @SuppressWarnings(value = "unchecked")
+    public static void setAllow(MultivaluedMap headers, String[] methods) {
+        if (methods == null) {
+            headers.remove("Allow");
+            return;
+        }
+        StringBuilder builder = new StringBuilder();
+        boolean isFirst = true;
+        for (String l : methods) {
+            if (isFirst) {
+                isFirst = false;
+            } else {
+                builder.append(", ");
+            }
+            builder.append(l);
+        }
+        headers.putSingle("Allow", builder.toString());
+    }
+
+    @SuppressWarnings(value = "unchecked")
+    public static void setAllow(MultivaluedMap headers, Set<String> methods) {
+        if (methods == null) {
+            headers.remove("Allow");
+            return;
+        }
+        StringBuilder builder = new StringBuilder();
+        boolean isFirst = true;
+        for (String l : methods) {
+            if (isFirst) {
+                isFirst = false;
+            } else {
+                builder.append(", ");
+            }
+            builder.append(l);
+        }
+        headers.putSingle("Allow", builder.toString());
+    }
+
+    public static boolean isContentLengthZero(MultivaluedMap httpHeaders) {
+        if (httpHeaders == null)
+            return false;
+        @SuppressWarnings(value = "unchecked")
+        String contentLength = (String) httpHeaders.getFirst(HttpHeaders.CONTENT_LENGTH);
+        if (contentLength != null) {
+            long length = Long.parseLong(contentLength);
+            if (length == 0)
+                return true;
+        }
+        return false;
+    }
+
+    public static List<MediaType> getAcceptableMediaTypes(MultivaluedMap<String, ? extends Object> headers) {
+        List<?> accepts = headers.get(HttpHeaders.ACCEPT);
+        if (accepts == null || accepts.isEmpty()) {
+            return Collections.singletonList(MediaType.WILDCARD_TYPE);
+        }
+        List<MediaType> list = new ArrayList<MediaType>();
+        for (Object obj : accepts) {
+            if (obj instanceof MediaType) {
+                list.add((MediaType) obj);
+                continue;
+            }
+            String accept = null;
+            if (obj instanceof String) {
+                accept = (String) obj;
+            } else {
+                accept = headerToString(obj);
+            }
+            if (accept.indexOf(',') != -1) {
+                StringTokenizer tokenizer = new StringTokenizer(accept, ",");
+                while (tokenizer.hasMoreElements()) {
+                    String item = tokenizer.nextToken().trim();
+                    list.add(MediaType.valueOf(item));
+                }
+            } else {
+                list.add(MediaType.valueOf(accept.trim()));
+            }
+        }
+        MediaTypeHelper.sortByWeight(list);
+        return list;
+    }
+
+    public static List<Locale> getAcceptableLanguages(MultivaluedMap<String, ? extends Object> headers) {
+        List<?> accepts = headers.get(HttpHeaders.ACCEPT_LANGUAGE);
+        if (accepts == null || accepts.isEmpty())
+            return Collections.emptyList();
+        List<WeightedLanguage> languages = new ArrayList<WeightedLanguage>();
+        for (Object obj : accepts) {
+            if (obj instanceof Locale) {
+                languages.add(new WeightedLanguage((Locale) obj, 1.0F));
+                continue;
+            }
+            String accept = headerToString(obj);
+            if (accept.indexOf(',') != -1) {
+                StringTokenizer tokenizer = new StringTokenizer(accept, ",");
+                while (tokenizer.hasMoreElements()) {
+                    String item = tokenizer.nextToken().trim();
+                    languages.add(WeightedLanguage.parse(item));
+                }
+            } else {
+                languages.add(WeightedLanguage.parse(accept.trim()));
+            }
+        }
+        Collections.sort(languages);
+        List<Locale> list = new ArrayList<Locale>(languages.size());
+        for (WeightedLanguage language : languages)
+            list.add(language.getLocale());
+        return list;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java
new file mode 100644
index 0000000000000..7e450b3fbc64b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkDelegate.java
@@ -0,0 +1,146 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.jaxrs.LinkBuilderImpl;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class LinkDelegate implements RuntimeDelegate.HeaderDelegate<Link> {
+    public static final LinkDelegate INSTANCE = new LinkDelegate();
+
+    private static class Parser {
+        private int curr;
+        private String value;
+        private Link.Builder builder;
+
+        Parser(final String value) {
+            this.value = value;
+            builder = new LinkBuilderImpl();
+        }
+
+        public Link getLink() {
+            return builder.build();
+        }
+
+        public void parse() {
+            String href = null;
+            MultivaluedMap<String, String> attributes = new QuarkusMultivaluedHashMap<String, String>();
+            while (curr < value.length()) {
+
+                char c = value.charAt(curr);
+                if (c == '<') {
+                    if (href != null)
+                        throw new IllegalArgumentException("Too many links");
+                    href = parseLink();
+                } else if (c == ';' || c == ' ') {
+                    curr++;
+                    continue;
+                } else {
+                    parseAttribute(attributes);
+                }
+            }
+            populateLink(href, attributes);
+
+        }
+
+        protected void populateLink(String href, MultivaluedMap<String, String> attributes) {
+            builder.uri(href);
+            for (String name : attributes.keySet()) {
+                List<String> values = attributes.get(name);
+                if (name.equals("rel")) {
+                    for (String val : values)
+                        builder.rel(val);
+                } else if (name.equals("title")) {
+                    for (String val : values)
+                        builder.title(val);
+
+                } else if (name.equals("type")) {
+                    for (String val : values)
+                        builder.type(val);
+
+                } else {
+                    for (String val : values)
+                        builder.param(name, val);
+
+                }
+            }
+        }
+
+        public String parseLink() {
+            int end = value.indexOf('>', curr);
+            if (end == -1)
+                throw new IllegalArgumentException("No end to link");
+            String href = value.substring(curr + 1, end);
+            curr = end + 1;
+            return href;
+        }
+
+        public void parseAttribute(MultivaluedMap<String, String> attributes) {
+            int end = value.indexOf('=', curr);
+            if (end == -1 || end + 1 >= value.length())
+                throw new IllegalArgumentException("No end to parameter");
+            String name = value.substring(curr, end);
+            name = name.trim();
+            curr = end + 1;
+            String val = null;
+            if (curr >= value.length()) {
+                val = "";
+            } else {
+
+                if (value.charAt(curr) == '"') {
+                    if (curr + 1 >= value.length())
+                        throw new IllegalArgumentException("No end to parameter");
+                    curr++;
+                    end = value.indexOf('"', curr);
+                    if (end == -1)
+                        throw new IllegalArgumentException("No end to parameter");
+                    val = value.substring(curr, end);
+                    curr = end + 1;
+                } else {
+                    StringBuffer buf = new StringBuffer();
+                    while (curr < value.length()) {
+                        char c = value.charAt(curr);
+                        if (c == ',' || c == ';')
+                            break;
+                        buf.append(value.charAt(curr));
+                        curr++;
+                    }
+                    val = buf.toString();
+                }
+            }
+            attributes.add(name, val);
+
+        }
+
+    }
+
+    @Override
+    public Link fromString(String value) throws IllegalArgumentException {
+        if (value == null)
+            throw new IllegalArgumentException("value was null");
+        Parser parser = new Parser(value);
+        parser.parse();
+        return parser.getLink();
+    }
+
+    @Override
+    public String toString(Link value) throws IllegalArgumentException {
+        if (value == null)
+            throw new IllegalArgumentException("value was null");
+        StringBuffer buf = new StringBuffer("<");
+        buf.append(value.getUri().toString()).append(">");
+
+        for (Map.Entry<String, String> entry : value.getParams().entrySet()) {
+            buf.append("; ").append(entry.getKey()).append("=\"").append(entry.getValue()).append("\"");
+        }
+
+        return buf.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java
new file mode 100644
index 0000000000000..d9d7785c49720
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LinkHeaders.java
@@ -0,0 +1,49 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.MultivaluedMap;
+
+public class LinkHeaders {
+    private final Map<String, Link> linksByRelationship = new HashMap<>();
+    private final List<Link> links = new ArrayList<>();
+
+    public LinkHeaders(MultivaluedMap<String, Object> headers) {
+        List<Object> values = headers.get("Link");
+        if (values == null) {
+            return;
+        }
+
+        for (Object val : values) {
+            if (val instanceof Link) {
+                addLink((Link) val);
+            } else if (val instanceof String) {
+                for (String link : ((String) val).split(",")) {
+                    addLink(Link.valueOf(link));
+                }
+            } else {
+                String str = HeaderUtil.headerToString(val);
+                addLink(Link.valueOf(str));
+            }
+        }
+    }
+
+    private void addLink(final Link link) {
+        links.add(link);
+        for (String rel : link.getRels()) {
+            linksByRelationship.put(rel, link);
+        }
+    }
+
+    public Link getLinkByRelationship(String rel) {
+        return linksByRelationship.get(rel);
+    }
+
+    public List<Link> getLinks() {
+        return links;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java
new file mode 100644
index 0000000000000..e3a51c33aa72a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/LocaleDelegate.java
@@ -0,0 +1,25 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.Locale;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.LocaleHelper;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class LocaleDelegate implements RuntimeDelegate.HeaderDelegate<Locale> {
+    public static final LocaleDelegate INSTANCE = new LocaleDelegate();
+
+    public Locale fromString(String value) throws IllegalArgumentException {
+        if (value == null)
+            throw new IllegalArgumentException("param was null");
+        return LocaleHelper.extractLocale(value);
+    }
+
+    public String toString(Locale value) {
+        if (value == null)
+            throw new IllegalArgumentException("param was null");
+        return LocaleHelper.toLanguageString(value);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java
new file mode 100644
index 0000000000000..9a450ad606f4a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/MediaTypeHeaderDelegate.java
@@ -0,0 +1,160 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.HeaderParameterParser;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class MediaTypeHeaderDelegate implements RuntimeDelegate.HeaderDelegate<MediaType> {
+    public static final MediaTypeHeaderDelegate INSTANCE = new MediaTypeHeaderDelegate();
+    private static final int MAX_MT_CACHE_SIZE = 200;
+    private static final char[] quotedChars = "()<>@,;:\\\"/[]?= \t\r\n".toCharArray();
+    private static final Map<String, MediaType> map = new ConcurrentHashMap<String, MediaType>();
+    private static final Map<MediaType, String> reverseMap = new ConcurrentHashMap<MediaType, String>();
+
+    protected static boolean isValid(String str) {
+        if (str == null || str.length() == 0)
+            return false;
+        for (int i = 0; i < str.length(); i++) {
+            switch (str.charAt(i)) {
+                case '/':
+                case '\\':
+                case '?':
+                case ':':
+                case '<':
+                case '>':
+                case ';':
+                case '(':
+                case ')':
+                case '@':
+                case ',':
+                case '[':
+                case ']':
+                case '=':
+                case '\n':
+                    return false;
+                default:
+                    break;
+            }
+        }
+        return true;
+    }
+
+    public static MediaType parse(String type) {
+        MediaType result = map.get(type);
+        if (result == null) {
+            result = internalParse(type);
+            final int size = map.size();
+            if (size >= MAX_MT_CACHE_SIZE) {
+                map.clear();
+                reverseMap.clear();
+            }
+            map.put(type, result);
+            reverseMap.put(result, type);
+        }
+        return result;
+    }
+
+    private static MediaType internalParse(String type) {
+        int typeIndex = type.indexOf('/');
+        int paramIndex = type.indexOf(';');
+        String major = null;
+        String subtype = null;
+        if (typeIndex < 0) // possible "*"
+        {
+            major = type;
+            if (paramIndex > -1) {
+                major = major.substring(0, paramIndex);
+            }
+            if (!MediaType.MEDIA_TYPE_WILDCARD.equals(major)) {
+                throw new IllegalArgumentException("Failed to parse media type " + type);
+            }
+            subtype = MediaType.MEDIA_TYPE_WILDCARD;
+        } else {
+            major = type.substring(0, typeIndex);
+            if (paramIndex > -1) {
+                subtype = type.substring(typeIndex + 1, paramIndex);
+            } else {
+                subtype = type.substring(typeIndex + 1);
+            }
+        }
+        if (major.length() < 1 || subtype.length() < 1) {
+            throw new IllegalArgumentException("Failed to parse media type " + type);
+        }
+        if (!isValid(major) || !isValid(subtype)) {
+            throw new IllegalArgumentException("Failed to parse media type " + type);
+        }
+        String params = null;
+        if (paramIndex > -1)
+            params = type.substring(paramIndex + 1);
+        if (params != null && !params.equals("")) {
+            HashMap<String, String> typeParams = new HashMap<String, String>();
+
+            int start = 0;
+
+            while (start < params.length()) {
+                start = HeaderParameterParser.setParam(typeParams, params, start);
+            }
+            return new MediaType(major, subtype, typeParams);
+        } else {
+            return new MediaType(major, subtype);
+        }
+    }
+
+    public static boolean quoted(String str) {
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            for (char q : quotedChars) {
+                if (c == q)
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    public MediaType fromString(String type) throws IllegalArgumentException {
+        if (type == null)
+            throw new IllegalArgumentException("Media type was null");
+        return parse(type);
+    }
+
+    public String toString(MediaType o) {
+        if (o == null)
+            throw new IllegalArgumentException("Param was null");
+        MediaType type = o;
+        String result = reverseMap.get(type);
+        if (result == null) {
+            result = internalToString(type);
+            final int size = reverseMap.size();
+            if (size >= MAX_MT_CACHE_SIZE) {
+                reverseMap.clear();
+                map.clear();
+            }
+            reverseMap.put(type, result);
+            map.put(result, type);
+        }
+        return result;
+    }
+
+    private String internalToString(MediaType type) {
+        StringBuilder buf = new StringBuilder();
+
+        buf.append(type.getType().toLowerCase()).append("/").append(type.getSubtype().toLowerCase());
+        if (type.getParameters() == null || type.getParameters().size() == 0)
+            return buf.toString();
+        for (String name : type.getParameters().keySet()) {
+            buf.append(';').append(name).append('=');
+            String val = type.getParameters().get(name);
+            if (quoted(val))
+                buf.append('"').append(val).append('"');
+            else
+                buf.append(val);
+        }
+        return buf.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java
new file mode 100644
index 0000000000000..76ea437ba210b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/NewCookieHeaderDelegate.java
@@ -0,0 +1,126 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.DateUtil;
+import org.jboss.resteasy.reactive.common.util.ParameterParser;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class NewCookieHeaderDelegate implements RuntimeDelegate.HeaderDelegate {
+    public static final NewCookieHeaderDelegate INSTANCE = new NewCookieHeaderDelegate();
+    private static final String OLD_COOKIE_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z";
+
+    public Object fromString(String newCookie) throws IllegalArgumentException {
+        if (newCookie == null)
+            throw new IllegalArgumentException("param was null");
+        String cookieName = null;
+        String cookieValue = null;
+        String comment = null;
+        String domain = null;
+        int maxAge = NewCookie.DEFAULT_MAX_AGE;
+        String path = null;
+        boolean secure = false;
+        int version = NewCookie.DEFAULT_VERSION;
+        boolean httpOnly = false;
+        Date expiry = null;
+
+        ParameterParser parser = new ParameterParser();
+        Map<String, String> map = parser.parse(newCookie, ';');
+
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            String name = entry.getKey();
+            String value = entry.getValue();
+            if (name.equalsIgnoreCase("Comment"))
+                comment = value;
+            else if (name.equalsIgnoreCase("Domain"))
+                domain = value;
+            else if (name.equalsIgnoreCase("Max-Age"))
+                maxAge = Integer.parseInt(value);
+            else if (name.equalsIgnoreCase("Path"))
+                path = value;
+            else if (name.equalsIgnoreCase("Secure"))
+                secure = true;
+            else if (name.equalsIgnoreCase("Version"))
+                version = Integer.parseInt(value);
+            else if (name.equalsIgnoreCase("HttpOnly"))
+                httpOnly = true;
+            else if (name.equalsIgnoreCase("Expires")) {
+                try {
+                    expiry = new SimpleDateFormat(OLD_COOKIE_PATTERN, Locale.US).parse(value);
+                } catch (ParseException e) {
+                }
+            } else {
+                cookieName = name;
+                cookieValue = value;
+            }
+
+        }
+
+        if (cookieValue == null) {
+            cookieValue = "";
+        }
+
+        return new NewCookie(cookieName, cookieValue, path, domain, version, comment, maxAge, expiry, secure, httpOnly);
+
+    }
+
+    protected void quote(StringBuilder b, String value) {
+
+        if (MediaTypeHeaderDelegate.quoted(value)) {
+            b.append('"');
+            b.append(value);
+            b.append('"');
+        } else {
+            b.append(value);
+        }
+    }
+
+    public String toString(Object value) {
+        if (value == null)
+            throw new IllegalArgumentException("param was null");
+        NewCookie cookie = (NewCookie) value;
+        StringBuilder b = new StringBuilder();
+
+        b.append(cookie.getName()).append('=');
+
+        if (cookie.getValue() != null) {
+            quote(b, cookie.getValue());
+        }
+
+        b.append(";").append("Version=").append(cookie.getVersion());
+
+        if (cookie.getComment() != null) {
+            b.append(";Comment=");
+            quote(b, cookie.getComment());
+        }
+        if (cookie.getDomain() != null) {
+            b.append(";Domain=");
+            quote(b, cookie.getDomain());
+        }
+        if (cookie.getPath() != null) {
+            b.append(";Path=");
+            b.append(cookie.getPath());
+        }
+        if (cookie.getMaxAge() != -1) {
+            b.append(";Max-Age=");
+            b.append(cookie.getMaxAge());
+        }
+        if (cookie.getExpiry() != null) {
+            b.append(";Expires=");
+            b.append(DateUtil.formatDate(cookie.getExpiry(), OLD_COOKIE_PATTERN));
+        }
+        if (cookie.isSecure())
+            b.append(";Secure");
+        if (cookie.isHttpOnly())
+            b.append(";HttpOnly");
+        return b.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java
new file mode 100644
index 0000000000000..274b0fefd048f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ObjectToStringDelegate.java
@@ -0,0 +1,22 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.util.Objects;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+public class ObjectToStringDelegate implements RuntimeDelegate.HeaderDelegate<Object> {
+    public static final ObjectToStringDelegate INSTANCE = new ObjectToStringDelegate();
+
+    @Override
+    public Object fromString(String value) {
+        if (value == null)
+            throw new IllegalArgumentException("Param was null");
+        throw new IllegalArgumentException("Does not support fromString");
+    }
+
+    @Override
+    public String toString(Object value) {
+        if (value == null)
+            throw new IllegalArgumentException("Param was null");
+        return Objects.toString(value);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ServerCookie.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ServerCookie.java
new file mode 100644
index 0000000000000..4bd216ee67fc9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/headers/ServerCookie.java
@@ -0,0 +1,286 @@
+package org.jboss.resteasy.reactive.common.headers;
+
+import java.io.Serializable;
+import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ * Server-side cookie representation. Stolen from Tomcat.
+ */
+public class ServerCookie implements Serializable {
+    private static final String tspecials = ",; ";
+    private static final String tspecials2 = "()<>@,;:\\\"/[]?={} \t";
+
+    /*
+     * Tests a string and returns true if the string counts as a
+     * reserved token in the Java language.
+     *
+     * @param value the <code>String</code> to be tested
+     *
+     * @return <code>true</code> if the <code>String</code> is a reserved
+     * token; <code>false</code> if it is not
+     */
+    public static boolean isToken(String value) {
+        if (value == null)
+            return true;
+        int len = value.length();
+
+        for (int i = 0; i < len; i++) {
+            char c = value.charAt(i);
+
+            if (tspecials.indexOf(c) != -1)
+                return false;
+        }
+        return true;
+    }
+
+    public static boolean containsCTL(String value, int version) {
+        if (value == null)
+            return false;
+        int len = value.length();
+        for (int i = 0; i < len; i++) {
+            char c = value.charAt(i);
+            if (c < 0x20 || c >= 0x7f) {
+                if (c == 0x09)
+                    continue; //allow horizontal tabs
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isToken2(String value) {
+        if (value == null)
+            return true;
+        int len = value.length();
+
+        for (int i = 0; i < len; i++) {
+            char c = value.charAt(i);
+            if (tspecials2.indexOf(c) != -1)
+                return false;
+        }
+        return true;
+    }
+
+    /**
+     * @deprecated Not used: Deprecated in the original org.apache.tomcat.util.http.ServerCookie class.
+     * @param name name
+     * @return boolean flag
+     */
+    public static boolean checkName(String name) {
+        if (!isToken(name)
+                || name.equalsIgnoreCase("Comment") // rfc2019
+                || name.equalsIgnoreCase("Discard") // rfc2965
+                || name.equalsIgnoreCase("Domain") // rfc2019
+                || name.equalsIgnoreCase("Expires") // Netscape
+                || name.equalsIgnoreCase("Max-Age") // rfc2019
+                || name.equalsIgnoreCase("Path") // rfc2019
+                || name.equalsIgnoreCase("Secure") // rfc2019
+                || name.equalsIgnoreCase("Version") // rfc2019
+        // TODO remaining RFC2965 attributes
+        ) {
+            return false;
+        }
+        return true;
+    }
+
+    // -------------------- Cookie parsing tools
+
+    /**
+     * Return the header name to set the cookie, based on cookie version.
+     * 
+     * @param version cookie version
+     * @return cookie header name
+     */
+    public static String getCookieHeaderName(int version) {
+        // TODO Re-enable logging when RFC2965 is implemented
+        // log( (version==1) ? "Set-Cookie2" : "Set-Cookie");
+        if (version == 1) {
+            // XXX RFC2965 not referenced in Servlet Spec
+            // Set-Cookie2 is not supported by Netscape 4, 6, IE 3, 5
+            // Set-Cookie2 is supported by Lynx and Opera
+            // Need to check on later IE and FF releases but for now...
+            // RFC2109
+            return "Set-Cookie";
+            // return "Set-Cookie2";
+        } else {
+            // Old Netscape
+            return "Set-Cookie";
+        }
+    }
+
+    /**
+     * US locale - all HTTP dates are in english
+     */
+    private static final Locale LOCALE_US = Locale.US;
+
+    /**
+     * GMT timezone - all HTTP dates are on GMT
+     */
+    public static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
+    /**
+     * Pattern used for old cookies
+     */
+    private static final String OLD_COOKIE_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z";
+
+    private static final DateFormat oldCookieFormat = new SimpleDateFormat(OLD_COOKIE_PATTERN, LOCALE_US);
+
+    public static String formatOldCookie(Date d) {
+        String ocf = null;
+        synchronized (oldCookieFormat) {
+            ocf = oldCookieFormat.format(d);
+        }
+        return ocf;
+    }
+
+    public static void formatOldCookie(Date d, StringBuffer sb,
+            FieldPosition fp) {
+        synchronized (oldCookieFormat) {
+            oldCookieFormat.format(d, sb, fp);
+        }
+    }
+
+    private static final String ancientDate = formatOldCookie(new Date(10000));
+
+    // TODO RFC2965 fields also need to be passed
+    public static void appendCookieValue(StringBuffer headerBuf,
+            int version,
+            String name,
+            String value,
+            String path,
+            String domain,
+            String comment,
+            int maxAge,
+            boolean isSecure) {
+        StringBuffer buf = new StringBuffer();
+        // Servlet implementation checks name
+        buf.append(name);
+        buf.append("=");
+        // Servlet implementation does not check anything else
+
+        maybeQuote2(version, buf, value);
+
+        // Add version 1 specific information
+        if (version == 1) {
+            // Version=1 ... required
+            buf.append("; Version=1");
+
+            // Comment=comment
+            if (comment != null) {
+                buf.append("; Comment=");
+                maybeQuote2(version, buf, comment);
+            }
+        }
+
+        // Add domain information, if present
+        if (domain != null) {
+            buf.append("; Domain=");
+            maybeQuote2(version, buf, domain);
+        }
+
+        // Max-Age=secs ... or use old "Expires" format
+        // TODO RFC2965 Discard
+        if (maxAge >= 0) {
+            if (version == 0) {
+                // Wdy, DD-Mon-YY HH:MM:SS GMT ( Expires Netscape format )
+                buf.append("; Expires=");
+                // To expire immediately we need to set the time in past
+                if (maxAge == 0)
+                    buf.append(ancientDate);
+                else
+                    formatOldCookie(new Date(System.currentTimeMillis() +
+                            maxAge * 1000L), buf,
+                            new FieldPosition(0));
+
+            } else {
+                buf.append("; Max-Age=");
+                buf.append(maxAge);
+            }
+        }
+
+        // Path=path
+        if (path != null) {
+            buf.append("; Path=");
+            maybeQuote2(version, buf, path);
+        }
+
+        // Secure
+        if (isSecure) {
+            buf.append("; Secure");
+        }
+
+        headerBuf.append(buf);
+    }
+
+    public static boolean alreadyQuoted(String value) {
+        if (value == null || value.length() == 0)
+            return false;
+        return (value.charAt(0) == '\"' && value.charAt(value.length() - 1) == '\"');
+    }
+
+    /**
+     * Quotes values using rules that vary depending on Cookie version.
+     *
+     * @param version cookie version
+     * @param buf buffer
+     * @param value value
+     */
+    public static void maybeQuote2(int version, StringBuffer buf, String value) {
+        if (value == null || value.length() == 0) {
+            buf.append("\"\"");
+        } else if (containsCTL(value, version))
+            throw new IllegalArgumentException("control character in cookie value");
+        else if (alreadyQuoted(value)) {
+            buf.append('"');
+            buf.append(escapeDoubleQuotes(value, 1, value.length() - 1));
+            buf.append('"');
+        } else if (version == 0 && !isToken(value)) {
+            buf.append('"');
+            buf.append(escapeDoubleQuotes(value, 0, value.length()));
+            buf.append('"');
+        } else if (version == 1 && !isToken2(value)) {
+            buf.append('"');
+            buf.append(escapeDoubleQuotes(value, 0, value.length()));
+            buf.append('"');
+        } else {
+            buf.append(value);
+        }
+    }
+
+    /**
+     * Escapes any double quotes in the given string.
+     *
+     * @param s the input string
+     * @param beginIndex start index inclusive
+     * @param endIndex exclusive
+     * @return The (possibly) escaped string
+     */
+    private static String escapeDoubleQuotes(String s, int beginIndex, int endIndex) {
+
+        if (s == null || s.length() == 0 || s.indexOf('"') == -1) {
+            return s;
+        }
+
+        StringBuffer b = new StringBuffer();
+        for (int i = beginIndex; i < endIndex; i++) {
+            char c = s.charAt(i);
+            if (c == '\\') {
+                b.append(c);
+                //ignore the character after an escape, just append it
+                if (++i >= endIndex)
+                    throw new IllegalArgumentException("Invalid escape character in cookie value");
+                b.append(s.charAt(i));
+            } else if (c == '"')
+                b.append('\\').append('"');
+            else
+                b.append(c);
+        }
+
+        return b.toString();
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java
new file mode 100644
index 0000000000000..1ab76a8078aad
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractResponseBuilder.java
@@ -0,0 +1,422 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.lang.annotation.Annotation;
+import java.net.URI;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Variant;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+
+public abstract class AbstractResponseBuilder extends Response.ResponseBuilder {
+
+    private static final Map<Integer, String> defaultReasonPhrases = new HashMap<>();
+    static {
+        defaultReasonPhrases.put(200, "OK");
+        defaultReasonPhrases.put(201, "Created");
+        defaultReasonPhrases.put(202, "Accepted");
+        defaultReasonPhrases.put(204, "No Content");
+        defaultReasonPhrases.put(205, "Reset Content");
+        defaultReasonPhrases.put(206, "Partial Content");
+        defaultReasonPhrases.put(301, "Moved Permanently");
+        defaultReasonPhrases.put(302, "Found");
+        defaultReasonPhrases.put(303, "See Other");
+        defaultReasonPhrases.put(304, "Not Modified");
+        defaultReasonPhrases.put(305, "Use Proxy");
+        defaultReasonPhrases.put(307, "Temporary Redirect");
+        defaultReasonPhrases.put(400, "Bad Request");
+        defaultReasonPhrases.put(401, "Unauthorized");
+        defaultReasonPhrases.put(402, "Payment Required");
+        defaultReasonPhrases.put(403, "Forbidden");
+        defaultReasonPhrases.put(404, "Not Found");
+        defaultReasonPhrases.put(405, "Method Not Allowed");
+        defaultReasonPhrases.put(406, "Not Acceptable");
+        defaultReasonPhrases.put(407, "Proxy Authentication Required");
+        defaultReasonPhrases.put(408, "Request Timeout");
+        defaultReasonPhrases.put(409, "Conflict");
+        defaultReasonPhrases.put(410, "Gone");
+        defaultReasonPhrases.put(411, "Length Required");
+        defaultReasonPhrases.put(412, "Precondition Failed");
+        defaultReasonPhrases.put(413, "Request Entity Too Large");
+        defaultReasonPhrases.put(414, "Request-URI Too Long");
+        defaultReasonPhrases.put(415, "Unsupported Media Type");
+        defaultReasonPhrases.put(416, "Requested Range Not Satisfiable");
+        defaultReasonPhrases.put(417, "Expectation Failed");
+        defaultReasonPhrases.put(500, "Internal Server Error");
+        defaultReasonPhrases.put(501, "Not Implemented");
+        defaultReasonPhrases.put(502, "Bad Gateway");
+        defaultReasonPhrases.put(503, "Service Unavailable");
+        defaultReasonPhrases.put(504, "Gateway Timeout");
+        defaultReasonPhrases.put(505, "HTTP Version Not Supported");
+    }
+
+    protected int status = -1;
+    protected String reasonPhrase;
+    protected Object entity;
+    protected MultivaluedMap<String, Object> metadata = new CaseInsensitiveMap<>();
+    protected Annotation[] entityAnnotations;
+
+    public static SimpleDateFormat getDateFormatRFC822() {
+        SimpleDateFormat dateFormatRFC822 = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+        dateFormatRFC822.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return dateFormatRFC822;
+    }
+
+    public static String createVaryHeader(List<Variant> variants) {
+        boolean accept = false;
+        boolean acceptLanguage = false;
+        boolean acceptEncoding = false;
+
+        for (Variant variant : variants) {
+            if (variant.getMediaType() != null)
+                accept = true;
+            if (variant.getLanguage() != null)
+                acceptLanguage = true;
+            if (variant.getEncoding() != null)
+                acceptEncoding = true;
+        }
+
+        String vary = null;
+        if (accept)
+            vary = HttpHeaders.ACCEPT;
+        if (acceptLanguage) {
+            if (vary == null)
+                vary = HttpHeaders.ACCEPT_LANGUAGE;
+            else
+                vary += ", " + HttpHeaders.ACCEPT_LANGUAGE;
+        }
+        if (acceptEncoding) {
+            if (vary == null)
+                vary = HttpHeaders.ACCEPT_ENCODING;
+            else
+                vary += ", " + HttpHeaders.ACCEPT_ENCODING;
+        }
+        return vary;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getReasonPhrase() {
+        return reasonPhrase;
+    }
+
+    public Object getEntity() {
+        return entity;
+    }
+
+    public Annotation[] getEntityAnnotations() {
+        return entityAnnotations;
+    }
+
+    public void setEntityAnnotations(Annotation[] entityAnnotations) {
+        this.entityAnnotations = entityAnnotations;
+    }
+
+    @Override
+    public ResponseImpl build() {
+        return populateResponse(new ResponseImpl());
+    }
+
+    public ResponseImpl build(boolean copyHeaders) {
+        return populateResponse(new ResponseImpl(), copyHeaders);
+    }
+
+    /**
+     * Populates a response with the standard data
+     *
+     * @return The given response
+     */
+    public <T extends ResponseImpl> T populateResponse(T response) {
+        return populateResponse(response, true);
+    }
+
+    public <T extends ResponseImpl> T populateResponse(T response, boolean copyHeaders) {
+        response.entity = entity;
+        if ((entity == null) && (status == -1)) {
+            response.status = 204; // spec says that when no status is set and the entity is null, we need to return 204
+        } else if (status == -1) {
+            response.status = 200;
+        } else {
+            response.status = status;
+        }
+        response.reasonPhrase = reasonPhrase;
+        if (copyHeaders) {
+            response.headers = new CaseInsensitiveMap<>();
+            response.headers.putAll(metadata);
+        } else {
+            response.headers = metadata;
+        }
+        response.entityAnnotations = entityAnnotations;
+        return response;
+    }
+
+    public void setAllHeaders(MultivaluedMap<String, String> values) {
+        for (Map.Entry<String, List<String>> i : values.entrySet()) {
+            for (String v : i.getValue()) {
+                metadata.add(i.getKey(), v);
+            }
+        }
+    }
+
+    protected abstract AbstractResponseBuilder doClone();
+
+    @Override
+    public AbstractResponseBuilder clone() {
+        AbstractResponseBuilder responseBuilder = doClone();
+        responseBuilder.status = status;
+        responseBuilder.reasonPhrase = reasonPhrase;
+        responseBuilder.entity = entity;
+        responseBuilder.metadata = new QuarkusMultivaluedHashMap<>();
+        responseBuilder.metadata.putAll(metadata);
+        return responseBuilder;
+    }
+
+    @Override
+    public Response.ResponseBuilder status(int status, String reasonPhrase) {
+        this.status = status;
+        this.reasonPhrase = reasonPhrase;
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder status(int status) {
+        return status(status, defaultReasonPhrases.get(status));
+    }
+
+    @Override
+    public Response.ResponseBuilder entity(Object entity) {
+        this.entity = entity;
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder entity(Object entity, Annotation[] annotations) {
+        this.entity = entity;
+        this.entityAnnotations = annotations;
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder type(MediaType type) {
+        if (type == null) {
+            metadata.remove(HttpHeaders.CONTENT_TYPE);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.CONTENT_TYPE, type);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder type(String type) {
+        if (type == null) {
+            metadata.remove(HttpHeaders.CONTENT_TYPE);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.CONTENT_TYPE, type);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder variant(Variant variant) {
+        if (variant == null) {
+            type((String) null);
+            language((String) null);
+            metadata.remove(HttpHeaders.CONTENT_ENCODING);
+            return this;
+        }
+        type(variant.getMediaType());
+        language(variant.getLanguage());
+        if (variant.getEncoding() != null)
+            metadata.putSingle(HttpHeaders.CONTENT_ENCODING, variant.getEncoding());
+        else
+            metadata.remove(HttpHeaders.CONTENT_ENCODING);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder variants(List<Variant> variants) {
+        if (variants == null) {
+            metadata.remove(HttpHeaders.VARY);
+            return this;
+        }
+        String vary = AbstractResponseBuilder.createVaryHeader(variants);
+        metadata.putSingle(HttpHeaders.VARY, vary);
+
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder language(String language) {
+        if (language == null) {
+            metadata.remove(HttpHeaders.CONTENT_LANGUAGE);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.CONTENT_LANGUAGE, language);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder tag(EntityTag tag) {
+        if (tag == null) {
+            metadata.remove(HttpHeaders.ETAG);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.ETAG, tag);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder tag(String tag) {
+        if (tag == null) {
+            metadata.remove(HttpHeaders.ETAG);
+            return this;
+        }
+        return tag(new EntityTag(tag));
+    }
+
+    @Override
+    public Response.ResponseBuilder lastModified(Date lastModified) {
+        if (lastModified == null) {
+            metadata.remove(HttpHeaders.LAST_MODIFIED);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.LAST_MODIFIED, lastModified);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder cacheControl(CacheControl cacheControl) {
+        if (cacheControl == null) {
+            metadata.remove(HttpHeaders.CACHE_CONTROL);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.CACHE_CONTROL, cacheControl);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder header(String name, Object value) {
+        if (value == null) {
+            metadata.remove(name);
+            return this;
+        }
+        metadata.add(name, value);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder cookie(NewCookie... cookies) {
+        if (cookies == null) {
+            metadata.remove(HttpHeaders.SET_COOKIE);
+            return this;
+        }
+        for (NewCookie cookie : cookies) {
+            metadata.add(HttpHeaders.SET_COOKIE, cookie);
+        }
+        return this;
+    }
+
+    public Response.ResponseBuilder language(Locale language) {
+        if (language == null) {
+            metadata.remove(HttpHeaders.CONTENT_LANGUAGE);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.CONTENT_LANGUAGE, language);
+        return this;
+    }
+
+    public Response.ResponseBuilder expires(Date expires) {
+        if (expires == null) {
+            metadata.remove(HttpHeaders.EXPIRES);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.EXPIRES, AbstractResponseBuilder.getDateFormatRFC822().format(expires));
+        return this;
+    }
+
+    public Response.ResponseBuilder allow(String... methods) {
+        if (methods == null) {
+            return allow((Set<String>) null);
+        }
+        HashSet<String> set = new HashSet<>(Arrays.asList(methods));
+        return allow(set);
+    }
+
+    public Response.ResponseBuilder allow(Set<String> methods) {
+        HeaderUtil.setAllow(this.metadata, methods);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder encoding(String encoding) {
+        if (encoding == null) {
+            metadata.remove(HttpHeaders.CONTENT_ENCODING);
+            return this;
+        }
+        metadata.putSingle(HttpHeaders.CONTENT_ENCODING, encoding);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder variants(Variant... variants) {
+        return this.variants(Arrays.asList(variants));
+    }
+
+    @Override
+    public Response.ResponseBuilder links(Link... links) {
+        if (links == null) {
+            metadata.remove(HttpHeaders.LINK);
+            return this;
+        }
+        for (Link link : links) {
+            metadata.add(HttpHeaders.LINK, link);
+        }
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder link(URI uri, String rel) {
+        Link link = Link.fromUri(uri).rel(rel).build();
+        metadata.add(HttpHeaders.LINK, link);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder link(String uri, String rel) {
+        Link link = Link.fromUri(uri).rel(rel).build();
+        metadata.add(HttpHeaders.LINK, link);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder replaceAll(MultivaluedMap<String, Object> headers) {
+        metadata.clear();
+        if (headers == null)
+            return this;
+        metadata.putAll(headers);
+        return this;
+    }
+
+    public MultivaluedMap<String, Object> getMetadata() {
+        return metadata;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java
new file mode 100644
index 0000000000000..ea85e3b2d0615
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ConfigurationImpl.java
@@ -0,0 +1,552 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Priority;
+import javax.ws.rs.ConstrainedTo;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.Produces;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.RxInvokerProvider;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.common.core.UnmanagedBeanFactory;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.common.util.MultivaluedTreeMap;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+import org.jboss.resteasy.reactive.common.util.types.Types;
+
+public class ConfigurationImpl implements Configuration {
+
+    public static final List<MediaType> WILDCARD_LIST = Collections.singletonList(MediaType.WILDCARD_TYPE);
+    public static final List<String> WILDCARD_STRING_LIST = Collections.singletonList(MediaType.WILDCARD);
+    private final RuntimeType runtimeType;
+    private final Map<String, Object> properties;
+    private final Map<Class<?>, Object> allInstances;
+    private final List<Feature> enabledFeatures;
+    private final Map<Class<?>, Map<Class<?>, Integer>> contracts;
+    private final MultivaluedMap<Integer, ClientRequestFilter> requestFilters;
+    private final MultivaluedMap<Integer, ClientResponseFilter> responseFilters;
+    private final MultivaluedMap<Integer, WriterInterceptor> writerInterceptors;
+    private final MultivaluedMap<Integer, ReaderInterceptor> readerInterceptors;
+    private final MultivaluedMap<Class<?>, ResourceWriter> resourceWriters;
+    private final MultivaluedMap<Class<?>, ResourceReader> resourceReaders;
+    private final MultivaluedMap<Class<?>, RxInvokerProvider<?>> rxInvokerProviders;
+
+    public ConfigurationImpl(RuntimeType runtimeType) {
+        this.runtimeType = runtimeType;
+        this.properties = new HashMap<>();
+        this.allInstances = new HashMap<>();
+        this.enabledFeatures = new ArrayList<>();
+        this.contracts = new HashMap<>();
+        this.requestFilters = new MultivaluedTreeMap<>();
+        this.responseFilters = new MultivaluedTreeMap<>(Collections.reverseOrder());
+        this.readerInterceptors = new MultivaluedTreeMap<>();
+        this.writerInterceptors = new MultivaluedTreeMap<>(Collections.reverseOrder());
+        this.resourceReaders = new QuarkusMultivaluedHashMap<>();
+        this.resourceWriters = new QuarkusMultivaluedHashMap<>();
+        this.rxInvokerProviders = new QuarkusMultivaluedHashMap<>();
+    }
+
+    public ConfigurationImpl(Configuration configuration) {
+        this.runtimeType = configuration.getRuntimeType();
+        this.properties = new HashMap<>(configuration.getProperties());
+        if (configuration instanceof ConfigurationImpl) {
+            // we want to preserve all the registration metadata
+            ConfigurationImpl configurationImpl = (ConfigurationImpl) configuration;
+            this.enabledFeatures = new ArrayList<>(configurationImpl.enabledFeatures);
+            this.contracts = new HashMap<>(configurationImpl.contracts);
+            this.allInstances = new HashMap<>(configurationImpl.allInstances);
+            this.requestFilters = new MultivaluedTreeMap<>();
+            this.requestFilters.putAll(configurationImpl.requestFilters);
+            // Spec 6.6 makes client/server response filters reversed
+            this.responseFilters = new MultivaluedTreeMap<>(Collections.reverseOrder());
+            this.responseFilters.putAll(configurationImpl.responseFilters);
+            this.readerInterceptors = new MultivaluedTreeMap<>();
+            this.readerInterceptors.putAll(configurationImpl.readerInterceptors);
+            this.writerInterceptors = new MultivaluedTreeMap<>();
+            this.writerInterceptors.putAll(configurationImpl.writerInterceptors);
+            this.resourceReaders = new QuarkusMultivaluedHashMap<>();
+            this.resourceReaders.putAll(configurationImpl.resourceReaders);
+            this.resourceWriters = new QuarkusMultivaluedHashMap<>();
+            this.resourceWriters.putAll(configurationImpl.resourceWriters);
+            this.rxInvokerProviders = new QuarkusMultivaluedHashMap<>();
+            this.rxInvokerProviders.putAll(configurationImpl.rxInvokerProviders);
+        } else {
+            this.allInstances = new HashMap<>();
+            this.enabledFeatures = new ArrayList<>();
+            this.contracts = new HashMap<>();
+            this.requestFilters = new MultivaluedTreeMap<>();
+            // Spec 6.6 makes client/server response filters reversed
+            this.responseFilters = new MultivaluedTreeMap<>(
+                    Collections.reverseOrder());
+            this.readerInterceptors = new MultivaluedTreeMap<>();
+            this.writerInterceptors = new MultivaluedTreeMap<>();
+            this.resourceReaders = new QuarkusMultivaluedHashMap<>();
+            this.resourceWriters = new QuarkusMultivaluedHashMap<>();
+            this.rxInvokerProviders = new QuarkusMultivaluedHashMap<>();
+            // this is the best we can do - we don't have any of the metadata associated with the registration
+            for (Object i : configuration.getInstances()) {
+                register(i);
+            }
+        }
+    }
+
+    @Override
+    public RuntimeType getRuntimeType() {
+        return runtimeType;
+    }
+
+    @Override
+    public Map<String, Object> getProperties() {
+        return Collections.unmodifiableMap(properties);
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return properties.get(name);
+    }
+
+    @Override
+    public Collection<String> getPropertyNames() {
+        return properties.keySet();
+    }
+
+    @Override
+    public boolean isEnabled(Feature feature) {
+        return enabledFeatures.contains(feature);
+    }
+
+    @Override
+    public boolean isEnabled(Class<? extends Feature> featureClass) {
+        for (Feature enabledFeature : enabledFeatures) {
+            if (enabledFeature.getClass().equals(featureClass)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isRegistered(Object component) {
+        return allInstances.get(component.getClass()) == component;
+    }
+
+    @Override
+    public boolean isRegistered(Class<?> componentClass) {
+        return allInstances.containsKey(componentClass);
+    }
+
+    @Override
+    public Map<Class<?>, Integer> getContracts(Class<?> componentClass) {
+        Map<Class<?>, Integer> componentContracts = contracts.get(componentClass);
+        if (componentContracts == null) {
+            return Collections.emptyMap();
+        }
+        return componentContracts;
+    }
+
+    @Override
+    public Set<Class<?>> getClasses() {
+        return new HashSet<>(allInstances.keySet());
+    }
+
+    @Override
+    public Set<Object> getInstances() {
+        return new HashSet<>(allInstances.values());
+    }
+
+    public void addEnabledFeature(Feature feature) {
+        enabledFeatures.add(feature);
+    }
+
+    public String toString(Object value) {
+        // FIXME: this is weird
+        return value.toString();
+    }
+
+    public void property(String name, Object value) {
+        properties.put(name, value);
+    }
+
+    public void register(Class<?> componentClass) {
+        try {
+            register(componentClass.getDeclaredConstructor().newInstance());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void register(Class<?> componentClass, int priority) {
+        try {
+            register(componentClass.getDeclaredConstructor().newInstance(), priority);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void register(Class<?> componentClass, Class<?>... contracts) {
+        try {
+            register(componentClass.getDeclaredConstructor().newInstance(), contracts);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void register(Object component) {
+        register(component, (Integer) null);
+    }
+
+    private void register(Object component, Integer priority) {
+        if (allInstances.containsKey(component.getClass())) {
+            return;
+        }
+        boolean added = false;
+        List<Class<?>> contractableClasses = new ArrayList<>();
+        if (component instanceof Feature) {
+            contractableClasses.add(Feature.class);
+
+            Feature thisFeature = (Feature) component;
+            added = true;
+            if (thisFeature.configure(new ConfigFeatureContext())) {
+                enabledFeatures.add(thisFeature);
+            }
+        }
+        if (component instanceof ClientRequestFilter) {
+            contractableClasses.add(ClientRequestFilter.class);
+
+            added = true;
+            int effectivePriority = priority != null ? priority : determinePriority(component);
+            requestFilters.add(effectivePriority, (ClientRequestFilter) component);
+        }
+        if (component instanceof ClientResponseFilter) {
+            contractableClasses.add(ClientRequestFilter.class);
+
+            added = true;
+            int effectivePriority = priority != null ? priority : determinePriority(component);
+            responseFilters.add(effectivePriority, (ClientResponseFilter) component);
+        }
+        if (component instanceof WriterInterceptor) {
+            contractableClasses.add(WriterInterceptor.class);
+
+            added = true;
+            int effectivePriority = priority != null ? priority : determinePriority(component);
+            writerInterceptors.add(effectivePriority, (WriterInterceptor) component);
+        }
+        if (component instanceof ReaderInterceptor) {
+            contractableClasses.add(ReaderInterceptor.class);
+
+            added = true;
+            int effectivePriority = priority != null ? priority : determinePriority(component);
+            readerInterceptors.add(effectivePriority, (ReaderInterceptor) component);
+        }
+        if (component instanceof MessageBodyReader) {
+            contractableClasses.add(MessageBodyReader.class);
+
+            added = true;
+            Class<?> componentClass = component.getClass();
+            ConstrainedTo constrainedTo = componentClass.getAnnotation(ConstrainedTo.class);
+            if ((constrainedTo == null) || (constrainedTo.value() == runtimeType)) {
+                ResourceReader resourceReader = new ResourceReader();
+                resourceReader.setFactory(new UnmanagedBeanFactory(component));
+                Consumes consumes = componentClass.getAnnotation(Consumes.class);
+                resourceReader
+                        .setMediaTypeStrings(
+                                consumes != null ? Arrays.asList(consumes.value()) : WILDCARD_STRING_LIST);
+                Type[] args = Types.findParameterizedTypes(componentClass, MessageBodyReader.class);
+                resourceReaders.add(args != null && args.length == 1 ? Types.getRawType(args[0]) : Object.class,
+                        resourceReader);
+            }
+        }
+        if (component instanceof MessageBodyWriter) {
+            contractableClasses.add(MessageBodyWriter.class);
+
+            added = true;
+            Class<?> componentClass = component.getClass();
+            ConstrainedTo constrainedTo = componentClass.getAnnotation(ConstrainedTo.class);
+            if ((constrainedTo == null) || (constrainedTo.value() == runtimeType)) {
+                ResourceWriter resourceWriter = new ResourceWriter();
+                resourceWriter.setFactory(new UnmanagedBeanFactory(component));
+                Produces produces = componentClass.getAnnotation(Produces.class);
+                resourceWriter
+                        .setMediaTypeStrings(
+                                produces != null ? Arrays.asList(produces.value()) : WILDCARD_STRING_LIST);
+                Type[] args = Types.findParameterizedTypes(componentClass, MessageBodyWriter.class);
+                resourceWriters.add(args != null && args.length == 1 ? Types.getRawType(args[0]) : Object.class,
+                        resourceWriter);
+            }
+        }
+        if (component instanceof RxInvokerProvider) {
+            added = true;
+            Class<?> componentClass = component.getClass();
+            Type[] args = Types.findParameterizedTypes(componentClass, RxInvokerProvider.class);
+            rxInvokerProviders.add(args != null && args.length == 1 ? Types.getRawType(args[0]) : Object.class,
+                    (RxInvokerProvider<?>) component);
+        }
+        if (added) {
+            allInstances.put(component.getClass(), component);
+
+            Map<Class<?>, Integer> contracts = new HashMap<>();
+            for (Class<?> contractableClass : contractableClasses) {
+                contracts.put(contractableClass, priority);
+            }
+            this.contracts.put(component.getClass(), contracts);
+        }
+    }
+
+    public void register(Object component, Class<?>[] contracts) {
+        if (contracts == null || contracts.length == 0) {
+            return;
+        }
+        Map<Class<?>, Integer> priorities = new HashMap<>();
+        for (Class<?> i : contracts) {
+            priorities.put(i, determinePriority(i));
+        }
+        register(component, priorities);
+    }
+
+    public void register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+        try {
+            register(componentClass.getDeclaredConstructor().newInstance(), contracts);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void register(Object component, Map<Class<?>, Integer> componentContracts) {
+        if (componentContracts == null || componentContracts.isEmpty()) {
+            return;
+        }
+        Class<?> componentClass = component.getClass();
+        if (allInstances.containsKey(componentClass)) {
+            return;
+        }
+        boolean added = false;
+        Integer priority = componentContracts.get(Feature.class);
+        if (component instanceof Feature && priority != null) {
+            Feature thisFeature = (Feature) component;
+            added = true;
+            if (thisFeature.configure(new ConfigFeatureContext())) {
+                enabledFeatures.add(priority, (Feature) component);
+            }
+        }
+        priority = componentContracts.get(ClientRequestFilter.class);
+        if (component instanceof ClientRequestFilter && priority != null) {
+            added = true;
+            requestFilters.add(priority, (ClientRequestFilter) component);
+        }
+        priority = componentContracts.get(ClientResponseFilter.class);
+        if (component instanceof ClientResponseFilter && priority != null) {
+            added = true;
+            responseFilters.add(priority, (ClientResponseFilter) component);
+        }
+        priority = componentContracts.get(WriterInterceptor.class);
+        if (component instanceof WriterInterceptor && priority != null) {
+            added = true;
+            writerInterceptors.add(priority, (WriterInterceptor) component);
+        }
+        priority = componentContracts.get(ReaderInterceptor.class);
+        if (component instanceof ReaderInterceptor && priority != null) {
+            added = true;
+            readerInterceptors.add(priority, (ReaderInterceptor) component);
+        }
+        priority = componentContracts.get(MessageBodyReader.class);
+        if (component instanceof MessageBodyReader && priority != null) {
+            added = true;
+            ConstrainedTo constrainedTo = componentClass.getAnnotation(ConstrainedTo.class);
+            if ((constrainedTo == null) || (constrainedTo.value() == runtimeType)) {
+                ResourceReader resourceReader = new ResourceReader();
+                resourceReader.setFactory(new UnmanagedBeanFactory(component));
+                Consumes consumes = componentClass.getAnnotation(Consumes.class);
+                resourceReader
+                        .setMediaTypeStrings(
+                                consumes != null ? Arrays.asList(consumes.value()) : WILDCARD_STRING_LIST);
+                Type[] args = Types.findParameterizedTypes(componentClass, MessageBodyReader.class);
+                resourceReaders.add(args != null && args.length == 1 ? Types.getRawType(args[0]) : Object.class,
+                        resourceReader);
+            }
+        }
+        priority = componentContracts.get(MessageBodyWriter.class);
+        if (component instanceof MessageBodyWriter && priority != null) {
+            added = true;
+            ConstrainedTo constrainedTo = componentClass.getAnnotation(ConstrainedTo.class);
+            if ((constrainedTo == null) || (constrainedTo.value() == runtimeType)) {
+                ResourceWriter resourceWriter = new ResourceWriter();
+                resourceWriter.setFactory(new UnmanagedBeanFactory(component));
+                Produces produces = componentClass.getAnnotation(Produces.class);
+                resourceWriter
+                        .setMediaTypeStrings(
+                                produces != null ? Arrays.asList(produces.value()) : WILDCARD_STRING_LIST);
+                Type[] args = Types.findParameterizedTypes(componentClass, MessageBodyWriter.class);
+                resourceWriters.add(args != null && args.length == 1 ? Types.getRawType(args[0]) : Object.class,
+                        resourceWriter);
+            }
+        }
+        if (added) {
+            allInstances.put(componentClass, component);
+            contracts.put(componentClass, componentContracts);
+        }
+
+    }
+
+    public void register(Object component, int priority) {
+        register(component, Integer.valueOf(priority));
+    }
+
+    public List<ClientRequestFilter> getRequestFilters() {
+        if (requestFilters.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<ClientRequestFilter> result = new ArrayList<>(requestFilters.size() * 2);
+        for (List<ClientRequestFilter> requestFilters : requestFilters.values()) {
+            result.addAll(requestFilters);
+        }
+        return result;
+    }
+
+    public List<ClientResponseFilter> getResponseFilters() {
+        if (responseFilters.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<ClientResponseFilter> result = new ArrayList<>(responseFilters.size() * 2);
+        for (List<ClientResponseFilter> responseFilters : responseFilters.values()) {
+            result.addAll(responseFilters);
+        }
+        return result;
+    }
+
+    public List<WriterInterceptor> getWriterInterceptors() {
+        if (writerInterceptors.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<WriterInterceptor> result = new ArrayList<>(writerInterceptors.size() * 2);
+        for (List<WriterInterceptor> writerInterceptors : writerInterceptors.values()) {
+            result.addAll(writerInterceptors);
+        }
+        return result;
+    }
+
+    public List<ReaderInterceptor> getReaderInterceptors() {
+        if (readerInterceptors.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<ReaderInterceptor> result = new ArrayList<>(readerInterceptors.size() * 2);
+        for (List<ReaderInterceptor> readerInterceptors : readerInterceptors.values()) {
+            result.addAll(readerInterceptors);
+        }
+        return result;
+    }
+
+    public RxInvokerProvider<?> getRxInvokerProvider(Class<?> wantedClass) {
+        List<RxInvokerProvider<?>> candidates = rxInvokerProviders.get(wantedClass);
+        if (candidates == null) {
+            return null;
+        }
+        for (RxInvokerProvider<?> invokerProvider : candidates) {
+            if (invokerProvider.isProviderFor(wantedClass))
+                return invokerProvider;
+        }
+        return null;
+    }
+
+    // TODO: we could generate some kind of index at build time in order to obtain these values without using the annotation
+    private int determinePriority(Object object) {
+        return determinePriority(object.getClass());
+    }
+
+    private int determinePriority(Class<?> object) {
+        Priority priority = object.getDeclaredAnnotation(Priority.class);
+        if (priority == null) {
+            return Priorities.USER;
+        }
+        return priority.value();
+    }
+
+    public MultivaluedMap<Class<?>, ResourceReader> getResourceReaders() {
+        return resourceReaders;
+    }
+
+    public MultivaluedMap<Class<?>, ResourceWriter> getResourceWriters() {
+        return resourceWriters;
+    }
+
+    private class ConfigFeatureContext implements FeatureContext {
+        @Override
+        public Configuration getConfiguration() {
+            return ConfigurationImpl.this;
+        }
+
+        @Override
+        public FeatureContext property(String name, Object value) {
+            ConfigurationImpl.this.property(name, value);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Class<?> componentClass) {
+            ConfigurationImpl.this.register(componentClass);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Class<?> componentClass, int priority) {
+            ConfigurationImpl.this.register(componentClass, priority);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Class<?> componentClass, Class<?>... contracts) {
+            ConfigurationImpl.this.register(componentClass, contracts);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+            ConfigurationImpl.this.register(componentClass, contracts);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Object component) {
+            ConfigurationImpl.this.register(component);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Object component, int priority) {
+            ConfigurationImpl.this.register(component, priority);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Object component, Class<?>... contracts) {
+            ConfigurationImpl.this.register(component, contracts);
+            return this;
+        }
+
+        @Override
+        public FeatureContext register(Object component, Map<Class<?>, Integer> contracts) {
+            ConfigurationImpl.this.register(component, contracts);
+            return this;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java
new file mode 100644
index 0000000000000..4947cc46f884b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkBuilderImpl.java
@@ -0,0 +1,133 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriBuilderException;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class LinkBuilderImpl implements Link.Builder {
+    /**
+     * A map for all the link parameters such as "rel", "type", etc.
+     */
+    protected final Map<String, String> map = new HashMap<String, String>();
+    protected UriBuilder uriBuilder;
+    protected URI baseUri;
+
+    @Override
+    public Link.Builder link(Link link) {
+        uriBuilder = UriBuilder.fromUri(link.getUri());
+        this.map.clear();
+        this.map.putAll(link.getParams());
+        return this;
+    }
+
+    @Override
+    public Link.Builder link(String link) {
+        Link l = LinkImpl.valueOf(link);
+        return link(l);
+    }
+
+    @Override
+    public Link.Builder uriBuilder(UriBuilder uriBuilder) {
+        this.uriBuilder = uriBuilder.clone();
+        return this;
+    }
+
+    @Override
+    public Link.Builder uri(URI uri) {
+        if (uri == null)
+            throw new IllegalArgumentException("URI was null");
+        uriBuilder = UriBuilder.fromUri(uri);
+        return this;
+    }
+
+    @Override
+    public Link.Builder uri(String uri) throws IllegalArgumentException {
+        if (uri == null)
+            throw new IllegalArgumentException("URI was null");
+        uriBuilder = UriBuilder.fromUri(uri);
+        return this;
+    }
+
+    @Override
+    public Link.Builder rel(String rel) {
+        if (rel == null)
+            throw new IllegalArgumentException("param was null");
+        final String rels = this.map.get(Link.REL);
+        param(Link.REL, rels == null ? rel : rels + " " + rel);
+        return this;
+    }
+
+    @Override
+    public Link.Builder title(String title) {
+        if (title == null)
+            throw new IllegalArgumentException("param was null");
+        param(Link.TITLE, title);
+        return this;
+
+    }
+
+    @Override
+    public Link.Builder type(String type) {
+        if (type == null)
+            throw new IllegalArgumentException("param was null");
+        param(Link.TYPE, type);
+        return this;
+    }
+
+    @Override
+    public Link.Builder param(String name, String value) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("param was null");
+        if (value == null)
+            throw new IllegalArgumentException("param was null");
+        this.map.put(name, value);
+        return this;
+    }
+
+    @Override
+    public Link build(Object... values) throws UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("param was null");
+        URI built = null;
+        if (uriBuilder == null) {
+            built = baseUri;
+        } else {
+            built = this.uriBuilder.build(values);
+        }
+        if (!built.isAbsolute() && baseUri != null) {
+            built = baseUri.resolve(built);
+        }
+        return new LinkImpl(built, this.map);
+    }
+
+    @Override
+    public Link buildRelativized(URI uri, Object... values) {
+        if (uri == null)
+            throw new IllegalArgumentException("URI was null");
+        if (values == null)
+            throw new IllegalArgumentException("values was null");
+        URI built = uriBuilder.build(values);
+        URI with = built;
+        if (baseUri != null)
+            with = baseUri.resolve(built);
+        return new LinkImpl(uri.relativize(with), this.map);
+    }
+
+    @Override
+    public Link.Builder baseUri(URI uri) {
+        this.baseUri = uri;
+        return this;
+    }
+
+    @Override
+    public Link.Builder baseUri(String uri) {
+        this.baseUri = URI.create(uri);
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java
new file mode 100644
index 0000000000000..b62edfd47187d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/LinkImpl.java
@@ -0,0 +1,99 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class LinkImpl extends Link {
+    protected final URI uri;
+
+    /**
+     * A map for all the link parameters such as "rel", "type", etc.
+     */
+    protected final Map<String, String> map;
+
+    protected static final RuntimeDelegate.HeaderDelegate<Link> delegate = RuntimeDelegate.getInstance()
+            .createHeaderDelegate(Link.class);
+
+    public static Link valueOf(String value) {
+        return delegate.fromString(value);
+    }
+
+    LinkImpl(final URI uri, final Map<String, String> map) {
+        this.uri = uri;
+        this.map = map.isEmpty() ? Collections.<String, String> emptyMap()
+                : Collections
+                        .unmodifiableMap(new HashMap<String, String>(map));
+    }
+
+    @Override
+    public URI getUri() {
+        return uri;
+    }
+
+    @Override
+    public UriBuilder getUriBuilder() {
+        return UriBuilder.fromUri(uri);
+    }
+
+    @Override
+    public String getRel() {
+        return map.get(REL);
+    }
+
+    @Override
+    public List<String> getRels() {
+        final String rels = map.get(REL);
+        return rels == null ? Collections.<String> emptyList() : Arrays.asList(rels.split(" +"));
+    }
+
+    @Override
+    public String getTitle() {
+        return map.get(TITLE);
+    }
+
+    @Override
+    public String getType() {
+        return map.get(TYPE);
+    }
+
+    @Override
+    public Map<String, String> getParams() {
+        return map;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other instanceof LinkImpl) {
+            final LinkImpl otherLink = (LinkImpl) other;
+            return uri.equals(otherLink.uri) && map.equals(otherLink.map);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 89 * hash + (this.uri != null ? this.uri.hashCode() : 0);
+        hash = 89 * hash + (this.map != null ? this.map.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return delegate.toString(this);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java
new file mode 100644
index 0000000000000..858606fac2cf4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/ResponseImpl.java
@@ -0,0 +1,311 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.Link.Builder;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.headers.LinkHeaders;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+
+/**
+ * This is the Response class for user-created responses. The client response
+ * object has more deserialising powers in @{link {@link io.quarkus.rest.server.runtime.client.QuarkusRestClientResponse}.
+ */
+@SuppressWarnings("JavadocReference")
+public class ResponseImpl extends Response {
+
+    int status;
+    String reasonPhrase;
+    protected Object entity;
+    MultivaluedMap<String, Object> headers;
+    InputStream entityStream;
+    private StatusTypeImpl statusType;
+    private MultivaluedMap<String, String> stringHeaders;
+    Annotation[] entityAnnotations;
+    protected boolean consumed;
+    protected boolean closed;
+    protected boolean buffered;
+
+    @Override
+    public int getStatus() {
+        return status;
+    }
+
+    /**
+     * Internal: this is just cheaper than duplicating the response just to change the status
+     */
+    public void setStatus(int status) {
+        this.status = status;
+        statusType = null;
+    }
+
+    @Override
+    public StatusType getStatusInfo() {
+        if (statusType == null) {
+            statusType = new StatusTypeImpl(status, reasonPhrase);
+        }
+        return statusType;
+    }
+
+    /**
+     * Internal: this is just cheaper than duplicating the response just to change the status
+     */
+    public void setStatusInfo(StatusType statusType) {
+        this.statusType = StatusTypeImpl.valueOf(statusType);
+        status = statusType.getStatusCode();
+    }
+
+    @Override
+    public Object getEntity() {
+        // The spec says that getEntity() can be called after readEntity() to obtain the same entity,
+        // but it also sort-of implies that readEntity() calls Response.close(), and the TCK does check
+        // that we throw if closed and non-buffered
+        checkClosed();
+        // this check seems very ugly, but it seems to be needed by the TCK
+        // this will likely require a better solution
+        if (entity instanceof GenericEntity) {
+            GenericEntity<?> genericEntity = (GenericEntity<?>) entity;
+            if (genericEntity.getRawType().equals(genericEntity.getType())) {
+                return ((GenericEntity<?>) entity).getEntity();
+            }
+        }
+        return entity;
+    }
+
+    protected void setEntity(Object entity) {
+        this.entity = entity;
+        if (entity instanceof InputStream) {
+            this.entityStream = (InputStream) entity;
+        }
+    }
+
+    public InputStream getEntityStream() {
+        return entityStream;
+    }
+
+    public void setEntityStream(InputStream entityStream) {
+        this.entityStream = entityStream;
+    }
+
+    protected <T> T readEntity(Class<T> entityType, Type genericType, Annotation[] annotations) {
+        // TODO: we probably need better state handling
+        if (entity != null && entityType.isInstance(entity)) {
+            // Note that this works if entityType is InputStream where we return it without closing it, as per spec
+            return (T) entity;
+        }
+        checkClosed();
+        // Spec says to throw this
+        throw new ProcessingException(
+                "Request could not be mapped to type " + (genericType != null ? genericType : entityType));
+    }
+
+    @Override
+    public <T> T readEntity(Class<T> entityType) {
+        return readEntity(entityType, entityType, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T readEntity(GenericType<T> entityType) {
+        return (T) readEntity(entityType.getRawType(), entityType.getType(), null);
+    }
+
+    @Override
+    public <T> T readEntity(Class<T> entityType, Annotation[] annotations) {
+        return readEntity(entityType, entityType, annotations);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T readEntity(GenericType<T> entityType, Annotation[] annotations) {
+        return (T) readEntity(entityType.getRawType(), entityType.getType(), annotations);
+    }
+
+    @Override
+    public boolean hasEntity() {
+        // The TCK checks that
+        checkClosed();
+        // we have an entity already read, or still to be read
+        return entity != null || entityStream != null;
+    }
+
+    @Override
+    public boolean bufferEntity() {
+        checkClosed();
+        // must be idempotent
+        if (buffered) {
+            return true;
+        }
+        if (entityStream != null && !consumed) {
+            // let's not try this again, even if it fails
+            consumed = true;
+            // we're supposed to read the entire stream, but if we can rewind it there's no point so let's keep it
+            if (!entityStream.markSupported()) {
+                ByteArrayOutputStream os = new ByteArrayOutputStream();
+                byte[] buffer = new byte[4096];
+                int read;
+                try {
+                    while ((read = entityStream.read(buffer)) != -1) {
+                        os.write(buffer, 0, read);
+                    }
+                    entityStream.close();
+                } catch (IOException x) {
+                    throw new UncheckedIOException(x);
+                }
+                entityStream = new ByteArrayInputStream(os.toByteArray());
+            }
+            buffered = true;
+            return true;
+        }
+        return false;
+    }
+
+    protected void checkClosed() {
+        // apparently the TCK says that buffered responses don't care about being closed
+        if (closed && !buffered)
+            throw new IllegalStateException("Response has been closed");
+    }
+
+    @Override
+    public void close() {
+        if (!closed) {
+            closed = true;
+            if (entityStream != null) {
+                try {
+                    entityStream.close();
+                } catch (IOException e) {
+                    throw new ProcessingException(e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return HeaderUtil.getMediaType(headers);
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return HeaderUtil.getLanguage(headers);
+    }
+
+    @Override
+    public int getLength() {
+        return HeaderUtil.getLength(headers);
+    }
+
+    @Override
+    public Set<String> getAllowedMethods() {
+        return HeaderUtil.getAllowedMethods(headers);
+    }
+
+    @Override
+    public Map<String, NewCookie> getCookies() {
+        return HeaderUtil.getNewCookies(headers);
+    }
+
+    @Override
+    public EntityTag getEntityTag() {
+        return HeaderUtil.getEntityTag(headers);
+    }
+
+    @Override
+    public Date getDate() {
+        return HeaderUtil.getDate(headers);
+    }
+
+    @Override
+    public Date getLastModified() {
+        return HeaderUtil.getLastModified(headers);
+    }
+
+    @Override
+    public URI getLocation() {
+        return HeaderUtil.getLocation(headers);
+    }
+
+    private LinkHeaders getLinkHeaders() {
+        return new LinkHeaders(headers);
+    }
+
+    @Override
+    public Set<Link> getLinks() {
+        return new HashSet<>(getLinkHeaders().getLinks());
+    }
+
+    @Override
+    public boolean hasLink(String relation) {
+        return getLinkHeaders().getLinkByRelationship(relation) != null;
+    }
+
+    @Override
+    public Link getLink(String relation) {
+        return getLinkHeaders().getLinkByRelationship(relation);
+    }
+
+    @Override
+    public Builder getLinkBuilder(String relation) {
+        Link link = getLinkHeaders().getLinkByRelationship(relation);
+        if (link == null) {
+            return null;
+        }
+        return Link.fromLink(link);
+    }
+
+    @Override
+    public MultivaluedMap<String, Object> getMetadata() {
+        return headers;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getStringHeaders() {
+        // FIXME: is this mutable?
+        if (stringHeaders == null) {
+            // let's keep this map case-insensitive
+            stringHeaders = new CaseInsensitiveMap<>();
+            for (Entry<String, List<Object>> entry : headers.entrySet()) {
+                List<String> stringValues = new ArrayList<>(entry.getValue().size());
+                for (Object value : entry.getValue()) {
+                    stringValues.add(HeaderUtil.headerToString(value));
+                }
+                stringHeaders.put(entry.getKey(), stringValues);
+            }
+        }
+
+        return stringHeaders;
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return HeaderUtil.getHeaderString(getStringHeaders(), name);
+    }
+
+    public Annotation[] getEntityAnnotations() {
+        return entityAnnotations;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java
new file mode 100644
index 0000000000000..4207e59b8310a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/RuntimeDelegateImpl.java
@@ -0,0 +1,105 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.util.Date;
+import java.util.Locale;
+import java.util.ServiceLoader;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.Variant;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory;
+import org.jboss.resteasy.reactive.common.headers.CacheControlDelegate;
+import org.jboss.resteasy.reactive.common.headers.CookieHeaderDelegate;
+import org.jboss.resteasy.reactive.common.headers.DateDelegate;
+import org.jboss.resteasy.reactive.common.headers.EntityTagDelegate;
+import org.jboss.resteasy.reactive.common.headers.LinkDelegate;
+import org.jboss.resteasy.reactive.common.headers.LocaleDelegate;
+import org.jboss.resteasy.reactive.common.headers.MediaTypeHeaderDelegate;
+import org.jboss.resteasy.reactive.common.headers.NewCookieHeaderDelegate;
+import org.jboss.resteasy.reactive.common.headers.ObjectToStringDelegate;
+
+public class RuntimeDelegateImpl extends RuntimeDelegate {
+
+    static final ResponseBuilderFactory factory;
+
+    static {
+        ResponseBuilderFactory result = new ResponseBuilderFactory() {
+            @Override
+            public Response.ResponseBuilder create() {
+                throw new RuntimeException("Resteasy Reactive server side components are not installed.");
+            }
+
+            @Override
+            public int priority() {
+                return 0;
+            }
+        };
+        ServiceLoader<ResponseBuilderFactory> sl = ServiceLoader.load(ResponseBuilderFactory.class,
+                RuntimeDelegateImpl.class.getClassLoader());
+        for (ResponseBuilderFactory i : sl) {
+            if (result.priority() < i.priority()) {
+                result = i;
+            }
+        }
+        factory = result;
+    }
+
+    @Override
+    public UriBuilder createUriBuilder() {
+        return new UriBuilderImpl();
+    }
+
+    @Override
+    public Response.ResponseBuilder createResponseBuilder() {
+        return factory.create();
+    }
+
+    @Override
+    public Variant.VariantListBuilder createVariantListBuilder() {
+        return new VariantListBuilderImpl();
+    }
+
+    @Override
+    public <T> T createEndpoint(Application application, Class<T> endpointType)
+            throws IllegalArgumentException, UnsupportedOperationException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> HeaderDelegate<T> createHeaderDelegate(Class<T> type) throws IllegalArgumentException {
+        if (type == null) {
+            throw new IllegalArgumentException("type cannot be null");
+        }
+        if (type.equals(MediaType.class)) {
+            return (HeaderDelegate<T>) MediaTypeHeaderDelegate.INSTANCE;
+        } else if (type.equals(Date.class)) {
+            return (HeaderDelegate<T>) DateDelegate.INSTANCE;
+        } else if (type.equals(CacheControl.class)) {
+            return (HeaderDelegate<T>) CacheControlDelegate.INSTANCE;
+        } else if (type.equals(NewCookie.class)) {
+            return (HeaderDelegate<T>) NewCookieHeaderDelegate.INSTANCE;
+        } else if (type.equals(Cookie.class)) {
+            return (HeaderDelegate<T>) CookieHeaderDelegate.INSTANCE;
+        } else if (type.equals(EntityTag.class)) {
+            return (HeaderDelegate<T>) EntityTagDelegate.INSTANCE;
+        } else if (type.equals(Locale.class)) {
+            return (HeaderDelegate<T>) LocaleDelegate.INSTANCE;
+        } else if (type.equals(Link.class)) {
+            return (HeaderDelegate<T>) LinkDelegate.INSTANCE;
+        } else {
+            return (HeaderDelegate<T>) ObjectToStringDelegate.INSTANCE;
+        }
+    }
+
+    @Override
+    public Link.Builder createLinkBuilder() {
+        return new LinkBuilderImpl();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java
new file mode 100644
index 0000000000000..9e383f1e3da39
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/StatusTypeImpl.java
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status.Family;
+import javax.ws.rs.core.Response.StatusType;
+
+public class StatusTypeImpl implements StatusType {
+
+    public static final String DEFAULT_REASON_PHRASE = "Unknown code"; // needed to avoid NPE in the TCK
+
+    private final String reasonPhrase;
+    private final int status;
+
+    public StatusTypeImpl(int status, String reasonPhrase) {
+        this.status = status;
+        this.reasonPhrase = reasonPhrase != null ? reasonPhrase : DEFAULT_REASON_PHRASE;
+    }
+
+    @Override
+    public int getStatusCode() {
+        return status;
+    }
+
+    @Override
+    public Family getFamily() {
+        return Response.Status.Family.familyOf(status);
+    }
+
+    @Override
+    public String getReasonPhrase() {
+        return reasonPhrase;
+    }
+
+    public static StatusTypeImpl valueOf(StatusType statusType) {
+        if (statusType instanceof StatusTypeImpl)
+            return (StatusTypeImpl) statusType;
+        return new StatusTypeImpl(statusType.getStatusCode(), statusType.getReasonPhrase());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java
new file mode 100644
index 0000000000000..2883d861ab424
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/UriBuilderImpl.java
@@ -0,0 +1,1070 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriBuilderException;
+import javax.ws.rs.ext.RuntimeDelegate;
+import org.jboss.resteasy.reactive.common.util.Encode;
+import org.jboss.resteasy.reactive.common.util.PathHelper;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class UriBuilderImpl extends UriBuilder {
+
+    private static final class URITemplateParametersMap extends HashMap<String, Object> {
+
+        private final Object[] parameterValues;
+        private int index;
+
+        private URITemplateParametersMap(final Object... parameterValues) {
+            this.parameterValues = parameterValues;
+        }
+
+        public Object get(Object key) {
+            Object object = null;
+            if (!super.containsKey(key) && this.index != this.parameterValues.length) {
+                object = this.parameterValues[this.index++];
+                super.put((String) key, object);
+            } else {
+                object = super.get(key);
+            }
+            return object;
+        }
+
+        public boolean containsKey(Object key) {
+            boolean containsKey = super.containsKey(key);
+            if (!containsKey && this.index != this.parameterValues.length) {
+                super.put((String) key, this.parameterValues[this.index++]);
+                containsKey = true;
+            }
+            return containsKey;
+        }
+
+    }
+
+    private String host;
+    private String scheme;
+    private int port = -1;
+
+    private String userInfo;
+    private String path;
+    private String query;
+    private String fragment;
+    private String ssp;
+    private String authority;
+
+    public UriBuilder clone() {
+        UriBuilderImpl impl = new UriBuilderImpl();
+        impl.host = host;
+        impl.scheme = scheme;
+        impl.port = port;
+        impl.userInfo = userInfo;
+        impl.path = path;
+        impl.query = query;
+        impl.fragment = fragment;
+        impl.ssp = ssp;
+        impl.authority = authority;
+
+        return impl;
+    }
+
+    public static final Pattern opaqueUri = Pattern.compile("^([^:/?#{]+):([^/].*)");
+    public static final Pattern hierarchicalUri = Pattern
+            .compile("^(([^:/?#{]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?");
+
+    public static boolean compare(String s1, String s2) {
+        if (s1 == s2)
+            return true;
+        if (s1 == null || s2 == null)
+            return false;
+        return s1.equals(s2);
+    }
+
+    public static URI relativize(URI from, URI to) {
+        if (!compare(from.getScheme(), to.getScheme()))
+            return to;
+        if (!compare(from.getHost(), to.getHost()))
+            return to;
+        if (from.getPort() != to.getPort())
+            return to;
+        if (from.getPath() == null && to.getPath() == null)
+            return URI.create("");
+        else if (from.getPath() == null)
+            return URI.create(to.getPath());
+        else if (to.getPath() == null)
+            return to;
+
+        String fromPath = from.getPath();
+        if (fromPath.startsWith("/"))
+            fromPath = fromPath.substring(1);
+        String[] fsplit = fromPath.split("/");
+        String toPath = to.getPath();
+        if (toPath.startsWith("/"))
+            toPath = toPath.substring(1);
+        String[] tsplit = toPath.split("/");
+
+        int f = 0;
+
+        for (; f < fsplit.length && f < tsplit.length; f++) {
+            if (!fsplit[f].equals(tsplit[f]))
+                break;
+        }
+
+        UriBuilder builder = UriBuilder.fromPath("");
+        for (int i = f; i < fsplit.length; i++)
+            builder.path("..");
+        for (int i = f; i < tsplit.length; i++)
+            builder.path(tsplit[i]);
+        return builder.build();
+    }
+
+    /**
+     * You may put path parameters anywhere within the uriTemplate except port.
+     *
+     * @param uriTemplate uri template
+     * @return uri builder
+     */
+    public static UriBuilderImpl fromTemplate(String uriTemplate) {
+        UriBuilderImpl impl = (UriBuilderImpl) RuntimeDelegate.getInstance().createUriBuilder();
+        impl.uriTemplate(uriTemplate);
+        return impl;
+    }
+
+    private static final Pattern hostPortPattern = Pattern.compile("([^/:]+):(\\d+)");
+    private static final Pattern squareHostBrackets = Pattern
+            .compile("(\\[(([0-9A-Fa-f]{0,4}:){2,7})([0-9A-Fa-f]{0,4})%?.*\\]):(\\d+)");
+
+    /**
+     * You may put path parameters anywhere within the uriTemplate except port.
+     *
+     * @param uriTemplate uri template
+     * @return uri builder
+     */
+    public UriBuilder uriTemplate(CharSequence uriTemplate) {
+        if (uriTemplate == null)
+            throw new IllegalArgumentException("Param was null");
+        Matcher opaque = opaqueUri.matcher(uriTemplate);
+        if (opaque.matches()) {
+            this.authority = null;
+            this.host = null;
+            this.port = -1;
+            this.userInfo = null;
+            this.query = null;
+            this.scheme = opaque.group(1);
+            this.ssp = opaque.group(2);
+            return this;
+        } else {
+            Matcher match = hierarchicalUri.matcher(uriTemplate);
+            if (match.matches()) {
+                ssp = null;
+                return parseHierarchicalUri(uriTemplate, match);
+            }
+        }
+        throw new IllegalArgumentException("Illegal URI template" + uriTemplate);
+    }
+
+    protected UriBuilder parseHierarchicalUri(CharSequence uriTemplate, Matcher match) {
+        boolean scheme = match.group(2) != null;
+        if (scheme)
+            this.scheme = match.group(2);
+        String authority = match.group(4);
+        if (authority != null) {
+            this.authority = null;
+            String host = match.group(4);
+            int at = host.indexOf('@');
+            if (at > -1) {
+                String user = host.substring(0, at);
+                host = host.substring(at + 1);
+                this.userInfo = user;
+            }
+
+            Matcher hostPortMatch = hostPortPattern.matcher(host);
+            if (hostPortMatch.matches()) {
+                this.host = hostPortMatch.group(1);
+                try {
+                    this.port = Integer.parseInt(hostPortMatch.group(2));
+                } catch (NumberFormatException e) {
+                    throw new IllegalArgumentException("Illegal URI template" + uriTemplate, e);
+                }
+            } else {
+                if (host.startsWith("[")) {
+                    // Must support an IPv6 hostname of format "[::1]" or [0:0:0:0:0:0:0:0]
+                    // and IPv6 link-local format [fe80::1234%1] [ff08::9abc%interface10]
+                    Matcher bracketsMatch = squareHostBrackets.matcher(host);
+                    if (bracketsMatch.matches()) {
+                        host = bracketsMatch.group(1);
+                        try {
+                            this.port = Integer.parseInt(bracketsMatch.group(5));
+                        } catch (NumberFormatException e) {
+                            throw new IllegalArgumentException("Illegal URI template" + uriTemplate, e);
+                        }
+                    }
+                }
+                this.host = host;
+            }
+        }
+        if (match.group(5) != null) {
+            String group = match.group(5);
+            if (!scheme && !"".equals(group) && !group.startsWith("/") && group.indexOf(':') > -1 &&
+                    group.indexOf('/') > -1 && group.indexOf(':') < group.indexOf('/'))
+                throw new IllegalArgumentException("Illegal URI template" + uriTemplate);
+            if (!"".equals(group))
+                replacePath(group);
+        }
+        if (match.group(7) != null)
+            replaceQuery(match.group(7));
+        if (match.group(9) != null)
+            fragment(match.group(9));
+        return this;
+    }
+
+    public UriBuilder uri(String uriTemplate) throws IllegalArgumentException {
+        return uriTemplate(uriTemplate);
+    }
+
+    public UriBuilder uriFromCharSequence(CharSequence uriTemplate) throws IllegalArgumentException {
+        return uriTemplate(uriTemplate);
+    }
+
+    public UriBuilder uri(URI uri) throws IllegalArgumentException {
+        if (uri == null)
+            throw new IllegalArgumentException("URI is null");
+
+        if (uri.getRawFragment() != null)
+            fragment = uri.getRawFragment();
+
+        if (uri.isOpaque()) {
+            scheme = uri.getScheme();
+            ssp = uri.getRawSchemeSpecificPart();
+            return this;
+        }
+
+        if (uri.getScheme() == null) {
+            if (ssp != null) {
+                if (uri.getRawSchemeSpecificPart() != null) {
+                    ssp = uri.getRawSchemeSpecificPart();
+                    return this;
+                }
+            }
+        } else {
+            scheme = uri.getScheme();
+        }
+
+        ssp = null;
+        if (uri.getRawAuthority() != null) {
+            if (uri.getRawUserInfo() == null && uri.getHost() == null && uri.getPort() == -1) {
+                authority = uri.getRawAuthority();
+                userInfo = null;
+                host = null;
+                port = -1;
+            } else {
+                authority = null;
+                if (uri.getRawUserInfo() != null) {
+                    userInfo = uri.getRawUserInfo();
+                }
+                if (uri.getHost() != null) {
+                    host = uri.getHost();
+                }
+                if (uri.getPort() != -1) {
+                    port = uri.getPort();
+                }
+            }
+        }
+
+        if (uri.getRawPath() != null && uri.getRawPath().length() > 0) {
+            path = uri.getRawPath();
+        }
+        if (uri.getRawQuery() != null && uri.getRawQuery().length() > 0) {
+            query = uri.getRawQuery();
+        }
+
+        return this;
+    }
+
+    public UriBuilder scheme(String scheme) throws IllegalArgumentException {
+        this.scheme = scheme;
+        return this;
+    }
+
+    public UriBuilder schemeSpecificPart(String ssp) throws IllegalArgumentException {
+        if (ssp == null)
+            throw new IllegalArgumentException("Scheme was null");
+
+        StringBuilder sb = new StringBuilder();
+        if (scheme != null)
+            sb.append(scheme).append(':');
+        if (ssp != null)
+            sb.append(ssp);
+        if (fragment != null && fragment.length() > 0)
+            sb.append('#').append(fragment);
+        URI uri = URI.create(sb.toString());
+
+        if (uri.getRawSchemeSpecificPart() != null && uri.getRawPath() == null) {
+            this.ssp = uri.getRawSchemeSpecificPart();
+        } else {
+            this.ssp = null;
+            userInfo = uri.getRawUserInfo();
+            host = uri.getHost();
+            port = uri.getPort();
+            path = uri.getRawPath();
+            query = uri.getRawQuery();
+
+        }
+        return this;
+
+    }
+
+    public UriBuilder userInfo(String ui) {
+        this.userInfo = ui;
+        return this;
+    }
+
+    public UriBuilder host(String host) throws IllegalArgumentException {
+        if (host != null && host.equals(""))
+            throw new IllegalArgumentException("invalid host");
+        this.host = host;
+        return this;
+    }
+
+    public UriBuilder port(int port) throws IllegalArgumentException {
+        if (port < -1)
+            throw new IllegalArgumentException("invalid port");
+        this.port = port;
+        return this;
+    }
+
+    protected static String paths(boolean encode, String basePath, String... segments) {
+        String path = basePath;
+        if (path == null)
+            path = "";
+        for (String segment : segments) {
+            if ("".equals(segment))
+                continue;
+            if (path.endsWith("/")) {
+                if (segment.startsWith("/")) {
+                    segment = segment.substring(1);
+                    if ("".equals(segment))
+                        continue;
+                }
+                if (encode)
+                    segment = Encode.encodePath(segment);
+                path += segment;
+            } else {
+                if (encode)
+                    segment = Encode.encodePath(segment);
+                if ("".equals(path)) {
+                    path = segment;
+                } else if (segment.startsWith("/")) {
+                    path += segment;
+                } else {
+                    path += "/" + segment;
+                }
+            }
+
+        }
+        return path;
+    }
+
+    public UriBuilder path(String segment) throws IllegalArgumentException {
+        if (segment == null)
+            throw new IllegalArgumentException("path is null");
+        path = paths(true, path, segment);
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public UriBuilder path(Class resource) throws IllegalArgumentException {
+        if (resource == null)
+            throw new IllegalArgumentException("path is null");
+        Path ann = (Path) resource.getAnnotation(Path.class);
+        if (ann != null) {
+            String[] segments = new String[] { ann.value() };
+            path = paths(true, path, segments);
+        } else {
+            throw new IllegalArgumentException("class must be annotated with @Path");
+        }
+        return this;
+    }
+
+    public UriBuilder path(Class resource, String method) throws IllegalArgumentException {
+        if (resource == null)
+            throw new IllegalArgumentException("resource is null");
+        if (method == null)
+            throw new IllegalArgumentException("method is null");
+        Method theMethod = null;
+        for (Method m : resource.getMethods()) {
+            if (m.getName().equals(method)) {
+                if (theMethod != null && m.isAnnotationPresent(Path.class)) {
+                    throw new IllegalArgumentException("Two methods with the same path " + method);
+                }
+                if (m.isAnnotationPresent(Path.class))
+                    theMethod = m;
+            }
+        }
+        if (theMethod == null)
+            throw new IllegalArgumentException("No public method annotated with @Path " + resource.getName() + " " + method);
+        return path(theMethod);
+    }
+
+    public UriBuilder path(Method method) throws IllegalArgumentException {
+        if (method == null) {
+            throw new IllegalArgumentException("method is null");
+        }
+        Path ann = method.getAnnotation(Path.class);
+        if (ann != null) {
+            path = paths(true, path, ann.value());
+        } else {
+            throw new IllegalArgumentException("Method not annotated with @Path");
+        }
+        return this;
+    }
+
+    public UriBuilder replaceMatrix(String matrix) throws IllegalArgumentException {
+        if (matrix == null)
+            matrix = "";
+        if (!matrix.startsWith(";"))
+            matrix = ";" + matrix;
+        matrix = Encode.encodePath(matrix);
+        if (path == null) {
+            path = matrix;
+        } else {
+            int start = path.lastIndexOf('/');
+            if (start < 0)
+                start = 0;
+            int matrixIndex = path.indexOf(';', start);
+            if (matrixIndex > -1)
+                path = path.substring(0, matrixIndex) + matrix;
+            else
+                path += matrix;
+
+        }
+        return this;
+    }
+
+    public UriBuilder replaceQuery(String query) throws IllegalArgumentException {
+        if (query == null || query.length() == 0) {
+            this.query = null;
+            return this;
+        }
+        this.query = Encode.encodeQueryString(query);
+        return this;
+    }
+
+    public UriBuilder fragment(String fragment) throws IllegalArgumentException {
+        if (fragment == null) {
+            this.fragment = null;
+            return this;
+        }
+        this.fragment = Encode.encodeFragment(fragment);
+        return this;
+    }
+
+    /**
+     * Only replace path params in path of URI. This changes state of URIBuilder.
+     *
+     * @param name parameter name
+     * @param value parameter value
+     * @param isEncoded encoded flag
+     * @return uri builder
+     */
+    public UriBuilder substitutePathParam(String name, Object value, boolean isEncoded) {
+        if (path != null) {
+            StringBuilder builder = new StringBuilder();
+            replacePathParameter(name, value.toString(), isEncoded, path, builder, false);
+            path = builder.toString();
+        }
+        return this;
+    }
+
+    public URI buildFromMap(Map<String, ? extends Object> values) throws IllegalArgumentException, UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        return buildUriFromMap(values, false, true);
+    }
+
+    public URI buildFromEncodedMap(Map<String, ? extends Object> values) throws IllegalArgumentException, UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        return buildUriFromMap(values, true, false);
+    }
+
+    public URI buildFromMap(Map<String, ?> values, boolean encodeSlashInPath)
+            throws IllegalArgumentException, UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        return buildUriFromMap(values, false, encodeSlashInPath);
+    }
+
+    protected URI buildUriFromMap(Map<String, ? extends Object> paramMap, boolean fromEncodedMap, boolean encodeSlash)
+            throws IllegalArgumentException, UriBuilderException {
+        String buf = buildString(paramMap, fromEncodedMap, false, encodeSlash);
+        try {
+            return URI.create(buf);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to create URI", e);
+        }
+    }
+
+    private String buildString(Map<String, ? extends Object> paramMap, boolean fromEncodedMap, boolean isTemplate,
+            boolean encodeSlash) {
+        return buildCharSequence(paramMap, fromEncodedMap, isTemplate, encodeSlash).toString();
+    }
+
+    private CharSequence buildCharSequence(Map<String, ? extends Object> paramMap, boolean fromEncodedMap, boolean isTemplate,
+            boolean encodeSlash) {
+        StringBuilder builder = new StringBuilder();
+
+        if (scheme != null)
+            replaceParameter(paramMap, fromEncodedMap, isTemplate, scheme, builder, encodeSlash).append(":");
+        if (ssp != null) {
+            builder.append(ssp);
+        } else if (userInfo != null || host != null || port != -1) {
+            builder.append("//");
+            if (userInfo != null)
+                replaceParameter(paramMap, fromEncodedMap, isTemplate, userInfo, builder, encodeSlash).append("@");
+            if (host != null) {
+                if ("".equals(host))
+                    throw new UriBuilderException("empty host");
+                replaceParameter(paramMap, fromEncodedMap, isTemplate, host, builder, encodeSlash);
+            }
+            if (port != -1)
+                builder.append(":").append(Integer.toString(port));
+        } else if (authority != null) {
+            builder.append("//");
+            replaceParameter(paramMap, fromEncodedMap, isTemplate, authority, builder, encodeSlash);
+        }
+        if (path != null) {
+            StringBuilder tmp = new StringBuilder();
+            replaceParameter(paramMap, fromEncodedMap, isTemplate, path, tmp, encodeSlash);
+            if (userInfo != null || host != null) {
+                if (tmp.length() > 0 && tmp.charAt(0) != '/')
+                    builder.append("/");
+            }
+            builder.append(tmp);
+        }
+        if (query != null) {
+            builder.append("?");
+            replaceQueryStringParameter(paramMap, fromEncodedMap, isTemplate, query, builder);
+        }
+        if (fragment != null) {
+            builder.append("#");
+            replaceParameter(paramMap, fromEncodedMap, isTemplate, fragment, builder, encodeSlash);
+        }
+        return builder;
+    }
+
+    protected StringBuilder replacePathParameter(String name, String value, boolean isEncoded, String string,
+            StringBuilder builder, boolean encodeSlash) {
+        if (string.indexOf('{') == -1) {
+            return builder.append(string);
+        }
+        Matcher matcher = createUriParamMatcher(string);
+        int start = 0;
+        while (matcher.find()) {
+            String param = matcher.group(1);
+            if (!param.equals(name))
+                continue;
+            builder.append(string, start, matcher.start());
+            if (!isEncoded) {
+                if (encodeSlash)
+                    value = Encode.encodePath(value);
+                else
+                    value = Encode.encodePathSegment(value);
+
+            } else {
+                value = Encode.encodeNonCodes(value);
+            }
+            builder.append(value);
+            start = matcher.end();
+        }
+        builder.append(string, start, string.length());
+        return builder;
+    }
+
+    public static Matcher createUriParamMatcher(String string) {
+        Matcher matcher = PathHelper.URI_PARAM_PATTERN.matcher(PathHelper.replaceEnclosedCurlyBracesCS(string));
+        return matcher;
+    }
+
+    protected StringBuilder replaceParameter(Map<String, ? extends Object> paramMap, boolean fromEncodedMap, boolean isTemplate,
+            String string, StringBuilder builder, boolean encodeSlash) {
+        if (string.indexOf('{') == -1) {
+            return builder.append(string);
+        }
+        Matcher matcher = createUriParamMatcher(string);
+        int start = 0;
+        while (matcher.find()) {
+            builder.append(string, start, matcher.start());
+            String param = matcher.group(1);
+            boolean containsValueForParam = paramMap.containsKey(param);
+            if (!containsValueForParam) {
+                if (isTemplate) {
+                    builder.append(matcher.group());
+                    start = matcher.end();
+                    continue;
+                }
+                throw new IllegalArgumentException("Path parameter not provided " + param);
+            }
+            Object value = paramMap.get(param);
+            String stringValue = value != null ? value.toString() : null;
+            if (stringValue != null) {
+                if (!fromEncodedMap) {
+                    if (encodeSlash)
+                        stringValue = Encode.encodePathSegmentAsIs(stringValue);
+                    else
+                        stringValue = Encode.encodePathAsIs(stringValue);
+                } else {
+                    if (encodeSlash)
+                        stringValue = Encode.encodePathSegmentSaveEncodings(stringValue);
+                    else
+                        stringValue = Encode.encodePathSaveEncodings(stringValue);
+                }
+                builder.append(stringValue);
+                start = matcher.end();
+            } else {
+                throw new IllegalArgumentException("Template parameter null: " + param);
+            }
+        }
+        builder.append(string, start, string.length());
+        return builder;
+    }
+
+    protected StringBuilder replaceQueryStringParameter(Map<String, ? extends Object> paramMap, boolean fromEncodedMap,
+            boolean isTemplate, String string, StringBuilder builder) {
+        if (string.indexOf('{') == -1) {
+            return builder.append(string);
+        }
+        Matcher matcher = createUriParamMatcher(string);
+        int start = 0;
+        while (matcher.find()) {
+            builder.append(string, start, matcher.start());
+            String param = matcher.group(1);
+            boolean containsValueForParam = paramMap.containsKey(param);
+            if (!containsValueForParam) {
+                if (isTemplate) {
+                    builder.append(matcher.group());
+                    start = matcher.end();
+                    continue;
+                }
+                throw new IllegalArgumentException("Path parameter not provided " + param);
+            }
+            Object value = paramMap.get(param);
+            String stringValue = value != null ? value.toString() : null;
+            if (stringValue != null) {
+                if (!fromEncodedMap) {
+                    stringValue = Encode.encodeQueryParamAsIs(stringValue);
+                } else {
+                    stringValue = Encode.encodeQueryParamSaveEncodings(stringValue);
+                }
+                builder.append(stringValue);
+                start = matcher.end();
+            } else {
+                throw new IllegalArgumentException("Template parm was null: " + param);
+            }
+        }
+        builder.append(string, start, string.length());
+        return builder;
+    }
+
+    /**
+     * Return a unique order list of path params.
+     *
+     * @return list of path parameters
+     */
+    public List<String> getPathParamNamesInDeclarationOrder() {
+        List<String> params = new ArrayList<String>();
+        HashSet<String> set = new HashSet<String>();
+        if (scheme != null)
+            addToPathParamList(params, set, scheme);
+        if (userInfo != null)
+            addToPathParamList(params, set, userInfo);
+        if (host != null)
+            addToPathParamList(params, set, host);
+        if (path != null)
+            addToPathParamList(params, set, path);
+        if (query != null)
+            addToPathParamList(params, set, query);
+        if (fragment != null)
+            addToPathParamList(params, set, fragment);
+
+        return params;
+    }
+
+    private void addToPathParamList(List<String> params, HashSet<String> set, String string) {
+        Matcher matcher = PathHelper.URI_PARAM_PATTERN.matcher(PathHelper.replaceEnclosedCurlyBracesCS(string));
+        while (matcher.find()) {
+            String param = matcher.group(1);
+            if (set.contains(param))
+                continue;
+            else {
+                set.add(param);
+                params.add(param);
+            }
+        }
+    }
+
+    public URI build(Object... values) throws IllegalArgumentException, UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        return buildFromValues(true, false, values);
+    }
+
+    protected URI buildFromValues(boolean encodeSlash, boolean encoded, Object... values) {
+        String buf = null;
+        try {
+            buf = buildString(new URITemplateParametersMap(values), encoded, false, encodeSlash);
+            return new URI(buf);
+            //return URI.create(buf);
+        } catch (IllegalArgumentException iae) {
+            throw iae;
+        } catch (Exception e) {
+            throw new UriBuilderException("failed to create URI", e);
+        }
+    }
+
+    public UriBuilder matrixParam(String name, Object... values) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("Name parameter is null");
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        if (path == null)
+            path = "";
+        for (Object val : values) {
+            if (val == null)
+                throw new IllegalArgumentException("Value is null");
+            path += ";" + Encode.encodeMatrixParam(name) + "=" + Encode.encodeMatrixParam(val.toString());
+        }
+        return this;
+    }
+
+    private static final Pattern PARAM_REPLACEMENT = Pattern.compile("_resteasy_uri_parameter");
+
+    public UriBuilder replaceMatrixParam(String name, Object... values) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("Name parameter is null");
+        if (path == null) {
+            if (values != null && values.length > 0)
+                return matrixParam(name, values);
+            return this;
+        }
+
+        // remove all path param expressions so we don't accidentally start replacing within a regular expression
+        ArrayList<String> pathParams = new ArrayList<String>();
+        boolean foundParam = false;
+
+        CharSequence pathWithoutEnclosedCurlyBraces = PathHelper.replaceEnclosedCurlyBracesCS(this.path);
+        Matcher matcher = PathHelper.URI_TEMPLATE_PATTERN.matcher(pathWithoutEnclosedCurlyBraces);
+        StringBuilder newSegment = new StringBuilder();
+        int from = 0;
+        while (matcher.find()) {
+            newSegment.append(pathWithoutEnclosedCurlyBraces, from, matcher.start());
+            foundParam = true;
+            String group = matcher.group();
+            pathParams.add(PathHelper.recoverEnclosedCurlyBraces(group));
+            newSegment.append("_resteasy_uri_parameter");
+            from = matcher.end();
+        }
+        newSegment.append(pathWithoutEnclosedCurlyBraces, from, pathWithoutEnclosedCurlyBraces.length());
+        path = newSegment.toString();
+
+        // Find last path segment
+        int start = path.lastIndexOf('/');
+        if (start < 0)
+            start = 0;
+
+        int matrixIndex = path.indexOf(';', start);
+        if (matrixIndex > -1) {
+
+            String matrixParams = path.substring(matrixIndex + 1);
+            path = path.substring(0, matrixIndex);
+            MultivaluedMap<String, String> map = new QuarkusMultivaluedHashMap<String, String>();
+
+            String[] params = matrixParams.split(";");
+            for (String param : params) {
+                int idx = param.indexOf('=');
+                if (idx < 0) {
+                    map.add(param, null);
+                } else {
+                    String theName = param.substring(0, idx);
+                    String value = "";
+                    if (idx + 1 < param.length())
+                        value = param.substring(idx + 1);
+                    map.add(theName, value);
+                }
+            }
+            map.remove(name);
+            for (String theName : map.keySet()) {
+                List<String> vals = map.get(theName);
+                for (Object val : vals) {
+                    if (val == null)
+                        path += ";" + theName;
+                    else
+                        path += ";" + theName + "=" + val.toString();
+                }
+            }
+        }
+        if (values != null && values.length > 0)
+            matrixParam(name, values);
+
+        // put back all path param expressions
+        if (foundParam) {
+            matcher = PARAM_REPLACEMENT.matcher(path);
+            newSegment = new StringBuilder();
+            int i = 0;
+            from = 0;
+            while (matcher.find()) {
+                newSegment.append(this.path, from, matcher.start());
+                newSegment.append(pathParams.get(i++));
+                from = matcher.end();
+            }
+            newSegment.append(this.path, from, this.path.length());
+            path = newSegment.toString();
+        }
+        return this;
+    }
+
+    /**
+     * Called by ClientRequest.getUri() to add a query parameter for
+     * {@code @QueryParam} parameters. We do not use UriBuilder.queryParam()
+     * because
+     * <ul>
+     * <li>queryParam() supports URI template processing and this method must
+     * always encode braces (for parameter substitution is not possible for
+     * {@code @QueryParam} parameters).
+     * <li>queryParam() supports "contextual URI encoding" (i.e., it does not
+     * encode {@code %} characters that are followed by two hex characters).
+     * The JavaDoc for {@code @QueryParam.value()} explicitly states that
+     * the value is specified in decoded format and that "any percent
+     * encoded literals within the value will not be decoded and will
+     * instead be treated as literal text". This means that it is an
+     * explicit bug to perform contextual URI encoding of this method's
+     * name parameter; hence, we must always encode said parameter. This
+     * method also foregoes contextual URI encoding on this method's values
+     * parameter because it represents arbitrary data passed to a
+     * {@code QueryParam} parameter of a client proxy (since the client
+     * proxy is nothing more than a transport layer, it should not be
+     * "interpreting" such data; instead, it should faithfully transmit
+     * this data over the wire).
+     * </ul>
+     *
+     * @param name the name of the query parameter.
+     * @param values the value(s) of the query parameter.
+     * @return Returns this instance to allow call chaining.
+     */
+    public UriBuilder clientQueryParam(String name, Object... values) throws IllegalArgumentException {
+        StringBuilder sb = new StringBuilder();
+        String prefix = "";
+        if (query == null)
+            query = "";
+        else {
+            sb.append(query).append("&");
+        }
+
+        if (name == null)
+            throw new IllegalArgumentException("Name parameter is null");
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        for (Object value : values) {
+            if (value == null)
+                throw new IllegalArgumentException("Value is null");
+            sb.append(prefix);
+            prefix = "&";
+            sb.append(Encode.encodeQueryParamAsIs(name)).append("=").append(Encode.encodeQueryParamAsIs(value.toString()));
+        }
+
+        query = sb.toString();
+        return this;
+    }
+
+    public UriBuilder queryParam(String name, Object... values) throws IllegalArgumentException {
+        StringBuilder sb = new StringBuilder();
+        String prefix = "";
+        if (query == null)
+            query = "";
+        else {
+            sb.append(query).append("&");
+        }
+
+        if (name == null)
+            throw new IllegalArgumentException("Name parameter is null");
+        if (values == null)
+            throw new IllegalArgumentException("Values parameter is null");
+        for (Object value : values) {
+            if (value == null)
+                throw new IllegalArgumentException("Value is null");
+            sb.append(prefix);
+            prefix = "&";
+            sb.append(Encode.encodeQueryParam(name)).append("=").append(Encode.encodeQueryParam(value.toString()));
+        }
+
+        query = sb.toString();
+        return this;
+    }
+
+    public UriBuilder replaceQueryParam(String name, Object... values) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("Name parameter is null");
+        if (query == null || query.equals("")) {
+            if (values != null)
+                return queryParam(name, values);
+            return this;
+        }
+
+        String[] params = query.split("&");
+        query = null;
+
+        String replacedName = Encode.encodeQueryParam(name);
+
+        for (String param : params) {
+            int pos = param.indexOf('=');
+            if (pos >= 0) {
+                String paramName = param.substring(0, pos);
+                if (paramName.equals(replacedName))
+                    continue;
+            } else {
+                if (param.equals(replacedName))
+                    continue;
+            }
+            if (query == null)
+                query = "";
+            else
+                query += "&";
+            query += param;
+        }
+        // don't set values if values is null
+        if (values == null || values.length == 0)
+            return this;
+        return queryParam(name, values);
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public String getScheme() {
+        return scheme;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String getUserInfo() {
+        return userInfo;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public String getFragment() {
+        return fragment;
+    }
+
+    public UriBuilder segment(String... segments) throws IllegalArgumentException {
+        if (segments == null)
+            throw new IllegalArgumentException("Segment parameter is null");
+        for (String segment : segments) {
+            if (segment == null)
+                throw new IllegalArgumentException("Segment is null");
+            path(Encode.encodePathSegment(segment));
+        }
+        return this;
+    }
+
+    public URI buildFromEncoded(Object... values) throws IllegalArgumentException, UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("Values is null");
+        return buildFromValues(false, true, values);
+    }
+
+    public UriBuilder replacePath(String path) {
+        if (path == null) {
+            this.path = null;
+            return this;
+        }
+        this.path = Encode.encodePath(path);
+        return this;
+    }
+
+    public URI build(Object[] values, boolean encodeSlashInPath) throws IllegalArgumentException, UriBuilderException {
+        if (values == null)
+            throw new IllegalArgumentException("Values is null");
+        return buildFromValues(encodeSlashInPath, false, values);
+    }
+
+    public String toTemplate() {
+        return buildString(new HashMap<String, Object>(), true, true, true);
+    }
+
+    public UriBuilder resolveTemplate(String name, Object value) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("Name is null");
+        if (value == null)
+            throw new IllegalArgumentException("Value is null");
+        HashMap<String, Object> vals = new HashMap<String, Object>();
+        vals.put(name, value);
+        return resolveTemplates(vals);
+    }
+
+    public UriBuilder resolveTemplates(Map<String, Object> templateValues) throws IllegalArgumentException {
+        if (templateValues == null)
+            throw new IllegalArgumentException("Template values null");
+        if (templateValues.containsKey(null))
+            throw new IllegalArgumentException("map key null");
+        return uriTemplate(buildCharSequence(templateValues, false, true, true));
+    }
+
+    public UriBuilder resolveTemplate(String name, Object value, boolean encodeSlashInPath) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("Name is null");
+        if (value == null)
+            throw new IllegalArgumentException("Value is null");
+        HashMap<String, Object> vals = new HashMap<String, Object>();
+        vals.put(name, value);
+        return uriTemplate(buildCharSequence(vals, false, true, encodeSlashInPath));
+    }
+
+    public UriBuilder resolveTemplateFromEncoded(String name, Object value) throws IllegalArgumentException {
+        if (name == null)
+            throw new IllegalArgumentException("Name is null");
+        if (value == null)
+            throw new IllegalArgumentException("Value is null");
+        HashMap<String, Object> vals = new HashMap<String, Object>();
+        vals.put(name, value);
+        return uriTemplate(buildCharSequence(vals, true, true, true));
+    }
+
+    public UriBuilder resolveTemplates(Map<String, Object> templateValues, boolean encodeSlashInPath)
+            throws IllegalArgumentException {
+        if (templateValues == null)
+            throw new IllegalArgumentException("Template values null");
+        if (templateValues.containsKey(null))
+            throw new IllegalArgumentException("map key null");
+        return uriTemplate(buildCharSequence(templateValues, false, true, encodeSlashInPath));
+    }
+
+    public UriBuilder resolveTemplatesFromEncoded(Map<String, Object> templateValues) throws IllegalArgumentException {
+        if (templateValues == null)
+            throw new IllegalArgumentException("Template values null");
+        if (templateValues.containsKey(null))
+            throw new IllegalArgumentException("map key null");
+        return uriTemplate(buildCharSequence(templateValues, true, true, true));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java
new file mode 100644
index 0000000000000..9367864192052
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/VariantListBuilderImpl.java
@@ -0,0 +1,84 @@
+package org.jboss.resteasy.reactive.common.jaxrs;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Variant;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class VariantListBuilderImpl extends Variant.VariantListBuilder {
+    private final ArrayList<Variant> variants = new ArrayList<Variant>();
+    private final ArrayList<Locale> currentLanguages = new ArrayList<Locale>();
+    private final ArrayList<String> currentEncodings = new ArrayList<String>();
+    private final ArrayList<MediaType> currentTypes = new ArrayList<MediaType>();
+
+    public List<Variant> build() {
+        add();
+        ArrayList<Variant> copy = new ArrayList<Variant>(variants);
+        variants.clear();
+        currentLanguages.clear();
+        currentEncodings.clear();
+        currentTypes.clear();
+        return copy;
+    }
+
+    public Variant.VariantListBuilder add() {
+        int langSize = currentLanguages.size();
+        int encodingSize = currentEncodings.size();
+        int typeSize = currentTypes.size();
+
+        int i = 0;
+
+        if (langSize == 0 && encodingSize == 0 && typeSize == 0)
+            return this;
+
+        do {
+            MediaType type = null;
+            if (i < typeSize)
+                type = currentTypes.get(i);
+            int j = 0;
+            do {
+                String encoding = null;
+                if (j < encodingSize)
+                    encoding = currentEncodings.get(j);
+                int k = 0;
+                do {
+                    Locale language = null;
+                    if (k < langSize)
+                        language = currentLanguages.get(k);
+                    variants.add(new Variant(type, language, encoding));
+                    k++;
+                } while (k < langSize);
+                j++;
+            } while (j < encodingSize);
+            i++;
+        } while (i < typeSize);
+
+        currentLanguages.clear();
+        currentEncodings.clear();
+        currentTypes.clear();
+
+        return this;
+    }
+
+    public Variant.VariantListBuilder languages(Locale... languages) {
+        currentLanguages.addAll(Arrays.asList(languages));
+        return this;
+    }
+
+    @Override
+    public Variant.VariantListBuilder encodings(String... encodings) {
+        currentEncodings.addAll(Arrays.asList(encodings));
+        return this;
+    }
+
+    @Override
+    public Variant.VariantListBuilder mediaTypes(MediaType... mediaTypes) {
+        currentTypes.addAll(Arrays.asList(mediaTypes));
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/BeanParamInfo.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/BeanParamInfo.java
new file mode 100644
index 0000000000000..e32fbfd4ed0ec
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/BeanParamInfo.java
@@ -0,0 +1,28 @@
+package org.jboss.resteasy.reactive.common.model;
+
+public class BeanParamInfo implements InjectableBean {
+    private boolean isFormParamRequired;
+    private boolean isInjectionRequired;
+
+    @Override
+    public boolean isFormParamRequired() {
+        return isFormParamRequired;
+    }
+
+    @Override
+    public InjectableBean setFormParamRequired(boolean isFormParamRequired) {
+        this.isFormParamRequired = isFormParamRequired;
+        return this;
+    }
+
+    @Override
+    public boolean isInjectionRequired() {
+        return isInjectionRequired;
+    }
+
+    @Override
+    public InjectableBean setInjectionRequired(boolean isInjectionRequired) {
+        this.isInjectionRequired = isInjectionRequired;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/HasPriority.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/HasPriority.java
new file mode 100644
index 0000000000000..4d4d4d2c4b2a8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/HasPriority.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.Comparator;
+
+public interface HasPriority {
+
+    Integer priority();
+
+    /**
+     * This comparator is used when a TreeMap is employed to order objects that have priority
+     * because TreeMap will only keep one key if multiple keys compare to the same value
+     */
+    class TreeMapComparator implements Comparator<HasPriority> {
+
+        public static final TreeMapComparator INSTANCE = new TreeMapComparator();
+
+        @Override
+        public int compare(HasPriority o1, HasPriority o2) {
+            int res = o1.priority().compareTo(o2.priority());
+            if (res != 0) {
+                return res;
+            }
+            res = Integer.compare(o1.hashCode(), o2.hashCode());
+            if (res != 0) {
+                return res;
+            }
+            //what to do here
+            //they are functionally equal, but we don't want one to be discarded if there is a hash collision
+            return 1;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InjectableBean.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InjectableBean.java
new file mode 100644
index 0000000000000..2b7973218a564
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InjectableBean.java
@@ -0,0 +1,21 @@
+package org.jboss.resteasy.reactive.common.model;
+
+/**
+ * Class that represents information about injectable beans as we scan them, such as
+ * resource endpoint beans, or BeanParam classes.
+ */
+public interface InjectableBean {
+    /**
+     * @return true if we have a FORM injectable field, either directly or in supertypes
+     */
+    public boolean isFormParamRequired();
+
+    public InjectableBean setFormParamRequired(boolean isFormParamRequired);
+
+    /**
+     * @return true if we have injectable fields, either directly or in supertypes
+     */
+    public boolean isInjectionRequired();
+
+    public InjectableBean setInjectionRequired(boolean isInjectionRequired);
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java
new file mode 100644
index 0000000000000..64d2ac7e13025
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/InterceptorContainer.java
@@ -0,0 +1,58 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class InterceptorContainer<T> {
+
+    private final List<ResourceInterceptor<T>> globalResourceInterceptors = new ArrayList<>();
+    private final List<ResourceInterceptor<T>> nameResourceInterceptors = new ArrayList<>();
+
+    public void addGlobalRequestInterceptor(ResourceInterceptor<T> interceptor) {
+        this.globalResourceInterceptors.add(interceptor);
+    }
+
+    public void addNameRequestInterceptor(ResourceInterceptor<T> interceptor) {
+        this.nameResourceInterceptors.add(interceptor);
+    }
+
+    public List<ResourceInterceptor<T>> getGlobalResourceInterceptors() {
+        return globalResourceInterceptors;
+    }
+
+    public List<ResourceInterceptor<T>> getNameResourceInterceptors() {
+        return nameResourceInterceptors;
+    }
+
+    public void sort() {
+        Collections.sort(globalResourceInterceptors);
+        Collections.sort(nameResourceInterceptors);
+    }
+
+    public ResourceInterceptor<T> create() {
+        return new ResourceInterceptor<>();
+    }
+
+    public void initializeDefaultFactories(Function<String, BeanFactory<?>> factoryCreator) {
+        for (ResourceInterceptor<T> i : globalResourceInterceptors) {
+            if (i.getFactory() == null) {
+                i.setFactory((BeanFactory<T>) factoryCreator.apply(i.getClassName()));
+            }
+        }
+        for (ResourceInterceptor<T> i : nameResourceInterceptors) {
+            if (i.getFactory() == null) {
+                i.setFactory((BeanFactory<T>) factoryCreator.apply(i.getClassName()));
+            }
+        }
+    }
+
+    public static class Reversed<T> extends InterceptorContainer<T> {
+
+        public ResourceInterceptor<T> create() {
+            return new ResourceInterceptor.Reversed();
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/MaybeRestClientInterface.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/MaybeRestClientInterface.java
new file mode 100644
index 0000000000000..1c061c9f95832
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/MaybeRestClientInterface.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.common.model;
+
+public class MaybeRestClientInterface {
+    private final RestClientInterface restClientInterface;
+    private final String failure;
+
+    private MaybeRestClientInterface(RestClientInterface restClientInterface, String failure) {
+        this.restClientInterface = restClientInterface;
+        this.failure = failure;
+    }
+
+    public String getFailure() {
+        return failure;
+    }
+
+    public boolean exists() {
+        return restClientInterface != null;
+    }
+
+    public RestClientInterface getRestClientInterface() {
+        return restClientInterface;
+    }
+
+    public static MaybeRestClientInterface failure(String failure) {
+        return new MaybeRestClientInterface(null, failure);
+    }
+
+    public static MaybeRestClientInterface success(RestClientInterface restClientInterface) {
+        return new MaybeRestClientInterface(restClientInterface, null);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/MethodParameter.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/MethodParameter.java
new file mode 100644
index 0000000000000..ec6965199592e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/MethodParameter.java
@@ -0,0 +1,113 @@
+package org.jboss.resteasy.reactive.common.model;
+
+public class MethodParameter {
+    public String name;
+    public String type;
+    /**
+     * Generally this will be the same as type, unless the parameter is a
+     * collection, in which case 'type' will be the element type and this
+     * will be the collection type
+     */
+    public String declaredType;
+    public String signature;
+    public ParameterType parameterType;
+    public boolean encoded;
+    private boolean single;
+    private String defaultValue;
+    private boolean optional;
+    private boolean isObtainedAsCollection;
+
+    public MethodParameter() {
+    }
+
+    public MethodParameter(String name, String type, String declaredType, String signature, ParameterType parameterType,
+            boolean single,
+            String defaultValue, boolean isObtainedAsCollection, boolean optional, boolean encoded) {
+        this.name = name;
+        this.type = type;
+        this.declaredType = declaredType;
+        this.signature = signature;
+        this.parameterType = parameterType;
+        this.single = single;
+        this.defaultValue = defaultValue;
+        this.isObtainedAsCollection = isObtainedAsCollection;
+        this.optional = optional;
+        this.encoded = encoded;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public ParameterType getParameterType() {
+        return parameterType;
+    }
+
+    public void setParameterType(ParameterType parameterType) {
+        this.parameterType = parameterType;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public MethodParameter setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+        return this;
+    }
+
+    public boolean isSingle() {
+        return single;
+    }
+
+    public MethodParameter setSingle(boolean single) {
+        this.single = single;
+        return this;
+    }
+
+    public String getDeclaredType() {
+        return declaredType;
+    }
+
+    public MethodParameter setDeclaredType(String declaredType) {
+        this.declaredType = declaredType;
+        return this;
+    }
+
+    public boolean isObtainedAsCollection() {
+        return isObtainedAsCollection;
+    }
+
+    public boolean isOptional() {
+        return optional;
+    }
+
+    public void setOptional(boolean optional) {
+        this.optional = optional;
+    }
+
+    public MethodParameter setObtainedAsCollection(boolean isObtainedAsCollection) {
+        this.isObtainedAsCollection = isObtainedAsCollection;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "MethodParameter{" +
+                "name='" + name + '\'' +
+                ", type='" + type + '\'' +
+                '}';
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ParameterType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ParameterType.java
new file mode 100644
index 0000000000000..15746ee40c650
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ParameterType.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.common.model;
+
+public enum ParameterType {
+
+    PATH,
+    QUERY,
+    HEADER,
+    FORM,
+    MULTI_PART_FORM,
+    BODY,
+    MATRIX,
+    CONTEXT,
+    ASYNC_RESPONSE,
+    COOKIE,
+    BEAN,
+    CUSTOM
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java
new file mode 100644
index 0000000000000..05e015ee2e40b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/PreMatchInterceptorContainer.java
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class PreMatchInterceptorContainer<T> extends InterceptorContainer<T> {
+    private final List<ResourceInterceptor<T>> preMatchInterceptors = new ArrayList<>();
+
+    public void addPreMatchInterceptor(ResourceInterceptor<T> interceptor) {
+        preMatchInterceptors.add(interceptor);
+    }
+
+    public List<ResourceInterceptor<T>> getPreMatchInterceptors() {
+        return preMatchInterceptors;
+    }
+
+    public void initializeDefaultFactories(Function<String, BeanFactory<?>> factoryCreator) {
+        super.initializeDefaultFactories(factoryCreator);
+        for (ResourceInterceptor<T> i : preMatchInterceptors) {
+            if (i.getFactory() == null) {
+                i.setFactory((BeanFactory<T>) factoryCreator.apply(i.getClassName()));
+            }
+        }
+    }
+
+    @Override
+    public void sort() {
+        super.sort();
+        Collections.sort(preMatchInterceptors);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java
new file mode 100644
index 0000000000000..73fec493fa967
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceClass.java
@@ -0,0 +1,151 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+import javax.ws.rs.ext.ExceptionMapper;
+import org.jboss.resteasy.reactive.common.core.LazyUnmanagedBeanFactory;
+import org.jboss.resteasy.reactive.common.util.URLUtils;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceClass {
+
+    /**
+     * The class name of the resource class
+     */
+    private String className;
+
+    /**
+     * The class path, will be null if this is a sub resource
+     */
+    private String path;
+
+    /**
+     * The resource methods
+     */
+    private final List<ResourceMethod> methods = new ArrayList<>();
+
+    private BeanFactory<Object> factory;
+    private boolean perRequestResource;
+
+    private boolean isFormParamRequired;
+
+    private Set<String> pathParameters = new HashSet<>();
+
+    /**
+     * Contains class level exception mappers
+     * The key is the exception type and the value is the exception mapper class
+     */
+    private Map<String, String> classLevelExceptionMappers = new HashMap<>();
+
+    public boolean isSubResource() {
+        return path == null;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public ResourceClass setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public BeanFactory<Object> getFactory() {
+        return factory;
+    }
+
+    public ResourceClass setFactory(BeanFactory<Object> factory) {
+        this.factory = factory;
+        return this;
+    }
+
+    public ResourceClass setPath(String path) {
+        this.path = path;
+        if (path != null) {
+            pathParameters.clear();
+            URLUtils.parsePathParameters(path, pathParameters);
+        }
+        return this;
+    }
+
+    public List<ResourceMethod> getMethods() {
+        return methods;
+    }
+
+    public boolean isPerRequestResource() {
+        return perRequestResource;
+    }
+
+    public void setPerRequestResource(boolean perRequestResource) {
+        this.perRequestResource = perRequestResource;
+    }
+
+    public boolean isFormParamRequired() {
+        return isFormParamRequired;
+    }
+
+    public ResourceClass setFormParamRequired(boolean isFormParamRequired) {
+        this.isFormParamRequired = isFormParamRequired;
+        return this;
+    }
+
+    public Set<String> getPathParameters() {
+        return pathParameters;
+    }
+
+    public ResourceClass setPathParameters(Set<String> pathParameters) {
+        this.pathParameters = pathParameters;
+        return this;
+    }
+
+    public Map<String, String> getClassLevelExceptionMappers() {
+        return classLevelExceptionMappers;
+    }
+
+    public void setClassLevelExceptionMappers(Map<String, String> classLevelExceptionMappers) {
+        this.classLevelExceptionMappers = classLevelExceptionMappers;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> resourceExceptionMapper() {
+        if (classLevelExceptionMappers.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> result = new HashMap<>(
+                classLevelExceptionMappers.size());
+        for (Map.Entry<String, String> entry : classLevelExceptionMappers.entrySet()) {
+            ResourceExceptionMapper mapper = new ResourceExceptionMapper();
+            // TODO: consider not using reflection to create these
+            mapper.setFactory(new LazyUnmanagedBeanFactory<>(new Supplier<ExceptionMapper<?>>() {
+                @Override
+                public ExceptionMapper<?> get() {
+                    try {
+                        return (ExceptionMapper<?>) loadClass(entry.getValue()).getConstructor().newInstance();
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }));
+            result.put((Class<? extends Throwable>) loadClass(entry.getKey()), mapper);
+        }
+        return result;
+    }
+
+    private static Class<?> loadClass(String className) {
+        try {
+            return Class.forName(className, false, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java
new file mode 100644
index 0000000000000..1b57eb9fdc30d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceContextResolver.java
@@ -0,0 +1,56 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceContextResolver {
+
+    private BeanFactory<ContextResolver<?>> factory;
+    private String className;
+    private List<String> mediaTypeStrings = new ArrayList<>();
+    private volatile List<MediaType> mediaTypes;
+
+    public void setFactory(BeanFactory<ContextResolver<?>> factory) {
+        this.factory = factory;
+    }
+
+    public BeanFactory<ContextResolver<?>> getFactory() {
+        return factory;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public ResourceContextResolver setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    public ResourceContextResolver setMediaTypeStrings(List<String> mediaTypeStrings) {
+        this.mediaTypeStrings = mediaTypeStrings;
+        return this;
+    }
+
+    public List<String> getMediaTypeStrings() {
+        return mediaTypeStrings;
+    }
+
+    public List<MediaType> mediaTypes() {
+        if (mediaTypes == null) {
+            //todo: does this actually need to be threadsafe?
+            synchronized (this) {
+                List<MediaType> ret = new ArrayList<>();
+                for (String i : mediaTypeStrings) {
+                    ret.add(MediaType.valueOf(i));
+                }
+                mediaTypes = Collections.unmodifiableList(ret);
+            }
+        }
+        return mediaTypes;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java
new file mode 100644
index 0000000000000..bdf6b75ea6408
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceDynamicFeature.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import javax.ws.rs.container.DynamicFeature;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceDynamicFeature {
+
+    private BeanFactory<DynamicFeature> factory;
+
+    public BeanFactory<DynamicFeature> getFactory() {
+        return factory;
+    }
+
+    public void setFactory(BeanFactory<DynamicFeature> factory) {
+        this.factory = factory;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java
new file mode 100644
index 0000000000000..d5a72e7429ac9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceExceptionMapper.java
@@ -0,0 +1,37 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import javax.ws.rs.Priorities;
+import javax.ws.rs.ext.ExceptionMapper;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceExceptionMapper<T extends Throwable> {
+
+    private BeanFactory<ExceptionMapper<T>> factory;
+    private int priority = Priorities.USER;
+    private String className;
+
+    public void setFactory(BeanFactory<ExceptionMapper<T>> factory) {
+        this.factory = factory;
+    }
+
+    public BeanFactory<ExceptionMapper<T>> getFactory() {
+        return factory;
+    }
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public ResourceExceptionMapper<T> setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java
new file mode 100644
index 0000000000000..456358d515a9a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceFeature.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import javax.ws.rs.core.Feature;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceFeature {
+
+    private BeanFactory<Feature> factory;
+
+    public BeanFactory<Feature> getFactory() {
+        return factory;
+    }
+
+    public void setFactory(BeanFactory<Feature> factory) {
+        this.factory = factory;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java
new file mode 100644
index 0000000000000..8fbe64f043ca4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptor.java
@@ -0,0 +1,76 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.Collections;
+import java.util.Set;
+import javax.ws.rs.Priorities;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceInterceptor<T>
+        implements Comparable<ResourceInterceptor<T>>, SettableResourceInterceptor<T>, HasPriority {
+
+    private BeanFactory<T> factory;
+    private Integer priority = Priorities.USER; // default priority as defined by spec
+
+    /**
+     * The class names of the {@code @NameBinding} annotations that the method is annotated with.
+     */
+    private Set<String> nameBindingNames = Collections.emptySet();
+
+    private String className;
+
+    public void setFactory(BeanFactory<T> factory) {
+        this.factory = factory;
+    }
+
+    public BeanFactory<T> getFactory() {
+        return factory;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public Integer priority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Set<String> getNameBindingNames() {
+        return nameBindingNames;
+    }
+
+    public void setNameBindingNames(Set<String> nameBindingNames) {
+        this.nameBindingNames = nameBindingNames;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public ResourceInterceptor<T> setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    // spec says that writer interceptors are sorted in ascending order
+    @Override
+    public int compareTo(ResourceInterceptor<T> o) {
+        return this.priority().compareTo(o.priority());
+    }
+
+    //Container response filters are reversed
+    public static class Reversed<T> extends ResourceInterceptor<T> {
+
+        @Override
+        public Integer priority() {
+            Integer p = super.priority();
+            if (p == null) {
+                return null;
+            }
+            return -p;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java
new file mode 100644
index 0000000000000..97e12ebc3e897
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceInterceptors.java
@@ -0,0 +1,72 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.function.Function;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceInterceptors {
+
+    private InterceptorContainer<ContainerResponseFilter> containerResponseFilters = new InterceptorContainer.Reversed<>();
+    private PreMatchInterceptorContainer<ContainerRequestFilter> containerRequestFilters = new PreMatchInterceptorContainer<>();
+    private InterceptorContainer<WriterInterceptor> writerInterceptors = new InterceptorContainer<>();
+    private InterceptorContainer<ReaderInterceptor> readerInterceptors = new InterceptorContainer<>();
+
+    public InterceptorContainer<ContainerResponseFilter> getContainerResponseFilters() {
+        return containerResponseFilters;
+    }
+
+    public ResourceInterceptors setContainerResponseFilters(
+            InterceptorContainer<ContainerResponseFilter> containerResponseFilters) {
+        this.containerResponseFilters = containerResponseFilters;
+        return this;
+    }
+
+    public PreMatchInterceptorContainer<ContainerRequestFilter> getContainerRequestFilters() {
+        return containerRequestFilters;
+    }
+
+    public ResourceInterceptors setContainerRequestFilters(
+            PreMatchInterceptorContainer<ContainerRequestFilter> containerRequestFilters) {
+        this.containerRequestFilters = containerRequestFilters;
+        return this;
+    }
+
+    public InterceptorContainer<WriterInterceptor> getWriterInterceptors() {
+        return writerInterceptors;
+    }
+
+    public ResourceInterceptors setWriterInterceptors(InterceptorContainer<WriterInterceptor> writerInterceptors) {
+        this.writerInterceptors = writerInterceptors;
+        return this;
+    }
+
+    public InterceptorContainer<ReaderInterceptor> getReaderInterceptors() {
+        return readerInterceptors;
+    }
+
+    public ResourceInterceptors setReaderInterceptors(InterceptorContainer<ReaderInterceptor> readerInterceptors) {
+        this.readerInterceptors = readerInterceptors;
+        return this;
+    }
+
+    public void initializeDefaultFactories(Function<String, BeanFactory<?>> factoryCreator) {
+        containerRequestFilters.initializeDefaultFactories(factoryCreator);
+        containerResponseFilters.initializeDefaultFactories(factoryCreator);
+        readerInterceptors.initializeDefaultFactories(factoryCreator);
+        writerInterceptors.initializeDefaultFactories(factoryCreator);
+    }
+
+    // we sort this at build time as the order of the elements in the lists is retained in generated bytecode
+    // therefore at runtime the elements are already properly sorted
+    public ResourceInterceptors sort() {
+        containerRequestFilters.sort();
+        containerResponseFilters.sort();
+        writerInterceptors.sort();
+        readerInterceptors.sort();
+        return this;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java
new file mode 100644
index 0000000000000..5e4099f85cde7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceMethod.java
@@ -0,0 +1,209 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.Collections;
+import java.util.Set;
+import org.jboss.resteasy.reactive.RestSseElementType;
+
+/**
+ * A representation of a REST endpoint. This is passed directly to recorders so must be bytecode serializable.
+ */
+public class ResourceMethod {
+
+    /**
+     * The HTTP Method. Will be null if this is a resource locator method. Note that only one method is allowed in this class,
+     * if a method has multiple method annotations then it should be added multiple times.
+     */
+    private String httpMethod;
+
+    /**
+     * The value of the path annotation. May be null if this serves from the path of the resource class.
+     */
+    private String path;
+
+    /**
+     * The value of the {@link javax.ws.rs.Produces} annotation, if none is specified on the method
+     * then this represents the value inherited from the class level, or null if not specified.
+     */
+    private String[] produces;
+
+    /**
+     * The value of the {@link RestSseElementType} annotation, if none is specified on the method
+     * then this represents the value inherited from the class level, or null if not specified.
+     */
+    private String sseElementType;
+
+    /**
+     * The value of the {@link javax.ws.rs.Consumes} annotation, if none is specified on the method
+     * then this represents the value inherited from the class level, or null if not specified.
+     */
+    private String[] consumes;
+
+    /**
+     * The class names of the {@code @NameBinding} annotations that the method is annotated with.
+     * If none is specified on the method then this represents the value inherited from the class level.
+     */
+    private Set<String> nameBindingNames = Collections.emptySet();
+
+    private String name;
+
+    private String returnType;
+    private String simpleReturnType;
+
+    private MethodParameter[] parameters;
+
+    private boolean blocking;
+
+    private boolean suspended;
+
+    private boolean isSse;
+
+    private boolean isFormParamRequired;
+
+    private boolean isMultipart;
+
+    public boolean isResourceLocator() {
+        return httpMethod == null;
+    }
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public ResourceMethod setHttpMethod(String httpMethod) {
+        this.httpMethod = httpMethod;
+        return this;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public ResourceMethod setPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    public String[] getProduces() {
+        return produces;
+    }
+
+    public ResourceMethod setProduces(String[] produces) {
+        this.produces = produces;
+        return this;
+    }
+
+    public String[] getConsumes() {
+        return consumes;
+    }
+
+    public ResourceMethod setConsumes(String[] consumes) {
+        this.consumes = consumes;
+        return this;
+    }
+
+    public Set<String> getNameBindingNames() {
+        return nameBindingNames;
+    }
+
+    public ResourceMethod setNameBindingNames(Set<String> nameBindingNames) {
+        this.nameBindingNames = nameBindingNames;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ResourceMethod setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getReturnType() {
+        return returnType;
+    }
+
+    public ResourceMethod setReturnType(String returnType) {
+        this.returnType = returnType;
+        return this;
+    }
+
+    public String getSimpleReturnType() {
+        return simpleReturnType;
+    }
+
+    public ResourceMethod setSimpleReturnType(String simpleReturnType) {
+        this.simpleReturnType = simpleReturnType;
+        return this;
+    }
+
+    public MethodParameter[] getParameters() {
+        return parameters;
+    }
+
+    public ResourceMethod setParameters(MethodParameter[] parameters) {
+        this.parameters = parameters;
+        return this;
+    }
+
+    public boolean isBlocking() {
+        return blocking;
+    }
+
+    public ResourceMethod setBlocking(boolean blocking) {
+        this.blocking = blocking;
+        return this;
+    }
+
+    public boolean isSuspended() {
+        return suspended;
+    }
+
+    public ResourceMethod setSuspended(boolean suspended) {
+        this.suspended = suspended;
+        return this;
+    }
+
+    public boolean isSse() {
+        return isSse;
+    }
+
+    public ResourceMethod setSse(boolean isSse) {
+        this.isSse = isSse;
+        return this;
+    }
+
+    public boolean isFormParamRequired() {
+        return isFormParamRequired;
+    }
+
+    public ResourceMethod setFormParamRequired(boolean isFormParamRequired) {
+        this.isFormParamRequired = isFormParamRequired;
+        return this;
+    }
+
+    public boolean isMultipart() {
+        return isMultipart;
+    }
+
+    public ResourceMethod setMultipart(boolean isMultipart) {
+        this.isMultipart = isMultipart;
+        return this;
+    }
+
+    public ResourceMethod setSseElementType(String sseElementType) {
+        this.sseElementType = sseElementType;
+        return this;
+    }
+
+    public String getSseElementType() {
+        return sseElementType;
+    }
+
+    @Override
+    public String toString() {
+        if (httpMethod != null)
+            return httpMethod + " " + path;
+        return "Sub-resource locator for " + path;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java
new file mode 100644
index 0000000000000..0237c67b2ce1b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceParamConverterProvider.java
@@ -0,0 +1,42 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import javax.ws.rs.Priorities;
+import javax.ws.rs.ext.ParamConverterProvider;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceParamConverterProvider implements Comparable<ResourceParamConverterProvider> {
+
+    private BeanFactory<ParamConverterProvider> factory;
+    private Integer priority = Priorities.USER;
+    private String className;
+
+    public void setFactory(BeanFactory<ParamConverterProvider> factory) {
+        this.factory = factory;
+    }
+
+    public BeanFactory<ParamConverterProvider> getFactory() {
+        return factory;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public ResourceParamConverterProvider setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    @Override
+    public int compareTo(ResourceParamConverterProvider o) {
+        return this.priority.compareTo(o.priority);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java
new file mode 100644
index 0000000000000..61e999ed15fd0
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceReader.java
@@ -0,0 +1,135 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceReader {
+
+    private BeanFactory<MessageBodyReader<?>> factory;
+    private List<String> mediaTypeStrings = new ArrayList<>();
+    private RuntimeType constraint;
+    private boolean builtin = true;
+    private volatile List<MediaType> mediaTypes;
+    private volatile MessageBodyReader<?> instance;
+
+    public void setFactory(BeanFactory<MessageBodyReader<?>> factory) {
+        this.factory = factory;
+    }
+
+    public BeanFactory<MessageBodyReader<?>> getFactory() {
+        return factory;
+    }
+
+    public List<String> getMediaTypeStrings() {
+        return mediaTypeStrings;
+    }
+
+    public ResourceReader setMediaTypeStrings(List<String> mediaTypeStrings) {
+        this.mediaTypeStrings = mediaTypeStrings;
+        return this;
+    }
+
+    public RuntimeType getConstraint() {
+        return constraint;
+    }
+
+    public ResourceReader setConstraint(RuntimeType constraint) {
+        this.constraint = constraint;
+        return this;
+    }
+
+    public boolean isBuiltin() {
+        return builtin;
+    }
+
+    public void setBuiltin(boolean builtin) {
+        this.builtin = builtin;
+    }
+
+    public MessageBodyReader<?> instance() {
+        if (instance == null) {
+            synchronized (this) {
+                if (instance == null) {
+                    //todo: manage lifecycle of bean
+                    instance = factory.createInstance().getInstance();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public List<MediaType> mediaTypes() {
+        if (mediaTypes == null) {
+            //todo: does this actually need to be threadsafe?
+            synchronized (this) {
+                List<MediaType> mts = new ArrayList<>(mediaTypeStrings.size());
+                for (int i = 0; i < mediaTypeStrings.size(); i++) {
+                    mts.add(MediaType.valueOf(mediaTypeStrings.get(i)));
+                }
+                mediaTypes = Collections.unmodifiableList(mts);
+            }
+        }
+        return mediaTypes;
+    }
+
+    public boolean matchesRuntimeType(RuntimeType runtimeType) {
+        if (runtimeType == null) {
+            return true;
+        }
+        if (constraint == null) {
+            return true;
+        }
+        return runtimeType == constraint;
+    }
+
+    /**
+     * The comparison for now is simple:
+     * 1) Application provided writers come first
+     * 2) Then the more specific the media type, the higher the priority
+     * 3) Finally we compare the number of media types
+     *
+     * The spec doesn't seem to mention this sorting being explicitly needed, but there are tests
+     * in the TCK that only pass reliably if the Readers are sorted like this
+     *
+     * TODO: if this actually follows the exact same rules as ResourceWriter, we need to refactor
+     */
+    public static class ResourceReaderComparator implements Comparator<ResourceReader> {
+
+        public static final ResourceReaderComparator INSTANCE = new ResourceReaderComparator();
+
+        @Override
+        public int compare(ResourceReader o1, ResourceReader o2) {
+            int builtInCompare = Boolean.compare(o1.isBuiltin(), o2.isBuiltin());
+            if (builtInCompare != 0) {
+                return builtInCompare;
+            }
+
+            List<MediaType> mediaTypes1 = o1.mediaTypes();
+            List<MediaType> mediaTypes2 = o2.mediaTypes();
+            if (mediaTypes1.isEmpty() && mediaTypes2.isEmpty()) {
+                return 0;
+            }
+            if (mediaTypes1.isEmpty()) {
+                return 1;
+            }
+            if (mediaTypes2.isEmpty()) {
+                return -1;
+            }
+            int mediaTypeCompare = MediaTypeHelper.compareWeight(mediaTypes1.get(0), mediaTypes2.get(0));
+            if (mediaTypeCompare != 0) {
+                return mediaTypeCompare;
+            }
+
+            // TODO: not sure if this makes sense but was added to make the sorting more deterministic
+            return Integer.compare(mediaTypes1.size(), mediaTypes2.size());
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java
new file mode 100644
index 0000000000000..75b8ec8ccef9a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/ResourceWriter.java
@@ -0,0 +1,148 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceWriter {
+
+    private BeanFactory<MessageBodyWriter<?>> factory;
+    private List<String> mediaTypeStrings = new ArrayList<>();
+    private RuntimeType constraint;
+    private boolean builtin = true;
+    private volatile List<MediaType> mediaTypes;
+    private volatile ServerMediaType serverMediaType;
+    private volatile MessageBodyWriter<?> instance;
+
+    public ResourceWriter setFactory(BeanFactory<MessageBodyWriter<?>> factory) {
+        this.factory = factory;
+        return this;
+    }
+
+    public BeanFactory<MessageBodyWriter<?>> getFactory() {
+        return factory;
+    }
+
+    public List<String> getMediaTypeStrings() {
+        return mediaTypeStrings;
+    }
+
+    public ResourceWriter setMediaTypeStrings(List<String> mediaTypeStrings) {
+        this.mediaTypeStrings = mediaTypeStrings;
+        return this;
+    }
+
+    public RuntimeType getConstraint() {
+        return constraint;
+    }
+
+    public ResourceWriter setConstraint(RuntimeType constraint) {
+        this.constraint = constraint;
+        return this;
+    }
+
+    public boolean isBuiltin() {
+        return builtin;
+    }
+
+    public void setBuiltin(boolean builtin) {
+        this.builtin = builtin;
+    }
+
+    public MessageBodyWriter<?> instance() {
+        if (instance == null) {
+            synchronized (this) {
+                if (instance == null) {
+                    //todo: manage lifecycle of bean
+                    instance = factory.createInstance().getInstance();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public List<MediaType> mediaTypes() {
+        if (mediaTypes == null) {
+            //todo: does this actually need to be threadsafe?
+            synchronized (this) {
+                List<MediaType> mts = new ArrayList<>(mediaTypeStrings.size());
+                for (int i = 0; i < mediaTypeStrings.size(); i++) {
+                    mts.add(MediaType.valueOf(mediaTypeStrings.get(i)));
+                }
+                mediaTypes = Collections.unmodifiableList(mts);
+            }
+        }
+        return mediaTypes;
+    }
+
+    public ServerMediaType serverMediaType() {
+        if (serverMediaType == null) {
+            synchronized (this) {
+                // a MessageBodyWriter should always return its configured media type when negotiating, hence the 'false' for 'useSuffix'
+                serverMediaType = new ServerMediaType(mediaTypes(), StandardCharsets.UTF_8.name(), false, false);
+            }
+        }
+        return serverMediaType;
+    }
+
+    public boolean matchesRuntimeType(RuntimeType runtimeType) {
+        if (runtimeType == null) {
+            return true;
+        }
+        if (constraint == null) {
+            return true;
+        }
+        return runtimeType == constraint;
+    }
+
+    @Override
+    public String toString() {
+        return "ResourceWriter[constraint: " + constraint + ", mediaTypes: " + mediaTypes + ", factory: " + factory + "]";
+    }
+
+    /**
+     * The comparison for now is simple:
+     * 1) Application provided writers come first
+     * 2) Then the more specific the media type, the higher the priority
+     * 3) Finally we compare the number of media types
+     */
+    public static class ResourceWriterComparator implements Comparator<ResourceWriter> {
+
+        public static final ResourceWriterComparator INSTANCE = new ResourceWriterComparator();
+
+        @Override
+        public int compare(ResourceWriter o1, ResourceWriter o2) {
+            int builtInCompare = Boolean.compare(o1.isBuiltin(), o2.isBuiltin());
+            if (builtInCompare != 0) {
+                return builtInCompare;
+            }
+
+            List<MediaType> mediaTypes1 = o1.mediaTypes();
+            List<MediaType> mediaTypes2 = o2.mediaTypes();
+            if (mediaTypes1.isEmpty() && mediaTypes2.isEmpty()) {
+                return 0;
+            }
+            if (mediaTypes1.isEmpty()) {
+                return 1;
+            }
+            if (mediaTypes2.isEmpty()) {
+                return -1;
+            }
+            int mediaTypeCompare = MediaTypeHelper.compareWeight(mediaTypes1.get(0), mediaTypes2.get(0));
+            if (mediaTypeCompare != 0) {
+                return mediaTypeCompare;
+            }
+
+            // TODO: not sure if this makes sense but was added to make the sorting more deterministic
+            return Integer.compare(mediaTypes1.size(), mediaTypes2.size());
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java
new file mode 100644
index 0000000000000..0221faf3b5af6
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/RestClientInterface.java
@@ -0,0 +1,62 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.jboss.resteasy.reactive.common.util.URLUtils;
+
+public class RestClientInterface {
+
+    /**
+     * The class name of the interface
+     */
+    private String className;
+
+    /**
+     * The class path
+     */
+    private String path;
+
+    /**
+     * The resource methods
+     */
+    private final List<ResourceMethod> methods = new ArrayList<>();
+
+    private Set<String> pathParameters = new HashSet<>();
+
+    public String getClassName() {
+        return className;
+    }
+
+    public RestClientInterface setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public RestClientInterface setPath(String path) {
+        this.path = path;
+        if (path != null) {
+            pathParameters.clear();
+            URLUtils.parsePathParameters(path, pathParameters);
+        }
+        return this;
+    }
+
+    public List<ResourceMethod> getMethods() {
+        return methods;
+    }
+
+    public Set<String> getPathParameters() {
+        return pathParameters;
+    }
+
+    public RestClientInterface setPathParameters(Set<String> pathParameters) {
+        this.pathParameters = pathParameters;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java
new file mode 100644
index 0000000000000..a3d7082317cf0
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/model/SettableResourceInterceptor.java
@@ -0,0 +1,13 @@
+package org.jboss.resteasy.reactive.common.model;
+
+import java.util.Set;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public interface SettableResourceInterceptor<T> {
+
+    void setFactory(BeanFactory<T> factory);
+
+    void setNameBindingNames(Set<String> nameBindings);
+
+    void setPriority(Integer priority);
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java
new file mode 100644
index 0000000000000..aee1e581bf9f1
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/BooleanMessageBodyHandler.java
@@ -0,0 +1,23 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+
+public class BooleanMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader<Boolean> {
+    public Boolean readFrom(Class<Boolean> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+            throws IOException, WebApplicationException {
+        return Boolean.valueOf(readFrom(entityStream, false));
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return type == Boolean.class;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java
new file mode 100644
index 0000000000000..a1b9544dde41b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ByteArrayMessageBodyHandler.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class ByteArrayMessageBodyHandler implements MessageBodyReader<byte[]>, MessageBodyWriter<byte[]> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public void writeTo(byte[] o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        entityStream.write(o);
+    }
+
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public byte[] readFrom(Class<byte[]> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return MessageReaderUtil.readBytes(entityStream);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java
new file mode 100644
index 0000000000000..08034b8f57717
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharArrayMessageBodyHandler.java
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class CharArrayMessageBodyHandler implements MessageBodyReader<char[]>, MessageBodyWriter<char[]> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public void writeTo(char[] o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        // FIXME: use response encoding
+        entityStream.write(new String(o).getBytes(StandardCharsets.UTF_8));
+    }
+
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return type.equals(String.class);
+    }
+
+    public char[] readFrom(Class<char[]> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return MessageReaderUtil.readString(entityStream, mediaType).toCharArray();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java
new file mode 100644
index 0000000000000..e5df390933f09
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/CharacterMessageBodyHandler.java
@@ -0,0 +1,30 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+
+public class CharacterMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader<Character> {
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return type == Character.class;
+    }
+
+    public Character readFrom(Class<Character> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+            throws IOException, WebApplicationException {
+        return doReadFrom(entityStream);
+    }
+
+    protected char doReadFrom(InputStream entityStream) throws IOException {
+        String string = readFrom(entityStream, false);
+        if (string.length() == 1)
+            return string.charAt(0);
+        throw new BadRequestException("Invalid character: " + string);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java
new file mode 100644
index 0000000000000..b1735b68f52a1
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/DefaultTextPlainBodyHandler.java
@@ -0,0 +1,37 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import org.jboss.resteasy.reactive.common.util.TypeConverter;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ *
+ *          TODO: Reevaluate this as it depends on a lot of reflection for reading Java types.
+ *          It should not be difficult to write handlers for these cases...
+ */
+public abstract class DefaultTextPlainBodyHandler implements MessageBodyReader<Object> {
+
+    public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        // StringTextStar should pick up strings
+        return !String.class.equals(type) && TypeConverter.isConvertable(type);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Object readFrom(Class type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        String input = MessageReaderUtil.readString(entityStream, mediaType);
+        validateInput(input);
+        return TypeConverter.getType(type, input);
+    }
+
+    protected abstract void validateInput(String input) throws ProcessingException;
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java
new file mode 100644
index 0000000000000..e7e4a462d3ff2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FileBodyHandler.java
@@ -0,0 +1,68 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+
+public class FileBodyHandler implements MessageBodyReader<File>, MessageBodyWriter<File> {
+    protected static final String PREFIX = "pfx";
+    protected static final String SUFFIX = "sfx";
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return File.class == type;
+    }
+
+    @Override
+    public File readFrom(Class<File> type, Type genericType,
+            Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException {
+        File downloadedFile = File.createTempFile(PREFIX, SUFFIX);
+        if (HeaderUtil.isContentLengthZero(httpHeaders)) {
+            return downloadedFile;
+        }
+
+        try (OutputStream output = new BufferedOutputStream(new FileOutputStream(downloadedFile))) {
+            int read;
+            final byte[] buf = new byte[2048];
+            while ((read = entityStream.read(buf)) != -1) {
+                output.write(buf, 0, read);
+            }
+        }
+
+        return downloadedFile;
+    }
+
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return File.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(File uploadFile, Class<?> type, Type genericType,
+            Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders,
+            OutputStream entityStream) throws IOException {
+        doWrite(uploadFile, entityStream);
+    }
+
+    protected void doWrite(File uploadFile, OutputStream out) throws IOException {
+        try (InputStream inputStream = new BufferedInputStream(new FileInputStream(uploadFile))) {
+            int read;
+            final byte[] buf = new byte[2048];
+            while ((read = inputStream.read(buf)) != -1) {
+                out.write(buf, 0, read);
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java
new file mode 100644
index 0000000000000..e19231caf8126
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/FormUrlEncodedProvider.java
@@ -0,0 +1,85 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.util.Encode;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+
+public class FormUrlEncodedProvider implements MessageBodyWriter<MultivaluedMap>, MessageBodyReader<MultivaluedMap> {
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return MultivaluedMap.class.equals(type);
+    }
+
+    public MultivaluedMap readFrom(Class<MultivaluedMap> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException {
+        return doReadFrom(mediaType, entityStream);
+    }
+
+    protected MultivaluedMap<String, String> doReadFrom(MediaType mediaType, InputStream entityStream) throws IOException {
+        String charset = MessageReaderUtil.charsetFromMediaType(mediaType);
+        return Encode.decode(FormUrlEncodedProvider.parseForm(entityStream, mediaType), charset);
+    }
+
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return MultivaluedMap.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(MultivaluedMap multivaluedMap, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream)
+            throws IOException, WebApplicationException {
+        String chartSet = MessageReaderUtil.charsetFromMediaType(mediaType);
+        entityStream.write(multiValuedMapToString(multivaluedMap, chartSet).getBytes(chartSet));
+    }
+
+    protected String multiValuedMapToString(MultivaluedMap data, String charset) throws UnsupportedEncodingException {
+        MultivaluedMap<String, String> formData = (MultivaluedMap<String, String>) data;
+        boolean first = true;
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, List<String>> entry : formData.entrySet()) {
+            for (String value : entry.getValue()) {
+                if (!first) {
+                    sb.append("&");
+                }
+                value = URLEncoder.encode(value, charset);
+                sb.append(entry.getKey());
+                sb.append("=");
+                sb.append(value);
+                first = false;
+            }
+        }
+        return sb.toString();
+    }
+
+    public static MultivaluedMap<String, String> parseForm(InputStream entityStream, MediaType charset) throws IOException {
+        String form = MessageReaderUtil.readString(entityStream, charset);
+
+        MultivaluedMap<String, String> formData = new QuarkusMultivaluedHashMap<String, String>();
+        if ("".equals(form)) {
+            return formData;
+        }
+
+        String[] params = form.split("&");
+        for (String param : params) {
+            if (param.indexOf('=') >= 0) {
+                String[] nv = param.split("=");
+                String val = nv.length > 1 ? nv[1] : "";
+                formData.add(nv[0], val);
+            } else {
+                formData.add(param, "");
+            }
+        }
+        return formData;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java
new file mode 100644
index 0000000000000..88d6c1b4bb106
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/InputStreamMessageBodyHandler.java
@@ -0,0 +1,45 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class InputStreamMessageBodyHandler implements MessageBodyWriter<InputStream>, MessageBodyReader<InputStream> {
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public InputStream readFrom(Class<InputStream> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return entityStream;
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return InputStream.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeTo(InputStream inputStream, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        try {
+            int c;
+            while ((c = inputStream.read()) != -1) {
+                entityStream.write(c);
+            }
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                // Drop the exception so we don't mask real IO errors
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java
new file mode 100644
index 0000000000000..5bc9f548e36d4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/MessageReaderUtil.java
@@ -0,0 +1,37 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import javax.ws.rs.core.MediaType;
+
+public class MessageReaderUtil {
+
+    public static final String UTF8_CHARSET = StandardCharsets.UTF_8.name();
+
+    public static String charsetFromMediaType(MediaType mediaType) {
+        if (mediaType == null) {
+            return UTF8_CHARSET;
+        }
+        String charset = mediaType.getParameters().get(MediaType.CHARSET_PARAMETER);
+        if (charset != null) {
+            return charset;
+        }
+        return UTF8_CHARSET;
+    }
+
+    public static byte[] readBytes(InputStream entityStream) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        byte[] buf = new byte[1024]; //TODO: fix, needs a pure vert.x async read model
+        int r;
+        while ((r = entityStream.read(buf)) > 0) {
+            out.write(buf, 0, r);
+        }
+        return out.toByteArray();
+    }
+
+    public static String readString(InputStream entityStream, MediaType mediaType) throws IOException {
+        return new String(readBytes(entityStream), charsetFromMediaType(mediaType));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java
new file mode 100644
index 0000000000000..12ff0055ea58f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/NumberMessageBodyHandler.java
@@ -0,0 +1,46 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+
+public class NumberMessageBodyHandler extends PrimitiveBodyHandler implements MessageBodyReader<Number> {
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return Number.class.isAssignableFrom(type);
+    }
+
+    public Number readFrom(Class<Number> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+            throws IOException, WebApplicationException {
+        return doReadFrom(type, entityStream);
+    }
+
+    protected Number doReadFrom(Class<Number> type, InputStream entityStream) throws IOException {
+        String text = readFrom(entityStream, false);
+        // we initially had one provider per number type, but the TCK wants this Number provider to be overridable
+        if ((Class<? extends Number>) type == Byte.class || (Class<? extends Number>) type == byte.class)
+            return Byte.valueOf(text);
+        if ((Class<? extends Number>) type == Short.class || (Class<? extends Number>) type == short.class)
+            return Integer.valueOf(text);
+        if ((Class<? extends Number>) type == Integer.class || (Class<? extends Number>) type == int.class)
+            return Integer.valueOf(text);
+        if ((Class<? extends Number>) type == Long.class || (Class<? extends Number>) type == long.class)
+            return Long.valueOf(text);
+        if ((Class<? extends Number>) type == Float.class || (Class<? extends Number>) type == float.class)
+            return Float.valueOf(text);
+        if ((Class<? extends Number>) type == Double.class || (Class<? extends Number>) type == double.class)
+            return Double.valueOf(text);
+        if ((Class<? extends Number>) type == BigDecimal.class)
+            return new BigDecimal(text);
+        if ((Class<? extends Number>) type == BigInteger.class)
+            return new BigInteger(text);
+        throw new RuntimeException("Don't know how to handle number class " + type);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java
new file mode 100644
index 0000000000000..2844e145617f9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/PrimitiveBodyHandler.java
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import javax.ws.rs.core.NoContentException;
+
+public abstract class PrimitiveBodyHandler {
+
+    public String readFrom(InputStream entityStream, boolean allowEmpty) throws IOException {
+        byte[] bytes;
+        if (entityStream instanceof ByteArrayInputStream) {
+            bytes = new byte[entityStream.available()];
+            entityStream.read(bytes);
+        } else {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            byte[] buf = new byte[1024]; //TODO: fix, needs a pure vert.x async read model
+            int r;
+            while ((r = entityStream.read(buf)) > 0) {
+                out.write(buf, 0, r);
+            }
+            bytes = out.toByteArray();
+        }
+        if (!allowEmpty) {
+            if (bytes.length == 0) {
+                throw new NoContentException("No content");
+            }
+        }
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java
new file mode 100644
index 0000000000000..48ade5a1f7c5b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/ReaderBodyHandler.java
@@ -0,0 +1,44 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class ReaderBodyHandler implements MessageBodyWriter<Reader>, MessageBodyReader<Reader> {
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return type.equals(Reader.class);
+    }
+
+    public Reader readFrom(Class<Reader> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException {
+        return new InputStreamReader(entityStream, MessageReaderUtil.charsetFromMediaType(mediaType));
+    }
+
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return Reader.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(Reader inputStream, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
+        try {
+            int c;
+            while ((c = inputStream.read()) != -1) {
+                entityStream.write(c);
+            }
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                // Drop the exception so we don't mask real IO errors
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java
new file mode 100644
index 0000000000000..44455e38b904d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/StringMessageBodyHandler.java
@@ -0,0 +1,35 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class StringMessageBodyHandler extends PrimitiveBodyHandler
+        implements MessageBodyReader<String>, MessageBodyWriter<Object> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public void writeTo(Object o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        // FIXME: use response encoding
+        entityStream.write(o.toString().getBytes(StandardCharsets.UTF_8));
+    }
+
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return type.equals(String.class);
+    }
+
+    public String readFrom(Class<String> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return readFrom(entityStream, true);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java
new file mode 100644
index 0000000000000..a9bd0af2d66ff
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonArrayHandler.java
@@ -0,0 +1,38 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers.jsonp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.json.JsonArray;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class JsonArrayHandler implements MessageBodyReader<JsonArray>, MessageBodyWriter<JsonArray> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonArray.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(JsonArray o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        try (JsonWriter writer = JsonpUtil.writer(entityStream, mediaType)) {
+            writer.writeArray(o);
+        }
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonArray.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public JsonArray readFrom(Class<JsonArray> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return JsonpUtil.reader(entityStream, mediaType).readArray();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java
new file mode 100644
index 0000000000000..fdcf8b2d0b287
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonObjectHandler.java
@@ -0,0 +1,38 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers.jsonp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.json.JsonObject;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class JsonObjectHandler implements MessageBodyReader<JsonObject>, MessageBodyWriter<JsonObject> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonObject.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(JsonObject o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        try (JsonWriter writer = JsonpUtil.writer(entityStream, mediaType)) {
+            writer.writeObject(o);
+        }
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonObject.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public JsonObject readFrom(Class<JsonObject> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return JsonpUtil.reader(entityStream, mediaType).readObject();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java
new file mode 100644
index 0000000000000..3d84fd8028986
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonStructureHandler.java
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers.jsonp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.json.JsonObject;
+import javax.json.JsonStructure;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class JsonStructureHandler implements MessageBodyReader<JsonStructure>, MessageBodyWriter<JsonStructure> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonStructure.class.isAssignableFrom(type) && !JsonObject.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(JsonStructure o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        try (JsonWriter writer = JsonpUtil.writer(entityStream, mediaType)) {
+            writer.write(o);
+        }
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonStructure.class.isAssignableFrom(type) && !JsonObject.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public JsonStructure readFrom(Class<JsonStructure> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return JsonpUtil.reader(entityStream, mediaType).read();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java
new file mode 100644
index 0000000000000..f4861375e00d3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonValueHandler.java
@@ -0,0 +1,38 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers.jsonp;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.json.JsonValue;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+public class JsonValueHandler implements MessageBodyReader<JsonValue>, MessageBodyWriter<JsonValue> {
+    public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonValue.class.isAssignableFrom(type);
+    }
+
+    public void writeTo(JsonValue jsonValue, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
+        try (JsonWriter writer = JsonpUtil.writer(entityStream, mediaType)) {
+            writer.write(jsonValue);
+        }
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return JsonValue.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public JsonValue readFrom(Class<JsonValue> type, Type genericType, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+        return JsonpUtil.reader(entityStream, mediaType).readValue();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java
new file mode 100644
index 0000000000000..3134103713137
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/providers/serialisers/jsonp/JsonpUtil.java
@@ -0,0 +1,27 @@
+package org.jboss.resteasy.reactive.common.providers.serialisers.jsonp;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import javax.json.Json;
+import javax.json.JsonReader;
+import javax.json.JsonReaderFactory;
+import javax.json.JsonWriter;
+import javax.json.JsonWriterFactory;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
+
+public final class JsonpUtil {
+
+    private static final JsonReaderFactory jsonReaderFactory = Json.createReaderFactory(null);
+    private static final JsonWriterFactory jsonWriterFactory = Json.createWriterFactory(null);
+
+    public static JsonReader reader(InputStream entityStream, MediaType mediaType) {
+        return jsonReaderFactory.createReader(entityStream, Charset.forName(MessageReaderUtil.charsetFromMediaType(mediaType)));
+    }
+
+    public static JsonWriter writer(OutputStream entityStream, MediaType mediaType) {
+        return jsonWriterFactory.createWriter(entityStream, Charset.forName(MessageReaderUtil.charsetFromMediaType(mediaType)));
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ArrayCharSequence.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ArrayCharSequence.java
new file mode 100644
index 0000000000000..4b65a717cb3f3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ArrayCharSequence.java
@@ -0,0 +1,55 @@
+package org.jboss.resteasy.reactive.common.util;
+
+/**
+ * A CharSequence backed by a char[] (no copy on creation)
+ *
+ */
+public class ArrayCharSequence implements CharSequence {
+    private final char[] buf;
+    private final int offset;
+    private final int count;
+
+    public ArrayCharSequence(final char[] buff) {
+        this(buff, 0, buff.length);
+    }
+
+    public ArrayCharSequence(final char[] buff, final int count) {
+        this(buff, 0, count);
+    }
+
+    public ArrayCharSequence(final char[] buff, final int offset, final int count) {
+        this.buf = buff;
+        this.offset = offset;
+        this.count = count;
+    }
+
+    public char charAt(int index) {
+        if (index < 0 || index >= count) {
+            throw new StringIndexOutOfBoundsException(index);
+        }
+        return buf[offset + index];
+    }
+
+    public int length() {
+        return count;
+    }
+
+    public CharSequence subSequence(int beginIndex, int endIndex) {
+        if (beginIndex < 0) {
+            throw new StringIndexOutOfBoundsException(beginIndex);
+        }
+        if (endIndex > count) {
+            throw new StringIndexOutOfBoundsException(endIndex);
+        }
+        if (beginIndex > endIndex) {
+            throw new StringIndexOutOfBoundsException(endIndex - beginIndex);
+        }
+        return ((beginIndex == 0) && (endIndex == count))
+                ? this
+                : new ArrayCharSequence(buf, offset + beginIndex, endIndex - beginIndex);
+    }
+
+    public String toString() {
+        return new String(this.buf, this.offset, this.count);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CaseInsensitiveMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CaseInsensitiveMap.java
new file mode 100644
index 0000000000000..c757c6debd1e5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CaseInsensitiveMap.java
@@ -0,0 +1,45 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.Comparator;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class CaseInsensitiveMap<V> extends MultivaluedTreeMap<String, V> {
+    public static final Comparator<String> CASE_INSENSITIVE_ORDER = new CaseInsensitiveComparator();
+
+    private static class CaseInsensitiveComparator
+            implements Comparator<String>, java.io.Serializable {
+
+        public int compare(String s1, String s2) {
+            if (s1 == s2)
+                return 0;
+            int n1 = 0;
+            // null check is different than JDK version of this method
+            if (s1 != null)
+                n1 = s1.length();
+            int n2 = 0;
+            if (s2 != null)
+                n2 = s2.length();
+            int min = Math.min(n1, n2);
+            for (int i = 0; i < min; i++) {
+                char c1 = s1.charAt(i);
+                char c2 = s2.charAt(i);
+                if (c1 != c2) {
+                    c1 = Character.toLowerCase(c1);
+                    c2 = Character.toLowerCase(c2);
+                    if (c1 != c2) {
+                        // No overflow because of numeric promotion
+                        return c1 - c2;
+                    }
+                }
+            }
+            return n1 - n2;
+        }
+    }
+
+    public CaseInsensitiveMap() {
+        super(CASE_INSENSITIVE_ORDER);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CommonSseUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CommonSseUtil.java
new file mode 100644
index 0000000000000..8791dbe1f3168
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CommonSseUtil.java
@@ -0,0 +1,7 @@
+package org.jboss.resteasy.reactive.common.util;
+
+public class CommonSseUtil {
+    //TODO: API for optimised charsequence creation
+    //public static final CharSequence SSE_CONTENT_TYPE = io.vertx.core.http.HttpHeaders.createOptimized("X-SSE-Content-Type");
+    public static final CharSequence SSE_CONTENT_TYPE = "X-SSE-Content-Type";
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java
new file mode 100644
index 0000000000000..d27c186de4348
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/CookieParser.java
@@ -0,0 +1,57 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.ws.rs.core.Cookie;
+
+public class CookieParser {
+    public static List<Cookie> parseCookies(String cookieHeader) {
+        if (cookieHeader == null) {
+            throw new IllegalArgumentException("Cookie value was null");
+        }
+        // cookie headers can be separated by "," (HTTP header separator), or ";" (Cookie separator)
+        // FIXME: the current cookie RFC doesn't mention params for cookies sent by the client
+        // doesn't mention $ as a prefix either
+        // FIXME: make this faster if we have a single cooke
+        try {
+            List<Cookie> cookies = new ArrayList<>();
+
+            int version = 0;
+            String domain = null;
+            String path = null;
+            String cookieName = null;
+            String cookieValue = null;
+
+            String[] parts = cookieHeader.split("[;,]");
+            for (String part : parts) {
+                String[] nv = part.split("=", 2);
+                String name = nv.length > 0 ? nv[0].trim() : "";
+                String value = nv.length > 1 ? nv[1].trim() : "";
+                if (value.startsWith("\"") && value.endsWith("\"") && value.length() > 1)
+                    value = value.substring(1, value.length() - 1);
+                if (!name.startsWith("$")) {
+                    if (cookieName != null) {
+                        cookies.add(new Cookie(cookieName, cookieValue, path, domain, version));
+                        cookieName = cookieValue = path = domain = null;
+                    }
+
+                    cookieName = name;
+                    cookieValue = value;
+                } else if (name.equalsIgnoreCase("$Version")) {
+                    version = Integer.parseInt(value);
+                } else if (name.equalsIgnoreCase("$Path")) {
+                    path = value;
+                } else if (name.equalsIgnoreCase("$Domain")) {
+                    domain = value;
+                }
+            }
+            if (cookieName != null) {
+                cookies.add(new Cookie(cookieName, cookieValue, path, domain, version));
+
+            }
+            return cookies;
+        } catch (Exception ex) {
+            throw new IllegalArgumentException("Failed to parse cookie: " + cookieHeader, ex);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DateUtil.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DateUtil.java
new file mode 100644
index 0000000000000..93661cdf9a47d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DateUtil.java
@@ -0,0 +1,191 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ * A utility class for parsing and formatting HTTP dates as used in cookies and
+ * other headers. This class handles dates as defined by RFC 2616 section
+ * 3.3.1 as well as some other common non-standard formats.
+ *
+ * @author Christopher Brown
+ * @author Michael Becke
+ */
+public class DateUtil {
+
+    public static class DateParseException extends RuntimeException {
+        public DateParseException() {
+        }
+
+        public DateParseException(final String s) {
+            super(s);
+        }
+
+        public DateParseException(final String s, final Throwable throwable) {
+            super(s, throwable);
+        }
+
+        public DateParseException(final Throwable throwable) {
+            super(throwable);
+        }
+    }
+
+    /**
+     * Date format pattern used to parse HTTP date headers in RFC 1123 format.
+     */
+    public static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
+
+    /**
+     * Date format pattern used to parse HTTP date headers in RFC 1036 format.
+     */
+    public static final String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz";
+
+    /**
+     * Date format pattern used to parse HTTP date headers in ANSI C
+     * <code>asctime()</code> format.
+     */
+    public static final String PATTERN_ASCTIME = "EEE MMM d HH:mm:ss yyyy";
+
+    private static final Collection DEFAULT_PATTERNS = Arrays.asList(
+            new String[] { PATTERN_ASCTIME, PATTERN_RFC1036, PATTERN_RFC1123 });
+
+    private static final Date DEFAULT_TWO_DIGIT_YEAR_START;
+
+    static {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(2000, Calendar.JANUARY, 1, 0, 0);
+        DEFAULT_TWO_DIGIT_YEAR_START = calendar.getTime();
+    }
+
+    private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
+
+    /**
+     * Parses a date value. The formats used for parsing the date value are retrieved from
+     * the default http params.
+     *
+     * @param dateValue the date value to parse
+     * @return the parsed date
+     * @throws DateParseException if the value could not be parsed using any of the
+     *         supported date formats
+     */
+    public static Date parseDate(String dateValue) throws DateParseException {
+        return parseDate(dateValue, null, null);
+    }
+
+    /**
+     * Parses the date value using the given date formats.
+     *
+     * @param dateValue the date value to parse
+     * @param dateFormats the date formats to use
+     * @return the parsed date
+     * @throws DateParseException if none of the dataFormats could parse the dateValue
+     */
+    public static Date parseDate(String dateValue, Collection dateFormats)
+            throws DateParseException {
+        return parseDate(dateValue, dateFormats, null);
+    }
+
+    /**
+     * Parses the date value using the given date formats.
+     *
+     * @param dateValue the date value to parse
+     * @param dateFormats the date formats to use
+     * @param startDate During parsing, two digit years will be placed in the range
+     *        <code>startDate</code> to <code>startDate + 100 years</code>. This value may
+     *        be <code>null</code>. When <code>null</code> is given as a parameter, year
+     *        <code>2000</code> will be used.
+     * @return the parsed date
+     * @throws DateParseException if none of the dataFormats could parse the dateValue
+     */
+    public static Date parseDate(
+            String dateValue,
+            Collection dateFormats,
+            Date startDate) throws DateParseException {
+
+        if (dateValue == null) {
+            throw new IllegalArgumentException("Date was null");
+        }
+        if (dateFormats == null) {
+            dateFormats = DEFAULT_PATTERNS;
+        }
+        if (startDate == null) {
+            startDate = DEFAULT_TWO_DIGIT_YEAR_START;
+        }
+        // trim single quotes around date if present
+        // see issue #5279
+        if (dateValue.length() > 1
+                && dateValue.startsWith("'")
+                && dateValue.endsWith("'")) {
+            dateValue = dateValue.substring(1, dateValue.length() - 1);
+        }
+
+        SimpleDateFormat dateParser = null;
+        Iterator formatIter = dateFormats.iterator();
+
+        while (formatIter.hasNext()) {
+            String format = (String) formatIter.next();
+            if (dateParser == null) {
+                dateParser = new SimpleDateFormat(format, Locale.US);
+                dateParser.setTimeZone(TimeZone.getTimeZone("GMT"));
+                dateParser.set2DigitYearStart(startDate);
+            } else {
+                dateParser.applyPattern(format);
+            }
+            try {
+                return dateParser.parse(dateValue);
+            } catch (ParseException pe) {
+                // ignore this exception, we will try the next format
+            }
+        }
+
+        // we were unable to parse the date
+        throw new DateParseException("Unable to parse " + dateValue);
+    }
+
+    /**
+     * Formats the given date according to the RFC 1123 pattern.
+     *
+     * @param date The date to format.
+     * @return An RFC 1123 formatted date string.
+     * @see #PATTERN_RFC1123
+     */
+    public static String formatDate(Date date) {
+        return formatDate(date, PATTERN_RFC1123);
+    }
+
+    /**
+     * Formats the given date according to the specified pattern. The pattern
+     * must conform to that used by the {@link SimpleDateFormat simple date
+     * format} class.
+     *
+     * @param date The date to format.
+     * @param pattern The pattern to use for formatting the date.
+     * @return A formatted date string.
+     * @throws IllegalArgumentException If the given date pattern is invalid.
+     * @see SimpleDateFormat
+     */
+    public static String formatDate(Date date, String pattern) {
+        if (date == null)
+            throw new IllegalArgumentException("Date was null");
+        if (pattern == null)
+            throw new IllegalArgumentException("Pattern was null");
+
+        SimpleDateFormat formatter = new SimpleDateFormat(pattern, Locale.US);
+        formatter.setTimeZone(GMT);
+        return formatter.format(date);
+    }
+
+    /**
+     * This class should not be instantiated.
+     */
+    private DateUtil() {
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java
new file mode 100644
index 0000000000000..46ef3fd183945
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/DeploymentUtils.java
@@ -0,0 +1,47 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+
+public abstract class DeploymentUtils {
+    private static final Map<String, Class<?>> primitiveTypes;
+
+    static {
+        Map<String, Class<?>> prims = new HashMap<>();
+        prims.put(byte.class.getName(), byte.class);
+        prims.put(boolean.class.getName(), boolean.class);
+        prims.put(char.class.getName(), char.class);
+        prims.put(short.class.getName(), short.class);
+        prims.put(int.class.getName(), int.class);
+        prims.put(float.class.getName(), float.class);
+        prims.put(double.class.getName(), double.class);
+        prims.put(long.class.getName(), long.class);
+        primitiveTypes = Collections.unmodifiableMap(prims);
+    }
+
+    public static void registerWriter(Serialisers serialisers, String entityClassName,
+            ResourceWriter writer) {
+        serialisers.addWriter(loadClass(entityClassName), writer);
+    }
+
+    public static void registerReader(Serialisers serialisers, String entityClassName,
+            ResourceReader reader) {
+        serialisers.addReader(loadClass(entityClassName), reader);
+    }
+
+    public static <T> Class<T> loadClass(String name) {
+        if (primitiveTypes.containsKey(name)) {
+            return (Class<T>) primitiveTypes.get(name);
+        }
+        try {
+            return (Class<T>) Class.forName(name, false, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/EmptyInputStream.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/EmptyInputStream.java
new file mode 100644
index 0000000000000..bc1ff37dacc97
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/EmptyInputStream.java
@@ -0,0 +1,14 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class EmptyInputStream extends InputStream {
+
+    public static final EmptyInputStream INSTANCE = new EmptyInputStream();
+
+    @Override
+    public int read() throws IOException {
+        return -1;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java
new file mode 100644
index 0000000000000..9000b871b62a1
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/Encode.java
@@ -0,0 +1,515 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class Encode {
+    private static final String UTF_8 = StandardCharsets.UTF_8.name();
+
+    private static final Pattern PARAM_REPLACEMENT = Pattern.compile("_resteasy_uri_parameter");
+
+    private static final String[] pathEncoding = new String[128];
+    private static final String[] pathSegmentEncoding = new String[128];
+    private static final String[] matrixParameterEncoding = new String[128];
+    private static final String[] queryNameValueEncoding = new String[128];
+    private static final String[] queryStringEncoding = new String[128];
+
+    static {
+        /*
+         * Encode via <a href="http://ietf.org/rfc/rfc3986.txt">RFC 3986</a>. PCHAR is allowed allong with '/'
+         *
+         * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
+         * sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
+         * / "*" / "+" / "," / ";" / "="
+         * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
+         *
+         */
+        for (int i = 0; i < 128; i++) {
+            if (i >= 'a' && i <= 'z')
+                continue;
+            if (i >= 'A' && i <= 'Z')
+                continue;
+            if (i >= '0' && i <= '9')
+                continue;
+            switch ((char) i) {
+                case '-':
+                case '.':
+                case '_':
+                case '~':
+                case '!':
+                case '$':
+                case '&':
+                case '\'':
+                case '(':
+                case ')':
+                case '*':
+                case '+':
+                case ',':
+                case '/':
+                case ';':
+                case '=':
+                case ':':
+                case '@':
+                    continue;
+            }
+            pathEncoding[i] = encodeString(String.valueOf((char) i));
+        }
+        pathEncoding[' '] = "%20";
+        System.arraycopy(pathEncoding, 0, matrixParameterEncoding, 0, pathEncoding.length);
+        matrixParameterEncoding[';'] = "%3B";
+        matrixParameterEncoding['='] = "%3D";
+        matrixParameterEncoding['/'] = "%2F"; // RESTEASY-729
+        System.arraycopy(pathEncoding, 0, pathSegmentEncoding, 0, pathEncoding.length);
+        pathSegmentEncoding['/'] = "%2F";
+        /*
+         * Encode via <a href="http://ietf.org/rfc/rfc3986.txt">RFC 3986</a>.
+         *
+         * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
+         * space encoded as '+'
+         *
+         */
+        for (int i = 0; i < 128; i++) {
+            if (i >= 'a' && i <= 'z')
+                continue;
+            if (i >= 'A' && i <= 'Z')
+                continue;
+            if (i >= '0' && i <= '9')
+                continue;
+            switch ((char) i) {
+                case '-':
+                case '.':
+                case '_':
+                case '~':
+                case '?':
+                    continue;
+                case ' ':
+                    queryNameValueEncoding[i] = "+";
+                    continue;
+            }
+            queryNameValueEncoding[i] = encodeString(String.valueOf((char) i));
+        }
+
+        /*
+         * query = *( pchar / "/" / "?" )
+         *
+         */
+        for (int i = 0; i < 128; i++) {
+            if (i >= 'a' && i <= 'z')
+                continue;
+            if (i >= 'A' && i <= 'Z')
+                continue;
+            if (i >= '0' && i <= '9')
+                continue;
+            switch ((char) i) {
+                case '-':
+                case '.':
+                case '_':
+                case '~':
+                case '!':
+                case '$':
+                case '&':
+                case '\'':
+                case '(':
+                case ')':
+                case '*':
+                case '+':
+                case ',':
+                case ';':
+                case '=':
+                case ':':
+                case '@':
+                case '?':
+                case '/':
+                    continue;
+                case ' ':
+                    queryStringEncoding[i] = "%20";
+                    continue;
+            }
+            queryStringEncoding[i] = encodeString(String.valueOf((char) i));
+        }
+    }
+
+    /**
+     * Keep encoded values "%..." and template parameters intact.
+     *
+     * @param value query string
+     * @return encoded query string
+     */
+    public static String encodeQueryString(String value) {
+        return encodeValue(value, queryStringEncoding);
+    }
+
+    /**
+     * Keep encoded values "%...", matrix parameters, template parameters, and '/' characters intact.
+     *
+     * @param value path
+     * @return encoded path
+     */
+    public static String encodePath(String value) {
+        return encodeValue(value, pathEncoding);
+    }
+
+    /**
+     * Keep encoded values "%...", matrix parameters and template parameters intact.
+     *
+     * @param value path segment
+     * @return encoded path segment
+     */
+    public static String encodePathSegment(String value) {
+        return encodeValue(value, pathSegmentEncoding);
+    }
+
+    /**
+     * Keep encoded values "%..." and template parameters intact.
+     *
+     * @param value uri fragment
+     * @return encoded uri fragment
+     */
+    public static String encodeFragment(String value) {
+        return encodeValue(value, queryStringEncoding);
+    }
+
+    /**
+     * Keep encoded values "%..." and template parameters intact.
+     *
+     * @param value matrix parameter
+     * @return encoded matrix parameter
+     */
+    public static String encodeMatrixParam(String value) {
+        return encodeValue(value, matrixParameterEncoding);
+    }
+
+    /**
+     * Keep encoded values "%..." and template parameters intact.
+     *
+     * @param value query parameter
+     * @return encoded query parameter
+     */
+    public static String encodeQueryParam(String value) {
+        return encodeValue(value, queryNameValueEncoding);
+    }
+
+    //private static final Pattern nonCodes = Pattern.compile("%([^a-fA-F0-9]|$)");
+    private static final Pattern nonCodes = Pattern.compile("%([^a-fA-F0-9]|[a-fA-F0-9]$|$|[a-fA-F0-9][^a-fA-F0-9])");
+    private static final Pattern encodedChars = Pattern.compile("%([a-fA-F0-9][a-fA-F0-9])");
+    private static final Pattern encodedCharsMulti = Pattern.compile("((%[a-fA-F0-9][a-fA-F0-9])+)");
+
+    public static String decodePath(String path) {
+        // FIXME: this doesn't appear to pass the TCK, because it fails to decode what it throws at it
+        // also it doesn't decode slashes (it should) and it decodes + (it should not)
+        //        return URLUtils.decode(path, StandardCharsets.UTF_8, false, null);
+        // So let's use the Vertx decoder for now
+        return URIDecoder.decodeURIComponent(path, false);
+    }
+
+    private static String decodeBytes(String enc, CharsetDecoder decoder) {
+        Matcher matcher = encodedChars.matcher(enc);
+        ByteBuffer bytes = ByteBuffer.allocate(enc.length() / 3);
+        while (matcher.find()) {
+            int b = Integer.parseInt(matcher.group(1), 16);
+            bytes.put((byte) b);
+        }
+        bytes.flip();
+        try {
+            return decoder.decode(bytes).toString();
+        } catch (CharacterCodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Encode '%' if it is not an encoding sequence
+     *
+     * @param string value to encode
+     * @return encoded value
+     */
+    public static String encodeNonCodes(String string) {
+        Matcher matcher = nonCodes.matcher(string);
+        StringBuilder builder = new StringBuilder();
+
+        // FYI: we do not use the no-arg matcher.find()
+        //      coupled with matcher.appendReplacement()
+        //      because the matched text may contain
+        //      a second % and we must make sure we
+        //      encode it (if necessary).
+        int idx = 0;
+        while (matcher.find(idx)) {
+            int start = matcher.start();
+            builder.append(string.substring(idx, start));
+            builder.append("%25");
+            idx = start + 1;
+        }
+        builder.append(string.substring(idx));
+        return builder.toString();
+    }
+
+    public static boolean savePathParams(String segmentString, StringBuilder newSegment, List<String> params) {
+        boolean foundParam = false;
+        // Regular expressions can have '{' and '}' characters.  Replace them to do match
+        CharSequence segment = PathHelper.replaceEnclosedCurlyBracesCS(segmentString);
+        Matcher matcher = PathHelper.URI_TEMPLATE_PATTERN.matcher(segment);
+        int start = 0;
+        while (matcher.find()) {
+            newSegment.append(segment, start, matcher.start());
+            foundParam = true;
+            String group = matcher.group();
+            // Regular expressions can have '{' and '}' characters.  Recover earlier replacement
+            params.add(PathHelper.recoverEnclosedCurlyBraces(group));
+            newSegment.append("_resteasy_uri_parameter");
+            start = matcher.end();
+        }
+        newSegment.append(segment, start, segment.length());
+        return foundParam;
+    }
+
+    /**
+     * Keep encoded values "%..." and template parameters intact i.e. "{x}"
+     *
+     * @param segment value to encode
+     * @param encoding encoding
+     * @return encoded value
+     */
+    public static String encodeValue(String segment, String[] encoding) {
+        ArrayList<String> params = new ArrayList<String>();
+        boolean foundParam = false;
+        StringBuilder newSegment = new StringBuilder();
+        if (savePathParams(segment, newSegment, params)) {
+            foundParam = true;
+            segment = newSegment.toString();
+        }
+        String result = encodeFromArray(segment, encoding, false);
+        result = encodeNonCodes(result);
+        segment = result;
+        if (foundParam) {
+            segment = pathParamReplacement(segment, params);
+        }
+        return segment;
+    }
+
+    /**
+     * Encode via <a href="http://ietf.org/rfc/rfc3986.txt">RFC 3986</a>. PCHAR is allowed allong with '/'
+     * <p>
+     * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
+     * sub-delims = "!" / "$" / "&#x26;" / "'" / "(" / ")"
+     * / "*" / "+" / "," / ";" / "="
+     * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
+     *
+     * @param segment value to encode
+     * @return encoded value
+     */
+    public static String encodePathAsIs(String segment) {
+        return encodeFromArray(segment, pathEncoding, true);
+    }
+
+    /**
+     * Keep any valid encodings from string i.e. keep "%2D" but don't keep "%p"
+     *
+     * @param segment value to encode
+     * @return encoded value
+     */
+    public static String encodePathSaveEncodings(String segment) {
+        String result = encodeFromArray(segment, pathEncoding, false);
+        result = encodeNonCodes(result);
+        return result;
+    }
+
+    /**
+     * Encode via <a href="http://ietf.org/rfc/rfc3986.txt">RFC 3986</a>. PCHAR is allowed allong with '/'
+     * <p>
+     * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
+     * sub-delims = "!" / "$" / "&#x26;" / "'" / "(" / ")"
+     * / "*" / "+" / "," / ";" / "="
+     * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
+     *
+     * @param segment value to encode
+     * @return encoded value
+     */
+    public static String encodePathSegmentAsIs(String segment) {
+        return encodeFromArray(segment, pathSegmentEncoding, true);
+    }
+
+    /**
+     * Keep any valid encodings from string i.e. keep "%2D" but don't keep "%p"
+     *
+     * @param segment value to encode
+     * @return encoded value
+     */
+    public static String encodePathSegmentSaveEncodings(String segment) {
+        String result = encodeFromArray(segment, pathSegmentEncoding, false);
+        result = encodeNonCodes(result);
+        return result;
+    }
+
+    /**
+     * Encodes everything of a query parameter name or value.
+     *
+     * @param nameOrValue value to encode
+     * @return encoded value
+     */
+    public static String encodeQueryParamAsIs(String nameOrValue) {
+        return encodeFromArray(nameOrValue, queryNameValueEncoding, true);
+    }
+
+    /**
+     * Keep any valid encodings from string i.e. keep "%2D" but don't keep "%p"
+     *
+     * @param segment value to encode
+     * @return encoded value
+     */
+    public static String encodeQueryParamSaveEncodings(String segment) {
+        String result = encodeFromArray(segment, queryNameValueEncoding, false);
+        result = encodeNonCodes(result);
+        return result;
+    }
+
+    public static String encodeFragmentAsIs(String nameOrValue) {
+        return encodeFromArray(nameOrValue, queryNameValueEncoding, true);
+    }
+
+    protected static String encodeFromArray(String segment, String[] encodingMap, boolean encodePercent) {
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < segment.length(); i++) {
+            char currentChar = segment.charAt(i);
+            if (!encodePercent && currentChar == '%') {
+                result.append(currentChar);
+                continue;
+            }
+            String encoding = encode(currentChar, encodingMap);
+            if (encoding == null) {
+                result.append(currentChar);
+            } else {
+                result.append(encoding);
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * @param zhar integer representation of character
+     * @param encodingMap encoding map
+     * @return URL encoded character
+     */
+    private static String encode(int zhar, String[] encodingMap) {
+        String encoded;
+        if (zhar < encodingMap.length) {
+            encoded = encodingMap[zhar];
+        } else {
+            encoded = encodeString(Character.toString((char) zhar));
+        }
+        return encoded;
+    }
+
+    /**
+     * Calls URLEncoder.encode(s, "UTF-8") on given input.
+     *
+     * @param s string to encode
+     * @return encoded string returned by URLEncoder.encode(s, "UTF-8")
+     */
+    public static String encodeString(String s) {
+        try {
+            return URLEncoder.encode(s, UTF_8);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String pathParamReplacement(String segment, List<String> params) {
+        StringBuilder newSegment = new StringBuilder();
+        Matcher matcher = PARAM_REPLACEMENT.matcher(segment);
+        int i = 0;
+        int start = 0;
+        while (matcher.find()) {
+            newSegment.append(segment, start, matcher.start());
+            String replacement = params.get(i++);
+            newSegment.append(replacement);
+            start = matcher.end();
+        }
+        newSegment.append(segment, start, segment.length());
+        segment = newSegment.toString();
+        return segment;
+    }
+
+    /**
+     * decode an encoded map
+     *
+     * @param map map
+     * @return decoded map
+     */
+    public static MultivaluedMap<String, String> decode(MultivaluedMap<String, String> map) {
+        MultivaluedMap<String, String> decoded = new QuarkusMultivaluedHashMap<String, String>();
+        for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+            List<String> values = entry.getValue();
+            for (String value : values) {
+                try {
+                    decoded.add(URLDecoder.decode(entry.getKey(), UTF_8), URLDecoder.decode(value, UTF_8));
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return decoded;
+    }
+
+    /**
+     * decode an encoded map
+     *
+     * @param map map
+     * @param charset charset
+     * @return decoded map
+     */
+    public static MultivaluedMap<String, String> decode(MultivaluedMap<String, String> map, String charset) {
+        if (charset == null) {
+            charset = UTF_8;
+        }
+        MultivaluedMap<String, String> decoded = new QuarkusMultivaluedHashMap<String, String>();
+        for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+            List<String> values = entry.getValue();
+            for (String value : values) {
+                try {
+                    decoded.add(URLDecoder.decode(entry.getKey(), charset), URLDecoder.decode(value, charset));
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return decoded;
+    }
+
+    public static MultivaluedMap<String, String> encode(MultivaluedMap<String, String> map) {
+        MultivaluedMap<String, String> decoded = new QuarkusMultivaluedHashMap<String, String>();
+        for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+            List<String> values = entry.getValue();
+            for (String value : values) {
+                try {
+                    decoded.add(URLEncoder.encode(entry.getKey(), UTF_8), URLEncoder.encode(value, UTF_8));
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        return decoded;
+    }
+
+    public static String decode(String string) {
+        try {
+            return URLDecoder.decode(string, UTF_8);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java
new file mode 100644
index 0000000000000..1e38c3ffcd586
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ExtendedCacheControl.java
@@ -0,0 +1,45 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import javax.ws.rs.core.CacheControl;
+
+/**
+ * Adds support for the public directive which is not supported by {@link CacheControl} for some reason.
+ *
+ * @author <a href="http://community.jboss.org/people/jharting">Jozef Hartinger</a>
+ *
+ * @see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.1">RFC-2616 Section 14</a>
+ */
+public class ExtendedCacheControl extends CacheControl {
+
+    private boolean _public = false;
+
+    public boolean isPublic() {
+        return _public;
+    }
+
+    public void setPublic(boolean _public) {
+        this._public = _public;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + (_public ? 1231 : 1237);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ExtendedCacheControl other = (ExtendedCacheControl) obj;
+        if (_public != other._public)
+            return false;
+        return true;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/HeaderParameterParser.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/HeaderParameterParser.java
new file mode 100644
index 0000000000000..8fced3ab5a846
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/HeaderParameterParser.java
@@ -0,0 +1,74 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class HeaderParameterParser {
+    static int getEndName(String params, int start) {
+        int equals = params.indexOf('=', start);
+        int semicolon = params.indexOf(';', start);
+        if (equals == -1 && semicolon == -1)
+            return params.length();
+        if (equals == -1)
+            return semicolon;
+        if (semicolon == -1)
+            return equals;
+        int end = (equals < semicolon) ? equals : semicolon;
+        return end;
+    }
+
+    public static int setParam(HashMap<String, String> typeParams, String params, int start) {
+        boolean quote = false;
+        boolean backslash = false;
+
+        int end = getEndName(params, start);
+        String name = params.substring(start, end).trim();
+        if (end < params.length() && params.charAt(end) == '=')
+            end++;
+
+        StringBuilder buffer = new StringBuilder(params.length() - end);
+        int i = end;
+        for (; i < params.length(); i++) {
+            char c = params.charAt(i);
+
+            switch (c) {
+                case '"': {
+                    if (backslash) {
+                        backslash = false;
+                        buffer.append(c);
+                    } else {
+                        quote = !quote;
+                    }
+                    break;
+                }
+                case '\\': {
+                    if (backslash) {
+                        backslash = false;
+                        buffer.append(c);
+                    }
+                    break;
+                }
+                case ';': {
+                    if (!quote) {
+                        String value = buffer.toString().trim();
+                        typeParams.put(name, value);
+                        return i + 1;
+                    } else {
+                        buffer.append(c);
+                    }
+                    break;
+                }
+                default: {
+                    buffer.append(c);
+                    break;
+                }
+            }
+        }
+        String value = buffer.toString().trim();
+        typeParams.put(name, value);
+        return i;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/LocaleHelper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/LocaleHelper.java
new file mode 100644
index 0000000000000..5a67103d60b8d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/LocaleHelper.java
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.Locale;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class LocaleHelper {
+    public static Locale extractLocale(String lang) {
+        int q = lang.indexOf(';');
+        if (q > -1) {
+            lang = lang.substring(0, q);
+        }
+        String[] split = lang.trim().split("-");
+        if (split.length == 1) {
+            return new Locale(split[0].toLowerCase());
+        } else if (split.length == 2) {
+            return new Locale(split[0].toLowerCase(), split[1].toLowerCase());
+        } else if (split.length > 2) {
+            return new Locale(split[0], split[1], split[2]);
+        }
+        return null; // unreachable
+    }
+
+    /**
+     * HTTP 1.1 has different String format for language than what java.util.Locale does '-' instead of '_'
+     * as a separator
+     *
+     * @param value locale
+     * @return converted language format string
+     */
+    public static String toLanguageString(Locale value) {
+        StringBuffer buf = new StringBuffer(value.getLanguage().toLowerCase());
+        if (value.getCountry() != null && !value.getCountry().equals("")) {
+            buf.append("-").append(value.getCountry().toLowerCase());
+        }
+        return buf.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java
new file mode 100644
index 0000000000000..b1021f2790b43
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java
@@ -0,0 +1,268 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+@SuppressWarnings(value = "rawtypes")
+public class MediaTypeHelper {
+    public static final MediaTypeComparator COMPARATOR = new MediaTypeComparator();
+
+    public static float getQWithParamInfo(MediaType type) {
+        if (type.getParameters() != null) {
+            String val = type.getParameters().get("q");
+            try {
+                if (val != null) {
+                    float rtn = Float.valueOf(val);
+                    if (rtn > 1.0F)
+                        throw new WebApplicationException("Media type q greated than 1" + type.toString(),
+                                Response.Status.BAD_REQUEST);
+                    return rtn;
+                }
+            } catch (NumberFormatException e) {
+                throw new RuntimeException("Media type q value must be a float" + type, e);
+            }
+        }
+        return 2.0f;
+    }
+
+    /**
+     * subtypes like application/*+xml
+     *
+     * @param subtype subtype
+     * @return true if subtype is composite
+     */
+    public static boolean isCompositeWildcardSubtype(String subtype) {
+        return subtype.startsWith("*+");
+    }
+
+    /**
+     * subtypes like application/*+xml
+     *
+     * @param subtype subtype
+     * @return true if subtype is wildcard composite
+     */
+    public static boolean isWildcardCompositeSubtype(String subtype) {
+        return subtype.endsWith("+*");
+    }
+
+    public static boolean isComposite(String subtype) {
+        return (isCompositeWildcardSubtype(subtype) || isWildcardCompositeSubtype(subtype));
+    }
+
+    public static class MediaTypeComparator implements Comparator<MediaType>, Serializable {
+
+        private static final long serialVersionUID = -5828700121582498092L;
+
+        public int compare(MediaType mediaType2, MediaType mediaType) {
+            float q = getQWithParamInfo(mediaType);
+            boolean wasQ = q != 2.0f;
+            if (q == 2.0f)
+                q = 1.0f;
+
+            float q2 = getQWithParamInfo(mediaType2);
+            boolean wasQ2 = q2 != 2.0f;
+            if (q2 == 2.0f)
+                q2 = 1.0f;
+
+            if (q < q2)
+                return -1;
+            if (q > q2)
+                return 1;
+
+            if (mediaType.isWildcardType() && !mediaType2.isWildcardType())
+                return -1;
+            if (!mediaType.isWildcardType() && mediaType2.isWildcardType())
+                return 1;
+            if (mediaType.isWildcardSubtype() && !mediaType2.isWildcardSubtype())
+                return -1;
+            if (!mediaType.isWildcardSubtype() && mediaType2.isWildcardSubtype())
+                return 1;
+            if (isComposite(mediaType.getSubtype()) && !isComposite(mediaType2.getSubtype()))
+                return -1;
+            if (!isComposite(mediaType.getSubtype()) && isComposite(mediaType2.getSubtype()))
+                return 1;
+            if (isCompositeWildcardSubtype(mediaType.getSubtype()) && !isCompositeWildcardSubtype(mediaType2.getSubtype()))
+                return -1;
+            if (!isCompositeWildcardSubtype(mediaType.getSubtype()) && isCompositeWildcardSubtype(mediaType2.getSubtype()))
+                return 1;
+            if (isWildcardCompositeSubtype(mediaType.getSubtype()) && !isWildcardCompositeSubtype(mediaType2.getSubtype()))
+                return -1;
+            if (!isWildcardCompositeSubtype(mediaType.getSubtype()) && isWildcardCompositeSubtype(mediaType2.getSubtype()))
+                return 1;
+
+            int numNonQ = 0;
+            if (mediaType.getParameters() != null) {
+                numNonQ = mediaType.getParameters().size();
+                if (wasQ)
+                    numNonQ--;
+            }
+
+            int numNonQ2 = 0;
+            if (mediaType2.getParameters() != null) {
+                numNonQ2 = mediaType2.getParameters().size();
+                if (wasQ2)
+                    numNonQ2--;
+            }
+
+            if (numNonQ < numNonQ2)
+                return -1;
+            if (numNonQ > numNonQ2)
+                return 1;
+
+            return 0;
+        }
+    }
+
+    public static int compareWeight(MediaType one, MediaType two) {
+        return COMPARATOR.compare(one, two);
+    }
+
+    public static void sortByWeight(List<MediaType> types) {
+        if (hasAtMostOneItem(types)) {
+            return;
+        }
+        types.sort(COMPARATOR);
+    }
+
+    private static boolean hasAtMostOneItem(List<MediaType> types) {
+        return types == null || types.size() <= 1;
+    }
+
+    /**
+     * Finds the best match according to the weight of the media types
+     * The parameters needs to be sorted, so a copy of these is made if necessary
+     * in order to avoid altering the input
+     */
+    public static MediaType getBestMatch(List<MediaType> desired, List<MediaType> provided) {
+        if (!hasAtMostOneItem(desired)) {
+            desired = new ArrayList<>(desired);
+            sortByWeight(desired);
+        }
+        if (!hasAtMostOneItem(provided)) {
+            provided = new ArrayList<>(provided);
+            sortByWeight(provided);
+        }
+        return getFirstMatch(desired, provided);
+    }
+
+    public static MediaType getFirstMatch(List<MediaType> desired, List<MediaType> provided) {
+        boolean emptyDesired = desired == null || desired.size() == 0;
+        boolean emptyProvided = provided == null || provided.size() == 0;
+
+        if (emptyDesired && emptyProvided)
+            return null;
+        if (emptyDesired)
+            return provided.get(0);
+        if (emptyProvided)
+            return desired.get(0);
+
+        for (int i = 0; i < desired.size(); i++) {
+            for (int j = 0; j < provided.size(); j++) {
+                MediaType provide = provided.get(j);
+                if (provide.isCompatible(desired.get(i))) {
+                    return provide;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static List<MediaType> parseHeader(String header) {
+        ArrayList<MediaType> types = new ArrayList<>();
+        String[] medias = header.split(",");
+        for (String media : medias) {
+            types.add(MediaType.valueOf(media.trim()));
+        }
+        return types;
+    }
+
+    public static boolean equivalent(MediaType m1, MediaType m2) {
+        if (m1 == m2)
+            return true;
+
+        if (!m1.getType().equals(m2.getType()))
+            return false;
+        if (!m1.getSubtype().equals(m2.getSubtype()))
+            return false;
+
+        return equivalentParams(m1, m2);
+    }
+
+    public static boolean equivalentParams(MediaType m1, MediaType m2) {
+        Map<String, String> params1 = m1.getParameters();
+        Map<String, String> params2 = m2.getParameters();
+
+        if (params1 == params2)
+            return true;
+        if (params1 == null || params2 == null)
+            return false;
+        if (params1.size() == 0 && params2.size() == 0)
+            return true;
+        int numParams1 = params1.size();
+        if (params1.containsKey("q"))
+            numParams1--;
+        int numParams2 = params2.size();
+        if (params2.containsKey("q"))
+            numParams2--;
+
+        if (numParams1 != numParams2)
+            return false;
+        if (numParams1 == 0)
+            return true;
+
+        for (Map.Entry<String, String> entry : params1.entrySet()) {
+            String key = entry.getKey();
+            if (key.equals("q"))
+                continue;
+            String value = entry.getValue();
+            String value2 = params2.get(key);
+            if (value == value2)
+                continue; // both null
+            if (value == null || value2 == null)
+                return false;
+            if (value.equals(value2) == false)
+                return false;
+        }
+        return true;
+    }
+
+    public static boolean isTextLike(MediaType mediaType) {
+        return "text".equalsIgnoreCase(mediaType.getType())
+                || ("application".equalsIgnoreCase(mediaType.getType())
+                        && mediaType.getSubtype().toLowerCase().startsWith("xml"));
+    }
+
+    public static boolean isBlacklisted(MediaType mediaType) {
+        return "application".equals(mediaType.getType()) && "signed-exchange".equals(mediaType.getSubtype());
+    }
+
+    public static boolean isUnsupportedWildcardSubtype(MediaType mediaType) {
+        if (mediaType.isWildcardSubtype()) {
+            return !mediaType.isWildcardType() && !"application".equals(mediaType.getType());
+        }
+        return false;
+    }
+
+    /**
+     * If the supplied media type contains a suffix in the subtype, then this returns a new media type
+     * that uses the suffix as the subtype
+     */
+    public static MediaType withSuffixAsSubtype(MediaType mediaType) {
+        int plusIndex = mediaType.getSubtype().indexOf('+');
+        if ((plusIndex > -1) && (plusIndex < mediaType.getSubtype().length() - 1)) {
+            mediaType = new MediaType(mediaType.getType(),
+                    mediaType.getSubtype().substring(plusIndex + 1),
+                    mediaType.getParameters());
+        }
+        return mediaType;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java
new file mode 100644
index 0000000000000..3145fae06e610
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultiCollectors.java
@@ -0,0 +1,54 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import java.util.stream.Collectors;
+
+/**
+ * Set of convenient collectors for dealing with {@link Multi} return types.
+ */
+// I've avoided creating collectors for silly things like Byte and Character because
+// they can't possibly be useful, and even the JAX-RS spec doesn't mandate we have writers
+// for them
+public class MultiCollectors {
+
+    public static Uni<String> concatenateStrings(Multi<String> multi) {
+        return multi.collectItems().with(Collectors.joining());
+    }
+
+    public static Uni<byte[]> concatenateByteArrays(Multi<byte[]> multi) {
+        // we could avoid the list and grow an array as we collect, but I doubt that's more efficient TBH
+        return multi.collectItems().asList()
+                .map(list -> {
+                    int size = 0;
+                    for (byte[] array : list) {
+                        size += array.length;
+                    }
+                    byte[] ret = new byte[size];
+                    int i = 0;
+                    for (byte[] array : list) {
+                        System.arraycopy(array, 0, ret, i, array.length);
+                        i += array.length;
+                    }
+                    return ret;
+                });
+    }
+
+    public static Uni<char[]> concatenateCharArrays(Multi<char[]> multi) {
+        // we could avoid the list and grow an array as we collect, but I doubt that's more efficient TBH
+        return multi.collectItems().asList()
+                .map(list -> {
+                    int size = 0;
+                    for (char[] array : list) {
+                        size += array.length;
+                    }
+                    char[] ret = new char[size];
+                    int i = 0;
+                    for (char[] array : list) {
+                        System.arraycopy(array, 0, ret, i, array.length);
+                        i += array.length;
+                    }
+                    return ret;
+                });
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java
new file mode 100644
index 0000000000000..b186f65c95d13
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MultivaluedTreeMap.java
@@ -0,0 +1,246 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class MultivaluedTreeMap<K, V> implements QuarkusMultivaluedMap<K, V>, Serializable {
+    private static final long serialVersionUID = -5819694356897323354L;
+
+    private final Map<K, List<V>> map;
+
+    public MultivaluedTreeMap() {
+        map = new TreeMap<K, List<V>>();
+    }
+
+    /**
+     * Used to create a CaseInsensitiveMap.
+     *
+     * @param keyComparator key comparator
+     */
+
+    public MultivaluedTreeMap(final Comparator<K> keyComparator) {
+        map = new TreeMap<K, List<V>>(keyComparator);
+    }
+
+    public MultivaluedTreeMap(final Map<K, V> map) {
+        this();
+        for (K key : map.keySet()) {
+            add(key, map.get(key));
+        }
+    }
+
+    public void add(K key, V value) {
+        List<V> list = getOrCreate(key);
+        list.add(value);
+    }
+
+    public V getFirst(K key) {
+        List<V> list = get(key);
+        if (list == null || list.size() == 0) {
+            return null;
+        }
+        return list.get(0);
+    }
+
+    public void putSingle(K key, V value) {
+        List<V> list = getOrCreate(key);
+        list.clear();
+        list.add(value);
+    }
+
+    private List<V> getOrCreate(K key) {
+        List<V> list = this.get(key);
+        if (list == null) {
+            list = createValueList(key);
+            // do not call the version that copies
+            map.put(key, list);
+        }
+        return list;
+    }
+
+    private List<V> createValueList(K key) {
+        return new ArrayList<V>(1);
+    }
+
+    private List<V> createValueList(List<V> values) {
+        return new ArrayList<V>(values);
+    }
+
+    public MultivaluedTreeMap<K, V> clone() {
+        return clone(this);
+    }
+
+    public static <K, V> MultivaluedTreeMap<K, V> clone(MultivaluedMap<K, V> src) {
+        MultivaluedTreeMap<K, V> clone = new MultivaluedTreeMap<K, V>();
+        copy(src, clone);
+        return clone;
+    }
+
+    public static <K, V> void copy(MultivaluedMap<K, V> src, MultivaluedMap<K, V> dest) {
+        for (K key : src.keySet()) {
+            List<V> value = src.get(key);
+            List<V> newValue = new ArrayList<V>(value);
+            dest.put(key, newValue);
+        }
+    }
+
+    public static <K, V> void addAll(MultivaluedMap<K, V> src, MultivaluedMap<K, V> dest) {
+        for (K key : src.keySet()) {
+            List<V> srcList = src.get(key);
+            List<V> destList = dest.get(key);
+            if (destList == null) {
+                destList = new ArrayList<V>(srcList.size());
+                dest.put(key, destList);
+            }
+            destList.addAll(srcList);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "[" + toString(this, ",") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+
+    public static String toString(MultivaluedMap<?, ?> map, String delimiter) {
+        StringBuilder result = new StringBuilder();
+        MultivaluedMap<?, ?> params = map;
+        String delim = ""; //$NON-NLS-1$
+        for (Object name : params.keySet()) {
+            for (Object value : params.get(name)) {
+                result.append(delim);
+                if (name == null) {
+                    result.append("null"); //$NON-NLS-1$
+                } else {
+                    result.append(name.toString());
+                }
+                if (value != null) {
+                    result.append('=');
+                    result.append(value.toString());
+                }
+                delim = delimiter;
+            }
+        }
+        return result.toString();
+    }
+
+    public void clear() {
+        map.clear();
+    }
+
+    public boolean containsKey(Object key) {
+        return map.containsKey(key);
+    }
+
+    public boolean containsValue(Object value) {
+        return map.containsValue(value);
+    }
+
+    public Set<Entry<K, List<V>>> entrySet() {
+        return map.entrySet();
+    }
+
+    public boolean equals(Object o) {
+        return map.equals(o);
+    }
+
+    public List<V> get(Object key) {
+        return map.get(key);
+    }
+
+    public int hashCode() {
+        return map.hashCode();
+    }
+
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    public Set<K> keySet() {
+        return map.keySet();
+    }
+
+    public List<V> put(K key, List<V> value) {
+        if (value != null) {
+            // do not use mutable external data storage internally
+            value = createValueList(value);
+        }
+        return map.put(key, value);
+    }
+
+    public void putAll(Map<? extends K, ? extends List<V>> t) {
+        for (Entry<? extends K, ? extends List<V>> entry : t.entrySet()) {
+            // call the version that copies
+            put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    public List<V> remove(Object key) {
+        return map.remove(key);
+    }
+
+    public int size() {
+        return map.size();
+    }
+
+    public Collection<List<V>> values() {
+        return map.values();
+    }
+
+    @SuppressWarnings(value = "unchecked")
+    @Override
+    public void addAll(K key, V... newValues) {
+        for (V value : newValues) {
+            add(key, value);
+        }
+    }
+
+    @Override
+    public void addAll(K key, List<V> valueList) {
+        for (V value : valueList) {
+            add(key, value);
+        }
+    }
+
+    @Override
+    public void addFirst(K key, V value) {
+        List<V> list = get(key);
+        if (list == null) {
+            add(key, value);
+            return;
+        } else {
+            list.add(0, value);
+        }
+    }
+
+    @Override
+    public boolean equalsIgnoreValueOrder(MultivaluedMap<K, V> omap) {
+        if (this == omap) {
+            return true;
+        }
+        if (!keySet().equals(omap.keySet())) {
+            return false;
+        }
+        for (Map.Entry<K, List<V>> e : entrySet()) {
+            List<V> olist = omap.get(e.getKey());
+            if (e.getValue().size() != olist.size()) {
+                return false;
+            }
+            for (V v : e.getValue()) {
+                if (!olist.contains(v)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ParameterParser.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ParameterParser.java
new file mode 100644
index 0000000000000..c043927ae735a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ParameterParser.java
@@ -0,0 +1,332 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A simple parser intended to parse sequences of name/value pairs.
+ * Parameter values are exptected to be enclosed in quotes if they
+ * contain unsafe characters, such as '=' characters or separators.
+ * Parameter values are optional and can be omitted.
+ * <p>
+ * <code>param1 = value; param2 = "anything goes; really"; param3</code>
+ * </p>
+ *
+ * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+ */
+
+public class ParameterParser {
+    /**
+     * String to be parsed.
+     */
+    private char[] chars = null;
+
+    /**
+     * Current position in the string.
+     */
+    private int pos = 0;
+
+    /**
+     * Maximum position in the string.
+     */
+    private int len = 0;
+
+    /**
+     * Start of a token.
+     */
+    private int i1 = 0;
+
+    /**
+     * End of a token.
+     */
+    private int i2 = 0;
+
+    /**
+     * Whether names stored in the map should be converted to lower case.
+     */
+    private boolean lowerCaseNames = false;
+
+    /**
+     * Default ParameterParser constructor.
+     */
+    public ParameterParser() {
+        super();
+    }
+
+    /**
+     * Are there any characters left to parse?
+     *
+     * @return <code>true</code> if there are unparsed characters,
+     *         <code>false</code> otherwise.
+     */
+    private boolean hasChar() {
+        return this.pos < this.len;
+    }
+
+    /**
+     * A helper method to process the parsed token. This method removes
+     * leading and trailing blanks as well as enclosing quotation marks,
+     * when necessary.
+     *
+     * @param quoted <code>true</code> if quotation marks are expected,
+     *        <code>false</code> otherwise.
+     * @return the token
+     */
+    private String getToken(boolean quoted) {
+        // Trim leading white spaces
+        while ((i1 < i2) && (Character.isWhitespace(chars[i1]))) {
+            i1++;
+        }
+        // Trim trailing white spaces
+        while ((i2 > i1) && (Character.isWhitespace(chars[i2 - 1]))) {
+            i2--;
+        }
+        // Strip away quotation marks if necessary
+        if (quoted) {
+            if (((i2 - i1) >= 2)
+                    && (chars[i1] == '"')
+                    && (chars[i2 - 1] == '"')) {
+                i1++;
+                i2--;
+            }
+        }
+        String result = null;
+        if (i2 > i1) {
+            result = new String(chars, i1, i2 - i1);
+        }
+        return result;
+    }
+
+    /**
+     * Tests if the given character is present in the array of characters.
+     *
+     * @param ch the character to test for presense in the array of characters
+     * @param charray the array of characters to test against
+     * @return <code>true</code> if the character is present in the array of
+     *         characters, <code>false</code> otherwise.
+     */
+    private boolean isOneOf(char ch, final char[] charray) {
+        boolean result = false;
+        for (int i = 0; i < charray.length; i++) {
+            if (ch == charray[i]) {
+                result = true;
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Parses out a token until any of the given terminators
+     * is encountered.
+     *
+     * @param terminators the array of terminating characters. Any of these
+     *        characters when encountered signify the end of the token
+     * @return the token
+     */
+    private String parseToken(final char[] terminators) {
+        char ch;
+        i1 = pos;
+        i2 = pos;
+        while (hasChar()) {
+            ch = chars[pos];
+            if (isOneOf(ch, terminators)) {
+                break;
+            }
+            i2++;
+            pos++;
+        }
+        return getToken(false);
+    }
+
+    /**
+     * Parses out a token until any of the given terminators
+     * is encountered outside the quotation marks.
+     *
+     * @param terminators the array of terminating characters. Any of these
+     *        characters when encountered outside the quotation marks signify the end
+     *        of the token
+     * @return the token
+     */
+    private String parseQuotedToken(final char[] terminators) {
+        char ch;
+        i1 = pos;
+        i2 = pos;
+        boolean quoted = false;
+        boolean charEscaped = false;
+        while (hasChar()) {
+            ch = chars[pos];
+            if (!quoted && isOneOf(ch, terminators)) {
+                break;
+            }
+            if (!charEscaped && ch == '"') {
+                quoted = !quoted;
+            }
+            charEscaped = (!charEscaped && ch == '\\');
+            i2++;
+            pos++;
+
+        }
+        return getToken(true);
+    }
+
+    /**
+     * Returns <code>true</code> if parameter names are to be converted to lower
+     * case when name/value pairs are parsed.
+     *
+     * @return <code>true</code> if parameter names are to be
+     *         converted to lower case when name/value pairs are parsed.
+     *         Otherwise returns <code>false</code>
+     */
+    public boolean isLowerCaseNames() {
+        return this.lowerCaseNames;
+    }
+
+    /**
+     * Sets the flag if parameter names are to be converted to lower case when
+     * name/value pairs are parsed.
+     *
+     * @param b <code>true</code> if parameter names are to be
+     *        converted to lower case when name/value pairs are parsed.
+     *        <code>false</code> otherwise.
+     */
+    public void setLowerCaseNames(boolean b) {
+        this.lowerCaseNames = b;
+    }
+
+    /**
+     * Extracts a map of name/value pairs from the given string. Names are
+     * expected to be unique.
+     *
+     * @param str the string that contains a sequence of name/value pairs
+     * @param separator the name/value pairs separator
+     * @return a map of name/value pairs
+     */
+    public Map<String, String> parse(final String str, char separator) {
+        if (str == null) {
+            return new HashMap<String, String>();
+        }
+        return parse(str.toCharArray(), separator);
+    }
+
+    /**
+     * Extracts a map of name/value pairs from the given array of
+     * characters. Names are expected to be unique.
+     *
+     * @param chars the array of characters that contains a sequence of
+     *        name/value pairs
+     * @param separator the name/value pairs separator
+     * @return a map of name/value pairs
+     */
+    public Map<String, String> parse(final char[] chars, char separator) {
+        if (chars == null) {
+            return new HashMap<String, String>();
+        }
+        return parse(chars, 0, chars.length, separator);
+    }
+
+    /**
+     * Extracts a map of name/value pairs from the given array of
+     * characters. Names are expected to be unique.
+     *
+     * @param chars the array of characters that contains a sequence of
+     *        name/value pairs
+     * @param offset - the initial offset.
+     * @param length - the length.
+     * @param separator the name/value pairs separator
+     * @return a map of name/value pairs
+     */
+    public Map<String, String> parse(
+            final char[] chars,
+            int offset,
+            int length,
+            char separator) {
+
+        if (chars == null) {
+            return new HashMap<String, String>();
+        }
+        HashMap<String, String> params = new HashMap<String, String>();
+        this.chars = chars;
+        this.pos = offset;
+        this.len = length;
+
+        String paramName = null;
+        String paramValue = null;
+        while (hasChar()) {
+            paramName = parseToken(new char[] { '=', separator });
+            paramValue = null;
+            if (hasChar() && (chars[pos] == '=')) {
+                pos++; // skip '='
+                paramValue = parseQuotedToken(new char[] {
+                        separator });
+            }
+            if (hasChar() && (chars[pos] == separator)) {
+                pos++; // skip separator
+            }
+            if ((paramName != null) && (paramName.length() > 0)) {
+                if (this.lowerCaseNames) {
+                    paramName = paramName.toLowerCase();
+                }
+                params.put(paramName, paramValue);
+            }
+        }
+        return params;
+    }
+
+    /**
+     * Takes string as-is and only changes the value of a specific attribute.
+     *
+     * @param chars the array of characters that contains a sequence of
+     *        name/value pairs
+     * @param offset - the initial offset.
+     * @param length - the length.
+     * @param separator the name/value pairs separator
+     * @param name attribute name
+     * @param value new value
+     * @return updated parameters string
+     */
+    public String setAttribute(
+            final char[] chars,
+            int offset,
+            int length,
+            char separator,
+            String name,
+            String value) {
+
+        this.chars = chars;
+        this.pos = offset;
+        this.len = length;
+
+        String paramName = null;
+        String paramValue = null;
+
+        int start = offset;
+
+        StringBuffer newChars = new StringBuffer();
+
+        while (hasChar()) {
+            paramName = parseToken(new char[] { '=', separator });
+            paramValue = null;
+            int index = -1;
+            if (paramName.equals(name)) {
+                newChars.append(new String(chars, start, pos - start));
+            }
+            if (hasChar() && (chars[pos] == '=')) {
+                pos++; // skip '='
+                paramValue = parseQuotedToken(new char[] {
+                        separator });
+            }
+            if (paramName.equals(name)) {
+                newChars.append("=").append(value);
+                start = pos;
+            } else {
+                newChars.append(new String(chars, start, pos - start));
+                start = pos;
+            }
+            if (hasChar() && (chars[pos] == separator)) {
+                pos++; // skip separator
+            }
+        }
+        return newChars.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathHelper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathHelper.java
new file mode 100644
index 0000000000000..dcba4bbabfdfc
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathHelper.java
@@ -0,0 +1,102 @@
+/**
+ *
+ */
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.regex.Pattern;
+
+/**
+ * A utility class for handling URI template parameters. As the Java
+ * regulare expressions package does not handle named groups, this
+ * class attempts to simulate that functionality by using groups.
+ *
+ * @author Ryan J. McDonough
+ * @author Bill Burke
+ */
+public class PathHelper {
+    public static final String URI_PARAM_NAME_REGEX = "\\w[\\w\\.-]*";
+    public static final String URI_PARAM_REGEX_REGEX = "[^{}][^{}]*";
+    public static final String URI_PARAM_REGEX = "\\{\\s*(" + URI_PARAM_NAME_REGEX + ")\\s*(:\\s*(" + URI_PARAM_REGEX_REGEX
+            + "))?\\}";
+    public static final String URI_PARAM_WITH_REGEX = "\\{\\s*(" + URI_PARAM_NAME_REGEX + ")\\s*(:\\s*(" + URI_PARAM_REGEX_REGEX
+            + "))\\}";
+    public static final String URI_PARAM_WITHOUT_REGEX = "\\{(" + URI_PARAM_NAME_REGEX + ")\\}";
+    public static final Pattern URI_PARAM_PATTERN = Pattern.compile(URI_PARAM_REGEX);
+    public static final Pattern URI_PARAM_WITH_REGEX_PATTERN = Pattern.compile(URI_PARAM_WITH_REGEX);
+    public static final Pattern URI_PARAM_WITHOUT_REGEX_PATTERN = Pattern.compile(URI_PARAM_WITHOUT_REGEX);
+
+    /**
+     * A regex pattern that searches for a URI template parameter in the form of {*}
+     */
+    public static final Pattern URI_TEMPLATE_PATTERN = Pattern.compile("(\\{([^}]+)\\})");
+
+    public static final String URI_TEMPLATE_REPLACE_PATTERN = "(.*?)";
+
+    public static String getEncodedPathInfo(String path, String contextPath) {
+        if (contextPath != null && !"".equals(contextPath) && path.startsWith(contextPath)) {
+            path = path.substring(contextPath.length());
+        }
+        return path;
+
+    }
+
+    public static final char openCurlyReplacement = 6;
+    public static final char closeCurlyReplacement = 7;
+
+    public static String replaceEnclosedCurlyBraces(String str) {
+        char[] chars = str.toCharArray();
+        int open = 0;
+        for (int i = 0; i < chars.length; i++) {
+            if (chars[i] == '{') {
+                if (open != 0)
+                    chars[i] = openCurlyReplacement;
+                open++;
+            } else if (chars[i] == '}') {
+                open--;
+                if (open != 0) {
+                    chars[i] = closeCurlyReplacement;
+                }
+            }
+        }
+        return new String(chars);
+    }
+
+    /**
+     * A cheaper (memory-wise) version of replaceEnclosedCurlyBraces(String str).
+     * 
+     * @param str input string
+     * @return replaced output
+     */
+    public static CharSequence replaceEnclosedCurlyBracesCS(String str) {
+        int open = 0;
+        CharSequence cs = str;
+        char[] chars = null;
+        for (int i = 0; i < str.length(); i++) {
+            if (cs.charAt(i) == '{') {
+                if (open != 0) {
+                    if (cs == str) {
+                        chars = str.toCharArray();
+                        cs = new ArrayCharSequence(chars);
+                    }
+                    chars[i] = openCurlyReplacement;
+                }
+                open++;
+            } else if (cs.charAt(i) == '}') {
+                open--;
+                if (open != 0) {
+                    if (cs == str) {
+                        chars = str.toCharArray();
+                        cs = new ArrayCharSequence(chars);
+                    }
+                    chars[i] = closeCurlyReplacement;
+                }
+            }
+        }
+        return cs;
+    }
+
+    public static String recoverEnclosedCurlyBraces(String str) {
+        return str.replace(openCurlyReplacement, '{').replace(closeCurlyReplacement, '}');
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java
new file mode 100644
index 0000000000000..9f70c3f7f722a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/PathSegmentImpl.java
@@ -0,0 +1,137 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.PathSegment;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class PathSegmentImpl implements PathSegment {
+    private String path;
+    private String original;
+    private MultivaluedMap<String, String> matrixParameters;
+    private boolean hasMatrixParams;
+
+    /**
+     * @param segment encoded path segment
+     * @param decode whether or not to decode values
+     */
+    public PathSegmentImpl(final String segment, final boolean decode) {
+        this.original = segment;
+        this.path = segment;
+        int semicolon = segment.indexOf(';');
+        if (semicolon >= 0) {
+            matrixParameters = new QuarkusMultivaluedHashMap<String, String>();
+            hasMatrixParams = true;
+            if (semicolon > 0)
+                this.path = segment.substring(0, semicolon);
+            else
+                this.path = "";
+            String matrixParams = segment.substring(semicolon + 1);
+            String[] params = matrixParams.split(";");
+            for (String param : params) {
+                String[] namevalue = param.split("=");
+                if (namevalue != null && namevalue.length > 0) {
+                    String name = namevalue[0];
+                    if (decode)
+                        name = Encode.decodePath(name);
+                    String value = null;
+                    if (namevalue.length > 1) {
+                        value = namevalue[1];
+                    }
+                    if (decode && value != null)
+                        value = Encode.decodePath(value);
+                    matrixParameters.add(name, value);
+                }
+            }
+        }
+        if (decode)
+            this.path = Encode.decodePath(this.path);
+    }
+
+    /**
+     * NOTE: Used for optimization in ResteasyUriInfo
+     * 
+     * @return true if path segment contains matrix parameters
+     */
+    public boolean hasMatrixParams() {
+        return hasMatrixParams;
+    }
+
+    public String getOriginal() {
+        return original;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public MultivaluedMap<String, String> getMatrixParameters() {
+        if (matrixParameters == null) {
+            matrixParameters = new QuarkusMultivaluedHashMap<String, String>();
+        }
+        return matrixParameters;
+    }
+
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        if (path != null)
+            buf.append(path);
+        if (matrixParameters != null) {
+            for (String name : matrixParameters.keySet()) {
+                for (String value : matrixParameters.get(name)) {
+                    buf.append(";").append(name).append("=").append(value);
+                }
+            }
+        }
+        return buf.toString();
+    }
+
+    public static List<PathSegment> parseSegments(String path, boolean decode) {
+        return parseSegmentsOptimization(path, decode).segments;
+    }
+
+    /**
+     * Used when creating the matching path in ResteasyUriInfo
+     *
+     */
+    public static class SegmentParse {
+        public List<PathSegment> segments;
+        public boolean hasMatrixParams;
+
+    }
+
+    /**
+     *
+     * @param path encoded full path
+     * @param decode whether or not to decode each segment
+     * @return {@link SegmentParse}
+     */
+    public static SegmentParse parseSegmentsOptimization(String path, boolean decode) {
+        SegmentParse parse = new SegmentParse();
+        List<PathSegment> pathSegments = new ArrayList<PathSegment>();
+        parse.segments = pathSegments;
+        int start = 0;
+        if (path.startsWith("/"))
+            start++;
+        int length = path.length();
+        do {
+            String p;
+            int slash = path.indexOf('/', start);
+            if (slash < 0) {
+                p = path.substring(start);
+                start = length;
+            } else {
+                p = path.substring(start, slash);
+                start = slash + 1;
+            }
+            PathSegmentImpl pathSegment = new PathSegmentImpl(p, decode);
+            parse.hasMatrixParams |= pathSegment.hasMatrixParams();
+            pathSegments.add(pathSegment);
+        } while (start < length);
+        return parse;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java
new file mode 100644
index 0000000000000..28ee93896903f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedHashMap.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.MultivaluedHashMap;
+
+/**
+ * QuarkusMultivaluedHashMap without the bug in put/putAll that leaks external mutable storage into our storage.
+ */
+public class QuarkusMultivaluedHashMap<Key, Value> extends MultivaluedHashMap<Key, Value>
+        implements QuarkusMultivaluedMap<Key, Value> {
+
+    private static final long serialVersionUID = 4136263572124588039L;
+
+    @Override
+    public List<Value> put(Key key, List<Value> value) {
+        if (value != null) {
+            // this is the storage the supertype uses
+            value = new LinkedList<>(value);
+        }
+        return super.put(key, value);
+    }
+
+    @Override
+    public void putAll(Map<? extends Key, ? extends List<Value>> m) {
+        for (Entry<? extends Key, ? extends List<Value>> entry : m.entrySet()) {
+            put(entry.getKey(), entry.getValue());
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java
new file mode 100644
index 0000000000000..5a9264f103b2d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/QuarkusMultivaluedMap.java
@@ -0,0 +1,20 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.List;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * MultivaluedMap with extra operations
+ */
+public interface QuarkusMultivaluedMap<Key, Value> extends MultivaluedMap<Key, Value> {
+    /**
+     * Adds all elements of the given map to this map.
+     * 
+     * @param otherMap the map to take keys and values from
+     */
+    public default void addAll(MultivaluedMap<Key, Value> otherMap) {
+        for (Entry<Key, List<Value>> entry : otherMap.entrySet()) {
+            addAll(entry.getKey(), entry.getValue());
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ReflectionBeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ReflectionBeanFactory.java
new file mode 100644
index 0000000000000..f1755ad72dac5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ReflectionBeanFactory.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ReflectionBeanFactory<T> implements BeanFactory<T> {
+    private final String className;
+
+    public ReflectionBeanFactory(String className) {
+        this.className = className;
+    }
+
+    @Override
+    public BeanInstance<T> createInstance() {
+        try {
+            T instance = (T) Class.forName(className, false, Thread.currentThread().getContextClassLoader())
+                    .newInstance();
+            return new BeanInstance<T>() {
+                @Override
+                public T getInstance() {
+                    return instance;
+                }
+
+                @Override
+                public void close() {
+
+                }
+            };
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ReflectionBeanFactoryCreator.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ReflectionBeanFactoryCreator.java
new file mode 100644
index 0000000000000..236ca4bf95e27
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ReflectionBeanFactoryCreator.java
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.function.Function;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ReflectionBeanFactoryCreator<T> implements Function<String, BeanFactory<T>> {
+    @Override
+    public BeanFactory<T> apply(String className) {
+        return new ReflectionBeanFactory<T>(className);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java
new file mode 100644
index 0000000000000..032ded20358c2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/ServerMediaType.java
@@ -0,0 +1,198 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * A representation of a server side media type.
+ *
+ * TODO: This belongs in the server module but needs to be untangled from ResourceWriter (in a way that doesn't hurt
+ * performance) to make that happen
+ */
+public class ServerMediaType {
+
+    private final MediaType[] sortedMediaTypes;
+    private final MediaType[] sortedOriginalMediaTypes;
+    private final MediaType hardCoded;
+
+    public static List<MediaType> mediaTypesFromArray(String[] mediaTypesStrs) {
+        List<MediaType> mediaTypes = new ArrayList<>(mediaTypesStrs.length);
+        for (String mediaTypesStr : mediaTypesStrs) {
+            mediaTypes.add(MediaType.valueOf(mediaTypesStr));
+        }
+        return mediaTypes;
+    }
+
+    /**
+     *
+     * @param mediaTypes The original media types
+     * @param charset charset to use
+     * @param deprioritizeWildcards whether or not wildcard types should be carry less weight when sorting is performed
+     * @param useSuffix whether or not a media type whose subtype contains a suffix should swap the entire subtype with the
+     *        suffix
+     */
+    public ServerMediaType(List<MediaType> mediaTypes, String charset, boolean deprioritizeWildcards, boolean useSuffix) {
+        if (mediaTypes.isEmpty()) {
+            this.sortedOriginalMediaTypes = new MediaType[] { MediaType.WILDCARD_TYPE };
+        } else {
+            this.sortedOriginalMediaTypes = mediaTypes.toArray(new MediaType[0]);
+        }
+        sortedMediaTypes = new MediaType[sortedOriginalMediaTypes.length];
+        Arrays.sort(sortedOriginalMediaTypes, new Comparator<MediaType>() {
+            @Override
+            public int compare(MediaType m1, MediaType m2) {
+                if (deprioritizeWildcards) {
+                    if (m1.isWildcardType() && !m2.isWildcardType()) {
+                        return 1;
+                    }
+                    if (!m1.isWildcardType() && m2.isWildcardType()) {
+                        return -1;
+                    }
+                    if (!m1.isWildcardType() && !m2.isWildcardType()) {
+                        if (m1.isWildcardSubtype() && !m2.isWildcardSubtype()) {
+                            return 1;
+                        }
+                        if (!m1.isWildcardSubtype() && m2.isWildcardSubtype()) {
+                            return -1;
+                        }
+                    }
+                }
+
+                String qs1s = m1.getParameters().get("qs");
+                String qs2s = m2.getParameters().get("qs");
+                if (qs1s == null && qs2s == null) {
+                    return 0;
+                }
+                if (qs1s != null) {
+                    if (qs2s == null) {
+                        return 1;
+                    } else {
+                        float q1 = Float.parseFloat(qs1s);
+                        float q2 = Float.parseFloat(qs2s);
+                        return Float.compare(q2, q1);
+                    }
+                } else {
+                    return -1;
+                }
+            }
+        });
+        for (int i = 0; i < sortedOriginalMediaTypes.length; ++i) {
+            MediaType existing = sortedOriginalMediaTypes[i];
+            MediaType m = new MediaType(existing.getType(), existing.getSubtype(), charset);
+            sortedMediaTypes[i] = m;
+        }
+        // use the suffix type if it exists when negotiating the type
+        if (useSuffix) {
+            for (int i = 0; i < sortedMediaTypes.length; i++) {
+                sortedMediaTypes[i] = MediaTypeHelper.withSuffixAsSubtype(sortedMediaTypes[i]);
+            }
+        }
+        // if there is only one media type, use it
+        if (sortedMediaTypes.length == 1
+                && !(sortedMediaTypes[0].isWildcardType() || sortedMediaTypes[0].isWildcardSubtype())) {
+            hardCoded = sortedMediaTypes[0];
+        } else {
+            hardCoded = null;
+        }
+    }
+
+    /**
+     *
+     * @return An entry containing the negotiated desired media type as a key and the negotiated
+     *         provided media type as a value
+     */
+    public Map.Entry<MediaType, MediaType> negotiateProduces(String acceptHeader) {
+        return negotiateProduces(acceptHeader, this.hardCoded);
+    }
+
+    /**
+     *
+     * @return An entry containing the negotiated desired media type as a key and the negotiated
+     *         provided media type as a value
+     */
+    public Map.Entry<MediaType, MediaType> negotiateProduces(String acceptHeader, MediaType hardCoded) {
+        if (hardCoded != null) {
+            //technically we should negotiate here, and check if we need to return a 416
+            //but for performance reasons we ignore this
+            return new AbstractMap.SimpleEntry<>(hardCoded, null);
+        }
+        MediaType selectedDesired = null;
+        MediaType selectedProvided = null;
+        List<MediaType> parsedAccepted;
+        if (acceptHeader != null) {
+            //TODO: this can be optimised
+            parsedAccepted = MediaTypeHelper.parseHeader(acceptHeader);
+            MediaTypeHelper.sortByWeight(parsedAccepted);
+            String currentClientQ = null;
+            int currentServerIndex = Integer.MAX_VALUE;
+            if (!parsedAccepted.isEmpty()) {
+                for (MediaType desired : parsedAccepted) {
+                    if (selectedDesired != null) {
+                        //this is to enable server side q values to take effect
+                        //the client side is sorted by q, if we have already picked one and the q is
+                        //different then we can return the current one
+                        if (!Objects.equals(desired.getParameters().get("q"), currentClientQ)) {
+                            if (selectedDesired.equals(MediaType.WILDCARD_TYPE)) {
+                                return new AbstractMap.SimpleEntry<>(MediaType.APPLICATION_OCTET_STREAM_TYPE, selectedProvided);
+                            }
+                            return new AbstractMap.SimpleEntry<>(selectedDesired, selectedProvided);
+                        }
+                    }
+                    for (int j = 0; j < sortedMediaTypes.length; j++) {
+                        MediaType provide = sortedMediaTypes[j];
+                        if (provide.isCompatible(desired)) {
+                            if (selectedDesired == null || j < currentServerIndex) {
+                                if (desired.isWildcardType()) {
+                                    // this is only preferable if we don't already have a better
+                                    // one
+                                    if (selectedDesired != null) {
+                                        continue;
+                                    }
+                                    selectedDesired = MediaType.APPLICATION_OCTET_STREAM_TYPE;
+                                } else if (desired.isWildcardSubtype()) {
+                                    // this is only preferable if we don't already have a better
+                                    // one
+                                    if (selectedDesired != null) {
+                                        continue;
+                                    }
+                                    // is this even allowed?
+                                    if (desired.isCompatible(MediaType.APPLICATION_OCTET_STREAM_TYPE))
+                                        selectedDesired = MediaType.APPLICATION_OCTET_STREAM_TYPE;
+                                    else
+                                        selectedDesired = desired; // keep the subwildcard
+                                } else {
+                                    selectedDesired = desired;
+                                }
+                                selectedProvided = provide;
+                                currentServerIndex = j;
+                                currentClientQ = desired.getParameters().get("q");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (selectedDesired == null) {
+            selectedDesired = sortedMediaTypes[0];
+        }
+        if (selectedDesired.equals(MediaType.WILDCARD_TYPE)) {
+            return new AbstractMap.SimpleEntry<>(MediaType.APPLICATION_OCTET_STREAM_TYPE, selectedProvided);
+        }
+        return new AbstractMap.SimpleEntry<>(selectedDesired, selectedProvided);
+    }
+
+    public MediaType[] getSortedMediaTypes() {
+        return sortedMediaTypes;
+    }
+
+    public MediaType[] getSortedOriginalMediaTypes() {
+        return sortedOriginalMediaTypes;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/TypeConverter.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/TypeConverter.java
new file mode 100644
index 0000000000000..5f8c89b41b38a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/TypeConverter.java
@@ -0,0 +1,246 @@
+/**
+ *
+ */
+package org.jboss.resteasy.reactive.common.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A utility class that can convert a String value as a typed object.
+ *
+ * @author <a href="ryan@damnhandy.com">Ryan J. McDonough</a>
+ * @version $Revision: $
+ *
+ *          TODO: Do we really need this?
+ */
+public final class TypeConverter {
+    private static final String VALUE_OF_METHOD = "valueOf";
+
+    /**
+     * A map of primitive to objects.
+     */
+    private static final Map<Class<?>, Class<?>> PRIMITIVES;
+
+    static {
+        PRIMITIVES = new HashMap<Class<?>, Class<?>>();
+        PRIMITIVES.put(int.class, Integer.class);
+        PRIMITIVES.put(double.class, Double.class);
+        PRIMITIVES.put(float.class, Float.class);
+        PRIMITIVES.put(short.class, Short.class);
+        PRIMITIVES.put(byte.class, Byte.class);
+        PRIMITIVES.put(long.class, Long.class);
+    }
+
+    private TypeConverter() {
+
+    }
+
+    /**
+     * A generic method that returns the {@link String} as the specified Java type.
+     *
+     * @param <T> the type to return
+     * @param source the string value to convert
+     * @param targetType target type
+     * @return the object instance
+     */
+    @SuppressWarnings(value = "unchecked")
+    public static <T> T getType(final Class<T> targetType, final String source) {
+        // just return that source if it's a String
+        if (String.class.equals(targetType)) {
+            return targetType.cast(source);
+        }
+        /*
+         * Dates are too complicated for this class.
+         */
+        if (Date.class.isAssignableFrom(targetType)) {
+            throw new IllegalArgumentException("Date instances are not supported by this class.");
+        }
+        if (Character.class.equals(targetType)) {
+            if (source.length() == 0)
+                return targetType.cast(new Character('\0'));
+            return targetType.cast(new Character(source.charAt(0)));
+        }
+        if (char.class.equals(targetType)) {
+            Character c = null;
+            if (source.length() == 0)
+                c = new Character('\0');
+            else
+                c = new Character(source.charAt(0));
+            try {
+                return (T) Character.class.getMethod("charValue").invoke(c);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
+            } catch (NoSuchMethodException e) {
+                throw new RuntimeException(e);
+            }
+
+        }
+        T result;
+        // boolean types need special handling
+        if (Boolean.class.equals(targetType) || boolean.class.equals(targetType)) {
+            Boolean booleanValue = getBooleanValue(source);
+            if (Boolean.class.equals(targetType)) {
+                return targetType.cast(booleanValue);
+            } else {
+                try {
+                    return (T) Boolean.class.getMethod("booleanValue").invoke(booleanValue);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                } catch (InvocationTargetException e) {
+                    throw new RuntimeException(e);
+                } catch (NoSuchMethodException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        try {
+            result = getTypeViaValueOfMethod(source, targetType);
+        } catch (NoSuchMethodException e) {
+            result = getTypeViaStringConstructor(source, targetType);
+        }
+        return result;
+    }
+
+    /**
+     * Tests if the class can safely be converted from a String to the
+     * specified type.
+     *
+     * @param targetType the type to convert to
+     * @return true if the class possesses either a "valueOf()" method or a constructor with a String
+     *         parameter.
+     */
+    public static boolean isConvertable(final Class<?> targetType) {
+        if (Boolean.class.equals(targetType)) {
+            return true;
+        }
+        if (Character.class.equals(targetType)) {
+            return true;
+        }
+
+        if (targetType.isPrimitive()) {
+            return true;
+        }
+        try {
+            targetType.getDeclaredMethod(VALUE_OF_METHOD, String.class);
+            return true;
+        } catch (NoSuchMethodException e) {
+            try {
+                targetType.getDeclaredConstructor(String.class);
+                return true;
+            }
+
+            catch (NoSuchMethodException e1) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * <p>
+     * Returns a Boolean value from a String. Unlike {@link Boolean#valueOf(String)}, this
+     * method takes more String options. The following String values will return true:
+     * </p>
+     * <ul>
+     * <li>Yes</li>
+     * <li>Y</li>
+     * <li>T</li>
+     * <li>1</li>
+     * </ul>
+     * <p>
+     * While the following values will return false:
+     * </p>
+     * <ul>
+     * <li>No</li>
+     * <li>N</li>
+     * <li>F</li>
+     * <li>0</li>
+     * </ul>
+     *
+     * @param source source string
+     * @return boolean value from string
+     */
+    public static Boolean getBooleanValue(final String source) {
+        if ("Y".equalsIgnoreCase(source) || "T".equalsIgnoreCase(source)
+                || "Yes".equalsIgnoreCase(source) || "1".equalsIgnoreCase(source)) {
+            return Boolean.TRUE;
+        } else if ("N".equals(source) || "F".equals(source) || "No".equals(source)
+                || "0".equalsIgnoreCase(source)) {
+            return Boolean.FALSE;
+        }
+        return Boolean.valueOf(source);
+    }
+
+    /**
+     * @param <T> type
+     * @param source source string
+     * @param targetType target type
+     * @return object instance of type T
+     * @throws NoSuchMethodException if method was not found
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getTypeViaValueOfMethod(final String source, final Class<T> targetType)
+            throws NoSuchMethodException {
+        Class<?> actualTarget = targetType;
+        /*
+         * if this is a primitive type, use the Object class's "valueOf()"
+         * method.
+         */
+        if (targetType.isPrimitive()) {
+            actualTarget = PRIMITIVES.get(targetType);
+        }
+        T result = null;
+        try {
+            // if the type has a static "valueOf()" method, try and create the instance that way
+            Method valueOf = actualTarget.getDeclaredMethod(VALUE_OF_METHOD, String.class);
+            Object value = valueOf.invoke(null, source);
+            if (actualTarget.equals(targetType) && targetType.isInstance(value)) {
+                result = targetType.cast(value);
+            }
+            /*
+             * handle the primitive case
+             */
+            else if (!actualTarget.equals(targetType) && actualTarget.isInstance(value)) {
+                // because you can't use targetType.cast() with primitives.
+                result = (T) value;
+            }
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+    /**
+     * @param <T> type
+     * @param source source string
+     * @param targetType target type
+     * @return object instance of type T
+     * @throws IllegalArgumentException if not suitable constructor was found
+     * @throws InstantiationException if the underlying constructor represents an abstract class
+     * @throws IllegalAccessException if the underlying constructor is not accessible
+     * @throws InvocationTargetException if the underlying constructor throws exception
+     */
+    private static <T> T getTypeViaStringConstructor(String source, Class<T> targetType) {
+        T result = null;
+        Constructor<T> c = null;
+
+        try {
+            c = targetType.getDeclaredConstructor(String.class);
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException((targetType.getName() + " has no String constructor"), e);
+        }
+
+        try {
+            result = c.newInstance(source);
+        } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URIDecoder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URIDecoder.java
new file mode 100644
index 0000000000000..ff0612f395727
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URIDecoder.java
@@ -0,0 +1,116 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
+ */
+public final class URIDecoder {
+
+    private URIDecoder() {
+        throw new RuntimeException("Static Class");
+    }
+
+    /**
+     * Decodes a segment of an URI encoded by a browser.
+     *
+     * The string is expected to be encoded as per RFC 3986, Section 2. This is the encoding used by JavaScript functions
+     * encodeURI and encodeURIComponent, but not escape. For example in this encoding, é (in Unicode U+00E9 or in
+     * UTF-8 0xC3 0xA9) is encoded as %C3%A9 or %c3%a9.
+     *
+     * Plus signs '+' will be handled as spaces and encoded using the default JDK URLEncoder class.
+     *
+     * @param s string to decode
+     *
+     * @return decoded string
+     */
+    public static String decodeURIComponent(String s) {
+        return decodeURIComponent(s, true);
+    }
+
+    /**
+     * Decodes a segment of an URI encoded by a browser.
+     *
+     * The string is expected to be encoded as per RFC 3986, Section 2. This is the encoding used by JavaScript functions
+     * encodeURI and encodeURIComponent, but not escape. For example in this encoding, é (in Unicode U+00E9 or in
+     * UTF-8 0xC3 0xA9) is encoded as %C3%A9 or %c3%a9.
+     *
+     * @param s string to decode
+     * @param plus weather or not to transform plus signs into spaces
+     *
+     * @return decoded string
+     */
+    public static String decodeURIComponent(String s, boolean plus) {
+        if (s == null) {
+            return null;
+        }
+
+        final int size = s.length();
+        boolean modified = false;
+        int i;
+        for (i = 0; i < size; i++) {
+            final char c = s.charAt(i);
+            if (c == '%' || (plus && c == '+')) {
+                modified = true;
+                break;
+            }
+        }
+        if (!modified) {
+            return s;
+        }
+        final byte[] buf = s.getBytes(StandardCharsets.UTF_8);
+        int pos = i; // position in `buf'.
+        for (; i < size; i++) {
+            char c = s.charAt(i);
+            if (c == '%') {
+                if (i == size - 1) {
+                    throw new IllegalArgumentException("unterminated escape"
+                            + " sequence at end of string: " + s);
+                }
+                c = s.charAt(++i);
+                if (c == '%') {
+                    buf[pos++] = '%'; // "%%" -> "%"
+                    break;
+                }
+                if (i >= size - 1) {
+                    throw new IllegalArgumentException("partial escape"
+                            + " sequence at end of string: " + s);
+                }
+                c = decodeHexNibble(c);
+                final char c2 = decodeHexNibble(s.charAt(++i));
+                if (c == Character.MAX_VALUE || c2 == Character.MAX_VALUE) {
+                    throw new IllegalArgumentException(
+                            "invalid escape sequence `%" + s.charAt(i - 1)
+                                    + s.charAt(i) + "' at index " + (i - 2)
+                                    + " of: " + s);
+                }
+                c = (char) (c * 16 + c2);
+                // shouldn't check for plus since it would be a double decoding
+                buf[pos++] = (byte) c;
+            } else {
+                buf[pos++] = (byte) (plus && c == '+' ? ' ' : c);
+            }
+        }
+        return new String(buf, 0, pos, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Helper to decode half of a hexadecimal number from a string.
+     * 
+     * @param c The ASCII character of the hexadecimal number to decode.
+     *        Must be in the range {@code [0-9a-fA-F]}.
+     * @return The hexadecimal value represented in the ASCII character
+     *         given, or {@link Character#MAX_VALUE} if the character is invalid.
+     */
+    private static char decodeHexNibble(final char c) {
+        if ('0' <= c && c <= '9') {
+            return (char) (c - '0');
+        } else if ('a' <= c && c <= 'f') {
+            return (char) (c - 'a' + 10);
+        } else if ('A' <= c && c <= 'F') {
+            return (char) (c - 'A' + 10);
+        } else {
+            return Character.MAX_VALUE;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java
new file mode 100644
index 0000000000000..14206c9b35c03
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/URLUtils.java
@@ -0,0 +1,416 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     https://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.jboss.resteasy.reactive.common.util;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.util.Set;
+import java.util.regex.Pattern;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Utilities for dealing with URLs
+ *
+ * @author Stuart Douglas
+ * @author Andre Schaefer
+ */
+public class URLUtils {
+
+    private static final char PATH_SEPARATOR = '/';
+
+    private static final QueryStringParser QUERY_STRING_PARSER = new QueryStringParser('&', false) {
+        @Override
+        void handle(MultivaluedMap<String, String> exchange, String key, String value) {
+            exchange.add(key, value);
+        }
+    };
+    private static final QueryStringParser PATH_PARAM_PARSER = new QueryStringParser(';', true) {
+        @Override
+        void handle(MultivaluedMap<String, String> exchange, String key, String value) {
+            exchange.add(key, value);
+        }
+    };
+
+    // RFC-3986 (URI Generic Syntax) states:
+    // URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+    // scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    // "The scheme and path components are required, though the path may be empty (no characters)."
+    private static final Pattern SCHEME_PATTERN = Pattern.compile("^[a-zA-Z][a-zA-Z0-9+-.]*:.*");
+
+    private URLUtils() {
+
+    }
+
+    public static void parseQueryString(final String string, final MultivaluedMap<String, String> exchange,
+            final Charset charset, final boolean doDecode, int maxParameters) {
+        QUERY_STRING_PARSER.parse(string, exchange, charset, doDecode, maxParameters);
+    }
+
+    @Deprecated
+    public static void parsePathParms(final String string, final MultivaluedMap<String, String> exchange, final Charset charset,
+            final boolean doDecode, int maxParameters) {
+        parsePathParams(string, exchange, charset, doDecode, maxParameters);
+    }
+
+    public static int parsePathParams(final String string, final MultivaluedMap<String, String> exchange, final Charset charset,
+            final boolean doDecode, int maxParameters) {
+        return PATH_PARAM_PARSER.parse(string, exchange, charset, doDecode, maxParameters);
+    }
+
+    /**
+     * Decodes a URL. If the decoding fails for any reason then an IllegalArgumentException will be thrown.
+     *
+     * @param s The string to decode
+     * @param enc The encoding
+     * @param decodeSlash If slash characters should be decoded
+     * @param buffer The string builder to use as a buffer.
+     * @return The decoded URL
+     */
+    public static String decode(String s, Charset enc, boolean decodeSlash, StringBuilder buffer) {
+        return decode(s, enc, decodeSlash, true, buffer);
+    }
+
+    /**
+     * Decodes a URL. If the decoding fails for any reason then an IllegalArgumentException will be thrown.
+     *
+     * @param s The string to decode
+     * @param enc The encoding
+     * @param decodeSlash If slash characters should be decoded
+     * @param buffer The string builder to use as a buffer.
+     * @return The decoded URL
+     */
+    public static String decode(String s, Charset enc, boolean decodeSlash, boolean formEncoding, StringBuilder buffer) {
+        if (buffer != null) {
+            buffer.setLength(0);
+        }
+        boolean needToChange = false;
+        int numChars = s.length();
+        int i = 0;
+        while (i < numChars) {
+            char c = s.charAt(i);
+            if (c == '+') {
+                if (formEncoding) {
+                    if (!needToChange) {
+                        if (buffer == null) {
+                            buffer = new StringBuilder();
+                        }
+                        buffer.append(s, 0, i);
+                    }
+                    buffer.append(' ');
+                    i++;
+                } else {
+                    i++;
+                    if (needToChange) {
+                        buffer.append(c);
+                    }
+                }
+            } else if (c == '%' || c > 127) {
+                if (!needToChange) {
+                    if (buffer == null) {
+                        buffer = new StringBuilder();
+                    }
+                    buffer.append(s, 0, i);
+                }
+                /*
+                 * Starting with this instance of a character
+                 * that needs to be encoded, process all
+                 * consecutive substrings of the form %xy. Each
+                 * substring %xy will yield a byte. Convert all
+                 * consecutive bytes obtained this way to whatever
+                 * character(s) they represent in the provided
+                 * encoding.
+                 *
+                 * Note that we need to decode the whole rest of the value, we can't just decode
+                 * three characters. For multi code point characters there if the code point can be
+                 * represented as an alphanumeric
+                 */
+                try {
+                    // guess the size of the remaining bytes
+                    // of remaining bytes
+                    // this works for percent encoded characters,
+                    // not so much for unencoded bytes
+                    byte[] bytes = new byte[numChars - i + 1];
+
+                    int pos = 0;
+
+                    while ((i < numChars)) {
+                        if (c == '%') {
+                            // we need 2 more characters to decode the % construct
+                            if ((i + 2) >= s.length()) {
+                                throw failedToDecodeURL(s, enc, null);
+                            }
+                            char p1 = Character.toLowerCase(s.charAt(i + 1));
+                            char p2 = Character.toLowerCase(s.charAt(i + 2));
+                            if (!decodeSlash && ((p1 == '2' && p2 == 'f') || (p1 == '5' && p2 == 'c'))) {
+                                if (pos + 2 >= bytes.length) {
+                                    bytes = expandBytes(bytes);
+                                }
+                                bytes[pos++] = (byte) c;
+                                // should be copied with preserved upper/lower case
+                                bytes[pos++] = (byte) s.charAt(i + 1);
+                                bytes[pos++] = (byte) s.charAt(i + 2);
+                                i += 3;
+
+                                if (i < numChars) {
+                                    c = s.charAt(i);
+                                }
+                                continue;
+                            }
+                            int v = 0;
+                            if (p1 >= '0' && p1 <= '9') {
+                                v = (p1 - '0') << 4;
+                            } else if (p1 >= 'a' && p1 <= 'f') {
+                                v = (p1 - 'a' + 10) << 4;
+                            } else {
+                                throw failedToDecodeURL(s, enc, null);
+                            }
+                            if (p2 >= '0' && p2 <= '9') {
+                                v += (p2 - '0');
+                            } else if (p2 >= 'a' && p2 <= 'f') {
+                                v += (p2 - 'a' + 10);
+                            } else {
+                                throw failedToDecodeURL(s, enc, null);
+                            }
+                            if (v < 0) {
+                                throw failedToDecodeURL(s, enc, null);
+                            }
+
+                            if (pos == bytes.length) {
+                                bytes = expandBytes(bytes);
+                            }
+                            bytes[pos++] = (byte) v;
+                            i += 3;
+                            if (i < numChars) {
+                                c = s.charAt(i);
+                            }
+                        } else if (c == '+' && formEncoding) {
+                            if (pos == bytes.length) {
+                                bytes = expandBytes(bytes);
+                            }
+                            bytes[pos++] = (byte) ' ';
+                            ++i;
+                            if (i < numChars) {
+                                c = s.charAt(i);
+                            }
+                        } else {
+                            if (pos == bytes.length) {
+                                bytes = expandBytes(bytes);
+                            }
+                            ++i;
+                            if (c >> 8 != 0) {
+                                bytes[pos++] = (byte) (c >> 8);
+                                if (pos == bytes.length) {
+                                    bytes = expandBytes(bytes);
+                                }
+                                bytes[pos++] = (byte) c;
+                            } else {
+                                bytes[pos++] = (byte) c;
+                                if (i < numChars) {
+                                    c = s.charAt(i);
+                                }
+                            }
+
+                        }
+                    }
+
+                    String decoded = new String(bytes, 0, pos, enc);
+                    buffer.append(decoded);
+                } catch (NumberFormatException e) {
+                    throw failedToDecodeURL(s, enc, e);
+                }
+                break;
+            } else {
+                i++;
+            }
+        }
+
+        return (needToChange ? buffer.toString() : s);
+    }
+
+    private static RuntimeException failedToDecodeURL(String s, Charset enc, Throwable o) {
+        return new RuntimeException("Failed to decode URL " + s + " to " + enc, o);
+    }
+
+    private static byte[] expandBytes(byte[] bytes) {
+        byte[] newBytes = new byte[bytes.length + 10];
+        System.arraycopy(bytes, 0, newBytes, 0, bytes.length);
+        return newBytes;
+    }
+
+    /**
+     * Extract path param names out of a JAX-RS path. Does not detect errors, but should
+     * be fast and correct if the input is correct.
+     */
+    public static void parsePathParameters(String path, Set<String> pathParameters) {
+        if (path == null || path.isEmpty() || path.indexOf('{') == -1)
+            return;
+        int len = path.length();
+        int open = 0;
+        int startName = -1;
+        int endName = -1;
+        for (int i = 0; i < len; i++) {
+            switch (path.charAt(i)) {
+                case '{':
+                    if (open == 0) {
+                        startName = i + 1;
+                        endName = -1;
+                    }
+                    open++;
+                    break;
+                case '}':
+                    // ignore extra closing brackets
+                    if (open > 0) {
+                        open--;
+                        if (open == 0) {
+                            // mark the end, unless we already marked it due to regex
+                            if (endName == -1)
+                                endName = i;
+                            String pathParam = path.substring(startName, endName);
+                            pathParameters.add(pathParam);
+                        }
+                    }
+                    break;
+                case ':':
+                    // mark the end of regex path param name
+                    if (open == 1 && endName == -1)
+                        endName = i;
+                    break;
+            }
+        }
+    }
+
+    private abstract static class QueryStringParser {
+
+        private final char separator;
+        private final boolean parseUntilSeparator;
+
+        QueryStringParser(final char separator, final boolean parseUntilSeparator) {
+            this.separator = separator;
+            this.parseUntilSeparator = parseUntilSeparator;
+        }
+
+        int parse(final String string, final MultivaluedMap<String, String> exchange, final Charset charset,
+                final boolean doDecode, int max) {
+            int count = 0;
+            int i = 0;
+            try {
+                int stringStart = 0;
+                String attrName = null;
+                for (i = 0; i < string.length(); ++i) {
+                    char c = string.charAt(i);
+                    if (c == '=' && attrName == null) {
+                        attrName = string.substring(stringStart, i);
+                        stringStart = i + 1;
+                    } else if (c == separator) {
+                        if (attrName != null) {
+                            handle(exchange, decode(charset, attrName, doDecode),
+                                    decode(charset, string.substring(stringStart, i), doDecode));
+                            if (++count > max) {
+                                throw tooManyParameters(max);
+                            }
+                        } else {
+                            handle(exchange, decode(charset, string.substring(stringStart, i), doDecode), "");
+                            if (++count > max) {
+                                throw tooManyParameters(max);
+                            }
+                        }
+                        stringStart = i + 1;
+                        attrName = null;
+                    } else if (parseUntilSeparator && (c == '?' || c == '/')) {
+                        break;
+                    }
+                }
+                if (attrName != null) {
+                    handle(exchange, decode(charset, attrName, doDecode),
+                            decode(charset, string.substring(stringStart, i), doDecode));
+                    if (++count > max) {
+                        throw tooManyParameters(max);
+                    }
+                } else if (string.length() != stringStart) {
+                    handle(exchange, decode(charset, string.substring(stringStart, i), doDecode), "");
+                    if (++count > max) {
+                        throw tooManyParameters(max);
+                    }
+                }
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+            }
+            return i;
+        }
+
+        private RuntimeException tooManyParameters(int max) {
+            return new RuntimeException("Too many parameters: max=" + max);
+        }
+
+        private String decode(Charset charset, String attrName, final boolean doDecode) throws UnsupportedEncodingException {
+            if (doDecode) {
+                return URLUtils.decode(attrName, charset, true, true, new StringBuilder());
+            }
+            return attrName;
+        }
+
+        abstract void handle(final MultivaluedMap<String, String> exchange, final String key, final String value);
+    }
+
+    /**
+     * Adds a '/' prefix to the beginning of a path if one isn't present
+     * and removes trailing slashes if any are present.
+     *
+     * @param path the path to normalize
+     * @return a normalized (with respect to slashes) result
+     */
+    public static String normalizeSlashes(final String path) {
+        // prepare
+        final StringBuilder builder = new StringBuilder(path);
+        boolean modified = false;
+
+        // remove all trailing '/'s except the first one
+        while (builder.length() > 0 && builder.length() != 1 && PATH_SEPARATOR == builder.charAt(builder.length() - 1)) {
+            builder.deleteCharAt(builder.length() - 1);
+            modified = true;
+        }
+
+        // add a slash at the beginning if one isn't present
+        if (builder.length() == 0 || PATH_SEPARATOR != builder.charAt(0)) {
+            builder.insert(0, PATH_SEPARATOR);
+            modified = true;
+        }
+
+        // only create string when it was modified
+        if (modified) {
+            return builder.toString();
+        }
+
+        return path;
+    }
+
+    /**
+     * Test if provided location is an absolute URI or not.
+     *
+     * @param location location to check, null = relative, having scheme = absolute
+     * @return true if location is considered absolute
+     */
+    public static boolean isAbsoluteUrl(String location) {
+        if (location != null && location.length() > 0 && location.contains(":")) {
+            // consider it absolute URL if location contains valid scheme part
+            return SCHEME_PATTERN.matcher(location).matches();
+        }
+        return false;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java
new file mode 100644
index 0000000000000..e77c3fb66cd7a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/UnmodifiableMultivaluedMap.java
@@ -0,0 +1,164 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedMap;
+
+/**
+ * Unmodifiable implementation of {@link javax.ws.rs.core.MultivaluedMap} interface
+ *
+ * @author <a href="mailto:mstefank@redhat.conm">Martin Stefanko</a>
+ * @version $Revision: 1 $
+ */
+public class UnmodifiableMultivaluedMap<K, V> implements MultivaluedMap<K, V> {
+
+    private final MultivaluedMap<K, V> delegate;
+
+    private volatile Set<java.util.Map.Entry<K, List<V>>> entrySet;
+
+    public UnmodifiableMultivaluedMap(final MultivaluedMap<K, V> delegate) {
+        this(delegate, true);
+    }
+
+    public UnmodifiableMultivaluedMap(final MultivaluedMap<K, V> delegate, final boolean eagerlyInitializeEntrySet) {
+        this.delegate = delegate;
+        if (eagerlyInitializeEntrySet) {
+            this.entrySet = buildEntrySet();
+        }
+    }
+
+    private Set<java.util.Map.Entry<K, List<V>>> buildEntrySet() {
+        Set<java.util.Map.Entry<K, List<V>>> entrySetDelegator = delegate.entrySet();
+        Set<java.util.Map.Entry<K, List<V>>> entrySetToReturn = new HashSet<>();
+        for (final java.util.Map.Entry<K, List<V>> entry : entrySetDelegator) {
+            entrySetToReturn.add(new Entry<K, List<V>>() {
+
+                @Override
+                public K getKey() {
+                    return entry.getKey();
+                }
+
+                @Override
+                public List<V> getValue() {
+                    List<V> value = entry.getValue();
+                    return value == null ? null : Collections.unmodifiableList(value);
+                }
+
+                @Override
+                public List<V> setValue(List<V> value) {
+                    throw new UnsupportedOperationException();
+                }
+            });
+        }
+        return Collections.unmodifiableSet(entrySetToReturn);
+    }
+
+    @Override
+    public void putSingle(K k, V v) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void add(K k, V v) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public V getFirst(K key) {
+        return delegate.getFirst(key);
+    }
+
+    @SuppressWarnings(value = "unchecked")
+    @Override
+    public void addAll(K k, V... vs) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void addAll(K k, List<V> list) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void addFirst(K k, V v) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean equalsIgnoreValueOrder(MultivaluedMap<K, V> omap) {
+        return delegate.equalsIgnoreValueOrder(omap);
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Set<Entry<K, List<V>>> entrySet() {
+        if (this.entrySet == null) {
+            this.entrySet = buildEntrySet();
+        }
+        return this.entrySet;
+    }
+
+    @Override
+    public List<V> get(Object key) {
+        List<V> list = delegate.get(key);
+        return list == null ? null : Collections.unmodifiableList(list);
+    }
+
+    @Override
+    public Set<K> keySet() {
+        return Collections.unmodifiableSet(delegate.keySet());
+    }
+
+    @Override
+    public List<V> put(K key, List<V> value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void putAll(Map<? extends K, ? extends List<V>> m) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public List<V> remove(Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Collection<List<V>> values() {
+        return Collections.unmodifiableCollection(delegate.values());
+    }
+
+    @Override
+    public boolean containsKey(Object o) {
+        return delegate.containsKey(o);
+    }
+
+    @Override
+    public boolean containsValue(Object o) {
+        return delegate.containsValue(o);
+    }
+
+    @Override
+    public int size() {
+        return delegate.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java
new file mode 100644
index 0000000000000..2ece300039122
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/WeightedLanguage.java
@@ -0,0 +1,108 @@
+package org.jboss.resteasy.reactive.common.util;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ */
+public class WeightedLanguage implements Comparable<WeightedLanguage> {
+    private float weight = 1.0f;
+    private String language;
+    private Locale locale;
+    private Map<String, String> params;
+
+    public WeightedLanguage(final Locale locale, final float weight) {
+        this.locale = locale;
+        this.weight = weight;
+    }
+
+    private WeightedLanguage(final String lang, final Map<String, String> parameters) {
+        this.language = lang;
+        this.params = parameters;
+        this.locale = LocaleHelper.extractLocale(lang);
+        if (params != null) {
+            String q = params.get("q");
+            if (q != null) {
+                weight = getQWithParamInfo(this, q);
+            }
+        }
+    }
+
+    public float getWeight() {
+        return weight;
+    }
+
+    public Locale getLocale() {
+        return locale;
+    }
+
+    public int compareTo(WeightedLanguage o) {
+        WeightedLanguage type2 = this;
+        WeightedLanguage type1 = o;
+
+        if (type1.weight < type2.weight)
+            return -1;
+        if (type1.weight > type2.weight)
+            return 1;
+
+        return 0;
+    }
+
+    public String toString() {
+        String rtn = language;
+        if (params == null || params.size() == 0)
+            return rtn;
+        for (String name : params.keySet()) {
+            String val = params.get(name);
+            rtn += ";" + name + "=\"" + val + "\"";
+        }
+        return rtn;
+    }
+
+    public static WeightedLanguage parse(String lang) {
+        String params = null;
+        int idx = lang.indexOf(";");
+        if (idx > -1) {
+            params = lang.substring(idx + 1).trim();
+            lang = lang.substring(0, idx);
+        }
+        HashMap<String, String> typeParams = new HashMap<String, String>();
+        if (params != null && !params.equals("")) {
+            int start = 0;
+            while (start < params.length()) {
+                start = HeaderParameterParser.setParam(typeParams, params, start);
+            }
+        }
+        return new WeightedLanguage(lang, typeParams);
+    }
+
+    private static float getQWithParamInfo(WeightedLanguage lang, String val) {
+        try {
+            if (val != null) {
+                float rtn = Float.valueOf(val);
+                if (rtn > 1.0F)
+                    throw new WebApplicationException("q value cannot be greater than one: " + (lang.toString()),
+                            Response.Status.BAD_REQUEST);
+                return rtn;
+            }
+        } catch (NumberFormatException e) {
+            throw new WebApplicationException("media type weighted language q must be a float: " + (lang.toString()),
+                    Response.Status.BAD_REQUEST);
+        }
+        return 1.0f;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/GenericArrayTypeImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/GenericArrayTypeImpl.java
new file mode 100644
index 0000000000000..1534d93e46412
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/GenericArrayTypeImpl.java
@@ -0,0 +1,53 @@
+package org.jboss.resteasy.reactive.common.util.types;
+
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Type;
+
+/**
+ * @author Marko Luksa
+ * @author Jozef Hartinger
+ */
+public class GenericArrayTypeImpl implements GenericArrayType {
+
+    private Type genericComponentType;
+
+    public GenericArrayTypeImpl(Type genericComponentType) {
+        this.genericComponentType = genericComponentType;
+    }
+
+    public GenericArrayTypeImpl(Class<?> rawType, Type... actualTypeArguments) {
+        this.genericComponentType = new ParameterizedTypeImpl(rawType, actualTypeArguments);
+    }
+
+    @Override
+    public Type getGenericComponentType() {
+        return genericComponentType;
+    }
+
+    @Override
+    public int hashCode() {
+        return ((genericComponentType == null) ? 0 : genericComponentType.hashCode());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof GenericArrayType) {
+            GenericArrayType that = (GenericArrayType) obj;
+            if (genericComponentType == null) {
+                return that.getGenericComponentType() == null;
+            } else {
+                return genericComponentType.equals(that.getGenericComponentType());
+            }
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(genericComponentType.toString());
+        sb.append("[]");
+        return sb.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/ParameterizedTypeImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/ParameterizedTypeImpl.java
new file mode 100644
index 0000000000000..69653f1251856
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/ParameterizedTypeImpl.java
@@ -0,0 +1,87 @@
+package org.jboss.resteasy.reactive.common.util.types;
+
+import java.io.Serializable;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class ParameterizedTypeImpl implements ParameterizedType, Serializable {
+
+    private static final long serialVersionUID = -3005183010706452884L;
+
+    private final Type[] actualTypeArguments;
+    private final Type rawType;
+    private final Type ownerType;
+
+    public ParameterizedTypeImpl(Type rawType, Type... actualTypeArguments) {
+        this(rawType, actualTypeArguments, null);
+    }
+
+    public ParameterizedTypeImpl(Type rawType, Type[] actualTypeArguments, Type ownerType) {
+        this.actualTypeArguments = actualTypeArguments;
+        this.rawType = rawType;
+        this.ownerType = ownerType;
+    }
+
+    @Override
+    public Type[] getActualTypeArguments() {
+        return Arrays.copyOf(actualTypeArguments, actualTypeArguments.length);
+    }
+
+    @Override
+    public Type getOwnerType() {
+        return ownerType;
+    }
+
+    @Override
+    public Type getRawType() {
+        return rawType;
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(actualTypeArguments) ^ (ownerType == null ? 0 : ownerType.hashCode())
+                ^ (rawType == null ? 0 : rawType.hashCode());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj instanceof ParameterizedType) {
+            ParameterizedType that = (ParameterizedType) obj;
+            Type thatOwnerType = that.getOwnerType();
+            Type thatRawType = that.getRawType();
+            return (ownerType == null ? thatOwnerType == null : ownerType.equals(thatOwnerType))
+                    && (rawType == null ? thatRawType == null : rawType.equals(thatRawType))
+                    && Arrays.equals(actualTypeArguments, that.getActualTypeArguments());
+        } else {
+            return false;
+        }
+
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        if (rawType instanceof Class) {
+            sb.append(((Class<?>) rawType).getName());
+        } else {
+            sb.append(rawType);
+        }
+        if (actualTypeArguments.length > 0) {
+            sb.append("<");
+            for (Type actualType : actualTypeArguments) {
+                if (actualType instanceof Class) {
+                    sb.append(((Class<?>) actualType).getName());
+                } else {
+                    sb.append(actualType);
+                }
+                sb.append(",");
+            }
+            sb.delete(sb.length() - 1, sb.length());
+            sb.append(">");
+        }
+        return sb.toString();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/TypeSignatureParser.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/TypeSignatureParser.java
new file mode 100644
index 0000000000000..d1ee22e02e7f7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/TypeSignatureParser.java
@@ -0,0 +1,180 @@
+package org.jboss.resteasy.reactive.common.util.types;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+// FIXME: move to quarkus-core?
+public class TypeSignatureParser {
+
+    private char[] chars;
+    private int i;
+
+    public TypeSignatureParser(String signature) {
+        chars = signature.toCharArray();
+    }
+
+    public Type parseType() {
+        int arrayCount = 0;
+        Type ret = null;
+        int start = i;
+        LOOP: do {
+            char c = chars[i++];
+            switch (c) {
+                // BaseType
+                case 'B':
+                    ret = byte.class;
+                    break LOOP;
+                case 'C':
+                    ret = char.class;
+                    break LOOP;
+                case 'D':
+                    ret = double.class;
+                    break LOOP;
+                case 'F':
+                    ret = float.class;
+                    break LOOP;
+                case 'I':
+                    ret = int.class;
+                    break LOOP;
+                case 'J':
+                    ret = long.class;
+                    break LOOP;
+                case 'S':
+                    ret = short.class;
+                    break LOOP;
+                case 'Z':
+                    ret = boolean.class;
+                    break LOOP;
+                case 'V':
+                    ret = void.class;
+                    break LOOP;
+                // ClassTypeSignature
+                case 'L':
+                    ret = parseReference();
+                    break LOOP;
+                // TypeVariableSignature
+                case 'T':
+                    // Stef has come to the conclusion that because TypeVariable depends on the GenericDeclaration that defined them, which is lacking
+                    // in signatures unless we have access to the current context, we should not support them
+                    throw new IllegalArgumentException(
+                            "Invalid type variable in signature: " + new String(chars) + " at position " + i);
+                //                // consume until the ;
+                //                int tStart = i;
+                //                while(chars[i++] != ';') {
+                //                }
+                //                ret = new FixedTypeVariableImpl<>(new String(chars, tStart, i - tStart - 1));
+                //                break LOOP;
+                // ArrayTypeSignature
+                case '[':
+                    arrayCount++;
+                    break;
+                default:
+                    throw new IllegalArgumentException(
+                            "Invalid signature char: " + c + " in " + new String(chars) + " at position " + i);
+            }
+        } while (true);
+        if (arrayCount > 0) {
+            if (ret instanceof Class) {
+                Class<?> retClass = (Class<?>) ret;
+                if (retClass.isPrimitive()) {
+                    // load [I or [[I
+                    return loadClass(new String(chars, start, i - start));
+                }
+                // get the [L part and the name out of the class
+                return loadClass(new String(chars, start, arrayCount + 1) + retClass.getName() + ";");
+            }
+            if (ret instanceof ParameterizedType) {
+                // this is a moronic API
+                for (int a = 0; a < arrayCount; a++) {
+                    ret = new GenericArrayTypeImpl(ret);
+                }
+                return ret;
+            }
+            throw new UnsupportedOperationException();
+        }
+        return ret;
+    }
+
+    private Type parseReference() {
+        int start = i;
+        StringBuilder name = new StringBuilder(chars.length - start);
+        List<Type> args = new ArrayList<>();
+        Type lastOwnerType = null;
+        while (i < chars.length) {
+            char c = chars[i++];
+            switch (c) {
+                // last part was PackageSpecifier
+                case '/':
+                    name.append('.');
+                    break;
+                // last part was Identifier
+                case '<':
+                    do {
+                        boolean ext = false;
+                        boolean sup = false;
+                        if (chars[i] == '+') {
+                            i++;
+                            ext = true;
+                        } else if (chars[i] == '-') {
+                            i++;
+                            sup = true;
+                        }
+                        Type typeArg;
+                        if (ext) {
+                            typeArg = WildcardTypeImpl.withUpperBound(parseType());
+                        } else if (sup) {
+                            typeArg = WildcardTypeImpl.withLowerBound(parseType());
+                        } else if (chars[i] == '*') {
+                            i++;
+                            typeArg = WildcardTypeImpl.defaultInstance();
+                        } else {
+                            typeArg = parseType();
+                        }
+                        args.add(typeArg);
+                        if (chars[i] == '>') {
+                            i++;
+                            break;
+                        }
+                    } while (true);
+                    break;
+                // Inner type
+                case '.':
+                    Type ownerType = loadClass(name.toString());
+                    if (!args.isEmpty()) {
+                        ownerType = new ParameterizedTypeImpl(ownerType, args.toArray(new Type[0]), lastOwnerType);
+                        args.clear();
+                    }
+                    lastOwnerType = ownerType;
+                    name.append('$');
+                    break;
+                // last part was Identifier
+                case ';':
+                    Type type = loadClass(name.toString());
+                    if (args.isEmpty())
+                        return type;
+                    return new ParameterizedTypeImpl(type, args.toArray(new Type[0]), lastOwnerType);
+                // default is text
+                default:
+                    name.append(c);
+                    break;
+            }
+        }
+        throw new UnsupportedOperationException();
+    }
+
+    private Type loadClass(String name) {
+        try {
+            // VERY IMPORTANT: we use this for array types, so don't change Class.forName into ClassLoader.loadClass
+            // which does not support arrays
+            return Class.forName(name, false, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static Type parse(String signature) {
+        return new TypeSignatureParser(signature).parseType();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/TypeVariableImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/TypeVariableImpl.java
new file mode 100644
index 0000000000000..4ef44b7adcbb3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/TypeVariableImpl.java
@@ -0,0 +1,57 @@
+package org.jboss.resteasy.reactive.common.util.types;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
+import java.util.List;
+
+public class TypeVariableImpl<D extends GenericDeclaration> implements TypeVariable<D> {
+
+    private final String name;
+
+    private final List<Type> bounds;
+
+    public TypeVariableImpl(String name, Type... bounds) {
+        this.name = name;
+        this.bounds = Arrays.asList(bounds);
+    }
+
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Annotation[] getDeclaredAnnotations() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Type[] getBounds() {
+        return bounds.toArray(new Type[bounds.size()]);
+    }
+
+    @Override
+    public D getGenericDeclaration() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public AnnotatedType[] getAnnotatedBounds() {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java
new file mode 100644
index 0000000000000..8167c40588a4c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/Types.java
@@ -0,0 +1,189 @@
+package org.jboss.resteasy.reactive.common.util.types;
+
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Type conversions and generic type manipulations
+ *
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public final class Types {
+
+    /**
+     * Given a class and an interfaces, go through the class hierarchy to find the interface and return its type arguments.
+     *
+     * @param classToSearch class
+     * @param interfaceToFind interface to find
+     * @return type arguments of the interface
+     */
+    public static Type[] getActualTypeArgumentsOfAnInterface(Class<?> classToSearch, Class<?> interfaceToFind) {
+        Type[] types = findParameterizedTypes(classToSearch, interfaceToFind);
+        if (types == null)
+            throw new RuntimeException("Unable to find type arguments of " + interfaceToFind);
+        return types;
+    }
+
+    private static final Type[] EMPTY_TYPE_ARRAY = {};
+
+    /**
+     * Search for the given interface or class within the root's class/interface hierarchy.
+     * If the searched for class/interface is a generic return an array of real types that fill it out.
+     *
+     * @param root root class
+     * @param searchedFor searched class
+     * @return for generic class/interface returns array of real types
+     */
+    public static Type[] findParameterizedTypes(Class<?> root, Class<?> searchedFor) {
+        if (searchedFor.isInterface()) {
+            return findInterfaceParameterizedTypes(root, null, searchedFor);
+        }
+        return findClassParameterizedTypes(root, null, searchedFor);
+    }
+
+    public static Type[] findClassParameterizedTypes(Class<?> root, ParameterizedType rootType,
+            Class<?> searchedForClass) {
+        if (Object.class.equals(root))
+            return null;
+
+        Map<TypeVariable<?>, Type> typeVarMap = populateParameterizedMap(root, rootType);
+
+        Class<?> superclass = root.getSuperclass();
+        Type genericSuper = root.getGenericSuperclass();
+
+        if (superclass.equals(searchedForClass)) {
+            return extractTypes(typeVarMap, genericSuper);
+        }
+
+        if (genericSuper instanceof ParameterizedType) {
+            ParameterizedType intfParam = (ParameterizedType) genericSuper;
+            Type[] types = findClassParameterizedTypes(superclass, intfParam, searchedForClass);
+            if (types != null) {
+                return extractTypeVariables(typeVarMap, types);
+            }
+        } else {
+            Type[] types = findClassParameterizedTypes(superclass, null, searchedForClass);
+            if (types != null) {
+                return types;
+            }
+        }
+        return null;
+    }
+
+    private static Map<TypeVariable<?>, Type> populateParameterizedMap(Class<?> root, ParameterizedType rootType) {
+        Map<TypeVariable<?>, Type> typeVarMap = new HashMap<>();
+        if (rootType != null) {
+            TypeVariable<? extends Class<?>>[] vars = root.getTypeParameters();
+            for (int i = 0; i < vars.length; i++) {
+                typeVarMap.put(vars[i], rootType.getActualTypeArguments()[i]);
+            }
+        }
+        return typeVarMap;
+    }
+
+    public static Type[] findInterfaceParameterizedTypes(Class<?> root, ParameterizedType rootType,
+            Class<?> searchedForInterface) {
+        Map<TypeVariable<?>, Type> typeVarMap = populateParameterizedMap(root, rootType);
+
+        for (int i = 0; i < root.getInterfaces().length; i++) {
+            Class<?> sub = root.getInterfaces()[i];
+            Type genericSub = root.getGenericInterfaces()[i];
+            if (sub.equals(searchedForInterface)) {
+                return extractTypes(typeVarMap, genericSub);
+            }
+        }
+
+        for (int i = 0; i < root.getInterfaces().length; i++) {
+            Type genericSub = root.getGenericInterfaces()[i];
+            Class<?> sub = root.getInterfaces()[i];
+
+            Type[] types = recurseSuperclassForInterface(searchedForInterface, typeVarMap, genericSub, sub);
+            if (types != null)
+                return types;
+        }
+        if (root.isInterface())
+            return null;
+
+        Class<?> superclass = root.getSuperclass();
+        Type genericSuper = root.getGenericSuperclass();
+
+        return recurseSuperclassForInterface(searchedForInterface, typeVarMap, genericSuper, superclass);
+    }
+
+    private static Type[] recurseSuperclassForInterface(Class<?> searchedForInterface,
+            Map<TypeVariable<?>, Type> typeVarMap, Type genericSub, Class<?> sub) {
+        if (genericSub instanceof ParameterizedType) {
+            ParameterizedType intfParam = (ParameterizedType) genericSub;
+            Type[] types = findInterfaceParameterizedTypes(sub, intfParam, searchedForInterface);
+            if (types != null) {
+                return extractTypeVariables(typeVarMap, types);
+            }
+        } else {
+            Type[] types = findInterfaceParameterizedTypes(sub, null, searchedForInterface);
+            if (types != null) {
+                return types;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Resolve generic types to actual types.
+     *
+     * @param typeVarMap The mapping for generic types to actual types.
+     * @param types The types to resolve.
+     * @return An array of resolved method parameter types in declaration order.
+     */
+    private static Type[] extractTypeVariables(final Map<TypeVariable<?>, Type> typeVarMap, final Type[] types) {
+        final Type[] resolvedMethodParameterTypes = new Type[types.length];
+
+        for (int i = 0; i < types.length; i++) {
+            final Type methodParameterType = types[i];
+
+            if (methodParameterType instanceof TypeVariable<?>) {
+                resolvedMethodParameterTypes[i] = typeVarMap.get(methodParameterType);
+            } else {
+                resolvedMethodParameterTypes[i] = methodParameterType;
+            }
+        }
+
+        return resolvedMethodParameterTypes;
+    }
+
+    private static Type[] extractTypes(Map<TypeVariable<?>, Type> typeVarMap, Type genericSub) {
+        if (genericSub instanceof ParameterizedType) {
+            ParameterizedType param = (ParameterizedType) genericSub;
+            Type[] types = param.getActualTypeArguments();
+
+            Type[] returnTypes = extractTypeVariables(typeVarMap, types);
+            return returnTypes;
+        } else {
+            return EMPTY_TYPE_ARRAY;
+        }
+    }
+
+    public static Class<?> getRawType(Type type) {
+        if (type instanceof Class)
+            return (Class<?>) type;
+        if (type instanceof ParameterizedType)
+            return getRawType(((ParameterizedType) type).getRawType());
+        if (type instanceof TypeVariable)
+            return getRawType(((TypeVariable) type).getBounds()[0]);
+        if (type instanceof WildcardType) {
+            Type[] bounds = ((WildcardType) type).getLowerBounds();
+            if (bounds.length > 0)
+                return getRawType(bounds[0]);
+            return getRawType(((WildcardType) type).getUpperBounds()[0]);
+        }
+        if (type instanceof GenericArrayType)
+            return getRawType(((GenericArrayType) type).getGenericComponentType());
+        throw new IllegalArgumentException("Unknow type: " + type);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/WildcardTypeImpl.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/WildcardTypeImpl.java
new file mode 100644
index 0000000000000..3f17c6460cfa8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/types/WildcardTypeImpl.java
@@ -0,0 +1,51 @@
+package org.jboss.resteasy.reactive.common.util.types;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
+
+/**
+ * This code was mainly copied from Weld codebase.
+ * 
+ * Implementation of {@link WildcardType}.
+ *
+ * Note that per JLS a wildcard may define either the upper bound or the lower bound. A wildcard may not have multiple bounds.
+ *
+ * @author Jozef Hartinger
+ *
+ */
+public class WildcardTypeImpl implements WildcardType {
+
+    public static WildcardType defaultInstance() {
+        return DEFAULT_INSTANCE;
+    }
+
+    public static WildcardType withUpperBound(Type type) {
+        return new WildcardTypeImpl(new Type[] { type }, DEFAULT_LOWER_BOUND);
+    }
+
+    public static WildcardType withLowerBound(Type type) {
+        return new WildcardTypeImpl(DEFAULT_UPPER_BOUND, new Type[] { type });
+    }
+
+    private static final Type[] DEFAULT_UPPER_BOUND = new Type[] { Object.class };
+    private static final Type[] DEFAULT_LOWER_BOUND = new Type[0];
+    private static final WildcardType DEFAULT_INSTANCE = new WildcardTypeImpl(DEFAULT_UPPER_BOUND, DEFAULT_LOWER_BOUND);
+
+    private final Type[] upperBound;
+    private final Type[] lowerBound;
+
+    private WildcardTypeImpl(Type[] upperBound, Type[] lowerBound) {
+        this.upperBound = upperBound;
+        this.lowerBound = lowerBound;
+    }
+
+    @Override
+    public Type[] getUpperBounds() {
+        return upperBound;
+    }
+
+    @Override
+    public Type[] getLowerBounds() {
+        return lowerBound;
+    }
+}
\ No newline at end of file
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/multipart/FileUpload.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/multipart/FileUpload.java
new file mode 100644
index 0000000000000..93a471f3051ca
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/multipart/FileUpload.java
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.reactive.multipart;
+
+import java.nio.file.Path;
+
+/**
+ * Represents a file-upload from an HTTP multipart form submission.
+ */
+public interface FileUpload {
+
+    /**
+     * @return the name of the upload as provided in the form submission.
+     */
+    String name();
+
+    /**
+     * @return the actual temporary file name on the server where the file was uploaded to.
+     */
+    Path uploadedFile();
+
+    /**
+     * @return the file name of the upload as provided in the form submission.
+     */
+    String fileName();
+
+    /**
+     * @return the size of the upload, in bytes
+     */
+    long size();
+
+    /**
+     * @return the content type (MIME type) of the upload.
+     */
+    String contentType();
+
+    /**
+     * @return the charset of the upload.
+     */
+    String charSet();
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/BeanFactory.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/BeanFactory.java
new file mode 100644
index 0000000000000..1c4c7cd6a90f2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/BeanFactory.java
@@ -0,0 +1,36 @@
+package org.jboss.resteasy.reactive.spi;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collection;
+
+public interface BeanFactory<T> {
+
+    /**
+     * Creates an endpoint instance outside the scope of a request
+     */
+    BeanInstance<T> createInstance();
+
+    interface BeanInstance<T> extends AutoCloseable {
+
+        T getInstance();
+
+        void close();
+
+        class ClosingTask<T> implements Closeable {
+            private final Collection<BeanInstance<T>> instances;
+
+            public ClosingTask(Collection<BeanInstance<T>> instances) {
+                this.instances = instances;
+            }
+
+            @Override
+            public void close() throws IOException {
+                for (BeanFactory.BeanInstance<T> i : instances) {
+                    i.close();
+                }
+            }
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/RestHandler.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/RestHandler.java
new file mode 100644
index 0000000000000..21df3722b8e4e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/RestHandler.java
@@ -0,0 +1,9 @@
+package org.jboss.resteasy.reactive.spi;
+
+import org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext;
+
+public interface RestHandler<T extends AbstractResteasyReactiveContext> {
+
+    void handle(T requestContext) throws Exception;
+
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/ThreadSetupAction.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/ThreadSetupAction.java
new file mode 100644
index 0000000000000..912614f2c6939
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/spi/ThreadSetupAction.java
@@ -0,0 +1,43 @@
+package org.jboss.resteasy.reactive.spi;
+
+public interface ThreadSetupAction {
+
+    ThreadState activateInitial();
+
+    ThreadState currentState();
+
+    interface ThreadState {
+        void close();
+
+        void activate();
+
+        void deactivate();
+    }
+
+    ThreadSetupAction NOOP = new ThreadSetupAction() {
+        @Override
+        public ThreadState activateInitial() {
+            return new ThreadState() {
+                @Override
+                public void close() {
+
+                }
+
+                @Override
+                public void activate() {
+
+                }
+
+                @Override
+                public void deactivate() {
+
+                }
+            };
+        }
+
+        @Override
+        public ThreadState currentState() {
+            return activateInitial();
+        }
+    };
+}
diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate b/independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
new file mode 100644
index 0000000000000..1eb63769aabcc
--- /dev/null
+++ b/independent-projects/resteasy-reactive/common/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
@@ -0,0 +1 @@
+org.jboss.resteasy.reactive.common.jaxrs.RuntimeDelegateImpl
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
new file mode 100644
index 0000000000000..57026056a4080
--- /dev/null
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -0,0 +1,595 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>37</version>
+    </parent>
+    <groupId>io.quarkus.resteasy.reactive</groupId>
+    <artifactId>resteasy-reactive-parent</artifactId>
+    <name>RESTEasy Reactive - Parent pom</name>
+    <packaging>pom</packaging>
+    <version>999-SNAPSHOT</version>
+
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <distribution>repo</distribution>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <url>https://github.com/quarkusio/quarkus</url>
+        <connection>scm:git:git@github.com:quarkusio/quarkus.git</connection>
+        <developerConnection>scm:git:git@github.com:quarkusio/quarkus.git</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <!-- Versions -->
+        <version.cdi>2.0.2</version.cdi>
+        <version.jandex>2.2.3.Final</version.jandex>
+        <version.junit5>5.7.1</version.junit5>
+        <version.maven>3.6.3</version.maven>
+        <version.assertj>3.19.0</version.assertj>
+        <version.jboss-logging>3.3.2.Final</version.jboss-logging>
+        <version.jakarta-annotation>1.3.5</version.jakarta-annotation>
+        <version.gizmo>1.0.6.Final</version.gizmo>
+        <version.jpa>2.2.3</version.jpa>
+
+        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
+        <jakarta.json.version>1.1.6</jakarta.json.version>
+        <mutiny.version>0.14.0</mutiny.version>
+        <smallrye-common-annotation.version>1.5.0</smallrye-common-annotation.version>
+        <vertx.version>3.9.5</vertx.version>
+        <rest-assured.version>4.3.3</rest-assured.version>
+        <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
+        <jboss-jaxb-api_2.3_spec.version>2.0.0.Final</jboss-jaxb-api_2.3_spec.version>
+    </properties>
+
+    <modules>
+        <module>server</module>
+        <module>common</module>
+        <module>client</module>
+    </modules>
+
+    <dependencyManagement>
+
+        <dependencies>
+
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-processor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-common-processor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-client-processor</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.quarkus.resteasy.reactive</groupId>
+                <artifactId>resteasy-reactive-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                <version>${version.cdi}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss</groupId>
+                <artifactId>jandex</artifactId>
+                <version>${version.jandex}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.quarkus.gizmo</groupId>
+                <artifactId>gizmo</artifactId>
+                <version>${version.gizmo}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.spec.javax.ws.rs</groupId>
+                <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+                <version>${jboss-jaxrs-api_2.1_spec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish</groupId>
+                <artifactId>jakarta.json</artifactId>
+                <version>${jakarta.json.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.vertx</groupId>
+                <artifactId>vertx-web</artifactId>
+                <version>${vertx.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.vertx</groupId>
+                <artifactId>vertx-core</artifactId>
+                <version>${vertx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.smallrye.reactive</groupId>
+                <artifactId>mutiny</artifactId>
+                <version>${mutiny.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.smallrye.common</groupId>
+                <artifactId>smallrye-common-annotation</artifactId>
+                <version>${smallrye-common-annotation.version}</version>
+            </dependency>
+
+            <!-- JUnit 5 dependencies, imported as a BOM -->
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${version.junit5}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.shrinkwrap</groupId>
+                <artifactId>shrinkwrap-depchain</artifactId>
+                <type>pom</type>
+                <scope>test</scope>
+                <version>1.2.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>${version.maven}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>${version.maven}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-core</artifactId>
+                <version>${version.maven}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging</artifactId>
+                <version>${version.jboss-logging}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${version.jakarta-annotation}</version>
+                <!-- scope>provided</scope -->
+            </dependency>
+
+            <dependency>
+                <groupId>jakarta.persistence</groupId>
+                <artifactId>jakarta.persistence-api</artifactId>
+                <version>${version.jpa}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${version.assertj}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>rest-assured</artifactId>
+                <version>${rest-assured.version}</version>
+                <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>javax.activation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <!-- https://github.com/quarkusio/quarkus/issues/1991 -->
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-osgi</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>commons-logging-jboss-logging</artifactId>
+                <version>${commons-logging-jboss-logging.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.spec.javax.xml.bind</groupId>
+                <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
+                <version>${jboss-jaxb-api_2.3_spec.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <quiet>true</quiet>
+                        <doclint>none</doclint>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>enforce</id>
+                            <configuration>
+                                <rules>
+                                    <bannedDependencies>
+                                        <excludes>
+                                            <!-- Use Jakarta artifacts instead of JBoss specific ones -->
+                                            <exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.servlet:jboss-servlet-api_4.0_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.5_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.1_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec</exclude>
+                                            <!-- except for these 2 for now as most of the RESTEasy optional artifacts depend on them
+                                            <exclude>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec</exclude>
+                                            <exclude>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec</exclude>
+                                            -->
+                                            <exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
+                                            <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
+                                            <!-- Exclude javax dependencies in favor of Jakarta -->
+                                            <exclude>javax.activation:activation</exclude>
+                                            <exclude>javax.activation:javax.activation-api</exclude>
+                                            <exclude>javax.annotation:javax.annotation-api</exclude>
+                                            <exclude>javax.enterprise:cdi-api</exclude>
+                                            <exclude>javax.inject:javax.inject</exclude>
+                                            <exclude>javax.json:javax.json-api</exclude>
+                                            <exclude>javax.json.bind:javax.json.bind-api</exclude>
+                                            <exclude>org.glassfish:javax.json</exclude>
+                                            <exclude>org.glassfish:javax.el</exclude>
+                                            <exclude>javax.persistence:javax.persistence-api</exclude>
+                                            <exclude>javax.persistence:persistence-api</exclude>
+                                            <exclude>javax.security.enterprise:javax.security.enterprise-api</exclude>
+                                            <exclude>javax.servlet:servlet-api</exclude>
+                                            <exclude>javax.servlet:javax.servlet-api</exclude>
+                                            <exclude>javax.transaction:jta</exclude>
+                                            <exclude>javax.transaction:javax.transaction-api</exclude>
+                                            <exclude>javax.validation:validation-api</exclude>
+                                            <exclude>javax.xml.bind:jaxb-api</exclude>
+                                            <exclude>javax.websocket:javax.websocket-api</exclude>
+                                            <exclude>javax.ws.rs:javax.ws.rs-api</exclude>
+                                            <!-- use our jboss-logmanager -->
+                                            <exclude>org.jboss.logging:jboss-logmanager</exclude>
+                                            <!-- We don't want all the API's in one jar-->
+                                            <exclude>javax:javaee-api</exclude>
+                                            <!-- Prevent incompatible config from coming in -->
+                                            <exclude>org.wildfly.client:wildfly-client-config</exclude>
+                                            <exclude>org.jboss.marshalling:jboss-marshalling-osgi</exclude>
+                                            <exclude>org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec</exclude>
+                                            <!-- The API is packaged by the implementation-->
+                                            <exclude>jakarta.json:jakarta.json-api</exclude>
+                                            <!-- Ensure none of the deps use netty-all. This forces deps to use more fine grained netty artifacts -->
+                                            <exclude>io.netty:netty-all</exclude>
+                                            <!-- Ban Log4J (use org.jboss.logmanager:log4j-jboss-logmanager instead) -->
+                                            <exclude>log4j:log4j</exclude>
+                                            <exclude>org.apache.logging.log4j:log4j-api</exclude>
+                                            <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                                            <exclude>org.apache.logging.log4j:log4j-slf4j-impl</exclude>
+                                            <!-- Ban commons-logging (use org.jboss.logging:commons-logging-jboss-logging instead) -->
+                                            <exclude>commons-logging:commons-logging</exclude>
+                                            <exclude>commons-logging:commons-logging-api</exclude>
+                                            <exclude>org.springframework:spring-jcl</exclude>
+                                            <exclude>org.slf4j:jcl-over-slf4j</exclude>
+                                            <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logmanager instead) -->
+                                            <exclude>org.jboss.slf4j:slf4j-jboss-logging</exclude>
+                                            <exclude>org.slf4j:slf4j-simple</exclude>
+                                            <exclude>org.slf4j:slf4j-nop</exclude>
+                                            <exclude>org.slf4j:slf4j-jdk14</exclude>
+                                            <exclude>org.slf4j:slf4j-log4j12</exclude>
+                                            <exclude>org.slf4j:slf4j-log4j13</exclude>
+                                        </excludes>
+                                    </bannedDependencies>
+                                </rules>
+                            </configuration>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${version.surefire.plugin}</version>
+                    <configuration>
+                        <argLine>${jacoco.agent.argLine}</argLine>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>net.revelc.code.formatter</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>2.14.0</version>
+                    <dependencies>
+                        <dependency>
+                            <artifactId>quarkus-ide-config</artifactId>
+                            <groupId>io.quarkus</groupId>
+                            <version>${project.version}</version>
+                        </dependency>
+                      </dependencies>
+                    <configuration>
+                        <configFile>eclipse-format.xml</configFile>
+                        <lineEnding>LF</lineEnding>
+                        <skip>${format.skip}</skip>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>net.revelc.code</groupId>
+                    <artifactId>impsort-maven-plugin</artifactId>
+                    <version>1.6.0</version>
+                    <configuration>
+                        <removeUnused>true</removeUnused>
+                        <skip>${format.skip}</skip>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>sonatype-nexus-releases</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>quick-build</id>
+            <activation>
+                <property>
+                    <name>quickly</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+            <build>
+                <defaultGoal>clean install</defaultGoal>
+            </build>
+        </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>${nexus-staging-maven-plugin.version}</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <serverId>ossrh</serverId>
+                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                            <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
+                            need to add and edit the following profile: <profile> <id>release</id> <properties>
+                            <gpg.useagent>false</gpg.useagent> <gpg.executable>/usr/local/Cellar/gnupg@1.4/1.4.23_1/bin/gpg1</gpg.executable>
+                            <- use gpg1 on Mac OS X <gpg.homedir>~/.gnupg</gpg.homedir> <- Update to
+                            your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase
+                            </properties> </profile> -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>format</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>!no-format</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.revelc.code.formatter</groupId>
+                        <artifactId>formatter-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>format</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>net.revelc.code</groupId>
+                        <artifactId>impsort-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sort-imports</id>
+                                <goals>
+                                    <goal>sort</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <removeUnused>true</removeUnused>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>validate</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>no-format</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.revelc.code.formatter</groupId>
+                        <artifactId>formatter-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>validate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>net.revelc.code</groupId>
+                        <artifactId>impsort-maven-plugin</artifactId>
+                        <configuration>
+                            <removeUnused>true</removeUnused>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>check-imports</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/server/pom.xml b/independent-projects/resteasy-reactive/server/pom.xml
new file mode 100644
index 0000000000000..7e247627f5d23
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-server-parent</artifactId>
+    <name>RESTEasy Reactive - Server Parent </name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>runtime</module>
+        <module>processor</module>
+        <module>vertx</module>
+    </modules>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/server/processor/pom.xml b/independent-projects/resteasy-reactive/server/processor/pom.xml
new file mode 100644
index 0000000000000..17ccebbe69c01
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-server-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-processor</artifactId>
+    <name>RESTEasy Reactive - Processor</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jandex</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus.gizmo</groupId>
+            <artifactId>gizmo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java
new file mode 100644
index 0000000000000..538028e49251d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/EndpointInvokerFactory.java
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.reactive.server.processor;
+
+import java.util.function.Supplier;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+
+public interface EndpointInvokerFactory {
+
+    Supplier<EndpointInvoker> create(ResourceMethod method, ClassInfo currentClass, MethodInfo currentMethod);
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java
new file mode 100644
index 0000000000000..3d2b37d740626
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ReflectionEndpointInvokerFactory.java
@@ -0,0 +1,79 @@
+package org.jboss.resteasy.reactive.server.processor;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.function.Supplier;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.PrimitiveType;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+
+public class ReflectionEndpointInvokerFactory implements EndpointInvokerFactory {
+
+    @Override
+    public Supplier<EndpointInvoker> create(ResourceMethod method, ClassInfo currentClass,
+            MethodInfo currentMethod) {
+        return new Supplier<EndpointInvoker>() {
+            @Override
+            public EndpointInvoker get() {
+
+                try {
+                    Class<?> clazz = Class.forName(currentMethod.declaringClass().name().toString(), false,
+                            Thread.currentThread().getContextClassLoader());
+                    Method meth = clazz.getDeclaredMethod(currentMethod.name(), toParamArray(currentMethod.parameters()));
+                    return new EndpointInvoker() {
+                        @Override
+                        public Object invoke(Object instance, Object[] parameters) throws Exception {
+                            return meth.invoke(instance, parameters);
+                        }
+                    };
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+
+            }
+
+            private Class<?>[] toParamArray(List<Type> parameters) {
+                Class<?>[] ret = new Class[parameters.size()];
+                for (int i = 0; i < ret.length; ++i) {
+                    ret[i] = toParam(parameters.get(i));
+                }
+                return ret;
+            }
+
+            private Class<?> toParam(Type type) {
+                if (type.kind() == Type.Kind.PRIMITIVE) {
+                    PrimitiveType prim = type.asPrimitiveType();
+                    switch (prim.primitive()) {
+                        case INT:
+                            return int.class;
+                        case BYTE:
+                            return byte.class;
+                        case CHAR:
+                            return char.class;
+                        case LONG:
+                            return long.class;
+                        case FLOAT:
+                            return float.class;
+                        case SHORT:
+                            return short.class;
+                        case DOUBLE:
+                            return double.class;
+                        case BOOLEAN:
+                            return boolean.class;
+                        default:
+                            throw new RuntimeException("Unknown type " + prim.primitive());
+                    }
+                } else {
+                    try {
+                        return Class.forName(type.name().toString(), false, Thread.currentThread().getContextClassLoader());
+                    } catch (ClassNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java
new file mode 100644
index 0000000000000..adcda24bd2af2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java
@@ -0,0 +1,340 @@
+package org.jboss.resteasy.reactive.server.processor;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_ARRAY;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_NUMBER;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_OBJECT;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_STRING;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_STRUCTURE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.JSONP_JSON_VALUE;
+import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.MULTI_VALUED_MAP;
+
+import io.quarkus.gizmo.MethodCreator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.core.MultivaluedMap;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.BeanParamInfo;
+import org.jboss.resteasy.reactive.common.model.InjectableBean;
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.common.processor.AdditionalReaders;
+import org.jboss.resteasy.reactive.common.processor.AdditionalWriters;
+import org.jboss.resteasy.reactive.common.processor.EndpointIndexer;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ListConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.LocalDateParamConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.OptionalConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverterSupplier;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.PathSegmentParamConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.SetConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.SortedSetConverter;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.ServerMethodParameter;
+import org.jboss.resteasy.reactive.server.model.ServerResourceMethod;
+import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerFormUrlEncodedProvider;
+import org.jboss.resteasy.reactive.server.providers.serialisers.jsonp.ServerJsonArrayHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.jsonp.ServerJsonObjectHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.jsonp.ServerJsonStructureHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.jsonp.ServerJsonValueHandler;
+
+public class ServerEndpointIndexer
+        extends EndpointIndexer<ServerEndpointIndexer, ServerIndexedParameter, ServerResourceMethod> {
+    private final MethodCreator initConverters;
+    protected final EndpointInvokerFactory endpointInvokerFactory;
+    protected final List<MethodScanner> methodScanners;
+
+    protected ServerEndpointIndexer(AbstractBuilder builder) {
+        super(builder);
+        this.initConverters = builder.initConverters;
+        this.endpointInvokerFactory = builder.endpointInvokerFactory;
+        this.methodScanners = new ArrayList<>(builder.methodScanners);
+    }
+
+    protected void addWriterForType(AdditionalWriters additionalWriters, Type paramType) {
+        DotName dotName = paramType.name();
+        if (dotName.equals(JSONP_JSON_VALUE)
+                || dotName.equals(JSONP_JSON_NUMBER)
+                || dotName.equals(JSONP_JSON_STRING)) {
+            additionalWriters.add(ServerJsonValueHandler.class, APPLICATION_JSON, javax.json.JsonValue.class);
+        } else if (dotName.equals(JSONP_JSON_ARRAY)) {
+            additionalWriters.add(ServerJsonArrayHandler.class, APPLICATION_JSON, javax.json.JsonArray.class);
+        } else if (dotName.equals(JSONP_JSON_OBJECT)) {
+            additionalWriters.add(ServerJsonObjectHandler.class, APPLICATION_JSON, javax.json.JsonObject.class);
+        } else if (dotName.equals(JSONP_JSON_STRUCTURE)) {
+            additionalWriters.add(ServerJsonStructureHandler.class, APPLICATION_JSON, javax.json.JsonStructure.class);
+        }
+    }
+
+    protected void addReaderForType(AdditionalReaders additionalReaders, Type paramType) {
+        DotName dotName = paramType.name();
+        if (dotName.equals(JSONP_JSON_NUMBER)
+                || dotName.equals(JSONP_JSON_VALUE)
+                || dotName.equals(JSONP_JSON_STRING)) {
+            additionalReaders.add(ServerJsonValueHandler.class, APPLICATION_JSON, javax.json.JsonValue.class);
+        } else if (dotName.equals(JSONP_JSON_ARRAY)) {
+            additionalReaders.add(ServerJsonArrayHandler.class, APPLICATION_JSON, javax.json.JsonArray.class);
+        } else if (dotName.equals(JSONP_JSON_OBJECT)) {
+            additionalReaders.add(ServerJsonObjectHandler.class, APPLICATION_JSON, javax.json.JsonObject.class);
+        } else if (dotName.equals(JSONP_JSON_STRUCTURE)) {
+            additionalReaders.add(ServerJsonStructureHandler.class, APPLICATION_JSON, javax.json.JsonStructure.class);
+        } else if (dotName.equals(MULTI_VALUED_MAP)) {
+            additionalReaders.add(ServerFormUrlEncodedProvider.class, APPLICATION_FORM_URLENCODED,
+                    MultivaluedMap.class);
+        }
+    }
+
+    @Override
+    protected ServerIndexedParameter createIndexedParam() {
+        return new ServerIndexedParameter();
+    }
+
+    @Override
+    protected boolean handleCustomParameter(Map<DotName, AnnotationInstance> anns, ServerIndexedParameter builder,
+            Type paramType, boolean field, Map<String, Object> methodContext) {
+        for (MethodScanner i : methodScanners) {
+            ParameterExtractor res = i.handleCustomParameter(paramType, anns, field, methodContext);
+            if (res != null) {
+                builder.setType(ParameterType.CUSTOM);
+                builder.setCustomerParameterExtractor(res);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    protected ServerResourceMethod createResourceMethod(MethodInfo methodInfo, Map<String, Object> methodContext) {
+        ServerResourceMethod serverResourceMethod = new ServerResourceMethod();
+        List<HandlerChainCustomizer> methodCustomizers = new ArrayList<>();
+        for (MethodScanner i : methodScanners) {
+            List<HandlerChainCustomizer> scanned = i.scan(methodInfo, methodContext);
+            if (scanned != null) {
+                methodCustomizers.addAll(scanned);
+            }
+        }
+        serverResourceMethod.setHandlerChainCustomizers(methodCustomizers);
+        return serverResourceMethod;
+    }
+
+    @Override
+    protected boolean handleBeanParam(ClassInfo actualEndpointInfo, Type paramType, MethodParameter[] methodParameters, int i) {
+        ClassInfo beanParamClassInfo = index.getClassByName(paramType.name());
+        InjectableBean injectableBean = scanInjectableBean(beanParamClassInfo,
+                actualEndpointInfo,
+                existingConverters, additionalReaders, injectableBeans, hasRuntimeConverters);
+        return injectableBean.isFormParamRequired();
+    }
+
+    @Override
+    protected void handleAdditionalMethodProcessing(ServerResourceMethod method, ClassInfo currentClassInfo, MethodInfo info) {
+        method.setInvoker(endpointInvokerFactory.create(method, currentClassInfo, info));
+        Set<String> methodAnnotationNames = new HashSet<>();
+        List<AnnotationInstance> instances = info.annotations();
+        for (AnnotationInstance instance : instances) {
+            methodAnnotationNames.add(instance.name().toString());
+        }
+        method.setMethodAnnotationNames(methodAnnotationNames);
+    }
+
+    protected InjectableBean scanInjectableBean(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo,
+            Map<String, String> existingConverters, AdditionalReaders additionalReaders,
+            Map<String, InjectableBean> injectableBeans, boolean hasRuntimeConverters) {
+
+        // do not scan a bean twice
+        String currentTypeName = currentClassInfo.name().toString();
+        InjectableBean currentInjectableBean = injectableBeans.get(currentTypeName);
+        if (currentInjectableBean != null) {
+            return currentInjectableBean;
+        }
+        currentInjectableBean = new BeanParamInfo();
+        injectableBeans.put(currentTypeName, currentInjectableBean);
+
+        // LinkedHashMap the TCK expects that fields annotated with @BeanParam are handled last
+        Map<FieldInfo, ServerIndexedParameter> fieldExtractors = new LinkedHashMap<>();
+        Map<FieldInfo, ServerIndexedParameter> beanParamFields = new LinkedHashMap<>();
+        for (FieldInfo field : currentClassInfo.fields()) {
+            Map<DotName, AnnotationInstance> annotations = new HashMap<>();
+            for (AnnotationInstance i : field.annotations()) {
+                annotations.put(i.name(), i);
+            }
+            ServerIndexedParameter result = extractParameterInfo(currentClassInfo, actualEndpointInfo, existingConverters,
+                    additionalReaders,
+                    annotations, field.type(), field.toString(), true, hasRuntimeConverters,
+                    // We don't support annotation-less path params in injectable beans: only annotations
+                    Collections.emptySet(), field.name(), new HashMap<>());
+            if ((result.getType() != null) && (result.getType() != ParameterType.BEAN)) {
+                //BODY means no annotation, so for fields not injectable
+                fieldExtractors.put(field, result);
+            }
+            if (result.getConverter() != null) {
+                handleConverter(currentTypeName, field);
+            }
+            if (result.getType() == ParameterType.BEAN) {
+                beanParamFields.put(field, result);
+                // transform the bean param
+                // FIXME: pretty sure this doesn't work with generics
+                ClassInfo beanParamClassInfo = index.getClassByName(field.type().name());
+                InjectableBean injectableBean = scanInjectableBean(beanParamClassInfo, actualEndpointInfo,
+                        existingConverters, additionalReaders, injectableBeans, hasRuntimeConverters);
+                // inherit form param requirement from field
+                if (injectableBean.isFormParamRequired()) {
+                    currentInjectableBean.setFormParamRequired(true);
+                }
+            } else if (result.getType() == ParameterType.FORM) {
+                // direct form param requirement
+                currentInjectableBean.setFormParamRequired(true);
+            }
+        }
+        // the TCK expects that fields annotated with @BeanParam are handled last
+        fieldExtractors.putAll(beanParamFields);
+
+        DotName superClassName = currentClassInfo.superName();
+        boolean superTypeIsInjectable = false;
+        if (superClassName != null && !superClassName.equals(ResteasyReactiveDotNames.OBJECT)) {
+            ClassInfo superClass = index.getClassByName(superClassName);
+            if (superClass != null) {
+                InjectableBean superInjectableBean = scanInjectableBean(superClass, actualEndpointInfo,
+                        existingConverters, additionalReaders, injectableBeans, hasRuntimeConverters);
+                superTypeIsInjectable = superInjectableBean.isInjectionRequired();
+                // inherit form param requirement from supertype
+                if (superInjectableBean.isFormParamRequired()) {
+                    currentInjectableBean.setFormParamRequired(true);
+                }
+            }
+        }
+
+        if (!fieldExtractors.isEmpty()) {
+            handleFieldExtractors(currentTypeName, fieldExtractors, superTypeIsInjectable);
+        }
+        currentInjectableBean.setInjectionRequired(!fieldExtractors.isEmpty() || superTypeIsInjectable);
+        return currentInjectableBean;
+    }
+
+    protected void handleFieldExtractors(String currentTypeName, Map<FieldInfo, ServerIndexedParameter> fieldExtractors,
+            boolean superTypeIsInjectable) {
+    }
+
+    protected void handleConverter(String currentTypeName, FieldInfo field) {
+    }
+
+    protected MethodParameter createMethodParameter(ClassInfo currentClassInfo, ClassInfo actualEndpointInfo, boolean encoded,
+            Type paramType, ServerIndexedParameter parameterResult, String name, String defaultValue, ParameterType type,
+            String elementType, boolean single, String signature) {
+        ParameterConverterSupplier converter = parameterResult.getConverter();
+        return new ServerMethodParameter(name,
+                elementType, toClassName(paramType, currentClassInfo, actualEndpointInfo, index),
+                type, single, signature,
+                converter, defaultValue, parameterResult.isObtainedAsCollection(), parameterResult.isOptional(), encoded,
+                parameterResult.getCustomerParameterExtractor());
+    }
+
+    protected void handleOtherParam(Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters,
+            ServerIndexedParameter builder, String elementType) {
+        builder.setConverter(extractConverter(elementType, index,
+                existingConverters, errorLocation, hasRuntimeConverters));
+    }
+
+    protected void handleSortedSetParam(Map<String, String> existingConverters, String errorLocation,
+            boolean hasRuntimeConverters, ServerIndexedParameter builder, String elementType) {
+        ParameterConverterSupplier converter = extractConverter(elementType, index,
+                existingConverters, errorLocation, hasRuntimeConverters);
+        builder.setConverter(new SortedSetConverter.SortedSetSupplier(converter));
+    }
+
+    protected void handleOptionalParam(Map<String, String> existingConverters, String errorLocation,
+            boolean hasRuntimeConverters, ServerIndexedParameter builder, String elementType) {
+        ParameterConverterSupplier converter = extractConverter(elementType, index,
+                existingConverters, errorLocation, hasRuntimeConverters);
+        builder.setConverter(new OptionalConverter.OptionalSupplier(converter));
+    }
+
+    protected void handleSetParam(Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters,
+            ServerIndexedParameter builder, String elementType) {
+        ParameterConverterSupplier converter = extractConverter(elementType, index,
+                existingConverters, errorLocation, hasRuntimeConverters);
+        builder.setConverter(new SetConverter.SetSupplier(converter));
+    }
+
+    protected void handleListParam(Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters,
+            ServerIndexedParameter builder, String elementType) {
+        ParameterConverterSupplier converter = extractConverter(elementType, index,
+                existingConverters, errorLocation, hasRuntimeConverters);
+        builder.setConverter(new ListConverter.ListSupplier(converter));
+    }
+
+    protected void handlePathSegmentParam(ServerIndexedParameter builder) {
+        builder.setConverter(new PathSegmentParamConverter.Supplier());
+    }
+
+    protected void handleLocalDateParam(ServerIndexedParameter builder) {
+        builder.setConverter(new LocalDateParamConverter.Supplier());
+    }
+
+    protected ParameterConverterSupplier extractConverter(String elementType, IndexView indexView,
+            Map<String, String> existingConverters, String errorLocation, boolean hasRuntimeConverters) {
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static class AbstractBuilder<B extends EndpointIndexer.Builder<ServerEndpointIndexer, B, ServerResourceMethod>>
+            extends EndpointIndexer.Builder<ServerEndpointIndexer, B, ServerResourceMethod> {
+
+        private MethodCreator initConverters;
+        private EndpointInvokerFactory endpointInvokerFactory = new ReflectionEndpointInvokerFactory();
+        private List<MethodScanner> methodScanners = new ArrayList<>();
+
+        public EndpointInvokerFactory getEndpointInvokerFactory() {
+            return endpointInvokerFactory;
+        }
+
+        public B setEndpointInvokerFactory(EndpointInvokerFactory endpointInvokerFactory) {
+            this.endpointInvokerFactory = endpointInvokerFactory;
+            return (B) this;
+        }
+
+        public MethodCreator getInitConverters() {
+            return initConverters;
+        }
+
+        public B setInitConverters(MethodCreator initConverters) {
+            this.initConverters = initConverters;
+            return (B) this;
+        }
+
+        public B addMethodScanner(MethodScanner methodScanner) {
+            this.methodScanners.add(methodScanner);
+            return (B) this;
+        }
+
+        public B addMethodScanners(Collection<MethodScanner> methodScanners) {
+            this.methodScanners.addAll(methodScanners);
+            return (B) this;
+        }
+
+        @Override
+        public ServerEndpointIndexer build() {
+            return new ServerEndpointIndexer(this);
+        }
+    }
+
+    public static class Builder extends AbstractBuilder<Builder> {
+
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerIndexedParameter.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerIndexedParameter.java
new file mode 100644
index 0000000000000..ca5259e3d26b4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerIndexedParameter.java
@@ -0,0 +1,28 @@
+package org.jboss.resteasy.reactive.server.processor;
+
+import org.jboss.resteasy.reactive.common.processor.IndexedParameter;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverterSupplier;
+
+public class ServerIndexedParameter extends IndexedParameter<ServerIndexedParameter> {
+    protected ParameterConverterSupplier converter;
+    private ParameterExtractor customerParameterExtractor;
+
+    public ParameterConverterSupplier getConverter() {
+        return converter;
+    }
+
+    public ServerIndexedParameter setConverter(ParameterConverterSupplier converter) {
+        this.converter = converter;
+        return this;
+    }
+
+    public ParameterExtractor getCustomerParameterExtractor() {
+        return customerParameterExtractor;
+    }
+
+    public ServerIndexedParameter setCustomerParameterExtractor(ParameterExtractor customerParameterExtractor) {
+        this.customerParameterExtractor = customerParameterExtractor;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java
new file mode 100644
index 0000000000000..7c9d0b85240d0
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/AsyncReturnTypeScanner.java
@@ -0,0 +1,40 @@
+package org.jboss.resteasy.reactive.server.processor.scanning;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletionStage;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.resteasy.reactive.server.handlers.CompletionStageResponseHandler;
+import org.jboss.resteasy.reactive.server.handlers.PublisherResponseHandler;
+import org.jboss.resteasy.reactive.server.handlers.UniResponseHandler;
+import org.jboss.resteasy.reactive.server.model.FixedHandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.reactivestreams.Publisher;
+
+public class AsyncReturnTypeScanner implements MethodScanner {
+    private static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
+    private static final DotName UNI = DotName.createSimple(Uni.class.getName());
+    private static final DotName MULTI = DotName.createSimple(Multi.class.getName());
+    private static final DotName PUBLISHER = DotName.createSimple(Publisher.class.getName());
+
+    @Override
+    public List<HandlerChainCustomizer> scan(MethodInfo method, Map<String, Object> methodContext) {
+        DotName returnTypeName = method.returnType().name();
+        if (returnTypeName.equals(COMPLETION_STAGE)) {
+            return Collections.singletonList(new FixedHandlerChainCustomizer(new CompletionStageResponseHandler(),
+                    HandlerChainCustomizer.Phase.AFTER_METHOD_INVOKE));
+        } else if (returnTypeName.equals(UNI)) {
+            return Collections.singletonList(new FixedHandlerChainCustomizer(new UniResponseHandler(),
+                    HandlerChainCustomizer.Phase.AFTER_METHOD_INVOKE));
+        }
+        if (returnTypeName.equals(MULTI) || returnTypeName.equals(PUBLISHER)) {
+            return Collections.singletonList(new FixedHandlerChainCustomizer(new PublisherResponseHandler(),
+                    HandlerChainCustomizer.Phase.AFTER_METHOD_INVOKE));
+        }
+        return Collections.emptyList();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java
new file mode 100644
index 0000000000000..5bab5fa85666f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/MethodScanner.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server.processor.scanning;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+
+public interface MethodScanner {
+
+    default List<HandlerChainCustomizer> scan(MethodInfo method, Map<String, Object> methodContext) {
+        return Collections.emptyList();
+    }
+
+    default ParameterExtractor handleCustomParameter(Type paramType, Map<DotName, AnnotationInstance> annotations,
+            boolean field, Map<String, Object> methodContext) {
+        return null;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java
new file mode 100644
index 0000000000000..5441090aafabc
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveContextResolverScanner.java
@@ -0,0 +1,78 @@
+package org.jboss.resteasy.reactive.server.processor.scanning;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.ResourceContextResolver;
+import org.jboss.resteasy.reactive.common.processor.JandexUtil;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+/**
+ * Class that is responsible for scanning for exception mappers
+ */
+public class ResteasyReactiveContextResolverScanner {
+
+    /**
+     * Creates a fully populated exception mapper instance, that are created via reflection.
+     */
+    public static ContextResolvers createContextResolvers(IndexView indexView, ApplicationScanningResult result) {
+        return createContextResolvers(indexView, result, new ReflectionBeanFactoryCreator());
+    }
+
+    /**
+     * Creates a fully populated exception mapper instance, that are created via the provided factory creator
+     */
+    public static ContextResolvers createContextResolvers(IndexView indexView, ApplicationScanningResult result,
+            Function<String, BeanFactory<?>> factoryCreator) {
+        ContextResolvers ret = scanForContextResolvers(indexView, result);
+        ret.initializeDefaultFactories(factoryCreator);
+        return ret;
+    }
+
+    public static ContextResolvers scanForContextResolvers(IndexView index, ApplicationScanningResult result) {
+
+        ContextResolvers contextResolvers = new ContextResolvers();
+        Collection<ClassInfo> resolvers = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.CONTEXT_RESOLVER);
+        for (ClassInfo resolverClass : resolvers) {
+            ApplicationScanningResult.KeepProviderResult keepProviderResult = result
+                    .keepProvider(resolverClass);
+            if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+                List<Type> typeParameters = JandexUtil.resolveTypeParameters(resolverClass.name(),
+                        ResteasyReactiveDotNames.CONTEXT_RESOLVER,
+                        index);
+                DotName typeParam = typeParameters.get(0).name();
+                ResourceContextResolver mapper = new ResourceContextResolver();
+                mapper.setClassName(resolverClass.name().toString());
+                mapper.setMediaTypeStrings(getProducesMediaTypes(resolverClass));
+                try {
+                    Class contextType = Class.forName(typeParam.toString(), false,
+                            Thread.currentThread().getContextClassLoader());
+                    contextResolvers.addContextResolver(contextType, mapper);
+                } catch (ClassNotFoundException e) {
+                    throw new RuntimeException("Unable to load context type: " + typeParam);
+                }
+            }
+        }
+        return contextResolvers;
+    }
+
+    private static List<String> getProducesMediaTypes(ClassInfo classInfo) {
+        AnnotationInstance produces = classInfo.classAnnotation(ResteasyReactiveDotNames.PRODUCES);
+        if (produces == null) {
+            return Collections.emptyList();
+        }
+        return Arrays.asList(produces.value().asStringArray());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java
new file mode 100644
index 0000000000000..7e5338fe3cf01
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveExceptionMappingScanner.java
@@ -0,0 +1,74 @@
+package org.jboss.resteasy.reactive.server.processor.scanning;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Function;
+import javax.ws.rs.Priorities;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Type;
+import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
+import org.jboss.resteasy.reactive.common.processor.JandexUtil;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+/**
+ * Class that is responsible for scanning for exception mappers
+ */
+public class ResteasyReactiveExceptionMappingScanner {
+
+    /**
+     * Creates a fully populated exception mapper instance, that are created via reflection.
+     */
+    public static ExceptionMapping createExceptionMappers(IndexView indexView, ApplicationScanningResult result) {
+        return createExceptionMappers(indexView, result, new ReflectionBeanFactoryCreator());
+    }
+
+    /**
+     * Creates a fully populated exception mapper instance, that are created via the provided factory creator
+     */
+    public static ExceptionMapping createExceptionMappers(IndexView indexView, ApplicationScanningResult result,
+            Function<String, BeanFactory<?>> factoryCreator) {
+        ExceptionMapping ret = scanForExceptionMappers(indexView, result);
+        ret.initializeDefaultFactories(factoryCreator);
+        return ret;
+    }
+
+    public static ExceptionMapping scanForExceptionMappers(IndexView index, ApplicationScanningResult result) {
+
+        ExceptionMapping exceptionMapping = new ExceptionMapping();
+        Collection<ClassInfo> exceptionMappers = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.EXCEPTION_MAPPER);
+        for (ClassInfo mapperClass : exceptionMappers) {
+            ApplicationScanningResult.KeepProviderResult keepProviderResult = result
+                    .keepProvider(mapperClass);
+            if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+                List<Type> typeParameters = JandexUtil.resolveTypeParameters(mapperClass.name(),
+                        ResteasyReactiveDotNames.EXCEPTION_MAPPER,
+                        index);
+                DotName handledExceptionDotName = typeParameters.get(0).name();
+                AnnotationInstance priorityInstance = mapperClass.classAnnotation(ResteasyReactiveDotNames.PRIORITY);
+                int priority = Priorities.USER;
+                if (priorityInstance != null) {
+                    priority = priorityInstance.value().asInt();
+                }
+                ResourceExceptionMapper mapper = new ResourceExceptionMapper<>();
+                mapper.setPriority(priority);
+                mapper.setClassName(mapperClass.name().toString());
+                try {
+                    Class mappedClass = Class.forName(handledExceptionDotName.toString(), false,
+                            Thread.currentThread().getContextClassLoader());
+                    exceptionMapping.addExceptionMapper(mappedClass, mapper);
+                } catch (ClassNotFoundException e) {
+                    throw new RuntimeException("Unable to load mapped exception: " + handledExceptionDotName);
+                }
+            }
+        }
+        return exceptionMapping;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java
new file mode 100644
index 0000000000000..722b8f6055ba9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveFeatureScanner.java
@@ -0,0 +1,95 @@
+package org.jboss.resteasy.reactive.server.processor.scanning;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.core.Feature;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature;
+import org.jboss.resteasy.reactive.common.model.ResourceFeature;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.server.model.DynamicFeatures;
+import org.jboss.resteasy.reactive.server.model.Features;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+/**
+ * Class that is responsible for scanning for features and dynamic features
+ */
+public class ResteasyReactiveFeatureScanner {
+
+    /**
+     * Creates a fully populated resource features instance, that are created via reflection.
+     */
+    public static Features createFeatures(IndexView indexView, ApplicationScanningResult result) {
+        return createFeatures(indexView, result, new ReflectionBeanFactoryCreator());
+    }
+
+    /**
+     * Creates a fully populated resource features instance, that are created via the provided factory creator
+     */
+    public static Features createFeatures(IndexView indexView, ApplicationScanningResult result,
+            Function<String, BeanFactory<?>> factoryCreator) {
+        Features features = new Features();
+        for (String i : scanForFeatures(indexView, result)) {
+            ResourceFeature resourceFeature = new ResourceFeature();
+            resourceFeature.setFactory((BeanFactory<Feature>) factoryCreator.apply(i));
+            features.addFeature(resourceFeature);
+        }
+        return features;
+    }
+
+    /**
+     * Creates a fully populated resource dynamic features instance, that are created via reflection.
+     */
+    public static DynamicFeatures createDynamicFeatures(IndexView indexView, ApplicationScanningResult result) {
+        return createDynamicFeatures(indexView, result, new ReflectionBeanFactoryCreator());
+    }
+
+    /**
+     * Creates a fully populated resource features instance, that are created via the provided factory creator
+     */
+    public static DynamicFeatures createDynamicFeatures(IndexView indexView, ApplicationScanningResult result,
+            Function<String, BeanFactory<?>> factoryCreator) {
+        DynamicFeatures features = new DynamicFeatures();
+        for (String i : scanForDynamicFeatures(indexView, result)) {
+            ResourceDynamicFeature resourceFeature = new ResourceDynamicFeature();
+            resourceFeature.setFactory((BeanFactory<DynamicFeature>) factoryCreator.apply(i));
+            features.addFeature(resourceFeature);
+        }
+        return features;
+    }
+
+    public static Set<String> scanForFeatures(IndexView index, ApplicationScanningResult applicationScanningResult) {
+        Collection<ClassInfo> features = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.FEATURE);
+        Set<String> ret = new HashSet<>();
+        for (ClassInfo featureClass : features) {
+            ApplicationScanningResult.KeepProviderResult keepProviderResult = applicationScanningResult
+                    .keepProvider(featureClass);
+            if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+                ret.add(featureClass.name().toString());
+            }
+        }
+        return ret;
+    }
+
+    public static Set<String> scanForDynamicFeatures(IndexView index, ApplicationScanningResult applicationScanningResult) {
+        Collection<ClassInfo> features = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.DYNAMIC_FEATURE);
+        Set<String> ret = new HashSet<>();
+        for (ClassInfo featureClass : features) {
+            ApplicationScanningResult.KeepProviderResult keepProviderResult = applicationScanningResult
+                    .keepProvider(featureClass);
+            if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+                ret.add(featureClass.name().toString());
+            }
+        }
+        return ret;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java
new file mode 100644
index 0000000000000..9b28b0dafde31
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/ResteasyReactiveParamConverterScanner.java
@@ -0,0 +1,56 @@
+package org.jboss.resteasy.reactive.server.processor.scanning;
+
+import java.util.Collection;
+import java.util.function.Function;
+import javax.ws.rs.Priorities;
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider;
+import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+/**
+ * Class that is responsible for scanning for param converters
+ */
+public class ResteasyReactiveParamConverterScanner {
+
+    /**
+     * Creates a fully populated param converter instance, that are created via reflection.
+     */
+    public static ParamConverterProviders createParamConverters(IndexView indexView, ApplicationScanningResult result) {
+        return createParamConverters(indexView, result, new ReflectionBeanFactoryCreator());
+    }
+
+    /**
+     * Creates a fully populated param converter instance, that are created via the provided factory creator
+     */
+    public static ParamConverterProviders createParamConverters(IndexView indexView, ApplicationScanningResult result,
+            Function<String, BeanFactory<?>> factoryCreator) {
+        ParamConverterProviders ret = scanForParamConverters(indexView, result);
+        ret.initializeDefaultFactories(factoryCreator);
+        return ret;
+    }
+
+    public static ParamConverterProviders scanForParamConverters(IndexView index, ApplicationScanningResult result) {
+
+        Collection<ClassInfo> paramConverterProviders = index
+                .getAllKnownImplementors(ResteasyReactiveDotNames.PARAM_CONVERTER_PROVIDER);
+        ParamConverterProviders providers = new ParamConverterProviders();
+        for (ClassInfo converterClass : paramConverterProviders) {
+            ApplicationScanningResult.KeepProviderResult keepProviderResult = result.keepProvider(converterClass);
+            if (keepProviderResult != ApplicationScanningResult.KeepProviderResult.DISCARD) {
+                AnnotationInstance priorityInstance = converterClass.classAnnotation(ResteasyReactiveDotNames.PRIORITY);
+                int priority = priorityInstance != null ? priorityInstance.value().asInt() : Priorities.USER;
+                ResourceParamConverterProvider provider = new ResourceParamConverterProvider();
+                provider.setPriority(priority);
+                provider.setClassName(converterClass.name().toString());
+                providers.addParamConverterProviders(provider);
+            }
+        }
+        return providers;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/pom.xml b/independent-projects/resteasy-reactive/server/runtime/pom.xml
new file mode 100644
index 0000000000000..0dc1ab737ce27
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-server-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive</artifactId>
+    <name>RESTEasy Reactive - Runtime</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java
new file mode 100644
index 0000000000000..1b946b780e941
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerExceptionMapper.java
@@ -0,0 +1,54 @@
+package org.jboss.resteasy.reactive.server;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * When used on a method, then an implementation of {@link javax.ws.rs.ext.ExceptionMapper} is generated
+ * that calls the annotated method with the proper arguments.
+ *
+ * When the annotation is placed on a method that is not a JAX-RS Resource class, the method handles exceptions in global
+ * fashion
+ * (as do regular JAX-RS {@code ExceptionMapper} implementations).
+ * However, when it is placed on a method of a JAX-RS Resource class, the method is only used to handle exceptions originating
+ * from
+ * that JAX-RS Resource class.
+ * Methods in a JAX-RS class annotated with this annotation will be used first when determining how to handle a thrown
+ * exception.
+ * This means that these methods take precedence over the global {@link javax.ws.rs.ext.ExceptionMapper} classes.
+ *
+ * In addition to the exception being handled, an annotated method can also declare any of the following
+ * parameters (in any order):
+ * <ul>
+ * <li>{@link ContainerRequestContext}
+ * <li>{@link UriInfo}
+ * <li>{@link HttpHeaders}
+ * <li>{@link Request}
+ * <li>{@link ResourceInfo}
+ * <li>{@link SimpleResourceInfo}
+ * </ul>
+ *
+ * When {@code value} is not set, then the handled Exception type is deduced by the Exception type used in the method parameters
+ * (there must be exactly one Exception type in this case).
+ *
+ * The return type of the method must be either be of type {@code Response} or {@code Uni<Response>}.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ServerExceptionMapper {
+
+    Class<? extends Throwable>[] value() default {};
+
+    /**
+     * The priority with which the exception mapper will be executed
+     */
+    int priority() default Priorities.USER;
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java
new file mode 100644
index 0000000000000..c1e1dd2cf7ab8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerRequestFilter.java
@@ -0,0 +1,86 @@
+package org.jboss.resteasy.reactive.server;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * When used on a method, then an implementation of {@link javax.ws.rs.container.ContainerRequestFilter} is generated
+ * that calls the annotated method with the proper arguments
+ * <p>
+ * The idea behind using this is to make it much to write a {@code ServerRequestFilter} as all the necessary information
+ * is passed as arguments to the method instead of forcing the author to use a mix of {@code @Context} and programmatic CDI
+ * look-ups.
+ * <p>
+ * An example filter could look like this:
+ *
+ * <pre>
+ * public class CustomContainerRequestFilter {
+ *
+ *     private final SomeBean someBean;
+ *
+ *     // SomeBean will be automatically injected by CDI as long as SomeBean is a bean itself
+ *     public CustomContainerRequestFilter(SomeBean someBean) {
+ *         this.someBean = someBean;
+ *     }
+ *
+ *     &#64;ServerRequestFilter
+ *     public void whatever(UriInfo uriInfo, HttpHeaders httpHeaders) {
+ *         // do something
+ *     }
+ * }
+ * </pre>
+ *
+ * Methods annotated with {@code ServerRequestFilter} can declare any of the following parameters (in any order)
+ * <ul>
+ * <li>{@link ContainerRequestContext}
+ * <li>{@link UriInfo}
+ * <li>{@link HttpHeaders}
+ * <li>{@link Request}
+ * <li>{@link ResourceInfo}
+ * <li>{@link SimpleResourceInfo}
+ * </ul>
+ *
+ * The return type of the method must be either be of type {@code void}, {@code Response}, {@code Optional<Response>},
+ * {@code Uni<Void>} or
+ * {@code Uni<Response>}.
+ * <ul>
+ * <li>{@code void} should be used when filtering does not need to perform any blocking operations and the filter cannot abort
+ * processing.
+ * <li>{@code Response} should be used when filtering does not need to perform any blocking operations and the filter cannot
+ * abort
+ * processing - in this case the processing will be aborted if the response is not {@code null}.
+ * <li>{@code Optional<Response>} should be used when filtering does not need to perform any blocking operations but the filter
+ * might abort processing - in this case processing is aborted when the {@code Optional} contains a {@code Response} payload.
+ * <li>{@code Uni<Void>} should be used when filtering needs to perform a blocking operations but the filter cannot abort
+ * processing.
+ * Note that {@code Uni<Void>} can easily be produced using: {@code Uni.createFrom().nullItem()}
+ * <li>{@code Uni<Response>} should be used when filtering needs to perform a blocking operations and the filter
+ * might abort processing - in this case processing is aborted when the {@code Uni} contains a {@code Response} payload.
+ * </ul>
+ *
+ * Another important thing to note is that if {@link ContainerRequestContext} is used as a request parameter, calling
+ * {@code abortWith}
+ * is not allowed. You should use the proper response type if aborting processing is necessary.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ServerRequestFilter {
+
+    /**
+     * The priority with which this request filter will be executed
+     */
+    int priority() default Priorities.USER;
+
+    /**
+     * Whether or not the filter is a pre-matching filter
+     */
+    boolean preMatching() default false;
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java
new file mode 100644
index 0000000000000..daf7fa44c1e1c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/ServerResponseFilter.java
@@ -0,0 +1,66 @@
+package org.jboss.resteasy.reactive.server;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ResourceInfo;
+
+/**
+ * When used on a method, then an implementation of {@link javax.ws.rs.container.ContainerResponseContext} is generated
+ * that calls the annotated method with the proper arguments
+ *
+ * The idea behind using this is to make it much to write a {@code ServerResponseFilter} as all the necessary information
+ * is passed as arguments to the method instead of forcing the author to use a mix of {@code @Context} and programmatic CDI
+ * look-ups.
+ * <p>
+ * An example filter could look like this:
+ *
+ * <pre>
+ * public class CustomContainerResponseFilter {
+ *
+ *     private final SomeBean someBean;
+ *
+ *     // SomeBean will be automatically injected by CDI as long as SomeBean is a bean itself
+ *     public CustomContainerResponseFilter(SomeBean someBean) {
+ *         this.someBean = someBean;
+ *     }
+ *
+ *     &#64;ServerResponseFilter
+ *     public void whatever(SimplifiedResourceInfo resourceInfo) {
+ *         // do something
+ *     }
+ * }
+ * </pre>
+ *
+ * Methods annotated with {@code ServerRequestFilter} can declare any of the following parameters (in any order)
+ * <ul>
+ * <li>{@link ContainerRequestContext}
+ * <li>{@link ContainerResponseContext}
+ * <li>{@link ResourceInfo}
+ * <li>{@link SimpleResourceInfo}
+ * <li>{@link Throwable} - The thrown exception - or {@code null} if no exception was thrown
+ * </ul>
+ *
+ * The return type of the method must be either be of type {@code void} or {@code Uni<Void>}.
+ * <ul>
+ * <li>{@code void} should be used when filtering does not need to perform any blocking operations.
+ * <li>{@code Uni<Void>} should be used when filtering needs to perform a blocking operations.
+ * </ul>
+ *
+ * Another important thing to note is that if {@link ContainerRequestContext} is used as a request parameter, calling
+ * {@code abortWith}
+ * is prohibited by the JAX-RS specification.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ServerResponseFilter {
+
+    /**
+     * The priority with which this response filter will be executed
+     */
+    int priority() default Priorities.USER;
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java
new file mode 100644
index 0000000000000..1c00ea0cf79c5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/SimpleResourceInfo.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server;
+
+/**
+ * Type that can be injected into places where ResourceInfo can.
+ * The idea is that this can be used when a piece of code does not need access to the entire resource method
+ * (which entails a reflective lookup call), where the resource class, method name and parameter types will suffice
+ */
+public interface SimpleResourceInfo {
+
+    /**
+     * Get the resource class that is the target of a request,
+     */
+    Class<?> getResourceClass();
+
+    /**
+     * Get the name of the resource method that is the target of a request
+     */
+    String getMethodName();
+
+    /**
+     * Get the parameter types of the resource method that is the target of a request
+     */
+    Class<?>[] parameterTypes();
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java
new file mode 100644
index 0000000000000..0826a7fccdb34
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/AsyncExceptionMapperContextImpl.java
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.server.spi.AsyncExceptionMapperContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class AsyncExceptionMapperContextImpl implements AsyncExceptionMapperContext {
+
+    private final ResteasyReactiveRequestContext context;
+
+    public AsyncExceptionMapperContextImpl(ResteasyReactiveRequestContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public ServerRequestContext serverRequestContext() {
+        return context;
+    }
+
+    @Override
+    public void suspend() {
+        context.suspend();
+    }
+
+    @Override
+    public void resume() {
+        context.resume();
+    }
+
+    @Override
+    public void setResponse(Response response) {
+        context.setResult(response);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/BlockingOperationSupport.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/BlockingOperationSupport.java
new file mode 100644
index 0000000000000..baa55448beb77
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/BlockingOperationSupport.java
@@ -0,0 +1,20 @@
+package org.jboss.resteasy.reactive.server.core;
+
+public class BlockingOperationSupport {
+
+    private static volatile IOThreadDetector ioThreadDetector;
+
+    public static void setIoThreadDetector(IOThreadDetector ioThreadDetector) {
+        BlockingOperationSupport.ioThreadDetector = ioThreadDetector;
+    }
+
+    public static boolean isBlockingAllowed() {
+        return ioThreadDetector.isBlockingAllowed();
+    }
+
+    public interface IOThreadDetector {
+
+        boolean isBlockingAllowed();
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java
new file mode 100644
index 0000000000000..f48983f138b76
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CloseRunnable.java
@@ -0,0 +1,25 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.io.Closeable;
+import java.io.IOException;
+import org.jboss.logging.Logger;
+
+public class CloseRunnable implements Runnable {
+
+    private static final Logger log = Logger.getLogger(CloseRunnable.class);
+
+    final Closeable closeable;
+
+    public CloseRunnable(Closeable closeable) {
+        this.closeable = closeable;
+    }
+
+    @Override
+    public void run() {
+        try {
+            closeable.close();
+        } catch (IOException e) {
+            log.error("Failed to run close task", e);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ContextFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ContextFactory.java
new file mode 100644
index 0000000000000..c78874855d7db
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ContextFactory.java
@@ -0,0 +1,4 @@
+package org.jboss.resteasy.reactive.server.core;
+
+public class ContextFactory {
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CurrentRequest.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CurrentRequest.java
new file mode 100644
index 0000000000000..88e2f740c100a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CurrentRequest.java
@@ -0,0 +1,8 @@
+package org.jboss.resteasy.reactive.server.core;
+
+public interface CurrentRequest {
+
+    ResteasyReactiveRequestContext get();
+
+    void set(ResteasyReactiveRequestContext set);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CurrentRequestManager.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CurrentRequestManager.java
new file mode 100644
index 0000000000000..918f65de89e81
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/CurrentRequestManager.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.server.core;
+
+public class CurrentRequestManager {
+
+    private static volatile CurrentRequest currentRequest = new DefaultCurrentRequest();
+
+    public static ResteasyReactiveRequestContext get() {
+        return currentRequest.get();
+    }
+
+    public static void set(ResteasyReactiveRequestContext set) {
+        currentRequest.set(set);
+    }
+
+    public static void setCurrentRequestInstance(CurrentRequest currentRequestInstance) {
+        currentRequest = currentRequestInstance;
+    }
+
+    private static class DefaultCurrentRequest implements CurrentRequest {
+        static final ThreadLocal<ResteasyReactiveRequestContext> INSTANCE = new ThreadLocal<>();
+
+        @Override
+        public ResteasyReactiveRequestContext get() {
+            return INSTANCE.get();
+        }
+
+        @Override
+        public void set(ResteasyReactiveRequestContext set) {
+            INSTANCE.set(set);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java
new file mode 100644
index 0000000000000..1d1102ca21c52
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/Deployment.java
@@ -0,0 +1,169 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider;
+import org.jboss.resteasy.reactive.common.util.types.Types;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.RuntimeParameterConverter;
+import org.jboss.resteasy.reactive.server.core.serialization.EntityWriter;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfigurableServerRestHandler;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory.BeanInstance;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class Deployment {
+    private final ExceptionMapping exceptionMapping;
+    private final ContextResolvers contextResolvers;
+    private final ServerSerialisers serialisers;
+    private final ServerRestHandler[] abortHandlerChain;
+    private final EntityWriter dynamicEntityWriter;
+    private final String prefix;
+    private final ParamConverterProviders paramConverterProviders;
+    private final ConfigurationImpl configuration;
+    private final Supplier<Application> applicationSupplier;
+    private final ThreadSetupAction threadSetupAction;
+    private final RequestContextFactory requestContextFactory;
+    private final List<ServerRestHandler> preMatchHandlers;
+    private final List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers;
+    private final List<RuntimeConfigurableServerRestHandler> runtimeConfigurableServerRestHandlers;
+
+    public Deployment(ExceptionMapping exceptionMapping, ContextResolvers contextResolvers,
+            ServerSerialisers serialisers,
+            ServerRestHandler[] abortHandlerChain,
+            EntityWriter dynamicEntityWriter, String prefix, ParamConverterProviders paramConverterProviders,
+            ConfigurationImpl configuration, Supplier<Application> applicationSupplier,
+            ThreadSetupAction threadSetupAction, RequestContextFactory requestContextFactory,
+            List<ServerRestHandler> preMatchHandlers,
+            List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers,
+            List<RuntimeConfigurableServerRestHandler> runtimeConfigurableServerRestHandlers) {
+        this.exceptionMapping = exceptionMapping;
+        this.contextResolvers = contextResolvers;
+        this.serialisers = serialisers;
+        this.abortHandlerChain = abortHandlerChain;
+        this.dynamicEntityWriter = dynamicEntityWriter;
+        this.prefix = prefix;
+        this.paramConverterProviders = paramConverterProviders;
+        this.configuration = configuration;
+        this.applicationSupplier = applicationSupplier;
+        this.threadSetupAction = threadSetupAction;
+        this.requestContextFactory = requestContextFactory;
+        this.preMatchHandlers = preMatchHandlers;
+        this.classMappers = classMappers;
+        this.runtimeConfigurableServerRestHandlers = runtimeConfigurableServerRestHandlers;
+    }
+
+    public Supplier<Application> getApplicationSupplier() {
+        return applicationSupplier;
+    }
+
+    public ConfigurationImpl getConfiguration() {
+        return configuration;
+    }
+
+    public ExceptionMapping getExceptionMapping() {
+        return exceptionMapping;
+    }
+
+    public ContextResolvers getContextResolvers() {
+        return contextResolvers;
+    }
+
+    public ServerSerialisers getSerialisers() {
+        return serialisers;
+    }
+
+    public ServerRestHandler[] getAbortHandlerChain() {
+        return abortHandlerChain;
+    }
+
+    public EntityWriter getDynamicEntityWriter() {
+        return dynamicEntityWriter;
+    }
+
+    /**
+     * Application path prefix. Must start with "/" and not end with a "/". Cannot be null.
+     * 
+     * @return the application path prefix, or an empty string.
+     */
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public ParamConverterProviders getParamConverterProviders() {
+        return paramConverterProviders;
+    }
+
+    public List<ServerRestHandler> getPreMatchHandlers() {
+        return preMatchHandlers;
+    }
+
+    public List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> getClassMappers() {
+        return classMappers;
+    }
+
+    public ParameterConverter getRuntimeParamConverter(Class<?> fieldOwnerClass, String fieldName, boolean single) {
+        List<ResourceParamConverterProvider> providers = getParamConverterProviders().getParamConverterProviders();
+        if (providers.size() > 0) {
+            Field field;
+            try {
+                field = fieldOwnerClass.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException | SecurityException e) {
+                throw new RuntimeException(e);
+            }
+            Class<?> klass;
+            Type genericType;
+            if (single) {
+                klass = field.getType();
+                genericType = field.getGenericType();
+            } else {
+                genericType = field.getGenericType();
+                if (genericType instanceof ParameterizedType) {
+                    Type[] args = Types.findInterfaceParameterizedTypes(field.getType(), (ParameterizedType) genericType,
+                            Collection.class);
+                    if (args != null && args.length == 1) {
+                        genericType = args[0];
+                        klass = Types.getRawType(genericType);
+                    } else {
+                        throw new RuntimeException("Failed to find Collection supertype of " + field);
+                    }
+                } else {
+                    throw new RuntimeException("Failed to find Collection supertype of " + field);
+                }
+            }
+            Annotation[] annotations = field.getAnnotations();
+            for (ResourceParamConverterProvider converterProvider : providers) {
+                BeanInstance<ParamConverterProvider> instance = converterProvider.getFactory().createInstance();
+                ParamConverter<?> converter = instance.getInstance().getConverter(klass, genericType, annotations);
+                if (converter != null)
+                    return new RuntimeParameterConverter(converter);
+            }
+        }
+        return null;
+    }
+
+    public ThreadSetupAction getThreadSetupAction() {
+        return threadSetupAction;
+    }
+
+    public RequestContextFactory getRequestContextFactory() {
+        return requestContextFactory;
+    }
+
+    public List<RuntimeConfigurableServerRestHandler> getRuntimeConfigurableServerRestHandlers() {
+        return runtimeConfigurableServerRestHandlers;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java
new file mode 100644
index 0000000000000..2d77b754d7f8f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/DeploymentInfo.java
@@ -0,0 +1,170 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.ws.rs.core.Application;
+import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig;
+import org.jboss.resteasy.reactive.common.model.ResourceClass;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.server.model.ContextResolvers;
+import org.jboss.resteasy.reactive.server.model.DynamicFeatures;
+import org.jboss.resteasy.reactive.server.model.Features;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class DeploymentInfo {
+
+    private ResourceInterceptors interceptors;
+    private ExceptionMapping exceptionMapping;
+    private ContextResolvers ctxResolvers;
+    private Features features;
+    private DynamicFeatures dynamicFeatures;
+    private ServerSerialisers serialisers;
+    private List<ResourceClass> resourceClasses;
+    private List<ResourceClass> locatableResourceClasses;
+    private ParamConverterProviders paramConverterProviders;
+    private Supplier<Application> applicationSupplier;
+    private Function<Class<?>, BeanFactory<?>> factoryCreator;
+    private ResteasyReactiveConfig config;
+    private Function<Object, Object> clientProxyUnwrapper;
+    private String applicationPath;
+    private List<HandlerChainCustomizer> globalHandlerCustomers = Collections.emptyList();
+
+    public ResourceInterceptors getInterceptors() {
+        return interceptors;
+    }
+
+    public DeploymentInfo setInterceptors(ResourceInterceptors interceptors) {
+        this.interceptors = interceptors;
+        return this;
+    }
+
+    public ExceptionMapping getExceptionMapping() {
+        return exceptionMapping;
+    }
+
+    public DeploymentInfo setExceptionMapping(ExceptionMapping exceptionMapping) {
+        this.exceptionMapping = exceptionMapping;
+        return this;
+    }
+
+    public ContextResolvers getCtxResolvers() {
+        return ctxResolvers;
+    }
+
+    public DeploymentInfo setCtxResolvers(ContextResolvers ctxResolvers) {
+        this.ctxResolvers = ctxResolvers;
+        return this;
+    }
+
+    public Features getFeatures() {
+        return features;
+    }
+
+    public DeploymentInfo setFeatures(Features features) {
+        this.features = features;
+        return this;
+    }
+
+    public DynamicFeatures getDynamicFeatures() {
+        return dynamicFeatures;
+    }
+
+    public DeploymentInfo setDynamicFeatures(DynamicFeatures dynamicFeatures) {
+        this.dynamicFeatures = dynamicFeatures;
+        return this;
+    }
+
+    public ServerSerialisers getSerialisers() {
+        return serialisers;
+    }
+
+    public DeploymentInfo setSerialisers(ServerSerialisers serialisers) {
+        this.serialisers = serialisers;
+        return this;
+    }
+
+    public List<ResourceClass> getResourceClasses() {
+        return resourceClasses;
+    }
+
+    public DeploymentInfo setResourceClasses(List<ResourceClass> resourceClasses) {
+        this.resourceClasses = resourceClasses;
+        return this;
+    }
+
+    public List<ResourceClass> getLocatableResourceClasses() {
+        return locatableResourceClasses;
+    }
+
+    public DeploymentInfo setLocatableResourceClasses(List<ResourceClass> locatableResourceClasses) {
+        this.locatableResourceClasses = locatableResourceClasses;
+        return this;
+    }
+
+    public ParamConverterProviders getParamConverterProviders() {
+        return paramConverterProviders;
+    }
+
+    public DeploymentInfo setParamConverterProviders(ParamConverterProviders paramConverterProviders) {
+        this.paramConverterProviders = paramConverterProviders;
+        return this;
+    }
+
+    public DeploymentInfo setFactoryCreator(Function<Class<?>, BeanFactory<?>> factoryCreator) {
+        this.factoryCreator = factoryCreator;
+        return this;
+    }
+
+    public Function<Class<?>, BeanFactory<?>> getFactoryCreator() {
+        return factoryCreator;
+    }
+
+    public Supplier<Application> getApplicationSupplier() {
+        return applicationSupplier;
+    }
+
+    public DeploymentInfo setApplicationSupplier(Supplier<Application> applicationSupplier) {
+        this.applicationSupplier = applicationSupplier;
+        return this;
+    }
+
+    public Function<Object, Object> getClientProxyUnwrapper() {
+        return clientProxyUnwrapper;
+    }
+
+    public DeploymentInfo setClientProxyUnwrapper(Function<Object, Object> clientProxyUnwrapper) {
+        this.clientProxyUnwrapper = clientProxyUnwrapper;
+        return this;
+    }
+
+    public ResteasyReactiveConfig getConfig() {
+        return config;
+    }
+
+    public DeploymentInfo setConfig(ResteasyReactiveConfig config) {
+        this.config = config;
+        return this;
+    }
+
+    public String getApplicationPath() {
+        return applicationPath;
+    }
+
+    public DeploymentInfo setApplicationPath(String applicationPath) {
+        this.applicationPath = applicationPath;
+        return this;
+    }
+
+    public List<HandlerChainCustomizer> getGlobalHandlerCustomizers() {
+        return globalHandlerCustomers;
+    }
+
+    public DeploymentInfo setGlobalHandlerCustomers(List<HandlerChainCustomizer> globalHandlerCustomers) {
+        this.globalHandlerCustomers = globalHandlerCustomers;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java
new file mode 100644
index 0000000000000..c61541ce96268
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/EncodedMediaType.java
@@ -0,0 +1,45 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.server.spi.ContentType;
+
+/**
+ * Wrapper around MediaType that saves the toString value, to avoid
+ * the expensive header delegate processing.
+ */
+public class EncodedMediaType implements ContentType {
+    final MediaType mediaType;
+    String encoded;
+    String charset;
+
+    public EncodedMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
+        this.charset = mediaType.getParameters().get("charset");
+    }
+
+    @Override
+    public String toString() {
+        return getEncoded();
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    @Override
+    public String getEncoded() {
+        if (encoded == null) {
+            return encoded = mediaType.toString();
+        }
+        return encoded;
+    }
+
+    @Override
+    public String getCharset() {
+        if (charset == null) {
+            return charset = mediaType.getParameters().get("charset");
+        }
+        return charset;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java
new file mode 100644
index 0000000000000..84a0519e50706
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ExceptionMapping.java
@@ -0,0 +1,127 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveAsyncExceptionMapper;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveExceptionMapper;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ExceptionMapping {
+
+    private static final Logger log = Logger.getLogger(ExceptionMapping.class);
+
+    private final Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> mappers = new HashMap<>();
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void mapException(Throwable throwable, ResteasyReactiveRequestContext context) {
+        Class<?> klass = throwable.getClass();
+        boolean isWebApplicationException = throwable instanceof WebApplicationException;
+        Response response = null;
+        if (isWebApplicationException) {
+            response = ((WebApplicationException) throwable).getResponse();
+        }
+        if (response != null && response.hasEntity()) {
+            context.setResult(response);
+            return;
+        }
+
+        // we match superclasses only if not a WebApplicationException according to spec 3.3.4 Exceptions
+        ExceptionMapper exceptionMapper = getExceptionMapper((Class<Throwable>) klass, context);
+        if (exceptionMapper != null) {
+            if (exceptionMapper instanceof ResteasyReactiveAsyncExceptionMapper) {
+                ((ResteasyReactiveAsyncExceptionMapper) exceptionMapper).asyncResponse(throwable,
+                        new AsyncExceptionMapperContextImpl(context));
+                return;
+            } else if (exceptionMapper instanceof ResteasyReactiveExceptionMapper) {
+                response = ((ResteasyReactiveExceptionMapper) exceptionMapper).toResponse(throwable, context);
+            } else {
+                response = exceptionMapper.toResponse(throwable);
+            }
+            context.setResult(response);
+            return;
+        }
+        if (isWebApplicationException) {
+            context.setResult(response);
+            return;
+        }
+        if (throwable instanceof IOException) {
+            log.debugf(throwable,
+                    "IOError processing HTTP request to %s failed, the client likely terminated the connection.",
+                    context.serverRequest().getRequestAbsoluteUri());
+        } else {
+            log.error("Request failed ", throwable);
+        }
+        context.handleUnmappedException(throwable);
+    }
+
+    /**
+     * Return the proper Exception that handles {@param throwable} or {@code null}
+     * if none is found.
+     * First checks if the Resource class that contained the Resource method contained class-level exception mappers
+     */
+    public <T extends Throwable> ExceptionMapper<T> getExceptionMapper(Class<T> clazz, ResteasyReactiveRequestContext context) {
+        Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> classExceptionMappers = getClassExceptionMappers(
+                context);
+        if ((classExceptionMappers != null) && !classExceptionMappers.isEmpty()) {
+            ExceptionMapper<T> result = doGetExceptionMapper(clazz, classExceptionMappers);
+            if (result != null) {
+                return result;
+            }
+        }
+        return doGetExceptionMapper(clazz, mappers);
+    }
+
+    private Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> getClassExceptionMappers(
+            ResteasyReactiveRequestContext context) {
+        if (context == null) {
+            return null;
+        }
+        return context.getTarget() != null ? context.getTarget().getClassExceptionMappers() : null;
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T extends Throwable> ExceptionMapper<T> doGetExceptionMapper(Class<T> clazz,
+            Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> mappers) {
+        Class<?> klass = clazz;
+        do {
+            ResourceExceptionMapper<? extends Throwable> mapper = mappers.get(klass);
+            if (mapper != null) {
+                return (ExceptionMapper<T>) mapper.getFactory()
+                        .createInstance().getInstance();
+            }
+            klass = klass.getSuperclass();
+        } while (klass != null);
+
+        return null;
+    }
+
+    public <T extends Throwable> void addExceptionMapper(Class<T> exceptionClass, ResourceExceptionMapper<T> mapper) {
+        ResourceExceptionMapper<? extends Throwable> existing = mappers.get(exceptionClass);
+        if (existing != null) {
+            if (existing.getPriority() < mapper.getPriority()) {
+                //already a higher priority mapper
+                return;
+            }
+        }
+        mappers.put(exceptionClass, mapper);
+    }
+
+    public Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> getMappers() {
+        return mappers;
+    }
+
+    public void initializeDefaultFactories(Function<String, BeanFactory<?>> factoryCreator) {
+        for (Map.Entry<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> entry : mappers.entrySet()) {
+            if (entry.getValue().getFactory() == null) {
+                entry.getValue().setFactory((BeanFactory) factoryCreator.apply(entry.getValue().getClassName()));
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java
new file mode 100644
index 0000000000000..c13a3aaf5f808
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/LazyResponse.java
@@ -0,0 +1,35 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import javax.ws.rs.core.Response;
+
+public interface LazyResponse {
+
+    /**
+     * Gets the response, possibly generating it if it does not exist yet
+     */
+    Response get();
+
+    /**
+     *
+     * @return <code>true</code> if the response already exists
+     */
+    boolean isCreated();
+
+    class Existing implements LazyResponse {
+        final Response response;
+
+        public Existing(Response response) {
+            this.response = response;
+        }
+
+        @Override
+        public Response get() {
+            return response;
+        }
+
+        @Override
+        public boolean isCreated() {
+            return true;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RequestContextFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RequestContextFactory.java
new file mode 100644
index 0000000000000..373c84a2ecfc6
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/RequestContextFactory.java
@@ -0,0 +1,20 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public interface RequestContextFactory {
+
+    ResteasyReactiveRequestContext createContext(Deployment deployment, ProvidersImpl providers,
+            Object context,
+            ThreadSetupAction requestContext, ServerRestHandler[] handlerChain, ServerRestHandler[] abortHandlerChain);
+
+    /**
+     * @return <code>true</code> if requests default to blocking when created by this factory
+     */
+    default boolean isDefaultBlocking() {
+        return false;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java
new file mode 100644
index 0000000000000..dd8d3106ac44d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java
@@ -0,0 +1,1002 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.regex.Matcher;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext;
+import org.jboss.resteasy.reactive.common.util.Encode;
+import org.jboss.resteasy.reactive.common.util.PathSegmentImpl;
+import org.jboss.resteasy.reactive.server.core.serialization.EntityWriter;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionContext;
+import org.jboss.resteasy.reactive.server.jaxrs.AsyncResponseImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.ContainerResponseContextImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.HttpHeadersImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.RequestImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.SseEventSinkImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.UriInfoImpl;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.mapping.URITemplate;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public abstract class ResteasyReactiveRequestContext
+        extends AbstractResteasyReactiveContext<ResteasyReactiveRequestContext, ServerRestHandler>
+        implements Closeable, ResteasyReactiveInjectionContext, ServerRequestContext {
+
+    public static final Object[] EMPTY_ARRAY = new Object[0];
+    protected final Deployment deployment;
+    protected final ProvidersImpl providers;
+    /**
+     * The parameters array, populated by handlers
+     */
+    private Object[] parameters;
+    private RuntimeResource target;
+
+    /**
+     * info about path params and other data about previously matched sub resource locators
+     */
+    private PreviousResource previousResource;
+
+    /**
+     * The parameter values extracted from the path.
+     * <p>
+     * This is not a map, for two reasons. One is raw performance, as an array causes
+     * less allocations and is generally faster. The other is that it is possible
+     * that you can have equivalent templates with different names. This allows the
+     * mapper to ignore the names, as everything is resolved in terms of indexes.
+     * <p>
+     * If there is only a single path param then it is stored directly into the field,
+     * while multiple params this will be an array. This optimisation allows us to avoid
+     * allocating anything in the common case that there is zero or one path param.
+     * <p>
+     * Note: those are decoded.
+     */
+    private Object pathParamValues;
+
+    private UriInfo uriInfo;
+    /**
+     * The endpoint to invoke
+     */
+    private Object endpointInstance;
+    /**
+     * The result of the invocation
+     */
+    private Object result;
+    /**
+     * The supplier of the actual response
+     */
+    private LazyResponse response;
+
+    private HttpHeadersImpl httpHeaders;
+    private Object requestEntity;
+    private Request request;
+    private EntityWriter entityWriter;
+    private ContainerRequestContextImpl containerRequestContext;
+    private ContainerResponseContextImpl containerResponseContext;
+    private String method; // used to hold the explicitly set method performed by a ContainerRequestFilter
+    private String originalMethod; // store the original method as obtaining it from Vert.x isn't dirt cheap
+    // this is only set if we override the requestUri
+    private String path;
+    // this is cached, but only if we override the requestUri
+    private String absoluteUri;
+    // this is only set if we override the requestUri
+    private String scheme;
+    // this is only set if we override the requestUri
+    private String authority;
+    private String remaining;
+    private EncodedMediaType responseContentType;
+    private MediaType consumesMediaType;
+
+    private Annotation[] methodAnnotations;
+    private Annotation[] additionalAnnotations; // can be added by entity annotations or response filters
+    private Annotation[] allAnnotations;
+    private Type genericReturnType;
+
+    /**
+     * The input stream, if an entity is present.
+     */
+    private InputStream inputStream;
+
+    /**
+     * used for {@link UriInfo#getMatchedURIs()}
+     */
+    private List<UriMatch> matchedURIs;
+
+    private AsyncResponseImpl asyncResponse;
+    private SseEventSinkImpl sseEventSink;
+    private List<PathSegment> pathSegments;
+    private ReaderInterceptor[] readerInterceptors;
+    private WriterInterceptor[] writerInterceptors;
+
+    private SecurityContext securityContext;
+    private OutputStream outputStream;
+    private OutputStream underlyingOutputStream;
+
+    public ResteasyReactiveRequestContext(Deployment deployment, ProvidersImpl providers,
+            ThreadSetupAction requestContext, ServerRestHandler[] handlerChain, ServerRestHandler[] abortHandlerChain) {
+        super(handlerChain, abortHandlerChain, requestContext);
+        this.deployment = deployment;
+        this.providers = providers;
+        this.parameters = EMPTY_ARRAY;
+    }
+
+    public abstract ServerHttpRequest serverRequest();
+
+    public abstract ServerHttpResponse serverResponse();
+
+    public Deployment getDeployment() {
+        return deployment;
+    }
+
+    public ProvidersImpl getProviders() {
+        return providers;
+    }
+
+    /**
+     * Restarts handler chain processing with a new chain targeting a new resource.
+     *
+     * @param target The resource target
+     */
+    public void restart(RuntimeResource target) {
+        restart(target, false);
+    }
+
+    public void restart(RuntimeResource target, boolean setLocatorTarget) {
+        this.handlers = target.getHandlerChain();
+        position = 0;
+        parameters = new Object[target.getParameterTypes().length];
+        if (setLocatorTarget) {
+            previousResource = new PreviousResource(this.target, pathParamValues, previousResource);
+        }
+        this.target = target;
+    }
+
+    /**
+     * Meant to be used when a error occurred early in processing chain
+     */
+    @Override
+    public void abortWith(Response response) {
+        setResult(response);
+        restart(getAbortHandlerChain());
+        // this is a valid action after suspend, in which case we must resume
+        if (isSuspended()) {
+            resume();
+        }
+    }
+
+    /**
+     * Resets the build time serialization assumptions. Called if a filter
+     * modifies the response
+     */
+    public void resetBuildTimeSerialization() {
+        entityWriter = deployment.getDynamicEntityWriter();
+    }
+
+    public UriInfo getUriInfo() {
+        if (uriInfo == null) {
+            uriInfo = new UriInfoImpl(this);
+        }
+        return uriInfo;
+    }
+
+    public HttpHeadersImpl getHttpHeaders() {
+        if (httpHeaders == null) {
+            httpHeaders = new HttpHeadersImpl(serverRequest().getAllRequestHeaders());
+        }
+        return httpHeaders;
+    }
+
+    public Object[] getParameters() {
+        return parameters;
+    }
+
+    public void setMaxPathParams(int maxPathParams) {
+        if (maxPathParams > 1) {
+            pathParamValues = new String[maxPathParams];
+        } else {
+            pathParamValues = null;
+        }
+    }
+
+    public String getPathParam(int index) {
+        return doGetPathParam(index, pathParamValues);
+    }
+
+    private String doGetPathParam(int index, Object pathParamValues) {
+        if (pathParamValues instanceof String[]) {
+            return ((String[]) pathParamValues)[index];
+        }
+        if (index > 1) {
+            throw new IndexOutOfBoundsException();
+        }
+        return (String) pathParamValues;
+    }
+
+    public ResteasyReactiveRequestContext setPathParamValue(int index, String value) {
+        if (pathParamValues instanceof String[]) {
+            ((String[]) pathParamValues)[index] = value;
+        } else {
+            if (index > 1) {
+                throw new IndexOutOfBoundsException();
+            }
+            pathParamValues = value;
+        }
+        return this;
+    }
+
+    public void setUriInfo(UriInfo uriInfo) {
+        this.uriInfo = uriInfo;
+    }
+
+    public Object getRequestEntity() {
+        return requestEntity;
+    }
+
+    public ResteasyReactiveRequestContext setRequestEntity(Object requestEntity) {
+        this.requestEntity = requestEntity;
+        return this;
+    }
+
+    public EntityWriter getEntityWriter() {
+        return entityWriter;
+    }
+
+    public ResteasyReactiveRequestContext setEntityWriter(EntityWriter entityWriter) {
+        this.entityWriter = entityWriter;
+        return this;
+    }
+
+    public Object getEndpointInstance() {
+        return endpointInstance;
+    }
+
+    public ResteasyReactiveRequestContext setEndpointInstance(Object endpointInstance) {
+        this.endpointInstance = endpointInstance;
+        return this;
+    }
+
+    public Object getResult() {
+        return result;
+    }
+
+    public Throwable getThrowable() {
+        return throwable;
+    }
+
+    public Object getResponseEntity() {
+        Object result = responseEntity();
+        if (result instanceof GenericEntity) {
+            return ((GenericEntity<?>) result).getEntity();
+        }
+        return result;
+    }
+
+    private Object responseEntity() {
+        if (response != null && response.isCreated()) {
+            return response.get().getEntity();
+        }
+        return result;
+    }
+
+    public ResteasyReactiveRequestContext setResult(Object result) {
+        this.result = result;
+        if (result instanceof Response) {
+            this.response = new LazyResponse.Existing((Response) result);
+        } else if (result instanceof GenericEntity) {
+            setGenericReturnType(((GenericEntity<?>) result).getType());
+        }
+        return this;
+    }
+
+    public void handleUnmappedException(Throwable throwable) {
+        setResult(Response.serverError().build());
+    }
+
+    public RuntimeResource getTarget() {
+        return target;
+    }
+
+    public void mapExceptionIfPresent() {
+        // this is called from the abort chain, but we can abort because we have a Response, or because
+        // we got an exception
+        if (throwable != null) {
+            this.responseContentType = null;
+            deployment.getExceptionMapping().mapException(throwable, this);
+            // NOTE: keep the throwable around for close() AsyncResponse notification
+        }
+    }
+
+    private void sendInternalError(Throwable throwable) {
+        log.error("Request failed", throwable);
+        serverResponse().setStatusCode(500).end();
+        close();
+    }
+
+    @Override
+    public void close() {
+        try {
+            if (outputStream != null) {
+                outputStream.close();
+            }
+        } catch (IOException e) {
+            log.debug("Failed to close stream", e);
+        }
+        try {
+            if (underlyingOutputStream != null) {
+                underlyingOutputStream.close();
+            }
+        } catch (IOException e) {
+            log.debug("Failed to close stream", e);
+        }
+        super.close();
+    }
+
+    public LazyResponse getResponse() {
+        return response;
+    }
+
+    public ResteasyReactiveRequestContext setResponse(LazyResponse response) {
+        this.response = response;
+        return this;
+    }
+
+    public Request getRequest() {
+        if (request == null) {
+            request = new RequestImpl(this);
+        }
+        return request;
+    }
+
+    public ContainerRequestContextImpl getContainerRequestContext() {
+        if (containerRequestContext == null) {
+            containerRequestContext = new ContainerRequestContextImpl(this);
+        }
+        return containerRequestContext;
+    }
+
+    public ContainerResponseContextImpl getContainerResponseContext() {
+        if (containerResponseContext == null) {
+            containerResponseContext = new ContainerResponseContextImpl(this);
+        }
+        return containerResponseContext;
+    }
+
+    public String getMethod() {
+        if (method == null) {
+            if (originalMethod != null) {
+                return originalMethod;
+            }
+            return originalMethod = serverRequest().getRequestMethod();
+        }
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public void setRemaining(String remaining) {
+        this.remaining = remaining;
+    }
+
+    public String getRemaining() {
+        return remaining;
+    }
+
+    /**
+     * Returns the normalised non-decoded path excluding any prefix.
+     */
+    public String getPathWithoutPrefix() {
+        String path = getPath();
+        if (path != null) {
+            String prefix = deployment.getPrefix();
+            if (!prefix.isEmpty()) {
+                // FIXME: can we really have paths that don't start with the prefix if there's a prefix?
+                if (path.startsWith(prefix)) {
+                    return path.substring(prefix.length());
+                }
+            }
+        }
+        return path;
+    }
+
+    /**
+     * Returns the normalised non-decoded path including any prefix.
+     */
+    public String getPath() {
+        if (path == null) {
+            return serverRequest().getRequestNormalisedPath();
+        }
+        return path;
+    }
+
+    public String getAbsoluteURI() {
+        // if we never changed the path we can use the vert.x URI
+        if (path == null)
+            return serverRequest().getRequestAbsoluteUri();
+        // Note: we could store our cache as normalised, but I'm not sure if the vertx one is normalised
+        if (absoluteUri == null) {
+            try {
+                absoluteUri = new URI(scheme, authority, path, null, null).toASCIIString();
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return absoluteUri;
+    }
+
+    public String getScheme() {
+        if (scheme == null)
+            return serverRequest().getRequestScheme();
+        return scheme;
+    }
+
+    public String getAuthority() {
+        if (authority == null)
+            return serverRequest().getRequestHost();
+        return authority;
+    }
+
+    public ResteasyReactiveRequestContext setRequestUri(URI requestURI) {
+        this.path = requestURI.getPath();
+        this.authority = requestURI.getRawAuthority();
+        this.scheme = requestURI.getScheme();
+        // FIXME: it's possible we may have to also update the query part
+        // invalidate those
+        this.uriInfo = null;
+        this.absoluteUri = null;
+        return this;
+    }
+
+    /**
+     * Returns the current response content type. If a response has been set and has an
+     * explicit content type then this is used, otherwise it returns any content type
+     * that has been explicitly set.
+     */
+    @Override
+    public EncodedMediaType getResponseContentType() {
+        if (response != null) {
+            if (response.isCreated()) {
+                MediaType mediaType = response.get().getMediaType();
+                if (mediaType != null) {
+                    return new EncodedMediaType(mediaType);
+                }
+            }
+        }
+        return responseContentType;
+    }
+
+    @Override
+    public MediaType getResponseMediaType() {
+        EncodedMediaType resp = getResponseContentType();
+        if (resp == null) {
+            return null;
+        }
+        return resp.mediaType;
+    }
+
+    public ResteasyReactiveRequestContext setResponseContentType(EncodedMediaType responseContentType) {
+        this.responseContentType = responseContentType;
+        return this;
+    }
+
+    public ResteasyReactiveRequestContext setResponseContentType(MediaType responseContentType) {
+        if (responseContentType == null) {
+            this.responseContentType = null;
+        } else {
+            this.responseContentType = new EncodedMediaType(responseContentType);
+        }
+        return this;
+    }
+
+    public MediaType getConsumesMediaType() {
+        return consumesMediaType;
+    }
+
+    public ResteasyReactiveRequestContext setConsumesMediaType(MediaType consumesMediaType) {
+        this.consumesMediaType = consumesMediaType;
+        return this;
+    }
+
+    public Annotation[] getAllAnnotations() {
+        if (allAnnotations == null) {
+            Annotation[] methodAnnotations = getMethodAnnotations();
+            if ((additionalAnnotations == null) || (additionalAnnotations.length == 0)) {
+                allAnnotations = methodAnnotations;
+            } else {
+                List<Annotation> list = new ArrayList<>(methodAnnotations.length + additionalAnnotations.length);
+                list.addAll(Arrays.asList(methodAnnotations));
+                list.addAll(Arrays.asList(additionalAnnotations));
+                allAnnotations = list.toArray(new Annotation[0]);
+            }
+        }
+        return allAnnotations;
+    }
+
+    public void setAllAnnotations(Annotation[] annotations) {
+        this.allAnnotations = annotations;
+    }
+
+    public Annotation[] getMethodAnnotations() {
+        if (methodAnnotations == null) {
+            if (target == null) {
+                return null;
+            }
+            return target.getLazyMethod().getAnnotations();
+        }
+        return methodAnnotations;
+    }
+
+    public ResteasyReactiveRequestContext setMethodAnnotations(Annotation[] methodAnnotations) {
+        this.methodAnnotations = methodAnnotations;
+        return this;
+    }
+
+    public Annotation[] getAdditionalAnnotations() {
+        return additionalAnnotations;
+    }
+
+    public void setAdditionalAnnotations(Annotation[] additionalAnnotations) {
+        this.additionalAnnotations = additionalAnnotations;
+    }
+
+    public boolean hasGenericReturnType() {
+        return this.genericReturnType != null;
+    }
+
+    public Type getGenericReturnType() {
+        if (genericReturnType == null) {
+            if (target == null) {
+                return null;
+            }
+            return target.getLazyMethod().getGenericReturnType();
+        }
+        return genericReturnType;
+    }
+
+    public ResteasyReactiveRequestContext setGenericReturnType(Type genericReturnType) {
+        this.genericReturnType = genericReturnType;
+        return this;
+    }
+
+    public AsyncResponseImpl getAsyncResponse() {
+        return asyncResponse;
+    }
+
+    public ResteasyReactiveRequestContext setAsyncResponse(AsyncResponseImpl asyncResponse) {
+        if (this.asyncResponse != null) {
+            throw new RuntimeException("Async can only be started once");
+        }
+        this.asyncResponse = asyncResponse;
+        return this;
+    }
+
+    public ReaderInterceptor[] getReaderInterceptors() {
+        return readerInterceptors;
+    }
+
+    public ResteasyReactiveRequestContext setReaderInterceptors(ReaderInterceptor[] readerInterceptors) {
+        this.readerInterceptors = readerInterceptors;
+        return this;
+    }
+
+    public WriterInterceptor[] getWriterInterceptors() {
+        return writerInterceptors;
+    }
+
+    public ResteasyReactiveRequestContext setWriterInterceptors(WriterInterceptor[] writerInterceptors) {
+        this.writerInterceptors = writerInterceptors;
+        return this;
+    }
+
+    protected void handleUnrecoverableError(Throwable throwable) {
+        log.error("Request failed", throwable);
+        if (serverResponse().headWritten()) {
+            serverRequest().closeConnection();
+        } else {
+            serverResponse().setStatusCode(500).end();
+        }
+        close();
+    }
+
+    protected void handleRequestScopeActivation() {
+        CurrentRequestManager.set(this);
+    }
+
+    @Override
+    protected void requestScopeDeactivated() {
+        CurrentRequestManager.set(null);
+    }
+
+    @Override
+    protected void restarted(boolean keepTarget) {
+        parameters = new Object[0];
+        if (!keepTarget) {
+            target = null;
+        }
+    }
+
+    public void saveUriMatchState() {
+        if (matchedURIs == null) {
+            matchedURIs = new LinkedList<>();
+        } else if (matchedURIs.get(0).resource == target) {
+            //already saved
+            return;
+        }
+        if (target != null) {
+            URITemplate classPath = target.getClassPath();
+            if (classPath != null) {
+                //this is not great, but the alternative is to do path based matching on every request
+                //given that this method is likely to be called very infrequently it is better to have a small
+                //cost here than a cost applied to every request
+                int pos = classPath.stem.length();
+                String path = getPathWithoutPrefix();
+                //we already know that this template matches, we just need to find the matched bit
+                for (int i = 1; i < classPath.components.length; ++i) {
+                    URITemplate.TemplateComponent segment = classPath.components[i];
+                    if (segment.type == URITemplate.Type.LITERAL) {
+                        pos += segment.literalText.length();
+                    } else if (segment.type == URITemplate.Type.DEFAULT_REGEX) {
+                        for (; pos < path.length(); ++pos) {
+                            if (path.charAt(pos) == '/') {
+                                --pos;
+                                break;
+                            }
+                        }
+                    } else {
+                        Matcher matcher = segment.pattern.matcher(path);
+                        if (matcher.find(pos) && matcher.start() == pos) {
+                            pos = matcher.end();
+                        }
+                    }
+                }
+                matchedURIs.add(new UriMatch(path.substring(1, pos), null, null));
+            }
+        }
+        // FIXME: this may be better as context.normalisedPath() or getPath()
+        // TODO: does this entry make sense when target is null ?
+        String path = serverRequest().getRequestPath();
+        if (path.equals(remaining)) {
+            matchedURIs.add(0, new UriMatch(path.substring(1), target, endpointInstance));
+        } else {
+            matchedURIs.add(0, new UriMatch(path.substring(1, path.length() - (remaining == null ? 0 : remaining.length())),
+                    target, endpointInstance));
+        }
+
+    }
+
+    public List<UriMatch> getMatchedURIs() {
+        saveUriMatchState();
+        return matchedURIs;
+    }
+
+    public boolean hasInputStream() {
+        return inputStream != null;
+    }
+
+    public InputStream getInputStream() {
+        if (inputStream == null) {
+            inputStream = serverRequest().createInputStream();
+        }
+        return inputStream;
+    }
+
+    public ResteasyReactiveRequestContext setInputStream(InputStream inputStream) {
+        this.inputStream = inputStream;
+        return this;
+    }
+
+    public SseEventSinkImpl getSseEventSink() {
+        return sseEventSink;
+    }
+
+    public void setSseEventSink(SseEventSinkImpl sseEventSink) {
+        this.sseEventSink = sseEventSink;
+    }
+
+    /**
+     * Return the path segments
+     * <p>
+     * This is lazily initialized
+     */
+    public List<PathSegment> getPathSegments() {
+        if (pathSegments == null) {
+            initPathSegments();
+        }
+        return pathSegments;
+    }
+
+    /**
+     * initializes the path seegments and removes any matrix params for the path
+     * used for matching.
+     */
+    public void initPathSegments() {
+        if (pathSegments != null) {
+            return;
+        }
+        //this is not super optimised
+        //I don't think we care about it that much though
+        String path = getPath();
+        String[] parts = path.split("/");
+        pathSegments = new ArrayList<>();
+        boolean hasMatrix = false;
+        for (String i : parts) {
+            if (i.isEmpty()) {
+                continue;
+            }
+            PathSegmentImpl ps = new PathSegmentImpl(i, true);
+            hasMatrix = ps.hasMatrixParams() || hasMatrix;
+            pathSegments.add(ps);
+        }
+        if (hasMatrix) {
+            StringBuilder sb = new StringBuilder();
+            for (PathSegment i : pathSegments) {
+                sb.append("/");
+                sb.append(i.getPath());
+            }
+            if (path.endsWith("/")) {
+                sb.append("/");
+            }
+            String newPath = sb.toString();
+            this.path = newPath;
+            if (this.remaining != null) {
+                this.remaining = newPath.substring(getPathWithoutPrefix().length() - this.remaining.length());
+            }
+        }
+    }
+
+    @Override
+    public Object getHeader(String name, boolean single) {
+        if (single)
+            return serverRequest().getRequestHeader(name);
+        // empty collections must not be turned to null
+        return serverRequest().getAllRequestHeaders(name);
+    }
+
+    @Override
+    public Object getQueryParameter(String name, boolean single, boolean encoded) {
+        if (single) {
+            String val = serverRequest().getQueryParam(name);
+            if (encoded && val != null) {
+                val = Encode.encodeQueryParam(val);
+            }
+            return val;
+        }
+        // empty collections must not be turned to null
+        List<String> strings = serverRequest().getAllQueryParams(name);
+        if (encoded) {
+            List<String> newStrings = new ArrayList<>();
+            for (String i : strings) {
+                newStrings.add(Encode.encodeQueryParam(i));
+            }
+            return newStrings;
+        }
+        return strings;
+    }
+
+    @Override
+    public Object getMatrixParameter(String name, boolean single, boolean encoded) {
+        if (single) {
+            for (PathSegment i : getPathSegments()) {
+                String res = i.getMatrixParameters().getFirst(name);
+                if (res != null) {
+                    if (encoded) {
+                        return Encode.encodeQueryParam(res);
+                    }
+                    return res;
+                }
+            }
+            return null;
+        } else {
+            List<String> ret = new ArrayList<>();
+            for (PathSegment i : getPathSegments()) {
+                List<String> res = i.getMatrixParameters().get(name);
+                if (res != null) {
+                    if (encoded) {
+                        for (String j : res) {
+                            ret.add(Encode.encodeQueryParam(j));
+                        }
+                    } else {
+                        ret.addAll(res);
+                    }
+                }
+            }
+            // empty collections must not be turned to null
+            return ret;
+        }
+    }
+
+    @Override
+    public String getCookieParameter(String name) {
+        Cookie cookie = getHttpHeaders().getCookies().get(name);
+        return cookie != null ? cookie.getValue() : null;
+    }
+
+    @Override
+    public Object getFormParameter(String name, boolean single, boolean encoded) {
+        if (single) {
+            String val = serverRequest().getFormAttribute(name);
+            if (encoded && val != null) {
+                val = Encode.encodeQueryParam(val);
+            }
+            return val;
+        }
+        List<String> strings = serverRequest().getAllFormAttributes(name);
+        if (encoded) {
+            List<String> newStrings = new ArrayList<>();
+            for (String i : strings) {
+                newStrings.add(Encode.encodeQueryParam(i));
+            }
+            return newStrings;
+        }
+        return strings;
+
+    }
+
+    @Override
+    public String getPathParameter(String name, boolean encoded) {
+        // this is a slower version than getPathParam, but we can't actually bake path indices inside
+        // BeanParam classes (which use thismethod ) because they can be used by multiple resources that would have different
+        // indices
+        Integer index = this.target.getPathParameterIndexes().get(name);
+        // It's possible to inject a path param that's not defined, return null in this case
+        String value = index != null ? getPathParam(index) : null;
+        if (encoded && value != null) {
+            return Encode.encodeQueryParam(value);
+        }
+        return value;
+    }
+
+    public <T> T unwrap(Class<T> type) {
+        return serverRequest().unwrap(type);
+    }
+
+    public SecurityContext getSecurityContext() {
+        if (securityContext == null) {
+            securityContext = createSecurityContext();
+        }
+        return securityContext;
+    }
+
+    public boolean isSecurityContextSet() {
+        return securityContext != null;
+    }
+
+    protected SecurityContext createSecurityContext() {
+        throw new UnsupportedOperationException();
+    }
+
+    public ResteasyReactiveRequestContext setSecurityContext(SecurityContext securityContext) {
+        this.securityContext = securityContext;
+        securityContextUpdated(securityContext);
+        return this;
+    }
+
+    protected void securityContextUpdated(SecurityContext securityContext) {
+
+    }
+
+    public void setOutputStream(OutputStream outputStream) {
+        this.outputStream = outputStream;
+    }
+
+    public OutputStream getOutputStream() {
+        return outputStream;
+    }
+
+    public OutputStream getOrCreateOutputStream() {
+        if (outputStream == null) {
+            return outputStream = underlyingOutputStream = serverResponse().createResponseOutputStream();
+        }
+        return outputStream;
+    }
+
+    @Override
+    public ResteasyReactiveResourceInfo getResteasyReactiveResourceInfo() {
+        return target == null ? null : target.getLazyMethod();
+    }
+
+    @Override
+    protected abstract Executor getEventLoop();
+
+    public abstract Runnable registerTimer(long millis, Runnable task);
+
+    public String getResourceLocatorPathParam(String name) {
+        return getResourceLocatorPathParam(name, previousResource);
+    }
+
+    private String getResourceLocatorPathParam(String name, PreviousResource previousResource) {
+        if (previousResource == null) {
+            return null;
+        }
+
+        int index = 0;
+        URITemplate classPath = previousResource.locatorTarget.getClassPath();
+        if (classPath != null) {
+            for (URITemplate.TemplateComponent component : classPath.components) {
+                if (component.name != null) {
+                    if (component.name.equals(name)) {
+                        return doGetPathParam(index, previousResource.locatorPathParamValues);
+                    }
+                    index++;
+                } else if (component.names != null) {
+                    for (String nm : component.names) {
+                        if (nm.equals(name)) {
+                            return doGetPathParam(index, previousResource.locatorPathParamValues);
+                        }
+                    }
+                    index++;
+                }
+            }
+        }
+        for (URITemplate.TemplateComponent component : previousResource.locatorTarget.getPath().components) {
+            if (component.name != null) {
+                if (component.name.equals(name)) {
+                    return doGetPathParam(index, previousResource.locatorPathParamValues);
+                }
+                index++;
+            } else if (component.names != null) {
+                for (String nm : component.names) {
+                    if (nm.equals(name)) {
+                        return doGetPathParam(index, previousResource.locatorPathParamValues);
+                    }
+                }
+                index++;
+            }
+        }
+        return getResourceLocatorPathParam(name, previousResource.prev);
+    }
+
+    static class PreviousResource {
+
+        public PreviousResource(RuntimeResource locatorTarget, Object locatorPathParamValues, PreviousResource prev) {
+            this.locatorTarget = locatorTarget;
+            this.locatorPathParamValues = locatorPathParamValues;
+            this.prev = prev;
+        }
+
+        /**
+         * When a subresource has been located and the processing has been restarted (and thus target point to the new
+         * subresource),
+         * this field contains the target that resulted in the offloading to the new target
+         */
+        private final RuntimeResource locatorTarget;
+
+        /**
+         * When a subresource has been located and the processing has been restarted (and thus target point to the new
+         * subresource),
+         * this field contains the pathParamValues of the target that resulted in the offloading to the new target
+         */
+        private final Object locatorPathParamValues;
+
+        private final PreviousResource prev;
+
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveSimplifiedResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveSimplifiedResourceInfo.java
new file mode 100644
index 0000000000000..4a977d4b24b7c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveSimplifiedResourceInfo.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+
+public final class ResteasyReactiveSimplifiedResourceInfo implements SimpleResourceInfo {
+
+    private final String methodName;
+    private final Class<?> resourceClass;
+    private final Class<?>[] parameterTypes;
+
+    public ResteasyReactiveSimplifiedResourceInfo(String methodName, Class<?> resourceClass, Class<?>[] parameterTypes) {
+        this.methodName = methodName;
+        this.resourceClass = resourceClass;
+        this.parameterTypes = parameterTypes;
+    }
+
+    @Override
+    public Class<?> getResourceClass() {
+        return resourceClass;
+    }
+
+    @Override
+    public String getMethodName() {
+        return methodName;
+    }
+
+    @Override
+    public Class<?>[] parameterTypes() {
+        return parameterTypes;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java
new file mode 100644
index 0000000000000..9fa98720e7874
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerResponseBuilderFactory.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory;
+import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl;
+
+public class ServerResponseBuilderFactory implements ResponseBuilderFactory {
+    @Override
+    public Response.ResponseBuilder create() {
+        return new ResponseBuilderImpl();
+    }
+
+    @Override
+    public int priority() {
+        return 100;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java
new file mode 100644
index 0000000000000..e816c4a7fd682
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ServerSerialisers.java
@@ -0,0 +1,499 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.lang.reflect.Type;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Variant;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.ResourceReader;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedMap;
+import org.jboss.resteasy.reactive.server.core.serialization.EntityWriter;
+import org.jboss.resteasy.reactive.server.core.serialization.FixedEntityWriterArray;
+import org.jboss.resteasy.reactive.server.jaxrs.WriterInterceptorContextImpl;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerBooleanMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerByteArrayMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerCharArrayMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerCharacterMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerDefaultTextPlainBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerFileBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerFormUrlEncodedProvider;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerInputStreamMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerNumberMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerReaderBodyHandler;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerStringMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+
+public class ServerSerialisers extends Serialisers {
+
+    private static final Consumer<ResteasyReactiveRequestContext> HEADER_FUNCTION = new Consumer<ResteasyReactiveRequestContext>() {
+        @Override
+        public void accept(ResteasyReactiveRequestContext context) {
+            ServerSerialisers.encodeResponseHeaders(context);
+        }
+    };
+
+    public static BuiltinReader[] BUILTIN_READERS = new BuiltinReader[] {
+            new BuiltinReader(String.class, ServerStringMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinReader(Boolean.class, ServerBooleanMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinReader(Character.class, ServerCharacterMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinReader(Number.class, ServerNumberMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinReader(InputStream.class, ServerInputStreamMessageBodyHandler.class, MediaType.WILDCARD),
+            new BuiltinReader(Reader.class, ServerReaderBodyHandler.class, MediaType.WILDCARD),
+            new BuiltinReader(File.class, ServerFileBodyHandler.class, MediaType.WILDCARD),
+
+            new BuiltinReader(byte[].class, ServerByteArrayMessageBodyHandler.class, MediaType.WILDCARD),
+            new BuiltinReader(Object.class, ServerDefaultTextPlainBodyHandler.class, MediaType.TEXT_PLAIN, RuntimeType.SERVER),
+    };
+    public static BuiltinWriter[] BUILTIN_WRITERS = new BuiltinWriter[] {
+            new BuiltinWriter(String.class, ServerStringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Number.class, ServerStringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Boolean.class, ServerStringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Character.class, ServerStringMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(Object.class, ServerStringMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(char[].class, ServerCharArrayMessageBodyHandler.class,
+                    MediaType.TEXT_PLAIN),
+            new BuiltinWriter(byte[].class, ServerByteArrayMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(MultivaluedMap.class, ServerFormUrlEncodedProvider.class,
+                    MediaType.APPLICATION_FORM_URLENCODED),
+            new BuiltinWriter(InputStream.class, ServerInputStreamMessageBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(Reader.class, ServerReaderBodyHandler.class,
+                    MediaType.WILDCARD),
+            new BuiltinWriter(File.class, ServerFileBodyHandler.class,
+                    MediaType.WILDCARD),
+    };
+    private static final String CONTENT_TYPE = "Content-Type"; // use this instead of the Vert.x constant because the TCK expects upper case
+
+    static {
+        primitivesToWrappers.put(boolean.class, Boolean.class);
+        primitivesToWrappers.put(char.class, Character.class);
+        primitivesToWrappers.put(byte.class, Byte.class);
+        primitivesToWrappers.put(short.class, Short.class);
+        primitivesToWrappers.put(int.class, Integer.class);
+        primitivesToWrappers.put(long.class, Long.class);
+        primitivesToWrappers.put(float.class, Float.class);
+        primitivesToWrappers.put(double.class, Double.class);
+    }
+
+    public static final MessageBodyWriter<?>[] NO_WRITER = new MessageBodyWriter[0];
+    public static final MessageBodyReader<?>[] NO_READER = new MessageBodyReader[0];
+
+    private final ConcurrentMap<Class<?>, List<ResourceWriter>> noMediaTypeClassCache = new ConcurrentHashMap<>();
+    private final Function<Class<?>, List<ResourceWriter>> mappingFunction = new Function<Class<?>, List<ResourceWriter>>() {
+        @Override
+        public List<ResourceWriter> apply(Class<?> aClass) {
+            Class<?> c = aClass;
+            List<ResourceWriter> writers = new ArrayList<>();
+            Set<Class<?>> seenInterfaces = new HashSet<>();
+            while (c != null) {
+                //TODO: the spec doesn't seem to be totally clear about the sorting here
+                // the way the writers are sorted here takes the distance from the requested type
+                // first and foremost and then uses the rest of the criteria
+
+                List<ResourceWriter> forClass = getWriters().get(c);
+                if (forClass != null) {
+                    forClass = new ArrayList<>(forClass);
+                    forClass.sort(new ResourceWriter.ResourceWriterComparator());
+                    writers.addAll(forClass);
+                }
+                Deque<Class<?>> interfaces = new ArrayDeque<>(Arrays.asList(c.getInterfaces()));
+                while (!interfaces.isEmpty()) {
+                    Class<?> iface = interfaces.poll();
+                    if (seenInterfaces.contains(iface)) {
+                        continue;
+                    }
+                    seenInterfaces.add(iface);
+                    forClass = getWriters().get(iface);
+                    if (forClass != null) {
+                        forClass = new ArrayList<>(forClass);
+                        forClass.sort(new ResourceWriter.ResourceWriterComparator());
+                        writers.addAll(forClass);
+                    }
+                    interfaces.addAll(Arrays.asList(iface.getInterfaces()));
+                }
+                c = c.getSuperclass();
+            }
+            return writers;
+        }
+    };
+
+    public static boolean invokeWriter(ResteasyReactiveRequestContext context, Object entity, MessageBodyWriter writer,
+            ServerSerialisers serialisers)
+            throws IOException {
+        return invokeWriter(context, entity, writer, serialisers, null);
+    }
+
+    public static boolean invokeWriter(ResteasyReactiveRequestContext context, Object entity, MessageBodyWriter writer,
+            ServerSerialisers serialisers, MediaType mediaType) throws IOException {
+        //note that GenericEntity is not a factor here. It should have already been unwrapped
+
+        WriterInterceptor[] writerInterceptors = context.getWriterInterceptors();
+        boolean outputStreamSet = context.getOutputStream() != null;
+        context.serverResponse().setPreCommitListener(HEADER_FUNCTION);
+        try {
+            if (writer instanceof ServerMessageBodyWriter && writerInterceptors == null && !outputStreamSet) {
+                ServerMessageBodyWriter<Object> quarkusRestWriter = (ServerMessageBodyWriter<Object>) writer;
+                RuntimeResource target = context.getTarget();
+                Type genericType;
+                if (context.hasGenericReturnType()) { // make sure that when a Response with a GenericEntity was returned, we use it
+                    genericType = context.getGenericReturnType();
+                } else {
+                    genericType = target == null ? null : target.getReturnType();
+                }
+                Class<?> entityClass = entity.getClass();
+                if (quarkusRestWriter.isWriteable(
+                        entityClass,
+                        genericType,
+                        target == null ? null : target.getLazyMethod(),
+                        context.getResponseMediaType())) {
+                    if (mediaType != null) {
+                        context.setResponseContentType(mediaType);
+                    }
+                    quarkusRestWriter.writeResponse(entity, genericType, context);
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                if (writer.isWriteable(entity.getClass(), context.getGenericReturnType(), context.getAllAnnotations(),
+                        context.getResponseMediaType())) {
+                    Response response = context.getResponse().get();
+                    if (mediaType != null) {
+                        context.setResponseContentType(mediaType);
+                    }
+                    if (writerInterceptors == null) {
+                        writer.writeTo(entity, entity.getClass(), context.getGenericReturnType(),
+                                context.getAllAnnotations(), response.getMediaType(), response.getHeaders(),
+                                context.getOrCreateOutputStream());
+                        context.getOrCreateOutputStream().close();
+                    } else {
+                        runWriterInterceptors(context, entity, writer, response, writerInterceptors, serialisers);
+                    }
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } catch (Throwable e) {
+            //clear the pre-commit listener, as if this error is unrecoverable
+            //the error handling will want to write out its own response
+            //and the pre commit listener will interfere with that
+            context.serverResponse().setPreCommitListener(null);
+            if (e instanceof RuntimeException) {
+                throw (RuntimeException) e;
+            } else if (e instanceof IOException) {
+                throw (IOException) e;
+            } else {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public static void runWriterInterceptors(ResteasyReactiveRequestContext context, Object entity, MessageBodyWriter writer,
+            Response response, WriterInterceptor[] writerInterceptor, ServerSerialisers serialisers) throws IOException {
+        WriterInterceptorContextImpl wc = new WriterInterceptorContextImpl(context, writerInterceptor, writer,
+                context.getAllAnnotations(), entity.getClass(), context.getGenericReturnType(), entity, response.getMediaType(),
+                response.getHeaders(), serialisers);
+        wc.proceed();
+    }
+
+    public MultivaluedMap<Class<?>, ResourceWriter> getWriters() {
+        return writers;
+    }
+
+    public MultivaluedMap<Class<?>, ResourceReader> getReaders() {
+        return readers;
+    }
+
+    /**
+     * Find the best matching writer based on the 'Accept' HTTP header
+     * This is probably more complex than it needs to be, but some RESTEasy tests show that the response type
+     * is influenced by the provider's weight of the media types
+     */
+    public BestMatchingServerWriterResult findBestMatchingServerWriter(ConfigurationImpl configuration,
+            Class<?> entityType, ServerHttpRequest request) {
+        // TODO: refactor to have use common code from findWriters
+        Class<?> klass = entityType;
+        Deque<Class<?>> toProcess = new LinkedList<>();
+        QuarkusMultivaluedMap<Class<?>, ResourceWriter> writers;
+        if (configuration != null && !configuration.getResourceWriters().isEmpty()) {
+            writers = new QuarkusMultivaluedHashMap<>();
+            writers.putAll(this.writers);
+            writers.addAll(configuration.getResourceWriters());
+        } else {
+            writers = this.writers;
+        }
+
+        BestMatchingServerWriterResult result = new BestMatchingServerWriterResult();
+        do {
+            if (klass == Object.class) {
+                //spec extension, look for interfaces as well
+                //we match interfaces before Object
+                Set<Class<?>> seen = new HashSet<>(toProcess);
+                while (!toProcess.isEmpty()) {
+                    Class<?> iface = toProcess.poll();
+                    List<ResourceWriter> matchingWritersByType = writers.get(iface);
+                    serverResourceWriterLookup(request, matchingWritersByType, result);
+                    for (Class<?> i : iface.getInterfaces()) {
+                        if (!seen.contains(i)) {
+                            seen.add(i);
+                            toProcess.add(i);
+                        }
+                    }
+                }
+            }
+            List<ResourceWriter> matchingWritersByType = writers.get(klass);
+            serverResourceWriterLookup(request, matchingWritersByType, result);
+            toProcess.addAll(Arrays.asList(klass.getInterfaces()));
+            klass = klass.getSuperclass();
+        } while (klass != null);
+
+        return result;
+    }
+
+    private void serverResourceWriterLookup(ServerHttpRequest request,
+            List<ResourceWriter> candidates, BestMatchingServerWriterResult result) {
+        if (candidates == null) {
+            return;
+        }
+
+        Map.Entry<MediaType, MediaType> selectedMediaTypes = null;
+        List<ResourceWriter> selectedResourceWriters = null;
+        for (ResourceWriter resourceWriter : candidates) {
+            if (!resourceWriter.matchesRuntimeType(RuntimeType.SERVER)) {
+                continue;
+            }
+            Map.Entry<MediaType, MediaType> current = resourceWriter.serverMediaType()
+                    .negotiateProduces(request.getRequestHeader(HttpHeaders.ACCEPT), null);
+            if (current.getValue() == null) {
+                continue;
+            }
+            if (selectedMediaTypes == null) {
+                selectedMediaTypes = current;
+                selectedResourceWriters = new ArrayList<>(1);
+                selectedResourceWriters.add(resourceWriter);
+            } else {
+                int compare = MediaTypeHelper.COMPARATOR.compare(current.getValue(), selectedMediaTypes.getValue());
+                if (compare == 0) {
+                    selectedResourceWriters.add(resourceWriter);
+                } else if (compare < 0) {
+                    selectedMediaTypes = current;
+                    selectedResourceWriters = new ArrayList<>(1);
+                    selectedResourceWriters.add(resourceWriter);
+                }
+            }
+        }
+        if (selectedMediaTypes != null) {
+            for (ResourceWriter selectedResourceWriter : selectedResourceWriters) {
+                result.add(selectedResourceWriter.instance(), selectedMediaTypes.getKey());
+            }
+        }
+    }
+
+    public NoMediaTypeResult findWriterNoMediaType(ResteasyReactiveRequestContext requestContext, Object entity,
+            ServerSerialisers serialisers, RuntimeType runtimeType) {
+        List<ResourceWriter> resultForClass = noMediaTypeClassCache.computeIfAbsent(entity.getClass(), mappingFunction);
+        List<ResourceWriter> constrainedResultsForClass = new ArrayList<>(resultForClass.size());
+        for (ResourceWriter writer : resultForClass) {
+            if (!writer.matchesRuntimeType(runtimeType)) {
+                continue;
+            }
+            constrainedResultsForClass.add(writer);
+        }
+        MediaType selected = null;
+        for (ResourceWriter writer : constrainedResultsForClass) {
+            selected = writer.serverMediaType()
+                    .negotiateProduces(requestContext.serverRequest().getRequestHeader(HttpHeaders.ACCEPT)).getKey();
+            if (selected != null) {
+                break;
+            }
+        }
+        if (selected == null) {
+            Set<MediaType> acceptable = new HashSet<>();
+            for (ResourceWriter i : constrainedResultsForClass) {
+                acceptable.addAll(i.mediaTypes());
+            }
+
+            throw new WebApplicationException(Response
+                    .notAcceptable(Variant
+                            .mediaTypes(
+                                    acceptable.toArray(new MediaType[0]))
+                            .build())
+                    .build());
+        }
+        if (selected.isWildcardType() || (selected.getType().equals("application") && selected.isWildcardSubtype())) {
+            selected = MediaType.APPLICATION_OCTET_STREAM_TYPE;
+        }
+        List<MessageBodyWriter<?>> finalResult = new ArrayList<>(constrainedResultsForClass.size());
+        for (ResourceWriter i : constrainedResultsForClass) {
+            // this part seems to be needed in order to pass com.sun.ts.tests.jaxrs.ee.resource.java2entity.JAXRSClient
+            if (i.mediaTypes().isEmpty()) {
+                finalResult.add(i.instance());
+            } else {
+                for (MediaType mt : i.mediaTypes()) {
+                    if (mt.isCompatible(selected)) {
+                        finalResult.add(i.instance());
+                        break;
+                    }
+                }
+            }
+        }
+        return new NoMediaTypeResult(finalResult.toArray(NO_WRITER), selected, serialisers);
+    }
+
+    @Override
+    public BuiltinWriter[] getBultinWriters() {
+        return BUILTIN_WRITERS;
+    }
+
+    @Override
+    public BuiltinReader[] getBultinReaders() {
+        return BUILTIN_READERS;
+    }
+
+    public static class NoMediaTypeResult {
+        final MessageBodyWriter<?>[] writers;
+        final MediaType mediaType;
+        final EntityWriter entityWriter;
+
+        public NoMediaTypeResult(MessageBodyWriter<?>[] writers, MediaType mediaType, ServerSerialisers serialisers) {
+            this.writers = writers;
+            this.mediaType = mediaType;
+            this.entityWriter = new FixedEntityWriterArray(writers, serialisers);
+        }
+
+        public MessageBodyWriter<?>[] getWriters() {
+            return writers;
+        }
+
+        public MediaType getMediaType() {
+            return mediaType;
+        }
+
+        public EntityWriter getEntityWriter() {
+            return entityWriter;
+        }
+    }
+
+    public static class BestMatchingServerWriterResult {
+        final List<Entry> entries = new ArrayList<>();
+
+        void add(MessageBodyWriter<?> writer, MediaType mediaType) {
+            entries.add(new Entry(writer, mediaType));
+        }
+
+        public boolean isEmpty() {
+            return entries.isEmpty();
+        }
+
+        public List<MessageBodyWriter<?>> getMessageBodyWriters() {
+            if (isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            List<MessageBodyWriter<?>> result = new ArrayList<>(entries.size());
+            for (Entry entry : entries) {
+                result.add(entry.writer);
+            }
+            return result;
+        }
+
+        public MediaType getSelectedMediaType() {
+            if (isEmpty()) {
+                return null;
+            }
+            return entries.get(0).mediaType;
+        }
+
+        private static class Entry {
+            final MessageBodyWriter<?> writer;
+            final MediaType mediaType;
+
+            public Entry(MessageBodyWriter<?> writer, MediaType mediaType) {
+                this.writer = writer;
+                this.mediaType = mediaType;
+            }
+        }
+    }
+
+    public static void encodeResponseHeaders(ResteasyReactiveRequestContext requestContext) {
+        ServerHttpResponse vertxResponse = requestContext.serverResponse();
+        if (!requestContext.getResponse().isCreated()) {
+            //fast path
+            //there is no response, so we just set the content type
+            if (requestContext.getResponseEntity() == null) {
+                vertxResponse.setStatusCode(Response.Status.NO_CONTENT.getStatusCode());
+            }
+            EncodedMediaType contentType = requestContext.getResponseContentType();
+            if (contentType != null) {
+                vertxResponse.setResponseHeader(CONTENT_TYPE, contentType.toString());
+            }
+            return;
+        }
+        Response response = requestContext.getResponse().get();
+        vertxResponse.setStatusCode(response.getStatus());
+
+        // avoid using getStringHeaders() which does similar things but copies into yet another map
+        MultivaluedMap<String, Object> headers = response.getHeaders();
+        for (Map.Entry<String, List<Object>> entry : headers.entrySet()) {
+            if (entry.getValue().size() == 1) {
+                Object o = entry.getValue().get(0);
+                if (o instanceof CharSequence) {
+                    vertxResponse.setResponseHeader(entry.getKey(), (CharSequence) o);
+                } else {
+                    vertxResponse.setResponseHeader(entry.getKey(), (CharSequence) HeaderUtil.headerToString(o));
+                }
+            } else {
+                List<CharSequence> strValues = new ArrayList<>(entry.getValue().size());
+                for (Object o : entry.getValue()) {
+                    strValues.add(HeaderUtil.headerToString(o));
+                }
+                vertxResponse.setResponseHeader(entry.getKey(), strValues);
+            }
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java
new file mode 100644
index 0000000000000..927e399c9fbde
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java
@@ -0,0 +1,157 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.SseEvent;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.common.util.CommonSseUtil;
+import org.jboss.resteasy.reactive.server.jaxrs.OutboundSseEventImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+
+public class SseUtil extends CommonSseUtil {
+
+    private static final String NL = "\n";
+
+    public static CompletionStage<?> send(ResteasyReactiveRequestContext context, OutboundSseEvent event) {
+        ServerHttpResponse response = context.serverResponse();
+        if (response.closed()) {
+            // FIXME: check spec
+            return CompletableFuture.completedFuture(null);
+        }
+        String data;
+        try {
+            data = serialiseEvent(context, event);
+        } catch (IOException e) {
+            CompletableFuture<Void> ret = new CompletableFuture<>();
+            ret.completeExceptionally(e);
+            return ret;
+        }
+        setHeaders(context, response);
+        return response.write(data.getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static String serialiseEvent(ResteasyReactiveRequestContext context, OutboundSseEvent event)
+            throws IOException {
+        StringBuilder sb = new StringBuilder();
+        MediaType eventMediaType = null;
+        // NOT IN SPEC
+        if (event instanceof OutboundSseEventImpl && ((OutboundSseEventImpl) event).isMediaTypeSet()) {
+            eventMediaType = event.getMediaType();
+            serialiseField(context, sb, "content-type", eventMediaType.toString(), false);
+        }
+        if (event.getComment() != null) {
+            // empty field name
+            serialiseField(context, sb, "", event.getComment(), false);
+        }
+        if (event.getId() != null) {
+            serialiseField(context, sb, "id", event.getId(), false);
+        }
+        if (event.getName() != null) {
+            serialiseField(context, sb, "event", event.getName(), false);
+        }
+        if (event.getReconnectDelay() != SseEvent.RECONNECT_NOT_SET) {
+            // SSE spec says to ignore any non-ASCII digits (including negative) so just ignore instead of throwing
+            if (event.getReconnectDelay() >= 0)
+                serialiseField(context, sb, "retry", Long.toString(event.getReconnectDelay()), false);
+        }
+        String data = serialiseDataToString(context, event, eventMediaType);
+        serialiseField(context, sb, "data", data, true);
+        sb.append(NL);
+        // return a UTF8 buffer
+        return sb.toString();
+    }
+
+    private static void serialiseField(ResteasyReactiveRequestContext context, StringBuilder sb, String field, String value,
+            boolean multiLine) {
+        sb.append(field).append(":");
+        // if not multi-line, just ignore whatever is after any \n, \r or \n\r, which ever comes first
+        int n = value.indexOf('\n');
+        int r = value.indexOf('\r');
+        if (n == -1 && r == -1) {
+            sb.append(value).append(NL);
+        } else if (!multiLine) {
+            sb.append(value, 0, Math.max(n, r)).append(NL);
+        } else {
+            // turn all \n \r \n\r into multiple lines
+            char[] chars = value.toCharArray();
+            for (int i = 0; i < chars.length; i++) {
+                char c = chars[i];
+                if (c == '\n') {
+                    // start a new line
+                    sb.append(NL).append(field).append(":");
+                    if (i + 1 < chars.length && chars[i + 1] == '\r') {
+                        // eat both
+                        i++;
+                    }
+                } else if (c == '\r') {
+                    // start a new line
+                    sb.append(NL).append(field).append(":");
+                } else {
+                    // safe to append
+                    sb.append(c);
+                }
+            }
+            // end of the line
+            sb.append(NL);
+        }
+
+    }
+
+    private static String serialiseDataToString(ResteasyReactiveRequestContext context, OutboundSseEvent event,
+            MediaType eventMediaType)
+            throws IOException {
+        ServerSerialisers serialisers = context.getDeployment().getSerialisers();
+        Object entity = event.getData();
+        Class<?> entityClass = event.getType();
+        Type entityType = event.getGenericType();
+        MediaType mediaType = eventMediaType != null ? eventMediaType : context.getTarget().getSseElementType();
+        if (mediaType == null) {
+            mediaType = MediaType.TEXT_PLAIN_TYPE;
+        }
+        // FIXME: this should belong somewhere else as it's generic
+        @SuppressWarnings("unchecked")
+        MessageBodyWriter<Object>[] writers = (MessageBodyWriter<Object>[]) serialisers
+                .findWriters(null, entityClass, mediaType)
+                .toArray(ServerSerialisers.NO_WRITER);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        boolean wrote = false;
+        for (MessageBodyWriter<Object> writer : writers) {
+            // Spec(API) says we should use class/type/mediaType but doesn't talk about annotations 
+            if (writer.isWriteable(entityClass, entityType, Serialisers.NO_ANNOTATION, mediaType)) {
+                // FIXME: spec doesn't really say what headers we should use here
+                writer.writeTo(entity, entityClass, entityType, Serialisers.NO_ANNOTATION, mediaType,
+                        Serialisers.EMPTY_MULTI_MAP, baos);
+                wrote = true;
+                break;
+            }
+        }
+        if (!wrote) {
+            throw new IllegalStateException("Could not find MessageBodyWriter for " + entityClass);
+        }
+        // At this point we can only pray that the resulting output is a UTF-8 string
+        return baos.toString(StandardCharsets.UTF_8.name());
+    }
+
+    public static void setHeaders(ResteasyReactiveRequestContext context, ServerHttpResponse response) {
+        // FIXME: spec says we should flush the headers when first message is sent or when the resource method returns, whichever
+        // happens first
+        if (!response.headWritten()) {
+            response.setStatusCode(Response.Status.OK.getStatusCode());
+            response.setResponseHeader(HttpHeaders.CONTENT_TYPE, MediaType.SERVER_SENT_EVENTS);
+            if (context.getTarget().getSseElementType() != null) {
+                response.setResponseHeader(SSE_CONTENT_TYPE, context.getTarget().getSseElementType().toString());
+            }
+            response.setChunked(true);
+            // FIXME: other headers?
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java
new file mode 100644
index 0000000000000..bbb7661451690
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/StreamingUtil.java
@@ -0,0 +1,85 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.core.Serialisers;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+
+// FIXME: we need to refactor the serialisation of entities to bytes between here and Sse and Serialisers
+// and figure out where interceptors come into play
+public class StreamingUtil {
+
+    public static CompletionStage<?> send(ResteasyReactiveRequestContext context, Object entity, String prefix) {
+        ServerHttpResponse response = context.serverResponse();
+        if (response.closed()) {
+            // FIXME: check spec
+            return CompletableFuture.completedFuture(null);
+        }
+        byte[] data;
+        try {
+            data = serialiseEntity(context, entity);
+        } catch (Exception e) {
+            CompletableFuture<?> ret = new CompletableFuture<>();
+            ret.completeExceptionally(e);
+            return ret;
+        }
+        setHeaders(context, response);
+        if (prefix != null) {
+            byte[] prefixBytes = prefix.getBytes(StandardCharsets.US_ASCII);
+            byte[] prefixedData = new byte[prefixBytes.length + data.length];
+            System.arraycopy(prefixBytes, 0, prefixedData, 0, prefixBytes.length);
+            System.arraycopy(data, 0, prefixedData, prefixBytes.length, data.length);
+            data = prefixedData;
+        }
+        return response.write(data);
+    }
+
+    private static byte[] serialiseEntity(ResteasyReactiveRequestContext context, Object entity) throws IOException {
+        ServerSerialisers serialisers = context.getDeployment().getSerialisers();
+        Class<?> entityClass = entity.getClass();
+        Type entityType = context.getGenericReturnType();
+        MediaType mediaType = context.getResponseMediaType();
+        // FIXME: this should belong somewhere else as it's generic
+        @SuppressWarnings("unchecked")
+        MessageBodyWriter<Object>[] writers = (MessageBodyWriter<Object>[]) serialisers
+                .findWriters(null, entityClass, mediaType, RuntimeType.SERVER)
+                .toArray(ServerSerialisers.NO_WRITER);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        boolean wrote = false;
+        for (MessageBodyWriter<Object> writer : writers) {
+            // Spec(API) says we should use class/type/mediaType but doesn't talk about annotations 
+            if (writer.isWriteable(entityClass, entityType, Serialisers.NO_ANNOTATION, mediaType)) {
+                // FIXME: spec doesn't really say what headers we should use here
+                writer.writeTo(entity, entityClass, entityType, Serialisers.NO_ANNOTATION, mediaType,
+                        Serialisers.EMPTY_MULTI_MAP, baos);
+                wrote = true;
+                break;
+            }
+        }
+        if (!wrote) {
+            throw new IllegalStateException(
+                    "Could not find MessageBodyWriter for " + entityClass + " / " + entityType + " as " + mediaType);
+        }
+        return baos.toByteArray();
+    }
+
+    public static void setHeaders(ResteasyReactiveRequestContext context, ServerHttpResponse response) {
+        // FIXME: spec says we should flush the headers when first message is sent or when the resource method returns, whichever
+        // happens first
+        if (!response.headWritten()) {
+            response.setStatusCode(Response.Status.OK.getStatusCode());
+            response.setResponseHeader(HttpHeaders.CONTENT_TYPE, context.getResponseContentType().toString());
+            response.setChunked(true);
+            // FIXME: other headers?
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/UriMatch.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/UriMatch.java
new file mode 100644
index 0000000000000..b8832af01d9e3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/UriMatch.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive.server.core;
+
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+
+public class UriMatch {
+    public final String matched;
+    public final RuntimeResource resource;
+    public final Object target;
+
+    public UriMatch(String matched, RuntimeResource resource, Object target) {
+        this.matched = matched;
+        this.resource = resource;
+        this.target = target;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/AsyncResponseExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/AsyncResponseExtractor.java
new file mode 100644
index 0000000000000..6196ab768d580
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/AsyncResponseExtractor.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.AsyncResponseImpl;
+
+public class AsyncResponseExtractor implements ParameterExtractor {
+
+    public static final AsyncResponseExtractor INSTANCE = new AsyncResponseExtractor();
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        AsyncResponseImpl response = new AsyncResponseImpl(context);
+        context.setAsyncResponse(response);
+        return response;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/BodyParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/BodyParamExtractor.java
new file mode 100644
index 0000000000000..ceecd772ff8a7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/BodyParamExtractor.java
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class BodyParamExtractor implements ParameterExtractor {
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getRequestEntity();
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java
new file mode 100644
index 0000000000000..085850388056e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ContextParamExtractor.java
@@ -0,0 +1,93 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Providers;
+import javax.ws.rs.sse.Sse;
+import javax.ws.rs.sse.SseEventSink;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.AsyncResponseImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.ResourceContextImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.SseEventSinkImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.SseImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ContextParamExtractor implements ParameterExtractor {
+
+    private final Class<?> type;
+
+    public ContextParamExtractor(String type) {
+        try {
+            this.type = Class.forName(type, false, Thread.currentThread().getContextClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        // NOTE: Same list for CDI at ContextProducers and in EndpointIndexer.CONTEXT_TYPES
+        if (type.equals(ServerRequestContext.class)) {
+            return context;
+        }
+        if (type.equals(HttpHeaders.class)) {
+            return context.getHttpHeaders();
+        }
+        if (type.equals(UriInfo.class)) {
+            return context.getUriInfo();
+        }
+        if (type.equals(Configuration.class)) {
+            return context.getDeployment().getConfiguration();
+        }
+        if (type.equals(AsyncResponse.class)) {
+            AsyncResponseImpl response = new AsyncResponseImpl(context);
+            context.setAsyncResponse(response);
+            return response;
+        }
+        if (type.equals(SseEventSink.class)) {
+            SseEventSinkImpl sink = new SseEventSinkImpl(context);
+            context.setSseEventSink(sink);
+            return sink;
+        }
+        if (type.equals(Request.class)) {
+            return context.getRequest();
+        }
+        if (type.equals(Providers.class)) {
+            return context.getProviders();
+        }
+        if (type.equals(Sse.class)) {
+            return SseImpl.INSTANCE;
+        }
+        if (type.equals(ResourceInfo.class)) {
+            return context.getTarget().getLazyMethod();
+        }
+        if (type.equals(SimpleResourceInfo.class)) {
+            return context.getTarget().getSimplifiedResourceInfo();
+        }
+        if (type.equals(Application.class)) {
+            return CDI.current().select(Application.class).get();
+        }
+        if (type.equals(SecurityContext.class)) {
+            return context.getSecurityContext();
+        }
+        if (type.equals(ResourceContext.class)) {
+            return ResourceContextImpl.INSTANCE;
+        }
+        Object instance = context.unwrap(type);
+        if (instance != null) {
+            return instance;
+        }
+        // FIXME: move to build time
+        throw new IllegalStateException("Unsupported contextual type: " + type);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java
new file mode 100644
index 0000000000000..19b7c273cb92a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/CookieParamExtractor.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class CookieParamExtractor implements ParameterExtractor {
+
+    private final String name;
+
+    public CookieParamExtractor(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getCookieParameter(name);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/FormParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/FormParamExtractor.java
new file mode 100644
index 0000000000000..11b84464f923d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/FormParamExtractor.java
@@ -0,0 +1,21 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class FormParamExtractor implements ParameterExtractor {
+
+    private final String name;
+    private final boolean single;
+    private final boolean encoded;
+
+    public FormParamExtractor(String name, boolean single, boolean encoded) {
+        this.name = name;
+        this.single = single;
+        this.encoded = encoded;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getFormParameter(name, single, encoded);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/HeaderParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/HeaderParamExtractor.java
new file mode 100644
index 0000000000000..a1c6a78ccd6e4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/HeaderParamExtractor.java
@@ -0,0 +1,19 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class HeaderParamExtractor implements ParameterExtractor {
+
+    private final String name;
+    private final boolean single;
+
+    public HeaderParamExtractor(String name, boolean single) {
+        this.name = name;
+        this.single = single;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getHeader(name, single);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java
new file mode 100644
index 0000000000000..2be168398e880
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/InjectParamExtractor.java
@@ -0,0 +1,28 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import javax.ws.rs.container.CompletionCallback;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class InjectParamExtractor implements ParameterExtractor {
+
+    private final BeanFactory<Object> factory;
+
+    public InjectParamExtractor(BeanFactory<Object> factory) {
+        this.factory = factory;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        BeanFactory.BeanInstance<Object> instance = factory.createInstance();
+        context.registerCompletionCallback(new CompletionCallback() {
+            @Override
+            public void onComplete(Throwable throwable) {
+                instance.close();
+            }
+        });
+        ((ResteasyReactiveInjectionTarget) instance.getInstance()).__quarkus_rest_inject(context);
+        return instance.getInstance();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java
new file mode 100644
index 0000000000000..835be0b515340
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class LocatableResourcePathParamExtractor implements ParameterExtractor {
+
+    private final String name;
+
+    public LocatableResourcePathParamExtractor(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getResourceLocatorPathParam(name);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MatrixParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MatrixParamExtractor.java
new file mode 100644
index 0000000000000..6423ad207a0c4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/MatrixParamExtractor.java
@@ -0,0 +1,22 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class MatrixParamExtractor implements ParameterExtractor {
+
+    private final String name;
+    private final boolean single;
+    private final boolean encoded;
+
+    public MatrixParamExtractor(String name, boolean single, boolean encoded) {
+        this.name = name;
+        this.single = single;
+        this.encoded = encoded;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getMatrixParameter(name, single, encoded);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/NullParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/NullParamExtractor.java
new file mode 100644
index 0000000000000..9eb8ae37e1abf
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/NullParamExtractor.java
@@ -0,0 +1,10 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class NullParamExtractor implements ParameterExtractor {
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return null;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java
new file mode 100644
index 0000000000000..4dd4e61169463
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/ParameterExtractor.java
@@ -0,0 +1,73 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import java.util.function.BiConsumer;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public interface ParameterExtractor {
+
+    /**
+     * Extracts a parameter from the request.
+     *
+     * If this returns a {@link ParameterCallback} then the value must be obtained from the listener
+     *
+     */
+    Object extractParameter(ResteasyReactiveRequestContext context);
+
+    /**
+     * listener class that is used to provide async method parameters.
+     * 
+     * This is very simple to reduce the number of required allocations.
+     */
+    public class ParameterCallback {
+
+        private Object result;
+        private Throwable failure;
+        private BiConsumer<Object, Throwable> listener;
+
+        public void setListener(BiConsumer<Object, Throwable> listener) {
+            Object result;
+            Throwable failure;
+            synchronized (this) {
+                if (this.listener != null) {
+                    throw new RuntimeException("Listener already set");
+                }
+                result = this.result;
+                failure = this.failure;
+                this.listener = listener;
+            }
+            if (result != null || failure != null) {
+                listener.accept(result, failure);
+            }
+        }
+
+        public void setResult(Object result) {
+            BiConsumer<Object, Throwable> listener;
+            synchronized (this) {
+                if (this.result != null || this.failure != null) {
+                    throw new RuntimeException("Callback already completed result:" + result + " failure:" + failure);
+                }
+                listener = this.listener;
+                this.result = result;
+            }
+            if (listener != null) {
+                listener.accept(result, null);
+            }
+        }
+
+        public void setFailure(Throwable failure) {
+            BiConsumer<Object, Throwable> listener;
+            synchronized (this) {
+                if (this.result != null || this.failure != null) {
+                    throw new RuntimeException("Callback already completed result:" + result + " failure:" + failure);
+                }
+                listener = this.listener;
+                this.failure = failure;
+            }
+            if (listener != null) {
+                listener.accept(null, failure);
+            }
+        }
+
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java
new file mode 100644
index 0000000000000..3a018f4651cc5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/PathParamExtractor.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.common.util.Encode;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class PathParamExtractor implements ParameterExtractor {
+
+    private final int index;
+    private final boolean encoded;
+
+    public PathParamExtractor(int index, boolean encoded) {
+        this.index = index;
+        this.encoded = encoded;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        String pathParam = context.getPathParam(index);
+        if (encoded) {
+            return Encode.encodeQueryParam(pathParam);
+        }
+        return pathParam;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/QueryParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/QueryParamExtractor.java
new file mode 100644
index 0000000000000..ba9efb34ea930
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/QueryParamExtractor.java
@@ -0,0 +1,21 @@
+package org.jboss.resteasy.reactive.server.core.parameters;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class QueryParamExtractor implements ParameterExtractor {
+
+    private final String name;
+    private final boolean single;
+    private final boolean encoded;
+
+    public QueryParamExtractor(String name, boolean single, boolean encoded) {
+        this.name = name;
+        this.single = single;
+        this.encoded = encoded;
+    }
+
+    @Override
+    public Object extractParameter(ResteasyReactiveRequestContext context) {
+        return context.getQueryParameter(name, single, encoded);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ConverterInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ConverterInfo.java
new file mode 100644
index 0000000000000..c11fb31d25c16
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ConverterInfo.java
@@ -0,0 +1,29 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+
+public class ConverterInfo {
+
+    private final Deployment deployment;
+    private final RuntimeResource resource;
+    private final int param;
+
+    public ConverterInfo(Deployment deployment, RuntimeResource resource, int param) {
+        this.deployment = deployment;
+        this.resource = resource;
+        this.param = param;
+    }
+
+    public Deployment getDeployment() {
+        return deployment;
+    }
+
+    public RuntimeResource getResource() {
+        return resource;
+    }
+
+    public int getParam() {
+        return param;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/DelegatingParameterConverterSupplier.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/DelegatingParameterConverterSupplier.java
new file mode 100644
index 0000000000000..eb1e193adb9b5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/DelegatingParameterConverterSupplier.java
@@ -0,0 +1,5 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+public interface DelegatingParameterConverterSupplier extends ParameterConverterSupplier {
+    public ParameterConverterSupplier getDelegate();
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/GeneratedParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/GeneratedParameterConverter.java
new file mode 100644
index 0000000000000..5e113d99fcece
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/GeneratedParameterConverter.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+public class GeneratedParameterConverter implements ParameterConverterSupplier {
+
+    private String className;
+
+    @Override
+    public ParameterConverter get() {
+        try {
+            return (ParameterConverter) Class.forName(className, false, Thread.currentThread().getContextClassLoader())
+                    .newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return className;
+    }
+
+    public GeneratedParameterConverter setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java
new file mode 100644
index 0000000000000..ea2cbf683b170
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ListConverter.java
@@ -0,0 +1,79 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class ListConverter implements ParameterConverter {
+
+    private final ParameterConverter delegate;
+
+    public ListConverter(ParameterConverter delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object convert(Object parameter) {
+        if (parameter instanceof List) {
+            if (delegate == null) {
+                return parameter;
+            }
+            List<Object> ret = new ArrayList<>();
+            List<String> values = (List<String>) parameter;
+            for (String val : values) {
+                ret.add(delegate.convert(val));
+            }
+            return ret;
+        } else if (parameter == null) {
+            return Collections.emptyList();
+        } else if (delegate != null) {
+            return Collections.singletonList(delegate.convert(parameter));
+        } else {
+            return Collections.singletonList(parameter);
+        }
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        if (delegate != null)
+            delegate.init(deployment, rawType, genericType, annotations);
+    }
+
+    public ParameterConverter getDelegate() {
+        return delegate;
+    }
+
+    public static class ListSupplier implements DelegatingParameterConverterSupplier {
+        private ParameterConverterSupplier delegate;
+
+        public ListSupplier() {
+        }
+
+        public ListSupplier(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return delegate == null ? new ListConverter(null) : new ListConverter(delegate.get());
+        }
+
+        @Override
+        public String getClassName() {
+            return ListConverter.class.getName();
+        }
+
+        @Override
+        public ParameterConverterSupplier getDelegate() {
+            return delegate;
+        }
+
+        public ListSupplier setDelegate(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+            return this;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/LocalDateParamConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/LocalDateParamConverter.java
new file mode 100644
index 0000000000000..373ca033dfdb4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/LocalDateParamConverter.java
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class LocalDateParamConverter implements ParameterConverter {
+
+    @Override
+    public Object convert(Object parameter) {
+        return LocalDate.parse(String.valueOf(parameter), DateTimeFormatter.ISO_LOCAL_DATE);
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType,
+            Annotation[] annotations) {
+        // no init required
+    }
+
+    public static class Supplier implements ParameterConverterSupplier {
+
+        @Override
+        public String getClassName() {
+            return LocalDateParamConverter.class.getName();
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return new LocalDateParamConverter();
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java
new file mode 100644
index 0000000000000..5958994b519a2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/NoopParameterConverter.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class NoopParameterConverter implements ParameterConverter {
+
+    @Override
+    public Object convert(Object parameter) {
+        return parameter;
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+
+    }
+
+    public static class Supplier implements ParameterConverterSupplier {
+
+        @Override
+        public ParameterConverter get() {
+            return new NoopParameterConverter();
+        }
+
+        @Override
+        public String getClassName() {
+            return NoopParameterConverter.class.getName();
+        }
+
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java
new file mode 100644
index 0000000000000..19698b2664c9e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/OptionalConverter.java
@@ -0,0 +1,63 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Optional;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class OptionalConverter implements ParameterConverter {
+
+    private final ParameterConverter delegate;
+
+    public OptionalConverter(ParameterConverter delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object convert(Object parameter) {
+        if (parameter == null) {
+            return Optional.empty();
+        } else if (delegate != null) {
+            return Optional.ofNullable(delegate.convert(parameter));
+        } else {
+            return Optional.of(parameter);
+        }
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        delegate.init(deployment, rawType, genericType, annotations);
+    }
+
+    public static class OptionalSupplier implements DelegatingParameterConverterSupplier {
+        private ParameterConverterSupplier delegate;
+
+        public OptionalSupplier() {
+        }
+
+        public OptionalSupplier(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return delegate == null ? new OptionalConverter(null) : new OptionalConverter(delegate.get());
+        }
+
+        public ParameterConverterSupplier getDelegate() {
+            return delegate;
+        }
+
+        public OptionalSupplier setDelegate(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+            return this;
+        }
+
+        @Override
+        public String getClassName() {
+            return OptionalConverter.class.getName();
+        }
+
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java
new file mode 100644
index 0000000000000..64db5e3708bcd
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverter.java
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public interface ParameterConverter {
+
+    Object convert(Object parameter);
+
+    void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverterSupplier.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverterSupplier.java
new file mode 100644
index 0000000000000..22de846f6c2dd
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/ParameterConverterSupplier.java
@@ -0,0 +1,8 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.util.function.Supplier;
+
+public interface ParameterConverterSupplier extends Supplier<ParameterConverter> {
+    String getClassName();
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java
new file mode 100644
index 0000000000000..7b55e141e58dd
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/PathSegmentParamConverter.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import org.jboss.resteasy.reactive.common.util.PathSegmentImpl;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class PathSegmentParamConverter implements ParameterConverter {
+    @Override
+    public Object convert(Object parameter) {
+        return new PathSegmentImpl(parameter.toString(), true);
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        // no init required
+    }
+
+    public static class Supplier implements ParameterConverterSupplier {
+
+        @Override
+        public String getClassName() {
+            return PathSegmentParamConverter.class.getName();
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return new PathSegmentParamConverter();
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java
new file mode 100644
index 0000000000000..269c26cac6c83
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeParameterConverter.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.ext.ParamConverter;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class RuntimeParameterConverter implements ParameterConverter {
+
+    private final ParamConverter<?> converter;
+
+    public RuntimeParameterConverter(ParamConverter<?> converter) {
+        this.converter = converter;
+    }
+
+    @Override
+    public Object convert(Object value) {
+        return converter.fromString((String) value);
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        // we're initialised in our constructor
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java
new file mode 100644
index 0000000000000..3eb4519c6a826
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/RuntimeResolvedConverter.java
@@ -0,0 +1,65 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class RuntimeResolvedConverter implements ParameterConverter {
+
+    private volatile ParamConverter<?> runtimeConverter;
+    private final ParameterConverter quarkusConverter;
+
+    public RuntimeResolvedConverter(ParameterConverter quarkusConverter) {
+        this.quarkusConverter = quarkusConverter;
+    }
+
+    @Override
+    public Object convert(Object parameter) {
+        if (runtimeConverter != null)
+            return runtimeConverter.fromString(parameter.toString());
+        return quarkusConverter.convert(parameter);
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        for (ResourceParamConverterProvider i : deployment.getParamConverterProviders()) {
+            ParamConverterProvider instance = i.getFactory().createInstance().getInstance();
+            ParamConverter<?> converter = instance.getConverter(rawType, genericType, annotations);
+            if (converter != null) {
+                this.runtimeConverter = converter;
+                break;
+            }
+        }
+        if (runtimeConverter == null && quarkusConverter == null) {
+            throw new RuntimeException("Unable to create param converter for parameter " + genericType);
+        }
+    }
+
+    public static class Supplier implements DelegatingParameterConverterSupplier {
+
+        private ParameterConverterSupplier delegate;
+
+        @Override
+        public String getClassName() {
+            return RuntimeResolvedConverter.class.getName();
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return new RuntimeResolvedConverter(delegate == null ? null : delegate.get());
+        }
+
+        public ParameterConverterSupplier setDelegate(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+            return this;
+        }
+
+        @Override
+        public ParameterConverterSupplier getDelegate() {
+            return delegate;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java
new file mode 100644
index 0000000000000..2edd9c8d278cd
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SetConverter.java
@@ -0,0 +1,75 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class SetConverter implements ParameterConverter {
+
+    private final ParameterConverter delegate;
+
+    public SetConverter(ParameterConverter delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object convert(Object parameter) {
+        if (parameter instanceof List) {
+            Set<Object> ret = new HashSet<>();
+            List<String> values = (List<String>) parameter;
+            for (String val : values) {
+                if (delegate == null) {
+                    ret.add(val);
+                } else {
+                    ret.add(delegate.convert(val));
+                }
+            }
+            return ret;
+        } else if (parameter == null) {
+            return Collections.emptySet();
+        } else if (delegate != null) {
+            return Collections.singleton(delegate.convert(parameter));
+        } else {
+            return Collections.singleton(parameter);
+        }
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        delegate.init(deployment, rawType, genericType, annotations);
+    }
+
+    public static class SetSupplier implements DelegatingParameterConverterSupplier {
+        private ParameterConverterSupplier delegate;
+
+        public SetSupplier() {
+        }
+
+        public SetSupplier(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public String getClassName() {
+            return SetConverter.class.getName();
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return delegate == null ? new SetConverter(null) : new SetConverter(delegate.get());
+        }
+
+        public ParameterConverterSupplier getDelegate() {
+            return delegate;
+        }
+
+        public SetSupplier setDelegate(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+            return this;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java
new file mode 100644
index 0000000000000..b62e81b91342b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/converters/SortedSetConverter.java
@@ -0,0 +1,81 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+
+public class SortedSetConverter implements ParameterConverter {
+
+    private final ParameterConverter delegate;
+
+    public SortedSetConverter(ParameterConverter delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object convert(Object parameter) {
+        if (parameter instanceof List) {
+            SortedSet<Object> ret = new TreeSet<>();
+            List<String> values = (List<String>) parameter;
+            for (String val : values) {
+                if (delegate == null) {
+                    ret.add(val);
+                } else {
+                    ret.add(delegate.convert(val));
+                }
+            }
+            return ret;
+        } else if (parameter == null) {
+            return Collections.emptySortedSet();
+        } else if (delegate != null) {
+            SortedSet<Object> ret = new TreeSet<>();
+            ret.add(delegate.convert(parameter));
+            return ret;
+        } else {
+            SortedSet<Object> ret = new TreeSet<>();
+            ret.add(parameter);
+            return ret;
+        }
+    }
+
+    @Override
+    public void init(ParamConverterProviders deployment, Class<?> rawType, Type genericType, Annotation[] annotations) {
+        delegate.init(deployment, rawType, genericType, annotations);
+    }
+
+    public static class SortedSetSupplier implements DelegatingParameterConverterSupplier {
+        private ParameterConverterSupplier delegate;
+
+        public SortedSetSupplier() {
+        }
+
+        public SortedSetSupplier(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public ParameterConverter get() {
+            return delegate == null ? new SortedSetConverter(null) : new SortedSetConverter(delegate.get());
+        }
+
+        public ParameterConverterSupplier getDelegate() {
+            return delegate;
+        }
+
+        public SortedSetSupplier setDelegate(ParameterConverterSupplier delegate) {
+            this.delegate = delegate;
+            return this;
+        }
+
+        @Override
+        public String getClassName() {
+            return SortedSetConverter.class.getName();
+        }
+
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java
new file mode 100644
index 0000000000000..c7344c6abc72e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/AcceptHeaders.java
@@ -0,0 +1,256 @@
+package org.jboss.resteasy.reactive.server.core.request;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * @author Pascal S. de Kloe
+ */
+public class AcceptHeaders {
+
+    /**
+     * Gets the strings from a comma-separated list.
+     * All "*" entries are replaced with {@code null} keys.
+     *
+     * @param header the header value.
+     * @return the listed items in order of appearance or {@code null} if the header didn't contain any entries.
+     */
+    public static Map<String, QualityValue> getStringQualityValues(String header) {
+        if (header == null) {
+            return null;
+        }
+        header = header.trim();
+        if (header.length() == 0) {
+            return null;
+        }
+        Map<String, QualityValue> result = new LinkedHashMap<String, QualityValue>();
+
+        int offset = 0;
+        while (true) {
+            int endIndex = header.indexOf(',', offset);
+            String content;
+            if (endIndex < 0) {
+                content = header.substring(offset);
+            } else {
+                content = header.substring(offset, endIndex);
+            }
+
+            QualityValue qualityValue = QualityValue.DEFAULT;
+            int qualityIndex = content.indexOf(';');
+            if (qualityIndex >= 0) {
+                String parameter = content.substring(qualityIndex + 1);
+                content = content.substring(0, qualityIndex);
+
+                int equalsIndex = parameter.indexOf('=');
+                if (equalsIndex < 0) {
+                    throw new BadRequestException("Malformed parameter: " + parameter);
+                }
+                String name = parameter.substring(0, equalsIndex).trim();
+                if (!"q".equals(name)) {
+                    throw new BadRequestException("Unsupported parameter: " + parameter);
+                }
+                String value = parameter.substring(equalsIndex + 1).trim();
+                qualityValue = QualityValue.valueOf(value);
+            }
+
+            content = content.trim();
+            if (content.length() == 0) {
+                throw new BadRequestException("Empty Field in header: " + header);
+            }
+            if (content.equals("*")) {
+                result.put(null, qualityValue);
+            } else {
+                result.put(content, qualityValue);
+            }
+
+            if (endIndex < 0) {
+                break;
+            }
+            offset = endIndex + 1;
+        }
+
+        return result;
+    }
+
+    /**
+     * Gets the locales from a comma-separated list.
+     * Any "*" entries are replaced with {@code null} keys.
+     *
+     * @param header the header value.
+     * @return the listed items in order of appearance or {@code null} if the header didn't contain any entries.
+     */
+    public static Map<Locale, QualityValue> getLocaleQualityValues(String header) {
+        Map<String, QualityValue> stringResult = getStringQualityValues(header);
+        if (stringResult == null)
+            return null;
+        Map<Locale, QualityValue> result = new LinkedHashMap<Locale, QualityValue>(stringResult.size() * 2);
+
+        for (Entry<String, QualityValue> entry : stringResult.entrySet()) {
+            QualityValue quality = entry.getValue();
+            Locale locale = null;
+            String value = entry.getKey();
+            if (value != null) {
+                int length = value.length();
+                if (length == 2) {
+                    locale = new Locale(value);
+                } else if (length == 5 && value.charAt(2) == '-') {
+                    String language = value.substring(0, 2);
+                    String country = value.substring(3, 5);
+                    locale = new Locale(language, country);
+                } else {
+                    //LogMessages.LOGGER.ignoringUnsupportedLocale(value);
+                    continue;
+                }
+            }
+            result.put(locale, quality);
+        }
+
+        //LogMessages.LOGGER.debug(result.toString());
+        return result;
+    }
+
+    /**
+     * Gets the media types from a comma-separated list.
+     *
+     * @param header the header value.
+     * @return the listed items in order of appearance or {@code null} if the header didn't contain any entries.
+     */
+    public static Map<MediaType, QualityValue> getMediaTypeQualityValues(String header) {
+        if (header == null)
+            return null;
+        header = header.trim();
+        if (header.length() == 0)
+            return null;
+        Map<MediaType, QualityValue> result = new LinkedHashMap<MediaType, QualityValue>();
+
+        int offset = 0;
+        while (offset >= 0) {
+            int slashIndex = header.indexOf('/', offset);
+            if (slashIndex < 0)
+                throw new BadRequestException("Malformed media type: " + header);
+            String type = header.substring(offset, slashIndex);
+            String subtype;
+            Map<String, String> parameters = null;
+            QualityValue qualityValue = QualityValue.DEFAULT;
+
+            offset = slashIndex + 1;
+            int parameterStartIndex = header.indexOf(';', offset);
+            int itemEndIndex = header.indexOf(',', offset);
+            if (parameterStartIndex == itemEndIndex) {
+                assert itemEndIndex == -1;
+                subtype = header.substring(offset);
+                offset = -1;
+            } else if (itemEndIndex < 0 || (parameterStartIndex >= 0 && parameterStartIndex < itemEndIndex)) {
+                subtype = header.substring(offset, parameterStartIndex);
+                offset = parameterStartIndex + 1;
+                parameters = new LinkedHashMap<String, String>();
+                offset = parseParameters(parameters, header, offset);
+                qualityValue = evaluateAcceptParameters(parameters);
+            } else {
+                subtype = header.substring(offset, itemEndIndex);
+                offset = itemEndIndex + 1;
+            }
+            result.put(new MediaType(type.trim(), subtype.trim(), parameters), qualityValue);
+        }
+
+        //LogMessages.LOGGER.debug(result.toString());
+        return result;
+    }
+
+    private static int parseParameters(Map<String, String> parameters, String header, int offset) {
+        while (true) {
+            int equalsIndex = header.indexOf('=', offset);
+            if (equalsIndex < 0)
+                throw new BadRequestException("Malformed parameters: " + header);
+            String name = header.substring(offset, equalsIndex).trim();
+            offset = equalsIndex + 1;
+            if (header.charAt(offset) == '"') {
+                int end = offset;
+                ++offset;
+                do {
+                    end = header.indexOf('"', ++end);
+                    if (end < 0)
+                        throw new BadRequestException("Unclosed quotes:" + header);
+                } while (header.charAt(end - 1) == '\\');
+                String value = header.substring(offset, end);
+                parameters.put(name, value);
+                offset = end + 1;
+
+                int parameterEndIndex = header.indexOf(';', offset);
+                int itemEndIndex = header.indexOf(',', offset);
+                if (parameterEndIndex == itemEndIndex) {
+                    assert itemEndIndex == -1;
+                    if (header.substring(offset).trim().length() != 0)
+                        throw new BadRequestException("Extra characters after quoted string:" + header);
+                    return -1;
+                } else if (parameterEndIndex < 0 || (itemEndIndex >= 0 && itemEndIndex < parameterEndIndex)) {
+                    if (header.substring(offset, itemEndIndex).trim().length() != 0)
+                        throw new BadRequestException("Extra characters after quoted string:" + header);
+                    return itemEndIndex + 1;
+                } else {
+                    if (header.substring(offset, parameterEndIndex).trim().length() != 0)
+                        throw new BadRequestException("Extra characters after quoted string:" + header);
+                    offset = parameterEndIndex + 1;
+                }
+            } else {
+                int parameterEndIndex = header.indexOf(';', offset);
+                int itemEndIndex = header.indexOf(',', offset);
+                if (parameterEndIndex == itemEndIndex) {
+                    assert itemEndIndex == -1;
+                    String value = header.substring(offset).trim();
+                    parameters.put(name, value);
+                    return -1;
+                } else if (parameterEndIndex < 0 || (itemEndIndex >= 0 && itemEndIndex < parameterEndIndex)) {
+                    String value = header.substring(offset, itemEndIndex).trim();
+                    parameters.put(name, value);
+                    return itemEndIndex + 1;
+                } else {
+                    String value = header.substring(offset, parameterEndIndex).trim();
+                    parameters.put(name, value);
+                    offset = parameterEndIndex + 1;
+                }
+            }
+        }
+    }
+
+    /**
+     * Evaluates and removes the accept parameters.
+     * 
+     * <pre>
+     * accept-params  = ";" "q" "=" qvalue *( accept-extension )
+     * accept-extension = ";" token [ "=" ( token | quoted-string ) ]
+     * </pre>
+     *
+     * @param parameters all parameters in order of appearance.
+     * @return the qvalue.
+     * @see "accept-params
+     */
+    private static QualityValue evaluateAcceptParameters(Map<String, String> parameters) {
+        Iterator<String> i = parameters.keySet().iterator();
+        while (i.hasNext()) {
+            String name = i.next();
+            if ("q".equals(name)) {
+                if (i.hasNext()) {
+                    //LogMessages.LOGGER.acceptExtensionsNotSupported();
+                    i.remove();
+                    do {
+                        i.next();
+                        i.remove();
+                    } while (i.hasNext());
+                    return QualityValue.NOT_ACCEPTABLE;
+                } else {
+                    String value = parameters.get(name);
+                    i.remove();
+                    return QualityValue.valueOf(value);
+                }
+            }
+        }
+        return QualityValue.DEFAULT;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java
new file mode 100644
index 0000000000000..2a6055b1ce441
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/QualityValue.java
@@ -0,0 +1,109 @@
+package org.jboss.resteasy.reactive.server.core.request;
+
+import javax.ws.rs.BadRequestException;
+
+/**
+ * @author Pascal S. de Kloe
+ * @see "RFC2616 3.9 Quality Values"
+ */
+public final class QualityValue extends Number implements Comparable<QualityValue> {
+
+    public static final QualityValue NOT_ACCEPTABLE = new QualityValue(0);
+    public static final QualityValue LOWEST = new QualityValue(1);
+    public static final QualityValue HIGHEST = new QualityValue(1000);
+    public static final QualityValue DEFAULT = HIGHEST;
+
+    private static final long serialVersionUID = 1L;
+    private static final String MALFORMED_VALUE_MESSAGE = "Malformed quality value.";
+    private final int WEIGHT;
+
+    private QualityValue(final int weight) {
+        assert weight >= 0;
+        assert weight <= 1000;
+        WEIGHT = weight;
+    }
+
+    /**
+     * @param qvalue the quality value or {@code null} if undefined.
+     * @return {@link QualityValue}
+     */
+    public static QualityValue valueOf(String qvalue) {
+        if (qvalue == null)
+            return DEFAULT;
+        return new QualityValue(parseAsInteger(qvalue));
+    }
+
+    public boolean isPrefered() {
+        return WEIGHT == HIGHEST.WEIGHT;
+    }
+
+    public boolean isAcceptable() {
+        return WEIGHT != NOT_ACCEPTABLE.WEIGHT;
+    }
+
+    public int compareTo(QualityValue o) {
+        return WEIGHT - o.WEIGHT;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || o.getClass() != QualityValue.class)
+            return false;
+        QualityValue other = (QualityValue) o;
+        return WEIGHT == other.WEIGHT;
+    }
+
+    @Override
+    public int hashCode() {
+        return WEIGHT;
+    }
+
+    @Override
+    public double doubleValue() {
+        return (double) WEIGHT / 1000d;
+    }
+
+    @Override
+    public float floatValue() {
+        return (float) WEIGHT / 1000f;
+    }
+
+    @Override
+    public int intValue() {
+        return WEIGHT;
+    }
+
+    @Override
+    public long longValue() {
+        return WEIGHT;
+    }
+
+    private static int parseAsInteger(String value) {
+        int length = value.length();
+        if (length == 0 || length > 5)
+            throw new BadRequestException(MALFORMED_VALUE_MESSAGE);
+        if (length > 1 && value.charAt(1) != '.')
+            throw new BadRequestException(MALFORMED_VALUE_MESSAGE);
+        int firstCharacter = value.codePointAt(0);
+        if (firstCharacter == '1') {
+            for (int i = 2; i < length; ++i)
+                if (value.charAt(i) != '0')
+                    throw new BadRequestException(MALFORMED_VALUE_MESSAGE);
+            return 1000;
+        } else if (firstCharacter == '0') {
+            int weight = 0;
+            for (int i = 2; i < 5; ++i) {
+                weight *= 10;
+                if (i < length) {
+                    int digit = value.codePointAt(i) - '0';
+                    if (digit < 0 || digit > 9)
+                        throw new BadRequestException(MALFORMED_VALUE_MESSAGE);
+                    weight += digit;
+                }
+            }
+            return weight;
+        } else
+            throw new BadRequestException(MALFORMED_VALUE_MESSAGE);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java
new file mode 100644
index 0000000000000..455c8ce40f7c9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/ServerDrivenNegotiation.java
@@ -0,0 +1,398 @@
+package org.jboss.resteasy.reactive.server.core.request;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Variant;
+
+/**
+ * {@link Variant} selection.
+ *
+ * @author Pascal S. de Kloe
+ * @see "RFC 2296"
+ */
+public class ServerDrivenNegotiation {
+
+    private Map<MediaType, QualityValue> requestedMediaTypes = null;
+    private Map<String, QualityValue> requestedCharacterSets = null;
+    private Map<String, QualityValue> requestedEncodings = null;
+    private Map<Locale, QualityValue> requestedLanguages = null;
+    private int mediaRadix = 1;
+
+    public ServerDrivenNegotiation() {
+    }
+
+    public void setAcceptHeaders(List<String> headerValues) {
+        requestedMediaTypes = null;
+        if (headerValues == null)
+            return;
+        Map<MediaType, QualityValue> requested = null;
+        for (String headerValue : headerValues) {
+            Map<MediaType, QualityValue> mapping = AcceptHeaders.getMediaTypeQualityValues(headerValue);
+            if (mapping == null)
+                return;
+            if (requested == null)
+                requested = mapping;
+            else
+                requested.putAll(mapping);
+        }
+        requestedMediaTypes = requested;
+        for (Iterator<MediaType> it = requested.keySet().iterator(); it.hasNext();) {
+            mediaRadix = Math.max(mediaRadix, it.next().getParameters().size());
+        }
+    }
+
+    public void setAcceptCharsetHeaders(List<String> headerValues) {
+        requestedCharacterSets = null;
+        if (headerValues == null)
+            return;
+        Map<String, QualityValue> requested = null;
+        for (String headerValue : headerValues) {
+            Map<String, QualityValue> mapping = AcceptHeaders.getStringQualityValues(headerValue);
+            if (mapping == null)
+                return;
+            if (requested == null)
+                requested = mapping;
+            else
+                requested.putAll(mapping);
+        }
+        requestedCharacterSets = requested;
+    }
+
+    public void setAcceptEncodingHeaders(List<String> headerValues) {
+        requestedEncodings = null;
+        if (headerValues == null)
+            return;
+        Map<String, QualityValue> requested = null;
+        for (String headerValue : headerValues) {
+            Map<String, QualityValue> mapping = AcceptHeaders.getStringQualityValues(headerValue);
+            if (mapping == null)
+                return;
+            if (requested == null)
+                requested = mapping;
+            else
+                requested.putAll(mapping);
+        }
+        requestedEncodings = requested;
+    }
+
+    public void setAcceptLanguageHeaders(List<String> headerValues) {
+        requestedLanguages = null;
+        if (headerValues == null)
+            return;
+        Map<Locale, QualityValue> requested = null;
+        for (String headerValue : headerValues) {
+            Map<Locale, QualityValue> mapping = AcceptHeaders.getLocaleQualityValues(headerValue);
+            if (mapping == null)
+                return;
+            if (requested == null)
+                requested = mapping;
+            else
+                requested.putAll(mapping);
+        }
+        requestedLanguages = requested;
+    }
+
+    public Variant getBestMatch(List<Variant> available) {
+        //      BigDecimal bestQuality = BigDecimal.ZERO;
+        VariantQuality bestQuality = null;
+        Variant bestOption = null;
+        for (Variant option : available) {
+            VariantQuality quality = new VariantQuality();
+            if (!applyMediaType(option, quality))
+                continue;
+            if (!applyCharacterSet(option, quality))
+                continue;
+            if (!applyEncoding(option, quality))
+                continue;
+            if (!applyLanguage(option, quality))
+                continue;
+
+            //         BigDecimal optionQuality = quality.getOverallQuality();
+            //         if (isBetterOption(bestQuality, bestOption, optionQuality, option))
+            if (isBetterOption(bestQuality, bestOption, quality, option)) {
+                //            bestQuality = optionQuality;
+                bestQuality = quality;
+                bestOption = option;
+            }
+        }
+        return bestOption;
+    }
+
+    /**
+     * Tests whether {@code option} is preferable over the current {@code bestOption}.
+     */
+    //   private static boolean isBetterOption(BigDecimal bestQuality, Variant best,
+    //                                         BigDecimal optionQuality, Variant option)
+    private static boolean isBetterOption(VariantQuality bestQuality, Variant best,
+            VariantQuality optionQuality, Variant option) {
+        if (best == null)
+            return true;
+
+        // Compare overall quality.
+        int signum = bestQuality.getOverallQuality().compareTo(optionQuality.getOverallQuality());
+        if (signum != 0)
+            return signum < 0;
+
+        // Overall quality is the same.
+        // Assuming the request has an Accept header, a VariantQuality has a non-null
+        // requestMediaType if and only if it the corresponding Variant has a non-null mediaType.
+        // If bestQuality and optionQuality both have a non-null requestMediaType, we compare them
+        // for specificity.
+        MediaType bestRequestMediaType = bestQuality.getRequestMediaType();
+        MediaType optionRequestMediaType = optionQuality.getRequestMediaType();
+        if (bestRequestMediaType != null && optionRequestMediaType != null) {
+            if (bestRequestMediaType.getType().equals(optionRequestMediaType.getType())) {
+                if (bestRequestMediaType.getSubtype().equals(optionRequestMediaType.getSubtype())) {
+                    int bestCount = bestRequestMediaType.getParameters().size();
+                    int optionCount = optionRequestMediaType.getParameters().size();
+                    if (optionCount > bestCount) {
+                        return true; // more matching parameters
+                    } else if (optionCount < bestCount) {
+                        return false; // less matching parameters
+                    }
+                } else if (bestRequestMediaType.getSubtype().equals("*")) {
+                    return true;
+                } else if (optionRequestMediaType.getSubtype().equals("*")) {
+                    return false;
+                }
+            } else if (bestRequestMediaType.getType().equals("*")) {
+                return true;
+            } else if (optionRequestMediaType.getType().equals("*")) {
+                return false;
+            }
+        }
+
+        // Compare variant media types for specificity.
+        MediaType bestType = best.getMediaType();
+        MediaType optionType = option.getMediaType();
+        if (bestType != null && optionType != null) {
+            if (bestType.getType().equals(optionType.getType())) {
+                // Same type
+                if (bestType.getSubtype().equals(optionType.getSubtype())) {
+                    // Same subtype
+                    int bestCount = bestType.getParameters().size();
+                    int optionCount = optionType.getParameters().size();
+                    if (optionCount > bestCount)
+                        return true; // more matching parameters
+                    else if (optionCount < bestCount)
+                        return false; // less matching parameters
+                } else if ("*".equals(bestType.getSubtype())) {
+                    return true; // more specific subtype
+                } else if ("*".equals(optionType.getSubtype())) {
+                    return false; // less specific subtype
+                }
+            } else if ("*".equals(bestType.getType())) {
+                return true; // more specific type
+            } else if ("*".equals(optionType.getType())) {
+                return false; // less specific type;
+            }
+        }
+
+        // Finally, compare specificity of the variants.
+        return getExplicitness(best) < getExplicitness(option);
+    }
+
+    private static int getExplicitness(Variant variant) {
+        int explicitness = 0;
+        if (variant.getMediaType() != null) {
+            ++explicitness;
+        }
+        if (variant.getEncoding() != null) {
+            ++explicitness;
+        }
+        if (variant.getLanguage() != null) {
+            ++explicitness;
+        }
+        return explicitness;
+    }
+
+    private boolean applyMediaType(Variant option, VariantQuality quality) {
+        if (requestedMediaTypes == null)
+            return true;
+        MediaType mediaType = option.getMediaType();
+        if (mediaType == null)
+            return true;
+
+        String type = mediaType.getType();
+        if ("*".equals(type)) {
+            type = null;
+        }
+        String subtype = mediaType.getSubtype();
+        if ("*".equals(subtype)) {
+            subtype = null;
+        }
+        Map<String, String> parameters = mediaType.getParameters();
+        if (parameters.isEmpty())
+            parameters = null;
+
+        QualityValue bestQuality = QualityValue.NOT_ACCEPTABLE;
+        int bestMatchCount = -1;
+        MediaType bestRequestMediaType = null;
+
+        for (MediaType requested : requestedMediaTypes.keySet()) {
+            int matchCount = 0;
+            if (type != null) {
+                String requestedType = requested.getType();
+                if (requestedType.equals(type)) {
+                    matchCount += mediaRadix * 100;
+                } else if (!"*".equals(requestedType)) {
+                    continue;
+                }
+            }
+            if (subtype != null) {
+                String requestedSubtype = requested.getSubtype();
+                if (requestedSubtype.equals(subtype)) {
+                    matchCount += mediaRadix * 10;
+                } else if (!"*".equals(requestedSubtype)) {
+                    continue;
+                }
+            }
+            Map<String, String> requestedParameters = requested.getParameters();
+            if (requestedParameters != null && requestedParameters.size() > 0) {
+                if (!hasRequiredParameters(requestedParameters, parameters))
+                    continue;
+                matchCount += requestedParameters.size();
+            }
+
+            if (matchCount > bestMatchCount) {
+                bestMatchCount = matchCount;
+                bestQuality = requestedMediaTypes.get(requested);
+                bestRequestMediaType = requested;
+            } else if (matchCount == bestMatchCount) {
+                QualityValue qualityValue = requestedMediaTypes.get(requested);
+                if (bestQuality.compareTo(qualityValue) < 0) {
+                    bestQuality = qualityValue;
+                    bestRequestMediaType = requested;
+                }
+            }
+        }
+
+        if (!bestQuality.isAcceptable()) {
+            return false;
+        }
+
+        quality.setMediaTypeQualityValue(bestQuality)
+                .setRequestMediaType(bestRequestMediaType);
+        return true;
+    }
+
+    private boolean hasRequiredParameters(Map<String, String> required, Map<String, String> available) {
+        if (available == null) {
+            return false;
+        }
+        for (Map.Entry<String, String> requiredEntry : required.entrySet()) {
+            String name = requiredEntry.getKey();
+            String value = requiredEntry.getValue();
+            String availableValue = available.get(name);
+            if (availableValue == null && "charset".equals(name)) {
+                if (requestedCharacterSets != null
+                        && !requestedCharacterSets.containsKey(null)
+                        && !requestedCharacterSets.containsKey(value)) {
+                    return false;
+                }
+            } else if (!value.equals(availableValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean applyCharacterSet(Variant option, VariantQuality quality) {
+        if (requestedCharacterSets == null)
+            return true;
+        MediaType mediaType = option.getMediaType();
+        if (mediaType == null) {
+            return true;
+        }
+        String charsetParameter = mediaType.getParameters().get("charset");
+        if (charsetParameter == null) {
+            return true;
+        }
+        QualityValue value = requestedCharacterSets.get(charsetParameter);
+        if (value == null) { // try wildcard
+            value = requestedCharacterSets.get(null);
+        }
+        if (value == null) { // no match
+            return false;
+        }
+        if (!value.isAcceptable()) {
+            return false;
+        }
+        quality.setCharacterSetQualityValue(value);
+        return true;
+    }
+
+    private boolean applyEncoding(Variant option, VariantQuality quality) {
+        if (requestedEncodings == null)
+            return true;
+        String encoding = option.getEncoding();
+        if (encoding == null)
+            return true;
+        QualityValue value = requestedEncodings.get(encoding);
+        if (value == null) { // try wildcard
+            value = requestedEncodings.get(null);
+        }
+        if (value == null) { // no match
+            return false;
+        }
+        if (!value.isAcceptable()) {
+            return false;
+        }
+        quality.setEncodingQualityValue(value);
+        return true;
+    }
+
+    private boolean hasCountry(Locale locale) {
+        return locale.getCountry() != null && !"".equals(locale.getCountry().trim());
+    }
+
+    private boolean applyLanguage(Variant option, VariantQuality quality) {
+        if (requestedLanguages == null) {
+            return true;
+        }
+        Locale language = option.getLanguage();
+        if (language == null) {
+            return true;
+        }
+        QualityValue value = null;
+        for (Map.Entry<Locale, QualityValue> entry : requestedLanguages.entrySet()) {
+            Locale locale = entry.getKey();
+            QualityValue qualityValue = entry.getValue();
+            if (locale == null) {
+                continue;
+            }
+
+            if (locale.getLanguage().equalsIgnoreCase(language.getLanguage())) {
+                if (hasCountry(locale) && hasCountry(language)) {
+                    if (locale.getCountry().equalsIgnoreCase(language.getCountry())) {
+                        value = qualityValue;
+                        break;
+                    } else {
+                        continue;
+                    }
+                } else if (hasCountry(locale) == hasCountry(language)) {
+                    value = qualityValue;
+                    break;
+                } else {
+                    value = qualityValue; // might be a better match so re-loop
+                }
+            }
+        }
+
+        if (value == null) {// try wildcard
+            value = requestedLanguages.get(null);
+        }
+        if (value == null) {// no match
+            return false;
+        }
+        if (!value.isAcceptable()) {
+            return false;
+        }
+        quality.setLanguageQualityValue(value);
+        return true;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java
new file mode 100644
index 0000000000000..63cb5a6991eca
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/request/VariantQuality.java
@@ -0,0 +1,96 @@
+package org.jboss.resteasy.reactive.server.core.request;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+import javax.ws.rs.core.MediaType;
+
+/**
+ * A individual variant quality bean for the RVSA (Remote Variant Selection Algorithm).
+ *
+ * @author Pascal S. de Kloe
+ * @see "RFC 2296"
+ */
+public class VariantQuality {
+
+    private QualityValue mediaTypeQualityValue = QualityValue.DEFAULT;
+    private QualityValue characterSetQualityValue = QualityValue.DEFAULT;
+    private QualityValue encodingQualityValue = QualityValue.DEFAULT;
+    private QualityValue languageQualityValue = QualityValue.DEFAULT;
+
+    private MediaType requestMediaType;
+
+    public VariantQuality() {
+    }
+
+    public VariantQuality setMediaTypeQualityValue(QualityValue value) {
+        if (value == null) {
+            mediaTypeQualityValue = QualityValue.DEFAULT;
+        } else {
+            mediaTypeQualityValue = value;
+        }
+        return this;
+    }
+
+    public VariantQuality setCharacterSetQualityValue(QualityValue value) {
+        if (value == null) {
+            characterSetQualityValue = QualityValue.DEFAULT;
+        } else {
+            characterSetQualityValue = value;
+        }
+        return this;
+    }
+
+    public VariantQuality setEncodingQualityValue(QualityValue value) {
+        if (value == null) {
+            encodingQualityValue = QualityValue.DEFAULT;
+        } else {
+            encodingQualityValue = value;
+        }
+        return this;
+    }
+
+    public VariantQuality setLanguageQualityValue(QualityValue value) {
+        if (value == null) {
+            languageQualityValue = QualityValue.DEFAULT;
+        } else {
+            languageQualityValue = value;
+        }
+        return this;
+    }
+
+    public MediaType getRequestMediaType() {
+        return requestMediaType;
+    }
+
+    public void setRequestMediaType(MediaType requestMediaType) {
+        this.requestMediaType = requestMediaType;
+    }
+
+    /**
+     * @return the quality value between zero and one with five decimal places after the point.
+     * @see "3.3 Computing overall quality values"
+     */
+    public BigDecimal getOverallQuality() {
+        BigDecimal qt = BigDecimal.valueOf(mediaTypeQualityValue.intValue(), 3);
+        BigDecimal qc = BigDecimal.valueOf(characterSetQualityValue.intValue(), 3);
+        BigDecimal qe = BigDecimal.valueOf(encodingQualityValue.intValue(), 3);
+        BigDecimal ql = BigDecimal.valueOf(languageQualityValue.intValue(), 3);
+        assert qt.compareTo(BigDecimal.ZERO) >= 0 && qt.compareTo(BigDecimal.ONE) <= 0;
+        assert qc.compareTo(BigDecimal.ZERO) >= 0 && qc.compareTo(BigDecimal.ONE) <= 0;
+        assert qe.compareTo(BigDecimal.ZERO) >= 0 && qe.compareTo(BigDecimal.ONE) <= 0;
+        assert ql.compareTo(BigDecimal.ZERO) >= 0 && ql.compareTo(BigDecimal.ONE) <= 0;
+
+        BigDecimal result = qt;
+        result = result.multiply(qc, MathContext.DECIMAL32);
+        result = result.multiply(qe, MathContext.DECIMAL32);
+        result = result.multiply(ql, MathContext.DECIMAL32);
+        assert result.compareTo(BigDecimal.ZERO) >= 0 && result.compareTo(BigDecimal.ONE) <= 0;
+
+        long round5 = result.scaleByPowerOfTen(5).longValue();
+        result = BigDecimal.valueOf(round5, 5);
+        assert result.compareTo(BigDecimal.ZERO) >= 0 && result.compareTo(BigDecimal.ONE) <= 0;
+
+        return result;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java
new file mode 100644
index 0000000000000..41466deba9423
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/DynamicEntityWriter.java
@@ -0,0 +1,98 @@
+package org.jboss.resteasy.reactive.server.core.serialization;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.server.core.EncodedMediaType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+
+/**
+ * Writer that is fully dynamic, and follows the spec defined resolution process
+ */
+public class DynamicEntityWriter implements EntityWriter {
+
+    private final ServerSerialisers serialisers;
+
+    public DynamicEntityWriter(ServerSerialisers serialisers) {
+        this.serialisers = serialisers;
+    }
+
+    @Override
+    public void write(ResteasyReactiveRequestContext context, Object entity) throws IOException {
+        EncodedMediaType producesMediaType = context.getResponseContentType();
+        MessageBodyWriter<?>[] writers = null;
+        if (producesMediaType == null) {
+            MediaType selectedMediaType = null;
+            boolean mediaTypeComesFromClient = false;
+            ServerHttpRequest vertxRequest = context.serverRequest();
+            // first check and see if the resource method defined a media type and try to use it
+            if ((context.getTarget() != null) && (context.getTarget().getProduces() != null)) {
+                MediaType res = context.getTarget().getProduces()
+                        .negotiateProduces(vertxRequest.getRequestHeader(HttpHeaders.ACCEPT)).getKey();
+                List<MessageBodyWriter<?>> writersList = serialisers.findWriters(null, entity.getClass(), res,
+                        RuntimeType.SERVER);
+                if (!writersList.isEmpty()) {
+                    writers = writersList.toArray(new MessageBodyWriter[0]);
+                    // use the actual type the method declares as this is what the spec expects despite the fact that we might
+                    // have used the suffix of the subtype to determine a MessageBodyWriter
+                    selectedMediaType = context.getTarget().getProduces().getSortedOriginalMediaTypes()[0];
+                }
+            } else if (vertxRequest.getRequestHeader(HttpHeaders.ACCEPT) != null
+                    && !MediaType.WILDCARD.equals(vertxRequest.getRequestHeader(HttpHeaders.ACCEPT))) {
+                // try and find a writer based on the 'Accept' header match
+
+                ServerSerialisers.BestMatchingServerWriterResult bestMatchingServerWriterResult = serialisers
+                        .findBestMatchingServerWriter(null, entity.getClass(), vertxRequest);
+                if (!bestMatchingServerWriterResult.isEmpty()) {
+                    selectedMediaType = bestMatchingServerWriterResult.getSelectedMediaType();
+                    mediaTypeComesFromClient = true;
+                    writers = bestMatchingServerWriterResult.getMessageBodyWriters().toArray(ServerSerialisers.NO_WRITER);
+                }
+            }
+            // try to find a Writer based on the entity type
+            if (writers == null) {
+                ServerSerialisers.NoMediaTypeResult writerNoMediaType = serialisers.findWriterNoMediaType(context, entity,
+                        serialisers, RuntimeType.SERVER);
+                writers = writerNoMediaType.getWriters();
+                selectedMediaType = writerNoMediaType.getMediaType();
+            }
+            if (selectedMediaType != null) {
+                if (MediaTypeHelper.isUnsupportedWildcardSubtype(selectedMediaType) && !mediaTypeComesFromClient) { // spec says the acceptable wildcard subtypes are */* or application/*
+                    ServerSerialisers.encodeResponseHeaders(context);
+                    // set the response header AFTER encodeResponseHeaders in order to override what Response has as we want this to be the final result
+                    ServerHttpResponse httpServerResponse = context.serverResponse();
+                    httpServerResponse.setStatusCode(Response.Status.NOT_ACCEPTABLE.getStatusCode());
+                    // spec says the response doesn't have a body so we just end the response here and return
+                    httpServerResponse.end();
+                    return;
+                } else {
+                    context.setResponseContentType(selectedMediaType);
+                    // this will be used as the fallback if Response does NOT contain a type
+                    context.serverResponse().addResponseHeader(HttpHeaders.CONTENT_TYPE, selectedMediaType.toString());
+                }
+            }
+        } else {
+            writers = serialisers
+                    .findWriters(null, entity.getClass(), MediaTypeHelper.withSuffixAsSubtype(producesMediaType.getMediaType()),
+                            RuntimeType.SERVER)
+                    .toArray(ServerSerialisers.NO_WRITER);
+        }
+        for (MessageBodyWriter<?> w : writers) {
+            if (ServerSerialisers.invokeWriter(context, entity, w, serialisers)) {
+                return;
+            }
+        }
+        throw new InternalServerErrorException("Could not find MessageBodyWriter for " + entity.getClass(),
+                Response.serverError().build());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java
new file mode 100644
index 0000000000000..f0cf9c112523c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/EntityWriter.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.server.core.serialization;
+
+import java.io.IOException;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+/**
+ * An interface that can be used to write out an entity.
+ * 
+ * In practical terms these represent a set of {@link javax.ws.rs.ext.MessageBodyWriter}
+ * implementations. As must as possible the implementations are resolved at build time, however
+ * the spec does allow for dynamic behaviour, which is abstracted behind this interface.
+ * 
+ */
+public interface EntityWriter {
+
+    void write(ResteasyReactiveRequestContext context, Object entity) throws IOException;
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java
new file mode 100644
index 0000000000000..8f3e284615ff4
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriter.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.server.core.serialization;
+
+import java.io.IOException;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+
+/**
+ * A fixed entity writer that can be used when we know the result will always be written
+ * by a given provider.
+ */
+public class FixedEntityWriter implements EntityWriter {
+
+    private final MessageBodyWriter writer;
+    private final ServerSerialisers serialisers;
+
+    public FixedEntityWriter(MessageBodyWriter writer, ServerSerialisers serialisers) {
+        this.writer = writer;
+        this.serialisers = serialisers;
+    }
+
+    @Override
+    public void write(ResteasyReactiveRequestContext context, Object entity) throws IOException {
+        if (!ServerSerialisers.invokeWriter(context, entity, writer, serialisers)) {
+            throw new InternalServerErrorException("Could not find MessageBodyWriter for " + entity.getClass(),
+                    Response.serverError().build());
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java
new file mode 100644
index 0000000000000..375ae48b5faf5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/FixedEntityWriterArray.java
@@ -0,0 +1,35 @@
+package org.jboss.resteasy.reactive.server.core.serialization;
+
+import java.io.IOException;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+
+/**
+ * A fixed entity writer that iterates an array of providers until it finds one that can handle
+ * the given types.
+ */
+public class FixedEntityWriterArray implements EntityWriter {
+
+    private final MessageBodyWriter[] writers;
+    private final ServerSerialisers serialisers;
+
+    public FixedEntityWriterArray(MessageBodyWriter[] writers, ServerSerialisers serialisers) {
+        this.writers = writers;
+        this.serialisers = serialisers;
+    }
+
+    @Override
+    public void write(ResteasyReactiveRequestContext context, Object entity) throws IOException {
+        for (int i = 0; i < writers.length; ++i) {
+            MessageBodyWriter writer = writers[i];
+            if (ServerSerialisers.invokeWriter(context, entity, writer, serialisers)) {
+                return;
+            }
+        }
+        throw new InternalServerErrorException("Could not find MessageBodyWriter for " + entity.getClass(),
+                Response.serverError().build());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java
new file mode 100644
index 0000000000000..e46b79171a730
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/MediaTypeDelegatingEntityWriter.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.server.core.serialization;
+
+import java.io.IOException;
+import java.util.Map;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+/**
+ * An entity writer that will delegate based on the actual type of the
+ * returned entity.
+ */
+public class MediaTypeDelegatingEntityWriter implements EntityWriter {
+
+    private final Map<MediaType, EntityWriter> typeMap;
+
+    public MediaTypeDelegatingEntityWriter(Map<MediaType, EntityWriter> typeMap) {
+        this.typeMap = typeMap;
+    }
+
+    @Override
+    public void write(ResteasyReactiveRequestContext context, Object entity) throws IOException {
+        EntityWriter delegate = typeMap.get(context.getResponseMediaType());
+        if (delegate != null) {
+            delegate.write(context, entity);
+            return;
+        }
+        throw new InternalServerErrorException("Could not find MessageBodyWriter for " + entity.getClass(),
+                Response.serverError().build());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java
new file mode 100644
index 0000000000000..2fd3e3dc581d8
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/serialization/TypeDelegatingEntityWriter.java
@@ -0,0 +1,35 @@
+package org.jboss.resteasy.reactive.server.core.serialization;
+
+import java.io.IOException;
+import java.util.Map;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+/**
+ * An entity writer that will delegate based on the actual type of the
+ * returned entity.
+ */
+public class TypeDelegatingEntityWriter implements EntityWriter {
+
+    private final Map<Class<?>, EntityWriter> typeMap;
+
+    public TypeDelegatingEntityWriter(Map<Class<?>, EntityWriter> typeMap) {
+        this.typeMap = typeMap;
+    }
+
+    @Override
+    public void write(ResteasyReactiveRequestContext context, Object entity) throws IOException {
+        Class<?> c = entity.getClass();
+        while (c != null) {
+            EntityWriter delegate = typeMap.get(c);
+            if (delegate != null) {
+                delegate.write(context, entity);
+                return;
+            }
+            c = c.getSuperclass();
+        }
+        throw new InternalServerErrorException("Could not find MessageBodyWriter for " + entity.getClass(),
+                Response.serverError().build());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/CustomServerRestHandlers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/CustomServerRestHandlers.java
new file mode 100644
index 0000000000000..1d0c7e2db1611
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/CustomServerRestHandlers.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server.core.startup;
+
+import java.util.function.Supplier;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public final class CustomServerRestHandlers {
+
+    private final Supplier<ServerRestHandler> blockingInputHandlerSupplier;
+    private final Supplier<ServerRestHandler> multipartHandlerSupplier;
+
+    public CustomServerRestHandlers(Supplier<ServerRestHandler> blockingInputHandlerSupplier,
+            Supplier<ServerRestHandler> multipartHandlerSupplier) {
+        this.blockingInputHandlerSupplier = blockingInputHandlerSupplier;
+        this.multipartHandlerSupplier = multipartHandlerSupplier;
+    }
+
+    public Supplier<ServerRestHandler> getBlockingInputHandlerSupplier() {
+        return blockingInputHandlerSupplier;
+    }
+
+    public Supplier<ServerRestHandler> getMultipartHandlerSupplier() {
+        return multipartHandlerSupplier;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java
new file mode 100644
index 0000000000000..6d6c860307054
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java
@@ -0,0 +1,255 @@
+package org.jboss.resteasy.reactive.server.core.startup;
+
+import static org.jboss.resteasy.reactive.common.util.DeploymentUtils.loadClass;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Feature;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.ResourceClass;
+import org.jboss.resteasy.reactive.common.model.ResourceFeature;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.DeploymentInfo;
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+import org.jboss.resteasy.reactive.server.core.RequestContextFactory;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.core.serialization.DynamicEntityWriter;
+import org.jboss.resteasy.reactive.server.handlers.ClassRoutingHandler;
+import org.jboss.resteasy.reactive.server.handlers.ExceptionHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResourceLocatorHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResourceRequestFilterHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResponseHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResponseWriterHandler;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+import org.jboss.resteasy.reactive.server.jaxrs.FeatureContextImpl;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.mapping.URITemplate;
+import org.jboss.resteasy.reactive.server.model.Features;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.server.model.ServerResourceMethod;
+import org.jboss.resteasy.reactive.server.spi.RuntimeConfigurableServerRestHandler;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class RuntimeDeploymentManager {
+    public static final ServerRestHandler[] EMPTY_REST_HANDLER_ARRAY = new ServerRestHandler[0];
+    private final DeploymentInfo info;
+    private final Supplier<Executor> executorSupplier;
+    private final CustomServerRestHandlers customServerRestHandlers;
+    private final Consumer<Closeable> closeTaskHandler;
+    private final RequestContextFactory requestContextFactory;
+    private final ThreadSetupAction threadSetupAction;
+    private final String rootPath;
+
+    public RuntimeDeploymentManager(DeploymentInfo info,
+            Supplier<Executor> executorSupplier,
+            CustomServerRestHandlers customServerRestHandlers,
+            Consumer<Closeable> closeTaskHandler,
+            RequestContextFactory requestContextFactory, ThreadSetupAction threadSetupAction, String rootPath) {
+        this.info = info;
+        this.executorSupplier = executorSupplier;
+        this.customServerRestHandlers = customServerRestHandlers;
+        this.closeTaskHandler = closeTaskHandler;
+        this.requestContextFactory = requestContextFactory;
+        this.threadSetupAction = threadSetupAction;
+        this.rootPath = rootPath;
+    }
+
+    public Deployment deploy() {
+        ResourceInterceptors interceptors = info.getInterceptors();
+        ServerSerialisers serialisers = info.getSerialisers();
+        Features features = info.getFeatures();
+        ExceptionMapping exceptionMapping = info.getExceptionMapping();
+        List<ResourceClass> resourceClasses = info.getResourceClasses();
+        List<ResourceClass> locatableResourceClasses = info.getLocatableResourceClasses();
+        ParamConverterProviders paramConverterProviders = info.getParamConverterProviders();
+        Supplier<Application> applicationSupplier = info.getApplicationSupplier();
+        String applicationPath = info.getApplicationPath();
+
+        DynamicEntityWriter dynamicEntityWriter = new DynamicEntityWriter(serialisers);
+
+        ConfigurationImpl configurationImpl = configureFeatures(features, interceptors, exceptionMapping);
+
+        RuntimeInterceptorDeployment interceptorDeployment = new RuntimeInterceptorDeployment(info, configurationImpl,
+                closeTaskHandler);
+        ResourceLocatorHandler resourceLocatorHandler = new ResourceLocatorHandler(
+                new Function<Class<?>, BeanFactory.BeanInstance<?>>() {
+                    @Override
+                    public BeanFactory.BeanInstance<?> apply(Class<?> aClass) {
+                        return info.getFactoryCreator().apply(aClass).createInstance();
+                    }
+                });
+        List<RuntimeConfigurableServerRestHandler> runtimeConfigurableServerRestHandlers = new ArrayList<>();
+        RuntimeResourceDeployment runtimeResourceDeployment = new RuntimeResourceDeployment(info, executorSupplier,
+                customServerRestHandlers,
+                interceptorDeployment, dynamicEntityWriter, resourceLocatorHandler, requestContextFactory.isDefaultBlocking());
+        List<ResourceClass> possibleSubResource = new ArrayList<>(locatableResourceClasses);
+        possibleSubResource.addAll(resourceClasses); //the TCK uses normal resources also as sub resources
+        for (ResourceClass clazz : possibleSubResource) {
+            Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>> templates = new HashMap<>();
+            URITemplate classPathTemplate = clazz.getPath() == null ? null : new URITemplate(clazz.getPath(), true);
+            for (ResourceMethod method : clazz.getMethods()) {
+                RuntimeResource runtimeResource = runtimeResourceDeployment.buildResourceMethod(
+                        clazz, (ServerResourceMethod) method, true, classPathTemplate, info);
+                addRuntimeConfigurableHandlers(runtimeResource, runtimeConfigurableServerRestHandlers);
+
+                RuntimeMappingDeployment.buildMethodMapper(templates, method, runtimeResource);
+            }
+            Map<String, RequestMapper<RuntimeResource>> mappersByMethod = RuntimeMappingDeployment.buildClassMapper(templates);
+            resourceLocatorHandler.addResource(loadClass(clazz.getClassName()), mappersByMethod);
+        }
+
+        //it is possible that multiple resource classes use the same path
+        //we use this map to merge them
+        Map<URITemplate, Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>>> mappers = new TreeMap<>();
+
+        for (ResourceClass clazz : resourceClasses) {
+            URITemplate classTemplate = new URITemplate(clazz.getPath(), true);
+            Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>> perClassMappers = mappers
+                    .get(classTemplate);
+            if (perClassMappers == null) {
+                mappers.put(classTemplate, perClassMappers = new HashMap<>());
+            }
+            for (ResourceMethod method : clazz.getMethods()) {
+                RuntimeResource runtimeResource = runtimeResourceDeployment.buildResourceMethod(
+                        clazz, (ServerResourceMethod) method, false, classTemplate, info);
+                addRuntimeConfigurableHandlers(runtimeResource, runtimeConfigurableServerRestHandlers);
+
+                RuntimeMappingDeployment.buildMethodMapper(perClassMappers, method, runtimeResource);
+            }
+
+        }
+        List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers = new ArrayList<>();
+        for (Map.Entry<URITemplate, Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>>> entry : mappers
+                .entrySet()) {
+            URITemplate classTemplate = entry.getKey();
+            int classTemplateNameCount = classTemplate.countPathParamNames();
+            Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>> perClassMappers = entry
+                    .getValue();
+            Map<String, RequestMapper<RuntimeResource>> mappersByMethod = RuntimeMappingDeployment
+                    .buildClassMapper(perClassMappers);
+            ClassRoutingHandler classRoutingHandler = new ClassRoutingHandler(mappersByMethod, classTemplateNameCount);
+
+            int maxMethodTemplateNameCount = 0;
+            for (TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>> i : perClassMappers.values()) {
+                for (URITemplate j : i.keySet()) {
+                    maxMethodTemplateNameCount = Math.max(maxMethodTemplateNameCount, j.countPathParamNames());
+                }
+            }
+            classMappers.add(new RequestMapper.RequestPath<>(true, classTemplate,
+                    new RestInitialHandler.InitialMatch(new ServerRestHandler[] { classRoutingHandler },
+                            maxMethodTemplateNameCount + classTemplateNameCount)));
+        }
+
+        List<ServerRestHandler> abortHandlingChain = new ArrayList<>();
+
+        if (interceptorDeployment.getGlobalInterceptorHandler() != null) {
+            abortHandlingChain.add(interceptorDeployment.getGlobalInterceptorHandler());
+        }
+        abortHandlingChain.add(new ExceptionHandler());
+        if (!interceptors.getContainerResponseFilters().getGlobalResourceInterceptors().isEmpty()) {
+            abortHandlingChain.addAll(interceptorDeployment.getGlobalResponseInterceptorHandlers());
+        }
+        abortHandlingChain.add(new ResponseHandler());
+        abortHandlingChain.add(new ResponseWriterHandler(dynamicEntityWriter));
+        // sanitise the prefix for our usage to make it either an empty string, or something which starts with a / and does not
+        // end with one
+        String prefix = rootPath;
+        if (prefix != null) {
+            prefix = sanitizePathPrefix(prefix);
+        } else {
+            prefix = "";
+        }
+        if ((applicationPath != null) && !applicationPath.isEmpty()) {
+            prefix = prefix + sanitizePathPrefix(applicationPath);
+        }
+
+        //pre matching interceptors are run first
+        List<ServerRestHandler> preMatchHandlers = new ArrayList<>();
+        for (int i = 0; i < info.getGlobalHandlerCustomizers().size(); i++) {
+            preMatchHandlers
+                    .addAll(info.getGlobalHandlerCustomizers().get(i).handlers(HandlerChainCustomizer.Phase.BEFORE_PRE_MATCH));
+        }
+        if (!interceptors.getContainerRequestFilters().getPreMatchInterceptors().isEmpty()) {
+            preMatchHandlers = new ArrayList<>(interceptorDeployment.getPreMatchContainerRequestFilters().size());
+            for (ContainerRequestFilter containerRequestFilter : interceptorDeployment.getPreMatchContainerRequestFilters()
+                    .values()) {
+                preMatchHandlers.add(new ResourceRequestFilterHandler(containerRequestFilter, true));
+            }
+        }
+        for (int i = 0; i < info.getGlobalHandlerCustomizers().size(); i++) {
+            preMatchHandlers
+                    .addAll(info.getGlobalHandlerCustomizers().get(i).handlers(HandlerChainCustomizer.Phase.AFTER_PRE_MATCH));
+        }
+
+        return new Deployment(exceptionMapping, info.getCtxResolvers(), serialisers,
+                abortHandlingChain.toArray(EMPTY_REST_HANDLER_ARRAY), dynamicEntityWriter,
+                prefix, paramConverterProviders, configurationImpl, applicationSupplier,
+                threadSetupAction, requestContextFactory, preMatchHandlers, classMappers,
+                runtimeConfigurableServerRestHandlers);
+    }
+
+    private void addRuntimeConfigurableHandlers(RuntimeResource runtimeResource,
+            List<RuntimeConfigurableServerRestHandler> runtimeConfigurableServerRestHandlers) {
+        for (ServerRestHandler serverRestHandler : runtimeResource.getHandlerChain()) {
+            if (serverRestHandler instanceof RuntimeConfigurableServerRestHandler) {
+                runtimeConfigurableServerRestHandlers.add((RuntimeConfigurableServerRestHandler) serverRestHandler);
+            }
+        }
+    }
+
+    //TODO: this needs plenty more work to support all possible types and provide all information the FeatureContext allows
+    private ConfigurationImpl configureFeatures(Features features, ResourceInterceptors interceptors,
+            ExceptionMapping exceptionMapping) {
+
+        ConfigurationImpl configuration = new ConfigurationImpl(RuntimeType.SERVER);
+        if (features.getResourceFeatures().isEmpty()) {
+            return configuration;
+        }
+
+        FeatureContextImpl featureContext = new FeatureContextImpl(interceptors, exceptionMapping,
+                configuration, info.getFactoryCreator());
+        List<ResourceFeature> resourceFeatures = features.getResourceFeatures();
+        for (ResourceFeature resourceFeature : resourceFeatures) {
+            Feature feature = resourceFeature.getFactory().createInstance().getInstance();
+            boolean enabled = feature.configure(featureContext);
+            if (enabled) {
+                configuration.addEnabledFeature(feature);
+            }
+        }
+        if (featureContext.isFiltersNeedSorting()) {
+            interceptors.sort();
+        }
+        return configuration;
+    }
+
+    private String sanitizePathPrefix(String prefix) {
+        prefix = prefix.trim();
+        if (prefix.equals("/"))
+            prefix = "";
+        // add leading slash
+        if (!prefix.startsWith("/"))
+            prefix = "/" + prefix;
+        // remove trailing slash
+        if (prefix.endsWith("/"))
+            prefix = prefix.substring(0, prefix.length() - 1);
+        return prefix;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java
new file mode 100644
index 0000000000000..8bcbe8f337329
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeInterceptorDeployment.java
@@ -0,0 +1,335 @@
+package org.jboss.resteasy.reactive.server.core.startup;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Consumer;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.HasPriority;
+import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptor;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.server.core.DeploymentInfo;
+import org.jboss.resteasy.reactive.server.handlers.InterceptorHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResourceRequestFilterHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResourceResponseFilterHandler;
+import org.jboss.resteasy.reactive.server.jaxrs.DynamicFeatureContext;
+import org.jboss.resteasy.reactive.server.model.DynamicFeatures;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+/**
+ * Class that encapsulates the startup interceptor logic
+ */
+public class RuntimeInterceptorDeployment {
+
+    private static final LinkedHashMap<ResourceInterceptor, ReaderInterceptor> EMPTY_INTERCEPTOR_MAP = new LinkedHashMap<>();
+
+    private final Map<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> globalRequestInterceptorsMap;
+    private final Map<ResourceInterceptor<ContainerResponseFilter>, ContainerResponseFilter> globalResponseInterceptorsMap;
+    private final Map<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> nameRequestInterceptorsMap;
+    private final Map<ResourceInterceptor<ContainerResponseFilter>, ContainerResponseFilter> nameResponseInterceptorsMap;
+    private final Map<ResourceInterceptor<ReaderInterceptor>, ReaderInterceptor> globalReaderInterceptorsMap;
+    private final Map<ResourceInterceptor<WriterInterceptor>, WriterInterceptor> globalWriterInterceptorsMap;
+    private final Map<ResourceInterceptor<ReaderInterceptor>, ReaderInterceptor> nameReaderInterceptorsMap;
+    private final Map<ResourceInterceptor<WriterInterceptor>, WriterInterceptor> nameWriterInterceptorsMap;
+    private final Map<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> preMatchContainerRequestFilters;
+    private final List<ResourceRequestFilterHandler> globalRequestInterceptorHandlers;
+    private final List<ResourceResponseFilterHandler> globalResponseInterceptorHandlers;
+    private final InterceptorHandler globalInterceptorHandler;
+    private final DeploymentInfo info;
+    private final Consumer<Closeable> closeTaskHandler;
+    private final ConfigurationImpl configurationImpl;
+
+    public RuntimeInterceptorDeployment(DeploymentInfo info, ConfigurationImpl configurationImpl,
+            Consumer<Closeable> closeTaskHandler) {
+        this.info = info;
+        this.configurationImpl = configurationImpl;
+        this.closeTaskHandler = closeTaskHandler;
+        ResourceInterceptors interceptors = info.getInterceptors();
+        globalRequestInterceptorsMap = createInterceptorInstances(
+                interceptors.getContainerRequestFilters().getGlobalResourceInterceptors(), closeTaskHandler);
+
+        globalResponseInterceptorsMap = createInterceptorInstances(
+                interceptors.getContainerResponseFilters().getGlobalResourceInterceptors(), closeTaskHandler);
+
+        nameRequestInterceptorsMap = createInterceptorInstances(
+                interceptors.getContainerRequestFilters().getNameResourceInterceptors(), closeTaskHandler);
+
+        nameResponseInterceptorsMap = createInterceptorInstances(
+                interceptors.getContainerResponseFilters().getNameResourceInterceptors(), closeTaskHandler);
+
+        globalReaderInterceptorsMap = createInterceptorInstances(
+                interceptors.getReaderInterceptors().getGlobalResourceInterceptors(), closeTaskHandler);
+
+        globalWriterInterceptorsMap = createInterceptorInstances(
+                interceptors.getWriterInterceptors().getGlobalResourceInterceptors(), closeTaskHandler);
+
+        nameReaderInterceptorsMap = createInterceptorInstances(
+                interceptors.getReaderInterceptors().getNameResourceInterceptors(), closeTaskHandler);
+
+        nameWriterInterceptorsMap = createInterceptorInstances(
+                interceptors.getWriterInterceptors().getNameResourceInterceptors(), closeTaskHandler);
+
+        preMatchContainerRequestFilters = createInterceptorInstances(
+                interceptors.getContainerRequestFilters().getPreMatchInterceptors(), closeTaskHandler);
+
+        Collection<ContainerResponseFilter> responseFilters = globalResponseInterceptorsMap.values();
+        globalResponseInterceptorHandlers = new ArrayList<>(responseFilters.size());
+        for (ContainerResponseFilter responseFilter : responseFilters) {
+            globalResponseInterceptorHandlers.add(new ResourceResponseFilterHandler(responseFilter));
+        }
+        Collection<ContainerRequestFilter> requestFilters = globalRequestInterceptorsMap.values();
+        globalRequestInterceptorHandlers = new ArrayList<>(requestFilters.size());
+        for (ContainerRequestFilter requestFilter : requestFilters) {
+            globalRequestInterceptorHandlers.add(new ResourceRequestFilterHandler(requestFilter, false));
+        }
+
+        InterceptorHandler globalInterceptorHandler = null;
+        if (!globalReaderInterceptorsMap.isEmpty() ||
+                !globalWriterInterceptorsMap.isEmpty()) {
+            WriterInterceptor[] writers = null;
+            ReaderInterceptor[] readers = null;
+            if (!globalReaderInterceptorsMap.isEmpty()) {
+                readers = new ReaderInterceptor[globalReaderInterceptorsMap.size()];
+                int idx = 0;
+                for (ReaderInterceptor i : globalReaderInterceptorsMap.values()) {
+                    readers[idx++] = i;
+                }
+            }
+            if (!globalWriterInterceptorsMap.isEmpty()) {
+                writers = new WriterInterceptor[globalWriterInterceptorsMap.size()];
+                int idx = 0;
+                for (WriterInterceptor i : globalWriterInterceptorsMap.values()) {
+                    writers[idx++] = i;
+                }
+            }
+            globalInterceptorHandler = new InterceptorHandler(writers, readers);
+        }
+        this.globalInterceptorHandler = globalInterceptorHandler;
+    }
+
+    public InterceptorHandler getGlobalInterceptorHandler() {
+        return globalInterceptorHandler;
+    }
+
+    public List<ResourceRequestFilterHandler> getGlobalRequestInterceptorHandlers() {
+        return globalRequestInterceptorHandlers;
+    }
+
+    public List<ResourceResponseFilterHandler> getGlobalResponseInterceptorHandlers() {
+        return globalResponseInterceptorHandlers;
+    }
+
+    public Map<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> getPreMatchContainerRequestFilters() {
+        return preMatchContainerRequestFilters;
+    }
+
+    private <T> LinkedHashMap<ResourceInterceptor<T>, T> createInterceptorInstances(
+            List<ResourceInterceptor<T>> interceptors, Consumer<Closeable> closeTaskHandler) {
+
+        if (interceptors.isEmpty()) {
+            return (LinkedHashMap) EMPTY_INTERCEPTOR_MAP;
+        }
+
+        LinkedHashMap<ResourceInterceptor<T>, T> result = new LinkedHashMap<>();
+        List<BeanFactory.BeanInstance<T>> responseBeanInstances = new ArrayList<>(interceptors.size());
+        Collections.sort(interceptors);
+        for (ResourceInterceptor<T> interceptor : interceptors) {
+            BeanFactory.BeanInstance<T> beanInstance = interceptor.getFactory().createInstance();
+            responseBeanInstances.add(beanInstance);
+            T containerResponseFilter = beanInstance.getInstance();
+            result.put(interceptor, containerResponseFilter);
+        }
+        closeTaskHandler.accept(new BeanFactory.BeanInstance.ClosingTask<>(responseBeanInstances));
+        return result;
+    }
+
+    public MethodInterceptorContext forMethod(ResourceMethod method, ResteasyReactiveResourceInfo lazyMethod) {
+        return new MethodInterceptorContext(method, lazyMethod);
+    }
+
+    <T> TreeMap<ResourceInterceptor<T>, T> buildInterceptorMap(
+            Map<ResourceInterceptor<T>, T> globalInterceptorsMap,
+            Map<ResourceInterceptor<T>, T> nameInterceptorsMap,
+            Map<ResourceInterceptor<T>, T> methodSpecificInterceptorsMap, ResourceMethod method, boolean reversed) {
+        TreeMap<ResourceInterceptor<T>, T> interceptorsToUse = new TreeMap<>(HasPriority.TreeMapComparator.INSTANCE);
+        interceptorsToUse.putAll(globalInterceptorsMap);
+        interceptorsToUse.putAll(methodSpecificInterceptorsMap);
+        for (ResourceInterceptor<T> nameInterceptor : nameInterceptorsMap.keySet()) {
+            // in order to the interceptor to be used, the method needs to have all the "qualifiers" that the interceptor has
+            if (method.getNameBindingNames().containsAll(nameInterceptor.getNameBindingNames())) {
+                interceptorsToUse.put(nameInterceptor, nameInterceptorsMap.get(nameInterceptor));
+            }
+        }
+        return interceptorsToUse;
+    }
+
+    public class MethodInterceptorContext {
+        private final ResourceMethod method;
+        final Map<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> methodSpecificRequestInterceptorsMap;
+        final Map<ResourceInterceptor<ContainerResponseFilter>, ContainerResponseFilter> methodSpecificResponseInterceptorsMap;
+        final Map<ResourceInterceptor<ReaderInterceptor>, ReaderInterceptor> methodSpecificReaderInterceptorsMap;
+        final Map<ResourceInterceptor<WriterInterceptor>, WriterInterceptor> methodSpecificWriterInterceptorsMap;
+
+        MethodInterceptorContext(ResourceMethod method, ResteasyReactiveResourceInfo lazyMethod) {
+            this.method = method;
+            Map<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> methodSpecificRequestInterceptorsMap = Collections
+                    .emptyMap();
+            Map<ResourceInterceptor<ContainerResponseFilter>, ContainerResponseFilter> methodSpecificResponseInterceptorsMap = Collections
+                    .emptyMap();
+            Map<ResourceInterceptor<ReaderInterceptor>, ReaderInterceptor> methodSpecificReaderInterceptorsMap = Collections
+                    .emptyMap();
+            Map<ResourceInterceptor<WriterInterceptor>, WriterInterceptor> methodSpecificWriterInterceptorsMap = Collections
+                    .emptyMap();
+            DynamicFeatures dynamicFeatures = info.getDynamicFeatures();
+            boolean dynamicFeaturesExist = !dynamicFeatures.getResourceDynamicFeatures().isEmpty();
+
+            if (dynamicFeaturesExist) {
+                // we'll basically just use this as a way to capture the registering of filters
+                // in the global fields
+                ResourceInterceptors dynamicallyConfiguredInterceptors = new ResourceInterceptors();
+
+                DynamicFeatureContext context = new DynamicFeatureContext(
+                        dynamicallyConfiguredInterceptors, configurationImpl, info.getFactoryCreator());
+                for (ResourceDynamicFeature resourceDynamicFeature : dynamicFeatures.getResourceDynamicFeatures()) {
+                    DynamicFeature feature = resourceDynamicFeature.getFactory().createInstance().getInstance();
+                    feature.configure(lazyMethod, context);
+                }
+                dynamicallyConfiguredInterceptors.sort();
+
+                if (!dynamicallyConfiguredInterceptors.getContainerRequestFilters().getGlobalResourceInterceptors()
+                        .isEmpty()) {
+                    methodSpecificRequestInterceptorsMap = createInterceptorInstances(
+                            dynamicallyConfiguredInterceptors.getContainerRequestFilters().getGlobalResourceInterceptors(),
+                            closeTaskHandler);
+                }
+                if (!dynamicallyConfiguredInterceptors.getContainerResponseFilters().getGlobalResourceInterceptors()
+                        .isEmpty()) {
+                    methodSpecificResponseInterceptorsMap = createInterceptorInstances(
+                            dynamicallyConfiguredInterceptors.getContainerResponseFilters().getGlobalResourceInterceptors(),
+                            closeTaskHandler);
+                }
+                if (!dynamicallyConfiguredInterceptors.getReaderInterceptors().getGlobalResourceInterceptors().isEmpty()) {
+                    methodSpecificReaderInterceptorsMap = createInterceptorInstances(
+                            dynamicallyConfiguredInterceptors.getReaderInterceptors().getGlobalResourceInterceptors(),
+                            closeTaskHandler);
+                }
+                if (!dynamicallyConfiguredInterceptors.getWriterInterceptors().getGlobalResourceInterceptors().isEmpty()) {
+                    methodSpecificWriterInterceptorsMap = createInterceptorInstances(
+                            dynamicallyConfiguredInterceptors.getWriterInterceptors().getGlobalResourceInterceptors(),
+                            closeTaskHandler);
+                }
+            }
+            this.methodSpecificReaderInterceptorsMap = methodSpecificReaderInterceptorsMap;
+            this.methodSpecificRequestInterceptorsMap = methodSpecificRequestInterceptorsMap;
+            this.methodSpecificWriterInterceptorsMap = methodSpecificWriterInterceptorsMap;
+            this.methodSpecificResponseInterceptorsMap = methodSpecificResponseInterceptorsMap;
+        }
+
+        public List<ServerRestHandler> setupResponseFilterHandler() {
+            List<ServerRestHandler> responseFilterHandlers = new ArrayList<>();
+            // according to the spec, global request filters apply everywhere
+            // and named request filters only apply to methods with exactly matching "qualifiers"
+            if (method.getNameBindingNames().isEmpty() && methodSpecificResponseInterceptorsMap.isEmpty()) {
+                if (!globalResponseInterceptorHandlers.isEmpty()) {
+                    responseFilterHandlers.addAll(globalResponseInterceptorHandlers);
+                }
+            } else if (nameResponseInterceptorsMap.isEmpty() && methodSpecificResponseInterceptorsMap.isEmpty()) {
+                // in this case there are no filters that match the qualifiers, so let's just reuse the global handler
+                if (!globalResponseInterceptorHandlers.isEmpty()) {
+                    responseFilterHandlers.addAll(globalResponseInterceptorHandlers);
+                }
+            } else {
+                TreeMap<ResourceInterceptor<ContainerResponseFilter>, ContainerResponseFilter> interceptorsToUse = buildInterceptorMap(
+                        globalResponseInterceptorsMap, nameResponseInterceptorsMap, methodSpecificResponseInterceptorsMap,
+                        method,
+                        true);
+                for (Map.Entry<ResourceInterceptor<ContainerResponseFilter>, ContainerResponseFilter> entry : interceptorsToUse
+                        .entrySet()) {
+                    responseFilterHandlers.add(new ResourceResponseFilterHandler(entry.getValue()));
+                }
+            }
+            return responseFilterHandlers;
+        }
+
+        public List<ServerRestHandler> setupInterceptorHandler() {
+            List<ServerRestHandler> handlers = new ArrayList<>();
+            if (method.getNameBindingNames().isEmpty() && methodSpecificReaderInterceptorsMap.isEmpty()
+                    && methodSpecificWriterInterceptorsMap.isEmpty()) {
+                if (globalInterceptorHandler != null) {
+                    handlers.add(globalInterceptorHandler);
+                }
+            } else if (nameReaderInterceptorsMap.isEmpty() && nameWriterInterceptorsMap.isEmpty()
+                    && methodSpecificReaderInterceptorsMap.isEmpty() && methodSpecificWriterInterceptorsMap.isEmpty()) {
+                // in this case there are no filters that match the qualifiers, so let's just reuse the global handler
+                if (globalInterceptorHandler != null) {
+                    handlers.add(globalInterceptorHandler);
+                }
+            } else {
+                TreeMap<ResourceInterceptor<ReaderInterceptor>, ReaderInterceptor> readerInterceptorsToUse = buildInterceptorMap(
+                        globalReaderInterceptorsMap, nameReaderInterceptorsMap, methodSpecificReaderInterceptorsMap, method,
+                        false);
+                TreeMap<ResourceInterceptor<WriterInterceptor>, WriterInterceptor> writerInterceptorsToUse = buildInterceptorMap(
+                        globalWriterInterceptorsMap, nameWriterInterceptorsMap, methodSpecificWriterInterceptorsMap, method,
+                        false);
+                WriterInterceptor[] writers = null;
+                ReaderInterceptor[] readers = null;
+                if (!readerInterceptorsToUse.isEmpty()) {
+                    readers = new ReaderInterceptor[readerInterceptorsToUse.size()];
+                    int idx = 0;
+                    for (ReaderInterceptor i : readerInterceptorsToUse.values()) {
+                        readers[idx++] = i;
+                    }
+                }
+                if (!writerInterceptorsToUse.isEmpty()) {
+                    writers = new WriterInterceptor[writerInterceptorsToUse.size()];
+                    int idx = 0;
+                    for (WriterInterceptor i : writerInterceptorsToUse.values()) {
+                        writers[idx++] = i;
+                    }
+                }
+                handlers.add(new InterceptorHandler(writers, readers));
+            }
+            return handlers;
+        }
+
+        public List<ServerRestHandler> setupRequestFilterHandler() {
+            List<ServerRestHandler> handlers = new ArrayList<>();
+            // according to the spec, global request filters apply everywhere
+            // and named request filters only apply to methods with exactly matching "qualifiers"
+            if (method.getNameBindingNames().isEmpty() && methodSpecificRequestInterceptorsMap.isEmpty()) {
+                if (!globalRequestInterceptorHandlers.isEmpty()) {
+                    handlers.addAll(globalRequestInterceptorHandlers);
+                }
+            } else if (nameRequestInterceptorsMap.isEmpty() && methodSpecificRequestInterceptorsMap.isEmpty()) {
+                // in this case there are no filters that match the qualifiers, so let's just reuse the global handler
+                if (!globalRequestInterceptorHandlers.isEmpty()) {
+                    handlers.addAll(globalRequestInterceptorHandlers);
+                }
+            } else {
+                TreeMap<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> interceptorsToUse = buildInterceptorMap(
+                        globalRequestInterceptorsMap, nameRequestInterceptorsMap, methodSpecificRequestInterceptorsMap, method,
+                        false);
+                for (Map.Entry<ResourceInterceptor<ContainerRequestFilter>, ContainerRequestFilter> entry : interceptorsToUse
+                        .entrySet()) {
+                    handlers.add(new ResourceRequestFilterHandler(entry.getValue(), false));
+                }
+            }
+            return handlers;
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java
new file mode 100644
index 0000000000000..fd23c10477c34
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeMappingDeployment.java
@@ -0,0 +1,80 @@
+package org.jboss.resteasy.reactive.server.core.startup;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.server.handlers.MediaTypeMapper;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.mapping.URITemplate;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class RuntimeMappingDeployment {
+
+    public static Map<String, RequestMapper<RuntimeResource>> buildClassMapper(
+            Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>> perClassMappers) {
+        Map<String, RequestMapper<RuntimeResource>> mappersByMethod = new HashMap<>();
+        SortedMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>> nullMethod = perClassMappers.get(null);
+        if (nullMethod == null) {
+            nullMethod = Collections.emptySortedMap();
+        }
+        for (Map.Entry<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>> i : perClassMappers
+                .entrySet()) {
+            for (Map.Entry<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>> nm : nullMethod.entrySet()) {
+                TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>> templateMap = i.getValue();
+                if (!templateMap.containsKey(nm.getKey())) {
+                    //resource methods take precedence
+                    //just skip sub resource locators for now
+                    //may need to be revisited if we want to pass the TCK 100%
+                    templateMap.put(nm.getKey(), nm.getValue());
+                }
+            }
+            //now we have all our possible resources
+            List<RequestMapper.RequestPath<RuntimeResource>> result = new ArrayList<>();
+            for (Map.Entry<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>> entry : i.getValue().entrySet()) {
+                List<RequestMapper.RequestPath<RuntimeResource>> requestPaths = entry.getValue();
+                if (requestPaths.size() == 1) {
+                    //simple case, only one match
+                    result.addAll(requestPaths);
+                } else {
+                    List<RuntimeResource> resources = new ArrayList<>(requestPaths.size());
+                    for (int j = 0; j < requestPaths.size(); j++) {
+                        resources.add(requestPaths.get(j).value);
+                    }
+                    MediaTypeMapper mapper = new MediaTypeMapper(resources);
+                    //now we just create a fake RuntimeResource
+                    //we could add another layer of indirection, however this is not a common case
+                    //so we don't want to add any extra latency into the common case
+                    RuntimeResource fake = new RuntimeResource(i.getKey(), entry.getKey(), null, null, Collections.emptyList(),
+                            null, null,
+                            new ServerRestHandler[] { mapper }, null, new Class[0], null, false, null, null, null, null, null,
+                            Collections.emptyMap());
+                    result.add(new RequestMapper.RequestPath<>(false, fake.getPath(), fake));
+                }
+            }
+            mappersByMethod.put(i.getKey(), new RequestMapper<>(result));
+        }
+        return mappersByMethod;
+    }
+
+    public static void buildMethodMapper(
+            Map<String, TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>>> perClassMappers,
+            ResourceMethod method, RuntimeResource runtimeResource) {
+        TreeMap<URITemplate, List<RequestMapper.RequestPath<RuntimeResource>>> templateMap = perClassMappers
+                .get(method.getHttpMethod());
+        if (templateMap == null) {
+            perClassMappers.put(method.getHttpMethod(), templateMap = new TreeMap<>());
+        }
+        List<RequestMapper.RequestPath<RuntimeResource>> list = templateMap.get(runtimeResource.getPath());
+        if (list == null) {
+            templateMap.put(runtimeResource.getPath(), list = new ArrayList<>());
+        }
+        list.add(new RequestMapper.RequestPath<>(method.getHttpMethod() == null, runtimeResource.getPath(),
+                runtimeResource));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java
new file mode 100644
index 0000000000000..46771c1d90847
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java
@@ -0,0 +1,515 @@
+package org.jboss.resteasy.reactive.server.core.startup;
+
+import static org.jboss.resteasy.reactive.common.util.DeploymentUtils.loadClass;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.Executor;
+import java.util.function.Supplier;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig;
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.common.model.ResourceClass;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+import org.jboss.resteasy.reactive.common.util.ReflectionBeanFactoryCreator;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.common.util.types.TypeSignatureParser;
+import org.jboss.resteasy.reactive.server.core.DeploymentInfo;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.core.parameters.AsyncResponseExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.BodyParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.ContextParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.CookieParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.FormParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.HeaderParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.InjectParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.LocatableResourcePathParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.MatrixParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.NullParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.PathParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.QueryParamExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.RuntimeResolvedConverter;
+import org.jboss.resteasy.reactive.server.core.serialization.DynamicEntityWriter;
+import org.jboss.resteasy.reactive.server.core.serialization.FixedEntityWriter;
+import org.jboss.resteasy.reactive.server.core.serialization.FixedEntityWriterArray;
+import org.jboss.resteasy.reactive.server.handlers.AbortChainHandler;
+import org.jboss.resteasy.reactive.server.handlers.BlockingHandler;
+import org.jboss.resteasy.reactive.server.handlers.ExceptionHandler;
+import org.jboss.resteasy.reactive.server.handlers.FixedProducesHandler;
+import org.jboss.resteasy.reactive.server.handlers.FormBodyHandler;
+import org.jboss.resteasy.reactive.server.handlers.InputHandler;
+import org.jboss.resteasy.reactive.server.handlers.InstanceHandler;
+import org.jboss.resteasy.reactive.server.handlers.InvocationHandler;
+import org.jboss.resteasy.reactive.server.handlers.ParameterHandler;
+import org.jboss.resteasy.reactive.server.handlers.PerRequestInstanceHandler;
+import org.jboss.resteasy.reactive.server.handlers.RequestDeserializeHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResourceLocatorHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResponseHandler;
+import org.jboss.resteasy.reactive.server.handlers.ResponseWriterHandler;
+import org.jboss.resteasy.reactive.server.handlers.SseResponseWriterHandler;
+import org.jboss.resteasy.reactive.server.handlers.VariableProducesHandler;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.mapping.URITemplate;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.ParamConverterProviders;
+import org.jboss.resteasy.reactive.server.model.ServerMethodParameter;
+import org.jboss.resteasy.reactive.server.model.ServerResourceMethod;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.server.util.ScoreSystem;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class RuntimeResourceDeployment {
+
+    public static final ServerRestHandler[] EMPTY_REST_HANDLER_ARRAY = new ServerRestHandler[0];
+
+    private static final Logger log = Logger.getLogger(RuntimeResourceDeployment.class);
+
+    private final DeploymentInfo info;
+    private final ServerSerialisers serialisers;
+    private final ResteasyReactiveConfig quarkusRestConfig;
+    private final Supplier<Executor> executorSupplier;
+    private final CustomServerRestHandlers customServerRestHandlers;
+    private final RuntimeInterceptorDeployment runtimeInterceptorDeployment;
+    private final DynamicEntityWriter dynamicEntityWriter;
+    private final ResourceLocatorHandler resourceLocatorHandler;
+    /**
+     * If the runtime will always default to blocking (e.g. Servlet)
+     */
+    private final boolean defaultBlocking;
+
+    public RuntimeResourceDeployment(DeploymentInfo info, Supplier<Executor> executorSupplier,
+            CustomServerRestHandlers customServerRestHandlers,
+            RuntimeInterceptorDeployment runtimeInterceptorDeployment, DynamicEntityWriter dynamicEntityWriter,
+            ResourceLocatorHandler resourceLocatorHandler, boolean defaultBlocking) {
+        this.info = info;
+        this.serialisers = info.getSerialisers();
+        this.quarkusRestConfig = info.getConfig();
+        this.executorSupplier = executorSupplier;
+        this.customServerRestHandlers = customServerRestHandlers;
+        this.runtimeInterceptorDeployment = runtimeInterceptorDeployment;
+        this.dynamicEntityWriter = dynamicEntityWriter;
+        this.resourceLocatorHandler = resourceLocatorHandler;
+        this.defaultBlocking = defaultBlocking;
+    }
+
+    public RuntimeResource buildResourceMethod(ResourceClass clazz,
+            ServerResourceMethod method, boolean locatableResource, URITemplate classPathTemplate, DeploymentInfo info) {
+        URITemplate methodPathTemplate = new URITemplate(method.getPath(), false);
+        MultivaluedMap<ScoreSystem.Category, ScoreSystem.Diagnostic> score = new QuarkusMultivaluedHashMap<>();
+
+        Map<String, Integer> pathParameterIndexes = buildParamIndexMap(classPathTemplate, methodPathTemplate);
+        List<ServerRestHandler> handlers = new ArrayList<>();
+        addHandlers(handlers, method, info, HandlerChainCustomizer.Phase.AFTER_MATCH);
+        MediaType sseElementType = null;
+        if (method.getSseElementType() != null) {
+            sseElementType = MediaType.valueOf(method.getSseElementType());
+        }
+        List<MediaType> consumesMediaTypes;
+        if (method.getConsumes() == null) {
+            consumesMediaTypes = Collections.emptyList();
+        } else {
+            consumesMediaTypes = new ArrayList<>(method.getConsumes().length);
+            for (String s : method.getConsumes()) {
+                consumesMediaTypes.add(MediaType.valueOf(s));
+            }
+        }
+
+        Class<Object> resourceClass = loadClass(clazz.getClassName());
+        Class<?>[] parameterClasses = new Class[method.getParameters().length];
+        for (int i = 0; i < method.getParameters().length; ++i) {
+            parameterClasses[i] = loadClass(method.getParameters()[i].declaredType);
+        }
+        ResteasyReactiveResourceInfo lazyMethod = new ResteasyReactiveResourceInfo(method.getName(), resourceClass,
+                parameterClasses, method.getMethodAnnotationNames());
+
+        RuntimeInterceptorDeployment.MethodInterceptorContext interceptorDeployment = runtimeInterceptorDeployment
+                .forMethod(method, lazyMethod);
+
+        //setup reader and writer interceptors first
+        handlers.addAll(interceptorDeployment.setupInterceptorHandler());
+        //at this point the handler chain only has interceptors
+        //which we also want in the abort handler chain
+        List<ServerRestHandler> abortHandlingChain = new ArrayList<>(handlers);
+
+        // when a method is blocking, we also want all the request filters to run on the worker thread
+        // because they can potentially set thread local variables
+        //we don't need to run this for Servlet and other runtimes that default to blocking
+        if (!defaultBlocking) {
+            if (method.isBlocking()) {
+                handlers.add(new BlockingHandler(executorSupplier));
+                score.add(ScoreSystem.Category.Execution, ScoreSystem.Diagnostic.ExecutionBlocking);
+            } else {
+                score.add(ScoreSystem.Category.Execution, ScoreSystem.Diagnostic.ExecutionNonBlocking);
+            }
+        }
+
+        //spec doesn't seem to test this, but RESTEasy does not run request filters again for sub resources (which makes sense)
+        if (!locatableResource) {
+            handlers.addAll(interceptorDeployment.setupRequestFilterHandler());
+        }
+
+        // some parameters need the body to be read
+        MethodParameter[] parameters = method.getParameters();
+        // body can only be in a parameter
+        MethodParameter bodyParameter = null;
+        int bodyParameterIndex = -1;
+        for (int i = 0; i < parameters.length; i++) {
+            MethodParameter param = parameters[i];
+            if (param.parameterType == ParameterType.BODY) {
+                bodyParameter = param;
+                bodyParameterIndex = i;
+                break;
+            }
+        }
+        // form params can be everywhere (field, beanparam, param)
+        if (method.isFormParamRequired() && !defaultBlocking) {
+            // read the body as multipart in one go
+            handlers.add(new FormBodyHandler(bodyParameter != null));
+        } else if (method.isMultipart()) {
+            Supplier<ServerRestHandler> multipartHandlerSupplier = customServerRestHandlers.getMultipartHandlerSupplier();
+            if (multipartHandlerSupplier != null) {
+                // multipart needs special body handling
+                handlers.add(multipartHandlerSupplier.get());
+            } else {
+                throw new RuntimeException(
+                        "The current execution environment does not implement a ServerRestHandler for multipart form support");
+            }
+        } else if (bodyParameter != null) {
+            if (!defaultBlocking) {
+                if (method.isBlocking()) {
+                    Supplier<ServerRestHandler> blockingInputHandlerSupplier = customServerRestHandlers
+                            .getBlockingInputHandlerSupplier();
+                    if (blockingInputHandlerSupplier != null) {
+                        // when the method is blocking, we will already be on a worker thread
+                        handlers.add(blockingInputHandlerSupplier.get());
+                    } else {
+                        throw new RuntimeException(
+                                "The current execution environment does not implement a ServerRestHandler for blocking input");
+                    }
+                } else if (!method.isBlocking()) {
+                    // allow the body to be read by chunks
+                    handlers.add(new InputHandler(quarkusRestConfig.getInputBufferSize(), executorSupplier));
+                }
+            }
+        }
+        // if we need the body, let's deserialize it
+        if (bodyParameter != null) {
+            Class<Object> typeClass = loadClass(bodyParameter.declaredType);
+            Type genericType = typeClass;
+            if (!bodyParameter.type.equals(bodyParameter.declaredType)) {
+                // we only need to parse the signature and create generic type when the declared type differs from the type
+                genericType = TypeSignatureParser.parse(bodyParameter.signature);
+            }
+            handlers.add(new RequestDeserializeHandler(typeClass, genericType,
+                    consumesMediaTypes.isEmpty() ? null : consumesMediaTypes.get(0), serialisers, bodyParameterIndex));
+        }
+
+        // given that we may inject form params in the endpoint we need to make sure we read the body before
+        // we create/inject our endpoint
+        EndpointInvoker invoker = method.getInvoker().get();
+        ServerRestHandler instanceHandler = null;
+        if (!locatableResource) {
+            if (clazz.isPerRequestResource()) {
+                instanceHandler = new PerRequestInstanceHandler(clazz.getFactory(), info.getClientProxyUnwrapper());
+                score.add(ScoreSystem.Category.Resource, ScoreSystem.Diagnostic.ResourcePerRequest);
+            } else {
+                instanceHandler = new InstanceHandler(clazz.getFactory());
+                score.add(ScoreSystem.Category.Resource, ScoreSystem.Diagnostic.ResourceSingleton);
+            }
+            handlers.add(instanceHandler);
+        }
+
+        addHandlers(handlers, method, info, HandlerChainCustomizer.Phase.RESOLVE_METHOD_PARAMETERS);
+        for (int i = 0; i < parameters.length; i++) {
+            ServerMethodParameter param = (ServerMethodParameter) parameters[i];
+            boolean single = param.isSingle();
+            ParameterExtractor extractor = parameterExtractor(pathParameterIndexes, locatableResource, param.parameterType,
+                    param.type, param.name,
+                    single, param.encoded, param.customerParameterExtractor);
+            ParameterConverter converter = null;
+            ParamConverterProviders paramConverterProviders = info.getParamConverterProviders();
+            boolean userProviderConvertersExist = !paramConverterProviders.getParamConverterProviders().isEmpty();
+            if (param.converter != null) {
+                converter = param.converter.get();
+                if (userProviderConvertersExist) {
+                    Method javaMethod = lazyMethod.getMethod();
+                    // Workaround our lack of support for generic params by not doing this init if there are not runtime
+                    // param converter providers
+                    converter.init(paramConverterProviders, javaMethod.getParameterTypes()[i],
+                            javaMethod.getGenericParameterTypes()[i],
+                            javaMethod.getParameterAnnotations()[i]);
+                    // make sure we give the user provided resolvers the chance to convert
+                    converter = new RuntimeResolvedConverter(converter);
+                    converter.init(paramConverterProviders, javaMethod.getParameterTypes()[i],
+                            javaMethod.getGenericParameterTypes()[i],
+                            javaMethod.getParameterAnnotations()[i]);
+                }
+            }
+
+            handlers.add(new ParameterHandler(i, param.getDefaultValue(), extractor,
+                    converter, param.parameterType,
+                    param.isObtainedAsCollection(), param.isOptional()));
+        }
+        addHandlers(handlers, method, info, HandlerChainCustomizer.Phase.BEFORE_METHOD_INVOKE);
+        handlers.add(new InvocationHandler(invoker));
+        addHandlers(handlers, method, info, HandlerChainCustomizer.Phase.AFTER_METHOD_INVOKE);
+
+        Type returnType = TypeSignatureParser.parse(method.getReturnType());
+        Type nonAsyncReturnType = getNonAsyncReturnType(returnType);
+        Class<?> rawNonAsyncReturnType = getRawType(nonAsyncReturnType);
+
+        ServerMediaType serverMediaType = null;
+        if (method.getProduces() != null && method.getProduces().length > 0) {
+            // when negotiating a media type, we want to use the proper subtype to locate a ResourceWriter,
+            // hence the 'true' for 'useSuffix'
+            serverMediaType = new ServerMediaType(ServerMediaType.mediaTypesFromArray(method.getProduces()),
+                    StandardCharsets.UTF_8.name(), false, true);
+        }
+        if (method.getHttpMethod() == null) {
+            //this is a resource locator method
+            handlers.add(resourceLocatorHandler);
+        } else if (!Response.class.isAssignableFrom(rawNonAsyncReturnType)) {
+            //try and statically determine the media type and response writer
+            //we can't do this for all cases, but we can do it for the most common ones
+            //in practice this should work for the majority of endpoints
+            if (method.getProduces() != null && method.getProduces().length > 0) {
+                //the method can only produce a single content type, which is the most common case
+                if (method.getProduces().length == 1) {
+                    MediaType mediaType = MediaType.valueOf(method.getProduces()[0]);
+                    //its a wildcard type, makes it hard to determine statically
+                    if (mediaType.isWildcardType() || mediaType.isWildcardSubtype()) {
+                        handlers.add(new VariableProducesHandler(serverMediaType, serialisers));
+                        score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterRunTime);
+                    } else if (rawNonAsyncReturnType != Void.class
+                            && rawNonAsyncReturnType != void.class) {
+                        List<MessageBodyWriter<?>> buildTimeWriters = serialisers.findBuildTimeWriters(rawNonAsyncReturnType,
+                                RuntimeType.SERVER, Collections.singletonList(
+                                        MediaTypeHelper.withSuffixAsSubtype(MediaType.valueOf(method.getProduces()[0]))));
+                        if (buildTimeWriters == null) {
+                            //if this is null this means that the type cannot be resolved at build time
+                            //this happens when the method returns a generic type (e.g. Object), so there
+                            //are more specific mappers that could be invoked depending on the actual return value
+                            handlers.add(new FixedProducesHandler(mediaType, dynamicEntityWriter));
+                            score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterRunTime);
+                        } else if (buildTimeWriters.isEmpty()) {
+                            //we could not find any writers that can write a response to this endpoint
+                            log.warn("Cannot find any combination of response writers for the method " + clazz.getClassName()
+                                    + "#" + method.getName() + "(" + Arrays.toString(method.getParameters()) + ")");
+                            handlers.add(new VariableProducesHandler(serverMediaType, serialisers));
+                            score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterRunTime);
+                        } else if (isSingleEffectiveWriter(buildTimeWriters)) {
+                            MessageBodyWriter<?> writer = buildTimeWriters.get(0);
+                            handlers.add(new FixedProducesHandler(mediaType, new FixedEntityWriter(
+                                    writer, serialisers)));
+                            if (writer instanceof ServerMessageBodyWriter)
+                                score.add(ScoreSystem.Category.Writer,
+                                        ScoreSystem.Diagnostic.WriterBuildTimeDirect(writer));
+                            else
+                                score.add(ScoreSystem.Category.Writer,
+                                        ScoreSystem.Diagnostic.WriterBuildTime(writer));
+                        } else {
+                            //multiple writers, we try them in the proper order which had already been created
+                            handlers.add(new FixedProducesHandler(mediaType,
+                                    new FixedEntityWriterArray(buildTimeWriters.toArray(new MessageBodyWriter[0]),
+                                            serialisers)));
+                            score.add(ScoreSystem.Category.Writer,
+                                    ScoreSystem.Diagnostic.WriterBuildTimeMultiple(buildTimeWriters));
+                        }
+                    } else {
+                        score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterNotRequired);
+                    }
+                } else {
+                    //there are multiple possibilities
+                    //we could optimise this more in future
+                    handlers.add(new VariableProducesHandler(serverMediaType, serialisers));
+                    score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterRunTime);
+                }
+            } else {
+                score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterRunTime);
+            }
+        } else {
+            score.add(ScoreSystem.Category.Writer, ScoreSystem.Diagnostic.WriterRunTime);
+        }
+
+        //the response filter handlers, they need to be added to both the abort and
+        //normal chains. At the moment this only has one handler added to it but
+        //in future there will be one per filter
+        List<ServerRestHandler> responseFilterHandlers;
+        if (method.isSse()) {
+            handlers.add(new SseResponseWriterHandler());
+            responseFilterHandlers = Collections.emptyList();
+        } else {
+            handlers.add(new ResponseHandler());
+            responseFilterHandlers = new ArrayList<>(interceptorDeployment.setupResponseFilterHandler());
+            handlers.addAll(responseFilterHandlers);
+            handlers.add(new ResponseWriterHandler(dynamicEntityWriter));
+        }
+        if (!clazz.resourceExceptionMapper().isEmpty() && (instanceHandler != null)) {
+            // when class level exception mapper are used, we need to make sure that an instance of resource class exists
+            // so we can invoke it
+            abortHandlingChain.add(instanceHandler);
+        }
+        abortHandlingChain.add(new ExceptionHandler());
+        abortHandlingChain.add(new ResponseHandler());
+        abortHandlingChain.addAll(responseFilterHandlers);
+
+        abortHandlingChain.add(new ResponseWriterHandler(dynamicEntityWriter));
+        handlers.add(0, new AbortChainHandler(abortHandlingChain.toArray(EMPTY_REST_HANDLER_ARRAY)));
+
+        return new RuntimeResource(method.getHttpMethod(), methodPathTemplate,
+                classPathTemplate,
+                method.getProduces() == null ? null : serverMediaType,
+                consumesMediaTypes, invoker,
+                clazz.getFactory(), handlers.toArray(EMPTY_REST_HANDLER_ARRAY), method.getName(), parameterClasses,
+                nonAsyncReturnType, method.isBlocking(), resourceClass,
+                lazyMethod,
+                pathParameterIndexes, score, sseElementType, clazz.resourceExceptionMapper());
+    }
+
+    private boolean isSingleEffectiveWriter(List<MessageBodyWriter<?>> buildTimeWriters) {
+        if (buildTimeWriters.size() == 1) { // common case of single writer
+            return true;
+        }
+
+        // in the case where the first Writer is an instance of AllWriteableMessageBodyWriter,
+        // it doesn't matter that we have multiple writers as the first one will always be used to serialize
+        return buildTimeWriters.get(0) instanceof ServerMessageBodyWriter.AllWriteableMessageBodyWriter;
+    }
+
+    private void addHandlers(List<ServerRestHandler> handlers, ServerResourceMethod method, DeploymentInfo info,
+            HandlerChainCustomizer.Phase phase) {
+        for (int i = 0; i < info.getGlobalHandlerCustomizers().size(); i++) {
+            handlers.addAll(info.getGlobalHandlerCustomizers().get(i).handlers(phase));
+        }
+        for (int i = 0; i < method.getHandlerChainCustomizers().size(); i++) {
+            handlers.addAll(method.getHandlerChainCustomizers().get(i).handlers(phase));
+        }
+    }
+
+    public ParameterExtractor parameterExtractor(Map<String, Integer> pathParameterIndexes, boolean locatableResource,
+            ParameterType type, String javaType,
+            String name,
+            boolean single, boolean encoded, ParameterExtractor customExtractor) {
+        ParameterExtractor extractor;
+        switch (type) {
+            case HEADER:
+                return new HeaderParamExtractor(name, single);
+            case COOKIE:
+                return new CookieParamExtractor(name);
+            case FORM:
+                return new FormParamExtractor(name, single, encoded);
+            case PATH:
+                Integer index = pathParameterIndexes.get(name);
+                if (index == null) {
+                    if (locatableResource) {
+                        extractor = new LocatableResourcePathParamExtractor(name);
+                    } else {
+                        extractor = new NullParamExtractor();
+                    }
+                } else {
+                    extractor = new PathParamExtractor(index, encoded);
+                }
+                return extractor;
+            case CONTEXT:
+                return new ContextParamExtractor(javaType);
+            case ASYNC_RESPONSE:
+                return new AsyncResponseExtractor();
+            case QUERY:
+                extractor = new QueryParamExtractor(name, single, encoded);
+                return extractor;
+            case BODY:
+                return new BodyParamExtractor();
+            case MATRIX:
+                extractor = new MatrixParamExtractor(name, single, encoded);
+                return extractor;
+            case BEAN:
+                return new InjectParamExtractor((BeanFactory<Object>) info.getFactoryCreator().apply(loadClass(javaType)));
+            case MULTI_PART_FORM:
+                return new InjectParamExtractor((BeanFactory<Object>) new ReflectionBeanFactoryCreator().apply(javaType));
+            case CUSTOM:
+                return customExtractor;
+            default:
+                throw new RuntimeException("Unknown param type: " + type);
+        }
+    }
+
+    public Map<String, Integer> buildParamIndexMap(URITemplate classPathTemplate, URITemplate methodPathTemplate) {
+        Map<String, Integer> pathParameterIndexes = new HashMap<>();
+        int pathCount = 0;
+        if (classPathTemplate != null) {
+            for (URITemplate.TemplateComponent i : classPathTemplate.components) {
+                if (i.name != null) {
+                    pathParameterIndexes.put(i.name, pathCount++);
+                } else if (i.names != null) {
+                    for (String nm : i.names) {
+                        pathParameterIndexes.put(nm, pathCount++);
+                    }
+                }
+            }
+        }
+        for (URITemplate.TemplateComponent i : methodPathTemplate.components) {
+            if (i.name != null) {
+                pathParameterIndexes.put(i.name, pathCount++);
+            } else if (i.names != null) {
+                for (String nm : i.names) {
+                    pathParameterIndexes.put(nm, pathCount++);
+                }
+            }
+        }
+        return pathParameterIndexes;
+    }
+
+    private Class<?> getRawType(Type type) {
+        if (type instanceof Class)
+            return (Class<?>) type;
+        if (type instanceof ParameterizedType) {
+            ParameterizedType ptype = (ParameterizedType) type;
+            return (Class<?>) ptype.getRawType();
+        }
+        throw new UnsupportedOperationException("Endpoint return type not supported yet: " + type);
+    }
+
+    private Type getNonAsyncReturnType(Type returnType) {
+        if (returnType instanceof Class)
+            return returnType;
+        if (returnType instanceof ParameterizedType) {
+            // NOTE: same code in EndpointIndexer.getNonAsyncReturnType
+            ParameterizedType type = (ParameterizedType) returnType;
+            if (type.getRawType() == CompletionStage.class) {
+                return type.getActualTypeArguments()[0];
+            }
+            if (type.getRawType() == Uni.class) {
+                return type.getActualTypeArguments()[0];
+            }
+            if (type.getRawType() == Multi.class) {
+                return type.getActualTypeArguments()[0];
+            }
+            return returnType;
+        }
+        throw new UnsupportedOperationException("Endpoint return type not supported yet: " + returnType);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/AbortChainHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/AbortChainHandler.java
new file mode 100644
index 0000000000000..8b69ef7b0ff31
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/AbortChainHandler.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class AbortChainHandler implements ServerRestHandler {
+    final ServerRestHandler[] abortChain;
+
+    public AbortChainHandler(ServerRestHandler[] abortChain) {
+        this.abortChain = abortChain;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        requestContext.setAbortHandlerChain(abortChain);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java
new file mode 100644
index 0000000000000..3179b5911f41c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/BlockingHandler.java
@@ -0,0 +1,29 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.concurrent.Executor;
+import java.util.function.Supplier;
+import org.jboss.resteasy.reactive.server.core.BlockingOperationSupport;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class BlockingHandler implements ServerRestHandler {
+
+    private volatile Executor executor;
+    private final Supplier<Executor> supplier;
+
+    public BlockingHandler(Supplier<Executor> supplier) {
+        this.supplier = supplier;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        if (BlockingOperationSupport.isBlockingAllowed()) {
+            return; //already dispatched
+        }
+        if (executor == null) {
+            executor = supplier.get();
+        }
+        requestContext.suspend();
+        requestContext.resume(executor);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java
new file mode 100644
index 0000000000000..243bcc039ca63
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ClassRoutingHandler.java
@@ -0,0 +1,210 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.NotAcceptableException;
+import javax.ws.rs.NotAllowedException;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.headers.MediaTypeHeaderDelegate;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class ClassRoutingHandler implements ServerRestHandler {
+    private final Map<String, RequestMapper<RuntimeResource>> mappers;
+    private final int parameterOffset;
+
+    public ClassRoutingHandler(Map<String, RequestMapper<RuntimeResource>> mappers, int parameterOffset) {
+        this.mappers = mappers;
+        this.parameterOffset = parameterOffset;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        RequestMapper<RuntimeResource> mapper = mappers.get(requestContext.getMethod());
+        if (mapper == null) {
+            String requestMethod = requestContext.getMethod();
+            if (requestMethod.equals(HttpMethod.HEAD)) {
+                mapper = mappers.get(HttpMethod.GET);
+            } else if (requestMethod.equals(HttpMethod.OPTIONS)) {
+                Set<CharSequence> allowedMethods = new HashSet<>();
+                for (String method : mappers.keySet()) {
+                    if (method == null) {
+                        continue;
+                    }
+                    allowedMethods.add(method);
+                }
+                allowedMethods.add(HttpMethod.OPTIONS);
+                allowedMethods.add(HttpMethod.HEAD);
+                requestContext.serverResponse().setResponseHeader(HttpHeaders.ALLOW, allowedMethods).end();
+                return;
+            }
+            if (mapper == null) {
+                mapper = mappers.get(null);
+            }
+            if (mapper == null) {
+                // The idea here is to check if any of the mappers of the class could map the request - if the HTTP Method were correct
+                String remaining = getRemaining(requestContext);
+                for (RequestMapper<RuntimeResource> existingMapper : mappers.values()) {
+                    if (existingMapper.map(remaining) != null) {
+                        throw new NotAllowedException(
+                                new ResponseBuilderImpl().status(Response.Status.METHOD_NOT_ALLOWED).build());
+                    }
+                }
+                throwNotFound(requestContext);
+                return;
+            }
+        }
+        String remaining = getRemaining(requestContext);
+        RequestMapper.RequestMatch<RuntimeResource> target = mapper.map(remaining);
+        if (target == null) {
+            if (requestContext.getMethod().equals(HttpMethod.HEAD)) {
+                mapper = mappers.get(HttpMethod.GET);
+                if (mapper != null) {
+                    target = mapper.map(remaining);
+                }
+            }
+
+            if (target == null) {
+                // The idea here is to check if any of the mappers of the class could map the request - if the HTTP Method were correct
+                for (Map.Entry<String, RequestMapper<RuntimeResource>> entry : mappers.entrySet()) {
+                    if (entry.getKey() == null) {
+                        continue;
+                    }
+                    if (entry.getKey().equals(requestContext.getMethod())) {
+                        continue;
+                    }
+                    if (entry.getValue().map(remaining) != null) {
+                        throw new NotAllowedException(
+                                new ResponseBuilderImpl().status(Response.Status.METHOD_NOT_ALLOWED).build());
+                    }
+                }
+                throwNotFound(requestContext);
+                return;
+            }
+        }
+
+        // use vert.x headers wherever we need header checking because we really don't want to
+        // copy headers as it's a performance killer
+        ServerHttpRequest serverRequest = requestContext.serverRequest();
+
+        // according to the spec we need to return HTTP 415 when content-type header doesn't match what is specified in @Consumes
+
+        if (!target.value.getConsumes().isEmpty()) {
+            String contentType = serverRequest.getRequestHeader(HttpHeaders.CONTENT_TYPE);
+            if (contentType != null) {
+                if (MediaTypeHelper.getFirstMatch(
+                        target.value.getConsumes(),
+                        Collections.singletonList(MediaType.valueOf(contentType))) == null) {
+                    throw new NotSupportedException();
+                }
+            }
+        }
+        // according to the spec we need to return HTTP 406 when Accept header doesn't match what is specified in @Produces
+        if (target.value.getProduces() != null) {
+            String accepts = serverRequest.getRequestHeader(HttpHeaders.ACCEPT);
+            if ((accepts != null) && !accepts.equals(MediaType.WILDCARD)) {
+                int commaIndex = accepts.indexOf(',');
+                boolean multipleAcceptsValues = commaIndex >= 0;
+                MediaType[] producesMediaTypes = target.value.getProduces().getSortedOriginalMediaTypes();
+                if (!multipleAcceptsValues && (producesMediaTypes.length == 1)) {
+                    // the point of this branch is to eliminate any list creation or string indexing as none is needed
+                    MediaType acceptsMediaType = MediaType.valueOf(accepts.trim());
+                    MediaType providedMediaType = producesMediaTypes[0];
+                    if (!providedMediaType.isCompatible(acceptsMediaType)) {
+                        throw new NotAcceptableException();
+                    }
+                } else if (multipleAcceptsValues && (producesMediaTypes.length == 1)) {
+                    // this is fairly common case, so we want it to be as fast as possible
+                    // we do that by manually splitting the accepts header and immediately checking
+                    // if the value is compatible with the produces media type
+                    boolean compatible = false;
+                    int begin = 0;
+
+                    do {
+                        String acceptPart;
+                        if (commaIndex == -1) { // this is the case where we are checking the remainder of the string
+                            acceptPart = accepts.substring(begin);
+                        } else {
+                            acceptPart = accepts.substring(begin, commaIndex);
+                        }
+                        if (producesMediaTypes[0].isCompatible(toMediaType(acceptPart.trim()))) {
+                            compatible = true;
+                            break;
+                        } else if (commaIndex == -1) { // we have reached the end and not found any compatible media types
+                            break;
+                        }
+                        begin = commaIndex + 1; // the next part will start at the character after the comma
+                        if (begin >= (accepts.length() - 1)) { // if we have reached this point, then are no compatible media types
+                            break;
+                        }
+                        commaIndex = accepts.indexOf(',', begin);
+                    } while (true);
+
+                    if (!compatible) {
+                        throw new NotAcceptableException();
+                    }
+                } else {
+                    // don't use any of the JAX-RS stuff from the various MediaType helper as we want to be as performant as possible
+                    List<MediaType> acceptsMediaTypes;
+                    if (accepts.contains(",")) {
+                        String[] parts = accepts.split(",");
+                        acceptsMediaTypes = new ArrayList<>(parts.length);
+                        for (int i = 0; i < parts.length; i++) {
+                            String part = parts[i];
+                            acceptsMediaTypes.add(toMediaType(part.trim()));
+                        }
+                    } else {
+                        acceptsMediaTypes = Collections.singletonList(toMediaType(accepts));
+                    }
+                    if (MediaTypeHelper.getFirstMatch(Arrays.asList(producesMediaTypes),
+                            acceptsMediaTypes) == null) {
+                        throw new NotAcceptableException();
+                    }
+                }
+            }
+        }
+
+        requestContext.restart(target.value);
+        requestContext.setRemaining(target.remaining);
+        for (int i = 0; i < target.pathParamValues.length; ++i) {
+            String pathParamValue = target.pathParamValues[i];
+            if (pathParamValue == null) {
+                break;
+            }
+            requestContext.setPathParamValue(i + parameterOffset, pathParamValue);
+        }
+    }
+
+    private MediaType toMediaType(String mediaTypeStr) {
+        return MediaTypeHeaderDelegate.parse(mediaTypeStr);
+    }
+
+    private void throwNotFound(ResteasyReactiveRequestContext requestContext) {
+        // the exception mapper needs access to request scoped beans, so make sure we have the context
+        requestContext.requireCDIRequestScope();
+        throw new NotFoundException();
+    }
+
+    private String getRemaining(ResteasyReactiveRequestContext requestContext) {
+        return requestContext.getRemaining().isEmpty() ? "/" : requestContext.getRemaining();
+    }
+
+    public Map<String, RequestMapper<RuntimeResource>> getMappers() {
+        return mappers;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java
new file mode 100644
index 0000000000000..78730e984c11d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/CompletionStageResponseHandler.java
@@ -0,0 +1,27 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.concurrent.CompletionStage;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class CompletionStageResponseHandler implements ServerRestHandler {
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        // FIXME: handle Response with entity being a CompletionStage
+        if (requestContext.getResult() instanceof CompletionStage) {
+            CompletionStage<?> result = (CompletionStage<?>) requestContext.getResult();
+            requestContext.suspend();
+
+            result.handle((v, t) -> {
+                if (t != null) {
+                    requestContext.handleException(t);
+                } else {
+                    requestContext.setResult(v);
+                }
+                requestContext.resume();
+                return null;
+            });
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ExceptionHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ExceptionHandler.java
new file mode 100644
index 0000000000000..dc6a06aa29c66
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ExceptionHandler.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Our job is to turn an exception into a Response instance. This is only present in the abort chain
+ */
+public class ExceptionHandler implements ServerRestHandler {
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        requestContext.mapExceptionIfPresent();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java
new file mode 100644
index 0000000000000..0e618046c034b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java
@@ -0,0 +1,48 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Variant;
+import org.jboss.resteasy.reactive.server.core.EncodedMediaType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.serialization.EntityWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Handler that negotiates the content type for endpoints that
+ * only produce a single type.
+ */
+public class FixedProducesHandler implements ServerRestHandler {
+
+    final EncodedMediaType mediaType;
+    final String mediaTypeString;
+    final String mediaTypeSubstring;
+    final EntityWriter writer;
+
+    public FixedProducesHandler(MediaType mediaType, EntityWriter writer) {
+        this.mediaType = new EncodedMediaType(mediaType);
+        this.writer = writer;
+        this.mediaTypeString = mediaType.getType() + "/" + mediaType.getSubtype();
+        this.mediaTypeSubstring = mediaType.getType() + "/*";
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        String accept = requestContext.serverRequest().getRequestHeader(HttpHeaders.ACCEPT);
+        if (accept == null) {
+            requestContext.setResponseContentType(mediaType);
+            requestContext.setEntityWriter(writer);
+        } else {
+            //TODO: this needs to be optimised
+            if (accept.contains(mediaTypeString) || accept.contains("*/*") || accept.contains(mediaTypeSubstring)) {
+                requestContext.setResponseContentType(mediaType);
+                requestContext.setEntityWriter(writer);
+            } else {
+                throw new WebApplicationException(
+                        Response.notAcceptable(Variant.mediaTypes(mediaType.getMediaType()).build()).build());
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java
new file mode 100644
index 0000000000000..3b721dec65b3a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FormBodyHandler.java
@@ -0,0 +1,63 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class FormBodyHandler implements ServerRestHandler {
+
+    private static final byte[] NO_BYTES = new byte[0];
+
+    private final boolean alsoSetInputStream;
+
+    public FormBodyHandler(boolean alsoSetInputStream) {
+        this.alsoSetInputStream = alsoSetInputStream;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        // in some cases, with sub-resource locators or via request filters, 
+        // it's possible we've already read the entity
+        if (requestContext.hasInputStream()) {
+            // let's not set it twice
+            return;
+        }
+        ServerHttpRequest serverHttpRequest = requestContext.serverRequest();
+        if (serverHttpRequest.isRequestEnded()) {
+            if (alsoSetInputStream) {
+                // do not use the EmptyInputStream.INSTANCE marker
+                requestContext.setInputStream(new ByteArrayInputStream(NO_BYTES));
+            }
+        } else {
+            serverHttpRequest.setExpectMultipart(true);
+            requestContext.suspend();
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            serverHttpRequest.setReadListener(new ServerHttpRequest.ReadCallback() {
+                @Override
+                public void done() {
+                    requestContext.setInputStream(new ByteArrayInputStream(outputStream.toByteArray()));
+                    requestContext.resume();
+                }
+
+                @Override
+                public void data(ByteBuffer data) {
+                    // the TCK allows the body to be read as a form param and also as a body param
+                    // the spec is silent about this
+                    // TODO: this is really really horrible and hacky and needs to be fixed.
+                    byte[] buf = new byte[data.remaining()];
+                    data.get(buf);
+                    try {
+                        outputStream.write(buf);
+                    } catch (IOException ignored) {
+                        //impossible
+                    }
+                }
+            });
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java
new file mode 100644
index 0000000000000..a81a35031d86b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InputHandler.java
@@ -0,0 +1,107 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.io.ByteArrayInputStream;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.function.Supplier;
+import javax.ws.rs.HttpMethod;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Handler that reads data and sets up the input stream
+ * <p>
+ * By default this will attempt to buffer and use a fully in memory stream,
+ * to allow the request to stay on the IO thread. If the request is too large
+ * it will be delegated to an executor and a blocking stream used instead.
+ * <p>
+ * TODO: the stream implementation here could be a lot more efficient.
+ */
+public class InputHandler implements ServerRestHandler {
+
+    final long maxBufferSize;
+    private volatile Executor executor;
+    private final Supplier<Executor> supplier;
+
+    public InputHandler(long maxBufferSize, Supplier<Executor> supplier) {
+        this.maxBufferSize = maxBufferSize;
+        this.supplier = supplier;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext context) throws Exception {
+        // in some cases, with sub-resource locators or via request filters, 
+        // it's possible we've already read the entity
+        if (context.hasInputStream()) {
+            // let's not set it twice
+            return;
+        }
+        if (context.serverRequest().getRequestMethod().equals(HttpMethod.GET) ||
+                context.serverRequest().getRequestMethod().equals(HttpMethod.HEAD)) {
+            return;
+        }
+        InputListener h = new InputListener(context);
+        context.suspend();
+        ServerHttpRequest req = context.serverRequest();
+        if (!req.isRequestEnded()) {
+            req.setReadListener(h);
+            req.resumeRequestInput();
+        } else {
+            req.resumeRequestInput();
+            h.done();
+        }
+    }
+
+    class InputListener implements ServerHttpRequest.ReadCallback {
+        final ResteasyReactiveRequestContext context;
+        int dataCount;
+        final List<ByteBuffer> data = new ArrayList<>();
+
+        InputListener(ResteasyReactiveRequestContext context) {
+            this.context = context;
+        }
+
+        @Override
+        public void done() {
+            //super inefficient
+            //TODO: write a stream that just uses the existing vert.x buffers
+            byte[] ar = new byte[dataCount];
+            int count = 0;
+            for (ByteBuffer i : data) {
+                int remaining = i.remaining();
+                i.get(ar, count, remaining);
+                count += remaining;
+            }
+            context.setInputStream(new ByteArrayInputStream(ar));
+            context.resume();
+        }
+
+        @Override
+        public void data(ByteBuffer event) {
+
+            dataCount += event.remaining();
+            data.add(event);
+            if (dataCount > maxBufferSize) {
+                context.serverRequest().pauseRequestInput();
+                if (executor == null) {
+                    executor = supplier.get();
+                }
+                //super inefficient
+                //TODO: write a stream that just uses the existing vert.x buffers
+                int count = 0;
+                byte[] ar = new byte[dataCount];
+                for (ByteBuffer i : data) {
+                    int remaining = i.remaining();
+                    i.get(ar, count, remaining);
+                    count += remaining;
+                }
+                //todo timeout
+                context.setInputStream(context.serverRequest().createInputStream(ByteBuffer.wrap(ar)));
+                context.resume(executor);
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InstanceHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InstanceHandler.java
new file mode 100644
index 0000000000000..b80d1871aef36
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InstanceHandler.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class InstanceHandler implements ServerRestHandler {
+
+    /**
+     * CDI Manages the lifecycle
+     *
+     */
+    private volatile Object instance;
+    private final BeanFactory<Object> factory;
+
+    public InstanceHandler(BeanFactory<Object> factory) {
+        this.factory = factory;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        if (instance == null) {
+            synchronized (this) {
+                if (instance == null) {
+                    instance = factory.createInstance().getInstance();
+                }
+            }
+        }
+        requestContext.setEndpointInstance(instance);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java
new file mode 100644
index 0000000000000..52e424d098358
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InterceptorHandler.java
@@ -0,0 +1,23 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class InterceptorHandler implements ServerRestHandler {
+
+    private final WriterInterceptor[] writerInterceptors;
+    private final ReaderInterceptor[] readerInterceptors;
+
+    public InterceptorHandler(WriterInterceptor[] writerInterceptors, ReaderInterceptor[] readerInterceptors) {
+        this.writerInterceptors = writerInterceptors;
+        this.readerInterceptors = readerInterceptors;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        requestContext.setWriterInterceptors(writerInterceptors);
+        requestContext.setReaderInterceptors(readerInterceptors);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InvocationHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InvocationHandler.java
new file mode 100644
index 0000000000000..fa6b806aa03bb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InvocationHandler.java
@@ -0,0 +1,41 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class InvocationHandler implements ServerRestHandler {
+    private final EndpointInvoker invoker;
+
+    public InvocationHandler(EndpointInvoker invoker) {
+        this.invoker = invoker;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        if (requestContext.getResult() != null) {
+            //processing was aborted
+            //but we still follow through with the handler chain
+            return;
+        }
+        //suspend processing
+        //need to do it here to avoid a race
+        boolean async = requestContext.getAsyncResponse() != null;
+        if (async) {
+            requestContext.suspend();
+        }
+        requestContext.requireCDIRequestScope();
+        try {
+            Object result = invoker.invoke(requestContext.getEndpointInstance(), requestContext.getParameters());
+            if (!async) {
+                requestContext.setResult(result);
+            }
+        } catch (Throwable t) {
+            // passing true since the target doesn't change and we want response filters to be able to know what the resource method was
+            requestContext.handleException(t, true);
+            if (async) {
+                requestContext.resume();
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MatrixParamHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MatrixParamHandler.java
new file mode 100644
index 0000000000000..9ce0683359e65
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MatrixParamHandler.java
@@ -0,0 +1,13 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class MatrixParamHandler implements ServerRestHandler {
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        if (requestContext.getPath().contains(";")) {
+            requestContext.initPathSegments();
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java
new file mode 100644
index 0000000000000..9418aa68c14ce
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java
@@ -0,0 +1,137 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Handler that deals with the case when two methods have the same path,
+ * and it needs to select based on content type.
+ * <p>
+ * This is not super optimised, as it is not a common case. Most apps
+ * won't every use this handler.
+ */
+public class MediaTypeMapper implements ServerRestHandler {
+
+    final Map<MediaType, Holder> resourcesByConsumes;
+    final List<MediaType> consumesTypes;
+
+    public MediaTypeMapper(List<RuntimeResource> runtimeResources) {
+        resourcesByConsumes = new HashMap<>();
+        consumesTypes = new ArrayList<>();
+        for (RuntimeResource runtimeResource : runtimeResources) {
+            MediaType consumesMT = runtimeResource.getConsumes().isEmpty() ? MediaType.WILDCARD_TYPE
+                    : runtimeResource.getConsumes().get(0);
+            if (!resourcesByConsumes.containsKey(consumesMT)) {
+                consumesTypes.add(consumesMT);
+                resourcesByConsumes.put(consumesMT, new Holder());
+            }
+            MediaType[] produces = runtimeResource.getProduces() != null
+                    ? runtimeResource.getProduces().getSortedOriginalMediaTypes()
+                    : null;
+            if (produces == null) {
+                produces = new MediaType[] { MediaType.WILDCARD_TYPE };
+            }
+            for (MediaType producesMT : produces) {
+                resourcesByConsumes.get(consumesMT).setResource(runtimeResource, producesMT);
+            }
+        }
+        for (Holder holder : resourcesByConsumes.values()) {
+            holder.setupServerMediaType();
+        }
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        String contentType = requestContext.serverRequest().getRequestHeader(HttpHeaders.CONTENT_TYPE);
+        // if there's no Content-Type it's */*
+        MediaType contentMediaType = contentType != null ? MediaType.valueOf(contentType) : MediaType.WILDCARD_TYPE;
+        // find the best matching consumes type. Note that the arguments are reversed from their definition
+        // of desired/provided, but we do want the result to be a media type we consume, since that's how we key
+        // our methods, rather than the single media type we get from the client. This way we ensure we get the
+        // best match.
+        MediaType consumes = MediaTypeHelper.getBestMatch(Collections.singletonList(contentMediaType),
+                consumesTypes);
+        Holder selectedHolder = resourcesByConsumes.get(consumes);
+        // if we haven't found anything, try selecting the wildcard type, if any
+        if (selectedHolder == null) {
+            selectedHolder = resourcesByConsumes.get(MediaType.WILDCARD_TYPE);
+        }
+        if (selectedHolder == null) {
+            throw new WebApplicationException(Response.status(Response.Status.UNSUPPORTED_MEDIA_TYPE).build());
+        }
+        RuntimeResource selectedResource;
+        if (selectedHolder.mtWithoutParamsToResource.size() == 1) {
+            selectedResource = selectedHolder.mtWithoutParamsToResource.values().iterator().next();
+        } else {
+            MediaType produces = selectMediaType(requestContext, selectedHolder);
+            requestContext.setResponseContentType(produces);
+            MediaType key = produces;
+            if (!key.getParameters().isEmpty()) {
+                key = new MediaType(key.getType(), key.getSubtype());
+            }
+            selectedResource = selectedHolder.mtWithoutParamsToResource.get(key);
+            if (selectedResource == null) {
+                selectedResource = selectedHolder.mtWithoutParamsToResource.get(MediaType.WILDCARD_TYPE);
+            }
+        }
+
+        if (selectedResource == null) {
+            throw new WebApplicationException(Response.status(416).build());
+        }
+        requestContext.restart(selectedResource);
+    }
+
+    public MediaType selectMediaType(ResteasyReactiveRequestContext requestContext, Holder holder) {
+        MediaType selected = null;
+        ServerHttpRequest httpServerRequest = requestContext.serverRequest();
+        if (httpServerRequest.containsRequestHeader(HttpHeaders.ACCEPT)) {
+            Map.Entry<MediaType, MediaType> entry = holder.serverMediaType
+                    .negotiateProduces(requestContext.serverRequest().getRequestHeader(HttpHeaders.ACCEPT), null);
+            if (entry.getValue() != null) {
+                selected = entry.getValue();
+            }
+        }
+        if (selected == null) {
+            selected = holder.mtsWithParams.get(0);
+        }
+        if (selected.equals(MediaType.WILDCARD_TYPE)) {
+            return MediaType.APPLICATION_OCTET_STREAM_TYPE;
+        }
+        return selected;
+    }
+
+    private static final class Holder {
+
+        private final Map<MediaType, RuntimeResource> mtWithoutParamsToResource = new HashMap<>();
+        private final List<MediaType> mtsWithParams = new ArrayList<>();
+        private ServerMediaType serverMediaType;
+
+        public void setResource(RuntimeResource runtimeResource, MediaType mediaType) {
+            MediaType withoutParams = mediaType;
+            MediaType withParas = mediaType;
+            if (!mediaType.getParameters().isEmpty()) {
+                withoutParams = new MediaType(mediaType.getType(), mediaType.getSubtype());
+            }
+            mtWithoutParamsToResource.put(withoutParams, runtimeResource);
+            mtsWithParams.add(withParas);
+        }
+
+        public void setupServerMediaType() {
+            serverMediaType = new ServerMediaType(mtsWithParams, StandardCharsets.UTF_8.name(), true, false);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java
new file mode 100644
index 0000000000000..4d5494b0bbf21
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ParameterHandler.java
@@ -0,0 +1,132 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.Collection;
+import java.util.function.BiConsumer;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.WebApplicationException;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverter;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class ParameterHandler implements ServerRestHandler {
+
+    private final int index;
+    private final String defaultValue;
+    private final ParameterExtractor extractor;
+    private final ParameterConverter converter;
+    private final ParameterType parameterType;
+    private final boolean isCollection;
+    private final boolean isOptional;
+
+    public ParameterHandler(int index, String defaultValue, ParameterExtractor extractor, ParameterConverter converter,
+            ParameterType parameterType, boolean isCollection, boolean isOptional) {
+        this.index = index;
+        this.defaultValue = defaultValue;
+        this.extractor = extractor;
+        this.converter = converter;
+        this.parameterType = parameterType;
+        this.isCollection = isCollection;
+        this.isOptional = isOptional;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) {
+        try {
+            Object result = extractor.extractParameter(requestContext);
+            if (result instanceof ParameterExtractor.ParameterCallback) {
+                requestContext.suspend();
+                ((ParameterExtractor.ParameterCallback) result).setListener(new BiConsumer<Object, Throwable>() {
+                    @Override
+                    public void accept(Object o, Throwable throwable) {
+                        if (throwable != null) {
+                            requestContext.resume(throwable);
+                        } else {
+                            handleResult(o, requestContext, true);
+                        }
+                    }
+                });
+            } else {
+                handleResult(result, requestContext, false);
+            }
+        } catch (Exception e) {
+            if (e instanceof WebApplicationException) {
+                throw e;
+            } else {
+                throw new WebApplicationException(e, 400);
+            }
+        }
+    }
+
+    private void handleResult(Object result, ResteasyReactiveRequestContext requestContext, boolean needsResume) {
+        // empty collections should still get their default value
+        if (defaultValue != null
+                && (result == null || (isCollection && ((Collection) result).isEmpty()))) {
+            result = defaultValue;
+        }
+        Throwable toThrow = null;
+        if (converter != null && ((result != null) || isOptional)) {
+            // spec says: 
+            /*
+             * 3.2 Fields and Bean Properties
+             * if the field or property is annotated with @MatrixParam, @QueryParam or @PathParam then an implementation
+             * MUST generate an instance of NotFoundException (404 status) that wraps the thrown exception and no
+             * entity; if the field or property is annotated with @HeaderParam or @CookieParam then an implementation
+             * MUST generate an instance of BadRequestException (400 status) that wraps the thrown exception and
+             * no entity.
+             * 3.3.2 Parameters
+             * Exceptions thrown during construction of @FormParam annotated parameter values are treated the same as if
+             * the parameter were annotated with @HeaderParam.
+             */
+            switch (parameterType) {
+                case COOKIE:
+                case HEADER:
+                case FORM:
+                    try {
+                        result = converter.convert(result);
+                    } catch (WebApplicationException x) {
+                        toThrow = x;
+                    } catch (Throwable x) {
+                        toThrow = new BadRequestException(x);
+                    }
+                    break;
+                case MATRIX:
+                case PATH:
+                case QUERY:
+                    try {
+                        result = converter.convert(result);
+                    } catch (WebApplicationException x) {
+                        toThrow = x;
+                    } catch (Throwable x) {
+                        toThrow = new NotFoundException(x);
+                    }
+                    break;
+                default:
+                    try {
+                        result = converter.convert(result);
+                    } catch (Throwable x) {
+                        toThrow = x;
+                    }
+                    break;
+            }
+        }
+        if (toThrow == null) {
+            requestContext.getParameters()[index] = result;
+        }
+        if (needsResume) {
+            if (toThrow == null) {
+                requestContext.resume();
+            } else {
+                requestContext.resume(toThrow);
+            }
+        } else if (toThrow != null) {
+            throw sneakyThrow(toThrow);
+        }
+    }
+
+    public static <E extends Throwable> RuntimeException sneakyThrow(Throwable e) throws E {
+        throw (E) e;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java
new file mode 100644
index 0000000000000..fad238c10563a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PerRequestInstanceHandler.java
@@ -0,0 +1,37 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.function.Function;
+import javax.ws.rs.container.CompletionCallback;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.injection.ResteasyReactiveInjectionTarget;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class PerRequestInstanceHandler implements ServerRestHandler {
+
+    /**
+     * CDI Manages the lifecycle. If this is a per request resource then this will be a client proxy
+     *
+     */
+    private final BeanFactory<Object> factory;
+    private final Function<Object, Object> clientProxyUnwrapper;
+
+    public PerRequestInstanceHandler(BeanFactory<Object> factory, Function<Object, Object> clientProxyUnwrapper) {
+        this.factory = factory;
+        this.clientProxyUnwrapper = clientProxyUnwrapper;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        BeanFactory.BeanInstance<Object> instance = factory.createInstance();
+        requestContext.setEndpointInstance(instance.getInstance());
+        ((ResteasyReactiveInjectionTarget) clientProxyUnwrapper.apply(instance.getInstance()))
+                .__quarkus_rest_inject(requestContext);
+        requestContext.registerCompletionCallback(new CompletionCallback() {
+            @Override
+            public void onComplete(Throwable throwable) {
+                instance.close();
+            }
+        });
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java
new file mode 100644
index 0000000000000..0b30d2e271469
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java
@@ -0,0 +1,210 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.nio.charset.StandardCharsets;
+import java.util.function.BiFunction;
+import javax.ws.rs.core.MediaType;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.SseUtil;
+import org.jboss.resteasy.reactive.server.core.StreamingUtil;
+import org.jboss.resteasy.reactive.server.jaxrs.OutboundSseEventImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+public class PublisherResponseHandler implements ServerRestHandler {
+
+    private static class SseMultiSubscriber extends AbstractMultiSubscriber {
+
+        SseMultiSubscriber(ResteasyReactiveRequestContext requestContext) {
+            super(requestContext);
+        }
+
+        @Override
+        public void onNext(Object item) {
+            OutboundSseEventImpl event = new OutboundSseEventImpl.BuilderImpl().data(item).build();
+            SseUtil.send(requestContext, event).handle(new BiFunction<Object, Throwable, Object>() {
+                @Override
+                public Object apply(Object v, Throwable t) {
+                    if (t != null) {
+                        // need to cancel because the exception didn't come from the Multi
+                        subscription.cancel();
+                        handleException(requestContext, t);
+                    } else {
+                        // send in the next item
+                        subscription.request(1);
+                    }
+                    return null;
+                }
+            });
+        }
+    }
+
+    private static class StreamingMultiSubscriber extends AbstractMultiSubscriber {
+
+        // Huge hack to stream valid json
+        private boolean json;
+        private String nextJsonPrefix;
+        private boolean hadItem;
+
+        StreamingMultiSubscriber(ResteasyReactiveRequestContext requestContext, boolean json) {
+            super(requestContext);
+            this.json = json;
+            this.nextJsonPrefix = "[";
+            this.hadItem = false;
+        }
+
+        @Override
+        public void onNext(Object item) {
+            hadItem = true;
+            StreamingUtil.send(requestContext, item, json ? nextJsonPrefix : null)
+                    .handle(new BiFunction<Object, Throwable, Object>() {
+                        @Override
+                        public Object apply(Object v, Throwable t) {
+                            if (t != null) {
+                                // need to cancel because the exception didn't come from the Multi
+                                try {
+                                    subscription.cancel();
+                                } catch (Throwable t2) {
+                                    t2.printStackTrace();
+                                }
+                                handleException(requestContext, t);
+                            } else {
+                                // next item will need this prefix if json
+                                nextJsonPrefix = ",";
+                                // send in the next item
+                                subscription.request(1);
+                            }
+                            return null;
+                        }
+                    });
+        }
+
+        @Override
+        public void onComplete() {
+            if (!hadItem) {
+                StreamingUtil.setHeaders(requestContext, requestContext.serverResponse());
+            }
+            if (json) {
+                String postfix;
+                // check if we never sent the open prefix
+                if (!hadItem) {
+                    postfix = "[]";
+                } else {
+                    postfix = "]";
+                }
+                byte[] postfixBytes = postfix.getBytes(StandardCharsets.US_ASCII);
+                requestContext.serverResponse().write(postfixBytes).handle((v, t) -> {
+                    super.onComplete();
+                    return null;
+                });
+            } else {
+                super.onComplete();
+            }
+        }
+    }
+
+    static abstract class AbstractMultiSubscriber implements Subscriber<Object> {
+        protected Subscription subscription;
+        protected ResteasyReactiveRequestContext requestContext;
+        private boolean weClosed = false;
+
+        AbstractMultiSubscriber(ResteasyReactiveRequestContext requestContext) {
+            this.requestContext = requestContext;
+            // let's make sure we never restart by accident, also make sure we're not marked as completed
+            requestContext.restart(AWOL, true);
+            requestContext.serverResponse().addCloseHandler(() -> {
+                if (!weClosed && this.subscription != null) {
+                    subscription.cancel();
+                }
+            });
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            this.subscription = s;
+            // initially ask for one item
+            s.request(1);
+        }
+
+        @Override
+        public void onComplete() {
+            // make sure we don't trigger cancel with our onCloseHandler
+            weClosed = true;
+            // no need to cancel on complete
+            // FIXME: are we interested in async completion?
+            requestContext.serverResponse().end();
+            // so, if I don't also close the connection, the client isn't notified that the request is over
+            // I guess that's true of chunked responses, but not clear why I need to close the connection
+            // because it means it can't get reused, right?
+            requestContext.serverRequest().closeConnection();
+            requestContext.close();
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            // no need to cancel on error
+            handleException(requestContext, t);
+        }
+
+        protected void handleException(ResteasyReactiveRequestContext requestContext, Throwable t) {
+            // in truth we can only send an exception if we haven't sent the headers yet, otherwise
+            // it will appear to be an SSE value, which is incorrect, so we should only log it and close the connection
+            if (requestContext.serverResponse().headWritten()) {
+                log.error("Exception in SSE server handling, impossible to send it to client", t);
+            } else {
+                // we can go through the abort chain
+                requestContext.resume(t, true);
+            }
+        }
+    }
+
+    private static final Logger log = Logger.getLogger(PublisherResponseHandler.class);
+
+    private static final ServerRestHandler[] AWOL = new ServerRestHandler[] {
+            new ServerRestHandler() {
+
+                @Override
+                public void handle(ResteasyReactiveRequestContext requestContext)
+                        throws Exception {
+                    throw new IllegalStateException("FAILURE: should never be restarted");
+                }
+            }
+    };
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        // FIXME: handle Response with entity being a Multi
+        if (requestContext.getResult() instanceof Publisher) {
+            Publisher<?> result = (Publisher<?>) requestContext.getResult();
+            // FIXME: if we make a pretend Response and go through the normal route, we will get
+            // media type negotiation and fixed entity writer set up, perhaps it's better than
+            // cancelling the normal route?
+            // or make this SSE produce build-time
+            MediaType[] mediaTypes = requestContext.getTarget().getProduces().getSortedMediaTypes();
+            if (mediaTypes.length != 1)
+                throw new IllegalStateException(
+                        "Negotiation or dynamic media type not supported yet for Multi: please use a single @Produces annotation");
+            requestContext.setResponseContentType(mediaTypes[0]);
+            // this is the non-async return type
+            requestContext.setGenericReturnType(requestContext.getTarget().getReturnType());
+            // we have several possibilities here, but in all we suspend
+            requestContext.suspend();
+            if (mediaTypes[0].isCompatible(MediaType.SERVER_SENT_EVENTS_TYPE)) {
+                handleSse(requestContext, result);
+            } else {
+                boolean json = mediaTypes[0].isCompatible(MediaType.APPLICATION_JSON_TYPE);
+                handleStreaming(requestContext, result, json);
+            }
+        }
+    }
+
+    private void handleStreaming(ResteasyReactiveRequestContext requestContext, Publisher<?> result, boolean json) {
+        result.subscribe(new StreamingMultiSubscriber(requestContext, json));
+    }
+
+    private void handleSse(ResteasyReactiveRequestContext requestContext, Publisher<?> result) {
+        result.subscribe(new SseMultiSubscriber(requestContext));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java
new file mode 100644
index 0000000000000..1d6478a131c96
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RequestDeserializeHandler.java
@@ -0,0 +1,117 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.NoContentException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.ReaderInterceptor;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.jaxrs.ReaderInterceptorContextImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class RequestDeserializeHandler implements ServerRestHandler {
+
+    private static final Logger log = Logger.getLogger(RequestDeserializeHandler.class);
+
+    private final Class<?> type;
+    private final Type genericType;
+    private final MediaType mediaType;
+    private final ServerSerialisers serialisers;
+    private final int parameterIndex;
+
+    public RequestDeserializeHandler(Class<?> type, Type genericType, MediaType mediaType, ServerSerialisers serialisers,
+            int parameterIndex) {
+        this.type = type;
+        this.genericType = genericType;
+        this.mediaType = mediaType;
+        this.serialisers = serialisers;
+        this.parameterIndex = parameterIndex;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        MediaType effectiveRequestType = mediaType;
+        String requestTypeString = requestContext.serverRequest().getRequestHeader(HttpHeaders.CONTENT_TYPE);
+        if (requestTypeString != null) {
+            try {
+                effectiveRequestType = MediaTypeHelper.withSuffixAsSubtype(MediaType.valueOf(requestTypeString));
+            } catch (Exception e) {
+                throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST).build());
+            }
+        } else if (effectiveRequestType == null) {
+            effectiveRequestType = MediaType.APPLICATION_OCTET_STREAM_TYPE;
+        }
+        List<MessageBodyReader<?>> readers = serialisers.findReaders(null, type, effectiveRequestType, RuntimeType.SERVER);
+        if (readers.isEmpty()) {
+            throw new NotSupportedException();
+        }
+        for (MessageBodyReader<?> reader : readers) {
+            if (isReadable(reader, requestContext, effectiveRequestType)) {
+                Object result;
+                ReaderInterceptor[] interceptors = requestContext.getReaderInterceptors();
+                try {
+                    try {
+                        if (interceptors == null) {
+                            result = readFrom(reader, requestContext, effectiveRequestType);
+                        } else {
+                            result = new ReaderInterceptorContextImpl(requestContext,
+                                    getAnnotations(requestContext),
+                                    type, genericType, effectiveRequestType, reader, requestContext.getInputStream(),
+                                    interceptors,
+                                    serialisers)
+                                            .proceed();
+                        }
+                    } catch (NoContentException e) {
+                        throw new BadRequestException(e);
+                    }
+                } catch (Exception e) {
+                    log.debug("Error occurred during deserialization of input", e);
+                    requestContext.handleException(e, true);
+                    requestContext.resume();
+                    return;
+                }
+                requestContext.setRequestEntity(result);
+                requestContext.resume();
+                return;
+            }
+        }
+        throw new NotSupportedException();
+    }
+
+    private boolean isReadable(MessageBodyReader<?> reader, ResteasyReactiveRequestContext requestContext,
+            MediaType requestType) {
+        if (reader instanceof ServerMessageBodyReader) {
+            return ((ServerMessageBodyReader<?>) reader).isReadable(type, genericType,
+                    requestContext.getTarget().getLazyMethod(),
+                    requestType);
+        }
+        return reader.isReadable(type, genericType, getAnnotations(requestContext), requestType);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Object readFrom(MessageBodyReader<?> reader, ResteasyReactiveRequestContext requestContext, MediaType requestType)
+            throws IOException {
+        if (reader instanceof ServerMessageBodyReader) {
+            return ((ServerMessageBodyReader<?>) reader).readFrom((Class) type, genericType, requestType, requestContext);
+        }
+        return reader.readFrom((Class) type, genericType, getAnnotations(requestContext), requestType,
+                requestContext.getHttpHeaders().getRequestHeaders(), requestContext.getInputStream());
+    }
+
+    private Annotation[] getAnnotations(ResteasyReactiveRequestContext requestContext) {
+        return requestContext.getTarget().getLazyMethod().getParameterAnnotations(parameterIndex);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java
new file mode 100644
index 0000000000000..807fd05fe388b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceLocatorHandler.java
@@ -0,0 +1,162 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.container.CompletionCallback;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ResourceLocatorHandler implements ServerRestHandler {
+
+    private final Map<Class<?>, Map<String, RequestMapper<RuntimeResource>>> resourceLocatorHandlers = new ConcurrentHashMap<>();
+    private final Function<Class<?>, BeanFactory.BeanInstance<?>> instantiator;
+
+    public ResourceLocatorHandler(Function<Class<?>, BeanFactory.BeanInstance<?>> instantiator) {
+        this.instantiator = instantiator;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        Object locator = requestContext.getResult();
+        if (locator == null) {
+            return;
+        }
+        Class<?> locatorClass;
+        if (locator instanceof Class) {
+            locatorClass = (Class<?>) locator;
+            BeanFactory.BeanInstance<?> instance = instantiator.apply(locatorClass);
+            requestContext.registerCompletionCallback(new CompletionCallback() {
+                @Override
+                public void onComplete(Throwable throwable) {
+                    instance.close();
+                }
+            });
+            locator = instance.getInstance();
+            if (locator == null) {
+                //TODO: we should make sure ArC always picks up these classes and makes them beans
+                //but until we get a bug report about it lets not worry for now, as I don't think anyone
+                //really uses this
+                locator = locatorClass.newInstance();
+            }
+        } else {
+            locatorClass = locator.getClass();
+        }
+        Map<String, RequestMapper<RuntimeResource>> target = findTarget(locatorClass);
+        if (target == null) {
+            throw new RuntimeException("Resource locator method returned object that was not a resource: " + locator);
+        }
+        RequestMapper<RuntimeResource> mapper = target.get(requestContext.getMethod());
+        boolean hadNullMethodMapper = false;
+        if (mapper == null) {
+            mapper = target.get(null); //another layer of resource locators maybe
+            // we set this without checking if we matched, but we only use it after
+            // we check for a null mapper, so by the time we use it, it must have meant that
+            // we had a matcher for a null method
+            hadNullMethodMapper = true;
+        }
+        if (mapper == null) {
+            throw new WebApplicationException(Response.status(Response.Status.METHOD_NOT_ALLOWED.getStatusCode()).build());
+        }
+        RequestMapper.RequestMatch<RuntimeResource> res = mapper
+                .map(requestContext.getRemaining().isEmpty() ? "/" : requestContext.getRemaining());
+        if (res == null) {
+            // the TCK checks for both these return statuses
+            if (hadNullMethodMapper)
+                throw new WebApplicationException(Response.status(Response.Status.METHOD_NOT_ALLOWED.getStatusCode()).build());
+            throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND.getStatusCode()).build());
+        }
+        requestContext.saveUriMatchState();
+        requestContext.setRemaining(res.remaining);
+        requestContext.setEndpointInstance(locator);
+        requestContext.setResult(null);
+        requestContext.restart(res.value, true);
+        requestContext.setMaxPathParams(res.pathParamValues.length);
+        for (int i = 0; i < res.pathParamValues.length; ++i) {
+            String pathParamValue = res.pathParamValues[i];
+            if (pathParamValue == null) {
+                break;
+            }
+            requestContext.setPathParamValue(i, pathParamValue);
+        }
+
+    }
+
+    private Map<String, RequestMapper<RuntimeResource>> findTarget(Class<?> locatorClass) {
+        if (locatorClass == Object.class || locatorClass == null) {
+            return null;
+        }
+        Map<String, RequestMapper<RuntimeResource>> res = resourceLocatorHandlers.get(locatorClass);
+        if (res != null) {
+            return res;
+        }
+        //not found, so we need to compute one
+        //we look through all interfaces and superclasses
+        //we need to do this as it could implement multiple interfaces
+        List<Map<String, RequestMapper<RuntimeResource>>> results = new ArrayList<>();
+        Set<Class<?>> seen = new HashSet<>();
+        findTargetRecursive(locatorClass, results, seen);
+        Map<String, List<RequestMapper.RequestPath<RuntimeResource>>> newMapper = new HashMap<>();
+        for (Map<String, RequestMapper<RuntimeResource>> i : results) {
+            for (Map.Entry<String, RequestMapper<RuntimeResource>> entry : i.entrySet()) {
+                List<RequestMapper.RequestPath<RuntimeResource>> list = newMapper.get(entry.getKey());
+                if (list == null) {
+                    newMapper.put(entry.getKey(), list = new ArrayList<>());
+                }
+                list.addAll(entry.getValue().getTemplates());
+            }
+        }
+        Map<String, RequestMapper<RuntimeResource>> finalResult = new HashMap<>();
+        for (Map.Entry<String, List<RequestMapper.RequestPath<RuntimeResource>>> i : newMapper.entrySet()) {
+            finalResult.put(i.getKey(), new RequestMapper<RuntimeResource>(i.getValue()));
+        }
+        //it does not matter if this is computed twice
+        resourceLocatorHandlers.put(locatorClass, finalResult);
+        return finalResult;
+    }
+
+    private void findTargetRecursive(Class<?> locatorClass, List<Map<String, RequestMapper<RuntimeResource>>> found,
+            Set<Class<?>> seen) {
+        if (locatorClass == Object.class || locatorClass == null) {
+            return;
+        }
+        boolean superRequired = true;
+        Map<String, RequestMapper<RuntimeResource>> res = resourceLocatorHandlers.get(locatorClass);
+        if (res != null) {
+            found.add(res);
+            superRequired = false;
+        }
+        for (Class<?> iface : locatorClass.getInterfaces()) {
+            if (seen.contains(iface)) {
+                continue;
+            }
+            seen.add(iface);
+            res = resourceLocatorHandlers.get(iface);
+            if (res != null) {
+                found.add(res);
+            }
+            for (Class<?> i : iface.getInterfaces()) {
+                findTargetRecursive(i, found, seen);
+            }
+        }
+        if (superRequired) {
+            findTargetRecursive(locatorClass.getSuperclass(), found, seen);
+        }
+    }
+
+    public void addResource(Class<?> resourceClass, Map<String, RequestMapper<RuntimeResource>> requestMapper) {
+        Class<?> c = resourceClass;
+        resourceLocatorHandlers.put(c, requestMapper);
+
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java
new file mode 100644
index 0000000000000..ef7baca00fb13
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceRequestFilterHandler.java
@@ -0,0 +1,36 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import javax.ws.rs.container.ContainerRequestFilter;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class ResourceRequestFilterHandler implements ServerRestHandler {
+
+    private final ContainerRequestFilter filter;
+    private final boolean preMatch;
+
+    public ResourceRequestFilterHandler(ContainerRequestFilter filter, boolean preMatch) {
+        this.filter = filter;
+        this.preMatch = preMatch;
+    }
+
+    public ContainerRequestFilter getFilter() {
+        return filter;
+    }
+
+    public boolean isPreMatch() {
+        return preMatch;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        ContainerRequestContextImpl filterContext = requestContext.getContainerRequestContext();
+        if (filterContext.isAborted()) {
+            return;
+        }
+        requestContext.requireCDIRequestScope();
+        filterContext.setPreMatch(preMatch);
+        filter.filter(filterContext);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java
new file mode 100644
index 0000000000000..536468260f5d2
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResourceResponseFilterHandler.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ContainerRequestContextImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class ResourceResponseFilterHandler implements ServerRestHandler {
+
+    private final ContainerResponseFilter filter;
+
+    public ResourceResponseFilterHandler(ContainerResponseFilter filter) {
+        this.filter = filter;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        requestContext.requireCDIRequestScope();
+        ContainerRequestContextImpl filterRequestContext = requestContext.getContainerRequestContext();
+        filterRequestContext.setResponse(true);
+        filterRequestContext.setPreMatch(false);
+        ContainerResponseContext filterResponseContext = requestContext.getContainerResponseContext();
+        filter.filter(filterRequestContext, filterResponseContext);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java
new file mode 100644
index 0000000000000..671c6f5bb91ea
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseHandler.java
@@ -0,0 +1,103 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
+import org.jboss.resteasy.reactive.server.core.EncodedMediaType;
+import org.jboss.resteasy.reactive.server.core.LazyResponse;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Our job is to turn endpoint return types into Response instances
+ */
+public class ResponseHandler implements ServerRestHandler {
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        Object result = requestContext.getResult();
+        if (result instanceof Response) {
+            boolean mediaTypeAlreadyExists = false;
+            //we already have a response
+            //set it explicitly
+            Response.ResponseBuilder responseBuilder;
+            Response existing = (Response) result;
+            if (existing.getEntity() instanceof GenericEntity) {
+                GenericEntity<?> genericEntity = (GenericEntity<?>) existing.getEntity();
+                requestContext.setGenericReturnType(genericEntity.getType());
+                responseBuilder = Response.fromResponse(existing).entity(genericEntity.getEntity());
+            } else {
+                // TCK says to use the entity type as generic type if we return a response
+                if (existing.hasEntity())
+                    requestContext.setGenericReturnType(existing.getEntity().getClass());
+                //TODO: super inefficent
+                responseBuilder = Response.fromResponse((Response) result);
+                if ((result instanceof ResponseImpl)) {
+                    // needed in order to preserve entity annotations
+                    ResponseImpl responseImpl = (ResponseImpl) result;
+                    if (responseImpl.getEntityAnnotations() != null) {
+                        requestContext.setAdditionalAnnotations(responseImpl.getEntityAnnotations());
+                    }
+                }
+            }
+            if (existing.getMediaType() != null) {
+                requestContext.setResponseContentType(existing.getMediaType());
+                mediaTypeAlreadyExists = true;
+            }
+            EncodedMediaType produces = requestContext.getResponseContentType();
+            if (!mediaTypeAlreadyExists && produces != null) {
+                responseBuilder.header(HttpHeaders.CONTENT_TYPE, produces.toString());
+            }
+            if ((responseBuilder instanceof ResponseBuilderImpl)) {
+                // avoid unnecessary copying of HTTP headers from the Builder to the Response
+                requestContext
+                        .setResponse(
+                                new LazyResponse.Existing(((ResponseBuilderImpl) responseBuilder).build(false)));
+            } else {
+                requestContext.setResponse(new LazyResponse.Existing(responseBuilder.build()));
+            }
+        } else {
+            requestContext.setResponse(new LazyResponse() {
+
+                Response response;
+
+                @Override
+                public Response get() {
+                    if (response == null) {
+                        Response.ResponseBuilder responseBuilder;
+                        if (result instanceof GenericEntity) {
+                            GenericEntity<?> genericEntity = (GenericEntity<?>) result;
+                            requestContext.setGenericReturnType(genericEntity.getType());
+                            responseBuilder = ResponseImpl.ok(genericEntity.getEntity());
+                        } else if (result == null) {
+                            // FIXME: custom status codes depending on method?
+                            responseBuilder = ResponseImpl.noContent();
+                        } else {
+                            // FIXME: custom status codes depending on method?
+                            responseBuilder = ResponseImpl.ok(result);
+                        }
+                        EncodedMediaType produces = requestContext.getResponseContentType();
+                        if (produces != null) {
+                            responseBuilder.header(HttpHeaders.CONTENT_TYPE, produces.toString());
+                        }
+                        if ((responseBuilder instanceof ResponseBuilderImpl)) {
+                            // avoid unnecessary copying of HTTP headers from the Builder to the Response
+                            response = ((ResponseBuilderImpl) responseBuilder).build(false);
+                        } else {
+                            response = responseBuilder.build();
+                        }
+                    }
+                    return response;
+                }
+
+                @Override
+                public boolean isCreated() {
+                    return response != null;
+                }
+            });
+
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java
new file mode 100644
index 0000000000000..8f359b41ce16d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/ResponseWriterHandler.java
@@ -0,0 +1,66 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.core.serialization.DynamicEntityWriter;
+import org.jboss.resteasy.reactive.server.core.serialization.EntityWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Our job is to write a Response
+ */
+public class ResponseWriterHandler implements ServerRestHandler {
+
+    public static final String HEAD = "HEAD";
+    private final DynamicEntityWriter dynamicEntityWriter;
+
+    public ResponseWriterHandler(DynamicEntityWriter dynamicEntityWriter) {
+        this.dynamicEntityWriter = dynamicEntityWriter;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        Object entity = requestContext.getResponseEntity();
+        if (entity != null && !requestContext.getMethod().equals(HEAD)) {
+            EntityWriter entityWriter = requestContext.getEntityWriter();
+            if (entityWriter == null) {
+                dynamicEntityWriter.write(requestContext, entity);
+            } else {
+                entityWriter.write(requestContext, entity);
+            }
+        } else {
+            setContentTypeIfNecessary(requestContext);
+            ServerSerialisers.encodeResponseHeaders(requestContext);
+            requestContext.serverResponse().end();
+        }
+    }
+
+    // set the content type header to what the resource method uses as a final fallback
+    private void setContentTypeIfNecessary(ResteasyReactiveRequestContext requestContext) {
+        if (hasBody(requestContext)
+                && requestContext.getTarget() != null
+                && requestContext.getTarget().getProduces() != null
+                && requestContext.getResponseContentType() == null) {
+            ServerMediaType serverMediaType = requestContext.getTarget().getProduces();
+            if (serverMediaType.getSortedOriginalMediaTypes().length > 0) {
+                requestContext.serverResponse().setResponseHeader(HttpHeaders.CONTENT_TYPE,
+                        serverMediaType.getSortedOriginalMediaTypes()[0].toString());
+            }
+        }
+    }
+
+    private boolean hasBody(ResteasyReactiveRequestContext requestContext) {
+        // pretend it has, because we want content-type/length headers
+        if (requestContext.getMethod().equals(HEAD))
+            return true;
+        if (requestContext.getResponse().isCreated()) {
+            int status = requestContext.getResponse().get().getStatus();
+            return status != Response.Status.NO_CONTENT.getStatusCode();
+        } else {
+            return requestContext.getResponseEntity() != null;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java
new file mode 100644
index 0000000000000..4e6442ba6f5cf
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/RestInitialHandler.java
@@ -0,0 +1,81 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.List;
+import javax.ws.rs.NotFoundException;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.RequestContextFactory;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class RestInitialHandler implements ServerRestHandler {
+
+    final RequestMapper<InitialMatch> mappers;
+    final Deployment deployment;
+    final ProvidersImpl providers;
+    final List<ServerRestHandler> preMappingHandlers;
+    final ServerRestHandler[] initialChain;
+
+    final ThreadSetupAction requestContext;
+    final RequestContextFactory requestContextFactory;
+
+    public RestInitialHandler(Deployment deployment) {
+        this.mappers = new RequestMapper<>(deployment.getClassMappers());
+        this.deployment = deployment;
+        this.providers = new ProvidersImpl(deployment);
+        this.preMappingHandlers = deployment.getPreMatchHandlers();
+        if (preMappingHandlers.isEmpty()) {
+            initialChain = new ServerRestHandler[] { new MatrixParamHandler(), this };
+        } else {
+            initialChain = new ServerRestHandler[preMappingHandlers.size() + 2];
+            initialChain[0] = new MatrixParamHandler();
+            for (int i = 0; i < preMappingHandlers.size(); i++) {
+                initialChain[i + 1] = preMappingHandlers.get(i);
+            }
+            initialChain[initialChain.length - 1] = this;
+        }
+        this.requestContext = deployment.getThreadSetupAction();
+        this.requestContextFactory = deployment.getRequestContextFactory();
+    }
+
+    public void beginProcessing(Object extenalHttpContext) {
+        ResteasyReactiveRequestContext rq = requestContextFactory.createContext(deployment, providers, extenalHttpContext,
+                requestContext,
+                initialChain, deployment.getAbortHandlerChain());
+        rq.run();
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        RequestMapper.RequestMatch<InitialMatch> target = mappers.map(requestContext.getPathWithoutPrefix());
+        if (target == null) {
+            // the NotFoundExceptionMapper needs access to the headers so we need to activate the scope
+            requestContext.requireCDIRequestScope();
+            // we want to engage the NotFoundExceptionMapper when nothing is found
+            requestContext.handleException(new NotFoundException());
+            return;
+        }
+        requestContext.restart(target.value.handlers);
+        requestContext.setMaxPathParams(target.value.maxPathParams);
+        requestContext.setRemaining(target.remaining);
+        for (int i = 0; i < target.pathParamValues.length; ++i) {
+            String pathParamValue = target.pathParamValues[i];
+            if (pathParamValue == null) {
+                break;
+            }
+            requestContext.setPathParamValue(i, target.pathParamValues[i]);
+        }
+    }
+
+    public static class InitialMatch {
+        public final ServerRestHandler[] handlers;
+        public final int maxPathParams;
+
+        public InitialMatch(ServerRestHandler[] handlers, int maxPathParams) {
+            this.handlers = handlers;
+            this.maxPathParams = maxPathParams;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/SseResponseWriterHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/SseResponseWriterHandler.java
new file mode 100644
index 0000000000000..c1a2526f12224
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/SseResponseWriterHandler.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Our job is to send initial headers for the SSE request
+ */
+public class SseResponseWriterHandler implements ServerRestHandler {
+
+    public SseResponseWriterHandler() {
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        requestContext.getSseEventSink().sendInitialResponse(requestContext.serverResponse());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java
new file mode 100644
index 0000000000000..b4e720adbc52a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/UniResponseHandler.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import io.smallrye.mutiny.Uni;
+import java.util.function.Consumer;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class UniResponseHandler implements ServerRestHandler {
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        // FIXME: handle Response with entity being a Uni
+        if (requestContext.getResult() instanceof Uni) {
+            Uni<?> result = (Uni<?>) requestContext.getResult();
+            requestContext.suspend();
+
+            result.subscribe().with(new Consumer<Object>() {
+                @Override
+                public void accept(Object v) {
+                    requestContext.setResult(v);
+                    requestContext.resume();
+                }
+            }, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable t) {
+                    requestContext.resume(t, true);
+                }
+            });
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java
new file mode 100644
index 0000000000000..8f7cda69de651
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/VariableProducesHandler.java
@@ -0,0 +1,64 @@
+package org.jboss.resteasy.reactive.server.handlers;
+
+import java.util.List;
+import javax.ws.rs.NotAcceptableException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Variant;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.core.serialization.FixedEntityWriterArray;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+/**
+ * Handler that negotiates the content type for endpoints that
+ * have multiple produces types, or for whatever reason can't have
+ * their writer list and media type determined at build time.
+ */
+public class VariableProducesHandler implements ServerRestHandler {
+
+    public static final MessageBodyWriter[] EMPTY = new MessageBodyWriter[0];
+    final ServerMediaType mediaTypeList;
+    final ServerSerialisers serialisers;
+
+    public VariableProducesHandler(ServerMediaType mediaTypeList, ServerSerialisers serialisers) {
+        this.mediaTypeList = mediaTypeList;
+        this.serialisers = serialisers;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
+        Object entity = requestContext.getResult();
+        if (entity instanceof Response) {
+            return;
+        }
+        if (entity == null) {
+            //TODO?
+            return;
+        }
+        MediaType res = mediaTypeList.negotiateProduces(requestContext.serverRequest().getRequestHeader(HttpHeaders.ACCEPT))
+                .getKey();
+        if (res == null) {
+            throw new WebApplicationException(Response
+                    .notAcceptable(Variant.mediaTypes(mediaTypeList.getSortedMediaTypes()).build())
+                    .build());
+        }
+        if (MediaTypeHelper.isUnsupportedWildcardSubtype(res)) { // spec says the acceptable wildcard subtypes are */* or application/*
+            throw new NotAcceptableException();
+        }
+        List<MessageBodyWriter<?>> writers = serialisers.findWriters(null, entity.getClass(), res, RuntimeType.SERVER);
+        if (writers == null || writers.isEmpty()) {
+            throw new WebApplicationException(Response
+                    .notAcceptable(Variant.mediaTypes(mediaTypeList.getSortedMediaTypes()).build())
+                    .build());
+        }
+        requestContext.setResponseContentType(res);
+        requestContext.setEntityWriter(new FixedEntityWriterArray(writers.toArray(EMPTY), serialisers));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java
new file mode 100644
index 0000000000000..3b27c08ab4f30
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java
@@ -0,0 +1,125 @@
+package org.jboss.resteasy.reactive.server.injection;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Providers;
+import javax.ws.rs.sse.Sse;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ResourceContextImpl;
+import org.jboss.resteasy.reactive.server.jaxrs.SseImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+/**
+ * Provides CDI producers for objects that can be injected via @Context
+ * In quarkus-rest this works because @Context is considered an alias for @Inject
+ * through the use of {@code AutoInjectAnnotationBuildItem}
+ */
+@Singleton
+public class ContextProducers {
+
+    // NOTE: Same list for parameters in ContextParamExtractor
+    // and in EndpointIndexer.CONTEXT_TYPES
+
+    @RequestScoped
+    @Produces
+    ServerRequestContext quarkusRestContext() {
+        return getContext();
+    }
+
+    @RequestScoped
+    @Produces
+    UriInfo uriInfo() {
+        return getContext().getUriInfo();
+    }
+
+    @RequestScoped
+    @Produces
+    HttpHeaders headers() {
+        return getContext().getHttpHeaders();
+    }
+
+    @ApplicationScoped
+    @Produces
+    Sse sse() {
+        return SseImpl.INSTANCE;
+    }
+
+    @RequestScoped
+    @Produces
+    Request request() {
+        return getContext().getRequest();
+    }
+
+    // HttpServerRequest, HttpServerRequest are Vert.x types so it's not necessary to have it injectable via @Context,
+    // however we do use it in the Quickstarts so let's make it work
+
+    //    @RequestScoped
+    //    @Produces
+    //    HttpServerRequest httpServerRequest() {
+    //        return CurrentRequest.get().getContext().request();
+    //    }
+
+    //    @RequestScoped
+    //    @Produces
+    //    HttpServerResponse httpServerResponse() {
+    //        return CurrentRequest.get().getContext().response();
+    //    }
+
+    @ApplicationScoped
+    @Produces
+    Providers providers() {
+        return getContext().getProviders();
+    }
+
+    @RequestScoped
+    @Produces
+    ResourceInfo resourceInfo() {
+        return getContext().getTarget().getLazyMethod();
+    }
+
+    @RequestScoped
+    @Produces
+    SimpleResourceInfo simplifiedResourceInfo() {
+        return getContext().getTarget().getSimplifiedResourceInfo();
+    }
+
+    @ApplicationScoped
+    @Produces
+    Configuration config() {
+        return getContext().getDeployment().getConfiguration();
+    }
+
+    @ApplicationScoped
+    @Produces
+    Application application() {
+        return getContext().getDeployment().getApplicationSupplier().get();
+    }
+
+    @ApplicationScoped
+    @Produces
+    ResourceContext resourceContext() {
+        return ResourceContextImpl.INSTANCE;
+    }
+
+    @RequestScoped
+    @Produces
+    SecurityContext securityContext() {
+        return getContext().getSecurityContext();
+    }
+
+    private ResteasyReactiveRequestContext getContext() {
+        return CurrentRequestManager.get();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ResteasyReactiveInjectionContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ResteasyReactiveInjectionContext.java
new file mode 100644
index 0000000000000..9f63080274550
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ResteasyReactiveInjectionContext.java
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.reactive.server.injection;
+
+public interface ResteasyReactiveInjectionContext {
+    Object getHeader(String name, boolean single);
+
+    Object getQueryParameter(String name, boolean single, boolean encoded);
+
+    String getPathParameter(String name, boolean encoded);
+
+    Object getMatrixParameter(String name, boolean single, boolean encoded);
+
+    String getCookieParameter(String name);
+
+    Object getFormParameter(String name, boolean single, boolean encoded);
+
+    <T> T unwrap(Class<T> theType);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ResteasyReactiveInjectionTarget.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ResteasyReactiveInjectionTarget.java
new file mode 100644
index 0000000000000..4ae0aa77d3437
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ResteasyReactiveInjectionTarget.java
@@ -0,0 +1,7 @@
+package org.jboss.resteasy.reactive.server.injection;
+
+public interface ResteasyReactiveInjectionTarget {
+
+    default void __quarkus_rest_inject(ResteasyReactiveInjectionContext ctx) {
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java
new file mode 100644
index 0000000000000..02c99fe76b02c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AbstractInterceptorContext.java
@@ -0,0 +1,88 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.Objects;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.InterceptorContext;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+
+public abstract class AbstractInterceptorContext implements InterceptorContext {
+    protected final ResteasyReactiveRequestContext context;
+    protected Annotation[] annotations;
+    protected Class<?> type;
+    protected Type genericType;
+    protected MediaType mediaType;
+    protected final ServerSerialisers serialisers;
+    // as the interceptors can change the type or mediaType, when that happens we need to find a new reader/writer
+    protected boolean rediscoveryNeeded = false;
+
+    public AbstractInterceptorContext(ResteasyReactiveRequestContext context, Annotation[] annotations,
+            Class<?> type,
+            Type genericType, MediaType mediaType, ServerSerialisers serialisers) {
+        this.context = context;
+        this.annotations = annotations;
+        this.type = type;
+        this.genericType = genericType;
+        this.mediaType = mediaType;
+        this.serialisers = serialisers;
+    }
+
+    public Object getProperty(String name) {
+        return context.getProperty(name);
+    }
+
+    public Collection<String> getPropertyNames() {
+        return context.getPropertyNames();
+    }
+
+    public void setProperty(String name, Object object) {
+        context.setProperty(name, object);
+    }
+
+    public void removeProperty(String name) {
+        context.removeProperty(name);
+    }
+
+    public Annotation[] getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Annotation[] annotations) {
+        Objects.requireNonNull(annotations);
+        this.annotations = annotations;
+    }
+
+    public Class<?> getType() {
+        return type;
+    }
+
+    public void setType(Class<?> type) {
+        if ((this.type != type) && (type != null)) {
+            rediscoveryNeeded = true;
+        }
+        this.type = type;
+    }
+
+    public Type getGenericType() {
+        return genericType;
+    }
+
+    public void setGenericType(Type genericType) {
+        this.genericType = genericType;
+    }
+
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    public void setMediaType(MediaType mediaType) {
+        if (this.mediaType != mediaType) {
+            rediscoveryNeeded = true;
+        }
+        this.mediaType = mediaType;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java
new file mode 100644
index 0000000000000..33ee6dfd76313
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/AsyncResponseImpl.java
@@ -0,0 +1,206 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import javax.ws.rs.ServiceUnavailableException;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.CompletionCallback;
+import javax.ws.rs.container.ConnectionCallback;
+import javax.ws.rs.container.TimeoutHandler;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class AsyncResponseImpl implements AsyncResponse, Runnable {
+
+    private final ResteasyReactiveRequestContext context;
+    private volatile boolean suspended;
+    private volatile boolean cancelled;
+    private volatile TimeoutHandler timeoutHandler;
+    // only used with lock, no need for volatile
+    private Runnable timerCancelTask = null;
+
+    public AsyncResponseImpl(ResteasyReactiveRequestContext context) {
+        this.context = context;
+        suspended = true;
+    }
+
+    @Override
+    public synchronized boolean resume(Object response) {
+        if (!suspended) {
+            return false;
+        } else {
+            suspended = false;
+        }
+        cancelTimer();
+        context.setResult(response);
+        context.resume();
+        return true;
+    }
+
+    @Override
+    public synchronized boolean resume(Throwable response) {
+        if (!suspended) {
+            return false;
+        } else {
+            suspended = false;
+        }
+        cancelTimer();
+        context.handleException(response);
+        context.resume();
+        return true;
+    }
+
+    @Override
+    public boolean cancel() {
+        return internalCancel(null);
+    }
+
+    @Override
+    public boolean cancel(int retryAfter) {
+        return internalCancel(retryAfter);
+    }
+
+    private synchronized boolean internalCancel(Object retryAfter) {
+        if (cancelled) {
+            return true;
+        }
+        if (!suspended) {
+            return false;
+        }
+        cancelTimer();
+        suspended = false;
+        cancelled = true;
+        ResponseBuilder response = Response.status(503);
+        if (retryAfter != null)
+            response.header(HttpHeaders.RETRY_AFTER, retryAfter);
+        // It's not clear if we should go via the exception handlers here, but our TCK setup makes us
+        // go through it, while RESTEasy doesn't because it does resume like this, so we do too
+        context.setResult(response.build());
+        context.resume();
+        return true;
+    }
+
+    @Override
+    public boolean cancel(Date retryAfter) {
+        return internalCancel(retryAfter);
+    }
+
+    // CALL WITH LOCK
+    private void cancelTimer() {
+        if (timerCancelTask != null) {
+            timerCancelTask.run();
+            timerCancelTask = null;
+        }
+    }
+
+    @Override
+    public boolean isSuspended() {
+        return suspended;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public boolean isDone() {
+        // we start suspended and stop being suspended on resume/cancel/timeout(which resumes) so
+        // this flag is enough to know if we're done
+        return !suspended;
+    }
+
+    @Override
+    public synchronized boolean setTimeout(long time, TimeUnit unit) {
+        if (!suspended)
+            return false;
+        if (timerCancelTask != null) {
+            timerCancelTask.run();
+        }
+        timerCancelTask = context.registerTimer(TimeUnit.MILLISECONDS.convert(time, unit), this);
+        return true;
+    }
+
+    @Override
+    public void setTimeoutHandler(TimeoutHandler handler) {
+        timeoutHandler = handler;
+    }
+
+    @Override
+    public Collection<Class<?>> register(Class<?> callback) {
+        Objects.requireNonNull(callback);
+        // FIXME: does this mean we should use CDI to look it up?
+        try {
+            return register(callback.newInstance());
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Map<Class<?>, Collection<Class<?>>> register(Class<?> callback, Class<?>... callbacks) {
+        Objects.requireNonNull(callback);
+        Objects.requireNonNull(callbacks);
+        Map<Class<?>, Collection<Class<?>>> ret = new HashMap<>();
+        ret.put(callback.getClass(), register(callback));
+        for (Class<?> cb : callbacks) {
+            ret.put(cb, register(cb));
+        }
+        return ret;
+    }
+
+    @Override
+    public Collection<Class<?>> register(Object callback) {
+        Objects.requireNonNull(callback);
+        List<Class<?>> ret = new ArrayList<>(2);
+        if (callback instanceof ConnectionCallback) {
+            context.registerConnectionCallback((ConnectionCallback) callback);
+            ret.add(ConnectionCallback.class);
+        }
+        if (callback instanceof CompletionCallback) {
+            context.registerCompletionCallback((CompletionCallback) callback);
+            ret.add(CompletionCallback.class);
+        }
+        return ret;
+    }
+
+    @Override
+    public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks) {
+        Objects.requireNonNull(callback);
+        Objects.requireNonNull(callbacks);
+        Map<Class<?>, Collection<Class<?>>> ret = new HashMap<>();
+        ret.put(callback.getClass(), register(callback));
+        for (Object cb : callbacks) {
+            ret.put(cb.getClass(), register(cb));
+        }
+        return ret;
+    }
+
+    @Override
+    public synchronized void run() {
+        // make sure we're not marked as waiting for a timer anymore
+        timerCancelTask = null;
+        // if we're not suspended anymore, or we were cancelled, drop it
+        if (!suspended || cancelled)
+            return;
+        if (timeoutHandler != null) {
+            timeoutHandler.handleTimeout(this);
+            // Spec says:
+            // In case the time-out handler does not take any of the actions mentioned above [resume/new timeout], 
+            // a default time-out strategy is executed by the runtime.
+            // Stef picked to do this if the handler did not resume or set a new timeout:
+            if (suspended && timerCancelTask == null)
+                resume(new ServiceUnavailableException());
+        } else {
+            resume(new ServiceUnavailableException());
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java
new file mode 100644
index 0000000000000..5a84c9154eb5d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerRequestContextImpl.java
@@ -0,0 +1,223 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveContainerRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ContainerRequestContextImpl implements ResteasyReactiveContainerRequestContext {
+
+    private final ResteasyReactiveRequestContext quarkusRestContext;
+    private boolean aborted;
+    private boolean preMatch;
+    private boolean response;
+
+    public ContainerRequestContextImpl(ResteasyReactiveRequestContext requestContext) {
+        this.quarkusRestContext = requestContext;
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return quarkusRestContext.getProperty(name);
+    }
+
+    @Override
+    public Collection<String> getPropertyNames() {
+        return quarkusRestContext.getPropertyNames();
+    }
+
+    @Override
+    public void setProperty(String name, Object object) {
+        quarkusRestContext.setProperty(name, object);
+    }
+
+    @Override
+    public void removeProperty(String name) {
+        quarkusRestContext.removeProperty(name);
+    }
+
+    @Override
+    public UriInfo getUriInfo() {
+        return quarkusRestContext.getUriInfo();
+    }
+
+    @Override
+    public void setRequestUri(URI requestUri) {
+        setRequestUri(getUriInfo().getBaseUri(), requestUri);
+    }
+
+    @Override
+    public void setRequestUri(URI baseUri, URI requestUri) {
+        assertPreMatch();
+        quarkusRestContext.setRequestUri(baseUri.resolve(requestUri));
+    }
+
+    @Override
+    public Request getRequest() {
+        return quarkusRestContext.getRequest();
+    }
+
+    @Override
+    public String getMethod() {
+        return quarkusRestContext.getMethod();
+    }
+
+    @Override
+    public void setMethod(String method) {
+        assertPreMatch();
+        quarkusRestContext.setMethod(method);
+    }
+
+    public void assertPreMatch() {
+        if (!isPreMatch()) {
+            throw new IllegalStateException("Can only be called from a @PreMatch filter");
+        }
+    }
+
+    public void assertNotResponse() {
+        if (isResponse()) {
+            throw new IllegalStateException("Cannot be called from response filter");
+        }
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getHeaders() {
+        return quarkusRestContext.getHttpHeaders().getMutableHeaders();
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return quarkusRestContext.getHttpHeaders().getHeaderString(name);
+    }
+
+    @Override
+    public Date getDate() {
+        return quarkusRestContext.getHttpHeaders().getDate();
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return quarkusRestContext.getHttpHeaders().getLanguage();
+    }
+
+    @Override
+    public int getLength() {
+        return quarkusRestContext.getHttpHeaders().getLength();
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return quarkusRestContext.getHttpHeaders().getMediaType();
+    }
+
+    @Override
+    public List<MediaType> getAcceptableMediaTypes() {
+        return quarkusRestContext.getHttpHeaders().getAcceptableMediaTypes();
+    }
+
+    @Override
+    public List<Locale> getAcceptableLanguages() {
+        return quarkusRestContext.getHttpHeaders().getAcceptableLanguages();
+    }
+
+    @Override
+    public Map<String, Cookie> getCookies() {
+        return quarkusRestContext.getHttpHeaders().getCookies();
+    }
+
+    @Override
+    public boolean hasEntity() {
+        // we haven't set the input stream because this runs before the input handlers
+        // so we just can't know, but RESTEasy does this, I suspect just to get the TCK to
+        // be happy, so that's enough for us too
+        return getMediaType() != null;
+    }
+
+    @Override
+    public InputStream getEntityStream() {
+        return quarkusRestContext.getInputStream();
+    }
+
+    @Override
+    public void setEntityStream(InputStream input) {
+        assertNotResponse();
+        quarkusRestContext.setInputStream(input);
+    }
+
+    @Override
+    public SecurityContext getSecurityContext() {
+        return quarkusRestContext.getSecurityContext();
+    }
+
+    @Override
+    public void setSecurityContext(SecurityContext context) {
+        assertNotResponse();
+        this.quarkusRestContext.setSecurityContext(context);
+    }
+
+    public boolean isPreMatch() {
+        return preMatch;
+    }
+
+    public ContainerRequestContextImpl setPreMatch(boolean preMatch) {
+        this.preMatch = preMatch;
+        return this;
+    }
+
+    @Override
+    public void abortWith(Response response) {
+        assertNotResponse();
+        quarkusRestContext.setResult(response);
+        quarkusRestContext.restart(quarkusRestContext.getAbortHandlerChain());
+        aborted = true;
+        // this is a valid action after suspend, in which case we must resume
+        if (quarkusRestContext.isSuspended())
+            quarkusRestContext.resume();
+    }
+
+    public boolean isResponse() {
+        return response;
+    }
+
+    public ContainerRequestContextImpl setResponse(boolean response) {
+        this.response = response;
+        return this;
+    }
+
+    public boolean isAborted() {
+        return aborted;
+    }
+
+    @Override
+    public ServerRequestContext getServerRequestContext() {
+        return quarkusRestContext;
+    }
+
+    @Override
+    public void suspend() {
+        quarkusRestContext.suspend();
+    }
+
+    @Override
+    public void resume() {
+        quarkusRestContext.resume();
+    }
+
+    @Override
+    public void resume(Throwable t) {
+        quarkusRestContext.resume(t);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java
new file mode 100644
index 0000000000000..991c0455eec26
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContainerResponseContextImpl.java
@@ -0,0 +1,202 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.Link.Builder;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.StatusType;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class ContainerResponseContextImpl implements ContainerResponseContext {
+
+    private final ResteasyReactiveRequestContext context;
+
+    public ContainerResponseContextImpl(ResteasyReactiveRequestContext requestContext) {
+        this.context = requestContext;
+    }
+
+    @Override
+    public int getStatus() {
+        return response().getStatus();
+    }
+
+    protected Response response() {
+        return context.getResponse().get();
+    }
+
+    @Override
+    public void setStatus(int code) {
+        context.setResult(Response.fromResponse(response()).status(code).build());
+    }
+
+    @Override
+    public StatusType getStatusInfo() {
+        return response().getStatusInfo();
+    }
+
+    @Override
+    public void setStatusInfo(StatusType statusInfo) {
+        context.setResult(Response.fromResponse(response()).status(statusInfo).build());
+    }
+
+    @Override
+    public MultivaluedMap<String, Object> getHeaders() {
+        return response().getHeaders();
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getStringHeaders() {
+        return response().getStringHeaders();
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return response().getHeaderString(name);
+    }
+
+    @Override
+    public Set<String> getAllowedMethods() {
+        return response().getAllowedMethods();
+    }
+
+    @Override
+    public Date getDate() {
+        return response().getDate();
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return response().getLanguage();
+    }
+
+    @Override
+    public int getLength() {
+        return response().getLength();
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return response().getMediaType();
+    }
+
+    @Override
+    public Map<String, NewCookie> getCookies() {
+        return response().getCookies();
+    }
+
+    @Override
+    public EntityTag getEntityTag() {
+        return response().getEntityTag();
+    }
+
+    @Override
+    public Date getLastModified() {
+        return response().getLastModified();
+    }
+
+    @Override
+    public URI getLocation() {
+        return response().getLocation();
+    }
+
+    @Override
+    public Set<Link> getLinks() {
+        return response().getLinks();
+    }
+
+    @Override
+    public boolean hasLink(String relation) {
+        return response().hasLink(relation);
+    }
+
+    @Override
+    public Link getLink(String relation) {
+        return response().getLink(relation);
+    }
+
+    @Override
+    public Builder getLinkBuilder(String relation) {
+        return response().getLinkBuilder(relation);
+    }
+
+    @Override
+    public boolean hasEntity() {
+        return response().hasEntity();
+    }
+
+    @Override
+    public Object getEntity() {
+        return response().getEntity();
+    }
+
+    @Override
+    public Class<?> getEntityClass() {
+        Object entity = getEntity();
+        if (entity == null) {
+            return null;
+        }
+        return entity.getClass();
+    }
+
+    @Override
+    public Type getEntityType() {
+        return context.getGenericReturnType();
+    }
+
+    @Override
+    public void setEntity(Object entity) {
+        context.resetBuildTimeSerialization();
+        if (entity instanceof GenericEntity) {
+            context.setGenericReturnType(((GenericEntity<?>) entity).getType());
+            entity = ((GenericEntity<?>) entity).getEntity();
+        }
+        Response.ResponseBuilder resp = Response.fromResponse(response()).entity(entity);
+        context.setResult(resp.build());
+    }
+
+    @Override
+    public void setEntity(Object entity, Annotation[] annotations, MediaType mediaType) {
+        context.resetBuildTimeSerialization();
+        if (entity instanceof GenericEntity) {
+            context.setGenericReturnType(((GenericEntity<?>) entity).getType());
+            entity = ((GenericEntity<?>) entity).getEntity();
+        }
+        context.setResponseContentType(mediaType);
+        context.setAllAnnotations(annotations);
+        Response.ResponseBuilder resp = Response.fromResponse(response()).entity(entity).type(mediaType);
+        context.setResult(resp.build());
+    }
+
+    @Override
+    public Annotation[] getEntityAnnotations() {
+        return context.getAllAnnotations();
+    }
+
+    @Override
+    public OutputStream getEntityStream() {
+        OutputStream existing = context.getOutputStream();
+        if (existing != null) {
+            return existing;
+        }
+        return context.getOrCreateOutputStream();
+    }
+
+    @Override
+    public void setEntityStream(OutputStream outputStream) {
+        context.setOutputStream(outputStream);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java
new file mode 100644
index 0000000000000..d484b11940058
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ContextResolverDelegate.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.Collection;
+import javax.ws.rs.ext.ContextResolver;
+
+public class ContextResolverDelegate<T> implements ContextResolver<T> {
+
+    private final Collection<ContextResolver<T>> delegates;
+
+    public ContextResolverDelegate(Collection<ContextResolver<T>> delegates) {
+        this.delegates = delegates;
+    }
+
+    @Override
+    public T getContext(Class<?> type) {
+        for (ContextResolver<T> delegate : delegates) {
+            T context = delegate.getContext(type);
+            if (context != null) {
+                return context;
+            }
+        }
+        return null;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java
new file mode 100644
index 0000000000000..8d1050bad4ebc
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureContext.java
@@ -0,0 +1,45 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.function.Function;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseFilter;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.InterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptor;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+// TODO: It might not make sense to have this extend from QuarkusRestFeatureContext
+public class DynamicFeatureContext extends FeatureContextImpl {
+
+    public DynamicFeatureContext(ResourceInterceptors interceptors, ConfigurationImpl configuration,
+            Function<Class<?>, BeanFactory<?>> beanContainer) {
+        super(interceptors, null, configuration, beanContainer);
+    }
+
+    @Override
+    protected boolean isAllowed(Class<?> componentClass) {
+        // For the time being we only support filters and interceptors
+        return isFilter(componentClass) || isInterceptor(componentClass);
+    }
+
+    @Override
+    protected void registerFilters(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority) {
+        boolean isRequest = ContainerRequestFilter.class.isAssignableFrom(componentClass);
+        boolean isResponse = ContainerResponseFilter.class.isAssignableFrom(componentClass);
+        if (isRequest) {
+            register(componentClass, beanFactory, priority, this.interceptors.getContainerRequestFilters());
+        }
+        if (isResponse) {
+            register(componentClass, beanFactory, priority, this.interceptors.getContainerResponseFilters());
+        }
+    }
+
+    private <T> void register(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority,
+            InterceptorContainer<T> interceptors) {
+        ResourceInterceptor<T> responseInterceptor = interceptors.create();
+        setFilterPriority(componentClass, priority, responseInterceptor);
+        responseInterceptor.setFactory(getFactory(componentClass, beanFactory));
+        interceptors.addGlobalRequestInterceptor(responseInterceptor);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java
new file mode 100644
index 0000000000000..0ef6cf3d05246
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/FeatureContextImpl.java
@@ -0,0 +1,232 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import javax.annotation.Priority;
+import javax.ws.rs.NameBinding;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.WriterInterceptor;
+import org.jboss.resteasy.reactive.common.core.UnmanagedBeanFactory;
+import org.jboss.resteasy.reactive.common.jaxrs.ConfigurationImpl;
+import org.jboss.resteasy.reactive.common.model.InterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.PreMatchInterceptorContainer;
+import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptor;
+import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
+import org.jboss.resteasy.reactive.common.model.SettableResourceInterceptor;
+import org.jboss.resteasy.reactive.server.core.ExceptionMapping;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class FeatureContextImpl implements FeatureContext {
+
+    protected final ResourceInterceptors interceptors;
+    private final ExceptionMapping exceptionMapping;
+    private final Function<Class<?>, BeanFactory<?>> beanFactoryCreator;
+    private final ConfigurationImpl configuration;
+
+    private boolean filtersNeedSorting = false;
+
+    public FeatureContextImpl(ResourceInterceptors interceptors, ExceptionMapping exceptionMapping,
+            ConfigurationImpl configuration, Function<Class<?>, BeanFactory<?>> beanFactoryCreator) {
+        this.interceptors = interceptors;
+        this.exceptionMapping = exceptionMapping;
+        this.configuration = configuration;
+        this.beanFactoryCreator = beanFactoryCreator;
+    }
+
+    @Override
+    public Configuration getConfiguration() {
+        return configuration;
+    }
+
+    @Override
+    public FeatureContext property(String name, Object value) {
+        configuration.property(name, value);
+        return this;
+    }
+
+    @Override
+    public FeatureContext register(Class<?> componentClass) {
+        doRegister(componentClass, null, null);
+        return this;
+    }
+
+    @Override
+    public FeatureContext register(Class<?> componentClass, int priority) {
+        doRegister(componentClass, null, priority);
+        return this;
+    }
+
+    @Override
+    public FeatureContext register(Class<?> componentClass, Class<?>... contracts) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public FeatureContext register(Class<?> componentClass, Map<Class<?>, Integer> contracts) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public FeatureContext register(Object component) {
+        doRegister(component.getClass(), new UnmanagedBeanFactory<>(component), null);
+        return this;
+    }
+
+    @Override
+    public FeatureContext register(Object component, int priority) {
+        doRegister(component.getClass(), new UnmanagedBeanFactory<>(component), priority);
+        return this;
+    }
+
+    @Override
+    public FeatureContext register(Object component, Class<?>... contracts) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public FeatureContext register(Object component, Map<Class<?>, Integer> contracts) {
+        throw new UnsupportedOperationException();
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private void doRegister(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority) {
+        if (!isAllowed(componentClass)) {
+            //TODO: log a warning
+            return;
+        }
+        if (ExceptionMapper.class.isAssignableFrom(componentClass)) {
+            Type[] genericInterfaces = componentClass.getGenericInterfaces();
+            for (Type type : genericInterfaces) {
+                // TODO: use proper generic handling
+                if (type instanceof ParameterizedType) {
+                    ParameterizedType parameterizedType = (ParameterizedType) type;
+                    if (parameterizedType.getRawType().equals(ExceptionMapper.class)) {
+                        Type exceptionType = parameterizedType.getActualTypeArguments()[0];
+                        if (exceptionType instanceof Class) {
+                            Class exceptionClass = (Class) exceptionType;
+                            ResourceExceptionMapper resourceExceptionMapper = new ResourceExceptionMapper();
+                            resourceExceptionMapper.setFactory(getFactory(componentClass, beanFactory));
+                            exceptionMapping.addExceptionMapper(exceptionClass, resourceExceptionMapper);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (isFilter(componentClass)) {
+            registerFilters(componentClass, beanFactory, priority);
+            filtersNeedSorting = true;
+        }
+        if (isInterceptor(componentClass)) {
+            registerInterceptors(componentClass, beanFactory, priority);
+            filtersNeedSorting = true;
+        }
+
+        //TODO: log warning if nothing was done
+    }
+
+    protected boolean isFilter(Class<?> componentClass) {
+        return ContainerRequestFilter.class.isAssignableFrom(componentClass)
+                || ContainerResponseFilter.class.isAssignableFrom(componentClass);
+    }
+
+    protected void registerFilters(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority) {
+        boolean isRequest = ContainerRequestFilter.class.isAssignableFrom(componentClass);
+        boolean isResponse = ContainerResponseFilter.class.isAssignableFrom(componentClass);
+        if (isRequest) {
+            register(componentClass, beanFactory, priority, interceptors.getContainerRequestFilters());
+        }
+        if (isResponse) {
+            register(componentClass, beanFactory, priority, interceptors.getContainerResponseFilters());
+        }
+    }
+
+    protected boolean isInterceptor(Class<?> componentClass) {
+        return ReaderInterceptor.class.isAssignableFrom(componentClass)
+                || WriterInterceptor.class.isAssignableFrom(componentClass);
+    }
+
+    protected void registerInterceptors(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority) {
+        boolean isReader = ReaderInterceptor.class.isAssignableFrom(componentClass);
+        boolean isWriter = WriterInterceptor.class.isAssignableFrom(componentClass);
+        if (isReader) {
+            register(componentClass, beanFactory, priority, interceptors.getReaderInterceptors());
+        }
+        if (isWriter) {
+            register(componentClass, beanFactory, priority, interceptors.getWriterInterceptors());
+        }
+    }
+
+    private <T> void register(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority,
+            InterceptorContainer<T> interceptorContainer) {
+        ResourceInterceptor<T> interceptor = interceptorContainer.create();
+        Set<String> nameBindings = setCommonFilterProperties(componentClass, beanFactory, priority,
+                interceptor);
+        if (interceptorContainer instanceof PreMatchInterceptorContainer
+                && componentClass.isAnnotationPresent(PreMatching.class)) {
+            ((PreMatchInterceptorContainer<T>) interceptorContainer).addPreMatchInterceptor(interceptor);
+        } else if (nameBindings.isEmpty()) {
+            interceptorContainer.addGlobalRequestInterceptor(interceptor);
+        } else {
+            interceptorContainer.addNameRequestInterceptor(interceptor);
+        }
+    }
+
+    protected boolean isAllowed(Class<?> componentClass) {
+        return true;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private Set<String> setCommonFilterProperties(Class<?> componentClass, BeanFactory<?> beanFactory, Integer priority,
+            SettableResourceInterceptor interceptor) {
+        interceptor.setFactory(getFactory(componentClass, beanFactory));
+        setFilterPriority(componentClass, priority, interceptor);
+        Set<String> nameBindings = new HashSet<>();
+        Annotation[] annotations = componentClass.getDeclaredAnnotations();
+        for (Annotation annotation : annotations) {
+            if (annotation.annotationType().isAnnotation()) {
+                if (annotation.annotationType().isAnnotationPresent(NameBinding.class)) {
+                    nameBindings.add(annotation.annotationType().getName());
+                }
+            }
+        }
+        if (!nameBindings.isEmpty()) {
+            interceptor.setNameBindingNames(nameBindings);
+        }
+        return nameBindings;
+    }
+
+    protected void setFilterPriority(Class<?> componentClass, Integer priority, SettableResourceInterceptor interceptor) {
+        if (priority == null) {
+            if (componentClass.isAnnotationPresent(Priority.class)) {
+                interceptor.setPriority(componentClass.getDeclaredAnnotation(Priority.class).value());
+            }
+        } else {
+            interceptor.setPriority(priority);
+        }
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected BeanFactory getFactory(Class<?> componentClass, BeanFactory explicitValue) {
+        if (explicitValue != null) {
+            return explicitValue;
+        }
+        return beanFactoryCreator.apply(componentClass);
+    }
+
+    public boolean isFiltersNeedSorting() {
+        return filtersNeedSorting;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java
new file mode 100644
index 0000000000000..990d6ce66dc7c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/HttpHeadersImpl.java
@@ -0,0 +1,111 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import org.jboss.resteasy.reactive.common.headers.HeaderUtil;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+import org.jboss.resteasy.reactive.common.util.UnmodifiableMultivaluedMap;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class HttpHeadersImpl implements HttpHeaders {
+
+    private final MultivaluedMap<String, String> requestHeaders;
+    private final MultivaluedMap<String, String> unmodifiableRequestHeaders;
+    private Map<String, Cookie> cookies;
+
+    public HttpHeadersImpl(Iterable<Map.Entry<String, String>> vertxHeaders) {
+        requestHeaders = new CaseInsensitiveMap<>();
+        for (Map.Entry<String, String> entry : vertxHeaders) {
+            requestHeaders.add(entry.getKey(), entry.getValue());
+        }
+        this.unmodifiableRequestHeaders = new UnmodifiableMultivaluedMap<>(requestHeaders, false);
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getRequestHeaders() {
+        return unmodifiableRequestHeaders;
+    }
+
+    public MultivaluedMap<String, String> getMutableHeaders() {
+        return requestHeaders;
+    }
+
+    @Override
+    public List<String> getRequestHeader(String name) {
+        List<String> vals = unmodifiableRequestHeaders.get(name);
+        return vals == null ? Collections.<String> emptyList() : vals;
+    }
+
+    @Override
+    public Map<String, Cookie> getCookies() {
+        if (cookies == null) {
+            cookies = Collections.unmodifiableMap(HeaderUtil.getCookies(requestHeaders));
+        }
+        return cookies;
+    }
+
+    @Override
+    public Date getDate() {
+        return HeaderUtil.getDate(requestHeaders);
+    }
+
+    @Override
+    public String getHeaderString(String name) {
+        return HeaderUtil.getHeaderString(requestHeaders, name);
+    }
+
+    @Override
+    public Locale getLanguage() {
+        return HeaderUtil.getLanguage(requestHeaders);
+    }
+
+    @Override
+    public int getLength() {
+        return HeaderUtil.getLength(requestHeaders);
+    }
+
+    // because header string map is mutable, we only cache the parsed media type
+    // and still do hash lookup
+    private String cachedMediaTypeString;
+    private MediaType cachedMediaType;
+
+    @Override
+    public MediaType getMediaType() {
+        String obj = requestHeaders.getFirst(HttpHeaders.CONTENT_TYPE);
+        if (obj == null)
+            return null;
+        if (obj == cachedMediaTypeString)
+            return cachedMediaType;
+        cachedMediaTypeString = obj;
+        cachedMediaType = MediaType.valueOf(obj);
+        return cachedMediaType;
+    }
+
+    @Override
+    public List<MediaType> getAcceptableMediaTypes() {
+        List<MediaType> modifiableAcceptableMediaTypes = getModifiableAcceptableMediaTypes();
+        if (modifiableAcceptableMediaTypes.size() > 1) {
+            return Collections.unmodifiableList(modifiableAcceptableMediaTypes);
+        }
+        return modifiableAcceptableMediaTypes;
+    }
+
+    public List<MediaType> getModifiableAcceptableMediaTypes() {
+        return HeaderUtil.getAcceptableMediaTypes(requestHeaders);
+    }
+
+    @Override
+    public List<Locale> getAcceptableLanguages() {
+        return HeaderUtil.getAcceptableLanguages(requestHeaders);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java
new file mode 100644
index 0000000000000..72137a4632817
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/OutboundSseEventImpl.java
@@ -0,0 +1,205 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.lang.reflect.Type;
+import java.util.Objects;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.SseEvent;
+
+public class OutboundSseEventImpl implements OutboundSseEvent {
+    private final String name;
+
+    private final String comment;
+
+    private final String id;
+
+    private final Class<?> type;
+
+    private final Type genericType;
+
+    private MediaType mediaType;
+
+    private boolean mediaTypeSet;
+
+    private final Object data;
+
+    private final long reconnectDelay;
+
+    private boolean escape = false;
+
+    OutboundSseEventImpl(final String name, final String id, final long reconnectDelay, final Class<?> type,
+            final Type genericType,
+            final MediaType mediaType, final Object data, final String comment) {
+        this.name = name;
+        this.comment = comment;
+        this.id = id;
+        this.reconnectDelay = reconnectDelay;
+        this.type = type;
+        this.genericType = genericType;
+        this.mediaType = mediaType != null ? mediaType : MediaType.TEXT_PLAIN_TYPE;
+        this.mediaTypeSet = mediaType != null;
+        this.data = data;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public long getReconnectDelay() {
+        return reconnectDelay;
+    }
+
+    @Override
+    public boolean isReconnectDelaySet() {
+        return reconnectDelay > -1;
+    }
+
+    @Override
+    public Class<?> getType() {
+        return type;
+    }
+
+    @Override
+    public Type getGenericType() {
+        return genericType;
+    }
+
+    @Override
+    public MediaType getMediaType() {
+        return mediaType;
+    }
+
+    public boolean isMediaTypeSet() {
+        return mediaTypeSet;
+    }
+
+    public void setMediaType(MediaType mediaType) {
+        this.mediaType = mediaType;
+        mediaTypeSet = true;
+    }
+
+    @Override
+    public String getComment() {
+        return comment;
+    }
+
+    @Override
+    public Object getData() {
+        return data;
+    }
+
+    public boolean isEscape() {
+        return escape;
+    }
+
+    public void setEscape(Boolean escape) {
+        this.escape = escape;
+    }
+
+    public static class BuilderImpl implements Builder {
+        private String name;
+
+        private String comment;
+
+        private String id;
+
+        private long reconnectDelay = SseEvent.RECONNECT_NOT_SET;
+
+        private Class<?> type;
+
+        private Type genericType;
+
+        private Object data;
+
+        private MediaType mediaType;
+
+        @Override
+        public BuilderImpl name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl reconnectDelay(long milliseconds) {
+            if (milliseconds < 0) {
+                milliseconds = SseEvent.RECONNECT_NOT_SET;
+            }
+            this.reconnectDelay = milliseconds;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl mediaType(final MediaType mediaType) {
+            Objects.requireNonNull(mediaType);
+            this.mediaType = mediaType;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl comment(String comment) {
+            this.comment = comment;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl data(Class type, Object data) {
+            Objects.requireNonNull(type);
+            Objects.requireNonNull(data);
+
+            this.type = type;
+            this.genericType = type;
+            this.data = data;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl data(GenericType type, Object data) {
+            Objects.requireNonNull(type);
+            Objects.requireNonNull(data);
+
+            this.type = type.getRawType();
+            this.genericType = type.getType();
+            this.data = data;
+            return this;
+        }
+
+        @Override
+        public BuilderImpl data(Object data) {
+            Objects.requireNonNull(data);
+
+            if (data instanceof GenericEntity) {
+                GenericEntity<?> genericEntity = (GenericEntity<?>) data;
+                this.type = genericEntity.getRawType();
+                this.genericType = genericEntity.getType();
+                this.data = genericEntity.getEntity();
+            } else {
+                data(data.getClass(), data);
+            }
+
+            return this;
+        }
+
+        @Override
+        public OutboundSseEventImpl build() {
+            if (this.comment == null && this.data == null) {
+                throw new IllegalArgumentException("Must set either comment or data");
+            }
+            return new OutboundSseEventImpl(name, id, reconnectDelay, type, genericType, mediaType, data, comment);
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java
new file mode 100644
index 0000000000000..f8ef7cb587560
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ProvidersImpl.java
@@ -0,0 +1,56 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Providers;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+
+public class ProvidersImpl implements Providers {
+
+    private final Deployment deployment;
+
+    public ProvidersImpl(Deployment deployment) {
+        this.deployment = deployment;
+    }
+
+    @Override
+    public <T> MessageBodyReader<T> getMessageBodyReader(Class<T> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        List<MessageBodyReader<?>> readers = deployment.getSerialisers().findReaders(null, type, mediaType);
+        for (MessageBodyReader<?> reader : readers) {
+            if (reader.isReadable(type, genericType, annotations, mediaType)) {
+                return (MessageBodyReader<T>) reader;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public <T> MessageBodyWriter<T> getMessageBodyWriter(Class<T> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        List<MessageBodyWriter<?>> writers = deployment.getSerialisers().findWriters(null, type, mediaType, RuntimeType.SERVER);
+        for (MessageBodyWriter<?> writer : writers) {
+            if (writer.isWriteable(type, genericType, annotations, mediaType)) {
+                return (MessageBodyWriter<T>) writer;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public <T extends Throwable> ExceptionMapper<T> getExceptionMapper(Class<T> type) {
+        return deployment.getExceptionMapping().getExceptionMapper(type, null);
+    }
+
+    @Override
+    public <T> ContextResolver<T> getContextResolver(Class<T> contextType, MediaType mediaType) {
+        return deployment.getContextResolvers().getContextResolver(contextType, mediaType);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java
new file mode 100644
index 0000000000000..6110eab50d810
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ReaderInterceptorContextImpl.java
@@ -0,0 +1,70 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+
+public class ReaderInterceptorContextImpl extends AbstractInterceptorContext
+        implements ReaderInterceptorContext {
+
+    private final MessageBodyReader reader;
+    private InputStream inputStream;
+    private int index = 0;
+    private final ReaderInterceptor[] interceptors;
+    private final MultivaluedMap<String, String> headers = new CaseInsensitiveMap<>();
+
+    public ReaderInterceptorContextImpl(ResteasyReactiveRequestContext context, Annotation[] annotations, Class<?> type,
+            Type genericType, MediaType mediaType, MessageBodyReader reader, InputStream inputStream,
+            ReaderInterceptor[] interceptors, ServerSerialisers serialisers) {
+        super(context, annotations, type, genericType, mediaType, serialisers);
+        this.reader = reader;
+        this.inputStream = inputStream;
+        this.interceptors = interceptors;
+        this.headers.putAll(context.getHttpHeaders().getRequestHeaders());
+    }
+
+    @Override
+    public Object proceed() throws IOException, WebApplicationException {
+        if (index == interceptors.length) {
+            MessageBodyReader effectiveReader = reader;
+            if (rediscoveryNeeded) {
+                List<MessageBodyReader<?>> readers = serialisers.findReaders(null, type, mediaType, RuntimeType.SERVER);
+                if (readers.isEmpty()) {
+                    throw new NotSupportedException();
+                }
+                effectiveReader = readers.get(0);
+            }
+            return effectiveReader.readFrom(type, genericType, annotations, mediaType, headers, inputStream);
+        } else {
+            return interceptors[index++].aroundReadFrom(this);
+        }
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+
+    @Override
+    public void setInputStream(InputStream is) {
+        this.inputStream = is;
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getHeaders() {
+        return headers;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java
new file mode 100644
index 0000000000000..0f7763f13066a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RequestImpl.java
@@ -0,0 +1,192 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Variant;
+import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder;
+import org.jboss.resteasy.reactive.common.util.DateUtil;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.request.ServerDrivenNegotiation;
+
+public class RequestImpl implements Request {
+
+    private final ResteasyReactiveRequestContext requestContext;
+    private final String httpMethod;
+    private String varyHeader;
+
+    public RequestImpl(ResteasyReactiveRequestContext requestContext) {
+        this.requestContext = requestContext;
+        this.httpMethod = requestContext.serverRequest().getRequestMethod();
+    }
+
+    @Override
+    public String getMethod() {
+        return requestContext.serverRequest().getRequestMethod();
+    }
+
+    private boolean isRfc7232preconditions() {
+        return true;//todo: do we need config for this?
+    }
+
+    public Variant selectVariant(List<Variant> variants) throws IllegalArgumentException {
+        if (variants == null || variants.size() == 0)
+            throw new IllegalArgumentException("Variant list must not be empty");
+
+        ServerDrivenNegotiation negotiation = new ServerDrivenNegotiation();
+        MultivaluedMap<String, String> requestHeaders = requestContext.getHttpHeaders().getRequestHeaders();
+        negotiation.setAcceptHeaders(requestHeaders.get(HttpHeaders.ACCEPT));
+        negotiation.setAcceptCharsetHeaders(requestHeaders.get(HttpHeaders.ACCEPT_CHARSET));
+        negotiation.setAcceptEncodingHeaders(requestHeaders.get(HttpHeaders.ACCEPT_ENCODING));
+        negotiation.setAcceptLanguageHeaders(requestHeaders.get(HttpHeaders.ACCEPT_LANGUAGE));
+
+        varyHeader = AbstractResponseBuilder.createVaryHeader(variants);
+        requestContext.serverResponse().setResponseHeader(HttpHeaders.VARY, varyHeader);
+        //response.getOutputHeaders().add(VARY, varyHeader);
+        return negotiation.getBestMatch(variants);
+    }
+
+    public List<EntityTag> convertEtag(List<String> tags) {
+        ArrayList<EntityTag> result = new ArrayList<EntityTag>();
+        for (String tag : tags) {
+            String[] split = tag.split(",");
+            for (String etag : split) {
+                result.add(EntityTag.valueOf(etag.trim()));
+            }
+        }
+        return result;
+    }
+
+    public Response.ResponseBuilder ifMatch(List<EntityTag> ifMatch, EntityTag eTag) {
+        boolean match = false;
+        for (EntityTag tag : ifMatch) {
+            if (tag.equals(eTag) || tag.getValue().equals("*")) {
+                match = true;
+                break;
+            }
+        }
+        if (match)
+            return null;
+        return Response.status(Response.Status.PRECONDITION_FAILED).tag(eTag);
+
+    }
+
+    public Response.ResponseBuilder ifNoneMatch(List<EntityTag> ifMatch, EntityTag eTag) {
+        boolean match = false;
+        for (EntityTag tag : ifMatch) {
+            if (tag.equals(eTag) || tag.getValue().equals("*")) {
+                match = true;
+                break;
+            }
+        }
+        if (match) {
+            if ("GET".equals(httpMethod) || "HEAD".equals(httpMethod)) {
+                return Response.notModified(eTag);
+            }
+
+            return Response.status(Response.Status.PRECONDITION_FAILED).tag(eTag);
+        }
+        return null;
+    }
+
+    public Response.ResponseBuilder evaluatePreconditions(EntityTag eTag) {
+        if (eTag == null)
+            throw new IllegalArgumentException("ETag was null");
+        Response.ResponseBuilder builder = null;
+        List<String> ifMatch = requestContext.getHttpHeaders().getRequestHeaders().get(HttpHeaders.IF_MATCH);
+        if (ifMatch != null && ifMatch.size() > 0) {
+            builder = ifMatch(convertEtag(ifMatch), eTag);
+        }
+        if (builder == null) {
+            List<String> ifNoneMatch = requestContext.getHttpHeaders().getRequestHeaders().get(HttpHeaders.IF_NONE_MATCH);
+            if (ifNoneMatch != null && ifNoneMatch.size() > 0) {
+                builder = ifNoneMatch(convertEtag(ifNoneMatch), eTag);
+            }
+        }
+        if (builder != null) {
+            builder.tag(eTag);
+        }
+        if (builder != null && varyHeader != null)
+            builder.header(HttpHeaders.VARY, varyHeader);
+        return builder;
+    }
+
+    public Response.ResponseBuilder ifModifiedSince(String strDate, Date lastModified) {
+        Date date = DateUtil.parseDate(strDate);
+
+        if (date.getTime() >= lastModified.getTime()) {
+            return Response.notModified();
+        }
+        return null;
+
+    }
+
+    public Response.ResponseBuilder ifUnmodifiedSince(String strDate, Date lastModified) {
+        Date date = DateUtil.parseDate(strDate);
+
+        if (date.getTime() >= lastModified.getTime()) {
+            return null;
+        }
+        return Response.status(Response.Status.PRECONDITION_FAILED).lastModified(lastModified);
+
+    }
+
+    public Response.ResponseBuilder evaluatePreconditions(Date lastModified) {
+        if (lastModified == null)
+            throw new IllegalArgumentException("Param cannot be null");
+        Response.ResponseBuilder builder = null;
+        MultivaluedMap<String, String> headers = requestContext.getHttpHeaders().getRequestHeaders();
+        String ifModifiedSince = headers.getFirst(HttpHeaders.IF_MODIFIED_SINCE);
+        if (ifModifiedSince != null && (!isRfc7232preconditions() || (!headers.containsKey(HttpHeaders.IF_NONE_MATCH)))) {
+            builder = ifModifiedSince(ifModifiedSince, lastModified);
+        }
+        if (builder == null) {
+            String ifUnmodifiedSince = headers.getFirst(HttpHeaders.IF_UNMODIFIED_SINCE);
+            if (ifUnmodifiedSince != null && (!isRfc7232preconditions() || (!headers.containsKey(HttpHeaders.IF_MATCH)))) {
+                builder = ifUnmodifiedSince(ifUnmodifiedSince, lastModified);
+            }
+        }
+        if (builder != null && varyHeader != null)
+            builder.header(HttpHeaders.VARY, varyHeader);
+
+        return builder;
+    }
+
+    public Response.ResponseBuilder evaluatePreconditions(Date lastModified, EntityTag eTag) {
+        if (lastModified == null)
+            throw new IllegalArgumentException("Last modified was null");
+        if (eTag == null)
+            throw new IllegalArgumentException("etag was null");
+        Response.ResponseBuilder rtn = null;
+        Response.ResponseBuilder lastModifiedBuilder = evaluatePreconditions(lastModified);
+        Response.ResponseBuilder etagBuilder = evaluatePreconditions(eTag);
+        if (lastModifiedBuilder == null && etagBuilder == null)
+            rtn = null;
+        else if (lastModifiedBuilder != null && etagBuilder == null)
+            rtn = lastModifiedBuilder;
+        else if (lastModifiedBuilder == null && etagBuilder != null)
+            rtn = etagBuilder;
+        else {
+            rtn = lastModifiedBuilder;
+            rtn.tag(eTag);
+        }
+        if (rtn != null && varyHeader != null)
+            rtn.header(HttpHeaders.VARY, varyHeader);
+        return rtn;
+    }
+
+    public Response.ResponseBuilder evaluatePreconditions() {
+        List<String> ifMatch = requestContext.getHttpHeaders().getRequestHeaders().get(HttpHeaders.IF_MATCH);
+        if (ifMatch == null || ifMatch.size() == 0) {
+            return null;
+        }
+
+        return Response.status(Response.Status.PRECONDITION_FAILED);
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java
new file mode 100644
index 0000000000000..6f9e1467390f3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResourceContextImpl.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import javax.enterprise.inject.spi.CDI;
+import javax.ws.rs.container.ResourceContext;
+
+public class ResourceContextImpl implements ResourceContext {
+    public static ResourceContextImpl INSTANCE = new ResourceContextImpl();
+
+    @Override
+    public <T> T getResource(Class<T> resourceClass) {
+        return CDI.current().select(resourceClass).get();
+    }
+
+    @Override
+    public <T> T initResource(T resource) {
+        return resource;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java
new file mode 100644
index 0000000000000..e89a66a885e00
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java
@@ -0,0 +1,107 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.jaxrs.AbstractResponseBuilder;
+import org.jboss.resteasy.reactive.server.core.CurrentRequestManager;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+
+public class ResponseBuilderImpl extends AbstractResponseBuilder {
+
+    @Override
+    public Response.ResponseBuilder location(URI location) {
+        if (location == null) {
+            metadata.remove(HttpHeaders.LOCATION);
+            return this;
+        }
+        if (!location.isAbsolute()) {
+            // FIXME: this leaks server stuff onto the client
+            ResteasyReactiveRequestContext request = CurrentRequestManager.get();
+            if (request != null) {
+                ServerHttpRequest req = request.serverRequest();
+                try {
+                    String host = req.getRequestHost();
+                    int port = -1;
+                    int index = host.indexOf(":");
+                    if (index > -1) {
+                        port = Integer.parseInt(host.substring(index + 1));
+                        host = host.substring(0, index);
+                    }
+                    String prefix = "";
+                    Deployment deployment = request.getDeployment();
+                    if (deployment != null) {
+                        // prefix is already sanitised
+                        prefix = deployment.getPrefix();
+                    }
+                    // Spec says relative to request, but TCK tests relative to Base URI, so we do that
+                    location = new URI(req.getRequestScheme(), null, host, port,
+                            prefix +
+                                    (location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath()),
+                            location.getQuery(), null);
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        metadata.putSingle(HttpHeaders.LOCATION, location);
+        return this;
+    }
+
+    @Override
+    public Response.ResponseBuilder contentLocation(URI location) {
+        if (location == null) {
+            metadata.remove(HttpHeaders.CONTENT_LOCATION);
+            return this;
+        }
+        if (!location.isAbsolute()) {
+            ResteasyReactiveRequestContext request = CurrentRequestManager.get();
+            if (request != null) {
+                // FIXME: this leaks server stuff onto the client
+                ServerHttpRequest req = request.serverRequest();
+                try {
+                    String host = req.getRequestHost();
+                    int port = -1;
+                    int index = host.indexOf(":");
+                    if (index > -1) {
+                        port = Integer.parseInt(host.substring(index + 1));
+                        host = host.substring(0, index);
+                    }
+                    location = new URI(req.getRequestScheme(), null, host, port,
+                            location.getPath().startsWith("/") ? location.getPath() : "/" + location.getPath(),
+                            location.getQuery(), null);
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        metadata.putSingle(HttpHeaders.CONTENT_LOCATION, location);
+        return this;
+    }
+
+    @Override
+    protected AbstractResponseBuilder doClone() {
+        return new ResponseBuilderImpl();
+    }
+
+    //TODO: add the rest of static methods of Response if we need them
+
+    public static Response.ResponseBuilder withStatus(Response.Status status) {
+        return new ResponseBuilderImpl().status(status);
+    }
+
+    public static Response.ResponseBuilder ok() {
+        return withStatus(Response.Status.OK);
+    }
+
+    public static Response.ResponseBuilder ok(Object entity) {
+        return ok().entity(entity);
+    }
+
+    public static Response.ResponseBuilder noContent() {
+        return withStatus(Response.Status.NO_CONTENT);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java
new file mode 100644
index 0000000000000..77d9db7142966
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseBroadcasterImpl.java
@@ -0,0 +1,85 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.SseBroadcaster;
+import javax.ws.rs.sse.SseEventSink;
+
+public class SseBroadcasterImpl implements SseBroadcaster {
+
+    private final List<SseEventSink> sinks = new ArrayList<>();
+    private final List<BiConsumer<SseEventSink, Throwable>> onErrorListeners = new ArrayList<>();
+    private final List<Consumer<SseEventSink>> onCloseListeners = new ArrayList<>();
+    private volatile boolean isClosed;
+
+    @Override
+    public synchronized void onError(BiConsumer<SseEventSink, Throwable> onError) {
+        Objects.requireNonNull(onError);
+        checkClosed();
+        onErrorListeners.add(onError);
+    }
+
+    @Override
+    public synchronized void onClose(Consumer<SseEventSink> onClose) {
+        Objects.requireNonNull(onClose);
+        checkClosed();
+        onCloseListeners.add(onClose);
+    }
+
+    @Override
+    public synchronized void register(SseEventSink sseEventSink) {
+        Objects.requireNonNull(sseEventSink);
+        checkClosed();
+        if (sseEventSink instanceof SseEventSinkImpl == false)
+            throw new IllegalArgumentException("Can only work with Quarkus-REST instances: " + sseEventSink);
+        ((SseEventSinkImpl) sseEventSink).register(this);
+        sinks.add(sseEventSink);
+    }
+
+    @Override
+    public synchronized CompletionStage<?> broadcast(OutboundSseEvent event) {
+        Objects.requireNonNull(event);
+        checkClosed();
+        CompletableFuture<?>[] cfs = new CompletableFuture[sinks.size()];
+        for (int i = 0; i < sinks.size(); i++) {
+            SseEventSink sseEventSink = sinks.get(i);
+            cfs[i] = sseEventSink.send(event).toCompletableFuture();
+        }
+        return CompletableFuture.allOf(cfs);
+    }
+
+    private void checkClosed() {
+        if (isClosed)
+            throw new IllegalStateException("Broadcaster has been closed");
+    }
+
+    @Override
+    public synchronized void close() {
+        if (isClosed)
+            return;
+        isClosed = true;
+        for (SseEventSink sink : sinks) {
+            // this will in turn fire close events to our listeners
+            sink.close();
+        }
+    }
+
+    synchronized void fireClose(SseEventSinkImpl sseEventSink) {
+        for (Consumer<SseEventSink> listener : onCloseListeners) {
+            listener.accept(sseEventSink);
+        }
+    }
+
+    synchronized void fireException(SseEventSinkImpl sseEventSink, Throwable t) {
+        for (BiConsumer<SseEventSink, Throwable> listener : onErrorListeners) {
+            listener.accept(sseEventSink, t);
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java
new file mode 100644
index 0000000000000..b682fc734a594
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java
@@ -0,0 +1,89 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.SseEventSink;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.SseUtil;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+
+public class SseEventSinkImpl implements SseEventSink {
+
+    private static final byte[] EMPTY_BUFFER = new byte[0];
+    private ResteasyReactiveRequestContext context;
+    private SseBroadcasterImpl broadcaster;
+    private boolean closed;
+
+    public SseEventSinkImpl(ResteasyReactiveRequestContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public synchronized boolean isClosed() {
+        return context.serverResponse().closed() || closed;
+    }
+
+    @Override
+    public CompletionStage<?> send(OutboundSseEvent event) {
+        if (isClosed())
+            throw new IllegalStateException("Already closed");
+        // NOTE: we can't cast event to OutboundSseEventImpl because the TCK sends us its own subclass
+        CompletionStage<?> ret = SseUtil.send(context, event);
+        if (broadcaster != null) {
+            return ret.whenComplete((value, x) -> {
+                if (x != null) {
+                    broadcaster.fireException(this, x);
+                }
+            });
+        }
+        return ret;
+    }
+
+    @Override
+    public synchronized void close() {
+        if (isClosed())
+            return;
+        closed = true;
+        // FIXME: do we need a state flag?
+        ServerHttpResponse response = context.serverResponse();
+        if (!response.headWritten()) {
+            // make sure we send the headers if we're closing this sink before the
+            // endpoint method is over
+            SseUtil.setHeaders(context, response);
+        }
+        response.end();
+        context.close();
+        if (broadcaster != null)
+            broadcaster.fireClose(this);
+    }
+
+    public void sendInitialResponse(ServerHttpResponse response) {
+        if (!response.headWritten()) {
+            SseUtil.setHeaders(context, response);
+            // send the headers over the wire
+            context.suspend();
+            response.write(EMPTY_BUFFER, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable throwable) {
+                    if (throwable == null) {
+                        context.resume();
+                    } else {
+                        context.resume(throwable);
+                    }
+                    // I don't think we should be firing the exception on the broadcaster here
+                }
+            });
+            //            response.closeHandler(v -> {
+            //                // FIXME: notify of client closing
+            //                System.err.println("Server connection closed");
+            //            });
+        }
+    }
+
+    void register(SseBroadcasterImpl broadcaster) {
+        if (this.broadcaster != null)
+            throw new IllegalStateException("Already registered on a broadcaster");
+        this.broadcaster = broadcaster;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java
new file mode 100644
index 0000000000000..590fbac392cd3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseImpl.java
@@ -0,0 +1,20 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import javax.ws.rs.sse.OutboundSseEvent;
+import javax.ws.rs.sse.Sse;
+import javax.ws.rs.sse.SseBroadcaster;
+
+public class SseImpl implements Sse {
+
+    public static final SseImpl INSTANCE = new SseImpl();
+
+    @Override
+    public OutboundSseEvent.Builder newEventBuilder() {
+        return new OutboundSseEventImpl.BuilderImpl();
+    }
+
+    @Override
+    public SseBroadcaster newBroadcaster() {
+        return new SseBroadcasterImpl();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java
new file mode 100644
index 0000000000000..17cb32fb312a3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java
@@ -0,0 +1,219 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
+import org.jboss.resteasy.reactive.common.util.PathSegmentImpl;
+import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap;
+import org.jboss.resteasy.reactive.common.util.URIDecoder;
+import org.jboss.resteasy.reactive.common.util.UnmodifiableMultivaluedMap;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.UriMatch;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+
+/**
+ * UriInfo implementation
+ */
+public class UriInfoImpl implements UriInfo {
+
+    private final ResteasyReactiveRequestContext currentRequest;
+    private MultivaluedMap<String, String> queryParams;
+    private MultivaluedMap<String, String> pathParams;
+    private URI requestUri;
+
+    public UriInfoImpl(ResteasyReactiveRequestContext currentRequest) {
+        this.currentRequest = currentRequest;
+    }
+
+    @Override
+    public String getPath() {
+        return getPath(true);
+    }
+
+    @Override
+    public String getPath(boolean decode) {
+        if (!decode)
+            throw encodedNotSupported();
+        // TCK says normalized
+        String path = URIDecoder.decodeURIComponent(currentRequest.getPath(), false);
+        // the path must not contain the prefix
+        String prefix = currentRequest.getDeployment().getPrefix();
+        if (prefix.isEmpty())
+            return path;
+        // else skip the prefix
+        return path.substring(prefix.length());
+    }
+
+    @Override
+    public List<PathSegment> getPathSegments() {
+        return getPathSegments(true);
+    }
+
+    @Override
+    public List<PathSegment> getPathSegments(boolean decode) {
+        if (!decode)
+            throw encodedNotSupported();
+        return PathSegmentImpl.parseSegments(getPath(), decode);
+    }
+
+    @Override
+    public URI getRequestUri() {
+        if (requestUri == null) {
+            ServerHttpRequest request = currentRequest.serverRequest();
+            try {
+                // TCK says normalized
+                requestUri = new URI(currentRequest.getAbsoluteURI())
+                        .normalize();
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return requestUri;
+    }
+
+    @Override
+    public UriBuilder getRequestUriBuilder() {
+        return UriBuilder.fromUri(getRequestUri());
+    }
+
+    @Override
+    public URI getAbsolutePath() {
+        try {
+            // TCK says normalized
+            return new URI(currentRequest.getAbsoluteURI()).normalize();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public UriBuilder getAbsolutePathBuilder() {
+        return UriBuilder.fromUri(getAbsolutePath());
+    }
+
+    @Override
+    public URI getBaseUri() {
+        try {
+            Deployment deployment = currentRequest.getDeployment();
+            // the TCK doesn't tell us, but Stuart and Georgios prefer dressing their base URIs with useless slashes ;)
+            String prefix = "/";
+            if (deployment != null) {
+                // prefix can be empty, but if it's not it will not end with a slash
+                prefix = deployment.getPrefix();
+                if (prefix.isEmpty())
+                    prefix = "/";
+                else
+                    prefix = prefix + "/";
+            }
+            return new URI(currentRequest.getScheme(), currentRequest.getAuthority(),
+                    prefix,
+                    null, null);
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public UriBuilder getBaseUriBuilder() {
+        return UriBuilder.fromUri(getBaseUri());
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getPathParameters() {
+        return getPathParameters(true);
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getPathParameters(boolean decode) {
+        if (!decode)
+            throw encodedNotSupported();
+        if (pathParams == null) {
+            pathParams = new QuarkusMultivaluedHashMap<>();
+            for (Entry<String, Integer> pathParam : currentRequest.getTarget().getPathParameterIndexes().entrySet()) {
+                pathParams.add(pathParam.getKey(), currentRequest.getPathParam(pathParam.getValue()));
+            }
+        }
+        return new UnmodifiableMultivaluedMap<>(pathParams);
+    }
+
+    private RuntimeException encodedNotSupported() {
+        return new IllegalArgumentException("We do not support non-decoded parameters");
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters() {
+        return getQueryParameters(true);
+    }
+
+    @Override
+    public MultivaluedMap<String, String> getQueryParameters(boolean decode) {
+        if (!decode)
+            throw encodedNotSupported();
+        if (queryParams == null) {
+            queryParams = new QuarkusMultivaluedHashMap<>();
+            Collection<String> entries = currentRequest.serverRequest().queryParamNames();
+            for (String i : entries) {
+                queryParams.addAll(i, currentRequest.serverRequest().getAllQueryParams(i));
+            }
+        }
+        return new UnmodifiableMultivaluedMap<>(queryParams);
+    }
+
+    @Override
+    public List<String> getMatchedURIs() {
+        return getMatchedURIs(true);
+    }
+
+    @Override
+    public List<String> getMatchedURIs(boolean decode) {
+        if (!decode)
+            throw encodedNotSupported();
+        if (currentRequest.getTarget() == null) {
+            return Collections.emptyList();
+        }
+        List<UriMatch> oldMatches = currentRequest.getMatchedURIs();
+        List<String> matched = new ArrayList<>();
+        String last = null;
+
+        for (int i = 0; i < oldMatches.size(); ++i) {
+            String m = oldMatches.get(i).matched;
+            if (!m.equals(last)) {
+                matched.add(m);
+                last = m;
+            }
+        }
+        return matched;
+    }
+
+    @Override
+    public List<Object> getMatchedResources() {
+        List<UriMatch> oldMatches = currentRequest.getMatchedURIs();
+        List<Object> matched = new ArrayList<>();
+        for (int i = 0; i < oldMatches.size(); ++i) {
+            Object target = oldMatches.get(i).target;
+            if (target != null) {
+                matched.add(target);
+            }
+        }
+        return matched;
+    }
+
+    @Override
+    public URI resolve(URI uri) {
+        return null;
+    }
+
+    @Override
+    public URI relativize(URI uri) {
+        return null;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java
new file mode 100644
index 0000000000000..48cd8b42fd036
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/WriterInterceptorContextImpl.java
@@ -0,0 +1,103 @@
+package org.jboss.resteasy.reactive.server.jaxrs;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.ext.WriterInterceptorContext;
+import org.jboss.resteasy.reactive.common.util.CaseInsensitiveMap;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+
+public class WriterInterceptorContextImpl extends AbstractInterceptorContext
+        implements WriterInterceptorContext {
+
+    private final WriterInterceptor[] interceptors;
+    private final MessageBodyWriter writer;
+    private final MultivaluedMap<String, Object> headers = new CaseInsensitiveMap<>();
+    private Object entity;
+
+    boolean done = false;
+    private int index = 0;
+
+    public WriterInterceptorContextImpl(ResteasyReactiveRequestContext context, WriterInterceptor[] interceptors,
+            MessageBodyWriter<?> writer, Annotation[] annotations, Class<?> type, Type genericType, Object entity,
+            MediaType mediaType, MultivaluedMap<String, Object> headers, ServerSerialisers serialisers) {
+        super(context, annotations, type, genericType, mediaType, serialisers);
+        this.interceptors = interceptors;
+        this.writer = writer;
+        this.entity = entity;
+        this.headers.putAll(headers);
+    }
+
+    @Override
+    public void proceed() throws IOException, WebApplicationException {
+        Response response = context.getResponse().get();
+        if (index == interceptors.length) {
+            MessageBodyWriter effectiveWriter = writer;
+            if (rediscoveryNeeded) {
+                List<MessageBodyWriter<?>> newWriters = serialisers.findWriters(null, entity.getClass(), mediaType,
+                        RuntimeType.SERVER);
+                if (newWriters.isEmpty()) {
+                    throw new InternalServerErrorException("Could not find MessageBodyWriter for " + entity.getClass(),
+                            Response.serverError().build());
+                }
+                effectiveWriter = newWriters.get(0);
+            }
+            context.setResult(Response.fromResponse(response).replaceAll(headers).build());
+            ServerSerialisers.encodeResponseHeaders(context);
+            // this must be done AFTER encoding the headers, otherwise the HTTP response gets all messed up
+            effectiveWriter.writeTo(entity, type, genericType,
+                    annotations, mediaType, response.getHeaders(), context.getOrCreateOutputStream());
+            context.getOutputStream().close();
+            done = true;
+        } else {
+            interceptors[index++].aroundWriteTo(this);
+            if (!done) {
+                //TODO: how to handle
+                context.setResult(Response.fromResponse(response).replaceAll(headers).build());
+                ServerSerialisers.encodeResponseHeaders(context);
+                context.serverResponse().end();
+            }
+        }
+
+    }
+
+    @Override
+    public Object getEntity() {
+        return entity;
+    }
+
+    @Override
+    public void setEntity(Object entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public OutputStream getOutputStream() {
+        OutputStream existing = context.getOutputStream();
+        if (existing != null) {
+            return existing;
+        }
+        return context.getOrCreateOutputStream();
+    }
+
+    @Override
+    public void setOutputStream(OutputStream os) {
+        context.setOutputStream(os);
+    }
+
+    @Override
+    public MultivaluedMap<String, Object> getHeaders() {
+        return headers;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/Dumpable.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/Dumpable.java
new file mode 100644
index 0000000000000..012c1784ee701
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/Dumpable.java
@@ -0,0 +1,11 @@
+package org.jboss.resteasy.reactive.server.mapping;
+
+public interface Dumpable {
+    public void dump(int level);
+
+    public default void indent(int level) {
+        for (int i = 0; i < level; i++) {
+            System.err.print(' ');
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/PathMatcher.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/PathMatcher.java
new file mode 100644
index 0000000000000..1a62bd0d503bf
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/PathMatcher.java
@@ -0,0 +1,262 @@
+package org.jboss.resteasy.reactive.server.mapping;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Handler that dispatches to a given handler based of a prefix match of the path.
+ * <p>
+ * This only matches a single level of a request, e.g if you have a request that takes the form:
+ * <p>
+ * /foo/bar
+ * <p>
+ *
+ * @author Stuart Douglas
+ */
+public class PathMatcher<T> implements Dumpable {
+
+    private static final String STRING_PATH_SEPARATOR = "/";
+
+    private volatile T defaultHandler;
+    private final SubstringMap<T> paths = new SubstringMap<T>();
+    private final ConcurrentMap<String, T> exactPathMatches = new ConcurrentHashMap<>();
+
+    /**
+     * lengths of all registered paths
+     */
+    private volatile int[] lengths = {};
+
+    public PathMatcher(final T defaultHandler) {
+        this.defaultHandler = defaultHandler;
+    }
+
+    public PathMatcher() {
+    }
+
+    /**
+     * Matches a path against the registered handlers.
+     * 
+     * @param path The relative path to match
+     * @return The match match. This will never be null, however if none matched its value field will be
+     */
+    public PathMatch<T> match(String path) {
+        if (!exactPathMatches.isEmpty()) {
+            T match = getExactPath(path);
+            if (match != null) {
+                return new PathMatch<>(path, "", match);
+            }
+        }
+
+        int length = path.length();
+        final int[] lengths = this.lengths;
+        for (int i = 0; i < lengths.length; ++i) {
+            int pathLength = lengths[i];
+            if (pathLength == length) {
+                SubstringMap.SubstringMatch<T> next = paths.get(path, length);
+                if (next != null) {
+                    return new PathMatch<>(path, "", next.getValue());
+                }
+            } else if (pathLength < length) {
+                char c = path.charAt(pathLength);
+                if (c == '/') {
+                    //todo: matches that end with / are a bit weird, maybe this is not the best matching algo
+                    SubstringMap.SubstringMatch<T> next = paths.get(path, pathLength + 1);
+                    if (next != null && next.getKey().endsWith("/")) {
+                        return new PathMatch<>(next.getKey(), path.substring(pathLength), next.getValue());
+                    }
+                    next = paths.get(path, pathLength);
+                    if (next != null) {
+                        return new PathMatch<>(next.getKey(), path.substring(pathLength), next.getValue());
+                    }
+                }
+                // it's also possible that we're looking up /foo/bar/gee and have a current path of /foo/bar/ which
+                // is an acceptable prefix
+                if (pathLength > 0) {
+                    c = path.charAt(pathLength - 1);
+                    if (c == '/') {
+                        SubstringMap.SubstringMatch<T> next = paths.get(path, pathLength);
+                        if (next != null) {
+                            return new PathMatch<>(next.getKey(), path.substring(pathLength), next.getValue());
+                        }
+                    }
+                }
+            }
+        }
+        return new PathMatch<>("/", path, defaultHandler);
+    }
+
+    /**
+     * Adds a path prefix and a handler for that path. If the path does not start
+     * with a / then one will be prepended.
+     * <p>
+     * The match is done on a prefix bases, so registering /foo will also match /bar. Exact
+     * path matches are taken into account first.
+     * <p>
+     * If / is specified as the path then it will replace the default handler.
+     *
+     * @param path The path
+     * @param handler The handler
+     */
+    public synchronized PathMatcher addPrefixPath(final String path, final T handler) {
+        if (path.isEmpty()) {
+            throw new IllegalArgumentException("Path not specified");
+        }
+
+        if (PathMatcher.STRING_PATH_SEPARATOR.equals(path)) {
+            this.defaultHandler = handler;
+            return this;
+        }
+
+        paths.put(path, handler);
+
+        buildLengths();
+        return this;
+    }
+
+    public synchronized PathMatcher addExactPath(final String path, final T handler) {
+        if (path.isEmpty()) {
+            throw new IllegalArgumentException("Path not specified");
+        }
+        exactPathMatches.put(path, handler);
+        return this;
+    }
+
+    public T getExactPath(final String path) {
+        return exactPathMatches.get(path);
+    }
+
+    public T getPrefixPath(final String path) {
+
+        // enable the prefix path mechanism to return the default handler
+        SubstringMap.SubstringMatch<T> match = paths.get(path);
+        if (PathMatcher.STRING_PATH_SEPARATOR.equals(path) && match == null) {
+            return this.defaultHandler;
+        }
+        if (match == null) {
+            return null;
+        }
+
+        // return the value for the given path
+        return match.getValue();
+    }
+
+    private void buildLengths() {
+        final Set<Integer> lengths = new TreeSet<>(new Comparator<Integer>() {
+            @Override
+            public int compare(Integer o1, Integer o2) {
+                return -o1.compareTo(o2);
+            }
+        });
+        for (String p : paths.keys()) {
+            lengths.add(p.length());
+        }
+
+        int[] lengthArray = new int[lengths.size()];
+        int pos = 0;
+        for (int i : lengths) {
+            lengthArray[pos++] = i;
+        }
+        this.lengths = lengthArray;
+    }
+
+    @Deprecated
+    public synchronized PathMatcher removePath(final String path) {
+        return removePrefixPath(path);
+    }
+
+    public synchronized PathMatcher removePrefixPath(final String path) {
+        if (path == null || path.isEmpty()) {
+            throw new IllegalArgumentException("Path not specified");
+        }
+
+        if (PathMatcher.STRING_PATH_SEPARATOR.equals(path)) {
+            defaultHandler = null;
+            return this;
+        }
+
+        paths.remove(path);
+
+        buildLengths();
+        return this;
+    }
+
+    public synchronized PathMatcher removeExactPath(final String path) {
+        if (path == null || path.isEmpty()) {
+            throw new IllegalArgumentException("Path not specified");
+        }
+
+        exactPathMatches.remove(path);
+
+        return this;
+    }
+
+    public synchronized PathMatcher clearPaths() {
+        paths.clear();
+        exactPathMatches.clear();
+        this.lengths = new int[0];
+        defaultHandler = null;
+        return this;
+    }
+
+    public Map<String, T> getPaths() {
+        return paths.toMap();
+    }
+
+    public static final class PathMatch<T> {
+        private final String matched;
+        private final String remaining;
+        private final T value;
+
+        public PathMatch(String matched, String remaining, T value) {
+            this.matched = matched;
+            this.remaining = remaining;
+            this.value = value;
+        }
+
+        public String getRemaining() {
+            return remaining;
+        }
+
+        public String getMatched() {
+            return matched;
+        }
+
+        public T getValue() {
+            return value;
+        }
+    }
+
+    @Override
+    public void dump(int level) {
+        System.err.println("Paths: " + paths.size());
+        for (String key : paths.keys()) {
+            System.err.println(" " + key + ": ");
+            SubstringMap.SubstringMatch<T> match = paths.get(key);
+            System.err.println("  matchKey: " + match.getKey());
+            System.err.println("  matchValue: ");
+            dumpValue(match.getValue(), 3);
+        }
+        System.err.println("Exact path matches: " + exactPathMatches.size());
+        for (Entry<String, T> entry : exactPathMatches.entrySet()) {
+            System.err.println(" " + entry.getKey() + ": ");
+            dumpValue(entry.getValue(), 2);
+        }
+        System.err.println("Default handler: " + defaultHandler);
+    }
+
+    private void dumpValue(T value, int level) {
+        if (value instanceof List) {
+            for (Object x : (List) value) {
+                if (x instanceof Dumpable)
+                    ((Dumpable) x).dump(level);
+            }
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java
new file mode 100644
index 0000000000000..258ec6b0ffae7
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RequestMapper.java
@@ -0,0 +1,189 @@
+package org.jboss.resteasy.reactive.server.mapping;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import org.jboss.resteasy.reactive.common.util.URIDecoder;
+
+public class RequestMapper<T> {
+
+    /**
+     * TODO: this needs a lot of work
+     */
+    private final PathMatcher<List<RequestPath<T>>> requestPaths;
+    private final List<RequestPath<T>> templates;
+    final int maxParams;
+
+    public RequestMapper(List<RequestPath<T>> templates) {
+        this.requestPaths = new PathMatcher<>();
+        this.templates = templates;
+        int max = 0;
+        Map<String, List<RequestPath<T>>> aggregates = new HashMap<>();
+        for (RequestPath<T> i : templates) {
+            List<RequestPath<T>> paths = aggregates.get(i.template.stem);
+            if (paths == null) {
+                aggregates.put(i.template.stem, paths = new ArrayList<>());
+            }
+            paths.add(i);
+            max = Math.max(max, i.template.countPathParamNames());
+        }
+        for (Map.Entry<String, List<RequestPath<T>>> entry : aggregates.entrySet()) {
+            Collections.sort(entry.getValue(), new Comparator<RequestPath<T>>() {
+                @Override
+                public int compare(RequestPath<T> t1, RequestPath<T> t2) {
+                    return t2.template.compareTo(t1.template);
+                }
+            });
+        }
+        for (Map.Entry<String, List<RequestPath<T>>> entry : aggregates.entrySet()) {
+            requestPaths.addPrefixPath(entry.getKey(), entry.getValue());
+        }
+        maxParams = max;
+    }
+
+    public RequestMatch<T> map(String path) {
+        int pathLength = path.length();
+        PathMatcher.PathMatch<List<RequestPath<T>>> initialMatch = requestPaths.match(path);
+        if (initialMatch.getValue() == null) {
+            return null;
+        }
+
+        List<RequestPath<T>> value = initialMatch.getValue();
+        for (int index = 0; index < value.size(); index++) {
+            RequestPath<T> potentialMatch = value.get(index);
+            String[] params = new String[maxParams];
+            int paramCount = 0;
+            boolean matched = true;
+            boolean prefixAllowed = potentialMatch.prefixTemplate;
+            int matchPos = initialMatch.getMatched().length();
+            for (int i = 1; i < potentialMatch.template.components.length; ++i) {
+                URITemplate.TemplateComponent segment = potentialMatch.template.components[i];
+                if (segment.type == URITemplate.Type.CUSTOM_REGEX) {
+                    Matcher matcher = segment.pattern.matcher(path);
+                    matched = matcher.find(matchPos);
+                    if (!matched) {
+                        break;
+                    }
+                    matchPos = matcher.end();
+                    for (String name : segment.names) {
+                        params[paramCount++] = URIDecoder.decodeURIComponent(matcher.group(name), false);
+                    }
+                } else if (segment.type == URITemplate.Type.LITERAL) {
+                    //make sure the literal text is the same
+                    if (matchPos + segment.literalText.length() > pathLength) {
+                        matched = false;
+                        break; //too long
+                    }
+                    for (int pos = 0; pos < segment.literalText.length(); ++pos) {
+                        if (path.charAt(matchPos++) != segment.literalText.charAt(pos)) {
+                            matched = false;
+                            break;
+                        }
+                    }
+                } else if (segment.type == URITemplate.Type.DEFAULT_REGEX) {
+                    if (matchPos == pathLength) {
+                        matched = false;
+                        break;
+                    }
+                    int start = matchPos;
+                    while (matchPos < pathLength && path.charAt(matchPos) != '/') {
+                        matchPos++;
+                    }
+                    params[paramCount++] = URIDecoder.decodeURIComponent(path.substring(start, matchPos), false);
+                }
+            }
+            if (paramCount < params.length) {
+                params[paramCount] = null;
+            }
+            boolean fullMatch = matchPos == pathLength;
+            if (!prefixAllowed && !fullMatch) {
+                //according to the spec every template ends with (/.*)?
+                prefixAllowed = path.charAt(matchPos) == '/' && matchPos == pathLength - 1;
+            }
+            if (matched && (fullMatch || prefixAllowed)) {
+                String remaining;
+                if (fullMatch) {
+                    remaining = "";
+                } else {
+                    if (matchPos == 1) {
+                        remaining = path;
+                    } else {
+                        remaining = path.substring(matchPos);
+                    }
+                }
+                return new RequestMatch(potentialMatch.template, potentialMatch.value, params, remaining);
+            }
+        }
+        return null;
+    }
+
+    public static class RequestPath<T> implements Dumpable {
+        public final boolean prefixTemplate;
+        public final URITemplate template;
+        public final T value;
+
+        public RequestPath(boolean prefixTemplate, URITemplate template, T value) {
+            this.prefixTemplate = prefixTemplate;
+            this.template = template;
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return "RequestPath{ value: " + value + ", template: " + template + " }";
+        }
+
+        @Override
+        public void dump(int level) {
+            indent(level);
+            System.err.println("RequestPath:");
+            indent(level + 1);
+            System.err.println("value: " + value);
+            indent(level + 1);
+            System.err.println("template: ");
+            template.dump(level + 2);
+        }
+    }
+
+    public static class RequestMatch<T> {
+        public final URITemplate template;
+        public final T value;
+        /**
+         * The matched parameters in order.
+         * <p>
+         * Note that this array may be larger than required, and padded with null values at the end
+         */
+        public final String[] pathParamValues;
+        public final String remaining;
+
+        public RequestMatch(URITemplate template, T value, String[] pathParamValues, String remaining) {
+            this.template = template;
+            this.value = value;
+            this.pathParamValues = pathParamValues;
+            this.remaining = remaining;
+        }
+
+        @Override
+        public String toString() {
+            return "RequestMatch{ value: " + value + ", template: " + template + ", pathParamValues: "
+                    + Arrays.toString(pathParamValues) + " }";
+        }
+    }
+
+    public void dump() {
+        this.requestPaths.dump(0);
+    }
+
+    public PathMatcher<List<RequestPath<T>>> getRequestPaths() {
+        return requestPaths;
+    }
+
+    public List<RequestPath<T>> getTemplates() {
+        return templates;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java
new file mode 100644
index 0000000000000..df7ce16ece12c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/RuntimeResource.java
@@ -0,0 +1,152 @@
+package org.jboss.resteasy.reactive.server.mapping;
+
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.model.ResourceExceptionMapper;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.server.SimpleResourceInfo;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveSimplifiedResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.server.util.ScoreSystem;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class RuntimeResource {
+
+    private final String httpMethod;
+    private final URITemplate path;
+    private final URITemplate classPath;
+    private final ServerMediaType produces;
+    private final List<MediaType> consumes;
+    private final EndpointInvoker invoker;
+    private final BeanFactory<Object> endpointFactory;
+    private final ServerRestHandler[] handlerChain;
+    private final String javaMethodName;
+    private final Class<?>[] parameterTypes;
+    private final Type returnType;
+    private final boolean blocking;
+    private final Class<?> resourceClass;
+    private final ResteasyReactiveResourceInfo lazyMethod;
+    private final Map<String, Integer> pathParameterIndexes;
+    private final Map<ScoreSystem.Category, List<ScoreSystem.Diagnostic>> score;
+    private final MediaType sseElementType;
+    private final Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> classExceptionMappers;
+
+    public RuntimeResource(String httpMethod, URITemplate path, URITemplate classPath, ServerMediaType produces,
+            List<MediaType> consumes,
+            EndpointInvoker invoker,
+            BeanFactory<Object> endpointFactory, ServerRestHandler[] handlerChain, String javaMethodName,
+            Class<?>[] parameterTypes,
+            Type returnType, boolean blocking, Class<?> resourceClass, ResteasyReactiveResourceInfo lazyMethod,
+            Map<String, Integer> pathParameterIndexes, Map<ScoreSystem.Category, List<ScoreSystem.Diagnostic>> score,
+            MediaType sseElementType,
+            Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> classExceptionMappers) {
+        this.httpMethod = httpMethod;
+        this.path = path;
+        this.classPath = classPath;
+        this.produces = produces;
+        this.consumes = consumes;
+        this.invoker = invoker;
+        this.endpointFactory = endpointFactory;
+        this.handlerChain = handlerChain;
+        this.javaMethodName = javaMethodName;
+        this.parameterTypes = parameterTypes;
+        this.returnType = returnType;
+        this.blocking = blocking;
+        this.resourceClass = resourceClass;
+        this.lazyMethod = lazyMethod;
+        this.pathParameterIndexes = pathParameterIndexes;
+        this.score = score;
+        this.sseElementType = sseElementType;
+        this.classExceptionMappers = classExceptionMappers;
+    }
+
+    public ServerRestHandler[] getHandlerChain() {
+        return handlerChain;
+    }
+
+    public String getJavaMethodName() {
+        return javaMethodName;
+    }
+
+    public Class<?>[] getParameterTypes() {
+        return parameterTypes;
+    }
+
+    public Type getReturnType() {
+        return returnType;
+    }
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public URITemplate getPath() {
+        return path;
+    }
+
+    public ServerMediaType getProduces() {
+        return produces;
+    }
+
+    public List<MediaType> getConsumes() {
+        return consumes;
+    }
+
+    public EndpointInvoker getInvoker() {
+        return invoker;
+    }
+
+    public boolean isBlocking() {
+        return blocking;
+    }
+
+    public Class<?> getResourceClass() {
+        return resourceClass;
+    }
+
+    public BeanFactory<Object> getEndpointFactory() {
+        return endpointFactory;
+    }
+
+    public ResteasyReactiveResourceInfo getLazyMethod() {
+        return lazyMethod;
+    }
+
+    public SimpleResourceInfo getSimplifiedResourceInfo() {
+        return new ResteasyReactiveSimplifiedResourceInfo(javaMethodName, resourceClass, parameterTypes);
+    }
+
+    public MediaType getSseElementType() {
+        return sseElementType;
+    }
+
+    /**
+     * The @Path that is present on the class itself
+     * 
+     * @return
+     */
+    public URITemplate getClassPath() {
+        return classPath;
+    }
+
+    public Map<String, Integer> getPathParameterIndexes() {
+        return pathParameterIndexes;
+    }
+
+    public Map<ScoreSystem.Category, List<ScoreSystem.Diagnostic>> getScore() {
+        return score;
+    }
+
+    public Map<Class<? extends Throwable>, ResourceExceptionMapper<? extends Throwable>> getClassExceptionMappers() {
+        return classExceptionMappers;
+    }
+
+    @Override
+    public String toString() {
+        return "RuntimeResource{ method: " + javaMethodName + ", path: " + path + "}";
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/SubstringMap.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/SubstringMap.java
new file mode 100644
index 0000000000000..78bd60404ac59
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/SubstringMap.java
@@ -0,0 +1,235 @@
+package org.jboss.resteasy.reactive.server.mapping;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+/**
+ * A string keyed map that can be accessed as a substring, eliminating the need to allocate a new string
+ * to do a key comparison against.
+ * <p>
+ * This class uses linear probing and is thread safe due to copy on write semantics. As such it is not recomended
+ * for data that changes frequently.
+ * <p>
+ * This class does not actually implement the map interface to avoid implementing unnecessary operations.
+ *
+ * @author Stuart Douglas
+ */
+public class SubstringMap<V> {
+    private static final int ALL_BUT_LAST_BIT = ~1;
+
+    private volatile Object[] table = new Object[16];
+    private int size;
+
+    public int size() {
+        return size;
+    }
+
+    public SubstringMatch<V> get(String key, int length) {
+        return get(key, length, false);
+    }
+
+    public SubstringMatch<V> get(String key) {
+        return get(key, key.length(), false);
+    }
+
+    private SubstringMatch<V> get(String key, int length, boolean exact) {
+        if (key.length() < length) {
+            throw new IllegalArgumentException();
+        }
+        Object[] table = this.table;
+        int hash = hash(key, length);
+        int pos = tablePos(table, hash);
+        int start = pos;
+        while (table[pos] != null) {
+            if (exact) {
+                if (table[pos].equals(key)) {
+                    return (SubstringMatch<V>) table[pos + 1];
+                }
+            } else {
+                if (doEquals((String) table[pos], key, length)) {
+                    return (SubstringMatch<V>) table[pos + 1];
+                }
+            }
+            pos += 2;
+            if (pos >= table.length) {
+                pos = 0;
+            }
+            if (pos == start) {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    private int tablePos(Object[] table, int hash) {
+        return (hash & (table.length - 1)) & ALL_BUT_LAST_BIT;
+    }
+
+    private boolean doEquals(String s1, String s2, int length) {
+        if (s1.length() != length || s2.length() < length) {
+            return false;
+        }
+        for (int i = 0; i < length; ++i) {
+            if (s1.charAt(i) != s2.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public synchronized void put(String key, V value) {
+        if (key == null) {
+            throw new NullPointerException();
+        }
+        Object[] newTable;
+        if (table.length / (double) size < 4 && table.length != Integer.MAX_VALUE) {
+            newTable = new Object[table.length << 1];
+            for (int i = 0; i < table.length; i += 2) {
+                if (table[i] != null) {
+                    doPut(newTable, (String) table[i], table[i + 1]);
+                }
+            }
+        } else {
+            newTable = new Object[table.length];
+            System.arraycopy(table, 0, newTable, 0, table.length);
+        }
+        doPut(newTable, key, new SubstringMap.SubstringMatch<>(key, value));
+        this.table = newTable;
+        size++;
+    }
+
+    public synchronized V remove(String key) {
+        if (key == null) {
+            throw new NullPointerException();
+        }
+        //we just assume it is present, and always do a copy
+        //for this maps intended use cases as a path matcher it won't be called when
+        //the value is not present anyway
+        V value = null;
+        Object[] newTable = new Object[table.length];
+        for (int i = 0; i < table.length; i += 2) {
+            if (table[i] != null && !table[i].equals(key)) {
+                doPut(newTable, (String) table[i], table[i + 1]);
+            } else if (table[i] != null) {
+                value = (V) table[i + 1];
+                size--;
+            }
+        }
+        this.table = newTable;
+        if (value == null) {
+            return null;
+        }
+        return ((SubstringMatch<V>) value).getValue();
+    }
+
+    private void doPut(Object[] newTable, String key, Object value) {
+        int hash = hash(key, key.length());
+        int pos = tablePos(newTable, hash);
+        while (newTable[pos] != null && !newTable[pos].equals(key)) {
+            pos += 2;
+            if (pos >= newTable.length) {
+                pos = 0;
+            }
+        }
+        newTable[pos] = key;
+        newTable[pos + 1] = value;
+    }
+
+    public Map<String, V> toMap() {
+        Map<String, V> map = new HashMap<>();
+        Object[] t = this.table;
+        for (int i = 0; i < t.length; i += 2) {
+            if (t[i] != null) {
+                map.put((String) t[i], ((SubstringMatch<V>) t[i + 1]).value);
+            }
+        }
+        return map;
+    }
+
+    public synchronized void clear() {
+        size = 0;
+        table = new Object[16];
+    }
+
+    private static int hash(String value, int length) {
+        if (length == 0) {
+            return 0;
+        }
+        int h = 0;
+        for (int i = 0; i < length; i++) {
+            h = 31 * h + value.charAt(i);
+        }
+        return h;
+    }
+
+    public Iterable<String> keys() {
+        return new Iterable<String>() {
+            @Override
+            public Iterator<String> iterator() {
+                final Object[] tMap = table;
+                int i = 0;
+                while (i < table.length && tMap[i] == null) {
+                    i += 2;
+                }
+                final int startPos = i;
+
+                return new Iterator<String>() {
+
+                    private Object[] map = tMap;
+
+                    private int pos = startPos;
+
+                    @Override
+                    public boolean hasNext() {
+                        return pos < table.length;
+                    }
+
+                    @Override
+                    public String next() {
+                        if (!hasNext()) {
+                            throw new NoSuchElementException();
+                        }
+                        String ret = (String) map[pos];
+
+                        pos += 2;
+                        while (pos < table.length && tMap[pos] == null) {
+                            pos += 2;
+                        }
+                        return ret;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        };
+
+    }
+
+    public static final class SubstringMatch<V> {
+        private final String key;
+        private final V value;
+
+        public SubstringMatch(String key, V value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public V getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return "SubstringMatch{ key: " + key + ", value: " + value + " }";
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/URITemplate.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/URITemplate.java
new file mode 100644
index 0000000000000..67d679578e9ef
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/mapping/URITemplate.java
@@ -0,0 +1,303 @@
+package org.jboss.resteasy.reactive.server.mapping;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class URITemplate implements Dumpable, Comparable<URITemplate> {
+
+    public final String template;
+
+    public final String stem;
+
+    /**
+     * The number of characters that are literals in the path. According to the spec we need to sort by this.
+     */
+    public final int literalCharacterCount;
+
+    public final int capturingGroups;
+
+    public final int complexExpressions;
+
+    /**
+     * The components, first one is always the stem, so if the stem has been matched it can be ignored
+     */
+    public final TemplateComponent[] components;
+
+    public final boolean prefixMatch;
+
+    public URITemplate(String template, boolean prefixMatch) {
+        this.prefixMatch = prefixMatch;
+        if (!template.startsWith("/")) {
+            template = "/" + template;
+        }
+        this.template = template;
+        List<TemplateComponent> components = new ArrayList<>();
+        String name = null;
+        String stem = null;
+        int litChars = 0;
+        int capGroups = 0;
+        int complexGroups = 0;
+        StringBuilder sb = new StringBuilder();
+        int state = 0; //0 = start, 1 = parsing name, 2 = parsing regex
+        for (int i = 0; i < template.length(); ++i) {
+            char c = template.charAt(i);
+            switch (state) {
+                case 0:
+                    if (c == '{') {
+                        state = 1;
+                        if (sb.length() > 0) {
+                            String literal = sb.toString();
+                            if (components.isEmpty()) {
+                                stem = literal;
+                            }
+                            components.add(new TemplateComponent(Type.LITERAL, literal, null, null, null));
+                        }
+                        sb.setLength(0);
+                    } else {
+                        litChars++;
+                        sb.append(c);
+                    }
+                    break;
+                case 1:
+                    if (c == '}') {
+                        state = 0;
+                        if (sb.length() > 0) {
+                            capGroups++;
+                            if (i + 1 == template.length() || template.charAt(i + 1) == '/') {
+                                components.add(new TemplateComponent(Type.DEFAULT_REGEX, null, sb.toString(), null, null));
+                            } else {
+                                components.add(new TemplateComponent(Type.CUSTOM_REGEX, "[^/]+?", sb.toString(),
+                                        null, null));
+                            }
+                        } else {
+                            throw new IllegalArgumentException("Invalid template " + template);
+                        }
+                        sb.setLength(0);
+                    } else if (c == ':') {
+                        name = sb.toString();
+                        sb.setLength(0);
+                        state = 2;
+                    } else {
+                        sb.append(c);
+                    }
+                    break;
+                case 2:
+                    if (c == '}') {
+                        state = 0;
+                        if (sb.length() > 0) {
+                            capGroups++;
+                            complexGroups++;
+                            components
+                                    .add(new TemplateComponent(Type.CUSTOM_REGEX, sb.toString(), name, null,
+                                            null));
+                        } else {
+                            throw new IllegalArgumentException("Invalid template " + template);
+                        }
+                        sb.setLength(0);
+                    } else {
+                        sb.append(c);
+                    }
+                    break;
+            }
+        }
+        switch (state) {
+            case 0:
+                if (sb.length() > 0) {
+                    String literal = sb.toString();
+                    if (components.isEmpty()) {
+                        stem = literal;
+                    }
+                    components.add(new TemplateComponent(Type.LITERAL, literal, null, null, null));
+                }
+                break;
+            case 1:
+            case 2:
+                throw new IllegalArgumentException("Invalid template " + template);
+        }
+
+        //coalesce the components
+        //once we have a CUSTOM_REGEX everything goes out the window, so we need to turn the remainder of the
+        //template into a single CUSTOM_REGEX
+        List<String> nameAggregator = null;
+        StringBuilder regexAggregator = null;
+        Iterator<TemplateComponent> it = components.iterator();
+        while (it.hasNext()) {
+            TemplateComponent component = it.next();
+            if (nameAggregator != null) {
+                it.remove();
+                if (component.type == Type.LITERAL) {
+                    regexAggregator.append(Pattern.quote(component.literalText));
+                } else if (component.type == Type.DEFAULT_REGEX) {
+                    regexAggregator.append("(?<").append(component.name).append(">[^/]+?)");
+                    nameAggregator.add(component.name);
+                } else if (component.type == Type.CUSTOM_REGEX) {
+                    regexAggregator.append("(?<").append(component.name).append(">").append(component.literalText.trim())
+                            .append(")");
+                    nameAggregator.add(component.name);
+                }
+            } else if (component.type == Type.CUSTOM_REGEX) {
+                it.remove();
+                regexAggregator = new StringBuilder();
+                nameAggregator = new ArrayList<>();
+                regexAggregator.append("(?<").append(component.name).append(">").append(component.literalText.trim())
+                        .append(")");
+                nameAggregator.add(component.name);
+            }
+        }
+        if (nameAggregator != null) {
+            if (!this.prefixMatch) {
+                regexAggregator.append("$");
+            }
+            components.add(new TemplateComponent(Type.CUSTOM_REGEX, null, null, Pattern.compile(regexAggregator.toString()),
+                    nameAggregator.toArray(new String[0])));
+        }
+        this.stem = stem;
+        this.literalCharacterCount = litChars;
+        this.components = components.toArray(new TemplateComponent[0]);
+        this.capturingGroups = capGroups;
+        this.complexExpressions = complexGroups;
+
+    }
+
+    public URITemplate(String template, String stem, int literalCharacterCount,
+            int capturingGroups, int complexExpressions, TemplateComponent[] components, boolean prefixMatch) {
+        this.template = template;
+        this.stem = stem;
+        this.literalCharacterCount = literalCharacterCount;
+        this.capturingGroups = capturingGroups;
+        this.complexExpressions = complexExpressions;
+        this.components = components;
+        this.prefixMatch = prefixMatch;
+    }
+
+    @Override
+    public int compareTo(URITemplate uriTemplate) {
+        int val = stem.compareTo(uriTemplate.stem);
+        if (val != 0) {
+            return val;
+        }
+        val = Integer.compare(literalCharacterCount, uriTemplate.literalCharacterCount);
+        if (val != 0) {
+            return val;
+        }
+        val = Integer.compare(capturingGroups, uriTemplate.capturingGroups);
+        if (val != 0) {
+            return val;
+        }
+        val = Integer.compare(complexExpressions, uriTemplate.complexExpressions);
+        if (val != 0) {
+            return val;
+        }
+        return template.compareTo(uriTemplate.template);
+    }
+
+    public int countPathParamNames() {
+        int classTemplateNameCount = 0;
+        for (URITemplate.TemplateComponent i : components) {
+            if (i.name != null) {
+                classTemplateNameCount++;
+            } else if (i.names != null) {
+                classTemplateNameCount += i.names.length;
+            }
+        }
+        return classTemplateNameCount;
+    }
+
+    public enum Type {
+        /**
+         * An actual literal
+         */
+        LITERAL,
+        /**
+         * The default regex, that matches any path segment up to a /
+         */
+        DEFAULT_REGEX,
+        /**
+         * A custom regex, that actually needs to be resolved via a Pattern. This may match additional segments.
+         */
+        CUSTOM_REGEX
+    }
+
+    public static class TemplateComponent implements Dumpable {
+
+        /**
+         * The type of component.
+         */
+        public final Type type;
+
+        /**
+         * The actual text of the segment
+         */
+        public final String literalText;
+
+        /**
+         * The parameter name to map the actual contents to
+         */
+        public final String name;
+
+        /**
+         * The pattern for custom regex. This pattern must start with ^ so it will only match from the very start.
+         */
+        public final Pattern pattern;
+
+        /**
+         * The names of all the capturing groups. Only used for CUSTOM_REGEX
+         */
+        public final String[] names;
+
+        public TemplateComponent(Type type, String literalText, String name, Pattern pattern, String[] names) {
+            this.type = type;
+            this.literalText = literalText;
+            this.name = name;
+            this.pattern = pattern;
+            this.names = names;
+        }
+
+        @Override
+        public String toString() {
+            return "TemplateComponent{ name: " + name + ", type: " + type + ", literalText: " + literalText + ", pattern: "
+                    + pattern + "}";
+        }
+
+        @Override
+        public void dump(int level) {
+            indent(level);
+            System.err.println("TemplateComponent");
+            indent(level + 1);
+            System.err.println("name: " + name);
+            indent(level + 1);
+            System.err.println("type: " + type);
+            indent(level + 1);
+            System.err.println("literalText: " + literalText);
+            indent(level + 1);
+            System.err.println("pattern: " + pattern);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "URITemplate{ stem: " + stem + ", template: " + template + ", literalCharacterCount: " + literalCharacterCount
+                + ", components: " + Arrays.toString(components) + " }";
+    }
+
+    @Override
+    public void dump(int level) {
+        indent(level);
+        System.err.println("URITemplate");
+        indent(level + 1);
+        System.err.println("stem: " + stem);
+        indent(level + 1);
+        System.err.println("template: " + template);
+        indent(level + 1);
+        System.err.println("literalCharacterCount: " + literalCharacterCount);
+        indent(level + 1);
+        System.err.println("components: ");
+        for (TemplateComponent component : components) {
+            component.dump(level + 2);
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java
new file mode 100644
index 0000000000000..81aba864a25c9
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ContextResolvers.java
@@ -0,0 +1,96 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import org.jboss.resteasy.reactive.common.model.ResourceContextResolver;
+import org.jboss.resteasy.reactive.common.util.MediaTypeHelper;
+import org.jboss.resteasy.reactive.server.jaxrs.ContextResolverDelegate;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ContextResolvers {
+
+    private final Map<Class<?>, List<ResourceContextResolver>> resolvers = new HashMap<>();
+
+    public <T> void addContextResolver(Class<T> contextType, ResourceContextResolver contextResolver) {
+        List<ResourceContextResolver> list = resolvers.get(contextType);
+        if (list == null) {
+            list = new ArrayList<>(1);
+            resolvers.put(contextType, list);
+        }
+        list.add(contextResolver);
+    }
+
+    public <T> ContextResolver<T> getContextResolver(Class<T> clazz, MediaType mediaType) {
+        List<ResourceContextResolver> goodResolvers = resolvers.get(clazz);
+        if ((goodResolvers != null) && !goodResolvers.isEmpty()) {
+            List<MediaType> mt = Collections.singletonList(mediaType);
+            final List<ContextResolver<T>> delegates = new ArrayList<>();
+            MediaType bestMatch = null;
+            for (ResourceContextResolver goodResolver : goodResolvers) {
+                boolean add = false;
+                // we don't care
+                if (mediaType == null) {
+                    add = true;
+                } else {
+                    MediaType match;
+                    // wildcard handling
+                    if (goodResolver.mediaTypes().isEmpty()) {
+                        match = MediaType.WILDCARD_TYPE;
+                    } else {
+                        match = MediaTypeHelper.getBestMatch(mt, goodResolver.mediaTypes());
+                        // if there's no match, we must skip it
+                        if (match == null)
+                            continue;
+                    }
+                    if (bestMatch == null) {
+                        bestMatch = match;
+                        add = true;
+                    } else {
+                        int cmp = MediaTypeHelper.COMPARATOR.compare(bestMatch, match);
+                        if (cmp == 0) {
+                            // same fitness
+                            add = true;
+                        } else if (cmp > 0) {
+                            // wrong order means that our best match is not as good as the new match
+                            delegates.clear();
+                            add = true;
+                            bestMatch = match;
+                        }
+                        // otherwise this is not as good as our delegate list, so let's not add it
+                    }
+                }
+                if (add) {
+                    delegates.add((ContextResolver<T>) goodResolver.getFactory().createInstance().getInstance());
+                }
+            }
+            if (delegates.isEmpty()) {
+                return null;
+            } else if (delegates.size() == 1) {
+                return delegates.get(0);
+            }
+
+            return new ContextResolverDelegate<>(delegates);
+        }
+        return null;
+    }
+
+    public Map<Class<?>, List<ResourceContextResolver>> getResolvers() {
+        return resolvers;
+    }
+
+    public void initializeDefaultFactories(Function<String, BeanFactory<?>> factoryCreator) {
+        for (Map.Entry<Class<?>, List<ResourceContextResolver>> entry : resolvers.entrySet()) {
+            for (ResourceContextResolver i : entry.getValue()) {
+                if (i.getFactory() == null) {
+                    i.setFactory((BeanFactory) factoryCreator.apply(i.getClassName()));
+                }
+            }
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java
new file mode 100644
index 0000000000000..87556a1eec4e5
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/DynamicFeatures.java
@@ -0,0 +1,21 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature;
+
+/**
+ * Container for {@link javax.ws.rs.container.DynamicFeature}
+ */
+public class DynamicFeatures {
+
+    private final List<ResourceDynamicFeature> resourceDynamicFeatures = new ArrayList<>();
+
+    public void addFeature(ResourceDynamicFeature resourceFeature) {
+        resourceDynamicFeatures.add(resourceFeature);
+    }
+
+    public List<ResourceDynamicFeature> getResourceDynamicFeatures() {
+        return resourceDynamicFeatures;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java
new file mode 100644
index 0000000000000..ecffc98b6652b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/Features.java
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.resteasy.reactive.common.model.ResourceFeature;
+
+public class Features {
+
+    private final List<ResourceFeature> resourceFeatures = new ArrayList<>();
+
+    public void addFeature(ResourceFeature resourceFeature) {
+        resourceFeatures.add(resourceFeature);
+    }
+
+    public List<ResourceFeature> getResourceFeatures() {
+        return resourceFeatures;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java
new file mode 100644
index 0000000000000..6c2f44df6155d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/FixedHandlerChainCustomizer.java
@@ -0,0 +1,45 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.Collections;
+import java.util.List;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class FixedHandlerChainCustomizer implements HandlerChainCustomizer {
+
+    private ServerRestHandler handler;
+    private Phase phase;
+
+    public FixedHandlerChainCustomizer(ServerRestHandler handler, Phase phase) {
+        this.handler = handler;
+        this.phase = phase;
+    }
+
+    public FixedHandlerChainCustomizer() {
+    }
+
+    @Override
+    public List<ServerRestHandler> handlers(Phase phase) {
+        if (this.phase == phase) {
+            return Collections.singletonList(handler);
+        }
+        return Collections.emptyList();
+    }
+
+    public ServerRestHandler getHandler() {
+        return handler;
+    }
+
+    public FixedHandlerChainCustomizer setHandler(ServerRestHandler handler) {
+        this.handler = handler;
+        return this;
+    }
+
+    public Phase getPhase() {
+        return phase;
+    }
+
+    public FixedHandlerChainCustomizer setPhase(Phase phase) {
+        this.phase = phase;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java
new file mode 100644
index 0000000000000..87567523bbc66
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java
@@ -0,0 +1,40 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.List;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public interface HandlerChainCustomizer {
+
+    List<ServerRestHandler> handlers(Phase phase);
+
+    enum Phase {
+        /**
+         * handlers are added right at the start of the pre match handler chain
+         * this can only be applied globally, not on a per method basis
+         */
+        BEFORE_PRE_MATCH,
+        /**
+         * handlers are added at the end of the pre match handler chain, before
+         * the next chain is determined and matched (i.e. after pre match filters)
+         * this can only be applied globally, not on a per method basis
+         */
+        AFTER_PRE_MATCH,
+        /**
+         * handlers are invoked as soon as the matched handler chain is being run
+         */
+        AFTER_MATCH,
+        /**
+         * handlers are invoked as part of resolving method parameters
+         */
+        RESOLVE_METHOD_PARAMETERS,
+        /**
+         * handlers are invoked just before the resource method is invoked
+         */
+        BEFORE_METHOD_INVOKE,
+        /**
+         * handlers are invoked just after the resource method is invoked
+         */
+        AFTER_METHOD_INVOKE,
+
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java
new file mode 100644
index 0000000000000..d2c3dd95a8f25
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ParamConverterProviders.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import javax.ws.rs.ext.ParamConverterProvider;
+import org.jboss.resteasy.reactive.common.model.ResourceParamConverterProvider;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+
+public class ParamConverterProviders {
+
+    private final List<ResourceParamConverterProvider> paramConverterProviders = new ArrayList<>();
+
+    public void addParamConverterProviders(ResourceParamConverterProvider resourceFeature) {
+        paramConverterProviders.add(resourceFeature);
+    }
+
+    public List<ResourceParamConverterProvider> getParamConverterProviders() {
+        return paramConverterProviders;
+    }
+
+    public void sort() {
+        Collections.sort(paramConverterProviders);
+    }
+
+    public void initializeDefaultFactories(Function<String, BeanFactory<?>> factoryCreator) {
+        for (ResourceParamConverterProvider i : paramConverterProviders) {
+            i.setFactory((BeanFactory<ParamConverterProvider>) factoryCreator.apply(i.getClassName()));
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java
new file mode 100644
index 0000000000000..85b99301a444a
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerMethodParameter.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import org.jboss.resteasy.reactive.common.model.MethodParameter;
+import org.jboss.resteasy.reactive.common.model.ParameterType;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.ParameterConverterSupplier;
+
+public class ServerMethodParameter extends MethodParameter {
+
+    public ParameterConverterSupplier converter;
+    public ParameterExtractor customerParameterExtractor;
+
+    public ServerMethodParameter() {
+    }
+
+    public ServerMethodParameter(String name, String type, String declaredType, ParameterType parameterType, boolean single,
+            String signature,
+            ParameterConverterSupplier converter, String defaultValue, boolean isObtainedAsCollection, boolean isOptional,
+            boolean encoded,
+            ParameterExtractor customerParameterExtractor) {
+        super(name, type, declaredType, signature, parameterType, single, defaultValue, isObtainedAsCollection, isOptional,
+                encoded);
+        this.converter = converter;
+        this.customerParameterExtractor = customerParameterExtractor;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java
new file mode 100644
index 0000000000000..a341cbd878b5f
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/model/ServerResourceMethod.java
@@ -0,0 +1,54 @@
+package org.jboss.resteasy.reactive.server.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+import org.jboss.resteasy.reactive.common.model.ResourceMethod;
+import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.spi.EndpointInvoker;
+
+public class ServerResourceMethod extends ResourceMethod {
+
+    private Supplier<EndpointInvoker> invoker;
+
+    private Set<String> methodAnnotationNames;
+
+    private List<HandlerChainCustomizer> handlerChainCustomizers = new ArrayList<>();
+    private ParameterExtractor customerParameterExtractor;
+
+    public Supplier<EndpointInvoker> getInvoker() {
+        return invoker;
+    }
+
+    public ResourceMethod setInvoker(Supplier<EndpointInvoker> invoker) {
+        this.invoker = invoker;
+        return this;
+    }
+
+    public Set<String> getMethodAnnotationNames() {
+        return methodAnnotationNames;
+    }
+
+    public void setMethodAnnotationNames(Set<String> methodAnnotationNames) {
+        this.methodAnnotationNames = methodAnnotationNames;
+    }
+
+    public List<HandlerChainCustomizer> getHandlerChainCustomizers() {
+        return handlerChainCustomizers;
+    }
+
+    public ServerResourceMethod setHandlerChainCustomizers(List<HandlerChainCustomizer> handlerChainCustomizers) {
+        this.handlerChainCustomizers = handlerChainCustomizers;
+        return this;
+    }
+
+    public ParameterExtractor getCustomerParameterExtractor() {
+        return customerParameterExtractor;
+    }
+
+    public ServerResourceMethod setCustomerParameterExtractor(ParameterExtractor customerParameterExtractor) {
+        this.customerParameterExtractor = customerParameterExtractor;
+        return this;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java
new file mode 100644
index 0000000000000..5923cf08ced2d
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerBooleanMessageBodyHandler.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.BooleanMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerBooleanMessageBodyHandler extends BooleanMessageBodyHandler
+        implements ServerMessageBodyReader<Boolean> {
+
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return type == Boolean.class;
+    }
+
+    @Override
+    public Boolean readFrom(Class<Boolean> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return Boolean.valueOf(super.readFrom(context.getInputStream(), false));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java
new file mode 100644
index 0000000000000..dc2d6e98612b3
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerByteArrayMessageBodyHandler.java
@@ -0,0 +1,40 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.ByteArrayMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerByteArrayMessageBodyHandler extends ByteArrayMessageBodyHandler
+        implements ServerMessageBodyWriter<byte[]>, ServerMessageBodyReader<byte[]> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public void writeResponse(byte[] o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        // FIXME: use response encoding
+        context.serverResponse().end(o);
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public byte[] readFrom(Class<byte[]> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return MessageReaderUtil.readBytes(context.getInputStream());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java
new file mode 100644
index 0000000000000..7fb4e97fdf1fb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharArrayMessageBodyHandler.java
@@ -0,0 +1,40 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.CharArrayMessageBodyHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerCharArrayMessageBodyHandler extends CharArrayMessageBodyHandler
+        implements ServerMessageBodyWriter<char[]>, ServerMessageBodyReader<char[]> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public void writeResponse(char[] o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        // FIXME: use response encoding
+        context.serverResponse().end(new String(o));
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return type.equals(String.class);
+    }
+
+    @Override
+    public char[] readFrom(Class<char[]> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return MessageReaderUtil.readString(context.getInputStream(), mediaType).toCharArray();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java
new file mode 100644
index 0000000000000..26958fd737e68
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerCharacterMessageBodyHandler.java
@@ -0,0 +1,29 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.CharacterMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerCharacterMessageBodyHandler extends CharacterMessageBodyHandler
+        implements ServerMessageBodyReader<Character> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return type == Character.class;
+    }
+
+    @Override
+    public Character readFrom(Class<Character> type, Type genericType, MediaType mediaType,
+            ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return doReadFrom(context.getInputStream());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java
new file mode 100644
index 0000000000000..165ab34b5e609
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerDefaultTextPlainBodyHandler.java
@@ -0,0 +1,22 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.DefaultTextPlainBodyHandler;
+
+@Provider
+@Consumes("text/plain")
+public class ServerDefaultTextPlainBodyHandler extends DefaultTextPlainBodyHandler {
+
+    @Override
+    protected void validateInput(String input) throws ProcessingException {
+        if (input.isEmpty()) {
+            // add an empty, non-null entity in order to ensure that the response will be used as is
+            // TODO: this seems to be an edge case, but perhaps it needs to be handled by RequestDeserializeHandler?
+            throw new BadRequestException(Response.status(Response.Status.BAD_REQUEST).entity("").build());
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java
new file mode 100644
index 0000000000000..47b5c66573c87
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFileBodyHandler.java
@@ -0,0 +1,47 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.FileBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+// TODO: this is very simplistic at the moment
+
+@Provider
+@Produces("*/*")
+@Consumes("*/*")
+public class ServerFileBodyHandler extends FileBodyHandler implements ServerMessageBodyWriter<File> {
+
+    @Override
+    public long getSize(File o, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return o.length();
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return File.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(File o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        ServerHttpResponse vertxResponse = context.serverResponse();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+            doWrite(o, baos);
+        } catch (IOException e) {
+            throw new WebApplicationException(e);
+        }
+        vertxResponse.end(baos.toByteArray());
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java
new file mode 100644
index 0000000000000..fd0bf810e7d84
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerFormUrlEncodedProvider.java
@@ -0,0 +1,59 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import javax.ws.rs.ConstrainedTo;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.RuntimeType;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.FormUrlEncodedProvider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+@SuppressWarnings("rawtypes")
+@Provider
+@Produces("application/x-www-form-urlencoded")
+@Consumes("application/x-www-form-urlencoded")
+@ConstrainedTo(RuntimeType.CLIENT)
+public class ServerFormUrlEncodedProvider extends FormUrlEncodedProvider
+        implements ServerMessageBodyReader<MultivaluedMap>, ServerMessageBodyWriter<MultivaluedMap> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return MultivaluedMap.class.equals(type);
+    }
+
+    @Override
+    public MultivaluedMap readFrom(Class<MultivaluedMap> type, Type genericType, MediaType mediaType,
+            ServerRequestContext context) throws WebApplicationException, IOException {
+        return doReadFrom(mediaType, context.getInputStream());
+    }
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return MultivaluedMap.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(MultivaluedMap o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        try {
+            // FIXME: use response encoding
+            context.serverResponse().end(multiValuedMapToString(o, MessageReaderUtil.UTF8_CHARSET));
+        } catch (UnsupportedEncodingException e) {
+            throw new WebApplicationException(e);
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java
new file mode 100644
index 0000000000000..c643e6d16f675
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerInputStreamMessageBodyHandler.java
@@ -0,0 +1,36 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.InputStreamMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerInputStreamMessageBodyHandler extends InputStreamMessageBodyHandler
+        implements ServerMessageBodyReader<InputStream> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public InputStream readFrom(Class<InputStream> type, Type genericType, MediaType mediaType,
+            ServerRequestContext context) throws WebApplicationException, IOException {
+        return context.getInputStream();
+    }
+
+    @Override
+    public long getSize(InputStream inputStream, Class<?> type, Type genericType, Annotation[] annotations,
+            MediaType mediaType) {
+        return -1;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java
new file mode 100644
index 0000000000000..8163240ccdafb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerNumberMessageBodyHandler.java
@@ -0,0 +1,28 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.NumberMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerNumberMessageBodyHandler extends NumberMessageBodyHandler
+        implements ServerMessageBodyReader<Number> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return Number.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public Number readFrom(Class<Number> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return doReadFrom(type, context.getInputStream());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java
new file mode 100644
index 0000000000000..789bf1d5229be
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerReaderBodyHandler.java
@@ -0,0 +1,33 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.providers.serialisers.MessageReaderUtil;
+import org.jboss.resteasy.reactive.common.providers.serialisers.ReaderBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ServerReaderBodyHandler extends ReaderBodyHandler implements ServerMessageBodyReader<Reader> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return type.equals(Reader.class);
+    }
+
+    @Override
+    public Reader readFrom(Class<Reader> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return new InputStreamReader(context.getInputStream(), MessageReaderUtil.charsetFromMediaType(mediaType));
+    }
+
+    public long getSize(Reader inputStream, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return -1;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java
new file mode 100644
index 0000000000000..55d250874d185
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/ServerStringMessageBodyHandler.java
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.common.providers.serialisers.StringMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+@Provider
+public class ServerStringMessageBodyHandler extends StringMessageBodyHandler
+        implements ServerMessageBodyWriter<Object>, ServerMessageBodyReader<String> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return true;
+    }
+
+    @Override
+    public void writeResponse(Object o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        // FIXME: use response encoding
+        context.serverResponse().end(o.toString());
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return type.equals(String.class);
+    }
+
+    @Override
+    public String readFrom(Class<String> type, Type genericType, MediaType mediaType, ServerRequestContext context)
+            throws WebApplicationException, IOException {
+        return readFrom(context.getInputStream(), true);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/json/AbstractJsonMessageBodyReader.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/json/AbstractJsonMessageBodyReader.java
new file mode 100644
index 0000000000000..2a8da3d7f8997
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/json/AbstractJsonMessageBodyReader.java
@@ -0,0 +1,33 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers.json;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyReader;
+
+public abstract class AbstractJsonMessageBodyReader implements ServerMessageBodyReader<Object> {
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+        return isReadable(mediaType, type);
+    }
+
+    @Override
+    public boolean isReadable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType) {
+        return isReadable(mediaType, type);
+    }
+
+    private boolean isReadable(MediaType mediaType, Class<?> type) {
+        if (mediaType == null) {
+            return false;
+        }
+        if (String.class.equals(type)) { // don't attempt to read plain strings
+            return false;
+        }
+        String subtype = mediaType.getSubtype();
+        boolean isApplicationMediaType = "application".equals(mediaType.getType());
+        return (isApplicationMediaType && "json".equalsIgnoreCase(subtype) || subtype.endsWith("+json"))
+                || (mediaType.isWildcardSubtype() && (mediaType.isWildcardType() || isApplicationMediaType));
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java
new file mode 100644
index 0000000000000..94a6ac374b457
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonArrayHandler.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers.jsonp;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Type;
+import javax.json.JsonArray;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonArrayHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ServerJsonArrayHandler extends JsonArrayHandler implements ServerMessageBodyWriter<JsonArray> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return JsonArray.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(JsonArray o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (JsonWriter writer = JsonpUtil.writer(out, context.getResponseContentType().getMediaType())) {
+            writer.writeArray(o);
+        }
+        context.serverResponse().end(out.toByteArray());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java
new file mode 100644
index 0000000000000..0fb229a16cfef
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonObjectHandler.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers.jsonp;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Type;
+import javax.json.JsonObject;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonObjectHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ServerJsonObjectHandler extends JsonObjectHandler implements ServerMessageBodyWriter<JsonObject> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return JsonObject.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(JsonObject o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (JsonWriter writer = JsonpUtil.writer(out, context.getResponseMediaType())) {
+            writer.writeObject(o);
+        }
+        context.serverResponse().end(out.toByteArray());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java
new file mode 100644
index 0000000000000..8e3fe16ddbbed
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonStructureHandler.java
@@ -0,0 +1,33 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers.jsonp;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Type;
+import javax.json.JsonObject;
+import javax.json.JsonStructure;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonStructureHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ServerJsonStructureHandler extends JsonStructureHandler
+        implements ServerMessageBodyWriter<JsonStructure> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return JsonStructure.class.isAssignableFrom(type) && !JsonObject.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(JsonStructure o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (JsonWriter writer = JsonpUtil.writer(out, context.getResponseMediaType())) {
+            writer.write(o);
+        }
+        context.serverResponse().end(out.toByteArray());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java
new file mode 100644
index 0000000000000..9623eaa903311
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/providers/serialisers/jsonp/ServerJsonValueHandler.java
@@ -0,0 +1,31 @@
+package org.jboss.resteasy.reactive.server.providers.serialisers.jsonp;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Type;
+import javax.json.JsonValue;
+import javax.json.JsonWriter;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonValueHandler;
+import org.jboss.resteasy.reactive.common.providers.serialisers.jsonp.JsonpUtil;
+import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
+import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public class ServerJsonValueHandler extends JsonValueHandler implements ServerMessageBodyWriter<JsonValue> {
+
+    @Override
+    public boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType) {
+        return JsonValue.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public void writeResponse(JsonValue o, Type genericType, ServerRequestContext context) throws WebApplicationException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (JsonWriter writer = JsonpUtil.writer(out, context.getResponseMediaType())) {
+            writer.write(o);
+        }
+        context.serverResponse().end(out.toByteArray());
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java
new file mode 100644
index 0000000000000..4c33cbcf06391
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/AsyncExceptionMapperContext.java
@@ -0,0 +1,14 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import javax.ws.rs.core.Response;
+
+public interface AsyncExceptionMapperContext {
+
+    ServerRequestContext serverRequestContext();
+
+    void suspend();
+
+    void resume();
+
+    void setResponse(Response response);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java
new file mode 100644
index 0000000000000..33b3ec14bcc3c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ContentType.java
@@ -0,0 +1,13 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import javax.ws.rs.core.MediaType;
+
+public interface ContentType {
+
+    String getCharset();
+
+    String getEncoded();
+
+    MediaType getMediaType();
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/EndpointInvoker.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/EndpointInvoker.java
new file mode 100644
index 0000000000000..4c4d5898c1041
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/EndpointInvoker.java
@@ -0,0 +1,7 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+public interface EndpointInvoker {
+
+    Object invoke(Object instance, Object[] parameters) throws Exception;
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java
new file mode 100644
index 0000000000000..cfb95ad8bcb9e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveAsyncExceptionMapper.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+/**
+ * Allow ExceptionMapper classes that can use resume and suspend when attempting to convert
+ * an exception into a response
+ */
+public interface ResteasyReactiveAsyncExceptionMapper<E extends Throwable> extends ExceptionMapper<E> {
+
+    /**
+     * If the handling of the exception involves async handling async results, the implementation can
+     * use {@link AsyncExceptionMapperContext#suspend()} and {@link AsyncExceptionMapperContext#resume()}.
+     *
+     * In all cases, tt is the responsibility of the implementation to call
+     * {@link AsyncExceptionMapperContext#setResponse(Response)}
+     * when the exception has been properly mapped.
+     *
+     */
+    void asyncResponse(E exception, AsyncExceptionMapperContext context);
+
+    default Response toResponse(E exception) {
+        throw new IllegalStateException("This should never have been called");
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java
new file mode 100644
index 0000000000000..786d26a293796
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestContext.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import javax.ws.rs.container.ContainerRequestContext;
+
+public interface ResteasyReactiveContainerRequestContext extends ContainerRequestContext {
+
+    ServerRequestContext getServerRequestContext();
+
+    void suspend();
+
+    void resume();
+
+    void resume(Throwable t);
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java
new file mode 100644
index 0000000000000..1d632ce9ee687
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerRequestFilter.java
@@ -0,0 +1,14 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.io.IOException;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+
+public interface ResteasyReactiveContainerRequestFilter extends ContainerRequestFilter {
+    @Override
+    default void filter(ContainerRequestContext requestContext) throws IOException {
+        filter((ResteasyReactiveContainerRequestContext) requestContext);
+    }
+
+    void filter(ResteasyReactiveContainerRequestContext requestContext);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java
new file mode 100644
index 0000000000000..83c787552b729
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveContainerResponseFilter.java
@@ -0,0 +1,14 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+
+public interface ResteasyReactiveContainerResponseFilter extends ContainerResponseFilter {
+    @Override
+    default void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
+        filter((ResteasyReactiveContainerRequestContext) requestContext, responseContext);
+    }
+
+    void filter(ResteasyReactiveContainerRequestContext requestContext, ContainerResponseContext responseContext);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java
new file mode 100644
index 0000000000000..ddccb90e0785e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveExceptionMapper.java
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+public interface ResteasyReactiveExceptionMapper<E extends Throwable> extends ExceptionMapper<E> {
+
+    /**
+     * Convenience method that allows for easy access to the request context
+     */
+    Response toResponse(E exception, ServerRequestContext context);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java
new file mode 100644
index 0000000000000..45d0e7187d277
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ResteasyReactiveResourceInfo.java
@@ -0,0 +1,91 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.Set;
+import javax.ws.rs.container.ResourceInfo;
+
+/**
+ * A lazy representation of a Method
+ *
+ * Only loaded if actually needed, which should not be the case generally
+ * unless custom Serialization is in use.
+ */
+public class ResteasyReactiveResourceInfo implements ResourceInfo {
+
+    private final String name;
+    private final Class<?> declaringClass;
+    private final Class[] parameterTypes;
+    private final Set<String> methodAnnotationNames;
+    private volatile Method method;
+    private volatile Annotation[] annotations;
+    private volatile Type returnType;
+
+    public ResteasyReactiveResourceInfo(String name, Class<?> declaringClass, Class[] parameterTypes,
+            Set<String> methodAnnotationNames) {
+        this.name = name;
+        this.declaringClass = declaringClass;
+        this.parameterTypes = parameterTypes;
+        this.methodAnnotationNames = methodAnnotationNames;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Class[] getParameterTypes() {
+        return parameterTypes;
+    }
+
+    public Set<String> getMethodAnnotationNames() {
+        return methodAnnotationNames;
+    }
+
+    public Method getMethod() {
+        if (method == null) {
+            synchronized (this) {
+                if (method == null) {
+                    try {
+                        Method declaredMethod = declaringClass.getMethod(name, parameterTypes);
+                        annotations = declaredMethod.getAnnotations();
+                        returnType = declaredMethod.getGenericReturnType();
+                        method = declaredMethod;
+                    } catch (NoSuchMethodException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        }
+        return method;
+    }
+
+    public Annotation[] getAnnotations() {
+        if (annotations == null) {
+            getMethod();
+        }
+        return annotations;
+    }
+
+    public Type getGenericReturnType() {
+        if (returnType == null) {
+            getMethod();
+        }
+        return returnType;
+    }
+
+    @Override
+    public Method getResourceMethod() {
+        return getMethod();
+    }
+
+    @Override
+    public Class<?> getResourceClass() {
+        return declaringClass;
+    }
+
+    public Annotation[] getParameterAnnotations(int index) {
+        // Should we cache this?
+        return getMethod().getParameterAnnotations()[index];
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/RuntimeConfigurableServerRestHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/RuntimeConfigurableServerRestHandler.java
new file mode 100644
index 0000000000000..9f1f217fd6252
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/RuntimeConfigurableServerRestHandler.java
@@ -0,0 +1,6 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+public interface RuntimeConfigurableServerRestHandler extends ServerRestHandler {
+
+    void configure(RuntimeConfiguration configuration);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/RuntimeConfiguration.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/RuntimeConfiguration.java
new file mode 100644
index 0000000000000..4f7d0fcad46cd
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/RuntimeConfiguration.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.time.Duration;
+import java.util.Optional;
+
+public interface RuntimeConfiguration {
+
+    Duration readTimeout();
+
+    Body body();
+
+    Limits limits();
+
+    interface Body {
+
+        boolean deleteUploadedFilesOnEnd();
+
+        String uploadsDirectory();
+    }
+
+    interface Limits {
+        Optional<Long> maxBodySize();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java
new file mode 100644
index 0000000000000..dab47b72d4bcf
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpRequest.java
@@ -0,0 +1,76 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface ServerHttpRequest {
+
+    String getRequestHeader(CharSequence name);
+
+    Iterable<Map.Entry<String, String>> getAllRequestHeaders();
+
+    List<String> getAllRequestHeaders(String name);
+
+    boolean containsRequestHeader(CharSequence accept);
+
+    String getRequestPath();
+
+    String getRequestMethod();
+
+    String getRequestNormalisedPath();
+
+    String getRequestAbsoluteUri();
+
+    String getRequestScheme();
+
+    String getRequestHost();
+
+    void closeConnection();
+
+    String getFormAttribute(String name);
+
+    List<String> getAllFormAttributes(String name);
+
+    String getQueryParam(String name);
+
+    List<String> getAllQueryParams(String name);
+
+    String query();
+
+    Collection<String> queryParamNames();
+
+    boolean isRequestEnded();
+
+    void setExpectMultipart(boolean expectMultipart);
+
+    InputStream createInputStream(ByteBuffer existingData);
+
+    InputStream createInputStream();
+
+    ServerHttpResponse pauseRequestInput();
+
+    ServerHttpResponse resumeRequestInput();
+
+    ServerHttpResponse setReadListener(ReadCallback callback);
+
+    /**
+     * Unwraps a backing object
+     * 
+     * @param theType
+     * @param <T>
+     * @return
+     */
+    <T> T unwrap(Class<T> theType);
+
+    interface ReadCallback {
+
+        void done();
+
+        void data(ByteBuffer data);
+
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java
new file mode 100644
index 0000000000000..f65b8e21bd57c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerHttpResponse.java
@@ -0,0 +1,42 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public interface ServerHttpResponse {
+
+    ServerHttpResponse setStatusCode(int code);
+
+    ServerHttpResponse end();
+
+    boolean headWritten();
+
+    ServerHttpResponse end(byte[] data);
+
+    ServerHttpResponse end(String data);
+
+    ServerHttpResponse addResponseHeader(CharSequence name, CharSequence value);
+
+    ServerHttpResponse setResponseHeader(CharSequence name, CharSequence value);
+
+    ServerHttpResponse setResponseHeader(CharSequence name, Iterable<CharSequence> values);
+
+    Iterable<Map.Entry<String, String>> getAllResponseHeaders();
+
+    boolean closed();
+
+    ServerHttpResponse setChunked(boolean chunked);
+
+    ServerHttpResponse write(byte[] data, Consumer<Throwable> asyncResultHandler);
+
+    CompletionStage<Void> write(byte[] data);
+
+    OutputStream createResponseOutputStream();
+
+    void setPreCommitListener(Consumer<ResteasyReactiveRequestContext> task);
+
+    ServerHttpResponse addCloseHandler(Runnable onClose);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java
new file mode 100644
index 0000000000000..956232859e503
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyReader.java
@@ -0,0 +1,16 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+
+public interface ServerMessageBodyReader<T> extends MessageBodyReader<T> {
+
+    boolean isReadable(Class<?> type, Type genericType,
+            ResteasyReactiveResourceInfo lazyMethod, MediaType mediaType);
+
+    T readFrom(Class<T> type, Type genericType, MediaType mediaType,
+            ServerRequestContext context) throws WebApplicationException, IOException;
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java
new file mode 100644
index 0000000000000..7c794519b6b53
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerMessageBodyWriter.java
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+/**
+ * Extension of MessageBodyWriter which can write directly to a Vert.x response
+ */
+public interface ServerMessageBodyWriter<T> extends MessageBodyWriter<T> {
+
+    boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target, MediaType mediaType);
+
+    void writeResponse(T o, Type genericType, ServerRequestContext context) throws WebApplicationException, IOException;
+
+    /**
+     * A special super-class of MessageBodyWriters that accepts all types of input.
+     * The main purpose of this class is to allow runtime code
+     * to optimize for the case when there are multiple providers determined at build time
+     * but the first one will always be used
+     */
+    abstract class AllWriteableMessageBodyWriter implements ServerMessageBodyWriter<Object> {
+
+        @Override
+        public final boolean isWriteable(Class<?> type, Type genericType, ResteasyReactiveResourceInfo target,
+                MediaType mediaType) {
+            return true;
+        }
+
+        @Override
+        public final boolean isWriteable(Class<?> type, Type genericType,
+                Annotation[] annotations, MediaType mediaType) {
+            return true;
+        }
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java
new file mode 100644
index 0000000000000..f0f0d51cd21dc
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRequestContext.java
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.common.core.ResteasyReactiveCallbackContext;
+
+public interface ServerRequestContext extends ResteasyReactiveCallbackContext {
+
+    ServerHttpResponse serverResponse();
+
+    InputStream getInputStream();
+
+    ContentType getResponseContentType();
+
+    MediaType getResponseMediaType();
+
+    OutputStream getOrCreateOutputStream();
+
+    ResteasyReactiveResourceInfo getResteasyReactiveResourceInfo();
+
+    void abortWith(Response response);
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRestHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRestHandler.java
new file mode 100644
index 0000000000000..be1d3cb6022ce
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/spi/ServerRestHandler.java
@@ -0,0 +1,10 @@
+package org.jboss.resteasy.reactive.server.spi;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.spi.RestHandler;
+
+public interface ServerRestHandler extends RestHandler<ResteasyReactiveRequestContext> {
+
+    void handle(ResteasyReactiveRequestContext requestContext) throws Exception;
+
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java
new file mode 100644
index 0000000000000..ede9bfd7425df
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/RuntimeResourceVisitor.java
@@ -0,0 +1,75 @@
+package org.jboss.resteasy.reactive.server.util;
+
+import java.util.List;
+import java.util.Map;
+import org.jboss.resteasy.reactive.server.handlers.ClassRoutingHandler;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+import org.jboss.resteasy.reactive.server.mapping.RequestMapper;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.spi.RestHandler;
+
+public interface RuntimeResourceVisitor {
+
+    public default void visitBasePath(String basePath) {
+    }
+
+    public default void visitRuntimeResource(String httpMethod, String fullPath, RuntimeResource runtimeResource) {
+    }
+
+    public default void visitEnd() {
+    }
+
+    public default void visitStart() {
+    }
+
+    public static void visitRuntimeResources(
+            List<RequestMapper.RequestPath<RestInitialHandler.InitialMatch>> classMappers,
+            RuntimeResourceVisitor visitor) {
+        visitor.visitStart();
+        for (RequestMapper.RequestPath<RestInitialHandler.InitialMatch> classMapper : classMappers) {
+            String template = classMapper.template.template;
+            RestInitialHandler.InitialMatch initialMatch = classMapper.value;
+            if ((initialMatch.handlers == null) || initialMatch.handlers.length == 0) {
+                continue;
+            }
+            RestHandler firstHandler = initialMatch.handlers[0];
+            if (!(firstHandler instanceof ClassRoutingHandler)) {
+                continue;
+            }
+            ClassRoutingHandler classRoutingHandler = (ClassRoutingHandler) firstHandler;
+
+            Map<String, RequestMapper<RuntimeResource>> classRoutingHandlerMappers = classRoutingHandler.getMappers();
+            for (Map.Entry<String, RequestMapper<RuntimeResource>> entry : classRoutingHandlerMappers.entrySet()) {
+                String basePath = template;
+                String httpMethod = entry.getKey();
+                if (httpMethod == null) {
+                    continue; // TODO: fix as to use all methods
+                }
+
+                RequestMapper<RuntimeResource> requestMapper = entry.getValue();
+                List<RequestMapper.RequestPath<RuntimeResource>> methodTemplates = requestMapper.getTemplates();
+                if (methodTemplates.isEmpty()) {
+                    continue;
+                }
+                visitor.visitBasePath(basePath);
+                for (RequestMapper.RequestPath<RuntimeResource> methodTemplate : methodTemplates) {
+                    String subPath = methodTemplate.template.template;
+                    if (subPath.startsWith("/")) {
+                        subPath = subPath.substring(1);
+                    }
+                    String fullPath = basePath;
+                    if (!subPath.isEmpty()) {
+                        if (basePath.endsWith("/")) {
+                            fullPath += subPath;
+                        } else {
+                            fullPath = basePath + "/" + subPath;
+                        }
+                    }
+                    RuntimeResource runtimeResource = methodTemplate.value;
+                    visitor.visitRuntimeResource(httpMethod, fullPath, runtimeResource);
+                }
+            }
+        }
+        visitor.visitEnd();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java
new file mode 100644
index 0000000000000..4808924189e48
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/util/ScoreSystem.java
@@ -0,0 +1,180 @@
+package org.jboss.resteasy.reactive.server.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.resteasy.reactive.common.util.ServerMediaType;
+import org.jboss.resteasy.reactive.server.handlers.ResourceRequestFilterHandler;
+import org.jboss.resteasy.reactive.server.mapping.RuntimeResource;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+public class ScoreSystem {
+
+    public static class EndpointScores {
+
+        public final List<EndpointScore> endpoints;
+        public final int score;
+
+        public EndpointScores(int score, List<EndpointScore> endpoints) {
+            this.score = score;
+            this.endpoints = endpoints;
+        }
+
+    }
+
+    public static class EndpointScore {
+
+        public final String httpMethod;
+        public final String fullPath;
+        public final List<MediaType> produces;
+        public final List<MediaType> consumes;
+        public final Map<Category, List<Diagnostic>> diagnostics;
+        public final int score;
+        public final List<RequestFilterEntry> requestFilterEntries;
+
+        public EndpointScore(String httpMethod, String fullPath, List<MediaType> produces, List<MediaType> consumes,
+                Map<Category, List<Diagnostic>> diagnostics, int score, List<RequestFilterEntry> requestFilterEntries) {
+            this.httpMethod = httpMethod;
+            this.fullPath = fullPath;
+            this.produces = produces;
+            this.consumes = consumes;
+            this.diagnostics = diagnostics;
+            this.score = score;
+            this.requestFilterEntries = requestFilterEntries;
+        }
+
+    }
+
+    public static class RequestFilterEntry {
+        public final String name;
+        public final boolean preMatch;
+
+        public String getName() {
+            String removeSubClass = name.replace("_Subclass", "");
+            String finalFilterName = removeSubClass.replaceAll("\\$.*?\\$", "::");
+            return finalFilterName;
+        }
+
+        public RequestFilterEntry(String name, boolean preMatch) {
+            this.name = name;
+            this.preMatch = preMatch;
+        }
+    }
+
+    public static class Diagnostic {
+
+        public final String message;
+        public final int score;
+
+        public Diagnostic(String message, int percentageScore) {
+            this.message = message;
+            this.score = percentageScore;
+        }
+
+        @Override
+        public String toString() {
+            return message + ": " + score + "/100";
+        }
+
+        public static Diagnostic ExecutionNonBlocking = new Diagnostic("Dispatched on the IO thread", 100);
+        public static Diagnostic ExecutionBlocking = new Diagnostic("Needs a worker thread dispatch", 0);
+
+        public static Diagnostic ResourceSingleton = new Diagnostic("Single resource instance for all requests", 100);
+        public static Diagnostic ResourcePerRequest = new Diagnostic("New resource instance for every request", 0);
+
+        public static Diagnostic WriterBuildTime(MessageBodyWriter<?> buildTimeWriter) {
+            return new Diagnostic("Single writer set at build time: " + buildTimeWriter, 90);
+        }
+
+        public static Diagnostic WriterBuildTimeDirect(MessageBodyWriter<?> buildTimeWriter) {
+            return new Diagnostic("Single direct writer set at build time: " + buildTimeWriter, 100);
+        }
+
+        public static Diagnostic WriterBuildTimeMultiple(List<MessageBodyWriter<?>> buildTimeWriters) {
+            return new Diagnostic("Multiple writers set at build time: " + buildTimeWriters, 50);
+        }
+
+        public static Diagnostic WriterRunTime = new Diagnostic("Run time writers required", 0);
+        public static Diagnostic WriterNotRequired = new Diagnostic("No writers required", 100);
+
+    }
+
+    public enum Category {
+        Writer,
+        Resource,
+        Execution
+    }
+
+    public static EndpointScores latestScores;
+
+    public final static RuntimeResourceVisitor ScoreVisitor = new RuntimeResourceVisitor() {
+        int overallScore = 0;
+        int overallTotal = 0;
+        List<EndpointScore> endpoints = new ArrayList<>();
+
+        @Override
+        public void visitRuntimeResource(String httpMethod, String fullPath, RuntimeResource runtimeResource) {
+            ServerMediaType serverMediaType = runtimeResource.getProduces();
+            List<MediaType> produces = Collections.emptyList();
+            if (serverMediaType != null) {
+                if ((serverMediaType.getSortedOriginalMediaTypes() != null)
+                        && serverMediaType.getSortedOriginalMediaTypes().length >= 1) {
+                    produces = Arrays.asList(serverMediaType.getSortedOriginalMediaTypes());
+                }
+            }
+
+            ServerRestHandler[] handlerChain = runtimeResource.getHandlerChain();
+            List<RequestFilterEntry> requestFilters = new ArrayList<>();
+            for (ServerRestHandler serverRestHandler : handlerChain) {
+                if (serverRestHandler instanceof ResourceRequestFilterHandler) {
+                    ResourceRequestFilterHandler requestFilterHandler = (ResourceRequestFilterHandler) serverRestHandler;
+                    requestFilters.add(new RequestFilterEntry(requestFilterHandler.getFilter().getClass().getName(),
+                            requestFilterHandler.isPreMatch()));
+                }
+            }
+            List<MediaType> consumes = runtimeResource.getConsumes();
+            if (runtimeResource.getScore() == null) {
+                return;
+            }
+            int score = 0;
+            int total = 0;
+            for (Entry<Category, List<Diagnostic>> scoreEntry : runtimeResource.getScore().entrySet()) {
+                for (Diagnostic diagnostic : scoreEntry.getValue()) {
+                    score += diagnostic.score;
+                }
+                total += 100;
+            }
+            // let's bring it to 100
+            score = (int) Math.floor(((float) score / (float) total) * 100f);
+            overallScore += score;
+            overallTotal += 100;
+            endpoints.add(new EndpointScore(httpMethod, fullPath, produces, consumes, runtimeResource.getScore(), score,
+                    requestFilters));
+        }
+
+        @Override
+        public void visitEnd() {
+            if (overallScore == 0) {
+                // we were most likely not able to determine the score, so don't print anything as it will be misleading
+                return;
+            }
+            // let's bring it to 100
+            overallScore = (int) Math.floor(((float) overallScore / (float) overallTotal) * 100f);
+            latestScores = new EndpointScores(overallScore, endpoints);
+        }
+
+        @Override
+        public void visitStart() {
+            //clear the endpoints
+            endpoints.clear();
+            //reset overallScore and overallTotal
+            overallScore = 0;
+            overallTotal = 0;
+        }
+    };
+}
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/resources/META-INF/services/org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory b/independent-projects/resteasy-reactive/server/runtime/src/main/resources/META-INF/services/org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory
new file mode 100644
index 0000000000000..15bc2d56a0687
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/resources/META-INF/services/org.jboss.resteasy.reactive.common.core.ResponseBuilderFactory
@@ -0,0 +1 @@
+org.jboss.resteasy.reactive.server.core.ServerResponseBuilderFactory
\ No newline at end of file
diff --git a/independent-projects/resteasy-reactive/server/vertx/pom.xml b/independent-projects/resteasy-reactive/server/vertx/pom.xml
new file mode 100644
index 0000000000000..c65cce73ecb44
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus.resteasy.reactive</groupId>
+        <artifactId>resteasy-reactive-server-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>resteasy-reactive-vertx</artifactId>
+    <name>RESTEasy Reactive - Vert.x Support - Runtime</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-depchain</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.resteasy.reactive</groupId>
+            <artifactId>resteasy-reactive-processor</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.bind</groupId>
+            <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java
new file mode 100644
index 0000000000000..6a3716004d17e
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveOutputStream.java
@@ -0,0 +1,288 @@
+package org.jboss.resteasy.reactive.server.vertx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.vertx.core.Context;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpConnection;
+import io.vertx.core.http.HttpServerRequest;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+
+public class ResteasyReactiveOutputStream extends OutputStream {
+
+    private static final Logger log = Logger.getLogger("io.quarkus.quarkus-rest");
+    private final ResteasyReactiveRequestContext context;
+    protected final HttpServerRequest request;
+    private ByteBuf pooledBuffer;
+    private long written;
+    private boolean committed;
+
+    private boolean closed;
+    private boolean finished;
+    protected boolean waitingForDrain;
+    protected boolean drainHandlerRegistered;
+    protected boolean first = true;
+    protected Throwable throwable;
+    private ByteArrayOutputStream overflow;
+
+    public ResteasyReactiveOutputStream(VertxResteasyReactiveRequestContext context) {
+        this.context = context;
+        this.request = context.getContext().request();
+        request.response().exceptionHandler(new Handler<Throwable>() {
+            @Override
+            public void handle(Throwable event) {
+                throwable = event;
+                log.debugf(event, "IO Exception ");
+                //TODO: do we need this?
+                terminateResponse();
+                request.connection().close();
+                synchronized (request.connection()) {
+                    if (waitingForDrain) {
+                        request.connection().notify();
+                    }
+                }
+            }
+        });
+
+        request.response().endHandler(new Handler<Void>() {
+            @Override
+            public void handle(Void event) {
+                synchronized (request.connection()) {
+                    if (waitingForDrain) {
+                        request.connection().notify();
+                    }
+                }
+                terminateResponse();
+            }
+        });
+    }
+
+    public void terminateResponse() {
+
+    }
+
+    Buffer createBuffer(ByteBuf data) {
+        return new VertxBufferImpl(data);
+    }
+
+    public void write(ByteBuf data, boolean last) throws IOException {
+        if (last && data == null) {
+            request.response().end();
+            return;
+        }
+        //do all this in the same lock
+        synchronized (request.connection()) {
+            try {
+                boolean bufferRequired = awaitWriteable() || (overflow != null && overflow.size() > 0);
+                if (bufferRequired) {
+                    //just buffer everything
+                    registerDrainHandler();
+                    if (overflow == null) {
+                        overflow = new ByteArrayOutputStream();
+                    }
+                    if (data.hasArray()) {
+                        overflow.write(data.array(), data.arrayOffset() + data.readerIndex(), data.readableBytes());
+                    } else {
+                        data.getBytes(data.readerIndex(), overflow, data.readableBytes());
+                    }
+                    if (last) {
+                        closed = true;
+                    }
+                } else {
+                    if (last) {
+                        request.response().end(createBuffer(data));
+                    } else {
+                        request.response().write(createBuffer(data));
+                    }
+                }
+            } catch (Exception e) {
+                if (data != null && data.refCnt() > 0) {
+                    data.release();
+                }
+                throw new IOException("Failed to write", e);
+            }
+        }
+    }
+
+    private boolean awaitWriteable() throws IOException {
+        if (Context.isOnEventLoopThread()) {
+            return request.response().writeQueueFull();
+        }
+        if (first) {
+            first = false;
+            return false;
+        }
+        assert Thread.holdsLock(request.connection());
+        while (request.response().writeQueueFull()) {
+            if (throwable != null) {
+                throw new IOException(throwable);
+            }
+            if (request.response().closed()) {
+                throw new IOException("Connection has been closed");
+            }
+            registerDrainHandler();
+            try {
+                waitingForDrain = true;
+                request.connection().wait();
+            } catch (InterruptedException e) {
+                throw new InterruptedIOException(e.getMessage());
+            } finally {
+                waitingForDrain = false;
+            }
+        }
+        return false;
+    }
+
+    private void registerDrainHandler() {
+        if (!drainHandlerRegistered) {
+            drainHandlerRegistered = true;
+            Handler<Void> handler = new Handler<Void>() {
+                @Override
+                public void handle(Void event) {
+                    HttpConnection connection = request.connection();
+                    synchronized (connection) {
+                        if (waitingForDrain) {
+                            connection.notifyAll();
+                        }
+                        if (overflow != null) {
+                            if (overflow.size() > 0) {
+                                if (closed) {
+                                    request.response().end(Buffer.buffer(overflow.toByteArray()));
+                                } else {
+                                    request.response().write(Buffer.buffer(overflow.toByteArray()));
+                                }
+                                overflow.reset();
+                            }
+                        }
+                    }
+                }
+            };
+            request.response().drainHandler(handler);
+            request.response().closeHandler(handler);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void write(final int b) throws IOException {
+        write(new byte[] { (byte) b }, 0, 1);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void write(final byte[] b) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void write(final byte[] b, final int off, final int len) throws IOException {
+        if (len < 1) {
+            return;
+        }
+        if (closed) {
+            throw new IOException("Stream is closed");
+        }
+
+        int rem = len;
+        int idx = off;
+        ByteBuf buffer = pooledBuffer;
+        try {
+            if (buffer == null) {
+                pooledBuffer = buffer = PooledByteBufAllocator.DEFAULT.directBuffer();
+            }
+            while (rem > 0) {
+                int toWrite = Math.min(rem, buffer.writableBytes());
+                buffer.writeBytes(b, idx, toWrite);
+                rem -= toWrite;
+                idx += toWrite;
+                if (!buffer.isWritable()) {
+                    ByteBuf tmpBuf = buffer;
+                    this.pooledBuffer = buffer = PooledByteBufAllocator.DEFAULT.directBuffer();
+                    writeBlocking(tmpBuf, false);
+                }
+            }
+        } catch (Exception e) {
+            if (buffer != null && buffer.refCnt() > 0) {
+                buffer.release();
+            }
+            throw new IOException(e);
+        }
+        updateWritten(len);
+    }
+
+    public void writeBlocking(ByteBuf buffer, boolean finished) throws IOException {
+        prepareWrite(buffer, finished);
+        write(buffer, finished);
+    }
+
+    private void prepareWrite(ByteBuf buffer, boolean finished) throws IOException {
+        if (!committed) {
+            committed = true;
+            if (finished) {
+                if (buffer == null) {
+                    context.serverResponse().setResponseHeader(HttpHeaderNames.CONTENT_LENGTH, "0");
+                } else {
+                    context.serverResponse().setResponseHeader(HttpHeaderNames.CONTENT_LENGTH, "" + buffer.readableBytes());
+                }
+            } else if (!request.response().headers().contains(HttpHeaderNames.CONTENT_LENGTH)) {
+                request.response().setChunked(true);
+            }
+        }
+        if (finished) {
+            this.finished = true;
+        }
+    }
+
+    void updateWritten(final long len) throws IOException {
+        this.written += len;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void flush() throws IOException {
+        if (closed) {
+            throw new IOException("Stream is closed");
+        }
+        try {
+            if (pooledBuffer != null) {
+                writeBlocking(pooledBuffer, false);
+                pooledBuffer = null;
+            }
+        } catch (Exception e) {
+            if (pooledBuffer != null) {
+                pooledBuffer.release();
+                pooledBuffer = null;
+            }
+            throw new IOException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void close() throws IOException {
+        if (closed)
+            return;
+        try {
+            writeBlocking(pooledBuffer, true);
+        } catch (Exception e) {
+            throw new IOException(e);
+        } finally {
+            closed = true;
+            pooledBuffer = null;
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java
new file mode 100644
index 0000000000000..3ff1635e2aa96
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/ResteasyReactiveVertxHandler.java
@@ -0,0 +1,19 @@
+package org.jboss.resteasy.reactive.server.vertx;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+
+public class ResteasyReactiveVertxHandler implements Handler<RoutingContext> {
+
+    private final RestInitialHandler handler;
+
+    public ResteasyReactiveVertxHandler(RestInitialHandler handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public void handle(RoutingContext event) {
+        handler.beginProcessing(event);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java
new file mode 100644
index 0000000000000..70aa066a7087b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxBufferImpl.java
@@ -0,0 +1,489 @@
+package org.jboss.resteasy.reactive.server.vertx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.util.CharsetUtil;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.impl.Arguments;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+public class VertxBufferImpl implements Buffer {
+
+    private ByteBuf buffer;
+
+    public VertxBufferImpl(ByteBuf buffer) {
+        this.buffer = buffer;
+    }
+
+    public String toString() {
+        return buffer.toString(StandardCharsets.UTF_8);
+    }
+
+    public String toString(String enc) {
+        return buffer.toString(Charset.forName(enc));
+    }
+
+    public String toString(Charset enc) {
+        return buffer.toString(enc);
+    }
+
+    @Override
+    public JsonObject toJsonObject() {
+        return new JsonObject(this);
+    }
+
+    @Override
+    public JsonArray toJsonArray() {
+        return new JsonArray(this);
+    }
+
+    public byte getByte(int pos) {
+        return buffer.getByte(pos);
+    }
+
+    public short getUnsignedByte(int pos) {
+        return buffer.getUnsignedByte(pos);
+    }
+
+    public int getInt(int pos) {
+        return buffer.getInt(pos);
+    }
+
+    public int getIntLE(int pos) {
+        return buffer.getIntLE(pos);
+    }
+
+    public long getUnsignedInt(int pos) {
+        return buffer.getUnsignedInt(pos);
+    }
+
+    public long getUnsignedIntLE(int pos) {
+        return buffer.getUnsignedIntLE(pos);
+    }
+
+    public long getLong(int pos) {
+        return buffer.getLong(pos);
+    }
+
+    public long getLongLE(int pos) {
+        return buffer.getLongLE(pos);
+    }
+
+    public double getDouble(int pos) {
+        return buffer.getDouble(pos);
+    }
+
+    public float getFloat(int pos) {
+        return buffer.getFloat(pos);
+    }
+
+    public short getShort(int pos) {
+        return buffer.getShort(pos);
+    }
+
+    public short getShortLE(int pos) {
+        return buffer.getShortLE(pos);
+    }
+
+    public int getUnsignedShort(int pos) {
+        return buffer.getUnsignedShort(pos);
+    }
+
+    public int getUnsignedShortLE(int pos) {
+        return buffer.getUnsignedShortLE(pos);
+    }
+
+    public int getMedium(int pos) {
+        return buffer.getMedium(pos);
+    }
+
+    public int getMediumLE(int pos) {
+        return buffer.getMediumLE(pos);
+    }
+
+    public int getUnsignedMedium(int pos) {
+        return buffer.getUnsignedMedium(pos);
+    }
+
+    public int getUnsignedMediumLE(int pos) {
+        return buffer.getUnsignedMediumLE(pos);
+    }
+
+    public byte[] getBytes() {
+        byte[] arr = new byte[buffer.writerIndex()];
+        buffer.getBytes(0, arr);
+        return arr;
+    }
+
+    public byte[] getBytes(int start, int end) {
+        Arguments.require(end >= start, "end must be greater or equal than start");
+        byte[] arr = new byte[end - start];
+        buffer.getBytes(start, arr, 0, end - start);
+        return arr;
+    }
+
+    @Override
+    public Buffer getBytes(byte[] dst) {
+        return getBytes(dst, 0);
+    }
+
+    @Override
+    public Buffer getBytes(byte[] dst, int dstIndex) {
+        return getBytes(0, buffer.writerIndex(), dst, dstIndex);
+    }
+
+    @Override
+    public Buffer getBytes(int start, int end, byte[] dst) {
+        return getBytes(start, end, dst, 0);
+    }
+
+    @Override
+    public Buffer getBytes(int start, int end, byte[] dst, int dstIndex) {
+        Arguments.require(end >= start, "end must be greater or equal than start");
+        buffer.getBytes(start, dst, dstIndex, end - start);
+        return this;
+    }
+
+    public Buffer getBuffer(int start, int end) {
+        return new VertxBufferImpl(Unpooled.wrappedBuffer(getBytes(start, end)));
+    }
+
+    public String getString(int start, int end, String enc) {
+        byte[] bytes = getBytes(start, end);
+        Charset cs = Charset.forName(enc);
+        return new String(bytes, cs);
+    }
+
+    public String getString(int start, int end) {
+        byte[] bytes = getBytes(start, end);
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
+
+    public Buffer appendBuffer(Buffer buff) {
+        buffer.writeBytes(buff.getByteBuf());
+        return this;
+    }
+
+    public Buffer appendBuffer(Buffer buff, int offset, int len) {
+        ByteBuf byteBuf = buff.getByteBuf();
+        int from = byteBuf.readerIndex() + offset;
+        buffer.writeBytes(byteBuf, from, len);
+        return this;
+    }
+
+    public Buffer appendBytes(byte[] bytes) {
+        buffer.writeBytes(bytes);
+        return this;
+    }
+
+    public Buffer appendBytes(byte[] bytes, int offset, int len) {
+        buffer.writeBytes(bytes, offset, len);
+        return this;
+    }
+
+    public Buffer appendByte(byte b) {
+        buffer.writeByte(b);
+        return this;
+    }
+
+    public Buffer appendUnsignedByte(short b) {
+        buffer.writeByte(b);
+        return this;
+    }
+
+    public Buffer appendInt(int i) {
+        buffer.writeInt(i);
+        return this;
+    }
+
+    public Buffer appendIntLE(int i) {
+        buffer.writeIntLE(i);
+        return this;
+    }
+
+    public Buffer appendUnsignedInt(long i) {
+        buffer.writeInt((int) i);
+        return this;
+    }
+
+    public Buffer appendUnsignedIntLE(long i) {
+        buffer.writeIntLE((int) i);
+        return this;
+    }
+
+    public Buffer appendMedium(int i) {
+        buffer.writeMedium(i);
+        return this;
+    }
+
+    public Buffer appendMediumLE(int i) {
+        buffer.writeMediumLE(i);
+        return this;
+    }
+
+    public Buffer appendLong(long l) {
+        buffer.writeLong(l);
+        return this;
+    }
+
+    public Buffer appendLongLE(long l) {
+        buffer.writeLongLE(l);
+        return this;
+    }
+
+    public Buffer appendShort(short s) {
+        buffer.writeShort(s);
+        return this;
+    }
+
+    public Buffer appendShortLE(short s) {
+        buffer.writeShortLE(s);
+        return this;
+    }
+
+    public Buffer appendUnsignedShort(int s) {
+        buffer.writeShort(s);
+        return this;
+    }
+
+    public Buffer appendUnsignedShortLE(int s) {
+        buffer.writeShortLE(s);
+        return this;
+    }
+
+    public Buffer appendFloat(float f) {
+        buffer.writeFloat(f);
+        return this;
+    }
+
+    public Buffer appendDouble(double d) {
+        buffer.writeDouble(d);
+        return this;
+    }
+
+    public Buffer appendString(String str, String enc) {
+        return append(str, Charset.forName(Objects.requireNonNull(enc)));
+    }
+
+    public Buffer appendString(String str) {
+        return append(str, CharsetUtil.UTF_8);
+    }
+
+    public Buffer setByte(int pos, byte b) {
+        ensureWritable(pos, 1);
+        buffer.setByte(pos, b);
+        return this;
+    }
+
+    public Buffer setUnsignedByte(int pos, short b) {
+        ensureWritable(pos, 1);
+        buffer.setByte(pos, b);
+        return this;
+    }
+
+    public Buffer setInt(int pos, int i) {
+        ensureWritable(pos, 4);
+        buffer.setInt(pos, i);
+        return this;
+    }
+
+    public Buffer setIntLE(int pos, int i) {
+        ensureWritable(pos, 4);
+        buffer.setIntLE(pos, i);
+        return this;
+    }
+
+    public Buffer setUnsignedInt(int pos, long i) {
+        ensureWritable(pos, 4);
+        buffer.setInt(pos, (int) i);
+        return this;
+    }
+
+    public Buffer setUnsignedIntLE(int pos, long i) {
+        ensureWritable(pos, 4);
+        buffer.setIntLE(pos, (int) i);
+        return this;
+    }
+
+    public Buffer setMedium(int pos, int i) {
+        ensureWritable(pos, 3);
+        buffer.setMedium(pos, i);
+        return this;
+    }
+
+    public Buffer setMediumLE(int pos, int i) {
+        ensureWritable(pos, 3);
+        buffer.setMediumLE(pos, i);
+        return this;
+    }
+
+    public Buffer setLong(int pos, long l) {
+        ensureWritable(pos, 8);
+        buffer.setLong(pos, l);
+        return this;
+    }
+
+    public Buffer setLongLE(int pos, long l) {
+        ensureWritable(pos, 8);
+        buffer.setLongLE(pos, l);
+        return this;
+    }
+
+    public Buffer setDouble(int pos, double d) {
+        ensureWritable(pos, 8);
+        buffer.setDouble(pos, d);
+        return this;
+    }
+
+    public Buffer setFloat(int pos, float f) {
+        ensureWritable(pos, 4);
+        buffer.setFloat(pos, f);
+        return this;
+    }
+
+    public Buffer setShort(int pos, short s) {
+        ensureWritable(pos, 2);
+        buffer.setShort(pos, s);
+        return this;
+    }
+
+    public Buffer setShortLE(int pos, short s) {
+        ensureWritable(pos, 2);
+        buffer.setShortLE(pos, s);
+        return this;
+    }
+
+    public Buffer setUnsignedShort(int pos, int s) {
+        ensureWritable(pos, 2);
+        buffer.setShort(pos, s);
+        return this;
+    }
+
+    public Buffer setUnsignedShortLE(int pos, int s) {
+        ensureWritable(pos, 2);
+        buffer.setShortLE(pos, s);
+        return this;
+    }
+
+    public Buffer setBuffer(int pos, Buffer b) {
+        ensureWritable(pos, b.length());
+        buffer.setBytes(pos, b.getByteBuf());
+        return this;
+    }
+
+    public Buffer setBuffer(int pos, Buffer b, int offset, int len) {
+        ensureWritable(pos, len);
+        ByteBuf byteBuf = b.getByteBuf();
+        buffer.setBytes(pos, byteBuf, byteBuf.readerIndex() + offset, len);
+        return this;
+    }
+
+    public VertxBufferImpl setBytes(int pos, ByteBuffer b) {
+        ensureWritable(pos, b.limit());
+        buffer.setBytes(pos, b);
+        return this;
+    }
+
+    public Buffer setBytes(int pos, byte[] b) {
+        ensureWritable(pos, b.length);
+        buffer.setBytes(pos, b);
+        return this;
+    }
+
+    public Buffer setBytes(int pos, byte[] b, int offset, int len) {
+        ensureWritable(pos, len);
+        buffer.setBytes(pos, b, offset, len);
+        return this;
+    }
+
+    public Buffer setString(int pos, String str) {
+        return setBytes(pos, str, CharsetUtil.UTF_8);
+    }
+
+    public Buffer setString(int pos, String str, String enc) {
+        return setBytes(pos, str, Charset.forName(enc));
+    }
+
+    public int length() {
+        return buffer.writerIndex();
+    }
+
+    public Buffer copy() {
+        return new VertxBufferImpl(buffer.copy());
+    }
+
+    public Buffer slice() {
+        return new VertxBufferImpl(buffer.slice());
+    }
+
+    public Buffer slice(int start, int end) {
+        return new VertxBufferImpl(buffer.slice(start, end - start));
+    }
+
+    public ByteBuf getByteBuf() {
+        // Return a duplicate so the Buffer can be written multiple times.
+        // See #648
+        return buffer;
+    }
+
+    private Buffer append(String str, Charset charset) {
+        byte[] bytes = str.getBytes(charset);
+        buffer.writeBytes(bytes);
+        return this;
+    }
+
+    private Buffer setBytes(int pos, String str, Charset charset) {
+        byte[] bytes = str.getBytes(charset);
+        ensureWritable(pos, bytes.length);
+        buffer.setBytes(pos, bytes);
+        return this;
+    }
+
+    private void ensureWritable(int pos, int len) {
+        int ni = pos + len;
+        int cap = buffer.capacity();
+        int over = ni - cap;
+        if (over > 0) {
+            buffer.writerIndex(cap);
+            buffer.ensureWritable(over);
+        }
+        //We have to make sure that the writerindex is always positioned on the last bit of data set in the buffer
+        if (ni > buffer.writerIndex()) {
+            buffer.writerIndex(ni);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        VertxBufferImpl buffer1 = (VertxBufferImpl) o;
+        return buffer != null ? buffer.equals(buffer1.buffer) : buffer1.buffer == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return buffer != null ? buffer.hashCode() : 0;
+    }
+
+    @Override
+    public void writeToBuffer(Buffer buff) {
+        buff.appendInt(this.length());
+        buff.appendBuffer(this);
+    }
+
+    @Override
+    public int readFromBuffer(int pos, Buffer buffer) {
+        int len = buffer.getInt(pos);
+        Buffer b = buffer.getBuffer(pos + 4, pos + 4 + len);
+        this.buffer = b.getByteBuf();
+        return pos + 4 + len;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java
new file mode 100644
index 0000000000000..5bbaa0202553c
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxInputStream.java
@@ -0,0 +1,300 @@
+package org.jboss.resteasy.reactive.server.vertx;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vertx.core.Context;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.net.impl.ConnectionBase;
+import io.vertx.ext.web.RoutingContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+public class VertxInputStream extends InputStream {
+
+    public static final String MAX_REQUEST_SIZE_KEY = "io.quarkus.max-request-size";
+    private final VertxBlockingInput exchange;
+
+    private boolean closed;
+    private boolean finished;
+    private ByteBuf pooled;
+    private final long limit;
+    private final VertxResteasyReactiveRequestContext vertxResteasyReactiveRequestContext;
+
+    public VertxInputStream(RoutingContext request, long timeout,
+            VertxResteasyReactiveRequestContext vertxResteasyReactiveRequestContext) {
+        this.vertxResteasyReactiveRequestContext = vertxResteasyReactiveRequestContext;
+        this.exchange = new VertxBlockingInput(request.request(), timeout);
+        Long limitObj = request.get(MAX_REQUEST_SIZE_KEY);
+        if (limitObj == null) {
+            limit = -1;
+        } else {
+            limit = limitObj;
+        }
+    }
+
+    public VertxInputStream(RoutingContext request, long timeout, ByteBuf existing,
+            VertxResteasyReactiveRequestContext vertxResteasyReactiveRequestContext) {
+        this.vertxResteasyReactiveRequestContext = vertxResteasyReactiveRequestContext;
+        this.exchange = new VertxBlockingInput(request.request(), timeout);
+        Long limitObj = request.get(MAX_REQUEST_SIZE_KEY);
+        if (limitObj == null) {
+            limit = -1;
+        } else {
+            limit = limitObj;
+        }
+        this.pooled = existing;
+    }
+
+    @Override
+    public int read() throws IOException {
+        byte[] b = new byte[1];
+        int read = read(b);
+        if (read == -1) {
+            return -1;
+        }
+        return b[0] & 0xff;
+    }
+
+    @Override
+    public int read(final byte[] b) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    @Override
+    public int read(final byte[] b, final int off, final int len) throws IOException {
+        if (closed) {
+            throw new IOException("Stream is closed");
+        }
+        if (vertxResteasyReactiveRequestContext.continueState == VertxResteasyReactiveRequestContext.ContinueState.REQUIRED) {
+            vertxResteasyReactiveRequestContext.continueState = VertxResteasyReactiveRequestContext.ContinueState.SENT;
+            vertxResteasyReactiveRequestContext.response.writeContinue();
+        }
+        readIntoBuffer();
+        if (limit > 0 && exchange.request.bytesRead() > limit) {
+            HttpServerResponse response = exchange.request.response();
+            if (response.headWritten()) {
+                //the response has been written, not much we can do
+                exchange.request.connection().close();
+                throw new IOException("Request too large");
+            } else {
+                response.setStatusCode(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE.code());
+                response.headers().add(HttpHeaderNames.CONNECTION, "close");
+                response.endHandler(new Handler<Void>() {
+                    @Override
+                    public void handle(Void event) {
+                        exchange.request.connection().close();
+                    }
+                });
+                response.end();
+                throw new IOException("Request too large");
+            }
+        }
+        if (finished) {
+            return -1;
+        }
+        if (len == 0) {
+            return 0;
+        }
+        ByteBuf buffer = pooled;
+        int copied = Math.min(len, buffer.readableBytes());
+        buffer.readBytes(b, off, copied);
+        if (!buffer.isReadable()) {
+            pooled.release();
+            pooled = null;
+        }
+        return copied;
+    }
+
+    private void readIntoBuffer() throws IOException {
+        if (pooled == null && !finished) {
+            pooled = exchange.readBlocking();
+            if (pooled == null) {
+                finished = true;
+                pooled = null;
+            }
+        }
+    }
+
+    @Override
+    public int available() throws IOException {
+        if (closed) {
+            throw new IOException("Stream is closed");
+        }
+        if (finished) {
+            return -1;
+        }
+
+        return exchange.readBytesAvailable();
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (closed) {
+            throw new IOException("Stream is closed");
+        }
+        closed = true;
+        try {
+            while (!finished) {
+                readIntoBuffer();
+                if (pooled != null) {
+                    pooled.release();
+                    pooled = null;
+                }
+            }
+        } catch (IOException | RuntimeException e) {
+            //our exchange is all broken, just end it
+            throw e;
+        } finally {
+            if (pooled != null) {
+                pooled.release();
+                pooled = null;
+            }
+            finished = true;
+        }
+    }
+
+    public static class VertxBlockingInput implements Handler<Buffer> {
+        protected final HttpServerRequest request;
+        protected Buffer input1;
+        protected Deque<Buffer> inputOverflow;
+        protected boolean waiting = false;
+        protected boolean eof = false;
+        protected Throwable readException;
+        private final long timeout;
+
+        public VertxBlockingInput(HttpServerRequest request, long timeout) {
+            this.request = request;
+            this.timeout = timeout;
+            final ConnectionBase connection = (ConnectionBase) request.connection();
+            synchronized (connection) {
+                if (!connection.channel().isOpen()) {
+                    readException = new ClosedChannelException();
+                } else if (!request.isEnded()) {
+                    request.pause();
+                    request.handler(this);
+                    request.endHandler(new Handler<Void>() {
+                        @Override
+                        public void handle(Void event) {
+                            synchronized (connection) {
+                                eof = true;
+                                if (waiting) {
+                                    connection.notify();
+                                }
+                            }
+                        }
+                    });
+                    request.exceptionHandler(new Handler<Throwable>() {
+                        @Override
+                        public void handle(Throwable event) {
+                            synchronized (connection) {
+                                readException = new IOException(event);
+                                if (input1 != null) {
+                                    input1.getByteBuf().release();
+                                    input1 = null;
+                                }
+                                if (inputOverflow != null) {
+                                    Buffer d = inputOverflow.poll();
+                                    while (d != null) {
+                                        d.getByteBuf().release();
+                                        d = inputOverflow.poll();
+                                    }
+                                }
+                                if (waiting) {
+                                    connection.notify();
+                                }
+                            }
+                        }
+
+                    });
+                    request.fetch(1);
+                } else {
+                    eof = true;
+                }
+            }
+        }
+
+        protected ByteBuf readBlocking() throws IOException {
+            long expire = System.currentTimeMillis() + timeout;
+            synchronized (request.connection()) {
+                while (input1 == null && !eof && readException == null) {
+                    long rem = expire - System.currentTimeMillis();
+                    if (rem <= 0) {
+                        //everything is broken, if read has timed out we can assume that the underling connection
+                        //is wrecked, so just close it
+                        request.connection().close();
+                        IOException throwable = new IOException("Read timed out");
+                        readException = throwable;
+                        throw throwable;
+                    }
+
+                    try {
+                        if (Context.isOnEventLoopThread()) {
+                            throw new IOException("Attempting a blocking read on io thread");
+                        }
+                        waiting = true;
+                        request.connection().wait(rem);
+                    } catch (InterruptedException e) {
+                        throw new InterruptedIOException(e.getMessage());
+                    } finally {
+                        waiting = false;
+                    }
+                }
+                if (readException != null) {
+                    throw new IOException(readException);
+                }
+                Buffer ret = input1;
+                input1 = null;
+                if (inputOverflow != null) {
+                    input1 = inputOverflow.poll();
+                    if (input1 == null) {
+                        request.fetch(1);
+                    }
+                } else if (!eof) {
+                    request.fetch(1);
+                }
+                return ret == null ? null : ret.getByteBuf();
+            }
+        }
+
+        @Override
+        public void handle(Buffer event) {
+            synchronized (request.connection()) {
+                if (input1 == null) {
+                    input1 = event;
+                } else {
+                    if (inputOverflow == null) {
+                        inputOverflow = new ArrayDeque<>();
+                    }
+                    inputOverflow.add(event);
+                }
+                if (waiting) {
+                    request.connection().notifyAll();
+                }
+            }
+        }
+
+        public int readBytesAvailable() {
+            if (input1 != null) {
+                return input1.getByteBuf().readableBytes();
+            }
+
+            String length = request.getHeader(HttpHeaders.CONTENT_LENGTH);
+
+            if (length == null) {
+                return 0;
+            }
+
+            return Integer.parseInt(length);
+        }
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java
new file mode 100644
index 0000000000000..25a0bcf19e93b
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxRequestContextFactory.java
@@ -0,0 +1,19 @@
+package org.jboss.resteasy.reactive.server.vertx;
+
+import io.vertx.ext.web.RoutingContext;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.RequestContextFactory;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class VertxRequestContextFactory implements RequestContextFactory {
+    @Override
+    public ResteasyReactiveRequestContext createContext(Deployment deployment,
+            ProvidersImpl providers, Object context, ThreadSetupAction requestContext,
+            ServerRestHandler[] handlerChain, ServerRestHandler[] abortHandlerChain) {
+        return new VertxResteasyReactiveRequestContext(deployment, providers, (RoutingContext) context,
+                requestContext, handlerChain, abortHandlerChain);
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java
new file mode 100644
index 0000000000000..04a838b51adbb
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/VertxResteasyReactiveRequestContext.java
@@ -0,0 +1,380 @@
+package org.jboss.resteasy.reactive.server.vertx;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.EventLoop;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.util.concurrent.ScheduledFuture;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.net.impl.ConnectionBase;
+import io.vertx.ext.web.RoutingContext;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.jaxrs.ProvidersImpl;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpRequest;
+import org.jboss.resteasy.reactive.server.spi.ServerHttpResponse;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+
+public class VertxResteasyReactiveRequestContext extends ResteasyReactiveRequestContext
+        implements ServerHttpRequest, ServerHttpResponse, Handler<Void> {
+
+    public static final String CONTINUE = "100-continue";
+    protected final RoutingContext context;
+    protected final HttpServerRequest request;
+    protected final HttpServerResponse response;
+    protected Consumer<ResteasyReactiveRequestContext> preCommitTask;
+    ContinueState continueState = ContinueState.NONE;
+
+    public VertxResteasyReactiveRequestContext(Deployment deployment, ProvidersImpl providers,
+            RoutingContext context,
+            ThreadSetupAction requestContext, ServerRestHandler[] handlerChain, ServerRestHandler[] abortHandlerChain) {
+        super(deployment, providers, requestContext, handlerChain, abortHandlerChain);
+        this.context = context;
+        this.request = context.request();
+        this.response = context.response();
+        context.addHeadersEndHandler(this);
+        String expect = request.getHeader(HttpHeaderNames.EXPECT);
+        if (expect != null && expect.equalsIgnoreCase(CONTINUE)) {
+            continueState = ContinueState.REQUIRED;
+        }
+    }
+
+    @Override
+    public ServerHttpResponse addCloseHandler(Runnable onClose) {
+        this.response.closeHandler(v -> {
+            onClose.run();
+        });
+        return this;
+    }
+
+    public RoutingContext getContext() {
+        return context;
+    }
+
+    @Override
+    public ServerHttpRequest serverRequest() {
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse serverResponse() {
+        return this;
+    }
+
+    @Override
+    protected EventLoop getEventLoop() {
+        return ((ConnectionBase) context.request().connection()).channel().eventLoop();
+    }
+
+    @Override
+    public Runnable registerTimer(long millis, Runnable task) {
+        ScheduledFuture<?> handle = getEventLoop().schedule(task, millis, TimeUnit.MILLISECONDS);
+        return new Runnable() {
+            @Override
+            public void run() {
+                handle.cancel(false);
+            }
+        };
+    }
+
+    @Override
+    public String getRequestHeader(CharSequence name) {
+        return request.headers().get(name);
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> getAllRequestHeaders() {
+        return request.headers();
+    }
+
+    @Override
+    public List<String> getAllRequestHeaders(String name) {
+        return request.headers().getAll(name);
+    }
+
+    @Override
+    public boolean containsRequestHeader(CharSequence accept) {
+        return request.headers().contains(accept);
+    }
+
+    @Override
+    public String getRequestPath() {
+        return request.path();
+    }
+
+    @Override
+    public String getRequestMethod() {
+        return request.rawMethod();
+    }
+
+    @Override
+    public String getRequestNormalisedPath() {
+        return context.normalisedPath();
+    }
+
+    @Override
+    public String getRequestAbsoluteUri() {
+        return request.absoluteURI();
+    }
+
+    @Override
+    public String getRequestScheme() {
+        return request.scheme();
+    }
+
+    @Override
+    public String getRequestHost() {
+        return request.host();
+    }
+
+    @Override
+    public void closeConnection() {
+        response.close();
+    }
+
+    @Override
+    public String getFormAttribute(String name) {
+        return request.getFormAttribute(name);
+    }
+
+    @Override
+    public List<String> getAllFormAttributes(String name) {
+        return request.formAttributes().getAll(name);
+    }
+
+    @Override
+    public String getQueryParam(String name) {
+        return context.queryParams().get(name);
+    }
+
+    @Override
+    public List<String> getAllQueryParams(String name) {
+        return context.queryParam(name);
+    }
+
+    @Override
+    public String query() {
+        return request.query();
+    }
+
+    @Override
+    public Collection<String> queryParamNames() {
+        return context.queryParams().names();
+    }
+
+    @Override
+    public boolean isRequestEnded() {
+        return request.isEnded();
+    }
+
+    @Override
+    public void setExpectMultipart(boolean expectMultipart) {
+        request.setExpectMultipart(expectMultipart);
+    }
+
+    @Override
+    public InputStream createInputStream(ByteBuffer existingData) {
+        if (existingData == null) {
+            return createInputStream();
+        }
+        return new VertxInputStream(context, 10000, Unpooled.wrappedBuffer(existingData), this);
+    }
+
+    @Override
+    public InputStream createInputStream() {
+        return new VertxInputStream(context, 10000, this);
+    }
+
+    @Override
+    public ServerHttpResponse pauseRequestInput() {
+        request.pause();
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse resumeRequestInput() {
+        if (continueState == ContinueState.REQUIRED) {
+            continueState = ContinueState.SENT;
+            response.writeContinue();
+        }
+        request.resume();
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse setReadListener(ReadCallback callback) {
+        request.pause();
+        if (continueState == ContinueState.REQUIRED) {
+            continueState = ContinueState.SENT;
+            response.writeContinue();
+        }
+        request.handler(new Handler<Buffer>() {
+            @Override
+            public void handle(Buffer event) {
+                callback.data(ByteBuffer.wrap(event.getBytes()));
+            }
+        });
+        request.endHandler(new Handler<Void>() {
+            @Override
+            public void handle(Void event) {
+                callback.done();
+            }
+        });
+        request.resume();
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T unwrap(Class<T> theType) {
+        if (theType == RoutingContext.class) {
+            return (T) context;
+        } else if (theType == HttpServerRequest.class) {
+            return (T) request;
+        } else if (theType == HttpServerResponse.class) {
+            return (T) response;
+        } else if (theType == ResteasyReactiveRequestContext.class) {
+            return (T) this;
+        }
+        return null;
+    }
+
+    @Override
+    public ServerHttpResponse setStatusCode(int code) {
+        response.setStatusCode(code);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse end() {
+        response.end();
+        return this;
+    }
+
+    @Override
+    public boolean headWritten() {
+        return response.headWritten();
+    }
+
+    @Override
+    public ServerHttpResponse end(byte[] data) {
+        response.end(Buffer.buffer(data));
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse end(String data) {
+        response.end(data);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse addResponseHeader(CharSequence name, CharSequence value) {
+        response.headers().add(name, value);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse setResponseHeader(CharSequence name, CharSequence value) {
+        response.headers().set(name, value);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse setResponseHeader(CharSequence name, Iterable<CharSequence> values) {
+        response.headers().set(name, values);
+        return this;
+    }
+
+    @Override
+    public Iterable<Map.Entry<String, String>> getAllResponseHeaders() {
+        return response.headers();
+    }
+
+    @Override
+    public boolean closed() {
+        return response.closed();
+    }
+
+    @Override
+    public ServerHttpResponse setChunked(boolean chunked) {
+        response.setChunked(chunked);
+        return this;
+    }
+
+    @Override
+    public ServerHttpResponse write(byte[] data, Consumer<Throwable> asyncResultHandler) {
+        response.write(Buffer.buffer(data), new Handler<AsyncResult<Void>>() {
+            @Override
+            public void handle(AsyncResult<Void> event) {
+                if (event.failed()) {
+                    asyncResultHandler.accept(event.cause());
+                } else {
+                    asyncResultHandler.accept(null);
+                }
+            }
+        });
+        return this;
+    }
+
+    @Override
+    public CompletionStage<Void> write(byte[] data) {
+        CompletableFuture<Void> ret = new CompletableFuture<>();
+        response.write(Buffer.buffer(data), new Handler<AsyncResult<Void>>() {
+            @Override
+            public void handle(AsyncResult<Void> event) {
+                if (event.failed()) {
+                    ret.completeExceptionally(event.cause());
+                } else {
+                    ret.complete(null);
+                }
+            }
+        });
+        return ret;
+    }
+
+    @Override
+    public OutputStream createResponseOutputStream() {
+        return new ResteasyReactiveOutputStream(this);
+    }
+
+    @Override
+    public void setPreCommitListener(Consumer<ResteasyReactiveRequestContext> task) {
+        preCommitTask = task;
+    }
+
+    @Override
+    public void handle(Void event) {
+        if (preCommitTask != null) {
+            preCommitTask.accept(this);
+        }
+    }
+
+    public HttpServerRequest vertxServerRequest() {
+        return request;
+    }
+
+    public HttpServerResponse vertxServerResponse() {
+        return response;
+    }
+
+    enum ContinueState {
+        NONE,
+        REQUIRED,
+        SENT;
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/providers/serialisers/json/JsonMessageBodyWriterUtil.java b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/providers/serialisers/json/JsonMessageBodyWriterUtil.java
new file mode 100644
index 0000000000000..12680f6b45d30
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/main/java/org/jboss/resteasy/reactive/server/vertx/providers/serialisers/json/JsonMessageBodyWriterUtil.java
@@ -0,0 +1,43 @@
+package org.jboss.resteasy.reactive.server.vertx.providers.serialisers.json;
+
+import io.vertx.core.MultiMap;
+import java.util.Map;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import org.jboss.resteasy.reactive.server.spi.ServerRequestContext;
+
+public final class JsonMessageBodyWriterUtil {
+
+    private JsonMessageBodyWriterUtil() {
+    }
+
+    public static void setContentTypeIfNecessary(MultivaluedMap<String, Object> httpHeaders) {
+        Object contentType = httpHeaders.getFirst(HttpHeaders.CONTENT_TYPE);
+        if (isNotJson(contentType)) {
+            httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        }
+    }
+
+    public static void setContentTypeIfNecessary(ServerRequestContext context) {
+        String currentContentType = null;
+        Iterable<Map.Entry<String, String>> responseHeaders = context.serverResponse().getAllResponseHeaders();
+        if (responseHeaders instanceof MultiMap) {
+            currentContentType = ((MultiMap) responseHeaders).get(HttpHeaders.CONTENT_TYPE);
+        } else {
+            for (Map.Entry<String, String> entry : responseHeaders) {
+                if (entry.getKey().equalsIgnoreCase(HttpHeaders.CONTENT_TYPE)) {
+                    currentContentType = entry.getValue();
+                    break;
+                }
+            }
+        }
+        if (isNotJson(currentContentType)) {
+            context.serverResponse().setResponseHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+        }
+    }
+
+    private static boolean isNotJson(Object contentType) {
+        return (contentType == null) || !contentType.toString().contains("json");
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java
new file mode 100644
index 0000000000000..cd6b1cd99b363
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/HelloResource.java
@@ -0,0 +1,15 @@
+package org.jboss.resteasy.reactive.server.vertx.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    public String hello(@QueryParam("name") String name) {
+        return "hello " + name;
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java
new file mode 100644
index 0000000000000..f37529f031047
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/SimpleVertxResteasyReactiveTest.java
@@ -0,0 +1,32 @@
+package org.jboss.resteasy.reactive.server.vertx.test;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import io.restassured.RestAssured;
+import java.util.function.Supplier;
+import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class SimpleVertxResteasyReactiveTest {
+
+    @RegisterExtension
+    static ResteasyReactiveUnitTest test = new ResteasyReactiveUnitTest()
+            .setArchiveProducer(new Supplier<JavaArchive>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClass(HelloResource.class);
+                }
+            });
+
+    @Test
+    public void helloWorldTest() {
+        RestAssured.get("/hello?name=Stu")
+                .then()
+                .body(equalTo("hello Stu"));
+    }
+
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/InMemoryLogHandler.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/InMemoryLogHandler.java
new file mode 100644
index 0000000000000..b1dde96f45bc1
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/InMemoryLogHandler.java
@@ -0,0 +1,44 @@
+package org.jboss.resteasy.reactive.server.vertx.test.framework;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+public class InMemoryLogHandler extends Handler {
+
+    private final Predicate<LogRecord> predicate;
+
+    public InMemoryLogHandler(Predicate<LogRecord> predicate) {
+        this.predicate = predicate;
+    }
+
+    final List<LogRecord> records = new ArrayList<>();
+
+    @Override
+    public void publish(LogRecord record) {
+        if (predicate.test(record)) {
+            records.add(record);
+        }
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public Level getLevel() {
+        return Level.FINE;
+    }
+
+    @Override
+    public void close() throws SecurityException {
+        this.records.clear();
+    }
+
+    void clearRecords() {
+        this.records.clear();
+    }
+}
diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java
new file mode 100644
index 0000000000000..b7715ed884e60
--- /dev/null
+++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/framework/ResteasyReactiveUnitTest.java
@@ -0,0 +1,341 @@
+package org.jboss.resteasy.reactive.server.vertx.test.framework;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpServer;
+import io.vertx.ext.web.Route;
+import io.vertx.ext.web.Router;
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.logging.Handler;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyWriter;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.Index;
+import org.jboss.resteasy.reactive.common.ResteasyReactiveConfig;
+import org.jboss.resteasy.reactive.common.model.ResourceClass;
+import org.jboss.resteasy.reactive.common.model.ResourceWriter;
+import org.jboss.resteasy.reactive.common.processor.JandexUtil;
+import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveInterceptorScanner;
+import org.jboss.resteasy.reactive.common.processor.scanning.ResteasyReactiveScanner;
+import org.jboss.resteasy.reactive.server.core.Deployment;
+import org.jboss.resteasy.reactive.server.core.DeploymentInfo;
+import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
+import org.jboss.resteasy.reactive.server.core.startup.RuntimeDeploymentManager;
+import org.jboss.resteasy.reactive.server.handlers.RestInitialHandler;
+import org.jboss.resteasy.reactive.server.processor.ServerEndpointIndexer;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveContextResolverScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveExceptionMappingScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveFeatureScanner;
+import org.jboss.resteasy.reactive.server.processor.scanning.ResteasyReactiveParamConverterScanner;
+import org.jboss.resteasy.reactive.server.providers.serialisers.ServerStringMessageBodyHandler;
+import org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler;
+import org.jboss.resteasy.reactive.server.vertx.VertxRequestContextFactory;
+import org.jboss.resteasy.reactive.spi.BeanFactory;
+import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class ResteasyReactiveUnitTest implements BeforeAllCallback, AfterAllCallback {
+
+    private static final Logger rootLogger;
+    private Handler[] originalHandlers;
+
+    static {
+        System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager");
+        rootLogger = (Logger) LogManager.getLogManager().getLogger("");
+    }
+
+    private Path deploymentDir;
+    private Consumer<Throwable> assertException;
+    private Supplier<JavaArchive> archiveProducer;
+
+    private Consumer<List<LogRecord>> assertLogRecords;
+
+    private Timer timeoutTimer;
+    private volatile TimerTask timeoutTask;
+    private InMemoryLogHandler inMemoryLogHandler = new InMemoryLogHandler((r) -> false);
+
+    static Vertx vertx;
+    static HttpServer httpServer;
+    static Router router;
+    static Route route;
+    static Executor executor = Executors.newFixedThreadPool(10);
+
+    List<Closeable> closeTasks = new ArrayList<>();
+
+    public ResteasyReactiveUnitTest setExpectedException(Class<? extends Throwable> expectedException) {
+        return assertException(t -> {
+            Throwable i = t;
+            boolean found = false;
+            while (i != null) {
+                if (i.getClass().getName().equals(expectedException.getName())) {
+                    found = true;
+                    break;
+                }
+                i = i.getCause();
+            }
+
+            assertTrue(found, "Build failed with wrong exception, expected " + expectedException + " but got " + t);
+        });
+    }
+
+    public ResteasyReactiveUnitTest() {
+    }
+
+    public ResteasyReactiveUnitTest assertException(Consumer<Throwable> assertException) {
+        if (this.assertException != null) {
+            throw new IllegalStateException("Don't set the asserted or excepted exception twice"
+                    + " to avoid shadowing out the first call.");
+        }
+        this.assertException = assertException;
+        return this;
+    }
+
+    public Supplier<JavaArchive> getArchiveProducer() {
+        return archiveProducer;
+    }
+
+    public ResteasyReactiveUnitTest setArchiveProducer(Supplier<JavaArchive> archiveProducer) {
+        Objects.requireNonNull(archiveProducer);
+        this.archiveProducer = archiveProducer;
+        return this;
+    }
+
+    public ResteasyReactiveUnitTest assertLogRecords(Consumer<List<LogRecord>> assertLogRecords) {
+        if (this.assertLogRecords != null) {
+            throw new IllegalStateException("Don't set the a log record assertion twice"
+                    + " to avoid shadowing out the first call.");
+        }
+        this.assertLogRecords = assertLogRecords;
+        return this;
+    }
+
+    private void exportArchive(Path deploymentDir, Class<?> testClass) {
+        try {
+            JavaArchive archive = getArchiveProducerOrDefault();
+            Class<?> c = testClass;
+            archive.addClasses(c.getClasses());
+            while (c != Object.class) {
+                archive.addClass(c);
+                c = c.getSuperclass();
+            }
+            archive.as(ExplodedExporter.class).exportExplodedInto(deploymentDir.toFile());
+
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to create the archive", e);
+        }
+    }
+
+    private JavaArchive getArchiveProducerOrDefault() {
+        if (archiveProducer == null) {
+            return ShrinkWrap.create(JavaArchive.class);
+        } else {
+            return archiveProducer.get();
+        }
+    }
+
+    @Override
+    public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        originalHandlers = rootLogger.getHandlers();
+
+        timeoutTask = new TimerTask() {
+            @Override
+            public void run() {
+                System.err.println("Test has been running for more than 5 minutes, thread dump is:");
+                for (Map.Entry<Thread, StackTraceElement[]> i : Thread.getAllStackTraces().entrySet()) {
+                    System.err.println("\n");
+                    System.err.println(i.toString());
+                    System.err.println("\n");
+                    for (StackTraceElement j : i.getValue()) {
+                        System.err.println(j);
+                    }
+                }
+            }
+        };
+        timeoutTimer = new Timer("Test thread dump timer");
+        timeoutTimer.schedule(timeoutTask, 1000 * 60 * 5);
+        ExtensionContext.Store store = extensionContext.getRoot().getStore(ExtensionContext.Namespace.GLOBAL);
+
+        Class<?> testClass = extensionContext.getRequiredTestClass();
+
+        deploymentDir = Files.createTempDirectory("quarkus-unit-test");
+
+        exportArchive(deploymentDir, testClass);
+
+        if (vertx == null) {
+            vertx = Vertx.vertx();
+            HttpServer server = vertx.createHttpServer();
+            router = Router.router(vertx);
+            server.requestHandler(router).listen(8080);
+            store.put(ResteasyReactiveUnitTest.class.getName(), new ExtensionContext.Store.CloseableResource() {
+                @Override
+                public void close() throws Throwable {
+                    server.close();
+                    vertx.close();
+                }
+            });
+        }
+
+        Index index = JandexUtil.createIndex(deploymentDir);
+        ApplicationScanningResult applicationScanningResult = ResteasyReactiveScanner.scanForApplicationClass(index,
+                Collections.emptySet());
+        ResourceScanningResult resources = ResteasyReactiveScanner.scanResources(index);
+        if (resources == null) {
+            throw new RuntimeException("no JAX-RS resources found");
+        }
+        ServerEndpointIndexer serverEndpointIndexer = new ServerEndpointIndexer.Builder()
+                .setIndex(index)
+                .setScannedResourcePaths(resources.getScannedResourcePaths())
+                .setClassLevelExceptionMappers(new HashMap<>())
+                .setInjectableBeans(new HashMap<>())
+                .setConfig(new ResteasyReactiveConfig(10000, true, true))
+                .setHttpAnnotationToMethod(resources.getHttpAnnotationToMethod())
+                .build();
+
+        List<ResourceClass> resourceClasses = new ArrayList<>();
+        List<ResourceClass> subResourceClasses = new ArrayList<>();
+        for (Map.Entry<DotName, ClassInfo> i : resources.getScannedResources().entrySet()) {
+            ResourceClass res = serverEndpointIndexer.createEndpoints(i.getValue());
+            resourceClasses.add(res);
+        }
+        for (Map.Entry<DotName, ClassInfo> i : resources.getPossibleSubResources().entrySet()) {
+            ResourceClass res = serverEndpointIndexer.createEndpoints(i.getValue());
+            subResourceClasses.add(res);
+        }
+
+        ServerSerialisers serialisers = new ServerSerialisers();
+        serialisers.addWriter(String.class, new ResourceWriter()
+                .setMediaTypeStrings(Collections.singletonList(MediaType.WILDCARD))
+                .setFactory(new BeanFactory<MessageBodyWriter<?>>() {
+                    @Override
+                    public BeanInstance<MessageBodyWriter<?>> createInstance() {
+                        return new BeanInstance<MessageBodyWriter<?>>() {
+                            @Override
+                            public MessageBodyWriter<?> getInstance() {
+                                return new ServerStringMessageBodyHandler();
+                            }
+
+                            @Override
+                            public void close() {
+
+                            }
+                        };
+                    }
+                }));
+        DeploymentInfo info = new DeploymentInfo()
+                .setApplicationPath("/")
+                .setFeatures(ResteasyReactiveFeatureScanner.createFeatures(index, applicationScanningResult))
+                .setInterceptors(
+                        ResteasyReactiveInterceptorScanner.createResourceInterceptors(index, applicationScanningResult))
+                .setDynamicFeatures(ResteasyReactiveFeatureScanner.createDynamicFeatures(index, applicationScanningResult))
+                .setParamConverterProviders(
+                        ResteasyReactiveParamConverterScanner.createParamConverters(index, applicationScanningResult))
+                .setSerialisers(serialisers)
+                .setExceptionMapping(
+                        ResteasyReactiveExceptionMappingScanner.createExceptionMappers(index, applicationScanningResult))
+                .setResourceClasses(resourceClasses)
+                .setCtxResolvers(
+                        ResteasyReactiveContextResolverScanner.createContextResolvers(index, applicationScanningResult))
+                .setLocatableResourceClasses(subResourceClasses)
+                .setApplicationSupplier(new Supplier<Application>() {
+                    @Override
+                    public Application get() {
+                        if (applicationScanningResult.getSelectedAppClass() == null) {
+                            return new Application();
+                        } else {
+                            try {
+                                return (Application) Class
+                                        .forName(applicationScanningResult.getSelectedAppClass().name().toString(), false,
+                                                Thread.currentThread().getContextClassLoader())
+                                        .newInstance();
+                            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }
+                });
+        RuntimeDeploymentManager runtimeDeploymentManager = new RuntimeDeploymentManager(info, () -> executor, null,
+                closeable -> closeTasks.add(closeable), new VertxRequestContextFactory(), ThreadSetupAction.NOOP, "/");
+        Deployment deployment = runtimeDeploymentManager.deploy();
+        RestInitialHandler initialHandler = new RestInitialHandler(deployment);
+        router.route().handler(new ResteasyReactiveVertxHandler(initialHandler));
+
+    }
+
+    @Override
+    public void afterAll(ExtensionContext extensionContext) throws Exception {
+        if (assertLogRecords != null) {
+            assertLogRecords.accept(inMemoryLogHandler.records);
+        }
+        //rootLogger.setHandlers(originalHandlers);
+        inMemoryLogHandler.clearRecords();
+
+        System.clearProperty("test.url");
+        timeoutTask.cancel();
+        timeoutTask = null;
+        timeoutTimer = null;
+        if (deploymentDir != null) {
+            deleteDirectory(deploymentDir);
+        }
+
+    }
+
+    public static void deleteDirectory(final Path directory) throws IOException {
+        if (!Files.isDirectory(directory)) {
+            return;
+        }
+        Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                try {
+                    Files.delete(file);
+                } catch (IOException e) {
+                    // ignored
+                }
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                try {
+                    Files.delete(dir);
+                } catch (IOException e) {
+                    // ignored
+                }
+                return FileVisitResult.CONTINUE;
+            }
+
+        });
+    }
+
+}
diff --git a/independent-projects/revapi/pom.xml b/independent-projects/revapi/pom.xml
new file mode 100644
index 0000000000000..44c90f964b7f2
--- /dev/null
+++ b/independent-projects/revapi/pom.xml
@@ -0,0 +1,83 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>36</version>
+    </parent>
+    
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-revapi-config</artifactId>
+    <name>Quarkus - Revapi Configuration</name>
+    <version>999-SNAPSHOT</version>    
+    <description>Contains the configuration of the Revapi API checker and the list of the API changes 
+        in the Quarkus APIs.
+    </description>
+    <packaging>jar</packaging>
+
+    <properties>
+        <format.skip>true</format.skip>
+    </properties>
+
+    <build>
+        <plugins>
+            <!-- 
+            This is not deployed into a Maven repository. It is merely installed into the local Maven repository
+            during a local build.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
+        <profile>
+            <id>quick-build</id>
+            <activation>
+                <property>
+                    <name>quickly</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+            <build>
+                <defaultGoal>clean install</defaultGoal>
+            </build>
+        </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
+    </profiles>
+</project>
diff --git a/independent-projects/revapi/src/main/resources/META-INF/revapi.ftl b/independent-projects/revapi/src/main/resources/META-INF/revapi.ftl
new file mode 100644
index 0000000000000..cbf91b7cffb67
--- /dev/null
+++ b/independent-projects/revapi/src/main/resources/META-INF/revapi.ftl
@@ -0,0 +1,49 @@
+<#ftl strip_whitespace=true>
+<#if reports?has_content>
+# API Change analysis Results
+
+The summary of the API changes between artifacts <#list analysis.oldApi.archives as archive>`${archive.name}`<#sep>, </#list> and 
+<#list analysis.newApi.archives as archive>`${archive.name}`<#sep>, </#list>
+
+[cols="1,1,1,1,1", options="header"]
+.Changes
+|===
+|Code
+|Element
+|Classification
+|Description
+|Justification
+
+<#list reports as report>
+
+<#list report.differences as diff>
+
+|${diff.code}
+|<#if report.newElement??>*${report.newElement}*</#if>
+<#if report.oldElement??>*${report.oldElement}*</#if>
+<#if diff.attachments['exampleUseChainInNewApi']??>
+  Example use chain in new api:
+<#list diff.attachments['exampleUseChainInNewApi']?split(" <- ") as e>
+  <-${e}
+</#list>
+</#if>
+<#if diff.attachments['exampleUseChainInOldApi']?? && diff.attachments['exampleUseChainInNewApi']! != diff.attachments['exampleUseChainInOldApi']>
+  Example use chain in old api:
+<#list diff.attachments['exampleUseChainInOldApi']?split(" <- ") as e>
+  <-${e}
+</#list>
+</#if>
+
+<#list diff.attachments?keys as key>
+<#if !['newArchive', 'newArchiveRole', 'oldArchive', 'oldArchiveRole','package','classQualifiedName','classSimpleName','elementKind','exception','methodName','exampleUseChainInNewApi','exampleUseChainInOldApi','fieldName']?seq_contains(key)>
+  ${key} = ${diff.attachments[key]}
+</#if>
+</#list>
+|<#list diff.classification?keys as compat><#if diff.classification?api.get(compat) != "NON_BREAKING">  ${compat?capitalize}: ${diff.classification?api.get(compat)?capitalize?replace("_","")}${'\n'}</#if></#list>
+|${diff.description}
+|${diff.justification!""}
+
+</#list>
+</#list>
+|===
+</#if>
\ No newline at end of file
diff --git a/independent-projects/revapi/src/main/resources/revapi/revapi-configuration.xml b/independent-projects/revapi/src/main/resources/revapi/revapi-configuration.xml
new file mode 100644
index 0000000000000..8d94f2bf2aa68
--- /dev/null
+++ b/independent-projects/revapi/src/main/resources/revapi/revapi-configuration.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- The basic configuration for Revapi API checks in all modules that have API checks enabled. -->
+<analysisConfiguration>
+  <revapi.java>
+    <missing-classes>
+      <behavior>error</behavior>
+      <ignoreMissingAnnotations>true</ignoreMissingAnnotations>
+    </missing-classes>
+    <filter>
+      <packages>
+        <regex>true</regex>
+        <exclude><item>javax\..*</item></exclude>
+      </packages>
+    </filter>
+  </revapi.java>
+    <!-- <revapi.reporter.text id="stdout">
+      <output>out</output>
+      <template>revapi.ftl</template>
+    </revapi.reporter.text>  -->
+    <revapi.reporter.text>
+      <minSeverity>NON_BREAKING</minSeverity>
+      <output>${project.build.directory}/revapi-results/revapi-breakages.adoc</output>
+      <template>revapi.ftl</template>
+    </revapi.reporter.text>
+    <revapi.reporter.json>
+        <minSeverity>NON_BREAKING</minSeverity>
+        <output>${project.build.directory}/revapi-results/revapi-breakages.json</output>
+        <indent>true</indent>
+        <keepEmptyFile>true</keepEmptyFile>
+      </revapi.reporter.json>
+</analysisConfiguration>
diff --git a/independent-projects/tools/artifact-api/pom.xml b/independent-projects/tools/artifact-api/pom.xml
new file mode 100644
index 0000000000000..0aee54bb768f5
--- /dev/null
+++ b/independent-projects/tools/artifact-api/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-tools-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-devtools-artifact-api</artifactId>
+    <name>Quarkus - Dev tools - Maven Artifact API</name>
+
+    <dependencies>
+    </dependencies>
+</project>
diff --git a/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/ArtifactCoords.java b/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/ArtifactCoords.java
new file mode 100644
index 0000000000000..529f8a1d25674
--- /dev/null
+++ b/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/ArtifactCoords.java
@@ -0,0 +1,129 @@
+package io.quarkus.maven;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ArtifactCoords implements Serializable {
+
+    public static final String TYPE_JAR = "jar";
+    public static final String TYPE_POM = "pom";
+
+    public static ArtifactCoords fromString(String str) {
+        return new ArtifactCoords(split(str, new String[5]));
+    }
+
+    public static ArtifactCoords pom(String groupId, String artifactId, String version) {
+        return new ArtifactCoords(groupId, artifactId, null, TYPE_POM, version);
+    }
+
+    protected static String[] split(String str, String[] parts) {
+        final int versionSep = str.lastIndexOf(':');
+        if (versionSep <= 0 || versionSep == str.length() - 1) {
+            throw new IllegalArgumentException("One of type, version or separating them ':' is missing from '" + str + "'");
+        }
+        parts[4] = str.substring(versionSep + 1);
+        ArtifactKey.split(str, parts, versionSep);
+        return parts;
+    }
+
+    protected final String groupId;
+    protected final String artifactId;
+    protected final String classifier;
+    protected final String type;
+    protected final String version;
+
+    protected transient ArtifactKey key;
+
+    protected ArtifactCoords(String[] parts) {
+        groupId = parts[0];
+        artifactId = parts[1];
+        classifier = parts[2];
+        type = parts[3] == null ? TYPE_JAR : parts[3];
+        version = parts[4];
+    }
+
+    public ArtifactCoords(ArtifactKey key, String version) {
+        this.key = key;
+        this.groupId = key.getGroupId();
+        this.artifactId = key.getArtifactId();
+        this.classifier = key.getClassifier();
+        this.type = key.getType();
+        this.version = version;
+    }
+
+    public ArtifactCoords(String groupId, String artifactId, String version) {
+        this(groupId, artifactId, "", TYPE_JAR, version);
+    }
+
+    public ArtifactCoords(String groupId, String artifactId, String type, String version) {
+        this(groupId, artifactId, "", type, version);
+    }
+
+    public ArtifactCoords(String groupId, String artifactId, String classifier, String type, String version) {
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.classifier = classifier == null ? "" : classifier;
+        this.type = type == null ? TYPE_JAR : type;
+        this.version = version;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    public String getClassifier() {
+        return classifier;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public ArtifactKey getKey() {
+        return key == null ? key = new ArtifactKey(groupId, artifactId, classifier, type) : key;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ArtifactCoords that = (ArtifactCoords) o;
+        return Objects.equals(groupId, that.groupId) &&
+                Objects.equals(artifactId, that.artifactId) &&
+                Objects.equals(classifier, that.classifier) &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(version, that.version);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(groupId, artifactId, classifier, type, version);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder buf = new StringBuilder();
+        append(buf);
+        return buf.toString();
+    }
+
+    protected StringBuilder append(final StringBuilder buf) {
+        buf.append(groupId).append(':').append(artifactId).append(':');
+        if (classifier != null && !classifier.isEmpty()) {
+            buf.append(classifier);
+        }
+        return buf.append(':').append(type).append(':').append(version);
+    }
+}
diff --git a/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/ArtifactKey.java b/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/ArtifactKey.java
new file mode 100644
index 0000000000000..7283a1e9388ba
--- /dev/null
+++ b/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/ArtifactKey.java
@@ -0,0 +1,171 @@
+package io.quarkus.maven;
+
+import java.io.Serializable;
+
+public class ArtifactKey implements Serializable {
+
+    public static ArtifactKey fromString(String str) {
+        return new ArtifactKey(split(str, new String[4], str.length()));
+    }
+
+    protected static String[] split(String str, String[] parts, int fromIndex) {
+        int i = str.lastIndexOf(':', fromIndex - 1);
+        if (i <= 0) {
+            throw new IllegalArgumentException("GroupId and artifactId separating ':' is absent or not in the right place in '"
+                    + str.substring(0, fromIndex) + "'");
+        }
+        parts[3] = str.substring(i + 1, fromIndex);
+        fromIndex = i;
+        i = str.lastIndexOf(':', fromIndex - 1);
+        if (i < 0) {
+            parts[0] = str.substring(0, fromIndex);
+            if ((parts[1] = parts[3]).isEmpty()) {
+                throw new IllegalArgumentException("ArtifactId is empty in `" + str + "`");
+            }
+            parts[2] = "";
+            parts[3] = null;
+            return parts;
+        }
+        if (i == 0) {
+            throw new IllegalArgumentException(
+                    "One of groupId or artifactId is missing from '" + str.substring(0, fromIndex) + "'");
+        }
+        if (i == fromIndex - 1) {
+            parts[2] = "";
+        } else {
+            parts[2] = str.substring(i + 1, fromIndex);
+        }
+
+        fromIndex = i;
+        i = str.lastIndexOf(':', fromIndex - 1);
+        if (i < 0) {
+            parts[0] = str.substring(0, fromIndex);
+            if ((parts[1] = parts[2]).isEmpty()) {
+                throw new IllegalArgumentException("ArtifactId is empty in `" + str + "`");
+            }
+            parts[2] = parts[3];
+            parts[3] = null;
+            return parts;
+        }
+        if (i == 0 || i == fromIndex - 1) {
+            throw new IllegalArgumentException(
+                    "One of groupId or artifactId is missing from '" + str.substring(0, fromIndex) + "'");
+        }
+
+        parts[0] = str.substring(0, i);
+        parts[1] = str.substring(i + 1, fromIndex);
+        if (parts[3].isEmpty()) {
+            parts[3] = null;
+        }
+        return parts;
+    }
+
+    protected final String groupId;
+    protected final String artifactId;
+    protected final String classifier;
+    protected final String type;
+
+    public ArtifactKey(String[] parts) {
+        this.groupId = parts[0];
+        this.artifactId = parts[1];
+        if (parts.length == 2 || parts[2] == null) {
+            this.classifier = "";
+        } else {
+            this.classifier = parts[2];
+        }
+        if (parts.length <= 3 || parts[3] == null) {
+            this.type = "jar";
+        } else {
+            this.type = parts[3];
+        }
+    }
+
+    public ArtifactKey(String groupId, String artifactId) {
+        this(groupId, artifactId, null);
+    }
+
+    public ArtifactKey(String groupId, String artifactId, String classifier) {
+        this(groupId, artifactId, classifier, null);
+    }
+
+    public ArtifactKey(String groupId, String artifactId, String classifier, String type) {
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.classifier = classifier == null ? "" : classifier;
+        this.type = type;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    public String getClassifier() {
+        return classifier;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((artifactId == null) ? 0 : artifactId.hashCode());
+        result = prime * result + ((classifier == null) ? 0 : classifier.hashCode());
+        result = prime * result + ((groupId == null) ? 0 : groupId.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ArtifactKey other = (ArtifactKey) obj;
+        if (artifactId == null) {
+            if (other.artifactId != null)
+                return false;
+        } else if (!artifactId.equals(other.artifactId))
+            return false;
+        if (classifier == null) {
+            if (other.classifier != null)
+                return false;
+        } else if (!classifier.equals(other.classifier))
+            return false;
+        if (groupId == null) {
+            if (other.groupId != null)
+                return false;
+        } else if (!groupId.equals(other.groupId))
+            return false;
+        if (type == null) {
+            if (other.type != null)
+                return false;
+        } else if (!type.equals(other.type))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder buf = new StringBuilder();
+        buf.append(groupId).append(':').append(artifactId);
+        if (!classifier.isEmpty()) {
+            buf.append(':').append(classifier);
+        } else if (type != null) {
+            buf.append(':');
+        }
+        if (type != null) {
+            buf.append(':').append(type);
+        }
+        return buf.toString();
+    }
+}
diff --git a/independent-projects/tools/codestarts/README.adoc b/independent-projects/tools/codestarts/README.adoc
new file mode 100644
index 0000000000000..27f94fd64a19c
--- /dev/null
+++ b/independent-projects/tools/codestarts/README.adoc
@@ -0,0 +1,252 @@
+Quarkus - Extension Codestarts
+==============================
+:toc: preamble
+:toclevels: 3
+:showtitle:
+
+This guide explains how to create and configure a Quarkus Codestart for an extension.
+
+== Description
+
+"Extension Codestarts" is the name we gave to our Quarkus extension quickstart code generation system. It aims to provide a personalized getting started experience with Quarkus.
+A Quarkus extension is able to provide one or more well defined codestarts which will contain the necessary resources and code examples required to get started using that particular extension.
+
+You can play with the extension codestarts in the Quarkus tooling:
+
+* The https://code.quarkus.io web app
+* The Quarkus Maven plugin:
++
+[source,bash]
+----
+mvn io.quarkus:quarkus-maven-plugin:create
+----
+
+* The experimental Quarkus CLI (using JBang until it gets a proper installer):
++
+[source,bash]
+----
+jbang cli@quarkusio create
+----
+
+We decided that:
+
+* "Codestart(s)" is the tool (the code generator system).
+* A "codestart" is a directory following a specific struture containing a `codestart.yml` and templates. It is used by the tool in combinations with other codestarts to generate a project.
+* An "Extension codestart" is a specific codestart providing example code for a Quarkus extension.
+
+== How it works
+
+There are two kinds of codestarts contributing to the generation of a project, the kind where we want to have only one for a project (called Base) and the rest (called Extra).
+
+Base:
+
+* project: The project skeleton (e.g. a Quarkus project)
+* buildtool: The build tool (e.g. Maven, Gradle, Gradle with Kotlin DSL)
+* language: The coding language (e.g. Java, Kotlin, Scala)
+* config: The config type (e.g. yaml, properties)
+
+Extra:
+
+* tooling: Anything that can be added to improve the project (e.g. dockerfiles)
+* code: Any Quarkus extension can provide example code. The user can decide to activate it or not.
+
+Each codestart consists of:
+
+. A codestart unique name, ie `my-codestart`
+. A directory for the codestart files, ie `my-codestart/`
+. A `codestart.yml` file
+. Optionally some templates which following a common structure and naming conventions
+
+== Where are the Quarkus Extension Codestarts located
+
+* Quarkus core codestarts dir: https://github.com/quarkusio/quarkus/tree/main/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core
+* Extension codestarts directory: https://github.com/quarkusio/quarkus/tree/main/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples
+
+== Writing an Extension Codestart
+
+As we discussed before, the base project files (pom.xml, dockerfiles, ...) are already generated by some existing codestarts. Thanks to this, we can only focus on the important, the example code for the extension.
+
+Here is the flow I am using to develop a new extension codestart:
+
+. duplicate the example (e.g. link:./examples/quarkus/my-example[./examples/quarkus/my-example])
+. adapt the codestart.yml with your codestarts details and metadata (steps 1 & 2 will be replaced by https://github.com/quarkusio/quarkus/issues/13614)
+. use the `qcd@quarkusio` jbang script to generate the project using your new extension codestart named `my-example` located in `./examples/quarkus` in java and kotlin:
++
+[source,bash]
+----
+jbang qcd@quarkusio -l java,kotlin -c ./examples/quarkus my-example
+----
+
+. Make sure the generated project(s) are as expected. You can use `-t` option to automatically build and test the generated project(s).
+. You can either edit the codestart files and start again from step 3 or also, open the generated project(s) using you IDE and edit the files. You need to manually copy the changes back to your codestart files (and iterate again from 3)
+
+*NOTE 1* You can start with java and add kotlin later in another PR
+
+*NOTE 2* The build file will automatically include the dependencies provided in the `codestart.yml`.
+
+=== When done (to bind the extension codestart to the actual extension):
+
+. put the working extension codestart in `devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/examples` and submit a PR.
+. Add the `codestart` property to the extension to the extension metadata (located in the extension `src/main/resources/META-INF/quarkus-extension.yaml).
+This is how it gets activated when the extension is selected.
+
+e.g:
+[source,yaml]
+----
+name: "RESTEasy JAX-RS"
+metadata:
+  short-name: "jax-rs"
+...
+  codestart:
+    name: "resteasy" # The codestart name or ref
+    kind: "example" # Either "example" or "singleton-example"
+    languages: # The list of implemented languages
+      - "java"
+      - "kotlin"
+      - "scala"
+    artifact: "io.quarkus:quarkus-descriptor-json" # The artifact in which the codestart is located
+----
+
+*NOTE* Using "io.quarkus:quarkus-descriptor-json" as artifact is temporary, extension codestarts will soon live alongside the extension.
+
+=== Tests
+
+* We already have tests making sure we can create and build apps with all extension codestarts together with each build tools and languages:
++
+https://github.com/quarkusio/quarkus/blob/main/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartRunIT.java#L74-L90
+* We have specific tests making sure the generation is working as expected (we will split it soon, you may create another class for your codestart):
++
+https://github.com/quarkusio/quarkus/blob/main/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
+
+=== Writing tips
+
+* Your extension codestart must/should be independent of buildtool and dockerfiles
+* Extension codestarts should be able to work alongside each other without interference
+* Make sure your class names are unique accross all extension codestarts.
+* Use `org.acme` as package name, and `org.acme.[something]` if it has more than one class.
+* Use the path `/[unique-name]-...` for your REST paths
+* If they are not adding learning value, don't provide tests
+* Write the config in `src/main/resources/application.yml`.
++
+It is going to be merged with the other codestarts config and automatically converted to the selected config type (yaml or properties).
+* You can start with java and add kotlin later in another PR
+* If the extension codestart is a bad citizen and may have some compatibility issues, make it a `singleton-example`
+* Ping me @ia3andy on https://quarkusio.zulipchat.com/
+
+=== Directory Structure
+
+*NOTE* `codestart.yml` is the only required file.
+
+* `codestart.yml` must be at the root of the codestart
+* `./base` contains all the files that will be processed
+* `./[java/kotlin/scala]` contains all the files that will be processed if the specified language has been selected (overriding base)
+
+=== codestart.yml
+
+codestart.yml:
+[source,yaml]
+----
+name: resteasy-example // the codestart unique name
+ref: resteasy // the codestart reference (the name is used if not set)
+type: code // the type of codestart (other types are used for other project files)
+tags: example // indicate that this is optional example code
+metadata: // metadata for this example to describe it outside (also available as data in the qute templates)
+  title: RESTEasy JAX-RS example
+  description: Rest is easy peasy with this Hello World RESTEasy resource.
+  related-guide-section: https://quarkus.io/guides/getting-started#the-jax-rs-resources
+language:
+  base: //  most of the time, only base is needed (we may also define java, kotlin, scala overrides)
+    dependencies:
+      - io.quarkus:quarkus-resteasy // You need to specify the dependencies to add (even if it's the one attached)
+    test-dependencies:
+      - io.rest-assured:rest-assured // And maybe test dependencies?
+----
+
+== Advanced topics
+
+=== Naming Convention for files
+
+* `.tpl.qute` will be processed with Qute and can use data (`.tpl.qute` will be removed from the output file name).
+* some files have a specific processing (`readme.md`, `src/test/resources/application.yml`, `src/main/resources/META-INF/resources/index.html`)
+* other files are copied.
+
+=== Templates (Qute)
+
+Codestarts may use Qute templates `MyClass.tpl.qute.java` for dynamic rendering.
+
+Those templates are able to use data which contains:
+
+* The `data` of the codestart to generate (specified in the `codestart.yml`)
+* A merge of the `shared-data` from the all the codestarts used to generate the project
+* The user input
+* Some dynamically generated data (e.g. `dependencies` and `test-dependencies`)
+
+=== README.md
+
+You may add a `README.md` or `README.tpl.qute.md` in the `base` directory, it will be appended to the others.
+So just add the info relative to your extension codestart.
+
+base/readme.tpl.qute.md
+[source,html]
+----
+{#include readme-header /}
+
+[Optionally, Here you may add information about how to use the example, settings, ...]
+----
+
+NOTE: The `{#include readme-header /}` will use a template located in the Quarkus project codestart which displays standard info from the `codestart.yml` metadata.
+
+=== application.properties
+
+As a convention, you should always provide the Quarkus configuration as a yaml file (`src/test/resources/application.yml`).
+
+It is going to be:
+
+* merged with the other extension codestarts configs
+* automatically converted to the selected config type (yaml or properties) at generation time depending on the selected extensions
+
+=== index.html and Cloud Extension codestarts
+
+Extension codestarts may provide a snippet for the generated index.html by adding this file:
+
+base/src/main/resources/META-INF/resources/index.entry.qute.html:
+[source,html]
+----
+{#include index-entry /}
+----
+
+NOTE: The `{#include index-entry /}` will use a template located in the Quarkus project codestart which displays standard info from the `codestart.yml` metadata.
+
+
+=== Singleton example
+
+If the extension codestart is a bad citizen and may have some compatibility issues, make it a `singleton-example`.
+
+This is a big constraint and should be done as a last resort:
+
+* The extension can't be selected with another singleton extension if examples are activated
+* When selected, it will automatically disable all other examples
+
+To make it a singleton:
+
+* Put it in this directory: https://github.com/quarkusio/quarkus/tree/main/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/singleton-examples
+* Add `singleton-example` in the tags:
++
+codestart.yml
+[source,yaml]
+----
+...
+tags:
+  - example
+  - singleton-example
+...
+----
+
+== The generator sources
+
+* Codestart generator: https://github.com/quarkusio/quarkus/tree/main/independent-projects/tools/codestarts
+* Quarkus implementation of the Codestart generator: https://github.com/quarkusio/quarkus/tree/main/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus
+
+== Issues and Feature requests
+
+https://github.com/quarkusio/quarkus/labels/area%2Fcodestarts
diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-example/base/README.tpl.qute.md b/independent-projects/tools/codestarts/examples/quarkus/my-example/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..9e8ad266c8fca
--- /dev/null
+++ b/independent-projects/tools/codestarts/examples/quarkus/my-example/base/README.tpl.qute.md
@@ -0,0 +1,3 @@
+{#include readme-header /}
+
+[Optionally, Here you may add information about how to use the example, settings, ...]
diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-example/base/src/main/resources/META-INF/resources/index.entry.qute.html b/independent-projects/tools/codestarts/examples/quarkus/my-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
new file mode 100644
index 0000000000000..a1768e062a782
--- /dev/null
+++ b/independent-projects/tools/codestarts/examples/quarkus/my-example/base/src/main/resources/META-INF/resources/index.entry.qute.html
@@ -0,0 +1 @@
+{#include index-entry /}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-example/codestart.yml b/independent-projects/tools/codestarts/examples/quarkus/my-example/codestart.yml
new file mode 100644
index 0000000000000..55648aa0fb431
--- /dev/null
+++ b/independent-projects/tools/codestarts/examples/quarkus/my-example/codestart.yml
@@ -0,0 +1,13 @@
+name: my-example-codestart
+ref: my-example
+type: code
+tags: example
+metadata:
+  title: My Hello Codestart example
+  description: This is an example Hello Quarkus codestart, it contains the base of a Quarkus extension codestart.
+  related-guide-section: https://github.com/quarkusio/quarkus/blob/main/independent-projects/tools/codestarts/README.adoc
+  path: /my-hello-example
+language:
+  base:
+    dependencies:
+      - io.quarkus:quarkus-resteasy
diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-example/java/src/main/java/org/acme/example/MyHelloExample.java b/independent-projects/tools/codestarts/examples/quarkus/my-example/java/src/main/java/org/acme/example/MyHelloExample.java
new file mode 100644
index 0000000000000..15e76e6efc617
--- /dev/null
+++ b/independent-projects/tools/codestarts/examples/quarkus/my-example/java/src/main/java/org/acme/example/MyHelloExample.java
@@ -0,0 +1,18 @@
+package org.acme.example;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/my-hello-example")
+public class MyHelloExample {
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public String hello() {
+        return "My Example Hello Quarkus Codestart";
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/examples/quarkus/my-example/kotlin/src/main/kotlin/org/acme/example/MyHelloExample.kt b/independent-projects/tools/codestarts/examples/quarkus/my-example/kotlin/src/main/kotlin/org/acme/example/MyHelloExample.kt
new file mode 100644
index 0000000000000..96e8d359af2f8
--- /dev/null
+++ b/independent-projects/tools/codestarts/examples/quarkus/my-example/kotlin/src/main/kotlin/org/acme/example/MyHelloExample.kt
@@ -0,0 +1,17 @@
+package org.acme.example
+
+import java.util.*
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/my-hello-example")
+class MyHelloExample {
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    fun hello(): String {
+        return "My Example Hello Quarkus Codestart"
+    }
+}
diff --git a/independent-projects/tools/codestarts/pom.xml b/independent-projects/tools/codestarts/pom.xml
new file mode 100644
index 0000000000000..2814f5adc016f
--- /dev/null
+++ b/independent-projects/tools/codestarts/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-tools-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-devtools-codestarts</artifactId>
+    <name>Quarkus - Dev tools - Codestarts</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus.qute</groupId>
+            <artifactId>qute-generator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-bootstrap-app-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-message-writer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>maven-model-helper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java
new file mode 100644
index 0000000000000..a5fc82a2afea7
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/Codestart.java
@@ -0,0 +1,93 @@
+package io.quarkus.devtools.codestarts;
+
+import io.quarkus.devtools.codestarts.core.CodestartSpec;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+public final class Codestart {
+    public static final String BASE_LANGUAGE = "base";
+    private final CodestartResourceAllocator readerProvider;
+    private final CodestartSpec spec;
+    private final Set<String> implementedLanguages;
+
+    public Codestart(final CodestartResourceAllocator readerProvider, final CodestartSpec spec,
+            Set<String> implementedLanguages) {
+        this.readerProvider = readerProvider;
+        this.spec = spec;
+        this.implementedLanguages = implementedLanguages;
+    }
+
+    public void use(Consumer<CodestartResource> readerConsumer) {
+        readerProvider.allocate(readerConsumer);
+    }
+
+    public CodestartSpec getSpec() {
+        return spec;
+    }
+
+    public String getName() {
+        return spec.getName();
+    }
+
+    public Set<String> getTags() {
+        return spec.getTags();
+    }
+
+    public Map<String, String> getMetadata() {
+        return spec.getMetadata();
+    }
+
+    public String getRef() {
+        return spec.getRef();
+    }
+
+    public int getTypeOrder() {
+        return spec.getType().getProcessingOrder();
+    }
+
+    public boolean isSelected(Set<String> selection) {
+        return selection.contains(getName()) || selection.contains(spec.getRef());
+    }
+
+    public CodestartType getType() {
+        return spec.getType();
+    }
+
+    public Set<String> getImplementedLanguages() {
+        return implementedLanguages;
+    }
+
+    public boolean implementsLanguage(String languageName) {
+        return implementedLanguages.isEmpty() || implementedLanguages.contains(languageName);
+    }
+
+    public boolean containsTag(String tag) {
+        return getSpec().getTags().contains(tag);
+    }
+
+    public Map<String, Object> getLocalData(String languageName) {
+        return NestedMaps.deepMerge(Stream.of(new HashMap<>(getMetadata()), getBaseLanguageSpec().getData(),
+                getLanguageSpec(languageName).getData()));
+    }
+
+    public Map<String, Object> getSharedData(String languageName) {
+        return NestedMaps
+                .deepMerge(Stream.of(getBaseLanguageSpec().getSharedData(), getLanguageSpec(languageName).getSharedData()));
+    }
+
+    public CodestartSpec.LanguageSpec getBaseLanguageSpec() {
+        return getSpec().getLanguagesSpec().getOrDefault(BASE_LANGUAGE, new CodestartSpec.LanguageSpec());
+    }
+
+    public CodestartSpec.LanguageSpec getLanguageSpec(String languageName) {
+        return getSpec().getLanguagesSpec().getOrDefault(languageName, new CodestartSpec.LanguageSpec());
+    }
+
+    public interface CodestartResourceAllocator {
+        void allocate(Consumer<CodestartResource> readerConsumer);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalog.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalog.java
new file mode 100644
index 0000000000000..d66b0d7a52f03
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalog.java
@@ -0,0 +1,10 @@
+package io.quarkus.devtools.codestarts;
+
+import java.util.Collection;
+
+public interface CodestartCatalog<T extends CodestartProjectInput> {
+    Collection<Codestart> getCodestarts();
+
+    CodestartProjectDefinition createProject(T projectInput);
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java
new file mode 100644
index 0000000000000..20c60289527be
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartCatalogLoader.java
@@ -0,0 +1,155 @@
+package io.quarkus.devtools.codestarts;
+
+import static io.quarkus.devtools.codestarts.Codestart.BASE_LANGUAGE;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import io.quarkus.devtools.codestarts.core.CodestartSpec;
+import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public final class CodestartCatalogLoader {
+
+    private static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory())
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+            .enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING)
+            .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
+
+    private CodestartCatalogLoader() {
+    }
+
+    public static CodestartCatalog<CodestartProjectInput> loadDefaultCatalog(CodestartPathLoader pathLoader,
+            String first,
+            String... more)
+            throws IOException {
+        final List<Codestart> codestarts = loadCodestarts(pathLoader, first, more);
+        return new GenericCodestartCatalog<>(codestarts);
+    }
+
+    public static Collection<Codestart> loadCodestartsFromDir(Path directory)
+            throws IOException {
+        return loadCodestarts(new DirectoryCodestartPathLoader(directory), "");
+    }
+
+    public static List<Codestart> loadCodestarts(CodestartPathLoader pathLoader, String first, String... more)
+            throws IOException {
+        final List<Codestart> codestarts = new ArrayList<>(loadCodestarts(pathLoader, first));
+        if (more != null) {
+            for (String subDir : more) {
+                codestarts.addAll(loadCodestarts(pathLoader, subDir));
+            }
+        }
+        return codestarts;
+    }
+
+    // Visible for testing
+    static Collection<Codestart> loadCodestarts(final CodestartPathLoader pathLoader, final String directoryName)
+            throws IOException {
+        return pathLoader.loadResourceAsPath(directoryName,
+                path -> {
+                    try (final Stream<Path> pathStream = Files.walk(path)) {
+                        return pathStream
+                                .filter(p -> p.getFileName().toString().matches("codestart\\.yml$"))
+                                .map(p -> {
+                                    final String resourceName = resolveResourceName(directoryName, path, p);
+                                    try {
+                                        final CodestartSpec spec = readCodestartSpec(new String(Files.readAllBytes(p)));
+                                        final String resourceCodestartDirectory = resourceName.replaceAll("/?codestart\\.yml",
+                                                "");
+                                        return new Codestart(
+                                                new PathCodestartResourceAllocator(pathLoader, resourceCodestartDirectory),
+                                                spec,
+                                                resolveImplementedLanguages(p.getParent()));
+                                    } catch (IOException e) {
+                                        throw new CodestartStructureException("Failed to load codestart spec: " + resourceName,
+                                                e);
+                                    }
+                                }).collect(Collectors.toList());
+                    }
+                });
+    }
+
+    private static Set<String> resolveImplementedLanguages(Path p) throws IOException {
+        // empty means all
+        try (final Stream<Path> files = Files.list(p)) {
+            return files
+                    .filter(Files::isDirectory)
+                    .map(CodestartCatalogLoader::getDirName)
+                    .filter(l -> !Objects.equals(l, BASE_LANGUAGE))
+                    .collect(Collectors.toSet());
+        }
+    }
+
+    // Visible for testing
+    static CodestartSpec readCodestartSpec(String content) throws com.fasterxml.jackson.core.JsonProcessingException {
+        return YAML_MAPPER.readerFor(CodestartSpec.class)
+                .readValue(content);
+    }
+
+    // Visible for testing
+    static String getDirName(Path d) {
+        return d.getFileName().toString().replaceAll("([/\\\\])$", "");
+    }
+
+    // Visible for testing
+    static String resolveResourceName(final String dirName, final Path dirPath, final Path resourcePath) {
+        return getResourcePath(dirName, dirPath.relativize(resourcePath).toString());
+    }
+
+    // Visible for testing
+    static String getResourcePath(String first, String... more) {
+        return Paths.get(first, more).toString().replace('\\', '/');
+    }
+
+    private static class PathCodestartResourceAllocator implements Codestart.CodestartResourceAllocator {
+
+        private final CodestartPathLoader pathLoader;
+        private final String resourceName;
+
+        public PathCodestartResourceAllocator(CodestartPathLoader pathLoader, String resourceName) {
+            this.pathLoader = pathLoader;
+            this.resourceName = resourceName;
+        }
+
+        @Override
+        public void allocate(Consumer<CodestartResource> readerConsumer) {
+            try {
+                pathLoader.loadResourceAsPath(resourceName, p -> {
+                    readerConsumer.accept(new CodestartResource.PathCodestartResource(p));
+                    return null;
+                });
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+    }
+
+    private static class DirectoryCodestartPathLoader implements CodestartPathLoader {
+
+        private final Path dir;
+
+        public DirectoryCodestartPathLoader(Path dir) {
+            this.dir = dir;
+        }
+
+        @Override
+        public <T> T loadResourceAsPath(String name, PathConsumer<T> consumer) throws IOException {
+            return consumer.consume(dir.resolve(name));
+        }
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartException.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartException.java
new file mode 100644
index 0000000000000..a13c1d924f99e
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartException.java
@@ -0,0 +1,17 @@
+package io.quarkus.devtools.codestarts;
+
+public class CodestartException extends RuntimeException {
+
+    public CodestartException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public CodestartException(Throwable cause) {
+        super(null, cause);
+    }
+
+    public CodestartException(String message) {
+        super(message, null);
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathLoader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathLoader.java
new file mode 100644
index 0000000000000..907905642075e
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartPathLoader.java
@@ -0,0 +1,13 @@
+package io.quarkus.devtools.codestarts;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public interface CodestartPathLoader {
+    <T> T loadResourceAsPath(String name, PathConsumer<T> consumer) throws IOException;
+
+    interface PathConsumer<T> {
+        T consume(Path is) throws IOException;
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectDefinition.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectDefinition.java
new file mode 100644
index 0000000000000..860576a9e0d55
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectDefinition.java
@@ -0,0 +1,32 @@
+package io.quarkus.devtools.codestarts;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public interface CodestartProjectDefinition {
+
+    void generate(Path targetDirectory) throws IOException;
+
+    List<Codestart> getCodestarts();
+
+    CodestartProjectInput getProjectInput();
+
+    Optional<Codestart> getCodestart(CodestartType type);
+
+    Codestart getRequiredCodestart(CodestartType type);
+
+    String getLanguageName();
+
+    Map<String, Object> getSharedData();
+
+    Map<String, Object> getDepsData();
+
+    Map<String, Object> getCodestartProjectData();
+
+    List<Codestart> getBaseCodestarts();
+
+    List<Codestart> getExtraCodestarts();
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java
new file mode 100644
index 0000000000000..957e672f18881
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInput.java
@@ -0,0 +1,42 @@
+package io.quarkus.devtools.codestarts;
+
+import static java.util.Objects.requireNonNull;
+
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import java.util.Collection;
+import java.util.Map;
+
+public class CodestartProjectInput {
+    private final Collection<String> dependencies;
+    private final Map<String, Object> data;
+    private final CodestartsSelection selection;
+    private final MessageWriter messageWriter;
+
+    protected CodestartProjectInput(final CodestartProjectInputBuilder builder) {
+        this.dependencies = requireNonNull(builder.dependencies, "dependencies is required");
+        this.selection = requireNonNull(builder.selection, "selection is required");
+        this.data = NestedMaps.unflatten(requireNonNull(builder.data, "data is required"));
+        this.messageWriter = requireNonNull(builder.messageWriter, "messageWriter is required");
+    }
+
+    public static CodestartProjectInputBuilder builder() {
+        return new CodestartProjectInputBuilder();
+    }
+
+    public MessageWriter log() {
+        return messageWriter;
+    }
+
+    public CodestartsSelection getSelection() {
+        return selection;
+    }
+
+    public Collection<String> getDependencies() {
+        return dependencies;
+    }
+
+    public Map<String, Object> getData() {
+        return data;
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java
new file mode 100644
index 0000000000000..3045b761c010d
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartProjectInputBuilder.java
@@ -0,0 +1,71 @@
+package io.quarkus.devtools.codestarts;
+
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CodestartProjectInputBuilder {
+    Collection<String> dependencies = new ArrayList<>();
+    CodestartsSelection selection = new CodestartsSelection();
+    Map<String, Object> data = new HashMap<>();
+    MessageWriter messageWriter = MessageWriter.info();
+
+    protected CodestartProjectInputBuilder() {
+
+    }
+
+    public CodestartProjectInputBuilder addDependencies(Collection<String> dependencies) {
+        this.dependencies.addAll(dependencies);
+        return this;
+    }
+
+    public CodestartProjectInputBuilder addDependency(String dependency) {
+        return this.addDependencies(Collections.singletonList(dependency));
+    }
+
+    public CodestartProjectInputBuilder addCodestarts(Collection<String> codestarts) {
+        this.selection.addNames(codestarts);
+        return this;
+    }
+
+    public CodestartProjectInputBuilder addCodestart(String name) {
+        this.selection.addName(name);
+        return this;
+    }
+
+    public CodestartProjectInputBuilder addData(Map<String, Object> data) {
+        this.data.putAll(data);
+        return this;
+    }
+
+    public CodestartProjectInputBuilder putData(String key, Object value) {
+        if (value != null) {
+            this.data.put(key, value);
+        }
+        return this;
+    }
+
+    public CodestartProjectInputBuilder putData(DataKey dataKey, Object value) {
+        return this.putData(dataKey.key(), value);
+    }
+
+    public CodestartProjectInputBuilder messageWriter(MessageWriter messageWriter) {
+        this.messageWriter = messageWriter;
+        return this;
+    }
+
+    public CodestartProjectInput build() {
+        return new CodestartProjectInput(this);
+    }
+
+    public boolean containsData(DataKey dataKey) {
+        return this.containsData(dataKey.key());
+    }
+
+    public boolean containsData(String key) {
+        return this.data.containsKey(key);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java
new file mode 100644
index 0000000000000..193e463fd62c5
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartResource.java
@@ -0,0 +1,152 @@
+package io.quarkus.devtools.codestarts;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.CopyOption;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.commons.io.FilenameUtils;
+
+public interface CodestartResource {
+
+    String pathName();
+
+    String read(String codestartRelativePath);
+
+    Path copyTo(String codestartRelativePath, Path target, CopyOption... copyOptions);
+
+    List<Source> listSources(String languageDir);
+
+    boolean dirExists(String languageDir);
+
+    List<String> getLanguageDirs();
+
+    Optional<Source> getSource(String languageDir, String name);
+
+    class Source {
+
+        private final CodestartResource resource;
+        private final String languageDir;
+        private final String path;
+
+        public Source(CodestartResource resource, String languageDir, String path) {
+            this.resource = resource;
+            this.languageDir = languageDir;
+            this.path = path;
+        }
+
+        public CodestartResource getCodestartResource() {
+            return resource;
+        }
+
+        public String getLanguageDir() {
+            return languageDir;
+        }
+
+        public String getFileName() {
+            return FilenameUtils.getName(path);
+        }
+
+        public String getFileDir() {
+            return FilenameUtils.getPath(this.path);
+        }
+
+        public String path() {
+            return path;
+        }
+
+        public String read() {
+            return resource.read(pathInCodestart());
+        }
+
+        public Path copyTo(Path target, CopyOption... copyOptions) {
+            return resource.copyTo(pathInCodestart(), target, copyOptions);
+        }
+
+        public String pathInCodestart() {
+            return languageDir + "/" + path;
+        }
+
+        public String absolutePath() {
+            return resource.pathName() + "/" + pathInCodestart();
+        }
+    }
+
+    class PathCodestartResource implements CodestartResource {
+
+        Path codestartDir;
+
+        public PathCodestartResource(Path codestartDir) {
+            this.codestartDir = codestartDir;
+        }
+
+        @Override
+        public String pathName() {
+            return codestartDir.toString();
+        }
+
+        @Override
+        public String read(String codestartRelativePath) {
+            try {
+                return new String(Files.readAllBytes(codestartDir.resolve(codestartRelativePath)), StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        @Override
+        public List<Source> listSources(String languageDir) {
+            final Path dir = codestartDir.resolve(languageDir);
+            try (final Stream<Path> pathStream = Files.walk(dir)) {
+                return pathStream
+                        .filter(Files::isRegularFile)
+                        .map(path -> dir.relativize(path).toString())
+                        .map(n -> new Source(this, languageDir, n))
+                        .collect(Collectors.toList());
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        @Override
+        public boolean dirExists(String languageDir) {
+            return Files.isDirectory(codestartDir.resolve(languageDir));
+        }
+
+        @Override
+        public List<String> getLanguageDirs() {
+            try (final Stream<Path> files = Files.list(codestartDir)) {
+                return files
+                        .filter(Files::isDirectory)
+                        .map(CodestartCatalogLoader::getDirName)
+                        .collect(Collectors.toList());
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+
+        @Override
+        public Optional<Source> getSource(String languageDir, String name) {
+            final Path path = codestartDir.resolve(languageDir).resolve(name);
+            if (!Files.isRegularFile(path)) {
+                return Optional.empty();
+            }
+            return Optional.of(new Source(this, languageDir, name));
+        }
+
+        @Override
+        public Path copyTo(String codestartRelativePath, Path target, CopyOption... copyOptions) {
+            try {
+                return Files.copy(codestartDir.resolve(codestartRelativePath), target, copyOptions);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartStructureException.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartStructureException.java
new file mode 100644
index 0000000000000..0d5e9aec89ff4
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartStructureException.java
@@ -0,0 +1,17 @@
+package io.quarkus.devtools.codestarts;
+
+public class CodestartStructureException extends RuntimeException {
+
+    public CodestartStructureException(Throwable cause) {
+        super(null, cause);
+    }
+
+    public CodestartStructureException(String message) {
+        super(message, null);
+    }
+
+    public CodestartStructureException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartType.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartType.java
new file mode 100644
index 0000000000000..ef1bdec85bb1f
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartType.java
@@ -0,0 +1,35 @@
+package io.quarkus.devtools.codestarts;
+
+import io.smallrye.common.os.OS;
+
+public enum CodestartType {
+    LANGUAGE(true, 1, "\uD83D\uDD20"),
+    BUILDTOOL(true, 2, "\uD83E\uDDF0"),
+    PROJECT(true, 3, "\uD83D\uDDC3"),
+    CONFIG(true, 4, "\uD83D\uDCDC"),
+    TOOLING(false, 5, "\uD83D\uDEE0"),
+    CODE(false, 6, "\uD83D\uDC12"),
+    ;
+
+    private final boolean base;
+    private final int processingOrder;
+    private final String icon;
+
+    CodestartType(boolean base, int processingOrder, String icon) {
+        this.base = base;
+        this.processingOrder = processingOrder;
+        this.icon = icon;
+    }
+
+    public boolean isBase() {
+        return base;
+    }
+
+    public String getIcon() {
+        return OS.WINDOWS.isCurrent() ? ">>" : icon;
+    }
+
+    public int getProcessingOrder() {
+        return processingOrder;
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartsSelection.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartsSelection.java
new file mode 100644
index 0000000000000..b29cda20719ee
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/CodestartsSelection.java
@@ -0,0 +1,26 @@
+package io.quarkus.devtools.codestarts;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+public class CodestartsSelection {
+    private final Set<String> names;
+
+    public CodestartsSelection() {
+        this.names = new HashSet<>();
+    }
+
+    public void addName(final String codestartName) {
+        this.names.add(codestartName);
+    }
+
+    public void addNames(final Collection<String> codestartNames) {
+        this.names.addAll(codestartNames);
+    }
+
+    public Set<String> getNames() {
+        return names;
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/DataKey.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/DataKey.java
new file mode 100644
index 0000000000000..82eac3d4fee07
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/DataKey.java
@@ -0,0 +1,7 @@
+package io.quarkus.devtools.codestarts;
+
+public interface DataKey {
+    default String key() {
+        return this.toString().toLowerCase().replace("_", "-");
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java
new file mode 100644
index 0000000000000..122fe33f72307
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartCatalogs.java
@@ -0,0 +1,84 @@
+package io.quarkus.devtools.codestarts.core;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartException;
+import io.quarkus.devtools.codestarts.CodestartProjectInput;
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.CodestartType;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public final class CodestartCatalogs {
+
+    private CodestartCatalogs() {
+    }
+
+    public static Codestart findRequiredCodestart(Collection<Codestart> codestarts, CodestartType type) {
+        return findCodestart(codestarts, type)
+                .orElseThrow(() -> new IllegalArgumentException(type.toString().toLowerCase() + " Codestart is required"));
+    }
+
+    public static String findLanguageName(Collection<Codestart> codestarts) {
+        return findRequiredCodestart(codestarts, CodestartType.LANGUAGE).getName();
+    }
+
+    public static Optional<Codestart> findCodestart(Collection<Codestart> codestarts, CodestartType type) {
+        return codestarts.stream().filter(c -> c.getType() == type).findFirst();
+    }
+
+    public static Collection<Codestart> select(CodestartProjectInput projectInput, Collection<Codestart> codestarts) {
+        final List<Codestart> selectedCodestarts = new ArrayList<>();
+        selectedCodestarts.addAll(getBaseSelection(codestarts, projectInput.getSelection().getNames()));
+        selectedCodestarts.addAll(getExtraSelection(codestarts, projectInput.getSelection().getNames()));
+        return removeUnimplementedCodestarts(projectInput, selectedCodestarts);
+    }
+
+    public static Collection<Codestart> removeUnimplementedCodestarts(CodestartProjectInput projectInput,
+            Collection<Codestart> codestarts) {
+        final String languageName = findLanguageName(codestarts);
+        return codestarts.stream().filter(c -> {
+            if (!c.implementsLanguage(languageName)) {
+                projectInput.log().warn(
+                        c.getName() + " codestart will not be applied (doesn't implement language '" + languageName
+                                + "' yet)");
+                return false;
+            }
+            return true;
+        }).collect(Collectors.toList());
+    }
+
+    static Collection<Codestart> getBaseSelection(Collection<Codestart> codestarts, Set<String> selection) {
+        return codestarts.stream()
+                .filter(c -> c.getSpec().getType().isBase())
+                .filter(c -> c.getSpec().isFallback() || c.isSelected(selection))
+                .collect(Collectors.toMap(c -> c.getSpec().getType(), c -> c, (a, b) -> {
+                    // When there is multiple matches for one key, one should be selected and the other a fallback.
+                    if (a.getSpec().isFallback() && b.getSpec().isFallback()) {
+                        throw new CodestartStructureException(
+                                "Multiple fallback found for a base codestart of type: '" + a.getSpec().getType()
+                                        + "' that should be unique. Only one of '" + a.getSpec().getName() + "' and '"
+                                        + b.getSpec().getName() + "' should be a fallback");
+                    }
+                    if (!a.getSpec().isFallback() && !b.getSpec().isFallback()) {
+                        throw new CodestartException(
+                                "Multiple selection for base codestart of type: '" + a.getSpec().getType()
+                                        + "' that should be unique. Only one of '" + a.getSpec().getName() + "' and '"
+                                        + b.getSpec().getName() + "' should be selected at once.");
+                    }
+                    // The selected is picked.
+                    return !a.getSpec().isFallback() ? a : b;
+                })).values();
+    }
+
+    static Collection<Codestart> getExtraSelection(Collection<Codestart> codestarts, Set<String> selection) {
+        return codestarts.stream()
+                .filter(c -> !c.getSpec().getType().isBase())
+                .filter(c -> c.getSpec().isPreselected() || c.isSelected(selection))
+                .collect(Collectors.toList());
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java
new file mode 100644
index 0000000000000..3af957579dfed
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartData.java
@@ -0,0 +1,74 @@
+package io.quarkus.devtools.codestarts.core;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.codestarts.core.CodestartSpec.CodestartDep;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public final class CodestartData {
+
+    public static final String INPUT_BASE_CODESTART_KEY_PREFIX = "input.base-codestart.";
+    public static final String INPUT_BASE_CODESTARTS_KEY = "input.base-codestarts";
+    public static final String INPUT_EXTRA_CODESTARTS_KEY = "input.extra-codestarts";
+
+    private CodestartData() {
+    }
+
+    public static Optional<String> getInputCodestartForType(final Map<String, Object> data, final CodestartType type) {
+        return NestedMaps.getValue(data, INPUT_BASE_CODESTART_KEY_PREFIX + type.toString().toLowerCase());
+    }
+
+    public static Optional<String> getBuildtool(final Map<String, Object> data) {
+        return getInputCodestartForType(data, CodestartType.BUILDTOOL);
+    }
+
+    public static Map<String, Object> buildCodestartData(final Codestart codestart, final String languageName,
+            final Map<String, Object> data) {
+        final Optional<Map<String, Object>> value = NestedMaps.getValue(data, codestart.getName());
+        Map<String, Object> codestartData = new HashMap<>();
+        codestartData.putAll(data);
+        NestedMaps.deepMerge(codestartData, codestart.getLocalData(languageName));
+        value.ifPresent(map -> NestedMaps.deepMerge(codestartData, map));
+        return codestartData;
+    }
+
+    public static Map<String, Object> buildCodestartProjectData(Collection<Codestart> baseCodestarts,
+            Collection<Codestart> extraCodestarts) {
+        final HashMap<String, Object> data = new HashMap<>();
+        baseCodestarts.forEach((c) -> data.put(INPUT_BASE_CODESTART_KEY_PREFIX + c.getSpec().getType().toString().toLowerCase(),
+                c.getName()));
+        data.put(INPUT_BASE_CODESTARTS_KEY,
+                baseCodestarts.stream().map(Codestart::getName).collect(Collectors.toList()));
+        data.put(INPUT_EXTRA_CODESTARTS_KEY,
+                extraCodestarts.stream().map(Codestart::getName).collect(Collectors.toList()));
+        return NestedMaps.unflatten(data);
+    }
+
+    public static Map<String, Object> buildDependenciesData(Stream<Codestart> codestartsStream, String languageName,
+            Collection<String> extensions) {
+        final Map<String, Set<CodestartDep>> depsData = new HashMap<>();
+        final Set<CodestartDep> dependencies = extensions.stream()
+                .map(CodestartDep::new)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+        final Set<CodestartDep> testDependencies = new LinkedHashSet<>();
+        codestartsStream
+                .flatMap(s -> Stream.of(s.getBaseLanguageSpec(), s.getLanguageSpec(languageName)))
+                .forEach(d -> {
+                    dependencies.addAll(d.getDependencies());
+                    testDependencies.addAll(d.getTestDependencies());
+                });
+        depsData.put("dependencies", dependencies);
+        depsData.put("test-dependencies", testDependencies);
+        return Collections.unmodifiableMap(depsData);
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java
new file mode 100644
index 0000000000000..55cf0694445e1
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessor.java
@@ -0,0 +1,38 @@
+package io.quarkus.devtools.codestarts.core;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+final class CodestartPathProcessor {
+
+    private static final String PACKAGE_NAME_KEY = "package-name";
+    private static final String PACKAGE_NAME_DIR_EXPRESSION = "package-name.dir";
+    private static Pattern EXPRESSION_PATTERN = Pattern.compile("\\{([^}]+)}");
+
+    private CodestartPathProcessor() {
+    }
+
+    static String process(String relativePath, Map<String, Object> data) {
+        if (!relativePath.contains("{")) {
+            return relativePath;
+        }
+        Matcher m = EXPRESSION_PATTERN.matcher(relativePath);
+        StringBuffer result = new StringBuffer();
+        while (m.find()) {
+            String found = m.group(1);
+            String key = found.replace(PACKAGE_NAME_DIR_EXPRESSION, PACKAGE_NAME_KEY);
+            String value = NestedMaps.<String> getValue(data, key)
+                    .orElseThrow(() -> new CodestartStructureException("Missing required data for PathGen: {" + key + "}"));
+            if (found.contains(PACKAGE_NAME_DIR_EXPRESSION) && value.contains(".")) {
+                value = value.replace(".", "/");
+            }
+            m.appendReplacement(result, value);
+        }
+        m.appendTail(result);
+        return result.toString();
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java
new file mode 100644
index 0000000000000..9517b2c9e7b50
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProcessor.java
@@ -0,0 +1,176 @@
+package io.quarkus.devtools.codestarts.core;
+
+import static io.quarkus.devtools.codestarts.Codestart.BASE_LANGUAGE;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartResource;
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.reader.CodestartFileReader;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategy;
+import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategyHandler;
+import io.quarkus.devtools.codestarts.core.strategy.DefaultCodestartFileStrategyHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+final class CodestartProcessor {
+
+    private final MessageWriter log;
+    private final String languageName;
+    private final Path targetDirectory;
+    private final List<CodestartFileStrategy> strategies;
+    private final Map<String, Object> data;
+    private final Map<String, List<TargetFile>> files = new LinkedHashMap<>();
+
+    CodestartProcessor(final MessageWriter log,
+            final String languageName,
+            final Path targetDirectory,
+            final List<CodestartFileStrategy> strategies,
+            final Map<String, Object> data) {
+        this.log = log;
+        this.languageName = languageName;
+        this.targetDirectory = targetDirectory;
+        this.strategies = strategies;
+        this.data = data;
+    }
+
+    void process(final CodestartResource projectResource, final Codestart codestart) {
+        log.debug("processing codestart '%s'...", codestart.getName());
+        addBuiltinData();
+        codestart.use(l -> {
+            final Map<String, Object> finalData = CodestartData.buildCodestartData(codestart, languageName, data);
+            log.debug("codestart data: %s", finalData);
+            Stream.of(BASE_LANGUAGE, languageName)
+                    .filter(l::dirExists)
+                    .forEach(languageDir -> processLanguageDir(projectResource, l, languageDir, finalData));
+        });
+    }
+
+    public void checkTargetDir() throws IOException {
+        if (!Files.exists(targetDirectory)) {
+            boolean mkdirStatus = targetDirectory.toFile().mkdirs();
+            if (!mkdirStatus) {
+                throw new IOException("Failed to create the project directory: " + targetDirectory);
+            }
+            return;
+        }
+        if (!Files.isDirectory(targetDirectory)) {
+            throw new IOException("Project path needs to point to a directory: " + targetDirectory);
+        }
+        final String[] files = targetDirectory.toFile().list();
+        if (files != null && files.length > 0) {
+            throw new IOException("You can't create a project when the directory is not empty: " + targetDirectory);
+        }
+    }
+
+    public void writeFiles() throws IOException {
+        for (Map.Entry<String, List<TargetFile>> e : files.entrySet()) {
+            final String relativePath = e.getKey();
+            final CodestartFileStrategyHandler strategy = getStrategy(relativePath).orElse(getSelectedDefaultStrategy());
+            log.debug("processing file '%s' with strategy %s", relativePath, strategy.name());
+            strategy.process(targetDirectory, relativePath, e.getValue(), data);
+        }
+    }
+
+    public static List<CodestartFileStrategy> buildStrategies(Map<String, String> spec) {
+        final List<CodestartFileStrategy> codestartFileStrategyHandlers = new ArrayList<>(spec.size());
+
+        for (Map.Entry<String, String> entry : spec.entrySet()) {
+            final CodestartFileStrategyHandler handler = CodestartFileStrategyHandler.BY_NAME.get(entry.getValue());
+            if (handler == null) {
+                throw new CodestartStructureException("ConflictStrategyHandler named '" + entry.getValue()
+                        + "' not found. Used with filter '" + entry.getKey() + "'");
+            }
+            codestartFileStrategyHandlers.add(new CodestartFileStrategy(entry.getKey(), handler));
+        }
+        return codestartFileStrategyHandlers;
+    }
+
+    void addBuiltinData() {
+        // needed for azure functions codestart
+        data.put("gen-info", Collections.singletonMap("time", System.currentTimeMillis()));
+    }
+
+    void processLanguageDir(final CodestartResource projectResource, final CodestartResource resource, final String languageDir,
+            final Map<String, Object> finalData) {
+        log.debug("processing dir: %s", resource.pathName());
+        final List<Source> sources = resource.listSources(languageDir);
+
+        for (Source source : sources) {
+            log.debug("found sourceName file: %s", resource.pathName(), source.absolutePath());
+            final String sourceFileName = source.getFileName();
+
+            // Read files to process
+            final Optional<CodestartFileReader> possibleReader = CodestartFileReader.ALL.stream()
+                    .filter(r -> r.matches(sourceFileName))
+                    .findFirst();
+            final CodestartFileReader reader = possibleReader.orElse(CodestartFileReader.DEFAULT);
+
+            log.debug("using reader: %s", reader.getClass().getName());
+
+            final String targetFileName = reader.cleanFileName(sourceFileName);
+            final String fileDir = source.getFileDir();
+            final String relativeTargetPath = "".equals(fileDir) ? targetFileName : fileDir + targetFileName;
+
+            final boolean hasFileStrategyHandler = getStrategy(relativeTargetPath).isPresent();
+            try {
+                final String processedRelativeTargetPath = CodestartPathProcessor.process(relativeTargetPath,
+                        finalData);
+                if (!possibleReader.isPresent() && !hasFileStrategyHandler) {
+                    final Path targetPath = targetDirectory.resolve(processedRelativeTargetPath);
+                    log.debug("copy static file: %s -> %s", source.absolutePath(), targetPath);
+                    getSelectedDefaultStrategy().copyStaticFile(source, targetPath);
+                    continue;
+                }
+                final Optional<String> content = reader.read(projectResource, source,
+                        languageName, finalData);
+                if (content.isPresent()) {
+                    log.debug("adding file to processing stack: %s", source.absolutePath());
+                    this.files.putIfAbsent(processedRelativeTargetPath, new ArrayList<>());
+                    this.files.get(processedRelativeTargetPath)
+                            .add(new TargetFile(processedRelativeTargetPath, content.get()));
+                } else {
+                    final Path targetPath = targetDirectory.resolve(processedRelativeTargetPath);
+                    Files.createDirectories(targetPath.getParent());
+                    log.debug("ignoring file (but creating directory): %s", source.absolutePath());
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+    }
+
+    DefaultCodestartFileStrategyHandler getSelectedDefaultStrategy() {
+        for (CodestartFileStrategy codestartFileStrategy : strategies) {
+            if (Objects.equals(codestartFileStrategy.getFilter(), "*")) {
+                if (codestartFileStrategy.getHandler() instanceof DefaultCodestartFileStrategyHandler) {
+                    return (DefaultCodestartFileStrategyHandler) codestartFileStrategy.getHandler();
+                }
+                throw new CodestartStructureException(
+                        codestartFileStrategy.getHandler().name() + " can't be used as '*' file strategy");
+            }
+        }
+        return CodestartFileStrategyHandler.DEFAULT_STRATEGY;
+    }
+
+    Optional<CodestartFileStrategyHandler> getStrategy(final String key) {
+        for (CodestartFileStrategy codestartFileStrategy : strategies) {
+            if (codestartFileStrategy.test(key)) {
+                return Optional.of(codestartFileStrategy.getHandler());
+            }
+        }
+        return Optional.empty();
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java
new file mode 100644
index 0000000000000..1eea467c6ebf0
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartProjectGeneration.java
@@ -0,0 +1,67 @@
+package io.quarkus.devtools.codestarts.core;
+
+import static io.quarkus.devtools.codestarts.core.CodestartProcessor.buildStrategies;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartProjectDefinition;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategy;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+final class CodestartProjectGeneration {
+
+    private CodestartProjectGeneration() {
+    }
+
+    static void generateProject(final CodestartProjectDefinition projectDefinition, final Path targetDirectory)
+            throws IOException {
+        final MessageWriter log = projectDefinition.getProjectInput().log();
+
+        final String languageName = projectDefinition.getLanguageName();
+
+        // Processing data
+        final Map<String, Object> data = NestedMaps.deepMerge(Stream.of(
+                projectDefinition.getSharedData(),
+                projectDefinition.getDepsData(),
+                projectDefinition.getCodestartProjectData()));
+
+        log.debug("processed shared-data: %s" + data);
+
+        final Codestart projectCodestart = projectDefinition.getRequiredCodestart(CodestartType.PROJECT);
+
+        final List<CodestartFileStrategy> strategies = buildStrategies(mergeStrategies(projectDefinition));
+
+        log.debug("file strategies: %s", strategies);
+        CodestartProcessor processor = new CodestartProcessor(log,
+                languageName, targetDirectory, strategies, data);
+        processor.checkTargetDir();
+
+        projectCodestart.use(project -> {
+            for (Codestart codestart : projectDefinition.getCodestarts()) {
+                processor.process(project, codestart);
+            }
+        });
+
+        processor.writeFiles();
+
+        log.info("\napplying codestarts...");
+        log.info(projectDefinition.getCodestarts().stream()
+                .map(c -> c.getType().getIcon() + " "
+                        + c.getName())
+                .collect(Collectors.joining(System.lineSeparator())));
+    }
+
+    private static Map<String, String> mergeStrategies(CodestartProjectDefinition projectDefinition) {
+        return NestedMaps.deepMerge(
+                projectDefinition.getCodestarts().stream().map(Codestart::getSpec)
+                        .map(CodestartSpec::getOutputStrategy));
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java
new file mode 100644
index 0000000000000..4b696ead7df86
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/CodestartSpec.java
@@ -0,0 +1,184 @@
+package io.quarkus.devtools.codestarts.core;
+
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.quarkus.devtools.codestarts.CodestartType;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+public final class CodestartSpec {
+
+    private final String name;
+    private final boolean isPreselected;
+    private final String ref;
+    private final CodestartType type;
+    private final boolean isFallback;
+    private final Set<String> tags;
+    private final Map<String, String> metadata;
+    private final Map<String, String> outputStrategy;
+    private final Map<String, LanguageSpec> languagesSpec;
+
+    @JsonCreator
+    public CodestartSpec(@JsonProperty(value = "name", required = true) String name,
+            @JsonProperty(value = "ref") String ref,
+            @JsonProperty(value = "type") CodestartType type,
+            @JsonProperty("fallback") boolean isFallback,
+            @JsonProperty("preselected") boolean isPreselected,
+            @JsonProperty("tags") Set<String> tags,
+            @JsonProperty("metadata") Map<String, String> metadata,
+            @JsonProperty("output-strategy") Map<String, String> outputStrategy,
+            @JsonProperty("language") Map<String, LanguageSpec> languagesSpec) {
+        this.name = requireNonNull(name, "name is required");
+        this.tags = tags != null ? tags : Collections.emptySet();
+        this.ref = ref != null ? ref : name;
+        this.type = type != null ? type : CodestartType.CODE;
+        this.isFallback = isFallback;
+        this.isPreselected = isPreselected;
+        this.outputStrategy = outputStrategy != null ? outputStrategy : Collections.emptyMap();
+        this.metadata = metadata != null ? metadata : Collections.emptyMap();
+        this.languagesSpec = languagesSpec != null ? languagesSpec : Collections.emptyMap();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getRef() {
+        return ref;
+    }
+
+    public Set<String> getTags() {
+        return tags;
+    }
+
+    public CodestartType getType() {
+        return type;
+    }
+
+    public boolean isFallback() {
+        return isFallback;
+    }
+
+    public boolean isPreselected() {
+        return isPreselected;
+    }
+
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public Map<String, String> getOutputStrategy() {
+        return outputStrategy;
+    }
+
+    public Map<String, LanguageSpec> getLanguagesSpec() {
+        return languagesSpec;
+    }
+
+    public static final class LanguageSpec {
+        private final Map<String, Object> data;
+        private final Map<String, Object> sharedData;
+        private final List<CodestartDep> dependencies;
+        private final List<CodestartDep> testDependencies;
+
+        public LanguageSpec() {
+            this(null, null, null, null);
+        }
+
+        @JsonCreator
+        public LanguageSpec(@JsonProperty("data") Map<String, Object> data,
+                @JsonProperty("shared-data") Map<String, Object> sharedData,
+                @JsonProperty("dependencies") List<CodestartDep> dependencies,
+                @JsonProperty("test-dependencies") List<CodestartDep> testDependencies) {
+            this.data = data != null ? data : Collections.emptyMap();
+            this.sharedData = sharedData != null ? sharedData : Collections.emptyMap();
+            this.dependencies = dependencies != null ? dependencies : Collections.emptyList();
+            this.testDependencies = testDependencies != null ? testDependencies : Collections.emptyList();
+        }
+
+        public Map<String, Object> getData() {
+            return data;
+        }
+
+        public Map<String, Object> getSharedData() {
+            return sharedData;
+        }
+
+        public List<CodestartDep> getDependencies() {
+            return dependencies;
+        }
+
+        public List<CodestartDep> getTestDependencies() {
+            return testDependencies;
+        }
+    }
+
+    public static class CodestartDep extends HashMap<String, String> {
+
+        private static final String GROUP_ID = "groupId";
+        private static final String ARTIFACT_ID = "artifactId";
+        private static final String VERSION = "version";
+        private static final String FORMATTED_GAV = "formatted-gav";
+        private static final String FORMATTED_GA = "formatted-ga";
+
+        public CodestartDep() {
+        }
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        public CodestartDep(final String expression) {
+            final String[] split = expression.split(":");
+            if (split.length < 2) {
+                throw new IllegalArgumentException("Invalid CodestartDep expression: " + expression);
+            }
+            this.put(GROUP_ID, split[0]);
+            this.put(ARTIFACT_ID, split[1]);
+
+            if (split.length == 3) {
+                this.put(VERSION, split[2]);
+                this.put(FORMATTED_GA, split[0] + ":" + split[1]);
+            } else {
+                this.put(FORMATTED_GA, expression);
+            }
+            this.put(FORMATTED_GAV, expression);
+
+        }
+
+        public String getGroupId() {
+            return this.get(GROUP_ID);
+        }
+
+        public String getArtifactId() {
+            return this.get(ARTIFACT_ID);
+        }
+
+        public String getVersion() {
+            return this.get(VERSION);
+        }
+
+        @Override
+        public String toString() {
+            return this.get(FORMATTED_GAV);
+        }
+
+        @Override
+        public int hashCode() {
+            return this.getGroupId().hashCode() + this.getArtifactId().hashCode();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof Map) {
+                final Map map = (Map) o;
+                return Objects.equals(this.getGroupId(), map.get(GROUP_ID)) &&
+                        Objects.equals(this.getArtifactId(), map.get(ARTIFACT_ID));
+            }
+            return false;
+        }
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java
new file mode 100644
index 0000000000000..97815c134cb57
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/DefaultCodestartProjectDefinition.java
@@ -0,0 +1,111 @@
+package io.quarkus.devtools.codestarts.core;
+
+import static io.quarkus.devtools.codestarts.core.CodestartCatalogs.findLanguageName;
+import static io.quarkus.devtools.codestarts.core.CodestartCatalogs.findRequiredCodestart;
+import static io.quarkus.devtools.codestarts.core.CodestartData.buildCodestartProjectData;
+import static io.quarkus.devtools.codestarts.core.CodestartData.buildDependenciesData;
+import static java.util.Objects.requireNonNull;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartProjectDefinition;
+import io.quarkus.devtools.codestarts.CodestartProjectInput;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public final class DefaultCodestartProjectDefinition implements CodestartProjectDefinition {
+
+    private static final Comparator<Codestart> PROCESSING_ORDER = Comparator.comparingInt(Codestart::getTypeOrder)
+            .thenComparing(Codestart::getName);
+
+    private static final Comparator<Codestart> SHARED_DATA_MERGE_ORDER = PROCESSING_ORDER;
+
+    private final String languageName;
+    private final List<Codestart> codestarts;
+    private final CodestartProjectInput projectInput;
+
+    private DefaultCodestartProjectDefinition(CodestartProjectInput projectInput,
+            String languageName,
+            List<Codestart> codestarts) {
+        this.projectInput = requireNonNull(projectInput, "codestartInput is required");
+        this.languageName = requireNonNull(languageName, "languageName is required");
+        this.codestarts = requireNonNull(codestarts, "codestarts is required");
+    }
+
+    public static CodestartProjectDefinition of(CodestartProjectInput projectInput,
+            Collection<Codestart> codestarts) {
+        final String languageName = findLanguageName(codestarts);
+        findRequiredCodestart(codestarts, CodestartType.PROJECT);
+        final List<Codestart> sorted = codestarts.stream()
+                .sorted(PROCESSING_ORDER)
+                .collect(Collectors.toList());
+        return new DefaultCodestartProjectDefinition(projectInput, languageName, sorted);
+    }
+
+    @Override
+    public void generate(Path targetDirectory) throws IOException {
+        CodestartProjectGeneration.generateProject(this, targetDirectory);
+    }
+
+    @Override
+    public List<Codestart> getCodestarts() {
+        return codestarts;
+    }
+
+    @Override
+    public CodestartProjectInput getProjectInput() {
+        return projectInput;
+    }
+
+    @Override
+    public Optional<Codestart> getCodestart(CodestartType type) {
+        return CodestartCatalogs.findCodestart(codestarts, type);
+    }
+
+    @Override
+    public Codestart getRequiredCodestart(CodestartType type) {
+        return findRequiredCodestart(codestarts, type);
+    }
+
+    @Override
+    public String getLanguageName() {
+        return languageName;
+    }
+
+    @Override
+    public Map<String, Object> getSharedData() {
+        final Stream<Map<String, Object>> codestartsGlobal = getCodestarts().stream()
+                .sorted(SHARED_DATA_MERGE_ORDER)
+                .map(c -> c.getSharedData(getLanguageName()));
+        return NestedMaps.deepMerge(Stream.concat(codestartsGlobal, Stream.of(getProjectInput().getData())));
+    }
+
+    @Override
+    public Map<String, Object> getDepsData() {
+        return buildDependenciesData(getCodestarts().stream(), getLanguageName(),
+                getProjectInput().getDependencies());
+    }
+
+    @Override
+    public Map<String, Object> getCodestartProjectData() {
+        return buildCodestartProjectData(getBaseCodestarts(), getExtraCodestarts());
+    }
+
+    @Override
+    public List<Codestart> getBaseCodestarts() {
+        return getCodestarts().stream().filter(c -> c.getSpec().getType().isBase()).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Codestart> getExtraCodestarts() {
+        return getCodestarts().stream().filter(c -> !c.getSpec().getType().isBase()).collect(Collectors.toList());
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java
new file mode 100644
index 0000000000000..dd7eeaaf14130
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/GenericCodestartCatalog.java
@@ -0,0 +1,32 @@
+package io.quarkus.devtools.codestarts.core;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartCatalog;
+import io.quarkus.devtools.codestarts.CodestartProjectDefinition;
+import io.quarkus.devtools.codestarts.CodestartProjectInput;
+import java.util.Collection;
+
+public class GenericCodestartCatalog<T extends CodestartProjectInput> implements CodestartCatalog<T> {
+
+    protected final Collection<Codestart> codestarts;
+
+    public GenericCodestartCatalog(Collection<Codestart> codestarts) {
+        this.codestarts = codestarts;
+    }
+
+    @Override
+    public Collection<Codestart> getCodestarts() {
+        return codestarts;
+    }
+
+    @Override
+    public CodestartProjectDefinition createProject(T projectInput) {
+        final Collection<Codestart> selected = select(projectInput);
+        return DefaultCodestartProjectDefinition.of(projectInput, selected);
+    }
+
+    protected Collection<Codestart> select(T projectInput) {
+        return CodestartCatalogs.select(projectInput, this.codestarts);
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java
new file mode 100644
index 0000000000000..ccc0aece3f1b9
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/CodestartFileReader.java
@@ -0,0 +1,46 @@
+package io.quarkus.devtools.codestarts.core.reader;
+
+import io.quarkus.devtools.codestarts.CodestartResource;
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public interface CodestartFileReader {
+
+    CodestartFileReader DEFAULT = new DefaultCodestartFileReader();
+
+    List<CodestartFileReader> ALL = Collections.unmodifiableList(Arrays.asList(
+            DEFAULT,
+            new QuteCodestartFileReader(),
+            new IgnoreCodestartFileReader()));
+
+    boolean matches(String fileName);
+
+    String cleanFileName(String fileName);
+
+    Optional<String> read(CodestartResource project, Source source, String languageName, Map<String, Object> data)
+            throws IOException;
+
+    class DefaultCodestartFileReader implements CodestartFileReader {
+
+        @Override
+        public boolean matches(String fileName) {
+            return false;
+        }
+
+        @Override
+        public String cleanFileName(String fileName) {
+            return fileName.replace("..", ".");
+        }
+
+        @Override
+        public Optional<String> read(CodestartResource project, Source source, String languageName, Map<String, Object> data)
+                throws IOException {
+            return Optional.of(source.read());
+        }
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java
new file mode 100644
index 0000000000000..d13b80d21b4ea
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/IgnoreCodestartFileReader.java
@@ -0,0 +1,31 @@
+package io.quarkus.devtools.codestarts.core.reader;
+
+import io.quarkus.devtools.codestarts.CodestartResource;
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+final class IgnoreCodestartFileReader implements CodestartFileReader {
+
+    private static final Set<String> TO_IGNORE = Collections.singleton(".gitkeep");
+
+    @Override
+    public boolean matches(String fileName) {
+        return TO_IGNORE.contains(fileName);
+    }
+
+    @Override
+    public String cleanFileName(String fileName) {
+        return fileName;
+    }
+
+    @Override
+    public Optional<String> read(CodestartResource project, Source source, String languageName, Map<String, Object> data)
+            throws IOException {
+        return Optional.empty();
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java
new file mode 100644
index 0000000000000..ec955dae7255c
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java
@@ -0,0 +1,140 @@
+package io.quarkus.devtools.codestarts.core.reader;
+
+import io.quarkus.devtools.codestarts.CodestartException;
+import io.quarkus.devtools.codestarts.CodestartResource;
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import io.quarkus.qute.Engine;
+import io.quarkus.qute.Expression;
+import io.quarkus.qute.ResultMapper;
+import io.quarkus.qute.Results;
+import io.quarkus.qute.TemplateException;
+import io.quarkus.qute.TemplateLocator;
+import io.quarkus.qute.TemplateNode;
+import io.quarkus.qute.Variant;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.commons.io.FilenameUtils;
+
+final class QuteCodestartFileReader implements CodestartFileReader {
+
+    private static final String TPL_QUTE_FLAG = ".tpl.qute";
+    private static final String ENTRY_QUTE_FLAG = ".entry.qute";
+    public static final String INCLUDE_QUTE_FLAG = ".include.qute";
+
+    @Override
+    public boolean matches(String fileName) {
+        return fileName.contains(TPL_QUTE_FLAG) || fileName.contains(ENTRY_QUTE_FLAG) || fileName.contains(INCLUDE_QUTE_FLAG);
+    }
+
+    @Override
+    public String cleanFileName(String fileName) {
+        return fileName.replaceAll(TPL_QUTE_FLAG, "").replace(ENTRY_QUTE_FLAG, "");
+    }
+
+    @Override
+    public Optional<String> read(CodestartResource projectResource, Source source, String languageName,
+            Map<String, Object> data)
+            throws IOException {
+        if (FilenameUtils.getName(source.path()).contains(INCLUDE_QUTE_FLAG)) {
+            return Optional.empty();
+        }
+        return Optional.of(readQuteFile(projectResource, source, languageName, data));
+    }
+
+    public static String readQuteFile(CodestartResource projectResource, Source source, String languageName,
+            Map<String, Object> data) {
+        final String content = source.read();
+        final Engine engine = Engine.builder().addDefaults()
+                .addResultMapper(new MissingValueMapper())
+                .removeStandaloneLines(true)
+                .addLocator(
+                        id -> findIncludeTemplate(source.getCodestartResource(), languageName, id)
+                                .map(IncludeTemplateLocation::new))
+                .addLocator(
+                        id -> findIncludeTemplate(projectResource, languageName, id)
+                                .map(IncludeTemplateLocation::new))
+                .addLocator(id -> Optional.of(new FallbackTemplateLocation()))
+                .build();
+        try {
+            return engine.parse(content).render(data);
+        } catch (Exception e) {
+            throw new CodestartException("Error while rendering template: " + source.absolutePath(), e);
+        }
+    }
+
+    private static Optional<Source> findIncludeTemplate(CodestartResource projectResource, String languageName, String name) {
+        final String includeFileName = name + INCLUDE_QUTE_FLAG;
+        final Optional<Source> languageIncludeSource = projectResource.getSource(languageName, includeFileName);
+        if (languageIncludeSource.isPresent()) {
+            return languageIncludeSource;
+        }
+        final Optional<Source> baseIncludeSource = projectResource.getSource("base", includeFileName);
+        if (baseIncludeSource.isPresent()) {
+            return baseIncludeSource;
+        }
+        return Optional.empty();
+    }
+
+    private static class FallbackTemplateLocation implements TemplateLocator.TemplateLocation {
+
+        @Override
+        public Reader read() {
+            return new StringReader("");
+        }
+
+        @Override
+        public Optional<Variant> getVariant() {
+            return Optional.empty();
+        }
+    }
+
+    private static class IncludeTemplateLocation implements TemplateLocator.TemplateLocation {
+        private final Source source;
+
+        public IncludeTemplateLocation(Source source) {
+            this.source = source;
+        }
+
+        @Override
+        public Reader read() {
+            return new StringReader(source.read());
+        }
+
+        @Override
+        public Optional<Variant> getVariant() {
+            return Optional.empty();
+        }
+    }
+
+    static class MissingValueMapper implements ResultMapper {
+
+        public boolean appliesTo(TemplateNode.Origin origin, Object result) {
+            return Results.Result.NOT_FOUND.equals(result);
+        }
+
+        public String map(Object result, Expression expression) {
+            if (expression.toOriginalString().equals("merged-content")) {
+                return "{merged-content}";
+            }
+            throw new TemplateException("Missing required data: {" + expression.toOriginalString() + "}");
+        }
+    }
+
+    /**
+     * private static CompletionStage<Object> replaceResolveAsync(EvalContext context) {
+     * String text = (String) context.getBase();
+     * switch (context.getName()) {
+     * case "replace":
+     * if (context.getParams().size() == 2) {
+     * return context.evaluate(context.getParams().get(0)).thenCombine(context.evaluate(context.getParams().get(1)),
+     * (r1, r2) -> CompletableFuture.completedFuture(text.replace(r1.toString(), r2.toString())));
+     * }
+     * default:
+     * return Results.NOT_FOUND;
+     * }
+     * }
+     **/
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/TargetFile.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/TargetFile.java
new file mode 100644
index 0000000000000..32fa0cf4107b7
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/reader/TargetFile.java
@@ -0,0 +1,21 @@
+package io.quarkus.devtools.codestarts.core.reader;
+
+public final class TargetFile {
+
+    private final String sourceName;
+    private final String content;
+
+    public TargetFile(String sourceName, String content) {
+        this.sourceName = sourceName;
+        this.content = content;
+    }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..777936a341f6e
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/AppendCodestartFileStrategyHandler.java
@@ -0,0 +1,27 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+final class AppendCodestartFileStrategyHandler implements CodestartFileStrategyHandler {
+
+    @Override
+    public String name() {
+        return "append";
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        checkTargetDoesNotExist(targetPath);
+        createDirectories(targetPath);
+        final String content = codestartFiles.stream().map(TargetFile::getContent).collect(Collectors.joining("\n"));
+        writeFile(targetPath, content);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategy.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategy.java
new file mode 100644
index 0000000000000..45a6d42602421
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategy.java
@@ -0,0 +1,47 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.function.Predicate;
+
+public class CodestartFileStrategy implements Predicate<String> {
+
+    private final String filter;
+    private final CodestartFileStrategyHandler handler;
+
+    public CodestartFileStrategy(String filter, CodestartFileStrategyHandler handler) {
+        this.filter = requireNonNull(filter, "filter is required");
+        this.handler = requireNonNull(handler, "handler is required");
+    }
+
+    public String getFilter() {
+        return filter;
+    }
+
+    @Override
+    public boolean test(String t) {
+        if (t == null) {
+            return false;
+        }
+        if (filter.startsWith("*") && filter.length() > 1) {
+            if (t.endsWith(filter.substring(1))) {
+                return true;
+            }
+        }
+        if (filter.endsWith("*") && filter.length() > 1) {
+            if (t.startsWith(filter.substring(0, filter.length() - 1))) {
+                return true;
+            }
+        }
+        return filter.equals(t);
+    }
+
+    public CodestartFileStrategyHandler getHandler() {
+        return handler;
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder(filter).append("->").append(handler.name()).toString();
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..1b92484732c04
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyHandler.java
@@ -0,0 +1,60 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public interface CodestartFileStrategyHandler {
+
+    DefaultCodestartFileStrategyHandler DEFAULT_STRATEGY = new FailOnDuplicateCodestartFileStrategyHandler();
+    String SKIP_FILE_IDENTIFIER = "//:SKIP_FILE";
+
+    Map<String, CodestartFileStrategyHandler> BY_NAME = Stream
+            .of(DEFAULT_STRATEGY,
+                    new AppendCodestartFileStrategyHandler(),
+                    new ContentMergeCodestartFileStrategyHandler(),
+                    new ExecutableFileStrategyHandler(),
+                    new ReplaceCodestartFileStrategyHandler(),
+                    new ForbiddenCodestartFileStrategyHandler(),
+                    new SmartConfigMergeCodestartFileStrategyHandler(),
+                    new SmartPomMergeCodestartFileStrategyHandler(),
+                    new SmartPackageFileStrategyHandler())
+            .collect(Collectors.toMap(CodestartFileStrategyHandler::name, Function.identity()));
+
+    String name();
+
+    void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException;
+
+    default void checkNotEmptyCodestartFiles(List<TargetFile> codestartFiles) {
+        if (codestartFiles == null || codestartFiles.isEmpty()) {
+            throw new CodestartStructureException("codestartFiles must not be null or empty");
+        }
+    }
+
+    default void checkTargetDoesNotExist(Path targetPath) {
+        if (Files.exists(targetPath)) {
+            throw new CodestartStructureException(
+                    "Target file already exists: " + targetPath.toString());
+        }
+    }
+
+    default void createDirectories(Path targetPath) throws IOException {
+        Files.createDirectories(targetPath.getParent());
+    }
+
+    default void writeFile(final Path targetPath, final String content) throws IOException {
+        if (!SKIP_FILE_IDENTIFIER.equals(content)) {
+            Files.write(targetPath, content.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..9b9743131b426
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ContentMergeCodestartFileStrategyHandler.java
@@ -0,0 +1,44 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+final class ContentMergeCodestartFileStrategyHandler implements CodestartFileStrategyHandler {
+
+    static final String NAME = "content-merge";
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        Optional<TargetFile> template = Optional.empty();
+        final StringBuilder mergedContent = new StringBuilder();
+        for (TargetFile f : codestartFiles) {
+            if (f.getContent().contains("{merged-content}")) {
+                if (template.isPresent()) {
+                    throw new CodestartStructureException("Found more than one file containing '{merged-content}': "
+                            + f.getSourceName() + ", " + template.get().getSourceName());
+                }
+                template = Optional.of(f);
+            } else {
+                mergedContent.append(f.getContent());
+            }
+        }
+        if (!template.isPresent() || mergedContent.length() == 0) {
+            return;
+        }
+        createDirectories(targetPath);
+        writeFile(targetPath, template.get().getContent().replace("{merged-content}", mergedContent.toString()));
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..f2387e0f7e978
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/DefaultCodestartFileStrategyHandler.java
@@ -0,0 +1,10 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import java.io.IOException;
+import java.nio.file.Path;
+
+public interface DefaultCodestartFileStrategyHandler extends CodestartFileStrategyHandler {
+
+    void copyStaticFile(Source source, Path targetPath) throws IOException;
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java
new file mode 100644
index 0000000000000..14b2c9e90c1d9
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ExecutableFileStrategyHandler.java
@@ -0,0 +1,35 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+final class ExecutableFileStrategyHandler implements CodestartFileStrategyHandler {
+
+    @Override
+    public String name() {
+        return "executable";
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        checkTargetDoesNotExist(targetPath);
+        if (codestartFiles.size() > 1) {
+            throw new CodestartStructureException(
+                    "Multiple files found for path with executable FileStrategy: " + relativePath);
+        }
+        createDirectories(targetPath);
+        writeFile(targetPath, codestartFiles.get(0).getContent());
+        final File file = targetPath.toFile();
+        file.setExecutable(true, false);
+        file.setReadable(true, false);
+        file.setWritable(true, true);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..e70f6d6a40a23
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/FailOnDuplicateCodestartFileStrategyHandler.java
@@ -0,0 +1,44 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+final class FailOnDuplicateCodestartFileStrategyHandler implements DefaultCodestartFileStrategyHandler {
+
+    static final String NAME = "fail-on-duplicate";
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        if (codestartFiles.size() > 1 || Files.exists(targetPath)) {
+            throw new CodestartStructureException(
+                    "Multiple files found for path with 'fail-on-duplicate' FileStrategy: " + relativePath);
+        }
+        createDirectories(targetPath);
+        writeFile(targetPath, codestartFiles.get(0).getContent());
+    }
+
+    @Override
+    public void copyStaticFile(Source source, Path targetPath) throws IOException {
+        if (Files.exists(targetPath)) {
+            throw new CodestartStructureException(
+                    "Multiple files found for path with 'fail-on-duplicate' FileStrategy: " + source.absolutePath() + ":"
+                            + targetPath);
+        }
+        Files.createDirectories(targetPath.getParent());
+        source.copyTo(targetPath);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..90c51667270d4
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ForbiddenCodestartFileStrategyHandler.java
@@ -0,0 +1,23 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+final class ForbiddenCodestartFileStrategyHandler implements CodestartFileStrategyHandler {
+    @Override
+    public String name() {
+        return "forbidden";
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        if (codestartFiles.size() > 0) {
+            throw new CodestartStructureException("This file is forbidden in the output-strategy definition: " + relativePath);
+        }
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..5b5bc90f45b64
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/ReplaceCodestartFileStrategyHandler.java
@@ -0,0 +1,35 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartResource.Source;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.Map;
+
+final class ReplaceCodestartFileStrategyHandler implements DefaultCodestartFileStrategyHandler {
+
+    @Override
+    public String name() {
+        return "replace";
+    }
+
+    @Override
+    public void copyStaticFile(Source source, Path targetPath) throws IOException {
+        Files.createDirectories(targetPath.getParent());
+        source.copyTo(targetPath, StandardCopyOption.REPLACE_EXISTING);
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        checkTargetDoesNotExist(targetPath);
+        createDirectories(targetPath);
+        writeFile(targetPath,
+                codestartFiles.get(codestartFiles.size() - 1).getContent());
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..ddcff3407db85
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java
@@ -0,0 +1,90 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+import io.quarkus.devtools.codestarts.CodestartException;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.codestarts.core.CodestartData;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+final class SmartConfigMergeCodestartFileStrategyHandler implements CodestartFileStrategyHandler {
+
+    private static final ObjectMapper YAML_MAPPER = new ObjectMapper(
+            new YAMLFactory().configure(YAMLGenerator.Feature.WRITE_DOC_START_MARKER, false));
+
+    @Override
+    public String name() {
+        return "smart-config-merge";
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+
+        final String configType = getConfigType(data);
+        final Map<String, Object> config = new HashMap<>();
+        for (TargetFile codestartFile : codestartFiles) {
+            final String content = codestartFile.getContent();
+            if (!content.trim().isEmpty()) {
+                final Map o = YAML_MAPPER.readerFor(Map.class).readValue(content);
+                NestedMaps.deepMerge(config, o);
+            }
+        }
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        createDirectories(targetPath);
+        if (Objects.equals(configType, "config-properties")) {
+            writePropertiesConfig(targetPath, config);
+            return;
+        }
+        if (Objects.equals(configType, "config-yaml")) {
+            writeYamlConfig(targetPath, config);
+            return;
+        }
+        throw new CodestartException("Unsupported config type: " + configType);
+    }
+
+    private void writeYamlConfig(Path targetPath, Map<String, Object> config) throws IOException {
+        checkTargetDoesNotExist(targetPath);
+        YAML_MAPPER.writerFor(Map.class).writeValue(targetPath.toFile(), config);
+    }
+
+    private void writePropertiesConfig(Path targetPath, Map<String, Object> config) throws IOException {
+        final StringBuilder builder = new StringBuilder();
+        final HashMap<String, String> flat = new HashMap<>();
+        flatten("", flat, config);
+        for (Map.Entry<String, String> entry : flat.entrySet()) {
+            builder.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
+        }
+        final Path propertiesTargetPath = targetPath.getParent()
+                .resolve(targetPath.getFileName().toString().replace(".yml", ".properties"));
+        checkTargetDoesNotExist(propertiesTargetPath);
+        writeFile(propertiesTargetPath, builder.toString());
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    static void flatten(String prefix, Map<String, String> target, Map<String, ?> map) {
+        for (Map.Entry entry : map.entrySet()) {
+            if (entry.getValue() instanceof Map) {
+                flatten(prefix + entry.getKey() + ".", target, (Map) entry.getValue());
+            } else {
+                // TODO: handle different types of values
+                target.put(prefix + entry.getKey(), entry.getValue().toString());
+            }
+        }
+    }
+
+    private static String getConfigType(Map<String, Object> data) {
+        final Optional<String> config = CodestartData.getInputCodestartForType(data, CodestartType.CONFIG);
+        return config.orElseThrow(() -> new CodestartException("Config type is required"));
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java
new file mode 100644
index 0000000000000..f53df906d4e76
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandler.java
@@ -0,0 +1,62 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.CodestartData;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+final class SmartPackageFileStrategyHandler implements CodestartFileStrategyHandler {
+
+    private static final String DEFAULT_PACKAGE_DIR = "org/acme";
+    private static final String REPLACE_REGEX = "((import)|(package)) org\\.acme";
+
+    @Override
+    public String name() {
+        return "smart-package";
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+
+        final Optional<String> optPackageName = NestedMaps.getValue(data, "project.package-name");
+        String modifiedRelativePath = relativePath;
+        String content = codestartFiles.get(0).getContent();
+        if (optPackageName.isPresent()) {
+            final String packageName = optPackageName.get();
+            final String packageNameAsDir = packageName.replace(".", "/");
+            modifiedRelativePath = relativePath.replace(DEFAULT_PACKAGE_DIR, packageNameAsDir);
+            content = refactorPackage(content, packageName);
+        }
+
+        // TODO this is a temporary workaround, we need change how this work to support having multiple processors for one file
+        if (modifiedRelativePath.contains("/native-test/")) {
+            final boolean isMaven = CodestartData.getBuildtool(data).filter(b -> Objects.equals(b, "maven")).isPresent();
+            if (isMaven) {
+                modifiedRelativePath = modifiedRelativePath.replace("/native-test/", "/test/");
+            }
+        }
+
+        final Path targetPath = targetDirectory.resolve(modifiedRelativePath);
+
+        if (Files.exists(targetPath)) {
+            throw new CodestartStructureException(
+                    "File already exists: " + targetPath.toString());
+        }
+
+        createDirectories(targetPath);
+        writeFile(targetPath, content);
+    }
+
+    static String refactorPackage(String content, String packageName) {
+        return content.replaceAll(REPLACE_REGEX, "$1 " + packageName);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java
new file mode 100644
index 0000000000000..f2bc99d58c194
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/core/strategy/SmartPomMergeCodestartFileStrategyHandler.java
@@ -0,0 +1,44 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import io.fabric8.maven.Maven;
+import io.fabric8.maven.merge.SmartModelMerger;
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.core.CodestartData;
+import io.quarkus.devtools.codestarts.core.reader.TargetFile;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Objects;
+import org.apache.maven.model.Model;
+
+final class SmartPomMergeCodestartFileStrategyHandler implements CodestartFileStrategyHandler {
+
+    @Override
+    public String name() {
+        return "smart-pom-merge";
+    }
+
+    @Override
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+            throws IOException {
+        checkNotEmptyCodestartFiles(codestartFiles);
+        final Path targetPath = targetDirectory.resolve(relativePath);
+        checkTargetDoesNotExist(targetPath);
+        createDirectories(targetPath);
+        CodestartData.getBuildtool(data)
+                .filter(b -> Objects.equals(b, "maven"))
+                .orElseThrow(() -> new CodestartStructureException(
+                        "something is wrong, smart-pom-merge file strategy must only be used on maven projects"));
+
+        final SmartModelMerger merger = new SmartModelMerger();
+        final Model targetModel = Maven.readModel(new StringReader(codestartFiles.get(0).getContent()));
+        final ListIterator<TargetFile> iterator = codestartFiles.listIterator(1);
+        while (iterator.hasNext()) {
+            merger.merge(targetModel, Maven.readModel(new StringReader(iterator.next().getContent())), true, null);
+        }
+        Maven.writeModel(targetModel, targetPath);
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/utils/NestedMaps.java b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/utils/NestedMaps.java
new file mode 100644
index 0000000000000..b664ce3deba75
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/main/java/io/quarkus/devtools/codestarts/utils/NestedMaps.java
@@ -0,0 +1,89 @@
+package io.quarkus.devtools.codestarts.utils;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public final class NestedMaps {
+
+    private NestedMaps() {
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Optional<T> getValue(Map<String, Object> data, String path) {
+        if (!path.contains(".")) {
+            return Optional.ofNullable((T) data.get(path));
+        }
+        int index = path.indexOf(".");
+        String key = path.substring(0, index);
+        if (data.get(key) instanceof Map) {
+            return getValue((Map<String, Object>) data.get(key), path.substring(index + 1));
+        } else {
+            return Optional.empty();
+        }
+
+    }
+
+    public static <T> Map<String, T> deepMerge(final Stream<Map<String, T>> mapStream) {
+        final Map<String, T> out = new HashMap<>();
+        mapStream.forEach(m -> deepMerge(out, m));
+        return out;
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static void deepMerge(Map left, Map right) {
+        for (Object key : right.keySet()) {
+            Object rightValue = right.get(key);
+            Object leftValue = left.get(key);
+
+            if (rightValue instanceof Map && leftValue instanceof Map) {
+                deepMerge((Map) leftValue, (Map) rightValue);
+            } else if (rightValue instanceof Collection && leftValue instanceof Collection) {
+                Collection c = new LinkedHashSet();
+                c.addAll((Collection) leftValue);
+                c.addAll((Collection) rightValue);
+                left.put(key, c);
+            } else {
+                // Override
+                left.put(key, rightValue);
+            }
+        }
+    }
+
+    public static Map<String, Object> unflatten(Map<String, Object> flattened) {
+        Map<String, Object> unflattened = new HashMap<>();
+        for (Map.Entry<String, Object> entry : flattened.entrySet()) {
+            doUnflatten(unflattened, entry.getKey(), entry.getValue());
+        }
+        return unflattened;
+    }
+
+    private static void doUnflatten(Map<String, Object> current, String key, Object originalValue) {
+        String[] parts = key.split("\\.");
+        for (int i = 0; i < parts.length; i++) {
+            String part = parts[i];
+            if (i == (parts.length - 1)) {
+                if (current.containsKey(part)) {
+                    throw new IllegalStateException("Conflicting data types for key '" + key + "'");
+                }
+                current.put(part, originalValue);
+                return;
+            }
+
+            final Object value = current.get(part);
+            if (value == null) {
+                final HashMap<String, Object> map = new HashMap<>();
+                current.put(part, map);
+                current = map;
+            } else if (value instanceof Map) {
+                current = (Map<String, Object>) value;
+            } else {
+                throw new IllegalStateException("Conflicting data types for key '" + key + "'");
+            }
+        }
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java
new file mode 100644
index 0000000000000..98d0610697e44
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartCatalogLoaderTest.java
@@ -0,0 +1,129 @@
+package io.quarkus.devtools.codestarts;
+
+import static io.quarkus.devtools.codestarts.CodestartType.CODE;
+import static io.quarkus.devtools.codestarts.CodestartType.PROJECT;
+import static org.apache.commons.io.IOUtils.resourceToString;
+import static org.assertj.core.api.Assertions.as;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import io.quarkus.devtools.codestarts.core.CodestartSpec;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Set;
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.junit.jupiter.api.Test;
+import org.mockito.internal.util.collections.Sets;
+
+class CodestartCatalogLoaderTest {
+
+    private TestCodestartResourceLoader resourceLoader = new TestCodestartResourceLoader();
+
+    @Test
+    void testReadCodestartSpec1() throws IOException {
+        final CodestartSpec codestartSpec = CodestartCatalogLoader.readCodestartSpec(resourceToString("codestart-spec1.yml",
+                StandardCharsets.UTF_8, Thread.currentThread().getContextClassLoader()));
+
+        assertThat(codestartSpec.getName()).isEqualTo("foo-project");
+        assertThat(codestartSpec.getRef()).isEqualTo("foo");
+        assertThat(codestartSpec.getType()).isEqualTo(PROJECT);
+        assertThat(codestartSpec.getOutputStrategy()).containsEntry("foo/bar", "strategy").hasSize(1);
+        assertThat(codestartSpec.isPreselected()).isTrue();
+        assertThat(codestartSpec.isFallback()).isTrue();
+        assertThat(codestartSpec.getTags()).isEmpty();
+        assertThat(codestartSpec.getLanguagesSpec()).containsOnlyKeys("base", "java");
+
+        final CodestartSpec.LanguageSpec baseLanguageSpec = codestartSpec.getLanguagesSpec().get("base");
+        assertThat(baseLanguageSpec.getDependencies()).isEmpty();
+        assertThat(baseLanguageSpec.getTestDependencies()).isEmpty();
+        assertThat(baseLanguageSpec.getData()).isEmpty();
+        assertThat(baseLanguageSpec.getSharedData()).containsEntry("foo-shared", "bar");
+        assertThat(baseLanguageSpec.getSharedData()).containsOnlyKeys("foo-shared", "project");
+        assertThat(NestedMaps.getValue(baseLanguageSpec.getSharedData(), "project.group-id")).hasValue("org.acme");
+        assertThat(NestedMaps.getValue(baseLanguageSpec.getSharedData(), "project.artifact-id")).hasValue("foo-project");
+
+        final CodestartSpec.LanguageSpec javaLanguageSpec = codestartSpec.getLanguagesSpec().get("java");
+        assertThat(javaLanguageSpec.getDependencies()).containsExactly(new CodestartSpec.CodestartDep("group:artifact"));
+        assertThat(javaLanguageSpec.getTestDependencies())
+                .containsExactly(new CodestartSpec.CodestartDep("grouptest:artifacttest:versiontest"));
+        assertThat(javaLanguageSpec.getSharedData()).isEmpty();
+        assertThat(javaLanguageSpec.getData()).hasSize(1).containsEntry("foo", "bar");
+    }
+
+    @Test
+    void testReadCodestartSpecDefault() throws IOException {
+        final CodestartSpec codestartSpec = CodestartCatalogLoader
+                .readCodestartSpec(resourceToString("codestart-specdefault.yml",
+                        StandardCharsets.UTF_8, Thread.currentThread().getContextClassLoader()));
+
+        assertThat(codestartSpec.getName()).isEqualTo("specdefault");
+        assertThat(codestartSpec.getType()).isEqualTo(CODE);
+        assertThat(codestartSpec.getTags()).isEmpty();
+        assertThat(codestartSpec.isPreselected()).isFalse();
+        assertThat(codestartSpec.isFallback()).isFalse();
+        assertThat(codestartSpec.getLanguagesSpec()).isEmpty();
+        assertThat(codestartSpec.getOutputStrategy()).isEmpty();
+    }
+
+    @Test
+    void testLoadCodestartsFromDefaultDir() throws IOException {
+        final CodestartCatalog<CodestartProjectInput> catalog = CodestartCatalogLoader
+                .loadDefaultCatalog(resourceLoader, "codestarts/core", "codestarts/examples");
+        assertThat(catalog.getCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder("y", "maven", "config-properties", "config-yaml", "foo", "a", "b", "replace", "t",
+                        "example-with-b", "example1", "example2", "example-forbidden");
+
+        checkLanguages(catalog, Sets.newSet("y", "z"), "a", "b");
+        checkLanguages(catalog, Sets.newSet("config-properties", "config-yaml", "foo", "a", "b", "replace"));
+        checkLanguages(catalog, Sets.newSet("t"), "a");
+        checkLanguages(catalog, Sets.newSet("example1"), "a");
+        checkLanguages(catalog, Sets.newSet("example2"), "b");
+        checkLanguages(catalog, Sets.newSet("example-forbidden"));
+    }
+
+    private void checkLanguages(CodestartCatalog<?> catalog, Set<String> names, String... languages) {
+        assertThat(catalog.getCodestarts())
+                .filteredOn(c -> names.contains(c.getName()))
+                .allSatisfy((c) -> assertThat(c)
+                        .extracting(Codestart::getImplementedLanguages, as(InstanceOfAssertFactories.ITERABLE))
+                        .containsExactlyInAnyOrder(languages));
+    }
+
+    @Test
+    void testLoadCodestartsFromSubDir() throws IOException {
+        final CodestartCatalog<CodestartProjectInput> catalog = CodestartCatalogLoader.loadDefaultCatalog(resourceLoader,
+                "codestarts/examples");
+        assertThat(catalog.getCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder("example1", "example2", "example-forbidden");
+
+    }
+
+    @Test
+    void testLoadCodestartsFail() throws IOException {
+        assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> CodestartCatalogLoader.loadCodestarts(resourceLoader, "codestarts-with-error-1"))
+                .withMessageContaining("codestart-1");
+        assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> CodestartCatalogLoader.loadCodestarts(resourceLoader, "codestarts-with-error-2"))
+                .withMessageContaining("codestart-2");
+        assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> CodestartCatalogLoader.loadCodestarts(resourceLoader, "codestarts-with-error-3"))
+                .withMessageContaining("codestart-3");
+    }
+
+    @Test
+    void testGetDirName() {
+        assertThat(CodestartCatalogLoader.getDirName(Paths.get("test-codestart/my-codestart/java/"))).isEqualTo("java");
+        assertThat(CodestartCatalogLoader.getDirName(Paths.get("test-codestart/my-codestart/java"))).isEqualTo("java");
+    }
+
+    @Test
+    void testGetResourcePath() {
+        assertThat(CodestartCatalogLoader.getResourcePath("codestart")).isEqualTo("codestart");
+        assertThat(CodestartCatalogLoader.getResourcePath("codestart/")).isEqualTo("codestart");
+        assertThat(CodestartCatalogLoader.getResourcePath("codestart", "/my-codestart/")).isEqualTo("codestart/my-codestart");
+        assertThat(CodestartCatalogLoader.getResourcePath("codestart/", "/my-codestart")).isEqualTo("codestart/my-codestart");
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java
new file mode 100644
index 0000000000000..6b7df9d97d384
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectGenerationTest.java
@@ -0,0 +1,131 @@
+package io.quarkus.devtools.codestarts;
+
+import static io.quarkus.devtools.codestarts.TestCodestartResourceLoader.getResource;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.apache.commons.io.FileUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class CodestartProjectGenerationTest {
+
+    private final Path projectPath = Paths.get("target/codestarts-test");
+    private TestCodestartResourceLoader resourceLoader = new TestCodestartResourceLoader();
+
+    @BeforeEach
+    void setUp() {
+        FileUtils.deleteQuietly(projectPath.toFile());
+        assertThat(projectPath).doesNotExist();
+    }
+
+    @Test
+    void checkStaticConflictFail() throws IOException {
+        final CodestartProjectInput input = CodestartProjectInput.builder()
+                .build();
+        final CodestartCatalog<CodestartProjectInput> catalog = loadSpecific("static-conflicting-file");
+
+        final CodestartProjectDefinition projectDefinition = catalog.createProject(input);
+        Assertions.assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> projectDefinition.generate(Files.createTempDirectory("checkStaticConflictFail")))
+                .withMessageContaining("Multiple files found for path with 'fail-on-duplicate' FileStrategy:")
+                .withMessageContaining(".tooling-t");
+    }
+
+    @Test
+    void checkConflictFail() throws IOException {
+        final CodestartProjectInput input = CodestartProjectInput.builder()
+                .build();
+        final CodestartCatalog<CodestartProjectInput> catalog = loadSpecific("conflicting-file");
+
+        final CodestartProjectDefinition projectDefinition = catalog.createProject(input);
+        Assertions.assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> projectDefinition.generate(Files.createTempDirectory("checkConflictFail")))
+                .withMessageContaining("Multiple files found for path with 'fail-on-duplicate' FileStrategy:")
+                .withMessageContaining(".tooling-t");
+    }
+
+    @Test
+    void checkConflictingFallbackProjectFail() throws IOException {
+        final CodestartProjectInput input = CodestartProjectInput.builder()
+                .build();
+        final CodestartCatalog<CodestartProjectInput> catalog = loadSpecific("conflicting-fallback-project");
+
+        Assertions.assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> catalog.createProject(input))
+                .withMessageContaining("Multiple fallback found for a base codestart of type: 'PROJECT'");
+    }
+
+    @Test
+    void checkDefaultProject() throws IOException {
+        final CodestartProjectInput input = CodestartProjectInput.builder()
+                .build();
+        final CodestartProjectDefinition projectDefinition = load().createProject(input);
+
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.PROJECT).getName()).isEqualTo("foo");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.LANGUAGE).getName()).isEqualTo("a");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.BUILDTOOL).getName()).isEqualTo("y");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.CONFIG).getName()).isEqualTo("config-properties");
+
+        assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder("t");
+
+        final Path targetDirectory = projectPath.resolve("default-project");
+        projectDefinition.generate(targetDirectory);
+
+        assertThat(targetDirectory.resolve("README.md")).hasContent("Base readme world y");
+        assertThat(targetDirectory.resolve("config.properties")).hasContent("foo.bar=baz\nfoo.foo=bar\n");
+        assertThat(targetDirectory.resolve(".gitignore")).hasContent("base-ignore1\nbase-ignore2\n");
+        assertThat(targetDirectory.resolve("a/.tooling-t")).hasContent("a/.tooling-t");
+        assertThat(targetDirectory.resolve(".tooling-t")).hasContent(".tooling-t");
+        assertThat(targetDirectory.resolve("ybuild.build")).hasContent("fooa\n\nbara\n\nappend test");
+    }
+
+    @Test
+    void checkSpecificProject() throws IOException {
+        final CodestartProjectInput input = CodestartProjectInput.builder()
+                .addCodestart("b")
+                .addCodestart("example-with-b")
+                .addCodestart("maven")
+                .addCodestart("config-yaml")
+                .putData("project.version", "1.2.3")
+                .putData("prop1", "prop-1-nonamespace")
+                .putData("maven.prop2", "prop-2-namespaced")
+                .putData("example-with-b.my-file-name", "my-dynamic-file-from-input")
+                .build();
+        final CodestartProjectDefinition projectDefinition = load().createProject(input);
+
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.PROJECT).getName()).isEqualTo("foo");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.LANGUAGE).getName()).isEqualTo("b");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.BUILDTOOL).getName()).isEqualTo("maven");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.CONFIG).getName()).isEqualTo("config-yaml");
+
+        assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder("example-with-b");
+
+        final Path targetDirectory = projectPath.resolve("specific-project");
+        projectDefinition.generate(targetDirectory);
+        assertThat(targetDirectory.resolve("README.md")).hasContent("Base readme world maven");
+        assertThat(targetDirectory.resolve("config.yml")).hasContent("example: \"code\"");
+        assertThat(targetDirectory.resolve(".gitignore")).hasContent("base-ignore1\nbase-ignore2\n");
+        assertThat(targetDirectory.resolve("b/example-code")).hasContent("example-code");
+        assertThat(targetDirectory.resolve("my-dynamic-dir/so-cool/my-dynamic-file-from-input.test"))
+                .hasContent("hello my-dynamic-file-from-input");
+        assertThat(targetDirectory.resolve("pom.xml"))
+                .hasSameTextualContentAs(getResource("expected-pom-maven-merge.xml"));
+    }
+
+    private CodestartCatalog<CodestartProjectInput> load() throws IOException {
+        return CodestartCatalogLoader.loadDefaultCatalog(resourceLoader, "codestarts/core", "codestarts/examples");
+    }
+
+    private CodestartCatalog<CodestartProjectInput> loadSpecific(String s) throws IOException {
+        return CodestartCatalogLoader.loadDefaultCatalog(resourceLoader, "codestarts/core", "codestarts/examples",
+                "codestarts/" + s);
+    }
+
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/TestCodestartResourceLoader.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/TestCodestartResourceLoader.java
new file mode 100644
index 0000000000000..cd4602f825378
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/TestCodestartResourceLoader.java
@@ -0,0 +1,27 @@
+package io.quarkus.devtools.codestarts;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Path;
+
+public class TestCodestartResourceLoader implements CodestartPathLoader {
+
+    @Override
+    public <T> T loadResourceAsPath(String name, PathConsumer<T> consumer) throws IOException {
+        return consumer.consume(getResource(name));
+    }
+
+    public static Path getResource(String name) throws IOException {
+        final URL url = Thread.currentThread().getContextClassLoader().getResource(name);
+        if (url == null) {
+            throw new IOException("Failed to locate " + name + " on the classpath");
+        }
+        try {
+            return new File(url.toURI()).toPath();
+        } catch (URISyntaxException e) {
+            throw new IOException(e);
+        }
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java
new file mode 100644
index 0000000000000..12c7ac14e86b2
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartPathProcessorTest.java
@@ -0,0 +1,42 @@
+package io.quarkus.devtools.codestarts.core;
+
+import static io.quarkus.devtools.codestarts.utils.NestedMaps.unflatten;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class CodestartPathProcessorTest {
+
+    @Test
+    void testProcess() {
+        Map<String, Object> dataFlat = new HashMap<>();
+        dataFlat.put("foo.bar", "vfoobar");
+        dataFlat.put("baz", "vbaz");
+        dataFlat.put("package-name", "org.acme.andy");
+        dataFlat.put("class-name", "MyResource");
+        final Map<String, Object> data = unflatten(dataFlat);
+        assertThat(CodestartPathProcessor.process("/foo/bar/{foo.bar}/baz", data))
+                .isEqualTo("/foo/bar/vfoobar/baz");
+        assertThat(CodestartPathProcessor.process("{foo.bar}", data))
+                .isEqualTo("vfoobar");
+        assertThat(CodestartPathProcessor.process("{foo.bar}/{foo.bar}", data))
+                .isEqualTo("vfoobar/vfoobar");
+        assertThat(CodestartPathProcessor.process("{foo.bar}/{baz}", data))
+                .isEqualTo("vfoobar/vbaz");
+        assertThat(CodestartPathProcessor.process("{foo.bar}/{baz}.txt", data))
+                .isEqualTo("vfoobar/vbaz.txt");
+        assertThat(CodestartPathProcessor.process("src/main/java/{package-name.dir}/{class-name}.java", data))
+                .isEqualTo("src/main/java/org/acme/andy/MyResource.java");
+        assertThat(CodestartPathProcessor.process("src/main/java/{package-name}/{class-name}.java", data))
+                .isEqualTo("src/main/java/org.acme.andy/MyResource.java");
+        assertThat(CodestartPathProcessor.process("foo/bar.txt", data))
+                .isEqualTo("foo/bar.txt");
+        assertThatExceptionOfType(CodestartStructureException.class)
+                .isThrownBy(() -> CodestartPathProcessor.process("{foo.bar}/{baz}/{foo.baz}.txt", data))
+                .withMessageContaining("{foo.baz}");
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java
new file mode 100644
index 0000000000000..25d0c4117b91d
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/CodestartProcessorTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.devtools.codestarts.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.quarkus.devtools.codestarts.core.strategy.CodestartFileStrategyHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class CodestartProcessorTest {
+
+    @Test
+    void checkSelectedDefaultStrategy() {
+        Map<String, String> spec = new HashMap<>();
+        spec.put("test/foo.tt", "forbidden");
+        spec.put("*", "replace");
+
+        final CodestartProcessor processor = new CodestartProcessor(
+                MessageWriter.info(),
+                "a",
+                Paths.get("test"),
+                CodestartProcessor.buildStrategies(spec),
+                Collections.emptyMap());
+
+        assertThat(processor.getSelectedDefaultStrategy()).isEqualTo(CodestartFileStrategyHandler.BY_NAME.get("replace"));
+        assertThat(processor.getStrategy("test/foo.tt")).hasValue(CodestartFileStrategyHandler.BY_NAME.get("forbidden"));
+    }
+
+    @Test
+    void checkDefaultStrategy() {
+        Map<String, String> spec = new HashMap<>();
+        spec.put("test/foo.tt", "forbidden");
+
+        final CodestartProcessor processor = new CodestartProcessor(
+                MessageWriter.info(),
+                "a",
+                Paths.get("test"),
+                CodestartProcessor.buildStrategies(spec),
+                Collections.emptyMap());
+
+        assertThat(processor.getSelectedDefaultStrategy())
+                .isEqualTo(CodestartFileStrategyHandler.BY_NAME.get("fail-on-duplicate"));
+        assertThat(processor.getStrategy("test/foo.tt")).hasValue(CodestartFileStrategyHandler.BY_NAME.get("forbidden"));
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyTest.java
new file mode 100644
index 0000000000000..d92d0c2e58e90
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/CodestartFileStrategyTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.junit.jupiter.api.Test;
+
+class CodestartFileStrategyTest {
+
+    @Test
+    void testFilterStart() {
+        final CodestartFileStrategy strategy = new CodestartFileStrategy("*.txt", mock(CodestartFileStrategyHandler.class));
+        assertThat(strategy.test("myfile.txt")).isTrue();
+        assertThat(strategy.test(null)).isFalse();
+        assertThat(strategy.test("foo/bar/myfile.txt")).isTrue();
+        assertThat(strategy.test(".txt")).isTrue();
+        assertThat(strategy.test("foo/bar/myfile.zip")).isFalse();
+        assertThat(strategy.test("")).isFalse();
+    }
+
+    @Test
+    void testFilterEnd() {
+        final CodestartFileStrategy strategy = new CodestartFileStrategy("/foo/bar/*",
+                mock(CodestartFileStrategyHandler.class));
+        assertThat(strategy.test("/foo/bar/myfile.txt")).isTrue();
+        assertThat(strategy.test("/foo/bar/baz/anoter_file")).isTrue();
+        assertThat(strategy.test(null)).isFalse();
+        assertThat(strategy.test("foo/bar/myfile.txt")).isFalse();
+        assertThat(strategy.test("something")).isFalse();
+        assertThat(strategy.test("")).isFalse();
+    }
+
+    @Test
+    void testFilter() {
+        final CodestartFileStrategy strategy = new CodestartFileStrategy("/foo/bar/myfile.txt",
+                mock(CodestartFileStrategyHandler.class));
+        assertThat(strategy.test("/foo/bar/myfile.txt")).isTrue();
+        assertThat(strategy.test("/foo/bar/myfile.tx")).isFalse();
+        assertThat(strategy.test(null)).isFalse();
+        assertThat(strategy.test("foo/bar/myfile.txt")).isFalse();
+        assertThat(strategy.test("something")).isFalse();
+        assertThat(strategy.test("")).isFalse();
+    }
+}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java
new file mode 100644
index 0000000000000..d637e00e7175f
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandlerTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import org.junit.jupiter.api.Test;
+
+class SmartConfigMergeCodestartFileStrategyHandlerTest {
+    @Test
+    void testFlatten() {
+
+        final HashMap<String, Object> cc = new HashMap<>();
+        cc.put("c-c-a", 1);
+        cc.put("c-c-b", 2);
+
+        final HashMap<String, Object> c = new HashMap<>();
+        c.put("c-a", "1");
+        c.put("c-b", "2");
+        c.put("c-c", cc);
+
+        final HashMap<String, Object> config = new HashMap<>();
+        config.put("a", "1");
+        config.put("b", "2");
+        config.put("c", c);
+
+        final HashMap<String, String> flat = new HashMap<>();
+        SmartConfigMergeCodestartFileStrategyHandler.flatten("", flat, config);
+
+        assertThat(flat).containsEntry("a", "1");
+        assertThat(flat).containsEntry("b", "2");
+        assertThat(flat).containsEntry("c.c-a", "1");
+        assertThat(flat).containsEntry("c.c-b", "2");
+        assertThat(flat).containsEntry("c.c-c.c-c-a", "1");
+        assertThat(flat).containsEntry("c.c-c.c-c-b", "2");
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java
new file mode 100644
index 0000000000000..5af617e2e7a55
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/core/strategy/SmartPackageFileStrategyHandlerTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.devtools.codestarts.core.strategy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class SmartPackageFileStrategyHandlerTest {
+
+    @Test
+    void testRefactorJava() {
+        assertThat(SmartPackageFileStrategyHandler.refactorPackage(
+                "package org.acme.qute;\n\nimport org.acme.qute.Something\nimport javax.ws.rs.core.MediaType\n",
+                "my.java.app")).isEqualTo(
+                        "package my.java.app.qute;\n\nimport my.java.app.qute.Something\nimport javax.ws.rs.core.MediaType\n");
+    }
+
+    @Test
+    void testRefactorKotlin() {
+        assertThat(SmartPackageFileStrategyHandler.refactorPackage(
+                "package org.acme.qute\n\nimport org.acme.qute.Something\nimport javax.ws.rs.core.MediaType\n",
+                "my.kotlin.app")).isEqualTo(
+                        "package my.kotlin.app.qute\n\nimport my.kotlin.app.qute.Something\nimport javax.ws.rs.core.MediaType\n");
+    }
+
+    @Test
+    void testRefactorScala() {
+        assertThat(SmartPackageFileStrategyHandler.refactorPackage(
+                "package org.acme.qute\n\nimport org.acme.qute.Something\nimport org.acme.qute.\\{GET, Path, Produces}\nimport javax.ws.rs.core.MediaType\n",
+                "my.scala.app")).isEqualTo(
+                        "package my.scala.app.qute\n\nimport my.scala.app.qute.Something\nimport my.scala.app.qute.\\{GET, Path, Produces}\nimport javax.ws.rs.core.MediaType\n");
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java
new file mode 100644
index 0000000000000..f970487572e3a
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/java/io/quarkus/devtools/codestarts/utils/NestedMapsTest.java
@@ -0,0 +1,115 @@
+package io.quarkus.devtools.codestarts.utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+
+class NestedMapsTest {
+
+    private static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory());
+    private static final Map<String, Object> NESTED_MAP_1 = readTestYamlMap("/nested-map-1.yml");
+    private static final Map<String, Object> NESTED_MAP_2 = readTestYamlMap("/nested-map-2.yml");
+
+    @Test
+    void testGetValue() {
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "foo.baz")).hasValue("baz");
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "foo.foo")).hasValue("bar");
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "foo.bar.baz")).isEmpty();
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "baa")).isEmpty();
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "foo.bar.foo")).hasValue("bar");
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "foo.bar.bar")).hasValue("foo");
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "bar.foo.bar.foo")).hasValue("baz");
+        assertThat((Collection) NestedMaps.getValue(NESTED_MAP_1, "list").get()).containsExactly("foo", "bar");
+        assertThat(NestedMaps.getValue(NESTED_MAP_1, "bar.foo.bar")).hasValueSatisfying(v -> {
+            assertThat(v).isInstanceOf(Map.class);
+            assertThat((Map) v).hasFieldOrPropertyWithValue("foo", "baz");
+        });
+    }
+
+    @Test
+    void testDeepMerge() {
+        final HashMap<String, Object> target = new HashMap<>();
+
+        NestedMaps.deepMerge(target, NESTED_MAP_1);
+        NestedMaps.deepMerge(target, NESTED_MAP_2);
+
+        checkTargetMap(target);
+    }
+
+    @Test
+    void testDeepMergeStream() {
+        final Map<String, Object> target = NestedMaps.deepMerge(Stream.of(NESTED_MAP_1, NESTED_MAP_2));
+
+        checkTargetMap(target);
+    }
+
+    private void checkTargetMap(Map<String, Object> target) {
+        assertThat(NestedMaps.getValue(target, "foo.baz")).hasValue("baz");
+        assertThat(NestedMaps.getValue(target, "foo.foo")).hasValue("bar");
+        assertThat(NestedMaps.getValue(target, "foo.bar")).hasValue("foo");
+        assertThat(NestedMaps.getValue(target, "foo.bar.baz")).isEmpty();
+        assertThat(NestedMaps.getValue(target, "baz")).hasValue("bar");
+
+        assertThat(NestedMaps.getValue(target, "bar.foo.bar.foo")).hasValue("bar");
+        assertThat(NestedMaps.getValue(target, "bar.foo.bar.baz")).hasValue("foo");
+        assertThat(NestedMaps.getValue(target, "hello")).hasValue("world");
+        assertThat((Collection) NestedMaps.getValue(target, "list").get()).containsExactly("foo", "bar", "baz");
+    }
+
+    @Test
+    void testUnflatten() {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put("foo.baz", "baz");
+        data.put("foo.foo", "bar");
+        data.put("foo.bar", "foo");
+        data.put("baz", "bar");
+        data.put("bar.foo.bar.foo", "bar");
+        data.put("bar.foo.bar.baz", "foo");
+        data.put("hello", "world");
+        data.put("list", Arrays.asList("foo", "bar", "baz"));
+        final Map<String, Object> target = NestedMaps.unflatten(data);
+
+        checkTargetMap(target);
+    }
+
+    @Test
+    void testUnflattenConflict() {
+        final Map<String, Object> data = new LinkedHashMap<>();
+        data.put("foo.baz", "baz");
+        data.put("foo", "bar");
+
+        assertThatIllegalStateException()
+                .isThrownBy(() -> NestedMaps.unflatten(data))
+                .withMessage("Conflicting data types for key 'foo'");
+    }
+
+    @Test
+    void testUnflattenConflict2() {
+        final Map<String, Object> data = new LinkedHashMap<>();
+        data.put("foo", "bar");
+        data.put("foo.baz", "baz");
+
+        assertThatIllegalStateException()
+                .isThrownBy(() -> NestedMaps.unflatten(data))
+                .withMessage("Conflicting data types for key 'foo.baz'");
+    }
+
+    private static Map<String, Object> readTestYamlMap(String name) {
+        try {
+            return YAML_MAPPER.readerFor(Map.class).readValue(NestedMapsTest.class.getResourceAsStream(name));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+}
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestart-spec1.yml b/independent-projects/tools/codestarts/src/test/resources/codestart-spec1.yml
new file mode 100644
index 0000000000000..46d77bad464cd
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestart-spec1.yml
@@ -0,0 +1,22 @@
+---
+name: foo-project
+type: project
+ref: foo
+fallback: true
+preselected: true
+output-strategy:
+  "foo/bar": strategy
+language:
+  base:
+    shared-data:
+      foo-shared: bar
+      project:
+        group-id: org.acme
+        artifact-id: foo-project
+  java:
+    data:
+      foo: bar
+    dependencies:
+      - group:artifact
+    test-dependencies:
+      - grouptest:artifacttest:versiontest
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestart-specdefault.yml b/independent-projects/tools/codestarts/src/test/resources/codestart-specdefault.yml
new file mode 100644
index 0000000000000..73b0157c4e78e
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestart-specdefault.yml
@@ -0,0 +1,2 @@
+---
+name: specdefault
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-1/codestart-1/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-1/codestart-1/codestart.yml
new file mode 100644
index 0000000000000..f8709e335b052
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-1/codestart-1/codestart.yml
@@ -0,0 +1 @@
+no-name: nonono
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-2/codestart-2/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-2/codestart-2/codestart.yml
new file mode 100644
index 0000000000000..44140b300a192
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-2/codestart-2/codestart.yml
@@ -0,0 +1,2 @@
+name: namename
+type: wrong-type
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-3/codestart-3/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-3/codestart-3/codestart.yml
new file mode 100644
index 0000000000000..d2dbdd5e246d9
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts-with-error-3/codestart-3/codestart.yml
@@ -0,0 +1,2 @@
+name: namenamename
+fallback: not-bool
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/..gitignore b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/..gitignore
new file mode 100644
index 0000000000000..617a787103d8c
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/..gitignore
@@ -0,0 +1,2 @@
+base-ignore1
+base-ignore2
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/README.tpl.qute.md b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..e7e592ef0a2ef
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/README.tpl.qute.md
@@ -0,0 +1 @@
+Base readme {buildtool.foo}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/src/main/resources/application.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/base/src/main/resources/application.yml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/codestart.yml
new file mode 100644
index 0000000000000..046af2d42e39b
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-fallback-project/bar-project/codestart.yml
@@ -0,0 +1,3 @@
+name: bar
+type: project
+fallback: true
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-file/tooling-tt/base/.tooling-t.tpl.qute b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-file/tooling-tt/base/.tooling-t.tpl.qute
new file mode 100644
index 0000000000000..2114c2f755763
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-file/tooling-tt/base/.tooling-t.tpl.qute
@@ -0,0 +1 @@
+tooling-tt
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-file/tooling-tt/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-file/tooling-tt/codestart.yml
new file mode 100644
index 0000000000000..b763b3a3187c7
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/conflicting-file/tooling-tt/codestart.yml
@@ -0,0 +1,3 @@
+name: tt
+type: tooling
+preselected: true
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/a/pom.tpl.qute.xml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/a/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..f08d077a00d09
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/a/pom.tpl.qute.xml
@@ -0,0 +1,13 @@
+<project>
+    <properties>
+        <prop1>{prop1}</prop1>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.a</groupId>
+            <artifactId>a</artifactId>
+            <version>0.1</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/b/pom.tpl.qute.xml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/b/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..fcc7ebafe9de5
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/b/pom.tpl.qute.xml
@@ -0,0 +1,14 @@
+<project>
+    <properties>
+        <prop1>{prop1}</prop1>
+        <prop2>{prop2}</prop2>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.b</groupId>
+            <artifactId>b</artifactId>
+            <version>0.1</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/base/pom.tpl.qute.xml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/base/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..2c7733f43b92e
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/base/pom.tpl.qute.xml
@@ -0,0 +1,12 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>{project.group-id2}</groupId>
+    <artifactId>{project.artifact-id}</artifactId>
+    <version>{project.version}</version>
+    <properties>
+        <abc>123</abc>
+        <fruit>pineapple</fruit>
+        <zebra>starts-with-z</zebra>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/codestart.yml
new file mode 100644
index 0000000000000..2c161c2a60ee2
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-maven/codestart.yml
@@ -0,0 +1,13 @@
+name: maven
+type: buildtool
+language:
+  base:
+    data:
+      prop1: proppp
+      prop2: proppp2
+    shared-data:
+      project:
+        group-id2: org.toto
+        artifact-id: andy
+      buildtool:
+        foo: world maven
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/a/ybuild.tpl.qute.build b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/a/ybuild.tpl.qute.build
new file mode 100644
index 0000000000000..126fc42f648b7
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/a/ybuild.tpl.qute.build
@@ -0,0 +1,10 @@
+{#include ybuild-layout}
+{#foo}
+fooa
+{/foo}
+{#bar}
+bara
+{/bar}
+{/include}
+
+append {test}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/b/ybuild.tpl.qute.build b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/b/ybuild.tpl.qute.build
new file mode 100644
index 0000000000000..9ee5b5dd37e5b
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/b/ybuild.tpl.qute.build
@@ -0,0 +1,7 @@
+prepend
+
+{#include ybuild-layout}
+{#foo}
+foob
+{/foo}
+{/include}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/base/config.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/base/config.yml
new file mode 100644
index 0000000000000..56d108a001731
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/base/config.yml
@@ -0,0 +1,2 @@
+foo:
+  bar: bar
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/base/ybuild-layout.include.qute b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/base/ybuild-layout.include.qute
new file mode 100644
index 0000000000000..6443fefb1486f
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/base/ybuild-layout.include.qute
@@ -0,0 +1,7 @@
+{#insert foo}
+foo
+{/}
+
+{#insert bar}
+bar
+{/}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/codestart.yml
new file mode 100644
index 0000000000000..821cc24a4dbcf
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/buildtool-y/codestart.yml
@@ -0,0 +1,13 @@
+name: y
+type: buildtool
+fallback: true
+language:
+  base:
+    data:
+      test: test
+    shared-data:
+      buildtool:
+        foo: world y
+  b:
+    data:
+      test: b
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/config-properties/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/config-properties/codestart.yml
new file mode 100644
index 0000000000000..be1598706f732
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/config-properties/codestart.yml
@@ -0,0 +1,8 @@
+name: config-properties
+type: config
+fallback: true
+language:
+  base:
+    shared-data:
+      config:
+        file-name: application.properties
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/config-yaml/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/config-yaml/codestart.yml
new file mode 100644
index 0000000000000..81a6305eeef41
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/config-yaml/codestart.yml
@@ -0,0 +1,7 @@
+name: config-yaml
+type: config
+language:
+  base:
+    shared-data:
+      config:
+        file-name: application.yml
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/b/example-code b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/b/example-code
new file mode 100644
index 0000000000000..09735013574a1
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/b/example-code
@@ -0,0 +1 @@
+example-code
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/config.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/config.yml
new file mode 100644
index 0000000000000..dc77f555ee0de
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/config.yml
@@ -0,0 +1 @@
+example: code
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test
new file mode 100644
index 0000000000000..69cb50e85de08
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/b/{my-dir-name}/{my-file-name}.tpl.qute.test
@@ -0,0 +1 @@
+hello {my-file-name}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/codestart.yml
new file mode 100644
index 0000000000000..61f250a93c056
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/example-with-b/codestart.yml
@@ -0,0 +1,8 @@
+name: example-with-b
+type: code
+tags: example
+language:
+  base:
+    data:
+      my-dir-name: my-dynamic-dir/so-cool
+      my-file-name: my-dynamic-file
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/..gitignore b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/..gitignore
new file mode 100644
index 0000000000000..617a787103d8c
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/..gitignore
@@ -0,0 +1,2 @@
+base-ignore1
+base-ignore2
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/README.tpl.qute.md b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..e7e592ef0a2ef
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/README.tpl.qute.md
@@ -0,0 +1 @@
+Base readme {buildtool.foo}
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/config.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/base/config.yml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/codestart.yml
new file mode 100644
index 0000000000000..6c93dece2b673
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/foo-project/codestart.yml
@@ -0,0 +1,18 @@
+name: foo
+type: project
+fallback: true
+output-strategy:
+  "pom.xml": smart-pom-merge
+  "README.md": append
+  "readme.md": forbidden
+  ".gitignore": append
+  "config.yml": smart-config-merge
+  "config.properties": forbidden
+  "*": fail-on-duplicate
+language:
+  base:
+    shared-data:
+      foo-shared: bar
+      project:
+        group-id: org.acme
+        artifact-id: quarkus-project
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/language-a/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/language-a/codestart.yml
new file mode 100644
index 0000000000000..9f619b7dbb38a
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/language-a/codestart.yml
@@ -0,0 +1,3 @@
+name: a
+type: language
+fallback: true
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/language-b/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/language-b/codestart.yml
new file mode 100644
index 0000000000000..787bbdadaff59
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/language-b/codestart.yml
@@ -0,0 +1,2 @@
+name: b
+type: language
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/replace-project/base/to-replace.txt b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/replace-project/base/to-replace.txt
new file mode 100644
index 0000000000000..e3f094ee6378d
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/replace-project/base/to-replace.txt
@@ -0,0 +1 @@
+project
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/replace-project/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/replace-project/codestart.yml
new file mode 100644
index 0000000000000..37b2368b457ff
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/replace-project/codestart.yml
@@ -0,0 +1,5 @@
+name: replace
+type: project
+output-strategy:
+  "*": replace
+
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/a/a/.tooling-t b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/a/a/.tooling-t
new file mode 100644
index 0000000000000..0e7c74fbde636
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/a/a/.tooling-t
@@ -0,0 +1 @@
+a/.tooling-t
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/a/config.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/a/config.yml
new file mode 100644
index 0000000000000..07e63c29e75ae
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/a/config.yml
@@ -0,0 +1,3 @@
+foo:
+  bar: baz
+  foo: bar
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/base/.tooling-t b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/base/.tooling-t
new file mode 100644
index 0000000000000..f9d7114d80597
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/base/.tooling-t
@@ -0,0 +1 @@
+.tooling-t
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/codestart.yml
new file mode 100644
index 0000000000000..1b8dcb447f88c
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/core/tooling-t/codestart.yml
@@ -0,0 +1,3 @@
+name: t
+type: tooling
+preselected: true
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example-forbidden/base/README.adoc b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example-forbidden/base/README.adoc
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example-forbidden/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example-forbidden/codestart.yml
new file mode 100644
index 0000000000000..1097a20ef75eb
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example-forbidden/codestart.yml
@@ -0,0 +1,2 @@
+name: example-forbidden
+tags: example
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example1/a/.gitkeep b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example1/a/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example1/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example1/codestart.yml
new file mode 100644
index 0000000000000..c20c21d195271
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example1/codestart.yml
@@ -0,0 +1,2 @@
+name: example1
+tags: example
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example2/b/.gitkeep b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example2/b/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example2/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example2/codestart.yml
new file mode 100644
index 0000000000000..72258a113003f
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/examples/example2/codestart.yml
@@ -0,0 +1,2 @@
+name: example2
+tags: example
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/static-conflicting-file/tooling-tt/base/.tooling-t b/independent-projects/tools/codestarts/src/test/resources/codestarts/static-conflicting-file/tooling-tt/base/.tooling-t
new file mode 100644
index 0000000000000..2114c2f755763
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/static-conflicting-file/tooling-tt/base/.tooling-t
@@ -0,0 +1 @@
+tooling-tt
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/codestarts/static-conflicting-file/tooling-tt/codestart.yml b/independent-projects/tools/codestarts/src/test/resources/codestarts/static-conflicting-file/tooling-tt/codestart.yml
new file mode 100644
index 0000000000000..b763b3a3187c7
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/codestarts/static-conflicting-file/tooling-tt/codestart.yml
@@ -0,0 +1,3 @@
+name: tt
+type: tooling
+preselected: true
\ No newline at end of file
diff --git a/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml b/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml
new file mode 100644
index 0000000000000..77caeee071c27
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/expected-pom-maven-merge.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.toto</groupId>
+  <artifactId>quarkus-project</artifactId>
+  <version>1.2.3</version>
+  <properties>
+    <abc>123</abc>
+    <fruit>pineapple</fruit>
+    <prop1>proppp</prop1>
+    <prop2>prop-2-namespaced</prop2>
+    <zebra>starts-with-z</zebra>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>io.b</groupId>
+      <artifactId>b</artifactId>
+      <version>0.1</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/independent-projects/tools/codestarts/src/test/resources/nested-map-1.yml b/independent-projects/tools/codestarts/src/test/resources/nested-map-1.yml
new file mode 100644
index 0000000000000..7e73e29f876f2
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/nested-map-1.yml
@@ -0,0 +1,15 @@
+---
+foo:
+  baz: baz
+  foo: bar
+  bar:
+    foo: bar
+    bar: foo
+baz: baz
+bar:
+  foo:
+    bar:
+      foo: baz
+list:
+  - foo
+  - bar
diff --git a/independent-projects/tools/codestarts/src/test/resources/nested-map-2.yml b/independent-projects/tools/codestarts/src/test/resources/nested-map-2.yml
new file mode 100644
index 0000000000000..5e00644f49c21
--- /dev/null
+++ b/independent-projects/tools/codestarts/src/test/resources/nested-map-2.yml
@@ -0,0 +1,13 @@
+---
+foo:
+  bar: foo
+baz: bar
+bar:
+  foo:
+    bar:
+      foo: bar
+      baz: foo
+hello:
+  world
+list:
+  - baz
diff --git a/independent-projects/tools/devtools-common/pom.xml b/independent-projects/tools/devtools-common/pom.xml
index 45b21dcf05540..9d5270200d4b9 100644
--- a/independent-projects/tools/devtools-common/pom.xml
+++ b/independent-projects/tools/devtools-common/pom.xml
@@ -28,7 +28,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
+            <artifactId>quarkus-devtools-registry-client</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -36,12 +36,33 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-api</artifactId>
+            <artifactId>quarkus-devtools-codestarts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus.qute</groupId>
+            <artifactId>qute-generator</artifactId>
+        </dependency>
+        <!-- user prompt -->
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>maven-model-helper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
@@ -106,12 +127,6 @@
             <groupId>jakarta.websocket</groupId>
             <artifactId>jakarta.websocket-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.immutables</groupId>
-            <artifactId>value</artifactId>
-            <version>2.8.8</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -127,10 +142,5 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- extensions reader -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusPlatformCodestartResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusPlatformCodestartResourceLoader.java
new file mode 100644
index 0000000000000..7753ff673ebd1
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/QuarkusPlatformCodestartResourceLoader.java
@@ -0,0 +1,21 @@
+package io.quarkus.devtools.codestarts;
+
+import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
+import java.io.IOException;
+
+public final class QuarkusPlatformCodestartResourceLoader implements CodestartPathLoader {
+    private ResourceLoader resourceLoader;
+
+    private QuarkusPlatformCodestartResourceLoader(ResourceLoader resourceLoader) {
+        this.resourceLoader = resourceLoader;
+    }
+
+    public static CodestartPathLoader platformPathLoader(ResourceLoader resourceLoader) {
+        return new QuarkusPlatformCodestartResourceLoader(resourceLoader);
+    }
+
+    @Override
+    public <T> T loadResourceAsPath(String name, PathConsumer<T> consumer) throws IOException {
+        return resourceLoader.loadResourceAsPath(name, consumer::consume);
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java
new file mode 100644
index 0000000000000..e1d0e2e4bad54
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java
@@ -0,0 +1,108 @@
+package io.quarkus.devtools.codestarts.extension;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartCatalogLoader;
+import io.quarkus.devtools.codestarts.CodestartPathLoader;
+import io.quarkus.devtools.codestarts.DataKey;
+import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import io.quarkus.platform.descriptor.loader.json.ClassPathResourceLoader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public final class QuarkusExtensionCodestartCatalog extends GenericCodestartCatalog<QuarkusExtensionCodestartProjectInput> {
+
+    public static final String QUARKUS_EXTENSION_CODESTARTS_DIR = "codestarts/quarkus-extension";
+
+    private static final ClassPathCodestartPathLoader LOADER = new ClassPathCodestartPathLoader();
+
+    private QuarkusExtensionCodestartCatalog(Collection<Codestart> codestarts) {
+        super(codestarts);
+    }
+
+    public enum QuarkusExtensionData implements DataKey {
+        NAMESPACE_ID("namespace.id"),
+        NAMESPACE_NAME("namespace.name"),
+        EXTENSION_ID("extension.id"),
+        EXTENSION_NAME("extension.name"),
+        GROUP_ID("group-id"),
+        VERSION("version"),
+        PACKAGE_NAME("package-name"),
+        CLASS_NAME_BASE("class-name-base"),
+        MAVEN_SUREFIRE_PLUGIN_VERSION("maven.surefire-plugin.version"),
+        QUARKUS_VERSION("quarkus.version"),
+        QUARKUS_BOM_GROUP_ID("quarkus.bom.group-id"),
+        QUARKUS_BOM_ARTIFACT_ID("quarkus.bom.artifact-id"),
+        QUARKUS_BOM_VERSION("quarkus.bom.version"),
+        PARENT_GROUP_ID("parent.group-id"),
+        PARENT_ARTIFACT_ID("parent.artifact-id"),
+        PARENT_VERSION("parent.version"),
+        PARENT_RELATIVE_PATH("parent.relative-path"),
+        IT_PARENT_GROUP_ID("it-parent.group-id"),
+        IT_PARENT_ARTIFACT_ID("it-parent.artifact-id"),
+        IT_PARENT_VERSION("it-parent.version"),
+        IT_PARENT_RELATIVE_PATH("it-parent.relative-path"),
+        MAVEN_COMPILER_PLUGIN_VERSION("maven.compiler-plugin-version");
+
+        private final String key;
+
+        QuarkusExtensionData(String key) {
+            this.key = key;
+        }
+
+        @Override
+        public String key() {
+            return key;
+        }
+    }
+
+    public enum Code implements DataKey {
+        EXTENSION_BASE,
+        QUARKIVERSE,
+        DEVMODE_TEST,
+        INTEGRATION_TESTS,
+        UNIT_TEST
+    }
+
+    public enum Tooling implements DataKey {
+        GIT
+    }
+
+    public static QuarkusExtensionCodestartCatalog fromBundledResources()
+            throws IOException {
+        final Collection<Codestart> codestarts = CodestartCatalogLoader.loadCodestarts(LOADER,
+                QUARKUS_EXTENSION_CODESTARTS_DIR);
+        return new QuarkusExtensionCodestartCatalog(codestarts);
+    }
+
+    @Override
+    protected Collection<Codestart> select(QuarkusExtensionCodestartProjectInput projectInput) {
+        projectInput.getSelection().addNames(getCodestarts(projectInput));
+        return super.select(projectInput);
+    }
+
+    private List<String> getCodestarts(QuarkusExtensionCodestartProjectInput projectInput) {
+        final List<String> codestarts = new ArrayList<>();
+        codestarts.add(Code.EXTENSION_BASE.key());
+        if (!projectInput.withoutDevModeTest()) {
+            codestarts.add(Code.DEVMODE_TEST.key());
+        }
+        if (!projectInput.withoutIntegrationTests()) {
+            codestarts.add(Code.INTEGRATION_TESTS.key());
+        }
+        if (!projectInput.withoutUnitTest()) {
+            codestarts.add(Code.UNIT_TEST.key());
+        }
+        return codestarts;
+    }
+
+    private static final class ClassPathCodestartPathLoader implements CodestartPathLoader {
+        private final ClassPathResourceLoader resourceLoader = new ClassPathResourceLoader();
+
+        @Override
+        public <T> T loadResourceAsPath(String name, PathConsumer<T> consumer) throws IOException {
+            return resourceLoader.loadResourceAsPath(name, consumer::consume);
+        }
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInput.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInput.java
new file mode 100644
index 0000000000000..97e1c220abc31
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInput.java
@@ -0,0 +1,32 @@
+package io.quarkus.devtools.codestarts.extension;
+
+import io.quarkus.devtools.codestarts.CodestartProjectInput;
+
+public final class QuarkusExtensionCodestartProjectInput extends CodestartProjectInput {
+    private final boolean withoutIntegrationTests;
+    private final boolean withoutUnitTest;
+    private final boolean withoutDevModeTest;
+
+    public QuarkusExtensionCodestartProjectInput(QuarkusExtensionCodestartProjectInputBuilder builder) {
+        super(builder);
+        this.withoutIntegrationTests = builder.withoutIntegrationTests;
+        this.withoutUnitTest = builder.withoutUnitTest;
+        this.withoutDevModeTest = builder.withoutDevModeTest;
+    }
+
+    public static QuarkusExtensionCodestartProjectInputBuilder builder() {
+        return new QuarkusExtensionCodestartProjectInputBuilder();
+    }
+
+    public boolean withoutIntegrationTests() {
+        return withoutIntegrationTests;
+    }
+
+    public boolean withoutUnitTest() {
+        return withoutUnitTest;
+    }
+
+    public boolean withoutDevModeTest() {
+        return withoutDevModeTest;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java
new file mode 100644
index 0000000000000..1963a3ec048ca
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartProjectInputBuilder.java
@@ -0,0 +1,66 @@
+package io.quarkus.devtools.codestarts.extension;
+
+import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder;
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import java.util.Collection;
+import java.util.Map;
+
+public class QuarkusExtensionCodestartProjectInputBuilder extends CodestartProjectInputBuilder {
+    boolean withoutIntegrationTests;
+    boolean withoutUnitTest;
+    boolean withoutDevModeTest;
+
+    QuarkusExtensionCodestartProjectInputBuilder() {
+        super();
+    }
+
+    public QuarkusExtensionCodestartProjectInputBuilder withoutIntegrationTests(boolean withoutIntegrationTest) {
+        this.withoutIntegrationTests = withoutIntegrationTest;
+        return this;
+    }
+
+    public QuarkusExtensionCodestartProjectInputBuilder withoutUnitTest(boolean withoutUnitTest) {
+        this.withoutUnitTest = withoutUnitTest;
+        return this;
+    }
+
+    public QuarkusExtensionCodestartProjectInputBuilder withoutDevModeTest(boolean withoutDevModeTest) {
+        this.withoutDevModeTest = withoutDevModeTest;
+        return this;
+    }
+
+    @Override
+    public QuarkusExtensionCodestartProjectInputBuilder addCodestarts(Collection<String> codestarts) {
+        super.addCodestarts(codestarts);
+        return this;
+    }
+
+    @Override
+    public QuarkusExtensionCodestartProjectInputBuilder addCodestart(String codestart) {
+        super.addCodestart(codestart);
+        return this;
+    }
+
+    @Override
+    public QuarkusExtensionCodestartProjectInputBuilder addData(Map<String, Object> data) {
+        super.addData(data);
+        return this;
+    }
+
+    public QuarkusExtensionCodestartProjectInputBuilder putData(QuarkusExtensionData dataKey, Object value) {
+        super.putData(dataKey, value);
+        return this;
+    }
+
+    @Override
+    public QuarkusExtensionCodestartProjectInputBuilder messageWriter(MessageWriter messageWriter) {
+        super.messageWriter(messageWriter);
+        return this;
+    }
+
+    public QuarkusExtensionCodestartProjectInput build() {
+        return new QuarkusExtensionCodestartProjectInput(this);
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java
new file mode 100644
index 0000000000000..29e91350b5a50
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java
@@ -0,0 +1,82 @@
+package io.quarkus.devtools.codestarts.jbang;
+
+import static io.quarkus.devtools.codestarts.QuarkusPlatformCodestartResourceLoader.platformPathLoader;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartCatalogLoader;
+import io.quarkus.devtools.codestarts.CodestartPathLoader;
+import io.quarkus.devtools.codestarts.DataKey;
+import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public final class QuarkusJBangCodestartCatalog extends GenericCodestartCatalog<QuarkusJBangCodestartProjectInput> {
+
+    public static final String QUARKUS_JBANG_CODESTARTS_DIR = "codestarts/quarkus-jbang";
+
+    public enum JBangDataKey implements DataKey {
+        QUARKUS_BOM_GROUP_ID("quarkus.bom.group-id"),
+        QUARKUS_BOM_ARTIFACT_ID("quarkus.bom.artifact-id"),
+        QUARKUS_BOM_VERSION("quarkus.bom.version");
+
+        private final String key;
+
+        JBangDataKey(String key) {
+            this.key = key;
+        }
+
+        @Override
+        public String key() {
+            return key;
+        }
+    }
+
+    public enum ExampleCodestart implements DataKey {
+        PICOCLI,
+        RESTEASY
+    }
+
+    public enum ToolingCodestart implements DataKey {
+        JBANG_WRAPPER
+    }
+
+    private QuarkusJBangCodestartCatalog(Collection<Codestart> codestarts) {
+        super(codestarts);
+    }
+
+    public static QuarkusJBangCodestartCatalog fromResourceLoader(ResourceLoader resourceLoader)
+            throws IOException {
+        final CodestartPathLoader pathLoader = platformPathLoader(resourceLoader);
+        final Collection<Codestart> codestarts = CodestartCatalogLoader.loadCodestarts(pathLoader,
+                QUARKUS_JBANG_CODESTARTS_DIR);
+        return new QuarkusJBangCodestartCatalog(codestarts);
+    }
+
+    @Override
+    protected Collection<Codestart> select(QuarkusJBangCodestartProjectInput projectInput) {
+
+        if (projectInput.getSelection().getNames().isEmpty()) {
+            if (projectInput.getDependencies().stream().anyMatch(s -> s.contains("picocli"))) {
+                projectInput.getSelection().addName(ExampleCodestart.PICOCLI.key());
+            } else {
+                projectInput.getSelection().addName(ExampleCodestart.RESTEASY.key());
+            }
+        }
+
+        // Add codestarts from extension and for tooling
+        projectInput.getSelection().addNames(getToolingCodestarts(projectInput));
+
+        return super.select(projectInput);
+    }
+
+    private List<String> getToolingCodestarts(QuarkusJBangCodestartProjectInput projectInput) {
+        final List<String> codestarts = new ArrayList<>();
+        if (!projectInput.noJBangWrapper()) {
+            codestarts.add(ToolingCodestart.JBANG_WRAPPER.key());
+        }
+        return codestarts;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java
new file mode 100644
index 0000000000000..07579f55d0eb8
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInput.java
@@ -0,0 +1,29 @@
+package io.quarkus.devtools.codestarts.jbang;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.codestarts.CodestartProjectInput;
+import java.util.Collection;
+
+public final class QuarkusJBangCodestartProjectInput extends CodestartProjectInput {
+    private final Collection<AppArtifactCoords> extensions;
+    private final boolean noJBangWrapper;
+
+    public QuarkusJBangCodestartProjectInput(QuarkusJBangCodestartProjectInputBuilder builder) {
+        super(builder);
+        this.extensions = builder.extensions;
+        this.noJBangWrapper = builder.noJBangWrapper;
+    }
+
+    public static QuarkusJBangCodestartProjectInputBuilder builder() {
+        return new QuarkusJBangCodestartProjectInputBuilder();
+    }
+
+    public boolean noJBangWrapper() {
+        return noJBangWrapper;
+    }
+
+    public Collection<AppArtifactCoords> getExtensions() {
+        return extensions;
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java
new file mode 100644
index 0000000000000..62315c4da21a1
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartProjectInputBuilder.java
@@ -0,0 +1,87 @@
+package io.quarkus.devtools.codestarts.jbang;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder;
+import io.quarkus.devtools.codestarts.DataKey;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.extensions.Extensions;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class QuarkusJBangCodestartProjectInputBuilder extends CodestartProjectInputBuilder {
+    public Collection<AppArtifactCoords> extensions = new ArrayList<>();
+
+    public QuarkusJBangCodestartProjectInputBuilder setNoJBangWrapper(boolean noJBangWrapper) {
+        this.noJBangWrapper = noJBangWrapper;
+        return this;
+    }
+
+    public boolean noJBangWrapper;
+
+    QuarkusJBangCodestartProjectInputBuilder() {
+        super();
+    }
+
+    public QuarkusJBangCodestartProjectInputBuilder addExtensions(Collection<AppArtifactCoords> extensions) {
+        this.extensions.addAll(extensions);
+        super.addDependencies(extensions.stream().map(Extensions::toGAV).collect(Collectors.toList()));
+        return this;
+    }
+
+    public QuarkusJBangCodestartProjectInputBuilder addExtension(AppArtifactCoords extension) {
+        return this.addExtensions(Collections.singletonList(extension));
+    }
+
+    public QuarkusJBangCodestartProjectInputBuilder addExtension(AppArtifactKey extension) {
+        return this.addExtension(Extensions.toCoords(extension, null));
+    }
+
+    @Override
+    public QuarkusJBangCodestartProjectInputBuilder addCodestarts(Collection<String> codestarts) {
+        super.addCodestarts(codestarts);
+        return this;
+    }
+
+    @Override
+    public QuarkusJBangCodestartProjectInputBuilder addCodestart(String codestart) {
+        super.addCodestart(codestart);
+        return this;
+    }
+
+    @Override
+    public QuarkusJBangCodestartProjectInputBuilder addData(Map<String, Object> data) {
+        super.addData(data);
+        return this;
+    }
+
+    @Override
+    public QuarkusJBangCodestartProjectInputBuilder putData(String key, Object value) {
+        super.putData(key, value);
+        return this;
+    }
+
+    @Override
+    public QuarkusJBangCodestartProjectInputBuilder putData(DataKey key, Object value) {
+        super.putData(key, value);
+        return this;
+    }
+
+    @Override
+    public QuarkusJBangCodestartProjectInputBuilder messageWriter(MessageWriter messageWriter) {
+        super.messageWriter(messageWriter);
+        return this;
+    }
+
+    public boolean noJBangWrapper() {
+        return noJBangWrapper;
+    }
+
+    public QuarkusJBangCodestartProjectInput build() {
+        return new QuarkusJBangCodestartProjectInput(this);
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java
new file mode 100644
index 0000000000000..bacb7be1192b8
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java
@@ -0,0 +1,228 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import static io.quarkus.devtools.codestarts.QuarkusPlatformCodestartResourceLoader.platformPathLoader;
+import static io.quarkus.devtools.codestarts.core.CodestartCatalogs.findLanguageName;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getCodestartName;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getGuide;
+
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartCatalogLoader;
+import io.quarkus.devtools.codestarts.CodestartException;
+import io.quarkus.devtools.codestarts.CodestartPathLoader;
+import io.quarkus.devtools.codestarts.CodestartStructureException;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.codestarts.DataKey;
+import io.quarkus.devtools.codestarts.QuarkusPlatformCodestartResourceLoader;
+import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.project.extensions.Extensions;
+import io.quarkus.platform.catalog.processor.ExtensionProcessor;
+import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public final class QuarkusCodestartCatalog extends GenericCodestartCatalog<QuarkusCodestartProjectInput> {
+
+    public static final String QUARKUS_CODESTARTS_DIR = "codestarts/quarkus";
+    public static final String INPUT_SELECTED_EXTENSIONS_KEY = "selected-extensions";
+    public static final String INPUT_SELECTED_EXTENSIONS_GA_KEY = "selected-extensions-ga";
+    public static final String INPUT_SELECTED_EXAMPLES_KEY = "selected-examples";
+    private final Map<String, Extension> extensionsMapping;
+
+    public enum Tag implements DataKey {
+        EXAMPLE,
+        SINGLETON_EXAMPLE,
+        MAVEN_ONLY;
+    }
+
+    public enum Language implements DataKey {
+        JAVA,
+        KOTLIN,
+        SCALA
+    }
+
+    public enum Tooling implements DataKey {
+        GRADLE_WRAPPER,
+        MAVEN_WRAPPER,
+        DOCKERFILES
+    }
+
+    public enum Example implements DataKey {
+        RESTEASY_EXAMPLE,
+        COMMANDMODE_EXAMPLE
+    }
+
+    private QuarkusCodestartCatalog(Collection<Codestart> codestarts,
+            Map<String, Extension> extensionsMapping) {
+        super(codestarts);
+        this.extensionsMapping = extensionsMapping;
+    }
+
+    public static QuarkusCodestartCatalog fromQuarkusPlatformDescriptorAndDirectories(
+            ExtensionCatalog catalog, Collection<Path> directories)
+            throws IOException {
+        final CodestartPathLoader pathLoader = QuarkusPlatformCodestartResourceLoader
+                .platformPathLoader(QuarkusProjectHelper.getResourceLoader(catalog));
+        final Map<String, Codestart> codestarts = CodestartCatalogLoader.loadCodestarts(pathLoader, QUARKUS_CODESTARTS_DIR)
+                .stream()
+                .collect(Collectors.toMap(Codestart::getName, Function.identity()));
+        for (Path directory : directories) {
+            final Map<String, Codestart> dirCodestarts = CodestartCatalogLoader.loadCodestartsFromDir(directory).stream()
+                    .collect(Collectors.toMap(Codestart::getName, Function.identity()));
+            // On duplicates, directories override platform codestarts
+            codestarts.putAll(dirCodestarts);
+        }
+        final Map<String, Extension> extensionsMapping = buildExtensionsMapping(catalog.getExtensions());
+        return new QuarkusCodestartCatalog(codestarts.values(), extensionsMapping);
+    }
+
+    public static QuarkusCodestartCatalog fromExtensionsCatalog(ExtensionCatalog catalog, ResourceLoader resourceLoader)
+            throws IOException {
+        final CodestartPathLoader pathLoader = platformPathLoader(resourceLoader);
+        final Collection<Codestart> codestarts = CodestartCatalogLoader.loadCodestarts(pathLoader, QUARKUS_CODESTARTS_DIR);
+        final Map<String, Extension> extensionCodestartMapping = buildExtensionsMapping(catalog.getExtensions());
+        return new QuarkusCodestartCatalog(codestarts, extensionCodestartMapping);
+    }
+
+    @Override
+    protected Collection<Codestart> select(QuarkusCodestartProjectInput projectInput) {
+        // Add codestarts from extension and for tooling
+        projectInput.getSelection().addNames(getExtensionCodestarts(projectInput));
+        projectInput.getSelection().addNames(getToolingCodestarts(projectInput));
+        projectInput.getSelection().addNames(projectInput.getOverrideExamples());
+
+        // Filter out examples if noExamples
+        final List<Codestart> projectCodestarts = super.select(projectInput).stream()
+                .filter(c -> !isExample(c) || !projectInput.noExamples())
+                .filter(c -> !isExample(c) || projectInput.getOverrideExamples().isEmpty()
+                        || c.isSelected(projectInput.getOverrideExamples()))
+                .collect(Collectors.toCollection(ArrayList::new));
+
+        // include default example codestarts if none selected
+        if (!projectInput.noExamples()
+                && projectCodestarts.stream()
+                        .noneMatch(c -> isExample(c) && !c.getSpec().isPreselected())) {
+            final Codestart defaultCodestart = codestarts.stream()
+                    .filter(c -> c.isSelected(Collections.singleton(Example.RESTEASY_EXAMPLE.key())))
+                    .findFirst().orElseThrow(() -> new CodestartStructureException(
+                            Example.RESTEASY_EXAMPLE.key() + " codestart not found"));
+            final String languageName = findLanguageName(projectCodestarts);
+            if (defaultCodestart.implementsLanguage(languageName)) {
+                projectCodestarts.add(defaultCodestart);
+            } else {
+                projectInput.log().warn(
+                        defaultCodestart.getName() + " codestart will not be applied (doesn't implement language '"
+                                + languageName
+                                + "' yet)");
+            }
+        }
+
+        // check compatibility issues
+        final long examplesWithCompatIssues = projectCodestarts.stream()
+                .filter(QuarkusCodestartCatalog::isExample)
+                .filter(c -> c.containsTag(Tag.SINGLETON_EXAMPLE.key()))
+                .count();
+
+        if (examplesWithCompatIssues == 1) {
+            // remove other examples
+            projectCodestarts.removeIf(c -> isExample(c) && !c.containsTag(Tag.SINGLETON_EXAMPLE.key()));
+        } else if (examplesWithCompatIssues > 1) {
+            throw new CodestartException(
+                    "Only one extension with singleton example can be selected at a time (you can always use 'noExamples' if needed)");
+        }
+
+        projectInput.getData().putAll(generateSelectionData(projectInput, projectCodestarts));
+
+        return projectCodestarts;
+    }
+
+    private Set<String> getExtensionCodestarts(QuarkusCodestartProjectInput projectInput) {
+        return getSelectedExtensionsAsStream(projectInput)
+                .map(ExtensionProcessor::getCodestartName)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+    }
+
+    private Stream<Extension> getSelectedExtensionsAsStream(QuarkusCodestartProjectInput projectInput) {
+        return projectInput.getExtensions().stream()
+                .map(Extensions::toGA)
+                .filter(extensionsMapping::containsKey)
+                .map(extensionsMapping::get);
+    }
+
+    private List<String> getToolingCodestarts(QuarkusCodestartProjectInput projectInput) {
+        final List<String> codestarts = new ArrayList<>();
+        codestarts.add(projectInput.getBuildTool().getKey());
+        if (!projectInput.noBuildToolWrapper()) {
+            switch (projectInput.getBuildTool()) {
+                case GRADLE:
+                case GRADLE_KOTLIN_DSL:
+                    codestarts.add(QuarkusCodestartCatalog.Tooling.GRADLE_WRAPPER.key());
+                    break;
+                case MAVEN:
+                    codestarts.add(QuarkusCodestartCatalog.Tooling.MAVEN_WRAPPER.key());
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unsupported build tool wrapper: " + projectInput.getBuildTool());
+            }
+        }
+        if (!projectInput.noDockerfiles()) {
+            codestarts.add(QuarkusCodestartCatalog.Tooling.DOCKERFILES.key());
+        }
+        return codestarts;
+    }
+
+    private Map<String, Object> generateSelectionData(QuarkusCodestartProjectInput projectInput,
+            List<Codestart> projectCodestarts) {
+        Map<String, Object> data = new HashMap<>();
+        final Map<String, Object> inputData = new HashMap<>();
+        inputData.put(INPUT_SELECTED_EXAMPLES_KEY,
+                projectCodestarts.stream().filter(QuarkusCodestartCatalog::isExample).map(c -> {
+                    Map<String, Object> eData = new HashMap<>();
+                    eData.put("name", c.getName());
+                    eData.put("tags", c.getTags());
+                    eData.putAll(c.getMetadata());
+                    return eData;
+                }).collect(Collectors.toList()));
+        inputData.put(INPUT_SELECTED_EXTENSIONS_GA_KEY,
+                getSelectedExtensionsAsStream(projectInput).map(Extension::managementKey).collect(Collectors.toSet()));
+        inputData.put(INPUT_SELECTED_EXTENSIONS_KEY, getSelectedExtensionsAsStream(projectInput).map(e -> {
+            Map<String, Object> eData = new HashMap<>();
+            eData.put("name", e.getName());
+            eData.put("description", e.getDescription());
+            eData.put("guide", getGuide(e));
+            return eData;
+        }).collect(Collectors.toList()));
+        data.put("input", inputData);
+        return data;
+    }
+
+    public static boolean isExample(Codestart codestart) {
+        return codestart.getType() == CodestartType.CODE && codestart.getSpec().getTags().contains(Tag.EXAMPLE.key());
+    }
+
+    private static Map<String, Extension> buildExtensionsMapping(
+            Collection<Extension> extensions) {
+        final Map<String, Extension> map = new HashMap<>(extensions.size());
+        extensions.forEach(e -> {
+            if (getCodestartName(e) != null) {
+                map.put(e.getArtifact().getGroupId() + ":" + e.getArtifact().getArtifactId(), e);
+            }
+        });
+        return map;
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartData.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartData.java
new file mode 100644
index 0000000000000..ba6d52cbdb97a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartData.java
@@ -0,0 +1,135 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import io.quarkus.devtools.codestarts.DataKey;
+import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public final class QuarkusCodestartData {
+
+    private QuarkusCodestartData() {
+    }
+
+    public enum QuarkusDataKey implements DataKey {
+        BOM_GROUP_ID("quarkus.platform.group-id"),
+        BOM_ARTIFACT_ID("quarkus.platform.artifact-id"),
+        BOM_VERSION("quarkus.platform.version"),
+        PROJECT_GROUP_ID("project.group-id"),
+        PROJECT_ARTIFACT_ID("project.artifact-id"),
+        PROJECT_VERSION("project.version"),
+        PROJECT_PACKAGE_NAME("project.package-name"),
+        QUARKUS_MAVEN_PLUGIN_GROUP_ID("quarkus.maven-plugin.group-id"),
+        QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID("quarkus.maven-plugin.artifact-id"),
+        QUARKUS_MAVEN_PLUGIN_VERSION("quarkus.maven-plugin.version"),
+        QUARKUS_GRADLE_PLUGIN_ID("quarkus.gradle-plugin.id"),
+        QUARKUS_GRADLE_PLUGIN_VERSION("quarkus.gradle-plugin.version"),
+        QUARKUS_VERSION("quarkus.version"),
+
+        JAVA_VERSION("java.version"),
+        KOTLIN_VERSION("kotlin.version"),
+        SCALA_VERSION("scala.version"),
+        SCALA_MAVEN_PLUGIN_VERSION("scala-maven-plugin.version"),
+        MAVEN_COMPILER_PLUGIN_VERSION("maven-compiler-plugin.version"),
+        MAVEN_SUREFIRE_PLUGIN_VERSION("maven-surefire-plugin.version"),
+
+        RESTEASY_EXAMPLE_RESOURCE_PATH("resteasy-example.resource.path"),
+        RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME("resteasy-example.resource.class-name"),
+
+        RESTEASY_REACTIVE_EXAMPLE_RESOURCE_PATH("resteasy-reactive-example.resource.path"),
+        RESTEASY_REACTIVE_EXAMPLE_RESOURCE_CLASS_NAME("resteasy-reactive-example.resource.class-name"),
+
+        SPRING_WEB_EXAMPLE_RESOURCE_PATH("spring-web-example.resource.path"),
+        SPRING_WEB_EXAMPLE_RESOURCE_CLASS_NAME("spring-web-example.resource.class-name"),
+
+        COMMANDMODE_EXAMPLE_RESOURCE_CLASS_NAME("commandmode-example.main.class-name"),
+
+        NO_EXAMPLES("quarkus-project.no-examples"),
+        NO_BUILD_TOOL_WRAPPER("quarkus-project.no-build-tool-wrapper"),
+        NO_DOCKERFILES("quarkus-project.no-dockerfiles");
+
+        private final String key;
+
+        QuarkusDataKey(String key) {
+            this.key = key;
+        }
+
+        @Override
+        public String key() {
+            return key;
+        }
+    }
+
+    public enum LegacySupport implements DataKey {
+        BOM_GROUP_ID("bom_groupId"),
+        BOM_ARTIFACT_ID("bom_artifactId"),
+        BOM_VERSION("bom_version"),
+        PROJECT_GROUP_ID("project_groupId"),
+        PROJECT_ARTIFACT_ID("project_artifactId"),
+        PROJECT_VERSION("project_version"),
+        PROJECT_PACKAGE_NAME("package_name"),
+        QUARKUS_MAVEN_PLUGIN_GROUP_ID("maven_plugin_groupId"),
+        QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID("maven_plugin_artifactId"),
+        QUARKUS_MAVEN_PLUGIN_VERSION("maven_plugin_version"),
+        QUARKUS_GRADLE_PLUGIN_ID("gradle_plugin_id"),
+        QUARKUS_GRADLE_PLUGIN_VERSION("gradle_plugin_version"),
+        QUARKUS_VERSION("quarkus_version"),
+
+        JAVA_VERSION("java_target"),
+        KOTLIN_VERSION("kotlin_version"),
+        SCALA_VERSION("scala_version"),
+        SCALA_MAVEN_PLUGIN_VERSION("scala_plugin_version"),
+        MAVEN_COMPILER_PLUGIN_VERSION("compiler_plugin_version"),
+        MAVEN_SUREFIRE_PLUGIN_VERSION("surefire_plugin_version"),
+
+        RESTEASY_EXAMPLE_RESOURCE_PATH("path"),
+        RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME(QuarkusCodestartData::convertClassName),
+
+        RESTEASY_REACTIVE_EXAMPLE_RESOURCE_PATH("path"),
+        RESTEASY_REACTIVE_EXAMPLE_RESOURCE_CLASS_NAME(QuarkusCodestartData::convertClassName),
+
+        SPRING_WEB_EXAMPLE_RESOURCE_PATH("path"),
+        SPRING_WEB_EXAMPLE_RESOURCE_CLASS_NAME(QuarkusCodestartData::convertClassName);
+
+        private final String key;
+        private final Function<Map<String, Object>, Object> converter;
+
+        LegacySupport(String legacyKey) {
+            this((m) -> m.get(legacyKey));
+        }
+
+        LegacySupport(Function<Map<String, Object>, Object> converter) {
+            this.key = QuarkusDataKey.valueOf(this.name()).key();
+            this.converter = converter;
+        }
+
+        @Override
+        public String key() {
+            return key;
+        }
+
+        public static Map<String, Object> convertFromLegacy(Map<String, Object> legacy) {
+            return NestedMaps.unflatten(Stream.of(values())
+                    .map(v -> new HashMap.SimpleImmutableEntry<>(v.key(), v.converter.apply(legacy)))
+                    .filter(v -> v.getValue() != null)
+                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
+        }
+    }
+
+    // TODO remove the class_name convertion when its removed
+    private static String convertClassName(final Map<String, Object> legacyData) {
+        Optional<String> classNameValue = NestedMaps.getValue(legacyData, "class_name");
+        if (classNameValue.isPresent()) {
+            final String className = classNameValue.get();
+            int idx = classNameValue.get().lastIndexOf('.');
+            if (idx < 0) {
+                return className;
+            }
+            return className.substring(idx + 1);
+        }
+        return null;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java
new file mode 100644
index 0000000000000..a5328f993fdf6
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInput.java
@@ -0,0 +1,56 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import static java.util.Objects.requireNonNull;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.codestarts.CodestartProjectInput;
+import io.quarkus.devtools.project.BuildTool;
+import java.util.Collection;
+import java.util.Set;
+
+public final class QuarkusCodestartProjectInput extends CodestartProjectInput {
+    private final BuildTool buildTool;
+    private final Collection<AppArtifactCoords> extensions;
+    private final Set<String> overrideExamples;
+    private final boolean noExamples;
+    private final boolean noDockerfiles;
+    private final boolean noBuildToolWrapper;
+
+    public QuarkusCodestartProjectInput(QuarkusCodestartProjectInputBuilder builder) {
+        super(builder);
+        this.extensions = builder.extensions;
+        this.overrideExamples = builder.overrideExamples;
+        this.buildTool = requireNonNull(builder.buildTool, "buildTool is required");
+        this.noExamples = builder.noExamples;
+        this.noDockerfiles = builder.noDockerfiles;
+        this.noBuildToolWrapper = builder.noBuildToolWrapper;
+    }
+
+    public static QuarkusCodestartProjectInputBuilder builder() {
+        return new QuarkusCodestartProjectInputBuilder();
+    }
+
+    public Collection<AppArtifactCoords> getExtensions() {
+        return extensions;
+    }
+
+    public Set<String> getOverrideExamples() {
+        return overrideExamples;
+    }
+
+    public boolean noExamples() {
+        return noExamples;
+    }
+
+    public boolean noDockerfiles() {
+        return noDockerfiles;
+    }
+
+    public boolean noBuildToolWrapper() {
+        return noBuildToolWrapper;
+    }
+
+    public BuildTool getBuildTool() {
+        return buildTool;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java
new file mode 100644
index 0000000000000..9a261e78fa8db
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartProjectInputBuilder.java
@@ -0,0 +1,121 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import static java.util.Objects.requireNonNull;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.codestarts.CodestartProjectInputBuilder;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.extensions.Extensions;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class QuarkusCodestartProjectInputBuilder extends CodestartProjectInputBuilder {
+    Collection<AppArtifactCoords> extensions = new ArrayList<>();
+    Set<String> overrideExamples = new HashSet<>();
+    boolean noExamples;
+    boolean noDockerfiles;
+    boolean noBuildToolWrapper;
+    BuildTool buildTool = BuildTool.MAVEN;
+
+    QuarkusCodestartProjectInputBuilder() {
+        super();
+    }
+
+    public QuarkusCodestartProjectInputBuilder addExtensions(Collection<AppArtifactCoords> extensions) {
+        this.extensions.addAll(extensions);
+        super.addDependencies(extensions.stream().map(Extensions::toGAV).collect(Collectors.toList()));
+        return this;
+    }
+
+    public QuarkusCodestartProjectInputBuilder addExtension(AppArtifactCoords extension) {
+        return this.addExtensions(Collections.singletonList(extension));
+    }
+
+    public QuarkusCodestartProjectInputBuilder addExtension(AppArtifactKey extension) {
+        return this.addExtension(Extensions.toCoords(extension, null));
+    }
+
+    public QuarkusCodestartProjectInputBuilder addOverrideExamples(Collection<String> overrideExamples) {
+        this.overrideExamples.addAll(overrideExamples);
+        return this;
+    }
+
+    public QuarkusCodestartProjectInputBuilder addExample(String overrideExample) {
+        this.overrideExamples.add(overrideExample);
+        return this;
+    }
+
+    @Override
+    public QuarkusCodestartProjectInputBuilder addCodestarts(Collection<String> codestarts) {
+        super.addCodestarts(codestarts);
+        return this;
+    }
+
+    @Override
+    public QuarkusCodestartProjectInputBuilder addCodestart(String codestart) {
+        super.addCodestart(codestart);
+        return this;
+    }
+
+    @Override
+    public QuarkusCodestartProjectInputBuilder addData(Map<String, Object> data) {
+        super.addData(data);
+        return this;
+    }
+
+    @Override
+    public QuarkusCodestartProjectInputBuilder putData(String key, Object value) {
+        super.putData(key, value);
+        return this;
+    }
+
+    @Override
+    public QuarkusCodestartProjectInputBuilder messageWriter(MessageWriter messageWriter) {
+        super.messageWriter(messageWriter);
+        return this;
+    }
+
+    public QuarkusCodestartProjectInputBuilder noExamples() {
+        return this.noExamples(true);
+    }
+
+    public QuarkusCodestartProjectInputBuilder noExamples(boolean noExamples) {
+        this.noExamples = noExamples;
+        return this;
+    }
+
+    public QuarkusCodestartProjectInputBuilder noDockerfiles() {
+        return this.noDockerfiles(true);
+    }
+
+    public QuarkusCodestartProjectInputBuilder noDockerfiles(boolean noDockerfiles) {
+        this.noDockerfiles = noDockerfiles;
+        return this;
+    }
+
+    public QuarkusCodestartProjectInputBuilder noBuildToolWrapper() {
+        return this.noBuildToolWrapper(true);
+    }
+
+    public QuarkusCodestartProjectInputBuilder noBuildToolWrapper(boolean noBuildToolWrapper) {
+        this.noBuildToolWrapper = noBuildToolWrapper;
+        return this;
+    }
+
+    public QuarkusCodestartProjectInputBuilder buildTool(BuildTool buildTool) {
+        this.buildTool = requireNonNull(buildTool, "buildTool is required");
+        return this;
+    }
+
+    public QuarkusCodestartProjectInput build() {
+        return new QuarkusCodestartProjectInput(this);
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java
index f6b614c32376f..c157105dc0c6b 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/AddExtensions.java
@@ -6,11 +6,12 @@
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
 import io.quarkus.devtools.commands.handlers.AddExtensionsCommandHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import io.quarkus.platform.tools.ToolsConstants;
 import io.quarkus.platform.tools.ToolsUtils;
-import io.quarkus.registry.ExtensionRegistry;
+import java.util.HashMap;
 import java.util.Set;
 
 /**
@@ -22,7 +23,6 @@ public class AddExtensions {
     public static final String EXTENSIONS = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "extensions");
     public static final String OUTCOME_UPDATED = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "outcome", "updated");
     public static final String EXTENSION_MANAGER = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "extension-manager");
-    public static final String EXTENSION_REGISTRY = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "extension-registry");
 
     private final QuarkusCommandInvocation invocation;
     private final AddExtensionsCommandHandler handler = new AddExtensionsCommandHandler();
@@ -31,13 +31,12 @@ public AddExtensions(final QuarkusProject quarkusProject) {
         this.invocation = new QuarkusCommandInvocation(quarkusProject);
     }
 
-    public AddExtensions extensionManager(ExtensionManager extensionManager) {
-        invocation.setValue(EXTENSION_MANAGER, requireNonNull(extensionManager, "extensionManager is required"));
-        return this;
+    public AddExtensions(final QuarkusProject quarkusProject, final MessageWriter messageWriter) {
+        this.invocation = new QuarkusCommandInvocation(quarkusProject, new HashMap<>(), messageWriter);
     }
 
-    public AddExtensions extensionRegistry(ExtensionRegistry extensionRegistry) {
-        invocation.setValue(EXTENSION_REGISTRY, requireNonNull(extensionRegistry, "extensionRegistry is required"));
+    public AddExtensions extensionManager(ExtensionManager extensionManager) {
+        invocation.setValue(EXTENSION_MANAGER, requireNonNull(extensionManager, "extensionManager is required"));
         return this;
     }
 
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
new file mode 100644
index 0000000000000..72fb23044a1ff
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
@@ -0,0 +1,463 @@
+package io.quarkus.devtools.commands;
+
+import static io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData.*;
+import static io.quarkus.devtools.commands.handlers.CreateExtensionCommandHandler.readPom;
+import static java.util.Objects.requireNonNull;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog;
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData;
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInput;
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInputBuilder;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.commands.handlers.CreateExtensionCommandHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.utilities.MojoUtils;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Stack;
+import java.util.stream.Collectors;
+import javax.lang.model.SourceVersion;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.model.Model;
+
+/**
+ * Instances of this class are not thread-safe. They are created per invocation.
+ */
+public class CreateExtension {
+
+    public enum LayoutType {
+        OTHER_PLATFORM,
+        QUARKUS_CORE,
+        QUARKIVERSE,
+        STANDALONE
+    }
+
+    public static final String DEFAULT_BOM_GROUP_ID = "io.quarkus";
+    public static final String DEFAULT_BOM_ARTIFACT_ID = "quarkus-bom";
+    public static final String DEFAULT_BOM_VERSION = "${quarkus.version}";
+    public static final String DEFAULT_VERSION = "1.0.0-SNAPSHOT";
+
+    public static final String DEFAULT_CORE_NAMESPACE_ID = "quarkus-";
+
+    public static final String DEFAULT_EXTERNAL_NAMESPACE_ID = "";
+
+    public static final String DEFAULT_QUARKIVERSE_PARENT_GROUP_ID = "io.quarkiverse";
+    public static final String DEFAULT_QUARKIVERSE_PARENT_ARTIFACT_ID = "quarkiverse-parent";
+    public static final String DEFAULT_QUARKIVERSE_PARENT_VERSION = "6";
+    public static final String DEFAULT_QUARKIVERSE_NAMESPACE_ID = "quarkus-";
+
+    private static final String DEFAULT_SUREFIRE_PLUGIN_VERSION = "3.0.0-M5";
+    private static final String DEFAULT_COMPILER_PLUGIN_VERSION = "3.8.1";
+
+    private final QuarkusExtensionCodestartProjectInputBuilder builder = QuarkusExtensionCodestartProjectInput.builder();
+    private final Path baseDir;
+    private final CreateExtensionCommandHandler handler = new CreateExtensionCommandHandler();
+
+    private final EnhancedDataMap data = new EnhancedDataMap();
+
+    private MessageWriter log = MessageWriter.info();
+    private String itTestRelativeDir = "integration-tests";
+    private String bomRelativeDir = "bom/application";
+    private String extensionsRelativeDir = "extensions";
+
+    public CreateExtension(final Path baseDir) {
+        this.baseDir = requireNonNull(baseDir, "extensionDirPath is required");
+    }
+
+    public CreateExtension groupId(String groupId) {
+        data.putIfNonEmptyString(GROUP_ID, groupId);
+        return this;
+    }
+
+    public CreateExtension extensionId(String extensionId) {
+        data.putIfNonEmptyString(EXTENSION_ID, extensionId);
+        return this;
+    }
+
+    public CreateExtension extensionName(String name) {
+        data.putIfNonEmptyString(EXTENSION_NAME, name);
+        return this;
+    }
+
+    public CreateExtension version(String version) {
+        data.putIfNonEmptyString(VERSION, version);
+        return this;
+    }
+
+    public CreateExtension packageName(String packageName) {
+        data.putIfNonEmptyString(PACKAGE_NAME, packageName);
+        return this;
+    }
+
+    public CreateExtension classNameBase(String classNameBase) {
+        data.putIfNonEmptyString(CLASS_NAME_BASE, classNameBase);
+        return this;
+    }
+
+    public CreateExtension namespaceId(String extensionArtifactIdPrefix) {
+        data.putIfNonNull(NAMESPACE_ID, extensionArtifactIdPrefix);
+        return this;
+    }
+
+    public CreateExtension namespaceName(String namespaceName) {
+        data.putIfNonNull(NAMESPACE_NAME, namespaceName);
+        return this;
+    }
+
+    public CreateExtension parentGroupId(String groupId) {
+        data.putIfNonEmptyString(PARENT_GROUP_ID, groupId);
+        return this;
+    }
+
+    public CreateExtension parentArtifactId(String artifactId) {
+        data.putIfNonEmptyString(PARENT_ARTIFACT_ID, artifactId);
+        return this;
+    }
+
+    public CreateExtension parentVersion(String version) {
+        data.putIfNonEmptyString(PARENT_VERSION, version);
+        return this;
+    }
+
+    public CreateExtension parentRelativePath(String parentRelativePath) {
+        data.putIfNonEmptyString(PARENT_RELATIVE_PATH, parentRelativePath);
+        return this;
+    }
+
+    public CreateExtension quarkusVersion(String quarkusVersion) {
+        data.putIfNonEmptyString(QUARKUS_VERSION, quarkusVersion);
+        return this;
+    }
+
+    public CreateExtension quarkusBomGroupId(String quarkusBomGroupId) {
+        data.putIfNonEmptyString(QUARKUS_BOM_GROUP_ID, quarkusBomGroupId);
+        return this;
+    }
+
+    public CreateExtension quarkusBomArtifactId(String quarkusBomArtifactId) {
+        data.putIfNonEmptyString(QUARKUS_BOM_ARTIFACT_ID, quarkusBomArtifactId);
+        return this;
+    }
+
+    public CreateExtension quarkusBomVersion(String quarkusBomVersion) {
+        data.putIfNonEmptyString(QUARKUS_BOM_VERSION, quarkusBomVersion);
+        return this;
+    }
+
+    public CreateExtension withoutUnitTest(boolean withoutUnitTest) {
+        this.builder.withoutUnitTest(withoutUnitTest);
+        return this;
+    }
+
+    public CreateExtension withoutDevModeTest(boolean withoutDevModeTest) {
+        this.builder.withoutDevModeTest(withoutDevModeTest);
+        return this;
+    }
+
+    public CreateExtension withoutIntegrationTests(boolean withoutIntegrationTest) {
+        this.builder.withoutIntegrationTests(withoutIntegrationTest);
+        return this;
+    }
+
+    public CreateExtension itTestRelativeDir(String itTestRelativeDir) {
+        if (!isEmpty(itTestRelativeDir)) {
+            this.itTestRelativeDir = itTestRelativeDir;
+        }
+        return this;
+    }
+
+    public CreateExtension bomRelativeDir(String bomRelativeDir) {
+        if (!isEmpty(bomRelativeDir)) {
+            this.bomRelativeDir = bomRelativeDir;
+        }
+        return this;
+    }
+
+    public CreateExtension extensionsRelativeDir(String extensionsRelativeDir) {
+        if (!isEmpty(extensionsRelativeDir)) {
+            this.extensionsRelativeDir = extensionsRelativeDir;
+        }
+        return this;
+    }
+
+    public QuarkusCommandOutcome execute() throws QuarkusCommandException {
+        final String extensionId = data.getRequiredStringValue(EXTENSION_ID);
+
+        final Path workingDir = resolveWorkingDir(baseDir);
+        final Model baseModel = resolveModel(baseDir);
+        final LayoutType layoutType = detectLayoutType(baseModel, data.getStringValue(GROUP_ID).orElse(null));
+
+        data.putIfAbsent(EXTENSION_NAME, toCapWords(extensionId));
+        data.putIfAbsent(NAMESPACE_ID, getDefaultNamespaceId(layoutType));
+        data.putIfAbsent(NAMESPACE_NAME, computeDefaultNamespaceName(data.getRequiredStringValue(NAMESPACE_ID)));
+        data.putIfAbsent(CLASS_NAME_BASE, toCapCamelCase(extensionId));
+
+        final String runtimeArtifactId = getRuntimeArtifactIdFromData();
+
+        ensureRequiredStringData(GROUP_ID, resolveGroupId(baseModel));
+        ensureRequiredStringData(VERSION, resolveVersion(baseModel));
+        ensureRequiredStringData(PACKAGE_NAME,
+                resolveExtensionPackage(data.getRequiredStringValue(GROUP_ID), extensionId));
+
+        final String groupId = data.getRequiredStringValue(GROUP_ID);
+        Model itTestModel;
+        String extensionDirName = runtimeArtifactId;
+        switch (layoutType) {
+            case QUARKUS_CORE:
+            case OTHER_PLATFORM:
+                extensionDirName = extensionId;
+                final Model extensionsParentModel = readPom(baseDir.resolve(extensionsRelativeDir));
+                ensureRequiredStringData(PARENT_GROUP_ID, resolveGroupId(extensionsParentModel));
+                ensureRequiredStringData(PARENT_ARTIFACT_ID, resolveArtifactId(extensionsParentModel));
+                ensureRequiredStringData(PARENT_VERSION, resolveVersion(extensionsParentModel));
+
+                data.putIfAbsent(PARENT_RELATIVE_PATH, "../pom.xml");
+                itTestModel = readPom(baseDir.resolve(itTestRelativeDir));
+                break;
+            case QUARKIVERSE:
+                data.putIfAbsent(PARENT_GROUP_ID, DEFAULT_QUARKIVERSE_PARENT_GROUP_ID);
+                data.putIfAbsent(PARENT_ARTIFACT_ID, DEFAULT_QUARKIVERSE_PARENT_ARTIFACT_ID);
+                data.putIfAbsent(PARENT_VERSION, DEFAULT_QUARKIVERSE_PARENT_VERSION);
+                data.putIfAbsent(QUARKUS_BOM_GROUP_ID, DEFAULT_BOM_GROUP_ID);
+                data.putIfAbsent(QUARKUS_BOM_ARTIFACT_ID, DEFAULT_BOM_ARTIFACT_ID);
+                data.putIfAbsent(QUARKUS_BOM_VERSION, DEFAULT_BOM_VERSION);
+                data.putIfAbsent(MAVEN_COMPILER_PLUGIN_VERSION, DEFAULT_COMPILER_PLUGIN_VERSION);
+                ensureRequiredStringData(QUARKUS_VERSION);
+                // TODO: Support Quarkiverse multi extensions repo
+                builder.addCodestart(QuarkusExtensionCodestartCatalog.Code.QUARKIVERSE.key());
+                builder.addCodestart(QuarkusExtensionCodestartCatalog.Tooling.GIT.key());
+                itTestModel = getStandaloneTempModel(workingDir, runtimeArtifactId);
+                break;
+            default:
+                data.putIfAbsent(QUARKUS_BOM_GROUP_ID, DEFAULT_BOM_GROUP_ID);
+                data.putIfAbsent(QUARKUS_BOM_ARTIFACT_ID, DEFAULT_BOM_ARTIFACT_ID);
+                data.putIfAbsent(QUARKUS_BOM_VERSION, DEFAULT_BOM_VERSION);
+                data.putIfAbsent(MAVEN_SUREFIRE_PLUGIN_VERSION, DEFAULT_SUREFIRE_PLUGIN_VERSION);
+                data.putIfAbsent(MAVEN_COMPILER_PLUGIN_VERSION, DEFAULT_COMPILER_PLUGIN_VERSION);
+                ensureRequiredStringData(QUARKUS_VERSION);
+
+                // In standalone mode, the base pom is used as parent for integration tests
+                itTestModel = getStandaloneTempModel(workingDir, runtimeArtifactId);
+                break;
+        }
+
+        ensureRequiredStringData(IT_PARENT_GROUP_ID, resolveGroupId(itTestModel));
+        ensureRequiredStringData(IT_PARENT_ARTIFACT_ID, resolveArtifactId(itTestModel));
+        ensureRequiredStringData(IT_PARENT_VERSION, resolveVersion(itTestModel));
+        ensureRequiredStringData(IT_PARENT_RELATIVE_PATH, "../pom.xml");
+
+        builder.addData(data);
+
+        log.info("\nDetected layout type is '%s' ", layoutType.toString().toLowerCase());
+        log.info("Generated runtime artifactId is '%s'\n", runtimeArtifactId);
+
+        if (LayoutType.QUARKUS_CORE.equals(layoutType) || LayoutType.OTHER_PLATFORM.equals(layoutType)) {
+            final Path extensionsDir = workingDir.resolve(extensionsRelativeDir);
+            final Path itTestDir = workingDir.resolve(itTestRelativeDir);
+            final Path bomDir = workingDir.resolve(bomRelativeDir);
+            return handler.execute(log, groupId, runtimeArtifactId, builder.build(),
+                    extensionsDir.resolve(extensionDirName),
+                    extensionsDir,
+                    itTestDir, bomDir);
+        }
+        return handler.execute(log, groupId, runtimeArtifactId, builder.build(), baseDir.resolve(extensionDirName));
+    }
+
+    private String getDefaultNamespaceId(LayoutType layoutType) {
+        switch (layoutType) {
+            case QUARKIVERSE:
+                return DEFAULT_QUARKIVERSE_NAMESPACE_ID;
+            case QUARKUS_CORE:
+                return DEFAULT_CORE_NAMESPACE_ID;
+            default:
+                return DEFAULT_EXTERNAL_NAMESPACE_ID;
+        }
+    }
+
+    private String computeDefaultNamespaceName(String namespaceId) {
+        if (isEmpty(namespaceId)) {
+            return "";
+        }
+        return toCapWords(namespaceId) + " - ";
+    }
+
+    public static Model resolveModel(Path dir) throws QuarkusCommandException {
+        final Path workingDir = resolveWorkingDir(dir);
+        final Path basePom = workingDir.resolve("pom.xml");
+        if (!Files.isRegularFile(basePom)) {
+            return null;
+        }
+        try {
+            return MojoUtils.readPom(basePom.toFile());
+        } catch (IOException e) {
+            throw new QuarkusCommandException("Error while reading base pom.xml", e);
+        }
+    }
+
+    private Model getStandaloneTempModel(Path workingDir, String runtimeArtifactId) {
+        final Model model = new Model();
+        model.setGroupId(data.getRequiredStringValue(GROUP_ID));
+        model.setArtifactId(runtimeArtifactId + "-parent");
+        model.setVersion(data.getStringValue(VERSION).orElse(DEFAULT_VERSION));
+        model.setPomFile(workingDir.resolve("pom.xml").toFile());
+        return model;
+    }
+
+    private String getRuntimeArtifactIdFromData() {
+        return data.getStringValue(NAMESPACE_ID).orElse("")
+                + data.getRequiredStringValue(EXTENSION_ID);
+    }
+
+    private static Path resolveWorkingDir(Path dir) {
+        return dir.endsWith("extensions/") ? dir.resolve("..") : dir;
+    }
+
+    public static LayoutType detectLayoutType(Model basePom, String groupId) {
+        if (basePom != null) {
+            if (basePom.getArtifactId().endsWith("quarkus-parent")) {
+                return LayoutType.QUARKUS_CORE;
+            }
+            if (basePom.getModules().stream().anyMatch(s -> s.contains("bom"))) {
+                return LayoutType.OTHER_PLATFORM;
+            }
+        }
+        if (isQuarkiverseGroupId(groupId))
+            return LayoutType.QUARKIVERSE;
+        return LayoutType.STANDALONE;
+    }
+
+    public static boolean isQuarkiverseGroupId(String groupId) {
+        return groupId != null && groupId.contains(DEFAULT_QUARKIVERSE_PARENT_GROUP_ID);
+    }
+
+    public static String extractQuarkiverseExtensionId(String groupId) {
+        return groupId.replace(DEFAULT_QUARKIVERSE_PARENT_GROUP_ID + ".", "");
+    }
+
+    private void ensureRequiredStringData(QuarkusExtensionData key) throws QuarkusCommandException {
+        if (!data.containsNonEmptyStringForKey(key)) {
+            throw new QuarkusCommandException("'" + key.toString() + "' value is required.");
+        }
+    }
+
+    private void ensureRequiredStringData(QuarkusExtensionData key, String detectedValue) throws QuarkusCommandException {
+        if (!data.containsNonEmptyStringForKey(key)) {
+            if (isEmpty(detectedValue)) {
+                throw new QuarkusCommandException(
+                        "You need to define  '" + key.toString() + "' because it was not found in the project hierarchy.");
+            }
+            data.putIfNonEmptyString(key, detectedValue);
+        }
+    }
+
+    static String resolveExtensionPackage(String groupId, String artifactId) {
+        final Stack<String> segments = new Stack<>();
+        for (String segment : groupId.split("[.\\-]+")) {
+            if (segments.isEmpty() || !segments.peek().equals(segment)) {
+                segments.add(segment);
+            }
+        }
+        for (String segment : artifactId.split("[.\\-]+")) {
+            if (!segments.contains(segment)) {
+                segments.add(segment);
+            }
+        }
+        return segments.stream() //
+                .map(s -> s.toLowerCase(Locale.ROOT)) //
+                .map(s -> SourceVersion.isKeyword(s) ? s + "_" : s) //
+                .collect(Collectors.joining("."));
+    }
+
+    static String resolveGroupId(Model basePom) {
+        return basePom != null ? basePom.getGroupId() != null ? basePom.getGroupId()
+                : basePom.getParent() != null && basePom.getParent().getGroupId() != null
+                        ? basePom.getParent().getGroupId()
+                        : null
+                : null;
+    }
+
+    static String resolveArtifactId(Model basePom) {
+        return basePom != null ? basePom.getArtifactId() != null ? basePom.getArtifactId()
+                : basePom.getParent() != null && basePom.getParent().getArtifactId() != null
+                        ? basePom.getParent().getArtifactId()
+                        : null
+                : null;
+    }
+
+    static String resolveVersion(Model basePom) {
+        return basePom != null ? basePom.getVersion() != null ? basePom.getVersion()
+                : basePom.getParent() != null && basePom.getParent().getVersion() != null
+                        ? basePom.getParent().getVersion()
+                        : DEFAULT_VERSION
+                : DEFAULT_VERSION;
+    }
+
+    static String toCapCamelCase(String name) {
+        final StringBuilder sb = new StringBuilder(name.length());
+        for (String segment : name.split("[.\\-]+")) {
+            sb.append(Character.toUpperCase(segment.charAt(0)));
+            if (segment.length() > 1) {
+                sb.append(segment.substring(1));
+            }
+        }
+        return sb.toString();
+    }
+
+    static String toCapWords(String name) {
+        final StringBuilder sb = new StringBuilder(name.length());
+        for (String segment : name.split("[.\\-]+")) {
+            if (sb.length() > 0) {
+                sb.append(' ');
+            }
+            sb.append(Character.toUpperCase(segment.charAt(0)));
+            if (segment.length() > 1) {
+                sb.append(segment.substring(1));
+            }
+        }
+        return sb.toString();
+    }
+
+    private static class EnhancedDataMap extends HashMap<String, Object> {
+
+        public Optional<String> getStringValue(QuarkusExtensionData key) {
+            final Object o = get(key.key());
+            return Optional.ofNullable((o instanceof String) ? (String) o : null);
+        }
+
+        public void putIfAbsent(QuarkusExtensionData dataKey, String defaultValue) {
+            if (!containsKey(dataKey)) {
+                this.put(dataKey.key(), defaultValue);
+            }
+        }
+
+        public void putIfNonEmptyString(QuarkusExtensionData dataKey, String value) {
+            if (!StringUtils.isEmpty(value)) {
+                this.put(dataKey.key(), value);
+            }
+        }
+
+        public void putIfNonNull(QuarkusExtensionData dataKey, String value) {
+            if (value != null) {
+                this.put(dataKey.key(), value);
+            }
+        }
+
+        public String getRequiredStringValue(QuarkusExtensionData key) {
+            return requireNonNull(getStringValue(key).orElse(null), key.key() + " is required");
+        }
+
+        public boolean containsNonEmptyStringForKey(QuarkusExtensionData dataKey) {
+            return !StringUtils.isEmpty(getStringValue(dataKey).orElse(null));
+        }
+
+        public boolean containsKey(QuarkusExtensionData dataKey) {
+            return containsKey(dataKey.key());
+        }
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java
new file mode 100644
index 0000000000000..c40162c515727
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateJBangProject.java
@@ -0,0 +1,48 @@
+package io.quarkus.devtools.commands;
+
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.EXTENSIONS;
+import static java.util.Objects.requireNonNull;
+
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.commands.handlers.CreateJBangProjectCommandHandler;
+import io.quarkus.devtools.project.QuarkusProject;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class CreateJBangProject {
+    public static final String NAME = "create-jbang";
+
+    private final QuarkusProject quarkusProject;
+
+    private Set<String> extensions = new HashSet<>();
+    private Map<String, Object> values = new HashMap<>();
+
+    public CreateJBangProject(QuarkusProject quarkusProject) {
+        this.quarkusProject = requireNonNull(quarkusProject, "quarkusProject is required");
+    }
+
+    public CreateJBangProject extensions(Set<String> extensions) {
+        if (extensions == null) {
+            return this;
+        }
+        this.extensions.addAll(extensions);
+        return this;
+    }
+
+    public CreateJBangProject setValue(String name, Object value) {
+        if (value != null) {
+            values.put(name, value);
+        }
+        return this;
+    }
+
+    public QuarkusCommandOutcome execute() throws QuarkusCommandException {
+        setValue(EXTENSIONS, extensions);
+        final QuarkusCommandInvocation invocation = new QuarkusCommandInvocation(quarkusProject, values);
+        return new CreateJBangProjectCommandHandler().execute(invocation);
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java
index cd4e67689f1ed..0c78f241e84e5 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateProject.java
@@ -1,14 +1,6 @@
 package io.quarkus.devtools.commands;
 
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.CLASS_NAME;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.EXTENSIONS;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.IS_SPRING;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.JAVA_TARGET;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_ARTIFACT_ID;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_GROUP_ID;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_VERSION;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.QUARKUS_PLUGIN_VERSION;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.SOURCE_TYPE;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.*;
 import static java.util.Objects.requireNonNull;
 
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
@@ -18,11 +10,11 @@
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.codegen.SourceType;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import java.io.IOException;
-import java.nio.file.Path;
+import io.quarkus.platform.tools.ToolsConstants;
+import io.quarkus.platform.tools.ToolsUtils;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -38,18 +30,23 @@
 public class CreateProject {
 
     public static final String NAME = "create-project";
+
+    public static final String NO_DOCKERFILES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-dockerfiles");
+    public static final String NO_BUILDTOOL_WRAPPER = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-buildtool-wrapper");
+    public static final String NO_EXAMPLES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "no-examples");
+    public static final String CODESTARTS = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "codestarts");
+    public static final String OVERRIDE_EXAMPLES = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME, "examples");
+
     private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
 
-    private final Path projectDirPath;
-    private final QuarkusPlatformDescriptor platformDescr;
+    private QuarkusProject quarkusProject;
     private String javaTarget;
-    private BuildTool buildTool = BuildTool.MAVEN;
+    private Set<String> extensions = new HashSet<>();
 
     private Map<String, Object> values = new HashMap<>();
 
-    public CreateProject(final Path projectDirPath, QuarkusPlatformDescriptor platformDescr) {
-        this.projectDirPath = requireNonNull(projectDirPath, "projectDirPath is required");
-        this.platformDescr = requireNonNull(platformDescr, "platformDescr is required");
+    public CreateProject(QuarkusProject project) {
+        this.quarkusProject = requireNonNull(project, "project is required");
     }
 
     public CreateProject groupId(String groupId) {
@@ -67,8 +64,24 @@ public CreateProject version(String version) {
         return this;
     }
 
+    @Deprecated
+    public CreateProject quarkusMavenPluginVersion(String version) {
+        setValue(QUARKUS_MAVEN_PLUGIN_VERSION, version);
+        return this;
+    }
+
+    @Deprecated
+    public CreateProject quarkusGradlePluginVersion(String version) {
+        setValue(QUARKUS_GRADLE_PLUGIN_VERSION, version);
+        return this;
+    }
+
     public CreateProject quarkusPluginVersion(String version) {
-        setValue(QUARKUS_PLUGIN_VERSION, version);
+        if (quarkusProject.getBuildTool().equals(BuildTool.MAVEN)) {
+            setValue(QUARKUS_MAVEN_PLUGIN_VERSION, version);
+        } else {
+            setValue(QUARKUS_GRADLE_PLUGIN_VERSION, version);
+        }
         return this;
     }
 
@@ -82,6 +95,15 @@ public CreateProject javaTarget(String javaTarget) {
         return this;
     }
 
+    public CreateProject resourcePath(String resourcePath) {
+        setValue(RESOURCE_PATH, resourcePath);
+        return this;
+    }
+
+    /**
+     * Use packageName instead as this one is only working with RESTEasy and SpringWeb
+     */
+    @Deprecated
     public CreateProject className(String className) {
         if (className == null) {
             return this;
@@ -93,25 +115,70 @@ public CreateProject className(String className) {
         return this;
     }
 
+    public CreateProject packageName(String packageName) {
+        if (packageName == null) {
+            return this;
+        }
+        if (!(SourceVersion.isName(packageName) && !SourceVersion.isKeyword(packageName))) {
+            throw new IllegalArgumentException(packageName + " is not a  package name");
+        }
+        setValue(PACKAGE_NAME, packageName);
+        return this;
+    }
+
     public CreateProject extensions(Set<String> extensions) {
-        if (isSpringStyle(extensions)) {
-            setValue(IS_SPRING, true);
+        if (extensions == null) {
+            return this;
         }
-        setValue(EXTENSIONS, extensions);
+        this.extensions.addAll(extensions);
         return this;
     }
 
-    public CreateProject setValue(String name, Object value) {
-        values.put(name, value);
+    public CreateProject codestarts(Set<String> codestarts) {
+        setValue(CODESTARTS, codestarts);
+        return this;
+    }
+
+    public CreateProject overrideExamples(Set<String> overrideExamples) {
+        setValue(OVERRIDE_EXAMPLES, overrideExamples);
         return this;
     }
 
-    public CreateProject buildTool(BuildTool buildTool) {
-        this.buildTool = requireNonNull(buildTool, "buildTool is required");
+    public CreateProject noExamples(boolean value) {
+        setValue(NO_EXAMPLES, value);
         return this;
     }
 
-    public boolean doCreateProject(final Map<String, Object> context) throws IOException {
+    public CreateProject noExamples() {
+        return noExamples(true);
+    }
+
+    public CreateProject noBuildToolWrapper(boolean value) {
+        setValue(NO_BUILDTOOL_WRAPPER, value);
+        return this;
+    }
+
+    public CreateProject noBuildToolWrapper() {
+        return noBuildToolWrapper(true);
+    }
+
+    public CreateProject noDockerfiles(boolean value) {
+        setValue(NO_DOCKERFILES, value);
+        return this;
+    }
+
+    public CreateProject noDockerfiles() {
+        return noDockerfiles(true);
+    }
+
+    public CreateProject setValue(String name, Object value) {
+        if (value != null) {
+            values.put(name, value);
+        }
+        return this;
+    }
+
+    public boolean doCreateProject(final Map<String, Object> context) throws QuarkusCommandException {
         if (context != null && !context.isEmpty()) {
             for (Map.Entry<String, Object> entry : context.entrySet()) {
                 if (entry.getValue() != null) {
@@ -119,12 +186,7 @@ public boolean doCreateProject(final Map<String, Object> context) throws IOExcep
                 }
             }
         }
-
-        try {
-            return execute().isSuccess();
-        } catch (QuarkusCommandException e) {
-            throw new IOException("Failed to create project", e);
-        }
+        return execute().isSuccess();
     }
 
     public QuarkusCommandOutcome execute() throws QuarkusCommandException {
@@ -136,8 +198,14 @@ public QuarkusCommandOutcome execute() throws QuarkusCommandException {
         } else {
             setValue(JAVA_TARGET, "11");
         }
-
-        final QuarkusProject quarkusProject = QuarkusProject.of(projectDirPath, platformDescr, buildTool);
+        if (containsSpringWeb(extensions)) {
+            setValue(IS_SPRING, true);
+            if (containsRESTEasy(extensions)) {
+                values.remove(CLASS_NAME);
+                values.remove(RESOURCE_PATH);
+            }
+        }
+        setValue(EXTENSIONS, extensions);
         final QuarkusCommandInvocation invocation = new QuarkusCommandInvocation(quarkusProject, values);
         return new CreateProjectCommandHandler().execute(invocation);
     }
@@ -151,7 +219,11 @@ public static SourceType determineSourceType(Set<String> extensions) {
         return sourceType.orElse(SourceType.JAVA);
     }
 
-    private static boolean isSpringStyle(Collection<String> extensions) {
-        return extensions != null && extensions.stream().anyMatch(e -> e.toLowerCase().contains("spring-web"));
+    private static boolean containsSpringWeb(Collection<String> extensions) {
+        return extensions.stream().anyMatch(e -> e.toLowerCase().contains("spring-web"));
+    }
+
+    private static boolean containsRESTEasy(Collection<String> extensions) {
+        return extensions.isEmpty() || extensions.stream().anyMatch(e -> e.toLowerCase().contains("resteasy"));
     }
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java
index 614be17d3f842..f19a132d98925 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListExtensions.java
@@ -6,11 +6,12 @@
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
 import io.quarkus.devtools.commands.handlers.ListExtensionsCommandHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import io.quarkus.platform.tools.ToolsConstants;
 import io.quarkus.platform.tools.ToolsUtils;
-import io.quarkus.registry.ExtensionRegistry;
+import java.util.HashMap;
 
 /**
  * Instances of this class are not thread-safe. They are created per single invocation.
@@ -19,10 +20,11 @@ public class ListExtensions {
     public static final String NAME = "list-extensions";
     private static final String PARAM_PREFIX = ToolsUtils.dotJoin(ToolsConstants.QUARKUS, NAME);
     public static final String ALL = ToolsUtils.dotJoin(PARAM_PREFIX, "all");
+    public static final String INSTALLED = ToolsUtils.dotJoin(PARAM_PREFIX, "installed");
+    public static final String FROM_CLI = ToolsUtils.dotJoin(PARAM_PREFIX, "fromCli");
     public static final String FORMAT = ToolsUtils.dotJoin(PARAM_PREFIX, "format");
     public static final String SEARCH = ToolsUtils.dotJoin(PARAM_PREFIX, "search");
     public static final String EXTENSION_MANAGER = ToolsUtils.dotJoin(PARAM_PREFIX, "extension-manager");
-    public static final String EXTENSION_REGISTRY = ToolsUtils.dotJoin(PARAM_PREFIX, "extension-registry");
 
     private final QuarkusCommandInvocation invocation;
     private final ListExtensionsCommandHandler handler = new ListExtensionsCommandHandler();
@@ -31,11 +33,25 @@ public ListExtensions(final QuarkusProject quarkusProject) {
         this.invocation = new QuarkusCommandInvocation(quarkusProject);
     }
 
+    public ListExtensions(final QuarkusProject quarkusProject, final MessageWriter messageWriter) {
+        this.invocation = new QuarkusCommandInvocation(quarkusProject, new HashMap<>(), messageWriter);
+    }
+
     public ListExtensions all(boolean all) {
         invocation.setValue(ALL, all);
         return this;
     }
 
+    public ListExtensions installed(boolean installed) {
+        invocation.setValue(INSTALLED, installed);
+        return this;
+    }
+
+    public ListExtensions fromCli(boolean cli) {
+        invocation.setValue(FROM_CLI, cli);
+        return this;
+    }
+
     public ListExtensions format(String format) {
         invocation.setValue(FORMAT, format);
         return this;
@@ -46,11 +62,6 @@ public ListExtensions extensionManager(ExtensionManager extensionManager) {
         return this;
     }
 
-    public ListExtensions extensionRegistry(ExtensionRegistry extensionRegistry) {
-        invocation.setValue(EXTENSION_REGISTRY, requireNonNull(extensionRegistry, "extensionRegistry is required"));
-        return this;
-    }
-
     public ListExtensions search(String search) {
         invocation.setValue(SEARCH, search);
         return this;
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java
new file mode 100644
index 0000000000000..191c93b6a1e23
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/ListPlatforms.java
@@ -0,0 +1,27 @@
+package io.quarkus.devtools.commands;
+
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.commands.handlers.ListPlatformsCommandHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.QuarkusProject;
+import java.util.HashMap;
+
+public class ListPlatforms {
+
+    private final QuarkusCommandInvocation invocation;
+    private final ListPlatformsCommandHandler handler = new ListPlatformsCommandHandler();
+
+    public ListPlatforms(QuarkusProject quarkusProject) {
+        this.invocation = new QuarkusCommandInvocation(quarkusProject);
+    }
+
+    public ListPlatforms(QuarkusProject quarkusProject, MessageWriter messageWriter) {
+        this.invocation = new QuarkusCommandInvocation(quarkusProject, new HashMap<>(), messageWriter);
+    }
+
+    public QuarkusCommandOutcome execute() throws QuarkusCommandException {
+        return handler.execute(invocation);
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java
index 85338c09689b5..b5ce6a9428d49 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/RemoveExtensions.java
@@ -6,10 +6,12 @@
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
 import io.quarkus.devtools.commands.handlers.RemoveExtensionsCommandHandler;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import io.quarkus.platform.tools.ToolsConstants;
 import io.quarkus.platform.tools.ToolsUtils;
+import java.util.HashMap;
 import java.util.Set;
 
 /**
@@ -28,6 +30,10 @@ public RemoveExtensions(final QuarkusProject quarkusProject) {
         invocation = new QuarkusCommandInvocation(quarkusProject);
     }
 
+    public RemoveExtensions(final QuarkusProject quarkusProject, final MessageWriter messageWriter) {
+        this.invocation = new QuarkusCommandInvocation(quarkusProject, new HashMap<>(), messageWriter);
+    }
+
     public RemoveExtensions extensions(Set<String> extensions) {
         invocation.setValue(EXTENSIONS, extensions);
         return this;
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java
index 20ac882e7731f..a46feadfaf8a1 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/QuarkusCommandInvocation.java
@@ -2,10 +2,9 @@
 
 import static java.util.Objects.requireNonNull;
 
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.tools.DefaultMessageWriter;
-import io.quarkus.platform.tools.MessageWriter;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,7 +18,7 @@ public QuarkusCommandInvocation(QuarkusProject quarkusProject) {
     }
 
     public QuarkusCommandInvocation(final QuarkusProject quarkusProject, final Map<String, Object> values) {
-        this(quarkusProject, values, new DefaultMessageWriter());
+        this(quarkusProject, values, MessageWriter.info());
     }
 
     public QuarkusCommandInvocation(final QuarkusProject quarkusProject, final Map<String, Object> values,
@@ -41,8 +40,7 @@ public MessageWriter log() {
         return log;
     }
 
-    public QuarkusPlatformDescriptor getPlatformDescriptor() {
-        return quarkusProject.getPlatformDescriptor();
+    public ExtensionCatalog getExtensionsCatalog() {
+        return quarkusProject.getExtensionsCatalog();
     }
-
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java
index c97d6afcc0a31..4ab793f86aa21 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/SelectionResult.java
@@ -1,21 +1,21 @@
 package io.quarkus.devtools.commands.data;
 
-import io.quarkus.dependencies.Extension;
+import io.quarkus.registry.catalog.Extension;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.Set;
 
 public class SelectionResult implements Iterable<Extension> {
 
-    private final Set<Extension> extensions;
+    private final Collection<Extension> extensions;
     private final boolean matches;
 
-    public SelectionResult(Set<Extension> extensions, boolean matches) {
+    public SelectionResult(Collection<Extension> extensions, boolean matches) {
         this.extensions = extensions;
         this.matches = matches;
     }
 
-    public Set<Extension> getExtensions() {
+    public Collection<Extension> getExtensions() {
         return extensions;
     }
 
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java
index 86033d44ded91..82de5139626f7 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/data/ValueMap.java
@@ -66,7 +66,7 @@ public boolean getValue(String name, boolean defaultValue) {
             return defaultValue;
         }
         if (Boolean.class.equals(value.getClass())) {
-            return ((Boolean) value).booleanValue();
+            return (Boolean) value;
         }
         return Boolean.parseBoolean(value.toString());
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java
index 95126446c1975..3e85f766e7682 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/AddExtensionsCommandHandler.java
@@ -1,20 +1,30 @@
 package io.quarkus.devtools.commands.handlers;
 
 import static io.quarkus.devtools.commands.AddExtensions.EXTENSION_MANAGER;
+import static io.quarkus.devtools.messagewriter.MessageIcons.NOK_ICON;
 
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.devtools.commands.AddExtensions;
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageIcons;
 import io.quarkus.devtools.project.extensions.ExtensionInstallPlan;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import io.quarkus.devtools.project.extensions.ExtensionManager.InstallResult;
-import io.quarkus.platform.tools.ConsoleMessageFormats;
-import io.quarkus.registry.DefaultExtensionRegistry;
-import io.quarkus.registry.ExtensionRegistry;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.platform.catalog.predicate.ExtensionPredicate;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.ExtensionOrigin;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * This class is thread-safe. It extracts extensions to be added to the project from an instance of
@@ -29,25 +39,30 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
             return QuarkusCommandOutcome.success().setValue(AddExtensions.OUTCOME_UPDATED, false);
         }
 
-        ExtensionRegistry extensionRegistry = invocation.getValue(AddExtensions.EXTENSION_REGISTRY);
-        if (extensionRegistry == null) {
-            extensionRegistry = DefaultExtensionRegistry.fromPlatform(invocation.getPlatformDescriptor());
-        }
-        String quarkusVersion = invocation.getPlatformDescriptor().getQuarkusVersion();
-        ExtensionInstallPlan extensionInstallPlan = extensionRegistry.planInstallation(quarkusVersion, extensionsQuery);
+        String quarkusVersion = invocation.getExtensionsCatalog().getQuarkusCoreVersion();
 
         final ExtensionManager extensionManager = invocation.getValue(EXTENSION_MANAGER,
                 invocation.getQuarkusProject().getExtensionManager());
         try {
+            ExtensionInstallPlan extensionInstallPlan = planInstallation(quarkusVersion, extensionsQuery,
+                    invocation.getExtensionsCatalog());
             if (extensionInstallPlan.isNotEmpty()) {
                 final InstallResult result = extensionManager.install(extensionInstallPlan);
                 result.getInstalled()
                         .forEach(a -> invocation.log()
-                                .info(ConsoleMessageFormats.ok("Extension " + a.getGroupId() + ":" + a.getArtifactId())
+                                .info(MessageIcons.OK_ICON + " Extension " + a.getGroupId() + ":" + a.getArtifactId()
                                         + " has been installed"));
                 return new QuarkusCommandOutcome(true).setValue(AddExtensions.OUTCOME_UPDATED, result.isSourceUpdated());
             }
-
+        } catch (MultipleExtensionsFoundException m) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(NOK_ICON + " Multiple extensions matching '").append(m.getKeyword()).append("'");
+            m.getExtensions()
+                    .forEach(extension -> sb.append(System.lineSeparator()).append("     * ")
+                            .append(extension.managementKey()));
+            sb.append(System.lineSeparator())
+                    .append("     Be more specific e.g using the exact name or the full GAV.");
+            invocation.log().info(sb.toString());
         } catch (IOException e) {
             throw new QuarkusCommandException("Failed to add extensions", e);
         }
@@ -55,4 +70,83 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
         return new QuarkusCommandOutcome(false).setValue(AddExtensions.OUTCOME_UPDATED, false);
     }
 
+    public ExtensionInstallPlan planInstallation(String quarkusCore, Collection<String> keywords,
+            ExtensionCatalog catalog) {
+        ExtensionInstallPlan.Builder builder = ExtensionInstallPlan.builder();
+        boolean multipleKeywords = keywords.size() > 1;
+        for (String keyword : keywords) {
+            int countColons = StringUtils.countMatches(keyword, ":");
+            // Check if it's just groupId:artifactId
+            if (countColons == 1) {
+                AppArtifactKey artifactKey = AppArtifactKey.fromString(keyword);
+                builder.addManagedExtension(new AppArtifactCoords(artifactKey, null));
+                continue;
+            } else if (countColons > 1) {
+                // it's a gav
+                builder.addIndependentExtension(AppArtifactCoords.fromString(keyword));
+                continue;
+            }
+            List<Extension> listed = listInternalExtensions(quarkusCore, keyword, catalog.getExtensions());
+            if (listed.size() != 1 && multipleKeywords) {
+                // No extension found for this keyword. Return empty immediately
+                return ExtensionInstallPlan.EMPTY;
+            }
+            // If it's a pattern allow multiple results
+            // See https://github.com/quarkusio/quarkus/issues/11086#issuecomment-666360783
+            else if (listed.size() > 1 && !ExtensionPredicate.isPattern(keyword)) {
+                throw new MultipleExtensionsFoundException(keyword, listed);
+            }
+            for (Extension e : listed) {
+                String groupId = e.getArtifact().getGroupId();
+                String artifactId = e.getArtifact().getArtifactId();
+                String version = e.getArtifact().getVersion();
+                AppArtifactCoords extensionCoords = new AppArtifactCoords(groupId, artifactId, version);
+
+                boolean managed = false;
+                // TODO this is not properly picking the platform BOMs
+                for (ExtensionOrigin origin : e.getOrigins()) {
+                    if (origin.isPlatform()) {
+                        builder.addManagedExtension(extensionCoords);
+                        final ArtifactCoords bomCoords = origin.getBom();
+                        builder.addPlatform(new AppArtifactCoords(bomCoords.getGroupId(), bomCoords.getArtifactId(),
+                                null, "pom", bomCoords.getVersion()));
+                        managed = true;
+                        break;
+                    }
+                }
+                if (!managed) {
+                    builder.addIndependentExtension(extensionCoords);
+                }
+            }
+            // TODO
+            //if (!listed.isEmpty()) {
+            //    builder.addPlatform(new AppArtifactCoords(catalog.getBomGroupId(), catalog.getBomArtifactId(), null, "pom",
+            //            catalog.getBomVersion()));
+            //}
+        }
+        return builder.build();
+    }
+
+    private List<Extension> listInternalExtensions(String quarkusCore, String keyword, Collection<Extension> extensions) {
+        List<Extension> result = new ArrayList<>();
+        ExtensionPredicate predicate = null;
+        if (keyword != null && !keyword.isEmpty()) {
+            predicate = new ExtensionPredicate(keyword);
+        }
+        for (Extension extension : extensions) {
+            // If no filter is defined, just return the tuple
+            if (predicate == null) {
+                result.add(extension);
+            } else {
+                // If there is an exact match, return only this
+                if (predicate.isExactMatch(extension)) {
+                    return Collections.singletonList(extension);
+                } else if (predicate.test(extension)) {
+                    result.add(extension);
+                }
+            }
+        }
+        return result;
+    }
+
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java
new file mode 100644
index 0000000000000..0052bd04e5de3
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java
@@ -0,0 +1,121 @@
+package io.quarkus.devtools.commands.handlers;
+
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog;
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartProjectInput;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageIcons;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.utilities.MojoUtils;
+import io.quarkus.maven.utilities.PomTransformer;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.model.Model;
+
+/**
+ * Instances of this class are thread-safe. They create a new project extracting all the necessary properties from an instance
+ * of {@link QuarkusCommandInvocation}.
+ */
+public class CreateExtensionCommandHandler {
+
+    public QuarkusCommandOutcome execute(MessageWriter log,
+            String groupId,
+            String artifactId,
+            QuarkusExtensionCodestartProjectInput input,
+            Path newExtensionDir)
+            throws QuarkusCommandException {
+        return execute(log, groupId, artifactId, input, newExtensionDir, null, null, null);
+    }
+
+    public QuarkusCommandOutcome execute(MessageWriter log,
+            String groupId,
+            String artifactId,
+            QuarkusExtensionCodestartProjectInput input,
+            Path newExtensionDir,
+            Path extensionsParentDir,
+            Path itTestParentDir,
+            Path bomDir)
+            throws QuarkusCommandException {
+        try {
+            final QuarkusExtensionCodestartCatalog catalog = QuarkusExtensionCodestartCatalog
+                    .fromBundledResources();
+            catalog.createProject(input).generate(newExtensionDir);
+
+            final String extensionDirName = newExtensionDir.getFileName().toString();
+            if (extensionsParentDir != null) {
+                updateExtensionsParentPom(extensionDirName, extensionsParentDir);
+                log.info(MessageIcons.OK_ICON + " New extension module '%s' added to %s", extensionDirName,
+                        extensionsParentDir);
+            }
+
+            if (itTestParentDir != null) {
+                updateITParentPomAndMoveDir(extensionDirName, newExtensionDir, itTestParentDir);
+                log.info(MessageIcons.OK_ICON + " New integration test module '%s' added to %s", extensionDirName,
+                        itTestParentDir);
+            }
+
+            if (bomDir != null) {
+                updateBom(groupId, artifactId, bomDir);
+                log.info(MessageIcons.OK_ICON
+                        + " The extension runtime and deployment artifacts have been added to the bom dependenciesManagement: %s",
+                        bomDir);
+            }
+
+            log.info("\n-----------\n" + MessageIcons.NOOP_ICON +
+                    " extension has been successfully generated in:\n--> "
+                    + newExtensionDir.toString() + "\n-----------");
+
+            return QuarkusCommandOutcome.success();
+        } catch (IOException e) {
+            throw new QuarkusCommandException("Error while creating Quarkus extension: " + e.getMessage(), e);
+        }
+    }
+
+    private void updateBom(String groupId, String artifactId, Path bomDir) throws QuarkusCommandException {
+        final Path bomPom = checkPomExists(bomDir);
+        List<PomTransformer.Transformation> transformations = new ArrayList<>();
+        transformations.add(PomTransformer.Transformation.addManagedDependency(groupId, artifactId,
+                "${project.version}"));
+        transformations.add(PomTransformer.Transformation.addManagedDependency(groupId, artifactId + "-deployment",
+                "${project.version}"));
+        new PomTransformer(bomPom, StandardCharsets.UTF_8).transform(transformations);
+    }
+
+    private void updateITParentPomAndMoveDir(String extensionDirName, Path newExtensionDir, Path itTestDir)
+            throws QuarkusCommandException, IOException {
+        final Path itTestPom = checkPomExists(itTestDir);
+        new PomTransformer(itTestPom, StandardCharsets.UTF_8)
+                .transform(PomTransformer.Transformation.addModule(extensionDirName));
+        FileUtils.moveDirectory(newExtensionDir.resolve("integration-tests").toFile(),
+                itTestDir.resolve(extensionDirName).toFile());
+    }
+
+    private void updateExtensionsParentPom(String extensionDirName, Path extensionsDir) throws QuarkusCommandException {
+        final Path extensionsPom = checkPomExists(extensionsDir);
+        new PomTransformer(extensionsPom, StandardCharsets.UTF_8)
+                .transform(PomTransformer.Transformation.addModule(extensionDirName));
+    }
+
+    public static Path checkPomExists(Path dir) throws QuarkusCommandException {
+        final Path pom = dir.resolve("pom.xml");
+        if (!Files.exists(pom)) {
+            throw new QuarkusCommandException("Invalid directory structure, file not found: " + pom.toString());
+        }
+        return pom;
+    }
+
+    public static Model readPom(Path dir) throws QuarkusCommandException {
+        final Path pom = checkPomExists(dir);
+        try {
+            return MojoUtils.readPom(pom.toFile());
+        } catch (IOException e) {
+            throw new QuarkusCommandException("Error while reading pom: " + pom.toString(), e);
+        }
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java
new file mode 100644
index 0000000000000..45f5e6e489207
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateJBangProjectCommandHandler.java
@@ -0,0 +1,74 @@
+package io.quarkus.devtools.commands.handlers;
+
+import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeCoordsFromQuery;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartCatalog;
+import io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartProjectInput;
+import io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartProjectInputBuilder;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageIcons;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.codegen.ProjectGenerator;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class CreateJBangProjectCommandHandler implements QuarkusCommandHandler {
+    @Override
+    public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws QuarkusCommandException {
+        final Set<String> extensionsQuery = invocation.getValue(ProjectGenerator.EXTENSIONS, Collections.emptySet());
+        final List<AppArtifactCoords> extensionsToAdd = computeCoordsFromQuery(invocation, extensionsQuery);
+        if (extensionsToAdd == null) {
+            throw new QuarkusCommandException("Failed to create project because of invalid extensions");
+        }
+
+        final ExtensionCatalog catalog = invocation.getExtensionsCatalog();
+
+        final QuarkusJBangCodestartProjectInputBuilder builder = QuarkusJBangCodestartProjectInput.builder()
+                .addExtensions(extensionsToAdd)
+                .setNoJBangWrapper(invocation.getBooleanValue("noJBangWrapper"))
+                .putData("quarkus.version", invocation.getExtensionsCatalog().getQuarkusCoreVersion());
+
+        if (catalog.getBom() != null) {
+            // TODO properly import the BOMs
+            final ArtifactCoords firstBom = catalog.getBom();
+            builder.putData(QuarkusJBangCodestartCatalog.JBangDataKey.QUARKUS_BOM_GROUP_ID.key(),
+                    firstBom.getGroupId())
+                    .putData(QuarkusJBangCodestartCatalog.JBangDataKey.QUARKUS_BOM_ARTIFACT_ID.key(),
+                            firstBom.getArtifactId())
+                    .putData(QuarkusJBangCodestartCatalog.JBangDataKey.QUARKUS_BOM_VERSION.key(),
+                            firstBom.getVersion());
+        }
+        final QuarkusJBangCodestartProjectInput input = builder.build();
+
+        final Path projectDir = invocation.getQuarkusProject().getProjectDirPath();
+        try {
+            invocation.log().info("-----------");
+            if (!extensionsToAdd.isEmpty()) {
+                invocation.log().info("selected extensions: \n"
+                        + extensionsToAdd.stream().map(e -> "- " + e.getGroupId() + ":" + e.getArtifactId() + "\n")
+                                .collect(Collectors.joining()));
+            }
+            getCatalog(invocation.getQuarkusProject()).createProject(input).generate(projectDir);
+            invocation.log()
+                    .info("\n-----------\n" + MessageIcons.NOOP_ICON
+                            + " jbang project has been successfully generated in:\n--> "
+                            + invocation.getQuarkusProject().getProjectDirPath().toString() + "\n-----------");
+        } catch (IOException e) {
+            throw new QuarkusCommandException("Failed to create JBang project: " + e.getMessage(), e);
+        }
+        return QuarkusCommandOutcome.success();
+    }
+
+    private QuarkusJBangCodestartCatalog getCatalog(QuarkusProject project) throws IOException {
+        return QuarkusJBangCodestartCatalog.fromResourceLoader(project.getCodestartsResourceLoader());
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
index 1ac7a7376c709..bc95464d4cc70 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
@@ -1,27 +1,42 @@
 package io.quarkus.devtools.commands.handlers;
 
+import static io.quarkus.devtools.commands.CreateProject.CODESTARTS;
+import static io.quarkus.devtools.commands.CreateProject.NO_BUILDTOOL_WRAPPER;
+import static io.quarkus.devtools.commands.CreateProject.NO_DOCKERFILES;
+import static io.quarkus.devtools.commands.CreateProject.NO_EXAMPLES;
+import static io.quarkus.devtools.commands.CreateProject.OVERRIDE_EXAMPLES;
 import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.computeCoordsFromQuery;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.*;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.BOM_ARTIFACT_ID;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.BOM_GROUP_ID;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.BOM_VERSION;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.CLASS_NAME;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.PACKAGE_NAME;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_GROUP_ID;
+import static io.quarkus.devtools.project.codegen.ProjectGenerator.QUARKUS_VERSION;
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.codestarts.CodestartProjectDefinition;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog;
+import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.LegacySupport;
+import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartProjectInput;
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.buildfile.GradleBuildFilesCreator;
+import io.quarkus.devtools.messagewriter.MessageIcons;
 import io.quarkus.devtools.project.codegen.ProjectGenerator;
-import io.quarkus.devtools.project.codegen.ProjectGeneratorRegistry;
-import io.quarkus.devtools.project.codegen.SourceType;
-import io.quarkus.devtools.project.codegen.rest.BasicRestProjectGenerator;
-import io.quarkus.devtools.project.extensions.ExtensionManager;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.tools.ConsoleMessageFormats;
+import io.quarkus.maven.ArtifactCoords;
 import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Instances of this class are thread-safe. They create a new project extracting all the necessary properties from an instance
@@ -31,11 +46,15 @@ public class CreateProjectCommandHandler implements QuarkusCommandHandler {
 
     @Override
     public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws QuarkusCommandException {
-        final QuarkusPlatformDescriptor platformDescr = invocation.getPlatformDescriptor();
-        invocation.setValue(BOM_GROUP_ID, platformDescr.getBomGroupId());
-        invocation.setValue(BOM_ARTIFACT_ID, platformDescr.getBomArtifactId());
-        invocation.setValue(QUARKUS_VERSION, platformDescr.getQuarkusVersion());
-        invocation.setValue(BOM_VERSION, platformDescr.getBomVersion());
+        final ExtensionCatalog platformDescr = invocation.getExtensionsCatalog();
+        final ArtifactCoords bom = platformDescr.getBom();
+        if (bom == null) {
+            throw new QuarkusCommandException("The platform BOM is missing");
+        }
+        invocation.setValue(BOM_GROUP_ID, bom.getGroupId());
+        invocation.setValue(BOM_ARTIFACT_ID, bom.getArtifactId());
+        invocation.setValue(BOM_VERSION, bom.getVersion());
+        invocation.setValue(QUARKUS_VERSION, platformDescr.getQuarkusCoreVersion());
         final Set<String> extensionsQuery = invocation.getValue(ProjectGenerator.EXTENSIONS, Collections.emptySet());
 
         final Properties quarkusProps = ToolsUtils.readQuarkusProperties(platformDescr);
@@ -46,47 +65,64 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
             }
         });
 
-        try {
-            String className = invocation.getStringValue(CLASS_NAME);
-            if (className != null) {
-                className = invocation.getValue(SOURCE_TYPE, SourceType.JAVA).stripExtensionFrom(className);
-                int idx = className.lastIndexOf('.');
-                if (idx >= 0) {
-                    String pkgName = invocation.getStringValue(PACKAGE_NAME);
-                    if (pkgName == null) {
-                        invocation.setValue(PACKAGE_NAME, className.substring(0, idx));
-                    }
-                    className = className.substring(idx + 1);
-                }
-                invocation.setValue(CLASS_NAME, className);
+        // Default to cleaned groupId if packageName not set
+        final String className = invocation.getStringValue(CLASS_NAME);
+        final String pkgName = invocation.getStringValue(PACKAGE_NAME);
+        final String groupId = invocation.getStringValue(PROJECT_GROUP_ID);
+        if (pkgName == null) {
+            if (className != null && className.contains(".")) {
+                final int idx = className.lastIndexOf('.');
+                invocation.setValue(PACKAGE_NAME, className.substring(0, idx));
+                invocation.setValue(CLASS_NAME, className.substring(idx + 1));
+            } else if (groupId != null) {
+                invocation.setValue(PACKAGE_NAME, groupId.replace("-", ".").replace("_", "."));
             }
+        }
 
-            final List<AppArtifactCoords> extensionsToAdd = computeCoordsFromQuery(invocation, extensionsQuery);
+        final List<AppArtifactCoords> extensionsToAdd = computeCoordsFromQuery(invocation, extensionsQuery);
+        if (extensionsToAdd == null) {
+            throw new QuarkusCommandException("Failed to create project because of invalid extensions");
+        }
+        try {
+            Map<String, Object> platformData = new HashMap<>();
+            if (platformDescr.getMetadata().get("maven") != null) {
+                platformData.put("maven", platformDescr.getMetadata().get("maven"));
+            }
+            if (platformDescr.getMetadata().get("gradle") != null) {
+                platformData.put("gradle", platformDescr.getMetadata().get("gradle"));
+            }
+            final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                    .addExtensions(extensionsToAdd)
+                    .buildTool(invocation.getQuarkusProject().getBuildTool())
+                    .addOverrideExamples(invocation.getValue(OVERRIDE_EXAMPLES, new HashSet<>()))
+                    .addCodestarts(invocation.getValue(CODESTARTS, new HashSet<>()))
+                    .noExamples(invocation.getValue(NO_EXAMPLES, false))
+                    .noBuildToolWrapper(invocation.getValue(NO_BUILDTOOL_WRAPPER, false))
+                    .noDockerfiles(invocation.getValue(NO_DOCKERFILES, false))
+                    .addData(platformData)
+                    .addData(LegacySupport.convertFromLegacy(invocation.getValues()))
+                    .messageWriter(invocation.log())
+                    .build();
+            invocation.log().info("-----------");
+            if (!extensionsToAdd.isEmpty()) {
+                invocation.log().info("selected extensions: \n"
+                        + extensionsToAdd.stream().map(e -> "- " + e.getGroupId() + ":" + e.getArtifactId() + "\n")
+                                .collect(Collectors.joining()));
+            }
 
-            // extensionsToAdd is null when an error occurred while matching extensions
-            if (extensionsToAdd != null) {
-                ProjectGeneratorRegistry.get(BasicRestProjectGenerator.NAME).generate(invocation);
+            final QuarkusCodestartCatalog catalog = QuarkusCodestartCatalog
+                    .fromExtensionsCatalog(invocation.getQuarkusProject().getExtensionsCatalog(),
+                            invocation.getQuarkusProject().getCodestartsResourceLoader());
+            final CodestartProjectDefinition projectDefinition = catalog.createProject(input);
+            projectDefinition.generate(invocation.getQuarkusProject().getProjectDirPath());
+            invocation.log()
+                    .info("\n-----------\n" + MessageIcons.OK_ICON + " "
+                            + projectDefinition.getRequiredCodestart(CodestartType.PROJECT).getName()
+                            + " project has been successfully generated in:\n--> "
+                            + invocation.getQuarkusProject().getProjectDirPath().toString() + "\n-----------");
 
-                //TODO ia3andy extensions should be added directly during the project generation
-                if (invocation.getQuarkusProject().getBuildTool().equals(BuildTool.GRADLE)) {
-                    final GradleBuildFilesCreator creator = new GradleBuildFilesCreator(invocation.getQuarkusProject());
-                    creator.create(
-                            invocation.getStringValue(PROJECT_GROUP_ID),
-                            invocation.getStringValue(PROJECT_ARTIFACT_ID),
-                            invocation.getStringValue(PROJECT_VERSION),
-                            quarkusProps,
-                            extensionsToAdd);
-                } else {
-                    final ExtensionManager.InstallResult result = invocation.getQuarkusProject().getExtensionManager()
-                            .install(extensionsToAdd);
-                    result.getInstalled()
-                            .forEach(a -> invocation.log()
-                                    .info(ConsoleMessageFormats.ok("Extension " + a.getGroupId() + ":" + a.getArtifactId())
-                                            + " has been installed"));
-                }
-            }
         } catch (IOException e) {
-            throw new QuarkusCommandException("Failed to create project", e);
+            throw new QuarkusCommandException("Failed to create project: " + e.getMessage(), e);
         }
         return QuarkusCommandOutcome.success();
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java
index 76ff92b02ee4b..37902284be4eb 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListExtensionsCommandHandler.java
@@ -1,24 +1,25 @@
 package io.quarkus.devtools.commands.handlers;
 
 import static io.quarkus.devtools.project.extensions.Extensions.toKey;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getGuide;
 import static java.util.stream.Collectors.toMap;
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
 import io.quarkus.devtools.commands.ListExtensions;
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
-import io.quarkus.platform.tools.MessageWriter;
-import io.quarkus.registry.DefaultExtensionRegistry;
-import io.quarkus.registry.ExtensionRegistry;
+import io.quarkus.platform.catalog.processor.ExtensionProcessor;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionOrigin;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
@@ -28,23 +29,56 @@
  */
 public class ListExtensionsCommandHandler implements QuarkusCommandHandler {
 
-    private static final String FULL_FORMAT = "%-8s %-50s %-50s %-25s%n%s";
+    private static final String FULL_FORMAT = "%-8s %-50s %-50s %-25s%s";
     private static final String CONCISE_FORMAT = "%-50s %-50s";
     private static final String NAME_FORMAT = "%-50s";
+    private static final String ORIGINS_FORMAT = "%-50s %-60s %s";
 
     @Override
     public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws QuarkusCommandException {
 
         final MessageWriter log = invocation.log();
         final boolean all = invocation.getValue(ListExtensions.ALL, true);
+        final boolean installedOnly = invocation.getValue(ListExtensions.INSTALLED, false);
+        final boolean cli = invocation.getValue(ListExtensions.FROM_CLI, false);
         final String format = invocation.getValue(ListExtensions.FORMAT, "concise");
         final String search = invocation.getValue(ListExtensions.SEARCH, "*");
         final ExtensionManager extensionManager = invocation.getValue(ListExtensions.EXTENSION_MANAGER,
                 invocation.getQuarkusProject().getExtensionManager());
-        ExtensionRegistry extensionRegistry = invocation.getValue(ListExtensions.EXTENSION_REGISTRY);
-        if (extensionRegistry == null) {
-            extensionRegistry = DefaultExtensionRegistry.fromPlatform(invocation.getPlatformDescriptor());
+
+        final Collection<Extension> extensions = search == null ? invocation.getExtensionsCatalog().getExtensions()
+                : QuarkusCommandHandlers.select(search, invocation.getExtensionsCatalog().getExtensions(), true)
+                        .getExtensions();
+
+        if (extensions.isEmpty()) {
+            log.info("No extension found with pattern '%s'", search);
+            return QuarkusCommandOutcome.success();
+        }
+
+        if (!cli) {
+            String extensionStatus = all ? "available" : "installable";
+            if (installedOnly)
+                extensionStatus = "installed";
+            log.info("%nCurrent Quarkus extensions %s: ", extensionStatus);
         }
+
+        BiConsumer<MessageWriter, Object[]> currentFormatter;
+        switch (format.toLowerCase()) {
+            case "name":
+                currentFormatter = this::nameFormatter;
+                break;
+            case "full":
+                currentFormatter = this::fullFormatter;
+                log.info(String.format(FULL_FORMAT, "Status", "Extension", "ArtifactId", "Updated Version", "Guide"));
+                break;
+            case "origins":
+                currentFormatter = this::originsFormatter;
+                break;
+            case "concise":
+            default:
+                currentFormatter = this::conciseFormatter;
+        }
+
         Map<AppArtifactKey, AppArtifactCoords> installedByKey;
         try {
             installedByKey = extensionManager.getInstalled().stream()
@@ -52,34 +86,15 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
         } catch (IOException e) {
             throw new QuarkusCommandException("Failed to determine the list of installed extensions", e);
         }
-        String quarkusVersion = invocation.getPlatformDescriptor().getQuarkusVersion();
-        Collection<Extension> platformExtensions = extensionRegistry.list(quarkusVersion, search);
-        if (platformExtensions.isEmpty()) {
-            log.info("No extension found with pattern '%s'", search);
-        } else {
-            String extensionStatus = all ? "available" : "installable";
-            log.info("%nCurrent Quarkus extensions %s: ", extensionStatus);
+        extensions.stream()
+                .filter(e -> !ExtensionProcessor.of(e).isUnlisted())
+                .forEach(e -> display(log, e, installedByKey.get(toKey(e)), all, installedOnly, currentFormatter));
+        final BuildTool buildTool = invocation.getQuarkusProject().getBuildTool();
+        boolean isGradle = BuildTool.GRADLE.equals(buildTool) || BuildTool.GRADLE_KOTLIN_DSL.equals(buildTool);
 
-            BiConsumer<MessageWriter, String[]> currentFormatter;
-            switch (format.toLowerCase()) {
-                case "name":
-                    currentFormatter = this::nameFormatter;
-                    break;
-                case "full":
-                    currentFormatter = this::fullFormatter;
-                    currentFormatter.accept(log,
-                            new String[] { "Status", "Extension", "ArtifactId", "Updated Version", "Guide" });
-                    break;
-                case "concise":
-                default:
-                    currentFormatter = this::conciseFormatter;
-            }
-
-            platformExtensions.forEach(platformExtension -> display(log, platformExtension,
-                    installedByKey.get(toKey(platformExtension)), all, currentFormatter));
-            final BuildTool buildTool = invocation.getQuarkusProject().getBuildTool();
+        if (!cli) {
             if ("concise".equalsIgnoreCase(format)) {
-                if (BuildTool.GRADLE.equals(buildTool)) {
+                if (isGradle) {
                     log.info("\nTo get more information, append --format=full to your command line.");
                 } else {
                     log.info(
@@ -87,35 +102,63 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
                 }
             }
 
-            if (BuildTool.GRADLE.equals(buildTool)) {
+            if (isGradle) {
                 log.info("\nAdd an extension to your project by adding the dependency to your " +
                         "build.gradle or use `./gradlew addExtension --extensions=\"artifactId\"`");
             } else {
                 log.info("\nAdd an extension to your project by adding the dependency to your " +
                         "pom.xml or use `./mvnw quarkus:add-extension -Dextensions=\"artifactId\"`");
             }
-
         }
 
         return QuarkusCommandOutcome.success();
     }
 
-    private void conciseFormatter(MessageWriter writer, String[] cols) {
-        writer.info(String.format(CONCISE_FORMAT, cols[1], cols[2], cols[4]));
+    private void conciseFormatter(MessageWriter writer, Object[] cols) {
+        Extension e = (Extension) cols[1];
+        writer.info(String.format(CONCISE_FORMAT, e.getName(), e.getArtifact().getArtifactId()));
     }
 
-    private void fullFormatter(MessageWriter writer, String[] cols) {
-        writer.info(String.format(FULL_FORMAT, cols[0], cols[1], cols[2], cols[3], cols[4]));
+    private void fullFormatter(MessageWriter writer, Object[] cols) {
+        Extension e = (Extension) cols[1];
+        final String guide = getGuide(e);
+        writer.info(String.format(FULL_FORMAT, cols[0], e.getName(), e.getArtifact().getArtifactId(), cols[2],
+                guide == null ? "" : guide));
     }
 
-    private void nameFormatter(MessageWriter writer, String[] cols) {
-        writer.info(String.format(NAME_FORMAT, cols[2]));
+    private void nameFormatter(MessageWriter writer, Object[] cols) {
+        Extension e = (Extension) cols[1];
+        writer.info(String.format(NAME_FORMAT, e.getArtifact().getArtifactId()));
     }
 
-    private void display(MessageWriter messageWriter, final Extension platformExtension, final AppArtifactCoords installed,
+    private void originsFormatter(MessageWriter writer, Object[] cols) {
+        Extension e = (Extension) cols[1];
+        String origin = null;
+        int i = 0;
+        final List<ExtensionOrigin> origins = e.getOrigins();
+        while (i < origins.size() && origin == null) {
+            final ExtensionOrigin o = origins.get(i++);
+            if (o.isPlatform()) {
+                origin = o.getBom().toString();
+            }
+        }
+        writer.info(String.format(ORIGINS_FORMAT, e.getName(), e.getArtifact().getVersion(), origin == null ? "" : origin));
+        while (i < origins.size()) {
+            final ExtensionOrigin o = origins.get(i++);
+            if (o.isPlatform()) {
+                writer.info(String.format(ORIGINS_FORMAT, "", "", o.getBom().toString()));
+            }
+        }
+    }
+
+    private void display(MessageWriter messageWriter, final Extension e, final AppArtifactCoords installed,
             boolean all,
-            BiConsumer<MessageWriter, String[]> formatter) {
-        if (!all && installed != null) {
+            boolean installedOnly,
+            BiConsumer<MessageWriter, Object[]> formatter) {
+        if (installedOnly && installed == null) {
+            return;
+        }
+        if (!installedOnly && !all && installed != null) {
             return;
         }
 
@@ -126,24 +169,17 @@ private void display(MessageWriter messageWriter, final Extension platformExtens
             final String installedVersion = installed.getVersion();
             if (installedVersion == null) {
                 label = "default";
-                version = platformExtension.getVersion();
-            } else if (installedVersion.equalsIgnoreCase(platformExtension.getVersion())) {
+                version = e.getArtifact().getVersion();
+            } else if (installedVersion.equalsIgnoreCase(e.getArtifact().getVersion())) {
                 label = "custom";
                 version = installedVersion;
             } else {
                 label = "custom*";
-                version = String.format("%s* <> %s", installedVersion, platformExtension.getVersion());
+                version = String.format("%s* <> %s", installedVersion, e.getArtifact().getVersion());
             }
         }
 
-        String[] result = new String[] { label, platformExtension.getName(), platformExtension.getArtifactId(), version,
-                platformExtension.getGuide() };
-
-        for (int i = 0; i < result.length; i++) {
-            result[i] = Objects.toString(result[i], "");
-        }
-
-        formatter.accept(messageWriter, result);
+        formatter.accept(messageWriter, new Object[] { label, e, version });
     }
 
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListPlatformsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListPlatformsCommandHandler.java
new file mode 100644
index 0000000000000..c2b23ad05b3b7
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/ListPlatformsCommandHandler.java
@@ -0,0 +1,27 @@
+package io.quarkus.devtools.commands.handlers;
+
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+
+public class ListPlatformsCommandHandler implements QuarkusCommandHandler {
+
+    @Override
+    public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws QuarkusCommandException {
+        final ExtensionCatalog catalog = invocation.getQuarkusProject().getExtensionsCatalog();
+        logPlatform(catalog, invocation.log());
+        catalog.getDerivedFrom().forEach(o -> logPlatform(o, invocation.log()));
+        return QuarkusCommandOutcome.success();
+    }
+
+    private static void logPlatform(ExtensionOrigin o, MessageWriter log) {
+        final ArtifactCoords bom = o.isPlatform() ? o.getBom() : null;
+        if (bom != null) {
+            log.info(bom.toString());
+        }
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java
new file mode 100644
index 0000000000000..571d1ebfba405
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/MultipleExtensionsFoundException.java
@@ -0,0 +1,27 @@
+package io.quarkus.devtools.commands.handlers;
+
+import io.quarkus.registry.catalog.Extension;
+import java.util.Collection;
+import java.util.Objects;
+
+/**
+ * Thrown when multiple extensions are found for a given installation plan
+ */
+public class MultipleExtensionsFoundException extends RuntimeException {
+
+    private final String keyword;
+    private final Collection<Extension> extensions;
+
+    public MultipleExtensionsFoundException(String keyword, Collection<Extension> extensions) {
+        this.keyword = Objects.requireNonNull(keyword, "Keyword must not be null");
+        this.extensions = Objects.requireNonNull(extensions, "Extensions should not be null");
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public Collection<Extension> getExtensions() {
+        return extensions;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java
index b0dfd2d898dc2..af2feb2ffad0b 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlers.java
@@ -1,19 +1,23 @@
 package io.quarkus.devtools.commands.handlers;
 
+import static io.quarkus.devtools.messagewriter.MessageIcons.ERROR_ICON;
 import static io.quarkus.devtools.project.extensions.Extensions.toCoords;
-import static io.quarkus.platform.tools.ConsoleMessageFormats.nok;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getExtendedKeywords;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getShortName;
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.isUnlisted;
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.SelectionResult;
 import io.quarkus.devtools.project.extensions.Extensions;
+import io.quarkus.maven.ArtifactKey;
+import io.quarkus.registry.catalog.Extension;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -35,7 +39,7 @@ static List<AppArtifactCoords> computeCoordsFromQuery(final QuarkusCommandInvoca
             } else if (countColons > 1) {
                 builder.add(AppArtifactCoords.fromString(query));
             } else {
-                Collection<Extension> extensions = invocation.getPlatformDescriptor().getExtensions();
+                Collection<Extension> extensions = invocation.getExtensionsCatalog().getExtensions();
                 SelectionResult result = select(query, extensions, false);
                 if (result.matches()) {
                     final Set<AppArtifactCoords> withStrippedVersion = result.getExtensions().stream().map(Extensions::toCoords)
@@ -46,13 +50,13 @@ static List<AppArtifactCoords> computeCoordsFromQuery(final QuarkusCommandInvoca
                     StringBuilder sb = new StringBuilder();
                     // We have 3 cases, we can still have a single candidate, but the match is on label
                     // or we have several candidates, or none
-                    Set<Extension> candidates = result.getExtensions();
+                    Collection<Extension> candidates = result.getExtensions();
                     if (candidates.isEmpty()) {
                         // No matches at all.
-                        invocation.log().info(nok("Cannot find a dependency matching '" + query + "', maybe a typo?"));
+                        invocation.log().error("Cannot find a dependency matching '" + query + "', maybe a typo?");
                         return null;
                     } else {
-                        sb.append(nok("Multiple extensions matching '")).append(query).append("'");
+                        sb.append(ERROR_ICON + " Multiple extensions matching '").append(query).append("'");
                         result.getExtensions()
                                 .forEach(extension -> sb.append(System.lineSeparator()).append("     * ")
                                         .append(extension.managementKey()));
@@ -71,77 +75,73 @@ static List<AppArtifactCoords> computeCoordsFromQuery(final QuarkusCommandInvoca
      * Selection algorithm.
      *
      * @param query the query
-     * @param allPlatformExtensions the list of all platform extensions
+     * @param allExtensions the list of all platform extensions
      * @param labelLookup whether or not the query must be tested against the labels of the extensions. Should
      *        be {@code false} by default.
      * @return the list of matching candidates and whether or not a match has been found.
      */
-    static SelectionResult select(final String query, final Collection<Extension> allPlatformExtensions,
+    static SelectionResult select(final String query, final Collection<Extension> allExtensions,
             final boolean labelLookup) {
         String q = query.trim().toLowerCase();
 
-        // Try exact matches
-        Set<Extension> matchesNameOrArtifactId = allPlatformExtensions.stream()
-                .filter(extension -> extension.getName().equalsIgnoreCase(q) || matchesArtifactId(extension.getArtifactId(), q))
-                .collect(Collectors.toSet());
-        if (matchesNameOrArtifactId.size() == 1) {
-            return new SelectionResult(matchesNameOrArtifactId, true);
-        }
+        final Map<ArtifactKey, Extension> matches = new LinkedHashMap<>();
 
-        final List<Extension> listedPlatformExtensions = allPlatformExtensions.stream()
-                .filter(e -> !e.isUnlisted()).collect(Collectors.toList());
+        if (!isExpression(q)) {
+            // Try exact matches
+            allExtensions.stream()
+                    .filter(extension -> extension.getName().equalsIgnoreCase(q)
+                            || matchesArtifactId(extension.getArtifact().getArtifactId(), q))
+                    .forEach(e -> matches.putIfAbsent(e.getArtifact().getKey(), e));
+            if (matches.size() == 1) {
+                return new SelectionResult(matches.values(), true);
+            }
 
-        // Try short names
-        Set<Extension> matchesShortName = listedPlatformExtensions.stream().filter(extension -> matchesShortName(extension, q))
-                .collect(Collectors.toSet());
+            final List<Extension> listedExtensions = getListedExtensions(allExtensions);
 
-        if (matchesShortName.size() == 1 && matchesNameOrArtifactId.isEmpty()) {
-            return new SelectionResult(matchesShortName, true);
-        }
+            // Try short names
+            listedExtensions.stream().filter(extension -> matchesShortName(extension, q))
+                    .forEach(e -> matches.putIfAbsent(e.getArtifact().getKey(), e));
+            if (matches.size() == 1) {
+                return new SelectionResult(matches.values(), true);
+            }
 
-        // Partial matches on name, artifactId and short names
-        Set<Extension> partialMatches = listedPlatformExtensions.stream()
-                .filter(extension -> extension.getName().toLowerCase().contains(q)
-                        || extension.getArtifactId().toLowerCase().contains(q)
-                        || extension.getShortName().toLowerCase().contains(q))
-                .collect(Collectors.toSet());
-        // Even if we have a single partial match, if the name, artifactId and short names are ambiguous, so not
-        // consider it as a match.
-        if (partialMatches.size() == 1 && matchesNameOrArtifactId.isEmpty() && matchesShortName.isEmpty()) {
-            return new SelectionResult(partialMatches, true);
-        }
+            // Partial matches on name, artifactId and short names
+            listedExtensions.stream()
+                    .filter(extension -> extension.getName().toLowerCase().contains(q)
+                            || extension.getArtifact().getArtifactId().toLowerCase().contains(q)
+                            || getShortName(extension).toLowerCase().contains(q))
+                    .forEach(e -> matches.putIfAbsent(e.getArtifact().getKey(), e));
+            // Even if we have a single partial match, if the name, artifactId and short names are ambiguous, so not
+            // consider it as a match.
+            if (matches.size() == 1) {
+                return new SelectionResult(matches.values(), true);
+            }
 
-        // find by labels
-        List<Extension> matchesLabels;
-        if (labelLookup) {
-            matchesLabels = listedPlatformExtensions.stream()
-                    .filter(extension -> extension.labelsForMatching().contains(q)).collect(Collectors.toList());
-        } else {
-            matchesLabels = Collections.emptyList();
+            // find by labels
+            if (labelLookup) {
+                listedExtensions.stream()
+                        .filter(extension -> getExtendedKeywords(extension).contains(q))
+                        .forEach(e -> matches.put(e.getArtifact().getKey(), e));
+            }
+            return new SelectionResult(matches.values(), false);
         }
-
+        final List<Extension> listedExtensions = getListedExtensions(allExtensions);
         // find by pattern
-        Set<Extension> matchesPatterns;
         Pattern pattern = toRegex(q);
         if (pattern != null) {
-            matchesPatterns = listedPlatformExtensions.stream()
+            listedExtensions.stream()
                     .filter(extension -> pattern.matcher(extension.getName().toLowerCase()).matches()
-                            || pattern.matcher(extension.getArtifactId().toLowerCase()).matches()
-                            || pattern.matcher(extension.getShortName().toLowerCase()).matches()
-                            || matchLabels(pattern, extension.getKeywords()))
-                    .collect(Collectors.toSet());
-            return new SelectionResult(matchesPatterns, true);
-        } else {
-            matchesPatterns = Collections.emptySet();
+                            || pattern.matcher(extension.getArtifact().getArtifactId().toLowerCase()).matches()
+                            || pattern.matcher(getShortName(extension).toLowerCase()).matches()
+                            || matchLabels(pattern, getExtendedKeywords(extension)))
+                    .forEach(e -> matches.putIfAbsent(e.getArtifact().getKey(), e));
         }
+        return new SelectionResult(matches.values(), !matches.isEmpty());
+    }
 
-        Set<Extension> candidates = new LinkedHashSet<>();
-        candidates.addAll(matchesNameOrArtifactId);
-        candidates.addAll(matchesShortName);
-        candidates.addAll(partialMatches);
-        candidates.addAll(matchesLabels);
-        candidates.addAll(matchesPatterns);
-        return new SelectionResult(candidates, false);
+    private static List<Extension> getListedExtensions(final Collection<Extension> allExtensions) {
+        return allExtensions.stream()
+                .filter(e -> !isUnlisted(e)).collect(Collectors.toList());
     }
 
     private static boolean matchLabels(Pattern pattern, List<String> labels) {
@@ -166,11 +166,8 @@ private static Pattern toRegex(final String str) {
     }
 
     private static String wildcardToRegex(String wildcard) {
-        if (wildcard == null || wildcard.isEmpty()) {
-            return null;
-        }
         // don't try with file match char in pattern
-        if (!(wildcard.contains("*") || wildcard.contains("?"))) {
+        if (!isExpression(wildcard)) {
             return null;
         }
         StringBuffer s = new StringBuffer(wildcard.length());
@@ -210,8 +207,12 @@ private static String wildcardToRegex(String wildcard) {
         return (s.toString());
     }
 
+    private static boolean isExpression(String s) {
+        return s == null || s.isEmpty() ? false : s.contains("*") || s.contains("?");
+    }
+
     private static boolean matchesShortName(Extension extension, String q) {
-        return q.equalsIgnoreCase(extension.getShortName());
+        return q.equalsIgnoreCase(getShortName(extension));
     }
 
     private static boolean matchesArtifactId(String artifactId, String q) {
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java
index 7844f86e6cf81..798a187841b5d 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/RemoveExtensionsCommandHandler.java
@@ -9,9 +9,9 @@
 import io.quarkus.devtools.commands.data.QuarkusCommandException;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.messagewriter.MessageIcons;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import io.quarkus.devtools.project.extensions.ExtensionManager.UninstallResult;
-import io.quarkus.platform.tools.ConsoleMessageFormats;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
@@ -32,23 +32,22 @@ public QuarkusCommandOutcome execute(QuarkusCommandInvocation invocation) throws
         }
 
         final List<AppArtifactCoords> extensionsToRemove = computeCoordsFromQuery(invocation, extensionsQuery);
+        if (extensionsToRemove == null) {
+            return new QuarkusCommandOutcome(false).setValue(RemoveExtensions.OUTCOME_UPDATED, false);
+        }
         final ExtensionManager extensionManager = invocation.getValue(EXTENSION_MANAGER,
                 invocation.getQuarkusProject().getExtensionManager());
         try {
-            if (extensionsToRemove != null) {
-                final Set<AppArtifactKey> keys = extensionsToRemove.stream().map(AppArtifactCoords::getKey)
-                        .collect(Collectors.toSet());
-                final UninstallResult result = extensionManager.uninstall(keys);
-                result.getUninstalled()
-                        .forEach(a -> invocation.log()
-                                .info(ConsoleMessageFormats.ok("Extension " + a.getGroupId() + ":" + a.getArtifactId())
-                                        + " has been uninstalled"));
-                return new QuarkusCommandOutcome(true).setValue(RemoveExtensions.OUTCOME_UPDATED, result.isSourceUpdated());
-            }
+            final Set<AppArtifactKey> keys = extensionsToRemove.stream().map(AppArtifactCoords::getKey)
+                    .collect(Collectors.toSet());
+            final UninstallResult result = extensionManager.uninstall(keys);
+            result.getUninstalled()
+                    .forEach(a -> invocation.log()
+                            .info(MessageIcons.OK_ICON + " Extension " + a.getGroupId() + ":" + a.getArtifactId()
+                                    + " has been uninstalled"));
+            return new QuarkusCommandOutcome(true).setValue(RemoveExtensions.OUTCOME_UPDATED, result.isSourceUpdated());
         } catch (IOException e) {
-            throw new QuarkusCommandException("Failed to add extensions", e);
+            throw new QuarkusCommandException("Failed to remove extensions", e);
         }
-
-        return new QuarkusCommandOutcome(true).setValue(RemoveExtensions.OUTCOME_UPDATED, false);
     }
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java
index f4bb1b3d98a5f..9678932a9ae17 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/BuildTool.java
@@ -1,9 +1,10 @@
 package io.quarkus.devtools.project;
 
-import io.quarkus.devtools.project.buildfile.GenericGradleBuildFile;
+import io.quarkus.devtools.project.buildfile.GroovyGradleBuildFile;
+import io.quarkus.devtools.project.buildfile.KotlinGradleBuildFile;
 import io.quarkus.devtools.project.buildfile.MavenBuildFile;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.nio.file.Path;
 
 /**
@@ -19,7 +20,12 @@ public enum BuildTool {
     /** Gradle build tool */
     GRADLE("\n# Gradle\n.gradle/\nbuild/",
             "build",
-            new String[] { "build.gradle", "settings.gradle", "gradle.properties" });
+            new String[] { "build.gradle", "settings.gradle", "gradle.properties" }),
+
+    /** Gradle build tool with Kotlin DSL */
+    GRADLE_KOTLIN_DSL("\n# Gradle\n.gradle/\nbuild/",
+            "build",
+            new String[] { "build.gradle.kts", "settings.gradle.kts", "gradle.properties" });
 
     private final String gitIgnoreEntries;
 
@@ -53,26 +59,32 @@ public String getBuildDirectory() {
     }
 
     public ExtensionManager createExtensionManager(final Path projectDirPath,
-            final QuarkusPlatformDescriptor platformDescriptor) {
+            ExtensionCatalog catalog) {
         switch (this) {
             case GRADLE:
-                return new GenericGradleBuildFile();
+                return new GroovyGradleBuildFile();
+            case GRADLE_KOTLIN_DSL:
+                return new KotlinGradleBuildFile();
             case MAVEN:
             default:
-                return new MavenBuildFile(projectDirPath, platformDescriptor);
+                return new MavenBuildFile(projectDirPath, catalog);
         }
     }
 
+    public String getKey() {
+        return toString().toLowerCase().replace("_", "-");
+    }
+
     public static BuildTool resolveExistingProject(Path path) {
         return QuarkusProject.resolveExistingProjectBuildTool(path);
     }
 
     public static BuildTool findTool(String tool) {
-        if ("GRADLE".equalsIgnoreCase(tool))
-            return GRADLE;
-        else if ("MAVEN".equalsIgnoreCase(tool))
-            return MAVEN;
-        else
-            return null;
+        for (BuildTool value : BuildTool.values()) {
+            if (value.toString().equalsIgnoreCase(tool) || value.getKey().equalsIgnoreCase(tool)) {
+                return value;
+            }
+        }
+        return null;
     }
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java
index dac22e0692daa..bc98410fcb6cc 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProject.java
@@ -2,47 +2,38 @@
 
 import static java.util.Objects.requireNonNull;
 
-import io.quarkus.devtools.project.buildfile.MavenBuildFile;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.nio.file.Path;
 
 public final class QuarkusProject {
 
     private final Path projectDirPath;
-    private final QuarkusPlatformDescriptor platformDescriptor;
+    private ExtensionCatalog catalog;
+    private ResourceLoader resourceLoader;
     private final ExtensionManager extensionManager;
 
-    private QuarkusProject(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor,
-            final ExtensionManager extensionManager) {
+    private QuarkusProject(Path projectDirPath, ExtensionCatalog catalog, ResourceLoader codestartPathLoader,
+            MessageWriter log,
+            ExtensionManager extensionManager) {
         this.projectDirPath = requireNonNull(projectDirPath, "projectDirPath is required");
-        this.platformDescriptor = requireNonNull(platformDescriptor, "platformDescriptor is required");
+        this.catalog = requireNonNull(catalog, "catalog is required");
+        this.resourceLoader = requireNonNull(codestartPathLoader, "resourceLoader is required");
         this.extensionManager = requireNonNull(extensionManager, "extensionManager is required");
     }
 
-    public static QuarkusProject of(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor,
+    public static QuarkusProject of(final Path projectDirPath, final ExtensionCatalog catalog,
+            ResourceLoader resourceLoader, MessageWriter log,
             final ExtensionManager extensionManager) {
-        return new QuarkusProject(projectDirPath, platformDescriptor, extensionManager);
-    }
-
-    public static QuarkusProject of(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor,
-            final BuildTool buildTool) {
-        return new QuarkusProject(projectDirPath, platformDescriptor,
-                buildTool.createExtensionManager(projectDirPath, platformDescriptor));
-    }
-
-    public static QuarkusProject maven(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor) {
-        return new QuarkusProject(projectDirPath, platformDescriptor,
-                new MavenBuildFile(projectDirPath, platformDescriptor));
+        return new QuarkusProject(projectDirPath, catalog, resourceLoader, log, extensionManager);
     }
 
-    public static QuarkusProject resolveExistingProject(final Path projectDirPath,
-            final QuarkusPlatformDescriptor descriptor) {
-        final BuildTool buildTool = resolveExistingProjectBuildTool(projectDirPath);
-        if (buildTool == null) {
-            throw new IllegalStateException("This is neither a Maven or Gradle project");
-        }
-        return of(projectDirPath, descriptor, buildTool);
+    public static QuarkusProject of(Path projectDirPath, ExtensionCatalog catalog, ResourceLoader codestartsResourceLoader,
+            MessageWriter log, BuildTool buildTool) {
+        return new QuarkusProject(projectDirPath, catalog, codestartsResourceLoader, log,
+                buildTool.createExtensionManager(projectDirPath, catalog));
     }
 
     public Path getProjectDirPath() {
@@ -57,16 +48,21 @@ public ExtensionManager getExtensionManager() {
         return extensionManager;
     }
 
-    public QuarkusPlatformDescriptor getPlatformDescriptor() {
-        return platformDescriptor;
+    public ExtensionCatalog getExtensionsCatalog() {
+        return catalog;
+    }
+
+    public ResourceLoader getCodestartsResourceLoader() {
+        return resourceLoader;
     }
 
     public static BuildTool resolveExistingProjectBuildTool(Path projectDirPath) {
         if (projectDirPath.resolve("pom.xml").toFile().exists()) {
             return BuildTool.MAVEN;
-        } else if (projectDirPath.resolve("build.gradle").toFile().exists()
-                || projectDirPath.resolve("build.gradle.kts").toFile().exists()) {
+        } else if (projectDirPath.resolve("build.gradle").toFile().exists()) {
             return BuildTool.GRADLE;
+        } else if (projectDirPath.resolve("build.gradle.kts").toFile().exists()) {
+            return BuildTool.GRADLE_KOTLIN_DSL;
         }
         return null;
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java
new file mode 100644
index 0000000000000..088434386600a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java
@@ -0,0 +1,171 @@
+package io.quarkus.devtools.project;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.extensions.ExtensionManager;
+import io.quarkus.platform.descriptor.loader.json.ClassPathResourceLoader;
+import io.quarkus.platform.tools.ToolsConstants;
+import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.registry.ExtensionCatalogResolver;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.config.RegistriesConfig;
+import io.quarkus.registry.config.RegistriesConfigLocator;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+
+public class QuarkusProjectHelper {
+
+    private static final String CODESTARTS_ARTIFACTS = "codestarts-artifacts";
+
+    private static RegistriesConfig toolsConfig;
+    private static MessageWriter log;
+    private static MavenArtifactResolver artifactResolver;
+    private static ExtensionCatalogResolver catalogResolver;
+
+    public static QuarkusProject getProject(Path projectDir) {
+        BuildTool buildTool = QuarkusProject.resolveExistingProjectBuildTool(projectDir);
+        if (buildTool == null) {
+            buildTool = BuildTool.MAVEN;
+        }
+        return getProject(projectDir, buildTool);
+    }
+
+    public static QuarkusProject getProject(Path projectDir, String quarkusVersion) {
+        // TODO remove this method once the default registry becomes available
+        BuildTool buildTool = QuarkusProject.resolveExistingProjectBuildTool(projectDir);
+        if (buildTool == null) {
+            buildTool = BuildTool.MAVEN;
+        }
+        return getProject(projectDir, buildTool, quarkusVersion);
+    }
+
+    public static QuarkusProject getProject(Path projectDir, BuildTool buildTool, String quarkusVersion) {
+        // TODO remove this method once the default registry becomes available
+        final ExtensionCatalogResolver catalogResolver = getCatalogResolver();
+        if (catalogResolver.hasRegistries()) {
+            return getProject(projectDir, buildTool);
+        }
+        return QuarkusProjectHelper.getProject(projectDir,
+                ToolsUtils.resolvePlatformDescriptorDirectly(null, null, quarkusVersion, artifactResolver(), messageWriter()),
+                buildTool);
+    }
+
+    public static QuarkusProject getProject(Path projectDir, BuildTool buildTool) {
+        final ExtensionCatalog catalog;
+        try {
+            catalog = resolveExtensionCatalog();
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to resolve the Quarkus extension catalog", e);
+        }
+
+        return getProject(projectDir, catalog, buildTool, messageWriter());
+    }
+
+    public static QuarkusProject getProject(Path projectDir, ExtensionCatalog catalog, BuildTool buildTool) {
+        return getProject(projectDir, catalog, buildTool, messageWriter());
+    }
+
+    public static QuarkusProject getProject(Path projectDir, ExtensionCatalog catalog, BuildTool buildTool,
+            MessageWriter log) {
+        return QuarkusProject.of(projectDir, catalog, getResourceLoader(catalog, artifactResolver()),
+                log, buildTool);
+    }
+
+    public static QuarkusProject getProject(Path projectDir, ExtensionManager extManager) throws RegistryResolutionException {
+        return getProject(projectDir, resolveExtensionCatalog(), extManager, messageWriter());
+    }
+
+    public static ExtensionCatalog resolveExtensionCatalog() throws RegistryResolutionException {
+        return getCatalogResolver().resolveExtensionCatalog();
+    }
+
+    public static QuarkusProject getProject(Path projectDir, ExtensionCatalog catalog, ExtensionManager extManager,
+            MessageWriter log) {
+        return QuarkusProject.of(projectDir, catalog, getResourceLoader(catalog, artifactResolver()),
+                log, extManager);
+    }
+
+    public static ClassPathResourceLoader getResourceLoader(ExtensionCatalog catalog) {
+        return getResourceLoader(catalog, artifactResolver());
+    }
+
+    public static ClassPathResourceLoader getResourceLoader(ExtensionCatalog catalog, MavenArtifactResolver mvn) {
+        Object o = catalog.getMetadata().get(CODESTARTS_ARTIFACTS);
+        final List<Artifact> codestartsArtifacts;
+        if (o == null) {
+            // This is hardcoded temporarily
+            codestartsArtifacts = Arrays
+                    .asList(new DefaultArtifact(ToolsConstants.IO_QUARKUS, "quarkus-platform-descriptor-json", "", "jar",
+                            catalog.getQuarkusCoreVersion()));
+        } else {
+            @SuppressWarnings({ "unchecked" })
+            final List<Object> list = o instanceof List ? (List<Object>) o : Arrays.asList(o);
+            codestartsArtifacts = new ArrayList<>(list.size());
+            for (Object i : list) {
+                AppArtifactCoords coords = AppArtifactCoords.fromString(i.toString());
+                codestartsArtifacts.add(new DefaultArtifact(coords.getGroupId(), coords.getArtifactId(), coords.getClassifier(),
+                        coords.getType(), coords.getVersion()));
+            }
+        }
+
+        final URL[] urls = new URL[codestartsArtifacts.size()];
+        for (int i = 0; i < codestartsArtifacts.size(); ++i) {
+            try {
+                urls[i] = mvn.resolve(codestartsArtifacts.get(i)).getArtifact().getFile().toURI().toURL();
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to resolve codestart artifact " + codestartsArtifacts.get(i), e);
+            }
+        }
+
+        return new ClassPathResourceLoader(new URLClassLoader(urls, null));
+    }
+
+    public static ExtensionCatalogResolver getCatalogResolver() {
+        return catalogResolver == null ? catalogResolver = getCatalogResolver(artifactResolver(), messageWriter())
+                : catalogResolver;
+    }
+
+    public static ExtensionCatalogResolver getCatalogResolver(MessageWriter log) {
+        return catalogResolver == null ? catalogResolver = getCatalogResolver(artifactResolver(), log)
+                : catalogResolver;
+    }
+
+    public static ExtensionCatalogResolver getCatalogResolver(MavenArtifactResolver resolver, MessageWriter log) {
+        return ExtensionCatalogResolver.builder()
+                .artifactResolver(resolver)
+                .config(toolsConfig())
+                .messageWriter(log)
+                .build();
+    }
+
+    private static RegistriesConfig toolsConfig() {
+        return toolsConfig == null ? toolsConfig = RegistriesConfigLocator.resolveConfig() : toolsConfig;
+    }
+
+    public static MessageWriter messageWriter() {
+        return log == null ? log = toolsConfig().isDebug() ? MessageWriter.debug() : MessageWriter.info() : log;
+    }
+
+    public static MavenArtifactResolver artifactResolver() {
+        if (artifactResolver == null) {
+            try {
+                artifactResolver = MavenArtifactResolver.builder()
+                        .setArtifactTransferLogging(toolsConfig().isDebug())
+                        .setWorkspaceDiscovery(false)
+                        .build();
+            } catch (BootstrapMavenException e) {
+                throw new IllegalStateException("Failed to initialize the Maven artifact resolver", e);
+            }
+        }
+        return artifactResolver;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java
index ab60cfbde3a05..2a7f495f1a226 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java
@@ -2,8 +2,7 @@
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -14,83 +13,91 @@
 import java.util.Properties;
 import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 // We keep it here to take advantage of the abstract tests
-public abstract class AbstractGradleBuildFile extends BuildFile {
+abstract class AbstractGradleBuildFile extends BuildFile {
+
+    private static final Pattern DEPENDENCIES_SECTION = Pattern.compile("^[\\t ]*dependencies\\s*\\{\\s*$", Pattern.MULTILINE);
 
-    private static final String BUILD_GRADLE_PATH = "build.gradle";
-    private static final String SETTINGS_GRADLE_PATH = "settings.gradle";
     private static final String GRADLE_PROPERTIES_PATH = "gradle.properties";
 
     private final Path rootProjectPath;
 
-    private AtomicReference<Model> modelReference = new AtomicReference<>();
+    private final AtomicReference<Model> modelReference = new AtomicReference<>();
 
-    public AbstractGradleBuildFile(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor) {
-        this(projectDirPath, platformDescriptor, null);
+    public AbstractGradleBuildFile(final Path projectDirPath, final ExtensionCatalog catalog) {
+        this(projectDirPath, catalog, null);
     }
 
-    public AbstractGradleBuildFile(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor,
+    public AbstractGradleBuildFile(final Path projectDirPath, final ExtensionCatalog catalog,
             Path rootProjectPath) {
-        super(projectDirPath, platformDescriptor);
+        super(projectDirPath, catalog);
         this.rootProjectPath = rootProjectPath;
     }
 
+    abstract String getSettingsGradlePath();
+
+    abstract String getBuildGradlePath();
+
     @Override
     public void writeToDisk() throws IOException {
         if (rootProjectPath != null) {
-            Files.write(rootProjectPath.resolve(SETTINGS_GRADLE_PATH), getModel().getRootSettingsContent().getBytes());
+            Files.write(rootProjectPath.resolve(getSettingsGradlePath()), getModel().getRootSettingsContent().getBytes());
             try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
                 getModel().getRootPropertiesContent().store(out, "Gradle properties");
                 Files.write(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH),
                         out.toByteArray());
             }
         } else {
-            writeToProjectFile(SETTINGS_GRADLE_PATH, getModel().getSettingsContent().getBytes());
+            writeToProjectFile(getSettingsGradlePath(), getModel().getSettingsContent().getBytes());
             try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
                 getModel().getPropertiesContent().store(out, "Gradle properties");
                 writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray());
             }
         }
-        writeToProjectFile(BUILD_GRADLE_PATH, getModel().getBuildContent().getBytes());
-    }
-
-    @Override
-    protected boolean addDependency(AppArtifactCoords coords, boolean managed) {
-        return addDependencyInModel(getModel(), coords, managed);
+        writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent().getBytes());
     }
 
-    static boolean addDependencyInModel(Model model, AppArtifactCoords coords, boolean managed) {
-        StringBuilder newDependency = new StringBuilder()
-                .append("    implementation '")
-                .append(coords.getGroupId())
-                .append(":")
-                .append(coords.getArtifactId());
+    static String createDependencyCoordinatesString(AppArtifactCoords coords, boolean managed, char quoteChar) {
+        StringBuilder newDependency = new StringBuilder().append(quoteChar)
+                .append(coords.getGroupId()).append(":").append(coords.getArtifactId());
         if (!managed &&
                 (coords.getVersion() != null && !coords.getVersion().isEmpty())) {
             newDependency.append(":").append(coords.getVersion());
         }
-        newDependency.append("'").append(System.lineSeparator());
-        String newDependencyString = newDependency.toString();
+        boolean isBOM = "pom".equals(coords.getType());
+        if (isBOM && !managed) {
+            return String.format("enforcedPlatform(%s)", newDependency.append(quoteChar).toString());
+        }
+        return newDependency.append(quoteChar).toString();
+    }
+
+    static boolean addDependencyInModel(Model model, String newDependency) {
         StringBuilder buildContent = new StringBuilder(model.getBuildContent());
-        boolean changed = false;
-        if (buildContent.indexOf(newDependencyString) == -1) {
-            changed = true;
-            // Add dependency after "dependencies {"
-            int indexOfDeps = buildContent.indexOf("dependencies {");
-            if (indexOfDeps > -1) {
-                // The line below fails on Windows if System.lineSeparator() is used
-                int nextLine = buildContent.indexOf("\n", indexOfDeps) + 1;
-                buildContent.insert(nextLine, newDependencyString);
-            } else {
-                // if no "dependencies {" found, add one
-                buildContent.append("dependencies {").append(System.lineSeparator())
-                        .append(newDependencyString)
-                        .append("}").append(System.lineSeparator());
-            }
-            model.setBuildContent(buildContent.toString());
+        // Add dependency after "dependencies {"
+        Matcher matcher = DEPENDENCIES_SECTION.matcher(buildContent);
+        if (matcher.find()) {
+            // The line below fails on Windows if System.lineSeparator() is used
+            int nextLine = buildContent.indexOf("\n", matcher.start()) + 1;
+            buildContent.insert(nextLine, newDependency);
+        } else {
+            // if no "dependencies {" found, add one
+            buildContent.append("dependencies {").append(System.lineSeparator())
+                    .append(newDependency)
+                    .append("}").append(System.lineSeparator());
+        }
+        model.setBuildContent(buildContent.toString());
+        return true;
+    }
+
+    static String getProperty(Model model, String propertyName) {
+        final String property = model.getPropertiesContent().getProperty(propertyName);
+        if (property != null || model.getRootPropertiesContent() == null) {
+            return property;
         }
-        return changed;
+        return model.getRootPropertiesContent().getProperty(propertyName);
     }
 
     @Override
@@ -109,19 +116,10 @@ protected void removeDependency(AppArtifactKey key) {
 
     @Override
     public String getProperty(String propertyName) {
-        final String property = getModel().getPropertiesContent().getProperty(propertyName);
-        if (property != null || getModel().getRootPropertiesContent() == null) {
-            return property;
-        }
-        return getModel().getRootPropertiesContent().getProperty(propertyName);
-    }
-
-    @Override
-    public BuildTool getBuildTool() {
-        return BuildTool.GRADLE;
+        return getProperty(getModel(), propertyName);
     }
 
-    private Model getModel() {
+    Model getModel() {
         return modelReference.updateAndGet(model -> {
             if (model == null) {
                 try {
@@ -139,7 +137,7 @@ protected void refreshData() {
         this.modelReference.set(null);
     }
 
-    private boolean hasRootProjectFile(final String fileName) throws IOException {
+    private boolean hasRootProjectFile(final String fileName) {
         if (rootProjectPath == null) {
             return false;
         }
@@ -161,16 +159,16 @@ private Model readModel() throws IOException {
         Properties propertiesContent = new Properties();
         String rootSettingsContent = null;
         Properties rootPropertiesContent = null;
-        if (hasProjectFile(SETTINGS_GRADLE_PATH)) {
-            final byte[] settings = readProjectFile(SETTINGS_GRADLE_PATH);
+        if (hasProjectFile(getSettingsGradlePath())) {
+            final byte[] settings = readProjectFile(getSettingsGradlePath());
             settingsContent = new String(settings, StandardCharsets.UTF_8);
         }
-        if (hasRootProjectFile(SETTINGS_GRADLE_PATH)) {
-            final byte[] settings = readRootProjectFile(SETTINGS_GRADLE_PATH);
+        if (hasRootProjectFile(getSettingsGradlePath())) {
+            final byte[] settings = readRootProjectFile(getSettingsGradlePath());
             rootSettingsContent = new String(settings, StandardCharsets.UTF_8);
         }
-        if (hasProjectFile(BUILD_GRADLE_PATH)) {
-            final byte[] build = readProjectFile(BUILD_GRADLE_PATH);
+        if (hasProjectFile(getBuildGradlePath())) {
+            final byte[] build = readProjectFile(getBuildGradlePath());
             buildContent = new String(build, StandardCharsets.UTF_8);
         }
         if (hasProjectFile(GRADLE_PROPERTIES_PATH)) {
@@ -185,17 +183,17 @@ private Model readModel() throws IOException {
         return new Model(settingsContent, buildContent, propertiesContent, rootSettingsContent, rootPropertiesContent);
     }
 
-    protected String getBuildContent() throws IOException {
+    protected String getBuildContent() {
         return getModel().getBuildContent();
     }
 
     static class Model {
         private String settingsContent;
         private String buildContent;
-        private Properties propertiesContent;
+        private final Properties propertiesContent;
 
-        private String rootSettingsContent;
-        private Properties rootPropertiesContent;
+        private final String rootSettingsContent;
+        private final Properties rootPropertiesContent;
 
         public Model(String settingsContent, String buildContent, Properties propertiesContent, String rootSettingsContent,
                 Properties rootPropertiesContent) {
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java
new file mode 100644
index 0000000000000..8bae8894e615a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java
@@ -0,0 +1,144 @@
+package io.quarkus.devtools.project.buildfile;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
+
+abstract class AbstractGradleBuildFilesCreator {
+
+    private static final String GRADLE_PROPERTIES_PATH = "gradle.properties";
+    private final QuarkusProject quarkusProject;
+
+    private AtomicReference<Model> modelReference = new AtomicReference<>();
+
+    public AbstractGradleBuildFilesCreator(QuarkusProject quarkusProject) {
+        this.quarkusProject = quarkusProject;
+    }
+
+    abstract String getSettingsGradlePath();
+
+    abstract String getBuildGradlePath();
+
+    abstract void createBuildContent(String groupId, String version) throws IOException;
+
+    abstract void createSettingsContent(String artifactId) throws IOException;
+
+    abstract void addDependencyInBuildFile(AppArtifactCoords coords) throws IOException;
+
+    public void create(String groupId, String artifactId, String version,
+            Properties properties, List<AppArtifactCoords> extensions) throws IOException {
+        createSettingsContent(artifactId);
+        createBuildContent(groupId, version);
+        createProperties();
+        extensions.forEach(e -> {
+            try {
+                addDependencyInBuildFile(e);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        });
+        this.writeToDisk();
+    }
+
+    private void writeToDisk() throws IOException {
+        writeToProjectFile(getSettingsGradlePath(), getModel().getSettingsContent().getBytes());
+        writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent().getBytes());
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            getModel().getPropertiesContent().store(out, "Gradle properties");
+            writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray());
+        }
+    }
+
+    protected boolean containsBOM(String groupId, String artifactId) throws IOException {
+        String buildContent = getModel().getBuildContent();
+        return buildContent.contains("enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:")
+                || buildContent.contains("enforcedPlatform(\"" + groupId + ":" + artifactId + ":");
+    }
+
+    public String getProperty(String propertyName) throws IOException {
+        return getModel().getPropertiesContent().getProperty(propertyName);
+    }
+
+    QuarkusProject getQuarkusProject() {
+        return quarkusProject;
+    }
+
+    Model getModel() throws IOException {
+        return modelReference.updateAndGet(model -> {
+            if (model == null) {
+                try {
+                    return readModel();
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+            }
+            return model;
+        });
+    }
+
+    private Model readModel() throws IOException {
+        String settingsContent = "";
+        String buildContent = "";
+        Properties propertiesContent = new Properties();
+        if (hasProjectFile(getSettingsGradlePath())) {
+            final byte[] settings = readProjectFile(getSettingsGradlePath());
+            settingsContent = new String(settings, StandardCharsets.UTF_8);
+        }
+        if (hasProjectFile(getBuildGradlePath())) {
+            final byte[] build = readProjectFile(getBuildGradlePath());
+            buildContent = new String(build, StandardCharsets.UTF_8);
+        }
+        if (hasProjectFile(GRADLE_PROPERTIES_PATH)) {
+            final byte[] properties = readProjectFile(GRADLE_PROPERTIES_PATH);
+            propertiesContent.load(new ByteArrayInputStream(properties));
+        }
+        return new Model(settingsContent, buildContent, propertiesContent, null, null);
+    }
+
+    protected boolean hasProjectFile(final String fileName) throws IOException {
+        final Path filePath = quarkusProject.getProjectDirPath().resolve(fileName);
+        return Files.exists(filePath);
+    }
+
+    protected byte[] readProjectFile(final String fileName) throws IOException {
+        final Path filePath = quarkusProject.getProjectDirPath().resolve(fileName);
+        return Files.readAllBytes(filePath);
+    }
+
+    protected void writeToProjectFile(final String fileName, final byte[] content) throws IOException {
+        Files.write(quarkusProject.getProjectDirPath().resolve(fileName), content);
+    }
+
+    private void createProperties() throws IOException {
+        final ExtensionCatalog platform = quarkusProject.getExtensionsCatalog();
+        Properties props = getModel().getPropertiesContent();
+        if (props.getProperty("quarkusPluginVersion") == null) {
+            props.setProperty("quarkusPluginVersion",
+                    ToolsUtils.getGradlePluginVersion(ToolsUtils.readQuarkusProperties(platform)));
+        }
+        final ArtifactCoords bom = platform.getBom();
+        if (props.getProperty("quarkusPlatformGroupId") == null) {
+            props.setProperty("quarkusPlatformGroupId", bom.getGroupId());
+        }
+        if (props.getProperty("quarkusPlatformArtifactId") == null) {
+            props.setProperty("quarkusPlatformArtifactId", bom.getArtifactId());
+        }
+        if (props.getProperty("quarkusPlatformVersion") == null) {
+            props.setProperty("quarkusPlatformVersion", bom.getVersion());
+        }
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java
new file mode 100644
index 0000000000000..1296a842cf7b0
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGroovyGradleBuildFile.java
@@ -0,0 +1,46 @@
+package io.quarkus.devtools.project.buildfile;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import java.nio.file.Path;
+
+public abstract class AbstractGroovyGradleBuildFile extends AbstractGradleBuildFile {
+
+    static final String BUILD_GRADLE_PATH = "build.gradle";
+    static final String SETTINGS_GRADLE_PATH = "settings.gradle";
+
+    public AbstractGroovyGradleBuildFile(Path projectDirPath, ExtensionCatalog catalog) {
+        super(projectDirPath, catalog);
+    }
+
+    public AbstractGroovyGradleBuildFile(Path projectDirPath, ExtensionCatalog catalog,
+            Path rootProjectPath) {
+        super(projectDirPath, catalog, rootProjectPath);
+    }
+
+    @Override
+    String getSettingsGradlePath() {
+        return SETTINGS_GRADLE_PATH;
+    }
+
+    @Override
+    String getBuildGradlePath() {
+        return BUILD_GRADLE_PATH;
+    }
+
+    @Override
+    protected boolean addDependency(AppArtifactCoords coords, boolean managed) {
+        return addDependencyInModel(getModel(), coords, managed);
+    }
+
+    @Override
+    public BuildTool getBuildTool() {
+        return BuildTool.GRADLE;
+    }
+
+    static boolean addDependencyInModel(Model model, AppArtifactCoords coords, boolean managed) {
+        return addDependencyInModel(model,
+                String.format("    implementation %s%n", createDependencyCoordinatesString(coords, managed, '\'')));
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java
index 61123333d1c73..811ca352715c8 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java
@@ -1,18 +1,16 @@
 package io.quarkus.devtools.project.buildfile;
 
-import static io.quarkus.devtools.project.extensions.Extensions.findInList;
-import static io.quarkus.devtools.project.extensions.Extensions.toCoords;
-import static io.quarkus.devtools.project.extensions.Extensions.toKey;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
 import io.quarkus.devtools.project.extensions.ExtensionInstallPlan;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import io.quarkus.devtools.project.extensions.Extensions;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.maven.ArtifactKey;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -20,28 +18,25 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.maven.model.Dependency;
 
 public abstract class BuildFile implements ExtensionManager {
 
     private final Path projectDirPath;
-    private final QuarkusPlatformDescriptor platformDescriptor;
+    private final ExtensionCatalog catalog;
 
-    public BuildFile(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor) {
+    public BuildFile(final Path projectDirPath, ExtensionCatalog catalog) {
         this.projectDirPath = requireNonNull(projectDirPath, "projectPath is required");
-        this.platformDescriptor = requireNonNull(platformDescriptor, "platformDescriptor is required");
+        this.catalog = requireNonNull(catalog, "catalog is required");
     }
 
     @Override
     public final InstallResult install(Collection<AppArtifactCoords> coords) throws IOException {
         this.refreshData();
-        final Set<AppArtifactKey> existingKeys = getDependenciesKeys();
-        final List<AppArtifactCoords> installed = coords.stream()
-                .distinct()
-                .filter(a -> !existingKeys.contains(a.getKey()))
-                .collect(toList());
+        final Collection<AppArtifactCoords> installed = withoutAlreadyInstalled(coords);
         installed.forEach(e -> addDependency(e, e.getVersion() == null));
         this.writeToDisk();
         return new InstallResult(installed);
@@ -50,17 +45,17 @@ public final InstallResult install(Collection<AppArtifactCoords> coords) throws
     @Override
     public InstallResult install(ExtensionInstallPlan plan) throws IOException {
         List<AppArtifactCoords> installed = new ArrayList<>();
-        for (AppArtifactCoords platform : plan.getPlatforms()) {
+        for (AppArtifactCoords platform : withoutAlreadyInstalled(plan.getPlatforms())) {
             if (addDependency(platform, false)) {
                 installed.add(platform);
             }
         }
-        for (AppArtifactCoords managedExtension : plan.getManagedExtensions()) {
+        for (AppArtifactCoords managedExtension : withoutAlreadyInstalled(plan.getManagedExtensions())) {
             if (addDependency(managedExtension, true)) {
                 installed.add(managedExtension);
             }
         }
-        for (AppArtifactCoords independentExtension : plan.getIndependentExtensions()) {
+        for (AppArtifactCoords independentExtension : withoutAlreadyInstalled(plan.getIndependentExtensions())) {
             if (addDependency(independentExtension, false)) {
                 installed.add(independentExtension);
             }
@@ -73,8 +68,7 @@ public InstallResult install(ExtensionInstallPlan plan) throws IOException {
     public final Collection<AppArtifactCoords> getInstalled() throws IOException {
         this.refreshData();
         return this.getDependencies().stream()
-                .filter(d -> this.isQuarkusExtension(toKey(d)))
-                .map(d -> toCoords(d, extractVersion(d)))
+                .filter(d -> this.isQuarkusExtension(d.getKey()))
                 .collect(toList());
     }
 
@@ -97,11 +91,19 @@ public final UninstallResult uninstall(Collection<AppArtifactKey> keys) throws I
         return new UninstallResult(uninstalled);
     }
 
+    private Collection<AppArtifactCoords> withoutAlreadyInstalled(Collection<AppArtifactCoords> extensions) throws IOException {
+        final Set<AppArtifactKey> existingKeys = getDependenciesKeys();
+        return extensions.stream()
+                .distinct()
+                .filter(a -> !existingKeys.contains(a.getKey()))
+                .collect(toList());
+    }
+
     protected abstract boolean addDependency(AppArtifactCoords coords, boolean managed);
 
     protected abstract void removeDependency(AppArtifactKey key) throws IOException;
 
-    protected abstract List<Dependency> getDependencies() throws IOException;
+    protected abstract List<AppArtifactCoords> getDependencies() throws IOException;
 
     protected abstract void writeToDisk() throws IOException;
 
@@ -128,39 +130,24 @@ protected void writeToProjectFile(final String fileName, final byte[] content) t
     }
 
     private boolean isQuarkusExtension(final AppArtifactKey key) {
-        // This will not always be true as the platform descriptor does not contain the list of all available extensions
-        return isDefinedInRegistry(platformDescriptor.getExtensions(), key);
+        if (catalog != null) {
+            return findInList(catalog.getExtensions(), key).isPresent();
+        }
+        return isDefinedInRegistry(catalog.getExtensions(), key);
     }
 
     private Set<AppArtifactKey> getDependenciesKeys() throws IOException {
-        return getDependencies().stream().map(Extensions::toKey).collect(Collectors.toSet());
-    }
-
-    private String extractVersion(final Dependency d) {
-        String version = d != null ? d.getVersion() : null;
-        if (version != null && version.startsWith("$")) {
-            String value = null;
-            try {
-                value = (String) this.getProperty(propertyName(version));
-                if (value != null) {
-                    return value;
-                }
-            } catch (IOException e) {
-                // ignore this error.
-            }
-        }
-        if (version != null) {
-            return version;
-        }
-        return null;
+        return getDependencies().stream().map(AppArtifactCoords::getKey).collect(Collectors.toSet());
     }
 
-    private String propertyName(final String variable) {
-        return variable.substring(2, variable.length() - 1);
+    public static boolean isDefinedInRegistry(Collection<Extension> registry, final AppArtifactKey key) {
+        return Extensions.findInList(registry, key).isPresent();
     }
 
-    public static boolean isDefinedInRegistry(List<Extension> registry, final AppArtifactKey key) {
-        return findInList(registry, key).isPresent();
+    private static Optional<io.quarkus.registry.catalog.Extension> findInList(
+            Collection<io.quarkus.registry.catalog.Extension> list, final AppArtifactKey key) {
+        ArtifactKey k = new ArtifactKey(key.getGroupId(), key.getArtifactId(), key.getClassifier(), key.getType());
+        return list.stream().filter(e -> Objects.equals(e.getArtifact().getKey(), k)).findFirst();
     }
 
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java
index 9a07d5ef77d1d..3a4c239aa4461 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GenericGradleBuildFile.java
@@ -2,7 +2,6 @@
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.extensions.ExtensionInstallPlan;
 import io.quarkus.devtools.project.extensions.ExtensionManager;
 import java.io.IOException;
@@ -11,12 +10,7 @@
 /**
  * TODO We need to find a way to use the gradle api outside of a gradle plugin
  */
-public class GenericGradleBuildFile implements ExtensionManager {
-
-    @Override
-    public BuildTool getBuildTool() {
-        return BuildTool.GRADLE;
-    }
+abstract class GenericGradleBuildFile implements ExtensionManager {
 
     @Override
     public Collection<AppArtifactCoords> getInstalled() throws IOException {
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GradleBuildFilesCreator.java
deleted file mode 100644
index 785d71dc7d952..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GradleBuildFilesCreator.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package io.quarkus.devtools.project.buildfile;
-
-import static io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.addDependencyInModel;
-
-import io.quarkus.bootstrap.model.AppArtifactCoords;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.tools.ToolsUtils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Properties;
-import java.util.Scanner;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-
-public final class GradleBuildFilesCreator {
-
-    private static final String BUILD_GRADLE_PATH = "build.gradle";
-    private static final String SETTINGS_GRADLE_PATH = "settings.gradle";
-    private static final String GRADLE_PROPERTIES_PATH = "gradle.properties";
-    private final QuarkusProject quarkusProject;
-
-    private AtomicReference<Model> modelReference = new AtomicReference<>();
-
-    public GradleBuildFilesCreator(QuarkusProject quarkusProject) {
-        this.quarkusProject = quarkusProject;
-    }
-
-    public void create(String groupId, String artifactId, String version,
-            Properties properties, List<AppArtifactCoords> extensions) throws IOException {
-        createSettingsContent(artifactId);
-        createBuildContent(groupId, version);
-        createProperties();
-        extensions.forEach(e -> {
-            try {
-                addDependencyInBuildFile(e);
-            } catch (IOException ex) {
-                throw new UncheckedIOException(ex);
-            }
-        });
-        this.writeToDisk();
-    }
-
-    private void writeToDisk() throws IOException {
-        writeToProjectFile(SETTINGS_GRADLE_PATH, getModel().getSettingsContent().getBytes());
-        writeToProjectFile(BUILD_GRADLE_PATH, getModel().getBuildContent().getBytes());
-        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            getModel().getPropertiesContent().store(out, "Gradle properties");
-            writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray());
-        }
-    }
-
-    private void addDependencyInBuildFile(AppArtifactCoords coords) throws IOException {
-        addDependencyInModel(getModel(), coords, false);
-    }
-
-    protected boolean containsBOM(String groupId, String artifactId) throws IOException {
-        String buildContent = getModel().getBuildContent();
-        return buildContent.contains("enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:")
-                || buildContent.contains("enforcedPlatform(\"" + groupId + ":" + artifactId + ":");
-    }
-
-    public String getProperty(String propertyName) throws IOException {
-        return getModel().getPropertiesContent().getProperty(propertyName);
-    }
-
-    private void readLineByLine(String content, Consumer<String> lineConsumer) {
-        try (Scanner scanner = new Scanner(new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)),
-                StandardCharsets.UTF_8.name())) {
-            while (scanner.hasNextLine()) {
-                String currentLine = scanner.nextLine();
-                lineConsumer.accept(currentLine);
-            }
-        }
-    }
-
-    private Model getModel() throws IOException {
-        return modelReference.updateAndGet(model -> {
-            if (model == null) {
-                try {
-                    return readModel();
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
-            }
-            return model;
-        });
-    }
-
-    private Model readModel() throws IOException {
-        String settingsContent = "";
-        String buildContent = "";
-        Properties propertiesContent = new Properties();
-        if (hasProjectFile(SETTINGS_GRADLE_PATH)) {
-            final byte[] settings = readProjectFile(SETTINGS_GRADLE_PATH);
-            settingsContent = new String(settings, StandardCharsets.UTF_8);
-        }
-        if (hasProjectFile(BUILD_GRADLE_PATH)) {
-            final byte[] build = readProjectFile(BUILD_GRADLE_PATH);
-            buildContent = new String(build, StandardCharsets.UTF_8);
-        }
-        if (hasProjectFile(GRADLE_PROPERTIES_PATH)) {
-            final byte[] properties = readProjectFile(GRADLE_PROPERTIES_PATH);
-            propertiesContent.load(new ByteArrayInputStream(properties));
-        }
-        return new Model(settingsContent, buildContent, propertiesContent, null, null);
-    }
-
-    protected boolean hasProjectFile(final String fileName) throws IOException {
-        final Path filePath = quarkusProject.getProjectDirPath().resolve(fileName);
-        return Files.exists(filePath);
-    }
-
-    protected byte[] readProjectFile(final String fileName) throws IOException {
-        final Path filePath = quarkusProject.getProjectDirPath().resolve(fileName);
-        return Files.readAllBytes(filePath);
-    }
-
-    protected void writeToProjectFile(final String fileName, final byte[] content) throws IOException {
-        Files.write(quarkusProject.getProjectDirPath().resolve(fileName), content);
-    }
-
-    private void createBuildContent(String groupId, String version)
-            throws IOException {
-        final String buildContent = getModel().getBuildContent();
-        StringBuilder res = new StringBuilder(buildContent);
-        if (!buildContent.contains("id 'io.quarkus'")) {
-            res.append("plugins {");
-            res.append(System.lineSeparator()).append("    id 'java'").append(System.lineSeparator());
-            res.append(System.lineSeparator()).append("    id 'io.quarkus'").append(System.lineSeparator());
-            res.append("}");
-        }
-        if (!containsBOM(quarkusProject.getPlatformDescriptor().getBomGroupId(),
-                quarkusProject.getPlatformDescriptor().getBomArtifactId())) {
-            res.append(System.lineSeparator());
-            res.append("dependencies {").append(System.lineSeparator());
-            res.append(
-                    "    implementation enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}\")")
-                    .append(System.lineSeparator());
-            res.append("    implementation 'io.quarkus:quarkus-resteasy'").append(System.lineSeparator());
-            res.append("    testImplementation 'io.quarkus:quarkus-junit5'").append(System.lineSeparator());
-            res.append("    testImplementation 'io.rest-assured:rest-assured'").append(System.lineSeparator());
-            res.append("}").append(System.lineSeparator());
-
-        }
-        String groupLine = "group '" + groupId + "'";
-        if (!buildContent.contains(groupLine)) {
-            res.append(System.lineSeparator()).append(groupLine)
-                    .append(System.lineSeparator());
-        }
-        String versionLine = "version '" + version + "'";
-        if (!buildContent.contains(versionLine)) {
-            res.append(System.lineSeparator()).append(versionLine)
-                    .append(System.lineSeparator());
-        }
-
-        res.append(System.lineSeparator())
-                .append("test {").append(System.lineSeparator())
-                .append("    systemProperty \"java.util.logging.manager\", \"org.jboss.logmanager.LogManager\"")
-                .append(System.lineSeparator())
-                .append("}");
-
-        getModel().setBuildContent(res.toString());
-    }
-
-    private void createSettingsContent(String artifactId) throws IOException {
-        final String settingsContent = getModel().getSettingsContent();
-        final StringBuilder res = new StringBuilder();
-        if (!settingsContent.contains("id 'io.quarkus'")) {
-            res.append(System.lineSeparator());
-            res.append("pluginManagement {").append(System.lineSeparator());
-            res.append("    repositories {").append(System.lineSeparator());
-            res.append("        mavenLocal()").append(System.lineSeparator());
-            res.append("        mavenCentral()").append(System.lineSeparator());
-            res.append("        gradlePluginPortal()").append(System.lineSeparator());
-            res.append("    }").append(System.lineSeparator());
-            res.append("    plugins {").append(System.lineSeparator());
-            res.append("        id 'io.quarkus' version \"${quarkusPluginVersion}\"").append(System.lineSeparator());
-            res.append("    }").append(System.lineSeparator());
-            res.append("}").append(System.lineSeparator());
-        }
-        if (!settingsContent.contains("rootProject.name")) {
-            res.append(System.lineSeparator()).append("rootProject.name='").append(artifactId).append("'")
-                    .append(System.lineSeparator());
-        }
-        res.append(settingsContent);
-        getModel().setSettingsContent(res.toString());
-    }
-
-    private void createProperties() throws IOException {
-        final QuarkusPlatformDescriptor platform = quarkusProject.getPlatformDescriptor();
-        Properties props = getModel().getPropertiesContent();
-        if (props.getProperty("quarkusPluginVersion") == null) {
-            props.setProperty("quarkusPluginVersion", ToolsUtils.getPluginVersion(ToolsUtils.readQuarkusProperties(platform)));
-        }
-        if (props.getProperty("quarkusPlatformGroupId") == null) {
-            props.setProperty("quarkusPlatformGroupId", platform.getBomGroupId());
-        }
-        if (props.getProperty("quarkusPlatformArtifactId") == null) {
-            props.setProperty("quarkusPlatformArtifactId", platform.getBomArtifactId());
-        }
-        if (props.getProperty("quarkusPlatformVersion") == null) {
-            props.setProperty("quarkusPlatformVersion", platform.getBomVersion());
-        }
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFile.java
new file mode 100644
index 0000000000000..3f3e57522f8f7
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFile.java
@@ -0,0 +1,12 @@
+package io.quarkus.devtools.project.buildfile;
+
+import io.quarkus.devtools.project.BuildTool;
+
+public class GroovyGradleBuildFile extends GenericGradleBuildFile {
+
+    @Override
+    public BuildTool getBuildTool() {
+        return BuildTool.GRADLE;
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java
new file mode 100644
index 0000000000000..7e5c6affbeb3f
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/GroovyGradleBuildFilesCreator.java
@@ -0,0 +1,97 @@
+package io.quarkus.devtools.project.buildfile;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.maven.ArtifactCoords;
+import java.io.IOException;
+
+public final class GroovyGradleBuildFilesCreator extends AbstractGradleBuildFilesCreator {
+
+    public GroovyGradleBuildFilesCreator(QuarkusProject quarkusProject) {
+        super(quarkusProject);
+    }
+
+    @Override
+    String getSettingsGradlePath() {
+        return AbstractGroovyGradleBuildFile.SETTINGS_GRADLE_PATH;
+    }
+
+    @Override
+    String getBuildGradlePath() {
+        return AbstractGroovyGradleBuildFile.BUILD_GRADLE_PATH;
+    }
+
+    @Override
+    void createBuildContent(String groupId, String version) throws IOException {
+        final String buildContent = getModel().getBuildContent();
+        StringBuilder res = new StringBuilder(buildContent);
+        if (!buildContent.contains("id 'io.quarkus'")) {
+            res.append("plugins {");
+            res.append(System.lineSeparator()).append("    id 'java'").append(System.lineSeparator());
+            res.append(System.lineSeparator()).append("    id 'io.quarkus'").append(System.lineSeparator());
+            res.append("}");
+        }
+        final ArtifactCoords bom = getQuarkusProject().getExtensionsCatalog().getBom();
+        if (!containsBOM(bom.getGroupId(), bom.getArtifactId())) {
+            res.append(System.lineSeparator());
+            res.append("dependencies {").append(System.lineSeparator());
+            res.append(
+                    "    implementation enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}\")")
+                    .append(System.lineSeparator());
+            res.append("    implementation 'io.quarkus:quarkus-resteasy'").append(System.lineSeparator());
+            res.append("    testImplementation 'io.quarkus:quarkus-junit5'").append(System.lineSeparator());
+            res.append("    testImplementation 'io.rest-assured:rest-assured'").append(System.lineSeparator());
+            res.append("}").append(System.lineSeparator());
+
+        }
+        String groupLine = "group '" + groupId + "'";
+        if (!buildContent.contains(groupLine)) {
+            res.append(System.lineSeparator()).append(groupLine)
+                    .append(System.lineSeparator());
+        }
+        String versionLine = "version '" + version + "'";
+        if (!buildContent.contains(versionLine)) {
+            res.append(System.lineSeparator()).append(versionLine)
+                    .append(System.lineSeparator());
+        }
+
+        res.append(System.lineSeparator())
+                .append("test {").append(System.lineSeparator())
+                .append("    systemProperty \"java.util.logging.manager\", \"org.jboss.logmanager.LogManager\"")
+                .append(System.lineSeparator())
+                .append("}");
+
+        getModel().setBuildContent(res.toString());
+    }
+
+    @Override
+    void createSettingsContent(String artifactId) throws IOException {
+        final String settingsContent = getModel().getSettingsContent();
+        final StringBuilder res = new StringBuilder();
+        if (!settingsContent.contains("id 'io.quarkus'")) {
+            res.append(System.lineSeparator());
+            res.append("pluginManagement {").append(System.lineSeparator());
+            res.append("    repositories {").append(System.lineSeparator());
+            res.append("        mavenLocal()").append(System.lineSeparator());
+            res.append("        mavenCentral()").append(System.lineSeparator());
+            res.append("        gradlePluginPortal()").append(System.lineSeparator());
+            res.append("    }").append(System.lineSeparator());
+            res.append("    plugins {").append(System.lineSeparator());
+            res.append("        id 'io.quarkus' version \"${quarkusPluginVersion}\"").append(System.lineSeparator());
+            res.append("    }").append(System.lineSeparator());
+            res.append("}").append(System.lineSeparator());
+        }
+        if (!settingsContent.contains("rootProject.name")) {
+            res.append(System.lineSeparator()).append("rootProject.name='").append(artifactId).append("'")
+                    .append(System.lineSeparator());
+        }
+        res.append(settingsContent);
+        getModel().setSettingsContent(res.toString());
+    }
+
+    @Override
+    void addDependencyInBuildFile(AppArtifactCoords coords) throws IOException {
+        AbstractGroovyGradleBuildFile.addDependencyInModel(getModel(), coords, false);
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFile.java
new file mode 100644
index 0000000000000..059c6b029aaf1
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFile.java
@@ -0,0 +1,12 @@
+package io.quarkus.devtools.project.buildfile;
+
+import io.quarkus.devtools.project.BuildTool;
+
+public class KotlinGradleBuildFile extends GenericGradleBuildFile {
+
+    @Override
+    public BuildTool getBuildTool() {
+        return BuildTool.GRADLE_KOTLIN_DSL;
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java
new file mode 100644
index 0000000000000..7715483cd9474
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/KotlinGradleBuildFilesCreator.java
@@ -0,0 +1,107 @@
+package io.quarkus.devtools.project.buildfile;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model;
+import io.quarkus.maven.ArtifactCoords;
+import java.io.IOException;
+
+public class KotlinGradleBuildFilesCreator extends AbstractGradleBuildFilesCreator {
+
+    static final String BUILD_GRADLE_PATH = "build.gradle.kts";
+    static final String SETTINGS_GRADLE_PATH = "settings.gradle.kts";
+
+    public KotlinGradleBuildFilesCreator(QuarkusProject quarkusProject) {
+        super(quarkusProject);
+    }
+
+    @Override
+    String getSettingsGradlePath() {
+        return SETTINGS_GRADLE_PATH;
+    }
+
+    @Override
+    String getBuildGradlePath() {
+        return BUILD_GRADLE_PATH;
+    }
+
+    @Override
+    void createBuildContent(String groupId, String version) throws IOException {
+        final String buildContent = getModel().getBuildContent();
+        StringBuilder res = new StringBuilder(buildContent);
+        if (!buildContent.contains("id(\"io.quarkus\")")) {
+            res.append("plugins {");
+            res.append(System.lineSeparator()).append("    java").append(System.lineSeparator());
+            res.append(System.lineSeparator()).append("    id(\"io.quarkus\")").append(System.lineSeparator());
+            res.append("}");
+        }
+        final ArtifactCoords bom = getQuarkusProject().getExtensionsCatalog().getBom();
+        if (!containsBOM(bom.getGroupId(), bom.getArtifactId())) {
+            res.append(System.lineSeparator());
+            res.append("dependencies {").append(System.lineSeparator());
+            res.append(
+                    "    implementation(enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}\"))")
+                    .append(System.lineSeparator());
+            res.append("    implementation(\"io.quarkus:quarkus-resteasy\")").append(System.lineSeparator());
+            res.append("    testImplementation(\"io.quarkus:quarkus-junit5\")").append(System.lineSeparator());
+            res.append("    testImplementation(\"io.rest-assured:rest-assured\")").append(System.lineSeparator());
+            res.append("}").append(System.lineSeparator());
+
+        }
+        String groupLine = "group = \"" + groupId + "\"";
+        if (!buildContent.contains(groupLine)) {
+            res.append(System.lineSeparator()).append(groupLine)
+                    .append(System.lineSeparator());
+        }
+        String versionLine = "version = \"" + version + "\"";
+        if (!buildContent.contains(versionLine)) {
+            res.append(System.lineSeparator()).append(versionLine)
+                    .append(System.lineSeparator());
+        }
+
+        res.append(System.lineSeparator())
+                .append("tasks.withType<Test> {").append(System.lineSeparator())
+                .append("    systemProperty(\"java.util.logging.manager\", \"org.jboss.logmanager.LogManager\")")
+                .append(System.lineSeparator())
+                .append("}");
+
+        getModel().setBuildContent(res.toString());
+    }
+
+    @Override
+    void createSettingsContent(String artifactId) throws IOException {
+        final String settingsContent = getModel().getSettingsContent();
+        final StringBuilder res = new StringBuilder();
+        if (!settingsContent.contains("id(\"io.quarkus\")")) {
+            res.append(System.lineSeparator());
+            res.append("pluginManagement {").append(System.lineSeparator());
+            res.append("    val quarkusPluginVersion: String by settings");
+            res.append("    repositories {").append(System.lineSeparator());
+            res.append("        mavenLocal()").append(System.lineSeparator());
+            res.append("        mavenCentral()").append(System.lineSeparator());
+            res.append("        gradlePluginPortal()").append(System.lineSeparator());
+            res.append("    }").append(System.lineSeparator());
+            res.append("    plugins {").append(System.lineSeparator());
+            res.append("        id(\"io.quarkus\") version quarkusPluginVersion").append(System.lineSeparator());
+            res.append("    }").append(System.lineSeparator());
+            res.append("}").append(System.lineSeparator());
+        }
+        if (!settingsContent.contains("rootProject.name")) {
+            res.append(System.lineSeparator()).append("rootProject.name=\"").append(artifactId).append("\"")
+                    .append(System.lineSeparator());
+        }
+        res.append(settingsContent);
+        getModel().setSettingsContent(res.toString());
+    }
+
+    @Override
+    void addDependencyInBuildFile(AppArtifactCoords coords) throws IOException {
+        addDependencyInModel(getModel(), coords, false);
+    }
+
+    static boolean addDependencyInModel(Model model, AppArtifactCoords coords, boolean managed) {
+        return AbstractGradleBuildFile.addDependencyInModel(model,
+                String.format("    implementation(%s)%n",
+                        AbstractGradleBuildFile.createDependencyCoordinatesString(coords, managed, '"')));
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java
index ec76cf0423beb..06fe843d92377 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenBuildFile.java
@@ -5,8 +5,9 @@
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.extensions.Extensions;
 import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -18,6 +19,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
@@ -28,8 +30,8 @@ public class MavenBuildFile extends BuildFile {
 
     private final AtomicReference<Model> modelRef = new AtomicReference<>();
 
-    public MavenBuildFile(final Path projectDirPath, final QuarkusPlatformDescriptor platformDescriptor) {
-        super(projectDirPath, platformDescriptor);
+    public MavenBuildFile(final Path projectDirPath, ExtensionCatalog catalog) {
+        super(projectDirPath, catalog);
     }
 
     @Override
@@ -91,8 +93,9 @@ protected void removeDependency(AppArtifactKey key) throws IOException {
     }
 
     @Override
-    public List<Dependency> getDependencies() throws IOException {
-        return getModel() == null ? Collections.emptyList() : getModel().getDependencies();
+    public List<AppArtifactCoords> getDependencies() throws IOException {
+        return getModel() == null ? Collections.emptyList()
+                : getModel().getDependencies().stream().map(Extensions::toCoords).collect(Collectors.toList());
     }
 
     @Override
@@ -127,6 +130,9 @@ private Model getModel() {
     }
 
     private Model initModel() throws IOException {
+        if (!hasProjectFile(BuildTool.MAVEN.getDependenciesFile())) {
+            return null;
+        }
         byte[] content = readProjectFile(BuildTool.MAVEN.getDependenciesFile());
         return MojoUtils.readPom(new ByteArrayInputStream(content));
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java
index ee7c7c28fcf7b..49642d72f87a4 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGenerator.java
@@ -10,7 +10,8 @@ public interface ProjectGenerator {
     String PROJECT_GROUP_ID = "project_groupId";
     String PROJECT_ARTIFACT_ID = "project_artifactId";
     String PROJECT_VERSION = "project_version";
-    String QUARKUS_PLUGIN_VERSION = "plugin_version";
+    String QUARKUS_MAVEN_PLUGIN_VERSION = "maven_plugin_version";
+    String QUARKUS_GRADLE_PLUGIN_VERSION = "gradle_plugin_version";
     String QUARKUS_VERSION = "quarkus_version";
     String PACKAGE_NAME = "package_name";
     String MAVEN_REPOSITORIES = "maven_repositories";
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGeneratorRegistry.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGeneratorRegistry.java
deleted file mode 100644
index 4090c600ef7b5..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/ProjectGeneratorRegistry.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.quarkus.devtools.project.codegen;
-
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.ServiceLoader;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author <a href="claprun@redhat.com">Christophe Laprun</a>
- */
-public class ProjectGeneratorRegistry {
-
-    private static final Map<String, ProjectGenerator> generators = new ConcurrentHashMap<>(7);
-    private static final ProjectGeneratorRegistry INSTANCE = new ProjectGeneratorRegistry();
-
-    private ProjectGeneratorRegistry() {
-        loadGenerators();
-    }
-
-    public static ProjectGeneratorRegistry getInstance() {
-        return INSTANCE;
-    }
-
-    public static ProjectGenerator get(String name) throws NoSuchElementException {
-        final ProjectGenerator generator = generators.get(name);
-        if (generator == null) {
-            throw new NoSuchElementException("Unknown generator: " + name);
-        }
-
-        return generator;
-    }
-
-    private static void register(ProjectGenerator generator) {
-        if (generator != null) {
-            generators.put(generator.getName(), generator);
-        } else {
-            throw new NullPointerException("Cannot register null generator");
-        }
-    }
-
-    private static void loadGenerators() {
-        ServiceLoader<ProjectGenerator> serviceLoader = ServiceLoader.load(ProjectGenerator.class);
-        serviceLoader.iterator().forEachRemaining(ProjectGeneratorRegistry::register);
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java
deleted file mode 100644
index e21454bed2d76..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGenerator.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package io.quarkus.devtools.project.codegen.rest;
-
-import static java.lang.String.format;
-
-import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.codegen.ProjectGenerator;
-import io.quarkus.devtools.project.codegen.SourceType;
-import io.quarkus.devtools.project.codegen.writer.FileProjectWriter;
-import io.quarkus.devtools.project.codegen.writer.ProjectWriter;
-import io.quarkus.maven.utilities.MojoUtils;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Map.Entry;
-
-public class BasicRestProjectGenerator implements ProjectGenerator {
-
-    public static final String NAME = "basic-rest";
-
-    public BasicRestProjectGenerator() {
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @Override
-    public void generate(QuarkusCommandInvocation invocation) throws IOException {
-        final FileProjectWriter writer = new FileProjectWriter(invocation.getQuarkusProject().getProjectDirPath().toFile());
-        writer.init();
-        generate(writer, invocation);
-    }
-
-    void generate(ProjectWriter writer, QuarkusCommandInvocation invocation) throws IOException {
-        final BasicRestProject project = new BasicRestProject(writer, invocation);
-
-        project.initProject();
-        project.setupContext();
-
-        project.createClasses();
-
-        project.createIndexPage();
-        project.createDockerFiles();
-        project.createDockerIgnore();
-        project.createApplicationConfig();
-        project.createReadme();
-
-        project.createGitIgnore();
-    }
-
-    private class BasicRestProject {
-        private QuarkusCommandInvocation invocation;
-        private String path = "/hello";
-        private ProjectWriter writer;
-        private String srcMainPath;
-        private String testMainPath;
-        private String nativeTestMainPath;
-        private SourceType type;
-
-        private BasicRestProject(final ProjectWriter writer, QuarkusCommandInvocation invocation) {
-            this.writer = writer;
-            this.invocation = invocation;
-            this.type = invocation.getValue(SOURCE_TYPE, SourceType.JAVA);
-        }
-
-        @SuppressWarnings("unchecked")
-        private <T> T get(final String key, final T defaultValue) {
-            return invocation.getValue(key, defaultValue);
-        }
-
-        private boolean initProject() throws IOException {
-            boolean newProject = initBuildTool();
-
-            path = get(RESOURCE_PATH, path);
-
-            srcMainPath = writer.mkdirs(type.getSrcDir());
-            testMainPath = writer.mkdirs(type.getTestSrcDir());
-            // for gradle we want to place the native tests in under 'src/native-test/java'
-            // since gradle's idiomatic way of running integration tests is to create a new source set
-            if (getBuildTool() == BuildTool.GRADLE) {
-                nativeTestMainPath = writer.mkdirs(type.getTestSrcDir().replace("test", "native-test"));
-            } else {
-                nativeTestMainPath = testMainPath;
-            }
-
-            return newProject;
-        }
-
-        private boolean initBuildTool() throws IOException {
-            BuildTool buildTool = getBuildTool();
-            if (!invocation.hasValue(ADDITIONAL_GITIGNORE_ENTRIES)) {
-                invocation.setValue(ADDITIONAL_GITIGNORE_ENTRIES, buildTool.getGitIgnoreEntries());
-            }
-            if (!invocation.hasValue(BUILD_DIRECTORY)) {
-                invocation.setValue(BUILD_DIRECTORY, buildTool.getBuildDirectory());
-            }
-            if (!invocation.hasValue(MAVEN_REPOSITORIES)) {
-                invocation.setValue(MAVEN_REPOSITORIES, "");
-            }
-            if (!invocation.hasValue(MAVEN_PLUGIN_REPOSITORIES)) {
-                invocation.setValue(MAVEN_PLUGIN_REPOSITORIES, "");
-            }
-
-            boolean newProject = !writer.exists(buildTool.getDependenciesFile());
-            if (newProject) {
-                for (String buildFile : buildTool.getBuildFiles()) {
-                    generate(type.getBuildFileResourceTemplate(getName(), buildFile), invocation, buildFile, buildFile);
-                }
-            } else {
-                String[] gav;
-                if (BuildTool.MAVEN.equals(buildTool)) {
-                    ByteArrayInputStream buildFileInputStream = new ByteArrayInputStream(
-                            writer.getContent(buildTool.getDependenciesFile()));
-                    gav = MojoUtils.readGavFromPom(buildFileInputStream);
-                } else {
-                    gav = new String[3];
-                    for (String buildFile : buildTool.getBuildFiles()) {
-                        if (writer.exists(buildFile)) {
-                            try (ByteArrayInputStream buildFileInputStream = new ByteArrayInputStream(
-                                    writer.getContent(buildFile))) {
-                                gav = MojoUtils.readGavFromSettingsGradle(buildFileInputStream, gav);
-                            }
-                        }
-                    }
-                }
-                if (gav[0] != null) {
-                    invocation.setValue(PROJECT_GROUP_ID, gav[0]);
-                }
-                if (gav[1] != null) {
-                    invocation.setValue(PROJECT_ARTIFACT_ID, gav[1]);
-                }
-            }
-            return newProject;
-        }
-
-        private BuildTool getBuildTool() {
-            return invocation.getQuarkusProject().getBuildTool();
-        }
-
-        private void generate(final String templateName, QuarkusCommandInvocation invocation, final String outputFilePath,
-                final String resourceType)
-                throws IOException {
-            if (!writer.exists(outputFilePath)) {
-                String template = invocation.getPlatformDescriptor().getTemplate(templateName);
-                if (template == null) {
-                    throw new IOException("Template resource is missing: " + templateName);
-                }
-                for (Entry<String, Object> e : invocation.getValues().entrySet()) {
-                    if (e.getValue() instanceof String) { // Exclude null values (classname and path can be null)
-                        template = template.replace(format("${%s}", e.getKey()), (String) e.getValue());
-                    }
-                }
-
-                // do some nasty replacements for Java target if we want to generate Java 11 projects
-                if ("11".equals(invocation.getValue(JAVA_TARGET))) {
-                    if (BuildTool.GRADLE.equals(invocation.getQuarkusProject().getBuildTool())) {
-                        template = template.replace("JavaVersion.VERSION_1_8", "JavaVersion.VERSION_11");
-                    } else {
-                        template = template.replace("<maven.compiler.source>1.8</maven.compiler.source>",
-                                "<maven.compiler.source>11</maven.compiler.source>");
-                        template = template.replace("<maven.compiler.target>1.8</maven.compiler.target>",
-                                "<maven.compiler.target>11</maven.compiler.target>");
-                        // Kotlin
-                        template = template.replace("<jvmTarget>1.8</jvmTarget>", "<jvmTarget>11</jvmTarget>");
-                        // Scala
-                        // For now, we keep Java 8 as a target for Scala as we don't want to upgrade to 2.13
-                        // template = template.replace("<arg>-target:jvm-1.8</arg>", "<arg>-target:jvm-11</arg>");
-                    }
-                }
-
-                writer.write(outputFilePath, template);
-            }
-        }
-
-        private void createIndexPage() throws IOException {
-            // Generate index page
-            String resources = "src/main/resources/META-INF/resources";
-            String index = writer.mkdirs(resources) + "/index.html";
-            if (!writer.exists(index)) {
-                generate("templates/index.ftl", invocation, index, "welcome page");
-            }
-
-        }
-
-        private void createDockerFiles() throws IOException {
-            String dockerRoot = "src/main/docker";
-            String dockerRootDir = writer.mkdirs(dockerRoot);
-            generate("templates/dockerfile-native.ftl", invocation, dockerRootDir + "/Dockerfile.native",
-                    "native docker file");
-            generate("templates/dockerfile-jvm.ftl", invocation, dockerRootDir + "/Dockerfile.jvm", "jvm docker file");
-            generate("templates/dockerfile-fast-jar.ftl", invocation, dockerRootDir + "/Dockerfile.fast-jar",
-                    "jvm docker file");
-        }
-
-        private void createReadme() throws IOException {
-            String readme = writer.mkdirs("") + "README.md";
-            BuildTool buildTool = getBuildTool();
-            switch (buildTool) {
-                case MAVEN:
-                    generate("templates/README.maven.ftl", invocation, readme, "read me");
-                    break;
-                case GRADLE:
-                    generate("templates/README.gradle.ftl", invocation, readme, "read me");
-                    break;
-                default:
-                    throw new IllegalStateException("buildTool is none of Maven or Gradle");
-            }
-        }
-
-        private void createDockerIgnore() throws IOException {
-            String docker = writer.mkdirs("") + ".dockerignore";
-            generate("templates/dockerignore.ftl", invocation, docker, "docker ignore");
-        }
-
-        private void createGitIgnore() throws IOException {
-            String gitignore = writer.mkdirs("") + ".gitignore";
-            generate("templates/gitignore.ftl", invocation, gitignore, "git ignore");
-        }
-
-        private void createApplicationConfig() throws IOException {
-            String meta = "src/main/resources";
-            String file = writer.mkdirs(meta) + "/application.properties";
-            if (!writer.exists(file)) {
-                writer.write(file, "# Configuration file" + System.lineSeparator() + "# key = value");
-            }
-        }
-
-        private void setupContext() throws IOException {
-            if (invocation.getValue(CLASS_NAME) != null) {
-                String packageName = invocation.getStringValue(PACKAGE_NAME);
-
-                if (packageName != null) {
-                    String packageDir = srcMainPath + '/' + packageName.replace('.', '/');
-                    String originalTestMainPath = testMainPath;
-                    String testPackageDir = testMainPath + '/' + packageName.replace('.', '/');
-                    srcMainPath = writer.mkdirs(packageDir);
-                    testMainPath = writer.mkdirs(testPackageDir);
-
-                    if (!originalTestMainPath.equals(nativeTestMainPath)) {
-                        String nativeTestPackageDir = nativeTestMainPath + '/' + packageName.replace('.', '/');
-                        nativeTestMainPath = writer.mkdirs(nativeTestPackageDir);
-                    } else {
-                        nativeTestMainPath = testMainPath;
-                    }
-
-                } else {
-                    throw new NullPointerException("Need a non-null package name");
-                }
-            }
-        }
-
-        private void createClasses() throws IOException {
-            Object className = invocation.getValue(CLASS_NAME);
-            // If className is null we disable the generation of the JAX-RS resource.
-            if (className != null) {
-                String extension = type.getExtension();
-                String classFile = srcMainPath + '/' + className + extension;
-                String testClassFile = testMainPath + '/' + className + "Test" + extension;
-                String itTestClassFile = nativeTestMainPath + '/' + "Native" + className + "IT" + extension;
-                String name = getName();
-                String srcResourceTemplate = type.getSrcResourceTemplate(name);
-                Object isSpring = invocation.getValue(IS_SPRING);
-                if (isSpring != null && (Boolean) invocation.getValue(IS_SPRING).equals(Boolean.TRUE)) {
-                    srcResourceTemplate = type.getSrcSpringControllerTemplate(name);
-                }
-                generate(srcResourceTemplate, invocation, classFile, "resource code");
-                generate(type.getTestResourceTemplate(name), invocation, testClassFile, "test code");
-                generate(type.getNativeTestResourceTemplate(name), invocation, itTestClassFile, "IT code");
-            }
-        }
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java
index e6a524ee9a18e..b4182b79f538a 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/compress/QuarkusProjectCompress.java
@@ -7,6 +7,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Stream;
 import org.apache.commons.compress.archivers.zip.UnixStat;
 import org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
@@ -35,8 +36,9 @@ public static void zip(final Path quarkusProjectDirPath, final Path targetZipPat
 
     public static void zip(final Path quarkusProjectDirPath, final Path targetZipPath, final boolean includeProjectDirectory,
             final Long withSpecificFilesTime) throws IOException {
-        try (final ZipArchiveOutputStream zaos = new ZipArchiveOutputStream(Files.newOutputStream(targetZipPath))) {
-            Files.walk(quarkusProjectDirPath)
+        try (final ZipArchiveOutputStream zaos = new ZipArchiveOutputStream(Files.newOutputStream(targetZipPath));
+                Stream<Path> paths = Files.walk(quarkusProjectDirPath)) {
+            paths
                     .filter((path) -> includeProjectDirectory || !quarkusProjectDirPath.equals(path))
                     .forEach((path) -> {
                         try {
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java
index 6f0b700194464..77148ae77bcac 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/ExtensionManager.java
@@ -2,7 +2,6 @@
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
 import io.quarkus.devtools.project.BuildTool;
 import java.io.IOException;
 import java.util.Collection;
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java
index da3b60d9f8ae5..f6643cd4d9f33 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/extensions/Extensions.java
@@ -2,8 +2,8 @@
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
-import java.util.List;
+import io.quarkus.registry.catalog.Extension;
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import org.apache.maven.model.Dependency;
@@ -13,7 +13,10 @@ private Extensions() {
     }
 
     public static AppArtifactKey toKey(final Extension extension) {
-        return toKey(extension.toDependency(false));
+        return new AppArtifactKey(extension.getArtifact().getGroupId(),
+                extension.getArtifact().getArtifactId(),
+                extension.getArtifact().getClassifier(),
+                extension.getArtifact().getType());
     }
 
     public static AppArtifactKey toKey(final Dependency dependency) {
@@ -21,7 +24,7 @@ public static AppArtifactKey toKey(final Dependency dependency) {
                 dependency.getType());
     }
 
-    public static Optional<Extension> findInList(List<Extension> list, final AppArtifactKey key) {
+    public static Optional<Extension> findInList(Collection<Extension> list, final AppArtifactKey key) {
         return list.stream().filter(e -> Objects.equals(toCoords(e).getKey(), key)).findFirst();
     }
 
@@ -30,13 +33,36 @@ public static AppArtifactCoords toCoords(final AppArtifactKey k, final String ve
     }
 
     public static AppArtifactCoords toCoords(final Extension e) {
-        return toCoords(e.toDependency(false));
+        return new AppArtifactCoords(e.getArtifact().getGroupId(),
+                e.getArtifact().getArtifactId(),
+                e.getArtifact().getClassifier(),
+                e.getArtifact().getType(),
+                e.getArtifact().getVersion());
     }
 
     public static AppArtifactCoords toCoords(final Dependency d, final String overrideVersion) {
         return overrideVersion(toCoords(d), overrideVersion);
     }
 
+    public static String toGAV(AppArtifactCoords c) {
+        if (c.getVersion() == null) {
+            return toGA(c);
+        }
+        return c.getGroupId() + ":" + c.getArtifactId() + ":" + c.getVersion();
+    }
+
+    public static String toGA(AppArtifactCoords c) {
+        return c.getGroupId() + ":" + c.getArtifactId();
+    }
+
+    public static String toGA(AppArtifactKey c) {
+        return c.getGroupId() + ":" + c.getArtifactId();
+    }
+
+    public static String toGA(Extension e) {
+        return e.getArtifact().getGroupId() + ":" + e.getArtifact().getArtifactId();
+    }
+
     public static AppArtifactCoords stripVersion(final AppArtifactCoords coords) {
         return overrideVersion(coords, null);
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/utils/Prompter.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/utils/Prompter.java
new file mode 100644
index 0000000000000..b21dbf5eb2301
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/utils/Prompter.java
@@ -0,0 +1,63 @@
+package io.quarkus.devtools.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Objects;
+import jline.console.ConsoleReader;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Prompt implementation.
+ *
+ * @author <a href="http://escoffier.me">Clement Escoffier</a>
+ */
+public class Prompter {
+
+    private final ConsoleReader console;
+
+    public Prompter() throws IOException {
+        this.console = new ConsoleReader();
+        console.setHistoryEnabled(false);
+        console.setExpandEvents(false);
+    }
+
+    public Prompter(InputStream in, OutputStream out) throws IOException {
+        this.console = new ConsoleReader(in, out);
+        console.setHistoryEnabled(false);
+        console.setExpandEvents(false);
+    }
+
+    public ConsoleReader getConsole() {
+        return console;
+    }
+
+    public String prompt(final String message, final Character mask) throws IOException {
+        Objects.requireNonNull(message);
+
+        final String prompt = String.format("%s: ", message);
+        String value;
+        do {
+            value = console.readLine(prompt, mask);
+        } while (StringUtils.isBlank(value));
+        return value;
+    }
+
+    public String prompt(final String message) throws IOException {
+        Objects.requireNonNull(message);
+        return prompt(message, null);
+    }
+
+    public String promptWithDefaultValue(final String message, final String defaultValue) throws IOException {
+        Objects.requireNonNull(message);
+        Objects.requireNonNull(defaultValue);
+
+        final String prompt = String.format("%s [%s]: ", message, defaultValue);
+        String value = console.readLine(prompt);
+        if (StringUtils.isBlank(value)) {
+            return defaultValue;
+        }
+        return value;
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java
new file mode 100644
index 0000000000000..6a46efe64f97a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/predicate/ExtensionPredicate.java
@@ -0,0 +1,170 @@
+package io.quarkus.platform.catalog.predicate;
+
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.getShortName;
+
+import io.quarkus.platform.catalog.processor.ExtensionProcessor;
+import io.quarkus.registry.catalog.Extension;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * A {@link Predicate} implementation that will test a keyword against an {@link Extension}
+ */
+public class ExtensionPredicate implements Predicate<Extension> {
+
+    private final String q;
+
+    public ExtensionPredicate(String keyword) {
+        this.q = Objects.requireNonNull(keyword, "keyword must not be null").trim().toLowerCase();
+    }
+
+    public static Predicate<Extension> create(String keyword) {
+        return new ExtensionPredicate(keyword);
+    }
+
+    public static boolean isPattern(String keyword) {
+        for (char c : keyword.toCharArray()) {
+            switch (c) {
+                case '*':
+                case '?':
+                case '^': // escape character in cmd.exe
+                case '(':
+                case ')':
+                case '[':
+                case ']':
+                case '$':
+                case '.':
+                case '{':
+                case '}':
+                case '|':
+                case '\\':
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean test(Extension extension) {
+        final ExtensionProcessor extensionMetadata = ExtensionProcessor.of(extension);
+        if (extensionMetadata.isUnlisted()) {
+            return false;
+        }
+
+        String extensionName = Objects.toString(extension.getName(), "");
+        String shortName = Objects.toString(extensionMetadata.getShortName(), "");
+
+        // Try exact matches
+        if (isExactMatch(extension)) {
+            return true;
+        }
+        // Try short names
+        if (matchesShortName(extension, q)) {
+            return true;
+        }
+        // Partial matches on name, artifactId and short names
+        if (extensionName.toLowerCase().contains(q)
+                || extension.getArtifact().getArtifactId().toLowerCase().contains(q)
+                || shortName.toLowerCase().contains(q)) {
+            return true;
+        }
+        // find by keyword
+        if (extensionMetadata.getExtendedKeywords().contains(q)) {
+            return true;
+        }
+        // find by pattern
+        Pattern pattern = toRegex(q);
+        return pattern != null && (pattern.matcher(extensionName.toLowerCase()).matches()
+                || pattern.matcher(extension.getArtifact().getArtifactId().toLowerCase()).matches()
+                || pattern.matcher(shortName.toLowerCase()).matches()
+                || matchLabels(pattern, extensionMetadata.getKeywords()));
+    }
+
+    public boolean isExactMatch(Extension extension) {
+        String extensionName = Objects.toString(extension.getName(), "");
+        // Try exact matches
+        if (extensionName.equalsIgnoreCase(q) ||
+                matchesArtifactId(extension.getArtifact().getArtifactId(), q)) {
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean matchesShortName(Extension extension, String q) {
+        return q.equalsIgnoreCase(getShortName(extension));
+    }
+
+    private static boolean matchesArtifactId(String artifactId, String q) {
+        return artifactId.equalsIgnoreCase(q) ||
+                artifactId.equalsIgnoreCase("quarkus-" + q);
+    }
+
+    private static boolean matchLabels(Pattern pattern, List<String> labels) {
+        boolean matches = false;
+        // if any label match it's ok
+        for (String label : labels) {
+            matches = matches || pattern.matcher(label.toLowerCase()).matches();
+        }
+        return matches;
+    }
+
+    private static Pattern toRegex(final String str) {
+        try {
+            String wildcardToRegex = wildcardToRegex(str);
+            if (wildcardToRegex != null && !wildcardToRegex.isEmpty()) {
+                return Pattern.compile(wildcardToRegex, Pattern.CASE_INSENSITIVE);
+            }
+        } catch (PatternSyntaxException e) {
+            //ignore it
+        }
+        return null;
+    }
+
+    private static String wildcardToRegex(String wildcard) {
+        if (wildcard == null || wildcard.isEmpty()) {
+            return null;
+        }
+        // don't try with file match char in pattern
+        if (!(wildcard.contains("*") || wildcard.contains("?"))) {
+            return null;
+        }
+        StringBuilder s = new StringBuilder(wildcard.length());
+        s.append("^.*");
+        for (int i = 0, is = wildcard.length(); i < is; i++) {
+            char c = wildcard.charAt(i);
+            switch (c) {
+                case '*':
+                    s.append(".*");
+                    break;
+                case '?':
+                    s.append(".");
+                    break;
+                case '^': // escape character in cmd.exe
+                    s.append("\\");
+                    break;
+                // escape special regexp-characters
+                case '(':
+                case ')':
+                case '[':
+                case ']':
+                case '$':
+                case '.':
+                case '{':
+                case '}':
+                case '|':
+                case '\\':
+                    s.append("\\");
+                    s.append(c);
+                    break;
+                default:
+                    s.append(c);
+                    break;
+            }
+        }
+        s.append(".*$");
+        return (s.toString());
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java
new file mode 100644
index 0000000000000..3679faddf4060
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/CatalogProcessor.java
@@ -0,0 +1,46 @@
+package io.quarkus.platform.catalog.processor;
+
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import java.util.*;
+
+public class CatalogProcessor {
+    private final ExtensionCatalog catalog;
+
+    private CatalogProcessor(ExtensionCatalog catalog) {
+        this.catalog = Objects.requireNonNull(catalog);
+    }
+
+    public static CatalogProcessor of(ExtensionCatalog catalog) {
+        return new CatalogProcessor(catalog);
+    }
+
+    public static List<ProcessedCategory> getProcessedCategoriesInOrder(ExtensionCatalog catalog) {
+        return of(catalog).getProcessedCategoriesInOrder();
+    }
+
+    public ExtensionCatalog getCatalog() {
+        return catalog;
+    }
+
+    public List<ProcessedCategory> getProcessedCategoriesInOrder() {
+        final Map<String, List<Extension>> extsByCategory = new HashMap<>(getCatalog().getCategories().size());
+        for (Extension e : catalog.getExtensions()) {
+            List<String> categories = ExtensionProcessor.of(e).getCategories();
+            for (String c : categories) {
+                if (!extsByCategory.containsKey(c)) {
+                    extsByCategory.put(c, new ArrayList<>());
+                }
+                extsByCategory.get(c).add(e);
+            }
+        }
+        final List<ProcessedCategory> orderedCategories = new ArrayList<>(getCatalog().getCategories().size());
+        for (Category c : getCatalog().getCategories()) {
+            if (extsByCategory.containsKey(c.getId())) {
+                orderedCategories.add(new ProcessedCategory(c, extsByCategory.get(c.getId())));
+            }
+        }
+        return orderedCategories;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java
new file mode 100644
index 0000000000000..d646f89bd9848
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtendedKeywords.java
@@ -0,0 +1,42 @@
+package io.quarkus.platform.catalog.processor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+
+public final class ExtendedKeywords {
+    private ExtendedKeywords() {
+    }
+
+    private static final Pattern TOKENIZER_PATTERN = Pattern.compile("\\w+");
+
+    private static final HashSet<String> STOP_WORDS = new HashSet<>(Arrays.asList("the", "and", "you", "that", "was", "for",
+            "are", "with", "his", "they", "one",
+            "have", "this", "from", "had", "not", "but", "what", "can", "out", "other", "were", "all", "there", "when",
+            "your", "how", "each", "she", "which", "their", "will", "way", "about", "many", "then", "them", "would", "enable",
+            "these", "her", "him", "has", "over", "than", "who", "may", "down", "been", "more", "implementing", "non",
+            "quarkus"));
+
+    public static List<String> extendsKeywords(ExtensionProcessor extensionMetadata) {
+        final TreeSet<String> result = new TreeSet<>();
+        extensionMetadata.getKeywords().forEach(it -> result.add(it.toLowerCase(Locale.US)));
+        result.add(extensionMetadata.getExtension().getArtifact().getArtifactId().toLowerCase(Locale.US));
+        final String description = extensionMetadata.getExtension().getDescription();
+        if (!StringUtils.isEmpty(description)) {
+            final Matcher matcher = TOKENIZER_PATTERN.matcher(description);
+            while (matcher.find()) {
+                final String token = matcher.group().toLowerCase(Locale.US);
+                if (token.length() >= 3 && !STOP_WORDS.contains(token)) {
+                    result.add(token);
+                }
+            }
+        }
+        return new ArrayList<>(result);
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java
new file mode 100644
index 0000000000000..caa4dbd5b8eec
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java
@@ -0,0 +1,145 @@
+package io.quarkus.platform.catalog.processor;
+
+import static io.quarkus.registry.catalog.Extension.*;
+
+import io.quarkus.registry.catalog.Extension;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public final class ExtensionProcessor {
+
+    private static final String STABLE_STATS = "stable";
+    public static final String PROVIDES_EXAMPLE_TAG = "provides-example";
+
+    public enum CodestartKind {
+        CORE,
+        EXAMPLE,
+        SINGLETON_EXAMPLE;
+
+        public boolean isExample() {
+            return name().contains("EXAMPLE");
+        }
+    }
+
+    private final Extension extension;
+
+    private ExtensionProcessor(Extension extension) {
+        this.extension = Objects.requireNonNull(extension);
+    }
+
+    public static ExtensionProcessor of(Extension extension) {
+        return new ExtensionProcessor(extension);
+    }
+
+    public static String getShortName(Extension extension) {
+        return of(extension).getShortName();
+    }
+
+    public static String getGuide(Extension extension) {
+        return of(extension).getGuide();
+    }
+
+    public static String getCodestartName(Extension extension) {
+        return of(extension).getCodestartName();
+    }
+
+    public static boolean isUnlisted(Extension extension) {
+        return of(extension).isUnlisted();
+    }
+
+    public static List<String> getExtendedKeywords(Extension extension) {
+        return of(extension).getExtendedKeywords();
+    }
+
+    public Extension getExtension() {
+        return extension;
+    }
+
+    /**
+     * @return string representing the location of primary guide for this extension.
+     */
+    public String getGuide() {
+        return getMetadataValue(MD_GUIDE).asString();
+    }
+
+    public String getShortName() {
+        final String shortName = getMetadataValue(MD_SHORT_NAME).asString();
+        return shortName == null ? extension.getName() : shortName;
+    }
+
+    public String getCodestartName() {
+        return getMetadataValue(MD_NESTED_CODESTART_NAME).asString();
+    }
+
+    public List<String> getCategories() {
+        return getMetadataValue(MD_CATEGORIES).asStringList();
+    }
+
+    public List<String> getCodestartLanguages() {
+        return getMetadataValue(MD_NESTED_CODESTART_LANGUAGES).asStringList();
+    }
+
+    public String getCodestartArtifact() {
+        return getMetadataValue(MD_NESTED_CODESTART_ARTIFACT).asString();
+    }
+
+    public CodestartKind getCodestartKind() {
+        return getMetadataValue(MD_NESTED_CODESTART_KIND).toEnum(CodestartKind.class);
+    }
+
+    public boolean providesExampleCode() {
+        final CodestartKind codestartKind = getCodestartKind();
+        return codestartKind != null && codestartKind.isExample();
+    }
+
+    public boolean isUnlisted() {
+        return getMetadataValue(MD_UNLISTED).asBoolean();
+    }
+
+    public List<String> getKeywords() {
+        return getMetadataValue(MD_KEYWORDS).asStringList();
+    }
+
+    /**
+     * List of strings to use for matching.
+     * <br/>
+     * <br/>
+     * It includes a mix of static keywords, the artifactId, and keywords extracted from the description
+     *
+     * @return list of keywords to use for matching.
+     */
+    public List<String> getExtendedKeywords() {
+        return ExtendedKeywords.extendsKeywords(this);
+    }
+
+    public List<String> getTags() {
+        return getTags(null);
+    }
+
+    public List<String> getTags(String customStatusKey) {
+        final List<String> keys = new ArrayList<>();
+        keys.add(customStatusKey != null ? customStatusKey : MD_STATUS);
+        final List<String> tags = keys.stream()
+                .map(key -> getMetadataValue(key).asStringList())
+                .flatMap(List::stream)
+                .filter(tag -> !STABLE_STATS.equals(tag))
+                .map(String::toLowerCase)
+                .collect(Collectors.toCollection(ArrayList::new));
+        if (providesExampleCode()) {
+            tags.add(PROVIDES_EXAMPLE_TAG);
+        }
+        return tags;
+    }
+
+    private Map<String, Object> getMetadata() {
+        return extension.getMetadata();
+    }
+
+    private MetadataValue getMetadataValue(String mdGuide) {
+        return MetadataValue.get(getMetadata(), mdGuide);
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/MetadataValue.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/MetadataValue.java
new file mode 100644
index 0000000000000..3e24f24ad7ea4
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/MetadataValue.java
@@ -0,0 +1,73 @@
+package io.quarkus.platform.catalog.processor;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+final class MetadataValue {
+    private static final MetadataValue EMPTY_METADATA_VALUE = new MetadataValue(null);
+    private final Object val;
+
+    public MetadataValue(Object val) {
+        this.val = val;
+    }
+
+    public static MetadataValue get(Map<String, Object> data, String path) {
+        final Map<String, Object> safeData = data != null ? data : Collections.emptyMap();
+        if (!path.contains(".")) {
+            return new MetadataValue(safeData.get(path));
+        }
+        int index = path.indexOf(".");
+        String key = path.substring(0, index);
+        if (safeData.get(key) instanceof Map) {
+            return get((Map<String, Object>) safeData.get(key), path.substring(index + 1));
+        } else {
+            return EMPTY_METADATA_VALUE;
+        }
+    }
+
+    public boolean isEmpty() {
+        return val == null;
+    }
+
+    public String asString() {
+        if (val instanceof String) {
+            return (String) val;
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public List<String> asStringList() {
+        if (val instanceof String) {
+            return Collections.singletonList((String) val);
+        } else if (val instanceof List && !((List<?>) val).isEmpty()
+                && ((List<?>) val).get(0) instanceof String) {
+            return (List<String>) val;
+        }
+        return Collections.emptyList();
+    }
+
+    @SuppressWarnings("unchecked")
+    public boolean asBoolean() {
+        if (val == null) {
+            return false;
+        }
+        if (val instanceof Boolean) {
+            return (Boolean) val;
+        }
+        if (val instanceof String) {
+            return Boolean.parseBoolean((String) val);
+        }
+        return false;
+    }
+
+    public <T extends Enum<T>> T toEnum(Class<T> clazz) {
+        final String name = asString();
+        if (name == null) {
+            return null;
+        }
+        return T.valueOf(clazz, name.toUpperCase().replace("-", "_"));
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java
new file mode 100644
index 0000000000000..93639c4c9cbee
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ProcessedCategory.java
@@ -0,0 +1,45 @@
+package io.quarkus.platform.catalog.processor;
+
+import static io.quarkus.registry.catalog.Category.MD_PINNED;
+
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public final class ProcessedCategory {
+    private final Category category;
+    private final Collection<Extension> extensions;
+
+    public ProcessedCategory(Category category, Collection<Extension> extensions) {
+        this.category = Objects.requireNonNull(category);
+        this.extensions = Objects.requireNonNull(extensions);
+    }
+
+    public Category getCategory() {
+        return category;
+    }
+
+    public Collection<Extension> getExtensions() {
+        return extensions;
+    }
+
+    public List<Extension> getSortedExtensions() {
+        return extensions.stream().sorted(extensionsComparator()).collect(Collectors.toList());
+    }
+
+    private Comparator<Extension> extensionsComparator() {
+        final List<String> pinnedList = MetadataValue.get(category.getMetadata(), MD_PINNED).asStringList();
+        return Comparator.<Extension> comparingInt(e -> getPinnedIndex(pinnedList, e))
+                .thenComparing(Extension::getName);
+    }
+
+    private int getPinnedIndex(List<String> pinnedList, Extension e) {
+        final int index = pinnedList.indexOf(e.managementKey());
+        return index >= 0 ? index : Integer.MAX_VALUE;
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/ProjectPlatformDescriptorJsonUtil.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/ProjectPlatformDescriptorJsonUtil.java
new file mode 100644
index 0000000000000..6ed328faa041a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/ProjectPlatformDescriptorJsonUtil.java
@@ -0,0 +1,103 @@
+package io.quarkus.platform.descriptor;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.AppModelResolver;
+import io.quarkus.bootstrap.resolver.AppModelResolverException;
+import io.quarkus.maven.ArtifactKey;
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
+import io.quarkus.registry.catalog.json.JsonExtensionOrigin;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ProjectPlatformDescriptorJsonUtil {
+
+    public static JsonExtensionCatalog resolveCatalog(AppModelResolver resolver, List<AppArtifact> depConstraints)
+            throws AppModelResolverException {
+        final List<JsonExtensionCatalog> platforms = new ArrayList<>(2);
+        final Set<AppArtifactKey> processedPlatforms = new HashSet<>();
+        for (int i = 0; i < depConstraints.size(); ++i) {
+            final AppArtifact artifact = depConstraints.get(i);
+            if (!artifact.getArtifactId().endsWith(BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)
+                    && !artifact.getType().equals("json")) {
+                continue;
+            }
+            if (!processedPlatforms.add(artifact.getKey())) {
+                continue;
+            }
+            final Path json = resolver.resolve(artifact);
+            final JsonExtensionCatalog platform;
+            try {
+                platform = JsonCatalogMapperHelper.deserialize(json, JsonExtensionCatalog.class);
+            } catch (IOException e) {
+                throw new AppModelResolverException("Failed to deserialize a platform descriptor from " + json, e);
+            }
+            platform.getDerivedFrom().forEach(o -> processedPlatforms.add(AppArtifactCoords.fromString(o.getId()).getKey()));
+            platforms.add(platform);
+        }
+        if (platforms.isEmpty()) {
+            return null;
+        }
+
+        final List<ExtensionOrigin> derivedFrom = new ArrayList<>();
+        final List<Extension> extensions = new ArrayList<>();
+        final Set<ArtifactKey> extensionKeys = new HashSet<>();
+        final List<Category> categories = new ArrayList<>();
+        final Set<String> categoryIds = new HashSet<>();
+        final Map<String, Object> metadata = new HashMap<>();
+
+        final JsonExtensionCatalog catalog = new JsonExtensionCatalog();
+        catalog.setPlatform(false);
+        catalog.setDerivedFrom(derivedFrom);
+        catalog.setExtensions(extensions);
+        catalog.setCategories(categories);
+        catalog.setMetadata(metadata);
+
+        final JsonExtensionCatalog dominatingPlatform = platforms.get(0);
+        catalog.setQuarkusCoreVersion(dominatingPlatform.getQuarkusCoreVersion());
+        catalog.setUpstreamQuarkusCoreVersion(dominatingPlatform.getUpstreamQuarkusCoreVersion());
+
+        for (int i = 0; i < platforms.size(); ++i) {
+            final JsonExtensionCatalog platform = platforms.get(i);
+            if (platform.getBom() != null) {
+                catalog.setBom(platform.getBom());
+            }
+            final JsonExtensionOrigin origin = new JsonExtensionOrigin();
+            origin.setId(platform.getId());
+            origin.setPlatform(platform.isPlatform());
+            origin.setBom(platform.getBom());
+            derivedFrom.add(origin);
+
+            for (Extension e : platform.getExtensions()) {
+                if (extensionKeys.add(e.getArtifact().getKey())) {
+                    extensions.add(e);
+                }
+            }
+
+            for (Category c : platform.getCategories()) {
+                if (categoryIds.add(c.getId())) {
+                    categories.add(c);
+                }
+            }
+
+            for (Map.Entry<String, Object> entry : platform.getMetadata().entrySet()) {
+                if (!metadata.containsKey(entry.getKey())) {
+                    metadata.put(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+        return catalog;
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ArtifactResolver.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ArtifactResolver.java
deleted file mode 100644
index 7871771667cbe..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ArtifactResolver.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json;
-
-import io.quarkus.bootstrap.resolver.AppModelResolverException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.function.Function;
-import org.apache.maven.model.Dependency;
-
-public interface ArtifactResolver {
-
-    default <T> T process(String groupId, String artifactId, String version, Function<Path, T> processor)
-            throws AppModelResolverException {
-        return process(groupId, artifactId, null, "jar", version, processor);
-    }
-
-    <T> T process(String groupId, String artifactId, String classifier, String type, String version,
-            Function<Path, T> processor) throws AppModelResolverException;
-
-    List<Dependency> getManagedDependencies(String groupId, String artifactId, String classifier, String type, String version);
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ClassPathResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ClassPathResourceLoader.java
index 9983b8eb9784a..7746ffc19c336 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ClassPathResourceLoader.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ClassPathResourceLoader.java
@@ -1,8 +1,9 @@
 package io.quarkus.platform.descriptor.loader.json;
 
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.net.URL;
 
 public class ClassPathResourceLoader implements ResourceLoader {
 
@@ -16,6 +17,21 @@ public ClassPathResourceLoader(ClassLoader cl) {
         this.cl = cl;
     }
 
+    @Override
+    public <T> T loadResourceAsPath(String name, ResourcePathConsumer<T> consumer) throws IOException {
+        final URL url = cl.getResource(name);
+        if (url == null) {
+            throw new IOException("Failed to locate " + name + " on the classpath");
+        }
+        return ResourceLoaders.processAsPath(url, is -> {
+            try {
+                return consumer.consume(is);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+    }
+
     @Override
     public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
         final InputStream stream = cl.getResourceAsStream(name);
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/DirectoryResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/DirectoryResourceLoader.java
index c42cc47894791..e59700228f3f1 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/DirectoryResourceLoader.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/DirectoryResourceLoader.java
@@ -1,8 +1,6 @@
 package io.quarkus.platform.descriptor.loader.json;
 
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -18,16 +16,11 @@ public DirectoryResourceLoader(Path dir) {
     }
 
     @Override
-    public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-        Path resource = dir.resolve(name);
-        if (!Files.exists(resource)) {
-            throw new IOException("Failed to locate " + resource);
-        }
-        if (Files.isDirectory(resource)) {
-            throw new IOException("Can't open a stream for path pointing to directory " + resource);
-        }
-        try (InputStream is = Files.newInputStream(resource)) {
-            return consumer.consume(is);
+    public <T> T loadResourceAsPath(String name, ResourcePathConsumer<T> consumer) throws IOException {
+        Path path = dir.resolve(name);
+        if (!Files.exists(path)) {
+            throw new IOException("Failed to locate " + name + " dir on the classpath");
         }
+        return consumer.consume(path);
     }
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoader.java
deleted file mode 100644
index 812f31dc1c185..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoader.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader;
-
-public interface QuarkusJsonPlatformDescriptorLoader<D extends QuarkusPlatformDescriptor>
-        extends QuarkusPlatformDescriptorLoader<D, QuarkusJsonPlatformDescriptorLoaderContext> {
-
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java
deleted file mode 100644
index 91e712eb426e3..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/QuarkusJsonPlatformDescriptorLoaderContext.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.quarkus.platform.descriptor.loader.json;
-
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoaderContext;
-import io.quarkus.platform.tools.DefaultMessageWriter;
-import io.quarkus.platform.tools.MessageWriter;
-import java.io.InputStream;
-import java.util.function.Function;
-
-public abstract class QuarkusJsonPlatformDescriptorLoaderContext implements QuarkusPlatformDescriptorLoaderContext {
-
-    protected final MessageWriter log;
-    protected final ArtifactResolver artifactResolver;
-    protected final ResourceLoader resourceLoader;
-
-    public QuarkusJsonPlatformDescriptorLoaderContext(ArtifactResolver artifactResolver) {
-        this(artifactResolver, new DefaultMessageWriter());
-    }
-
-    public QuarkusJsonPlatformDescriptorLoaderContext(ArtifactResolver artifactResolver, MessageWriter log) {
-        this(artifactResolver, new ClassPathResourceLoader(Thread.currentThread().getContextClassLoader()), log);
-    }
-
-    public QuarkusJsonPlatformDescriptorLoaderContext(ArtifactResolver artifactResolver, ResourceLoader resourceLoader,
-            MessageWriter log) {
-        this.log = log;
-        this.artifactResolver = artifactResolver;
-        this.resourceLoader = resourceLoader;
-    }
-
-    public abstract <T> T parseJson(Function<InputStream, T> parser);
-
-    @Override
-    public MessageWriter getMessageWriter() {
-        return log;
-    }
-
-    public ArtifactResolver getArtifactResolver() {
-        return artifactResolver;
-    }
-
-    public ResourceLoader getResourceLoader() {
-        return resourceLoader;
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/ResourceInputStreamConsumer.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceInputStreamConsumer.java
similarity index 75%
rename from independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/ResourceInputStreamConsumer.java
rename to independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceInputStreamConsumer.java
index 4898146a6fa52..5bd29649a6d58 100644
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/ResourceInputStreamConsumer.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceInputStreamConsumer.java
@@ -1,4 +1,4 @@
-package io.quarkus.platform.descriptor;
+package io.quarkus.platform.descriptor.loader.json;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoader.java
index a7d67ec4a8c7a..910ae860ea874 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoader.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoader.java
@@ -1,9 +1,19 @@
 package io.quarkus.platform.descriptor.loader.json;
 
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 
 public interface ResourceLoader {
 
-    <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException;
+    <T> T loadResourceAsPath(String name, ResourcePathConsumer<T> consumer) throws IOException;
+
+    default <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
+        return this.loadResourceAsPath(name, p -> {
+            try (InputStream is = Files.newInputStream(p)) {
+                return consumer.consume(is);
+            }
+        });
+    }
+
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java
new file mode 100644
index 0000000000000..d29e0b2aafa28
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourceLoaders.java
@@ -0,0 +1,72 @@
+package io.quarkus.platform.descriptor.loader.json;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.function.Function;
+
+public final class ResourceLoaders {
+
+    private static final String FILE = "file";
+    private static final String JAR = "jar";
+
+    private ResourceLoaders() {
+    }
+
+    public static File getResourceFile(final URL url, final String name) throws IOException {
+        if (url == null) {
+            throw new IOException("Failed to locate resource " + name + " on the classpath");
+        }
+        try {
+            return new File(url.toURI());
+        } catch (URISyntaxException | IllegalArgumentException e) {
+            throw new IOException(
+                    "There were a problem while reading the resource dir '" + name + "' on the classpath with url: '"
+                            + url.toString() + "'");
+        }
+    }
+
+    // This method is copied from io.quarkus.runtime.util.ClassPathUtils
+    public static <R> R processAsPath(URL url, Function<Path, R> function) {
+        if (JAR.equals(url.getProtocol())) {
+            final String file = url.getFile();
+            final int exclam = file.lastIndexOf('!');
+            final Path jar;
+            try {
+                jar = toLocalPath(exclam >= 0 ? new URL(file.substring(0, exclam)) : url);
+            } catch (MalformedURLException e) {
+                throw new RuntimeException("Failed to create a URL for '" + file.substring(0, exclam) + "'", e);
+            }
+            try (FileSystem jarFs = FileSystems.newFileSystem(jar, (ClassLoader) null)) {
+                Path localPath = jarFs.getPath("/");
+                if (exclam >= 0) {
+                    localPath = localPath.resolve(file.substring(exclam + 1));
+                }
+                return function.apply(localPath);
+            } catch (IOException e) {
+                throw new UncheckedIOException("Failed to read " + jar, e);
+            }
+        }
+
+        if (FILE.equals(url.getProtocol())) {
+            return function.apply(toLocalPath(url));
+        }
+
+        throw new IllegalArgumentException("Unexpected protocol " + url.getProtocol() + " for URL " + url);
+    }
+
+    private static Path toLocalPath(final URL url) {
+        try {
+            return Paths.get(url.toURI());
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Failed to translate " + url + " to local path", e);
+        }
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourcePathConsumer.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourcePathConsumer.java
new file mode 100644
index 0000000000000..cacb282ffbcc1
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ResourcePathConsumer.java
@@ -0,0 +1,9 @@
+package io.quarkus.platform.descriptor.loader.json;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public interface ResourcePathConsumer<T> {
+
+    T consume(Path is) throws IOException;
+}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java
index 171d4be144e96..8c16537ada648 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/descriptor/loader/json/ZipResourceLoader.java
@@ -1,8 +1,6 @@
 package io.quarkus.platform.descriptor.loader.json;
 
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -17,15 +15,14 @@ public ZipResourceLoader(Path zip) {
     }
 
     @Override
-    public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
+    public <T> T loadResourceAsPath(String name, ResourcePathConsumer<T> consumer) throws IOException {
         try (FileSystem fs = FileSystems.newFileSystem(zip, (ClassLoader) null)) {
-            final Path p = fs.getPath("/", name);
-            if (!Files.exists(p)) {
+            final Path path = fs.getPath("/", name);
+            if (!Files.exists(path)) {
                 throw new IOException("Failed to locate " + name + " in " + zip);
             }
-            try (InputStream is = Files.newInputStream(p)) {
-                return consumer.consume(is);
-            }
+            return consumer.consume(path);
         }
     }
+
 }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsConstants.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsConstants.java
index 9f23b61615aa1..962393f338979 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsConstants.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsConstants.java
@@ -13,9 +13,20 @@ public interface ToolsConstants {
     String DEFAULT_PLATFORM_BOM_GROUP_ID = IO_QUARKUS;
     String DEFAULT_PLATFORM_BOM_ARTIFACT_ID = "quarkus-universe-bom";
 
-    String PROP_QUARKUS_PLUGIN_GROUP_ID = "plugin-groupId";
-    String PROP_QUARKUS_PLUGIN_ARTIFACT_ID = "plugin-artifactId";
-    String PROP_QUARKUS_PLUGIN_VERSION = "plugin-version";
+    String PROP_QUARKUS_CORE_VERSION = "quarkus-core-version";
+
+    String PROP_KOTLIN_VERSION = "kotlin-version";
+    String PROP_SCALA_VERSION = "scala-version";
+    String PROP_SCALA_PLUGIN_VERSION = "scala-plugin-version";
+    String PROP_SUREFIRE_PLUGIN_VERSION = "surefire-plugin-version";
+    String PROP_COMPILER_PLUGIN_VERSION = "compiler-plugin-version";
+
+    String PROP_QUARKUS_MAVEN_PLUGIN_GROUP_ID = "maven-plugin-groupId";
+    String PROP_QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID = "maven-plugin-artifactId";
+    String PROP_QUARKUS_MAVEN_PLUGIN_VERSION = "maven-plugin-version";
+
+    String PROP_QUARKUS_GRADLE_PLUGIN_ID = "gradle-plugin-id";
+    String PROP_QUARKUS_GRADLE_PLUGIN_VERSION = "gradle-plugin-version";
 
     String PROP_PROPOSED_MVN_VERSION = "proposed-maven-version";
     String PROP_MVN_WRAPPER_VERSION = "maven-wrapper-version";
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java
index 5d55e32a79e2d..82a8c02a45aee 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/ToolsUtils.java
@@ -1,8 +1,25 @@
 package io.quarkus.platform.tools;
 
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.bootstrap.resolver.AppModelResolver;
+import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonCatalogMerger;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 
 public class ToolsUtils {
 
@@ -42,34 +59,113 @@ public static String dotJoin(String... parts) {
         return buf.toString();
     }
 
-    public static Properties readQuarkusProperties(QuarkusPlatformDescriptor platformDescr) {
-        final Properties properties;
+    public static ExtensionCatalog resolvePlatformDescriptorDirectly(String bomGroupId, String bomArtifactId, String bomVersion,
+            MavenArtifactResolver artifactResolver, MessageWriter log) {
+        // TODO remove this method once we have the registry service available
+        if (bomVersion == null) {
+            throw new IllegalArgumentException("BOM version was not provided");
+        }
+        Artifact catalogCoords = new DefaultArtifact(
+                bomGroupId == null ? "io.quarkus" : bomGroupId,
+                (bomArtifactId == null ? "quarkus-universe-bom" : bomArtifactId)
+                        + BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX,
+                bomVersion, "json", bomVersion);
+        Path platformJson = null;
+        try {
+            log.debug("Resolving platform descriptor %s", catalogCoords);
+            platformJson = artifactResolver.resolve(catalogCoords).getArtifact().getFile().toPath();
+        } catch (Exception e) {
+            if (bomArtifactId == null && catalogCoords.getArtifactId().startsWith("quarkus-universe-bom")) {
+                catalogCoords = new DefaultArtifact(
+                        catalogCoords.getGroupId(),
+                        "quarkus-bom" + BootstrapConstants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX,
+                        catalogCoords.getClassifier(), catalogCoords.getExtension(), catalogCoords.getVersion());
+                try {
+                    log.debug("Resolving platform descriptor %s", catalogCoords);
+                    platformJson = artifactResolver.resolve(catalogCoords).getArtifact().getFile().toPath();
+                } catch (Exception e2) {
+                }
+            }
+            if (platformJson == null) {
+                throw new RuntimeException("Failed to resolve the default platform JSON descriptor", e);
+            }
+        }
         try {
-            properties = platformDescr.loadResource("quarkus.properties", is -> {
-                final Properties props = new Properties();
-                props.load(is);
-                return props;
-            });
+            return JsonCatalogMapperHelper.deserialize(platformJson, JsonExtensionCatalog.class);
         } catch (IOException e) {
-            throw new IllegalStateException("Failed to read quarkus.properties", e);
+            throw new RuntimeException("Failed to deserialize extension catalog " + platformJson, e);
         }
+    }
+
+    public static ExtensionCatalog mergePlatforms(List<ArtifactCoords> platforms, MavenArtifactResolver artifactResolver) {
+        // TODO remove this method once we have the registry service available
+        return mergePlatforms(platforms, new BootstrapAppModelResolver(artifactResolver));
+    }
+
+    public static ExtensionCatalog mergePlatforms(List<ArtifactCoords> platforms, AppModelResolver artifactResolver) {
+        // TODO remove this method once we have the registry service available
+        List<ExtensionCatalog> catalogs = new ArrayList<>(platforms.size());
+        for (ArtifactCoords platform : platforms) {
+            final Path json;
+            try {
+                json = artifactResolver.resolve(new AppArtifact(platform.getGroupId(), platform.getArtifactId(),
+                        platform.getClassifier(), platform.getType(), platform.getVersion()));
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to resolve platform descriptor " + platform, e);
+            }
+            try {
+                catalogs.add(JsonCatalogMapperHelper.deserialize(json, JsonExtensionCatalog.class));
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to deserialize platform descriptor " + json, e);
+            }
+        }
+        return JsonCatalogMerger.merge(catalogs);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Properties readQuarkusProperties(ExtensionCatalog catalog) {
+        Map<Object, Object> map = (Map<Object, Object>) catalog.getMetadata().getOrDefault("project", Collections.emptyMap());
+        map = (Map<Object, Object>) map.getOrDefault("properties", Collections.emptyMap());
+        final Properties properties = new Properties();
+        map.entrySet().forEach(
+                e -> properties.setProperty(e.getKey().toString(), e.getValue() == null ? null : e.getValue().toString()));
         return properties;
     }
 
-    public static String getPluginArtifactId(Properties props) {
-        return props.getProperty(ToolsConstants.PROP_QUARKUS_PLUGIN_ARTIFACT_ID);
+    public static String requireProperty(Properties props, String name) {
+        final String value = props.getProperty(name);
+        if (value == null) {
+            throw new IllegalStateException("Failed to resolve required property " + name);
+        }
+        return value;
+    }
+
+    public static String getMavenPluginArtifactId(Properties props) {
+        return props.getProperty(ToolsConstants.PROP_QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID);
+    }
+
+    public static String getMavenPluginGroupId(Properties props) {
+        return props.getProperty(ToolsConstants.PROP_QUARKUS_MAVEN_PLUGIN_GROUP_ID);
+    }
+
+    public static String getQuarkusCoreVersion(Properties props) {
+        return props.getProperty(ToolsConstants.PROP_QUARKUS_CORE_VERSION);
+    }
+
+    public static String requireQuarkusCoreVersion(Properties props) {
+        return requireProperty(props, ToolsConstants.PROP_QUARKUS_CORE_VERSION);
     }
 
-    public static String getPluginGroupId(Properties props) {
-        return props.getProperty(ToolsConstants.PROP_QUARKUS_PLUGIN_GROUP_ID);
+    public static String getMavenPluginVersion(Properties props) {
+        return props.getProperty(ToolsConstants.PROP_QUARKUS_MAVEN_PLUGIN_VERSION);
     }
 
-    public static String getPluginVersion(Properties props) {
-        return props.getProperty(ToolsConstants.PROP_QUARKUS_PLUGIN_VERSION);
+    public static String getGradlePluginVersion(Properties props) {
+        return props.getProperty(ToolsConstants.PROP_QUARKUS_GRADLE_PLUGIN_VERSION);
     }
 
     public static String getPluginKey(Properties props) {
-        return getPluginGroupId(props) + ":" + getPluginArtifactId(props);
+        return getMavenPluginGroupId(props) + ":" + getMavenPluginArtifactId(props);
     }
 
     public static String getProposedMavenVersion(Properties props) {
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java
deleted file mode 100644
index 024149a91c526..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/tools/config/QuarkusPlatformConfig.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package io.quarkus.platform.tools.config;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoaderContext;
-import io.quarkus.platform.tools.DefaultMessageWriter;
-import io.quarkus.platform.tools.MessageWriter;
-import java.util.Iterator;
-import java.util.ServiceLoader;
-import java.util.concurrent.atomic.AtomicReference;
-
-public class QuarkusPlatformConfig {
-
-    public static class Builder {
-
-        private int type = STANDALONE;
-        private MessageWriter log;
-        private QuarkusPlatformDescriptor platformDescr;
-
-        private Builder(int type) {
-            if (type == GLOBAL) {
-                assertNoGlobalConfig();
-            } else if (type == THREAD_LOCAL) {
-                assertNoThreadLocalConfig();
-            }
-            this.type = type;
-        }
-
-        public Builder setMessageWriter(MessageWriter msgWriter) {
-            this.log = msgWriter;
-            return this;
-        }
-
-        private MessageWriter getMessageWriter() {
-            return log == null ? log = new DefaultMessageWriter() : log;
-        }
-
-        public Builder setPlatformDescriptor(QuarkusPlatformDescriptor platformDescr) {
-            this.platformDescr = platformDescr;
-            return this;
-        }
-
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        private QuarkusPlatformDescriptor getPlatformDescriptor() {
-            if (platformDescr != null) {
-                return platformDescr;
-            }
-
-            final Iterator<QuarkusPlatformDescriptorLoader> i = ServiceLoader.load(QuarkusPlatformDescriptorLoader.class)
-                    .iterator();
-            if (!i.hasNext()) {
-                throw new IllegalStateException("Failed to locate an implementation of "
-                        + QuarkusPlatformDescriptorLoader.class.getName() + " on the classpath");
-            }
-            final QuarkusPlatformDescriptorLoader<QuarkusPlatformDescriptor, QuarkusPlatformDescriptorLoaderContext> dl = i
-                    .next();
-            if (i.hasNext()) {
-                final StringBuilder buf = new StringBuilder();
-                buf.append("Found multiple implementations of ").append(QuarkusPlatformDescriptorLoader.class.getName())
-                        .append("on the classpath: ").append(dl.getClass().getName());
-                while (i.hasNext()) {
-                    buf.append(", ").append(i.next().getClass().getName());
-                }
-                throw new IllegalStateException(buf.toString());
-            }
-            return platformDescr = dl.load(new QuarkusPlatformDescriptorLoaderContext() {
-                @Override
-                public MessageWriter getMessageWriter() {
-                    return Builder.this.getMessageWriter();
-                }
-            });
-        }
-
-        public QuarkusPlatformConfig build() {
-            return new QuarkusPlatformConfig(this);
-        }
-    }
-
-    public static Builder builder() {
-        return new Builder(STANDALONE);
-    }
-
-    /**
-     * This hopefully will be a temporary way of providing global default config
-     * by creating a builder that will create a config instance which will serve
-     * as the global default config.
-     */
-    public static Builder defaultConfigBuilder() {
-        return new Builder(GLOBAL);
-    }
-
-    /**
-     * This hopefully will be a temporary way of providing global default config
-     * by creating a builder that will create a config instance which will serve
-     * as the global default config.
-     */
-    public static Builder threadLocalConfigBuilder() {
-        return new Builder(THREAD_LOCAL);
-    }
-
-    public static QuarkusPlatformConfig newInstance() {
-        return builder().build();
-    }
-
-    public static synchronized QuarkusPlatformConfig getGlobalDefault() {
-        final QuarkusPlatformConfig c = globalConfig.get();
-        if (c != null) {
-            return c;
-        }
-        return defaultConfigBuilder().build();
-    }
-
-    public static boolean hasGlobalDefault() {
-        return globalConfig.get() != null;
-    }
-
-    public static QuarkusPlatformConfig getThreadLocal() {
-        final QuarkusPlatformConfig c = threadLocalConfig.get();
-        if (c != null) {
-            return c;
-        }
-        return threadLocalConfigBuilder().build();
-    }
-
-    public static boolean hasThreadLocal() {
-        return threadLocalConfig.get() != null;
-    }
-
-    public static void clearThreadLocal() {
-        threadLocalConfig.remove();
-    }
-
-    private static void assertNoGlobalConfig() {
-        if (globalConfig.get() != null) {
-            throw new IllegalStateException(
-                    "The global instance of " + QuarkusPlatformConfig.class.getName() + " has already been initialized");
-        }
-    }
-
-    private static void assertNoThreadLocalConfig() {
-        if (threadLocalConfig.get() != null) {
-            throw new IllegalStateException(
-                    "The thread local instance of " + QuarkusPlatformConfig.class.getName() + " has already been initialized");
-        }
-    }
-
-    private static final int STANDALONE = 0;
-    private static final int GLOBAL = 1;
-    private static final int THREAD_LOCAL = 2;
-
-    private static final AtomicReference<QuarkusPlatformConfig> globalConfig = new AtomicReference<>();
-    private static final ThreadLocal<QuarkusPlatformConfig> threadLocalConfig = new ThreadLocal<>();
-
-    private final MessageWriter log;
-    private final QuarkusPlatformDescriptor platformDescr;
-
-    private QuarkusPlatformConfig(Builder builder) {
-        this.log = builder.getMessageWriter();
-        this.platformDescr = builder.getPlatformDescriptor();
-        if (builder.type == GLOBAL) {
-            assertNoGlobalConfig();
-            globalConfig.set(this);
-        } else if (builder.type == THREAD_LOCAL) {
-            assertNoThreadLocalConfig();
-            threadLocalConfig.set(this);
-        }
-    }
-
-    public MessageWriter getMessageWriter() {
-        return log;
-    }
-
-    public QuarkusPlatformDescriptor getPlatformDescriptor() {
-        return platformDescr;
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/DefaultExtensionRegistry.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/DefaultExtensionRegistry.java
deleted file mode 100644
index 1f2441e105b62..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/DefaultExtensionRegistry.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package io.quarkus.registry;
-
-import io.quarkus.bootstrap.model.AppArtifactCoords;
-import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.dependencies.ExtensionPredicate;
-import io.quarkus.devtools.project.extensions.ExtensionInstallPlan;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.builder.RegistryBuilder;
-import io.quarkus.registry.builder.URLRegistryBuilder;
-import io.quarkus.registry.model.ArtifactKey;
-import io.quarkus.registry.model.Extension.ExtensionRelease;
-import io.quarkus.registry.model.Registry;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.artifact.versioning.ComparableVersion;
-import org.immutables.value.Value;
-
-/**
- * This {@link ExtensionRegistry} implementation uses in-memory {@link Registry}
- * objects to query the data.
- */
-public class DefaultExtensionRegistry implements ExtensionRegistry {
-
-    private final Registry registry;
-
-    /**
-     * Create a {@link DefaultExtensionRegistry} out of a {@link Collection} of {@link URL}s
-     *
-     * @param urls urls used to lookup this registry
-     * @return a {@link DefaultExtensionRegistry} instance
-     * @throws IOException if any IO error occurs while reading each URL contents
-     */
-    public static DefaultExtensionRegistry fromURLs(Collection<URL> urls) throws IOException {
-        Registry registry = new URLRegistryBuilder()
-                .addURLs(urls)
-                .build();
-        return new DefaultExtensionRegistry(registry);
-    }
-
-    /**
-     * Create a {@link DefaultExtensionRegistry} from a single {@link QuarkusPlatformDescriptor}
-     *
-     * @param platform the single platform
-     * @return a {@link DefaultExtensionRegistry} instance
-     */
-    public static DefaultExtensionRegistry fromPlatform(QuarkusPlatformDescriptor platform) {
-        RegistryBuilder builder = new RegistryBuilder();
-        builder.visitPlatform(platform);
-        return new DefaultExtensionRegistry(builder.build());
-    }
-
-    public DefaultExtensionRegistry(Registry registry) {
-        this.registry = Objects.requireNonNull(registry, "Registry cannot be null");
-    }
-
-    @Override
-    public Set<String> getQuarkusCoreVersions() {
-        return registry.getCoreVersions().keySet().stream().map(ComparableVersion::toString).collect(
-                Collectors.toCollection(LinkedHashSet::new));
-    }
-
-    @Override
-    public Set<Extension> getExtensionsByCoreVersion(String version) {
-        return list(version, "");
-    }
-
-    @Override
-    public Set<Extension> list(String quarkusCore, String keyword) {
-        return listInternalExtensions(quarkusCore, keyword)
-                .stream()
-                .map(this::toQuarkusExtension)
-                .sorted(Comparator.comparing(Extension::getArtifactId))
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-    }
-
-    @Override
-    public ExtensionInstallPlan planInstallation(String quarkusCore, Collection<String> keywords) {
-        ExtensionInstallPlan.Builder builder = ExtensionInstallPlan.builder();
-        boolean multipleKeywords = keywords.size() > 1;
-        for (String keyword : keywords) {
-            int countColons = StringUtils.countMatches(keyword, ":");
-            // Check if it's just groupId:artifactId
-            if (countColons == 1) {
-                AppArtifactKey artifactKey = AppArtifactKey.fromString(keyword);
-                builder.addManagedExtension(new AppArtifactCoords(artifactKey, null));
-                continue;
-            } else if (countColons > 1) {
-                // it's a gav
-                builder.addIndependentExtension(AppArtifactCoords.fromString(keyword));
-                continue;
-            }
-            List<ExtensionReleaseTuple> tuples = listInternalExtensions(quarkusCore, keyword);
-            if (tuples.size() != 1 && multipleKeywords) {
-                // No extension found for this keyword. Return empty immediately
-                return ExtensionInstallPlan.EMPTY;
-            }
-            for (ExtensionReleaseTuple tuple : tuples) {
-                ArtifactKey id = tuple.getExtension().getId();
-                String groupId = id.getGroupId();
-                String artifactId = id.getArtifactId();
-                String version = tuple.getRelease().getRelease().getVersion();
-                AppArtifactCoords extensionCoords = new AppArtifactCoords(groupId, artifactId, version);
-                List<AppArtifactCoords> platformCoords = tuple.getRelease().getPlatforms()
-                        .stream()
-                        .map(c -> new AppArtifactCoords(
-                                c.getCoords().getId().getGroupId(),
-                                c.getCoords().getId().getArtifactId(),
-                                "pom",
-                                c.getCoords().getVersion()))
-                        .collect(Collectors.toList());
-                if (platformCoords.isEmpty()) {
-                    builder.addIndependentExtension(extensionCoords);
-                } else {
-                    builder.addManagedExtension(extensionCoords);
-                    for (AppArtifactCoords platformCoord : platformCoords) {
-                        builder.addPlatform(platformCoord);
-                    }
-                }
-            }
-        }
-        return builder.build();
-    }
-
-    private List<ExtensionReleaseTuple> listInternalExtensions(String quarkusCore, String keyword) {
-        List<ExtensionReleaseTuple> result = new ArrayList<>();
-        ExtensionPredicate predicate = null;
-        if (keyword != null && !keyword.isEmpty()) {
-            predicate = new ExtensionPredicate(keyword);
-        }
-        for (io.quarkus.registry.model.Extension extension : registry.getExtensions()) {
-            for (ExtensionRelease extensionRelease : extension.getReleases()) {
-                if (quarkusCore.equals(extensionRelease.getRelease().getQuarkusCore())) {
-                    ExtensionReleaseTuple tuple = ExtensionReleaseTuple.builder().extension(extension)
-                            .release(extensionRelease).build();
-                    // If no filter is defined, just return the tuple
-                    if (predicate == null) {
-                        result.add(tuple);
-                    } else {
-                        Extension quarkusExtension = toQuarkusExtension(tuple);
-                        // If there is an exact match, return only this
-                        if (predicate.isExactMatch(quarkusExtension)) {
-                            return Collections.singletonList(tuple);
-                        } else if (predicate.test(quarkusExtension)) {
-                            result.add(tuple);
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-
-    private Extension toQuarkusExtension(ExtensionReleaseTuple tuple) {
-        io.quarkus.registry.model.Extension extension = tuple.getExtension();
-        ExtensionRelease tupleRelease = tuple.getRelease();
-        // Platforms may have metadata overriding the extension metadata
-        Map<String, Object> metadata = new HashMap<>(extension.getMetadata());
-        tupleRelease.getPlatforms().stream()
-                .map(io.quarkus.registry.model.Extension.ExtensionPlatformRelease::getMetadata)
-                .findFirst()
-                .ifPresent(metadata::putAll);
-        ArtifactKey id = extension.getId();
-        return new Extension()
-                .setGroupId(id.getGroupId())
-                .setArtifactId(id.getArtifactId())
-                .setVersion(tupleRelease.getRelease().getVersion())
-                .setName(extension.getName())
-                .setDescription(extension.getDescription())
-                .setMetadata(metadata);
-    }
-
-    /**
-     * Used in tests
-     */
-    public Registry getRegistry() {
-        return registry;
-    }
-
-    /**
-     * This exists only because ExtensionRelease does not accept a back reference to Extension
-     */
-    @Value.Immutable
-    interface ExtensionReleaseTuple {
-        io.quarkus.registry.model.Extension getExtension();
-
-        ExtensionRelease getRelease();
-
-        static ImmutableExtensionReleaseTuple.Builder builder() {
-            return ImmutableExtensionReleaseTuple.builder();
-        }
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/ExtensionRegistry.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/ExtensionRegistry.java
deleted file mode 100644
index a25dfb5172940..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/ExtensionRegistry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.quarkus.registry;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.project.extensions.ExtensionInstallPlan;
-import java.util.Collection;
-
-public interface ExtensionRegistry {
-
-    // Query methods
-    Collection<String> getQuarkusCoreVersions();
-
-    Collection<Extension> getExtensionsByCoreVersion(String version);
-
-    /**
-     * Return the set of extensions that matches a given keyword
-     *
-     * @param quarkusCore the quarkus core this extension supports
-     * @param keyword the keyword to search
-     * @return a set of {@link Extension} objects or an empty set if not found
-     */
-    Collection<Extension> list(String quarkusCore, String keyword);
-
-    /**
-     * What platforms and extensions do I need to add to my build descriptor?
-     * This method looks up the registry and provides a {@link ExtensionInstallPlan} containing this information.
-     *
-     * @param quarkusCore the quarkus core this extension supports
-     * @param keywords the keywords to lookup
-     * @return a {@link ExtensionInstallPlan} an object representing the necessary data to be added to a build descriptor
-     */
-    ExtensionInstallPlan planInstallation(String quarkusCore, Collection<String> keywords);
-
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/RepositoryIndexer.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/RepositoryIndexer.java
deleted file mode 100644
index 000dd6dd86ab8..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/RepositoryIndexer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.quarkus.registry;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.catalog.model.Extension;
-import io.quarkus.registry.catalog.model.Platform;
-import io.quarkus.registry.catalog.model.Repository;
-import io.quarkus.registry.catalog.spi.ArtifactResolver;
-import io.quarkus.registry.catalog.spi.IndexVisitor;
-import io.quarkus.registry.model.Release;
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * Indexes a repository
- */
-public class RepositoryIndexer {
-
-    private final ArtifactResolver artifactResolver;
-
-    public RepositoryIndexer(ArtifactResolver artifactResolver) {
-        this.artifactResolver = Objects.requireNonNull(artifactResolver, "Resolver cannot be null");
-    }
-
-    public void index(Repository repository, IndexVisitor visitor) throws IOException {
-        // Index Platforms
-        for (Platform platform : repository.getPlatforms()) {
-            for (Release release : platform.getReleases()) {
-                QuarkusPlatformDescriptor descriptor = artifactResolver.resolvePlatform(platform, release);
-                if (descriptor != null) {
-                    visitor.visitPlatform(descriptor);
-                }
-            }
-        }
-
-        // Index extensions
-        for (Extension extension : repository.getIndividualExtensions()) {
-            for (Release release : extension.getReleases()) {
-                io.quarkus.dependencies.Extension ext = artifactResolver.resolveExtension(extension, release);
-                if (ext != null) {
-                    visitor.visitExtension(ext, release.getQuarkusCore());
-                }
-            }
-        }
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/ExtensionRegistryBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/ExtensionRegistryBuilder.java
deleted file mode 100644
index 8e1b62248fd40..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/ExtensionRegistryBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.quarkus.registry.builder;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.DefaultExtensionRegistry;
-import io.quarkus.registry.ExtensionRegistry;
-import io.quarkus.registry.catalog.model.Extension;
-import io.quarkus.registry.catalog.model.Platform;
-import io.quarkus.registry.catalog.spi.ArtifactResolver;
-import io.quarkus.registry.model.Registry;
-import io.quarkus.registry.model.Release;
-import java.io.IOException;
-
-/**
- * Builds an {@link ExtensionRegistry} given the platforms and extensions resolved by the
- * {@link ArtifactResolver}
- */
-public class ExtensionRegistryBuilder {
-
-    private final ArtifactResolver artifactResolver;
-    private final RegistryBuilder registryBuilder = new RegistryBuilder();
-
-    public ExtensionRegistryBuilder(ArtifactResolver artifactResolver) {
-        this.artifactResolver = artifactResolver;
-    }
-
-    public ExtensionRegistryBuilder addPlatform(String groupId, String artifactId, String version) throws IOException {
-        Platform platform = Platform.builder().groupId(groupId).artifactId(artifactId).build();
-        Release release = Release.builder().version(version).build();
-        QuarkusPlatformDescriptor descriptor = artifactResolver.resolvePlatform(platform, release);
-        registryBuilder.visitPlatform(descriptor);
-        return this;
-    }
-
-    public ExtensionRegistryBuilder addExtension(String groupId, String artifactId, String version, String quarkusCore)
-            throws IOException {
-        Extension extension = Extension.builder().groupId(groupId).artifactId(artifactId).build();
-        Release release = Release.builder().version(version).build();
-        io.quarkus.dependencies.Extension ext = artifactResolver.resolveExtension(extension, release);
-        registryBuilder.visitExtension(ext, quarkusCore);
-        return this;
-    }
-
-    public ExtensionRegistry build() {
-        Registry registry = registryBuilder.build();
-        return new DefaultExtensionRegistry(registry);
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/RegistryBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/RegistryBuilder.java
deleted file mode 100644
index 839e2103b656f..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/RegistryBuilder.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package io.quarkus.registry.builder;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.catalog.spi.IndexVisitor;
-import io.quarkus.registry.model.ArtifactCoords;
-import io.quarkus.registry.model.ArtifactKey;
-import io.quarkus.registry.model.Extension.ExtensionPlatformRelease;
-import io.quarkus.registry.model.ImmutableArtifactCoords;
-import io.quarkus.registry.model.ImmutableArtifactKey;
-import io.quarkus.registry.model.ImmutableExtensionPlatformRelease;
-import io.quarkus.registry.model.ImmutableRegistry;
-import io.quarkus.registry.model.ModifiableExtension;
-import io.quarkus.registry.model.ModifiableExtensionRelease;
-import io.quarkus.registry.model.ModifiablePlatform;
-import io.quarkus.registry.model.Registry;
-import io.quarkus.registry.model.Release;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.apache.maven.artifact.versioning.ComparableVersion;
-import org.immutables.value.Value;
-
-public class RegistryBuilder implements IndexVisitor {
-
-    private final Map<ArtifactKey, ModifiablePlatform> platforms = new LinkedHashMap<>();
-
-    private final Map<ArtifactKey, ModifiableExtension> extensions = new LinkedHashMap<>();
-
-    private final Map<ArtifactCoordsTuple, ModifiableExtensionRelease> releases = new LinkedHashMap<>();
-
-    private final ImmutableRegistry.Builder registryBuilder = Registry.builder();
-
-    @Override
-    public void visitPlatform(QuarkusPlatformDescriptor platform) {
-        registryBuilder.putCoreVersions(new ComparableVersion(platform.getQuarkusVersion()), new HashMap<>());
-        registryBuilder.addAllCategories(platform.getCategories());
-
-        ArtifactKey platformKey = ImmutableArtifactKey.of(platform.getBomGroupId(), platform.getBomArtifactId());
-        ModifiablePlatform platformBuilder = platforms.computeIfAbsent(platformKey,
-                key -> ModifiablePlatform.create().setId(key));
-
-        platformBuilder.addReleases(Release.builder().version(platform.getBomVersion())
-                .quarkusCore(platform.getQuarkusVersion())
-                .build());
-
-        ArtifactCoords platformCoords = ImmutableArtifactCoords.of(platformKey, platform.getBomVersion());
-        for (Extension extension : platform.getExtensions()) {
-            visitExtension(extension, platform.getQuarkusVersion(), platformCoords);
-        }
-    }
-
-    @Override
-    public void visitExtension(Extension extension, String quarkusCore) {
-        visitExtension(extension, quarkusCore, null);
-    }
-
-    private void visitExtension(Extension extension, String quarkusCore, ArtifactCoords platform) {
-        // Ignore unlisted extensions
-        if (extension.isUnlisted()) {
-            return;
-        }
-        registryBuilder.putCoreVersions(new ComparableVersion(quarkusCore), new HashMap<>());
-        ArtifactKey extensionKey = ImmutableArtifactKey.of(extension.getGroupId(), extension.getArtifactId());
-        ModifiableExtension extensionBuilder = extensions
-                .computeIfAbsent(extensionKey, key -> ModifiableExtension.create()
-                        .setId(extensionKey)
-                        .setName(Objects.toString(extension.getName(), extension.getArtifactId()))
-                        .setDescription(extension.getDescription())
-                        .setMetadata(extension.getMetadata()));
-        ArtifactCoords coords = ImmutableArtifactCoords.of(extensionKey, extension.getVersion());
-        ArtifactCoordsTuple key = ImmutableArtifactCoordsTuple.builder().coords(coords)
-                .quarkusVersion(quarkusCore)
-                .build();
-        ModifiableExtensionRelease releaseBuilder = releases.computeIfAbsent(key,
-                appArtifactCoords -> ModifiableExtensionRelease.create()
-                        .setRelease(Release.builder()
-                                .version(appArtifactCoords.getCoords().getVersion())
-                                .quarkusCore(appArtifactCoords.getQuarkusVersion())
-                                .build()));
-        if (platform != null) {
-            Map<String, Object> metadata = diff(extensionBuilder.getMetadata(), extension.getMetadata());
-            ExtensionPlatformRelease platformRelease = ImmutableExtensionPlatformRelease
-                    .builder().coords(platform).metadata(metadata).build();
-            releaseBuilder.addPlatforms(platformRelease);
-        }
-    }
-
-    public Registry build() {
-        for (Map.Entry<ArtifactCoordsTuple, ModifiableExtensionRelease> entry : releases.entrySet()) {
-            ArtifactCoordsTuple tuple = entry.getKey();
-            ModifiableExtensionRelease extensionReleaseBuilder = entry.getValue();
-            ArtifactKey key = tuple.getCoords().getId();
-            ModifiableExtension extensionBuilder = extensions.get(key);
-            extensionBuilder.addReleases(extensionReleaseBuilder.toImmutable());
-        }
-        extensions.values().stream().map(ModifiableExtension::toImmutable).forEach(registryBuilder::addExtensions);
-        platforms.values().stream().map(ModifiablePlatform::toImmutable).forEach(registryBuilder::addPlatforms);
-        return registryBuilder.build();
-    }
-
-    static Map<String, Object> diff(Map<String, Object> left, Map<String, Object> right) {
-        Map<String, Object> result = new HashMap<>();
-        for (Map.Entry<String, Object> entry : right.entrySet()) {
-            Object value = left.get(entry.getKey());
-            if (!entry.getValue().equals(value)) {
-                result.put(entry.getKey(), entry.getValue());
-            }
-        }
-        return result;
-    }
-
-    @Value.Immutable
-    public interface ArtifactCoordsTuple {
-        @Value.Parameter
-        ArtifactCoords getCoords();
-
-        @Value.Parameter
-        String getQuarkusVersion();
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/URLRegistryBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/URLRegistryBuilder.java
deleted file mode 100644
index b61fca0264e3f..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/builder/URLRegistryBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.quarkus.registry.builder;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import io.quarkus.registry.model.ImmutableRegistry;
-import io.quarkus.registry.model.Registry;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class URLRegistryBuilder {
-
-    private final List<URL> urls = new ArrayList<>();
-
-    public URLRegistryBuilder addURL(URL url) {
-        urls.add(url);
-        return this;
-    }
-
-    public URLRegistryBuilder addURLs(Collection<URL> urls) {
-        this.urls.addAll(urls);
-        return this;
-    }
-
-    public Registry build() throws IOException {
-        if (urls.isEmpty()) {
-            throw new IllegalStateException("At least one URL must be specified");
-        }
-        ObjectMapper mapper = new ObjectMapper()
-                .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-                .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
-        if (urls.size() == 1) {
-            // Just one
-            return mapper.readValue(urls.get(0), Registry.class);
-        } else {
-            ImmutableRegistry.Builder builder = Registry.builder();
-            for (URL url : urls) {
-                Registry aRegistry = mapper.readValue(url, Registry.class);
-                builder.addAllCategories(aRegistry.getCategories())
-                        .addAllExtensions(aRegistry.getExtensions())
-                        .addAllPlatforms(aRegistry.getPlatforms())
-                        .putAllCoreVersions(aRegistry.getCoreVersions());
-            }
-            return builder.build();
-        }
-
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Extension.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Extension.java
deleted file mode 100644
index bf7c365c59bd4..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Extension.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.quarkus.registry.catalog.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.quarkus.registry.model.Release;
-import java.util.List;
-import org.immutables.value.Value;
-
-/**
- * An extension is a Maven dependency that can be added to a Quarkus project
- */
-@Value.Immutable
-@JsonDeserialize(as = ImmutableExtension.class)
-public interface Extension {
-
-    @JsonProperty("group-id")
-    String getGroupId();
-
-    @JsonProperty("artifact-id")
-    String getArtifactId();
-
-    @Value.Auxiliary
-    List<Release> getReleases();
-
-    static ImmutableExtension.Builder builder() {
-        return ImmutableExtension.builder();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Platform.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Platform.java
deleted file mode 100644
index fd6e96a254222..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Platform.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.quarkus.registry.catalog.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.quarkus.registry.model.Release;
-import java.util.List;
-import org.immutables.value.Value;
-
-/**
- * A {@link Platform} holds a set of extensions
- */
-@Value.Immutable
-@JsonDeserialize(as = ImmutablePlatform.class)
-public interface Platform {
-
-    @JsonProperty("group-id")
-    String getGroupId();
-
-    @Value.Default
-    @JsonProperty("group-id-json")
-    @Value.Auxiliary
-    default String getGroupIdJson() {
-        return getGroupId();
-    }
-
-    @JsonProperty("artifact-id")
-    String getArtifactId();
-
-    @Value.Default
-    @JsonProperty("artifact-id-json")
-    @Value.Auxiliary
-    default String getArtifactIdJson() {
-        return getArtifactId();
-    }
-
-    @Value.Auxiliary
-    List<Release> getReleases();
-
-    static ImmutablePlatform.Builder builder() {
-        return ImmutablePlatform.builder();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Repository.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Repository.java
deleted file mode 100644
index 54e74093cfa76..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/model/Repository.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.quarkus.registry.catalog.model;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.type.CollectionType;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.immutables.value.Value.Immutable;
-
-@Immutable
-@JsonDeserialize(as = ImmutableRepository.class)
-public abstract class Repository {
-
-    public abstract List<Extension> getIndividualExtensions();
-
-    public abstract List<Platform> getPlatforms();
-
-    /**
-     * - Match all files ending with '.json' inside an extensions directory
-     * - Match platforms.json
-     */
-    public static Repository parse(Path rootPath, ObjectMapper mapper) {
-        ObjectReader reader = mapper.reader()
-                .with(mapper.getDeserializationConfig().with(PropertyNamingStrategy.KEBAB_CASE));
-        return ImmutableRepository.builder()
-                .addAllPlatforms(parse(rootPath.resolve("platforms.json"), Platform.class, reader))
-                .addAllIndividualExtensions(parse(rootPath.resolve("extensions"), Extension.class, reader))
-                .build();
-    }
-
-    private static <T> Set<T> parse(Path root, Class<? extends T> type, ObjectReader reader) {
-        final Set<T> result = new HashSet<>();
-        if (Files.isDirectory(root)) {
-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(root, "*.json")) {
-                for (Path path : stream) {
-                    result.add(reader.forType(type).readValue(path.toFile()));
-                }
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        } else {
-            CollectionType collectionType = reader.getTypeFactory().constructCollectionType(List.class, type);
-            try {
-                result.addAll(reader.forType(collectionType).readValue(root.toFile()));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/spi/ArtifactResolver.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/spi/ArtifactResolver.java
deleted file mode 100644
index a2ed590778567..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/spi/ArtifactResolver.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.quarkus.registry.catalog.spi;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.catalog.model.Extension;
-import io.quarkus.registry.catalog.model.Platform;
-import io.quarkus.registry.model.Release;
-import java.io.IOException;
-
-/**
- * Resolves artifacts from the underlying artifact repositories
- */
-public interface ArtifactResolver {
-    /**
-     * Resolve this specific platform
-     */
-    QuarkusPlatformDescriptor resolvePlatform(Platform platform, Release release) throws IOException;
-
-    /**
-     * Resolve this specific extension
-     */
-    io.quarkus.dependencies.Extension resolveExtension(Extension extension, Release release) throws IOException;
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/spi/IndexVisitor.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/spi/IndexVisitor.java
deleted file mode 100644
index d2e9c5f32af5f..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/catalog/spi/IndexVisitor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.quarkus.registry.catalog.spi;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-
-public interface IndexVisitor {
-
-    void visitPlatform(QuarkusPlatformDescriptor platform);
-
-    void visitExtension(Extension extension, String quarkusCore);
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/ArtifactCoords.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/ArtifactCoords.java
deleted file mode 100644
index dcb211448ddae..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/ArtifactCoords.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.quarkus.registry.model;
-
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@JsonDeserialize(as = ImmutableArtifactCoords.class)
-public interface ArtifactCoords {
-    @Value.Parameter
-    @JsonUnwrapped
-    ArtifactKey getId();
-
-    @Value.Parameter
-    String getVersion();
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/ArtifactKey.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/ArtifactKey.java
deleted file mode 100644
index c38c3ef82b57a..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/ArtifactKey.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.quarkus.registry.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@JsonDeserialize(as = ImmutableArtifactKey.class)
-public interface ArtifactKey {
-    @Value.Parameter
-    @JsonProperty("group-id")
-    String getGroupId();
-
-    @Value.Parameter
-    @JsonProperty("artifact-id")
-    String getArtifactId();
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Extension.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Extension.java
deleted file mode 100644
index 6e20e935ea8db..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Extension.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.quarkus.registry.model;
-
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@Value.Modifiable
-@JsonDeserialize(as = ImmutableExtension.class)
-public interface Extension {
-
-    @JsonUnwrapped
-    ArtifactKey getId();
-
-    @Value.Auxiliary
-    String getName();
-
-    @Value.Auxiliary
-    @Nullable
-    String getDescription();
-
-    @Value.Auxiliary
-    Map<String, Object> getMetadata();
-
-    @Value.Auxiliary
-    @Value.ReverseOrder
-    SortedSet<ExtensionRelease> getReleases();
-
-    @Value.Immutable
-    @Value.Modifiable
-    @JsonDeserialize(as = ImmutableExtensionRelease.class)
-    interface ExtensionRelease extends Comparable<ExtensionRelease> {
-
-        @JsonUnwrapped
-        Release getRelease();
-
-        @Value.Auxiliary
-        Set<ExtensionPlatformRelease> getPlatforms();
-
-        @Override
-        default int compareTo(ExtensionRelease o) {
-            return getRelease().compareTo(o.getRelease());
-        }
-    }
-
-    @Value.Immutable
-    @JsonDeserialize(as = ImmutableExtensionPlatformRelease.class)
-    interface ExtensionPlatformRelease {
-        @JsonUnwrapped
-        ArtifactCoords getCoords();
-
-        @Value.Auxiliary
-        Map<String, Object> getMetadata();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Nullable.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Nullable.java
deleted file mode 100644
index 223b4cb068841..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Nullable.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.quarkus.registry.model;
-
-@interface Nullable {
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Platform.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Platform.java
deleted file mode 100644
index 1c721254a74ee..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Platform.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.quarkus.registry.model;
-
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.Set;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@Value.Modifiable
-@JsonDeserialize(as = ImmutablePlatform.class)
-public interface Platform {
-
-    @JsonUnwrapped
-    ArtifactKey getId();
-
-    @Value.Auxiliary
-    Set<Release> getReleases();
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Registry.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Registry.java
deleted file mode 100644
index 7250c5af05692..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Registry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.quarkus.registry.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.quarkus.dependencies.Category;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import org.apache.maven.artifact.versioning.ComparableVersion;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@JsonDeserialize(as = ImmutableRegistry.class)
-public interface Registry {
-
-    @JsonProperty("core-versions")
-    @Value.ReverseOrder
-    SortedMap<ComparableVersion, Map<String, String>> getCoreVersions();
-
-    Set<Extension> getExtensions();
-
-    Set<Platform> getPlatforms();
-
-    Set<Category> getCategories();
-
-    static ImmutableRegistry.Builder builder() {
-        return ImmutableRegistry.builder();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Release.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Release.java
deleted file mode 100644
index 84e7650b56350..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/model/Release.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.quarkus.registry.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.maven.artifact.versioning.ComparableVersion;
-import org.immutables.value.Value;
-
-@Value.Immutable
-@JsonDeserialize(as = ImmutableRelease.class)
-public interface Release extends Comparable<Release> {
-
-    String getVersion();
-
-    @Nullable
-    @JsonProperty("quarkus-core")
-    String getQuarkusCore();
-
-    @Nullable
-    @JsonProperty("repository-url")
-    @Value.Auxiliary
-    String getRepositoryURL();
-
-    static ImmutableRelease.Builder builder() {
-        return ImmutableRelease.builder();
-    }
-
-    @Override
-    default int compareTo(Release o) {
-        int compare = new ComparableVersion(getVersion())
-                .compareTo(new ComparableVersion(o.getVersion()));
-        if (compare == 0 && (getQuarkusCore() != null && o.getQuarkusCore() != null)) {
-            compare = new ComparableVersion(getQuarkusCore())
-                    .compareTo(new ComparableVersion(o.getQuarkusCore()));
-        }
-        return compare;
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/package-info.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/package-info.java
deleted file mode 100644
index 0c6504e3ca885..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/registry/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@Style(jdkOnly = true, visibility = PUBLIC, allowedClasspathAnnotations = { Override.class })
-package io.quarkus.registry;
-
-import static org.immutables.value.Value.Style.ImplementationVisibility.PUBLIC;
-
-import org.immutables.value.Value.Style;
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/META-INF/services/io.quarkus.devtools.project.codegen.ProjectGenerator b/independent-projects/tools/devtools-common/src/main/resources/META-INF/services/io.quarkus.devtools.project.codegen.ProjectGenerator
deleted file mode 100644
index 41ba05fc1a3e4..0000000000000
--- a/independent-projects/tools/devtools-common/src/main/resources/META-INF/services/io.quarkus.devtools.project.codegen.ProjectGenerator
+++ /dev/null
@@ -1 +0,0 @@
-io.quarkus.devtools.project.codegen.rest.BasicRestProjectGenerator
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/buildtool/maven/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/buildtool/maven/codestart.yml
new file mode 100644
index 0000000000000..f11f46cf1ec4d
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/buildtool/maven/codestart.yml
@@ -0,0 +1,3 @@
+name: maven
+type: buildtool
+fallback: true
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/devmode-test/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/devmode-test/codestart.yml
new file mode 100644
index 0000000000000..f45043bd893e9
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/devmode-test/codestart.yml
@@ -0,0 +1,3 @@
+name: devmode-test
+ref: test
+type: code
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/devmode-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}DevModeTest.tpl.qute.java b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/devmode-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}DevModeTest.tpl.qute.java
new file mode 100644
index 0000000000000..8ebe59bdc97a8
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/devmode-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}DevModeTest.tpl.qute.java
@@ -0,0 +1,23 @@
+package {package-name}.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class {class-name-base}DevModeTest {
+
+    // Start hot reload (DevMode) test with your extension loaded
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest()
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void writeYourOwnDevModeTest() {
+        // Write your dev mode tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.assertTrue(true, "Add dev mode assertions to " + getClass().getName());
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/codestart.yml
new file mode 100644
index 0000000000000..287d417f4f001
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/codestart.yml
@@ -0,0 +1,3 @@
+name: extension-base
+ref: base
+type: code
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..df0bc12a2c38a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>{group-id}</groupId>
+        <artifactId>{namespace.id}{extension.id}-parent</artifactId>
+        <version>{version}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>{namespace.id}{extension.id}-deployment</artifactId>
+    {#if extension.name}
+    <name>{namespace.name}{extension.name} - Deployment</name>
+    {/if}
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>{group-id}</groupId>
+            <artifactId>{namespace.id}{extension.id}</artifactId>
+            {#if quarkus.bom}
+            <version>$\{project.version}</version>
+            {/if}
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            {#if quarkus.version}
+                            <version>$\{quarkus.version}</version>
+                            {#else}
+                            <version>$\{project.version}</version>
+                            {/if}
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/src/main/java/{package-name.dir}/deployment/{class-name-base}Processor.tpl.qute.java b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/src/main/java/{package-name.dir}/deployment/{class-name-base}Processor.tpl.qute.java
new file mode 100644
index 0000000000000..ba6d41288f46f
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/deployment/src/main/java/{package-name.dir}/deployment/{class-name-base}Processor.tpl.qute.java
@@ -0,0 +1,14 @@
+package {package-name}.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+class {class-name-base}Processor {
+
+    private static final String FEATURE = "{extension.id}";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..0e3773d53d95b
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+{#if parent}
+    <parent>
+        <groupId>{parent.group-id}</groupId>
+        <artifactId>{parent.artifact-id}</artifactId>
+        <version>{parent.version}</version>
+        {#if parent.relative-path}
+        <relativePath>{parent.relative-path}</relativePath>
+        {/if}
+    </parent>
+    {#if group-id and group-id ne parent.group-id}
+    <groupId>{group-id}</groupId>
+    {/if}
+    {#if version and version ne parent.version}
+    <version>{version}</version>
+    {/if}
+{#else}
+    <groupId>{group-id}</groupId>
+    <version>{version}</version>
+{/if}
+
+    <artifactId>{namespace.id}{extension.id}-parent</artifactId>
+{#if extension.name}
+    <name>{namespace.name}{extension.name} - Parent</name>
+{/if}
+
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+        {#if quarkus.version}<quarkus.version>{quarkus.version}</quarkus.version>{/if}
+        {#if maven.compiler-plugin-version}<compiler-plugin.version>{maven.compiler-plugin-version}</compiler-plugin.version>{/if}
+        {#if maven.surefire-plugin.version}
+        <surefire-plugin.version>{maven.surefire-plugin.version}</surefire-plugin.version>
+        <failsafe-plugin.version>$\{surefire-plugin.version}</failsafe-plugin.version>
+        {/if}
+    </properties>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+{#if quarkus.bom}
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>{quarkus.bom.group-id}</groupId>
+                <artifactId>{quarkus.bom.artifact-id}</artifactId>
+                <version>{quarkus.bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+{/if}
+{#if quarkus.version or maven.compiler-plugin-version or maven.surefire-plugin.version}
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                {#if quarkus.version}
+                <plugin>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-maven-plugin</artifactId>
+                    <version>$\{quarkus.version}</version>
+                </plugin>
+                {/if}
+                {#if maven.surefire-plugin.version}
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>$\{surefire-plugin.version}</version>
+                    <configuration>
+                        <systemPropertyVariables>
+                            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                            <maven.home>$\{maven.home}</maven.home>
+                            <maven.repo>$\{settings.localRepository}</maven.repo>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>$\{failsafe-plugin.version}</version>
+                    <configuration>
+                        <systemPropertyVariables>
+                            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                            <maven.home>$\{maven.home}</maven.home>
+                            <maven.repo>$\{settings.localRepository}</maven.repo>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
+                {/if}
+                {#if maven.compiler-plugin-version}
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>$\{compiler-plugin.version}</version>
+                </plugin>
+                {/if}
+            </plugins>
+        </pluginManagement>
+    </build>
+{/if}
+</project>
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/runtime/pom.tpl.qute.xml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/runtime/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..4372d011fbba4
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/runtime/pom.tpl.qute.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>{group-id}</groupId>
+        <artifactId>{namespace.id}{extension.id}-parent</artifactId>
+        <version>{version}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>{namespace.id}{extension.id}</artifactId>
+    {#if extension.name}
+    <name>{namespace.name}{extension.name} - Runtime</name>
+    {/if}
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                {#if quarkus.version}
+                <version>$\{quarkus.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <deployment>$\{project.groupId}:$\{project.artifactId}-deployment:$\{project.version}</deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+                {/if}
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            {#if quarkus.version}
+                            <version>$\{quarkus.version}</version>
+                            {#else}
+                            <version>$\{project.version}</version>
+                            {/if}
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/runtime/src/main/resources/META-INF/quarkus-extension.tpl.qute.yaml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/runtime/src/main/resources/META-INF/quarkus-extension.tpl.qute.yaml
new file mode 100644
index 0000000000000..4f9a5585912bb
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/runtime/src/main/resources/META-INF/quarkus-extension.tpl.qute.yaml
@@ -0,0 +1,9 @@
+name: {namespace.name}{extension.name}
+#description: {namespace.name}{extension.name} ...
+metadata:
+#  keywords:
+#    - {extension.id}
+#  guide: ...
+#  categories:
+#    - "miscellaneous"
+#  status: "preview"
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/codestart.yml
new file mode 100644
index 0000000000000..5177f68e36f0e
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/codestart.yml
@@ -0,0 +1,3 @@
+name: integration-tests
+ref: it
+type: code
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..d057115741855
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/pom.tpl.qute.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+{#if it-parent}
+    <parent>
+        <groupId>{it-parent.group-id}</groupId>
+        <artifactId>{it-parent.artifact-id}</artifactId>
+        <version>{it-parent.version}</version>
+        {#if it-parent.relative-path}
+        <relativePath>{it-parent.relative-path}</relativePath>
+        {/if}
+    </parent>
+{/if}
+    <artifactId>{namespace.id}{extension.id}-integration-tests</artifactId>
+{#if extension.name}
+<name>{namespace.name}{extension.name} - Integration Tests</name>
+{/if}
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>{group-id}</groupId>
+            <artifactId>{namespace.id}{extension.id}</artifactId>
+            {#if quarkus.bom}
+            <version>$\{project.version}</version>
+            {/if}
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>$\{native.surefire.skip}</skipTests>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>$\{project.build.directory}/$\{project.build.finalName}-runner</native.image.path>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                        <maven.home>$\{maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
+
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java
new file mode 100644
index 0000000000000..82751b9072276
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java
@@ -0,0 +1,32 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You 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 {package-name}.it;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/{extension.id}")
+@ApplicationScoped
+public class {class-name-base}Resource {
+    // add some rest methods here
+
+    @GET
+    public String hello() {
+        return "Hello {extension.id}";
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/resources/application.properties b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/resources/application.properties
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java
new file mode 100644
index 0000000000000..d331a251a1666
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/Native{class-name-base}ResourceIT.tpl.qute.java
@@ -0,0 +1,7 @@
+package {package-name}.it;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class Native{class-name-base}ResourceIT extends {class-name-base}ResourceTest {
+}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/{class-name-base}ResourceTest.tpl.qute.java b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/{class-name-base}ResourceTest.tpl.qute.java
new file mode 100644
index 0000000000000..b13ea0f5edda6
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/test/java/{package-name.dir}/it/{class-name-base}ResourceTest.tpl.qute.java
@@ -0,0 +1,21 @@
+package {package-name}.it;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class {class-name-base}ResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+                .when().get("/{extension.id}")
+                .then()
+                .statusCode(200)
+                .body(is("Hello {extension.id}"));
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/codestart.yml
new file mode 100644
index 0000000000000..fcee763226bfc
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/codestart.yml
@@ -0,0 +1,2 @@
+name: quarkiverse
+type: code
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/dependabot.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/dependabot.yml
new file mode 100644
index 0000000000000..4b11d34c5ea02
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "org.apache.maven.plugins:maven-compiler-plugin"
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/project.tpl.qute.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/project.tpl.qute.yml
new file mode 100644
index 0000000000000..6795cc89bfcce
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/project.tpl.qute.yml
@@ -0,0 +1,4 @@
+release:
+  current-version: 0
+  next-version: {version}
+
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/release/maven-settings.xml.gpg b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/release/maven-settings.xml.gpg
new file mode 100644
index 0000000000000..b342f7c1f62cd
Binary files /dev/null and b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/release/maven-settings.xml.gpg differ
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml
new file mode 100644
index 0000000000000..3c39045edbd1f
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/build.yml
@@ -0,0 +1,53 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - "main"
+    paths-ignore:
+      - '.gitignore'
+      - 'CODEOWNERS'
+      - 'LICENSE'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - '.all-contributorsrc'
+  pull_request:
+    paths-ignore:
+      - '.gitignore'
+      - 'CODEOWNERS'
+      - 'LICENSE'
+      - '*.md'
+      - '*.adoc'
+      - '*.txt'
+      - '.all-contributorsrc'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+
+    - name: Get Date
+      id: get-date
+      run: |
+        echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
+      shell: bash
+    - name: Cache Maven Repository
+      id: cache-maven
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        # refresh cache every month to avoid unlimited growth
+        key: maven-repo-${{ runner.os }}-${{ steps.get-date.outputs.date }}
+
+    - name: Build with Maven
+      run: mvn -B formatter:validate verify --file pom.xml
+
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/pre-release.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/pre-release.yml
new file mode 100644
index 0000000000000..63d9d0fa196f0
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/pre-release.yml
@@ -0,0 +1,25 @@
+name: Quarkiverse Pre Release
+
+on:
+  pull_request:
+    paths:
+      - '.github/project.yml'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    name: pre release
+
+    steps:
+      - uses: radcortez/project-metadata-action@master
+        name: retrieve project metadata
+        id: metadata
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          metadata-file-path: '.github/project.yml'
+
+      - name: Validate version
+        if: contains(steps.metadata.outputs.current-version, 'SNAPSHOT')
+        run: |
+          echo '::error::Cannot release a SNAPSHOT version.'
+          exit 1
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml
new file mode 100644
index 0000000000000..d19a62953c4be
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/quarkus-snapshot.tpl.qute.yaml
@@ -0,0 +1,53 @@
+name: "Quarkus ecosystem CI"
+on:
+  workflow_dispatch:
+  watch:
+    types: [started]
+
+  # For this CI to work, ECOSYSTEM_CI_TOKEN needs to contain a GitHub with rights to close the Quarkus issue that the user/bot has opened,
+  # while 'ECOSYSTEM_CI_REPO_PATH' needs to be set to the corresponding path in the 'quarkusio/quarkus-ecosystem-ci' repository
+
+env:
+  ECOSYSTEM_CI_REPO: quarkusio/quarkus-ecosystem-ci
+  ECOSYSTEM_CI_REPO_FILE: context.yaml
+  JAVA_VERSION: 11
+
+  #########################
+  # Repo specific setting #
+  #########################
+
+  ECOSYSTEM_CI_REPO_PATH: {namespace.id}{extension.id}
+
+jobs:
+  build:
+    name: "Build against latest Quarkus snapshot"
+    runs-on: ubuntu-latest
+    # Allow <ADMIN> to manually launch the ecosystem CI in addition to the bots
+    if: github.actor == 'quarkusbot' || github.actor == 'quarkiversebot' || github.actor == '<ADMIN>'
+
+    steps:
+      - name: Install yq
+        run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y
+
+      - name: Set up Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          path: current-repo
+          ref: main
+
+      - name: Checkout Ecosystem
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ env.ECOSYSTEM_CI_REPO }}
+          ref: main
+          path: ecosystem-ci
+
+      - name: Setup and Run Tests
+        run: ./ecosystem-ci/setup-and-test
+        env:
+          ECOSYSTEM_CI_TOKEN: ${{ secrets.ECOSYSTEM_CI_TOKEN }}
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml
new file mode 100644
index 0000000000000..0b85d94ec1f20
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/.github/workflows/release.yml
@@ -0,0 +1,69 @@
+name: Quarkiverse Release
+
+on:
+  pull_request:
+    types: [closed]
+    paths:
+      - '.github/project.yml'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    name: release
+    if: ${{github.event.pull_request.merged == true}}
+
+    steps:
+      - uses: radcortez/project-metadata-action@master
+        name: Retrieve project metadata
+        id: metadata
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          metadata-file-path: '.github/project.yml'
+
+      - uses: actions/checkout@v2
+
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v3
+        with:
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
+      - uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 11
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Configure Git author
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+
+      - name: Maven release ${{steps.metadata.outputs.current-version}}
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.GPG_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
+          git checkout -b release
+          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
+          git checkout ${{github.base_ref}}
+          git rebase release
+          mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease -s maven-settings.xml
+
+      - name: Push changes to ${{github.base_ref}}
+        uses: ad-m/github-push-action@v0.6.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{github.base_ref}}
+
+      - name: Push tags
+        uses: ad-m/github-push-action@v0.6.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tags: true
+          branch: ${{github.base_ref}}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/LICENSE b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/LICENSE
new file mode 100644
index 0000000000000..261eeb9e9f8b2
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/README.tpl.qute.md b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/README.tpl.qute.md
new file mode 100644
index 0000000000000..f289cc46b48c3
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/README.tpl.qute.md
@@ -0,0 +1,23 @@
+# {namespace.name}{extension.name}
+
+## Welcome to Quarkiverse!
+
+Congratulations and thank you for creating a new Quarkus extension project in Quarkiverse!
+
+Feel free to replace this content with the proper description of your new project and necessary instructions how to use and contribute to it.
+
+You can find the basic info, Quarkiverse policies and conventions in [the Quarkiverse wiki](https://github.com/quarkiverse/quarkiverse/wiki).
+
+In case you are creating a Quarkus extension project for the first time, please follow [Building My First Extension](https://quarkus.io/guides/building-my-first-extension) guide.
+
+Other useful articles related to Quarkus extension development can be found under the [Writing Extensions](https://quarkus.io/guides/#writing-extensions) guide category on the [Quarkus.io](http://quarkus.io) website.
+
+Thanks again, good luck and have fun!
+
+## Documentation
+
+The documentation for this extension should be maintained as part of this repository and it is stored in the `docs/` directory. 
+
+The layout should follow the [Antora's Standard File and Directory Set](https://docs.antora.org/antora/2.3/standard-directories/).
+
+Once the docs are ready to be published, please open a PR including this repository in the [Quarkiverse Docs Antora playbook](https://github.com/quarkiverse/quarkiverse-docs/blob/main/antora-playbook.yml#L7). See an example [here](https://github.com/quarkiverse/quarkiverse-docs/pull/1).
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/antora.tpl.qute.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/antora.tpl.qute.yml
new file mode 100644
index 0000000000000..026a76c1d6980
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/antora.tpl.qute.yml
@@ -0,0 +1,5 @@
+name: {namespace.id}{extension.id}
+title: {namespace.name}{extension.name}
+version: dev
+nav:
+  - modules/ROOT/nav.adoc
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/nav.tpl.qute.adoc b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/nav.tpl.qute.adoc
new file mode 100644
index 0000000000000..d32dbb74b6c66
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/nav.tpl.qute.adoc
@@ -0,0 +1 @@
+* xref:index.adoc[{namespace.name}{extension.name}]
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/pages/config.adoc b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/pages/config.adoc
new file mode 100644
index 0000000000000..926cca390a14e
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/pages/config.adoc
@@ -0,0 +1,112 @@
+//
+// This content is generated using mvn compile and copied manually to here
+//
+[.configuration-legend]
+icon:lock[title=Fixed at build time] Configuration property fixed at build time - All other configuration properties are overridable at runtime
+[.configuration-reference.searchable, cols="80,.^10,.^10"]
+|===
+
+h|[[quarkus-freemarker_configuration]]link:#quarkus-freemarker_configuration[Configuration property]
+
+h|Type
+h|Default
+
+a|icon:lock[title=Fixed at build time] [[quarkus-freemarker_quarkus.freemarker.resource-paths]]`link:#quarkus-freemarker_quarkus.freemarker.resource-paths[quarkus.freemarker.resource-paths]`
+
+[.description]
+--
+Comma-separated list of absolute resource paths to scan recursively for templates. All tree folder from 'resource-paths' will be added as a resource. Unprefixed locations or locations starting with classpath will be processed in the same way.
+--|list of string
+|`freemarker/templates`
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.file-paths]]`link:#quarkus-freemarker_quarkus.freemarker.file-paths[quarkus.freemarker.file-paths]`
+
+[.description]
+--
+Comma-separated of file system paths where freemarker templates are located
+--|list of string
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.default-encoding]]`link:#quarkus-freemarker_quarkus.freemarker.default-encoding[quarkus.freemarker.default-encoding]`
+
+[.description]
+--
+Set the preferred charset template files are stored in.
+--|string
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.template-exception-handler]]`link:#quarkus-freemarker_quarkus.freemarker.template-exception-handler[quarkus.freemarker.template-exception-handler]`
+
+[.description]
+--
+Sets how errors will appear. rethrow, debug, html-debug, ignore.
+--|string
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.log-template-exceptions]]`link:#quarkus-freemarker_quarkus.freemarker.log-template-exceptions[quarkus.freemarker.log-template-exceptions]`
+
+[.description]
+--
+If false, don't log exceptions inside FreeMarker that it will be thrown at you anyway.
+--|boolean
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.wrap-unchecked-exceptions]]`link:#quarkus-freemarker_quarkus.freemarker.wrap-unchecked-exceptions[quarkus.freemarker.wrap-unchecked-exceptions]`
+
+[.description]
+--
+Wrap unchecked exceptions thrown during template processing into TemplateException-s.
+--|boolean
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.fallback-on-null-loop-variable]]`link:#quarkus-freemarker_quarkus.freemarker.fallback-on-null-loop-variable[quarkus.freemarker.fallback-on-null-loop-variable]`
+
+[.description]
+--
+If false, do not fall back to higher scopes when reading a null loop variable.
+--|boolean
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.boolean-format]]`link:#quarkus-freemarker_quarkus.freemarker.boolean-format[quarkus.freemarker.boolean-format]`
+
+[.description]
+--
+The string value for the boolean `true` and `false` values, usually intended for human consumption (not for a computer language), separated with comma.
+--|string
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.number-format]]`link:#quarkus-freemarker_quarkus.freemarker.number-format[quarkus.freemarker.number-format]`
+
+[.description]
+--
+Sets the default number format used to convert numbers to strings.
+--|string
+|
+
+
+a| [[quarkus-freemarker_quarkus.freemarker.object-wrapper-expose-fields]]`link:#quarkus-freemarker_quarkus.freemarker.object-wrapper-expose-fields[quarkus.freemarker.object-wrapper-expose-fields]`
+
+[.description]
+--
+If true, the object wrapper will be configured to expose fields.
+--|boolean
+|
+
+
+a|icon:lock[title=Fixed at build time] [[quarkus-freemarker_quarkus.freemarker.directive-directive]]`link:#quarkus-freemarker_quarkus.freemarker.directive-directive[quarkus.freemarker.directive]`
+
+[.description]
+--
+List of directives to register with format name=classname
+--|`Map<String,String>`
+|
+
+|===
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/pages/index.tpl.qute.adoc b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/pages/index.tpl.qute.adoc
new file mode 100644
index 0000000000000..27a3941039820
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/modules/ROOT/pages/index.tpl.qute.adoc
@@ -0,0 +1,22 @@
+= {namespace.name}{extension.name}
+:extension-status: preview
+
+Describe what the extension does here.
+
+== Installation
+
+If you want to use this extension, you need to add the `{group-id}:{namespace.id}{extension.id}` extension first.
+In your `pom.xml` file, add:
+
+[source,xml]
+----
+<dependency>
+    <groupId>{group-id}</groupId>
+    <artifactId>{namespace.id}{extension.id}</artifactId>
+</dependency>
+----
+
+[[extension-configuration-reference]]
+== Extension Configuration Reference
+
+include::config.adoc[leveloffset=+1, opts=optional]
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/pom.tpl.qute.xml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/pom.tpl.qute.xml
new file mode 100644
index 0000000000000..4f9249036ae7b
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/pom.tpl.qute.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <packaging>pom</packaging>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>!true</value>
+                </property>
+            </activation>
+            <modules>
+                <module>integration-tests</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/unit-test/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/unit-test/codestart.yml
new file mode 100644
index 0000000000000..12e74ee91379a
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/unit-test/codestart.yml
@@ -0,0 +1,3 @@
+name: unit-test
+ref: test
+type: code
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/unit-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}Test.tpl.qute.java b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/unit-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}Test.tpl.qute.java
new file mode 100644
index 0000000000000..d6bea80075268
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/code/unit-test/java/deployment/src/test/java/{package-name.dir}/test/{class-name-base}Test.tpl.qute.java
@@ -0,0 +1,23 @@
+package {package-name}.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class {class-name-base}Test {
+
+    // Start unit test with your extension loaded
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void writeYourOwnUnitTest() {
+        // Write your unit tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.assertTrue(true, "Add some assertions to " + getClass().getName());
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/language/java/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/language/java/codestart.yml
new file mode 100644
index 0000000000000..4f1da5b0e1a88
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/language/java/codestart.yml
@@ -0,0 +1,3 @@
+name: java
+type: language
+fallback: true
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/project/quarkus-extension/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/project/quarkus-extension/codestart.yml
new file mode 100644
index 0000000000000..46a909031eac6
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/project/quarkus-extension/codestart.yml
@@ -0,0 +1,14 @@
+name: quarkus-extension
+type: project
+fallback: true
+output-strategy:
+  "pom.xml": smart-pom-merge
+  "runtime/pom.xml": smart-pom-merge
+  "deployment/pom.xml": smart-pom-merge
+  "integration-tests/pom.xml": smart-pom-merge
+  "README.md": replace
+  "readme.md": forbidden
+  "README.adoc": forbidden
+  "readme.adoc": forbidden
+  ".gitignore": append
+  "*": fail-on-duplicate
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/base/..gitignore b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/base/..gitignore
new file mode 100644
index 0000000000000..a556d9478e823
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/base/..gitignore
@@ -0,0 +1,64 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Gradle
+.gradle/
+build/
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/base/README.tpl.qute.md b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/base/README.tpl.qute.md
new file mode 100644
index 0000000000000..546e7e5f51f35
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/base/README.tpl.qute.md
@@ -0,0 +1,3 @@
+# {namespace.name}{extension.name}
+
+This is a Quarkus Extension for ...
diff --git a/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/codestart.yml b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/codestart.yml
new file mode 100644
index 0000000000000..df2127ecb1b4d
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/main/resources/codestarts/quarkus-extension/tooling/git/codestart.yml
@@ -0,0 +1,4 @@
+name: git
+ref: git
+type: tooling
+
diff --git a/independent-projects/tools/devtools-common/src/test/filtered/quarkus.properties b/independent-projects/tools/devtools-common/src/test/filtered/quarkus.properties
index 75b90715a75f6..2c025575f5827 100644
--- a/independent-projects/tools/devtools-common/src/test/filtered/quarkus.properties
+++ b/independent-projects/tools/devtools-common/src/test/filtered/quarkus.properties
@@ -8,10 +8,16 @@ kotlin-version=${kotlin.version}
 scala-version=${scala.version}
 scala-plugin-version=${scala-plugin.version}
 
-# Plugin metadata
-plugin-groupId=${project.groupId}
-plugin-artifactId=quarkus-maven-plugin
-plugin-version=${project.version}
+quarkus-core-version=${project.version}
+
+# Maven plugin metadata
+maven-plugin-groupId=${project.groupId}
+maven-plugin-artifactId=quarkus-maven-plugin
+maven-plugin-version=${project.version}
+
+# Gradle plugin metadata
+gradle-plugin-id=io.quarkus
+gradle-plugin-version=${project.version}
 
 supported-maven-versions=${supported-maven-versions}
 # the proposed version must be in the range of the supported versions
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java
deleted file mode 100644
index 27492a7f844e8..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package io.quarkus.devtools.commands;
-
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-abstract class AbstractAddExtensionsTest<T> extends PlatformAwareTestBase {
-
-    private final Path projectPath = Paths.get("target/extensions-test");
-
-    public Path getProjectPath() {
-        return projectPath;
-    }
-
-    @Test
-    void addSomeValidExtensions() throws Exception {
-        createProject();
-        addExtensions(asList("jdbc-postgre", "agroal", "quarkus-arc", " hibernate-validator",
-                "commons-io:commons-io:2.6"));
-        final T project = readProject();
-        hasDependency(project, "quarkus-agroal");
-        hasDependency(project, "quarkus-arc");
-        hasDependency(project, "quarkus-hibernate-validator");
-        hasDependency(project, "commons-io", "commons-io", "2.6");
-        hasDependency(project, "quarkus-jdbc-postgresql");
-    }
-
-    @Test
-    void testPartialMatches() throws Exception {
-        createProject();
-        addExtensions(asList("orm-pana", "jdbc-postgre", "arc"));
-
-        final T project = readProject();
-        hasDependency(project, "quarkus-arc");
-        hasDependency(project, "quarkus-hibernate-orm-panache");
-        hasDependency(project, "quarkus-jdbc-postgresql");
-    }
-
-    @Test
-    void testRegexpMatches() throws Exception {
-        createProject();
-
-        final QuarkusCommandOutcome result = addExtensions(asList("Sm??lRye**"));
-
-        Assertions.assertTrue(result.isSuccess());
-        Assertions.assertTrue(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-
-        final T project = readProject();
-        hasDependency(project, "quarkus-smallrye-reactive-messaging");
-        hasDependency(project, "quarkus-smallrye-reactive-streams-operators");
-        hasDependency(project, "quarkus-smallrye-opentracing");
-        hasDependency(project, "quarkus-smallrye-metrics");
-        hasDependency(project, "quarkus-smallrye-reactive-messaging-kafka");
-        hasDependency(project, "quarkus-smallrye-health");
-        hasDependency(project, "quarkus-smallrye-openapi");
-        hasDependency(project, "quarkus-smallrye-jwt");
-        hasDependency(project, "quarkus-smallrye-context-propagation");
-        hasDependency(project, "quarkus-smallrye-reactive-type-converters");
-        hasDependency(project, "quarkus-smallrye-reactive-messaging-amqp");
-        hasDependency(project, "quarkus-smallrye-fault-tolerance");
-    }
-
-    @Test
-    void addExtensionWithGroupIdAndArtifactId() throws Exception {
-        createProject();
-
-        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("io.quarkus:quarkus-agroal"));
-
-        final T project = readProject();
-        hasDependency(project, "io.quarkus", "quarkus-agroal", null);
-    }
-
-    @Test
-    void addExtensionWithGAV() throws Exception {
-        createProject();
-
-        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("io.quarkus:quarkus-agroal:2.5"));
-
-        final T project = readProject();
-        hasDependency(project, "io.quarkus", "quarkus-agroal", "2.5");
-    }
-
-    @Test
-    void addMissingExtension() throws Exception {
-        createProject();
-
-        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("missing"));
-
-        final T project = readProject();
-        doesNotHaveDependency(project, "quarkus-missing");
-        Assertions.assertFalse(result.isSuccess());
-        Assertions.assertFalse(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-    }
-
-    @Test
-    void addExtensionTwiceInOneBatch() throws Exception {
-        createProject();
-        final QuarkusCommandOutcome result = addExtensions(asList("agroal", "agroal"));
-        final T project = readProject();
-        hasDependency(project, "quarkus-agroal");
-        Assertions.assertEquals(1,
-                countDependencyOccurrences(project, getPluginGroupId(), "quarkus-agroal", null));
-        Assertions.assertTrue(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-        Assertions.assertTrue(result.isSuccess());
-    }
-
-    @Test
-    void addExtensionTwiceInTwoBatches() throws Exception {
-        createProject();
-
-        final QuarkusCommandOutcome result1 = addExtensions(Collections.singletonList("agroal"));
-        final T project1 = readProject();
-        hasDependency(project1, "quarkus-agroal");
-        Assertions.assertEquals(1,
-                countDependencyOccurrences(project1, getPluginGroupId(), "quarkus-agroal", null));
-        Assertions.assertTrue(result1.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-        Assertions.assertTrue(result1.isSuccess());
-
-        final QuarkusCommandOutcome result2 = addExtensions(Collections.singletonList("agroal"));
-        final T project2 = readProject();
-        hasDependency(project2, "quarkus-agroal");
-        Assertions.assertEquals(1,
-                countDependencyOccurrences(project2, getPluginGroupId(), "quarkus-agroal", null));
-        Assertions.assertFalse(result2.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-        Assertions.assertTrue(result2.isSuccess());
-    }
-
-    /**
-     * This test reproduce the issue we had using the first selection algorithm.
-     * The `arc` query was matching ArC but also hibernate-search-elasticsearch.
-     */
-    @Test
-    void testPartialMatchConflict() throws Exception {
-        createProject();
-
-        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("arc"));
-
-        Assertions.assertTrue(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-        Assertions.assertTrue(result.isSuccess());
-        final T project = readProject();
-        hasDependency(project, "quarkus-arc");
-
-        final QuarkusCommandOutcome result2 = addExtensions(Collections.singletonList("elasticsearch"));
-
-        Assertions.assertTrue(result2.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-        Assertions.assertTrue(result2.isSuccess());
-        final T project2 = readProject();
-        hasDependency(project2, "quarkus-hibernate-search-elasticsearch");
-    }
-
-    @Test
-    void addExistingAndMissingExtensionsWillFailForBoth() throws Exception {
-        createProject();
-        final QuarkusCommandOutcome result = addExtensions(asList("missing", "agroal"));
-
-        final T project = readProject();
-        doesNotHaveDependency(project, "quarkus-missing");
-        doesNotHaveDependency(project, "quarkus-agroal");
-        Assertions.assertFalse(result.isSuccess());
-        Assertions.assertFalse(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
-    }
-
-    @Test
-    void doNotAddExtensionWhenMultipleMatch() throws Exception {
-        createProject();
-
-        addExtensions(asList("agroal", "jdbc"));
-
-        final T project = readProject();
-        doesNotHaveDependency(project, "quarkus-agroal");
-        doesNotHaveDependency(project, "quarkus-jdbc-postgresql");
-        doesNotHaveDependency(project, "quarkus-jdbc-h2");
-    }
-
-    @Test
-    void addDuplicatedExtensionUsingGAV() throws Exception {
-        createProject();
-
-        addExtensions(asList("org.acme:acme:1", "org.acme:acme:1"));
-
-        final T project = readProject();
-        hasDependency(project, "org.acme", "acme", "1");
-        Assertions.assertEquals(1,
-                countDependencyOccurrences(project, "org.acme", "acme", "1"));
-    }
-
-    @Test
-    void testVertx() throws Exception {
-        createProject();
-
-        addExtensions(Collections.singletonList("vertx"));
-
-        final T project = readProject();
-        hasDependency(project, "quarkus-vertx");
-    }
-
-    @Test
-    void testVertxWithDot() throws Exception {
-        createProject();
-
-        addExtensions(Collections.singletonList("vert.x"));
-
-        final T project = readProject();
-        hasDependency(project, "quarkus-vertx");
-    }
-
-    private void hasDependency(T project, String artifactId) {
-        hasDependency(project, getPluginGroupId(), artifactId, null);
-    }
-
-    private void hasDependency(T project, String groupId, String artifactId, String version) {
-        assertThat(countDependencyOccurrences(project, groupId, artifactId, version)).isNotZero();
-    }
-
-    private void doesNotHaveDependency(T project, String artifactId) {
-        assertThat(countDependencyOccurrences(project, getPluginGroupId(), artifactId, null)).isZero();
-    }
-
-    protected abstract T createProject() throws IOException, QuarkusCommandException;
-
-    protected abstract T readProject() throws IOException;
-
-    protected abstract QuarkusCommandOutcome addExtensions(List<String> extensions) throws IOException, QuarkusCommandException;
-
-    protected abstract long countDependencyOccurrences(T project, String groupId, String artifactId, String version);
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java
deleted file mode 100644
index f0e2c3ea201e3..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.quarkus.devtools.commands;
-
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.maven.model.Dependency;
-
-class AddGradleExtensionsTest extends AbstractAddExtensionsTest<List<String>> {
-
-    @Override
-    protected List<String> createProject() throws IOException, QuarkusCommandException {
-        CreateProjectTest.delete(getProjectPath().toFile());
-        new CreateProject(getProjectPath(), getPlatformDescriptor())
-                .buildTool(BuildTool.GRADLE)
-                .groupId("org.acme")
-                .artifactId("add-gradle-extension-test")
-                .version("0.0.1-SNAPSHOT")
-                .execute();
-        return readProject();
-    }
-
-    @Override
-    protected List<String> readProject() throws IOException {
-        return Files.readAllLines(getProjectPath().resolve("build.gradle"));
-    }
-
-    @Override
-    protected QuarkusCommandOutcome addExtensions(final List<String> extensions) throws IOException, QuarkusCommandException {
-        return new AddExtensions(getQuarkusProject())
-                .extensions(new HashSet<>(extensions))
-                .execute();
-    }
-
-    @Override
-    protected long countDependencyOccurrences(final List<String> buildFile, final String groupId, final String artifactId,
-            final String version) {
-        return buildFile.stream()
-                .filter(d -> d.equals(getBuildFileDependencyString(groupId, artifactId, version)))
-                .count();
-    }
-
-    private static String getBuildFileDependencyString(final String groupId, final String artifactId, final String version) {
-        final String versionPart = version != null ? ":" + version : "";
-        return "    implementation '" + groupId + ":" + artifactId + versionPart + "'";
-    }
-
-    private QuarkusProject getQuarkusProject() {
-        final Path projectPath = getProjectPath();
-        final QuarkusPlatformDescriptor platformDescriptor = getPlatformDescriptor();
-        return QuarkusProject.of(projectPath, platformDescriptor, new TestingGradleBuildFile(projectPath, platformDescriptor));
-    }
-
-    static class TestingGradleBuildFile extends AbstractGradleBuildFile {
-
-        public TestingGradleBuildFile(Path projectDirPath, QuarkusPlatformDescriptor platformDescriptor) {
-            super(projectDirPath, platformDescriptor);
-        }
-
-        @Override
-        protected List<Dependency> getDependencies() throws IOException {
-            final Matcher matcher = Pattern.compile("\\s*implementation\\s+'([^\\v:]+):([^\\v:]+)(:[^:\\v]+)?'")
-                    .matcher(getBuildContent());
-            final ArrayList<Dependency> builder = new ArrayList<>();
-            while (matcher.find()) {
-                final Dependency dep = new Dependency();
-                dep.setGroupId(matcher.group(1));
-                dep.setArtifactId(matcher.group(2));
-                dep.setVersion(matcher.group(3));
-                builder.add(dep);
-            }
-            return builder;
-        }
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java
deleted file mode 100644
index f7a7c993c4821..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package io.quarkus.devtools.commands;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.contentOf;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.codegen.writer.FileProjectWriter;
-import io.quarkus.maven.utilities.MojoUtils;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import org.apache.maven.model.Model;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-public class CreateProjectTest extends PlatformAwareTestBase {
-    @Test
-    public void create() throws Exception {
-        final File file = new File("target/basic-rest");
-        delete(file);
-        createProject(file, "io.quarkus", "basic-rest", "1.0.0-SNAPSHOT");
-
-        final File gitignore = new File(file, ".gitignore");
-        assertTrue(gitignore.exists());
-        final String gitignoreContent = new String(Files.readAllBytes(gitignore.toPath()), StandardCharsets.UTF_8);
-        assertTrue(gitignoreContent.contains("\ntarget/\n"));
-    }
-
-    @Test
-    public void createGradle() throws Exception {
-        final File file = new File("target/basic-rest-gradle");
-        delete(file);
-        createProject(BuildTool.GRADLE, file, "io.quarkus", "basic-rest", "1.0.0-SNAPSHOT");
-
-        final File gitignore = new File(file, ".gitignore");
-        assertTrue(gitignore.exists());
-        final String gitignoreContent = new String(Files.readAllBytes(gitignore.toPath()), StandardCharsets.UTF_8);
-        Assertions.assertFalse(gitignoreContent.contains("\ntarget/\n"));
-        assertTrue(gitignoreContent.contains("\nbuild/"));
-        assertTrue(gitignoreContent.contains("\n.gradle/\n"));
-
-        assertThat(new File(file, "README.md")).exists();
-        assertThat(contentOf(new File(file, "README.md"), "UTF-8")).contains("./gradlew");
-    }
-
-    @Test
-    public void createOnTopOfExisting() throws Exception {
-        final File testDir = new File("target/existing");
-        delete(testDir);
-        testDir.mkdirs();
-
-        Model model = new Model();
-        model.setModelVersion("4.0.0");
-        model.setGroupId("org.acme");
-        model.setArtifactId("foobar");
-        model.setVersion("10.1.2");
-        final File pom = new File(testDir, "pom.xml");
-        MojoUtils.write(model, pom);
-        assertThatExceptionOfType(QuarkusCommandException.class).isThrownBy(() -> {
-            new CreateProject(testDir.toPath(), getPlatformDescriptor())
-                    .groupId("something.is")
-                    .artifactId("wrong")
-                    .version("1.0.0-SNAPSHOT")
-                    .className("org.foo.MyResource")
-                    .execute();
-        }).withRootCauseInstanceOf(IOException.class);
-    }
-
-    @Test
-    @Timeout(2)
-    @DisplayName("Should create correctly multiple times in parallel with multiple threads")
-    void createMultipleTimes() throws InterruptedException {
-        final ExecutorService executorService = Executors.newFixedThreadPool(4);
-        final CountDownLatch latch = new CountDownLatch(20);
-
-        List<Callable<Void>> collect = IntStream.range(0, 20).boxed().map(i -> (Callable<Void>) () -> {
-            File tempDir = Files.createTempDirectory("test").toFile();
-            FileProjectWriter write = new FileProjectWriter(tempDir);
-            final QuarkusCommandOutcome result = new CreateProject(tempDir.toPath(), getPlatformDescriptor())
-                    .groupId("org.acme")
-                    .artifactId("acme")
-                    .version("1.0.0-SNAPSHOT")
-                    .className("org.acme.MyResource")
-                    .execute();
-            assertTrue(result.isSuccess());
-            latch.countDown();
-            write.close();
-            tempDir.delete();
-            return null;
-        }).collect(Collectors.toList());
-        executorService.invokeAll(collect);
-        latch.await();
-    }
-
-    public static void delete(final File file) throws IOException {
-
-        if (file.exists()) {
-            try (Stream<Path> stream = Files.walk(file.toPath())) {
-                stream.sorted(Comparator.reverseOrder())
-                        .map(Path::toFile)
-                        .forEach(File::delete);
-            }
-        }
-
-        Assertions.assertFalse(
-                Files.exists(file.toPath()), "Directory still exists");
-    }
-
-    private void createProject(final File file, String groupId, String artifactId, String version)
-            throws QuarkusCommandException {
-        createProject(BuildTool.MAVEN, file, groupId, artifactId, version);
-    }
-
-    private void createProject(BuildTool buildTool, File file, String groupId, String artifactId, String version)
-            throws QuarkusCommandException {
-        final QuarkusCommandOutcome result = new CreateProject(file.toPath(), getPlatformDescriptor())
-                .buildTool(buildTool)
-                .groupId(groupId)
-                .artifactId(artifactId)
-                .version(version)
-                .quarkusPluginVersion("2.3.5")
-                .execute();
-        assertTrue(result.isSuccess());
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java
deleted file mode 100644
index 9eb5b3e14f56d..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package io.quarkus.devtools.commands;
-
-import static io.quarkus.maven.utilities.MojoUtils.readPom;
-import static java.util.Arrays.asList;
-import static java.util.stream.Collectors.toMap;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import io.quarkus.bootstrap.model.AppArtifactCoords;
-import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.maven.utilities.QuarkusDependencyPredicate;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.function.Function;
-import org.apache.maven.model.Model;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class ListExtensionsTest extends PlatformAwareTestBase {
-
-    @Test
-    public void listWithBom() throws Exception {
-        final QuarkusProject project = createNewProject(new File("target/list-extensions-test", "pom.xml"));
-        addExtensions(project, "commons-io:commons-io:2.5", "Agroal");
-
-        final ListExtensions listExtensions = new ListExtensions(project);
-
-        final Map<AppArtifactKey, AppArtifactCoords> installed = readByKey(project);
-
-        Assertions.assertNotNull(installed.get(AppArtifactKey.fromString(getPluginGroupId() + ":quarkus-agroal")));
-    }
-
-    /**
-     * When creating a project with Maven, you could have -Dextensions="resteasy, hibernate-validator".
-     * <p>
-     * Having a space is not automatically handled by the Maven converter injecting the properties
-     * so we added code for that and we need to test it.
-     */
-    @Test
-    public void listWithBomExtensionWithSpaces() throws Exception {
-        final QuarkusProject quarkusProject = createNewProject(new File("target/list-extensions-test", "pom.xml"));
-        addExtensions(quarkusProject, "resteasy", " hibernate-validator ");
-
-        final ListExtensions listExtensions = new ListExtensions(quarkusProject);
-
-        final Map<AppArtifactKey, AppArtifactCoords> installed = readByKey(quarkusProject);
-
-        Assertions.assertNotNull(installed.get(AppArtifactKey.fromString(getPluginGroupId() + ":quarkus-resteasy")));
-        Assertions.assertNotNull(installed.get(AppArtifactKey.fromString(getPluginGroupId() + ":quarkus-hibernate-validator")));
-    }
-
-    @Test
-    public void listWithoutBom() throws Exception {
-        final File pom = new File("target/list-extensions-test", "pom.xml");
-        final QuarkusProject quarkusProject = createNewProject(pom);
-        Model model = readPom(pom);
-
-        model.getDependencies().stream()
-                .filter(new QuarkusDependencyPredicate())
-                .forEach(d -> d.setVersion("0.0.1"));
-
-        MojoUtils.write(model, pom);
-
-        addExtensions(quarkusProject, "commons-io:commons-io:2.5", "Agroal",
-                "io.quarkus:quarkus-hibernate-orm-panache:" + getPluginVersion());
-
-        model = readPom(pom);
-
-        final PrintStream out = System.out;
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final PrintStream printStream = new PrintStream(baos, false, "UTF-8")) {
-            System.setOut(printStream);
-            new ListExtensions(quarkusProject)
-                    .all(true)
-                    .format("full")
-                    .execute();
-        } finally {
-            System.setOut(out);
-        }
-        boolean agroal = false;
-        boolean resteasy = false;
-        boolean panache = false;
-        boolean hibernateValidator = false;
-        final String output = baos.toString("UTF-8");
-        boolean checkGuideInLineAfter = false;
-        for (String line : output.split("\r?\n")) {
-            if (line.contains(" Agroal ")) {
-                assertTrue(line.startsWith("default"), "Agroal should list as being default: " + line);
-                agroal = true;
-            } else if (line.contains(" RESTEasy  ")) {
-                assertTrue(line.startsWith("custom*"), "RESTEasy should list as being custom*: " + line);
-                assertTrue(
-                        line.endsWith(
-                                String.format("%-15s", getPluginVersion())),
-                        "RESTEasy should list as being custom*: " + line);
-                resteasy = true;
-                checkGuideInLineAfter = true;
-            } else if (line.contains("quarkus-hibernate-orm-panache")) {
-                assertTrue(line.startsWith("custom"), "Panache should list as being custom: " + line);
-                assertTrue(
-                        line.endsWith(String.format("%-25s", getPluginVersion())),
-                        "Panache should list as being custom*: " + line);
-                panache = true;
-            } else if (line.contains(" Hibernate Validator  ")) {
-                assertTrue(line.startsWith("   "), "Hibernate Validator should not list as anything: " + line);
-                hibernateValidator = true;
-            } else if (checkGuideInLineAfter) {
-                checkGuideInLineAfter = false;
-                assertTrue(
-                        line.endsWith(
-                                String.format("%s", "https://quarkus.io/guides/rest-json")),
-                        "RESTEasy should list as having an guide: " + line);
-            }
-        }
-
-        assertTrue(agroal && resteasy && hibernateValidator && panache);
-    }
-
-    @Test
-    public void searchUnexpected() throws Exception {
-        final QuarkusProject quarkusProject = createNewProject(new File("target/list-extensions-test", "pom.xml"));
-        addExtensions(quarkusProject, "commons-io:commons-io:2.5", "Agroal");
-
-        final PrintStream out = System.out;
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final PrintStream printStream = new PrintStream(baos, false, "UTF-8")) {
-            System.setOut(printStream);
-            new ListExtensions(quarkusProject)
-                    .all(true)
-                    .format("full")
-                    .search("unexpectedSearch")
-                    .execute();
-        } finally {
-            System.setOut(out);
-        }
-        final String output = baos.toString("UTF-8");
-        Assertions.assertEquals(String.format("No extension found with pattern 'unexpectedSearch'%n"), output,
-                "search to unexpected extension must return a message");
-    }
-
-    @Test
-    public void searchRest() throws Exception {
-        final QuarkusProject quarkusProject = createNewProject(new File("target/list-extensions-test", "pom.xml"));
-        addExtensions(quarkusProject, "commons-io:commons-io:2.5", "Agroal");
-
-        final PrintStream out = System.out;
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final PrintStream printStream = new PrintStream(baos, false, "UTF-8")) {
-            System.setOut(printStream);
-            new ListExtensions(quarkusProject)
-                    .all(true)
-                    .format("full")
-                    .search("Rest")
-                    .execute();
-        } finally {
-            System.setOut(out);
-        }
-        final String output = baos.toString("UTF-8");
-        Assertions.assertTrue(output.split("\r?\n").length > 7, "search to unexpected extension must return a message");
-    }
-
-    @Test
-    void testListExtensionsWithoutAPomFile() throws IOException {
-        final Path tempDirectory = Files.createTempDirectory("proj");
-        final QuarkusProject project = QuarkusProject.maven(tempDirectory, getPlatformDescriptor());
-        assertThatExceptionOfType(UncheckedIOException.class).isThrownBy(() -> readByKey(project))
-                .withRootCauseInstanceOf(NoSuchFileException.class);
-    }
-
-    private void addExtensions(QuarkusProject quarkusProject, String... extensions) throws Exception {
-        new AddExtensions(quarkusProject)
-                .extensions(new HashSet<>(asList(extensions)))
-                .execute();
-    }
-
-    private QuarkusProject createNewProject(final File pom) throws IOException, QuarkusCommandException {
-        CreateProjectTest.delete(pom.getParentFile());
-        final Path projectDirPath = pom.getParentFile().toPath();
-        new CreateProject(projectDirPath, getPlatformDescriptor())
-                .groupId("org.acme")
-                .artifactId("add-extension-test")
-                .version("0.0.1-SNAPSHOT")
-                .execute();
-        return QuarkusProject.maven(projectDirPath, getPlatformDescriptor());
-    }
-
-    private static Map<AppArtifactKey, AppArtifactCoords> readByKey(QuarkusProject project) throws IOException {
-        return project.getExtensionManager().getInstalled().stream()
-                .collect(toMap(AppArtifactCoords::getKey, Function.identity()));
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/PlatformAwareTestBase.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/PlatformAwareTestBase.java
deleted file mode 100644
index 33b1278cd484d..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/PlatformAwareTestBase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.quarkus.devtools.commands;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
-import java.io.IOException;
-import java.util.Properties;
-
-public class PlatformAwareTestBase {
-
-    private QuarkusPlatformDescriptor platformDescr;
-    private Properties quarkusProps;
-    private String pluginGroupId;
-    private String pluginArtifactId;
-    private String pluginVersion;
-
-    protected QuarkusPlatformDescriptor getPlatformDescriptor() {
-        return platformDescr == null ? platformDescr = QuarkusPlatformConfig.builder().build().getPlatformDescriptor()
-                : platformDescr;
-    }
-
-    private Properties getQuarkusProperties() {
-        if (quarkusProps == null) {
-            try {
-                quarkusProps = getPlatformDescriptor().loadResource("quarkus.properties", is -> {
-                    final Properties props = new Properties();
-                    props.load(is);
-                    return props;
-                });
-            } catch (IOException e) {
-                throw new IllegalStateException("Failed to load quarkus.properties", e);
-            }
-        }
-        return quarkusProps;
-    }
-
-    protected String getPluginGroupId() {
-        return pluginGroupId == null ? pluginGroupId = getQuarkusProperties().getProperty("plugin-groupId") : pluginGroupId;
-    }
-
-    protected String getPluginArtifactId() {
-        return pluginArtifactId == null ? pluginArtifactId = getQuarkusProperties().getProperty("plugin-artifactId")
-                : pluginArtifactId;
-    }
-
-    protected String getPluginVersion() {
-        return pluginVersion == null ? pluginVersion = getQuarkusProperties().getProperty("plugin-version") : pluginVersion;
-    }
-
-    protected String getBomGroupId() {
-        return getPlatformDescriptor().getBomGroupId();
-    }
-
-    protected String getBomArtifactId() {
-        return getPlatformDescriptor().getBomArtifactId();
-    }
-
-    protected String getBomVersion() {
-        return getPlatformDescriptor().getBomVersion();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java
deleted file mode 100644
index 963af786163e6..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package io.quarkus.devtools.commands;
-
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.List;
-import org.junit.jupiter.api.Disabled;
-
-class RemoveGradleExtensionsTest extends AbstractRemoveExtensionsTest<List<String>> {
-
-    @Disabled
-    void addExtensionTwiceInTwoBatches() throws IOException {
-        //FIXME This is currently not working
-    }
-
-    @Override
-    protected List<String> createProject() throws IOException, QuarkusCommandException {
-        CreateProjectTest.delete(getProjectPath().toFile());
-        new CreateProject(getProjectPath(), getPlatformDescriptor())
-                .buildTool(BuildTool.GRADLE)
-                .groupId("org.acme")
-                .artifactId("add-gradle-extension-test")
-                .version("0.0.1-SNAPSHOT")
-                .execute();
-        return readProject();
-    }
-
-    @Override
-    protected List<String> readProject() throws IOException {
-        return Files.readAllLines(getProjectPath().resolve("build.gradle"));
-    }
-
-    @Override
-    protected QuarkusCommandOutcome addExtensions(final List<String> extensions) throws IOException, QuarkusCommandException {
-        return new AddExtensions(getQuarkusProject())
-                .extensions(new HashSet<>(extensions))
-                .execute();
-    }
-
-    @Override
-    protected QuarkusCommandOutcome removeExtensions(final List<String> extensions)
-            throws IOException, QuarkusCommandException {
-        return new RemoveExtensions(getQuarkusProject())
-                .extensions(new HashSet<>(extensions))
-                .execute();
-    }
-
-    @Override
-    protected long countDependencyOccurrences(final List<String> buildFile, final String groupId, final String artifactId,
-            final String version) {
-        return buildFile.stream()
-                .filter(d -> d.equals(getBuildFileDependencyString(groupId, artifactId, version)))
-                .count();
-    }
-
-    private QuarkusProject getQuarkusProject() {
-        final Path projectPath = getProjectPath();
-        final QuarkusPlatformDescriptor platformDescriptor = getPlatformDescriptor();
-        return QuarkusProject.of(projectPath, platformDescriptor,
-                new AddGradleExtensionsTest.TestingGradleBuildFile(projectPath, platformDescriptor));
-    }
-
-    private static String getBuildFileDependencyString(final String groupId, final String artifactId, final String version) {
-        final String versionPart = version != null ? ":" + version : "";
-        return "    implementation '" + groupId + ":" + artifactId + versionPart + "'";
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java
deleted file mode 100644
index ab9135375aa1c..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package io.quarkus.devtools.commands.handlers;
-
-import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.select;
-import static java.util.Arrays.asList;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.commands.data.SelectionResult;
-import java.util.Collections;
-import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class QuarkusCommandHandlersTest {
-
-    @Test
-    void testMultiMatchByLabels() {
-        Extension e1 = new Extension("org.acme", "e1", "1.0")
-                .setName("some extension 1")
-                .setKeywords(new String[] { "foo", "bar" });
-        Extension e2 = new Extension("org.acme", "e2", "1.0")
-                .setName("some extension 2")
-                .setKeywords(new String[] { "foo", "bar", "baz" });
-        Extension e3 = new Extension("org.acme", "e3", "1.0")
-                .setName("unrelated")
-                .setKeywords(new String[] { "bar" });
-
-        List<Extension> extensions = asList(e1, e2, e3);
-        Collections.shuffle(extensions);
-        SelectionResult matches = select("foo", extensions, true);
-        Assertions.assertFalse(matches.matches());
-        Assertions.assertEquals(2, matches.getExtensions().size());
-
-        matches = select("foo", extensions, false);
-        Assertions.assertFalse(matches.matches());
-        Assertions.assertEquals(0, matches.getExtensions().size());
-    }
-
-    @Test
-    void testThatSingleLabelMatchIsNotAMatch() {
-        Extension e1 = new Extension("org.acme", "e1", "1.0")
-                .setName("e1")
-                .setKeywords(new String[] { "foo", "bar" });
-        Extension e2 = new Extension("org.acme", "e2", "1.0")
-                .setName("e2")
-                .setKeywords(new String[] { "bar", "baz" });
-
-        List<Extension> extensions = asList(e1, e2);
-        Collections.shuffle(extensions);
-        SelectionResult matches = select("foo", extensions, true);
-        Assertions.assertFalse(matches.matches());
-        Assertions.assertEquals(1, matches.getExtensions().size());
-    }
-
-    @Test
-    void testMultiMatchByArtifactIdsAndNames() {
-        Extension e1 = new Extension("org.acme", "e1", "1.0")
-                .setName("foo")
-                .setKeywords(new String[] { "foo", "bar" });
-        Extension e2 = new Extension("org.acme", "quarkus-foo", "1.0")
-                .setName("some foo bar")
-                .setKeywords(new String[] { "foo", "bar", "baz" });
-        Extension e3 = new Extension("org.acme", "e3", "1.0")
-                .setName("unrelated")
-                .setKeywords(new String[] { "foo" });
-
-        List<Extension> extensions = asList(e1, e2, e3);
-        Collections.shuffle(extensions);
-        SelectionResult matches = select("foo", extensions, false);
-        Assertions.assertFalse(matches.matches());
-        Assertions.assertEquals(2, matches.getExtensions().size());
-
-        matches = select("foo", extensions, true);
-        Assertions.assertFalse(matches.matches());
-        Assertions.assertEquals(3, matches.getExtensions().size());
-
-    }
-
-    @Test
-    void testShortNameSelection() {
-        Extension e1 = new Extension("org.acme", "some-complex-seo-unaware-artifactid", "1.0")
-                .setName("some complex seo unaware name")
-                .setShortName("foo")
-                .setKeywords(new String[] { "foo", "bar" });
-        Extension e2 = new Extension("org.acme", "some-foo-bar", "1.0")
-                .setName("some foo bar")
-                .setKeywords(new String[] { "foo", "bar", "baz" });
-        Extension e3 = new Extension("org.acme", "unrelated", "1.0")
-                .setName("unrelated")
-                .setKeywords(new String[] { "foo" });
-
-        List<Extension> extensions = asList(e1, e2, e3);
-        Collections.shuffle(extensions);
-        SelectionResult matches = select("foo", extensions, false);
-        Assertions.assertTrue(matches.matches());
-        Assertions.assertEquals(1, matches.getExtensions().size());
-        Assertions.assertTrue(matches.iterator().hasNext());
-        Assertions
-                .assertTrue(matches.iterator().next().getArtifactId().equalsIgnoreCase("some-complex-seo-unaware-artifactid"));
-    }
-
-    @Test
-    void testArtifactIdSelectionWithQuarkusPrefix() {
-        Extension e1 = new Extension("org.acme", "quarkus-foo", "1.0")
-                .setName("some complex seo unaware name")
-                .setShortName("foo")
-                .setKeywords(new String[] { "foo", "bar" });
-        Extension e2 = new Extension("org.acme", "quarkus-foo-bar", "1.0")
-                .setName("some foo bar")
-                .setKeywords(new String[] { "foo", "bar", "baz" });
-        Extension e3 = new Extension("org.acme", "quarkus-unrelated", "1.0")
-                .setName("unrelated")
-                .setKeywords(new String[] { "foo" });
-
-        List<Extension> extensions = asList(e1, e2, e3);
-        Collections.shuffle(extensions);
-        SelectionResult matches = select("foo", extensions, false);
-        Assertions.assertEquals(1, matches.getExtensions().size());
-        Assertions.assertTrue(matches.iterator().hasNext());
-        Assertions.assertTrue(matches.iterator().next().getArtifactId().equalsIgnoreCase("quarkus-foo"));
-    }
-
-    @Test
-    void testListedVsUnlisted() {
-        Extension e1 = new Extension("org.acme", "quarkus-foo-unlisted", "1.0")
-                .setName("some complex seo unaware name")
-                .setShortName("foo")
-                .setKeywords(new String[] { "foo", "bar" }).addMetadata("unlisted", "true");
-
-        Extension e2 = new Extension("org.acme", "quarkus-foo-bar", "1.0")
-                .setName("some foo bar")
-                .setKeywords(new String[] { "foo", "bar", "baz" }).addMetadata("unlisted", "false");
-        Extension e3 = new Extension("org.acme", "quarkus-foo-baz", "1.0")
-                .setName("unrelated")
-                .setKeywords(new String[] { "foo" });
-
-        List<Extension> extensions = asList(e1, e2, e3);
-        Collections.shuffle(extensions);
-        SelectionResult matches = select("quarkus-foo", extensions, true);
-        Assertions.assertEquals(2, matches.getExtensions().size());
-
-        matches = select("quarkus-foo-unlisted", extensions, true);
-        Assertions.assertEquals(1, matches.getExtensions().size());
-
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/buildfile/MavenBuildFileTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/buildfile/MavenBuildFileTest.java
index 88f10e174789b..e0104ed2fe59d 100644
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/buildfile/MavenBuildFileTest.java
+++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/buildfile/MavenBuildFileTest.java
@@ -4,7 +4,7 @@
 
 import io.quarkus.bootstrap.model.AppArtifactCoords;
 import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Properties;
@@ -39,7 +39,7 @@ void setUp(@TempDir Path projectDirPath) throws IOException {
         model.setDependencyManagement(depMan);
         Path pomPath = projectDirPath.resolve("pom.xml");
         MojoUtils.write(model, pomPath.toFile());
-        QuarkusPlatformDescriptor mock = Mockito.mock(QuarkusPlatformDescriptor.class);
+        ExtensionCatalog mock = Mockito.mock(ExtensionCatalog.class);
         mavenBuildFile = new MavenBuildFile(projectDirPath, mock);
     }
 
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java
deleted file mode 100644
index fbdf838568ac2..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/codegen/rest/BasicRestProjectGeneratorTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package io.quarkus.devtools.project.codegen.rest;
-
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.BOM_VERSION;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.CLASS_NAME;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.IS_SPRING;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PACKAGE_NAME;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_ARTIFACT_ID;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_GROUP_ID;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.PROJECT_VERSION;
-import static io.quarkus.devtools.project.codegen.ProjectGenerator.SOURCE_TYPE;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.quarkus.bootstrap.util.IoUtils;
-import io.quarkus.devtools.commands.PlatformAwareTestBase;
-import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.devtools.project.codegen.SourceType;
-import io.quarkus.devtools.project.codegen.writer.ProjectWriter;
-import io.quarkus.maven.utilities.MojoUtils;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-class BasicRestProjectGeneratorTest extends PlatformAwareTestBase {
-
-    private final Map<String, Object> basicProjectContext = new HashMap<>();
-
-    @BeforeEach
-    void setUp() {
-        basicProjectContext.put(PROJECT_GROUP_ID, "org.example");
-        basicProjectContext.put(PROJECT_ARTIFACT_ID, "quarkus-app");
-        basicProjectContext.put(PROJECT_VERSION, "0.0.1-SNAPSHOT");
-        basicProjectContext.put(BOM_VERSION, getBomVersion());
-        basicProjectContext.put(PACKAGE_NAME, "org.example");
-        basicProjectContext.put(CLASS_NAME, "ExampleResource");
-        basicProjectContext.put("path", "/hello");
-        basicProjectContext.put(SOURCE_TYPE, SourceType.JAVA);
-    }
-
-    @Test
-    @Timeout(2)
-    @DisplayName("Should generate correctly multiple times in parallel with multiple threads")
-    void generateMultipleTimes() throws InterruptedException {
-        final ExecutorService executorService = Executors.newFixedThreadPool(4);
-        final CountDownLatch latch = new CountDownLatch(20);
-        final BasicRestProjectGenerator basicRestProjectGenerator = new BasicRestProjectGenerator();
-        List<Callable<Void>> collect = IntStream.range(0, 20).boxed().map(i -> (Callable<Void>) () -> {
-            final Path path = Files.createTempDirectory("test");
-            try {
-                basicRestProjectGenerator.generate(createQuarkusCommandInvocation(path));
-            } finally {
-                IoUtils.recursiveDelete(path);
-            }
-            latch.countDown();
-            return null;
-        }).collect(Collectors.toList());
-        executorService.invokeAll(collect);
-        latch.await();
-    }
-
-    @Test
-    @DisplayName("Should generate project files with basic context")
-    void generateFilesWithJaxRsResource() throws Exception {
-        final ProjectWriter mockWriter = mock(ProjectWriter.class);
-        final Path mockProjectPath = mock(Path.class);
-        final BasicRestProjectGenerator basicRestProjectGenerator = new BasicRestProjectGenerator();
-
-        when(mockWriter.mkdirs(anyString())).thenAnswer(invocationOnMock -> invocationOnMock.getArgument(0, String.class));
-
-        basicRestProjectGenerator.generate(mockWriter,
-                createQuarkusCommandInvocation(mockProjectPath));
-
-        verify(mockWriter, times(10)).mkdirs(anyString());
-        verify(mockWriter, times(3)).mkdirs("");
-        verify(mockWriter, times(1)).mkdirs("src/main/java");
-        verify(mockWriter, times(1)).mkdirs("src/main/java/org/example");
-        verify(mockWriter, times(1)).mkdirs("src/test/java");
-        verify(mockWriter, times(1)).mkdirs("src/test/java/org/example");
-        verify(mockWriter, times(1)).mkdirs("src/main/resources");
-        verify(mockWriter, times(1)).mkdirs("src/main/resources/META-INF/resources");
-        verify(mockWriter, times(1)).mkdirs("src/main/docker");
-
-        verify(mockWriter, times(12)).write(anyString(), anyString());
-        verify(mockWriter, times(1)).write(eq("pom.xml"),
-                argThat(argument -> argument.contains("<groupId>org.example</groupId>")
-                        && argument.contains("<artifactId>quarkus-app</artifactId")
-                        && argument.contains("<version>0.0.1-SNAPSHOT</version>")
-                        && argument.contains(
-                                "<" + MojoUtils.TEMPLATE_PROPERTY_QUARKUS_PLATFORM_VERSION_NAME + ">" + getPluginVersion()
-                                        + "</" + MojoUtils.TEMPLATE_PROPERTY_QUARKUS_PLATFORM_VERSION_NAME + ">")));
-        verify(mockWriter, times(1)).write(eq("src/main/java/org/example/ExampleResource.java"),
-                argThat(argument -> argument.contains("@Path(\"/hello\")")));
-        verify(mockWriter, times(1)).write(eq("src/test/java/org/example/ExampleResourceTest.java"), anyString());
-        verify(mockWriter, times(1)).write(eq("src/test/java/org/example/NativeExampleResourceIT.java"), anyString());
-        verify(mockWriter, times(1)).write(eq("src/main/resources/application.properties"), anyString());
-        verify(mockWriter, times(1)).write(eq("src/main/resources/META-INF/resources/index.html"), anyString());
-        verify(mockWriter, times(1)).write(eq("src/main/docker/Dockerfile.native"), anyString());
-        verify(mockWriter, times(1)).write(eq("src/main/docker/Dockerfile.jvm"), anyString());
-        verify(mockWriter, times(1)).write(eq("src/main/docker/Dockerfile.fast-jar"), anyString());
-        verify(mockWriter, times(1)).write(eq(".dockerignore"), anyString());
-    }
-
-    @Test
-    @DisplayName("Should generate project files with basic spring web context")
-    void generateFilesWithSpringControllerResource() throws Exception {
-        final ProjectWriter mockWriter = mock(ProjectWriter.class);
-        final Path mockProjectPath = mock(Path.class);
-        final BasicRestProjectGenerator basicRestProjectGenerator = new BasicRestProjectGenerator();
-
-        when(mockWriter.mkdirs(anyString())).thenAnswer(invocationOnMock -> invocationOnMock.getArgument(0, String.class));
-
-        QuarkusCommandInvocation springContext = createQuarkusCommandInvocation(mockProjectPath);
-        springContext.setValue(IS_SPRING, Boolean.TRUE);
-        basicRestProjectGenerator.generate(mockWriter, springContext);
-
-        verify(mockWriter, times(1)).write(eq("src/main/java/org/example/ExampleResource.java"),
-                argThat(argument -> argument.contains("@RequestMapping(\"/hello\")")));
-        verify(mockWriter, times(1)).write(eq("src/main/java/org/example/ExampleResource.java"),
-                argThat(argument -> argument.contains("@RestController")));
-
-    }
-
-    private QuarkusCommandInvocation createQuarkusCommandInvocation(Path projectPath) {
-        return new QuarkusCommandInvocation(QuarkusProject.maven(projectPath, getPlatformDescriptor()),
-                basicProjectContext);
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java
new file mode 100644
index 0000000000000..93d89673d2243
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/platform/catalog/predicate/ExtensionPredicateTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.platform.catalog.predicate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.json.JsonExtension;
+import java.util.Arrays;
+import org.junit.jupiter.api.Test;
+
+class ExtensionPredicateTest {
+
+    @Test
+    void rejectUnlisted() {
+        ExtensionPredicate predicate = new ExtensionPredicate("foo");
+        JsonExtension extension = new JsonExtension();
+        extension.setArtifact(new ArtifactCoords("g", "a", null, "jar", "v"));
+        extension.getMetadata().put(Extension.MD_UNLISTED, true);
+        assertThat(predicate).rejects(extension);
+    }
+
+    @Test
+    void acceptKeywordInArtifactId() {
+        ExtensionPredicate predicate = new ExtensionPredicate("foo");
+        JsonExtension extension = new JsonExtension();
+        extension.setArtifact(new ArtifactCoords("g", "foo-bar", null, "jar", "1.0"));
+        assertThat(predicate).accepts(extension);
+    }
+
+    @Test
+    void acceptKeywordInLabel() {
+        ExtensionPredicate predicate = new ExtensionPredicate("foo");
+        JsonExtension extension = new JsonExtension();
+        extension.setArtifact(new ArtifactCoords("g", "a", null, "jar", "1.0"));
+        extension.getMetadata().put(Extension.MD_KEYWORDS, Arrays.asList("foo", "bar"));
+        assertThat(predicate).accepts(extension);
+    }
+
+}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/DefaultExtensionRegistryTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/DefaultExtensionRegistryTest.java
deleted file mode 100644
index d5db150cd323f..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/DefaultExtensionRegistryTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package io.quarkus.registry;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import io.quarkus.bootstrap.model.AppArtifactCoords;
-import io.quarkus.devtools.project.extensions.ExtensionInstallPlan;
-import io.quarkus.registry.builder.RegistryBuilder;
-import io.quarkus.registry.catalog.model.Repository;
-import io.quarkus.registry.model.Registry;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collections;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-class DefaultExtensionRegistryTest {
-
-    static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
-            .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    static DefaultExtensionRegistry extensionRegistry;
-
-    @BeforeAll
-    static void setUp() throws IOException {
-        Repository repository = Repository.parse(Paths.get("src/test/resources/registry/repository"), OBJECT_MAPPER);
-        RegistryBuilder registryBuilder = new RegistryBuilder();
-        RepositoryIndexer indexer = new RepositoryIndexer(new TestArtifactResolver());
-        indexer.index(repository, registryBuilder);
-        Registry registry = registryBuilder.build();
-        extensionRegistry = new DefaultExtensionRegistry(registry);
-    }
-
-    @Test
-    void serializationShouldKeepValues(@TempDir Path tmpDir) throws IOException {
-        File tmpFile = tmpDir.resolve("registry.json").toFile();
-        OBJECT_MAPPER.writeValue(tmpFile, extensionRegistry.getRegistry());
-        Registry newRegistry = OBJECT_MAPPER.readValue(tmpFile, Registry.class);
-        assertThat(newRegistry).isEqualToComparingFieldByField(extensionRegistry.getRegistry());
-    }
-
-    @Test
-    void shouldReturnFourQuarkusCoreVersions() {
-        assertThat(extensionRegistry.getQuarkusCoreVersions()).containsExactly(
-                "1.6.0.Final",
-                "1.5.2.Final",
-                "1.3.2.Final",
-                "1.3.1.Final",
-                "1.1.0.CR1");
-    }
-
-    @Test
-    void shouldLookupPlatformForDependentExtensionInQuarkusFinal() {
-        ExtensionInstallPlan result = extensionRegistry.planInstallation("1.3.2.Final",
-                Arrays.asList("quarkus-arc", "quarkus-vertx"));
-        assertThat(result).isNotNull();
-        assertThat(result.getPlatforms()).hasSize(2);
-        assertThat(result.getPlatforms())
-                .extracting(AppArtifactCoords::getArtifactId)
-                .contains("quarkus-universe-bom", "quarkus-bom");
-        assertThat(result.getManagedExtensions()).hasSize(2);
-        assertThat(result.getIndependentExtensions()).isEmpty();
-    }
-
-    @Test
-    void shouldLookupNoPlatformForIndependentExtension() {
-        ExtensionInstallPlan result = extensionRegistry.planInstallation("1.3.1.Final",
-                Collections.singletonList("myfaces-quarkus-runtime"));
-        assertThat(result).isNotNull();
-        assertThat(result.getPlatforms()).isEmpty();
-        assertThat(result.getManagedExtensions()).isEmpty();
-        assertThat(result.getIndependentExtensions()).hasSize(1);
-        assertThat(result.getIndependentExtensions().iterator().next())
-                .hasFieldOrPropertyWithValue("groupId", "org.apache.myfaces.core.extensions.quarkus")
-                .hasFieldOrPropertyWithValue("artifactId", "myfaces-quarkus-runtime")
-                .hasFieldOrPropertyWithValue("version", "2.3-next-M2");
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/RepositoryIndexerTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/RepositoryIndexerTest.java
deleted file mode 100644
index 282e311b0d7e3..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/RepositoryIndexerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.quarkus.registry;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.catalog.model.Repository;
-import io.quarkus.registry.catalog.spi.IndexVisitor;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import org.junit.jupiter.api.Test;
-
-class RepositoryIndexerTest {
-    @Test
-    void shouldVisitParsedElements() throws Exception {
-        Path rootPath = Paths.get("src/test/resources/registry/repository");
-        assertThat(rootPath).exists();
-        ObjectMapper mapper = new ObjectMapper();
-        Repository repository = Repository.parse(rootPath, mapper);
-        RepositoryIndexer indexer = new RepositoryIndexer(new TestArtifactResolver());
-        IndexVisitor mock = mock(IndexVisitor.class);
-        indexer.index(repository, mock);
-        verify(mock, atLeast(4)).visitPlatform(any(QuarkusPlatformDescriptor.class));
-        verify(mock, atLeast(2)).visitExtension(any(Extension.class), anyString());
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/TestArtifactResolver.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/TestArtifactResolver.java
deleted file mode 100644
index 9e2581f99eb64..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/TestArtifactResolver.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.registry;
-
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.registry.catalog.model.Platform;
-import io.quarkus.registry.catalog.spi.ArtifactResolver;
-import io.quarkus.registry.model.Release;
-import io.quarkus.test.platform.descriptor.loader.QuarkusTestPlatformDescriptorLoader;
-import java.io.IOException;
-
-public class TestArtifactResolver implements ArtifactResolver {
-
-    @Override
-    public QuarkusPlatformDescriptor resolvePlatform(Platform platform, Release release) {
-        final QuarkusTestPlatformDescriptorLoader loader = new QuarkusTestPlatformDescriptorLoader();
-        loader.setGroupId(platform.getGroupId());
-        loader.setArtifactId(platform.getArtifactId());
-        loader.setVersion(release.getVersion());
-        return loader.load(null);
-    }
-
-    @Override
-    public Extension resolveExtension(io.quarkus.registry.catalog.model.Extension extension, Release release)
-            throws IOException {
-        return new Extension(extension.getGroupId(), extension.getArtifactId(), release.getVersion());
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/ExtensionRegistryBuilderTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/ExtensionRegistryBuilderTest.java
deleted file mode 100644
index 7f6ead47774a9..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/ExtensionRegistryBuilderTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.quarkus.registry.builder;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.atMostOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.quarkus.registry.ExtensionRegistry;
-import io.quarkus.registry.catalog.model.Extension;
-import io.quarkus.registry.catalog.spi.ArtifactResolver;
-import io.quarkus.registry.model.Release;
-import java.io.IOException;
-import org.junit.jupiter.api.Test;
-
-class ExtensionRegistryBuilderTest {
-
-    @Test
-    void shouldResolveCamelDependencies() throws IOException {
-        String groupId = "org.apache.camel";
-        String artifactId = "camel-quarkus";
-        String version = "1.6.0.Final";
-
-        ArtifactResolver artifactResolver = mock(ArtifactResolver.class);
-        Release release = Release.builder().version(version).build();
-        Extension extension = Extension.builder().groupId(groupId).artifactId(artifactId)
-                .addReleases(release).build();
-        when(artifactResolver.resolveExtension(extension, release))
-                .thenReturn(new io.quarkus.dependencies.Extension(groupId, artifactId, version));
-
-        ExtensionRegistry registry = new ExtensionRegistryBuilder(artifactResolver)
-                .addExtension(groupId, artifactId, version, version)
-                .build();
-        verify(artifactResolver, atMostOnce()).resolveExtension(extension, release);
-        assertThat(registry.list(version, "camel")).isNotEmpty();
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/RegistryBuilderTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/RegistryBuilderTest.java
deleted file mode 100644
index 9dd6e19b497e5..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/RegistryBuilderTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.quarkus.registry.builder;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.entry;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import io.quarkus.registry.RepositoryIndexer;
-import io.quarkus.registry.TestArtifactResolver;
-import io.quarkus.registry.catalog.model.Repository;
-import io.quarkus.registry.model.Registry;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-class RegistryBuilderTest {
-
-    static Registry registry;
-
-    @BeforeAll
-    static void setUp() throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        Repository repository = Repository.parse(Paths.get("src/test/resources/registry/repository"), mapper);
-        RepositoryIndexer indexer = new RepositoryIndexer(new TestArtifactResolver());
-        RegistryBuilder builder = new RegistryBuilder();
-        indexer.index(repository, builder);
-        registry = builder.build();
-    }
-
-    @Test
-    void build() throws Exception {
-        assertThat(registry.getExtensions()).isNotEmpty();
-        assertThat(registry.getPlatforms()).isNotEmpty();
-        if (Boolean.getBoolean("generateTmpRegistry")) {
-            ObjectMapper mapper = new ObjectMapper()
-                    .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-                    .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
-            mapper.writeValue(new java.io.File("/tmp/registry.json"), registry);
-        }
-    }
-
-    @Test
-    void diffMap() {
-        Map<String, Object> left = new HashMap<>();
-        left.put("A", "1");
-        left.put("B", "2");
-        Map<String, Object> right = new HashMap<>();
-        right.put("A", "1");
-        right.put("B", "2");
-        right.put("C", "3");
-        Map<String, Object> result = RegistryBuilder.diff(left, right);
-        assertThat(result).doesNotContainKeys("A", "B").containsOnly(entry("C", "3"));
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/URLRegistryBuilderTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/URLRegistryBuilderTest.java
deleted file mode 100644
index 5cad5d6368c3a..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/builder/URLRegistryBuilderTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.quarkus.registry.builder;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import io.quarkus.registry.model.Registry;
-import java.io.IOException;
-import java.net.URL;
-import org.junit.jupiter.api.Test;
-
-class URLRegistryBuilderTest {
-
-    @Test
-    void shouldFailOnEmptyURLS() {
-        assertThrows(IllegalStateException.class, new URLRegistryBuilder()::build);
-    }
-
-    @Test
-    void shouldReadRegistry() throws IOException {
-        URL url = getClass().getClassLoader().getResource("registry/registry.json");
-        Registry registry = new URLRegistryBuilder().addURL(url).build();
-        assertThat(registry.getCoreVersions()).isNotEmpty();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/model/RepositoryTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/model/RepositoryTest.java
deleted file mode 100644
index 35cd832fa3945..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/registry/model/RepositoryTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.quarkus.registry.model;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.quarkus.registry.catalog.model.Repository;
-import java.nio.file.Paths;
-import org.junit.jupiter.api.Test;
-
-class RepositoryTest {
-
-    @Test
-    void shouldParseRepository() throws Exception {
-        Repository repository = Repository.parse(Paths.get("src/test/resources/registry/repository"), new ObjectMapper());
-        assertThat(repository).isNotNull();
-        assertThat(repository.getPlatforms()).isNotEmpty();
-        assertThat(repository.getIndividualExtensions()).isNotEmpty();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java
deleted file mode 100644
index f9da268b93ccc..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/CombinedQuarkusPlatformDescriptorTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package io.quarkus.test.platform.descriptor;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.devtools.commands.PlatformAwareTestBase;
-import io.quarkus.platform.descriptor.CombinedQuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.apache.maven.model.Dependency;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class CombinedQuarkusPlatformDescriptorTest extends PlatformAwareTestBase {
-
-    private static final String DOMINATING_VERSION = "dominating-version";
-
-    QuarkusPlatformDescriptor dominatingPlatform;
-    QuarkusPlatformDescriptor defaultPlatform;
-
-    @BeforeEach
-    public void setup() {
-        dominatingPlatform = new TestDominatingQuarkusPlatformDescriptor();
-        defaultPlatform = getPlatformDescriptor();
-    }
-
-    @Test
-    public void testDominance() throws Exception {
-
-        final QuarkusPlatformDescriptor combined = CombinedQuarkusPlatformDescriptor.builder()
-                .addPlatform(dominatingPlatform)
-                .addPlatform(defaultPlatform)
-                .build();
-
-        final Map<String, Extension> expectedExtensions = toMap(defaultPlatform.getExtensions());
-        expectedExtensions.putAll(toMap(dominatingPlatform.getExtensions()));
-
-        assertBom(combined);
-
-        assertEquals(dominatingPlatform.getQuarkusVersion(), combined.getQuarkusVersion());
-
-        assertCategories(combined);
-
-        assertExtensions(expectedExtensions, combined);
-
-        assertManagedDeps(combined);
-
-        assertEquals("dominating pom.xml template", combined.getTemplate("templates/basic-rest/java/pom.xml-template.ftl"));
-        assertEquals(defaultPlatform.getTemplate("templates/dockerfile-jvm.ftl"),
-                combined.getTemplate("templates/dockerfile-jvm.ftl"));
-    }
-
-    private void assertBom(QuarkusPlatformDescriptor descriptor) {
-        assertEquals(dominatingPlatform.getBomGroupId(), descriptor.getBomGroupId());
-        assertEquals(dominatingPlatform.getBomArtifactId(), descriptor.getBomArtifactId());
-        assertEquals(dominatingPlatform.getBomVersion(), descriptor.getBomVersion());
-    }
-
-    private void assertCategories(QuarkusPlatformDescriptor descriptor) {
-        final List<Category> categories = descriptor.getCategories();
-        assertFalse(categories.isEmpty());
-        final Map<String, Category> map = categories.stream().collect(Collectors.toMap(Category::getId, c -> c));
-        assertEquals("Dominating Web", map.get("web").getName());
-        assertEquals("Data", map.get("data").getName());
-        assertEquals("Other category", map.get("other").getName());
-    }
-
-    private void assertExtensions(Map<String, Extension> expectedExtensions, QuarkusPlatformDescriptor descriptor) {
-        final List<Extension> extensions = descriptor.getExtensions();
-        assertFalse(extensions.isEmpty());
-        for (Extension actual : extensions) {
-            final Extension expected = expectedExtensions.get(getGa(actual));
-            assertNotNull(expected);
-            assertEquals(expected.getVersion(), actual.getVersion());
-        }
-
-        final Map<String, Extension> actualMap = toMap(descriptor.getExtensions());
-        Extension ext = actualMap.get("io.quarkus:quarkus-jdbc-h2");
-        assertNotNull(ext);
-        assertEquals(defaultPlatform.getQuarkusVersion(), ext.getVersion());
-
-        ext = actualMap.get("io.quarkus:quarkus-resteasy");
-        assertNotNull(ext);
-        assertEquals(DOMINATING_VERSION, ext.getVersion());
-    }
-
-    private void assertManagedDeps(QuarkusPlatformDescriptor descriptor) {
-        final List<Dependency> deps = descriptor.getManagedDependencies();
-        assertFalse(deps.isEmpty());
-        final Map<String, Dependency> actualMap = deps.stream().collect(Collectors.toMap(d -> getGa(d), d -> d));
-
-        Dependency dep = actualMap.get("io.quarkus:quarkus-jdbc-h2");
-        assertNotNull(dep);
-        assertEquals(defaultPlatform.getQuarkusVersion(), dep.getVersion());
-
-        dep = actualMap.get("io.quarkus:quarkus-resteasy");
-        assertNotNull(dep);
-        assertEquals(DOMINATING_VERSION, dep.getVersion());
-    }
-
-    private static Map<String, Extension> toMap(final List<Extension> extensions) {
-        return extensions.stream().collect(Collectors.toMap(e -> getGa(e), e -> e));
-    }
-
-    private static String getGa(Extension e) {
-        return e.getGroupId() + ":" + e.getArtifactId();
-    }
-
-    private static String getGa(Dependency d) {
-        return d.getGroupId() + ":" + d.getArtifactId();
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/TestDominatingQuarkusPlatformDescriptor.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/TestDominatingQuarkusPlatformDescriptor.java
deleted file mode 100644
index f2ba040a12c38..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/TestDominatingQuarkusPlatformDescriptor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package io.quarkus.test.platform.descriptor;
-
-import static io.quarkus.test.platform.descriptor.loader.QuarkusTestPlatformDescriptorLoader.addCategory;
-import static io.quarkus.test.platform.descriptor.loader.QuarkusTestPlatformDescriptorLoader.addExtension;
-
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.maven.model.Dependency;
-
-public class TestDominatingQuarkusPlatformDescriptor implements QuarkusPlatformDescriptor {
-
-    private final List<Category> categories = new ArrayList<>();
-    private final List<Extension> extensions = new ArrayList<>();
-    private final List<Dependency> bomDeps = new ArrayList<>();
-
-    public TestDominatingQuarkusPlatformDescriptor() {
-
-        addCategory("other", "Other category", categories);
-        addCategory("web", "Dominating Web", categories);
-
-        addExtension("io.quarkus", "quarkus-resteasy", "dominating-version", "Dominating RESTEasy", "dominating/guide",
-                extensions, bomDeps);
-    }
-
-    @Override
-    public String getBomGroupId() {
-        return "dominating.bom.group.id";
-    }
-
-    @Override
-    public String getBomArtifactId() {
-        return "dominating.bom.artifact.id";
-    }
-
-    @Override
-    public String getBomVersion() {
-        return "dominating.bom.version";
-    }
-
-    @Override
-    public String getQuarkusVersion() {
-        return "dominating.quarkus.version";
-    }
-
-    @Override
-    public List<Dependency> getManagedDependencies() {
-        return bomDeps;
-    }
-
-    @Override
-    public List<Extension> getExtensions() {
-        return extensions;
-    }
-
-    @Override
-    public List<Category> getCategories() {
-        return categories;
-    }
-
-    @Override
-    public String getTemplate(String name) {
-        if ("templates/basic-rest/java/pom.xml-template.ftl".equals(name)) {
-            return "dominating pom.xml template";
-        }
-        return null;
-    }
-
-    @Override
-    public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-        return null;
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/loader/QuarkusTestPlatformDescriptorLoader.java b/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/loader/QuarkusTestPlatformDescriptorLoader.java
deleted file mode 100644
index fed3b39694e9c..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/test/platform/descriptor/loader/QuarkusTestPlatformDescriptorLoader.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package io.quarkus.test.platform.descriptor.loader;
-
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoaderContext;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Properties;
-import org.apache.maven.model.Dependency;
-
-public class QuarkusTestPlatformDescriptorLoader
-        implements QuarkusPlatformDescriptorLoader<QuarkusPlatformDescriptor, QuarkusPlatformDescriptorLoaderContext> {
-
-    private static final List<Extension> extensions = new ArrayList<>();
-    private static final List<Dependency> bomDeps = new ArrayList<>();
-    private static final Properties quarkusProps;
-
-    private static final String quarkusVersion;
-    private static final List<Category> categories = new ArrayList<>();
-
-    private String groupId = "io.quarkus";
-    private String artifactId = "quarkus-bom";
-    private String version;
-
-    private static void addCategories() {
-        addCategory("web", "Web");
-        addCategory("data", "Data");
-        addCategory("messaging", "Messaging");
-        addCategory("core", "Core");
-        addCategory("reactive", "Reactive");
-        addCategory("cloud", "Cloud");
-    }
-
-    private static void addExtensions() {
-        addExtension("quarkus-agroal", "Agroal");
-        addExtension("quarkus-arc", "Arc");
-        addExtension("quarkus-hibernate-orm-panache", "Hibernate ORM Panache");
-        addExtension("quarkus-hibernate-search-elasticsearch", "Elasticsearch");
-        addExtension("quarkus-hibernate-validator", "Hibernate Validator");
-        addExtension("quarkus-jdbc-postgresql", "JDBC PostreSQL");
-        addExtension("quarkus-jdbc-h2", "JDBC H2");
-        addExtension("quarkus-resteasy", "RESTEasy", "https://quarkus.io/guides/rest-json");
-
-        addExtension("quarkus-smallrye-reactive-messaging", "SmallRye Reactive Messaging");
-        addExtension("quarkus-smallrye-reactive-streams-operators", "SmallRye Reactive Streams Operators");
-        addExtension("quarkus-smallrye-opentracing", "SmallRye Opentracing");
-        addExtension("quarkus-smallrye-metrics", "SmallRye Metrics");
-        addExtension("quarkus-smallrye-reactive-messaging-kafka", "SmallRye Reactive Messaging Kafka");
-        addExtension("quarkus-smallrye-health", "SmallRye Health");
-        addExtension("quarkus-smallrye-openapi", "SmallRye Open API");
-        addExtension("quarkus-smallrye-jwt", "SmallRye JWT");
-        addExtension("quarkus-smallrye-context-propagation", "SmallRye Context Propagation");
-        addExtension("quarkus-smallrye-reactive-type-converters", "SmallRye Reactive Type Converters");
-        addExtension("quarkus-smallrye-reactive-messaging-amqp", "SmallRye Reactive Messaging AMQP");
-        addExtension("quarkus-smallrye-fault-tolerance", "SmallRye Fault Tolerance");
-
-        addExtension("quarkus-vertx", "Vert.X");
-    }
-
-    private static void addExtension(String artifactId, String name) {
-        addExtension(artifactId, name, "url://" + name);
-    }
-
-    private static void addExtension(String artifactId, String name, String guide) {
-        addExtension("io.quarkus", artifactId, quarkusVersion, name, guide);
-    }
-
-    private static void addExtension(String groupId, String artifactId, String version, String name, String guide) {
-        addExtension(groupId, artifactId, version, name, guide, extensions, bomDeps);
-    }
-
-    public static void addExtension(String groupId, String artifactId, String version, String name, String guide,
-            List<Extension> extensions, List<Dependency> bomDeps) {
-        extensions.add(new Extension(groupId, artifactId, version).setName(name).setGuide(guide));
-
-        final Dependency d = new Dependency();
-        d.setGroupId(groupId);
-        d.setArtifactId(artifactId);
-        d.setVersion(version);
-        bomDeps.add(d);
-    }
-
-    private static void addCategory(String id, String name) {
-        addCategory(id, name, categories);
-    }
-
-    public static void addCategory(String id, String name, List<Category> categories) {
-        Category cat = new Category();
-        cat.setId(id);
-        cat.setName(name);
-        categories.add(cat);
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public void setArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    static {
-        try {
-            quarkusProps = loadStaticResource("quarkus.properties", is -> {
-                final Properties props = new Properties();
-                props.load(is);
-                return props;
-            });
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to load quarkus.properties", e);
-        }
-        quarkusVersion = quarkusProps.getProperty("plugin-version");
-        if (quarkusVersion == null) {
-            throw new IllegalStateException("plugin-version property is missing from quarkus.properties");
-        }
-
-        addCategories();
-        addExtensions();
-    }
-
-    @Override
-    public QuarkusPlatformDescriptor load(QuarkusPlatformDescriptorLoaderContext context) {
-        return new QuarkusPlatformDescriptor() {
-
-            @Override
-            public String getBomGroupId() {
-                return groupId;
-            }
-
-            @Override
-            public String getBomArtifactId() {
-                return artifactId;
-            }
-
-            @Override
-            public String getBomVersion() {
-                return Objects.toString(version, quarkusVersion);
-            }
-
-            @Override
-            public String getQuarkusVersion() {
-                return Objects.toString(version, quarkusVersion);
-            }
-
-            @Override
-            public List<Dependency> getManagedDependencies() {
-                return bomDeps;
-            }
-
-            @Override
-            public List<Extension> getExtensions() {
-                return extensions;
-            }
-
-            @Override
-            public String getTemplate(String name) {
-                try {
-                    return loadResource(name, is -> {
-                        final StringWriter writer = new StringWriter();
-                        try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
-                                BufferedWriter bw = new BufferedWriter(writer)) {
-                            String line;
-                            while ((line = reader.readLine()) != null) {
-                                bw.write(line);
-                                bw.newLine();
-                            }
-                        }
-                        return writer.getBuffer().toString();
-                    });
-                } catch (IOException e) {
-                    throw new IllegalStateException("Failed to load resource " + name, e);
-                }
-            }
-
-            @Override
-            public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-                return loadStaticResource(name, consumer);
-            }
-
-            @Override
-            public List<Category> getCategories() {
-                return categories;
-            }
-        };
-    }
-
-    private static <T> T loadStaticResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-        final InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
-        if (is == null) {
-            throw new IOException("Failed to locate resource " + name + " on the classpath");
-        }
-        try {
-            return consumer.consume(is);
-        } finally {
-            is.close();
-        }
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/META-INF/services/io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader b/independent-projects/tools/devtools-common/src/test/resources/META-INF/services/io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader
deleted file mode 100644
index d891464c6f8e9..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/META-INF/services/io.quarkus.platform.descriptor.loader.QuarkusPlatformDescriptorLoader
+++ /dev/null
@@ -1 +0,0 @@
-io.quarkus.test.platform.descriptor.loader.QuarkusTestPlatformDescriptorLoader
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/dir/some-file.template b/independent-projects/tools/devtools-common/src/test/resources/dir/some-file.template
new file mode 100644
index 0000000000000..93d00322a11cc
--- /dev/null
+++ b/independent-projects/tools/devtools-common/src/test/resources/dir/some-file.template
@@ -0,0 +1,3 @@
+Humble smack Shirelings tears baby usurper mouthful. Embrace fresh burned oil Wargs regurgitation unheard-of. Brandybucks puppet vines boats familiar prizewinners tunnel leaving riverbank welcome threw 60? Durin's certain washing crawled children? Pouf Dwarvish elected fruity writing. Laughing reserves hinges Barad-dur either troublemakers saw pleased thereof set weren't penny. Hear my voice. Come back to the light. Slight keyhole strong Shirkers 3434 promised?
+Water pointy-ear Saruman notion deceived go outer river salted unpredictable slowed. Galadriel strawberries scum surety bolted suffer delaying him lidless achieving killing. I have no memory of this place. Arguing Lake-men scale pon tree falling. Slugs when presses wasteland cousin sing pool Éomund. Resown how shaft wheeled checked dream later Rohan's ago. Famished accustomed you'd Rohan save thicket better plan knife-work becoming ten. Swim solid Ere? Opened clothes filleting devilry struck incident Southrons.
+Dancing there wet since sooner contract granny Dunharrow father bless. Easy pipe-weed sweeter talks Kili? Fried raw perfected Dimholt together taught toad child. Avenged cheated fill sigh choking deep biding drown Rabble-rousers very. Smirking adventure exchanged bodyguard Dî courteous. Tries fact merchants Wargs badly. All right, then. Keep your secrets. Fours craft new announce faint Dale beside relic advantage travel cook long-forgotten? Short entire weapons knows Westfold ordered birdsong mustn't? Trousers glory consequence possible poured claim Baggins leg telling squeal.
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/registry/registry.json b/independent-projects/tools/devtools-common/src/test/resources/registry/registry.json
deleted file mode 100644
index 0ce8d67c77a05..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/registry/registry.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-  "core-versions": {
-    "1.5.1.Final": {},
-    "1.4.2.Final": {},
-    "1.3.4.Final": {}
-  },
-  "extensions" : [
-    {
-      "group-id":"io.quarkus",
-      "artifact-id":"quarkus-resteasy",
-      "name":"RESTEasy JAX-RS",
-      "description":"REST endpoint framework implementing JAX-RS and more",
-      "metadata":{
-        "short-name":"jax-rs",
-        "keywords":[
-          "resteasy",
-          "jaxrs",
-          "web",
-          "rest"
-        ],
-        "guide":"https://quarkus.io/guides/rest-json",
-        "categories":[
-          "web"
-        ],
-        "status":"stable"
-      },
-      "releases":[
-        {
-          "platforms":[
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-universe-bom",
-              "version":"1.5.1.Final"
-            },
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-bom",
-              "version":"1.5.1.Final"
-            }
-          ],
-          "version":"1.5.1.Final",
-          "quarkus-core":"1.5.1.Final"
-        },
-        {
-          "platforms":[
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-universe-bom",
-              "version":"1.4.2.Final"
-            },
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-bom",
-              "version":"1.4.2.Final"
-            }
-          ],
-          "version":"1.4.2.Final",
-          "quarkus-core":"1.4.2.Final"
-        },
-        {
-          "platforms":[
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-universe-bom",
-              "version":"1.3.4.Final"
-            },
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-bom",
-              "version":"1.3.4.Final"
-            }
-          ],
-          "version":"1.3.4.Final",
-          "quarkus-core":"1.3.4.Final"
-        }
-      ]
-    },
-    {
-      "group-id":"io.quarkus",
-      "artifact-id":"quarkus-resteasy-jackson",
-      "name":"RESTEasy Jackson",
-      "description":"Jackson serialization support for RESTEasy",
-      "metadata":{
-        "keywords":[
-          "resteasy-jackson",
-          "jaxrs-json",
-          "resteasy-json",
-          "resteasy",
-          "jaxrs",
-          "json",
-          "jackson"
-        ],
-        "categories":[
-          "web",
-          "serialization"
-        ],
-        "status":"stable"
-      },
-      "releases":[
-        {
-          "platforms":[
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-universe-bom",
-              "version":"1.5.1.Final"
-            },
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-bom",
-              "version":"1.5.1.Final"
-            }
-          ],
-          "version":"1.5.1.Final",
-          "quarkus-core":"1.5.1.Final"
-        },
-        {
-          "platforms":[
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-universe-bom",
-              "version":"1.4.2.Final"
-            },
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-bom",
-              "version":"1.4.2.Final"
-            }
-          ],
-          "version":"1.4.2.Final",
-          "quarkus-core":"1.4.2.Final"
-        },
-        {
-          "platforms":[
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-universe-bom",
-              "version":"1.3.4.Final"
-            },
-            {
-              "group-id":"io.quarkus",
-              "artifact-id":"quarkus-bom",
-              "version":"1.3.4.Final"
-            }
-          ],
-          "version":"1.3.4.Final",
-          "quarkus-core":"1.3.4.Final"
-        }
-      ]
-    }
-  ],
-  "platforms":[
-    {
-      "group-id":"io.quarkus",
-      "artifact-id":"quarkus-universe-bom",
-      "releases":[
-        {
-          "version":"1.5.1.Final",
-          "quarkus-core":"1.5.1.Final"
-        },
-        {
-          "version":"1.4.2.Final",
-          "quarkus-core":"1.4.2.Final"
-        },
-        {
-          "version":"1.3.4.Final",
-          "quarkus-core":"1.3.4.Final"
-        }
-      ]
-    },
-    {
-      "group-id":"io.quarkus",
-      "artifact-id":"quarkus-bom",
-      "releases":[
-        {
-          "version":"1.5.1.Final",
-          "quarkus-core":"1.5.1.Final"
-        },
-        {
-          "version":"1.4.2.Final",
-          "quarkus-core":"1.4.2.Final"
-        },
-        {
-          "version":"1.3.4.Final",
-          "quarkus-core":"1.3.4.Final"
-        }
-      ]
-    }
-  ],
-  "categories":[
-    {
-      "id":"web",
-      "name":"Web",
-      "description":"Everything you need for REST endpoints, HTTP and web formats like JSON",
-      "metadata":{
-        "pinned":[
-          "io.quarkus:quarkus-resteasy",
-          "io.quarkus:quarkus-resteasy-jackson"
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/registry/repository/extensions/jsf.json b/independent-projects/tools/devtools-common/src/test/resources/registry/repository/extensions/jsf.json
deleted file mode 100644
index 7dedaad1cee99..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/registry/repository/extensions/jsf.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "group-id": "org.apache.myfaces.core.extensions.quarkus",
-  "artifact-id": "myfaces-quarkus-runtime",
-  "releases": [
-    {
-      "version": "2.3-next-M2",
-      "quarkus-core":  "1.3.1.Final"
-    },
-    {
-      "version": "2.3-next-M1",
-      "quarkus-core": "1.1.0.CR1"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/registry/repository/platforms.json b/independent-projects/tools/devtools-common/src/test/resources/registry/repository/platforms.json
deleted file mode 100644
index 7d16491842aa3..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/registry/repository/platforms.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "group-id": "io.quarkus",
-    "artifact-id": "quarkus-universe-bom",
-    "releases": [
-      {
-        "version": "1.5.2.Final"
-      },
-      {
-        "version": "1.3.2.Final"
-      }
-    ]
-  },
-  {
-    "group-id": "io.quarkus",
-    "artifact-id": "quarkus-bom",
-    "artifact-id-json": "quarkus-bom-descriptor-json",
-    "releases": [
-      {
-        "version": "1.6.0.Final"
-      },
-      {
-        "version": "1.5.2.Final"
-      },
-      {
-        "version": "1.3.2.Final"
-      }
-    ]
-  }
-]
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/README.gradle.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/README.gradle.ftl
deleted file mode 100644
index 7c9ddaef5f165..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/README.gradle.ftl
+++ /dev/null
@@ -1,35 +0,0 @@
-# ${project_artifactId} project
-
-This project uses Quarkus, the Supersonic Subatomic Java Framework.
-
-If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ .
-
-## Running the application in dev mode
-
-You can run your application in dev mode that enables live coding using:
-```
-./gradlew quarkusDev
-```
-
-## Packaging and running the application
-
-The application can be packaged using `./gradlew quarkusBuild`.
-It produces the `${project_artifactId}-${project_version}-runner.jar` file in the `build` directory.
-Be aware that it’s not an _über-jar_ as the dependencies are copied into the `build/lib` directory.
-
-The application is now runnable using `java -jar build/${project_artifactId}-${project_version}-runner.jar`.
-
-If you want to build an _über-jar_, just add the `--uber-jar` option to the command line:
-```
-./gradlew quarkusBuild --uber-jar
-```
-
-## Creating a native executable
-
-You can create a native executable using: `./gradlew build -Dquarkus.package.type=native`.
-
-Or, if you don't have GraalVM installed, you can run the native executable build in a container using: `./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true`.
-
-You can then execute your native executable with: `./build/${project_artifactId}-${project_version}-runner`
-
-If you want to learn more about building native executables, please consult https://quarkus.io/guides/gradle-tooling#building-a-native-executable.
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/README.maven.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/README.maven.ftl
deleted file mode 100644
index 286dfb6c27485..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/README.maven.ftl
+++ /dev/null
@@ -1,30 +0,0 @@
-# ${project_artifactId} project
-
-This project uses Quarkus, the Supersonic Subatomic Java Framework.
-
-If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ .
-
-## Running the application in dev mode
-
-You can run your application in dev mode that enables live coding using:
-```
-./mvnw quarkus:dev
-```
-
-## Packaging and running the application
-
-The application can be packaged using `./mvnw package`.
-It produces the `${project_artifactId}-${project_version}-runner.jar` file in the `/target` directory.
-Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
-
-The application is now runnable using `java -jar target/${project_artifactId}-${project_version}-runner.jar`.
-
-## Creating a native executable
-
-You can create a native executable using: `./mvnw package -Pnative`.
-
-Or, if you don't have GraalVM installed, you can run the native executable build in a container using: `./mvnw package -Pnative -Dquarkus.native.container-build=true`.
-
-You can then execute your native executable with: `./target/${project_artifactId}-${project_version}-runner`
-
-If you want to learn more about building native executables, please consult https://quarkus.io/guides/building-native-image.
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/build.gradle-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/build.gradle-template.ftl
deleted file mode 100644
index b0ca2b031be0b..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/build.gradle-template.ftl
+++ /dev/null
@@ -1,35 +0,0 @@
-plugins {
-    id 'java'
-    id 'io.quarkus'
-}
-
-repositories {
-     mavenLocal()
-     mavenCentral()${maven_repositories}
-}
-
-dependencies {
-    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
-}
-
-group '${project_groupId}'
-version '${project_version}'
-
-compileJava {
-    options.encoding = 'UTF-8'
-    options.compilerArgs << '-parameters'
-}
-
-compileTestJava {
-    options.encoding = 'UTF-8'
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/gradle.properties-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/gradle.properties-template.ftl
deleted file mode 100644
index 94a82c13ff3a2..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/gradle.properties-template.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-quarkusPlatformGroupId = ${bom_groupId}
-quarkusPlatformArtifactId = ${bom_artifactId}
-quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/native-test-resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/native-test-resource-template.ftl
deleted file mode 100644
index 3e798bfaa4cc5..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/native-test-resource-template.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-package ${package_name};
-
-import io.quarkus.test.junit.NativeImageTest;
-
-@NativeImageTest
-public class Native${class_name}IT extends ${class_name}Test {
-
-    // Execute the same tests but in native mode.
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/pom.xml-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/pom.xml-template.ftl
deleted file mode 100644
index b82146a023918..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/pom.xml-template.ftl
+++ /dev/null
@@ -1,130 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${project_groupId}</groupId>
-    <artifactId>${project_artifactId}</artifactId>
-    <version>${project_version}</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-
-        <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
-        <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
-        <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
-        <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
-    </properties>
-    ${maven_repositories}${maven_plugin_repositories}
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>${quarkus.platform.artifact-id}</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- Quarkus build plugin - also provides the quarkus:dev live-reload feature -->
-            <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
-                <version>${quarkus-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>prepare</goal>
-                            <goal>prepare-tests</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-            </plugin>
-            <!-- Run the tests in JVM mode -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!-- Use this profile to build a native executable using GraalVM -->
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-            <build>
-                <plugins>
-                    <!-- Run the tests with the native executable -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                        <maven.home>${maven.home}</maven.home>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/resource-template.ftl
deleted file mode 100644
index 81b6be5b2e069..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/resource-template.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-package ${package_name};
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-@Path("${path}")
-public class ${class_name} {
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public String hello() {
-        return "hello";
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/settings.gradle-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/settings.gradle-template.ftl
deleted file mode 100644
index 6687873c9483b..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/settings.gradle-template.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()${maven_plugin_repositories}
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    plugins {
-      id 'io.quarkus' version "${quarkusPluginVersion}"
-    }
-}
-rootProject.name='${project_artifactId}'
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/spring-controller-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/spring-controller-template.ftl
deleted file mode 100644
index cc291567c9026..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/spring-controller-template.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-package ${package_name};
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping("${path}")
-public class ${class_name} {
-
-    @GetMapping
-    public String hello() {
-        return "hello";
-    }
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/test-resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/test-resource-template.ftl
deleted file mode 100644
index d1b78cbd0e87d..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/java/test-resource-template.ftl
+++ /dev/null
@@ -1,21 +0,0 @@
-package ${package_name};
-
-import io.quarkus.test.junit.QuarkusTest;
-import org.junit.jupiter.api.Test;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.is;
-
-@QuarkusTest
-public class ${class_name}Test {
-
-    @Test
-    public void testHelloEndpoint() {
-        given()
-          .when().get("${path}")
-          .then()
-             .statusCode(200)
-             .body(is("hello"));
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
deleted file mode 100644
index f1cec0a5afe2d..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
+++ /dev/null
@@ -1,50 +0,0 @@
-plugins {
-    id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}"
-    id "org.jetbrains.kotlin.plugin.allopen" version "${kotlin_version}"
-    id 'io.quarkus'
-}
-
-repositories {
-     mavenLocal()
-     mavenCentral()${maven_repositories}
-}
-
-dependencies {
-    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    implementation 'io.quarkus:quarkus-resteasy'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:kotlin-extensions'
-}
-
-group '${project_groupId}'
-version '${project_version}'
-
-quarkus {
-    setOutputDirectory("$projectDir/build/classes/kotlin/main")
-}
-
-quarkusDev {
-    setSourceDir("$projectDir/src/main/kotlin")
-}
-
-allOpen {
-    annotation("javax.ws.rs.Path")
-    annotation("javax.enterprise.context.ApplicationScoped")
-    annotation("io.quarkus.test.junit.QuarkusTest")
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-    kotlinOptions.javaParameters = true
-}
-
-compileTestKotlin {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl
deleted file mode 100644
index 94a82c13ff3a2..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/gradle.properties-template.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-quarkusPlatformGroupId = ${bom_groupId}
-quarkusPlatformArtifactId = ${bom_artifactId}
-quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl
deleted file mode 100644
index bea133eec2aaa..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/native-test-resource-template.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-package ${package_name}
-
-import io.quarkus.test.junit.NativeImageTest
-
-@NativeImageTest
-class Native${class_name}IT : ${class_name}Test()
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
deleted file mode 100644
index 1e9816b38147e..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/pom.xml-template.ftl
+++ /dev/null
@@ -1,174 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${project_groupId}</groupId>
-    <artifactId>${project_artifactId}</artifactId>
-    <version>${project_version}</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-
-        <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
-        <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
-        <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
-        <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
-        <kotlin.version>${kotlin_version}</kotlin.version>
-    </properties>
-    ${maven_repositories}${maven_plugin_repositories}
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>${quarkus.platform.artifact-id}</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-        </dependency>
-
-        <!-- Test extensions -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>kotlin-extensions</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <sourceDirectory>src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
-                <version>${quarkus-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <javaParameters>true</javaParameters>
-                    <jvmTarget>1.8</jvmTarget>
-                    <!-- Soon to be replaced by plugin that will pre-configure all necessary annotations -->
-                    <compilerPlugins>
-                        <plugin>all-open</plugin>
-                    </compilerPlugins>
-
-                    <pluginOptions>
-                        <!-- Each annotation is placed on its own line -->
-                        <option>all-open:annotation=javax.ws.rs.Path</option>
-                        <option>all-open:annotation=javax.enterprise.context.ApplicationScoped</option>
-                        <option>all-open:annotation=io.quarkus.test.junit.QuarkusTest</option>
-                    </pluginOptions>
-                </configuration>
-
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-maven-allopen</artifactId>
-                        <version>${kotlin.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                        <maven.home>${maven.home}</maven.home>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/resource-template.ftl
deleted file mode 100644
index f2e69a6a795b6..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/resource-template.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-package ${package_name}
-
-import javax.ws.rs.GET
-import javax.ws.rs.Path
-import javax.ws.rs.Produces
-import javax.ws.rs.core.MediaType
-
-@Path("${path}")
-class ${class_name} {
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    fun hello() = "hello"
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl
deleted file mode 100644
index 6687873c9483b..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/settings.gradle-template.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()${maven_plugin_repositories}
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    plugins {
-      id 'io.quarkus' version "${quarkusPluginVersion}"
-    }
-}
-rootProject.name='${project_artifactId}'
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/spring-controller-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/spring-controller-template.ftl
deleted file mode 100644
index 29bdeabb92bd4..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/spring-controller-template.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-package ${package_name};
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping("${path}")
-class ${class_name} {
-
-    @GetMapping
-    fun hello() = "hello"
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/test-resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/test-resource-template.ftl
deleted file mode 100644
index d31002cc1e273..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/kotlin/test-resource-template.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-package ${package_name}
-
-import io.quarkus.test.junit.QuarkusTest
-import io.restassured.RestAssured.given
-import org.hamcrest.CoreMatchers.`is`
-import org.junit.jupiter.api.Test
-
-@QuarkusTest
-class ${class_name}Test {
-
-    @Test
-    fun testHelloEndpoint() {
-        given()
-          .`when`().get("${path}")
-          .then()
-             .statusCode(200)
-             .body(`is`("hello"))
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/build.gradle-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/build.gradle-template.ftl
deleted file mode 100644
index 73ebc301f419e..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/build.gradle-template.ftl
+++ /dev/null
@@ -1,32 +0,0 @@
-plugins {
-    id 'scala'
-    id 'io.quarkus'
-}
-
-repositories {
-     mavenLocal()
-     mavenCentral()${maven_repositories}
-}
-
-dependencies {
-    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    implementation 'org.scala-lang:scala-library:${scala_version}'
-    implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
-}
-
-group '${project_groupId}'
-version '${project_version}'
-
-compileScala {
-    scalaCompileOptions.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/gradle.properties-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/gradle.properties-template.ftl
deleted file mode 100644
index 94a82c13ff3a2..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/gradle.properties-template.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-quarkusPlatformGroupId = ${bom_groupId}
-quarkusPlatformArtifactId = ${bom_artifactId}
-quarkusPlatformVersion = ${bom_version}
-quarkusPluginVersion = ${plugin_version}
\ No newline at end of file
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/native-test-resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/native-test-resource-template.ftl
deleted file mode 100644
index ee89a757a96a7..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/native-test-resource-template.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-package ${package_name}
-
-import io.quarkus.test.junit.NativeImageTest
-
-@NativeImageTest
-class Native${class_name}IT extends ${class_name}Test
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/pom.xml-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/pom.xml-template.ftl
deleted file mode 100644
index 26faada923b7e..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/pom.xml-template.ftl
+++ /dev/null
@@ -1,171 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${project_groupId}</groupId>
-    <artifactId>${project_artifactId}</artifactId>
-    <version>${project_version}</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-
-        <quarkus.platform.artifact-id>${bom_artifactId}</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>${bom_groupId}</quarkus.platform.group-id>
-        <quarkus.platform.version>${bom_version}</quarkus.platform.version>
-        <quarkus-plugin.version>${plugin_version}</quarkus-plugin.version>
-        <compiler-plugin.version>${compiler_plugin_version}</compiler-plugin.version>
-        <surefire-plugin.version>${surefire_plugin_version}</surefire-plugin.version>
-        <scala.version>${scala_version}</scala.version>
-        <scala-maven-plugin.version>${scala_plugin_version}</scala-maven-plugin.version>
-    </properties>
-    ${maven_repositories}${maven_plugin_repositories}
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
-                <artifactId>${quarkus.platform.artifact-id}</artifactId>
-                <version>${quarkus.platform.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-reflect</artifactId>
-            <version>${scala.version}</version>
-        </dependency>
-
-        <!-- Test extensions -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <sourceDirectory>src/main/scala</sourceDirectory>
-        <testSourceDirectory>src/test/scala</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>${plugin_groupId}</groupId>
-                <artifactId>${plugin_artifactId}</artifactId>
-                <version>${quarkus-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                        <maven.home>${maven.home}</maven.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <version>${scala-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>scala-compile-first</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>scala-test-compile</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <scalaVersion>${scala.version}</scalaVersion>
-                    <args>
-                        <arg>-deprecation</arg>
-                        <arg>-feature</arg>
-                        <arg>-explaintypes</arg>
-                        <arg>-target:jvm-1.8</arg>
-                        <arg>-Ypartial-unification</arg>
-                    </args>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${surefire-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                                        <maven.home>${maven.home}</maven.home>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/resource-template.ftl
deleted file mode 100644
index 898fcb73fa253..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/resource-template.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-package ${package_name}
-
-import javax.ws.rs.{GET, Path, Produces}
-import javax.ws.rs.core.MediaType
-
-@Path("${path}")
-class ${class_name} {
-
-    @GET
-    @Produces(Array[String](MediaType.TEXT_PLAIN))
-    def hello() = "hello"
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/settings.gradle-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/settings.gradle-template.ftl
deleted file mode 100644
index 6687873c9483b..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/settings.gradle-template.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()${maven_plugin_repositories}
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    plugins {
-      id 'io.quarkus' version "${quarkusPluginVersion}"
-    }
-}
-rootProject.name='${project_artifactId}'
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/spring-controller-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/spring-controller-template.ftl
deleted file mode 100644
index a3623acc15711..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/spring-controller-template.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-package ${package_name};
-
-import org.springframework.web.bind.annotation.{GetMapping, RequestMapping, RestController};
-
-
-@RestController
-@RequestMapping(Array[String]("${path}"))
-class ${class_name} {
-
-    @GetMapping
-    def hello() = "hello"
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/test-resource-template.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/test-resource-template.ftl
deleted file mode 100644
index 11246ffe8584d..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/basic-rest/scala/test-resource-template.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-package ${package_name}
-
-import io.quarkus.test.junit.QuarkusTest
-import io.restassured.RestAssured.given
-import org.hamcrest.CoreMatchers.`is`
-import org.junit.jupiter.api.Test
-
-@QuarkusTest
-class ${class_name}Test {
-
-    @Test
-    def testHelloEndpoint() = {
-        given()
-          .`when`().get("${path}")
-          .then()
-             .statusCode(200)
-             .body(`is`("hello"))
-    }
-
-}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-fast-jar.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-fast-jar.ftl
deleted file mode 100644
index a19bdfe343658..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-fast-jar.ftl
+++ /dev/null
@@ -1,56 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the docker image run:
-#
-# mvn package
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/${project_artifactId}-jvm .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}-jvm
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
-# 
-# Then run the container using : 
-#
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-jvm
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
-
-ARG JAVA_PACKAGE=java-11-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-
-# Install java and the run-java script
-# Also set up permissions for user `1001`
-RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
-    && microdnf update \
-    && microdnf clean all \
-    && mkdir /deployments \
-    && chown 1001 /deployments \
-    && chmod "g+rwX" /deployments \
-    && chown 1001:root /deployments \
-    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
-    && chown 1001 /deployments/run-java.sh \
-    && chmod 540 /deployments/run-java.sh \
-    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
-
-# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-
-COPY ${build_dir}/quarkus-app/lib/* /deployments/lib/
-COPY ${build_dir}/quarkus-app/*.jar /deployments/
-COPY ${build_dir}/quarkus-app/app/* /deployments/app/
-COPY ${build_dir}/quarkus-app/quarkus/* /deployments/quarkus/
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-jvm.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-jvm.ftl
deleted file mode 100644
index c74c433819b05..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-jvm.ftl
+++ /dev/null
@@ -1,54 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
-#
-# Before building the docker image run:
-#
-# mvn package
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/${project_artifactId}-jvm .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}-jvm
-#
-# If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
-# 
-# Then run the container using : 
-#
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-jvm
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
-
-ARG JAVA_PACKAGE=java-11-openjdk-headless
-ARG RUN_JAVA_VERSION=1.3.8
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-
-# Install java and the run-java script
-# Also set up permissions for user `1001`
-RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
-    && microdnf update \
-    && microdnf clean all \
-    && mkdir /deployments \
-    && chown 1001 /deployments \
-    && chmod "g+rwX" /deployments \
-    && chown 1001:root /deployments \
-    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
-    && chown 1001 /deployments/run-java.sh \
-    && chmod 540 /deployments/run-java.sh \
-    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
-
-# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-
-COPY ${build_dir}/lib/* /deployments/lib/
-COPY ${build_dir}/*-runner.jar /deployments/app.jar
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-native.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-native.ftl
deleted file mode 100644
index 4e3a77944bd67..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerfile-native.ftl
+++ /dev/null
@@ -1,27 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode
-#
-# Before building the docker image run:
-#
-# mvn package -Pnative -Dquarkus.native.container-build=true
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/${project_artifactId} .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId}
-#
-###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root ${build_dir}/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerignore.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/dockerignore.ftl
deleted file mode 100644
index 4d16dfdf3b08c..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/dockerignore.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-*
-!${build_dir}/*-runner
-!${build_dir}/*-runner.jar
-!${build_dir}/lib/*
-!${build_dir}/quarkus-app/*
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/gitignore.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/gitignore.ftl
deleted file mode 100644
index 667fae3d7021e..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/gitignore.ftl
+++ /dev/null
@@ -1,30 +0,0 @@
-# Eclipse
-.project
-.classpath
-.settings/
-bin/
-
-# IntelliJ
-.idea
-*.ipr
-*.iml
-*.iws
-
-# NetBeans
-nb-configuration.xml
-
-# Visual Studio Code
-.vscode
-.factorypath
-
-# OSX
-.DS_Store
-
-# Vim
-*.swp
-*.swo
-
-# patch
-*.orig
-*.rej
-${additional_gitignore_entries}
diff --git a/independent-projects/tools/devtools-common/src/test/resources/templates/index.ftl b/independent-projects/tools/devtools-common/src/test/resources/templates/index.ftl
deleted file mode 100644
index ef51dbc6ab16c..0000000000000
--- a/independent-projects/tools/devtools-common/src/test/resources/templates/index.ftl
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>${project_artifactId} - ${project_version}</title>
-    <style>
-        h1, h2, h3, h4, h5, h6 {
-            margin-bottom: 0.5rem;
-            font-weight: 400;
-            line-height: 1.5;
-        }
-
-        h1 {
-            font-size: 2.5rem;
-        }
-
-        h2 {
-            font-size: 2rem
-        }
-
-        h3 {
-            font-size: 1.75rem
-        }
-
-        h4 {
-            font-size: 1.5rem
-        }
-
-        h5 {
-            font-size: 1.25rem
-        }
-
-        h6 {
-            font-size: 1rem
-        }
-
-        .lead {
-            font-weight: 300;
-            font-size: 2rem;
-        }
-
-        .banner {
-            font-size: 2.7rem;
-            margin: 0;
-            padding: 2rem 1rem;
-            background-color: #00A1E2;
-            color: white;
-        }
-
-        body {
-            margin: 0;
-            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-        }
-
-        code {
-            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-            font-size: 87.5%;
-            color: #e83e8c;
-            word-break: break-word;
-        }
-
-        .left-column {
-            padding: .75rem;
-            max-width: 75%;
-            min-width: 55%;
-        }
-
-        .right-column {
-            padding: .75rem;
-            max-width: 25%;
-        }
-
-        .container {
-            display: flex;
-            width: 100%;
-        }
-
-        li {
-            margin: 0.75rem;
-        }
-
-        .right-section {
-            margin-left: 1rem;
-            padding-left: 0.5rem;
-        }
-
-        .right-section h3 {
-            padding-top: 0;
-            font-weight: 200;
-        }
-
-        .right-section ul {
-            border-left: 0.3rem solid #00A1E2;
-            list-style-type: none;
-            padding-left: 0;
-        }
-
-    </style>
-</head>
-<body>
-
-<div class="banner lead">
-    Your new Cloud-Native application is ready!
-</div>
-
-<div class="container">
-    <div class="left-column">
-        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
-
-        <h2>Why do you see this?</h2>
-
-        <p>This page is served by Quarkus. The source is in
-            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
-
-        <h2>What can I do from here?</h2>
-
-        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
-        </p>
-        <ul>
-            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
-            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
-            <li>Configure your application in <code>src/main/resources/application.properties</code>.
-            </li>
-        </ul>
-
-        <h2>Do you like Quarkus?</h2>
-        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
-
-        <h2>How do I get rid of this page?</h2>
-        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
-    </div>
-    <div class="right-column">
-        <div class="right-section">
-            <h3>Application</h3>
-            <ul>
-                <li>GroupId: ${project_groupId}</li>
-                <li>ArtifactId: ${project_artifactId}</li>
-                <li>Version: ${project_version}</li>
-                <li>Quarkus Version: ${quarkus_version}</li>
-            </ul>
-        </div>
-        <div class="right-section">
-            <h3>Next steps</h3>
-            <ul>
-                <li><a href="${doc_root}/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
-                <li><a href="${doc_root}/guides/getting-started.html" target="_blank">Getting started</a></li>
-                <li><a href="${doc_root}" target="_blank">Quarkus Web Site</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-
-
-</body>
-</html>
diff --git a/independent-projects/tools/devtools-testing/pom.xml b/independent-projects/tools/devtools-testing/pom.xml
new file mode 100644
index 0000000000000..2969166f5c395
--- /dev/null
+++ b/independent-projects/tools/devtools-testing/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-tools-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-devtools-testing</artifactId>
+    <name>Quarkus - Dev tools - Testing</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>compile</scope>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java
new file mode 100644
index 0000000000000..ac037500d5464
--- /dev/null
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/SnapshotTesting.java
@@ -0,0 +1,249 @@
+package io.quarkus.devtools.testing;
+
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import org.apache.commons.io.FileUtils;
+import org.assertj.core.api.AbstractPathAssert;
+import org.assertj.core.api.ListAssert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.TestInfo;
+
+/**
+ * Test file content and directory tree to make sure they are valid by comparing them to their snapshots.
+ * The snapshots can easily be updated when necessary and reviewed to confirm they are consistent with the changes.
+ * <br />
+ * <br />
+ * The snapshots will be created/updated using <code>-Dsnap</code> or
+ * <code>-Dupdate-snapshots</code>
+ * <br />
+ * Snapshots are created in {@link #SNAPSHOTS_DIR}
+ */
+public class SnapshotTesting {
+
+    public static final Path SNAPSHOTS_DIR = Paths.get("src/test/resources/__snapshots__/");
+    public static final String UPDATE_SNAPSHOTS_PROPERTY = "update-snapshots";
+    public static final String UPDATE_SNAPSHOTS_PROPERTY_SHORTCUT = "snap";
+
+    /**
+     * Test file content to make sure it is valid by comparing it to its snapshots.
+     * <br />
+     * The snapshot can easily be updated when necessary and reviewed to confirm it is consistent with the changes.
+     * <br />
+     * <br />
+     * The snapshot will be created/updated using <code>-Dsnap</code> or
+     * <code>-Dupdate-snapshots</code>
+     * <br />
+     * <br />
+     * Even if the content is checked as a whole, it's always better to also manually check that specific content snippets
+     * contains what's expected
+     * <br />
+     * <br />
+     * example:
+     *
+     * <pre>
+     * assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java")
+     *         .satisfies(checkContains("@Path(\"/hello\")"))
+     * </pre>
+     *
+     * @param testInfo the {@link TestInfo} from the {@Link Test} parameter (used to get the current test class & method to
+     *        compute the snapshot location)
+     * @param parentDir the parent directory containing the generated files for this test (makes it nicer when checking multiple
+     *        snapshots)
+     * @param fileRelativePath the relative path from the directory (used to name the snapshot)
+     * @return an {@link AbstractPathAssert} giving a direct way to check specific content snippets contains what's expected
+     * @throws Throwable
+     */
+    public static AbstractPathAssert<?> assertThatMatchSnapshot(TestInfo testInfo, Path parentDir, String fileRelativePath)
+            throws Throwable {
+        final String snapshotDirName = getSnapshotDirName(testInfo);
+        final String normalizedFileName = snapshotDirName + "/" + normalizePathAsName(fileRelativePath);
+        return assertThatMatchSnapshot(parentDir.resolve(fileRelativePath), normalizedFileName);
+    }
+
+    /**
+     * Test file content to make sure it is valid by comparing it to a snapshot.
+     * <br />
+     * The snapshot can easily be updated when necessary and reviewed to confirm it is consistent with the changes.
+     * <br />
+     * <br />
+     * The snapshot will be created/updated using <code>-Dsnap</code> or
+     * <code>-Dupdate-snapshots</code>
+     * <br />
+     * <br />
+     * Even if the content is checked as a whole, it's always better to also manually check that specific content snippets
+     * contains what's expected using {@link #checkContains(String)} or {@link #checkMatches(String)}
+     *
+     * @param fileToCheck the {@link Path} of the file to check
+     * @param snapshotIdentifier the snapshotIdentifier of the snapshot (used as a relative path from the {@link #SNAPSHOTS_DIR}
+     * @return an {@link AbstractPathAssert} giving a direct way to check specific content snippets contains what's expected
+     * @throws Throwable
+     */
+    public static AbstractPathAssert<?> assertThatMatchSnapshot(Path fileToCheck, String snapshotIdentifier) throws Throwable {
+        final Path snapshotFile = SNAPSHOTS_DIR.resolve(snapshotIdentifier);
+        assertThat(fileToCheck).isRegularFile();
+
+        final boolean updateSnapshot = shouldUpdateSnapshot(snapshotIdentifier);
+
+        if (updateSnapshot) {
+            if (Files.isRegularFile(snapshotFile)) {
+                deleteExistingSnapshots(snapshotIdentifier, snapshotFile);
+            }
+            FileUtils.copyFile(fileToCheck.toFile(), snapshotFile.toFile());
+        }
+
+        final String snapshotNotFoundDescription = "corresponding snapshot not found for " + snapshotIdentifier
+                + " (Use -Dsnap to create it automatically)";
+        if (isUTF8File(fileToCheck)) {
+            final String description = "check snapshot for: " + snapshotIdentifier;
+            assertThat(snapshotFile).as(snapshotNotFoundDescription).isRegularFile();
+            assertThat(fileToCheck).as(description).exists().usingCharset(StandardCharsets.UTF_8)
+                    .hasContent(getContent(snapshotFile));
+        } else {
+            final String description = "check binary snapshot for: " + snapshotIdentifier;
+            assertThat(snapshotFile).as(snapshotNotFoundDescription).isRegularFile();
+            assertThat(fileToCheck).as(description).hasBinaryContent(getBinaryContent(snapshotFile));
+        }
+        return assertThat(fileToCheck);
+    }
+
+    /**
+     * Test directory tree to make sure it is valid by comparing it to a snapshot.
+     * <br />
+     * The snapshot can easily be updated when necessary and reviewed to confirm it is consistent with the changes.
+     * <br />
+     * <br />
+     * The snapshot will be created/updated using <code>-Dsnap</code> or
+     * <code>-Dupdate-snapshots</code>
+     *
+     * @param testInfo the {@link TestInfo} from the {@Link Test} parameter (used to get the current test class & method to
+     *        compute the snapshot location)
+     * @param dir the {@link Path} of the directory to test
+     * @return a {@link ListAssert} with the directory tree as a list
+     * @throws Throwable
+     */
+    public static ListAssert<String> assertThatDirectoryTreeMatchSnapshots(TestInfo testInfo, Path dir) throws Throwable {
+        final String snapshotName = getSnapshotDirName(testInfo) + "/dir-tree.snapshot";
+        final Path snapshotFile = SNAPSHOTS_DIR.resolve(snapshotName);
+
+        assertThat(dir).isDirectory();
+
+        final List<String> tree = Files.walk(dir)
+                .map(p -> {
+                    final String r = dir.relativize(p).toString().replace('\\', '/');
+                    if (Files.isDirectory(p)) {
+                        return r + "/";
+                    }
+                    return r;
+                })
+                .collect(toList());
+
+        final boolean updateSnapshot = shouldUpdateSnapshot(snapshotName);
+
+        if (updateSnapshot) {
+            if (Files.isRegularFile(snapshotFile)) {
+                deleteExistingSnapshots(snapshotName, snapshotFile);
+            }
+            Files.createDirectories(snapshotFile.getParent());
+            Files.write(snapshotFile, String.join("\n", tree).getBytes(StandardCharsets.UTF_8));
+        }
+
+        assertThat(snapshotFile)
+                .as("corresponding snapshot not found for " + snapshotName + " (Use -Dsnap to create it automatically)")
+                .isRegularFile();
+
+        final List<String> content = Arrays.stream(getContent(snapshotFile).split("\\v"))
+                .filter(s -> !s.isEmpty())
+                .collect(toList());
+
+        return assertThat(tree).containsExactlyInAnyOrderElementsOf(content);
+    }
+
+    public static byte[] getBinaryContent(Path file) {
+        try {
+            return Files.readAllBytes(file);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read " + file.toString(), e);
+        }
+    }
+
+    public static String getContent(Path file) {
+        try {
+            return new String(Files.readAllBytes(file), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new UncheckedIOException("Unable to read " + file.toString(), e);
+        }
+    }
+
+    public static void deleteTestDirectory(final File file) throws IOException {
+        FileUtils.deleteDirectory(file);
+
+        Assertions.assertFalse(
+                Files.exists(file.toPath()), "Directory still exists");
+    }
+
+    /**
+     * To use with {@link AbstractPathAssert} in order to check the file content contains a specific string.
+     *
+     * @param s the string which should be in the file content
+     * @return a {@link Consumer<Path>} to use with {@link AbstractPathAssert#satisfies(Consumer)}
+     */
+    public static Consumer<Path> checkContains(String s) {
+        return (p) -> assertThat(getContent(p)).contains(s);
+    }
+
+    public static Consumer<Path> checkMatches(String regex) {
+        return (p) -> assertThat(getContent(p)).matches(regex);
+    }
+
+    public static String getSnapshotDirName(TestInfo testInfo) {
+        return testInfo.getTestClass().get().getSimpleName() + "/" + testInfo.getTestMethod().get().getName();
+    }
+
+    public static String normalizePathAsName(String fileRelativePath) {
+        return fileRelativePath.replace("/", "_");
+    }
+
+    private static boolean shouldUpdateSnapshot(String identifier) {
+        return getUpdateSnapshotsProp().filter(u -> u.isEmpty() || "true".equalsIgnoreCase(u) || u.contains(identifier))
+                .isPresent();
+    }
+
+    private static boolean isUTF8File(final Path file) {
+        try {
+            final byte[] inputBytes = Files.readAllBytes(file);
+            final String converted = new String(inputBytes, StandardCharsets.UTF_8);
+            final byte[] outputBytes = converted.getBytes(StandardCharsets.UTF_8);
+            return Arrays.equals(inputBytes, outputBytes);
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    private static void deleteExistingSnapshots(String name, Path snapshots) {
+        System.out.println("\n>>>>>> DELETING EXISTING TEST SNAPSHOTS FOR:\n>>>>>> " + name + "\n");
+        FileUtils.deleteQuietly(snapshots.toFile());
+    }
+
+    static Optional<String> getUpdateSnapshotsProp() {
+        final Optional<String> property = Optional
+                .ofNullable(System.getProperty(UPDATE_SNAPSHOTS_PROPERTY, System.getenv(UPDATE_SNAPSHOTS_PROPERTY)));
+        if (property.isPresent()) {
+            return property;
+        }
+        return Optional.ofNullable(
+                System.getProperty(UPDATE_SNAPSHOTS_PROPERTY_SHORTCUT, System.getenv(UPDATE_SNAPSHOTS_PROPERTY_SHORTCUT)));
+    }
+
+}
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java
new file mode 100644
index 0000000000000..ac3ef5a50e416
--- /dev/null
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/WrapperRunner.java
@@ -0,0 +1,132 @@
+package io.quarkus.devtools.testing;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+public final class WrapperRunner {
+
+    public enum Wrapper {
+        GRADLE("gradlew", "gradlew.bat", new String[] { "--no-daemon", "build", "-i" }),
+        MAVEN("mvnw", "mvnw.cmd", new String[] { "package" });
+
+        private final String execUnix;
+        private final String execWindows;
+        private final String[] cmdArgs;
+
+        Wrapper(String execUnix, String execWindows, String[] cmdArgs) {
+            this.execUnix = execUnix;
+            this.execWindows = execWindows;
+            this.cmdArgs = cmdArgs;
+        }
+
+        public String getExec() {
+            return System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows") ? execWindows : execUnix;
+        }
+
+        public String[] getCmdArgs() {
+            return cmdArgs;
+        }
+
+        public static Wrapper fromBuildtool(String buildtool) {
+            switch (buildtool) {
+                case "maven":
+                    return MAVEN;
+                case "gradle":
+                case "gradle-kotlin-dsl":
+                    return GRADLE;
+                default:
+                    throw new IllegalStateException("No wrapper linked to buildtool: " + buildtool);
+            }
+        }
+    }
+
+    public static int run(Path projectDir, Wrapper wrapper) {
+        List<String> command = new LinkedList<>();
+        command.add(projectDir.resolve(wrapper.getExec()).toAbsolutePath().toString());
+        command.addAll(Arrays.asList(wrapper.getCmdArgs()));
+
+        if (System.getProperties().containsKey("maven.repo.local")) {
+            command.add("-Dmaven.repo.local=" + System.getProperty("maven.repo.local"));
+        }
+
+        try {
+            System.out.println("Running command: " + command);
+            final Process p = new ProcessBuilder()
+                    .directory(projectDir.toFile())
+                    .command(command)
+                    .start();
+            try {
+                streamToSysOutSysErr(p);
+                p.waitFor(10, TimeUnit.MINUTES);
+                return p.exitValue();
+            } catch (InterruptedException e) {
+                p.destroyForcibly();
+                Thread.currentThread().interrupt();
+            }
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+        return -1;
+    }
+
+    private static void streamToSysOutSysErr(final Process process) {
+        streamOutputToSysOut(process);
+        streamErrorToSysErr(process);
+    }
+
+    private static void streamOutputToSysOut(final Process process) {
+        final InputStream processStdOut = process.getInputStream();
+        final Thread t = new Thread(new Streamer(processStdOut, System.out));
+        t.setName("Process stdout streamer");
+        t.setDaemon(true);
+        t.start();
+    }
+
+    private static void streamErrorToSysErr(final Process process) {
+        streamErrorTo(System.err, process);
+    }
+
+    private static void streamErrorTo(final PrintStream printStream, final Process process) {
+        final InputStream processStdErr = process.getErrorStream();
+        final Thread t = new Thread(new Streamer(processStdErr, printStream));
+        t.setName("Process stderr streamer");
+        t.setDaemon(true);
+        t.start();
+    }
+
+    private static final class Streamer implements Runnable {
+
+        private final InputStream processStream;
+        private final PrintStream consumer;
+
+        private Streamer(final InputStream processStream, final PrintStream consumer) {
+            this.processStream = processStream;
+            this.consumer = consumer;
+        }
+
+        @Override
+        public void run() {
+            try (final BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(processStream, StandardCharsets.UTF_8))) {
+                String line = null;
+                while ((line = reader.readLine()) != null) {
+                    consumer.println(line);
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+    }
+
+}
diff --git a/independent-projects/tools/message-writer/pom.xml b/independent-projects/tools/message-writer/pom.xml
new file mode 100644
index 0000000000000..4d33f90355d1c
--- /dev/null
+++ b/independent-projects/tools/message-writer/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <dependencies>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-os</artifactId>
+        </dependency>
+    </dependencies>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-tools-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-devtools-message-writer</artifactId>
+    <name>Quarkus - Dev tools - Message Writer</name>
+
+</project>
\ No newline at end of file
diff --git a/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/DefaultMessageWriter.java b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/DefaultMessageWriter.java
new file mode 100644
index 0000000000000..dc8ed683f3cd7
--- /dev/null
+++ b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/DefaultMessageWriter.java
@@ -0,0 +1,57 @@
+package io.quarkus.devtools.messagewriter;
+
+import static io.quarkus.devtools.messagewriter.MessageIcons.ERROR_ICON;
+import static io.quarkus.devtools.messagewriter.MessageIcons.WARN_ICON;
+
+import java.io.PrintStream;
+
+final class DefaultMessageWriter implements MessageWriter {
+
+    protected final PrintStream out;
+    protected boolean debug;
+
+    DefaultMessageWriter() {
+        this(System.out, false);
+    }
+
+    DefaultMessageWriter(PrintStream out) {
+        this(out, false);
+    }
+
+    DefaultMessageWriter(boolean debug) {
+        this(System.out, debug);
+    }
+
+    DefaultMessageWriter(PrintStream out, boolean debug) {
+        this.out = out;
+        this.debug = debug;
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return debug;
+    }
+
+    @Override
+    public void info(String msg) {
+        out.println(msg);
+    }
+
+    @Override
+    public void error(String msg) {
+        out.println(ERROR_ICON + " " + msg);
+    }
+
+    @Override
+    public void debug(String msg) {
+        if (!isDebugEnabled()) {
+            return;
+        }
+        out.println("[DEBUG] " + msg);
+    }
+
+    @Override
+    public void warn(String msg) {
+        out.println(WARN_ICON + " " + msg);
+    }
+}
diff --git a/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageIcons.java b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageIcons.java
new file mode 100644
index 0000000000000..e6c9f2e4cb563
--- /dev/null
+++ b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageIcons.java
@@ -0,0 +1,25 @@
+package io.quarkus.devtools.messagewriter;
+
+import io.smallrye.common.os.OS;
+
+public enum MessageIcons {
+
+    OK_ICON("\u2705", "[SUCCESS]"),
+    NOK_ICON("\u274c", "[FAILURE]"),
+    NOOP_ICON("\uD83D\uDC4D", ""),
+    WARN_ICON("\uD83D\uDD25", "[WARN]"),
+    ERROR_ICON("\u2757", "[ERROR]");
+
+    private String icon;
+    private String messageCode;
+
+    MessageIcons(String icon, String messageCode) {
+        this.icon = icon;
+        this.messageCode = messageCode;
+    }
+
+    @Override
+    public String toString() {
+        return OS.WINDOWS.isCurrent() ? messageCode : String.format("%s %s", messageCode, icon);
+    }
+}
diff --git a/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java
new file mode 100644
index 0000000000000..a5e8cb8252a35
--- /dev/null
+++ b/independent-projects/tools/message-writer/src/main/java/io/quarkus/devtools/messagewriter/MessageWriter.java
@@ -0,0 +1,51 @@
+package io.quarkus.devtools.messagewriter;
+
+import java.io.PrintStream;
+
+public interface MessageWriter {
+
+    static MessageWriter info() {
+        return new DefaultMessageWriter();
+    }
+
+    static MessageWriter info(PrintStream out) {
+        return new DefaultMessageWriter(out);
+    }
+
+    static MessageWriter debug() {
+        return new DefaultMessageWriter(true);
+    }
+
+    static MessageWriter debug(PrintStream out) {
+        return new DefaultMessageWriter(out, true);
+    }
+
+    default void info(String format, Object... args) {
+        info(String.format(format, args));
+    }
+
+    void info(String msg);
+
+    default void error(String format, Object... args) {
+        error(String.format(format, args));
+    }
+
+    void error(String msg);
+
+    boolean isDebugEnabled();
+
+    default void debug(String format, Object... args) {
+        if (!isDebugEnabled()) {
+            return;
+        }
+        debug(String.format(format, args));
+    }
+
+    void debug(String msg);
+
+    default void warn(String format, Object... args) {
+        warn(String.format(format, args));
+    }
+
+    void warn(String msg);
+}
diff --git a/independent-projects/tools/platform-descriptor-api/pom.xml b/independent-projects/tools/platform-descriptor-api/pom.xml
deleted file mode 100644
index de49dcf170fcb..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-tools-parent</artifactId>
-        <version>999-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>quarkus-platform-descriptor-api</artifactId>
-    <name>Quarkus - Dev tools - Platform Descriptor API</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/Category.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/Category.java
deleted file mode 100644
index 55c5776990005..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/Category.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.quarkus.dependencies;
-
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Objects;
-
-public class Category implements Serializable {
-
-    public static final String MD_PINNED = "pinned";
-
-    String id;
-    String name;
-    String description;
-
-    Map<String, Object> metadata;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Map<String, Object> getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(Map<String, Object> metadata) {
-        this.metadata = metadata;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Category category = (Category) o;
-        return Objects.equals(id, category.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/Extension.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/Extension.java
deleted file mode 100644
index 1c3eda6389a5c..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/Extension.java
+++ /dev/null
@@ -1,294 +0,0 @@
-package io.quarkus.dependencies;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import org.apache.maven.model.Dependency;
-
-/**
- * @author <a href="http://escoffier.me">Clement Escoffier</a>
- * @author <a href="http://kenfinnigan.me">Ken Finnigan</a>
- */
-public class Extension implements Serializable {
-
-    public static final String GROUP_ID = "group-id";
-
-    public static final String ARTIFACT_ID = "artifact-id";
-
-    public static final String VERSION = "version";
-
-    public static final String MD_SHORT_NAME = "short-name";
-
-    public static final String MD_GUIDE = "guide";
-
-    /** Key used for keywords in metadata **/
-    public static String MD_KEYWORDS = "keywords";
-
-    public static final String MD_UNLISTED = "unlisted";
-
-    public static final String MD_STATUS = "status";
-
-    private String artifactId;
-    private String groupId;
-    private String scope;
-    private String version;
-
-    private String type;
-    private String classifier;
-
-    private String name;
-    private String description;
-
-    private String simplifiedArtifactId;
-    private static final transient Pattern QUARKUS_PREFIX = Pattern.compile("^quarkus-");
-
-    private Map<String, Object> metadata = new HashMap<String, Object>(3);
-
-    public Extension() {
-        // Use by mapper.
-    }
-
-    public Extension(String groupId, String artifactId, String version) {
-        this.groupId = groupId;
-        this.setArtifactId(artifactId);
-        this.version = version;
-    }
-
-    public String getArtifactId() {
-        return artifactId;
-    }
-
-    public Extension setArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-        this.simplifiedArtifactId = QUARKUS_PREFIX.matcher(artifactId).replaceFirst("");
-        return this;
-    }
-
-    /** Group Id for the extension artifact */
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public Extension setGroupId(String groupId) {
-        this.groupId = groupId;
-        return this;
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    public Extension setScope(String scope) {
-        this.scope = scope;
-        return this;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public Extension setVersion(String version) {
-        this.version = version;
-        return this;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public Extension setType(String type) {
-        this.type = type;
-        return this;
-    }
-
-    public String getClassifier() {
-        return classifier;
-    }
-
-    public Extension setClassifier(String classifier) {
-        this.classifier = classifier;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Extension setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Extension setDescription(String description) {
-        this.description = description;
-        return this;
-    }
-
-    /**
-     * Semi-Unstructured metadata used to provide metadata to tools and other
-     * frontends.
-     * 
-     */
-    public Map<String, Object> getMetadata() {
-        return metadata;
-    }
-
-    public Extension setMetadata(Map<String, Object> metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    public List<String> getKeywords() {
-        List<String> kw = (List<String>) getMetadata().get(MD_KEYWORDS);
-        return kw == null ? Collections.emptyList() : kw;
-    }
-
-    public Extension setKeywords(String[] keywords) {
-        getMetadata().put(MD_KEYWORDS, Arrays.asList(keywords));
-        return this;
-    }
-
-    /**
-     * List of strings to use for matching.
-     * 
-     * Returns keywords + artifactid all in lowercase.
-     * 
-     * @return list of labels to use for matching.
-     */
-    public List<String> labelsForMatching() {
-        List<String> list = new ArrayList<>();
-        List<String> keywords = getKeywords();
-        if (keywords != null) {
-            list.addAll(keywords.stream().map(String::toLowerCase).collect(Collectors.toList()));
-        }
-        list.add(artifactId.toLowerCase());
-        return list;
-    }
-
-    /**
-     * Convert this Extension into a dependency
-     * 
-     * @param stripVersion if provided version will not be set on the Dependency
-     * @return a Maven {@link Dependency} object
-     */
-    public Dependency toDependency(boolean stripVersion) {
-        Dependency dependency = new Dependency();
-        dependency.setGroupId(groupId);
-        dependency.setArtifactId(artifactId);
-        if (scope != null && !scope.isEmpty()) {
-            dependency.setScope(scope);
-        }
-        if (classifier != null && !classifier.isEmpty()) {
-            dependency.setClassifier(classifier);
-        }
-        if (version != null && !version.isEmpty() && !stripVersion) {
-            dependency.setVersion(version);
-        }
-        if (type != null && !type.isEmpty()) {
-            dependency.setType(type);
-        }
-        return dependency;
-    }
-
-    public String managementKey() {
-        return getGroupId() + ":" + getArtifactId();
-    }
-
-    public String gav() {
-        return managementKey() + ":" + version;
-    }
-
-    public String getSimplifiedArtifactId() {
-        return simplifiedArtifactId;
-    }
-
-    @Override
-    public String toString() {
-        return gav();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Extension extension = (Extension) o;
-        return Objects.equals(artifactId, extension.artifactId) &&
-                Objects.equals(groupId, extension.groupId) &&
-                Objects.equals(version, extension.version);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(artifactId, groupId, version);
-    }
-
-    public Extension setGuide(String guide) {
-        getMetadata().put(MD_GUIDE, guide);
-        return this;
-    }
-
-    /**
-     * 
-     * @return string representing the location of primary guide for this extension.
-     */
-    public String getGuide() {
-        return (String) getMetadata().get(MD_GUIDE);
-    }
-
-    public String getShortName() {
-        String shortName = (String) getMetadata().get(MD_SHORT_NAME);
-        if (shortName == null) {
-            return name;
-        } else {
-            return shortName;
-        }
-    }
-
-    public Extension setShortName(String shortName) {
-        getMetadata().put(MD_SHORT_NAME, shortName);
-        return this;
-    }
-
-    public boolean isUnlisted() {
-        Object val = getMetadata().get(MD_UNLISTED);
-        if (val == null) {
-            return false;
-        } else if (val instanceof Boolean) {
-            return (Boolean) val;
-        } else if (val instanceof String) {
-            return Boolean.parseBoolean((String) val);
-        }
-
-        return false;
-    }
-
-    public void setUnlisted(boolean unlisted) {
-        getMetadata().put(MD_UNLISTED, unlisted);
-    }
-
-    public Extension addMetadata(String key, Object value) {
-        getMetadata().put(key, value);
-        return this;
-
-    }
-
-    public Extension removeMetadata(String key) {
-        getMetadata().remove(key);
-        return this;
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/ExtensionPredicate.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/ExtensionPredicate.java
deleted file mode 100644
index 2937990bf37e5..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/dependencies/ExtensionPredicate.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package io.quarkus.dependencies;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * A {@link Predicate} implementation that will test a keyword against an {@link Extension}
- */
-public class ExtensionPredicate implements Predicate<Extension> {
-
-    private final String q;
-
-    public ExtensionPredicate(String keyword) {
-        this.q = Objects.requireNonNull(keyword, "keyword must not be null").trim().toLowerCase();
-    }
-
-    public static Predicate<Extension> create(String keyword) {
-        return new ExtensionPredicate(keyword);
-    }
-
-    @Override
-    public boolean test(Extension extension) {
-        if (extension.isUnlisted()) {
-            return false;
-        }
-
-        String extensionName = Objects.toString(extension.getName(), "");
-        String shortName = Objects.toString(extension.getShortName(), "");
-
-        // Try exact matches
-        if (isExactMatch(extension)) {
-            return true;
-        }
-        // Try short names
-        if (matchesShortName(extension, q)) {
-            return true;
-        }
-        // Partial matches on name, artifactId and short names
-        if (extensionName.toLowerCase().contains(q)
-                || extension.getArtifactId().toLowerCase().contains(q)
-                || shortName.toLowerCase().contains(q)) {
-            return true;
-        }
-        // find by labels
-        if (extension.labelsForMatching().contains(q)) {
-            return true;
-        }
-        // find by pattern
-        Pattern pattern = toRegex(q);
-        return pattern != null && (pattern.matcher(extensionName.toLowerCase()).matches()
-                || pattern.matcher(extension.getArtifactId().toLowerCase()).matches()
-                || pattern.matcher(shortName.toLowerCase()).matches()
-                || matchLabels(pattern, extension.getKeywords()));
-    }
-
-    public boolean isExactMatch(Extension extension) {
-        String extensionName = Objects.toString(extension.getName(), "");
-        // Try exact matches
-        if (extensionName.equalsIgnoreCase(q) ||
-                matchesArtifactId(extension.getArtifactId(), q)) {
-            return true;
-        }
-        return false;
-    }
-
-    private static boolean matchesShortName(Extension extension, String q) {
-        return q.equalsIgnoreCase(extension.getShortName());
-    }
-
-    private static boolean matchesArtifactId(String artifactId, String q) {
-        return artifactId.equalsIgnoreCase(q) ||
-                artifactId.equalsIgnoreCase("quarkus-" + q);
-    }
-
-    private static boolean matchLabels(Pattern pattern, List<String> labels) {
-        boolean matches = false;
-        // if any label match it's ok
-        for (String label : labels) {
-            matches = matches || pattern.matcher(label.toLowerCase()).matches();
-        }
-        return matches;
-    }
-
-    private static Pattern toRegex(final String str) {
-        try {
-            String wildcardToRegex = wildcardToRegex(str);
-            if (wildcardToRegex != null && !wildcardToRegex.isEmpty()) {
-                return Pattern.compile(wildcardToRegex, Pattern.CASE_INSENSITIVE);
-            }
-        } catch (PatternSyntaxException e) {
-            //ignore it
-        }
-        return null;
-    }
-
-    private static String wildcardToRegex(String wildcard) {
-        if (wildcard == null || wildcard.isEmpty()) {
-            return null;
-        }
-        // don't try with file match char in pattern
-        if (!(wildcard.contains("*") || wildcard.contains("?"))) {
-            return null;
-        }
-        StringBuilder s = new StringBuilder(wildcard.length());
-        s.append("^.*");
-        for (int i = 0, is = wildcard.length(); i < is; i++) {
-            char c = wildcard.charAt(i);
-            switch (c) {
-                case '*':
-                    s.append(".*");
-                    break;
-                case '?':
-                    s.append(".");
-                    break;
-                case '^': // escape character in cmd.exe
-                    s.append("\\");
-                    break;
-                // escape special regexp-characters
-                case '(':
-                case ')':
-                case '[':
-                case ']':
-                case '$':
-                case '.':
-                case '{':
-                case '}':
-                case '|':
-                case '\\':
-                    s.append("\\");
-                    s.append(c);
-                    break;
-                default:
-                    s.append(c);
-                    break;
-            }
-        }
-        s.append(".*$");
-        return (s.toString());
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/CombinedQuarkusPlatformDescriptor.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/CombinedQuarkusPlatformDescriptor.java
deleted file mode 100644
index 55e9f2d8a7bf0..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/CombinedQuarkusPlatformDescriptor.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package io.quarkus.platform.descriptor;
-
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.apache.maven.model.Dependency;
-
-/**
- * Platform descriptor that is composed of multiple platform descriptors.
- * The order in which descriptors are added is significant. Platform descriptor
- * added earlier dominate over those added later.
- */
-public class CombinedQuarkusPlatformDescriptor implements QuarkusPlatformDescriptor {
-
-    public static class Builder {
-
-        private List<QuarkusPlatformDescriptor> platforms = new ArrayList<>();
-
-        private Builder() {
-        }
-
-        /**
-         * Adds a platform descriptor.
-         * The order in which descriptors are added is significant. Platform descriptor
-         * added earlier dominate over those added later.
-         *
-         * @param platform platform descriptor to add
-         * @return this builder instance
-         */
-        public Builder addPlatform(QuarkusPlatformDescriptor platform) {
-            platforms.add(platform);
-            return this;
-        }
-
-        public QuarkusPlatformDescriptor build() {
-            return new CombinedQuarkusPlatformDescriptor(this);
-        }
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    private final QuarkusPlatformDescriptor master;
-    private final List<QuarkusPlatformDescriptor> platforms;
-    private List<Dependency> managedDeps;
-    private List<Extension> extensions;
-    private List<Category> categories;
-
-    private CombinedQuarkusPlatformDescriptor(Builder builder) {
-        if (builder.platforms.isEmpty()) {
-            throw new IllegalArgumentException("No platforms to combine");
-        }
-        master = builder.platforms.get(0);
-        platforms = new ArrayList<>(builder.platforms);
-    }
-
-    @Override
-    public String getBomGroupId() {
-        return master.getBomGroupId();
-    }
-
-    @Override
-    public String getBomArtifactId() {
-        return master.getBomArtifactId();
-    }
-
-    @Override
-    public String getBomVersion() {
-        return master.getBomVersion();
-    }
-
-    @Override
-    public String getQuarkusVersion() {
-        return master.getQuarkusVersion();
-    }
-
-    @Override
-    public List<Dependency> getManagedDependencies() {
-        if (managedDeps != null) {
-            return managedDeps;
-        }
-        final List<Dependency> deps = new ArrayList<>();
-        final Set<DepKey> depKeys = new HashSet<>();
-        for (QuarkusPlatformDescriptor platform : platforms) {
-            for (Dependency dep : platform.getManagedDependencies()) {
-                if (depKeys.add(new DepKey(dep))) {
-                    deps.add(dep);
-                }
-            }
-        }
-        return managedDeps = deps;
-    }
-
-    @Override
-    public List<Extension> getExtensions() {
-        if (extensions != null) {
-            return extensions;
-        }
-        final List<Extension> list = new ArrayList<>();
-        final Set<DepKey> depKeys = new HashSet<>();
-        for (QuarkusPlatformDescriptor platform : platforms) {
-            for (Extension ext : platform.getExtensions()) {
-                if (depKeys.add(new DepKey(ext.getGroupId(), ext.getArtifactId()))) {
-                    list.add(ext);
-                }
-            }
-        }
-        return extensions = list;
-    }
-
-    @Override
-    public List<Category> getCategories() {
-        if (categories != null) {
-            return categories;
-        }
-        final List<Category> list = new ArrayList<>();
-        final Set<String> ids = new HashSet<>();
-        for (QuarkusPlatformDescriptor platform : platforms) {
-            for (Category cat : platform.getCategories()) {
-                if (ids.add(cat.getId())) {
-                    list.add(cat);
-                }
-            }
-        }
-        return categories = list;
-    }
-
-    @Override
-    public String getTemplate(String name) {
-        for (QuarkusPlatformDescriptor platform : platforms) {
-            final String template = platform.getTemplate(name);
-            if (template != null) {
-                return template;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-        for (QuarkusPlatformDescriptor platform : platforms) {
-            try {
-                return platform.loadResource(name, consumer);
-            } catch (IOException e) {
-                // ignore
-            }
-        }
-        throw new IOException("Failed to locate resource " + name);
-    }
-
-    private static class DepKey {
-        final String groupId;
-        final String artifactId;
-        final String classifier;
-        final String type;
-
-        DepKey(Dependency dep) {
-            this(dep.getGroupId(), dep.getArtifactId(), dep.getClassifier(), dep.getType());
-        }
-
-        DepKey(String groupId, String artifactId) {
-            this(groupId, artifactId, null, null);
-        }
-
-        DepKey(String groupId, String artifactId, String classifier, String type) {
-            this.groupId = groupId;
-            this.artifactId = artifactId;
-            this.classifier = classifier;
-            this.type = type;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((artifactId == null) ? 0 : artifactId.hashCode());
-            result = prime * result + ((classifier == null) ? 0 : classifier.hashCode());
-            result = prime * result + ((groupId == null) ? 0 : groupId.hashCode());
-            result = prime * result + ((type == null) ? 0 : type.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            DepKey other = (DepKey) obj;
-            if (artifactId == null) {
-                if (other.artifactId != null)
-                    return false;
-            } else if (!artifactId.equals(other.artifactId))
-                return false;
-            if (classifier == null) {
-                if (other.classifier != null)
-                    return false;
-            } else if (!classifier.equals(other.classifier))
-                return false;
-            if (groupId == null) {
-                if (other.groupId != null)
-                    return false;
-            } else if (!groupId.equals(other.groupId))
-                return false;
-            if (type == null) {
-                if (other.type != null)
-                    return false;
-            } else if (!type.equals(other.type))
-                return false;
-            return true;
-        }
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/QuarkusPlatformDescriptor.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/QuarkusPlatformDescriptor.java
deleted file mode 100644
index f13d977975e2b..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/QuarkusPlatformDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.quarkus.platform.descriptor;
-
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import java.io.IOException;
-import java.util.List;
-import org.apache.maven.model.Dependency;
-
-public interface QuarkusPlatformDescriptor {
-
-    String getBomGroupId();
-
-    String getBomArtifactId();
-
-    String getBomVersion();
-
-    String getQuarkusVersion();
-
-    List<Dependency> getManagedDependencies();
-
-    List<Extension> getExtensions();
-
-    List<Category> getCategories();
-
-    String getTemplate(String name);
-
-    <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException;
-
-    default String gav() {
-        return String.format("%s:%s:%s", getBomGroupId(), getBomArtifactId(), getBomVersion());
-    }
-
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/loader/QuarkusPlatformDescriptorLoader.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/loader/QuarkusPlatformDescriptorLoader.java
deleted file mode 100644
index 371085940126f..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/loader/QuarkusPlatformDescriptorLoader.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.platform.descriptor.loader;
-
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-
-public interface QuarkusPlatformDescriptorLoader<D extends QuarkusPlatformDescriptor, C extends QuarkusPlatformDescriptorLoaderContext> {
-
-    D load(C context);
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/loader/QuarkusPlatformDescriptorLoaderContext.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/loader/QuarkusPlatformDescriptorLoaderContext.java
deleted file mode 100644
index f532409d93240..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/descriptor/loader/QuarkusPlatformDescriptorLoaderContext.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.platform.descriptor.loader;
-
-import io.quarkus.platform.tools.MessageWriter;
-
-public interface QuarkusPlatformDescriptorLoaderContext {
-
-    MessageWriter getMessageWriter();
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/ConsoleMessageFormats.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/ConsoleMessageFormats.java
deleted file mode 100644
index fe652ced37088..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/ConsoleMessageFormats.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.quarkus.platform.tools;
-
-public final class ConsoleMessageFormats {
-
-    private static final String OK = "\u2705 ";
-    private static final String NOK = "\u274c ";
-    private static final String NOOP = "\uD83D\uDC4D ";
-
-    private ConsoleMessageFormats() {
-    }
-
-    public static String nok(String content) {
-        return NOK + content;
-    }
-
-    public static String ok(String content) {
-        return OK + content;
-    }
-
-    public static String noop(String content) {
-        return NOOP + content;
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/DefaultMessageWriter.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/DefaultMessageWriter.java
deleted file mode 100644
index 227b48707ba0b..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/DefaultMessageWriter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.quarkus.platform.tools;
-
-import java.io.PrintStream;
-
-public class DefaultMessageWriter implements MessageWriter {
-
-    protected final PrintStream out;
-    protected boolean debug;
-
-    public DefaultMessageWriter() {
-        this(System.out);
-    }
-
-    public DefaultMessageWriter(PrintStream out) {
-        this.out = out;
-    }
-
-    public DefaultMessageWriter setDebugEnabled(boolean debugEnabled) {
-        this.debug = debugEnabled;
-        return this;
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return debug;
-    }
-
-    @Override
-    public void info(String msg) {
-        out.println(msg);
-    }
-
-    @Override
-    public void error(String msg) {
-        out.println(msg);
-    }
-
-    @Override
-    public void debug(String msg) {
-        if (!isDebugEnabled()) {
-            return;
-        }
-        out.println("DEBUG: " + msg);
-    }
-
-    @Override
-    public void warn(String msg) {
-        out.println("WARN: " + msg);
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/MessageWriter.java b/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/MessageWriter.java
deleted file mode 100644
index 21e133f70bd98..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/main/java/io/quarkus/platform/tools/MessageWriter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.quarkus.platform.tools;
-
-public interface MessageWriter {
-
-    default void info(String format, Object... args) {
-        info(String.format(format, args));
-    }
-
-    void info(String msg);
-
-    default void error(String format, Object... args) {
-        error(String.format(format, args));
-    }
-
-    void error(String msg);
-
-    boolean isDebugEnabled();
-
-    default void debug(String format, Object... args) {
-        if (!isDebugEnabled()) {
-            return;
-        }
-        debug(String.format(format, args));
-    }
-
-    void debug(String msg);
-
-    default void warn(String format, Object... args) {
-        warn(String.format(format, args));
-    }
-
-    void warn(String msg);
-}
diff --git a/independent-projects/tools/platform-descriptor-api/src/test/java/io/quarkus/dependencies/ExtensionPredicateTest.java b/independent-projects/tools/platform-descriptor-api/src/test/java/io/quarkus/dependencies/ExtensionPredicateTest.java
deleted file mode 100644
index 7f9e27f90d6c0..0000000000000
--- a/independent-projects/tools/platform-descriptor-api/src/test/java/io/quarkus/dependencies/ExtensionPredicateTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.quarkus.dependencies;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-
-class ExtensionPredicateTest {
-
-    @Test
-    void rejectUnlisted() {
-        ExtensionPredicate predicate = new ExtensionPredicate("foo");
-        Extension extension = new Extension("g", "a", "v");
-        extension.setUnlisted(true);
-        assertThat(predicate).rejects(extension);
-    }
-
-    @Test
-    void acceptKeywordInArtifactId() {
-        ExtensionPredicate predicate = new ExtensionPredicate("foo");
-        Extension extension = new Extension("g", "foo-bar", "1.0");
-        assertThat(predicate).accepts(extension);
-    }
-
-    @Test
-    void acceptKeywordInLabel() {
-        ExtensionPredicate predicate = new ExtensionPredicate("foo");
-        Extension extension = new Extension("g", "a", "1.0");
-        extension.setKeywords(new String[] { "foo", "bar" });
-        assertThat(predicate).accepts(extension);
-    }
-
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/pom.xml b/independent-projects/tools/platform-descriptor-resolver-json/pom.xml
deleted file mode 100644
index a26ec9dc69d9b..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-tools-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
-    <name>Quarkus - Dev tools - Platform JSON descriptor resolver</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.eclipsesource.minimal-json</groupId>
-            <artifactId>minimal-json</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devtools-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/PlatformDescriptorLoadingException.java b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/PlatformDescriptorLoadingException.java
deleted file mode 100644
index f661ccdca9e18..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/PlatformDescriptorLoadingException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.quarkus.platform.descriptor.resolver.json;
-
-import java.lang.Exception;
-
-public class PlatformDescriptorLoadingException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public PlatformDescriptorLoadingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PlatformDescriptorLoadingException(String message) {
-        super(message);
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java
deleted file mode 100644
index 75ea6527ce5ef..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/QuarkusJsonPlatformDescriptorResolver.java
+++ /dev/null
@@ -1,725 +0,0 @@
-package io.quarkus.platform.descriptor.resolver.json;
-
-import static io.quarkus.platform.tools.ToolsUtils.getProperty;
-
-import com.eclipsesource.json.Json;
-import com.eclipsesource.json.JsonObject;
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.resolver.AppModelResolver;
-import io.quarkus.bootstrap.resolver.AppModelResolverException;
-import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver;
-import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
-import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils;
-import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.loader.json.ArtifactResolver;
-import io.quarkus.platform.descriptor.loader.json.ClassPathResourceLoader;
-import io.quarkus.platform.descriptor.loader.json.DirectoryResourceLoader;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoaderContext;
-import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
-import io.quarkus.platform.descriptor.loader.json.ZipResourceLoader;
-import io.quarkus.platform.tools.DefaultMessageWriter;
-import io.quarkus.platform.tools.MessageWriter;
-import io.quarkus.platform.tools.ToolsConstants;
-import io.quarkus.platform.tools.ToolsUtils;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.ServiceLoader;
-import java.util.function.Function;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
-
-/**
- * Helps resolve the specific or the latest available version of a JSON platform descriptor.
- */
-public class QuarkusJsonPlatformDescriptorResolver {
-
-    private static final String BUNDLED_QUARKUS_BOM_PATH = "quarkus-bom/pom.xml";
-    private static final String BUNDLED_QUARKUS_PROPERTIES_PATH = "quarkus.properties";
-    private static final String BUNDLED_EXTENSIONS_JSON_PATH = "quarkus-bom-descriptor/extensions.json";
-
-    private static final String QUARKUS_PLATFORM_DESCRIPTOR_JSON = "quarkus-platform-descriptor-json";
-
-    private static final String DEFAULT_QUARKUS_PLATFORM_VERSION_RANGE = "[1.0.0.CR2,2)";
-    private static final String DEFAULT_NON_QUARKUS_VERSION_RANGE = "[0,)";
-
-    public static final String PROP_PLATFORM_JSON_GROUP_ID = "quarkus.platform.json.groupId";
-    public static final String PROP_PLATFORM_JSON_ARTIFACT_ID = "quarkus.platform.json.artifactId";
-    public static final String PROP_PLATFORM_JSON_VERSION = "quarkus.platform.json.version";
-    public static final String PROP_PLATFORM_JSON_VERSION_RANGE = "quarkus.platform.json.version-range";
-
-    public static QuarkusJsonPlatformDescriptorResolver newInstance() {
-        return new QuarkusJsonPlatformDescriptorResolver();
-    }
-
-    private static String getDefaultVersionRange(String groupId, String artifactId) {
-        return ToolsConstants.IO_QUARKUS.equals(groupId)
-                && ("quarkus-bom".equals(artifactId)
-                        || "quarkus-bom-descriptor".equals(artifactId)
-                        || "quarkus-universe-bom".equals(artifactId))
-                                ? DEFAULT_QUARKUS_PLATFORM_VERSION_RANGE
-                                : DEFAULT_NON_QUARKUS_VERSION_RANGE;
-    }
-
-    private String jsonGroupId;
-    private String jsonArtifactId;
-    private String jsonVersion;
-    private String jsonVersionRange;
-
-    private Path jsonDescriptor;
-
-    private String bomGroupId;
-    private String bomArtifactId;
-    private String bomVersion;
-    private String bomVersionRange;
-
-    private AppModelResolver artifactResolver;
-    private MessageWriter log;
-
-    public QuarkusJsonPlatformDescriptorResolver() {
-    }
-
-    public QuarkusPlatformDescriptor resolveFromJson(String groupId, String artifactId, String version) {
-        this.jsonGroupId = groupId;
-        this.jsonArtifactId = artifactId;
-        this.jsonVersion = version;
-        return resolve();
-    }
-
-    public QuarkusPlatformDescriptor resolveLatestFromJson(String groupId, String artifactId, String versionRange) {
-        this.jsonGroupId = groupId;
-        this.jsonArtifactId = artifactId;
-        this.jsonVersionRange = versionRange;
-        return resolve();
-    }
-
-    public QuarkusPlatformDescriptor resolveFromJsonArtifactId(String artifactId) {
-        this.jsonArtifactId = artifactId;
-        return resolve();
-    }
-
-    public QuarkusPlatformDescriptor resolveFromJson(Path jsonDescriptor) {
-        this.jsonDescriptor = jsonDescriptor;
-        return resolve();
-    }
-
-    public QuarkusPlatformDescriptor resolveFromBom(String groupId, String artifactId, String version) {
-        this.bomGroupId = groupId;
-        this.bomArtifactId = artifactId;
-        this.bomVersion = version;
-        return resolve();
-    }
-
-    public QuarkusPlatformDescriptor resolveLatestFromBom(String groupId, String artifactId, String versionRange) {
-        this.bomGroupId = groupId;
-        this.bomArtifactId = artifactId;
-        this.bomVersionRange = versionRange;
-        return resolve();
-    }
-
-    public QuarkusJsonPlatformDescriptorResolver setArtifactResolver(AppModelResolver artifactResolver) {
-        this.artifactResolver = artifactResolver;
-        return this;
-    }
-
-    public QuarkusJsonPlatformDescriptorResolver setMessageWriter(MessageWriter msgWriter) {
-        this.log = msgWriter;
-        return this;
-    }
-
-    public QuarkusPlatformDescriptor resolve() {
-
-        ensureLoggerInitialized();
-
-        AppModelResolver artifactResolver = this.artifactResolver;
-        if (artifactResolver == null) {
-            try {
-                artifactResolver = new BootstrapAppModelResolver(MavenArtifactResolver.builder().build());
-            } catch (Exception e) {
-                throw new IllegalStateException("Failed to initialize the Maven artifact resolver", e);
-            }
-        }
-
-        try {
-            if (jsonDescriptor != null) {
-                return loadFromFile(artifactResolver, jsonDescriptor);
-            }
-            return resolveJsonDescriptor(artifactResolver);
-        } catch (VersionNotAvailableException | PlatformDescriptorLoadingException e) {
-            throw new IllegalStateException("Failed to load Quarkus platform descriptor", e);
-        }
-    }
-
-    public QuarkusPlatformDescriptor resolveBundled() {
-        ensureLoggerInitialized();
-        final Model bundledBom = loadBundledPom();
-        if (bundledBom == null) {
-            throw new IllegalStateException("Failed to locate bundled Quarkus platform BOM on the classpath");
-        }
-        try {
-            return loadFromBomCoords(null, getGroupId(bundledBom), getArtifactId(bundledBom), getVersion(bundledBom),
-                    bundledBom);
-        } catch (Exception e) {
-            throw new IllegalStateException("Failed to load bundled Quarkus platform", e);
-        }
-    }
-
-    private void ensureLoggerInitialized() {
-        if (log == null) {
-            log = new DefaultMessageWriter();
-        }
-    }
-
-    private QuarkusPlatformDescriptor loadFromFile(AppModelResolver artifactResolver, Path jsonFile)
-            throws PlatformDescriptorLoadingException, VersionNotAvailableException {
-        log.debug("Loading Quarkus platform descriptor from %s", jsonFile);
-        if (!Files.exists(jsonFile)) {
-            throw new IllegalArgumentException("Failed to locate extensions JSON file at " + jsonFile);
-        }
-
-        // Resolve the Quarkus version used by the platform
-        final String quarkusCoreVersion;
-        try (BufferedReader reader = Files.newBufferedReader(jsonFile)) {
-            final JsonObject jsonObject = Json.parse(reader).asObject();
-            quarkusCoreVersion = jsonObject.getString("quarkus-core-version", null);
-            if (quarkusCoreVersion == null) {
-                throw new IllegalStateException("Failed to determine the Quarkus Core version for " + jsonFile);
-            }
-        } catch (RuntimeException | IOException e) {
-            throw new PlatformDescriptorLoadingException("Failed to parse extensions JSON file " + jsonFile, e);
-        }
-        log.debug("Loaded Quarkus platform is based on Quarkus %s", quarkusCoreVersion);
-
-        try (InputStream is = Files.newInputStream(jsonFile)) {
-            return loadPlatformDescriptor(toLoaderResolver(artifactResolver), is, quarkusCoreVersion);
-        } catch (VersionNotAvailableException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new PlatformDescriptorLoadingException("Failed to load Quarkus platform descriptor from " + jsonFile, e);
-        }
-    }
-
-    private QuarkusPlatformDescriptor resolveJsonDescriptor(AppModelResolver artifactResolver)
-            throws PlatformDescriptorLoadingException {
-        if (!ToolsUtils.isNullOrEmpty(bomGroupId) || !ToolsUtils.isNullOrEmpty(bomArtifactId)
-                || !ToolsUtils.isNullOrEmpty(bomVersion) || !ToolsUtils.isNullOrEmpty(bomVersionRange)) {
-            if (log.isDebugEnabled()) {
-                final StringBuilder buf = new StringBuilder();
-                buf.append("Resolving Quarkus platform descriptor from the provided BOM coordinates ");
-                appendArg(buf, bomGroupId);
-                buf.append(":");
-                appendArg(buf, bomArtifactId);
-                buf.append(":");
-                if (!ToolsUtils.isNullOrEmpty(bomVersion)) {
-                    appendArg(buf, bomVersion);
-                } else if (!ToolsUtils.isNullOrEmpty(bomVersionRange)) {
-                    appendArg(buf, bomVersionRange);
-                } else {
-                    appendArg(buf, bomVersion);
-                }
-                log.debug(buf.toString());
-            }
-            return resolveJsonArtifactFromBom(artifactResolver);
-        }
-        try {
-            return resolveJsonArtifactFromArgs(artifactResolver);
-        } catch (VersionNotAvailableException e) {
-            final QuarkusPlatformDescriptor platform = resolveJsonArtifactFromBom(artifactResolver);
-            log.warn(e.getLocalizedMessage() + ", falling back to the bundled platform based on " + platform.getBomGroupId()
-                    + ":" + platform.getBomArtifactId() + "::pom:" + platform.getBomVersion() + " and Quarkus version "
-                    + platform.getQuarkusVersion());
-            return platform;
-        }
-    }
-
-    private static void appendArg(StringBuilder buf, String arg) {
-        buf.append(ToolsUtils.isNullOrEmpty(arg) ? "<not-provided>" : arg);
-    }
-
-    private QuarkusPlatformDescriptor resolveJsonArtifactFromArgs(AppModelResolver artifactResolver)
-            throws VersionNotAvailableException {
-        String jsonGroupId = this.jsonGroupId;
-        String jsonArtifactId = this.jsonArtifactId;
-        String jsonVersion = this.jsonVersion;
-        // If some of the coordinates are missing, we are trying the default ones
-        int defaultCoords = 0;
-        if (jsonGroupId == null) {
-            jsonGroupId = getProperty(PROP_PLATFORM_JSON_GROUP_ID);
-            if (jsonGroupId == null) {
-                jsonGroupId = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID;
-                ++defaultCoords;
-            }
-        }
-        if (jsonArtifactId == null) {
-            jsonArtifactId = getProperty(PROP_PLATFORM_JSON_ARTIFACT_ID);
-            if (jsonArtifactId == null) {
-                jsonArtifactId = ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID;
-                ++defaultCoords;
-            }
-        }
-        if (jsonVersion == null) {
-            if (jsonVersionRange != null) {
-                // if the range was set using the api, it overrides a possibly set version system property
-                // depending on how this evolves this may or may not be reasonable
-                try {
-                    jsonVersion = resolveLatestJsonVersion(artifactResolver, jsonGroupId, jsonArtifactId, jsonVersionRange);
-                } catch (VersionNotAvailableException e) {
-                    throw new IllegalStateException("Failed to resolve the latest version of " + jsonGroupId + ":"
-                            + jsonArtifactId + " from the requested range " + jsonVersionRange, e);
-                }
-            } else {
-                jsonVersion = getProperty(PROP_PLATFORM_JSON_VERSION);
-                if (jsonVersion == null) {
-                    jsonVersion = resolveLatestJsonVersion(artifactResolver, jsonGroupId, jsonArtifactId, null);
-                    ++defaultCoords;
-                }
-            }
-        }
-        try {
-            return loadFromJsonArtifact(artifactResolver,
-                    new AppArtifact(jsonGroupId, jsonArtifactId, null, "json", jsonVersion));
-        } catch (VersionNotAvailableException e) {
-            if (defaultCoords == 3) {
-                // complete coords were the default ones, so we can re-throw and try the bundled platform
-                throw e;
-            }
-            throw new IllegalStateException("Failed to resolve the JSON artifact with the requested coordinates", e);
-        }
-    }
-
-    private QuarkusPlatformDescriptor resolveJsonArtifactFromBom(AppModelResolver artifactResolver)
-            throws PlatformDescriptorLoadingException {
-
-        // If some of the coordinates are missing, we are trying the default ones
-        boolean tryingDefaultCoords = false;
-        String bomGroupId = this.bomGroupId;
-        if (bomGroupId == null) {
-            bomGroupId = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID;
-            tryingDefaultCoords = true;
-        }
-        String bomArtifactId = this.bomArtifactId;
-        if (bomArtifactId == null) {
-            bomArtifactId = ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID;
-            tryingDefaultCoords = true;
-        }
-        String bomVersion = this.bomVersion;
-        try {
-            return loadFromBomCoords(artifactResolver, bomGroupId, bomArtifactId, bomVersion, null);
-        } catch (VersionNotAvailableException e) {
-            if (!tryingDefaultCoords) {
-                throw new IllegalStateException("Failed to resolve the platform BOM using the provided coordinates", e);
-            }
-            log.debug(
-                    "Failed to resolve Quarkus platform BOM using the default coordinates, falling back to the bundled Quarkus platform artifacts");
-        }
-
-        Model bundledBom = loadBundledPom();
-        bomGroupId = this.bomGroupId;
-        if (bomGroupId != null) {
-            if (!bomGroupId.equals(getGroupId(bundledBom))) {
-                throw new IllegalStateException(
-                        "Failed to resolve Quarkus platform using the requested BOM groupId " + bomGroupId);
-            }
-        } else {
-            bomGroupId = getGroupId(bundledBom);
-        }
-        if (bomGroupId == null) {
-            failedDetermineDefaultPlatformCoords();
-        }
-
-        bomArtifactId = this.bomArtifactId;
-        if (bomArtifactId != null) {
-            if (!bomArtifactId.equals(getArtifactId(bundledBom))) {
-                throw new IllegalStateException(
-                        "Failed to resolve Quarkus platform using the requested BOM artifactId " + bomArtifactId);
-            }
-        } else {
-            bomArtifactId = getArtifactId(bundledBom);
-        }
-        if (bomArtifactId == null) {
-            failedDetermineDefaultPlatformCoords();
-        }
-
-        bomVersion = this.bomVersion;
-        if (bomVersion != null) {
-            if (!bomVersion.equals(getVersion(bundledBom))) {
-                throw new IllegalStateException(
-                        "Failed to resolve Quarkus platform using the requested BOM version " + bomVersion);
-            }
-        } else if (this.bomVersionRange == null) {
-            bomVersion = getVersion(bundledBom);
-        }
-        try {
-            return loadFromBomCoords(artifactResolver, bomGroupId, bomArtifactId, bomVersion, bundledBom);
-        } catch (VersionNotAvailableException e) {
-            // this should never happen
-            throw new IllegalStateException("Failed to load the bundled platform artifacts", e);
-        }
-    }
-
-    private QuarkusPlatformDescriptor loadFromBomCoords(AppModelResolver artifactResolver, String bomGroupId,
-            String bomArtifactId, String bomVersion, Model bundledBom)
-            throws PlatformDescriptorLoadingException, VersionNotAvailableException {
-        if (bomVersion == null) {
-            String bomVersionRange = this.bomVersionRange;
-            if (bomVersionRange == null) {
-                bomVersionRange = getDefaultVersionRange(bomGroupId, bomArtifactId);
-            }
-            final AppArtifact bomArtifact = new AppArtifact(bomGroupId, bomArtifactId, null, "pom", bomVersionRange);
-            log.debug("Resolving the latest version of %s", bomArtifact);
-            try {
-                bomVersion = artifactResolver.getLatestVersionFromRange(bomArtifact, bomVersionRange);
-            } catch (AppModelResolverException e) {
-                throw new VersionNotAvailableException("Failed to resolve the latest version of " + bomArtifact, e);
-            }
-            if (bomVersion == null) {
-                throw new VersionNotAvailableException("Failed to resolve the latest version of " + bomArtifact);
-            }
-        }
-        log.debug("Resolving Quarkus platform BOM %s:%s::pom:%s", bomGroupId, bomArtifactId, bomVersion);
-
-        final Model theBundledBom = loadBundledPomIfNull(bundledBom);
-        // Check whether the BOM on the classpath is matching the requested one
-        if (theBundledBom != null
-                && bomArtifactId.equals(getArtifactId(theBundledBom))
-                && bomVersion.equals(getVersion(theBundledBom))
-                && bomGroupId.equals(getGroupId(theBundledBom))) {
-            log.debug("The requested Quarkus platform BOM version is available on the classpath");
-            // If the BOM matches, there should also be the JSON file
-            final InputStream jsonStream = getCpResourceAsStream(BUNDLED_EXTENSIONS_JSON_PATH);
-            if (jsonStream != null) {
-                // The JSON is available, now there also should be quarkus.properties
-                final String quarkusVersion = getBundledPlatformQuarkusVersionOrNull();
-                if (quarkusVersion != null) {
-                    return loadPlatformDescriptor(getBundledResolver(theBundledBom), jsonStream, quarkusVersion);
-                } else {
-                    log.debug("Failed to locate quarkus.properties on the classpath");
-                }
-            } else {
-                log.debug("Failed to locate Quarkus platform descriptor on the classpath");
-            }
-        }
-
-        return loadFromJsonArtifact(artifactResolver, new AppArtifact(bomGroupId, bomArtifactId, null, "json", bomVersion));
-    }
-
-    private void failedDetermineDefaultPlatformCoords() {
-        throw new IllegalStateException("Failed to determine the Maven coordinates of the default Quarkus platform");
-    }
-
-    private QuarkusPlatformDescriptor loadFromJsonArtifact(AppModelResolver artifactResolver, AppArtifact jsonArtifact)
-            throws VersionNotAvailableException {
-        try {
-            log.debug("Attempting to resolve Quarkus platform descriptor %s", jsonArtifact);
-            return loadFromFile(artifactResolver, artifactResolver.resolve(jsonArtifact));
-        } catch (PlatformDescriptorLoadingException e) {
-            // the artifact was successfully resolved but processing of it has failed
-            throw new IllegalStateException("Failed to load Quarkus platform descriptor " + jsonArtifact, e);
-        } catch (Exception e) {
-            log.debug("Failed to load %s due to %s", jsonArtifact, e.getLocalizedMessage());
-            // it didn't work, now we are trying artifactId-descriptor-json
-            final AppArtifact fallbackArtifact = new AppArtifact(jsonArtifact.getGroupId(),
-                    jsonArtifact.getArtifactId() + "-descriptor-json", null, "json", jsonArtifact.getVersion());
-            log.debug("Attempting to resolve Quarkus platform descriptor %s", fallbackArtifact);
-            try {
-                return loadFromFile(artifactResolver, artifactResolver.resolve(fallbackArtifact));
-            } catch (AppModelResolverException e1) {
-                throw new VersionNotAvailableException("Failed to resolve Quarkus platform descriptor " + jsonArtifact, e);
-            } catch (Exception e2) {
-                throw new IllegalStateException("Failed to load Quarkus platform descriptor " + jsonArtifact, e);
-            }
-        }
-    }
-
-    @SuppressWarnings("rawtypes")
-    private QuarkusPlatformDescriptor loadPlatformDescriptor(ArtifactResolver mvn, final InputStream jsonStream,
-            String quarkusCoreVersion) throws PlatformDescriptorLoadingException, VersionNotAvailableException {
-
-        ClassLoader jsonDescrLoaderCl = null;
-
-        // check whether the quarkus-platform-descriptor-json used in the platform is already on the classpath
-        final String pomPropsPath = "META-INF/maven/" + ToolsConstants.IO_QUARKUS + "/" + QUARKUS_PLATFORM_DESCRIPTOR_JSON
-                + "/pom.properties";
-        final InputStream is = getCpResourceAsStream(pomPropsPath);
-        if (is != null) {
-            final Properties props = new Properties();
-            try {
-                props.load(is);
-            } catch (IOException e) {
-                throw new PlatformDescriptorLoadingException("Failed to load " + pomPropsPath + " from the classpath", e);
-            }
-            final String version = props.getProperty("version");
-            if (quarkusCoreVersion.equals(version)) {
-                jsonDescrLoaderCl = Thread.currentThread().getContextClassLoader();
-            } else {
-                log.debug("Version of the Quarkus JSON platform descriptor loader on the classpath is %s", version);
-            }
-        }
-
-        // platform resource loader
-        ResourceLoader resourceLoader = null;
-
-        boolean externalLoader = false;
-        if (jsonDescrLoaderCl == null) {
-            final AppArtifact jsonDescrArtifact = new AppArtifact(ToolsConstants.IO_QUARKUS, QUARKUS_PLATFORM_DESCRIPTOR_JSON,
-                    null, "jar", quarkusCoreVersion);
-            log.debug("Resolving Quarkus JSON platform descriptor loader %s", jsonDescrArtifact);
-            final URL jsonDescrUrl;
-            try {
-                final Path path = mvn.process(jsonDescrArtifact.getGroupId(), jsonDescrArtifact.getArtifactId(),
-                        jsonDescrArtifact.getClassifier(), jsonDescrArtifact.getType(), jsonDescrArtifact.getVersion(), p -> {
-                            return p;
-                        });
-                resourceLoader = Files.isDirectory(path) ? new DirectoryResourceLoader(path) : new ZipResourceLoader(path);
-                log.debug("Quarkus platform resources will be loaded from %s", path);
-                jsonDescrUrl = path.toUri().toURL();
-            } catch (AppModelResolverException e) {
-                throw new VersionNotAvailableException("Failed to resolve " + jsonDescrArtifact, e);
-            } catch (Exception e) {
-                throw new PlatformDescriptorLoadingException("Failed to resolve " + jsonDescrArtifact, e);
-            }
-            jsonDescrLoaderCl = new URLClassLoader(new URL[] { jsonDescrUrl }, Thread.currentThread().getContextClassLoader());
-            externalLoader = true;
-        }
-
-        try {
-            final Iterator<QuarkusJsonPlatformDescriptorLoader> i = ServiceLoader
-                    .load(QuarkusJsonPlatformDescriptorLoader.class, jsonDescrLoaderCl).iterator();
-            if (!i.hasNext()) {
-                throw new PlatformDescriptorLoadingException(
-                        "Failed to locate an implementation of " + QuarkusJsonPlatformDescriptorLoader.class.getName());
-            }
-            final QuarkusJsonPlatformDescriptorLoader<?> jsonDescrLoader = i.next();
-            if (i.hasNext()) {
-                throw new PlatformDescriptorLoadingException(
-                        "Located more than one implementation of " + QuarkusJsonPlatformDescriptorLoader.class.getName());
-            }
-
-            try {
-                return jsonDescrLoader.load(
-                        new QuarkusJsonPlatformDescriptorLoaderContext(
-                                mvn,
-                                resourceLoader == null ? new ClassPathResourceLoader() : resourceLoader,
-                                log) {
-                            @Override
-                            public <T> T parseJson(Function<InputStream, T> parser) {
-                                return parser.apply(jsonStream);
-                            }
-                        });
-            } catch (Exception e) {
-                throw new PlatformDescriptorLoadingException("Failed to load Quarkus platform descriptor", e);
-            }
-        } finally {
-            if (externalLoader) {
-                try {
-                    ((URLClassLoader) jsonDescrLoaderCl).close();
-                } catch (IOException e) {
-                }
-            }
-        }
-    }
-
-    private String resolveLatestJsonVersion(AppModelResolver artifactResolver, String groupId, String artifactId,
-            String versionRange) throws VersionNotAvailableException {
-        if (versionRange == null) {
-            versionRange = getProperty(PROP_PLATFORM_JSON_VERSION_RANGE);
-            if (versionRange == null) {
-                versionRange = getDefaultVersionRange(groupId, artifactId);
-            }
-        }
-        try {
-            return resolveLatestFromVersionRange(artifactResolver, groupId, artifactId, null, "json", versionRange);
-        } catch (AppModelResolverException e) {
-            throw new VersionNotAvailableException("Failed to resolve the latest JSON platform version of " + groupId + ":"
-                    + artifactId + "::json:" + versionRange);
-        }
-    }
-
-    private String resolveLatestFromVersionRange(AppModelResolver mvn, String groupId, String artifactId, String classifier,
-            String type, final String versionRange)
-            throws AppModelResolverException, VersionNotAvailableException {
-        final AppArtifact appArtifact = new AppArtifact(groupId, artifactId, classifier, type, versionRange);
-        log.debug("Resolving the latest version of %s", appArtifact);
-        final String latestVersion = mvn.getLatestVersionFromRange(appArtifact, versionRange);
-        if (latestVersion == null) {
-            throw new VersionNotAvailableException("Failed to resolve the latest version of " + appArtifact);
-        }
-        return latestVersion;
-    }
-
-    private Model loadBundledPomIfNull(Model model) {
-        return model == null ? loadBundledPom() : model;
-    }
-
-    private Model loadBundledPom() {
-        final InputStream bomIs = getCpResourceAsStream(BUNDLED_QUARKUS_BOM_PATH);
-        if (bomIs == null) {
-            log.debug("Failed to locate quarkus-bom/pom.xml on the classpath");
-            return null;
-        }
-        try {
-            return MojoUtils.readPom(bomIs);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to load POM model from the classpath for quarkus-bom/pom.xml", e);
-        } finally {
-            try {
-                bomIs.close();
-            } catch (IOException e) {
-            }
-        }
-    }
-
-    private static String getGroupId(Model model) {
-        if (model == null) {
-            return null;
-        }
-        String groupId = model.getGroupId();
-        if (groupId != null) {
-            return groupId;
-        }
-        final Parent parent = model.getParent();
-        if (parent != null) {
-            groupId = parent.getGroupId();
-            if (groupId != null) {
-                return groupId;
-            }
-        }
-        throw new IllegalStateException("Failed to determine the groupId for the POM of " + model.getArtifactId());
-    }
-
-    private static String getArtifactId(Model model) {
-        if (model == null) {
-            return null;
-        }
-        return model.getArtifactId();
-    }
-
-    private static String getVersion(Model model) {
-        if (model == null) {
-            return null;
-        }
-        String version = model.getVersion();
-        if (version != null) {
-            return version;
-        }
-        final Parent parent = model.getParent();
-        if (parent != null) {
-            version = parent.getVersion();
-            if (version != null) {
-                return version;
-            }
-        }
-        throw new IllegalStateException("Failed to determine the version for the POM of " + model.getArtifactId());
-    }
-
-    private ArtifactResolver toLoaderResolver(AppModelResolver mvn) {
-        return new ArtifactResolver() {
-
-            @Override
-            public <T> T process(String groupId, String artifactId, String classifier, String type, String version,
-                    Function<Path, T> processor) throws AppModelResolverException {
-                final AppArtifact artifact = new AppArtifact(groupId, artifactId, classifier, type, version);
-                return processor.apply(mvn.resolve(artifact));
-            }
-
-            @Override
-            public List<Dependency> getManagedDependencies(String groupId, String artifactId, String classifier,
-                    String type, String version) {
-                if (!"pom".equals(type)) {
-                    throw new IllegalStateException("This implementation expects artifacts of type pom");
-                }
-                final Path pom;
-                final AppArtifact pomArtifact = new AppArtifact(groupId, artifactId, classifier, type, version);
-                try {
-                    pom = mvn.resolve(pomArtifact);
-                } catch (AppModelResolverException e) {
-                    throw new IllegalStateException("Failed to resolve " + pomArtifact, e);
-                }
-                try {
-                    return ModelUtils.readModel(pom).getDependencyManagement().getDependencies();
-                } catch (IOException e) {
-                    throw new IllegalStateException("Failed to read model of " + pom, e);
-                }
-            }
-        };
-    }
-
-    private ArtifactResolver getBundledResolver(final Model model) {
-
-        final Path platformResources;
-        try {
-            platformResources = MojoUtils.getResourceOrigin(Thread.currentThread().getContextClassLoader(),
-                    BUNDLED_QUARKUS_BOM_PATH);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to locate the bundled Quarkus platform resources on the classpath");
-        }
-
-        final ArtifactResolver bundledResolver = new ArtifactResolver() {
-
-            @Override
-            public <T> T process(String groupId, String artifactId, String classifier, String type, String version,
-                    Function<Path, T> processor) {
-                if (QUARKUS_PLATFORM_DESCRIPTOR_JSON.equals(artifactId)
-                        && ToolsConstants.IO_QUARKUS.equals(groupId)
-                        && "jar".equals(type)
-                        && StringUtils.isEmpty(classifier)
-                        && version.equals(getBundledPlatformQuarkusVersionOrNull())) {
-                    return processor.apply(platformResources);
-                }
-                throw new IllegalArgumentException("Unexpected artifact coordinates " + groupId + ":" + artifactId + ":"
-                        + classifier + ":" + type + ":" + version);
-            }
-
-            @Override
-            public List<Dependency> getManagedDependencies(String groupId, String artifactId, String classifier,
-                    String type, String version) {
-                if (getArtifactId(model).equals(artifactId)
-                        && "pom".equals(type)
-                        && getVersion(model).equals(version)
-                        && StringUtils.isEmpty(classifier)
-                        && getGroupId(model).equals(groupId)) {
-                    return model.getDependencyManagement().getDependencies();
-                }
-                throw new IllegalArgumentException(
-                        "Expected " + getGroupId(model) + ":" + getArtifactId(model) + "::pom:" + getVersion(model)
-                                + " but received "
-                                + groupId + ":" + artifactId + ":" + classifier + ":" + type + ":" + version);
-            }
-        };
-        return bundledResolver;
-    }
-
-    private static String getBundledPlatformQuarkusVersionOrNull() {
-        final InputStream quarkusPropsStream = getCpResourceAsStream(BUNDLED_QUARKUS_PROPERTIES_PATH);
-        if (quarkusPropsStream == null) {
-            return null;
-        }
-        final Properties props = new Properties();
-        try {
-            props.load(quarkusPropsStream);
-        } catch (IOException e) {
-            throw new IllegalStateException("Failed to load quarkus.properties from the classpath", e);
-        }
-        final String quarkusVersion = props.getProperty("plugin-version");
-        if (quarkusVersion == null) {
-            throw new IllegalStateException(
-                    "quarkus.properties loaded from the classpath is missing plugin-version property");
-        }
-        return quarkusVersion;
-    }
-
-    private static InputStream getCpResourceAsStream(String name) {
-        return Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/VersionNotAvailableException.java b/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/VersionNotAvailableException.java
deleted file mode 100644
index cea8276f63991..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/main/java/io/quarkus/platform/descriptor/resolver/json/VersionNotAvailableException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.quarkus.platform.descriptor.resolver.json;
-
-public class VersionNotAvailableException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public VersionNotAvailableException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public VersionNotAvailableException(String message) {
-        super(message);
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java b/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java
deleted file mode 100644
index a28a5530ccf2d..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/QuarkusJsonPlatformDescriptorResolverTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package io.quarkus.platform.descriptor.resolver.json.test;
-
-import static io.quarkus.platform.tools.ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID;
-import static io.quarkus.platform.tools.ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID;
-import static io.quarkus.platform.tools.ToolsConstants.IO_QUARKUS;
-import static io.quarkus.platform.tools.ToolsConstants.QUARKUS_CORE_ARTIFACT_ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import io.quarkus.bootstrap.model.AppArtifact;
-import io.quarkus.bootstrap.resolver.ResolverSetupCleanup;
-import io.quarkus.bootstrap.resolver.TsArtifact;
-import io.quarkus.bootstrap.resolver.TsDependency;
-import io.quarkus.bootstrap.util.IoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
-import io.quarkus.platform.tools.DefaultMessageWriter;
-import io.quarkus.platform.tools.MessageWriter;
-import io.quarkus.platform.tools.ToolsConstants;
-import java.nio.file.Path;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class QuarkusJsonPlatformDescriptorResolverTest extends ResolverSetupCleanup {
-
-    private static Path testDir;
-
-    private MessageWriter log = new DefaultMessageWriter();
-
-    @BeforeEach
-    @Override
-    public void setup() throws Exception {
-        if (workDir != null) {
-            return;
-        }
-        super.setup();
-        testDir = workDir;
-        doSetup();
-    }
-
-    @Override
-    protected boolean cleanWorkDir() {
-        return false;
-    }
-
-    @AfterAll
-    public static void afterAll() throws Exception {
-        if (testDir != null) {
-            IoUtils.recursiveDelete(testDir);
-        }
-    }
-
-    protected void doSetup() throws Exception {
-
-        final TsArtifact quarkusCore = new TsArtifact(IO_QUARKUS, QUARKUS_CORE_ARTIFACT_ID, null, "jar", "1.0.0.CR50");
-        install(quarkusCore, newJar().getPath(workDir));
-
-        final TsArtifact quarkusPlatformDescriptorJson = new TsArtifact(IO_QUARKUS, "quarkus-platform-descriptor-json", null,
-                "jar", "1.0.0.CR50");
-        install(quarkusPlatformDescriptorJson, newJar().getPath(workDir));
-
-        // install a few universe versions with the default GA
-        installDefaultUniverse(quarkusCore, "1.0.0.CR50");
-        installDefaultUniverse(quarkusCore, "1.0.0.CR60");
-        installDefaultUniverse(quarkusCore, "1.0.0.CR70");
-
-        // install a universe with a custom GA and JSON descriptor with `-descriptor-json` suffix
-        TsArtifact universeBom = new TsArtifact(DEFAULT_PLATFORM_BOM_GROUP_ID, "other-universe", null, "pom", "1.0.0.CR80")
-                .addManagedDependency(new TsDependency(quarkusCore));
-        install(universeBom);
-        final TsArtifact universeJson = new TsArtifact(DEFAULT_PLATFORM_BOM_GROUP_ID, "other-universe" + "-descriptor-json",
-                null, "json", "1.0.0.CR80")
-                        .setContent(new TestPlatformJsonDescriptorProvider(universeBom));
-        install(universeJson);
-    }
-
-    @Test
-    public void testResolveBundled() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveBundled();
-        assertBundledPlatform(platform, "1.0.0.CR90");
-        assertEquals("1.0.0.CR90", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolve() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolve();
-        assertDefaultPlatform(platform, "1.0.0.CR70");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromJsonVersion() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveFromJson(DEFAULT_PLATFORM_BOM_GROUP_ID,
-                DEFAULT_PLATFORM_BOM_ARTIFACT_ID, "1.0.0.CR60");
-        assertDefaultPlatform(platform, "1.0.0.CR60");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromJsonFile() throws Exception {
-        final Path jsonPath = resolver.resolve(
-                new AppArtifact(DEFAULT_PLATFORM_BOM_GROUP_ID, DEFAULT_PLATFORM_BOM_ARTIFACT_ID, null, "json", "1.0.0.CR50"));
-        final QuarkusPlatformDescriptor platform = newResolver().resolveFromJson(jsonPath);
-        assertDefaultPlatform(platform, "1.0.0.CR50");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromBomWithDescriptorJsonPrefix() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveFromBom(DEFAULT_PLATFORM_BOM_GROUP_ID, "other-universe",
-                "1.0.0.CR80");
-        assertNotNull(platform);
-        assertEquals(ToolsConstants.IO_QUARKUS, platform.getBomGroupId());
-        assertEquals("other-universe", platform.getBomArtifactId());
-        assertEquals("1.0.0.CR80", platform.getBomVersion());
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromJsonWithDescriptorJsonPrefix() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveLatestFromJson(DEFAULT_PLATFORM_BOM_GROUP_ID,
-                "other-universe" + "-descriptor-json", null);
-        assertNotNull(platform);
-        assertEquals(ToolsConstants.IO_QUARKUS, platform.getBomGroupId());
-        assertEquals("other-universe", platform.getBomArtifactId());
-        assertEquals("1.0.0.CR80", platform.getBomVersion());
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromLatestJson() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveLatestFromJson(DEFAULT_PLATFORM_BOM_GROUP_ID,
-                DEFAULT_PLATFORM_BOM_ARTIFACT_ID, null);
-        assertDefaultPlatform(platform, "1.0.0.CR70");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromLatestJsonWithRange() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveLatestFromJson(DEFAULT_PLATFORM_BOM_GROUP_ID,
-                DEFAULT_PLATFORM_BOM_ARTIFACT_ID, "[0,1.0.0.CR60]");
-        assertDefaultPlatform(platform, "1.0.0.CR60");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromLatestBom() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveLatestFromBom(DEFAULT_PLATFORM_BOM_GROUP_ID,
-                DEFAULT_PLATFORM_BOM_ARTIFACT_ID, null);
-        assertDefaultPlatform(platform, "1.0.0.CR70");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    @Test
-    public void testResolveFromLatestBomWithRange() throws Exception {
-        final QuarkusPlatformDescriptor platform = newResolver().resolveLatestFromJson(DEFAULT_PLATFORM_BOM_GROUP_ID,
-                DEFAULT_PLATFORM_BOM_ARTIFACT_ID, "[0,1.0.0.CR60]");
-        assertDefaultPlatform(platform, "1.0.0.CR60");
-        assertEquals("1.0.0.CR50", platform.getQuarkusVersion());
-    }
-
-    private void installDefaultUniverse(final TsArtifact quarkusCore, String platformVersion) {
-        final TsArtifact universeBom = new TsArtifact(DEFAULT_PLATFORM_BOM_GROUP_ID, DEFAULT_PLATFORM_BOM_ARTIFACT_ID, null,
-                "pom", platformVersion)
-                        .addManagedDependency(new TsDependency(quarkusCore));
-        install(universeBom);
-        final TsArtifact universeJson = new TsArtifact(DEFAULT_PLATFORM_BOM_GROUP_ID, DEFAULT_PLATFORM_BOM_ARTIFACT_ID, null,
-                "json", platformVersion)
-                        .setContent(new TestPlatformJsonDescriptorProvider(universeBom));
-        install(universeJson);
-    }
-
-    private QuarkusJsonPlatformDescriptorResolver newResolver() {
-        return QuarkusJsonPlatformDescriptorResolver.newInstance()
-                .setMessageWriter(log)
-                .setArtifactResolver(resolver);
-    }
-
-    private static void assertDefaultPlatform(QuarkusPlatformDescriptor platform, String version) {
-        assertNotNull(platform);
-        assertEquals(ToolsConstants.IO_QUARKUS, platform.getBomGroupId());
-        assertEquals(ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID, platform.getBomArtifactId());
-        assertEquals(version, platform.getBomVersion());
-    }
-
-    private static void assertBundledPlatform(QuarkusPlatformDescriptor platform, String version) {
-        assertNotNull(platform);
-        assertEquals(ToolsConstants.IO_QUARKUS, platform.getBomGroupId());
-        assertEquals("quarkus-bom", platform.getBomArtifactId());
-        assertEquals(version, platform.getBomVersion());
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/TestJsonPlatformDescriptorLoader.java b/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/TestJsonPlatformDescriptorLoader.java
deleted file mode 100644
index 1e607484cc4a0..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/TestJsonPlatformDescriptorLoader.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package io.quarkus.platform.descriptor.resolver.json.test;
-
-import com.eclipsesource.json.Json;
-import com.eclipsesource.json.JsonObject;
-import com.eclipsesource.json.JsonValue;
-import io.quarkus.dependencies.Category;
-import io.quarkus.dependencies.Extension;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.ResourceInputStreamConsumer;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader;
-import io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoaderContext;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
-import org.apache.maven.model.Dependency;
-
-public class TestJsonPlatformDescriptorLoader implements QuarkusJsonPlatformDescriptorLoader<QuarkusPlatformDescriptor> {
-
-    @Override
-    public QuarkusPlatformDescriptor load(QuarkusJsonPlatformDescriptorLoaderContext context) {
-        final JsonObject json = context.parseJson(s -> {
-            try (InputStreamReader reader = new InputStreamReader(s, StandardCharsets.UTF_8)) {
-                return Json.parse(reader).asObject();
-            } catch (IOException e) {
-                throw new IllegalStateException("Failed to parse JSON descriptor", e);
-            }
-        });
-
-        JsonValue jsonValue = getRequiredAttr(json, "bom");
-        final JsonObject bom = jsonValue.asObject();
-
-        jsonValue = getRequiredAttr(json, "quarkus-core-version");
-        final String quarkusVersion = jsonValue.asString();
-
-        return new QuarkusPlatformDescriptor() {
-
-            @Override
-            public String getBomGroupId() {
-                return bom.getString("groupId", null);
-            }
-
-            @Override
-            public String getBomArtifactId() {
-                return bom.getString("artifactId", null);
-            }
-
-            @Override
-            public String getBomVersion() {
-                return bom.getString("version", null);
-            }
-
-            @Override
-            public String getQuarkusVersion() {
-                return quarkusVersion;
-            }
-
-            @Override
-            public List<Dependency> getManagedDependencies() {
-                return Collections.emptyList();
-            }
-
-            @Override
-            public List<Extension> getExtensions() {
-                return Collections.emptyList();
-            }
-
-            @Override
-            public List<Category> getCategories() {
-                return Collections.emptyList();
-            }
-
-            @Override
-            public String getTemplate(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> T loadResource(String name, ResourceInputStreamConsumer<T> consumer) throws IOException {
-                return null;
-            }
-        };
-    }
-
-    private JsonValue getRequiredAttr(final JsonObject json, String name) {
-        final JsonValue jsonValue = json.get(name);
-        if (jsonValue == null) {
-            throw new IllegalStateException("Failed to locate '" + name + "' attribute in the JSON descriptor");
-        }
-        return jsonValue;
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/TestPlatformJsonDescriptorProvider.java b/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/TestPlatformJsonDescriptorProvider.java
deleted file mode 100644
index df026afdf2bb4..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/java/io/quarkus/platform/descriptor/resolver/json/test/TestPlatformJsonDescriptorProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.quarkus.platform.descriptor.resolver.json.test;
-
-import com.eclipsesource.json.Json;
-import com.eclipsesource.json.JsonObject;
-import io.quarkus.bootstrap.resolver.TsArtifact;
-import io.quarkus.platform.tools.ToolsConstants;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-
-public class TestPlatformJsonDescriptorProvider implements TsArtifact.ContentProvider {
-
-    private final TsArtifact bomArtifact;
-
-    public TestPlatformJsonDescriptorProvider(TsArtifact bomArtifact) {
-        this.bomArtifact = bomArtifact;
-    }
-
-    @Override
-    public Path getPath(Path workDir) throws IOException {
-        final Model model = bomArtifact.getPomModel();
-
-        final JsonObject json = Json.object();
-
-        json.set("bom", Json.object().set("groupId", model.getGroupId()).set("artifactId", model.getArtifactId()).set("version",
-                model.getVersion()));
-
-        String coreVersion = null;
-        for (Dependency dep : model.getDependencyManagement().getDependencies()) {
-            if (dep.getArtifactId().equals(ToolsConstants.QUARKUS_CORE_ARTIFACT_ID)
-                    && dep.getGroupId().equals(ToolsConstants.QUARKUS_CORE_GROUP_ID)) {
-                coreVersion = dep.getVersion();
-            }
-        }
-        if (coreVersion == null) {
-            throw new IllegalStateException("Failed to locate " + ToolsConstants.QUARKUS_CORE_GROUP_ID + ":"
-                    + ToolsConstants.QUARKUS_CORE_ARTIFACT_ID + " among the managed dependencies");
-        }
-        json.set("quarkus-core-version", coreVersion);
-
-        final Path jsonPath = workDir.resolve(bomArtifact.getArtifactFileName());
-        try (BufferedWriter writer = Files.newBufferedWriter(jsonPath)) {
-            json.writeTo(writer);
-        }
-        return jsonPath;
-    }
-}
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/META-INF/services/io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader b/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/META-INF/services/io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader
deleted file mode 100644
index 3698a45f9f4bd..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/META-INF/services/io.quarkus.platform.descriptor.loader.json.QuarkusJsonPlatformDescriptorLoader
+++ /dev/null
@@ -1 +0,0 @@
-io.quarkus.platform.descriptor.resolver.json.test.TestJsonPlatformDescriptorLoader
\ No newline at end of file
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom-descriptor/extensions.json b/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom-descriptor/extensions.json
deleted file mode 100644
index 309c411e5344b..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom-descriptor/extensions.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "bom": {
-        "groupId": "io.quarkus",
-        "artifactId": "quarkus-bom",
-        "version": "1.0.0.CR90"
-    },
-    "quarkus-core-version": "1.0.0.CR90",
-    "extensions": []
-}
\ No newline at end of file
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom/pom.xml b/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom/pom.xml
deleted file mode 100644
index ea3de75d124f3..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus-bom/pom.xml
+++ /dev/null
@@ -1,470 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-bom</artifactId>
-    <version>1.0.0.CR90</version>
-    <name>Quarkus - BOM</name>
-    <packaging>pom</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- External BOMs -->
-
-            <!-- Quarkus core -->
-
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <!--
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-arc</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-caffeine</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jaxb</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jackson</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jsonb</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jsonp</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-netty</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-agroal</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-artemis-core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-artemis-jms</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elasticsearch-rest-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-security</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elytron-security</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elytron-security-properties-file</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elytron-security-oauth2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-oidc</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-keycloak-authorization</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-flyway</artifactId>
-                <version>${project.version}</version>
-             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-orm</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-panache-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-panacheql</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-orm-panache</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-mongodb-panache</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-hibernate-validator</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-infinispan-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jaeger</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jdbc-postgresql</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jdbc-h2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jdbc-mariadb</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jdbc-mssql</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jdbc-mysql</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jdbc-derby</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-kafka-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-kafka-streams</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-health</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-jwt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-context-propagation</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-reactive-streams-operators</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-reactive-type-converters</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-reactive-messaging</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-reactive-messaging-amqp</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-reactive-messaging-mqtt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-metrics</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-openapi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-opentracing</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy-jackson</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy-jsonb</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy-jaxb</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-resteasy-server-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-narayana-jta</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-undertow</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-smallrye-fault-tolerance</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-http</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-web</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-reactive-pg-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-reactive-mysql-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-mailer</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-mongodb-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-undertow-websockets</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-scheduler</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-quartz</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-di</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-web</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-spring-data-jpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-swagger-ui</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-kotlin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-amazon-lambda</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-amazon-lambda-http</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-amazon-dynamodb</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-azure-functions-http</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-kubernetes</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-kubernetes-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-kogito</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-tika</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-neo4j</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-scala</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-jgit</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-narayana-stm</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-elytron-security-jdbc</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vault</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-credentials</artifactId>
-                <version>${project.version}</version>
-            </dependency>
--->
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus.properties b/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus.properties
deleted file mode 100644
index cf81a1ccd6879..0000000000000
--- a/independent-projects/tools/platform-descriptor-resolver-json/src/test/resources/quarkus.properties
+++ /dev/null
@@ -1 +0,0 @@
-plugin-version = 1.0.0.CR90
\ No newline at end of file
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index c93146c5811b1..46e48dc86b66e 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
     <groupId>io.quarkus</groupId>
     <artifactId>quarkus-tools-parent</artifactId>
@@ -16,7 +16,7 @@
         <license>
             <name>Apache License, Version 2.0</name>
             <distribution>repo</distribution>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
         </license>
     </licenses>
     <properties>
@@ -27,50 +27,61 @@
         <!-- These properties are used by CreateProjectMojo to add the Maven Wrapper -->
         <proposed-maven-version>3.6.3</proposed-maven-version>
         <maven-wrapper.version>0.7.7</maven-wrapper.version>
-        <gradle-wrapper.version>6.5.1</gradle-wrapper.version>
+        <gradle-wrapper.version>6.8.3</gradle-wrapper.version>
 
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
-        <!-- Quarkus uses jboss-parent and it comes with 3.8.0-jboss-2, we don't want that in the templates -->
+        <!-- Quarkus uses jboss-parent and it comes with 3.8.1-jboss-1, we don't want that in the templates -->
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <kotlin.version>1.3.72</kotlin.version>
-        <scala.version>2.12.8</scala.version>
-        <scala-plugin.version>4.1.1</scala-plugin.version>
+        <scala.version>2.12.13</scala.version>
+        <scala-plugin.version>4.4.0</scala-plugin.version>
 
         <!-- Versions -->
-        <assertj.version>3.16.1</assertj.version>
-        <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
-        <jackson.version>2.11.1</jackson.version>
+        <jline.version>2.14.6</jline.version>
+        <assertj.version>3.19.0</assertj.version>
+        <jackson.version>2.12.1</jackson.version>
         <jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
         <jakarta.servlet-api.version>4.0.3</jakarta.servlet-api.version>
         <jakarta.websocket-api.version>1.1.2</jakarta.websocket-api.version>
-        <junit.version>5.6.1</junit.version>
+        <junit.version>5.7.1</junit.version>
         <commons-compress.version>1.20</commons-compress.version>
         <jboss-logging.version>3.3.2.Final</jboss-logging.version>
         <maven-core.version>3.6.3</maven-core.version>
-        <mockito.version>3.4.4</mockito.version>
+        <mockito.version>3.8.0</mockito.version>
         <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <quarkus.version>999-SNAPSHOT</quarkus.version>
-        <quarkus-http.version>3.0.12.Final</quarkus-http.version>
+        <maven-model-helper.version>18</maven-model-helper.version>
+        <commons-io.version>2.8.0</commons-io.version>
+        <quarkus-http.version>3.0.18.Final</quarkus-http.version>
+        <smallrye-commons.version>1.5.0</smallrye-commons.version>
     </properties>
     <modules>
-        <module>platform-descriptor-api</module>
+        <module>artifact-api</module>
+        <module>registry-client</module>
+        <module>message-writer</module>
+        <module>devtools-testing</module>
+        <module>codestarts</module>
         <module>devtools-common</module>
         <module>utilities</module>
-        <module>platform-descriptor-resolver-json</module>
     </modules>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devtools-artifact-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-devtools-registry-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
                 <version>${commons-compress.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.eclipsesource.minimal-json</groupId>
-                <artifactId>minimal-json</artifactId>
-                <version>${eclipse-minimal-json.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-app-model</artifactId>
@@ -81,24 +92,29 @@
                 <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
                 <version>${quarkus.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus.qute</groupId>
+                <artifactId>qute-generator</artifactId>
+                <version>${quarkus.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devtools-utilities</artifactId>
+                <artifactId>quarkus-devtools-message-writer</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devtools-common</artifactId>
+                <artifactId>quarkus-devtools-utilities</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-platform-descriptor-api</artifactId>
+                <artifactId>quarkus-devtools-codestarts</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
+                <artifactId>quarkus-devtools-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -112,6 +128,31 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>jline</groupId>
+                <artifactId>jline</artifactId>
+                <version>${jline.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>maven-model-helper</artifactId>
+                <version>${maven-model-helper.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
@@ -170,6 +211,11 @@
                 <scope>test</scope>
                 <version>${quarkus.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye.common</groupId>
+                <artifactId>smallrye-common-os</artifactId>
+                <version>${smallrye-commons.version}</version>
+            </dependency>
             <!-- Jackson dependencies, imported as a BOM -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
@@ -178,7 +224,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -264,7 +309,8 @@
                                         <exclude>commons-logging:commons-logging-api</exclude>
                                         <exclude>org.springframework:spring-jcl</exclude>
                                         <exclude>org.slf4j:jcl-over-slf4j</exclude>
-                                        <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logging instead) -->
+                                        <!-- Ban SLF4j implementations (use org.jboss.slf4j:slf4j-jboss-logmanager instead) -->
+                                        <exclude>org.jboss.slf4j:slf4j-jboss-logging</exclude>
                                         <exclude>org.slf4j:slf4j-simple</exclude>
                                         <exclude>org.slf4j:slf4j-nop</exclude>
                                         <exclude>org.slf4j:slf4j-jdk14</exclude>
@@ -290,7 +336,7 @@
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.12.1</version>
+                <version>2.14.0</version>
                 <dependencies>
                     <dependency>
                         <artifactId>quarkus-ide-config</artifactId>
@@ -307,7 +353,7 @@
             <plugin>
                 <groupId>net.revelc.code</groupId>
                 <artifactId>impsort-maven-plugin</artifactId>
-                <version>1.4.1</version>
+                <version>1.6.0</version>
                 <configuration>
                     <removeUnused>true</removeUnused>
                     <skip>${format.skip}</skip>
@@ -317,6 +363,16 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>jdk-8-classpath</id>
+            <activation>
+                <!-- activate this on any JDK from 9 onwards -->
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <maven.compiler.release>8</maven.compiler.release>
+            </properties>
+        </profile>
         <profile>
             <id>quick-build</id>
             <activation>
@@ -334,6 +390,21 @@
                 <defaultGoal>clean install</defaultGoal>
             </build>
         </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+            </properties>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -344,7 +415,7 @@
                         <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
diff --git a/independent-projects/tools/registry-client/pom.xml b/independent-projects/tools/registry-client/pom.xml
new file mode 100644
index 0000000000000..dc14ba7c9fc0c
--- /dev/null
+++ b/independent-projects/tools/registry-client/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-tools-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-devtools-registry-client</artifactId>
+    <name>Quarkus - Dev tools - Registry Client API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-artifact-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-message-writer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/Constants.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/Constants.java
new file mode 100644
index 0000000000000..a71dd7402442e
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/Constants.java
@@ -0,0 +1,21 @@
+package io.quarkus.registry;
+
+public interface Constants {
+
+    String DEFAULT_REGISTRY_ID = "registry.quarkus.io";
+    String DEFAULT_REGISTRY_GROUP_ID = "io.quarkus.registry";
+    String DEFAULT_REGISTRY_ARTIFACT_VERSION = "1.0-SNAPSHOT";
+    String DEFAULT_REGISTRY_DESCRIPTOR_ARTIFACT_ID = "quarkus-registry-descriptor";
+    String DEFAULT_REGISTRY_NON_PLATFORM_EXTENSIONS_CATALOG_ARTIFACT_ID = "quarkus-non-platform-extensions";
+    String DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID = "quarkus-platforms";
+
+    String DEFAULT_REGISTRY_REST_URL = "https://registry.quarkus.io/api/1";
+    String DEFAULT_REGISTRY_MAVEN_REPO_URL = "https://registry.quarkus.io/maven";
+    String DEFAULT_REGISTRY_BACKUP_MAVEN_REPO_ID = "oss.sonatype.org";
+    String DEFAULT_REGISTRY_BACKUP_MAVEN_REPO_URL = "https://oss.sonatype.org/content/repositories/snapshots";
+
+    String PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX = "-quarkus-platform-descriptor";
+    String PLATFORM_PROPERTIES_ARTIFACT_ID_SUFFIX = "-quarkus-platform-properties";
+
+    String JSON = "json";
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExclusiveProviderConflictException.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExclusiveProviderConflictException.java
new file mode 100644
index 0000000000000..18ba96c10465e
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExclusiveProviderConflictException.java
@@ -0,0 +1,13 @@
+package io.quarkus.registry;
+
+import java.util.List;
+
+@SuppressWarnings("serial")
+class ExclusiveProviderConflictException extends Exception {
+
+    List<RegistryExtensionResolver> conflictingRegistries;
+
+    ExclusiveProviderConflictException(List<RegistryExtensionResolver> conflictingRegistries) {
+        this.conflictingRegistries = conflictingRegistries;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java
new file mode 100644
index 0000000000000..c50d4d8982439
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java
@@ -0,0 +1,423 @@
+package io.quarkus.registry;
+
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.maven.ArtifactKey;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import io.quarkus.registry.catalog.json.JsonCatalogMerger;
+import io.quarkus.registry.catalog.json.JsonPlatformCatalog;
+import io.quarkus.registry.client.RegistryClientFactory;
+import io.quarkus.registry.client.maven.MavenRegistryClientFactory;
+import io.quarkus.registry.config.RegistriesConfig;
+import io.quarkus.registry.config.RegistriesConfigLocator;
+import io.quarkus.registry.config.RegistryConfig;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+public class ExtensionCatalogResolver {
+
+    public static ExtensionCatalogResolver empty() {
+        final ExtensionCatalogResolver resolver = new ExtensionCatalogResolver();
+        resolver.registries = Collections.emptyList();
+        return resolver;
+    }
+
+    public static Builder builder() {
+        return new ExtensionCatalogResolver().new Builder();
+    }
+
+    public class Builder {
+
+        private MavenArtifactResolver artifactResolver;
+        private RegistriesConfig config;
+        private boolean built;
+
+        private Builder() {
+        }
+
+        public Builder artifactResolver(MavenArtifactResolver resolver) {
+            assertNotBuilt();
+            artifactResolver = resolver;
+            return this;
+        }
+
+        public Builder messageWriter(MessageWriter messageWriter) {
+            assertNotBuilt();
+            log = messageWriter;
+            return this;
+        }
+
+        public Builder config(RegistriesConfig registriesConfig) {
+            assertNotBuilt();
+            config = registriesConfig;
+            return this;
+        }
+
+        public ExtensionCatalogResolver build() {
+            assertNotBuilt();
+            built = true;
+            completeConfig();
+            buildRegistryClients();
+            return ExtensionCatalogResolver.this;
+        }
+
+        private void completeConfig() {
+            if (config == null) {
+                config = RegistriesConfigLocator.resolveConfig();
+            }
+            if (log == null) {
+                log = config.isDebug() ? MessageWriter.debug() : MessageWriter.info();
+            }
+            if (artifactResolver == null) {
+                try {
+                    artifactResolver = MavenArtifactResolver.builder()
+                            .setWorkspaceDiscovery(false)
+                            .setArtifactTransferLogging(config.isDebug())
+                            .build();
+                } catch (BootstrapMavenException e) {
+                    throw new IllegalStateException("Failed to intialize the default Maven artifact resolver", e);
+                }
+            }
+        }
+
+        private void buildRegistryClients() {
+            registries = new ArrayList<>(config.getRegistries().size());
+            final RegistryClientFactory defaultClientFactory = new MavenRegistryClientFactory(artifactResolver,
+                    log);
+            for (RegistryConfig config : config.getRegistries()) {
+                if (config.isDisabled()) {
+                    continue;
+                }
+                try {
+                    registries.add(new RegistryExtensionResolver(defaultClientFactory.buildRegistryClient(config), log));
+                } catch (RegistryResolutionException e) {
+                    // TODO this should be enabled once the registry comes to life
+                    log.debug(e.getMessage());
+                    continue;
+                }
+            }
+        }
+
+        private void assertNotBuilt() {
+            if (built) {
+                throw new IllegalStateException("The builder has already built an instance");
+            }
+        }
+    }
+
+    private MessageWriter log;
+    private List<RegistryExtensionResolver> registries;
+
+    public boolean hasRegistries() {
+        return !registries.isEmpty();
+    }
+
+    public PlatformCatalog resolvePlatformCatalog() throws RegistryResolutionException {
+        return resolvePlatformCatalog(null);
+    }
+
+    public PlatformCatalog resolvePlatformCatalog(String quarkusVersion) throws RegistryResolutionException {
+        final Set<ArtifactKey> collectedPlatformKeys = new HashSet<>();
+
+        List<PlatformCatalog> catalogs = new ArrayList<>(registries.size());
+        for (RegistryExtensionResolver qer : registries) {
+            final PlatformCatalog catalog = qer.resolvePlatformCatalog(quarkusVersion);
+            if (catalog != null) {
+                catalogs.add(catalog);
+            }
+        }
+
+        if (catalogs.isEmpty()) {
+            return null;
+        }
+        if (catalogs.size() == 1) {
+            return catalogs.get(0);
+        }
+
+        final JsonPlatformCatalog result = new JsonPlatformCatalog();
+
+        result.setDefaultPlatform(catalogs.get(0).getDefaultPlatform());
+
+        final List<Platform> collectedPlatforms = new ArrayList<>();
+        result.setPlatforms(collectedPlatforms);
+
+        collectedPlatformKeys.clear();
+        for (PlatformCatalog c : catalogs) {
+            collectPlatforms(c, collectedPlatforms, collectedPlatformKeys);
+        }
+
+        return result;
+    }
+
+    private void collectPlatforms(PlatformCatalog catalog, List<Platform> collectedPlatforms,
+            Set<ArtifactKey> collectedPlatformKeys) {
+        for (Platform p : catalog.getPlatforms()) {
+            if (collectedPlatformKeys.add(p.getBom().getKey())) {
+                collectedPlatforms.add(p);
+            }
+        }
+    }
+
+    public ExtensionCatalog resolveExtensionCatalog() throws RegistryResolutionException {
+        return resolveExtensionCatalog((String) null);
+    }
+
+    public ExtensionCatalog resolveExtensionCatalog(String quarkusCoreVersion) throws RegistryResolutionException {
+
+        final int registriesTotal = registries.size();
+        if (registriesTotal == 0) {
+            throw new RegistryResolutionException("No registries configured");
+        }
+        final Map<String, List<RegistryExtensionResolver>> registriesByQuarkusCore = new LinkedHashMap<>(registriesTotal);
+        List<ExtensionCatalog> extensionCatalogs = null;
+
+        if (quarkusCoreVersion == null) {
+            // if there is only one registry and all the platforms it recommends are based
+            // on the same quarkus version then we don't need to execute extra requests to align the platforms
+            // on the common quarkus version
+            if (registriesTotal == 1) {
+                final PlatformCatalog platformsCatalog = registries.get(0).resolvePlatformCatalog();
+                final List<Platform> platforms = platformsCatalog == null ? Collections.emptyList()
+                        : platformsCatalog.getPlatforms();
+                if (platforms.isEmpty()) {
+                    // TODO this should be allowed
+                    throw new RegistryResolutionException(
+                            "Registry " + registries.get(0).getId() + " does not provide any platform");
+                }
+                String commonQuarkusVersion = quarkusCoreVersion = platforms.get(0).getQuarkusCoreVersion();
+                Platform defaultPlatform = null;
+                int i = 1;
+                while (i < platforms.size()) {
+                    final Platform p = platforms.get(i++);
+                    if (defaultPlatform == null && p.getBom().equals(platformsCatalog.getDefaultPlatform())) {
+                        defaultPlatform = p;
+                        quarkusCoreVersion = p.getQuarkusCoreVersion();
+                    }
+                    if (commonQuarkusVersion != null && !commonQuarkusVersion.equals(p.getQuarkusCoreVersion())) {
+                        commonQuarkusVersion = null;
+                    }
+                }
+                if (commonQuarkusVersion != null) {
+                    // all platforms are aligned on the same quarkus version
+                    final RegistryExtensionResolver mainRegistry = registries.get(0);
+                    registriesByQuarkusCore.put(commonQuarkusVersion, Arrays.asList(mainRegistry));
+                    extensionCatalogs = new ArrayList<>();
+                    i = 0;
+                    while (i < platforms.size()) {
+                        extensionCatalogs.add(mainRegistry.resolvePlatformExtensions(platforms.get(i++).getBom()));
+                    }
+                }
+            } else {
+                quarkusCoreVersion = registries.get(0).resolveDefaultPlatform().getQuarkusCoreVersion();
+            }
+        }
+
+        if (extensionCatalogs == null) {
+            // collect all the platform extensions from all the registries compatible with the given quarkus core version
+            extensionCatalogs = new ArrayList<>();
+            final Set<String> upstreamQuarkusVersions = new HashSet<>(1);
+
+            collectPlatforms(quarkusCoreVersion, registriesByQuarkusCore, upstreamQuarkusVersions, extensionCatalogs);
+
+            if (!upstreamQuarkusVersions.isEmpty()) {
+                Set<String> upstreamToProcess = upstreamQuarkusVersions;
+                Set<String> collectedUpstream = new HashSet<>(0);
+                do {
+                    collectedUpstream.clear();
+                    final Iterator<String> upstreamIterator = upstreamToProcess.iterator();
+                    while (upstreamIterator.hasNext()) {
+                        collectPlatforms(upstreamIterator.next(),
+                                registriesByQuarkusCore, collectedUpstream, extensionCatalogs);
+                    }
+                    final Set<String> tmp = upstreamToProcess;
+                    upstreamToProcess = collectedUpstream;
+                    collectedUpstream = tmp;
+                } while (!upstreamToProcess.isEmpty());
+            }
+        }
+        return appendNonPlatformExtensions(registriesByQuarkusCore, extensionCatalogs);
+    }
+
+    public ExtensionCatalog resolveExtensionCatalog(List<ArtifactCoords> platforms)
+            throws RegistryResolutionException {
+        if (platforms.isEmpty()) {
+            return resolveExtensionCatalog();
+        }
+        final List<ExtensionCatalog> catalogs = new ArrayList<>(platforms.size() + registries.size());
+        Map<String, List<RegistryExtensionResolver>> registriesByQuarkusCore = new HashMap<>(2);
+        String quarkusVersion = null;
+        for (ArtifactCoords bom : platforms) {
+            final List<RegistryExtensionResolver> registries;
+            try {
+                registries = filterRegistries(r -> r.checkPlatform(bom));
+            } catch (ExclusiveProviderConflictException e) {
+                final StringBuilder buf = new StringBuilder();
+                buf.append(
+                        "The following registries were configured as exclusive providers of the ");
+                buf.append(bom);
+                buf.append("platform: ").append(e.conflictingRegistries.get(0).getId());
+                for (int i = 1; i < e.conflictingRegistries.size(); ++i) {
+                    buf.append(", ").append(e.conflictingRegistries.get(i).getId());
+                }
+                throw new RuntimeException(buf.toString());
+            }
+
+            final ExtensionCatalog catalog = resolvePlatformExtensions(bom, registries);
+            if (catalog != null) {
+                catalogs.add(catalog);
+                if (quarkusVersion == null) {
+                    quarkusVersion = catalog.getQuarkusCoreVersion();
+                    registriesByQuarkusCore.put(quarkusVersion, getRegistriesForQuarkusVersion(quarkusVersion));
+                }
+                final String upstreamQuarkusVersion = catalog.getUpstreamQuarkusCoreVersion();
+                if (upstreamQuarkusVersion != null && !registriesByQuarkusCore.containsKey(upstreamQuarkusVersion)) {
+                    registriesByQuarkusCore.put(upstreamQuarkusVersion,
+                            getRegistriesForQuarkusVersion(upstreamQuarkusVersion));
+                }
+            }
+        }
+        return appendNonPlatformExtensions(registriesByQuarkusCore, catalogs);
+    }
+
+    private ExtensionCatalog resolvePlatformExtensions(ArtifactCoords bom, List<RegistryExtensionResolver> registries) {
+        if (registries.isEmpty()) {
+            log.debug("None of the configured registries recognizes platform %s", bom);
+            return null;
+        }
+        for (RegistryExtensionResolver registry : registries) {
+            try {
+                return registry.resolvePlatformExtensions(bom);
+            } catch (RegistryResolutionException e) {
+            }
+        }
+        final StringBuilder buf = new StringBuilder();
+        buf.append("Failed to resolve platform ").append(bom).append(" using the following registries: ");
+        buf.append(registries.get(0).getId());
+        for (int i = 1; i < registries.size(); ++i) {
+            buf.append(", ").append(registries.get(i++));
+        }
+        log.warn(buf.toString());
+        return null;
+    }
+
+    private ExtensionCatalog appendNonPlatformExtensions(
+            final Map<String, List<RegistryExtensionResolver>> registriesByQuarkusCore,
+            List<ExtensionCatalog> extensionCatalogs) throws RegistryResolutionException {
+        for (Map.Entry<String, List<RegistryExtensionResolver>> quarkusVersionRegistries : registriesByQuarkusCore.entrySet()) {
+            for (RegistryExtensionResolver registry : quarkusVersionRegistries.getValue()) {
+                final ExtensionCatalog nonPlatformCatalog = registry
+                        .resolveNonPlatformExtensions(quarkusVersionRegistries.getKey());
+                if (nonPlatformCatalog != null) {
+                    extensionCatalogs.add(nonPlatformCatalog);
+                }
+            }
+        }
+        return JsonCatalogMerger.merge(extensionCatalogs);
+    }
+
+    private void collectPlatforms(String quarkusCoreVersion,
+            Map<String, List<RegistryExtensionResolver>> registriesByQuarkusCore,
+            Set<String> upstreamQuarkusVersions, List<ExtensionCatalog> extensionCatalogs) throws RegistryResolutionException {
+        List<RegistryExtensionResolver> quarkusVersionRegistries = registriesByQuarkusCore.get(quarkusCoreVersion);
+        if (quarkusVersionRegistries != null) {
+            return;
+        }
+
+        quarkusVersionRegistries = getRegistriesForQuarkusVersion(quarkusCoreVersion);
+        registriesByQuarkusCore.put(quarkusCoreVersion, quarkusVersionRegistries);
+
+        for (RegistryExtensionResolver registry : quarkusVersionRegistries) {
+            final PlatformCatalog platformCatalog = registry.resolvePlatformCatalog(quarkusCoreVersion);
+            if (platformCatalog == null) {
+                continue;
+            }
+            final List<Platform> platforms = platformCatalog.getPlatforms();
+            if (platforms.isEmpty()) {
+                continue;
+            }
+            for (Platform p : platforms) {
+                final String upstreamQuarkusCoreVersion = p.getUpstreamQuarkusCoreVersion();
+                if (upstreamQuarkusCoreVersion != null
+                        && !registriesByQuarkusCore.containsKey(upstreamQuarkusCoreVersion)) {
+                    upstreamQuarkusVersions.add(upstreamQuarkusCoreVersion);
+                }
+                final ExtensionCatalog catalog = registry.resolvePlatformExtensions(p.getBom());
+                if (catalog != null) {
+                    extensionCatalogs.add(catalog);
+                }
+            }
+        }
+    }
+
+    private List<RegistryExtensionResolver> getRegistriesForQuarkusVersion(String quarkusCoreVersion) {
+        try {
+            return filterRegistries(r -> r.checkQuarkusVersion(quarkusCoreVersion));
+        } catch (ExclusiveProviderConflictException e) {
+            final StringBuilder buf = new StringBuilder();
+            buf.append(
+                    "The following registries were configured as exclusive providers of extensions based on Quarkus version ");
+            buf.append(quarkusCoreVersion);
+            buf.append(": ").append(e.conflictingRegistries.get(0).getId());
+            for (int i = 1; i < e.conflictingRegistries.size(); ++i) {
+                buf.append(", ").append(e.conflictingRegistries.get(i).getId());
+            }
+            throw new RuntimeException(buf.toString());
+        }
+    }
+
+    private List<RegistryExtensionResolver> filterRegistries(Function<RegistryExtensionResolver, Integer> recognizer)
+            throws ExclusiveProviderConflictException {
+        RegistryExtensionResolver exclusiveProvider = null;
+        List<RegistryExtensionResolver> filtered = null;
+        List<RegistryExtensionResolver> conflicts = null;
+        for (int i = 0; i < registries.size(); ++i) {
+            final RegistryExtensionResolver registry = registries.get(i);
+            final int versionCheck = recognizer.apply(registry);
+
+            if (versionCheck == RegistryExtensionResolver.VERSION_NOT_RECOGNIZED) {
+                if (exclusiveProvider == null && filtered == null) {
+                    filtered = new ArrayList<>(registries.size() - 1);
+                    for (int j = 0; j < i; ++j) {
+                        filtered.add(registries.get(j));
+                    }
+                }
+                continue;
+            }
+
+            if (versionCheck == RegistryExtensionResolver.VERSION_EXCLUSIVE_PROVIDER) {
+                if (exclusiveProvider == null) {
+                    exclusiveProvider = registry;
+                } else {
+                    if (conflicts == null) {
+                        conflicts = new ArrayList<>();
+                        conflicts.add(exclusiveProvider);
+                    }
+                    conflicts.add(registry);
+                }
+            }
+
+            if (filtered != null) {
+                filtered.add(registry);
+            }
+        }
+
+        if (conflicts != null) {
+            throw new ExclusiveProviderConflictException(conflicts);
+        }
+
+        return exclusiveProvider == null ? filtered == null ? registries : filtered : Arrays.asList(exclusiveProvider);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java
new file mode 100644
index 0000000000000..6727b1b08f45f
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java
@@ -0,0 +1,92 @@
+package io.quarkus.registry;
+
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import io.quarkus.registry.client.RegistryClient;
+import io.quarkus.registry.config.RegistryConfig;
+import io.quarkus.registry.util.GlobUtil;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+class RegistryExtensionResolver {
+
+    public static final int VERSION_NOT_RECOGNIZED = -1;
+    public static final int VERSION_NOT_CONFIGURED = 0;
+    public static final int VERSION_RECOGNIZED = 1;
+    public static final int VERSION_EXCLUSIVE_PROVIDER = 2;
+
+    private final RegistryConfig config;
+    private final RegistryClient extensionResolver;
+
+    private Pattern recognizedQuarkusVersions;
+
+    RegistryExtensionResolver(RegistryClient extensionResolver,
+            MessageWriter log) throws RegistryResolutionException {
+        this.extensionResolver = Objects.requireNonNull(extensionResolver, "Registry extension resolver is null");
+        this.config = extensionResolver.resolveRegistryConfig();
+
+        String versionExpr = config.getQuarkusVersions() == null ? null
+                : config.getQuarkusVersions().getRecognizedVersionsExpression();
+        if (versionExpr != null) {
+            recognizedQuarkusVersions = Pattern.compile(GlobUtil.toRegexPattern(versionExpr));
+        }
+    }
+
+    String getId() {
+        return config.getId();
+    }
+
+    int checkQuarkusVersion(String quarkusVersion) {
+        if (recognizedQuarkusVersions == null) {
+            return VERSION_NOT_CONFIGURED;
+        }
+        if (!recognizedQuarkusVersions.matcher(quarkusVersion).matches()) {
+            return VERSION_NOT_RECOGNIZED;
+        }
+        return config.getQuarkusVersions().isExclusiveProvider() ? VERSION_EXCLUSIVE_PROVIDER
+                : VERSION_RECOGNIZED;
+    }
+
+    int checkPlatform(ArtifactCoords platform) {
+        // TODO this should be allowed to check the full coordinates
+        return checkQuarkusVersion(platform.getVersion());
+    }
+
+    PlatformCatalog resolvePlatformCatalog() throws RegistryResolutionException {
+        return resolvePlatformCatalog(null);
+    }
+
+    PlatformCatalog resolvePlatformCatalog(String quarkusCoreVersion) throws RegistryResolutionException {
+        return extensionResolver.resolvePlatforms(quarkusCoreVersion);
+    }
+
+    Platform resolveDefaultPlatform() throws RegistryResolutionException {
+        final PlatformCatalog platformsCatalog = resolvePlatformCatalog();
+        final ArtifactCoords defaultCoords = platformsCatalog.getDefaultPlatform();
+        for (Platform p : platformsCatalog.getPlatforms()) {
+            if (defaultCoords.equals(p.getBom())) {
+                return p;
+            }
+        }
+        final StringBuilder buf = new StringBuilder();
+        buf.append("Failed to locate the default platform ").append(defaultCoords).append(" in the catalog of ");
+        final Iterator<Platform> i = platformsCatalog.getPlatforms().iterator();
+        buf.append(i.next().getBom());
+        while (i.hasNext()) {
+            buf.append(", ").append(i.next().getBom());
+        }
+        throw new RegistryResolutionException(buf.toString());
+    }
+
+    ExtensionCatalog resolveNonPlatformExtensions(String quarkusCoreVersion) throws RegistryResolutionException {
+        return extensionResolver.resolveNonPlatformExtensions(quarkusCoreVersion);
+    }
+
+    ExtensionCatalog resolvePlatformExtensions(ArtifactCoords platform) throws RegistryResolutionException {
+        return extensionResolver.resolvePlatformExtensions(platform);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryResolutionException.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryResolutionException.java
new file mode 100644
index 0000000000000..468c93dbdbdd9
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryResolutionException.java
@@ -0,0 +1,12 @@
+package io.quarkus.registry;
+
+public class RegistryResolutionException extends Exception {
+
+    public RegistryResolutionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public RegistryResolutionException(String message) {
+        super(message);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java
new file mode 100644
index 0000000000000..fa365b730ef39
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Category.java
@@ -0,0 +1,16 @@
+package io.quarkus.registry.catalog;
+
+import java.util.Map;
+
+public interface Category {
+
+    String MD_PINNED = "pinned";
+
+    String getId();
+
+    String getName();
+
+    String getDescription();
+
+    Map<String, Object> getMetadata();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java
new file mode 100644
index 0000000000000..29677d39b5c31
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Extension.java
@@ -0,0 +1,49 @@
+package io.quarkus.registry.catalog;
+
+import io.quarkus.maven.ArtifactCoords;
+import java.util.List;
+import java.util.Map;
+
+public interface Extension {
+
+    String MD_SHORT_NAME = "short-name";
+    String MD_NESTED_CODESTART_NAME = "codestart.name";
+    String MD_NESTED_CODESTART_LANGUAGES = "codestart.languages";
+    String MD_NESTED_CODESTART_KIND = "codestart.kind";
+    String MD_NESTED_CODESTART_ARTIFACT = "codestart.artifact";
+
+    String MD_GUIDE = "guide";
+    String MD_KEYWORDS = "keywords";
+    String MD_UNLISTED = "unlisted";
+    String MD_CATEGORIES = "categories";
+    String MD_STATUS = "status";
+
+    String getName();
+
+    String getDescription();
+
+    ArtifactCoords getArtifact();
+
+    List<ExtensionOrigin> getOrigins();
+
+    default boolean hasPlatformOrigin() {
+        final List<ExtensionOrigin> origins = getOrigins();
+        if (origins == null || origins.isEmpty()) {
+            return false;
+        }
+        for (ExtensionOrigin o : origins) {
+            if (o.isPlatform()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    Map<String, Object> getMetadata();
+
+    default String managementKey() {
+        final ArtifactCoords artifact = getArtifact();
+        return artifact.getGroupId() + ":" + artifact.getArtifactId();
+    }
+
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java
new file mode 100644
index 0000000000000..0561aae31dd12
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionCatalog.java
@@ -0,0 +1,58 @@
+package io.quarkus.registry.catalog;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface ExtensionCatalog extends ExtensionOrigin {
+
+    /**
+     * All the origins this catalog is derived from.
+     *
+     * @return all the origins this catalog derives from.
+     */
+    List<ExtensionOrigin> getDerivedFrom();
+
+    /**
+     * Quarkus core version used by the extensions in this catalog.
+     *
+     * @return Quarkus core version used by the extensions in this catalog
+     */
+    String getQuarkusCoreVersion();
+
+    /**
+     * In case the catalog was built for a custom version of the Quarkus core,
+     * this version represents the corresponding upstream community Quarkus core version.
+     * This is done to be able to link the custom builds of Quarkus back to the upstream community
+     * extensions ecosystem.
+     *
+     * This method may return null in case the corresponding version does not exist in the upstream community
+     * or simply to link back to it.
+     *
+     *
+     * @return the upstream community Quarkus core version corresponding to the Quarkus core version
+     *         used in this catalog
+     */
+    String getUpstreamQuarkusCoreVersion();
+
+    /**
+     * Quarkus extensions that constitute the catalog.
+     *
+     * @return Quarkus extensions that constitute the catalog.
+     */
+    Collection<Extension> getExtensions();
+
+    /**
+     * Extension categories
+     *
+     * @return extension categories
+     */
+    List<Category> getCategories();
+
+    /**
+     * Various metadata attached to the catalog
+     *
+     * @return metadata attached to the catalog
+     */
+    Map<String, Object> getMetadata();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java
new file mode 100644
index 0000000000000..4380b6bf6046a
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/ExtensionOrigin.java
@@ -0,0 +1,31 @@
+package io.quarkus.registry.catalog;
+
+import io.quarkus.maven.ArtifactCoords;
+
+public interface ExtensionOrigin {
+
+    /**
+     * Origin ID. E.g. GAV of the descriptor.
+     *
+     * @return origin ID
+     */
+    String getId();
+
+    /**
+     * BOM that should be imported by a project
+     * using extensions from this origin. This method normally won't return null.
+     * Given that any Quarkus project would typically be importing at least some version of
+     * io.quarkus:quarkus-bom even if extensions used in the project aren't managed by the quarkus-bom/
+     * the project
+     *
+     * @return BOM coordinates
+     */
+    ArtifactCoords getBom();
+
+    /**
+     * Whether the origin represents a platform.
+     *
+     * @return true in case the origin is a platform, otherwise - false
+     */
+    boolean isPlatform();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java
new file mode 100644
index 0000000000000..99ade7d77a364
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/Platform.java
@@ -0,0 +1,12 @@
+package io.quarkus.registry.catalog;
+
+import io.quarkus.maven.ArtifactCoords;
+
+public interface Platform {
+
+    ArtifactCoords getBom();
+
+    String getQuarkusCoreVersion();
+
+    String getUpstreamQuarkusCoreVersion();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java
new file mode 100644
index 0000000000000..30954d3da4dbf
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformCatalog.java
@@ -0,0 +1,11 @@
+package io.quarkus.registry.catalog;
+
+import io.quarkus.maven.ArtifactCoords;
+import java.util.List;
+
+public interface PlatformCatalog {
+
+    List<Platform> getPlatforms();
+
+    ArtifactCoords getDefaultPlatform();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsDeserializer.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsDeserializer.java
new file mode 100644
index 0000000000000..149ed84afd241
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsDeserializer.java
@@ -0,0 +1,17 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import io.quarkus.maven.ArtifactCoords;
+import java.io.IOException;
+
+public class JsonArtifactCoordsDeserializer extends JsonDeserializer<ArtifactCoords> {
+
+    @Override
+    public ArtifactCoords deserialize(JsonParser p, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        return ArtifactCoords.fromString(p.getText());
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsMixin.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsMixin.java
new file mode 100644
index 0000000000000..3095c2143e86c
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsMixin.java
@@ -0,0 +1,14 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.quarkus.maven.ArtifactKey;
+
+@JsonSerialize(using = JsonArtifactCoordsSerializer.class)
+@JsonDeserialize(using = JsonArtifactCoordsDeserializer.class)
+public interface JsonArtifactCoordsMixin {
+
+    @JsonIgnore
+    ArtifactKey getKey();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsSerializer.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsSerializer.java
new file mode 100644
index 0000000000000..94a6c6e521ffe
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonArtifactCoordsSerializer.java
@@ -0,0 +1,15 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import io.quarkus.maven.ArtifactCoords;
+import java.io.IOException;
+
+public class JsonArtifactCoordsSerializer extends JsonSerializer<ArtifactCoords> {
+
+    @Override
+    public void serialize(ArtifactCoords value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeString(value.toString());
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMapperHelper.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMapperHelper.java
new file mode 100644
index 0000000000000..424583d066a04
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMapperHelper.java
@@ -0,0 +1,85 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import io.quarkus.maven.ArtifactCoords;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class JsonCatalogMapperHelper {
+
+    private static ObjectMapper mapper;
+
+    public static ObjectMapper mapper() {
+        return mapper == null ? mapper = initMapper(new ObjectMapper()) : mapper;
+    }
+
+    public static ObjectMapper initMapper(ObjectMapper mapper) {
+        mapper.addMixIn(ArtifactCoords.class, JsonArtifactCoordsMixin.class);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.enable(JsonParser.Feature.ALLOW_COMMENTS);
+        mapper.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+        mapper.setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        return mapper;
+    }
+
+    public static void serialize(Object catalog, Path p) throws IOException {
+        serialize(mapper(), catalog, p);
+    }
+
+    public static void serialize(ObjectMapper mapper, Object catalog, Path p) throws IOException {
+        if (!Files.exists(p.getParent())) {
+            Files.createDirectories(p.getParent());
+        }
+        try (BufferedWriter writer = Files.newBufferedWriter(p)) {
+            serialize(mapper, catalog, writer);
+        }
+    }
+
+    public static void serialize(Object catalog, Writer writer) throws IOException {
+        serialize(mapper(), catalog, writer);
+    }
+
+    public static void serialize(ObjectMapper mapper, Object catalog, Writer writer) throws IOException {
+        mapper.writeValue(writer, catalog);
+    }
+
+    public static <T> T deserialize(Path p, Class<T> t) throws IOException {
+        return deserialize(mapper(), p, t);
+    }
+
+    public static <T> T deserialize(ObjectMapper mapper, Path p, Class<T> t) throws IOException {
+        if (!Files.exists(p)) {
+            throw new IllegalArgumentException("File " + p + " does not exist");
+        }
+        try (BufferedReader reader = Files.newBufferedReader(p)) {
+            return mapper.readValue(reader, t);
+        }
+    }
+
+    public static <T> T deserialize(InputStream is, Class<T> t) throws IOException {
+        return deserialize(mapper(), is, t);
+    }
+
+    public static <T> T deserialize(ObjectMapper mapper, InputStream is, Class<T> t) throws IOException {
+        return mapper.readValue(is, t);
+    }
+
+    public static <T> T deserialize(Reader reader, Class<T> t) throws IOException {
+        return deserialize(mapper(), reader, t);
+    }
+
+    public static <T> T deserialize(ObjectMapper mapper, Reader reader, Class<T> t) throws IOException {
+        return mapper.readValue(reader, t);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java
new file mode 100644
index 0000000000000..435a821accb82
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java
@@ -0,0 +1,85 @@
+package io.quarkus.registry.catalog.json;
+
+import io.quarkus.maven.ArtifactKey;
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class JsonCatalogMerger {
+
+    public static ExtensionCatalog merge(List<ExtensionCatalog> catalogs) {
+
+        if (catalogs.isEmpty()) {
+            throw new IllegalArgumentException("No catalogs provided");
+        }
+        if (catalogs.size() == 1) {
+            return catalogs.get(0);
+        }
+
+        final List<ExtensionCatalog> roots = detectRoots(catalogs);
+        if (roots.size() == 1) {
+            return roots.get(0);
+        }
+
+        final JsonExtensionCatalog combined = new JsonExtensionCatalog();
+
+        final Map<String, Category> categories = new LinkedHashMap<>();
+        final Map<String, ExtensionOrigin> derivedFrom = new LinkedHashMap<>();
+        final Map<ArtifactKey, Extension> extensions = new LinkedHashMap<>();
+        final Map<String, Object> metadata = new HashMap<>();
+        for (ExtensionCatalog catalog : roots) {
+            if (combined.getBom() == null) {
+                combined.setBom(catalog.getBom());
+            }
+
+            if (catalog.getId() != null) {
+                derivedFrom.putIfAbsent(catalog.getId(), catalog);
+            }
+            catalog.getDerivedFrom().forEach(o -> derivedFrom.putIfAbsent(o.getId(), o));
+
+            catalog.getCategories().forEach(c -> categories.putIfAbsent(c.getId(), c));
+            catalog.getExtensions().forEach(e -> extensions.putIfAbsent(e.getArtifact().getKey(), e));
+            catalog.getMetadata().entrySet().forEach(entry -> metadata.putIfAbsent(entry.getKey(), entry.getValue()));
+
+            if (combined.getQuarkusCoreVersion() == null && catalog.getQuarkusCoreVersion() != null) {
+                combined.setQuarkusCoreVersion(catalog.getQuarkusCoreVersion());
+            }
+            if (combined.getUpstreamQuarkusCoreVersion() == null && catalog.getUpstreamQuarkusCoreVersion() != null
+                    && !combined.getQuarkusCoreVersion().equals(catalog.getUpstreamQuarkusCoreVersion())) {
+                combined.setUpstreamQuarkusCoreVersion(catalog.getUpstreamQuarkusCoreVersion());
+            }
+        }
+
+        combined.setCategories(new ArrayList<>(categories.values()));
+        combined.setDerivedFrom(new ArrayList<>(derivedFrom.values()));
+        combined.setExtensions(new ArrayList<>(extensions.values()));
+        combined.setMetadata(metadata);
+        return combined;
+    }
+
+    private static List<ExtensionCatalog> detectRoots(List<ExtensionCatalog> catalogs) {
+        final Set<String> allDerivedFrom = new HashSet<>(catalogs.size());
+        for (ExtensionCatalog catalog : catalogs) {
+            for (ExtensionOrigin o : catalog.getDerivedFrom()) {
+                allDerivedFrom.add(o.getId());
+            }
+        }
+        final List<ExtensionCatalog> roots = new ArrayList<>(catalogs.size());
+        for (ExtensionCatalog catalog : catalogs) {
+            if (catalog.getId() == null) {
+                roots.add(catalog);
+            } else if (!allDerivedFrom.contains(catalog.getId())) {
+                roots.add(catalog);
+            }
+        }
+        return roots;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCategory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCategory.java
new file mode 100644
index 0000000000000..154e5f502e311
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCategory.java
@@ -0,0 +1,70 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.quarkus.registry.catalog.Category;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonCategory implements Category {
+
+    protected String id;
+    protected String name;
+    protected String description;
+
+    protected Map<String, Object> metadata;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public Map<String, Object> getMetadata() {
+        return metadata == null ? metadata = new HashMap<>() : metadata;
+    }
+
+    public void setMetadata(Map<String, Object> metadata) {
+        this.metadata = metadata;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final JsonCategory category = (JsonCategory) o;
+        return Objects.equals(id, category.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtension.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtension.java
new file mode 100644
index 0000000000000..e91b4c64ae190
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtension.java
@@ -0,0 +1,123 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonExtension implements Extension {
+
+    private String name;
+    private String description;
+    private Map<String, Object> metadata;
+    private ArtifactCoords artifact;
+    private List<ExtensionOrigin> origins;
+
+    // to support legacy format
+    private String groupId;
+    private String artifactId;
+    private String version;
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public ArtifactCoords getArtifact() {
+        if (artifact == null && artifactId != null) {
+            artifact = new ArtifactCoords(groupId, artifactId, version);
+        }
+        return artifact;
+    }
+
+    public void setArtifact(ArtifactCoords coords) {
+        this.artifact = coords;
+    }
+
+    public void setOrigins(List<ExtensionOrigin> origins) {
+        this.origins = origins;
+    }
+
+    @Override
+    @JsonIdentityReference(alwaysAsId = true)
+    @JsonDeserialize(contentAs = JsonExtensionOrigin.class)
+    public List<ExtensionOrigin> getOrigins() {
+        return origins == null ? Collections.emptyList() : origins;
+    }
+
+    @Override
+    public Map<String, Object> getMetadata() {
+        return metadata == null ? metadata = new HashMap<>() : metadata;
+    }
+
+    public void setMetadata(Map<String, Object> metadata) {
+        this.metadata = metadata;
+    }
+
+    public Extension addMetadata(String key, Object value) {
+        this.getMetadata().put(key, value);
+        return this;
+
+    }
+
+    public Extension removeMetadata(String key) {
+        this.getMetadata().remove(key);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return name + " " + getArtifact();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        JsonExtension extension = (JsonExtension) o;
+        return Objects.equals(artifact, extension.artifact);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(artifact);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionCatalog.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionCatalog.java
new file mode 100644
index 0000000000000..c1dcbb60597c0
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionCatalog.java
@@ -0,0 +1,87 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonExtensionCatalog extends JsonExtensionOrigin implements ExtensionCatalog {
+
+    private String quarkusCore;
+    private String upstreamQuarkusCore;
+    private List<ExtensionOrigin> derivedFrom;
+    private List<Extension> extensions;
+    private List<Category> categories;
+    private Map<String, Object> metadata;
+
+    @Override
+    public String getQuarkusCoreVersion() {
+        return quarkusCore;
+    }
+
+    public void setQuarkusCoreVersion(String quarkusCore) {
+        this.quarkusCore = quarkusCore;
+    }
+
+    @Override
+    public String getUpstreamQuarkusCoreVersion() {
+        return upstreamQuarkusCore;
+    }
+
+    public void setUpstreamQuarkusCoreVersion(String upstreamQuarkusCore) {
+        this.upstreamQuarkusCore = upstreamQuarkusCore;
+    }
+
+    @Override
+    @JsonDeserialize(contentAs = JsonExtensionOrigin.class)
+    public List<ExtensionOrigin> getDerivedFrom() {
+        return derivedFrom == null ? Collections.emptyList() : derivedFrom;
+    }
+
+    public void setDerivedFrom(List<ExtensionOrigin> origins) {
+        this.derivedFrom = origins;
+    }
+
+    @Override
+    @JsonDeserialize(contentAs = JsonExtension.class)
+    public List<Extension> getExtensions() {
+        return extensions == null ? Collections.emptyList() : extensions;
+    }
+
+    public void setExtensions(List<Extension> extensions) {
+        this.extensions = extensions;
+    }
+
+    public void addExtension(Extension e) {
+        if (extensions == null) {
+            extensions = new ArrayList<>();
+        }
+        extensions.add(e);
+    }
+
+    @Override
+    @JsonDeserialize(contentAs = JsonCategory.class)
+    public List<Category> getCategories() {
+        return categories == null ? Collections.emptyList() : categories;
+    }
+
+    public void setCategories(List<Category> categories) {
+        this.categories = categories;
+    }
+
+    @Override
+    public Map<String, Object> getMetadata() {
+        return metadata == null ? Collections.emptyMap() : metadata;
+    }
+
+    public void setMetadata(Map<String, Object> metadata) {
+        this.metadata = metadata;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionOrigin.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionOrigin.java
new file mode 100644
index 0000000000000..71abbe826258d
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonExtensionOrigin.java
@@ -0,0 +1,53 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.ExtensionOrigin;
+
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id")
+public class JsonExtensionOrigin implements ExtensionOrigin {
+
+    protected String id;
+    protected boolean platform;
+    protected ArtifactCoords bom;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public ArtifactCoords getBom() {
+        return bom;
+    }
+
+    public void setBom(ArtifactCoords bom) {
+        this.bom = bom;
+    }
+
+    @Override
+    public boolean isPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(boolean platform) {
+        this.platform = platform;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder buf = new StringBuilder();
+        buf.append('[');
+        if (id != null) {
+            buf.append("id=").append(id).append(' ');
+        }
+        buf.append("platform=").append(platform);
+        buf.append(" boms=").append(bom);
+        return buf.append(']').toString();
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonPlatform.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonPlatform.java
new file mode 100644
index 0000000000000..ba29ca4e5eb04
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonPlatform.java
@@ -0,0 +1,52 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Platform;
+import java.util.Objects;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonPlatform implements Platform {
+
+    public static JsonPlatform of(ArtifactCoords bom) {
+        JsonPlatform p = new JsonPlatform();
+        p.setBom(Objects.requireNonNull(bom, "bom can't be null"));
+        return p;
+    }
+
+    private ArtifactCoords bom;
+    private String quarkusCore;
+    private String upstreamQuarkusCore;
+
+    @Override
+    public ArtifactCoords getBom() {
+        return bom;
+    }
+
+    public void setBom(ArtifactCoords bom) {
+        this.bom = bom;
+    }
+
+    @Override
+    public String getQuarkusCoreVersion() {
+        return quarkusCore;
+    }
+
+    public void setQuarkusCoreVersion(String quarkusCore) {
+        this.quarkusCore = quarkusCore;
+    }
+
+    @Override
+    public String getUpstreamQuarkusCoreVersion() {
+        return upstreamQuarkusCore;
+    }
+
+    public void setUpstreamQuarkusCoreVersion(String upstreamQuarkusCore) {
+        this.upstreamQuarkusCore = upstreamQuarkusCore;
+    }
+
+    @Override
+    public String toString() {
+        return "[platform " + bom + ", quarkus-core=" + quarkusCore + ", upstream-quarkus-core=" + upstreamQuarkusCore + "]";
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonPlatformCatalog.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonPlatformCatalog.java
new file mode 100644
index 0000000000000..988993193c515
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonPlatformCatalog.java
@@ -0,0 +1,43 @@
+package io.quarkus.registry.catalog.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonPlatformCatalog implements PlatformCatalog {
+
+    private List<Platform> platforms;
+    private ArtifactCoords defaultPlatform;
+
+    @Override
+    @JsonDeserialize(contentAs = JsonPlatform.class)
+    public List<Platform> getPlatforms() {
+        return platforms == null ? Collections.emptyList() : platforms;
+    }
+
+    public void setPlatforms(List<Platform> platforms) {
+        this.platforms = platforms;
+    }
+
+    public void addPlatform(Platform platform) {
+        if (platforms == null) {
+            platforms = new ArrayList<>();
+        }
+        platforms.add(platform);
+    }
+
+    @Override
+    public ArtifactCoords getDefaultPlatform() {
+        return defaultPlatform;
+    }
+
+    public void setDefaultPlatform(ArtifactCoords defaultPlatform) {
+        this.defaultPlatform = defaultPlatform;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClient.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClient.java
new file mode 100644
index 0000000000000..f2b1e83075f0d
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClient.java
@@ -0,0 +1,55 @@
+package io.quarkus.registry.client;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import io.quarkus.registry.config.RegistryConfig;
+import java.util.Objects;
+
+/**
+ * Implements the basic queries a registry client is supposed to handle.
+ * Although there are only a few kinds of queries, a registry is not required to support
+ * all of them. For example, a registry may be configured to only provide platform extensions or
+ * the other way around - provide only non-platform extensions but not platforms.
+ */
+public class RegistryClient
+        implements RegistryNonPlatformExtensionsResolver, RegistryPlatformExtensionsResolver, RegistryPlatformsResolver,
+        RegistryConfigResolver {
+
+    private final RegistryPlatformsResolver platforms;
+    private final RegistryPlatformExtensionsResolver platformExtensions;
+    private final RegistryNonPlatformExtensionsResolver nonPlatformExtensions;
+    protected RegistryConfig config;
+
+    public RegistryClient(RegistryConfig config, RegistryPlatformsResolver platforms,
+            RegistryPlatformExtensionsResolver platformExtensions,
+            RegistryNonPlatformExtensionsResolver nonPlatformExtensions) {
+        this.config = config;
+        this.platforms = platforms;
+        this.platformExtensions = Objects.requireNonNull(platformExtensions);
+        this.nonPlatformExtensions = nonPlatformExtensions;
+    }
+
+    @Override
+    public PlatformCatalog resolvePlatforms(String quarkusVersion) throws RegistryResolutionException {
+        return platforms == null ? null : platforms.resolvePlatforms(quarkusVersion);
+    }
+
+    @Override
+    public ExtensionCatalog resolvePlatformExtensions(ArtifactCoords platformCoords)
+            throws RegistryResolutionException {
+        return platformExtensions.resolvePlatformExtensions(platformCoords);
+    }
+
+    @Override
+    public ExtensionCatalog resolveNonPlatformExtensions(String quarkusVersion) throws RegistryResolutionException {
+        return nonPlatformExtensions == null ? null
+                : nonPlatformExtensions.resolveNonPlatformExtensions(quarkusVersion);
+    }
+
+    @Override
+    public RegistryConfig resolveRegistryConfig() throws RegistryResolutionException {
+        return config;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientFactory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientFactory.java
new file mode 100644
index 0000000000000..fbfda63c8bf34
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryClientFactory.java
@@ -0,0 +1,9 @@
+package io.quarkus.registry.client;
+
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.config.RegistryConfig;
+
+public interface RegistryClientFactory {
+
+    RegistryClient buildRegistryClient(RegistryConfig config) throws RegistryResolutionException;
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryConfigResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryConfigResolver.java
new file mode 100644
index 0000000000000..39d7a64f07233
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryConfigResolver.java
@@ -0,0 +1,17 @@
+package io.quarkus.registry.client;
+
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.config.RegistryConfig;
+
+public interface RegistryConfigResolver {
+
+    /**
+     * Returns the complete registry configuration. The idea is that the default configuration
+     * to communicate with the registry will be provided by the registry admins for all users.
+     * Users though will still have a chance to adjust certain config options on the client side.
+     *
+     * @return complete registry configuration
+     * @throws RegistryResolutionException in case of a failure
+     */
+    RegistryConfig resolveRegistryConfig() throws RegistryResolutionException;
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryNonPlatformExtensionsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryNonPlatformExtensionsResolver.java
new file mode 100644
index 0000000000000..90cacf5a35a8b
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryNonPlatformExtensionsResolver.java
@@ -0,0 +1,19 @@
+package io.quarkus.registry.client;
+
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public interface RegistryNonPlatformExtensionsResolver {
+
+    /**
+     * Returns a catalog of extensions that are compatible with a given Quarkus version
+     * or null, in case the registry does not include any extension that is compatible
+     * with the given Quarkus version.
+     *
+     * @param quarkusVersion Quarkus version
+     * @return catalog of extensions compatible with a given Quarkus version or null
+     * @throws RegistryResolutionException in case of a failure
+     */
+    ExtensionCatalog resolveNonPlatformExtensions(String quarkusVersion)
+            throws RegistryResolutionException;
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryPlatformExtensionsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryPlatformExtensionsResolver.java
new file mode 100644
index 0000000000000..d8cfafda00256
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryPlatformExtensionsResolver.java
@@ -0,0 +1,18 @@
+package io.quarkus.registry.client;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public interface RegistryPlatformExtensionsResolver {
+
+    /**
+     * Returns a catalog of extensions that represents a given platform.
+     *
+     * @param platformCoords either a BOM or a JSON descriptor coordinates
+     * @return catalog of extensions that represents the platform
+     * @throws RegistryResolutionException in case of a failure
+     */
+    ExtensionCatalog resolvePlatformExtensions(ArtifactCoords platformCoords)
+            throws RegistryResolutionException;
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryPlatformsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryPlatformsResolver.java
new file mode 100644
index 0000000000000..f54594552676e
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/RegistryPlatformsResolver.java
@@ -0,0 +1,18 @@
+package io.quarkus.registry.client;
+
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.PlatformCatalog;
+
+public interface RegistryPlatformsResolver {
+
+    /**
+     * Returns a catalog of the recommended platform versions, indicating which one of them
+     * is the default one for new project creation, for a given Quarkus version or in general,
+     * in case the caller did not provide any specific Quarkus version.
+     *
+     * @param quarkusVersion Quarkus version or null
+     * @return catalog of the recommended platform versions
+     * @throws RegistryResolutionException in case of a failure
+     */
+    PlatformCatalog resolvePlatforms(String quarkusVersion) throws RegistryResolutionException;
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java
new file mode 100644
index 0000000000000..167aeffb1289d
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenNonPlatformExtensionsResolver.java
@@ -0,0 +1,51 @@
+package io.quarkus.registry.client.maven;
+
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
+import io.quarkus.registry.client.RegistryNonPlatformExtensionsResolver;
+import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig;
+import java.nio.file.Path;
+import java.util.Objects;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+
+public class MavenNonPlatformExtensionsResolver
+        implements RegistryNonPlatformExtensionsResolver {
+
+    private final RegistryNonPlatformExtensionsConfig config;
+    private final MavenArtifactResolver artifactResolver;
+    private final MessageWriter log;
+
+    public MavenNonPlatformExtensionsResolver(RegistryNonPlatformExtensionsConfig config,
+            MavenArtifactResolver artifactResolver, MessageWriter log) {
+        this.config = Objects.requireNonNull(config);
+        this.artifactResolver = Objects.requireNonNull(artifactResolver);
+        this.log = Objects.requireNonNull(log);
+    }
+
+    @Override
+    public ExtensionCatalog resolveNonPlatformExtensions(String quarkusVersion)
+            throws RegistryResolutionException {
+        final ArtifactCoords baseCoords = config.getArtifact();
+        final Artifact catalogArtifact = new DefaultArtifact(baseCoords.getGroupId(),
+                baseCoords.getArtifactId(), quarkusVersion, baseCoords.getType(), baseCoords.getVersion());
+        log.debug("Resolving non-platform extension catalog %s", catalogArtifact);
+        final Path jsonFile;
+        try {
+            jsonFile = artifactResolver.resolve(catalogArtifact).getArtifact().getFile().toPath();
+        } catch (Exception e) {
+            log.debug("Failed to resolve non-platform extension catalog %s", catalogArtifact);
+            return null;
+        }
+        try {
+            return JsonCatalogMapperHelper.deserialize(jsonFile, JsonExtensionCatalog.class);
+        } catch (Exception e) {
+            throw new RegistryResolutionException("Failed to load non-platform extension catalog from " + jsonFile, e);
+        }
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java
new file mode 100644
index 0000000000000..84603090c98ab
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformExtensionsResolver.java
@@ -0,0 +1,93 @@
+package io.quarkus.registry.client.maven;
+
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.Constants;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
+import io.quarkus.registry.client.RegistryPlatformExtensionsResolver;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Objects;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+
+public class MavenPlatformExtensionsResolver implements RegistryPlatformExtensionsResolver {
+
+    private final MavenArtifactResolver artifactResolver;
+    private final MessageWriter log;
+
+    public MavenPlatformExtensionsResolver(MavenArtifactResolver artifactResolver,
+            MessageWriter log) {
+        this.artifactResolver = Objects.requireNonNull(artifactResolver);
+        this.log = Objects.requireNonNull(log);
+    }
+
+    @Override
+    public ExtensionCatalog resolvePlatformExtensions(ArtifactCoords platformCoords) throws RegistryResolutionException {
+        final String version;
+        if (platformCoords.getVersion() == null) {
+            version = resolveLatestBomVersion(platformCoords, "[0-alpha,)");
+        } else if (isVersionRange(platformCoords.getVersion())) {
+            version = resolveLatestBomVersion(platformCoords, platformCoords.getVersion());
+        } else {
+            version = platformCoords.getVersion();
+        }
+        final String groupId = platformCoords.getGroupId();
+        final String artifactId = platformCoords.getArtifactId().endsWith(Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)
+                ? platformCoords.getArtifactId()
+                : platformCoords.getArtifactId() + Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX;
+        final String classifier = version;
+        final Artifact catalogArtifact = new DefaultArtifact(groupId, artifactId, classifier, "json", version);
+        log.debug("Resolving platform extension catalog %s", catalogArtifact);
+        final Path jsonPath;
+        try {
+            jsonPath = artifactResolver.resolve(catalogArtifact).getArtifact().getFile().toPath();
+        } catch (Exception e) {
+            throw new RegistryResolutionException("Failed to resolve Quarkus extensions catalog " + catalogArtifact,
+                    e);
+        }
+        try {
+            return JsonCatalogMapperHelper.deserialize(jsonPath, JsonExtensionCatalog.class);
+        } catch (IOException e) {
+            throw new RegistryResolutionException("Failed to parse Quarkus extensions catalog " + jsonPath, e);
+        }
+    }
+
+    private String resolveLatestBomVersion(ArtifactCoords bom, String versionRange)
+            throws RegistryResolutionException {
+        final Artifact bomArtifact = new DefaultArtifact(bom.getGroupId(),
+                bom.getArtifactId().endsWith(Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX)
+                        ? bom.getArtifactId().substring(0,
+                                bom.getArtifactId().length()
+                                        - Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX.length())
+                        : bom.getArtifactId(),
+                "", "pom", bom.getVersion());
+        log.debug("Resolving the latest version of %s:%s:%s:%s in the range %s", bom.getGroupId(), bom.getArtifactId(),
+                bom.getClassifier(), bom.getType(), versionRange);
+        try {
+            return artifactResolver.getLatestVersionFromRange(bomArtifact, versionRange);
+        } catch (Exception e) {
+            throw new RegistryResolutionException("Failed to resolve the latest version of " + bomArtifact.getGroupId()
+                    + ":" + bom.getArtifactId() + ":" + bom.getClassifier() + ":" + bom.getType() + ":" + versionRange, e);
+        }
+    }
+
+    private static boolean isVersionRange(String versionStr) {
+        if (versionStr == null || versionStr.isEmpty()) {
+            return false;
+        }
+        char c = versionStr.charAt(0);
+        if (c == '[' || c == '(') {
+            return true;
+        }
+        c = versionStr.charAt(versionStr.length() - 1);
+        if (c == ']' || c == ')') {
+            return true;
+        }
+        return versionStr.indexOf(',') >= 0;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java
new file mode 100644
index 0000000000000..a9056846ef1a9
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenPlatformsResolver.java
@@ -0,0 +1,51 @@
+package io.quarkus.registry.client.maven;
+
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonPlatformCatalog;
+import io.quarkus.registry.client.RegistryPlatformsResolver;
+import io.quarkus.registry.config.RegistryPlatformsConfig;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Objects;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+
+public class MavenPlatformsResolver implements RegistryPlatformsResolver {
+
+    private final RegistryPlatformsConfig config;
+    private final MavenArtifactResolver artifactResolver;
+    private final MessageWriter log;
+
+    public MavenPlatformsResolver(RegistryPlatformsConfig config, MavenArtifactResolver artifactResolver,
+            MessageWriter log) {
+        this.config = Objects.requireNonNull(config);
+        this.artifactResolver = Objects.requireNonNull(artifactResolver);
+        this.log = Objects.requireNonNull(log);
+    }
+
+    @Override
+    public PlatformCatalog resolvePlatforms(String quarkusVersion) throws RegistryResolutionException {
+        final ArtifactCoords baseCoords = config.getArtifact();
+        final Artifact catalogArtifact = new DefaultArtifact(baseCoords.getGroupId(), baseCoords.getArtifactId(),
+                quarkusVersion, baseCoords.getType(), baseCoords.getVersion());
+        log.debug("Resolving platform catalog %s", catalogArtifact);
+        final Path jsonFile;
+        try {
+            jsonFile = artifactResolver.resolve(catalogArtifact).getArtifact().getFile().toPath();
+        } catch (Exception e) {
+            log.debug("Failed to resolve platform catalog %s", catalogArtifact);
+            return null;
+        }
+        try {
+            return JsonCatalogMapperHelper.deserialize(jsonFile, JsonPlatformCatalog.class);
+        } catch (IOException e) {
+            throw new RegistryResolutionException(
+                    "Failed to load platform catalog from " + jsonFile, e);
+        }
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java
new file mode 100644
index 0000000000000..78b94b1a10a86
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java
@@ -0,0 +1,368 @@
+package io.quarkus.registry.client.maven;
+
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.Constants;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.client.RegistryClient;
+import io.quarkus.registry.client.RegistryClientFactory;
+import io.quarkus.registry.client.RegistryNonPlatformExtensionsResolver;
+import io.quarkus.registry.client.RegistryPlatformsResolver;
+import io.quarkus.registry.config.RegistryArtifactConfig;
+import io.quarkus.registry.config.RegistryConfig;
+import io.quarkus.registry.config.RegistryDescriptorConfig;
+import io.quarkus.registry.config.RegistryMavenConfig;
+import io.quarkus.registry.config.RegistryMavenRepoConfig;
+import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig;
+import io.quarkus.registry.config.RegistryPlatformsConfig;
+import io.quarkus.registry.config.json.JsonRegistryConfig;
+import io.quarkus.registry.config.json.JsonRegistryMavenConfig;
+import io.quarkus.registry.config.json.JsonRegistryMavenRepoConfig;
+import io.quarkus.registry.config.json.JsonRegistryPlatformsConfig;
+import io.quarkus.registry.config.json.RegistriesConfigMapperHelper;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.RepositoryPolicy;
+import org.eclipse.aether.resolution.ArtifactResult;
+
+public class MavenRegistryClientFactory implements RegistryClientFactory {
+
+    private MessageWriter log;
+    private MavenArtifactResolver originalResolver;
+    private List<RemoteRepository> singleRegistryRepos = new ArrayList<RemoteRepository>();
+
+    public MavenRegistryClientFactory(MavenArtifactResolver resolver, MessageWriter log) {
+        this.originalResolver = Objects.requireNonNull(resolver);
+        this.log = Objects.requireNonNull(log);
+    }
+
+    @Override
+    public RegistryClient buildRegistryClient(RegistryConfig config) throws RegistryResolutionException {
+        Objects.requireNonNull(config, "The registry config is null");
+
+        final RegistryDescriptorConfig descriptorConfig = Objects.requireNonNull(config.getDescriptor(),
+                "The registry descriptor configuration is missing");
+
+        MavenArtifactResolver resolver = originalResolver;
+
+        singleRegistryRepos.clear();
+        determineExtraRepos(config, resolver.getRepositories());
+
+        List<RemoteRepository> aggregatedRepos = resolver.getRepositories();
+        if (!singleRegistryRepos.isEmpty()) {
+            aggregatedRepos = resolver.getRemoteRepositoryManager().aggregateRepositories(resolver.getSession(),
+                    Collections.emptyList(), singleRegistryRepos, true);
+            aggregatedRepos = resolver.getRemoteRepositoryManager().aggregateRepositories(resolver.getSession(),
+                    aggregatedRepos, resolver.getRepositories(), false);
+            resolver = newResolver(resolver, aggregatedRepos);
+        }
+
+        final ArtifactCoords originalDescrCoords = descriptorConfig.getArtifact();
+        final Artifact registryDescriptorCoords = new DefaultArtifact(originalDescrCoords.getGroupId(),
+                originalDescrCoords.getArtifactId(), originalDescrCoords.getClassifier(), originalDescrCoords.getType(),
+                originalDescrCoords.getVersion());
+        ArtifactResult result;
+        try {
+            result = resolver.resolve(registryDescriptorCoords);
+        } catch (BootstrapMavenException e) {
+            final StringWriter buf = new StringWriter();
+            try (BufferedWriter writer = new BufferedWriter(buf)) {
+                writer.write("Failed to resolve Quarkus extensions registry descriptor ");
+                writer.write(registryDescriptorCoords.toString());
+                writer.write(" using the following repositories:");
+                for (RemoteRepository repo : aggregatedRepos) {
+                    writer.newLine();
+                    writer.write("- ");
+                    writer.write(repo.getId());
+                    writer.write(" (");
+                    writer.write(repo.getUrl());
+                    writer.write(")");
+                }
+            } catch (IOException e1) {
+                buf.append(e.getLocalizedMessage());
+            }
+            throw new RegistryResolutionException(buf.toString());
+        }
+
+        final String srcRepoId = result.getRepository() == null ? "n/a" : result.getRepository().getId();
+        log.debug("Resolved registry descriptor %s from %s", registryDescriptorCoords, srcRepoId);
+        if (!singleRegistryRepos.isEmpty()) {
+            if (srcRepoId != null && !"local".equals(srcRepoId)) {
+                String srcRepoUrl = null;
+                for (RemoteRepository repo : resolver.getRepositories()) {
+                    if (repo.getId().equals(srcRepoId)) {
+                        srcRepoUrl = repo.getUrl();
+                        break;
+                    }
+                }
+                if (srcRepoUrl == null) {
+                    throw new IllegalStateException(
+                            "Failed to locate the repository URL corresponding to repository " + srcRepoId);
+                }
+            } else {
+                log.debug("Failed to determine the remote repository for %s registry descriptor %s", config.getId(),
+                        registryDescriptorCoords);
+            }
+        }
+
+        final RegistryConfig descriptor;
+        try {
+            descriptor = RegistriesConfigMapperHelper.deserialize(result.getArtifact().getFile().toPath(),
+                    JsonRegistryConfig.class);
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to deserialize registries descriptor " + result.getArtifact().getFile(), e);
+        }
+
+        if (!isComplete(config, descriptor)) {
+            final JsonRegistryConfig complete = new JsonRegistryConfig();
+            complete(complete, config, descriptor);
+            config = complete;
+        }
+
+        final RegistryNonPlatformExtensionsResolver nonPlatformExtensionsResolver;
+        final RegistryNonPlatformExtensionsConfig nonPlatformExtensions = config.getNonPlatformExtensions();
+        if (nonPlatformExtensions == null || nonPlatformExtensions.isDisabled()) {
+            log.debug("Non-platform extension catalogs were disabled for registry %s", config.getId());
+            nonPlatformExtensionsResolver = null;
+        } else {
+            nonPlatformExtensionsResolver = new MavenNonPlatformExtensionsResolver(nonPlatformExtensions,
+                    resolver, log);
+        }
+
+        final RegistryPlatformsResolver platformsResolver;
+        final RegistryPlatformsConfig platformsConfig = config.getPlatforms();
+        if (platformsConfig == null || platformsConfig.isDisabled()) {
+            log.debug("Platform catalogs were disabled for registry %s", config.getId());
+            platformsResolver = null;
+        } else {
+            platformsResolver = new MavenPlatformsResolver(platformsConfig, resolver, log);
+        }
+
+        return new RegistryClient(config, platformsResolver,
+                Boolean.TRUE.equals(config.getPlatforms().getExtensionCatalogsIncluded())
+                        ? new MavenPlatformExtensionsResolver(resolver, log)
+                        : new MavenPlatformExtensionsResolver(originalResolver, log),
+                nonPlatformExtensionsResolver);
+    }
+
+    private static void complete(JsonRegistryConfig complete, RegistryConfig original, RegistryConfig descriptor) {
+        complete.setId(original.getId() == null ? descriptor.getId() : original.getId());
+
+        if (original.getDescriptor() == null) {
+            complete.setDescriptor(descriptor.getDescriptor());
+        } else {
+            complete.setDescriptor(original.getDescriptor());
+        }
+        if (original.getPlatforms() == null) {
+            complete.setPlatforms(descriptor.getPlatforms());
+        } else {
+            complete.setPlatforms(complete(original.getPlatforms(), descriptor.getPlatforms()));
+        }
+        if (original.getNonPlatformExtensions() == null) {
+            complete.setNonPlatformExtensions(descriptor.getNonPlatformExtensions());
+        } else {
+            complete.setNonPlatformExtensions(descriptor.getNonPlatformExtensions());
+        }
+
+        if (original.getUpdatePolicy() == null) {
+            complete.setUpdatePolicy(descriptor.getUpdatePolicy());
+        } else {
+            complete.setUpdatePolicy(original.getUpdatePolicy());
+        }
+
+        if (original.getMaven() == null) {
+            complete.setMaven(descriptor.getMaven());
+        } else if (isComplete(original.getMaven())) {
+            complete.setMaven(original.getMaven());
+        } else {
+            final JsonRegistryMavenConfig completeMavenConfig = new JsonRegistryMavenConfig();
+            complete.setMaven(completeMavenConfig);
+            complete(completeMavenConfig, original.getMaven(),
+                    descriptor.getMaven() == null ? completeMavenConfig : descriptor.getMaven());
+        }
+        if (original.getQuarkusVersions() == null) {
+            complete.setQuarkusVersions(descriptor.getQuarkusVersions());
+        }
+    }
+
+    private static RegistryPlatformsConfig complete(RegistryPlatformsConfig client, RegistryPlatformsConfig descriptor) {
+        if (client == null) {
+            return descriptor;
+        }
+        if (isComplete(client)) {
+            return client;
+        }
+        JsonRegistryPlatformsConfig complete = new JsonRegistryPlatformsConfig();
+        complete.setArtifact(client.getArtifact() == null ? descriptor.getArtifact() : client.getArtifact());
+        complete.setDisabled(client.isDisabled());
+        complete.setExtensionCatalogsIncluded(
+                client.getExtensionCatalogsIncluded() == null ? descriptor.getExtensionCatalogsIncluded()
+                        : client.getExtensionCatalogsIncluded());
+        return complete;
+    }
+
+    private static void complete(JsonRegistryMavenConfig complete, RegistryMavenConfig original,
+            RegistryMavenConfig descriptor) {
+        if (original.getRepository() == null) {
+            complete.setRepository(descriptor.getRepository());
+        } else if (isComplete(original.getRepository()) || descriptor.getRepository() == null) {
+            complete.setRepository(original.getRepository());
+        } else {
+            final JsonRegistryMavenRepoConfig completeRepo = new JsonRegistryMavenRepoConfig();
+            complete.setRepository(completeRepo);
+            complete(completeRepo, original.getRepository(), descriptor.getRepository());
+        }
+    }
+
+    private static void complete(JsonRegistryMavenRepoConfig complete, RegistryMavenRepoConfig original,
+            RegistryMavenRepoConfig descriptor) {
+        complete.setId(original.getId() == null ? descriptor.getId() : original.getId());
+        complete.setUrl(original.getUrl() == null ? descriptor.getUrl() : original.getUrl());
+    }
+
+    private static boolean isComplete(RegistryConfig client, RegistryConfig descriptor) {
+        if (client.isDisabled()) {
+            return true;
+        }
+        if (client.getDescriptor() == null) {
+            return false;
+        }
+        if (!isComplete(client.getPlatforms(), descriptor.getPlatforms())) {
+            return false;
+        }
+        if (!isComplete(client.getNonPlatformExtensions())) {
+            return false;
+        }
+        if (!isComplete(client.getMaven())) {
+            return false;
+        }
+        if (client.getQuarkusVersions() == null && descriptor.getQuarkusVersions() != null) {
+            return false;
+        }
+        if (client.getUpdatePolicy() == null && descriptor.getUpdatePolicy() != null) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isComplete(RegistryMavenConfig config) {
+        if (config == null) {
+            return false;
+        }
+        if (!isComplete(config.getRepository())) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isComplete(RegistryPlatformsConfig client, RegistryPlatformsConfig descriptor) {
+        if (!isComplete(client)) {
+            return false;
+        }
+        if (descriptor != null && Boolean.TRUE.equals(descriptor.getExtensionCatalogsIncluded())
+                && client.getExtensionCatalogsIncluded() == null) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isComplete(RegistryArtifactConfig config) {
+        if (config == null) {
+            return false;
+        }
+        if (!config.isDisabled() && config.getArtifact() == null) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isComplete(RegistryMavenRepoConfig config) {
+        if (config == null) {
+            return false;
+        }
+        if (config.getId() == null) {
+            return false;
+        }
+        if (config.getUrl() == null) {
+            return false;
+        }
+        return true;
+    }
+
+    private static MavenArtifactResolver newResolver(MavenArtifactResolver resolver, List<RemoteRepository> aggregatedRepos) {
+        try {
+            final BootstrapMavenContext mvnCtx = new BootstrapMavenContext(
+                    BootstrapMavenContext.config()
+                            .setRepositorySystem(resolver.getSystem())
+                            .setRepositorySystemSession(resolver.getSession())
+                            .setRemoteRepositoryManager(resolver.getRemoteRepositoryManager())
+                            .setRemoteRepositories(aggregatedRepos)
+                            .setLocalRepository(resolver.getMavenContext().getLocalRepo())
+                            .setCurrentProject(resolver.getMavenContext().getCurrentProject()));
+            return new MavenArtifactResolver(mvnCtx);
+        } catch (BootstrapMavenException e) {
+            throw new IllegalStateException("Failed to initialize maven context", e);
+        }
+    }
+
+    private void determineExtraRepos(RegistryConfig config,
+            List<RemoteRepository> configuredRepos) {
+        final RegistryMavenConfig mavenConfig = config.getMaven() == null ? null : config.getMaven();
+        final RegistryMavenRepoConfig repoConfig = mavenConfig == null ? null : mavenConfig.getRepository();
+        final String repoUrl = repoConfig == null || repoConfig.getUrl() == null
+                ? Constants.DEFAULT_REGISTRY_BACKUP_MAVEN_REPO_URL
+                : repoConfig.getUrl();
+        addRegistryRepo(repoUrl, repoConfig == null || repoConfig.getId() == null ? config.getId() : repoConfig.getId(),
+                config.getUpdatePolicy(),
+                configuredRepos);
+    }
+
+    private void addRegistryRepo(final String repoUrl, String defaultRepoId, String updatePolicy,
+            List<RemoteRepository> configuredRepos) {
+        final Set<String> ids = new HashSet<>(configuredRepos.size());
+        for (RemoteRepository repo : configuredRepos) {
+            if (repo.getUrl().equals(repoUrl)) {
+                return;
+            }
+            ids.add(repo.getId());
+        }
+
+        String repoId = defaultRepoId;
+        if (ids.contains(repoId)) {
+            int i = 2;
+            String tmp;
+            do {
+                tmp = repoId + "-" + i++;
+            } while (!ids.contains(tmp));
+            repoId = tmp;
+        }
+
+        final RemoteRepository.Builder repoBuilder = new RemoteRepository.Builder(repoId, "default", repoUrl);
+
+        if (updatePolicy != null) {
+            if (updatePolicy.equalsIgnoreCase(RepositoryPolicy.UPDATE_POLICY_DAILY)
+                    || updatePolicy.equalsIgnoreCase(RepositoryPolicy.UPDATE_POLICY_ALWAYS)
+                    || updatePolicy.equalsIgnoreCase(RepositoryPolicy.UPDATE_POLICY_NEVER)
+                    || updatePolicy.startsWith(RepositoryPolicy.UPDATE_POLICY_INTERVAL)) {
+                repoBuilder.setPolicy(new RepositoryPolicy(true, updatePolicy, RepositoryPolicy.CHECKSUM_POLICY_WARN));
+            } else {
+                throw new IllegalStateException("Unrecognized update policy '" + updatePolicy + "' for repository " + repoId);
+            }
+        }
+
+        singleRegistryRepos.add(repoBuilder.build());
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/PropertiesUtil.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/PropertiesUtil.java
new file mode 100644
index 0000000000000..f8a22577b0cba
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/PropertiesUtil.java
@@ -0,0 +1,66 @@
+package io.quarkus.registry.config;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Locale;
+
+public class PropertiesUtil {
+
+    private static final String OS_NAME = "os.name";
+    private static final String USER_HOME = "user.home";
+    private static final String WINDOWS = "windows";
+
+    private static final String FALSE = "false";
+    private static final String TRUE = "true";
+
+    private PropertiesUtil() {
+    }
+
+    public static boolean isWindows() {
+        return getProperty(OS_NAME).toLowerCase(Locale.ENGLISH).contains(WINDOWS);
+    }
+
+    public static String getUserHome() {
+        return getProperty(USER_HOME);
+    }
+
+    public static String getProperty(final String name, String defValue) {
+        assert name != null : "name is null";
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            return AccessController.doPrivileged(new PrivilegedAction<String>() {
+                @Override
+                public String run() {
+                    return System.getProperty(name, defValue);
+                }
+            });
+        } else {
+            return System.getProperty(name, defValue);
+        }
+    }
+
+    public static String getProperty(final String name) {
+        assert name != null : "name is null";
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            return AccessController.doPrivileged(new PrivilegedAction<String>() {
+                @Override
+                public String run() {
+                    return System.getProperty(name);
+                }
+            });
+        } else {
+            return System.getProperty(name);
+        }
+    }
+
+    public static final Boolean getBooleanOrNull(String name) {
+        final String value = getProperty(name);
+        return value == null ? null : Boolean.parseBoolean(value);
+    }
+
+    public static final boolean getBoolean(String name, boolean notFoundValue) {
+        final String value = getProperty(name, (notFoundValue ? TRUE : FALSE));
+        return value.isEmpty() ? true : Boolean.parseBoolean(value);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java
new file mode 100644
index 0000000000000..80357d5e6d329
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfig.java
@@ -0,0 +1,10 @@
+package io.quarkus.registry.config;
+
+import java.util.List;
+
+public interface RegistriesConfig {
+
+    boolean isDebug();
+
+    List<RegistryConfig> getRegistries();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java
new file mode 100644
index 0000000000000..9b83b2062f470
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java
@@ -0,0 +1,203 @@
+package io.quarkus.registry.config;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.Constants;
+import io.quarkus.registry.config.json.JsonRegistriesConfig;
+import io.quarkus.registry.config.json.JsonRegistryConfig;
+import io.quarkus.registry.config.json.JsonRegistryDescriptorConfig;
+import io.quarkus.registry.config.json.JsonRegistryMavenConfig;
+import io.quarkus.registry.config.json.JsonRegistryMavenRepoConfig;
+import io.quarkus.registry.config.json.JsonRegistryNonPlatformExtensionsConfig;
+import io.quarkus.registry.config.json.JsonRegistryPlatformsConfig;
+import io.quarkus.registry.config.json.RegistriesConfigMapperHelper;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+public class RegistriesConfigLocator {
+
+    public static final String CONFIG_RELATIVE_PATH = ".quarkus/config.yaml";
+    public static final String CONFIG_FILE_PATH_PROPERTY = "qer.config";
+
+    public static RegistriesConfig resolveConfig() {
+        final Path configYaml = locateConfigYaml();
+        if (configYaml == null) {
+            return completeRequiredConfig(new JsonRegistriesConfig());
+        }
+        return load(configYaml);
+    }
+
+    public static RegistriesConfig load(Path configYaml) {
+        try {
+            return completeRequiredConfig(RegistriesConfigMapperHelper.deserialize(configYaml, JsonRegistriesConfig.class));
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to parse config file " + configYaml, e);
+        }
+    }
+
+    public static RegistriesConfig load(InputStream configYaml) {
+        try {
+            return completeRequiredConfig(RegistriesConfigMapperHelper.deserializeYaml(configYaml, JsonRegistriesConfig.class));
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to parse config file " + configYaml, e);
+        }
+    }
+
+    private static Path locateConfigYaml() {
+        final String prop = PropertiesUtil.getProperty(CONFIG_FILE_PATH_PROPERTY);
+        Path configYaml;
+        if (prop != null) {
+            configYaml = Paths.get(prop);
+            if (!Files.exists(configYaml)) {
+                throw new IllegalStateException("Quarkus extensions registry configuration file " + configYaml
+                        + " specified with the system property " + CONFIG_FILE_PATH_PROPERTY + " does not exist");
+            }
+            return configYaml;
+        }
+        configYaml = Paths.get("").normalize().toAbsolutePath().resolve(CONFIG_RELATIVE_PATH);
+        if (Files.exists(configYaml)) {
+            return configYaml;
+        }
+        configYaml = Paths.get(PropertiesUtil.getProperty("user.home")).resolve(CONFIG_RELATIVE_PATH);
+        return Files.exists(configYaml) ? configYaml : null;
+    }
+
+    private static RegistriesConfig completeRequiredConfig(RegistriesConfig original) {
+        final JsonRegistriesConfig config = new JsonRegistriesConfig();
+        config.setDebug(original.isDebug());
+        if (original.getRegistries().isEmpty()) {
+            config.addRegistry(getDefaultRegistry());
+        } else {
+            for (RegistryConfig qerConfig : original.getRegistries()) {
+                if (!qerConfig.isDisabled()) {
+                    config.addRegistry(completeRequiredConfig(qerConfig));
+                }
+            }
+            if (config.isEmpty()) {
+                config.addRegistry(getDefaultRegistry());
+            }
+        }
+        return config;
+    }
+
+    private static RegistryConfig completeRequiredConfig(RegistryConfig original) {
+        if (hasRequiredConfig(original)) {
+            return original;
+        }
+        final String id = original.getId();
+        final JsonRegistryConfig config = new JsonRegistryConfig(id);
+        config.setUpdatePolicy(original.getUpdatePolicy());
+        config.setDescriptor(completeDescriptor(original));
+        config.setMaven(completeRequiedMavenConfig(original));
+        if (original != null) {
+            if (original.getNonPlatformExtensions() != null) {
+                config.setNonPlatformExtensions(original.getNonPlatformExtensions());
+            }
+            if (original.getPlatforms() != null) {
+                config.setPlatforms(original.getPlatforms());
+            }
+        }
+        return config;
+    }
+
+    private static RegistryMavenConfig completeRequiedMavenConfig(RegistryConfig original) {
+        RegistryMavenConfig originalMaven = original.getMaven();
+        if (hasRequiredConfig(originalMaven)) {
+            return originalMaven;
+        }
+        final JsonRegistryMavenConfig config = new JsonRegistryMavenConfig();
+        if (originalMaven != null) {
+            config.setRepository(originalMaven.getRepository());
+        }
+        return config;
+    }
+
+    private static RegistryDescriptorConfig completeDescriptor(RegistryConfig config) {
+        if (config.getDescriptor() != null && config.getDescriptor().getArtifact() != null) {
+            return config.getDescriptor();
+        }
+        final JsonRegistryDescriptorConfig descriptor = new JsonRegistryDescriptorConfig();
+        String host = config.getId();
+        if (host == null) {
+            final RegistryMavenRepoConfig repo = config.getMaven() == null ? null : config.getMaven().getRepository();
+            if (repo != null && repo.getUrl() != null) {
+                throw new IllegalStateException(
+                        "Failed to determine the descriptor coordinates for a registry with no ID and no Maven configuration");
+            }
+            host = Objects.requireNonNull(toUrlOrNull(repo.getUrl()), "REST endpoint is not a valid URL").getHost();
+        }
+        final String[] parts = host.split("\\.");
+        final StringBuilder buf = new StringBuilder(host.length());
+        int i = parts.length;
+        buf.append(parts[--i]);
+        while (--i >= 0) {
+            buf.append('.').append(parts[i]);
+        }
+        descriptor.setArtifact(
+                new ArtifactCoords(buf.toString(), Constants.DEFAULT_REGISTRY_DESCRIPTOR_ARTIFACT_ID, null, Constants.JSON,
+                        Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION));
+        return descriptor;
+    }
+
+    private static URL toUrlOrNull(String str) {
+        try {
+            return new URL(str);
+        } catch (MalformedURLException e) {
+        }
+        return null;
+    }
+
+    private static boolean hasRequiredConfig(RegistryConfig qerConfig) {
+        if (qerConfig.getId() == null) {
+            return false;
+        }
+        if (qerConfig.getDescriptor() == null) {
+            return false;
+        }
+        return hasRequiredConfig(qerConfig.getMaven());
+    }
+
+    private static boolean hasRequiredConfig(RegistryMavenConfig maven) {
+        if (maven == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public static RegistryConfig getDefaultRegistry() {
+        final JsonRegistryConfig qer = new JsonRegistryConfig();
+        qer.setId(Constants.DEFAULT_REGISTRY_ID);
+
+        final JsonRegistryDescriptorConfig descriptor = new JsonRegistryDescriptorConfig();
+        qer.setDescriptor(descriptor);
+        descriptor.setArtifact(
+                new ArtifactCoords(Constants.DEFAULT_REGISTRY_GROUP_ID, Constants.DEFAULT_REGISTRY_DESCRIPTOR_ARTIFACT_ID, null,
+                        Constants.JSON, Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION));
+
+        final JsonRegistryMavenConfig mavenConfig = new JsonRegistryMavenConfig();
+        qer.setMaven(mavenConfig);
+
+        final JsonRegistryPlatformsConfig platformsConfig = new JsonRegistryPlatformsConfig();
+        qer.setPlatforms(platformsConfig);
+        platformsConfig.setArtifact(new ArtifactCoords(Constants.DEFAULT_REGISTRY_GROUP_ID,
+                Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID, null, Constants.JSON,
+                Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION));
+
+        final JsonRegistryNonPlatformExtensionsConfig nonPlatformExtensionsConfig = new JsonRegistryNonPlatformExtensionsConfig();
+        qer.setNonPlatformExtensions(nonPlatformExtensionsConfig);
+        nonPlatformExtensionsConfig.setArtifact(new ArtifactCoords(Constants.DEFAULT_REGISTRY_GROUP_ID,
+                Constants.DEFAULT_REGISTRY_NON_PLATFORM_EXTENSIONS_CATALOG_ARTIFACT_ID, null, Constants.JSON,
+                Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION));
+
+        final JsonRegistryMavenRepoConfig mavenRepo = new JsonRegistryMavenRepoConfig();
+        mavenConfig.setRepository(mavenRepo);
+        mavenRepo.setId(Constants.DEFAULT_REGISTRY_ID);
+        mavenRepo.setUrl(Constants.DEFAULT_REGISTRY_MAVEN_REPO_URL);
+        return qer;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfig.java
new file mode 100644
index 0000000000000..55cdcb8a34a70
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryArtifactConfig.java
@@ -0,0 +1,10 @@
+package io.quarkus.registry.config;
+
+import io.quarkus.maven.ArtifactCoords;
+
+public interface RegistryArtifactConfig {
+
+    boolean isDisabled();
+
+    ArtifactCoords getArtifact();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java
new file mode 100644
index 0000000000000..ef758108e7c27
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryConfig.java
@@ -0,0 +1,20 @@
+package io.quarkus.registry.config;
+
+public interface RegistryConfig {
+
+    String getId();
+
+    boolean isDisabled();
+
+    String getUpdatePolicy();
+
+    RegistryDescriptorConfig getDescriptor();
+
+    RegistryPlatformsConfig getPlatforms();
+
+    RegistryNonPlatformExtensionsConfig getNonPlatformExtensions();
+
+    RegistryMavenConfig getMaven();
+
+    RegistryQuarkusVersionsConfig getQuarkusVersions();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfig.java
new file mode 100644
index 0000000000000..3c1fce320611f
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryDescriptorConfig.java
@@ -0,0 +1,8 @@
+package io.quarkus.registry.config;
+
+import io.quarkus.maven.ArtifactCoords;
+
+public interface RegistryDescriptorConfig {
+
+    ArtifactCoords getArtifact();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfig.java
new file mode 100644
index 0000000000000..0154206d866fd
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenConfig.java
@@ -0,0 +1,6 @@
+package io.quarkus.registry.config;
+
+public interface RegistryMavenConfig {
+
+    RegistryMavenRepoConfig getRepository();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfig.java
new file mode 100644
index 0000000000000..601d352246efd
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryMavenRepoConfig.java
@@ -0,0 +1,8 @@
+package io.quarkus.registry.config;
+
+public interface RegistryMavenRepoConfig {
+
+    String getId();
+
+    String getUrl();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfig.java
new file mode 100644
index 0000000000000..e0999e39a91d6
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryNonPlatformExtensionsConfig.java
@@ -0,0 +1,5 @@
+package io.quarkus.registry.config;
+
+public interface RegistryNonPlatformExtensionsConfig extends RegistryArtifactConfig {
+
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfig.java
new file mode 100644
index 0000000000000..405dbd2c69639
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryPlatformsConfig.java
@@ -0,0 +1,6 @@
+package io.quarkus.registry.config;
+
+public interface RegistryPlatformsConfig extends RegistryArtifactConfig {
+
+    Boolean getExtensionCatalogsIncluded();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java
new file mode 100644
index 0000000000000..1d3f2fa43b2dc
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfig.java
@@ -0,0 +1,8 @@
+package io.quarkus.registry.config;
+
+public interface RegistryQuarkusVersionsConfig {
+
+    String getRecognizedVersionsExpression();
+
+    boolean isExclusiveProvider();
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistriesConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistriesConfig.java
new file mode 100644
index 0000000000000..920e76e8c544f
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistriesConfig.java
@@ -0,0 +1,50 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.quarkus.registry.config.RegistriesConfig;
+import io.quarkus.registry.config.RegistryConfig;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonRegistriesConfig implements RegistriesConfig {
+
+    private boolean debug;
+    private List<RegistryConfig> registries = Collections.emptyList();
+
+    @Override
+    @JsonDeserialize(contentUsing = JsonRegistryConfigDeserializer.class)
+    @JsonSerialize(contentUsing = JsonRegistryConfigSerializer.class)
+    public List<RegistryConfig> getRegistries() {
+        return registries;
+    }
+
+    public void setRegistries(List<RegistryConfig> registries) {
+        this.registries = registries == null ? Collections.emptyList() : registries;
+    }
+
+    public void addRegistry(RegistryConfig registry) {
+        if (registries.isEmpty()) {
+            registries = new ArrayList<>();
+        }
+        registries.add(registry);
+    }
+
+    @Override
+    public boolean isDebug() {
+        return debug;
+    }
+
+    public void setDebug(boolean debug) {
+        this.debug = debug;
+    }
+
+    @JsonIgnore
+    public boolean isEmpty() {
+        return registries.isEmpty();
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryArtifactConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryArtifactConfig.java
new file mode 100644
index 0000000000000..8f36b29ab70df
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryArtifactConfig.java
@@ -0,0 +1,30 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.config.RegistryArtifactConfig;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonRegistryArtifactConfig implements RegistryArtifactConfig {
+
+    protected boolean disabled;
+    protected ArtifactCoords artifact;
+
+    @Override
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
+
+    @Override
+    public ArtifactCoords getArtifact() {
+        return artifact;
+    }
+
+    public void setArtifact(ArtifactCoords artifact) {
+        this.artifact = artifact;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfig.java
new file mode 100644
index 0000000000000..f0edf0d9e7fca
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfig.java
@@ -0,0 +1,118 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.quarkus.registry.config.RegistryConfig;
+import io.quarkus.registry.config.RegistryDescriptorConfig;
+import io.quarkus.registry.config.RegistryMavenConfig;
+import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig;
+import io.quarkus.registry.config.RegistryPlatformsConfig;
+import io.quarkus.registry.config.RegistryQuarkusVersionsConfig;
+import java.util.Objects;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonRegistryConfig implements RegistryConfig {
+
+    private String id;
+    private boolean disabled;
+    private String updatePolicy;
+    private RegistryDescriptorConfig descriptor;
+    private RegistryPlatformsConfig platforms;
+    private RegistryNonPlatformExtensionsConfig nonPlatformExtensions;
+    private RegistryMavenConfig mavenConfig;
+    private RegistryQuarkusVersionsConfig versionsConfig;
+
+    public JsonRegistryConfig() {
+    }
+
+    public JsonRegistryConfig(String id) {
+        this.id = Objects.requireNonNull(id, "QER ID can't be null");
+    }
+
+    @JsonIgnore
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = Objects.requireNonNull(id);
+    }
+
+    @Override
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
+
+    @Override
+    public String getUpdatePolicy() {
+        return updatePolicy;
+    }
+
+    public void setUpdatePolicy(String updatePolicy) {
+        this.updatePolicy = updatePolicy;
+    }
+
+    @Override
+    @JsonDeserialize(as = JsonRegistryDescriptorConfig.class)
+    public RegistryDescriptorConfig getDescriptor() {
+        return descriptor;
+    }
+
+    public void setDescriptor(RegistryDescriptorConfig descriptor) {
+        this.descriptor = descriptor;
+    }
+
+    @JsonDeserialize(as = JsonRegistryPlatformsConfig.class)
+    @Override
+    public RegistryPlatformsConfig getPlatforms() {
+        return platforms;
+    }
+
+    public void setPlatforms(RegistryPlatformsConfig platforms) {
+        this.platforms = platforms;
+    }
+
+    @JsonDeserialize(as = JsonRegistryNonPlatformExtensionsConfig.class)
+    @Override
+    public RegistryNonPlatformExtensionsConfig getNonPlatformExtensions() {
+        return nonPlatformExtensions;
+    }
+
+    public void setNonPlatformExtensions(RegistryNonPlatformExtensionsConfig nonPlatformExtensions) {
+        this.nonPlatformExtensions = nonPlatformExtensions;
+    }
+
+    boolean isIdOnly() {
+        return mavenConfig == null;
+    }
+
+    @JsonDeserialize(as = JsonRegistryMavenConfig.class)
+    @Override
+    public RegistryMavenConfig getMaven() {
+        return mavenConfig;
+    }
+
+    public void setMaven(RegistryMavenConfig mavenConfig) {
+        this.mavenConfig = mavenConfig;
+    }
+
+    @JsonDeserialize(as = JsonRegistryQuarkusVersionsConfig.class)
+    @Override
+    public RegistryQuarkusVersionsConfig getQuarkusVersions() {
+        return versionsConfig;
+    }
+
+    public void setQuarkusVersions(RegistryQuarkusVersionsConfig quarkusVersions) {
+        this.versionsConfig = quarkusVersions;
+    }
+
+    public String toString() {
+        return "[" + id + " maven=" + mavenConfig + "]";
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfigDeserializer.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfigDeserializer.java
new file mode 100644
index 0000000000000..7ca51a912b2e7
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfigDeserializer.java
@@ -0,0 +1,35 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import java.io.IOException;
+
+public class JsonRegistryConfigDeserializer extends JsonDeserializer<JsonRegistryConfig> {
+
+    @Override
+    public JsonRegistryConfig deserialize(JsonParser p, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        if (p.getCurrentToken() == JsonToken.VALUE_STRING) {
+            return new JsonRegistryConfig(p.getText());
+        } else if (p.getCurrentToken() == JsonToken.START_OBJECT) {
+            ensureNextToken(p, JsonToken.FIELD_NAME, ctxt);
+            final String qerId = p.getCurrentName();
+            ensureNextToken(p, JsonToken.START_OBJECT, ctxt);
+            final JsonRegistryConfig qer = p.readValueAs(JsonRegistryConfig.class);
+            qer.setId(qerId);
+            ensureNextToken(p, JsonToken.END_OBJECT, ctxt);
+            return qer;
+        }
+        return null;
+    }
+
+    private void ensureNextToken(JsonParser p, JsonToken expected, DeserializationContext ctxt) throws IOException {
+        if (p.nextToken() != expected) {
+            throw InvalidFormatException.from(p, "Expected " + expected, ctxt, JsonRegistryConfig.class);
+        }
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfigSerializer.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfigSerializer.java
new file mode 100644
index 0000000000000..f9a58756fcead
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryConfigSerializer.java
@@ -0,0 +1,39 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;
+import java.io.IOException;
+
+public class JsonRegistryConfigSerializer extends JsonSerializer<JsonRegistryConfig> {
+
+    private JsonSerializer<Object> qerSerializer;
+
+    @Override
+    public void serialize(JsonRegistryConfig value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value.isIdOnly()) {
+            gen.writeString(value.getId());
+        } else {
+            gen.writeStartObject();
+            gen.writeObjectFieldStart(value.getId());
+            getQerSerializer(serializers).unwrappingSerializer(null).serialize(value, gen, serializers);
+            gen.writeEndObject();
+            gen.writeEndObject();
+        }
+    }
+
+    private JsonSerializer<Object> getQerSerializer(SerializerProvider serializers) throws JsonMappingException {
+        if (qerSerializer == null) {
+            JavaType javaType = serializers.constructType(JsonRegistryConfig.class);
+            BeanDescription beanDesc = serializers.getConfig().introspect(javaType);
+            qerSerializer = BeanSerializerFactory.instance.findBeanOrAddOnSerializer(serializers, javaType, beanDesc,
+                    serializers.isEnabled(MapperFeature.USE_STATIC_TYPING));
+        }
+        return qerSerializer;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryDescriptorConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryDescriptorConfig.java
new file mode 100644
index 0000000000000..cc5d6c59f9ca2
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryDescriptorConfig.java
@@ -0,0 +1,18 @@
+package io.quarkus.registry.config.json;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.config.RegistryDescriptorConfig;
+
+public class JsonRegistryDescriptorConfig implements RegistryDescriptorConfig {
+
+    private ArtifactCoords artifact;
+
+    @Override
+    public ArtifactCoords getArtifact() {
+        return artifact;
+    }
+
+    public void setArtifact(ArtifactCoords artifact) {
+        this.artifact = artifact;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryMavenConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryMavenConfig.java
new file mode 100644
index 0000000000000..5340eb3f91de3
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryMavenConfig.java
@@ -0,0 +1,30 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.quarkus.registry.config.RegistryMavenConfig;
+import io.quarkus.registry.config.RegistryMavenRepoConfig;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonRegistryMavenConfig implements RegistryMavenConfig {
+
+    private RegistryMavenRepoConfig repo;
+
+    @Override
+    @JsonDeserialize(as = JsonRegistryMavenRepoConfig.class)
+    public RegistryMavenRepoConfig getRepository() {
+        return repo;
+    }
+
+    public void setRepository(RegistryMavenRepoConfig repo) {
+        this.repo = repo;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder buf = new StringBuilder();
+        buf.append('[');
+        buf.append("repo=").append(repo);
+        return buf.append(']').toString();
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryMavenRepoConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryMavenRepoConfig.java
new file mode 100644
index 0000000000000..7188ed1440e9f
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryMavenRepoConfig.java
@@ -0,0 +1,34 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.quarkus.registry.config.RegistryMavenRepoConfig;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JsonRegistryMavenRepoConfig implements RegistryMavenRepoConfig {
+
+    private String id;
+    private String url;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public String toString() {
+        return "[id=" + id + ", url=" + url + "]";
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryNonPlatformExtensionsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryNonPlatformExtensionsConfig.java
new file mode 100644
index 0000000000000..263022369f3b4
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryNonPlatformExtensionsConfig.java
@@ -0,0 +1,8 @@
+package io.quarkus.registry.config.json;
+
+import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig;
+
+public class JsonRegistryNonPlatformExtensionsConfig extends JsonRegistryArtifactConfig
+        implements RegistryNonPlatformExtensionsConfig {
+
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryPlatformsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryPlatformsConfig.java
new file mode 100644
index 0000000000000..190538bd298a5
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryPlatformsConfig.java
@@ -0,0 +1,17 @@
+package io.quarkus.registry.config.json;
+
+import io.quarkus.registry.config.RegistryPlatformsConfig;
+
+public class JsonRegistryPlatformsConfig extends JsonRegistryArtifactConfig implements RegistryPlatformsConfig {
+
+    private Boolean extensionCatalogsIncluded;
+
+    @Override
+    public Boolean getExtensionCatalogsIncluded() {
+        return extensionCatalogsIncluded;
+    }
+
+    public void setExtensionCatalogsIncluded(Boolean extensionCatalogsIncluded) {
+        this.extensionCatalogsIncluded = extensionCatalogsIncluded;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryQuarkusVersionsConfig.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryQuarkusVersionsConfig.java
new file mode 100644
index 0000000000000..bfaf8b4fd976b
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/JsonRegistryQuarkusVersionsConfig.java
@@ -0,0 +1,27 @@
+package io.quarkus.registry.config.json;
+
+import io.quarkus.registry.config.RegistryQuarkusVersionsConfig;
+
+public class JsonRegistryQuarkusVersionsConfig implements RegistryQuarkusVersionsConfig {
+
+    private String recognizedVersionsExpression;
+    private boolean exclusiveProvider;
+
+    @Override
+    public String getRecognizedVersionsExpression() {
+        return recognizedVersionsExpression;
+    }
+
+    public void setRecognizedVersionsExpression(String recognizedVersionsExpression) {
+        this.recognizedVersionsExpression = recognizedVersionsExpression;
+    }
+
+    @Override
+    public boolean isExclusiveProvider() {
+        return exclusiveProvider;
+    }
+
+    public void setExclusiveProvider(boolean exclusiveProvider) {
+        this.exclusiveProvider = exclusiveProvider;
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/RegistriesConfigMapperHelper.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/RegistriesConfigMapperHelper.java
new file mode 100644
index 0000000000000..da847acaf97d5
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/json/RegistriesConfigMapperHelper.java
@@ -0,0 +1,73 @@
+package io.quarkus.registry.config.json;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.json.JsonArtifactCoordsMixin;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class RegistriesConfigMapperHelper {
+
+    private static ObjectMapper yamlMapper;
+    private static ObjectMapper jsonMapper;
+
+    public static ObjectMapper yamlMapper() {
+        return yamlMapper == null ? yamlMapper = initMapper(new ObjectMapper(new YAMLFactory())) : yamlMapper;
+    }
+
+    public static ObjectMapper jsonMapper() {
+        return jsonMapper == null ? jsonMapper = initMapper(new ObjectMapper()) : jsonMapper;
+    }
+
+    private static ObjectMapper mapper(Path p) {
+        return p.getFileName().toString().endsWith(".json") ? jsonMapper() : yamlMapper();
+    }
+
+    public static ObjectMapper initMapper(ObjectMapper mapper) {
+        mapper.addMixIn(ArtifactCoords.class, JsonArtifactCoordsMixin.class);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        return mapper;
+    }
+
+    public static void serialize(Object config, Path p) throws IOException {
+        if (!Files.exists(p.getParent())) {
+            Files.createDirectories(p.getParent());
+        }
+        try (BufferedWriter writer = Files.newBufferedWriter(p)) {
+            mapper(p).writeValue(writer, config);
+        }
+    }
+
+    public static void toJson(Object config, Writer writer) throws IOException {
+        jsonMapper().writeValue(writer, config);
+    }
+
+    public static <T> T deserialize(Path p, Class<T> t) throws IOException {
+        if (!Files.exists(p)) {
+            throw new IllegalArgumentException("File " + p + " does not exist");
+        }
+        try (BufferedReader reader = Files.newBufferedReader(p)) {
+            return mapper(p).readValue(reader, t);
+        }
+    }
+
+    public static <T> T deserializeYaml(InputStream is, Class<T> t) throws IOException {
+        return yamlMapper().readValue(is, t);
+    }
+
+    public static <T> T deserializeYaml(Reader reader, Class<T> t) throws IOException {
+        return yamlMapper().readValue(reader, t);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/util/GlobUtil.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/util/GlobUtil.java
new file mode 100644
index 0000000000000..bb336dca6b33d
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/util/GlobUtil.java
@@ -0,0 +1,209 @@
+package io.quarkus.registry.util;
+
+import java.util.regex.Pattern;
+
+public class GlobUtil {
+
+    private GlobUtil() {
+    }
+
+    /**
+     * Transforms the given {@code glob} to a regular expression suitable for passing to
+     * {@link Pattern#compile(String)}.
+     *
+     * <h2>Glob syntax
+     * <h2>
+     *
+     * <table>
+     * <tr>
+     * <th>Construct</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td><code>*</code></td>
+     * <td>Matches a (possibly empty) sequence of characters that does not contain slash ({@code /})</td>
+     * </tr>
+     * <tr>
+     * <td><code>**</code></td>
+     * <td>Matches a (possibly empty) sequence of characters that may contain slash ({@code /})</td>
+     * </tr>
+     * <tr>
+     * <td><code>?</code></td>
+     * <td>Matches one character, but not slash</td>
+     * </tr>
+     * <tr>
+     * <td><code>[abc]</code></td>
+     * <td>Matches one character given in the bracket, but not slash</td>
+     * </tr>
+     * <tr>
+     * <td><code>[a-z]</code></td>
+     * <td>Matches one character from the range given in the bracket, but not slash</td>
+     * </tr>
+     * <tr>
+     * <td><code>[!abc]</code></td>
+     * <td>Matches one character not named in the bracket; does not match slash</td>
+     * </tr>
+     * <tr>
+     * <td><code>[a-z]</code></td>
+     * <td>Matches one character outside the range given in the bracket; does not match slash</td>
+     * </tr>
+     * <tr>
+     * <td><code>{one,two,three}</code></td>
+     * <td>Matches any of the alternating tokens separated by comma; the tokens may contain wildcards, nested
+     * alternations and ranges</td>
+     * </tr>
+     * <tr>
+     * <td><code>\</code></td>
+     * <td>The escape character</td>
+     * </tr>
+     * </table>
+     *
+     * @param glob the glob expression to transform
+     * @return a regular expression suitable for {@link Pattern}
+     * @throws IllegalStateException in case the {@code glob} is syntactically invalid
+     */
+    public static String toRegexPattern(String glob) {
+        final int length = glob.length();
+        final StringBuilder result = new StringBuilder(length + 4);
+        glob(glob, 0, length, null, result);
+        return result.toString();
+    }
+
+    private static int glob(String glob, int i, int length, String stopChars, StringBuilder result) {
+        while (i < length) {
+            char current = glob.charAt(i++);
+            switch (current) {
+                case '*':
+                    if (i < length && glob.charAt(i) == '*') {
+                        result.append(".*");
+                        i++;
+                    } else {
+                        result.append("[^/]*");
+                    }
+                    break;
+                case '?':
+                    result.append("[^/]");
+                    break;
+                case '[':
+                    i = charClass(glob, i, length, result);
+                    break;
+                case '{':
+                    i = alternation(glob, i, length, result);
+                    break;
+                case '\\':
+                    i = unescape(glob, i, length, result, false);
+                    break;
+                default:
+                    if (stopChars != null && stopChars.indexOf(current) >= 0) {
+                        i--;
+                        return i;
+                    } else {
+                        escapeIfNeeded(current, result);
+                    }
+                    break;
+            }
+        }
+        return i;
+    }
+
+    private static int alternation(String glob, int i, int length, StringBuilder result) {
+        result.append("(?:");
+        while (i < length) {
+            char current = glob.charAt(i++);
+            switch (current) {
+                case '}':
+                    result.append(')');
+                    return i;
+                case ',':
+                    result.append('|');
+                    i = glob(glob, i, length, ",}", result);
+                    break;
+                default:
+                    i--;
+                    i = glob(glob, i, length, ",}", result);
+                    break;
+            }
+        }
+        throw new IllegalStateException(String.format("Missing } at the end of input in glob %s", glob));
+    }
+
+    private static int unescape(String glob, int i, int length, StringBuilder result, boolean charClass) {
+        if (i < length) {
+            final char current = glob.charAt(i++);
+            if (charClass) {
+                escapeCharClassIfNeeded(current, result);
+            } else {
+                escapeIfNeeded(current, result);
+            }
+            return i;
+        } else {
+            throw new IllegalStateException(
+                    String.format("Incomplete escape sequence at the end of input in glob %s", glob));
+        }
+    }
+
+    private static int charClass(String glob, int i, int length, StringBuilder result) {
+        result.append("[[^/]&&[");
+        if (i < length && glob.charAt(i) == '!') {
+            i++;
+            result.append('^');
+        }
+        while (i < length) {
+            char current = glob.charAt(i++);
+            switch (current) {
+                case ']':
+                    result.append("]]");
+                    return i;
+                case '-':
+                    result.append('-');
+                    break;
+                case '\\':
+                    i = unescape(glob, i, length, result, true);
+                    break;
+                default:
+                    escapeCharClassIfNeeded(current, result);
+                    break;
+            }
+        }
+        throw new IllegalStateException(String.format("Missing ] at the end of input in glob %s", glob));
+    }
+
+    private static void escapeIfNeeded(char current, StringBuilder result) {
+        switch (current) {
+            case '*':
+            case '?':
+            case '+':
+            case '.':
+            case '^':
+            case '$':
+            case '{':
+            case '[':
+            case ']':
+            case '|':
+            case '(':
+            case ')':
+            case '\\':
+                result.append('\\');
+                break;
+            default:
+                break;
+        }
+        result.append(current);
+    }
+
+    private static void escapeCharClassIfNeeded(char current, StringBuilder result) {
+        switch (current) {
+            case '^':
+            case '[':
+            case ']':
+            case '&':
+            case '-':
+            case '\\':
+                result.append('\\');
+                break;
+            default:
+                break;
+        }
+        result.append(current);
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/util/PlatformArtifacts.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/util/PlatformArtifacts.java
new file mode 100644
index 0000000000000..8a74dc99a288e
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/util/PlatformArtifacts.java
@@ -0,0 +1,29 @@
+package io.quarkus.registry.util;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.Constants;
+
+public class PlatformArtifacts {
+
+    public static ArtifactCoords getCatalogArtifactForBom(ArtifactCoords bom) {
+        return getCatalogArtifactForBom(bom.getGroupId(), bom.getArtifactId(), bom.getVersion());
+    }
+
+    public static ArtifactCoords getCatalogArtifactForBom(String bomGroupId, String bomArtifactId, String bomVersion) {
+        return new ArtifactCoords(bomGroupId, bomArtifactId + Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX, bomVersion,
+                "json", bomVersion);
+    }
+
+    public static ArtifactCoords ensureCatalogArtifact(ArtifactCoords coords) {
+        return isCatalogArtifact(coords) ? coords
+                : getCatalogArtifactForBom(coords.getGroupId(), coords.getArtifactId(), coords.getVersion());
+    }
+
+    public static boolean isCatalogArtifactId(String artifactId) {
+        return artifactId != null && artifactId.endsWith(Constants.PLATFORM_DESCRIPTOR_ARTIFACT_ID_SUFFIX);
+    }
+
+    public static boolean isCatalogArtifact(ArtifactCoords coords) {
+        return isCatalogArtifactId(coords.getArtifactId());
+    }
+}
diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java
new file mode 100644
index 0000000000000..1dab2be6aec76
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/devtools/registry/util/PlatformArtifactsTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.devtools.registry.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.util.PlatformArtifacts;
+import org.junit.jupiter.api.Test;
+
+public class PlatformArtifactsTest {
+
+    @Test
+    public void getCatalogArtifactForBom() {
+        final ArtifactCoords catalog = new ArtifactCoords("org.acme", "acme-bom-quarkus-platform-descriptor", "1.0", "json",
+                "1.0");
+        assertEquals(catalog,
+                PlatformArtifacts.getCatalogArtifactForBom(new ArtifactCoords("org.acme", "acme-bom", null, "pom", "1.0")));
+        assertEquals(catalog, PlatformArtifacts.getCatalogArtifactForBom("org.acme", "acme-bom", "1.0"));
+    }
+
+    @Test
+    public void ensureCatalogArtifact() {
+        final ArtifactCoords catalog = new ArtifactCoords("org.acme", "acme-bom-quarkus-platform-descriptor", "1.0", "json",
+                "1.0");
+        assertEquals(catalog, PlatformArtifacts.ensureCatalogArtifact(catalog));
+        assertEquals(catalog,
+                PlatformArtifacts.ensureCatalogArtifact(new ArtifactCoords("org.acme", "acme-bom", null, "pom", "1.0")));
+    }
+
+    @Test
+    public void isCatalogArtifactId() {
+        assertTrue(PlatformArtifacts.isCatalogArtifactId("acme-bom-quarkus-platform-descriptor"));
+        assertFalse(PlatformArtifacts.isCatalogArtifactId("acme-bom"));
+    }
+
+    @Test
+    public void isCatalogArtifact() {
+        assertTrue(PlatformArtifacts.isCatalogArtifact(
+                new ArtifactCoords("org.acme", "acme-bom-quarkus-platform-descriptor", "1.0", "json", "1.0")));
+        assertFalse(PlatformArtifacts.isCatalogArtifact(new ArtifactCoords("org.acme", "acme-bom", null, "pom", "1.0")));
+    }
+}
diff --git a/integration-tests/amazon-lambda-http-resteasy/pom.xml b/integration-tests/amazon-lambda-http-resteasy/pom.xml
index 5eb23ae265068..1b1b102f9b5bf 100644
--- a/integration-tests/amazon-lambda-http-resteasy/pom.xml
+++ b/integration-tests/amazon-lambda-http-resteasy/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,6 +33,34 @@
             <artifactId>quarkus-test-amazon-lambda</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -58,65 +85,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java
index bd8fe65f6e93a..52d3274a8acaa 100644
--- a/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java
+++ b/integration-tests/amazon-lambda-http-resteasy/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java
@@ -5,8 +5,11 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+
 @Path("/hello")
 public class GreetingResource {
 
@@ -40,4 +43,22 @@ public void empty() {
 
     }
 
+    @GET
+    @Path("context")
+    @Produces(MediaType.TEXT_PLAIN)
+    public void context(@Context com.amazonaws.services.lambda.runtime.Context ctx) {
+        if (ctx == null)
+            throw new RuntimeException();
+        if (ctx.getAwsRequestId() == null)
+            throw new RuntimeException("aws context not set");
+    }
+
+    @GET
+    @Path("proxyRequestContext")
+    @Produces(MediaType.TEXT_PLAIN)
+    public void proxyRequestContext(@Context APIGatewayV2HTTPEvent ctx) {
+        if (ctx == null)
+            throw new RuntimeException();
+    }
+
 }
diff --git a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
index 80f207ec4fee6..62937980cccb4 100644
--- a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
+++ b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -1,47 +1,65 @@
 package io.quarkus.it.amazon.lambda;
 
+import java.util.HashMap;
+
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.codec.binary.Base64;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
-import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
-import io.quarkus.amazon.lambda.http.model.Headers;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
+
 import io.quarkus.amazon.lambda.test.LambdaClient;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
 public class AmazonLambdaSimpleTestCase {
 
+    @Test
+    public void testContext() throws Exception {
+        APIGatewayV2HTTPEvent request = new APIGatewayV2HTTPEvent();
+        request.setRawPath("/hello/context");
+        request.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext());
+        request.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http());
+        request.getRequestContext().getHttp().setMethod("GET");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
+    }
+
     @Test
     public void testGetText() throws Exception {
         testGetText("/hello");
     }
 
-    private String body(AwsProxyResponse response) {
-        if (!response.isBase64Encoded())
+    private String body(APIGatewayV2HTTPResponse response) {
+        if (!response.getIsBase64Encoded())
             return response.getBody();
         return new String(Base64.decodeBase64(response.getBody()));
     }
 
     private void testGetText(String path) {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("GET");
-        request.setPath(path);
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request(path);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
+    }
+
+    private APIGatewayV2HTTPEvent request(String path) {
+        APIGatewayV2HTTPEvent request = new APIGatewayV2HTTPEvent();
+        request.setRawPath(path);
+        request.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext());
+        request.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http());
+        request.getRequestContext().getHttp().setMethod("GET");
+        return request;
     }
 
     @Test
     public void test404() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("GET");
-        request.setPath("/nowhere");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request("/nowhere");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 404);
     }
 
@@ -51,33 +69,32 @@ public void testPostText() throws Exception {
     }
 
     private void testPostText(String path) {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", "text/plain");
-        request.setPath(path);
+        APIGatewayV2HTTPEvent request = request(path);
+        request.getRequestContext().getHttp().setMethod("POST");
+        request.setHeaders(new HashMap<>());
+        request.getHeaders().put("Content-Type", "text/plain");
         request.setBody("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello Bill");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
     }
 
     @Test
     public void testPostBinary() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
         byte[] bytes = { 0, 1, 2, 3 };
         String body = Base64.encodeBase64String(bytes);
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
-        request.setPath("/hello");
+        APIGatewayV2HTTPEvent request = request("/hello");
+        request.getRequestContext().getHttp().setMethod("POST");
+        request.setHeaders(new HashMap<>());
+        request.getHeaders().put("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
         request.setBody(body);
         request.setIsBase64Encoded(true);
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(out.getMultiValueHeaders().getFirst("Content-Type"), MediaType.APPLICATION_OCTET_STREAM);
-        Assertions.assertTrue(out.isBase64Encoded());
+        Assertions.assertEquals(out.getMultiValueHeaders().get("Content-Type").get(0),
+                MediaType.APPLICATION_OCTET_STREAM);
+        Assertions.assertTrue(out.getIsBase64Encoded());
         byte[] rtn = Base64.decodeBase64(out.getBody());
         Assertions.assertEquals(rtn[0], 4);
         Assertions.assertEquals(rtn[1], 5);
@@ -87,13 +104,18 @@ public void testPostBinary() throws Exception {
 
     @Test
     public void testPostEmpty() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.setPath("/hello/empty");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request("/hello/empty");
+        request.getRequestContext().getHttp().setMethod("POST");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 204);
 
     }
 
+    @Test
+    public void testProxyRequestContext() throws Exception {
+        APIGatewayV2HTTPEvent request = request("/hello/proxyRequestContext");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
+    }
+
 }
diff --git a/integration-tests/amazon-lambda-http/pom.xml b/integration-tests/amazon-lambda-http/pom.xml
index 0081c347dcd3a..62ce64d02e22f 100644
--- a/integration-tests/amazon-lambda-http/pom.xml
+++ b/integration-tests/amazon-lambda-http/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,6 +49,86 @@
             <artifactId>quarkus-test-amazon-lambda</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -74,65 +153,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java
index bd8fe65f6e93a..52d3274a8acaa 100644
--- a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java
+++ b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingResource.java
@@ -5,8 +5,11 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+
 @Path("/hello")
 public class GreetingResource {
 
@@ -40,4 +43,22 @@ public void empty() {
 
     }
 
+    @GET
+    @Path("context")
+    @Produces(MediaType.TEXT_PLAIN)
+    public void context(@Context com.amazonaws.services.lambda.runtime.Context ctx) {
+        if (ctx == null)
+            throw new RuntimeException();
+        if (ctx.getAwsRequestId() == null)
+            throw new RuntimeException("aws context not set");
+    }
+
+    @GET
+    @Path("proxyRequestContext")
+    @Produces(MediaType.TEXT_PLAIN)
+    public void proxyRequestContext(@Context APIGatewayV2HTTPEvent ctx) {
+        if (ctx == null)
+            throw new RuntimeException();
+    }
+
 }
diff --git a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingVertx.java b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingVertx.java
index eba76c7f191e8..5a62713303abc 100644
--- a/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingVertx.java
+++ b/integration-tests/amazon-lambda-http/src/main/java/io/quarkus/it/amazon/lambda/GreetingVertx.java
@@ -21,19 +21,6 @@ void helloPost(RoutingContext context) {
         context.response().setStatusCode(200).end("hello " + name);
     }
 
-    @Route(path = "/vertx/rx/hello", methods = GET)
-    void rxHelloGet(io.vertx.reactivex.ext.web.RoutingContext context) {
-        context.response().headers().set("Content-Type", "text/plain");
-        context.response().setStatusCode(200).end("hello");
-    }
-
-    @Route(path = "/vertx/rx/hello", methods = POST)
-    void rxHelloPost(io.vertx.reactivex.ext.web.RoutingContext context) {
-        String name = context.getBodyAsString();
-        context.response().headers().set("Content-Type", "text/plain");
-        context.response().setStatusCode(200).end("hello " + name);
-    }
-
     @Route(path = "/vertx/exchange/hello", methods = GET)
     void exchange(RoutingExchange exchange) {
         exchange.response().headers().set("Content-Type", "text/plain");
diff --git a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
index c1e203d84684c..ed8b602e92548 100644
--- a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
+++ b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -1,5 +1,7 @@
 package io.quarkus.it.amazon.lambda;
 
+import java.util.HashMap;
+
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.codec.binary.Base64;
@@ -8,15 +10,26 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
-import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
-import io.quarkus.amazon.lambda.http.model.Headers;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
+
 import io.quarkus.amazon.lambda.test.LambdaClient;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
 public class AmazonLambdaSimpleTestCase {
 
+    @Test
+    public void testContext() throws Exception {
+        APIGatewayV2HTTPEvent request = new APIGatewayV2HTTPEvent();
+        request.setRawPath("/hello/context");
+        request.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext());
+        request.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http());
+        request.getRequestContext().getHttp().setMethod("GET");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
+    }
+
     @Test
     public void testGetText() throws Exception {
         testGetText("/vertx/hello");
@@ -27,38 +40,40 @@ public void testGetText() throws Exception {
     @Test
     public void testSwaggerUi() throws Exception {
         // this tests the FileRegion support in the handler
-        AwsProxyRequest request = request("/swagger-ui/");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request("/q/swagger-ui/");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("Swagger UI"));
+        Assertions.assertTrue(body(out).contains("OpenAPI UI"));
 
     }
 
-    private String body(AwsProxyResponse response) {
-        if (!response.isBase64Encoded())
+    private String body(APIGatewayV2HTTPResponse response) {
+        if (!response.getIsBase64Encoded())
             return response.getBody();
         return new String(Base64.decodeBase64(response.getBody()));
     }
 
     private void testGetText(String path) {
-        AwsProxyRequest request = request(path);
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request(path);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
     }
 
-    private AwsProxyRequest request(String path) {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("GET");
-        request.setPath(path);
+    private APIGatewayV2HTTPEvent request(String path) {
+        APIGatewayV2HTTPEvent request = new APIGatewayV2HTTPEvent();
+        request.setRawPath(path);
+        request.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext());
+        request.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http());
+        request.getRequestContext().getHttp().setMethod("GET");
         return request;
     }
 
     @Test
     public void test404() throws Exception {
-        AwsProxyRequest request = request("/nowhere");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request("/nowhere");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 404);
     }
 
@@ -70,33 +85,32 @@ public void testPostText() throws Exception {
     }
 
     private void testPostText(String path) {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", "text/plain");
-        request.setPath(path);
+        APIGatewayV2HTTPEvent request = request(path);
+        request.getRequestContext().getHttp().setMethod("POST");
+        request.setHeaders(new HashMap<>());
+        request.getHeaders().put("Content-Type", "text/plain");
         request.setBody("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "hello Bill");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("text/plain"));
     }
 
     @Test
     public void testPostBinary() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
         byte[] bytes = { 0, 1, 2, 3 };
         String body = Base64.encodeBase64String(bytes);
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
-        request.setPath("/hello");
+        APIGatewayV2HTTPEvent request = request("/hello");
+        request.getRequestContext().getHttp().setMethod("POST");
+        request.setHeaders(new HashMap<>());
+        request.getHeaders().put("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
         request.setBody(body);
         request.setIsBase64Encoded(true);
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(out.getMultiValueHeaders().getFirst("Content-Type"), MediaType.APPLICATION_OCTET_STREAM);
-        Assertions.assertTrue(out.isBase64Encoded());
+        Assertions.assertEquals(out.getMultiValueHeaders().get("Content-Type").get(0),
+                MediaType.APPLICATION_OCTET_STREAM);
+        Assertions.assertTrue(out.getIsBase64Encoded());
         byte[] rtn = Base64.decodeBase64(out.getBody());
         Assertions.assertEquals(rtn[0], 4);
         Assertions.assertEquals(rtn[1], 5);
@@ -106,11 +120,9 @@ public void testPostBinary() throws Exception {
 
     @Test
     public void testPostEmpty() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.setPath("/hello/empty");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPEvent request = request("/hello/empty");
+        request.getRequestContext().getHttp().setMethod("POST");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 204);
 
     }
@@ -118,16 +130,22 @@ public void testPostEmpty() throws Exception {
     @ParameterizedTest
     @ValueSource(strings = { "/funqy", "/funqyAsync" })
     public void testFunqy(String path) {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", "application/json");
-        request.setPath(path);
+        APIGatewayV2HTTPEvent request = request(path);
+        request.getRequestContext().getHttp().setMethod("POST");
+        request.setHeaders(new HashMap<>());
+        request.getHeaders().put("Content-Type", MediaType.APPLICATION_JSON);
         request.setBody("\"Bill\"");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
         Assertions.assertEquals(out.getStatusCode(), 200);
         Assertions.assertEquals(body(out), "\"Make it funqy Bill\"");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("application/json"));
+        Assertions.assertTrue(out.getMultiValueHeaders().get("Content-Type").get(0).startsWith("application/json"));
+    }
+
+    @Test
+    public void testProxyRequestContext() throws Exception {
+        APIGatewayV2HTTPEvent request = request("/hello/proxyRequestContext");
+        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
     }
 
 }
diff --git a/integration-tests/amazon-lambda-rest/pom.xml b/integration-tests/amazon-lambda-rest/pom.xml
new file mode 100644
index 0000000000000..cee1cbbf85a53
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/pom.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-amazon-lambda-rest</artifactId>
+    <name>Quarkus - Integration Tests - Amazon Lambda AWS Gateway REST API</name>
+    <description>Module that contains Amazon Lambda related tests for RESTEasy</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-rest</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-amazon-lambda</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-rest-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>${native.surefire.skip}</skipTests>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>
+                                            ${project.build.directory}/${project.build.finalName}-runner
+                                        </native.image.path>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java
new file mode 100644
index 0000000000000..35f2d73271278
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/FunqyGreeting.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.amazon.lambda.v1;
+
+import io.quarkus.funqy.Funq;
+import io.smallrye.mutiny.Uni;
+
+public class FunqyGreeting {
+
+    @Funq
+    public String funqy(String name) {
+        return "Make it funqy " + name;
+    }
+
+    @Funq
+    public Uni<String> funqyAsync(String name) {
+        return Uni.createFrom().item(() -> "Make it funqy " + name);
+    }
+}
diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java
new file mode 100644
index 0000000000000..6b11b7c7cb4f6
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingResource.java
@@ -0,0 +1,64 @@
+package io.quarkus.it.amazon.lambda.v1;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext;
+
+@Path("/hello")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+    @POST
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public String hello(String name) {
+        return "hello " + name;
+    }
+
+    @POST
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
+    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
+    public byte[] hello(byte[] bytes) {
+        if (bytes[0] != 0 || bytes[1] != 1 || bytes[2] != 2 || bytes[3] != 3) {
+            throw new RuntimeException("bad input");
+        }
+        byte[] rtn = { 4, 5, 6 };
+        return rtn;
+    }
+
+    @POST
+    @Path("empty")
+    public void empty() {
+
+    }
+
+    @GET
+    @Path("context")
+    @Produces(MediaType.TEXT_PLAIN)
+    public void context(@Context com.amazonaws.services.lambda.runtime.Context ctx) {
+        if (ctx == null)
+            throw new RuntimeException();
+        if (ctx.getAwsRequestId() == null)
+            throw new RuntimeException("aws context not set");
+    }
+
+    @GET
+    @Path("proxyRequestContext")
+    @Produces(MediaType.TEXT_PLAIN)
+    public void proxyRequestContext(@Context AwsProxyRequestContext ctx) {
+        if (ctx == null)
+            throw new RuntimeException();
+    }
+
+}
diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java
new file mode 100644
index 0000000000000..c883fc8be27ec
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingServlet.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.amazon.lambda.v1;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name = "ServletGreeting", urlPatterns = "/servlet/hello")
+public class GreetingServlet extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.setStatus(200);
+        resp.addHeader("Content-Type", "text/plain");
+        resp.getWriter().write("hello");
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        String name = req.getReader().readLine();
+        resp.setStatus(200);
+        resp.addHeader("Content-Type", "text/plain");
+        resp.getWriter().write("hello " + name);
+    }
+}
diff --git a/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java
new file mode 100644
index 0000000000000..15e21b9e9f8d5
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/main/java/io/quarkus/it/amazon/lambda/v1/GreetingVertx.java
@@ -0,0 +1,42 @@
+package io.quarkus.it.amazon.lambda.v1;
+
+import static io.vertx.core.http.HttpMethod.GET;
+import static io.vertx.core.http.HttpMethod.POST;
+
+import io.quarkus.vertx.web.Route;
+import io.quarkus.vertx.web.RoutingExchange;
+import io.vertx.ext.web.RoutingContext;
+
+public class GreetingVertx {
+    @Route(path = "/vertx/hello", methods = GET)
+    void hello(RoutingContext context) {
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(200).end("hello");
+    }
+
+    @Route(path = "/vertx/hello", methods = POST)
+    void helloPost(RoutingContext context) {
+        String name = context.getBodyAsString();
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(200).end("hello " + name);
+    }
+
+    @Route(path = "/vertx/rx/hello", methods = GET)
+    void rxHelloGet(RoutingContext context) {
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(200).end("hello");
+    }
+
+    @Route(path = "/vertx/rx/hello", methods = POST)
+    void rxHelloPost(RoutingContext context) {
+        String name = context.getBodyAsString();
+        context.response().headers().set("Content-Type", "text/plain");
+        context.response().setStatusCode(200).end("hello " + name);
+    }
+
+    @Route(path = "/vertx/exchange/hello", methods = GET)
+    void exchange(RoutingExchange exchange) {
+        exchange.response().headers().set("Content-Type", "text/plain");
+        exchange.ok("hello");
+    }
+}
diff --git a/integration-tests/amazon-lambda-rest/src/main/resources/application.properties b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties
new file mode 100644
index 0000000000000..f41be18ef3090
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+quarkus.lambda.enable-polling-jvm-mode=true
+quarkus.http.virtual=true
+quarkus.swagger-ui.always-include=true
diff --git a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java
new file mode 100644
index 0000000000000..e0d2337733696
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.amazon.lambda;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class AmazonLambdaV1SimpleIT extends AmazonLambdaV1SimpleTestCase {
+}
diff --git a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java
new file mode 100644
index 0000000000000..e99974e08bad4
--- /dev/null
+++ b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java
@@ -0,0 +1,153 @@
+package io.quarkus.it.amazon.lambda;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.commons.codec.binary.Base64;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequest;
+import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext;
+import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
+import io.quarkus.amazon.lambda.http.model.Headers;
+import io.quarkus.amazon.lambda.test.LambdaClient;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class AmazonLambdaV1SimpleTestCase {
+
+    @Test
+    public void testContext() throws Exception {
+        AwsProxyRequest request = new AwsProxyRequest();
+        request.setHttpMethod("GET");
+        request.setPath("/hello/context");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
+    }
+
+    @Test
+    public void testGetText() throws Exception {
+        testGetText("/vertx/hello");
+        testGetText("/servlet/hello");
+        testGetText("/hello");
+    }
+
+    @Test
+    public void testSwaggerUi() throws Exception {
+        // this tests the FileRegion support in the handler
+        AwsProxyRequest request = request("/q/swagger-ui/");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 200);
+        Assertions.assertTrue(body(out).contains("OpenAPI UI"));
+
+    }
+
+    private String body(AwsProxyResponse response) {
+        if (!response.isBase64Encoded())
+            return response.getBody();
+        return new String(Base64.decodeBase64(response.getBody()));
+    }
+
+    private void testGetText(String path) {
+        AwsProxyRequest request = request(path);
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 200);
+        Assertions.assertEquals(body(out), "hello");
+        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+    }
+
+    private AwsProxyRequest request(String path) {
+        AwsProxyRequest request = new AwsProxyRequest();
+        request.setHttpMethod("GET");
+        request.setPath(path);
+        return request;
+    }
+
+    @Test
+    public void test404() throws Exception {
+        AwsProxyRequest request = request("/nowhere");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 404);
+    }
+
+    @Test
+    public void testPostText() throws Exception {
+        testPostText("/hello");
+        testPostText("/servlet/hello");
+        testPostText("/vertx/hello");
+    }
+
+    private void testPostText(String path) {
+        AwsProxyRequest request = new AwsProxyRequest();
+        request.setHttpMethod("POST");
+        request.setMultiValueHeaders(new Headers());
+        request.getMultiValueHeaders().add("Content-Type", "text/plain");
+        request.setPath(path);
+        request.setBody("Bill");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 200);
+        Assertions.assertEquals(body(out), "hello Bill");
+        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+    }
+
+    @Test
+    public void testPostBinary() throws Exception {
+        AwsProxyRequest request = new AwsProxyRequest();
+        byte[] bytes = { 0, 1, 2, 3 };
+        String body = Base64.encodeBase64String(bytes);
+        request.setHttpMethod("POST");
+        request.setMultiValueHeaders(new Headers());
+        request.getMultiValueHeaders().add("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
+        request.setPath("/hello");
+        request.setBody(body);
+        request.setIsBase64Encoded(true);
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 200);
+        Assertions.assertEquals(out.getMultiValueHeaders().getFirst("Content-Type"), MediaType.APPLICATION_OCTET_STREAM);
+        Assertions.assertTrue(out.isBase64Encoded());
+        byte[] rtn = Base64.decodeBase64(out.getBody());
+        Assertions.assertEquals(rtn[0], 4);
+        Assertions.assertEquals(rtn[1], 5);
+        Assertions.assertEquals(rtn[2], 6);
+
+    }
+
+    @Test
+    public void testPostEmpty() throws Exception {
+        AwsProxyRequest request = new AwsProxyRequest();
+        request.setHttpMethod("POST");
+        request.setMultiValueHeaders(new Headers());
+        request.setPath("/hello/empty");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
+
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "/funqy", "/funqyAsync" })
+    public void testFunqy(String path) {
+        AwsProxyRequest request = new AwsProxyRequest();
+        request.setHttpMethod("POST");
+        request.setMultiValueHeaders(new Headers());
+        request.getMultiValueHeaders().add("Content-Type", "application/json");
+        request.setPath(path);
+        request.setBody("\"Bill\"");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 200);
+        Assertions.assertEquals(body(out), "\"Make it funqy Bill\"");
+        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("application/json"));
+    }
+
+    @Test
+    public void testProxyRequestContext() throws Exception {
+        AwsProxyRequest request = new AwsProxyRequest();
+        request.setRequestContext(new AwsProxyRequestContext());
+        request.setHttpMethod("GET");
+        request.setPath("/hello/proxyRequestContext");
+        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
+        Assertions.assertEquals(out.getStatusCode(), 204);
+    }
+
+}
diff --git a/integration-tests/amazon-lambda-s3event/pom.xml b/integration-tests/amazon-lambda-s3event/pom.xml
new file mode 100644
index 0000000000000..5684802872361
--- /dev/null
+++ b/integration-tests/amazon-lambda-s3event/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-amazon-lambda-s3event</artifactId>
+    <name>Quarkus - Integration Tests - Amazon Lambda</name>
+    <description>Module that contains Amazon Lambda S3Event related tests</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-amazon-lambda</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/amazon-lambda-s3event/src/main/java/io/quarkus/it/amazon/lambda/MyS3.java b/integration-tests/amazon-lambda-s3event/src/main/java/io/quarkus/it/amazon/lambda/MyS3.java
new file mode 100644
index 0000000000000..b152b94bc26b6
--- /dev/null
+++ b/integration-tests/amazon-lambda-s3event/src/main/java/io/quarkus/it/amazon/lambda/MyS3.java
@@ -0,0 +1,38 @@
+package io.quarkus.it.amazon.lambda;
+
+import org.junit.jupiter.api.Assertions;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.S3Event;
+import com.amazonaws.services.lambda.runtime.events.models.s3.S3EventNotification;
+
+public class MyS3 implements RequestHandler<S3Event, String> {
+
+    @Override
+    public String handleRequest(S3Event event, Context context) {
+        Assertions.assertEquals(1, event.getRecords().size());
+        S3EventNotification.S3EventNotificationRecord record = event.getRecords().get(0);
+        Assertions.assertEquals("2.0", record.getEventVersion());
+        Assertions.assertEquals("aws:s3", record.getEventSource());
+        Assertions.assertEquals("us-west-2", record.getAwsRegion());
+        Assertions.assertEquals("1970-01-01T00:00:00.000Z", record.getEventTime().toString());
+        Assertions.assertEquals("ObjectCreated:Put", record.getEventName());
+        Assertions.assertEquals("AIDAJDPLRKLG7UEXAMPLE", record.getUserIdentity().getPrincipalId());
+        Assertions.assertEquals("127.0.0.1", record.getRequestParameters().getSourceIPAddress());
+        Assertions.assertEquals("C3D13FE58DE4C810", record.getResponseElements().getxAmzRequestId());
+        Assertions.assertEquals("FMyUVURIY8/IgAtTv8xRjskZQpcIZ9KG4V5Wp6S7S/JRWeUWerMUE5JgHvANOjpD",
+                record.getResponseElements().getxAmzId2());
+
+        Assertions.assertEquals("1.0", record.getS3().getS3SchemaVersion());
+        Assertions.assertEquals("testConfigRule", record.getS3().getConfigurationId());
+        Assertions.assertEquals("sourcebucket", record.getS3().getBucket().getName());
+        Assertions.assertEquals("arn:aws:s3:::sourcebucket", record.getS3().getBucket().getArn());
+        Assertions.assertEquals("A3NL1KOZZKExample", record.getS3().getBucket().getOwnerIdentity().getPrincipalId());
+        Assertions.assertEquals("HappyFace.jpg", record.getS3().getObject().getKey());
+        Assertions.assertEquals(1024, record.getS3().getObject().getSizeAsLong());
+        Assertions.assertEquals("d41d8cd98f00b204e9800998ecf8427e", record.getS3().getObject().geteTag());
+        Assertions.assertEquals("096fKKXTRTtl3on89fVO.nfljtsv6qko", record.getS3().getObject().getVersionId());
+        return "Ok";
+    }
+}
diff --git a/integration-tests/amazon-lambda-s3event/src/main/resources/application.properties b/integration-tests/amazon-lambda-s3event/src/main/resources/application.properties
new file mode 100644
index 0000000000000..e04a99c3c9f73
--- /dev/null
+++ b/integration-tests/amazon-lambda-s3event/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.lambda.enable-polling-jvm-mode=true
\ No newline at end of file
diff --git a/integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventIT.java b/integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventIT.java
new file mode 100644
index 0000000000000..e322fd8ef5aa7
--- /dev/null
+++ b/integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.amazon.lambda;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class S3EventIT extends S3EventTestCase {
+}
diff --git a/integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventTestCase.java b/integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventTestCase.java
new file mode 100644
index 0000000000000..9a3581e9f8415
--- /dev/null
+++ b/integration-tests/amazon-lambda-s3event/src/test/java/io/quarkus/it/amazon/lambda/S3EventTestCase.java
@@ -0,0 +1,57 @@
+package io.quarkus.it.amazon.lambda;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.amazon.lambda.test.LambdaClient;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class S3EventTestCase {
+
+    static String json = "{\n" +
+            "  \"Records\":[\n" +
+            "    {\n" +
+            "      \"eventVersion\":\"2.0\",\n" +
+            "      \"eventSource\":\"aws:s3\",\n" +
+            "      \"awsRegion\":\"us-west-2\",\n" +
+            "      \"eventTime\":\"1970-01-01T00:00:00.000Z\",\n" +
+            "      \"eventName\":\"ObjectCreated:Put\",\n" +
+            "      \"userIdentity\":{\n" +
+            "        \"principalId\":\"AIDAJDPLRKLG7UEXAMPLE\"\n" +
+            "      },\n" +
+            "      \"requestParameters\":{\n" +
+            "        \"sourceIPAddress\":\"127.0.0.1\"\n" +
+            "      },\n" +
+            "      \"responseElements\":{\n" +
+            "        \"x-amz-request-id\":\"C3D13FE58DE4C810\",\n" +
+            "        \"x-amz-id-2\":\"FMyUVURIY8/IgAtTv8xRjskZQpcIZ9KG4V5Wp6S7S/JRWeUWerMUE5JgHvANOjpD\"\n" +
+            "      },\n" +
+            "      \"s3\":{\n" +
+            "        \"s3SchemaVersion\":\"1.0\",\n" +
+            "        \"configurationId\":\"testConfigRule\",\n" +
+            "        \"bucket\":{\n" +
+            "          \"name\":\"sourcebucket\",\n" +
+            "          \"ownerIdentity\":{\n" +
+            "            \"principalId\":\"A3NL1KOZZKExample\"\n" +
+            "          },\n" +
+            "          \"arn\":\"arn:aws:s3:::sourcebucket\"\n" +
+            "        },\n" +
+            "        \"object\":{\n" +
+            "          \"key\":\"HappyFace.jpg\",\n" +
+            "          \"size\":1024,\n" +
+            "          \"eTag\":\"d41d8cd98f00b204e9800998ecf8427e\",\n" +
+            "          \"versionId\":\"096fKKXTRTtl3on89fVO.nfljtsv6qko\"\n" +
+            "        }\n" +
+            "      }\n" +
+            "    }\n" +
+            "  ]\n" +
+            "}";
+
+    @Test
+    public void testS3() throws Exception {
+        String out = LambdaClient.invokeJson(String.class, json);
+        Assertions.assertEquals("Ok", out);
+    }
+
+}
diff --git a/integration-tests/amazon-lambda-stream-handler/pom.xml b/integration-tests/amazon-lambda-stream-handler/pom.xml
index 1d13d1a3cdf68..17f5313b7e6cf 100644
--- a/integration-tests/amazon-lambda-stream-handler/pom.xml
+++ b/integration-tests/amazon-lambda-stream-handler/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,6 +29,21 @@
             <artifactId>quarkus-test-amazon-lambda</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -54,65 +68,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/amazon-lambda/pom.xml b/integration-tests/amazon-lambda/pom.xml
index 31edfd65de6a8..288078482df72 100644
--- a/integration-tests/amazon-lambda/pom.xml
+++ b/integration-tests/amazon-lambda/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,6 +29,21 @@
             <artifactId>quarkus-test-amazon-lambda</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-lambda-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -54,65 +68,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java
new file mode 100644
index 0000000000000..263fbcb6d1e3f
--- /dev/null
+++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/Count.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.amazon.lambda;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@InterceptorBinding
+@Documented
+@Retention(RUNTIME)
+@Target({ METHOD, TYPE })
+public @interface Count {
+}
diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java
new file mode 100644
index 0000000000000..cfc33c93a2178
--- /dev/null
+++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/CounterInterceptor.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.amazon.lambda;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Priority(1)
+@Count
+@Interceptor
+public class CounterInterceptor {
+
+    static final AtomicInteger COUNTER = new AtomicInteger();
+
+    @AroundInvoke
+    public Object aroundInvoke(InvocationContext context) throws Exception {
+        COUNTER.incrementAndGet();
+        return context.proceed();
+    }
+
+}
diff --git a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java
index 01e77026294e3..2f3f0bb2edecf 100644
--- a/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java
+++ b/integration-tests/amazon-lambda/src/main/java/io/quarkus/it/amazon/lambda/TestLambda.java
@@ -12,6 +12,7 @@ public class TestLambda implements RequestHandler<InputObject, OutputObject> {
     @Inject
     ProcessingService service;
 
+    @Count
     @Override
     public OutputObject handleRequest(InputObject input, Context context) {
         return service.proces(input).setRequestId(context.getAwsRequestId());
diff --git a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
index ea4c543c056d1..15fafdc5c6eb1 100644
--- a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
+++ b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -1,6 +1,9 @@
 package io.quarkus.it.amazon.lambda;
 
-import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.amazon.lambda.test.LambdaClient;
@@ -11,27 +14,46 @@ public class AmazonLambdaSimpleTestCase {
 
     @Test
     public void testSimpleLambdaSuccess() throws Exception {
+        resetCounter();
         InputObject in = new InputObject();
         in.setGreeting("Hello");
         in.setName("Stu");
         OutputObject out = LambdaClient.invoke(OutputObject.class, in);
-        Assertions.assertEquals("Hello Stu", out.getResult());
-        Assertions.assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-<number>'");
+        assertEquals("Hello Stu", out.getResult());
+        assertCounter(1);
+        assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-<number>'");
     }
 
     @Test
     public void testSimpleLambdaFailure() throws Exception {
+        resetCounter();
         InputObject in = new InputObject();
         in.setGreeting("Hello");
         in.setName("Stuart");
         try {
             OutputObject out = LambdaClient.invoke(OutputObject.class, in);
             out.getResult();
-            Assertions.fail();
+            fail();
         } catch (Exception e) {
-            Assertions.assertEquals(ProcessingService.CAN_ONLY_GREET_NICKNAMES, e.getMessage());
+            assertEquals(ProcessingService.CAN_ONLY_GREET_NICKNAMES, e.getMessage());
             //Assertions.assertEquals(IllegalArgumentException.class.getName(), e.getType());
         }
+        assertCounter(1);
+    }
+
+    private void resetCounter() {
+        if (!isNativeImageTest()) {
+            CounterInterceptor.COUNTER.set(0);
+        }
+    }
+
+    private void assertCounter(int expected) {
+        if (!isNativeImageTest()) {
+            assertEquals(expected, CounterInterceptor.COUNTER.get());
+        }
+    }
 
+    private boolean isNativeImageTest() {
+        return System.getProperty("native.image.path") != null;
     }
 }
diff --git a/integration-tests/amazon-services/pom.xml b/integration-tests/amazon-services/pom.xml
index 691e739b19045..487d753dfb432 100644
--- a/integration-tests/amazon-services/pom.xml
+++ b/integration-tests/amazon-services/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,6 +20,7 @@
         <sqs.url>http://localhost:8010</sqs.url>
         <kms.url>http://localhost:8011</kms.url>
         <ses.url>http://localhost:8012</ses.url>
+        <iam.url>http://localhost:8013</iam.url>
     </properties>
 
     <dependencies>
@@ -44,6 +44,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-amazon-dynamodb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-iam</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-amazon-sns</artifactId>
@@ -71,7 +75,7 @@
 
         <dependency>
             <groupId>org.jboss.slf4j</groupId>
-            <artifactId>slf4j-jboss-logging</artifactId>
+            <artifactId>slf4j-jboss-logmanager</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -86,6 +90,138 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-dynamodb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-kms-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-s3-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-iam-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-ses-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-sns-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-amazon-sqs-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -127,7 +263,7 @@
             <id>test-amazon-services</id>
             <activation>
                 <property>
-                    <name>test-amazon-services</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -148,65 +284,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-aws-stack</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <build>
@@ -231,6 +313,7 @@
                                             <port>8010:4576</port> <!-- SQS -->
                                             <port>8011:4599</port> <!-- KMS -->
                                             <port>8012:4566</port> <!-- SES -->
+                                            <port>8013:4593</port> <!-- IAM -->
                                         </ports>
                                         <log/>
                                         <wait>
@@ -273,7 +356,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/amazon-services/src/main/java/io/quarkus/it/amazon/iam/IamResource.java b/integration-tests/amazon-services/src/main/java/io/quarkus/it/amazon/iam/IamResource.java
new file mode 100644
index 0000000000000..38c650a21c474
--- /dev/null
+++ b/integration-tests/amazon-services/src/main/java/io/quarkus/it/amazon/iam/IamResource.java
@@ -0,0 +1,52 @@
+package io.quarkus.it.amazon.iam;
+
+import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.jboss.logging.Logger;
+
+import software.amazon.awssdk.services.iam.IamAsyncClient;
+import software.amazon.awssdk.services.iam.IamClient;
+import software.amazon.awssdk.services.iam.model.CreateUserRequest;
+import software.amazon.awssdk.services.iam.model.CreateUserResponse;
+
+@Path("/iam")
+public class IamResource {
+
+    private static final Logger LOG = Logger.getLogger(IamResource.class);
+
+    @Inject
+    IamClient iamClient;
+
+    @Inject
+    IamAsyncClient iamAsyncClient;
+
+    @GET
+    @Path("sync")
+    @Produces(TEXT_PLAIN)
+    public String testSync() {
+        LOG.info("Testing Sync IAM client");
+        CreateUserResponse user = iamClient.createUser(CreateUserRequest.builder().userName("quarkus").build());
+
+        return String.valueOf(user.sdkHttpResponse().statusCode());
+    }
+
+    @GET
+    @Path("async")
+    @Produces(TEXT_PLAIN)
+    public String testAsync() throws InterruptedException, ExecutionException {
+        LOG.info("Testing Async IAM client");
+
+        CompletableFuture<CreateUserResponse> user = iamAsyncClient
+                .createUser(CreateUserRequest.builder().userName("quarkus").build());
+
+        return String.valueOf(user.get().sdkHttpResponse().statusCode());
+    }
+}
diff --git a/integration-tests/amazon-services/src/main/resources/application.properties b/integration-tests/amazon-services/src/main/resources/application.properties
index 50dd1e5a8da8b..66b1172506ce6 100644
--- a/integration-tests/amazon-services/src/main/resources/application.properties
+++ b/integration-tests/amazon-services/src/main/resources/application.properties
@@ -1,3 +1,5 @@
+quarkus.http.test-timeout=1m
+
 quarkus.dynamodb.endpoint-override=${dynamodb.url}
 quarkus.dynamodb.interceptors=io.quarkus.it.amazon.dynamodb.DynamoDBModifyResponse
 quarkus.dynamodb.aws.region=us-east-1
@@ -34,4 +36,10 @@ quarkus.ses.endpoint-override=${ses.url}
 quarkus.ses.aws.region=us-east-1
 quarkus.ses.aws.credentials.type=static
 quarkus.ses.aws.credentials.static-provider.access-key-id=test-key
-quarkus.ses.aws.credentials.static-provider.secret-access-key=test-secret
\ No newline at end of file
+quarkus.ses.aws.credentials.static-provider.secret-access-key=test-secret
+
+quarkus.iam.endpoint-override=${iam.url}
+quarkus.iam.aws.region=us-east-1
+quarkus.iam.aws.credentials.type=static
+quarkus.iam.aws.credentials.static-provider.access-key-id=test-key
+quarkus.iam.aws.credentials.static-provider.secret-access-key=test-secret
\ No newline at end of file
diff --git a/integration-tests/amazon-services/src/test/java/io/quarkus/it/amazon/AmazonIamTest.java b/integration-tests/amazon-services/src/test/java/io/quarkus/it/amazon/AmazonIamTest.java
new file mode 100644
index 0000000000000..172d716c42e1b
--- /dev/null
+++ b/integration-tests/amazon-services/src/test/java/io/quarkus/it/amazon/AmazonIamTest.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.amazon;
+
+import static org.hamcrest.Matchers.any;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class AmazonIamTest {
+
+    @Test
+    public void testSesAsync() {
+        RestAssured.when().get("/test/iam/async").then().body(any(String.class));
+    }
+
+    @Test
+    public void testSesSync() {
+        RestAssured.when().get("/test/iam/sync").then().body(any(String.class));
+    }
+}
diff --git a/integration-tests/artemis-core/pom.xml b/integration-tests/artemis-core/pom.xml
index 7929bfa6d9934..d0d3f719f9de7 100644
--- a/integration-tests/artemis-core/pom.xml
+++ b/integration-tests/artemis-core/pom.xml
@@ -13,10 +13,6 @@
     <name>Quarkus - Integration Tests - Artemis - Core</name>
     <description>The Apache ActiveMQ Artemis Core integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <!-- JAX-RS -->
         <dependency>
@@ -84,6 +80,60 @@
             <artifactId>commons-logging-jboss-logging</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-artemis-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -102,60 +152,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java
index c641e781346c4..131c0521b3f62 100644
--- a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java
+++ b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java
@@ -21,7 +21,7 @@ public class ArtemisHealthCheckTest {
 
     @Test
     public void test() {
-        Response response = RestAssured.with().get("/health/ready");
+        Response response = RestAssured.with().get("/q/health/ready");
         Assertions.assertEquals(Status.OK.getStatusCode(), response.statusCode());
 
         Map<String, Object> body = response.as(new TypeRef<Map<String, Object>>() {
diff --git a/integration-tests/artemis-jms/pom.xml b/integration-tests/artemis-jms/pom.xml
index 06c9eb3b2f29d..ab577d6095099 100644
--- a/integration-tests/artemis-jms/pom.xml
+++ b/integration-tests/artemis-jms/pom.xml
@@ -13,10 +13,6 @@
     <name>Quarkus - Integration Tests - Artemis - JMS</name>
     <description>The Apache ActiveMQ Artemis JMS integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <!-- JAX-RS -->
         <dependency>
@@ -85,6 +81,60 @@
             <artifactId>commons-logging-jboss-logging</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-artemis-jms-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -103,60 +153,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java
index ba46719e31f66..26c266fcdc397 100644
--- a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java
+++ b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisHealthCheckTest.java
@@ -21,7 +21,7 @@ public class ArtemisHealthCheckTest {
 
     @Test
     public void test() {
-        Response response = RestAssured.with().get("/health/ready");
+        Response response = RestAssured.with().get("/q/health/ready");
         Assertions.assertEquals(Status.OK.getStatusCode(), response.statusCode());
 
         Map<String, Object> body = response.as(new TypeRef<Map<String, Object>>() {
diff --git a/integration-tests/bootstrap-config/application/pom.xml b/integration-tests/bootstrap-config/application/pom.xml
index 42857ae085ce9..af4c04b382905 100644
--- a/integration-tests/bootstrap-config/application/pom.xml
+++ b/integration-tests/bootstrap-config/application/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-test-bootstrap-config</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-bootstrap-config-application</artifactId>
@@ -35,6 +34,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-bootstrap-config-extension-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/bootstrap-config/extension/deployment/pom.xml b/integration-tests/bootstrap-config/extension/deployment/pom.xml
index 72b1144f7e159..53a6eb9d6cadc 100644
--- a/integration-tests/bootstrap-config/extension/deployment/pom.xml
+++ b/integration-tests/bootstrap-config/extension/deployment/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-test-bootstrap-config-extension-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-bootstrap-config-extension-deployment</artifactId>
diff --git a/integration-tests/bootstrap-config/extension/runtime/pom.xml b/integration-tests/bootstrap-config/extension/runtime/pom.xml
index d84bffc7ed76f..faa6ce901fe0a 100644
--- a/integration-tests/bootstrap-config/extension/runtime/pom.xml
+++ b/integration-tests/bootstrap-config/extension/runtime/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-test-bootstrap-config-extension-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-bootstrap-config-extension</artifactId>
diff --git a/integration-tests/bootstrap-config/pom.xml b/integration-tests/bootstrap-config/pom.xml
index cd9797db529b9..661b61cfee01b 100644
--- a/integration-tests/bootstrap-config/pom.xml
+++ b/integration-tests/bootstrap-config/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-bootstrap-config</artifactId>
diff --git a/integration-tests/bouncycastle-fips-jsse/pom.xml b/integration-tests/bouncycastle-fips-jsse/pom.xml
new file mode 100644
index 0000000000000..64ec6bc750191
--- /dev/null
+++ b/integration-tests/bouncycastle-fips-jsse/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-bouncycastle-fips-jsse</artifactId>
+    <name>Quarkus - Integration Tests - Bouncy Castle FIPS JSSE</name>
+    <description>Bouncy Castle FIPS JSSE integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bctls-fips</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bc-fips</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java b/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java
new file mode 100644
index 0000000000000..bf79098f66c7d
--- /dev/null
+++ b/integration-tests/bouncycastle-fips-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseEndpoint.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.bouncycastle;
+
+import java.security.Security;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/jsse")
+public class BouncyCastleFipsJsseEndpoint {
+
+    @GET
+    @Path("listProviders")
+    public String listProviders() {
+        return Arrays.asList(Security.getProviders()).stream()
+                .map(p -> p.getName()).collect(Collectors.joining(","));
+    }
+}
diff --git a/integration-tests/bouncycastle-fips-jsse/src/main/resources/application.properties b/integration-tests/bouncycastle-fips-jsse/src/main/resources/application.properties
new file mode 100644
index 0000000000000..e8af67cf00971
--- /dev/null
+++ b/integration-tests/bouncycastle-fips-jsse/src/main/resources/application.properties
@@ -0,0 +1,18 @@
+quarkus.security.security-providers=BCFIPSJSSE
+
+quarkus.http.ssl.client-auth=REQUIRED
+
+quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
+quarkus.http.ssl.certificate.key-store-password=password
+quarkus.http.ssl.certificate.key-store-file-type=BCFKS
+quarkus.http.ssl.certificate.key-store-provider=BCFIPS
+quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks
+quarkus.http.ssl.certificate.trust-store-password=password
+quarkus.http.ssl.certificate.trust-store-file-type=BCFKS
+quarkus.http.ssl.certificate.trust-store-provider=BCFIPS
+quarkus.native.additional-build-args=-H:IncludeResources=.*\\.jks
+
+quarkus.log.category."org.bouncycastle.jsse".min-level=TRACE
+quarkus.log.category."org.bouncycastle.jsse".level=TRACE
+quarkus.log.file.enable=true
+quarkus.log.file.format=%C - %s%n
diff --git a/integration-tests/bouncycastle-fips-jsse/src/main/resources/server-keystore.jks b/integration-tests/bouncycastle-fips-jsse/src/main/resources/server-keystore.jks
new file mode 100644
index 0000000000000..5eafc603f2299
Binary files /dev/null and b/integration-tests/bouncycastle-fips-jsse/src/main/resources/server-keystore.jks differ
diff --git a/integration-tests/bouncycastle-fips-jsse/src/main/resources/server-truststore.jks b/integration-tests/bouncycastle-fips-jsse/src/main/resources/server-truststore.jks
new file mode 100644
index 0000000000000..371c430bc25d3
Binary files /dev/null and b/integration-tests/bouncycastle-fips-jsse/src/main/resources/server-truststore.jks differ
diff --git a/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseITCase.java b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseITCase.java
new file mode 100644
index 0000000000000..ed8ea4f132d58
--- /dev/null
+++ b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseITCase.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.bouncycastle;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.runtime.util.JavaVersionUtil;
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BouncyCastleFipsJsseITCase extends BouncyCastleFipsJsseTestCase {
+
+    @Test
+    @Override
+    public void testListProviders() throws Exception {
+        if (!JavaVersionUtil.isJava11OrHigher()) {
+            LOG.trace("Skipping BouncyCastleJsseITCase, Java version is older than 11");
+            return;
+        }
+        doTestListProviders();
+        checkLog(true);
+    }
+}
diff --git a/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java
new file mode 100644
index 0000000000000..3828f84f7d75a
--- /dev/null
+++ b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java
@@ -0,0 +1,160 @@
+package io.quarkus.it.bouncycastle;
+
+import static org.awaitility.Awaitility.given;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import org.awaitility.core.ThrowingRunnable;
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.runtime.util.JavaVersionUtil;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.net.KeyStoreOptions;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.mutiny.ext.web.client.HttpResponse;
+import io.vertx.mutiny.ext.web.client.WebClient;
+
+@QuarkusTest
+public class BouncyCastleFipsJsseTestCase {
+
+    static final Logger LOG = Logger.getLogger(BouncyCastleFipsJsseTestCase.class);
+
+    @TestHTTPResource(ssl = true)
+    URL url;
+
+    @Inject
+    Vertx vertx;
+
+    @Test
+    public void testListProviders() throws Exception {
+        if (!JavaVersionUtil.isJava11OrHigher()) {
+            LOG.trace("Skipping BouncyCastleJsseITCase, Java version is older than 11");
+            return;
+        }
+        doTestListProviders();
+        checkLog(false);
+    }
+
+    protected void doTestListProviders() throws Exception {
+        WebClientOptions options = createWebClientOptions();
+        WebClient webClient = WebClient.create(new io.vertx.mutiny.core.Vertx(vertx), options);
+        HttpResponse<io.vertx.mutiny.core.buffer.Buffer> resp = webClient.get("/jsse/listProviders").send().await()
+                .indefinitely();
+        String providers = resp.bodyAsString();
+        assertTrue(providers.contains("BCFIPS,BCJSSE"));
+    }
+
+    private WebClientOptions createWebClientOptions() throws Exception {
+        WebClientOptions webClientOptions = new WebClientOptions().setDefaultHost(url.getHost())
+                .setDefaultPort(url.getPort()).setSsl(true).setVerifyHost(false);
+
+        byte[] keyStoreData = getFileContent(Paths.get("client-keystore.jks"));
+        KeyStoreOptions keyStoreOptions = new KeyStoreOptions()
+                .setPassword("password")
+                .setValue(Buffer.buffer(keyStoreData))
+                .setType("BCFKS")
+                .setProvider("BCFIPS");
+        webClientOptions.setKeyCertOptions(keyStoreOptions);
+
+        byte[] trustStoreData = getFileContent(Paths.get("client-truststore.jks"));
+        KeyStoreOptions trustStoreOptions = new KeyStoreOptions()
+                .setPassword("password")
+                .setValue(Buffer.buffer(trustStoreData))
+                .setType("BCFKS")
+                .setProvider("BCFIPS");
+        webClientOptions.setTrustOptions(trustStoreOptions);
+
+        return webClientOptions;
+    }
+
+    protected void checkLog(boolean serverOnly) {
+        final Path logDirectory = Paths.get(".", "target");
+        given().pollInterval(100, TimeUnit.MILLISECONDS)
+                .atMost(10, TimeUnit.SECONDS)
+                .untilAsserted(new ThrowingRunnable() {
+                    @Override
+                    public void run() throws Throwable {
+                        Path accessLogFilePath = logDirectory.resolve("quarkus.log");
+                        boolean fileExists = Files.exists(accessLogFilePath);
+                        if (!fileExists) {
+                            accessLogFilePath = logDirectory.resolve("target/quarkus.log");
+                            fileExists = Files.exists(accessLogFilePath);
+                        }
+                        Assertions.assertTrue(fileExists, "access log file " + accessLogFilePath + " is missing");
+
+                        boolean checkClientPassed = serverOnly;
+                        boolean checkServerPassed = false;
+
+                        StringBuilder sbLog = new StringBuilder();
+                        try (BufferedReader reader = new BufferedReader(
+                                new InputStreamReader(new ByteArrayInputStream(Files.readAllBytes(accessLogFilePath)),
+                                        StandardCharsets.UTF_8))) {
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                sbLog.append(line).append("/r/n");
+                                if (!checkServerPassed && line.contains("ProvTlsServer")
+                                        && (line.contains("Server selected protocol version: TLSv1.2")
+                                                || line.contains("Server selected protocol version: TLSv1.3"))) {
+                                    checkServerPassed = true;
+                                } else if (!checkClientPassed && line.contains("ProvTlsClient")
+                                        && (line.contains("Client notified of selected protocol version: TLSv1.2")
+                                                || line.contains("Client notified of selected protocol version: TLSv1.3"))) {
+                                    checkClientPassed = true;
+                                }
+                                if (checkClientPassed && checkServerPassed) {
+                                    break;
+                                }
+                            }
+                        }
+                        assertTrue(checkClientPassed,
+                                "Log file doesn't contain BouncyCastle JSSE client records, log: " + sbLog.toString());
+                        assertTrue(checkServerPassed,
+                                "Log file doesn't contain BouncyCastle JSSE server records, log: " + sbLog.toString());
+                    }
+                });
+    }
+
+    private static byte[] getFileContent(Path path) throws IOException {
+        byte[] data;
+        final InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream(path.toString());
+        if (resource != null) {
+            try (InputStream is = resource) {
+                data = doRead(is);
+            }
+        } else {
+            try (InputStream is = Files.newInputStream(path)) {
+                data = doRead(is);
+            }
+        }
+        return data;
+    }
+
+    private static byte[] doRead(InputStream is) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        byte[] buf = new byte[1024];
+        int r;
+        while ((r = is.read(buf)) > 0) {
+            out.write(buf, 0, r);
+        }
+        return out.toByteArray();
+    }
+}
diff --git a/integration-tests/bouncycastle-fips-jsse/src/test/resources/client-keystore.jks b/integration-tests/bouncycastle-fips-jsse/src/test/resources/client-keystore.jks
new file mode 100644
index 0000000000000..371c430bc25d3
Binary files /dev/null and b/integration-tests/bouncycastle-fips-jsse/src/test/resources/client-keystore.jks differ
diff --git a/integration-tests/bouncycastle-fips-jsse/src/test/resources/client-truststore.jks b/integration-tests/bouncycastle-fips-jsse/src/test/resources/client-truststore.jks
new file mode 100644
index 0000000000000..5eafc603f2299
Binary files /dev/null and b/integration-tests/bouncycastle-fips-jsse/src/test/resources/client-truststore.jks differ
diff --git a/integration-tests/bouncycastle-fips/pom.xml b/integration-tests/bouncycastle-fips/pom.xml
new file mode 100644
index 0000000000000..09b8805d2fd73
--- /dev/null
+++ b/integration-tests/bouncycastle-fips/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-bouncycastle-fips</artifactId>
+    <name>Quarkus - Integration Tests - Bouncy Castle FIPS</name>
+    <description>Bouncy Castle FIPS integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bc-fips</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>no-native</id>
+            <activation>
+                <property>
+                    <name>!native</name>
+                </property>
+            </activation>
+            <!-- these properties must not be defined in the general properties,
+                 otherwise the native profile in the parent pom is not able to override them -->
+            <properties>
+                <quarkus.package.type>uber-jar</quarkus.package.type>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsEndpoint.java b/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsEndpoint.java
new file mode 100644
index 0000000000000..e7731b43ea9b7
--- /dev/null
+++ b/integration-tests/bouncycastle-fips/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleFipsEndpoint.java
@@ -0,0 +1,29 @@
+package io.quarkus.it.bouncycastle;
+
+import java.security.Security;
+import java.security.Signature;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/jca")
+public class BouncyCastleFipsEndpoint {
+
+    @GET
+    @Path("listProviders")
+    public String listProviders() {
+        return Arrays.asList(Security.getProviders()).stream()
+                .filter(p -> p.getName().equals("BCFIPS"))
+                .map(p -> p.getName()).collect(Collectors.joining());
+    }
+
+    @GET
+    @Path("SHA256withRSAandMGF1")
+    public String checkSHA256withRSAandMGF1() throws Exception {
+        // This algorithm name is only supported with BC, Java (11+) equivalent is `RSASSA-PSS`
+        Signature.getInstance("SHA256withRSAandMGF1", "BCFIPS");
+        return "success";
+    }
+}
diff --git a/integration-tests/bouncycastle-fips/src/main/resources/application.properties b/integration-tests/bouncycastle-fips/src/main/resources/application.properties
new file mode 100644
index 0000000000000..e33534e88ffed
--- /dev/null
+++ b/integration-tests/bouncycastle-fips/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.security.security-providers=BCFIPS
diff --git a/integration-tests/bouncycastle-fips/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsITCase.java b/integration-tests/bouncycastle-fips/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsITCase.java
new file mode 100644
index 0000000000000..e4303688f6ffd
--- /dev/null
+++ b/integration-tests/bouncycastle-fips/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.bouncycastle;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BouncyCastleFipsITCase extends BouncyCastleFipsTestCase {
+}
diff --git a/integration-tests/bouncycastle-fips/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsTestCase.java b/integration-tests/bouncycastle-fips/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsTestCase.java
new file mode 100644
index 0000000000000..fed961e576198
--- /dev/null
+++ b/integration-tests/bouncycastle-fips/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsTestCase.java
@@ -0,0 +1,33 @@
+package io.quarkus.it.bouncycastle;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class BouncyCastleFipsTestCase {
+
+    @Test
+    public void testListProviders() {
+        RestAssured.given()
+                .when()
+                .get("/jca/listProviders")
+                .then()
+                .statusCode(200)
+                .body(equalTo("BCFIPS"));
+    }
+
+    @Test
+    public void testSHA256withRSAandMGF1() {
+        RestAssured.given()
+                .when()
+                .get("/jca/SHA256withRSAandMGF1")
+                .then()
+                .statusCode(200)
+                .body(equalTo("success"));
+    }
+
+}
diff --git a/integration-tests/bouncycastle-jsse/pom.xml b/integration-tests/bouncycastle-jsse/pom.xml
new file mode 100644
index 0000000000000..d546332e6da73
--- /dev/null
+++ b/integration-tests/bouncycastle-jsse/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-bouncycastle-jsse</artifactId>
+    <name>Quarkus - Integration Tests - Bouncy Castle JSSE</name>
+    <description>Bouncy Castle integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bctls-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java
new file mode 100644
index 0000000000000..4f20e3cff332c
--- /dev/null
+++ b/integration-tests/bouncycastle-jsse/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleJsseEndpoint.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.bouncycastle;
+
+import java.security.Security;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/jsse")
+public class BouncyCastleJsseEndpoint {
+
+    @GET
+    @Path("listProviders")
+    public String listProviders() {
+        return Arrays.asList(Security.getProviders()).stream()
+                .map(p -> p.getName()).collect(Collectors.joining(","));
+    }
+}
diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/application.properties b/integration-tests/bouncycastle-jsse/src/main/resources/application.properties
new file mode 100644
index 0000000000000..4c0d0e07a2f40
--- /dev/null
+++ b/integration-tests/bouncycastle-jsse/src/main/resources/application.properties
@@ -0,0 +1,13 @@
+quarkus.security.security-providers=BCJSSE
+
+quarkus.http.ssl.certificate.key-store-file=server-keystore.jks
+quarkus.http.ssl.certificate.key-store-password=password
+quarkus.http.ssl.certificate.trust-store-file=server-truststore.jks
+quarkus.http.ssl.certificate.trust-store-password=password
+quarkus.http.ssl.client-auth=REQUIRED
+quarkus.native.additional-build-args=-H:IncludeResources=.*\\.jks
+
+quarkus.log.category."org.bouncycastle.jsse".min-level=TRACE
+quarkus.log.category."org.bouncycastle.jsse".level=TRACE
+quarkus.log.file.enable=true
+quarkus.log.file.format=%C - %s%n
diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks b/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks
new file mode 100644
index 0000000000000..d8991ddbd627d
Binary files /dev/null and b/integration-tests/bouncycastle-jsse/src/main/resources/server-keystore.jks differ
diff --git a/integration-tests/bouncycastle-jsse/src/main/resources/server-truststore.jks b/integration-tests/bouncycastle-jsse/src/main/resources/server-truststore.jks
new file mode 100644
index 0000000000000..8ec8e126507b6
Binary files /dev/null and b/integration-tests/bouncycastle-jsse/src/main/resources/server-truststore.jks differ
diff --git a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseITCase.java b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseITCase.java
new file mode 100644
index 0000000000000..3a685627d6698
--- /dev/null
+++ b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseITCase.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.bouncycastle;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.runtime.util.JavaVersionUtil;
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BouncyCastleJsseITCase extends BouncyCastleJsseTestCase {
+    @Test
+    @Override
+    public void testListProviders() {
+        if (!JavaVersionUtil.isJava11OrHigher()) {
+            LOG.trace("Skipping BouncyCastleJsseITCase, Java version is older than 11");
+            return;
+        }
+        doTestListProviders();
+        checkLog(true);
+    }
+}
diff --git a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java
new file mode 100644
index 0000000000000..8421d06f1554d
--- /dev/null
+++ b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java
@@ -0,0 +1,109 @@
+package io.quarkus.it.bouncycastle;
+
+import static org.awaitility.Awaitility.given;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.core.ThrowingRunnable;
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.runtime.util.JavaVersionUtil;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.specification.RequestSpecification;
+
+@QuarkusTest
+public class BouncyCastleJsseTestCase {
+
+    static final Logger LOG = Logger.getLogger(BouncyCastleJsseTestCase.class);
+
+    @TestHTTPResource(ssl = true)
+    URL url;
+
+    @Test
+    public void testListProviders() {
+        if (!JavaVersionUtil.isJava11OrHigher()) {
+            LOG.trace("Skipping BouncyCastleJsseITCase, Java version is older than 11");
+            return;
+        }
+        doTestListProviders();
+        checkLog(false);
+    }
+
+    protected void doTestListProviders() {
+        RequestSpecification spec = new RequestSpecBuilder()
+                .setBaseUri(String.format("%s://%s", url.getProtocol(), url.getHost()))
+                .setPort(url.getPort())
+                .setKeyStore("client-keystore.jks", "password")
+                .setTrustStore("client-truststore.jks", "password")
+                .build();
+        RestAssured.given()
+                .spec(spec)
+                .when()
+                .get("/jsse/listProviders")
+                .then()
+                .statusCode(200)
+                .body(containsString("BC,BCJSSE,SunJSSE"));
+    }
+
+    protected void checkLog(boolean serverOnly) {
+        final Path logDirectory = Paths.get(".", "target");
+        given().pollInterval(100, TimeUnit.MILLISECONDS)
+                .atMost(10, TimeUnit.SECONDS)
+                .untilAsserted(new ThrowingRunnable() {
+                    @Override
+                    public void run() throws Throwable {
+                        Path accessLogFilePath = logDirectory.resolve("quarkus.log");
+                        boolean fileExists = Files.exists(accessLogFilePath);
+                        if (!fileExists) {
+                            accessLogFilePath = logDirectory.resolve("target/quarkus.log");
+                            fileExists = Files.exists(accessLogFilePath);
+                        }
+                        Assertions.assertTrue(fileExists, "access log file " + accessLogFilePath + " is missing");
+
+                        boolean checkClientPassed = serverOnly;
+                        boolean checkServerPassed = false;
+
+                        StringBuilder sbLog = new StringBuilder();
+                        try (BufferedReader reader = new BufferedReader(
+                                new InputStreamReader(new ByteArrayInputStream(Files.readAllBytes(accessLogFilePath)),
+                                        StandardCharsets.UTF_8))) {
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                sbLog.append(line).append("/r/n");
+                                if (!checkServerPassed && line.contains("ProvTlsServer")
+                                        && (line.contains("Server selected protocol version: TLSv1.2")
+                                                || line.contains("Server selected protocol version: TLSv1.3"))) {
+                                    checkServerPassed = true;
+                                } else if (!checkClientPassed && line.contains("ProvTlsClient")
+                                        && (line.contains("Client notified of selected protocol version: TLSv1.2")
+                                                || line.contains("Client notified of selected protocol version: TLSv1.3"))) {
+                                    checkClientPassed = true;
+                                }
+                                if (checkClientPassed && checkServerPassed) {
+                                    break;
+                                }
+                            }
+                        }
+                        assertTrue(checkClientPassed,
+                                "Log file doesn't contain BouncyCastle JSSE client records, log: " + sbLog.toString());
+                        assertTrue(checkServerPassed,
+                                "Log file doesn't contain BouncyCastle JSSE server records, log: " + sbLog.toString());
+                    }
+                });
+    }
+}
diff --git a/integration-tests/bouncycastle-jsse/src/test/resources/client-keystore.jks b/integration-tests/bouncycastle-jsse/src/test/resources/client-keystore.jks
new file mode 100644
index 0000000000000..cf6d6ba454864
Binary files /dev/null and b/integration-tests/bouncycastle-jsse/src/test/resources/client-keystore.jks differ
diff --git a/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks b/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks
new file mode 100644
index 0000000000000..112fb9857fbd7
Binary files /dev/null and b/integration-tests/bouncycastle-jsse/src/test/resources/client-truststore.jks differ
diff --git a/integration-tests/bouncycastle/pom.xml b/integration-tests/bouncycastle/pom.xml
new file mode 100644
index 0000000000000..96607fdc07ff3
--- /dev/null
+++ b/integration-tests/bouncycastle/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-bouncycastle</artifactId>
+    <name>Quarkus - Integration Tests - Bouncy Castle</name>
+    <description>Bouncy Castle integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>no-native</id>
+            <activation>
+                <property>
+                    <name>!native</name>
+                </property>
+            </activation>
+            <!-- these properties must not be defined in the general properties,
+                 otherwise the native profile in the parent pom is not able to override them -->
+            <properties>
+                <quarkus.package.type>uber-jar</quarkus.package.type>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java b/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java
new file mode 100644
index 0000000000000..153318831b200
--- /dev/null
+++ b/integration-tests/bouncycastle/src/main/java/io/quarkus/it/bouncycastle/BouncyCastleEndpoint.java
@@ -0,0 +1,29 @@
+package io.quarkus.it.bouncycastle;
+
+import java.security.Security;
+import java.security.Signature;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/jca")
+public class BouncyCastleEndpoint {
+
+    @GET
+    @Path("listProviders")
+    public String listProviders() {
+        return Arrays.asList(Security.getProviders()).stream()
+                .filter(p -> p.getName().equals("BC"))
+                .map(p -> p.getName()).collect(Collectors.joining());
+    }
+
+    @GET
+    @Path("SHA256withRSAandMGF1")
+    public String checkSHA256withRSAandMGF1() throws Exception {
+        // This algorithm name is only supported with BC, Java (11+) equivalent is `RSASSA-PSS`
+        Signature.getInstance("SHA256withRSAandMGF1", "BC");
+        return "success";
+    }
+}
diff --git a/integration-tests/bouncycastle/src/main/resources/application.properties b/integration-tests/bouncycastle/src/main/resources/application.properties
new file mode 100644
index 0000000000000..19aa109c7a090
--- /dev/null
+++ b/integration-tests/bouncycastle/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.security.security-providers=BC
diff --git a/integration-tests/bouncycastle/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleITCase.java b/integration-tests/bouncycastle/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleITCase.java
new file mode 100644
index 0000000000000..e2af1efbfe881
--- /dev/null
+++ b/integration-tests/bouncycastle/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.bouncycastle;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BouncyCastleITCase extends BouncyCastleTestCase {
+}
diff --git a/integration-tests/bouncycastle/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleTestCase.java b/integration-tests/bouncycastle/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleTestCase.java
new file mode 100644
index 0000000000000..0f94b08af0e86
--- /dev/null
+++ b/integration-tests/bouncycastle/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleTestCase.java
@@ -0,0 +1,33 @@
+package io.quarkus.it.bouncycastle;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class BouncyCastleTestCase {
+
+    @Test
+    public void testListProviders() {
+        RestAssured.given()
+                .when()
+                .get("/jca/listProviders")
+                .then()
+                .statusCode(200)
+                .body(equalTo("BC"));
+    }
+
+    @Test
+    public void testSHA256withRSAandMGF1() {
+        RestAssured.given()
+                .when()
+                .get("/jca/SHA256withRSAandMGF1")
+                .then()
+                .statusCode(200)
+                .body(equalTo("success"));
+    }
+
+}
diff --git a/integration-tests/cache/pom.xml b/integration-tests/cache/pom.xml
index a7051f682d6dd..1dd3260f3ae45 100644
--- a/integration-tests/cache/pom.xml
+++ b/integration-tests/cache/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-cache</artifactId>
@@ -21,11 +20,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-context-propagation</artifactId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
+            <artifactId>quarkus-rest-client</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -52,6 +51,73 @@
             <artifactId>quarkus-test-h2</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-cache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,60 +136,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java
new file mode 100644
index 0000000000000..cc1e26fdf3a64
--- /dev/null
+++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/CaffeineResource.java
@@ -0,0 +1,61 @@
+package io.quarkus.it.cache;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import com.github.benmanes.caffeine.cache.CacheLoader;
+
+@ApplicationScoped
+@Path("/caffeine")
+public class CaffeineResource {
+    /*
+     * Replicates the behavior of com.github.benmanes.caffeine.cache.LocalLoadingCache.java
+     *
+     * https://github.com/ben-manes/caffeine/blob/37f6ad303eb4474cd8a644551d528dfda37c5bfc/caffeine/src/main/java/com/github/
+     * benmanes/caffeine/cache/LocalLoadingCache.java#L176-L185
+     */
+    public static boolean hasLoadAll(CacheLoader<String, String> cl) {
+        try {
+            Method classLoadAll = cl.getClass().getMethod("loadAll", Iterable.class);
+            Method defaultLoadAll = CacheLoader.class.getMethod("loadAll", Iterable.class);
+            return !classLoadAll.equals(defaultLoadAll);
+        } catch (NoSuchMethodException | SecurityException e) {
+            return false;
+        }
+    }
+
+    @GET
+    @Path("/hasLoadAll")
+    public JsonObject hasLoadAll() {
+        return Json.createObjectBuilder()
+                .add("loader", hasLoadAll(new MyCacheLoader()))
+                .add("bulk-loader", hasLoadAll(new MyBulkCacheLoader()))
+                .build();
+    }
+
+    public static class MyCacheLoader implements CacheLoader<String, String> {
+        @Override
+        public String load(String unused) throws Exception {
+            return null;
+        }
+    }
+
+    public static class MyBulkCacheLoader implements CacheLoader<String, String> {
+        @Override
+        public String load(String unused) throws Exception {
+            return null;
+        }
+
+        @Override
+        public Map<String, String> loadAll(Iterable<? extends String> unused) throws Exception {
+            return Collections.emptyMap();
+        }
+    }
+}
diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java
index 253addaf7021d..8339b5b616a81 100644
--- a/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java
+++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/ExpensiveResource.java
@@ -4,9 +4,7 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 
 import io.quarkus.cache.CacheKey;
 import io.quarkus.cache.CacheResult;
@@ -19,7 +17,6 @@ public class ExpensiveResource {
 
     @GET
     @Path("/{keyElement1}/{keyElement2}/{keyElement3}")
-    @Produces(MediaType.APPLICATION_JSON)
     @CacheResult(cacheName = "expensiveResourceCache", lockTimeout = 5000)
     public ExpensiveResponse getExpensiveResponse(@PathParam("keyElement1") @CacheKey String keyElement1,
             @PathParam("keyElement2") @CacheKey String keyElement2, @PathParam("keyElement3") @CacheKey String keyElement3,
diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java
new file mode 100644
index 0000000000000..77e2e9dc96e41
--- /dev/null
+++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/RestClientResource.java
@@ -0,0 +1,40 @@
+package io.quarkus.it.cache;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+import org.jboss.resteasy.annotations.jaxrs.QueryParam;
+
+@Path("rest-client")
+public class RestClientResource {
+
+    @RestClient
+    SunriseRestClient sunriseRestClient;
+
+    @GET
+    @Path("time/{city}")
+    public String getSunriseTime(@PathParam String city, @QueryParam String date) {
+        return sunriseRestClient.getSunriseTime(city, date);
+    }
+
+    @GET
+    @Path("invocations")
+    public Integer getSunriseTimeInvocations() {
+        return sunriseRestClient.getSunriseTimeInvocations();
+    }
+
+    @DELETE
+    @Path("invalidate/{city}")
+    public void invalidate(@PathParam String city, @QueryParam String notPartOfTheCacheKey, @QueryParam String date) {
+        sunriseRestClient.invalidate(city, notPartOfTheCacheKey, date);
+    }
+
+    @DELETE
+    @Path("invalidate")
+    public void invalidateAll() {
+        sunriseRestClient.invalidateAll();
+    }
+}
diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java
new file mode 100644
index 0000000000000..22c905b761737
--- /dev/null
+++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestClient.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.cache;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+import org.jboss.resteasy.annotations.jaxrs.QueryParam;
+
+import io.quarkus.cache.CacheInvalidate;
+import io.quarkus.cache.CacheInvalidateAll;
+import io.quarkus.cache.CacheKey;
+import io.quarkus.cache.CacheResult;
+
+@RegisterRestClient
+@Path("sunrise")
+public interface SunriseRestClient {
+
+    String CACHE_NAME = "sunrise-cache";
+
+    @GET
+    @Path("time/{city}")
+    @CacheResult(cacheName = CACHE_NAME)
+    String getSunriseTime(@PathParam String city, @QueryParam String date);
+
+    @GET
+    @Path("invocations")
+    Integer getSunriseTimeInvocations();
+
+    /*
+     * The following methods wouldn't make sense in a real-life application but it's not relevant here. We only need to check if
+     * the caching annotations work as intended with the rest-client extension.
+     */
+
+    @DELETE
+    @Path("invalidate/{city}")
+    @CacheInvalidate(cacheName = CACHE_NAME)
+    void invalidate(@CacheKey @PathParam String city, @QueryParam String notPartOfTheCacheKey,
+            @CacheKey @QueryParam String date);
+
+    @DELETE
+    @Path("invalidate")
+    @CacheInvalidateAll(cacheName = CACHE_NAME)
+    void invalidateAll();
+}
diff --git a/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java
new file mode 100644
index 0000000000000..15555ec0fb19c
--- /dev/null
+++ b/integration-tests/cache/src/main/java/io/quarkus/it/cache/SunriseRestServerResource.java
@@ -0,0 +1,41 @@
+package io.quarkus.it.cache;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+import org.jboss.resteasy.annotations.jaxrs.QueryParam;
+
+@ApplicationScoped
+@Path("sunrise")
+public class SunriseRestServerResource {
+
+    private int sunriseTimeInvocations;
+
+    @GET
+    @Path("time/{city}")
+    public String getSunriseTime(@PathParam String city, @QueryParam String date) {
+        sunriseTimeInvocations++;
+        return "2020-12-20T10:15:30";
+    }
+
+    @GET
+    @Path("invocations")
+    public Integer getSunriseTimeInvocations() {
+        return sunriseTimeInvocations;
+    }
+
+    @DELETE
+    @Path("invalidate/{city}")
+    public void invalidate(@PathParam String city, @QueryParam String notPartOfTheCacheKey, @QueryParam String date) {
+        // Do nothing. We only need to test the caching annotation on the client side.
+    }
+
+    @DELETE
+    @Path("invalidate")
+    public void invalidateAll() {
+        // Do nothing. We only need to test the caching annotation on the client side.
+    }
+}
diff --git a/integration-tests/cache/src/main/resources/application.properties b/integration-tests/cache/src/main/resources/application.properties
index 35b5a8cac5542..740e54971c2cc 100644
--- a/integration-tests/cache/src/main/resources/application.properties
+++ b/integration-tests/cache/src/main/resources/application.properties
@@ -3,3 +3,8 @@ quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.sql-load-script=import.sql
+
+# configure the cache
+quarkus.cache.caffeine."forest".expire-after-write=10M
+
+io.quarkus.it.cache.SunriseRestClient/mp-rest/url=${test.url}
diff --git a/integration-tests/cache/src/test/java/io/quarkus/it/cache/CaffeineITCase.java b/integration-tests/cache/src/test/java/io/quarkus/it/cache/CaffeineITCase.java
new file mode 100644
index 0000000000000..ac9a278d4a43d
--- /dev/null
+++ b/integration-tests/cache/src/test/java/io/quarkus/it/cache/CaffeineITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.cache;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class CaffeineITCase extends CaffeineTestCase {
+}
diff --git a/integration-tests/cache/src/test/java/io/quarkus/it/cache/CaffeineTestCase.java b/integration-tests/cache/src/test/java/io/quarkus/it/cache/CaffeineTestCase.java
new file mode 100644
index 0000000000000..f870e1974d2d7
--- /dev/null
+++ b/integration-tests/cache/src/test/java/io/quarkus/it/cache/CaffeineTestCase.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.cache;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class CaffeineTestCase {
+
+    @Test
+    public void test() {
+        given().when().get("/caffeine/hasLoadAll").then().statusCode(200).body(
+                "loader", is(false),
+                "bulk-loader", is(true));
+    }
+}
diff --git a/integration-tests/cache/src/test/java/io/quarkus/it/cache/RestClientITCase.java b/integration-tests/cache/src/test/java/io/quarkus/it/cache/RestClientITCase.java
new file mode 100644
index 0000000000000..9c4b81bd9d427
--- /dev/null
+++ b/integration-tests/cache/src/test/java/io/quarkus/it/cache/RestClientITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.cache;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class RestClientITCase extends RestClientTestCase {
+}
diff --git a/integration-tests/cache/src/test/java/io/quarkus/it/cache/RestClientTestCase.java b/integration-tests/cache/src/test/java/io/quarkus/it/cache/RestClientTestCase.java
new file mode 100644
index 0000000000000..2b4359830db92
--- /dev/null
+++ b/integration-tests/cache/src/test/java/io/quarkus/it/cache/RestClientTestCase.java
@@ -0,0 +1,68 @@
+package io.quarkus.it.cache;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+@DisplayName("Tests the integration between the cache and the rest-client extensions")
+public class RestClientTestCase {
+
+    private static final String CITY = "Toulouse";
+    private static final String TODAY = "2020-12-20";
+
+    @Test
+    public void test() {
+        assertInvocations("0");
+        getSunriseTimeInvocations();
+        assertInvocations("1");
+        getSunriseTimeInvocations();
+        assertInvocations("1");
+        invalidate();
+        getSunriseTimeInvocations();
+        assertInvocations("2");
+        invalidateAll();
+        getSunriseTimeInvocations();
+        assertInvocations("3");
+    }
+
+    private void assertInvocations(String expectedInvocations) {
+        given()
+                .when()
+                .get("/rest-client/invocations")
+                .then()
+                .statusCode(200)
+                .body(equalTo(expectedInvocations));
+    }
+
+    private void getSunriseTimeInvocations() {
+        given()
+                .queryParam("date", TODAY)
+                .when()
+                .get("/rest-client/time/{city}", CITY)
+                .then()
+                .statusCode(200);
+    }
+
+    private void invalidate() {
+        given()
+                .queryParam("date", TODAY)
+                .queryParam("notPartOfTheCacheKey", "notPartOfTheCacheKey")
+                .when()
+                .delete("/rest-client/invalidate/{city}", CITY)
+                .then()
+                .statusCode(204);
+    }
+
+    private void invalidateAll() {
+        given()
+                .when()
+                .delete("/rest-client/invalidate")
+                .then()
+                .statusCode(204);
+    }
+}
diff --git a/integration-tests/class-transformer/deployment/pom.xml b/integration-tests/class-transformer/deployment/pom.xml
index daf23f719f14f..82f2248b42d71 100644
--- a/integration-tests/class-transformer/deployment/pom.xml
+++ b/integration-tests/class-transformer/deployment/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-test-class-transformer-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/integration-tests/class-transformer/disable-native-profile b/integration-tests/class-transformer/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/class-transformer/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/class-transformer/pom.xml b/integration-tests/class-transformer/pom.xml
index 50a20bdfe201f..054e27c6aac80 100644
--- a/integration-tests/class-transformer/pom.xml
+++ b/integration-tests/class-transformer/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/integration-tests/class-transformer/runtime/pom.xml b/integration-tests/class-transformer/runtime/pom.xml
index a9c69e1f61f6d..e75411cf06745 100644
--- a/integration-tests/class-transformer/runtime/pom.xml
+++ b/integration-tests/class-transformer/runtime/pom.xml
@@ -6,13 +6,33 @@
     <artifactId>quarkus-integration-test-class-transformer-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>quarkus-integration-test-class-transformer</artifactId>
   <name>Quarkus - Integration Tests - Class tranformer - Runtime</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-core-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
diff --git a/integration-tests/common-jpa-entities/disable-native-profile b/integration-tests/common-jpa-entities/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/common-jpa-entities/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/common-jpa-entities/pom.xml b/integration-tests/common-jpa-entities/pom.xml
index 4d509f72946a6..d5ee8734e20b1 100644
--- a/integration-tests/common-jpa-entities/pom.xml
+++ b/integration-tests/common-jpa-entities/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/integration-tests/consul-config/pom.xml b/integration-tests/consul-config/pom.xml
index d14f1856240b7..f1f6afcdc1ced 100644
--- a/integration-tests/consul-config/pom.xml
+++ b/integration-tests/consul-config/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-consul-config</artifactId>
@@ -33,6 +32,34 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-consul-config-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -53,37 +80,15 @@
 
     <profiles>
         <profile>
-            <id>native</id>
+            <id>native-image</id>
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
+            <!-- add some custom config, the rest comes from parent -->
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>uk.co.automatictester</groupId>
                         <artifactId>wiremock-maven-plugin</artifactId>
@@ -111,9 +116,7 @@
                     </plugin>
                 </plugins>
             </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
         </profile>
     </profiles>
+
 </project>
diff --git a/integration-tests/container-image/disable-native-profile b/integration-tests/container-image/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/container-image/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/container-image/maven-invoker-way/pom.xml b/integration-tests/container-image/maven-invoker-way/pom.xml
index 25e681436e623..a677629b0bfba 100644
--- a/integration-tests/container-image/maven-invoker-way/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/pom.xml
@@ -107,7 +107,7 @@
             <id>container-image-docker</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
                 <os>
                     <family>linux</family>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
index a058bb217576f..7fa083b0097f8 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
@@ -77,6 +77,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -86,21 +89,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm
index fa97e4b117200..6e349aaf8576a 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm
@@ -1,22 +1,54 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
 #
-# Before building the docker image run:
+# Before building the container image run:
 #
-# mvn package
+# ./mvnw package
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/getting-started-jvm .
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/rest-client-quickstart-jvm .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/getting-started-jvm
+# docker run -i --rm -p 8080:8080 quarkus/rest-client-quickstart-jvm
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/rest-client-quickstart-jvm
 #
 ###
-FROM fabric8/java-alpine-openjdk8-jre
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 
+
+ARG JAVA_PACKAGE=java-11-openjdk-headless
+ARG RUN_JAVA_VERSION=1.3.8
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+# Install java and the run-java script
+# Also set up permissions for user `1001`
+RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
+    && microdnf update \
+    && microdnf clean all \
+    && mkdir /deployments \
+    && chown 1001 /deployments \
+    && chmod "g+rwX" /deployments \
+    && chown 1001:root /deployments \
+    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
+    && chown 1001 /deployments/run-java.sh \
+    && chmod 540 /deployments/run-java.sh \
+    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
+
+# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV AB_ENABLED=jmx_exporter
-COPY target/lib/* /deployments/lib/
-COPY target/*-runner.jar /deployments/app.jar
-ENTRYPOINT [ "/deployments/run-java.sh" ]
\ No newline at end of file
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=1001 target/quarkus-app/lib/ /deployments/lib/
+COPY --chown=1001 target/quarkus-app/*.jar /deployments/
+COPY --chown=1001 target/quarkus-app/app/ /deployments/app/
+COPY --chown=1001 target/quarkus-app/quarkus/ /deployments/quarkus/
+
+EXPOSE 8080
+USER 1001
+
+ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/invoker.properties b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/invoker.properties
new file mode 100644
index 0000000000000..5a1e6fd59b49c
--- /dev/null
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/invoker.properties
@@ -0,0 +1 @@
+invoker.goals=clean package -Dquarkus.container-image.build=true
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
new file mode 100644
index 0000000000000..bda3e4a983e42
--- /dev/null
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>container-build-jib-appcds</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <properties>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>@project.version@</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-reactive</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-jib</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <maven.home>${maven.home}</maven.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skipTests>${native.surefire.skip}</skipTests>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java
new file mode 100644
index 0000000000000..ad80766a17747
--- /dev/null
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/java/org/acme/Hello.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class Hello {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/resources/application.properties b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/resources/application.properties
new file mode 100644
index 0000000000000..8c13e8552019a
--- /dev/null
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+# Configuration file
+# key = value
+quarkus.package.type=fast-jar
+quarkus.package.create-appcds=true
+# -Xshare:on ensures that the AppCDS file will be used - if it can't, the JVM terminates
+quarkus.jib.jvm-arguments=-Djava.util.logging.manager=org.jboss.logmanager.LogManager,-Xshare:on
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/verify.groovy b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/verify.groovy
new file mode 100644
index 0000000000000..e9018f7cc3698
--- /dev/null
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/verify.groovy
@@ -0,0 +1,43 @@
+import io.quarkus.deployment.util.ExecUtil
+import io.quarkus.runtime.util.JavaVersionUtil
+
+import java.util.concurrent.ThreadLocalRandom
+
+if (!JavaVersionUtil.java11OrHigher) {
+    // AppCDS don't work in Java 8
+    return
+}
+
+try {
+    ExecUtil.exec("docker", "version", "--format", "'{{.Server.Version}}'")
+} catch (Exception ignored) {
+    return
+}
+
+String image = "${System.getProperty("user.name")}/container-build-jib-appcds:0.1-SNAPSHOT"
+assert ExecUtil.exec("docker", "images", image)
+
+String containerName = "container-build-jib-appcds-" + ThreadLocalRandom.current().nextInt(10000)
+int maxTimesToCheck = 10
+int i = 0
+int hostPort = 12345
+assert ExecUtil.exec("docker", "run", "-d", "-p", "$hostPort:8080", "--name", containerName, image)
+
+while (true) {
+    try {
+        def response = "http://localhost:$hostPort/hello".toURL().text
+        assert response == "hello"
+        break
+    } catch (IOException e) {
+        try {
+            Thread.sleep(2000)
+        } catch (InterruptedException ignored) {
+        }
+        if ((i++) >= maxTimesToCheck) {
+            throw new RuntimeException("Unable to determine if container is running", e)
+        }
+    }
+}
+assert ExecUtil.exec("docker", "stop", containerName)
+assert ExecUtil.exec("docker", "rm", containerName)
+assert ExecUtil.exec("docker", "rmi", image)
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
index 99df94681f0c5..708808bb39adc 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
@@ -77,6 +77,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -86,21 +89,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/verify.groovy b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/verify.groovy
index bf91d6494ae5a..9dbb723da54c5 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/verify.groovy
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/verify.groovy
@@ -1,5 +1,7 @@
 import io.quarkus.deployment.util.ExecUtil
 
+import java.nio.file.Paths
+
 try {
     ExecUtil.exec("docker", "version", "--format", "'{{.Server.Version}}'")
 } catch (Exception ignored) {
@@ -10,3 +12,17 @@ try {
 String group = System.getProperty("user.name")
 assert ExecUtil.exec("docker", "images", group + "/container-build-jib")
 assert ExecUtil.exec("docker", "rmi", group + "/container-build-jib:0.1-SNAPSHOT")
+
+File propertiesFile =
+        System.getProperty("user.dir").endsWith("maven-invoker-way")
+                ? Paths.get("target", "it", "container-build-jib", "target", "quarkus-artifact.properties").toFile()
+                : Paths.get("integration-tests", "container-image", "maven-invoker-way", "target", "it", "container-build-jib", "target", "quarkus-artifact.properties").toFile()
+Properties properties = new Properties()
+propertiesFile.withInputStream {
+    properties.load(it)
+}
+
+
+
+assert properties.type == 'jar-container'
+assert properties."metadata.container-image" == group + "/container-build-jib:0.1-SNAPSHOT"
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
index 39db8ffd3a5fd..2185eea3fa494 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
@@ -77,6 +77,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -86,21 +89,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm
index b21f723763439..6e349aaf8576a 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm
@@ -1,22 +1,54 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
 #
-# Before building the docker image run:
+# Before building the container image run:
 #
-# mvn package
+# ./mvnw package
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/getting-started-jvm .
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/rest-client-quickstart-jvm .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/getting-started-jvm
+# docker run -i --rm -p 8080:8080 quarkus/rest-client-quickstart-jvm
+#
+# If you want to include the debug port into your docker image
+# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5050
+#
+# Then run the container using :
+#
+# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/rest-client-quickstart-jvm
 #
 ###
-FROM fabric8/java-alpine-openjdk8-jre
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 
+
+ARG JAVA_PACKAGE=java-11-openjdk-headless
+ARG RUN_JAVA_VERSION=1.3.8
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+# Install java and the run-java script
+# Also set up permissions for user `1001`
+RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
+    && microdnf update \
+    && microdnf clean all \
+    && mkdir /deployments \
+    && chown 1001 /deployments \
+    && chmod "g+rwX" /deployments \
+    && chown 1001:root /deployments \
+    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
+    && chown 1001 /deployments/run-java.sh \
+    && chmod 540 /deployments/run-java.sh \
+    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
+
+# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV AB_ENABLED=jmx_exporter
-COPY target/lib/* /deployments/lib/
-COPY target/*-runner.jar /deployments/app.jar
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --chown=1001 target/quarkus-app/lib/ /deployments/lib/
+COPY --chown=1001 target/quarkus-app/*.jar /deployments/
+COPY --chown=1001 target/quarkus-app/app/ /deployments/app/
+COPY --chown=1001 target/quarkus-app/quarkus/ /deployments/quarkus/
+
+EXPOSE 8080
+USER 1001
+
 ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
index 18b9a9f8c550f..a50cb2b4c760e 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
@@ -77,6 +77,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -86,21 +89,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
index 4f62c2cfbe6f7..26ad0de5ba716 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
@@ -67,6 +67,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -76,21 +79,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/container-image/quarkus-standard-way/pom.xml b/integration-tests/container-image/quarkus-standard-way/pom.xml
index 3d5166c10e7cb..2ee96f3e28b14 100644
--- a/integration-tests/container-image/quarkus-standard-way/pom.xml
+++ b/integration-tests/container-image/quarkus-standard-way/pom.xml
@@ -10,12 +10,12 @@
 
   <artifactId>quarkus-integration-test-container-image-standard</artifactId>
   <name>Quarkus - Integration Tests - Container Image - Standard</name>
-  <description>Container Image integration tests that use @QuarkusProdModeTest</description>
+  <description>Container Image integration tests that use '@QuarkusProdModeTest' and '@QuarkusIntegrationTests'</description>
 
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy</artifactId>
+      <artifactId>quarkus-resteasy-reactive</artifactId>
     </dependency>
 
     <!-- made test scope only to force Maven to build these dependencies before running the tests-->
@@ -40,6 +40,113 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-docker-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-jib-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>test-quarkus-integration-test</id>
+      <activation>
+        <property>
+          <name>test-containers</name>
+        </property>
+      </activation>
+      <properties>
+        <quarkus.container-image.build>true</quarkus.container-image.build>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-container-image-jib</artifactId>
+          <scope>compile</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/GreetingResourceIT.java b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/GreetingResourceIT.java
new file mode 100644
index 0000000000000..c4c565ea22012
--- /dev/null
+++ b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/GreetingResourceIT.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.container.image;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class GreetingResourceIT {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+                .when().get("/greeting")
+                .then()
+                .statusCode(200)
+                .body(is("hello"));
+    }
+}
diff --git a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java
index 2cd26e194dffa..31f75197dc047 100644
--- a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java
+++ b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/MultipleContainerImageExtensionTest.java
@@ -18,7 +18,7 @@ public class MultipleContainerImageExtensionTest {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
-            .setApplicationName("MultipleContainerImage")
+            .setApplicationName("multiple-container-image")
             .setApplicationVersion("0.1-SNAPSHOT")
             .setExpectedException(IllegalStateException.class)
             .setForcedDependencies(
diff --git a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java
index 812fa037f1930..f1764c2066362 100644
--- a/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java
+++ b/integration-tests/container-image/quarkus-standard-way/src/test/java/io/quarkus/it/container/image/SingleContainerImageExtensionTest.java
@@ -20,7 +20,7 @@ public class SingleContainerImageExtensionTest {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
-            .setApplicationName("SingleContainerImage")
+            .setApplicationName("single-container-image")
             .setApplicationVersion("0.1-SNAPSHOT")
             .setForcedDependencies(
                     Collections.singletonList(
diff --git a/integration-tests/devmode/disable-native-profile b/integration-tests/devmode/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/devmode/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/devmode/pom.xml b/integration-tests/devmode/pom.xml
index d00fdbff5f990..924511e1e5393 100644
--- a/integration-tests/devmode/pom.xml
+++ b/integration-tests/devmode/pom.xml
@@ -6,7 +6,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/integration-tests/devtools/disable-native-profile b/integration-tests/devtools/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/devtools/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/devtools/pom.xml b/integration-tests/devtools/pom.xml
new file mode 100644
index 0000000000000..27aa22d17fb99
--- /dev/null
+++ b/integration-tests/devtools/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-devtools</artifactId>
+    <name>Quarkus - Integration Tests - Devtools</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-platform-descriptor-json</artifactId>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-devtools</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-testing</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>testResources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/test-classes</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/test/resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/PlatformAwareTestBase.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/PlatformAwareTestBase.java
new file mode 100644
index 0000000000000..7c703c69b2e50
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/PlatformAwareTestBase.java
@@ -0,0 +1,119 @@
+package io.quarkus.devtools;
+
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.BOM_ARTIFACT_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.BOM_GROUP_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.BOM_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.JAVA_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.KOTLIN_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.MAVEN_COMPILER_PLUGIN_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.MAVEN_SUREFIRE_PLUGIN_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.PROJECT_ARTIFACT_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.PROJECT_GROUP_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.PROJECT_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.QUARKUS_GRADLE_PLUGIN_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.QUARKUS_GRADLE_PLUGIN_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.QUARKUS_MAVEN_PLUGIN_GROUP_ID;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.QUARKUS_MAVEN_PLUGIN_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.QUARKUS_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.SCALA_MAVEN_PLUGIN_VERSION;
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.SCALA_VERSION;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.test.RegistryClientTestHelper;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
+import io.quarkus.platform.tools.ToolsConstants;
+import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class PlatformAwareTestBase {
+
+    private ExtensionCatalog catalog;
+    private Properties quarkusProps;
+
+    @BeforeAll
+    static void enableDevToolsTestConfig() {
+        RegistryClientTestHelper.enableRegistryClientTestConfig();
+    }
+
+    @AfterAll
+    static void disableDevToolsTestConfig() {
+        RegistryClientTestHelper.disableRegistryClientTestConfig();
+    }
+
+    protected ResourceLoader getCodestartsResourceLoader() {
+        return QuarkusProjectHelper.getResourceLoader(getExtensionsCatalog());
+    }
+
+    protected ExtensionCatalog getExtensionsCatalog() {
+        if (catalog == null) {
+            try {
+                catalog = QuarkusProjectHelper.getCatalogResolver().resolveExtensionCatalog();
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to resolve extensions catalog", e);
+            }
+        }
+        return catalog;
+    }
+
+    protected Map<String, Object> getTestInputData(ExtensionCatalog catalog, Map<String, Object> override) {
+
+        final ArtifactCoords bom = catalog.getBom();
+
+        final HashMap<String, Object> data = new HashMap<>();
+        final Properties quarkusProp = getQuarkusProperties();
+        data.put(PROJECT_GROUP_ID.key(), "org.test");
+        data.put(PROJECT_ARTIFACT_ID.key(), "test-codestart");
+        data.put(PROJECT_VERSION.key(), "1.0.0-codestart");
+        data.put(BOM_GROUP_ID.key(), bom.getGroupId());
+        data.put(BOM_ARTIFACT_ID.key(), bom.getArtifactId());
+        data.put(BOM_VERSION.key(), bom.getVersion());
+        data.put(QUARKUS_VERSION.key(), catalog.getQuarkusCoreVersion());
+        data.put(QUARKUS_MAVEN_PLUGIN_GROUP_ID.key(), "io.quarkus");
+        data.put(QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID.key(), "quarkus-maven-plugin");
+        data.put(QUARKUS_MAVEN_PLUGIN_VERSION.key(), catalog.getQuarkusCoreVersion());
+        data.put(QUARKUS_GRADLE_PLUGIN_ID.key(), "io.quarkus");
+        data.put(QUARKUS_GRADLE_PLUGIN_VERSION.key(), catalog.getQuarkusCoreVersion());
+        data.put(KOTLIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_KOTLIN_VERSION));
+        data.put(SCALA_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_SCALA_VERSION));
+        data.put(SCALA_MAVEN_PLUGIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_SCALA_PLUGIN_VERSION));
+        data.put(MAVEN_COMPILER_PLUGIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_COMPILER_PLUGIN_VERSION));
+        data.put(MAVEN_SUREFIRE_PLUGIN_VERSION.key(), quarkusProp.getProperty(ToolsConstants.PROP_SUREFIRE_PLUGIN_VERSION));
+        data.put(JAVA_VERSION.key(), "11");
+        if (override != null)
+            data.putAll(override);
+        return data;
+    }
+
+    protected Properties getQuarkusProperties() {
+        return quarkusProps == null ? quarkusProps = ToolsUtils.readQuarkusProperties(getExtensionsCatalog()) : quarkusProps;
+    }
+
+    protected String getMavenPluginGroupId() {
+        return ToolsUtils.getMavenPluginGroupId(getQuarkusProperties());
+    }
+
+    protected String getMavenPluginArtifactId() {
+        return ToolsUtils.getMavenPluginArtifactId(getQuarkusProperties());
+    }
+
+    protected String getMavenPluginVersion() {
+        return ToolsUtils.getMavenPluginVersion(getQuarkusProperties());
+    }
+
+    protected String getQuarkusCoreVersion() {
+        return ToolsUtils.getQuarkusCoreVersion(getQuarkusProperties());
+    }
+
+    protected String getBomVersion() {
+        return getQuarkusCoreVersion();
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java
new file mode 100644
index 0000000000000..b33e6cd4d3955
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.devtools.codestarts.extension;
+
+import static io.quarkus.devtools.testing.SnapshotTesting.assertThatDirectoryTreeMatchSnapshots;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+
+import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData;
+import io.quarkus.devtools.testing.SnapshotTesting;
+
+class QuarkusExtensionCodestartGenerationTest {
+
+    private static final Path testDirPath = Paths.get("target/extension-codestart-gen-test");
+
+    @BeforeAll
+    static void setUp() throws IOException {
+        SnapshotTesting.deleteTestDirectory(testDirPath.toFile());
+    }
+
+    private QuarkusExtensionCodestartProjectInputBuilder prepareInput() {
+        return QuarkusExtensionCodestartProjectInput.builder()
+                .putData(QuarkusExtensionData.GROUP_ID, "org.extension")
+                .putData(QuarkusExtensionData.NAMESPACE_ID, "quarkus-")
+                .putData(QuarkusExtensionData.NAMESPACE_NAME, "Quarkus -")
+                .putData(QuarkusExtensionData.EXTENSION_ID, "my-extension")
+                .putData(QuarkusExtensionData.EXTENSION_NAME, "My Extension")
+                .putData(QuarkusExtensionData.VERSION, "1.0.0-SNAPSHOT")
+                .putData(QuarkusExtensionData.PACKAGE_NAME, "org.extension")
+                .putData(QuarkusExtensionData.CLASS_NAME_BASE, "MyExtension");
+    }
+
+    @Test
+    void generateDefaultProject(TestInfo testInfo) throws Throwable {
+        final QuarkusExtensionCodestartProjectInput input = prepareInput()
+                .build();
+        final Path projectDir = testDirPath.resolve("default");
+        getCatalog().createProject(input).generate(projectDir);
+        assertThatDirectoryTreeMatchSnapshots(testInfo, projectDir);
+    }
+
+    @Test
+    void generateProjectWithoutTests(TestInfo testInfo) throws Throwable {
+        final QuarkusExtensionCodestartProjectInput input = prepareInput()
+                .withoutDevModeTest(true)
+                .withoutIntegrationTests(true)
+                .withoutUnitTest(true)
+                .build();
+        final Path projectDir = testDirPath.resolve("without-tests");
+        getCatalog().createProject(input).generate(projectDir);
+        assertThatDirectoryTreeMatchSnapshots(testInfo, projectDir);
+    }
+
+    private QuarkusExtensionCodestartCatalog getCatalog() throws IOException {
+        return QuarkusExtensionCodestartCatalog.fromBundledResources();
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java
new file mode 100644
index 0000000000000..9447516d1a5c5
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java
@@ -0,0 +1,60 @@
+package io.quarkus.devtools.codestarts.jbang;
+
+import static io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartCatalog.JBangDataKey.QUARKUS_BOM_ARTIFACT_ID;
+import static io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartCatalog.JBangDataKey.QUARKUS_BOM_GROUP_ID;
+import static io.quarkus.devtools.codestarts.jbang.QuarkusJBangCodestartCatalog.JBangDataKey.QUARKUS_BOM_VERSION;
+import static io.quarkus.devtools.testing.SnapshotTesting.assertThatDirectoryTreeMatchSnapshots;
+import static io.quarkus.devtools.testing.SnapshotTesting.assertThatMatchSnapshot;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.testing.SnapshotTesting;
+
+class QuarkusJBangCodestartGenerationTest extends PlatformAwareTestBase {
+
+    private static final Path testDirPath = Paths.get("target/jbang-codestart-gen-test");
+
+    @BeforeAll
+    static void setUp() throws IOException {
+        SnapshotTesting.deleteTestDirectory(testDirPath.toFile());
+    }
+
+    @Test
+    void generateDefaultProject(TestInfo testInfo) throws Throwable {
+        final QuarkusJBangCodestartProjectInput input = QuarkusJBangCodestartProjectInput.builder()
+                .putData(QUARKUS_BOM_GROUP_ID, "io.quarkus")
+                .putData(QUARKUS_BOM_ARTIFACT_ID, "quarkus-bom")
+                .putData(QUARKUS_BOM_VERSION, "999-MOCK")
+                .build();
+        final Path projectDir = testDirPath.resolve("default");
+        getCatalog().createProject(input).generate(projectDir);
+        assertThatDirectoryTreeMatchSnapshots(testInfo, projectDir);
+        assertThatMatchSnapshot(testInfo, projectDir, "src/GreetingResource.java");
+    }
+
+    @Test
+    void generatePicocliProject(TestInfo testInfo) throws Throwable {
+        final QuarkusJBangCodestartProjectInput input = QuarkusJBangCodestartProjectInput.builder()
+                .addCodestart("jbang-picocli-code")
+                .putData(QUARKUS_BOM_GROUP_ID, "io.quarkus")
+                .putData(QUARKUS_BOM_ARTIFACT_ID, "quarkus-bom")
+                .putData(QUARKUS_BOM_VERSION, "999-MOCK")
+                .build();
+        final Path projectDir = testDirPath.resolve("picocli");
+        getCatalog().createProject(input).generate(projectDir);
+        assertThatDirectoryTreeMatchSnapshots(testInfo, projectDir);
+        assertThatMatchSnapshot(testInfo, projectDir, "src/GreetingCommand.java");
+    }
+
+    private QuarkusJBangCodestartCatalog getCatalog() throws IOException {
+        return QuarkusJBangCodestartCatalog.fromResourceLoader(getCodestartsResourceLoader());
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java
new file mode 100644
index 0000000000000..288e8164225fb
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalogTest.java
@@ -0,0 +1,168 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartProjectDefinition;
+import io.quarkus.devtools.codestarts.CodestartType;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.testing.SnapshotTesting;
+
+class QuarkusCodestartCatalogTest extends PlatformAwareTestBase {
+
+    private final Path projectPath = Paths.get("target/quarkus-codestart-catalog-test");
+
+    @BeforeEach
+    void setUp() throws IOException {
+        SnapshotTesting.deleteTestDirectory(projectPath.toFile());
+    }
+
+    @Test
+    void loadTest() throws IOException {
+        final QuarkusCodestartCatalog catalog = getCatalog();
+        assertThat(catalog.getCodestarts())
+                .filteredOn(c -> c.getType().isBase())
+                .extracting(Codestart::getImplementedLanguages)
+                .allSatisfy(s -> assertThat(s.isEmpty() || s.size() == 3).isTrue());
+
+        assertThat(catalog.getCodestarts()).filteredOn("ref", "commandmode")
+                .extracting(Codestart::getImplementedLanguages)
+                .hasSize(1)
+                .allSatisfy(s -> assertThat(s).containsExactlyInAnyOrder("java", "kotlin"));
+
+        assertThat(catalog.getCodestarts()).filteredOn("ref", "resteasy-qute")
+                .extracting(Codestart::getImplementedLanguages)
+                .hasSize(1)
+                .allSatisfy(s -> assertThat(s).containsExactlyInAnyOrder("java", "kotlin"));
+
+        assertThat(catalog.getCodestarts()).filteredOn("ref", "resteasy")
+                .extracting(Codestart::getImplementedLanguages)
+                .hasSize(1)
+                .allSatisfy(s -> assertThat(s).containsExactlyInAnyOrder("java", "kotlin", "scala"));
+    }
+
+    @Test
+    void createProjectTestEmpty() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .noExamples()
+                .noBuildToolWrapper()
+                .noDockerfiles()
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.PROJECT)).extracting(Codestart::getName)
+                .isEqualTo("quarkus");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.BUILDTOOL)).extracting(Codestart::getName)
+                .isEqualTo("maven");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.CONFIG)).extracting(Codestart::getName)
+                .isEqualTo("config-properties");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.LANGUAGE)).extracting(Codestart::getName)
+                .isEqualTo("java");
+        assertThat(projectDefinition.getBaseCodestarts()).hasSize(4);
+        assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
+                .isEmpty();
+    }
+
+    @Test
+    void createProjectTestNoExample() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .noExamples()
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.PROJECT)).extracting(Codestart::getName)
+                .isEqualTo("quarkus");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.BUILDTOOL)).extracting(Codestart::getName)
+                .isEqualTo("maven");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.CONFIG)).extracting(Codestart::getName)
+                .isEqualTo("config-properties");
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.LANGUAGE)).extracting(Codestart::getName)
+                .isEqualTo("java");
+        assertThat(projectDefinition.getBaseCodestarts()).hasSize(4);
+        assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder("dockerfiles",
+                        "maven-wrapper");
+    }
+
+    @Test
+    void createProjectTestGradle() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE)
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.BUILDTOOL)).extracting(Codestart::getName)
+                .isEqualTo("gradle");
+    }
+
+    @Test
+    void createProjectTestKotlin() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.LANGUAGE)).extracting(Codestart::getName)
+                .isEqualTo("kotlin");
+    }
+
+    @Test
+    void prepareProjectTestScala() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.LANGUAGE)).extracting(Codestart::getName)
+                .isEqualTo("scala");
+    }
+
+    @Test
+    void prepareProjectTestConfigYaml() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-config-yaml"))
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getRequiredCodestart(CodestartType.CONFIG)).extracting(Codestart::getName)
+                .isEqualTo("config-yaml");
+    }
+
+    @Test
+    void prepareProjectTestResteasy() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getBaseCodestarts()).extracting(Codestart::getName)
+                .contains("config-properties");
+        assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder(
+                        "dockerfiles",
+                        "maven-wrapper",
+                        "resteasy-example");
+    }
+
+    @Test
+    void prepareProjectTestCommandMode() throws IOException {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addCodestart("commandmode")
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        assertThat(projectDefinition.getBaseCodestarts()).extracting(Codestart::getName)
+                .contains("config-properties");
+        assertThat(projectDefinition.getExtraCodestarts()).extracting(Codestart::getName)
+                .containsExactlyInAnyOrder(
+                        "dockerfiles",
+                        "maven-wrapper",
+                        "commandmode-example");
+    }
+
+    private QuarkusCodestartCatalog getCatalog() throws IOException {
+        return QuarkusCodestartCatalog.fromExtensionsCatalog(getExtensionsCatalog(), getCodestartsResourceLoader());
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
new file mode 100644
index 0000000000000..76b6dac58c4fc
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java
@@ -0,0 +1,740 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey.*;
+import static io.quarkus.devtools.testing.SnapshotTesting.assertThatMatchSnapshot;
+import static io.quarkus.devtools.testing.SnapshotTesting.checkContains;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.testing.SnapshotTesting;
+
+class QuarkusCodestartGenerationTest extends PlatformAwareTestBase {
+
+    private static final Path testDirPath = Paths.get("target/quarkus-codestart-gen-test");
+
+    @BeforeAll
+    static void setUp() throws Throwable {
+        SnapshotTesting.deleteTestDirectory(testDirPath.toFile());
+    }
+
+    private Map<String, Object> getGenerationTestInputData() {
+        return getGenerationTestInputData(null);
+    }
+
+    private static Map<String, Object> getGenerationTestInputData(final Map<String, Object> override) {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put(PROJECT_GROUP_ID.key(), "org.test");
+        data.put(PROJECT_ARTIFACT_ID.key(), "test-codestart");
+        data.put(PROJECT_VERSION.key(), "1.0.0-codestart");
+        data.put(BOM_GROUP_ID.key(), "io.quarkus");
+        data.put(BOM_ARTIFACT_ID.key(), "quarkus-mock-bom");
+        data.put(BOM_VERSION.key(), "999-MOCK");
+        data.put(QUARKUS_VERSION.key(), "999-MOCK");
+        data.put(QUARKUS_MAVEN_PLUGIN_GROUP_ID.key(), "io.quarkus");
+        data.put(QUARKUS_MAVEN_PLUGIN_ARTIFACT_ID.key(), "quarkus-mock-maven-plugin");
+        data.put(QUARKUS_MAVEN_PLUGIN_VERSION.key(), "999-MOCK");
+        data.put(QUARKUS_GRADLE_PLUGIN_ID.key(), "io.quarkus");
+        data.put(QUARKUS_GRADLE_PLUGIN_VERSION.key(), "999-MOCK");
+        data.put(JAVA_VERSION.key(), "11");
+        data.put(KOTLIN_VERSION.key(), "1.4.28-MOCK");
+        data.put(SCALA_VERSION.key(), "2.12.8-MOCK");
+        data.put(SCALA_MAVEN_PLUGIN_VERSION.key(), "4.1.1-MOCK");
+        data.put(MAVEN_COMPILER_PLUGIN_VERSION.key(), "3.8.1-MOCK");
+        data.put(MAVEN_SUREFIRE_PLUGIN_VERSION.key(), "3.0.0-MOCK");
+        if (override != null)
+            data.putAll(override);
+        return data;
+    }
+
+    @Test
+    void generateDefault(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .noExamples()
+                .noDockerfiles()
+                .noBuildToolWrapper()
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("default");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+
+        assertThat(projectDir.resolve(".mvnw")).doesNotExist();
+        assertThat(projectDir.resolve(".dockerignore")).doesNotExist();
+
+        assertThatMatchSnapshot(testInfo, projectDir, "pom.xml");
+        assertThatMatchSnapshot(testInfo, projectDir, "README.md");
+
+        assertThat(projectDir.resolve("src/main/java")).exists().isEmptyDirectory();
+    }
+
+    @Test
+    void generateCommandMode(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addCodestart("commandmode")
+                .addData(getGenerationTestInputData())
+                .build();
+
+        final Path projectDir = testDirPath.resolve("commandmode");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/HelloCommando.java");
+    }
+
+    @Test
+    void generateCommandModeCustom(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addCodestart("commandmode")
+                .addData(getGenerationTestInputData())
+                .putData(PROJECT_PACKAGE_NAME.key(), "com.test.andy")
+                .putData(COMMANDMODE_EXAMPLE_RESOURCE_CLASS_NAME.key(), "AndyCommando")
+                .build();
+        final Path projectDir = testDirPath.resolve("commandmode-custom");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/com/test/andy/AndyCommando.java");
+    }
+
+    @Test
+    void generateRESTEasyJavaCustom(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getGenerationTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .putData(PROJECT_PACKAGE_NAME.key(), "com.andy")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.key(), "BonjourResource")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_PATH.key(), "/bonjour")
+                .build();
+        final Path projectDir = testDirPath.resolve("resteasy-java-custom");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/com/andy/BonjourResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/com/andy/NativeBonjourResourceIT.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/resources/META-INF/resources/index.html");
+    }
+
+    @Test
+    void generateRESTEasySpringWeb(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getGenerationTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-spring-web"))
+                .build();
+        final Path projectDir = testDirPath.resolve("resteasy-springweb");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/NativeGreetingResourceIT.java");
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/SpringGreetingController.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/SpringGreetingControllerTest.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/NativeSpringGreetingControllerIT.java");
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/resources/META-INF/resources/index.html")
+                .satisfies(checkContains("\"/hello-resteasy\""))
+                .satisfies(checkContains("quarkus.io/guides/rest-json"))
+                .satisfies(checkContains("\"/hello-spring\""))
+                .satisfies(checkContains("quarkus.io/guides/spring-web"));
+    }
+
+    @Test
+    void generateMavenWithCustomDep(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getGenerationTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactCoords.fromString("commons-io:commons-io:2.5"))
+
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-custom-dep");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        assertThatMatchSnapshot(testInfo, projectDir, "pom.xml")
+                .satisfies(checkContains("<dependency>\n" +
+                        "      <groupId>commons-io</groupId>\n" +
+                        "      <artifactId>commons-io</artifactId>\n" +
+                        "      <version>2.5</version>\n" +
+                        "    </dependency>\n"))
+                .satisfies(checkContains("<dependency>\n" +
+                        "      <groupId>io.quarkus</groupId>\n" +
+                        "      <artifactId>quarkus-resteasy</artifactId>\n" +
+                        "    </dependency>\n"));
+    }
+
+    @Test
+    void generateRESTEasyKotlinCustom(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getGenerationTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .putData(PROJECT_PACKAGE_NAME.key(), "com.andy")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.key(), "BonjourResource")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_PATH.key(), "/bonjour")
+                .build();
+        final Path projectDir = testDirPath.resolve("resteasy-kotlin-custom");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/com/andy/BonjourResource.kt")
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResource"))
+                .satisfies(checkContains("@Path(\"/bonjour\")"));
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/com/andy/BonjourResourceTest.kt")
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResourceTest"))
+                .satisfies(checkContains("\"/bonjour\""));
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/com/andy/NativeBonjourResourceIT.kt")
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class NativeBonjourResourceIT : BonjourResourceTest"));
+    }
+
+    @Test
+    void generateRESTEasyScalaCustom(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getGenerationTestInputData())
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
+                .putData(PROJECT_PACKAGE_NAME.key(), "com.andy")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.key(), "BonjourResource")
+                .putData(RESTEASY_EXAMPLE_RESOURCE_PATH.key(), "/bonjour")
+                .build();
+        final Path projectDir = testDirPath.resolve("resteasy-scala-custom");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/scala/com/andy/BonjourResource.scala")
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResource"))
+                .satisfies(checkContains("@Path(\"/bonjour\")"));
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/com/andy/BonjourResourceTest.scala")
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class BonjourResourceTest"))
+                .satisfies(checkContains("\"/bonjour\""));
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/com/andy/NativeBonjourResourceIT.scala")
+                .satisfies(checkContains("package com.andy"))
+                .satisfies(checkContains("class NativeBonjourResourceIT extends BonjourResourceTest"));
+    }
+
+    @Test
+    void generateMavenDefaultJava(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-default-java");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/NativeGreetingResourceIT.java");
+    }
+
+    @Test
+    void generateMavenResteasyJava(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-resteasy-java");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/NativeGreetingResourceIT.java");
+    }
+
+    @Test
+    void generateMavenPicocliJava(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-picocli"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-picocli-java");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/picocli/EntryCommand.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/picocli/GoodbyeCommand.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/picocli/HelloCommand.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/picocli/GreetingService.java");
+
+        assertThat(projectDir.resolve("README.md"))
+                .satisfies(checkContains("./mvnw compile quarkus:dev -Dquarkus.args='hello --first-name=Quarky"));
+    }
+
+    @Test
+    void generateMavenPicocliKotlin(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-picocli"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-picocli-kotlin");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/picocli/EntryCommand.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/picocli/GoodbyeCommand.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/picocli/HelloCommand.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/picocli/GreetingService.kt");
+    }
+
+    @Test
+    void generateMavenPicocliGradle(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-picocli"))
+                .buildTool(BuildTool.GRADLE)
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-picocli-gradle");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradle(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE);
+        checkConfigProperties(projectDir);
+
+        assertThat(projectDir.resolve("README.md"))
+                .satisfies(checkContains("./gradlew quarkusDev --quarkus-args='hello --first-name=Quarky'"));
+    }
+
+    @Test
+    void generateMavenConfigYamlJava(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-config-yaml"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-yaml-java");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigYaml(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/config/ConfigResource.java");
+    }
+
+    @Test
+    void generateMavenResteasyKotlin(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-resteasy-kotlin");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/GreetingResource.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/org/acme/GreetingResourceTest.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/org/acme/NativeGreetingResourceIT.kt");
+    }
+
+    @Test
+    void generateMavenResteasyScala(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-resteasy-scala");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/scala/org/acme/GreetingResource.scala");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/org/acme/GreetingResourceTest.scala");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/org/acme/NativeGreetingResourceIT.scala");
+    }
+
+    @Test
+    void generateGradleResteasyJava(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE)
+                .addCodestart("gradle")
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("gradle-resteasy-java");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradle(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/org/acme/GreetingResourceTest.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/native-test/java/org/acme/NativeGreetingResourceIT.java");
+    }
+
+    @Test
+    void generateGradleResteasyKotlin(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE)
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .addCodestart("gradle")
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("gradle-resteasy-kotlin");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradle(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/GreetingResource.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/kotlin/org/acme/GreetingResourceTest.kt");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/native-test/kotlin/org/acme/NativeGreetingResourceIT.kt");
+    }
+
+    @Test
+    void generateGradleResteasyScala(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE)
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("gradle-resteasy-scala");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradle(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/scala/org/acme/GreetingResource.scala");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/scala/org/acme/GreetingResourceTest.scala");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/native-test/scala/org/acme/NativeGreetingResourceIT.scala");
+    }
+
+    @Test
+    void generateGradleWithKotlinDslResteasyJava(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE_KOTLIN_DSL)
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("gradle-kotlin-dsl-resteasy-java");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradleWithKotlinDsl(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE_KOTLIN_DSL);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/GreetingResource.java");
+    }
+
+    @Test
+    void generateGradleWithKotlinDslResteasyKotlin(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE_KOTLIN_DSL)
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-kotlin"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("gradle-kotlin-dsl-resteasy-kotlin");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradleWithKotlinDsl(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE_KOTLIN_DSL);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/kotlin/org/acme/GreetingResource.kt");
+    }
+
+    @Test
+    void generateGradleWithKotlinDslResteasyScala(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE_KOTLIN_DSL)
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy"))
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-scala"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("gradle-kotlin-dsl-resteasy-scala");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradleWithKotlinDsl(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.GRADLE_KOTLIN_DSL);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/scala/org/acme/GreetingResource.scala");
+    }
+
+    @Test
+    void generateRESTEasyQute(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addExtension(AppArtifactKey.fromString("io.quarkus:quarkus-resteasy-qute"))
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("maven-resteasy-qute");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/resteasyqute/Quark.java");
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/org/acme/resteasyqute/QuteResource.java");
+    }
+
+    @Test
+    void generateWithCustomPackage(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addCodestart("resteasy-qute").addCodestart("resteasy").addCodestart("funqy-http")
+                .putData(PROJECT_PACKAGE_NAME.key(), "my.custom.app")
+                .addData(getGenerationTestInputData())
+                .build();
+        final Path projectDir = testDirPath.resolve("custom-package");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkMaven(projectDir);
+        checkReadme(projectDir);
+        checkDockerfiles(projectDir, BuildTool.MAVEN);
+        checkConfigProperties(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/my/custom/app/GreetingResource.java")
+                .satisfies(checkContains("package my.custom.app;"));
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/my/custom/app/GreetingResourceTest.java")
+                .satisfies(checkContains("package my.custom.app;"));
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/my/custom/app/NativeGreetingResourceIT.java")
+                .satisfies(checkContains("package my.custom.app;"));
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/my/custom/app/resteasyqute/Quark.java")
+                .satisfies(checkContains("package my.custom.app.resteasyqute;"));
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/my/custom/app/resteasyqute/QuteResource.java")
+                .satisfies(checkContains("package my.custom.app.resteasyqute;"));
+        assertThatMatchSnapshot(testInfo, projectDir, "src/main/java/my/custom/app/funqy/Funqy.java")
+                .satisfies(checkContains("package my.custom.app.funqy;"));
+        assertThatMatchSnapshot(testInfo, projectDir, "src/test/java/my/custom/app/funqy/FunqyTest.java")
+                .satisfies(checkContains("package my.custom.app.funqy;"));
+    }
+
+    @Test
+    public void generateGradleWrapperGithubAction(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE)
+                .addData(getGenerationTestInputData())
+                .addCodestarts(Collections.singletonList("github-action"))
+                .build();
+        Path projectDir = testDirPath.resolve("gradle-github");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradle(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, ".github/workflows/ci.yml")
+                .satisfies(checkContains("run: ./gradlew build"));
+    }
+
+    @Test
+    public void generateGradleNoWrapperGithubAction(TestInfo testInfo) throws Throwable {
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .buildTool(BuildTool.GRADLE)
+                .noBuildToolWrapper()
+                .addData(getGenerationTestInputData())
+                .addCodestarts(Collections.singletonList("github-action"))
+                .build();
+        Path projectDir = testDirPath.resolve("gradle-nowrapper-github");
+        getCatalog().createProject(input).generate(projectDir);
+
+        checkGradle(projectDir);
+
+        assertThatMatchSnapshot(testInfo, projectDir, ".github/workflows/ci.yml")
+                .satisfies(checkContains("uses: eskatos/gradle-command-action@v1"))
+                .satisfies(checkContains("arguments: build"));
+    }
+
+    private void checkDockerfiles(Path projectDir, BuildTool buildTool) {
+        switch (buildTool) {
+            case MAVEN:
+                checkDockerfilesWithMaven(projectDir);
+                break;
+            case GRADLE_KOTLIN_DSL:
+            case GRADLE:
+                checkDockerfilesWithGradle(projectDir);
+                break;
+            default:
+                throw new IllegalArgumentException("Unhandled buildtool");
+        }
+    }
+
+    private void checkDockerfilesWithMaven(Path projectDir) {
+        assertThat(projectDir.resolve(".dockerignore")).exists();
+        assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
+                .satisfies(checkContains("./mvnw package"))
+                .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
+                .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3"))
+                .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless"))
+                .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]"));
+        assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
+                .satisfies(checkContains("./mvnw package -Dquarkus.package.type=legacy-jar"))
+                .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
+                .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3"))
+                .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless"))
+                .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]"));
+        assertThat(projectDir.resolve("src/main/docker/Dockerfile.native")).exists()
+                .satisfies(checkContains("./mvnw package -Pnative"))
+                .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3"))
+                .satisfies(checkContains("CMD [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]"));
+    }
+
+    private void checkDockerfilesWithGradle(Path projectDir) {
+        assertThat(projectDir.resolve(".dockerignore")).exists();
+        assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
+                .satisfies(checkContains("./gradlew build"))
+                .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
+                .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3"))
+                .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless"))
+                .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]"));
+        assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
+                .satisfies(checkContains("./gradlew build -Dquarkus.package.type=legacy-jar"))
+                .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
+                .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3"))
+                .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless"))
+                .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]"));
+        assertThat(projectDir.resolve("src/main/docker/Dockerfile.native")).exists()
+                .satisfies(checkContains("./gradlew build -Dquarkus.package.type=native"))
+                .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3"))
+                .satisfies(checkContains("CMD [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]"));
+    }
+
+    private void checkConfigProperties(Path projectDir) {
+        assertThat(projectDir.resolve("src/main/resources/application.yml")).doesNotExist();
+        assertThat(projectDir.resolve("src/main/resources/application.properties")).exists();
+    }
+
+    private void checkConfigYaml(Path projectDir) {
+        assertThat(projectDir.resolve("src/main/resources/application.yml")).exists();
+        assertThat(projectDir.resolve("src/main/resources/application.properties")).doesNotExist();
+    }
+
+    private void checkReadme(Path projectDir) {
+        assertThat(projectDir.resolve("README.md")).exists();
+        assertThat(projectDir.resolve(".gitignore")).exists();
+    }
+
+    private void checkMaven(Path projectDir) {
+        assertThat(projectDir.resolve("pom.xml"))
+                .exists()
+                .satisfies(checkContains("<groupId>org.test</groupId>"))
+                .satisfies(checkContains("<artifactId>test-codestart</artifactId>"))
+                .satisfies(checkContains("<version>1.0.0-codestart</version>"));
+        assertThat(projectDir.resolve("build.gradle")).doesNotExist();
+        assertThat(projectDir.resolve("gradle.properties")).doesNotExist();
+        assertThat(projectDir.resolve("settings.properties")).doesNotExist();
+    }
+
+    private void checkGradle(Path projectDir) {
+        assertThat(projectDir.resolve("pom.xml")).doesNotExist();
+        assertThat(projectDir.resolve("build.gradle.kts")).doesNotExist();
+        assertThat(projectDir.resolve("settings.gradle.kts")).doesNotExist();
+        assertThat(projectDir.resolve("build.gradle"))
+                .exists()
+                .satisfies(checkContains("group 'org.test'"))
+                .satisfies(checkContains("version '1.0.0-codestart'"));
+        assertThat(projectDir.resolve("gradle.properties")).exists();
+        assertThat(projectDir.resolve("settings.gradle"))
+                .exists()
+                .satisfies(checkContains("rootProject.name='test-codestart'"));
+    }
+
+    private void checkGradleWithKotlinDsl(Path projectDir) {
+        assertThat(projectDir.resolve("pom.xml")).doesNotExist();
+        assertThat(projectDir.resolve("build.gradle")).doesNotExist();
+        assertThat(projectDir.resolve("settings.gradle")).doesNotExist();
+        assertThat(projectDir.resolve("build.gradle.kts"))
+                .exists()
+                .satisfies(checkContains("group = \"org.test\""))
+                .satisfies(checkContains("version = \"1.0.0-codestart\""));
+        assertThat(projectDir.resolve("gradle.properties")).exists();
+        assertThat(projectDir.resolve("settings.gradle.kts"))
+                .exists()
+                .satisfies(checkContains("rootProject.name=\"test-codestart\""));
+    }
+
+    private QuarkusCodestartCatalog getCatalog() throws IOException {
+        return QuarkusCodestartCatalog.fromExtensionsCatalog(getExtensionsCatalog(), getCodestartsResourceLoader());
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartRunIT.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartRunIT.java
new file mode 100644
index 0000000000000..2b3f2c83a5863
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartRunIT.java
@@ -0,0 +1,217 @@
+package io.quarkus.devtools.codestarts.quarkus;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import com.google.common.collect.Sets;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.codestarts.Codestart;
+import io.quarkus.devtools.codestarts.CodestartProjectDefinition;
+import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Tag;
+import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.devtools.testing.WrapperRunner;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class QuarkusCodestartRunIT extends PlatformAwareTestBase {
+
+    private static final Path testDirPath = Paths.get("target/quarkus-codestart-run-test");
+
+    private static final Set<String> EXCLUDED = Sets.newHashSet(
+            "azure-functions-http-example", "commandmode-example");
+
+    private static final Set<String> RUN_ALONE = Sets.newHashSet("resteasy-reactive-example", "picocli-example");
+
+    @BeforeAll
+    static void setUp() throws IOException {
+        SnapshotTesting.deleteTestDirectory(testDirPath.toFile());
+    }
+
+    private Map<String, Object> getTestInputData(final Map<String, Object> override) {
+        return getTestInputData(getExtensionsCatalog(), override);
+    }
+
+    @Test
+    public void testRunTogetherCodestartsJava() throws Exception {
+        generateProjectRunTests("maven", "java", getRunTogetherExamples(), Collections.emptyMap());
+    }
+
+    @Test
+    public void testRunTogetherCodestartsKotlin() throws Exception {
+        generateProjectRunTests("maven", "kotlin", getRunTogetherExamples(), Collections.emptyMap());
+    }
+
+    @Test
+    public void testRunTogetherCodestartsScala() throws Exception {
+        generateProjectRunTests("maven", "scala", getRunTogetherExamples(), Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideLanguages")
+    public void testGradle(String language) throws Exception {
+        final List<String> codestarts = getRunTogetherExamples();
+        generateProjectRunTests("gradle", language, codestarts, Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideLanguages")
+    public void testGradleKotlinDSL(String language) throws Exception {
+        final List<String> codestarts = getRunTogetherExamples();
+        generateProjectRunTests("gradle-kotlin-dsl", language, codestarts, Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideRunAloneExamples")
+    public void testRunAloneCodestartsJava(String codestart) throws Exception {
+        generateProjectRunTests("maven", "java", singletonList(codestart), Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideRunAloneExamples")
+    public void testRunAloneCodestartsKotlin(String codestart) throws Exception {
+        generateProjectRunTests("maven", "kotlin", singletonList(codestart), Collections.emptyMap());
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideRunAloneExamples")
+    public void testRunAloneCodestartsScala(String codestart) throws Exception {
+        generateProjectRunTests("maven", "scala", singletonList(codestart), Collections.emptyMap());
+    }
+
+    @Test
+    public void generateAzureFunctionsHttpExampleProjectRun() throws Exception {
+        generateProjectRunTests("maven", "java", singletonList("azure-functions-http-example"),
+                Collections.emptyMap());
+    }
+
+    @Test
+    public void generateCustomizedRESTEasyProjectRun() throws Exception {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put(QuarkusDataKey.PROJECT_PACKAGE_NAME.key(), "com.test.andy");
+        data.put(QuarkusDataKey.RESTEASY_EXAMPLE_RESOURCE_CLASS_NAME.key(), "AndyEndpoint");
+        data.put(QuarkusDataKey.RESTEASY_EXAMPLE_RESOURCE_PATH.key(), "/andy");
+        final String buildTool = "maven";
+        final String language = "java";
+        final List<String> codestarts = singletonList("resteasy-example");
+        generateProjectRunTests(buildTool, language, codestarts, data,
+                genName(buildTool, language, codestarts) + "-customized");
+    }
+
+    @Test
+    public void generateCustomizedSpringWebProjectRun() throws Exception {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put(QuarkusDataKey.PROJECT_PACKAGE_NAME.key(), "com.test.spring.web");
+        data.put(QuarkusDataKey.SPRING_WEB_EXAMPLE_RESOURCE_CLASS_NAME.key(), "SpringWebEndpoint");
+        data.put(QuarkusDataKey.SPRING_WEB_EXAMPLE_RESOURCE_PATH.key(), "/springweb");
+        final String buildTool = "maven";
+        final String language = "java";
+        final List<String> codestarts = singletonList("spring-web-example");
+        generateProjectRunTests(buildTool, language, codestarts, data,
+                genName(buildTool, language, codestarts) + "-customized");
+    }
+
+    @Test
+    public void generateCustomizedCommandModeProjectRun() throws Exception {
+        final HashMap<String, Object> data = new HashMap<>();
+        data.put(QuarkusDataKey.PROJECT_PACKAGE_NAME.key(), "com.test.andy");
+        data.put(QuarkusDataKey.COMMANDMODE_EXAMPLE_RESOURCE_CLASS_NAME.key(), "AndyCommando");
+        final String buildTool = "maven";
+        final String language = "java";
+        final List<String> codestarts = Collections.emptyList();
+        generateProjectRunTests(buildTool, language, codestarts, data,
+                genName(buildTool, language, codestarts) + "-customized");
+    }
+
+    private void generateProjectRunTests(String buildTool, String language, List<String> codestarts, Map<String, Object> data)
+            throws Exception {
+        generateProjectRunTests(buildTool, language, codestarts, data, genName(buildTool, language, codestarts));
+    }
+
+    private void generateProjectRunTests(String buildToolName, String language, List<String> codestarts,
+            Map<String, Object> data, String name)
+            throws Exception {
+        final BuildTool buildTool = BuildTool.findTool(buildToolName);
+
+        // for JVM 8 and 14 this will generate project with java 1.8, for JVM 11 project with java 11
+        final QuarkusCodestartProjectInput input = QuarkusCodestartProjectInput.builder()
+                .addData(getTestInputData(Collections.singletonMap("artifact-id", name)))
+                .buildTool(buildTool)
+                .addCodestarts(codestarts)
+                .addCodestart(language)
+                .addData(data)
+                .build();
+        final CodestartProjectDefinition projectDefinition = getCatalog().createProject(input);
+        Path projectDir = testDirPath.resolve(name);
+        projectDefinition.generate(projectDir);
+
+        final int result = WrapperRunner.run(projectDir,
+                WrapperRunner.Wrapper.fromBuildtool(buildToolName));
+        assertThat(result).isZero();
+    }
+
+    private String genName(String buildtool, String language, List<String> codestarts) {
+        String name = "project-" + buildtool + "-" + language;
+        if (codestarts.isEmpty()) {
+            name += "-default";
+        } else if (codestarts.size() > 2) {
+            name += "-" + UUID.randomUUID().toString();
+        } else {
+            name += "-" + String.join("-", codestarts);
+        }
+        return name;
+    }
+
+    private QuarkusCodestartCatalog getCatalog() throws IOException {
+        return QuarkusCodestartCatalog.fromExtensionsCatalog(getExtensionsCatalog(), getCodestartsResourceLoader());
+    }
+
+    private List<String> getRunTogetherExamples() throws IOException {
+        return getAllExamples()
+                .filter(c -> !isRunAloneExample(c))
+                .map(Codestart::getName)
+                .collect(Collectors.toList());
+    }
+
+    private Stream<Arguments> provideRunAloneExamples() throws IOException {
+        return getAllExamples()
+                .filter(this::isRunAloneExample)
+                .map(Codestart::getName)
+                .map(Arguments::of);
+    }
+
+    private Stream<Arguments> provideLanguages() {
+        return Stream.of("java", "kotlin", "scala")
+                .map(Arguments::of);
+    }
+
+    private Stream<Codestart> getAllExamples() throws IOException {
+        return getCatalog().getCodestarts().stream()
+                .filter(QuarkusCodestartCatalog::isExample)
+                .filter(c -> !EXCLUDED.contains(c.getName()));
+    }
+
+    private boolean isRunAloneExample(Codestart c) {
+        return c.containsTag(Tag.SINGLETON_EXAMPLE.key()) || RUN_ALONE.contains(c.getName());
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java
new file mode 100644
index 0000000000000..2263a4da99ece
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractAddExtensionsTest.java
@@ -0,0 +1,241 @@
+package io.quarkus.devtools.commands;
+
+import static io.quarkus.platform.catalog.processor.ExtensionProcessor.isUnlisted;
+import static io.quarkus.platform.tools.ToolsConstants.IO_QUARKUS;
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.registry.catalog.Extension;
+
+abstract class AbstractAddExtensionsTest<T> extends PlatformAwareTestBase {
+
+    private final Path projectPath = Paths.get("target/extensions-test");
+
+    public Path getProjectPath() {
+        return projectPath;
+    }
+
+    @Test
+    void addSomeValidExtensions() throws Exception {
+        createProject();
+        addExtensions(asList("jdbc-postgre", "agroal", " hibernate-validator",
+                "commons-io:commons-io:2.6"));
+        final T project = readProject();
+        hasDependency(project, "quarkus-agroal");
+        hasDependency(project, "quarkus-hibernate-validator");
+        hasDependency(project, "commons-io", "commons-io", "2.6");
+        hasDependency(project, "quarkus-jdbc-postgresql");
+    }
+
+    @Test
+    void testPartialMatches() throws Exception {
+        createProject();
+        addExtensions(asList("mongodb-panache", "hibernate-val", "agro"));
+
+        final T project = readProject();
+        hasDependency(project, "quarkus-agroal");
+        hasDependency(project, "quarkus-mongodb-panache");
+        hasDependency(project, "quarkus-hibernate-validator");
+    }
+
+    @Test
+    void testRegexpMatches() throws Exception {
+        createProject();
+
+        final QuarkusCommandOutcome result = addExtensions(asList("Sm??lRye**"));
+
+        Assertions.assertTrue(result.isSuccess());
+        Assertions.assertTrue(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
+
+        final T project = readProject();
+
+        getExtensionsWithArtifactContaining("smallrye")
+                .forEach(e -> hasDependency(project, e.getArtifact().getArtifactId()));
+    }
+
+    @Test
+    void addExtensionWithGroupIdAndArtifactId() throws Exception {
+        createProject();
+
+        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("io.quarkus:quarkus-agroal"));
+
+        final T project = readProject();
+        hasDependency(project, "io.quarkus", "quarkus-agroal", null);
+    }
+
+    @Test
+    void addExtensionWithGAV() throws Exception {
+        createProject();
+
+        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("io.quarkus:quarkus-agroal:2.5"));
+
+        final T project = readProject();
+        hasDependency(project, "io.quarkus", "quarkus-agroal", "2.5");
+    }
+
+    @Test
+    void addMissingExtension() throws Exception {
+        createProject();
+
+        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("missing"));
+
+        final T project = readProject();
+        doesNotHaveDependency(project, "quarkus-missing");
+        Assertions.assertFalse(result.isSuccess());
+        Assertions.assertFalse(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
+    }
+
+    @Test
+    void addExtensionTwiceInOneBatch() throws Exception {
+        createProject();
+        final QuarkusCommandOutcome result = addExtensions(asList("agroal", "agroal"));
+        final T project = readProject();
+        hasDependency(project, "quarkus-agroal");
+        Assertions.assertEquals(1,
+                countDependencyOccurrences(project, IO_QUARKUS, "quarkus-agroal", null));
+        Assertions.assertTrue(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
+        Assertions.assertTrue(result.isSuccess());
+    }
+
+    @Test
+    void addExtensionTwiceInTwoBatches() throws Exception {
+        createProject();
+
+        final QuarkusCommandOutcome result1 = addExtensions(Collections.singletonList("agroal"));
+        final T project1 = readProject();
+        hasDependency(project1, "quarkus-agroal");
+        Assertions.assertEquals(1,
+                countDependencyOccurrences(project1, IO_QUARKUS, "quarkus-agroal", null));
+        Assertions.assertTrue(result1.valueIs(AddExtensions.OUTCOME_UPDATED, true));
+        Assertions.assertTrue(result1.isSuccess());
+
+        final QuarkusCommandOutcome result2 = addExtensions(Collections.singletonList("agroal"));
+        final T project2 = readProject();
+        hasDependency(project2, "quarkus-agroal");
+        Assertions.assertEquals(1,
+                countDependencyOccurrences(project2, IO_QUARKUS, "quarkus-agroal", null));
+        Assertions.assertFalse(result2.valueIs(AddExtensions.OUTCOME_UPDATED, true));
+        Assertions.assertTrue(result2.isSuccess());
+    }
+
+    /**
+     * This test reproduce the issue we had using the first selection algorithm.
+     * The `arc` query was matching ArC but also hibernate-search-elasticsearch.
+     */
+    @Test
+    void testPartialMatchConflict() throws Exception {
+        // arc is now unlisted
+    }
+
+    @Test
+    void addExistingAndMissingExtensionsWillFailForBoth() throws Exception {
+        createProject();
+        final QuarkusCommandOutcome result = addExtensions(asList("missing", "agroal"));
+
+        final T project = readProject();
+        doesNotHaveDependency(project, "quarkus-missing");
+        doesNotHaveDependency(project, "quarkus-agroal");
+        Assertions.assertFalse(result.isSuccess());
+        Assertions.assertFalse(result.valueIs(AddExtensions.OUTCOME_UPDATED, true));
+    }
+
+    @Test
+    void doNotAddExtensionWhenMultipleMatchWithMultipleKeywords() throws Exception {
+        createProject();
+
+        addExtensions(asList("agroal", "jdbc"));
+
+        final T project = readProject();
+        doesNotHaveDependency(project, "quarkus-agroal");
+        getExtensionsWithArtifactContaining("jdbc")
+                .forEach(e -> doesNotHaveDependency(project, e.getArtifact().getArtifactId()));
+    }
+
+    @Test
+    void doesNotAddExtensionsWhenMultipleMatchWithOneKeyword() throws Exception {
+        createProject();
+
+        addExtensions(asList("jdbc"));
+
+        final T project = readProject();
+
+        getExtensionsWithArtifactContaining("jdbc")
+                .forEach(e -> doesNotHaveDependency(project, e.getArtifact().getArtifactId()));
+    }
+
+    @Test
+    void addDuplicatedExtensionUsingGAV() throws Exception {
+        createProject();
+
+        addExtensions(asList("org.acme:acme:1", "org.acme:acme:1"));
+
+        final T project = readProject();
+        hasDependency(project, "org.acme", "acme", "1");
+        Assertions.assertEquals(1,
+                countDependencyOccurrences(project, "org.acme", "acme", "1"));
+    }
+
+    @Test
+    void testVertx() throws Exception {
+        createProject();
+
+        addExtensions(Collections.singletonList("vertx"));
+
+        final T project = readProject();
+        hasDependency(project, "quarkus-vertx");
+    }
+
+    @Test
+    void testVertxWithDot() throws Exception {
+        createProject();
+
+        // It's not possible anymore to install vert.x this way since there are more than one matching extension
+        final QuarkusCommandOutcome result = addExtensions(Collections.singletonList("vert.x"));
+
+        final T project = readProject();
+        getExtensionsWithArtifactContaining("vertx")
+                .forEach(e -> hasDependency(project, e.getArtifact().getArtifactId()));
+    }
+
+    private Stream<Extension> getExtensionsWithArtifactContaining(String contains) {
+        return getExtensionsCatalog().getExtensions().stream()
+                .filter(e -> e.getArtifact().getArtifactId().contains(contains) && !isUnlisted(e));
+    }
+
+    private void hasDependency(T project, String artifactId) {
+        hasDependency(project, IO_QUARKUS, artifactId, null);
+    }
+
+    private void hasDependency(T project, String groupId, String artifactId, String version) {
+        assertThat(countDependencyOccurrences(project, groupId, artifactId, version))
+                .describedAs("Dependency %s:%s:%s must be in project", groupId, artifactId, version)
+                .isNotZero();
+    }
+
+    private void doesNotHaveDependency(T project, String artifactId) {
+        assertThat(countDependencyOccurrences(project, IO_QUARKUS, artifactId, null))
+                .describedAs("Dependency %s:%s must not be in project", IO_QUARKUS, artifactId)
+                .isZero();
+    }
+
+    protected abstract T createProject() throws IOException, QuarkusCommandException;
+
+    protected abstract T readProject() throws IOException;
+
+    protected abstract QuarkusCommandOutcome addExtensions(List<String> extensions) throws IOException, QuarkusCommandException;
+
+    protected abstract long countDependencyOccurrences(T project, String groupId, String artifactId, String version);
+}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java
similarity index 85%
rename from independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java
index 9be4524fa0508..f1132a6c57623 100644
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AbstractRemoveExtensionsTest.java
@@ -1,16 +1,20 @@
 package io.quarkus.devtools.commands;
 
+import static io.quarkus.platform.tools.ToolsConstants.IO_QUARKUS;
 import static java.util.Arrays.asList;
 
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+
 abstract class AbstractRemoveExtensionsTest<T> extends PlatformAwareTestBase {
 
     private final Path projectPath = Paths.get("target/extensions-test");
@@ -22,12 +26,11 @@ public Path getProjectPath() {
     @Test
     void removeSomeValidExtensions() throws Exception {
         createProject();
-        List<String> extensions = asList("jdbc-postgre", "agroal", "quarkus-arc", " hibernate-validator",
+        List<String> extensions = asList("jdbc-postgre", "agroal", " hibernate-validator",
                 "commons-io:commons-io:2.6");
         addExtensions(extensions);
         final T project = readProject();
         hasDependency(project, "quarkus-agroal");
-        hasDependency(project, "quarkus-arc");
         hasDependency(project, "quarkus-hibernate-validator");
         hasDependency(project, "commons-io", "commons-io", "2.6");
         hasDependency(project, "quarkus-jdbc-postgresql");
@@ -35,7 +38,6 @@ void removeSomeValidExtensions() throws Exception {
         removeExtensions(extensions);
         final T projectAfter = readProject();
         hasNoDependency(projectAfter, "quarkus-agroal");
-        hasNoDependency(projectAfter, "quarkus-arc");
         hasNoDependency(projectAfter, "quarkus-hibernate-validator");
         hasNoDependency(projectAfter, "commons-io", "commons-io", "2.6");
         hasNoDependency(projectAfter, "quarkus-jdbc-postgresql");
@@ -44,19 +46,19 @@ void removeSomeValidExtensions() throws Exception {
     @Test
     void testPartialMatches() throws Exception {
         createProject();
-        List<String> extensions = asList("orm-pana", "jdbc-postgre", "arc");
+        List<String> extensions = asList("mongodb-panache", "hibernate-val", "agro");
 
         addExtensions(extensions);
         final T project = readProject();
-        hasDependency(project, "quarkus-arc");
-        hasDependency(project, "quarkus-hibernate-orm-panache");
-        hasDependency(project, "quarkus-jdbc-postgresql");
+        hasDependency(project, "quarkus-agroal");
+        hasDependency(project, "quarkus-mongodb-panache");
+        hasDependency(project, "quarkus-hibernate-validator");
 
         removeExtensions(extensions);
         final T projectAfter = readProject();
-        hasNoDependency(projectAfter, "quarkus-arc");
-        hasNoDependency(projectAfter, "quarkus-hibernate-orm-panache");
-        hasNoDependency(projectAfter, "quarkus-jdbc-postgresql");
+        hasNoDependency(projectAfter, "quarkus-agroal");
+        hasNoDependency(projectAfter, "quarkus-mongodb-panache");
+        hasNoDependency(projectAfter, "quarkus-hibernate-validator");
     }
 
     @Test
@@ -89,7 +91,7 @@ void testRegexpMatches() throws Exception {
     }
 
     private void hasDependency(T project, String artifactId) {
-        hasDependency(project, getPluginGroupId(), artifactId, null);
+        hasDependency(project, IO_QUARKUS, artifactId, null);
     }
 
     private void hasDependency(T project, String groupId, String artifactId, String version) {
@@ -97,7 +99,7 @@ private void hasDependency(T project, String groupId, String artifactId, String
     }
 
     private void hasNoDependency(T project, String artifactId) {
-        hasNoDependency(project, getPluginGroupId(), artifactId, null);
+        hasNoDependency(project, IO_QUARKUS, artifactId, null);
     }
 
     private void hasNoDependency(T project, String groupId, String artifactId, String version) {
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java
new file mode 100644
index 0000000000000..a9ba75e6c1043
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AddGradleExtensionsTest.java
@@ -0,0 +1,99 @@
+package io.quarkus.devtools.commands;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.project.buildfile.AbstractGroovyGradleBuildFile;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+class AddGradleExtensionsTest extends AbstractAddExtensionsTest<List<String>> {
+
+    @Override
+    protected List<String> createProject() throws IOException, QuarkusCommandException {
+        SnapshotTesting.deleteTestDirectory(getProjectPath().toFile());
+        final QuarkusProject project = getQuarkusProject();
+        new CreateProject(project)
+                .groupId("org.acme")
+                .artifactId("add-gradle-extension-test")
+                .version("0.0.1-SNAPSHOT")
+                .execute();
+        return readProject();
+    }
+
+    @Override
+    protected List<String> readProject() throws IOException {
+        return Files.readAllLines(getProjectPath().resolve("build.gradle"));
+    }
+
+    @Override
+    protected QuarkusCommandOutcome addExtensions(final List<String> extensions) throws IOException, QuarkusCommandException {
+        return new AddExtensions(getQuarkusProject())
+                .extensions(new HashSet<>(extensions))
+                .execute();
+    }
+
+    @Override
+    protected long countDependencyOccurrences(final List<String> buildFile, final String groupId, final String artifactId,
+            final String version) {
+        return buildFile.stream()
+                .filter(d -> d.equals(getBuildFileDependencyString(groupId, artifactId, version)))
+                .count();
+    }
+
+    private static String getBuildFileDependencyString(final String groupId, final String artifactId, final String version) {
+        final String versionPart = version != null ? ":" + version : "";
+        return "    implementation '" + groupId + ":" + artifactId + versionPart + "'";
+    }
+
+    protected QuarkusProject getQuarkusProject() throws QuarkusCommandException {
+        try {
+            return QuarkusProjectHelper.getProject(getProjectPath(),
+                    new TestingGradleBuildFile(getProjectPath(), getExtensionsCatalog()));
+        } catch (RegistryResolutionException e) {
+            throw new QuarkusCommandException("Failed to initialize Quarkus project", e);
+        }
+    }
+
+    static class TestingGradleBuildFile extends AbstractGroovyGradleBuildFile {
+
+        public TestingGradleBuildFile(Path projectDirPath, ExtensionCatalog catalog) {
+            super(projectDirPath, catalog);
+        }
+
+        @Override
+        protected List<AppArtifactCoords> getDependencies() throws IOException {
+            final Matcher matcher = Pattern.compile("\\s*implementation\\s+'([^\\v:]+):([^\\v:]+)(:[^:\\v]+)?'")
+                    .matcher(getBuildContent());
+            final ArrayList<AppArtifactCoords> builder = new ArrayList<>();
+            while (matcher.find()) {
+                builder.add(createDependency(matcher.group(1), matcher.group(2), matcher.group(3), "jar"));
+            }
+            if (getBuildContent().contains(
+                    "implementation enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}\")")) {
+                builder.add(createDependency(
+                        getProperty("quarkusPlatformGroupId"),
+                        getProperty("quarkusPlatformArtifactId"),
+                        getProperty("quarkusPlatformVersion"),
+                        "pom"));
+            }
+            return builder;
+        }
+
+        private AppArtifactCoords createDependency(String groupId, String artifactId, String version, String type) {
+            return new AppArtifactCoords(groupId, artifactId, type, version);
+        }
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java
similarity index 83%
rename from independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java
index 904777bf8917e..c1957fd01e949 100644
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/AddMavenExtensionsTest.java
@@ -1,25 +1,29 @@
 package io.quarkus.devtools.commands;
 
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.maven.utilities.MojoUtils;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+
 import org.apache.maven.model.Model;
 
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.maven.utilities.MojoUtils;
+
 class AddMavenExtensionsTest extends AbstractAddExtensionsTest<Model> {
 
     @Override
     protected Model createProject() throws IOException, QuarkusCommandException {
         final File pom = getProjectPath().resolve("pom.xml").toFile();
-        CreateProjectTest.delete(getProjectPath().toFile());
-        new CreateProject(getProjectPath(), getPlatformDescriptor())
-                .buildTool(BuildTool.MAVEN)
+        SnapshotTesting.deleteTestDirectory(getProjectPath().toFile());
+        final QuarkusProject project = getQuarkusProject();
+        new CreateProject(project)
                 .groupId("org.acme")
                 .artifactId("add-maven-extension-test")
                 .version("0.0.1-SNAPSHOT")
@@ -48,6 +52,6 @@ protected long countDependencyOccurrences(final Model project, final String grou
     }
 
     private QuarkusProject getQuarkusProject() {
-        return QuarkusProject.maven(getProjectPath(), getPlatformDescriptor());
+        return QuarkusProjectHelper.getProject(getProjectPath(), BuildTool.MAVEN);
     }
 }
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateJBangProjectTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateJBangProjectTest.java
new file mode 100644
index 0000000000000..3fc2eb1602c0b
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateJBangProjectTest.java
@@ -0,0 +1,84 @@
+package io.quarkus.devtools.commands;
+
+import static io.quarkus.devtools.testing.SnapshotTesting.checkContains;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+
+public class CreateJBangProjectTest extends PlatformAwareTestBase {
+    @Test
+    public void createRESTEasy() throws Exception {
+        final File file = new File("target/jbang-resteasy");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        assertCreateJBangProject(newCreateJBangProject(projectDir)
+                .setValue("noJBangWrapper", false));
+
+        assertThat(projectDir.resolve("jbang")).exists();
+
+        assertThat(projectDir.resolve("src/GreetingResource.java"))
+                .exists()
+                .satisfies(checkContains("//usr/bin/env jbang \"$0\" \"$@\" ; exit $?"))
+                .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy"));
+    }
+
+    @Test
+    public void createRESTEasyWithNoJBangWrapper() throws Exception {
+        final File file = new File("target/jbang-resteasy");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        assertCreateJBangProject(newCreateJBangProject(projectDir)
+                .setValue("noJBangWrapper", true));
+
+        assertThat(projectDir.resolve("jbang")).doesNotExist();
+
+        assertThat(projectDir.resolve("src/GreetingResource.java"))
+                .exists()
+                .satisfies(checkContains("//usr/bin/env jbang \"$0\" \"$@\" ; exit $?"))
+                .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy"));
+    }
+
+    @Test
+    public void createRESTEasyWithExtensions() throws Exception {
+        final File file = new File("target/jbang-resteasy");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        Set<String> extensions = new HashSet<>();
+        extensions.add("resteasy-jsonb");
+
+        assertCreateJBangProject(newCreateJBangProject(projectDir)
+                .extensions(extensions)
+                .setValue("noJBangWrapper", false));
+
+        assertThat(projectDir.resolve("jbang")).exists();
+
+        assertThat(projectDir.resolve("src/GreetingResource.java"))
+                .exists()
+                .satisfies(checkContains("//usr/bin/env jbang \"$0\" \"$@\" ; exit $?"))
+                .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy"))
+                .satisfies(checkContains("//DEPS io.quarkus:quarkus-resteasy-jsonb"));
+    }
+
+    private CreateJBangProject newCreateJBangProject(Path dir) {
+        return new CreateJBangProject(QuarkusProjectHelper.getProject(dir, BuildTool.MAVEN));
+    }
+
+    private void assertCreateJBangProject(CreateJBangProject createJBangProjectProject)
+            throws QuarkusCommandException {
+        final QuarkusCommandOutcome result = createJBangProjectProject.execute();
+        assertTrue(result.isSuccess());
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectPlatformMetadataTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectPlatformMetadataTest.java
new file mode 100644
index 0000000000000..bff47f1e244c9
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectPlatformMetadataTest.java
@@ -0,0 +1,91 @@
+package io.quarkus.devtools.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import org.assertj.core.util.Files;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class CreateProjectPlatformMetadataTest extends PlatformAwareTestBase {
+
+    private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+
+    @Test
+    public void create() throws Exception {
+        final File file = new File("target/meta-rest");
+        SnapshotTesting.deleteTestDirectory(file);
+        createProject(BuildTool.MAVEN, file, "io.quarkus", "basic-rest", "1.0.0-SNAPSHOT");
+        assertThat(file.toPath().resolve("pom.xml"))
+                .exists()
+                .satisfies(checkContains("<id>redhat</id>"))
+                .satisfies(checkContains("<url>https://maven.repository.redhat.com</url>"))
+                .satisfies(checkContains("<snapshots>"))
+                .satisfies(checkContains("<releases>"))
+                .satisfies(checkContains("<repositories>"))
+                .satisfies(checkContains("<pluginRepositories>"));
+    }
+
+    @Test
+    public void createGradle() throws Exception {
+        final File file = new File("target/meta-rest-gradle");
+        SnapshotTesting.deleteTestDirectory(file);
+        createProject(BuildTool.GRADLE, file, "io.quarkus", "basic-rest", "1.0.0-SNAPSHOT");
+        assertThat(file.toPath().resolve("build.gradle"))
+                .exists()
+                .satisfies(checkContains("maven { url \"https://maven.repository.redhat.com\" }"));
+    }
+
+    @Test
+    public void createGradleKotlin() throws Exception {
+        final File file = new File("target/meta-rest-gradle-kts");
+        SnapshotTesting.deleteTestDirectory(file);
+        createProject(BuildTool.GRADLE_KOTLIN_DSL, file, "io.quarkus", "basic-rest", "1.0.0-SNAPSHOT");
+        assertThat(file.toPath().resolve("build.gradle.kts"))
+                .exists()
+                .satisfies(checkContains("maven { url = uri(\"https://maven.repository.redhat.com\") }"));
+    }
+
+    private Consumer<Path> checkContains(String s) {
+        return (p) -> assertThat(Files.contentOf(p.toFile(), StandardCharsets.UTF_8)).contains(s);
+    }
+
+    private Map<String, Object> getMetadata() throws java.io.IOException {
+        return JSON_MAPPER.reader().readValue(CreateProjectPlatformMetadataTest.class.getResource("/platform-metadata.json"),
+                Map.class);
+    }
+
+    private void createProject(BuildTool buildTool, File file, String groupId, String artifactId, String version)
+            throws QuarkusCommandException, IOException {
+        final ExtensionCatalog platformDescriptor = getExtensionsCatalog();
+        final ExtensionCatalog spy = spy(platformDescriptor);
+        when(spy.getMetadata()).thenReturn(getMetadata());
+        QuarkusProject project = QuarkusProjectHelper.getProject(file.toPath(), spy, buildTool);
+        final QuarkusCommandOutcome result = new CreateProject(project)
+                .groupId(groupId)
+                .artifactId(artifactId)
+                .version(version)
+                .quarkusPluginVersion(buildTool == BuildTool.MAVEN ? "2.3.5" : "2.3.5-gradle")
+                .execute();
+        assertTrue(result.isSuccess());
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java
new file mode 100644
index 0000000000000..def60c953faa9
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/CreateProjectTest.java
@@ -0,0 +1,244 @@
+package io.quarkus.devtools.commands;
+
+import static io.quarkus.devtools.testing.SnapshotTesting.checkContains;
+import static io.quarkus.devtools.testing.SnapshotTesting.checkMatches;
+import static io.quarkus.platform.tools.ToolsConstants.PROP_COMPILER_PLUGIN_VERSION;
+import static io.quarkus.platform.tools.ToolsConstants.PROP_SUREFIRE_PLUGIN_VERSION;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.maven.model.Model;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.project.codegen.writer.FileProjectWriter;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.maven.utilities.MojoUtils;
+
+public class CreateProjectTest extends PlatformAwareTestBase {
+    @Test
+    public void createRESTEasy() throws Exception {
+        final File file = new File("target/basic-resteasy");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        assertCreateProject(newCreateProject(projectDir)
+                .groupId("org.acme.foo")
+                .artifactId("resteasy-app")
+                .version("1.0.0-FOO")
+                .className("org.acme.getting.started.GreetingResource")
+                .resourcePath("/foo")
+                .extensions(Collections.singleton("resteasy")));
+        final Properties quarkusProp = getQuarkusProperties();
+        assertThat(projectDir.resolve(".gitignore"))
+                .exists()
+                .satisfies(checkMatches("(?s).*target/\\R.*"));
+        assertThat(projectDir.resolve("src/main/java/org/acme/getting/started/GreetingResource.java"))
+                .exists()
+                .satisfies(checkContains("package org.acme.getting.started;"))
+                .satisfies(checkContains("class GreetingResource"))
+                .satisfies(checkContains("@Path(\"/foo\")"));
+        assertThat(projectDir.resolve("pom.xml"))
+                .exists()
+                .satisfies(checkContains("<groupId>org.acme.foo</groupId>"))
+                .satisfies(checkContains("<artifactId>resteasy-app</artifactId>"))
+                .satisfies(checkContains("<version>1.0.0-FOO</version>"))
+                .satisfies(checkContains(
+                        "<surefire-plugin.version>" + quarkusProp.getProperty(PROP_SUREFIRE_PLUGIN_VERSION)
+                                + "</surefire-plugin.version>"))
+                .satisfies(checkContains(
+                        "<compiler-plugin.version>" + quarkusProp.getProperty(PROP_COMPILER_PLUGIN_VERSION)
+                                + "</compiler-plugin.version>"))
+                .satisfies(checkContains("<artifactId>quarkus-resteasy</artifactId>"));
+
+        assertThat(projectDir.resolve("README.md"))
+                .exists()
+                .satisfies(checkContains("./mvnw"));
+    }
+
+    @Test
+    public void createSpringWeb() throws Exception {
+        final File file = new File("target/create-spring");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        assertCreateProject(newCreateProject(projectDir)
+                .groupId("org.acme.bar")
+                .packageName("org.acme.bar.spr")
+                .artifactId("spring-web-app")
+                .version("1.0.0-BAR")
+                .className("BarController")
+                .resourcePath("/bar")
+                .extensions(Collections.singleton("spring-web")));
+        assertThat(projectDir.resolve("pom.xml"))
+                .exists()
+                .satisfies(checkContains("<groupId>org.acme.bar</groupId>"))
+                .satisfies(checkContains("<artifactId>spring-web-app</artifactId>"))
+                .satisfies(checkContains("<version>1.0.0-BAR</version>"))
+                .satisfies(checkContains("<artifactId>quarkus-spring-web</artifactId>"));
+
+        assertThat(projectDir.resolve("src/main/java/org/acme/bar/spr/BarController.java"))
+                .exists()
+                .satisfies(checkContains("package org.acme.bar.spr"))
+                .satisfies(checkContains("@RestController"))
+                .satisfies(checkContains("class BarController"))
+                .satisfies(checkContains("@RequestMapping(\"/bar\")"));
+    }
+
+    @Test
+    public void createRESTEasyAndSpringWeb() throws Exception {
+        final File file = new File("target/create-spring-resteasy");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        assertCreateProject(newCreateProject(projectDir)
+                .artifactId("spring-web-resteasy-app")
+                .className("BarController")
+                .packageName("io.test")
+                .resourcePath("/bar")
+                .extensions(new HashSet<>(Arrays.asList("resteasy", "spring-web"))));
+        assertThat(projectDir.resolve("pom.xml"))
+                .exists()
+                .satisfies(checkContains("<artifactId>spring-web-resteasy-app</artifactId>"))
+                .satisfies(checkContains("<artifactId>quarkus-spring-web</artifactId>"))
+                .satisfies(checkContains("<artifactId>quarkus-resteasy</artifactId>"));
+
+        assertThat(projectDir.resolve("src/main/java/io/test/SpringGreetingController.java"))
+                .exists()
+                .satisfies(checkContains("package io.test;"))
+                .satisfies(checkContains("@RestController"))
+                .satisfies(checkContains("class SpringGreetingController"))
+                .satisfies(checkContains("@RequestMapping(\"/hello-spring\")"));
+
+        assertThat(projectDir.resolve("src/main/java/io/test/GreetingResource.java"))
+                .exists()
+                .satisfies(checkContains("package io.test;"))
+                .satisfies(checkContains("class GreetingResource"))
+                .satisfies(checkContains("@Path(\"/hello-resteasy\")"));
+    }
+
+    @Test
+    public void createGradle() throws Exception {
+        final File file = new File("target/create-resteasy-gradle");
+        final Path projectDir = file.toPath();
+        SnapshotTesting.deleteTestDirectory(file);
+        assertCreateProject(newCreateProject(projectDir, BuildTool.GRADLE)
+                .groupId("io.foo")
+                .packageName("my.project")
+                .artifactId("resteasy-app")
+                .version("1.0.0-FOO")
+                .className("FooResource")
+                .resourcePath("/foo")
+                .extensions(Collections.singleton("resteasy")));
+
+        assertThat(projectDir.resolve(".gitignore"))
+                .exists()
+                .satisfies(checkMatches("(?s).*build/\\R.*"))
+                .satisfies(checkMatches("(?s).*\\.gradle/\\R.*"));
+        assertThat(projectDir.resolve("src/main/java/my/project/FooResource.java"))
+                .exists()
+                .satisfies(checkContains("@Path(\"/foo\")"));
+        assertThat(projectDir.resolve("build.gradle"))
+                .exists()
+                .satisfies(checkContains("group 'io.foo'"))
+                .satisfies(checkContains("version '1.0.0-FOO'"))
+                .satisfies(checkContains("implementation 'io.quarkus:quarkus-resteasy'"));
+
+        assertThat(projectDir.resolve("settings.gradle"))
+                .exists()
+                .satisfies(checkContains("rootProject.name='resteasy-app'"));
+
+        assertThat(projectDir.resolve("README.md"))
+                .exists()
+                .satisfies(checkContains("./gradlew"));
+    }
+
+    private CreateProject newCreateProject(Path dir) {
+        return newCreateProject(dir, BuildTool.MAVEN);
+    }
+
+    private CreateProject newCreateProject(Path dir, BuildTool buildTool) {
+        return new CreateProject(QuarkusProjectHelper.getProject(dir, buildTool));
+    }
+
+    @Test
+    public void createOnTopOfExisting() throws Exception {
+        final File testDir = new File("target/create-existing");
+        SnapshotTesting.deleteTestDirectory(testDir);
+        testDir.mkdirs();
+
+        Model model = new Model();
+        model.setModelVersion("4.0.0");
+        model.setGroupId("org.acme");
+        model.setArtifactId("foobar");
+        model.setVersion("10.1.2");
+        final File pom = new File(testDir, "pom.xml");
+        MojoUtils.write(model, pom);
+        assertThatExceptionOfType(QuarkusCommandException.class).isThrownBy(() -> {
+            final QuarkusProject project = QuarkusProjectHelper.getProject(testDir.toPath(), BuildTool.MAVEN);
+            new CreateProject(project)
+                    .groupId("something.is")
+                    .artifactId("wrong")
+                    .version("1.0.0-SNAPSHOT")
+                    .className("org.foo.MyResource")
+                    .execute();
+        }).withRootCauseInstanceOf(IOException.class);
+    }
+
+    @Test
+    @Timeout(3)
+    @DisplayName("Should create correctly multiple times in parallel with multiple threads")
+    void createMultipleTimes() throws InterruptedException {
+        final ExecutorService executorService = Executors.newFixedThreadPool(4);
+        final CountDownLatch latch = new CountDownLatch(15);
+
+        List<Callable<Void>> collect = IntStream.range(0, 15).boxed().map(i -> (Callable<Void>) () -> {
+            File tempDir = Files.createTempDirectory("test").toFile();
+            FileProjectWriter write = new FileProjectWriter(tempDir);
+            final QuarkusProject project = QuarkusProjectHelper.getProject(tempDir.toPath(), BuildTool.MAVEN);
+            final QuarkusCommandOutcome result = new CreateProject(project)
+                    .groupId("org.acme")
+                    .artifactId("acme")
+                    .version("1.0.0-SNAPSHOT")
+                    .className("org.acme.MyResource")
+                    .execute();
+            assertTrue(result.isSuccess());
+            latch.countDown();
+            write.close();
+            tempDir.delete();
+            return null;
+        }).collect(Collectors.toList());
+        executorService.invokeAll(collect);
+        latch.await();
+    }
+
+    private void assertCreateProject(CreateProject createProject)
+            throws QuarkusCommandException {
+        final QuarkusCommandOutcome result = createProject
+                .quarkusPluginVersion("2.3.5")
+                .execute();
+        assertTrue(result.isSuccess());
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java
new file mode 100644
index 0000000000000..1b525211af0ca
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/ListExtensionsTest.java
@@ -0,0 +1,207 @@
+package io.quarkus.devtools.commands;
+
+import static io.quarkus.maven.utilities.MojoUtils.readPom;
+import static io.quarkus.platform.tools.ToolsConstants.IO_QUARKUS;
+import static java.util.Arrays.asList;
+import static java.util.stream.Collectors.toMap;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.function.Function;
+
+import org.apache.maven.model.Model;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.bootstrap.model.AppArtifactCoords;
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.messagewriter.MessageWriter;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.maven.utilities.MojoUtils;
+import io.quarkus.maven.utilities.QuarkusDependencyPredicate;
+
+public class ListExtensionsTest extends PlatformAwareTestBase {
+
+    @Test
+    public void listWithBom() throws Exception {
+        final QuarkusProject project = createNewProject(new File("target/list-extensions-test", "pom.xml"));
+        addExtensions(project, "commons-io:commons-io:2.5", "Agroal");
+
+        final ListExtensions listExtensions = new ListExtensions(project);
+
+        final Map<AppArtifactKey, AppArtifactCoords> installed = readByKey(project);
+
+        Assertions.assertNotNull(installed.get(AppArtifactKey.fromString(IO_QUARKUS + ":quarkus-agroal")));
+    }
+
+    /**
+     * When creating a project with Maven, you could have -Dextensions="resteasy, hibernate-validator".
+     * <p>
+     * Having a space is not automatically handled by the Maven converter injecting the properties
+     * so we added code for that and we need to test it.
+     */
+    @Test
+    public void listWithBomExtensionWithSpaces() throws Exception {
+        final QuarkusProject quarkusProject = createNewProject(new File("target/list-extensions-test", "pom.xml"));
+        addExtensions(quarkusProject, "resteasy", " hibernate-validator ");
+
+        final ListExtensions listExtensions = new ListExtensions(quarkusProject);
+
+        final Map<AppArtifactKey, AppArtifactCoords> installed = readByKey(quarkusProject);
+
+        Assertions.assertNotNull(installed.get(AppArtifactKey.fromString(IO_QUARKUS + ":quarkus-resteasy")));
+        Assertions.assertNotNull(
+                installed.get(AppArtifactKey.fromString(IO_QUARKUS + ":quarkus-hibernate-validator")));
+    }
+
+    @Test
+    public void listWithoutBom() throws Exception {
+        final File pom = new File("target/list-extensions-test", "pom.xml");
+        final QuarkusProject quarkusProject = createNewProject(pom);
+        Model model = readPom(pom);
+
+        model.getDependencies().stream()
+                .filter(new QuarkusDependencyPredicate())
+                .forEach(d -> d.setVersion("0.0.1"));
+
+        MojoUtils.write(model, pom);
+
+        addExtensions(quarkusProject, "commons-io:commons-io:2.5", "Agroal",
+                "io.quarkus:quarkus-hibernate-orm-panache:" + getMavenPluginVersion());
+
+        model = readPom(pom);
+
+        try (final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                final PrintStream printStream = new PrintStream(baos, true, "UTF-8")) {
+            new ListExtensions(quarkusProject, MessageWriter.info(printStream))
+                    .all(true)
+                    .format("full")
+                    .execute();
+            final String output = baos.toString("UTF-8");
+
+            boolean agroal = false;
+            boolean resteasy = false;
+            boolean panache = false;
+            boolean hibernateValidator = false;
+            for (String line : output.split("\r?\n")) {
+                if (line.contains("agroal")) {
+                    assertTrue(line.startsWith("default"), "Agroal should list as being default: " + line);
+                    agroal = true;
+                } else if (line.contains("quarkus-resteasy ")) {
+                    assertTrue(line.startsWith("custom*"), "RESTEasy should list as being custom*: " + line);
+                    assertTrue(
+                            line.contains(
+                                    String.format("%-15s", getMavenPluginVersion())),
+                            "RESTEasy should list as being custom*: " + line);
+                    resteasy = true;
+                    assertTrue(
+                            line.endsWith(
+                                    String.format("%s", "https://quarkus.io/guides/rest-json")),
+                            "RESTEasy should list as having an guide: " + line);
+                } else if (line.contains("quarkus-hibernate-orm-panache ")) {
+                    assertTrue(line.startsWith("custom"), "Panache should list as being custom: " + line);
+                    assertTrue(
+                            line.contains(String.format("%-25s", getMavenPluginVersion())),
+                            "Panache should list as being custom*: " + line);
+                    panache = true;
+                } else if (line.contains("hibernate-validator")) {
+                    assertTrue(line.startsWith("   "), "Hibernate Validator should not list as anything: " + line);
+                    hibernateValidator = true;
+                }
+            }
+
+            assertTrue(agroal);
+            assertTrue(resteasy);
+            assertTrue(hibernateValidator);
+            assertTrue(panache);
+        }
+    }
+
+    @Test
+    public void searchUnexpected() throws Exception {
+        final QuarkusProject quarkusProject = createNewProject(new File("target/list-extensions-test", "pom.xml"));
+        addExtensions(quarkusProject, "commons-io:commons-io:2.5", "Agroal");
+
+        final PrintStream out = System.out;
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (final PrintStream printStream = new PrintStream(baos, false, "UTF-8")) {
+            new ListExtensions(quarkusProject, MessageWriter.info(printStream))
+                    .all(true)
+                    .format("full")
+                    .search("unexpectedSearch")
+                    .execute();
+        }
+        final String output = baos.toString("UTF-8");
+        Assertions.assertEquals(String.format("No extension found with pattern 'unexpectedSearch'%n"), output,
+                "search to unexpected extension must return a message");
+    }
+
+    @Test
+    public void searchRest() throws Exception {
+        final QuarkusProject quarkusProject = createNewProject(new File("target/list-extensions-test", "pom.xml"));
+        addExtensions(quarkusProject, "commons-io:commons-io:2.5", "Agroal");
+
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (final PrintStream printStream = new PrintStream(baos, false, "UTF-8")) {
+            new ListExtensions(quarkusProject, MessageWriter.info(printStream))
+                    .all(true)
+                    .format("full")
+                    .search("Rest")
+                    .execute();
+        }
+        final String output = baos.toString("UTF-8");
+        Assertions.assertTrue(output.split("\r?\n").length > 7, "search to unexpected extension must return a message");
+    }
+
+    @Test
+    void testListExtensionsWithoutAPomFile() throws Exception {
+        final Path tempDirectory = Files.createTempDirectory("proj");
+        final QuarkusProject project = QuarkusProjectHelper.getProject(tempDirectory, BuildTool.MAVEN);
+        final Map<AppArtifactKey, AppArtifactCoords> installed = readByKey(project);
+        assertTrue(installed.isEmpty());
+        assertFalse(project.getExtensionsCatalog().getExtensions().isEmpty());
+
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (final PrintStream printStream = new PrintStream(baos, false, "UTF-8")) {
+            new ListExtensions(project, MessageWriter.info(printStream)).execute();
+        }
+        final String output = baos.toString("UTF-8");
+        Assertions.assertTrue(output.contains("Current Quarkus extensions available:"));
+    }
+
+    private void addExtensions(QuarkusProject quarkusProject, String... extensions) throws Exception {
+        new AddExtensions(quarkusProject)
+                .extensions(new HashSet<>(asList(extensions)))
+                .execute();
+    }
+
+    private QuarkusProject createNewProject(final File pom) throws IOException, QuarkusCommandException {
+        SnapshotTesting.deleteTestDirectory(pom.getParentFile());
+        final Path projectDirPath = pom.getParentFile().toPath();
+        final QuarkusProject project = QuarkusProjectHelper.getProject(projectDirPath, BuildTool.MAVEN);
+        new CreateProject(project)
+                .groupId("org.acme")
+                .artifactId("add-extension-test")
+                .version("0.0.1-SNAPSHOT")
+                .execute();
+        return project;
+    }
+
+    private static Map<AppArtifactKey, AppArtifactCoords> readByKey(QuarkusProject project) throws IOException {
+        return project.getExtensionManager().getInstalled().stream()
+                .collect(toMap(AppArtifactCoords::getKey, Function.identity()));
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java
new file mode 100644
index 0000000000000..84f66d11ad190
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/RemoveGradleExtensionsTest.java
@@ -0,0 +1,77 @@
+package io.quarkus.devtools.commands;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashSet;
+import java.util.List;
+
+import org.junit.jupiter.api.Disabled;
+
+import io.quarkus.devtools.commands.AddGradleExtensionsTest.TestingGradleBuildFile;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.registry.RegistryResolutionException;
+
+class RemoveGradleExtensionsTest extends AbstractRemoveExtensionsTest<List<String>> {
+
+    @Disabled
+    void addExtensionTwiceInTwoBatches() throws IOException {
+        //FIXME This is currently not working
+    }
+
+    @Override
+    protected List<String> createProject() throws IOException, QuarkusCommandException {
+        SnapshotTesting.deleteTestDirectory(getProjectPath().toFile());
+        new CreateProject(getQuarkusProject())
+                .groupId("org.acme")
+                .artifactId("add-gradle-extension-test")
+                .version("0.0.1-SNAPSHOT")
+                .execute();
+        return readProject();
+    }
+
+    @Override
+    protected List<String> readProject() throws IOException {
+        return Files.readAllLines(getProjectPath().resolve("build.gradle"));
+    }
+
+    @Override
+    protected QuarkusCommandOutcome addExtensions(final List<String> extensions) throws IOException, QuarkusCommandException {
+        return new AddExtensions(getQuarkusProject())
+                .extensions(new HashSet<>(extensions))
+                .execute();
+    }
+
+    @Override
+    protected QuarkusCommandOutcome removeExtensions(final List<String> extensions)
+            throws IOException, QuarkusCommandException {
+        return new RemoveExtensions(getQuarkusProject())
+                .extensions(new HashSet<>(extensions))
+                .execute();
+    }
+
+    @Override
+    protected long countDependencyOccurrences(final List<String> buildFile, final String groupId, final String artifactId,
+            final String version) {
+        return buildFile.stream()
+                .filter(d -> d.equals(getBuildFileDependencyString(groupId, artifactId, version)))
+                .count();
+    }
+
+    protected QuarkusProject getQuarkusProject() throws QuarkusCommandException {
+        try {
+            return QuarkusProjectHelper.getProject(getProjectPath(),
+                    new TestingGradleBuildFile(getProjectPath(), getExtensionsCatalog()));
+        } catch (RegistryResolutionException e) {
+            throw new QuarkusCommandException("Failed to initialize Quarkus project", e);
+        }
+    }
+
+    private static String getBuildFileDependencyString(final String groupId, final String artifactId, final String version) {
+        final String versionPart = version != null ? ":" + version : "";
+        return "    implementation '" + groupId + ":" + artifactId + versionPart + "'";
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java
similarity index 83%
rename from independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java
index febaba8565c34..6fa2ecf1864c5 100644
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/RemoveMavenExtensionsTest.java
@@ -1,23 +1,29 @@
 package io.quarkus.devtools.commands;
 
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
-import io.quarkus.devtools.project.QuarkusProject;
-import io.quarkus.maven.utilities.MojoUtils;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+
 import org.apache.maven.model.Model;
 
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+import io.quarkus.maven.utilities.MojoUtils;
+
 class RemoveMavenExtensionsTest extends AbstractRemoveExtensionsTest<Model> {
 
     @Override
     protected Model createProject() throws IOException, QuarkusCommandException {
         final File pom = getProjectPath().resolve("pom.xml").toFile();
-        CreateProjectTest.delete(getProjectPath().toFile());
-        new CreateProject(getProjectPath(), getPlatformDescriptor())
+        SnapshotTesting.deleteTestDirectory(getProjectPath().toFile());
+        final QuarkusProject project = getQuarkusProject();
+        new CreateProject(project)
                 .groupId("org.acme")
                 .artifactId("add-maven-extension-test")
                 .version("0.0.1-SNAPSHOT")
@@ -53,6 +59,6 @@ protected long countDependencyOccurrences(final Model project, final String grou
     }
 
     private QuarkusProject getQuarkusProject() {
-        return QuarkusProject.maven(getProjectPath(), getPlatformDescriptor());
+        return QuarkusProjectHelper.getProject(getProjectPath(), BuildTool.MAVEN);
     }
 }
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java
new file mode 100644
index 0000000000000..4f279052fa993
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/commands/handlers/QuarkusCommandHandlersTest.java
@@ -0,0 +1,170 @@
+package io.quarkus.devtools.commands.handlers;
+
+import static io.quarkus.devtools.commands.handlers.QuarkusCommandHandlers.select;
+import static java.util.Arrays.asList;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.devtools.commands.data.SelectionResult;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.json.JsonExtension;
+
+class QuarkusCommandHandlersTest {
+
+    @Test
+    void testMultiMatchByLabels() {
+        JsonExtension e1 = new JsonExtension();
+        e1.setArtifact(new ArtifactCoords("org.acme", "e1", "1.0"));
+        e1.setName("some extension 1");
+        e1.getMetadata().put(Extension.MD_KEYWORDS, Arrays.asList("foo", "bar"));
+        JsonExtension e2 = new JsonExtension();
+        e2.setArtifact(new ArtifactCoords("org.acme", "e2", "1.0"));
+        e2.setName("some extension 2");
+        e2.getMetadata().put(Extension.MD_KEYWORDS, Arrays.asList("foo", "bar", "baz"));
+        JsonExtension e3 = new JsonExtension();
+        e3.setArtifact(new ArtifactCoords("org.acme", "e3", "1.0"));
+        e3.setName("unrelated");
+        e3.getMetadata().put(Extension.MD_KEYWORDS, Arrays.asList("bar"));
+
+        List<Extension> extensions = asList(e1, e2, e3);
+        Collections.shuffle(extensions);
+        SelectionResult matches = select("foo", extensions, true);
+        Assertions.assertFalse(matches.matches());
+        Assertions.assertEquals(2, matches.getExtensions().size());
+
+        matches = select("foo", extensions, false);
+        Assertions.assertFalse(matches.matches());
+        Assertions.assertEquals(0, matches.getExtensions().size());
+    }
+
+    @Test
+    void testThatSingleLabelMatchIsNotAMatch() {
+        JsonExtension e1 = new JsonExtension();
+        e1.setArtifact(new ArtifactCoords("org.acme", "e1", "1.0"));
+        e1.setName("e1");
+        e1.getMetadata().put(Extension.MD_KEYWORDS, Arrays.asList("foo", "bar"));
+        JsonExtension e2 = new JsonExtension();
+        e2.setArtifact(new ArtifactCoords("org.acme", "e2", "1.0"));
+        e2.setName("e2");
+        e2.getMetadata().put(Extension.MD_KEYWORDS, Arrays.asList("bar", "baz"));
+
+        List<Extension> extensions = asList(e1, e2);
+        Collections.shuffle(extensions);
+        SelectionResult matches = select("foo", extensions, true);
+        Assertions.assertFalse(matches.matches());
+        Assertions.assertEquals(1, matches.getExtensions().size());
+    }
+
+    @Test
+    void testMultiMatchByArtifactIdsAndNames() {
+        JsonExtension e1 = new JsonExtension();
+        e1.setArtifact(new ArtifactCoords("org.acme", "e1", "1.0"));
+        e1.setName("foo");
+        e1.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar"));
+        JsonExtension e2 = new JsonExtension();
+        e2.setArtifact(new ArtifactCoords("org.acme", "quarkus-foo", "1.0"));
+        e2.setName("some foo bar");
+        e2.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar", "baz"));
+        JsonExtension e3 = new JsonExtension();
+        e3.setArtifact(new ArtifactCoords("org.acme", "e3", "1.0"));
+        e3.setName("unrelated");
+        e3.getMetadata().put(Extension.MD_KEYWORDS, asList("foo"));
+
+        List<Extension> extensions = asList(e1, e2, e3);
+        Collections.shuffle(extensions);
+        SelectionResult matches = select("foo", extensions, false);
+        Assertions.assertFalse(matches.matches(), " " + matches.getExtensions().size());
+        Assertions.assertEquals(2, matches.getExtensions().size());
+
+        matches = select("foo", extensions, true);
+        Assertions.assertFalse(matches.matches());
+        Assertions.assertEquals(3, matches.getExtensions().size());
+
+    }
+
+    @Test
+    void testShortNameSelection() {
+        JsonExtension e1 = new JsonExtension();
+        e1.setArtifact(new ArtifactCoords("org.acme", "some-complex-seo-unaware-artifactid", "1.0"));
+        e1.setName("some complex seo unaware name");
+        e1.getMetadata().put(Extension.MD_SHORT_NAME, "foo");
+        e1.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar"));
+        JsonExtension e2 = new JsonExtension();
+        e2.setArtifact(new ArtifactCoords("org.acme", "some-foo-bar", "1.0"));
+        e2.setName("some foo bar");
+        e2.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar", "baz"));
+        JsonExtension e3 = new JsonExtension();
+        e3.setArtifact(new ArtifactCoords("org.acme", "unrelated", "1.0"));
+        e3.setName("unrelated");
+        e3.getMetadata().put(Extension.MD_KEYWORDS, asList("foo"));
+
+        List<Extension> extensions = asList(e1, e2, e3);
+        Collections.shuffle(extensions);
+        SelectionResult matches = select("foo", extensions, false);
+        Assertions.assertTrue(matches.matches());
+        Assertions.assertEquals(1, matches.getExtensions().size());
+        Assertions.assertTrue(matches.iterator().hasNext());
+        Assertions
+                .assertTrue(matches.iterator().next().getArtifact().getArtifactId()
+                        .equalsIgnoreCase("some-complex-seo-unaware-artifactid"));
+    }
+
+    @Test
+    void testArtifactIdSelectionWithQuarkusPrefix() {
+        JsonExtension e1 = new JsonExtension();
+        e1.setArtifact(new ArtifactCoords("org.acme", "quarkus-foo", "1.0"));
+        e1.setName("some complex seo unaware name");
+        e1.getMetadata().put(Extension.MD_SHORT_NAME, "foo");
+        e1.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar"));
+        JsonExtension e2 = new JsonExtension();
+        e2.setArtifact(new ArtifactCoords("org.acme", "quarkus-foo-bar", "1.0"));
+        e2.setName("some foo bar");
+        e2.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar", "baz"));
+        JsonExtension e3 = new JsonExtension();
+        e3.setArtifact(new ArtifactCoords("org.acme", "quarkus-unrelated", "1.0"));
+        e3.setName("unrelated");
+        e3.getMetadata().put(Extension.MD_KEYWORDS, asList("foo"));
+
+        List<Extension> extensions = asList(e1, e2, e3);
+        Collections.shuffle(extensions);
+        SelectionResult matches = select("foo", extensions, false);
+        Assertions.assertEquals(1, matches.getExtensions().size());
+        Assertions.assertTrue(matches.iterator().hasNext());
+        Assertions.assertTrue(matches.iterator().next().getArtifact().getArtifactId().equalsIgnoreCase("quarkus-foo"));
+    }
+
+    @Test
+    void testListedVsUnlisted() {
+        JsonExtension e1 = new JsonExtension();
+        e1.setArtifact(new ArtifactCoords("org.acme", "quarkus-foo-unlisted", "1.0"));
+        e1.setName("some complex seo unaware name");
+        e1.getMetadata().put(Extension.MD_SHORT_NAME, "foo");
+        e1.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar"));
+        e1.addMetadata("unlisted", "true");
+
+        JsonExtension e2 = new JsonExtension();
+        e2.setArtifact(new ArtifactCoords("org.acme", "quarkus-foo-bar", "1.0"));
+        e2.setName("some foo bar");
+        e2.getMetadata().put(Extension.MD_KEYWORDS, asList("foo", "bar", "baz"));
+        e2.addMetadata("unlisted", "false");
+        JsonExtension e3 = new JsonExtension();
+        e3.setArtifact(new ArtifactCoords("org.acme", "quarkus-foo-baz", "1.0"));
+        e3.setName("unrelated");
+        e3.getMetadata().put(Extension.MD_KEYWORDS, asList("foo"));
+
+        List<Extension> extensions = asList(e1, e2, e3);
+        Collections.shuffle(extensions);
+        SelectionResult matches = select("quarkus-foo", extensions, true);
+        Assertions.assertEquals(2, matches.getExtensions().size());
+
+        matches = select("quarkus-foo-unlisted", extensions, true);
+        Assertions.assertEquals(1, matches.getExtensions().size());
+
+    }
+}
diff --git a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java
similarity index 91%
rename from independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java
rename to integration-tests/devtools/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java
index c3d57ffc3b799..12fdb6f4fb406 100644
--- a/independent-projects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java
+++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/project/compress/QuarkusProjectCompressTest.java
@@ -6,11 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import io.quarkus.devtools.commands.CreateProject;
-import io.quarkus.devtools.commands.CreateProjectTest;
-import io.quarkus.devtools.commands.PlatformAwareTestBase;
-import io.quarkus.devtools.commands.data.QuarkusCommandException;
-import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -20,15 +15,25 @@
 import java.nio.file.Paths;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.devtools.commands.CreateProject;
+import io.quarkus.devtools.commands.data.QuarkusCommandException;
+import io.quarkus.devtools.commands.data.QuarkusCommandOutcome;
+import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProject;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.testing.SnapshotTesting;
+
 class QuarkusProjectCompressTest extends PlatformAwareTestBase {
 
     @Test
     public void createZip() throws Exception {
         // Given a Quarkus project
         final Path testDir = Paths.get("target/zip");
-        CreateProjectTest.delete(testDir.toFile());
+        SnapshotTesting.deleteTestDirectory(testDir.toFile());
         testDir.toFile().mkdirs();
         Path zip = testDir.resolve("project.zip");
 
@@ -49,7 +54,7 @@ public void createZip() throws Exception {
     public void createZipWithParentFolder() throws Exception {
         // Given a Quarkus project
         final Path testDir = Paths.get("target/zip");
-        CreateProjectTest.delete(testDir.toFile());
+        SnapshotTesting.deleteTestDirectory(testDir.toFile());
         testDir.toFile().mkdirs();
         Path zip = testDir.resolve("project.zip");
 
@@ -80,7 +85,8 @@ private void checkUnzipped(Path projectPath, Path unzipProject) throws IOExcepti
 
     private Path createProject(Path testDir) throws QuarkusCommandException, IOException {
         final Path projectPath = testDir.resolve("project");
-        final QuarkusCommandOutcome result = new CreateProject(projectPath, getPlatformDescriptor())
+        final QuarkusProject project = QuarkusProjectHelper.getProject(projectPath, BuildTool.MAVEN);
+        final QuarkusCommandOutcome result = new CreateProject(project)
                 .groupId("org.acme")
                 .artifactId("basic-rest")
                 .version("1.0.0-SNAPSHOT")
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogProcessorTest.java b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogProcessorTest.java
new file mode 100644
index 0000000000000..74be301684f8f
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogProcessorTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.platform.catalog;
+
+import static io.quarkus.platform.catalog.processor.CatalogProcessor.getProcessedCategoriesInOrder;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.platform.catalog.processor.ProcessedCategory;
+import io.quarkus.registry.catalog.Category;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class CatalogProcessorTest extends PlatformAwareTestBase {
+
+    @Test
+    void testCategoryOrder() {
+        final ExtensionCatalog catalog = getExtensionsCatalog();
+        assertThat(getProcessedCategoriesInOrder(catalog))
+                .map(ProcessedCategory::getCategory)
+                .map(Category::getId)
+                .startsWith("web", "data", "messaging", "core");
+    }
+
+    @Test
+    void testExtensionsOrder() {
+        final ExtensionCatalog catalog = getExtensionsCatalog();
+        assertThat(getProcessedCategoriesInOrder(catalog).get(0).getSortedExtensions())
+                .map(Extension::getArtifact)
+                .map(ArtifactCoords::getArtifactId)
+                .startsWith("quarkus-resteasy", "quarkus-resteasy-jackson",
+                        "quarkus-resteasy-jsonb", "quarkus-vertx-http",
+                        "quarkus-vertx-graphql", "quarkus-hibernate-validator");
+    }
+}
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/ExtensionProcessorTest.java b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/ExtensionProcessorTest.java
new file mode 100644
index 0000000000000..935349d806cb8
--- /dev/null
+++ b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/ExtensionProcessorTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.platform.catalog;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.devtools.PlatformAwareTestBase;
+import io.quarkus.platform.catalog.processor.ExtensionProcessor;
+import io.quarkus.registry.catalog.Extension;
+import io.quarkus.registry.catalog.ExtensionCatalog;
+
+public class ExtensionProcessorTest extends PlatformAwareTestBase {
+
+    @Test
+    void testRESTEasyMetadata() {
+        final ExtensionCatalog catalog = getExtensionsCatalog();
+        final Extension resteasy = findExtension(catalog, "quarkus-resteasy");
+        final ExtensionProcessor extensionProcessor = ExtensionProcessor.of(resteasy);
+
+        assertThat(extensionProcessor.getTags()).contains("provides-example");
+        assertThat(extensionProcessor.getShortName()).contains("jax-rs");
+        assertThat(extensionProcessor.getCategories()).contains("web");
+        assertThat(extensionProcessor.getCodestartKind()).isEqualTo(ExtensionProcessor.CodestartKind.EXAMPLE);
+        assertThat(extensionProcessor.getCodestartName()).isEqualTo("resteasy");
+        assertThat(extensionProcessor.getCodestartArtifact()).isEqualTo("io.quarkus:quarkus-descriptor-json");
+        assertThat(extensionProcessor.getCodestartLanguages()).contains("java", "kotlin", "scala");
+        assertThat(extensionProcessor.getKeywords()).contains("resteasy", "jaxrs", "web", "rest");
+        assertThat(extensionProcessor.getExtendedKeywords()).contains("resteasy", "jaxrs", "web", "rest");
+        assertThat(extensionProcessor.getGuide()).isEqualTo("https://quarkus.io/guides/rest-json");
+    }
+
+    @Test
+    void testKotlinMetadata() {
+        final ExtensionCatalog catalog = getExtensionsCatalog();
+        final Extension kotlin = findExtension(catalog, "quarkus-kotlin");
+        final ExtensionProcessor extensionProcessor = ExtensionProcessor.of(kotlin);
+        assertThat(extensionProcessor.getTags()).contains("preview");
+        assertThat(extensionProcessor.getShortName()).contains("Kotlin");
+        assertThat(extensionProcessor.getCategories()).contains("alt-languages");
+        assertThat(extensionProcessor.getCodestartKind()).isEqualTo(ExtensionProcessor.CodestartKind.CORE);
+        assertThat(extensionProcessor.getCodestartName()).isEqualTo("kotlin");
+        assertThat(extensionProcessor.getCodestartLanguages()).isEmpty();
+        assertThat(extensionProcessor.getCodestartArtifact()).isEqualTo("io.quarkus:quarkus-descriptor-json");
+        assertThat(extensionProcessor.getKeywords()).contains("kotlin");
+        assertThat(extensionProcessor.getExtendedKeywords()).contains("kotlin", "quarkus-kotlin", "services", "write");
+        assertThat(extensionProcessor.getGuide()).isEqualTo("https://quarkus.io/guides/kotlin");
+    }
+
+    private Extension findExtension(ExtensionCatalog catalog, String id) {
+        final Optional<Extension> first = catalog.getExtensions().stream()
+                .filter(e -> e.getArtifact().getArtifactId().equals(id)).findFirst();
+        assertThat(first).isPresent();
+        return first.get();
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateCommandMode/src_main_java_org_acme_HelloCommando.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateCommandMode/src_main_java_org_acme_HelloCommando.java
new file mode 100644
index 0000000000000..1454bd7963fab
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateCommandMode/src_main_java_org_acme_HelloCommando.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class HelloCommando implements QuarkusApplication {
+
+    @Override
+    public int run(String... args) throws Exception {
+        final String name = args.length > 0 ? String.join(" ", args) : "Commando";
+        System.out.println("Hello " + name);
+        return 0;
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateCommandModeCustom/src_main_java_com_test_andy_AndyCommando.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateCommandModeCustom/src_main_java_com_test_andy_AndyCommando.java
new file mode 100644
index 0000000000000..3673964fd569b
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateCommandModeCustom/src_main_java_com_test_andy_AndyCommando.java
@@ -0,0 +1,19 @@
+package com.test.andy;
+
+import javax.enterprise.context.control.ActivateRequestContext;
+import javax.inject.Inject;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class AndyCommando implements QuarkusApplication {
+
+    @Override
+    public int run(String... args) throws Exception {
+        final String name = args.length > 0 ? String.join(" ", args) : "Commando";
+        System.out.println("Hello " + name);
+        return 0;
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/README.md b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/README.md
new file mode 100644
index 0000000000000..4b06ae141ab63
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/README.md
@@ -0,0 +1,47 @@
+# test-codestart project
+
+This project uses Quarkus, the Supersonic Subatomic Java Framework.
+
+If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ .
+
+## Running the application in dev mode
+
+You can run your application in dev mode that enables live coding using:
+```shell script
+mvn compile quarkus:dev
+```
+
+> **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
+
+## Packaging and running the application
+
+The application can be packaged using:
+```shell script
+mvn package
+```
+It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
+Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/quarkus-app/lib/` directory.
+
+If you want to build an _über-jar_, execute the following command:
+```shell script
+mvn package -Dquarkus.package.type=uber-jar
+```
+
+The application is now runnable using `java -jar target/quarkus-app/quarkus-run.jar`.
+
+## Creating a native executable
+
+You can create a native executable using: 
+```shell script
+mvn package -Pnative
+```
+
+Or, if you don't have GraalVM installed, you can run the native executable build in a container using: 
+```shell script
+mvn package -Pnative -Dquarkus.native.container-build=true
+```
+
+You can then execute your native executable with: `./target/test-codestart-1.0.0-codestart-runner`
+
+If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.html.
+
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
new file mode 100644
index 0000000000000..560edef2e7d1a
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.test</groupId>
+  <artifactId>test-codestart</artifactId>
+  <version>1.0.0-codestart</version>
+  <properties>
+    <compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <quarkus-plugin.version>999-MOCK</quarkus-plugin.version>
+    <quarkus.platform.artifact-id>quarkus-mock-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.version>999-MOCK</quarkus.platform.version>
+    <surefire-plugin.version>3.0.0-MOCK</surefire-plugin.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-mock-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <maven.home>${maven.home}</maven.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml
new file mode 100644
index 0000000000000..f26a18ff19293
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleNoWrapperGithubAction/.github_workflows_ci.yml
@@ -0,0 +1,23 @@
+## This is basic continuous integration build for your Quarkus application.
+
+name: Quarkus Codestart CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Build
+          uses: eskatos/gradle-command-action@v1
+          with:
+            arguments: build
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_main_java_org_acme_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_main_java_org_acme_GreetingResource.java
new file mode 100644
index 0000000000000..6adb758a7dc6d
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_main_java_org_acme_GreetingResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello-resteasy")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_native-test_java_org_acme_NativeGreetingResourceIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_native-test_java_org_acme_NativeGreetingResourceIT.java
new file mode 100644
index 0000000000000..043ae18256485
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_native-test_java_org_acme_NativeGreetingResourceIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeGreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_test_java_org_acme_GreetingResourceTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_test_java_org_acme_GreetingResourceTest.java
new file mode 100644
index 0000000000000..ca2efef29c249
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyJava/src_test_java_org_acme_GreetingResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(is("Hello RESTEasy"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt
new file mode 100644
index 0000000000000..e9f434ae958e9
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt
@@ -0,0 +1,14 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/hello-resteasy")
+class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_native-test_kotlin_org_acme_NativeGreetingResourceIT.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_native-test_kotlin_org_acme_NativeGreetingResourceIT.kt
new file mode 100644
index 0000000000000..9a773adc7db0c
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_native-test_kotlin_org_acme_NativeGreetingResourceIT.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeGreetingResourceIT : GreetingResourceTest()
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_test_kotlin_org_acme_GreetingResourceTest.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_test_kotlin_org_acme_GreetingResourceTest.kt
new file mode 100644
index 0000000000000..7a515af98eee9
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyKotlin/src_test_kotlin_org_acme_GreetingResourceTest.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class GreetingResourceTest {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(`is`("Hello RESTEasy"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_main_scala_org_acme_GreetingResource.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_main_scala_org_acme_GreetingResource.scala
new file mode 100644
index 0000000000000..afe92d9014073
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_main_scala_org_acme_GreetingResource.scala
@@ -0,0 +1,12 @@
+package org.acme
+
+import javax.ws.rs.{GET, Path, Produces}
+import javax.ws.rs.core.MediaType
+
+@Path("/hello-resteasy")
+class GreetingResource {
+
+    @GET
+    @Produces(Array[String](MediaType.TEXT_PLAIN))
+    def hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_native-test_scala_org_acme_NativeGreetingResourceIT.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_native-test_scala_org_acme_NativeGreetingResourceIT.scala
new file mode 100644
index 0000000000000..c31493e7be710
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_native-test_scala_org_acme_NativeGreetingResourceIT.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeGreetingResourceIT extends GreetingResourceTest
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_test_scala_org_acme_GreetingResourceTest.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_test_scala_org_acme_GreetingResourceTest.scala
new file mode 100644
index 0000000000000..baafe965d0e08
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleResteasyScala/src_test_scala_org_acme_GreetingResourceTest.scala
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class GreetingResourceTest {
+
+    @Test
+    def testHelloEndpoint() = {
+        given()
+          .`when`().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(`is`("Hello RESTEasy"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyJava/src_main_java_org_acme_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyJava/src_main_java_org_acme_GreetingResource.java
new file mode 100644
index 0000000000000..6adb758a7dc6d
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyJava/src_main_java_org_acme_GreetingResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello-resteasy")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt
new file mode 100644
index 0000000000000..e9f434ae958e9
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt
@@ -0,0 +1,14 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/hello-resteasy")
+class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyScala/src_main_scala_org_acme_GreetingResource.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyScala/src_main_scala_org_acme_GreetingResource.scala
new file mode 100644
index 0000000000000..afe92d9014073
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWithKotlinDslResteasyScala/src_main_scala_org_acme_GreetingResource.scala
@@ -0,0 +1,12 @@
+package org.acme
+
+import javax.ws.rs.{GET, Path, Produces}
+import javax.ws.rs.core.MediaType
+
+@Path("/hello-resteasy")
+class GreetingResource {
+
+    @GET
+    @Produces(Array[String](MediaType.TEXT_PLAIN))
+    def hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml
new file mode 100644
index 0000000000000..522d6dc1151da
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateGradleWrapperGithubAction/.github_workflows_ci.yml
@@ -0,0 +1,21 @@
+## This is basic continuous integration build for your Quarkus application.
+
+name: Quarkus Codestart CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Build
+        run: ./gradlew build
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenConfigYamlJava/src_main_java_org_acme_config_ConfigResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenConfigYamlJava/src_main_java_org_acme_config_ConfigResource.java
new file mode 100644
index 0000000000000..60925f5da57ad
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenConfigYamlJava/src_main_java_org_acme_config_ConfigResource.java
@@ -0,0 +1,41 @@
+package org.acme.config;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.math.BigDecimal;
+import java.util.Optional;
+
+@Path("/config")
+public class ConfigResource {
+
+    @ConfigProperty(name = "constant.speed-of-sound-in-meter-per-second", defaultValue = "343")
+    int speedOfSound;
+
+    @ConfigProperty(name = "display.mach")
+    Optional<Integer> displayMach;
+
+    @ConfigProperty(name = "display.unit.name")
+    String displayUnitName;
+
+    @ConfigProperty(name = "display.unit.factor")
+    BigDecimal displayUnitFactor;
+
+    @GET
+    @Path("supersonic")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String supersonic() {
+        final int mach = displayMach.orElse(1);
+        final BigDecimal speed = BigDecimal.valueOf(speedOfSound)
+            .multiply(displayUnitFactor)
+            .multiply(BigDecimal.valueOf(mach));
+        return String.format("Mach %d is %.3f %s",
+            mach,
+            speed,
+            displayUnitName
+        );
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java
new file mode 100644
index 0000000000000..6adb758a7dc6d
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello-resteasy")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceTest.java
new file mode 100644
index 0000000000000..ca2efef29c249
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(is("Hello RESTEasy"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_NativeGreetingResourceIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_NativeGreetingResourceIT.java
new file mode 100644
index 0000000000000..043ae18256485
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_NativeGreetingResourceIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeGreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_EntryCommand.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_EntryCommand.java
new file mode 100644
index 0000000000000..4447b7610861e
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_EntryCommand.java
@@ -0,0 +1,9 @@
+package org.acme.picocli;
+
+import io.quarkus.picocli.runtime.annotations.TopCommand;
+import picocli.CommandLine;
+
+@TopCommand
+@CommandLine.Command(mixinStandardHelpOptions = true, subcommands = { HelloCommand.class, GoodbyeCommand.class })
+public class EntryCommand {
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_GoodbyeCommand.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_GoodbyeCommand.java
new file mode 100644
index 0000000000000..653ba227a5540
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_GoodbyeCommand.java
@@ -0,0 +1,21 @@
+package org.acme.picocli;
+
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+@Command(name = "goodbye")
+public class GoodbyeCommand implements Runnable {
+
+    @Option(names = {"--name"}, description = "Guest name")
+    String name;
+
+    @Option(names = {"--times", "-t"}, defaultValue = "1", description = "How many time should we say goodbye")
+    int times;
+
+    @Override
+    public void run() {
+        for (int i = 0;i<times;i++) {
+            System.out.printf("Goodbye %s!\n", name);
+        }
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_GreetingService.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_GreetingService.java
new file mode 100644
index 0000000000000..4bf7abeb7aaa4
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_GreetingService.java
@@ -0,0 +1,11 @@
+package org.acme.picocli;
+
+import javax.enterprise.context.Dependent;
+
+@Dependent
+public class GreetingService {
+
+    public void sayHello(String name){
+        System.out.printf("Hello dear %s!\n", name);
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_HelloCommand.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_HelloCommand.java
new file mode 100644
index 0000000000000..79bca01d31dcf
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliJava/src_main_java_org_acme_picocli_HelloCommand.java
@@ -0,0 +1,39 @@
+package org.acme.picocli;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.io.File;
+import java.net.URL;
+
+@Command(name = "hello")
+public class HelloCommand implements Runnable{
+
+    @CommandLine.ArgGroup(exclusive = true, multiplicity = "1")
+    Name name;
+
+    static class Name {
+
+        @CommandLine.Option(names = {"--first-name"}, description = "The guest first name")
+        String firstName;
+
+        @CommandLine.Option(names = {"--nick-name"}, description = "The guest nickname")
+        String nickname;
+
+        String value(){
+            return firstName != null ? firstName : nickname;
+        }
+
+    }
+
+    private final GreetingService greetingService;
+
+    public HelloCommand(GreetingService greetingService) {
+        this.greetingService = greetingService;
+    }
+
+    @Override
+    public void run() {
+        greetingService.sayHello(name.value());
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_EntryCommand.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_EntryCommand.kt
new file mode 100644
index 0000000000000..47a14786f6376
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_EntryCommand.kt
@@ -0,0 +1,8 @@
+package org.acme.picocli
+
+import io.quarkus.picocli.runtime.annotations.TopCommand
+import picocli.CommandLine
+
+@TopCommand
+@CommandLine.Command(mixinStandardHelpOptions = true, subcommands = [HelloCommand::class, GoodbyeCommand::class])
+class EntryCommand 
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_GoodbyeCommand.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_GoodbyeCommand.kt
new file mode 100644
index 0000000000000..5319a8ebb8141
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_GoodbyeCommand.kt
@@ -0,0 +1,17 @@
+package org.acme.picocli
+
+import picocli.CommandLine
+
+@CommandLine.Command(name = "goodbye")
+class GoodbyeCommand : Runnable {
+    @CommandLine.Option(names = ["--name"], description = ["Guest name"])
+    var name: String? = null
+
+    @CommandLine.Option(names = ["--times", "-t"], defaultValue = "1", description = ["How many time should we say goodbye"])
+    var times = 0
+    override fun run() {
+        for (i in 0 until times) {
+            System.out.printf("Goodbye %s!\n", name)
+        }
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_GreetingService.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_GreetingService.kt
new file mode 100644
index 0000000000000..67fb9830532db
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_GreetingService.kt
@@ -0,0 +1,10 @@
+package org.acme.picocli
+
+import javax.enterprise.context.Dependent
+
+@Dependent
+class GreetingService {
+    fun sayHello(name: String?) {
+        System.out.printf("Hello dear %s!\n", name)
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_HelloCommand.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_HelloCommand.kt
new file mode 100644
index 0000000000000..d285c7982e191
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenPicocliKotlin/src_main_kotlin_org_acme_picocli_HelloCommand.kt
@@ -0,0 +1,27 @@
+package org.acme.picocli
+
+import picocli.CommandLine
+import picocli.CommandLine.ArgGroup
+
+@CommandLine.Command(name = "hello")
+class HelloCommand(private val greetingService: GreetingService) : Runnable {
+
+    @ArgGroup(exclusive = true, multiplicity = "1")
+    var name: Name? = null
+
+    class Name {
+        @CommandLine.Option(names = ["--first-name"], description = ["The guest first name"])
+        var firstName: String? = null
+
+        @CommandLine.Option(names = ["--nick-name"], description = ["The guest nickname"])
+        var nickname: String? = null
+
+        fun value(): String {
+            return if (firstName != null) firstName!! else nickname!!
+        }
+    }
+
+    override fun run() {
+        greetingService.sayHello(name!!.value())
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java
new file mode 100644
index 0000000000000..6adb758a7dc6d
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello-resteasy")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_GreetingResourceTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_GreetingResourceTest.java
new file mode 100644
index 0000000000000..ca2efef29c249
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_GreetingResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(is("Hello RESTEasy"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_NativeGreetingResourceIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_NativeGreetingResourceIT.java
new file mode 100644
index 0000000000000..043ae18256485
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyJava/src_test_java_org_acme_NativeGreetingResourceIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeGreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt
new file mode 100644
index 0000000000000..e9f434ae958e9
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_main_kotlin_org_acme_GreetingResource.kt
@@ -0,0 +1,14 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/hello-resteasy")
+class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_test_kotlin_org_acme_GreetingResourceTest.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_test_kotlin_org_acme_GreetingResourceTest.kt
new file mode 100644
index 0000000000000..7a515af98eee9
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_test_kotlin_org_acme_GreetingResourceTest.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class GreetingResourceTest {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(`is`("Hello RESTEasy"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_test_kotlin_org_acme_NativeGreetingResourceIT.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_test_kotlin_org_acme_NativeGreetingResourceIT.kt
new file mode 100644
index 0000000000000..9a773adc7db0c
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyKotlin/src_test_kotlin_org_acme_NativeGreetingResourceIT.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeGreetingResourceIT : GreetingResourceTest()
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_main_scala_org_acme_GreetingResource.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_main_scala_org_acme_GreetingResource.scala
new file mode 100644
index 0000000000000..afe92d9014073
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_main_scala_org_acme_GreetingResource.scala
@@ -0,0 +1,12 @@
+package org.acme
+
+import javax.ws.rs.{GET, Path, Produces}
+import javax.ws.rs.core.MediaType
+
+@Path("/hello-resteasy")
+class GreetingResource {
+
+    @GET
+    @Produces(Array[String](MediaType.TEXT_PLAIN))
+    def hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_test_scala_org_acme_GreetingResourceTest.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_test_scala_org_acme_GreetingResourceTest.scala
new file mode 100644
index 0000000000000..baafe965d0e08
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_test_scala_org_acme_GreetingResourceTest.scala
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class GreetingResourceTest {
+
+    @Test
+    def testHelloEndpoint() = {
+        given()
+          .`when`().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(`is`("Hello RESTEasy"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_test_scala_org_acme_NativeGreetingResourceIT.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_test_scala_org_acme_NativeGreetingResourceIT.scala
new file mode 100644
index 0000000000000..c31493e7be710
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenResteasyScala/src_test_scala_org_acme_NativeGreetingResourceIT.scala
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeGreetingResourceIT extends GreetingResourceTest
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
new file mode 100644
index 0000000000000..bd832231ac1c5
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.test</groupId>
+  <artifactId>test-codestart</artifactId>
+  <version>1.0.0-codestart</version>
+  <properties>
+    <compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <quarkus-plugin.version>999-MOCK</quarkus-plugin.version>
+    <quarkus.platform.artifact-id>quarkus-mock-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.version>999-MOCK</quarkus.platform.version>
+    <surefire-plugin.version>3.0.0-MOCK</surefire-plugin.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-mock-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <maven.home>${maven.home}</maven.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateQute/src_main_java_org_acme_qute_Quark.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateQute/src_main_java_org_acme_qute_Quark.java
new file mode 100644
index 0000000000000..bbd715e5fe810
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateQute/src_main_java_org_acme_qute_Quark.java
@@ -0,0 +1,25 @@
+package org.acme.qute;
+
+public class Quark {
+    public enum Flavor { DOWN, UP, STRANGE, CHARM, BOTTOM, TOP }
+
+    public enum Color {
+        RED("#ff6961"),
+        GREEN("#77dd77"),
+        BLUE("#aec6cf");
+
+        public final String hex;
+
+        Color(String hex) {
+            this.hex = hex;
+        }
+    }
+
+    public final Flavor flavor;
+    public final Color color;
+
+    public Quark(Flavor flavor, Color color) {
+        this.flavor = flavor;
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateQute/src_main_java_org_acme_qute_QuteResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateQute/src_main_java_org_acme_qute_QuteResource.java
new file mode 100644
index 0000000000000..17c0b5b5a40b3
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateQute/src_main_java_org_acme_qute_QuteResource.java
@@ -0,0 +1,55 @@
+package org.acme.qute;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.TemplateInstance;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+@Path("/qute/quarks")
+public class QuteResource {
+
+    private final List<Quark> quarks = Collections.synchronizedList(new ArrayList<>());
+
+    @Inject
+    Template page;
+
+    public QuteResource() {
+        for (int i = 0; i < 3; i++) {
+            this.addQuark();
+        }
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get() {
+        return page.data("quarks", new ArrayList<>(quarks));
+    }
+
+    @POST
+    @Path("add")
+    public void addQuark() {
+        final Random random = new Random();
+        final Quark.Flavor flavor = Quark.Flavor.values()[random.nextInt(Quark.Flavor.values().length)];
+        final Quark.Color color = Quark.Color.values()[random.nextInt(Quark.Color.values().length)];
+        quarks.add(new Quark(flavor, color));
+    }
+
+    /**
+     * This template extension method implements the "position" computed property.
+     */
+    @TemplateExtension
+    static int position(Quark quark) {
+        return new Random().nextInt(100);
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java
new file mode 100644
index 0000000000000..b9958edbb5b23
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java
@@ -0,0 +1,16 @@
+package com.andy;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/bonjour")
+public class BonjourResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_resources_META-INF_resources_index.html b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_resources_META-INF_resources_index.html
new file mode 100644
index 0000000000000..6575420c4a96f
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_main_resources_META-INF_resources_index.html
@@ -0,0 +1,176 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>test-codestart - 1.0.0-codestart</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #0d1c2c;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #71aeef;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+        .example-code {
+            border-left: 0.3rem solid #71aeef;
+            padding-left: 10px;
+        }
+
+        .example-code h3 {
+            font-weight: 200;
+        }
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus cloud application.</p>
+
+        <h2>What is this page?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What are your next steps?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>./mvnw compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.</li>
+            <li>Quarkus now ships with a <a href="/q/dev/">Dev UI</a> (available in dev mode only)</li>
+            <li>Play with the getting started example code located in <code>src/main/java</code>:</li>
+        </ul>
+                <div class="example-code">
+            <h3>RESTEasy JAX-RS example</h3>
+            <p>REST is easy peasy with this Hello World RESTEasy resource.</p>
+            <p><code>@Path: <a href="/bonjour" class="path-link" target="_blank">/bonjour</a></code></p>
+            <p><a href="https://quarkus.io/guides/getting-started#the-jax-rs-resources" class="guide-link" target="_blank">Related guide section...</a></p>
+        </div>
+
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: <code>org.test</code></li>
+                <li>ArtifactId: <code>test-codestart</code></li>
+                <li>Version: <code>1.0.0-codestart</code></li>
+                <li>Quarkus Version: <code>999-MOCK</code></li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Do you like Quarkus?</h3>
+            <ul>
+                <li>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Selected extensions guides</h3>
+            <ul>
+                <li title="REST endpoint framework implementing JAX-RS and more"><a href="https://quarkus.io/guides/rest-json" target="_blank">RESTEasy JAX-RS guide</a></li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>More reading</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
+                <li><a href="https://quarkus.io/guides/" target="_blank">All guides</a></li>
+                <li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_NativeBonjourResourceIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_NativeBonjourResourceIT.java
new file mode 100644
index 0000000000000..47d1a0ead6f1e
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyJavaCustom/src_test_java_com_andy_NativeBonjourResourceIT.java
@@ -0,0 +1,9 @@
+package com.andy;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeBonjourResourceIT extends BonjourResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt
new file mode 100644
index 0000000000000..8ec4180e042ff
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt
@@ -0,0 +1,14 @@
+package com.andy
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/bonjour")
+class BonjourResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_BonjourResourceTest.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_BonjourResourceTest.kt
new file mode 100644
index 0000000000000..a49751803fb08
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_BonjourResourceTest.kt
@@ -0,0 +1,20 @@
+package com.andy
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class BonjourResourceTest {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("/bonjour")
+          .then()
+             .statusCode(200)
+             .body(`is`("Hello RESTEasy"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_NativeBonjourResourceIT.kt b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_NativeBonjourResourceIT.kt
new file mode 100644
index 0000000000000..326e8c8ae1fca
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyKotlinCustom/src_test_kotlin_com_andy_NativeBonjourResourceIT.kt
@@ -0,0 +1,6 @@
+package com.andy
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeBonjourResourceIT : BonjourResourceTest()
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyQute/src_main_java_org_acme_resteasyqute_Quark.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyQute/src_main_java_org_acme_resteasyqute_Quark.java
new file mode 100644
index 0000000000000..7c54bb8ad80fe
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyQute/src_main_java_org_acme_resteasyqute_Quark.java
@@ -0,0 +1,25 @@
+package org.acme.resteasyqute;
+
+public class Quark {
+    public enum Flavor { DOWN, UP, STRANGE, CHARM, BOTTOM, TOP }
+
+    public enum Color {
+        RED("#ff6961"),
+        GREEN("#77dd77"),
+        BLUE("#aec6cf");
+
+        public final String hex;
+
+        Color(String hex) {
+            this.hex = hex;
+        }
+    }
+
+    public final Flavor flavor;
+    public final Color color;
+
+    public Quark(Flavor flavor, Color color) {
+        this.flavor = flavor;
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyQute/src_main_java_org_acme_resteasyqute_QuteResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyQute/src_main_java_org_acme_resteasyqute_QuteResource.java
new file mode 100644
index 0000000000000..91dec46ab26b6
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyQute/src_main_java_org_acme_resteasyqute_QuteResource.java
@@ -0,0 +1,55 @@
+package org.acme.resteasyqute;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.TemplateInstance;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+@Path("/qute/quarks")
+public class QuteResource {
+
+    private final List<Quark> quarks = Collections.synchronizedList(new ArrayList<>());
+
+    @Inject
+    Template page;
+
+    public QuteResource() {
+        for (int i = 0; i < 3; i++) {
+            this.addQuark();
+        }
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get() {
+        return page.data("quarks", new ArrayList<>(quarks));
+    }
+
+    @POST
+    @Path("add")
+    public void addQuark() {
+        final Random random = new Random();
+        final Quark.Flavor flavor = Quark.Flavor.values()[random.nextInt(Quark.Flavor.values().length)];
+        final Quark.Color color = Quark.Color.values()[random.nextInt(Quark.Color.values().length)];
+        quarks.add(new Quark(flavor, color));
+    }
+
+    /**
+     * This template extension method implements the "position" computed property.
+     */
+    @TemplateExtension
+    static int position(Quark quark) {
+        return new Random().nextInt(100);
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala
new file mode 100644
index 0000000000000..57cdbdd8c7829
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala
@@ -0,0 +1,12 @@
+package com.andy
+
+import javax.ws.rs.{GET, Path, Produces}
+import javax.ws.rs.core.MediaType
+
+@Path("/bonjour")
+class BonjourResource {
+
+    @GET
+    @Produces(Array[String](MediaType.TEXT_PLAIN))
+    def hello() = "Hello RESTEasy"
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_BonjourResourceTest.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_BonjourResourceTest.scala
new file mode 100644
index 0000000000000..2e48aca2e4beb
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_BonjourResourceTest.scala
@@ -0,0 +1,20 @@
+package com.andy
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class BonjourResourceTest {
+
+    @Test
+    def testHelloEndpoint() = {
+        given()
+          .`when`().get("/bonjour")
+          .then()
+             .statusCode(200)
+             .body(`is`("Hello RESTEasy"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_NativeBonjourResourceIT.scala b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_NativeBonjourResourceIT.scala
new file mode 100644
index 0000000000000..a781956bfd06c
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasyScalaCustom/src_test_scala_com_andy_NativeBonjourResourceIT.scala
@@ -0,0 +1,6 @@
+package com.andy
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeBonjourResourceIT extends BonjourResourceTest
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_java_org_acme_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_java_org_acme_GreetingResource.java
new file mode 100644
index 0000000000000..6adb758a7dc6d
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_java_org_acme_GreetingResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello-resteasy")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_java_org_acme_SpringGreetingController.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_java_org_acme_SpringGreetingController.java
new file mode 100644
index 0000000000000..c28f85ded5343
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_java_org_acme_SpringGreetingController.java
@@ -0,0 +1,15 @@
+package org.acme;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/hello-spring")
+public class SpringGreetingController {
+
+    @GetMapping
+    public String hello() {
+        return "Hello Spring";
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_resources_META-INF_resources_index.html b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_resources_META-INF_resources_index.html
new file mode 100644
index 0000000000000..1a845be55557d
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_main_resources_META-INF_resources_index.html
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>test-codestart - 1.0.0-codestart</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #0d1c2c;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #71aeef;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+        .example-code {
+            border-left: 0.3rem solid #71aeef;
+            padding-left: 10px;
+        }
+
+        .example-code h3 {
+            font-weight: 200;
+        }
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus cloud application.</p>
+
+        <h2>What is this page?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What are your next steps?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>./mvnw compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.</li>
+            <li>Quarkus now ships with a <a href="/q/dev/">Dev UI</a> (available in dev mode only)</li>
+            <li>Play with the getting started example code located in <code>src/main/java</code>:</li>
+        </ul>
+                <div class="example-code">
+            <h3>RESTEasy JAX-RS example</h3>
+            <p>REST is easy peasy with this Hello World RESTEasy resource.</p>
+            <p><code>@Path: <a href="/hello-resteasy" class="path-link" target="_blank">/hello-resteasy</a></code></p>
+            <p><a href="https://quarkus.io/guides/getting-started#the-jax-rs-resources" class="guide-link" target="_blank">Related guide section...</a></p>
+        </div>
+        <div class="example-code">
+            <h3>Spring Web example</h3>
+            <p>Spring, the Quarkus way! A Hello World Spring Web Controller.</p>
+            <p><code>@Path: <a href="/hello-spring" class="path-link" target="_blank">/hello-spring</a></code></p>
+            <p><a href="https://quarkus.io/guides/spring-web#greetingcontroller" class="guide-link" target="_blank">Related guide section...</a></p>
+        </div>
+
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: <code>org.test</code></li>
+                <li>ArtifactId: <code>test-codestart</code></li>
+                <li>Version: <code>1.0.0-codestart</code></li>
+                <li>Quarkus Version: <code>999-MOCK</code></li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Do you like Quarkus?</h3>
+            <ul>
+                <li>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Selected extensions guides</h3>
+            <ul>
+                <li title="REST endpoint framework implementing JAX-RS and more"><a href="https://quarkus.io/guides/rest-json" target="_blank">RESTEasy JAX-RS guide</a></li>
+                <li title="Use Spring Web annotations to create your REST services"><a href="https://quarkus.io/guides/spring-web" target="_blank">Quarkus Extension for Spring Web API guide</a></li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>More reading</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
+                <li><a href="https://quarkus.io/guides/" target="_blank">All guides</a></li>
+                <li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_GreetingResourceTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_GreetingResourceTest.java
new file mode 100644
index 0000000000000..ca2efef29c249
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_GreetingResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(is("Hello RESTEasy"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_NativeGreetingResourceIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_NativeGreetingResourceIT.java
new file mode 100644
index 0000000000000..043ae18256485
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_NativeGreetingResourceIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeGreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_NativeSpringGreetingControllerIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_NativeSpringGreetingControllerIT.java
new file mode 100644
index 0000000000000..38428ce8f7200
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_NativeSpringGreetingControllerIT.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeSpringGreetingControllerIT extends SpringGreetingControllerTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_SpringGreetingControllerTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_SpringGreetingControllerTest.java
new file mode 100644
index 0000000000000..bb0b3d27feb88
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateRESTEasySpringWeb/src_test_java_org_acme_SpringGreetingControllerTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class SpringGreetingControllerTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello-spring")
+          .then()
+             .statusCode(200)
+             .body(is("Hello Spring"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_GreetingResource.java
new file mode 100644
index 0000000000000..accf61bcb44ed
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_GreetingResource.java
@@ -0,0 +1,16 @@
+package my.custom.app;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello-resteasy")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello RESTEasy";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_funqy_Funqy.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_funqy_Funqy.java
new file mode 100644
index 0000000000000..aa229c8105b7c
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_funqy_Funqy.java
@@ -0,0 +1,19 @@
+package my.custom.app.funqy;
+
+import io.quarkus.funqy.Funq;
+
+import java.util.Random;
+
+public class Funqy {
+
+    private static final String CHARM_QUARK_SYMBOL = "c";
+
+    @Funq
+    public String charm(Answer answer) {
+        return CHARM_QUARK_SYMBOL.equalsIgnoreCase(answer.value) ? "You Quark!" : "👻 Wrong answer";
+    }
+
+    public static class Answer {
+        public String value;
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_qute_Quark.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_qute_Quark.java
new file mode 100644
index 0000000000000..a1f180edbd3d5
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_qute_Quark.java
@@ -0,0 +1,25 @@
+package my.custom.app.qute;
+
+public class Quark {
+    public enum Flavor { DOWN, UP, STRANGE, CHARM, BOTTOM, TOP }
+
+    public enum Color {
+        RED("#ff6961"),
+        GREEN("#77dd77"),
+        BLUE("#aec6cf");
+
+        public final String hex;
+
+        Color(String hex) {
+            this.hex = hex;
+        }
+    }
+
+    public final Flavor flavor;
+    public final Color color;
+
+    public Quark(Flavor flavor, Color color) {
+        this.flavor = flavor;
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_qute_QuteResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_qute_QuteResource.java
new file mode 100644
index 0000000000000..2ab3f23f36948
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_qute_QuteResource.java
@@ -0,0 +1,55 @@
+package my.custom.app.qute;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.TemplateInstance;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+@Path("/qute/quarks")
+public class QuteResource {
+
+    private final List<Quark> quarks = Collections.synchronizedList(new ArrayList<>());
+
+    @Inject
+    Template page;
+
+    public QuteResource() {
+        for (int i = 0; i < 3; i++) {
+            this.addQuark();
+        }
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get() {
+        return page.data("quarks", new ArrayList<>(quarks));
+    }
+
+    @POST
+    @Path("add")
+    public void addQuark() {
+        final Random random = new Random();
+        final Quark.Flavor flavor = Quark.Flavor.values()[random.nextInt(Quark.Flavor.values().length)];
+        final Quark.Color color = Quark.Color.values()[random.nextInt(Quark.Color.values().length)];
+        quarks.add(new Quark(flavor, color));
+    }
+
+    /**
+     * This template extension method implements the "position" computed property.
+     */
+    @TemplateExtension
+    static int position(Quark quark) {
+        return new Random().nextInt(100);
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_resteasyqute_Quark.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_resteasyqute_Quark.java
new file mode 100644
index 0000000000000..b159293e074ee
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_resteasyqute_Quark.java
@@ -0,0 +1,25 @@
+package my.custom.app.resteasyqute;
+
+public class Quark {
+    public enum Flavor { DOWN, UP, STRANGE, CHARM, BOTTOM, TOP }
+
+    public enum Color {
+        RED("#ff6961"),
+        GREEN("#77dd77"),
+        BLUE("#aec6cf");
+
+        public final String hex;
+
+        Color(String hex) {
+            this.hex = hex;
+        }
+    }
+
+    public final Flavor flavor;
+    public final Color color;
+
+    public Quark(Flavor flavor, Color color) {
+        this.flavor = flavor;
+        this.color = color;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_resteasyqute_QuteResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_resteasyqute_QuteResource.java
new file mode 100644
index 0000000000000..c5c2baf606956
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_main_java_my_custom_app_resteasyqute_QuteResource.java
@@ -0,0 +1,55 @@
+package my.custom.app.resteasyqute;
+
+import io.quarkus.qute.Template;
+import io.quarkus.qute.TemplateExtension;
+import io.quarkus.qute.TemplateInstance;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+@Path("/qute/quarks")
+public class QuteResource {
+
+    private final List<Quark> quarks = Collections.synchronizedList(new ArrayList<>());
+
+    @Inject
+    Template page;
+
+    public QuteResource() {
+        for (int i = 0; i < 3; i++) {
+            this.addQuark();
+        }
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get() {
+        return page.data("quarks", new ArrayList<>(quarks));
+    }
+
+    @POST
+    @Path("add")
+    public void addQuark() {
+        final Random random = new Random();
+        final Quark.Flavor flavor = Quark.Flavor.values()[random.nextInt(Quark.Flavor.values().length)];
+        final Quark.Color color = Quark.Color.values()[random.nextInt(Quark.Color.values().length)];
+        quarks.add(new Quark(flavor, color));
+    }
+
+    /**
+     * This template extension method implements the "position" computed property.
+     */
+    @TemplateExtension
+    static int position(Quark quark) {
+        return new Random().nextInt(100);
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_GreetingResourceTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_GreetingResourceTest.java
new file mode 100644
index 0000000000000..f248d0a6a953f
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_GreetingResourceTest.java
@@ -0,0 +1,21 @@
+package my.custom.app;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello-resteasy")
+          .then()
+             .statusCode(200)
+             .body(is("Hello RESTEasy"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_NativeGreetingResourceIT.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_NativeGreetingResourceIT.java
new file mode 100644
index 0000000000000..c6d392dff6654
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_NativeGreetingResourceIT.java
@@ -0,0 +1,9 @@
+package my.custom.app;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeGreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_funqy_FunqyTest.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_funqy_FunqyTest.java
new file mode 100644
index 0000000000000..ca3531786ccce
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateWithCustomPackage/src_test_java_my_custom_app_funqy_FunqyTest.java
@@ -0,0 +1,23 @@
+package my.custom.app.funqy;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+@QuarkusTest
+public class FunqyTest {
+
+    @Test
+    public void testCharm() {
+        given()
+                .contentType("application/json")
+                .body("{\"value\": \"c\"}")
+                .post("/charm")
+                .then()
+                .statusCode(200)
+                .body(containsString("You Quark!"));
+    }
+
+}
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
new file mode 100644
index 0000000000000..fd85ce0e03979
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
@@ -0,0 +1,43 @@
+/
+runtime/
+runtime/pom.xml
+runtime/src/
+runtime/src/main/
+runtime/src/main/resources/
+runtime/src/main/resources/META-INF/
+runtime/src/main/resources/META-INF/quarkus-extension.yaml
+integration-tests/
+integration-tests/pom.xml
+integration-tests/src/
+integration-tests/src/test/
+integration-tests/src/test/java/
+integration-tests/src/test/java/org/
+integration-tests/src/test/java/org/extension/
+integration-tests/src/test/java/org/extension/it/
+integration-tests/src/test/java/org/extension/it/MyExtensionResourceTest.java
+integration-tests/src/test/java/org/extension/it/NativeMyExtensionResourceIT.java
+integration-tests/src/main/
+integration-tests/src/main/resources/
+integration-tests/src/main/resources/application.properties
+integration-tests/src/main/java/
+integration-tests/src/main/java/org/
+integration-tests/src/main/java/org/extension/
+integration-tests/src/main/java/org/extension/it/
+integration-tests/src/main/java/org/extension/it/MyExtensionResource.java
+pom.xml
+deployment/
+deployment/pom.xml
+deployment/src/
+deployment/src/test/
+deployment/src/test/java/
+deployment/src/test/java/org/
+deployment/src/test/java/org/extension/
+deployment/src/test/java/org/extension/test/
+deployment/src/test/java/org/extension/test/MyExtensionDevModeTest.java
+deployment/src/test/java/org/extension/test/MyExtensionTest.java
+deployment/src/main/
+deployment/src/main/java/
+deployment/src/main/java/org/
+deployment/src/main/java/org/extension/
+deployment/src/main/java/org/extension/deployment/
+deployment/src/main/java/org/extension/deployment/MyExtensionProcessor.java
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusExtensionCodestartGenerationTest/generateProjectWithoutTests/dir-tree.snapshot b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusExtensionCodestartGenerationTest/generateProjectWithoutTests/dir-tree.snapshot
new file mode 100644
index 0000000000000..3ef3d8480ef25
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusExtensionCodestartGenerationTest/generateProjectWithoutTests/dir-tree.snapshot
@@ -0,0 +1,18 @@
+/
+runtime/
+runtime/pom.xml
+runtime/src/
+runtime/src/main/
+runtime/src/main/resources/
+runtime/src/main/resources/META-INF/
+runtime/src/main/resources/META-INF/quarkus-extension.yaml
+pom.xml
+deployment/
+deployment/pom.xml
+deployment/src/
+deployment/src/main/
+deployment/src/main/java/
+deployment/src/main/java/org/
+deployment/src/main/java/org/extension/
+deployment/src/main/java/org/extension/deployment/
+deployment/src/main/java/org/extension/deployment/MyExtensionProcessor.java
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
new file mode 100644
index 0000000000000..cf707de304aeb
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
@@ -0,0 +1,7 @@
+/
+README.md
+jbang
+.gitignore
+jbang.cmd
+src/
+src/GreetingResource.java
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_GreetingResource.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_GreetingResource.java
new file mode 100644
index 0000000000000..ac7ffd9f86f91
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generateDefaultProject/src_GreetingResource.java
@@ -0,0 +1,24 @@
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS io.quarkus:quarkus-bom:999-MOCK@pom
+//DEPS io.quarkus:quarkus-resteasy
+
+//JAVAC_OPTIONS -parameters
+
+import io.quarkus.runtime.Quarkus;
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/hello-resteasy")
+@ApplicationScoped
+public class GreetingResource {
+
+    @GET
+    public String sayHello() {
+        return "Hello RESTEasy";
+    }
+
+    public static void main(String[] args) {
+        Quarkus.run(args);
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/dir-tree.snapshot b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/dir-tree.snapshot
new file mode 100644
index 0000000000000..053588afead31
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/dir-tree.snapshot
@@ -0,0 +1,7 @@
+/
+README.md
+jbang
+.gitignore
+jbang.cmd
+src/
+src/GreetingCommand.java
\ No newline at end of file
diff --git a/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/src_GreetingCommand.java b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/src_GreetingCommand.java
new file mode 100644
index 0000000000000..a4f62e6ea3fb0
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/__snapshots__/QuarkusJBangCodestartGenerationTest/generatePicocliProject/src_GreetingCommand.java
@@ -0,0 +1,31 @@
+//usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS io.quarkus:quarkus-bom:999-MOCK@pom
+//DEPS io.quarkus:quarkus-picocli
+
+//JAVAC_OPTIONS -parameters
+//
+import io.quarkus.picocli.runtime.annotations.TopCommand;
+import picocli.CommandLine;
+
+@TopCommand
+@CommandLine.Command(mixinStandardHelpOptions = true, subcommands = {HelloCommand.class, GoodByeCommand.class})
+public class GreetingCommand {
+}
+
+@CommandLine.Command(name = "hello", description = "Greet World!")
+class HelloCommand implements Runnable {
+
+    @Override
+    public void run() {
+        System.out.println("Hello World!");
+    }
+}
+
+@CommandLine.Command(name = "goodbye", description = "Say goodbye to World!")
+class GoodByeCommand implements Runnable {
+
+    @Override
+    public void run() {
+        System.out.println("Goodbye World!");
+    }
+}
diff --git a/integration-tests/devtools/src/test/resources/platform-metadata.json b/integration-tests/devtools/src/test/resources/platform-metadata.json
new file mode 100644
index 0000000000000..49c0eb3f4dc3a
--- /dev/null
+++ b/integration-tests/devtools/src/test/resources/platform-metadata.json
@@ -0,0 +1,52 @@
+{
+  "maven" :  {
+    "repositories" : [
+      {
+        "id": "redhat",
+        "url": "https://maven.repository.redhat.com",
+        "releases-enabled": "true",
+        "snapshots-enabled": "false"
+      }
+    ],
+    "plugin-repositories" : [
+      {
+        "id": "redhat",
+        "url": "https://maven.repository.redhat.com",
+        "releases-enabled": "true",
+        "snapshots-enabled": "false"
+      }
+    ]
+  },
+  "gradle" :  {
+    "repositories" : [
+      {
+        "id": "redhat",
+        "url": "https://maven.repository.redhat.com"
+      }
+    ]
+  },
+     "project": {
+      "properties": {
+        "doc-root": "https://quarkus.io",
+        "rest-assured-version": "${rest-assured.version}",
+        "compiler-plugin-version": "${compiler-plugin.version}",
+        "surefire-plugin-version": "${version.surefire.plugin}",
+        "kotlin-version": "${kotlin.version}",
+        "scala-version": "${scala.version}",
+        "scala-plugin-version": "${scala-plugin.version}",
+        "quarkus-core-version": "${project.version}",
+        "maven-plugin-groupId": "${project.groupId}",
+        "maven-plugin-artifactId": "quarkus-maven-plugin",
+        "maven-plugin-version": "${project.version}",
+        "gradle-plugin-id": "io.quarkus",
+        "gradle-plugin-version": "${project.version}",
+        "supported-maven-versions": "${supported-maven-versions}",
+        "proposed-maven-version": "${proposed-maven-version}",
+        "maven-wrapper-version": "${maven-wrapper.version}",
+        "gradle-wrapper-version": "${gradle-wrapper.version}"
+      }
+    },
+    "codestarts-artifacts": [
+      "${project.groupId}:quarkus-platform-descriptor-json::jar:${project.version}"
+    ]
+}
\ No newline at end of file
diff --git a/integration-tests/disable-native-profile b/integration-tests/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml
index 5b38225180a5a..050b29a192539 100644
--- a/integration-tests/elasticsearch-rest-client/pom.xml
+++ b/integration-tests/elasticsearch-rest-client/pom.xml
@@ -7,7 +7,6 @@
     <artifactId>quarkus-integration-tests-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>quarkus-integration-test-elasticsearch-rest-client</artifactId>
@@ -38,9 +37,56 @@
       <artifactId>rest-assured</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-elasticsearch-rest-client-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-health-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
@@ -74,7 +120,7 @@
       <id>test-elasticsearch</id>
       <activation>
         <property>
-          <name>test-elasticsearch</name>
+          <name>test-containers</name>
         </property>
       </activation>
       <build>
@@ -91,25 +137,67 @@
               <skip>false</skip>
             </configuration>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>docker-elasticsearch</id>
+      <activation>
+        <property>
+          <name>start-containers</name>
+        </property>
+      </activation>
+      <properties>
+        <elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
+        <elasticsearch.protocol>http</elasticsearch.protocol>
+      </properties>
+      <build>
+        <plugins>
           <plugin>
-            <groupId>com.github.alexcojocaru</groupId>
-            <artifactId>elasticsearch-maven-plugin</artifactId>
+            <groupId>io.fabric8</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
             <configuration>
-              <timeout>90</timeout>
-              <pathConf>${project.build.directory}/test-classes/elasticsearch-maven-plugin/configuration/</pathConf>
-              <autoCreateIndex>true</autoCreateIndex>
+              <images>
+                <image>
+                  <name>${elasticsearch.image}</name>
+                  <alias>elasticsearch</alias>
+                  <run>
+                    <env>
+                      <discovery.type>single-node</discovery.type>
+                    </env>
+                    <ports>
+                      <port>9200:9200</port>
+                    </ports>
+                    <log>
+                      <prefix>Elasticsearch: </prefix>
+                      <date>default</date>
+                      <color>cyan</color>
+                    </log>
+                    <wait>
+                      <http>
+                        <url>http://localhost:9200</url>
+                        <method>GET</method>
+                        <status>200</status>
+                      </http>
+                      <time>20000</time>
+                    </wait>
+                  </run>
+                </image>
+              </images>
+              <allContainers>true</allContainers>
             </configuration>
-            <!-- Different executions from 2.x: the "start" goal has been renamed in version 5  -->
             <executions>
               <execution>
-                <id>start-elasticsearch</id>
+                <id>docker-start</id>
                 <phase>process-test-classes</phase>
                 <goals>
-                  <goal>runforked</goal>
+                  <goal>stop</goal>
+                  <goal>start</goal>
                 </goals>
               </execution>
               <execution>
-                <id>stop-elasticsearch</id>
+                <id>docker-stop</id>
                 <phase>post-integration-test</phase>
                 <goals>
                   <goal>stop</goal>
@@ -117,39 +205,25 @@
               </execution>
             </executions>
           </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>native</id>
-      <activation>
-        <property>
-          <name>native</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
           <plugin>
-            <artifactId>maven-failsafe-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
             <executions>
               <execution>
+                <id>docker-prune</id>
+                <phase>generate-resources</phase>
                 <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
+                  <goal>exec</goal>
                 </goals>
                 <configuration>
-                  <systemProperties>
-                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                  </systemProperties>
+                  <executable>${docker-prune.location}</executable>
                 </configuration>
               </execution>
             </executions>
           </plugin>
         </plugins>
       </build>
-      <properties>
-        <quarkus.package.type>native</quarkus.package.type>
-      </properties>
     </profile>
+
   </profiles>
 </project>
diff --git a/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java b/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java
index 42be689abe124..268f7a1ca07af 100644
--- a/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java
+++ b/integration-tests/elasticsearch-rest-client/src/main/java/io/quarkus/it/elasticsearch/FruitResource.java
@@ -7,19 +7,14 @@
 
 import javax.inject.Inject;
 import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
     @Inject
     FruitService fruitService;
diff --git a/integration-tests/elasticsearch-rest-client/src/main/resources/application.properties b/integration-tests/elasticsearch-rest-client/src/main/resources/application.properties
index 8395e78244c4d..4f57810e65b8e 100644
--- a/integration-tests/elasticsearch-rest-client/src/main/resources/application.properties
+++ b/integration-tests/elasticsearch-rest-client/src/main/resources/application.properties
@@ -1,4 +1,5 @@
-quarkus.elasticsearch.hosts=localhost:9200
+quarkus.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.elasticsearch.protocol=${elasticsearch.protocol:http}
 quarkus.elasticsearch.socket-timeout=10S
 quarkus.elasticsearch.discovery.enabled=true
 quarkus.elasticsearch.discovery.refresh-interval=1M
\ No newline at end of file
diff --git a/integration-tests/elasticsearch-rest-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java b/integration-tests/elasticsearch-rest-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java
index 6ebed60a37fa9..b0413434b2600 100644
--- a/integration-tests/elasticsearch-rest-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java
+++ b/integration-tests/elasticsearch-rest-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java
@@ -60,7 +60,7 @@ public void testEndpoint() throws InterruptedException {
 
     @Test
     public void testHealth() {
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
                         "checks.name", containsInAnyOrder("Elasticsearch cluster health check"));
diff --git a/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml b/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml
deleted file mode 100644
index e15abadf05b9d..0000000000000
--- a/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# ======================== Elasticsearch Configuration =========================
-#
-# NOTE: Elasticsearch comes with reasonable defaults for most settings.
-#       Before you set out to tweak and tune the configuration, make sure you
-#       understand what are you trying to accomplish and the consequences.
-#
-# The primary way of configuring a node is via this file. This template lists
-# the most important settings you may want to configure for a production cluster.
-#
-# Please consult the documentation for further information on configuration options:
-# https://www.elastic.co/guide/en/elasticsearch/reference/index.html
-#
-# ---------------------------------- Cluster -----------------------------------
-#
-# Use a descriptive name for your cluster:
-#
-#cluster.name: my-application
-#
-# ------------------------------------ Node ------------------------------------
-#
-# Use a descriptive name for the node:
-#
-#node.name: node-1
-#
-# Add custom attributes to the node:
-#
-#node.attr.rack: r1
-#
-# ----------------------------------- Paths ------------------------------------
-#
-# Path to directory where to store the data (separate multiple locations by comma):
-#
-#path.data: /path/to/data
-#
-# Path to log files:
-#
-#path.logs: /path/to/logs
-#
-# ----------------------------------- Memory -----------------------------------
-#
-# Lock the memory on startup:
-#
-bootstrap.memory_lock: true
-#
-# Make sure that the heap size is set to about half the memory available
-# on the system and that the owner of the process is allowed to use this
-# limit.
-#
-# Elasticsearch performs poorly when the system is swapping the memory.
-#
-# ---------------------------------- Network -----------------------------------
-#
-# Set the bind address to a specific IP (IPv4 or IPv6):
-#
-network.host: _local_
-#
-# Set a custom port for HTTP:
-#
-http.port: 9200
-#
-# For more information, consult the network module documentation.
-#
-# --------------------------------- Discovery ----------------------------------
-#
-# Pass an initial list of hosts to perform discovery when this node is started:
-# The default list of hosts is ["127.0.0.1", "[::1]"]
-#
-#discovery.seed_hosts: ["host1", "host2"]
-#
-# Bootstrap the cluster using an initial set of master-eligible nodes:
-#
-#cluster.initial_master_nodes: ["node-1", "node-2"]
-#
-# For more information, consult the discovery and cluster formation module documentation.
-#
-# ---------------------------------- Gateway -----------------------------------
-#
-# Block initial recovery after a full cluster restart until N nodes are started:
-#
-#gateway.recover_after_nodes: 3
-#
-# For more information, consult the gateway module documentation.
-#
-# ---------------------------------- Various -----------------------------------
-#
-# Require explicit names when deleting indices:
-#
-#action.destructive_requires_name: true
-#
-# Disable starting multiple nodes on a single system:
-#
-node.max_local_storage_nodes: 1
diff --git a/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options b/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options
deleted file mode 100644
index 91f3f0ee7dd56..0000000000000
--- a/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options
+++ /dev/null
@@ -1,125 +0,0 @@
-## JVM configuration
-
-################################################################
-## IMPORTANT: JVM heap size
-################################################################
-##
-## You should always set the min and max JVM heap
-## size to the same value. For example, to set
-## the heap to 4 GB, set:
-##
-## -Xms4g
-## -Xmx4g
-##
-## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
-## for more information
-##
-################################################################
-
-# Xms represents the initial size of total heap space
-# Xmx represents the maximum size of total heap space
-
-# For Hibernate Search, we don't need as much as the default 2g
-# Let's keep it low, so that we'll be able to run tests
-# on memory-constrained CI slaves
--Xms256m
--Xmx256m
-
-################################################################
-## Expert settings
-################################################################
-##
-## All settings below this section are considered
-## expert settings. Don't tamper with them unless
-## you understand what you are doing
-##
-################################################################
-
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
-## G1GC Configuration
-# NOTE: G1GC is only supported on JDK version 10 or later.
-# To use G1GC uncomment the lines below.
-# 10-:-XX:-UseConcMarkSweepGC
-# 10-:-XX:-UseCMSInitiatingOccupancyOnly
-# 10-:-XX:+UseG1GC
-# 10-:-XX:InitiatingHeapOccupancyPercent=75
-
-## DNS cache policy
-# cache ttl in seconds for positive DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.ttl; set to -1 to cache forever
--Des.networkaddress.cache.ttl=60
-# cache ttl in seconds for negative DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.negative ttl; set to -1 to cache
-# forever
--Des.networkaddress.cache.negative.ttl=10
-
-## optimizations
-
-# pre-touch memory pages used by the JVM during initialization
--XX:+AlwaysPreTouch
-
-## basic
-
-# explicitly set the stack size
--Xss1m
-
-# set to headless, just in case
--Djava.awt.headless=true
-
-# ensure UTF-8 encoding by default (e.g. filenames)
--Dfile.encoding=UTF-8
-
-# use our provided JNA always versus the system one
--Djna.nosys=true
-
-# turn off a JDK optimization that throws away stack traces for common
-# exceptions because stack traces are important for debugging
--XX:-OmitStackTraceInFastThrow
-
-# flags to configure Netty
--Dio.netty.noUnsafe=true
--Dio.netty.noKeySetOptimization=true
--Dio.netty.recycler.maxCapacityPerThread=0
-
-# log4j 2
--Dlog4j.shutdownHookEnabled=false
--Dlog4j2.disable.jmx=true
-
--Djava.io.tmpdir=${ES_TMPDIR}
-
-## heap dumps
-
-# generate a heap dump when an allocation from the Java heap fails
-# heap dumps are created in the working directory of the JVM
--XX:+HeapDumpOnOutOfMemoryError
-
-# specify an alternative path for heap dumps; ensure the directory exists and
-# has sufficient space
--XX:HeapDumpPath=data
-
-# specify an alternative path for JVM fatal error logs
--XX:ErrorFile=logs/hs_err_pid%p.log
-
-## JDK 8 GC logging
-
-8:-XX:+PrintGCDetails
-8:-XX:+PrintGCDateStamps
-8:-XX:+PrintTenuringDistribution
-8:-XX:+PrintGCApplicationStoppedTime
-8:-Xloggc:logs/gc.log
-8:-XX:+UseGCLogFileRotation
-8:-XX:NumberOfGCLogFiles=32
-8:-XX:GCLogFileSize=64m
-
-# JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
-# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
-# time/date parsing will break in an incompatible way for some date patterns and locals
-9-:-Djava.locale.providers=COMPAT
-
-# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
-10-:-XX:UseAVX=2
\ No newline at end of file
diff --git a/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties b/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties
deleted file mode 100644
index e4789c251b25a..0000000000000
--- a/integration-tests/elasticsearch-rest-client/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-status = error
-appenders = console
-loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing
-
-# log action execution errors for easier debugging
-logger.action.name = org.elasticsearch.action
-logger.action.level = info
-
-# do not log metadata too much as we generate a log of noise
-logger.metadata.name = org.elasticsearch.cluster.metadata
-logger.metadata.level = warn
-
-logger.cluster.name = org.elasticsearch.cluster.routing.allocation
-logger.cluster.level = warn
-
-logger.settings.name = org.elasticsearch.common.settings
-logger.settings.level = warn
-
-logger.deprecation.name = org.elasticsearch.deprecation
-logger.deprecation.level = warn
-
-# Warn us about using inefficient Search operations
-logger.slow_search.name = index.search.slowlog
-logger.slow_search.level = trace
-
-# Warn us about using inefficient indexing actions
-logger.slow_indexing.name = index.indexing.slowlog
-logger.slow_indexing.level = trace
-
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ABSOLUTE} (%t) %5p %c{1}:%L - %m%n
-
-rootLogger.level = info
-rootLogger.appenderRef.console.ref = console
diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml
index 20f4b06c6f9ba..735e1b0571bed 100644
--- a/integration-tests/elasticsearch-rest-high-level-client/pom.xml
+++ b/integration-tests/elasticsearch-rest-high-level-client/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -39,9 +38,56 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
@@ -75,7 +121,7 @@
             <id>test-elasticsearch</id>
             <activation>
                 <property>
-                    <name>test-elasticsearch</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -92,25 +138,67 @@
                             <skip>false</skip>
                         </configuration>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-elasticsearch</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
+                <elasticsearch.protocol>http</elasticsearch.protocol>
+            </properties>
+            <build>
+                <plugins>
                     <plugin>
-                        <groupId>com.github.alexcojocaru</groupId>
-                        <artifactId>elasticsearch-maven-plugin</artifactId>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <timeout>90</timeout>
-                            <pathConf>${project.build.directory}/test-classes/elasticsearch-maven-plugin/configuration/</pathConf>
-                            <autoCreateIndex>true</autoCreateIndex>
+                            <images>
+                                <image>
+                                    <name>${elasticsearch.image}</name>
+                                    <alias>elasticsearch</alias>
+                                    <run>
+                                        <env>
+                                            <discovery.type>single-node</discovery.type>
+                                        </env>
+                                        <ports>
+                                            <port>9200:9200</port>
+                                        </ports>
+                                        <log>
+                                            <prefix>Elasticsearch: </prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <http>
+                                                <url>http://localhost:9200</url>
+                                                <method>GET</method>
+                                                <status>200</status>
+                                            </http>
+                                            <time>20000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
                         </configuration>
-                        <!-- Different executions from 2.x: the "start" goal has been renamed in version 5  -->
                         <executions>
                             <execution>
-                                <id>start-elasticsearch</id>
+                                <id>docker-start</id>
                                 <phase>process-test-classes</phase>
                                 <goals>
-                                    <goal>runforked</goal>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
                                 </goals>
                             </execution>
                             <execution>
-                                <id>stop-elasticsearch</id>
+                                <id>docker-stop</id>
                                 <phase>post-integration-test</phase>
                                 <goals>
                                     <goal>stop</goal>
@@ -118,40 +206,26 @@
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
                     <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
         </profile>
+
     </profiles>
 
 </project>
\ No newline at end of file
diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java
index 47e8663da7a69..fe4bbd3c8d46b 100644
--- a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java
+++ b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java
@@ -7,19 +7,14 @@
 
 import javax.inject.Inject;
 import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 @Path("/fruits")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class FruitResource {
     @Inject
     FruitService fruitService;
diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/application.properties b/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/application.properties
new file mode 100644
index 0000000000000..4f57810e65b8e
--- /dev/null
+++ b/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+quarkus.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.elasticsearch.protocol=${elasticsearch.protocol:http}
+quarkus.elasticsearch.socket-timeout=10S
+quarkus.elasticsearch.discovery.enabled=true
+quarkus.elasticsearch.discovery.refresh-interval=1M
\ No newline at end of file
diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java b/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java
index f6a077535d747..d4f6a8a3cf1fe 100644
--- a/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java
+++ b/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java
@@ -61,7 +61,7 @@ public void testEndpoint() throws InterruptedException {
 
     @Test
     public void testHealth() {
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
                         "checks.name", containsInAnyOrder("Elasticsearch cluster health check"));
diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml b/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml
deleted file mode 100644
index e15abadf05b9d..0000000000000
--- a/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# ======================== Elasticsearch Configuration =========================
-#
-# NOTE: Elasticsearch comes with reasonable defaults for most settings.
-#       Before you set out to tweak and tune the configuration, make sure you
-#       understand what are you trying to accomplish and the consequences.
-#
-# The primary way of configuring a node is via this file. This template lists
-# the most important settings you may want to configure for a production cluster.
-#
-# Please consult the documentation for further information on configuration options:
-# https://www.elastic.co/guide/en/elasticsearch/reference/index.html
-#
-# ---------------------------------- Cluster -----------------------------------
-#
-# Use a descriptive name for your cluster:
-#
-#cluster.name: my-application
-#
-# ------------------------------------ Node ------------------------------------
-#
-# Use a descriptive name for the node:
-#
-#node.name: node-1
-#
-# Add custom attributes to the node:
-#
-#node.attr.rack: r1
-#
-# ----------------------------------- Paths ------------------------------------
-#
-# Path to directory where to store the data (separate multiple locations by comma):
-#
-#path.data: /path/to/data
-#
-# Path to log files:
-#
-#path.logs: /path/to/logs
-#
-# ----------------------------------- Memory -----------------------------------
-#
-# Lock the memory on startup:
-#
-bootstrap.memory_lock: true
-#
-# Make sure that the heap size is set to about half the memory available
-# on the system and that the owner of the process is allowed to use this
-# limit.
-#
-# Elasticsearch performs poorly when the system is swapping the memory.
-#
-# ---------------------------------- Network -----------------------------------
-#
-# Set the bind address to a specific IP (IPv4 or IPv6):
-#
-network.host: _local_
-#
-# Set a custom port for HTTP:
-#
-http.port: 9200
-#
-# For more information, consult the network module documentation.
-#
-# --------------------------------- Discovery ----------------------------------
-#
-# Pass an initial list of hosts to perform discovery when this node is started:
-# The default list of hosts is ["127.0.0.1", "[::1]"]
-#
-#discovery.seed_hosts: ["host1", "host2"]
-#
-# Bootstrap the cluster using an initial set of master-eligible nodes:
-#
-#cluster.initial_master_nodes: ["node-1", "node-2"]
-#
-# For more information, consult the discovery and cluster formation module documentation.
-#
-# ---------------------------------- Gateway -----------------------------------
-#
-# Block initial recovery after a full cluster restart until N nodes are started:
-#
-#gateway.recover_after_nodes: 3
-#
-# For more information, consult the gateway module documentation.
-#
-# ---------------------------------- Various -----------------------------------
-#
-# Require explicit names when deleting indices:
-#
-#action.destructive_requires_name: true
-#
-# Disable starting multiple nodes on a single system:
-#
-node.max_local_storage_nodes: 1
diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options b/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options
deleted file mode 100644
index 91f3f0ee7dd56..0000000000000
--- a/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options
+++ /dev/null
@@ -1,125 +0,0 @@
-## JVM configuration
-
-################################################################
-## IMPORTANT: JVM heap size
-################################################################
-##
-## You should always set the min and max JVM heap
-## size to the same value. For example, to set
-## the heap to 4 GB, set:
-##
-## -Xms4g
-## -Xmx4g
-##
-## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
-## for more information
-##
-################################################################
-
-# Xms represents the initial size of total heap space
-# Xmx represents the maximum size of total heap space
-
-# For Hibernate Search, we don't need as much as the default 2g
-# Let's keep it low, so that we'll be able to run tests
-# on memory-constrained CI slaves
--Xms256m
--Xmx256m
-
-################################################################
-## Expert settings
-################################################################
-##
-## All settings below this section are considered
-## expert settings. Don't tamper with them unless
-## you understand what you are doing
-##
-################################################################
-
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
-## G1GC Configuration
-# NOTE: G1GC is only supported on JDK version 10 or later.
-# To use G1GC uncomment the lines below.
-# 10-:-XX:-UseConcMarkSweepGC
-# 10-:-XX:-UseCMSInitiatingOccupancyOnly
-# 10-:-XX:+UseG1GC
-# 10-:-XX:InitiatingHeapOccupancyPercent=75
-
-## DNS cache policy
-# cache ttl in seconds for positive DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.ttl; set to -1 to cache forever
--Des.networkaddress.cache.ttl=60
-# cache ttl in seconds for negative DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.negative ttl; set to -1 to cache
-# forever
--Des.networkaddress.cache.negative.ttl=10
-
-## optimizations
-
-# pre-touch memory pages used by the JVM during initialization
--XX:+AlwaysPreTouch
-
-## basic
-
-# explicitly set the stack size
--Xss1m
-
-# set to headless, just in case
--Djava.awt.headless=true
-
-# ensure UTF-8 encoding by default (e.g. filenames)
--Dfile.encoding=UTF-8
-
-# use our provided JNA always versus the system one
--Djna.nosys=true
-
-# turn off a JDK optimization that throws away stack traces for common
-# exceptions because stack traces are important for debugging
--XX:-OmitStackTraceInFastThrow
-
-# flags to configure Netty
--Dio.netty.noUnsafe=true
--Dio.netty.noKeySetOptimization=true
--Dio.netty.recycler.maxCapacityPerThread=0
-
-# log4j 2
--Dlog4j.shutdownHookEnabled=false
--Dlog4j2.disable.jmx=true
-
--Djava.io.tmpdir=${ES_TMPDIR}
-
-## heap dumps
-
-# generate a heap dump when an allocation from the Java heap fails
-# heap dumps are created in the working directory of the JVM
--XX:+HeapDumpOnOutOfMemoryError
-
-# specify an alternative path for heap dumps; ensure the directory exists and
-# has sufficient space
--XX:HeapDumpPath=data
-
-# specify an alternative path for JVM fatal error logs
--XX:ErrorFile=logs/hs_err_pid%p.log
-
-## JDK 8 GC logging
-
-8:-XX:+PrintGCDetails
-8:-XX:+PrintGCDateStamps
-8:-XX:+PrintTenuringDistribution
-8:-XX:+PrintGCApplicationStoppedTime
-8:-Xloggc:logs/gc.log
-8:-XX:+UseGCLogFileRotation
-8:-XX:NumberOfGCLogFiles=32
-8:-XX:GCLogFileSize=64m
-
-# JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
-# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
-# time/date parsing will break in an incompatible way for some date patterns and locals
-9-:-Djava.locale.providers=COMPAT
-
-# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
-10-:-XX:UseAVX=2
\ No newline at end of file
diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties b/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties
deleted file mode 100644
index e4789c251b25a..0000000000000
--- a/integration-tests/elasticsearch-rest-high-level-client/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-status = error
-appenders = console
-loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing
-
-# log action execution errors for easier debugging
-logger.action.name = org.elasticsearch.action
-logger.action.level = info
-
-# do not log metadata too much as we generate a log of noise
-logger.metadata.name = org.elasticsearch.cluster.metadata
-logger.metadata.level = warn
-
-logger.cluster.name = org.elasticsearch.cluster.routing.allocation
-logger.cluster.level = warn
-
-logger.settings.name = org.elasticsearch.common.settings
-logger.settings.level = warn
-
-logger.deprecation.name = org.elasticsearch.deprecation
-logger.deprecation.level = warn
-
-# Warn us about using inefficient Search operations
-logger.slow_search.name = index.search.slowlog
-logger.slow_search.level = trace
-
-# Warn us about using inefficient indexing actions
-logger.slow_indexing.name = index.indexing.slowlog
-logger.slow_indexing.level = trace
-
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ABSOLUTE} (%t) %5p %c{1}:%L - %m%n
-
-rootLogger.level = info
-rootLogger.appenderRef.console.ref = console
diff --git a/integration-tests/elytron-resteasy/pom.xml b/integration-tests/elytron-resteasy/pom.xml
index e87702ad61d3e..d1acb501541b7 100644
--- a/integration-tests/elytron-resteasy/pom.xml
+++ b/integration-tests/elytron-resteasy/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-elytron-resteasy</artifactId>
@@ -40,6 +39,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -58,60 +85,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/TestSecurityTestCase.java b/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/TestSecurityTestCase.java
index bf1fca0974877..a441e0b1052d6 100644
--- a/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/TestSecurityTestCase.java
+++ b/integration-tests/elytron-resteasy/src/test/java/io/quarkus/it/resteasy/elytron/TestSecurityTestCase.java
@@ -2,8 +2,15 @@
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.security.TestSecurity;
@@ -22,9 +29,21 @@ void testGet() {
                 .body(is("secure"));
     }
 
-    @Test
     @TestSecurity
-    void testGetWithSecEnabled() {
+    @ParameterizedTest
+    @ValueSource(ints = 1) //https://github.com/quarkusio/quarkus/issues/12413
+    void testGetWithSecEnabled(int ignore) {
+        given()
+                .when()
+                .get("/secure")
+                .then()
+                .statusCode(401);
+    }
+
+    @TestSecurity
+    @ParameterizedTest
+    @MethodSource("arrayParams") //https://github.com/quarkusio/quarkus/issues/12413
+    void testGetUnAuthorized(int[] ignoredPrimitives, String[] ignored) {
         given()
                 .when()
                 .get("/secure")
@@ -63,4 +82,9 @@ void testTestUserCorrectRole() {
                 .body(is("testUser"));
     }
 
+    static Stream<Arguments> arrayParams() {
+        return Stream.of(
+                arguments(new int[] { 1, 2 }, new String[] { "hello", "world" }));
+    }
+
 }
diff --git a/integration-tests/elytron-security-jdbc/pom.xml b/integration-tests/elytron-security-jdbc/pom.xml
index 4505d5db82ffe..b999d61326964 100644
--- a/integration-tests/elytron-security-jdbc/pom.xml
+++ b/integration-tests/elytron-security-jdbc/pom.xml
@@ -43,6 +43,47 @@
             <artifactId>quarkus-test-h2</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-jdbc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -69,56 +110,11 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                    <enableReports>false</enableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
         </profile>
     </profiles>
 
diff --git a/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java b/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java
index 7414f8413b313..09f1bc9c14a20 100644
--- a/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java
+++ b/integration-tests/elytron-security-jdbc/src/main/java/io/quarkus/elytron/security/jdbc/it/ElytronSecurityJdbcResource.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/integration-tests/elytron-security-ldap/pom.xml b/integration-tests/elytron-security-ldap/pom.xml
index f20011d31c181..792c0d32a975c 100644
--- a/integration-tests/elytron-security-ldap/pom.xml
+++ b/integration-tests/elytron-security-ldap/pom.xml
@@ -39,6 +39,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-ldap-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -65,58 +93,11 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${project.version}</version>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                    <enableReports>false</enableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
         </profile>
     </profiles>
-
 </project>
diff --git a/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java b/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java
index 1d54f0c2f047f..52c5726f6027c 100644
--- a/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java
+++ b/integration-tests/elytron-security-ldap/src/main/java/io/quarkus/elytron/security/ldap/it/ElytronSecurityLdapResource.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/integration-tests/elytron-security-oauth2/pom.xml b/integration-tests/elytron-security-oauth2/pom.xml
index cb4db4cb132d8..2d66d101a9cd3 100644
--- a/integration-tests/elytron-security-oauth2/pom.xml
+++ b/integration-tests/elytron-security-oauth2/pom.xml
@@ -6,17 +6,12 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-integration-test-elytron-security-oauth2</artifactId>
     <name>Quarkus - Integration Tests - Elytron Security OAuth2</name>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -49,6 +44,34 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-oauth2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -73,62 +96,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 
 </project>
diff --git a/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java b/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java
index 96347f19cc1d1..f1acf2fa1934a 100644
--- a/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java
+++ b/integration-tests/elytron-security-oauth2/src/main/java/io/quarkus/it/elytron/oauth2/ElytronOauth2ExtensionResource.java
@@ -3,11 +3,8 @@
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 @Path("/api")
-@Produces(MediaType.APPLICATION_JSON)
 public class ElytronOauth2ExtensionResource {
 
     @GET
diff --git a/integration-tests/elytron-security/pom.xml b/integration-tests/elytron-security/pom.xml
index a07c5362b4f4b..a17756792e204 100644
--- a/integration-tests/elytron-security/pom.xml
+++ b/integration-tests/elytron-security/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Integration Tests - Elytron Security</name>
     <description>The elytron-security integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -42,6 +37,33 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -60,9 +82,6 @@
                         <goals>
                             <goal>build</goal>
                         </goals>
-                        <configuration>
-                            <uberJar>true</uberJar>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -71,59 +90,18 @@
 
     <profiles>
         <profile>
-            <id>native-image</id>
+            <id>no-native</id>
             <activation>
                 <property>
-                    <name>native</name>
+                    <name>!native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- these properties must not be defined in the general properties,
+                 otherwise the native profile in the parent pom is not able to override them -->
+            <properties>
+                <quarkus.package.type>uber-jar</quarkus.package.type>
+            </properties>
         </profile>
-
     </profiles>
 
 </project>
diff --git a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java
index af6137ecb982e..fe4e491ea085d 100644
--- a/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java
+++ b/integration-tests/elytron-security/src/main/java/io/quarkus/it/elytron/KeyFactoryEndpoint.java
@@ -61,4 +61,16 @@ public boolean verifyRSASig(@QueryParam("msg") String msg, @QueryParam("publicKe
 
         return true;
     }
+
+    @GET
+    @Path("SHA256withRSAandMGF1")
+    public String checkSHA256withRSAandMGF1() {
+        // This algorithm name is only supported with BC, Java (11+) equivalent is `RSASSA-PSS`
+        try {
+            Signature.getInstance("SHA256withRSAandMGF1");
+            return "success";
+        } catch (Throwable t) {
+            return "failure";
+        }
+    }
 }
diff --git a/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCATestCase.java b/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCATestCase.java
index 158203b0567db..a66ca3045594f 100644
--- a/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCATestCase.java
+++ b/integration-tests/elytron-security/src/test/java/io/quarkus/it/elytron/JCATestCase.java
@@ -1,6 +1,7 @@
 package io.quarkus.it.elytron;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 import java.security.KeyPair;
@@ -26,6 +27,16 @@ public void testListProviders() {
                 .body(containsString("SunRsaSign"));
     }
 
+    @Test
+    public void testSHA256withRSAandMGF1() {
+        RestAssured.given()
+                .when()
+                .get("/jca/SHA256withRSAandMGF1")
+                .then()
+                .statusCode(200)
+                .body(equalTo("failure"));
+    }
+
     @Test
     public void testDecodeRSAKey() throws Exception {
         KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
diff --git a/integration-tests/elytron-undertow/pom.xml b/integration-tests/elytron-undertow/pom.xml
index c793e8ac107d8..4111e03fee8fd 100644
--- a/integration-tests/elytron-undertow/pom.xml
+++ b/integration-tests/elytron-undertow/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-elytron-undertow</artifactId>
@@ -44,6 +43,60 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -59,63 +112,30 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Copy the certs to target -->
+                            <outputDirectory>${basedir}/target</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/elytron-undertow/src/main/resources/application.properties b/integration-tests/elytron-undertow/src/main/resources/application.properties
index 20955e50fb574..4ac7dea74a8bc 100644
--- a/integration-tests/elytron-undertow/src/main/resources/application.properties
+++ b/integration-tests/elytron-undertow/src/main/resources/application.properties
@@ -1,9 +1,17 @@
 quarkus.security.users.embedded.enabled=true
-quarkus.security.users.embedded.users.john=john
-quarkus.security.users.embedded.roles.john=employees
-quarkus.security.users.embedded.users.mary=mary
-quarkus.security.users.embedded.roles.mary=managers
+#note that the spaces after the usernames and roles are deliberate
+#to verify that they are trimmed correctly
+quarkus.security.users.embedded.users.john=john 
+quarkus.security.users.embedded.roles.john=employees 
+quarkus.security.users.embedded.users.mary=mary 
+quarkus.security.users.embedded.roles.mary=managers 
 quarkus.security.users.embedded.users.poul=poul
 quarkus.security.users.embedded.roles.poul=interns
 quarkus.security.users.embedded.plain-text=true
 quarkus.servlet.context-path=/foo
+quarkus.http.ssl.certificate.file=target/server-cert.pem
+quarkus.http.ssl.certificate.key-file=target/server-key.pem
+# Test that server starts with this option
+# See https://github.com/quarkusio/quarkus/issues/8336
+quarkus.http.insecure-requests=disabled
+quarkus.native.enable-all-security-services=true
\ No newline at end of file
diff --git a/integration-tests/elytron-undertow/src/main/resources/server-cert.pem b/integration-tests/elytron-undertow/src/main/resources/server-cert.pem
new file mode 100644
index 0000000000000..837702dd2ab8d
--- /dev/null
+++ b/integration-tests/elytron-undertow/src/main/resources/server-cert.pem
@@ -0,0 +1,22 @@
+Bag Attributes
+    friendlyName: test-store
+    localKeyID: 54 69 6D 65 20 31 35 36 38 30 34 30 37 34 37 35 34 31 
+subject=/CN=localhost
+issuer=/CN=localhost
+-----BEGIN CERTIFICATE-----
+MIICxzCCAa+gAwIBAgIEUfdmtTANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDEwls
+b2NhbGhvc3QwHhcNMTkwOTA5MTQ1MjI1WhcNMjIwOTA4MTQ1MjI1WjAUMRIwEAYD
+VQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
+Zh82steZt+2yANuCR1xMe5hb+zPSAb9vF/oVfy6DUorbqR+I5quDgvjUNe8RooPr
+u5R1d/m0Rm4SEQETMJTUnvYUGTDMKZVCTfFuthM+/+jvFCXC8RdZ4VrQ9NpPWd8p
+vVfo3tCC7+5Sabrqd25g4c0FI4oFdECjzeaxCvO3YrBr6XNjlH3RTE0NC6QgbCYR
+vHsfTVzstRkwo1kpWgLrRcHQInKLpFv8w4QQ/g/pxzGtb4DvyqubGXqLilb0GQO5
+gm/iWdvmX8lq1qW//d2/tixS9spVS63Bz19uVb4fLz53t61XXaxtzfy/3/rseid1
++ZWB4smPkyjSk2KuQADxAgMBAAGjITAfMB0GA1UdDgQWBBS8QnI8iaQo0oFYq8GS
+76Zcw8ne7zANBgkqhkiG9w0BAQsFAAOCAQEAHVssxFZVcckOOjD/2BB9kiEfAa7g
+bSPomLNOK2/y2lPxJSwze3uW9Pazue87PpswYip4o/bQWpfifncHLU6LDZ6EndFn
+G2ZCfnjpyHzmNVGf1V32DJi3PdOe4yBPNEetSLSe/v3CW/6kpIZmLZvwGoDSIooe
+3oWDg7TeLcwp5v2R2SOMPiUiM4gPY4Scda/gl9y5Eg/IamxzYROtepJjupO6En95
+0B5h1yu0PyyKRsRD+RBf5K7mo6nh5LeyQCHB5yttTkJX3NvbH5wkMOV9QLNUuoAj
+ZkGWeMRZCRpZajHwI95U8RcFwhQg3r8rWVYMr5BiHuXiHxA0S+ckvT3Tjw==
+-----END CERTIFICATE-----
diff --git a/integration-tests/elytron-undertow/src/main/resources/server-key.pem b/integration-tests/elytron-undertow/src/main/resources/server-key.pem
new file mode 100644
index 0000000000000..3bb409cf39a2a
--- /dev/null
+++ b/integration-tests/elytron-undertow/src/main/resources/server-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCMZh82steZt+2y
+ANuCR1xMe5hb+zPSAb9vF/oVfy6DUorbqR+I5quDgvjUNe8RooPru5R1d/m0Rm4S
+EQETMJTUnvYUGTDMKZVCTfFuthM+/+jvFCXC8RdZ4VrQ9NpPWd8pvVfo3tCC7+5S
+abrqd25g4c0FI4oFdECjzeaxCvO3YrBr6XNjlH3RTE0NC6QgbCYRvHsfTVzstRkw
+o1kpWgLrRcHQInKLpFv8w4QQ/g/pxzGtb4DvyqubGXqLilb0GQO5gm/iWdvmX8lq
+1qW//d2/tixS9spVS63Bz19uVb4fLz53t61XXaxtzfy/3/rseid1+ZWB4smPkyjS
+k2KuQADxAgMBAAECggEAFHNDlKoUMXXTD5yEXMOcNB/En5FFiQ9sHPh3Gu59je9V
+/ozx5PUEgpFvQSnh+sWbRZj7FOk23AVuPv9vEqZ+50GIQoEw1GwyK4hC5Ids4j5Q
+ZZKftXd8mUD0A3/G1MwYb3H+/hKGeKwOIL751PE0iLQbMuZsUkMOr01sjtkzisCD
+RyweFnD/NmlGYJyxZo2/iQi/PD2szkWftL+fkwLQZD0hlYbvJZTZ6rWd68FN+Hg6
+afveOrCgkaH9rsXdodahOUP+fUUPDIJAmSGY0Z+P4t9piBHbdY+4b0dKu2MJzhHz
+ZaBIewnWor7yX05UinhPhjFruo0Rf1obZtttvr0XiQKBgQDf5YwKCu+BNZFEkaEq
+wwgD9qjYqGEzblVCX+HDvmcgJ7neWBSB4FYRzj9JKZ6jFQbHYHMvb+oO1WbGWF5J
+R0YJ9m6qLsRgQKpW3/RFFWzCYHA1NdCxUicHeUVqsA7C/E8TvckAVEUGpZ+8cHsZ
+fwyNfkOYW3nADBo+aTFpi8l+awKBgQCgh6sYSetdfTL+WR1K/Z8u2ZSsXEuM/PEH
+nQQwkSBiYxHfpKo26s9LpEIHDjmsZQZHKgINNQiXIjQXB11HjiNK3Gn4aAY3HQMH
+Ew7zHF7BvIKCJlY4kLU/68HzYlpda2WSTpBGeuiLsx0BHwzQ4utt63TugiiRCbs9
+8vzonEydEwKBgQCCpO3W+lSQn5I5YYSacB0gOvCBI5c8LHhBd7NDxbllEOkq7Vhi
+BGYUk7Vn2oo/fMhs1EHB/1qi9zC2MeAqgBVFQO+IDCv4QiNi9+EP4pWIwj8XPWSd
+42L0wHWZ8EtcyV7XFRnRQFraqxAPI88grHrFoVSN9WqQfj9eBYGYpcGYKwKBgQCD
+3c47PoV8H5ti+jso3dwENTF+wLZDE4i/U0kcyCpNB8qn5vD3+bzdCwo+F35i0f3t
+OWHEDZuH4s3dWOxUGjt9hD/8kR8B6PASwKIYLGbeSIcAeJN9Fcn9vyFsV4+Zi948
+6BJ2AwLBtxmNUT9K3Ay/F5rPTdYbBl5sTg1Y2wPIRwKBgQCNJpTTgWXo1o2Ol1nQ
+Ju/Asw2HlYmMZIYqOPzXLUqPhTU0SA+M4jod/zQX1RGLb5KE+GQ1gKpU4iz64q3x
+3qiNxXghuP3beV/+bSVvcdF9wW/1CJOwV1nVwNjFmdiBZUAJPv6yBeKf+pIZ9nrE
+cSuSQnddeA0ojQOLbK6nyaARBw==
+-----END PRIVATE KEY-----
diff --git a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthRestTest.java b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthRestTest.java
index adf40cd938599..da7128be5284b 100644
--- a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthRestTest.java
+++ b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthRestTest.java
@@ -10,7 +10,7 @@
 import io.restassured.http.ContentType;
 
 @QuarkusTest
-class BaseAuthRestTest {
+class BaseAuthRestTest extends HttpsSetup {
 
     @Test
     @RepeatedTest(100)
diff --git a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthTest.java b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthTest.java
index ada5a161a952e..9734df2cab1ae 100644
--- a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthTest.java
+++ b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/BaseAuthTest.java
@@ -10,7 +10,7 @@
 import io.restassured.http.ContentType;
 
 @QuarkusTest
-public class BaseAuthTest {
+public class BaseAuthTest extends HttpsSetup {
 
     @RepeatedTest(100)
     public void testPost() {
diff --git a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/HttpsSetup.java b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/HttpsSetup.java
new file mode 100644
index 0000000000000..8003766299630
--- /dev/null
+++ b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/HttpsSetup.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.undertow.elytron;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import io.restassured.RestAssured;
+
+public class HttpsSetup {
+
+    @BeforeAll
+    public static void setupRestAssured() {
+        RestAssured.useRelaxedHTTPSValidation();
+    }
+
+    @AfterAll
+    public static void restoreRestAssured() {
+        RestAssured.reset();
+    }
+
+}
diff --git a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/ServletSecurityAnnotationPermissionsTestCase.java b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/ServletSecurityAnnotationPermissionsTestCase.java
index f2f70ceaf38bf..9da4fd39aa7a9 100644
--- a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/ServletSecurityAnnotationPermissionsTestCase.java
+++ b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/ServletSecurityAnnotationPermissionsTestCase.java
@@ -7,7 +7,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
-class ServletSecurityAnnotationPermissionsTestCase {
+class ServletSecurityAnnotationPermissionsTestCase extends HttpsSetup {
 
     @Test
     void testSecuredServletWithWrongAuth() {
diff --git a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/WebXmlPermissionsTestCase.java b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/WebXmlPermissionsTestCase.java
index 64c46ce2eae10..34825a00a2127 100644
--- a/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/WebXmlPermissionsTestCase.java
+++ b/integration-tests/elytron-undertow/src/test/java/io/quarkus/it/undertow/elytron/WebXmlPermissionsTestCase.java
@@ -9,7 +9,7 @@
 import io.restassured.http.ContentType;
 
 @QuarkusTest
-class WebXmlPermissionsTestCase {
+class WebXmlPermissionsTestCase extends HttpsSetup {
 
     @Test
     void testPost() {
diff --git a/integration-tests/flyway/pom.xml b/integration-tests/flyway/pom.xml
index 2d0b4f4963c11..e9d1875577bed 100644
--- a/integration-tests/flyway/pom.xml
+++ b/integration-tests/flyway/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -56,6 +55,73 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-flyway-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -80,65 +146,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java
index f3a7a677b15dc..467d2c611aeff 100644
--- a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java
+++ b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java
@@ -5,11 +5,8 @@
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.MigrationVersion;
@@ -17,8 +14,6 @@
 import io.quarkus.flyway.FlywayDataSource;
 
 @Path("/")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
 public class FlywayFunctionalityResource {
     @Inject
     Flyway flyway;
diff --git a/integration-tests/funqy-amazon-lambda/disable-native-profile b/integration-tests/funqy-amazon-lambda/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/funqy-amazon-lambda/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/funqy-amazon-lambda/pom.xml b/integration-tests/funqy-amazon-lambda/pom.xml
index 3d810bfae2607..b0e33dd470708 100644
--- a/integration-tests/funqy-amazon-lambda/pom.xml
+++ b/integration-tests/funqy-amazon-lambda/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,6 +37,34 @@
             <artifactId>quarkus-test-amazon-lambda</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-amazon-lambda-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-server-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -68,65 +95,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/funqy-google-cloud-functions/disable-native-profile b/integration-tests/funqy-google-cloud-functions/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/funqy-google-cloud-functions/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/funqy-google-cloud-functions/pom.xml b/integration-tests/funqy-google-cloud-functions/pom.xml
index cf339f015ab8f..853e1fd395b95 100644
--- a/integration-tests/funqy-google-cloud-functions/pom.xml
+++ b/integration-tests/funqy-google-cloud-functions/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,6 +28,21 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-google-cloud-functions-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -59,64 +73,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 </project>
diff --git a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/Greeting.java b/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/Greeting.java
deleted file mode 100644
index a008fe0c0ef4a..0000000000000
--- a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/Greeting.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.quarkus.funqy.gcp.functions.test;
-
-import java.util.Objects;
-
-public class Greeting {
-    private String name;
-    private String message;
-
-    public Greeting() {
-    }
-
-    public Greeting(String name, String message) {
-        this.name = name;
-        this.message = message;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        Greeting greeting = (Greeting) o;
-        return Objects.equals(name, greeting.name) &&
-                Objects.equals(message, greeting.message);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, message);
-    }
-
-    @Override
-    public String toString() {
-        return "Greeting{" +
-                "name='" + name + '\'' +
-                ", message='" + message + '\'' +
-                '}';
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}
diff --git a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/Identity.java b/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/Identity.java
deleted file mode 100644
index 20451a663db1c..0000000000000
--- a/integration-tests/funqy-google-cloud-functions/src/main/java/io/quarkus/funqy/gcp/functions/test/Identity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.quarkus.funqy.gcp.functions.test;
-
-public class Identity {
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
diff --git a/integration-tests/funqy-google-cloud-functions/src/main/resources/application.properties b/integration-tests/funqy-google-cloud-functions/src/main/resources/application.properties
index f1a7e7fba521f..d35c85ba89049 100644
--- a/integration-tests/funqy-google-cloud-functions/src/main/resources/application.properties
+++ b/integration-tests/funqy-google-cloud-functions/src/main/resources/application.properties
@@ -1,4 +1,2 @@
-quarkus.funqy.export=helloHttpWorld
-#quarkus.funqy.export=helloHttpWorldAsync
+quarkus.funqy.export=helloGCSWorld
 #quarkus.funqy.export=helloPubSubWorld
-#quarkus.funqy.export=helloGCSWorld
\ No newline at end of file
diff --git a/integration-tests/google-cloud-functions-http/README.md b/integration-tests/google-cloud-functions-http/README.md
index 3b97ce68bd9ca..1b87f5bd2e5a6 100644
--- a/integration-tests/google-cloud-functions-http/README.md
+++ b/integration-tests/google-cloud-functions-http/README.md
@@ -10,19 +10,17 @@ First, you need to log in to Google Cloud:
 gcloud auth login
 ```
 
-Then you need to use Maven to build the artifact and put it in a directory where it will be the only file.
+Then you need to use Maven to build the artifact, the build will automatically copy it inside `target/deployment`.
 
 ```shell script
-mkdir deployment
 mvn clean package
-cp target/quarkus-integration-test-google-cloud-functions-http-999-SNAPSHOT-runner.jar deployment/
 ```
 
 Finally, you need to use `gcloud` to deploy the function to Google Cloud
 
 ```shell script
 gcloud beta functions deploy quarkus-example-http --entry-point=io.quarkus.gcp.functions.http.QuarkusHttpFunction \
-  --runtime=java11 --trigger-http --source=deployment
+  --runtime=java11 --trigger-http --source=target/deployment
 ```
 
 ## Testing the endpoints
@@ -35,4 +33,5 @@ You can issue the following `curl` commands to test it:
 curl -v {httpsTrigger.url}/hello
 curl -v {httpsTrigger.url}/servlet/hello
 curl -v {httpsTrigger.url}/vertx/hello
+curl -v {httpsTrigger.url}/funqy
 ```
diff --git a/integration-tests/google-cloud-functions-http/disable-native-profile b/integration-tests/google-cloud-functions-http/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/google-cloud-functions-http/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/google-cloud-functions-http/pom.xml b/integration-tests/google-cloud-functions-http/pom.xml
index 2260cec4cceba..a7b3254d0d3ea 100644
--- a/integration-tests/google-cloud-functions-http/pom.xml
+++ b/integration-tests/google-cloud-functions-http/pom.xml
@@ -25,6 +25,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-google-cloud-functions-http</artifactId>
@@ -41,6 +45,73 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-google-cloud-functions-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -65,64 +136,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 </project>
diff --git a/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingFunqy.java b/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingFunqy.java
new file mode 100644
index 0000000000000..4926fb497c9f6
--- /dev/null
+++ b/integration-tests/google-cloud-functions-http/src/main/java/io/quarkus/it/gcp/functions/http/GreetingFunqy.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.gcp.functions.http;
+
+import io.quarkus.funqy.Funq;
+import io.smallrye.mutiny.Uni;
+
+public class GreetingFunqy {
+
+    @Funq
+    public String funqy() {
+        return "Make it funqy";
+    }
+
+    @Funq
+    public Uni<String> funqyAsync() {
+        return Uni.createFrom().item(() -> "Make it funqy asynchronously");
+    }
+}
diff --git a/integration-tests/google-cloud-functions-http/src/test/java/io/quarkus/it/gcp/functions/http/GreetingTest.java b/integration-tests/google-cloud-functions-http/src/test/java/io/quarkus/it/gcp/functions/http/GreetingTest.java
index 75690af738183..ede7a0a3268a5 100644
--- a/integration-tests/google-cloud-functions-http/src/test/java/io/quarkus/it/gcp/functions/http/GreetingTest.java
+++ b/integration-tests/google-cloud-functions-http/src/test/java/io/quarkus/it/gcp/functions/http/GreetingTest.java
@@ -16,5 +16,7 @@ public void testGreeting() {
         when().get("/servlet/hello").then().statusCode(200);
 
         when().get("/vertx/hello").then().statusCode(200);
+
+        when().get("/funqy").then().statusCode(200);
     }
 }
diff --git a/integration-tests/google-cloud-functions/disable-native-profile b/integration-tests/google-cloud-functions/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/google-cloud-functions/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/google-cloud-functions/pom.xml b/integration-tests/google-cloud-functions/pom.xml
index df49f176af40a..1f08f2ab19810 100644
--- a/integration-tests/google-cloud-functions/pom.xml
+++ b/integration-tests/google-cloud-functions/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,6 +23,21 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-google-cloud-functions-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -54,64 +68,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 </project>
diff --git a/integration-tests/gradle/.gitignore b/integration-tests/gradle/.gitignore
new file mode 100644
index 0000000000000..b74cd93b4902c
--- /dev/null
+++ b/integration-tests/gradle/.gitignore
@@ -0,0 +1,20 @@
+# Created by https://www.toptal.com/developers/gitignore/api/gradle
+# Edit at https://www.toptal.com/developers/gitignore?templates=gradle
+
+### Gradle ###
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.toptal.com/developers/gitignore/api/gradle
diff --git a/integration-tests/gradle/build.gradle b/integration-tests/gradle/build.gradle
index 3fc7a210f60bd..ff678de35e994 100644
--- a/integration-tests/gradle/build.gradle
+++ b/integration-tests/gradle/build.gradle
@@ -16,27 +16,46 @@ compileTestJava {
 }
 
 repositories {
-    mavenLocal()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
     mavenCentral()
 }
 
-configurations.all {
-    exclude group: 'io.quarkus', module: 'quarkus-bootstrap-maven-resolver'
-}
-
 dependencies {
+    testImplementation "io.quarkus:quarkus-test-devtools:${version}"
     testImplementation "io.quarkus:quarkus-bootstrap-core:${version}"
     testImplementation "io.quarkus:quarkus-core-deployment:${version}"
     testImplementation "io.quarkus:quarkus-devmode-test-utils:${version}"
     testImplementation "io.quarkus:quarkus-devtools-common:${version}"
     testImplementation "io.quarkus:quarkus-platform-descriptor-json:${version}"
-    testImplementation "io.quarkus:quarkus-platform-descriptor-resolver-json:${version}"
-    testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
+    testImplementation "io.quarkus:io.quarkus.gradle.plugin:${version}"
+    testImplementation 'org.mockito:mockito-core:3.8.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
     testImplementation 'org.awaitility:awaitility:4.0.3'
 }
 
+processTestResources {
+    filesMatching('.quarkus/config.yaml') {
+        expand(testResourcesDir: destinationDir)
+    }
+    filesMatching('test-registry-repo/**') {
+        expand(project.properties)
+    }
+}
+
 test {
+    // propagate the custom local maven repo, in case it's configured
+    if (System.properties.containsKey('maven.repo.local')) {
+        systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
+    }
+    systemProperty 'project.version', "${version}"
     useJUnitPlatform()
 
     // Kotlin compiler does not support Java 14
@@ -53,6 +72,10 @@ task nativeTest(type: Test) {
     useJUnitPlatform()
 
     systemProperties project.properties.subMap(["quarkus.native.container-build", "quarkus.native.builder-image"])
+    // propagate the custom local maven repo, in case it's configured
+    if (System.properties.containsKey('maven.repo.local')) {
+        systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
+    }
 
     // Include only native build test package
     include 'io/quarkus/gradle/nativeimage/*.class'
diff --git a/integration-tests/gradle/gradle.properties b/integration-tests/gradle/gradle.properties
index a70146c0ed233..6b1bd1f00fe12 100644
--- a/integration-tests/gradle/gradle.properties
+++ b/integration-tests/gradle/gradle.properties
@@ -1 +1,3 @@
-version = 999-SNAPSHOT
\ No newline at end of file
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
+version = 999-SNAPSHOT
diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b9..e708b1c023ec8 100644
Binary files a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar and b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties
index ac33e9944a65e..8cf6eb5ad222e 100644
--- a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/integration-tests/gradle/gradlew b/integration-tests/gradle/gradlew
index fbd7c515832da..4f906e0c811fc 100755
--- a/integration-tests/gradle/gradlew
+++ b/integration-tests/gradle/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/integration-tests/gradle/gradlew.bat b/integration-tests/gradle/gradlew.bat
index a9f778a7a964b..ac1b06f93825d 100644
--- a/integration-tests/gradle/gradlew.bat
+++ b/integration-tests/gradle/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml
index 05e738f746b60..550cd10642b0b 100644
--- a/integration-tests/gradle/pom.xml
+++ b/integration-tests/gradle/pom.xml
@@ -20,6 +20,161 @@
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
+    <dependencies>
+        <!-- All the following dependencies shall enforce the right build order
+             and proper upstream/downstream detection for incremental build.
+             They won't have an actual impact on "inner" gradle execution. -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>io.quarkus.gradle.plugin</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <!-- The following dependencies are generated in a way that is consistent with other normal IT modules,
+             that is "runtime" deps are defined with scope compile and "minimal extension deployment dependencies"
+             come in the usual form (pom, test, exclusions). This also ensures to keep the enforcer rules happy. -->
+        <!-- START update-dependencies.sh -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-bootstrap-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devmode-test-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-platform-descriptor-json</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-devtools</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kotlin-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- END update-dependencies.sh -->
+    </dependencies>
+
     <profiles>
         <profile>
             <id>skip-gradle-build</id>
@@ -56,13 +211,15 @@
                                         <argument>clean</argument>
                                         <argument>test</argument>
                                         <argument>-Pdescription=${project.description}</argument>
+                                        <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
                                         <argument>-i</argument> <!-- info logging -->
                                         <argument>-S</argument>
                                         <argument>--stacktrace</argument>
+                                        <argument>--no-daemon</argument>
                                     </arguments>
                                     <environmentVariables>
-                                        <MAVEN_LOCAL_REPO>${settings.localRepository}</MAVEN_LOCAL_REPO>
-                                        <GRADLE_OPTS>${env.MAVEN_OPTS}</GRADLE_OPTS>
+                                        <MAVEN_REPO_LOCAL>${settings.localRepository}</MAVEN_REPO_LOCAL>
+                                        <GRADLE_OPTS>-Xmx1408m</GRADLE_OPTS>
                                     </environmentVariables>
                                     <skip>${skip.gradle.tests}</skip>
                                 </configuration>
@@ -93,15 +250,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <!-- add some custom config, the rest comes from parent -->
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
@@ -119,10 +270,11 @@
                                         <argument>-Pquarkus.native.builder-image=${quarkus.native.builder-image}</argument>
                                         <argument>-S</argument>
                                         <argument>--stacktrace</argument>
+                                        <argument>--no-daemon</argument>
                                     </arguments>
                                     <environmentVariables>
                                         <MAVEN_LOCAL_REPO>${settings.localRepository}</MAVEN_LOCAL_REPO>
-                                        <GRADLE_OPTS>${env.MAVEN_OPTS}</GRADLE_OPTS>
+                                        <GRADLE_OPTS>-Xmx1408m</GRADLE_OPTS>
                                     </environmentVariables>
                                     <skip>${skip.gradle.build}</skip>
                                 </configuration>
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleKtsProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleKtsProjectTest.java
new file mode 100644
index 0000000000000..e42fae0ed9882
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleKtsProjectTest.java
@@ -0,0 +1,52 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+
+public class AddExtensionToModuleInMultiModuleKtsProjectTest extends QuarkusGradleDevToolsTestBase {
+
+    private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
+
+    @Test
+    public void testBasicMultiModuleBuild() throws Exception {
+
+        final File projectDir = getProjectDir("add-extension-multi-module-kts");
+
+        runGradleWrapper(projectDir, ":application:addExtension", "--extensions=openshift");
+
+        final Path applicationLib = projectDir.toPath().resolve("application").resolve("settings.gradle");
+        assertThat(applicationLib).doesNotExist();
+        final Path applicationLibKts = projectDir.toPath().resolve("application").resolve("settings.gradle.kts");
+        assertThat(applicationLibKts).doesNotExist();
+
+        final Path appBuild = projectDir.toPath().resolve("application").resolve("build.gradle");
+        assertThat(appBuild).doesNotExist();
+
+        final Path appBuildKts = projectDir.toPath().resolve("application").resolve("build.gradle.kts");
+        assertThat(appBuildKts).exists();
+        assertThat(readFile(appBuildKts)).contains("implementation(\"io.quarkus:quarkus-openshift\")");
+
+        runGradleWrapper(projectDir, ":application:removeExtension", "--extensions=openshift");
+        assertThat(readFile(appBuildKts)).doesNotContain("implementation(\"io.quarkus:quarkus-openshift\")");
+    }
+
+    private static String readFile(Path file) throws IOException {
+        final char[] charBuffer = new char[DEFAULT_BUFFER_SIZE];
+        int n = 0;
+        final StringWriter output = new StringWriter();
+        try (BufferedReader input = Files.newBufferedReader(file)) {
+            while ((n = input.read(charBuffer)) != -1) {
+                output.write(charBuffer, 0, n);
+            }
+        }
+        return output.getBuffer().toString();
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleProjectTest.java
index b056aad4f27a2..18b49e556cc95 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleProjectTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToModuleInMultiModuleProjectTest.java
@@ -11,7 +11,7 @@
 
 import org.junit.jupiter.api.Test;
 
-public class AddExtensionToModuleInMultiModuleProjectTest extends QuarkusGradleWrapperTestBase {
+public class AddExtensionToModuleInMultiModuleProjectTest extends QuarkusGradleDevToolsTestBase {
 
     private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
 
@@ -20,17 +20,17 @@ public void testBasicMultiModuleBuild() throws Exception {
 
         final File projectDir = getProjectDir("add-extension-multi-module");
 
-        runGradleWrapper(projectDir, ":application:addExtension", "--extensions=hibernate-orm");
+        runGradleWrapper(projectDir, ":application:addExtension", "--extensions=openshift");
 
         final Path applicationLib = projectDir.toPath().resolve("application").resolve("settings.gradle");
         assertThat(applicationLib).doesNotExist();
 
         final Path appBuild = projectDir.toPath().resolve("application").resolve("build.gradle");
         assertThat(appBuild).exists();
-        assertThat(readFile(appBuild)).contains("implementation 'io.quarkus:quarkus-hibernate-orm'");
+        assertThat(readFile(appBuild)).contains("implementation 'io.quarkus:quarkus-openshift'");
 
-        runGradleWrapper(projectDir, ":application:removeExtension", "--extensions=hibernate-orm");
-        assertThat(readFile(appBuild)).doesNotContain("implementation 'io.quarkus:quarkus-hibernate-orm'");
+        runGradleWrapper(projectDir, ":application:removeExtension", "--extensions=openshift");
+        assertThat(readFile(appBuild)).doesNotContain("implementation 'io.quarkus:quarkus-openshift'");
     }
 
     private static String readFile(Path file) throws IOException {
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java
new file mode 100644
index 0000000000000..ab7ea55623e5d
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleKtsProjectTest.java
@@ -0,0 +1,58 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+
+public class AddExtensionToSingleModuleKtsProjectTest extends QuarkusGradleDevToolsTestBase {
+
+    @Test
+    public void testAddAndRemoveExtension() throws IOException, URISyntaxException, InterruptedException {
+
+        final File projectDir = getProjectDir("add-remove-extension-single-module-kts");
+
+        runGradleWrapper(projectDir, ":addExtension", "--extensions=openshift");
+
+        final Path buildKts = projectDir.toPath().resolve("build.gradle.kts");
+        assertThat(buildKts).exists();
+        assertThat(new String(Files.readAllBytes(buildKts)))
+                .contains("implementation(\"io.quarkus:quarkus-openshift\")")
+                .doesNotContain("implementation(enforcedPlatform(\"io.quarkus:quarkus-bom:")
+                .doesNotContain("implementation(\"io.quarkus:quarkus-bom:");
+
+        runGradleWrapper(projectDir, ":removeExtension", "--extensions=openshift");
+
+        assertThat(new String(Files.readAllBytes(buildKts)))
+                .doesNotContain("implementation(\"io.quarkus:quarkus-openshift\")");
+
+        assertThat(projectDir.toPath().resolve("build.gradle")).doesNotExist();
+    }
+
+    @Test
+    public void testRemoveNonExistentExtension() throws IOException, URISyntaxException, InterruptedException {
+
+        final File projectDir = getProjectDir("add-remove-extension-single-module-kts");
+
+        BuildResult buildResult = runGradleWrapper(projectDir, "clean", "build");
+        assertThat(buildResult.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+
+        final Path buildKts = projectDir.toPath().resolve("build.gradle.kts");
+        assertThat(buildKts).exists();
+        assertThat(new String(Files.readAllBytes(buildKts)))
+                .doesNotContain("implementation(\"io.quarkus:quarkus-hibernate-orm\")");
+
+        runGradleWrapper(projectDir, ":removeExtension", "--extensions=hibernate-orm");
+
+        assertThat(new String(Files.readAllBytes(buildKts)))
+                .doesNotContain("implementation(\"io.quarkus:quarkus-hibernate-orm\")");
+
+        assertThat(projectDir.toPath().resolve("build.gradle")).doesNotExist();
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java
index a5a68c6efc36f..9d6965d4547f6 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AddExtensionToSingleModuleProjectTest.java
@@ -10,21 +10,24 @@
 
 import org.junit.jupiter.api.Test;
 
-public class AddExtensionToSingleModuleProjectTest extends QuarkusGradleWrapperTestBase {
+public class AddExtensionToSingleModuleProjectTest extends QuarkusGradleDevToolsTestBase {
 
     @Test
     public void testAddAndRemoveExtension() throws IOException, URISyntaxException, InterruptedException {
 
         final File projectDir = getProjectDir("add-remove-extension-single-module");
 
-        runGradleWrapper(projectDir, ":addExtension", "--extensions=hibernate-orm");
+        runGradleWrapper(projectDir, ":addExtension", "--extensions=openshift");
 
         final Path build = projectDir.toPath().resolve("build.gradle");
         assertThat(build).exists();
-        assertThat(new String(Files.readAllBytes(build))).contains("implementation 'io.quarkus:quarkus-hibernate-orm'");
+        assertThat(new String(Files.readAllBytes(build)))
+                .contains("implementation 'io.quarkus:quarkus-openshift'")
+                .doesNotContain("implementation enforcedPlatform('io.quarkus:quarkus-bom:")
+                .doesNotContain("implementation 'io.quarkus:quarkus-bom:");
 
-        runGradleWrapper(projectDir, ":removeExtension", "--extensions=hibernate-orm");
-        assertThat(new String(Files.readAllBytes(build))).doesNotContain("implementation 'io.quarkus:quarkus-hibernate-orm'");
+        runGradleWrapper(projectDir, ":removeExtension", "--extensions=openshift");
+        assertThat(new String(Files.readAllBytes(build))).doesNotContain("implementation 'io.quarkus:quarkus-openshift'");
 
     }
 
@@ -33,7 +36,8 @@ public void testRemoveNonExistentExtension() throws IOException, URISyntaxExcept
 
         final File projectDir = getProjectDir("add-remove-extension-single-module");
 
-        runGradleWrapper(projectDir, "clean", "build");
+        BuildResult buildResult = runGradleWrapper(projectDir, "clean", "build");
+        assertThat(buildResult.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
 
         final Path build = projectDir.toPath().resolve("build.gradle");
         assertThat(build).exists();
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/AdditionalSourceSetsTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AdditionalSourceSetsTest.java
new file mode 100644
index 0000000000000..e335167b4d681
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/AdditionalSourceSetsTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.gradle;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test for verifying that the plugin can work with test-sources which are included as part of a custom source set.
+ * E.g., functional-tests / integration-tests.
+ */
+public class AdditionalSourceSetsTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void executeFunctionalTest() throws URISyntaxException, IOException, InterruptedException {
+        final File projectDir = getProjectDir("additional-source-sets");
+        BuildResult result = runGradleWrapper(projectDir, "functionalTest");
+        assertEquals(BuildResult.SUCCESS_OUTCOME, result.getTasks().get(":functionalTest"),
+                "Failed to run tests defined in an alternate test sources directory");
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaLibraryModuleTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaLibraryModuleTest.java
index b03e057de64bb..e8698737ba71a 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaLibraryModuleTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaLibraryModuleTest.java
@@ -20,7 +20,8 @@ public void testBasicMultiModuleBuild() throws Exception {
         assertThat(commonLibs).exists();
         assertThat(commonLibs.resolve("library-1.0.0-SNAPSHOT.jar")).exists();
 
-        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("lib");
+        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("quarkus-app")
+                .resolve("lib").resolve("main");
         assertThat(applicationLib).exists();
         assertThat(applicationLib.resolve("org.acme.library-1.0.0-SNAPSHOT.jar")).exists();
     }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaPlatformModuleTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaPlatformModuleTest.java
index b3e493da4089f..0f199eca30216 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaPlatformModuleTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicJavaPlatformModuleTest.java
@@ -20,7 +20,7 @@ public void testBasicPlatformModuleBuild() throws Exception {
         assertThat(p).exists();
         assertThat(p.resolve("application-1.0.0-SNAPSHOT.jar")).exists();
 
-        p = projectDir.toPath().resolve("application").resolve("build").resolve("application-1.0.0-SNAPSHOT-runner.jar");
+        p = projectDir.toPath().resolve("application").resolve("build").resolve("quarkus-app").resolve("quarkus-run.jar");
         assertThat(p).exists();
     }
 }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicMultiModuleQuarkusBuildTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicMultiModuleQuarkusBuildTest.java
index 988e18a136875..d4cb7fbd7460a 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicMultiModuleQuarkusBuildTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BasicMultiModuleQuarkusBuildTest.java
@@ -20,7 +20,8 @@ public void testBasicMultiModuleBuild() throws Exception {
         assertThat(commonLibs).exists();
         assertThat(commonLibs.resolve("common.jar")).exists();
 
-        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("lib");
+        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("quarkus-app")
+                .resolve("lib").resolve("main");
         assertThat(applicationLib).exists();
         assertThat(applicationLib.resolve("quarkus-basic-multi-module-build.common.jar")).exists();
     }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/BeanInTestSourcesTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BeanInTestSourcesTest.java
new file mode 100644
index 0000000000000..374e98927150a
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/BeanInTestSourcesTest.java
@@ -0,0 +1,17 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+public class BeanInTestSourcesTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void testBasicMultiModuleBuild() throws Exception {
+        final File projectDir = getProjectDir("bean-in-testsources-project");
+        final BuildResult build = runGradleWrapper(projectDir, "clean", "test");
+        assertThat(build.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/FastJarFormatWorksTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/FastJarFormatWorksTest.java
index 7b2df6c0e47f3..16bb935fbc802 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/FastJarFormatWorksTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/FastJarFormatWorksTest.java
@@ -39,7 +39,8 @@ public void testFastJarFormatWorks() throws Exception {
             dumpFileContentOnFailure(() -> {
                 await()
                         .pollDelay(1, TimeUnit.SECONDS)
-                        .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/hello", 200));
+                        .atMost(1, TimeUnit.MINUTES)
+                        .until(() -> DevModeTestUtils.isCode("/hello", 200));
                 return null;
             }, output, ConditionTimeoutException.class);
 
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/GrpcMultiModuleQuarkusBuildTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/GrpcMultiModuleQuarkusBuildTest.java
index 4d13b907c2ef1..4ae97ee4a8c22 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/GrpcMultiModuleQuarkusBuildTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/GrpcMultiModuleQuarkusBuildTest.java
@@ -1,8 +1,10 @@
 package io.quarkus.gradle;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Test;
@@ -20,8 +22,24 @@ public void testGrpcMultiModuleBuild() throws Exception {
         assertThat(commonLibs).exists();
         assertThat(commonLibs.resolve("common.jar")).exists();
 
-        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("lib");
+        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("quarkus-app")
+                .resolve("lib").resolve("main");
         assertThat(applicationLib).exists();
         assertThat(applicationLib.resolve("quarkus-grpc-multi-module-build.common.jar")).exists();
     }
+
+    @Test
+    public void testProtocErrorOutput() throws Exception {
+        final File projectDir = getProjectDir("grpc-multi-module-project");
+
+        final Path protoDirectory = new File(projectDir, "application/src/main/proto/").toPath();
+        Files.copy(projectDir.toPath().resolve("invalid.proto"), protoDirectory.resolve("invalid.proto"));
+        try {
+            final BuildResult buildResult = runGradleWrapper(projectDir, ":application:quarkusBuild", "--info");
+            assertTrue(buildResult.getOutput().contains("invalid.proto:5:1: Missing field number."));
+        } finally {
+            Files.delete(protoDirectory.resolve("invalid.proto"));
+        }
+
+    }
 }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ImplementationFilesQuarkusBuildTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ImplementationFilesQuarkusBuildTest.java
new file mode 100644
index 0000000000000..ba35e4e3a7db7
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ImplementationFilesQuarkusBuildTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.runtime.util.HashUtil;
+
+public class ImplementationFilesQuarkusBuildTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void test() throws Exception {
+
+        final File projectDir = getProjectDir("implementation-files");
+
+        runGradleWrapper(projectDir, ":common:build");
+        final Path commonLibs = projectDir.toPath().resolve("common").resolve("build").resolve("libs");
+        assertThat(commonLibs).exists();
+        final Path commonJar = commonLibs.resolve("common.jar");
+        assertThat(commonJar).exists();
+
+        runGradleWrapper(projectDir, ":application:build");
+        final Path applicationLib = projectDir.toPath().resolve("application").resolve("build").resolve("quarkus-app")
+                .resolve("lib").resolve("main");
+        assertThat(applicationLib).exists();
+        String commonFileName = HashUtil.sha1(commonJar.getParent().toString()) + "." + commonJar.getFileName();
+        assertThat(applicationLib.resolve(commonFileName)).exists();
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/KotlinGRPCProjectBuildTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/KotlinGRPCProjectBuildTest.java
new file mode 100644
index 0000000000000..1148f70087ca1
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/KotlinGRPCProjectBuildTest.java
@@ -0,0 +1,18 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+public class KotlinGRPCProjectBuildTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void testBasicMultiModuleBuild() throws Exception {
+        final File projectDir = getProjectDir("kotlin-grpc-project");
+        final BuildResult build = runGradleWrapper(projectDir, "clean", "build");
+        assertThat(build.getTasks().get(":quarkusGenerateCode")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+        assertThat(build.getTasks().get(":compileKotlin")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/LaunchUtils.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/LaunchUtils.java
index 6fb38ed699218..c6f74375fcd8e 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/LaunchUtils.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/LaunchUtils.java
@@ -5,6 +5,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 import org.jboss.logging.Logger;
@@ -15,6 +16,10 @@ public class LaunchUtils {
     private static final Logger log = Logger.getLogger(LaunchUtils.class);
 
     protected static Process launch(Path jar, File output) throws IOException {
+        return launch(jar, output, null);
+    }
+
+    protected static Process launch(Path jar, File output, Map<String, String> env) throws IOException {
         List<String> commands = new ArrayList<>();
         commands.add(JavaBinFinder.findBin());
         commands.add("-jar");
@@ -22,6 +27,9 @@ protected static Process launch(Path jar, File output) throws IOException {
         ProcessBuilder processBuilder = new ProcessBuilder(commands.toArray(new String[0]));
         processBuilder.redirectOutput(output);
         processBuilder.redirectError(output);
+        if (env != null) {
+            processBuilder.environment().putAll(env);
+        }
         return processBuilder.start();
     }
 
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/LegacyJarFormatWorksTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/LegacyJarFormatWorksTest.java
new file mode 100644
index 0000000000000..8a0279bbadb24
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/LegacyJarFormatWorksTest.java
@@ -0,0 +1,66 @@
+package io.quarkus.gradle;
+
+import static io.quarkus.gradle.LaunchUtils.dumpFileContentOnFailure;
+import static io.quarkus.gradle.LaunchUtils.launch;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.FileUtils;
+import org.awaitility.core.ConditionTimeoutException;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.devmode.util.DevModeTestUtils;
+
+public class LegacyJarFormatWorksTest extends QuarkusGradleWrapperTestBase {
+    private static Future<?> jarRun;
+
+    @Test
+    public void testLegacyJarFormatWorks() throws Exception {
+
+        final File projectDir = getProjectDir("test-that-legacy-jar-format-works");
+
+        runGradleWrapper(projectDir, "clean", "build");
+
+        final Path runnerJar = projectDir.toPath().resolve("build")
+                .resolve("code-with-quarkus-1.0.0-SNAPSHOT-runner.jar");
+        assertThat(runnerJar).exists();
+
+        File output = new File(projectDir, "build/output.log");
+        output.createNewFile();
+        Process process = launch(runnerJar, output);
+        try {
+            //Wait until server up
+            dumpFileContentOnFailure(() -> {
+                await()
+                        .pollDelay(1, TimeUnit.SECONDS)
+                        .atMost(1, TimeUnit.MINUTES)
+                        .until(() -> DevModeTestUtils.isCode("/hello", 200));
+                return null;
+            }, output, ConditionTimeoutException.class);
+
+            String logs = FileUtils.readFileToString(output, "UTF-8");
+
+            assertThatOutputWorksCorrectly(logs);
+
+            // test that the application name and version are properly set
+            assertThat(DevModeTestUtils.getHttpResponse("/hello", () -> {
+                return jarRun == null ? null : jarRun.isDone() ? "jar run mode has terminated" : null;
+            }).equals("hello"));
+        } finally {
+            process.destroy();
+        }
+    }
+
+    private void assertThatOutputWorksCorrectly(String logs) {
+        assertThat(logs.isEmpty()).isFalse();
+        String infoLogLevel = "INFO";
+        assertThat(logs.contains(infoLogLevel)).isTrue();
+        assertThat(logs.contains("cdi, resteasy")).isTrue();
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ListExtensionsTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ListExtensionsTest.java
new file mode 100644
index 0000000000000..5d880c0300714
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ListExtensionsTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+public class ListExtensionsTest extends QuarkusGradleDevToolsTestBase {
+
+    @Test
+    public void testListExtensionsWork() throws IOException, URISyntaxException, InterruptedException {
+
+        final File projectDir = getProjectDir("list-extension-single-module");
+        runGradleWrapper(projectDir, ":listExtensions");
+
+        List<String> outputLogLines = listExtensions(projectDir, ":listExtension");
+
+        assertThat(outputLogLines).anyMatch(line -> line.contains("quarkus-resteasy"));
+        assertThat(outputLogLines).anyMatch(line -> line.contains("quarkus-vertx"));
+    }
+
+    private List<String> listExtensions(File projectDir, String... args) throws IOException, InterruptedException {
+
+        File outputLog = new File(projectDir, "command-output.log");
+
+        return Files.readAllLines(outputLog.toPath());
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleKotlinProjectBuildTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleKotlinProjectBuildTest.java
index a04223115f514..020037329c481 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleKotlinProjectBuildTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleKotlinProjectBuildTest.java
@@ -1,5 +1,7 @@
 package io.quarkus.gradle;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.File;
 
 import org.junit.jupiter.api.Test;
@@ -8,9 +10,9 @@ public class MultiModuleKotlinProjectBuildTest extends QuarkusGradleWrapperTestB
 
     @Test
     public void testBasicMultiModuleBuild() throws Exception {
-
         final File projectDir = getProjectDir("multi-module-kotlin-project");
-
-        runGradleWrapper(projectDir, "clean", "build");
+        final BuildResult build = runGradleWrapper(projectDir, "clean", "build");
+        assertThat(build.getTasks().get(":quarkusGenerateCode")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+        assertThat(build.getTasks().get(":compileKotlin")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
     }
 }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleUberJarTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleUberJarTest.java
index c124f03cdee5f..3df21df54e2fb 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleUberJarTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiModuleUberJarTest.java
@@ -38,12 +38,12 @@ public void testUberJarForMultiModule() throws Exception {
             dumpFileContentOnFailure(() -> {
                 await()
                         .pollDelay(1, TimeUnit.SECONDS)
-                        .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/hello", 200));
+                        .atMost(1, TimeUnit.MINUTES)
+                        .until(() -> DevModeTestUtils.isCode("/hello", 200));
                 return null;
             }, output, ConditionTimeoutException.class);
 
             String logs = FileUtils.readFileToString(output, "UTF-8");
-
             assertThatOutputWorksCorrectly(logs);
 
             // test that the http response is correct
@@ -57,7 +57,6 @@ public void testUberJarForMultiModule() throws Exception {
 
     private void assertThatOutputWorksCorrectly(String logs) {
         assertThat(logs.isEmpty()).isFalse();
-        //String infoLogLevel = "INFO";
         assertThat(logs.contains("INFO")).isTrue();
         assertThat(logs.contains("cdi, resteasy")).isTrue();
     }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiSourceProjectTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiSourceProjectTest.java
new file mode 100644
index 0000000000000..59796e82c7f3e
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MultiSourceProjectTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+public class MultiSourceProjectTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void shouldRunTest() throws Exception {
+        final File projectDir = getProjectDir("multi-source-project");
+        final BuildResult buildResult = runGradleWrapper(projectDir, ":clean", ":test");
+
+        assertThat(buildResult.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/MutableJarFormatBootsInDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MutableJarFormatBootsInDevModeTest.java
new file mode 100644
index 0000000000000..74ace56e20fdd
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/MutableJarFormatBootsInDevModeTest.java
@@ -0,0 +1,68 @@
+package io.quarkus.gradle;
+
+import static io.quarkus.gradle.LaunchUtils.dumpFileContentOnFailure;
+import static io.quarkus.gradle.LaunchUtils.launch;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.FileUtils;
+import org.awaitility.core.ConditionTimeoutException;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.devmode.util.DevModeTestUtils;
+
+public class MutableJarFormatBootsInDevModeTest extends QuarkusGradleWrapperTestBase {
+    private static Future<?> jarRun;
+
+    @Test
+    public void testFastJarFormatWorks() throws Exception {
+
+        final File projectDir = getProjectDir("mutable-jar");
+
+        runGradleWrapper(projectDir, "clean", "quarkusBuild");
+
+        final Path quarkusApp = projectDir.toPath().resolve("build").resolve("quarkus-app");
+        assertThat(quarkusApp).exists();
+        Path jar = quarkusApp.resolve("quarkus-run.jar");
+        assertThat(jar).exists();
+
+        File output = new File(projectDir, "build/output.log");
+        output.createNewFile();
+        Process process = launch(jar, output, Collections.singletonMap("QUARKUS_LAUNCH_DEVMODE", "true"));
+        try {
+            //Wait until server up
+            dumpFileContentOnFailure(() -> {
+                await()
+                        .pollDelay(1, TimeUnit.SECONDS)
+                        .atMost(1, TimeUnit.MINUTES)
+                        .until(() -> DevModeTestUtils.isCode("/hello", 200));
+                return null;
+            }, output, ConditionTimeoutException.class);
+
+            String logs = FileUtils.readFileToString(output, "UTF-8");
+
+            assertThatOutputWorksCorrectly(logs);
+
+            // test that the application name and version are properly set
+            assertThat(DevModeTestUtils.getHttpResponse("/hello", () -> {
+                return jarRun == null ? null : jarRun.isDone() ? "jar run mode has terminated" : null;
+            }).equals("hello"));
+        } finally {
+            process.destroy();
+        }
+    }
+
+    private void assertThatOutputWorksCorrectly(String logs) {
+        assertThat(logs.isEmpty()).isFalse();
+        String infoLogLevel = "INFO";
+        assertThat(logs.contains(infoLogLevel)).isTrue();
+        assertThat(logs.contains("cdi, resteasy")).isTrue();
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleDevToolsTestBase.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleDevToolsTestBase.java
new file mode 100644
index 0000000000000..66a093d30c5c7
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleDevToolsTestBase.java
@@ -0,0 +1,36 @@
+package io.quarkus.gradle;
+
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import io.quarkus.devtools.test.RegistryClientTestHelper;
+
+public class QuarkusGradleDevToolsTestBase extends QuarkusGradleWrapperTestBase {
+
+    private static Properties devToolsProps = new Properties();
+
+    @BeforeAll
+    static void enableDevToolsTestConfig() {
+        RegistryClientTestHelper.enableRegistryClientTestConfig(Paths.get("").normalize().toAbsolutePath().resolve("build"),
+                devToolsProps);
+        for (Map.Entry<?, ?> prop : devToolsProps.entrySet()) {
+            System.setProperty(prop.getKey().toString(), prop.getValue().toString());
+        }
+    }
+
+    @AfterAll
+    static void disableDevToolsTestConfig() {
+        RegistryClientTestHelper.disableRegistryClientTestConfig();
+    }
+
+    @Override
+    protected void setupTestCommand() {
+        for (Map.Entry<?, ?> prop : devToolsProps.entrySet()) {
+            setSystemProperty(prop.getKey().toString(), prop.getValue().toString());
+        }
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleWrapperTestBase.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleWrapperTestBase.java
index eeaca45d3c0d3..ddc00eb24dd81 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleWrapperTestBase.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusGradleWrapperTestBase.java
@@ -5,10 +5,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 public class QuarkusGradleWrapperTestBase extends QuarkusGradleTestBase {
@@ -16,11 +20,20 @@ public class QuarkusGradleWrapperTestBase extends QuarkusGradleTestBase {
     private static final String GRADLE_WRAPPER_WINDOWS = "gradlew.bat";
     private static final String GRADLE_WRAPPER_UNIX = "./gradlew";
     private static final String GRADLE_NO_DAEMON = "--no-daemon";
+    private static final String MAVEN_REPO_LOCAL = "maven.repo.local";
+
+    private Map<String, String> systemProps;
+
+    protected void setupTestCommand() {
+
+    }
 
     public BuildResult runGradleWrapper(File projectDir, String... args) throws IOException, InterruptedException {
+        setupTestCommand();
         List<String> command = new LinkedList<>();
         command.add(getGradleWrapperCommand());
         command.add(GRADLE_NO_DAEMON);
+        command.addAll(getSytemProperties());
         command.add("--stacktrace");
         command.addAll(Arrays.asList(args));
 
@@ -30,14 +43,26 @@ public BuildResult runGradleWrapper(File projectDir, String... args) throws IOEx
                 .directory(projectDir)
                 .command(command)
                 .redirectInput(ProcessBuilder.Redirect.INHERIT)
+                .redirectError(logOutput)
                 .redirectOutput(logOutput)
+                .redirectError(logOutput)
                 .start();
 
         p.waitFor(5, TimeUnit.MINUTES);
-
         try (InputStream is = new FileInputStream(logOutput)) {
-            return BuildResult.of(is);
+            final BuildResult commandResult = BuildResult.of(is);
+            if (p.exitValue() != 0) {
+                printCommandOutput(command, commandResult);
+            }
+            return commandResult;
+        }
+    }
+
+    protected void setSystemProperty(String name, String value) {
+        if (systemProps == null) {
+            systemProps = new HashMap<>();
         }
+        systemProps.put(name, value);
     }
 
     private String getGradleWrapperCommand() {
@@ -50,4 +75,33 @@ private String getGradleWrapperName() {
         }
         return GRADLE_WRAPPER_UNIX;
     }
+
+    private List<String> getSytemProperties() {
+        List<String> args = null;
+        if (systemProps != null) {
+            args = new ArrayList<>(systemProps.size() + 1);
+            for (Map.Entry<String, String> prop : systemProps.entrySet()) {
+                args.add(toPropertyArg(prop.getKey(), prop.getValue()));
+            }
+        }
+        final String mavenRepoLocal = System.getProperty(MAVEN_REPO_LOCAL);
+        if (mavenRepoLocal != null) {
+            final String arg = toPropertyArg(MAVEN_REPO_LOCAL, mavenRepoLocal);
+            if (args == null) {
+                args = Collections.singletonList(arg);
+            } else {
+                args.add(arg);
+            }
+        }
+        return args == null ? Collections.emptyList() : args;
+    }
+
+    private static String toPropertyArg(String name, String value) {
+        return new StringBuilder().append("-D=").append(name).append("=").append(value).toString();
+    }
+
+    private void printCommandOutput(List<String> command, BuildResult commandResult) {
+        System.err.println("Command: " + String.join(" ", command) + " failed with the following output:");
+        System.err.println(commandResult.getOutput());
+    }
 }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java
index 4a7f71eb10c1a..d3829a0da725b 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginFunctionalTest.java
@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -19,11 +18,11 @@
 
 import io.quarkus.devtools.commands.CreateProject;
 import io.quarkus.devtools.project.BuildTool;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.project.codegen.SourceType;
-import io.quarkus.platform.tools.config.QuarkusPlatformConfig;
 import io.quarkus.test.devmode.util.DevModeTestUtils;
 
-public class QuarkusPluginFunctionalTest extends QuarkusGradleWrapperTestBase {
+public class QuarkusPluginFunctionalTest extends QuarkusGradleDevToolsTestBase {
 
     private File projectRoot;
 
@@ -33,17 +32,7 @@ void setUp(@TempDir File projectRoot) {
     }
 
     @Test
-    public void canRunListExtensions() throws IOException, InterruptedException {
-        createProject(SourceType.JAVA);
-
-        BuildResult build = runGradleWrapper(projectRoot, "listExtensions");
-
-        assertThat(build.getTasks().get(":listExtensions")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
-        assertThat(build.getOutput()).contains("Quarkus - Core");
-    }
-
-    @Test
-    public void canGenerateConfig() throws IOException, InterruptedException {
+    public void canGenerateConfig() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult build = runGradleWrapper(projectRoot, "generateConfig");
@@ -54,7 +43,7 @@ public void canGenerateConfig() throws IOException, InterruptedException {
 
     @ParameterizedTest(name = "Build {0} project")
     @EnumSource(SourceType.class)
-    public void canBuild(SourceType sourceType) throws IOException, InterruptedException {
+    public void canBuild(SourceType sourceType) throws Exception {
         createProject(sourceType);
 
         BuildResult build = runGradleWrapper(projectRoot, "build", "--stacktrace");
@@ -68,7 +57,7 @@ public void canBuild(SourceType sourceType) throws IOException, InterruptedExcep
     }
 
     @Test
-    public void canDetectUpToDateBuild() throws IOException, InterruptedException {
+    public void canDetectUpToDateBuild() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
@@ -79,27 +68,28 @@ public void canDetectUpToDateBuild() throws IOException, InterruptedException {
     }
 
     @Test
-    public void canDetectResourceChangeWhenBuilding() throws IOException, InterruptedException {
+    public void canDetectResourceChangeWhenBuilding() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
         assertThat(firstBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
 
         final File applicationProperties = projectRoot.toPath().resolve("src/main/resources/application.properties").toFile();
-        DevModeTestUtils.filter(applicationProperties, ImmutableMap.of("# Configuration file", "quarkus.http.port=8888"));
+        Files.write(applicationProperties.toPath(), "quarkus.http.port=8888".getBytes());
 
         BuildResult secondBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
         assertThat(secondBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
     }
 
     @Test
-    public void canDetectClassChangeWhenBuilding() throws IOException, InterruptedException {
+    public void canDetectClassChangeWhenBuilding() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
         assertThat(firstBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
 
-        final File greetingResourceFile = projectRoot.toPath().resolve("src/main/java/org/acme/GreetingResource.java").toFile();
+        final File greetingResourceFile = projectRoot.toPath().resolve("src/main/java/org/acme/foo/GreetingResource.java")
+                .toFile();
         DevModeTestUtils.filter(greetingResourceFile, ImmutableMap.of("\"/greeting\"", "\"/test/hello\""));
 
         BuildResult secondBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
@@ -107,7 +97,7 @@ public void canDetectClassChangeWhenBuilding() throws IOException, InterruptedEx
     }
 
     @Test
-    public void canDetectClasspathChangeWhenBuilding() throws IOException, InterruptedException {
+    public void canDetectClasspathChangeWhenBuilding() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
@@ -119,13 +109,13 @@ public void canDetectClasspathChangeWhenBuilding() throws IOException, Interrupt
     }
 
     @Test
-    public void canDetectOutputChangeWhenBuilding() throws IOException, InterruptedException {
+    public void canDetectOutputChangeWhenBuilding() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
 
         assertThat(firstBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
-        Path runnerJar = projectRoot.toPath().resolve("build").resolve("foo-1.0.0-SNAPSHOT-runner.jar");
+        Path runnerJar = projectRoot.toPath().resolve("build").resolve("quarkus-app").resolve("quarkus-run.jar");
         Files.delete(runnerJar);
 
         BuildResult secondBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
@@ -135,7 +125,35 @@ public void canDetectOutputChangeWhenBuilding() throws IOException, InterruptedE
     }
 
     @Test
-    public void canRunTest() throws IOException, InterruptedException {
+    public void canDetectUpToDateTests() throws Exception {
+        createProject(SourceType.JAVA);
+
+        BuildResult firstBuild = runGradleWrapper(projectRoot, "test");
+
+        assertThat(firstBuild.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+
+        BuildResult secondBuild = runGradleWrapper(projectRoot, "test");
+
+        assertThat(secondBuild.getTasks().get(":test")).isEqualTo(BuildResult.UPTODATE_OUTCOME);
+    }
+
+    @Test
+    public void canDetectSystemPropertyChangeWhenBuilding() throws Exception {
+        createProject(SourceType.JAVA);
+
+        BuildResult firstBuild = runGradleWrapper(projectRoot, "quarkusBuild", "--stacktrace");
+
+        assertThat(firstBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+        assertThat(projectRoot.toPath().resolve("build").resolve("quarkus-app").resolve("quarkus-run.jar")).exists();
+
+        BuildResult secondBuild = runGradleWrapper(projectRoot, "quarkusBuild", "-Dquarkus.package.type=fast-jar");
+
+        assertThat(secondBuild.getTasks().get(":quarkusBuild")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+        assertThat(projectRoot.toPath().resolve("build").resolve("quarkus-app")).exists();
+    }
+
+    @Test
+    public void canRunTest() throws Exception {
         createProject(SourceType.JAVA);
 
         BuildResult buildResult = runGradleWrapper(projectRoot, "test", "--stacktrace");
@@ -143,19 +161,18 @@ public void canRunTest() throws IOException, InterruptedException {
         assertThat(buildResult.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
     }
 
-    private void createProject(SourceType sourceType) throws IOException {
+    private void createProject(SourceType sourceType) throws Exception {
         Map<String, Object> context = new HashMap<>();
         context.put("path", "/greeting");
-        assertThat(new CreateProject(projectRoot.toPath(),
-                QuarkusPlatformConfig.getGlobalDefault().getPlatformDescriptor())
+        assertThat(new CreateProject(QuarkusProjectHelper.getProject(projectRoot.toPath(),
+                BuildTool.GRADLE))
                         .groupId("com.acme.foo")
                         .artifactId("foo")
                         .version("1.0.0-SNAPSHOT")
-                        .buildTool(BuildTool.GRADLE)
-                        .className("org.acme.GreetingResource")
+                        .className("org.acme.foo.GreetingResource")
                         .sourceType(sourceType)
                         .doCreateProject(context))
                                 .withFailMessage("Project was not created")
                                 .isTrue();
     }
-}
\ No newline at end of file
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureModuleTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureModuleTest.java
new file mode 100644
index 0000000000000..2b60e9226ef1a
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureModuleTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import org.junit.jupiter.api.Test;
+
+public class TestFixtureModuleTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void testTaskShouldUseTestFixtures() throws IOException, URISyntaxException, InterruptedException {
+        final File projectDir = getProjectDir("test-fixtures-module");
+
+        final BuildResult result = runGradleWrapper(projectDir, "clean", "test");
+
+        assertThat(result.getTasks().get(":test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureMultiModuleTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureMultiModuleTest.java
new file mode 100644
index 0000000000000..00d9076bdca26
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureMultiModuleTest.java
@@ -0,0 +1,19 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import org.junit.jupiter.api.Test;
+
+public class TestFixtureMultiModuleTest extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void testTaskShouldUseTestFixtures() throws IOException, URISyntaxException, InterruptedException {
+        final File projectDir = getProjectDir("test-fixtures-multi-module");
+        final BuildResult result = runGradleWrapper(projectDir, "clean", "test");
+        assertThat(result.getTasks().get(":application:test")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestResourcesInBuildStepsTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestResourcesInBuildStepsTest.java
index 9a296936fc378..34e1980aaeb44 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestResourcesInBuildStepsTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/TestResourcesInBuildStepsTest.java
@@ -19,8 +19,7 @@ public void testBasicMultiModuleBuild() throws Exception {
         runGradleWrapper(projectDir, "clean", "build");
 
         final Path buildDir = projectDir.toPath().resolve("application").resolve("build");
-
-        final Path libDir = buildDir.resolve("lib");
+        final Path libDir = buildDir.resolve("quarkus-app").resolve("lib").resolve("main");
         assertThat(libDir).exists();
         assertThat(libDir.resolve("org.acme.runtime-1.0-SNAPSHOT.jar")).exists();
 
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/UberJarFormatWorksTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/UberJarFormatWorksTest.java
index 2374164828675..6746780908197 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/UberJarFormatWorksTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/UberJarFormatWorksTest.java
@@ -38,7 +38,8 @@ public void testUberJarFormatWorks() throws Exception {
             dumpFileContentOnFailure(() -> {
                 await()
                         .pollDelay(1, TimeUnit.SECONDS)
-                        .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/hello", 200));
+                        .atMost(1, TimeUnit.MINUTES)
+                        .until(() -> DevModeTestUtils.isCode("/hello", 200));
                 return null;
             }, output, ConditionTimeoutException.class);
 
diff --git a/devtools/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java
similarity index 90%
rename from devtools/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java
rename to integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java
index df9bf9b9f3d6b..8e205e140b1a1 100644
--- a/devtools/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.gradle.builder;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
@@ -36,12 +37,12 @@ void testToAppDependency() {
         when(version.toString()).thenReturn(":commons-lang3-3.9:");
         when(artifact.getModuleVersion()).thenReturn(version);
         when(artifact.getFile()).thenReturn(Files.currentFolder());
-        assertThatCode(() -> QuarkusModelBuilder.toDependency(artifact, "implementation")).doesNotThrowAnyException();
+        assertThatCode(() -> QuarkusModelBuilder.toDependency(artifact)).doesNotThrowAnyException();
     }
 
     @Test
     public void shouldLoadSimpleModuleModel() throws URISyntaxException, IOException {
-        File projectDir = getResourcesProject("simple-module-project");
+        File projectDir = getResourcesProject("builder/simple-module-project");
         final QuarkusModel quarkusModel = QuarkusGradleModelFactory.create(projectDir, "TEST");
 
         assertNotNull(quarkusModel);
@@ -52,7 +53,7 @@ public void shouldLoadSimpleModuleModel() throws URISyntaxException, IOException
 
     @Test
     public void shouldLoadMultiModuleModel() throws URISyntaxException, IOException {
-        File projectDir = getResourcesProject("multi-module-project");
+        File projectDir = getResourcesProject("builder/multi-module-project");
         final QuarkusModel quarkusModel = QuarkusGradleModelFactory.create(new File(projectDir, "application"), "TEST");
 
         assertNotNull(quarkusModel);
@@ -69,9 +70,9 @@ private void assertWorkspace(WorkspaceModule workspaceModule, File projectDir) {
         assertEquals(new File(projectDir, "build"), workspaceModule.getBuildDir());
         final SourceSet sourceSet = workspaceModule.getSourceSet();
         assertNotNull(sourceSet);
-        assertEquals(new File(projectDir, "build/resources/main"), sourceSet.getResourceDirectory());
-        assertEquals(1, sourceSet.getSourceDirectories().size());
-        assertEquals(new File(projectDir, "build/classes/java/main"), sourceSet.getSourceDirectories().iterator().next());
+        assertNull(sourceSet.getResourceDirectory());
+        assertThat(sourceSet.getSourceDirectories()).containsAnyOf(new File(projectDir, "build/classes/java/main"),
+                new File(projectDir, "build/classes/java/test"));
         final SourceSet sourceSourceSet = workspaceModule.getSourceSourceSet();
         assertEquals(new File(projectDir, "src/main/resources"), sourceSourceSet.getResourceDirectory());
         assertEquals(1, sourceSourceSet.getSourceDirectories().size());
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicJavaApplicationModuleDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicJavaApplicationModuleDevModeTest.java
new file mode 100644
index 0000000000000..724391c93ee96
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicJavaApplicationModuleDevModeTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.UUID;
+
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+import com.google.common.collect.ImmutableMap;
+
+@DisabledOnOs(OS.WINDOWS)
+public class BasicJavaApplicationModuleDevModeTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "basic-java-application-project";
+    }
+
+    @Override
+    protected String[] buildArguments() {
+        return new String[] { "clean", "run", "-s" };
+    }
+
+    protected void testDevMode() throws Exception {
+        assertThat(getHttpResponse("/hello")).contains("hello");
+
+        final String uuid = UUID.randomUUID().toString();
+        replace("src/main/java/org/acme/ExampleResource.java",
+                ImmutableMap.of("return \"hello\";", "return \"" + uuid + "\";"));
+
+        assertUpdatedResponseContains("/hello", uuid);
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/CompileOnlyDependencyDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/CompileOnlyDependencyDevModeTest.java
new file mode 100644
index 0000000000000..a1dac88c77f6c
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/CompileOnlyDependencyDevModeTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Disabled;
+
+import com.google.common.collect.ImmutableMap;
+
+@Disabled
+public class CompileOnlyDependencyDevModeTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "compile-only-lombok";
+    }
+
+    @Override
+    protected String[] buildArguments() {
+        return new String[] { "clean", "quarkusDev", "-s" };
+    }
+
+    protected void testDevMode() throws Exception {
+
+        assertThat(getHttpResponse("/hello", 2, TimeUnit.MINUTES)).contains("hello lombok");
+
+        replace("src/main/java/io/playground/MyData.java",
+                ImmutableMap.of("private String other;", "private final String other;"));
+        replace("src/main/java/io/playground/MyDataProducer.java",
+                ImmutableMap.of("return new MyData(\"lombok\");", "return new MyData(\"lombok\", \"!\");"));
+
+        replace("src/main/java/io/playground/HelloResource.java",
+                ImmutableMap.of("return \"hello \" + myData.getMessage();",
+                        "return \"hello \" + myData.getMessage() + myData.getOther();"));
+
+        assertUpdatedResponseContains("/hello", "hello lombok!", 5, TimeUnit.MINUTES);
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java
index 7f225d8292a60..db77de5aee95a 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcDevModeTest.java
@@ -2,8 +2,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.Disabled;
+
 import com.google.common.collect.ImmutableMap;
 
+@Disabled
 public class GrpcDevModeTest extends QuarkusDevGradleTestBase {
     @Override
     protected String projectDirectoryName() {
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcWithIncludesDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcWithIncludesDevModeTest.java
new file mode 100644
index 0000000000000..d460d5d6790d7
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/GrpcWithIncludesDevModeTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Disabled;
+
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * A test to check if a proto file that imports another proto from dependencies
+ * works properly in dev mode if quarkus.generate-code.grpc.scan-for-imports=true is specified
+ */
+@Disabled
+public class GrpcWithIncludesDevModeTest extends QuarkusDevGradleTestBase {
+    @Override
+    protected String projectDirectoryName() {
+        return "grpc-include-project";
+    }
+
+    @Override
+    protected void testDevMode() throws Exception {
+        assertThat(getHttpResponse("/hello")).isEqualTo("hello 2");
+
+        replace("application/src/main/proto/hello.proto",
+                ImmutableMap.of("TEST_ONE = 2;", "TEST_ONE = 15;"));
+
+        Thread.sleep(1000);
+
+        assertThat(getHttpResponse("/hello")).isEqualTo("hello 15");
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/ImplementationFilesDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/ImplementationFilesDevModeTest.java
new file mode 100644
index 0000000000000..699d9c59aecec
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/ImplementationFilesDevModeTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+
+public class ImplementationFilesDevModeTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "implementation-files";
+    }
+
+    @Override
+    protected String[] buildArguments() {
+        return new String[] { "clean", ":common:build", ":application:quarkusDev", "-s" };
+    }
+
+    protected void testDevMode() throws Exception {
+
+        assertThat(getHttpResponse("/hello")).contains("hello common");
+
+        replace("application/src/main/java/org/acme/quarkus/sample/HelloResource.java",
+                ImmutableMap.of("return \"hello \" + common.getName();", "return \"hi \" + common.getName();"));
+
+        assertUpdatedResponseContains("/hello", "hi common");
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/JandexMultiModuleProjectDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/JandexMultiModuleProjectDevModeTest.java
new file mode 100644
index 0000000000000..a799504010e35
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/JandexMultiModuleProjectDevModeTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+
+public class JandexMultiModuleProjectDevModeTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "jandex-basic-multi-module-project";
+    }
+
+    @Override
+    protected String[] buildArguments() {
+        return new String[] { "clean", ":application:quarkusDev", "-s" };
+    }
+
+    protected void testDevMode() {
+
+        assertThat(getHttpResponse("/hello")).contains("hello common");
+
+        replace("common/src/main/java/org/acme/common/CommonBean.java",
+                ImmutableMap.of("return \"common\";", "return \"modified\";"));
+
+        assertUpdatedResponseContains("/hello", "hello modified");
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/MultiModuleIncludedBuildTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/MultiModuleIncludedBuildTest.java
new file mode 100644
index 0000000000000..5ec22656b0e36
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/MultiModuleIncludedBuildTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class MultiModuleIncludedBuildTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "multi-module-included-build";
+    }
+
+    @Override
+    protected String[] buildArguments() {
+        return new String[] { "--include-build", "../external-library", "clean", "quarkusDev" };
+    }
+
+    @Override
+    protected void testDevMode() throws Exception {
+        assertThat(getHttpResponse("/hello")).contains("foo bar");
+    }
+
+    @Override
+    protected File getProjectDir() {
+        File projectDir = super.getProjectDir();
+        final File appProjectProperties = new File(projectDir, "app/gradle.properties");
+        final File libProjectProperties = new File(projectDir, "external-library/gradle.properties");
+        final Path projectProperties = projectDir.toPath().resolve("gradle.properties");
+
+        try {
+            Files.copy(projectProperties, appProjectProperties.toPath());
+            Files.copy(projectProperties, libProjectProperties.toPath());
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to copy gradle.properties file", e);
+        }
+        this.projectDir = appProjectProperties.getParentFile();
+        return this.projectDir;
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevDependencyDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevDependencyDevModeTest.java
new file mode 100644
index 0000000000000..d8523467019d8
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevDependencyDevModeTest.java
@@ -0,0 +1,16 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class QuarkusDevDependencyDevModeTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "quarkus-dev-dependency";
+    }
+
+    @Override
+    protected void testDevMode() throws Exception {
+        assertThat(getHttpResponse("/hello")).contains("Quarkus");
+    }
+}
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevGradleTestBase.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevGradleTestBase.java
index 03126cf2caec4..ffb6f7d7d1f2a 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevGradleTestBase.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/QuarkusDevGradleTestBase.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,6 +18,7 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.gradle.BuildResult;
 import io.quarkus.gradle.QuarkusGradleWrapperTestBase;
 import io.quarkus.runtime.util.ClassPathUtils;
 import io.quarkus.test.devmode.util.DevModeTestUtils;
@@ -26,26 +28,47 @@ public abstract class QuarkusDevGradleTestBase extends QuarkusGradleWrapperTestB
     private static final String PLUGIN_UNDER_TEST_METADATA_PROPERTIES = "plugin-under-test-metadata.properties";
 
     private Future<?> quarkusDev;
-    private File projectDir;
+    protected File projectDir;
 
     @Test
     public void main() throws Exception {
 
         projectDir = getProjectDir();
         ExecutorService executor = null;
+        final BuildResult[] buildResult = new BuildResult[1];
         try {
             executor = Executors.newSingleThreadExecutor();
             quarkusDev = executor.submit(new Runnable() {
                 @Override
                 public void run() {
                     try {
-                        build();
+                        buildResult[0] = build();
                     } catch (Exception e) {
                         throw new IllegalStateException("Failed to build the project", e);
                     }
                 }
             });
             testDevMode();
+        } catch (Exception | AssertionError e) {
+            if (buildResult[0] != null) {
+                System.err.println("BELOW IS THE CAPTURED LOGGING OF THE FAILED GRADLE TEST PROJECT BUILD");
+                System.err.println(buildResult[0].getOutput());
+            } else {
+                File logOutput = new File(projectDir, "command-output.log");
+                if (logOutput.exists()) {
+                    System.err.println("BELOW IS THE CAPTURED LOGGING OF THE FAILED GRADLE TEST PROJECT BUILD");
+                    try (BufferedReader reader = Files.newBufferedReader(logOutput.toPath())) {
+                        String line = reader.readLine();
+                        while (line != null) {
+                            System.err.println(line);
+                            line = reader.readLine();
+                        }
+                    }
+                } else {
+                    System.err.println("GRADLE TEST PROJECT BUILD OUTPUT IS NOT AVAILABLE");
+                }
+            }
+            throw e;
         } finally {
             if (quarkusDev != null) {
                 quarkusDev.cancel(true);
@@ -65,7 +88,7 @@ public void run() {
         }
     }
 
-    protected void build() throws Exception {
+    protected BuildResult build() throws Exception {
         // Plugin's classpath won't be visible in QuarkusDev task
         // so, here we are going to propagate the plugin-under-test-metadata properties
         final Path path = ClassPathUtils
@@ -75,7 +98,7 @@ protected void build() throws Exception {
         }
         System.setProperty(PLUGIN_UNDER_TEST_METADATA_PROPERTIES, path.toAbsolutePath().toString());
 
-        runGradleWrapper(projectDir, buildArguments());
+        return runGradleWrapper(projectDir, buildArguments());
     }
 
     protected abstract String projectDirectoryName();
@@ -105,7 +128,11 @@ protected String getHttpResponse() {
     }
 
     protected String getHttpResponse(String path) {
-        return DevModeTestUtils.getHttpResponse(path, getQuarkusDevBrokenReason());
+        return getHttpResponse(path, 1, TimeUnit.MINUTES);
+    }
+
+    protected String getHttpResponse(String path, long timeout, TimeUnit tu) {
+        return DevModeTestUtils.getHttpResponse(path, false, getQuarkusDevBrokenReason(), timeout, tu);
     }
 
     private Supplier<String> getQuarkusDevBrokenReason() {
@@ -125,8 +152,12 @@ protected void replace(String srcFile, Map<String, String> tokens) {
     }
 
     protected void assertUpdatedResponseContains(String path, String value) {
+        assertUpdatedResponseContains(path, value, 1, TimeUnit.MINUTES);
+    }
+
+    protected void assertUpdatedResponseContains(String path, String value, long waitAtMost, TimeUnit timeUnit) {
         await()
                 .pollDelay(100, TimeUnit.MILLISECONDS)
-                .atMost(1, TimeUnit.MINUTES).until(() -> getHttpResponse(path).contains(value));
+                .atMost(waitAtMost, timeUnit).until(() -> getHttpResponse(path, waitAtMost, timeUnit).contains(value));
     }
 }
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/nativeimage/CustomNativeTestSourceSetTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/nativeimage/CustomNativeTestSourceSetTest.java
new file mode 100644
index 0000000000000..e93ca9c7d11cb
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/nativeimage/CustomNativeTestSourceSetTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.gradle.nativeimage;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.gradle.BuildResult;
+
+public class CustomNativeTestSourceSetTest extends QuarkusNativeGradleTestBase {
+
+    @Test
+    public void runNativeTests() throws Exception {
+        final File projectDir = getProjectDir("custom-java-native-sourceset-module");
+
+        final BuildResult build = runGradleWrapper(projectDir, "clean", "testNative");
+        assertThat(build.getTasks().get(":testNative")).isEqualTo(BuildResult.SUCCESS_OUTCOME);
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/resources/.quarkus/config.yaml b/integration-tests/gradle/src/test/resources/.quarkus/config.yaml
new file mode 100644
index 0000000000000..82f4783ee7130
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/.quarkus/config.yaml
@@ -0,0 +1,7 @@
+---
+debug: true
+registries:
+- test.registry.quarkus.io:
+    maven:
+        repository:
+            url: file://$testResourcesDir/test-registry-repo
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/build.gradle.kts b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/build.gradle.kts
new file mode 100644
index 0000000000000..0a16f07d4e47c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("io.quarkus")
+}
+
+val quarkusPlatformGroupId: String by project
+val quarkusPlatformArtifactId: String by project
+val quarkusPlatformVersion: String by project
+
+dependencies {
+    implementation(project(":common"))
+    implementation("io.quarkus:quarkus-resteasy")
+
+    implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java
new file mode 100644
index 0000000000000..092d251dc1ebb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/java/org/acme/quarkus/sample/HelloResource.java
@@ -0,0 +1,22 @@
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.acme.common.CommonBean;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    CommonBean common;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello " + common.getName();
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/resources/META-INF/resources/index.html b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..77e09dffb5088
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>my-quarkus-project - 1.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme.quarkus.sample</li>
+                <li>ArtifactId: my-quarkus-project</li>
+                <li>Version: 1.0-SNAPSHOT</li>
+                <li>Quarkus Version: 999-SNAPSHOT</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
+                <li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3c1ac56a1ad0a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/application/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/build.gradle.kts b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/build.gradle.kts
new file mode 100644
index 0000000000000..00da047426af9
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/build.gradle.kts
@@ -0,0 +1,48 @@
+buildscript {
+
+    repositories {
+        if (System.getProperties().containsKey("maven.repo.local")) {
+            maven(url = System.getProperties().get("maven.repo.local")!!)
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+}
+
+plugins {
+    java
+}
+
+group = "com.quarkus.demo"
+version = "1.0"
+
+
+subprojects {
+
+    apply(plugin = "java")
+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    tasks {
+      test {
+          dependsOn("cleanTest")
+          useJUnitPlatform()
+          setForkEvery(1)
+      }
+    }
+
+    repositories {
+        if (System.getProperties().containsKey("maven.repo.local")) {
+            maven(url = System.getProperties().get("maven.repo.local")!!)
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/build.gradle.kts b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/build.gradle.kts
new file mode 100644
index 0000000000000..bcf58d676e495
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `java-library`
+}
+
+dependencies {
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java
new file mode 100644
index 0000000000000..ace88a5b0e415
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/src/main/java/org/acme/common/CommonBean.java
@@ -0,0 +1,11 @@
+package org.acme.common;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class CommonBean {
+
+   public String getName() {
+       return "common";
+   }
+}
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/src/main/resources/META-INF/beans.xml b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000000..ddcbaf4800eb9
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+        bean-discovery-mode="all">
+
+</beans>
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/gradle.properties b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/gradle.properties
new file mode 100644
index 0000000000000..8f063b7d88ba4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/settings.gradle.kts b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/settings.gradle.kts
new file mode 100644
index 0000000000000..d793059f6bdb2
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module-kts/settings.gradle.kts
@@ -0,0 +1,20 @@
+pluginManagement {
+    val quarkusPluginVersion: String by settings
+    repositories {
+        if (System.getProperties().containsKey("maven.repo.local")) {
+            maven(url = System.getProperties().get("maven.repo.local")!!)
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id("io.quarkus") version quarkusPluginVersion
+    }
+}
+rootProject.name="quarkus-basic-multi-module-build"
+
+include(":common")
+include(":application")
+
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module/application/build.gradle b/integration-tests/gradle/src/test/resources/add-extension-multi-module/application/build.gradle
index 511bf08bcde83..4976a00601d3e 100644
--- a/integration-tests/gradle/src/test/resources/add-extension-multi-module/application/build.gradle
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module/application/build.gradle
@@ -6,8 +6,5 @@ dependencies {
     implementation project(":common")
     implementation 'io.quarkus:quarkus-resteasy'
 
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
-
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
 }
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module/build.gradle b/integration-tests/gradle/src/test/resources/add-extension-multi-module/build.gradle
index ed287c44d8461..30555543ff725 100644
--- a/integration-tests/gradle/src/test/resources/add-extension-multi-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module/build.gradle
@@ -1,8 +1,13 @@
 buildscript {
 
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
@@ -31,8 +36,13 @@ subprojects {
     }
 
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 }
diff --git a/integration-tests/gradle/src/test/resources/add-extension-multi-module/settings.gradle b/integration-tests/gradle/src/test/resources/add-extension-multi-module/settings.gradle
index e36cfc1474677..27ca517b2ff24 100644
--- a/integration-tests/gradle/src/test/resources/add-extension-multi-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/add-extension-multi-module/settings.gradle
@@ -1,7 +1,12 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/build.gradle.kts b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/build.gradle.kts
new file mode 100644
index 0000000000000..eb1213478c518
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    java
+    id("io.quarkus")
+}
+
+repositories {
+    if (System.getProperties().containsKey("maven.repo.local")) {
+        maven(url = System.getProperties().get("maven.repo.local")!!)
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+val quarkusPlatformGroupId: String by project
+val quarkusPlatformArtifactId: String by project
+val quarkusPlatformVersion: String by project
+
+dependencies {
+    implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
+    implementation("io.quarkus:quarkus-resteasy")
+
+    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.rest-assured:rest-assured")
+}
+
+group  = "org.acme"
+version = "1.0.0-SNAPSHOT"
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+    options.compilerArgs.add("-parameters")
+}
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/gradle.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/settings.gradle.kts b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/settings.gradle.kts
new file mode 100644
index 0000000000000..a184fa5d8fa2d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/settings.gradle.kts
@@ -0,0 +1,16 @@
+pluginManagement {
+    val quarkusPluginVersion: String by settings
+    repositories {
+        if (System.getProperties().containsKey("maven.repo.local")) {
+            maven(url = System.getProperties().get("maven.repo.local")!!)
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id("io.quarkus") version quarkusPluginVersion
+    }
+}
+rootProject.name="code-with-quarkus"
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..a4df5d8d739aa
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,17 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class ExampleResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello from Test";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties
new file mode 100644
index 0000000000000..75b9417d6dc14
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java
new file mode 100644
index 0000000000000..84adafee15420
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/java/org/acme/ExampleResourceTest.java
@@ -0,0 +1,20 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class ExampleResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("Hello from Test"));
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties
new file mode 100644
index 0000000000000..c725bb2abf61b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module-kts/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+# Configuration file
+# key = value
+
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/build.gradle b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/build.gradle
index 6484513f4f4aa..b3fd66c246d86 100644
--- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/build.gradle
@@ -4,8 +4,14 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/settings.gradle b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/settings.gradle
index 36494c326c7a8..38ef9ad777b32 100644
--- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/settings.gradle
@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java
index d01ef472250e2..a4df5d8d739aa 100644
--- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/java/org/acme/ExampleResource.java
@@ -6,19 +6,12 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
 @Path("/hello")
 public class ExampleResource {
 
-    @ConfigProperty(name = "my-app-name")
-    String appName;
-    @ConfigProperty(name = "quarkus.application.version")
-    String appVersion;
-
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public String hello() {
-        return appName + " " + appVersion;
+        return "Hello from Test";
     }
 }
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties
index b18c72feda9df..75b9417d6dc14 100644
--- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/main/resources/application.properties
@@ -1,3 +1,2 @@
 # Configuration file
 # key = value
-my-app-name=${quarkus.application.name}
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java
index 9b92351468aa0..84adafee15420 100644
--- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java
@@ -17,13 +17,4 @@ public void testHelloEndpoint() {
              .statusCode(200)
              .body(is("Hello from Test"));
     }
-
-    @Test
-    public void testTestOnly() {
-      given()
-          .when().get("test-only")
-          .then()
-              .statusCode(200)
-              .body(is("Test only"));
-    }
 }
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties
index b2340b5f9173f..c725bb2abf61b 100644
--- a/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties
+++ b/integration-tests/gradle/src/test/resources/add-remove-extension-single-module/src/test/resources/application.properties
@@ -1,5 +1,3 @@
 # Configuration file
 # key = value
-example.message=Hello from Test
-test-only=Test only
 
diff --git a/integration-tests/gradle/src/test/resources/additional-source-sets/build.gradle b/integration-tests/gradle/src/test/resources/additional-source-sets/build.gradle
new file mode 100644
index 0000000000000..c8375ad175158
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/additional-source-sets/build.gradle
@@ -0,0 +1,56 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation "io.quarkus:quarkus-arc"
+    testImplementation "io.quarkus:quarkus-junit5"
+}
+
+sourceSets {
+    // Functional Tests
+    funcTest {
+        java.srcDir 'src/funcTest/java'
+        if (file('src/funcTest/resources').exists()) {
+            resources.srcDir 'src/funcTest/resources'
+        }
+
+        compileClasspath += sourceSets.main.output + configurations.testRuntimeClasspath + configurations.compileOnly
+        runtimeClasspath += output + compileClasspath
+    }
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
+/*
+ * Functional tests for this module.
+ */
+task functionalTest(type: Test, description: 'Functional tests', dependsOn: [processResources, classes]) {
+    description = 'Run the functional tests.'
+    group = 'verification'
+
+    useJUnitPlatform()
+    testClassesDirs = sourceSets.funcTest.output.classesDirs
+    classpath = sourceSets.funcTest.runtimeClasspath
+
+    // Show standard streams on the console.
+    testLogging {
+        showStandardStreams = true
+    }
+    systemProperty 'quarkus.http.host', 'localhost'
+}
diff --git a/integration-tests/gradle/src/test/resources/additional-source-sets/gradle.properties b/integration-tests/gradle/src/test/resources/additional-source-sets/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/additional-source-sets/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/additional-source-sets/settings.gradle b/integration-tests/gradle/src/test/resources/additional-source-sets/settings.gradle
new file mode 100644
index 0000000000000..053cc448fb3cf
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/additional-source-sets/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name = 'additional-test-sources'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java b/integration-tests/gradle/src/test/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java
new file mode 100644
index 0000000000000..a8a62620dd554
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/additional-source-sets/src/funcTest/java/ft/SimpleBeanTest.java
@@ -0,0 +1,19 @@
+package ft;
+
+import javax.inject.Inject;
+import org.junit.jupiter.api.Test;
+import io.quarkus.test.junit.QuarkusTest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@QuarkusTest
+public class SimpleBeanTest {
+
+    @Inject
+    SimpleBean bean;
+
+    @Test
+    public void verify() {
+        assertEquals("hello", bean.hello(), "Did the implementation of the SimpleBean change?");
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/additional-source-sets/src/main/java/ft/SimpleBean.java b/integration-tests/gradle/src/test/resources/additional-source-sets/src/main/java/ft/SimpleBean.java
new file mode 100644
index 0000000000000..7dbf40c55c6a6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/additional-source-sets/src/main/java/ft/SimpleBean.java
@@ -0,0 +1,11 @@
+package ft;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class SimpleBean {
+
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/additional-source-sets/src/main/resources/META-INF/beans.xml b/integration-tests/gradle/src/test/resources/additional-source-sets/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000000..29595ff4907bc
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/additional-source-sets/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="all">
+</beans>
diff --git a/integration-tests/gradle/src/test/resources/basic-java-application-project/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-application-project/build.gradle
new file mode 100644
index 0000000000000..2a685df9a2ac2
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/basic-java-application-project/build.gradle
@@ -0,0 +1,36 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+    id 'application'
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
+application {
+    mainClass = 'org.acme.EntryPoint'
+}
+
+run {
+    // propagate the custom local maven repo, in case it's configured
+    if (System.properties.containsKey('maven.repo.local')) {
+        systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/basic-java-application-project/gradle.properties b/integration-tests/gradle/src/test/resources/basic-java-application-project/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/basic-java-application-project/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/basic-java-application-project/settings.gradle b/integration-tests/gradle/src/test/resources/basic-java-application-project/settings.gradle
new file mode 100644
index 0000000000000..ef736ac60ab00
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/basic-java-application-project/settings.gradle
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
diff --git a/integration-tests/gradle/src/test/resources/basic-java-application-project/src/main/java/org/acme/EntryPoint.java b/integration-tests/gradle/src/test/resources/basic-java-application-project/src/main/java/org/acme/EntryPoint.java
new file mode 100644
index 0000000000000..1d134c1f55ae3
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/basic-java-application-project/src/main/java/org/acme/EntryPoint.java
@@ -0,0 +1,11 @@
+package org.acme;
+
+import io.quarkus.runtime.Quarkus;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class EntryPoint {
+    public static void main(String[] args) {
+        Quarkus.run();
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..69a905bf38a8f
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/basic-java-application-project/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class ExampleResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/basic-java-library-module/application/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-library-module/application/build.gradle
index c32c091249fc4..71e5f909a09e6 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-library-module/application/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-library-module/application/build.gradle
@@ -4,8 +4,14 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/basic-java-library-module/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-library-module/build.gradle
index 446534c216bfc..8e96833be1f8e 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-library-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-library-module/build.gradle
@@ -1,6 +1,12 @@
 buildscript {
      repositories {
-          mavenLocal()
+          if (System.properties.containsKey('maven.repo.local')) {
+               maven {
+                    url System.properties.get('maven.repo.local')
+               }
+          } else {
+               mavenLocal()
+          }
           mavenCentral()
      }
 }
@@ -12,7 +18,13 @@ allprojects {
 
 subprojects{
      repositories {
-          mavenLocal()
+          if (System.properties.containsKey('maven.repo.local')) {
+               maven {
+                    url System.properties.get('maven.repo.local')
+               }
+          } else {
+               mavenLocal()
+          }
           mavenCentral()
      }
 }
diff --git a/integration-tests/gradle/src/test/resources/basic-java-library-module/library/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-library-module/library/build.gradle
index 1029a18702395..52c995fb82717 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-library-module/library/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-library-module/library/build.gradle
@@ -3,17 +3,19 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     api enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     api 'io.quarkus:quarkus-kubernetes-client'
-    api 'io.quarkus:quarkus-smallrye-health'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 compileJava {
diff --git a/integration-tests/gradle/src/test/resources/basic-java-library-module/settings.gradle b/integration-tests/gradle/src/test/resources/basic-java-library-module/settings.gradle
index c9627114348d7..65ef2a2911ae4 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-library-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-library-module/settings.gradle
@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/basic-java-native-module/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-native-module/build.gradle
index de1499d4d7647..259544e7a7780 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-native-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-native-module/build.gradle
@@ -4,8 +4,14 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/basic-java-native-module/settings.gradle b/integration-tests/gradle/src/test/resources/basic-java-native-module/settings.gradle
index 3c00571e4dae0..72f00e40a2b5b 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-native-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-native-module/settings.gradle
@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/build.gradle
index 5d6aa1ebfc44b..bef4daa9b1646 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/build.gradle
@@ -4,16 +4,21 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
-    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    implementation 'io.quarkus:quarkus-resteasy'
-
     implementation platform(project(':platform'))
+    implementation 'io.quarkus:quarkus-resteasy'
 
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     testImplementation 'io.quarkus:quarkus-junit5'
     testImplementation 'io.rest-assured:rest-assured'
 }
diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm
index 92c0f51a55bca..c3215a3faa371 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm
+++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
 
 ARG JAVA_PACKAGE=java-1.8.0-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8
@@ -44,4 +44,4 @@ COPY build/*-runner.jar /deployments/app.jar
 EXPOSE 8080
 USER 1001
 
-ENTRYPOINT [ "/deployments/run-java.sh" ]
\ No newline at end of file
+ENTRYPOINT [ "/deployments/run-java.sh" ]
diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native
index cc988f93db69a..844275a593bee 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native
+++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
 WORKDIR /work/
 COPY build/*-runner /work/application
 
@@ -27,4 +27,4 @@ RUN chmod 775 /work /work/application \
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
\ No newline at end of file
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-platform-module/build.gradle
index 446534c216bfc..d27cedd35b461 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/build.gradle
@@ -1,6 +1,12 @@
 buildscript {
      repositories {
-          mavenLocal()
+          if (System.properties.containsKey('maven.repo.local')) {
+               maven {
+                    url System.properties.get('maven.repo.local')
+               }
+          } else {
+               mavenLocal()
+          }
           mavenCentral()
      }
 }
@@ -12,7 +18,13 @@ allprojects {
 
 subprojects{
      repositories {
-          mavenLocal()
           mavenCentral()
+          if (System.properties.containsKey('maven.repo.local')) {
+               maven {
+                    url System.properties.get('maven.repo.local')
+               }
+          } else {
+               mavenLocal()
+          }
      }
 }
diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/platform/build.gradle b/integration-tests/gradle/src/test/resources/basic-java-platform-module/platform/build.gradle
index 9b1a9db62bd6e..f40fa4cdd517d 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/platform/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/platform/build.gradle
@@ -3,13 +3,20 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     constraints {
         api enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+        api "io.quarkus:quarkus-resteasy:${quarkusPlatformVersion}"
         api 'io.quarkus:quarkus-kubernetes-client'
     }
 }
diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/settings.gradle b/integration-tests/gradle/src/test/resources/basic-java-platform-module/settings.gradle
index 9599ee69bfce5..e3d26b7b34cae 100644
--- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/settings.gradle
@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/build.gradle b/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/build.gradle
index 512f8db87f743..fc6e4fa593c10 100644
--- a/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/build.gradle
@@ -1,12 +1,15 @@
 buildscript {
-
     repositories {
-        mavenLocal()
-        jcenter()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
-
 }
 
 apply plugin: 'java'
@@ -29,8 +32,13 @@ subprojects {
     }
 
     repositories {
-        mavenLocal()
-        jcenter()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 
diff --git a/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/settings.gradle b/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/settings.gradle
index da73190d018ee..6711399b69643 100644
--- a/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-multi-module-project-test-setup/settings.gradle
@@ -1,7 +1,12 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/basic-multi-module-project/build.gradle b/integration-tests/gradle/src/test/resources/basic-multi-module-project/build.gradle
index 89f430bff6527..cb42fb26582ce 100644
--- a/integration-tests/gradle/src/test/resources/basic-multi-module-project/build.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-multi-module-project/build.gradle
@@ -1,12 +1,15 @@
 buildscript {
-
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
-
 }
 
 apply plugin: 'java'
@@ -26,8 +29,13 @@ subprojects {
     }
 
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 
diff --git a/integration-tests/gradle/src/test/resources/basic-multi-module-project/settings.gradle b/integration-tests/gradle/src/test/resources/basic-multi-module-project/settings.gradle
index e36cfc1474677..27ca517b2ff24 100644
--- a/integration-tests/gradle/src/test/resources/basic-multi-module-project/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/basic-multi-module-project/settings.gradle
@@ -1,7 +1,12 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/build.gradle
new file mode 100644
index 0000000000000..2595643b73560
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/build.gradle
@@ -0,0 +1,48 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+    id 'org.jetbrains.kotlin.jvm' version "1.3.72"
+    id "org.jetbrains.kotlin.plugin.allopen" version "1.3.72"
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'io.quarkus:quarkus-kotlin'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+allOpen {
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    annotation("io.quarkus.test.junit.QuarkusTest")
+}
+
+compileKotlin {
+    kotlinOptions.javaParameters = true
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/gradle.properties b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/settings.gradle b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/settings.gradle
new file mode 100644
index 0000000000000..38ef9ad777b32
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/settings.gradle
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..a4df5d8d739aa
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,17 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class ExampleResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello from Test";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/main/resources/application.properties
new file mode 100644
index 0000000000000..75b9417d6dc14
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/java/org/acme/ExampleResourceTest.java
new file mode 100644
index 0000000000000..ff623e7d71f6c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/java/org/acme/ExampleResourceTest.java
@@ -0,0 +1,20 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class ExampleResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/test-resources")
+          .then()
+             .statusCode(200)
+             .body(is("Hello from Test"));
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt
new file mode 100644
index 0000000000000..83d18985d4fd4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/kotlin/org/acme/test/TestExampleResource.kt
@@ -0,0 +1,14 @@
+package org.acme.test
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/test-resources")
+class ExampleResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "Hello from Test"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/resources/application.properties
new file mode 100644
index 0000000000000..c725bb2abf61b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+# Configuration file
+# key = value
+
diff --git a/devtools/gradle/src/test/resources/multi-module-project/application/build.gradle b/integration-tests/gradle/src/test/resources/builder/multi-module-project/application/build.gradle
similarity index 100%
rename from devtools/gradle/src/test/resources/multi-module-project/application/build.gradle
rename to integration-tests/gradle/src/test/resources/builder/multi-module-project/application/build.gradle
diff --git a/integration-tests/gradle/src/test/resources/builder/multi-module-project/build.gradle b/integration-tests/gradle/src/test/resources/builder/multi-module-project/build.gradle
new file mode 100644
index 0000000000000..a747a50500c7b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/builder/multi-module-project/build.gradle
@@ -0,0 +1,23 @@
+
+subprojects {
+    apply plugin: 'java'
+
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+    }
+
+    dependencies {
+        implementation enforcedPlatform("io.quarkus:quarkus-bom:${quarkusPlatformVersion}")
+    }
+
+}
+
+group 'org.acme'
+version '1.0-SNAPSHOT'
diff --git a/devtools/gradle/src/test/resources/multi-module-project/common/build.gradle b/integration-tests/gradle/src/test/resources/builder/multi-module-project/common/build.gradle
similarity index 100%
rename from devtools/gradle/src/test/resources/multi-module-project/common/build.gradle
rename to integration-tests/gradle/src/test/resources/builder/multi-module-project/common/build.gradle
diff --git a/integration-tests/gradle/src/test/resources/builder/multi-module-project/nomain/build.gradle b/integration-tests/gradle/src/test/resources/builder/multi-module-project/nomain/build.gradle
new file mode 100644
index 0000000000000..b8cf19cf75668
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/builder/multi-module-project/nomain/build.gradle
@@ -0,0 +1,8 @@
+plugins {
+    id 'java-library'
+}
+
+
+sourceSets {
+    remove(named("main"))
+}
diff --git a/integration-tests/gradle/src/test/resources/builder/multi-module-project/settings.gradle b/integration-tests/gradle/src/test/resources/builder/multi-module-project/settings.gradle
new file mode 100644
index 0000000000000..671852ed649a6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/builder/multi-module-project/settings.gradle
@@ -0,0 +1,19 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='mutli-module-project'
+
+include 'common', 'application', 'nomain'
diff --git a/integration-tests/gradle/src/test/resources/builder/simple-module-project/build.gradle b/integration-tests/gradle/src/test/resources/builder/simple-module-project/build.gradle
new file mode 100644
index 0000000000000..56eb4c2b0d0bd
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/builder/simple-module-project/build.gradle
@@ -0,0 +1,27 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("io.quarkus:quarkus-bom:${quarkusPlatformVersion}")
+}
+
+group 'org.acme'
+version '1.0-SNAPSHOT'
+
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
diff --git a/integration-tests/gradle/src/test/resources/builder/simple-module-project/settings.gradle b/integration-tests/gradle/src/test/resources/builder/simple-module-project/settings.gradle
new file mode 100644
index 0000000000000..ddad38f21d355
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/builder/simple-module-project/settings.gradle
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='simple-module-project'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/build.gradle b/integration-tests/gradle/src/test/resources/compile-only-lombok/build.gradle
new file mode 100644
index 0000000000000..92f084b1e1014
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/build.gradle
@@ -0,0 +1,45 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+    testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'io.playground'
+version '1.0'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/gradle.properties b/integration-tests/gradle/src/test/resources/compile-only-lombok/gradle.properties
new file mode 100644
index 0000000000000..cac35f5608ec1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/gradle.properties
@@ -0,0 +1,6 @@
+#Gradle properties
+#Tue Aug 04 17:04:55 CEST 2020
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
+org.gradle.logging.level=INFO
+lombokVersion=1.18.12
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/settings.gradle b/integration-tests/gradle/src/test/resources/compile-only-lombok/settings.gradle
new file mode 100644
index 0000000000000..7d4396cceb81b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='playground-gradle-app'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java
new file mode 100644
index 0000000000000..6a80730c76ac6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/HelloResource.java
@@ -0,0 +1,20 @@
+package io.playground;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    MyData myData;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello " + myData.getMessage();
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/MyData.java b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/MyData.java
new file mode 100644
index 0000000000000..eb3adf37710ca
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/MyData.java
@@ -0,0 +1,9 @@
+package io.playground;
+
+import lombok.Data;
+
+public @Data class MyData {
+
+    private final String message;
+    private String other;
+}
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java
new file mode 100644
index 0000000000000..ed89e60c1720a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/java/io/playground/MyDataProducer.java
@@ -0,0 +1,13 @@
+package io.playground;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+@Singleton
+public class MyDataProducer {
+
+    @Produces
+    public MyData myData() {
+        return new MyData("lombok");
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3c1ac56a1ad0a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/compile-only-lombok/src/test/java/io/playground/HelloResourceTest.java b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/test/java/io/playground/HelloResourceTest.java
new file mode 100644
index 0000000000000..dd153546f8e07
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/compile-only-lombok/src/test/java/io/playground/HelloResourceTest.java
@@ -0,0 +1,21 @@
+package io.playground;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class HelloResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("hello lombok"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/custom-config-java-module/build.gradle b/integration-tests/gradle/src/test/resources/custom-config-java-module/build.gradle
index 183d880b88ae3..9b27a84d5ec06 100644
--- a/integration-tests/gradle/src/test/resources/custom-config-java-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/custom-config-java-module/build.gradle
@@ -4,16 +4,20 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 group 'org.acme'
diff --git a/integration-tests/gradle/src/test/resources/custom-config-java-module/settings.gradle b/integration-tests/gradle/src/test/resources/custom-config-java-module/settings.gradle
index 36494c326c7a8..5c456b715cba6 100644
--- a/integration-tests/gradle/src/test/resources/custom-config-java-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/custom-config-java-module/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/custom-filesystem-provider/build.gradle b/integration-tests/gradle/src/test/resources/custom-filesystem-provider/build.gradle
index f816fe894f1a3..d9704e676ad08 100644
--- a/integration-tests/gradle/src/test/resources/custom-filesystem-provider/build.gradle
+++ b/integration-tests/gradle/src/test/resources/custom-filesystem-provider/build.gradle
@@ -1,8 +1,14 @@
 buildscript {
 
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
@@ -26,8 +32,14 @@ subprojects {
     }
 
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 
diff --git a/integration-tests/gradle/src/test/resources/custom-filesystem-provider/settings.gradle b/integration-tests/gradle/src/test/resources/custom-filesystem-provider/settings.gradle
index 5a0326d86083b..80c8e2a34641f 100644
--- a/integration-tests/gradle/src/test/resources/custom-filesystem-provider/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/custom-filesystem-provider/settings.gradle
@@ -1,7 +1,13 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/build.gradle b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/build.gradle
new file mode 100644
index 0000000000000..706e36869c219
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/build.gradle
@@ -0,0 +1,55 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+sourceSets {
+    integrationTest {
+        java.srcDir file('src/integration-test/java')
+        resources.srcDir file('src/integration-test/resources')
+        compileClasspath += sourceSets.main.output + project.configurations.testCompileClasspath
+        runtimeClasspath += sourceSets.main.output + project.configurations.testRuntimeClasspath
+    }
+}
+
+quarkus {
+    sourceSets {
+        extraNativeTest = sourceSets.integrationTest
+    }
+}
+quarkusBuild {
+    nativeArgs {
+        additionalArgs= ["--verbose"]
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/gradle.properties b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/settings.gradle b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/settings.gradle
new file mode 100644
index 0000000000000..72f00e40a2b5b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/settings.gradle
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='foo'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/integration-test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/integration-test/java/org/acme/ExampleResourceTest.java
new file mode 100644
index 0000000000000..b695c6be461e1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/integration-test/java/org/acme/ExampleResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class ExampleResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("hello"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..89804c62b5e24
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/native-test/java/org/acme/ExampleResourceNativeTest.java b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/native-test/java/org/acme/ExampleResourceNativeTest.java
new file mode 100644
index 0000000000000..6213d57d91613
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/custom-java-native-sourceset-module/src/native-test/java/org/acme/ExampleResourceNativeTest.java
@@ -0,0 +1,6 @@
+package org.acme;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ExampleResourceNativeTest extends ExampleResourceTest {}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/dotenv-config-java-module/build.gradle b/integration-tests/gradle/src/test/resources/dotenv-config-java-module/build.gradle
index 183d880b88ae3..9b27a84d5ec06 100644
--- a/integration-tests/gradle/src/test/resources/dotenv-config-java-module/build.gradle
+++ b/integration-tests/gradle/src/test/resources/dotenv-config-java-module/build.gradle
@@ -4,16 +4,20 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 group 'org.acme'
diff --git a/integration-tests/gradle/src/test/resources/dotenv-config-java-module/settings.gradle b/integration-tests/gradle/src/test/resources/dotenv-config-java-module/settings.gradle
index 554eb4c409868..10c9642e110bb 100644
--- a/integration-tests/gradle/src/test/resources/dotenv-config-java-module/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/dotenv-config-java-module/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/grpc-include-project/build.gradle b/integration-tests/gradle/src/test/resources/grpc-include-project/build.gradle
new file mode 100644
index 0000000000000..16cdde8142e0c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/grpc-include-project/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'io.quarkus:quarkus-grpc'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/grpc-include-project/gradle.properties b/integration-tests/gradle/src/test/resources/grpc-include-project/gradle.properties
new file mode 100644
index 0000000000000..b7078eaa33fca
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/grpc-include-project/gradle.properties
@@ -0,0 +1,3 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
+quarkus.generate-code.grpc.scan-for-imports=true
diff --git a/integration-tests/gradle/src/test/resources/grpc-include-project/settings.gradle b/integration-tests/gradle/src/test/resources/grpc-include-project/settings.gradle
new file mode 100644
index 0000000000000..1543ea4a87868
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/grpc-include-project/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name = 'grpc-include-project'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/test/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java
new file mode 100644
index 0000000000000..140a8a6b9d6f0
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/grpc-include-project/src/main/java/org/acme/quarkus/sample/HelloResource.java
@@ -0,0 +1,21 @@
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.example.HelloMsg;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        Integer number = HelloMsg.Status.TEST_ONE.getNumber();
+        // return a thing from proto file (for devmode test)
+        return "hello " + number;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/grpc-include-project/src/main/proto/hello.proto b/integration-tests/gradle/src/test/resources/grpc-include-project/src/main/proto/hello.proto
new file mode 100644
index 0000000000000..4ebcaf36db77a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/grpc-include-project/src/main/proto/hello.proto
@@ -0,0 +1,23 @@
+syntax = "proto3";
+package io.quarkus.example;
+
+option java_multiple_files = true;
+option java_package = "io.quarkus.example";
+
+import "google/protobuf/timestamp.proto";
+
+
+message HelloMsg {
+  enum Status {
+    UNKNOWN = 0;
+    NOT_SERVING = 1;
+    TEST_ONE = 2;
+  }
+  string message = 1;
+  google.protobuf.Timestamp date_time = 2;
+  Status status = 3;
+}
+
+service DevModeService {
+  rpc Check(HelloMsg) returns (HelloMsg);
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/grpc-multi-module-project/build.gradle b/integration-tests/gradle/src/test/resources/grpc-multi-module-project/build.gradle
index be9ab9c34df0a..4678c48609963 100644
--- a/integration-tests/gradle/src/test/resources/grpc-multi-module-project/build.gradle
+++ b/integration-tests/gradle/src/test/resources/grpc-multi-module-project/build.gradle
@@ -1,12 +1,16 @@
 buildscript {
-
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
-
 }
 
 apply plugin: 'java'
@@ -26,8 +30,14 @@ subprojects {
     }
 
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 
diff --git a/integration-tests/gradle/src/test/resources/grpc-multi-module-project/invalid.proto b/integration-tests/gradle/src/test/resources/grpc-multi-module-project/invalid.proto
new file mode 100644
index 0000000000000..b495ad37994d4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/grpc-multi-module-project/invalid.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+message DevModeRequest {
+  string service
+}
+
+
+message DevModeResponse {
+  enum Status {
+    UNKNOWN = 0;
+    NOT_SERVING = 1;
+    TEST_ONE = 2;
+  }
+  Status status = 1;
+}
diff --git a/integration-tests/gradle/src/test/resources/grpc-multi-module-project/settings.gradle b/integration-tests/gradle/src/test/resources/grpc-multi-module-project/settings.gradle
index 166c58e46a5e6..50c635c6cb036 100644
--- a/integration-tests/gradle/src/test/resources/grpc-multi-module-project/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/grpc-multi-module-project/settings.gradle
@@ -1,7 +1,13 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/application/build.gradle b/integration-tests/gradle/src/test/resources/implementation-files/application/build.gradle
new file mode 100644
index 0000000000000..37800d79c245a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/application/build.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id 'io.quarkus'
+}
+
+dependencies {
+    implementation files("../common/build/libs/common.jar")
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/test/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java
new file mode 100644
index 0000000000000..092d251dc1ebb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/application/src/main/java/org/acme/quarkus/sample/HelloResource.java
@@ -0,0 +1,22 @@
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.acme.common.CommonBean;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    CommonBean common;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello " + common.getName();
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/application/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/implementation-files/application/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3c1ac56a1ad0a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/application/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/build.gradle b/integration-tests/gradle/src/test/resources/implementation-files/build.gradle
new file mode 100644
index 0000000000000..14204c32561dd
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/build.gradle
@@ -0,0 +1,48 @@
+buildscript {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+apply plugin: 'java'
+
+group = 'com.quarkus.demo'
+version = '1.0'
+
+
+subprojects {
+
+    apply plugin: 'java'
+
+    test {
+        dependsOn 'cleanTest'
+        useJUnitPlatform()
+        forkEvery 1
+    }
+
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+    }
+
+    dependencies {
+        implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")    
+        implementation 'io.quarkus:quarkus-resteasy'
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/common/build.gradle b/integration-tests/gradle/src/test/resources/implementation-files/common/build.gradle
new file mode 100644
index 0000000000000..800c99a9396e1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/common/build.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id 'java-library'
+}
+
+dependencies {
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/test/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java
new file mode 100644
index 0000000000000..ace88a5b0e415
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/common/src/main/java/org/acme/common/CommonBean.java
@@ -0,0 +1,11 @@
+package org.acme.common;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class CommonBean {
+
+   public String getName() {
+       return "common";
+   }
+}
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/common/src/main/resources/META-INF/beans.xml b/integration-tests/gradle/src/test/resources/implementation-files/common/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000000..ddcbaf4800eb9
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans
+        xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+                      http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+        bean-discovery-mode="all">
+
+</beans>
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/gradle.properties b/integration-tests/gradle/src/test/resources/implementation-files/gradle.properties
new file mode 100644
index 0000000000000..8f063b7d88ba4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/implementation-files/settings.gradle b/integration-tests/gradle/src/test/resources/implementation-files/settings.gradle
new file mode 100644
index 0000000000000..c456b7403d6e1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/implementation-files/settings.gradle
@@ -0,0 +1,24 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    //noinspection GroovyAssignabilityCheck
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name = 'quarkus-basic-multi-module-build'
+
+include ':common'
+include ':application'
+
diff --git a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/application/build.gradle b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/application/build.gradle
index da2ac60d0190d..7d536950fe162 100644
--- a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/application/build.gradle
+++ b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/application/build.gradle
@@ -4,8 +4,15 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/build.gradle b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/build.gradle
index 446534c216bfc..ccfb994b1ac80 100644
--- a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/build.gradle
+++ b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/build.gradle
@@ -1,6 +1,13 @@
 buildscript {
      repositories {
-          mavenLocal()
+          // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+          if (System.properties.containsKey('maven.repo.local')) {
+               maven {
+                    url System.properties.get('maven.repo.local')
+               }
+          } else {
+               mavenLocal()
+          }
           mavenCentral()
      }
 }
@@ -12,7 +19,14 @@ allprojects {
 
 subprojects{
      repositories {
-          mavenLocal()
+          // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+          if (System.properties.containsKey('maven.repo.local')) {
+               maven {
+                    url System.properties.get('maven.repo.local')
+               }
+          } else {
+               mavenLocal()
+          }
           mavenCentral()
      }
 }
diff --git a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/library/build.gradle b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/library/build.gradle
index 05c7e84f86812..10f1ce6245b3f 100644
--- a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/library/build.gradle
+++ b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/library/build.gradle
@@ -3,8 +3,15 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/settings.gradle b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/settings.gradle
index c9627114348d7..aba50a9f6042d 100644
--- a/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/inject-bean-from-test-config/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/build.gradle b/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/build.gradle
index 6484513f4f4aa..0c0d58d4180b0 100644
--- a/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/build.gradle
+++ b/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/build.gradle
@@ -4,8 +4,15 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/settings.gradle b/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/settings.gradle
index 36494c326c7a8..5c456b715cba6 100644
--- a/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/inject-quarkus-app-properties/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/build.gradle b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/build.gradle
new file mode 100644
index 0000000000000..9a9126404f827
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/build.gradle
@@ -0,0 +1,7 @@
+plugins {
+    id 'io.quarkus'
+}
+
+dependencies {
+    implementation project(":common")
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java
new file mode 100644
index 0000000000000..092d251dc1ebb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/src/main/java/org/acme/quarkus/sample/HelloResource.java
@@ -0,0 +1,22 @@
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.acme.common.CommonBean;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    CommonBean common;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello " + common.getName();
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3c1ac56a1ad0a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/application/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/build.gradle b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/build.gradle
new file mode 100644
index 0000000000000..df815cc74e057
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/build.gradle
@@ -0,0 +1,49 @@
+buildscript {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+apply plugin: 'java'
+
+group = 'com.quarkus.demo'
+version = '1.0'
+
+
+subprojects {
+
+    apply plugin: 'java'
+
+    test {
+        dependsOn 'cleanTest'
+        useJUnitPlatform()
+        forkEvery 1
+    }
+
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+    }
+
+    dependencies {
+        implementation 'io.quarkus:quarkus-resteasy'
+
+        implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle
new file mode 100644
index 0000000000000..6bf5023edf727
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/build.gradle
@@ -0,0 +1,9 @@
+plugins {
+    id 'io.quarkus'
+    id 'java-library'
+    id "org.kordamp.gradle.jandex" version "0.6.0"
+}
+
+dependencies {
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java
new file mode 100644
index 0000000000000..ace88a5b0e415
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/common/src/main/java/org/acme/common/CommonBean.java
@@ -0,0 +1,11 @@
+package org.acme.common;
+
+import javax.enterprise.context.RequestScoped;
+
+@RequestScoped
+public class CommonBean {
+
+   public String getName() {
+       return "common";
+   }
+}
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/gradle.properties b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/gradle.properties
new file mode 100644
index 0000000000000..8f063b7d88ba4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/settings.gradle b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/settings.gradle
new file mode 100644
index 0000000000000..a4eba2734ec50
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/jandex-basic-multi-module-project/settings.gradle
@@ -0,0 +1,24 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name = 'quarkus-basic-multi-module-build'
+
+include ':common'
+include ':application'
+
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle
new file mode 100644
index 0000000000000..3067cf79331d9
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle
@@ -0,0 +1,45 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version "1.3.72"
+    id "org.jetbrains.kotlin.plugin.allopen" version "1.3.72"
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'io.quarkus:quarkus-kotlin'
+    implementation 'io.quarkus:quarkus-grpc'
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:kotlin-extensions'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+allOpen {
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    annotation("io.quarkus.test.junit.QuarkusTest")
+}
+
+compileKotlin {
+    kotlinOptions.javaParameters = true
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/gradle.properties b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/gradle.properties
new file mode 100644
index 0000000000000..8f063b7d88ba4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/settings.gradle b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/settings.gradle
new file mode 100644
index 0000000000000..5c456b715cba6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt
new file mode 100644
index 0000000000000..00c3c4f2a15c0
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/kotlin/org/acme/ExampleResource.kt
@@ -0,0 +1,16 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+import io.quarkus.example.HelloMsg
+
+@Path("/hello")
+class ExampleResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello() = "hello" + HelloMsg.Status.TEST_ONE.getNumber()
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/proto/hello.proto b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/proto/hello.proto
new file mode 100644
index 0000000000000..4ebcaf36db77a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/proto/hello.proto
@@ -0,0 +1,23 @@
+syntax = "proto3";
+package io.quarkus.example;
+
+option java_multiple_files = true;
+option java_package = "io.quarkus.example";
+
+import "google/protobuf/timestamp.proto";
+
+
+message HelloMsg {
+  enum Status {
+    UNKNOWN = 0;
+    NOT_SERVING = 1;
+    TEST_ONE = 2;
+  }
+  string message = 1;
+  google.protobuf.Timestamp date_time = 2;
+  Status status = 3;
+}
+
+service DevModeService {
+  rpc Check(HelloMsg) returns (HelloMsg);
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/resources/META-INF/resources/index.html b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..939e5639dbb49
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>code-with-quarkus - 1.0.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme</li>
+                <li>ArtifactId: code-with-quarkus</li>
+                <li>Version: 1.0.0-SNAPSHOT</li>
+                <li>Quarkus Version: 1.7.2.Final</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
+                <li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3c1ac56a1ad0a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt
new file mode 100644
index 0000000000000..fca00427884e7
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeExampleResourceIT : ExampleResourceTest()
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/test/kotlin/org/acme/ExampleResourceTest.kt b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/test/kotlin/org/acme/ExampleResourceTest.kt
new file mode 100644
index 0000000000000..18d3c9c8013cb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/src/test/kotlin/org/acme/ExampleResourceTest.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class ExampleResourceTest {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(`is`("hello2"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/build.gradle b/integration-tests/gradle/src/test/resources/list-extension-single-module/build.gradle
new file mode 100644
index 0000000000000..75094cb2a302d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/build.gradle
@@ -0,0 +1,36 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+     mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/gradle.properties b/integration-tests/gradle/src/test/resources/list-extension-single-module/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/settings.gradle b/integration-tests/gradle/src/test/resources/list-extension-single-module/settings.gradle
new file mode 100644
index 0000000000000..5c456b715cba6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..d01ef472250e2
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,24 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/hello")
+public class ExampleResource {
+
+    @ConfigProperty(name = "my-app-name")
+    String appName;
+    @ConfigProperty(name = "quarkus.application.version")
+    String appVersion;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return appName + " " + appVersion;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/main/resources/application.properties
new file mode 100644
index 0000000000000..b18c72feda9df
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+# Configuration file
+# key = value
+my-app-name=${quarkus.application.name}
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java
new file mode 100644
index 0000000000000..9b92351468aa0
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/test/java/org/acme/ExampleResourceTest.java
@@ -0,0 +1,29 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class ExampleResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("Hello from Test"));
+    }
+
+    @Test
+    public void testTestOnly() {
+      given()
+          .when().get("test-only")
+          .then()
+              .statusCode(200)
+              .body(is("Test only"));
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/list-extension-single-module/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/test/resources/application.properties
new file mode 100644
index 0000000000000..b2340b5f9173f
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/list-extension-single-module/src/test/resources/application.properties
@@ -0,0 +1,5 @@
+# Configuration file
+# key = value
+example.message=Hello from Test
+test-only=Test only
+
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/app/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/build.gradle
new file mode 100644
index 0000000000000..21b65330ee69c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/build.gradle
@@ -0,0 +1,29 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'org.acme:external-library:1.0.0-SNAPSHOT'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/app/settings.gradle b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/settings.gradle
new file mode 100644
index 0000000000000..80745a0d871b8
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/settings.gradle
@@ -0,0 +1,12 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name='app'
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..4a05673847be1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,22 @@
+package org.acme;
+
+import org.acme.lib.LibService;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class ExampleResource {
+
+    @Inject
+    LibService libService;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "foo " + libService.bar();
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/app/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/src/main/resources/application.properties
new file mode 100644
index 0000000000000..75b9417d6dc14
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/app/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/build.gradle
new file mode 100644
index 0000000000000..4cce1a80df2bd
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/build.gradle
@@ -0,0 +1,27 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-core'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/settings.gradle b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/settings.gradle
new file mode 100644
index 0000000000000..c64ace75b3c73
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name='external-library'
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java
new file mode 100644
index 0000000000000..5f872ecd6a32f
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/src/main/java/org/acme/lib/LibService.java
@@ -0,0 +1,10 @@
+package org.acme.lib;
+
+import javax.inject.Singleton;
+
+@Singleton
+public class LibService {
+    public String bar() {
+        return "bar";
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/src/main/resources/META-INF/beans.xml b/integration-tests/gradle/src/test/resources/multi-module-included-build/external-library/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/integration-tests/gradle/src/test/resources/multi-module-included-build/gradle.properties b/integration-tests/gradle/src/test/resources/multi-module-included-build/gradle.properties
new file mode 100644
index 0000000000000..a0bb7cd4da3b4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-module-included-build/gradle.properties
@@ -0,0 +1,4 @@
+#Gradle properties
+#Tue Aug 25 06:41:36 GMT 2020
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/build.gradle
index 4152ab9cf293c..80eb748e32188 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/build.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/build.gradle
@@ -25,7 +25,14 @@ allprojects {
     }
 
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 
diff --git a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/domain/build.gradle.kts b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/domain/build.gradle.kts
index 60f768cb9dc38..6b12a0cf7f0a6 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/domain/build.gradle.kts
+++ b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/domain/build.gradle.kts
@@ -1,5 +1,3 @@
 dependencies {
     implementation(project(":port"))
-    implementation("jakarta.enterprise:jakarta.enterprise.cdi-api")
-    implementation("jakarta.transaction:jakarta.transaction-api")
 }
diff --git a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/settings.gradle b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/settings.gradle
index b4e2ef9a5a04b..980dd275427ab 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/multi-module-named-injection/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-named-injection/build.gradle
index 794a075af64ed..07ee7b704e302 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-named-injection/build.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-named-injection/build.gradle
@@ -2,7 +2,14 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
+     // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+     if (System.properties.containsKey('maven.repo.local')) {
+          maven {
+               url System.properties.get('maven.repo.local')
+          }
+     } else {
+          mavenLocal()
+     }
      mavenCentral()
 }
 
diff --git a/integration-tests/gradle/src/test/resources/multi-module-named-injection/common/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-named-injection/common/build.gradle
index 5fb9179df89ca..050f75e6b60f2 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-named-injection/common/build.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-named-injection/common/build.gradle
@@ -3,16 +3,20 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     api enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     api 'io.quarkus:quarkus-smallrye-health'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 group 'org.acme'
diff --git a/integration-tests/gradle/src/test/resources/multi-module-named-injection/quarkus/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-named-injection/quarkus/build.gradle
index d3b3afa2d247d..444919091dde5 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-named-injection/quarkus/build.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-named-injection/quarkus/build.gradle
@@ -4,8 +4,15 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
@@ -13,9 +20,6 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy'
 
     implementation project(':common')
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 group 'org.acme'
diff --git a/integration-tests/gradle/src/test/resources/multi-module-named-injection/settings.gradle b/integration-tests/gradle/src/test/resources/multi-module-named-injection/settings.gradle
index 5fc0f6898005b..04571789f2de6 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-named-injection/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-named-injection/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/app/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/app/build.gradle
index 3aaee49261e2d..1b14007e3cbe5 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/app/build.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/app/build.gradle
@@ -4,8 +4,15 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/build.gradle
index 9a4da89f764b4..5b09c7df63fb9 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/build.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/build.gradle
@@ -8,7 +8,14 @@ subprojects {
     version = '1.0.0-SNAPSHOT'
 
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 }
diff --git a/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/settings.gradle b/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/settings.gradle
index 088c5c41cad35..ce2f7f663f9c3 100644
--- a/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/multi-module-parent-dependency/settings.gradle
@@ -1,7 +1,13 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/test/resources/multi-source-project/build.gradle
new file mode 100644
index 0000000000000..27664041d622e
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/build.gradle
@@ -0,0 +1,45 @@
+plugins {
+    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version "1.3.72"
+    id "org.jetbrains.kotlin.plugin.allopen" version "1.3.72"
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'io.quarkus:quarkus-kotlin'
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:kotlin-extensions'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+allOpen {
+    annotation("javax.ws.rs.Path")
+    annotation("javax.enterprise.context.ApplicationScoped")
+    annotation("io.quarkus.test.junit.QuarkusTest")
+}
+
+compileKotlin {
+    kotlinOptions.javaParameters = true
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/gradle.properties b/integration-tests/gradle/src/test/resources/multi-source-project/gradle.properties
new file mode 100644
index 0000000000000..8f063b7d88ba4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/settings.gradle b/integration-tests/gradle/src/test/resources/multi-source-project/settings.gradle
new file mode 100644
index 0000000000000..5c456b715cba6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java
new file mode 100644
index 0000000000000..433b9aeb179ec
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/java/org/acme/service/SimpleService.java
@@ -0,0 +1,13 @@
+package org.acme.service;
+
+import org.jetbrains.annotations.NotNull;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class SimpleService {
+    @NotNull
+    public String hello() {
+        return "hello from JavaComponent";
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt
new file mode 100644
index 0000000000000..c488bc2a37e42
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/kotlin/org/acme/ExampleResource.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import javax.inject.Inject
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+import org.acme.service.SimpleService
+
+@Path("/hello")
+class ExampleResource {
+
+    @Inject
+    lateinit var service: SimpleService
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello(): String = service.hello()
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/src/main/resources/META-INF/resources/index.html b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..939e5639dbb49
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>code-with-quarkus - 1.0.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme</li>
+                <li>ArtifactId: code-with-quarkus</li>
+                <li>Version: 1.0.0-SNAPSHOT</li>
+                <li>Quarkus Version: 1.7.2.Final</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html" target="_blank">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html" target="_blank">Getting started</a></li>
+                <li><a href="https://quarkus.io" target="_blank">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3c1ac56a1ad0a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt b/integration-tests/gradle/src/test/resources/multi-source-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt
new file mode 100644
index 0000000000000..fca00427884e7
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/src/native-test/kotlin/org/acme/NativeExampleResourceIT.kt
@@ -0,0 +1,6 @@
+package org.acme
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+class NativeExampleResourceIT : ExampleResourceTest()
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/src/test/kotlin/org/acme/ExampleResourceTest.kt b/integration-tests/gradle/src/test/resources/multi-source-project/src/test/kotlin/org/acme/ExampleResourceTest.kt
new file mode 100644
index 0000000000000..b5075d14d193f
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/multi-source-project/src/test/kotlin/org/acme/ExampleResourceTest.kt
@@ -0,0 +1,20 @@
+package org.acme
+
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured.given
+import org.hamcrest.CoreMatchers.`is`
+import org.junit.jupiter.api.Test
+
+@QuarkusTest
+class ExampleResourceTest {
+
+    @Test
+    fun testHelloEndpoint() {
+        given()
+          .`when`().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(`is`("hello from JavaComponent"))
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/mutable-jar/build.gradle b/integration-tests/gradle/src/test/resources/mutable-jar/build.gradle
new file mode 100644
index 0000000000000..0c0d58d4180b0
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/mutable-jar/build.gradle
@@ -0,0 +1,36 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
diff --git a/integration-tests/gradle/src/test/resources/mutable-jar/gradle.properties b/integration-tests/gradle/src/test/resources/mutable-jar/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/mutable-jar/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/mutable-jar/settings.gradle b/integration-tests/gradle/src/test/resources/mutable-jar/settings.gradle
new file mode 100644
index 0000000000000..5c456b715cba6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/mutable-jar/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..2cd1720641843
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/mutable-jar/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/hello")
+public class ExampleResource {
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/mutable-jar/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/mutable-jar/src/main/resources/application.properties
new file mode 100644
index 0000000000000..256ad245f801e
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/mutable-jar/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+# Configuration file
+# key = value
+my-app-name=${quarkus.application.name}
+quarkus.package.type=mutable-jar
+
diff --git a/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/src/test/resources/application.properties b/integration-tests/gradle/src/test/resources/mutable-jar/src/test/resources/application.properties
similarity index 100%
rename from integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/src/test/resources/application.properties
rename to integration-tests/gradle/src/test/resources/mutable-jar/src/test/resources/application.properties
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/build.gradle b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/build.gradle
new file mode 100644
index 0000000000000..cc9155e665eee
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/build.gradle
@@ -0,0 +1,39 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+    id 'application'
+}
+
+repositories {
+    mavenCentral()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    implementation 'io.quarkus:quarkus-hibernate-orm-panache'
+    quarkusDev 'io.quarkus:quarkus-jdbc-h2'
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
+application {
+    mainClass = 'org.acme.EntryPoint'
+}
+
+run {
+    // propagate the custom local maven repo, in case it's configured
+    if (System.properties.containsKey('maven.repo.local')) {
+        systemProperty 'maven.repo.local', System.properties.get('maven.repo.local')
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/gradle.properties b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/settings.gradle b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/settings.gradle
new file mode 100644
index 0000000000000..ef736ac60ab00
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/settings.gradle
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..2193180639cb9
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,17 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class ExampleResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        Project quarkus = Project.findById(100000L);
+        return quarkus.label;
+    }
+}
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java
new file mode 100644
index 0000000000000..c8740c90b3d9d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/java/org/acme/Project.java
@@ -0,0 +1,15 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Project extends PanacheEntity {
+    String label;
+}
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/resources/application.properties
new file mode 100644
index 0000000000000..0224db32e7226
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+quarkus.datasource.jdbc.driver=org.h2.Driver
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.sql-load-script=import.sql
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/resources/import.sql b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/resources/import.sql
new file mode 100644
index 0000000000000..659bda0262cdb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/quarkus-dev-dependency/src/main/resources/import.sql
@@ -0,0 +1,3 @@
+DELETE FROM Project WHERE id=100000;
+INSERT INTO Project (id, label)
+VALUES (100000,'Quarkus');
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-module/build.gradle
new file mode 100644
index 0000000000000..826f8eae9e3e1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'java'
+    id 'java-test-fixtures'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'my-groupId'
+version 'my-version'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/gradle.properties b/integration-tests/gradle/src/test/resources/test-fixtures-module/gradle.properties
new file mode 100644
index 0000000000000..081ae9b668e8b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/gradle.properties
@@ -0,0 +1,4 @@
+#Quarkus Gradle TS
+#Sat May 23 23:11:14 CEST 2020
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/settings.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-module/settings.gradle
new file mode 100644
index 0000000000000..8a6497075c76a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/settings.gradle
@@ -0,0 +1,21 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    //noinspection GroovyAssignabilityCheck
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+rootProject.name='io.quarkus.reproducer'
+
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyFactory.java b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyFactory.java
new file mode 100644
index 0000000000000..1d23464f731f7
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyFactory.java
@@ -0,0 +1,7 @@
+package org.my.group;
+
+public interface MyFactory {
+
+    MyService createMyService();
+
+}
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java
new file mode 100644
index 0000000000000..acdf0d34ab5bb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyResource.java
@@ -0,0 +1,16 @@
+package org.my.group;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class MyResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyService.java b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyService.java
new file mode 100644
index 0000000000000..ba19c269c70a0
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/main/java/org.my.group/MyService.java
@@ -0,0 +1,7 @@
+package org.my.group;
+
+public interface MyService {
+
+    String getSomething();
+
+}
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/src/test/java/org.my.group/MyResourceTest.java b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/test/java/org.my.group/MyResourceTest.java
new file mode 100644
index 0000000000000..3079858426b87
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/test/java/org.my.group/MyResourceTest.java
@@ -0,0 +1,20 @@
+package org.my.group;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.example.MyTestFactory;
+
+@QuarkusTest
+public class MyResourceTest {
+
+    @Test
+    public void testTestFixtures() {
+        MyService myService = new MyTestFactory().createMyService();
+
+        String result = myService.getSomething();
+
+        Assertions.assertEquals("test-fixtures", result);
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-module/src/testFixtures/java/org.my.group/MyTestFactory.java b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/testFixtures/java/org.my.group/MyTestFactory.java
new file mode 100644
index 0000000000000..5ebc159c1c729
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-module/src/testFixtures/java/org.my.group/MyTestFactory.java
@@ -0,0 +1,13 @@
+package com.example;
+
+import org.my.group.MyFactory;
+import org.my.group.MyService;
+
+public class MyTestFactory implements MyFactory {
+
+    @Override
+    public MyService createMyService() {
+        return () -> "test-fixtures";
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle
new file mode 100644
index 0000000000000..569d9c30e7a6d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/build.gradle
@@ -0,0 +1,39 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+
+    // Library-2 has to be dependency as implementation and test fixture
+    implementation(project(':library-2'))
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+    testImplementation(testFixtures(project(':library-2')))
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/src/main/java/org/example/Main.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/src/main/java/org/example/Main.java
new file mode 100644
index 0000000000000..139667bbcbb2d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/src/main/java/org/example/Main.java
@@ -0,0 +1,9 @@
+package org.example;
+
+public class Main {
+
+    // Here just because we want dependency
+    // to production code and test-fixtures of the same module
+    private MainLibrary2 mainLibrary2 = new MainLibrary2();
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/src/test/java/org/example/TestFixturesTest.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/src/test/java/org/example/TestFixturesTest.java
new file mode 100644
index 0000000000000..6c4e3423b3b6d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/application/src/test/java/org/example/TestFixturesTest.java
@@ -0,0 +1,14 @@
+package org.example;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class TestFixturesTest extends TestBase {
+
+    @Test
+    void testTestFixtures() {
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/build.gradle
new file mode 100644
index 0000000000000..03fc5d27fb7a8
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/build.gradle
@@ -0,0 +1,16 @@
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+allprojects {
+    group 'my-groupId'
+    version 'my-version'
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/gradle.properties b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/gradle.properties
new file mode 100644
index 0000000000000..8f063b7d88ba4
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/build.gradle
new file mode 100644
index 0000000000000..364a82fa0591c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/build.gradle
@@ -0,0 +1,34 @@
+plugins {
+    id 'java'
+    id 'java-test-fixtures'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation(project(":static-init-library"))
+    testFixturesImplementation(project(":static-init-library"))
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/main/java/org/example/MainLibrary1.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/main/java/org/example/MainLibrary1.java
new file mode 100644
index 0000000000000..c53278ea98ca6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/main/java/org/example/MainLibrary1.java
@@ -0,0 +1,8 @@
+package org.example;
+
+public class MainLibrary1 {
+
+    public void hereJustForDependency() {
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/main/java/org/example/OfyFactory.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/main/java/org/example/OfyFactory.java
new file mode 100644
index 0000000000000..9ab43a6ed017d
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/main/java/org/example/OfyFactory.java
@@ -0,0 +1,4 @@
+package org.example;
+
+public class OfyFactory extends ObjectFactory {
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/testFixtures/java/org/example/TestHelper.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/testFixtures/java/org/example/TestHelper.java
new file mode 100644
index 0000000000000..a4763ba4ebcff
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-1/src/testFixtures/java/org/example/TestHelper.java
@@ -0,0 +1,10 @@
+package org.example;
+
+
+public class TestHelper {
+
+    public void setUp() {
+        StaticInitLibrary.init(new OfyFactory());
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/build.gradle
new file mode 100644
index 0000000000000..a4864d0a6f923
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/build.gradle
@@ -0,0 +1,39 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+    id 'java-test-fixtures'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    testFixturesImplementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    testFixturesImplementation 'io.quarkus:quarkus-junit5'
+
+    // Library-1 has to be dependency as implementation and test fixture
+    testFixturesImplementation(project(':library-1'))
+    testFixturesImplementation(testFixtures(project(':library-1')))
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/src/main/java/org/example/MainLibrary2.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/src/main/java/org/example/MainLibrary2.java
new file mode 100644
index 0000000000000..f91a78e6a95bb
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/src/main/java/org/example/MainLibrary2.java
@@ -0,0 +1,8 @@
+package org.example;
+
+public class MainLibrary2 {
+
+    public void hereJustForDependency() {
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/src/testFixtures/java/org/example/TestBase.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/src/testFixtures/java/org/example/TestBase.java
new file mode 100644
index 0000000000000..9bc601dc203e7
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/library-2/src/testFixtures/java/org/example/TestBase.java
@@ -0,0 +1,22 @@
+package org.example;
+
+import org.junit.jupiter.api.BeforeEach;
+
+
+public class TestBase {
+
+    private final TestHelper helper;
+    private final MainLibrary1 mainLibrary1;
+
+    public TestBase() {
+        this.helper = new TestHelper();
+        this.mainLibrary1 = new MainLibrary1();
+    }
+
+    @BeforeEach
+    public void setUp() {
+        helper.setUp();
+        mainLibrary1.hereJustForDependency();
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/settings.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/settings.gradle
new file mode 100644
index 0000000000000..6c204b8a0c6ea
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/settings.gradle
@@ -0,0 +1,23 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    //noinspection GroovyAssignabilityCheck
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+
+include ':application', ':library-1', ':library-2', ':static-init-library'
+
+rootProject.name='io.quarkus.reproducer'
+
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/build.gradle b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/build.gradle
new file mode 100644
index 0000000000000..4546e954f9e1a
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/build.gradle
@@ -0,0 +1,6 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/src/main/java/org/example/ObjectFactory.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/src/main/java/org/example/ObjectFactory.java
new file mode 100644
index 0000000000000..19a84abbfacae
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/src/main/java/org/example/ObjectFactory.java
@@ -0,0 +1,9 @@
+package org.example;
+
+public class ObjectFactory {
+
+    private String returnValue() {
+        return "value";
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/src/main/java/org/example/StaticInitLibrary.java b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/src/main/java/org/example/StaticInitLibrary.java
new file mode 100644
index 0000000000000..d0e61f7cd4b3b
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-fixtures-multi-module/static-init-library/src/main/java/org/example/StaticInitLibrary.java
@@ -0,0 +1,11 @@
+package org.example;
+
+public class StaticInitLibrary {
+
+    private static ObjectFactory factory;
+
+    public static void init(ObjectFactory f) {
+        factory = f;
+    }
+
+}
diff --git a/integration-tests/gradle/src/test/resources/test-registry-repo/io/quarkus/registry/test/quarkus-platforms/1.0-SNAPSHOT/quarkus-platforms-1.0-SNAPSHOT.json b/integration-tests/gradle/src/test/resources/test-registry-repo/io/quarkus/registry/test/quarkus-platforms/1.0-SNAPSHOT/quarkus-platforms-1.0-SNAPSHOT.json
new file mode 100644
index 0000000000000..005be0766b3da
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-registry-repo/io/quarkus/registry/test/quarkus-platforms/1.0-SNAPSHOT/quarkus-platforms-1.0-SNAPSHOT.json
@@ -0,0 +1,7 @@
+{
+  "default-platform" : "$quarkusPlatformGroupId:$quarkusPlatformArtifactId::pom:$version",
+  "platforms" : [ {
+    "bom": "$quarkusPlatformGroupId:$quarkusPlatformArtifactId::pom:$version",
+    "quarkus-core-version": "$version"
+  } ]
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-registry-repo/io/quarkus/registry/test/quarkus-registry-descriptor/1.0-SNAPSHOT/quarkus-registry-descriptor-1.0-SNAPSHOT.json b/integration-tests/gradle/src/test/resources/test-registry-repo/io/quarkus/registry/test/quarkus-registry-descriptor/1.0-SNAPSHOT/quarkus-registry-descriptor-1.0-SNAPSHOT.json
new file mode 100644
index 0000000000000..c1a3b991ba2b1
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-registry-repo/io/quarkus/registry/test/quarkus-registry-descriptor/1.0-SNAPSHOT/quarkus-registry-descriptor-1.0-SNAPSHOT.json
@@ -0,0 +1,8 @@
+{
+  "platforms" : {
+    "artifact" : "io.quarkus.registry.test:quarkus-platforms::json:1.0-SNAPSHOT"
+  },
+  "non-platform-extensions" : {
+    "disabled" : true
+  }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle b/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle
index 6f613229fcceb..7c7113861f470 100644
--- a/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle
+++ b/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/application/build.gradle
@@ -19,7 +19,7 @@ test {
     forkEvery 1
 }
 
-quarkusPrepare {
+quarkusGenerateCode {
     dependsOn 'publishAcmeExt'
 }
 
diff --git a/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/build.gradle b/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/build.gradle
index da3e44bd62abd..f6fbae4c34e6a 100644
--- a/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/build.gradle
+++ b/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/build.gradle
@@ -1,12 +1,16 @@
 buildscript {
-
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
-
 }
 
 apply plugin: 'java'
@@ -21,8 +25,14 @@ subprojects {
     apply plugin: 'java'
 
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
     }
 }
diff --git a/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/settings.gradle b/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/settings.gradle
index c2119a0d58f2d..c7afad000bcda 100644
--- a/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/test-resources-in-build-steps/settings.gradle
@@ -1,7 +1,13 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/build.gradle b/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/build.gradle
index 6484513f4f4aa..0c0d58d4180b0 100644
--- a/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/build.gradle
+++ b/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/build.gradle
@@ -4,8 +4,15 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
diff --git a/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/settings.gradle b/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/settings.gradle
index 36494c326c7a8..5c456b715cba6 100644
--- a/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/test-resources-vs-main-resources/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/build.gradle b/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/build.gradle
index 6484513f4f4aa..6bcbe53905483 100644
--- a/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/build.gradle
+++ b/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/build.gradle
@@ -4,16 +4,20 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 group 'org.acme'
diff --git a/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/settings.gradle b/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/settings.gradle
index 36494c326c7a8..5c456b715cba6 100644
--- a/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/test-that-fast-jar-format-works/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/build.gradle b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/build.gradle
new file mode 100644
index 0000000000000..6bcbe53905483
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+}
+
+group 'org.acme'
+version '1.0.0-SNAPSHOT'
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}
diff --git a/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/gradle.properties b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/gradle.properties
new file mode 100644
index 0000000000000..ec2b6ef199c2c
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/gradle.properties
@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/settings.gradle b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/settings.gradle
new file mode 100644
index 0000000000000..5c456b715cba6
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java
new file mode 100644
index 0000000000000..2cd1720641843
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/src/main/java/org/acme/ExampleResource.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/hello")
+public class ExampleResource {
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/src/main/resources/application.properties b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/src/main/resources/application.properties
new file mode 100644
index 0000000000000..05a9559a3f155
--- /dev/null
+++ b/integration-tests/gradle/src/test/resources/test-that-legacy-jar-format-works/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+# Configuration file
+# key = value
+quarkus.package.type=legacy-jar
diff --git a/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/build.gradle b/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/build.gradle
index 6484513f4f4aa..6bcbe53905483 100644
--- a/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/build.gradle
+++ b/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/build.gradle
@@ -4,16 +4,20 @@ plugins {
 }
 
 repositories {
-     mavenLocal()
-     mavenCentral()
+    // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
 }
 
 dependencies {
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
-
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
 }
 
 group 'org.acme'
diff --git a/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/settings.gradle b/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/settings.gradle
index 176f0396673af..aa9114c253a47 100644
--- a/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/test-uber-jar-format-works/settings.gradle
@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/build.gradle b/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/build.gradle
index 89f430bff6527..5fc8f23eea273 100644
--- a/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/build.gradle
+++ b/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/build.gradle
@@ -1,12 +1,16 @@
 buildscript {
-
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
-
 }
 
 apply plugin: 'java'
@@ -26,19 +30,13 @@ subprojects {
     }
 
     repositories {
-        jcenter()
         mavenLocal()
         mavenCentral()
     }
 
     dependencies {
-
         implementation 'io.quarkus:quarkus-resteasy'
 
-        testImplementation 'io.quarkus:quarkus-junit5'
-        testImplementation 'io.rest-assured:rest-assured'
-
         implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-
     }
 }
diff --git a/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/settings.gradle b/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/settings.gradle
index e3337facbdb52..58eea89a5c9e8 100644
--- a/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/settings.gradle
+++ b/integration-tests/gradle/src/test/resources/uber-jar-for-multi-module-project/settings.gradle
@@ -1,7 +1,13 @@
 pluginManagement {
     repositories {
-        jcenter()
-        mavenLocal()
+        // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
         mavenCentral()
         gradlePluginPortal()
     }
diff --git a/integration-tests/gradle/update-dependencies.sh b/integration-tests/gradle/update-dependencies.sh
new file mode 100755
index 0000000000000..5d9205cfc172c
--- /dev/null
+++ b/integration-tests/gradle/update-dependencies.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Purpose: Updates pom.xml with (minimal) dependencies to other modules to enforce a consistent build order.
+
+set -e -u -o pipefail
+shopt -s failglob
+
+DEP_TEMPLATE='        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>XXX</artifactId>
+            <version>\${project.version}</version>
+        </dependency>'
+
+DEP_TEMPLATE_DEPLOYMENT='        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>XXX-deployment</artifactId>
+            <version>\${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>'
+
+echo ''
+echo 'Building dependencies list from gradle build files...'
+echo ''
+
+# get the Quarkus artifact ids from all gradle build files in this repo
+# pipefail is switched off briefly so that a better error can be logged when nothing is found
+set +o pipefail
+# note on sed: -deployment deps are added explicitly later and bom is upstream anyway
+ARTIFACT_IDS=`grep -hR --include 'build*.gradle' --exclude-dir=build '[iI]mplementation' | \
+              grep -Po '(?<=io\.quarkus:)quarkus-[a-z0-9-]+' | \
+              sed -e '/-deployment/d' -e '/quarkus-bom/d' | sort | uniq`
+set -o pipefail
+if [ -z "${ARTIFACT_IDS}" ]
+then
+  echo -e '\033[0;31mError:\033[0m Could not find any artifact-ids. Please check the grep command. ' 1>&2
+  exit 1
+fi
+
+# to replace newlines with \n so that the final sed calls accept ${DEPS} as input
+SED_EXPR_NEWLINES=':a;N;$!ba;s/\n/\\\n/g'
+
+DEPS=`echo "${ARTIFACT_IDS}" \
+  | xargs -i sh -c "echo \"${DEP_TEMPLATE}\" | sed 's/XXX/{}/'" \
+  | sed "${SED_EXPR_NEWLINES}"`
+
+DEPS+='\n'
+
+# note on sed: Remove artifacts that are not extensions (since not -deployment sibling exists).
+#              This is a bit fragile but without this -deployment deps would need to be added by hand.
+DEPS+=`echo "${ARTIFACT_IDS}" \
+  | sed -e '/-bootstrap/d' -e '/-test/d' -e '/-junit/d' -e '/-devtools/d' -e '/-descriptor/d' \
+  | xargs -i sh -c "echo \"${DEP_TEMPLATE_DEPLOYMENT}\" | sed 's/XXX/{}/'" \
+  | sed "${SED_EXPR_NEWLINES}"`
+
+MARK_START='<!-- START update-dependencies.sh -->'
+MARK_END='<!-- END update-dependencies.sh -->'
+SED_EXPR="/${MARK_START}/,/${MARK_END}/c\        ${MARK_START}\n${DEPS}\n        ${MARK_END}"
+
+echo ''
+echo 'Updating pom.xml...'
+echo ''
+sed -i "${SED_EXPR}" pom.xml
+
+echo ''
+echo 'Sanity check...'
+echo ''
+# sanity check; make sure nothing stupid was added like non-existing deps
+mvn dependency:resolve validate -Dsilent -q $*
\ No newline at end of file
diff --git a/integration-tests/grpc-health/disable-native-profile b/integration-tests/grpc-health/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/grpc-health/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/grpc-health/pom.xml b/integration-tests/grpc-health/pom.xml
index a86addf2e2c80..d4293d0e3e1c4 100644
--- a/integration-tests/grpc-health/pom.xml
+++ b/integration-tests/grpc-health/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-grpc-health</artifactId>
@@ -51,6 +50,47 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,7 +101,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>generate-code</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
@@ -70,59 +110,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthDisabledTest.java b/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthDisabledTest.java
index 9a0175632fee0..71ac15b08c1b0 100644
--- a/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthDisabledTest.java
+++ b/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthDisabledTest.java
@@ -23,7 +23,7 @@ public class MicroProfileHealthDisabledTest {
     public void shouldNotGetMpHealthInfoWhenDisabled() {
         // @formatter:off
         when()
-                .get("/health")
+                .get("/q/health")
         .then()
                 .statusCode(200)
                 .body("checks.size()", Matchers.equalTo(0));
diff --git a/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java b/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java
index 74c684797f2e0..e65209d009b56 100644
--- a/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java
+++ b/integration-tests/grpc-health/src/test/java/io/quarkus/grpc/health/MicroProfileHealthEnabledTest.java
@@ -68,7 +68,7 @@ public void shouldNotFailMpHealthCheckOnGettingUnknownServiceStatus() {
     private void checkHealthOk() {
         // @formatter:off
         when()
-                .get("/health")
+                .get("/q/health")
         .then()
                 .statusCode(200)
                 .body("checks[0].name", Matchers.equalTo("gRPC Server"))
diff --git a/integration-tests/grpc-interceptors/pom.xml b/integration-tests/grpc-interceptors/pom.xml
index b56c9aa018962..88c9197ca18a7 100644
--- a/integration-tests/grpc-interceptors/pom.xml
+++ b/integration-tests/grpc-interceptors/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-grpc-interceptors</artifactId>
@@ -47,6 +46,47 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -57,7 +97,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>generate-code</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
@@ -66,59 +106,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/grpc-mutual-auth/pom.xml b/integration-tests/grpc-mutual-auth/pom.xml
index bd36532d68cf7..0b01df1b7fe09 100644
--- a/integration-tests/grpc-mutual-auth/pom.xml
+++ b/integration-tests/grpc-mutual-auth/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-grpc-mutual-auth</artifactId>
@@ -47,6 +46,47 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -57,7 +97,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>generate-code</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
@@ -67,60 +107,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>java-8</id>
             <activation>
diff --git a/integration-tests/grpc-plain-text-gzip/pom.xml b/integration-tests/grpc-plain-text-gzip/pom.xml
new file mode 100644
index 0000000000000..a221d522568f6
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/pom.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-grpc-plain-text-gzip</artifactId>
+    <name>Quarkus - Integration Tests - gRPC - Plain Text with gzip compression</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--
+        mixing the grpc and ispn dependencies has been known to cause problems with jsr305 and epoll,
+        the following dependency is here to check if they work together:
+        -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-infinispan-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-infinispan-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-code</goal>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java
new file mode 100644
index 0000000000000..597f1f0df2fc8
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HeaderCollectingInterceptor.java
@@ -0,0 +1,45 @@
+package io.quarkus.grpc.examples.hello;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.grpc.internal.GrpcUtil;
+
+@ApplicationScoped
+public class HeaderCollectingInterceptor implements ClientInterceptor {
+    private volatile String encoding;
+
+    @Override
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
+            CallOptions callOptions, Channel next) {
+        return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+            @Override
+            public void start(Listener<RespT> responseListener, Metadata headers) {
+                super.start(
+                        new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
+                            @Override
+                            public void onHeaders(Metadata headers) {
+                                encoding = headers.get(GrpcUtil.MESSAGE_ENCODING_KEY);
+                                super.onHeaders(headers);
+                            }
+                        }, headers);
+            }
+        };
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void clear() {
+        encoding = null;
+    }
+
+}
diff --git a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java
new file mode 100644
index 0000000000000..bc5e50b03e881
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java
@@ -0,0 +1,59 @@
+package io.quarkus.grpc.examples.hello;
+
+import javax.inject.Inject;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import examples.GreeterGrpc;
+import examples.HelloReply;
+import examples.HelloRequest;
+import examples.MutinyGreeterGrpc;
+import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.smallrye.mutiny.Uni;
+
+@Path("/hello")
+public class HelloWorldEndpoint {
+
+    @Inject
+    @GrpcService("hello")
+    GreeterGrpc.GreeterBlockingStub blockingHelloService;
+    @Inject
+    @GrpcService("hello")
+    MutinyGreeterGrpc.MutinyGreeterStub mutinyHelloService;
+
+    @Inject
+    HeaderCollectingInterceptor headerCollectingInterceptor;
+
+    @GET
+    @Path("/blocking/{name}")
+    public String helloBlocking(@PathParam("name") String name) {
+        HelloReply reply = blockingHelloService.sayHello(HelloRequest.newBuilder().setName(name).build());
+        return generateResponse(reply);
+
+    }
+
+    @GET
+    @Path("/mutiny/{name}")
+    public Uni<String> helloMutiny(@PathParam("name") String name) {
+        return mutinyHelloService.sayHello(HelloRequest.newBuilder().setName(name).build())
+                .onItem().transform((reply) -> generateResponse(reply));
+    }
+
+    @Path("/encoding")
+    @GET
+    public String encodingUsedByGrpc() {
+        return headerCollectingInterceptor.getEncoding();
+    }
+
+    @Path("/encoding")
+    @DELETE
+    public void deleteEncodingData() {
+        headerCollectingInterceptor.clear();
+    }
+
+    public String generateResponse(HelloReply reply) {
+        return String.format("%s! HelloWorldService has been called %d number of times.", reply.getMessage(), reply.getCount());
+    }
+}
diff --git a/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java
new file mode 100644
index 0000000000000..aa1967bbd877c
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java
@@ -0,0 +1,25 @@
+package io.quarkus.grpc.examples.hello;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.inject.Singleton;
+
+import examples.GreeterGrpc;
+import examples.HelloReply;
+import examples.HelloRequest;
+import io.grpc.stub.StreamObserver;
+
+@Singleton
+public class HelloWorldService extends GreeterGrpc.GreeterImplBase {
+
+    AtomicInteger counter = new AtomicInteger();
+
+    @Override
+    public void sayHello(HelloRequest request, StreamObserver<HelloReply> responseObserver) {
+        int count = counter.incrementAndGet();
+        String name = request.getName();
+        String res = "Hello " + name;
+        responseObserver.onNext(HelloReply.newBuilder().setMessage(res).setCount(count).build());
+        responseObserver.onCompleted();
+    }
+}
diff --git a/integration-tests/grpc-plain-text-gzip/src/main/proto/helloworld.proto b/integration-tests/grpc-plain-text-gzip/src/main/proto/helloworld.proto
new file mode 100644
index 0000000000000..6da77d69b36b2
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/src/main/proto/helloworld.proto
@@ -0,0 +1,57 @@
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "examples";
+option java_outer_classname = "HelloWorldProto";
+option objc_class_prefix = "HLW";
+
+package helloworld;
+
+import "google/protobuf/timestamp.proto";
+
+// The greeting service definition.
+service Greeter {
+    // Sends a greeting
+    rpc SayHello (HelloRequest) returns (HelloReply) {}
+}
+
+// The request message containing the user's name.
+message HelloRequest {
+    string name = 1;
+    google.protobuf.Timestamp date_time = 2;
+}
+
+// The response message containing the greetings
+message HelloReply {
+    string message = 1;
+    int32 count = 2;
+}
diff --git a/integration-tests/grpc-plain-text-gzip/src/main/resources/application.properties b/integration-tests/grpc-plain-text-gzip/src/main/resources/application.properties
new file mode 100644
index 0000000000000..c5c793326226c
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+quarkus.grpc.clients.hello.host=localhost
+quarkus.grpc.server.compression=gzip
\ No newline at end of file
diff --git a/integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java
similarity index 100%
rename from integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java
rename to integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java
diff --git a/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java
new file mode 100644
index 0000000000000..3ef8141dbde17
--- /dev/null
+++ b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.grpc.examples.hello;
+
+import static io.restassured.RestAssured.delete;
+import static io.restassured.RestAssured.get;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class HelloWorldEndpointTest {
+
+    @BeforeEach
+    @AfterEach
+    public void cleanUp() {
+        delete("/hello/encoding").then().statusCode(204);
+    }
+
+    @Test
+    public void testHelloWorldServiceUsingBlockingStub() {
+        String response = get("/hello/blocking/neo").asString();
+        assertThat(response).startsWith("Hello neo");
+        assertThat(get("/hello/encoding").asString()).isEqualTo("gzip");
+    }
+
+    @Test
+    public void testHelloWorldServiceUsingMutinyStub() {
+        String response = get("/hello/mutiny/neo-mutiny").asString();
+        assertThat(response).startsWith("Hello neo-mutiny");
+        assertThat(get("/hello/encoding").asString()).isEqualTo("gzip");
+    }
+
+}
diff --git a/integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java
similarity index 100%
rename from integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java
rename to integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java
diff --git a/integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java b/integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java
similarity index 100%
rename from integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java
rename to integration-tests/grpc-plain-text-gzip/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java
diff --git a/integration-tests/grpc-plain-text-mutiny/pom.xml b/integration-tests/grpc-plain-text-mutiny/pom.xml
new file mode 100644
index 0000000000000..9f09512c3ef40
--- /dev/null
+++ b/integration-tests/grpc-plain-text-mutiny/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>quarkus-integration-tests-parent</artifactId>
+    <groupId>io.quarkus</groupId>
+    <version>999-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>quarkus-integration-test-grpc-plain-text-mutiny</artifactId>
+  <name>Quarkus - Integration Tests - gRPC - Plain Text with Mutiny</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-mutiny</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-grpc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-grpc-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/integration-tests/grpc-plain-text/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java b/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java
similarity index 100%
rename from integration-tests/grpc-plain-text/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java
rename to integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldEndpoint.java
diff --git a/integration-tests/grpc-plain-text/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java b/integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java
similarity index 100%
rename from integration-tests/grpc-plain-text/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java
rename to integration-tests/grpc-plain-text-mutiny/src/main/java/io/quarkus/grpc/examples/hello/HelloWorldService.java
diff --git a/integration-tests/grpc-plain-text/src/main/proto/helloworld.proto b/integration-tests/grpc-plain-text-mutiny/src/main/proto/helloworld.proto
similarity index 100%
rename from integration-tests/grpc-plain-text/src/main/proto/helloworld.proto
rename to integration-tests/grpc-plain-text-mutiny/src/main/proto/helloworld.proto
diff --git a/integration-tests/grpc-plain-text/src/main/resources/application.properties b/integration-tests/grpc-plain-text-mutiny/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/grpc-plain-text/src/main/resources/application.properties
rename to integration-tests/grpc-plain-text-mutiny/src/main/resources/application.properties
diff --git a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java
new file mode 100644
index 0000000000000..17f195143ebf5
--- /dev/null
+++ b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.grpc.examples.hello;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class HelloWorldEndpointIT extends HelloWorldEndpointTest {
+
+}
\ No newline at end of file
diff --git a/integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java
similarity index 100%
rename from integration-tests/grpc-plain-text/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java
rename to integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldEndpointTest.java
diff --git a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java
new file mode 100644
index 0000000000000..addf2badc869b
--- /dev/null
+++ b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.grpc.examples.hello;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class HelloWorldServiceIT extends HelloWorldEndpointTest {
+
+}
\ No newline at end of file
diff --git a/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java
new file mode 100644
index 0000000000000..1f775a5177ae8
--- /dev/null
+++ b/integration-tests/grpc-plain-text-mutiny/src/test/java/io/quarkus/grpc/examples/hello/HelloWorldServiceTest.java
@@ -0,0 +1,52 @@
+package io.quarkus.grpc.examples.hello;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import examples.GreeterGrpc;
+import examples.HelloReply;
+import examples.HelloRequest;
+import examples.MutinyGreeterGrpc;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class HelloWorldServiceTest {
+
+    private ManagedChannel channel;
+
+    @BeforeEach
+    public void init() {
+        channel = ManagedChannelBuilder.forAddress("localhost", 9000).usePlaintext().build();
+    }
+
+    @AfterEach
+    public void cleanup() throws InterruptedException {
+        channel.shutdown();
+        channel.awaitTermination(10, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testHelloWorldServiceUsingBlockingStub() {
+        GreeterGrpc.GreeterBlockingStub client = GreeterGrpc.newBlockingStub(channel);
+        HelloReply reply = client
+                .sayHello(HelloRequest.newBuilder().setName("neo-blocking").build());
+        assertThat(reply.getMessage()).isEqualTo("Hello neo-blocking");
+    }
+
+    @Test
+    public void testHelloWorldServiceUsingMutinyStub() {
+        HelloReply reply = MutinyGreeterGrpc.newMutinyStub(channel)
+                .sayHello(HelloRequest.newBuilder().setName("neo-blocking").build())
+                .await().atMost(Duration.ofSeconds(5));
+        assertThat(reply.getMessage()).isEqualTo("Hello neo-blocking");
+    }
+
+}
diff --git a/integration-tests/grpc-plain-text/pom.xml b/integration-tests/grpc-plain-text/pom.xml
deleted file mode 100644
index 2f5b07acb5f95..0000000000000
--- a/integration-tests/grpc-plain-text/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>quarkus-integration-tests-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <artifactId>quarkus-integration-test-grpc-plain-text</artifactId>
-    <name>Quarkus - Integration Tests - gRPC - Plain Text</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-grpc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare</goal>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/integration-tests/grpc-proto-v2/pom.xml b/integration-tests/grpc-proto-v2/pom.xml
index 08f4361b2427f..13d64055e7c22 100644
--- a/integration-tests/grpc-proto-v2/pom.xml
+++ b/integration-tests/grpc-proto-v2/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-grpc-proto-v2</artifactId>
@@ -47,17 +46,58 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
-		        <plugin>
+            <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>generate-code</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
@@ -66,59 +106,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/grpc-streaming/disable-native-profile b/integration-tests/grpc-streaming/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/grpc-streaming/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/grpc-streaming/pom.xml b/integration-tests/grpc-streaming/pom.xml
index e5856a99c5a45..354ae16a61924 100644
--- a/integration-tests/grpc-streaming/pom.xml
+++ b/integration-tests/grpc-streaming/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-grpc-streaming</artifactId>
@@ -51,6 +50,60 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,7 +114,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>generate-code</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
@@ -70,59 +123,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java b/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java
index c32439d18a190..709ba98ca2a56 100644
--- a/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java
+++ b/integration-tests/grpc-streaming/src/main/java/io/quarkus/grpc/example/streaming/StreamingEndpoint.java
@@ -4,8 +4,6 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import io.grpc.examples.streaming.Empty;
 import io.grpc.examples.streaming.Item;
@@ -15,7 +13,6 @@
 import io.smallrye.mutiny.Uni;
 
 @Path("/streaming")
-@Produces(MediaType.APPLICATION_JSON)
 public class StreamingEndpoint {
 
     @Inject
diff --git a/integration-tests/grpc-tls/pom.xml b/integration-tests/grpc-tls/pom.xml
index 4cec78fc1f07a..45a47b589093f 100644
--- a/integration-tests/grpc-tls/pom.xml
+++ b/integration-tests/grpc-tls/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-grpc-tls</artifactId>
@@ -47,6 +46,47 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -57,7 +97,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>prepare</goal>
+                            <goal>generate-code</goal>
                             <goal>build</goal>
                         </goals>
                     </execution>
@@ -67,60 +107,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>java-8</id>
             <activation>
diff --git a/integration-tests/grpc-tls/src/main/resources/application.properties b/integration-tests/grpc-tls/src/main/resources/application.properties
index d9f6c079434a3..246415387c7e3 100644
--- a/integration-tests/grpc-tls/src/main/resources/application.properties
+++ b/integration-tests/grpc-tls/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 quarkus.grpc.clients.hello.host=localhost
-quarkus.grpc.clients.hello.ssl.trust-store=src/main/resources/tls/ca.pem
+quarkus.grpc.clients.hello.ssl.trust-store=tls/ca.pem
 
-quarkus.grpc.server.ssl.certificate=src/main/resources/tls/server.pem
-quarkus.grpc.server.ssl.key=src/main/resources/tls/server.key
\ No newline at end of file
+quarkus.grpc.server.ssl.certificate=tls/server.pem
+quarkus.grpc.server.ssl.key=tls/server.key
\ No newline at end of file
diff --git a/integration-tests/hibernate-orm-envers/pom.xml b/integration-tests/hibernate-orm-envers/pom.xml
index faf51678a9142..844b236a50672 100644
--- a/integration-tests/hibernate-orm-envers/pom.xml
+++ b/integration-tests/hibernate-orm-envers/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -50,6 +49,60 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-envers-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -74,63 +127,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java
index 755e7404846bb..2db0a597c4b1e 100644
--- a/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java
+++ b/integration-tests/hibernate-orm-envers/src/main/java/io/quarkus/it/envers/ProjectResource.java
@@ -1,6 +1,5 @@
 package io.quarkus.it.envers;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
@@ -15,9 +14,10 @@
 import org.hibernate.envers.query.AuditEntity;
 
 import io.quarkus.runtime.StartupEvent;
+import io.smallrye.common.annotation.Blocking;
 
 @Path("/project")
-@ApplicationScoped
+@Blocking
 public class ProjectResource {
 
     @Inject
diff --git a/integration-tests/hibernate-orm-envers/src/main/resources/application.properties b/integration-tests/hibernate-orm-envers/src/main/resources/application.properties
index fd159c0e16e3e..081c30e274bf8 100644
--- a/integration-tests/hibernate-orm-envers/src/main/resources/application.properties
+++ b/integration-tests/hibernate-orm-envers/src/main/resources/application.properties
@@ -1,7 +1,6 @@
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.max-size=8
-quarkus.datasource.min-size=2
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/hibernate-orm-panache-kotlin/disable-native-profile b/integration-tests/hibernate-orm-panache-kotlin/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/hibernate-orm-panache-kotlin/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/hibernate-orm-panache-kotlin/pom.xml b/integration-tests/hibernate-orm-panache-kotlin/pom.xml
index 95148392399cc..25c97e63fc12b 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/pom.xml
+++ b/integration-tests/hibernate-orm-panache-kotlin/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -64,11 +63,6 @@
             <artifactId>quarkus-jackson</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test</artifactId>
@@ -93,6 +87,99 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-kotlin-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -157,65 +244,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt
index 63c6acb9dedda..9df8e3b38cb2f 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/AccessorEntity.kt
@@ -18,8 +18,13 @@ open class AccessorEntity : GenericEntity<Int>() {
             setICalls++
             field = value
         }
-    @JvmField
-    var l: Long = 0
+    var l: Long
+        get() {
+            throw UnsupportedOperationException("just checking")
+        }
+        set(value) {
+            throw UnsupportedOperationException("just checking")
+        }
     var f = 0f
     var d = 0.0
     @javax.persistence.Transient
@@ -37,10 +42,6 @@ open class AccessorEntity : GenericEntity<Int>() {
     @Transient
     var setTransCalls = 0
 
-    fun getL(): Long = throw UnsupportedOperationException("just checking")
-    fun setL(value: Long) {
-        throw UnsupportedOperationException("just checking")
-    }
 
     fun method() { // touch some fields
         val b2 = b
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt
index 7bec881ced41c..67b93ce533f62 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Address.kt
@@ -1,6 +1,6 @@
 package io.quarkus.it.panache.kotlin
 
-import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanion
+import io.quarkus.hibernate.orm.panache.kotlin.PanacheCompanionBase
 import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntityBase
 import javax.persistence.Entity
 import javax.persistence.GeneratedValue
@@ -8,7 +8,7 @@ import javax.persistence.Id
 
 @Entity
 open class Address : PanacheEntityBase {
-    companion object : PanacheCompanion<Address, Int> {
+    companion object : PanacheCompanionBase<Address, Int> {
         override fun count(query: String, params: Map<String, Any>): Long {
             AddressDao.shouldBeOverridden()
         }
@@ -19,7 +19,7 @@ open class Address : PanacheEntityBase {
     @JvmField
     var id: Int? = null
 
-    lateinit var street: String
+    var street: String? = null
 
     var street2: String? = null
 
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt
index 2b954095db422..1e78426b9ac5f 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Dog.kt
@@ -10,7 +10,7 @@ import javax.persistence.ManyToOne
 
 @Entity
 open class Dog() : PanacheEntityBase {
-    companion object : PanacheCompanion<Dog, Long>
+    companion object : PanacheCompanion<Dog>
 
     constructor(name: String, race: String): this() {
         this.name = name
@@ -19,8 +19,8 @@ open class Dog() : PanacheEntityBase {
 
     @ManyToOne
     var owner: Person? = null
-    lateinit var name: String
-    lateinit var race: String
+    var name: String? = null
+    var race: String? = null
     /**
      * The auto-generated ID field. This field is set by Hibernate ORM when this entity
      * is persisted.
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt
index acb8991abf7e0..84bb899cf95ff 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/Person.kt
@@ -30,7 +30,7 @@ import javax.persistence.EnumType
     Filter(name = "Person.hasName")
 )
 open class Person : PanacheEntity() {
-    companion object : PanacheCompanion<Person, Long> {
+    companion object : PanacheCompanion<Person> {
         fun findOrdered(): List<Address>  = AddressDao.shouldBeOverridden()
     }
 
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt
index 324340902bde9..c7127002ce28b 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/PersonRepository.kt
@@ -1,12 +1,12 @@
 package io.quarkus.it.panache.kotlin
 
 import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository
-import io.quarkus.hibernate.orm.panache.kotlin.runtime.JpaOperations
+import io.quarkus.hibernate.orm.panache.kotlin.runtime.KotlinJpaOperations.INSTANCE
 import javax.enterprise.context.ApplicationScoped
 
 @ApplicationScoped
 open class PersonRepository : PanacheRepository<Person> {
     override fun count(query: String, params: Map<String, Any>): Long {
-        return JpaOperations.count(Person::class.java, query, params)
+        return INSTANCE.count(Person::class.java, query, params)
     }
 }
\ No newline at end of file
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt
index 3ecd18bbbbcca..4032f199a1a89 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/kotlin/io/quarkus/it/panache/kotlin/TestEndpoint.kt
@@ -9,10 +9,10 @@ import org.hibernate.engine.spi.SelfDirtinessTracker
 import org.hibernate.jpa.QueryHints
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.fail
-import org.wildfly.common.Assert
 import java.lang.UnsupportedOperationException
 import java.lang.reflect.Field
 import java.lang.reflect.Method
+import java.util.UUID
 import java.util.stream.Collectors
 import java.util.stream.Stream
 import javax.inject.Inject
@@ -38,6 +38,16 @@ class TestEndpoint {
     @Path("model")
     @Transactional
     fun testModel(): String {
+        Assertions.assertDoesNotThrow {
+            Person.findById(Long.MIN_VALUE)
+        }
+        Assertions.assertDoesNotThrow {
+            Person.find("name = ?1", UUID.randomUUID().toString()).firstResult()
+        }
+        Assertions.assertThrows(NoResultException::class.java, {
+            Person.find("name = ?1", UUID.randomUUID().toString()).singleResult()
+        })
+
         var persons: List<Person> = Person.findAll().list()
         Assertions.assertEquals(0, persons.size)
 
@@ -848,17 +858,9 @@ class TestEndpoint {
         Assertions.assertEquals(2, entity.getBCalls)
         Assertions.assertEquals(2, entity.setICalls)
 
-        try {
-            entity.l
-            fail("This call should have invoked getL() which throws an exception")
-        } catch(_ : UnsupportedOperationException) {
-        }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { entity.l }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { entity.l = 42 }
 
-        try {
-            entity.l = 42
-            fail("This call should have invoked setL() which throws an exception")
-        } catch(_ : UnsupportedOperationException) {
-        }
         return "OK"
     }
 
@@ -874,7 +876,7 @@ class TestEndpoint {
         Person.deleteAll()
         Assertions.assertEquals(0, Person.count())
 
-        val person: Person = makeSavedPerson()
+        val person: Person = makeSavedPerson("")
         val trackingPerson = person as SelfDirtinessTracker
 
         var dirtyAttributes = trackingPerson.`$$_hibernate_getDirtyAttributes`()
@@ -970,15 +972,15 @@ class TestEndpoint {
 
         // Ensure that any JAX-B annotations are properly moved to generated getters
         var m: Method = JAXBEntity::class.java.getMethod("getNamedAnnotatedProp")
-        var anno = m.getAnnotation(XmlAttribute::class.java)
-        Assertions.assertNotNull(anno)
-        Assertions.assertEquals("Named", anno.name)
+        var annotation = m.getAnnotation(XmlAttribute::class.java)
+        Assertions.assertNotNull(annotation)
+        Assertions.assertEquals("Named", annotation.name)
         Assertions.assertNull(m.getAnnotation(XmlTransient::class.java))
 
         m = JAXBEntity::class.java.getMethod("getDefaultAnnotatedProp")
-        anno = m.getAnnotation(XmlAttribute::class.java)
-        Assertions.assertNotNull(anno)
-        Assertions.assertEquals("##default", anno.name)
+        annotation = m.getAnnotation(XmlAttribute::class.java)
+        Assertions.assertNotNull(annotation)
+        Assertions.assertEquals("##default", annotation.name)
         Assertions.assertNull(m.getAnnotation(XmlTransient::class.java))
 
         m = JAXBEntity::class.java.getMethod("getUnAnnotatedProp")
@@ -991,12 +993,12 @@ class TestEndpoint {
 
         m = JAXBEntity::class.java.getMethod("getArrayAnnotatedProp")
         Assertions.assertNull(m.getAnnotation(XmlTransient::class.java))
-        val elementsAnno = m.getAnnotation(XmlElements::class.java)
-        Assertions.assertNotNull(elementsAnno)
-        Assertions.assertNotNull(elementsAnno.value)
-        Assertions.assertEquals(2, elementsAnno.value.size)
-        Assertions.assertEquals("array1", elementsAnno.value.get(0).name)
-        Assertions.assertEquals("array2", elementsAnno.value.get(1).name)
+        val elementsAnnotation = m.getAnnotation(XmlElements::class.java)
+        Assertions.assertNotNull(elementsAnnotation)
+        Assertions.assertNotNull(elementsAnnotation.value)
+        Assertions.assertEquals(2, elementsAnnotation.value.size)
+        Assertions.assertEquals("array1", elementsAnnotation.value[0].name)
+        Assertions.assertEquals("array2", elementsAnnotation.value[1].name)
 
         // Ensure that all original fields were labeled @XmlTransient and had their original JAX-B annotations removed
         ensureFieldSanitized("namedAnnotatedProp")
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/main/resources/application.properties b/integration-tests/hibernate-orm-panache-kotlin/src/main/resources/application.properties
index 16c242fdf8970..36ee4a18acd81 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/main/resources/application.properties
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/main/resources/application.properties
@@ -1,7 +1,6 @@
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.max-size=8
-quarkus.datasource.min-size=2
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt
index 9488a2056fbdd..5d2a177963cf8 100644
--- a/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt
+++ b/integration-tests/hibernate-orm-panache-kotlin/src/test/kotlin/io/quarkus/it/panache/TestEndpointRunner.kt
@@ -77,7 +77,7 @@ class TestEndpointRunner {
     private fun invokeNonOverload(function: () -> Any?) {
         try {
             function()
-        } catch (ignored: Exception) {
+        } catch (ignored: java.lang.UnsupportedOperationException) {
             fail("This method should have been replaced", ignored)
         }
     }
diff --git a/integration-tests/hibernate-orm-panache/pom.xml b/integration-tests/hibernate-orm-panache/pom.xml
index f90a40ffc0052..5720964104218 100644
--- a/integration-tests/hibernate-orm-panache/pom.xml
+++ b/integration-tests/hibernate-orm-panache/pom.xml
@@ -6,21 +6,12 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-integration-test-hibernate-orm-panache</artifactId>
     <name>Quarkus - Integration Tests - Hibernate ORM with Panache</name>
 
-    <!--
-        This is enabled in the Quarkus Maven archetype but not on the integration tests.
-        PanacheQuery.project(Class) needs it.
-    -->
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -60,6 +51,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -118,6 +113,138 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -162,63 +289,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookResource.java
deleted file mode 100644
index 3f8a62e33de25..0000000000000
--- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookResource.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.quarkus.it.panache;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.transaction.Transactional;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-@Path("/book")
-public class BookResource {
-
-    @Inject
-    BookDao bookDao;
-
-    @Transactional
-    @GET
-    @Path("/{name}/{author}")
-    @Produces(MediaType.APPLICATION_JSON)
-    public List<Book> addAndListAll(@PathParam("name") String name, @PathParam("author") String author) {
-        bookDao.persist(new Book(name, author));
-        return bookDao.listAll();
-    }
-}
diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto.java
new file mode 100644
index 0000000000000..6c506dc5d89ca
--- /dev/null
+++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.panache;
+
+import io.quarkus.hibernate.orm.panache.ProjectedFieldName;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+public class DogDto {
+
+    public String name;
+
+    public String ownerName;
+
+    public DogDto(String name, @ProjectedFieldName("owner.name") String ownerName) {
+        this.name = name;
+        this.ownerName = ownerName;
+    }
+
+}
diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java
index 093455562d175..18f85e29dffe6 100644
--- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java
+++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java
@@ -61,7 +61,7 @@ public static List<Person> findOrdered() {
 
     // For https://github.com/quarkusio/quarkus/issues/9635
     public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Object... params) {
-        return (PanacheQuery<T>) JpaOperations.find(Person.class, query, params);
+        return (PanacheQuery<T>) JpaOperations.INSTANCE.find(Person.class, query, params);
     }
 
     // For JAXB: both getter and setter are required
diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java
index 971a987404c7c..6a3d0205d8012 100644
--- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java
+++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java
@@ -1054,7 +1054,7 @@ private void checkMethod(Class<?> klass, String name, Class<?> returnType, Class
     public String testModel1() {
         Assertions.assertEquals(0, Person.count());
 
-        Person person = makeSavedPerson();
+        Person person = makeSavedPerson("");
         SelfDirtinessTracker trackingPerson = (SelfDirtinessTracker) person;
 
         String[] dirtyAttributes = trackingPerson.$$_hibernate_getDirtyAttributes();
@@ -1107,6 +1107,11 @@ public String testProjection() {
 
         Assertions.assertEquals(1, Person.findAll().project(PersonName.class).count());
 
+        Person owner = makeSavedPerson();
+        DogDto dogDto = Dog.findAll().project(DogDto.class).firstResult();
+        Assertions.assertEquals("stef", dogDto.ownerName);
+        owner.delete();
+
         return "OK";
     }
 
@@ -1215,7 +1220,7 @@ public String testJaxbAnnotationTransfer() throws Exception {
     }
 
     private void ensureFieldSanitized(String fieldName) throws Exception {
-        Field f = JAXBEntity.class.getField(fieldName);
+        Field f = JAXBEntity.class.getDeclaredField(fieldName);
         assertNull(f.getAnnotation(XmlAttribute.class));
         assertNotNull(f.getAnnotation(XmlTransient.class));
     }
diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java
new file mode 100644
index 0000000000000..3228b2af75cbc
--- /dev/null
+++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.panache.resources;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import io.quarkus.it.panache.Book;
+import io.quarkus.it.panache.BookDao;
+
+@Path("/book")
+public class BookResource {
+
+    @Inject
+    BookDao bookDao;
+
+    @Transactional
+    @GET
+    @Path("/{name}/{author}")
+    public List<Book> addAndListAll(@PathParam("name") String name, @PathParam("author") String author) {
+        bookDao.persist(new Book(name, author));
+        return bookDao.listAll();
+    }
+}
diff --git a/integration-tests/hibernate-orm-panache/src/main/resources/application.properties b/integration-tests/hibernate-orm-panache/src/main/resources/application.properties
index 681a5037798bb..f0d41dd21c6bc 100644
--- a/integration-tests/hibernate-orm-panache/src/main/resources/application.properties
+++ b/integration-tests/hibernate-orm-panache/src/main/resources/application.properties
@@ -1,7 +1,9 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.hibernate-orm.statistics=true
+quarkus.hibernate-orm.metrics.enabled=true
\ No newline at end of file
diff --git a/integration-tests/hibernate-orm-panache/src/main/resources/nopaging.properties b/integration-tests/hibernate-orm-panache/src/main/resources/nopaging.properties
index 4a194385d522d..d15f255c940fa 100644
--- a/integration-tests/hibernate-orm-panache/src/main/resources/nopaging.properties
+++ b/integration-tests/hibernate-orm-panache/src/main/resources/nopaging.properties
@@ -1,7 +1,6 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java
index 47f341da3d64f..81e59b415072c 100644
--- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java
+++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java
@@ -16,6 +16,7 @@ public class JacksonTest {
     public void testJsonIgnoreHonoured() {
         List<Book> books = RestAssured.when().get("/book/Berlin/Beevor").then().extract().body().jsonPath().getList(".",
                 Book.class);
+
         assertThat(books).hasSize(1).filteredOn(book -> book.author != null).isEmpty();
     }
 }
diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java
index f67a867480d57..cf1335df76c6b 100644
--- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java
+++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java
@@ -1,11 +1,11 @@
 package io.quarkus.it.panache;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
 /**
  * Test various Panache operations running in native mode
  */
-@NativeImageTest
+@QuarkusIntegrationTest
 public class PanacheFunctionalityInGraalITCase extends PanacheFunctionalityTest {
 
 }
diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java
index 20c5b87b2b5c2..bd5878b28b20f 100644
--- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java
+++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.panache;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -18,6 +19,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil;
+import io.quarkus.test.junit.DisabledOnIntegrationTest;
 import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -88,7 +91,7 @@ public void testJaxbAnnotationTransfer() {
     /**
      * _PanacheEntityBase_ has the method _isPersistent_. This method is used by Jackson to serialize the attribute *peristent*
      * in the JSON which is not intended. This test ensures that the attribute *persistent* is not generated when using Jackson.
-     * 
+     *
      * This test does not interact with the Quarkus application itself. It is just using the Jackson ObjectMapper with a
      * PanacheEntity. Thus this test is disabled in native mode. The test code runs the JVM and not native.
      */
@@ -103,7 +106,7 @@ public void jacksonDeserializationIgnoresPersistentAttribute() throws JsonProces
         // make sure the Jaxb module is loaded
         objectMapper.findAndRegisterModules();
         String personAsString = objectMapper.writeValueAsString(person);
-        // check 
+        // check
         // hence no 'persistence'-attribute
         assertEquals(
                 "{\"id\":null,\"name\":\"max\",\"uniqueName\":null,\"address\":null,\"status\":null,\"dogs\":[],\"serialisationTrick\":1}",
@@ -133,7 +136,7 @@ public void jaxbDeserializationHasAllFields() throws JsonProcessingException, JA
     /**
      * This test is disabled in native mode as there is no interaction with the quarkus integration test endpoint.
      */
-    @DisabledOnNativeImage
+    @DisabledOnIntegrationTest
     @Test
     public void jsonbDeserializationHasAllFields() throws JsonProcessingException {
         // set Up
@@ -176,6 +179,15 @@ public void testBug9036() {
         RestAssured.when().get("/test/9036").then().body(is("OK"));
     }
 
+    @Test
+    public void testMetrics() {
+        RestAssured.when()
+                .get("/q/metrics")
+                .then()
+                .body(containsString("vendor_hibernate_cache_update_timestamps_requests_total{entityManagerFactory=\""
+                        + PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME + "\",result=\"miss\"}"));
+    }
+
     @DisabledOnNativeImage
     @Transactional
     @Test
diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionTest.java
new file mode 100644
index 0000000000000..892c9168979a3
--- /dev/null
+++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionTest.java
@@ -0,0 +1,33 @@
+package io.quarkus.it.panache;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.TestTransaction;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Tests that @TestTransaction works as expected
+ */
+@QuarkusTest
+@TestTransaction
+public class TestTransactionTest {
+
+    @Test
+    @TestTransaction
+    public void test1() {
+        Assertions.assertEquals(0, Beer.find("name", "Lager").count());
+        Beer b = new Beer();
+        b.name = "Lager";
+        Beer.persist(b);
+    }
+
+    @Test
+    @TestTransaction
+    public void test2() {
+        Assertions.assertEquals(0, Beer.find("name", "Lager").count());
+        Beer b = new Beer();
+        b.name = "Lager";
+        Beer.persist(b);
+    }
+}
diff --git a/integration-tests/hibernate-orm-rest-data-panache/pom.xml b/integration-tests/hibernate-orm-rest-data-panache/pom.xml
index 99bc495eb2791..6811ac56be68d 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/pom.xml
+++ b/integration-tests/hibernate-orm-rest-data-panache/pom.xml
@@ -25,6 +25,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -45,6 +49,60 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-rest-data-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -60,68 +118,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <parameters>true</parameters>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Authors.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Authors.java
deleted file mode 100644
index f478a3cdb9b76..0000000000000
--- a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Authors.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.quarkus.it.hibernate.orm.rest.data.panache;
-
-import javax.ws.rs.core.Response;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
-import io.quarkus.rest.data.panache.MethodProperties;
-
-public interface Authors extends PanacheEntityResource<Author, Long> {
-
-    @MethodProperties(exposed = false)
-    Response add(Author entity);
-
-    @MethodProperties(exposed = false)
-    Response update(Long id, Author entity);
-
-    @MethodProperties(exposed = false)
-    void delete(Long id);
-}
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/AuthorsResource.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/AuthorsResource.java
new file mode 100644
index 0000000000000..44a015bbf5016
--- /dev/null
+++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/AuthorsResource.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.hibernate.orm.rest.data.panache;
+
+import java.util.List;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.rest.data.panache.MethodProperties;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(exposed = false)
+public interface AuthorsResource extends PanacheEntityResource<Author, Long> {
+
+    @MethodProperties
+    List<Author> list(Page page, Sort sort);
+
+    @MethodProperties
+    Author get(Long id);
+}
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java
index fb53581842736..8a39ac8fb4e33 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java
+++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Book.java
@@ -4,6 +4,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotBlank;
 
 @Entity
 public class Book {
@@ -12,6 +13,7 @@ public class Book {
     @GeneratedValue
     private Long id;
 
+    @NotBlank
     private String title;
 
     @ManyToOne
@@ -21,10 +23,6 @@ public Long getId() {
         return id;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getTitle() {
         return title;
     }
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Books.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Books.java
deleted file mode 100644
index 3ff6f316c497e..0000000000000
--- a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/Books.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.it.hibernate.orm.rest.data.panache;
-
-import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
-import io.quarkus.rest.data.panache.ResourceProperties;
-
-@ResourceProperties(hal = true)
-public interface Books extends PanacheRepositoryResource<BookRepository, Book, Long> {
-}
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BooksResource.java b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BooksResource.java
new file mode 100644
index 0000000000000..e038baf2ac85f
--- /dev/null
+++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/java/io/quarkus/it/hibernate/orm/rest/data/panache/BooksResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.hibernate.orm.rest.data.panache;
+
+import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(hal = true)
+public interface BooksResource extends PanacheRepositoryResource<BookRepository, Book, Long> {
+}
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/main/resources/application.properties b/integration-tests/hibernate-orm-rest-data-panache/src/main/resources/application.properties
index 5e8b4a1eb33fb..324fe9cf65b78 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/src/main/resources/application.properties
+++ b/integration-tests/hibernate-orm-rest-data-panache/src/main/resources/application.properties
@@ -1,7 +1,6 @@
-quarkus.datasource.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.driver=org.h2.Driver
-quarkus.datasource.max-size=8
-quarkus.datasource.min-size=2
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.log.sql=true
 quarkus.hibernate-orm.sql-load-script=import.sql
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
index c7edffaa9b1d0..1e06b96817565 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
+++ b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
@@ -163,6 +163,26 @@ void shouldCreateAndDeleteBook() {
                 .then().statusCode(404);
     }
 
+    @Test
+    void shouldNotCreateBookWithBlankTitle() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", DOSTOEVSKY_NAME)
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        JsonObject book = Json.createObjectBuilder()
+                .add("title", "")
+                .add("author", author)
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().post("/books")
+                .then().statusCode(400)
+                .and().body("parameterViolations[0].path", equalTo("add.arg0.title"))
+                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+    }
+
     @Test
     void shouldNotUpdateAuthor() {
         JsonObject author = Json.createObjectBuilder()
@@ -212,4 +232,24 @@ void shouldCreateUpdateAndDeleteBook() {
         when().delete(location)
                 .then().statusCode(204);
     }
+
+    @Test
+    void shouldNotUpdateBookWithBlankTitle() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", DOSTOEVSKY_NAME)
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        JsonObject book = Json.createObjectBuilder()
+                .add("title", "")
+                .add("author", author)
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().put("/books/" + CRIME_AND_PUNISHMENT_ID)
+                .then().statusCode(400)
+                .and().body("parameterViolations[0].path", equalTo("update.arg1.title"))
+                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+    }
 }
diff --git a/integration-tests/hibernate-reactive-db2/pom.xml b/integration-tests/hibernate-reactive-db2/pom.xml
index 733a3ccb6b148..2b3b3bfde2da5 100644
--- a/integration-tests/hibernate-reactive-db2/pom.xml
+++ b/integration-tests/hibernate-reactive-db2/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +14,7 @@
     <description>Hibernate Reactive related tests running with the DB2 database</description>
 
     <properties>
-    	<db2.image>ibmcom/db2:11.5.0.0a</db2.image>
+        <db2.image>ibmcom/db2:11.5.5.0</db2.image>
         <reactive-db2.url>vertx-reactive:db2://localhost:50000/hreact</reactive-db2.url>
     </properties>
     <dependencies>
@@ -29,14 +28,10 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
 
-		<!-- test dependencies -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -47,6 +42,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-db2-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,12 +97,18 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <systemPropertyVariables>
+                        <org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>true</org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <systemPropertyVariables>
+                        <org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>true</org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -88,7 +130,7 @@
             <id>test-db2</id>
             <activation>
                 <property>
-                    <name>test-db2</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -109,68 +151,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-db2</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -202,6 +187,7 @@
                                         	<!-- These help the DB2 container start faster -->
                                         	<AUTOCONFIG>false</AUTOCONFIG>
                                         	<ARCHIVE_LOGS>false</ARCHIVE_LOGS>
+                                        	<PERSISTENT_HOME>false</PERSISTENT_HOME>
                                         </env>
                                         <log>
                                             <prefix>DB2:</prefix>
@@ -210,9 +196,13 @@
                                         </log>
                                         <wait>
                                             <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
-                                            <log>.*Setup has completed\..*</log>
-                                            <!-- Unfortunately booting DB2 is slow, needs to set a generous (10m) timeout: -->
-                                            <time>600000</time>
+                                            <log>.*INSTANCE.*</log>
+                                            <!-- Unfortunately booting DB2 is slow, needs to set a generous (15m) timeout;
+                                             it generally starts in 2-3 minutes, but it's been occasionally slightly above 10m -->
+                                            <time>900000</time>
+                                            <!-- Kill the container, if it doesn't stop before this given time
+                                             duration since a graceful stop was issued -->
+                                            <kill>300000</kill>
                                         </wait>
                                     </run>
                                 </image>
@@ -247,7 +237,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java
index 0d0d7265ff52c..4ae671275e7a9 100644
--- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java
+++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2AlternativeTestEndpoint.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
@@ -18,7 +16,6 @@
 import io.vertx.mutiny.sqlclient.Tuple;
 
 @Path("/alternative-tests")
-@Produces(MediaType.APPLICATION_JSON)
 public class HibernateReactiveDB2AlternativeTestEndpoint {
 
     @Inject
@@ -45,32 +42,32 @@ public CompletionStage<GuineaPig> reactiveFind() {
     public Uni<GuineaPig> reactiveFindMutiny() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
         return populateDB()
-                .then(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
+                .chain(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactivePersist")
     public Uni<String> reactivePersist() {
         return mutinySession.persist(new GuineaPig(10, "Tulip"))
-                .chain(s -> s.flush())
-                .then(() -> selectNameFromId(10));
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(10));
     }
 
     @GET
     @Path("/reactiveRemoveTransientEntity")
     public Uni<String> reactiveRemoveTransientEntity() {
         return populateDB()
-                .then(() -> selectNameFromId(5))
+                .chain(() -> selectNameFromId(5))
                 .map(name -> {
                     if (name == null) {
                         throw new AssertionError("Database was not populated properly");
                     }
                     return name;
                 })
-                .then(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
+                .chain(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
                 .chain(aloi -> mutinySession.remove(aloi))
-                .then(() -> mutinySession.flush())
-                .then(() -> selectNameFromId(5))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
                 .onItem().ifNotNull().transform(result -> result)
                 .onItem().ifNull().continueWith("OK");
     }
@@ -79,10 +76,10 @@ public Uni<String> reactiveRemoveTransientEntity() {
     @Path("/reactiveRemoveManagedEntity")
     public Uni<String> reactiveRemoveManagedEntity() {
         return populateDB()
-                .then(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
                 .chain(aloi -> mutinySession.remove(aloi))
-                .then(() -> mutinySession.flush())
-                .then(() -> selectNameFromId(5))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
                 .onItem().ifNotNull().transform(result -> result)
                 .onItem().ifNull().continueWith("OK");
     }
@@ -92,7 +89,7 @@ public Uni<String> reactiveRemoveManagedEntity() {
     public Uni<String> reactiveUpdate() {
         final String NEW_NAME = "Tina";
         return populateDB()
-                .then(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
                 .onItem().transform(pig -> {
                     if (NEW_NAME.equals(pig.getName())) {
                         throw new AssertionError("Pig already had name " + NEW_NAME);
@@ -100,8 +97,8 @@ public Uni<String> reactiveUpdate() {
                     pig.setName(NEW_NAME);
                     return pig;
                 })
-                .then(() -> mutinySession.flush())
-                .then(() -> selectNameFromId(5));
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5));
     }
 
     private Uni<RowSet<Row>> populateDB() {
diff --git a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java
index 95cd043342711..ac780eef29d67 100644
--- a/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java
+++ b/integration-tests/hibernate-reactive-db2/src/main/java/io/quarkus/it/hibernate/reactive/db2/HibernateReactiveDB2TestEndpoint.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
@@ -21,10 +19,10 @@
 public class HibernateReactiveDB2TestEndpoint {
 
     @Inject
-    CompletionStage<Stage.Session> stageSession;
+    Stage.Session stageSession;
 
     @Inject
-    Uni<Mutiny.Session> mutinySession;
+    Mutiny.Session mutinySession;
 
     // Injecting a Vert.x Pool is not required, it us only used to
     // independently validate the contents of the database for the test
@@ -33,107 +31,79 @@ public class HibernateReactiveDB2TestEndpoint {
 
     @GET
     @Path("/reactiveFind")
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<GuineaPig> reactiveFind() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
-        return stageSession
-                .thenCompose(session -> {
-                    return populateDB().convert().toCompletionStage()
-                            .thenCompose(junk -> session.find(GuineaPig.class, expectedPig.getId()));
-                });
+        return populateDB().convert().toCompletionStage()
+                .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactiveFindMutiny")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<GuineaPig> reactiveFindMutiny() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
-        return mutinySession
-                .flatMap(session -> {
-                    return populateDB()
-                            .then(() -> session.find(GuineaPig.class, expectedPig.getId()));
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactivePersist")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactivePersist() {
-        return mutinySession
-                .flatMap(s -> s.persist(new GuineaPig(10, "Tulip")))
-                .flatMap(s -> s.flush())
-                .then(() -> selectNameFromId(10));
+        return mutinySession.persist(new GuineaPig(10, "Tulip"))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(10));
     }
 
     @GET
     @Path("/reactiveRemoveTransientEntity")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveRemoveTransientEntity() {
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(name -> {
-                                if (name == null)
-                                    throw new AssertionError("Database was not populated properly");
-                                return name;
-                            })
-                            .flatMap(junk -> mutinySession.merge(new GuineaPig(5, "Aloi")))
-                            .flatMap(aloi -> mutinySession.remove(aloi))
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(result -> {
-                                if (result == null)
-                                    return "OK";
-                                else
-                                    return result;
-                            });
-                });
+        return populateDB()
+                .chain(() -> selectNameFromId(5))
+                .map(name -> {
+                    if (name == null) {
+                        throw new AssertionError("Database was not populated properly");
+                    }
+                    return name;
+                })
+                .chain(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
+                .onItem().ifNotNull().transform(result -> result)
+                .onItem().ifNull().continueWith("OK");
     }
 
     @GET
     @Path("/reactiveRemoveManagedEntity")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveRemoveManagedEntity() {
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> mutinySession.find(GuineaPig.class, 5))
-                            .flatMap(aloi -> mutinySession.remove(aloi))
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(result -> {
-                                if (result == null)
-                                    return "OK";
-                                else
-                                    return result;
-                            });
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
+                .onItem().ifNotNull().transform(result -> result)
+                .onItem().ifNull().continueWith("OK");
     }
 
     @GET
     @Path("/reactiveUpdate")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveUpdate() {
         final String NEW_NAME = "Tina";
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> mutinySession.find(GuineaPig.class, 5))
-                            .map(pig -> {
-                                if (NEW_NAME.equals(pig.getName()))
-                                    throw new AssertionError("Pig already had name " + NEW_NAME);
-                                pig.setName(NEW_NAME);
-                                return pig;
-                            })
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5));
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .map(pig -> {
+                    if (NEW_NAME.equals(pig.getName())) {
+                        throw new AssertionError("Pig already had name " + NEW_NAME);
+                    }
+                    pig.setName(NEW_NAME);
+                    return pig;
+                })
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5));
     }
 
     private Uni<RowSet<Row>> populateDB() {
         return db2Pool.query("DELETE FROM Pig").execute()
-                .flatMap(junk -> db2Pool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute());
+                .chain(() -> db2Pool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute());
     }
 
     private Uni<String> selectNameFromId(Integer id) {
diff --git a/integration-tests/hibernate-reactive-mysql/pom.xml b/integration-tests/hibernate-reactive-mysql/pom.xml
index 5dedd9f1d6061..184bf289d36c8 100644
--- a/integration-tests/hibernate-reactive-mysql/pom.xml
+++ b/integration-tests/hibernate-reactive-mysql/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,14 +29,10 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
 
-		<!-- test dependencies -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -48,6 +43,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-mysql-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -62,12 +98,18 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <systemPropertyVariables>
+                        <org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>true</org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <systemPropertyVariables>
+                        <org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>true</org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -89,7 +131,7 @@
             <id>test-mariadb</id>
             <activation>
                 <property>
-                    <name>test-mariadb</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -110,67 +152,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-mariadb</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -255,7 +241,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java
index ceb29e2191cf4..c9048f764b1ca 100644
--- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java
+++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLAlternativeTestEndpoint.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
@@ -18,7 +16,6 @@
 import io.vertx.mutiny.sqlclient.Tuple;
 
 @Path("/alternative-tests")
-@Produces(MediaType.APPLICATION_JSON)
 public class HibernateReactiveMySQLAlternativeTestEndpoint {
 
     @Inject
@@ -45,33 +42,32 @@ public CompletionStage<GuineaPig> reactiveFind() {
     public Uni<GuineaPig> reactiveFindMutiny() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
         return populateDB()
-                .then(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
+                .chain(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactivePersist")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactivePersist() {
         return mutinySession.persist(new GuineaPig(10, "Tulip"))
-                .chain(s -> s.flush())
-                .then(() -> selectNameFromId(10));
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(10));
     }
 
     @GET
     @Path("/reactiveRemoveTransientEntity")
     public Uni<String> reactiveRemoveTransientEntity() {
         return populateDB()
-                .then(() -> selectNameFromId(5))
+                .chain(() -> selectNameFromId(5))
                 .map(name -> {
                     if (name == null) {
                         throw new AssertionError("Database was not populated properly");
                     }
                     return name;
                 })
-                .then(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
+                .chain(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
                 .chain(aloi -> mutinySession.remove(aloi))
-                .then(() -> mutinySession.flush())
-                .then(() -> selectNameFromId(5))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
                 .onItem().ifNotNull().transform(result -> result)
                 .onItem().ifNull().continueWith("OK");
     }
@@ -80,10 +76,10 @@ public Uni<String> reactiveRemoveTransientEntity() {
     @Path("/reactiveRemoveManagedEntity")
     public Uni<String> reactiveRemoveManagedEntity() {
         return populateDB()
-                .then(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
                 .chain(aloi -> mutinySession.remove(aloi))
-                .then(() -> mutinySession.flush())
-                .then(() -> selectNameFromId(5))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
                 .onItem().ifNotNull().transform(result -> result)
                 .onItem().ifNull().continueWith("OK");
     }
@@ -93,7 +89,7 @@ public Uni<String> reactiveRemoveManagedEntity() {
     public Uni<String> reactiveUpdate() {
         final String NEW_NAME = "Tina";
         return populateDB()
-                .then(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
                 .map(pig -> {
                     if (NEW_NAME.equals(pig.getName())) {
                         throw new AssertionError("Pig already had name " + NEW_NAME);
@@ -101,8 +97,8 @@ public Uni<String> reactiveUpdate() {
                     pig.setName(NEW_NAME);
                     return pig;
                 })
-                .then(() -> mutinySession.flush())
-                .then(() -> selectNameFromId(5));
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5));
     }
 
     private Uni<RowSet<Row>> populateDB() {
diff --git a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java
index 9380c1faa3e0d..1c144be731ac4 100644
--- a/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java
+++ b/integration-tests/hibernate-reactive-mysql/src/main/java/io/quarkus/it/hibernate/reactive/mysql/HibernateReactiveMySQLTestEndpoint.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
@@ -21,10 +19,10 @@
 public class HibernateReactiveMySQLTestEndpoint {
 
     @Inject
-    CompletionStage<Stage.Session> stageSession;
+    Stage.Session stageSession;
 
     @Inject
-    Uni<Mutiny.Session> mutinySession;
+    Mutiny.Session mutinySession;
 
     // Injecting a Vert.x Pool is not required, it us only used to
     // independently validate the contents of the database for the test
@@ -33,102 +31,74 @@ public class HibernateReactiveMySQLTestEndpoint {
 
     @GET
     @Path("/reactiveFind")
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<GuineaPig> reactiveFind() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
-        return stageSession
-                .thenCompose(session -> {
-                    return populateDB().convert().toCompletionStage()
-                            .thenCompose(junk -> session.find(GuineaPig.class, expectedPig.getId()));
-                });
+        return populateDB().convert().toCompletionStage()
+                .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactiveFindMutiny")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<GuineaPig> reactiveFindMutiny() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
-        return mutinySession
-                .flatMap(session -> {
-                    return populateDB()
-                            .then(() -> session.find(GuineaPig.class, expectedPig.getId()));
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactivePersist")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactivePersist() {
-        return mutinySession
-                .flatMap(s -> s.persist(new GuineaPig(10, "Tulip")))
-                .flatMap(s -> s.flush())
-                .flatMap(junk -> selectNameFromId(10));
+        return mutinySession.persist(new GuineaPig(10, "Tulip"))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(10));
     }
 
     @GET
     @Path("/reactiveRemoveTransientEntity")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveRemoveTransientEntity() {
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(name -> {
-                                if (name == null)
-                                    throw new AssertionError("Database was not populated properly");
-                                return name;
-                            })
-                            .flatMap(junk -> mutinySession.merge(new GuineaPig(5, "Aloi")))
-                            .flatMap(aloi -> mutinySession.remove(aloi))
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(result -> {
-                                if (result == null)
-                                    return "OK";
-                                else
-                                    return result;
-                            });
-                });
+        return populateDB()
+                .chain(() -> selectNameFromId(5))
+                .map(name -> {
+                    if (name == null) {
+                        throw new AssertionError("Database was not populated properly");
+                    }
+                    return name;
+                })
+                .chain(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
+                .onItem().ifNotNull().transform(result -> result)
+                .onItem().ifNull().continueWith("OK");
     }
 
     @GET
     @Path("/reactiveRemoveManagedEntity")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveRemoveManagedEntity() {
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> mutinySession.find(GuineaPig.class, 5))
-                            .flatMap(aloi -> mutinySession.remove(aloi))
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(result -> {
-                                if (result == null)
-                                    return "OK";
-                                else
-                                    return result;
-                            });
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
+                .onItem().ifNotNull().transform(result -> result)
+                .onItem().ifNull().continueWith("OK");
     }
 
     @GET
     @Path("/reactiveUpdate")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveUpdate() {
         final String NEW_NAME = "Tina";
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> mutinySession.find(GuineaPig.class, 5))
-                            .map(pig -> {
-                                if (NEW_NAME.equals(pig.getName()))
-                                    throw new AssertionError("Pig already had name " + NEW_NAME);
-                                pig.setName(NEW_NAME);
-                                return pig;
-                            })
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5));
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .map(pig -> {
+                    if (NEW_NAME.equals(pig.getName())) {
+                        throw new AssertionError("Pig already had name " + NEW_NAME);
+                    }
+                    pig.setName(NEW_NAME);
+                    return pig;
+                })
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5));
     }
 
     private Uni<RowSet<Row>> populateDB() {
diff --git a/integration-tests/hibernate-reactive-panache/pom.xml b/integration-tests/hibernate-reactive-panache/pom.xml
new file mode 100644
index 0000000000000..770edf43536a8
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/pom.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-hibernate-reactive-panache</artifactId>
+    <name>Quarkus - Integration Tests - Hibernate Reactive with Panache</name>
+
+    <!--
+        This is enabled in the Quarkus Maven archetype but not on the integration tests.
+        PanacheQuery.project(Class) needs it.
+    -->
+    <properties>
+        <postgres.image>postgres:13.1</postgres.image>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-mock</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-postgresql</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                        <executions>
+                            <!--
+                            The prod mode tests need to be part of a different execution to ensure that they don't mess with the standard tests.
+                            By adding this configuration we ensure that the maven surefire plugin will execute twice, one for the regular **/*Test.java
+                            tests (using the 'default-test' execution), and one for the prod mode tests (this 'prod-mode' execution)
+                            -->
+                            <execution>
+                                <id>prod-mode</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <includes>**/*PMT.java</includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-postgresql</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${postgres.image}</name>
+                                    <alias>postgresql</alias>
+                                    <run>
+                                        <env>
+                                            <POSTGRES_USER>hibernate_orm_test</POSTGRES_USER>
+                                            <POSTGRES_PASSWORD>hibernate_orm_test</POSTGRES_PASSWORD>
+                                            <POSTGRES_DB>hibernate_orm_test</POSTGRES_DB>
+                                        </env>
+                                        <ports>
+                                            <port>5431:5432</port>
+                                        </ports>
+                                        <wait>
+                                            <tcp>
+                                                <mode>mapped</mode>
+                                                <ports>
+                                                    <port>5432</port>
+                                                </ports>
+                                            </tcp>
+                                            <time>10000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <!--Stops all postgres images currently running, not just those we just started.
+                              Useful to stop processes still running from a previously failed integration test run -->
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${docker-prune.location}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AbstractRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AbstractRepository.java
new file mode 100644
index 0000000000000..a07e34f03a68c
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AbstractRepository.java
@@ -0,0 +1,6 @@
+package io.quarkus.it.panache.reactive;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+
+public class AbstractRepository<T> implements PanacheRepositoryBase<T, String> {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java
new file mode 100644
index 0000000000000..3515738e2fc39
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AccessorEntity.java
@@ -0,0 +1,59 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+public class AccessorEntity extends GenericEntity<Integer> {
+
+    public String string;
+    public char c;
+    public boolean bool;
+    public byte b;
+    public short s;
+    public int i;
+    public long l;
+    public float f;
+    public double d;
+    @Transient
+    public Object trans;
+    @Transient
+    public Object trans2;
+
+    // FIXME: those appear to be mapped by hibernate
+    transient int getBCalls = 0;
+    transient int setICalls = 0;
+    transient int getTransCalls = 0;
+    transient int setTransCalls = 0;
+
+    public void method() {
+        // touch some fields
+        @SuppressWarnings("unused")
+        byte b2 = b;
+        i = 2;
+        t = 1;
+        t2 = 2;
+    }
+
+    // explicit getter or setter
+
+    public byte getB() {
+        getBCalls++;
+        return b;
+    }
+
+    public void setI(int i) {
+        setICalls++;
+        this.i = i;
+    }
+
+    public Object getTrans() {
+        getTransCalls++;
+        return trans;
+    }
+
+    public void setTrans(Object trans) {
+        setTransCalls++;
+        this.trans = trans;
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java
new file mode 100644
index 0000000000000..9b82b52b19611
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Address.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class Address extends PanacheEntity implements Comparable<Address> {
+
+    public String street;
+
+    public Address() {
+    }
+
+    public Address(String street) {
+        this.street = street;
+    }
+
+    @Override
+    public int compareTo(Address address) {
+        return street.compareTo(address.street);
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java
new file mode 100644
index 0000000000000..1dc6e9172175f
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/AddressDao.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+
+@ApplicationScoped
+public class AddressDao implements PanacheRepository<Address> {
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java
new file mode 100644
index 0000000000000..7d79a8b3d6f96
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Beer.java
@@ -0,0 +1,11 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class Beer extends PanacheEntity {
+
+    public String name;
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java
new file mode 100644
index 0000000000000..ee7338b415ce1
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5274EntityRepository.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class Bug5274EntityRepository extends AbstractRepository<Person> {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885AbstractRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885AbstractRepository.java
new file mode 100644
index 0000000000000..d78587a33cbc2
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885AbstractRepository.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.panache.reactive;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+
+public abstract class Bug5885AbstractRepository<T> implements PanacheRepository<T> {
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java
new file mode 100644
index 0000000000000..ce6fb987c0d10
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug5885EntityRepository.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class Bug5885EntityRepository extends Bug5885AbstractRepository<Person> {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java
new file mode 100644
index 0000000000000..635ff39bca71d
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721Entity.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.panache.reactive;
+
+import java.util.Objects;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Entity
+public class Bug7721Entity extends Bug7721EntitySuperClass {
+    @Column(nullable = false)
+    public String foo = "default";
+
+    public Bug7721Entity() {
+        foo = "default"; // same as init
+        this.foo = "default"; // qualify
+        superField = "default";
+        this.superField = "default";
+        super.superField = "default";
+
+        Bug7721OtherEntity otherEntity = new Bug7721OtherEntity();
+        otherEntity.foo = "bar"; // we want to make sure the setter gets called because it's not our hierarchy
+        if (!otherEntity.foo.equals("BAR"))
+            throw new AssertionError("setter was not called", null);
+    }
+
+    public void setFoo(String foo) {
+        Objects.requireNonNull(foo);
+        // should never be null
+        Objects.requireNonNull(this.foo);
+        this.foo = foo;
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java
new file mode 100644
index 0000000000000..e5d991e1c1371
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721EntitySuperClass.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.panache.reactive;
+
+import java.util.Objects;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@MappedSuperclass
+public class Bug7721EntitySuperClass extends PanacheEntity {
+
+    @Column(nullable = false)
+    public String superField = "default";
+
+    public void setSuperField(String superField) {
+        Objects.requireNonNull(superField);
+        // should never be null
+        Objects.requireNonNull(this.superField);
+        this.superField = superField;
+    }
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java
new file mode 100644
index 0000000000000..b604bf73800d0
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Bug7721OtherEntity.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class Bug7721OtherEntity extends PanacheEntity {
+    public String foo;
+
+    public void setFoo(String foo) {
+        this.foo = foo.toUpperCase();
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java
new file mode 100644
index 0000000000000..a192e31b82f1d
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Cat.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class Cat extends PanacheEntity {
+
+    @ManyToOne
+    CatOwner owner;
+
+    public Cat(CatOwner owner) {
+        this.owner = owner;
+    }
+
+    public Cat() {
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java
new file mode 100644
index 0000000000000..de49ecd6eca4e
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/CatOwner.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class CatOwner extends PanacheEntity {
+
+    public String name;
+
+    public CatOwner(String name) {
+        this.name = name;
+    }
+
+    public CatOwner() {
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java
new file mode 100644
index 0000000000000..1d385939b314d
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Dog.java
@@ -0,0 +1,33 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+
+// custom id type
+@Entity
+public class Dog extends PanacheEntityBase {
+
+    @Id
+    @GeneratedValue
+    public Integer id;
+
+    public String name;
+
+    public String race;
+
+    @ManyToOne
+    public Person owner;
+
+    public Dog(String name, String race) {
+        this.name = name;
+        this.race = race;
+    }
+
+    public Dog() {
+    }
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java
new file mode 100644
index 0000000000000..269c337287a7d
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DogDao.java
@@ -0,0 +1,11 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+
+// custom id type
+@ApplicationScoped
+public class DogDao implements PanacheRepositoryBase<Dog, Integer> {
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java
new file mode 100644
index 0000000000000..2a342cebae598
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateEntity.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+import io.quarkus.panache.common.Parameters;
+import io.smallrye.mutiny.Uni;
+
+@Entity
+public class DuplicateEntity extends PanacheEntityBase {
+
+    @Id
+    @GeneratedValue
+    public Integer id;
+
+    public static <T extends PanacheEntityBase> Uni<T> findById(Object id) {
+        DuplicateEntity duplicate = new DuplicateEntity();
+        duplicate.id = (Integer) id;
+        return (Uni<T>) Uni.createFrom().item(duplicate);
+    }
+
+    @Override
+    public Uni<Void> persist() {
+        return Uni.createFrom().nullItem();
+    }
+
+    public static Uni<Integer> update(String query, Parameters params) {
+        return Uni.createFrom().item(0);
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java
new file mode 100644
index 0000000000000..67ac10d1ab825
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/DuplicateRepository.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.smallrye.mutiny.Uni;
+
+@ApplicationScoped
+public class DuplicateRepository implements PanacheRepositoryBase<DuplicateEntity, Integer> {
+
+    @Override
+    public Uni<DuplicateEntity> findById(Integer id) {
+        DuplicateEntity duplicate = new DuplicateEntity();
+        duplicate.id = id;
+        return Uni.createFrom().item(duplicate);
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java
new file mode 100644
index 0000000000000..e9c44f954f041
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Fruit.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class Fruit extends PanacheEntity {
+
+    public String name;
+    public String color;
+
+    public Fruit(String name, String color) {
+        this.name = name;
+        this.color = color;
+    }
+
+    public Fruit() {
+    }
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java
new file mode 100644
index 0000000000000..9a65589b56f4e
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/GenericEntity.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.MappedSuperclass;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@MappedSuperclass
+public abstract class GenericEntity<T> extends PanacheEntity {
+    public T t;
+    public T t2;
+
+    public T getT2() {
+        return t2;
+    }
+
+    public void setT2(T t2) {
+        this.t2 = t2;
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java
new file mode 100644
index 0000000000000..0caef64c25583
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/MockablePersonRepository.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.panache.reactive;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+import io.smallrye.mutiny.Uni;
+
+@ApplicationScoped
+public class MockablePersonRepository implements PanacheRepository<Person> {
+    public Uni<List<Person>> findOrdered() {
+        return find("ORDER BY name").list();
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java
new file mode 100644
index 0000000000000..5396e275d16dd
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryEntity.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+
+@Entity
+@NamedQuery(name = "NamedQueryEntity.getAll", query = "from NamedQueryEntity")
+public class NamedQueryEntity extends NamedQueryMappedSuperClass {
+    public String test;
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java
new file mode 100644
index 0000000000000..11aa2641c4875
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryMappedSuperClass.java
@@ -0,0 +1,12 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.MappedSuperclass;
+import javax.persistence.NamedQuery;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@MappedSuperclass
+@NamedQuery(name = "NamedQueryMappedSuperClass.getAll", query = "from NamedQueryEntity")
+public class NamedQueryMappedSuperClass extends PanacheEntity {
+    public String superField;
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java
new file mode 100644
index 0000000000000..2cebb1bc1dcd0
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryRepository.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+
+@ApplicationScoped
+public class NamedQueryRepository implements PanacheRepository<NamedQueryEntity> {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java
new file mode 100755
index 0000000000000..5e932b5b1040f
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesEntity.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+@NamedQuery(name = "NamedQueryWith2QueriesEntity.getAll1", query = "from NamedQueryWith2QueriesEntity")
+@NamedQuery(name = "NamedQueryWith2QueriesEntity.getAll2", query = "from NamedQueryWith2QueriesEntity")
+public class NamedQueryWith2QueriesEntity extends PanacheEntity {
+    public String test;
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java
new file mode 100755
index 0000000000000..68f9473190ff7
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NamedQueryWith2QueriesRepository.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+
+@ApplicationScoped
+public class NamedQueryWith2QueriesRepository implements PanacheRepository<NamedQueryWith2QueriesEntity> {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java
new file mode 100644
index 0000000000000..8af355617be51
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/NoPagingTestEndpoint.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.hibernate.reactive.panache.Panache;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Run a simple, no paged PanacheQueryTest in order to log the generated SQL.
+ *
+ * @see io.quarkus.it.panache.reactive.NoPagingPMT
+ */
+@Path("no-paging-test")
+public class NoPagingTestEndpoint {
+
+    @GET
+    public Uni<String> test() {
+        return Panache.withTransaction(() -> PageItem.findAll().list().map(v -> "OK"));
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java
new file mode 100755
index 0000000000000..58f3b046b3297
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithCompositeId.java
@@ -0,0 +1,49 @@
+package io.quarkus.it.panache.reactive;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+
+@Entity
+@IdClass(ObjectWithCompositeId.ObjectKey.class)
+public class ObjectWithCompositeId extends PanacheEntityBase {
+    @Id
+    public String part1;
+    @Id
+    public String part2;
+    public String description;
+
+    static class ObjectKey implements Serializable {
+        private String part1;
+        private String part2;
+
+        public ObjectKey() {
+        }
+
+        public ObjectKey(String part1, String part2) {
+            this.part1 = part1;
+            this.part2 = part2;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+            ObjectKey objectKey = (ObjectKey) o;
+            return part1.equals(objectKey.part1) &&
+                    part2.equals(objectKey.part2);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(part1, part2);
+        }
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java
new file mode 100755
index 0000000000000..6c34b2abe72af
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/ObjectWithEmbeddableId.java
@@ -0,0 +1,47 @@
+package io.quarkus.it.panache.reactive;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import javax.persistence.Embeddable;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+
+@Entity
+public class ObjectWithEmbeddableId extends PanacheEntityBase {
+    @EmbeddedId
+    public ObjectKey key;
+    public String description;
+
+    @Embeddable
+    static class ObjectKey implements Serializable {
+        private String part1;
+        private String part2;
+
+        public ObjectKey() {
+        }
+
+        public ObjectKey(String part1, String part2) {
+            this.part1 = part1;
+            this.part2 = part2;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+            ObjectKey objectKey = (ObjectKey) o;
+            return part1.equals(objectKey.part1) &&
+                    part2.equals(objectKey.part2);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(part1, part2);
+        }
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java
new file mode 100644
index 0000000000000..29e16fce0a978
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PageItem.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class PageItem extends PanacheEntity {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java
new file mode 100644
index 0000000000000..82c6498b2534d
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Person.java
@@ -0,0 +1,83 @@
+package io.quarkus.it.panache.reactive;
+
+import static io.quarkus.hibernate.reactive.panache.runtime.JpaOperations.INSTANCE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.FilterDef;
+import org.hibernate.annotations.ParamDef;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+import io.quarkus.hibernate.reactive.panache.PanacheQuery;
+import io.smallrye.mutiny.Uni;
+
+@XmlRootElement
+@Entity(name = "Person2")
+@NamedQuery(name = "Person.getByName", query = "from Person2 where name = :name")
+@FilterDef(name = "Person.hasName", defaultCondition = "name = :name", parameters = @ParamDef(name = "name", type = "string"))
+@FilterDef(name = "Person.isAlive", defaultCondition = "status = 'LIVING'")
+@Filter(name = "Person.isAlive")
+@Filter(name = "Person.hasName")
+public class Person extends PanacheEntity {
+
+    public String name;
+    @Column(unique = true)
+    public String uniqueName;
+
+    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    public Address address;
+
+    @Enumerated(EnumType.STRING)
+    public Status status;
+
+    @OneToMany(mappedBy = "owner", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    public List<Dog> dogs = new ArrayList<>();
+
+    // note that this annotation is automatically added for mapped fields, which is not the case here
+    // so we do it manually to emulate a mapped field situation
+    @XmlTransient
+    @Transient
+    public int serialisationTrick;
+
+    public static Uni<List<Person>> findOrdered() {
+        return find("ORDER BY name").list();
+    }
+
+    // For https://github.com/quarkusio/quarkus/issues/9635
+    public static <T extends PanacheEntityBase> PanacheQuery<T> find(String query, Object... params) {
+        return (PanacheQuery<T>) INSTANCE.find(Person.class, query, params);
+    }
+
+    // For JAXB: both getter and setter are required
+    // Here we make sure the field is not used by Hibernate, but the accessor is used by jaxb, jsonb and jackson
+    @JsonProperty
+    public int getSerialisationTrick() {
+        return ++serialisationTrick;
+    }
+
+    public void setSerialisationTrick(int serialisationTrick) {
+        this.serialisationTrick = serialisationTrick;
+    }
+
+    public static long methodWithPrimitiveParams(boolean b, byte bb, short s, int i, long l, float f, double d, char c) {
+        return 0;
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonName.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonName.java
new file mode 100644
index 0000000000000..e509b38aecaa1
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonName.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.panache.reactive;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+public class PersonName {
+    public final String name;
+    public final String uniqueName;
+
+    public PersonName(String uniqueName, String name) {
+        this.name = name;
+        this.uniqueName = uniqueName;
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java
new file mode 100644
index 0000000000000..2edc51fb9d021
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/PersonRepository.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.panache.reactive;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+import io.smallrye.mutiny.Uni;
+
+@ApplicationScoped
+public class PersonRepository implements PanacheRepository<Person> {
+    public Uni<List<Person>> findOrdered() {
+        return find("ORDER BY name").list();
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Status.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Status.java
new file mode 100644
index 0000000000000..a2c1d8edc0677
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/Status.java
@@ -0,0 +1,6 @@
+package io.quarkus.it.panache.reactive;
+
+public enum Status {
+    LIVING,
+    DECEASED
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java
new file mode 100644
index 0000000000000..57b0874c258a6
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/java/io/quarkus/it/panache/reactive/TestEndpoint.java
@@ -0,0 +1,1690 @@
+package io.quarkus.it.panache.reactive;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import javax.inject.Inject;
+import javax.persistence.LockModeType;
+import javax.persistence.NoResultException;
+import javax.persistence.NonUniqueResultException;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.hibernate.engine.spi.SelfDirtinessTracker;
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.hibernate.reactive.panache.Panache;
+import io.quarkus.hibernate.reactive.panache.PanacheQuery;
+import io.quarkus.panache.common.Page;
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
+import io.quarkus.panache.common.exception.PanacheQueryException;
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Various tests covering Panache functionality. All tests should work in both standard JVM and in native mode.
+ */
+@Path("test")
+public class TestEndpoint {
+
+    // fake unused injection point to force ArC to not remove this otherwise I can't mock it in the tests
+    @Inject
+    MockablePersonRepository mockablePersonRepository;
+
+    @GET
+    @Path("model")
+    public Uni<String> testModel() {
+        return Panache.withTransaction(() -> Person.findAll().list()
+                .flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    return Person.listAll();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    return collect(Person.findAll().stream());
+                }).flatMap(personStream -> {
+                    Assertions.assertEquals(0, personStream.size());
+
+                    return collect(Person.streamAll());
+                }).flatMap(personStream -> {
+
+                    Assertions.assertEquals(0, personStream.size());
+                    return assertThrows(NoResultException.class, () -> Person.findAll().singleResult(),
+                            "singleResult should have thrown");
+                }).flatMap(v -> Person.findAll().firstResult())
+                .flatMap(result -> {
+                    Assertions.assertNull(result);
+
+                    return makeSavedPerson();
+                }).flatMap(person -> {
+                    Assertions.assertNotNull(person.id);
+
+                    return Person.count()
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return Person.count("name = ?1", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return Person.count("name = :name", Parameters.with("name", "stef").map());
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return Person.count("name = :name", Parameters.with("name", "stef"));
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return Person.count("name", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return Dog.count();
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                // FIXME: fetch
+                                Assertions.assertEquals(1, person.dogs.size());
+
+                                return Person.findAll().list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.listAll();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.findAll().stream());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.streamAll());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.findAll().firstResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return Person.findAll().singleResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return Person.find("name = ?1", "stef").list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find("name = ?1", "stef").withLock(LockModeType.PESSIMISTIC_READ).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                // FIXME: not supported yet
+                                //                                // next calls to this query will be cached
+                                //                                return Person.find("name = ?1", "stef").withHint(QueryHints.HINT_CACHEABLE, "true").list();
+                                //                            }).flatMap(persons -> {
+                                //                                Assertions.assertEquals(1, persons.size());
+                                //                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.list("name = ?1", "stef");
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find("name = :name", Parameters.with("name", "stef").map()).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find("name = :name", Parameters.with("name", "stef")).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.list("name = :name", Parameters.with("name", "stef").map());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find("name = :name", Parameters.with("name", "stef").map()).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.list("name = :name", Parameters.with("name", "stef"));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find("name", "stef").list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.find("name = ?1", "stef").stream());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.stream("name = ?1", "stef"));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.stream("name = :name", Parameters.with("name", "stef").map()));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.stream("name = :name", Parameters.with("name", "stef")));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(Person.find("name", "stef").stream());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find("name", "stef").firstResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return Person.find("name", "stef").singleResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return Person.find("name", "stef").singleResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                //named query
+                                return Person.list("#Person.getByName", Parameters.with("name", "stef"));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return assertThrows(PanacheQueryException.class,
+                                        () -> Person.find("#Person.namedQueryNotFound").list(),
+                                        "singleResult should have thrown");
+                            }).flatMap(v -> NamedQueryEntity.list("#NamedQueryMappedSuperClass.getAll"))
+                            .flatMap(v -> NamedQueryEntity.list("#NamedQueryEntity.getAll"))
+                            .flatMap(v -> NamedQueryWith2QueriesEntity.list("#NamedQueryWith2QueriesEntity.getAll1"))
+                            .flatMap(v -> NamedQueryWith2QueriesEntity.list("#NamedQueryWith2QueriesEntity.getAll2"))
+                            .flatMap(v -> {
+                                //empty query
+                                return Person.find("").list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.find(null).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return Person.findById(person.id);
+                            }).flatMap(byId -> {
+                                Assertions.assertEquals(person, byId);
+                                Assertions.assertEquals("Person<" + person.id + ">", byId.toString());
+
+                                return Person.findById(person.id, LockModeType.PESSIMISTIC_READ);
+                            }).flatMap(byId -> {
+                                Assertions.assertEquals(person, byId);
+                                Assertions.assertEquals("Person<" + person.id + ">", byId.toString());
+
+                                return person.delete();
+                            }).flatMap(v -> Person.count())
+                            .flatMap(count -> {
+                                Assertions.assertEquals(0, count);
+
+                                return makeSavedPerson();
+                            });
+                }).flatMap(person -> {
+
+                    return Person.count()
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return Person.delete("name = ?1", "emmanuel");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(0, count);
+
+                                return Dog.delete("owner = ?1", person);
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return Person.delete("name", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return makeSavedPerson();
+                            });
+                }).flatMap(person -> {
+
+                    return Dog.delete("owner = :owner", Parameters.with("owner", person).map())
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return Person.delete("name", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return makeSavedPerson();
+                            });
+                }).flatMap(person -> {
+
+                    return Dog.delete("owner = :owner", Parameters.with("owner", person))
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return Person.delete("name", "stef");
+                            }).map(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return null;
+                            });
+                })
+                .flatMap(v -> Person.deleteAll())
+                .flatMap(count -> {
+                    Assertions.assertEquals(0, count);
+
+                    return makeSavedPerson();
+                }).flatMap(person -> {
+
+                    return Dog.deleteAll()
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return Person.deleteAll();
+                            }).map(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return null;
+                            });
+                })
+                .flatMap(v -> testPersist(PersistTest.Iterable))
+                .flatMap(v -> testPersist(PersistTest.Stream))
+                .flatMap(v -> testPersist(PersistTest.Variadic))
+                .flatMap(v -> Person.deleteAll())
+                .flatMap(count -> {
+                    Assertions.assertEquals(6, count);
+
+                    return testSorting();
+                })
+                // paging
+                .flatMap(v -> makeSavedPerson("0"))
+                .flatMap(v -> makeSavedPerson("1"))
+                .flatMap(v -> makeSavedPerson("2"))
+                .flatMap(v -> makeSavedPerson("3"))
+                .flatMap(v -> makeSavedPerson("4"))
+                .flatMap(v -> makeSavedPerson("5"))
+                .flatMap(v -> makeSavedPerson("6"))
+                .flatMap(v -> testPaging(Person.findAll()))
+                .flatMap(v -> testPaging(Person.find("ORDER BY name")))
+                // range
+                .flatMap(v -> testRange(Person.findAll()))
+                .flatMap(v -> testRange(Person.find("ORDER BY name")))
+                .flatMap(v -> assertThrows(NonUniqueResultException.class,
+                        () -> Person.findAll().singleResult(),
+                        "singleResult should have thrown"))
+                .flatMap(v -> Person.findAll().firstResult())
+                .flatMap(person -> {
+                    Assertions.assertNotNull(person);
+
+                    return Person.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(7, count);
+
+                    return testUpdate();
+                }).flatMap(v -> {
+                    //delete by id
+                    Person toRemove = new Person();
+                    toRemove.name = "testDeleteById";
+                    toRemove.uniqueName = "testDeleteByIdUnique";
+                    return toRemove.persist().flatMap(v2 -> Person.deleteById(toRemove.id));
+                }).flatMap(deleted -> {
+                    assertTrue(deleted);
+
+                    return Person.deleteById(666L); //not existing
+                }).flatMap(deleted -> {
+                    assertFalse(deleted);
+
+                    // persistAndFlush
+                    Person person1 = new Person();
+                    person1.name = "testFLush1";
+                    person1.uniqueName = "unique";
+                    return person1.persist();
+                    // FIXME: https://github.com/hibernate/hibernate-reactive/issues/281
+                    //                }).flatMap(v -> {
+                    //                    Person person2 = new Person();
+                    //                    person2.name = "testFLush2";
+                    //                    person2.uniqueName = "unique";
+                    //
+                    //                    // FIXME should be PersistenceException see https://github.com/hibernate/hibernate-reactive/issues/280
+                    //                    return assertThrows(PgException.class,
+                    //                            () -> person2.persistAndFlush(),
+                    //                            "Should have failed");
+                }).flatMap(v -> Person.deleteAll())
+                .map(v -> "OK"));
+    }
+
+    private <T> Uni<List<T>> collect(Multi<T> stream) {
+        return stream.collectItems().asList();
+    }
+
+    private Uni<Void> testUpdate() {
+        return makeSavedPerson("p1")
+                .flatMap(v -> makeSavedPerson("p2"))
+                .flatMap(v -> Person.update("update from Person2 p set p.name = 'stefNEW' where p.name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return Person.update("update from Person2 p set p.name = 'stefNEW' where p.name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return Person.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPerson("p1");
+                }).flatMap(v -> makeSavedPerson("p2"))
+                .flatMap(v -> Person.update("from Person2 p set p.name = 'stefNEW' where p.name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return Person.update("from Person2 p set p.name = 'stefNEW' where p.name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return Person.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPerson("p1");
+                }).flatMap(v -> makeSavedPerson("p2"))
+                .flatMap(v -> Person.update("set name = 'stefNEW' where name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return Person.update("set name = 'stefNEW' where name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return Person.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPerson("p1");
+                }).flatMap(v -> makeSavedPerson("p2"))
+                .flatMap(v -> Person.update("name = 'stefNEW' where name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return Person.update("name = 'stefNEW' where name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return Person.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPerson("p1");
+                }).flatMap(v -> makeSavedPerson("p2"))
+                .flatMap(v -> Person.update("name = 'stefNEW' where name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return Person.update("name = 'stefNEW' where name = :pName",
+                            Parameters.with("pName", "stefp2"));
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return Person.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return assertThrows(PanacheQueryException.class, () -> Person.update(null),
+                            "PanacheQueryException should have thrown");
+                }).flatMap(v -> assertThrows(PanacheQueryException.class, () -> Person.update(" "),
+                        "PanacheQueryException should have thrown"));
+    }
+
+    private Uni<Void> testUpdateDao() {
+        return makeSavedPersonDao("p1")
+                .flatMap(v -> makeSavedPersonDao("p2"))
+                .flatMap(v -> personDao.update("update from Person2 p set p.name = 'stefNEW' where p.name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return personDao.update("update from Person2 p set p.name = 'stefNEW' where p.name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return personDao.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPersonDao("p1");
+                }).flatMap(v -> makeSavedPersonDao("p2"))
+                .flatMap(v -> personDao.update("from Person2 p set p.name = 'stefNEW' where p.name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return personDao.update("from Person2 p set p.name = 'stefNEW' where p.name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return personDao.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPersonDao("p1");
+                }).flatMap(v -> makeSavedPersonDao("p2"))
+                .flatMap(v -> personDao.update("set name = 'stefNEW' where name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return personDao.update("set name = 'stefNEW' where name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return personDao.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPersonDao("p1");
+                }).flatMap(v -> makeSavedPersonDao("p2"))
+                .flatMap(v -> personDao.update("name = 'stefNEW' where name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return personDao.update("name = 'stefNEW' where name = :pName",
+                            Parameters.with("pName", "stefp2").map());
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return personDao.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return makeSavedPersonDao("p1");
+                }).flatMap(v -> makeSavedPersonDao("p2"))
+                .flatMap(v -> personDao.update("name = 'stefNEW' where name = ?1", "stefp1"))
+                .flatMap(updateByIndexParameter -> {
+                    Assertions.assertEquals(1, updateByIndexParameter, "More than one Person updated");
+
+                    return personDao.update("name = 'stefNEW' where name = :pName",
+                            Parameters.with("pName", "stefp2"));
+                }).flatMap(updateByNamedParameter -> {
+                    Assertions.assertEquals(1, updateByNamedParameter, "More than one Person updated");
+
+                    return personDao.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(2, count);
+
+                    return assertThrows(PanacheQueryException.class, () -> personDao.update(null),
+                            "PanacheQueryException should have thrown");
+                }).flatMap(v -> assertThrows(PanacheQueryException.class, () -> personDao.update(" "),
+                        "PanacheQueryException should have thrown"));
+    }
+
+    private Uni<Void> assertThrows(Class<? extends Throwable> exceptionClass,
+            Supplier<Uni<?>> f,
+            String message) {
+        System.err.println("Asserting " + message + " hoping to get a " + exceptionClass);
+        Uni<?> uni;
+        try {
+            uni = f.get();
+        } catch (Throwable t) {
+            uni = Uni.createFrom().failure(t);
+        }
+        return uni
+                .onItemOrFailure().invoke((r, t) -> {
+                    System.err.println("Got back val: " + r + " and exception " + t);
+                })
+                .onItem().invoke(v -> Assertions.fail(message))
+                .onFailure(exceptionClass)
+                .recoverWithItem(() -> null)
+                .map(v -> null);
+    }
+
+    private Uni<Void> testSorting() {
+        Person person1 = new Person();
+        person1.name = "stef";
+        person1.status = Status.LIVING;
+
+        Person person2 = new Person();
+        person2.name = "stef";
+        person2.status = Status.DECEASED;
+
+        Person person3 = new Person();
+        person3.name = "emmanuel";
+        person3.status = Status.LIVING;
+
+        return person1.persist()
+                .flatMap(v -> person2.persist())
+                .flatMap(v -> person3.persist())
+                .flatMap(v -> {
+                    Sort sort1 = Sort.by("name", "status");
+                    List<Person> order1 = Arrays.asList(person3, person2, person1);
+
+                    Sort sort2 = Sort.descending("name", "status");
+                    List<Person> order2 = Arrays.asList(person1, person2);
+
+                    return Person.findAll(sort1).list()
+                            .flatMap(list -> {
+                                Assertions.assertEquals(order1, list);
+
+                                return Person.listAll(sort1);
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order1, list);
+
+                                return collect(Person.<Person> streamAll(sort1));
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order1, list);
+
+                                return Person.find("name", sort2, "stef").list();
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return Person.list("name", sort2, "stef");
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return collect(Person.<Person> stream("name", sort2, "stef"));
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return Person.find("name = :name", sort2, Parameters.with("name", "stef").map()).list();
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return Person.list("name = :name", sort2, Parameters.with("name", "stef").map());
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return collect(
+                                        Person.<Person> stream("name = :name", sort2, Parameters.with("name", "stef").map()));
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return Person.find("name = :name", sort2, Parameters.with("name", "stef")).list();
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return Person.list("name = :name", sort2, Parameters.with("name", "stef"));
+                            }).flatMap(list -> {
+                                Assertions.assertEquals(order2, list);
+
+                                return collect(Person.<Person> stream("name = :name", sort2, Parameters.with("name", "stef")));
+                            });
+                }).flatMap(v -> Person.deleteAll())
+                .map(count -> {
+                    Assertions.assertEquals(3, count);
+
+                    return null;
+                });
+    }
+
+    private Uni<Person> makeSavedPerson(String suffix) {
+        Person person = new Person();
+        person.name = "stef" + suffix;
+        person.status = Status.LIVING;
+        person.address = new Address("stef street");
+        return person.address.persist()
+                .flatMap(v -> person.persist())
+                .map(v -> person);
+    }
+
+    private Uni<Person> makeSavedPersonDao(String suffix) {
+        Person person = new Person();
+        person.name = "stef" + suffix;
+        person.status = Status.LIVING;
+        person.address = new Address("stef street");
+        return addressDao.persist(person.address)
+                .flatMap(v -> personDao.persist(person))
+                .map(v -> person);
+    }
+
+    private Uni<Person> makeSavedPerson() {
+        Uni<Person> uni = makeSavedPerson("");
+
+        return uni.flatMap(person -> {
+            Dog dog = new Dog("octave", "dalmatian");
+            dog.owner = person;
+            person.dogs.add(dog);
+            return dog.persist().map(v -> person);
+        });
+    }
+
+    private Uni<Person> makeSavedPersonDao() {
+        Uni<Person> uni = makeSavedPersonDao("");
+
+        return uni.flatMap(person -> {
+            Dog dog = new Dog("octave", "dalmatian");
+            dog.owner = person;
+            person.dogs.add(dog);
+            return dog.persist().map(v -> person);
+        });
+    }
+
+    private Uni<Void> testPersist(PersistTest persistTest) {
+        Person person1 = new Person();
+        person1.name = "stef1";
+        Person person2 = new Person();
+        person2.name = "stef2";
+
+        assertFalse(person1.isPersistent());
+        assertFalse(person2.isPersistent());
+
+        Uni<Void> persist;
+        switch (persistTest) {
+            case Iterable:
+                persist = Person.persist(Arrays.asList(person1, person2));
+                break;
+            case Stream:
+                persist = Person.persist(Stream.of(person1, person2));
+                break;
+            case Variadic:
+                persist = Person.persist(person1, person2);
+                break;
+            default:
+                throw new RuntimeException("Ouch");
+        }
+        return persist.map(v -> {
+            assertTrue(person1.isPersistent());
+            assertTrue(person2.isPersistent());
+            return null;
+        });
+    }
+
+    private Uni<Void> testPersistDao(PersistTest persistTest) {
+        Person person1 = new Person();
+        person1.name = "stef1";
+        Person person2 = new Person();
+        person2.name = "stef2";
+
+        assertFalse(personDao.isPersistent(person1));
+        assertFalse(personDao.isPersistent(person2));
+
+        Uni<Void> persist;
+        switch (persistTest) {
+            case Iterable:
+                persist = personDao.persist(Arrays.asList(person1, person2));
+                break;
+            case Stream:
+                persist = personDao.persist(Stream.of(person1, person2));
+                break;
+            case Variadic:
+                persist = personDao.persist(person1, person2);
+                break;
+            default:
+                throw new RuntimeException("Ouch");
+        }
+        return persist.map(v -> {
+            assertTrue(personDao.isPersistent(person1));
+            assertTrue(personDao.isPersistent(person2));
+            return null;
+        });
+    }
+
+    @Inject
+    PersonRepository personDao;
+    @Inject
+    DogDao dogDao;
+    @Inject
+    AddressDao addressDao;
+    @Inject
+    NamedQueryRepository namedQueryRepository;
+    @Inject
+    NamedQueryWith2QueriesRepository namedQueryWith2QueriesRepository;
+
+    @GET
+    @Path("model-dao")
+    public Uni<String> testModelDao() {
+        return Panache.withTransaction(() -> personDao.findAll().list()
+                .flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    return personDao.listAll();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    return collect(personDao.findAll().stream());
+                }).flatMap(personStream -> {
+                    Assertions.assertEquals(0, personStream.size());
+
+                    return collect(personDao.streamAll());
+                }).flatMap(personStream -> {
+
+                    Assertions.assertEquals(0, personStream.size());
+                    return assertThrows(NoResultException.class, () -> personDao.findAll().singleResult(),
+                            "singleResult should have thrown");
+                }).flatMap(v -> personDao.findAll().firstResult())
+                .flatMap(result -> {
+                    Assertions.assertNull(result);
+
+                    return makeSavedPersonDao();
+                }).flatMap(person -> {
+                    Assertions.assertNotNull(person.id);
+
+                    return personDao.count()
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return personDao.count("name = ?1", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return personDao.count("name = :name", Parameters.with("name", "stef").map());
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return personDao.count("name = :name", Parameters.with("name", "stef"));
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return personDao.count("name", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                return dogDao.count();
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+                                // FIXME: fetch
+                                Assertions.assertEquals(1, person.dogs.size());
+
+                                return personDao.findAll().list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.listAll();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.findAll().stream());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.streamAll());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.findAll().firstResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return personDao.findAll().singleResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return personDao.find("name = ?1", "stef").list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find("name = ?1", "stef").withLock(LockModeType.PESSIMISTIC_READ).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                // FIXME: not supported yet
+                                //                                // next calls to this query will be cached
+                                //                                return personDao.find("name = ?1", "stef").withHint(QueryHints.HINT_CACHEABLE, "true").list();
+                                //                            }).flatMap(persons -> {
+                                //                                Assertions.assertEquals(1, persons.size());
+                                //                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.list("name = ?1", "stef");
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find("name = :name", Parameters.with("name", "stef").map()).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find("name = :name", Parameters.with("name", "stef")).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.list("name = :name", Parameters.with("name", "stef").map());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find("name = :name", Parameters.with("name", "stef").map()).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.list("name = :name", Parameters.with("name", "stef"));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find("name", "stef").list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.find("name = ?1", "stef").stream());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.stream("name = ?1", "stef"));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.stream("name = :name", Parameters.with("name", "stef").map()));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.stream("name = :name", Parameters.with("name", "stef")));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return collect(personDao.find("name", "stef").stream());
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find("name", "stef").firstResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return personDao.find("name", "stef").singleResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                return personDao.find("name", "stef").singleResult();
+                            }).flatMap(personResult -> {
+                                Assertions.assertEquals(person, personResult);
+
+                                //named query
+                                return personDao.list("#Person.getByName", Parameters.with("name", "stef"));
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return assertThrows(PanacheQueryException.class,
+                                        () -> personDao.find("#Person.namedQueryNotFound").list(),
+                                        "singleResult should have thrown");
+                            }).flatMap(v -> namedQueryRepository.list("#NamedQueryMappedSuperClass.getAll"))
+                            .flatMap(v -> namedQueryRepository.list("#NamedQueryEntity.getAll"))
+                            .flatMap(v -> namedQueryWith2QueriesRepository.list("#NamedQueryWith2QueriesEntity.getAll1"))
+                            .flatMap(v -> namedQueryWith2QueriesRepository.list("#NamedQueryWith2QueriesEntity.getAll2"))
+                            .flatMap(v -> {
+                                //empty query
+                                return personDao.find("").list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.find(null).list();
+                            }).flatMap(persons -> {
+                                Assertions.assertEquals(1, persons.size());
+                                Assertions.assertEquals(person, persons.get(0));
+
+                                return personDao.findById(person.id);
+                            }).flatMap(byId -> {
+                                Assertions.assertEquals(person, byId);
+                                Assertions.assertEquals("Person<" + person.id + ">", byId.toString());
+
+                                return personDao.findById(person.id, LockModeType.PESSIMISTIC_READ);
+                            }).flatMap(byId -> {
+                                Assertions.assertEquals(person, byId);
+                                Assertions.assertEquals("Person<" + person.id + ">", byId.toString());
+
+                                return person.delete();
+                            }).flatMap(v -> personDao.count())
+                            .flatMap(count -> {
+                                Assertions.assertEquals(0, count);
+
+                                return makeSavedPersonDao();
+                            });
+                }).flatMap(person -> {
+
+                    return personDao.count()
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return personDao.delete("name = ?1", "emmanuel");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(0, count);
+
+                                return dogDao.delete("owner = ?1", person);
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return personDao.delete("name", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return makeSavedPersonDao();
+                            });
+                }).flatMap(person -> {
+
+                    return dogDao.delete("owner = :owner", Parameters.with("owner", person).map())
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return personDao.delete("name", "stef");
+                            }).flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return makeSavedPersonDao();
+                            });
+                }).flatMap(person -> {
+
+                    return dogDao.delete("owner = :owner", Parameters.with("owner", person))
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return personDao.delete("name", "stef");
+                            }).map(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return null;
+                            });
+                })
+                .flatMap(v -> personDao.deleteAll())
+                .flatMap(count -> {
+                    Assertions.assertEquals(0, count);
+
+                    return makeSavedPersonDao();
+                }).flatMap(person -> {
+
+                    return dogDao.deleteAll()
+                            .flatMap(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return personDao.deleteAll();
+                            }).map(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return null;
+                            });
+                })
+                .flatMap(v -> testPersistDao(PersistTest.Iterable))
+                .flatMap(v -> testPersistDao(PersistTest.Stream))
+                .flatMap(v -> testPersistDao(PersistTest.Variadic))
+                .flatMap(v -> personDao.deleteAll())
+                .flatMap(count -> {
+                    Assertions.assertEquals(6, count);
+
+                    return testSorting();
+                })
+                // paging
+                .flatMap(v -> makeSavedPersonDao("0"))
+                .flatMap(v -> makeSavedPersonDao("1"))
+                .flatMap(v -> makeSavedPersonDao("2"))
+                .flatMap(v -> makeSavedPersonDao("3"))
+                .flatMap(v -> makeSavedPersonDao("4"))
+                .flatMap(v -> makeSavedPersonDao("5"))
+                .flatMap(v -> makeSavedPersonDao("6"))
+                .flatMap(v -> testPaging(personDao.findAll()))
+                .flatMap(v -> testPaging(personDao.find("ORDER BY name")))
+                // range
+                .flatMap(v -> testRange(personDao.findAll()))
+                .flatMap(v -> testRange(personDao.find("ORDER BY name")))
+                .flatMap(v -> assertThrows(NonUniqueResultException.class,
+                        () -> personDao.findAll().singleResult(),
+                        "singleResult should have thrown"))
+                .flatMap(v -> personDao.findAll().firstResult())
+                .flatMap(person -> {
+                    Assertions.assertNotNull(person);
+
+                    return personDao.deleteAll();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(7, count);
+
+                    return testUpdateDao();
+                }).flatMap(v -> {
+                    //delete by id
+                    Person toRemove = new Person();
+                    toRemove.name = "testDeleteById";
+                    toRemove.uniqueName = "testDeleteByIdUnique";
+                    return toRemove.persist().flatMap(v2 -> {
+                        System.err.println("Calling DELETE for " + toRemove.id);
+                        return personDao.deleteById(toRemove.id);
+                    });
+                }).flatMap(deleted -> {
+                    assertTrue(deleted);
+
+                    return personDao.deleteById(666L); //not existing
+                }).flatMap(deleted -> {
+                    assertFalse(deleted);
+
+                    // persistAndFlush
+                    Person person1 = new Person();
+                    person1.name = "testFLush1";
+                    person1.uniqueName = "unique";
+                    return personDao.persistAndFlush(person1);
+                    // FIXME: https://github.com/hibernate/hibernate-reactive/issues/281
+                    //                }).flatMap(v -> {
+                    //                    Person person2 = new Person();
+                    //                    person2.name = "testFLush2";
+                    //                    person2.uniqueName = "unique";
+                    //
+                    //                    // FIXME should be PersistenceException see https://github.com/hibernate/hibernate-reactive/issues/280
+                    //                    return assertThrows(PgException.class,
+                    //                            () -> personDao.persistAndFlush(person2),
+                    //                            "Should have failed");
+                }).flatMap(v -> {
+                    System.err.println("DONE before delete ?");
+                    return personDao.deleteAll();
+                })
+                .map(v -> {
+                    System.err.println("deleted " + v);
+                    return "OK";
+                }));
+    }
+
+    enum PersistTest {
+        Iterable,
+        Variadic,
+        Stream;
+    }
+
+    private Uni<Void> testPaging(PanacheQuery<Person> query) {
+        // No paging allowed until a page is setup
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.firstPage(),
+                "UnsupportedOperationException should have thrown");
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.previousPage(),
+                "UnsupportedOperationException should have thrown");
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.nextPage(),
+                "UnsupportedOperationException should have thrown");
+        //        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.lastPage(),
+        //                "UnsupportedOperationException should have thrown");
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.hasNextPage(),
+                "UnsupportedOperationException should have thrown");
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.hasPreviousPage(),
+                "UnsupportedOperationException should have thrown");
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.page(),
+                "UnsupportedOperationException should have thrown");
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> query.pageCount(),
+                "UnsupportedOperationException should have thrown");
+
+        // ints
+        return query.page(0, 3).list()
+                .flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef0", persons.get(0).name);
+                    Assertions.assertEquals("stef1", persons.get(1).name);
+                    Assertions.assertEquals("stef2", persons.get(2).name);
+
+                    return query.page(1, 3).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef3", persons.get(0).name);
+                    Assertions.assertEquals("stef4", persons.get(1).name);
+                    Assertions.assertEquals("stef5", persons.get(2).name);
+
+                    return query.page(2, 3).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(1, persons.size());
+                    Assertions.assertEquals("stef6", persons.get(0).name);
+
+                    return query.page(2, 4).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    // page
+                    Page page = new Page(3);
+                    return query.page(page).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef0", persons.get(0).name);
+                    Assertions.assertEquals("stef1", persons.get(1).name);
+                    Assertions.assertEquals("stef2", persons.get(2).name);
+
+                    Page page = new Page(1, 3);
+                    return query.page(page).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef3", persons.get(0).name);
+                    Assertions.assertEquals("stef4", persons.get(1).name);
+                    Assertions.assertEquals("stef5", persons.get(2).name);
+
+                    Page page = new Page(2, 3);
+                    return query.page(page).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(1, persons.size());
+                    Assertions.assertEquals("stef6", persons.get(0).name);
+
+                    Page page = new Page(3, 3);
+                    return query.page(page).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    // query paging
+                    Page page = new Page(3);
+                    return query.page(page).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef0", persons.get(0).name);
+                    Assertions.assertEquals("stef1", persons.get(1).name);
+                    Assertions.assertEquals("stef2", persons.get(2).name);
+                    return query.hasNextPage();
+                }).flatMap(hasNextPage -> {
+                    assertTrue(hasNextPage);
+                    assertFalse(query.hasPreviousPage());
+
+                    return query.nextPage().list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(1, query.page().index);
+                    Assertions.assertEquals(3, query.page().size);
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef3", persons.get(0).name);
+                    Assertions.assertEquals("stef4", persons.get(1).name);
+                    Assertions.assertEquals("stef5", persons.get(2).name);
+                    return query.hasNextPage();
+                }).flatMap(hasNextPage -> {
+                    assertTrue(hasNextPage);
+                    assertTrue(query.hasPreviousPage());
+
+                    return query.nextPage().list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(1, persons.size());
+                    Assertions.assertEquals("stef6", persons.get(0).name);
+
+                    return query.hasNextPage();
+                }).flatMap(hasNextPage -> {
+                    assertFalse(hasNextPage);
+                    assertTrue(query.hasPreviousPage());
+
+                    return query.nextPage().list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    return query.count();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(7, count);
+
+                    return query.pageCount();
+                }).flatMap(count -> {
+                    Assertions.assertEquals(3, count);
+
+                    // mix page with range
+                    return query.page(0, 3).range(0, 1).list();
+                }).map(persons -> {
+                    Assertions.assertEquals(2, persons.size());
+                    Assertions.assertEquals("stef0", persons.get(0).name);
+                    Assertions.assertEquals("stef1", persons.get(1).name);
+
+                    return null;
+                });
+    }
+
+    private Uni<Void> testRange(PanacheQuery<Person> query) {
+        return query.range(0, 2).list()
+                .flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef0", persons.get(0).name);
+                    Assertions.assertEquals("stef1", persons.get(1).name);
+                    Assertions.assertEquals("stef2", persons.get(2).name);
+
+                    return query.range(3, 5).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef3", persons.get(0).name);
+                    Assertions.assertEquals("stef4", persons.get(1).name);
+                    Assertions.assertEquals("stef5", persons.get(2).name);
+
+                    return query.range(6, 8).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(1, persons.size());
+                    Assertions.assertEquals("stef6", persons.get(0).name);
+
+                    return query.range(8, 12).list();
+                }).flatMap(persons -> {
+                    Assertions.assertEquals(0, persons.size());
+
+                    // mix range with page
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).nextPage());
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).previousPage());
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).pageCount());
+                    //                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).lastPage());
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).firstPage());
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).hasPreviousPage());
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).hasNextPage());
+                    Assertions.assertThrows(UnsupportedOperationException.class, () -> query.range(0, 2).page());
+
+                    // this is valid as we switch from range to page
+                    return query.range(0, 2).page(0, 3).list();
+                }).map(persons -> {
+                    Assertions.assertEquals(3, persons.size());
+                    Assertions.assertEquals("stef0", persons.get(0).name);
+                    Assertions.assertEquals("stef1", persons.get(1).name);
+                    Assertions.assertEquals("stef2", persons.get(2).name);
+
+                    return null;
+                });
+    }
+
+    @GET
+    @Path("accessors")
+    public String testAccessors() throws NoSuchMethodException, SecurityException {
+        checkMethod(AccessorEntity.class, "getString", String.class);
+        checkMethod(AccessorEntity.class, "isBool", boolean.class);
+        checkMethod(AccessorEntity.class, "getC", char.class);
+        checkMethod(AccessorEntity.class, "getS", short.class);
+        checkMethod(AccessorEntity.class, "getI", int.class);
+        checkMethod(AccessorEntity.class, "getL", long.class);
+        checkMethod(AccessorEntity.class, "getF", float.class);
+        checkMethod(AccessorEntity.class, "getD", double.class);
+        checkMethod(AccessorEntity.class, "getT", Object.class);
+        checkMethod(AccessorEntity.class, "getT2", Object.class);
+
+        checkMethod(AccessorEntity.class, "setString", void.class, String.class);
+        checkMethod(AccessorEntity.class, "setBool", void.class, boolean.class);
+        checkMethod(AccessorEntity.class, "setC", void.class, char.class);
+        checkMethod(AccessorEntity.class, "setS", void.class, short.class);
+        checkMethod(AccessorEntity.class, "setI", void.class, int.class);
+        checkMethod(AccessorEntity.class, "setL", void.class, long.class);
+        checkMethod(AccessorEntity.class, "setF", void.class, float.class);
+        checkMethod(AccessorEntity.class, "setD", void.class, double.class);
+        checkMethod(AccessorEntity.class, "setT", void.class, Object.class);
+        checkMethod(AccessorEntity.class, "setT2", void.class, Object.class);
+
+        try {
+            checkMethod(AccessorEntity.class, "getTrans2", Object.class);
+            Assertions.fail("transient field should have no getter: trans2");
+        } catch (NoSuchMethodException x) {
+        }
+
+        try {
+            checkMethod(AccessorEntity.class, "setTrans2", void.class, Object.class);
+            Assertions.fail("transient field should have no setter: trans2");
+        } catch (NoSuchMethodException x) {
+        }
+
+        // Now check that accessors are called
+        AccessorEntity entity = new AccessorEntity();
+        @SuppressWarnings("unused")
+        byte b = entity.b;
+        Assertions.assertEquals(1, entity.getBCalls);
+        entity.i = 2;
+        Assertions.assertEquals(1, entity.setICalls);
+        Object trans = entity.trans;
+        Assertions.assertEquals(0, entity.getTransCalls);
+        entity.trans = trans;
+        Assertions.assertEquals(0, entity.setTransCalls);
+
+        // accessors inside the entity itself
+        entity.method();
+        Assertions.assertEquals(2, entity.getBCalls);
+        Assertions.assertEquals(2, entity.setICalls);
+
+        return "OK";
+    }
+
+    private void checkMethod(Class<?> klass, String name, Class<?> returnType, Class<?>... params)
+            throws NoSuchMethodException, SecurityException {
+        Method method = klass.getMethod(name, params);
+        Assertions.assertEquals(returnType, method.getReturnType());
+    }
+
+    @GET
+    @Path("model1")
+    public Uni<String> testModel1() {
+        return Panache.withTransaction(() -> Person.count()
+                .flatMap(count -> {
+                    Assertions.assertEquals(0, count);
+
+                    return makeSavedPerson("");
+                }).flatMap(person -> {
+                    SelfDirtinessTracker trackingPerson = (SelfDirtinessTracker) person;
+
+                    String[] dirtyAttributes = trackingPerson.$$_hibernate_getDirtyAttributes();
+                    Assertions.assertEquals(0, dirtyAttributes.length);
+
+                    person.name = "1";
+
+                    dirtyAttributes = trackingPerson.$$_hibernate_getDirtyAttributes();
+                    Assertions.assertEquals(1, dirtyAttributes.length);
+
+                    return Person.count();
+                }).map(count -> {
+                    Assertions.assertEquals(1, count);
+
+                    return "OK";
+                }));
+    }
+
+    @GET
+    @Path("model2")
+    public Uni<String> testModel2() {
+        return Panache.withTransaction(() -> Person.count()
+                .flatMap(count -> {
+                    Assertions.assertEquals(1, count);
+
+                    return Person.findAll().<Person> firstResult();
+                }).map(person -> {
+                    Assertions.assertEquals("1", person.name);
+
+                    person.name = "2";
+                    return "OK";
+                }));
+    }
+
+    @GET
+    @Path("projection")
+    public Uni<String> testProjection() {
+        return Panache.withTransaction(() -> Person.count()
+                .flatMap(count -> {
+                    Assertions.assertEquals(1, count);
+
+                    return Person.findAll().project(PersonName.class).<PersonName> firstResult();
+                }).flatMap(person -> {
+                    Assertions.assertEquals("2", person.name);
+
+                    return Person.find("name", "2").project(PersonName.class).<PersonName> firstResult();
+                }).flatMap(person -> {
+                    Assertions.assertEquals("2", person.name);
+
+                    return Person.find("name = ?1", "2").project(PersonName.class).<PersonName> firstResult();
+                }).flatMap(person -> {
+                    Assertions.assertEquals("2", person.name);
+
+                    return Person.find("name = :name", Parameters.with("name", "2")).project(PersonName.class)
+                            .<PersonName> firstResult();
+                }).flatMap(person -> {
+                    Assertions.assertEquals("2", person.name);
+
+                    PanacheQuery<PersonName> query = Person.findAll().project(PersonName.class).page(0, 2);
+                    return query.list()
+                            .flatMap(results -> {
+                                Assertions.assertEquals(1, results.size());
+
+                                query.nextPage();
+                                return query.list();
+                            }).flatMap(results -> {
+                                Assertions.assertEquals(0, results.size());
+
+                                return Person.findAll().project(PersonName.class).count();
+                            }).map(count -> {
+                                Assertions.assertEquals(1, count);
+
+                                return "OK";
+                            });
+                }));
+    }
+
+    @GET
+    @Path("model3")
+    public Uni<String> testModel3() {
+        return Panache.withTransaction(() -> Person.count()
+                .flatMap(count -> {
+                    Assertions.assertEquals(1, count);
+
+                    return Person.findAll().<Person> firstResult();
+                })
+                .flatMap(person -> {
+                    Assertions.assertEquals("2", person.name);
+
+                    return Dog.deleteAll();
+                }).flatMap(v -> Person.deleteAll())
+                .flatMap(v -> Address.deleteAll())
+                .flatMap(v -> Person.count())
+                .map(count -> {
+                    Assertions.assertEquals(0, count);
+
+                    return "OK";
+                }));
+    }
+
+    @GET
+    @Path("ignored-properties")
+    public Person ignoredProperties() throws NoSuchMethodException, SecurityException {
+        Person.class.getMethod("$$_hibernate_read_id");
+        Person.class.getMethod("$$_hibernate_read_name");
+        try {
+            Person.class.getMethod("$$_hibernate_read_persistent");
+            Assertions.fail();
+        } catch (NoSuchMethodException e) {
+        }
+
+        // no need to persist it, we can fake it
+        Person person = new Person();
+        person.id = 666l;
+        person.name = "Eddie";
+        person.status = Status.DECEASED;
+        return person;
+    }
+
+    @Inject
+    Bug5274EntityRepository bug5274EntityRepository;
+
+    @GET
+    @Path("5274")
+    public Uni<String> testBug5274() {
+        return bug5274EntityRepository.count()
+                .map(v -> "OK");
+    }
+
+    @Inject
+    Bug5885EntityRepository bug5885EntityRepository;
+
+    @GET
+    @Path("5885")
+    public Uni<String> testBug5885() {
+        return bug5885EntityRepository.findById(1L)
+                .map(v -> "OK");
+    }
+
+    @GET
+    @Path("composite")
+    public Uni<String> testCompositeKey() {
+        return Panache.withTransaction(() -> {
+            ObjectWithCompositeId obj = new ObjectWithCompositeId();
+            obj.part1 = "part1";
+            obj.part2 = "part2";
+            obj.description = "description";
+            return obj.persist()
+                    .flatMap(v -> {
+                        ObjectWithCompositeId.ObjectKey key = new ObjectWithCompositeId.ObjectKey("part1", "part2");
+                        return ObjectWithCompositeId.findById(key)
+                                .flatMap(result -> {
+                                    assertNotNull(result);
+
+                                    return ObjectWithCompositeId.deleteById(key);
+                                }).flatMap(deleted -> {
+                                    assertTrue(deleted);
+
+                                    ObjectWithCompositeId.ObjectKey notExistingKey = new ObjectWithCompositeId.ObjectKey(
+                                            "notexist1",
+                                            "notexist2");
+                                    return ObjectWithCompositeId.deleteById(key);
+                                }).flatMap(deleted -> {
+                                    assertFalse(deleted);
+
+                                    ObjectWithEmbeddableId.ObjectKey embeddedKey = new ObjectWithEmbeddableId.ObjectKey("part1",
+                                            "part2");
+                                    ObjectWithEmbeddableId embeddable = new ObjectWithEmbeddableId();
+                                    embeddable.key = embeddedKey;
+                                    embeddable.description = "description";
+                                    return embeddable.persist()
+                                            .flatMap(v2 -> ObjectWithEmbeddableId.findById(embeddedKey))
+                                            .flatMap(embeddableResult -> {
+                                                assertNotNull(embeddableResult);
+
+                                                return ObjectWithEmbeddableId.deleteById(embeddedKey);
+                                            }).flatMap(deleted2 -> {
+                                                assertTrue(deleted2);
+
+                                                ObjectWithEmbeddableId.ObjectKey notExistingEmbeddedKey = new ObjectWithEmbeddableId.ObjectKey(
+                                                        "notexist1",
+                                                        "notexist2");
+                                                return ObjectWithEmbeddableId.deleteById(notExistingEmbeddedKey);
+                                            }).map(deleted2 -> {
+                                                assertFalse(deleted2);
+
+                                                return "OK";
+                                            });
+                                });
+                    });
+        });
+    }
+
+    @GET
+    @Path("7721")
+    public Uni<String> testBug7721() {
+        Bug7721Entity entity = new Bug7721Entity();
+        return Panache.withTransaction(() -> entity.persist()
+                .flatMap(v -> entity.delete())
+                .map(v -> "OK"));
+    }
+
+    @GET
+    @Path("8254")
+    public Uni<String> testBug8254() {
+        CatOwner owner = new CatOwner("8254");
+        return Panache.withTransaction(() -> owner.persist()
+                .flatMap(v -> new Cat(owner).persist())
+                .flatMap(v -> new Cat(owner).persist())
+                .flatMap(v -> new Cat(owner).persist())
+                // This used to fail with an invalid query "SELECT COUNT(*) SELECT DISTINCT cat.owner FROM Cat cat WHERE cat.owner = ?1"
+                // Should now result in a valid query "SELECT COUNT(DISTINCT cat.owner) FROM Cat cat WHERE cat.owner = ?1"
+                .flatMap(v -> CatOwner.find("SELECT DISTINCT cat.owner FROM Cat cat WHERE cat.owner = ?1", owner).count())
+                .flatMap(count -> {
+                    assertEquals(1L, count);
+
+                    // This used to fail with an invalid query "SELECT COUNT(*) SELECT cat.owner FROM Cat cat WHERE cat.owner = ?1"
+                    // Should now result in a valid query "SELECT COUNT(cat.owner) FROM Cat cat WHERE cat.owner = ?1"
+                    return CatOwner.find("SELECT cat.owner FROM Cat cat WHERE cat.owner = ?1", owner).count();
+                }).flatMap(count -> {
+                    assertEquals(3L, count);
+
+                    // This used to fail with an invalid query "SELECT COUNT(*) SELECT cat FROM Cat cat WHERE cat.owner = ?1"
+                    // Should now result in a valid query "SELECT COUNT(cat) FROM Cat cat WHERE cat.owner = ?1"
+                    return Cat.find("SELECT cat FROM Cat cat WHERE cat.owner = ?1", owner).count();
+                }).flatMap(count -> {
+                    assertEquals(3L, count);
+
+                    // This didn't use to fail. Make sure it still doesn't.
+                    return Cat.find("FROM Cat WHERE owner = ?1", owner).count();
+                }).flatMap(count -> {
+                    assertEquals(3L, count);
+
+                    return Cat.find("owner", owner).count();
+                }).flatMap(count -> {
+                    assertEquals(3L, count);
+
+                    return CatOwner.find("name = ?1", "8254").count();
+                }).map(count -> {
+                    assertEquals(1L, count);
+
+                    return "OK";
+                }));
+    }
+
+    @GET
+    @Path("9025")
+    public Uni<String> testBug9025() {
+        Fruit apple = new Fruit("apple", "red");
+        Fruit orange = new Fruit("orange", "orange");
+        Fruit banana = new Fruit("banana", "yellow");
+
+        return Panache.withTransaction(() -> Fruit.persist(apple, orange, banana)
+                .flatMap(v -> {
+                    PanacheQuery<Fruit> query = Fruit.find(
+                            "select name, color from Fruit").page(Page.ofSize(1));
+
+                    return query.list()
+                            .flatMap(v2 -> query.pageCount())
+                            .map(v2 -> "OK");
+                }));
+    }
+
+    @GET
+    @Path("9036")
+    public Uni<String> testBug9036() {
+        return Panache.withTransaction(() -> Person.deleteAll()
+                .flatMap(v -> new Person().persist())
+                .flatMap(v -> {
+                    Person deadPerson = new Person();
+                    deadPerson.name = "Stef";
+                    deadPerson.status = Status.DECEASED;
+                    return deadPerson.persist();
+                }).flatMap(v -> {
+                    Person livePerson = new Person();
+                    livePerson.name = "Stef";
+                    livePerson.status = Status.LIVING;
+                    return livePerson.persist();
+                }).flatMap(v -> Person.count())
+                .flatMap(count -> {
+                    assertEquals(3, count);
+
+                    return Person.listAll();
+                }).flatMap(list -> {
+                    assertEquals(3, list.size());
+
+                    return Person.find("status", Status.LIVING).firstResult();
+                }).flatMap(livePerson -> {
+                    // should be filtered
+                    PanacheQuery<Person> query = Person.findAll(Sort.by("id")).filter("Person.isAlive").filter("Person.hasName",
+                            Parameters.with("name", "Stef"));
+
+                    return query.count()
+                            .flatMap(count -> {
+                                assertEquals(1, count);
+
+                                return query.list();
+                            }).flatMap(list -> {
+                                assertEquals(1, list.size());
+
+                                assertEquals(livePerson, list.get(0));
+
+                                return collect(query.stream());
+                            }).flatMap(list -> {
+                                assertEquals(1, list.size());
+
+                                return query.firstResult();
+                            }).flatMap(result -> {
+                                assertEquals(livePerson, result);
+
+                                return query.singleResult();
+                            }).flatMap(result -> {
+                                assertEquals(livePerson, result);
+
+                                // these should be unaffected
+                                return Person.count();
+                            }).flatMap(count -> {
+                                assertEquals(3, count);
+
+                                return Person.listAll();
+                            }).flatMap(list -> {
+                                assertEquals(3, list.size());
+
+                                return Person.deleteAll();
+                            }).map(v -> "OK");
+                }));
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/main/resources/application.properties b/integration-tests/hibernate-reactive-panache/src/main/resources/application.properties
new file mode 100644
index 0000000000000..6d0922b28d2fe
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=hibernate_orm_test
+quarkus.datasource.password=hibernate_orm_test
+quarkus.datasource.reactive.url=${postgres.reactive.url}
+
+quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/hibernate-reactive-panache/src/main/resources/nopaging.properties b/integration-tests/hibernate-reactive-panache/src/main/resources/nopaging.properties
new file mode 100644
index 0000000000000..640a5e624b2fb
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/main/resources/nopaging.properties
@@ -0,0 +1,10 @@
+quarkus.datasource.db-kind=postgresql
+quarkus.datasource.username=hibernate_orm_test
+quarkus.datasource.password=hibernate_orm_test
+quarkus.datasource.reactive.url=${postgres.reactive.url}
+
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.log.category."org.hibernate.SQL".level=DEBUG
+# this is required otherwise SQL logs are formatted on multiple lines and we can't match them
+quarkus.hibernate-orm.log.sql=false
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java b/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java
new file mode 100644
index 0000000000000..512b83dc4e49c
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/DefaultPackageWithFastJarPMT.java
@@ -0,0 +1,32 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class DefaultPackageWithFastJarPMT {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(PackagelessCat.class))
+            .setApplicationName("default-package")
+            .setApplicationVersion(Version.getVersion())
+            .withConfigurationResource("application.properties")
+            .overrideConfigKey("quarkus.package.type", "fast-jar");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void testJarCreated() {
+        assertThat(prodModeTestResults.getResults()).hasSize(1);
+        assertThat(prodModeTestResults.getResults().get(0).getPath()).exists();
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java b/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java
new file mode 100644
index 0000000000000..549b164ed917a
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/PackagelessCat.java
@@ -0,0 +1,10 @@
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntity;
+
+@Entity
+public class PackagelessCat extends PanacheEntity {
+
+    public PackagelessCat() {
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java
new file mode 100644
index 0000000000000..8419afeb68cd7
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/DuplicateMethodTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.it.panache.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class DuplicateMethodTest {
+
+    @Inject
+    DuplicateRepository repository;
+
+    @Test
+    public void shouldNotDuplicateMethodsInRepository() {
+        assertThat(repository.findById(1)).isNotNull();
+    }
+
+    @Test
+    public void shouldNotDuplicateMethodsInEntity() {
+        DuplicateEntity entity = DuplicateEntity.<DuplicateEntity> findById(1).await().indefinitely();
+        assertThat(entity).isNotNull();
+        entity.persist().await().indefinitely();
+        DuplicateEntity.update("foo", Parameters.with("a", 1)).await().indefinitely();
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java
new file mode 100644
index 0000000000000..7d5409009219a
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/MockPersonRepository.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.panache.reactive;
+
+import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
+
+/**
+ * An alternate implementation of {@link PersonRepository} to demonstrate that Repository entity type can be retrieved
+ * even when the class does not directly implement PanacheRepository interface.
+ */
+@Alternative
+@Priority(1)
+@ApplicationScoped
+public class MockPersonRepository extends PersonRepository {
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java
new file mode 100644
index 0000000000000..483aad47b9174
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/NoPagingPMT.java
@@ -0,0 +1,81 @@
+package io.quarkus.it.panache.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.Version;
+import io.quarkus.test.LogFile;
+import io.quarkus.test.QuarkusProdModeTest;
+import io.restassured.RestAssured;
+
+/**
+ * Test if PanacheQuery is using unnecessary SQL for limiting the number of output rows, the log output is tested for the
+ * presence of <code>offset</code> or <code>limit</code> in the SQL.
+ */
+public class NoPagingPMT {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(PageItem.class, NoPagingTestEndpoint.class))
+            .setApplicationName("no-paging-test")
+            .setApplicationVersion(Version.getVersion())
+            .setRun(true)
+            .setLogFileName("no-paging-test.log")
+            .withConfigurationResource("nopaging.properties");
+
+    @LogFile
+    private Path logfile;
+
+    @Test
+    public void test() {
+        assertThat(logfile).isRegularFile().hasFileName("no-paging-test.log");
+
+        RestAssured.when().get("/no-paging-test").then().body(is("OK"));
+
+        // the logs might not be flushed to disk immediately, so wait a few seconds before giving up completely
+        await().atMost(3, TimeUnit.SECONDS).untilAsserted(this::checkLog);
+    }
+
+    private void checkLog() {
+        final List<String> lines;
+        try {
+            lines = Files.readAllLines(logfile);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        /*
+         * Test the SQL was logged, this could fail if Hibernate decides to change how it logs the generated SQL, here in order
+         * to not silently skip the following test
+         */
+        final boolean sqlFound = lines.stream()
+                .filter(line -> line.matches(".*select .* from PageItem .*"))
+                .findAny()
+                .isPresent();
+        assertThat(sqlFound)
+                .as("Hibernate query wasn't logged")
+                .isTrue();
+
+        // Search for the presence of a SQL with a limit or offset
+        final boolean wrongSqlFound = lines.stream()
+                .filter(line -> line.matches(".*select .* limit .*") || line.matches(".*select .* offset .*"))
+                .findAny()
+                .isPresent();
+        assertThat(wrongSqlFound)
+                .as("PanacheQuery is generating SQL with limits and/or offsets when no paging has been requested")
+                .isFalse();
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityInGraalITCase.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityInGraalITCase.java
new file mode 100644
index 0000000000000..78d2b13010a09
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityInGraalITCase.java
@@ -0,0 +1,11 @@
+package io.quarkus.it.panache.reactive;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+/**
+ * Test various Panache operations running in native mode
+ */
+@QuarkusIntegrationTest
+public class PanacheFunctionalityInGraalITCase extends PanacheFunctionalityTest {
+
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java
new file mode 100644
index 0000000000000..62f4a5559d963
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheFunctionalityTest.java
@@ -0,0 +1,189 @@
+package io.quarkus.it.panache.reactive;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import javax.transaction.Transactional;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.test.junit.DisabledOnNativeImage;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.smallrye.mutiny.Uni;
+
+/**
+ * Test various Panache operations running in Quarkus
+ */
+@QuarkusTest
+public class PanacheFunctionalityTest {
+
+    /**
+     * Tests that direct use of the entity in the test class does not break transformation
+     *
+     * see https://github.com/quarkusio/quarkus/issues/1724
+     */
+    @SuppressWarnings("unused")
+    Person p = new Person();
+
+    @Test
+    public void testPanacheFunctionality() throws Exception {
+        RestAssured.when().get("/test/model-dao").then().body(is("OK"));
+        RestAssured.when().get("/test/model").then().body(is("OK"));
+        RestAssured.when().get("/test/accessors").then().body(is("OK"));
+
+        RestAssured.when().get("/test/model1").then().body(is("OK"));
+        RestAssured.when().get("/test/model2").then().body(is("OK"));
+        RestAssured.when().get("/test/projection").then().body(is("OK"));
+        RestAssured.when().get("/test/model3").then().body(is("OK"));
+    }
+
+    @Test
+    public void testPanacheSerialisation() {
+        RestAssured.given().accept(ContentType.JSON)
+                .when().get("/test/ignored-properties")
+                .then()
+                .body(is("{\"id\":666,\"dogs\":[],\"name\":\"Eddie\",\"serialisationTrick\":1,\"status\":\"DECEASED\"}"));
+    }
+
+    @DisabledOnNativeImage
+    @Test
+    public void testPanacheInTest() {
+        Assertions.assertEquals(0, Person.count().await().indefinitely());
+    }
+
+    @Test
+    public void testBug5274() {
+        RestAssured.when().get("/test/5274").then().body(is("OK"));
+    }
+
+    @Test
+    public void testBug5885() {
+        RestAssured.when().get("/test/5885").then().body(is("OK"));
+    }
+
+    /**
+     * _PanacheEntityBase_ has the method _isPersistent_. This method is used by Jackson to serialize the attribute *peristent*
+     * in the JSON which is not intended. This test ensures that the attribute *persistent* is not generated when using Jackson.
+     *
+     * This test does not interact with the Quarkus application itself. It is just using the Jackson ObjectMapper with a
+     * PanacheEntity. Thus this test is disabled in native mode. The test code runs the JVM and not native.
+     */
+    @DisabledOnNativeImage
+    @Test
+    public void jacksonDeserializationIgnoresPersistentAttribute() throws JsonProcessingException {
+        // set Up
+        Person person = new Person();
+        person.name = "max";
+        // do
+        ObjectMapper objectMapper = new ObjectMapper();
+        // make sure the Jaxb module is loaded
+        objectMapper.findAndRegisterModules();
+        String personAsString = objectMapper.writeValueAsString(person);
+        // check 
+        // hence no 'persistence'-attribute
+        assertEquals(
+                "{\"id\":null,\"name\":\"max\",\"uniqueName\":null,\"address\":null,\"status\":null,\"dogs\":[],\"serialisationTrick\":1}",
+                personAsString);
+    }
+
+    /**
+     * This test is disabled in native mode as there is no interaction with the quarkus integration test endpoint.
+     */
+    @DisabledOnNativeImage
+    @Test
+    public void jsonbDeserializationHasAllFields() throws JsonProcessingException {
+        // set Up
+        Person person = new Person();
+        person.name = "max";
+        // do
+
+        Jsonb jsonb = JsonbBuilder.create();
+        String json = jsonb.toJson(person);
+        assertEquals(
+                "{\"dogs\":[],\"name\":\"max\",\"serialisationTrick\":1}",
+                json);
+    }
+
+    @Test
+    public void testCompositeKey() {
+        RestAssured.when()
+                .get("/test/composite")
+                .then()
+                .body(is("OK"));
+    }
+
+    @Test
+    public void testBug7721() {
+        RestAssured.when().get("/test/7721").then().body(is("OK"));
+    }
+
+    @Test
+    public void testBug8254() {
+        RestAssured.when().get("/test/8254").then().body(is("OK"));
+    }
+
+    @Test
+    public void testBug9025() {
+        RestAssured.when().get("/test/9025").then().body(is("OK"));
+    }
+
+    @Test
+    public void testBug9036() {
+        RestAssured.when().get("/test/9036").then().body(is("OK"));
+    }
+
+    @DisabledOnNativeImage
+    @Transactional
+    @Test
+    void testBug7102InOneTransaction() {
+        testBug7102();
+    }
+
+    @DisabledOnNativeImage
+    @Test
+    public void testBug7102() {
+        createBug7102()
+                .flatMap(person -> {
+                    return getBug7102(person.id)
+                            .flatMap(person1 -> {
+                                Assertions.assertEquals("pero", person1.name);
+                                return updateBug7102(person.id);
+                            })
+                            .flatMap(v -> getBug7102(person.id))
+                            .map(person2 -> {
+                                Assertions.assertEquals("jozo", person2.name);
+                                return null;
+                            });
+                }).flatMap(v -> Person.deleteAll())
+                .await().indefinitely();
+    }
+
+    @Transactional
+    Uni<Person> createBug7102() {
+        Person personPanache = new Person();
+        personPanache.name = "pero";
+        return personPanache.persistAndFlush().map(v -> personPanache);
+    }
+
+    @Transactional
+    Uni<Void> updateBug7102(Long id) {
+        return Person.<Person> findById(id)
+                .map(person -> {
+                    person.name = "jozo";
+                    return null;
+                });
+    }
+
+    @Transactional
+    Uni<Person> getBug7102(Long id) {
+        return Person.findById(id);
+    }
+}
diff --git a/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java
new file mode 100644
index 0000000000000..91297fe21cf5f
--- /dev/null
+++ b/integration-tests/hibernate-reactive-panache/src/test/java/io/quarkus/it/panache/reactive/PanacheMockingTest.java
@@ -0,0 +1,127 @@
+package io.quarkus.it.panache.reactive;
+
+import java.util.Collections;
+
+import javax.inject.Inject;
+import javax.persistence.LockModeType;
+import javax.ws.rs.WebApplicationException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
+import io.quarkus.panache.mock.PanacheMock;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.mockito.InjectMock;
+import io.smallrye.mutiny.Uni;
+
+@QuarkusTest
+public class PanacheMockingTest {
+
+    @Test
+    @Order(1)
+    public void testPanacheMocking() {
+        PanacheMock.mock(Person.class);
+
+        Assertions.assertEquals(0, Person.count().await().indefinitely());
+
+        Mockito.when(Person.count()).thenReturn(Uni.createFrom().item(23l));
+        Assertions.assertEquals(23, Person.count().await().indefinitely());
+
+        Mockito.when(Person.count()).thenReturn(Uni.createFrom().item(42l));
+        Assertions.assertEquals(42, Person.count().await().indefinitely());
+
+        Mockito.when(Person.count()).thenCallRealMethod();
+        Assertions.assertEquals(0, Person.count().await().indefinitely());
+
+        PanacheMock.verify(Person.class, Mockito.times(4)).count();
+
+        Person p = new Person();
+        Mockito.when(Person.findById(12l)).thenReturn(Uni.createFrom().item(p));
+        Assertions.assertSame(p, Person.findById(12l).await().indefinitely());
+        Assertions.assertNull(Person.findById(42l).await().indefinitely());
+
+        Mockito.when(Person.findById(12l)).thenThrow(new WebApplicationException());
+        try {
+            Person.findById(12l);
+            Assertions.fail();
+        } catch (WebApplicationException x) {
+        }
+
+        Mockito.when(Person.findOrdered()).thenReturn(Uni.createFrom().item(Collections.emptyList()));
+        Assertions.assertTrue(Person.findOrdered().await().indefinitely().isEmpty());
+
+        PanacheMock.verify(Person.class).findOrdered();
+        PanacheMock.verify(Person.class, Mockito.atLeastOnce()).findById(Mockito.any());
+        PanacheMock.verifyNoMoreInteractions(Person.class);
+
+        Assertions.assertEquals(0, Person.methodWithPrimitiveParams(true, (byte) 0, (short) 0, 0, 2, 2.0f, 2.0, 'c'));
+    }
+
+    @Test
+    @Order(2)
+    public void testPanacheMockingWasCleared() {
+        Assertions.assertFalse(PanacheMock.IsMockEnabled);
+    }
+
+    @InjectMock
+    MockablePersonRepository mockablePersonRepository;
+
+    @Test
+    public void testPanacheRepositoryMocking() throws Throwable {
+        Assertions.assertEquals(0, mockablePersonRepository.count().await().indefinitely());
+
+        Mockito.when(mockablePersonRepository.count()).thenReturn(Uni.createFrom().item(23l));
+        Assertions.assertEquals(23, mockablePersonRepository.count().await().indefinitely());
+
+        Mockito.when(mockablePersonRepository.count()).thenReturn(Uni.createFrom().item(42l));
+        Assertions.assertEquals(42, mockablePersonRepository.count().await().indefinitely());
+
+        Mockito.when(mockablePersonRepository.count()).thenCallRealMethod();
+        Assertions.assertEquals(0, mockablePersonRepository.count().await().indefinitely());
+
+        Mockito.verify(mockablePersonRepository, Mockito.times(4)).count();
+
+        Person p = new Person();
+        Mockito.when(mockablePersonRepository.findById(12l)).thenReturn(Uni.createFrom().item(p));
+        Assertions.assertSame(p, mockablePersonRepository.findById(12l).await().indefinitely());
+        Assertions.assertNull(mockablePersonRepository.findById(42l).await().indefinitely());
+
+        Mockito.when(mockablePersonRepository.findById(12l)).thenThrow(new WebApplicationException());
+        try {
+            mockablePersonRepository.findById(12l);
+            Assertions.fail();
+        } catch (WebApplicationException x) {
+        }
+
+        Mockito.when(mockablePersonRepository.findOrdered()).thenReturn(Uni.createFrom().item(Collections.emptyList()));
+        Assertions.assertTrue(mockablePersonRepository.findOrdered().await().indefinitely().isEmpty());
+
+        Mockito.verify(mockablePersonRepository).findOrdered();
+        Mockito.verify(mockablePersonRepository, Mockito.atLeastOnce()).findById(Mockito.any());
+        Mockito.verifyNoMoreInteractions(mockablePersonRepository);
+    }
+
+    @Inject
+    PersonRepository realPersonRepository;
+
+    @Test
+    public void testPanacheRepositoryBridges() {
+        // normal method call
+        Assertions.assertNull(realPersonRepository.findById(0l).await().indefinitely());
+        // bridge call
+        Assertions.assertNull(((PanacheRepositoryBase) realPersonRepository).findById(0l).await().indefinitely());
+        // normal method call
+        Assertions.assertNull(realPersonRepository.findById(0l, LockModeType.NONE).await().indefinitely());
+        // bridge call
+        Assertions.assertNull(
+                ((PanacheRepositoryBase) realPersonRepository).findById(0l, LockModeType.NONE).await().indefinitely());
+
+        // normal method call
+        Assertions.assertEquals(false, realPersonRepository.deleteById(0l).await().indefinitely());
+        // bridge call
+        Assertions.assertEquals(false, ((PanacheRepositoryBase) realPersonRepository).deleteById(0l).await().indefinitely());
+    }
+}
diff --git a/integration-tests/hibernate-reactive-postgresql/pom.xml b/integration-tests/hibernate-reactive-postgresql/pom.xml
index 4da20cbc5f721..d4bf47eaee933 100644
--- a/integration-tests/hibernate-reactive-postgresql/pom.xml
+++ b/integration-tests/hibernate-reactive-postgresql/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +14,7 @@
     <description>Hibernate Reactive related tests running with the PostgreSQL database</description>
 
     <properties>
-        <postgres.image>postgres:10.5</postgres.image>
+        <postgres.image>postgres:13.1</postgres.image>
         <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
     </properties>
 
@@ -30,14 +29,10 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
 
-		<!-- test dependencies -->
+        <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -48,6 +43,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -62,12 +98,18 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <systemPropertyVariables>
+                        <org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>true</org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <systemPropertyVariables>
+                        <org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>true</org.hibernate.reactive.common.InternalStateAssertions.ENFORCE>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -89,7 +131,7 @@
             <id>test-postgresql</id>
             <activation>
                 <property>
-                    <name>test-postgresql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -110,68 +152,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-postgresql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -208,7 +193,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all postgres:10.5 images currently running, not just those we just started.
+                            <!--Stops all postgres images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>
@@ -241,7 +226,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java
index c2531d097fc53..e3fa12b9c8166 100644
--- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java
+++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpoint.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
@@ -21,10 +19,10 @@
 public class HibernateReactiveTestEndpoint {
 
     @Inject
-    CompletionStage<Stage.Session> stageSession;
+    Stage.Session stageSession;
 
     @Inject
-    Uni<Mutiny.Session> mutinySession;
+    Mutiny.Session mutinySession;
 
     // Injecting a Vert.x Pool is not required, it us only used to
     // independently validate the contents of the database for the test
@@ -33,121 +31,104 @@ public class HibernateReactiveTestEndpoint {
 
     @GET
     @Path("/reactiveFind")
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<GuineaPig> reactiveFind() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
-        return stageSession
-                .thenCompose(session -> {
-                    return populateDB().convert().toCompletionStage()
-                            .thenCompose(junk -> session.find(GuineaPig.class, expectedPig.getId()));
-                });
+        return populateDB().convert().toCompletionStage()
+                .thenCompose(junk -> stageSession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactiveFindMutiny")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<GuineaPig> reactiveFindMutiny() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
-        return mutinySession
-                .flatMap(session -> {
-                    return populateDB()
-                            .then(() -> session.find(GuineaPig.class, expectedPig.getId()));
-                });
+        return populateDB().chain(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactivePersist")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactivePersist() {
+        final GuineaPig pig = new GuineaPig(10, "Tulip");
         return mutinySession
-                .flatMap(s -> s.persist(new GuineaPig(10, "Tulip")))
-                .flatMap(s -> s.flush())
-                .flatMap(junk -> selectNameFromId(10));
+                .persist(pig)
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(10));
     }
 
     @GET
     @Path("/reactiveCowPersist")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<FriesianCow> reactiveCowPersist() {
         final FriesianCow cow = new FriesianCow();
         cow.name = "Carolina";
         return mutinySession
-                .flatMap(s -> s.persist(cow))
-                .flatMap(s -> s.flush())
-                .flatMap(s -> s.createQuery("from FriesianCow f where f.name = :name", FriesianCow.class)
+                .persist(cow)
+                .chain(() -> mutinySession.flush())
+                .chain(s -> mutinySession.createQuery("from FriesianCow f where f.name = :name", FriesianCow.class)
                         .setParameter("name", cow.name).getSingleResult());
     }
 
     @GET
     @Path("/reactiveRemoveTransientEntity")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveRemoveTransientEntity() {
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(name -> {
-                                if (name == null)
-                                    throw new AssertionError("Database was not populated properly");
-                                return name;
-                            })
-                            .flatMap(junk -> mutinySession.merge(new GuineaPig(5, "Aloi")))
-                            .flatMap(aloi -> mutinySession.remove(aloi))
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(result -> {
-                                if (result == null)
-                                    return "OK";
-                                else
-                                    return result;
-                            });
+        return populateDB()
+                .chain(() -> selectNameFromId(5))
+                .invoke(name -> {
+                    if (name == null)
+                        throw new AssertionError("Database was not populated properly");
+                })
+                .chain(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
+                .map(result -> {
+                    if (result == null)
+                        return "OK";
+                    else
+                        return result;
                 });
     }
 
     @GET
     @Path("/reactiveRemoveManagedEntity")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveRemoveManagedEntity() {
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> mutinySession.find(GuineaPig.class, 5))
-                            .flatMap(aloi -> mutinySession.remove(aloi))
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5))
-                            .map(result -> {
-                                if (result == null)
-                                    return "OK";
-                                else
-                                    return result;
-                            });
+        return populateDB()
+                .chain(() -> selectNameFromId(5))
+                .invoke(name -> {
+                    if (name == null)
+                        throw new AssertionError("Database was not populated properly");
+                })
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
+                .map(result -> {
+                    if (result == null)
+                        return "OK";
+                    else
+                        return result;
                 });
     }
 
     @GET
     @Path("/reactiveUpdate")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<String> reactiveUpdate() {
         final String NEW_NAME = "Tina";
-        return mutinySession
-                .flatMap(mutinySession -> {
-                    return populateDB()
-                            .flatMap(junk -> mutinySession.find(GuineaPig.class, 5))
-                            .map(pig -> {
-                                if (NEW_NAME.equals(pig.getName()))
-                                    throw new AssertionError("Pig already had name " + NEW_NAME);
-                                pig.setName(NEW_NAME);
-                                return pig;
-                            })
-                            .flatMap(junk -> mutinySession.flush())
-                            .flatMap(junk -> selectNameFromId(5));
-                });
+        return populateDB()
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .invoke(pig -> {
+                    if (NEW_NAME.equals(pig.getName()))
+                        throw new AssertionError("Pig already had name " + NEW_NAME);
+                    pig.setName(NEW_NAME);
+                })
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5));
     }
 
     private Uni<RowSet<Row>> populateDB() {
-        return pgPool.query("DELETE FROM Pig").execute()
-                .and(pgPool.query("DELETE FROM Cow").execute())
-                .flatMap(junk -> pgPool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute());
+        return Uni.combine().all().unis(
+                pgPool.query("DELETE FROM Pig").execute(),
+                pgPool.query("DELETE FROM Cow").execute())
+                .asTuple()
+                .chain(() -> pgPool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute());
     }
 
     private Uni<String> selectNameFromId(Integer id) {
diff --git a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java
index 58ab3e7de2a6b..f0551267f32b1 100644
--- a/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java
+++ b/integration-tests/hibernate-reactive-postgresql/src/main/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTestEndpointAlternative.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.stage.Stage;
@@ -18,7 +16,6 @@
 import io.vertx.mutiny.sqlclient.Tuple;
 
 @Path("/alternative-tests")
-@Produces(MediaType.APPLICATION_JSON)
 public class HibernateReactiveTestEndpointAlternative {
 
     @Inject
@@ -45,32 +42,32 @@ public CompletionStage<GuineaPig> reactiveFind() {
     public Uni<GuineaPig> reactiveFindMutiny() {
         final GuineaPig expectedPig = new GuineaPig(5, "Aloi");
         return populateDB()
-                .onItem().transformToUni(junk -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
+                .chain(() -> mutinySession.find(GuineaPig.class, expectedPig.getId()));
     }
 
     @GET
     @Path("/reactivePersist")
     public Uni<String> reactivePersist() {
         return mutinySession.persist(new GuineaPig(10, "Tulip"))
-                .onItem().transformToUni(s -> s.flush())
-                .onItem().transformToUni(junk -> selectNameFromId(10));
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(10));
     }
 
     @GET
     @Path("/reactiveRemoveTransientEntity")
     public Uni<String> reactiveRemoveTransientEntity() {
         return populateDB()
-                .onItem().transformToUni(junk -> selectNameFromId(5))
+                .chain(() -> selectNameFromId(5))
                 .onItem().transform(name -> {
                     if (name == null) {
                         throw new AssertionError("Database was not populated properly");
                     }
                     return name;
                 })
-                .onItem().transformToUni(junk -> mutinySession.merge(new GuineaPig(5, "Aloi")))
-                .onItem().transformToUni(aloi -> mutinySession.remove(aloi))
-                .onItem().transformToUni(junk -> mutinySession.flush())
-                .onItem().transformToUni(junk -> selectNameFromId(5))
+                .chain(() -> mutinySession.merge(new GuineaPig(5, "Aloi")))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
                 .onItem().ifNotNull().transform(result -> result)
                 .onItem().ifNull().continueWith("OK");
     }
@@ -79,10 +76,10 @@ public Uni<String> reactiveRemoveTransientEntity() {
     @Path("/reactiveRemoveManagedEntity")
     public Uni<String> reactiveRemoveManagedEntity() {
         return populateDB()
-                .onItem().transformToUni(junk -> mutinySession.find(GuineaPig.class, 5))
-                .onItem().transformToUni(aloi -> mutinySession.remove(aloi))
-                .onItem().transformToUni(junk -> mutinySession.flush())
-                .onItem().transformToUni(junk -> selectNameFromId(5))
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
+                .chain(aloi -> mutinySession.remove(aloi))
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5))
                 .onItem().ifNotNull().transform(result -> result)
                 .onItem().ifNull().continueWith("OK");
     }
@@ -92,7 +89,7 @@ public Uni<String> reactiveRemoveManagedEntity() {
     public Uni<String> reactiveUpdate() {
         final String NEW_NAME = "Tina";
         return populateDB()
-                .onItem().transformToUni(junk -> mutinySession.find(GuineaPig.class, 5))
+                .chain(() -> mutinySession.find(GuineaPig.class, 5))
                 .onItem().transform(pig -> {
                     if (NEW_NAME.equals(pig.getName())) {
                         throw new AssertionError("Pig already had name " + NEW_NAME);
@@ -100,13 +97,13 @@ public Uni<String> reactiveUpdate() {
                     pig.setName(NEW_NAME);
                     return pig;
                 })
-                .onItem().transformToUni(junk -> mutinySession.flush())
-                .onItem().transformToUni(junk -> selectNameFromId(5));
+                .chain(() -> mutinySession.flush())
+                .chain(() -> selectNameFromId(5));
     }
 
     private Uni<RowSet<Row>> populateDB() {
         return pgPool.query("DELETE FROM Pig").execute()
-                .flatMap(junk -> pgPool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute());
+                .chain(() -> pgPool.preparedQuery("INSERT INTO Pig (id, name) VALUES (5, 'Aloi')").execute());
     }
 
     private Uni<String> selectNameFromId(Integer id) {
diff --git a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java
index f9ec6a03f7744..9d5e37ada5ad5 100644
--- a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java
+++ b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveAlternativeTest.java
@@ -4,6 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 
@@ -11,12 +12,13 @@
  * Test various JPA operations running in Quarkus when the session is injected without Uni or CompletionStage.
  */
 @QuarkusTest
+@TestHTTPEndpoint(HibernateReactiveTestEndpointAlternative.class)
 public class HibernateReactiveAlternativeTest {
 
     @Test
     public void reactiveFind() {
         RestAssured.when()
-                .get("/alternative-tests/reactiveFind")
+                .get("/reactiveFind")
                 .then()
                 .body(is("{\"id\":5,\"name\":\"Aloi\"}"));
     }
@@ -24,7 +26,7 @@ public void reactiveFind() {
     @Test
     public void reactiveFindMutiny() {
         RestAssured.when()
-                .get("/alternative-tests/reactiveFindMutiny")
+                .get("/reactiveFindMutiny")
                 .then()
                 .body(is("{\"id\":5,\"name\":\"Aloi\"}"));
     }
@@ -32,7 +34,7 @@ public void reactiveFindMutiny() {
     @Test
     public void reactivePersist() {
         RestAssured.when()
-                .get("/alternative-tests/reactivePersist")
+                .get("/reactivePersist")
                 .then()
                 .body(is("Tulip"));
     }
@@ -40,7 +42,7 @@ public void reactivePersist() {
     @Test
     public void reactiveRemoveTransientEntity() {
         RestAssured.when()
-                .get("/alternative-tests/reactiveRemoveTransientEntity")
+                .get("/reactiveRemoveTransientEntity")
                 .then()
                 .body(is("OK"));
     }
@@ -48,7 +50,7 @@ public void reactiveRemoveTransientEntity() {
     @Test
     public void reactiveRemoveManagedEntity() {
         RestAssured.when()
-                .get("/alternative-tests/reactiveRemoveManagedEntity")
+                .get("/reactiveRemoveManagedEntity")
                 .then()
                 .body(is("OK"));
     }
@@ -56,7 +58,7 @@ public void reactiveRemoveManagedEntity() {
     @Test
     public void reactiveUpdate() {
         RestAssured.when()
-                .get("/alternative-tests/reactiveUpdate")
+                .get("/reactiveUpdate")
                 .then()
                 .body(is("Tina"));
     }
diff --git a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java
index e3507910d1c1a..89fe03fbc06b9 100644
--- a/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java
+++ b/integration-tests/hibernate-reactive-postgresql/src/test/java/io/quarkus/it/hibernate/reactive/postgresql/HibernateReactiveTest.java
@@ -5,6 +5,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 
@@ -12,12 +13,13 @@
  * Test various JPA operations running in Quarkus
  */
 @QuarkusTest
+@TestHTTPEndpoint(HibernateReactiveTestEndpoint.class)
 public class HibernateReactiveTest {
 
     @Test
     public void reactiveFind() {
         RestAssured.when()
-                .get("/tests/reactiveFind")
+                .get("/reactiveFind")
                 .then()
                 .body(is("{\"id\":5,\"name\":\"Aloi\"}"));
     }
@@ -25,7 +27,7 @@ public void reactiveFind() {
     @Test
     public void reactiveCowPersist() {
         RestAssured.when()
-                .get("/tests/reactiveCowPersist")
+                .get("/reactiveCowPersist")
                 .then()
                 .body(containsString("\"name\":\"Carolina\"}")); //Use containsString as we don't know the Id this object will have
     }
@@ -33,7 +35,7 @@ public void reactiveCowPersist() {
     @Test
     public void reactiveFindMutiny() {
         RestAssured.when()
-                .get("/tests/reactiveFindMutiny")
+                .get("/reactiveFindMutiny")
                 .then()
                 .body(is("{\"id\":5,\"name\":\"Aloi\"}"));
     }
@@ -41,7 +43,7 @@ public void reactiveFindMutiny() {
     @Test
     public void reactivePersist() {
         RestAssured.when()
-                .get("/tests/reactivePersist")
+                .get("/reactivePersist")
                 .then()
                 .body(is("Tulip"));
     }
@@ -49,7 +51,7 @@ public void reactivePersist() {
     @Test
     public void reactiveRemoveTransientEntity() {
         RestAssured.when()
-                .get("/tests/reactiveRemoveTransientEntity")
+                .get("/reactiveRemoveTransientEntity")
                 .then()
                 .body(is("OK"));
     }
@@ -57,7 +59,7 @@ public void reactiveRemoveTransientEntity() {
     @Test
     public void reactiveRemoveManagedEntity() {
         RestAssured.when()
-                .get("/tests/reactiveRemoveManagedEntity")
+                .get("/reactiveRemoveManagedEntity")
                 .then()
                 .body(is("OK"));
     }
@@ -65,7 +67,7 @@ public void reactiveRemoveManagedEntity() {
     @Test
     public void reactiveUpdate() {
         RestAssured.when()
-                .get("/tests/reactiveUpdate")
+                .get("/reactiveUpdate")
                 .then()
                 .body(is("Tina"));
     }
diff --git a/integration-tests/hibernate-search-elasticsearch/README.md b/integration-tests/hibernate-search-elasticsearch/README.md
deleted file mode 100644
index 4ecf385695306..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Hibernate Search example with Elasticsearch
-
-## Running the tests
-
-By default, the tests of this module are disabled.
-
-To run the tests in a standard JVM with Elasticsearch started in the JVM, you can run the following command:
-
-```
-mvn clean install -Dtest-elasticsearch
-```
-
-Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
-
-```
-mvn clean install -Dtest-elasticsearch -Dnative
-```
-
diff --git a/integration-tests/hibernate-search-elasticsearch/pom.xml b/integration-tests/hibernate-search-elasticsearch/pom.xml
deleted file mode 100644
index 9a223b265f1cf..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/pom.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>quarkus-integration-tests-parent</artifactId>
-        <groupId>io.quarkus</groupId>
-        <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>quarkus-integration-test-hibernate-search-elasticsearch</artifactId>
-    <name>Quarkus - Integration Tests - Hibernate Search + Elasticsearch</name>
-    <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-hibernate-search-elasticsearch</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jdbc-h2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>test-elasticsearch</id>
-            <activation>
-                <property>
-                    <name>test-elasticsearch</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.alexcojocaru</groupId>
-                        <artifactId>elasticsearch-maven-plugin</artifactId>
-                        <configuration>
-                            <timeout>90</timeout>
-                            <pathConf>${project.build.directory}/test-classes/elasticsearch-maven-plugin/configuration/</pathConf>
-                            <pathInitScript>${project.build.directory}/test-classes/elasticsearch-maven-plugin/init/init.script</pathInitScript>
-                            <autoCreateIndex>true</autoCreateIndex>
-                        </configuration>
-                        <!-- Different executions from 2.x: the "start" goal has been renamed in version 5  -->
-                        <executions>
-                            <execution>
-                                <id>start-elasticsearch</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>runforked</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>stop-elasticsearch</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/DefaultITAnalysisConfigurer.java b/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/DefaultITAnalysisConfigurer.java
deleted file mode 100644
index 9aa35ed59aba1..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/DefaultITAnalysisConfigurer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.quarkus.it.hibernate.search.elasticsearch.search;
-
-import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
-import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
-
-public class DefaultITAnalysisConfigurer implements ElasticsearchAnalysisConfigurer {
-
-    @Override
-    public void configure(ElasticsearchAnalysisConfigurationContext context) {
-        context.analyzer("standard").type("standard");
-        context.normalizer("lowercase").custom().tokenFilters("lowercase");
-    }
-}
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Person.java b/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Person.java
deleted file mode 100644
index ab66e88134ed9..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Person.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package io.quarkus.it.hibernate.search.elasticsearch.search;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-
-import org.hibernate.search.engine.backend.document.model.dsl.ObjectFieldStorage;
-import org.hibernate.search.engine.backend.types.Sortable;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
-
-@Entity
-@Indexed
-public class Person {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "personSeq")
-    private Long id;
-
-    @FullTextField(analyzer = "standard")
-    @KeywordField(name = "name_sort", normalizer = "lowercase", sortable = Sortable.YES)
-    private String name;
-
-    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    @IndexedEmbedded(storage = ObjectFieldStorage.NESTED)
-    private Address address;
-
-    public Person() {
-    }
-
-    public Person(String name, Address address) {
-        this.name = name;
-        this.address = address;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-
-    public void describeFully(StringBuilder sb) {
-        sb.append("Person with id=").append(id).append(", name='").append(name).append("', address { ");
-        getAddress().describeFully(sb);
-        sb.append(" }");
-    }
-}
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/resources/application.properties b/integration-tests/hibernate-search-elasticsearch/src/main/resources/application.properties
deleted file mode 100644
index f465574d5bf03..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/main/resources/application.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-quarkus.ssl.native = false
-
-quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
-quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
-
-quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
-quarkus.hibernate-orm.database.generation=drop-and-create
-
-quarkus.hibernate-search.elasticsearch.version=7
-quarkus.hibernate-search.elasticsearch.analysis.configurer=io.quarkus.it.hibernate.search.elasticsearch.search.DefaultITAnalysisConfigurer
-quarkus.hibernate-search.elasticsearch.index-defaults.schema-management.required-status=yellow
-quarkus.hibernate-search.schema-management.strategy=drop-and-create-and-drop
-quarkus.hibernate-search.automatic-indexing.synchronization.strategy=sync
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml b/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml
deleted file mode 100644
index e15abadf05b9d..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/elasticsearch.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-# ======================== Elasticsearch Configuration =========================
-#
-# NOTE: Elasticsearch comes with reasonable defaults for most settings.
-#       Before you set out to tweak and tune the configuration, make sure you
-#       understand what are you trying to accomplish and the consequences.
-#
-# The primary way of configuring a node is via this file. This template lists
-# the most important settings you may want to configure for a production cluster.
-#
-# Please consult the documentation for further information on configuration options:
-# https://www.elastic.co/guide/en/elasticsearch/reference/index.html
-#
-# ---------------------------------- Cluster -----------------------------------
-#
-# Use a descriptive name for your cluster:
-#
-#cluster.name: my-application
-#
-# ------------------------------------ Node ------------------------------------
-#
-# Use a descriptive name for the node:
-#
-#node.name: node-1
-#
-# Add custom attributes to the node:
-#
-#node.attr.rack: r1
-#
-# ----------------------------------- Paths ------------------------------------
-#
-# Path to directory where to store the data (separate multiple locations by comma):
-#
-#path.data: /path/to/data
-#
-# Path to log files:
-#
-#path.logs: /path/to/logs
-#
-# ----------------------------------- Memory -----------------------------------
-#
-# Lock the memory on startup:
-#
-bootstrap.memory_lock: true
-#
-# Make sure that the heap size is set to about half the memory available
-# on the system and that the owner of the process is allowed to use this
-# limit.
-#
-# Elasticsearch performs poorly when the system is swapping the memory.
-#
-# ---------------------------------- Network -----------------------------------
-#
-# Set the bind address to a specific IP (IPv4 or IPv6):
-#
-network.host: _local_
-#
-# Set a custom port for HTTP:
-#
-http.port: 9200
-#
-# For more information, consult the network module documentation.
-#
-# --------------------------------- Discovery ----------------------------------
-#
-# Pass an initial list of hosts to perform discovery when this node is started:
-# The default list of hosts is ["127.0.0.1", "[::1]"]
-#
-#discovery.seed_hosts: ["host1", "host2"]
-#
-# Bootstrap the cluster using an initial set of master-eligible nodes:
-#
-#cluster.initial_master_nodes: ["node-1", "node-2"]
-#
-# For more information, consult the discovery and cluster formation module documentation.
-#
-# ---------------------------------- Gateway -----------------------------------
-#
-# Block initial recovery after a full cluster restart until N nodes are started:
-#
-#gateway.recover_after_nodes: 3
-#
-# For more information, consult the gateway module documentation.
-#
-# ---------------------------------- Various -----------------------------------
-#
-# Require explicit names when deleting indices:
-#
-#action.destructive_requires_name: true
-#
-# Disable starting multiple nodes on a single system:
-#
-node.max_local_storage_nodes: 1
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options b/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options
deleted file mode 100644
index 91f3f0ee7dd56..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/jvm.options
+++ /dev/null
@@ -1,125 +0,0 @@
-## JVM configuration
-
-################################################################
-## IMPORTANT: JVM heap size
-################################################################
-##
-## You should always set the min and max JVM heap
-## size to the same value. For example, to set
-## the heap to 4 GB, set:
-##
-## -Xms4g
-## -Xmx4g
-##
-## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
-## for more information
-##
-################################################################
-
-# Xms represents the initial size of total heap space
-# Xmx represents the maximum size of total heap space
-
-# For Hibernate Search, we don't need as much as the default 2g
-# Let's keep it low, so that we'll be able to run tests
-# on memory-constrained CI slaves
--Xms256m
--Xmx256m
-
-################################################################
-## Expert settings
-################################################################
-##
-## All settings below this section are considered
-## expert settings. Don't tamper with them unless
-## you understand what you are doing
-##
-################################################################
-
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
-## G1GC Configuration
-# NOTE: G1GC is only supported on JDK version 10 or later.
-# To use G1GC uncomment the lines below.
-# 10-:-XX:-UseConcMarkSweepGC
-# 10-:-XX:-UseCMSInitiatingOccupancyOnly
-# 10-:-XX:+UseG1GC
-# 10-:-XX:InitiatingHeapOccupancyPercent=75
-
-## DNS cache policy
-# cache ttl in seconds for positive DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.ttl; set to -1 to cache forever
--Des.networkaddress.cache.ttl=60
-# cache ttl in seconds for negative DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.negative ttl; set to -1 to cache
-# forever
--Des.networkaddress.cache.negative.ttl=10
-
-## optimizations
-
-# pre-touch memory pages used by the JVM during initialization
--XX:+AlwaysPreTouch
-
-## basic
-
-# explicitly set the stack size
--Xss1m
-
-# set to headless, just in case
--Djava.awt.headless=true
-
-# ensure UTF-8 encoding by default (e.g. filenames)
--Dfile.encoding=UTF-8
-
-# use our provided JNA always versus the system one
--Djna.nosys=true
-
-# turn off a JDK optimization that throws away stack traces for common
-# exceptions because stack traces are important for debugging
--XX:-OmitStackTraceInFastThrow
-
-# flags to configure Netty
--Dio.netty.noUnsafe=true
--Dio.netty.noKeySetOptimization=true
--Dio.netty.recycler.maxCapacityPerThread=0
-
-# log4j 2
--Dlog4j.shutdownHookEnabled=false
--Dlog4j2.disable.jmx=true
-
--Djava.io.tmpdir=${ES_TMPDIR}
-
-## heap dumps
-
-# generate a heap dump when an allocation from the Java heap fails
-# heap dumps are created in the working directory of the JVM
--XX:+HeapDumpOnOutOfMemoryError
-
-# specify an alternative path for heap dumps; ensure the directory exists and
-# has sufficient space
--XX:HeapDumpPath=data
-
-# specify an alternative path for JVM fatal error logs
--XX:ErrorFile=logs/hs_err_pid%p.log
-
-## JDK 8 GC logging
-
-8:-XX:+PrintGCDetails
-8:-XX:+PrintGCDateStamps
-8:-XX:+PrintTenuringDistribution
-8:-XX:+PrintGCApplicationStoppedTime
-8:-Xloggc:logs/gc.log
-8:-XX:+UseGCLogFileRotation
-8:-XX:NumberOfGCLogFiles=32
-8:-XX:GCLogFileSize=64m
-
-# JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
-# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
-# time/date parsing will break in an incompatible way for some date patterns and locals
-9-:-Djava.locale.providers=COMPAT
-
-# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
-10-:-XX:UseAVX=2
\ No newline at end of file
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties b/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties
deleted file mode 100644
index e4789c251b25a..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/configuration/log4j2.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-status = error
-appenders = console
-loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing
-
-# log action execution errors for easier debugging
-logger.action.name = org.elasticsearch.action
-logger.action.level = info
-
-# do not log metadata too much as we generate a log of noise
-logger.metadata.name = org.elasticsearch.cluster.metadata
-logger.metadata.level = warn
-
-logger.cluster.name = org.elasticsearch.cluster.routing.allocation
-logger.cluster.level = warn
-
-logger.settings.name = org.elasticsearch.common.settings
-logger.settings.level = warn
-
-logger.deprecation.name = org.elasticsearch.deprecation
-logger.deprecation.level = warn
-
-# Warn us about using inefficient Search operations
-logger.slow_search.name = index.search.slowlog
-logger.slow_search.level = trace
-
-# Warn us about using inefficient indexing actions
-logger.slow_indexing.name = index.indexing.slowlog
-logger.slow_indexing.level = trace
-
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ABSOLUTE} (%t) %5p %c{1}:%L - %m%n
-
-rootLogger.level = info
-rootLogger.appenderRef.console.ref = console
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/init/init.script b/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/init/init.script
deleted file mode 100644
index 7c20a72b48ffc..0000000000000
--- a/integration-tests/hibernate-search-elasticsearch/src/test/resources/elasticsearch-maven-plugin/init/init.script
+++ /dev/null
@@ -1,6 +0,0 @@
-PUT:_template/lightweight_index:{ "template" : "*", "order": -9999, "settings" : { "number_of_shards" : 1, "number_of_replicas" : 0 } }
-PUT:_template/slowlogs_search_level:{ "template" : "*", "order": -9999, "settings" : { "index.search.slowlog.level": "debug" } }
-PUT:_template/slowlogs_indexing_level:{ "template" : "*", "order": -9999, "settings" : { "index.indexing.slowlog.level": "debug" } }
-PUT:_template/slowlogs_search_threshold_query:{ "template" : "*", "order": -9999, "settings" : { "index.search.slowlog.threshold.query.warn": "5s", "index.search.slowlog.threshold.query.info": "500ms", "index.search.slowlog.threshold.query.debug": "100ms", "index.search.slowlog.threshold.query.trace": "10ms" } }
-PUT:_template/slowlogs_search_threshold_fetch:{ "template" : "*", "order": -9999, "settings" : { "index.search.slowlog.threshold.fetch.warn": "1s", "index.search.slowlog.threshold.fetch.info": "200ms", "index.search.slowlog.threshold.fetch.debug": "100ms", "index.search.slowlog.threshold.fetch.trace": "10ms" } }
-PUT:_template/slowlogs_indexing_threshold_index:{ "template" : "*", "order": -9999, "settings" : { "index.indexing.slowlog.threshold.index.warn": "2s", "index.indexing.slowlog.threshold.index.info": "500ms", "index.indexing.slowlog.threshold.index.debug": "100ms", "index.indexing.slowlog.threshold.index.trace": "10ms" } }
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/README.md b/integration-tests/hibernate-search-orm-elasticsearch/README.md
new file mode 100644
index 0000000000000..8569383f9017e
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/README.md
@@ -0,0 +1,18 @@
+# Hibernate Search example with Elasticsearch
+
+## Running the tests
+
+By default, the tests of this module are disabled.
+
+To run the tests in a standard JVM with Elasticsearch started in the JVM, you can run the following command:
+
+```
+mvn clean install -Dtest-containers
+```
+
+Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
+
+```
+mvn clean install -Dtest-containers -Dnative
+```
+
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml
new file mode 100644
index 0000000000000..9bc04cfc8dfda
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-hibernate-search-orm-elasticsearch</artifactId>
+    <name>Quarkus - Integration Tests - Hibernate Search ORM + Elasticsearch</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-elasticsearch</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-elasticsearch</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
+                <elasticsearch.protocol>http</elasticsearch.protocol>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${elasticsearch.image}</name>
+                                    <alias>elasticsearch</alias>
+                                    <run>
+                                        <env>
+                                            <discovery.type>single-node</discovery.type>
+                                        </env>
+                                        <ports>
+                                            <port>9200:9200</port>
+                                        </ports>
+                                        <log>
+                                            <prefix>Elasticsearch: </prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <http>
+                                                <url>http://localhost:9200</url>
+                                                <method>GET</method>
+                                                <status>200</status>
+                                            </http>
+                                            <time>20000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${docker-prune.location}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis0TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis0TestingEntity.java
new file mode 100644
index 0000000000000..e80c5decd68b3
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis0TestingEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class Analysis0TestingEntity extends AnalysisTestingEntityBase {
+    public Analysis0TestingEntity() {
+    }
+
+    public Analysis0TestingEntity(String text) {
+        super(text);
+    }
+
+    @FullTextField(analyzer = "backend-level-analyzer")
+    @Override
+    public String getText() {
+        return super.getText();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis1TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis1TestingEntity.java
new file mode 100644
index 0000000000000..09bd232b18a5f
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis1TestingEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class Analysis1TestingEntity extends AnalysisTestingEntityBase {
+    public Analysis1TestingEntity() {
+    }
+
+    public Analysis1TestingEntity(String text) {
+        super(text);
+    }
+
+    @FullTextField(analyzer = "index-level-analyzer-1")
+    @Override
+    public String getText() {
+        return super.getText();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis2TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis2TestingEntity.java
new file mode 100644
index 0000000000000..ae50c90b3af67
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis2TestingEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class Analysis2TestingEntity extends AnalysisTestingEntityBase {
+    public Analysis2TestingEntity() {
+    }
+
+    public Analysis2TestingEntity(String text) {
+        super(text);
+    }
+
+    @FullTextField(analyzer = "index-level-analyzer-2")
+    @Override
+    public String getText() {
+        return super.getText();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis3TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis3TestingEntity.java
new file mode 100644
index 0000000000000..0f20212da5c0b
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis3TestingEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class Analysis3TestingEntity extends AnalysisTestingEntityBase {
+    public Analysis3TestingEntity() {
+    }
+
+    public Analysis3TestingEntity(String text) {
+        super(text);
+    }
+
+    @FullTextField(analyzer = "index-level-analyzer-3")
+    @Override
+    public String getText() {
+        return super.getText();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis4TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis4TestingEntity.java
new file mode 100644
index 0000000000000..e3c5fc8ab76b8
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis4TestingEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class Analysis4TestingEntity extends AnalysisTestingEntityBase {
+    public Analysis4TestingEntity() {
+    }
+
+    public Analysis4TestingEntity(String text) {
+        super(text);
+    }
+
+    @FullTextField(analyzer = "index-level-analyzer-4")
+    @Override
+    public String getText() {
+        return super.getText();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis5TestingEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis5TestingEntity.java
new file mode 100644
index 0000000000000..d7a84f8811573
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/Analysis5TestingEntity.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.Entity;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class Analysis5TestingEntity extends AnalysisTestingEntityBase {
+    public Analysis5TestingEntity() {
+    }
+
+    public Analysis5TestingEntity(String text) {
+        super(text);
+    }
+
+    @FullTextField(analyzer = "index-level-analyzer-5")
+    @Override
+    public String getText() {
+        return super.getText();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/AnalysisTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/AnalysisTestResource.java
new file mode 100644
index 0000000000000..a5128ed04fd8f
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/AnalysisTestResource.java
@@ -0,0 +1,72 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.hibernate.search.mapper.orm.Search;
+import org.hibernate.search.mapper.orm.common.EntityReference;
+import org.hibernate.search.mapper.orm.session.SearchSession;
+import org.jboss.resteasy.annotations.jaxrs.QueryParam;
+
+@Path("/test/analysis")
+public class AnalysisTestResource {
+
+    @Inject
+    EntityManager entityManager;
+
+    @PUT
+    @Path("/init-data")
+    @Transactional
+    public void initData() {
+        entityManager.persist(new Analysis0TestingEntity("irrelevant"));
+        entityManager.persist(new Analysis1TestingEntity("irrelevant"));
+        entityManager.persist(new Analysis2TestingEntity("irrelevant"));
+        entityManager.persist(new Analysis3TestingEntity("irrelevant"));
+        entityManager.persist(new Analysis4TestingEntity("irrelevant"));
+        entityManager.persist(new Analysis5TestingEntity("irrelevant"));
+    }
+
+    @GET
+    @Path("/analysis-configured")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public String testAnalysisConfigured() {
+        assertThat(findTypesMatching("text", "token_inserted_by_backend_analysis"))
+                .containsExactlyInAnyOrder(Analysis0TestingEntity.class);
+
+        assertThat(findTypesMatching("text", "token_inserted_by_index_analysis_1"))
+                .containsExactlyInAnyOrder(Analysis1TestingEntity.class);
+
+        assertThat(findTypesMatching("text", "token_inserted_by_index_analysis_2"))
+                .containsExactlyInAnyOrder(Analysis2TestingEntity.class);
+
+        assertThat(findTypesMatching("text", "token_inserted_by_index_analysis_3"))
+                .containsExactlyInAnyOrder(Analysis3TestingEntity.class);
+
+        assertThat(findTypesMatching("text", "token_inserted_by_index_analysis_4"))
+                .containsExactlyInAnyOrder(Analysis4TestingEntity.class);
+
+        assertThat(findTypesMatching("text", "token_inserted_by_index_analysis_5"))
+                .containsExactlyInAnyOrder(Analysis5TestingEntity.class);
+
+        return "OK";
+    }
+
+    public List<Class<?>> findTypesMatching(@QueryParam String field, @QueryParam String term) {
+        SearchSession searchSession = Search.session(entityManager);
+        return searchSession.search(AnalysisTestingEntityBase.class)
+                .<Class<?>> select(f -> f.composite(EntityReference::type, f.entityReference()))
+                .where(f -> f.match().field(field).matching(term).skipAnalysis())
+                .fetchAllHits();
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/AnalysisTestingEntityBase.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/AnalysisTestingEntityBase.java
new file mode 100644
index 0000000000000..cfdf2d9ed7565
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/AnalysisTestingEntityBase.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class AnalysisTestingEntityBase {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "analysisSeq")
+    private Long id;
+
+    private String text;
+
+    public AnalysisTestingEntityBase() {
+    }
+
+    public AnalysisTestingEntityBase(String text) {
+        this.text = text;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/BackendAnalysisConfigurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/BackendAnalysisConfigurer.java
new file mode 100644
index 0000000000000..7872308da51fb
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/BackendAnalysisConfigurer.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+@Dependent
+@Named("backend-analysis")
+public class BackendAnalysisConfigurer implements ElasticsearchAnalysisConfigurer {
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        MyCdiContext.checkAvailable(cdiContext);
+
+        context.analyzer("standard").type("standard");
+        context.normalizer("lowercase").custom().tokenFilters("lowercase");
+
+        context.analyzer("backend-level-analyzer").custom()
+                .tokenizer("keyword")
+                .tokenFilters("backend-level-tokenfilter");
+
+        context.tokenFilter("backend-level-tokenfilter").type("pattern_replace")
+                .param("pattern", ".+")
+                .param("replacement", "token_inserted_by_backend_analysis");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis1Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis1Configurer.java
new file mode 100644
index 0000000000000..9d2a1a8ed0dfa
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis1Configurer.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.inject.Inject;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+public class IndexAnalysis1Configurer implements ElasticsearchAnalysisConfigurer {
+    // This will always be null.
+    // It's only here to check that this class is instantiated without relying on CDI
+    // (because we want to test non-CDI configurers too).
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        MyCdiContext.checkNotAvailable(cdiContext);
+
+        context.analyzer("index-level-analyzer-1").custom()
+                .tokenizer("keyword")
+                .tokenFilters("index-level-tokenfilter");
+
+        context.tokenFilter("index-level-tokenfilter").type("pattern_replace")
+                .param("pattern", ".+")
+                .param("replacement", "token_inserted_by_index_analysis_1");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis2Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis2Configurer.java
new file mode 100644
index 0000000000000..1757e911bc958
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis2Configurer.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+@Dependent
+@Named("index-analysis-2")
+public class IndexAnalysis2Configurer implements ElasticsearchAnalysisConfigurer {
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        MyCdiContext.checkAvailable(cdiContext);
+
+        context.analyzer("index-level-analyzer-2").custom()
+                .tokenizer("keyword")
+                .tokenFilters("index-level-tokenfilter");
+
+        context.tokenFilter("index-level-tokenfilter").type("pattern_replace")
+                .param("pattern", ".+")
+                .param("replacement", "token_inserted_by_index_analysis_2");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis3Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis3Configurer.java
new file mode 100644
index 0000000000000..f8371c8662971
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis3Configurer.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.inject.Inject;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+public class IndexAnalysis3Configurer implements ElasticsearchAnalysisConfigurer {
+    // This will always be null.
+    // It's only here to check that this class is instantiated without relying on CDI
+    // (because we want to test non-CDI configurers too).
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        MyCdiContext.checkNotAvailable(cdiContext);
+
+        context.analyzer("index-level-analyzer-3").custom()
+                .tokenizer("keyword")
+                .tokenFilters("index-level-tokenfilter");
+
+        context.tokenFilter("index-level-tokenfilter").type("pattern_replace")
+                .param("pattern", ".+")
+                .param("replacement", "token_inserted_by_index_analysis_3");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis4Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis4Configurer.java
new file mode 100644
index 0000000000000..800f599c6ffaf
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis4Configurer.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+@ApplicationScoped
+@Named("index-analysis-4")
+public class IndexAnalysis4Configurer implements ElasticsearchAnalysisConfigurer {
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        MyCdiContext.checkAvailable(cdiContext);
+
+        context.analyzer("index-level-analyzer-4").custom()
+                .tokenizer("keyword")
+                .tokenFilters("index-level-tokenfilter");
+
+        context.tokenFilter("index-level-tokenfilter").type("pattern_replace")
+                .param("pattern", ".+")
+                .param("replacement", "token_inserted_by_index_analysis_4");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis5Configurer.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis5Configurer.java
new file mode 100644
index 0000000000000..0af4739777dfa
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/IndexAnalysis5Configurer.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext;
+import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer;
+
+@ApplicationScoped
+public class IndexAnalysis5Configurer implements ElasticsearchAnalysisConfigurer {
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public void configure(ElasticsearchAnalysisConfigurationContext context) {
+        MyCdiContext.checkAvailable(cdiContext);
+
+        context.analyzer("index-level-analyzer-5").custom()
+                .tokenizer("keyword")
+                .tokenFilters("index-level-tokenfilter");
+
+        context.tokenFilter("index-level-tokenfilter").type("pattern_replace")
+                .param("pattern", ".+")
+                .param("replacement", "token_inserted_by_index_analysis_5");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/MyCdiContext.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/MyCdiContext.java
new file mode 100644
index 0000000000000..7e5e4c74e4ed9
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/analysis/MyCdiContext.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.hibernate.search.elasticsearch.analysis;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class MyCdiContext {
+
+    public static void checkAvailable(MyCdiContext injected) {
+        assertThat(injected)
+                .as("CDI context should be available")
+                .isNotNull()
+                .returns(true, MyCdiContext::worksProperly);
+    }
+
+    public static void checkNotAvailable(MyCdiContext injected) {
+        assertThat(injected)
+                .as("CDI context should not be available")
+                .isNull();
+    }
+
+    public boolean worksProperly() {
+        return true;
+    }
+}
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/client/ElasticsearchClientTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/client/ElasticsearchClientTestResource.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/client/ElasticsearchClientTestResource.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/client/ElasticsearchClientTestResource.java
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/MethodAccessEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/MethodAccessEntity.java
new file mode 100644
index 0000000000000..d8a6a413d40ee
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/MethodAccessEntity.java
@@ -0,0 +1,42 @@
+package io.quarkus.it.hibernate.search.elasticsearch.propertyaccess;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class MethodAccessEntity {
+
+    private Long id;
+
+    private String property;
+
+    public MethodAccessEntity() {
+    }
+
+    public MethodAccessEntity(Long id, String property) {
+        this.id = id;
+        this.property = property;
+    }
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @FullTextField
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java
new file mode 100644
index 0000000000000..1a7c4ad1ff5d6
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/PrivateFieldAccessEntity.java
@@ -0,0 +1,60 @@
+package io.quarkus.it.hibernate.search.elasticsearch.propertyaccess;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.LazyGroup;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+
+@Entity
+@Indexed
+public class PrivateFieldAccessEntity {
+
+    @Id
+    private Long id;
+
+    @Basic(fetch = FetchType.LAZY)
+    @LazyGroup("group1")
+    @FullTextField
+    private String property;
+
+    @Basic(fetch = FetchType.LAZY)
+    @LazyGroup("group2")
+    @FullTextField
+    private String otherProperty;
+
+    public PrivateFieldAccessEntity() {
+    }
+
+    public PrivateFieldAccessEntity(Long id, String property) {
+        this.id = id;
+        this.property = property;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public String getOtherProperty() {
+        return otherProperty;
+    }
+
+    public void setOtherProperty(String otherProperty) {
+        this.otherProperty = otherProperty;
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/PropertyAccessTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/PropertyAccessTestResource.java
new file mode 100644
index 0000000000000..c5b675a38f92d
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/PropertyAccessTestResource.java
@@ -0,0 +1,211 @@
+package io.quarkus.it.hibernate.search.elasticsearch.propertyaccess;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.hibernate.Hibernate;
+import org.hibernate.search.mapper.orm.session.SearchSession;
+
+@Path("/test/property-access")
+public class PropertyAccessTestResource {
+
+    @Inject
+    EntityManager entityManager;
+
+    @Inject
+    SearchSession searchSession;
+
+    @Inject
+    UserTransaction transaction;
+
+    @GET
+    @Path("/private-field")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testPrivateFieldAccess() {
+        long id = 1L;
+        String value = "foo";
+
+        inTransaction(() -> assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                .where(f -> f.match().field("property")
+                        .matching(value))
+                .fetchAllHits())
+                        .isEmpty());
+
+        // While indexing, HSearch will read the entity property by calling a synthetic getter
+        inTransaction(() -> entityManager.persist(new PrivateFieldAccessEntity(id, value)));
+
+        inTransaction(() -> assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                .where(f -> f.match().field("property")
+                        .matching(value))
+                .fetchAllHits())
+                        .hasSize(1));
+
+        return "OK";
+    }
+
+    @GET
+    @Path("/private-field-lazy-init")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testPrivateFieldAccessLazyInitialization() {
+        long id = 2L;
+        String value = "bar";
+
+        inTransaction(() -> assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                .where(f -> f.match().field("property")
+                        .matching(value))
+                .fetchAllHits())
+                        .isEmpty());
+
+        inTransaction(() -> entityManager.persist(new PrivateFieldAccessEntity(id, value)));
+
+        inTransaction(() -> {
+            // "otherProperty" has no value in the index...
+            assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                    .where(f -> f.match().field("otherProperty")
+                            .matching(value))
+                    .fetchAllHits())
+                            .isEmpty();
+
+            // but "property" has.
+            assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                    .where(f -> f.match().field("property")
+                            .matching(value))
+                    .fetchAllHits())
+                            .hasSize(1);
+        });
+
+        // While indexing, HSearch will read the entity property by calling a synthetic getter,
+        // ensuring that it gets initialized automatically
+        inTransaction(() -> {
+            PrivateFieldAccessEntity entity = entityManager.getReference(PrivateFieldAccessEntity.class, id);
+            // The entity is not initialized
+            assertThat(entity)
+                    .returns(false, e -> Hibernate.isPropertyInitialized(e, "property"))
+                    .returns(false, e -> Hibernate.isPropertyInitialized(e, "otherProperty"));
+
+            // We update "otherProperty"
+            entity.setOtherProperty(value);
+
+            // Consequently, "otherProperty" is initialized,
+            // but "property" (which is in a different @LazyGroup) still isn't.
+            assertThat(entity)
+                    .returns(false, e -> Hibernate.isPropertyInitialized(e, "property"));
+        });
+
+        inTransaction(() -> {
+            // "otherProperty" was updated in the index...
+            assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                    .where(f -> f.match().field("otherProperty")
+                            .matching(value))
+                    .fetchAllHits())
+                            .hasSize(1);
+
+            // and "property" still has a value, proving that it was lazily initialized upon indexing.
+            assertThat(searchSession.search(PrivateFieldAccessEntity.class)
+                    .where(f -> f.match().field("property")
+                            .matching(value))
+                    .fetchAllHits())
+                            .hasSize(1);
+        });
+
+        return "OK";
+    }
+
+    @GET
+    @Path("/method")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testMethodAccess() {
+        long id = 1L;
+        String value = "foo";
+
+        inTransaction(() -> assertThat(searchSession.search(MethodAccessEntity.class)
+                .where(f -> f.match().field("property")
+                        .matching(value))
+                .fetchAllHits())
+                        .isEmpty());
+
+        // While indexing, HSearch will read the entity property through its getter method
+        inTransaction(() -> entityManager.persist(new MethodAccessEntity(id, value)));
+
+        inTransaction(() -> assertThat(searchSession.search(MethodAccessEntity.class)
+                .where(f -> f.match().field("property")
+                        .matching(value))
+                .fetchAllHits())
+                        .hasSize(1));
+
+        return "OK";
+    }
+
+    @GET
+    @Path("/transient-method")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testTransientMethodAccess() {
+        long id = 1L;
+        String value1 = "foo1";
+        String value2 = "foo2";
+
+        inTransaction(() -> {
+            assertThat(searchSession.search(TransientMethodAccessEntity.class)
+                    .where(f -> f.match().field("property")
+                            .matching(value1))
+                    .fetchAllHits())
+                            .isEmpty();
+            assertThat(searchSession.search(TransientMethodAccessEntity.class)
+                    .where(f -> f.match().field("property")
+                            .matching(value2))
+                    .fetchAllHits())
+                            .isEmpty();
+        });
+
+        // While indexing, HSearch will read the (@Transient) entity property through its getter method
+        inTransaction(() -> entityManager.persist(new TransientMethodAccessEntity(id, value1, value2)));
+
+        inTransaction(() -> {
+            assertThat(searchSession.search(TransientMethodAccessEntity.class)
+                    .where(f -> f.match().field("property")
+                            .matching(value1))
+                    .fetchAllHits())
+                            .hasSize(1);
+            assertThat(searchSession.search(TransientMethodAccessEntity.class)
+                    .where(f -> f.match().field("property")
+                            .matching(value2))
+                    .fetchAllHits())
+                            .hasSize(1);
+        });
+
+        return "OK";
+    }
+
+    private void inTransaction(Runnable runnable) {
+        try {
+            transaction.begin();
+            try {
+                runnable.run();
+                transaction.commit();
+            } catch (Throwable t) {
+                try {
+                    transaction.rollback();
+                } catch (RuntimeException e2) {
+                    t.addSuppressed(e2);
+                }
+                throw t;
+            }
+        } catch (NotSupportedException | SystemException | RollbackException | HeuristicMixedException
+                | HeuristicRollbackException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/TransientMethodAccessEntity.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/TransientMethodAccessEntity.java
new file mode 100644
index 0000000000000..07645c1d46271
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/propertyaccess/TransientMethodAccessEntity.java
@@ -0,0 +1,66 @@
+package io.quarkus.it.hibernate.search.elasticsearch.propertyaccess;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.ObjectPath;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.PropertyValue;
+
+@Entity
+@Indexed
+public class TransientMethodAccessEntity {
+
+    private Long id;
+
+    private String property1;
+
+    private String property2;
+
+    public TransientMethodAccessEntity() {
+    }
+
+    public TransientMethodAccessEntity(Long id, String property1, String property2) {
+        this.id = id;
+        this.property1 = property1;
+        this.property2 = property2;
+    }
+
+    @Id
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getProperty1() {
+        return property1;
+    }
+
+    public void setProperty1(String property1) {
+        this.property1 = property1;
+    }
+
+    public String getProperty2() {
+        return property2;
+    }
+
+    public void setProperty2(String property2) {
+        this.property2 = property2;
+    }
+
+    @Transient
+    @FullTextField
+    @IndexingDependency(derivedFrom = {
+            @ObjectPath(@PropertyValue(propertyName = "property1")),
+            @ObjectPath(@PropertyValue(propertyName = "property2"))
+    })
+    public String getProperty() {
+        return property1 + " " + property2;
+    }
+}
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Address.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Address.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Address.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Address.java
diff --git a/integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/HibernateSearchTestResource.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/HibernateSearchTestResource.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/HibernateSearchTestResource.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/HibernateSearchTestResource.java
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Person.java b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Person.java
new file mode 100644
index 0000000000000..96535302012e5
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/java/io/quarkus/it/hibernate/search/elasticsearch/search/Person.java
@@ -0,0 +1,71 @@
+package io.quarkus.it.hibernate.search.elasticsearch.search;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.search.engine.backend.types.ObjectStructure;
+import org.hibernate.search.engine.backend.types.Sortable;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
+
+@Entity
+@Indexed
+public class Person {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "personSeq")
+    private Long id;
+
+    @FullTextField(analyzer = "standard")
+    @KeywordField(name = "name_sort", normalizer = "lowercase", sortable = Sortable.YES)
+    private String name;
+
+    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @IndexedEmbedded(structure = ObjectStructure.NESTED)
+    private Address address;
+
+    public Person() {
+    }
+
+    public Person(String name, Address address) {
+        this.name = name;
+        this.address = address;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    public void describeFully(StringBuilder sb) {
+        sb.append("Person with id=").append(id).append(", name='").append(name).append("', address { ");
+        getAddress().describeFully(sb);
+        sb.append(" }");
+    }
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/META-INF/beans.xml b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties
new file mode 100644
index 0000000000000..ee4248757e2f1
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties
@@ -0,0 +1,20 @@
+quarkus.ssl.native = false
+
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+quarkus.hibernate-search-orm.elasticsearch.version=7
+quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200}
+quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http}
+quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=bean:backend-analysis
+quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis1TestingEntity.analysis.configurer=class:io.quarkus.it.hibernate.search.elasticsearch.analysis.IndexAnalysis1Configurer
+quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis2TestingEntity.analysis.configurer=bean:index-analysis-2
+quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis3TestingEntity.analysis.configurer=io.quarkus.it.hibernate.search.elasticsearch.analysis.IndexAnalysis3Configurer
+quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis4TestingEntity.analysis.configurer=index-analysis-4
+quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis5TestingEntity.analysis.configurer=io.quarkus.it.hibernate.search.elasticsearch.analysis.IndexAnalysis5Configurer
+quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop
+quarkus.hibernate-search-orm.automatic-indexing.synchronization.strategy=sync
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/AnalysisInGraalIT.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/AnalysisInGraalIT.java
new file mode 100644
index 0000000000000..39ff81456eaad
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/AnalysisInGraalIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.hibernate.search.elasticsearch;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class AnalysisInGraalIT extends AnalysisTest {
+
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/AnalysisTest.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/AnalysisTest.java
new file mode 100644
index 0000000000000..bf52c13c21684
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/AnalysisTest.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.hibernate.search.elasticsearch;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class AnalysisTest {
+
+    @Test
+    public void testSearch() {
+        RestAssured.when().put("/test/analysis/init-data").then()
+                .statusCode(204);
+
+        RestAssured.when().get("/test/analysis/analysis-configured").then()
+                .statusCode(200)
+                .body(is("OK"));
+    }
+}
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientInGraalIT.java
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientTest.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientTest.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientTest.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/ElasticsearchClientTest.java
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchInGraalIT.java
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchTest.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchTest.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchTest.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/HibernateSearchTest.java
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/PropertyAccessInGraalIT.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/PropertyAccessInGraalIT.java
new file mode 100644
index 0000000000000..fcdcf22e8de1b
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/PropertyAccessInGraalIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.hibernate.search.elasticsearch;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class PropertyAccessInGraalIT extends PropertyAccessTest {
+
+}
diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/PropertyAccessTest.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/PropertyAccessTest.java
new file mode 100644
index 0000000000000..fd25bc27bc5b5
--- /dev/null
+++ b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/PropertyAccessTest.java
@@ -0,0 +1,40 @@
+package io.quarkus.it.hibernate.search.elasticsearch;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class PropertyAccessTest {
+
+    @Test
+    public void testPrivateFieldAccess() {
+        when().get("/test/property-access/private-field").then()
+                .statusCode(200)
+                .body(is("OK"));
+    }
+
+    @Test
+    public void testPrivateFieldAccessLazyInitialization() {
+        when().get("/test/property-access/private-field-lazy-init").then()
+                .statusCode(200)
+                .body(is("OK"));
+    }
+
+    @Test
+    public void testMethodAccess() {
+        when().get("/test/property-access/method").then()
+                .statusCode(200)
+                .body(is("OK"));
+    }
+
+    @Test
+    public void testTransientMethodAccess() {
+        when().get("/test/property-access/transient-method").then()
+                .statusCode(200)
+                .body(is("OK"));
+    }
+}
diff --git a/integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/TestResources.java b/integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/TestResources.java
similarity index 100%
rename from integration-tests/hibernate-search-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/TestResources.java
rename to integration-tests/hibernate-search-orm-elasticsearch/src/test/java/io/quarkus/it/hibernate/search/elasticsearch/TestResources.java
diff --git a/integration-tests/hibernate-tenancy/README.md b/integration-tests/hibernate-tenancy/README.md
index b3a88391fc620..29b7ff899c930 100644
--- a/integration-tests/hibernate-tenancy/README.md
+++ b/integration-tests/hibernate-tenancy/README.md
@@ -7,16 +7,16 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with MariaDB started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-mariadb -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Please note that waiting on the availability of MariaDB port does not work on macOS.
-This module does not work with `-Ddocker` option on this operating system.
+This module does not work with `-Dstart-containers` option on this operating system.
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-mariadb -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run MariaDB as a Docker container, you can start your own MariaDB server. It needs to listen on the default port and have a database called `hibernate_orm_test` and a root user with the password `secret`.
@@ -24,11 +24,11 @@ If you don't want to run MariaDB as a Docker container, you can start your own M
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-mariadb
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dmariadb.base_url=jdbc:mariadb://...`.
-Note that this specific integration test module module requires permissions to create additional users and databases, hence the `mariadb.base_url` variable
+Note that this specific integration test module requires permissions to create additional users and databases, hence the `mariadb.base_url` variable
 should not include the database name: check the `application.properties` to see how it's used.
 
 To run the MariaDB server "manually" via command line for testing, the following command line could be useful:
@@ -48,5 +48,5 @@ N.B. it takes a while for MariaDB to be actually booted and accepting connection
 After it's fully booted, you can run all integration tests via
 
 ```
-mvn clean install -Dtest-mariadb -Dnative
+mvn clean install -Dtest-containers -Dnative
 ```
diff --git a/integration-tests/hibernate-tenancy/pom.xml b/integration-tests/hibernate-tenancy/pom.xml
index e2fdb3e64cb9e..f83dcfce5efb6 100644
--- a/integration-tests/hibernate-tenancy/pom.xml
+++ b/integration-tests/hibernate-tenancy/pom.xml
@@ -1,258 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<parent>
-		<artifactId>quarkus-integration-tests-parent</artifactId>
-		<groupId>io.quarkus</groupId>
-		<version>999-SNAPSHOT</version>
-		<relativePath>../</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>quarkus-integration-test-hibernate-tenancy</artifactId>
-	<name>Quarkus - Integration Tests - Hibernate - Multitenancy</name>
-	<description>Module that contains Hibernate Multitenancy related tests running with the MariaDB database</description>
+    <artifactId>quarkus-integration-test-hibernate-tenancy</artifactId>
+    <name>Quarkus - Integration Tests - Hibernate - Multitenancy</name>
+    <description>Module that contains Hibernate Multitenancy related tests running with the MariaDB database</description>
 
-	<properties>
-		<mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
-		<mariadb.image>mariadb:10.4</mariadb.image>
-	</properties>
+    <properties>
+        <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
+        <mariadb.image>mariadb:10.4</mariadb.image>
+    </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-undertow</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-hibernate-orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-jdbc-mariadb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-flyway</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-resteasy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-resteasy-jsonb</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mariadb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-flyway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
 
-		<!-- test dependencies -->
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-junit5</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.rest-assured</groupId>
-			<artifactId>rest-assured</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>io.quarkus</groupId>
-				<artifactId>quarkus-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>build</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-flyway-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mariadb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 
-	<profiles>
-		<profile>
-			<id>test-mariadb</id>
-			<activation>
-				<property>
-					<name>test-mariadb</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<skip>false</skip>
-						</configuration>
-					</plugin>
-					<plugin>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<configuration>
-							<skip>false</skip>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-		<profile>
-			<id>native-image</id>
-			<activation>
-				<property>
-					<name>native</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<skipTests>${native.surefire.skip}</skipTests>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<executions>
-							<execution>
-								<goals>
-									<goal>integration-test</goal>
-									<goal>verify</goal>
-								</goals>
-								<configuration>
-									<systemPropertyVariables>
-										<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-									</systemPropertyVariables>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>io.quarkus</groupId>
-						<artifactId>quarkus-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>native-image</id>
-								<goals>
-									<goal>native-image</goal>
-								</goals>
-								<configuration>
-									<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-									<cleanupServer>true</cleanupServer>
-									<enableHttpUrlHandler>true</enableHttpUrlHandler>
-									<enableServer>false</enableServer>
-									<dumpProxies>false</dumpProxies>
-									<graalvmHome>${graalvmHome}</graalvmHome>
-									<debugBuildProcess>false</debugBuildProcess>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+    <profiles>
+        <profile>
+            <id>test-mariadb</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-		<profile>
-			<id>docker-mariadb</id>
-			<activation>
-				<property>
-					<name>docker</name>
-				</property>
-			</activation>
-			<properties>
-				<mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>io.fabric8</groupId>
-						<artifactId>docker-maven-plugin</artifactId>
-						<configuration>
-							<images>
-								<image>
-									<name>${mariadb.image}</name>
-									<alias>quarkus-test-mariadb</alias>
-									<run>
-										<ports>
-											<port>3308:3306</port>
-										</ports>
-										<env>
-											<MYSQL_DATABASE>hibernate_orm_test</MYSQL_DATABASE>
-											<MYSQL_ROOT_PASSWORD>secret</MYSQL_ROOT_PASSWORD>
-										</env>
-										<log>
-											<prefix>MariaDB:</prefix>
-											<date>default</date>
-											<color>cyan</color>
-										</log>
-										<!-- Speed things up a bit by not actually flushing writes to disk -->
-										<tmpfs>/var/lib/mysql</tmpfs>
-										<wait>
-											<time>20000</time>
-											<exec>
-												<postStart>mysqladmin ping -h localhost -uroot -psecret</postStart>
-											</exec>
-										</wait>
-										<volumes>
-											<bind>
-												<volume>${project.basedir}/custom-mariadbconfig:/etc/mysql/conf.d/:Z</volume>
-											</bind>
-										</volumes>
-									</run>
-								</image>
-							</images>
-							<!--Stops all mariadb:10.4 images currently running, not just those 
-								we just started. Useful to stop processes still running from a previously 
-								failed integration test run -->
-							<allContainers>true</allContainers>
-						</configuration>
-						<executions>
-							<execution>
-								<id>docker-start</id>
-								<phase>compile</phase>
-								<goals>
-									<goal>stop</goal>
-									<goal>start</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>docker-stop</id>
-								<phase>post-integration-test</phase>
-								<goals>
-									<goal>stop</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
+        <profile>
+            <id>docker-mariadb</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <mariadb.base_url>jdbc:mariadb://localhost:3308</mariadb.base_url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${mariadb.image}</name>
+                                    <alias>quarkus-test-mariadb</alias>
+                                    <run>
+                                        <ports>
+                                            <port>3308:3306</port>
+                                        </ports>
+                                        <env>
+                                            <MYSQL_DATABASE>hibernate_orm_test</MYSQL_DATABASE>
+                                            <MYSQL_ROOT_PASSWORD>secret</MYSQL_ROOT_PASSWORD>
+                                        </env>
+                                        <log>
+                                            <prefix>MariaDB:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <!-- Speed things up a bit by not actually flushing writes to disk -->
+                                        <tmpfs>/var/lib/mysql</tmpfs>
+                                        <wait>
+                                            <time>20000</time>
+                                            <exec>
+                                                <postStart>mysqladmin ping -h localhost -uroot -psecret</postStart>
+                                            </exec>
+                                        </wait>
+                                        <volumes>
+                                            <bind>
+                                                <volume>${project.basedir}/custom-mariadbconfig:/etc/mysql/conf.d/:Z</volume>
+                                            </bind>
+                                        </volumes>
+                                    </run>
+                                </image>
+                            </images>
+                            <!--Stops all mariadb:10.4 images currently running, not just those 
+                                we just started. Useful to stop processes still running from a previously 
+                                failed integration test run -->
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
-	</profiles>
+    </profiles>
 
 </project>
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantResolver.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantResolver.java
deleted file mode 100644
index 3f53dea1d853f..0000000000000
--- a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/CustomTenantResolver.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.quarkus.it.hibernate.multitenancy;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
-import org.jboss.logging.Logger;
-
-import io.quarkus.arc.Unremovable;
-import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
-import io.vertx.ext.web.RoutingContext;
-
-@RequestScoped
-@Unremovable
-public class CustomTenantResolver implements TenantResolver {
-
-    private static final Logger LOG = Logger.getLogger(CustomTenantResolver.class);
-
-    @Inject
-    RoutingContext context;
-
-    @Override
-    public String getDefaultTenantId() {
-        return "base";
-    }
-
-    @Override
-    public String resolveTenantId() {
-        String path = context.request().path();
-        final String tenantId;
-        if (path.startsWith("/mycompany")) {
-            tenantId = "mycompany";
-        } else {
-            tenantId = getDefaultTenantId();
-        }
-        LOG.debugv("TenantId = {0}", tenantId);
-        return tenantId;
-    }
-
-}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/Fruit.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/Fruit.java
deleted file mode 100644
index 440a8ea38502f..0000000000000
--- a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/Fruit.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package io.quarkus.it.hibernate.multitenancy;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@Entity
-@Table(name = "known_fruits")
-@NamedQuery(name = "Fruits.findAll", query = "SELECT f FROM Fruit f ORDER BY f.name")
-@NamedQuery(name = "Fruits.findByName", query = "SELECT f FROM Fruit f WHERE f.name=:name")
-@XmlRootElement(name = "fruit")
-public class Fruit {
-
-    @Id
-    @SequenceGenerator(name = "fruitsSequence", sequenceName = "known_fruits_id_seq", allocationSize = 1, initialValue = 10)
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fruitsSequence")
-    private Integer id;
-
-    @Column(length = 40, unique = true)
-    private String name;
-
-    public Fruit() {
-    }
-
-    public Fruit(String name) {
-        this.name = name;
-    }
-
-    Fruit(Integer id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Fruit other = (Fruit) obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "Fruit [id=" + id + ", name=" + name + "]";
-    }
-
-}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/FruitResource.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/FruitResource.java
deleted file mode 100644
index 777d99f33f9bf..0000000000000
--- a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/FruitResource.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package io.quarkus.it.hibernate.multitenancy;
-
-import java.util.List;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-import org.jboss.logging.Logger;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
-
-@ApplicationScoped
-@Produces("application/json")
-@Consumes("application/json")
-@Path("/")
-public class FruitResource {
-
-    private static final Logger LOG = Logger.getLogger(FruitResource.class.getName());
-
-    @Inject
-    EntityManager entityManager;
-
-    @GET
-    @Path("fruits")
-    public Fruit[] getDefault() {
-        return get();
-    }
-
-    @GET
-    @Path("{tenant}/fruits")
-    public Fruit[] getTenant() {
-        return get();
-    }
-
-    private Fruit[] get() {
-        return entityManager.createNamedQuery("Fruits.findAll", Fruit.class)
-                .getResultList().toArray(new Fruit[0]);
-    }
-
-    @GET
-    @Path("fruits/{id}")
-    public Fruit getSingleDefault(@PathParam("id") int id) {
-        return findById(id);
-    }
-
-    @GET
-    @Path("{tenant}/fruits/{id}")
-    public Fruit getSingleTenant(@PathParam("id") int id) {
-        return findById(id);
-    }
-
-    private Fruit findById(int id) {
-        Fruit entity = entityManager.find(Fruit.class, id);
-        if (entity == null) {
-            throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
-        }
-        return entity;
-    }
-
-    @POST
-    @Transactional
-    @Path("fruits")
-    public Response createDefault(@NotNull Fruit fruit) {
-        return create(fruit);
-    }
-
-    @POST
-    @Transactional
-    @Path("{tenant}/fruits")
-    public Response createTenant(@NotNull Fruit fruit) {
-        return create(fruit);
-    }
-
-    private Response create(@NotNull Fruit fruit) {
-        if (fruit.getId() != null) {
-            throw new WebApplicationException("Id was invalidly set on request.", 422);
-        }
-        LOG.debugv("Create {0}", fruit.getName());
-        entityManager.persist(fruit);
-        return Response.ok(fruit).status(201).build();
-    }
-
-    @PUT
-    @Path("fruits/{id}")
-    @Transactional
-    public Fruit updateDefault(@PathParam("id") int id, @NotNull Fruit fruit) {
-        return update(id, fruit);
-    }
-
-    @PUT
-    @Path("{tenant}/fruits/{id}")
-    @Transactional
-    public Fruit updateTenant(@PathParam("id") int id, @NotNull Fruit fruit) {
-        return update(id, fruit);
-    }
-
-    private Fruit update(@NotNull @PathParam("id") int id, @NotNull Fruit fruit) {
-        if (fruit.getName() == null) {
-            throw new WebApplicationException("Fruit Name was not set on request.", 422);
-        }
-
-        Fruit entity = entityManager.find(Fruit.class, id);
-        if (entity == null) {
-            throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
-        }
-        entity.setName(fruit.getName());
-
-        LOG.debugv("Update #{0} {1}", fruit.getId(), fruit.getName());
-
-        return entity;
-    }
-
-    @DELETE
-    @Path("fruits/{id}")
-    @Transactional
-    public Response deleteDefault(@PathParam("id") int id) {
-        return delete(id);
-    }
-
-    @DELETE
-    @Path("{tenant}/fruits/{id}")
-    @Transactional
-    public Response deleteTenant(@PathParam("id") int id) {
-        return delete(id);
-    }
-
-    private Response delete(int id) {
-        Fruit fruit = entityManager.getReference(Fruit.class, id);
-        if (fruit == null) {
-            throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
-        }
-        LOG.debugv("Delete #{0} {1}", fruit.getId(), fruit.getName());
-        entityManager.remove(fruit);
-        return Response.status(204).build();
-    }
-
-    @GET
-    @Path("fruitsFindBy")
-    public Response findByDefault(@NotNull @QueryParam("type") String type, @NotNull @QueryParam("value") String value) {
-        return findBy(type, value);
-    }
-
-    @GET
-    @Path("{tenant}/fruitsFindBy")
-    public Response findByTenant(@NotNull @QueryParam("type") String type, @NotNull @QueryParam("value") String value) {
-        return findBy(type, value);
-    }
-
-    private Response findBy(@NotNull String type, @NotNull String value) {
-        if (!"name".equalsIgnoreCase(type)) {
-            throw new IllegalArgumentException("Currently only 'fruitsFindBy?type=name' is supported");
-        }
-        List<Fruit> list = entityManager.createNamedQuery("Fruits.findByName", Fruit.class).setParameter("name", value)
-                .getResultList();
-        if (list.size() == 0) {
-            return Response.status(404).build();
-        }
-        Fruit fruit = list.get(0);
-        return Response.status(200).entity(fruit).build();
-    }
-
-    @Provider
-    public static class ErrorMapper implements ExceptionMapper<Exception> {
-
-        @Override
-        public Response toResponse(Exception exception) {
-            LOG.error("Failed to handle request", exception);
-
-            int code = 500;
-            if (exception instanceof WebApplicationException) {
-                code = ((WebApplicationException) exception).getResponse().getStatus();
-            }
-
-            JsonObjectBuilder entityBuilder = Json.createObjectBuilder()
-                    .add("exceptionType", exception.getClass().getName())
-                    .add("code", code);
-
-            if (exception.getMessage() != null) {
-                entityBuilder.add("error", exception.getMessage());
-            }
-
-            return Response.status(code)
-                    .type(MediaType.APPLICATION_JSON)
-                    .entity(entityBuilder.build())
-                    .build();
-
-        }
-
-    }
-}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java
new file mode 100644
index 0000000000000..7ba349289e117
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/CustomTenantResolver.java
@@ -0,0 +1,37 @@
+package io.quarkus.it.hibernate.multitenancy.fruit;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
+import io.vertx.ext.web.RoutingContext;
+
+@RequestScoped
+public class CustomTenantResolver implements TenantResolver {
+
+    private static final Logger LOG = Logger.getLogger(CustomTenantResolver.class);
+
+    @Inject
+    RoutingContext context;
+
+    @Override
+    public String getDefaultTenantId() {
+        return "base";
+    }
+
+    @Override
+    public String resolveTenantId() {
+        String path = context.request().path();
+        final String tenantId;
+        if (path.startsWith("/mycompany")) {
+            tenantId = "mycompany";
+        } else {
+            tenantId = getDefaultTenantId();
+        }
+        LOG.debugv("TenantId = {0}", tenantId);
+        return tenantId;
+    }
+
+}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java
new file mode 100644
index 0000000000000..24dc81505cc24
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/Fruit.java
@@ -0,0 +1,92 @@
+package io.quarkus.it.hibernate.multitenancy.fruit;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Entity
+@Table(name = "known_fruits")
+@NamedQuery(name = "Fruits.findAll", query = "SELECT f FROM Fruit f ORDER BY f.name")
+@NamedQuery(name = "Fruits.findByName", query = "SELECT f FROM Fruit f WHERE f.name=:name")
+@XmlRootElement(name = "fruit")
+public class Fruit {
+
+    @Id
+    @SequenceGenerator(name = "fruitsSequence", sequenceName = "known_fruits_id_seq", allocationSize = 1, initialValue = 10)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "fruitsSequence")
+    private Integer id;
+
+    @Column(length = 40, unique = true)
+    private String name;
+
+    public Fruit() {
+    }
+
+    public Fruit(String name) {
+        this.name = name;
+    }
+
+    public Fruit(Integer id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Fruit other = (Fruit) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "Fruit [id=" + id + ", name=" + name + "]";
+    }
+
+}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java
new file mode 100644
index 0000000000000..e1e77787f8470
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/fruit/FruitResource.java
@@ -0,0 +1,207 @@
+package io.quarkus.it.hibernate.multitenancy.fruit;
+
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.json.Json;
+import javax.json.JsonObjectBuilder;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.logging.Logger;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@ApplicationScoped
+@Produces("application/json")
+@Consumes("application/json")
+@Path("/")
+public class FruitResource {
+
+    private static final Logger LOG = Logger.getLogger(FruitResource.class.getName());
+
+    @Inject
+    EntityManager entityManager;
+
+    @GET
+    @Path("fruits")
+    public Fruit[] getDefault() {
+        return get();
+    }
+
+    @GET
+    @Path("{tenant}/fruits")
+    public Fruit[] getTenant() {
+        return get();
+    }
+
+    private Fruit[] get() {
+        return entityManager.createNamedQuery("Fruits.findAll", Fruit.class)
+                .getResultList().toArray(new Fruit[0]);
+    }
+
+    @GET
+    @Path("fruits/{id}")
+    public Fruit getSingleDefault(@PathParam("id") int id) {
+        return findById(id);
+    }
+
+    @GET
+    @Path("{tenant}/fruits/{id}")
+    public Fruit getSingleTenant(@PathParam("id") int id) {
+        return findById(id);
+    }
+
+    private Fruit findById(int id) {
+        Fruit entity = entityManager.find(Fruit.class, id);
+        if (entity == null) {
+            throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
+        }
+        return entity;
+    }
+
+    @POST
+    @Transactional
+    @Path("fruits")
+    public Response createDefault(@NotNull Fruit fruit) {
+        return create(fruit);
+    }
+
+    @POST
+    @Transactional
+    @Path("{tenant}/fruits")
+    public Response createTenant(@NotNull Fruit fruit) {
+        return create(fruit);
+    }
+
+    private Response create(@NotNull Fruit fruit) {
+        if (fruit.getId() != null) {
+            throw new WebApplicationException("Id was invalidly set on request.", 422);
+        }
+        LOG.debugv("Create {0}", fruit.getName());
+        entityManager.persist(fruit);
+        return Response.ok(fruit).status(201).build();
+    }
+
+    @PUT
+    @Path("fruits/{id}")
+    @Transactional
+    public Fruit updateDefault(@PathParam("id") int id, @NotNull Fruit fruit) {
+        return update(id, fruit);
+    }
+
+    @PUT
+    @Path("{tenant}/fruits/{id}")
+    @Transactional
+    public Fruit updateTenant(@PathParam("id") int id, @NotNull Fruit fruit) {
+        return update(id, fruit);
+    }
+
+    private Fruit update(@NotNull @PathParam("id") int id, @NotNull Fruit fruit) {
+        if (fruit.getName() == null) {
+            throw new WebApplicationException("Fruit Name was not set on request.", 422);
+        }
+
+        Fruit entity = entityManager.find(Fruit.class, id);
+        if (entity == null) {
+            throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
+        }
+        entity.setName(fruit.getName());
+
+        LOG.debugv("Update #{0} {1}", fruit.getId(), fruit.getName());
+
+        return entity;
+    }
+
+    @DELETE
+    @Path("fruits/{id}")
+    @Transactional
+    public Response deleteDefault(@PathParam("id") int id) {
+        return delete(id);
+    }
+
+    @DELETE
+    @Path("{tenant}/fruits/{id}")
+    @Transactional
+    public Response deleteTenant(@PathParam("id") int id) {
+        return delete(id);
+    }
+
+    private Response delete(int id) {
+        Fruit fruit = entityManager.getReference(Fruit.class, id);
+        if (fruit == null) {
+            throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
+        }
+        LOG.debugv("Delete #{0} {1}", fruit.getId(), fruit.getName());
+        entityManager.remove(fruit);
+        return Response.status(204).build();
+    }
+
+    @GET
+    @Path("fruitsFindBy")
+    public Response findByDefault(@NotNull @QueryParam("type") String type, @NotNull @QueryParam("value") String value) {
+        return findBy(type, value);
+    }
+
+    @GET
+    @Path("{tenant}/fruitsFindBy")
+    public Response findByTenant(@NotNull @QueryParam("type") String type, @NotNull @QueryParam("value") String value) {
+        return findBy(type, value);
+    }
+
+    private Response findBy(@NotNull String type, @NotNull String value) {
+        if (!"name".equalsIgnoreCase(type)) {
+            throw new IllegalArgumentException("Currently only 'fruitsFindBy?type=name' is supported");
+        }
+        List<Fruit> list = entityManager.createNamedQuery("Fruits.findByName", Fruit.class).setParameter("name", value)
+                .getResultList();
+        if (list.size() == 0) {
+            return Response.status(404).build();
+        }
+        Fruit fruit = list.get(0);
+        return Response.status(200).entity(fruit).build();
+    }
+
+    @Provider
+    public static class ErrorMapper implements ExceptionMapper<Exception> {
+
+        @Override
+        public Response toResponse(Exception exception) {
+            LOG.error("Failed to handle request", exception);
+
+            int code = 500;
+            if (exception instanceof WebApplicationException) {
+                code = ((WebApplicationException) exception).getResponse().getStatus();
+            }
+
+            JsonObjectBuilder entityBuilder = Json.createObjectBuilder()
+                    .add("exceptionType", exception.getClass().getName())
+                    .add("code", code);
+
+            if (exception.getMessage() != null) {
+                entityBuilder.add("error", exception.getMessage());
+            }
+
+            return Response.status(code)
+                    .type(MediaType.APPLICATION_JSON)
+                    .entity(entityBuilder.build())
+                    .build();
+
+        }
+
+    }
+}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java
new file mode 100644
index 0000000000000..0c331ff2595f5
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryResource.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.hibernate.multitenancy.inventory;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+
+@ApplicationScoped
+@Produces("application/json")
+@Consumes("application/json")
+@Path("/")
+public class InventoryResource {
+
+    @Inject
+    @PersistenceUnit("inventory")
+    EntityManager entityManager;
+
+    @GET
+    @Path("inventory")
+    public Plane[] getDefault() {
+        return get();
+    }
+
+    @GET
+    @Path("{tenant}/inventory")
+    public Plane[] getTenant() {
+        return get();
+    }
+
+    private Plane[] get() {
+        return entityManager.createNamedQuery("Planes.findAll", Plane.class)
+                .getResultList().toArray(new Plane[0]);
+    }
+}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java
new file mode 100644
index 0000000000000..48f3919c68d1e
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/InventoryTenantResolver.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.hibernate.multitenancy.inventory;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.hibernate.orm.runtime.tenant.TenantResolver;
+import io.vertx.ext.web.RoutingContext;
+
+@RequestScoped
+@PersistenceUnit("inventory")
+public class InventoryTenantResolver implements TenantResolver {
+
+    private static final Logger LOG = Logger.getLogger(InventoryTenantResolver.class);
+
+    @Inject
+    RoutingContext context;
+
+    @Override
+    public String getDefaultTenantId() {
+        return "inventory";
+    }
+
+    @Override
+    public String resolveTenantId() {
+        String path = context.request().path();
+        final String tenantId;
+        if (path.startsWith("/mycompany")) {
+            tenantId = "inventorymycompany";
+        } else {
+            tenantId = getDefaultTenantId();
+        }
+        LOG.debugv("TenantId = {0}", tenantId);
+        return tenantId;
+    }
+
+}
diff --git a/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java
new file mode 100644
index 0000000000000..3c1f0f7b1995c
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/java/io/quarkus/it/hibernate/multitenancy/inventory/Plane.java
@@ -0,0 +1,72 @@
+package io.quarkus.it.hibernate.multitenancy.inventory;
+
+import java.util.Objects;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "plane")
+@NamedQuery(name = "Planes.findAll", query = "SELECT p FROM Plane p ORDER BY p.name")
+public class Plane {
+
+    private Long id;
+
+    private String name;
+
+    public Plane() {
+    }
+
+    public Plane(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "plane_iq_seq")
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        Plane other = (Plane) obj;
+        return Objects.equals(this.name, other.name)
+                && Objects.equals(this.id, other.id);
+    }
+
+    @Override
+    public String toString() {
+        return "Plane [id=" + id + ", name=" + name + "]";
+    }
+}
diff --git a/integration-tests/hibernate-tenancy/src/main/resources/application.properties b/integration-tests/hibernate-tenancy/src/main/resources/application.properties
index 6ddf2937a808d..61361b4b3ffcb 100644
--- a/integration-tests/hibernate-tenancy/src/main/resources/application.properties
+++ b/integration-tests/hibernate-tenancy/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 # Hibernate ORM settings 
 quarkus.hibernate-orm.database.generation=none
-quarkus.hibernate-orm.multitenant=DATABASE
+quarkus.hibernate-orm.multitenant=database
+quarkus.hibernate-orm.packages=io.quarkus.it.hibernate.multitenancy.fruit
 
 # Default DB Configuration
 quarkus.datasource.db-kind=mariadb
@@ -8,7 +9,6 @@ quarkus.datasource.username=root
 quarkus.datasource.password=secret
 quarkus.datasource.jdbc.url=${mariadb.base_url}/hibernate_orm_test
 quarkus.datasource.jdbc.max-size=1
-quarkus.datasource.jdbc.min-size=1
 quarkus.flyway.migrate-at-start=true
 #Reset Flyway metadata at boot, as the database might have been tainted by previous integration tests:
 quarkus.flyway.clean-at-start=true
@@ -20,7 +20,6 @@ quarkus.datasource.base.username=jane
 quarkus.datasource.base.password=abc
 quarkus.datasource.base.jdbc.url=${mariadb.base_url}/base
 quarkus.datasource.base.jdbc.max-size=1
-quarkus.datasource.base.jdbc.min-size=1
 quarkus.flyway.base.migrate-at-start=true
 quarkus.flyway.base.clean-at-start=true
 quarkus.flyway.base.locations=classpath:database/base
@@ -31,8 +30,33 @@ quarkus.datasource.mycompany.username=john
 quarkus.datasource.mycompany.password=def
 quarkus.datasource.mycompany.jdbc.url=${mariadb.base_url}/mycompany
 quarkus.datasource.mycompany.jdbc.max-size=1
-quarkus.datasource.mycompany.jdbc.min-size=1
 quarkus.flyway.mycompany.migrate-at-start=true
 quarkus.flyway.mycompany.clean-at-start=true
 quarkus.flyway.mycompany.locations=classpath:database/mycompany
 
+# Inventory persistence unit
+quarkus.hibernate-orm."inventory".database.generation=none
+quarkus.hibernate-orm."inventory".multitenant=database
+quarkus.hibernate-orm."inventory".datasource=<default>
+quarkus.hibernate-orm."inventory".packages=io.quarkus.it.hibernate.multitenancy.inventory
+
+# DATABASE Tenant 'inventory' / 'base' Configuration
+quarkus.datasource.inventory.db-kind=mariadb
+quarkus.datasource.inventory.username=jane
+quarkus.datasource.inventory.password=abc
+quarkus.datasource.inventory.jdbc.url=${mariadb.base_url}/inventory
+quarkus.datasource.inventory.jdbc.max-size=1
+quarkus.flyway.inventory.migrate-at-start=true
+quarkus.flyway.inventory.clean-at-start=true
+quarkus.flyway.inventory.locations=classpath:database/inventory
+
+# DATABASE Tenant 'inventory' / 'mycompany' Configuration
+quarkus.datasource."inventorymycompany".db-kind=mariadb
+quarkus.datasource."inventorymycompany".username=john
+quarkus.datasource."inventorymycompany".password=def
+quarkus.datasource."inventorymycompany".jdbc.url=${mariadb.base_url}/inventorymycompany
+quarkus.datasource."inventorymycompany".jdbc.max-size=1
+quarkus.flyway."inventorymycompany".migrate-at-start=true
+quarkus.flyway."inventorymycompany".clean-at-start=true
+quarkus.flyway."inventorymycompany".locations=classpath:database/inventorymycompany
+
diff --git a/integration-tests/hibernate-tenancy/src/main/resources/database/default/V1.0.0__init_databases.sql b/integration-tests/hibernate-tenancy/src/main/resources/database/default/V1.0.0__init_databases.sql
index aad4b706e5e4c..83a43be076a54 100644
--- a/integration-tests/hibernate-tenancy/src/main/resources/database/default/V1.0.0__init_databases.sql
+++ b/integration-tests/hibernate-tenancy/src/main/resources/database/default/V1.0.0__init_databases.sql
@@ -6,4 +6,12 @@ CREATE DATABASE IF NOT EXISTS mycompany;
 CREATE USER IF NOT EXISTS 'john'@'%' IDENTIFIED BY 'def';
 GRANT ALL privileges ON mycompany.* TO 'john'@'%';
 
+CREATE DATABASE IF NOT EXISTS inventory;
+CREATE USER IF NOT EXISTS 'jane'@'%' IDENTIFIED BY 'abc';
+GRANT ALL privileges ON inventory.* TO 'jane'@'%';
+
+CREATE DATABASE IF NOT EXISTS inventorymycompany;
+CREATE USER IF NOT EXISTS 'john'@'%' IDENTIFIED BY 'def';
+GRANT ALL privileges ON inventorymycompany.* TO 'john'@'%';
+
 FLUSH PRIVILEGES;
diff --git a/integration-tests/hibernate-tenancy/src/main/resources/database/inventory/V1.0.0__create_planes.sql b/integration-tests/hibernate-tenancy/src/main/resources/database/inventory/V1.0.0__create_planes.sql
new file mode 100644
index 0000000000000..5283cc3970e19
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/resources/database/inventory/V1.0.0__create_planes.sql
@@ -0,0 +1,8 @@
+CREATE TABLE plane
+(
+  id   INT,
+  name VARCHAR(255)
+);
+CREATE SEQUENCE plane_id_seq START WITH 3;
+INSERT INTO plane(id, name) VALUES (1, 'Airbus A320');
+INSERT INTO plane(id, name) VALUES (2, 'Airbus A350');
diff --git a/integration-tests/hibernate-tenancy/src/main/resources/database/inventorymycompany/V1.0.0__create_planes.sql b/integration-tests/hibernate-tenancy/src/main/resources/database/inventorymycompany/V1.0.0__create_planes.sql
new file mode 100644
index 0000000000000..0cbb6076c718c
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/main/resources/database/inventorymycompany/V1.0.0__create_planes.sql
@@ -0,0 +1,8 @@
+CREATE TABLE plane
+(
+  id   INT,
+  name VARCHAR(40)
+);
+CREATE SEQUENCE plane_iq_seq START WITH 3;
+INSERT INTO plane(id, name) VALUES (1, 'Boeing 737');
+INSERT INTO plane(id, name) VALUES (2, 'Boeing 747');
diff --git a/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/HibernateTenancyFunctionalityInGraalITCase.java b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityInGraalITCase.java
similarity index 81%
rename from integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/HibernateTenancyFunctionalityInGraalITCase.java
rename to integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityInGraalITCase.java
index b58d01b233942..4e3bf42e6fb53 100644
--- a/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/HibernateTenancyFunctionalityInGraalITCase.java
+++ b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityInGraalITCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.hibernate.multitenancy;
+package io.quarkus.it.hibernate.multitenancy.fruit;
 
 import io.quarkus.test.junit.NativeImageTest;
 
diff --git a/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/HibernateTenancyFunctionalityTest.java b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java
similarity index 99%
rename from integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/HibernateTenancyFunctionalityTest.java
rename to integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java
index 00c7de12670b6..e4253cbbe0313 100644
--- a/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/HibernateTenancyFunctionalityTest.java
+++ b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/fruit/HibernateTenancyFunctionalityTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.hibernate.multitenancy;
+package io.quarkus.it.hibernate.multitenancy.fruit;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java
new file mode 100644
index 0000000000000..ef5ec3d3ecdaa
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.it.hibernate.multitenancy.inventory;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+
+import javax.ws.rs.core.Response.Status;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.restassured.config.ObjectMapperConfig;
+import io.restassured.config.RestAssuredConfig;
+import io.restassured.mapper.ObjectMapperType;
+
+@QuarkusTest
+public class HibernateNamedPersistenceUnitTest {
+
+    private static RestAssuredConfig config;
+
+    @BeforeAll
+    public static void beforeClass() {
+        config = RestAssured.config().objectMapperConfig(new ObjectMapperConfig(ObjectMapperType.JSONB));
+    }
+
+    @Test
+    public void testGetPlanesDefaultTenant() throws Exception {
+
+        Plane[] planes = given().config(config).when().get("/inventory").then().assertThat()
+                .statusCode(is(Status.OK.getStatusCode())).extract()
+                .as(Plane[].class);
+        assertThat(planes, arrayContaining(new Plane(1L, "Airbus A320"), new Plane(2L, "Airbus A350")));
+
+    }
+
+    @Test
+    public void testGetPlanesTenantMycompany() throws Exception {
+
+        Plane[] planes = given().config(config).when().get("/mycompany/inventory").then().assertThat()
+                .statusCode(is(Status.OK.getStatusCode())).extract()
+                .as(Plane[].class);
+        assertThat(planes, arrayContaining(new Plane(1L, "Boeing 737"), new Plane(2L, "Boeing 747")));
+
+    }
+}
diff --git a/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTestInGraalITCase.java b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTestInGraalITCase.java
new file mode 100644
index 0000000000000..136fd8d65e70c
--- /dev/null
+++ b/integration-tests/hibernate-tenancy/src/test/java/io/quarkus/it/hibernate/multitenancy/inventory/HibernateNamedPersistenceUnitTestInGraalITCase.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.hibernate.multitenancy.inventory;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class HibernateNamedPersistenceUnitTestInGraalITCase extends HibernateNamedPersistenceUnitTest {
+
+}
diff --git a/integration-tests/hibernate-validator/pom.xml b/integration-tests/hibernate-validator/pom.xml
index 6474ddcaf1641..8b0919432ce6d 100644
--- a/integration-tests/hibernate-validator/pom.xml
+++ b/integration-tests/hibernate-validator/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Integration Tests - Hibernate Validator</name>
     <description>Module that contains Hibernate Validator/Bean Validation related tests</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -36,7 +31,17 @@
             <artifactId>quarkus-arc</artifactId>
         </dependency>
 
-        <!-- test dependencies -->
+        <!-- To test the ORM integration -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -47,6 +52,90 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -90,53 +179,18 @@
                 </property>
             </activation>
             <build>
+                <!-- add some custom config, the rest comes from parent -->
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
+                            <systemPropertyVariables>
+                                <!-- force the locale as we want to explicitly test message interpolation -->
+                                <user.language>en</user.language>
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <!-- force the locale as we want to explicitly test message interpolation -->
-                                        <user.language>en</user.language>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java
index 145c7e1d928dc..f27b3f66f161c 100644
--- a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java
@@ -1,5 +1,9 @@
 package io.quarkus.it.hibernate.validator;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -9,6 +13,9 @@
 
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
+import javax.interceptor.InterceptorBinding;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Valid;
@@ -17,25 +24,32 @@
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.Pattern;
+import javax.validation.groups.ConvertGroup;
 import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.hibernate.validator.constraints.Length;
 
 import io.quarkus.it.hibernate.validator.custom.MyOtherBean;
+import io.quarkus.it.hibernate.validator.groups.MyBeanWithGroups;
+import io.quarkus.it.hibernate.validator.groups.ValidationGroups;
 import io.quarkus.it.hibernate.validator.injection.InjectedConstraintValidatorConstraint;
 import io.quarkus.it.hibernate.validator.injection.MyService;
+import io.quarkus.it.hibernate.validator.orm.TestEntity;
 import io.quarkus.runtime.StartupEvent;
 
 @Path("/hibernate-validator/test")
 public class HibernateValidatorTestResource
-        implements HibernateValidatorTestResourceGenericInterface<Integer> {
+        implements HibernateValidatorTestResourceGenericInterface<Integer>, HibernateValidatorTestResourceInterface {
 
     @Inject
     Validator validator;
@@ -49,6 +63,9 @@ public class HibernateValidatorTestResource
     @Inject
     ZipCodeService zipCodeResource;
 
+    @Inject
+    EntityManager em;
+
     public void testValidationOutsideOfResteasyContext(@Observes StartupEvent startupEvent) {
         validator.validate(new MyOtherBean(null));
     }
@@ -120,6 +137,19 @@ public String testRestEndPointValidation(@Digits(integer = 5, fraction = 0) @Pat
         return id;
     }
 
+    // all JAX-RS annotations are defined in the interface
+    @Override
+    public String testRestEndPointInterfaceValidation(String id) {
+        return id;
+    }
+
+    // all JAX-RS annotations are defined in the interface
+    @Override
+    @SomeInterceptorBindingAnnotation
+    public String testRestEndPointInterfaceValidationWithAnnotationOnImplMethod(String id) {
+        return id;
+    }
+
     @GET
     @Path("/rest-end-point-generic-method-validation/{id}")
     @Produces(MediaType.TEXT_PLAIN)
@@ -196,7 +226,6 @@ public Response testValidationMessageLocale(
     @POST
     @Path("/test-manual-validation-message-locale")
     @Produces(MediaType.TEXT_PLAIN)
-    @Consumes(MediaType.APPLICATION_JSON)
     public String testManualValidationMessageLocale(MyLocaleTestBean test) {
         Set<ConstraintViolation<MyLocaleTestBean>> violations = validator.validate(test);
 
@@ -210,6 +239,65 @@ public String testManualValidationMessageLocale(MyLocaleTestBean test) {
         return result.build();
     }
 
+    @GET
+    @Path("/test-hibernate-orm-integration")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public String testHibernateOrmIntegration() {
+        em.persist(new TestEntity());
+        return "FAILED";
+    }
+
+    @PUT
+    @Path("/rest-end-point-validation-groups/")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String testRestEndPointValidationGroups_Put(
+            @Valid @ConvertGroup(to = ValidationGroups.Put.class) MyBeanWithGroups bean) {
+        return "passed";
+    }
+
+    @POST
+    @Path("/rest-end-point-validation-groups/")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.APPLICATION_JSON)
+    public String testRestEndPointValidationGroups_Post(
+            @Valid @ConvertGroup(to = ValidationGroups.Post.class) MyBeanWithGroups bean) {
+        return "passed";
+    }
+
+    @GET
+    @Path("/rest-end-point-validation-groups/{id}/")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Valid
+    @ConvertGroup(to = ValidationGroups.Get.class)
+    public MyBeanWithGroups testRestEndPointValidationGroups_Get(@PathParam("id") long id,
+            @QueryParam("simulateDeleted") boolean simulateDeleted,
+            @QueryParam("simulateNullName") boolean simulateNullName) {
+        MyBeanWithGroups result = new MyBeanWithGroups();
+        result.setId(id);
+        result.setName(simulateNullName ? null : "someName");
+        result.setDeleted(simulateDeleted);
+        return result;
+    }
+
+    @DELETE
+    @Path("/rest-end-point-validation-groups/{id}/")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Valid
+    @ConvertGroup(to = ValidationGroups.Delete.class)
+    public MyBeanWithGroups testRestEndPointValidationGroups_Delete(@PathParam("id") long id,
+            @QueryParam("simulateDeleted") boolean simulateDeleted,
+            @QueryParam("simulateNullName") boolean simulateNullName) {
+        MyBeanWithGroups result = new MyBeanWithGroups();
+        result.setId(id);
+        result.setName(simulateNullName ? null : "someName");
+        result.setDeleted(simulateDeleted);
+        return result;
+    }
+
     private String formatViolations(Set<? extends ConstraintViolation<?>> violations) {
         if (violations.isEmpty()) {
             return "passed";
@@ -308,6 +396,12 @@ public String getValue() {
         }
     }
 
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.RUNTIME)
+    @InterceptorBinding
+    public static @interface SomeInterceptorBindingAnnotation {
+    }
+
     private static class ResultBuilder {
 
         private StringBuilder builder = new StringBuilder();
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java
new file mode 100644
index 0000000000000..fe76470c7c252
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.hibernate.validator;
+
+import javax.validation.constraints.Digits;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+public interface HibernateValidatorTestResourceInterface {
+
+    @GET
+    @Path("/rest-end-point-interface-validation/{id}/")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testRestEndPointInterfaceValidation(@Digits(integer = 5, fraction = 0) @PathParam("id") String id);
+
+    @GET
+    @Path("/rest-end-point-interface-validation-annotation-on-impl-method/{id}/")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testRestEndPointInterfaceValidationWithAnnotationOnImplMethod(
+            @Digits(integer = 5, fraction = 0) @PathParam("id") String id);
+}
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java
new file mode 100644
index 0000000000000..e25f7b05189ce
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/MyBeanWithGroups.java
@@ -0,0 +1,47 @@
+package io.quarkus.it.hibernate.validator.groups;
+
+import javax.validation.constraints.AssertFalse;
+import javax.validation.constraints.AssertTrue;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+
+public class MyBeanWithGroups {
+
+    @Null(groups = ValidationGroups.Put.class)
+    @NotNull(groups = { ValidationGroups.Post.class, ValidationGroups.Get.class, ValidationGroups.Delete.class })
+    private Long id;
+
+    @NotNull
+    private String name;
+
+    @AssertFalse(groups = { ValidationGroups.Put.class, ValidationGroups.Post.class, ValidationGroups.Get.class })
+    @AssertTrue(groups = ValidationGroups.Delete.class)
+    private boolean deleted;
+
+    public MyBeanWithGroups() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+}
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java
new file mode 100644
index 0000000000000..4e8e4eec0dcc8
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/groups/ValidationGroups.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.hibernate.validator.groups;
+
+import javax.validation.groups.Default;
+
+public interface ValidationGroups {
+    interface Put extends Default {
+    }
+
+    interface Post extends Default {
+    }
+
+    interface Get extends Default {
+    }
+
+    interface Delete extends Default {
+    }
+}
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java
new file mode 100644
index 0000000000000..bdf6a20ed0d91
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/BookResource.java
@@ -0,0 +1,16 @@
+package io.quarkus.it.hibernate.validator.inheritance;
+
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+public interface BookResource {
+
+    String PATH = "/books";
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    String hello(@NotNull @QueryParam("name") String name);
+}
\ No newline at end of file
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java
new file mode 100644
index 0000000000000..98c883f0ec957
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResource.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.hibernate.validator.inheritance;
+
+import javax.ws.rs.Path;
+
+@Path(ScienceBookResource.PATH)
+public interface ScienceBookResource extends BookResource {
+
+    String PATH = BookResource.PATH + "/science";
+
+}
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResourceImpl.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResourceImpl.java
new file mode 100644
index 0000000000000..f6ac51b9c7856
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/inheritance/ScienceBookResourceImpl.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.hibernate.validator.inheritance;
+
+public class ScienceBookResourceImpl implements ScienceBookResource {
+
+    @Override
+    public String hello(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java
new file mode 100644
index 0000000000000..25e0d77c20aa0
--- /dev/null
+++ b/integration-tests/hibernate-validator/src/main/java/io/quarkus/it/hibernate/validator/orm/TestEntity.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.hibernate.validator.orm;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.annotations.GenericGenerator;
+
+@Entity
+public class TestEntity {
+
+    @Id
+    @GeneratedValue(generator = "uuid")
+    @GenericGenerator(name = "uuid", strategy = "uuid2")
+    String id;
+
+    @NotNull
+    String validatedField;
+
+}
diff --git a/integration-tests/hibernate-validator/src/main/resources/application.properties b/integration-tests/hibernate-validator/src/main/resources/application.properties
index 041f24d3fc0be..d4417e98f6029 100644
--- a/integration-tests/hibernate-validator/src/main/resources/application.properties
+++ b/integration-tests/hibernate-validator/src/main/resources/application.properties
@@ -1 +1,6 @@
-quarkus.locales=en,hr-HR,en-US,fr-FR
\ No newline at end of file
+quarkus.locales=en,hr-HR,en-US,fr-FR
+
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.hibernate-orm.database.generation = drop-and-create
+
diff --git a/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java b/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java
index 8381469d1ad3c..48795cdd2dc08 100644
--- a/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java
+++ b/integration-tests/hibernate-validator/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java
@@ -5,14 +5,17 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 
 /**
  * Test various Bean Validation operations running in Quarkus
  */
-
 @QuarkusTest
+@QuarkusTestResource(H2DatabaseTestResource.class)
 public class HibernateValidatorFunctionalityTest {
 
     @Test
@@ -69,6 +72,34 @@ public void testRestEndPointValidation() {
                 .body(is("42"));
     }
 
+    @Test
+    public void testRestEndPointInterfaceValidation() {
+        RestAssured.when()
+                .get("/hibernate-validator/test/rest-end-point-interface-validation/plop/")
+                .then()
+                .statusCode(400)
+                .body(containsString("numeric value out of bounds"));
+
+        RestAssured.when()
+                .get("/hibernate-validator/test/rest-end-point-interface-validation/42/")
+                .then()
+                .body(is("42"));
+    }
+
+    @Test
+    public void testRestEndPointInterfaceValidationWithAnnotationOnImplMethod() {
+        RestAssured.when()
+                .get("/hibernate-validator/test/rest-end-point-interface-validation-annotation-on-impl-method/plop/")
+                .then()
+                .statusCode(400)
+                .body(containsString("numeric value out of bounds"));
+
+        RestAssured.when()
+                .get("/hibernate-validator/test/rest-end-point-interface-validation-annotation-on-impl-method/42/")
+                .then()
+                .body(is("42"));
+    }
+
     @Test
     public void testRestEndPointGenericMethodValidation() {
         RestAssured.when()
@@ -159,4 +190,130 @@ public void testManualValidationMessageLocale() {
                 .body(containsString("Vrijednost ne zadovoljava uzorak"));
     }
 
+    @Test
+    public void testHibernateOrmIntegration() {
+        RestAssured.when()
+                .get("/hibernate-validator/test/test-hibernate-orm-integration")
+                .then()
+                .statusCode(500);
+    }
+
+    @Test
+    public void testInheritance() {
+        RestAssured.given()
+                .get("/books/science")
+                .then()
+                .statusCode(400)
+                .body(containsString("must not be null"));
+    }
+
+    @Test
+    public void testRestEndPointValidationGroups_parameters() {
+        // PUT: input id must be null
+        RestAssured.given()
+                .contentType(ContentType.JSON)
+                .body("{\"id\": 1, \"name\": \"b\"}")
+                .when()
+                .put("/hibernate-validator/test/rest-end-point-validation-groups/")
+                .then()
+                .statusCode(400)
+                .body(containsString("must be null"));
+        RestAssured.given()
+                .contentType(ContentType.JSON)
+                .body("{\"name\": \"b\"}")
+                .when()
+                .put("/hibernate-validator/test/rest-end-point-validation-groups/")
+                .then()
+                .statusCode(200)
+                .body(containsString("passed"));
+
+        // POST: input id must not be null
+        RestAssured.given()
+                .contentType(ContentType.JSON)
+                .body("{\"name\": \"b\"}")
+                .when()
+                .post("/hibernate-validator/test/rest-end-point-validation-groups/")
+                .then()
+                .statusCode(400)
+                .body(containsString("must not be null"));
+        RestAssured.given()
+                .contentType(ContentType.JSON)
+                .body("{\"id\": 1, \"name\": \"b\"}")
+                .when()
+                .post("/hibernate-validator/test/rest-end-point-validation-groups/")
+                .then()
+                .statusCode(200)
+                .body(containsString("passed"));
+
+        // Also check that constraints using the default group still work
+        RestAssured.given()
+                .contentType(ContentType.JSON)
+                .body("{}")
+                .when()
+                .put("/hibernate-validator/test/rest-end-point-validation-groups/")
+                .then()
+                .statusCode(400)
+                .body(containsString("must not be null"));
+        RestAssured.given()
+                .contentType(ContentType.JSON)
+                .body("{\"id\":1}")
+                .when()
+                .post("/hibernate-validator/test/rest-end-point-validation-groups/")
+                .then()
+                .statusCode(400)
+                .body(containsString("must not be null"));
+    }
+
+    @Test
+    public void testRestEndPointValidationGroups_result() {
+        // GET: deleted must be false
+        RestAssured.given()
+                .param("simulateDeleted", true)
+                .when()
+                .get("/hibernate-validator/test/rest-end-point-validation-groups/1/")
+                .then()
+                .statusCode(500)
+                .body(containsString("must be false"));
+        RestAssured.given()
+                .param("simulateDeleted", false)
+                .when()
+                .get("/hibernate-validator/test/rest-end-point-validation-groups/1/")
+                .then()
+                .statusCode(200)
+                .body(containsString("\"deleted\":false"));
+
+        // DELETE: deleted must be true
+        RestAssured.given()
+                .param("simulateDeleted", false)
+                .when()
+                .delete("/hibernate-validator/test/rest-end-point-validation-groups/1/")
+                .then()
+                .statusCode(500)
+                .body(containsString("must be true"));
+        RestAssured.given()
+                .param("simulateDeleted", true)
+                .when()
+                .delete("/hibernate-validator/test/rest-end-point-validation-groups/1/")
+                .then()
+                .statusCode(200)
+                .body(containsString("\"deleted\":true"));
+
+        // Also check that constraints using the default group still work
+        RestAssured.given()
+                .param("simulateDeleted", false)
+                .param("simulateNullName", true)
+                .when()
+                .get("/hibernate-validator/test/rest-end-point-validation-groups/1/")
+                .then()
+                .statusCode(500)
+                .body(containsString("must not be null"));
+        RestAssured.given()
+                .param("simulateDeleted", true)
+                .param("simulateNullName", true)
+                .when()
+                .delete("/hibernate-validator/test/rest-end-point-validation-groups/1/")
+                .then()
+                .statusCode(500)
+                .body(containsString("must not be null"));
+    }
 }
diff --git a/integration-tests/ide-launcher/disable-native-profile b/integration-tests/ide-launcher/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/ide-launcher/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/ide-launcher/pom.xml b/integration-tests/ide-launcher/pom.xml
index 3b177ce34e352..fca6abbe2b28d 100644
--- a/integration-tests/ide-launcher/pom.xml
+++ b/integration-tests/ide-launcher/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-ide-launcher</artifactId>
@@ -34,7 +33,21 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-    </dependencies>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/integration-tests/infinispan-cache-jpa/pom.xml b/integration-tests/infinispan-cache-jpa/pom.xml
index 33540ddc63475..6aaa46558fe12 100644
--- a/integration-tests/infinispan-cache-jpa/pom.xml
+++ b/integration-tests/infinispan-cache-jpa/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,6 +45,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,63 +110,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/infinispan-cache-jpa/src/main/resources/application.properties b/integration-tests/infinispan-cache-jpa/src/main/resources/application.properties
index 2b1c9a9c8c27f..1a7a4a124997b 100644
--- a/integration-tests/infinispan-cache-jpa/src/main/resources/application.properties
+++ b/integration-tests/infinispan-cache-jpa/src/main/resources/application.properties
@@ -1,7 +1,6 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.statistics=true
 quarkus.hibernate-orm.cache."com.example.EntityA".memory.object-count=200
diff --git a/integration-tests/infinispan-client/pom.xml b/integration-tests/infinispan-client/pom.xml
index 866793de3b908..8bc594bfdfd5c 100644
--- a/integration-tests/infinispan-client/pom.xml
+++ b/integration-tests/infinispan-client/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -95,17 +94,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
 
     </dependencies>
@@ -154,64 +153,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 
 </project>
diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BigDecimalAdapter.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BigDecimalAdapter.java
new file mode 100644
index 0000000000000..8d4084c8871cc
--- /dev/null
+++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BigDecimalAdapter.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.infinispan.client;
+
+import java.math.BigDecimal;
+
+import org.infinispan.protostream.annotations.ProtoAdapter;
+import org.infinispan.protostream.annotations.ProtoFactory;
+import org.infinispan.protostream.annotations.ProtoField;
+import org.infinispan.protostream.descriptors.Type;
+
+@ProtoAdapter(BigDecimal.class)
+public class BigDecimalAdapter {
+    @ProtoFactory
+    BigDecimal create(Double value) {
+        return BigDecimal.valueOf(value);
+    }
+
+    @ProtoField(number = 1, type = Type.DOUBLE, defaultValue = "0")
+    Double value(BigDecimal value) {
+        return value.doubleValue();
+    }
+}
diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java
index 8351e7b21efdf..ca404a8f7985c 100644
--- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java
+++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.infinispan.client;
 
+import java.math.BigDecimal;
 import java.util.Objects;
 import java.util.Set;
 
@@ -15,14 +16,16 @@ public class Book {
     private final int publicationYear;
     private final Set<Author> authors;
     private final Type bookType;
+    private final BigDecimal price;
 
     @ProtoFactory
-    public Book(String title, String description, int publicationYear, Set<Author> authors, Type bookType) {
+    public Book(String title, String description, int publicationYear, Set<Author> authors, Type bookType, BigDecimal price) {
         this.title = Objects.requireNonNull(title);
         this.description = Objects.requireNonNull(description);
         this.publicationYear = publicationYear;
         this.authors = Objects.requireNonNull(authors);
         this.bookType = bookType;
+        this.price = price;
     }
 
     @ProtoField(number = 1)
@@ -50,6 +53,11 @@ public Type getBookType() {
         return bookType;
     }
 
+    @ProtoField(number = 6)
+    public BigDecimal getPrice() {
+        return price;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -61,11 +69,12 @@ public boolean equals(Object o) {
                 title.equals(book.title) &&
                 description.equals(book.description) &&
                 authors.equals(book.authors) &&
-                bookType.equals(book.bookType);
+                bookType.equals(book.bookType) &&
+                price.equals(book.price);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(title, description, publicationYear, authors, bookType);
+        return Objects.hash(title, description, publicationYear, authors, bookType, price);
     }
 }
diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookContextInitializer.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookContextInitializer.java
index 0dbf73c927deb..dcb626ef21026 100644
--- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookContextInitializer.java
+++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/BookContextInitializer.java
@@ -3,6 +3,7 @@
 import org.infinispan.protostream.SerializationContextInitializer;
 import org.infinispan.protostream.annotations.AutoProtoSchemaBuilder;
 
-@AutoProtoSchemaBuilder(includeClasses = { Book.class, Type.class, Author.class }, schemaPackageName = "book_sample")
+@AutoProtoSchemaBuilder(includeClasses = { Book.class, Type.class, Author.class,
+        BigDecimalAdapter.class }, schemaPackageName = "book_sample")
 interface BookContextInitializer extends SerializationContextInitializer {
 }
diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java
index 320d3f0c6eda6..f0c49967f8c57 100644
--- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java
+++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.infinispan.client;
 
+import java.math.BigDecimal;
 import java.time.YearMonth;
 import java.util.Arrays;
 import java.util.Collections;
@@ -105,9 +106,9 @@ public void resultUpdated(String key, Book value) {
         log.info("Added continuous query listener");
 
         cache.put("book1", new Book("Game of Thrones", "Lots of people perish", 2010,
-                Collections.singleton(new Author("George", "Martin")), Type.FANTASY));
+                Collections.singleton(new Author("George", "Martin")), Type.FANTASY, new BigDecimal("23.99")));
         cache.put("book2", new Book("Game of Thrones Path 2", "They win?", 2023,
-                Collections.singleton(new Author("Son", "Martin")), Type.FANTASY));
+                Collections.singleton(new Author("Son", "Martin")), Type.FANTASY, new BigDecimal("54.99")));
 
         magazineCache.put("first-mad", new Magazine("MAD", YearMonth.of(1952, 10),
                 Collections.singletonList("Blob named Melvin")));
@@ -249,7 +250,7 @@ public String nearCache() {
         long nearCacheInvalidations = stats.getNearCacheInvalidations();
 
         Book nearCacheBook = new Book("Near Cache Book", "Just here to test", 2010,
-                Collections.emptySet(), Type.PROGRAMMING);
+                Collections.emptySet(), Type.PROGRAMMING, new BigDecimal("12.99"));
 
         String id = "nearcache";
         cache.put(id, nearCacheBook);
@@ -283,7 +284,8 @@ public String nearCache() {
             return "second retrieved book doesn't match";
         }
 
-        nearCacheBook = new Book("Near Cache Book", "Just here to test", 2011, Collections.emptySet(), Type.PROGRAMMING);
+        nearCacheBook = new Book("Near Cache Book", "Just here to test",
+                2011, Collections.emptySet(), Type.PROGRAMMING, new BigDecimal("0.99"));
 
         cache.put(id, nearCacheBook);
 
@@ -312,7 +314,7 @@ public String nearCache() {
     @Consumes(MediaType.TEXT_PLAIN)
     public Response createItem(String value, @PathParam("id") String id) {
         ensureStart();
-        Book book = new Book(id, value, 2019, Collections.emptySet(), Type.PROGRAMMING);
+        Book book = new Book(id, value, 2019, Collections.emptySet(), Type.PROGRAMMING, new BigDecimal("9.99"));
         Book previous = cache.putIfAbsent(id, book);
         if (previous == null) {
             //status code 201
diff --git a/integration-tests/infinispan-client/src/main/resources/application.properties b/integration-tests/infinispan-client/src/main/resources/application.properties
index d28fd785e1337..ad6c22b395205 100644
--- a/integration-tests/infinispan-client/src/main/resources/application.properties
+++ b/integration-tests/infinispan-client/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 quarkus.infinispan-client.server-list=localhost:11232
-quarkus.infinispan-client.near-cache-max-entries=3
 quarkus.infinispan-client.trust-store=src/main/resources/server.p12
 quarkus.infinispan-client.trust-store-password=changeit
 quarkus.infinispan-client.trust-store-type=PKCS12
diff --git a/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanServerTestResource.java b/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanServerTestResource.java
index 6bcba082209b2..f519c49f5081a 100644
--- a/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanServerTestResource.java
+++ b/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanServerTestResource.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.infinispan.commons.dataconversion.MediaType;
 import org.infinispan.commons.test.TestResourceTracker;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
@@ -23,10 +24,14 @@ public class InfinispanServerTestResource implements QuarkusTestResourceLifecycl
     @Override
     public Map<String, String> start() {
         TestResourceTracker.setThreadTestName("InfinispanServer");
+        ConfigurationBuilder configurationBuilder = new ConfigurationBuilder();
+        configurationBuilder.encoding().mediaType(MediaType.APPLICATION_PROTOSTREAM_TYPE);
         EmbeddedCacheManager ecm = TestCacheManagerFactory.createCacheManager(
                 new GlobalConfigurationBuilder().nonClusteredDefault().defaultCacheName("default"),
-                new ConfigurationBuilder());
-        ecm.defineConfiguration("magazine", new ConfigurationBuilder().build());
+                configurationBuilder);
+
+        ecm.defineConfiguration("magazine", configurationBuilder.build());
+
         // Client connects to a non default port
         final HotRodServerConfigurationBuilder hotRodServerConfigurationBuilder = new HotRodServerConfigurationBuilder();
         hotRodServerConfigurationBuilder
diff --git a/integration-tests/injectmock/disable-native-profile b/integration-tests/injectmock/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/injectmock/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/injectmock/pom.xml b/integration-tests/injectmock/pom.xml
index 0254a8fad7b45..f184c2d7acd58 100644
--- a/integration-tests/injectmock/pom.xml
+++ b/integration-tests/injectmock/pom.xml
@@ -28,6 +28,21 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java
new file mode 100644
index 0000000000000..4c2d3ee1f8978
--- /dev/null
+++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/AlphaObserver.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.mockbean;
+
+import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+@ApplicationScoped
+public class AlphaObserver {
+
+    public boolean test() {
+        return true;
+    }
+
+    void onBigDecimal(@Observes AtomicReference<BigDecimal> event) {
+        event.set(event.get().add(BigDecimal.ONE));
+    }
+
+}
diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java
new file mode 100644
index 0000000000000..4e7bbb9b1d1e3
--- /dev/null
+++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/BravoObserver.java
@@ -0,0 +1,16 @@
+package io.quarkus.it.mockbean;
+
+import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+@ApplicationScoped
+public class BravoObserver {
+
+    void onBigDecimal(@Observes AtomicReference<BigDecimal> event) {
+        event.set(event.get().add(BigDecimal.ONE));
+    }
+
+}
diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java
new file mode 100644
index 0000000000000..622f331392b77
--- /dev/null
+++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SameBeanInstance.java
@@ -0,0 +1,63 @@
+package io.quarkus.it.mockbean;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+public class SameBeanInstance {
+
+    public interface UnderTest {
+        void method1();
+    }
+
+    public interface I3 {
+        void method3();
+    }
+
+    public interface I2 {
+        void method2();
+    }
+
+    public interface I4 {
+        void method4();
+    }
+
+    @ApplicationScoped
+    public static class C1 implements UnderTest {
+        @Inject
+        I2 i2;
+
+        @Inject
+        I3 i3;
+
+        @Inject
+        I4 i4;
+
+        @Override
+        public void method1() {
+            i2.method2();
+            i3.method3();
+        }
+    }
+
+    @ApplicationScoped
+    public static class C2 implements I2, I3 {
+        @Override
+        public void method2() {
+
+        }
+
+        @Override
+        public void method3() {
+
+        }
+    }
+
+    @ApplicationScoped
+    public static class C3 implements I4 {
+
+        @Override
+        public void method4() {
+
+        }
+    }
+}
diff --git a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java
index bb0728476173c..9abe827814401 100644
--- a/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java
+++ b/integration-tests/injectmock/src/main/java/io/quarkus/it/mockbean/SuffixService.java
@@ -5,7 +5,7 @@
 @ApplicationScoped
 public class SuffixService {
 
-    public String getSuffix() {
+    String getSuffix() {
         return "";
     }
 }
diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java
new file mode 100644
index 0000000000000..7be20eb62196a
--- /dev/null
+++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/MockedObserverTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.it.mockbean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.math.BigDecimal;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.mockito.InjectMock;
+
+@QuarkusTest
+class MockedObserverTest {
+
+    @InjectMock
+    AlphaObserver observer;
+
+    @Inject
+    Event<AtomicReference<BigDecimal>> event;
+
+    @Test
+    public void testMockedObserverNotNotified() {
+        Mockito.when(observer.test()).thenReturn(false);
+        assertFalse(observer.test());
+        AtomicReference<BigDecimal> payload = new AtomicReference<BigDecimal>(BigDecimal.ZERO);
+        event.fire(payload);
+        // BravoObserver is not mocked
+        assertEquals(BigDecimal.ONE, payload.get());
+    }
+
+}
diff --git a/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java
new file mode 100644
index 0000000000000..4e3724e700143
--- /dev/null
+++ b/integration-tests/injectmock/src/test/java/io/quarkus/it/mockbean/SameBeanInstanceTest.java
@@ -0,0 +1,35 @@
+package io.quarkus.it.mockbean;
+
+import static org.mockito.Mockito.*;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.mockito.InjectMock;
+
+@QuarkusTest
+public class SameBeanInstanceTest {
+
+    @Inject
+    SameBeanInstance.UnderTest underTest;
+
+    @InjectMock
+    SameBeanInstance.I2 i2;
+
+    @InjectMock
+    SameBeanInstance.I3 i3;
+
+    @InjectMock
+    SameBeanInstance.I4 i4;
+
+    @Test
+    public void sample() {
+        underTest.method1();
+
+        verify(i2).method2();
+        verify(i3).method3();
+        verify(i4, never()).method4();
+    }
+}
diff --git a/integration-tests/jackson/pom.xml b/integration-tests/jackson/pom.xml
index 2fce720aa742a..d382b724cec25 100644
--- a/integration-tests/jackson/pom.xml
+++ b/integration-tests/jackson/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-jackson</artifactId>
@@ -40,6 +39,34 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -58,61 +85,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java
new file mode 100644
index 0000000000000..ef3692133a658
--- /dev/null
+++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResource.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.jackson;
+
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.quarkus.it.jackson.model.SampleResponse;
+
+@Path("/json-naming/")
+public class ModelWithJsonNamingStrategyResource {
+
+    private final ObjectMapper objectMapper;
+
+    public ModelWithJsonNamingStrategyResource(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public String get() throws IOException {
+        return objectMapper.writeValueAsString(new SampleResponse("My blog post"));
+    }
+}
diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/RegisteredPojoModel.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/RegisteredPojoModel.java
index 4e92989ee387d..0dc6fa3d676c4 100644
--- a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/RegisteredPojoModel.java
+++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/RegisteredPojoModel.java
@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.arc.Arc;
@@ -11,6 +13,7 @@
  * Simple POJO model class.
  */
 @RegisterForReflection
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id")
 public class RegisteredPojoModel {
 
     // -------------------------------------------------------------------------
@@ -21,6 +24,9 @@ public class RegisteredPojoModel {
     private String id = null;
     private String value = null;
 
+    private RegisteredPojoModel parent;
+    private RegisteredPojoModel child;
+
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -72,6 +78,22 @@ public void setValue(String value) {
         this.value = value;
     }
 
+    public RegisteredPojoModel getParent() {
+        return parent;
+    }
+
+    public void setParent(RegisteredPojoModel parent) {
+        this.parent = parent;
+    }
+
+    public RegisteredPojoModel getChild() {
+        return child;
+    }
+
+    public void setChild(RegisteredPojoModel child) {
+        this.child = child;
+    }
+
     // -------------------------------------------------------------------------
     // Private methods
     // -------------------------------------------------------------------------
diff --git a/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/SampleResponse.java b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/SampleResponse.java
new file mode 100644
index 0000000000000..5bc6a7cc4eeac
--- /dev/null
+++ b/integration-tests/jackson/src/main/java/io/quarkus/it/jackson/model/SampleResponse.java
@@ -0,0 +1,35 @@
+package io.quarkus.it.jackson.model;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@RegisterForReflection
+public class SampleResponse {
+
+    private String blogTitle;
+
+    public SampleResponse() {
+    }
+
+    public SampleResponse(String blogTitle) {
+        this.blogTitle = blogTitle;
+    }
+
+    public String getBlogTitle() {
+        return blogTitle;
+    }
+
+    public void setBlogTitle(String blogTitle) {
+        this.blogTitle = blogTitle;
+    }
+
+    @Override
+    public String toString() {
+        return "SampleResponse{" +
+                "blogTitle='" + blogTitle + '\'' +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResourceIT.java b/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResourceIT.java
new file mode 100644
index 0000000000000..9411062a9e385
--- /dev/null
+++ b/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResourceIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.jackson;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ModelWithJsonNamingStrategyResourceIT extends ModelWithJsonNamingStrategyResourceTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResourceTest.java b/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResourceTest.java
new file mode 100644
index 0000000000000..0eec2037f7cb1
--- /dev/null
+++ b/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/ModelWithJsonNamingStrategyResourceTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.jackson;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class ModelWithJsonNamingStrategyResourceTest {
+
+    @Test
+    public void testStrategy() throws IOException {
+        given()
+                .when().get("/json-naming/")
+                .then()
+                .statusCode(200)
+                .body(containsString("blog_title"));
+    }
+
+}
diff --git a/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/RegisteredPojoModelResourceTest.java b/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/RegisteredPojoModelResourceTest.java
index d8bd9cf79a01f..88f33683cc901 100644
--- a/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/RegisteredPojoModelResourceTest.java
+++ b/integration-tests/jackson/src/test/java/io/quarkus/it/jackson/RegisteredPojoModelResourceTest.java
@@ -16,19 +16,33 @@ public class RegisteredPojoModelResourceTest {
 
     @Test
     public void testSimplePojoModel() throws IOException {
-        RegisteredPojoModel model = new RegisteredPojoModel();
-        model.setId("123");
-        model.setVersion(3);
-        model.setValue("some");
+        RegisteredPojoModel parent = new RegisteredPojoModel();
+        parent.setId("123");
+        parent.setVersion(3);
+        parent.setValue("some");
+
+        RegisteredPojoModel child = new RegisteredPojoModel();
+        child.setId("234");
+        child.setVersion(1);
+        child.setValue("value");
+
+        parent.setChild(child);
+        child.setParent(parent);
 
         given()
                 .contentType("application/json")
-                .body(model.toJson(getObjectMapperForTest()))
+                .body(parent.toJson(getObjectMapperForTest()))
                 .when().post("/registeredpojomodel")
                 .then()
                 .statusCode(201)
                 .body("id", equalTo("123"))
                 .body("version", equalTo(3))
-                .body("value", equalTo("some"));
+                .body("value", equalTo("some"))
+                .body("parent", equalTo(null))
+                .body("child.id", equalTo("234"))
+                .body("child.version", equalTo(1))
+                .body("child.value", equalTo("value"))
+                .body("child.parent", equalTo("123"))
+                .body("child.child", equalTo(null));
     }
 }
diff --git a/integration-tests/jaxp/pom.xml b/integration-tests/jaxp/pom.xml
new file mode 100644
index 0000000000000..360e4760f95d6
--- /dev/null
+++ b/integration-tests/jaxp/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-jaxp</artifactId>
+    <name>Quarkus - Integration Tests - JAXP</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxp</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jaxp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java b/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java
new file mode 100644
index 0000000000000..d6fe51caf9720
--- /dev/null
+++ b/integration-tests/jaxp/src/main/java/io/quarkus/it/jaxp/JaxpResource.java
@@ -0,0 +1,70 @@
+package io.quarkus.it.jaxp;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+@Path("/jaxp")
+@ApplicationScoped
+public class JaxpResource {
+
+    @Path("/dom-builder")
+    @POST
+    @Consumes(MediaType.TEXT_XML)
+    @Produces(MediaType.TEXT_PLAIN)
+    public String domBuilder(InputStream in) throws SAXException, IOException, ParserConfigurationException {
+        final DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        final Document doc = dBuilder.parse(in);
+        return doc.getDocumentElement().getTextContent();
+    }
+
+    @Path("/transformer")
+    @POST
+    @Consumes(MediaType.TEXT_XML)
+    @Produces(MediaType.TEXT_PLAIN)
+    public String transformer(InputStream in) throws TransformerException {
+        final Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        final DOMResult result = new DOMResult();
+        transformer.transform(new StreamSource(in), result);
+        final Document doc = (Document) result.getNode();
+        return doc.getDocumentElement().getTextContent();
+    }
+
+    @Path("/xpath")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String xpath(@QueryParam("input") String input, @QueryParam("xpath") String xPathExpression)
+            throws XPathExpressionException {
+        final XPath xPath = XPathFactory.newInstance().newXPath();
+        InputSource in = new InputSource(new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8)));
+        final String result = (String) xPath.evaluate(xPathExpression, in, XPathConstants.STRING);
+        return result;
+    }
+
+}
diff --git a/integration-tests/jaxp/src/test/java/io/quarkus/it/jaxp/JaxpIT.java b/integration-tests/jaxp/src/test/java/io/quarkus/it/jaxp/JaxpIT.java
new file mode 100644
index 0000000000000..eaae1d04d54db
--- /dev/null
+++ b/integration-tests/jaxp/src/test/java/io/quarkus/it/jaxp/JaxpIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.jaxp;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class JaxpIT extends JaxpTest {
+
+}
diff --git a/integration-tests/jaxp/src/test/java/io/quarkus/it/jaxp/JaxpTest.java b/integration-tests/jaxp/src/test/java/io/quarkus/it/jaxp/JaxpTest.java
new file mode 100644
index 0000000000000..eaf652c0eca7d
--- /dev/null
+++ b/integration-tests/jaxp/src/test/java/io/quarkus/it/jaxp/JaxpTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.it.jaxp;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class JaxpTest {
+
+    @Test
+    public void domBuilder() {
+        RestAssured.given()
+                .contentType("text/xml")
+                .body("<foo>bar</foo>")
+                .post("/jaxp/dom-builder")
+                .then()
+                .statusCode(200)
+                .body(is("bar"));
+
+    }
+
+    @Test
+    public void transformer() {
+        RestAssured.given()
+                .contentType("text/xml")
+                .body("<foo>bar</foo>")
+                .post("/jaxp/transformer")
+                .then()
+                .statusCode(200)
+                .body(is("bar"));
+
+    }
+
+    @Test
+    public void xPath() {
+        RestAssured.given()
+                .contentType("text/xml")
+                .param("input", "<foo><bar>baz</bar></foo>")
+                .param("xpath", "/foo/bar/text()")
+                .get("/jaxp/xpath")
+                .then()
+                .statusCode(200)
+                .body(is("baz"));
+
+    }
+}
diff --git a/integration-tests/jgit/pom.xml b/integration-tests/jgit/pom.xml
index 497974fcbc769..4f62fd643da62 100644
--- a/integration-tests/jgit/pom.xml
+++ b/integration-tests/jgit/pom.xml
@@ -6,16 +6,11 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-integration-test-jgit</artifactId>
     <name>Quarkus - Integration Tests - JGit</name>
     <description>JGit integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -61,6 +56,34 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jgit-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -79,61 +102,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/jpa-db2/README.md b/integration-tests/jpa-db2/README.md
index 0f9ae1f5799db..1a0cb9ed4cf14 100644
--- a/integration-tests/jpa-db2/README.md
+++ b/integration-tests/jpa-db2/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with DB2 started as a Docker container, you can run the following command:
 
 ```
-mvn verify -Dtest-db2 -Ddocker
+mvn verify -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn verify -Dtest-db2 -Ddocker -Dnative
+mvn verify -Dtest-containers -Dstart-containers -Dnative
 ```
 
 ## To manually run an equivalent DB2 container instead of through Testcontainers, do the following:
@@ -30,11 +30,11 @@ docker run \
   -e LICENSE=accept \
   -p 50000:50000 \
   --privileged \
-  ibmcom/db2:11.5.0.0a
+  ibmcom/db2:11.5.5.0
 ```
 
 2. Run the test, specifying the JDBC URL for the container you started in the previous step
 
 ```
-mvn verify -Dtest-db2 -Djdbc-db2.url=jdbc:db2://localhost:50000/hreact
+mvn verify -Dtest-containers -Djdbc-db2.url=jdbc:db2://localhost:50000/hreact
 ```
diff --git a/integration-tests/jpa-db2/pom.xml b/integration-tests/jpa-db2/pom.xml
index bf3d4a8ea33fe..909edd6185256 100644
--- a/integration-tests/jpa-db2/pom.xml
+++ b/integration-tests/jpa-db2/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +15,7 @@
     
     <properties>
         <jdbc-db2.url>jdbc:db2://localhost:50000/hreact</jdbc-db2.url>
-        <db2.image>ibmcom/db2:11.5.0.0a</db2.image>
+        <db2.image>ibmcom/db2:11.5.5.0</db2.image>
     </properties>
     
     <dependencies>
@@ -43,6 +42,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-db2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -84,7 +124,7 @@
             <id>test-db2</id>
             <activation>
                 <property>
-                    <name>test-db2</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -105,67 +145,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-db2</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -197,6 +181,7 @@
                                         	<!-- These help the DB2 container start faster -->
                                         	<AUTOCONFIG>false</AUTOCONFIG>
                                         	<ARCHIVE_LOGS>false</ARCHIVE_LOGS>
+                                        	<PERSISTENT_HOME>false</PERSISTENT_HOME>
                                         </env>
                                         <log>
                                             <prefix>DB2:</prefix>
@@ -205,9 +190,13 @@
                                         </log>
                                         <wait>
                                             <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
-                                            <log>.*Setup has completed\..*</log>
-                                            <!-- Unfortunately booting DB2 is slow, needs to set a generous (10m) timeout: -->
-                                            <time>600000</time>
+                                            <log>.*INSTANCE.*</log>
+                                            <!-- Unfortunately booting DB2 is slow, needs to set a generous (15m) timeout;
+                                             it generally starts in 2-3 minutes, but it's been occasionally slightly above 10m -->
+                                            <time>900000</time>
+                                            <!-- Kill the container, if it doesn't stop before this given time
+                                             duration since a graceful stop was issued -->
+                                            <kill>300000</kill>
                                         </wait>
                                     </run>
                                 </image>
@@ -242,7 +231,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/jpa-db2/src/main/resources/META-INF/persistence.xml b/integration-tests/jpa-db2/src/main/resources/META-INF/persistence.xml
index 1d067ecc6ba8d..83ff5175016b1 100644
--- a/integration-tests/jpa-db2/src/main/resources/META-INF/persistence.xml
+++ b/integration-tests/jpa-db2/src/main/resources/META-INF/persistence.xml
@@ -9,6 +9,8 @@
         <description>Hibernate test case template Persistence Unit</description>
 
         <properties>
+            <property name="hibernate.archive.autodetection" value="class, hbm"/>
+
             <!-- Connection specific -->
             <property name="hibernate.dialect" value="org.hibernate.dialect.DB297Dialect"/>
             <!--
diff --git a/integration-tests/jpa-derby/pom.xml b/integration-tests/jpa-derby/pom.xml
index b25fc56d4ca91..6ca4aa3485261 100644
--- a/integration-tests/jpa-derby/pom.xml
+++ b/integration-tests/jpa-derby/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,6 +45,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-derby-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,63 +110,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/jpa-derby/src/main/resources/META-INF/persistence.xml b/integration-tests/jpa-derby/src/main/resources/META-INF/persistence.xml
index e68ef2777720e..21021f83b3991 100644
--- a/integration-tests/jpa-derby/src/main/resources/META-INF/persistence.xml
+++ b/integration-tests/jpa-derby/src/main/resources/META-INF/persistence.xml
@@ -7,6 +7,8 @@
     <persistence-unit name="templatePU" transaction-type="JTA">
 
         <properties>
+            <property name="hibernate.archive.autodetection" value="class, hbm"/>
+
             <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyTenSevenDialect"/>
             <property name="javax.persistence.schema-generation.database.action" value="create"/>
         </properties>
diff --git a/integration-tests/jpa-derby/src/main/resources/application.properties b/integration-tests/jpa-derby/src/main/resources/application.properties
index fbef81e6f882a..237af8a51e57d 100644
--- a/integration-tests/jpa-derby/src/main/resources/application.properties
+++ b/integration-tests/jpa-derby/src/main/resources/application.properties
@@ -1,4 +1,3 @@
 quarkus.datasource.db-kind=derby
 quarkus.datasource.jdbc.url=jdbc:derby://localhost:1527/memory:testDB;create=true
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
\ No newline at end of file
diff --git a/integration-tests/jpa-h2/pom.xml b/integration-tests/jpa-h2/pom.xml
index 3c04f956ccf3b..bf33e59ae02cc 100644
--- a/integration-tests/jpa-h2/pom.xml
+++ b/integration-tests/jpa-h2/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,6 +45,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -70,63 +110,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java
new file mode 100644
index 0000000000000..684626b7f593e
--- /dev/null
+++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/AbstractGenericMappedSuperType.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.jpa.h2.generics;
+
+import javax.persistence.Basic;
+import javax.persistence.Lob;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class AbstractGenericMappedSuperType<T> {
+
+    @Basic
+    @Lob
+    private T whateverType;
+
+}
diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java
new file mode 100644
index 0000000000000..6dd5554e17324
--- /dev/null
+++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/IntermediateAbstractMapped.java
@@ -0,0 +1,52 @@
+package io.quarkus.it.jpa.h2.generics;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+@IdClass(IntermediateAbstractMapped.PK.class)
+public abstract class IntermediateAbstractMapped<T> extends AbstractGenericMappedSuperType<T> {
+
+    @Id
+    private String keyOne;
+    @Id
+    private String keyTwo;
+    @Id
+    private String keyThree;
+
+    @SuppressWarnings("UnusedDeclaration")
+    public static final class PK implements Serializable {
+
+        private String keyOne;
+        private String keyTwo;
+        private String keyThree;
+
+        public PK() {
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            PK pk = (PK) o;
+            return Objects.equals(keyOne, pk.keyOne) &&
+                    Objects.equals(keyTwo, pk.keyTwo) &&
+                    Objects.equals(keyThree, pk.keyThree);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(keyOne, keyTwo, keyThree);
+        }
+
+    }
+
+}
diff --git a/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java
new file mode 100644
index 0000000000000..ea7f540582697
--- /dev/null
+++ b/integration-tests/jpa-h2/src/main/java/io/quarkus/it/jpa/h2/generics/SnapshotEventEntry.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.jpa.h2.generics;
+
+import javax.persistence.Entity;
+
+/**
+ * This strange mapping is useful to verify that Hibernate ORM can
+ * actually boot, which implies to successfully narrow down the T
+ * generics of the two superclass types.
+ * See also HHH-14499 for details; the reason this directly impacts
+ * Quarkus is that the issue can be triggered by enlisting the
+ * parent classes (mapped with MappedSuperclass) among the discovered
+ * entities - which is not necessary and actually triggers the problem.
+ * So this is a regression test to check that Quarkus is NOT passing
+ * such abstract types as mapped entities to the ORM bootstrap.
+ * No actual test is necessary: Hibernate ORM will fail to boot
+ * (likely but not guaranteed as this is dependent on the order
+ * of entity discovery) simply because these entities exist on the
+ * same classpath.
+ */
+@Entity
+public class SnapshotEventEntry extends IntermediateAbstractMapped<byte[]> {
+
+}
diff --git a/integration-tests/jpa-h2/src/main/resources/META-INF/persistence.xml b/integration-tests/jpa-h2/src/main/resources/META-INF/persistence.xml
index d461e439e3175..d4a99198d72b4 100644
--- a/integration-tests/jpa-h2/src/main/resources/META-INF/persistence.xml
+++ b/integration-tests/jpa-h2/src/main/resources/META-INF/persistence.xml
@@ -7,6 +7,8 @@
     <persistence-unit name="templatePU" transaction-type="JTA">
 
         <properties>
+            <property name="hibernate.archive.autodetection" value="class, hbm"/>
+
             <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
             <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
         </properties>
diff --git a/integration-tests/jpa-h2/src/main/resources/application.properties b/integration-tests/jpa-h2/src/main/resources/application.properties
index 809287cb41b61..bf4226d2762fd 100644
--- a/integration-tests/jpa-h2/src/main/resources/application.properties
+++ b/integration-tests/jpa-h2/src/main/resources/application.properties
@@ -1,4 +1 @@
-quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
\ No newline at end of file
diff --git a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TestResources.java b/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TestResources.java
deleted file mode 100644
index cab3615f001d3..0000000000000
--- a/integration-tests/jpa-h2/src/test/java/io/quarkus/it/jpa/h2/TestResources.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.it.jpa.h2;
-
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.h2.H2DatabaseTestResource;
-
-@QuarkusTestResource(H2DatabaseTestResource.class)
-public class TestResources {
-}
diff --git a/integration-tests/jpa-mariadb/README.md b/integration-tests/jpa-mariadb/README.md
index f6f1084468d00..8b3905e6542e6 100644
--- a/integration-tests/jpa-mariadb/README.md
+++ b/integration-tests/jpa-mariadb/README.md
@@ -7,16 +7,16 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with MariaDB started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-mariadb -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Please note that waiting on the availability of MariaDB port does not work on macOS.
-This module does not work with `-Ddocker` option on this operating system.
+This module does not work with `-Dstart-containers` option on this operating system.
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-mariadb -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run MariaDB as a Docker container, you can start your own MariaDB server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`.
@@ -24,7 +24,7 @@ If you don't want to run MariaDB as a Docker container, you can start your own M
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-mariadb
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dmariadb.url=jdbc:mariadb://...`.
@@ -46,5 +46,5 @@ N.B. it takes a while for MariaDB to be actually booted and accepting connection
 After it's fully booted, you can run all integration tests via
 
 ```
-mvn clean install -Dtest-mariadb -Dnative
+mvn clean install -Dtest-containers -Dnative
 ```
diff --git a/integration-tests/jpa-mariadb/pom.xml b/integration-tests/jpa-mariadb/pom.xml
index 3a9be7f4bc22c..c882e3c4e5323 100644
--- a/integration-tests/jpa-mariadb/pom.xml
+++ b/integration-tests/jpa-mariadb/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,6 +43,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mariadb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,7 +125,7 @@
             <id>test-mariadb</id>
             <activation>
                 <property>
-                    <name>test-mariadb</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -106,69 +146,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-mariadb</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -248,7 +230,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/jpa-mariadb/src/main/resources/application.properties b/integration-tests/jpa-mariadb/src/main/resources/application.properties
index bbb006e25ef3c..05d96600bb238 100644
--- a/integration-tests/jpa-mariadb/src/main/resources/application.properties
+++ b/integration-tests/jpa-mariadb/src/main/resources/application.properties
@@ -3,4 +3,3 @@ quarkus.datasource.username=hibernate_orm_test
 quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${mariadb.url}
 quarkus.datasource.jdbc.max-size=1
-quarkus.datasource.jdbc.min-size=1
\ No newline at end of file
diff --git a/integration-tests/jpa-mssql/README.md b/integration-tests/jpa-mssql/README.md
index 52e8e9e34d495..9322c7ed97091 100644
--- a/integration-tests/jpa-mssql/README.md
+++ b/integration-tests/jpa-mssql/README.md
@@ -7,19 +7,27 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with SQL Server started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Ddocker -Dtest-mssql
+mvn clean install -Dstart-containers -Dtest-containers
 ```
 
 To also test as a native image, add `-Dnative`:
 
 ```
-mvn clean install -Ddocker -Dtest-mssql -Dnative
+mvn clean install -Dstart-containers -Dtest-containers -Dnative
 ```
 
 Alternatively you can connect to your own SQL Server.
 Reconfigure the connection URL with `-Dmssqldb.url=jdbc:sqlserver://...`;
 you'll probably want to change the authentication password too: `-Dmssqldb.sa-password=NotS0Secret`.
 
+### With Podman
+
+If you prefer to run the MSSQL Server container via podman, use:
+
+```
+podman run --rm=true --net=host --memory-swappiness=0 --name mssql_testing -e SA_PASSWORD=ActuallyRequired11Complexity -e ACCEPT_EULA=Y -p 1433:1433 mcr.microsoft.com/mssql/2019-CU8-ubuntu-16.04
+```
+
 ## Limitations
 
 ### Active Directory
diff --git a/integration-tests/jpa-mssql/pom.xml b/integration-tests/jpa-mssql/pom.xml
index 120757a048e79..997c593f8b3b5 100644
--- a/integration-tests/jpa-mssql/pom.xml
+++ b/integration-tests/jpa-mssql/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +16,7 @@
     <properties>
         <mssqldb.url>jdbc:sqlserver://localhost:1433;databaseName=tempdb</mssqldb.url>
         <mssqldb.sa-password>ActuallyRequired11Complexity</mssqldb.sa-password>
-        <mssqldb.image>microsoft/mssql-server-linux:2017-CU13</mssqldb.image>
+        <mssqldb.image>mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04</mssqldb.image>
     </properties>
 
     <dependencies>
@@ -48,6 +47,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mssql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,7 +129,7 @@
             <id>test-mssql</id>
             <activation>
                 <property>
-                    <name>test-mssql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -117,66 +157,22 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <!--
-                                     Enabling addAllCharsets is highly recommended when connecting to MSSQL as it doesn't support UTF-8.
-                                     FIXME Should we introduce a feature to auto-enable or at least check for the expected Charsets
-                                     to be included?
-                                     -->
-                                    <addAllCharsets>true</addAllCharsets>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <!--
+                 Enabling addAllCharsets is highly recommended when connecting to MSSQL as it doesn't support UTF-8.
+                 FIXME Should we introduce a feature to auto-enable or at least check for the expected Charsets
+                 to be included?
+                 -->
+                <quarkus.native.add-all-charsets>true</quarkus.native.add-all-charsets>
+            </properties>
         </profile>
 
         <profile>
             <id>docker-mssql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -245,7 +241,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/jpa-mssql/src/main/resources/application.properties b/integration-tests/jpa-mssql/src/main/resources/application.properties
index 3e99564e952be..26899798e7fe2 100644
--- a/integration-tests/jpa-mssql/src/main/resources/application.properties
+++ b/integration-tests/jpa-mssql/src/main/resources/application.properties
@@ -3,6 +3,5 @@ quarkus.datasource.username=sa
 quarkus.datasource.password=${mssqldb.sa-password}
 quarkus.datasource.jdbc.url=${mssqldb.url}
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.SQLServer2012Dialect
 quarkus.hibernate-orm.database.generation=create
diff --git a/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTest.java b/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTest.java
index 9da35bca14278..0e8f4edb440bf 100644
--- a/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTest.java
+++ b/integration-tests/jpa-mssql/src/test/java/io/quarkus/it/jpa/mssql/JPAFunctionalityTest.java
@@ -9,9 +9,7 @@
 
 /**
  * Test connecting Hibernate ORM to MS SQL.
- * Can quickly start a matching database with:
- * sudo docker run --ulimit memlock=-1:-1 -it --rm=true --net=host --memory-swappiness=0 -e 'ACCEPT_EULA=Y' -e
- * 'SA_PASSWORD=ActuallyRequired11Complexity' -p 1433:1433 --name quarkus_test_mssql -d microsoft/mssql-server-linux:2017-CU13
+ * See the README.md for reminders about how to quickly start a Docker container running MS SQL Server.
  */
 @QuarkusTest
 public class JPAFunctionalityTest {
diff --git a/integration-tests/jpa-mysql/README.md b/integration-tests/jpa-mysql/README.md
index 9db3ed59eefa8..6188ed2d21086 100644
--- a/integration-tests/jpa-mysql/README.md
+++ b/integration-tests/jpa-mysql/README.md
@@ -7,16 +7,16 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with MySQL started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-mysql -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Please note that waiting on the availability of MySQL port does not work on macOS.
-This module does not work with `-Ddocker` option on this operating system.
+This module does not work with `-Dstart-containers` option on this operating system.
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-mysql -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run MySQL as a Docker container, you can start your own MySQLDB server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`.
@@ -24,7 +24,7 @@ If you don't want to run MySQL as a Docker container, you can start your own MyS
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-mysql
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dmysql.url=jdbc:mysql://...`.
@@ -32,7 +32,19 @@ If you have specific requirements, you can define a specific connection URL with
 To run the MySQL server "manually" via command line for testing, the following command line could be useful:
 
 ```
-docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test_mysql -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -e MYSQL_RANDOM_ROOT_PASSWORD=true -p 3306:3306 mysql:8.0.17
+docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test_mysql -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -e MYSQL_RANDOM_ROOT_PASSWORD=true -p 3306:3306 mysql:8.0.22
+```
+
+Alternatively to docker, with podman:
+
+```
+podman run -it --rm=true --name quarkus_test_mysql -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -e MYSQL_RANDOM_ROOT_PASSWORD=true -p 3306:3306 mysql:8.0.22
+```
+
+To connect with a CLI client and inspect the database content:
+
+```
+mysql -h localhost -u hibernate_orm_test -phibernate_orm_test hibernate_orm_test --protocol tcp
 ```
 
 N.B. it takes a while for MySQL to be actually booted and accepting connections.
@@ -40,5 +52,5 @@ N.B. it takes a while for MySQL to be actually booted and accepting connections.
 After it's fully booted, you can run all integration tests via
 
 ```
-mvn clean install -Dtest-mysql -Dnative
+mvn clean install -Dtest-containers -Dnative
 ```
diff --git a/integration-tests/jpa-mysql/pom.xml b/integration-tests/jpa-mysql/pom.xml
index 760a47aa0babc..df9c4b347a3ad 100644
--- a/integration-tests/jpa-mysql/pom.xml
+++ b/integration-tests/jpa-mysql/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,8 +14,8 @@
     <description>Module that contains JPA related tests running with the MySQL database</description>
 
     <properties>
-        <mysql.url>jdbc:mysql://localhost:3306/hibernate_orm_test</mysql.url>
-        <mysql.image>mysql:8.0.17</mysql.image>
+        <mysql.url>jdbc:mysql://localhost:3306/hibernate_orm_test?allowPublicKeyRetrieval=true</mysql.url>
+        <mysql.image>mysql:8.0.22</mysql.image>
     </properties>
 
     <dependencies>
@@ -44,6 +43,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-mysql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,7 +125,7 @@
             <id>test-mysql</id>
             <activation>
                 <property>
-                    <name>test-mysql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -106,73 +146,15 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-mysql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
-                <mysql.url>jdbc:mysql://localhost:3306/hibernate_orm_test</mysql.url>
+                <mysql.url>jdbc:mysql://localhost:3306/hibernate_orm_test?allowPublicKeyRetrieval=true</mysql.url>
             </properties>
             <build>
                 <plugins>
@@ -245,7 +227,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java
new file mode 100644
index 0000000000000..c2b333c1731b9
--- /dev/null
+++ b/integration-tests/jpa-mysql/src/main/java/io/quarkus/it/jpa/mysql/XaConnectionsEndpoint.java
@@ -0,0 +1,48 @@
+package io.quarkus.it.jpa.mysql;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.inject.Inject;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.AgroalConnectionFactoryConfiguration;
+import io.quarkus.agroal.DataSource;
+
+@WebServlet(name = "XaConnectionEndpoint", urlPatterns = "/jpa-mysql/testxaconnection")
+public class XaConnectionsEndpoint extends HttpServlet {
+
+    @Inject
+    @DataSource("samebutxa")
+    AgroalDataSource xaDatasource;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+
+        // Test 1#
+        // Verify that the connection can be obtained
+        try (Connection connection = xaDatasource.getConnection()) {
+            //The main goal is to check that the connection could be opened
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+
+        // Test 2#
+        // Check it's of the expected configuration
+        AgroalConnectionFactoryConfiguration cfg = xaDatasource.getConfiguration().connectionPoolConfiguration()
+                .connectionFactoryConfiguration();
+        Class<?> connectionProviderClass = cfg.connectionProviderClass();
+        if (connectionProviderClass.equals(com.mysql.cj.jdbc.MysqlXADataSource.class)) {
+            resp.getWriter().write("OK");
+        } else {
+            resp.getWriter().write("Unexpected Driver class: " + connectionProviderClass.getName());
+        }
+
+    }
+
+}
diff --git a/integration-tests/jpa-mysql/src/main/resources/application.properties b/integration-tests/jpa-mysql/src/main/resources/application.properties
index 646e8eadef25a..49d4f9d270e17 100644
--- a/integration-tests/jpa-mysql/src/main/resources/application.properties
+++ b/integration-tests/jpa-mysql/src/main/resources/application.properties
@@ -2,5 +2,12 @@ quarkus.datasource.db-kind=mysql
 quarkus.datasource.username=hibernate_orm_test
 quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${mysql.url}
-quarkus.datasource.max-size=1
-quarkus.datasource.min-size=1
\ No newline at end of file
+quarkus.datasource.jdbc.max-size=1
+quarkus.datasource.jdbc.transactions=enabled
+
+quarkus.datasource.samebutxa.db-kind=mysql
+quarkus.datasource.samebutxa.username=hibernate_orm_test
+quarkus.datasource.samebutxa.password=hibernate_orm_test
+quarkus.datasource.samebutxa.jdbc.url=${mysql.url}
+quarkus.datasource.samebutxa.jdbc.max-size=1
+quarkus.datasource.samebutxa.jdbc.transactions=xa
diff --git a/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/XaConnectionInGraalITCase.java b/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/XaConnectionInGraalITCase.java
new file mode 100644
index 0000000000000..7e7308af13eaf
--- /dev/null
+++ b/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/XaConnectionInGraalITCase.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.jpa.mysql;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class XaConnectionInGraalITCase extends XaConnectionTest {
+
+}
diff --git a/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/XaConnectionTest.java b/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/XaConnectionTest.java
new file mode 100644
index 0000000000000..8ef56bb9c710c
--- /dev/null
+++ b/integration-tests/jpa-mysql/src/test/java/io/quarkus/it/jpa/mysql/XaConnectionTest.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.jpa.mysql;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class XaConnectionTest {
+
+    @Test
+    public void testJPAFunctionalityFromServlet() throws Exception {
+        RestAssured.when().get("/jpa-mysql/testxaconnection").then().body(is("OK"));
+    }
+
+}
diff --git a/integration-tests/jpa-postgresql/README.md b/integration-tests/jpa-postgresql/README.md
index 7bda824a011e3..9ebd2900d52fe 100644
--- a/integration-tests/jpa-postgresql/README.md
+++ b/integration-tests/jpa-postgresql/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with PostgreSQL started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-postgresql -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-postgresql -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run PostgreSQL as a Docker container, you can start your own PostgreSQL server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`.
@@ -21,7 +21,7 @@ If you don't want to run PostgreSQL as a Docker container, you can start your ow
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-postgresql
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dpostgres.url=jdbc:postgresql://...`.
diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml
index 126f8294b46ae..76b8faeb314f9 100644
--- a/integration-tests/jpa-postgresql/pom.xml
+++ b/integration-tests/jpa-postgresql/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +14,7 @@
     <description>Module that contains JPA related tests running with the PostgreSQL database</description>
 
     <properties>
-        <postgres.image>postgres:10.5</postgres.image>
+        <postgres.image>postgres:13.1</postgres.image>
     </properties>
 
     <dependencies>
@@ -43,6 +42,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -84,7 +124,7 @@
             <id>test-postgresql</id>
             <activation>
                 <property>
-                    <name>test-postgresql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -105,68 +145,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-postgresql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -203,7 +186,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all postgres:10.5 images currently running, not just those we just started.
+                            <!--Stops all postgres images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>
@@ -236,7 +219,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
index b9a0863afba79..e2f391b29a036 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
@@ -5,10 +5,10 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceUnit;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -24,7 +24,7 @@
 @WebServlet(name = "JPATestBootstrapEndpoint", urlPatterns = "/jpa/testfunctionality")
 public class JPAFunctionalityTestEndpoint extends HttpServlet {
 
-    @PersistenceUnit(unitName = "templatePU")
+    @Inject
     EntityManagerFactory entityManagerFactory;
 
     @Override
@@ -99,7 +99,7 @@ private static void deleteAllPerson(final EntityManagerFactory emf) {
         EntityManager em = emf.createEntityManager();
         EntityTransaction transaction = em.getTransaction();
         transaction.begin();
-        em.createNativeQuery("Delete from Person").executeUpdate();
+        em.createNativeQuery("Delete from myschema.Person").executeUpdate();
         transaction.commit();
         em.close();
     }
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
index d49feae82c3c9..9d98e4201621c 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
@@ -8,8 +8,10 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 
 @Entity
+@Table(schema = "myschema")
 @NamedQuery(name = "get_person_by_name", query = "select p from Person p where name = :name")
 public class Person {
 
diff --git a/integration-tests/jpa-postgresql/src/main/resources/META-INF/persistence.xml b/integration-tests/jpa-postgresql/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 38e6919e6b701..0000000000000
--- a/integration-tests/jpa-postgresql/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
-             http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
-             version="2.1">
-
-    <persistence-unit name="templatePU" transaction-type="JTA">
-
-        <description>Hibernate test case template Persistence Unit</description>
-
-        <properties>
-            <!-- intentionally using worse case so that we can optimise for this -->
-            <property name="hibernate.archive.autodetection" value="class, hbm"/>
-
-            <!-- Connection specific -->
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL95Dialect"/>
-            <!--
-            Disabled as the Agroal Datasource is injected:
-            <property name="hibernate.connection.url" value="${postgres.url}"/>
-            <property name="hibernate.connection.username" value="hibernate_orm_test"/>
-            <property name="hibernate.connection.password" value="hibernate_orm_test"/>
-            <property name="hibernate.connection.pool_size" value="2"/>
-            -->
-
-            <!-- Tuning and debugging -->
-            <property name="hibernate.show_sql" value="false"/>
-            <property name="hibernate.format_sql" value="false"/>
-
-            <!--
-                Optimistically create the tables;
-                will cause background errors being logged if they already exist,
-                but is practical to retain existing data across runs (or create as needed) -->
-            <!-- drop-and-create create-only -->
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-
-            <property name="javax.persistence.validation.mode" value="NONE"/>
-        </properties>
-
-    </persistence-unit>
-</persistence>
diff --git a/integration-tests/jpa-postgresql/src/main/resources/application.properties b/integration-tests/jpa-postgresql/src/main/resources/application.properties
index b6b719a20ec93..59bf46a494b07 100644
--- a/integration-tests/jpa-postgresql/src/main/resources/application.properties
+++ b/integration-tests/jpa-postgresql/src/main/resources/application.properties
@@ -1,6 +1,7 @@
-quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=hibernate_orm_test
 quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${postgres.url}
-quarkus.datasource.max-size=8
-quarkus.datasource.min-size=2
\ No newline at end of file
+quarkus.datasource.jdbc.max-size=8
+
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.database.generation.create-schemas=true
\ No newline at end of file
diff --git a/integration-tests/jpa-without-entity/pom.xml b/integration-tests/jpa-without-entity/pom.xml
index a5fed95e6f0ec..62c55dd022986 100644
--- a/integration-tests/jpa-without-entity/pom.xml
+++ b/integration-tests/jpa-without-entity/pom.xml
@@ -45,6 +45,60 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jsonb</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -63,64 +117,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 
 </project>
diff --git a/integration-tests/jpa-without-entity/src/main/resources/application.properties b/integration-tests/jpa-without-entity/src/main/resources/application.properties
new file mode 100644
index 0000000000000..ebf02d7ca5259
--- /dev/null
+++ b/integration-tests/jpa-without-entity/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.datasource.devservices=false
diff --git a/integration-tests/jpa/pom.xml b/integration-tests/jpa/pom.xml
index 9207227201683..25e7369b80cde 100644
--- a/integration-tests/jpa/pom.xml
+++ b/integration-tests/jpa/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,6 +25,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -48,6 +52,47 @@
             <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,60 +117,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java
new file mode 100644
index 0000000000000..d3f8acf9a6f86
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterResource.java
@@ -0,0 +1,54 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.resteasy.annotations.jaxrs.QueryParam;
+
+@Path("/attribute-converter")
+@ApplicationScoped
+public class AttributeConverterResource {
+
+    @Inject
+    EntityManager em;
+
+    @GET
+    @Path("/with-cdi")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public String withCdi(@QueryParam String theData) {
+        EntityWithAttributeConverters entity = new EntityWithAttributeConverters();
+        entity.setMyDataRequiringCDI(new MyDataRequiringCDI(theData));
+        em.persist(entity);
+
+        em.flush();
+        em.clear();
+
+        // This can only return `theData` if Hibernate ORM correctly instantiates MyDataConverter through CDI
+        // so that MyDataConversionService is injected.
+        return em.find(EntityWithAttributeConverters.class, entity.getId()).getMyDataRequiringCDI().getContent();
+    }
+
+    @GET
+    @Path("/without-cdi")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public String withoutCdi(@QueryParam String theData) {
+        EntityWithAttributeConverters entity = new EntityWithAttributeConverters();
+        entity.setMyDataNotRequiringCDI(new MyDataNotRequiringCDI(theData));
+        em.persist(entity);
+
+        em.flush();
+        em.clear();
+
+        // This can only return `theData` if Hibernate ORM correctly instantiates MyDataConverter through CDI
+        // so that MyDataConversionService is injected.
+        return em.find(EntityWithAttributeConverters.class, entity.getId()).getMyDataNotRequiringCDI().getContent();
+    }
+}
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java
new file mode 100644
index 0000000000000..9261d9b662105
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/EntityWithAttributeConverters.java
@@ -0,0 +1,43 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class EntityWithAttributeConverters {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Convert(converter = MyDataRequiringCDIConverter.class)
+    private MyDataRequiringCDI myDataRequiringCDI;
+
+    @Convert(converter = MyDataNotRequiringCDIConverter.class)
+    private MyDataNotRequiringCDI myDataNotRequiringCDI;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public MyDataRequiringCDI getMyDataRequiringCDI() {
+        return myDataRequiringCDI;
+    }
+
+    public void setMyDataRequiringCDI(MyDataRequiringCDI myDataRequiringCDI) {
+        this.myDataRequiringCDI = myDataRequiringCDI;
+    }
+
+    public MyDataNotRequiringCDI getMyDataNotRequiringCDI() {
+        return myDataNotRequiringCDI;
+    }
+
+    public void setMyDataNotRequiringCDI(MyDataNotRequiringCDI myDataNotRequiringCDI) {
+        this.myDataNotRequiringCDI = myDataNotRequiringCDI;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java
new file mode 100644
index 0000000000000..e1aadac6e2762
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyCdiContext.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class MyCdiContext {
+
+    public static void checkAvailable(MyCdiContext injected) {
+        assertThat(injected)
+                .as("CDI context should be available")
+                .isNotNull()
+                .returns(true, MyCdiContext::worksProperly);
+    }
+
+    public static void checkNotAvailable(MyCdiContext injected) {
+        assertThat(injected)
+                .as("CDI context should not be available")
+                .isNull();
+    }
+
+    public boolean worksProperly() {
+        return true;
+    }
+}
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDI.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDI.java
new file mode 100644
index 0000000000000..f65ae9601ace8
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDI.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+public final class MyDataNotRequiringCDI {
+    private final String content;
+
+    public MyDataNotRequiringCDI(String content) {
+        this.content = content;
+    }
+
+    public String getContent() {
+        return content;
+    }
+}
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java
new file mode 100644
index 0000000000000..49d88e5376fde
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataNotRequiringCDIConverter.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import javax.inject.Inject;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+public class MyDataNotRequiringCDIConverter implements AttributeConverter<MyDataNotRequiringCDI, String> {
+    // This will always be null.
+    // It's only here to check that this class is instantiated without relying on CDI
+    // (because we want to test non-CDI attribute converters too).
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public String convertToDatabaseColumn(MyDataNotRequiringCDI attribute) {
+        MyCdiContext.checkNotAvailable(cdiContext);
+        return attribute == null ? null : attribute.getContent();
+    }
+
+    @Override
+    public MyDataNotRequiringCDI convertToEntityAttribute(String dbData) {
+        MyCdiContext.checkNotAvailable(cdiContext);
+        return dbData == null ? null : new MyDataNotRequiringCDI(dbData);
+    }
+}
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDI.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDI.java
new file mode 100644
index 0000000000000..40a5b55be510b
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDI.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+public final class MyDataRequiringCDI {
+    private final String content;
+
+    public MyDataRequiringCDI(String content) {
+        this.content = content;
+    }
+
+    public String getContent() {
+        return content;
+    }
+}
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java
new file mode 100644
index 0000000000000..59686baf68215
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/attributeconverter/MyDataRequiringCDIConverter.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+@ApplicationScoped
+public class MyDataRequiringCDIConverter implements AttributeConverter<MyDataRequiringCDI, String> {
+    @Inject
+    MyCdiContext cdiContext;
+
+    @Override
+    public String convertToDatabaseColumn(MyDataRequiringCDI attribute) {
+        MyCdiContext.checkAvailable(cdiContext);
+        return attribute == null ? null : attribute.getContent();
+    }
+
+    @Override
+    public MyDataRequiringCDI convertToEntityAttribute(String dbData) {
+        MyCdiContext.checkAvailable(cdiContext);
+        return dbData == null ? null : new MyDataRequiringCDI(dbData);
+    }
+}
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java
new file mode 100644
index 0000000000000..6426d90e3552f
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/EntityWithSequenceIdentityId.java
@@ -0,0 +1,33 @@
+package io.quarkus.it.jpa.jdbcmetadata;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.GenericGenerator;
+
+@Entity
+@GenericGenerator(name = "my-identity-generator", strategy = "sequence-identity", parameters = @org.hibernate.annotations.Parameter(name = "sequence", value = "MY_ID_SEQ"))
+public class EntityWithSequenceIdentityId {
+    @Id
+    @GeneratedValue(generator = "my-identity-generator")
+    private Long id;
+
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java
new file mode 100644
index 0000000000000..533c99cb10395
--- /dev/null
+++ b/integration-tests/jpa/src/main/java/io/quarkus/it/jpa/jdbcmetadata/JdbcMetadataRetrievalResource.java
@@ -0,0 +1,37 @@
+package io.quarkus.it.jpa.jdbcmetadata;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/jdbc-metadata-retrieval")
+@ApplicationScoped
+public class JdbcMetadataRetrievalResource {
+
+    @Inject
+    EntityManager em;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public String test() {
+        EntityWithSequenceIdentityId entity = new EntityWithSequenceIdentityId();
+        entity.setName("thePersistedName");
+
+        // This cannot work unless Hibernate ORM correct detects that the JDBC driver/database
+        // support getting generated keys after an insert,
+        // which requires Hibernate ORM to retrieve JDBC metadata at runtime init.
+        // If Hibernate ORM doesn't retrieve this metadata,
+        // it will assume getting generated keys is not possible and throw an exception upon insert.
+        em.persist(entity);
+
+        em.clear();
+
+        return em.find(EntityWithSequenceIdentityId.class, entity.getId()).getName();
+    }
+}
diff --git a/integration-tests/jpa/src/main/resources/application.properties b/integration-tests/jpa/src/main/resources/application.properties
index b1828c6710f78..a78788facf306 100644
--- a/integration-tests/jpa/src/main/resources/application.properties
+++ b/integration-tests/jpa/src/main/resources/application.properties
@@ -2,5 +2,4 @@ quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
-quarkus.hibernate-orm.log.sql=true
 quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/jpa/src/main/resources/import.sql b/integration-tests/jpa/src/main/resources/import.sql
index c533205094a30..14a740fa1b273 100644
--- a/integration-tests/jpa/src/main/resources/import.sql
+++ b/integration-tests/jpa/src/main/resources/import.sql
@@ -1,2 +1,4 @@
 DELETE FROM Gift WHERE id=100000;
-INSERT INTO Gift (id,name) VALUES (100000,'Teddy bear');
+-- on multiple lines to properly test the multi-line SQL extractor
+INSERT INTO Gift (id, name)
+        VALUES (100000,'Teddy bear');
diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterInGraalITCase.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterInGraalITCase.java
new file mode 100644
index 0000000000000..b8824aca7b7d0
--- /dev/null
+++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class AttributeConverterInGraalITCase extends AttributeConverterTest {
+}
diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterTest.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterTest.java
new file mode 100644
index 0000000000000..bd7d9290ed450
--- /dev/null
+++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/attributeconverter/AttributeConverterTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.it.jpa.attributeconverter;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.Is.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class AttributeConverterTest {
+
+    @Test
+    public void withCdi() {
+        given().queryParam("theData", "MyExpectedReturnedData")
+                .when().get("/jpa-test/attribute-converter/with-cdi").then()
+                .body(is("MyExpectedReturnedData"))
+                .statusCode(200);
+    }
+
+    @Test
+    public void withoutCdi() {
+        given().queryParam("theData", "MyExpectedReturnedData")
+                .when().get("/jpa-test/attribute-converter/without-cdi").then()
+                .body(is("MyExpectedReturnedData"))
+                .statusCode(200);
+    }
+
+}
diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPACacheDisabled.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPACacheDisabled.java
deleted file mode 100644
index 272b986b91c2d..0000000000000
--- a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/configurationless/JPACacheDisabled.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.quarkus.it.jpa.configurationless;
-
-import static org.hamcrest.core.StringContains.containsString;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusUnitTest;
-import io.restassured.RestAssured;
-
-/**
- * Similar to JPAConfigurationlessTest, yet explicitly disabling 2nd level caching,
- * then asserting the TimestampsCacheDisabledImpl have been disabled as a consequence.
- */
-public class JPACacheDisabled {
-
-    @RegisterExtension
-    static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .withConfigurationResource("application.properties")
-            .overrideConfigKey("quarkus.hibernate-orm.second-level-caching-enabled", "false");
-
-    @Test
-    public void testInjection() {
-        RestAssured.when().get("/jpa-test").then()
-                .body(containsString("jpa=OK"));
-
-        RestAssured.when().get("/jpa-test/user-tx").then()
-                .body(containsString("jpa=OK"));
-
-        RestAssured.when().get("/jpa-test/timestamps").then()
-                .body(containsString("org.hibernate.cache.internal.TimestampsCacheDisabledImpl"));
-    }
-
-}
diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/jdbcmetadata/JPAJdbcMetadataRetrievalInGraalITCase.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/jdbcmetadata/JPAJdbcMetadataRetrievalInGraalITCase.java
new file mode 100644
index 0000000000000..8caebcbb479a5
--- /dev/null
+++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/jdbcmetadata/JPAJdbcMetadataRetrievalInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.jpa.jdbcmetadata;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class JPAJdbcMetadataRetrievalInGraalITCase extends JPAJdbcMetadataRetrievalTest {
+}
diff --git a/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/jdbcmetadata/JPAJdbcMetadataRetrievalTest.java b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/jdbcmetadata/JPAJdbcMetadataRetrievalTest.java
new file mode 100644
index 0000000000000..a3e856e9e54a7
--- /dev/null
+++ b/integration-tests/jpa/src/test/java/io/quarkus/it/jpa/jdbcmetadata/JPAJdbcMetadataRetrievalTest.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.jpa.jdbcmetadata;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.core.Is.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class JPAJdbcMetadataRetrievalTest {
+
+    @Test
+    public void test() {
+        when().get("/jpa-test/jdbc-metadata-retrieval").then()
+                .body(is("thePersistedName"))
+                .statusCode(200);
+    }
+
+}
diff --git a/integration-tests/jsch/pom.xml b/integration-tests/jsch/pom.xml
index 9e9cf3702bdae..97d8e8c77085e 100644
--- a/integration-tests/jsch/pom.xml
+++ b/integration-tests/jsch/pom.xml
@@ -6,16 +6,11 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-integration-test-jsch</artifactId>
     <name>Quarkus - Integration Tests - JSch</name>
     <description>JSch integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -46,6 +41,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsch-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -64,61 +87,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/jsonb/pom.xml b/integration-tests/jsonb/pom.xml
index 1c413adc029be..7e708c0b00952 100644
--- a/integration-tests/jsonb/pom.xml
+++ b/integration-tests/jsonb/pom.xml
@@ -8,16 +8,11 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-jsonb</artifactId>
     <name>Quarkus - Integration Tests - JSON-B</name>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -39,6 +34,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -57,59 +80,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image-it-main</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/kafka-avro/pom.xml b/integration-tests/kafka-avro/pom.xml
index 7ac6315ef9014..e0c204706041d 100644
--- a/integration-tests/kafka-avro/pom.xml
+++ b/integration-tests/kafka-avro/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +14,6 @@
     <description>The Apache Kafka Avro integration tests module</description>
 
     <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
         <apicurio.version>1.2.2.Final</apicurio.version>
     </properties>
 
@@ -93,6 +91,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- required by io.confluent.kafka.schemaregistry.client.rest.entities.ServerClusterId -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.1-jre</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
 
         <!-- test dependencies -->
         <dependency>
@@ -132,12 +143,108 @@
             <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-avro-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <repositories>
         <repository>
             <id>confluent</id>
             <url>https://packages.confluent.io/maven/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -194,7 +301,7 @@
             <id>test-kafka</id>
             <activation>
                 <property>
-                    <name>test-kafka</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -214,53 +321,18 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
-            <id>native-image-it-main</id>
+            <id>native-image</id>
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
         </profile>
     </profiles>
 
diff --git a/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java b/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java
index 7b3a6274daba7..4659d2134b823 100644
--- a/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java
+++ b/integration-tests/kafka-avro/src/main/java/io/quarkus/it/kafka/avro/AvroEndpoint.java
@@ -5,8 +5,6 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -24,7 +22,6 @@ public class AvroEndpoint {
 
     @GET
     @Path("/confluent")
-    @Produces(MediaType.APPLICATION_JSON)
     public JsonObject getConfluent() {
         return get(AvroKafkaCreator.createConfluentConsumer("test-avro-confluent-consumer", "test-avro-confluent-consumer"));
     }
@@ -38,7 +35,6 @@ public void sendConfluent(Pet pet) {
 
     @GET
     @Path("/apicurio")
-    @Produces(MediaType.APPLICATION_JSON)
     public JsonObject getApicurio() {
         return get(AvroKafkaCreator.createApicurioConsumer("test-avro-apicurio-consumer", "test-avro-apicurio-consumer"));
     }
diff --git a/integration-tests/kafka-snappy/pom.xml b/integration-tests/kafka-snappy/pom.xml
new file mode 100644
index 0000000000000..62bb455118fec
--- /dev/null
+++ b/integration-tests/kafka-snappy/pom.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-kafka-snappy</artifactId>
+    <name>Quarkus - Integration Tests - Kafka with Snappy</name>
+    <description>The Apache Kafka with Snappy compression integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-shared-library</artifactId>
+        </dependency>
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
+
+        <!-- Health -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health</artifactId>
+        </dependency>
+
+        <!-- Kafka -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client</artifactId>
+        </dependency>
+
+        <!-- Service Binding - This isn't necessary to any Kafka functionality, but we want to test that Quarkus provides the proper config from a mock service binding -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+        </dependency>
+
+        <!-- Micrometer -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.debezium</groupId>
+            <artifactId>debezium-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.debezium</groupId>
+            <artifactId>debezium-core</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.12</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-kafka</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java
new file mode 100644
index 0000000000000..edb2a93c583d9
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java
@@ -0,0 +1,60 @@
+package io.quarkus.it.kafka;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Properties;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.IntegerDeserializer;
+import org.apache.kafka.common.serialization.StringDeserializer;
+
+@ApplicationScoped
+public class KafkaConsumerManager {
+
+    public static KafkaConsumer<Integer, String> createConsumer() {
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "test-consumer");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, IntegerDeserializer.class.getName());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        KafkaConsumer<Integer, String> consumer = new KafkaConsumer<>(props);
+        consumer.subscribe(Collections.singletonList("test-consumer"));
+        return consumer;
+    }
+
+    @Inject
+    Event<Consumer<?, ?>> consumerEvent;
+
+    private Consumer<Integer, String> consumer;
+
+    @PostConstruct
+    public void create() {
+        consumer = createConsumer();
+        consumerEvent.fire(consumer);
+    }
+
+    @PreDestroy
+    public void cleanup() {
+        consumerEvent.fire(consumer);
+    }
+
+    public String receive() {
+        final ConsumerRecords<Integer, String> records = consumer.poll(Duration.ofMillis(60000));
+        if (records.isEmpty()) {
+            return null;
+        }
+        return records.iterator().next().value();
+    }
+
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java
new file mode 100644
index 0000000000000..fd429d6fcd109
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.kafka;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+@Path("/kafka")
+public class KafkaEndpoint {
+
+    @Inject
+    KafkaProducerManager manager;
+
+    @Inject
+    KafkaConsumerManager consumer;
+
+    @POST
+    public void post(String message) {
+        manager.send(message);
+    }
+
+    @GET
+    public String get() {
+        return consumer.receive();
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java
new file mode 100644
index 0000000000000..ad43e28706ca7
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java
@@ -0,0 +1,53 @@
+package io.quarkus.it.kafka;
+
+import java.util.Properties;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.IntegerSerializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+
+@ApplicationScoped
+public class KafkaProducerManager {
+
+    public static Producer<Integer, String> createProducer() {
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ProducerConfig.CLIENT_ID_CONFIG, "test");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, IntegerSerializer.class.getName());
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        props.put(ProducerConfig.COMPRESSION_TYPE_CONFIG, "snappy");
+        return new KafkaProducer<>(props);
+    }
+
+    @Inject
+    Event<Producer<?, ?>> producerEvent;
+
+    private int count;
+    private Producer<Integer, String> producer;
+
+    @PostConstruct
+    public void create() {
+        producer = createProducer();
+        producerEvent.fire(producer);
+    }
+
+    @PreDestroy
+    public void cleanup() {
+        producerEvent.fire(producer);
+    }
+
+    public void send(String message) {
+        producer.send(new ProducerRecord<>("test", count++, message));
+        producer.flush();
+    }
+
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java
new file mode 100644
index 0000000000000..d8ae6270d66a0
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java
@@ -0,0 +1,168 @@
+package io.quarkus.it.kafka.codecs;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Properties;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+
+import io.quarkus.kafka.client.serialization.JsonbSerializer;
+import io.quarkus.kafka.client.serialization.ObjectMapperSerializer;
+
+/**
+ * Pet: Serialized and de-serialized with custom codec, topic: pets
+ * Person: Serialized with Json-b serializer and de-serialized with an extension of the Json-b deserializer, topic: persons
+ * Movie: Serialized with the Jackson serializer and de-serialized with an extension of the Jackson
+ * deserializer (ObjectMapperDeserializer), topic: movies
+ */
+@Path("/codecs")
+public class CodecEndpoint {
+
+    public static Producer<String, Pet> createPetProducer() {
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ProducerConfig.CLIENT_ID_CONFIG, "pet");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, PetCodec.class.getName());
+        return new KafkaProducer<>(props);
+    }
+
+    public static Producer<String, Person> createPersonProducer() {
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ProducerConfig.CLIENT_ID_CONFIG, "person");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonbSerializer.class.getName());
+        return new KafkaProducer<>(props);
+    }
+
+    public static Producer<String, Movie> createMovieProducer() {
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ProducerConfig.CLIENT_ID_CONFIG, "movie");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ObjectMapperSerializer.class.getName());
+        return new KafkaProducer<>(props);
+    }
+
+    public static KafkaConsumer<String, Pet> createPetConsumer() {
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "pet");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, PetCodec.class.getName());
+        props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        KafkaConsumer<String, Pet> consumer = new KafkaConsumer<>(props);
+        consumer.subscribe(Collections.singletonList("pets"));
+        return consumer;
+    }
+
+    public static KafkaConsumer<String, Person> createPersonConsumer() {
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "person");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, PersonDeserializer.class.getName());
+        props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        KafkaConsumer<String, Person> consumer = new KafkaConsumer<>(props);
+        consumer.subscribe(Collections.singletonList("persons"));
+        return consumer;
+    }
+
+    public static KafkaConsumer<String, Movie> createMovieConsumer() {
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "movie");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, MovieDeserializer.class.getName());
+        props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        KafkaConsumer<String, Movie> consumer = new KafkaConsumer<>(props);
+        consumer.subscribe(Collections.singletonList("movies"));
+        return consumer;
+    }
+
+    private Producer<String, Pet> petProducer;
+    private Producer<String, Person> personProducer;
+    private Consumer<String, Pet> petConsumer;
+    private Consumer<String, Person> personConsumer;
+    private KafkaConsumer<String, Movie> movieConsumer;
+    private Producer<String, Movie> movieProducer;
+
+    @PostConstruct
+    public void create() {
+        petProducer = createPetProducer();
+        petConsumer = createPetConsumer();
+        personProducer = createPersonProducer();
+        personConsumer = createPersonConsumer();
+        movieProducer = createMovieProducer();
+        movieConsumer = createMovieConsumer();
+    }
+
+    @POST
+    @Path("/pets")
+    public void post(Pet pet) {
+        petProducer.send(new ProducerRecord<>("pets", pet));
+        petProducer.flush();
+    }
+
+    @POST
+    @Path("/persons")
+    public void post(Person person) {
+        personProducer.send(new ProducerRecord<>("persons", person));
+        personProducer.flush();
+    }
+
+    @POST
+    @Path("/movies")
+    public void post(Movie movie) {
+        movieProducer.send(new ProducerRecord<>("movies", movie));
+        movieProducer.flush();
+    }
+
+    @GET
+    @Path("/pets")
+    public Pet getPet() {
+        final ConsumerRecords<String, Pet> records = petConsumer.poll(Duration.ofMillis(60000));
+        if (records.isEmpty()) {
+            return null;
+        }
+        return records.iterator().next().value();
+    }
+
+    @GET
+    @Path("/persons")
+    public Person getPerson() {
+        final ConsumerRecords<String, Person> records = personConsumer.poll(Duration.ofMillis(60000));
+        if (records.isEmpty()) {
+            return null;
+        }
+        return records.iterator().next().value();
+    }
+
+    @GET
+    @Path("/movies")
+    public Movie getMovie() {
+        final ConsumerRecords<String, Movie> records = movieConsumer.poll(Duration.ofMillis(60000));
+        if (records.isEmpty()) {
+            return null;
+        }
+        return records.iterator().next().value();
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Movie.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Movie.java
new file mode 100644
index 0000000000000..2a8bb7c05fbb7
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Movie.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.kafka.codecs;
+
+public class Movie {
+
+    private String title;
+
+    private int year;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Movie setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public Movie setYear(int year) {
+        this.year = year;
+        return this;
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/MovieDeserializer.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/MovieDeserializer.java
new file mode 100644
index 0000000000000..4ad572d2c672a
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/MovieDeserializer.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.kafka.codecs;
+
+import io.quarkus.kafka.client.serialization.ObjectMapperDeserializer;
+
+public class MovieDeserializer extends ObjectMapperDeserializer<Movie> {
+    public MovieDeserializer() {
+        super(Movie.class);
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Person.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Person.java
new file mode 100644
index 0000000000000..94a55ed9b7fb4
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Person.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.kafka.codecs;
+
+public class Person {
+
+    private String name;
+
+    private int id;
+
+    public String getName() {
+        return name;
+    }
+
+    public Person setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public Person setId(int id) {
+        this.id = id;
+        return this;
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/PersonDeserializer.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/PersonDeserializer.java
new file mode 100644
index 0000000000000..4abd25c0c6c30
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/PersonDeserializer.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.kafka.codecs;
+
+import io.quarkus.kafka.client.serialization.JsonbDeserializer;
+
+public class PersonDeserializer extends JsonbDeserializer<Person> {
+    public PersonDeserializer() {
+        super(Person.class);
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Pet.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Pet.java
new file mode 100644
index 0000000000000..350aa29412715
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/Pet.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.kafka.codecs;
+
+public class Pet {
+
+    private String kind;
+
+    private String name;
+
+    public String getKind() {
+        return kind;
+    }
+
+    public Pet setKind(String kind) {
+        this.kind = kind;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Pet setName(String name) {
+        this.name = name;
+        return this;
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/PetCodec.java b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/PetCodec.java
new file mode 100644
index 0000000000000..f493e0dc99210
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/java/io/quarkus/it/kafka/codecs/PetCodec.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.kafka.codecs;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+import org.apache.kafka.common.serialization.Deserializer;
+import org.apache.kafka.common.serialization.Serializer;
+
+public class PetCodec implements Serializer<Pet>, Deserializer<Pet> {
+    @Override
+    public Pet deserialize(String topic, byte[] bytes) {
+        String value = new String(bytes, StandardCharsets.UTF_8);
+        String[] segments = value.split("_");
+        Pet pet = new Pet();
+        pet.setKind(segments[0]);
+        pet.setName(segments[1]);
+        return pet;
+    }
+
+    @Override
+    public void configure(Map<String, ?> configs, boolean isKey) {
+        // no config
+    }
+
+    @Override
+    public byte[] serialize(String topic, Pet pet) {
+        return (pet.getKind() + "_" + pet.getName()).getBytes(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public void close() {
+        // do nothing.
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/main/resources/application.properties b/integration-tests/kafka-snappy/src/main/resources/application.properties
new file mode 100644
index 0000000000000..a1d72fa75140a
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/main/resources/application.properties
@@ -0,0 +1,8 @@
+quarkus.log.category.kafka.level=WARN
+quarkus.log.category.\"org.apache.kafka\".level=WARN
+quarkus.log.category.\"org.apache.zookeeper\".level=WARN
+
+quarkus.kafka.health.enabled=true
+
+# Enable snappy:
+quarkus.kafka.snappy.enabled=true
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyCodecITCase.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyCodecITCase.java
new file mode 100644
index 0000000000000..6c3a4817958d2
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyCodecITCase.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.kafka;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class KafkaSnappyCodecITCase extends KafkaSnappyCodecTest {
+
+}
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyCodecTest.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyCodecTest.java
new file mode 100644
index 0000000000000..5903f28769e84
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyCodecTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.it.kafka;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KafkaTestResource.class)
+@QuarkusTest
+public class KafkaSnappyCodecTest {
+
+    @Test
+    public void testCustomCodec() {
+        RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body("{\"kind\":\"rabbit\", \"name\":\"neo\"}")
+                .post("/codecs/pets");
+
+        RestAssured
+                .given()
+                .header("Accept", "application/json")
+                .get("/codecs/pets")
+                .then()
+                .body("kind", is("rabbit"))
+                .body("name", is("neo"));
+
+    }
+
+    @Test
+    public void testJsonbCodec() {
+        RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body("{\"name\":\"kate\", \"id\":\"1234\"}")
+                .post("/codecs/persons");
+
+        RestAssured
+                .given()
+                .header("Accept", "application/json")
+                .get("/codecs/persons")
+                .then()
+                .body("name", is("kate"))
+                .body("id", is(1234));
+
+    }
+
+    @Test
+    public void testJacksonCodec() {
+        RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body("{\"title\":\"Inception\", \"year\":\"2010\"}")
+                .post("/codecs/movies");
+
+        RestAssured
+                .given()
+                .header("Accept", "application/json")
+                .get("/codecs/movies")
+                .then()
+                .body("title", is("Inception"))
+                .body("year", is(2010));
+
+    }
+
+}
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyConsumerITCase.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyConsumerITCase.java
new file mode 100644
index 0000000000000..5a17882133121
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyConsumerITCase.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.kafka;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class KafkaSnappyConsumerITCase extends KafkaSnappyConsumerTest {
+
+}
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyConsumerTest.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyConsumerTest.java
new file mode 100644
index 0000000000000..576a84af89349
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyConsumerTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.it.kafka;
+
+import static org.hamcrest.Matchers.containsString;
+
+import java.util.Properties;
+
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.IntegerSerializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KafkaTestResource.class)
+@QuarkusTest
+public class KafkaSnappyConsumerTest {
+
+    public static Producer<Integer, String> createProducer() {
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ProducerConfig.CLIENT_ID_CONFIG, "test-consumer");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, IntegerSerializer.class.getName());
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        return new KafkaProducer<Integer, String>(props);
+    }
+
+    @Test
+    public void test() throws Exception {
+        Producer<Integer, String> producer = createProducer();
+        producer.send(new ProducerRecord<>("test-consumer", 1, "hi world"));
+        RestAssured.when().get("/kafka").then().body(Matchers.is("hi world"));
+    }
+
+    @Test
+    public void metrics() throws Exception {
+        // Look for kafka consumer metrics (add .log().all() to examine what they are
+        RestAssured.when().get("/q/metrics").then()
+                .statusCode(200)
+                .body(containsString("kafka_consumer_"));
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyProducerITCase.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyProducerITCase.java
new file mode 100644
index 0000000000000..db28db7e753f3
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyProducerITCase.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.kafka;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class KafkaSnappyProducerITCase extends KafkaSnappyProducerTest {
+
+}
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyProducerTest.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyProducerTest.java
new file mode 100644
index 0000000000000..b39aac68929e8
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaSnappyProducerTest.java
@@ -0,0 +1,60 @@
+package io.quarkus.it.kafka;
+
+import static org.hamcrest.Matchers.*;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.IntegerDeserializer;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class KafkaSnappyProducerTest {
+
+    public static KafkaConsumer<Integer, String> createConsumer() {
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:19092");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "test");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, IntegerDeserializer.class.getName());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true");
+        props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        KafkaConsumer<Integer, String> consumer = new KafkaConsumer<>(props);
+        consumer.subscribe(Collections.singletonList("test"));
+        return consumer;
+    }
+
+    @Test
+    public void test() throws Exception {
+        KafkaConsumer<Integer, String> consumer = createConsumer();
+        RestAssured.with().body("hello").post("/kafka");
+        ConsumerRecord<Integer, String> records = consumer.poll(Duration.ofMillis(10000)).iterator().next();
+        Assertions.assertEquals(records.key(), (Integer) 0);
+        Assertions.assertEquals(records.value(), "hello");
+    }
+
+    @Test
+    public void health() throws Exception {
+        RestAssured.when().get("/q/health/ready").then()
+                .body("status", is("UP"),
+                        "checks.status", containsInAnyOrder("UP"),
+                        "checks.name", containsInAnyOrder("Kafka connection health check"));
+    }
+
+    @Test
+    public void metrics() throws Exception {
+        // Look for kafka producer metrics (add .log().all() to examine what they are
+        RestAssured.when().get("/q/metrics").then()
+                .statusCode(200)
+                .body(containsString("kafka_producer_"));
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaTestResource.java b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaTestResource.java
new file mode 100644
index 0000000000000..129868edd0213
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/java/io/quarkus/it/kafka/KafkaTestResource.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.kafka;
+
+import java.io.File;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import io.debezium.kafka.KafkaCluster;
+import io.debezium.util.Testing;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
+
+    private KafkaCluster kafka;
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            Properties props = new Properties();
+            props.setProperty("zookeeper.connection.timeout.ms", "45000");
+            File directory = Testing.Files.createTestingDirectory("kafka-data", true);
+            kafka = new KafkaCluster().withPorts(2182, 19092)
+                    .addBrokers(1)
+                    .usingDirectory(directory)
+                    .deleteDataUponShutdown(true)
+                    .withKafkaConfiguration(props)
+                    .deleteDataPriorToStartup(true)
+                    .startup();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        Map<String, String> result = new HashMap<>();
+        // make the service binding root known
+        result.put("quarkus.kubernetes-service-binding.root", Paths.get("").resolve("src").resolve("test").resolve("resources")
+                .resolve("k8s-sb").toAbsolutePath().toString());
+        return result;
+    }
+
+    @Override
+    public void stop() {
+        if (kafka != null) {
+            kafka.shutdown();
+        }
+    }
+}
diff --git a/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/bootstrapServers b/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/bootstrapServers
new file mode 100644
index 0000000000000..aedd8242935b4
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/bootstrapServers
@@ -0,0 +1 @@
+localhost:19092
diff --git a/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/provider b/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/provider
new file mode 100644
index 0000000000000..ec4074f8cc990
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/provider
@@ -0,0 +1 @@
+RH-SBO
diff --git a/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/type b/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/type
new file mode 100644
index 0000000000000..605f59bfb4d26
--- /dev/null
+++ b/integration-tests/kafka-snappy/src/test/resources/k8s-sb/some-kafka/type
@@ -0,0 +1 @@
+kafka
diff --git a/integration-tests/kafka-streams/pom.xml b/integration-tests/kafka-streams/pom.xml
index f5ba3e7bc33a0..f5142265425f6 100644
--- a/integration-tests/kafka-streams/pom.xml
+++ b/integration-tests/kafka-streams/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Integration Tests - Kafka Streams</name>
     <description>The Kafka Streams integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -50,6 +45,12 @@
             <artifactId>quarkus-kafka-streams</artifactId>
         </dependency>
 
+        <!-- Micrometer -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -77,6 +78,86 @@
             <artifactId>kafka_2.12</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-streams-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -97,58 +178,29 @@
 
     <profiles>
         <profile>
-            <id>native-image-it-main</id>
+            <id>native-image</id>
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
+        </profile>
+        <!-- Skip the tests on Windows due to https://issues.apache.org/jira/browse/KAFKA-12190 -->
+        <profile>
+            <id>skip-tests-windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+            </properties>
         </profile>
     </profiles>
 
diff --git a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java
index 203ad74935885..89a69ed186fb3 100644
--- a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java
+++ b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEndpoint.java
@@ -2,13 +2,10 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.errors.InvalidStateStoreException;
@@ -45,8 +42,6 @@ public void stop() {
 
     @GET
     @Path("/category/{id}")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     public Long getCategory(@PathParam("id") int id) {
         return getCountstore().get(id);
     }
diff --git a/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java
new file mode 100644
index 0000000000000..6f312fde0fc9b
--- /dev/null
+++ b/integration-tests/kafka-streams/src/main/java/io/quarkus/it/kafka/streams/KafkaStreamsEventCounter.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.kafka.streams;
+
+import java.util.concurrent.atomic.LongAdder;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.apache.kafka.streams.KafkaStreams;
+
+@ApplicationScoped
+public class KafkaStreamsEventCounter {
+
+    LongAdder eventCount = new LongAdder();
+
+    void onKafkaStreamsEvent(@Observes KafkaStreams kafkaStreams) {
+        eventCount.increment();
+    }
+
+    public int getEventCount() {
+        return eventCount.intValue();
+    }
+}
diff --git a/integration-tests/kafka-streams/src/main/resources/ks-keystore.p12 b/integration-tests/kafka-streams/src/main/resources/ks-keystore.p12
index abfdbcb2053a3..04b1592caeb08 100644
Binary files a/integration-tests/kafka-streams/src/main/resources/ks-keystore.p12 and b/integration-tests/kafka-streams/src/main/resources/ks-keystore.p12 differ
diff --git a/integration-tests/kafka-streams/src/main/resources/ks-truststore.p12 b/integration-tests/kafka-streams/src/main/resources/ks-truststore.p12
index 58ff7c596254c..3fc21188bfebc 100644
Binary files a/integration-tests/kafka-streams/src/main/resources/ks-truststore.p12 and b/integration-tests/kafka-streams/src/main/resources/ks-truststore.p12 differ
diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java
new file mode 100644
index 0000000000000..84e1081d3fcaf
--- /dev/null
+++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsCdiEventTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.kafka.streams;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTestResource(KafkaTestResource.class)
+@QuarkusTest
+public class KafkaStreamsCdiEventTest {
+
+    @Inject
+    KafkaStreamsEventCounter eventCounter;
+
+    @Test
+    void testEventShouldBePublished() {
+        Assertions.assertEquals(1, eventCounter.getEventCount(),
+                "There should be one event for creating KafakStreams in the producder.");
+    }
+}
diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java
new file mode 100644
index 0000000000000..147e6ebead36c
--- /dev/null
+++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsStartupFailureTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.it.kafka.streams;
+
+import static org.apache.kafka.streams.KafkaStreams.State;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.http.HttpStatus;
+import org.apache.kafka.streams.KafkaStreams;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import io.quarkus.kafka.streams.runtime.KafkaStreamsTopologyManager;
+import io.quarkus.runtime.Application;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(KafkaTestResource.class)
+@TestProfile(KafkaStreamsStartupFailureTest.NonExistingTopicProfile.class)
+@QuarkusTest
+public class KafkaStreamsStartupFailureTest {
+
+    @Inject
+    KafkaStreams kafkaStreams;
+
+    @Inject
+    KafkaStreamsTopologyManager kafkaStreamsTopologyManager;
+
+    @Test
+    @Timeout(5)
+    public void testShutdownBeforeKStreamsStarted() throws Exception {
+        assertEquals(State.CREATED, kafkaStreams.state());
+        RestAssured.get("/q/health/ready").then()
+                .statusCode(HttpStatus.SC_SERVICE_UNAVAILABLE)
+                .body("checks[0].name", CoreMatchers.is("Kafka Streams topics health check"))
+                .body("checks[0].status", CoreMatchers.is("DOWN"))
+                .body("checks[0].data.missing_topics", CoreMatchers.is("nonexisting-topic"));
+        assertTrue(Application.currentApplication().isStarted());
+
+        Application.currentApplication().stop();
+
+        assertEquals(State.NOT_RUNNING, kafkaStreams.state());
+    }
+
+    public static class NonExistingTopicProfile implements QuarkusTestProfile {
+
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> conf = new HashMap<>();
+            conf.put("quarkus.kafka-streams.topics", "nonexisting-topic");
+            return conf;
+        }
+    }
+}
diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsTest.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsTest.java
index 7c68a740cc959..35f57feacfb00 100644
--- a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsTest.java
+++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaStreamsTest.java
@@ -1,5 +1,7 @@
 package io.quarkus.it.kafka.streams;
 
+import static org.hamcrest.Matchers.containsString;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -136,42 +138,51 @@ record = records.get(3);
         testKafkaStreamsAliveAndReady();
         RestAssured.when().get("/kafkastreams/state").then().body(CoreMatchers.is("RUNNING"));
 
+        testMetricsPresent();
+
         // explicitly stopping the pipeline *before* the broker is shut down, as it
         // otherwise will time out
         RestAssured.post("/kafkastreams/stop");
     }
 
+    private void testMetricsPresent() {
+        // Look for kafka consumer metrics (add .log().all() to examine what they are
+        RestAssured.when().get("/q/metrics").then()
+                .statusCode(200)
+                .body(containsString("kafka_stream_"));
+    }
+
     public void testKafkaStreamsNotAliveAndNotReady() throws Exception {
-        RestAssured.get("/health/ready").then()
+        RestAssured.get("/q/health/ready").then()
                 .statusCode(HttpStatus.SC_SERVICE_UNAVAILABLE)
                 .body("checks[0].name", CoreMatchers.is("Kafka Streams topics health check"))
                 .body("checks[0].status", CoreMatchers.is("DOWN"))
                 .body("checks[0].data.missing_topics", CoreMatchers.is("streams-test-customers,streams-test-categories"));
 
-        RestAssured.when().get("/health/live").then()
+        RestAssured.when().get("/q/health/live").then()
                 .statusCode(HttpStatus.SC_SERVICE_UNAVAILABLE)
                 .body("checks[0].name", CoreMatchers.is("Kafka Streams state health check"))
                 .body("checks[0].status", CoreMatchers.is("DOWN"))
                 .body("checks[0].data.state", CoreMatchers.is("CREATED"));
 
-        RestAssured.when().get("/health").then()
+        RestAssured.when().get("/q/health").then()
                 .statusCode(HttpStatus.SC_SERVICE_UNAVAILABLE);
     }
 
     public void testKafkaStreamsAliveAndReady() throws Exception {
-        RestAssured.get("/health/ready").then()
+        RestAssured.get("/q/health/ready").then()
                 .statusCode(HttpStatus.SC_OK)
                 .body("checks[0].name", CoreMatchers.is("Kafka Streams topics health check"))
                 .body("checks[0].status", CoreMatchers.is("UP"))
                 .body("checks[0].data.available_topics", CoreMatchers.is("streams-test-categories,streams-test-customers"));
 
-        RestAssured.when().get("/health/live").then()
+        RestAssured.when().get("/q/health/live").then()
                 .statusCode(HttpStatus.SC_OK)
                 .body("checks[0].name", CoreMatchers.is("Kafka Streams state health check"))
                 .body("checks[0].status", CoreMatchers.is("UP"))
                 .body("checks[0].data.state", CoreMatchers.is("RUNNING"));
 
-        RestAssured.when().get("/health").then()
+        RestAssured.when().get("/q/health").then()
                 .statusCode(HttpStatus.SC_OK);
     }
 
diff --git a/integration-tests/kafka/pom.xml b/integration-tests/kafka/pom.xml
index 38bcc390bb05d..e045d16835463 100644
--- a/integration-tests/kafka/pom.xml
+++ b/integration-tests/kafka/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Integration Tests - Kafka</name>
     <description>The Apache Kafka integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -54,6 +49,12 @@
             <artifactId>quarkus-kafka-client</artifactId>
         </dependency>
 
+        <!-- Micrometer -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -87,10 +88,98 @@
             <artifactId>kafka_2.12</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -129,7 +218,7 @@
             <id>test-kafka</id>
             <activation>
                 <property>
-                    <name>test-kafka</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -151,59 +240,16 @@
         </profile>
 
         <profile>
-            <id>native-image-it-main</id>
+            <id>native-image</id>
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
         </profile>
     </profiles>
 
diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java
index 5148385f79bf6..edb2a93c583d9 100644
--- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java
+++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaConsumerManager.java
@@ -5,7 +5,10 @@
 import java.util.Properties;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
 
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -30,11 +33,20 @@ public static KafkaConsumer<Integer, String> createConsumer() {
         return consumer;
     }
 
+    @Inject
+    Event<Consumer<?, ?>> consumerEvent;
+
     private Consumer<Integer, String> consumer;
 
     @PostConstruct
     public void create() {
         consumer = createConsumer();
+        consumerEvent.fire(consumer);
+    }
+
+    @PreDestroy
+    public void cleanup() {
+        consumerEvent.fire(consumer);
     }
 
     public String receive() {
diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java
index 3870abf0d9190..ddd9a45af2578 100644
--- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java
+++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/KafkaProducerManager.java
@@ -3,7 +3,10 @@
 import java.util.Properties;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
 
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.Producer;
@@ -24,12 +27,21 @@ public static Producer<Integer, String> createProducer() {
         return new KafkaProducer<Integer, String>(props);
     }
 
+    @Inject
+    Event<Producer<?, ?>> producerEvent;
+
     private int count;
     private Producer<Integer, String> producer;
 
     @PostConstruct
     public void create() {
         producer = createProducer();
+        producerEvent.fire(producer);
+    }
+
+    @PreDestroy
+    public void cleanup() {
+        producerEvent.fire(producer);
     }
 
     public void send(String message) {
diff --git a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java
index 4cf517de168a6..d8ae6270d66a0 100644
--- a/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java
+++ b/integration-tests/kafka/src/main/java/io/quarkus/it/kafka/codecs/CodecEndpoint.java
@@ -5,12 +5,9 @@
 import java.util.Properties;
 
 import javax.annotation.PostConstruct;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -33,8 +30,6 @@
  * deserializer (ObjectMapperDeserializer), topic: movies
  */
 @Path("/codecs")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class CodecEndpoint {
 
     public static Producer<String, Pet> createPetProducer() {
diff --git a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerTest.java b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerTest.java
index ef9bdf41e9141..be029f81b6daa 100644
--- a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerTest.java
+++ b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaConsumerTest.java
@@ -1,5 +1,7 @@
 package io.quarkus.it.kafka;
 
+import static org.hamcrest.Matchers.containsString;
+
 import java.util.Properties;
 
 import org.apache.kafka.clients.producer.KafkaProducer;
@@ -35,4 +37,11 @@ public void test() throws Exception {
         RestAssured.when().get("/kafka").then().body(Matchers.is("hi world"));
     }
 
+    @Test
+    public void metrics() throws Exception {
+        // Look for kafka consumer metrics (add .log().all() to examine what they are
+        RestAssured.when().get("/q/metrics").then()
+                .statusCode(200)
+                .body(containsString("kafka_consumer_"));
+    }
 }
diff --git a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerTest.java b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerTest.java
index 6e72d362807d9..4509a8631bc3b 100644
--- a/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerTest.java
+++ b/integration-tests/kafka/src/test/java/io/quarkus/it/kafka/KafkaProducerTest.java
@@ -1,7 +1,6 @@
 package io.quarkus.it.kafka;
 
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 
 import java.time.Duration;
 import java.util.Collections;
@@ -45,10 +44,17 @@ public void test() throws Exception {
 
     @Test
     public void health() throws Exception {
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
                         "checks.name", containsInAnyOrder("Kafka connection health check"));
     }
 
+    @Test
+    public void metrics() throws Exception {
+        // Look for kafka producer metrics (add .log().all() to examine what they are
+        RestAssured.when().get("/q/metrics").then()
+                .statusCode(200)
+                .body(containsString("kafka_producer_"));
+    }
 }
diff --git a/integration-tests/kafka/src/test/resources/README.md b/integration-tests/kafka/src/test/resources/README.md
new file mode 100644
index 0000000000000..ab3ac1cbc7e1c
--- /dev/null
+++ b/integration-tests/kafka/src/test/resources/README.md
@@ -0,0 +1,23 @@
+# How to generate the key and trust stores
+
+Run:
+
+```shell script
+cd src/test/resources
+rm -Rf *.p12
+export SECRET=Z_pkTh9xgZovK4t34cGB2o6afT4zZg0L
+export JKS_FILE=kafka-keystore.jks
+export JKS_TRUST_FILE=kafka-truststore.jks
+export CERT_FILE=localhost.crt
+export PKCS_FILE=kafka-keystore.p12
+export PKCS_TRUST_FILE=kafka-truststore.p12
+export PEM_FILE_CERT=kafka-cert.pem
+export PEM_FILE_KEY=kafka-key.pem
+keytool -genkey -alias kafka-test-store -keyalg RSA -keystore ${JKS_FILE} -keysize 2048 -validity 1095 -dname CN=localhost -keypass ${SECRET} -storepass ${SECRET}
+keytool -export -alias kafka-test-store -file ${CERT_FILE} -keystore ${JKS_FILE} -keypass ${SECRET} -storepass ${SECRET}
+keytool -importkeystore -srckeystore ${JKS_FILE} -srcstorepass ${SECRET} -destkeystore ${PKCS_FILE} -deststoretype PKCS12 -deststorepass ${SECRET}
+keytool -keystore ${JKS_TRUST_FILE} -import -file ${CERT_FILE} -keypass ${SECRET} -storepass ${SECRET} -noprompt  
+keytool -importkeystore -srckeystore ${JKS_TRUST_FILE} -srcstorepass ${SECRET} -destkeystore ${PKCS_TRUST_FILE} -deststoretype PKCS12 -deststorepass ${SECRET}
+rm -Rf localhost.crt *.jks
+cd ../../.. || exit -1 
+```
\ No newline at end of file
diff --git a/integration-tests/kafka/src/test/resources/kafka-keystore.p12 b/integration-tests/kafka/src/test/resources/kafka-keystore.p12
index abfdbcb2053a3..04b1592caeb08 100644
Binary files a/integration-tests/kafka/src/test/resources/kafka-keystore.p12 and b/integration-tests/kafka/src/test/resources/kafka-keystore.p12 differ
diff --git a/integration-tests/kafka/src/test/resources/kafka-truststore.p12 b/integration-tests/kafka/src/test/resources/kafka-truststore.p12
index 58ff7c596254c..3fc21188bfebc 100644
Binary files a/integration-tests/kafka/src/test/resources/kafka-truststore.p12 and b/integration-tests/kafka/src/test/resources/kafka-truststore.p12 differ
diff --git a/integration-tests/keycloak-authorization/README.md b/integration-tests/keycloak-authorization/README.md
index 0f4b1759b7b3c..39f2a31d442d3 100644
--- a/integration-tests/keycloak-authorization/README.md
+++ b/integration-tests/keycloak-authorization/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with Keycloak Server started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run Keycloak Server as a Docker container, you can start your own Keycloak server. It needs to listen on the default port `8180`.
@@ -21,7 +21,7 @@ If you don't want to run Keycloak Server as a Docker container, you can start yo
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-keycloak
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dkeycloak.url=http://keycloak.server.domain:8180/auth`.
diff --git a/integration-tests/keycloak-authorization/pom.xml b/integration-tests/keycloak-authorization/pom.xml
index 4165d16d017dc..054b0d8db6603 100644
--- a/integration-tests/keycloak-authorization/pom.xml
+++ b/integration-tests/keycloak-authorization/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -51,6 +50,73 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-keycloak-admin-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-keycloak-authorization-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -92,7 +158,7 @@
             <id>test-keycloak</id>
             <activation>
                 <property>
-                    <name>test-keycloak</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -131,62 +197,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-keycloak</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -261,7 +276,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
index c7c01b5714865..ece3e8d73cf7b 100644
--- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
+++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
@@ -4,19 +4,15 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 
 import javax.inject.Inject;
 import javax.security.auth.AuthPermission;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
 
 import org.keycloak.representations.idm.authorization.Permission;
 
@@ -31,23 +27,18 @@ public class ProtectedResource {
     SecurityIdentity identity;
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<List<Permission>> permissions() {
         return identity.checkPermission(new AuthPermission("Permission Resource")).onItem()
-                .apply(new Function<Boolean, List<Permission>>() {
-                    @Override
-                    public List<Permission> apply(Boolean granted) {
-                        if (granted) {
-                            return identity.getAttribute("permissions");
-                        }
-                        throw new ForbiddenException();
+                .transform(granted -> {
+                    if (granted) {
+                        return identity.getAttribute("permissions");
                     }
+                    throw new ForbiddenException();
                 });
     }
 
     @GET
     @Path("/scope")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<List<Permission>> hasScopePermission(@QueryParam("scope") String scope) {
         return identity.checkPermission(new BasicPermission("Scope Permission Resource") {
             @Override
@@ -55,35 +46,28 @@ public String getActions() {
                 return scope;
             }
         }).onItem()
-                .apply(new Function<Boolean, List<Permission>>() {
-                    @Override
-                    public List<Permission> apply(Boolean granted) {
-                        if (granted) {
-                            return identity.getAttribute("permissions");
-                        }
-                        throw new ForbiddenException();
+                .transform(granted -> {
+                    if (granted) {
+                        return identity.getAttribute("permissions");
                     }
+                    throw new ForbiddenException();
                 });
     }
 
     @Path("/claim-protected")
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public List<Permission> claimProtected() {
         return identity.getAttribute("permissions");
     }
 
     @Path("/http-response-claim-protected")
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public List<Permission> httpResponseClaimProtected() {
         return identity.getAttribute("permissions");
     }
 
     @Path("/body-claim")
     @POST
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     public List<Permission> bodyClaim(Map<String, Object> body, @Context HttpServerRequest request) {
         if (body == null || !body.containsKey("from-body")) {
             return Collections.emptyList();
diff --git a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java
index 2851ce9c98d15..8424d2b447709 100644
--- a/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java
+++ b/integration-tests/keycloak-authorization/src/main/java/io/quarkus/it/keycloak/UsersResource.java
@@ -3,8 +3,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import io.quarkus.security.identity.SecurityIdentity;
 
@@ -16,7 +14,6 @@ public class UsersResource {
 
     @GET
     @Path("/me")
-    @Produces(MediaType.APPLICATION_JSON)
     public User me() {
         return new User(keycloakSecurityContext);
     }
diff --git a/integration-tests/kotlin/disable-native-profile b/integration-tests/kotlin/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/kotlin/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/kotlin/pom.xml b/integration-tests/kotlin/pom.xml
index d310d28e36dc1..b1cf0f5215bc1 100644
--- a/integration-tests/kotlin/pom.xml
+++ b/integration-tests/kotlin/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-kotlin</artifactId>
@@ -32,17 +31,18 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-json</artifactId>
+            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-maven</artifactId>
+            <artifactId>quarkus-platform-descriptor-json</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-maven</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -83,9 +83,6 @@
                 </executions>
                 <configuration>
                     <systemPropertyVariables>
-                        <!--suppress MavenModelInspection -->
-                        <maven.home>${maven.home}</maven.home>
-                        <maven.repo>${settings.localRepository}</maven.repo>
                         <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
diff --git a/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java b/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java
index fd8256f0247c6..13f34e386e960 100644
--- a/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java
+++ b/integration-tests/kotlin/src/test/java/io/quarkus/kotlin/maven/it/KotlinCreateMavenProjectIT.java
@@ -47,7 +47,7 @@ public void testProjectGenerationFromScratchForKotlin() throws MavenInvocationEx
         String config = Files
                 .asCharSource(new File(testDir, "src/main/resources/application.properties"), Charsets.UTF_8)
                 .read();
-        assertThat(config).contains("key = value");
+        assertThat(config).isEmpty();
 
         assertThat(new File(testDir, "src/main/docker/Dockerfile.native")).isFile();
         assertThat(new File(testDir, "src/main/docker/Dockerfile.jvm")).isFile();
@@ -76,14 +76,13 @@ private InvocationResult setup(Properties params)
             throws MavenInvocationException, FileNotFoundException, UnsupportedEncodingException {
 
         params.setProperty("platformArtifactId", "quarkus-bom");
-        params.setProperty("platformVersion", getPluginVersion());
+        params.setProperty("platformVersion", getQuarkusCoreVersion());
 
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBatchMode(true);
         request.setGoals(Collections.singletonList(
-                getPluginGroupId() + ":" + getPluginArtifactId() + ":" + getPluginVersion() + ":create"));
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create"));
         request.setProperties(params);
-        getEnv().forEach(request::addShellEnvironment);
         File log = new File(testDir, "build-create-" + testDir.getName() + ".log");
         PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
                 InvokerLogger.DEBUG);
diff --git a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
index e34170f7abace..e7558485a865c 100644
--- a/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
+++ b/integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-websockets</artifactId>
+            <artifactId>quarkus-websockets</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -52,11 +52,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/main/kotlin</sourceDirectory>
@@ -115,25 +110,9 @@
     <profiles>
         <profile>
             <id>native</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/integration-tests/kubernetes-client/pom.xml b/integration-tests/kubernetes-client/pom.xml
index e39202073f5f3..ea2df35547387 100644
--- a/integration-tests/kubernetes-client/pom.xml
+++ b/integration-tests/kubernetes-client/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-kubernetes-client</artifactId>
@@ -48,6 +47,34 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-config-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -63,62 +90,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <runOrder>alphabetical</runOrder>
+                </configuration>
+                <executions>
+                    <!--
+                    The prod mode tests need to be part of a different execution to ensure that they don't mess with the standard tests.
+                    By adding this configuration we ensure that the maven surefire plugin will execute twice, one for the regular **/*Test.java
+                    tests (using the 'default-test' execution), and one for the prod mode tests (this 'prod-mode' execution)
+                    -->
+                    <execution>
+                        <id>prod-mode</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>**/*PMT.java</includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java
index 667eaf39ab1fc..1bc111303004a 100644
--- a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java
+++ b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/Pods.java
@@ -1,6 +1,7 @@
 package io.quarkus.it.kubernetes.client;
 
 import java.util.List;
+import java.util.UUID;
 
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -8,8 +9,6 @@
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import io.fabric8.kubernetes.api.model.Pod;
@@ -26,7 +25,6 @@ public Pods(KubernetesClient kubernetesClient) {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     @Path("/{namespace}")
     public Response pods(@PathParam("namespace") String namespace) {
         return Response.ok(kubernetesClient.pods().inNamespace(namespace).list().getItems()).build();
@@ -45,7 +43,6 @@ public Response deleteFirst(@PathParam("namespace") String namespace) {
     }
 
     @PUT
-    @Produces(MediaType.APPLICATION_JSON)
     @Path("/{namespace}")
     public Response updateFirst(@PathParam("namespace") String namespace) {
         final List<Pod> pods = kubernetesClient.pods().inNamespace(namespace).list().getItems();
@@ -56,7 +53,8 @@ public Response updateFirst(@PathParam("namespace") String namespace) {
         final Pod pod = pods.get(0);
         final String podName = pod.getMetadata().getName();
         // would normally do some kind of meaningful update here
-        Pod updatedPod = new PodBuilder().withNewMetadata().withName(podName).withNewResourceVersion("12345").endMetadata()
+        Pod updatedPod = new PodBuilder().withNewMetadata().withName(podName).withNewResourceVersion("12345")
+                .addToLabels("key1", "value1").endMetadata()
                 .build();
 
         updatedPod = kubernetesClient.pods().withName(podName).createOrReplace(updatedPod);
@@ -64,12 +62,13 @@ public Response updateFirst(@PathParam("namespace") String namespace) {
     }
 
     @POST
-    @Produces(MediaType.APPLICATION_JSON)
     @Path("/{namespace}")
     public Response createNew(@PathParam("namespace") String namespace) {
         return Response
-                .ok(kubernetesClient.pods().inNamespace(namespace).createNew().withNewMetadata().withResourceVersion("12345")
-                        .endMetadata().done())
+                .ok(kubernetesClient.pods().inNamespace(namespace)
+                        .create(new PodBuilder().withNewMetadata()
+                                .withName(UUID.randomUUID().toString()).withResourceVersion("12345")
+                                .endMetadata().build()))
                 .build();
     }
 }
diff --git a/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java
new file mode 100644
index 0000000000000..a879c97f939d8
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/main/java/io/quarkus/it/kubernetes/client/SecretProperties.java
@@ -0,0 +1,64 @@
+package io.quarkus.it.kubernetes.client;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+@Path("/secretProperties")
+public class SecretProperties {
+
+    @ConfigProperty(name = "dummysecret")
+    String dummysecret;
+
+    @ConfigProperty(name = "overridden.secret")
+    String overriddenSecret;
+
+    @ConfigProperty(name = "secret.prop1")
+    String secretProp1;
+
+    @ConfigProperty(name = "secret.prop2")
+    String secretProp2;
+
+    @ConfigProperty(name = "secret.prop3")
+    String secretProp3;
+
+    @ConfigProperty(name = "secret.prop4")
+    String secretProp4;
+
+    @GET
+    @Path("/dummysecret")
+    public String dummysecret() {
+        return dummysecret;
+    }
+
+    @GET
+    @Path("/overriddensecret")
+    public String overriddensecret() {
+        return overriddenSecret;
+    }
+
+    @GET
+    @Path("/secretProp1")
+    public String secretProp1() {
+        return secretProp1;
+    }
+
+    @GET
+    @Path("/secretProp2")
+    public String secretProp2() {
+        return secretProp2;
+    }
+
+    @GET
+    @Path("/secretProp3")
+    public String secretProp3() {
+        return secretProp3;
+    }
+
+    @GET
+    @Path("/secretProp4")
+    public String secretProp4() {
+        return secretProp4;
+    }
+}
diff --git a/integration-tests/kubernetes-client/src/main/resources/application.properties b/integration-tests/kubernetes-client/src/main/resources/application.properties
index 7718cf92c7718..f405ff437daf6 100644
--- a/integration-tests/kubernetes-client/src/main/resources/application.properties
+++ b/integration-tests/kubernetes-client/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 quarkus.kubernetes-config.enabled=true
 quarkus.kubernetes-config.config-maps=cmap1,cmap2
 quarkus.kubernetes-config.secrets=s1
+quarkus.kubernetes-config.secrets.enabled=true
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java
new file mode 100644
index 0000000000000..81cd82376b350
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesPMT.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.kubernetes.client;
+
+import java.io.IOException;
+
+import org.assertj.core.api.Assertions;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusProdModeTest;
+import io.quarkus.test.common.QuarkusTestResource;
+
+@QuarkusTestResource(value = CustomKubernetesMockServerTestResource.class, restrictToAnnotatedClass = true)
+public class AbsentConfigMapPropertiesPMT {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(ConfigMapProperties.class))
+            .setApplicationName("k8s-configMaps")
+            .withConfigurationResource("application-demo.properties")
+            .setRun(true)
+            .setExpectExit(true)
+            .setApplicationVersion("0.1-SNAPSHOT");
+
+    @Test
+    public void startUpShouldFail() throws IOException {
+        Assertions.assertThat(config.getStartupConsoleOutput())
+                .contains("ConfigMap 'cmap4' not found in namespace 'demo'").contains("RuntimeException");
+    }
+
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesTest.java
deleted file mode 100644
index c477e7bdd9825..0000000000000
--- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/AbsentConfigMapPropertiesTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.quarkus.it.kubernetes.client;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-
-import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import io.quarkus.test.QuarkusProdModeTest;
-import io.quarkus.test.common.QuarkusTestResource;
-
-@QuarkusTestResource(CustomKubernetesMockServerTestResource.class)
-public class AbsentConfigMapPropertiesTest {
-
-    @RegisterExtension
-    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(ConfigMapProperties.class))
-            .setApplicationName("k8s-configMaps")
-            .withConfigurationResource("application-demo.properties")
-            .setRun(true)
-            .setExpectExit(true)
-            .setApplicationVersion("0.1-SNAPSHOT");
-
-    @Test
-    public void startUpShouldFail() throws IOException {
-        Assertions.assertThat(config.getStartupConsoleOutput())
-                .contains("ConfigMap 'cmap4' not found in namespace 'demo'").contains("RuntimeException");
-    }
-
-}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/ConfigMapPropertiesTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/ConfigMapPropertiesTest.java
index f2f9e599aab57..03d0102941a06 100644
--- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/ConfigMapPropertiesTest.java
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/ConfigMapPropertiesTest.java
@@ -8,7 +8,7 @@
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
-@QuarkusTestResource(CustomKubernetesMockServerTestResource.class)
+@QuarkusTestResource(value = CustomKubernetesMockServerTestResource.class, restrictToAnnotatedClass = true)
 @QuarkusTest
 public class ConfigMapPropertiesTest {
 
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesMockServerTestResource.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesMockServerTestResource.java
index a5c9636793ba4..89e6d9676a27f 100644
--- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesMockServerTestResource.java
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesMockServerTestResource.java
@@ -1,6 +1,9 @@
 package io.quarkus.it.kubernetes.client;
 
+import java.util.Base64;
+
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
+import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.quarkus.test.kubernetes.client.KubernetesMockServerTestResource;
 
@@ -12,8 +15,10 @@ public void configureMockServer(KubernetesMockServer mockServer) {
         mockServer.expect().get().withPath("/api/v1/namespaces/test/configmaps/cmap1")
                 .andReturn(200, configMapBuilder("cmap1")
                         .addToData("dummy", "dummy")
+                        .addToData("overridden.secret", "cm") // will be overridden since secrets have a higher priority
                         .addToData("some.prop1", "val1")
                         .addToData("some.prop2", "val2")
+                        .addToData("some.prop4", "v4") // will be overridden since cmap2 has a higher priority
                         .addToData("some.prop5", "val5")
                         .addToData("application.properties", "some.prop3=val3")
                         .addToData("application.yaml", "some:\n  prop4: val4").build())
@@ -33,6 +38,26 @@ public void configureMockServer(KubernetesMockServer mockServer) {
                         .addToData("application.properties", "some.prop3=val3FromDemo")
                         .addToData("application.yaml", "some:\n  prop4: val4FromDemo").build())
                 .once();
+
+        mockServer.expect().get().withPath("/api/v1/namespaces/test/secrets/s1")
+                .andReturn(200, secretBuilder("s1")
+                        .addToData("dummysecret", encodeValue("dummysecret"))
+                        .addToData("overridden.secret", encodeValue("secret"))
+                        .addToData("secret.prop1", encodeValue("val1"))
+                        .addToData("secret.prop2", encodeValue("val2"))
+                        .addToData("application.properties", encodeValue("secret.prop3=val3"))
+                        .addToData("application.yaml", encodeValue("secret:\n  prop4: val4")).build())
+                .once();
+
+        mockServer.expect().get().withPath("/api/v1/namespaces/demo/secrets/s1")
+                .andReturn(200, secretBuilder("s1")
+                        .addToData("dummysecret", encodeValue("dummysecretFromDemo"))
+                        .addToData("overridden.secret", encodeValue("secretFromDemo"))
+                        .addToData("secret.prop1", encodeValue("val1FromDemo"))
+                        .addToData("secret.prop2", encodeValue("val2FromDemo"))
+                        .addToData("application.properties", encodeValue("secret.prop3=val3FromDemo"))
+                        .addToData("application.yaml", encodeValue("secret:\n  prop4: val4FromDemo")).build())
+                .once();
     }
 
     private ConfigMapBuilder configMapBuilder(String name) {
@@ -40,4 +65,12 @@ private ConfigMapBuilder configMapBuilder(String name) {
                 .withName(name).endMetadata();
     }
 
+    private SecretBuilder secretBuilder(String name) {
+        return new SecretBuilder().withNewMetadata()
+                .withName(name).endMetadata();
+    }
+
+    private String encodeValue(String value) {
+        return Base64.getEncoder().encodeToString(value.getBytes());
+    }
 }
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesTestServerTestResource.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesTestServerTestResource.java
new file mode 100644
index 0000000000000..a28944ab803c4
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/CustomKubernetesTestServerTestResource.java
@@ -0,0 +1,65 @@
+package io.quarkus.it.kubernetes.client;
+
+import java.util.Base64;
+
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
+import io.fabric8.kubernetes.api.model.SecretBuilder;
+import io.quarkus.test.kubernetes.client.KubernetesServerTestResource;
+
+public class CustomKubernetesTestServerTestResource extends KubernetesServerTestResource {
+
+    // setup the ConfigMap objects that the application expects to lookup configuration from
+    @Override
+    protected void configureServer() {
+        server.getClient().inNamespace("test").configMaps().create(configMapBuilder("cmap1")
+                .addToData("dummy", "dummy")
+                .addToData("overridden.secret", "cm") // will be overridden since secrets have a higher priority
+                .addToData("some.prop1", "val1")
+                .addToData("some.prop2", "val2")
+                .addToData("some.prop4", "v4") // will be overridden since cmap2 has a higher priority
+                .addToData("some.prop5", "val5")
+                .addToData("application.properties", "some.prop3=val3")
+                .addToData("application.yaml", "some:\n  prop4: val4").build());
+
+        server.getClient().inNamespace("test").configMaps().create(configMapBuilder("cmap2")
+                .addToData("application.yaml", "some:\n  prop4: val4").build());
+
+        server.getClient().inNamespace("test").configMaps().create(configMapBuilder("cmap3")
+                .addToData("dummy", "dummyFromDemo")
+                .addToData("some.prop1", "val1FromDemo")
+                .addToData("some.prop2", "val2FromDemo")
+                .addToData("some.prop5", "val5FromDemo")
+                .addToData("application.properties", "some.prop3=val3FromDemo")
+                .addToData("application.yaml", "some:\n  prop4: val4FromDemo").build());
+
+        server.getClient().inNamespace("test").secrets().create(secretBuilder("s1")
+                .addToData("dummysecret", encodeValue("dummysecret"))
+                .addToData("overridden.secret", encodeValue("secret"))
+                .addToData("secret.prop1", encodeValue("val1"))
+                .addToData("secret.prop2", encodeValue("val2"))
+                .addToData("application.properties", encodeValue("secret.prop3=val3"))
+                .addToData("application.yaml", encodeValue("secret:\n  prop4: val4")).build());
+
+        server.getClient().inNamespace("test").secrets().create(secretBuilder("s1")
+                .addToData("dummysecret", encodeValue("dummysecretFromDemo"))
+                .addToData("overridden.secret", encodeValue("secretFromDemo"))
+                .addToData("secret.prop1", encodeValue("val1FromDemo"))
+                .addToData("secret.prop2", encodeValue("val2FromDemo"))
+                .addToData("application.properties", encodeValue("secret.prop3=val3FromDemo"))
+                .addToData("application.yaml", encodeValue("secret:\n  prop4: val4FromDemo")).build());
+    }
+
+    private ConfigMapBuilder configMapBuilder(String name) {
+        return new ConfigMapBuilder().withNewMetadata()
+                .withName(name).endMetadata();
+    }
+
+    private SecretBuilder secretBuilder(String name) {
+        return new SecretBuilder().withNewMetadata()
+                .withName(name).endMetadata();
+    }
+
+    private String encodeValue(String value) {
+        return Base64.getEncoder().encodeToString(value.getBytes());
+    }
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTest.java
index cb1998866e8b3..304cc1e5bb779 100644
--- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTest.java
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesClientTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.kubernetes.client;
 
+import static java.net.HttpURLConnection.HTTP_CONFLICT;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 
@@ -18,7 +19,7 @@
  * KubernetesClientTest.TestResource contains the entire process of setting up the Mock Kubernetes API Server
  * It has to live there otherwise the Kubernetes client in native mode won't be able to locate the mock API Server
  */
-@QuarkusTestResource(CustomKubernetesMockServerTestResource.class)
+@QuarkusTestResource(value = CustomKubernetesMockServerTestResource.class, restrictToAnnotatedClass = true)
 @QuarkusTest
 public class KubernetesClientTest {
 
@@ -26,24 +27,57 @@ public class KubernetesClientTest {
     private KubernetesMockServer mockServer;
 
     @Test
-    public void before() {
+    public void testInteractionWithAPIServer() {
+        setupMockServerForTest();
+
+        RestAssured.when().get("/pod/test").then()
+                .body("size()", is(2)).body(containsString("pod1"), containsString("pod2"));
+
+        RestAssured.when().delete("/pod/test").then()
+                .statusCode(204);
+
+        RestAssured.when().put("/pod/test").then()
+                .body(containsString("value1"));
+
+        RestAssured.when().post("/pod/test").then()
+                .body(containsString("54321"));
+    }
+
+    private void setupMockServerForTest() {
         Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
         Pod pod2 = new PodBuilder().withNewMetadata().withName("pod2").withNamespace("test").and().build();
 
+        /*
+         * We take special care here to only create as many mock responses as this specific test class needs
+         * This is done in order to avoid leaking mock responses into other tests
+         */
+
         mockServer.expect().get().withPath("/api/v1/namespaces/test/pods")
                 .andReturn(200,
                         new PodListBuilder().withNewMetadata().withResourceVersion("1").endMetadata().withItems(pod1, pod2)
                                 .build())
-                .always();
+                // GET /pod/test,
+                // DELETE /pod/test,
+                // PUT /pod/test
+                // all list the pods
+                .times(3);
 
         mockServer.expect().get().withPath("/api/v1/namespaces/test/pods/pod1")
                 .andReturn(200, pod1)
-                .always();
+                // DELETE /pod/test,
+                // PUT /pod/test
+                // both look at this endpoint to see if the pod exists
+                .times(2);
 
         mockServer.expect().delete().withPath("/api/v1/namespaces/test/pods/pod1")
                 .andReturn(200, "{}")
                 .once();
 
+        // PUT on /pod/test will createOrReplace, which attempts a POST first, then a PUT if receiving a 409
+        mockServer.expect().post().withPath("/api/v1/namespaces/test/pods")
+                .andReturn(HTTP_CONFLICT, "{}")
+                .once();
+
         // it doesn't really matter what we return here, we just need to return a Pod to make sure
         // deserialization works
         mockServer.expect().put().withPath("/api/v1/namespaces/test/pods/pod1").andReturn(200, new PodBuilder()
@@ -54,19 +88,4 @@ public void before() {
                 .withNewMetadata().withResourceVersion("54321").and().build()).once();
     }
 
-    @Test
-    public void testInteractionWithAPIServer() {
-        RestAssured.when().get("/pod/test").then()
-                .body("size()", is(2)).body(containsString("pod1"), containsString("pod2"));
-
-        RestAssured.when().delete("/pod/test").then()
-                .statusCode(204);
-
-        RestAssured.when().put("/pod/test").then()
-                .body(containsString("value1"));
-
-        RestAssured.when().post("/pod/test").then()
-                .body(containsString("54321"));
-    }
-
 }
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesNewClientTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesNewClientTest.java
new file mode 100644
index 0000000000000..2222bbb00a8ed
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesNewClientTest.java
@@ -0,0 +1,52 @@
+package io.quarkus.it.kubernetes.client;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.kubernetes.client.KubernetesTestServer;
+import io.restassured.RestAssured;
+
+/*
+ * KubernetesClientTest.TestResource contains the entire process of setting up the Mock Kubernetes API Server
+ * It has to live there otherwise the Kubernetes client in native mode won't be able to locate the mock API Server
+ */
+@QuarkusTestResource(value = CustomKubernetesTestServerTestResource.class, restrictToAnnotatedClass = true)
+@QuarkusTest
+public class KubernetesNewClientTest {
+
+    @KubernetesTestServer
+    private KubernetesServer mockServer;
+
+    @Test
+    public void testInteractionWithAPIServer() throws InterruptedException {
+        setupMockServerForTest();
+
+        RestAssured.when().get("/pod/test").then()
+                .body("size()", is(2)).body(containsString("pod1"), containsString("pod2"));
+
+        RestAssured.when().delete("/pod/test").then()
+                .statusCode(204);
+
+        RestAssured.when().put("/pod/test").then()
+                .body(containsString("value1"));
+
+        RestAssured.when().post("/pod/test").then()
+                .body(containsString("12345"));
+    }
+
+    private void setupMockServerForTest() {
+        Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
+        Pod pod2 = new PodBuilder().withNewMetadata().withName("pod2").withNamespace("test").and().build();
+
+        mockServer.getClient().inNamespace("test").pods().create(pod1);
+        mockServer.getClient().inNamespace("test").pods().create(pod2);
+    }
+
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesNewClientTestIT.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesNewClientTestIT.java
new file mode 100644
index 0000000000000..24e771ca88ccd
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesNewClientTestIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.kubernetes.client;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class KubernetesNewClientTestIT extends KubernetesNewClientTest {
+
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesTestServerOnProfileTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesTestServerOnProfileTest.java
new file mode 100644
index 0000000000000..6bb8e6d2c4222
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesTestServerOnProfileTest.java
@@ -0,0 +1,72 @@
+package io.quarkus.it.kubernetes.client;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+import io.quarkus.test.kubernetes.client.KubernetesTestServer;
+import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
+
+/*
+ * This class has no native-image test because it relies on setting config overrides that clash
+ * with native image build config.
+ * This is the same test as KubernetesTestServerTest but with the test resource annotation on the profile
+ */
+@TestProfile(KubernetesTestServerOnProfileTest.MyProfile.class)
+@QuarkusTest
+public class KubernetesTestServerOnProfileTest {
+
+    private static KubernetesServer setupServer;
+
+    public static class Setup implements Consumer<KubernetesServer> {
+
+        @Override
+        public void accept(KubernetesServer t) {
+            setupServer = t;
+        }
+
+    }
+
+    @KubernetesTestServer
+    private KubernetesServer mockServer;
+
+    @Test
+    public void testConfiguration() throws InterruptedException {
+        // we can't really test CRUD, and HTTPS doesn't work
+        Assertions.assertEquals(10001, mockServer.getMockServer().getPort());
+        Assertions.assertSame(mockServer, setupServer);
+    }
+
+    @WithKubernetesTestServer(https = false, crud = true, port = 10001, setup = KubernetesTestServerOnProfileTest.Setup.class)
+    public static class MyProfile implements QuarkusTestProfile {
+
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> overrides = new HashMap<>();
+            // do not fetch config from kubernetes
+            overrides.put("quarkus.kubernetes-config.enabled", "false");
+            overrides.put("quarkus.kubernetes-config.secrets.enabled", "false");
+            // get rid of errors due to us not populating config from kubernetes
+            overrides.put("dummy", "asd");
+            overrides.put("some.prop1", "asd");
+            overrides.put("some.prop2", "asd");
+            overrides.put("some.prop3", "asd");
+            overrides.put("some.prop4", "asd");
+            overrides.put("some.prop5", "asd");
+            overrides.put("secret.prop1", "asd");
+            overrides.put("secret.prop2", "asd");
+            overrides.put("secret.prop3", "asd");
+            overrides.put("secret.prop4", "asd");
+            overrides.put("overridden.secret", "asd");
+            overrides.put("dummysecret", "asd");
+            return overrides;
+        }
+    }
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesTestServerTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesTestServerTest.java
new file mode 100644
index 0000000000000..f2c185005b7bd
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/KubernetesTestServerTest.java
@@ -0,0 +1,70 @@
+package io.quarkus.it.kubernetes.client;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+import io.quarkus.test.kubernetes.client.KubernetesTestServer;
+import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
+
+/*
+ * This class has no native-image test because it relies on setting config overrides that clash
+ * with native image build config.
+ */
+@TestProfile(KubernetesTestServerTest.MyProfile.class)
+@WithKubernetesTestServer(https = false, crud = true, port = 10001, setup = KubernetesTestServerTest.Setup.class)
+@QuarkusTest
+public class KubernetesTestServerTest {
+
+    private static KubernetesServer setupServer;
+
+    public static class Setup implements Consumer<KubernetesServer> {
+
+        @Override
+        public void accept(KubernetesServer t) {
+            setupServer = t;
+        }
+
+    }
+
+    @KubernetesTestServer
+    private KubernetesServer mockServer;
+
+    @Test
+    public void testConfiguration() throws InterruptedException {
+        // we can't really test CRUD, and HTTPS doesn't work
+        Assertions.assertEquals(10001, mockServer.getMockServer().getPort());
+        Assertions.assertSame(mockServer, setupServer);
+    }
+
+    public static class MyProfile implements QuarkusTestProfile {
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> overrides = new HashMap<>();
+            // do not fetch config from kubernetes
+            overrides.put("quarkus.kubernetes-config.enabled", "false");
+            overrides.put("quarkus.kubernetes-config.secrets.enabled", "false");
+            // get rid of errors due to us not populating config from kubernetes
+            overrides.put("dummy", "asd");
+            overrides.put("some.prop1", "asd");
+            overrides.put("some.prop2", "asd");
+            overrides.put("some.prop3", "asd");
+            overrides.put("some.prop4", "asd");
+            overrides.put("some.prop5", "asd");
+            overrides.put("secret.prop1", "asd");
+            overrides.put("secret.prop2", "asd");
+            overrides.put("secret.prop3", "asd");
+            overrides.put("secret.prop4", "asd");
+            overrides.put("overridden.secret", "asd");
+            overrides.put("dummysecret", "asd");
+            return overrides;
+        }
+    }
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/NamespacedConfigMapPropertiesTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/NamespacedConfigMapPropertiesTest.java
index 7eaec8fd683de..ea203c1c90b15 100644
--- a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/NamespacedConfigMapPropertiesTest.java
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/NamespacedConfigMapPropertiesTest.java
@@ -1,7 +1,5 @@
 package io.quarkus.it.kubernetes.client;
 
-import static io.quarkus.it.kubernetes.client.ConfigMapPropertiesTest.assertProperty;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,19 +10,25 @@
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
 
-@QuarkusTestResource(CustomKubernetesMockServerTestResource.class)
+@QuarkusTestResource(value = CustomKubernetesMockServerTestResource.class, restrictToAnnotatedClass = true)
 @TestProfile(NamespacedConfigMapPropertiesTest.MyProfile.class)
 @QuarkusTest
 public class NamespacedConfigMapPropertiesTest {
 
     @Test
     public void testPropertiesReadFromConfigMap() {
-        assertProperty("dummy", "dummyFromDemo");
-        assertProperty("someProp1", "val1FromDemo");
-        assertProperty("someProp2", "val2FromDemo");
-        assertProperty("someProp3", "val3FromDemo");
-        assertProperty("someProp4", "val4FromDemo");
-        assertProperty("someProp5", "val5FromDemo");
+        ConfigMapPropertiesTest.assertProperty("dummy", "dummyFromDemo");
+        ConfigMapPropertiesTest.assertProperty("someProp1", "val1FromDemo");
+        ConfigMapPropertiesTest.assertProperty("someProp2", "val2FromDemo");
+        ConfigMapPropertiesTest.assertProperty("someProp3", "val3FromDemo");
+        ConfigMapPropertiesTest.assertProperty("someProp4", "val4FromDemo");
+        ConfigMapPropertiesTest.assertProperty("someProp5", "val5FromDemo");
+
+        SecretPropertiesTest.assertProperty("dummysecret", "dummysecretFromDemo");
+        SecretPropertiesTest.assertProperty("secretProp1", "val1FromDemo");
+        SecretPropertiesTest.assertProperty("secretProp2", "val2FromDemo");
+        SecretPropertiesTest.assertProperty("secretProp3", "val3FromDemo");
+        SecretPropertiesTest.assertProperty("secretProp4", "val4FromDemo");
     }
 
     public static class MyProfile implements QuarkusTestProfile {
@@ -36,6 +40,7 @@ public Map<String, String> getConfigOverrides() {
             conf.put("quarkus.kubernetes-config.config-maps", "cmap3");
             conf.put("quarkus.kubernetes-config.namespace", "demo");
             conf.put("quarkus.kubernetes-config.secrets", "s1");
+            conf.put("quarkus.kubernetes-config.secrets.enabled", "true");
             return conf;
         }
 
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/SecretPropertiesIT.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/SecretPropertiesIT.java
new file mode 100644
index 0000000000000..5962e30562abf
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/SecretPropertiesIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.kubernetes.client;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class SecretPropertiesIT extends SecretPropertiesTest {
+}
diff --git a/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/SecretPropertiesTest.java b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/SecretPropertiesTest.java
new file mode 100644
index 0000000000000..425fef9d150f7
--- /dev/null
+++ b/integration-tests/kubernetes-client/src/test/java/io/quarkus/it/kubernetes/client/SecretPropertiesTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.kubernetes.client;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTestResource(value = CustomKubernetesMockServerTestResource.class, restrictToAnnotatedClass = true)
+@QuarkusTest
+public class SecretPropertiesTest {
+
+    @Test
+    public void testPropertiesReadFromConfigMap() {
+        assertProperty("dummysecret", "dummysecret");
+        assertProperty("overriddensecret", "secret");
+        assertProperty("secretProp1", "val1");
+        assertProperty("secretProp2", "val2");
+        assertProperty("secretProp3", "val3");
+        assertProperty("secretProp4", "val4");
+    }
+
+    public static void assertProperty(String propertyName, String expectedValue) {
+        given()
+                .when().get("/secretProperties/" + propertyName)
+                .then()
+                .statusCode(200)
+                .body(is(expectedValue));
+    }
+}
diff --git a/integration-tests/kubernetes-client/src/test/resources/application-demo.properties b/integration-tests/kubernetes-client/src/test/resources/application-demo.properties
index 8b73a6f298078..6b99ce437c620 100644
--- a/integration-tests/kubernetes-client/src/test/resources/application-demo.properties
+++ b/integration-tests/kubernetes-client/src/test/resources/application-demo.properties
@@ -2,4 +2,4 @@ quarkus.kubernetes-config.enabled=true
 quarkus.kubernetes-config.config-maps=cmap4
 quarkus.kubernetes-config.namespace=demo
 quarkus.kubernetes-config.secrets=s1
-
+quarkus.kubernetes-config.secrets.enabled=true
diff --git a/integration-tests/kubernetes-service-binding-jdbc/pom.xml b/integration-tests/kubernetes-service-binding-jdbc/pom.xml
new file mode 100644
index 0000000000000..67becae685e91
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/pom.xml
@@ -0,0 +1,297 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-k8s-service-binding-jdbc</artifactId>
+    <name>Quarkus - Integration Tests - Kubernetes Service Binding JDBC</name>
+
+    <properties>
+        <postgres.image>postgres:13.1</postgres.image>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-service-binding-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-postgresql</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <quarkus.kubernetes-service-binding.root>
+                                    ${project.basedir}/src/test/resources/k8s-sb
+                                </quarkus.kubernetes-service-binding.root>
+                                <quarkus.kubernetes-service-binding.enabled>true</quarkus.kubernetes-service-binding.enabled>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <quarkus.kubernetes-service-binding.root>
+                                    ${project.basedir}/src/test/resources/k8s-sb
+                                </quarkus.kubernetes-service-binding.root>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>
+                                            ${project.build.directory}/${project.build.finalName}-runner
+                                        </native.image.path>
+                                        <systemPropertyVariables>
+                                            <quarkus.kubernetes-service-binding.root>
+                                                ${project.basedir}/src/test/resources/k8s-sb
+                                            </quarkus.kubernetes-service-binding.root>
+                                            <quarkus.kubernetes-service-binding.enabled>true</quarkus.kubernetes-service-binding.enabled>
+                                        </systemPropertyVariables>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>docker-postgresql</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${postgres.image}</name>
+                                    <alias>postgresql</alias>
+                                    <run>
+                                        <env>
+                                            <POSTGRES_USER>quarkus_test</POSTGRES_USER>
+                                            <POSTGRES_PASSWORD>quarkus_test</POSTGRES_PASSWORD>
+                                            <POSTGRES_DB>quarkus_test</POSTGRES_DB>
+                                        </env>
+                                        <ports>
+                                            <port>5431:5432</port>
+                                        </ports>
+                                        <wait>
+                                            <tcp>
+                                                <mode>mapped</mode>
+                                                <ports>
+                                                    <port>5432</port>
+                                                </ports>
+                                            </tcp>
+                                            <time>10000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <!--Stops all postgres images currently running, not just those we just started.
+                              Useful to stop processes still running from a previously failed integration test run -->
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${docker-prune.location}</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
+
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java
new file mode 100644
index 0000000000000..9d60a9f3bb8ce
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/Fruit.java
@@ -0,0 +1,48 @@
+package io.quarkus.it.k8ssb.jdbc;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.QueryHint;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "known_fruits")
+@NamedQuery(name = "Fruits.findAll", query = "SELECT f FROM Fruit f ORDER BY f.name", hints = @QueryHint(name = "org.hibernate.cacheable", value = "true"))
+public class Fruit {
+
+    @Id
+    @SequenceGenerator(name = "fruitsSequence", sequenceName = "known_fruits_id_seq", allocationSize = 1, initialValue = 10)
+    @GeneratedValue(generator = "fruitsSequence")
+    private Integer id;
+
+    @Column(length = 40, unique = true)
+    private String name;
+
+    public Fruit() {
+    }
+
+    public Fruit(String name) {
+        this.name = name;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java
new file mode 100644
index 0000000000000..d5f663f9deaa9
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/main/java/io/quarkus/it/k8ssb/jdbc/FruitResource.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.k8ssb.jdbc;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import io.smallrye.common.annotation.Blocking;
+
+@Path("fruits")
+public class FruitResource {
+
+    @Inject
+    EntityManager entityManager;
+
+    @GET
+    @Blocking
+    @Produces("application/json")
+    @Consumes("application/json")
+    public List<Fruit> get() {
+        return entityManager.createNamedQuery("Fruits.findAll", Fruit.class)
+                .getResultList();
+    }
+}
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/main/resources/application.properties b/integration-tests/kubernetes-service-binding-jdbc/src/main/resources/application.properties
new file mode 100644
index 0000000000000..debf9eec5562f
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.sql-load-script=import.sql
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/main/resources/import.sql b/integration-tests/kubernetes-service-binding-jdbc/src/main/resources/import.sql
new file mode 100644
index 0000000000000..2fffc825cfd97
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/main/resources/import.sql
@@ -0,0 +1,3 @@
+INSERT INTO known_fruits(id, name) VALUES (1, 'Cherry');
+INSERT INTO known_fruits(id, name) VALUES (2, 'Apple');
+INSERT INTO known_fruits(id, name) VALUES (3, 'Banana');
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/java/io/quarkus/it/k8ssb/jdbc/FruitsEndpointTest.java b/integration-tests/kubernetes-service-binding-jdbc/src/test/java/io/quarkus/it/k8ssb/jdbc/FruitsEndpointTest.java
new file mode 100644
index 0000000000000..3f48e622bdbbb
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/java/io/quarkus/it/k8ssb/jdbc/FruitsEndpointTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.k8ssb.jdbc;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class FruitsEndpointTest {
+
+    @Test
+    public void testListAllFruits() {
+        given()
+                .when().get("/fruits")
+                .then()
+                .statusCode(200)
+                .body(
+                        containsString("Cherry"),
+                        containsString("Apple"),
+                        containsString("Banana"));
+    }
+
+}
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/database b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/database
new file mode 100644
index 0000000000000..39cd31f5ffa44
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/database
@@ -0,0 +1 @@
+quarkus_test
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/host b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/host
new file mode 100644
index 0000000000000..2fbb50c4a8dc7
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/host
@@ -0,0 +1 @@
+localhost
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/password b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/password
new file mode 100644
index 0000000000000..39cd31f5ffa44
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/password
@@ -0,0 +1 @@
+quarkus_test
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/port b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/port
new file mode 100644
index 0000000000000..7e30bed39582f
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/port
@@ -0,0 +1 @@
+5431
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/type b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/type
new file mode 100644
index 0000000000000..a02a1cc751d91
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/type
@@ -0,0 +1 @@
+postgresql
diff --git a/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/username b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/username
new file mode 100644
index 0000000000000..39cd31f5ffa44
--- /dev/null
+++ b/integration-tests/kubernetes-service-binding-jdbc/src/test/resources/k8s-sb/fruit-db/username
@@ -0,0 +1 @@
+quarkus_test
diff --git a/integration-tests/kubernetes/disable-native-profile b/integration-tests/kubernetes/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/kubernetes/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/kubernetes/maven-invoker-way/pom.xml b/integration-tests/kubernetes/maven-invoker-way/pom.xml
index 9c598ad56bfcb..7d7652dba5c4c 100644
--- a/integration-tests/kubernetes/maven-invoker-way/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-test-kubernetes-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-kubernetes-invoker</artifactId>
@@ -41,6 +40,21 @@
             <artifactId>knative-annotations</artifactId>
             <classifier>noapt</classifier>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <testResources>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/invoker.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/invoker.properties
index 30fa8f402eb68..8ef5dcfe58a8c 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/invoker.properties
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/invoker.properties
@@ -1,4 +1,5 @@
 # invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native 
-invoker.goals=clean package -Dquarkus.kubernetes.deploy=true
+# ensure that an attempt to deploy is made, but that the attempt fails (as we don't want to deploy this test application to a cluster that the runner of test may have configured)
+invoker.goals=clean package -Dquarkus.kubernetes.deploy=true -Dquarkus.kubernetes-client.master-url=http://localhost:12345
 # expect a failure since there is no Kubernetes cluster to deploy to
 invoker.buildResult = failure
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/pom.xml
index 6c4bbaa1ff346..57b4b92f8bc9f 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy/pom.xml
@@ -81,6 +81,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -90,21 +93,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/invoker.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/invoker.properties
index 30fa8f402eb68..0bb67aa6669ff 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/invoker.properties
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/invoker.properties
@@ -1,4 +1,5 @@
-# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native 
-invoker.goals=clean package -Dquarkus.kubernetes.deploy=true
+# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native
+# ensure that an attempt to deploy is made, but that the attempt fails (as we don't want to deploy this test application to a cluster that the runner of test may have configured)
+invoker.goals=clean package -Dquarkus.kubernetes.deploy=true -Dquarkus.kubernetes-client.master-url=http://localhost:12345
 # expect a failure since there is no Kubernetes cluster to deploy to
 invoker.buildResult = failure
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
index 9e2e507faa286..6f3c37f64d0ef 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
@@ -81,6 +81,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -90,21 +93,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-manifest/pom.xml
index c56cd03ec515f..6434391d251c3 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-manifest/pom.xml
@@ -81,6 +81,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -90,21 +93,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties
new file mode 100644
index 0000000000000..f0dfb6e6c40a1
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/invoker.properties
@@ -0,0 +1,2 @@
+# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native 
+invoker.goals=clean package
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
new file mode 100644
index 0000000000000..254339e82e686
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>minikube-with-existing-manifest</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <properties>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>@project.version@</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-kubernetes</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-minikube</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-docker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <maven.home>${maven.home}</maven.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skipTests>${native.surefire.skip}</skipTests>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/docker/Dockerfile.jvm b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/docker/Dockerfile.jvm
new file mode 100644
index 0000000000000..fa97e4b117200
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/docker/Dockerfile.jvm
@@ -0,0 +1,22 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the docker image run:
+#
+# mvn package
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/getting-started-jvm .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/getting-started-jvm
+#
+###
+FROM fabric8/java-alpine-openjdk8-jre
+ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV AB_ENABLED=jmx_exporter
+COPY target/lib/* /deployments/lib/
+COPY target/*-runner.jar /deployments/app.jar
+ENTRYPOINT [ "/deployments/run-java.sh" ]
\ No newline at end of file
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java
new file mode 100644
index 0000000000000..ad80766a17747
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/java/org/acme/Hello.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class Hello {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json
new file mode 100644
index 0000000000000..caca28a449307
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json
@@ -0,0 +1,119 @@
+[
+  {
+    "apiVersion": "v1",
+    "kind": "Service",
+    "metadata": {
+      "labels": {
+        "app.kubernetes.io/name": "postgres",
+        "app.kubernetes.io/version" : "10.6"
+      },
+      "name": "postgres"
+    },
+    "spec": {
+      "ports": [
+        {
+          "name": "tcp",
+          "port": 5432,
+          "protocol": "TCP",
+          "targetPort": 5432
+        }
+      ],
+      "selector": {
+        "app.kubernetes.io/name": "postgres",
+        "app.kubernetes.io/version" : "10.6"
+      },
+      "sessionAffinity": "None",
+      "type": "ClusterIP"
+    }
+  },
+  {
+    "apiVersion": "apps/v1",
+    "kind": "Deployment",
+    "metadata": {
+      "labels": {
+        "app.kubernetes.io/name": "postgres",
+        "app.kubernetes.io/version" : "10.6"
+      },
+      "name": "postgres"
+    },
+    "spec": {
+      "progressDeadlineSeconds": 600,
+      "replicas": 1,
+      "selector" : {
+        "matchLabels": {
+          "app.kubernetes.io/name": "postgres",
+          "app.kubernetes.io/version" : "10.6"
+        }
+      },
+      "strategy": {
+        "rollingUpdate": {
+          "maxSurge": "25%",
+          "maxUnavailable": "25%"
+        },
+        "type": "RollingUpdate"
+      },
+      "template": {
+        "metadata": {
+          "labels": {
+            "app.kubernetes.io/name": "postgres",
+            "app.kubernetes.io/version" : "10.6"
+          }
+        },
+        "spec": {
+          "containers": [
+            {
+              "env": [
+                {
+                  "name": "POSTGRES_USER",
+                  "value": "controls"
+                },
+                {
+                  "name": "POSTGRES_PASSWORD",
+                  "value": "controls"
+                },
+                {
+                  "name": "POSTGRES_DB",
+                  "value": "controls_db"
+                }
+              ],
+              "image": "postgres:10.6",
+              "imagePullPolicy": "IfNotPresent",
+              "name": "postgres",
+              "ports": [
+                {
+                  "containerPort": 5432,
+                  "protocol": "TCP"
+                }
+              ],
+              "readinessProbe": {
+                "timeoutSeconds": 1,
+                "initialDelaySeconds": 5,
+                "exec": {
+                  "command": [ "psql", "-U", "$(POSTGRES_USER)", "-d", "$(POSTGRES_DB)", "-c", "SELECT 1" ]
+                }
+              },
+              "livenessProbe": {
+                "timeoutSeconds": 10,
+                "initialDelaySeconds": 120,
+                "exec": {
+                  "command": [ "psql", "-U", "$(POSTGRES_USER)", "-d", "$(POSTGRES_DB)", "-c", "SELECT 1" ]
+                }
+              },
+              "resources": {},
+              "securityContext": {
+                "privileged": false
+              },
+              "terminationMessagePath": "/dev/termination-log",
+              "terminationMessagePolicy": "File"
+            }
+          ],
+          "dnsPolicy": "ClusterFirst",
+          "restartPolicy": "Always",
+          "schedulerName": "default-scheduler",
+          "securityContext": {},
+          "terminationGracePeriodSeconds": 30
+        }
+      }
+    }
+  }
+]
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/resources/application.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/resources/application.properties
new file mode 100644
index 0000000000000..75b9417d6dc14
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+# key = value
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/verify.groovy b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/verify.groovy
new file mode 100644
index 0000000000000..e0ffe79f260c8
--- /dev/null
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/verify.groovy
@@ -0,0 +1,48 @@
+import io.dekorate.utils.Serialization
+import io.dekorate.deps.kubernetes.api.model.KubernetesList
+import io.dekorate.deps.kubernetes.api.model.Container
+import io.dekorate.deps.kubernetes.api.model.Service
+import io.dekorate.deps.kubernetes.api.model.apps.Deployment;
+
+//Check that file exits
+String base = basedir
+File kubernetesYml = new File(base, "target/kubernetes/minikube.yml")
+assert kubernetesYml.exists()
+kubernetesYml.withInputStream { stream -> 
+    //Check that its parse-able
+    KubernetesList list = Serialization.unmarshalAsList(stream)
+    assert list != null
+
+    //Check that it contains the existing Service provided
+    Service service = list.items.find{ r -> r.kind == "Service" && r.metadata.name == "postgres"}
+    assert service != null
+    assert service.metadata.labels.get("app.kubernetes.io/name") == "postgres"
+    assert service.metadata.labels.get("app.kubernetes.io/version") == "10.6"
+    assert service.spec.selector.get("app.kubernetes.io/name") == "postgres"
+    assert service.spec.selector.get("app.kubernetes.io/version") == "10.6"
+
+    //Check that it contains the existing Deployment with provided labels and selector
+    Deployment deploymentProvided = list.items.find{r -> r.kind == "Deployment" && r.metadata.name == "postgres"}
+    assert deploymentProvided != null
+    assert deploymentProvided.metadata.labels.get("app.kubernetes.io/name") == "postgres"
+    assert deploymentProvided.metadata.labels.get("app.kubernetes.io/version") == "10.6"
+    assert deploymentProvided.spec.replicas == 1
+    
+    assert deploymentProvided.spec.selector.matchLabels.get("app.kubernetes.io/name") == "postgres"
+    assert deploymentProvided.spec.selector.matchLabels.get("app.kubernetes.io/version") == "10.6"
+
+    Container container = deploymentProvided.spec.template.spec.containers[0]
+    assert container != null
+    assert container.name == "postgres"
+    assert container.ports.find{p -> p.protocol = "TCP"}.containerPort == 5432
+
+    //Check that it created the application's Deployment with right labels and selector
+    Deployment deployment = list.items.find{r -> r.kind == "Deployment" && r.metadata.name == "minikube-with-existing-manifest"}
+    assert deployment != null
+    assert deployment.metadata.labels.get("app.kubernetes.io/name") == "minikube-with-existing-manifest"
+    assert deployment.metadata.labels.get("app.kubernetes.io/version") == "0.1-SNAPSHOT"
+    assert deployment.spec.replicas == 1
+
+    assert deployment.spec.selector.matchLabels.get("app.kubernetes.io/name") == "minikube-with-existing-manifest"
+    assert deployment.spec.selector.matchLabels.get("app.kubernetes.io/version") == "0.1-SNAPSHOT"
+}
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/invoker.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/invoker.properties
index 30fa8f402eb68..0bb67aa6669ff 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/invoker.properties
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/invoker.properties
@@ -1,4 +1,5 @@
-# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native 
-invoker.goals=clean package -Dquarkus.kubernetes.deploy=true
+# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native
+# ensure that an attempt to deploy is made, but that the attempt fails (as we don't want to deploy this test application to a cluster that the runner of test may have configured)
+invoker.goals=clean package -Dquarkus.kubernetes.deploy=true -Dquarkus.kubernetes-client.master-url=http://localhost:12345
 # expect a failure since there is no Kubernetes cluster to deploy to
 invoker.buildResult = failure
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
index 0f24bb4e34235..82695e12d002d 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
@@ -81,6 +81,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -90,21 +93,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/invoker.properties b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/invoker.properties
index 30fa8f402eb68..0bb67aa6669ff 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/invoker.properties
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/invoker.properties
@@ -1,4 +1,5 @@
-# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native 
-invoker.goals=clean package -Dquarkus.kubernetes.deploy=true
+# invoker.goals=clean package -Dquarkus.container.build=true -Dquarkus.package.type=native
+# ensure that an attempt to deploy is made, but that the attempt fails (as we don't want to deploy this test application to a cluster that the runner of test may have configured)
+invoker.goals=clean package -Dquarkus.kubernetes.deploy=true -Dquarkus.kubernetes-client.master-url=http://localhost:12345
 # expect a failure since there is no Kubernetes cluster to deploy to
 invoker.buildResult = failure
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
index 662af06cdfe27..32a94ef505d3c 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -77,6 +77,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -86,21 +89,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index ee8b234fa2409..3b8f2f7a5c391 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-integration-tests-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>quarkus-integration-test-kubernetes-parent</artifactId>
diff --git a/integration-tests/kubernetes/quarkus-standard-way/pom.xml b/integration-tests/kubernetes/quarkus-standard-way/pom.xml
index afc14fb00e602..9baa22f4f1de0 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/pom.xml
+++ b/integration-tests/kubernetes/quarkus-standard-way/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-integration-test-kubernetes-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-kubernetes-standard</artifactId>
@@ -18,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -47,6 +46,10 @@
                     <groupId>javax.xml.bind</groupId>
                     <artifactId>jaxb-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
             </exclusions>
          </dependency>
          <dependency>
@@ -99,6 +102,34 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     
     <profiles>
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/main/docker/Dockerfile.jvm b/integration-tests/kubernetes/quarkus-standard-way/src/main/docker/Dockerfile.jvm
new file mode 100644
index 0000000000000..fa97e4b117200
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/main/docker/Dockerfile.jvm
@@ -0,0 +1,22 @@
+####
+# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
+#
+# Before building the docker image run:
+#
+# mvn package
+#
+# Then, build the image with:
+#
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/getting-started-jvm .
+#
+# Then run the container using:
+#
+# docker run -i --rm -p 8080:8080 quarkus/getting-started-jvm
+#
+###
+FROM fabric8/java-alpine-openjdk8-jre
+ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV AB_ENABLED=jmx_exporter
+COPY target/lib/* /deployments/lib/
+COPY target/*-runner.jar /deployments/app.jar
+ENTRYPOINT [ "/deployments/run-java.sh" ]
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java
index 7654193636c8c..90a6ff6a2d8ab 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicKubernetesTest.java
@@ -2,6 +2,7 @@
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
 import static org.hamcrest.Matchers.is;
 
 import java.io.IOException;
@@ -10,12 +11,12 @@
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.quarkus.test.LogFile;
 import io.quarkus.test.ProdBuildResults;
@@ -60,7 +61,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
 
-        assertThat(kubernetesList).hasSize(3);
+        assertThat(kubernetesList).hasSize(2);
 
         assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
             assertThat(d.getMetadata()).satisfies(m -> {
@@ -69,11 +70,16 @@ public void assertGeneratedResources() throws IOException {
             });
 
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getSelector()).isNotNull().satisfies(labelSelector -> {
+                    assertThat(labelSelector.getMatchLabels()).containsOnly(entry("app.kubernetes.io/name", "basic"),
+                            entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+                });
+
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getImagePullPolicy()).isEqualTo("Always"); // expect the default value
-                            assertThat(container.getPorts()).hasOnlyOneElementSatisfying(p -> {
+                            assertThat(container.getPorts()).singleElement().satisfies(p -> {
                                 assertThat(p.getContainerPort()).isEqualTo(8080);
                             });
                         });
@@ -87,16 +93,20 @@ public void assertGeneratedResources() throws IOException {
                 assertThat(m.getNamespace()).isNull();
             });
             assertThat(s.getSpec()).satisfies(spec -> {
-                assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                assertThat(spec.getSelector()).containsOnly(entry("app.kubernetes.io/name", "basic"),
+                        entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+
+                assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                     assertThat(p.getPort()).isEqualTo(8080);
                 });
             });
         });
+    }
 
-        assertThat(kubernetesList.get(2)).isInstanceOfSatisfying(ServiceAccount.class, sa -> {
-            assertThat(sa.getMetadata()).satisfies(m -> {
-                assertThat(m.getNamespace()).isNull();
-            });
-        });
+    @Disabled("flaky")
+    @Test
+    public void assertDependencies() {
+        Path mainDepsPath = prodModeTestResults.getBuildDir().resolve("quarkus-app").resolve("lib").resolve("main");
+        assertThat(mainDepsPath).isDirectoryNotContaining(p -> p.getFileName().toString().contains("kubernetes-client"));
     }
 }
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java
index 42c229ac4143e..ce0b9d038049b 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/BasicOpenshiftTest.java
@@ -1,11 +1,15 @@
 package io.quarkus.it.kubernetes;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
+import org.assertj.core.api.AbstractObjectAssert;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -39,20 +43,33 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> openshiftList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
 
-        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h.getMetadata()).satisfies(m -> {
                 assertThat(m.getName()).isEqualTo("basic-openshift");
                 assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
                 assertThat(m.getNamespace()).isNull();
             });
-            assertThat(h).extracting("spec").extracting("replicas").isEqualTo(1);
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("replicas").isEqualTo(1);
+            specAssert.extracting("triggers").isInstanceOfSatisfying(Collection.class, c -> {
+                assertThat(c).isEmpty();
+            });
+            specAssert.extracting("selector").isInstanceOfSatisfying(Map.class, selectorsMap -> {
+                assertThat(selectorsMap).containsOnly(entry("app.kubernetes.io/name", "basic-openshift"),
+                        entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+            });
         });
 
-        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata()).satisfies(m -> {
                     assertThat(m.getNamespace()).isNull();
                 });
+
+                assertThat(s.getSpec()).satisfies(spec -> {
+                    assertThat(spec.getSelector()).containsOnly(entry("app.kubernetes.io/name", "basic-openshift"),
+                            entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+                });
             });
         });
     }
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java
index 41db86e3a637a..b342e213977d2 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalContainerConcurrency.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).hasOnlyOneElementSatisfying(c -> {
+        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).singleElement().satisfies(c -> {
             assertThat(c.getMetadata()).satisfies(m -> assertThat(m.getName()).isEqualTo("config-autoscaler"));
             assertThat(c).isInstanceOfSatisfying(ConfigMap.class, m -> {
                 assertThat(m.getData()).contains(entry("container-concurrency", "100"));
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java
index f52de80da4bbb..ea86126af6310 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeGlobalRequestsPerSecond.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).hasOnlyOneElementSatisfying(c -> {
+        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).singleElement().satisfies(c -> {
             assertThat(c.getMetadata()).satisfies(m -> assertThat(m.getName()).isEqualTo("config-autoscaler"));
             assertThat(c).isInstanceOfSatisfying(ConfigMap.class, m -> {
                 assertThat(m.getData()).contains(entry("requests-per-second-target-default", "150"));
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java
index f5775bf4dad96..2a520be893770 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleBoundsTest.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata().getAnnotations()).contains(entry("autoscaling.knative.dev/minScale", "3"));
                 assertThat(s.getMetadata().getAnnotations()).contains(entry("autoscaling.knative.dev/maxScale", "5"));
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java
index 8c5041209fe75..0ff3b7fb1b470 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeScaleToZeroTest.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).hasOnlyOneElementSatisfying(c -> {
+        assertThat(kubernetesList).filteredOn(i -> "ConfigMap".equals(i.getKind())).singleElement().satisfies(c -> {
             assertThat(c.getMetadata()).satisfies(m -> assertThat(m.getName()).isEqualTo("config-autoscaler"));
             assertThat(c).isInstanceOfSatisfying(ConfigMap.class, m -> {
                 assertThat(m.getData()).contains(entry("enable-scale-to-zero", "false"));
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java
index 913bfd860822b..47ca9c79fd283 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeTest.java
@@ -40,7 +40,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertThat(s.getMetadata()).satisfies(m -> {
@@ -49,8 +49,8 @@ public void assertGeneratedResources() throws IOException {
 
                     assertThat(spec.getTemplate()).satisfies(template -> {
                         assertThat(template.getSpec()).satisfies(templateSpec -> {
-                            assertThat(templateSpec.getContainers()).hasSize(1).hasOnlyOneElementSatisfying(c -> {
-                                assertThat(c.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                            assertThat(templateSpec.getContainers()).hasSize(1).singleElement().satisfies(c -> {
+                                assertThat(c.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                                     assertThat(p.getName()).isEqualTo("http1");
                                 });
                             });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java
index 03865bf83fdff..345f90b7f3dcf 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithApplicationPropertiesTest.java
@@ -41,7 +41,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("knative.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertThat(s.getMetadata()).satisfies(m -> {
@@ -53,8 +53,8 @@ public void assertGeneratedResources() throws IOException {
 
                     assertThat(spec.getTemplate()).satisfies(template -> {
                         assertThat(template.getSpec()).satisfies(templateSpec -> {
-                            assertThat(templateSpec.getContainers()).hasSize(1).hasOnlyOneElementSatisfying(c -> {
-                                assertThat(c.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                            assertThat(templateSpec.getContainers()).hasSize(1).singleElement().satisfies(c -> {
+                                assertThat(c.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                                     assertThat(p.getName()).isEqualTo("http1");
                                 });
                             });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java
new file mode 100644
index 0000000000000..cf2a6c4178057
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithHealthTest.java
@@ -0,0 +1,92 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.knative.serving.v1.Service;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Probe;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KnativeWithHealthTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("knative-health")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("knative-with-health.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(
+                            new AppArtifact("io.quarkus", "quarkus-smallrye-health", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("knative.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("knative.yml"))
+                .satisfies(p -> assertThat(p.toFile().listFiles()).hasSize(2));
+
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("knative.yml"));
+
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
+            assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
+                assertThat(s.getSpec()).satisfies(spec -> {
+                    assertThat(s.getMetadata()).satisfies(m -> {
+                        assertThat(m.getNamespace()).isNull();
+                    });
+
+                    assertThat(spec.getTemplate()).satisfies(template -> {
+                        assertThat(template.getSpec()).satisfies(templateSpec -> {
+                            assertThat(templateSpec.getContainers()).hasSize(1).singleElement().satisfies(c -> {
+                                assertThat(c.getPorts()).hasSize(1).singleElement().satisfies(p -> {
+                                    assertThat(p.getName()).isEqualTo("http1");
+                                });
+                                assertThat(c.getReadinessProbe()).isNotNull().satisfies(p -> {
+                                    assertThat(p.getInitialDelaySeconds()).isEqualTo(0);
+                                    assertProbePath(p, "/q/health/ready");
+
+                                    assertNotNull(p.getHttpGet());
+                                    assertNull(p.getHttpGet().getPort());
+                                });
+                                assertThat(c.getLivenessProbe()).isNotNull().satisfies(p -> {
+                                    assertThat(p.getInitialDelaySeconds()).isEqualTo(20);
+                                    assertProbePath(p, "/q/health/live");
+
+                                    assertNotNull(p.getHttpGet());
+                                    assertNull(p.getHttpGet().getPort());
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+
+    private void assertProbePath(Probe p, String expectedPath) {
+        assertThat(p.getHttpGet()).satisfies(h -> {
+            assertThat(h.getPath()).isEqualTo(expectedPath);
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java
new file mode 100644
index 0000000000000..0ec0a8fb28bbe
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithTrafficSplitting.java
@@ -0,0 +1,61 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.knative.serving.v1.Service;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KnativeWithTrafficSplitting {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("knative-with-traffic-splitting")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("knative-with-traffic-splitting.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("knative.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("knative.yml"))
+                .satisfies(p -> assertThat(p.toFile().listFiles()).hasSize(2));
+
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("knative.yml"));
+
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
+            assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
+                assertThat(s.getSpec()).satisfies(spec -> {
+                    assertThat(s.getMetadata()).satisfies(m -> {
+                        assertThat(m.getName()).isEqualTo("knative-with-traffic-splitting");
+                    });
+
+                    assertThat(spec.getTemplate()).satisfies(template -> {
+                        assertThat(template.getMetadata().getName()).isEqualTo("my-revision");
+                    });
+
+                    assertThat(spec.getTraffic()).singleElement().satisfies(t -> {
+                        assertThat(t.getPercent()).isEqualTo(80);
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java
new file mode 100644
index 0000000000000..5668c54709938
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KnativeWithVolumesTest.java
@@ -0,0 +1,77 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.assertj.core.api.Condition;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.knative.serving.v1.Service;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Volume;
+import io.fabric8.kubernetes.api.model.VolumeMount;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KnativeWithVolumesTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("knative-with-volumes-properties")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("knative-with-volumes.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("knative.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("knative.yml"))
+                .satisfies(p -> assertThat(p.toFile().listFiles()).hasSize(2));
+
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("knative.yml"));
+
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
+            assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
+                assertThat(s.getSpec()).satisfies(spec -> {
+
+                    assertThat(spec.getTemplate()).satisfies(template -> {
+                        assertThat(template.getSpec()).satisfies(revisionSpec -> {
+                            assertThat(revisionSpec.getVolumes()).haveAtLeastOne(new Condition<Volume>(
+                                    v -> v.getName().equals("client-crts")
+                                            && v.getSecret().getSecretName().equals("clientcerts"),
+                                    "Has secret volume named client-crts referencing secret clientcerts"));
+                            assertThat(revisionSpec.getVolumes()).haveAtLeastOne(new Condition<Volume>(
+                                    v -> v.getName().equals("client-cfg") && v.getConfigMap().getName().equals("clientconfig"),
+                                    "Has config-map named client-cfg referencing configmap clientconfig"));
+
+                            assertThat(revisionSpec.getContainers()).hasSize(1).singleElement().satisfies(c -> {
+
+                                assertThat(c.getVolumeMounts()).haveAtLeastOne(new Condition<VolumeMount>(
+                                        m -> m.getName().equals("client-crts"), "Has client-crts mount"));
+                                assertThat(c.getVolumeMounts()).haveAtLeastOne(new Condition<VolumeMount>(
+                                        m -> m.getName().equals("client-cfg"), "Has client-cfg mount"));
+
+                                assertThat(c.getPorts()).hasSize(1).singleElement().satisfies(p -> {
+                                    assertThat(p.getName()).isEqualTo("http1");
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java
index 3a1cb3ed88524..819e2419d754d 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesAndMinikubeWithApplicationPropertiesTest.java
@@ -31,8 +31,7 @@ public class KubernetesAndMinikubeWithApplicationPropertiesTest {
             .setApplicationVersion("0.1-SNAPSHOT")
             .withConfigurationResource("kubernetes-and-minikube-with-application.properties")
             .setForcedDependencies(
-                    Collections.singletonList(
-                            new AppArtifact("io.quarkus", "quarkus-minikube", Version.getVersion())));
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-minikube", Version.getVersion())));
 
     @ProdBuildResults
     private ProdModeTestResults prodModeTestResults;
@@ -54,7 +53,7 @@ private void assertKubernetes(Path kubernetesDir) throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
                 assertThat(d.getMetadata()).satisfies(m -> {
                     assertThat(m.getName()).isEqualTo("kubernetes-and-minikube-app");
@@ -64,7 +63,7 @@ private void assertKubernetes(Path kubernetesDir) throws IOException {
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(1);
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getImagePullPolicy()).isEqualTo("Always");
                             });
                         });
@@ -73,11 +72,11 @@ private void assertKubernetes(Path kubernetesDir) throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertEquals("ClusterIP", spec.getType());
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getNodePort()).isNull();
                         assertThat(p.getPort()).isEqualTo(9090);
                     });
@@ -90,7 +89,7 @@ private void assertMinikube(Path kubernetesDir) throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("minikube.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
                 assertThat(d.getMetadata()).satisfies(m -> {
                     assertThat(m.getName()).isEqualTo("kubernetes-and-minikube-app");
@@ -100,7 +99,7 @@ private void assertMinikube(Path kubernetesDir) throws IOException {
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(1);
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getImagePullPolicy()).isEqualTo("IfNotPresent");
                             });
                         });
@@ -109,11 +108,11 @@ private void assertMinikube(Path kubernetesDir) throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertEquals("NodePort", spec.getType());
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getNodePort()).isNotNull();
                         assertThat(p.getPort()).isEqualTo(9090);
                     });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java
new file mode 100644
index 0000000000000..5e3df9c4d9517
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesConfigWithSecretsTest.java
@@ -0,0 +1,98 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.rbac.PolicyRule;
+import io.fabric8.kubernetes.api.model.rbac.Role;
+import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesConfigWithSecretsTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("kubernetes-config-with-secrets")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-config-with-secrets.properties")
+            .setForcedDependencies(Collections.singletonList(
+                    new AppArtifact("io.quarkus", "quarkus-kubernetes-config", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil.deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+
+        assertThat(kubernetesList).filteredOn(h -> "Role".equals(h.getKind())).hasSize(1);
+
+        assertThat(kubernetesList).anySatisfy(res -> {
+            assertThat(res).isInstanceOfSatisfying(Role.class, role -> {
+                assertThat(role.getMetadata()).satisfies(m -> {
+                    assertThat(m.getName()).isEqualTo("view-secrets");
+                });
+
+                assertThat(role.getRules()).singleElement().satisfies(r -> {
+                    assertThat(r).isInstanceOfSatisfying(PolicyRule.class, rule -> {
+                        assertThat(rule.getApiGroups()).containsExactly("");
+                        assertThat(rule.getResources()).containsExactly("secrets");
+                        assertThat(rule.getVerbs()).containsExactly("get");
+                    });
+                });
+            });
+        });
+
+        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).hasSize(2)
+                .anySatisfy(res -> {
+                    assertThat(res).isInstanceOfSatisfying(RoleBinding.class, roleBinding -> {
+                        assertThat(roleBinding.getMetadata()).satisfies(m -> {
+                            assertThat(m.getName()).isEqualTo("kubernetes-config-with-secrets-view-secrets");
+                        });
+
+                        assertThat(roleBinding.getRoleRef().getKind()).isEqualTo("Role");
+                        assertThat(roleBinding.getRoleRef().getName()).isEqualTo("view-secrets");
+
+                        assertThat(roleBinding.getSubjects()).singleElement().satisfies(subject -> {
+                            assertThat(subject.getKind()).isEqualTo("ServiceAccount");
+                            assertThat(subject.getName()).isEqualTo("kubernetes-config-with-secrets");
+                        });
+                    });
+                })
+                .anySatisfy(res -> {
+                    assertThat(res).isInstanceOfSatisfying(RoleBinding.class, roleBinding -> {
+                        assertThat(roleBinding.getMetadata()).satisfies(m -> {
+                            assertThat(m.getName()).isEqualTo("kubernetes-config-with-secrets-view");
+                        });
+
+                        assertThat(roleBinding.getRoleRef().getKind()).isEqualTo("ClusterRole");
+                        assertThat(roleBinding.getRoleRef().getName()).isEqualTo("view");
+
+                        assertThat(roleBinding.getSubjects()).singleElement().satisfies(subject -> {
+                            assertThat(subject.getKind()).isEqualTo("ServiceAccount");
+                            assertThat(subject.getName()).isEqualTo("kubernetes-config-with-secrets");
+                        });
+                    });
+                });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java
new file mode 100644
index 0000000000000..e378c5dbe21b6
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesInitContainersTest.java
@@ -0,0 +1,73 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesInitContainersTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("kubernetes-with-init-containers")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-with-init-containers.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-smallrye-health", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
+            assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
+
+                assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                    assertThat(deploymentSpec.getReplicas()).isEqualTo(1);
+                    assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                        assertThat(t.getSpec()).satisfies(podSpec -> {
+                            assertThat(podSpec.getServiceAccount()).isNull();
+                            assertThat(podSpec.getInitContainers()).singleElement().satisfies(container -> {
+                                assertThat(container.getImage()).isEqualTo("busybox:1.28");
+                                assertThat(container.getCommand()).containsExactly("sh", "-c", "echo",
+                                        "The init container is running!");
+                                assertThat(container.getReadinessProbe()).isNull();
+                                assertThat(container.getLivenessProbe()).isNull();
+                                assertThat(container.getLifecycle()).isNull();
+                            });
+
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                                assertThat(container.getReadinessProbe()).isNotNull();
+                                assertThat(container.getLivenessProbe()).isNotNull();
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java
index f1ea28c90d091..951d426bba2fc 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithApplicationPropertiesTest.java
@@ -17,7 +17,6 @@
 import io.fabric8.kubernetes.api.model.EnvVarSourceBuilder;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.extensions.Ingress;
 import io.quarkus.test.ProdBuildResults;
@@ -45,9 +44,9 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
 
-        assertThat(kubernetesList).hasSize(4);
+        assertThat(kubernetesList).hasSize(3);
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
                 assertThat(d.getMetadata()).satisfies(m -> {
                     assertThat(m.getName()).isEqualTo("test-it");
@@ -56,10 +55,14 @@ public void assertGeneratedResources() throws IOException {
                 });
 
                 assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                    // ensure that the version is not part of the selector labels
+                    assertThat(deploymentSpec.getSelector()).isNotNull().satisfies(labelSelector -> {
+                        assertThat(labelSelector.getMatchLabels()).containsOnly(entry("app.kubernetes.io/name", "test-it"));
+                    });
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(3);
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getEnv()).extracting("name", "value")
                                         .contains(tuple("MY_ENV_VAR", "SOMEVALUE"));
 
@@ -70,7 +73,7 @@ public void assertGeneratedResources() throws IOException {
 
                                 assertThat(container.getImage())
                                         .isEqualTo("quay.io/grp/kubernetes-with-application-properties:0.1-SNAPSHOT");
-                                assertThat(container.getPorts()).hasOnlyOneElementSatisfying(p -> {
+                                assertThat(container.getPorts()).singleElement().satisfies(p -> {
                                     assertThat(p.getContainerPort()).isEqualTo(9090);
                                 });
                                 assertThat(container.getImagePullPolicy()).isEqualTo("IfNotPresent");
@@ -81,7 +84,7 @@ public void assertGeneratedResources() throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata()).satisfies(m -> {
                     assertThat(m.getNamespace()).isEqualTo("applications");
@@ -89,17 +92,15 @@ public void assertGeneratedResources() throws IOException {
 
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertEquals("NodePort", spec.getType());
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getSelector()).containsOnly(entry("app.kubernetes.io/name", "test-it"));
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getPort()).isEqualTo(9090);
                     });
                 });
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "ServiceAccount".equals(i.getKind())).hasSize(1)
-                .hasOnlyElementsOfType(ServiceAccount.class);
-
-        assertThat(kubernetesList).filteredOn(i -> "Ingress".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Ingress".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Ingress.class, in -> {
                 //Check that labels and annotations are also applied to Ingresses (#10260)
                 assertThat(i.getMetadata()).satisfies(m -> {
@@ -109,7 +110,7 @@ public void assertGeneratedResources() throws IOException {
                     assertThat(m.getNamespace()).isEqualTo("applications");
                 });
 
-                assertThat(in.getSpec().getRules()).hasOnlyOneElementSatisfying(r -> {
+                assertThat(in.getSpec().getRules()).singleElement().satisfies(r -> {
                     assertThat(r.getHost()).isEqualTo("example.com");
                 });
             });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java
index ac5b4f640076c..c0aa34fc37b3c 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapCustomModeTest.java
@@ -45,14 +45,14 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getVolumes()).hasOnlyOneElementSatisfying(volume -> {
+                        assertThat(podSpec.getVolumes()).singleElement().satisfies(volume -> {
                             assertThat(volume.getName()).isEqualTo("app-config");
                             assertThat(volume.getConfigMap().getName()).isEqualTo("app-config");
                             assertThat(volume.getConfigMap().getDefaultMode()).isEqualTo(420);
                         });
 
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
-                            assertThat(container.getVolumeMounts()).hasOnlyOneElementSatisfying(volumeMount -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            assertThat(container.getVolumeMounts()).singleElement().satisfies(volumeMount -> {
                                 assertThat(volumeMount.getName()).isEqualTo("app-config");
                                 assertThat(volumeMount.getMountPath()).isEqualTo("/deployments/config");
                             });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java
index 67a28a873e075..c644f6ecd2c76 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConfigMapTest.java
@@ -45,14 +45,14 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getVolumes()).hasOnlyOneElementSatisfying(volume -> {
+                        assertThat(podSpec.getVolumes()).singleElement().satisfies(volume -> {
                             assertThat(volume.getName()).isEqualTo("app-config");
                             assertThat(volume.getConfigMap().getName()).isEqualTo("app-config");
                             assertThat(volume.getConfigMap().getDefaultMode()).isEqualTo(384);
                         });
 
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
-                            assertThat(container.getVolumeMounts()).hasOnlyOneElementSatisfying(volumeMount -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            assertThat(container.getVolumeMounts()).singleElement().satisfies(volumeMount -> {
                                 assertThat(volumeMount.getName()).isEqualTo("app-config");
                                 assertThat(volumeMount.getMountPath()).isEqualTo("/deployments/config");
                             });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java
index 63a163a770a97..b164dd7d2599d 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvFromResourceTest.java
@@ -10,7 +10,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.builder.BuildException;
 import io.quarkus.test.ProdBuildResults;
 import io.quarkus.test.ProdModeTestResults;
 import io.quarkus.test.QuarkusProdModeTest;
@@ -22,7 +21,6 @@ public class KubernetesWithConflictingEnvFromResourceTest {
             .setApplicationVersion("0.1-SNAPSHOT")
             .assertBuildException(e -> assertThat(e)
                     .isInstanceOf(RuntimeException.class)
-                    .hasCauseInstanceOf(BuildException.class)
                     .hasMessageContaining(
                             "'db-password' env var can't simultaneously take its value from 'db-configmap' configmap & 'db-secret' secret"))
             .withConfigurationResource("kubernetes-with-conflicting-env-from-resource.properties");
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java
index 80ece704dc2ab..e95cdf6f3047e 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithConflictingEnvTest.java
@@ -10,7 +10,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.builder.BuildException;
 import io.quarkus.test.ProdBuildResults;
 import io.quarkus.test.ProdModeTestResults;
 import io.quarkus.test.QuarkusProdModeTest;
@@ -25,7 +24,6 @@ public class KubernetesWithConflictingEnvTest {
             .setApplicationVersion("0.1-SNAPSHOT")
             .assertBuildException(e -> assertThat(e)
                     .isInstanceOf(RuntimeException.class)
-                    .hasCauseInstanceOf(BuildException.class)
                     .hasMessageContaining(
                             "- 'envvar': first defined as 'envvar' env var with value 'value' redefined as 'envvar' env var with value from field 'field'"))
             .withConfigurationResource("kubernetes-with-" + APPLICATION_NAME + "-env.properties");
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java
index 3fb977275f08f..f2d5885711cdc 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithDefaultsTest.java
@@ -39,14 +39,15 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
 
                 assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(1);
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getServiceAccount()).isNull();
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getImagePullPolicy()).isEqualTo("Always");
                             });
                         });
@@ -55,7 +56,7 @@ public void assertGeneratedResources() throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertEquals("ClusterIP", spec.getType());
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java
index a429b994ee4eb..43fba9baaeb2f 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromConfigMapTest.java
@@ -46,19 +46,19 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
 
                             assertThat(container.getEnvFrom()).filteredOn(env -> env.getConfigMapRef() != null
                                     && env.getConfigMapRef().getName() != null
                                     && env.getConfigMapRef().getName().equals("my-configmap"))
-                                    .hasOnlyOneElementSatisfying(env -> {
+                                    .singleElement().satisfies(env -> {
                                         assertThat(env.getConfigMapRef()).satisfies(configmapRef -> {
                                             assertThat(configmapRef.getOptional()).isNull();
                                         });
                                     });
 
                             assertThat(container.getEnv()).filteredOn(env -> "DB_DATABASE".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> {
+                                    .singleElement().satisfies(env -> {
                                         assertThat(env.getValueFrom()).satisfies(valueFrom -> {
                                             assertThat(valueFrom.getConfigMapKeyRef()).satisfies(configMapKeyRef -> {
                                                 assertThat(configMapKeyRef.getKey()).isEqualTo("database.name");
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java
index 425c2ec11ceb9..18f752e0e2562 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromFieldTest.java
@@ -45,9 +45,9 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getEnv()).filteredOn(env -> "MY_NAME".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> {
+                                    .singleElement().satisfies(env -> {
                                         assertThat(env.getValueFrom()).satisfies(valueFrom -> {
                                             assertThat(valueFrom.getFieldRef().getFieldPath()).isEqualTo("metadata.name");
                                         });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java
index 48836c53f1df5..458f7ee317681 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithEnvFromSecretTest.java
@@ -45,15 +45,15 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
-                            assertThat(container.getEnvFrom()).hasOnlyOneElementSatisfying(env -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            assertThat(container.getEnvFrom()).singleElement().satisfies(env -> {
                                 assertThat(env.getSecretRef()).satisfies(secretRef -> {
                                     assertThat(secretRef.getName()).isEqualTo("my-secret");
                                 });
                             });
 
                             assertThat(container.getEnv()).filteredOn(env -> "DB_PASSWORD".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> {
+                                    .singleElement().satisfies(env -> {
                                         assertThat(env.getValueFrom()).satisfies(valueFrom -> {
                                             assertThat(valueFrom.getSecretKeyRef()).satisfies(secretKeyRef -> {
                                                 assertThat(secretKeyRef.getKey()).isEqualTo("database.password");
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java
new file mode 100644
index 0000000000000..27bef2daec67c
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithGitlabLikeImageTest.java
@@ -0,0 +1,65 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithGitlabLikeImageTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("gitlab-like-image-test")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-with-gitlab-like-image.properties")
+            .setLogFileName("k8s.log")
+            .setForcedDependencies(
+                    Collections.singletonList(
+                            new AppArtifact("io.quarkus", "quarkus-container-image-jib", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("gitlab-like-image-test");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getSpec()).satisfies(podSpec -> {
+                        assertThat(podSpec.getContainers())
+                                .singleElement().satisfies(c -> {
+                                    assertThat(c.getImage()).isEqualTo("gitlab.acme.org:1111/group/subgroup/project:latest");
+                                });
+                    });
+                });
+            });
+        });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java
index 83b0ef96309c9..4ea49ab62364f 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthAndJibTest.java
@@ -55,15 +55,14 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getReadinessProbe()).isNotNull().satisfies(p -> {
-                                assertProbePath(p, "/health/ready");
+                                assertProbePath(p, "/q/health/ready");
                             });
                             assertThat(container.getLivenessProbe()).isNotNull().satisfies(p -> {
-                                assertProbePath(p, "/health/live");
+                                assertProbePath(p, "/q/health/live");
                             });
-                            // since no registry was set and a container-image extension exists, we force-set 'IfNotPresent'
-                            assertThat(container.getImagePullPolicy()).isEqualTo("IfNotPresent");
+                            assertThat(container.getImagePullPolicy()).isEqualTo("Always");
                         });
                     });
                 });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java
index 743025fb50dd4..74b39ab42ff36 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHealthTest.java
@@ -74,17 +74,17 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getReadinessProbe()).isNotNull().satisfies(p -> {
                                 assertThat(p.getInitialDelaySeconds()).isEqualTo(0);
-                                assertProbePath(p, "/health/ready");
+                                assertProbePath(p, "/q/health/ready");
 
                                 assertNotNull(p.getHttpGet());
                                 assertEquals(p.getHttpGet().getPort().getIntVal(), 9090);
                             });
                             assertThat(container.getLivenessProbe()).isNotNull().satisfies(p -> {
                                 assertThat(p.getInitialDelaySeconds()).isEqualTo(20);
-                                assertProbePath(p, "/health/live");
+                                assertProbePath(p, "/liveness");
 
                                 assertNotNull(p.getHttpGet());
                                 assertEquals(p.getHttpGet().getPort().getIntVal(), 9090);
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java
new file mode 100644
index 0000000000000..35d7fa08a931c
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithHostAliasesTest.java
@@ -0,0 +1,59 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.HostAlias;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithHostAliasesTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("hostaliases")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-with-hostaliases.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        HostAlias expected_ha1 = new HostAlias(Arrays.asList("foo.bar", "bar.foo"), "127.0.0.1");
+        HostAlias expected_ha2 = new HostAlias(Arrays.asList("test.com"), "10.0.0.1");
+
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("hostaliases");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getSpec()).satisfies(podSpec -> {
+                        assertThat(podSpec.getHostAliases()).containsExactlyInAnyOrder(expected_ha1, expected_ha2);
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java
new file mode 100644
index 0000000000000..bbba410693d54
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomAbsoluteTest.java
@@ -0,0 +1,86 @@
+package io.quarkus.it.kubernetes;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.LogFile;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithMetricsCustomAbsoluteTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("metrics")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .setRun(true)
+            .setLogFileName("k8s.log")
+            .withConfigurationResource("kubernetes-with-metrics-custom-absolute.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(
+                            new AppArtifact("io.quarkus", "quarkus-micrometer-registry-prometheus", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @LogFile
+    private Path logfile;
+
+    @Test
+    public void assertApplicationRuns() {
+        assertThat(logfile).isRegularFile().hasFileName("k8s.log");
+        TestUtil.assertLogFileContents(logfile, "kubernetes", "metrics");
+
+        given()
+                .when().get("/greeting")
+                .then()
+                .statusCode(200)
+                .body(is("hello"));
+    }
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("metrics");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getMetadata()).satisfies(meta -> {
+                        // Annotations will have a different default prefix,
+                        // and the scrape annotation was specifically configured
+                        assertThat(meta.getAnnotations()).contains(entry("example.io/should_be_scraped", "true"),
+                                entry("example.io/path", "/absolute-metrics"), entry("example.io/port", "9090"),
+                                entry("example.io/scheme", "http"));
+                    });
+                });
+            });
+        });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java
new file mode 100644
index 0000000000000..a681d25ffe2f9
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsCustomRelativeTest.java
@@ -0,0 +1,86 @@
+package io.quarkus.it.kubernetes;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.LogFile;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithMetricsCustomRelativeTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("metrics")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .setRun(true)
+            .setLogFileName("k8s.log")
+            .withConfigurationResource("kubernetes-with-metrics-custom-relative.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(
+                            new AppArtifact("io.quarkus", "quarkus-smallrye-metrics", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @LogFile
+    private Path logfile;
+
+    @Test
+    public void assertApplicationRuns() {
+        assertThat(logfile).isRegularFile().hasFileName("k8s.log");
+        TestUtil.assertLogFileContents(logfile, "kubernetes", "metrics");
+
+        given()
+                .when().get("/greeting")
+                .then()
+                .statusCode(200)
+                .body(is("hello"));
+    }
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("metrics");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getMetadata()).satisfies(meta -> {
+                        // Annotations will have a different default prefix,
+                        // and the scrape annotation was specifically configured
+                        assertThat(meta.getAnnotations()).contains(entry("example.io/should_be_scraped", "true"),
+                                entry("example.io/path", "/q/met"), entry("example.io/port", "9090"),
+                                entry("example.io/scheme", "http"));
+                    });
+                });
+            });
+        });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java
new file mode 100644
index 0000000000000..e0f24a7a0c2f9
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsNoAnnotationsTest.java
@@ -0,0 +1,85 @@
+package io.quarkus.it.kubernetes;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.LogFile;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithMetricsNoAnnotationsTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("metrics")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .setRun(true)
+            .setLogFileName("k8s.log")
+            .withConfigurationResource("kubernetes-with-metrics-no-annotations.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(
+                            new AppArtifact("io.quarkus", "quarkus-micrometer-registry-prometheus", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @LogFile
+    private Path logfile;
+
+    @Test
+    public void assertApplicationRuns() {
+        assertThat(logfile).isRegularFile().hasFileName("k8s.log");
+        TestUtil.assertLogFileContents(logfile, "kubernetes", "metrics");
+
+        given()
+                .when().get("/greeting")
+                .then()
+                .statusCode(200)
+                .body(is("hello"));
+    }
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("metrics");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getMetadata()).satisfies(meta -> {
+                        // Annotations should not have been created in this configuration.
+                        assertThat(meta.getAnnotations()).doesNotContain(entry("prometheus.io/scrape", "true"),
+                                entry("prometheus.io/path", "/met"), entry("prometheus.io/port", "9090"),
+                                entry("prometheus.io/scheme", "http"));
+                    });
+                });
+            });
+        });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java
index 794ba83f501e0..30d04ba17ad71 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMetricsTest.java
@@ -29,7 +29,7 @@ public class KubernetesWithMetricsTest {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
-            .setApplicationName("health")
+            .setApplicationName("metrics")
             .setApplicationVersion("0.1-SNAPSHOT")
             .setRun(true)
             .setLogFileName("k8s.log")
@@ -66,14 +66,15 @@ public void assertGeneratedResources() throws IOException {
                 .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
         assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
             assertThat(d.getMetadata()).satisfies(m -> {
-                assertThat(m.getName()).isEqualTo("health");
+                assertThat(m.getName()).isEqualTo("metrics");
             });
 
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getMetadata()).satisfies(meta -> {
                         assertThat(meta.getAnnotations()).contains(entry("prometheus.io/scrape", "true"),
-                                entry("prometheus.io/path", "/met"), entry("prometheus.io/port", "9090"));
+                                entry("prometheus.io/path", "/q/metrics"), entry("prometheus.io/port", "9090"),
+                                entry("prometheus.io/scheme", "http"));
                     });
                 });
             });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java
new file mode 100644
index 0000000000000..306f597bd598f
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMicrometerTest.java
@@ -0,0 +1,83 @@
+package io.quarkus.it.kubernetes;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.LogFile;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithMicrometerTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("metrics")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .setRun(true)
+            .setLogFileName("k8s.log")
+            .setForcedDependencies(
+                    Collections.singletonList(
+                            new AppArtifact("io.quarkus", "quarkus-micrometer-registry-prometheus", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @LogFile
+    private Path logfile;
+
+    @Test
+    public void assertApplicationRuns() {
+        assertThat(logfile).isRegularFile().hasFileName("k8s.log");
+        TestUtil.assertLogFileContents(logfile, "kubernetes", "micrometer");
+
+        given()
+                .when().get("/greeting")
+                .then()
+                .statusCode(200)
+                .body(is("hello"));
+    }
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("metrics");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getMetadata()).satisfies(meta -> {
+                        assertThat(meta.getAnnotations()).contains(entry("prometheus.io/scrape", "true"),
+                                entry("prometheus.io/path", "/q/metrics"), entry("prometheus.io/port", "8080"),
+                                entry("prometheus.io/scheme", "http"));
+                    });
+                });
+            });
+        });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java
index 9958beae66ce8..1bbc19354e34b 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithMixedStyleEnvTest.java
@@ -47,24 +47,24 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "FROMFIELD".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             env -> assertThat(env.getValueFrom().getFieldRef().getFieldPath())
                                                     .isEqualTo("metadata.name"));
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "ENVVAR".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> assertThat(env.getValue()).isEqualTo("value"));
+                                    .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("value"));
                             final List<EnvFromSource> envFrom = container.getEnvFrom();
                             assertThat(envFrom).hasSize(2);
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getSecretRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getSecretRef().getName()).isEqualTo("secretName"));
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getConfigMapRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getConfigMapRef().getName()).isEqualTo("configName"));
                         });
                     });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java
index 467f8e02423fa..92a2b25a78f65 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithNewStyleEnvTest.java
@@ -48,24 +48,30 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "FROMFIELD".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             env -> assertThat(env.getValueFrom().getFieldRef().getFieldPath())
                                                     .isEqualTo("metadata.name"));
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "ENVVAR".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> assertThat(env.getValue()).isEqualTo("value"));
+                                    .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("value"));
+                            assertThat(container.getEnv())
+                                    .filteredOn(env -> "QUARKUS_KUBERNETES_CONFIG_ENABLED".equals(env.getName()))
+                                    .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("true"));
+                            assertThat(container.getEnv())
+                                    .filteredOn(env -> "FOO_MP_REST_URL".equals(env.getName()))
+                                    .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("foo.url"));
                             final List<EnvFromSource> envFrom = container.getEnvFrom();
                             assertThat(envFrom).hasSize(2);
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getSecretRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getSecretRef().getName()).isEqualTo("secretName"));
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getConfigMapRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getConfigMapRef().getName()).isEqualTo("configName"));
                         });
                     });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java
index c7270541928df..920f9a4aef13d 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithOldStyleEnvTest.java
@@ -48,20 +48,20 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "FROMFIELD".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             env -> assertThat(env.getValueFrom().getFieldRef().getFieldPath())
                                                     .isEqualTo("metadata.name"));
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "ENVVAR".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> assertThat(env.getValue()).isEqualTo("value"));
+                                    .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("value"));
                             final List<EnvFromSource> envFrom = container.getEnvFrom();
                             assertThat(envFrom).hasSize(1);
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getSecretRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getSecretRef().getName()).isEqualTo("secretName"));
                         });
                     });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java
new file mode 100644
index 0000000000000..a1678ea03ad10
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithResourcesRequirementsTest.java
@@ -0,0 +1,64 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Quantity;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithResourcesRequirementsTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("resources-requirements")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-with-resources-requirements.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("resources-requirements");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getSpec()).satisfies(podSpec -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            assertThat(container.getResources()).satisfies(resources -> {
+
+                                assertThat(resources.getLimits().get("cpu")).isEqualTo(Quantity.parse("1000m"));
+                                assertThat(resources.getLimits().get("memory")).isEqualTo(Quantity.parse("512Mi"));
+                                assertThat(resources.getRequests().get("cpu")).isEqualTo(Quantity.parse("250m"));
+                                assertThat(resources.getRequests().get("memory")).isEqualTo(Quantity.parse("64Mi"));
+
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java
index d9eafed1556ef..cd9b9b5d0dfaf 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithRootAndHealthTest.java
@@ -52,12 +52,12 @@ public void assertGeneratedResources() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getReadinessProbe()).satisfies(p -> {
-                                assertProbePath(p, "/api/health/ready");
+                                assertProbePath(p, "/api/q/health/ready");
                             });
                             assertThat(container.getLivenessProbe()).satisfies(p -> {
-                                assertProbePath(p, "/api/health/liveness");
+                                assertProbePath(p, "/liveness");
                             });
                         });
                     });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java
index 7147740c03a68..f32a457200ecd 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndJibTest.java
@@ -63,34 +63,37 @@ public void assertGeneratedResources() throws IOException {
 
     private void assertApplicationContainer(io.fabric8.kubernetes.api.model.PodSpec podSpec) {
         assertThat(podSpec.getContainers()).filteredOn(ps -> "sidecar-test".equals(ps.getName()))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getImage()).isEqualTo("docker.io/somegrp/sidecar-test:0.1-SNAPSHOT");
                     assertThat(c.getImagePullPolicy()).isEqualTo("Always");
                     assertThat(c.getCommand()).isEmpty();
                     assertThat(c.getArgs()).isEmpty();
                     assertThat(c.getWorkingDir()).isNull();
                     assertThat(c.getVolumeMounts()).isEmpty();
-                    assertThat(c.getPorts()).hasOnlyOneElementSatisfying(p -> {
-                        assertThat(p.getContainerPort()).isEqualTo(8080);
-                    });
+                    assertThat(c.getPorts()).singleElement().satisfies(p -> assertThat(p.getContainerPort()).isEqualTo(8080));
+                    assertThat(c.getEnv()).allSatisfy(e -> assertThat(e.getName()).isNotEqualToIgnoringCase("foo"));
                 });
     }
 
     private void assertSidecar(io.fabric8.kubernetes.api.model.PodSpec podSpec) {
         assertThat(podSpec.getContainers()).filteredOn(ps -> "sc".equals(ps.getName()))
-                .hasOnlyOneElementSatisfying(c -> {
+                .singleElement().satisfies(c -> {
                     assertThat(c.getImage()).isEqualTo("quay.io/sidecar/image:2.1");
                     assertThat(c.getImagePullPolicy()).isEqualTo("IfNotPresent");
                     assertThat(c.getCommand()).containsOnly("ls");
                     assertThat(c.getArgs()).containsOnly("-l");
                     assertThat(c.getWorkingDir()).isEqualTo("/work");
-                    assertThat(c.getVolumeMounts()).hasOnlyOneElementSatisfying(volumeMount -> {
+                    assertThat(c.getVolumeMounts()).singleElement().satisfies(volumeMount -> {
                         assertThat(volumeMount.getName()).isEqualTo("app-config");
                         assertThat(volumeMount.getMountPath()).isEqualTo("/deployments/config");
                     });
-                    assertThat(c.getPorts()).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(c.getPorts()).singleElement().satisfies(p -> {
                         assertThat(p.getContainerPort()).isEqualTo(3000);
                     });
+                    assertThat(c.getEnv()).singleElement().satisfies(e -> {
+                        assertThat(e.getName()).isEqualTo("FOO");
+                        assertThat(e.getValue()).isEqualTo("bar");
+                    });
                 });
     }
 }
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java
new file mode 100644
index 0000000000000..092644934cb95
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithSidecarAndProbesTest.java
@@ -0,0 +1,78 @@
+
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Probe;
+import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class KubernetesWithSidecarAndProbesTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("kubernetes-with-sidecar-and-probes")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("kubernetes-with-sidecar-and-probes.properties")
+            .setLogFileName("k8s.log")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-kubernetes", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml"));
+        List<HasMetadata> kubernetesList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
+        assertThat(kubernetesList.get(0)).isInstanceOfSatisfying(Deployment.class, d -> {
+            assertThat(d.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("kubernetes-with-sidecar-and-probes");
+            });
+
+            assertThat(d.getSpec()).satisfies(deploymentSpec -> {
+                assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
+                    assertThat(t.getSpec()).satisfies(podSpec -> {
+                        assertThat(podSpec.getContainers()).filteredOn(c -> "x".equals(c.getName())).singleElement()
+                                .satisfies(container -> {
+                                    assertThat(container.getLivenessProbe()).isNotNull().satisfies(p -> {
+                                        assertProbePath(p, "/q/health/live");
+                                        assertNotNull(p.getHttpGet());
+                                        assertEquals(p.getHttpGet().getPort().getIntVal(), 9090);
+                                    });
+                                });
+                    });
+                });
+            });
+
+        });
+    }
+
+    private void assertProbePath(Probe p, String expectedPath) {
+        assertThat(p.getHttpGet()).satisfies(h -> {
+            assertThat(h.getPath()).isEqualTo(expectedPath);
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java
index cd6857981c71f..b518878190fe3 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithWarningsEnvTest.java
@@ -50,24 +50,24 @@ public void ensureProperQuarkusPropertiesLogged() throws IOException {
             assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                 assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                     assertThat(t.getSpec()).satisfies(podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "MY_FIELD".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             env -> assertThat(env.getValueFrom().getFieldRef().getFieldPath())
                                                     .isEqualTo("newField"));
                             assertThat(container.getEnv())
                                     .filteredOn(env -> "MY_VAR".equals(env.getName()))
-                                    .hasOnlyOneElementSatisfying(env -> assertThat(env.getValue()).isEqualTo("newVariable"));
+                                    .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("newVariable"));
                             final List<EnvFromSource> envFrom = container.getEnvFrom();
                             assertThat(envFrom).hasSize(2);
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getSecretRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getSecretRef().getName()).isEqualTo("secret"));
                             assertThat(envFrom)
                                     .filteredOn(e -> e.getConfigMapRef() != null)
-                                    .hasOnlyOneElementSatisfying(
+                                    .singleElement().satisfies(
                                             e -> assertThat(e.getConfigMapRef().getName()).isEqualTo("configMap"));
                         });
                     });
@@ -80,13 +80,13 @@ public void ensureProperQuarkusPropertiesLogged() throws IOException {
         assertThat(buildLogRecords).hasSize(4);
         assertThat(buildLogRecords)
                 .filteredOn(r -> r.getMessage().contains("my-field"))
-                .hasOnlyOneElementSatisfying(r -> assertThat(r.getMessage()).contains("newField"));
+                .singleElement().satisfies(r -> assertThat(r.getMessage()).contains("newField"));
         assertThat(buildLogRecords)
                 .filteredOn(r -> r.getMessage().contains("my-var"))
-                .hasOnlyOneElementSatisfying(r -> assertThat(r.getMessage()).contains("newVariable"));
+                .singleElement().satisfies(r -> assertThat(r.getMessage()).contains("newVariable"));
         assertThat(buildLogRecords)
                 .filteredOn(r -> r.getMessage().contains("configMap"))
-                .hasOnlyOneElementSatisfying(
+                .singleElement().satisfies(
                         r -> assertThat(r.getMessage().contains("'xxx'") && r.getMessage().contains("'secret'")));
         assertThat(buildLogRecords)
                 .filteredOn(r -> r.getMessage().contains("secret"))
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java
index 4f6c6bc1b4868..728e0d4844061 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithApplicationPropertiesTest.java
@@ -6,6 +6,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -16,6 +17,8 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
 import io.quarkus.test.ProdBuildResults;
 import io.quarkus.test.ProdModeTestResults;
 import io.quarkus.test.QuarkusProdModeTest;
@@ -27,7 +30,9 @@ public class MinikubeWithApplicationPropertiesTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
             .setApplicationName("minikube-with-application-properties")
             .setApplicationVersion("0.1-SNAPSHOT")
-            .withConfigurationResource("minikube-with-application.properties");
+            .withConfigurationResource("minikube-with-application.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-minikube", Version.getVersion())));
 
     @ProdBuildResults
     private ProdModeTestResults prodModeTestResults;
@@ -41,7 +46,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("minikube.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
                 assertThat(d.getMetadata()).satisfies(m -> {
                     assertThat(m.getName()).isEqualTo("minikube-with-application-properties");
@@ -54,7 +59,7 @@ public void assertGeneratedResources() throws IOException {
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(1);
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getImagePullPolicy()).isEqualTo("IfNotPresent");
                             });
                         });
@@ -63,7 +68,7 @@ public void assertGeneratedResources() throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata()).satisfies(m -> {
                     assertThat(m.getNamespace()).isEqualTo("applications");
@@ -71,7 +76,7 @@ public void assertGeneratedResources() throws IOException {
 
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertEquals("NodePort", spec.getType());
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getNodePort()).isEqualTo(31999);
                         assertThat(p.getPort()).isEqualTo(9090);
                     });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java
index f3d6630abdd8e..4b027bf0f3786 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithDefaultsTest.java
@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -15,6 +16,8 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
 import io.quarkus.test.ProdBuildResults;
 import io.quarkus.test.ProdModeTestResults;
 import io.quarkus.test.QuarkusProdModeTest;
@@ -26,7 +29,9 @@ public class MinikubeWithDefaultsTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
             .setApplicationName("minikube-with-defaults")
             .setApplicationVersion("0.1-SNAPSHOT")
-            .withConfigurationResource("minikube-with-defaults.properties");
+            .withConfigurationResource("minikube-with-defaults.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-minikube", Version.getVersion())));
 
     @ProdBuildResults
     private ProdModeTestResults prodModeTestResults;
@@ -41,7 +46,7 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("minikube.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
 
                 assertThat(d.getMetadata()).satisfies(m -> {
@@ -52,7 +57,7 @@ public void assertGeneratedResources() throws IOException {
                     assertThat(deploymentSpec.getReplicas()).isEqualTo(1);
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getImagePullPolicy()).isEqualTo("IfNotPresent");
                             });
                         });
@@ -61,7 +66,7 @@ public void assertGeneratedResources() throws IOException {
             });
         });
 
-        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Service".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata()).satisfies(m -> {
                     assertThat(m.getNamespace()).isNull();
@@ -69,7 +74,7 @@ public void assertGeneratedResources() throws IOException {
 
                 assertThat(s.getSpec()).satisfies(spec -> {
                     assertEquals("NodePort", spec.getType());
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getNodePort()).isNotNull();
                     });
                 });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java
index 8788758d5ca25..33f4d9f110455 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/MinikubeWithMixedStyleEnvTest.java
@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -14,6 +15,8 @@
 import io.fabric8.kubernetes.api.model.EnvFromSource;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
 import io.quarkus.test.ProdBuildResults;
 import io.quarkus.test.ProdModeTestResults;
 import io.quarkus.test.QuarkusProdModeTest;
@@ -25,7 +28,9 @@ public class MinikubeWithMixedStyleEnvTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
             .setApplicationName("minikube-with-mixed-style-env")
             .setApplicationVersion("0.1-SNAPSHOT")
-            .withConfigurationResource("minikube-with-mixed-style-env.properties");
+            .withConfigurationResource("minikube-with-mixed-style-env.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-minikube", Version.getVersion())));
 
     @ProdBuildResults
     private ProdModeTestResults prodModeTestResults;
@@ -39,29 +44,29 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("minikube.yml"));
 
-        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(kubernetesList).filteredOn(i -> "Deployment".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> {
                 assertThat(d.getSpec()).satisfies(deploymentSpec -> {
                     assertThat(deploymentSpec.getTemplate()).satisfies(t -> {
                         assertThat(t.getSpec()).satisfies(podSpec -> {
-                            assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                            assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                                 assertThat(container.getEnv())
                                         .filteredOn(env -> "FROMFIELD".equals(env.getName()))
-                                        .hasOnlyOneElementSatisfying(
+                                        .singleElement().satisfies(
                                                 env -> assertThat(env.getValueFrom().getFieldRef().getFieldPath())
                                                         .isEqualTo("metadata.name"));
                                 assertThat(container.getEnv())
                                         .filteredOn(env -> "ENVVAR".equals(env.getName()))
-                                        .hasOnlyOneElementSatisfying(env -> assertThat(env.getValue()).isEqualTo("value"));
+                                        .singleElement().satisfies(env -> assertThat(env.getValue()).isEqualTo("value"));
                                 final List<EnvFromSource> envFrom = container.getEnvFrom();
                                 assertThat(envFrom).hasSize(2);
                                 assertThat(envFrom)
                                         .filteredOn(e -> e.getSecretRef() != null)
-                                        .hasOnlyOneElementSatisfying(
+                                        .singleElement().satisfies(
                                                 e -> assertThat(e.getSecretRef().getName()).isEqualTo("secretName"));
                                 assertThat(envFrom)
                                         .filteredOn(e -> e.getConfigMapRef() != null)
-                                        .hasOnlyOneElementSatisfying(
+                                        .singleElement().satisfies(
                                                 e -> assertThat(e.getConfigMapRef().getName()).isEqualTo("configName"));
                             });
                         });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java
new file mode 100644
index 0000000000000..430d5909cb813
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV3Test.java
@@ -0,0 +1,75 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Service;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftV3Test {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-v3")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-v3.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"))
+                .satisfies(p -> assertThat(p.toFile().listFiles()).hasSize(2));
+        List<HasMetadata> openshiftList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-v3");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+                assertThat(m.getLabels().get("app.kubernetes.io/name")).isEqualTo("openshift-v3");
+                assertThat(m.getLabels().get("app")).isEqualTo("openshift-v3");
+                assertThat(m.getNamespace()).isNull();
+            });
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("selector").isInstanceOfSatisfying(Map.class, selectorsMap -> {
+                assertThat(selectorsMap).containsOnly(entry("app.kubernetes.io/name", "openshift-v3"),
+                        entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+            });
+        });
+
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
+                assertThat(s.getMetadata()).satisfies(m -> {
+                    assertThat(m.getNamespace()).isNull();
+                    assertThat(m.getLabels().get("app.kubernetes.io/name")).isEqualTo("openshift-v3");
+                    assertThat(m.getLabels().get("app")).isEqualTo("openshift-v3");
+                });
+
+                assertThat(s.getSpec()).satisfies(spec -> {
+                    assertThat(spec.getSelector()).containsOnly(entry("app.kubernetes.io/name", "openshift-v3"),
+                            entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java
new file mode 100644
index 0000000000000..96d5ed28fbea5
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftV4Test.java
@@ -0,0 +1,75 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Service;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftV4Test {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-v4")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-v4.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"))
+                .satisfies(p -> assertThat(p.toFile().listFiles()).hasSize(2));
+        List<HasMetadata> openshiftList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-v4");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+                assertThat(m.getLabels().get("app.kubernetes.io/name")).isEqualTo("openshift-v4");
+                assertThat(m.getLabels().get("app")).isNull();
+                assertThat(m.getNamespace()).isNull();
+            });
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("selector").isInstanceOfSatisfying(Map.class, selectorsMap -> {
+                assertThat(selectorsMap).containsOnly(entry("app.kubernetes.io/name", "openshift-v4"),
+                        entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+            });
+        });
+
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
+                assertThat(s.getMetadata()).satisfies(m -> {
+                    assertThat(m.getNamespace()).isNull();
+                    assertThat(m.getLabels().get("app.kubernetes.io/name")).isEqualTo("openshift-v4");
+                    assertThat(m.getLabels().get("app")).isNull();
+                });
+
+                assertThat(s.getSpec()).satisfies(spec -> {
+                    assertThat(spec.getSelector()).containsOnly(entry("app.kubernetes.io/name", "openshift-v4"),
+                            entry("app.kubernetes.io/version", "0.1-SNAPSHOT"));
+                });
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java
new file mode 100644
index 0000000000000..fc372c14c3367
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppConfigMapTest.java
@@ -0,0 +1,81 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.EnvVar;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.PodSpec;
+import io.fabric8.kubernetes.api.model.Volume;
+import io.fabric8.kubernetes.api.model.VolumeMount;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithAppConfigMapTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-with-app-config-map")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-with-app-config-map.properties")
+            .setForcedDependencies(Collections.singletonList(
+                    new AppArtifact("io.quarkus", "quarkus-openshift", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(
+                kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-with-app-config-map");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+            });
+
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+                    podSpec -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            List<EnvVar> envVars = container.getEnv();
+                            assertThat(envVars).anySatisfy(envVar -> {
+                                assertThat(envVar.getName()).isEqualTo("SMALLRYE_CONFIG_LOCATIONS");
+                                assertThat(envVar.getValue()).isEqualTo("/mnt/app-config-map");
+                            });
+
+                            List<VolumeMount> mounts = container.getVolumeMounts();
+                            assertThat(mounts).anySatisfy(mount -> {
+                                assertThat(mount.getName()).isEqualTo("app-config-map");
+                                assertThat(mount.getMountPath()).isEqualTo("/mnt/app-config-map");
+                            });
+                        });
+                        List<Volume> volumes = podSpec.getVolumes();
+                        assertThat(volumes).anySatisfy(volume -> {
+                            assertThat(volume.getName()).isEqualTo("app-config-map");
+                            assertThat(volume.getConfigMap().getName()).isEqualTo("my-config-map");
+                        });
+                    });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java
new file mode 100644
index 0000000000000..4ecaf821202a5
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithAppSecretTest.java
@@ -0,0 +1,81 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.EnvVar;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.PodSpec;
+import io.fabric8.kubernetes.api.model.Volume;
+import io.fabric8.kubernetes.api.model.VolumeMount;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithAppSecretTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-with-app-secret")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-with-app-secret.properties")
+            .setForcedDependencies(Collections.singletonList(
+                    new AppArtifact("io.quarkus", "quarkus-openshift", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(
+                kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-with-app-secret");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+            });
+
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+                    podSpec -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            List<EnvVar> envVars = container.getEnv();
+                            assertThat(envVars).anySatisfy(envVar -> {
+                                assertThat(envVar.getName()).isEqualTo("SMALLRYE_CONFIG_LOCATIONS");
+                                assertThat(envVar.getValue()).isEqualTo("/mnt/app-secret");
+                            });
+
+                            List<VolumeMount> mounts = container.getVolumeMounts();
+                            assertThat(mounts).anySatisfy(mount -> {
+                                assertThat(mount.getName()).isEqualTo("app-secret");
+                                assertThat(mount.getMountPath()).isEqualTo("/mnt/app-secret");
+                            });
+                        });
+                        List<Volume> volumes = podSpec.getVolumes();
+                        assertThat(volumes).anySatisfy(volume -> {
+                            assertThat(volume.getName()).isEqualTo("app-secret");
+                            assertThat(volume.getSecret().getSecretName()).isEqualTo("my-secret");
+                        });
+                    });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java
index ee4aa9b8d7d4b..7320f583ae317 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithApplicationPropertiesTest.java
@@ -7,7 +7,9 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 
+import org.assertj.core.api.AbstractObjectAssert;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -42,37 +44,42 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> openshiftList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
 
-        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h.getMetadata()).satisfies(m -> {
                 assertThat(m.getName()).isEqualTo("test-it");
                 assertThat(m.getLabels()).contains(entry("foo", "bar"));
                 assertThat(m.getNamespace()).isEqualTo("applications");
             });
-            assertThat(h).extracting("spec").extracting("replicas").isEqualTo(3);
-            assertThat(h).extracting("spec").extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("replicas").isEqualTo(3);
+            specAssert.extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
                     podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getEnv()).extracting("name", "value")
                                     .contains(tuple("MY_ENV_VAR", "SOMEVALUE"));
                         });
                     });
+            specAssert.extracting("selector").isInstanceOfSatisfying(Map.class, selectorsMap -> {
+                assertThat(selectorsMap).containsOnly(entry("app.kubernetes.io/name", "test-it"));
+            });
         });
 
-        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getMetadata()).satisfies(m -> {
                     assertThat(m.getNamespace()).isEqualTo("applications");
                 });
 
                 assertThat(s.getSpec()).satisfies(spec -> {
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getSelector()).containsOnly(entry("app.kubernetes.io/name", "test-it"));
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getPort()).isEqualTo(9090);
                     });
                 });
             });
         });
 
-        assertThat(openshiftList).filteredOn(i -> "Route".equals(i.getKind())).hasOnlyOneElementSatisfying(i -> {
+        assertThat(openshiftList).filteredOn(i -> "Route".equals(i.getKind())).singleElement().satisfies(i -> {
             assertThat(i).isInstanceOfSatisfying(Route.class, in -> {
                 //Check that labels and annotations are also applied to Routes (#10260)
                 assertThat(i.getMetadata()).satisfies(m -> {
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java
new file mode 100644
index 0000000000000..18f2f20a3c1d5
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithDockerBuildStrategyTest.java
@@ -0,0 +1,70 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.openshift.api.model.BuildConfig;
+import io.fabric8.openshift.api.model.DeploymentConfig;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithDockerBuildStrategyTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-s2i").setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-with-docker-build-strategy.properties")
+            .setForcedDependencies(Collections
+                    .singletonList(new AppArtifact("io.quarkus", "quarkus-openshift", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+
+        assertThat(kubernetesDir).isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(kubernetesDir.resolve("openshift.yml"));
+
+        //Assert that the container contains neither command nor arguments
+        assertThat(openshiftList).filteredOn(d -> "DeploymentConfig".equals(d.getKind())).singleElement().satisfies(d -> {
+            assertThat(d).isInstanceOfSatisfying(DeploymentConfig.class, dc -> {
+                assertThat(dc.getSpec().getTemplate().getSpec().getContainers()).singleElement().satisfies(c -> {
+                    assertThat(c.getCommand()).isNullOrEmpty();
+                    assertThat(c.getArgs()).isNullOrEmpty();
+                    //We explicitly remove them when using the `docker build strategy`.
+                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                });
+            });
+        });
+
+        assertThat(openshiftList).filteredOn(h -> "BuildConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-s2i");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+            });
+            assertThat(h).isInstanceOfSatisfying(BuildConfig.class, bc -> {
+                assertThat(bc.getSpec().getSource()).satisfies(s -> {
+                    assertThat(s.getDockerfile()).isNotNull();
+                });
+            });
+        });
+
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java
index 1453fd52a7541..cbf2aa897bca1 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithHealthTest.java
@@ -64,17 +64,17 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> openshiftList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
 
-        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h.getMetadata()).satisfies(m -> {
                 assertThat(m.getName()).isEqualTo("openshift-health");
             });
             assertThat(h).extracting("spec").extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
                     podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             assertThat(container.getReadinessProbe()).isNotNull().satisfies(p -> {
                                 assertThat(p.getPeriodSeconds()).isEqualTo(10);
                                 assertThat(p.getHttpGet()).satisfies(h1 -> {
-                                    assertThat(h1.getPath()).isEqualTo("/health/ready");
+                                    assertThat(h1.getPath()).isEqualTo("/q/health/ready");
                                 });
                             });
                             assertThat(container.getLivenessProbe()).isNotNull().satisfies(p -> {
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java
new file mode 100644
index 0000000000000..9cc7c0826343e
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithLegacySidecarAndS2iTest.java
@@ -0,0 +1,89 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.PodSpec;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithLegacySidecarAndS2iTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-sidecar-test")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-with-legacy-sidecar-and-s2i.properties")
+            .setForcedDependencies(Collections.singletonList(
+                    new AppArtifact("io.quarkus", "quarkus-openshift", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(
+                kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-sidecar-test");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+            });
+
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+                    podSpec -> {
+                        assertThat(podSpec.getContainers()).hasSize(2);
+                        assertSidecar(podSpec);
+                        assertApplicationContainer(podSpec);
+                    });
+        });
+    }
+
+    private void assertApplicationContainer(PodSpec podSpec) {
+        assertThat(podSpec.getContainers()).filteredOn(ps -> "openshift-sidecar-test".equals(ps.getName()))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getEnv()).extracting("name").contains("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                });
+    }
+
+    private void assertSidecar(PodSpec podSpec) {
+        assertThat(podSpec.getContainers()).filteredOn(ps -> "sc".equals(ps.getName()))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getImage()).isEqualTo("quay.io/sidecar/image:2.1");
+                    assertThat(c.getImagePullPolicy()).isEqualTo("IfNotPresent");
+                    assertThat(c.getCommand()).containsOnly("ls");
+                    assertThat(c.getArgs()).containsOnly("-l");
+                    assertThat(c.getWorkingDir()).isEqualTo("/work");
+                    assertThat(c.getVolumeMounts()).singleElement().satisfies(volumeMount -> {
+                        assertThat(volumeMount.getName()).isEqualTo("app-config");
+                        assertThat(volumeMount.getMountPath()).isEqualTo("/deployments/config");
+                    });
+                    assertThat(c.getPorts()).singleElement().satisfies(p -> {
+                        assertThat(p.getContainerPort()).isEqualTo(3000);
+                    });
+                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java
new file mode 100644
index 0000000000000..13353dafc689c
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithRoutePropertiesTest.java
@@ -0,0 +1,71 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.openshift.api.model.Route;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithRoutePropertiesTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-with-route.properties");
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil
+                .deserializeAsList(kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
+                assertThat(s.getMetadata()).satisfies(m -> {
+                    assertThat(m.getNamespace()).isEqualTo("applications");
+                });
+
+                assertThat(s.getSpec()).satisfies(spec -> {
+                    assertThat(spec.getSelector()).contains(entry("app.kubernetes.io/name", "test-it"));
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
+                        assertThat(p.getPort()).isEqualTo(9090);
+                    });
+                });
+            });
+        });
+
+        assertThat(openshiftList).filteredOn(i -> "Route".equals(i.getKind())).singleElement().satisfies(i -> {
+            assertThat(i).isInstanceOfSatisfying(Route.class, in -> {
+                //Check that labels and annotations are also applied to Routes (#10260)
+                assertThat(i.getMetadata()).satisfies(m -> {
+                    assertThat(m.getName()).isEqualTo("test-it");
+                    assertThat(m.getLabels()).contains(entry("foo", "bar"));
+                    assertThat(m.getAnnotations()).contains(entry("bar", "baz"));
+                    assertThat(m.getAnnotations()).contains(entry("kubernetes.io/tls-acme", "true"));
+                    assertThat(m.getNamespace()).isEqualTo("applications");
+                });
+                assertThat(in.getSpec().getHost()).isEqualTo("foo.bar.io");
+            });
+        });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java
index f088fb0da7356..bfb0462f6c5b4 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java
@@ -4,9 +4,11 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.assertj.core.api.AbstractObjectAssert;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -59,19 +61,20 @@ public void assertGeneratedResources() throws IOException {
 
         assertThat(openshiftList).filteredOn(h -> "BuildConfig".equals(h.getKind())).hasSize(1);
 
-        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h.getMetadata()).satisfies(m -> {
                 assertThat(m.getName()).isEqualTo("openshift-s2i");
                 assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
             });
 
-            assertThat(h).extracting("spec").extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
                     podSpec -> {
-                        assertThat(podSpec.getContainers()).hasOnlyOneElementSatisfying(container -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
                             List<EnvVar> envVars = container.getEnv();
                             assertThat(envVars).anySatisfy(envVar -> {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_APP_JAR");
-                                assertThat(envVar.getValue()).isEqualTo("/deployments/openshift-s2i-runner.jar");
+                                assertThat(envVar.getValue()).isEqualTo("/deployments/quarkus-run.jar");
                             });
                             assertThat(envVars).anySatisfy(envVar -> {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_LIB_DIR");
@@ -83,18 +86,21 @@ public void assertGeneratedResources() throws IOException {
                             });
                             assertThat(envVars).anySatisfy(envVar -> {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_OPTIONS");
-                                assertThat(envVar.getValue()).contains("-Dquarkus.http.host=0.0.0.0");
                                 assertThat(envVar.getValue())
                                         .contains("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
                             });
                         });
                     });
+
+            specAssert.extracting("triggers").isInstanceOfSatisfying(Collection.class, c -> {
+                assertThat(c).hasSize(1);
+            });
         });
 
-        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(openshiftList).filteredOn(h -> "Service".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h).isInstanceOfSatisfying(Service.class, s -> {
                 assertThat(s.getSpec()).satisfies(spec -> {
-                    assertThat(spec.getPorts()).hasSize(1).hasOnlyOneElementSatisfying(p -> {
+                    assertThat(spec.getPorts()).hasSize(1).singleElement().satisfies(p -> {
                         assertThat(p.getPort()).isEqualTo(8080);
                     });
                 });
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java
new file mode 100644
index 0000000000000..f49f81d29b751
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithSidecarAndS2iTest.java
@@ -0,0 +1,89 @@
+package io.quarkus.it.kubernetes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.PodSpec;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithSidecarAndS2iTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-sidecar-test")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .withConfigurationResource("openshift-with-sidecar-and-s2i.properties")
+            .setForcedDependencies(Collections.singletonList(
+                    new AppArtifact("io.quarkus", "quarkus-openshift", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+
+        assertThat(kubernetesDir)
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(
+                kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-sidecar-test");
+                assertThat(m.getLabels().get("app.openshift.io/runtime")).isEqualTo("quarkus");
+            });
+
+            AbstractObjectAssert<?, ?> specAssert = assertThat(h).extracting("spec");
+            specAssert.extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+                    podSpec -> {
+                        assertThat(podSpec.getContainers()).hasSize(2);
+                        assertSidecar(podSpec);
+                        assertApplicationContainer(podSpec);
+                    });
+        });
+    }
+
+    private void assertApplicationContainer(PodSpec podSpec) {
+        assertThat(podSpec.getContainers()).filteredOn(ps -> "openshift-sidecar-test".equals(ps.getName()))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getEnv()).extracting("name").contains("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                });
+    }
+
+    private void assertSidecar(PodSpec podSpec) {
+        assertThat(podSpec.getContainers()).filteredOn(ps -> "sc".equals(ps.getName()))
+                .singleElement().satisfies(c -> {
+                    assertThat(c.getImage()).isEqualTo("quay.io/sidecar/image:2.1");
+                    assertThat(c.getImagePullPolicy()).isEqualTo("IfNotPresent");
+                    assertThat(c.getCommand()).containsOnly("ls");
+                    assertThat(c.getArgs()).containsOnly("-l");
+                    assertThat(c.getWorkingDir()).isEqualTo("/work");
+                    assertThat(c.getVolumeMounts()).singleElement().satisfies(volumeMount -> {
+                        assertThat(volumeMount.getName()).isEqualTo("app-config");
+                        assertThat(volumeMount.getMountPath()).isEqualTo("/deployments/config");
+                    });
+                    assertThat(c.getPorts()).singleElement().satisfies(p -> {
+                        assertThat(p.getContainerPort()).isEqualTo(3000);
+                    });
+                    assertThat(c.getEnv()).extracting("name").doesNotContain("JAVA_APP_JAR", "JAVA_LIB_DIR");
+                });
+    }
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java
new file mode 100644
index 0000000000000..7b83395869ca4
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithUberJarTest.java
@@ -0,0 +1,79 @@
+package io.quarkus.it.kubernetes;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.assertj.core.api.Condition;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.fabric8.kubernetes.api.model.EnvVar;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.PodSpec;
+import io.quarkus.bootstrap.model.AppArtifact;
+import io.quarkus.builder.Version;
+import io.quarkus.test.LogFile;
+import io.quarkus.test.ProdBuildResults;
+import io.quarkus.test.ProdModeTestResults;
+import io.quarkus.test.QuarkusProdModeTest;
+
+public class OpenshiftWithUberJarTest {
+
+    @RegisterExtension
+    static final QuarkusProdModeTest config = new QuarkusProdModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(GreetingResource.class))
+            .setApplicationName("openshift-uberjar").setApplicationVersion("0.1-SNAPSHOT").setRun(true)
+            .setLogFileName("k8s.log").withConfigurationResource("openshift-with-uberjar.properties")
+            .setForcedDependencies(
+                    Collections.singletonList(new AppArtifact("io.quarkus", "quarkus-openshift", Version.getVersion())));
+
+    @ProdBuildResults
+    private ProdModeTestResults prodModeTestResults;
+
+    @LogFile
+    private Path logfile;
+
+    @Test
+    public void assertApplicationRuns() {
+        assertThat(logfile).isRegularFile().hasFileName("k8s.log");
+        TestUtil.assertLogFileContents(logfile, "kubernetes", "uberjar");
+
+        given().when().get("/greeting").then().statusCode(200).body(is("hello"));
+    }
+
+    @Test
+    public void assertGeneratedResources() throws IOException {
+        Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes");
+        assertThat(kubernetesDir).isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json"))
+                .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml"));
+        List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(kubernetesDir.resolve("openshift.yml"));
+
+        assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata()).satisfies(m -> {
+                assertThat(m.getName()).isEqualTo("openshift-uberjar");
+            });
+            assertThat(h).extracting("spec").extracting("template").extracting("spec").isInstanceOfSatisfying(PodSpec.class,
+                    podSpec -> {
+                        assertThat(podSpec.getContainers()).singleElement().satisfies(container -> {
+                            assertThat(container.getEnv())
+                                    .filteredOn(new Condition<EnvVar>(e -> e.getName().equals("APP_JAVA_LIB"),
+                                            "Environment variable JAVA_APP_LIB"))
+                                    .hasSize(0);
+
+                            assertThat(container.getArgs())
+                                    .filteredOn(new Condition<String>(e -> e.equals("-cp"), "Classpath arguments"))
+                                    .hasSize(0);
+                        });
+                    });
+        });
+    }
+
+}
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java
index 6ac7063cf5c50..8ed88c80d969a 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/WithKubernetesClientTest.java
@@ -62,12 +62,18 @@ public void assertGeneratedResources() throws IOException {
         List<HasMetadata> kubernetesList = DeserializationUtil
                 .deserializeAsList(kubernetesDir.resolve("kubernetes.yml"));
 
-        assertThat(kubernetesList).filteredOn(h -> "ServiceAccount".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
+        assertThat(kubernetesList).filteredOn(h -> "ServiceAccount".equals(h.getKind())).singleElement().satisfies(h -> {
             assertThat(h.getMetadata().getName()).isEqualTo("kubernetes-with-client");
         });
 
-        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).hasOnlyOneElementSatisfying(h -> {
-            assertThat(h.getMetadata().getName()).isEqualTo("kubernetes-with-client:view");
+        assertThat(kubernetesList).filteredOn(h -> "RoleBinding".equals(h.getKind())).singleElement().satisfies(h -> {
+            assertThat(h.getMetadata().getName()).isEqualTo("kubernetes-with-client-view");
         });
     }
+
+    @Test
+    public void assertDependencies() {
+        Path mainDepsPath = prodModeTestResults.getBuildDir().resolve("quarkus-app").resolve("lib").resolve("main");
+        assertThat(mainDepsPath).isDirectoryContaining(p -> p.getFileName().toString().contains("kubernetes-client"));
+    }
 }
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-health.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-health.properties
new file mode 100644
index 0000000000000..80ed52e487ed8
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-health.properties
@@ -0,0 +1,3 @@
+quarkus.http.port=9090
+quarkus.kubernetes.deployment-target=knative
+quarkus.knative.liveness-probe.initial-delay=20s
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-traffic-splitting.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-traffic-splitting.properties
new file mode 100644
index 0000000000000..f0a292c48b7e7
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-traffic-splitting.properties
@@ -0,0 +1,3 @@
+quarkus.kubernetes.deployment-target=knative
+quarkus.knative.revision-name=my-revision
+quarkus.knative.traffic.my-revision.percentage=80
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-volumes.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-volumes.properties
new file mode 100644
index 0000000000000..a3c617cbae577
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/knative-with-volumes.properties
@@ -0,0 +1,8 @@
+# Configuration file
+quarkus.kubernetes.deployment-target=knative
+
+quarkus.knative.mounts.client-crts.path=/mnt/clientcerts
+quarkus.knative.secret-volumes.client-crts.secret-name=clientcerts
+
+quarkus.knative.mounts.client-cfg.path=/mnt/clientconfig
+quarkus.knative.config-map-volumes.client-cfg.config-map-name=clientconfig
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-config-with-secrets.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-config-with-secrets.properties
new file mode 100644
index 0000000000000..03d54b3c43582
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-config-with-secrets.properties
@@ -0,0 +1,3 @@
+quarkus.kubernetes-config.enabled=true
+quarkus.kubernetes-config.secrets.enabled=true
+quarkus.kubernetes-config.secrets=my-secret
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-application.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-application.properties
index 460d96bedb543..698af3b9baa91 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-application.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-application.properties
@@ -5,10 +5,11 @@ quarkus.kubernetes.labels.foo=bar
 quarkus.kubernetes.annotations.bar=baz
 quarkus.kubernetes.env-vars.my-env-var.value=SOMEVALUE
 quarkus.kubernetes.env-vars.my-name.field=metadata.name
+quarkus.kubernetes.add-version-to-label-selectors=false
 quarkus.container-image.group=grp
 quarkus.container-image.registry=quay.io
-quarkus.kubernetes.expose=true
-quarkus.kubernetes.host=example.com
+quarkus.kubernetes.ingress.expose=true
+quarkus.kubernetes.ingress.host=example.com
 quarkus.kubernetes.service-type=NodePort
 quarkus.kubernetes.image-pull-policy=IfNotPresent
 quarkus.kubernetes.replicas=3
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-gitlab-like-image.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-gitlab-like-image.properties
new file mode 100644
index 0000000000000..c2122ab28c8e4
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-gitlab-like-image.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.deployment-target=kubernetes
+quarkus.container-image.image=gitlab.acme.org:1111/group/subgroup/project
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-health.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-health.properties
index 4410bb400544b..b7337fe50a68f 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-health.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-health.properties
@@ -1,2 +1,3 @@
 quarkus.http.port=9090
 quarkus.kubernetes.liveness-probe.initial-delay=20s
+quarkus.smallrye-health.liveness-path=/liveness
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-hostaliases.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-hostaliases.properties
new file mode 100644
index 0000000000000..d445ed3c4d4b6
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-hostaliases.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.hostaliases."127.0.0.1".hostnames=foo.bar,bar.foo
+quarkus.kubernetes.hostaliases."10.0.0.1".hostnames=test.com
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-init-containers.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-init-containers.properties
new file mode 100644
index 0000000000000..8aba1345d365d
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-init-containers.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.init-containers.migrate-db.image=busybox:1.28
+quarkus.kubernetes.init-containers.migrate-db.command=sh,-c,echo,The init container is running!
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-custom-absolute.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-custom-absolute.properties
new file mode 100644
index 0000000000000..befe3e634b923
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-custom-absolute.properties
@@ -0,0 +1,4 @@
+quarkus.http.port=9090
+quarkus.micrometer.export.prometheus.path=/absolute-metrics
+quarkus.kubernetes.prometheus.prefix=example.io
+quarkus.kubernetes.prometheus.scrape=example.io/should_be_scraped
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-custom-relative.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-custom-relative.properties
new file mode 100644
index 0000000000000..ce7853e673614
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-custom-relative.properties
@@ -0,0 +1,4 @@
+quarkus.http.port=9090
+quarkus.smallrye-metrics.path=met
+quarkus.kubernetes.prometheus.prefix=example.io
+quarkus.kubernetes.prometheus.scrape=example.io/should_be_scraped
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-no-annotations.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-no-annotations.properties
new file mode 100644
index 0000000000000..232bf76c33de6
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics-no-annotations.properties
@@ -0,0 +1,4 @@
+quarkus.http.port=9090
+quarkus.smallrye-metrics.path=/met
+quarkus.kubernetes.prometheus.annotations=false
+quarkus.kubernetes.prometheus.prefix=example.io
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics.properties
index a6e7232a4984b..2e40601cd49fa 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-metrics.properties
@@ -1,2 +1 @@
 quarkus.http.port=9090
-quarkus.smallrye-metrics.path=/met
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties
index 660b6f89691d4..966366bd8f608 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-new-style-env.properties
@@ -1,4 +1,6 @@
 quarkus.kubernetes.env.fields.fromfield=metadata.name
 quarkus.kubernetes.env.vars.envvar=value
+quarkus.kubernetes.env.vars."quarkus.kubernetes-config.enabled"=true
 quarkus.kubernetes.env.configmaps=configName
 quarkus.kubernetes.env.secrets=secretName
+quarkus.kubernetes.env.mapping.foo/mp-rest/url.with-key=foo.url
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-resources-requirements.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-resources-requirements.properties
new file mode 100644
index 0000000000000..c9bbef1994df5
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-resources-requirements.properties
@@ -0,0 +1,4 @@
+quarkus.kubernetes.resources.requests.memory=64Mi
+quarkus.kubernetes.resources.requests.cpu=250m
+quarkus.kubernetes.resources.limits.memory=512Mi
+quarkus.kubernetes.resources.limits.cpu=1000m
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-jib.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-jib.properties
index d0aa09f05c98d..4eae1a7c43558 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-jib.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-jib.properties
@@ -8,3 +8,4 @@ quarkus.kubernetes.sidecars.sc.working-dir=/work
 quarkus.kubernetes.sidecars.sc.arguments=-l
 quarkus.kubernetes.sidecars.sc.mounts.app-config.path=/deployments/config
 quarkus.kubernetes.sidecars.sc.ports.http.container-port=3000
+quarkus.kubernetes.sidecars.sc.env-vars.foo.value=bar
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-probes.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-probes.properties
new file mode 100644
index 0000000000000..688f2a8127bcd
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/kubernetes-with-sidecar-and-probes.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.sidecars.x.liveness-probe.http-action-path=/q/health/live
+quarkus.kubernetes.sidecars.x.ports.http.container-port=9090
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-v3.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-v3.properties
new file mode 100644
index 0000000000000..22bc2bebdb904
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-v3.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.deployment-target=openshift
+quarkus.openshift.flavor=v3
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-v4.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-v4.properties
new file mode 100644
index 0000000000000..b1345eed2b92b
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-v4.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.deployment-target=openshift
+quarkus.openshift.flavor=v4
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-app-config-map.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-app-config-map.properties
new file mode 100644
index 0000000000000..4d15570dc5fc3
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-app-config-map.properties
@@ -0,0 +1 @@
+quarkus.openshift.app-config-map=my-config-map
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-app-secret.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-app-secret.properties
new file mode 100644
index 0000000000000..e2c3ada9506f0
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-app-secret.properties
@@ -0,0 +1 @@
+quarkus.openshift.app-secret=my-secret
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-application.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-application.properties
index c747176fdaed2..5073911776276 100644
--- a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-application.properties
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-application.properties
@@ -6,6 +6,7 @@ quarkus.openshift.labels.foo=bar
 quarkus.openshift.annotations.bar=baz
 quarkus.openshift.env-vars.my-env-var.value=SOMEVALUE
 quarkus.openshift.group=grp
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
 quarkus.s2i.registry=quay.io
 quarkus.openshift.replicas=3
+quarkus.openshift.add-version-to-label-selectors=false
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-docker-build-strategy.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-docker-build-strategy.properties
new file mode 100644
index 0000000000000..9c178c4c7722a
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-docker-build-strategy.properties
@@ -0,0 +1 @@
+quarkus.openshift.build-strategy=DOCKER
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties
new file mode 100644
index 0000000000000..1af97a9376baa
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-legacy-sidecar-and-s2i.properties
@@ -0,0 +1,10 @@
+quarkus.openshift.expose=true
+quarkus.s2i.base-jvm-image=my.registry.example/openjdk/openjdk-11-rhel7
+quarkus.openshift.containers.sc.image=quay.io/sidecar/image:2.1
+quarkus.openshift.containers.sc.image-pull-policy=IfNotPresent
+quarkus.openshift.containers.sc.command=ls
+quarkus.openshift.containers.sc.working-dir=/work
+quarkus.openshift.containers.sc.arguments=-l
+quarkus.openshift.containers.sc.mounts.app-config.path=/deployments/config
+quarkus.openshift.containers.sc.ports.http.container-port=3000
+
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-route.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-route.properties
new file mode 100644
index 0000000000000..a42e2e6b443ef
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-route.properties
@@ -0,0 +1,13 @@
+quarkus.http.port=9090
+quarkus.kubernetes.deployment-target=openshift
+quarkus.openshift.name=test-it
+quarkus.openshift.namespace=applications
+quarkus.openshift.labels.foo=bar
+quarkus.openshift.annotations.bar=baz
+quarkus.openshift.group=grp
+
+quarkus.openshift.route.expose=true
+quarkus.openshift.route.host=foo.bar.io
+quarkus.openshift.route.annotations."kubernetes.io/tls-acme"=true
+
+quarkus.s2i.registry=quay.io
\ No newline at end of file
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties
new file mode 100644
index 0000000000000..c94814b323956
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-sidecar-and-s2i.properties
@@ -0,0 +1,10 @@
+quarkus.openshift.expose=true
+quarkus.s2i.base-jvm-image=my.registry.example/openjdk/openjdk-11-rhel7
+quarkus.openshift.sidecars.sc.image=quay.io/sidecar/image:2.1
+quarkus.openshift.sidecars.sc.image-pull-policy=IfNotPresent
+quarkus.openshift.sidecars.sc.command=ls
+quarkus.openshift.sidecars.sc.working-dir=/work
+quarkus.openshift.sidecars.sc.arguments=-l
+quarkus.openshift.sidecars.sc.mounts.app-config.path=/deployments/config
+quarkus.openshift.sidecars.sc.ports.http.container-port=3000
+
diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-uberjar.properties b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-uberjar.properties
new file mode 100644
index 0000000000000..f956e2c95be36
--- /dev/null
+++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/resources/openshift-with-uberjar.properties
@@ -0,0 +1,2 @@
+quarkus.kubernetes.deployment-target=openshift
+quarkus.package.type=uber-jar
\ No newline at end of file
diff --git a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
index 089b59a3e6364..652e0f39903b0 100644
--- a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -81,6 +81,9 @@
           <name>native</name>
         </property>
       </activation>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -90,21 +93,6 @@
               <skipTests>${native.surefire.skip}</skipTests>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>@project.version@</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/legacy-redirect/pom.xml b/integration-tests/legacy-redirect/pom.xml
new file mode 100644
index 0000000000000..c38d191a4bb96
--- /dev/null
+++ b/integration-tests/legacy-redirect/pom.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-legacy-redirect</artifactId>
+    <name>Quarkus - Integration Tests - Legacy redirect</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-graphql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-swagger-ui</artifactId>
+        </dependency>
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+
+        <!-- Verify path configuration -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes</artifactId>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-graphql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-swagger-ui-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Farewell.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Farewell.java
new file mode 100644
index 0000000000000..215a3bbdefc07
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Farewell.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.legacy.redirect;
+
+public class Farewell extends Salutation {
+
+    @Override
+    public String getType() {
+        return "Farewell";
+    }
+
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Greeting.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Greeting.java
new file mode 100644
index 0000000000000..fb8d9f95f9355
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Greeting.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.time.LocalTime;
+
+public class Greeting extends Salutation {
+
+    private String message;
+    private LocalTime time;
+
+    public Greeting() {
+    }
+
+    public Greeting(String message, LocalTime time) {
+        this.message = message;
+        this.time = time;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public void setTime(LocalTime time) {
+        this.time = time;
+    }
+
+    @Override
+    public String getType() {
+        return "Greet";
+    }
+
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/GreetingResource.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/GreetingResource.java
new file mode 100644
index 0000000000000..dc834e4207880
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/GreetingResource.java
@@ -0,0 +1,47 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Mutation;
+import org.eclipse.microprofile.graphql.Name;
+import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
+
+@GraphQLApi
+public class GreetingResource {
+
+    @ConfigProperty(name = "message")
+    String message;
+
+    @Query
+    public String message() {
+        return message;
+    }
+
+    @Query
+    public Greeting hello() {
+        return new Greeting("hello", LocalTime.of(11, 34));
+    }
+
+    @Mutation
+    public Greetings load(Greetings greetings) {
+        return greetings;
+    }
+
+    @Name("options")
+    public List<Greeting> buildInOptions(@Source Greeting greeting) {
+        List<Greeting> options = new ArrayList<>();
+        options.add(new Hello());
+        options.add(new Morning());
+        return options;
+    }
+
+    @Query
+    public Farewell farewell() {
+        return new Farewell();
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Greetings.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Greetings.java
new file mode 100644
index 0000000000000..3c8841ff3c0d4
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Greetings.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.util.List;
+
+public class Greetings {
+    private String language;
+    private List<Greeting> hellos;
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public List<Greeting> getHellos() {
+        return hellos;
+    }
+
+    public void setHellos(List<Greeting> hellos) {
+        this.hellos = hellos;
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Hello.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Hello.java
new file mode 100644
index 0000000000000..0e1586a5a18a3
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Hello.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.time.LocalTime;
+
+public class Hello extends Greeting {
+
+    private TimeOfDay timeOfDay = TimeOfDay.ANY;
+
+    public Hello() {
+        super("Hello", LocalTime.now());
+    }
+
+    public TimeOfDay getTimeOfDay() {
+        return timeOfDay;
+    }
+
+    public void setTimeOfDay(TimeOfDay timeOfDay) {
+        this.timeOfDay = timeOfDay;
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/MessageResource.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/MessageResource.java
new file mode 100644
index 0000000000000..62eab08d02e7b
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/MessageResource.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.legacy.redirect;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/message")
+public class MessageResource {
+
+    @GET
+    public String message() {
+        return "hello world";
+    }
+
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Morning.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Morning.java
new file mode 100644
index 0000000000000..07e45d1f5e07c
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Morning.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.time.LocalTime;
+
+public class Morning extends Greeting {
+
+    private TimeOfDay timeOfDay = TimeOfDay.MORNING;
+
+    public Morning() {
+        super("Good Morning", LocalTime.now());
+    }
+
+    public TimeOfDay getTimeOfDay() {
+        return timeOfDay;
+    }
+
+    public void setTimeOfDay(TimeOfDay timeOfDay) {
+        this.timeOfDay = timeOfDay;
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Salutation.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Salutation.java
new file mode 100644
index 0000000000000..2f6d65e8b4602
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Salutation.java
@@ -0,0 +1,6 @@
+package io.quarkus.it.legacy.redirect;
+
+public abstract class Salutation {
+
+    public abstract String getType();
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/TimeOfDay.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/TimeOfDay.java
new file mode 100644
index 0000000000000..b8eff96f3cf86
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/TimeOfDay.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.legacy.redirect;
+
+public enum TimeOfDay {
+
+    ANY,
+    MORNING,
+    AFTERNOON,
+    EVENING,
+    NIGHT
+}
diff --git a/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Welcome.java b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Welcome.java
new file mode 100644
index 0000000000000..044412e210726
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/java/io/quarkus/it/legacy/redirect/Welcome.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.legacy.redirect;
+
+public class Welcome extends Salutation {
+
+    @Override
+    public String getType() {
+        return "Welcome";
+    }
+
+}
diff --git a/integration-tests/legacy-redirect/src/main/resources/application.properties b/integration-tests/legacy-redirect/src/main/resources/application.properties
new file mode 100644
index 0000000000000..2eb12f844bf76
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+quarkus.http.redirect-to-non-application-root-path=true
+message=Production
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootDuplicateFrameworkIT.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootDuplicateFrameworkIT.java
new file mode 100644
index 0000000000000..9271a7e5b16de
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootDuplicateFrameworkIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.legacy.redirect;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class LegacyRedirectAppRootDuplicateFrameworkIT extends LegacyRedirectAppRootTest {
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootDuplicateFrameworkTest.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootDuplicateFrameworkTest.java
new file mode 100644
index 0000000000000..44e98e85ce219
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootDuplicateFrameworkTest.java
@@ -0,0 +1,94 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(LegacyRedirectAppRootDuplicateFrameworkTest.SetApplicationSameFrameworkRoot.class)
+class LegacyRedirectAppRootDuplicateFrameworkTest {
+
+    // When the root path and the framework path are the same, there are
+    // no redirects at all.
+
+    public static class SetApplicationSameFrameworkRoot implements QuarkusTestProfile {
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> overrides = new HashMap<>();
+            overrides.put("quarkus.http.root-path", "/app");
+            overrides.put("quarkus.http.non-application-root-path", "/app");
+            return overrides;
+        }
+    }
+
+    @TestHTTPResource(value = "/")
+    URL hostPortUrl;
+
+    WebClientUtil clientUtil = new WebClientUtil();
+
+    @BeforeEach
+    void setUrl() {
+        clientUtil.setHostPortUrl(hostPortUrl);
+    }
+
+    @Test
+    public void testGraphQlUnchangedNeverRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/graphql", 404);
+        // Not the same as 404.. graphql is found in the right place
+        clientUtil.validate("/app/graphql", 405);
+    }
+
+    @Test
+    public void testGraphQlUiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/graphql-ui", 404);
+
+        clientUtil.validate("/app/graphql-ui", 302);
+    }
+
+    @Test
+    public void testHealthWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/health", 404);
+
+        clientUtil.validate("/app/health", 200);
+        clientUtil.validate("/app/health/group", 200);
+        clientUtil.validate("/app/health/live", 200);
+        clientUtil.validate("/app/health/ready", 200);
+        clientUtil.validate("/app/health/well", 200);
+        clientUtil.validate("/app/health-ui", 302);
+    }
+
+    @Test
+    public void testMetricsWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/metrics", 404);
+
+        clientUtil.validateText("/app/metrics", 200);
+    }
+
+    @Test
+    public void testOpenApiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/openapi", 404);
+
+        clientUtil.validate("/app/openapi", 200);
+    }
+
+    @Test
+    public void testSwaggerUiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/swagger-ui", 404);
+
+        clientUtil.validate("/app/swagger-ui", 302);
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootIT.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootIT.java
new file mode 100644
index 0000000000000..b3c3d70ff0486
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.legacy.redirect;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class LegacyRedirectAppRootIT extends LegacyRedirectAppRootTest {
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootTest.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootTest.java
new file mode 100644
index 0000000000000..2c340ba8bf0b2
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectAppRootTest.java
@@ -0,0 +1,106 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.net.URL;
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(LegacyRedirectAppRootTest.SetApplicationRoot.class)
+class LegacyRedirectAppRootTest {
+
+    // Legacy redirect behavior is implicitly scoped to the configured
+    // http root (i.e. /app/health will be redirected)
+
+    public static class SetApplicationRoot implements QuarkusTestProfile {
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            return Collections.singletonMap("quarkus.http.root-path", "/app");
+        }
+    }
+
+    @TestHTTPResource(value = "/")
+    URL hostPortUrl;
+
+    WebClientUtil clientUtil = new WebClientUtil();
+
+    @BeforeEach
+    void setUrl() {
+        clientUtil.setHostPortUrl(hostPortUrl);
+    }
+
+    @Test
+    public void testGraphQlUnchangedNeverRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/graphql", 404);
+        // Not the same as 404.. graphql is found in the right place
+        clientUtil.validate("/app/graphql", 405);
+    }
+
+    @Test
+    public void testGraphQlUiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/graphql-ui", 404);
+
+        clientUtil.validate("/app/graphql-ui", 301, "/app/q/graphql-ui");
+        clientUtil.validate("/app/q/graphql-ui", 302);
+    }
+
+    @Test
+    public void testHealthWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/health", 404);
+
+        clientUtil.validate("/app/health", 301, "/app/q/health");
+        clientUtil.validate("/app/q/health", 200);
+
+        clientUtil.validate("/app/health/group", 301, "/app/q/health/group");
+        clientUtil.validate("/app/q/health/group", 200);
+
+        clientUtil.validate("/app/health/live", 301, "/app/q/health/live");
+        clientUtil.validate("/app/q/health/live", 200);
+
+        clientUtil.validate("/app/health/ready", 301, "/app/q/health/ready");
+        clientUtil.validate("/app/q/health/ready", 200);
+
+        clientUtil.validate("/app/health/well", 301, "/app/q/health/well");
+        clientUtil.validate("/app/q/health/well", 200);
+
+        clientUtil.validate("/app/health-ui", 301, "/app/q/health-ui");
+        clientUtil.validate("/app/q/health-ui", 302);
+    }
+
+    @Test
+    public void testMetricsWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/metrics", 404);
+
+        clientUtil.validate("/app/metrics", 301, "/app/q/metrics");
+        clientUtil.validateText("/app/q/metrics", 200);
+    }
+
+    @Test
+    public void testOpenApiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/openapi", 404);
+
+        clientUtil.validate("/app/openapi", 301, "/app/q/openapi");
+        clientUtil.validate("/app/q/openapi", 200);
+    }
+
+    @Test
+    public void testSwaggerUiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/swagger-ui", 404);
+
+        clientUtil.validate("/app/swagger-ui", 301, "/app/q/swagger-ui");
+        clientUtil.validate("/app/q/swagger-ui", 302);
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectExplicitTargetIT.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectExplicitTargetIT.java
new file mode 100644
index 0000000000000..d748459ffc07a
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectExplicitTargetIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.legacy.redirect;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class LegacyRedirectExplicitTargetIT extends LegacyRedirectAppRootTest {
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectExplicitTargetTest.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectExplicitTargetTest.java
new file mode 100644
index 0000000000000..90744532fa25a
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectExplicitTargetTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(LegacyRedirectExplicitTargetTest.SetExplicitTarget.class)
+class LegacyRedirectExplicitTargetTest {
+
+    // When explicit endpoints are specified, those endpoints should be used
+    // directly, which should disable the compatibility redirect for that
+    // endpoint (404)
+
+    public static class SetExplicitTarget implements QuarkusTestProfile {
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> overrides = new HashMap<>();
+            overrides.put("quarkus.http.root-path", "/app");
+            overrides.put("quarkus.http.non-application-root-path", "/framework");
+            overrides.put("quarkus.smallrye-metrics.path", "/my-metrics");
+            overrides.put("quarkus.smallrye-health.liveness-path", "/liveness");
+            return overrides;
+        }
+    }
+
+    @TestHTTPResource(value = "/")
+    URL hostPortUrl;
+
+    WebClientUtil clientUtil = new WebClientUtil();
+
+    @BeforeEach
+    void setUrl() {
+        clientUtil.setHostPortUrl(hostPortUrl);
+    }
+
+    @Test
+    public void testHealthWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/health", 404);
+
+        clientUtil.validate("/app/health", 301, "/framework/health");
+        clientUtil.validate("/framework/health", 200);
+
+        clientUtil.validate("/app/health/liveness", 404);
+        clientUtil.validate("/framework/health/liveness", 404);
+        clientUtil.validate("/liveness", 200);
+    }
+
+    @Test
+    public void testMetricsWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/metrics", 404);
+        clientUtil.validate("/app/metrics", 404);
+        clientUtil.validate("/framework/metrics", 404);
+
+        clientUtil.validateText("/my-metrics", 200);
+        clientUtil.validate("/app/my-metrics", 404);
+        clientUtil.validate("/framework/my-metrics", 404);
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectFrameworkRootIT.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectFrameworkRootIT.java
new file mode 100644
index 0000000000000..03a1e12ce8820
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectFrameworkRootIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.legacy.redirect;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class LegacyRedirectFrameworkRootIT extends LegacyRedirectFrameworkRootTest {
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectFrameworkRootTest.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectFrameworkRootTest.java
new file mode 100644
index 0000000000000..9b1d008accfeb
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectFrameworkRootTest.java
@@ -0,0 +1,109 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(LegacyRedirectFrameworkRootTest.SetFrameworkRoot.class)
+class LegacyRedirectFrameworkRootTest {
+
+    // Legacy redirect behavior is implicitly scoped to the configured
+    // http root (i.e. /app/health will be redirected)
+
+    public static class SetFrameworkRoot implements QuarkusTestProfile {
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> overrides = new HashMap<>();
+            overrides.put("quarkus.http.root-path", "/app");
+            overrides.put("quarkus.http.non-application-root-path", "/framework");
+            return overrides;
+        }
+    }
+
+    @TestHTTPResource(value = "/")
+    URL hostPortUrl;
+
+    WebClientUtil clientUtil = new WebClientUtil();
+
+    @BeforeEach
+    void setUrl() {
+        clientUtil.setHostPortUrl(hostPortUrl);
+    }
+
+    @Test
+    public void testGraphQlUnchangedNeverRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/graphql", 404);
+        // Not the same as 404.. graphql is found in the right place
+        clientUtil.validate("/app/graphql", 405);
+    }
+
+    @Test
+    public void testGraphQlUiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/graphql-ui", 404);
+
+        clientUtil.validate("/app/graphql-ui", 301, "/framework/graphql-ui");
+        clientUtil.validate("/framework/graphql-ui", 302);
+    }
+
+    @Test
+    public void testHealthWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/health", 404);
+
+        clientUtil.validate("/app/health", 301, "/framework/health");
+        clientUtil.validate("/framework/health", 200);
+
+        clientUtil.validate("/app/health/group", 301, "/framework/health/group");
+        clientUtil.validate("/framework/health/group", 200);
+
+        clientUtil.validate("/app/health/live", 301, "/framework/health/live");
+        clientUtil.validate("/framework/health/live", 200);
+
+        clientUtil.validate("/app/health/ready", 301, "/framework/health/ready");
+        clientUtil.validate("/framework/health/ready", 200);
+
+        clientUtil.validate("/app/health/well", 301, "/framework/health/well");
+        clientUtil.validate("/framework/health/well", 200);
+
+        clientUtil.validate("/app/health-ui", 301, "/framework/health-ui");
+        clientUtil.validate("/framework/health-ui", 302);
+    }
+
+    @Test
+    public void testMetricsWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/metrics", 404);
+
+        clientUtil.validate("/app/metrics", 301, "/framework/metrics");
+        clientUtil.validateText("/framework/metrics", 200);
+    }
+
+    @Test
+    public void testOpenApiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/openapi", 404);
+
+        clientUtil.validate("/app/openapi", 301, "/framework/openapi");
+        clientUtil.validate("/framework/openapi", 200);
+    }
+
+    @Test
+    public void testSwaggerUiWithRedirect() {
+        // Not found: moved with application endpoint
+        clientUtil.validate("/swagger-ui", 404);
+
+        clientUtil.validate("/app/swagger-ui", 301, "/framework/swagger-ui");
+        clientUtil.validate("/framework/swagger-ui", 302);
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectIT.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectIT.java
new file mode 100644
index 0000000000000..1edd1a26f4535
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.legacy.redirect;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class LegacyRedirectIT extends LegacyRedirectTest {
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectTest.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectTest.java
new file mode 100644
index 0000000000000..03a2a43a4d934
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/LegacyRedirectTest.java
@@ -0,0 +1,78 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.net.URL;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class LegacyRedirectTest {
+
+    // Default configuration
+
+    @TestHTTPResource(value = "/")
+    URL hostPortUrl;
+
+    WebClientUtil clientUtil = new WebClientUtil();
+
+    @BeforeEach
+    void setUrl() {
+        clientUtil.setHostPortUrl(hostPortUrl);
+    }
+
+    @Test
+    public void testGraphQlUnchangedNeverRedirect() {
+        // Not the same as 404.. graphql is found in the right place
+        clientUtil.validate("/graphql", 405);
+    }
+
+    @Test
+    public void testGraphQlUiWithRedirect() {
+        clientUtil.validate("/graphql-ui", 301, "/q/graphql-ui");
+        clientUtil.validate("/q/graphql-ui", 302);
+    }
+
+    @Test
+    public void testHealthWithRedirect() {
+        clientUtil.validate("/health", 301, "/q/health");
+        clientUtil.validate("/q/health", 200);
+
+        clientUtil.validate("/health/group", 301, "/q/health/group");
+        clientUtil.validate("/q/health/group", 200);
+
+        clientUtil.validate("/health/live", 301, "/q/health/live");
+        clientUtil.validate("/q/health/live", 200);
+
+        clientUtil.validate("/health/ready", 301, "/q/health/ready");
+        clientUtil.validate("/q/health/ready", 200);
+
+        clientUtil.validate("/health/well", 301, "/q/health/well");
+        clientUtil.validate("/q/health/well", 200);
+
+        clientUtil.validate("/health-ui", 301, "/q/health-ui");
+        clientUtil.validate("/q/health-ui", 302);
+    }
+
+    @Test
+    public void testMetricsWithRedirect() {
+        clientUtil.validate("/metrics", 301, "/q/metrics");
+        clientUtil.validateText("/q/metrics", 200);
+    }
+
+    @Test
+    public void testOpenApiWithRedirect() {
+        clientUtil.validate("/openapi", 301, "/q/openapi");
+        clientUtil.validate("/openapi?format=JSON", 301, "/q/openapi?format=JSON");
+        clientUtil.validateContentType("/q/openapi?format=JSON", 200, "application/json");
+        clientUtil.followForContentType("/openapi?format=JSON", 200, "application/json");
+    }
+
+    @Test
+    public void testSwaggerUiWithRedirect() {
+        clientUtil.validate("/swagger-ui", 301, "/q/swagger-ui");
+        clientUtil.validate("/q/swagger-ui", 302);
+    }
+}
diff --git a/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/WebClientUtil.java b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/WebClientUtil.java
new file mode 100644
index 0000000000000..f0ccb58e99aa2
--- /dev/null
+++ b/integration-tests/legacy-redirect/src/test/java/io/quarkus/it/legacy/redirect/WebClientUtil.java
@@ -0,0 +1,123 @@
+package io.quarkus.it.legacy.redirect;
+
+import java.net.URL;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import org.junit.jupiter.api.Assertions;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.ext.web.client.HttpRequest;
+import io.vertx.ext.web.client.HttpResponse;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.WebClientOptions;
+
+public class WebClientUtil {
+
+    static class Result {
+        String requestedPath;
+        int statusCode;
+        String redirectPath;
+        String contentType;
+
+        public String toString() {
+            return "requestedPath=" + requestedPath + ", statusCode=" + statusCode + ", redirectPath=" + redirectPath
+                    + ", contentType=" + contentType;
+        }
+    }
+
+    URL hostPortUrl;
+
+    void setHostPortUrl(URL hostPortUrl) {
+        this.hostPortUrl = hostPortUrl;
+    }
+
+    public void validate(String requestPath, int expectedStatusCode) {
+        internalValidate(requestPath, expectedStatusCode, null, null, false);
+    }
+
+    public void validate(String requestPath, int expectedStatusCode, String expectedRedirect) {
+        internalValidate(requestPath, expectedStatusCode, expectedRedirect, null, false);
+    }
+
+    public void validateText(String requestPath, int expectedStatusCode) {
+        internalValidate(requestPath, expectedStatusCode, null, "text/plain", false);
+    }
+
+    public void validateText(String requestPath, int expectedStatusCode, String expectedRedirect) {
+        internalValidate(requestPath, expectedStatusCode, expectedRedirect, "text/plain", false);
+    }
+
+    public void validateContentType(String requestPath, int expectedStatusCode, String contentType) {
+        WebClientUtil.Result result = internalValidate(requestPath, expectedStatusCode, null, null, false);
+        Assertions.assertTrue(result.contentType.startsWith(contentType),
+                "Expected Content-Type for request to path " + requestPath + " to start with " + contentType
+                        + ", instead found " + result.contentType);
+    }
+
+    public void followForContentType(String requestPath, int expectedStatusCode, String contentType) {
+        WebClientUtil.Result result = internalValidate(requestPath, expectedStatusCode, null, null, true);
+        Assertions.assertTrue(result.contentType.startsWith(contentType),
+                "Expected Content-Type for request to path " + requestPath + " to start with " + contentType
+                        + ", instead found " + result.contentType);
+    }
+
+    WebClientUtil.Result internalValidate(String requestPath, int expectedStatusCode, String expectedRedirect,
+            String acceptType, boolean follow) {
+
+        WebClientUtil.Result result = get(requestPath, acceptType, follow);
+
+        Assertions.assertEquals(expectedStatusCode, result.statusCode,
+                "Expected status code " + expectedStatusCode + " for request to path " + requestPath);
+
+        if (expectedRedirect != null) {
+            Assertions.assertEquals(expectedRedirect, result.redirectPath,
+                    "Expected a Location header value of " + expectedRedirect + " for request to path " + requestPath);
+        }
+
+        return result;
+    }
+
+    Result get(final String requestPath, final String acceptType, boolean follow) {
+        Vertx vertx = Vertx.vertx();
+
+        try {
+            CompletableFuture<Result> resultFuture = new CompletableFuture<>();
+
+            WebClientOptions options = new WebClientOptions()
+                    .setFollowRedirects(follow);
+
+            HttpRequest<Buffer> request = WebClient.create(vertx, options)
+                    .get(hostPortUrl.getPort(), hostPortUrl.getHost(), requestPath);
+
+            if (acceptType != null) {
+                request.putHeader("Accept", acceptType);
+            }
+
+            request.send(ar -> {
+                if (ar.succeeded()) {
+                    HttpResponse<Buffer> response = ar.result();
+                    Result result = new Result();
+                    result.requestedPath = requestPath;
+                    result.statusCode = response.statusCode();
+                    result.contentType = response.getHeader("Content-Type");
+                    if (result.statusCode == 301) {
+                        result.redirectPath = response.getHeader("Location");
+                    }
+                    resultFuture.complete(result);
+                } else {
+                    resultFuture.completeExceptionally(ar.cause());
+                }
+            });
+
+            return resultFuture.get();
+        } catch (InterruptedException | ExecutionException e) {
+            Assertions.fail(e);
+            return null;
+        } finally {
+            vertx.close();
+        }
+    }
+
+}
diff --git a/integration-tests/liquibase/pom.xml b/integration-tests/liquibase/pom.xml
index 105479efbb15b..13469d09a886c 100644
--- a/integration-tests/liquibase/pom.xml
+++ b/integration-tests/liquibase/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,6 +51,60 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-liquibase-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -76,66 +129,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                    <enableReports>true</enableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 
 </project>
diff --git a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java
index 1736198aba55d..c08d0effabe3a 100644
--- a/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java
+++ b/integration-tests/liquibase/src/main/java/io/quarkus/it/liquibase/LiquibaseFunctionalityResource.java
@@ -5,12 +5,9 @@
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
 
 import io.quarkus.liquibase.LiquibaseFactory;
 import liquibase.Liquibase;
@@ -20,8 +17,6 @@
 import liquibase.command.core.DropAllCommand;
 
 @Path("/")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
 public class LiquibaseFunctionalityResource {
 
     @Inject
diff --git a/integration-tests/liquibase/src/main/resources/db/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/changeLog.xml
index fefb1ac2cf9b3..b5455cf33466a 100644
--- a/integration-tests/liquibase/src/main/resources/db/changeLog.xml
+++ b/integration-tests/liquibase/src/main/resources/db/changeLog.xml
@@ -8,4 +8,5 @@
     <include relativeToChangelogFile="true" file="json/changeLog.json" />
     <include relativeToChangelogFile="true" file="sql/changeLog.sql" />
     <include relativeToChangelogFile="true" file="yaml/changeLog.yaml" />
+    <include relativeToChangelogFile="true" file="complex-schema/changeLog.xml" />
 </databaseChangeLog>
diff --git a/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml
new file mode 100644
index 0000000000000..fff8b99b60b51
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/complex-schema/changeLog.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+    <changeSet id="00000000000000" author="jhipster">
+        <createSequence sequenceName="sequence_generator" startValue="1050" incrementBy="50"/>
+    </changeSet>
+
+    <!--
+        JHipster core tables.
+        The initial schema has the '00000000000001' id, so that it is over-written if we re-generate it.
+    -->
+    <changeSet id="00000000000001" author="jhipster">
+        <createTable tableName="jhi_user">
+            <column name="id" type="bigint" >
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="login" type="varchar(50)">
+                <constraints unique="true" nullable="false" uniqueConstraintName="ux_user_login"/>
+            </column>
+            <column name="password_hash" type="varchar(60)"/>
+            <column name="first_name" type="varchar(50)"/>
+            <column name="last_name" type="varchar(50)"/>
+            <column name="email" type="varchar(191)">
+                <constraints unique="true" nullable="true" uniqueConstraintName="ux_user_email"/>
+            </column>
+            <column name="image_url" type="varchar(256)"/>
+            <column name="activated" type="boolean" valueBoolean="false">
+                <constraints nullable="false" />
+            </column>
+            <column name="lang_key" type="varchar(10)"/>
+            <column name="activation_key" type="varchar(20)"/>
+            <column name="reset_key" type="varchar(20)"/>
+            <column name="created_by" type="varchar(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+            <column name="reset_date" type="timestamp">
+                <constraints nullable="true"/>
+            </column>
+            <column name="last_modified_by" type="varchar(50)"/>
+            <column name="last_modified_date" type="timestamp"/>
+        </createTable>
+
+        <createTable tableName="jhi_authority">
+            <column name="name" type="varchar(50)">
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+        </createTable>
+
+        <createTable tableName="jhi_user_authority">
+            <column name="user_id" type="bigint">
+                <constraints nullable="false"/>
+            </column>
+            <column name="authority_name" type="varchar(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+
+        <addPrimaryKey columnNames="user_id, authority_name" tableName="jhi_user_authority"/>
+
+        <addForeignKeyConstraint baseColumnNames="authority_name"
+                                 baseTableName="jhi_user_authority"
+                                 constraintName="fk_authority_name"
+                                 referencedColumnNames="name"
+                                 referencedTableName="jhi_authority"/>
+
+        <addForeignKeyConstraint baseColumnNames="user_id"
+                                 baseTableName="jhi_user_authority"
+                                 constraintName="fk_user_id"
+                                 referencedColumnNames="id"
+                                 referencedTableName="jhi_user"/>
+
+        <addNotNullConstraint   columnName="password_hash"
+                                columnDataType="varchar(60)"
+                                tableName="jhi_user"/>
+        <loadData
+                  file="db/complex-schema/data/user.csv"
+                  separator=";"
+                  tableName="jhi_user">
+            <column name="id" type="numeric"/>
+            <column name="activated" type="boolean"/>
+            <column name="created_date" type="timestamp"/>
+        </loadData>
+        <dropDefaultValue tableName="jhi_user" columnName="created_date" columnDataType="datetime"/>
+        <loadData
+                  file="db/complex-schema/data/authority.csv"
+                  separator=";"
+                  tableName="jhi_authority">
+            <column name="name" type="string"/>
+        </loadData>
+
+        <loadData
+                  file="db/complex-schema/data/user_authority.csv"
+                  separator=";"
+                  tableName="jhi_user_authority">
+            <column name="user_id" type="numeric"/>
+        </loadData>
+        <createTable tableName="jhi_persistent_audit_event">
+            <column name="event_id" type="bigint" >
+                <constraints primaryKey="true" nullable="false"/>
+            </column>
+            <column name="principal" type="varchar(50)">
+                <constraints nullable="false" />
+            </column>
+            <column name="event_date" type="timestamp"/>
+            <column name="event_type" type="varchar(255)"/>
+        </createTable>
+
+        <createTable tableName="jhi_persistent_audit_evt_data">
+            <column name="event_id" type="bigint">
+                <constraints nullable="false"/>
+            </column>
+            <column name="name" type="varchar(150)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="value" type="varchar(255)"/>
+        </createTable>
+        <addPrimaryKey columnNames="event_id, name" tableName="jhi_persistent_audit_evt_data"/>
+
+        <createIndex indexName="idx_persistent_audit_event"
+                     tableName="jhi_persistent_audit_event"
+                     unique="false">
+            <column name="principal" type="varchar(50)"/>
+            <column name="event_date" type="timestamp"/>
+        </createIndex>
+
+        <createIndex indexName="idx_persistent_audit_evt_data"
+                     tableName="jhi_persistent_audit_evt_data"
+                     unique="false">
+            <column name="event_id" type="bigint"/>
+        </createIndex>
+
+        <addForeignKeyConstraint baseColumnNames="event_id"
+                                 baseTableName="jhi_persistent_audit_evt_data"
+                                 constraintName="fk_evt_pers_audit_evt_data"
+                                 referencedColumnNames="event_id"
+                                 referencedTableName="jhi_persistent_audit_event"/>
+    </changeSet>
+
+    <changeSet author="jhipster" id="00000000000002" context="test">
+        <createTable tableName="jhi_date_time_wrapper">
+            <column  name="id" type="BIGINT">
+                <constraints primaryKey="true" primaryKeyName="jhi_date_time_wrapperPK"/>
+            </column>
+            <column name="instant" type="timestamp"/>
+            <column name="local_date_time" type="timestamp"/>
+            <column name="offset_date_time" type="timestamp"/>
+            <column name="zoned_date_time" type="timestamp"/>
+            <column name="local_time" type="time"/>
+            <column name="offset_time" type="time"/>
+            <column name="local_date" type="date"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
diff --git a/integration-tests/liquibase/src/main/resources/db/complex-schema/data/authority.csv b/integration-tests/liquibase/src/main/resources/db/complex-schema/data/authority.csv
new file mode 100644
index 0000000000000..af5c6dfa186d3
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/complex-schema/data/authority.csv
@@ -0,0 +1,3 @@
+name
+ROLE_ADMIN
+ROLE_USER
diff --git a/integration-tests/liquibase/src/main/resources/db/complex-schema/data/user.csv b/integration-tests/liquibase/src/main/resources/db/complex-schema/data/user.csv
new file mode 100644
index 0000000000000..6052c4250d399
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/complex-schema/data/user.csv
@@ -0,0 +1,5 @@
+id;login;password_hash;first_name;last_name;email;image_url;activated;lang_key;created_by;last_modified_by
+1;system;$2a$10$mE.qmcV0mFU5NcKh73TZx.z4ueI/.bDWbj0T1BYyqP481kGGarKLG;System;System;system@localhost;;true;ru;system;system
+2;anonymoususer;$2a$10$j8S5d7Sr7.8VTOYNviDPOeWX8KcYILUVJBsYV83Y5NtECayypx9lO;Anonymous;User;anonymous@localhost;;true;ru;system;system
+3;admin;$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC;Administrator;Administrator;admin@localhost;;true;ru;system;system
+4;user;$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K;User;User;user@localhost;;true;ru;system;system
diff --git a/integration-tests/liquibase/src/main/resources/db/complex-schema/data/user_authority.csv b/integration-tests/liquibase/src/main/resources/db/complex-schema/data/user_authority.csv
new file mode 100644
index 0000000000000..06c5feeeeace8
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/complex-schema/data/user_authority.csv
@@ -0,0 +1,6 @@
+user_id;authority_name
+1;ROLE_ADMIN
+1;ROLE_USER
+3;ROLE_ADMIN
+3;ROLE_USER
+4;ROLE_USER
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml b/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
index 7198339ed51fe..acec1e3f6903a 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/changeLog.xml
@@ -7,4 +7,6 @@
     <include relativeToChangelogFile="true" file="create-tables.xml" />
 
     <include relativeToChangelogFile="true" file="test/test.xml" />
+
+    <include relativeToChangelogFile="true" file="create-views.xml" />
 </databaseChangeLog>
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml b/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml
index ea52956274b9f..7ed325ea317f5 100644
--- a/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml
+++ b/integration-tests/liquibase/src/main/resources/db/xml/create-tables.xml
@@ -4,6 +4,10 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
+    <preConditions>
+        <dbms type="h2"/>
+    </preConditions>
+
     <changeSet author="dev (generated)" id="create-tables-1">
         <createTable tableName="LIQUIBASE">
             <column name="ID" type="VARCHAR(255)">
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml b/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml
new file mode 100644
index 0000000000000..21e67a9734088
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/xml/create-views.xml
@@ -0,0 +1,27 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.2.xsd">
+
+    <preConditions>
+        <dbms type="h2"/>
+    </preConditions>
+
+    <changeSet author="dev (generated)" id="create-view-inline">
+        <createView viewName="v_inline">select id, name from liquibase where id > 1</createView>
+    </changeSet>
+
+    <changeSet author="dev (generated)" id="create-view-file-abs">
+        <createView viewName="v_file_abs"
+                    path="db/xml/views/view-abs.sql"
+                    relativeToChangelogFile="false"/>
+    </changeSet>
+
+    <changeSet author="dev (generated)" id="create-view-file-rel">
+        <createView viewName="v_file_rel"
+                    path="views/view-rel.sql"
+                    relativeToChangelogFile="true"/>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/views/view-abs.sql b/integration-tests/liquibase/src/main/resources/db/xml/views/view-abs.sql
new file mode 100644
index 0000000000000..eb7996a1dac45
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/xml/views/view-abs.sql
@@ -0,0 +1 @@
+select id, name from liquibase where id > 1
\ No newline at end of file
diff --git a/integration-tests/liquibase/src/main/resources/db/xml/views/view-rel.sql b/integration-tests/liquibase/src/main/resources/db/xml/views/view-rel.sql
new file mode 100644
index 0000000000000..eb7996a1dac45
--- /dev/null
+++ b/integration-tests/liquibase/src/main/resources/db/xml/views/view-rel.sql
@@ -0,0 +1 @@
+select id, name from liquibase where id > 1
\ No newline at end of file
diff --git a/integration-tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityTest.java b/integration-tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityTest.java
index 5555d9ab7c61b..9d7e8f7c96661 100644
--- a/integration-tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityTest.java
+++ b/integration-tests/liquibase/src/test/java/io/quarkus/it/liquibase/LiquibaseFunctionalityTest.java
@@ -19,7 +19,11 @@ public void testLiquibaseQuarkusFunctionality() {
                 .get("/liquibase/update")
                 .then()
                 .body(is(
-                        "create-tables-1,test-1,json-create-tables-1,json-test-1,sql-create-tables-1,sql-test-1,yaml-create-tables-1,yaml-test-1"));
+                        "create-tables-1,test-1,create-view-inline,create-view-file-abs,create-view-file-rel,"
+                                + "json-create-tables-1,json-test-1,"
+                                + "sql-create-tables-1,sql-test-1,"
+                                + "yaml-create-tables-1,yaml-test-1,"
+                                + "00000000000000,00000000000001,00000000000002"));
     }
 
 }
diff --git a/integration-tests/logging-gelf/README.md b/integration-tests/logging-gelf/README.md
index 37a640d26c8b7..e90c5fac187b5 100644
--- a/integration-tests/logging-gelf/README.md
+++ b/integration-tests/logging-gelf/README.md
@@ -1,8 +1,10 @@
 # JAX-RS example using Graylog central log management
 
-## Running the tests
+By default, the test of this module is enabled for ELK using `mvn clean test -Dstart-containers -Dtest-containers`.
 
-By default, the tests of this module are disabled.
+If you want to launch central logging stack by yourself, you can use the following instructions.
+
+## Testing with Graylog
 
 To run them, you first need to start a Graylog server and it's needed dependencies.
 
diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml
index 81a5527aaa138..9c269bcfc383c 100644
--- a/integration-tests/logging-gelf/pom.xml
+++ b/integration-tests/logging-gelf/pom.xml
@@ -34,6 +34,38 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-gelf-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -66,10 +98,10 @@
 
     <profiles>
         <profile>
-        <id>test-gelf</id>
+            <id>test-gelf</id>
             <activation>
                 <property>
-                    <name>test-gelf</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -89,56 +121,131 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
-            <id>native-image</id>
+            <id>docker-gelf</id>
             <activation>
                 <property>
-                    <name>native</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
+            <properties>
+                <elasticsearch.hosts>localhost:9200</elasticsearch.hosts>
+                <elasticsearch.protocol>http</elasticsearch.protocol>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
+                            <autoCreateCustomNetworks>true</autoCreateCustomNetworks>
+                            <images>
+                                <image>
+                                    <name>docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3</name>
+                                    <alias>elasticsearch</alias>
+                                    <run>
+                                        <network>
+                                            <mode>custom</mode>
+                                            <name>elk</name>
+                                            <alias>elasticsearch</alias>
+                                        </network>
+                                        <cpus>2</cpus>
+                                        <cpuShares>2048</cpuShares>
+                                        <ports>
+                                            <port>9200:9200</port>
+                                        </ports>
+                                        <env>
+                                            <discovery.type>single-node</discovery.type>
+                                        </env>
+                                        <log>
+                                            <prefix>Elasticsearch: </prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <http>
+                                                <url>http://localhost:9200</url>
+                                                <method>GET</method>
+                                                <status>200</status>
+                                            </http>
+                                            <time>30000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                                <image>
+                                    <name>docker.elastic.co/logstash/logstash-oss:7.9.3</name>
+                                    <alias>logstash</alias>
+                                    <run>
+                                        <network>
+                                            <mode>custom</mode>
+                                            <name>elk</name>
+                                            <alias>logstash</alias>
+                                        </network>
+                                        <cpus>2</cpus>
+                                        <cpuShares>2048</cpuShares>
+                                        <ports>
+                                            <port>12201:12201/udp</port>
+                                            <port>5000:5000</port>
+                                            <port>9600:9600</port>
+                                        </ports>
+                                        <log>
+                                            <prefix>Logstash: </prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <volumes>
+                                            <bind>
+                                                <volume>${project.basedir}/src/test/resources/pipeline:/usr/share/logstash/pipeline</volume>
+                                            </bind>
+                                        </volumes>
+                                        <wait>
+                                            <http>
+                                                <url>http://localhost:9600</url>
+                                                <method>GET</method>
+                                                <status>200</status>
+                                            </http>
+                                            <!-- Starting the pipeline can be long as it needs to communicate with Elasticsearch -->
+                                            <time>45000</time>
+                                        </wait>
+                                        <dependsOn>
+                                            <container>elasticsearch</container>
+                                        </dependsOn>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
                         </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>docker-start</id>
+                                <phase>process-test-classes</phase>
                                 <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
                                 </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>native-image</id>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
+                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
                                 </configuration>
                             </execution>
                         </executions>
@@ -146,6 +253,19 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
+        </profile>
     </profiles>
 
 </project>
diff --git a/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java b/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java
index 4e7ac9127e207..28cba380916e0 100644
--- a/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java
+++ b/integration-tests/logging-gelf/src/main/java/io/quarkus/logging/gelf/it/GelfLogHandlerResource.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java b/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java
index 225ab4785357d..b4c271deda068 100644
--- a/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java
+++ b/integration-tests/logging-gelf/src/test/java/io/quarkus/logging/gelf/it/GelfLogHandlerTest.java
@@ -1,35 +1,47 @@
 package io.quarkus.logging.gelf.it;
 
-import static org.hamcrest.Matchers.hasItem;
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import io.restassured.response.Response;
 
 /**
  * This test is disabled by default as it needs a central log management system up and running to be able to be launched.
  * Check the README.md, it contains info of how to launch one prior to this test.
  *
- * This test is designed to be launched with Graylog as the central management solution as the RestAssured assertion
- * check that a log events is received using the Graylog search API. Launching the test with another solution will
+ * This test is designed to be launched with ELK as the central management solution as the RestAssured assertion
+ * check that a log events is received using the Elasticsearch search API. Launching the test with another solution will
  * fail the test.
  */
 @QuarkusTest
 public class GelfLogHandlerTest {
 
     @Test
-    public void test() throws InterruptedException {
-        RestAssured.given().when().get("/gelf-log-handler").then().statusCode(204);
-
-        //wait two seconds for the log events to be processed
-        Thread.sleep(2000);
-
-        RestAssured.given()
-                .when()
-                .auth().basic("admin", "admin")
-                .get("http://127.0.0.1:9000/api/search/universal/relative?query=")
-                .then().statusCode(200)
-                .body("messages.message.message", hasItem("Some useful log message"));
+    public void test() {
+        //we need to await for a certain time as logstash needs to create the index template,
+        // then elasticsearch create the index
+        // then some logs being indexed.
+        await().atMost(10, TimeUnit.SECONDS)
+                .untilAsserted(
+                        () -> {
+                            RestAssured.given().when().get("/gelf-log-handler").then().statusCode(204);
+
+                            Response response = RestAssured.given()
+                                    .when()
+                                    .get("http://127.0.0.1:9200/_search?q=message")
+                                    .prettyPeek()
+                                    .andReturn();
+
+                            assertEquals(200, response.statusCode());
+                            assertNotNull(response.body().path("hits.hits[0]._source"));
+                            assertEquals("Some useful log message", response.body().path("hits.hits[0]._source.message"));
+                        });
     }
 }
diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml
index f1abfed119c33..2cf361edaa15d 100644
--- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml
+++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml
@@ -2,14 +2,15 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.2
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3
     environment:
-      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+      - "discovery.type=single-node"
     networks:
       - elk
 
   logstash:
-    image: docker.elastic.co/logstash/logstash-oss:6.8.2
+    image: docker.elastic.co/logstash/logstash-oss:7.9.3
     volumes:
       - source: $HOME/pipelines
         target: /usr/share/logstash/pipeline
@@ -24,7 +25,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana-oss:6.8.2
+    image: docker.elastic.co/kibana/kibana-oss:7.9.3
     ports:
       - "5601:5601"
     networks:
diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml
index b60017a6ae843..9531222e6b428 100644
--- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml
+++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml
@@ -2,19 +2,20 @@ version: '3.2'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.2
+    # Graylog 3 only works with Elasticsearch 6
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.9
     environment:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
     networks:
       - graylog
 
   mongo:
-    image: mongo:4.0
+    image: mongo:4.2
     networks:
       - graylog
 
   graylog:
-    image: graylog/graylog:3.1
+    image: graylog/graylog:3.3.8
     ports:
       - "9000:9000"
       - "12201:12201/udp"
diff --git a/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf b/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf
new file mode 100644
index 0000000000000..b478c8175bac3
--- /dev/null
+++ b/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf
@@ -0,0 +1,11 @@
+input {
+  gelf {
+    port => 12201
+  }
+}
+output {
+  stdout {}
+  elasticsearch {
+    hosts => ["http://elasticsearch:9200"]
+  }
+}
diff --git a/integration-tests/logging-json/pom.xml b/integration-tests/logging-json/pom.xml
new file mode 100644
index 0000000000000..380d77b785221
--- /dev/null
+++ b/integration-tests/logging-json/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-logging-json</artifactId>
+    <name>Quarkus - Integration Tests - Logging - JSON</name>
+    <description>
+        Tests the JSON logging extension
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-json</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-logging-json-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java b/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java
new file mode 100644
index 0000000000000..1c3099e4d5610
--- /dev/null
+++ b/integration-tests/logging-json/src/main/java/io/quarkus/it/logging/json/GreetingResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.logging.json;
+
+import java.util.logging.Logger;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class GreetingResource {
+
+    private static final Logger logger = Logger.getLogger(GreetingResource.class.getName());
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        logger.info("Hello to \"Quarkus\"");
+        return "hello";
+    }
+}
diff --git a/integration-tests/logging-json/src/test/java/io/quarkus/it/logging/json/GreetingResourceTest.java b/integration-tests/logging-json/src/test/java/io/quarkus/it/logging/json/GreetingResourceTest.java
new file mode 100644
index 0000000000000..f56b70e099f03
--- /dev/null
+++ b/integration-tests/logging-json/src/test/java/io/quarkus/it/logging/json/GreetingResourceTest.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.logging.json;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class GreetingResourceTest {
+
+    @Test
+    public void testHelloEndpoint() throws Exception {
+        given()
+                .when().get("/hello")
+                .then()
+                .statusCode(200)
+                .body(is("hello"));
+    }
+
+}
diff --git a/integration-tests/logging-json/src/test/java/io/quarkus/it/logging/json/NativeGreetingResourceIT.java b/integration-tests/logging-json/src/test/java/io/quarkus/it/logging/json/NativeGreetingResourceIT.java
new file mode 100644
index 0000000000000..3d9ebea159a78
--- /dev/null
+++ b/integration-tests/logging-json/src/test/java/io/quarkus/it/logging/json/NativeGreetingResourceIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.json;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeGreetingResourceIT extends GreetingResourceTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/pom.xml b/integration-tests/logging-min-level-set/pom.xml
new file mode 100644
index 0000000000000..38e124a93d652
--- /dev/null
+++ b/integration-tests/logging-min-level-set/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-logging-min-level-set</artifactId>
+    <name>Quarkus - Integration Tests - Logging when minimum level is set</name>
+    <description>
+        A integration test that verifies logging expectations when minimum logging level is set
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/LoggingWitness.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/LoggingWitness.java
new file mode 100644
index 0000000000000..8e3bf78a6b138
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/LoggingWitness.java
@@ -0,0 +1,44 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import java.util.function.BiConsumer;
+
+import org.jboss.logging.Logger;
+
+public class LoggingWitness {
+
+    public static boolean loggedError(String msg, Logger logger) {
+        return logged(msg, logger::error);
+    }
+
+    public static boolean loggedWarn(String msg, Logger logger) {
+        return logged(msg, logger::warn);
+    }
+
+    public static boolean loggedInfo(String msg, Logger logger) {
+        return logged(msg, logger::info);
+    }
+
+    public static boolean loggedDebug(String msg, Logger logger) {
+        return logged(msg, logger::debug);
+    }
+
+    public static boolean loggedTrace(String msg, Logger logger) {
+        return logged(msg, logger::trace);
+    }
+
+    private static boolean logged(String msg, BiConsumer<String, Throwable> logFunction) {
+        final LoggingWitnessThrowable throwable = new LoggingWitnessThrowable();
+        logFunction.accept(msg, throwable);
+        return throwable.logged;
+    }
+
+    private static final class LoggingWitnessThrowable extends Throwable {
+        boolean logged;
+
+        @Override
+        public StackTraceElement[] getStackTrace() {
+            logged = true;
+            return new StackTraceElement[] {};
+        }
+    }
+}
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java
new file mode 100644
index 0000000000000..7e8b33db36039
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/above/LoggingMinLevelAbove.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.logging.minlevel.set.above;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.set.LoggingWitness;
+
+@Path("/log/above")
+public class LoggingMinLevelAbove {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelAbove.class);
+
+    @GET
+    @Path("/not-info")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotInfo() {
+        return !LOG.isInfoEnabled() && !LoggingWitness.loggedInfo("should not print", LOG);
+    }
+
+    @GET
+    @Path("/warn")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isWarn() {
+        return LoggingWitness.loggedWarn("warn message", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java
new file mode 100644
index 0000000000000..b2597bf482b9c
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/LoggingMinLevelBelow.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.logging.minlevel.set.below;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.set.LoggingWitness;
+
+@Path("/log/below")
+public class LoggingMinLevelBelow {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelBelow.class);
+
+    @GET
+    @Path("/trace")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isTrace() {
+        return LOG.isTraceEnabled() && LoggingWitness.loggedTrace("trace-message", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java
new file mode 100644
index 0000000000000..e17b1267e0ae1
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/below/child/LoggingMinLevelBelowChild.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.logging.minlevel.set.below.child;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.set.LoggingWitness;
+
+@Path("/log/below/child")
+public class LoggingMinLevelBelowChild {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelBelowChild.class);
+
+    @GET
+    @Path("/trace")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isTrace() {
+        return LOG.isTraceEnabled() && LoggingWitness.loggedTrace("trace-message", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java
new file mode 100644
index 0000000000000..e4055c810b6c2
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/bydefault/LoggingMinLevelByDefault.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.logging.minlevel.set.bydefault;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.set.LoggingWitness;
+
+@Path("/log/bydefault")
+public class LoggingMinLevelByDefault {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelByDefault.class);
+
+    @GET
+    @Path("/debug")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isDebug() {
+        return LOG.isDebugEnabled() && LoggingWitness.loggedDebug("debug message", LOG);
+    }
+
+    @GET
+    @Path("/not-trace")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotTrace() {
+        return !LOG.isTraceEnabled() && !LoggingWitness.loggedTrace("should not print", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java
new file mode 100644
index 0000000000000..ddb251b3ee243
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/LoggingMinLevelPromote.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.logging.minlevel.set.promote;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.set.LoggingWitness;
+
+@Path("/log/promote")
+public class LoggingMinLevelPromote {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelPromote.class);
+
+    @GET
+    @Path("/not-info")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotInfo() {
+        return !LOG.isInfoEnabled() && !LoggingWitness.loggedInfo("should not print", LOG);
+    }
+
+    @GET
+    @Path("/error")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isError() {
+        return LoggingWitness.loggedError("error message", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java
new file mode 100644
index 0000000000000..6c29051a9c190
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/java/io/quarkus/it/logging/minlevel/set/promote/sub/LoggingMinLevelPromoteSub.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.logging.minlevel.set.promote.sub;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.set.LoggingWitness;
+
+@Path("/log/promote/sub")
+public class LoggingMinLevelPromoteSub {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelPromoteSub.class);
+
+    @GET
+    @Path("/not-info")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotInfo() {
+        return !LOG.isInfoEnabled() && !LoggingWitness.loggedInfo("should not print", LOG);
+    }
+
+    @GET
+    @Path("/error")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isError() {
+        return LoggingWitness.loggedError("error message", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/main/resources/application.properties b/integration-tests/logging-min-level-set/src/main/resources/application.properties
new file mode 100644
index 0000000000000..2e1c47781c2c4
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+quarkus.log.min-level=DEBUG
+quarkus.log.category."io.quarkus.it.logging.minlevel.set.above".min-level=INFO
+quarkus.log.category."io.quarkus.it.logging.minlevel.set.below".min-level=TRACE
+quarkus.log.category."io.quarkus.it.logging.minlevel.set.below.child".min-level=inherit
+quarkus.log.category."io.quarkus.it.logging.minlevel.set.promote".min-level=ERROR
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/Asserts.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/Asserts.java
new file mode 100644
index 0000000000000..0cf7cd42d1f50
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/Asserts.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.function.BiConsumer;
+
+final class Asserts {
+    private static boolean assertLogged(boolean expected, String msg, BiConsumer<String, Throwable> logFunction) {
+        try (AssertThrowable t = new AssertThrowable(expected)) {
+            logFunction.accept(msg, t);
+            if (t.expected)
+                return t.executed;
+            else
+                return t.executed;
+        }
+    }
+
+    private static final class AssertThrowable extends Throwable implements AutoCloseable {
+
+        final boolean expected;
+        boolean executed;
+
+        private AssertThrowable(boolean expected) {
+            this.expected = expected;
+        }
+
+        @Override
+        public StackTraceElement[] getStackTrace() {
+            executed = true;
+            return new StackTraceElement[] {};
+        }
+
+        @Override
+        public void close() {
+            if (expected) {
+                assertTrue(executed, "Expected message to be printed but didn't get printed");
+            } else {
+                assertFalse(executed, "Expected message not to be printed but got printed");
+            }
+        }
+    }
+
+    private Asserts() {
+    }
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelAboveTest.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelAboveTest.java
new file mode 100644
index 0000000000000..0494c00722ac0
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelAboveTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Test that verifies that min-level can go higher than default min-level,
+ * and this can be further tweaked at runtime to go to above to an even higher level.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelAboveTest {
+
+    @Test
+    public void testNotInfo() {
+        given()
+                .when().get("/log/above/not-info")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testWarn() {
+        given()
+                .when().get("/log/above/warn")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelBelowChildTest.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelBelowChildTest.java
new file mode 100644
index 0000000000000..4ae4a80484490
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelBelowChildTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Test verifies that a min-level override that goes below the default min-level is applied correctly.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelBelowChildTest {
+
+    @Test
+    public void testTrace() {
+        given()
+                .when().get("/log/below/child/trace")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelBelowTest.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelBelowTest.java
new file mode 100644
index 0000000000000..ced72852db9bf
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelBelowTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Test verifies that a min-level override that goes below the default min-level is applied correctly.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelBelowTest {
+
+    @Test
+    public void testTrace() {
+        given()
+                .when().get("/log/below/trace")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelByDefaultTest.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelByDefaultTest.java
new file mode 100644
index 0000000000000..b4a79abf90a9d
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelByDefaultTest.java
@@ -0,0 +1,40 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Tests that verify that changes to the default min-level are applied correctly.
+ *
+ * If unset, the default is INFO,
+ * so this test verifies that when the default min-level is changed,
+ * say to DEBUG, the code works as expected.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelByDefaultTest {
+
+    @Test
+    public void testDebug() {
+        given()
+                .when().get("/log/bydefault/debug")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testNotTrace() {
+        given()
+                .when().get("/log/bydefault/not-trace")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelPromoteSubTest.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelPromoteSubTest.java
new file mode 100644
index 0000000000000..9b7e978754b3e
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelPromoteSubTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * This test verifies that log levels are promoted to min-level when set below, even for subpackages.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelPromoteSubTest {
+
+    @Test
+    public void testNotInfo() {
+        given()
+                .when().get("/log/promote/sub/not-info")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testError() {
+        given()
+                .when().get("/log/promote/sub/error")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelPromoteTest.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelPromoteTest.java
new file mode 100644
index 0000000000000..bd4e8208828fc
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/LoggingMinLevelPromoteTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * This test verifies that log levels are promoted to min-level when set below.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelPromoteTest {
+
+    @Test
+    public void testNotInfo() {
+        given()
+                .when().get("/log/promote/not-info")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testError() {
+        given()
+                .when().get("/log/promote/error")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelAboveIT.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelAboveIT.java
new file mode 100644
index 0000000000000..cd30e3e9bd42f
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelAboveIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelAboveIT extends LoggingMinLevelAboveTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelBelowChildIT.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelBelowChildIT.java
new file mode 100644
index 0000000000000..759969c919c02
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelBelowChildIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelBelowChildIT extends LoggingMinLevelBelowChildTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelBelowIT.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelBelowIT.java
new file mode 100644
index 0000000000000..083f158875001
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelBelowIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelBelowIT extends LoggingMinLevelBelowTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelByDefaultIT.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelByDefaultIT.java
new file mode 100644
index 0000000000000..cf004df48327d
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelByDefaultIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelByDefaultIT extends LoggingMinLevelByDefaultTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelPromoteIT.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelPromoteIT.java
new file mode 100644
index 0000000000000..d8d931a0f17c4
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelPromoteIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelPromoteIT extends LoggingMinLevelPromoteTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelPromoteSubIT.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelPromoteSubIT.java
new file mode 100644
index 0000000000000..900692bb54e4f
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/NativeLoggingMinLevelPromoteSubIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelPromoteSubIT extends LoggingMinLevelPromoteSubTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/SetRuntimeLogLevels.java b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/SetRuntimeLogLevels.java
new file mode 100644
index 0000000000000..465dd36f56f0a
--- /dev/null
+++ b/integration-tests/logging-min-level-set/src/test/java/io/quarkus/it/logging/minlevel/set/SetRuntimeLogLevels.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.logging.minlevel.set;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public final class SetRuntimeLogLevels implements QuarkusTestResourceLifecycleManager {
+
+    @Override
+    public Map<String, String> start() {
+        final Map<String, String> systemProperties = new HashMap<>();
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.set.bydefault\".level", "DEBUG");
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.set.above\".level", "WARN");
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.set.below\".level", "TRACE");
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.set.below.child\".level", "inherit");
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.set.promote\".level", "INFO");
+        return systemProperties;
+    }
+
+    @Override
+    public void stop() {
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/pom.xml b/integration-tests/logging-min-level-unset/pom.xml
new file mode 100644
index 0000000000000..8fed5dc28f7a8
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-logging-min-level-unset</artifactId>
+    <name>Quarkus - Integration Tests - Logging when minimum level is unset</name>
+    <description>
+        A integration test that verifies logging expectations when minimum logging level is unset
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/LoggingWitness.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/LoggingWitness.java
new file mode 100644
index 0000000000000..9b5bcc9acb027
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/LoggingWitness.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import java.util.function.BiConsumer;
+
+import org.jboss.logging.Logger;
+
+public class LoggingWitness {
+    public static boolean loggedInfo(String msg, Logger logger) {
+        return logged(msg, logger::info);
+    }
+
+    public static boolean notLoggedInfo(String msg, Logger logger) {
+        return !loggedInfo(msg, logger);
+    }
+
+    public static boolean loggedWarn(String msg, Logger logger) {
+        return logged(msg, logger::warn);
+    }
+
+    public static boolean notLoggedTrace(String msg, Logger logger) {
+        return !logged(msg, logger::trace);
+    }
+
+    private static boolean logged(String msg, BiConsumer<String, Throwable> logFunction) {
+        final LoggingWitnessThrowable throwable = new LoggingWitnessThrowable();
+        logFunction.accept(msg, throwable);
+        return throwable.logged;
+    }
+
+    private static final class LoggingWitnessThrowable extends Throwable {
+        boolean logged;
+
+        @Override
+        public StackTraceElement[] getStackTrace() {
+            logged = true;
+            return new StackTraceElement[] {};
+        }
+    }
+}
diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java
new file mode 100644
index 0000000000000..f2982156233e5
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/above/LoggingMinLevelAbove.java
@@ -0,0 +1,38 @@
+package io.quarkus.it.logging.minlevel.unset.above;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.unset.LoggingWitness;
+
+@Path("/log/above")
+public class LoggingMinLevelAbove {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelAbove.class);
+
+    @GET
+    @Path("/not-info")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotInfo() {
+        return !LOG.isInfoEnabled() && LoggingWitness.notLoggedInfo("should not print", LOG);
+    }
+
+    @GET
+    @Path("/warn")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isWarn() {
+        return LoggingWitness.loggedWarn("warn message", LOG);
+    }
+
+    @GET
+    @Path("/not-trace")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotTrace() {
+        return !LOG.isTraceEnabled() && LoggingWitness.notLoggedTrace("should not print", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java
new file mode 100644
index 0000000000000..0a6c206c6f067
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/bydefault/LoggingMinLevelByDefault.java
@@ -0,0 +1,38 @@
+package io.quarkus.it.logging.minlevel.unset.bydefault;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.unset.LoggingWitness;
+
+@Path("/log/bydefault")
+public class LoggingMinLevelByDefault {
+
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelByDefault.class);
+
+    @GET
+    @Path("/info")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isInfo() {
+        return LOG.isInfoEnabled() && LoggingWitness.loggedInfo("info message", LOG);
+    }
+
+    @GET
+    @Path("/warn")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isWarn() {
+        return LoggingWitness.loggedWarn("warn message", LOG);
+    }
+
+    @GET
+    @Path("/not-trace")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotTrace() {
+        return !LOG.isTraceEnabled() && LoggingWitness.notLoggedTrace("should not print", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java
new file mode 100644
index 0000000000000..4bc35d2dc7cd9
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/main/java/io/quarkus/it/logging/minlevel/unset/promote/LoggingMinLevelPromote.java
@@ -0,0 +1,37 @@
+package io.quarkus.it.logging.minlevel.unset.promote;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.it.logging.minlevel.unset.LoggingWitness;
+
+@Path("/log/promote")
+public class LoggingMinLevelPromote {
+    static final Logger LOG = Logger.getLogger(LoggingMinLevelPromote.class);
+
+    @GET
+    @Path("/info")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isInfo() {
+        return LOG.isInfoEnabled() && LoggingWitness.loggedInfo("info message", LOG);
+    }
+
+    @GET
+    @Path("/warn")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isWarn() {
+        return LoggingWitness.loggedWarn("warn message", LOG);
+    }
+
+    @GET
+    @Path("/not-trace")
+    @Produces(MediaType.TEXT_PLAIN)
+    public boolean isNotTrace() {
+        return !LOG.isTraceEnabled() && LoggingWitness.notLoggedTrace("should not print", LOG);
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/Asserts.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/Asserts.java
new file mode 100644
index 0000000000000..baf4464457af2
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/Asserts.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.function.BiConsumer;
+
+final class Asserts {
+    private static boolean assertLogged(boolean expected, String msg, BiConsumer<String, Throwable> logFunction) {
+        try (AssertThrowable t = new AssertThrowable(expected)) {
+            logFunction.accept(msg, t);
+            if (t.expected)
+                return t.executed;
+            else
+                return t.executed;
+        }
+    }
+
+    private static final class AssertThrowable extends Throwable implements AutoCloseable {
+
+        final boolean expected;
+        boolean executed;
+
+        private AssertThrowable(boolean expected) {
+            this.expected = expected;
+        }
+
+        @Override
+        public StackTraceElement[] getStackTrace() {
+            executed = true;
+            return new StackTraceElement[] {};
+        }
+
+        @Override
+        public void close() {
+            if (expected) {
+                assertTrue(executed, "Expected message to be printed but didn't get printed");
+            } else {
+                assertFalse(executed, "Expected message not to be printed but got printed");
+            }
+        }
+    }
+
+    private Asserts() {
+    }
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelAboveTest.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelAboveTest.java
new file mode 100644
index 0000000000000..0e8ef8cb344d3
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelAboveTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * This test verifies that a runtime log level can go above the default min-level,
+ * and only messages at same runtime log level or above are shown.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelAboveTest {
+
+    @Test
+    public void testNotInfo() {
+        given()
+                .when().get("/log/above/not-info")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testWarn() {
+        given()
+                .when().get("/log/above/warn")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testNotTrace() {
+        given()
+                .when().get("/log/above/not-trace")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelByDefaultTest.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelByDefaultTest.java
new file mode 100644
index 0000000000000..423be57b74ef0
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelByDefaultTest.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Tests that logging works as expected when min-level is default,
+ * and there's no applicable runtime log level override.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelByDefaultTest {
+
+    @Test
+    public void testInfo() {
+        given()
+                .when().get("/log/bydefault/info")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testWarn() {
+        given()
+                .when().get("/log/bydefault/warn")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testNotTrace() {
+        given()
+                .when().get("/log/bydefault/not-trace")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelPromoteTest.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelPromoteTest.java
new file mode 100644
index 0000000000000..8dfdb29d39301
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/LoggingMinLevelPromoteTest.java
@@ -0,0 +1,49 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * This test verifies that log levels are promoted to min-level when set below the default min-level.
+ * 
+ * So given the default min-level is DEBUG,
+ * so if log level is set to TRACE,
+ * it will be automatically promoted to DEBUG.
+ */
+@QuarkusTest
+@QuarkusTestResource(SetRuntimeLogLevels.class)
+public class LoggingMinLevelPromoteTest {
+
+    @Test
+    public void testInfo() {
+        given()
+                .when().get("/log/promote/info")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testWarn() {
+        given()
+                .when().get("/log/promote/warn")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+    @Test
+    public void testNotTrace() {
+        given()
+                .when().get("/log/promote/not-trace")
+                .then()
+                .statusCode(200)
+                .body(is("true"));
+    }
+
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingMinLevelByDefaultIT.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingMinLevelByDefaultIT.java
new file mode 100644
index 0000000000000..40746cab36c33
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingMinLevelByDefaultIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelByDefaultIT extends LoggingMinLevelByDefaultTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingMinLevelPromoteIT.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingMinLevelPromoteIT.java
new file mode 100644
index 0000000000000..d046b36e4b955
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingMinLevelPromoteIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingMinLevelPromoteIT extends LoggingMinLevelPromoteTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingWarnResourceIT.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingWarnResourceIT.java
new file mode 100644
index 0000000000000..9d0000a87df99
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/NativeLoggingWarnResourceIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeLoggingWarnResourceIT extends LoggingMinLevelAboveTest {
+
+    // Execute the same tests but in native mode.
+}
diff --git a/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/SetRuntimeLogLevels.java b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/SetRuntimeLogLevels.java
new file mode 100644
index 0000000000000..777bb6e0db2fc
--- /dev/null
+++ b/integration-tests/logging-min-level-unset/src/test/java/io/quarkus/it/logging/minlevel/unset/SetRuntimeLogLevels.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.logging.minlevel.unset;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public final class SetRuntimeLogLevels implements QuarkusTestResourceLifecycleManager {
+
+    @Override
+    public Map<String, String> start() {
+        final Map<String, String> systemProperties = new HashMap<>();
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.unset.above\".level", "WARN");
+        systemProperties.put("quarkus.log.category.\"io.quarkus.it.logging.minlevel.unset.promote\".level", "TRACE");
+        return systemProperties;
+    }
+
+    @Override
+    public void stop() {
+    }
+
+}
diff --git a/integration-tests/mailer/pom.xml b/integration-tests/mailer/pom.xml
new file mode 100644
index 0000000000000..7c2a35decfee9
--- /dev/null
+++ b/integration-tests/mailer/pom.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-mailer</artifactId>
+    <name>Quarkus - Integration Tests - Mailer</name>
+    <description>The Quarkus Mailer integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-shared-library</artifactId>
+        </dependency>
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mailer</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mailer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-mailer</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java b/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java
new file mode 100644
index 0000000000000..ceda2733e2da0
--- /dev/null
+++ b/integration-tests/mailer/src/main/java/io/quarkus/it/mailer/MailResource.java
@@ -0,0 +1,76 @@
+package io.quarkus.it.mailer;
+
+import java.time.Duration;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.mailer.Mail;
+import io.quarkus.mailer.Mailer;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.core.buffer.Buffer;
+
+@Path("/mail")
+@Produces(MediaType.TEXT_PLAIN)
+public class MailResource {
+
+    @Inject
+    Mailer mailer;
+
+    @Inject
+    Vertx vertx;
+
+    /**
+     * Send a simple text email.
+     */
+    @GET
+    @Path("/text")
+    public String sendSimpleTextEmail() {
+        mailer.send(Mail.withText("nobody@quarkus.io",
+                "simple test email",
+                "This is a simple test email.\nRegards,\nRoger the robot"));
+        return "ok";
+    }
+
+    /**
+     * Send a simple text email with a text attachment (not inlined)
+     */
+    @GET
+    @Path("/text-with-attachment")
+    public String sendSimpleTextEmailWithASingleAttachment() {
+        Buffer lorem = vertx.fileSystem().readFile("META-INF/resources/lorem.txt").await().atMost(Duration.ofSeconds(1));
+        mailer.send(Mail.withText("nobody@quarkus.io",
+                "simple test email with an attachment",
+                "This is a simple test email.\nRegards,\nRoger the robot")
+                .addAttachment("lorem.txt", lorem.getBytes(), "text/plain"));
+        return "ok";
+    }
+
+    /**
+     * Send a simple HTML email.
+     */
+    @GET
+    @Path("/html")
+    public String sendSimpleHtmlEmail() {
+        mailer.send(Mail.withHtml("nobody@quarkus.io",
+                "html test email",
+                "<h3>Hello!</h3><p>This is a simple test email.</p><p>Regards,</p><p>Roger the robot</p>"));
+        return "ok";
+    }
+
+    /**
+     * Send a simple text email to multiple recipients.
+     */
+    @GET
+    @Path("/multiple-recipients")
+    public String sendSimpleTextEmailToMultipleRecipients() {
+        mailer.send(Mail.withText("nobody@quarkus.io",
+                "simple test email",
+                "This is a simple test email.\nRegards,\nRoger the robot")
+                .addTo("nobody@example.com"));
+        return "ok";
+    }
+}
diff --git a/integration-tests/mailer/src/main/resources/META-INF/resources/lorem.txt b/integration-tests/mailer/src/main/resources/META-INF/resources/lorem.txt
new file mode 100644
index 0000000000000..0919db07d900c
--- /dev/null
+++ b/integration-tests/mailer/src/main/resources/META-INF/resources/lorem.txt
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+ Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+ Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/integration-tests/mailer/src/main/resources/application.properties b/integration-tests/mailer/src/main/resources/application.properties
new file mode 100644
index 0000000000000..1e8fc2ddacc43
--- /dev/null
+++ b/integration-tests/mailer/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+quarkus.mailer.from=roger-the-robot@quarkus.io
+quarkus.mailer.mock=false
+quarkus.mailer.ssl=false
+quarkus.mailer.trust-all=true
\ No newline at end of file
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/Attachment.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/Attachment.java
new file mode 100644
index 0000000000000..d3aea6b418bcf
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/Attachment.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.mailer;
+
+public class Attachment {
+
+    public String contentDisposition;
+    public String filename;
+    public String contentType;
+    public String checksum;
+
+}
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java
new file mode 100644
index 0000000000000..d16d0c9331db6
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.mailer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class FakeMailerTestResource implements QuarkusTestResourceLifecycleManager {
+
+    public GenericContainer<?> server = new GenericContainer<>("reachfive/fake-smtp-server:latest")
+            .withExposedPorts(1080, 1025)
+            .waitingFor(Wait.forHttp("/api/emails"));
+
+    @Override
+    public Map<String, String> start() {
+        server.start();
+        HashMap<String, String> properties = new HashMap<>();
+        properties.put("quarkus.mailer.port", Integer.toString(server.getMappedPort(1025)));
+        properties.put("quarkus.mailer.host", server.getContainerIpAddress());
+        properties.put("fake.mailer", server.getContainerIpAddress() + ":" + server.getMappedPort(1080));
+        //        properties.put("quarkus.mailer.port", Integer.toString(32787));
+        //        properties.put("quarkus.mailer.host", "localhost");
+        //        properties.put("fake.mailer", "localhost" + ":" + 32786);
+        return properties;
+    }
+
+    @Override
+    public void stop() {
+        server.close();
+    }
+}
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/HtmlEmail.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/HtmlEmail.java
new file mode 100644
index 0000000000000..9f2aeadcf580c
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/HtmlEmail.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.mailer;
+
+public class HtmlEmail {
+
+    public String subject;
+    public String html;
+    public Recipient to;
+}
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerIT.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerIT.java
new file mode 100644
index 0000000000000..b19bb9722c705
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerIT.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.mailer;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+@QuarkusTestResource(FakeMailerTestResource.class)
+public class MailerIT extends MailerTest {
+
+}
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java
new file mode 100644
index 0000000000000..aa2daaf2aa695
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java
@@ -0,0 +1,127 @@
+package io.quarkus.it.mailer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.google.common.reflect.TypeToken;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.restassured.config.ObjectMapperConfig;
+import io.restassured.mapper.ObjectMapperType;
+
+@QuarkusTest
+@QuarkusTestResource(FakeMailerTestResource.class)
+public class MailerTest {
+    public static final String LOREM_CHECKSUM = "386e8d6ae186eacb5b60fac15ed140cd";
+    private String mailServer;
+
+    @BeforeAll
+    public static void configureMapper() {
+        RestAssured.config = RestAssured.config.objectMapperConfig(ObjectMapperConfig.objectMapperConfig()
+                .defaultObjectMapperType(ObjectMapperType.JSONB));
+    }
+
+    @BeforeEach
+    public void init() {
+        mailServer = "http://" + System.getProperty("fake.mailer") + "/api/emails";
+    }
+
+    @AfterEach
+    public void clearAllReceivedEmails() {
+        RestAssured.delete(mailServer)
+                .then().statusCode(200);
+    }
+
+    @Test
+    public void sendTextEmail() {
+        RestAssured.get("/mail/text");
+
+        await().until(() -> getLastEmail() != null);
+
+        TextEmail email = getLastEmail();
+        assertThat(email).isNotNull();
+        assertThat(email.subject).isEqualTo("simple test email");
+        assertThat(email.text).contains("This is a simple test email.");
+        assertThat(email.to.text).contains("nobody@quarkus.io");
+    }
+
+    @Test
+    public void sendEmailToMultipleRecipients() {
+        RestAssured.get("/mail/multiple-recipients");
+
+        await().until(() -> getLastEmail() != null);
+
+        TextEmail email = getLastEmail();
+        assertThat(email).isNotNull();
+        assertThat(email.subject).isEqualTo("simple test email");
+        assertThat(email.text).contains("This is a simple test email.");
+        assertThat(email.to.text).contains("nobody@quarkus.io", "nobody@example.com");
+    }
+
+    @Test
+    public void sendHtmlEmail() {
+        RestAssured.get("/mail/html");
+
+        await().until(() -> getLastEmail() != null);
+
+        HtmlEmail email = getLastHtmlEmail();
+        assertThat(email).isNotNull();
+        assertThat(email.subject).isEqualTo("html test email");
+        assertThat(email.html).contains("<h3>Hello!</h3>");
+        assertThat(email.to.text).contains("nobody@quarkus.io");
+    }
+
+    @Test
+    public void sendTextEmailWithAttachment() {
+        RestAssured.get("/mail/text-with-attachment");
+
+        await().until(() -> getLastEmail() != null);
+
+        TextEmail email = getLastEmail();
+        assertThat(email).isNotNull();
+        assertThat(email.subject).isEqualTo("simple test email with an attachment");
+        assertThat(email.text).contains("This is a simple test email.");
+        assertThat(email.to.text).contains("nobody@quarkus.io");
+
+        assertThat(email.attachments).hasSize(1)
+                .allSatisfy(attachment -> {
+                    assertThat(attachment.filename).isEqualTo("lorem.txt");
+                    assertThat(attachment.checksum).isEqualTo(LOREM_CHECKSUM);
+                    assertThat(attachment.contentDisposition).isEqualTo("attachment");
+                    assertThat(attachment.contentType).isEqualTo("text/plain");
+                });
+    }
+
+    @SuppressWarnings("UnstableApiUsage")
+    private TextEmail getLastEmail() {
+        Type t = new TypeToken<List<TextEmail>>() {
+        }.getType();
+        List<TextEmail> emails = RestAssured.get(mailServer).as(t, ObjectMapperType.JSONB);
+        if (emails == null || emails.isEmpty()) {
+            return null;
+        }
+        return emails.get(emails.size() - 1);
+    }
+
+    @SuppressWarnings("UnstableApiUsage")
+    private HtmlEmail getLastHtmlEmail() {
+        Type t = new TypeToken<List<HtmlEmail>>() {
+        }.getType();
+        List<HtmlEmail> emails = RestAssured.get(mailServer).as(t, ObjectMapperType.JSONB);
+        if (emails == null || emails.isEmpty()) {
+            return null;
+        }
+        return emails.get(emails.size() - 1);
+    }
+
+}
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/Recipient.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/Recipient.java
new file mode 100644
index 0000000000000..1601121faaa13
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/Recipient.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.mailer;
+
+public class Recipient {
+
+    public String text;
+
+}
diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/TextEmail.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/TextEmail.java
new file mode 100644
index 0000000000000..2f354db7d0123
--- /dev/null
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/TextEmail.java
@@ -0,0 +1,11 @@
+package io.quarkus.it.mailer;
+
+import java.util.List;
+
+public class TextEmail {
+
+    public String subject;
+    public String text;
+    public Recipient to;
+    public List<Attachment> attachments;
+}
diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml
index f156bb48e7c16..84a29d85a5c76 100644
--- a/integration-tests/main/pom.xml
+++ b/integration-tests/main/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +18,6 @@
         <datasource.url>jdbc:h2:tcp://localhost/mem:test</datasource.url>
         <datasource.username></datasource.username>
         <datasource.password></datasource.password>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
     </properties>
 
     <dependencies>
@@ -33,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
+            <artifactId>quarkus-micrometer</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -69,7 +67,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-websockets</artifactId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -131,10 +133,10 @@
             <artifactId>quarkus-smallrye-context-propagation</artifactId>
         </dependency>
 
-        <!-- JSON Logging -->
+        <!-- Tika -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-logging-json</artifactId>
+            <artifactId>quarkus-tika</artifactId>
         </dependency>
 
         <!-- test dependencies -->
@@ -161,6 +163,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>bootstrap</artifactId>
+            <version>3.1.0</version>
         </dependency>
         <!-- Issue 2707: used to test if web-fragments.xml is being read properly -->
         <dependency>
@@ -175,6 +178,320 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny-reactive-streams-operators-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-narayana-jta-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-scheduler-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-opentracing-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-swagger-ui-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-websockets-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-tika-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -193,9 +510,6 @@
                         <goals>
                             <goal>build</goal>
                         </goals>
-                        <configuration>
-                            <uberJar>true</uberJar>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -214,7 +528,7 @@
             <id>test-postgresql</id>
             <activation>
                 <property>
-                    <name>test-postgresql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <properties>
@@ -228,69 +542,56 @@
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-jdbc-postgresql</artifactId>
                 </dependency>
+
+                <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
             </dependencies>
         </profile>
+
         <profile>
-            <id>native-image-it-main</id>
+            <id>native-image</id>
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <addAllCharsets>true</addAllCharsets>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <additionalBuildArgs></additionalBuildArgs>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.add-all-charsets>true</quarkus.native.add-all-charsets>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>no-native</id>
+            <activation>
+                <property>
+                    <name>!native</name>
+                </property>
+            </activation>
+            <!-- these properties must not be defined in the general properties,
+                 otherwise the native profile in the parent pom is not able to override them -->
+            <properties>
+                <quarkus.package.type>uber-jar</quarkus.package.type>
+            </properties>
         </profile>
 
         <profile>
             <id>docker-postgresql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -304,7 +605,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>postgres:10.5</name>
+                                    <name>postgres:13.1</name>
                                     <alias>postgresql</alias>
                                     <run>
                                         <env>
@@ -327,7 +628,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all postgres:10.5 images currently running, not just those we just started.
+                            <!--Stops all postgres images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>
@@ -360,7 +661,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java b/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java
index 12ce1e3d287f8..a5a029fd1977b 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/config/ConfigPropertiesResource.java
@@ -1,6 +1,11 @@
 package io.quarkus.it.config;
 
 import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.util.Optional;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.GET;
@@ -12,9 +17,12 @@
 public class ConfigPropertiesResource {
 
     final GreetingConfiguration greetingConfiguration;
+    final GreetingConfigurationI greetingConfigurationI;
 
-    public ConfigPropertiesResource(GreetingConfiguration greetingConfiguration) {
+    public ConfigPropertiesResource(GreetingConfiguration greetingConfiguration,
+            GreetingConfigurationI greetingConfigurationI) {
         this.greetingConfiguration = greetingConfiguration;
+        this.greetingConfigurationI = greetingConfigurationI;
     }
 
     @GET
@@ -22,6 +30,12 @@ public String greet() {
         return greetingConfiguration.message + greetingConfiguration.number + greetingConfiguration.suffix;
     }
 
+    @GET
+    @Path("/period")
+    public String period() {
+        return greetingConfiguration.period.get().toString();
+    }
+
     @ConfigProperties(prefix = "configproperties")
     public static class GreetingConfiguration {
         @Size(min = 2)
@@ -29,10 +43,20 @@ public static class GreetingConfiguration {
         public String suffix = "!";
         public BigDecimal other;
         public NumberEnum number;
+        // Force to use implicit converter to check for reflective registration
+        public LocalDate date;
+        public Optional<Period> period;
     }
 
     public enum NumberEnum {
         ONE,
         TWO;
     }
+
+    @ConfigProperties(prefix = "configproperties")
+    public interface GreetingConfigurationI {
+        LocalDateTime dateTime();
+
+        Optional<Instant> instant();
+    }
 }
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java b/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java
index 4ebcb73c0ba25..0e43fd7200f70 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/context/ContextPropagationResource.java
@@ -14,10 +14,11 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.microprofile.context.ManagedExecutor;
+import org.eclipse.microprofile.context.ThreadContext;
 import org.wildfly.common.Assert;
 
 import io.quarkus.arc.Arc;
+import io.smallrye.context.SmallRyeManagedExecutor;
 
 @Path("context-propagation")
 public class ContextPropagationResource {
@@ -25,14 +26,42 @@ public class ContextPropagationResource {
     @Inject
     RequestBean doNotRemove;
     @Inject
-    ManagedExecutor allExec;
+    SmallRyeManagedExecutor smallRyeAllExec;
+    @Inject
+    SmallRyeManagedExecutor allExec;
+    @Inject
+    ThreadContext context;
+    @Inject
+    ThreadContext smallRyeContext;
     @Inject
     TransactionManager transactionManager;
 
+    @Path("managed-executor/created")
+    @Transactional
+    @GET
+    public CompletionStage<String> testManagedExecutorCreated(@Context UriInfo uriInfo) throws SystemException {
+        return testCompletionStage(allExec.completedFuture("OK"), uriInfo);
+    }
+
+    @Path("managed-executor/obtained")
     @Transactional
     @GET
-    public CompletionStage<String> test(@Context UriInfo uriInfo) throws SystemException {
-        CompletableFuture<String> ret = allExec.completedFuture("OK");
+    public CompletionStage<String> testManagedExecutorObtained(@Context UriInfo uriInfo) throws SystemException {
+        // make sure we can also do that with CF we obtained from other sources, via ManagedExecutor
+        CompletableFuture<String> completedFuture = CompletableFuture.completedFuture("OK");
+        return testCompletionStage(allExec.copy(completedFuture), uriInfo);
+    }
+
+    @Path("thread-context")
+    @Transactional
+    @GET
+    public CompletionStage<String> testThreadContext(@Context UriInfo uriInfo) throws SystemException {
+        // make sure we can also do that with CF we obtained from other sources, via ThreadContext
+        CompletableFuture<String> completedFuture = CompletableFuture.completedFuture("OK");
+        return testCompletionStage(context.withContextCapture(completedFuture), uriInfo);
+    }
+
+    private CompletionStage<String> testCompletionStage(CompletionStage<String> stage, UriInfo uriInfo) throws SystemException {
         // Transaction
         Transaction t1 = transactionManager.getTransaction();
         Assert.assertTrue(t1 != null);
@@ -43,7 +72,7 @@ public CompletionStage<String> test(@Context UriInfo uriInfo) throws SystemExcep
         Assert.assertTrue(rb1 != null);
         String rbValue = rb1.callMe();
 
-        return ret.thenApplyAsync(text -> {
+        return stage.thenApplyAsync(text -> {
             // RESTEasy
             uriInfo.getAbsolutePath();
             // ArC
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java b/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java
index 376b22e60b239..b82b905a02012 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/context/MutinyContextPropagationResource.java
@@ -11,7 +11,6 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.microprofile.context.ManagedExecutor;
 import org.wildfly.common.Assert;
 
 import io.quarkus.arc.Arc;
@@ -24,8 +23,6 @@ public class MutinyContextPropagationResource {
     @Inject
     RequestBean doNotRemove;
     @Inject
-    ManagedExecutor allExec;
-    @Inject
     TransactionManager transactionManager;
 
     @Transactional
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java
new file mode 100644
index 0000000000000..08a71fbf6afad
--- /dev/null
+++ b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/FaultToleranceTestResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.faulttolerance;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/ft")
+public class FaultToleranceTestResource {
+
+    @Inject
+    Service service;
+
+    @GET
+    public String getName() {
+        AtomicInteger counter = new AtomicInteger();
+        String name = service.getName(counter);
+        return counter + ":" + name;
+    }
+
+}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/TestResource.java b/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/TestResource.java
deleted file mode 100644
index 3a7b3ce9a1c00..0000000000000
--- a/integration-tests/main/src/main/java/io/quarkus/it/faulttolerance/TestResource.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.quarkus.it.faulttolerance;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-@Path("/ft")
-public class TestResource {
-
-    @Inject
-    Service service;
-
-    @GET
-    public String getName() {
-        AtomicInteger counter = new AtomicInteger();
-        String name = service.getName(counter);
-        return counter + ":" + name;
-    }
-
-}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java
index 21bc12bd1dd4b..b74fd42395b8e 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/jaxb/rest/NewsResource.java
@@ -6,8 +6,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import io.quarkus.it.jaxb.mapper.process.UnmarshalRSSProcess;
@@ -21,7 +19,6 @@ public class NewsResource {
     UnmarshalRSSProcess newsProcessor;
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public Response getNews() {
         try {
             final Collection<INews> results = new ArrayList<>();
@@ -32,4 +29,4 @@ public Response getNews() {
         }
         return Response.noContent().build();
     }
-}
\ No newline at end of file
+}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JpaProducer.java b/integration-tests/main/src/main/java/io/quarkus/it/jpa/JpaProducer.java
deleted file mode 100644
index 714230433eff2..0000000000000
--- a/integration-tests/main/src/main/java/io/quarkus/it/jpa/JpaProducer.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.quarkus.it.jpa;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceUnit;
-
-@Dependent
-public class JpaProducer {
-
-    @Produces
-    @PersistenceUnit(unitName = "templatePU")
-    EntityManagerFactory emf;
-
-    @Produces
-    @PersistenceContext
-    EntityManager em;
-}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/opentracing/OpenTracingResource.java b/integration-tests/main/src/main/java/io/quarkus/it/opentracing/OpenTracingResource.java
index 9a43cdf723e78..f02cb83813924 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/opentracing/OpenTracingResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/opentracing/OpenTracingResource.java
@@ -1,21 +1,22 @@
 package io.quarkus.it.opentracing;
 
+import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.eclipse.microprofile.opentracing.Traced;
-
 import io.jaegertracing.internal.JaegerTracer;
 
 @Path("/opentracing")
 public class OpenTracingResource {
+    @Inject
+    TracedService tracedService;
 
+    // calling this endpoint should generate a trace with two spans
     @GET
-    @Traced
     public String getTest() {
-        return "TEST";
+        return tracedService.testTraced();
     }
 
     @GET
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/opentracing/TracedService.java b/integration-tests/main/src/main/java/io/quarkus/it/opentracing/TracedService.java
new file mode 100644
index 0000000000000..878057fbb938b
--- /dev/null
+++ b/integration-tests/main/src/main/java/io/quarkus/it/opentracing/TracedService.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.opentracing;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.opentracing.Traced;
+
+@ApplicationScoped
+public class TracedService {
+    @Traced
+    public String testTraced() {
+        return "TEST";
+    }
+}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java b/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java
index 4a52774b70f77..756847cd0c517 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/reactive/ReactiveStreamOpsResource.java
@@ -5,7 +5,7 @@
 
 import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
 
-import io.reactivex.Flowable;
+import io.smallrye.mutiny.Multi;
 
 @Path("/reactive")
 public class ReactiveStreamOpsResource {
@@ -27,10 +27,10 @@ public String stream1() {
     }
 
     @GET
-    @Path("/stream-rx")
+    @Path("/stream-mutiny")
     public String stream2() {
         StringBuilder builder = new StringBuilder();
-        ReactiveStreams.fromPublisher(Flowable.fromArray("d", "e", "f"))
+        ReactiveStreams.fromPublisher(Multi.createFrom().items("d", "e", "f"))
                 .map(String::toUpperCase)
                 .forEach(builder::append)
                 .run();
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java
index 13ea871fa033f..1da09fbda5573 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/ClientResource.java
@@ -41,6 +41,10 @@ public class ClientResource {
     @RestClient
     RestClientBaseUriConfigKeyInterface restClientBaseUriConfigKeyInterface;
 
+    @Inject
+    @RestClient
+    RestClientWithFaultToleranceInterface restClientWithFaultToleranceInterface;
+
     @Inject
     @ConfigProperty(name = "loopback/mp-rest/url", defaultValue = "http://localhost:8080/loopback")
     Provider<String> loopbackEndpoint;
@@ -98,6 +102,13 @@ public TestResource.MyData getDataCdi() {
         return restClientInterface.getData();
     }
 
+    @GET
+    @Path("encoding")
+    public String testEmojis() {
+        return restClientInterface.echo(
+                "\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00");
+    }
+
     @GET
     @Path("async/cdi/jackson")
     @Produces("application/json")
@@ -156,7 +167,6 @@ public String getDefaultInterfaceScope() {
 
     @GET
     @Path("/jaxrs-client")
-    @Produces(MediaType.APPLICATION_JSON)
     public Greeting testJaxrsClient() throws ClassNotFoundException {
         Greeting greeting = client.target(loopbackEndpoint.get())
                 .request()
@@ -207,4 +217,10 @@ public Multi<String> publisherClient() {
             }
         });
     }
+
+    @GET
+    @Path("/fault-tolerance")
+    public String faultTolerance() {
+        return restClientWithFaultToleranceInterface.echo();
+    }
 }
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java
index f10b87696f21b..2546b75b6afdb 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/GouvFrGeoApiClientImpl.java
@@ -6,11 +6,8 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 
-@Produces(MediaType.APPLICATION_JSON)
 @Path("gouv-geo-api")
 public class GouvFrGeoApiClientImpl {
 
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java
index 0b8d1c75052b5..94c479344b730 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/LoopbackResource.java
@@ -4,14 +4,11 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 @Path("/loopback")
 public class LoopbackResource {
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public Greeting hello() {
         return new Greeting("hello self", LocalDate.of(2020, 02, 13));
     }
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java
index 394a39cb2a268..85cf390a37c94 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientInterface.java
@@ -3,6 +3,7 @@
 import javax.enterprise.context.Dependent;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
@@ -16,6 +17,10 @@
 @RegisterClientHeaders
 public interface RestClientInterface {
 
+    @GET
+    @Path("/echo/{echo}")
+    String echo(@PathParam("echo") String echo);
+
     @GET
     String get();
 
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java
new file mode 100644
index 0000000000000..b7b7a02321fe1
--- /dev/null
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestClientWithFaultToleranceInterface.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.faulttolerance.Fallback;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+/**
+ * Used to test {@link Fallback} on default methods on interfaces.
+ */
+@RegisterRestClient
+@Path("/test")
+public interface RestClientWithFaultToleranceInterface {
+
+    @GET
+    @Path("/failure")
+    @Fallback(fallbackMethod = "fallback")
+    String echo();
+
+    default String fallback() {
+        return "Hello fallback!";
+    }
+}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java
index 10e30901ae3a3..994a7e76a75bd 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/RestInterface.java
@@ -6,6 +6,7 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
@@ -19,6 +20,10 @@ public interface RestInterface {
     @GET
     String get();
 
+    @GET
+    @Path("/echo/{echo}")
+    String echo(@PathParam("echo") String echo);
+
     @GET
     CompletionStage<String> asyncGet();
 
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java
index 9004783f6dbee..bd24ac2f88096 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/rest/TestResource.java
@@ -320,6 +320,13 @@ public MyEntity fromJson() throws Exception {
         }
     }
 
+    @GET
+    @Path("/echo/{echo}")
+    @Produces("application/json")
+    public String echo(@PathParam("echo") String echo) {
+        return echo;
+    }
+
     @GET
     @Path("params/{path}")
     public void regularParams(@PathParam("path") String path,
@@ -416,6 +423,12 @@ public String echoPayload(String payload) {
         return payload;
     }
 
+    @GET
+    @Path("/failure")
+    public Response alwaysFail() {
+        return Response.serverError().build();
+    }
+
     @XmlRootElement
     public static class XmlObject {
 
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java b/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java
index 90d0ed6799798..4e8ab58923512 100644
--- a/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java
+++ b/integration-tests/main/src/main/java/io/quarkus/it/transaction/TransactionResource.java
@@ -9,7 +9,7 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
-@Path("/txn")
+@Path("/txn/txendpoint")
 public class TransactionResource {
 
     @Inject
diff --git a/integration-tests/main/src/main/resources/application.properties b/integration-tests/main/src/main/resources/application.properties
index b7f302fed2133..62b34bb36b257 100644
--- a/integration-tests/main/src/main/resources/application.properties
+++ b/integration-tests/main/src/main/resources/application.properties
@@ -2,6 +2,7 @@ io.quarkus.it.rest.GouvFrGeoApiClient/mp-rest/url=${test.url}
 io.quarkus.it.rest.RestInterface/mp-rest/url=${test.url}
 io.quarkus.it.rest.RestInterface/mp-rest/scope=javax.inject.Singleton
 io.quarkus.it.rest.RestClientInterface/mp-rest/url=${test.url}
+io.quarkus.it.rest.RestClientWithFaultToleranceInterface/mp-rest/url=${test.url}
 restClientConfigKey/mp-rest/url=${test.url}
 restClientBaseUriConfigKey/mp-rest/url=${test.url}
 loopback/mp-rest/url=${test.url}/loopback
@@ -37,7 +38,18 @@ microprofile.cidr-address=10.0.0.20/24
 configproperties.message=Hello
 configproperties.other=1
 configproperties.number=ONE
+configproperties.date=2020-10-10
+configproperties.date-time=2020-10-10T10:10
+configproperties.period=P1D
+configproperties.instant=2010-10-10T10:10:10Z
 
 quarkus.swagger-ui.always-include=true
 
+quarkus.health.openapi.included=true
+
 quarkus.native.resources.includes = test-resources/**.txt
+quarkus.native.resources.excludes = **/unwanted.*
+
+quarkus.log.metrics.enabled=true
+
+quarkus.native.additional-build-args =-H:ReflectionConfigurationFiles=reflection-config.json
diff --git a/integration-tests/main/src/main/resources/reflection-config.json b/integration-tests/main/src/main/resources/reflection-config.json
new file mode 100644
index 0000000000000..c44dc44f37c7b
--- /dev/null
+++ b/integration-tests/main/src/main/resources/reflection-config.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/integration-tests/main/src/main/resources/test-resources/excluded/unwanted.txt b/integration-tests/main/src/main/resources/test-resources/excluded/unwanted.txt
new file mode 100644
index 0000000000000..2ff940165e7f0
--- /dev/null
+++ b/integration-tests/main/src/main/resources/test-resources/excluded/unwanted.txt
@@ -0,0 +1 @@
+An unwanted file
\ No newline at end of file
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesTestCase.java
index fa9cc4457f232..00cf846059b6a 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ConfigPropertiesTestCase.java
@@ -16,4 +16,11 @@ public void testConfigPropertiesProperlyInjected() {
                 .when().get("/configuration-properties")
                 .then().body(is("HelloONE!"));
     }
+
+    @Test
+    public void testImplicitConverters() {
+        RestAssured
+                .when().get("/configuration-properties/period")
+                .then().body(is("P1D"));
+    }
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationTestCase.java
index 98093d19a3acd..a3ed03282890d 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ContextPropagationTestCase.java
@@ -21,6 +21,9 @@ public void testContextPropagation(String endpoint) throws Exception {
     }
 
     private static List<String> endpoints() {
-        return Arrays.asList("/context-propagation", "/context-propagation-mutiny");
+        return Arrays.asList("/context-propagation/managed-executor/created",
+                "/context-propagation/managed-executor/obtained",
+                "/context-propagation/thread-context",
+                "/context-propagation-mutiny");
     }
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceTestCase.java
index d165fad1ba269..b877b58655182 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/FaultToleranceTestCase.java
@@ -9,13 +9,16 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.it.faulttolerance.FaultToleranceTestResource;
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
 public class FaultToleranceTestCase {
 
-    @TestHTTPResource("ft")
+    @TestHTTPEndpoint(FaultToleranceTestResource.class)
+    @TestHTTPResource
     URL uri;
 
     @Test
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/HealthTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/HealthTestCase.java
index 7cf6b2a9989fd..53d56a362c20b 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/HealthTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/HealthTestCase.java
@@ -15,6 +15,48 @@ public class HealthTestCase {
 
     @Test
     public void testHealthCheck() {
+        try {
+            RestAssured.when().get("/q/health/live").then()
+                    .contentType(ContentType.JSON)
+                    .header("Content-Type", containsString("charset=UTF-8"))
+                    .body("status", is("UP"),
+                            "checks.status", containsInAnyOrder("UP", "UP"),
+                            "checks.name", containsInAnyOrder("basic", "basic-with-builder"));
+
+            RestAssured.when().get("/q/health/ready").then()
+                    .contentType(ContentType.JSON)
+                    .header("Content-Type", containsString("charset=UTF-8"))
+                    .body("status", is("UP"),
+                            "checks.status", containsInAnyOrder("UP"),
+                            "checks.name", containsInAnyOrder("Database connections health check"));
+
+            RestAssured.when().get("/q/health/group/group1").then()
+                    .contentType(ContentType.JSON)
+                    .header("Content-Type", containsString("charset=UTF-8"))
+                    .body("status", is("UP"),
+                            "checks.status", containsInAnyOrder("UP", "UP"),
+                            "checks.name", containsInAnyOrder("single", "combined"));
+
+            RestAssured.when().get("/q/health/group/group2").then()
+                    .contentType(ContentType.JSON)
+                    .header("Content-Type", containsString("charset=UTF-8"))
+                    .body("status", is("UP"),
+                            "checks.status", containsInAnyOrder("UP"),
+                            "checks.name", containsInAnyOrder("combined"));
+
+            RestAssured.when().get("/q/health/group").then()
+                    .contentType(ContentType.JSON)
+                    .header("Content-Type", containsString("charset=UTF-8"))
+                    .body("status", is("UP"),
+                            "checks.status", containsInAnyOrder("UP", "UP"),
+                            "checks.name", containsInAnyOrder("single", "combined"));
+        } finally {
+            RestAssured.reset();
+        }
+    }
+
+    @Test
+    public void testHealthCheckRedirect() {
         try {
             RestAssured.when().get("/health/live").then()
                     .contentType(ContentType.JSON)
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java
index ce42fd7f2bc0f..f3b8477d1f2f7 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxRSTestCase.java
@@ -15,6 +15,8 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.it.rest.TestResource;
+import io.quarkus.test.common.http.TestHTTPEndpoint;
+import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.parsing.Parser;
@@ -28,11 +30,13 @@ public void testJAXRS() {
     }
 
     @Test
+    @TestHTTPEndpoint(TestResource.class)
     public void testInteger() {
-        RestAssured.when().get("/test/int/10").then().body(is("11"));
+        RestAssured.when().get("/int/10").then().body(is("11"));
     }
 
     @Test
+    @DisabledOnNativeImage //the native image tests will bind to 0.0.0.0 as the image is a production image, but the test datasource in the JVM will want to use localhost
     public void testConfigInjectionOfPort() {
         String host = ConfigProvider.getConfig().getOptionalValue("quarkus.http.host", String.class).orElse("0.0.0.0");
         RestAssured.when().get("/test/config/host").then().body(is(host));
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java
index 8c32cf33add5c..4e23e989055e7 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java
@@ -2,6 +2,7 @@
 
 import static org.hamcrest.Matchers.contains;
 
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
@@ -10,9 +11,13 @@
 @QuarkusTest
 public class JaxbTestCase {
 
-    @Test
-    public void testNews() {
-        RestAssured.when().get("/test/jaxb/getnews").then()
-                .body("author", contains("Emmanuel Bernard"));
+    @Nested
+    class SomeClass {
+        @Test
+        public void testNews() {
+            RestAssured.when().get("/test/jaxb/getnews").then()
+                    .body("author", contains("Emmanuel Bernard"));
+        }
     }
+
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java
index 1f32ab48a5e5a..19a410fdddd6c 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/MockTestCase.java
@@ -38,12 +38,12 @@ public void testBeforeAll() {
 
     @Test
     public void testPerTestMock() {
-        QuarkusMock.installMockForInstance(new BonourGreeter(), mockableBean2);
+        QuarkusMock.installMockForInstance(new BonjourGreeter(), mockableBean2);
         Assertions.assertEquals("A mock for Stuart", mockableBean1.greet("Stuart"));
         Assertions.assertEquals("Bonjour Stuart", mockableBean2.greet("Stuart"));
     }
 
-    public static class BonourGreeter extends MockableBean2 {
+    public static class BonjourGreeter extends MockableBean2 {
         @Override
         public String greet(String name) {
             return BONJOUR + name;
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java
index 8de79bbffcc19..c0c69a749e805 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/OpenApiTestCase.java
@@ -5,6 +5,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Iterator;
 import java.util.Set;
 
 import javax.json.Json;
@@ -17,13 +18,12 @@
 import io.quarkus.test.common.http.TestHTTPResource;
 import io.quarkus.test.junit.QuarkusTest;
 
-/**
- * @author Ken Finnigan
- */
 @QuarkusTest
 public class OpenApiTestCase {
 
-    @TestHTTPResource("openapi")
+    private static final String DEFAULT_MEDIA_TYPE = "application/json";
+
+    @TestHTTPResource("q/openapi")
     URL uri;
 
     @Test
@@ -63,8 +63,10 @@ public void testOpenAPIJSON() throws Exception {
         // test RESTEasy extensions
 
         JsonObject schemasObj = obj.getJsonObject("components").getJsonObject("schemas");
-        String testSchemaType = schemaType("200", "*/*", testObj.getJsonObject("get").getJsonObject("responses"), schemasObj);
-        String rxSchemaType = schemaType("200", "*/*", injectionObj.getJsonObject("get").getJsonObject("responses"),
+        String testSchemaType = schemaType("200", DEFAULT_MEDIA_TYPE, testObj.getJsonObject("get").getJsonObject("responses"),
+                schemasObj);
+        String rxSchemaType = schemaType("200", DEFAULT_MEDIA_TYPE,
+                injectionObj.getJsonObject("get").getJsonObject("responses"),
                 schemasObj);
         // make sure String, CompletionStage<String> and Single<String> are detected the same
         Assertions.assertEquals(testSchemaType,
@@ -72,7 +74,7 @@ public void testOpenAPIJSON() throws Exception {
                 "Normal and RX/Single have same schema");
         JsonObject csObj = paths.getJsonObject("/test/cs");
         Assertions.assertEquals(testSchemaType,
-                schemaType("200", "*/*", csObj.getJsonObject("get").getJsonObject("responses"), schemasObj),
+                schemaType("200", DEFAULT_MEDIA_TYPE, csObj.getJsonObject("get").getJsonObject("responses"), schemasObj),
                 "Normal and RX/CS have same schema");
 
         JsonObject paramsObj = paths.getJsonObject("/test/params/{path}");
@@ -86,7 +88,7 @@ public void testOpenAPIJSON() throws Exception {
         Assertions.assertEquals(1, keys.size());
         Assertions.assertEquals("get", keys.iterator().next());
 
-        String uniSchemaType = schemaType("200", "*/*", uniObj.getJsonObject("get").getJsonObject("responses"),
+        String uniSchemaType = schemaType("200", DEFAULT_MEDIA_TYPE, uniObj.getJsonObject("get").getJsonObject("responses"),
                 schemasObj);
         // make sure String, CompletionStage<String> and Uni<String> are detected the same
         Assertions.assertEquals(testSchemaType,
@@ -99,11 +101,13 @@ public void testOpenAPIJSON() throws Exception {
         Assertions.assertEquals(1, keys.size());
         Assertions.assertEquals("get", keys.iterator().next());
 
-        String uniTypedSchemaType = schemaType("200", "*/*", uniTypedObj.getJsonObject("get").getJsonObject("responses"),
+        String uniTypedSchemaType = schemaType("200", DEFAULT_MEDIA_TYPE,
+                uniTypedObj.getJsonObject("get").getJsonObject("responses"),
                 schemasObj);
         // make sure ComponentType and Uni<ComponentType> are detected the same
         JsonObject ctObj = paths.getJsonObject("/test/compType");
-        String ctSchemaType = schemaType("200", "*/*", ctObj.getJsonObject("get").getJsonObject("responses"), schemasObj);
+        String ctSchemaType = schemaType("200", DEFAULT_MEDIA_TYPE, ctObj.getJsonObject("get").getJsonObject("responses"),
+                schemasObj);
         Assertions.assertEquals(ctSchemaType,
                 uniTypedSchemaType,
                 "Normal and Mutiny Uni have same schema");
@@ -116,7 +120,7 @@ public void testOpenAPIJSON() throws Exception {
 
         // make sure Multi<String> is detected as array
         JsonObject multiSchema = multiObj.getJsonObject("get").getJsonObject("responses")
-                .getJsonObject("200").getJsonObject("content").getJsonObject("*/*").getJsonObject("schema");
+                .getJsonObject("200").getJsonObject("content").getJsonObject(DEFAULT_MEDIA_TYPE).getJsonObject("schema");
         Assertions.assertEquals("array", multiSchema.getString("type"));
         Assertions.assertEquals("string", multiSchema.getJsonObject("items").getString("type"));
 
@@ -127,13 +131,41 @@ public void testOpenAPIJSON() throws Exception {
         Assertions.assertEquals("get", keys.iterator().next());
 
         JsonObject multiTypedSchema = multiTypedObj.getJsonObject("get").getJsonObject("responses")
-                .getJsonObject("200").getJsonObject("content").getJsonObject("*/*").getJsonObject("schema");
+                .getJsonObject("200").getJsonObject("content").getJsonObject(DEFAULT_MEDIA_TYPE).getJsonObject("schema");
         // make sure Multi<ComponentType> is detected as array
         Assertions.assertEquals("array", multiTypedSchema.getString("type"));
         String mutliTypedObjectSchema = schemaTypeFromRef(multiTypedSchema.getJsonObject("items"), schemasObj);
         Assertions.assertEquals(ctSchemaType,
                 mutliTypedObjectSchema,
                 "Normal and Mutiny Multi have same schema");
+
+        // Verify presence of Health API
+        JsonObject healthPath = paths.getJsonObject("/q/health");
+        Assertions.assertNotNull(healthPath);
+        Set<String> healthKeys = healthPath.keySet();
+        Iterator<String> healthKeysIterator = healthKeys.iterator();
+        Assertions.assertEquals(3, healthPath.size());
+        Assertions.assertEquals("summary", healthKeysIterator.next());
+        Assertions.assertEquals("description", healthKeysIterator.next());
+        Assertions.assertEquals("get", healthKeysIterator.next());
+
+        JsonObject livenessPath = paths.getJsonObject("/q/health/live");
+        Assertions.assertNotNull(livenessPath);
+        Set<String> livenessKeys = livenessPath.keySet();
+        Iterator<String> livenessKeysIterator = livenessKeys.iterator();
+        Assertions.assertEquals(3, livenessKeys.size());
+        Assertions.assertEquals("summary", livenessKeysIterator.next());
+        Assertions.assertEquals("description", livenessKeysIterator.next());
+        Assertions.assertEquals("get", livenessKeysIterator.next());
+
+        JsonObject readinessPath = paths.getJsonObject("/q/health/ready");
+        Assertions.assertNotNull(readinessPath);
+        Set<String> readinessKeys = readinessPath.keySet();
+        Iterator<String> readinessKeysIterator = readinessKeys.iterator();
+        Assertions.assertEquals(3, readinessKeys.size());
+        Assertions.assertEquals("summary", readinessKeysIterator.next());
+        Assertions.assertEquals("description", readinessKeysIterator.next());
+        Assertions.assertEquals("get", readinessKeysIterator.next());
     }
 
     protected static String schemaType(String responseCode, String mediaType, JsonObject responses, JsonObject schemas) {
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java
new file mode 100644
index 0000000000000..b1b51ef8f50d6
--- /dev/null
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusClassloaderProtectionDomainTest.java
@@ -0,0 +1,45 @@
+package io.quarkus.it.main;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * The purpose of this test is to ensure that using the projection domain of a class loaded
+ * from the QuarkusClassLoader yields the appropriate result
+ */
+@QuarkusTest
+public class QuarkusClassloaderProtectionDomainTest {
+
+    @Test
+    public void testClassFromJar() throws IOException {
+        Class<?> testClass = BeanManager.class;
+        ClassLoader classLoader = testClass.getClassLoader();
+        assertTrue(classLoader instanceof QuarkusClassLoader);
+
+        URL location = testClass.getProtectionDomain().getCodeSource().getLocation();
+        assertNotNull(location);
+
+        try (InputStream inputStream = location.openStream()) {
+            try (JarInputStream jarInputStream = new JarInputStream(inputStream)) {
+                Manifest manifest = jarInputStream.getManifest();
+                assertNotNull(manifest);
+                assertEquals("jakarta.enterprise.cdi-api", manifest.getMainAttributes().getValue("Bundle-SymbolicName"));
+            }
+        }
+    }
+
+}
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
index 5f521553042ce..44c234d970e9a 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
@@ -2,27 +2,37 @@
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
 
 /**
  * The purpose of this test is simply to ensure that {@link SimpleAnnotationCheckerBeforeEachCallback}
- * can read {@code @TestAnnotation} without issue
+ * can read {@code @TestAnnotation} without issue.
+ * Also checks that {@link SimpleAnnotationCheckerBeforeClassCallback} is executed properly
  */
 @QuarkusTest
 public class QuarkusTestCallbacksTestCase {
 
     @Test
     @TestAnnotation
+    @Order(1)
     public void testTestMethodHasAnnotation() {
 
     }
 
+    @Test
+    @Order(2)
+    public void testBeforeClass() {
+        assertEquals(1, SimpleAnnotationCheckerBeforeClassCallback.count.get());
+    }
+
     @Target({ METHOD })
     @Retention(RUNTIME)
     public @interface TestAnnotation {
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsTestCase.java
index d3b5b5791f461..ca9f1c1dae491 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ReactiveStreamsOperatorsTestCase.java
@@ -17,8 +17,8 @@ public void testReactiveStreams() {
     }
 
     @Test
-    public void testRxJava2() {
-        RestAssured.when().get("/reactive/stream-rx").then()
+    public void testMutiny() {
+        RestAssured.when().get("/reactive/stream-mutiny").then()
                 .body(is("DEF"));
     }
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesITCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesITCase.java
index e2bf0a1537230..f1d2b6cd58939 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesITCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesITCase.java
@@ -14,6 +14,11 @@ public void excludedNative() {
                 .get("/resources/test-resources/file.adoc")
                 .then()
                 .statusCode(404);
+
+        RestAssured.when()
+                .get("/resources/test-resources/excluded/unwanted.txt")
+                .then()
+                .statusCode(404);
     }
 
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesTestCase.java
index 3804f4dfb968b..efd715a557fcf 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ResourcesTestCase.java
@@ -28,5 +28,11 @@ public void excludedJvm() {
                 .then()
                 .statusCode(200)
                 .body(is("= An AsciiDoc File"));
+
+        RestAssured.when()
+                .get("/resources/test-resources/excluded/unwanted.txt")
+                .then()
+                .statusCode(200)
+                .body(is("An unwanted file"));
     }
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java
index 220c61e9eaae8..268573e938fab 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/RestClientTestCase.java
@@ -11,6 +11,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -45,6 +47,14 @@ public void testMicroprofileClientCDIIntegration() {
                 .body(is("TEST"));
     }
 
+    @DisabledOnOs(OS.WINDOWS)
+    @Test
+    public void testEmojis() {
+        RestAssured.when().get("/client/encoding")
+                .then().body(is(
+                        "\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00\uD83D\uDE00"));
+    }
+
     @Test
     void testMicroprofileClientData() {
         JsonPath jsonPath = RestAssured.when().get("/client/manual/jackson").thenReturn().jsonPath();
@@ -163,4 +173,10 @@ public void testIssue8795() {
                         + "data: 75056-2\n\n"
                         + "data: 75056-2\n\n"));
     }
+
+    @Test
+    public void testFaultTolerance() {
+        RestAssured.when().get("/client/fault-tolerance").then()
+                .body(is("Hello fallback!"));
+    }
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/ServletTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/ServletTestCase.java
index ecc3f14132174..5177bc37ec47c 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/ServletTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/ServletTestCase.java
@@ -5,6 +5,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.it.web.TestServlet;
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 
@@ -12,8 +14,9 @@
 public class ServletTestCase {
 
     @Test
+    @TestHTTPEndpoint(TestServlet.class)
     public void testServlet() {
-        RestAssured.when().get("/testservlet").then()
+        RestAssured.when().get().then()
                 .body(is("A message"));
     }
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeClassCallback.java b/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeClassCallback.java
new file mode 100644
index 0000000000000..30024ccb0930a
--- /dev/null
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeClassCallback.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.main;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.Assertions;
+
+import io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback;
+
+public class SimpleAnnotationCheckerBeforeClassCallback implements QuarkusTestBeforeClassCallback {
+
+    public static AtomicInteger count = new AtomicInteger(0);
+
+    @Override
+    public void beforeClass(Class<?> testClass) {
+        assertQuarkusClassLoader(Thread.currentThread().getContextClassLoader());
+        assertQuarkusClassLoader(testClass.getClassLoader());
+        // make sure that this comes into play only for the test we care about
+        if (!testClass.getName().endsWith("QuarkusTestCallbacksTestCase")) {
+            return;
+        }
+
+        count.incrementAndGet();
+    }
+
+    private void assertQuarkusClassLoader(ClassLoader contextClassLoader) {
+        Assertions.assertTrue(contextClassLoader.getClass().getName().contains("QuarkusClassLoader"));
+    }
+}
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUITestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUITestCase.java
index fb3899164fe25..03e8b6144c3e4 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUITestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/SwaggerUITestCase.java
@@ -12,6 +12,13 @@ public class SwaggerUITestCase {
 
     @Test
     public void testSwaggerUi() {
+        RestAssured.when().get("/q/swagger-ui").then()
+                .body(containsString("#swagger-ui"))
+                .body(containsString("/openapi"));
+    }
+
+    @Test
+    public void testSwaggerUiRedirect() {
         RestAssured.when().get("/swagger-ui").then()
                 .body(containsString("#swagger-ui"))
                 .body(containsString("/openapi"));
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionTestCase.java
index f229df74474ad..1be1b8a40d92f 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/TransactionTestCase.java
@@ -4,15 +4,18 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.it.transaction.TransactionResource;
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 
 @QuarkusTest
+@TestHTTPEndpoint(TransactionResource.class)
 public class TransactionTestCase {
 
     @Test
     public void testTransaction() {
-        RestAssured.when().get("/txn").then()
+        RestAssured.when().get().then()
                 .body(is("true"));
     }
 
diff --git a/integration-tests/main/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback b/integration-tests/main/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback
new file mode 100644
index 0000000000000..55a7977c0b23d
--- /dev/null
+++ b/integration-tests/main/src/test/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback
@@ -0,0 +1 @@
+io.quarkus.it.main.SimpleAnnotationCheckerBeforeClassCallback
diff --git a/integration-tests/maven/pom.xml b/integration-tests/maven/pom.xml
index 145553b2d461d..b52db2d4a25a3 100644
--- a/integration-tests/maven/pom.xml
+++ b/integration-tests/maven/pom.xml
@@ -20,6 +20,12 @@
             <artifactId>quarkus-test-maven</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-testing</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
             <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
@@ -27,9 +33,10 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bom-descriptor-json</artifactId>
+            <artifactId>quarkus-bom-quarkus-platform-descriptor</artifactId>
             <version>${project.version}</version>
             <type>json</type>
+            <classifier>${project.version}</classifier>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -43,10 +50,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -60,10 +63,6 @@
                 <directory>src/test/resources</directory>
                 <filtering>true</filtering>
             </testResource>
-            <testResource>
-                <directory>src/it</directory>
-                <filtering>true</filtering>
-            </testResource>
         </testResources>
         <plugins>
             <plugin>
@@ -77,14 +76,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <!--suppress MavenModelInspection -->
-                        <maven.home>${maven.home}</maven.home>
-                        <maven.repo>${settings.localRepository}</maven.repo>
-                        <project.version>${project.version}</project.version>
-                    </systemPropertyVariables>
-                </configuration>
             </plugin>
 
             <plugin>
@@ -98,59 +89,33 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <systemPropertyVariables>
-                        <!--suppress MavenModelInspection -->
-                        <maven.home>${maven.home}</maven.home>
-                        <maven.repo>${settings.localRepository}</maven.repo>
-                        <project.version>${project.version}</project.version>
-                    </systemPropertyVariables>
-                </configuration>
             </plugin>
         </plugins>
     </build>
     <profiles>
         <profile>
             <id>native-image</id>
+            <!-- Since there is no quarkus-maven-plugin build goal in this pom,
+                 this profile will not directly yield a native image like in the other modules.
+                 Instead, there are IT classes in this module that trigger the native image compilation. -->
             <activation>
                 <property>
                     <name>native</name>
                 </property>
             </activation>
+            <!-- add some custom config, the rest comes from parent -->
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                         <configuration>
                             <systemPropertyVariables>
-                                <!--suppress MavenModelInspection -->
-                                <maven.home>${maven.home}</maven.home>
-                                <maven.repo>${settings.localRepository}</maven.repo>
-                                <project.version>${project.version}</project.version>
-
                                 <!-- add a system property that can be used by JUnit to determine whether a native image can be built -->
                                 <quarkus.test.native>true</quarkus.test.native>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
-
                 </plugins>
             </build>
         </profile>
@@ -176,8 +141,11 @@
                                 <configuration>
                                     <skip>${skipTests}</skip>
                                     <jsonGroupId>io.quarkus</jsonGroupId>
-                                    <jsonArtifactId>quarkus-bom-descriptor-json</jsonArtifactId>
+                                    <jsonArtifactId>quarkus-bom-quarkus-platform-descriptor</jsonArtifactId>
                                     <jsonVersion>${project.version}</jsonVersion>
+                                    <ignoredGroupIds>
+                                        <ignoredGroupId>software.amazon.awssdk</ignoredGroupId>
+                                    </ignoredGroupIds>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/AddExtensionMojoTest.java b/integration-tests/maven/src/test/java/io/quarkus/maven/AddExtensionMojoTest.java
index bf2799d23232b..f33ae44f53ccd 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/AddExtensionMojoTest.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/AddExtensionMojoTest.java
@@ -12,35 +12,103 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.resolution.ArtifactDescriptorResult;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
+import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils;
+import io.quarkus.devtools.test.RegistryClientTestHelper;
+
 class AddExtensionMojoTest {
 
-    private static final File MIN_POM = new File("src/test/resources/projects/simple-pom-it/pom.xml");
+    private static final File MIN_POM = new File("target/test-classes/projects/simple-pom-it/pom.xml");
     private static final File OUTPUT_POM = new File("target/test-classes/add-extension/pom.xml");
     private static final String DEP_GAV = "org.apache.commons:commons-lang3:3.8.1";
     private AddExtensionMojo mojo;
 
+    @BeforeAll
+    static void globalInit() {
+        RegistryClientTestHelper.enableRegistryClientTestConfig();
+    }
+
+    @AfterAll
+    static void globalCleanUp() {
+        RegistryClientTestHelper.disableRegistryClientTestConfig();
+    }
+
     @BeforeEach
-    void init() throws IOException {
+    void init() throws Exception {
         mojo = getMojo();
         mojo.project = new MavenProject();
         mojo.project.setPomFile(OUTPUT_POM);
         mojo.project.setFile(OUTPUT_POM);
-        Model model = new Model();
-        mojo.project.setModel(model);
-        mojo.project.setOriginalModel(model);
         FileUtils.copyFile(MIN_POM, OUTPUT_POM);
+
+        Model model = ModelUtils.readModel(OUTPUT_POM.toPath());
         model.setPomFile(OUTPUT_POM);
+        mojo.project.setOriginalModel(model);
+
+        final MavenArtifactResolver mvn = new MavenArtifactResolver(
+                new BootstrapMavenContext(BootstrapMavenContext.config()
+                        .setCurrentProject(OUTPUT_POM.getAbsolutePath())
+                        .setOffline(true)));
+        mojo.repoSystem = mvn.getSystem();
+        mojo.repoSession = mvn.getSession();
+        mojo.repos = mvn.getRepositories();
+        mojo.remoteRepositoryManager = mvn.getRemoteRepositoryManager();
+
+        final Model effectiveModel = model.clone();
+        final DependencyManagement dm = new DependencyManagement();
+        effectiveModel.setDependencyManagement(dm);
+        final Artifact projectPom = new DefaultArtifact(ModelUtils.getGroupId(model), model.getArtifactId(), null, "pom",
+                ModelUtils.getVersion(model));
+        final ArtifactDescriptorResult descriptor = mvn.resolveDescriptor(projectPom);
+        descriptor.getManagedDependencies().forEach(d -> {
+            final Dependency dep = new Dependency();
+            Artifact a = d.getArtifact();
+            dep.setGroupId(a.getGroupId());
+            dep.setArtifactId(a.getArtifactId());
+            dep.setClassifier(a.getClassifier());
+            dep.setType(a.getExtension());
+            dep.setVersion(a.getVersion());
+            if (d.getOptional() != null) {
+                dep.setOptional(d.getOptional());
+            }
+            dep.setScope(d.getScope());
+            dm.addDependency(dep);
+        });
+        descriptor.getDependencies().forEach(d -> {
+            final Dependency dep = new Dependency();
+            Artifact a = d.getArtifact();
+            dep.setGroupId(a.getGroupId());
+            dep.setArtifactId(a.getArtifactId());
+            dep.setClassifier(a.getClassifier());
+            dep.setType(a.getExtension());
+            dep.setVersion(a.getVersion());
+            if (d.getOptional() != null) {
+                dep.setOptional(d.getOptional());
+            }
+            dep.setScope(d.getScope());
+            effectiveModel.addDependency(dep);
+        });
+        descriptor.getProperties().entrySet().forEach(p -> effectiveModel.getProperties().setProperty(p.getKey(),
+                p.getValue() == null ? "" : p.getValue().toString()));
+        mojo.project.setModel(effectiveModel);
     }
 
-    protected AddExtensionMojo getMojo() {
+    protected AddExtensionMojo getMojo() throws Exception {
         return new AddExtensionMojo();
     }
 
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java b/integration-tests/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java
deleted file mode 100644
index 809450f5b5976..0000000000000
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/CreateExtensionMojoTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package io.quarkus.maven;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import org.apache.maven.model.Build;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.PluginManagement;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.maven.utilities.MojoUtils;
-
-public class CreateExtensionMojoTest {
-
-    private static CreateExtensionMojo initMojo(final Path projectDir) throws IOException {
-        final CreateExtensionMojo mojo = new CreateExtensionMojo();
-        mojo.project = new MavenProject();
-        mojo.basedir = projectDir.toFile();
-
-        final File pom = new File(projectDir.toFile(), "pom.xml");
-        if (pom.exists()) {
-            mojo.project.setFile(pom);
-            final Model rawModel = MojoUtils.readPom(pom);
-            // the project would have an interpolated model at runtime, which we can't fully init here
-            // here are just some key parts
-            if (rawModel.getDependencyManagement() != null) {
-                List<Dependency> deps = rawModel.getDependencyManagement().getDependencies();
-                if (deps != null && !deps.isEmpty()) {
-                    Dependency deploymentBom = null;
-                    for (Dependency dep : deps) {
-                        if (dep.getArtifactId().equals("quarkus-bom") && dep.getGroupId().equals("io.quarkus")) {
-                            deploymentBom = dep;
-                        }
-                    }
-                    if (deploymentBom != null) {
-                        String version = deploymentBom.getVersion();
-                        if (CreateExtensionMojo.QUARKUS_VERSION_POM_EXPR.equals(version)) {
-                            version = rawModel.getProperties().getProperty(version.substring(2, version.length() - 1));
-                            if (version == null) {
-                                throw new IllegalStateException(
-                                        "Failed to resolve " + deploymentBom.getVersion() + " from " + pom);
-                            }
-                        }
-                        Dependency dep = new Dependency();
-                        dep.setGroupId("io.quarkus");
-                        dep.setArtifactId("quarkus-core-deployment");
-                        dep.setType("jar");
-                        dep.setVersion(version);
-                        deps.add(dep);
-                    }
-                }
-            }
-            mojo.project.setModel(rawModel);
-        }
-
-        Build build = mojo.project.getBuild();
-        if (build.getPluginManagement() == null) {
-            build.setPluginManagement(new PluginManagement());
-        }
-
-        mojo.encoding = CreateExtensionMojo.DEFAULT_ENCODING;
-        mojo.templatesUriBase = CreateExtensionMojo.DEFAULT_TEMPLATES_URI_BASE;
-        mojo.quarkusVersion = CreateExtensionMojo.DEFAULT_QUARKUS_VERSION;
-        mojo.bomEntryVersion = CreateExtensionMojo.DEFAULT_BOM_ENTRY_VERSION;
-        mojo.assumeManaged = true;
-        mojo.nameSegmentDelimiter = CreateExtensionMojo.DEFAULT_NAME_SEGMENT_DELIMITER;
-        mojo.platformGroupId = CreateExtensionMojo.PLATFORM_DEFAULT_GROUP_ID;
-        mojo.platformArtifactId = CreateExtensionMojo.PLATFORM_DEFAULT_ARTIFACT_ID;
-        mojo.compilerPluginVersion = CreateExtensionMojo.COMPILER_PLUGIN_DEFAULT_VERSION;
-        return mojo;
-    }
-
-    private static Path createProjectFromTemplate(String testProjectName) throws IOException {
-        final Path srcDir = Paths.get("src/test/resources/projects/" + testProjectName);
-        /*
-         * We want to run on the same project multiple times with different args so let's create a copy with a random
-         * suffix
-         */
-        final Path copyDir = newProjectDir(testProjectName);
-        Files.walk(srcDir).forEach(source -> {
-            final Path dest = copyDir.resolve(srcDir.relativize(source));
-            try {
-                Files.copy(source, dest);
-            } catch (IOException e) {
-                if (!Files.isDirectory(dest)) {
-                    throw new RuntimeException(e);
-                }
-            }
-        });
-        return copyDir;
-    }
-
-    private static Path newProjectDir(String testProjectName) throws IOException {
-        int count = 0;
-        while (count < 100) {
-            Path path = Paths.get("target/test-classes/projects/" + testProjectName + "-" + UUID.randomUUID());
-            if (!Files.exists(path)) {
-                Files.createDirectories(path);
-                return path;
-            }
-            count++;
-        }
-
-        // if we have tried too many times we just give up instead of looping forever which could cause the test to never end
-        throw new RuntimeException("Unable to create a directory for copying the test application into");
-    }
-
-    @Test
-    void createExtensionUnderExistingPomMinimal() throws MojoExecutionException, MojoFailureException,
-            IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException {
-        final CreateExtensionMojo mojo = initMojo(createProjectFromTemplate("create-extension-pom"));
-        mojo.artifactId = "my-project-(minimal-extension)";
-        mojo.assumeManaged = false;
-        mojo.execute();
-
-        assertTreesMatch(Paths.get("src/test/resources/expected/create-extension-pom-minimal"),
-                mojo.basedir.toPath());
-    }
-
-    @Test
-    void createExtensionUnderExistingPomWithAdditionalRuntimeDependencies() throws MojoExecutionException, MojoFailureException,
-            IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException {
-        final CreateExtensionMojo mojo = initMojo(createProjectFromTemplate("create-extension-pom"));
-        mojo.artifactId = "my-project-(add-to-bom)";
-        mojo.assumeManaged = false;
-        mojo.bomPath = Paths.get("bom/pom.xml");
-        mojo.additionalRuntimeDependencies = Arrays.asList("org.example:example-1:1.2.3",
-                "org.acme:acme-@{quarkus.artifactIdBase}:@{$}{acme.version}");
-        mojo.execute();
-
-        assertTreesMatch(Paths.get("src/test/resources/expected/create-extension-pom-add-to-bom"),
-                mojo.basedir.toPath());
-    }
-
-    @Test
-    void createExtensionUnderExistingPomWithItest() throws MojoExecutionException, MojoFailureException,
-            IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException {
-        final CreateExtensionMojo mojo = initMojo(createProjectFromTemplate("create-extension-pom"));
-        mojo.artifactId = "my-project-(itest)";
-        mojo.assumeManaged = false;
-        mojo.itestParentPath = Paths.get("integration-tests/pom.xml");
-        mojo.execute();
-
-        assertTreesMatch(Paths.get("src/test/resources/expected/create-extension-pom-itest"),
-                mojo.basedir.toPath());
-    }
-
-    @Test
-    void createExtensionUnderExistingPomCustomGrandParent() throws MojoExecutionException, MojoFailureException,
-            IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException, IOException {
-        final CreateExtensionMojo mojo = initMojo(createProjectFromTemplate("create-extension-pom"));
-        mojo.artifactId = "myproject-(with-grand-parent)";
-        mojo.grandParentArtifactId = "grand-parent";
-        mojo.grandParentRelativePath = "../pom.xml";
-        mojo.templatesUriBase = "file:templates";
-
-        mojo.bomPath = Paths.get("bom/pom.xml");
-        mojo.execute();
-        assertTreesMatch(
-                Paths.get("src/test/resources/expected/create-extension-pom-with-grand-parent"),
-                mojo.basedir.toPath());
-    }
-
-    @Test
-    void createNewExtensionProject() throws Exception {
-        final CreateExtensionMojo mojo = initMojo(newProjectDir("new-ext-project"));
-        mojo.groupId = "org.acme";
-        mojo.artifactId = "my-ext";
-        mojo.version = "1.0-SNAPSHOT";
-        mojo.assumeManaged = null;
-        mojo.execute();
-        assertTreesMatch(
-                Paths.get("target/test-classes/expected/new-extension-project"),
-                mojo.basedir.toPath());
-    }
-
-    static void assertTreesMatch(Path expected, Path actual) throws IOException {
-        final Set<Path> expectedFiles = new LinkedHashSet<>();
-        Files.walk(expected).filter(Files::isRegularFile).forEach(p -> {
-            final Path relative = expected.relativize(p);
-            expectedFiles.add(relative);
-            final Path actualPath = actual.resolve(relative);
-            try {
-                assertEquals(new String(Files.readAllBytes(p), StandardCharsets.UTF_8),
-                        new String(Files.readAllBytes(actualPath), StandardCharsets.UTF_8));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-        final Set<Path> unexpectedFiles = new LinkedHashSet<>();
-        Files.walk(actual).filter(Files::isRegularFile).forEach(p -> {
-            final Path relative = actual.relativize(p);
-            if (!expectedFiles.contains(relative)) {
-                unexpectedFiles.add(relative);
-            }
-        });
-        if (!unexpectedFiles.isEmpty()) {
-            fail(String.format("Files found under [%s] but not defined as expected under [%s]:%s", actual,
-                    expected, unexpectedFiles.stream().map(Path::toString).collect(Collectors.joining("\n    "))));
-        }
-    }
-
-    @Test
-    void getPackage() throws IOException {
-        assertEquals("org.apache.camel.quarkus.aws.sns.deployment", CreateExtensionMojo
-                .getJavaPackage("org.apache.camel.quarkus", null, "camel-quarkus-aws-sns-deployment"));
-        assertEquals("org.apache.camel.quarkus.component.aws.sns.deployment", CreateExtensionMojo
-                .getJavaPackage("org.apache.camel.quarkus", "component", "camel-quarkus-aws-sns-deployment"));
-    }
-
-    @Test
-    void toCapCamelCase() throws IOException {
-        assertEquals("FooBarBaz", CreateExtensionMojo.toCapCamelCase("foo-bar-baz"));
-    }
-
-}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java
index 727a9d700df1e..c0ffe9c5742fe 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/AddExtensionIT.java
@@ -20,12 +20,14 @@
 import org.apache.maven.shared.invoker.InvokerLogger;
 import org.apache.maven.shared.invoker.MavenInvocationException;
 import org.apache.maven.shared.invoker.PrintStreamLogger;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @DisableForNative
 class AddExtensionIT extends QuarkusPlatformAwareMojoTestBase {
 
     private static final String QUARKUS_GROUPID = "io.quarkus";
+    private static final String BOM_ARTIFACT_ID = "quarkus-bom";
     private static final String VERTX_ARTIFACT_ID = "quarkus-vertx";
     private static final String COMMONS_IO = "commons-io";
     private static final String PROJECT_SOURCE_DIR = "projects/classic";
@@ -45,6 +47,23 @@ void testAddExtensionWithASingleExtension() throws MavenInvocationException, IOE
         assertThat(contains(model.getDependencies(), expected)).isTrue();
     }
 
+    @Test
+    @Disabled("TODO: https://github.com/quarkusio/quarkus/issues/14164")
+    void testAddExtensionWithASingleExtensionToSubmodule() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/multimodule", "projects/testAddExtensionWithASingleExtensionToSubmodule");
+        testDir = new File(testDir, "runner");
+        invoker = initInvoker(testDir);
+        addExtension(false, VERTX_ARTIFACT_ID);
+
+        Model model = loadPom(testDir);
+        Dependency expected = new Dependency();
+        expected.setGroupId(QUARKUS_GROUPID);
+        expected.setArtifactId(VERTX_ARTIFACT_ID);
+        assertThat(contains(model.getDependencies(), expected)).isTrue();
+
+        assertThat(model.getDependencyManagement().getDependencies()).isEmpty();
+    }
+
     @Test
     void testAddExtensionWithMultipleExtension() throws MavenInvocationException, IOException {
         testDir = initProject(PROJECT_SOURCE_DIR, "projects/testAddExtensionWithMultipleExtension");
@@ -110,18 +129,18 @@ private void addExtension(boolean plural, String ext)
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBatchMode(true);
         request.setGoals(Collections.singletonList(
-                getPluginGroupId() + ":" + getPluginArtifactId() + ":" + getPluginVersion() + ":add-extension"));
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":add-extension"));
         Properties properties = new Properties();
-        properties.setProperty("platformGroupId", "io.quarkus");
-        properties.setProperty("platformArtifactId", "quarkus-bom");
-        properties.setProperty("platformVersion", getPluginVersion());
+        properties.setProperty("platformGroupId", QUARKUS_GROUPID);
+        properties.setProperty("platformArtifactId", BOM_ARTIFACT_ID);
+        properties.setProperty("platformVersion", getQuarkusCoreVersion());
         if (plural) {
             properties.setProperty("extensions", ext);
         } else {
             properties.setProperty("extension", ext);
         }
         request.setProperties(properties);
-        getEnv().forEach(request::addShellEnvironment);
+
         File log = new File(testDir, "build-add-extension-" + testDir.getName() + ".log");
         PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
                 InvokerLogger.DEBUG);
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/BuildIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/BuildIT.java
index e78eb1d2ee60c..b4e8883286f9b 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/BuildIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/BuildIT.java
@@ -6,44 +6,86 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
 import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.maven.it.verifier.MavenProcessInvocationResult;
 import io.quarkus.maven.it.verifier.RunningInvoker;
+import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.test.devmode.util.DevModeTestUtils;
 
 @DisableForNative
-public class BuildIT extends MojoTestBase {
+class BuildIT extends MojoTestBase {
 
     private RunningInvoker running;
     private File testDir;
 
     @Test
-    public void testMultiModuleAppRootWithNoSources()
+    void testMultiModuleAppRootWithNoSources()
             throws MavenInvocationException, IOException, InterruptedException {
         testDir = initProject("projects/multimodule-root-no-src", "projects/multimodule-root-no-src-build");
 
         running = new RunningInvoker(testDir, false);
         MavenProcessInvocationResult result = running.execute(Collections.singletonList("install -pl .,html,rest"),
                 Collections.emptyMap());
-        assertThat(result.getProcess().waitFor()).isEqualTo(0);
+        assertThat(result.getProcess().waitFor()).isZero();
 
         result = running.execute(Collections.singletonList("quarkus:build -f runner"), Collections.emptyMap());
 
-        assertThat(result.getProcess().waitFor()).isEqualTo(0);
+        assertThat(result.getProcess().waitFor()).isZero();
 
         final File targetDir = new File(testDir, "runner" + File.separator + "target");
-        List<File> jars = getFilesEndingWith(targetDir, ".jar");
-        assertThat(jars).hasSize(1);
+        final File runnerJar = targetDir.toPath().resolve("quarkus-app").resolve("quarkus-run.jar").toFile();
 
         // make sure the jar can be read by JarInputStream
-        ensureManifestOfJarIsReadableByJarInputStream(
-                jars.stream().filter(f -> f.getName().contains("-runner")).findFirst().get());
+        ensureManifestOfJarIsReadableByJarInputStream(runnerJar);
+    }
+
+    @Test
+    void testModuleWithBuildProfileInProperty() throws MavenInvocationException, InterruptedException, IOException {
+        testDir = initProject("projects/build-mode-quarkus-profile-property");
+        build(null);
+        launch();
+    }
+
+    @Test
+    void testModuleWithOverriddenBuildProfile() throws MavenInvocationException, InterruptedException, IOException {
+        testDir = initProject("projects/build-mode-quarkus-profile-override");
+        build(String.format("-D%s=foo", ProfileManager.QUARKUS_PROFILE_PROP));
+        launch();
+    }
+
+    private void launch() throws IOException {
+        File output = new File(testDir, "target/output.log");
+        output.createNewFile();
+        Process process = JarRunnerIT.doLaunch(new File(testDir, "target/quarkus-app"), Paths.get("quarkus-run.jar"), output,
+                Collections.emptyList()).start();
+        try {
+            Assertions.assertEquals("hello, from foo", DevModeTestUtils.getHttpResponse("/hello"));
+        } finally {
+            process.destroy();
+        }
+    }
+
+    private void build(String arg) throws MavenInvocationException, InterruptedException, IOException {
+        assertThat(testDir).isDirectory();
+        running = new RunningInvoker(testDir, false);
+
+        final List<String> args = new ArrayList<>(2);
+        args.add("package");
+        if (arg != null) {
+            args.add(arg);
+        }
+        MavenProcessInvocationResult result = running.execute(args, Collections.emptyMap());
+        assertThat(result.getProcess().waitFor()).isZero();
     }
 
     private void ensureManifestOfJarIsReadableByJarInputStream(File jar) throws IOException {
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java
new file mode 100644
index 0000000000000..7fa0339261b7c
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateExtensionMojoIT.java
@@ -0,0 +1,125 @@
+package io.quarkus.maven.it;
+
+import static io.quarkus.devtools.testing.SnapshotTesting.assertThatDirectoryTreeMatchSnapshots;
+import static io.quarkus.devtools.testing.SnapshotTesting.assertThatMatchSnapshot;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.apache.maven.shared.invoker.DefaultInvocationRequest;
+import org.apache.maven.shared.invoker.InvocationRequest;
+import org.apache.maven.shared.invoker.InvocationResult;
+import org.apache.maven.shared.invoker.Invoker;
+import org.apache.maven.shared.invoker.InvokerLogger;
+import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.apache.maven.shared.invoker.PrintStreamLogger;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+
+@DisableForNative
+public class CreateExtensionMojoIT extends QuarkusPlatformAwareMojoTestBase {
+
+    private Invoker invoker;
+    private File testDir;
+
+    @Test
+    public void testCreateCoreExtension(TestInfo testInfo) throws Throwable {
+        testDir = initProject("projects/create-extension-quarkus-core", "output/create-extension-quarkus-core");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+
+        Properties properties = new Properties();
+        properties.put("extensionId", "my-ext");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isZero();
+
+        final Path testDirPath = testDir.toPath();
+        assertThatDirectoryTreeMatchSnapshots(testInfo, testDirPath)
+                .contains(
+                        "extensions/my-ext/pom.xml",
+                        "extensions/my-ext/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java",
+                        "integration-tests/my-ext/pom.xml",
+                        "integration-tests/my-ext/src/test/java/org/acme/my/ext/it/MyExtResourceTest.java");
+        assertThatMatchSnapshot(testInfo, testDirPath, "bom/application/pom.xml");
+        assertThatMatchSnapshot(testInfo, testDirPath, "integration-tests/pom.xml");
+        assertThatMatchSnapshot(testInfo, testDirPath, "extensions/pom.xml");
+    }
+
+    @Test
+    public void testCreateQuarkiverseExtension(TestInfo testInfo) throws Throwable {
+        testDir = initEmptyProject("output/create-quarkiverse-extension");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+
+        Properties properties = new Properties();
+        properties.put("groupId", "io.quarkiverse.my-quarki-ext");
+        properties.put("extensionId", "my-quarki-ext");
+        properties.put("quarkusVersion", "1.10.5.Final");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isZero();
+
+        final Path testDirPath = testDir.toPath();
+        assertThatDirectoryTreeMatchSnapshots(testInfo, testDirPath)
+                .contains(
+                        "quarkus-my-quarki-ext/pom.xml",
+                        "quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/my/quarki/ext/deployment/MyQuarkiExtProcessor.java",
+                        "quarkus-my-quarki-ext/integration-tests/pom.xml",
+                        "quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResourceTest.java");
+        assertThatMatchSnapshot(testInfo, testDirPath, "quarkus-my-quarki-ext/pom.xml");
+        assertThatMatchSnapshot(testInfo, testDirPath, "quarkus-my-quarki-ext/runtime/pom.xml");
+    }
+
+    @Test
+    public void testCreateStandaloneExtension(TestInfo testInfo) throws Throwable {
+        testDir = initEmptyProject("output/create-standalone-extension");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+
+        Properties properties = new Properties();
+        properties.put("groupId", "io.standalone");
+        properties.put("extensionId", "my-own-ext");
+        properties.put("namespaceId", "my-org-");
+        properties.put("quarkusVersion", "1.10.5.Final");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isZero();
+
+        final Path testDirPath = testDir.toPath();
+        assertThatDirectoryTreeMatchSnapshots(testInfo, testDirPath)
+                .contains(
+                        "my-org-my-own-ext/pom.xml",
+                        "my-org-my-own-ext/deployment/src/main/java/io/standalone/my/own/ext/deployment/MyOwnExtProcessor.java",
+                        "my-org-my-own-ext/integration-tests/pom.xml",
+                        "my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/own/ext/it/MyOwnExtResourceTest.java");
+        assertThatMatchSnapshot(testInfo, testDirPath, "my-org-my-own-ext/pom.xml");
+        assertThatMatchSnapshot(testInfo, testDirPath, "my-org-my-own-ext/runtime/pom.xml");
+    }
+
+    private InvocationResult setup(Properties params)
+            throws MavenInvocationException, FileNotFoundException, UnsupportedEncodingException {
+
+        InvocationRequest request = new DefaultInvocationRequest();
+        request.setBatchMode(true);
+        request.setGoals(Collections.singletonList(
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion()
+                        + ":create-extension"));
+        request.setDebug(false);
+        request.setShowErrors(true);
+        request.setProperties(params);
+        File log = new File(testDir.getParent(), "build-create-extension-" + testDir.getName() + ".log");
+        PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
+                InvokerLogger.DEBUG);
+        invoker.setLogger(logger);
+        return invoker.execute(request);
+    }
+
+}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java
new file mode 100644
index 0000000000000..66a91e9038600
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateJBangProjectMojoIT.java
@@ -0,0 +1,61 @@
+package io.quarkus.maven.it;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.*;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.apache.maven.shared.invoker.DefaultInvocationRequest;
+import org.apache.maven.shared.invoker.InvocationRequest;
+import org.apache.maven.shared.invoker.InvocationResult;
+import org.apache.maven.shared.invoker.Invoker;
+import org.apache.maven.shared.invoker.InvokerLogger;
+import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.apache.maven.shared.invoker.PrintStreamLogger;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.maven.it.verifier.RunningInvoker;
+import io.quarkus.platform.tools.ToolsConstants;
+
+@DisableForNative
+public class CreateJBangProjectMojoIT extends QuarkusPlatformAwareMojoTestBase {
+
+    private Invoker invoker;
+    private RunningInvoker running;
+    private File testDir;
+
+    @Test
+    public void testProjectGeneration() throws MavenInvocationException, IOException {
+        testDir = initEmptyProject("projects/project-generation");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+
+        Properties properties = new Properties();
+        properties.put("outputDirectory", "jbang");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isZero();
+    }
+
+    private InvocationResult setup(Properties params)
+            throws MavenInvocationException, FileNotFoundException, UnsupportedEncodingException {
+
+        params.setProperty("platformGroupId", ToolsConstants.IO_QUARKUS);
+        params.setProperty("platformArtifactId", "quarkus-bom");
+        params.setProperty("platformVersion", getQuarkusCoreVersion());
+
+        InvocationRequest request = new DefaultInvocationRequest();
+        request.setBatchMode(true);
+        request.setGoals(Collections.singletonList(
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create-jbang"));
+        request.setDebug(false);
+        request.setShowErrors(true);
+        request.setProperties(params);
+        File log = new File(testDir, "build-create-" + testDir.getName() + ".log");
+        PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
+                InvokerLogger.DEBUG);
+        invoker.setLogger(logger);
+        return invoker.execute(request);
+    }
+}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java
new file mode 100644
index 0000000000000..a5d67deb3cbec
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java
@@ -0,0 +1,191 @@
+package io.quarkus.maven.it;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.UncheckedIOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.shared.invoker.DefaultInvocationRequest;
+import org.apache.maven.shared.invoker.InvocationRequest;
+import org.apache.maven.shared.invoker.InvocationResult;
+import org.apache.maven.shared.invoker.Invoker;
+import org.apache.maven.shared.invoker.InvokerLogger;
+import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.apache.maven.shared.invoker.PrintStreamLogger;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import io.quarkus.platform.tools.ToolsConstants;
+
+@DisableForNative
+public class CreateProjectCodestartMojoIT extends QuarkusPlatformAwareMojoTestBase {
+
+    private static final Logger LOG = Logger.getLogger(CreateProjectCodestartMojoIT.class.getName());
+
+    private File testDir;
+
+    private static Stream<Arguments> provideLanguages() {
+        return Stream.of("java", "kotlin")
+                .flatMap(l -> Stream.of("", "resteasy", "qute").map(e -> Arguments.of(l, e)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideLanguages")
+    public void generateMavenProject(String language, String extensions) throws Exception {
+        final Path generatedProjectPath = generateProject("maven", language, extensions, Collections.emptyMap());
+        checkDir(generatedProjectPath.resolve("src/main/" + language));
+        Stream.of(extensions.split(","))
+                .filter(s -> !s.isEmpty())
+                .forEach(e -> checkContent(generatedProjectPath.resolve("pom.xml"), e));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideLanguages")
+    public void generateGradleProject(String language, String extensions) throws Exception {
+        final Path generatedProjectPath = generateProject("gradle", language, extensions, Collections.emptyMap());
+        checkDir(generatedProjectPath.resolve("src/main/" + language));
+        Stream.of(extensions.split(","))
+                .forEach(e -> checkContent(generatedProjectPath.resolve("build.gradle"), e));
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideLanguages")
+    public void generateGradleKotlinProject(String language, String extensions) throws Exception {
+        final Path generatedProjectPath = generateProject("gradle-kotlin-dsl", language, extensions, Collections.emptyMap());
+        checkDir(generatedProjectPath.resolve("src/main/" + language));
+        Stream.of(extensions.split(","))
+                .forEach(e -> checkContent(generatedProjectPath.resolve("build.gradle.kts"), e));
+    }
+
+    @Test
+    public void generateCustomRESTEasyJavaProject() throws Exception {
+        final HashMap<String, String> options = new HashMap<>();
+        options.put("path", "/bonjour");
+        options.put("className", "com.andy.BonjourResource");
+        final Path generatedProjectPath = generateProject("maven", "java",
+                "resteasy", options);
+        checkDir(generatedProjectPath.resolve("src/main/java/com/andy"));
+        checkContent(generatedProjectPath.resolve("src/main/java/com/andy/BonjourResource.java"),
+                "package com.andy;",
+                "class BonjourResource",
+                "@Path(\"/bonjour\")");
+
+        checkContent(generatedProjectPath.resolve("src/test/java/com/andy/BonjourResourceTest.java"),
+                "package com.andy;",
+                "class BonjourResourceTest",
+                "\"/bonjour\"");
+
+        checkContent(generatedProjectPath.resolve("src/test/java/com/andy/NativeBonjourResourceIT.java"),
+                "package com.andy;",
+                "class NativeBonjourResourceIT extends BonjourResourceTest");
+    }
+
+    private Path generateProject(String buildtool, String language, String extensions, Map<String, String> options)
+            throws Exception {
+        String name = "project-" + buildtool + "-" + language;
+        if (extensions.isEmpty()) {
+            name += "-commandmode";
+        } else {
+            name += "-" + extensions.replace(",", "-");
+        }
+        if (!options.isEmpty()) {
+            name += "-custom";
+        }
+        testDir = prepareTestDir(name);
+        LOG.info("creating project in " + testDir.toPath().toString());
+        return runCreateCommand(buildtool, extensions + (!Objects.equals(language, "java") ? "," + language : ""), options);
+    }
+
+    private static File prepareTestDir(String name) {
+        File tc = new File("target/codestart-test/" + name);
+        if (tc.isDirectory()) {
+            try {
+                FileUtils.deleteDirectory(tc);
+            } catch (IOException e) {
+                throw new RuntimeException("Cannot delete directory: " + tc, e);
+            }
+        }
+        boolean mkdirs = tc.mkdirs();
+        LOG.log(Level.FINE, "codestart-test created? %s", mkdirs);
+        return tc;
+    }
+
+    private Path runCreateCommand(String buildTool, String extensions, Map<String, String> options)
+            throws MavenInvocationException, FileNotFoundException, UnsupportedEncodingException {
+        // Scaffold the new project
+        assertThat(testDir).isDirectory();
+
+        Properties properties = new Properties();
+        properties.put("projectGroupId", "org.test");
+        properties.put("projectArtifactId", "my-test-app");
+        properties.put("codestartsEnabled", "true");
+        properties.put("buildTool", buildTool);
+        properties.put("extensions", extensions);
+        properties.putAll(options);
+
+        InvocationResult result = executeCreate(properties);
+
+        assertThat(result.getExitCode()).isZero();
+
+        return testDir.toPath().resolve("my-test-app");
+    }
+
+    private InvocationResult executeCreate(Properties params)
+            throws MavenInvocationException, FileNotFoundException, UnsupportedEncodingException {
+        Invoker invoker = initInvoker(testDir);
+        params.setProperty("platformGroupId", ToolsConstants.IO_QUARKUS);
+        params.setProperty("platformArtifactId", "quarkus-bom");
+        params.setProperty("platformVersion", getQuarkusCoreVersion());
+
+        InvocationRequest request = new DefaultInvocationRequest();
+        request.setBatchMode(true);
+        request.setGoals(Collections.singletonList(
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create"));
+        request.setDebug(false);
+        request.setShowErrors(true);
+        request.setProperties(params);
+
+        PrintStreamLogger logger = getPrintStreamLogger("create-codestart.log");
+        invoker.setLogger(logger);
+        return invoker.execute(request);
+    }
+
+    private PrintStreamLogger getPrintStreamLogger(String s) throws UnsupportedEncodingException, FileNotFoundException {
+        File log = new File(testDir, s);
+        return new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
+                InvokerLogger.DEBUG);
+    }
+
+    private void checkContent(final Path resource, final String... contentsToFind) {
+        assertThat(resource).isRegularFile();
+        Stream.of(contentsToFind)
+                .forEach(c -> {
+                    try {
+                        assertThat(FileUtils.readFileToString(resource.toFile(), "UTF-8")).contains(c);
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
+    }
+
+    private void checkDir(final Path dir) throws IOException {
+        assertThat(dir).isDirectory();
+    }
+}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
index 6c56b52a29f03..b2863ae12ed2f 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
@@ -60,7 +60,8 @@ public void testProjectGenerationFromScratch() throws MavenInvocationException,
         Properties properties = new Properties();
         properties.put("projectGroupId", "org.acme");
         properties.put("projectArtifactId", "acme");
-        properties.put("projectVersion", "1.0-SNAPSHOT");
+        properties.put("projectVersion", "1.0.0-SNAPSHOT");
+
         InvocationResult result = setup(properties);
 
         assertThat(result.getExitCode()).isZero();
@@ -75,7 +76,7 @@ public void testProjectGenerationFromScratch() throws MavenInvocationException,
         String config = Files
                 .asCharSource(new File(testDir, "src/main/resources/application.properties"), Charsets.UTF_8)
                 .read();
-        assertThat(config).contains("key = value");
+        assertThat(config).isEmpty();
 
         assertThat(new File(testDir, "src/main/docker/Dockerfile.native")).isFile();
         assertThat(new File(testDir, "src/main/docker/Dockerfile.jvm")).isFile();
@@ -111,7 +112,7 @@ public void testProjectGenerationFromScratch() throws MavenInvocationException,
     }
 
     @Test
-    public void testProjectGenerationWithExistingPomShouldFail() throws Exception {
+    public void testProjectGenerationWithExistingPomFileWithPackagingJarShouldFail() throws Exception {
         testDir = initProject("projects/simple-pom-it", "projects/project-generation-from-empty-pom");
         assertThat(testDir).isDirectory();
         invoker = initInvoker(testDir);
@@ -120,6 +121,72 @@ public void testProjectGenerationWithExistingPomShouldFail() throws Exception {
         assertThat(result.getExitCode()).isOne();
     }
 
+    @Test
+    public void testProjectGenerationWithExistingGradleFileShouldFail() throws Exception {
+        testDir = initProject("projects/parent-gradle-it", "projects/project-generation-from-parent-gradle");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+        InvocationResult result = setup(new Properties());
+
+        assertThat(result.getExitCode()).isOne();
+    }
+
+    @Test
+    public void testGradleProjectGenerationWithExistingGradleFileShouldFail() throws Exception {
+        testDir = initProject("projects/parent-gradle-it", "projects/gradle-project-generation-from-parent-gradle");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+        Properties properties = new Properties();
+        properties.put("projectGroupId", "org.acme");
+        properties.put("projectArtifactId", "acme");
+        properties.put("className", "org.acme.MyResource");
+        properties.put("buildTool", "gradle");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isOne();
+    }
+
+    @Test
+    public void testGradleProjectGenerationWithExistingPomFileShouldFail() throws Exception {
+        testDir = initProject("projects/parent-pom-it", "projects/gradle-project-generation-from-parent-pom");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+        Properties properties = new Properties();
+        properties.put("projectGroupId", "org.acme");
+        properties.put("projectArtifactId", "acme");
+        properties.put("className", "org.acme.MyResource");
+        properties.put("buildTool", "gradle");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isOne();
+    }
+
+    @Test
+    public void testProjectGenerationAsModuleWithExistingPomFileWithPackagingPom() throws Exception {
+        testDir = initProject("projects/parent-pom-it", "projects/project-generation-from-parent-pom");
+        assertThat(testDir).isDirectory();
+        invoker = initInvoker(testDir);
+
+        String projectArtifactId = "acme";
+        Properties properties = new Properties();
+        properties.put("projectGroupId", "io.acme.it");
+        properties.put("projectArtifactId", projectArtifactId);
+        properties.put("projectVersion", "1.0-SNAPSHOT");
+        InvocationResult result = setup(properties);
+
+        assertThat(result.getExitCode()).isZero();
+
+        Model parentPomModel = loadPom(testDir);
+        assertThat(parentPomModel.getModules()).isNotEmpty();
+        assertThat(parentPomModel.getModules()).contains(projectArtifactId);
+
+        Model modulePomModel = loadPom(new File(testDir, projectArtifactId));
+        assertThat(modulePomModel.getParent()).isNotNull();
+        assertThat(modulePomModel.getParent().getGroupId()).isEqualTo("io.acme.it");
+        assertThat(modulePomModel.getParent().getArtifactId()).isEqualTo("acme-parent-pom");
+        assertThat(modulePomModel.getParent().getVersion()).isEqualTo("0.0.1.BUILD-SNAPSHOT");
+    }
+
     @Test
     public void testProjectGenerationFromScratchWithResource() throws Exception {
         testDir = initEmptyProject("projects/project-generation-with-resource");
@@ -130,6 +197,7 @@ public void testProjectGenerationFromScratchWithResource() throws Exception {
         properties.put("projectGroupId", "org.acme");
         properties.put("projectArtifactId", "acme");
         properties.put("className", "org.acme.MyResource.java");
+        properties.put("extensions", "resteasy");
         InvocationResult result = setup(properties);
 
         assertThat(result.getExitCode()).isZero();
@@ -173,7 +241,7 @@ public void testProjectGenerationFromScratchWithMissingExtensionShouldFail() thr
         properties.put("extensions", "resteasy,smallrye-metrics,missing");
         InvocationResult result = setup(properties);
 
-        assertThat(result.getExitCode()).isZero();
+        assertThat(result.getExitCode()).isOne();
     }
 
     @Test
@@ -228,7 +296,7 @@ public void testGradleProjectGenerationFromScratchWithExtensions() throws Except
         properties.put("projectGroupId", "org.acme");
         properties.put("projectArtifactId", "acme");
         properties.put("className", "org.acme.MyResource");
-        properties.put("extensions", "kotlin,jackson");
+        properties.put("extensions", "kotlin,resteasy,jackson");
         properties.put("buildTool", "gradle");
         InvocationResult result = setup(properties);
 
@@ -263,7 +331,7 @@ public void testProjectGenerationFromScratchWithCustomDependencies() throws Exce
         properties.put("projectGroupId", "org.acme");
         properties.put("projectArtifactId", "acme");
         properties.put("className", "org.acme.MyResource");
-        properties.put("extensions", "commons-io:commons-io:2.5");
+        properties.put("extensions", "resteasy,commons-io:commons-io:2.5");
         InvocationResult result = setup(properties);
 
         assertThat(result.getExitCode()).isZero();
@@ -302,13 +370,14 @@ public void testThatDefaultPackageAreReplaced() throws Exception {
 
         Properties properties = new Properties();
         properties.put("className", "MyGreatResource");
+        properties.put("extensions", "resteasy");
         InvocationResult result = setup(properties);
 
         assertThat(result.getExitCode()).isZero();
         // As the directory is not empty (log) navigate to the artifactID directory
-        testDir = new File(testDir, "my-quarkus-project");
-        check(new File(testDir, "src/main/java/org/acme/quarkus/sample/MyGreatResource.java"),
-                "package org.acme.quarkus.sample;");
+        testDir = new File(testDir, "code-with-quarkus");
+        check(new File(testDir, "src/main/java/org/acme/MyGreatResource.java"),
+                "package org.acme;");
     }
 
     private void check(final File resource, final String contentsToFind) throws IOException {
@@ -334,6 +403,7 @@ public void generateNewProjectAndRun() throws Exception {
         Properties properties = new Properties();
         properties.put("projectGroupId", "org.acme");
         properties.put("projectArtifactId", "acme");
+        properties.put("extensions", "resteasy");
         properties.put("className", "org.acme.HelloResource");
         InvocationResult result = setup(properties);
 
@@ -350,7 +420,7 @@ public void generateNewProjectAndRun() throws Exception {
         String resp = DevModeTestUtils.getHttpResponse();
 
         assertThat(resp).containsIgnoringCase("ready").containsIgnoringCase("application").containsIgnoringCase("org.acme")
-                .containsIgnoringCase("1.0-SNAPSHOT");
+                .containsIgnoringCase("1.0.0-SNAPSHOT");
 
         String greeting = DevModeTestUtils.getHttpResponse("/hello");
         assertThat(greeting).containsIgnoringCase("hello");
@@ -361,21 +431,20 @@ private InvocationResult setup(Properties params)
 
         params.setProperty("platformGroupId", ToolsConstants.IO_QUARKUS);
         params.setProperty("platformArtifactId", "quarkus-bom");
-        params.setProperty("platformVersion", getPluginVersion());
+        params.setProperty("platformVersion", getQuarkusCoreVersion());
 
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBatchMode(true);
         request.setGoals(Collections.singletonList(
-                getPluginGroupId() + ":" + getPluginArtifactId() + ":" + getPluginVersion() + ":create"));
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create"));
         request.setDebug(false);
-        request.setShowErrors(false);
+        request.setShowErrors(true);
         request.setProperties(params);
-        getEnv().forEach(request::addShellEnvironment);
+
         File log = new File(testDir, "build-create-" + testDir.getName() + ".log");
         PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
                 InvokerLogger.DEBUG);
         invoker.setLogger(logger);
         return invoker.execute(request);
     }
-
 }
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
index 59e55947cda48..eb3bf674d8369 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
@@ -3,14 +3,18 @@
 import static io.quarkus.maven.it.ApplicationNameAndVersionTestUtil.assertApplicationPropertiesSetCorrectly;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -26,6 +30,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.maven.it.verifier.MavenProcessInvocationResult;
@@ -34,20 +39,94 @@
 
 /**
  * @author <a href="http://escoffier.me">Clement Escoffier</a>
- *
+ *         <p>
  *         NOTE to anyone diagnosing failures in this test, to run a single method use:
- *
+ *         <p>
  *         mvn install -Dit.test=DevMojoIT#methodName
  */
 @DisableForNative
 public class DevMojoIT extends RunAndCheckMojoTestBase {
 
+    @Test
+    public void testSystemPropertiesConfig() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/dev-mode-sys-props-config");
+        run(true);
+        assertThat(DevModeTestUtils.getHttpResponse("/hello")).isEqualTo("hello, out there");
+    }
+
+    @Test
+    public void testEnvironmentVariablesConfig() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/dev-mode-env-vars-config");
+        run(true);
+        assertThat(DevModeTestUtils.getHttpResponse("/hello")).isEqualTo("hello, WORLD");
+    }
+
     @Test
     public void testPropertyOverridesTest() throws MavenInvocationException, IOException {
         testDir = getTargetDir("projects/property-overrides");
         runAndCheck("-Dlocal-dep.version=1.0-SNAPSHOT");
     }
 
+    @Test
+    public void testSystemPropertyWithSpacesOnCommandLine() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/classic", "projects/project-classic-prop-with-spaces");
+        runAndCheck("-Dgreeting=\"1 2 3\"");
+        final String greeting = DevModeTestUtils.getHttpResponse("/app/hello/greeting");
+        assertThat(greeting).isEqualTo("1 2 3");
+    }
+
+    @Test
+    public void testCommandModeAppSystemPropArguments() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/basic-command-mode", "projects/command-mode-app-args");
+        run(false, "-Dquarkus.args='1 2'");
+
+        // Wait until this file exists
+        final File done = new File(testDir, "target/done.txt");
+        await()
+                .pollDelay(1, TimeUnit.SECONDS)
+                .atMost(20, TimeUnit.MINUTES).until(() -> done.exists());
+
+        // read the log and check the passed in args
+        final File log = new File(testDir, "build-command-mode-app-args.log");
+        assertThat(log).exists();
+        String loggedArgs = extractLoggedArgs(log);
+        assertThat(loggedArgs).isEqualTo("ARGS: [1, 2]");
+    }
+
+    @Test
+    public void testCommandModeAppPomConfigArguments() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/command-mode-app-args-plugin-config", "projects/command-mode-app-pom-args");
+        run(false);
+
+        // Wait until this file exists
+        final File done = new File(testDir, "target/done.txt");
+        await()
+                .pollDelay(1, TimeUnit.SECONDS)
+                .atMost(20, TimeUnit.MINUTES).until(() -> done.exists());
+
+        // read the log and check the passed in args
+        final File log = new File(testDir, "build-command-mode-app-pom-args.log");
+        assertThat(log).exists();
+        String loggedArgs = extractLoggedArgs(log);
+        assertThat(loggedArgs).isEqualTo("ARGS: [plugin, pom, config]");
+    }
+
+    private String extractLoggedArgs(final File log) throws IOException, FileNotFoundException {
+        String loggedArgs = null;
+        try (BufferedReader reader = new BufferedReader(new FileReader(log))) {
+            String s;
+            while ((s = reader.readLine()) != null) {
+                // not startsWith() because line might start with ANSI escape sequence (which must be stripped)
+                int indexOfARGS = s.indexOf("ARGS: ");
+                if (indexOfARGS > -1) {
+                    loggedArgs = s.substring(indexOfARGS);
+                    break;
+                }
+            }
+        }
+        return loggedArgs;
+    }
+
     @Test
     public void testThatClassAppCanRun() throws MavenInvocationException, IOException {
         testDir = initProject("projects/classic", "projects/project-classic-run");
@@ -136,6 +215,89 @@ public void testThatTheApplicationIsReloadedOnJavaChange() throws MavenInvocatio
                 .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains("carambar"));
     }
 
+    @Test
+    public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationException, IOException {
+        testDir = initProject("projects/classic-inst", "projects/project-intrumentation-reload");
+        runAndCheck();
+
+        //if there is an insturmentation based reload this will stay the same
+        String firstUuid = DevModeTestUtils.getHttpResponse("/app/uuid");
+
+        // Edit the "Hello" message.
+        File source = new File(testDir, "src/main/java/org/acme/HelloResource.java");
+        String uuid = UUID.randomUUID().toString();
+        filter(source, Collections.singletonMap("return \"hello\";", "return \"" + uuid + "\";"));
+
+        // Wait until we get "uuid"
+        await()
+                .pollDelay(100, TimeUnit.MILLISECONDS)
+                .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains(uuid));
+
+        //verify that this was an instrumentation based reload
+        Assertions.assertEquals(firstUuid, DevModeTestUtils.getHttpResponse("/app/uuid"));
+
+        source = new File(testDir, "src/main/java/org/acme/HelloService.java");
+        filter(source, Collections.singletonMap("\"Stuart\"", "\"Stuart Douglas\""));
+
+        // Wait until we get "Stuart Douglas"
+        await()
+                .pollDelay(100, TimeUnit.MILLISECONDS)
+                .atMost(1, TimeUnit.MINUTES)
+                .until(() -> DevModeTestUtils.getHttpResponse("/app/name").contains("Stuart Douglas"));
+
+        //this bean observes startup event, so it should be different UUID
+        String secondUUid = DevModeTestUtils.getHttpResponse("/app/uuid");
+        Assertions.assertNotEquals(secondUUid, firstUuid);
+
+        //now disable instrumentation based restart, and try again
+        //change it back to hello
+        DevModeTestUtils.getHttpResponse("/app/disable");
+        source = new File(testDir, "src/main/java/org/acme/HelloResource.java");
+        filter(source, Collections.singletonMap("return \"" + uuid + "\";", "return \"hello\";"));
+
+        // Wait until we get "hello"
+        await()
+                .pollDelay(100, TimeUnit.MILLISECONDS)
+                .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains("hello"));
+
+        //verify that this was not instrumentation based reload
+        Assertions.assertNotEquals(secondUUid, DevModeTestUtils.getHttpResponse("/app/uuid"));
+        secondUUid = DevModeTestUtils.getHttpResponse("/app/uuid");
+
+        //now re-enable
+        //and repeat
+        DevModeTestUtils.getHttpResponse("/app/enable");
+        source = new File(testDir, "src/main/java/org/acme/HelloResource.java");
+        filter(source, Collections.singletonMap("return \"hello\";", "return \"" + uuid + "\";"));
+
+        // Wait until we get uuid
+        await()
+                .pollDelay(100, TimeUnit.MILLISECONDS)
+                .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains(uuid));
+
+        //verify that this was an instrumentation based reload
+        Assertions.assertEquals(secondUUid, DevModeTestUtils.getHttpResponse("/app/uuid"));
+
+        // verify that add + change results in full reload
+        // add a new class
+        Files.write(Paths.get(testDir.toString(), "src/main/java/org/acme/AnotherClass.java"),
+                "package org.acme;\nclass ItDoesntMatter{}".getBytes());
+
+        // change back to hello
+        source = new File(testDir, "src/main/java/org/acme/HelloResource.java");
+        filter(source, Collections.singletonMap("return \"" + uuid + "\";", "return \"hello\";"));
+
+        // Wait until we get "hello"
+        await()
+                .pollDelay(100, TimeUnit.MILLISECONDS)
+                .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains("hello"));
+
+        //verify that this was not instrumentation based reload
+        Assertions.assertNotEquals(secondUUid, DevModeTestUtils.getHttpResponse("/app/uuid"));
+        secondUUid = DevModeTestUtils.getHttpResponse("/app/uuid");
+
+    }
+
     @Test
     public void testThatSourceChangesAreDetectedOnPomChange() throws Exception {
         testDir = initProject("projects/classic", "projects/project-classic-run-src-and-pom-change");
@@ -235,7 +397,7 @@ public void testThatTheApplicationIsReloadedOnPomChange() throws MavenInvocation
         // Wait until we get "uuid"
         await()
                 .pollDelay(100, TimeUnit.MILLISECONDS)
-                .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/openapi").contains("hello"));
+                .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/q/openapi").contains("hello"));
     }
 
     @Test
@@ -244,17 +406,39 @@ public void testProjectWithExtension() throws MavenInvocationException, IOExcept
         runAndCheck();
 
         final List<String> extDepWarnings = Files.readAllLines(testDir.toPath().resolve("build-project-with-extension.log"))
-                .stream().filter(s -> s.startsWith("[WARNING] Local Quarkus extension dependency "))
+                .stream()
+                .filter(s -> s.startsWith(
+                        "[WARNING] [io.quarkus.bootstrap.devmode.DependenciesFilter] Local Quarkus extension dependency "))
                 .collect(Collectors.toList());
         assertTrue(extDepWarnings
-                .contains("[WARNING] Local Quarkus extension dependency org.acme:acme-quarkus-ext will not be hot-reloadable"));
+                .contains(
+                        "[WARNING] [io.quarkus.bootstrap.devmode.DependenciesFilter] Local Quarkus extension dependency org.acme:acme-quarkus-ext will not be hot-reloadable"));
         assertTrue(extDepWarnings
-                .contains("[WARNING] Local Quarkus extension dependency org.acme:acme-common will not be hot-reloadable"));
+                .contains(
+                        "[WARNING] [io.quarkus.bootstrap.devmode.DependenciesFilter] Local Quarkus extension dependency org.acme:acme-common will not be hot-reloadable"));
         assertTrue(extDepWarnings.contains(
-                "[WARNING] Local Quarkus extension dependency org.acme:acme-common-transitive will not be hot-reloadable"));
+                "[WARNING] [io.quarkus.bootstrap.devmode.DependenciesFilter] Local Quarkus extension dependency org.acme:acme-common-transitive will not be hot-reloadable"));
         assertEquals(3, extDepWarnings.size());
     }
 
+    @Test
+    public void testRestClientCustomHeadersExtension() throws MavenInvocationException, IOException {
+        testDir = getTargetDir("projects/rest-client-custom-headers-extension");
+        runAndCheck();
+
+        final List<String> extDepWarnings = Files
+                .readAllLines(testDir.toPath().resolve("build-rest-client-custom-headers-extension.log"))
+                .stream()
+                .filter(s -> s.startsWith(
+                        "[WARNING] [io.quarkus.bootstrap.devmode.DependenciesFilter] Local Quarkus extension dependency "))
+                .collect(Collectors.toList());
+        assertTrue(extDepWarnings
+                .contains(
+                        "[WARNING] [io.quarkus.bootstrap.devmode.DependenciesFilter] Local Quarkus extension dependency org.acme:rest-client-custom-headers will not be hot-reloadable"));
+
+        assertThat(DevModeTestUtils.getHttpResponse("/app/frontend")).isEqualTo("CustomValue1 CustomValue2");
+    }
+
     @Test
     public void testThatTheApplicationIsReloadedMultiModule() throws MavenInvocationException, IOException {
         testDir = initProject("projects/multimodule", "projects/multimodule-with-deps");
@@ -774,15 +958,6 @@ public void testThatTheApplicationIsReloadedOnDotEnvConfigChange() throws MavenI
                 .until(() -> DevModeTestUtils.getHttpResponse("/app/hello/otherGreeting").contains(uuid));
     }
 
-    @Test
-    public void testDevModeWithoutJavaSrc() throws MavenInvocationException, IOException {
-        testDir = initProject("projects/classic-no-java-src");
-        run(true);
-        getHttpResponse();
-
-        assertThat(running.log()).contains("The project's sources directory does not exist");
-    }
-
     @Test
     public void testMultiModuleDevModeWithoutJavaSrc() throws MavenInvocationException, IOException {
         testDir = initProject("projects/multimodule", "projects/multimodule-no-java-src");
@@ -841,4 +1016,16 @@ public void testThatDependencyInParentIsEvaluated() throws IOException, MavenInv
         testDir = initProject("projects/multimodule-parent-dep");
         runAndCheck();
     }
+
+    @Test
+    public void testThatGenerateCodeGoalIsNotTriggeredIfNotConfigured() throws IOException, MavenInvocationException {
+        testDir = initProject("projects/classic-no-generate");
+        // the skip parameter triggers a log statement by the generate goal,
+        // otherwise there would be no way to tell from the logfile that the goal was invoked
+        runAndCheck(false, "-Dquarkus.generate-code.skip=true");
+
+        assertThat(running.log()).doesNotContain("Skipping Quarkus code generation");
+        assertThat(running.log()).contains("Copying 1 resource"); // maven-resource-plugin
+        assertThat(running.log()).contains("Compiling 2 source files"); // maven-compiler-plugin
+    }
 }
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/FastJarQuarkusIntegrationTestIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/FastJarQuarkusIntegrationTestIT.java
new file mode 100644
index 0000000000000..2707eca2ba93a
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/FastJarQuarkusIntegrationTestIT.java
@@ -0,0 +1,15 @@
+package io.quarkus.maven.it;
+
+import java.io.IOException;
+
+import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.junit.jupiter.api.Test;
+
+@DisableForNative
+public class FastJarQuarkusIntegrationTestIT extends QuarkusITBase {
+
+    @Test
+    public void testFastJar() throws MavenInvocationException, IOException {
+        doTest("qit-fast-jar", "fastjar");
+    }
+}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/GenerateConfigIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/GenerateConfigIT.java
index 5d6097d073dd2..68cbc38412a7a 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/GenerateConfigIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/GenerateConfigIT.java
@@ -62,12 +62,12 @@ private void generateConfig(String filename)
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBatchMode(true);
         request.setGoals(Collections
-                .singletonList(getPluginGroupId() + ":" + getPluginArtifactId() + ":"
-                        + getPluginVersion() + ":generate-config"));
+                .singletonList(getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":"
+                        + getMavenPluginVersion() + ":generate-config"));
         Properties properties = new Properties();
         properties.setProperty("file", filename);
         request.setProperties(properties);
-        getEnv().forEach(request::addShellEnvironment);
+
         File log = new File(testDir, "build-generate-config-" + testDir.getName() + ".log");
         PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
                 InvokerLogger.DEBUG);
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java
index e7d02ccfb60ae..9b3802d401eb6 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java
@@ -7,6 +7,7 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -21,6 +22,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -46,6 +48,43 @@
 @DisableForNative
 public class JarRunnerIT extends MojoTestBase {
 
+    /**
+     * Tests that a Quarkus project builds fine if the project is hosted in a directory
+     * path that contains non-ASCII characters
+     *
+     * @throws MavenInvocationException
+     * @throws IOException
+     * @see <a href="https://github.com/quarkusio/quarkus/issues/11511"/>
+     */
+    @Test
+    public void testNonAsciiDir() throws Exception {
+        final File testDir = initProject("projects/classic", "projects/ěščřžýáíéůú");
+        final RunningInvoker running = new RunningInvoker(testDir, false);
+
+        final MavenProcessInvocationResult result = running.execute(Arrays.asList("install", "-DskipTests"),
+                Collections.emptyMap());
+        await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive());
+        assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS");
+        running.stop();
+
+        File output = new File(testDir, "target/output.log");
+        output.createNewFile();
+
+        Process process = doLaunch(new File(testDir, "target/quarkus-app"), Paths.get("quarkus-run.jar"), output,
+                Collections.emptyList()).start();
+        try {
+            // Wait until server up
+            dumpFileContentOnFailure(() -> {
+                await().pollDelay(1, TimeUnit.SECONDS)
+                        .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello/package", 200));
+                return null;
+            }, output, ConditionTimeoutException.class);
+        } finally {
+            process.destroy();
+        }
+
+    }
+
     @Test
     public void testThatJarRunnerConsoleOutputWorksCorrectly() throws MavenInvocationException, IOException {
         File testDir = initProject("projects/classic", "projects/project-classic-console-output");
@@ -57,7 +96,7 @@ public void testThatJarRunnerConsoleOutputWorksCorrectly() throws MavenInvocatio
         running.stop();
 
         Path jar = testDir.toPath().toAbsolutePath()
-                .resolve(Paths.get("target/acme-1.0-SNAPSHOT-runner.jar"));
+                .resolve(Paths.get("target/quarkus-app/quarkus-run.jar"));
         File output = new File(testDir, "target/output.log");
         output.createNewFile();
 
@@ -75,10 +114,60 @@ public void testThatJarRunnerConsoleOutputWorksCorrectly() throws MavenInvocatio
             // test that the application name and version are properly set
             assertApplicationPropertiesSetCorrectly();
             assertResourceReadingFromClassPathWorksCorrectly("");
+            assertUsingProtectionDomainWorksCorrectly("");
+        } finally {
+            process.destroy();
+        }
+
+    }
+
+    @Test
+    public void testPlatformPropertiesOverridenInApplicationProperties() throws Exception {
+        final File testDir = initProject("projects/platform-properties-overrides",
+                "projects/platform-props-overriden-in-app-props");
+        final RunningInvoker running = new RunningInvoker(testDir, false);
+
+        final MavenProcessInvocationResult result = running.execute(Arrays.asList("install"),
+                Collections.emptyMap());
+        await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive());
+        assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS");
+        running.stop();
+
+        File output = new File(testDir, "app/target/output.log");
+        output.createNewFile();
+
+        Process process = doLaunch(new File(testDir, "app/target/quarkus-app"), Paths.get("quarkus-run.jar"), output,
+                Collections.emptyList()).start();
+        try {
+            Assertions.assertEquals("builder-image is customized", DevModeTestUtils.getHttpResponse("/hello"));
         } finally {
             process.destroy();
         }
+    }
+
+    @Test
+    public void testPlatformPropertiesOverridenOnCommandLine() throws Exception {
+        final File testDir = initProject("projects/platform-properties-overrides",
+                "projects/platform-props-overriden-on-cmd-line");
+        final RunningInvoker running = new RunningInvoker(testDir, false);
+
+        final MavenProcessInvocationResult result = running.execute(
+                Arrays.asList("install -Dquarkus.native.builder-image=commandline -DskipTests"),
+                Collections.emptyMap());
+        await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive());
+        assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS");
+        running.stop();
 
+        File output = new File(testDir, "app/target/output.log");
+        output.createNewFile();
+
+        Process process = doLaunch(new File(testDir, "app/target/quarkus-app"), Paths.get("quarkus-run.jar"), output,
+                Collections.emptyList()).start();
+        try {
+            Assertions.assertEquals("builder-image is commandline", DevModeTestUtils.getHttpResponse("/hello"));
+        } finally {
+            process.destroy();
+        }
     }
 
     @Test
@@ -101,6 +190,68 @@ public void testThatMutableFastJarWorksProvidersDirOutsideOutputDir() throws Exc
         assertThatMutableFastJarWorks("outsidedir", ".." + File.separator + "providers");
     }
 
+    @Test
+    public void testThatLegacyJarFormatWorks() throws Exception {
+        File testDir = initProject("projects/rr-with-json-logging", "projects/rr-with-json-logging-legacy-jar");
+        RunningInvoker running = new RunningInvoker(testDir, false);
+
+        MavenProcessInvocationResult result = running
+                .execute(Arrays.asList("package",
+                        "-DskipTests",
+                        "-Dquarkus.package.type=legacy-jar"), Collections.emptyMap());
+
+        await().atMost(1, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive());
+        assertThat(running.log()).containsIgnoringCase("BUILD SUCCESS");
+        running.stop();
+
+        Path jar = testDir.toPath().toAbsolutePath()
+                .resolve(Paths.get("target",
+                        JarResultBuildStep.DEFAULT_FAST_JAR_DIRECTORY_NAME,
+                        "quarkus-run.jar"));
+        Assertions.assertFalse(Files.exists(jar));
+
+        jar = testDir.toPath().toAbsolutePath()
+                .resolve(Paths.get("target/acme-1.0-SNAPSHOT-runner.jar"));
+        Assertions.assertTrue(Files.exists(jar));
+
+        Properties quarkusArtifactProperties = new Properties();
+        quarkusArtifactProperties
+                .load(new FileInputStream(testDir.toPath().resolve("target").resolve("quarkus-artifact.properties").toFile()));
+        Assertions.assertEquals("jar", quarkusArtifactProperties.get("type"));
+        Assertions.assertEquals("acme-1.0-SNAPSHOT-runner.jar", quarkusArtifactProperties.get("path"));
+
+        File output = new File(testDir, "target/output.log");
+        output.createNewFile();
+
+        Properties properties = new Properties();
+        properties
+                .load(new FileInputStream(testDir.toPath().resolve("target").resolve("quarkus-artifact.properties").toFile()));
+        Assertions.assertEquals("jar", properties.get("type"));
+        Assertions.assertEquals("acme-1.0-SNAPSHOT-runner.jar", properties.get("path"));
+
+        Process process = doLaunch(jar, output).start();
+        try {
+            // Wait until server up
+            dumpFileContentOnFailure(() -> {
+                await()
+                        .pollDelay(1, TimeUnit.SECONDS)
+                        .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello/package", 200));
+                return null;
+            }, output, ConditionTimeoutException.class);
+
+            String logs = FileUtils.readFileToString(output, "UTF-8");
+
+            assertThat(logs).isNotEmpty().contains("resteasy-reactive");
+
+            // test that the application name and version are properly set
+            assertApplicationPropertiesSetCorrectly();
+            assertResourceReadingFromClassPathWorksCorrectly("");
+            assertUsingProtectionDomainWorksCorrectly("");
+        } finally {
+            process.destroy();
+        }
+    }
+
     private void assertThatMutableFastJarWorks(String targetDirSuffix, String providersDir) throws Exception {
         File testDir = initProject("projects/classic",
                 "projects/project-classic-console-output-mutable-fast-jar" + targetDirSuffix);
@@ -181,6 +332,7 @@ private void assertThatMutableFastJarWorks(String targetDirSuffix, String provid
             assertApplicationPropertiesSetCorrectly("/moved");
 
             assertResourceReadingFromClassPathWorksCorrectly("/moved");
+            assertUsingProtectionDomainWorksCorrectly("/moved");
             Assertions.assertEquals("added endpoint", performRequest("/moved/app/added", 200));
         } finally {
             process.destroy();
@@ -202,7 +354,7 @@ public void testThatAppCDSAreUsable() throws Exception {
         running.stop();
 
         Path jar = testDir.toPath().toAbsolutePath()
-                .resolve(Paths.get("target/acme-1.0-SNAPSHOT-runner.jar"));
+                .resolve(Paths.get("target/quarkus-app/quarkus-run.jar"));
         File output = new File(testDir, "target/output.log");
         output.createNewFile();
 
@@ -244,7 +396,7 @@ public void testArcExcludeDependencyOnLocalModule() throws Exception {
 
         File targetDir = new File(testDir.getAbsoluteFile(), "runner" + File.separator + "target");
         Path jar = targetDir.toPath().toAbsolutePath()
-                .resolve(Paths.get("acme-1.0-SNAPSHOT-runner.jar"));
+                .resolve(Paths.get("quarkus-app/quarkus-run.jar"));
         File output = new File(targetDir, "output.log");
         output.createNewFile();
 
@@ -268,10 +420,15 @@ public void testArcExcludeDependencyOnLocalModule() throws Exception {
     }
 
     private ProcessBuilder doLaunch(Path jar, File output) throws IOException {
-        return doLaunch(jar, output, Collections.emptyList());
+        return doLaunch(null, jar, output, Collections.emptyList());
     }
 
     private ProcessBuilder doLaunch(Path jar, File output, Collection<String> vmArgs) throws IOException {
+        return doLaunch(null, jar, output, vmArgs);
+    }
+
+    static ProcessBuilder doLaunch(final File workingDir, final Path jar, File output, Collection<String> vmArgs)
+            throws IOException {
         List<String> commands = new ArrayList<>();
         commands.add(JavaBinFinder.findBin());
         commands.addAll(vmArgs);
@@ -280,6 +437,9 @@ private ProcessBuilder doLaunch(Path jar, File output, Collection<String> vmArgs
         // write out the command used to launch the process, into the log file
         Files.write(output.toPath(), commands);
         ProcessBuilder processBuilder = new ProcessBuilder(commands.toArray(new String[0]));
+        if (workingDir != null) {
+            processBuilder.directory(workingDir);
+        }
         processBuilder.redirectOutput(ProcessBuilder.Redirect.appendTo(output));
         processBuilder.redirectError(ProcessBuilder.Redirect.appendTo(output));
         return processBuilder;
@@ -304,6 +464,25 @@ static void assertResourceReadingFromClassPathWorksCorrectly(String path) {
         }
     }
 
+    static void assertUsingProtectionDomainWorksCorrectly(String path) {
+        try {
+            URL url = new URL("http://localhost:8080" + path + "/app/protectionDomain");
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            // the default Accept header used by HttpURLConnection is not compatible with RESTEasy negotiation as it uses q=.2
+            connection.setRequestProperty("Accept", "text/html, *; q=0.2, */*; q=0.2");
+            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                failResourcesFromTheClasspath();
+            }
+            try (BufferedReader br = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
+                String output = br.readLine();
+                assertThat(output).isEqualTo("success");
+            }
+        } catch (IOException e) {
+            failProtectionDomain();
+        }
+    }
+
     static String performRequest(String path, int expectedCode) {
         try {
             URL url = new URL("http://localhost:8080" + path);
@@ -328,6 +507,10 @@ private static void failResourcesFromTheClasspath() {
         fail("Failed to assert that the application properly reads resources from the classpath");
     }
 
+    private static void failProtectionDomain() {
+        fail("Failed to assert that the use of ProtectionDomain works correctly");
+    }
+
     /**
      * Calls the {@link Callable} and if that call results in an exception of type {@code failureType} then,
      * prints out the contents of the passed {@code logFile} and throws back the original exception
@@ -356,7 +539,7 @@ private void dumpFileContentOnFailure(final Callable<Void> operation, final File
     }
 
     private void assertThatFastJarFormatWorks(String outputDir) throws Exception {
-        File testDir = initProject("projects/classic", "projects/project-classic-console-output-fast-jar" + outputDir);
+        File testDir = initProject("projects/rr-with-json-logging", "projects/rr-with-json-logging" + outputDir);
         RunningInvoker running = new RunningInvoker(testDir, false);
 
         MavenProcessInvocationResult result = running
@@ -381,6 +564,13 @@ private void assertThatFastJarFormatWorks(String outputDir) throws Exception {
         File output = new File(testDir, "target/output.log");
         output.createNewFile();
 
+        Properties properties = new Properties();
+        properties
+                .load(new FileInputStream(testDir.toPath().resolve("target").resolve("quarkus-artifact.properties").toFile()));
+        Assertions.assertEquals("jar", properties.get("type"));
+        Assertions.assertTrue(properties.get("path").toString().startsWith(outputDir == null ? "quarkus-app" : outputDir));
+        Assertions.assertTrue(properties.get("path").toString().endsWith("quarkus-run.jar"));
+
         Process process = doLaunch(jar, output).start();
         try {
             // Wait until server up
@@ -393,11 +583,12 @@ private void assertThatFastJarFormatWorks(String outputDir) throws Exception {
 
             String logs = FileUtils.readFileToString(output, "UTF-8");
 
-            assertThatOutputWorksCorrectly(logs);
+            assertThat(logs).isNotEmpty().contains("resteasy-reactive");
 
             // test that the application name and version are properly set
             assertApplicationPropertiesSetCorrectly();
             assertResourceReadingFromClassPathWorksCorrectly("");
+            assertUsingProtectionDomainWorksCorrectly("");
         } finally {
             process.destroy();
         }
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/LegacyJarQuarkusIntegrationTestIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/LegacyJarQuarkusIntegrationTestIT.java
new file mode 100644
index 0000000000000..77c95ac6988d0
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/LegacyJarQuarkusIntegrationTestIT.java
@@ -0,0 +1,15 @@
+package io.quarkus.maven.it;
+
+import java.io.IOException;
+
+import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.junit.jupiter.api.Test;
+
+@DisableForNative
+public class LegacyJarQuarkusIntegrationTestIT extends QuarkusITBase {
+
+    @Test
+    public void testFastJar() throws MavenInvocationException, IOException {
+        doTest("qit-legacy-jar", "legacyjar");
+    }
+}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java
index 962ff87c06cc7..29d5730115545 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/ListExtensionsIT.java
@@ -62,8 +62,8 @@ private List<String> listExtensions()
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBatchMode(true);
         request.setGoals(Collections.singletonList(
-                getPluginGroupId() + ":" + getPluginArtifactId() + ":" + getPluginVersion() + ":list-extensions"));
-        getEnv().forEach(request::addShellEnvironment);
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion()
+                        + ":list-extensions"));
 
         File outputLog = new File(testDir, "output.log");
         InvocationOutputHandler outputHandler = new PrintStreamHandler(
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/NativeImageIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/NativeImageIT.java
index 788c9222605cb..fae54a7e9e36c 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/NativeImageIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/NativeImageIT.java
@@ -38,7 +38,7 @@ public void testJavaLibraryPathAtRuntime() throws Exception {
         // trigger mvn package -Pnative -Dquarkus.ssl.native=true
         final String[] mvnArgs = new String[] { "package", "-DskipTests", "-Pnative", "-Dquarkus.ssl.native=true" };
         final MavenProcessInvocationResult result = running.execute(Arrays.asList(mvnArgs), Collections.emptyMap());
-        await().atMost(5, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive());
+        await().atMost(10, TimeUnit.MINUTES).until(() -> result.getProcess() != null && !result.getProcess().isAlive());
         final String processLog = running.log();
         try {
             assertThat(processLog).containsIgnoringCase("BUILD SUCCESS");
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java
index ae4935a26a8e2..788517d4f86b3 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java
@@ -1,11 +1,9 @@
 package io.quarkus.maven.it;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -22,7 +20,7 @@
 import java.util.zip.ZipInputStream;
 
 import org.apache.maven.shared.invoker.MavenInvocationException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.maven.it.verifier.MavenProcessInvocationResult;
@@ -35,23 +33,15 @@ public class PackageIT extends MojoTestBase {
     private File testDir;
 
     @Test
-    public void testPackageWorksWhenUberjarIsFalse()
+    public void testUberJarMavenPluginConfiguration()
             throws MavenInvocationException, IOException, InterruptedException {
-        testDir = initProject("projects/uberjar-check", "projects/project-uberjar-false");
-
+        testDir = initProject("projects/uberjar-maven-plugin-config");
         running = new RunningInvoker(testDir, false);
         final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
-                Collections.singletonMap("QUARKUS_PACKAGE_UBER_JAR", "false"));
-
+                Collections.emptyMap());
         assertThat(result.getProcess().waitFor()).isEqualTo(0);
 
-        final File targetDir = getTargetDir();
-        List<File> jars = getFilesEndingWith(targetDir, ".jar");
-        assertThat(jars).hasSize(2);
-
-        // make sure the jar can be read by JarInputStream
-        ensureManifestOfJarIsReadableByJarInputStream(
-                jars.stream().filter(f -> f.getName().contains("-runner")).findFirst().get());
+        verifyUberJar();
     }
 
     private void ensureManifestOfJarIsReadableByJarInputStream(File jar) throws IOException {
@@ -63,10 +53,54 @@ private void ensureManifestOfJarIsReadableByJarInputStream(File jar) throws IOEx
         }
     }
 
+    @Test
+    public void testQuarkusPackageOutputDirectory()
+            throws MavenInvocationException, IOException, InterruptedException {
+        testDir = initProject("projects/quarkus.package.output-directory");
+
+        running = new RunningInvoker(testDir, false);
+        // we do want to run the tests too
+        final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
+                Collections.emptyMap());
+
+        assertThat(result.getProcess().waitFor()).isEqualTo(0);
+
+        File targetDir = getTargetDir();
+        List<File> jars = getFilesEndingWith(targetDir, ".jar");
+        assertThat(jars).hasSize(1);
+
+        targetDir = new File(targetDir, "custom-output-dir");
+        assertThat(targetDir).exists();
+        jars = getFilesEndingWith(targetDir, ".jar");
+        assertThat(jars).hasSize(1);
+    }
+
+    /**
+     * POM files are often found among the project's dependencies.
+     * This test makes sure such projects can be built with mutable-jar format
+     * without choking on non-jar dependencies.
+     */
+    @Test
+    public void testDependencyOnPomMutableJar()
+            throws MavenInvocationException, IOException, InterruptedException {
+        testDir = initProject("projects/dependency-on-pom");
+
+        running = new RunningInvoker(testDir, false);
+        // we do want to run the tests too
+        final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
+                Collections.emptyMap());
+
+        assertThat(result.getProcess().waitFor()).isEqualTo(0);
+
+        File targetDir = getTargetDir();
+        List<File> jars = getFilesEndingWith(targetDir, ".jar");
+        assertThat(jars).hasSize(1);
+    }
+
     @Test
     public void testPackageWorksWhenUberjarIsTrue()
             throws MavenInvocationException, IOException, InterruptedException {
-        testDir = initProject("projects/uberjar-check", "projects/project-uberjar-true");
+        testDir = initProject("projects/uberjar-check");
 
         createAndVerifyUberJar();
         // ensure that subsequent package without clean also works
@@ -75,13 +109,17 @@ public void testPackageWorksWhenUberjarIsTrue()
 
     private void createAndVerifyUberJar() throws IOException, MavenInvocationException, InterruptedException {
         Properties p = new Properties();
-        p.setProperty("quarkus.package.uber-jar", "true");
+        p.setProperty("quarkus.package.type", "uber-jar");
 
         running = new RunningInvoker(testDir, false);
         final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
                 Collections.emptyMap(), p);
         assertThat(result.getProcess().waitFor()).isEqualTo(0);
 
+        verifyUberJar();
+    }
+
+    private void verifyUberJar() throws IOException {
         final File targetDir = getTargetDir();
         List<File> jars = getFilesEndingWith(targetDir, ".jar");
         assertThat(jars).hasSize(1);
@@ -92,7 +130,7 @@ private void createAndVerifyUberJar() throws IOException, MavenInvocationExcepti
 
     @Test
     public void testCustomPackaging()
-            throws MavenInvocationException, FileNotFoundException, InterruptedException {
+            throws Exception {
         testDir = getTargetDir("projects/custom-packaging-plugin");
 
         running = new RunningInvoker(testDir, false);
@@ -113,9 +151,10 @@ public void testCustomPackaging()
         for (File f : files) {
             jarNames.add(f.getName());
         }
-        assertEquals(new HashSet<>(Arrays.asList(new String[] { "acme-custom-packaging-app-1.0-SNAPSHOT-runner.jar",
-                "acme-custom-packaging-app-1.0-SNAPSHOT.jar" })),
-                jarNames);
+
+        final Path runnerJar = getTargetDir().toPath().resolve("quarkus-app").resolve("quarkus-run.jar");
+        Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing");
+        assertZipEntriesCanBeOpenedAndClosed(runnerJar);
     }
 
     /**
@@ -128,12 +167,12 @@ public void testCustomPackaging()
      */
     @Test
     public void testRunnerUberJarHasValidCRC() throws Exception {
-        testDir = initProject("projects/uberjar-check", "projects/project-uberjar-true2");
+        testDir = initProject("projects/uberjar-check", "projects/project-uberjar-crc");
 
         running = new RunningInvoker(testDir, false);
 
         Properties p = new Properties();
-        p.setProperty("quarkus.package.uber-jar", "true");
+        p.setProperty("quarkus.package.type", "uber-jar");
         final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
                 Collections.emptyMap(), p);
         assertThat(result.getProcess().waitFor()).isEqualTo(0);
@@ -143,7 +182,7 @@ public void testRunnerUberJarHasValidCRC() throws Exception {
         assertThat(getNumberOfFilesEndingWith(targetDir, ".original")).isEqualTo(1);
 
         final Path runnerJar = targetDir.toPath().resolve("acme-1.0-SNAPSHOT-runner.jar");
-        Assert.assertTrue("Runner jar " + runnerJar + " is missing", Files.exists(runnerJar));
+        Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing");
         assertZipEntriesCanBeOpenedAndClosed(runnerJar);
     }
 
@@ -156,12 +195,12 @@ public void testRunnerUberJarHasValidCRC() throws Exception {
      * @see <a href="https://github.com/quarkusio/quarkus/issues/4782"/>
      */
     @Test
-    public void testRunnerJarHasValidCRC() throws Exception {
-        testDir = initProject("projects/uberjar-check", "projects/project-uberjar-false2");
+    public void testLegacyJarHasValidCRC() throws Exception {
+        testDir = initProject("projects/uberjar-check", "projects/project-legacyjar-crc");
 
         running = new RunningInvoker(testDir, false);
         final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
-                Collections.singletonMap("QUARKUS_PACKAGE_TYPES", "thin-jar"));
+                Collections.singletonMap("QUARKUS_PACKAGE_TYPE", "legacy-jar"));
 
         assertThat(result.getProcess().waitFor()).isEqualTo(0);
 
@@ -169,7 +208,30 @@ public void testRunnerJarHasValidCRC() throws Exception {
         assertThat(getNumberOfFilesEndingWith(targetDir, ".jar")).isEqualTo(2);
 
         final Path runnerJar = targetDir.toPath().resolve("acme-1.0-SNAPSHOT-runner.jar");
-        Assert.assertTrue("Runner jar " + runnerJar + " is missing", Files.exists(runnerJar));
+        Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing");
+        assertZipEntriesCanBeOpenedAndClosed(runnerJar);
+    }
+
+    /**
+     * Tests that the runner jar created by Quarkus has valid CRC entries. The verification
+     * is pretty trivial and involves opening and closing the ZipEntry entries that are part of the
+     * runner jar. That internally triggers the CRC checks.
+     *
+     * @throws Exception
+     * @see <a href="https://github.com/quarkusio/quarkus/issues/4782"/>
+     */
+    @Test
+    public void testFastJarHasValidCRC() throws Exception {
+        testDir = initProject("projects/uberjar-check", "projects/project-fastjar-crc");
+
+        running = new RunningInvoker(testDir, false);
+        final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
+                Collections.emptyMap());
+
+        assertThat(result.getProcess().waitFor()).isEqualTo(0);
+
+        final Path runnerJar = getTargetDir().toPath().resolve("quarkus-app").resolve("quarkus-run.jar");
+        Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing");
         assertZipEntriesCanBeOpenedAndClosed(runnerJar);
     }
 
@@ -182,18 +244,37 @@ public void testQuarkusIndexDependencyOnLocalModule() throws Exception {
 
         running = new RunningInvoker(testDir, false);
         final MavenProcessInvocationResult result = running.execute(Collections.singletonList("package"),
-                Collections.singletonMap("QUARKUS_PACKAGE_TYPES", "thin-jar"));
+                Collections.emptyMap());
 
         assertThat(result.getProcess().waitFor()).isEqualTo(0);
 
         final File targetDir = new File(testDir.getAbsoluteFile(), "runner" + File.separator + "target");
-        assertThat(getNumberOfFilesEndingWith(targetDir, ".jar")).isEqualTo(2);
 
-        final Path runnerJar = targetDir.toPath().resolve("quarkus-quickstart-multimodule-main-1.0-SNAPSHOT-runner.jar");
-        Assert.assertTrue("Runner jar " + runnerJar + " is missing", Files.exists(runnerJar));
+        final Path runnerJar = targetDir.toPath().resolve("quarkus-app").resolve("quarkus-run.jar");
+        Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing");
         assertZipEntriesCanBeOpenedAndClosed(runnerJar);
     }
 
+    @Test
+    public void testNativeSourcesPackage() throws Exception {
+        testDir = initProject("projects/uberjar-check", "projects/project-native-sources");
+
+        running = new RunningInvoker(testDir, false);
+        final MavenProcessInvocationResult result = running.execute(
+                Arrays.asList("package", "-Dquarkus.package.type=native-sources"),
+                Collections.emptyMap());
+
+        assertThat(result.getProcess().waitFor()).isEqualTo(0);
+
+        final File targetDir = getTargetDir();
+
+        final Path nativeSourcesDir = targetDir.toPath().resolve("native-sources");
+        assertThat(nativeSourcesDir).exists()
+                .isDirectoryContaining(p -> "native-image.args".equals(p.getFileName().toString()))
+                .isDirectoryContaining(p -> "acme-1.0-SNAPSHOT-runner.jar".equals(p.getFileName().toString()));
+
+    }
+
     private int getNumberOfFilesEndingWith(File dir, String suffix) {
         return getFilesEndingWith(dir, suffix).size();
     }
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java
new file mode 100644
index 0000000000000..77db092b14410
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/QuarkusITBase.java
@@ -0,0 +1,43 @@
+package io.quarkus.maven.it;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.maven.shared.invoker.MavenInvocationException;
+
+import io.quarkus.maven.it.verifier.MavenProcessInvocationResult;
+import io.quarkus.maven.it.verifier.RunningInvoker;
+
+// meant to test that @QuarkusIntegrationTest can properly launch jars
+abstract class QuarkusITBase extends MojoTestBase {
+
+    void doTest(String projectName, String profile) throws MavenInvocationException, IOException {
+        File testDir = initProject("projects/reactive-routes", "projects/" + projectName);
+        RunningInvoker packageInvocation = new RunningInvoker(testDir, false);
+
+        MavenProcessInvocationResult packageInvocationResult = packageInvocation
+                .execute(Arrays.asList("package", "-B",
+                        "-D" + profile), Collections.emptyMap());
+
+        await().atMost(1, TimeUnit.MINUTES)
+                .until(() -> packageInvocationResult.getProcess() != null && !packageInvocationResult.getProcess().isAlive());
+        assertThat(packageInvocation.log()).containsIgnoringCase("BUILD SUCCESS");
+
+        RunningInvoker integrationTestsInvocation = new RunningInvoker(testDir, false);
+
+        MavenProcessInvocationResult integrationTestsInvocationResult = integrationTestsInvocation
+                .execute(Arrays.asList("failsafe:integration-test", "-B",
+                        "-D" + profile), Collections.emptyMap());
+
+        await().atMost(1, TimeUnit.MINUTES)
+                .until(() -> integrationTestsInvocationResult.getProcess() != null
+                        && !integrationTestsInvocationResult.getProcess().isAlive());
+        assertThat(integrationTestsInvocation.log()).containsIgnoringCase("BUILD SUCCESS");
+    }
+}
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java
index b6849b389d12e..429aa61401664 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java
@@ -54,6 +54,9 @@ public void testThatTheApplicationIsReloadedOnJavaChange()
         await()
                 .pollDelay(1, TimeUnit.SECONDS)
                 .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains("carambar"));
+
+        //also verify that the dev ui console is disabled
+        DevModeTestUtils.getHttpResponse("/q/dev", 404, 10, TimeUnit.SECONDS);
     }
 
     @Test
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/UberJarQuarkusIntegrationTestIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/UberJarQuarkusIntegrationTestIT.java
new file mode 100644
index 0000000000000..3e6fe6bef1ad1
--- /dev/null
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/UberJarQuarkusIntegrationTestIT.java
@@ -0,0 +1,15 @@
+package io.quarkus.maven.it;
+
+import java.io.IOException;
+
+import org.apache.maven.shared.invoker.MavenInvocationException;
+import org.junit.jupiter.api.Test;
+
+@DisableForNative
+public class UberJarQuarkusIntegrationTestIT extends QuarkusITBase {
+
+    @Test
+    public void testFastJar() throws MavenInvocationException, IOException {
+        doTest("qit-uber-jar", "uberjar");
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/bom_application_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/bom_application_pom.xml
new file mode 100644
index 0000000000000..963e10748ca88
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/bom_application_pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>fake-quarkus-parent</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>fake-quarkus-bom</artifactId>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.acme</groupId>
+                <artifactId>quarkus-my-ext</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.acme</groupId>
+                <artifactId>quarkus-my-ext-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/dir-tree.snapshot b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/dir-tree.snapshot
new file mode 100644
index 0000000000000..00914409beef8
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/dir-tree.snapshot
@@ -0,0 +1,60 @@
+/
+bom/
+bom/application/
+bom/application/pom.xml
+integration-tests/
+integration-tests/my-ext/
+integration-tests/my-ext/pom.xml
+integration-tests/my-ext/src/
+integration-tests/my-ext/src/test/
+integration-tests/my-ext/src/test/java/
+integration-tests/my-ext/src/test/java/org/
+integration-tests/my-ext/src/test/java/org/acme/
+integration-tests/my-ext/src/test/java/org/acme/my/
+integration-tests/my-ext/src/test/java/org/acme/my/ext/
+integration-tests/my-ext/src/test/java/org/acme/my/ext/it/
+integration-tests/my-ext/src/test/java/org/acme/my/ext/it/NativeMyExtResourceIT.java
+integration-tests/my-ext/src/test/java/org/acme/my/ext/it/MyExtResourceTest.java
+integration-tests/my-ext/src/main/
+integration-tests/my-ext/src/main/resources/
+integration-tests/my-ext/src/main/resources/application.properties
+integration-tests/my-ext/src/main/java/
+integration-tests/my-ext/src/main/java/org/
+integration-tests/my-ext/src/main/java/org/acme/
+integration-tests/my-ext/src/main/java/org/acme/my/
+integration-tests/my-ext/src/main/java/org/acme/my/ext/
+integration-tests/my-ext/src/main/java/org/acme/my/ext/it/
+integration-tests/my-ext/src/main/java/org/acme/my/ext/it/MyExtResource.java
+integration-tests/pom.xml
+pom.xml
+extensions/
+extensions/my-ext/
+extensions/my-ext/runtime/
+extensions/my-ext/runtime/pom.xml
+extensions/my-ext/runtime/src/
+extensions/my-ext/runtime/src/main/
+extensions/my-ext/runtime/src/main/resources/
+extensions/my-ext/runtime/src/main/resources/META-INF/
+extensions/my-ext/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+extensions/my-ext/pom.xml
+extensions/my-ext/deployment/
+extensions/my-ext/deployment/pom.xml
+extensions/my-ext/deployment/src/
+extensions/my-ext/deployment/src/test/
+extensions/my-ext/deployment/src/test/java/
+extensions/my-ext/deployment/src/test/java/org/
+extensions/my-ext/deployment/src/test/java/org/acme/
+extensions/my-ext/deployment/src/test/java/org/acme/my/
+extensions/my-ext/deployment/src/test/java/org/acme/my/ext/
+extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/
+extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
+extensions/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
+extensions/my-ext/deployment/src/main/
+extensions/my-ext/deployment/src/main/java/
+extensions/my-ext/deployment/src/main/java/org/
+extensions/my-ext/deployment/src/main/java/org/acme/
+extensions/my-ext/deployment/src/main/java/org/acme/my/
+extensions/my-ext/deployment/src/main/java/org/acme/my/ext/
+extensions/my-ext/deployment/src/main/java/org/acme/my/ext/deployment/
+extensions/my-ext/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java
+extensions/pom.xml
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_pom.xml
new file mode 100644
index 0000000000000..5e79f7f310a9a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/extensions_pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>fake-quarkus-parent</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>extensions-parent</artifactId>
+
+    <packaging>pom</packaging>
+    <modules>
+        <module>my-ext</module>
+    </modules>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/integration-tests_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/integration-tests_pom.xml
new file mode 100644
index 0000000000000..290f8d60bff9c
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateCoreExtension/integration-tests_pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>fake-quarkus-parent</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>integration-tests-parent</artifactId>
+
+    <packaging>pom</packaging>
+    <modules>
+        <module>my-ext</module>
+    </modules>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/dir-tree.snapshot b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/dir-tree.snapshot
new file mode 100644
index 0000000000000..a928e5e7d1a77
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/dir-tree.snapshot
@@ -0,0 +1,77 @@
+/
+quarkus-my-quarki-ext/
+quarkus-my-quarki-ext/LICENSE
+quarkus-my-quarki-ext/runtime/
+quarkus-my-quarki-ext/runtime/pom.xml
+quarkus-my-quarki-ext/runtime/src/
+quarkus-my-quarki-ext/runtime/src/main/
+quarkus-my-quarki-ext/runtime/src/main/resources/
+quarkus-my-quarki-ext/runtime/src/main/resources/META-INF/
+quarkus-my-quarki-ext/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+quarkus-my-quarki-ext/integration-tests/
+quarkus-my-quarki-ext/integration-tests/pom.xml
+quarkus-my-quarki-ext/integration-tests/src/
+quarkus-my-quarki-ext/integration-tests/src/test/
+quarkus-my-quarki-ext/integration-tests/src/test/java/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResourceTest.java
+quarkus-my-quarki-ext/integration-tests/src/test/java/io/quarkiverse/my/quarki/ext/it/NativeMyQuarkiExtResourceIT.java
+quarkus-my-quarki-ext/integration-tests/src/main/
+quarkus-my-quarki-ext/integration-tests/src/main/resources/
+quarkus-my-quarki-ext/integration-tests/src/main/resources/application.properties
+quarkus-my-quarki-ext/integration-tests/src/main/java/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/it/
+quarkus-my-quarki-ext/integration-tests/src/main/java/io/quarkiverse/my/quarki/ext/it/MyQuarkiExtResource.java
+quarkus-my-quarki-ext/pom.xml
+quarkus-my-quarki-ext/docs/
+quarkus-my-quarki-ext/docs/antora.yml
+quarkus-my-quarki-ext/docs/modules/
+quarkus-my-quarki-ext/docs/modules/ROOT/
+quarkus-my-quarki-ext/docs/modules/ROOT/nav.adoc
+quarkus-my-quarki-ext/docs/modules/ROOT/pages/
+quarkus-my-quarki-ext/docs/modules/ROOT/pages/config.adoc
+quarkus-my-quarki-ext/docs/modules/ROOT/pages/index.adoc
+quarkus-my-quarki-ext/README.md
+quarkus-my-quarki-ext/.gitignore
+quarkus-my-quarki-ext/deployment/
+quarkus-my-quarki-ext/deployment/pom.xml
+quarkus-my-quarki-ext/deployment/src/
+quarkus-my-quarki-ext/deployment/src/test/
+quarkus-my-quarki-ext/deployment/src/test/java/
+quarkus-my-quarki-ext/deployment/src/test/java/io/
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/MyQuarkiExtTest.java
+quarkus-my-quarki-ext/deployment/src/test/java/io/quarkiverse/my/quarki/ext/test/MyQuarkiExtDevModeTest.java
+quarkus-my-quarki-ext/deployment/src/main/
+quarkus-my-quarki-ext/deployment/src/main/java/
+quarkus-my-quarki-ext/deployment/src/main/java/io/
+quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/
+quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/my/
+quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/my/quarki/
+quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/my/quarki/ext/
+quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/my/quarki/ext/deployment/
+quarkus-my-quarki-ext/deployment/src/main/java/io/quarkiverse/my/quarki/ext/deployment/MyQuarkiExtProcessor.java
+quarkus-my-quarki-ext/.github/
+quarkus-my-quarki-ext/.github/project.yml
+quarkus-my-quarki-ext/.github/workflows/
+quarkus-my-quarki-ext/.github/workflows/release.yml
+quarkus-my-quarki-ext/.github/workflows/quarkus-snapshot.yaml
+quarkus-my-quarki-ext/.github/workflows/pre-release.yml
+quarkus-my-quarki-ext/.github/workflows/build.yml
+quarkus-my-quarki-ext/.github/release/
+quarkus-my-quarki-ext/.github/release/maven-settings.xml.gpg
+quarkus-my-quarki-ext/.github/dependabot.yml
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarki-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarki-ext_pom.xml
new file mode 100644
index 0000000000000..c0378ca326177
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarki-ext_pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.quarkiverse</groupId>
+    <artifactId>quarkiverse-parent</artifactId>
+    <version>6</version>
+  </parent>
+  <groupId>io.quarkiverse.my-quarki-ext</groupId>
+  <artifactId>quarkus-my-quarki-ext-parent</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Quarkus - My Quarki Ext - Parent</name>
+  <modules>
+    <module>deployment</module>
+    <module>runtime</module>
+  </modules>
+  <properties>
+    <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <quarkus.version>1.10.5.Final</quarkus.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${quarkus.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-maven-plugin</artifactId>
+          <version>${quarkus.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler-plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <profiles>
+    <profile>
+      <id>it</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>!true</value>
+        </property>
+      </activation>
+      <modules>
+        <module>integration-tests</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarki-ext_runtime_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarki-ext_runtime_pom.xml
new file mode 100644
index 0000000000000..05d4cb9e16e3c
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarki-ext_runtime_pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.quarkiverse.my-quarki-ext</groupId>
+    <artifactId>quarkus-my-quarki-ext-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>quarkus-my-quarki-ext</artifactId>
+  <name>Quarkus - My Quarki Ext - Runtime</name>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <version>${quarkus.version}</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>extension-descriptor</goal>
+            </goals>
+            <configuration>
+              <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.quarkus</groupId>
+              <artifactId>quarkus-extension-processor</artifactId>
+              <version>${quarkus.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/dir-tree.snapshot b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/dir-tree.snapshot
new file mode 100644
index 0000000000000..ea2af9381dd39
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/dir-tree.snapshot
@@ -0,0 +1,56 @@
+/
+my-org-my-own-ext/
+my-org-my-own-ext/runtime/
+my-org-my-own-ext/runtime/pom.xml
+my-org-my-own-ext/runtime/src/
+my-org-my-own-ext/runtime/src/main/
+my-org-my-own-ext/runtime/src/main/resources/
+my-org-my-own-ext/runtime/src/main/resources/META-INF/
+my-org-my-own-ext/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+my-org-my-own-ext/integration-tests/
+my-org-my-own-ext/integration-tests/pom.xml
+my-org-my-own-ext/integration-tests/src/
+my-org-my-own-ext/integration-tests/src/test/
+my-org-my-own-ext/integration-tests/src/test/java/
+my-org-my-own-ext/integration-tests/src/test/java/io/
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/own/
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/own/ext/
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/own/ext/it/
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/own/ext/it/MyOwnExtResourceTest.java
+my-org-my-own-ext/integration-tests/src/test/java/io/standalone/my/own/ext/it/NativeMyOwnExtResourceIT.java
+my-org-my-own-ext/integration-tests/src/main/
+my-org-my-own-ext/integration-tests/src/main/resources/
+my-org-my-own-ext/integration-tests/src/main/resources/application.properties
+my-org-my-own-ext/integration-tests/src/main/java/
+my-org-my-own-ext/integration-tests/src/main/java/io/
+my-org-my-own-ext/integration-tests/src/main/java/io/standalone/
+my-org-my-own-ext/integration-tests/src/main/java/io/standalone/my/
+my-org-my-own-ext/integration-tests/src/main/java/io/standalone/my/own/
+my-org-my-own-ext/integration-tests/src/main/java/io/standalone/my/own/ext/
+my-org-my-own-ext/integration-tests/src/main/java/io/standalone/my/own/ext/it/
+my-org-my-own-ext/integration-tests/src/main/java/io/standalone/my/own/ext/it/MyOwnExtResource.java
+my-org-my-own-ext/pom.xml
+my-org-my-own-ext/deployment/
+my-org-my-own-ext/deployment/pom.xml
+my-org-my-own-ext/deployment/src/
+my-org-my-own-ext/deployment/src/test/
+my-org-my-own-ext/deployment/src/test/java/
+my-org-my-own-ext/deployment/src/test/java/io/
+my-org-my-own-ext/deployment/src/test/java/io/standalone/
+my-org-my-own-ext/deployment/src/test/java/io/standalone/my/
+my-org-my-own-ext/deployment/src/test/java/io/standalone/my/own/
+my-org-my-own-ext/deployment/src/test/java/io/standalone/my/own/ext/
+my-org-my-own-ext/deployment/src/test/java/io/standalone/my/own/ext/test/
+my-org-my-own-ext/deployment/src/test/java/io/standalone/my/own/ext/test/MyOwnExtDevModeTest.java
+my-org-my-own-ext/deployment/src/test/java/io/standalone/my/own/ext/test/MyOwnExtTest.java
+my-org-my-own-ext/deployment/src/main/
+my-org-my-own-ext/deployment/src/main/java/
+my-org-my-own-ext/deployment/src/main/java/io/
+my-org-my-own-ext/deployment/src/main/java/io/standalone/
+my-org-my-own-ext/deployment/src/main/java/io/standalone/my/
+my-org-my-own-ext/deployment/src/main/java/io/standalone/my/own/
+my-org-my-own-ext/deployment/src/main/java/io/standalone/my/own/ext/
+my-org-my-own-ext/deployment/src/main/java/io/standalone/my/own/ext/deployment/
+my-org-my-own-ext/deployment/src/main/java/io/standalone/my/own/ext/deployment/MyOwnExtProcessor.java
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
new file mode 100644
index 0000000000000..81bdae266ca17
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.standalone</groupId>
+  <artifactId>my-org-my-own-ext-parent</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>My Org - My Own Ext - Parent</name>
+  <modules>
+    <module>deployment</module>
+    <module>runtime</module>
+  </modules>
+  <properties>
+    <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <quarkus.version>1.10.5.Final</quarkus.version>
+    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${quarkus.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>io.quarkus</groupId>
+          <artifactId>quarkus-maven-plugin</artifactId>
+          <version>${quarkus.version}</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire-plugin.version}</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+              <maven.home>${maven.home}</maven.home>
+              <maven.repo>${settings.localRepository}</maven.repo>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>${failsafe-plugin.version}</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+              <maven.home>${maven.home}</maven.home>
+              <maven.repo>${settings.localRepository}</maven.repo>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${compiler-plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_runtime_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_runtime_pom.xml
new file mode 100644
index 0000000000000..911d9ed985012
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_runtime_pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.standalone</groupId>
+    <artifactId>my-org-my-own-ext-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>my-org-my-own-ext</artifactId>
+  <name>My Org - My Own Ext - Runtime</name>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <version>${quarkus.version}</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>extension-descriptor</goal>
+            </goals>
+            <configuration>
+              <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.quarkus</groupId>
+              <artifactId>quarkus-extension-processor</artifactId>
+              <version>${quarkus.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
index 7addb97771c1e..fa56ac1dcad9a 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>my-project-add-to-bom</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java
new file mode 100644
index 0000000000000..7b4e92a348f2d
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.my.project.add.to.bom.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class AddToBomDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java
new file mode 100644
index 0000000000000..db18f37a01516
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/deployment/src/test/java/org/acme/my/project/add/to/bom/test/AddToBomTest.java
@@ -0,0 +1,23 @@
+package org.acme.my.project.add.to.bom.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class AddToBomTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml
index d2f1abbac5539..a1c3488f00065 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-add-to-bom/add-to-bom/pom.xml
@@ -7,7 +7,6 @@
         <groupId>org.acme</groupId>
         <artifactId>grand-parent</artifactId>
         <version>0.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>my-project-add-to-bom-parent</artifactId>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
index b860ec1b77cad..79bc41b6ba3df 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/pom.xml
@@ -64,6 +64,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -92,28 +95,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                    <enableReports>false</enableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java
index f019cbd783ef0..bc98dd59f27d2 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/integration-tests/itest/src/main/java/org/acme/my/project/itest/it/ItestResource.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/pom.xml
index d5c94a8c44610..ce4be68dadac5 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>my-project-itest</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java
new file mode 100644
index 0000000000000..5890739d62939
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.my.project.itest.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class ItestDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java
new file mode 100644
index 0000000000000..e360eb2280e9b
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/deployment/src/test/java/org/acme/my/project/itest/test/ItestTest.java
@@ -0,0 +1,23 @@
+package org.acme.my.project.itest.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class ItestTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/pom.xml
index 1df06faf34efa..b616ded9ae643 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-itest/itest/pom.xml
@@ -7,7 +7,6 @@
         <groupId>org.acme</groupId>
         <artifactId>grand-parent</artifactId>
         <version>0.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>my-project-itest-parent</artifactId>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
index 78ec5cab8eb8c..931dbb24fe833 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>my-project-minimal-extension</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java
new file mode 100644
index 0000000000000..c6294029a5d7a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.my.project.minimal.extension.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class MinimalExtensionDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java
new file mode 100644
index 0000000000000..3d93606a05ef4
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/deployment/src/test/java/org/acme/my/project/minimal/extension/test/MinimalExtensionTest.java
@@ -0,0 +1,23 @@
+package org.acme.my.project.minimal.extension.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class MinimalExtensionTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/pom.xml
index 7fc75abe49330..b93dc4575c3ae 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-minimal/minimal-extension/pom.xml
@@ -7,7 +7,6 @@
         <groupId>org.acme</groupId>
         <artifactId>grand-parent</artifactId>
         <version>0.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>my-project-minimal-extension-parent</artifactId>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
index 217c13e781115..a85d566741f13 100644
--- a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/pom.xml
@@ -22,6 +22,11 @@
             <groupId>org.acme</groupId>
             <artifactId>myproject-with-grand-parent</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java
new file mode 100644
index 0000000000000..9786b73a468d7
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.myproject.with.grand.parent.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class WithGrandParentDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java
new file mode 100644
index 0000000000000..11a4d78fbd353
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/create-extension-pom-with-grand-parent/with-grand-parent/deployment/src/test/java/org/acme/myproject/with/grand/parent/test/WithGrandParentTest.java
@@ -0,0 +1,23 @@
+package org.acme.myproject.with.grand.parent.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class WithGrandParentTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/pom.xml
new file mode 100644
index 0000000000000..9650c557d75f0
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>my-ext-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>my-ext-deployment</artifactId>
+    <name>My Ext - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.acme</groupId>
+            <artifactId>my-ext</artifactId>
+            <version>\${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java
new file mode 100644
index 0000000000000..0b9fa976adcc4
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java
@@ -0,0 +1,15 @@
+package org.acme.my.ext.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+class MyExtProcessor {
+
+    private static final String FEATURE = "my-ext";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
new file mode 100644
index 0000000000000..d1a5fb8fc7603
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.my.ext.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class MyExtDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
new file mode 100644
index 0000000000000..71ed95323e1d2
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
@@ -0,0 +1,23 @@
+package org.acme.my.ext.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class MyExtTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/pom.xml
new file mode 100644
index 0000000000000..30b3da1b2e542
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.acme</groupId>
+    <artifactId>my-ext-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>My Ext - Parent</name>
+
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+        <quarkus.version>${project.version}</quarkus.version>
+        <compiler-plugin.version>${compiler-plugin.version}</compiler-plugin.version>
+    </properties>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom</artifactId>
+                <version>${quarkus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>\${compiler-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/runtime/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/runtime/pom.xml
new file mode 100644
index 0000000000000..a38543d99a911
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-current-directory-project/runtime/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>my-ext-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>my-ext</artifactId>
+    <name>My Ext - Runtime</name>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <version>${quarkus.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <deployment>\${project.groupId}:\${project.artifactId}-deployment:\${project.version}
+                            </deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml
new file mode 100644
index 0000000000000..9650c557d75f0
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>my-ext-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>my-ext-deployment</artifactId>
+    <name>My Ext - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.acme</groupId>
+            <artifactId>my-ext</artifactId>
+            <version>\${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java
new file mode 100644
index 0000000000000..0b9fa976adcc4
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/main/java/org/acme/my/ext/deployment/MyExtProcessor.java
@@ -0,0 +1,15 @@
+package org.acme.my.ext.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+class MyExtProcessor {
+
+    private static final String FEATURE = "my-ext";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
new file mode 100644
index 0000000000000..d1a5fb8fc7603
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.my.ext.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class MyExtDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
new file mode 100644
index 0000000000000..71ed95323e1d2
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
@@ -0,0 +1,23 @@
+package org.acme.my.ext.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class MyExtTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml
new file mode 100644
index 0000000000000..5dcdb6b841167
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>37</version>
+    </parent>
+
+    <groupId>org.acme</groupId>
+    <artifactId>my-ext-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>My Ext - Parent</name>
+
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+        <quarkus.version>${project.version}</quarkus.version>
+        <compiler-plugin.version>${compiler-plugin.version}</compiler-plugin.version>
+    </properties>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom</artifactId>
+                <version>${quarkus.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>\${compiler-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/runtime/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/runtime/pom.xml
new file mode 100644
index 0000000000000..a38543d99a911
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project-with-jboss-parent/my-ext/runtime/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>my-ext-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>my-ext</artifactId>
+    <name>My Ext - Runtime</name>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <version>${quarkus.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <deployment>\${project.groupId}:\${project.artifactId}-deployment:\${project.version}
+                            </deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/pom.xml b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/pom.xml
index 6ee59f6e8843f..9650c557d75f0 100644
--- a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/pom.xml
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>my-ext</artifactId>
             <version>\${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
new file mode 100644
index 0000000000000..d1a5fb8fc7603
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtDevModeTest.java
@@ -0,0 +1,22 @@
+package org.acme.my.ext.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class MyExtDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest devModeTest = new QuarkusDevModeTest() // Start hot reload (DevMode) test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-hot-reload for more information
+        Assertions.fail("Add dev mode assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
new file mode 100644
index 0000000000000..71ed95323e1d2
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/expected/new-extension-project/my-ext/deployment/src/test/java/org/acme/my/ext/test/MyExtTest.java
@@ -0,0 +1,23 @@
+package org.acme.my.ext.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+class MyExtTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest() // Start unit test with your extension loaded
+        .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Test
+    public void test() {
+        // Write your tests here - see the testing extension guide https://quarkus.io/guides/writing-extensions#testing-extensions for more information
+        Assertions.fail("Add some assertions to " + getClass().getName());
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/library/pom.xml b/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/library/pom.xml
index 4802625d1a52f..ab609c4dbd981 100644
--- a/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/library/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/library/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-lib</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/runner/pom.xml
index a03607022f9cd..825178aa02241 100644
--- a/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/arc-exclude-dependencies/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>acme</artifactId>
@@ -69,6 +68,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -78,21 +80,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/basic-command-mode/pom.xml b/integration-tests/maven/src/test/resources/projects/basic-command-mode/pom.xml
new file mode 100644
index 0000000000000..a716a84707e19
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/basic-command-mode/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>basic-command-mode</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/basic-command-mode/src/main/java/org/acme/Main.java b/integration-tests/maven/src/test/resources/projects/basic-command-mode/src/main/java/org/acme/Main.java
new file mode 100644
index 0000000000000..a81333404cc25
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/basic-command-mode/src/main/java/org/acme/Main.java
@@ -0,0 +1,25 @@
+package org.acme;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class Main implements QuarkusApplication {
+
+	@Override
+	public int run(String... args) throws Exception {
+		System.out.println("ARGS: " + Arrays.asList(args));
+		
+		final Path path = Paths.get("done.txt");
+		if(Files.exists(path)) {
+			Files.delete(path);
+		}
+		Files.createFile(path);
+		return 10;
+	}
+}
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/pom.xml b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/pom.xml
new file mode 100644
index 0000000000000..577af84b12b88
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus.profile>bar</quarkus.profile>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..a0db2386f1c56
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,22 @@
+package org.acme;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    HelloService service;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello, " + service.name();
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java
new file mode 100644
index 0000000000000..6fe83a9616388
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/java/org/acme/HelloService.java
@@ -0,0 +1,18 @@
+package org.acme;
+
+import io.quarkus.arc.profile.IfBuildProfile;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@IfBuildProfile("foo")
+@ApplicationScoped
+public class HelloService {
+
+    @ConfigProperty(name = "name")
+    String name;
+
+    public String name() {
+        return name;
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/resources/application.properties
new file mode 100644
index 0000000000000..7757ef9abfce0
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-override/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+name=from default
+%foo.name=from foo
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/pom.xml b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/pom.xml
new file mode 100644
index 0000000000000..7fd149d135062
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus.profile>foo</quarkus.profile>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..a0db2386f1c56
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,22 @@
+package org.acme;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    HelloService service;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello, " + service.name();
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java
new file mode 100644
index 0000000000000..6fe83a9616388
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/java/org/acme/HelloService.java
@@ -0,0 +1,18 @@
+package org.acme;
+
+import io.quarkus.arc.profile.IfBuildProfile;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@IfBuildProfile("foo")
+@ApplicationScoped
+public class HelloService {
+
+    @ConfigProperty(name = "name")
+    String name;
+
+    public String name() {
+        return name;
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/resources/application.properties
new file mode 100644
index 0000000000000..7757ef9abfce0
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/build-mode-quarkus-profile-property/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+name=from default
+%foo.name=from foo
diff --git a/integration-tests/maven/src/test/resources/projects/classic-inst/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-inst/pom.xml
new file mode 100644
index 0000000000000..15c1c3911fb3b
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-inst/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-context-propagation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-websockets</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.webjars</groupId>
+      <artifactId>bootstrap</artifactId>
+      <version>3.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..341f28dc2ba3e
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,58 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.UUID;
+
+@Path("/app")
+public class HelloResource {
+
+    static final UUID uuid;
+
+    static {
+        uuid = UUID.randomUUID();
+    }
+
+    private final HelloService resource;
+
+    @Inject
+    public HelloResource(HelloService resource) {
+        this.resource = resource;
+    }
+
+    @GET
+    @Path("hello")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+    @GET
+    @Path("name")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String name() {
+        return "hello " + resource.name();
+    }
+
+    @GET
+    @Path("uuid")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String uuid() {
+        return uuid.toString();
+    }
+
+    @GET
+    @Path("disable")
+    public void disable() {
+        System.setProperty("quarkus.live-reload.instrumentation", "false");
+    }
+
+    @GET
+    @Path("enable")
+    public void enable() {
+        System.setProperty("quarkus.live-reload.instrumentation","true");
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/java/org/acme/HelloService.java b/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/java/org/acme/HelloService.java
new file mode 100644
index 0000000000000..bfe7fc496c202
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/java/org/acme/HelloService.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import io.quarkus.runtime.StartupEvent;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+@ApplicationScoped
+public class HelloService {
+
+    public void start(@Observes StartupEvent startupEvent) {
+
+    }
+
+    public String name() {
+        return "Stuart";
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-java-src/src/main/resources/META-INF/resources/index.html b/integration-tests/maven/src/test/resources/projects/classic-inst/src/main/resources/META-INF/resources/index.html
similarity index 100%
rename from integration-tests/maven/src/test/resources/projects/classic-no-java-src/src/main/resources/META-INF/resources/index.html
rename to integration-tests/maven/src/test/resources/projects/classic-inst/src/main/resources/META-INF/resources/index.html
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-build/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-no-build/pom.xml
index 6976386173638..895ee47636978 100644
--- a/integration-tests/maven/src/test/resources/projects/classic-no-build/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic-no-build/pom.xml
@@ -34,11 +34,12 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow-websockets</artifactId>
+      <artifactId>quarkus-websockets</artifactId>
     </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>bootstrap</artifactId>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -63,25 +64,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-generate/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-no-generate/pom.xml
new file mode 100644
index 0000000000000..6117ed9227cb3
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-no-generate/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+            <nonFilteredFileExtensions>
+                <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+            </nonFilteredFileExtensions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..e05e3fc81410a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java
new file mode 100644
index 0000000000000..2b41cd0385afb
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/java/org/acme/MyApplication.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/app")
+public class MyApplication extends Application {
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/resources/META-INF/resources/index.html b/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..c09bb5c96b869
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic-no-generate/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>acme - 1.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme</li>
+                <li>ArtifactId: acme</li>
+                <li>Version: 1.0-SNAPSHOT</li>
+                <li>Quarkus Version: 999-SNAPSHOT</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <!-- the url have been erased on purpose -->
+                <li><a href="#">Setup your IDE</a></li>
+                <li><a href="#">Getting started</a></li>
+                <li><a href="#">Documentation</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-java-src/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-no-java-src/pom.xml
deleted file mode 100644
index 343f781e04deb..0000000000000
--- a/integration-tests/maven/src/test/resources/projects/classic-no-java-src/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.acme</groupId>
-  <artifactId>acme</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <properties>
-    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-    <quarkus.platform.version>@project.version@</quarkus.platform.version>
-    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${quarkus.platform.group-id}</groupId>
-        <artifactId>${quarkus.platform.artifact-id}</artifactId>
-        <version>${quarkus.platform.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <!-- insert test dependencies here -->
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow-websockets</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>bootstrap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${quarkus-plugin.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-undertow/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-no-undertow/pom.xml
index 848672dcee402..7e0b42e1e4caa 100644
--- a/integration-tests/maven/src/test/resources/projects/classic-no-undertow/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic-no-undertow/pom.xml
@@ -60,25 +60,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml
index 257c44679f716..1513eb40a52c6 100644
--- a/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml
@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow-websockets</artifactId>
+      <artifactId>quarkus-websockets</artifactId>
     </dependency>
     <!-- quarkus-logging-json dependency to make sure application start
  doesn't fail in dev mode due to classloading issues (see issue#7469) -->
@@ -43,6 +43,7 @@
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>bootstrap</artifactId>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -74,25 +75,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-remote-dev/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-remote-dev/pom.xml
index 849727dde1d96..7de99a0c2c379 100644
--- a/integration-tests/maven/src/test/resources/projects/classic-remote-dev/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic-remote-dev/pom.xml
@@ -34,11 +34,12 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow-websockets</artifactId>
+      <artifactId>quarkus-websockets</artifactId>
     </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>bootstrap</artifactId>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -75,25 +76,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic-resource-filtering/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-resource-filtering/pom.xml
index 7836b0aef409a..24b2178b081fa 100644
--- a/integration-tests/maven/src/test/resources/projects/classic-resource-filtering/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic-resource-filtering/pom.xml
@@ -76,25 +76,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic/pom.xml b/integration-tests/maven/src/test/resources/projects/classic/pom.xml
index 849727dde1d96..15c1c3911fb3b 100644
--- a/integration-tests/maven/src/test/resources/projects/classic/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic/pom.xml
@@ -34,11 +34,16 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow-websockets</artifactId>
+      <artifactId>quarkus-smallrye-context-propagation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-websockets</artifactId>
     </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>bootstrap</artifactId>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -65,6 +70,8 @@
         <executions>
           <execution>
             <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
               <goal>build</goal>
             </goals>
           </execution>
@@ -75,25 +82,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ClasspathResources.java b/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ClasspathResources.java
index 6f8beb61aa115..07e1106b5dc71 100644
--- a/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ClasspathResources.java
+++ b/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ClasspathResources.java
@@ -31,7 +31,8 @@ public String readClassPathResources() {
                 () -> assertInvalidExactFileLocation(),
                 () -> assertCorrectExactFileLocation(),
                 () -> assertInvalidDirectory(),
-                () -> assertCorrectDirectory()
+                () -> assertCorrectDirectory(),
+                () -> assertMultiRelease()
         );
     }
 
@@ -61,6 +62,24 @@ private String assertInvalidExactFileLocation() {
         }
     }
 
+    private String assertMultiRelease() {
+        final String testType = "assert-multi-release-jar";
+        if (System.getProperty("java.version").startsWith("1.")) {
+            return SUCCESS;
+        }
+        try {
+            //this class is only present in multi release jars
+            //for fast-jar we need to make sure it is loaded correctly
+            Class<?> clazz = this.getClass().getClassLoader().loadClass("io.smallrye.context.Jdk9CompletableFutureWrapper");
+            if (clazz.getClassLoader() == getClass().getClassLoader()) {
+                return SUCCESS;
+            }
+            return errorResult(testType, "Incorrect ClassLoader for " + clazz);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
     private String assertCorrectExactFileLocation() {
         final String testType = "correct-exact-location";
         try {
diff --git a/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ProtectionDomain.java b/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ProtectionDomain.java
new file mode 100644
index 0000000000000..1ff398c3bc262
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/classic/src/main/java/org/acme/ProtectionDomain.java
@@ -0,0 +1,77 @@
+package org.acme;
+
+import org.apache.commons.io.IOUtils;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.function.Supplier;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+
+@Path("/protectionDomain")
+public class ProtectionDomain {
+
+    private static final String SUCCESS = "success";
+
+    @GET
+    public String useProtectionDomain() {
+        return runAssertions(
+                () -> assertReadManifestFromJar()
+        );
+    }
+
+    private String runAssertions(Supplier<String>... assertions) {
+        String result;
+        for (Supplier<String> assertion : assertions) {
+            result = assertion.get();
+            if (!SUCCESS.equals(result)) {
+                return result;
+            }
+        }
+        return SUCCESS;
+    }
+
+    private String assertReadManifestFromJar() {
+        final String testType = "manifest-from-jar";
+        try {
+            URL location = org.apache.commons.io.Charsets.class.getProtectionDomain().getCodeSource().getLocation();
+            if (location == null) {
+                return errorResult(testType, "location should not be null");
+            }
+
+            try (InputStream inputStream = location.openStream()) {
+                try (JarInputStream jarInputStream = new JarInputStream(inputStream)) {
+                    Manifest manifest = jarInputStream.getManifest();
+                    if (manifest == null) {
+                        return errorResult(testType, "manifest should not be null");
+                    }
+                    String implementationVersion = manifest.getMainAttributes().getValue("Implementation-Version");
+                    if (implementationVersion == null) {
+                        return errorResult(testType, "implementation-version should not be null");
+                    }
+                }
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+
+    private String errorResult(String testType, String message) {
+        return testType + " / " + message;
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml b/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml
new file mode 100644
index 0000000000000..9cf6bf6a2c247
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>basic-command-mode</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <quarkus.package.type>uber-jar</quarkus.package.type>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <argsString>plugin pom config</argsString> <!-- dev goal parameter -->
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/src/main/java/org/acme/Main.java b/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/src/main/java/org/acme/Main.java
new file mode 100644
index 0000000000000..a81333404cc25
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/command-mode-app-args-plugin-config/src/main/java/org/acme/Main.java
@@ -0,0 +1,25 @@
+package org.acme;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+
+import io.quarkus.runtime.QuarkusApplication;
+import io.quarkus.runtime.annotations.QuarkusMain;
+
+@QuarkusMain
+public class Main implements QuarkusApplication {
+
+	@Override
+	public int run(String... args) throws Exception {
+		System.out.println("ARGS: " + Arrays.asList(args));
+		
+		final Path path = Paths.get("done.txt");
+		if(Files.exists(path)) {
+			Files.delete(path);
+		}
+		Files.createFile(path);
+		return 10;
+	}
+}
diff --git a/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/bom/application/pom.xml b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/bom/application/pom.xml
new file mode 100644
index 0000000000000..a89664e5971e5
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/bom/application/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>fake-quarkus-parent</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>fake-quarkus-bom</artifactId>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/extensions/pom.xml b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/extensions/pom.xml
new file mode 100644
index 0000000000000..a2f1a9ca25a3b
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/extensions/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>fake-quarkus-parent</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>extensions-parent</artifactId>
+
+    <packaging>pom</packaging>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/integration-tests/pom.xml b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/integration-tests/pom.xml
new file mode 100644
index 0000000000000..902753886980b
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/integration-tests/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>fake-quarkus-parent</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>integration-tests-parent</artifactId>
+
+    <packaging>pom</packaging>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/pom.xml b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/pom.xml
new file mode 100644
index 0000000000000..2f75386e90fd0
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/create-extension-quarkus-core/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>37</version>
+    </parent>
+
+    <groupId>org.acme</groupId>
+    <artifactId>fake-quarkus-parent</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <properties>
+        <rest-assured.version>3.3.0</rest-assured.version>
+        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    </properties>
+
+    <modules>
+        <module>bom/application</module>
+        <module>integration-tests</module>
+        <module>extensions</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bom</artifactId>
+                <version>1.10.3.Final</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${compiler-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/dependency-on-pom/pom.xml b/integration-tests/maven/src/test/resources/projects/dependency-on-pom/pom.xml
new file mode 100644
index 0000000000000..cc54ead2583f8
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dependency-on-pom/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- It happens quite often that POM files are found among the project's dependencies -->
+    <dependency>
+      <groupId>${quarkus.platform.group-id}</groupId>
+      <artifactId>${quarkus.platform.artifact-id}</artifactId>
+      <version>${quarkus.platform.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..e05e3fc81410a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dependency-on-pom/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/dependency-on-pom/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/dependency-on-pom/src/main/resources/application.properties
new file mode 100644
index 0000000000000..ad54b1b7740c6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dependency-on-pom/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+# Configuration file
+quarkus.package.type=mutable-jar
+quarkus.live-reload.password=secret
diff --git a/integration-tests/maven/src/test/resources/projects/dev-mode-env-vars-config/pom.xml b/integration-tests/maven/src/test/resources/projects/dev-mode-env-vars-config/pom.xml
new file mode 100644
index 0000000000000..4584d50b28179
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dev-mode-env-vars-config/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <environmentVariables>
+            <VAR>WORLD</VAR>
+          </environmentVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..ce1b38ba72d71
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dev-mode-env-vars-config/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello, " + System.getenv("VAR");
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/dev-mode-sys-props-config/pom.xml b/integration-tests/maven/src/test/resources/projects/dev-mode-sys-props-config/pom.xml
new file mode 100644
index 0000000000000..bd02cfc8571be
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dev-mode-sys-props-config/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <systemProperties>
+            <prop>out there</prop>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..dc1e6a12d0ca6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/dev-mode-sys-props-config/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello, " + System.getProperty("prop");
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml b/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml
index 248df4d59f14b..d1fdbfd9bd357 100644
--- a/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/ignore-entries-uber-jar/pom.xml
@@ -13,6 +13,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <quarkus.package.type>uber-jar</quarkus.package.type>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -44,7 +45,6 @@
         <artifactId>quarkus-maven-plugin</artifactId>
         <version>${quarkus-plugin.version}</version>
         <configuration>
-          <uberJar>true</uberJar>
           <ignoredEntries>
             <ignoredEntry>META-INF/swagger-ui-files/swagger-ui-bundle.js.map</ignoredEntry>
             <ignoredEntry>META-INF/swagger-ui-files/swagger-ui-standalone-preset.js.map</ignoredEntry>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-classpath/html/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-classpath/html/pom.xml
index 3889e12cb03dd..6a962aaa9f23d 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-classpath/html/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-classpath/html/pom.xml
@@ -6,7 +6,6 @@
         <groupId>cp.acme</groupId>
         <artifactId>multimodule-cp-resources</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>multimodule-cp-resources-html</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-classpath/rest/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-classpath/rest/pom.xml
index 82eda2b9ae6f9..d0345993dbb00 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-classpath/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-classpath/rest/pom.xml
@@ -6,7 +6,6 @@
         <groupId>cp.acme</groupId>
         <artifactId>multimodule-cp-resources</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>multimodule-cp-resources-rest</artifactId>
     <version>1.0-SNAPSHOT</version>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-classpath/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-classpath/runner/pom.xml
index 0a05f1fa537b1..0f02a6c8dfa40 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-classpath/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-classpath/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>cp.acme</groupId>
         <artifactId>multimodule-cp-resources</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>multimodule-cp-resources-main</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -72,6 +71,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -81,21 +83,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level1/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level1/pom.xml
index 5e6fe8fcaec72..d50aa4961d352 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level1/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level1/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-quickstart-multimodule-level1</artifactId>
 
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/pom.xml
index b421c751ac8cf..81d481d15fd57 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-quickstart-multimodule-level2</artifactId>
     <packaging>pom</packaging>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/submodule/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/submodule/pom.xml
index 200cb27aa81ba..afd9ba2bd3f15 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/submodule/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/level2/submodule/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-level2</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-quickstart-multimodule-level2-submodule</artifactId>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/runner/pom.xml
index d809377cdd56c..5cbda16d7352f 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-parent-dep/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-quickstart-multimodule-runner</artifactId>
 
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/html/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/html/pom.xml
index 25466ca24bc4d..169789fcb8a48 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/html/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/html/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-quickstart-multimodule-html</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/rest/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/rest/pom.xml
index 50f0fad93225f..492f951bb1f64 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/rest/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-quickstart-multimodule-rest</artifactId>
 
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/runner/pom.xml
index 8ada2f0e165d8..65e62c2095167 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-revision-prop/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>${revision}</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-quickstart-multimodule-main</artifactId>
 
@@ -71,6 +70,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -80,21 +82,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/html/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/html/pom.xml
index 7ab25c5ed108c..4e2ff8c280cf8 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/html/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/html/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <groupId>org.acme</groupId>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/rest/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/rest/pom.xml
index b809a335a98b9..c7e866c380673 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/rest/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-rest</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/runner/pom.xml
index 4d81692797b79..af140c1268ac4 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule-root-no-src/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-main</artifactId>
@@ -73,6 +72,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -82,21 +84,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule/html/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule/html/pom.xml
index 7ab25c5ed108c..4e2ff8c280cf8 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule/html/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule/html/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <groupId>org.acme</groupId>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule/rest/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule/rest/pom.xml
index b841562cf3f4b..83b54ac3f97cf 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule/rest/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule/rest/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-rest</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/multimodule/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/multimodule/runner/pom.xml
index 4d81692797b79..af140c1268ac4 100644
--- a/integration-tests/maven/src/test/resources/projects/multimodule/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/multimodule/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-main</artifactId>
@@ -73,6 +72,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -82,21 +84,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/native-image-app/pom.xml b/integration-tests/maven/src/test/resources/projects/native-image-app/pom.xml
index 525c2d793a6bf..e6d3b557611c4 100644
--- a/integration-tests/maven/src/test/resources/projects/native-image-app/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/native-image-app/pom.xml
@@ -51,25 +51,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/parent-gradle-it/settings.gradle b/integration-tests/maven/src/test/resources/projects/parent-gradle-it/settings.gradle
new file mode 100644
index 0000000000000..ade69748e6915
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/parent-gradle-it/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'parent-gradle-project'
diff --git a/integration-tests/maven/src/test/resources/projects/parent-pom-it/pom.xml b/integration-tests/maven/src/test/resources/projects/parent-pom-it/pom.xml
new file mode 100644
index 0000000000000..bbebeecdefd73
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/parent-pom-it/pom.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.acme.it</groupId>
+  <artifactId>acme-parent-pom</artifactId>
+  <version>0.0.1.BUILD-SNAPSHOT</version>
+  <packaging>pom</packaging>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/pom.xml b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/pom.xml
new file mode 100644
index 0000000000000..68b6fb5df1ff0
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <parent>
+    <groupId>org.acme.quarkus.sample</groupId>
+    <artifactId>acme-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>acme-app</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>org.acme.quarkus.sample</groupId>
+      <artifactId>acme-extension</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <maven.home>${maven.home}</maven.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <maven.home>${maven.home}</maven.home>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java
new file mode 100644
index 0000000000000..01fc40fe4e929
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/main/java/org/acme/quarkus/sample/HelloResource.java
@@ -0,0 +1,22 @@
+package org.acme.quarkus.sample;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.acme.quarkus.sample.extension.ConfigReport;
+
+@Path("/hello")
+public class HelloResource {
+
+    @Inject
+    ConfigReport configReport;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "builder-image is " + configReport.builderImage;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/main/resources/application.properties
new file mode 100644
index 0000000000000..716b8d711192c
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.native.builder-image=customized
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/test/java/org/acme/quarkus/sample/HelloResourceTest.java b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/test/java/org/acme/quarkus/sample/HelloResourceTest.java
new file mode 100644
index 0000000000000..35914f8acaa97
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/app/src/test/java/org/acme/quarkus/sample/HelloResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme.quarkus.sample;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class HelloResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("builder-image is customized"));
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/deployment/pom.xml b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/deployment/pom.xml
new file mode 100644
index 0000000000000..dca2e7845f15d
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/deployment/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme.quarkus.sample</groupId>
+        <artifactId>acme-extension-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>acme-extension-deployment</artifactId>
+    <name>Acme Extension - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.acme.quarkus.sample</groupId>
+            <artifactId>acme-extension</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus-plugin.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java
new file mode 100644
index 0000000000000..b42e6c0676823
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/deployment/src/main/java/org/acme/quarkus/sample/extension/deployment/AcmeExtensionProcessor.java
@@ -0,0 +1,32 @@
+package org.acme.quarkus.sample.extension.deployment;
+
+import javax.inject.Singleton;
+
+import org.acme.quarkus.sample.extension.ConfigReport;
+import org.acme.quarkus.sample.extension.ConfigReportRecorder;
+
+import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.pkg.NativeConfig;
+
+class AcmeExtensionProcessor {
+
+    private static final String FEATURE = "acme-extension";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    SyntheticBeanBuildItem syntheticBean(ConfigReportRecorder recorder, NativeConfig nativeConfig) {
+       return SyntheticBeanBuildItem.configure(ConfigReport.class)
+    		   .scope(Singleton.class)
+    		   .runtimeValue(recorder.configReport(nativeConfig.builderImage))
+    		   .done();
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/pom.xml b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/pom.xml
new file mode 100644
index 0000000000000..4b4a6e8c9a945
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.acme.quarkus.sample</groupId>
+        <artifactId>acme-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>acme-extension-parent</artifactId>
+    <name>Acme Extension - Parent</name>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${compiler-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/pom.xml b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/pom.xml
new file mode 100644
index 0000000000000..f6b556a7f06eb
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme.quarkus.sample</groupId>
+        <artifactId>acme-extension-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>acme-extension</artifactId>
+    <name>Acme Extension - Runtime</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <version>${quarkus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <deployment>org.acme.quarkus.sample:acme-extension-deployment:1.0-SNAPSHOT</deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus-plugin.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/src/main/java/org/acme/quarkus/sample/extension/ConfigReport.java b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/src/main/java/org/acme/quarkus/sample/extension/ConfigReport.java
new file mode 100644
index 0000000000000..957cfde80288a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/src/main/java/org/acme/quarkus/sample/extension/ConfigReport.java
@@ -0,0 +1,11 @@
+package org.acme.quarkus.sample.extension;
+
+
+public class ConfigReport {
+
+	public final String builderImage;
+	
+	public ConfigReport(String builderImage) {
+		this.builderImage = builderImage;
+	}
+}
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/src/main/java/org/acme/quarkus/sample/extension/ConfigReportRecorder.java b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/src/main/java/org/acme/quarkus/sample/extension/ConfigReportRecorder.java
new file mode 100644
index 0000000000000..94a0ad6d2307e
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/ext/runtime/src/main/java/org/acme/quarkus/sample/extension/ConfigReportRecorder.java
@@ -0,0 +1,11 @@
+package org.acme.quarkus.sample.extension;
+
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+
+@Recorder
+public class ConfigReportRecorder {
+	public RuntimeValue<ConfigReport> configReport(String builderImage) {
+		return new RuntimeValue<>(new ConfigReport(builderImage));
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/pom.xml b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/pom.xml
new file mode 100644
index 0000000000000..a2d09f63e06dc
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/platform-properties-overrides/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme.quarkus.sample</groupId>
+  <artifactId>acme-parent</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <properties>
+    <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <surefire-plugin.version>2.22.1</surefire-plugin.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <modules>
+    <module>ext</module>
+    <module>app</module>
+  </modules>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/project-with-extension/common-transitive/pom.xml b/integration-tests/maven/src/test/resources/projects/project-with-extension/common-transitive/pom.xml
index e706da13da509..f91e0627c2cbb 100644
--- a/integration-tests/maven/src/test/resources/projects/project-with-extension/common-transitive/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/project-with-extension/common-transitive/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <groupId>org.acme</groupId>
diff --git a/integration-tests/maven/src/test/resources/projects/project-with-extension/common/pom.xml b/integration-tests/maven/src/test/resources/projects/project-with-extension/common/pom.xml
index d424aa8383d9c..386b8c583c607 100644
--- a/integration-tests/maven/src/test/resources/projects/project-with-extension/common/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/project-with-extension/common/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>acme-common</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/project-with-extension/library/pom.xml b/integration-tests/maven/src/test/resources/projects/project-with-extension/library/pom.xml
index 3797926934c24..00924ba037e02 100644
--- a/integration-tests/maven/src/test/resources/projects/project-with-extension/library/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/project-with-extension/library/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>acme-library</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/project-with-extension/quarkus-ext/runtime/pom.xml b/integration-tests/maven/src/test/resources/projects/project-with-extension/quarkus-ext/runtime/pom.xml
index 3ab8dfb27657d..82ae9cab0e8c7 100644
--- a/integration-tests/maven/src/test/resources/projects/project-with-extension/quarkus-ext/runtime/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/project-with-extension/quarkus-ext/runtime/pom.xml
@@ -18,6 +18,10 @@
             <groupId>org.acme</groupId>
             <artifactId>acme-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integration-tests/maven/src/test/resources/projects/project-with-extension/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/project-with-extension/runner/pom.xml
index 3e207238d9c49..2dd777c28e3f9 100644
--- a/integration-tests/maven/src/test/resources/projects/project-with-extension/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/project-with-extension/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-main</artifactId>
@@ -77,6 +76,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -86,21 +88,6 @@
                             <skipTests>\${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>\${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>\${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/property-overrides/bom/pom.xml b/integration-tests/maven/src/test/resources/projects/property-overrides/bom/pom.xml
index 3f58ccc8587e2..b9d79457eb3fe 100644
--- a/integration-tests/maven/src/test/resources/projects/property-overrides/bom/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/property-overrides/bom/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>acme-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>acme-bom</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/property-overrides/local-dep/pom.xml b/integration-tests/maven/src/test/resources/projects/property-overrides/local-dep/pom.xml
index 73d0101518789..d14d180efc353 100644
--- a/integration-tests/maven/src/test/resources/projects/property-overrides/local-dep/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/property-overrides/local-dep/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>acme-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>acme-local-dep</artifactId>
 
diff --git a/integration-tests/maven/src/test/resources/projects/property-overrides/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/property-overrides/runner/pom.xml
index 07230a5e5d411..2700d0feb3a02 100644
--- a/integration-tests/maven/src/test/resources/projects/property-overrides/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/property-overrides/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>acme-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <artifactId>acme-main</artifactId>
 
@@ -78,6 +77,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -87,21 +89,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/library/pom.xml b/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/library/pom.xml
index 4802625d1a52f..ab609c4dbd981 100644
--- a/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/library/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/library/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-lib</artifactId>
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/runner/pom.xml
index cb7f8bb5a3c0d..8e3c01448ccb3 100644
--- a/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/runner/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/quarkus-index-dependencies/runner/pom.xml
@@ -5,7 +5,6 @@
         <groupId>org.acme</groupId>
         <artifactId>quarkus-quickstart-multimodule-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <groupId>org.acme</groupId>
     <artifactId>quarkus-quickstart-multimodule-main</artifactId>
@@ -69,6 +68,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -78,21 +80,6 @@
                             <skipTests>${native.surefire.skip}</skipTests>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/pom.xml b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/pom.xml
new file mode 100644
index 0000000000000..cce3d911fa2e3
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>\${quarkus.platform.group-id}</groupId>
+        <artifactId>\${quarkus.platform.artifact-id}</artifactId>
+        <version>\${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>\${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare</goal>
+              <goal>prepare-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>\${surefire-plugin.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+            <maven.home>\${maven.home}</maven.home>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..42203e0efd1f5
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,17 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/resources/META-INF/resources/index.html b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..c09bb5c96b869
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>acme - 1.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme</li>
+                <li>ArtifactId: acme</li>
+                <li>Version: 1.0-SNAPSHOT</li>
+                <li>Quarkus Version: 999-SNAPSHOT</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <!-- the url have been erased on purpose -->
+                <li><a href="#">Setup your IDE</a></li>
+                <li><a href="#">Getting started</a></li>
+                <li><a href="#">Documentation</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/resources/application.properties
new file mode 100644
index 0000000000000..df8dadd355e85
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Configuration file
+quarkus.package.output-directory=custom-output-dir
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/test/java/org/acme/HelloResourceTest.java b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/test/java/org/acme/HelloResourceTest.java
new file mode 100644
index 0000000000000..5cd335c4f293f
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/quarkus.package.output-directory/src/test/java/org/acme/HelloResourceTest.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class HelloResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        given()
+          .when().get("/hello")
+          .then()
+             .statusCode(200)
+             .body(is("hello"));
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/reactive-routes/pom.xml b/integration-tests/maven/src/test/resources/projects/reactive-routes/pom.xml
new file mode 100644
index 0000000000000..a71844a234340
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/reactive-routes/pom.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.quarkus.quickstarts</groupId>
+    <artifactId>reactive-routes-quickstart</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <properties>
+        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <quarkus-plugin.version>999-SNAPSHOT</quarkus-plugin.version>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <awaitility.version>3.0.0</awaitility.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-jib</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-jib-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <maven.home>${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>fast-jar</id>
+            <activation>
+                <property>
+                    <name>fastjar</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>jar</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager
+                                        </java.util.logging.manager>
+                                        <maven.home>${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>legacy-jar</id>
+            <activation>
+                <property>
+                    <name>legacyjar</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>legacy-jar</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager
+                                        </java.util.logging.manager>
+                                        <maven.home>${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>uber-jar</id>
+            <activation>
+                <property>
+                    <name>uberjar</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>uber-jar</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager
+                                        </java.util.logging.manager>
+                                        <maven.home>${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java
new file mode 100644
index 0000000000000..42caa8d26028c
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyDeclarativeRoutes.java
@@ -0,0 +1,25 @@
+package org.acme.reactive.routes;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.vertx.web.Route;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class MyDeclarativeRoutes {
+
+    @Route(path = "/", methods = HttpMethod.GET)
+    public void handle(RoutingContext rc) {
+        rc.response().end("hello");
+    }
+
+    @Route(path = "/hello", methods = HttpMethod.GET)
+    public void greetings(RoutingContext rc) {
+        String name = rc.request().getParam("name");
+        if (name == null) {
+            name = "world";
+        }
+        rc.response().end("hello " + name);
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java
new file mode 100644
index 0000000000000..1e4c376525bba
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/main/java/org/acme/reactive/routes/MyFilter.java
@@ -0,0 +1,17 @@
+package org.acme.reactive.routes;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import io.quarkus.vertx.http.runtime.filters.Filters;
+
+@ApplicationScoped
+public class MyFilter {
+
+    public void registerMyFilter(@Observes Filters filters) {
+        filters.register(rc -> {
+            rc.response().putHeader("X-Header", "intercepting the request");
+            rc.next();
+        }, 100);
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/reactive-routes/src/test/java/org/acme/reactive/routes/RouteIT.java b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/test/java/org/acme/reactive/routes/RouteIT.java
new file mode 100644
index 0000000000000..c7c9ab9f63a20
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/test/java/org/acme/reactive/routes/RouteIT.java
@@ -0,0 +1,8 @@
+package org.acme.reactive.routes;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class RouteIT extends RouteTest {
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/reactive-routes/src/test/java/org/acme/reactive/routes/RouteTest.java b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/test/java/org/acme/reactive/routes/RouteTest.java
new file mode 100644
index 0000000000000..e1449dd769604
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/reactive-routes/src/test/java/org/acme/reactive/routes/RouteTest.java
@@ -0,0 +1,31 @@
+package org.acme.reactive.routes;
+
+import static org.hamcrest.core.Is.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class RouteTest {
+
+    @Test
+    public void testDeclarativeRoutes() {
+        RestAssured.get("/").then()
+                .header("X-Header", "intercepting the request")
+                .statusCode(200)
+                .body(is("hello"));
+
+        RestAssured.get("/hello").then()
+                .header("X-Header", "intercepting the request")
+                .statusCode(200)
+                .body(is("hello world"));
+
+        RestAssured.get("/hello?name=quarkus").then()
+                .header("X-Header", "intercepting the request")
+                .statusCode(200)
+                .body(is("hello quarkus"));
+    }
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/pom.xml b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/pom.xml
new file mode 100644
index 0000000000000..22d6d5dca21a6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.acme</groupId>
+    <artifactId>quarkus-extensions-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+        <quarkus.platform.version>@project.version@</quarkus.platform.version>
+        <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+    <modules>
+        <module>rest-client-custom-headers</module>
+        <module>runner</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>\${quarkus-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
+                <version>${quarkus.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.acme</groupId>
+                <artifactId>rest-client-custom-headers</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/deployment/pom.xml b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/deployment/pom.xml
new file mode 100644
index 0000000000000..0cccf718e385b
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/deployment/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>rest-client-custom-headers-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>rest-client-custom-headers-deployment</artifactId>
+    <name>Rest Client Custom Headers - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.acme</groupId>
+            <artifactId>rest-client-custom-headers</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>\${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/deployment/src/main/java/org/acme/deployment/ExtensionBuildStep.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/deployment/src/main/java/org/acme/deployment/ExtensionBuildStep.java
new file mode 100644
index 0000000000000..7044b472a7a5f
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/deployment/src/main/java/org/acme/deployment/ExtensionBuildStep.java
@@ -0,0 +1,24 @@
+package org.acme.deployment;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.restclient.deployment.RestClientAnnotationProviderBuildItem;
+import org.acme.CustomHeader1Filter;
+import org.acme.CustomHeader2Filter;
+
+
+public class ExtensionBuildStep {
+
+    @BuildStep
+    void registerProvider(BuildProducer<AdditionalBeanBuildItem> additionalBeans,
+            BuildProducer<RestClientAnnotationProviderBuildItem> restAnnotationProvider) {
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(CustomHeader1Filter.class));
+        additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(CustomHeader2Filter.class));
+        
+        restAnnotationProvider.produce(new RestClientAnnotationProviderBuildItem("org.acme.CustomHeader1",
+                CustomHeader1Filter.class));
+        restAnnotationProvider.produce(new RestClientAnnotationProviderBuildItem("org.acme.CustomHeader2",
+                CustomHeader2Filter.class));
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml
new file mode 100644
index 0000000000000..b623a23860d0a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>rest-client-custom-headers-parent</artifactId>
+    <name>Rest Client Custom Headers - Parent</name>
+
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.parameters>true</maven.compiler.parameters>
+        <quarkus.version>@project.version@</quarkus.version>
+        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    </properties>
+
+    <modules>
+        <module>runtime</module>
+        <module>deployment</module>
+    </modules>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>\${compiler-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/pom.xml b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/pom.xml
new file mode 100644
index 0000000000000..53e512ecc0416
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>rest-client-custom-headers-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>rest-client-custom-headers</artifactId>
+    <name>Rest Client Custom Headers - Runtime</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <version>\${quarkus.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <deployment>org.acme:rest-client-custom-headers-deployment:1.0-SNAPSHOT</deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>\${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1.java
new file mode 100644
index 0000000000000..d86abe91e51a8
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1.java
@@ -0,0 +1,13 @@
+package org.acme;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface CustomHeader1 {
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java
new file mode 100644
index 0000000000000..312dd854f53b6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader1Filter.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.inject.Singleton;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Singleton
+@Priority(Priorities.AUTHENTICATION)
+public class CustomHeader1Filter implements ClientRequestFilter {
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add("CustomHeader1", "CustomValue1");
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2.java
new file mode 100644
index 0000000000000..d51202b65f9d6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2.java
@@ -0,0 +1,13 @@
+package org.acme;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface CustomHeader2 {
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java
new file mode 100644
index 0000000000000..007ff31e966c7
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/rest-client-custom-headers/runtime/src/main/java/org/acme/CustomHeader2Filter.java
@@ -0,0 +1,21 @@
+package org.acme;
+
+import java.io.IOException;
+
+import javax.annotation.Priority;
+import javax.inject.Singleton;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Singleton
+@Priority(Priorities.AUTHENTICATION)
+public class CustomHeader2Filter implements ClientRequestFilter {
+
+    @Override
+    public void filter(ClientRequestContext requestContext) throws IOException {
+        requestContext.getHeaders().add("CustomHeader2", "CustomValue2");
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/pom.xml b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/pom.xml
new file mode 100644
index 0000000000000..c5085569b958f
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.acme</groupId>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.acme</groupId>
+    <artifactId>quarkus-extensions-main</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.acme</groupId>
+            <artifactId>rest-client-custom-headers</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>\${surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <maven.home>\${maven.home}</maven.home>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <version>${quarkus-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>\${native.surefire.skip}</skipTests>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>\${surefire-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>\${project.build.directory}/\${project.build.finalName}-runner</native.image.path>
+                                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                                        <maven.home>\${maven.home}</maven.home>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java
new file mode 100644
index 0000000000000..cf0fa28643af6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamService.java
@@ -0,0 +1,14 @@
+package org.acme;
+
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/downstream")
+public class DownstreamService {
+
+    @GET
+    public String getHeaders(@HeaderParam("CustomHeader1") String customHeader1, @HeaderParam("CustomHeader2") String customHeader2) {
+        return customHeader1 + " " + customHeader2;
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java
new file mode 100644
index 0000000000000..cb7593fc50209
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/DownstreamServiceClient.java
@@ -0,0 +1,18 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.acme.CustomHeader1;
+import org.acme.CustomHeader2;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@CustomHeader1
+@CustomHeader2
+@Path("/")
+public interface DownstreamServiceClient {
+
+    @GET
+    String getHeaders();
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java
new file mode 100644
index 0000000000000..640c18524440e
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/FrontendService.java
@@ -0,0 +1,19 @@
+package org.acme;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendService {
+    @Inject
+    @RestClient
+    DownstreamServiceClient client;
+
+    @GET
+    public String getHeaders() {
+        return client.getHeaders();
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..e05e3fc81410a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java
new file mode 100644
index 0000000000000..2b41cd0385afb
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/java/org/acme/MyApplication.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/app")
+public class MyApplication extends Application {
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/resources/META-INF/resources/index.html b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..b5da1d7d71f02
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>getting-started - 1.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native a is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/META-INF/microprofile-config.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme</li>
+                <li>ArtifactId: getting-started</li>
+                <li>Version: 1.0-SNAPSHOT</li>
+                <li>Quarkus Version: 0.11.0</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <li><a href="https://quarkus.io/guides/maven-tooling.html">Setup your IDE</a></li>
+                <li><a href="https://quarkus.io/guides/getting-started.html">Getting started</a></li>
+                <li><a href="https://quarkus.io">Quarkus Web Site</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/resources/application.properties
new file mode 100644
index 0000000000000..07ee2d7dd9084
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rest-client-custom-headers-extension/runner/src/main/resources/application.properties
@@ -0,0 +1 @@
+org.acme.DownstreamServiceClient/mp-rest/url=http://localhost:8080/app/downstream
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/.env b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/.env
new file mode 100644
index 0000000000000..98fb9ae1398c6
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/.env
@@ -0,0 +1 @@
+OTHER_GREETING=Hola
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/pom.xml b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/pom.xml
new file mode 100644
index 0000000000000..89ec901b7473b
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <!-- insert managed dependencies here -->
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- insert test dependencies here -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-reactive</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-logging-json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-context-propagation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java
new file mode 100644
index 0000000000000..07e1106b5dc71
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/ClasspathResources.java
@@ -0,0 +1,177 @@
+package org.acme;
+
+import org.apache.commons.io.IOUtils;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.function.Supplier;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+@Path("/classpathResources")
+public class ClasspathResources {
+
+    private static final String SUCCESS = "success";
+
+    @GET
+    public String readClassPathResources() {
+        return runAssertions(
+                () -> assertInvalidExactFileLocation(),
+                () -> assertCorrectExactFileLocation(),
+                () -> assertInvalidDirectory(),
+                () -> assertCorrectDirectory(),
+                () -> assertMultiRelease()
+        );
+    }
+
+    private String runAssertions(Supplier<String>... assertions) {
+        String result;
+        for (Supplier<String> assertion : assertions) {
+            result = assertion.get();
+            if (!SUCCESS.equals(result)) {
+                return result;
+            }
+        }
+        return SUCCESS;
+    }
+
+    private String assertInvalidExactFileLocation() {
+        final String testType = "invalid-exact-location";
+        try {
+            Enumeration<URL> exactFileLocationEnumeration = this.getClass().getClassLoader().getResources("db/location/test2.sql");
+            List<URL> exactFileLocationList = urlList(exactFileLocationEnumeration);
+            if (exactFileLocationList.size() != 0) {
+                return errorResult(testType, "wrong number of urls");
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+
+    private String assertMultiRelease() {
+        final String testType = "assert-multi-release-jar";
+        if (System.getProperty("java.version").startsWith("1.")) {
+            return SUCCESS;
+        }
+        try {
+            //this class is only present in multi release jars
+            //for fast-jar we need to make sure it is loaded correctly
+            Class<?> clazz = this.getClass().getClassLoader().loadClass("io.smallrye.context.Jdk9CompletableFutureWrapper");
+            if (clazz.getClassLoader() == getClass().getClassLoader()) {
+                return SUCCESS;
+            }
+            return errorResult(testType, "Incorrect ClassLoader for " + clazz);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+    private String assertCorrectExactFileLocation() {
+        final String testType = "correct-exact-location";
+        try {
+            Enumeration<URL> exactFileLocationEnumeration = this.getClass().getClassLoader().getResources("db/location/test.sql");
+            List<URL> exactFileLocationList = urlList(exactFileLocationEnumeration);
+            if (exactFileLocationList.size() != 1) {
+                return errorResult(testType, "wrong number of urls");
+            }
+            String fileContent = IOUtils.toString(exactFileLocationList.get(0).toURI(), StandardCharsets.UTF_8);
+            if (!fileContent.contains("CREATE TABLE")) {
+                return errorResult(testType, "wrong file content");
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+
+    private String assertInvalidDirectory() {
+        final String testType = "invalid-directory";
+        try {
+            Enumeration<URL> exactFileLocationEnumeration = this.getClass().getClassLoader().getResources("db/location2");
+            List<URL> exactFileLocationList = urlList(exactFileLocationEnumeration);
+            if (exactFileLocationList.size() != 0) {
+                return errorResult(testType, "wrong number of urls");
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+
+    private String assertCorrectDirectory() {
+        final String testType = "correct-directory";
+        try {
+            Enumeration<URL> directoryEnumeration = this.getClass().getClassLoader().getResources("db/location");
+            List<URL> directoryURLList = urlList(directoryEnumeration);
+            if (directoryURLList.size() != 1) {
+                return errorResult(testType, "wrong number of directory urls");
+            }
+
+            URL singleURL = directoryURLList.get(0);
+
+            int separatorIndex = singleURL.getPath().lastIndexOf('!');
+            String jarPath = singleURL.getPath().substring(0, separatorIndex);
+            String directoryName = singleURL.getPath().substring(separatorIndex + 2) + "/";
+
+            try (JarFile jarFile = new JarFile(Paths.get(new URI(jarPath)).toFile())) {
+                Enumeration<JarEntry> entries = jarFile.entries();
+                List<JarEntry> entriesInDirectory = new ArrayList<>();
+                while (entries.hasMoreElements()) {
+                    JarEntry currentEntry = entries.nextElement();
+                    String entryName = currentEntry.getName();
+                    if (entryName.startsWith(directoryName) && !entryName.equals(directoryName)) {
+                        entriesInDirectory.add(currentEntry);
+                    }
+                }
+
+                if (entriesInDirectory.size() != 1) {
+                    return errorResult(testType, "wrong number of entries in jar directory");
+                }
+
+                try (InputStream is = jarFile.getInputStream(entriesInDirectory.get(0))) {
+                    String fileContent = IOUtils.toString(is, StandardCharsets.UTF_8);
+                    if (!fileContent.contains("CREATE TABLE")) {
+                        return errorResult(testType, "wrong file content");
+                    }
+                    return SUCCESS;
+                }
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+
+    private List<URL> urlList(Enumeration<URL> enumeration) {
+        if (enumeration == null) {
+            return Collections.emptyList();
+        }
+        List<URL> result = new ArrayList<>();
+        while (enumeration.hasMoreElements()) {
+            result.add(enumeration.nextElement());
+        }
+        return result;
+    }
+
+    private String errorResult(String testType, String message) {
+        return testType + " / " + message;
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..4b26e9a74e6ec
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,74 @@
+package org.acme;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @ConfigProperty(name = "greeting")
+    String greeting;
+
+    @ConfigProperty(name = "quarkus.application.version")
+    String applicationVersion;
+
+    @ConfigProperty(name = "quarkus.application.name")
+    String applicationName;
+
+    @ConfigProperty(name = "other.greeting", defaultValue = "other")
+    String otherGreeting;
+
+    @ConfigProperty(name = "quarkus.profile")
+    String profile;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+
+    @GET
+    @Path("/greeting")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String greeting() {
+        return greeting;
+    }
+
+    @GET
+    @Path("/package")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String pkg() {
+        return Blah.class.getPackage().getName();
+    }
+
+    @GET
+    @Path("/nameAndVersion")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String nameAndVersion() {
+        return applicationName + "/" +  applicationVersion;
+    }
+
+    @GET
+    @Path("/otherGreeting")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String otherGreeting() {
+        return otherGreeting;
+    }
+
+    @GET
+    @Path("/profile")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String profile() {
+        return profile;
+    }
+
+
+    public static class Blah {
+        
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java
new file mode 100644
index 0000000000000..2b41cd0385afb
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/MyApplication.java
@@ -0,0 +1,9 @@
+package org.acme;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/app")
+public class MyApplication extends Application {
+
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java
new file mode 100644
index 0000000000000..1ff398c3bc262
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/java/org/acme/ProtectionDomain.java
@@ -0,0 +1,77 @@
+package org.acme;
+
+import org.apache.commons.io.IOUtils;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.function.Supplier;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+
+@Path("/protectionDomain")
+public class ProtectionDomain {
+
+    private static final String SUCCESS = "success";
+
+    @GET
+    public String useProtectionDomain() {
+        return runAssertions(
+                () -> assertReadManifestFromJar()
+        );
+    }
+
+    private String runAssertions(Supplier<String>... assertions) {
+        String result;
+        for (Supplier<String> assertion : assertions) {
+            result = assertion.get();
+            if (!SUCCESS.equals(result)) {
+                return result;
+            }
+        }
+        return SUCCESS;
+    }
+
+    private String assertReadManifestFromJar() {
+        final String testType = "manifest-from-jar";
+        try {
+            URL location = org.apache.commons.io.Charsets.class.getProtectionDomain().getCodeSource().getLocation();
+            if (location == null) {
+                return errorResult(testType, "location should not be null");
+            }
+
+            try (InputStream inputStream = location.openStream()) {
+                try (JarInputStream jarInputStream = new JarInputStream(inputStream)) {
+                    Manifest manifest = jarInputStream.getManifest();
+                    if (manifest == null) {
+                        return errorResult(testType, "manifest should not be null");
+                    }
+                    String implementationVersion = manifest.getMainAttributes().getValue("Implementation-Version");
+                    if (implementationVersion == null) {
+                        return errorResult(testType, "implementation-version should not be null");
+                    }
+                }
+            }
+            return SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return errorResult(testType, "exception during resolution of resource");
+        }
+    }
+
+    private String errorResult(String testType, String message) {
+        return testType + " / " + message;
+    }
+}
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/META-INF/resources/index.html b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..c09bb5c96b869
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>acme - 1.0-SNAPSHOT</title>
+    <style>
+        h1, h2, h3, h4, h5, h6 {
+            margin-bottom: 0.5rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        h1 {
+            font-size: 2.5rem;
+        }
+
+        h2 {
+            font-size: 2rem
+        }
+
+        h3 {
+            font-size: 1.75rem
+        }
+
+        h4 {
+            font-size: 1.5rem
+        }
+
+        h5 {
+            font-size: 1.25rem
+        }
+
+        h6 {
+            font-size: 1rem
+        }
+
+        .lead {
+            font-weight: 300;
+            font-size: 2rem;
+        }
+
+        .banner {
+            font-size: 2.7rem;
+            margin: 0;
+            padding: 2rem 1rem;
+            background-color: #00A1E2;
+            color: white;
+        }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, system-ui, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+        }
+
+        code {
+            font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+            font-size: 87.5%;
+            color: #e83e8c;
+            word-break: break-word;
+        }
+
+        .left-column {
+            padding: .75rem;
+            max-width: 75%;
+            min-width: 55%;
+        }
+
+        .right-column {
+            padding: .75rem;
+            max-width: 25%;
+        }
+
+        .container {
+            display: flex;
+            width: 100%;
+        }
+
+        li {
+            margin: 0.75rem;
+        }
+
+        .right-section {
+            margin-left: 1rem;
+            padding-left: 0.5rem;
+        }
+
+        .right-section h3 {
+            padding-top: 0;
+            font-weight: 200;
+        }
+
+        .right-section ul {
+            border-left: 0.3rem solid #00A1E2;
+            list-style-type: none;
+            padding-left: 0;
+        }
+
+    </style>
+</head>
+<body>
+
+<div class="banner lead">
+    Your new Cloud-Native application is ready!
+</div>
+
+<div class="container">
+    <div class="left-column">
+        <p class="lead"> Congratulations, you have created a new Quarkus application.</p>
+
+        <h2>Why do you see this?</h2>
+
+        <p>This page is served by Quarkus. The source is in
+            <code>src/main/resources/META-INF/resources/index.html</code>.</p>
+
+        <h2>What can I do from here?</h2>
+
+        <p>If not already done, run the application in <em>dev mode</em> using: <code>mvn compile quarkus:dev</code>.
+        </p>
+        <ul>
+            <li>Add REST resources, Servlets, functions and other services in <code>src/main/java</code>.</li>
+            <li>Your static assets are located in <code>src/main/resources/META-INF/resources</code>.</li>
+            <li>Configure your application in <code>src/main/resources/application.properties</code>.
+            </li>
+        </ul>
+
+        <h2>Do you like Quarkus?</h2>
+        <p>Go give it a star on <a href="https://github.com/quarkusio/quarkus">GitHub</a>.</p>
+
+        <h2>How do I get rid of this page?</h2>
+        <p>Just delete the <code>src/main/resources/META-INF/resources/index.html</code> file.</p>
+    </div>
+    <div class="right-column">
+        <div class="right-section">
+            <h3>Application</h3>
+            <ul>
+                <li>GroupId: org.acme</li>
+                <li>ArtifactId: acme</li>
+                <li>Version: 1.0-SNAPSHOT</li>
+                <li>Quarkus Version: 999-SNAPSHOT</li>
+            </ul>
+        </div>
+        <div class="right-section">
+            <h3>Next steps</h3>
+            <ul>
+                <!-- the url have been erased on purpose -->
+                <li><a href="#">Setup your IDE</a></li>
+                <li><a href="#">Getting started</a></li>
+                <li><a href="#">Documentation</a></li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-java-src/src/main/resources/application.properties b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/application.properties
similarity index 100%
rename from integration-tests/maven/src/test/resources/projects/classic-no-java-src/src/main/resources/application.properties
rename to integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/application.properties
diff --git a/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/db/location/test.sql b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/db/location/test.sql
new file mode 100644
index 0000000000000..cddc725179c67
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/main/resources/db/location/test.sql
@@ -0,0 +1,7 @@
+CREATE TABLE TEST_SCHEMA.quarkus_table2
+(
+    id   INT,
+    name VARCHAR(20)
+);
+INSERT INTO TEST_SCHEMA.quarkus_table2(id, name)
+VALUES (1, '1.0.1 QUARKED');
diff --git a/integration-tests/maven/src/test/resources/projects/classic-no-java-src/src/test/java/org/acme/HelloResourceTest.java b/integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/test/java/org/acme/HelloResourceTest.java
similarity index 100%
rename from integration-tests/maven/src/test/resources/projects/classic-no-java-src/src/test/java/org/acme/HelloResourceTest.java
rename to integration-tests/maven/src/test/resources/projects/rr-with-json-logging/src/test/java/org/acme/HelloResourceTest.java
diff --git a/integration-tests/maven/src/test/resources/projects/test-module-dependency/app/pom.xml b/integration-tests/maven/src/test/resources/projects/test-module-dependency/app/pom.xml
index f158934ba608e..4ef267e60312a 100644
--- a/integration-tests/maven/src/test/resources/projects/test-module-dependency/app/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/test-module-dependency/app/pom.xml
@@ -75,11 +75,11 @@
                   <goal>verify</goal>
                 </goals>
                 <configuration>
-                  <systemProperties>
+                  <systemPropertyVariables>
                     <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                     <maven.home>${maven.home}</maven.home>
-                  </systemProperties>
+                  </systemPropertyVariables>
                 </configuration>
               </execution>
             </executions>
diff --git a/integration-tests/maven/src/test/resources/projects/uberjar-check/pom.xml b/integration-tests/maven/src/test/resources/projects/uberjar-check/pom.xml
index 45a1a9bf7771d..4b03672bae2d1 100644
--- a/integration-tests/maven/src/test/resources/projects/uberjar-check/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/uberjar-check/pom.xml
@@ -64,25 +64,9 @@
   <profiles>
     <profile>
       <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${quarkus-plugin.version}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
     </profile>
   </profiles>
 </project>
diff --git a/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml b/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml
new file mode 100644
index 0000000000000..19397b3c96c8a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.acme</groupId>
+  <artifactId>acme</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <properties>
+    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
+    <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
+    <quarkus.platform.version>@project.version@</quarkus.platform.version>
+    <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <quarkus.package.type>uber-jar</quarkus.package.type>
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>${quarkus.platform.artifact-id}</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>native</id>
+      <properties>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java b/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java
new file mode 100644
index 0000000000000..e05e3fc81410a
--- /dev/null
+++ b/integration-tests/maven/src/test/resources/projects/uberjar-maven-plugin-config/src/main/java/org/acme/HelloResource.java
@@ -0,0 +1,16 @@
+package org.acme;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class HelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/micrometer-mp-metrics/pom.xml b/integration-tests/micrometer-mp-metrics/pom.xml
new file mode 100644
index 0000000000000..911cac93f4a12
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/pom.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-micrometer-mp-metrics</artifactId>
+    <name>Quarkus - Integration Tests - Micrometer MP Metrics</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+        </dependency>
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java
new file mode 100644
index 0000000000000..e6f726a311c60
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/CountedInstance.java
@@ -0,0 +1,16 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import javax.enterprise.context.RequestScoped;
+
+import org.eclipse.microprofile.metrics.annotation.Counted;
+
+@RequestScoped
+@Counted(description = "called for each discovered prime number")
+public class CountedInstance {
+
+    CountedInstance() {
+    }
+
+    public void countPrimes() {
+    }
+}
diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java
new file mode 100644
index 0000000000000..ecebb9e689928
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/InjectedInstance.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import java.util.Random;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.microprofile.metrics.Counter;
+import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.Histogram;
+import org.eclipse.microprofile.metrics.annotation.Metric;
+
+@Singleton
+public class InjectedInstance {
+    Random r = new Random();
+
+    @Inject
+    @Metric(name = "notPrime", description = "Count the number of not prime numbers")
+    Counter count;
+
+    @Inject
+    @Metric(name = "valueRange", description = "Aggregate checked values")
+    Histogram histogram;
+
+    @Produces
+    @Metric(name = "passiveInjection", description = "This is ignored: @Produces + @Metric")
+    Gauge<Integer> createGauge = new Gauge<Integer>() {
+        @Override
+        public Integer getValue() {
+            return r.nextInt();
+        }
+    };
+}
diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java
new file mode 100644
index 0000000000000..5c72e4b60a958
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/MessageResource.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+@Path("/message")
+public class MessageResource {
+
+    private final MeterRegistry registry;
+
+    public MessageResource(MeterRegistry registry) {
+        this.registry = registry;
+    }
+
+    @GET
+    public String message() {
+        return registry.getClass().getName();
+    }
+
+    @GET
+    @Path("fail")
+    public String fail() {
+        throw new NullPointerException("Failed on purpose");
+    }
+
+    @GET
+    @Path("item/{id}")
+    public String item(@PathParam("id") String id) {
+        return "return message with id " + id;
+    }
+}
diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java
new file mode 100644
index 0000000000000..33936ec87d0f2
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java
@@ -0,0 +1,76 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import java.util.concurrent.atomic.LongAccumulator;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.eclipse.microprofile.metrics.MetricUnits;
+import org.eclipse.microprofile.metrics.annotation.*;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
+
+@Path("/prime")
+public class PrimeResource {
+
+    private LongAccumulator highestPrimeSoFar = new LongAccumulator(Long::max, 2);
+
+    @Inject
+    CountedInstance countedResource;
+
+    InjectedInstance injectedMetrics;
+
+    @Metered
+    PrimeResource(InjectedInstance injectedMetrics) {
+        this.injectedMetrics = injectedMetrics;
+    }
+
+    @GET
+    @Path("/{number}")
+    @Produces("text/plain")
+    @ConcurrentGauge(description = "active calls to checkIfPrime")
+    public String checkIfPrime(@PathParam long number) {
+        String result = checkPrime(number);
+
+        if (result.length() > 0) {
+            injectedMetrics.count.inc();
+            return result;
+        }
+
+        countedResource.countPrimes();
+        highestPrimeSoFar.accumulate(number);
+        return number + " is prime.";
+    }
+
+    // This method is both counted and timed. The counted annotation should be suppressed/removed
+    @Timed(name = "checksTimer", description = "Measure how long it takes to perform the primality test.", unit = MetricUnits.MILLISECONDS)
+    @Counted
+    String checkPrime(long number) {
+        injectedMetrics.histogram.update(number);
+
+        if (number < 1) {
+            return "Only natural numbers can be prime numbers.";
+        }
+        if (number == 1) {
+            return "1 is not prime.";
+        }
+        if (number == 2) {
+            return "2 is prime.";
+        }
+        if (number % 2 == 0) {
+            return number + " is not prime, it is divisible by 2.";
+        }
+        for (int i = 3; i < Math.floor(Math.sqrt(number)) + 1; i = i + 2) {
+            if (number % i == 0) {
+                return number + " is not prime, is divisible by " + i + ".";
+            }
+        }
+        return "";
+    }
+
+    @Gauge(name = "highestPrimeNumberSoFar", unit = MetricUnits.NONE, description = "Highest prime number so far.")
+    public Long highestPrimeNumberSoFar() {
+        return highestPrimeSoFar.get();
+    }
+}
diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java
new file mode 100644
index 0000000000000..1e921284f8116
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/RenameMeterFilterProducer.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.config.MeterFilter;
+
+@Singleton
+public class RenameMeterFilterProducer {
+    static String targetMetric = PrimeResource.class.getName() + ".highestPrimeNumberSoFar";
+
+    @Produces
+    MeterFilter renameMeterFilter() {
+        return new MeterFilter() {
+            @Override
+            public Meter.Id map(Meter.Id id) {
+                if (id.getName().equals(targetMetric)) {
+                    List<Tag> tags = id.getTags().stream().filter(x -> !"scope".equals(x.getKey()))
+                            .collect(Collectors.toList());
+                    return id.withName("highestPrimeNumberSoFar").replaceTags(tags);
+                }
+                return id;
+            }
+        };
+    }
+}
diff --git a/integration-tests/micrometer-mp-metrics/src/main/resources/application.properties b/integration-tests/micrometer-mp-metrics/src/main/resources/application.properties
new file mode 100644
index 0000000000000..81703227f14d6
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/main/resources/application.properties
@@ -0,0 +1,16 @@
+#quarkus.log.category."io.quarkus.micrometer".level=DEBUG
+quarkus.log.category."io.quarkus.micrometer.runtime.binder.vertx".level=INFO
+
+quarkus.log.category."io.quarkus.bootstrap".level=INFO
+quarkus.log.category."io.quarkus.netty".level=INFO
+quarkus.log.category."io.quarkus.resteasy".level=INFO
+
+quarkus.log.category."io.netty".level=INFO
+quarkus.log.category."io.restassured".level=INFO
+quarkus.log.category."org.apache".level=INFO
+quarkus.log.category."org.jboss.resteasy".level=INFO
+
+quarkus.micrometer.binder.mp-metrics.enabled=true
+quarkus.micrometer.export.json.enabled=true
+
+quarkus.micrometer.binder.vertx.ignore-patterns=/message
\ No newline at end of file
diff --git a/integration-tests/micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsIT.java b/integration-tests/micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsIT.java
new file mode 100644
index 0000000000000..a0f43e95baab8
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class MPMetricsIT extends MPMetricsTest {
+}
diff --git a/integration-tests/micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsTest.java b/integration-tests/micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsTest.java
new file mode 100644
index 0000000000000..54d46a53ee1bd
--- /dev/null
+++ b/integration-tests/micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsTest.java
@@ -0,0 +1,124 @@
+package io.quarkus.it.micrometer.mpmetrics;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class MPMetricsTest {
+
+    @Test
+    @Order(1)
+    void callPrimeGen_1() {
+        given()
+                .when().get("/prime/31")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(2)
+    void callPrimeGen_2() {
+        given()
+                .when().get("/prime/33")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(3)
+    void callPrimeGen_3() {
+        given()
+                .when().get("/prime/887")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(4)
+    void validateMetricsOutput_1() {
+        given()
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+
+                // Prometheus body has ALL THE THINGS in no particular order
+
+                // PrimeResource
+                .body(containsString(
+                        "io_quarkus_it_micrometer_mpmetrics_PrimeResource_PrimeResource_total{scope=\"application\",} 1.0"))
+                .body(containsString(
+                        "io_quarkus_it_micrometer_mpmetrics_CountedInstance_CountedInstance_total{scope=\"application\",} 2.0"))
+
+                // number of concurrent requests at time of sample
+                .body(containsString(
+                        "io_quarkus_it_micrometer_mpmetrics_PrimeResource_checkIfPrime{scope=\"application\",} 0.0"))
+                .body(containsString(
+                        "io_quarkus_it_micrometer_mpmetrics_CountedInstance_countPrimes_total{scope=\"application\",} 2.0"))
+                .body(containsString(
+                        "highestPrimeNumberSoFar 887.0"))
+
+                // the counter associated with a timed method should have been removed
+                .body(not(containsString("io_quarkus_it_micrometer_mpmetrics_PrimeResource_checkPrime")));
+    }
+
+    @Test
+    @Order(5)
+    void callPrimeGen_4() {
+        given()
+                .when().get("/prime/900")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(8)
+    void callMessage() {
+        given()
+                .when().get("/message")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(9)
+    void validateMetricsOutput_2() {
+        given()
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+
+                // Prometheus body has ALL THE THINGS in no particular order
+                .body(containsString(
+                        "io_quarkus_it_micrometer_mpmetrics_CountedInstance_countPrimes_total{scope=\"application\",} 2.0"))
+                .body(containsString(
+                        "highestPrimeNumberSoFar 887.0"))
+                .body(containsString(
+                        "io_quarkus_it_micrometer_mpmetrics_InjectedInstance_notPrime_total{scope=\"application\",}"))
+                .body(not(containsString("/message")));
+    }
+
+    @Test
+    @Order(10)
+    void validateJsonOutput() {
+        given()
+                .header("Accept", "application/json")
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+                .body("'io.quarkus.it.micrometer.mpmetrics.CountedInstance.countPrimes;scope=application'",
+                        Matchers.equalTo(2.0f))
+                .body("'highestPrimeNumberSoFar'",
+                        Matchers.equalTo(887.0f));
+    }
+
+}
diff --git a/integration-tests/micrometer-prometheus/pom.xml b/integration-tests/micrometer-prometheus/pom.xml
new file mode 100644
index 0000000000000..6d2108d9902e0
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-micrometer-prometheus</artifactId>
+    <name>Quarkus - Integration Tests - Micrometer Prometheus</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Hibernate -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2</artifactId>
+        </dependency>
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+        </dependency>
+
+        <!-- Verify extensions co-exist -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes</artifactId>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>commons-logging-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java
new file mode 100644
index 0000000000000..50f9d6901c370
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/AnnotatedResource.java
@@ -0,0 +1,141 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.jboss.logging.Logger;
+
+import io.micrometer.core.annotation.Counted;
+import io.micrometer.core.annotation.Timed;
+
+@Path("/all-the-things")
+public class AnnotatedResource {
+    private static final Logger log = Logger.getLogger(AnnotatedResource.class);
+
+    @GET
+    public String allTheThings() {
+        // Counted
+        onlyCountFailures();
+        countAllInvocations(false);
+        emptyMetricName(false);
+        wrap(x -> countAllInvocations(true));
+        wrap(x -> emptyMetricName(true));
+
+        join(x -> onlyCountAsyncFailures());
+        join(x -> countAllAsyncInvocations(false));
+        join(x -> emptyAsyncMetricName(false));
+        join(x -> countAllAsyncInvocations(true));
+        join(x -> emptyAsyncMetricName(true));
+
+        //Timed
+        call(false);
+        longCall(false);
+        wrap(x -> call(true));
+        wrap(x -> longCall(true));
+
+        join(x -> asyncCall(false));
+        join(x -> longAsyncCall(false));
+        join(x -> asyncCall(true));
+        join(x -> longAsyncCall(true));
+
+        return "OK";
+    }
+
+    void wrap(Function<Boolean, Object> function) {
+        try {
+            function.apply(true);
+        } catch (NullPointerException e) {
+            if (!e.getMessage().equals("Failed on purpose")) {
+                log.error("Unexpected exception in test", e);
+                throw e;
+            }
+        }
+    }
+
+    void join(Function<Boolean, CompletableFuture<?>> function) {
+        try {
+            function.apply(true).join();
+        } catch (CompletionException e) {
+            if (!e.getCause().getMessage().equals("Failed on purpose")) {
+                log.error("unexpected exception in test", e);
+                throw e;
+            }
+        }
+    }
+
+    @Counted(value = "metric.none", recordFailuresOnly = true)
+    public Object onlyCountFailures() {
+        return new Response(false).get();
+    }
+
+    @Counted(value = "metric.all", extraTags = { "extra", "tag" })
+    public Object countAllInvocations(boolean fail) {
+        return new Response(fail).get();
+    }
+
+    @Counted(description = "nice description")
+    public Object emptyMetricName(boolean fail) {
+        return new Response(fail).get();
+    }
+
+    @Counted(value = "async.none", recordFailuresOnly = true)
+    public CompletableFuture<?> onlyCountAsyncFailures() {
+        return CompletableFuture.supplyAsync(new Response(false));
+    }
+
+    @Counted(value = "async.all", extraTags = { "extra", "tag" })
+    public CompletableFuture<?> countAllAsyncInvocations(boolean fail) {
+        return CompletableFuture.supplyAsync(new Response(fail));
+    }
+
+    @Counted
+    public CompletableFuture<?> emptyAsyncMetricName(boolean fail) {
+        return CompletableFuture.supplyAsync(new Response(fail));
+    }
+
+    @Timed(value = "call", extraTags = { "extra", "tag" })
+    public Object call(boolean fail) {
+        return new Response(fail).get();
+    }
+
+    @Timed(value = "longCall", extraTags = { "extra", "tag" }, longTask = true)
+    public Object longCall(boolean fail) {
+        return new Response(fail).get();
+    }
+
+    @Timed(value = "async.call", extraTags = { "extra", "tag" })
+    public CompletableFuture<?> asyncCall(boolean fail) {
+        return CompletableFuture.supplyAsync(new Response(fail));
+    }
+
+    @Timed(value = "async.longCall", extraTags = { "extra", "tag" }, longTask = true)
+    public CompletableFuture<?> longAsyncCall(boolean fail) {
+        return CompletableFuture.supplyAsync(new Response(fail));
+    }
+
+    static class Response implements Supplier<Object> {
+        boolean fail;
+
+        Response(boolean fail) {
+            this.fail = fail;
+        }
+
+        @Override
+        public Object get() {
+            try {
+                Thread.sleep(3);
+            } catch (InterruptedException e) {
+                // intentionally empty
+            }
+            if (fail) {
+                throw new NullPointerException("Failed on purpose");
+            }
+            return new Object();
+        }
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java
new file mode 100644
index 0000000000000..649e7966c6381
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/CustomConfiguration.java
@@ -0,0 +1,80 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import java.util.Arrays;
+
+import javax.annotation.Priority;
+import javax.enterprise.inject.Produces;
+import javax.inject.Singleton;
+import javax.interceptor.Interceptor;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.config.MeterFilter;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.prometheus.client.CollectorRegistry;
+import io.quarkus.micrometer.runtime.MeterFilterConstraint;
+
+@Singleton
+@Priority(Interceptor.Priority.APPLICATION - 100)
+public class CustomConfiguration {
+
+    @ConfigProperty(name = "deployment.env")
+    String deploymentEnv;
+
+    @Produces
+    @Singleton
+    @MeterFilterConstraint(applyTo = PrometheusMeterRegistry.class)
+    public MeterFilter configurePrometheusRegistries() {
+        return MeterFilter.commonTags(Arrays.asList(
+                Tag.of("registry", "prometheus")));
+    }
+
+    @Produces
+    @Singleton
+    @MeterFilterConstraint(applyTo = CustomConfiguration.class)
+    public MeterFilter configureNonexistantRegistries() {
+        return MeterFilter.commonTags(Arrays.asList(
+                Tag.of("tag", "class-should-not-match")));
+    }
+
+    @Produces
+    @Singleton
+    public MeterFilter configureAllRegistries() {
+        return MeterFilter.commonTags(Arrays.asList(
+                Tag.of("env", deploymentEnv)));
+    }
+
+    /**
+     * Produce a custom prometheus configuration that is isolated/separate from
+     * the application (and won't be connected to the Quarkus configured application
+     * endpoint).
+     */
+    @Produces
+    @Singleton
+    public PrometheusMeterRegistry registry(CollectorRegistry collectorRegistry, Clock clock) {
+        return new PrometheusMeterRegistry(PrometheusConfig.DEFAULT, collectorRegistry, clock);
+    }
+
+    /** Enable histogram buckets for a specific timer */
+    @Produces
+    @Singleton
+    public MeterFilter enableHistogram() {
+        return new MeterFilter() {
+            public DistributionStatisticConfig configure(Meter.Id id, DistributionStatisticConfig config) {
+                if (id.getName().equals("prime.number.test")) {
+                    return DistributionStatisticConfig.builder()
+                            .percentiles(0.5, 0.95) // median and 95th percentile
+                            .percentilesHistogram(true) // histogram buckets (for use with prometheus histogram_quantile)
+                            .build()
+                            .merge(config);
+                }
+                return config;
+            }
+        };
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java
new file mode 100644
index 0000000000000..cd4f186c0280a
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/Fruit.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class Fruit extends PanacheEntity {
+    public String name;
+
+    public Fruit(String name) {
+        this.name = name;
+    }
+
+    public Fruit() {
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java
new file mode 100644
index 0000000000000..3a1b74739da00
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/FruitResource.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import java.util.List;
+
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.hibernate.orm.panache.PanacheQuery;
+import io.smallrye.common.annotation.Blocking;
+
+@Path("/fruit")
+@Blocking
+public class FruitResource {
+
+    @GET
+    @Path("create")
+    @Transactional
+    public void trigger() {
+        Fruit apple = new Fruit("apple");
+        Fruit pear = new Fruit("pear");
+        Fruit banana = new Fruit("banana");
+
+        Fruit.persist(apple, pear, banana);
+    }
+
+    @GET
+    @Path("all")
+    public void retrieveAll() {
+        PanacheQuery<Fruit> query = Fruit.find(
+                "select name from Fruit");
+        List<Fruit> all = query.list();
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java
new file mode 100644
index 0000000000000..93f87cefe5232
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/MessageResource.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+@Path("/message")
+public class MessageResource {
+
+    private final MeterRegistry registry;
+
+    public MessageResource(MeterRegistry registry) {
+        this.registry = registry;
+    }
+
+    @GET
+    public String message() {
+        return registry.getClass().getName();
+    }
+
+    @GET
+    @Path("fail")
+    public String fail() {
+        throw new NullPointerException("Failed on purpose");
+    }
+
+    @GET
+    @Path("item/{id}")
+    public String item(@PathParam("id") String id) {
+        return "return message with id " + id;
+    }
+
+    @GET
+    @Path("match/{id}/{sub}")
+    public String match(@PathParam("id") String id, @PathParam("sub") String sub) {
+        return "return message with id " + id + ", and sub " + sub;
+    }
+
+    @GET
+    @Path("match/{text}")
+    public String optional(@PathParam("text") String text) {
+        return "return message with text " + text;
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java
new file mode 100644
index 0000000000000..8bafc55aa3081
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PrimeNumberResource.java
@@ -0,0 +1,66 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+import io.micrometer.core.instrument.MeterRegistry;
+
+@Path("/prime")
+public class PrimeNumberResource {
+
+    private final LongAccumulator highestPrime = new LongAccumulator(Long::max, 0);
+    private final MeterRegistry registry;
+
+    PrimeNumberResource(MeterRegistry registry) {
+        this.registry = registry;
+
+        // Create a gauge that uses the highestPrimeNumberSoFar method
+        // to obtain the highest observed prime number
+        registry.gauge("prime.number.max", this,
+                PrimeNumberResource::highestObservedPrimeNumber);
+    }
+
+    @GET
+    @Path("/{number}")
+    @Produces("text/plain")
+    public String checkIfPrime(@PathParam("number") long number) {
+        if (number < 1) {
+            return "Only natural numbers can be prime numbers.";
+        }
+        if (number == 1) {
+            return "1 is not prime.";
+        }
+        if (number == 2) {
+            return "2 is prime.";
+        }
+        if (number % 2 == 0) {
+            return number + " is not prime, it is divisible by 2.";
+        }
+
+        Supplier<String> supplier = () -> {
+            for (int i = 3; i < Math.floor(Math.sqrt(number)) + 1; i = i + 2) {
+                if (number % i == 0) {
+                    return number + " is not prime, is divisible by " + i + ".";
+                }
+            }
+            highestPrime.accumulate(number);
+            return number + " is prime.";
+        };
+
+        return registry.timer("prime.number.test").wrap(supplier).get();
+    }
+
+    /**
+     * This method is called by the registered {@code highest.prime.number} gauge.
+     * 
+     * @return the highest observed prime value
+     */
+    long highestObservedPrimeNumber() {
+        return highestPrime.get();
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/main/resources/application.properties b/integration-tests/micrometer-prometheus/src/main/resources/application.properties
new file mode 100644
index 0000000000000..428a6ca0c2dbf
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/resources/application.properties
@@ -0,0 +1,25 @@
+#quarkus.log.min-level=DEBUG
+#quarkus.log.category."io.quarkus.micrometer".level=DEBUG
+quarkus.log.category."io.quarkus.bootstrap".level=INFO
+quarkus.log.category."io.quarkus.netty".level=INFO
+quarkus.log.category."io.quarkus.resteasy.runtime".level=INFO
+
+quarkus.log.category."io.netty".level=INFO
+quarkus.log.category."org.apache".level=INFO
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.statistics=true
+quarkus.hibernate-orm.metrics.enabled=true
+
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
+
+# This is the old property, should still be used
+quarkus.micrometer.binder.vertx.ignore-patterns=/fruit/create
+# Add a property to verify match pattern behavior
+quarkus.micrometer.binder.http-server.match-patterns=/message/match/\\\\d+/[0-9]+=/message/match/{id}/{sub},\
+/message/match/.*=/message/match/{other}
+
+deployment.env=test
diff --git a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryIT.java b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryIT.java
new file mode 100644
index 0000000000000..a3542559f136b
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryIT.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+/**
+ * tests that application.properties is read from src/main/resources when running native image tests
+ *
+ * This does not necessarily belong here, but main and test-extension have a lot of existing
+ * config that would need to be duplicated, so it is here out of convenience.
+ */
+@NativeImageTest
+class PrometheusMetricsRegistryIT extends PrometheusMetricsRegistryTest {
+}
diff --git a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java
new file mode 100644
index 0000000000000..3a64d1c75226e
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java
@@ -0,0 +1,202 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Test functioning prometheus endpoint.
+ * Use test execution order to ensure one http server request measurement
+ * is present when the endpoint is scraped.
+ */
+@QuarkusTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class PrometheusMetricsRegistryTest {
+
+    @Test
+    @Order(1)
+    void testRegistryInjection() {
+        given()
+                .when().get("/message")
+                .then()
+                .statusCode(200)
+                .body(containsString("io.micrometer.core.instrument.composite.CompositeMeterRegistry"));
+    }
+
+    @Test
+    @Order(2)
+    void testUnknownUrl() {
+        given()
+                .when().get("/messsage/notfound")
+                .then()
+                .statusCode(404);
+    }
+
+    @Test
+    @Order(3)
+    void testServerError() {
+        given()
+                .when().get("/message/fail")
+                .then()
+                .statusCode(500);
+    }
+
+    @Test
+    @Order(4)
+    void testPathParameter() {
+        given()
+                .when().get("/message/item/123")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(5)
+    void testMultipleParameters() {
+        given()
+                .when().get("/message/match/123/1")
+                .then()
+                .statusCode(200);
+
+        given()
+                .when().get("/message/match/1/123")
+                .then()
+                .statusCode(200);
+
+        given()
+                .when().get("/message/match/baloney")
+                .then()
+                .statusCode(200);
+    }
+
+    @Test
+    @Order(6)
+    void testPanacheCalls() {
+        given()
+                .when().get("/fruit/create")
+                .then()
+                .statusCode(204);
+
+        given()
+                .when().get("/fruit/all")
+                .then()
+                .statusCode(204);
+    }
+
+    @Test
+    @Order(7)
+    void testPrimeEndpointCalls() {
+        given()
+                .when().get("/prime/7")
+                .then()
+                .statusCode(200)
+                .body(containsString("is prime"));
+    }
+
+    @Test
+    @Order(8)
+    void testAllTheThings() {
+        given()
+                .when().get("/all-the-things")
+                .then()
+                .statusCode(200)
+                .body(containsString("OK"));
+    }
+
+    @Test
+    @Order(10)
+    void testPrometheusScrapeEndpoint() {
+        given()
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+
+                // Prometheus body has ALL THE THINGS in no particular order
+
+                .body(containsString("registry=\"prometheus\""))
+                .body(containsString("env=\"test\""))
+                .body(containsString("http_server_requests"))
+
+                .body(containsString("status=\"404\""))
+                .body(containsString("uri=\"NOT_FOUND\""))
+                .body(containsString("outcome=\"CLIENT_ERROR\""))
+
+                .body(containsString("status=\"500\""))
+                .body(containsString("uri=\"/message/fail\""))
+                .body(containsString("outcome=\"SERVER_ERROR\""))
+
+                .body(containsString("status=\"200\""))
+                .body(containsString("uri=\"/message\""))
+                .body(containsString("uri=\"/message/item/{id}\""))
+                .body(containsString("outcome=\"SUCCESS\""))
+                .body(containsString("uri=\"/message/match/{id}/{sub}\""))
+                .body(containsString("uri=\"/message/match/{other}\""))
+
+                // Verify Hibernate Metrics
+                .body(containsString(
+                        "hibernate_sessions_open_total{entityManagerFactory=\"<default>\",env=\"test\",registry=\"prometheus\",} 2.0"))
+                .body(containsString(
+                        "hibernate_sessions_closed_total{entityManagerFactory=\"<default>\",env=\"test\",registry=\"prometheus\",} 2.0"))
+                .body(containsString(
+                        "hibernate_connections_obtained_total{entityManagerFactory=\"<default>\",env=\"test\",registry=\"prometheus\",}"))
+                .body(containsString(
+                        "hibernate_entities_inserts_total{entityManagerFactory=\"<default>\",env=\"test\",registry=\"prometheus\",} 3.0"))
+                .body(containsString(
+                        "hibernate_flushes_total{entityManagerFactory=\"<default>\",env=\"test\",registry=\"prometheus\",} 1.0"))
+
+                // Annotated counters
+                .body(not(containsString("metric_none")))
+                .body(containsString(
+                        "metric_all_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"none\",extra=\"tag\",method=\"countAllInvocations\",registry=\"prometheus\",result=\"success\",} 1.0"))
+                .body(containsString(
+                        "metric_all_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"NullPointerException\",extra=\"tag\",method=\"countAllInvocations\",registry=\"prometheus\",result=\"failure\",} 1.0"))
+                .body(containsString(
+                        "method_counted_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"NullPointerException\",method=\"emptyMetricName\",registry=\"prometheus\",result=\"failure\",} 1.0"))
+                .body(containsString(
+                        "method_counted_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"none\",method=\"emptyMetricName\",registry=\"prometheus\",result=\"success\",} 1.0"))
+                .body(not(containsString("async_none")))
+                .body(containsString(
+                        "async_all_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"NullPointerException\",extra=\"tag\",method=\"countAllAsyncInvocations\",registry=\"prometheus\",result=\"failure\",} 1.0"))
+                .body(containsString(
+                        "async_all_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"none\",extra=\"tag\",method=\"countAllAsyncInvocations\",registry=\"prometheus\",result=\"success\",} 1.0"))
+                .body(containsString(
+                        "method_counted_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"NullPointerException\",method=\"emptyAsyncMetricName\",registry=\"prometheus\",result=\"failure\",} 1.0"))
+                .body(containsString(
+                        "method_counted_total{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"none\",method=\"emptyAsyncMetricName\",registry=\"prometheus\",result=\"success\",} 1.0"))
+
+                // Annotated Timers
+                .body(containsString(
+                        "call_seconds_count{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"NullPointerException\",extra=\"tag\",method=\"call\",registry=\"prometheus\",} 1.0"))
+                .body(containsString(
+                        "call_seconds_count{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"none\",extra=\"tag\",method=\"call\",registry=\"prometheus\",}"))
+                .body(containsString(
+                        "async_call_seconds_count{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"NullPointerException\",extra=\"tag\",method=\"asyncCall\",registry=\"prometheus\",} 1.0"))
+                .body(containsString(
+                        "async_call_seconds_count{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",exception=\"none\",extra=\"tag\",method=\"asyncCall\",registry=\"prometheus\",} 1.0"))
+                .body(containsString(
+                        "longCall_seconds_active_count{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",extra=\"tag\",method=\"longCall\",registry=\"prometheus\",}"))
+                .body(containsString(
+                        "async_longCall_seconds_duration_sum{class=\"io.quarkus.it.micrometer.prometheus.AnnotatedResource\",env=\"test\",extra=\"tag\",method=\"longAsyncCall\",registry=\"prometheus\",} 0.0"))
+
+                // Configured median, 95th percentile and histogram buckets
+                .body(containsString(
+                        "prime_number_test_seconds{env=\"test\",registry=\"prometheus\",quantile=\"0.5\",}"))
+                .body(containsString(
+                        "prime_number_test_seconds{env=\"test\",registry=\"prometheus\",quantile=\"0.95\",}"))
+                .body(containsString(
+                        "prime_number_test_seconds_bucket{env=\"test\",registry=\"prometheus\",le=\"0.001\",}"))
+
+                // this was defined by a tag to a non-matching registry, and should not be found
+                .body(not(containsString("class-should-not-match")))
+
+                // should not find this ignored uri
+                .body(not(containsString("uri=\"/fruit/create\"")));
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/TestResources.java b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/TestResources.java
new file mode 100644
index 0000000000000..49a22905af3e5
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/TestResources.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
+
+@QuarkusTestResource(H2DatabaseTestResource.class)
+public class TestResources {
+}
diff --git a/integration-tests/mongodb-client/pom.xml b/integration-tests/mongodb-client/pom.xml
index 90785e496908d..39f32dcedd314 100644
--- a/integration-tests/mongodb-client/pom.xml
+++ b/integration-tests/mongodb-client/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -49,6 +49,47 @@
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -79,65 +120,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java
index 155816b9dc975..ef33391ac8869 100644
--- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResource.java
@@ -5,36 +5,30 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
+
+import io.smallrye.common.annotation.Blocking;
 
 @Path("/books")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
+@Blocking
 public class BookResource {
 
     @Inject
     MongoClient client;
 
-    private MongoCollection<Book> collection;
-
-    @PostConstruct
-    public void init() {
-        MongoDatabase database = client.getDatabase("books");
-        collection = database.getCollection("my-collection", Book.class);
+    private MongoCollection<Book> getCollection() {
+        return client.getDatabase("books").getCollection("my-collection", Book.class);
     }
 
     @GET
     public List<Book> getBooks() {
-        FindIterable<Book> iterable = collection.find();
+        FindIterable<Book> iterable = getCollection().find();
         List<Book> books = new ArrayList<>();
         for (Book doc : iterable) {
             books.add(doc);
@@ -44,14 +38,14 @@ public List<Book> getBooks() {
 
     @POST
     public Response addBook(Book book) {
-        collection.insertOne(book);
+        getCollection().insertOne(book);
         return Response.accepted().build();
     }
 
     @GET
     @Path("/{author}")
     public List<Book> getBooksByAuthor(@PathParam("author") String author) {
-        FindIterable<Book> iterable = collection.find(eq("author", author));
+        FindIterable<Book> iterable = getCollection().find(eq("author", author));
         List<Book> books = new ArrayList<>();
         for (Book doc : iterable) {
             String title = doc.getTitle();
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java
new file mode 100644
index 0000000000000..f834311622d0e
--- /dev/null
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/BookResourceWithParameterInjection.java
@@ -0,0 +1,64 @@
+package io.quarkus.it.mongodb;
+
+import static com.mongodb.client.model.Filters.eq;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+
+import io.quarkus.mongodb.MongoClientName;
+import io.smallrye.common.annotation.Blocking;
+
+@Path("/books-with-parameter-injection")
+@Blocking
+public class BookResourceWithParameterInjection {
+    private final MongoClient client;
+
+    @Inject
+    public BookResourceWithParameterInjection(@MongoClientName("parameter-injection") MongoClient client) {
+        this.client = client;
+    }
+
+    private MongoCollection<Book> getCollection() {
+        return client.getDatabase("books").getCollection("books-with-parameter-injection", Book.class);
+    }
+
+    @GET
+    public List<Book> getBooks() {
+        FindIterable<Book> iterable = getCollection().find();
+        List<Book> books = new ArrayList<>();
+        for (Book doc : iterable) {
+            books.add(doc);
+        }
+        return books;
+    }
+
+    @POST
+    public Response addBook(Book book) {
+        getCollection().insertOne(book);
+        return Response.accepted().build();
+    }
+
+    @GET
+    @Path("/{author}")
+    public List<Book> getBooksByAuthor(@PathParam("author") String author) {
+        FindIterable<Book> iterable = getCollection().find(eq("author", author));
+        List<Book> books = new ArrayList<>();
+        for (Book doc : iterable) {
+            String title = doc.getTitle();
+            books.add(new Book().setTitle(title).setAuthor(author));
+        }
+        return books;
+    }
+
+}
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java
index 0f5e3c023ff35..3a77cbfadca80 100644
--- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/ReactiveBookResource.java
@@ -5,38 +5,31 @@
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 import io.quarkus.mongodb.reactive.ReactiveMongoCollection;
 
 @Path("/reactive-books")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class ReactiveBookResource {
 
     @Inject
     ReactiveMongoClient client;
 
-    private ReactiveMongoCollection<Book> collection;
-
-    @PostConstruct
-    public void init() {
-        collection = client.getDatabase("books").getCollection("my-reactive-collection", Book.class);
+    private ReactiveMongoCollection<Book> getCollection() {
+        return client.getDatabase("books").getCollection("my-reactive-collection", Book.class);
     }
 
     @GET
     public CompletionStage<List<Book>> getBooks() {
-        return collection.find().collectItems().asList().subscribeAsCompletionStage();
+        return getCollection().find().collectItems().asList().subscribeAsCompletionStage();
     }
 
     @POST
     public CompletionStage<Response> addBook(Book book) {
-        return collection.insertOne(book)
+        return getCollection().insertOne(book)
                 .onItem().transform(x -> Response.accepted().build())
                 .subscribeAsCompletionStage();
     }
@@ -44,7 +37,7 @@ public CompletionStage<Response> addBook(Book book) {
     @GET
     @Path("/{author}")
     public CompletionStage<List<Book>> getBooksByAuthor(@PathParam("author") String author) {
-        return collection.find(eq("author", author))
+        return getCollection().find(eq("author", author))
                 .collectItems().asList()
                 .subscribeAsCompletionStage();
     }
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java
index c2b7576c3c7dc..74e453331b076 100644
--- a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/discriminator/VehicleResource.java
@@ -7,40 +7,32 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
+
+import io.smallrye.common.annotation.Blocking;
 
 @Path("/vehicles")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
+@Blocking
 public class VehicleResource {
     @Inject
     MongoClient client;
 
-    private MongoCollection<Vehicle> collection;
-
-    @PostConstruct
-    public void init() {
-        MongoDatabase database = client.getDatabase("books");
-        collection = database.getCollection("vehicle", Vehicle.class);
+    private MongoCollection<Vehicle> getCollection() {
+        return client.getDatabase("books").getCollection("vehicle", Vehicle.class);
 
     }
 
     @GET
     public List<Vehicle> getVehicles() {
-        FindIterable<Vehicle> iterable = collection.find();
+        FindIterable<Vehicle> iterable = getCollection().find();
         List<Vehicle> vehicles = new ArrayList<>();
         for (Vehicle doc : iterable) {
             vehicles.add(doc);
@@ -50,7 +42,7 @@ public List<Vehicle> getVehicles() {
 
     @POST
     public Response addVehicle(Vehicle vehicle) throws UnsupportedEncodingException {
-        collection.insertOne(vehicle);
+        getCollection().insertOne(vehicle);
         return Response.created(URI.create("/vehicle/" + URLEncoder.encode(vehicle.name, StandardCharsets.UTF_8.toString())))
                 .build();
     }
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/OptionalPropertyCodecProvider.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/OptionalPropertyCodecProvider.java
new file mode 100644
index 0000000000000..3e545cbe3a4cb
--- /dev/null
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/OptionalPropertyCodecProvider.java
@@ -0,0 +1,62 @@
+package io.quarkus.it.mongodb.pojo;
+
+import java.util.Optional;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.pojo.PropertyCodecProvider;
+import org.bson.codecs.pojo.PropertyCodecRegistry;
+import org.bson.codecs.pojo.TypeWithTypeParameters;
+
+/**
+ * This class is an example of a PropertyCodecProvider, it handle the Optional type for the POJO Codec.
+ * It is used to test that the mongodb-client extension correctly register all PropertyCodecProvider within the POJO Codec.
+ *
+ * See: http://mongodb.github.io/mongo-java-driver/3.12/bson/pojos/#generics-support
+ */
+public class OptionalPropertyCodecProvider implements PropertyCodecProvider {
+    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry registry) {
+        // Check the main type and number of generic parameters
+        if (Optional.class.isAssignableFrom(type.getType()) && type.getTypeParameters().size() == 1) {
+            // Get the codec for the concrete type of the Optional, as its declared in the POJO.
+            Codec<?> valueCodec = registry.get(type.getTypeParameters().get(0));
+            return new OptionalCodec(type.getType(), valueCodec);
+        } else {
+            return null;
+        }
+    }
+
+    private static final class OptionalCodec<T> implements Codec<Optional<T>> {
+        private final Class<Optional<T>> encoderClass;
+        private final Codec<T> codec;
+
+        private OptionalCodec(final Class<Optional<T>> encoderClass, final Codec<T> codec) {
+            this.encoderClass = encoderClass;
+            this.codec = codec;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Optional<T> optionalValue, final EncoderContext encoderContext) {
+            if (optionalValue != null && optionalValue.isPresent()) {
+                codec.encode(writer, optionalValue.get(), encoderContext);
+            } else {
+                writer.writeNull();
+            }
+        }
+
+        @Override
+        public Optional<T> decode(final BsonReader reader, final DecoderContext context) {
+            return Optional.of(codec.decode(reader, context));
+        }
+
+        @Override
+        public Class<Optional<T>> getEncoderClass() {
+            return encoderClass;
+        }
+    }
+}
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/Pojo.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/Pojo.java
new file mode 100644
index 0000000000000..1f4ddbac63ba9
--- /dev/null
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/Pojo.java
@@ -0,0 +1,11 @@
+package io.quarkus.it.mongodb.pojo;
+
+import java.util.Optional;
+
+import org.bson.types.ObjectId;
+
+public class Pojo {
+    public ObjectId id;
+    public String description;
+    public Optional<String> optionalString;
+}
diff --git a/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java
new file mode 100644
index 0000000000000..ee49e1b059508
--- /dev/null
+++ b/integration-tests/mongodb-client/src/main/java/io/quarkus/it/mongodb/pojo/PojoResource.java
@@ -0,0 +1,54 @@
+package io.quarkus.it.mongodb.pojo;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+
+import io.smallrye.common.annotation.Blocking;
+
+@Path("/pojos")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Blocking
+public class PojoResource {
+    @Inject
+    MongoClient client;
+
+    private MongoCollection<Pojo> getCollection() {
+        return client.getDatabase("books").getCollection("pojo", Pojo.class);
+    }
+
+    @GET
+    public List<Pojo> getPojos() {
+        FindIterable<Pojo> iterable = getCollection().find();
+        List<Pojo> pojos = new ArrayList<>();
+        for (Pojo doc : iterable) {
+            pojos.add(doc);
+        }
+        return pojos;
+    }
+
+    @POST
+    public Response addPojo(Pojo pojo) throws UnsupportedEncodingException {
+        getCollection().insertOne(pojo);
+        return Response
+                .created(URI.create("/pojos/" + URLEncoder.encode(pojo.id.toString(), StandardCharsets.UTF_8.toString())))
+                .build();
+    }
+}
diff --git a/integration-tests/mongodb-client/src/main/resources/application.properties b/integration-tests/mongodb-client/src/main/resources/application.properties
index eed33da79fbf3..47c195fe3393e 100644
--- a/integration-tests/mongodb-client/src/main/resources/application.properties
+++ b/integration-tests/mongodb-client/src/main/resources/application.properties
@@ -1,2 +1,4 @@
 quarkus.mongodb.connection-string=mongodb://localhost:27018
-quarkus.mongodb.write-concern.journal=false
\ No newline at end of file
+quarkus.mongodb.write-concern.journal=false
+quarkus.mongodb.parameter-injection.connection-string=mongodb://localhost:27018
+quarkus.mongodb.parameter-injection.write-concern.journal=false
\ No newline at end of file
diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java
index b1d6d19718282..a46fbd778b4b1 100644
--- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java
+++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java
@@ -2,53 +2,28 @@
 
 import static io.restassured.RestAssured.get;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
 
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.it.mongodb.discriminator.Car;
-import io.quarkus.it.mongodb.discriminator.Moto;
+import io.quarkus.mongodb.health.MongoHealthCheck;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import io.restassured.common.mapper.TypeRef;
-import io.restassured.config.ObjectMapperConfig;
-import io.restassured.mapper.ObjectMapper;
-import io.restassured.mapper.ObjectMapperDeserializationContext;
-import io.restassured.mapper.ObjectMapperSerializationContext;
-import io.restassured.response.Response;
 
 @QuarkusTest
 @QuarkusTestResource(MongoTestResource.class)
 public class BookResourceTest {
-
     private static Jsonb jsonb;
 
     @BeforeAll
     public static void giveMeAMapper() {
-        jsonb = JsonbBuilder.create();
-        ObjectMapper mapper = new ObjectMapper() {
-            @Override
-            public Object deserialize(ObjectMapperDeserializationContext context) {
-                return jsonb.fromJson(context.getDataToDeserialize().asString(), context.getType());
-            }
-
-            @Override
-            public Object serialize(ObjectMapperSerializationContext context) {
-                return jsonb.toJson(context.getObjectToSerialize());
-            }
-        };
-        RestAssured.config().objectMapperConfig(ObjectMapperConfig.objectMapperConfig().defaultObjectMapper(mapper));
+        jsonb = Utils.initialiseJsonb();
     }
 
     @AfterAll
@@ -58,91 +33,22 @@ public static void releaseMapper() throws Exception {
 
     @Test
     public void testBlockingClient() {
-        callTheEndpoint("/books");
-    }
-
-    private void callTheEndpoint(String endpoint) {
-        List<Book> list = get(endpoint).as(new TypeRef<List<Book>>() {
-        });
-        Assertions.assertEquals(0, list.size());
-
-        Book book1 = new Book().setAuthor("Victor Hugo").setTitle("Les Misérables")
-                .setCategories(Arrays.asList("long", "very long"))
-                .setDetails(new BookDetail().setRating(3).setSummary("A very long book"));
-        Response response = RestAssured
-                .given()
-                .header("Content-Type", "application/json")
-                .body(book1)
-                .post(endpoint)
-                .andReturn();
-        Assertions.assertEquals(202, response.statusCode());
-
-        Book book2 = new Book().setAuthor("Victor Hugo").setTitle("Notre-Dame de Paris")
-                .setCategories(Arrays.asList("long", "quasimodo"))
-                .setDetails(new BookDetail().setRating(4).setSummary("quasimodo and esmeralda"));
-        response = RestAssured
-                .given()
-                .header("Content-Type", "application/json")
-                .body(book2)
-                .post(endpoint)
-                .andReturn();
-        Assertions.assertEquals(202, response.statusCode());
-
-        list = get(endpoint).as(new TypeRef<List<Book>>() {
-        });
-        Assertions.assertEquals(2, list.size());
-
-        Book book3 = new Book().setAuthor("Charles Baudelaire").setTitle("Les fleurs du mal")
-                .setCategories(Collections.singletonList("poem"))
-                .setDetails(new BookDetail().setRating(2).setSummary("Les Fleurs du mal is a volume of poetry."));
-        response = RestAssured
-                .given()
-                .header("Content-Type", "application/json")
-                .body(book3)
-                .post(endpoint)
-                .andReturn();
-        Assertions.assertEquals(202, response.statusCode());
-
-        list = get(endpoint).as(new TypeRef<List<Book>>() {
-        });
-        Assertions.assertEquals(3, list.size());
-
-        list = get(endpoint + "/Victor Hugo").as(new TypeRef<List<Book>>() {
-        });
-        Assertions.assertEquals(2, list.size());
+        Utils.callTheEndpoint("/books");
     }
 
     @Test
     public void testReactiveClients() {
-        callTheEndpoint("/reactive-books");
+        Utils.callTheEndpoint("/reactive-books");
     }
 
     @Test
     public void health() throws Exception {
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .body("status", is("UP"),
+                        "checks.data", containsInAnyOrder(hasKey(MongoHealthCheck.CLIENT_DEFAULT)),
+                        "checks.data", containsInAnyOrder(hasKey(MongoHealthCheck.CLIENT_DEFAULT_REACTIVE)),
                         "checks.status", containsInAnyOrder("UP"),
                         "checks.name", containsInAnyOrder("MongoDB connection health check"));
     }
 
-    @Test
-    public void testVehicleEndpoint() {
-        Car car = new Car();
-        car.name = "Renault Clio";
-        car.type = "CAR";
-        car.seatNumber = 5;
-        RestAssured.given().header("Content-Type", "application/json").body(car)
-                .when().post("/vehicles")
-                .then().statusCode(201);
-
-        Moto moto = new Moto();
-        moto.name = "Harley Davidson Sportster";
-        moto.type = "MOTO";
-        RestAssured.given().header("Content-Type", "application/json").body(moto)
-                .when().post("/vehicles")
-                .then().statusCode(201);
-
-        get("/vehicles").then().statusCode(200).body("size()", is(2));
-    }
-
 }
diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java
new file mode 100644
index 0000000000000..d9399564e0b7f
--- /dev/null
+++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceWithParameterInjectionTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.mongodb;
+
+import static org.hamcrest.Matchers.*;
+
+import javax.json.bind.Jsonb;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+@QuarkusTestResource(MongoTestResource.class)
+public class BookResourceWithParameterInjectionTest {
+
+    private static Jsonb jsonb;
+
+    @BeforeAll
+    public static void giveMeAMapper() {
+        jsonb = Utils.initialiseJsonb();
+    }
+
+    @AfterAll
+    public static void releaseMapper() throws Exception {
+        jsonb.close();
+    }
+
+    @Test
+    public void testInjectedClient() {
+        Utils.callTheEndpoint("/books-with-parameter-injection");
+    }
+}
diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/MongoTestResource.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/MongoTestResource.java
index 6049b6aa0a373..01513ad858ecb 100644
--- a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/MongoTestResource.java
+++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/MongoTestResource.java
@@ -6,12 +6,16 @@
 
 import org.jboss.logging.Logger;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
@@ -22,6 +26,13 @@ public class MongoTestResource implements QuarkusTestResourceLifecycleManager {
 
     @Override
     public Map<String, String> start() {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
         try {
             Version.Main version = Version.Main.V4_0;
             int port = 27018;
@@ -60,7 +71,11 @@ private MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @Override
diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceWithParameterInjectionIT.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceWithParameterInjectionIT.java
new file mode 100644
index 0000000000000..36876faebc7ee
--- /dev/null
+++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/NativeBookResourceWithParameterInjectionIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.mongodb;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class NativeBookResourceWithParameterInjectionIT extends BookResourceWithParameterInjectionTest {
+
+}
diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java
new file mode 100644
index 0000000000000..1981ca915baf7
--- /dev/null
+++ b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/Utils.java
@@ -0,0 +1,92 @@
+package io.quarkus.it.mongodb;
+
+import static io.restassured.RestAssured.get;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+
+import org.junit.jupiter.api.Assertions;
+
+import io.restassured.RestAssured;
+import io.restassured.common.mapper.TypeRef;
+import io.restassured.config.ObjectMapperConfig;
+import io.restassured.mapper.ObjectMapper;
+import io.restassured.mapper.ObjectMapperDeserializationContext;
+import io.restassured.mapper.ObjectMapperSerializationContext;
+import io.restassured.response.Response;
+
+class Utils {
+    static Jsonb initialiseJsonb() {
+        Jsonb jsonb = JsonbBuilder.create();
+        ObjectMapper mapper = new ObjectMapper() {
+            @Override
+            public Object deserialize(ObjectMapperDeserializationContext context) {
+                return jsonb.fromJson(context.getDataToDeserialize().asString(), context.getType());
+            }
+
+            @Override
+            public Object serialize(ObjectMapperSerializationContext context) {
+                return jsonb.toJson(context.getObjectToSerialize());
+            }
+        };
+        RestAssured.config().objectMapperConfig(ObjectMapperConfig.objectMapperConfig().defaultObjectMapper(mapper));
+
+        return jsonb;
+    }
+
+    static void callTheEndpoint(String endpoint) {
+        List<Book> list = get(endpoint).as(new TypeRef<List<Book>>() {
+        });
+        Assertions.assertEquals(0, list.size());
+
+        Book book1 = new Book().setAuthor("Victor Hugo").setTitle("Les Misérables")
+                .setCategories(Arrays.asList("long", "very long"))
+                .setDetails(new BookDetail().setRating(3).setSummary("A very long book"));
+        Response response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book1)
+                .post(endpoint)
+                .andReturn();
+        Assertions.assertEquals(202, response.statusCode());
+
+        Book book2 = new Book().setAuthor("Victor Hugo").setTitle("Notre-Dame de Paris")
+                .setCategories(Arrays.asList("long", "quasimodo"))
+                .setDetails(new BookDetail().setRating(4).setSummary("quasimodo and esmeralda"));
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book2)
+                .post(endpoint)
+                .andReturn();
+        Assertions.assertEquals(202, response.statusCode());
+
+        list = get(endpoint).as(new TypeRef<List<Book>>() {
+        });
+        Assertions.assertEquals(2, list.size());
+
+        Book book3 = new Book().setAuthor("Charles Baudelaire").setTitle("Les fleurs du mal")
+                .setCategories(Collections.singletonList("poem"))
+                .setDetails(new BookDetail().setRating(2).setSummary("Les Fleurs du mal is a volume of poetry."));
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book3)
+                .post(endpoint)
+                .andReturn();
+        Assertions.assertEquals(202, response.statusCode());
+
+        list = get(endpoint).as(new TypeRef<List<Book>>() {
+        });
+        Assertions.assertEquals(3, list.size());
+
+        list = get(endpoint + "/Victor Hugo").as(new TypeRef<List<Book>>() {
+        });
+        Assertions.assertEquals(2, list.size());
+    }
+
+}
diff --git a/integration-tests/mongodb-panache-kotlin/disable-native-profile b/integration-tests/mongodb-panache-kotlin/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/pom.xml b/integration-tests/mongodb-panache-kotlin/pom.xml
new file mode 100755
index 0000000000000..69cd94f5f2ddf
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/pom.xml
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-mongodb-panache-kotlin</artifactId>
+
+    <name>Quarkus - Integration Tests - MongoDB Panache Kotlin</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-kotlin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Force the scope to compile as we make assertions inside the resources -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-panache-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-kotlin-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-allopen</artifactId>
+                        <version>${kotlin.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <compilerPlugins>
+                        <plugin>all-open</plugin>
+                    </compilerPlugins>
+                    <pluginOptions>
+                        <option>all-open:annotation=javax.ws.rs.Path</option>
+                    </pluginOptions>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/Book.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/Book.kt
new file mode 100644
index 0000000000000..63d54cd962df3
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/Book.kt
@@ -0,0 +1,58 @@
+package io.quarkus.it.mongodb.panache.book
+
+import io.quarkus.mongodb.panache.MongoEntity
+import org.bson.codecs.pojo.annotations.BsonIgnore
+import org.bson.codecs.pojo.annotations.BsonProperty
+import org.bson.types.ObjectId
+import java.time.LocalDate
+import javax.json.bind.annotation.JsonbDateFormat
+
+@MongoEntity(collection = "TheBook", clientName = "cl2")
+class Book {
+    @BsonProperty("bookTitle")
+    var title: String? = null
+        private set
+    var author: String? = null
+        private set
+    var id: ObjectId? = null
+
+    @BsonIgnore
+    var transientDescription: String? = null
+        private set
+
+    @JsonbDateFormat("yyyy-MM-dd")
+    var creationDate: LocalDate? = null
+    var categories = listOf<String>()
+        private set
+    private var details: BookDetail? = null
+
+    fun setTitle(title: String?): Book {
+        this.title = title
+        return this
+    }
+
+    fun setAuthor(author: String?): Book {
+        this.author = author
+        return this
+    }
+
+    fun setCategories(categories: List<String>): Book {
+        this.categories = categories
+        return this
+    }
+
+    fun getDetails(): BookDetail? {
+        return details
+    }
+
+    fun setDetails(details: BookDetail?): Book {
+        this.details = details
+        return this
+    }
+
+    fun setTransientDescription(transientDescription: String?): Book {
+        this.transientDescription = transientDescription
+        return this
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookDetail.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookDetail.kt
new file mode 100644
index 0000000000000..5b4d2e2a9a737
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookDetail.kt
@@ -0,0 +1,18 @@
+package io.quarkus.it.mongodb.panache.book
+
+class BookDetail {
+    var summary: String? = null
+        private set
+    var rating = 0
+        private set
+
+    fun setSummary(summary: String?): BookDetail {
+        this.summary = summary
+        return this
+    }
+
+    fun setRating(rating: Int): BookDetail {
+        this.rating = rating
+        return this
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntity.kt
new file mode 100644
index 0000000000000..5b61afc594a48
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntity.kt
@@ -0,0 +1,60 @@
+package io.quarkus.it.mongodb.panache.book
+
+import io.quarkus.mongodb.panache.MongoEntity
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity
+import io.quarkus.mongodb.panache.kotlin.runtime.KotlinMongoOperations.Companion.INSTANCE
+import org.bson.codecs.pojo.annotations.BsonIgnore
+import org.bson.codecs.pojo.annotations.BsonProperty
+import org.bson.types.ObjectId
+import java.time.LocalDate
+import javax.json.bind.annotation.JsonbDateFormat
+
+@MongoEntity(collection = "TheBookEntity", clientName = "cl2")
+class BookEntity : PanacheMongoEntity() {
+    companion object : PanacheMongoCompanion<BookEntity> {
+        override fun findById(id: ObjectId): BookEntity {
+            return INSTANCE.findById(BookEntity::class.java, id) as BookEntity
+        }
+    }
+
+    @BsonProperty("bookTitle")
+    var title: String? = null
+        private set
+    var author: String? = null
+        private set
+
+    @BsonIgnore
+    var transientDescription: String? = null
+
+    @JsonbDateFormat("yyyy-MM-dd")
+    var creationDate: LocalDate? = null
+    var categories = listOf<String>()
+        private set
+    private var details: BookDetail? = null
+
+    fun setTitle(title: String?): BookEntity {
+        this.title = title
+        return this
+    }
+
+    fun setAuthor(author: String?): BookEntity {
+        this.author = author
+        return this
+    }
+
+    fun setCategories(categories: List<String>): BookEntity {
+        this.categories = categories
+        return this
+    }
+
+    fun getDetails(): BookDetail? {
+        return details
+    }
+
+    fun setDetails(details: BookDetail?): BookEntity {
+        this.details = details
+        return this
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt
new file mode 100644
index 0000000000000..a497760f76c97
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookEntityResource.kt
@@ -0,0 +1,109 @@
+package io.quarkus.it.mongodb.panache.book
+
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import org.bson.types.ObjectId
+import org.jboss.logging.Logger
+import java.net.URI
+import java.time.LocalDate
+import javax.annotation.PostConstruct
+import javax.ws.rs.Consumes
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.NotFoundException
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.Produces
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/books/entity")
+class BookEntityResource {
+    @PostConstruct
+    fun init() {
+        val databaseName: String = BookEntity.mongoDatabase().name
+        val collectionName: String = BookEntity.mongoCollection().namespace.collectionName
+        LOGGER.infov("Using BookEntity[database={0}, collection={1}]", databaseName, collectionName)
+    }
+
+    @GET
+    fun getBooks(@QueryParam("sort") sort: String?): List<BookEntity> {
+        return if (sort != null) {
+            BookEntity.listAll(Sort.ascending(sort))
+        } else BookEntity.listAll()
+    }
+
+    @POST
+    fun addBook(book: BookEntity): Response {
+        book.persist()
+        val id: String = book.id.toString()
+        return Response.created(URI.create("/books/entity/$id")).build()
+    }
+
+    @PUT
+    fun updateBook(book: BookEntity): Response {
+        book.update()
+        return Response.accepted().build()
+    }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertBook(book: BookEntity): Response {
+        book.persistOrUpdate()
+        return Response.accepted().build()
+    }
+
+    @DELETE
+    @Path("/{id}")
+    fun deleteBook(@PathParam("id") id: String?) {
+        val deleted: Boolean = BookEntity.deleteById(ObjectId(id))
+        if (!deleted) {
+            throw NotFoundException()
+        }
+    }
+
+    @GET
+    @Path("/{id}")
+    fun getBook(@PathParam("id") id: String?): BookEntity = BookEntity.findById(ObjectId(id))
+
+    @GET
+    @Path("/search/{author}")
+    fun getBooksByAuthor(@PathParam("author") author: String): List<BookShortView> =
+            BookEntity.find("author", author).project(BookShortView::class.java).list()
+
+    @GET
+    @Path("/search")
+    fun search(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+               @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): BookEntity? {
+        return if (author != null) {
+            BookEntity.find("{'author': ?1,'bookTitle': ?2}", author, title!!).firstResult()
+        } else BookEntity
+                .find("{'creationDate': {\$gte: ?1}, 'creationDate': {\$lte: ?2}}", LocalDate.parse(dateFrom),
+                        LocalDate.parse(dateTo))
+                .firstResult()
+    }
+
+    @GET
+    @Path("/search2")
+    fun search2(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+                @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): BookEntity? {
+        return if (author != null) {
+            BookEntity.find("{'author': :author,'bookTitle': :title}",
+                    Parameters.with("author", author).and("title", title)).firstResult()
+        } else BookEntity.find("{'creationDate': {\$gte: :dateFrom}, 'creationDate': {\$lte: :dateTo}}",
+                Parameters.with("dateFrom", LocalDate.parse(dateFrom)).and("dateTo", LocalDate.parse(dateTo))).firstResult()
+    }
+
+    @DELETE
+    fun deleteAll() {
+        BookEntity.deleteAll()
+    }
+
+    companion object {
+        private val LOGGER: Logger = Logger.getLogger(BookEntityResource::class.java)
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt
new file mode 100644
index 0000000000000..c2d2bebd4c4e6
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepository.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.book
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class BookRepository : PanacheMongoRepository<Book>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt
new file mode 100644
index 0000000000000..c2e21277abe52
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.kt
@@ -0,0 +1,112 @@
+package io.quarkus.it.mongodb.panache.book
+
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import org.bson.types.ObjectId
+import org.jboss.logging.Logger
+import java.net.URI
+import java.time.LocalDate
+import javax.annotation.PostConstruct
+import javax.inject.Inject
+import javax.ws.rs.Consumes
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.NotFoundException
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.Produces
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/books/repository")
+class BookRepositoryResource {
+    @Inject
+    lateinit var bookRepository: BookRepository
+
+    @PostConstruct
+    fun init() {
+        val databaseName: String = bookRepository.mongoDatabase().name
+        val collectionName: String = bookRepository.mongoCollection().namespace.collectionName
+        LOGGER.infov("Using BookRepository[database={0}, collection={1}]", databaseName, collectionName)
+    }
+
+    @GET
+    fun getBooks(@QueryParam("sort") sort: String?): List<Book> {
+        return if (sort != null) {
+            bookRepository.listAll(Sort.ascending(sort))
+        } else bookRepository.listAll()
+    }
+
+    @POST
+    fun addBook(book: Book): Response {
+        bookRepository.persist(book)
+        return Response.created(URI.create("/books/entity${book.id}")).build()
+    }
+
+    @PUT
+    fun updateBook(book: Book): Response {
+        bookRepository.update(book)
+        return Response.accepted().build()
+    }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertBook(book: Book): Response {
+        bookRepository.persistOrUpdate(book)
+        return Response.accepted().build()
+    }
+
+    @DELETE
+    @Path("/{id}")
+    fun deleteBook(@PathParam("id") id: String) {
+        val deleted: Boolean = bookRepository.deleteById(ObjectId(id))
+        if (!deleted) {
+            throw NotFoundException()
+        }
+    }
+
+    @GET
+    @Path("/{id}")
+    fun getBook(@PathParam("id") id: String?) = bookRepository.findById(ObjectId(id))
+
+    @GET
+    @Path("/search/{author}")
+    fun getBooksByAuthor(@PathParam("author") author: String): List<BookShortView> =
+            bookRepository.find("author", author).project(BookShortView::class.java).list()
+
+    @GET
+    @Path("/search")
+    fun search(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+               @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): Book? {
+        return if (author != null) {
+            bookRepository.find("{'author': ?1,'bookTitle': ?2}", author, title!!).firstResult()
+        } else bookRepository
+                .find("{'creationDate': {\$gte: ?1}, 'creationDate': {\$lte: ?2}}", LocalDate.parse(dateFrom),
+                        LocalDate.parse(dateTo))
+                .firstResult() ?: throw  NotFoundException()
+    }
+
+    @GET
+    @Path("/search2")
+    fun search2(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+                @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): Book? {
+        return if (author != null) {
+            bookRepository.find("{'author': :author,'bookTitle': :title}",
+                    Parameters.with("author", author).and("title", title)).firstResult()
+        } else bookRepository.find("{'creationDate': {\$gte: :dateFrom}, 'creationDate': {\$lte: :dateTo}}",
+                Parameters.with("dateFrom", LocalDate.parse(dateFrom)).and("dateTo", LocalDate.parse(dateTo))).firstResult()
+    }
+
+    @DELETE
+    fun deleteAll() {
+        bookRepository.deleteAll()
+    }
+
+    companion object {
+        private val LOGGER: Logger = Logger.getLogger(BookRepositoryResource::class.java)
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookShortView.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookShortView.kt
new file mode 100644
index 0000000000000..fe12bfd04ed45
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/book/BookShortView.kt
@@ -0,0 +1,15 @@
+package io.quarkus.it.mongodb.panache.book
+
+import io.quarkus.mongodb.panache.ProjectionFor
+import java.time.LocalDate
+import javax.json.bind.annotation.JsonbDateFormat
+
+@ProjectionFor(Book::class)
+class BookShortView {
+    // uses the field name title and not the column name bookTitle
+    var title: String? = null
+    var author: String? = null
+
+    @JsonbDateFormat("yyyy-MM-dd")
+    var creationDate: LocalDate? = null
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/AbstractRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/AbstractRepository.kt
new file mode 100644
index 0000000000000..aa5732ad6656d
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/AbstractRepository.kt
@@ -0,0 +1,5 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase
+
+abstract class AbstractRepository<T: Any> : PanacheMongoRepositoryBase<T, String>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt
new file mode 100644
index 0000000000000..7abdd45fa5479
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5274EntityRepository.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.it.mongodb.panache.book.Book
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class Bug5274EntityRepository : AbstractRepository<Book>()
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885AbstractRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885AbstractRepository.kt
new file mode 100644
index 0000000000000..ec8109aa86bb5
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885AbstractRepository.kt
@@ -0,0 +1,5 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase
+
+abstract class Bug5885AbstractRepository<T: Any> : PanacheMongoRepositoryBase<T, Long>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt
new file mode 100644
index 0000000000000..fdd2538e763f2
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug5885EntityRepository.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.it.mongodb.panache.person.PersonEntity
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class Bug5885EntityRepository : Bug5885AbstractRepository<PersonEntity>()
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324AbstractRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324AbstractRepository.kt
new file mode 100644
index 0000000000000..0ad66742a6eee
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324AbstractRepository.kt
@@ -0,0 +1,5 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository
+
+abstract class Bug6324AbstractRepository<T: Any> : PanacheMongoRepository<T>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt
new file mode 100644
index 0000000000000..4b98163786cb5
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324ConcreteRepository.kt
@@ -0,0 +1,6 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class Bug6324ConcreteRepository : Bug6324AbstractRepository<NeedReflection>()
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt
new file mode 100644
index 0000000000000..78ed184bd4736
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/Bug6324Repository.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class Bug6324Repository : PanacheMongoRepository<NeedReflection>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt
new file mode 100644
index 0000000000000..06b7af4bb4463
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/BugResource.kt
@@ -0,0 +1,94 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.temporal.ChronoUnit
+import java.util.Date
+import javax.inject.Inject
+import javax.ws.rs.Consumes
+import javax.ws.rs.GET
+import javax.ws.rs.NotFoundException
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/bugs")
+@Produces(MediaType.TEXT_PLAIN)
+@Consumes(MediaType.TEXT_PLAIN)
+class BugResource {
+    @Inject
+    lateinit var bug5274EntityRepository: Bug5274EntityRepository
+
+    @Inject
+    lateinit var bug5885EntityRepository: Bug5885EntityRepository
+
+    @Inject
+    lateinit var bug6324Repository: Bug6324Repository
+
+    @Inject
+    lateinit var bug6324ConcreteRepository: Bug6324ConcreteRepository
+
+    @GET
+    @Path("5274")
+    fun testBug5274(): String {
+        bug5274EntityRepository.count()
+        return "OK"
+    }
+
+    @GET
+    @Path("5885")
+    fun testBug5885(): String {
+        bug5885EntityRepository.findById(1L)
+        return "OK"
+    }
+
+    @GET
+    @Path("6324")
+    fun testNeedReflection(): Response {
+        return Response.ok(bug6324Repository.listAll()).build()
+    }
+
+    @GET
+    @Path("6324/abstract")
+    fun testNeedReflectionAndAbstract(): Response {
+        return Response.ok(bug6324ConcreteRepository.listAll()).build()
+    }
+
+    @GET
+    @Path("dates")
+    fun testDatesFormat(): Response {
+        val dateEntity = DateEntity()
+        dateEntity.persist()
+
+        // search on all possible fields
+        val millisInDay = 1000 * 60 * 60 * 24.toLong()
+        val dateTomorrow = Date(System.currentTimeMillis() + 1000 * millisInDay)
+        val localDateTomorrow: LocalDate = LocalDate.now().plus(1, ChronoUnit.DAYS)
+        val localDateTimeTomorrow: LocalDateTime = LocalDateTime.now().plus(1, ChronoUnit.DAYS)
+        val instantTomorrow: Instant = Instant.now().plus(1, ChronoUnit.DAYS)
+        val result: DateEntity = DateEntity
+                .find("dateDate < ?1 and localDate < ?2 and localDateTime < ?3 and instant < ?4",
+                        dateTomorrow, localDateTomorrow, localDateTimeTomorrow, instantTomorrow)
+                .firstResult()
+                ?: return Response.status(404).build()
+        return Response.ok().build()
+    }
+
+    @GET
+    @Path("7415")
+    fun testForeignObjectId(): Response {
+        val link = LinkedEntity()
+        link.name = "toto"
+        link.persist()
+        val entity = LinkedEntity()
+        entity.name = "tata"
+        entity.myForeignId = link.id
+        entity.persist()
+
+        // we should be able to retrieve `entity` from the foreignId ...
+        LinkedEntity.find("myForeignId", link.id!!).firstResult() ?: throw NotFoundException()
+        return Response.ok().build()
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/DateEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/DateEntity.kt
new file mode 100644
index 0000000000000..b9390d4ab5f6d
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/DateEntity.kt
@@ -0,0 +1,19 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity
+import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.util.Date
+
+/**
+ * An entity that have all the supported date format.
+ * Asserting #6566 and possibility other date issues.
+ */
+class DateEntity(var dateDate: Date = Date(), var localDate: LocalDate = LocalDate.now(),
+                 var localDateTime: LocalDateTime = LocalDateTime.now(),
+                 var instant: Instant = Instant.now()) : PanacheMongoEntity() {
+    companion object: PanacheMongoCompanion<DateEntity>
+
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/LinkedEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/LinkedEntity.kt
new file mode 100644
index 0000000000000..72fecd3e9a8d4
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/LinkedEntity.kt
@@ -0,0 +1,12 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity
+import org.bson.types.ObjectId
+
+class LinkedEntity : PanacheMongoEntity() {
+    companion object: PanacheMongoCompanion<LinkedEntity>
+
+    var name: String? = null
+    var myForeignId: ObjectId? = null
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/NeedReflection.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/NeedReflection.kt
new file mode 100644
index 0000000000000..5af253182e2c2
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/bugs/NeedReflection.kt
@@ -0,0 +1,5 @@
+package io.quarkus.it.mongodb.panache.bugs
+
+class NeedReflection {
+    var comment: String? = null
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt
new file mode 100644
index 0000000000000..25debd8c5a899
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/MockablePersonRepository.kt
@@ -0,0 +1,14 @@
+package io.quarkus.it.mongodb.panache.person
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase
+import io.quarkus.panache.common.Sort
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+open class MockablePersonRepository : PanacheMongoRepositoryBase<PersonEntity, Long> {
+    open fun findOrdered(): List<PersonEntity>? {
+        val sort = Sort.by("lastname", "firstname")
+        val found = findAll(sort)
+        return found.list()
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/Person.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/Person.kt
new file mode 100644
index 0000000000000..df6b9ef791943
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/Person.kt
@@ -0,0 +1,11 @@
+package io.quarkus.it.mongodb.panache.person
+
+import org.bson.codecs.pojo.annotations.BsonId
+
+class Person {
+    @BsonId
+    var id: Long? = null
+    var firstname: String? = null
+    var lastname: String? = null
+    var status: Status = Status.ALIVE
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonEntity.kt
new file mode 100644
index 0000000000000..9ded9fd233696
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonEntity.kt
@@ -0,0 +1,21 @@
+package io.quarkus.it.mongodb.panache.person
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanionBase
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntityBase
+import io.quarkus.panache.common.Sort
+import org.bson.codecs.pojo.annotations.BsonId
+
+class PersonEntity : PanacheMongoEntityBase() {
+    @BsonId
+    var id: Long? = null
+    var firstname: String? = null
+    var lastname: String? = null
+    var status: Status = Status.ALIVE
+
+    companion object : PanacheMongoCompanionBase<PersonEntity, Long> {
+        fun findOrdered(): List<PersonEntity> {
+            return findAll(Sort.by("lastname", "firstname")).list()
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonName.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonName.kt
new file mode 100644
index 0000000000000..5808cd7e3df1b
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonName.kt
@@ -0,0 +1,18 @@
+package io.quarkus.it.mongodb.panache.person
+
+class PersonName {
+    var lastname: String? = null
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is PersonName) return false
+
+        if (lastname != other.lastname) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return lastname?.hashCode() ?: 0
+    }
+
+}
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt
new file mode 100644
index 0000000000000..d38f6b57708ab
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/PersonRepository.kt
@@ -0,0 +1,8 @@
+package io.quarkus.it.mongodb.panache.person
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class PersonRepository : PanacheMongoRepositoryBase<Person, Long> {
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/Status.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/Status.kt
new file mode 100644
index 0000000000000..c23cf9418ee47
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/Status.kt
@@ -0,0 +1,10 @@
+package io.quarkus.it.mongodb.panache.person
+
+enum class Status(val value: String) {
+    DEAD("I'm a Zombie"), ALIVE("I alive!");
+
+    override fun toString(): String {
+        return value
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt
new file mode 100644
index 0000000000000..a228c866131c3
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.kt
@@ -0,0 +1,87 @@
+package io.quarkus.it.mongodb.panache.person.resources
+
+import com.mongodb.ReadPreference
+import io.quarkus.it.mongodb.panache.person.PersonEntity
+import io.quarkus.it.mongodb.panache.person.PersonName
+import io.quarkus.it.mongodb.panache.person.Status
+import io.quarkus.panache.common.Sort
+import java.net.URI
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.Response
+
+@Path("/persons/entity")
+class PersonEntityResource {
+    @GET
+    fun getPersons(@QueryParam("sort") sort: String?): List<PersonEntity> =
+            sort?.let { PersonEntity.listAll(Sort.ascending(sort)) }
+                    ?: PersonEntity.listAll()
+
+    @GET
+    @Path("/search/{name}")
+    fun searchPersons(@PathParam("name") name: String): Set<PersonName> {
+        return PersonEntity.find("lastname = ?1 and status = ?2", name, Status.ALIVE)
+                .project(PersonName::class.java)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list()
+                .toSet()
+    }
+
+    @POST
+    fun addPerson(person: PersonEntity): Response {
+        person.persist()
+        return Response.created(URI.create("/persons/entity/${person.id}")).build()
+    }
+
+    @POST
+    @Path("/multiple")
+    fun addPersons(persons: List<PersonEntity>) {
+        PersonEntity.persist(persons)
+    }
+
+    @PUT
+    fun updatePerson(person: PersonEntity): Response {
+        person.update()
+        return Response.accepted().build()
+    }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertPerson(person: PersonEntity): Response {
+        person.persistOrUpdate()
+        return Response.accepted().build()
+    }
+
+    @DELETE
+    @Path("/{id}")
+    fun deletePerson(@PathParam("id") id: String) {
+        PersonEntity.deleteById(id.toLong())
+    }
+
+    @GET
+    @Path("/{id}")
+    fun getPerson(@PathParam("id") id: String) = PersonEntity.findById(id.toLong())
+
+    @GET
+    @Path("/count")
+    fun countAll(): Long = PersonEntity.count()
+
+    @DELETE
+    fun deleteAll() {
+        PersonEntity.deleteAll()
+    }
+
+    @POST
+    @Path("/rename")
+    fun rename(@QueryParam("previousName") previousName: String, @QueryParam("newName") newName: String): Response {
+        PersonEntity.update("lastname", newName)
+                .where("lastname", previousName)
+        return Response.ok().build()
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt
new file mode 100644
index 0000000000000..78909274bbdcc
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.kt
@@ -0,0 +1,100 @@
+package io.quarkus.it.mongodb.panache.person.resources
+
+import com.mongodb.ReadPreference
+import io.quarkus.it.mongodb.panache.person.MockablePersonRepository
+import io.quarkus.it.mongodb.panache.person.Person
+import io.quarkus.it.mongodb.panache.person.PersonName
+import io.quarkus.it.mongodb.panache.person.PersonRepository
+import io.quarkus.it.mongodb.panache.person.Status
+import io.quarkus.panache.common.Sort
+import java.net.URI
+import javax.inject.Inject
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.Response
+
+@Path("/persons/repository")
+class PersonRepositoryResource {
+    // fake unused injection point to force ArC to not remove this otherwise I can't mock it in the tests
+    @Inject
+    lateinit var mockablePersonRepository: MockablePersonRepository
+
+    @Inject
+    lateinit var personRepository: PersonRepository
+
+    @GET
+    fun getPersons(@QueryParam("sort") sort: String?): List<Person> {
+        return sort?.let {
+            personRepository.listAll(Sort.ascending(sort))
+        } ?: personRepository.listAll()
+    }
+
+    @GET
+    @Path("/search/{name}")
+    fun searchPersons(@PathParam("name") name: String): Set<PersonName> {
+        return personRepository.find("lastname = ?1 and status = ?2", name, Status.ALIVE)
+                .project(PersonName::class.java)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list()
+                .toSet()
+    }
+
+    @POST
+    fun addPerson(person: Person): Response {
+        personRepository.persist(person)
+        return Response.created(URI.create("/persons/repository/${person.id}")).build()
+    }
+
+    @POST
+    @Path("/multiple")
+    fun addPersons(persons: List<Person>) {
+        personRepository.persist(persons)
+    }
+
+    @PUT
+    fun updatePerson(person: Person): Response {
+        personRepository.update(person)
+        return Response.accepted().build()
+    }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertPerson(person: Person): Response {
+        personRepository.persistOrUpdate(person)
+        return Response.accepted().build()
+    }
+
+    @DELETE
+    @Path("/{id}")
+    fun deletePerson(@PathParam("id") id: String) {
+        val person = personRepository.findById(id.toLong())
+        personRepository.delete(person!!)
+    }
+
+
+    @GET
+    @Path("/{id}")
+    fun getPerson(@PathParam("id") id: String) = personRepository.findById(id.toLong())
+
+    @GET
+    @Path("/count")
+    fun countAll(): Long = personRepository.count()
+
+    @DELETE
+    fun deleteAll() {
+        personRepository.deleteAll()
+    }
+
+    @POST
+    @Path("/rename")
+    fun rename(@QueryParam("previousName") previousName: String, @QueryParam("newName") newName: String): Response {
+        personRepository.update("lastname", newName).where("lastname", previousName)
+        return Response.ok().build()
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntity.kt
new file mode 100644
index 0000000000000..38ebce70fb33b
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntity.kt
@@ -0,0 +1,53 @@
+package io.quarkus.it.mongodb.panache.reactive.book
+
+import io.quarkus.it.mongodb.panache.book.BookDetail
+import io.quarkus.mongodb.panache.MongoEntity
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoEntity
+import org.bson.codecs.pojo.annotations.BsonIgnore
+import org.bson.codecs.pojo.annotations.BsonProperty
+import java.time.LocalDate
+import java.util.ArrayList
+import javax.json.bind.annotation.JsonbDateFormat
+
+@MongoEntity(collection = "TheBookEntity", clientName = "cl2")
+class ReactiveBookEntity : ReactivePanacheMongoEntity() {
+    companion object: ReactivePanacheMongoCompanion<ReactiveBookEntity>
+
+    @BsonProperty("bookTitle")
+    var title: String? = null
+        private set
+    var author: String? = null
+        private set
+
+    @BsonIgnore
+    var transientDescription: String? = null
+
+    @JsonbDateFormat("yyyy-MM-dd")
+    var creationDate: LocalDate? = null
+    var categories: List<String> = ArrayList()
+        private set
+    var details: BookDetail? = null
+        private set
+
+    fun setTitle(title: String?): ReactiveBookEntity {
+        this.title = title
+        return this
+    }
+
+    fun setAuthor(author: String?): ReactiveBookEntity {
+        this.author = author
+        return this
+    }
+
+    fun setCategories(categories: List<String>): ReactiveBookEntity {
+        this.categories = categories
+        return this
+    }
+
+    fun setDetails(details: BookDetail?): ReactiveBookEntity {
+        this.details = details
+        return this
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt
new file mode 100644
index 0000000000000..62dc6480aecfc
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.kt
@@ -0,0 +1,123 @@
+package io.quarkus.it.mongodb.panache.reactive.book
+
+import io.quarkus.panache.common.Parameters.with
+import io.quarkus.panache.common.Sort
+import io.smallrye.mutiny.Uni
+import org.bson.types.ObjectId
+import org.jboss.logging.Logger
+import org.jboss.resteasy.annotations.SseElementType
+import org.reactivestreams.Publisher
+import java.net.URI
+import java.time.LocalDate.parse
+import javax.annotation.PostConstruct
+import javax.ws.rs.Consumes
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.NotFoundException
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.Produces
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/reactive/books/entity")
+class ReactiveBookEntityResource {
+    @PostConstruct
+    fun init() {
+        val databaseName: String = ReactiveBookEntity.mongoDatabase().name
+        val collectionName: String = ReactiveBookEntity.mongoCollection().namespace.collectionName
+        LOGGER.infov("Using BookEntity[database={0}, collection={1}]", databaseName, collectionName)
+    }
+
+    @GET
+    fun getBooks(@QueryParam("sort") sort: String?): Uni<List<ReactiveBookEntity>> {
+        return if (sort != null) {
+            ReactiveBookEntity.listAll(Sort.ascending(sort))
+        } else ReactiveBookEntity.listAll()
+    }
+
+    @GET
+    @Path("/stream")
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    @SseElementType(MediaType.APPLICATION_JSON)
+    fun streamBooks(@QueryParam("sort") sort: String?): Publisher<ReactiveBookEntity> {
+        return if (sort != null) {
+            ReactiveBookEntity.streamAll(Sort.ascending(sort))
+        } else ReactiveBookEntity.streamAll()
+    }
+
+    @POST
+    fun addBook(book: ReactiveBookEntity): Uni<Response> {
+        return book.persist().map {
+            //the ID is populated before sending it to the database
+            Response.created(URI.create("/books/entity${book.id}")).build()
+        }
+    }
+
+    @PUT
+    fun updateBook(book: ReactiveBookEntity): Uni<Response> = book.update().map { _ -> Response.accepted().build() }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertBook(book: ReactiveBookEntity): Uni<Response> =
+            book.persistOrUpdate().map { v -> Response.accepted().build() }
+
+    @DELETE
+    @Path("/{id}")
+    fun deleteBook(@PathParam("id") id: String?): Uni<Void> {
+        return ReactiveBookEntity.deleteById(ObjectId(id))
+                .map { d ->
+                    if (d) {
+                        return@map null
+                    }
+                    throw NotFoundException()
+                }
+    }
+
+    @GET
+    @Path("/{id}")
+    fun getBook(@PathParam("id") id: String?): Uni<ReactiveBookEntity?> = ReactiveBookEntity.findById(ObjectId(id))
+
+    @GET
+    @Path("/search/{author}")
+    fun getBooksByAuthor(@PathParam("author") author: String): Uni<List<ReactiveBookEntity>> =
+            ReactiveBookEntity.list("author", author)
+
+    @GET
+    @Path("/search")
+    fun search(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+               @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): Uni<ReactiveBookEntity?> {
+        return if (author != null) {
+            ReactiveBookEntity.find("{'author': ?1,'bookTitle': ?2}", author, title!!).firstResult()
+        } else ReactiveBookEntity
+                .find("{'creationDate': {\$gte: ?1}, 'creationDate': {\$lte: ?2}}", parse(dateFrom),
+                        parse(dateTo))
+                .firstResult()
+    }
+
+    @GET
+    @Path("/search2")
+    fun search2(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+                @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?)
+            : Uni<ReactiveBookEntity?> =
+
+            if (author != null) {
+                ReactiveBookEntity.find("{'author': :author,'bookTitle': :title}",
+                        with("author", author).and("title", title)).firstResult()
+            } else {
+                ReactiveBookEntity.find("{'creationDate': {\$gte: :dateFrom}, 'creationDate': {\$lte: :dateTo}}",
+                        with("dateFrom", parse(dateFrom)).and("dateTo", parse(dateTo)))
+                        .firstResult()
+            }
+
+    @DELETE
+    fun deleteAll(): Uni<Void> = ReactiveBookEntity.deleteAll().map { l -> null }
+
+    companion object {
+        private val LOGGER: Logger = Logger.getLogger(ReactiveBookEntityResource::class.java)
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt
new file mode 100644
index 0000000000000..cae81fd8d66ce
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepository.kt
@@ -0,0 +1,8 @@
+package io.quarkus.it.mongodb.panache.reactive.book
+
+import io.quarkus.it.mongodb.panache.book.Book
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepository
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class ReactiveBookRepository : ReactivePanacheMongoRepository<Book>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt
new file mode 100644
index 0000000000000..7bcc43e3a141f
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.kt
@@ -0,0 +1,125 @@
+package io.quarkus.it.mongodb.panache.reactive.book
+
+import io.quarkus.it.mongodb.panache.book.Book
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import io.smallrye.mutiny.Uni
+import org.bson.types.ObjectId
+import org.jboss.logging.Logger
+import org.jboss.resteasy.annotations.SseElementType
+import org.reactivestreams.Publisher
+import java.net.URI
+import java.time.LocalDate
+import javax.annotation.PostConstruct
+import javax.inject.Inject
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.NotFoundException
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.Produces
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
+
+@Path("/reactive/books/repository")
+class ReactiveBookRepositoryResource {
+    @Inject
+    lateinit var reactiveBookRepository: ReactiveBookRepository
+
+    @PostConstruct
+    fun init() {
+        val databaseName: String = reactiveBookRepository.mongoDatabase().name
+        val collectionName: String = reactiveBookRepository.mongoCollection().namespace.collectionName
+        LOGGER.infov("Using BookRepository[database={0}, collection={1}]", databaseName, collectionName)
+    }
+
+    @GET
+    fun getBooks(@QueryParam("sort") sort: String?): Uni<List<Book>> {
+        return if (sort != null) {
+            reactiveBookRepository.listAll(Sort.ascending(sort))
+        } else reactiveBookRepository.listAll()
+    }
+
+    @GET
+    @Path("/stream")
+    @Produces(MediaType.SERVER_SENT_EVENTS)
+    @SseElementType(MediaType.APPLICATION_JSON)
+    fun streamBooks(@QueryParam("sort") sort: String?): Publisher<Book> {
+        return if (sort != null) {
+            reactiveBookRepository.streamAll(Sort.ascending(sort))
+        } else reactiveBookRepository.streamAll()
+    }
+
+    @POST
+    fun addBook(book: Book): Uni<Response> {
+        return reactiveBookRepository.persist(book).map {
+            //the ID is populated before sending it to the database
+            Response.created(URI.create("/books/entity${book.id}")).build()
+        }
+    }
+
+    @PUT
+    fun updateBook(book: Book): Uni<Response> = reactiveBookRepository.update(book).map { Response.accepted().build() }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertBook(book: Book): Uni<Response> =
+            reactiveBookRepository.persistOrUpdate(book).map { Response.accepted().build() }
+
+    @DELETE
+    @Path("/{id}")
+    fun deleteBook(@PathParam("id") id: String?): Uni<Void> {
+        return reactiveBookRepository.deleteById(ObjectId(id))
+                .map { d ->
+                    if (d) {
+                        return@map null
+                    }
+                    throw NotFoundException()
+                }
+    }
+
+    @GET
+    @Path("/{id}")
+    fun getBook(@PathParam("id") id: String?) = reactiveBookRepository.findById(ObjectId(id))
+
+    @GET
+    @Path("/search/{author}")
+    fun getBooksByAuthor(@PathParam("author") author: String): Uni<List<Book>> =
+            reactiveBookRepository.list("author", author)
+
+    @GET
+    @Path("/search")
+    fun search(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+               @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): Uni<Book?> {
+        return if (author != null) {
+            reactiveBookRepository.find("{'author': ?1,'bookTitle': ?2}", author, title!!).firstResult()
+        } else {
+            reactiveBookRepository
+                    .find("{'creationDate': {\$gte: ?1}, 'creationDate': {\$lte: ?2}}", LocalDate.parse(dateFrom),
+                            LocalDate.parse(dateTo))
+                    .firstResult()
+        }
+    }
+
+    @GET
+    @Path("/search2")
+    fun search2(@QueryParam("author") author: String?, @QueryParam("title") title: String?,
+                @QueryParam("dateFrom") dateFrom: String?, @QueryParam("dateTo") dateTo: String?): Uni<Book?> {
+        return if (author != null) {
+            reactiveBookRepository.find("{'author': :author,'bookTitle': :title}",
+                    Parameters.with("author", author).and("title", title)).firstResult()
+        } else reactiveBookRepository.find("{'creationDate': {\$gte: :dateFrom}, 'creationDate': {\$lte: :dateTo}}",
+                Parameters.with("dateFrom", LocalDate.parse(dateFrom)).and("dateTo", LocalDate.parse(dateTo))).firstResult()
+    }
+
+    @DELETE
+    fun deleteAll(): Uni<Void> = reactiveBookRepository.deleteAll().map { null }
+
+    companion object {
+        private val LOGGER: Logger = Logger.getLogger(ReactiveBookRepositoryResource::class.java)
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntity.kt
new file mode 100644
index 0000000000000..2e7e76a27d276
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntity.kt
@@ -0,0 +1,14 @@
+package io.quarkus.it.mongodb.panache.reactive.person
+
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoCompanionBase
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoEntityBase
+import org.bson.codecs.pojo.annotations.BsonId
+
+class ReactivePersonEntity : ReactivePanacheMongoEntityBase() {
+    companion object: ReactivePanacheMongoCompanionBase<ReactivePersonEntity, Long>
+
+    @BsonId
+    var id: Long? = null
+    var firstname: String? = null
+    var lastname: String? = null
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt
new file mode 100644
index 0000000000000..e14dd7e9e5379
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepository.kt
@@ -0,0 +1,8 @@
+package io.quarkus.it.mongodb.panache.reactive.person
+
+import io.quarkus.it.mongodb.panache.person.Person
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepositoryBase
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class ReactivePersonRepository : ReactivePanacheMongoRepositoryBase<Person, Long>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt
new file mode 100644
index 0000000000000..3647741bbf92d
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.kt
@@ -0,0 +1,86 @@
+package io.quarkus.it.mongodb.panache.reactive.person.resources
+
+
+import com.mongodb.ReadPreference
+import io.quarkus.it.mongodb.panache.person.PersonName
+import io.quarkus.it.mongodb.panache.reactive.person.ReactivePersonEntity
+import io.quarkus.panache.common.Sort
+import io.smallrye.mutiny.Uni
+import java.net.URI
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.Response
+
+@Path("/reactive/persons/entity")
+class ReactivePersonEntityResource {
+    @GET
+    fun getPersons(@QueryParam("sort") sort: String?): Uni<List<ReactivePersonEntity>> {
+        return if (sort != null) {
+            ReactivePersonEntity.listAll(Sort.ascending(sort))
+        } else ReactivePersonEntity.listAll()
+    }
+
+    @GET
+    @Path("/search/{name}")
+    fun searchPersons(@PathParam("name") name: String): Set<PersonName> {
+        val uniqueNames = mutableSetOf<PersonName>()
+        val lastnames: List<PersonName> = ReactivePersonEntity.find("lastname", name)
+                .project(PersonName::class.java)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list()
+                .await()
+                .indefinitely()
+        lastnames.forEach { p -> uniqueNames.add(p) }
+        return uniqueNames
+    }
+
+    @POST
+    fun addPerson(person: ReactivePersonEntity): Uni<Response> {
+        return person.persist()
+                .map { Response.created(URI.create("/persons/entity${person.id}")).build() }
+    }
+
+    @POST
+    @Path("/multiple")
+    fun addPersons(persons: List<ReactivePersonEntity>): Uni<Void> = ReactivePersonEntity.persist(persons)
+
+    @PUT
+    fun updatePerson(person: ReactivePersonEntity): Uni<Response> =
+            person.update().map { Response.accepted().build() }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertPerson(person: ReactivePersonEntity): Uni<Response> =
+            person.persistOrUpdate().map { Response.accepted().build() }
+
+    @DELETE
+    @Path("/{id}")
+    fun deletePerson(@PathParam("id") id: String): Uni<Void> =
+            ReactivePersonEntity.findById(id.toLong()).flatMap { person -> person?.delete() }
+
+    @GET
+    @Path("/{id}")
+    fun getPerson(@PathParam("id") id: String): Uni<ReactivePersonEntity?> =
+            ReactivePersonEntity.findById(id.toLong())
+
+    @GET
+    @Path("/count")
+    fun countAll(): Uni<Long> = ReactivePersonEntity.count()
+
+    @DELETE
+    fun deleteAll(): Uni<Void> = ReactivePersonEntity.deleteAll().map { null }
+
+    @POST
+    @Path("/rename")
+    fun rename(@QueryParam("previousName") previousName: String, @QueryParam("newName") newName: String): Uni<Response> {
+        return ReactivePersonEntity.update("lastname", newName)
+                .where("lastname", previousName)
+                .map { count -> Response.ok().build() }
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt
new file mode 100644
index 0000000000000..20efbc0273b9c
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.kt
@@ -0,0 +1,93 @@
+package io.quarkus.it.mongodb.panache.reactive.person.resources
+
+
+import com.mongodb.ReadPreference
+import io.quarkus.it.mongodb.panache.person.Person
+import io.quarkus.it.mongodb.panache.person.PersonName
+import io.quarkus.it.mongodb.panache.reactive.person.ReactivePersonRepository
+import io.quarkus.panache.common.Sort
+import io.smallrye.mutiny.Uni
+import java.net.URI
+import javax.inject.Inject
+import javax.ws.rs.DELETE
+import javax.ws.rs.GET
+import javax.ws.rs.PATCH
+import javax.ws.rs.POST
+import javax.ws.rs.PUT
+import javax.ws.rs.Path
+import javax.ws.rs.PathParam
+import javax.ws.rs.QueryParam
+import javax.ws.rs.core.Response
+
+@Path("/reactive/persons/repository")
+class ReactivePersonRepositoryResource {
+    @Inject
+    lateinit var reactivePersonRepository: ReactivePersonRepository
+
+    @GET
+    fun getPersons(@QueryParam("sort") sort: String?): Uni<List<Person>> {
+        return if (sort != null) {
+            reactivePersonRepository.listAll(Sort.ascending(sort))
+        } else reactivePersonRepository.listAll()
+    }
+
+    @GET
+    @Path("/search/{name}")
+    fun searchPersons(@PathParam("name") name: String): Set<PersonName> {
+        val uniqueNames = mutableSetOf<PersonName>()
+        val lastnames: List<PersonName> = reactivePersonRepository.find("lastname", name)
+                .project(PersonName::class.java)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list()
+                .await()
+                .indefinitely()
+        lastnames.forEach { p -> uniqueNames.add(p) } // this will throw if it's not the right type
+        return uniqueNames
+    }
+
+    @POST
+    fun addPerson(person: Person): Uni<Response> {
+        return reactivePersonRepository.persist(person).map {
+            //the ID is populated before sending it to the database
+            Response.created(URI.create("/persons/entity${person.id}")).build()
+        }
+    }
+
+    @POST
+    @Path("/multiple")
+    fun addPersons(persons: List<Person>): Uni<Void> = reactivePersonRepository.persist(persons)
+
+    @PUT
+    fun updatePerson(person: Person): Uni<Response> =
+            reactivePersonRepository.update(person).map { Response.accepted().build() }
+
+    // PATCH is not correct here but it allows to test persistOrUpdate without a specific subpath
+    @PATCH
+    fun upsertPerson(person: Person): Uni<Response> =
+            reactivePersonRepository.persistOrUpdate(person).map { v -> Response.accepted().build() }
+
+    @DELETE
+    @Path("/{id}")
+    fun deletePerson(@PathParam("id") id: String): Uni<Void> {
+        return reactivePersonRepository.findById(id.toLong())
+                .flatMap { person -> person?.let { reactivePersonRepository.delete(it) } }
+    }
+
+    @GET
+    @Path("/{id}")
+    fun getPerson(@PathParam("id") id: String) = reactivePersonRepository.findById(id.toLong())
+
+    @GET
+    @Path("/count")
+    fun countAll(): Uni<Long> = reactivePersonRepository.count()
+
+    @DELETE
+    fun deleteAll(): Uni<Void> = reactivePersonRepository.deleteAll().map { null }
+
+    @POST
+    @Path("/rename")
+    fun rename(@QueryParam("previousName") previousName: String, @QueryParam("newName") newName: String): Uni<Response> {
+        return reactivePersonRepository.update("lastname", newName).where("lastname", previousName)
+                .map { count -> Response.ok().build() }
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.kt
new file mode 100644
index 0000000000000..952e43611e65f
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.kt
@@ -0,0 +1,19 @@
+package io.quarkus.it.mongodb.panache.test
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoEntity
+
+class TestImperativeEntity : PanacheMongoEntity {
+    companion object : PanacheMongoCompanion<TestImperativeEntity>
+
+    lateinit var title: String
+    lateinit var category: String
+    lateinit var description: String
+
+    constructor() {}
+    constructor(title: String, category: String, description: String) {
+        this.title = title
+        this.category = category
+        this.description = description
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt
new file mode 100644
index 0000000000000..19fb094764583
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestImperativeRepository.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.test
+
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepository
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class TestImperativeRepository : PanacheMongoRepository<TestImperativeEntity>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.kt
new file mode 100644
index 0000000000000..f1df4203bbd3d
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.kt
@@ -0,0 +1,18 @@
+package io.quarkus.it.mongodb.panache.test
+
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoCompanion
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoEntity
+
+class TestReactiveEntity : ReactivePanacheMongoEntity {
+    companion object : ReactivePanacheMongoCompanion<TestReactiveEntity>
+    lateinit var title: String
+    lateinit var category: String
+    lateinit var description: String
+
+    constructor() {}
+    constructor(title: String, category: String, description: String) {
+        this.title = title
+        this.category = category
+        this.description = description
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt
new file mode 100644
index 0000000000000..383a4855c3420
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestReactiveRepository.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.test
+
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheMongoRepository
+import javax.enterprise.context.ApplicationScoped
+
+@ApplicationScoped
+class TestReactiveRepository : ReactivePanacheMongoRepository<TestReactiveEntity>
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt
new file mode 100644
index 0000000000000..9fff5f13c6a6d
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/kotlin/io/quarkus/it/mongodb/panache/test/TestResource.kt
@@ -0,0 +1,745 @@
+package io.quarkus.it.mongodb.panache.test
+
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationStrength
+import io.quarkus.mongodb.panache.kotlin.PanacheQuery
+import io.quarkus.mongodb.panache.kotlin.reactive.ReactivePanacheQuery
+import io.quarkus.panache.common.Page
+import io.quarkus.panache.common.Parameters
+import io.quarkus.panache.common.Sort
+import org.bson.Document
+import org.junit.jupiter.api.Assertions
+import javax.inject.Inject
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.core.Response
+
+@Path("/test")
+class TestResource {
+    @Inject
+    lateinit var testImperativeRepository: TestImperativeRepository
+
+    @Inject
+    lateinit var testReactiveRepository: TestReactiveRepository
+
+    private val testImperativeEntities: List<TestImperativeEntity> by lazy {
+        (0..9).map { TestImperativeEntity("title$it", "category" + it % 2, "description$it") }
+    }
+
+    @GET
+    @Path("imperative/entity")
+    fun testImperativeEntity(): Response {
+        val entities: List<TestImperativeEntity> = testImperativeEntities
+
+        // insert all
+        Assertions.assertEquals(0, TestImperativeEntity.count())
+        TestImperativeEntity.persist(entities)
+        Assertions.assertEquals(10, TestImperativeEntity.count())
+
+        // varargs
+        val entity11 = TestImperativeEntity("title11", "category", "desc")
+        val entity12 = TestImperativeEntity("title11", "category", "desc")
+        TestImperativeEntity.persist(entity11, entity12)
+        Assertions.assertEquals(12, TestImperativeEntity.count())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        TestImperativeEntity.update(entity11, entity12)
+        entity11.delete()
+        entity12.delete()
+        TestImperativeEntity.persistOrUpdate(entity11, entity12)
+        Assertions.assertEquals(12, TestImperativeEntity.count())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        TestImperativeEntity.persistOrUpdate(entity11, entity12)
+        entity11.delete()
+        entity12.delete()
+        Assertions.assertEquals(10, TestImperativeEntity.count())
+
+        // paginate
+        testImperativePagination(TestImperativeEntity.findAll())
+
+        // range
+        testImperativeRange(TestImperativeEntity.findAll())
+
+        // query
+        Assertions.assertEquals(5, TestImperativeEntity.list("category", "category0").size)
+        Assertions.assertEquals(5, TestImperativeEntity.list("category = ?1", "category0").size)
+        Assertions.assertEquals(5, TestImperativeEntity.list("category = :category",
+                Parameters.with("category", "category1")).size)
+        Assertions.assertEquals(5, TestImperativeEntity.list("{'category' : ?1}", "category0").size)
+        Assertions.assertEquals(5, TestImperativeEntity.list("{'category' : :category}",
+                Parameters.with("category", "category1")).size)
+        val listQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, TestImperativeEntity.list(listQuery).size)
+        Assertions.assertEquals(0, TestImperativeEntity.list("category", null).size)
+        Assertions.assertEquals(0, TestImperativeEntity.list("category = :category",
+                Parameters.with("category", null)).size)
+
+        // regex
+        val entityWithUpperCase = TestImperativeEntity("title11", "upperCaseCategory", "desc")
+        entityWithUpperCase.persist()
+        Assertions.assertEquals(1, TestImperativeEntity.list("category like ?1", "upperCase.*").size)
+        Assertions.assertEquals(1, TestImperativeEntity.list("category like ?1", "/uppercase.*/i").size)
+        entityWithUpperCase.delete()
+
+        // sort
+        val entityA = TestImperativeEntity("aaa", "aaa", "aaa")
+        entityA.persist()
+        val entityZ = TestImperativeEntity("zzz", "zzz", "zzz")
+        entityZ.persistOrUpdate()
+        var result: TestImperativeEntity = TestImperativeEntity.listAll(Sort.ascending("title"))[0]
+        Assertions.assertEquals("aaa", result.title)
+        result = TestImperativeEntity.listAll(Sort.descending("title"))[0]
+        Assertions.assertEquals("zzz", result.title)
+        entityA.delete()
+        entityZ.delete()
+
+        // collation
+        val entityALower = TestImperativeEntity("aaa", "aaa", "aaa")
+        entityALower.persist()
+        val entityAUpper = TestImperativeEntity("AAA", "AAA", "AAA")
+        entityAUpper.persist()
+        val entityB = TestImperativeEntity("BBB", "BBB", "BBB")
+        entityB.persistOrUpdate()
+        var results: List<TestImperativeEntity> = TestImperativeEntity.listAll(Sort.ascending("title"))
+        Assertions.assertEquals("AAA", results[0].title)
+        Assertions.assertEquals("BBB", results[1].title)
+        Assertions.assertEquals("aaa", results[2].title)
+        val collation: Collation = Collation.builder().caseLevel(true).collationStrength(CollationStrength.PRIMARY).locale("fr")
+                .build()
+        results = TestImperativeEntity.findAll(Sort.ascending("title")).withCollation(collation).list()
+        Assertions.assertEquals("aaa", results[0].title)
+        Assertions.assertEquals("AAA", results[1].title)
+        Assertions.assertEquals("BBB", results[2].title)
+        entityAUpper.delete()
+        entityALower.delete()
+        entityB.delete()
+
+        // count
+        Assertions.assertEquals(5, TestImperativeEntity.count("category", "category0"))
+        Assertions.assertEquals(5, TestImperativeEntity.count("category = ?1", "category0"))
+        Assertions.assertEquals(5, TestImperativeEntity.count("category = :category",
+                Parameters.with("category", "category1")))
+        Assertions.assertEquals(5, TestImperativeEntity.count("{'category' : ?1}", "category0"))
+        Assertions.assertEquals(5, TestImperativeEntity.count("{'category' : :category}",
+                Parameters.with("category", "category1")))
+        val countQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, TestImperativeEntity.count(countQuery))
+
+        // update
+        val list: List<TestImperativeEntity> = TestImperativeEntity.list("category = ?1", "category0")
+        Assertions.assertEquals(5, list.size)
+        for (entity in list) {
+            entity.category = "newCategory"
+        }
+        TestImperativeEntity.update(list)
+        TestImperativeEntity.update(list.stream())
+        TestImperativeEntity.persistOrUpdate(list)
+        var updated: Long = TestImperativeEntity.update("category", "newCategory2").where("category", "newCategory")
+        Assertions.assertEquals(5, updated)
+        updated = TestImperativeEntity.update("category = ?1", "newCategory").where("category = ?1", "newCategory2")
+        Assertions.assertEquals(5, updated)
+        updated = TestImperativeEntity.update("{'category' : ?1}", "newCategory2").where("{'category' : ?1}", "newCategory")
+        Assertions.assertEquals(5, updated)
+        updated = TestImperativeEntity.update("category = :category", Parameters.with("category", "newCategory"))
+                .where("category = :category", Parameters.with("category", "newCategory2"))
+        Assertions.assertEquals(5, updated)
+        updated = TestImperativeEntity.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory"))
+        Assertions.assertEquals(5, updated)
+        Assertions.assertEquals(5, TestImperativeEntity.count("category = ?1", "newCategory2"))
+        updated = TestImperativeEntity.update("newField", "newValue").all()
+        Assertions.assertEquals(10, updated)
+
+        // delete
+        TestImperativeEntity.delete("category = ?1", "newCategory2")
+        TestImperativeEntity.delete("{'category' : ?1}", "category1")
+        Assertions.assertEquals(0, TestImperativeEntity.count())
+        TestImperativeEntity.persist(entities.stream())
+        TestImperativeEntity.delete("category = :category", Parameters.with("category", "category0"))
+        TestImperativeEntity.delete("{'category' : :category}", Parameters.with("category", "category1"))
+        Assertions.assertEquals(0, TestImperativeEntity.count())
+        TestImperativeEntity.persistOrUpdate(entities.stream())
+        TestImperativeEntity.delete("category", "category0")
+        TestImperativeEntity.delete("category", "category1")
+        Assertions.assertEquals(0, TestImperativeEntity.count())
+        return Response.ok().build()
+    }
+
+    @GET
+    @Path("imperative/repository")
+    fun testImperativeRepository(): Response {
+        val entities: List<TestImperativeEntity> = testImperativeEntities
+
+        // insert all
+        Assertions.assertEquals(0, testImperativeRepository.count())
+        testImperativeRepository.persist(entities)
+        Assertions.assertEquals(10, testImperativeRepository.count())
+
+        // varargs
+        val entity11 = TestImperativeEntity("title11", "category", "desc")
+        val entity12 = TestImperativeEntity("title11", "category", "desc")
+        testImperativeRepository.persist(entity11, entity12)
+        Assertions.assertEquals(12, testImperativeRepository.count())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        testImperativeRepository.update(entity11, entity12)
+        entity11.delete()
+        entity12.delete()
+        testImperativeRepository.persistOrUpdate(entity11, entity12)
+        Assertions.assertEquals(12, testImperativeRepository.count())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        testImperativeRepository.persistOrUpdate(entity11, entity12)
+        entity11.delete()
+        entity12.delete()
+        Assertions.assertEquals(10, testImperativeRepository.count())
+
+        // paginate
+        testImperativePagination(testImperativeRepository.findAll())
+
+        // range
+        testImperativeRange(testImperativeRepository.findAll())
+
+        // query
+        Assertions.assertEquals(5, testImperativeRepository.list("category", "category0").size)
+        Assertions.assertEquals(5, testImperativeRepository.list("category = ?1", "category0").size)
+        Assertions.assertEquals(5, testImperativeRepository.list("category = :category",
+                Parameters.with("category", "category1")).size)
+        Assertions.assertEquals(5, testImperativeRepository.list("{'category' : ?1}", "category0").size)
+        Assertions.assertEquals(5, testImperativeRepository.list("{'category' : :category}",
+                Parameters.with("category", "category1")).size)
+        val listQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, testImperativeRepository.list(listQuery).size)
+        Assertions.assertEquals(0, testImperativeRepository.list("category", null).size)
+        Assertions.assertEquals(0, testImperativeRepository.list("category = :category",
+                Parameters.with("category", null)).size)
+
+        // regex
+        val entityWithUpperCase = TestImperativeEntity("title11", "upperCaseCate)gory", "desc")
+        testImperativeRepository.persist(entityWithUpperCase)
+        Assertions.assertEquals(1, testImperativeRepository.list("category like ?1", "upperCase.*").size)
+        Assertions.assertEquals(1, testImperativeRepository.list("category like ?1", "/uppercase.*/i").size)
+        testImperativeRepository.delete(entityWithUpperCase)
+
+        // sort
+        val entityA = TestImperativeEntity("aaa", "aaa", "aaa")
+        testImperativeRepository.persist(entityA)
+        val entityZ = TestImperativeEntity("zzz", "zzz", "zzz")
+        testImperativeRepository.persistOrUpdate(entityZ)
+        var result: TestImperativeEntity = testImperativeRepository.listAll(Sort.ascending("title"))[0]
+        Assertions.assertEquals("aaa", result.title)
+        result = testImperativeRepository.listAll(Sort.descending("title"))[0]
+        Assertions.assertEquals("zzz", result.title)
+        testImperativeRepository.delete(entityA)
+        testImperativeRepository.delete(entityZ)
+
+        // collation
+        val entityALower = TestImperativeEntity("aaa", "aaa", "aaa")
+        testImperativeRepository.persist(entityALower)
+        val entityAUpper = TestImperativeEntity("AAA", "AAA", "AAA")
+        testImperativeRepository.persist(entityAUpper)
+        val entityB = TestImperativeEntity("BBB", "BBB", "BBB")
+        testImperativeRepository.persistOrUpdate(entityB)
+        var results: List<TestImperativeEntity> = testImperativeRepository.listAll(Sort.ascending("title"))
+        Assertions.assertEquals("AAA", results[0].title)
+        Assertions.assertEquals("BBB", results[1].title)
+        Assertions.assertEquals("aaa", results[2].title)
+        val collation: Collation = Collation.builder().caseLevel(true).collationStrength(CollationStrength.PRIMARY).locale("fr")
+                .build()
+        results = testImperativeRepository.findAll(Sort.ascending("title"))
+                .withCollation(collation)
+                .list()
+        Assertions.assertEquals("aaa", results[0].title)
+        Assertions.assertEquals("AAA", results[1].title)
+        Assertions.assertEquals("BBB", results[2].title)
+        testImperativeRepository.delete(entityALower)
+        testImperativeRepository.delete(entityAUpper)
+        testImperativeRepository.delete(entityB)
+
+        // count
+        Assertions.assertEquals(5, testImperativeRepository.count("category", "category0"))
+        Assertions.assertEquals(5, testImperativeRepository.count("category = ?1", "category0"))
+        Assertions.assertEquals(5, testImperativeRepository.count("category = :category",
+                Parameters.with("category", "category1")))
+        Assertions.assertEquals(5, testImperativeRepository.count("{'category' : ?1}", "category0"))
+        Assertions.assertEquals(5, testImperativeRepository.count("{'category' : :category}",
+                Parameters.with("category", "category1")))
+        val countQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, testImperativeRepository.count(countQuery))
+
+        // update
+        val list: List<TestImperativeEntity> = testImperativeRepository.list("category = ?1", "category0")
+        Assertions.assertEquals(5, list.size)
+        for (entity in list) {
+            entity.category = "newCategory"
+        }
+        testImperativeRepository.update(list)
+        testImperativeRepository.update(list.stream())
+        testImperativeRepository.persistOrUpdate(list)
+        var updated: Long = testImperativeRepository.update("category", "newCategory2").where("category", "newCategory")
+        Assertions.assertEquals(5, updated)
+        updated = testImperativeRepository.update("category = ?1", "newCategory").where("category = ?1", "newCategory2")
+        Assertions.assertEquals(5, updated)
+        updated = testImperativeRepository.update("{'category' : ?1}", "newCategory2").where("{'category' : ?1}",
+                "newCategory")
+        Assertions.assertEquals(5, updated)
+        updated = testImperativeRepository.update("category = :category", Parameters.with("category", "newCategory"))
+                .where("category = :category", Parameters.with("category", "newCategory2"))
+        Assertions.assertEquals(5, updated)
+        updated = testImperativeRepository.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory"))
+        Assertions.assertEquals(5, updated)
+        Assertions.assertEquals(5, testImperativeRepository.count("category = ?1", "newCategory2"))
+        updated = testImperativeRepository.update("newField", "newValue").all()
+        Assertions.assertEquals(10, updated)
+
+        // delete
+        testImperativeRepository.delete("category = ?1", "newCategory2")
+        testImperativeRepository.delete("{'category' : ?1}", "category1")
+        Assertions.assertEquals(0, testImperativeRepository.count())
+        testImperativeRepository.persist(entities.stream())
+        testImperativeRepository.delete("category = :category", Parameters.with("category", "category0"))
+        testImperativeRepository.delete("{'category' : :category}", Parameters.with("category", "category1"))
+        Assertions.assertEquals(0, testImperativeRepository.count())
+        testImperativeRepository.persistOrUpdate(entities.stream())
+        testImperativeRepository.delete("category", "category0")
+        testImperativeRepository.delete("category", "category1")
+        Assertions.assertEquals(0, testImperativeRepository.count())
+        return Response.ok().build()
+    }
+
+    private fun testImperativePagination(query: PanacheQuery<TestImperativeEntity>) {
+        query.page(0, 4)
+        Assertions.assertEquals(3, query.pageCount())
+        var page: List<TestImperativeEntity> = query.list()
+        Assertions.assertEquals(4, page.size)
+        Assertions.assertTrue(query.hasNextPage())
+        Assertions.assertFalse(query.hasPreviousPage())
+        query.nextPage()
+        page = query.list()
+        Assertions.assertEquals(4, page.size)
+        Assertions.assertTrue(query.hasNextPage())
+        Assertions.assertTrue(query.hasPreviousPage())
+        query.lastPage()
+        page = query.list()
+        Assertions.assertEquals(2, page.size)
+        Assertions.assertFalse(query.hasNextPage())
+        Assertions.assertTrue(query.hasPreviousPage())
+        query.firstPage()
+        page = query.list()
+        Assertions.assertEquals(4, page.size)
+        Assertions.assertTrue(query.hasNextPage())
+        Assertions.assertFalse(query.hasPreviousPage())
+        query.page(Page.of(1, 5))
+        Assertions.assertEquals(2, query.pageCount())
+        page = query.list()
+        Assertions.assertEquals(5, page.size)
+        Assertions.assertFalse(query.hasNextPage())
+        Assertions.assertTrue(query.hasPreviousPage())
+
+        // mix page with range
+        page = query.page(0, 3).range(0, 1).list()
+        Assertions.assertEquals(2, page.size)
+    }
+
+    private fun testImperativeRange(query: PanacheQuery<TestImperativeEntity>) {
+        query.range(0, 3)
+        var range: List<TestImperativeEntity> = query.list()
+        Assertions.assertEquals(4, range.size)
+        range = query.range(4, 7).list()
+        Assertions.assertEquals(4, range.size)
+        range = query.range(8, 12).list()
+        Assertions.assertEquals(2, range.size)
+        range = query.range(10, 12).list()
+        Assertions.assertEquals(0, range.size)
+
+        // when using range, we cannot use any of the page related operations
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).nextPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).previousPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).pageCount() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).lastPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).firstPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).hasPreviousPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).hasNextPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).page() }
+
+        // but this is valid to switch from range to page
+        range = query.range(0, 2).page(0, 3).list()
+        Assertions.assertEquals(3, range.size)
+    }
+
+    @GET
+    @Path("reactive/entity")
+    fun testReactiveEntity(): Response {
+        val entities: List<TestReactiveEntity> = testReactiveEntities
+
+        // insert all
+        Assertions.assertEquals(0, TestReactiveEntity.count().await().indefinitely())
+        TestReactiveEntity.persist(entities).await().indefinitely()
+        Assertions.assertEquals(10, TestReactiveEntity.count().await().indefinitely())
+
+        // varargs
+        val entity11 = TestReactiveEntity("title11", "category", "desc")
+        val entity12 = TestReactiveEntity("title11", "category", "desc")
+        TestReactiveEntity.persist(entity11, entity12).await().indefinitely()
+        Assertions.assertEquals(12, TestReactiveEntity.count().await().indefinitely())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        TestReactiveEntity.update(entity11, entity12).await().indefinitely()
+        entity11.delete().await().indefinitely()
+        entity12.delete().await().indefinitely()
+        TestReactiveEntity.persistOrUpdate(entity11, entity12).await().indefinitely()
+        Assertions.assertEquals(12, TestReactiveEntity.count().await().indefinitely())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        TestReactiveEntity.persistOrUpdate(entity11, entity12).await().indefinitely()
+        entity11.delete().await().indefinitely()
+        entity12.delete().await().indefinitely()
+        Assertions.assertEquals(10, TestReactiveEntity.count().await().indefinitely())
+
+        // paginate
+        testReactivePagination(TestReactiveEntity.findAll())
+
+        // range
+        testReactiveRange(TestReactiveEntity.findAll())
+
+        // query
+        Assertions.assertEquals(5,
+                TestReactiveEntity.list("category", "category0").await().indefinitely().size)
+        Assertions.assertEquals(5,
+                TestReactiveEntity.list("category = ?1", "category0").await().indefinitely().size)
+        Assertions.assertEquals(5, TestReactiveEntity.list("category = :category",
+                Parameters.with("category", "category1")).await().indefinitely().size)
+        Assertions.assertEquals(5,
+                TestReactiveEntity.list("{'category' : ?1}", "category0").await().indefinitely().size)
+        Assertions.assertEquals(5, TestReactiveEntity.list("{'category' : :category}",
+                Parameters.with("category", "category1")).await().indefinitely().size)
+        val listQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, TestReactiveEntity.list(listQuery).await().indefinitely().size)
+        Assertions.assertEquals(0, TestReactiveEntity.list("category", null).await().indefinitely().size)
+        Assertions.assertEquals(0, TestReactiveEntity.list("category = :category",
+                Parameters.with("category", null)).await().indefinitely().size)
+
+        // regex
+        val entityWithUpperCase = TestReactiveEntity("title11", "upperCaseCategory", "desc")
+        entityWithUpperCase.persist().await().indefinitely()
+        Assertions.assertEquals(1, TestReactiveEntity.list("category like ?1", "upperCase.*")
+                .await().indefinitely().size)
+        Assertions.assertEquals(1, TestReactiveEntity.list("category like ?1", "/uppercase.*/i")
+                .await().indefinitely().size)
+        entityWithUpperCase.delete().await().indefinitely()
+
+        // sort
+        val entityA = TestReactiveEntity("aaa", "aaa", "aaa")
+        entityA.persist().await().indefinitely()
+        val entityZ = TestReactiveEntity("zzz", "zzz", "zzz")
+        entityZ.persistOrUpdate().await().indefinitely()
+        var result: TestReactiveEntity = TestReactiveEntity.listAll(Sort.ascending("title")).await()
+                .indefinitely()[0]
+        Assertions.assertEquals("aaa", result.title)
+        result = TestReactiveEntity.listAll(Sort.descending("title")).await().indefinitely()[0]
+        Assertions.assertEquals("zzz", result.title)
+        entityA.delete().await().indefinitely()
+        entityZ.delete().await().indefinitely()
+
+        // collation
+        val entityALower = TestReactiveEntity("aaa", "aaa", "aaa")
+        entityALower.persist().await().indefinitely()
+        val entityAUpper = TestReactiveEntity("AAA", "AAA", "AAA")
+        entityAUpper.persist().await().indefinitely()
+        val entityB = TestReactiveEntity("BBB", "BBB", "BBB")
+        entityB.persistOrUpdate().await().indefinitely()
+        var results: List<TestReactiveEntity> = TestReactiveEntity.listAll(Sort.ascending("title")).await()
+                .indefinitely()
+        Assertions.assertEquals("AAA", results[0].title)
+        Assertions.assertEquals("BBB", results[1].title)
+        Assertions.assertEquals("aaa", results[2].title)
+        val collation: Collation = Collation.builder().caseLevel(true).collationStrength(CollationStrength.PRIMARY).locale("fr")
+                .build()
+        results = TestReactiveEntity.findAll( Sort.ascending("title")).withCollation(collation).list()
+                .await().indefinitely()
+        Assertions.assertEquals("aaa", results[0].title)
+        Assertions.assertEquals("AAA", results[1].title)
+        Assertions.assertEquals("BBB", results[2].title)
+        entityAUpper.delete().await().indefinitely()
+        entityALower.delete().await().indefinitely()
+        entityB.delete().await().indefinitely()
+
+        // count
+        Assertions.assertEquals(5, TestReactiveEntity.count("category", "category0").await().indefinitely())
+        Assertions.assertEquals(5, TestReactiveEntity.count("category = ?1", "category0").await().indefinitely())
+        Assertions.assertEquals(5, TestReactiveEntity.count("category = :category",
+                Parameters.with("category", "category1")).await().indefinitely())
+        Assertions.assertEquals(5, TestReactiveEntity.count("{'category' : ?1}", "category0").await().indefinitely())
+        Assertions.assertEquals(5, TestReactiveEntity.count("{'category' : :category}",
+                Parameters.with("category", "category1")).await().indefinitely())
+        val countQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, TestReactiveEntity.count(countQuery).await().indefinitely())
+
+        // update
+        val list: List<TestReactiveEntity> = TestReactiveEntity.list("category = ?1", "category0").await()
+        .indefinitely()
+        Assertions.assertEquals(5, list.size)
+        for (entity in list) {
+            entity.category = "newCategory"
+        }
+        TestReactiveEntity.update(list).await().indefinitely()
+        TestReactiveEntity.update(list.stream()).await().indefinitely()
+        TestReactiveEntity.persistOrUpdate(list).await().indefinitely()
+        var updated: Long = TestReactiveEntity.update("category", "newCategory2").where("category", "newCategory").await()
+                .indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = TestReactiveEntity.update("category = ?1", "newCategory").where("category = ?1", "newCategory2").await()
+                .indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = TestReactiveEntity.update("{'category' : ?1}", "newCategory2").where("{'category' : ?1}", "newCategory")
+                .await().indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = TestReactiveEntity.update("category = :category", Parameters.with("category", "newCategory"))
+                .where("category = :category", Parameters.with("category", "newCategory2")).await().indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = TestReactiveEntity.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory")).await().indefinitely()
+        Assertions.assertEquals(5, updated)
+        Assertions.assertEquals(5, TestReactiveEntity.count("category = ?1", "newCategory2").await().indefinitely())
+        updated = TestReactiveEntity.update("newField", "newValue").all().await().indefinitely()
+        Assertions.assertEquals(10, updated)
+
+        // delete
+        TestReactiveEntity.delete("category = ?1", "newCategory2").await().indefinitely()
+        TestReactiveEntity.delete("{'category' : ?1}", "category1").await().indefinitely()
+        Assertions.assertEquals(0, TestReactiveEntity.count().await().indefinitely())
+        TestReactiveEntity.persist(entities.stream()).await().indefinitely()
+        TestReactiveEntity.delete("category = :category", Parameters.with("category", "category0")).await().indefinitely()
+        TestReactiveEntity.delete("{'category' : :category}", Parameters.with("category", "category1")).await().indefinitely()
+        Assertions.assertEquals(0, TestReactiveEntity.count().await().indefinitely())
+        TestReactiveEntity.persistOrUpdate(entities.stream()).await().indefinitely()
+        TestReactiveEntity.delete("category", "category0").await().indefinitely()
+        TestReactiveEntity.delete("category", "category1").await().indefinitely()
+        Assertions.assertEquals(0, TestReactiveEntity.count().await().indefinitely())
+        return Response.ok().build()
+    }
+
+    @GET
+    @Path("reactive/repository")
+    fun testReactiveRepository(): Response {
+        val entities: List<TestReactiveEntity> = testReactiveEntities
+
+        // insert all
+        Assertions.assertEquals(0, testReactiveRepository.count().await().indefinitely())
+        testReactiveRepository.persist(entities).await().indefinitely()
+        Assertions.assertEquals(10, testReactiveRepository.count().await().indefinitely())
+
+        // varargs
+        val entity11 = TestReactiveEntity("title11", "category", "desc")
+        val entity12 = TestReactiveEntity("title11", "category", "desc")
+        testReactiveRepository.persist(entity11, entity12).await().indefinitely()
+        Assertions.assertEquals(12, testReactiveRepository.count().await().indefinitely())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        testReactiveRepository.update(entity11, entity12).await().indefinitely()
+        entity11.delete().await().indefinitely()
+        entity12.delete().await().indefinitely()
+        testReactiveRepository.persistOrUpdate(entity11, entity12).await().indefinitely()
+        Assertions.assertEquals(12, testReactiveRepository.count().await().indefinitely())
+        entity11.category = "categoryUpdated"
+        entity12.category = "categoryUpdated"
+        testReactiveRepository.persistOrUpdate(entity11, entity12).await().indefinitely()
+        entity11.delete().await().indefinitely()
+        entity12.delete().await().indefinitely()
+        Assertions.assertEquals(10, testReactiveRepository.count().await().indefinitely())
+
+        // paginate
+        testReactivePagination(testReactiveRepository.findAll())
+
+        // range
+        testReactiveRange(testReactiveRepository.findAll())
+
+        // query
+        Assertions.assertEquals(5,
+                testReactiveRepository.list("category", "category0").await().indefinitely().size)
+        Assertions.assertEquals(5,
+                testReactiveRepository.list("category = ?1", "category0").await().indefinitely().size)
+        Assertions.assertEquals(5, testReactiveRepository.list("category = :category",
+                Parameters.with("category", "category1")).await().indefinitely().size)
+        Assertions.assertEquals(5,
+                testReactiveRepository.list("{'category' : ?1}", "category0").await().indefinitely().size)
+        Assertions.assertEquals(5, testReactiveRepository.list("{'category' : :category}",
+                Parameters.with("category", "category1")).await().indefinitely().size)
+        val listQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, testReactiveRepository.list(listQuery).await().indefinitely().size)
+        Assertions.assertEquals(0, testReactiveRepository.list("category", null).await().indefinitely().size)
+        Assertions.assertEquals(0, testReactiveRepository.list("category = :category",
+                Parameters.with("category", null)).await().indefinitely().size)
+
+        // regex
+        val entityWithUpperCase = TestReactiveEntity("title11", "upperCaseCategory", "desc")
+        testReactiveRepository.persist(entityWithUpperCase).await().indefinitely()
+        Assertions.assertEquals(1, testReactiveRepository.list("category like ?1", "upperCase.*")
+                .await().indefinitely().size)
+        Assertions.assertEquals(1, testReactiveRepository.list("category like ?1", "/uppercase.*/i")
+                .await().indefinitely().size)
+        testReactiveRepository.delete(entityWithUpperCase).await().indefinitely()
+
+        // sort
+        val entityA = TestReactiveEntity("aaa", "aaa", "aaa")
+        testReactiveRepository.persist(entityA).await().indefinitely()
+        val entityZ = TestReactiveEntity("zzz", "zzz", "zzz")
+        testReactiveRepository.persistOrUpdate(entityZ).await().indefinitely()
+        var result: TestReactiveEntity = testReactiveRepository.listAll(Sort.ascending("title")).await().indefinitely()[0]
+        Assertions.assertEquals("aaa", result.title)
+        result = testReactiveRepository.listAll(Sort.descending("title")).await().indefinitely()[0]
+        Assertions.assertEquals("zzz", result.title)
+        testReactiveRepository.delete(entityA).await().indefinitely()
+        testReactiveRepository.delete(entityZ).await().indefinitely()
+
+        // collation
+        val entityALower = TestReactiveEntity("aaa", "aaa", "aaa")
+        testReactiveRepository.persist(entityALower).await().indefinitely()
+        val entityAUpper = TestReactiveEntity("AAA", "AAA", "AAA")
+        testReactiveRepository.persist(entityAUpper).await().indefinitely()
+        val entityB = TestReactiveEntity("BBB", "BBB", "BBB")
+        testReactiveRepository.persistOrUpdate(entityB).await().indefinitely()
+        var results: List<TestReactiveEntity> = testReactiveRepository.listAll(Sort.ascending("title")).await().indefinitely()
+        Assertions.assertEquals("AAA", results[0].title)
+        Assertions.assertEquals("BBB", results[1].title)
+        Assertions.assertEquals("aaa", results[2].title)
+        val collation: Collation = Collation.builder().caseLevel(true).collationStrength(CollationStrength.PRIMARY).locale("fr")
+                .build()
+        results = testReactiveRepository.findAll(Sort.ascending("title")).withCollation(collation).list().await()
+                .indefinitely()
+        Assertions.assertEquals("aaa", results[0].title)
+        Assertions.assertEquals("AAA", results[1].title)
+        Assertions.assertEquals("BBB", results[2].title)
+        testReactiveRepository.delete(entityALower).await().indefinitely()
+        testReactiveRepository.delete(entityAUpper).await().indefinitely()
+        testReactiveRepository.delete(entityB).await().indefinitely()
+
+        // count
+        Assertions.assertEquals(5,
+                testReactiveRepository.count("category", "category0").await().indefinitely())
+        Assertions.assertEquals(5,
+                testReactiveRepository.count("category = ?1", "category0").await().indefinitely())
+        Assertions.assertEquals(5, testReactiveRepository.count("category = :category",
+                Parameters.with("category", "category1")).await().indefinitely())
+        Assertions.assertEquals(5,
+                testReactiveRepository.count("{'category' : ?1}", "category0").await().indefinitely())
+        Assertions.assertEquals(5, testReactiveRepository.count("{'category' : :category}",
+                Parameters.with("category", "category1")).await().indefinitely())
+        val countQuery: Document = Document().append("category", "category1")
+        Assertions.assertEquals(5, testReactiveRepository.count(countQuery).await().indefinitely())
+
+        // update
+        val list: List<TestReactiveEntity> = testReactiveRepository.list("category = ?1", "category0").await().indefinitely()
+        Assertions.assertEquals(5, list.size)
+        for (entity in list) {
+            entity.category = "newCategory"
+        }
+        testReactiveRepository.update(list).await().indefinitely()
+        testReactiveRepository.update(list.stream()).await().indefinitely()
+        testReactiveRepository.persistOrUpdate(list).await().indefinitely()
+        var updated: Long = testReactiveRepository.update("category", "newCategory2").where("category", "newCategory").await()
+                .indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = testReactiveRepository.update("category = ?1", "newCategory").where("category = ?1", "newCategory2").await()
+                .indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = testReactiveRepository.update("{'category' : ?1}", "newCategory2").where("{'category' : ?1}", "newCategory")
+                .await().indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = testReactiveRepository.update("category = :category", Parameters.with("category", "newCategory"))
+                .where("category = :category", Parameters.with("category", "newCategory2")).await().indefinitely()
+        Assertions.assertEquals(5, updated)
+        updated = testReactiveRepository.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory")).await().indefinitely()
+        Assertions.assertEquals(5, updated)
+        Assertions.assertEquals(5, testReactiveRepository.count("category = ?1", "newCategory2").await().indefinitely())
+        updated = testReactiveRepository.update("newField", "newValue").all().await().indefinitely()
+        Assertions.assertEquals(10, updated)
+
+        // delete
+        testReactiveRepository.delete("category = ?1", "newCategory2").await().indefinitely()
+        testReactiveRepository.delete("{'category' : ?1}", "category1").await().indefinitely()
+        Assertions.assertEquals(0, testReactiveRepository.count().await().indefinitely())
+        testReactiveRepository.persist(entities.stream()).await().indefinitely()
+        testReactiveRepository.delete("category = :category", Parameters.with("category", "category0")).await().indefinitely()
+        testReactiveRepository.delete("{'category' : :category}", Parameters.with("category", "category1")).await()
+                .indefinitely()
+        Assertions.assertEquals(0, testReactiveRepository.count().await().indefinitely())
+        testReactiveRepository.persistOrUpdate(entities.stream()).await().indefinitely()
+        testReactiveRepository.delete("category", "category0").await().indefinitely()
+        testReactiveRepository.delete("category", "category1").await().indefinitely()
+        Assertions.assertEquals(0, testReactiveRepository.count().await().indefinitely())
+        return Response.ok().build()
+    }
+
+    private val testReactiveEntities: List<TestReactiveEntity>
+        get() {
+            return (0..9).map {
+                TestReactiveEntity("title$it",
+                        "category" + it % 2,
+                        "description$it")
+            }
+        }
+
+    private fun testReactivePagination(query: ReactivePanacheQuery<TestReactiveEntity>) {
+        query.page(0, 4)
+        Assertions.assertEquals(3, query.pageCount().await().indefinitely())
+        var page: List<TestReactiveEntity> = query.list().await().indefinitely()
+        Assertions.assertEquals(4, page.size)
+        Assertions.assertTrue(query.hasNextPage().await().indefinitely())
+        Assertions.assertFalse(query.hasPreviousPage())
+        query.nextPage()
+        page = query.list().await().indefinitely()
+        Assertions.assertEquals(4, page.size)
+        Assertions.assertTrue(query.hasNextPage().await().indefinitely())
+        Assertions.assertTrue(query.hasPreviousPage())
+        query.lastPage().await().indefinitely()
+        page = query.list().await().indefinitely()
+        Assertions.assertEquals(2, page.size)
+        Assertions.assertFalse(query.hasNextPage().await().indefinitely())
+        Assertions.assertTrue(query.hasPreviousPage())
+        query.firstPage()
+        page = query.list().await().indefinitely()
+        Assertions.assertEquals(4, page.size)
+        Assertions.assertTrue(query.hasNextPage().await().indefinitely())
+        Assertions.assertFalse(query.hasPreviousPage())
+        query.page(Page.of(1, 5))
+        Assertions.assertEquals(2, query.pageCount().await().indefinitely())
+        page = query.list().await().indefinitely()
+        Assertions.assertEquals(5, page.size)
+        Assertions.assertFalse(query.hasNextPage().await().indefinitely())
+        Assertions.assertTrue(query.hasPreviousPage())
+
+        // mix page with range
+        page = query.page(0, 3).range(0, 1).list().await().indefinitely()
+        Assertions.assertEquals(2, page.size)
+    }
+
+    private fun testReactiveRange(query: ReactivePanacheQuery<TestReactiveEntity>) {
+        query.range(0, 3)
+        var range: List<TestReactiveEntity> = query.list().await().indefinitely()
+        Assertions.assertEquals(4, range.size)
+        range = query.range(4, 7).list().await().indefinitely()
+        Assertions.assertEquals(4, range.size)
+        range = query.range(8, 12).list().await().indefinitely()
+        Assertions.assertEquals(2, range.size)
+        range = query.range(10, 12).list().await().indefinitely()
+        Assertions.assertEquals(0, range.size)
+
+        // when using range, we cannot use any of the page related operations
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).nextPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).previousPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).pageCount() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).lastPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).firstPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).hasPreviousPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).hasNextPage() }
+        Assertions.assertThrows(UnsupportedOperationException::class.java) { query.range(0, 2).page() }
+
+        // but this is valid to switch from range to page
+        range = query.range(0, 2).page(0, 3).list().await().indefinitely()
+        Assertions.assertEquals(3, range.size)
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/main/resources/application.properties b/integration-tests/mongodb-panache-kotlin/src/main/resources/application.properties
new file mode 100644
index 0000000000000..bde8c47826706
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/main/resources/application.properties
@@ -0,0 +1,9 @@
+quarkus.mongodb.connection-string=mongodb://localhost:27018
+quarkus.mongodb.write-concern.journal=false
+quarkus.mongodb.database=books
+
+# fake a different MongoDB instance
+quarkus.mongodb.cl2.connection-string=mongodb://localhost:27018
+quarkus.mongodb.cl2.write-concern.journal=false
+
+#quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/BookDTO.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/BookDTO.kt
new file mode 100644
index 0000000000000..37149010476f5
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/BookDTO.kt
@@ -0,0 +1,73 @@
+package io.quarkus.it.mongodb.panache
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import io.quarkus.it.mongodb.panache.book.BookDetail
+import java.util.ArrayList
+import java.util.Date
+
+/**
+ * The IT uses a DTO and not directly the Book object because it should avoid the usage of ObjectId.
+ */
+class BookDTO {
+    var title: String? = null
+        private set
+    var author: String? = null
+        private set
+    var id: String? = null
+    var transientDescription: String? = null
+        private set
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private var creationDate: Date? = null
+    var categories: List<String> = ArrayList()
+        private set
+    var details: BookDetail? = null
+        private set
+
+    fun setTitle(title: String?): BookDTO {
+        this.title = title
+        return this
+    }
+
+    fun setAuthor(author: String?): BookDTO {
+        this.author = author
+        return this
+    }
+
+    fun setCategories(categories: List<String>): BookDTO {
+        this.categories = categories
+        return this
+    }
+
+    fun setDetails(details: BookDetail?): BookDTO {
+        this.details = details
+        return this
+    }
+
+    fun setTransientDescription(transientDescription: String?): BookDTO {
+        this.transientDescription = transientDescription
+        return this
+    }
+
+    fun getCreationDate(): Date? {
+        return creationDate
+    }
+
+    fun setCreationDate(creationDate: Date?): BookDTO {
+        this.creationDate = creationDate
+        return this
+    }
+
+    @Override
+    override fun toString(): String {
+        return "BookDTO{" +
+                "title='" + title + '\'' +
+                ", author='" + author + '\'' +
+                ", id='" + id + '\'' +
+                ", transientDescription='" + transientDescription + '\'' +
+                ", creationDate='" + creationDate + '\'' +
+                ", categories=" + categories +
+                ", details=" + details +
+                '}'
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongoTestResource.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongoTestResource.kt
new file mode 100644
index 0000000000000..de90b8189d530
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongoTestResource.kt
@@ -0,0 +1,82 @@
+package io.quarkus.it.mongodb.panache
+
+import de.flapdoodle.embed.mongo.Command
+import de.flapdoodle.embed.mongo.MongodExecutable
+import de.flapdoodle.embed.mongo.MongodStarter
+import de.flapdoodle.embed.mongo.config.IMongodConfig
+import de.flapdoodle.embed.mongo.config.MongodConfigBuilder
+import de.flapdoodle.embed.mongo.config.Net
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder
+import de.flapdoodle.embed.mongo.distribution.Version
+import de.flapdoodle.embed.process.config.io.ProcessOutput
+import de.flapdoodle.embed.process.io.Processors
+import de.flapdoodle.embed.process.runtime.Network
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager
+import org.jboss.logging.Logger
+
+class MongoTestResource : QuarkusTestResourceLifecycleManager {
+    companion object {
+        private val LOGGER: Logger = Logger.getLogger(MongoTestResource::class.java)
+    }
+
+    private var mongod: MongodExecutable? = null
+
+    override fun start(): Map<String, String> {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (e: ClassNotFoundException) {
+        }
+        return try {
+            val version: Version.Main = Version.Main.V4_0
+            val port = 27018
+            LOGGER.infof("Starting Mongo %s on port %s", version, port)
+            val config: IMongodConfig = MongodConfigBuilder()
+                    .version(version)
+                    .net(Net(port, Network.localhostIsIPv6()))
+                    .build()
+            mongod = getMongodExecutable(config).also {
+                try {
+                    it.start()
+                } catch (e: Exception) {
+                    //every so often mongo fails to start on CI runs
+                    //see if this helps
+                    Thread.sleep(1000)
+                    it.start()
+                }
+
+            }
+            mapOf()
+        } catch (e: Exception) {
+            throw RuntimeException(e)
+        }
+    }
+
+    private fun getMongodExecutable(config: IMongodConfig): MongodExecutable {
+        return try {
+            doGetExecutable(config)
+        } catch (e: Exception) {
+            // sometimes the download process can timeout so just sleep and try again
+            try {
+                Thread.sleep(1000)
+            } catch (ignored: InterruptedException) {
+            }
+            doGetExecutable(config)
+        }
+    }
+
+    private fun doGetExecutable(config: IMongodConfig): MongodExecutable {
+        val runtimeConfig = RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput(Processors.silent(),
+                        Processors.silent(), Processors.silent()))
+                .build()
+        return MongodStarter.getInstance(runtimeConfig).prepare(config)
+    }
+
+    override fun stop() {
+        mongod?.stop()
+    }
+}
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt
new file mode 100644
index 0000000000000..2fe71cd4e42b8
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.kt
@@ -0,0 +1,107 @@
+package io.quarkus.it.mongodb.panache
+
+import io.quarkus.it.mongodb.panache.person.MockablePersonRepository
+import io.quarkus.it.mongodb.panache.person.Person
+import io.quarkus.it.mongodb.panache.person.PersonEntity
+import io.quarkus.it.mongodb.panache.person.PersonRepository
+import io.quarkus.mongodb.panache.kotlin.PanacheMongoRepositoryBase
+import io.quarkus.test.common.QuarkusTestResource
+import io.quarkus.test.junit.QuarkusTest
+import io.quarkus.test.junit.mockito.InjectMock
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import org.mockito.Mockito
+import java.util.Collections
+import javax.inject.Inject
+import javax.ws.rs.WebApplicationException
+
+@QuarkusTest
+@QuarkusTestResource(MongoTestResource::class)
+class MongodbPanacheMockingTest {
+    @Inject
+    lateinit var realPersonRepository: PersonRepository
+
+    @InjectMock
+    lateinit var mockablePersonRepository: MockablePersonRepository
+
+    // These mocks are trying to call methods against instances but kotlin doesn't allow these kinds of method calls.
+    // they must be called against the companion object (invoked against the type not a reference).  removing these tests
+    // for now as I neither know how to correct this at this point nor am I convinced of the utility of these tests.
+/*
+    @Test
+    @Order(1)
+    fun testPanacheMocking() {
+        PanacheMock.mock(PersonEntity::class.java)
+        Assertions.assertEquals(0, PersonEntity.count())
+        Mockito.`when`(PersonEntity.count()).thenReturn(23L)
+        Assertions.assertEquals(23, PersonEntity.count())
+        Mockito.`when`(PersonEntity.count()).thenReturn(42L)
+        Assertions.assertEquals(42, PersonEntity.count())
+        Mockito.`when`(PersonEntity.count()).thenCallRealMethod()
+        Assertions.assertEquals(0, PersonEntity.count())
+        Assertions.assertEquals(4, PersonEntity.count())
+
+        val p = PersonEntity()
+        Mockito.`when`(PersonEntity.findById(12L)).thenReturn(p)
+        Assertions.assertSame(p, PersonEntity.findById(12L))
+        Assertions.assertNull(PersonEntity.findById(42L))
+        Mockito.`when`(PersonEntity.findById(12L)).thenThrow(WebApplicationException())
+        try {
+            PersonEntity.findById(12L)
+            Assertions.fail<Exception>()
+        } catch (x: WebApplicationException) {
+        }
+        Mockito.`when`(PersonEntity.findOrdered()).thenReturn(Collections.emptyList())
+        Assertions.assertTrue(PersonEntity.findOrdered().isEmpty())
+        PanacheMock.verify(PersonEntity::class.java).findOrdered()
+        PanacheMock.verify(PersonEntity::class.java, Mockito.atLeastOnce()).findById(Mockito.any())
+        PanacheMock.verifyNoMoreInteractions(PersonEntity::class.java)
+    }
+
+    @Test
+    @Order(2)
+    fun testPanacheMockingWasCleared() {
+        Assertions.assertFalse(PanacheMock.IsMockEnabled)
+    }
+*/
+
+    @Test
+    @Throws(Throwable::class)
+    fun testPanacheRepositoryMocking() {
+        Assertions.assertEquals(0, mockablePersonRepository.count())
+        Mockito.`when`(mockablePersonRepository.count()).thenReturn(23L)
+        Assertions.assertEquals(23, mockablePersonRepository.count())
+        Mockito.`when`(mockablePersonRepository.count()).thenReturn(42L)
+        Assertions.assertEquals(42, mockablePersonRepository.count())
+        Mockito.`when`(mockablePersonRepository.count()).thenCallRealMethod()
+        Assertions.assertEquals(0, mockablePersonRepository.count())
+        Mockito.verify(mockablePersonRepository, Mockito.times(4)).count()
+        val p = PersonEntity()
+        Mockito.`when`(mockablePersonRepository.findById(12L)).thenReturn(p)
+        Assertions.assertSame(p, mockablePersonRepository.findById(12L))
+        Assertions.assertNull(mockablePersonRepository.findById(42L))
+        Mockito.`when`(mockablePersonRepository.findById(12L)).thenThrow(WebApplicationException())
+        try {
+            mockablePersonRepository.findById(12L)
+            Assertions.fail<Exception>()
+        } catch (x: WebApplicationException) {
+        }
+        Mockito.`when`(mockablePersonRepository.findOrdered()).thenReturn(Collections.emptyList())
+        Assertions.assertTrue(mockablePersonRepository.findOrdered()?.isEmpty() ?: false)
+        Mockito.verify(mockablePersonRepository).findOrdered()
+        Mockito.verify(mockablePersonRepository, Mockito.atLeastOnce()).findById(12L)
+    }
+
+    @Test
+    fun testPanacheRepositoryBridges() {
+        // normal method call
+        Assertions.assertNull(realPersonRepository.findById(0L))
+        // bridge call
+        Assertions.assertNull((realPersonRepository as PanacheMongoRepositoryBase<Person, Long>).findById(0L))
+
+        // normal method call
+        Assertions.assertEquals(false, realPersonRepository.deleteById(0L))
+        // bridge call
+        Assertions.assertEquals(false, (realPersonRepository as PanacheMongoRepositoryBase<Person, Long>).deleteById(0L))
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.kt
new file mode 100644
index 0000000000000..c46756da682d8
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.kt
@@ -0,0 +1,334 @@
+package io.quarkus.it.mongodb.panache
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import io.quarkus.it.mongodb.panache.book.BookDetail
+import io.quarkus.it.mongodb.panache.person.Person
+import io.quarkus.it.mongodb.panache.person.PersonEntity
+import io.quarkus.test.common.QuarkusTestResource
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured
+import io.restassured.RestAssured.get
+import io.restassured.common.mapper.TypeRef
+import io.restassured.config.ObjectMapperConfig
+import io.restassured.parsing.Parser
+import io.restassured.response.Response
+import org.hamcrest.Matchers.`is`
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import java.util.Calendar
+import java.util.Collections
+import java.util.Date
+import java.util.GregorianCalendar
+
+@QuarkusTest
+@QuarkusTestResource(MongoTestResource::class)
+open class MongodbPanacheResourceTest {
+    @Test
+    fun testBookEntity() {
+        callBookEndpoint("/books/entity")
+    }
+
+    @Test
+    fun testBookRepository() {
+        callBookEndpoint("/books/repository")
+    }
+
+    @Test
+    fun testPersonEntity() {
+        callPersonEndpoint("/persons/entity")
+    }
+
+    @Test
+    fun testPersonRepository() {
+        callPersonEndpoint("/persons/repository")
+    }
+
+    private fun callBookEndpoint(endpoint: String) {
+        RestAssured.defaultParser = Parser.JSON
+        RestAssured.config
+                .objectMapperConfig(ObjectMapperConfig().jackson2ObjectMapperFactory { _, _ ->
+                    ObjectMapper()
+                            .registerModule(Jdk8Module())
+                            .registerModule(JavaTimeModule())
+                            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                })
+        var list: List<BookDTO> = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(0, list.size)
+        val book1: BookDTO = BookDTO().setAuthor("Victor Hugo").setTitle("Les Misérables")
+                .setCreationDate(yearToDate(1886))
+                .setCategories(listOf("long", "very long"))
+                .setDetails(BookDetail().setRating(3).setSummary("A very long book"))
+        var response: Response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book1)
+                .post(endpoint)
+                .andReturn()
+        Assertions.assertEquals(201, response.statusCode())
+        Assertions.assertTrue(response.header("Location").length > 20) //Assert that id has been populated
+        val book2: BookDTO = BookDTO().setAuthor("Victor Hugo").setTitle("Notre-Dame de Paris")
+                .setCreationDate(yearToDate(1831))
+                .setCategories(listOf("long", "quasimodo"))
+                .setDetails(BookDetail().setRating(4).setSummary("quasimodo and esmeralda"))
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book2)
+                .post(endpoint)
+                .andReturn()
+        Assertions.assertEquals(201, response.statusCode())
+        list = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(2, list.size)
+        val book3: BookDTO = BookDTO().setAuthor("Charles Baudelaire").setTitle("Les fleurs du mal")
+                .setCreationDate(yearToDate(1857))
+                .setCategories(Collections.singletonList("poem"))
+                .setDetails(BookDetail().setRating(2).setSummary("Les Fleurs du mal is a volume of poetry."))
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book3)
+                .post(endpoint)
+                .andReturn()
+        Assertions.assertEquals(201, response.statusCode())
+        val book4: BookDTO = BookDTO().setAuthor("Charles Baudelaire").setTitle("Le Spleen de Paris")
+                .setCreationDate(yearToDate(1869))
+                .setCategories(Collections.singletonList("poem"))
+                .setDetails(BookDetail().setRating(2)
+                        .setSummary("Le Spleen de Paris is a collection of 50 short prose poems."))
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book4)
+                .patch(endpoint)
+                .andReturn()
+        Assertions.assertEquals(202, response.statusCode())
+        list = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(4, list.size)
+
+        //with sort
+        list = get("$endpoint?sort=author").`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(4, list.size)
+
+        // magic query find("author", author)
+        list = get("$endpoint/search/Victor Hugo").`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(2, list.size)
+        // we have a projection so we should not have the details field but we should have the title thanks to @BsonProperty
+        Assertions.assertNotNull(list[0].title)
+        Assertions.assertNull(list[0].details)
+
+        // magic query find("{'author':?1,'title':?1}", author, title)
+        var book: BookDTO = get("$endpoint/search?author=Victor Hugo&title=Notre-Dame de Paris").`as`(BookDTO::class.java)
+        Assertions.assertNotNull(book)
+
+        // date
+        book = get("$endpoint/search?dateFrom=1885-01-01&dateTo=1887-01-01").`as`(BookDTO::class.java)
+        Assertions.assertNotNull(book)
+        book = get("$endpoint/search2?dateFrom=1885-01-01&dateTo=1887-01-01").`as`(BookDTO::class.java)
+        Assertions.assertNotNull(book)
+
+        // magic query find("{'author'::author,'title'::title}", Parameters.with("author", author).and("title", title))
+        book = get("$endpoint/search2?author=Victor Hugo&title=Notre-Dame de Paris").`as`(BookDTO::class.java)
+        Assertions.assertNotNull(book)
+        Assertions.assertNotNull(book.id)
+        Assertions.assertNotNull(book.details)
+
+        //update a book
+        book.setTitle("Notre-Dame de Paris 2").setTransientDescription("should not be persisted")
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book)
+                .put(endpoint)
+                .andReturn()
+        Assertions.assertEquals(202, response.statusCode())
+
+        //check that the title has been updated and the transient description ignored
+        book = get(endpoint + "/" + book.id.toString()).`as`(BookDTO::class.java)
+        Assertions.assertNotNull(book)
+        Assertions.assertEquals("Notre-Dame de Paris 2", book.title)
+        Assertions.assertNull(book.transientDescription)
+
+        //delete a book
+        response = RestAssured
+                .given()
+                .delete(endpoint + "/" + book.id.toString())
+                .andReturn()
+        Assertions.assertEquals(204, response.statusCode())
+        list = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(3, list.size)
+
+        //test some special characters
+        list = get("$endpoint/search/Victor'\\ Hugo").`as`(LIST_OF_BOOK_TYPE_REF)
+        Assertions.assertEquals(0, list.size)
+
+        //delete all
+        response = RestAssured
+                .given()
+                .delete(endpoint)
+                .andReturn()
+        Assertions.assertEquals(204, response.statusCode())
+    }
+
+    private fun callPersonEndpoint(endpoint: String) {
+        RestAssured.defaultParser = Parser.JSON
+        RestAssured.config
+                .objectMapperConfig(ObjectMapperConfig().jackson2ObjectMapperFactory { _, _ ->
+                    ObjectMapper()
+                            .registerModule(Jdk8Module())
+                            .registerModule(JavaTimeModule())
+                            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                })
+        var list: List<Person> = get(endpoint).`as`(LIST_OF_PERSON_TYPE_REF)
+        Assertions.assertEquals(0, list.size)
+        val person1 = Person()
+        person1.id = 1L
+        person1.firstname = "John"
+        person1.lastname = "Doe"
+        var response: Response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(person1)
+                .post(endpoint)
+                .andReturn()
+        Assertions.assertEquals(201, response.statusCode())
+        val person2 = Person()
+        person2.id = 2L
+        person2.firstname = "Jane"
+        person2.lastname = "Doe"
+        var person3 = Person()
+        person3.id = 3L
+        person3.firstname = "Victor"
+        person3.lastname = "Hugo"
+        val persons = mutableListOf<Person>()
+        persons.add(person2)
+        persons.add(person3)
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(persons)
+                .post("$endpoint/multiple")
+                .andReturn()
+        Assertions.assertEquals(204, response.statusCode())
+        val person4 = Person()
+        person4.id = 4L
+        person4.firstname = "Charles"
+        person4.lastname = "Baudelaire"
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(person4)
+                .patch(endpoint)
+                .andReturn()
+        Assertions.assertEquals(202, response.statusCode())
+        list = get(endpoint).`as`(LIST_OF_PERSON_TYPE_REF)
+        Assertions.assertEquals(4, list.size)
+
+        //with sort
+        list = get("$endpoint?sort=firstname").`as`(LIST_OF_PERSON_TYPE_REF)
+        Assertions.assertEquals(4, list.size)
+
+        //with project
+        list = get("$endpoint/search/Doe").`as`(LIST_OF_PERSON_TYPE_REF)
+        Assertions.assertEquals(1, list.size)
+        Assertions.assertNotNull(list[0].lastname)
+        //expected the firstname field to be null as we project on lastname only
+        Assertions.assertNull(list[0].firstname)
+
+        //rename the Doe
+        RestAssured
+                .given()
+                .queryParam("previousName", "Doe").queryParam("newName", "Dupont")
+                .header("Content-Type", "application/json")
+                .`when`().post("$endpoint/rename")
+                .then().statusCode(200)
+        list = get("$endpoint/search/Dupont").`as`(LIST_OF_PERSON_TYPE_REF)
+        Assertions.assertEquals(1, list.size)
+
+        //count
+        var count: Long = get("$endpoint/count").`as`(Long::class.java)
+        Assertions.assertEquals(4, count)
+
+        //update a person
+        person3.lastname = "Webster"
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(person3)
+                .put(endpoint)
+                .andReturn()
+        Assertions.assertEquals(202, response.statusCode())
+
+        //check that the title has been updated
+        person3 = get("$endpoint/${person3.id}").`as`(Person::class.java)
+        Assertions.assertEquals(3L, person3.id ?: -1)
+        Assertions.assertEquals("Webster", person3.lastname)
+
+        //delete a person
+        response = RestAssured
+                .given()
+                .delete("$endpoint/${person3.id}")
+                .andReturn()
+        Assertions.assertEquals(204, response.statusCode())
+        count = get("$endpoint/count").`as`(Long::class.java)
+        Assertions.assertEquals(3, count)
+
+        //delete all
+        response = RestAssured
+                .given()
+                .delete(endpoint)
+                .andReturn()
+        Assertions.assertEquals(204, response.statusCode())
+        count = get("$endpoint/count").`as`(Long::class.java)
+        Assertions.assertEquals(0, count)
+    }
+
+    private fun yearToDate(year: Int): Date {
+        val cal: Calendar = GregorianCalendar()
+        cal.set(year, 1, 1)
+        return cal.time
+    }
+
+    @Test
+    fun testBug5274() {
+        get("/bugs/5274").then().body(`is`("OK"))
+    }
+
+    @Test
+    fun testBug5885() {
+        get("/bugs/5885").then().body(`is`("OK"))
+    }
+
+    @Test
+    fun testDatesFormat() {
+        get("/bugs/dates").then().statusCode(200)
+    }
+
+    @Test
+    fun testNeedReflection() {
+        get("/bugs/6324").then().statusCode(200)
+        get("/bugs/6324/abstract").then().statusCode(200)
+    }
+
+    @Test
+    fun testBug7415() {
+        get("/bugs/7415").then().statusCode(200)
+    }
+
+    @Test
+    fun testMoreEntityFunctionalities() {
+        get("/test/imperative/entity").then().statusCode(200)
+    }
+
+    @Test
+    fun testMoreRepositoryFunctionalities() {
+        get("/test/imperative/repository").then().statusCode(200)
+    }
+
+    companion object {
+        private val LIST_OF_BOOK_TYPE_REF: TypeRef<List<BookDTO>> = object : TypeRef<List<BookDTO>>() {}
+        private val LIST_OF_PERSON_TYPE_REF: TypeRef<List<Person>> = object : TypeRef<List<Person>>() {}
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/NativeMongodbPanacheResourceIT.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/NativeMongodbPanacheResourceIT.kt
new file mode 100644
index 0000000000000..a688929f09b4d
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/NativeMongodbPanacheResourceIT.kt
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.panache.reactive
+
+import io.quarkus.it.mongodb.panache.MongodbPanacheResourceTest
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+internal class NativeMongodbPanacheResourceIT : MongodbPanacheResourceTest()
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/NativeReactiveMongodbPanacheResourceIT.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/NativeReactiveMongodbPanacheResourceIT.kt
new file mode 100644
index 0000000000000..820b50ccab674
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/NativeReactiveMongodbPanacheResourceIT.kt
@@ -0,0 +1,6 @@
+package io.quarkus.it.mongodb.panache.reactive
+
+import io.quarkus.test.junit.NativeImageTest
+
+@NativeImageTest
+internal class NativeReactiveMongodbPanacheResourceIT : ReactiveMongodbPanacheResourceTest()
diff --git a/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt
new file mode 100644
index 0000000000000..283139f1e4865
--- /dev/null
+++ b/integration-tests/mongodb-panache-kotlin/src/test/kotlin/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.kt
@@ -0,0 +1,351 @@
+package io.quarkus.it.mongodb.panache.reactive
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import io.quarkus.it.mongodb.panache.BookDTO
+import io.quarkus.it.mongodb.panache.MongoTestResource
+import io.quarkus.it.mongodb.panache.book.BookDetail
+import io.quarkus.it.mongodb.panache.person.Person
+import io.quarkus.test.common.QuarkusTestResource
+import io.quarkus.test.junit.QuarkusTest
+import io.restassured.RestAssured
+import io.restassured.RestAssured.get
+import io.restassured.common.mapper.TypeRef
+import io.restassured.config.ObjectMapperConfig
+import io.restassured.parsing.Parser
+import io.restassured.response.Response
+import org.awaitility.Awaitility.await
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import java.io.IOException
+import java.time.Duration
+import java.util.Calendar
+import java.util.Collections
+import java.util.Date
+import java.util.GregorianCalendar
+import javax.ws.rs.client.Client
+import javax.ws.rs.client.ClientBuilder
+import javax.ws.rs.client.WebTarget
+import javax.ws.rs.sse.SseEventSource
+
+@QuarkusTest
+@QuarkusTestResource(MongoTestResource::class)
+internal open class ReactiveMongodbPanacheResourceTest {
+    companion object {
+        private val LIST_OF_BOOK_TYPE_REF: TypeRef<List<BookDTO>> = object : TypeRef<List<BookDTO>>() {}
+        private val LIST_OF_PERSON_TYPE_REF: TypeRef<List<Person>> = object : TypeRef<List<Person>>() {}
+    }
+
+    @Test
+    @Throws(InterruptedException::class)
+    fun testReactiveBookEntity() {
+        callReactiveBookEndpoint("/reactive/books/entity")
+    }
+
+    @Test
+    @Throws(InterruptedException::class)
+    fun testReactiveBookRepository() {
+        callReactiveBookEndpoint("/reactive/books/repository")
+    }
+
+    @Test
+    fun testReactivePersonEntity() {
+        callReactivePersonEndpoint("/reactive/persons/entity")
+    }
+
+    @Test
+    fun testReactivePersonRepository() {
+        callReactivePersonEndpoint("/reactive/persons/repository")
+    }
+
+    @Throws(InterruptedException::class)
+    private fun callReactiveBookEndpoint(endpoint: String) {
+        RestAssured.defaultParser = Parser.JSON
+        val objectMapper: ObjectMapper = ObjectMapper()
+                .registerModule(Jdk8Module())
+                .registerModule(JavaTimeModule())
+                .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+        RestAssured.config
+                .objectMapperConfig(ObjectMapperConfig().jackson2ObjectMapperFactory { _, _ -> objectMapper })
+
+        var list: List<BookDTO> = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(0, list.size)
+
+        val book1: BookDTO = BookDTO().setAuthor("Victor Hugo").setTitle("Les Misérables")
+                .setCreationDate(yearToDate(1886))
+                .setCategories(listOf("long", "very long"))
+                .setDetails(BookDetail().setRating(3).setSummary("A very long book"))
+        var response: Response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book1)
+                .post(endpoint)
+                .andReturn()
+        assertEquals(201, response.statusCode())
+        Assertions.assertTrue(response.header("Location").length > 20) //Assert that id has been populated
+
+        val book2: BookDTO = BookDTO().setAuthor("Victor Hugo").setTitle("Notre-Dame de Paris")
+                .setCreationDate(yearToDate(1831))
+                .setCategories(listOf("long", "quasimodo"))
+                .setDetails(BookDetail().setRating(4).setSummary("quasimodo and esmeralda"))
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book2)
+                .post(endpoint)
+                .andReturn()
+        assertEquals(201, response.statusCode())
+
+        list = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(2, list.size)
+
+        val book3: BookDTO = BookDTO().setAuthor("Charles Baudelaire").setTitle("Les fleurs du mal")
+                .setCreationDate(yearToDate(1857))
+                .setCategories(Collections.singletonList("poem"))
+                .setDetails(BookDetail().setRating(2).setSummary("Les Fleurs du mal is a volume of poetry."))
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book3)
+                .post(endpoint)
+                .andReturn()
+        assertEquals(201, response.statusCode())
+
+        val book4: BookDTO = BookDTO().setAuthor("Charles Baudelaire").setTitle("Le Spleen de Paris")
+                .setCreationDate(yearToDate(1869))
+                .setCategories(Collections.singletonList("poem"))
+                .setDetails(BookDetail().setRating(2)
+                        .setSummary("Le Spleen de Paris is a collection of 50 short prose poems."))
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book4)
+                .patch(endpoint)
+                .andReturn()
+        assertEquals(202, response.statusCode())
+
+        list = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(4, list.size)
+
+        //with sort
+        list = get("$endpoint?sort=author").`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(4, list.size)
+
+        // magic query find("author", author)
+        list = get("$endpoint/search/Victor Hugo").`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(2, list.size)
+
+        // magic query find("{'author':?1,'title':?1}", author, title)
+        var book: BookDTO = get("$endpoint/search?author=Victor Hugo&title=Notre-Dame de Paris").`as`(BookDTO::class.java)
+        assertNotNull(book)
+
+        // date
+        book = get("$endpoint/search?dateFrom=1885-01-01&dateTo=1887-01-01").`as`(BookDTO::class.java)
+        assertNotNull(book)
+
+        book = get("$endpoint/search2?dateFrom=1885-01-01&dateTo=1887-01-01").`as`(BookDTO::class.java)
+        assertNotNull(book)
+
+        // magic query find("{'author'::author,'title'::title}", Parameters.with("author", author).and("title", title))
+        book = get("$endpoint/search2?author=Victor Hugo&title=Notre-Dame de Paris").`as`(BookDTO::class.java)
+        assertNotNull(book)
+        assertNotNull(book.id)
+        assertNotNull(book.details)
+
+        //update a book
+        book.setTitle("Notre-Dame de Paris 2").setTransientDescription("should not be persisted")
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(book)
+                .put(endpoint)
+                .andReturn()
+        assertEquals(202, response.statusCode())
+
+        //check that the title has been updated and the transient description ignored
+        book = get(endpoint + "/" + book.id.toString()).`as`(BookDTO::class.java)
+        assertEquals("Notre-Dame de Paris 2", book.title)
+        Assertions.assertNull(book.transientDescription)
+
+        //delete a book
+        response = RestAssured
+                .given()
+                .delete(endpoint + "/" + book.id.toString())
+                .andReturn()
+        assertEquals(204, response.statusCode())
+
+        list = get(endpoint).`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(3, list.size)
+
+        //test some special characters
+        list = get("$endpoint/search/Victor'\\ Hugo").`as`(LIST_OF_BOOK_TYPE_REF)
+        assertEquals(0, list.size)
+
+        //test SSE : there is no JSON serialization for SSE so the test is not very elegant ...
+        val client: Client = ClientBuilder.newClient()
+        val target: WebTarget = client.target("http://localhost:8081$endpoint/stream")
+        SseEventSource.target(target).build().use { source ->
+            val nbEvent = IntegerAdder()
+            source.register { inboundSseEvent ->
+                try {
+                    val theBook: BookDTO = objectMapper.readValue(inboundSseEvent.readData(), BookDTO::class.java)
+                    assertNotNull(theBook)
+                } catch (e: IOException) {
+                    throw RuntimeException(e)
+                }
+                nbEvent.increment()
+            }
+            source.open()
+            await().atMost(Duration.ofSeconds(10)).until({ nbEvent.count() == 3 })
+        }
+
+        //delete all
+        response = RestAssured
+                .given()
+                .delete(endpoint)
+                .andReturn()
+        assertEquals(204, response.statusCode())
+    }
+
+    private fun callReactivePersonEndpoint(endpoint: String) {
+        RestAssured.defaultParser = Parser.JSON
+        RestAssured.config
+                .objectMapperConfig(ObjectMapperConfig().jackson2ObjectMapperFactory({ type, s ->
+                    ObjectMapper()
+                            .registerModule(Jdk8Module())
+                            .registerModule(JavaTimeModule())
+                            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                }))
+        var list: List<Person> = get(endpoint).`as`(LIST_OF_PERSON_TYPE_REF)
+        assertEquals(0, list.size)
+        val person1 = Person()
+        person1.id = 1L
+        person1.firstname = "John"
+        person1.lastname = "Doe"
+        var response: Response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(person1)
+                .post(endpoint)
+                .andReturn()
+        assertEquals(201, response.statusCode())
+        val person2 = Person()
+        person2.id = 2L
+        person2.firstname = "Jane"
+        person2.lastname = "Doe"
+        var person3 = Person()
+        person3.id = 3L
+        person3.firstname = "Victor"
+        person3.lastname = "Hugo"
+        val persons = mutableListOf<Person>()
+        persons.add(person2)
+        persons.add(person3)
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(persons)
+                .post("$endpoint/multiple")
+                .andReturn()
+        assertEquals(204, response.statusCode())
+        val person4 = Person()
+        person4.id = 4L
+        person4.firstname = "Charles"
+        person4.lastname = "Baudelaire"
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(person4)
+                .patch(endpoint)
+                .andReturn()
+        assertEquals(202, response.statusCode())
+        list = get(endpoint).`as`(LIST_OF_PERSON_TYPE_REF)
+        assertEquals(4, list.size)
+
+        //with sort
+        list = get("$endpoint?sort=firstname").`as`(LIST_OF_PERSON_TYPE_REF)
+        assertEquals(4, list.size)
+
+        //with project
+        list = get("$endpoint/search/Doe").`as`(LIST_OF_PERSON_TYPE_REF)
+        assertEquals(1, list.size)
+        assertNotNull(list[0].lastname)
+        //expected the firstname field to be null as we project on lastname only
+        Assertions.assertNull(list[0].firstname)
+
+        //rename the Doe
+        RestAssured
+                .given()
+                .queryParam("previousName", "Doe").queryParam("newName", "Dupont")
+                .header("Content-Type", "application/json")
+                .`when`().post("$endpoint/rename")
+                .then().statusCode(200)
+        list = get("$endpoint/search/Dupont").`as`(LIST_OF_PERSON_TYPE_REF)
+        assertEquals(1, list.size)
+
+        //count
+        var count: Long = get("$endpoint/count").`as`(Long::class.java)
+        assertEquals(4, count)
+
+        //update a person
+        person3.lastname = "Webster"
+        response = RestAssured
+                .given()
+                .header("Content-Type", "application/json")
+                .body(person3)
+                .put(endpoint)
+                .andReturn()
+        assertEquals(202, response.statusCode())
+
+        //check that the title has been updated
+        person3 = get("$endpoint/${person3.id}").`as`(Person::class.java)
+        assertEquals(3L, person3.id ?: -1L)
+        assertEquals("Webster", person3.lastname)
+
+        //delete a person
+        response = RestAssured
+                .given()
+                .delete(endpoint + "/" + person3.id)
+                .andReturn()
+        assertEquals(204, response.statusCode())
+        count = get("$endpoint/count").`as`(Long::class.java)
+        assertEquals(3, count)
+
+        //delete all
+        response = RestAssured
+                .given()
+                .delete(endpoint)
+                .andReturn()
+        assertEquals(204, response.statusCode())
+        count = get("$endpoint/count").`as`(Long::class.java)
+        assertEquals(0, count)
+    }
+
+    private fun yearToDate(year: Int): Date {
+        val cal: Calendar = GregorianCalendar()
+        cal.set(year, 1, 1)
+        return cal.getTime()
+    }
+
+    private class IntegerAdder {
+        var cpt = 0
+        fun increment() {
+            cpt++
+        }
+
+        fun count(): Int = cpt
+    }
+
+    @Test
+    fun testMoreEntityFunctionalities() {
+        get("/test/reactive/entity").then().statusCode(200)
+    }
+
+    @Test
+    fun testMoreRepositoryFunctionalities() {
+        get("/test/reactive/repository").then().statusCode(200)
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache/pom.xml b/integration-tests/mongodb-panache/pom.xml
index 4bd5ecb03ad2d..e5a7dd8249951 100755
--- a/integration-tests/mongodb-panache/pom.xml
+++ b/integration-tests/mongodb-panache/pom.xml
@@ -31,6 +31,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+        </dependency>
 
         <!-- Force the scope to compile as we make assertions inside the resources -->
         <dependency>
@@ -74,6 +78,74 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -104,65 +176,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/AccessorEntity.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/AccessorEntity.java
new file mode 100644
index 0000000000000..aacfb1b0cbf85
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/AccessorEntity.java
@@ -0,0 +1,56 @@
+package io.quarkus.it.mongodb.panache;
+
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+
+public class AccessorEntity extends GenericEntity {
+
+    public byte b;
+    public boolean bool;
+    public char c;
+    public double d;
+    public float f;
+    public int i;
+    public long l;
+    public short s;
+    public String string;
+    @BsonIgnore
+    public Object trans;
+    @BsonIgnore
+    public Object trans2;
+
+    transient int getBCalls = 0;
+    transient int getTransCalls = 0;
+    transient int setICalls = 0;
+    transient int setTransCalls = 0;
+
+    public byte getB() {
+        getBCalls++;
+        return b;
+    }
+
+    // explicit getter or setter
+
+    public Object getTrans() {
+        getTransCalls++;
+        return trans;
+    }
+
+    public void setTrans(Object trans) {
+        setTransCalls++;
+        this.trans = trans;
+    }
+
+    public void method() {
+        // touch some fields
+        @SuppressWarnings("unused")
+        byte b2 = b;
+        i = 2;
+        t = 1;
+        t2 = 2;
+    }
+
+    public void setI(int i) {
+        setICalls++;
+        this.i = i;
+    }
+}
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/GenericEntity.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/GenericEntity.java
new file mode 100644
index 0000000000000..cbcea15c55535
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/GenericEntity.java
@@ -0,0 +1,16 @@
+package io.quarkus.it.mongodb.panache;
+
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+public abstract class GenericEntity<T> extends PanacheMongoEntity {
+    public T t;
+    public T t2;
+
+    public T getT2() {
+        return t2;
+    }
+
+    public void setT2(T t2) {
+        this.t2 = t2;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java
new file mode 100644
index 0000000000000..adedbb1e53de4
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/TestEndpoint.java
@@ -0,0 +1,74 @@
+package io.quarkus.it.mongodb.panache;
+
+import java.lang.reflect.Method;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.junit.jupiter.api.Assertions;
+
+@Path("/accessors")
+public class TestEndpoint {
+
+    @GET
+    public String testAccessors() throws NoSuchMethodException, SecurityException {
+        checkMethod(AccessorEntity.class, "getString", String.class);
+        checkMethod(AccessorEntity.class, "isBool", boolean.class);
+        checkMethod(AccessorEntity.class, "getC", char.class);
+        checkMethod(AccessorEntity.class, "getS", short.class);
+        checkMethod(AccessorEntity.class, "getI", int.class);
+        checkMethod(AccessorEntity.class, "getL", long.class);
+        checkMethod(AccessorEntity.class, "getF", float.class);
+        checkMethod(AccessorEntity.class, "getD", double.class);
+        checkMethod(AccessorEntity.class, "getT", Object.class);
+        checkMethod(AccessorEntity.class, "getT2", Object.class);
+
+        checkMethod(AccessorEntity.class, "setString", void.class, String.class);
+        checkMethod(AccessorEntity.class, "setBool", void.class, boolean.class);
+        checkMethod(AccessorEntity.class, "setC", void.class, char.class);
+        checkMethod(AccessorEntity.class, "setS", void.class, short.class);
+        checkMethod(AccessorEntity.class, "setI", void.class, int.class);
+        checkMethod(AccessorEntity.class, "setL", void.class, long.class);
+        checkMethod(AccessorEntity.class, "setF", void.class, float.class);
+        checkMethod(AccessorEntity.class, "setD", void.class, double.class);
+        checkMethod(AccessorEntity.class, "setT", void.class, Object.class);
+        checkMethod(AccessorEntity.class, "setT2", void.class, Object.class);
+
+        try {
+            checkMethod(AccessorEntity.class, "getTrans2", Object.class);
+            Assertions.fail("transient field should have no getter: trans2");
+        } catch (NoSuchMethodException x) {
+        }
+
+        try {
+            checkMethod(AccessorEntity.class, "setTrans2", void.class, Object.class);
+            Assertions.fail("transient field should have no setter: trans2");
+        } catch (NoSuchMethodException x) {
+        }
+
+        // Now check that accessors are called
+        AccessorEntity entity = new AccessorEntity();
+        @SuppressWarnings("unused")
+        byte b = entity.b;
+        Assertions.assertEquals(1, entity.getBCalls);
+        entity.i = 2;
+        Assertions.assertEquals(1, entity.setICalls);
+        Object trans = entity.trans;
+        Assertions.assertEquals(0, entity.getTransCalls);
+        entity.trans = trans;
+        Assertions.assertEquals(0, entity.setTransCalls);
+
+        // accessors inside the entity itself
+        entity.method();
+        Assertions.assertEquals(2, entity.getBCalls);
+        Assertions.assertEquals(2, entity.setICalls);
+
+        return "OK";
+    }
+
+    private void checkMethod(Class<?> klass, String name, Class<?> returnType, Class<?>... params)
+            throws NoSuchMethodException, SecurityException {
+        Method method = klass.getMethod(name, params);
+        Assertions.assertEquals(returnType, method.getReturnType());
+    }
+}
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java
index f8f018e81df14..f98d16594b2b9 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookEntityResource.java
@@ -6,7 +6,6 @@
 
 import javax.annotation.PostConstruct;
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.bson.types.ObjectId;
@@ -16,8 +15,6 @@
 import io.quarkus.panache.common.Sort;
 
 @Path("/books/entity")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class BookEntityResource {
     private static final Logger LOGGER = Logger.getLogger(BookEntityResource.class);
 
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java
index 5de29dc6f49f4..a0dd6d7549231 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/book/BookRepositoryResource.java
@@ -7,7 +7,6 @@
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.bson.types.ObjectId;
@@ -17,8 +16,6 @@
 import io.quarkus.panache.common.Sort;
 
 @Path("/books/repository")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class BookRepositoryResource {
     private static final Logger LOGGER = Logger.getLogger(BookRepositoryResource.class);
     @Inject
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java
new file mode 100644
index 0000000000000..3ec61ddce60f8
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/Bug13301Repository.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.mongodb.panache.bugs;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.mongodb.panache.PanacheMongoRepository;
+
+@ApplicationScoped
+public class Bug13301Repository implements PanacheMongoRepository<NeedReflectionChild> {
+}
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java
index 448393c346f10..7b5c1150baf39 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/BugResource.java
@@ -5,6 +5,7 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
+import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
@@ -23,6 +24,9 @@ public class BugResource {
     @Inject
     Bug5274EntityRepository bug5274EntityRepository;
 
+    @Inject
+    Bug13301Repository bug13301Repository;
+
     @GET
     @Path("5274")
     public String testBug5274() {
@@ -97,4 +101,16 @@ public Response testForeignObjectId() {
         LinkedEntity.find("myForeignId", link.id).firstResultOptional().orElseThrow(() -> new NotFoundException());
         return Response.ok().build();
     }
+
+    @GET
+    @Path("13301")
+    public Response testReflectiveHierarchy() {
+        NeedReflectionChild me = new NeedReflectionChild();
+        me.parent = "François";
+        me.child = "Loïc";
+        bug13301Repository.persist(me);
+
+        Optional<NeedReflectionChild> result = bug13301Repository.find("parent", "François").firstResultOptional();
+        return result.isPresent() ? Response.ok().build() : Response.serverError().build();
+    }
 }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/NeedReflectionChild.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/NeedReflectionChild.java
new file mode 100644
index 0000000000000..4fc7189a301bb
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/NeedReflectionChild.java
@@ -0,0 +1,5 @@
+package io.quarkus.it.mongodb.panache.bugs;
+
+public class NeedReflectionChild extends NeedReflectionParent {
+    public String child;
+}
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/NeedReflectionParent.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/NeedReflectionParent.java
new file mode 100644
index 0000000000000..27ad7bbed75be
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/bugs/NeedReflectionParent.java
@@ -0,0 +1,5 @@
+package io.quarkus.it.mongodb.panache.bugs;
+
+public class NeedReflectionParent {
+    public String parent;
+}
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Person.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Person.java
index 49f28cd323000..f6a2f122d27eb 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Person.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Person.java
@@ -7,4 +7,5 @@ public class Person {
     public Long id;
     public String firstname;
     public String lastname;
+    public Status status = Status.ALIVE;
 }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntity.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntity.java
index be33769b45e73..06013b3b5a20f 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntity.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntity.java
@@ -12,6 +12,7 @@ public class PersonEntity extends PanacheMongoEntityBase {
     public Long id;
     public String firstname;
     public String lastname;
+    public Status status = Status.ALIVE;
 
     public static List<PersonEntity> findOrdered() {
         return findAll(Sort.by("lastname", "firstname")).list();
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Status.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Status.java
new file mode 100644
index 0000000000000..0a7180aab25e7
--- /dev/null
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/Status.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.mongodb.panache.person;
+
+public enum Status {
+    DEAD("I'm a Zombie"),
+    ALIVE("I alive!");
+
+    private final String value;
+
+    private Status(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java
similarity index 84%
rename from integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntityResource.java
rename to integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java
index 0cfe021f3ec8c..44903f875df34 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntityResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonEntityResource.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.mongodb.panache.person;
+package io.quarkus.it.mongodb.panache.person.resources;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -6,14 +6,16 @@
 import java.util.Set;
 
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import com.mongodb.ReadPreference;
+
+import io.quarkus.it.mongodb.panache.person.PersonEntity;
+import io.quarkus.it.mongodb.panache.person.PersonName;
+import io.quarkus.it.mongodb.panache.person.Status;
 import io.quarkus.panache.common.Sort;
 
 @Path("/persons/entity")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class PersonEntityResource {
     @GET
     public List<PersonEntity> getPersons(@QueryParam("sort") String sort) {
@@ -27,7 +29,10 @@ public List<PersonEntity> getPersons(@QueryParam("sort") String sort) {
     @Path("/search/{name}")
     public Set<PersonName> searchPersons(@PathParam("name") String name) {
         Set<PersonName> uniqueNames = new HashSet<>();
-        List<PersonName> lastnames = PersonEntity.find("lastname", name).project(PersonName.class).list();
+        List<PersonName> lastnames = PersonEntity.find("lastname = ?1 and status = ?2", name, Status.ALIVE)
+                .project(PersonName.class)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list();
         lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
         return uniqueNames;
     }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java
similarity index 82%
rename from integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepositoryResource.java
rename to integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java
index 413f5a1987bbd..3a614f7f29a05 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepositoryResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/resources/PersonRepositoryResource.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.mongodb.panache.person;
+package io.quarkus.it.mongodb.panache.person.resources;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -7,14 +7,18 @@
 
 import javax.inject.Inject;
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import com.mongodb.ReadPreference;
+
+import io.quarkus.it.mongodb.panache.person.MockablePersonRepository;
+import io.quarkus.it.mongodb.panache.person.Person;
+import io.quarkus.it.mongodb.panache.person.PersonName;
+import io.quarkus.it.mongodb.panache.person.PersonRepository;
+import io.quarkus.it.mongodb.panache.person.Status;
 import io.quarkus.panache.common.Sort;
 
 @Path("/persons/repository")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class PersonRepositoryResource {
 
     // fake unused injection point to force ArC to not remove this otherwise I can't mock it in the tests
@@ -36,7 +40,10 @@ public List<Person> getPersons(@QueryParam("sort") String sort) {
     @Path("/search/{name}")
     public Set<PersonName> searchPersons(@PathParam("name") String name) {
         Set<PersonName> uniqueNames = new HashSet<>();
-        List<PersonName> lastnames = personRepository.find("lastname", name).project(PersonName.class).list();
+        List<PersonName> lastnames = personRepository.find("lastname = ?1 and status = ?2", name, Status.ALIVE)
+                .project(PersonName.class)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list();
         lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
         return uniqueNames;
     }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java
index 54d11aee5cf3e..82646a6ea6087 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookEntityResource.java
@@ -19,8 +19,6 @@
 import io.smallrye.mutiny.Uni;
 
 @Path("/reactive/books/entity")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class ReactiveBookEntityResource {
     private static final Logger LOGGER = Logger.getLogger(ReactiveBookEntityResource.class);
 
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java
index 543dab581b105..4ef11d7e5bde6 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/book/ReactiveBookRepositoryResource.java
@@ -21,8 +21,6 @@
 import io.smallrye.mutiny.Uni;
 
 @Path("/reactive/books/repository")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class ReactiveBookRepositoryResource {
     private static final Logger LOGGER = Logger.getLogger(ReactiveBookRepositoryResource.class);
     @Inject
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java
similarity index 88%
rename from integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntityResource.java
rename to integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java
index 3bdce32025ac8..dbd1a9bac4724 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntityResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonEntityResource.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.mongodb.panache.reactive.person;
+package io.quarkus.it.mongodb.panache.reactive.person.resources;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -6,16 +6,16 @@
 import java.util.Set;
 
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import com.mongodb.ReadPreference;
+
 import io.quarkus.it.mongodb.panache.person.PersonName;
+import io.quarkus.it.mongodb.panache.reactive.person.ReactivePersonEntity;
 import io.quarkus.panache.common.Sort;
 import io.smallrye.mutiny.Uni;
 
 @Path("/reactive/persons/entity")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class ReactivePersonEntityResource {
     @GET
     public Uni<List<ReactivePersonEntity>> getPersons(@QueryParam("sort") String sort) {
@@ -29,8 +29,11 @@ public Uni<List<ReactivePersonEntity>> getPersons(@QueryParam("sort") String sor
     @Path("/search/{name}")
     public Set<PersonName> searchPersons(@PathParam("name") String name) {
         Set<PersonName> uniqueNames = new HashSet<>();
-        List<PersonName> lastnames = ReactivePersonEntity.find("lastname", name).project(PersonName.class).list().await()
-                .indefinitely();
+        List<PersonName> lastnames = ReactivePersonEntity.find("lastname", name)
+                .project(PersonName.class)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list()
+                .await().indefinitely();
         lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
         return uniqueNames;
     }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java
similarity index 88%
rename from integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepositoryResource.java
rename to integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java
index 3e60edf9f9884..aea4dad507f2e 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepositoryResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/resources/ReactivePersonRepositoryResource.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.mongodb.panache.reactive.person;
+package io.quarkus.it.mongodb.panache.reactive.person.resources;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -7,17 +7,17 @@
 
 import javax.inject.Inject;
 import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import com.mongodb.ReadPreference;
+
 import io.quarkus.it.mongodb.panache.person.Person;
 import io.quarkus.it.mongodb.panache.person.PersonName;
+import io.quarkus.it.mongodb.panache.reactive.person.ReactivePersonRepository;
 import io.quarkus.panache.common.Sort;
 import io.smallrye.mutiny.Uni;
 
 @Path("/reactive/persons/repository")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
 public class ReactivePersonRepositoryResource {
 
     @Inject
@@ -35,8 +35,11 @@ public Uni<List<Person>> getPersons(@QueryParam("sort") String sort) {
     @Path("/search/{name}")
     public Set<PersonName> searchPersons(@PathParam("name") String name) {
         Set<PersonName> uniqueNames = new HashSet<>();
-        List<PersonName> lastnames = reactivePersonRepository.find("lastname", name).project(PersonName.class).list().await()
-                .indefinitely();
+        List<PersonName> lastnames = reactivePersonRepository.find("lastname", name)
+                .project(PersonName.class)
+                .withReadPreference(ReadPreference.primaryPreferred())
+                .list()
+                .await().indefinitely();
         lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
         return uniqueNames;
     }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.java
index 4dc23313b65b3..051a32df1530a 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestImperativeEntity.java
@@ -6,6 +6,7 @@ public class TestImperativeEntity extends PanacheMongoEntity {
     public String title;
     public String category;
     public String description;
+    public int cpt = 1;
 
     public TestImperativeEntity() {
     }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.java
index 59ff60f8be2c9..edce5d613916c 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestReactiveEntity.java
@@ -6,6 +6,7 @@ public class TestReactiveEntity extends ReactivePanacheMongoEntity {
     public String title;
     public String category;
     public String description;
+    public int cpt = 1;
 
     public TestReactiveEntity() {
     }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java
index a13af23876ce6..41657f6ed6318 100644
--- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java
+++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java
@@ -149,12 +149,18 @@ public Response testImperativeEntity() {
         updated = TestImperativeEntity.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
                 .where("{'category' : :category}", Parameters.with("category", "newCategory"));
         Assertions.assertEquals(5, updated);
-        Assertions.assertEquals(5, TestImperativeEntity.count("category = ?1", "newCategory2"));
+        updated = TestImperativeEntity.update("{'$set': {'category' : :category}}", Parameters.with("category", "newCategory3"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory2"));
+        Assertions.assertEquals(5, updated);
+        Assertions.assertEquals(5, TestImperativeEntity.count("category = ?1", "newCategory3"));
         updated = TestImperativeEntity.update("newField", "newValue").all();
         Assertions.assertEquals(10, updated);
+        updated = TestImperativeEntity.update("{'$inc': {'cpt': 1}}").all();
+        Assertions.assertEquals(10, updated);
+        Assertions.assertEquals(10, TestImperativeEntity.count("cpt = ?1", 2));
 
         // delete
-        TestImperativeEntity.delete("category = ?1", "newCategory2");
+        TestImperativeEntity.delete("category = ?1", "newCategory3");
         TestImperativeEntity.delete("{'category' : ?1}", "category1");
         Assertions.assertEquals(0, TestImperativeEntity.count());
         TestImperativeEntity.persist(entities.stream());
@@ -292,12 +298,19 @@ public Response testImperativeRepository() {
         updated = testImperativeRepository.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
                 .where("{'category' : :category}", Parameters.with("category", "newCategory"));
         Assertions.assertEquals(5, updated);
-        Assertions.assertEquals(5, testImperativeRepository.count("category = ?1", "newCategory2"));
+        updated = testImperativeRepository
+                .update("{'$set': {'category' : :category}}", Parameters.with("category", "newCategory3"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory2"));
+        Assertions.assertEquals(5, updated);
+        Assertions.assertEquals(5, testImperativeRepository.count("category = ?1", "newCategory3"));
         updated = testImperativeRepository.update("newField", "newValue").all();
         Assertions.assertEquals(10, updated);
+        updated = testImperativeRepository.update("{'$inc': {'cpt': 1}}").all();
+        Assertions.assertEquals(10, updated);
+        Assertions.assertEquals(10, testImperativeRepository.count("cpt = ?1", 2));
 
         // delete
-        testImperativeRepository.delete("category = ?1", "newCategory2");
+        testImperativeRepository.delete("category = ?1", "newCategory3");
         testImperativeRepository.delete("{'category' : ?1}", "category1");
         Assertions.assertEquals(0, testImperativeRepository.count());
         testImperativeRepository.persist(entities.stream());
@@ -515,12 +528,18 @@ public Response testReactiveEntity() {
         updated = TestReactiveEntity.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
                 .where("{'category' : :category}", Parameters.with("category", "newCategory")).await().indefinitely();
         Assertions.assertEquals(5, updated);
-        Assertions.assertEquals(5, TestReactiveEntity.count("category = ?1", "newCategory2").await().indefinitely());
+        updated = TestReactiveEntity.update("{'$set': {'category' : :category}}", Parameters.with("category", "newCategory3"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory2")).await().indefinitely();
+        Assertions.assertEquals(5, updated);
+        Assertions.assertEquals(5, TestReactiveEntity.count("category = ?1", "newCategory3").await().indefinitely());
         updated = TestReactiveEntity.update("newField", "newValue").all().await().indefinitely();
         Assertions.assertEquals(10, updated);
+        updated = TestReactiveEntity.update("{'$inc': {'cpt': 1}}").all().await().indefinitely();
+        Assertions.assertEquals(10, updated);
+        Assertions.assertEquals(10, TestReactiveEntity.count("cpt = ?1", 2).await().indefinitely());
 
         // delete
-        TestReactiveEntity.delete("category = ?1", "newCategory2").await().indefinitely();
+        TestReactiveEntity.delete("category = ?1", "newCategory3").await().indefinitely();
         TestReactiveEntity.delete("{'category' : ?1}", "category1").await().indefinitely();
         Assertions.assertEquals(0, TestReactiveEntity.count().await().indefinitely());
         TestReactiveEntity.persist(entities.stream()).await().indefinitely();
@@ -668,12 +687,19 @@ public Response testReactiveRepository() {
         updated = testReactiveRepository.update("{'category' : :category}", Parameters.with("category", "newCategory2"))
                 .where("{'category' : :category}", Parameters.with("category", "newCategory")).await().indefinitely();
         Assertions.assertEquals(5, updated);
-        Assertions.assertEquals(5, testReactiveRepository.count("category = ?1", "newCategory2").await().indefinitely());
+        updated = testReactiveRepository
+                .update("{'$set': {'category' : :category}}", Parameters.with("category", "newCategory3"))
+                .where("{'category' : :category}", Parameters.with("category", "newCategory2")).await().indefinitely();
+        Assertions.assertEquals(5, updated);
+        Assertions.assertEquals(5, testReactiveRepository.count("category = ?1", "newCategory3").await().indefinitely());
         updated = testReactiveRepository.update("newField", "newValue").all().await().indefinitely();
         Assertions.assertEquals(10, updated);
+        updated = testReactiveRepository.update("{'$inc': {'cpt': 1}}").all().await().indefinitely();
+        Assertions.assertEquals(10, updated);
+        Assertions.assertEquals(10, testReactiveRepository.count("cpt = ?1", 2).await().indefinitely());
 
         // delete
-        testReactiveRepository.delete("category = ?1", "newCategory2").await().indefinitely();
+        testReactiveRepository.delete("category = ?1", "newCategory3").await().indefinitely();
         testReactiveRepository.delete("{'category' : ?1}", "category1").await().indefinitely();
         Assertions.assertEquals(0, testReactiveRepository.count().await().indefinitely());
         testReactiveRepository.persist(entities.stream()).await().indefinitely();
diff --git a/integration-tests/mongodb-panache/src/main/resources/application.properties b/integration-tests/mongodb-panache/src/main/resources/application.properties
index a8735d2d6ed0c..63810ad397a2a 100644
--- a/integration-tests/mongodb-panache/src/main/resources/application.properties
+++ b/integration-tests/mongodb-panache/src/main/resources/application.properties
@@ -6,4 +6,5 @@ quarkus.mongodb.database=books
 quarkus.mongodb.cl2.connection-string=mongodb://localhost:27018
 quarkus.mongodb.cl2.write-concern.journal=false
 
-quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
\ No newline at end of file
+#quarkus.log.category."io.quarkus.mongodb.panache.runtime".level=DEBUG
+quarkus.mongodb.metrics.enabled=true
diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongoTestResource.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongoTestResource.java
index 63e498ccdc100..edb722fae8fd3 100644
--- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongoTestResource.java
+++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongoTestResource.java
@@ -5,12 +5,16 @@
 
 import org.jboss.logging.Logger;
 
+import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
 import de.flapdoodle.embed.mongo.config.IMongodConfig;
 import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
 import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.runtime.Network;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
@@ -21,6 +25,13 @@ public class MongoTestResource implements QuarkusTestResourceLifecycleManager {
 
     @Override
     public Map<String, String> start() {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
         try {
             Version.Main version = Version.Main.V4_0;
             int port = 27018;
@@ -59,7 +70,11 @@ private MongodExecutable getMongodExecutable(IMongodConfig config) {
     }
 
     private MongodExecutable doGetExecutable(IMongodConfig config) {
-        return MongodStarter.getDefaultInstance().prepare(config);
+        IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+                .defaults(Command.MongoD)
+                .processOutput(ProcessOutput.getDefaultInstanceSilent())
+                .build();
+        return MongodStarter.getInstance(runtimeConfig).prepare(config);
     }
 
     @Override
diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java
index 1f5d7ad5f72be..e05dccf054da1 100644
--- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java
+++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheMockingTest.java
@@ -31,10 +31,10 @@ public void testPanacheMocking() {
 
         Assertions.assertEquals(0, PersonEntity.count());
 
-        Mockito.when(PersonEntity.count()).thenReturn(23l);
+        Mockito.when(PersonEntity.count()).thenReturn(23L);
         Assertions.assertEquals(23, PersonEntity.count());
 
-        Mockito.when(PersonEntity.count()).thenReturn(42l);
+        Mockito.when(PersonEntity.count()).thenReturn(42L);
         Assertions.assertEquals(42, PersonEntity.count());
 
         Mockito.when(PersonEntity.count()).thenCallRealMethod();
@@ -44,13 +44,13 @@ public void testPanacheMocking() {
 
         PersonEntity p = new PersonEntity();
 
-        Mockito.when(PersonEntity.findById(12l)).thenReturn(p);
-        Assertions.assertSame(p, PersonEntity.findById(12l));
-        Assertions.assertNull(PersonEntity.findById(42l));
+        Mockito.when(PersonEntity.findById(12L)).thenReturn(p);
+        Assertions.assertSame(p, PersonEntity.findById(12L));
+        Assertions.assertNull(PersonEntity.findById(42L));
 
-        Mockito.when(PersonEntity.findById(12l)).thenThrow(new WebApplicationException());
+        Mockito.when(PersonEntity.findById(12L)).thenThrow(new WebApplicationException());
         try {
-            PersonEntity.findById(12l);
+            PersonEntity.findById(12L);
             Assertions.fail();
         } catch (WebApplicationException x) {
         }
@@ -76,10 +76,10 @@ public void testPanacheMockingWasCleared() {
     public void testPanacheRepositoryMocking() throws Throwable {
         Assertions.assertEquals(0, mockablePersonRepository.count());
 
-        Mockito.when(mockablePersonRepository.count()).thenReturn(23l);
+        Mockito.when(mockablePersonRepository.count()).thenReturn(23L);
         Assertions.assertEquals(23, mockablePersonRepository.count());
 
-        Mockito.when(mockablePersonRepository.count()).thenReturn(42l);
+        Mockito.when(mockablePersonRepository.count()).thenReturn(42L);
         Assertions.assertEquals(42, mockablePersonRepository.count());
 
         Mockito.when(mockablePersonRepository.count()).thenCallRealMethod();
@@ -88,13 +88,13 @@ public void testPanacheRepositoryMocking() throws Throwable {
         Mockito.verify(mockablePersonRepository, Mockito.times(4)).count();
 
         PersonEntity p = new PersonEntity();
-        Mockito.when(mockablePersonRepository.findById(12l)).thenReturn(p);
-        Assertions.assertSame(p, mockablePersonRepository.findById(12l));
-        Assertions.assertNull(mockablePersonRepository.findById(42l));
+        Mockito.when(mockablePersonRepository.findById(12L)).thenReturn(p);
+        Assertions.assertSame(p, mockablePersonRepository.findById(12L));
+        Assertions.assertNull(mockablePersonRepository.findById(42L));
 
-        Mockito.when(mockablePersonRepository.findById(12l)).thenThrow(new WebApplicationException());
+        Mockito.when(mockablePersonRepository.findById(12L)).thenThrow(new WebApplicationException());
         try {
-            mockablePersonRepository.findById(12l);
+            mockablePersonRepository.findById(12L);
             Assertions.fail();
         } catch (WebApplicationException x) {
         }
@@ -113,19 +113,19 @@ public void testPanacheRepositoryMocking() throws Throwable {
     @Test
     public void testPanacheRepositoryBridges() {
         // normal method call
-        Assertions.assertNull(realPersonRepository.findById(0l));
+        Assertions.assertNull(realPersonRepository.findById(0L));
         // bridge call
-        Assertions.assertNull(((PanacheMongoRepositoryBase) realPersonRepository).findById(0l));
+        Assertions.assertNull(((PanacheMongoRepositoryBase) realPersonRepository).findById(0L));
 
         // normal method call
-        Assertions.assertEquals(Optional.empty(), realPersonRepository.findByIdOptional(0l));
+        Assertions.assertEquals(Optional.empty(), realPersonRepository.findByIdOptional(0L));
         // bridge call
-        Assertions.assertEquals(Optional.empty(), ((PanacheMongoRepositoryBase) realPersonRepository).findByIdOptional(0l));
+        Assertions.assertEquals(Optional.empty(), ((PanacheMongoRepositoryBase) realPersonRepository).findByIdOptional(0L));
 
         // normal method call
-        Assertions.assertEquals(false, realPersonRepository.deleteById(0l));
+        Assertions.assertEquals(false, realPersonRepository.deleteById(0L));
         // bridge call
-        Assertions.assertEquals(false, ((PanacheMongoRepositoryBase) realPersonRepository).deleteById(0l));
+        Assertions.assertEquals(false, ((PanacheMongoRepositoryBase) realPersonRepository).deleteById(0L));
     }
 
 }
diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.java
index 582464d102480..cf39c6b62baf2 100644
--- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.java
+++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.java
@@ -11,6 +11,7 @@
 import java.util.GregorianCalendar;
 import java.util.List;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -37,6 +38,11 @@ class MongodbPanacheResourceTest {
     private static final TypeRef<List<Person>> LIST_OF_PERSON_TYPE_REF = new TypeRef<List<Person>>() {
     };
 
+    @Test
+    public void testAccessors() {
+        callEndpoint("/accessors");
+    }
+
     @Test
     public void testBookEntity() {
         callBookEndpoint("/books/entity");
@@ -194,6 +200,21 @@ private void callBookEndpoint(String endpoint) {
         Assertions.assertEquals(204, response.statusCode());
     }
 
+    private void callEndpoint(String endpoint) {
+        RestAssured.defaultParser = Parser.JSON;
+        RestAssured.config
+                .objectMapperConfig(new ObjectMapperConfig().jackson2ObjectMapperFactory((type, s) -> new ObjectMapper()
+                        .registerModule(new Jdk8Module())
+                        .registerModule(new JavaTimeModule())
+                        .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)));
+
+        Response response = RestAssured
+                .given()
+                .get(endpoint)
+                .andReturn();
+        Assertions.assertEquals(200, response.statusCode());
+    }
+
     private void callPersonEndpoint(String endpoint) {
         RestAssured.defaultParser = Parser.JSON;
         RestAssured.config
@@ -310,6 +331,15 @@ private void callPersonEndpoint(String endpoint) {
 
         count = get(endpoint + "/count").as(Long.class);
         Assertions.assertEquals(0, count);
+
+        // Test prometheus metrics gathered using micrometer metrics
+        RestAssured.given()
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.containsString("mongodb_driver_pool_checkedout"))
+                .body(CoreMatchers.containsString("mongodb_driver_pool_size"))
+                .body(CoreMatchers.containsString("mongodb_driver_pool_waitqueuesize"));
     }
 
     private Date yearToDate(int year) {
@@ -354,4 +384,9 @@ public void testMoreEntityFunctionalities() {
     public void testMoreRepositoryFunctionalities() {
         get("/test/imperative/repository").then().statusCode(200);
     }
+
+    @Test
+    public void testBug13301() {
+        get("/bugs/13301").then().statusCode(200);
+    }
 }
diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java
index dedbc0c344408..52cbe7e9f8387 100644
--- a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java
+++ b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java
@@ -205,7 +205,7 @@ private void callReactiveBookEndpoint(String endpoint) throws InterruptedExcepti
                 nbEvent.increment();
             });
             source.open();
-            await().atMost(Duration.ofSeconds(1)).until(() -> nbEvent.count() == 3);
+            await().atMost(Duration.ofSeconds(10)).until(() -> nbEvent.count() == 3);
         }
 
         //delete all
diff --git a/integration-tests/mongodb-rest-data-panache/pom.xml b/integration-tests/mongodb-rest-data-panache/pom.xml
new file mode 100644
index 0000000000000..aba39a0621b0a
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-mongodb-rest-data-panache</artifactId>
+    <name>Quarkus - Integration Tests - MongoDB REST Data with Panache</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-rest-data-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mongodb-rest-data-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/Author.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/Author.java
new file mode 100644
index 0000000000000..7c8e71f6b9ae1
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/Author.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+@MongoEntity
+public class Author extends PanacheMongoEntity {
+
+    public String name;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    public LocalDate dob;
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/AuthorsResource.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/AuthorsResource.java
new file mode 100644
index 0000000000000..bd842b0373a36
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/AuthorsResource.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import org.bson.types.ObjectId;
+
+import io.quarkus.mongodb.rest.data.panache.PanacheMongoEntityResource;
+import io.quarkus.rest.data.panache.MethodProperties;
+
+public interface AuthorsResource extends PanacheMongoEntityResource<Author, ObjectId> {
+
+    @MethodProperties(exposed = false)
+    Author add(Author entity);
+
+    @MethodProperties(exposed = false)
+    Author update(ObjectId id, Author entity);
+
+    @MethodProperties(exposed = false)
+    boolean delete(ObjectId id);
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/Book.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/Book.java
new file mode 100644
index 0000000000000..3792c7ccf02de
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/Book.java
@@ -0,0 +1,40 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import org.bson.codecs.pojo.annotations.BsonId;
+
+import io.quarkus.mongodb.panache.MongoEntity;
+
+@MongoEntity
+public class Book {
+
+    @BsonId
+    private String id;
+
+    private String title;
+
+    private Author author;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Author getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(Author author) {
+        this.author = author;
+    }
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java
new file mode 100644
index 0000000000000..71edcb3389ec3
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BookRepository.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.mongodb.panache.PanacheMongoRepositoryBase;
+
+@ApplicationScoped
+public class BookRepository implements PanacheMongoRepositoryBase<Book, String> {
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BooksResource.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BooksResource.java
new file mode 100644
index 0000000000000..66168b65122f6
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/BooksResource.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import io.quarkus.mongodb.rest.data.panache.PanacheMongoRepositoryResource;
+import io.quarkus.rest.data.panache.ResourceProperties;
+
+@ResourceProperties(hal = true)
+public interface BooksResource extends PanacheMongoRepositoryResource<BookRepository, Book, String> {
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java
new file mode 100644
index 0000000000000..c8238f6b178a5
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/java/io/quarkus/it/mongodb/rest/data/panache/TestResource.java
@@ -0,0 +1,48 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@ApplicationScoped
+@Path("/test")
+public class TestResource {
+
+    @Inject
+    BookRepository bookRepository;
+
+    @POST
+    @Path("/authors")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Author createAuthor(Author author) {
+        author.persist();
+        return author;
+    }
+
+    @DELETE
+    @Path("/authors")
+    public void deleteAllAuthors() {
+        Author.deleteAll();
+    }
+
+    @POST
+    @Path("/books")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public Book createBook(Book book) {
+        bookRepository.persist(book);
+        return book;
+    }
+
+    @DELETE
+    @Path("/books")
+    public void deleteAllBooks() {
+        bookRepository.deleteAll();
+    }
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/main/resources/application.properties b/integration-tests/mongodb-rest-data-panache/src/main/resources/application.properties
new file mode 100644
index 0000000000000..c3a2666d88ea0
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+quarkus.mongodb.connection-string=mongodb://localhost:27018
+quarkus.mongodb.write-concern.journal=false
+quarkus.mongodb.database=test
diff --git a/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheIT.java b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheIT.java
new file mode 100644
index 0000000000000..ecfd9f0d78da0
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class MongoDbRestDataPanacheIT extends MongoDbRestDataPanacheTest {
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java
new file mode 100644
index 0000000000000..a108698405545
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoDbRestDataPanacheTest.java
@@ -0,0 +1,293 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.ws.rs.core.MediaType;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.response.Response;
+
+@QuarkusTest
+@QuarkusTestResource(MongoTestResource.class)
+class MongoDbRestDataPanacheTest {
+
+    private Author dostoevsky;
+
+    private Book crimeAndPunishment;
+
+    private Book idiot;
+
+    @BeforeEach
+    void beforeEach() {
+        dostoevsky = createTestAuthor("Fyodor Dostoevsky", "1821-11-11");
+        crimeAndPunishment = createTestBook("Crime and Punishment", dostoevsky);
+        idiot = createTestBook("Idiot", dostoevsky);
+    }
+
+    @AfterEach
+    void afterEach() {
+        deleteTestBooks();
+        deleteTestAuthors();
+    }
+
+    @Test
+    void shouldGetAuthor() {
+        given().accept("application/json")
+                .when().get("/authors/" + dostoevsky.id)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(dostoevsky.id.toString())))
+                .and().body("name", is(equalTo(dostoevsky.name)))
+                .and().body("dob", is(equalTo(dostoevsky.dob.toString())));
+    }
+
+    @Test
+    void shouldNotGetAuthorHal() {
+        given().accept("application/hal+json")
+                .when().get("/authors/" + dostoevsky.id)
+                .then().statusCode(406);
+    }
+
+    @Test
+    void shouldGetBook() {
+        given().accept("application/json")
+                .when().get("/books/" + crimeAndPunishment.getId())
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(crimeAndPunishment.getId().toString())))
+                .and().body("title", is(equalTo(crimeAndPunishment.getTitle())))
+                .and().body("author.id", is(equalTo(dostoevsky.id.toString())))
+                .and().body("author.name", is(equalTo(dostoevsky.name)))
+                .and().body("author.dob", is(equalTo(dostoevsky.dob.toString())));
+    }
+
+    @Test
+    void shouldGetBookHal() {
+        given().accept("application/hal+json")
+                .when().get("/books/" + crimeAndPunishment.getId())
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(crimeAndPunishment.getId().toString())))
+                .and().body("title", is(equalTo(crimeAndPunishment.getTitle())))
+                .and().body("author.id", is(equalTo(dostoevsky.id.toString())))
+                .and().body("author.name", is(equalTo(dostoevsky.name)))
+                .and().body("author.dob", is(equalTo(dostoevsky.dob.toString())))
+                .and().body("_links.add.href", endsWith("/books"))
+                .and().body("_links.list.href", endsWith("/books"))
+                .and().body("_links.self.href", endsWith("/books/" + crimeAndPunishment.getId()))
+                .and().body("_links.update.href", endsWith("/books/" + crimeAndPunishment.getId()))
+                .and().body("_links.remove.href", endsWith("/books/" + crimeAndPunishment.getId()));
+    }
+
+    @Test
+    void shouldListAuthors() {
+        given().accept("application/json")
+                .when().get("/authors")
+                .then().statusCode(200)
+                .and().body("id", contains(dostoevsky.id.toString()))
+                .and().body("name", contains(dostoevsky.name))
+                .and().body("dob", contains(dostoevsky.dob.toString()));
+    }
+
+    @Test
+    void shouldListBooks() {
+        given().accept("application/json")
+                .when().get("/books")
+                .then().statusCode(200)
+                .and().body("id", contains(crimeAndPunishment.getId().toString(), idiot.getId().toString()))
+                .and().body("title", contains(crimeAndPunishment.getTitle(), idiot.getTitle()))
+                .and().body("author.id", contains(dostoevsky.id.toString(), dostoevsky.id.toString()))
+                .and().body("author.name", contains(dostoevsky.name, dostoevsky.name))
+                .and().body("author.dob", contains(dostoevsky.dob.toString(), dostoevsky.dob.toString()));
+    }
+
+    @Test
+    void shouldListBooksHal() {
+        given().accept("application/hal+json")
+                .when().get("/books")
+                .then().statusCode(200)
+                .and().body("_embedded.books.id", contains(crimeAndPunishment.getId().toString(), idiot.getId().toString()))
+                .and().body("_embedded.books.title", contains(crimeAndPunishment.getTitle(), idiot.getTitle()))
+                .and().body("_embedded.books.author.id", contains(dostoevsky.id.toString(), dostoevsky.id.toString()))
+                .and().body("_embedded.books.author.name", contains(dostoevsky.name, dostoevsky.name))
+                .and().body("_embedded.books.author.dob", contains(dostoevsky.dob.toString(), dostoevsky.dob.toString()))
+                .and().body("_embedded.books._links.add.href", contains(endsWith("/books"), endsWith("/books")))
+                .and().body("_embedded.books._links.list.href", contains(endsWith("/books"), endsWith("/books")))
+                .and().body("_embedded.books._links.self.href",
+                        contains(endsWith("/books/" + crimeAndPunishment.getId()), endsWith("/books/" + idiot.getId())))
+                .and().body("_embedded.books._links.update.href",
+                        contains(endsWith("/books/" + crimeAndPunishment.getId()), endsWith("/books/" + idiot.getId())))
+                .and().body("_embedded.books._links.remove.href",
+                        contains(endsWith("/books/" + crimeAndPunishment.getId()), endsWith("/books/" + idiot.getId())))
+                .and().body("_links.add.href", endsWith("/books"))
+                .and().body("_links.list.href", endsWith("/books"));
+    }
+
+    @Test
+    void shouldNotCreateOrDeleteAuthor() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("name", "test")
+                .add("dob", "1900-01-01")
+                .build();
+        given().contentType("application/json")
+                .and().body(author.toString())
+                .when().post("/authors")
+                .then().statusCode(405);
+        when().delete("/authors/" + dostoevsky.id)
+                .then().statusCode(405);
+    }
+
+    @Test
+    void shouldCreateAndDeleteBook() {
+        String title = "The Brothers Karamazov";
+        JsonObject book = Json.createObjectBuilder()
+                .add("id", titleToId(title))
+                .add("title", title)
+                .add("author", Json.createObjectBuilder()
+                        .add("id", dostoevsky.id.toString())
+                        .add("name", dostoevsky.name)
+                        .add("dob", dostoevsky.dob.toString())
+                        .build())
+                .build();
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().post("/books")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+        assertThat(response.header("Location")).isNotEmpty();
+
+        when().delete(response.getHeader("Location"))
+                .then().statusCode(204);
+        given().accept("application/json")
+                .when().get(response.getHeader("Location"))
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldNotCreateDuplicateBook() {
+        JsonObject book = Json.createObjectBuilder()
+                .add("id", titleToId(idiot.getId()))
+                .add("title", idiot.getTitle())
+                .add("author", Json.createObjectBuilder()
+                        .add("id", dostoevsky.id.toString())
+                        .add("name", dostoevsky.name)
+                        .add("dob", dostoevsky.dob.toString())
+                        .build())
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().post("/books")
+                .then().statusCode(409);
+    }
+
+    @Test
+    void shouldNotUpdateAuthor() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", dostoevsky.id.toString())
+                .add("name", "test")
+                .add("dob", dostoevsky.dob.toString())
+                .build();
+        given().contentType("application/json")
+                .and().body(author.toString())
+                .when().put("/authors/" + dostoevsky.id)
+                .then().statusCode(405);
+    }
+
+    @Test
+    void shouldCreateUpdateAndDeleteBook() {
+        JsonObject dostoevskyJson = Json.createObjectBuilder()
+                .add("id", dostoevsky.id.toString())
+                .add("name", dostoevsky.name)
+                .add("dob", dostoevsky.dob.toString())
+                .build();
+        String title = "The Brothers Karamazov";
+        String id = titleToId(title);
+        JsonObject book = Json.createObjectBuilder()
+                .add("id", id)
+                .add("title", title)
+                .add("author", dostoevskyJson)
+                .build();
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().put("/books/" + id)
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+        assertThat(response.header("Location")).isNotEmpty();
+        assertThat(response.body().jsonPath().getString("id")).isEqualTo(id);
+        assertThat(response.body().jsonPath().getString("title")).isEqualTo(title);
+
+        String location = response.header("Location");
+        JsonObject updateBook = Json.createObjectBuilder()
+                .add("title", "Notes from Underground")
+                .add("author", dostoevskyJson)
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(updateBook.toString())
+                .when().put(location)
+                .then().statusCode(204);
+        given().accept("application/json")
+                .when().get(location)
+                .then().body("title", is(equalTo("Notes from Underground")));
+        when().delete(location)
+                .then().statusCode(204);
+    }
+
+    private Author createTestAuthor(String name, String dob) {
+        return given().contentType(MediaType.APPLICATION_JSON)
+                .and().accept(MediaType.APPLICATION_JSON)
+                .and().body(Json.createObjectBuilder()
+                        .add("name", name)
+                        .add("dob", dob)
+                        .build()
+                        .toString())
+                .post("/test/authors")
+                .thenReturn()
+                .as(Author.class);
+    }
+
+    private void deleteTestAuthors() {
+        when().delete("/test/authors")
+                .then().statusCode(204);
+    }
+
+    private Book createTestBook(String title, Author author) {
+        return given().contentType(MediaType.APPLICATION_JSON)
+                .and().accept(MediaType.APPLICATION_JSON)
+                .and().body(Json.createObjectBuilder()
+                        .add("id", titleToId(title))
+                        .add("title", title)
+                        .add("author", Json.createObjectBuilder()
+                                .add("id", author.id.toString())
+                                .add("name", author.name)
+                                .add("dob", author.dob.toString())
+                                .build())
+                        .build()
+                        .toString())
+                .post("/test/books")
+                .thenReturn()
+                .as(Book.class);
+    }
+
+    private String titleToId(String title) {
+        return title.toLowerCase().replaceAll(" ", "-");
+    }
+
+    private void deleteTestBooks() {
+        when().delete("/test/books")
+                .then().statusCode(204);
+    }
+}
diff --git a/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoTestResource.java b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoTestResource.java
new file mode 100644
index 0000000000000..8799bcbe12c7d
--- /dev/null
+++ b/integration-tests/mongodb-rest-data-panache/src/test/java/io/quarkus/it/mongodb/rest/data/panache/MongoTestResource.java
@@ -0,0 +1,82 @@
+package io.quarkus.it.mongodb.rest.data.panache;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+
+import de.flapdoodle.embed.mongo.MongodExecutable;
+import de.flapdoodle.embed.mongo.MongodStarter;
+import de.flapdoodle.embed.mongo.config.IMongodConfig;
+import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.runtime.Network;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class MongoTestResource implements QuarkusTestResourceLifecycleManager {
+
+    private static final Logger LOGGER = Logger.getLogger(MongoTestResource.class);
+    private static MongodExecutable MONGO;
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            //JDK bug workaround
+            //https://github.com/quarkusio/quarkus/issues/14424
+            //force class init to prevent possible deadlock when done by mongo threads
+            Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
+        } catch (ClassNotFoundException e) {
+        }
+        try {
+            Version.Main version = Version.Main.V4_0;
+            int port = 27018;
+            LOGGER.infof("Starting Mongo %s on port %s", version, port);
+            IMongodConfig config = new MongodConfigBuilder()
+                    .version(version)
+                    .net(new Net(port, Network.localhostIsIPv6()))
+                    .build();
+            MONGO = getMongodExecutable(config);
+            try {
+                MONGO.start();
+            } catch (Exception e) {
+                //every so often mongo fails to start on CI runs
+                //see if this helps
+                Thread.sleep(1000);
+                MONGO.start();
+            }
+            return Collections.emptyMap();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private MongodExecutable getMongodExecutable(IMongodConfig config) {
+        try {
+            return doGetExecutable(config);
+        } catch (Exception e) {
+            // sometimes the download process can timeout so just sleep and try again
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignored) {
+
+            }
+            return doGetExecutable(config);
+        }
+    }
+
+    private MongodExecutable doGetExecutable(IMongodConfig config) {
+        return MongodStarter.getDefaultInstance().prepare(config);
+    }
+
+    private void initData() {
+
+    }
+
+    @Override
+    public void stop() {
+        if (MONGO != null) {
+            MONGO.stop();
+        }
+    }
+}
diff --git a/integration-tests/narayana-jta/pom.xml b/integration-tests/narayana-jta/pom.xml
index 6b97047c0a22b..87beb6b3687e5 100644
--- a/integration-tests/narayana-jta/pom.xml
+++ b/integration-tests/narayana-jta/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,11 +16,48 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-narayana-jta</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-narayana-jta-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -38,59 +74,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java
index 41fbbfe2dd183..cc96f148dcbdf 100644
--- a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java
+++ b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionBeanWithEvents.java
@@ -29,6 +29,15 @@ public class TransactionBeanWithEvents {
     @Inject
     TransactionManager tm;
 
+    static void cleanCounts() {
+        initializedCount = 0;
+        beforeDestroyedCount = 0;
+        destroyedCount = 0;
+
+        commitCount = 0;
+        rollbackCount = 0;
+    }
+
     static int getInitialized() {
         return initializedCount;
     }
diff --git a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java
index 23b56164a5f1a..2ebbe16150daa 100644
--- a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java
+++ b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionScopedBean.java
@@ -1,9 +1,17 @@
 package io.quarkus.narayana.jta;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.transaction.TransactionScoped;
 
 @TransactionScoped
 public class TransactionScopedBean {
+
+    private static final AtomicInteger initializedCount = new AtomicInteger(0);
+    private static final AtomicInteger destroyedCount = new AtomicInteger(0);
+
     private int value = 0;
 
     public int getValue() {
@@ -13,4 +21,28 @@ public int getValue() {
     public void setValue(int value) {
         this.value = value;
     }
+
+    static void resetCounters() {
+        initializedCount.set(0);
+        destroyedCount.set(0);
+    }
+
+    static int getInitializedCount() {
+        return initializedCount.get();
+    }
+
+    static int getPreDestroyCount() {
+        return destroyedCount.get();
+    }
+
+    @PostConstruct
+    void postConstruct() {
+        initializedCount.incrementAndGet();
+    }
+
+    @PreDestroy
+    void preDestroy() {
+        destroyedCount.incrementAndGet();
+    }
+
 }
diff --git a/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java
new file mode 100644
index 0000000000000..b9f7f447efa4e
--- /dev/null
+++ b/integration-tests/narayana-jta/src/main/java/io/quarkus/narayana/jta/TransactionalResource.java
@@ -0,0 +1,25 @@
+package io.quarkus.narayana.jta;
+
+import javax.inject.Inject;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/tx")
+public class TransactionalResource {
+    @Inject
+    TransactionManager tm;
+
+    @Path("/status")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    @Transactional
+    public String status() throws javax.transaction.SystemException {
+        Transaction txn = tm.getTransaction();
+        return String.valueOf(txn.getStatus());
+    }
+}
diff --git a/integration-tests/narayana-jta/src/main/resources/application.properties b/integration-tests/narayana-jta/src/main/resources/application.properties
new file mode 100644
index 0000000000000..3a07eed4c67f6
--- /dev/null
+++ b/integration-tests/narayana-jta/src/main/resources/application.properties
@@ -0,0 +1,11 @@
+# Configuration file
+# key = value
+quarkus.log.console.enable=true
+quarkus.log.console.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n
+quarkus.log.console.level=INFO
+quarkus.log.console.color=false
+
+quarkus.log.category."com.arjuna".level=INFO
+quarkus.log.category."io.quarkus".level=INFO
+
+quarkus.transaction-manager.object-store-directory=target/tx-object-store
\ No newline at end of file
diff --git a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java
new file mode 100644
index 0000000000000..de15cc987fe8f
--- /dev/null
+++ b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionConfPropTest.java
@@ -0,0 +1,22 @@
+package io.quarkus.narayana.jta;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class TransactionConfPropTest {
+
+    /*
+     * verify that the objectStore directory path for JTA can be configured
+     */
+    @Test
+    void testObjectStoreDirPath() {
+        // verify that the quarkus configuration took effect
+        Assertions.assertEquals("target/tx-object-store", // this value is set via application.properties
+                arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+    }
+}
diff --git a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java
index d0b0b5ca1e7ea..6a08d4ae18f26 100644
--- a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java
+++ b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionScopedTest.java
@@ -29,8 +29,11 @@ class TransactionScopedTest {
 
     @Test
     void transactionScopedInTransaction() throws Exception {
+        TransactionScopedBean.resetCounters();
+
         tx.begin();
         beanTransactional.setValue(42);
+        assertEquals(1, TransactionScopedBean.getInitializedCount(), "Expected @PostConstruct to be invoked");
         assertEquals(42, beanTransactional.getValue(), "Transaction scope did not save the value");
         Transaction suspendedTransaction = tm.suspend();
 
@@ -40,8 +43,10 @@ void transactionScopedInTransaction() throws Exception {
 
         tx.begin();
         beanTransactional.setValue(1);
+        assertEquals(2, TransactionScopedBean.getInitializedCount(), "Expected @PostConstruct to be invoked");
         assertEquals(1, beanTransactional.getValue(), "Transaction scope did not save the value");
         tx.commit();
+        assertEquals(1, TransactionScopedBean.getPreDestroyCount(), "Expected @PreDestroy to be invoked");
 
         assertThrows(ContextNotActiveException.class, () -> {
             beanTransactional.getValue();
@@ -50,10 +55,13 @@ void transactionScopedInTransaction() throws Exception {
         tm.resume(suspendedTransaction);
         assertEquals(42, beanTransactional.getValue(), "Transaction scope did not resumed correctly");
         tx.rollback();
+        assertEquals(2, TransactionScopedBean.getPreDestroyCount(), "Expected @PreDestroy to be invoked");
     }
 
     @Test
     void scopeEventsAreEmitted() {
+        beanEvents.cleanCounts();
+
         beanEvents.doInTransaction(true);
 
         try {
diff --git a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionalITCase.java b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionalITCase.java
new file mode 100644
index 0000000000000..da42779199c22
--- /dev/null
+++ b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.narayana.jta;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class TransactionalITCase extends TransactionalTestCase {
+}
diff --git a/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionalTestCase.java b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionalTestCase.java
new file mode 100644
index 0000000000000..acb77cca6a461
--- /dev/null
+++ b/integration-tests/narayana-jta/src/test/java/io/quarkus/narayana/jta/TransactionalTestCase.java
@@ -0,0 +1,19 @@
+package io.quarkus.narayana.jta;
+
+import static org.hamcrest.core.Is.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPEndpoint;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@TestHTTPEndpoint(TransactionalResource.class)
+public class TransactionalTestCase {
+
+    @Test
+    public void test() {
+        RestAssured.when().get("/status").then().body(is("0"));
+    }
+}
diff --git a/integration-tests/narayana-stm/disable-native-profile b/integration-tests/narayana-stm/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/narayana-stm/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/narayana-stm/pom.xml b/integration-tests/narayana-stm/pom.xml
index 34ae353e11ff0..9a6a817fa2b2e 100644
--- a/integration-tests/narayana-stm/pom.xml
+++ b/integration-tests/narayana-stm/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,6 +30,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-narayana-stm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -47,59 +74,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/native-config-profile/pom.xml b/integration-tests/native-config-profile/pom.xml
new file mode 100644
index 0000000000000..4bc0894574d9f
--- /dev/null
+++ b/integration-tests/native-config-profile/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-native-config-profile</artifactId>
+    <name>Quarkus - Integration Tests - Native Configuration Profile</name>
+    <description>Native Configuration Profile</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <phase/>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <configuration>
+                                    <configurationProfiles>
+                                        <configurationProfile>alt-profile</configurationProfile>
+                                    </configurationProfiles>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java
new file mode 100644
index 0000000000000..37830301fc47b
--- /dev/null
+++ b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/NativeConfigProfileResource.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.nat.test.profile;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import io.quarkus.arc.Arc;
+
+@Path("/native-config-profile")
+public class NativeConfigProfileResource {
+
+    @ConfigProperty(name = "my.config.value")
+    String myConfigValue;
+
+    @Path("/myConfigValue")
+    @Produces("text/plain")
+    @GET
+    public String myConfigValue() {
+        return myConfigValue;
+    }
+
+    @Path("/unused-exists")
+    @Produces("text/plain")
+    @GET
+    public boolean unusedExists() {
+        return Arc.container().instance(UnusedRemovableBean.class).isAvailable();
+    }
+
+}
diff --git a/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java
new file mode 100644
index 0000000000000..1f2e302b1af74
--- /dev/null
+++ b/integration-tests/native-config-profile/src/main/java/io/quarkus/it/nat/test/profile/UnusedRemovableBean.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.nat.test.profile;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class UnusedRemovableBean {
+}
diff --git a/integration-tests/native-config-profile/src/main/resources/application.properties b/integration-tests/native-config-profile/src/main/resources/application.properties
new file mode 100644
index 0000000000000..6ecdb232f570d
--- /dev/null
+++ b/integration-tests/native-config-profile/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+quarkus.arc.remove-unused-beans = none
+my.config.value = foo
+%bar-profile.my.config.value = bar
+%build-profile-change.quarkus.arc.remove-unused-beans = all
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/BuiltTimeProfileChangeManualIT.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/BuiltTimeProfileChangeManualIT.java
new file mode 100644
index 0000000000000..5b269b2361292
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/BuiltTimeProfileChangeManualIT.java
@@ -0,0 +1,35 @@
+package io.quarkus.it.nat.test.profile;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.NativeTestExtension;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+/**
+ * Run this manually via {@code mvn clean verify -Dnative -Dit.test=BuiltTimeProfileChangeManualITCase} to ensure that
+ * {@link NativeTestExtension#beforeEach(org.junit.jupiter.api.extension.ExtensionContext)} throws an exception caused
+ * by an application boot failure. The failure should happen because {@link NativeTestExtension} is setting
+ * {@code quarkus.configuration.build-time-mismatch-at-runtime = fail} and
+ * {@link BuildProfileChange#getConfigProfile()} returns a profile name that changes
+ * {@code quarkus.arc.remove-unused-beans} in {@code application.properties}.
+ */
+@NativeImageTest
+@TestProfile(BuiltTimeProfileChangeManualIT.BuildProfileChange.class)
+@Disabled("Manual testing only")
+public class BuiltTimeProfileChangeManualIT {
+    @Test
+    public void unusedExists() {
+        Assertions.fail("Expected to fail in io.quarkus.test.junit.NativeTestExtension.beforeEach(ExtensionContext)");
+    }
+
+    public static class BuildProfileChange implements QuarkusTestProfile {
+        @Override
+        public String getConfigProfile() {
+            return "build-profile-change";
+        }
+    }
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/BuiltTimeValueChangeManualIT.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/BuiltTimeValueChangeManualIT.java
new file mode 100644
index 0000000000000..f9f2e34d3e5ab
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/BuiltTimeValueChangeManualIT.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.nat.test.profile;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.NativeTestExtension;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+/**
+ * Run this manually via {@code mvn clean verify -Dnative -Dit.test=BuiltTimeValueChangeManualITCase} to ensure that
+ * {@link NativeTestExtension#beforeEach(org.junit.jupiter.api.extension.ExtensionContext)} throws an exception caused
+ * by an application boot failure. The failure should happen because {@link NativeTestExtension} is setting
+ * {@code quarkus.configuration.build-time-mismatch-at-runtime = fail} and
+ * {@link BuildTimeValueChangeTestProfile#getConfigOverrides()} changes {@code quarkus.arc.remove-unused-beans}.
+ */
+@NativeImageTest
+@TestProfile(BuiltTimeValueChangeManualIT.BuildTimeValueChangeTestProfile.class)
+@Disabled("Manual testing only")
+public class BuiltTimeValueChangeManualIT {
+    @Test
+    public void failInNativeTestExtension_beforeEach() {
+        Assertions.fail("Expected to fail in io.quarkus.test.junit.NativeTestExtension.beforeEach(ExtensionContext)");
+    }
+
+    public static class BuildTimeValueChangeTestProfile implements QuarkusTestProfile {
+
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            return Collections.singletonMap("quarkus.arc.remove-unused-beans", "all");
+        }
+
+    }
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/DefaultTestProfileIT.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/DefaultTestProfileIT.java
new file mode 100644
index 0000000000000..6c68f27ab5ee9
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/DefaultTestProfileIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.nat.test.profile;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class DefaultTestProfileIT extends DefaultTestProfileTest {
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/DefaultTestProfileTest.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/DefaultTestProfileTest.java
new file mode 100644
index 0000000000000..69a80f7ddaef2
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/DefaultTestProfileTest.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.nat.test.profile;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class DefaultTestProfileTest {
+    @Test
+    public void unusedExists() {
+        RestAssured.when()
+                .get("/native-config-profile/unused-exists")
+                .then()
+                .body(is("true"));
+    }
+
+    @Test
+    public void myConfigValue() {
+        RestAssured.when()
+                .get("/native-config-profile/myConfigValue")
+                .then()
+                .body(is("foo"));
+    }
+
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeProfileChangeIT.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeProfileChangeIT.java
new file mode 100644
index 0000000000000..fe20834fd205d
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeProfileChangeIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.nat.test.profile;
+
+import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.TestProfile;
+
+@NativeImageTest
+@TestProfile(RuntimeProfileChangeIT.CustomTestProfile.class)
+public class RuntimeProfileChangeIT extends RuntimeProfileChangeTest {
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeProfileChangeTest.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeProfileChangeTest.java
new file mode 100644
index 0000000000000..b2b2452776fb0
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeProfileChangeTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.nat.test.profile;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@TestProfile(RuntimeProfileChangeTest.CustomTestProfile.class)
+public class RuntimeProfileChangeTest {
+    @Test
+    public void failInNativeTestExtension_beforeEach() {
+        RestAssured.when()
+                .get("/native-config-profile/myConfigValue")
+                .then()
+                .body(is("bar"));
+    }
+
+    public static class CustomTestProfile implements QuarkusTestProfile {
+
+        @Override
+        public String getConfigProfile() {
+            return "bar-profile";
+        }
+
+    }
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeValueChangeIT.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeValueChangeIT.java
new file mode 100644
index 0000000000000..2b4d8664061b9
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeValueChangeIT.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.nat.test.profile;
+
+import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.TestProfile;
+
+@NativeImageTest
+@TestProfile(RuntimeValueChangeIT.CustomTestProfile.class)
+public class RuntimeValueChangeIT extends RuntimeValueChangeTest {
+}
diff --git a/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeValueChangeTest.java b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeValueChangeTest.java
new file mode 100644
index 0000000000000..b5ad3de2cfab3
--- /dev/null
+++ b/integration-tests/native-config-profile/src/test/java/io/quarkus/it/nat/test/profile/RuntimeValueChangeTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.it.nat.test.profile;
+
+import static org.hamcrest.Matchers.is;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@TestProfile(RuntimeValueChangeTest.CustomTestProfile.class)
+public class RuntimeValueChangeTest {
+    @Test
+    public void failInNativeTestExtension_beforeEach() {
+        RestAssured.when()
+                .get("/native-config-profile/myConfigValue")
+                .then()
+                .body(is("RuntimeTimeValueChangeTest"));
+    }
+
+    public static class CustomTestProfile implements QuarkusTestProfile {
+
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            return Collections.singletonMap("my.config.value", "RuntimeTimeValueChangeTest");
+        }
+
+    }
+}
diff --git a/integration-tests/neo4j/README.md b/integration-tests/neo4j/README.md
index a4f57b1ed4ac9..c6bc1fe417019 100644
--- a/integration-tests/neo4j/README.md
+++ b/integration-tests/neo4j/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with Neo4j started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-neo4j -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 To also test as a native image, add `-Dnative`:
 
 ```
-mvn clean install -Dtest-neo4j -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 Alternatively you can connect to your own Neo4j instance or cluster.
@@ -38,26 +38,14 @@ Neo4j's Bolt transport is encrypted by default.
 That means, your image will need to have SSL native enabled.
 Have a look at [Using SSL with Native Executables](https://quarkus.io/guides/native-and-ssl-guide) to understand the overhead of this.
 
-The Quarkus maven plugin must be configured like this:
+The Quarkus project must be configured like this:
 
 ```
-<plugin>
-    <groupId>${project.groupId}</groupId>
-    <artifactId>quarkus-maven-plugin</artifactId>
-    <executions>
-        <execution>
-            <id>native-image</id>
-            <goals>
-                <goal>native-image</goal>
-            </goals>
-            <configuration>
-                <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                <enableAllSecurityServices>true</enableAllSecurityServices>
-            </configuration>
-        </execution>
-    </executions>
-</plugin>
+<properties>
+    <quarkus.package.type>native</quarkus.package.type>
+    <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+    <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+</properties>
 ```
 
 That's exactly the way the example project here is configured.
diff --git a/integration-tests/neo4j/pom.xml b/integration-tests/neo4j/pom.xml
index f185ad847abcd..c91cab110f7e2 100644
--- a/integration-tests/neo4j/pom.xml
+++ b/integration-tests/neo4j/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,6 +48,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-health</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+        </dependency>
 
         <!-- Project reactor makes it easier to deal with reactive streams -->
         <dependency>
@@ -74,6 +77,46 @@
             </exclusions>
         </dependency>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-neo4j-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -115,7 +158,7 @@
             <id>test-neo4j</id>
             <activation>
                 <property>
-                    <name>test-neo4j</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -136,65 +179,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-neo4j</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -260,7 +249,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/neo4j/src/main/resources/application.properties b/integration-tests/neo4j/src/main/resources/application.properties
index cea3d24dfd4c9..8960ef7c989d5 100644
--- a/integration-tests/neo4j/src/main/resources/application.properties
+++ b/integration-tests/neo4j/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 quarkus.neo4j.uri = ${neo4j.uri}
 quarkus.neo4j.authentication.username = ${neo4j.username}
 quarkus.neo4j.authentication.password = ${neo4j.password}
+quarkus.neo4j.pool.metrics-enabled = true
 
 # Disabling SSL is not recommended in production and only needed for this integration test.
 # Disabling SSL will disable encrypted bolt communication.
diff --git a/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java b/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java
index 19058362bf4e4..0f8255e973d99 100644
--- a/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java
+++ b/integration-tests/neo4j/src/test/java/io/quarkus/it/neo4j/Neo4jFunctionalityTest.java
@@ -5,10 +5,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 
 /**
  * Test connecting via Neo4j Java-Driver to Neo4j.
@@ -45,11 +47,29 @@ public void testReactiveNeo4jFunctionality() {
 
     @Test
     public void health() {
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .log().all()
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
                         "checks.name", containsInAnyOrder("Neo4j connection health check"),
                         "checks.data.server", containsInAnyOrder(matchesRegex("Neo4j/.*@.*:\\d*")));
     }
+
+    @Test
+    public void metrics() {
+        RestAssured.given().when().get("/neo4j/blocking").then().body(is("OK"));
+        assertMetricValue("neo4j.acquired", greaterThan(0));
+        assertMetricValue("neo4j.created", greaterThan(0));
+        assertMetricValue("neo4j.totalAcquisitionTime", greaterThan(0));
+        assertMetricValue("neo4j.totalConnectionTime", greaterThan(0));
+        assertMetricValue("neo4j.totalInUseTime", greaterThan(0));
+    }
+
+    private void assertMetricValue(String name, Matcher<Integer> valueMatcher) {
+        RestAssured
+                .given().accept(ContentType.JSON)
+                .when().get("/q/metrics/vendor/" + name)
+                .then()
+                .body("'" + name + "'", valueMatcher);
+    }
 }
diff --git a/integration-tests/oidc-client-wiremock/pom.xml b/integration-tests/oidc-client-wiremock/pom.xml
new file mode 100644
index 0000000000000..eb1b79d88c98d
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/pom.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-oidc-client-wiremock</artifactId>
+    <name>Quarkus - Integration Tests - OpenID Connect Client Wiremock</name>
+    <description>Module that contains OpenID Connect Client tests using Wiremock</description>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+    </properties>
+
+    <dependencies>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId> jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <keycloak.url>${keycloak.url}</keycloak.url>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <keycloak.url>${keycloak.url}</keycloak.url>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
new file mode 100644
index 0000000000000..ce137ab6c683c
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.keycloak;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendResource {
+    @Inject
+    @RestClient
+    ProtectedResourceServiceOidcClient protectedResourceServiceOidcClient;
+
+    @GET
+    @Path("echoToken")
+    public String echoToken() {
+        return protectedResourceServiceOidcClient.echoToken();
+    }
+}
diff --git a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
new file mode 100644
index 0000000000000..7c9316864eda9
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+
+@Path("/protected")
+public class ProtectedResource {
+
+    @GET
+    public String echoToken(@HeaderParam("Authorization") String authorization) {
+        return authorization.split(" ")[1];
+    }
+}
diff --git a/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java
new file mode 100644
index 0000000000000..d2726065eeea1
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.client.filter.OidcClientFilter;
+
+@RegisterRestClient
+@OidcClientFilter
+@Path("/")
+public interface ProtectedResourceServiceOidcClient {
+
+    @GET
+    String echoToken();
+}
diff --git a/integration-tests/oidc-client-wiremock/src/main/resources/application.properties b/integration-tests/oidc-client-wiremock/src/main/resources/application.properties
new file mode 100644
index 0000000000000..2aa40586a8020
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+quarkus.oidc-client.auth-server-url=${keycloak.url}
+quarkus.oidc-client.discovery-enabled=false
+quarkus.oidc-client.token-path=/tokens
+quarkus.oidc-client.client-id=quarkus-app
+quarkus.oidc-client.credentials.secret=secret
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=alice
+quarkus.oidc-client.grant-options.password.password=alice
+
+io.quarkus.it.keycloak.ProtectedResourceServiceOidcClient/mp-rest/url=http://localhost:8081/protected
+
+quarkus.log.category."io.quarkus.oidc.client.runtime.OidcClientImpl".min-level=TRACE
+quarkus.log.category."io.quarkus.oidc.client.runtime.OidcClientImpl".level=TRACE
+quarkus.log.file.enable=true
+quarkus.log.file.format=%C - %s%n
diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
new file mode 100644
index 0000000000000..4590a940a46d8
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -0,0 +1,62 @@
+package io.quarkus.it.keycloak;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.matching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.core.Options.ChunkedEncodingPolicy;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final Logger LOG = Logger.getLogger(KeycloakRealmResourceManager.class);
+
+    private WireMockServer server;
+
+    @Override
+    public Map<String, String> start() {
+
+        server = new WireMockServer(wireMockConfig().dynamicPort().useChunkedTransferEncoding(ChunkedEncodingPolicy.NEVER));
+        server.start();
+
+        server.stubFor(WireMock.post("/tokens")
+                .withRequestBody(matching("grant_type=password&username=alice&password=alice"))
+                .willReturn(WireMock
+                        .aResponse()
+                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                        .withBody(
+                                "{\"access_token\":\"access_token_1\", \"expires_in\":4, \"refresh_token\":\"refresh_token_1\"}")));
+        server.stubFor(WireMock.post("/tokens")
+                .withRequestBody(matching("grant_type=refresh_token&refresh_token=refresh_token_1"))
+                .willReturn(WireMock
+                        .aResponse()
+                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                        .withBody(
+                                "{\"access_token\":\"access_token_2\", \"expires_in\":4, \"refresh_token\":\"refresh_token_1\"}")));
+
+        LOG.infof("Keycloak started in mock mode: %s", server.baseUrl());
+
+        Map<String, String> conf = new HashMap<>();
+        conf.put("quarkus.oidc-client.auth-server-url", server.baseUrl());
+        conf.put("keycloak-url", server.baseUrl());
+        return conf;
+    }
+
+    @Override
+    public synchronized void stop() {
+        if (server != null) {
+            server.stop();
+            LOG.info("Keycloak was shut down");
+            server = null;
+        }
+    }
+}
diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientInGraalITCase.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientInGraalITCase.java
new file mode 100644
index 0000000000000..bf79d4fc6d047
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class OidcClientInGraalITCase extends OidcClientTest {
+}
diff --git a/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java
new file mode 100644
index 0000000000000..853f45223f253
--- /dev/null
+++ b/integration-tests/oidc-client-wiremock/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java
@@ -0,0 +1,95 @@
+package io.quarkus.it.keycloak;
+
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.core.ThrowingRunnable;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@QuarkusTestResource(KeycloakRealmResourceManager.class)
+public class OidcClientTest {
+
+    @Test
+    public void testEchoAndRefreshTokens() {
+        RestAssured.when().get("/frontend/echoToken")
+                .then()
+                .statusCode(200)
+                .body(equalTo("access_token_1"));
+
+        // Wait until the access token has expired
+        long expiredTokenTime = System.currentTimeMillis() + 5000;
+        await().atMost(10, TimeUnit.SECONDS)
+                .pollInterval(Duration.ofSeconds(3))
+                .until(new Callable<Boolean>() {
+                    @Override
+                    public Boolean call() throws Exception {
+                        return System.currentTimeMillis() > expiredTokenTime;
+                    }
+                });
+
+        RestAssured.when().get("/frontend/echoToken")
+                .then()
+                .statusCode(200)
+                .body(equalTo("access_token_2"));
+        checkLog();
+    }
+
+    private void checkLog() {
+        final Path logDirectory = Paths.get(".", "target");
+        given().await().pollInterval(100, TimeUnit.MILLISECONDS)
+                .atMost(10, TimeUnit.SECONDS)
+                .untilAsserted(new ThrowingRunnable() {
+                    @Override
+                    public void run() throws Throwable {
+                        Path accessLogFilePath = logDirectory.resolve("quarkus.log");
+                        boolean fileExists = Files.exists(accessLogFilePath);
+                        if (!fileExists) {
+                            accessLogFilePath = logDirectory.resolve("target/quarkus.log");
+                            fileExists = Files.exists(accessLogFilePath);
+                        }
+                        Assertions.assertTrue(Files.exists(accessLogFilePath),
+                                "quarkus log file " + accessLogFilePath + " is missing");
+
+                        int tokenAcquisitionCount = 0;
+                        int tokenRefreshedCount = 0;
+
+                        try (BufferedReader reader = new BufferedReader(
+                                new InputStreamReader(new ByteArrayInputStream(Files.readAllBytes(accessLogFilePath)),
+                                        StandardCharsets.UTF_8))) {
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                if (line.contains("Default OidcClient has refreshed the tokens")) {
+                                    tokenRefreshedCount++;
+                                } else if (line.contains("Default OidcClient has acquired the tokens")) {
+                                    tokenAcquisitionCount++;
+                                }
+
+                            }
+                        }
+                        assertEquals(1, tokenAcquisitionCount,
+                                "Log file must contain a single OidcClientImpl token acquisition confirmation");
+                        assertEquals(1, tokenRefreshedCount,
+                                "Log file must contain a single OidcClientImpl token refresh confirmation");
+                    }
+                });
+    }
+}
diff --git a/integration-tests/oidc-client/pom.xml b/integration-tests/oidc-client/pom.xml
new file mode 100644
index 0000000000000..beeb43aa9173c
--- /dev/null
+++ b/integration-tests/oidc-client/pom.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-oidc-client</artifactId>
+    <name>Quarkus - Integration Tests - OpenID Connect Client</name>
+    <description>Module that contains OpenID Connect Client tests</description>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+        <keycloak.ssl.url>https://localhost:8543/auth</keycloak.ssl.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-keycloak</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.ssl.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.ssl.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-keycloak</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <keycloak.url>http://localhost:8180/auth</keycloak.url>
+                <keycloak.ssl.url>https://localhost:8543/auth</keycloak.ssl.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${keycloak.docker.image}</name>
+                                    <alias>quarkus-test-keycloak</alias>
+                                    <run>
+                                        <ports>
+                                            <port>8180:8080</port>
+                                            <port>8543:8443</port>
+                                        </ports>
+                                        <env>
+                                            <KEYCLOAK_USER>admin</KEYCLOAK_USER>
+                                            <KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
+                                        </env>
+                                        <log>
+                                            <prefix>Keycloak:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
+                                            <http>
+                                                <url>http://localhost:8180</url>
+                                            </http>
+                                            <time>100000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
new file mode 100644
index 0000000000000..836468b2ac48e
--- /dev/null
+++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
@@ -0,0 +1,40 @@
+package io.quarkus.it.keycloak;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendResource {
+    @Inject
+    @RestClient
+    ProtectedResourceServiceOidcClient protectedResourceServiceOidcClient;
+
+    @Inject
+    @RestClient
+    ProtectedResourceServiceOidcClient protectedResourceServiceRegisterProvider;
+
+    @Inject
+    @RestClient
+    ProtectedResourceServiceNoOidcClient protectedResourceServiceNoOidcClient;
+
+    @GET
+    @Path("userOidcClient")
+    public String userNameOidcClient() {
+        return protectedResourceServiceOidcClient.getUserName();
+    }
+
+    @GET
+    @Path("userRegisterProvider")
+    public String userNameRegisterProvider() {
+        return protectedResourceServiceRegisterProvider.getUserName();
+    }
+
+    @GET
+    @Path("userNoOidcClient")
+    public String userNameNoOidcClient() {
+        return protectedResourceServiceNoOidcClient.getUserName();
+    }
+}
diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
new file mode 100644
index 0000000000000..b99056445fdee
--- /dev/null
+++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.keycloak;
+
+import java.security.Principal;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/protected")
+@Authenticated
+public class ProtectedResource {
+
+    @Inject
+    Principal principal;
+
+    @GET
+    @RolesAllowed("user")
+    public String principalName() {
+        return principal.getName();
+    }
+}
diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java
new file mode 100644
index 0000000000000..8e078666a40f4
--- /dev/null
+++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceNoOidcClient.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@Path("/")
+public interface ProtectedResourceServiceNoOidcClient {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java
new file mode 100644
index 0000000000000..3cedc0b77aacb
--- /dev/null
+++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceOidcClient.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.client.filter.OidcClientFilter;
+
+@RegisterRestClient
+@OidcClientFilter
+@Path("/")
+public interface ProtectedResourceServiceOidcClient {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java
new file mode 100644
index 0000000000000..d51c52d398d76
--- /dev/null
+++ b/integration-tests/oidc-client/src/main/java/io/quarkus/it/keycloak/ProtectedResourceServiceRegisterProvider.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.client.filter.OidcClientRequestFilter;
+
+@RegisterRestClient
+@RegisterProvider(OidcClientRequestFilter.class)
+@Path("/")
+public interface ProtectedResourceServiceRegisterProvider {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/oidc-client/src/main/resources/application.properties b/integration-tests/oidc-client/src/main/resources/application.properties
new file mode 100644
index 0000000000000..fab7890822ec9
--- /dev/null
+++ b/integration-tests/oidc-client/src/main/resources/application.properties
@@ -0,0 +1,20 @@
+quarkus.oidc.auth-server-url=${keycloak.ssl.url}/realms/quarkus/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.secret=${quarkus.oidc.credentials.secret}
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=alice
+quarkus.oidc-client.grant-options.password.password=alice
+
+io.quarkus.it.keycloak.ProtectedResourceServiceRegisterProvider/mp-rest/url=http://localhost:8081/protected
+io.quarkus.it.keycloak.ProtectedResourceServiceOidcClient/mp-rest/url=http://localhost:8081/protected
+io.quarkus.it.keycloak.ProtectedResourceServiceNoOidcClient/mp-rest/url=http://localhost:8081/protected
+
+quarkus.tls.trust-all=true
+quarkus.log.category."io.quarkus.oidc.client.runtime.OidcClientImpl".min-level=TRACE
+quarkus.log.category."io.quarkus.oidc.client.runtime.OidcClientImpl".level=TRACE
+quarkus.log.file.enable=true
+quarkus.log.file.format=%C - %s%n
diff --git a/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
new file mode 100644
index 0000000000000..a760650e66bbd
--- /dev/null
+++ b/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -0,0 +1,132 @@
+package io.quarkus.it.keycloak;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RoleRepresentation;
+import org.keycloak.representations.idm.RolesRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.ssl.url", "https://localhost:8543/auth");
+    private static final String KEYCLOAK_REALM = "quarkus";
+
+    static {
+        RestAssured.useRelaxedHTTPSValidation();
+    }
+
+    @Override
+    public Map<String, String> start() {
+
+        RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setAccessTokenLifespan(3);
+
+        realm.getClients().add(createClient("quarkus-app"));
+        realm.getUsers().add(createUser("alice", "user"));
+
+        try {
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setUsers(new ArrayList<>());
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+
+        RolesRepresentation roles = new RolesRepresentation();
+        List<RoleRepresentation> realmRoles = new ArrayList<>();
+
+        roles.setRealm(realmRoles);
+        realm.setRoles(roles);
+
+        realm.getRoles().getRealm().add(new RoleRepresentation("user", null, false));
+        realm.getRoles().getRealm().add(new RoleRepresentation("admin", null, false));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static UserRepresentation createUser(String username, String... realmRoles) {
+        UserRepresentation user = new UserRepresentation();
+
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setCredentials(new ArrayList<>());
+        user.setRealmRoles(Arrays.asList(realmRoles));
+        user.setEmail(username + "@gmail.com");
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+
+        credential.setType(CredentialRepresentation.PASSWORD);
+        credential.setValue(username);
+        credential.setTemporary(false);
+
+        user.getCredentials().add(credential);
+
+        return user;
+    }
+
+    @Override
+    public void stop() {
+
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).then().statusCode(204);
+    }
+}
diff --git a/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/OidcClientInGraalITCase.java b/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/OidcClientInGraalITCase.java
new file mode 100644
index 0000000000000..bf79d4fc6d047
--- /dev/null
+++ b/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/OidcClientInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class OidcClientInGraalITCase extends OidcClientTest {
+}
diff --git a/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java b/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java
new file mode 100644
index 0000000000000..8c3e20cd5f255
--- /dev/null
+++ b/integration-tests/oidc-client/src/test/java/io/quarkus/it/keycloak/OidcClientTest.java
@@ -0,0 +1,120 @@
+package io.quarkus.it.keycloak;
+
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.core.ThrowingRunnable;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@QuarkusTestResource(KeycloakRealmResourceManager.class)
+public class OidcClientTest {
+
+    @Test
+    public void testGetUserNameOidcClient() {
+        RestAssured.when().get("/frontend/userOidcClient")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+    }
+
+    @Test
+    public void testGetUserOidcClientNameAndRefreshTokens() {
+        RestAssured.when().get("/frontend/userOidcClient")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+
+        // Wait until the access token has expired
+        long expiredTokenTime = System.currentTimeMillis() + 5000;
+        await().atMost(10, TimeUnit.SECONDS)
+                .pollInterval(Duration.ofSeconds(3))
+                .until(new Callable<Boolean>() {
+                    @Override
+                    public Boolean call() throws Exception {
+                        return System.currentTimeMillis() > expiredTokenTime;
+                    }
+                });
+
+        RestAssured.when().get("/frontend/userOidcClient")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+        checkLog();
+    }
+
+    @Test
+    public void testGetUserNameRegisterProvider() {
+        RestAssured.when().get("/frontend/userRegisterProvider")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+
+    }
+
+    @Test
+    public void testGetUserNameNoOidcClient() {
+        RestAssured.when().get("/frontend/userNoOidcClient")
+                .then()
+                .statusCode(401);
+
+    }
+
+    private void checkLog() {
+        final Path logDirectory = Paths.get(".", "target");
+        given().await().pollInterval(100, TimeUnit.MILLISECONDS)
+                .atMost(10, TimeUnit.SECONDS)
+                .untilAsserted(new ThrowingRunnable() {
+                    @Override
+                    public void run() throws Throwable {
+                        Path accessLogFilePath = logDirectory.resolve("quarkus.log");
+                        boolean fileExists = Files.exists(accessLogFilePath);
+                        if (!fileExists) {
+                            accessLogFilePath = logDirectory.resolve("target/quarkus.log");
+                            fileExists = Files.exists(accessLogFilePath);
+                        }
+                        Assertions.assertTrue(Files.exists(accessLogFilePath),
+                                "quarkus log file " + accessLogFilePath + " is missing");
+
+                        int tokenAcquisitionCount = 0;
+                        int tokenRefreshedCount = 0;
+
+                        try (BufferedReader reader = new BufferedReader(
+                                new InputStreamReader(new ByteArrayInputStream(Files.readAllBytes(accessLogFilePath)),
+                                        StandardCharsets.UTF_8))) {
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                if (line.contains("Default OidcClient has refreshed the tokens")) {
+                                    tokenRefreshedCount++;
+                                } else if (line.contains("Default OidcClient has acquired the tokens")) {
+                                    tokenAcquisitionCount++;
+                                }
+
+                            }
+                        }
+                        assertEquals(1, tokenAcquisitionCount,
+                                "Log file must contain a single OidcClientImpl token acquisition confirmation");
+                        assertEquals(1, tokenRefreshedCount,
+                                "Log file must contain a single OidcClientImpl token refresh confirmation");
+                    }
+                });
+    }
+}
diff --git a/integration-tests/oidc-code-flow/README.md b/integration-tests/oidc-code-flow/README.md
index 0fb20fef25488..a1cc260f3238f 100644
--- a/integration-tests/oidc-code-flow/README.md
+++ b/integration-tests/oidc-code-flow/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with Keycloak Server started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run Keycloak Server as a Docker container, you can start your own Keycloak server. It needs to listen on the default port `8180`.
@@ -21,7 +21,7 @@ If you don't want to run Keycloak Server as a Docker container, you can start yo
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-keycloak
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dkeycloak.url=http://keycloak.server.domain:8180/auth`.
diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml
index 3bb4aa24e9459..7ae446386df45 100644
--- a/integration-tests/oidc-code-flow/pom.xml
+++ b/integration-tests/oidc-code-flow/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,11 +22,24 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-oidc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-security</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -58,6 +70,60 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -99,7 +165,7 @@
             <id>test-keycloak</id>
             <activation>
                 <property>
-                    <name>test-keycloak</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -137,69 +203,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-keycloak</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -269,7 +277,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java
new file mode 100644
index 0000000000000..0936eac60f2b0
--- /dev/null
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomSecurityIdentityAugmentor.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.keycloak;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.oidc.IdTokenCredential;
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.identity.SecurityIdentityAugmentor;
+import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+import io.smallrye.mutiny.Uni;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class CustomSecurityIdentityAugmentor implements SecurityIdentityAugmentor {
+
+    @Override
+    public int priority() {
+        return 0;
+    }
+
+    @Override
+    public Uni<SecurityIdentity> augment(SecurityIdentity identity, AuthenticationRequestContext context) {
+        IdTokenCredential cred = identity.getCredential(IdTokenCredential.class);
+        if (cred != null) {
+            QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder(identity);
+            builder.addAttribute(RoutingContext.class.getName(), cred.getRoutingContext());
+            identity = builder.build();
+        }
+        return Uni.createFrom().item(identity);
+    }
+
+}
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
index 9afa335889120..648205d098ace 100644
--- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
@@ -23,6 +23,34 @@ public String resolve(RoutingContext context) {
             return "tenant-logout";
         }
 
+        if (path.contains("tenant-query")) {
+            return "tenant-query";
+        }
+
+        if (path.contains("tenant-listener")) {
+            return "tenant-listener";
+        }
+
+        if (path.contains("tenant-idtoken-only")) {
+            return "tenant-idtoken-only";
+        }
+
+        if (path.contains("tenant-split-tokens")) {
+            return "tenant-split-tokens";
+        }
+
+        if (path.contains("tenant-id-refresh-token")) {
+            return "tenant-id-refresh-token";
+        }
+
+        if (path.contains("tenant-split-id-refresh-token")) {
+            return "tenant-split-id-refresh-token";
+        }
+
+        if (path.contains("tenant-autorefresh")) {
+            return "tenant-autorefresh";
+        }
+
         if (path.contains("tenant-https")) {
             return "tenant-https";
         }
@@ -31,11 +59,35 @@ public String resolve(RoutingContext context) {
             return "tenant-xhr";
         }
 
-        return path.contains("callback-after-redirect") || path.contains("callback-before-redirect") ? "tenant-1"
-                : path.contains("callback-jwt-after-redirect") || path.contains("callback-jwt-before-redirect") ? "tenant-jwt"
-                        : path.contains("callback-jwt-not-used-after-redirect")
-                                || path.contains("callback-jwt-not-used-before-redirect")
-                                        ? "tenant-jwt-not-used"
-                                        : path.contains("/web-app2") ? "tenant-2" : null;
+        if (path.contains("tenant-javascript")) {
+            return "tenant-javascript";
+        }
+
+        if (path.contains("tenant-cookie-path-header")) {
+            return "tenant-cookie-path-header";
+        }
+
+        if (path.contains("callback-before-wrong-redirect")) {
+            return context.getCookie("q_auth_tenant-before-wrong-redirect") == null ? "tenant-before-wrong-redirect"
+                    : "tenant-1";
+        }
+
+        if (path.contains("callback-after-redirect") || path.contains("callback-before-redirect")) {
+            return "tenant-1";
+        }
+
+        if (path.contains("callback-jwt-after-redirect") || path.contains("callback-jwt-before-redirect")) {
+            return "tenant-jwt";
+        }
+
+        if (path.contains("callback-jwt-not-used-after-redirect") || path.contains("callback-jwt-not-used-before-redirect")) {
+            return "tenant-jwt-not-used";
+        }
+
+        if (path.contains("/web-app2")) {
+            return "tenant-2";
+        }
+
+        return null;
     }
 }
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
index 41574f0a9d169..a4207bea1dbee 100644
--- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
@@ -5,6 +5,8 @@
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.SecurityContext;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 
@@ -12,13 +14,22 @@
 import io.quarkus.oidc.IdToken;
 import io.quarkus.oidc.IdTokenCredential;
 import io.quarkus.oidc.OIDCException;
+import io.quarkus.oidc.OidcConfigurationMetadata;
 import io.quarkus.oidc.RefreshToken;
 import io.quarkus.security.Authenticated;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.vertx.ext.web.RoutingContext;
 
 @Path("/web-app")
 @Authenticated
 public class ProtectedResource {
 
+    @Inject
+    SecurityIdentity identity;
+
+    @Inject
+    OidcConfigurationMetadata configMetadata;
+
     @Inject
     @IdToken
     JsonWebToken idToken;
@@ -35,14 +46,62 @@ public class ProtectedResource {
     @Inject
     RefreshToken refreshToken;
 
+    @Context
+    SecurityContext securityContext;
+
+    @GET
+    @Path("sec")
+    public String hello() {
+        return securityContext.getUserPrincipal().getName();
+    }
+
+    @GET
+    @Path("configMetadataIssuer")
+    public String configMetadataIssuer() {
+        return configMetadata.getIssuer();
+    }
+
     @GET
     public String getName() {
         if (!idTokenCredential.getToken().equals(idToken.getRawToken())) {
             throw new OIDCException("ID token values are not equal");
         }
+        if (idTokenCredential.getRoutingContext() != identity.getAttribute(RoutingContext.class.getName())) {
+            throw new OIDCException("SecurityIdentity must have a RoutingContext attribute");
+        }
         return idToken.getName();
     }
 
+    @GET
+    @Path("tenant-idtoken-only")
+    public String getNameIdTokenOnly() {
+        return "tenant-idtoken-only:" + getName();
+    }
+
+    @GET
+    @Path("tenant-id-refresh-token")
+    public String getNameIdRefreshTokenOnly() {
+        return "tenant-id-refresh-token:" + getName();
+    }
+
+    @GET
+    @Path("tenant-split-tokens")
+    public String getNameSplitTokens() {
+        return "tenant-split-tokens:" + getName();
+    }
+
+    @GET
+    @Path("tenant-split-id-refresh-token")
+    public String getNameIdRefreshSplitTokens() {
+        return "tenant-split-id-refresh-token:" + getName();
+    }
+
+    @GET
+    @Path("callback-before-wrong-redirect")
+    public String getNameCallbackBeforeWrongRedirect() {
+        throw new InternalServerErrorException("This method must not be invoked");
+    }
+
     @GET
     @Path("callback-before-redirect")
     public String getNameCallbackBeforeRedirect() {
@@ -88,24 +147,92 @@ public String getTenantLogout() {
     @GET
     @Path("access")
     public String getAccessToken() {
-        if (!accessTokenCredential.getToken().equals(accessToken.getRawToken())) {
+        if (accessToken.getRawToken() != null && !accessTokenCredential.getToken().equals(accessToken.getRawToken())) {
             throw new OIDCException("Access token values are not equal");
         }
-        return accessToken.getRawToken() != null && !accessToken.getRawToken().isEmpty() ? "AT injected" : "";
+        return accessToken.getRawToken() != null && !accessToken.getRawToken().isEmpty() ? "AT injected" : "no access";
+    }
+
+    @GET
+    @Path("access/tenant-idtoken-only")
+    public String getAccessTokenIdTokenOnly() {
+        return "tenant-idtoken-only:" + getAccessToken();
+    }
+
+    @GET
+    @Path("access/tenant-id-refresh-token")
+    public String getAccessTokenIdRefreshTokensOnly() {
+        return "tenant-id-refresh-token:" + getAccessToken();
+    }
+
+    @GET
+    @Path("access/tenant-split-tokens")
+    public String getAccessTokenSplitTokens() {
+        return "tenant-split-tokens:" + getAccessToken();
+    }
+
+    @GET
+    @Path("access/tenant-split-id-refresh-token")
+    public String getAccessIdRefreshTokenSplitTokens() {
+        return "tenant-split-id-refresh-token:" + getAccessToken();
     }
 
     @GET
     @Path("refresh")
-    public String refresh() {
-        if (!accessTokenCredential.getRefreshToken().getToken().equals(refreshToken.getToken())) {
+    public String getRefreshToken() {
+        return doGetRefreshToken(true);
+    }
+
+    private String doGetRefreshToken(boolean refreshWithAccessTokenCheckRequired) {
+        if (refreshWithAccessTokenCheckRequired && refreshToken.getToken() != null
+                && !accessTokenCredential.getRefreshToken().getToken().equals(refreshToken.getToken())) {
             throw new OIDCException("Refresh token values are not equal");
         }
-        return refreshToken.getToken() != null && !refreshToken.getToken().isEmpty() ? "RT injected" : "no refresh";
+        if (refreshToken.getToken() != null && !refreshToken.getToken().isEmpty()) {
+            String message = "RT injected";
+            String listenerMessage = idTokenCredential.getRoutingContext().get("listener-message");
+            if (listenerMessage != null) {
+                message += ("(" + listenerMessage + ")");
+            }
+            return message;
+        } else {
+            return "no refresh";
+        }
+    }
+
+    @GET
+    @Path("refresh/tenant-idtoken-only")
+    public String getRefreshTokenIdTokenOnly() {
+        return "tenant-idtoken-only:" + getRefreshToken();
+    }
+
+    @GET
+    @Path("refresh/tenant-id-refresh-token")
+    public String getRefreshTokenIdRefreshTokensOnly() {
+        return "tenant-id-refresh-token:" + doGetRefreshToken(false);
+    }
+
+    @GET
+    @Path("refresh/tenant-split-id-refresh-token")
+    public String getRefreshTokenIdRefreshTokensSplit() {
+        return "tenant-split-id-refresh-token:" + doGetRefreshToken(false);
+    }
+
+    @GET
+    @Path("refresh/tenant-split-tokens")
+    public String getRefreshTokenSplitTokens() {
+        return "tenant-split-tokens:" + getRefreshToken();
+    }
+
+    @GET
+    @Path("refresh/tenant-listener")
+    public String getRefreshTokenTenantListener() {
+        return getRefreshToken();
     }
 
     @GET
     @Path("refresh-query")
-    public String refresh(@QueryParam("a") String aValue) {
-        return refresh() + ":" + aValue;
+    public String getRefreshTokenQuery(@QueryParam("a") String aValue) {
+        return getRefreshToken() + ":" + aValue;
     }
 }
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java
new file mode 100644
index 0000000000000..3cbc78deeb051
--- /dev/null
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/SecurityEventListener.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.keycloak;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import io.quarkus.oidc.IdTokenCredential;
+import io.quarkus.oidc.SecurityEvent;
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class SecurityEventListener {
+
+    public void event(@Observes SecurityEvent event) {
+        String tenantId = event.getSecurityIdentity().getAttribute("tenant-id");
+        boolean blockingApiAvailable = event.getSecurityIdentity()
+                .getAttribute(AuthenticationRequestContext.class.getName()) != null;
+
+        RoutingContext vertxContext = event.getSecurityIdentity().getCredential(IdTokenCredential.class).getRoutingContext();
+        vertxContext.put("listener-message",
+                String.format("event:%s,tenantId:%s,blockingApi:%b", event.getEventType().name(), tenantId,
+                        blockingApiAvailable));
+    }
+
+}
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java
new file mode 100644
index 0000000000000..9d5e9b4345070
--- /dev/null
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantAutoRefresh.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/tenant-autorefresh")
+public class TenantAutoRefresh {
+    @Authenticated
+    @GET
+    public String getTenantLogout() {
+        return "Tenant AutoRefresh";
+    }
+}
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java
new file mode 100644
index 0000000000000..d147326e894c5
--- /dev/null
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/tenant-https")
+@Authenticated
+public class TenantHttps {
+
+    @GET
+    public String getTenant() {
+        return "tenant-https";
+    }
+
+    @GET
+    @Path("query")
+    public String getTenantWithQuery(@QueryParam("a") String value) {
+        return "tenant-https?a=" + value;
+    }
+}
diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java
index 2056638f20429..bbf6cdde9cada 100644
--- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java
+++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantLogout.java
@@ -22,6 +22,16 @@ public String getTenantLogout() {
         return "Tenant Logout";
     }
 
+    // It is needed for the proactive-auth=false to work: /tenant-logout/logout should match a user initiated logout request 
+    // which must be handled by `CodeAuthenticationMechanism`.
+    // Adding `@Authenticated` gives control to `CodeAuthenticationMechanism` instead of RestEasy.
+    @GET
+    @Authenticated
+    @Path("logout")
+    public String getTenantLogoutPath() {
+        throw new InternalServerErrorException();
+    }
+
     @GET
     @Path("post-logout")
     public String postLogout(@QueryParam("state") String postLogoutState) {
diff --git a/integration-tests/oidc-code-flow/src/main/resources/application.properties b/integration-tests/oidc-code-flow/src/main/resources/application.properties
index 3c0790e8de3dc..13c04a9328fbd 100644
--- a/integration-tests/oidc-code-flow/src/main/resources/application.properties
+++ b/integration-tests/oidc-code-flow/src/main/resources/application.properties
@@ -4,13 +4,27 @@ quarkus.oidc.client-id=quarkus-app
 quarkus.oidc.credentials.secret=secret
 quarkus.oidc.authentication.scopes=profile,email,phone
 quarkus.oidc.authentication.redirect-path=/web-app
-# Several tests here start from /index.html (state cookie is available)
-# and next they try /web-app/* (when a state cookie might not be available)
-# Adding 'cookie-path=/' may prevent the intermittent CI failures to do with the missing state cookie
-quarkus.oidc.authentication.cookie-path=/
+quarkus.oidc.authentication.restore-path-after-redirect=true
+quarkus.oidc.authentication.cookie-path-header=some-header
+quarkus.oidc.authentication.cookie-domain=localhost
 quarkus.oidc.authentication.extra-params.max-age=60
 quarkus.oidc.application-type=web-app
 
+# Tenant listener configuration for testing that the login event has been captured
+quarkus.oidc.tenant-listener.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-listener.client-id=quarkus-app
+quarkus.oidc.tenant-listener.credentials.secret=secret
+# Redirect parameters are dropped by redirecting the authenticated user but this final redirect loses the login event message
+# on Vertx context; so disabling it for the test endpoint to confirm the login event has been accepted
+quarkus.oidc.tenant-listener.authentication.remove-redirect-parameters=false
+quarkus.oidc.tenant-listener.application-type=web-app
+
+
+quarkus.oidc.tenant-before-wrong-redirect.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-before-wrong-redirect.client-id=quarkus-app
+quarkus.oidc.tenant-before-wrong-redirect.credentials.client-secret.value=secret
+quarkus.oidc.tenant-before-wrong-redirect.token.issuer=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-before-wrong-redirect.application-type=web-app
 
 # Tenant which does not need to restore a request path after redirect, client_secret_post method
 quarkus.oidc.tenant-1.auth-server-url=${keycloak.url}/realms/quarkus
@@ -19,7 +33,6 @@ quarkus.oidc.tenant-1.credentials.client-secret.value=secret
 quarkus.oidc.tenant-1.credentials.client-secret.method=post
 quarkus.oidc.tenant-1.token.issuer=${keycloak.url}/realms/quarkus
 quarkus.oidc.tenant-1.authentication.redirect-path=/web-app/callback-after-redirect
-quarkus.oidc.tenant-1.authentication.restore-path-after-redirect=false
 quarkus.oidc.tenant-1.application-type=web-app
 
 # Tenant with client which needs to use client_secret_jwt method
@@ -28,7 +41,6 @@ quarkus.oidc.tenant-jwt.client-id=quarkus-app-jwt
 quarkus.oidc.tenant-jwt.credentials.jwt.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
 quarkus.oidc.tenant-jwt.token.issuer=${keycloak.url}/realms/quarkus
 quarkus.oidc.tenant-jwt.authentication.redirect-path=/web-app/callback-jwt-after-redirect
-quarkus.oidc.tenant-jwt.authentication.restore-path-after-redirect=false
 quarkus.oidc.tenant-jwt.application-type=web-app
 
 # Tenant with client which needs to use client_secret_jwt but uses client_secret_post
@@ -38,7 +50,6 @@ quarkus.oidc.tenant-jwt-not-used.credentials.client-secret.value=AyM1SysPpbyDfgZ
 quarkus.oidc.tenant-jwt-not-used.credentials.client-secret.method=post
 quarkus.oidc.tenant-jwt-not-used.token.issuer=${keycloak.url}/realms/quarkus
 quarkus.oidc.tenant-jwt-not-used.authentication.redirect-path=/web-app/callback-jwt-not-used-after-redirect
-quarkus.oidc.tenant-jwt-not-used.authentication.restore-path-after-redirect=false
 quarkus.oidc.tenant-jwt-not-used.application-type=web-app
 
 # Tenant which does not need to restore a request path after redirect with a different redirect path root
@@ -47,7 +58,6 @@ quarkus.oidc.tenant-2.client-id=quarkus-app
 quarkus.oidc.tenant-2.credentials.client-secret.value=secret
 quarkus.oidc.tenant-2.token.issuer=${keycloak.url}/realms/quarkus
 quarkus.oidc.tenant-2.authentication.redirect-path=/web-app2/name
-quarkus.oidc.tenant-2.authentication.restore-path-after-redirect=false
 quarkus.oidc.tenant-2.authentication.cookie-path=/web-app2
 quarkus.oidc.tenant-2.application-type=web-app
 
@@ -56,8 +66,7 @@ quarkus.oidc.tenant-3.auth-server-url=${keycloak.url}/realms/quarkus
 quarkus.oidc.tenant-3.client-id=quarkus-app
 quarkus.oidc.tenant-3.credentials.secret=secret
 quarkus.oidc.tenant-3.token.issuer=${keycloak.url}/realms/quarkus
-quarkus.oidc.tenant-3.authentication.redirect-path=/some/other/path
-quarkus.oidc.tenant-3.authentication.restore-path-after-redirect=false
+quarkus.oidc.tenant-3.authentication.redirect-path=/web-app3
 quarkus.oidc.tenant-3.application-type=web-app
 
 quarkus.oidc.tenant-logout.auth-server-url=${keycloak.url}/realms/logout-realm
@@ -65,45 +74,96 @@ quarkus.oidc.tenant-logout.client-id=quarkus-app
 quarkus.oidc.tenant-logout.credentials.secret=secret
 quarkus.oidc.tenant-logout.application-type=web-app
 quarkus.oidc.tenant-logout.authentication.cookie-path=/tenant-logout
+quarkus.oidc.tenant-logout.authentication.session-age-extension=2M
 quarkus.oidc.tenant-logout.logout.path=/tenant-logout/logout
 quarkus.oidc.tenant-logout.logout.post-logout-path=/tenant-logout/post-logout
 quarkus.oidc.tenant-logout.token.refresh-expired=true
-quarkus.oidc.tenant-logout.token.lifespan-grace=120
+
+quarkus.oidc.tenant-autorefresh.auth-server-url=${keycloak.url}/realms/logout-realm
+quarkus.oidc.tenant-autorefresh.client-id=quarkus-app
+quarkus.oidc.tenant-autorefresh.credentials.secret=secret
+quarkus.oidc.tenant-autorefresh.application-type=web-app
+quarkus.oidc.tenant-autorefresh.authentication.cookie-path=/tenant-autorefresh
+quarkus.oidc.tenant-autorefresh.token.refresh-expired=true
+quarkus.oidc.tenant-autorefresh.token.auto-refresh-interval=30S
 
 # Tenant which is used to test that the redirect_uri https scheme is enforced.
 quarkus.oidc.tenant-https.auth-server-url=${keycloak.url}/realms/quarkus
 quarkus.oidc.tenant-https.client-id=quarkus-app
 quarkus.oidc.tenant-https.credentials.secret=secret
 quarkus.oidc.tenant-https.authentication.scopes=profile,email,phone
-quarkus.oidc.tenant-https.authentication.redirect-path=/web-app
-quarkus.oidc.tenant-https.authentication.cookie-path=/
 quarkus.oidc.tenant-https.authentication.extra-params.max-age=60
 quarkus.oidc.tenant-https.application-type=web-app
 quarkus.oidc.tenant-https.authentication.force-redirect-https-scheme=true
 
-quarkus.oidc.tenant-xhr.auth-server-url=${keycloak.url}/realms/quarkus
-quarkus.oidc.tenant-xhr.client-id=quarkus-app
-quarkus.oidc.tenant-xhr.credentials.secret=secret
-quarkus.oidc.tenant-xhr.authentication.xhr-auto-redirect=false
-quarkus.oidc.tenant-xhr.application-type=web-app
+quarkus.oidc.tenant-javascript.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-javascript.client-id=quarkus-app
+quarkus.oidc.tenant-javascript.credentials.secret=secret
+quarkus.oidc.tenant-javascript.authentication.java-script-auto-redirect=false
+quarkus.oidc.tenant-javascript.application-type=web-app
+
+quarkus.oidc.tenant-cookie-path-header.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-cookie-path-header.client-id=quarkus-app
+quarkus.oidc.tenant-cookie-path-header.credentials.secret=secret
+quarkus.oidc.tenant-cookie-path-header.authentication.cookie-path-header=X-Forwarded-Prefix
+quarkus.oidc.tenant-cookie-path-header.application-type=web-app
+
+quarkus.oidc.tenant-idtoken-only.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-idtoken-only.client-id=quarkus-app
+quarkus.oidc.tenant-idtoken-only.credentials.secret=secret
+quarkus.oidc.tenant-idtoken-only.token-state-manager.strategy=id-token
+quarkus.oidc.tenant-idtoken-only.application-type=web-app
+
+quarkus.oidc.tenant-id-refresh-token.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-id-refresh-token.client-id=quarkus-app
+quarkus.oidc.tenant-id-refresh-token.credentials.secret=secret
+quarkus.oidc.tenant-id-refresh-token.token-state-manager.strategy=id-refresh-tokens
+quarkus.oidc.tenant-id-refresh-token.application-type=web-app
+
+quarkus.oidc.tenant-split-id-refresh-token.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-split-id-refresh-token.client-id=quarkus-app
+quarkus.oidc.tenant-split-id-refresh-token.credentials.secret=secret
+quarkus.oidc.tenant-split-id-refresh-token.token-state-manager.strategy=id-refresh-tokens
+quarkus.oidc.tenant-split-id-refresh-token.token-state-manager.split-tokens=true
+quarkus.oidc.tenant-split-id-refresh-token.application-type=web-app
+
+quarkus.oidc.tenant-split-tokens.auth-server-url=${keycloak.url}/realms/quarkus
+quarkus.oidc.tenant-split-tokens.client-id=quarkus-app
+quarkus.oidc.tenant-split-tokens.credentials.secret=secret
+quarkus.oidc.tenant-split-tokens.token-state-manager.split-tokens=true
+quarkus.oidc.tenant-split-tokens.application-type=web-app
 
 quarkus.http.auth.permission.roles1.paths=/index.html
 quarkus.http.auth.permission.roles1.policy=authenticated
 
+quarkus.http.auth.permission.callback.paths=/web-app3
+quarkus.http.auth.permission.callback.policy=authenticated
+
 quarkus.http.auth.permission.logout.paths=/tenant-logout
 quarkus.http.auth.permission.logout.policy=authenticated
 
-quarkus.http.auth.permission.https.paths=/tenant-https
-quarkus.http.auth.permission.https.policy=authenticated
+quarkus.http.auth.permission.autorefresh.paths=/tenant-autorefresh
+quarkus.http.auth.permission.autorefresh.policy=authenticated
+
+quarkus.http.auth.permission.javascript.paths=/tenant-javascript
+quarkus.http.auth.permission.javascript.policy=authenticated
 
-quarkus.http.auth.permission.xhr.paths=/tenant-xhr
-quarkus.http.auth.permission.xhr.policy=authenticated
+quarkus.http.auth.permission.tenant-cookie-path-header.paths=/tenant-cookie-path-header
+quarkus.http.auth.permission.tenant-cookie-path-header.policy=authenticated
 
 quarkus.http.auth.permission.post-logout.paths=/tenant-logout/post-logout
 quarkus.http.auth.permission.post-logout.policy=permit
 
 quarkus.http.cors=true
+quarkus.http.auth.proactive=false
+quarkus.http.proxy.enable-forwarded-prefix=true
+quarkus.http.proxy.allow-forwarded=true
 
+quarkus.log.category."io.quarkus.oidc.runtime.CodeAuthenticationMechanism".min-level=TRACE
 quarkus.log.category."io.quarkus.oidc.runtime.CodeAuthenticationMechanism".level=TRACE
+quarkus.log.category."io.vertx.ext.auth.oauth2.impl.OAuth2UserImpl".min-level=TRACE
 quarkus.log.category."io.vertx.ext.auth.oauth2.impl.OAuth2UserImpl".level=TRACE
+#quarkus.log.category."org.apache.http".min-level=TRACE
 #quarkus.log.category."org.apache.http".level=TRACE
+
+quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL
diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java
index 199ee4efb145e..e279cad783488 100644
--- a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java
+++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java
@@ -2,6 +2,7 @@
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -25,6 +26,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.util.Cookie;
 
+import io.quarkus.oidc.runtime.OidcUtils;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
@@ -42,14 +44,14 @@ public void testCodeFlowNoConsent() throws IOException {
             webClient.getOptions().setRedirectEnabled(false);
             WebResponse webResponse = webClient
                     .loadWebResponse(new WebRequest(URI.create("http://localhost:8081/index.html").toURL()));
-            verifyLocationHeader(webClient, webResponse.getResponseHeaderValue("location"), null, false);
+            verifyLocationHeader(webClient, webResponse.getResponseHeaderValue("location"), null, "web-app", false);
 
             webClient.getOptions().setRedirectEnabled(true);
             HtmlPage page = webClient.getPage("http://localhost:8081/index.html");
 
             assertEquals("/index.html", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -64,6 +66,13 @@ public void testCodeFlowNoConsent() throws IOException {
 
             assertEquals("Welcome to Test App", page.getTitleText(),
                     "A second request should not redirect and just re-authenticate the user");
+
+            page = webClient.getPage("http://localhost:8081/web-app/configMetadataIssuer");
+
+            assertEquals(
+                    KeycloakRealmResourceManager.KEYCLOAK_SERVER_URL + "/realms/" + KeycloakRealmResourceManager.KEYCLOAK_REALM,
+                    page.asText());
+
             webClient.getCookieManager().clearCookies();
         }
     }
@@ -72,18 +81,105 @@ public void testCodeFlowNoConsent() throws IOException {
     public void testCodeFlowForceHttpsRedirectUri() throws IOException {
         try (final WebClient webClient = createWebClient()) {
             webClient.getOptions().setRedirectEnabled(false);
+            // Verify X-Forwarded-Prefix header is checked during all the redirects 
+            webClient.addRequestHeader("X-Forwarded-Prefix", "/xforwarded");
+
             WebResponse webResponse = webClient
                     .loadWebResponse(
                             new WebRequest(URI.create("http://localhost:8081/tenant-https").toURL()));
-            verifyLocationHeader(webClient, webResponse.getResponseHeaderValue("location"), "tenant-https", true);
+            String keycloakUrl = webResponse.getResponseHeaderValue("location");
+            verifyLocationHeader(webClient, keycloakUrl, "tenant-https", "xforwarded%2Ftenant-https",
+                    true);
+
+            HtmlPage page = webClient.getPage(keycloakUrl);
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
+            webResponse = loginForm.getInputByName("login").click().getWebResponse();
+            webClient.getOptions().setThrowExceptionOnFailingStatusCode(true);
+
+            // This is a redirect from the OIDC server to the endpoint
+            String endpointLocation = webResponse.getResponseHeaderValue("location");
+            assertTrue(endpointLocation.startsWith("https"));
+            endpointLocation = "http" + endpointLocation.substring(5);
+            assertTrue(endpointLocation.contains("/xforwarded"));
+            endpointLocation = endpointLocation.replace("/xforwarded", "");
+            URI endpointLocationUri = URI.create(endpointLocation);
+            assertNotNull(endpointLocationUri.getRawQuery());
+
+            webClient.addRequestHeader("X-Forwarded-Prefix", "/xforwarded");
+            webResponse = webClient.loadWebResponse(new WebRequest(endpointLocationUri.toURL()));
+
+            // This is a redirect from quarkus-oidc which drops the query parameters
+            String endpointLocationWithoutQuery = webResponse.getResponseHeaderValue("location");
+            assertTrue(endpointLocationWithoutQuery.startsWith("https"));
+            assertTrue(endpointLocationWithoutQuery.contains("/xforwarded"));
+
+            endpointLocationWithoutQuery = "http" + endpointLocationWithoutQuery.substring(5);
+            endpointLocationWithoutQuery = endpointLocationWithoutQuery.replace("/xforwarded", "");
+            URI endpointLocationWithoutQueryUri = URI.create(endpointLocationWithoutQuery);
+            assertNull(endpointLocationWithoutQueryUri.getRawQuery());
+
+            page = webClient.getPage(endpointLocationWithoutQueryUri.toURL());
+            assertEquals("tenant-https", page.getBody().asText());
             webClient.getCookieManager().clearCookies();
         }
     }
 
-    private void verifyLocationHeader(WebClient webClient, String loc, String tenant, boolean forceHttps) {
+    @Test
+    public void testCodeFlowForceHttpsRedirectUriWithQuery() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            webClient.getOptions().setRedirectEnabled(false);
+
+            WebResponse webResponse = webClient
+                    .loadWebResponse(
+                            new WebRequest(URI.create("http://localhost:8081/tenant-https/query?a=b").toURL()));
+            String keycloakUrl = webResponse.getResponseHeaderValue("location");
+            verifyLocationHeader(webClient, keycloakUrl, "tenant-https", "tenant-https",
+                    true);
+
+            HtmlPage page = webClient.getPage(keycloakUrl);
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
+            webResponse = loginForm.getInputByName("login").click().getWebResponse();
+            webClient.getOptions().setThrowExceptionOnFailingStatusCode(true);
+
+            // This is a redirect from the OIDC server to the endpoint
+            String endpointLocation = webResponse.getResponseHeaderValue("location");
+            assertTrue(endpointLocation.startsWith("https"));
+            endpointLocation = "http" + endpointLocation.substring(5);
+            URI endpointLocationUri = URI.create(endpointLocation);
+            assertNotNull(endpointLocationUri.getRawQuery());
+
+            webResponse = webClient.loadWebResponse(new WebRequest(endpointLocationUri.toURL()));
+
+            // This is a redirect from quarkus-oidc which drops the code and state query parameters
+            String endpointLocationWithoutQuery = webResponse.getResponseHeaderValue("location");
+            assertTrue(endpointLocationWithoutQuery.startsWith("https"));
+
+            endpointLocationWithoutQuery = "http" + endpointLocationWithoutQuery.substring(5);
+            URI endpointLocationWithoutQueryUri = URI.create(endpointLocationWithoutQuery);
+            assertEquals("a=b", endpointLocationWithoutQueryUri.getRawQuery());
+
+            page = webClient.getPage(endpointLocationWithoutQueryUri.toURL());
+            assertEquals("tenant-https?a=b", page.getBody().asText());
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    private void verifyLocationHeader(WebClient webClient, String loc, String tenant, String path, boolean forceHttps) {
         assertTrue(loc.startsWith("http://localhost:8180/auth/realms/quarkus/protocol/openid-connect/auth"));
         String scheme = forceHttps ? "https" : "http";
-        assertTrue(loc.contains("redirect_uri=" + scheme + "%3A%2F%2Flocalhost%3A8081%2Fweb-app"));
+        assertTrue(loc.contains("redirect_uri=" + scheme + "%3A%2F%2Flocalhost%3A8081%2F" + path));
         assertTrue(loc.contains("state=" + getStateCookieStateParam(webClient, tenant)));
         assertTrue(loc.contains("scope=openid+profile+email+phone"));
         assertTrue(loc.contains("response_type=code"));
@@ -98,7 +194,7 @@ public void testTokenTimeoutLogout() throws IOException, InterruptedException {
             HtmlPage page = webClient.getPage("http://localhost:8081/index.html");
             assertEquals("/index.html", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -109,9 +205,12 @@ public void testTokenTimeoutLogout() throws IOException, InterruptedException {
 
             assertEquals("Welcome to Test App", page.getTitleText());
             assertNull(getStateCookie(webClient, null));
+            assertNull(getSessionAtCookie(webClient, null));
+            assertNull(getSessionRtCookie(webClient, null));
             Cookie sessionCookie = getSessionCookie(webClient, null);
             assertNotNull(sessionCookie);
             assertEquals("/", sessionCookie.getPath());
+            assertEquals("localhost", sessionCookie.getDomain());
 
             webClient.getOptions().setRedirectEnabled(false);
             webClient.getCache().clear();
@@ -132,7 +231,7 @@ public Boolean call() throws Exception {
             webClient.getOptions().setRedirectEnabled(true);
             page = webClient.getPage("http://localhost:8081/index.html");
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
             webClient.getCookieManager().clearCookies();
         }
     }
@@ -141,7 +240,7 @@ public Boolean call() throws Exception {
     public void testRPInitiatedLogout() throws IOException {
         try (final WebClient webClient = createWebClient()) {
             HtmlPage page = webClient.getPage("http://localhost:8081/tenant-logout");
-            assertEquals("Log in to logout-realm", page.getTitleText());
+            assertEquals("Sign in to logout-realm", page.getTitleText());
             HtmlForm loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -154,7 +253,7 @@ public void testRPInitiatedLogout() throws IOException {
             assertNull(getSessionCookie(webClient, "tenant-logout"));
 
             page = webClient.getPage("http://localhost:8081/tenant-logout");
-            assertEquals("Log in to logout-realm", page.getTitleText());
+            assertEquals("Sign in to logout-realm", page.getTitleText());
             loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -165,7 +264,7 @@ public void testRPInitiatedLogout() throws IOException {
             assertNotNull(sessionCookie);
             String idToken = getIdToken(sessionCookie);
 
-            //wait now so that we reach the refresh timeout
+            //wait now so that we reach the ID token timeout
             await().atMost(10, TimeUnit.SECONDS)
                     .pollInterval(Duration.ofSeconds(1))
                     .until(new Callable<Boolean>() {
@@ -212,7 +311,49 @@ public Boolean call() throws Exception {
             webClient.getOptions().setRedirectEnabled(true);
             page = webClient.getPage("http://localhost:8081/tenant-logout");
             assertNull(getSessionCookie(webClient, "tenant-logout"));
-            assertEquals("Log in to logout-realm", page.getTitleText());
+            assertEquals("Sign in to logout-realm", page.getTitleText());
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testTokenAutoRefresh() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/tenant-autorefresh");
+            assertEquals("Sign in to logout-realm", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+            page = loginForm.getInputByName("login").click();
+            assertTrue(page.asText().contains("Tenant AutoRefresh"));
+
+            Cookie sessionCookie = getSessionCookie(webClient, "tenant-autorefresh");
+            assertNotNull(sessionCookie);
+            String idToken = getIdToken(sessionCookie);
+
+            // Auto-refresh-interval is 30 secs so every call auto-refreshes the token
+            // Right now the original ID token is still valid but will be auto-refreshed
+            page = webClient.getPage("http://localhost:8081/tenant-autorefresh");
+            assertTrue(page.getBody().asText().contains("Tenant AutoRefresh"));
+            sessionCookie = getSessionCookie(webClient, "tenant-autorefresh");
+            assertNotNull(sessionCookie);
+            String nextIdToken = getIdToken(sessionCookie);
+            assertNotEquals(idToken, nextIdToken);
+            idToken = nextIdToken;
+
+            //wait now so that we reach the ID token timeout
+            await().atLeast(6, TimeUnit.SECONDS);
+
+            // ID token has expired, must be refreshed, auto-refresh-interval must not cause
+            // an auto-refresh loop even though it is larger than the ID token lifespan
+            page = webClient.getPage("http://localhost:8081/tenant-autorefresh");
+            assertTrue(page.getBody().asText().contains("Tenant AutoRefresh"));
+            sessionCookie = getSessionCookie(webClient, "tenant-autorefresh");
+            assertNotNull(sessionCookie);
+            nextIdToken = getIdToken(sessionCookie);
+            assertNotEquals(idToken, nextIdToken);
+
+            webClient.getCookieManager().clearCookies();
         }
     }
 
@@ -222,7 +363,7 @@ public void testIdTokenInjection() throws IOException {
             HtmlPage page = webClient.getPage("http://localhost:8081/index.html");
             assertEquals("/index.html", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -247,7 +388,7 @@ public void testIdTokenInjectionWithoutRestoredPath() throws IOException, Interr
             assertNotNull(getStateCookieStateParam(webClient, "tenant-1"));
             assertNull(getStateCookieSavedPath(webClient, "tenant-1"));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -273,7 +414,7 @@ public void testIdTokenInjectionJwtMethod() throws IOException, InterruptedExcep
             assertNull(getStateCookieSavedPath(webClient, "tenant-jwt"));
 
             HtmlPage page = webClient.getPage(webResponse.getResponseHeaderValue("location"));
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
             HtmlForm loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -304,7 +445,7 @@ public void testIdTokenInjectionJwtMethodButPostMethodUsed() throws IOException,
             assertNotNull(getStateCookieStateParam(webClient, "tenant-jwt-not-used"));
             assertNull(getStateCookieSavedPath(webClient, "tenant-jwt-not-used"));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -329,7 +470,7 @@ public void testIdTokenInjectionWithoutRestoredPathDifferentRoot() throws IOExce
             assertNotNull(getStateCookieStateParam(webClient, "tenant-2"));
             assertNull(getStateCookieSavedPath(webClient, "tenant-2"));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -359,7 +500,7 @@ public void testIdTokenInjectionWithoutRestoredPathDifferentRoot() throws IOExce
             webClient.getOptions().setRedirectEnabled(true);
             page = webClient.getPage("http://localhost:8081/web-app2/name");
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             webClient.getCookieManager().clearCookies();
         }
@@ -367,12 +508,12 @@ public void testIdTokenInjectionWithoutRestoredPathDifferentRoot() throws IOExce
 
     @Test
     public void testAuthenticationCompletionFailedNoStateCookie() throws IOException, InterruptedException {
-        // tenant-3 configuration uses a '/some/other/path' redirect parameter which does not have the same root
+        // tenant-3 configuration uses a '/web-app3' redirect parameter which does not have the same root
         // as the original request which is 'web-app', as a result, when the user is returned back to Quarkus
-        // to '/some/other/path' no state cookie is detected.
+        // to '/web-app3' no state cookie is detected.
         try (final WebClient webClient = createWebClient()) {
             HtmlPage page = webClient.getPage("http://localhost:8081/web-app/callback-before-redirect?tenantId=tenant-3");
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -395,8 +536,8 @@ public void testAuthenticationCompletionFailedWrongRedirectUri() throws IOExcept
         // When the user is redirected back, CustomTenantResolver will resolve a 'tenant-1' configuration with
         // a redirect_uri '/web-app/callback-after-redirect' which will cause a code to token exchange failure
         try (final WebClient webClient = createWebClient()) {
-            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/callback-before-redirect?tenantId");
-            assertEquals("Log in to quarkus", page.getTitleText());
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/callback-before-wrong-redirect");
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -418,7 +559,7 @@ public void testAccessTokenInjection() throws IOException {
             HtmlPage page = webClient.getPage("http://localhost:8081/index.html");
             assertEquals("/index.html", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -442,7 +583,7 @@ public void testAccessAndRefreshTokenInjection() throws IOException {
             HtmlPage page = webClient.getPage("http://localhost:8081/index.html");
             assertEquals("/index.html", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -466,7 +607,7 @@ public void testAccessAndRefreshTokenInjectionWithoutIndexHtml() throws IOExcept
             HtmlPage page = webClient.getPage("http://localhost:8081/web-app/refresh");
             assertEquals("/web-app/refresh", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -481,12 +622,212 @@ public void testAccessAndRefreshTokenInjectionWithoutIndexHtml() throws IOExcept
     }
 
     @Test
-    public void testAccessAndRefreshTokenInjectionWithoutIndexHtmlWithQuery() throws Exception {
+    public void testDefaultSessionManagerIdTokenOnly() throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/tenant-idtoken-only");
+            assertNotNull(getStateCookie(webClient, "tenant-idtoken-only"));
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            page = loginForm.getInputByName("login").click();
+            assertEquals("tenant-idtoken-only:alice", page.getBody().asText());
+
+            page = webClient.getPage("http://localhost:8081/web-app/access/tenant-idtoken-only");
+            assertEquals("tenant-idtoken-only:no access", page.getBody().asText());
+            page = webClient.getPage("http://localhost:8081/web-app/refresh/tenant-idtoken-only");
+            assertEquals("tenant-idtoken-only:no refresh", page.getBody().asText());
+
+            Cookie idTokenCookie = getSessionCookie(page.getWebClient(), "tenant-idtoken-only");
+            checkSingleTokenCookie(idTokenCookie, "ID");
+
+            assertNull(getSessionAtCookie(webClient, "tenant-idtoken-only"));
+            assertNull(getSessionRtCookie(webClient, "tenant-idtoken-only"));
+
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testDefaultSessionManagerIdRefreshTokens() throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/tenant-id-refresh-token");
+            assertNotNull(getStateCookie(webClient, "tenant-id-refresh-token"));
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            page = loginForm.getInputByName("login").click();
+            assertEquals("tenant-id-refresh-token:alice", page.getBody().asText());
+
+            page = webClient.getPage("http://localhost:8081/web-app/access/tenant-id-refresh-token");
+            assertEquals("tenant-id-refresh-token:no access", page.getBody().asText());
+            page = webClient.getPage("http://localhost:8081/web-app/refresh/tenant-id-refresh-token");
+            assertEquals("tenant-id-refresh-token:RT injected", page.getBody().asText());
+
+            Cookie idTokenCookie = getSessionCookie(page.getWebClient(), "tenant-id-refresh-token");
+            String[] parts = idTokenCookie.getValue().split("\\|");
+            assertEquals(3, parts.length);
+            assertEquals("ID", OidcUtils.decodeJwtContent(parts[0]).getString("typ"));
+            assertEquals("", parts[1]);
+            assertEquals("Refresh", OidcUtils.decodeJwtContent(parts[2]).getString("typ"));
+
+            assertNull(getSessionAtCookie(webClient, "tenant-id-refresh-token"));
+            assertNull(getSessionRtCookie(webClient, "tenant-id-refresh-token"));
+
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testDefaultSessionManagerSplitTokens() throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/tenant-split-tokens");
+            assertNotNull(getStateCookie(webClient, "tenant-split-tokens"));
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            page = loginForm.getInputByName("login").click();
+            assertEquals("tenant-split-tokens:alice", page.getBody().asText());
+
+            page = webClient.getPage("http://localhost:8081/web-app/access/tenant-split-tokens");
+            assertEquals("tenant-split-tokens:AT injected", page.getBody().asText());
+            page = webClient.getPage("http://localhost:8081/web-app/refresh/tenant-split-tokens");
+            assertEquals("tenant-split-tokens:RT injected", page.getBody().asText());
+
+            Cookie idTokenCookie = getSessionCookie(page.getWebClient(), "tenant-split-tokens");
+            checkSingleTokenCookie(idTokenCookie, "ID");
+
+            Cookie atTokenCookie = getSessionAtCookie(page.getWebClient(), "tenant-split-tokens");
+            checkSingleTokenCookie(atTokenCookie, "Bearer");
+
+            Cookie rtTokenCookie = getSessionRtCookie(page.getWebClient(), "tenant-split-tokens");
+            checkSingleTokenCookie(rtTokenCookie, "Refresh");
+
+            // verify all the cookies are cleared after the session timeout
+            webClient.getOptions().setRedirectEnabled(false);
+            webClient.getCache().clear();
+
+            await().atLeast(6, TimeUnit.SECONDS)
+                    .pollDelay(Duration.ofSeconds(6))
+                    .until(new Callable<Boolean>() {
+                        @Override
+                        public Boolean call() throws Exception {
+                            WebResponse webResponse = webClient
+                                    .loadWebResponse(new WebRequest(URI.create("http://localhost:8081/index.html").toURL()));
+                            assertEquals(302, webResponse.getStatusCode());
+                            assertNull(getSessionCookie(webClient, null));
+                            return true;
+                        }
+                    });
+
+            assertNull(getSessionCookie(page.getWebClient(), "tenant-split-tokens"));
+            assertNull(getSessionAtCookie(page.getWebClient(), "tenant-split-tokens"));
+            assertNull(getSessionRtCookie(page.getWebClient(), "tenant-split-tokens"));
+
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testDefaultSessionManagerIdRefreshSplitTokens() throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/tenant-split-id-refresh-token");
+            assertNotNull(getStateCookie(webClient, "tenant-split-id-refresh-token"));
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            page = loginForm.getInputByName("login").click();
+            assertEquals("tenant-split-id-refresh-token:alice", page.getBody().asText());
+
+            page = webClient.getPage("http://localhost:8081/web-app/access/tenant-split-id-refresh-token");
+            assertEquals("tenant-split-id-refresh-token:no access", page.getBody().asText());
+            page = webClient.getPage("http://localhost:8081/web-app/refresh/tenant-split-id-refresh-token");
+            assertEquals("tenant-split-id-refresh-token:RT injected", page.getBody().asText());
+
+            Cookie idTokenCookie = getSessionCookie(page.getWebClient(), "tenant-split-id-refresh-token");
+            checkSingleTokenCookie(idTokenCookie, "ID");
+
+            assertNull(getSessionAtCookie(page.getWebClient(), "tenant-split-id-refresh-token"));
+
+            Cookie rtTokenCookie = getSessionRtCookie(page.getWebClient(), "tenant-split-id-refresh-token");
+            checkSingleTokenCookie(rtTokenCookie, "Refresh");
+
+            // verify all the cookies are cleared after the session timeout
+            webClient.getOptions().setRedirectEnabled(false);
+            webClient.getCache().clear();
+
+            await().atLeast(6, TimeUnit.SECONDS)
+                    .pollDelay(Duration.ofSeconds(6))
+                    .until(new Callable<Boolean>() {
+                        @Override
+                        public Boolean call() throws Exception {
+                            WebResponse webResponse = webClient
+                                    .loadWebResponse(new WebRequest(URI.create("http://localhost:8081/index.html").toURL()));
+                            assertEquals(302, webResponse.getStatusCode());
+                            assertNull(getSessionCookie(webClient, null));
+                            return true;
+                        }
+                    });
+
+            assertNull(getSessionCookie(page.getWebClient(), "tenant-split-id-refresh-token"));
+            assertNull(getSessionAtCookie(page.getWebClient(), "tenant-split-id-refresh-token"));
+            assertNull(getSessionRtCookie(page.getWebClient(), "tenant-split-id-refresh-token"));
+
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    private void checkSingleTokenCookie(Cookie idTokenCookie, String type) {
+        String[] parts = idTokenCookie.getValue().split("\\|");
+        assertEquals(1, parts.length);
+        assertEquals(type, OidcUtils.decodeJwtContent(parts[0]).getString("typ"));
+    }
+
+    @Test
+    public void testAccessAndRefreshTokenInjectionWithoutIndexHtmlAndListener() throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/web-app/refresh/tenant-listener");
+
+            assertEquals("Sign in to quarkus", page.getTitleText());
+
+            HtmlForm loginForm = page.getForms().get(0);
+
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+
+            page = loginForm.getInputByName("login").click();
+
+            assertEquals("RT injected(event:OIDC_LOGIN,tenantId:tenant-listener,blockingApi:true)", page.getBody().asText());
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testAccessAndRefreshTokenInjectionWithQuery() throws Exception {
         try (final WebClient webClient = createWebClient()) {
             HtmlPage page = webClient.getPage("http://localhost:8081/web-app/refresh-query?a=aValue");
             assertEquals("/web-app/refresh-query?a=aValue", getStateCookieSavedPath(webClient, null));
 
-            assertEquals("Log in to quarkus", page.getTitleText());
+            assertEquals("Sign in to quarkus", page.getTitleText());
 
             HtmlForm loginForm = page.getForms().get(0);
 
@@ -501,11 +842,38 @@ public void testAccessAndRefreshTokenInjectionWithoutIndexHtmlWithQuery() throws
     }
 
     @Test
-    public void testXhrRequest() throws IOException, InterruptedException {
+    public void testRedirectUriWithForwardedPrefix() throws IOException, InterruptedException {
+        //doTestRedirectUriWithForwardedPrefix("/service");
+        doTestRedirectUriWithForwardedPrefix("/service/");
+        //doTestRedirectUriWithForwardedPrefix("");
+        //doTestRedirectUriWithForwardedPrefix("/");
+        //doTestRedirectUriWithForwardedPrefix("//");
+    }
+
+    private void doTestRedirectUriWithForwardedPrefix(String prefix) throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            webClient.getOptions().setRedirectEnabled(false);
+            webClient.addRequestHeader("X-Forwarded-Prefix", prefix);
+            WebResponse webResponse = webClient
+                    .loadWebResponse(new WebRequest(URI.create("http://localhost:8081/index.html").toURL()));
+            String loc = webResponse.getResponseHeaderValue("location");
+            String encodedPrefix;
+            if (prefix.isEmpty() || prefix.equals("/") || prefix.equals("//")) {
+                encodedPrefix = "%2F";
+            } else {
+                encodedPrefix = prefix.replaceAll("\\/", "%2F");
+            }
+            assertTrue(loc.contains("redirect_uri=http%3A%2F%2Flocalhost%3A8081" + encodedPrefix + "web-app"));
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testJavaScriptRequest() throws IOException, InterruptedException {
         try (final WebClient webClient = createWebClient()) {
             try {
-                webClient.addRequestHeader("X-Requested-With", "XMLHttpRequest");
-                webClient.getPage("http://localhost:8081/tenant-xhr");
+                webClient.addRequestHeader("X-Requested-With", "JavaScript");
+                webClient.getPage("http://localhost:8081/tenant-javascript");
                 fail("499 status error is expected");
             } catch (FailingHttpStatusCodeException ex) {
                 assertEquals(499, ex.getStatusCode());
@@ -516,6 +884,19 @@ public void testXhrRequest() throws IOException, InterruptedException {
         }
     }
 
+    @Test
+    public void testCookiePathHeader() throws IOException, InterruptedException {
+        try (final WebClient webClient = createWebClient()) {
+            webClient.getOptions().setRedirectEnabled(false);
+            webClient.addRequestHeader("X-Forwarded-Prefix", "/x-forwarded-prefix-value");
+            WebResponse webResponse = webClient
+                    .loadWebResponse(new WebRequest(URI.create("http://localhost:8081/tenant-cookie-path-header").toURL()));
+            assertEquals(302, webResponse.getStatusCode());
+            assertEquals("/x-forwarded-prefix-value", getStateCookie(webClient, "tenant-cookie-path-header").getPath());
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
     @Test
     public void testNoCodeFlowUnprotected() {
         RestAssured.when().get("/public-web-app/access")
@@ -547,6 +928,14 @@ private Cookie getSessionCookie(WebClient webClient, String tenantId) {
         return webClient.getCookieManager().getCookie("q_session" + (tenantId == null ? "" : "_" + tenantId));
     }
 
+    private Cookie getSessionAtCookie(WebClient webClient, String tenantId) {
+        return webClient.getCookieManager().getCookie("q_session_at" + (tenantId == null ? "" : "_" + tenantId));
+    }
+
+    private Cookie getSessionRtCookie(WebClient webClient, String tenantId) {
+        return webClient.getCookieManager().getCookie("q_session_rt" + (tenantId == null ? "" : "_" + tenantId));
+    }
+
     private String getIdToken(Cookie sessionCookie) {
         return sessionCookie.getValue().split("\\|")[0];
     }
diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
index bc49802bf10e1..6d5321ce0a42f 100644
--- a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
+++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -21,8 +21,8 @@
 
 public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
 
-    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
-    private static final String KEYCLOAK_REALM = "quarkus";
+    public static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    public static final String KEYCLOAK_REALM = "quarkus";
     private List<RealmRepresentation> realms = new ArrayList<>();
 
     @Override
diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/TestSecurityLazyAuthTest.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/TestSecurityLazyAuthTest.java
new file mode 100644
index 0000000000000..aaf566303e5da
--- /dev/null
+++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/TestSecurityLazyAuthTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.keycloak;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPEndpoint;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.security.TestSecurity;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@TestHTTPEndpoint(ProtectedResource.class)
+public class TestSecurityLazyAuthTest {
+
+    @Test
+    @TestSecurity(user = "user1", roles = "viewer")
+    public void testWithDummyUser() {
+        RestAssured.when().get("sec").then()
+                .body(is("user1"));
+    }
+
+}
diff --git a/integration-tests/oidc-tenancy/README.md b/integration-tests/oidc-tenancy/README.md
index 0fb20fef25488..a1cc260f3238f 100644
--- a/integration-tests/oidc-tenancy/README.md
+++ b/integration-tests/oidc-tenancy/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with Keycloak Server started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run Keycloak Server as a Docker container, you can start your own Keycloak server. It needs to listen on the default port `8180`.
@@ -21,7 +21,7 @@ If you don't want to run Keycloak Server as a Docker container, you can start yo
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-keycloak
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dkeycloak.url=http://keycloak.server.domain:8180/auth`.
diff --git a/integration-tests/oidc-tenancy/pom.xml b/integration-tests/oidc-tenancy/pom.xml
index 7f72e5f5f4e86..46040878b0837 100644
--- a/integration-tests/oidc-tenancy/pom.xml
+++ b/integration-tests/oidc-tenancy/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,6 +22,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-oidc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jackson</artifactId>
@@ -57,6 +60,47 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-build-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -98,7 +142,7 @@
             <id>test-keycloak</id>
             <activation>
                 <property>
-                    <name>test-keycloak</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -136,69 +180,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-keycloak</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -268,7 +254,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java
index 39d30bb5f48fc..84fbb66a62cb9 100644
--- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java
+++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantConfigResolver.java
@@ -3,6 +3,8 @@
 import javax.enterprise.context.ApplicationScoped;
 
 import io.quarkus.oidc.OidcTenantConfig;
+import io.quarkus.oidc.OidcTenantConfig.ApplicationType;
+import io.quarkus.oidc.OidcTenantConfig.Roles.Source;
 import io.quarkus.oidc.TenantConfigResolver;
 import io.vertx.ext.web.RoutingContext;
 
@@ -10,6 +12,12 @@
 public class CustomTenantConfigResolver implements TenantConfigResolver {
     @Override
     public OidcTenantConfig resolve(RoutingContext context) {
+        // Make sure this resolver is called only once during a given request
+        if (context.get("dynamic_config_resolved") != null) {
+            throw new RuntimeException();
+        }
+        context.put("dynamic_config_resolved", "true");
+
         String path = context.request().path();
         String tenantId = path.split("/")[2];
         if ("tenant-d".equals(tenantId)) {
@@ -19,6 +27,7 @@ public OidcTenantConfig resolve(RoutingContext context) {
             config.setClientId("quarkus-d");
             config.getCredentials().setSecret("secret");
             config.getToken().setIssuer(getIssuerUrl() + "/realms/quarkus-d");
+            config.getAuthentication().setUserInfoRequired(true);
             return config;
         } else if ("tenant-oidc".equals(tenantId)) {
             OidcTenantConfig config = new OidcTenantConfig();
@@ -40,6 +49,25 @@ public OidcTenantConfig resolve(RoutingContext context) {
             config.setJwksPath("jwks");
             config.setClientId("client");
             return config;
+        } else if ("tenant-oidc-no-introspection".equals(tenantId)) {
+            OidcTenantConfig config = new OidcTenantConfig();
+            config.setTenantId("tenant-oidc-no-introspection");
+            String uri = context.request().absoluteURI();
+            String authServerUri = uri.replace("/tenant/tenant-oidc-no-introspection/api/user", "/oidc");
+            config.setAuthServerUrl(authServerUri);
+            config.token.setAllowJwtIntrospection(false);
+            config.setClientId("client");
+            return config;
+        } else if ("tenant-web-app-dynamic".equals(tenantId)) {
+            OidcTenantConfig config = new OidcTenantConfig();
+            config.setTenantId("tenant-web-app-dynamic");
+            config.setAuthServerUrl(getIssuerUrl() + "/realms/quarkus-webapp");
+            config.setClientId("quarkus-app-webapp");
+            config.getCredentials().setSecret("secret");
+            config.getAuthentication().setUserInfoRequired(true);
+            config.getRoles().setSource(Source.userinfo);
+            config.setApplicationType(ApplicationType.WEB_APP);
+            return config;
         }
         return null;
     }
diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
index 0a62c660d97bf..0d6947562f813 100644
--- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
+++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
@@ -10,9 +10,20 @@ public class CustomTenantResolver implements TenantResolver {
 
     @Override
     public String resolve(RoutingContext context) {
+        // Make sure this resolver is called only once during a given request
+        if (context.get("static_config_resolved") != null) {
+            throw new RuntimeException();
+        }
+        context.put("static_config_resolved", "true");
+
         if (context.request().path().endsWith("/tenant-public-key")) {
             return "tenant-public-key";
         }
-        return context.request().path().split("/")[2];
+        String tenantId = context.request().path().split("/")[2];
+        if ("tenant-hybrid".equals(tenantId)) {
+            return context.request().getHeader("Authorization") != null ? "tenant-hybrid-service" : "tenant-hybrid-webapp";
+        }
+        return tenantId;
+
     }
 }
diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java
index e6664052078c9..0d4b3e0b2639c 100644
--- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java
+++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java
@@ -24,6 +24,7 @@ public class OidcResource {
     private volatile boolean introspection;
     private volatile boolean rotate;
     private volatile int jwkEndpointCallCount;
+    private volatile int introspectionEndpointCallCount;
 
     @PostConstruct
     public void init() throws Exception {
@@ -40,7 +41,7 @@ public String discovery() {
         final String baseUri = ui.getBaseUriBuilder().path("oidc").build().toString();
         return "{" +
                 "   \"token_endpoint\":" + "\"" + baseUri + "/token\"," +
-                "   \"token_introspection_endpoint\":" + "\"" + baseUri + "/introspect\"," +
+                "   \"introspection_endpoint\":" + "\"" + baseUri + "/introspect\"," +
                 "   \"jwks_uri\":" + "\"" + baseUri + "/jwks\"" +
                 "  }";
     }
@@ -73,12 +74,25 @@ public int resetJwkEndpointCallCount() {
         return jwkEndpointCallCount;
     }
 
+    @GET
+    @Path("introspection-endpoint-call-count")
+    public int introspectionEndpointCallCount() {
+        return introspectionEndpointCallCount;
+    }
+
+    @POST
+    @Path("introspection-endpoint-call-count")
+    public int resetIntrospectionEndpointCallCount() {
+        introspectionEndpointCallCount = 0;
+        return introspectionEndpointCallCount;
+    }
+
     @POST
     @Produces("application/json")
     @Path("introspect")
     public String introspect() {
-        // Introspect call will return an active token status only when the introspection is disallowed.
-        // This is done to test that an asynchronous JWK refresh call done by Vertx Auth is effective.
+        introspectionEndpointCallCount++;
+
         return "{" +
                 "   \"active\": " + introspection + "," +
                 "   \"scope\": \"user\"," +
@@ -107,28 +121,30 @@ public String opaqueToken(@QueryParam("kid") String kid) {
     }
 
     @POST
-    @Path("introspection")
+    @Path("enable-introspection")
     public boolean setIntrospection() {
         introspection = true;
         return introspection;
     }
 
-    @GET
-    @Path("introspection-status")
-    public boolean introspectionStatus() {
+    @POST
+    @Path("disable-introspection")
+    public boolean disableIntrospection() {
+        introspection = false;
         return introspection;
     }
 
     @POST
-    @Path("rotate")
+    @Path("enable-rotate")
     public boolean setRotate() {
         rotate = true;
         return rotate;
     }
 
-    @GET
-    @Path("rotate-status")
-    public boolean rotateStatus() {
+    @POST
+    @Path("disable-rotate")
+    public boolean disableRotate() {
+        rotate = false;
         return rotate;
     }
 
@@ -138,7 +154,7 @@ private String jwt(String kid) {
                 .upn("alice")
                 .preferredUserName("alice")
                 .groups("user")
-                .jws().signatureKeyId(kid)
+                .jws().keyId(kid)
                 .sign(key.getPrivateKey());
     }
 }
diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java
new file mode 100644
index 0000000000000..002e50a4243fd
--- /dev/null
+++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantHybridResource.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.quarkus.oidc.IdToken;
+
+@Path("/tenants")
+public class TenantHybridResource {
+    @Inject
+    @IdToken
+    JsonWebToken idToken;
+    @Inject
+    JsonWebToken accessToken;
+
+    @GET
+    @Path("/{tenant-hybrid}/api/user")
+    @RolesAllowed("user")
+    public String userNameService() {
+        return idToken.getName() != null ? (idToken.getName() + ":web-app") : (accessToken.getName() + ":service");
+    }
+}
diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java
index a6c3f436f2c73..08a9e6573719b 100644
--- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java
+++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/TenantResource.java
@@ -6,6 +6,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
+import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
 
 import io.quarkus.arc.Arc;
@@ -37,27 +38,56 @@ public String userNameService(@PathParam("tenant") String tenant) {
         if (tenant.startsWith("tenant-web-app")) {
             throw new OIDCException("Wrong tenant");
         }
-        return tenant + ":" + getNameServiceType();
+        String name = getNameServiceType();
+        if ("tenant-d".equals(tenant) || "tenant-b-no-discovery".equals(tenant)) {
+            UserInfo userInfo = getUserInfo();
+            if (!userInfo.contains(Claims.sub.name())) {
+                throw new OIDCException("UserInfo returned from Keycloak must contain 'sub'");
+            }
+            if (userInfo.getPropertyNames().contains(Claims.preferred_username.name())) {
+                name = name + "." + userInfo.getString(Claims.preferred_username.name());
+            }
+        }
+        return tenant + ":" + name;
+    }
+
+    @GET
+    @RolesAllowed("user")
+    @Path("no-discovery")
+    public String userNameServiceNoDiscovery(@PathParam("tenant") String tenant) {
+        return userNameService(tenant);
     }
 
     @GET
     @Path("webapp")
     @RolesAllowed("user")
     public String userNameWebApp(@PathParam("tenant") String tenant) {
-        if (!tenant.equals("tenant-web-app")) {
+        if (!tenant.equals("tenant-web-app") && !tenant.equals("tenant-web-app-dynamic")
+                && !tenant.equals("tenant-web-app-no-discovery")) {
             throw new OIDCException("Wrong tenant");
         }
-        if (!(securityIdentity.getAttribute("userinfo") instanceof UserInfo)) {
-            throw new OIDCException("userinfo attribute muset be set");
-        }
-        // Not injecting in the service field as not all tenants require it
-        UserInfo userInfo = Arc.container().instance(UserInfo.class).get();
+        UserInfo userInfo = getUserInfo();
         if (!idToken.getGroups().contains("user")) {
             throw new OIDCException("Groups expected");
         }
         return tenant + ":" + getNameWebAppType(userInfo.getString("upn"), "upn", "preferred_username");
     }
 
+    @GET
+    @Path("webapp-no-discovery")
+    @RolesAllowed("user")
+    public String userNameWebAppNoDiscovery(@PathParam("tenant") String tenant) {
+        return userNameWebApp(tenant);
+    }
+
+    private UserInfo getUserInfo() {
+        if (!(securityIdentity.getAttribute("userinfo") instanceof UserInfo)) {
+            throw new OIDCException("userinfo attribute must be set");
+        }
+        // Not injecting in the service field as not all tenants require it
+        return Arc.container().instance(UserInfo.class).get();
+    }
+
     @GET
     @Path("webapp2")
     @RolesAllowed("user")
diff --git a/integration-tests/oidc-tenancy/src/main/resources/application.properties b/integration-tests/oidc-tenancy/src/main/resources/application.properties
index 8d1724d1d4939..423fc054a1d0b 100644
--- a/integration-tests/oidc-tenancy/src/main/resources/application.properties
+++ b/integration-tests/oidc-tenancy/src/main/resources/application.properties
@@ -4,21 +4,31 @@ quarkus.http.cors=true
 quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus-a
 quarkus.oidc.client-id=quarkus-app-a
 quarkus.oidc.credentials.secret=secret
-quarkus.oidc.tenant-web-app.application-type=service
+quarkus.oidc.application-type=service
 
 # Tenant B
 quarkus.oidc.tenant-b.auth-server-url=${keycloak.url}/realms/quarkus-b
 quarkus.oidc.tenant-b.client-id=quarkus-app-b
 quarkus.oidc.tenant-b.credentials.secret=secret
 quarkus.oidc.tenant-b.token.issuer=${keycloak.url}/realms/quarkus-b
-quarkus.oidc.tenant-web-app.application-type=service
+quarkus.oidc.tenant-b.application-type=service
+
+# Tenant B Service No Discovery (Introspection + User Info)
+quarkus.oidc.tenant-b-no-discovery.auth-server-url=${keycloak.url}/realms/quarkus-b
+quarkus.oidc.tenant-b-no-discovery.discovery-enabled=false
+quarkus.oidc.tenant-b-no-discovery.user-info-path=/protocol/openid-connect/userinfo
+quarkus.oidc.tenant-b-no-discovery.introspection-path=protocol/openid-connect/token/introspect
+quarkus.oidc.tenant-b-no-discovery.client-id=quarkus-app-b
+quarkus.oidc.tenant-b-no-discovery.credentials.secret=secret
+quarkus.oidc.tenant-b-no-discovery.application-type=service
+quarkus.oidc.tenant-b-no-discovery.authentication.user-info-required=true
 
 # Tenant C
 quarkus.oidc.tenant-c.auth-server-url=${keycloak.url}/realms/quarkus-c
 quarkus.oidc.tenant-c.client-id=quarkus-app-c
 quarkus.oidc.tenant-c.credentials.secret=secret
 quarkus.oidc.tenant-c.token.audience=${keycloak.url}/realms/quarkus-c
-quarkus.oidc.tenant-web-app.application-type=service
+quarkus.oidc.tenant-c.application-type=service
 
 # Tenant Web App
 quarkus.oidc.tenant-web-app.auth-server-url=${keycloak.url}/realms/quarkus-webapp
@@ -28,6 +38,20 @@ quarkus.oidc.tenant-web-app.application-type=web-app
 quarkus.oidc.tenant-web-app.authentication.user-info-required=true
 quarkus.oidc.tenant-web-app.roles.source=userinfo
 
+# Tenant Web App No Discovery (Introspection + User Info)
+quarkus.oidc.tenant-web-app-no-discovery.auth-server-url=${keycloak.url}/realms/quarkus-webapp
+quarkus.oidc.tenant-web-app-no-discovery.discovery-enabled=false
+quarkus.oidc.tenant-web-app-no-discovery.authorization-path=/protocol/openid-connect/auth
+quarkus.oidc.tenant-web-app-no-discovery.token-path=/protocol/openid-connect/token
+quarkus.oidc.tenant-web-app-no-discovery.user-info-path=/protocol/openid-connect/userinfo
+quarkus.oidc.tenant-web-app-no-discovery.introspection-path=protocol/openid-connect/token/introspect
+#quarkus.oidc.tenant-web-app-no-discovery.jwks-path=/protocol/openid-connect/certs
+quarkus.oidc.tenant-web-app-no-discovery.client-id=quarkus-app-webapp
+quarkus.oidc.tenant-web-app-no-discovery.credentials.secret=secret
+quarkus.oidc.tenant-web-app-no-discovery.application-type=web-app
+quarkus.oidc.tenant-web-app-no-discovery.authentication.user-info-required=true
+quarkus.oidc.tenant-web-app-no-discovery.roles.source=userinfo
+
 # Tenant Web App2
 quarkus.oidc.tenant-web-app2.auth-server-url=${keycloak.url}/realms/quarkus-webapp2
 quarkus.oidc.tenant-web-app2.client-id=quarkus-app-webapp2
@@ -35,7 +59,35 @@ quarkus.oidc.tenant-web-app2.credentials.secret=secret
 quarkus.oidc.tenant-web-app2.application-type=web-app
 quarkus.oidc.tenant-web-app2.roles.source=accesstoken
 
+# Tenant Hybrid Service
+quarkus.oidc.tenant-hybrid-service.auth-server-url=${keycloak.url}/realms/quarkus-hybrid
+quarkus.oidc.tenant-hybrid-service.client-id=quarkus-app-hybrid
+quarkus.oidc.tenant-hybrid-service.credentials.secret=secret
+quarkus.oidc.tenant-hybrid-service.application-type=service
+
+# Tenant Hybrid Web-App
+quarkus.oidc.tenant-hybrid-webapp.auth-server-url=${keycloak.url}/realms/quarkus-hybrid
+quarkus.oidc.tenant-hybrid-webapp.client-id=quarkus-app-hybrid
+quarkus.oidc.tenant-hybrid-webapp.credentials.secret=secret
+quarkus.oidc.tenant-hybrid-webapp.application-type=web-app
+
+# Tenant Hybrid Web-App Service
+quarkus.oidc.tenant-hybrid-webapp-service.auth-server-url=${keycloak.url}/realms/quarkus-hybrid
+quarkus.oidc.tenant-hybrid-webapp-service.client-id=quarkus-app-hybrid
+quarkus.oidc.tenant-hybrid-webapp-service.credentials.secret=secret
+quarkus.oidc.tenant-hybrid-webapp-service.application-type=hybrid
+
+# Custom header
+quarkus.oidc.tenant-customheader.auth-server-url=${keycloak.url}/realms/quarkus-b
+quarkus.oidc.tenant-customheader.client-id=quarkus-app-b
+quarkus.oidc.tenant-customheader.credentials.secret=secret
+quarkus.oidc.tenant-customheader.token.header=X-Forwarded-Authorization
+quarkus.oidc.tenant-customheader.application-type=service
+
+
 quarkus.oidc.tenant-public-key.client-id=test
 quarkus.oidc.tenant-public-key.public-key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlivFI8qB4D0y2jy0CfEqFyy46R0o7S8TKpsx5xbHKoU1VWg6QkQm+ntyIv1p4kE1sPEQO73+HY8+Bzs75XwRTYL1BmR1w8J5hmjVWjc6R2BTBGAYRPFRhor3kpM6ni2SPmNNhurEAHw7TaqszP5eUF/F9+KEBWkwVta+PZ37bwqSE4sCb1soZFrVz/UT/LF4tYpuVYt3YbqToZ3pZOZ9AX2o1GCG3xwOjkc4x0W7ezbQZdC9iftPxVHR8irOijJRRjcPDtA6vPKpzLl6CyYnsIYPd99ltwxTHjr3npfv/3Lw50bAkbT4HeLFxTx4flEoZLKO/g0bAoV2uqBhkA9xnQIDAQAB
 
 smallrye.jwt.sign.key-location=/privateKey.pem
+
+quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL
diff --git a/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java b/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
index 2d4ab1c497c7e..ab0629e3e3660 100644
--- a/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
+++ b/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
@@ -1,14 +1,11 @@
 package io.quarkus.it.keycloak;
 
-import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.IOException;
-import java.time.Duration;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 import org.keycloak.representations.AccessTokenResponse;
@@ -22,7 +19,6 @@
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import io.restassured.response.Response;
 import io.vertx.core.json.JsonObject;
 
 /**
@@ -42,7 +38,7 @@ public void testResolveTenantIdentifierWebApp() throws IOException {
             // State cookie is available but there must be no saved path parameter
             // as the tenant-web-app configuration does not set a redirect-path property
             assertNull(getStateCookieSavedPath(webClient, "tenant-web-app"));
-            assertEquals("Log in to quarkus-webapp", page.getTitleText());
+            assertEquals("Sign in to quarkus-webapp", page.getTitleText());
             HtmlForm loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -59,7 +55,7 @@ public void testResolveTenantIdentifierWebApp2() throws IOException {
             // State cookie is available but there must be no saved path parameter
             // as the tenant-web-app configuration does not set a redirect-path property
             assertNull(getStateCookieSavedPath(webClient, "tenant-web-app2"));
-            assertEquals("Log in to quarkus-webapp2", page.getTitleText());
+            assertEquals("Sign in to quarkus-webapp2", page.getTitleText());
             HtmlForm loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -69,13 +65,78 @@ public void testResolveTenantIdentifierWebApp2() throws IOException {
         }
     }
 
+    @Test
+    public void testHybridWebApp() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/tenants/tenant-hybrid/api/user");
+            assertNotNull(getStateCookie(webClient, "tenant-hybrid-webapp"));
+            assertEquals("Sign in to quarkus-hybrid", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+            page = loginForm.getInputByName("login").click();
+            assertEquals("alice:web-app", page.getBody().asText());
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
+    @Test
+    public void testHybridService() {
+        RestAssured.given().auth().oauth2(getAccessToken("alice", "hybrid"))
+                .when().get("/tenants/tenant-hybrid/api/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice:service"));
+    }
+
+    @Test
+    public void testHybridWebAppService() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/tenants/tenant-hybrid-webapp-service/api/user");
+            assertNotNull(getStateCookie(webClient, "tenant-hybrid-webapp-service"));
+            assertEquals("Sign in to quarkus-hybrid", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+            page = loginForm.getInputByName("login").click();
+            assertEquals("alice:web-app", page.getBody().asText());
+            webClient.getCookieManager().clearCookies();
+        }
+        RestAssured.given().auth().oauth2(getAccessToken("alice", "hybrid"))
+                .when().get("/tenants/tenant-hybrid-webapp-service/api/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice:service"));
+    }
+
+    @Test
+    public void testResolveTenantIdentifierWebAppNoDiscovery() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient
+                    .getPage("http://localhost:8081/tenant/tenant-web-app-no-discovery/api/user/webapp-no-discovery");
+            // State cookie is available but there must be no saved path parameter
+            // as the tenant-web-app configuration does not set a redirect-path property
+            assertNull(getStateCookieSavedPath(webClient, "tenant-web-app-no-discovery"));
+            assertEquals("Sign in to quarkus-webapp", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+            page = loginForm.getInputByName("login").click();
+            assertEquals("tenant-web-app-no-discovery:alice", page.getBody().asText());
+
+            page = webClient.getPage("http://localhost:8081/tenant/tenant-web-app-no-discovery/api/user/webapp-no-discovery");
+            assertEquals("tenant-web-app-no-discovery:alice", page.getBody().asText());
+            webClient.getCookieManager().clearCookies();
+        }
+    }
+
     @Test
     public void testReAuthenticateWhenSwitchingTenants() throws IOException {
         try (final WebClient webClient = createWebClient()) {
             // tenant-web-app
             HtmlPage page = webClient.getPage("http://localhost:8081/tenant/tenant-web-app/api/user/webapp");
             assertNull(getStateCookieSavedPath(webClient, "tenant-web-app"));
-            assertEquals("Log in to quarkus-webapp", page.getTitleText());
+            assertEquals("Sign in to quarkus-webapp", page.getTitleText());
             HtmlForm loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -84,7 +145,7 @@ public void testReAuthenticateWhenSwitchingTenants() throws IOException {
             // tenant-web-app2
             page = webClient.getPage("http://localhost:8081/tenant/tenant-web-app2/api/user/webapp2");
             assertNull(getStateCookieSavedPath(webClient, "tenant-web-app2"));
-            assertEquals("Log in to quarkus-webapp2", page.getTitleText());
+            assertEquals("Sign in to quarkus-webapp2", page.getTitleText());
             loginForm = page.getForms().get(0);
             loginForm.getInputByName("username").setValueAttribute("alice");
             loginForm.getInputByName("password").setValueAttribute("alice");
@@ -110,13 +171,47 @@ public void testResolveTenantIdentifier() {
                 .statusCode(401);
     }
 
+    @Test
+    public void testCustomHeader() {
+        RestAssured.given().header("X-Forwarded-Authorization", getAccessToken("alice", "b"))
+                .when().get("/tenant/tenant-customheader/api/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("tenant-customheader:alice"));
+    }
+
+    @Test
+    public void testCustomHeaderBearerScheme() {
+        RestAssured.given().header("X-Forwarded-Authorization", "Bearer " + getAccessToken("alice", "b"))
+                .when().get("/tenant/tenant-customheader/api/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("tenant-customheader:alice"));
+    }
+
+    @Test
+    public void testWrongCustomHeader() {
+        RestAssured.given().header("X-Authorization", getAccessToken("alice", "b"))
+                .when().get("/tenant/tenant-customheader/api/user")
+                .then()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testCustomHeaderCustomScheme() {
+        RestAssured.given().header("X-Forwarded-Authorization", "DPoP " + getAccessToken("alice", "b"))
+                .when().get("/tenant/tenant-customheader/api/user")
+                .then()
+                .statusCode(401);
+    }
+
     @Test
     public void testResolveTenantConfig() {
         RestAssured.given().auth().oauth2(getAccessToken("alice", "d"))
                 .when().get("/tenant/tenant-d/api/user")
                 .then()
                 .statusCode(200)
-                .body(equalTo("tenant-d:alice"));
+                .body(equalTo("tenant-d:alice.alice"));
 
         // should give a 401 given that access token from issuer b can not access tenant c
         RestAssured.given().auth().oauth2(getAccessToken("alice", "b"))
@@ -125,6 +220,15 @@ public void testResolveTenantConfig() {
                 .statusCode(401);
     }
 
+    @Test
+    public void testResolveTenantConfigNoDiscovery() {
+        RestAssured.given().auth().oauth2(getAccessToken("alice", "b"))
+                .when().get("/tenant/tenant-b-no-discovery/api/user/no-discovery")
+                .then()
+                .statusCode(200)
+                .body(equalTo("tenant-b-no-discovery:alice.alice"));
+    }
+
     @Test
     public void testDefaultTenant() {
         // any non-extent tenant should accept tokens from tenant a
@@ -138,23 +242,11 @@ public void testDefaultTenant() {
     @Test
     public void testSimpleOidcJwtWithJwkRefresh() {
         RestAssured.when().post("/oidc/jwk-endpoint-call-count").then().body(equalTo("0"));
-        RestAssured.when().get("/oidc/introspection-status").then().body(equalTo("false"));
-        RestAssured.when().get("/oidc/rotate-status").then().body(equalTo("false"));
+        RestAssured.when().post("/oidc/introspection-endpoint-call-count").then().body(equalTo("0"));
+        RestAssured.when().post("/oidc/disable-introspection").then().body(equalTo("false"));
         // Quarkus OIDC is initialized with JWK set with kid '1' as part of the discovery process
         // Now enable the rotation
-        RestAssured.when().post("/oidc/rotate").then().body(equalTo("true"));
-
-        // OIDC server will have a refreshed JWK set with kid '2', 200 is expected even though the introspection fallback is disabled.
-        await().atMost(5, TimeUnit.SECONDS)
-                .pollInterval(Duration.ofSeconds(1))
-                .until(new Callable<Boolean>() {
-                    @Override
-                    public Boolean call() throws Exception {
-                        Response r = RestAssured.given().auth().oauth2(getAccessTokenFromSimpleOidc("2"))
-                                .when().get("/tenant/tenant-oidc/api/user");
-                        return r.getStatusCode() == 200;
-                    }
-                });
+        RestAssured.when().post("/oidc/enable-rotate").then().body(equalTo("true"));
 
         // JWK is available now in Quarkus OIDC, confirm that no timeout is needed 
         RestAssured.given().auth().oauth2(getAccessTokenFromSimpleOidc("2"))
@@ -171,7 +263,7 @@ public Boolean call() throws Exception {
                 .statusCode(401);
 
         // Enable introspection
-        RestAssured.when().post("/oidc/introspection").then().body(equalTo("true"));
+        RestAssured.when().post("/oidc/enable-introspection").then().body(equalTo("true"));
         // No timeout is required
         RestAssured.given().auth().oauth2(getAccessTokenFromSimpleOidc("3"))
                 .when().get("/tenant/tenant-oidc/api/user")
@@ -186,17 +278,52 @@ public Boolean call() throws Exception {
                 .statusCode(200)
                 .body(equalTo("tenant-oidc-opaque:alice"));
 
-        // OIDC JWK endpoint must've been called only twice, once as part of the Quarkus OIDC/Vertx Auth initialization
+        // OIDC JWK endpoint must've been called only twice, once as part of the Quarkus OIDC initialization
+        // and once during the 1st request with a token kid '2', follow up requests must've been blocked due to the interval
+        // restrictions
+        RestAssured.when().get("/oidc/jwk-endpoint-call-count").then().body(equalTo("2"));
+        // both requests with kid `3` and with the opaque token required the remote introspection
+        RestAssured.when().get("/oidc/introspection-endpoint-call-count").then().body(equalTo("3"));
+        RestAssured.when().post("/oidc/disable-rotate").then().body(equalTo("false"));
+    }
+
+    @Test
+    public void testJwtTokenIntrospectionDisallowed() {
+        RestAssured.when().post("/oidc/jwk-endpoint-call-count").then().body(equalTo("0"));
+        RestAssured.when().post("/oidc/introspection-endpoint-call-count").then().body(equalTo("0"));
+        RestAssured.when().post("/oidc/disable-introspection").then().body(equalTo("false"));
+        // Quarkus OIDC is initialized with JWK set with kid '1' as part of the discovery process
+        // Now enable the rotation
+        RestAssured.when().post("/oidc/enable-rotate").then().body(equalTo("true"));
+
+        // JWK is available now in Quarkus OIDC, confirm that no timeout is needed 
+        RestAssured.given().auth().oauth2(getAccessTokenFromSimpleOidc("2"))
+                .when().get("/tenant/tenant-oidc-no-introspection/api/user")
+                .then()
+                .statusCode(200)
+                .body(equalTo("tenant-oidc-no-introspection:alice"));
+
+        // Enable OIDC introspection endpoint
+        RestAssured.when().post("/oidc/enable-introspection").then().body(equalTo("true"));
+        RestAssured.given().auth().oauth2(getAccessTokenFromSimpleOidc("3"))
+                .when().get("/tenant/tenant-oidc-no-introspection/api/user")
+                .then()
+                .statusCode(401);
+
+        // OIDC JWK endpoint must've been called only twice, once as part of the Quarkus OIDC initialization
         // and once during the 1st request with a token kid '2', follow up requests must've been blocked due to the interval
         // restrictions
         RestAssured.when().get("/oidc/jwk-endpoint-call-count").then().body(equalTo("2"));
+        // JWT introspection is disallowed
+        RestAssured.when().get("/oidc/introspection-endpoint-call-count").then().body(equalTo("0"));
+        RestAssured.when().post("/oidc/disable-rotate").then().body(equalTo("false"));
     }
 
     @Test
     public void testSimpleOidcNoDiscovery() {
         RestAssured.when().post("/oidc/jwk-endpoint-call-count").then().body(equalTo("0"));
-        RestAssured.when().get("/oidc/introspection-status").then().body(equalTo("false"));
-        RestAssured.when().get("/oidc/rotate-status").then().body(equalTo("false"));
+        RestAssured.when().post("/oidc/disable-introspection").then().body(equalTo("false"));
+        RestAssured.when().post("/oidc/disable-rotate").then().body(equalTo("false"));
 
         // Quarkus OIDC is initialized with JWK set with kid '1' as part of the initialization process
         RestAssured.given().auth().oauth2(getAccessTokenFromSimpleOidc("1"))
@@ -205,6 +332,24 @@ public void testSimpleOidcNoDiscovery() {
                 .statusCode(200)
                 .body(equalTo("tenant-oidc-no-discovery:alice"));
         RestAssured.when().get("/oidc/jwk-endpoint-call-count").then().body(equalTo("1"));
+        RestAssured.when().get("/oidc/introspection-endpoint-call-count").then().body(equalTo("0"));
+    }
+
+    @Test
+    public void testResolveTenantIdentifierWebAppDynamic() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            HtmlPage page = webClient.getPage("http://localhost:8081/tenant/tenant-web-app-dynamic/api/user/webapp");
+            // State cookie is available but there must be no saved path parameter
+            // as the tenant-web-app-dynamic configuration does not set a redirect-path property
+            assertNull(getStateCookieSavedPath(webClient, "tenant-web-app-dynamic"));
+            assertEquals("Sign in to quarkus-webapp", page.getTitleText());
+            HtmlForm loginForm = page.getForms().get(0);
+            loginForm.getInputByName("username").setValueAttribute("alice");
+            loginForm.getInputByName("password").setValueAttribute("alice");
+            page = loginForm.getInputByName("login").click();
+            assertEquals("tenant-web-app-dynamic:alice", page.getBody().asText());
+            webClient.getCookieManager().clearCookies();
+        }
     }
 
     private String getAccessToken(String userName, String clientId) {
diff --git a/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
index bcd0bcf26125f..6cd30e10fafb0 100644
--- a/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
+++ b/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -26,7 +26,7 @@ public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycl
 
     @Override
     public Map<String, String> start() {
-        for (String realmId : Arrays.asList("a", "b", "c", "d", "webapp", "webapp2")) {
+        for (String realmId : Arrays.asList("a", "b", "c", "d", "webapp", "webapp2", "hybrid")) {
             RealmRepresentation realm = createRealm(KEYCLOAK_REALM + realmId);
 
             realm.getClients().add(createClient("quarkus-app-" + realmId));
@@ -92,10 +92,10 @@ private static ClientRepresentation createClient(String clientId) {
         client.setDirectAccessGrantsEnabled(true);
         client.setEnabled(true);
         client.setDefaultRoles(new String[] { "role-" + clientId });
-        if (clientId.startsWith("quarkus-app-webapp")) {
+        if (clientId.startsWith("quarkus-app-webapp") || clientId.equals("quarkus-app-hybrid")) {
             client.setRedirectUris(Arrays.asList("*"));
         }
-        if (clientId.equals("quarkus-app-webapp")) {
+        if (clientId.equals("quarkus-app-webapp") || clientId.equals("quarkus-app-hybrid")) {
             // This instructs Keycloak to include the roles with the ID token too
             client.setDefaultClientScopes(Arrays.asList("microprofile-jwt"));
         }
@@ -123,7 +123,7 @@ private static UserRepresentation createUser(String username, String... realmRol
 
     @Override
     public void stop() {
-        for (String realmId : Arrays.asList("a", "b", "c", "d", "webapp", "webapp2")) {
+        for (String realmId : Arrays.asList("a", "b", "c", "d", "webapp", "webapp2", "hybrid")) {
             RestAssured
                     .given()
                     .auth().oauth2(getAdminAccessToken())
diff --git a/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/ServicePublicKeyTestCase.java b/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/ServicePublicKeyTestCase.java
index 859134a6c93e3..e4500c1c98a6e 100644
--- a/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/ServicePublicKeyTestCase.java
+++ b/integration-tests/oidc-tenancy/src/test/java/io/quarkus/it/keycloak/ServicePublicKeyTestCase.java
@@ -1,6 +1,7 @@
 package io.quarkus.it.keycloak;
 
 import java.io.IOException;
+import java.time.Instant;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -30,4 +31,14 @@ public void testModifiedSignature() throws IOException, InterruptedException {
                 .get("/service/tenant-public-key");
         Assertions.assertEquals(401, r.getStatusCode());
     }
+
+    @Test
+    public void testExpiredToken() throws IOException, InterruptedException {
+        String jwt = Jwt.claims().preferredUserName("alice").expiresAt(Instant.EPOCH).sign();
+        // the last section of the jwt token is a signature
+        Response r = RestAssured.given().auth()
+                .oauth2(jwt)
+                .get("/service/tenant-public-key");
+        Assertions.assertEquals(401, r.getStatusCode());
+    }
 }
diff --git a/integration-tests/oidc-token-propagation/pom.xml b/integration-tests/oidc-token-propagation/pom.xml
new file mode 100644
index 0000000000000..109801f856868
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/pom.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-oidc-token-propagation</artifactId>
+    <name>Quarkus - Integration Tests - OpenID Connect Token Propagation</name>
+    <description>Module that contains OpenID Connect Token Propagation tests</description>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-token-propagation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-client-filter-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-keycloak</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-keycloak</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <keycloak.url>http://localhost:8180/auth</keycloak.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${keycloak.docker.image}</name>
+                                    <alias>quarkus-test-keycloak</alias>
+                                    <run>
+                                        <ports>
+                                            <port>8180:8080</port>
+                                        </ports>
+                                        <env>
+                                            <KEYCLOAK_USER>admin</KEYCLOAK_USER>
+                                            <KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
+                                        </env>
+                                        <log>
+                                            <prefix>Keycloak:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
+                                            <http>
+                                                <url>http://localhost:8180</url>
+                                            </http>
+                                            <time>100000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java
new file mode 100644
index 0000000000000..a85798bfccdbd
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.token.propagation.AccessToken;
+
+@RegisterRestClient
+@AccessToken
+@Path("/")
+public interface AccessTokenPropagationService {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
new file mode 100644
index 0000000000000..24b1004ec0947
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
@@ -0,0 +1,43 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendResource {
+    @Inject
+    @RestClient
+    JwtTokenPropagationService jwtTokenPropagationService;
+
+    @Inject
+    @RestClient
+    AccessTokenPropagationService accessTokenPropagationService;
+
+    @Inject
+    @RestClient
+    ServiceAccountService serviceAccountService;
+
+    @GET
+    @Path("jwt-token-propagation")
+    @RolesAllowed("user")
+    public String userNameJwtTokenPropagation() {
+        return jwtTokenPropagationService.getUserName();
+    }
+
+    @GET
+    @Path("access-token-propagation")
+    @RolesAllowed("user")
+    public String userNameAccessTokenPropagation() {
+        return accessTokenPropagationService.getUserName();
+    }
+
+    @GET
+    @Path("service-account")
+    public String userNameServiceAccount() {
+        return serviceAccountService.getUserName();
+    }
+}
diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java
new file mode 100644
index 0000000000000..c5c8b87eb9545
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.token.propagation.JsonWebToken;
+
+@RegisterRestClient
+@JsonWebToken
+@Path("/")
+public interface JwtTokenPropagationService {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
new file mode 100644
index 0000000000000..b99056445fdee
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.keycloak;
+
+import java.security.Principal;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/protected")
+@Authenticated
+public class ProtectedResource {
+
+    @Inject
+    Principal principal;
+
+    @GET
+    @RolesAllowed("user")
+    public String principalName() {
+        return principal.getName();
+    }
+}
diff --git a/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java
new file mode 100644
index 0000000000000..014fcdee418d6
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/main/java/io/quarkus/it/keycloak/ServiceAccountService.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.client.filter.OidcClientFilter;
+
+@RegisterRestClient
+@OidcClientFilter
+@Path("/")
+public interface ServiceAccountService {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/oidc-token-propagation/src/main/resources/application.properties b/integration-tests/oidc-token-propagation/src/main/resources/application.properties
new file mode 100644
index 0000000000000..8d813f9172cbe
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+
+quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
+quarkus.oidc-client.credentials.secret=${quarkus.oidc.credentials.secret}
+quarkus.oidc-client.grant.type=password
+quarkus.oidc-client.grant-options.password.username=bob
+quarkus.oidc-client.grant-options.password.password=bob
+
+io.quarkus.it.keycloak.JwtTokenPropagationService/mp-rest/uri=http://localhost:8081/protected
+io.quarkus.it.keycloak.AccessTokenPropagationService/mp-rest/uri=http://localhost:8081/protected
+io.quarkus.it.keycloak.ServiceAccountService/mp-rest/uri=http://localhost:8081/protected
+
diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
new file mode 100644
index 0000000000000..f2fbe961d02cb
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -0,0 +1,142 @@
+package io.quarkus.it.keycloak;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RoleRepresentation;
+import org.keycloak.representations.idm.RolesRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus";
+
+    @Override
+    public Map<String, String> start() {
+
+        RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setAccessTokenLifespan(3);
+
+        realm.getClients().add(createClient("quarkus-app"));
+        realm.getUsers().add(createUser("alice", "user"));
+        realm.getUsers().add(createUser("bob", "user"));
+
+        try {
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setUsers(new ArrayList<>());
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+
+        RolesRepresentation roles = new RolesRepresentation();
+        List<RoleRepresentation> realmRoles = new ArrayList<>();
+
+        roles.setRealm(realmRoles);
+        realm.setRoles(roles);
+
+        realm.getRoles().getRealm().add(new RoleRepresentation("user", null, false));
+        realm.getRoles().getRealm().add(new RoleRepresentation("admin", null, false));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static UserRepresentation createUser(String username, String... realmRoles) {
+        UserRepresentation user = new UserRepresentation();
+
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setCredentials(new ArrayList<>());
+        user.setRealmRoles(Arrays.asList(realmRoles));
+        user.setEmail(username + "@gmail.com");
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+
+        credential.setType(CredentialRepresentation.PASSWORD);
+        credential.setValue(username);
+        credential.setTemporary(false);
+
+        user.getCredentials().add(credential);
+
+        return user;
+    }
+
+    @Override
+    public void stop() {
+
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).then().statusCode(204);
+    }
+
+    public static String getAccessToken(String userName) {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", userName)
+                .param("password", userName)
+                .param("client_id", "quarkus-app")
+                .param("client_secret", "secret")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/" + KEYCLOAK_REALM + "/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+}
diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationInGraalITCase.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationInGraalITCase.java
new file mode 100644
index 0000000000000..01ee8ab1acbd6
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class OidcTokenPropagationInGraalITCase extends OidcTokenPropagationTest {
+}
diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
new file mode 100644
index 0000000000000..836310c666edb
--- /dev/null
+++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
@@ -0,0 +1,40 @@
+package io.quarkus.it.keycloak;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@QuarkusTestResource(KeycloakRealmResourceManager.class)
+public class OidcTokenPropagationTest {
+
+    @Test
+    public void testGetUserNameWithJwtTokenPropagation() {
+        RestAssured.given().auth().oauth2(KeycloakRealmResourceManager.getAccessToken("alice"))
+                .when().get("/frontend/jwt-token-propagation")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+    }
+
+    @Test
+    public void testGetUserNameWithAccessTokenPropagation() {
+        RestAssured.given().auth().oauth2(KeycloakRealmResourceManager.getAccessToken("alice"))
+                .when().get("/frontend/access-token-propagation")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+    }
+
+    @Test
+    public void testGetUserNameFromServiceAccount() {
+        RestAssured.when().get("/frontend/service-account")
+                .then()
+                .statusCode(200)
+                .body(equalTo("bob"));
+    }
+}
diff --git a/integration-tests/oidc-wiremock/pom.xml b/integration-tests/oidc-wiremock/pom.xml
new file mode 100644
index 0000000000000..d09aa282c5451
--- /dev/null
+++ b/integration-tests/oidc-wiremock/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-oidc-wiremock</artifactId>
+    <name>Quarkus - Integration Tests - OpenID Connect Adapter WireMock</name>
+    <description>Module that contains OpenID Connect related tests using WireMock</description>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId> jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <keycloak.url>${keycloak.url}</keycloak.url>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <keycloak.url>${keycloak.url}</keycloak.url>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java
new file mode 100644
index 0000000000000..9acb280304b3d
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/AdminResource.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.security.identity.SecurityIdentity;
+
+/**
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+@Path("/api/admin")
+public class AdminResource {
+
+    @Inject
+    SecurityIdentity identity;
+
+    @GET
+    @RolesAllowed("admin")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String admin() {
+        return "granted:" + identity.getRoles();
+    }
+}
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java
new file mode 100644
index 0000000000000..cd68880ea8552
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CodeFlowResource.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.keycloak;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.security.Authenticated;
+import io.quarkus.security.identity.SecurityIdentity;
+
+@Path("/code-flow")
+@Authenticated
+public class CodeFlowResource {
+
+    @Inject
+    SecurityIdentity identity;
+
+    @GET
+    public String access() {
+        return identity.getPrincipal().getName();
+    }
+}
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
new file mode 100644
index 0000000000000..4b8c71899a984
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/CustomTenantResolver.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.keycloak;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.oidc.TenantResolver;
+import io.vertx.ext.web.RoutingContext;
+
+@ApplicationScoped
+public class CustomTenantResolver implements TenantResolver {
+
+    @Override
+    public String resolve(RoutingContext context) {
+        String path = context.normalisedPath();
+        if (path.endsWith("code-flow")) {
+            return "code-flow";
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java
new file mode 100644
index 0000000000000..439507da2fcd7
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueAdminResource.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.security.identity.SecurityIdentity;
+
+/**
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+@Path("/opaque/api/admin")
+public class OpaqueAdminResource {
+
+    @Inject
+    SecurityIdentity identity;
+
+    @GET
+    @RolesAllowed("admin")
+    @Produces(MediaType.APPLICATION_JSON)
+    public String admin() {
+        return "granted:" + identity.getRoles();
+    }
+}
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java
new file mode 100644
index 0000000000000..4beaad95f4910
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/OpaqueUsersResource.java
@@ -0,0 +1,38 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.it.keycloak.model.User;
+import io.quarkus.security.identity.SecurityIdentity;
+
+/**
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+@Path("/opaque/api/users")
+public class OpaqueUsersResource {
+
+    @Inject
+    SecurityIdentity identity;
+
+    @GET
+    @Path("/me")
+    @RolesAllowed("user")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User principalName() {
+        return new User(identity.getPrincipal().getName());
+    }
+
+    @GET
+    @Path("/preferredUserName")
+    @RolesAllowed("user")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User opaquePreferredUserName() {
+        return new User(identity.getPrincipal().getName());
+    }
+
+}
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java
new file mode 100644
index 0000000000000..6055d8ff9bace
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/UsersResource.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.quarkus.it.keycloak.model.User;
+import io.quarkus.security.identity.SecurityIdentity;
+
+/**
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+@Path("/api/users")
+public class UsersResource {
+
+    @Inject
+    SecurityIdentity identity;
+
+    @GET
+    @Path("/me")
+    @RolesAllowed("user")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User principalName() {
+        return new User(identity.getPrincipal().getName());
+    }
+
+    @GET
+    @Path("/preferredUserName")
+    @RolesAllowed("user")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User preferredUserName() {
+        return new User(((JsonWebToken) identity.getPrincipal()).getClaim("preferred_username"));
+    }
+}
diff --git a/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/model/User.java b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/model/User.java
new file mode 100644
index 0000000000000..0e052e2c56daf
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/java/io/quarkus/it/keycloak/model/User.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.keycloak.model;
+
+public class User {
+
+    private final String userName;
+
+    public User(String name) {
+        this.userName = name;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/oidc-wiremock/src/main/resources/application.properties b/integration-tests/oidc-wiremock/src/main/resources/application.properties
new file mode 100644
index 0000000000000..9353a7002b92f
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/main/resources/application.properties
@@ -0,0 +1,16 @@
+# Configuration file
+quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.client-id=quarkus-app
+quarkus.oidc.credentials.secret=secret
+quarkus.oidc.authentication.scopes=profile,email,phone
+
+quarkus.oidc.code-flow.auth-server-url=${keycloak.url}/realms/quarkus/
+quarkus.oidc.code-flow.client-id=quarkus-web-app
+quarkus.oidc.code-flow.credentials.secret=secret
+quarkus.oidc.code-flow.application-type=web-app
+quarkus.log.category."io.quarkus.oidc.runtime.CodeAuthenticationMechanism".min-level=TRACE
+quarkus.log.category."io.quarkus.oidc.runtime.CodeAuthenticationMechanism".level=TRACE
+
+quarkus.oidc.token.audience=https://service.example.com
+
+smallrye.jwt.sign.key-location=privateKey.jwk
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerOpaqueTokenAuthorizationInGraalITCase.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerOpaqueTokenAuthorizationInGraalITCase.java
new file mode 100644
index 0000000000000..626b6d1484a9b
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerOpaqueTokenAuthorizationInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BearerOpaqueTokenAuthorizationInGraalITCase extends BearerOpaqueTokenAuthorizationTest {
+}
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerOpaqueTokenAuthorizationTest.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerOpaqueTokenAuthorizationTest.java
new file mode 100644
index 0000000000000..c53d03b008d9c
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerOpaqueTokenAuthorizationTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.it.keycloak;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.Arrays;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+/**
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+@QuarkusTest
+@QuarkusTestResource(KeycloakTestResource.class)
+public class BearerOpaqueTokenAuthorizationTest {
+
+    @Test
+    public void testSecureAccessSuccessPreferredUsername() {
+        for (String username : Arrays.asList("alice", "jdoe", "admin")) {
+            RestAssured.given()
+                    .header("Authorization", "Bearer " + username)
+                    .when().get("/opaque/api/users/preferredUserName")
+                    .then()
+                    .statusCode(200)
+                    .body("userName", equalTo(username));
+        }
+    }
+
+    @Test
+    public void testAccessAdminResource() {
+        RestAssured.given()
+                .header("Authorization", "Bearer " + "admin")
+                .when().get("/opaque/api/admin")
+                .then()
+                .statusCode(200)
+                .body(Matchers.containsString("admin"));
+    }
+
+    @Test
+    public void testDeniedAccessAdminResource() {
+        RestAssured.given()
+                .header("Authorization", "Bearer " + "alice")
+                .when().get("/opaque/api/admin")
+                .then()
+                .statusCode(403);
+    }
+
+    @Test
+    public void testDeniedNoBearerToken() {
+        RestAssured.given()
+                .when().get("/opaque/api/users/me").then()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testExpiredBearerToken() {
+
+        RestAssured.given()
+                .header("Authorization", "Bearer " + "expired")
+                .get("/opaque/api/users/me")
+                .then()
+                .statusCode(401);
+    }
+
+}
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java
new file mode 100644
index 0000000000000..4decbe21df340
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BearerTokenAuthorizationInGraalITCase extends BearerTokenAuthorizationTest {
+}
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
new file mode 100644
index 0000000000000..4780a25c57617
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
@@ -0,0 +1,150 @@
+package io.quarkus.it.keycloak;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.smallrye.jwt.build.Jwt;
+
+/**
+ * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
+ */
+@QuarkusTest
+@QuarkusTestResource(KeycloakTestResource.class)
+public class BearerTokenAuthorizationTest {
+
+    @Test
+    public void testSecureAccessSuccessPreferredUsername() {
+        for (String username : Arrays.asList("alice", "jdoe", "admin")) {
+            RestAssured.given().auth().oauth2(getAccessToken(username, new HashSet<>(Arrays.asList("user", "admin"))))
+                    .when().get("/api/users/preferredUserName")
+                    .then()
+                    .statusCode(200)
+                    .body("userName", equalTo(username));
+        }
+    }
+
+    @Test
+    public void testAccessAdminResource() {
+        RestAssured.given().auth().oauth2(getAccessToken("admin", new HashSet<>(Arrays.asList("admin"))))
+                .when().get("/api/admin")
+                .then()
+                .statusCode(200)
+                .body(Matchers.containsString("admin"));
+    }
+
+    @Test
+    public void testAccessAdminResourceAudienceArray() {
+        RestAssured.given().auth().oauth2(getAccessTokenAudienceArray("admin", new HashSet<>(Arrays.asList("admin"))))
+                .when().get("/api/admin")
+                .then()
+                .statusCode(200)
+                .body(Matchers.containsString("admin"));
+    }
+
+    @Test
+    public void testDeniedAccessAdminResource() {
+        RestAssured.given().auth().oauth2(getAccessToken("alice", new HashSet<>(Arrays.asList("user"))))
+                .when().get("/api/admin")
+                .then()
+                .statusCode(403);
+    }
+
+    @Test
+    public void testDeniedNoBearerToken() {
+        RestAssured.given()
+                .when().get("/api/users/me").then()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testExpiredBearerToken() {
+        String token = getExpiredAccessToken("alice", new HashSet<>(Arrays.asList("user")));
+
+        RestAssured.given().auth().oauth2(token).when()
+                .get("/api/users/me")
+                .then()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testBearerTokenWrongIssuer() {
+        String token = getAccessTokenWrongIssuer("alice", new HashSet<>(Arrays.asList("user")));
+
+        RestAssured.given().auth().oauth2(token).when()
+                .get("/api/users/me")
+                .then()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testBearerTokenWrongAudience() {
+        String token = getAccessTokenWrongAudience("alice", new HashSet<>(Arrays.asList("user")));
+
+        RestAssured.given().auth().oauth2(token).when()
+                .get("/api/users/me")
+                .then()
+                .statusCode(401);
+    }
+
+    private String getAccessToken(String userName, Set<String> groups) {
+        return Jwt.preferredUserName(userName)
+                .groups(groups)
+                .issuer("https://server.example.com")
+                .audience("https://service.example.com")
+                .jws()
+                .keyId("1")
+                .sign();
+    }
+
+    private String getAccessTokenWrongAudience(String userName, Set<String> groups) {
+        return Jwt.preferredUserName(userName)
+                .groups(groups)
+                .issuer("https://server.example.com")
+                .audience("https://services.com")
+                .jws()
+                .keyId("1")
+                .sign();
+    }
+
+    private String getAccessTokenAudienceArray(String userName, Set<String> groups) {
+        return Jwt.preferredUserName(userName)
+                .groups(groups)
+                .issuer("https://server.example.com")
+                .audience(new HashSet<>(Arrays.asList("https://service.example.com", "https://frontendservice.example.com")))
+                .jws()
+                .keyId("1")
+                .sign();
+    }
+
+    private String getExpiredAccessToken(String userName, Set<String> groups) {
+        return Jwt.preferredUserName(userName)
+                .groups(groups)
+                .issuer("https://server.example.com")
+                .audience("https://service.example.com")
+                .expiresAt(Instant.MIN)
+                .jws()
+                .keyId("1")
+                .sign();
+    }
+
+    private String getAccessTokenWrongIssuer(String userName, Set<String> groups) {
+        return Jwt.preferredUserName(userName)
+                .groups(groups)
+                .issuer("https://example.com")
+                .audience("https://service.example.com")
+                .jws()
+                .keyId("1")
+                .sign();
+    }
+
+}
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
new file mode 100644
index 0000000000000..5478b4810c03b
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.it.keycloak;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+import com.gargoylesoftware.htmlunit.SilentCssErrorHandler;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+@QuarkusTestResource(KeycloakTestResource.class)
+public class CodeFlowAuthorizationTest {
+
+    @Test
+    public void testCodeFlow() throws IOException {
+        try (final WebClient webClient = createWebClient()) {
+            webClient.getOptions().setRedirectEnabled(true);
+            HtmlPage page = webClient.getPage("http://localhost:8081/code-flow");
+
+            HtmlForm form = page.getFormByName("form");
+            form.getInputByName("username").type("alice");
+            form.getInputByName("password").type("alice");
+
+            page = form.getInputByValue("login").click();
+
+            assertEquals("alice", page.getBody().asText());
+        }
+    }
+
+    private WebClient createWebClient() {
+        WebClient webClient = new WebClient();
+        webClient.setCssErrorHandler(new SilentCssErrorHandler());
+        return webClient;
+    }
+
+}
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java
new file mode 100644
index 0000000000000..0fa620f517f80
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java
@@ -0,0 +1,187 @@
+package io.quarkus.it.keycloak;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.matching;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.joining;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jboss.logging.Logger;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
+import com.google.common.collect.ImmutableSet;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.smallrye.jwt.build.Jwt;
+
+public class KeycloakTestResource implements QuarkusTestResourceLifecycleManager {
+
+    private static final Logger LOG = Logger.getLogger(KeycloakTestResource.class);
+
+    private WireMockServer server;
+
+    @Override
+    public Map<String, String> start() {
+
+        server = new WireMockServer(
+                wireMockConfig()
+                        .extensions(new ResponseTemplateTransformer(false))
+                        .dynamicPort());
+        server.start();
+
+        server.stubFor(
+                get(urlEqualTo("/auth/realms/quarkus/.well-known/openid-configuration"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                                .withBody("{\n" +
+                                        "    \"jwks_uri\": \"" + server.baseUrl()
+                                        + "/auth/realms/quarkus/protocol/openid-connect/certs\",\n" +
+                                        "    \"token_introspection_endpoint\": \"" + server.baseUrl()
+                                        + "/auth/realms/quarkus/protocol/openid-connect/token/introspect\",\n" +
+                                        "    \"authorization_endpoint\": \"" + server.baseUrl() + "/auth/realms/quarkus\"," +
+                                        "    \"token_endpoint\": \"" + server.baseUrl() + "/auth/realms/quarkus/token\"," +
+                                        "    \"issuer\" : \"https://server.example.com\"," +
+                                        "    \"introspection_endpoint\": \"" + server.baseUrl()
+                                        + "/auth/realms/quarkus/protocol/openid-connect/token/introspect\""
+                                        +
+                                        "}")));
+
+        server.stubFor(
+                get(urlEqualTo("/auth/realms/quarkus/protocol/openid-connect/certs"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                                .withBody("{\n" +
+                                        "  \"keys\" : [\n" +
+                                        "    {\n" +
+                                        "      \"kid\": \"1\",\n" +
+                                        "      \"kty\":\"RSA\",\n" +
+                                        "      \"n\":\"iJw33l1eVAsGoRlSyo-FCimeOc-AaZbzQ2iESA3Nkuo3TFb1zIkmt0kzlnWVGt48dkaIl13Vdefh9hqw_r9yNF8xZqX1fp0PnCWc5M_TX_ht5fm9y0TpbiVmsjeRMWZn4jr3DsFouxQ9aBXUJiu26V0vd2vrECeeAreFT4mtoHY13D2WVeJvboc5mEJcp50JNhxRCJ5UkY8jR_wfUk2Tzz4-fAj5xQaBccXnqJMu_1C6MjoCEiB7G1d13bVPReIeAGRKVJIF6ogoCN8JbrOhc_48lT4uyjbgnd24beatuKWodmWYhactFobRGYo5551cgMe8BoxpVQ4to30cGA0qjQ\",\n"
+                                        +
+                                        "      \"e\":\"AQAB\"\n" +
+                                        "    }\n" +
+                                        "  ]\n" +
+                                        "}")));
+
+        // define the mock for the introspect endpoint
+
+        // Valid
+        defineValidIntrospectionMockTokenStubForUserWithRoles("alice", ImmutableSet.of("user"));
+        defineValidIntrospectionMockTokenStubForUserWithRoles("jdoe", ImmutableSet.of("user"));
+        defineValidIntrospectionMockTokenStubForUserWithRoles("admin", ImmutableSet.of("user", "admin"));
+
+        // Invalid
+        defineInvalidIntrospectionMockTokenStubForUserWithRoles("expired", emptySet());
+
+        // Code Flow Authorization Mock
+        defineCodeFlowAuthorizationMockTokenStub();
+
+        // Login Page
+        server.stubFor(
+                get(urlPathMatching("/auth/realms/quarkus"))
+                        .willReturn(aResponse()
+                                .withHeader("Content-Type", MediaType.TEXT_HTML)
+                                .withBody("<html>\n" +
+                                        "<body>\n" +
+                                        " <form action=\"/login\" name=\"form\">\n" +
+                                        "  <input type=\"text\" id=\"username\" name=\"username\"/>\n" +
+                                        "  <input type=\"password\" id=\"password\" name=\"password\"/>\n" +
+                                        "  <input type=\"hidden\" id=\"state\" name=\"state\" value=\"{{request.query.state}}\"/>\n"
+                                        +
+                                        "  <input type=\"hidden\" id=\"redirect_uri\" name=\"redirect_uri\" value=\"{{request.query.redirect_uri}}\"/>\n"
+                                        +
+                                        "  <input type=\"submit\" id=\"login\" value=\"login\"/>\n" +
+                                        "</form>\n" +
+                                        "</body>\n" +
+                                        "</html> ")
+                                .withTransformers("response-template")));
+
+        // Login Request
+        server.stubFor(
+                get(urlPathMatching("/login"))
+                        .willReturn(aResponse()
+                                .withHeader("Location",
+                                        "{{request.query.redirect_uri}}?state={{request.query.state}}&code=58af24f2-9093-4674-a431-4a9d66be719c.50437113-cd78-48a2-838e-b936fe458c5d.0ac5df91-e044-4051-bd03-106a3a5fb9cc")
+                                .withStatus(302)
+                                .withTransformers("response-template")));
+
+        LOG.infof("Keycloak started in mock mode: %s", server.baseUrl());
+        Map<String, String> conf = new HashMap<>();
+        conf.put("quarkus.oidc.auth-server-url", server.baseUrl() + "/auth/realms/quarkus");
+        conf.put("quarkus.oidc.code-flow.auth-server-url", server.baseUrl() + "/auth/realms/quarkus");
+        conf.put("keycloak-url", server.baseUrl());
+
+        return conf;
+    }
+
+    private void defineValidIntrospectionMockTokenStubForUserWithRoles(String user, Set<String> roles) {
+        server.stubFor(WireMock.post("/auth/realms/quarkus/protocol/openid-connect/token/introspect")
+                .withRequestBody(matching("token=" + user + "&token_type_hint=access_token"))
+                .willReturn(WireMock
+                        .aResponse()
+                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                        .withBody(
+                                "{\"active\":true,\"scope\":\"" + roles.stream().collect(joining(" ")) + "\",\"username\":\""
+                                        + user
+                                        + "\",\"iat\":1,\"exp\":999999999999,\"expires_in\":999999999999,\"client_id\":\"my_client_id\"}")));
+    }
+
+    private void defineInvalidIntrospectionMockTokenStubForUserWithRoles(String user, Set<String> roles) {
+        server.stubFor(WireMock.post("/auth/realms/quarkus/protocol/openid-connect/token/introspect")
+                .withRequestBody(matching("token=" + user + "&token_type_hint=access_token"))
+                .willReturn(WireMock
+                        .aResponse()
+                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                        .withBody(
+                                "{\"active\":true,\"scope\":\"" + roles.stream().collect(joining(" ")) + "\",\"username\":\""
+                                        + user
+                                        + "\",\"iat\":1562315654,\"exp\":1,\"expires_in\":1,\"client_id\":\"my_client_id\"}")));
+    }
+
+    private void defineCodeFlowAuthorizationMockTokenStub() {
+        server.stubFor(WireMock.post("/auth/realms/quarkus/token")
+                .withRequestBody(containing("authorization_code"))
+                .willReturn(WireMock.aResponse()
+                        .withHeader("Content-Type", MediaType.APPLICATION_JSON)
+                        .withBody("{\n" +
+                                "  \"access_token\": \""
+                                + getAccessToken("alice", new HashSet<>(Arrays.asList("user", "admin"))) + "\",\n" +
+                                "  \"refresh_token\": \"07e08903-1263-4dd1-9fd1-4a59b0db5283\",\n" +
+                                "  \"id_token\": \"" + getAccessToken("alice", new HashSet<>(Arrays.asList("user", "admin")))
+                                + "\"\n" +
+                                "}")));
+    }
+
+    private String getAccessToken(String userName, Set<String> groups) {
+        return Jwt.preferredUserName(userName)
+                .groups(groups)
+                .issuer("https://server.example.com")
+                .audience("https://service.example.com")
+                .jws()
+                .keyId("1")
+                .sign("privateKey.jwk");
+    }
+
+    @Override
+    public synchronized void stop() {
+        if (server != null) {
+            server.stop();
+            LOG.info("Keycloak was shut down");
+            server = null;
+        }
+    }
+
+}
diff --git a/integration-tests/oidc-wiremock/src/test/resources/privateKey.jwk b/integration-tests/oidc-wiremock/src/test/resources/privateKey.jwk
new file mode 100644
index 0000000000000..fd33492b396d8
--- /dev/null
+++ b/integration-tests/oidc-wiremock/src/test/resources/privateKey.jwk
@@ -0,0 +1,11 @@
+{
+ "kty":"RSA",
+ "n":"iJw33l1eVAsGoRlSyo-FCimeOc-AaZbzQ2iESA3Nkuo3TFb1zIkmt0kzlnWVGt48dkaIl13Vdefh9hqw_r9yNF8xZqX1fp0PnCWc5M_TX_ht5fm9y0TpbiVmsjeRMWZn4jr3DsFouxQ9aBXUJiu26V0vd2vrECeeAreFT4mtoHY13D2WVeJvboc5mEJcp50JNhxRCJ5UkY8jR_wfUk2Tzz4-fAj5xQaBccXnqJMu_1C6MjoCEiB7G1d13bVPReIeAGRKVJIF6ogoCN8JbrOhc_48lT4uyjbgnd24beatuKWodmWYhactFobRGYo5551cgMe8BoxpVQ4to30cGA0qjQ",
+ "e":"AQAB",
+ "d":"AvIDTlsK_priQLTwEQf5IVf2Xl638Q7dHdXyDC-oAAPmv1GcqRVH7Wm5oAPW_CZQfWhV55WRVaJzP8AhksyD5NcslH79hQZT4NT6xgApGYecrvmseuZ4dfR-e1cxXTRNBxaoXvwSiv4LuOPHmC8XGX712AhOoCGKiZp1WFqqkKwTpkgJEApJFVb-XRIKQa0YaRKpJsJ534pLMwTh7LoPLM4BCaBVbRfHzH2H5L3TSJP718kyCuxg3z2p9Y7zIOLTmgFdeR0_kd_xKUFZ2ByN3SKlC0IWlLUSiMPsGYExRpZTMZHKyD939gv-2_Z-bOYfKlYNIvAmQH_8CcX2I039LQ",
+ "p":"104AjPaxZoi_BiMBODlChnZOvRJT071PdkeZ283uyrdW8qqKD9q8FTMgUXzKoboHtUiHbJbLOobPmPDh93839rq7dTdCNzNVOuLmE-V3_bmaShdzvxEIazwPf6AvjbEZAc-zu2RS4SNkp1LbzgSl9nINSlF7t6Lkl6T28PYULys",
+ "q":"om5ooyzxa4ZJ-dU0ODsEb-Bmz6xwb27xF9aEhBYJprHeoNs2QM1D64_A39weD9MYwBux4-ivshCJ0dVKEbDujJRLnzf-ssrasA6CFyaaCT4DKtq1oWb9rcG-2LQd5Bm9PttrUrSUNqitr085IYikaLEz7UU6gtXPoC8UOcJ4cSc",
+ "dp":"DeWE95Q8oweUfMrpmz1m49LjBiUWsAX6CQJaFevWy9LFk-gZ_Sf7F8sy_M93LLUbJkJGK2YYO_DTmWWC0Dyv2gb3bntglLuFdsWKYCJhekjugnW9DMoGpxU7Utt99kFGAe3sBd5V0x47sukQMt3t8FgwL2nO-G1VH8yP-8GGT_0",
+ "dq":"TGBeE1wuqMCcSD1YMJiPnYuGzF_o_nzMIMldxj4Wi6tXY4uwFwhtx3Xw21JFUGuSV8KuAtyGwNPF-kSwb2Eiyjdw140c1jVMXzxzLy-XfoEKPDxa62niHrHba0pGQ9tWgRfrfxgqGQl3odc-peX6aL_qCsdim-KtnkSE3iPzPkE",
+ "qi":"Jzp5KnT24y0wOoPUn_11S3ZcYl0i03dkaH4c5zR02G1MJG9K017juurx2aXVTctOzrj7O226EUiL1Qbq3QtnWFDDGY6vNZuqzJM7AMXsvp1djq_6fEVhxCIOgfJbmhb3mkG82rxn4et9o_TNr6mvEmHzG15sHbvZbAnn4GeqToY"
+}
\ No newline at end of file
diff --git a/integration-tests/oidc/README.md b/integration-tests/oidc/README.md
index 2df9b96e771d3..888c2ce777026 100644
--- a/integration-tests/oidc/README.md
+++ b/integration-tests/oidc/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with Keycloak Server started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-keycloak -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run Keycloak Server as a Docker container, you can start your own Keycloak server. It needs to listen on the default https port `8543`.
@@ -21,7 +21,7 @@ If you don't want to run Keycloak Server as a Docker container, you can start yo
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-keycloak
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dkeycloak.url=https://keycloak.server.domain:8543/auth`.
diff --git a/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml
index 3c3c770fdb7c2..128e44baf488e 100644
--- a/integration-tests/oidc/pom.xml
+++ b/integration-tests/oidc/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -53,6 +52,37 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,7 +124,7 @@
             <id>test-keycloak</id>
             <activation>
                 <property>
-                    <name>test-keycloak</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -139,63 +169,17 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <debugBuildProcess>false</debugBuildProcess>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
         </profile>
 
         <profile>
             <id>docker-keycloak</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -267,7 +251,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java
index 9b8d047b0da34..a5e44360fd13a 100644
--- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java
+++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/AdminResource.java
@@ -3,10 +3,9 @@
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.jwt.Claim;
+import org.eclipse.microprofile.jwt.ClaimValue;
 
 /**
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
@@ -15,12 +14,11 @@
 public class AdminResource {
 
     @Claim("preferred_username")
-    String claim;
+    ClaimValue<String> claim;
 
     @GET
     @RolesAllowed("admin")
-    @Produces(MediaType.APPLICATION_JSON)
     public String admin() {
-        return "granted:" + claim;
+        return "granted:" + claim.getValue();
     }
 }
diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java
index 7c369d694d02d..51492856d0948 100644
--- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java
+++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/PermissionResource.java
@@ -8,8 +8,6 @@
 import javax.json.JsonString;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 
@@ -22,7 +20,6 @@ public class PermissionResource {
     @GET
     @Path("/{name}")
     @RolesAllowed("user")
-    @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> permissions() {
         Map<String, Object> claims = new HashMap<>();
         for (String i : jwt.getClaimNames()) {
diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java
index 14bead7f636a6..ec9898331a7a7 100644
--- a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java
+++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/UsersResource.java
@@ -1,16 +1,14 @@
 package io.quarkus.it.keycloak;
 
-import java.security.Principal;
-
 import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 
+import io.quarkus.security.identity.SecurityIdentity;
+
 /**
  * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>
  */
@@ -18,22 +16,20 @@
 public class UsersResource {
 
     @Inject
-    Principal identity;
+    SecurityIdentity identity;
 
     @GET
     @Path("/me")
     @RolesAllowed("user")
-    @Produces(MediaType.APPLICATION_JSON)
     public User principalName() {
-        return new User(identity.getName());
+        return new User(identity.getPrincipal().getName());
     }
 
     @GET
     @Path("/preferredUserName")
     @RolesAllowed("user")
-    @Produces(MediaType.APPLICATION_JSON)
     public User preferredUserName() {
-        return new User(((JsonWebToken) identity).getClaim("preferred_username"));
+        return new User(((JsonWebToken) identity.getPrincipal()).getClaim("preferred_username"));
     }
 
     public static class User {
diff --git a/integration-tests/oidc/src/main/resources/application.properties b/integration-tests/oidc/src/main/resources/application.properties
index 423e0a93117e1..2a425123ef58e 100644
--- a/integration-tests/oidc/src/main/resources/application.properties
+++ b/integration-tests/oidc/src/main/resources/application.properties
@@ -3,5 +3,11 @@ quarkus.oidc.auth-server-url=${keycloak.ssl.url}/realms/quarkus/
 quarkus.oidc.client-id=quarkus-app
 quarkus.oidc.credentials.secret=secret
 quarkus.oidc.token.principal-claim=email
-quarkus.http.cors=true
 quarkus.oidc.tls.verification=none
+quarkus.http.cors=true
+
+quarkus.http.auth.basic=true
+quarkus.security.users.embedded.enabled=true
+quarkus.security.users.embedded.plain-text=true
+quarkus.security.users.embedded.users.alice=password
+quarkus.security.users.embedded.roles.alice=user
diff --git a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
index ba94d9db19aa6..b5a88e6f7584d 100644
--- a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
+++ b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java
@@ -5,7 +5,9 @@
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.equalTo;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 
 import org.hamcrest.Matchers;
@@ -58,6 +60,17 @@ public void testSecureAccessSuccessCustomPrincipal() {
         }
     }
 
+    @Test
+    public void testBasicAuth() {
+        byte[] basicAuthBytes = "alice:password".getBytes(StandardCharsets.UTF_8);
+        RestAssured.given()
+                .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(basicAuthBytes))
+                .when().get("/api/users/me")
+                .then()
+                .statusCode(200)
+                .body("userName", equalTo("alice"));
+    }
+
     @Test
     public void testSecureAccessSuccessPreferredUsername() {
         for (String username : Arrays.asList("alice", "jdoe", "admin")) {
@@ -78,6 +91,22 @@ public void testAccessAdminResource() {
                 .body(Matchers.containsString("granted:admin"));
     }
 
+    @Test
+    public void testAccessAdminResourceCustomHeaderNoBearerScheme() {
+        RestAssured.given().header("X-Forwarded-Authorization", getAccessToken("admin"))
+                .when().get("/api/admin")
+                .then()
+                .statusCode(401);
+    }
+
+    @Test
+    public void testAccessAdminResourceCustomHeaderBearerScheme() {
+        RestAssured.given().header("X-Forwarded-Authorization", getAccessToken("admin"))
+                .when().get("/api/admin")
+                .then()
+                .statusCode(401);
+    }
+
     @Test
     public void testAccessAdminResourceWithRefreshToken() {
         RestAssured.given().auth().oauth2(getRefreshToken("admin"))
@@ -104,13 +133,21 @@ public void testDeniedAccessAdminResource() {
     }
 
     @Test
-    public void testDeniedNoBearerToken() {
+    public void testVerificationFailedNoBearerToken() {
         RestAssured.given()
                 .when().get("/api/users/me").then()
                 .statusCode(401);
     }
 
+    @Test
+    public void testVerificationFailedInvalidToken() {
+        RestAssured.given().auth().oauth2("123")
+                .when().get("/api/users/me").then()
+                .statusCode(401);
+    }
+
     //see https://github.com/quarkusio/quarkus/issues/5809
+    @Test
     @RepeatedTest(20)
     public void testOidcAndVertxHandler() {
         RestAssured.given().auth().oauth2(getAccessToken("alice"))
diff --git a/integration-tests/openshift-client/pom.xml b/integration-tests/openshift-client/pom.xml
new file mode 100644
index 0000000000000..1e95f5e6a17f8
--- /dev/null
+++ b/integration-tests/openshift-client/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-openshift-client</artifactId>
+    <name>Quarkus - Integration Tests - OpenShift Client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-openshift-client</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java b/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java
new file mode 100644
index 0000000000000..c2a2196d11e7d
--- /dev/null
+++ b/integration-tests/openshift-client/src/main/java/io/quarkus/it/openshift/client/Routes.java
@@ -0,0 +1,30 @@
+package io.quarkus.it.openshift.client;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.openshift.client.OpenShiftClient;
+
+@Path("/route")
+public class Routes {
+
+    // make sure we can inject both aspects of it
+    @Inject
+    KubernetesClient kubernetesClient;
+
+    @Inject
+    OpenShiftClient openshiftClient;
+
+    @GET
+    @Path("/{namespace}")
+    public Response routes(@PathParam("namespace") String namespace) {
+        if (kubernetesClient != openshiftClient) {
+            return Response.serverError().entity("The clients are different").build();
+        }
+        return Response.ok(openshiftClient.routes().inNamespace(namespace).list().getItems()).build();
+    }
+}
diff --git a/integration-tests/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTest.java b/integration-tests/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTest.java
new file mode 100644
index 0000000000000..0398a7bb4bc0b
--- /dev/null
+++ b/integration-tests/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTest.java
@@ -0,0 +1,56 @@
+package io.quarkus.it.openshift.client;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.fabric8.kubernetes.api.model.PodListBuilder;
+import io.fabric8.openshift.api.model.Route;
+import io.fabric8.openshift.api.model.RouteBuilder;
+import io.fabric8.openshift.client.NamespacedOpenShiftClient;
+import io.fabric8.openshift.client.server.mock.OpenShiftMockServer;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.kubernetes.client.MockServer;
+import io.quarkus.test.kubernetes.client.OpenShiftMockServerTestResource;
+import io.restassured.RestAssured;
+
+@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTest
+public class OpenShiftClientTest {
+
+    @MockServer
+    private OpenShiftMockServer mockServer;
+
+    @Test
+    void createRoute() {
+
+        mockServer.expect().post().withPath("/apis/route.openshift.io/v1/namespaces/test/routes")
+                .andReturn(200, new PodListBuilder().build())
+                .once();
+
+        Route expectedRoute = new RouteBuilder().withNewMetadata().withName("myroute").withNamespace("test").endMetadata()
+                .build();
+        mockServer.expect().get().withPath("/apis/route.openshift.io/v1/namespaces/test/routes/myroute")
+                .andReturn(200, expectedRoute)
+                .once();
+
+        NamespacedOpenShiftClient openShiftClient = mockServer.createOpenShiftClient();
+        openShiftClient.routes()
+                .create(new RouteBuilder().withNewMetadata().withName("myroute").withNamespace("test").endMetadata().build());
+        Route route = openShiftClient.routes().inNamespace("test").withName("myroute").get();
+        Assertions.assertNotNull(route);
+    }
+
+    @Test
+    void getRoutes() {
+
+        mockServer.expect().get().withPath("/apis/route.openshift.io/v1/namespaces/test/routes")
+                .andReturn(200, new PodListBuilder().build())
+                .once();
+
+        RestAssured.when().get("/route/test").then()
+                .body("size()", is(0));
+    }
+}
diff --git a/integration-tests/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTestIT.java b/integration-tests/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTestIT.java
new file mode 100644
index 0000000000000..f1e55a63b6e48
--- /dev/null
+++ b/integration-tests/openshift-client/src/test/java/io/quarkus/it/openshift/client/OpenShiftClientTestIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.openshift.client;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class OpenShiftClientTestIT extends OpenShiftClientTest {
+
+}
diff --git a/integration-tests/packaging/disable-native-profile b/integration-tests/packaging/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/packaging/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/packaging/pom.xml b/integration-tests/packaging/pom.xml
index 434a2024e9dc7..17a579a8575bc 100644
--- a/integration-tests/packaging/pom.xml
+++ b/integration-tests/packaging/pom.xml
@@ -20,11 +20,6 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -39,9 +34,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <!--suppress MavenModelInspection -->
-                        <maven.home>${maven.home}</maven.home>
-                        <maven.repo>${settings.localRepository}</maven.repo>
                         <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java
index eb78fd39970a6..53cc5d185dbba 100644
--- a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java
+++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java
@@ -11,7 +11,7 @@
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -44,12 +44,11 @@ public void testManifestEntries() throws Exception {
                 Attributes testAttributes = manifest.getEntries().get("Test-Information");
                 assertThat(testAttributes).isNotNull();
                 Attributes.Name testKey1 = new Attributes.Name("Test-Key-1");
-                Assert.assertTrue("Custom Manifest Entry for Test-Key-1 is missing",
-                        testAttributes.containsKey(testKey1));
-                Assert.assertEquals("Custom Manifest Entry for Test-Key-1 value is not correct",
-                        "Test Value 1", testAttributes.getValue(testKey1));
-                Assert.assertTrue("Custom Manifest Entry for Test-Key-2 is missing",
-                        testAttributes.containsKey(new Attributes.Name("Test-Key-2")));
+                Assertions.assertTrue(testAttributes.containsKey(testKey1), "Custom Manifest Entry for Test-Key-1 is missing");
+                Assertions.assertEquals("Test Value 1", testAttributes.getValue(testKey1),
+                        "Custom Manifest Entry for Test-Key-1 value is not correct");
+                Assertions.assertTrue(testAttributes.containsKey(new Attributes.Name("Test-Key-2")),
+                        "Custom Manifest Entry for Test-Key-2 is missing");
             }
         }
     }
diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java
index ae421e21c82ed..6c5b89d02006d 100644
--- a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java
+++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java
@@ -11,7 +11,7 @@
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -44,12 +44,11 @@ public void testManifestEntries() throws Exception {
                 Attributes testAttributes = manifest.getEntries().get("Test-Information");
                 assertThat(testAttributes).isNotNull();
                 Attributes.Name testKey1 = new Attributes.Name("Test-Key-1");
-                Assert.assertTrue("Custom Manifest Entry for Test-Key-1 is missing",
-                        testAttributes.containsKey(testKey1));
-                Assert.assertEquals("Custom Manifest Entry for Test-Key-1 value is not correct",
-                        "Test Value 1", testAttributes.getValue(testKey1));
-                Assert.assertTrue("Custom Manifest Entry for Test-Key-2 is missing",
-                        testAttributes.containsKey(new Attributes.Name("Test-Key-2")));
+                Assertions.assertTrue(testAttributes.containsKey(testKey1), "Custom Manifest Entry for Test-Key-1 is missing");
+                Assertions.assertEquals("Test Value 1", testAttributes.getValue(testKey1),
+                        "Custom Manifest Entry for Test-Key-1 value is not correct");
+                Assertions.assertTrue(testAttributes.containsKey(new Attributes.Name("Test-Key-2")),
+                        "Custom Manifest Entry for Test-Key-2 is missing");
             }
         }
     }
diff --git a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-thin.properties b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-thin.properties
index 7501503e749aa..bea0f3ae8b072 100644
--- a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-thin.properties
+++ b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-thin.properties
@@ -1,4 +1,3 @@
 quarkus.package.type=jar
-quarkus.package.uber-jar=false
 quarkus.package.manifest.manifest-sections.Test-Information.Test-Key-1=Test Value 1
 quarkus.package.manifest.manifest-sections.Test-Information.Test-Key-2=Test Value 2
\ No newline at end of file
diff --git a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-uber.properties b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-uber.properties
index 4893de5cc77a8..8c07aed4295a0 100644
--- a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-uber.properties
+++ b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/custom-manifest-uber.properties
@@ -1,4 +1,3 @@
-quarkus.package.type=jar
-quarkus.package.uber-jar=true
+quarkus.package.type=uber-jar
 quarkus.package.manifest.manifest-sections.Test-Information.Test-Key-1=Test Value 1
 quarkus.package.manifest.manifest-sections.Test-Information.Test-Key-2=Test Value 2
\ No newline at end of file
diff --git a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-thin.properties b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-thin.properties
index c5eec7fff6ab7..a615e1959f6be 100644
--- a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-thin.properties
+++ b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-thin.properties
@@ -1,2 +1 @@
 quarkus.package.type=jar
-quarkus.package.uber-jar=false
\ No newline at end of file
diff --git a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-uber.properties b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-uber.properties
index a8d523bea13ad..389ff30544c77 100644
--- a/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-uber.properties
+++ b/integration-tests/packaging/src/test/resources/projects/custom-manifest-section/no-custom-manifest-uber.properties
@@ -1,2 +1 @@
-quarkus.package.type=jar
-quarkus.package.uber-jar=true
\ No newline at end of file
+quarkus.package.type=uber-jar
diff --git a/integration-tests/picocli-native/pom.xml b/integration-tests/picocli-native/pom.xml
index 6027fb78e39ba..6c6edd06efa85 100644
--- a/integration-tests/picocli-native/pom.xml
+++ b/integration-tests/picocli-native/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,6 +37,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-picocli-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -62,67 +89,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <trimStackTrace>false</trimStackTrace>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 
 </project>
diff --git a/integration-tests/picocli/disable-native-profile b/integration-tests/picocli/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/picocli/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/picocli/pom.xml b/integration-tests/picocli/pom.xml
index b76eb67a52fa8..99e5635114578 100644
--- a/integration-tests/picocli/pom.xml
+++ b/integration-tests/picocli/pom.xml
@@ -6,17 +6,12 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>quarkus-integration-test-picocli</artifactId>
     <name>Quarkus - Integration Tests - Picocli</name>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -39,6 +34,21 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-picocli-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -46,7 +56,7 @@
             <id>test-vault</id>
             <activation>
                 <property>
-                    <name>test-vault</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -61,7 +71,6 @@
                                 </goals>
                                 <configuration>
                                     <skip>false</skip>
-                                    <trimStackTrace>false</trimStackTrace>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 38cbc9147b337..d4fb98cedb80d 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -20,9 +20,13 @@
         <gpg.skip>true</gpg.skip>
         <quarkus.build.skip>${skipTests}</quarkus.build.skip>
         <native.surefire.skip>${skipTests}</native.surefire.skip>
+        <enforce-test-deps-scope.skip>true</enforce-test-deps-scope.skip>
     </properties>
-
     <modules>
+        <module>bouncycastle</module>
+        <module>bouncycastle-fips</module>
+        <module>bouncycastle-fips-jsse</module>
+        <module>bouncycastle-jsse</module>
         <module>funqy-amazon-lambda</module>
         <module>funqy-google-cloud-functions</module>
         <module>class-transformer</module>
@@ -30,9 +34,11 @@
         <module>hibernate-validator</module>
         <module>common-jpa-entities</module>
         <module>infinispan-client</module>
+        <module>devtools</module>
         <module>gradle</module>
         <module>main</module>
         <module>kafka</module>
+        <module>kafka-snappy</module>
         <module>kafka-avro</module>
         <module>kafka-streams</module>
         <module>jpa</module>
@@ -52,9 +58,11 @@
         <module>hibernate-reactive-db2</module>
         <module>hibernate-reactive-mysql</module>
         <module>hibernate-reactive-postgresql</module>
-        <module>hibernate-search-elasticsearch</module>
+        <module>hibernate-reactive-panache</module>
+        <module>hibernate-search-orm-elasticsearch</module>
         <module>hibernate-tenancy</module>
         <module>hibernate-orm-envers</module>
+        <module>legacy-redirect</module>
         <module>vertx-http</module>
         <module>vertx-web</module>
         <module>vertx</module>
@@ -63,6 +71,7 @@
         <module>spring-data-jpa</module>
         <module>spring-boot-properties</module>
         <module>spring-cloud-config-client</module>
+        <module>spring-data-rest</module>
         <module>infinispan-cache-jpa</module>
         <module>elytron-security</module>
         <module>elytron-security-oauth2</module>
@@ -71,8 +80,13 @@
         <module>flyway</module>
         <module>liquibase</module>
         <module>oidc</module>
+        <module>oidc-client</module>
+        <module>oidc-client-wiremock</module>
+        <module>oidc-token-propagation</module>
+        <module>smallrye-jwt-token-propagation</module>
         <module>oidc-code-flow</module>
         <module>oidc-tenancy</module>
+        <module>oidc-wiremock</module>
         <module>keycloak-authorization</module>
         <module>reactive-db2-client</module>
         <module>reactive-pg-client</module>
@@ -80,12 +94,16 @@
         <module>amazon-services</module>
         <module>test-extension</module>
         <module>amazon-lambda</module>
+        <module>amazon-lambda-s3event</module>
         <module>amazon-lambda-stream-handler</module>
         <module>amazon-lambda-http</module>
+        <module>amazon-lambda-rest</module>
         <module>amazon-lambda-http-resteasy</module>
         <module>container-image</module>
         <module>kubernetes</module>
         <module>kubernetes-client</module>
+        <module>kubernetes-service-binding-jdbc</module>
+        <module>openshift-client</module>
         <module>tika</module>
         <module>neo4j</module>
         <module>mongodb-client</module>
@@ -103,12 +121,16 @@
         <module>scala</module>
         <module>kotlin</module>
         <module>mongodb-panache</module>
+        <module>mongodb-panache-kotlin</module>
+        <module>mongodb-rest-data-panache</module>
         <module>narayana-stm</module>
         <module>narayana-jta</module>
         <module>elytron-security-jdbc</module>
         <module>elytron-security-ldap</module>
         <module>vertx-graphql</module>
+        <module>smallrye-config</module>
         <module>smallrye-context-propagation</module>
+        <module>smallrye-metrics</module>
         <module>smallrye-graphql</module>
         <module>jpa-without-entity</module>
         <module>quartz</module>
@@ -119,7 +141,11 @@
         <module>bootstrap-config</module>
         <module>injectmock</module>
         <module>reactive-messaging-amqp</module>
+        <module>reactive-messaging-kafka</module>
+        <module>reactive-messaging-http</module>
         <module>rest-client</module>
+        <module>resteasy-reactive-rest-client</module>
+        <module>resteasy-reactive-rest-client-standalone</module>
         <module>packaging</module>
         <module>simple with space</module>
         <module>consul-config</module>
@@ -130,10 +156,19 @@
         <module>ide-launcher</module>
         <module>elasticsearch-rest-client</module>
         <module>elasticsearch-rest-high-level-client</module>
-        
+        <module>micrometer-mp-metrics</module>
+        <module>micrometer-prometheus</module>
+        <module>logging-json</module>
+        <module>jaxp</module>
+        <module>mailer</module>
+        <module>native-config-profile</module>
+        <module>logging-min-level-unset</module>
+        <module>logging-min-level-set</module>
+
         <!-- gRPC tests -->
-        <module>grpc-plain-text</module>
         <module>grpc-tls</module>
+        <module>grpc-plain-text-gzip</module>
+        <module>grpc-plain-text-mutiny</module>
         <module>grpc-mutual-auth</module>
         <module>grpc-streaming</module>
         <module>grpc-interceptors</module>
@@ -145,6 +180,30 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-deployment-deps</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requiresMinimalDeploymentDependency implementation="io.quarkus.enforcer.RequiresMinimalDeploymentDependency"/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-enforcer-rules</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -207,4 +266,61 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <profiles>
+        <!-- Common native image test profile
+             WARNING: In this parent profile, you cannot override properties in a submodule!
+                      Plugin config can only be overridden (to a certain point) via pluginManagement!
+                      This is due to how Maven handles profiles in parents:
+                      A property in a submodule takes precedence (sic!) over a property in this parent profile. -->
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+                <file>
+                    <missing>${basedir}/disable-native-profile</missing>
+                </file>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <skipTests>${native.surefire.skip}</skipTests>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                                <configuration>
+                                    <systemPropertyVariables>
+                                        <native.image.path>
+                                            ${project.build.directory}/${project.build.finalName}-runner
+                                        </native.image.path>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
+
diff --git a/integration-tests/quartz/pom.xml b/integration-tests/quartz/pom.xml
index 5ab904a300a6a..fc83855de7faf 100644
--- a/integration-tests/quartz/pom.xml
+++ b/integration-tests/quartz/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -59,6 +58,86 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-flyway-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-quartz-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,60 +156,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/quartz/src/main/resources/application.properties b/integration-tests/quartz/src/main/resources/application.properties
index 53b5ffec1ba65..c99453a9c63bc 100644
--- a/integration-tests/quartz/src/main/resources/application.properties
+++ b/integration-tests/quartz/src/main/resources/application.properties
@@ -2,7 +2,6 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 
 # Quartz configuration
 quarkus.quartz.store-type=jdbc-cmt
@@ -15,3 +14,7 @@ quarkus.flyway.migrate-at-start=true
 quarkus.flyway.baseline-on-migrate=true
 quarkus.flyway.baseline-version=1.0
 quarkus.flyway.baseline-description=Quartz
+
+# Register de LoggingJobHistoryPlugin for testing
+quarkus.quartz.plugins.jobHistory.class=org.quartz.plugins.history.LoggingJobHistoryPlugin
+quarkus.quartz.plugins.jobHistory.properties.jobSuccessMessage=Job [{1}.{0}] execution complete and reports: {8}
diff --git a/integration-tests/qute/pom.xml b/integration-tests/qute/pom.xml
index cd55e770b8440..adb4055911d9f 100644
--- a/integration-tests/qute/pom.xml
+++ b/integration-tests/qute/pom.xml
@@ -6,10 +6,9 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    
     <artifactId>quarkus-integration-test-qute</artifactId>
     <name>Quarkus - Integration Tests - Qute</name>
     <description>Qute integration test module</description>
@@ -23,8 +22,21 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -35,10 +47,74 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-qute-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${compiler-plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
@@ -53,60 +129,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java
new file mode 100644
index 0000000000000..9a3e5e267c754
--- /dev/null
+++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Beer.java
@@ -0,0 +1,16 @@
+package io.quarkus.it.qute;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class Beer extends PanacheEntity {
+
+    public String name;
+
+    public Boolean completed;
+
+    public boolean done;
+
+}
diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java
new file mode 100644
index 0000000000000..6634e32c041a4
--- /dev/null
+++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/BeerResource.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.qute;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import io.quarkus.qute.CheckedTemplate;
+import io.quarkus.qute.TemplateInstance;
+
+@Path("/beer")
+public class BeerResource {
+
+    @CheckedTemplate
+    static class Templates {
+
+        static native TemplateInstance beer(Beer beer);
+
+    }
+
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public TemplateInstance get() {
+        Beer beer = Beer.find("name", "Pilsner").firstResult();
+        return Templates.beer(beer);
+    }
+
+}
diff --git a/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java
new file mode 100644
index 0000000000000..0211649c419b4
--- /dev/null
+++ b/integration-tests/qute/src/main/java/io/quarkus/it/qute/Brewery.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.qute;
+
+import javax.enterprise.event.Observes;
+import javax.transaction.Transactional;
+
+import io.quarkus.runtime.StartupEvent;
+
+public class Brewery {
+
+    @Transactional
+    void onStart(@Observes StartupEvent event) {
+        Beer myBeer = new Beer();
+        myBeer.name = "Pilsner";
+        myBeer.completed = true;
+        myBeer.done = true;
+        myBeer.persist();
+    }
+
+}
diff --git a/integration-tests/qute/src/main/resources/application.properties b/integration-tests/qute/src/main/resources/application.properties
new file mode 100644
index 0000000000000..723225e17fee8
--- /dev/null
+++ b/integration-tests/qute/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
+
+quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm.database.generation=drop-and-create
\ No newline at end of file
diff --git a/integration-tests/qute/src/main/resources/templates/BeerResource/beer.html b/integration-tests/qute/src/main/resources/templates/BeerResource/beer.html
new file mode 100644
index 0000000000000..114e4e28b0261
--- /dev/null
+++ b/integration-tests/qute/src/main/resources/templates/BeerResource/beer.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Beer!</title> 
+</head>
+<body>
+    <p>Beer {beer.name}, completed: {beer.completed}, done: {beer.done}</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java b/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java
index 1ca76db7acf95..ca4eb9f76bdb0 100644
--- a/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java
+++ b/integration-tests/qute/src/test/java/io/quarkus/it/qute/QuteTestCase.java
@@ -14,7 +14,7 @@
 public class QuteTestCase {
 
     @Test
-    public void testTemplate() throws InterruptedException {
+    public void testTemplates() throws InterruptedException {
         RestAssured.when().get("/hello?name=Ciri").then().body(containsString("Hello Ciri!"));
         RestAssured.when().get("/hello").then().body(containsString("Hello world!"));
         RestAssured.given().accept(ContentType.HTML).when().get("/hello-route")
@@ -24,6 +24,7 @@ public void testTemplate() throws InterruptedException {
         RestAssured.given().accept(ContentType.HTML).when().get("/hello-route?name=Ciri").then()
                 .contentType(is(ContentType.HTML.toString()))
                 .body(containsString("Hello Ciri!"));
+        RestAssured.when().get("/beer").then().body(containsString("Beer Pilsner, completed: true, done: true"));
     }
 
     @Test
diff --git a/integration-tests/qute/src/test/java/io/quarkus/it/qute/TestResources.java b/integration-tests/qute/src/test/java/io/quarkus/it/qute/TestResources.java
new file mode 100644
index 0000000000000..5dbac2cb4c232
--- /dev/null
+++ b/integration-tests/qute/src/test/java/io/quarkus/it/qute/TestResources.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.qute;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
+
+@QuarkusTestResource(H2DatabaseTestResource.class)
+public class TestResources {
+}
diff --git a/integration-tests/reactive-db2-client/README.md b/integration-tests/reactive-db2-client/README.md
index 6df636d0ad03f..1e12a4eceac8a 100644
--- a/integration-tests/reactive-db2-client/README.md
+++ b/integration-tests/reactive-db2-client/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with DB2 started as a Docker container, you can run the following command:
 
 ```
-mvn verify -Dtest-db2 -Ddocker
+mvn verify -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn verify -Dtest-db2 -Ddocker -Dnative
+mvn verify -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run DB2 as a Docker container, you can start your own DB2 server. It needs to listen on the default port (50000) and have a database called `hreact` accessible to the user `hreact` with the password `hreact`.
@@ -21,7 +21,7 @@ If you don't want to run DB2 as a Docker container, you can start your own DB2 s
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn verify -Dtest-db2
+mvn verify -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dreactive-db2.url=vertx-reactive:db2://localhost:50000/hreact`.
diff --git a/integration-tests/reactive-db2-client/pom.xml b/integration-tests/reactive-db2-client/pom.xml
index c89ec4b6c5a7d..9b3553271ff94 100644
--- a/integration-tests/reactive-db2-client/pom.xml
+++ b/integration-tests/reactive-db2-client/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-reactive-db2-client</artifactId>
@@ -17,7 +16,7 @@
 
     <properties>
         <reactive-db2.url>vertx-reactive:db2://localhost:50000/hreact</reactive-db2.url>
-        <db2.image>ibmcom/db2:11.5.0.0a</db2.image>
+        <db2.image>ibmcom/db2:11.5.5.0</db2.image>
     </properties>
 
     <dependencies>
@@ -44,6 +43,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-db2-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,7 +125,7 @@
             <id>test-db2</id>
             <activation>
                 <property>
-                    <name>test-db2</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -106,67 +146,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-db2</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -198,6 +182,7 @@
                                         	<!-- These help the DB2 container start faster -->
                                         	<AUTOCONFIG>false</AUTOCONFIG>
                                         	<ARCHIVE_LOGS>false</ARCHIVE_LOGS>
+                                        	<PERSISTENT_HOME>false</PERSISTENT_HOME>
                                         </env>
                                         <log>
                                             <prefix>DB2:</prefix>
@@ -206,9 +191,13 @@
                                         </log>
                                         <wait>
                                             <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
-                                            <log>.*Setup has completed\..*</log>
-                                            <!-- Unfortunately booting DB2 is slow, needs to set a generous (10m) timeout: -->
-                                            <time>600000</time>
+                                            <log>.*INSTANCE.*</log>
+                                            <!-- Unfortunately booting DB2 is slow, needs to set a generous (15m) timeout;
+                                             it generally starts in 2-3 minutes, but it's been occasionally slightly above 10m -->
+                                            <time>900000</time>
+                                            <!-- Kill the container, if it doesn't stop before this given time
+                                             duration since a graceful stop was issued -->
+                                            <kill>300000</kill>
                                         </wait>
                                     </run>
                                 </image>
@@ -243,7 +232,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/FruitResource.java b/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/FruitResource.java
deleted file mode 100644
index 97b0c8a6b5fa0..0000000000000
--- a/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/FruitResource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.quarkus.it.reactive.db2.client;
-
-import java.util.concurrent.CompletionStage;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-import io.vertx.mutiny.db2client.DB2Pool;
-import io.vertx.mutiny.sqlclient.Row;
-
-@Path("/fruits")
-public class FruitResource {
-
-    @Inject
-    DB2Pool client;
-
-    @PostConstruct
-    void setupDb() {
-        client.query("DROP TABLE IF EXISTS fruits").execute()
-                .flatMap(r -> client
-                        .query("CREATE TABLE fruits (id INTEGER NOT NULL GENERATED AS IDENTITY, name VARCHAR(50) NOT NULL)")
-                        .execute())
-                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Orange')").execute())
-                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Pear')").execute())
-                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Apple')").execute())
-                .await().indefinitely();
-    }
-
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    public CompletionStage<JsonArray> listFruits() {
-        return client.query("SELECT * FROM fruits").execute()
-                .map(mysqlRowSet -> {
-                    JsonArray jsonArray = new JsonArray();
-                    for (Row row : mysqlRowSet) {
-                        jsonArray.add(toJson(row));
-                    }
-                    return jsonArray;
-                })
-                .subscribeAsCompletionStage();
-    }
-
-    private JsonObject toJson(Row row) {
-        return new JsonObject()
-                .put("id", row.getLong("id"))
-                .put("name", row.getString("name"));
-    }
-
-}
diff --git a/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java b/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java
new file mode 100644
index 0000000000000..26c911fc5228a
--- /dev/null
+++ b/integration-tests/reactive-db2-client/src/main/java/io/quarkus/it/reactive/db2/client/PlantResource.java
@@ -0,0 +1,81 @@
+package io.quarkus.it.reactive.db2.client;
+
+import java.util.concurrent.CompletionStage;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.mutiny.db2client.DB2Pool;
+import io.vertx.mutiny.sqlclient.Row;
+
+@Path("/plants")
+public class PlantResource {
+
+    @Inject
+    DB2Pool client;
+
+    @Inject
+    @ReactiveDataSource("additional")
+    DB2Pool additionalClient;
+
+    @PostConstruct
+    void setupDb() {
+        client.query("DROP TABLE IF EXISTS fruits").execute()
+                .flatMap(r -> client
+                        .query("CREATE TABLE fruits (id INTEGER NOT NULL GENERATED AS IDENTITY, name VARCHAR(50) NOT NULL)")
+                        .execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Orange')").execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Pear')").execute())
+                .flatMap(r -> client.query("INSERT INTO fruits (name) VALUES ('Apple')").execute())
+                .await().indefinitely();
+
+        additionalClient.query("DROP TABLE IF EXISTS vegetables").execute()
+                .flatMap(r -> client
+                        .query("CREATE TABLE legumes (id INTEGER NOT NULL GENERATED AS IDENTITY, name VARCHAR(50) NOT NULL)")
+                        .execute())
+                .flatMap(r -> client.query("INSERT INTO legumes (name) VALUES ('Cumcumber')").execute())
+                .flatMap(r -> client.query("INSERT INTO legumes (name) VALUES ('Broccoli')").execute())
+                .flatMap(r -> client.query("INSERT INTO legumes (name) VALUES ('Leeks')").execute())
+                .await().indefinitely();
+    }
+
+    @GET
+    @Path("/fruits/")
+    public CompletionStage<JsonArray> listFruits() {
+        return client.query("SELECT * FROM fruits ORDER BY name").execute()
+                .map(rowSet -> {
+                    JsonArray jsonArray = new JsonArray();
+                    for (Row row : rowSet) {
+                        jsonArray.add(toJson(row));
+                    }
+                    return jsonArray;
+                })
+                .subscribeAsCompletionStage();
+    }
+
+    @GET
+    @Path("/legumes/")
+    public CompletionStage<JsonArray> listLegumes() {
+        return additionalClient.query("SELECT * FROM legumes ORDER BY name").execute()
+                .map(rowSet -> {
+                    JsonArray jsonArray = new JsonArray();
+                    for (Row row : rowSet) {
+                        jsonArray.add(toJson(row));
+                    }
+                    return jsonArray;
+                })
+                .subscribeAsCompletionStage();
+    }
+
+    private JsonObject toJson(Row row) {
+        return new JsonObject()
+                .put("id", row.getLong("id"))
+                .put("name", row.getString("name"));
+    }
+
+}
diff --git a/integration-tests/reactive-db2-client/src/main/resources/application.properties b/integration-tests/reactive-db2-client/src/main/resources/application.properties
index 2c32df094b7bb..928990ac3ed91 100644
--- a/integration-tests/reactive-db2-client/src/main/resources/application.properties
+++ b/integration-tests/reactive-db2-client/src/main/resources/application.properties
@@ -2,3 +2,8 @@ quarkus.datasource.db-kind=db2
 quarkus.datasource.username=hreact
 quarkus.datasource.password=hreact
 quarkus.datasource.reactive.url=${reactive-db2.url}
+
+quarkus.datasource."additional".db-kind=db2
+quarkus.datasource."additional".username=hreact
+quarkus.datasource."additional".password=hreact
+quarkus.datasource."additional".reactive.url=${reactive-db2.url}
diff --git a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/FruitsEndpointTest.java b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/FruitsEndpointTest.java
deleted file mode 100644
index a0c89a5261a6c..0000000000000
--- a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/FruitsEndpointTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.it.reactive.db2.client;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.containsString;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-public class FruitsEndpointTest {
-
-    @Test
-    public void testListAllFruits() {
-        given()
-                .when().get("/fruits")
-                .then()
-                .statusCode(200)
-                .body(
-                        containsString("Orange"),
-                        containsString("Pear"),
-                        containsString("Apple"));
-    }
-
-}
diff --git a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/HealthCheckTest.java b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/HealthCheckTest.java
index 14da9989ef4d3..826ff4f7a66ea 100644
--- a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/HealthCheckTest.java
+++ b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/HealthCheckTest.java
@@ -14,11 +14,11 @@
 public class HealthCheckTest {
     @Test
     public void testHealthCheck() {
-        RestAssured.when().get("/health").then()
+        RestAssured.when().get("/q/health").then()
                 .contentType(ContentType.JSON)
                 .header("Content-Type", containsString("charset=UTF-8"))
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
-                        "checks.name", containsInAnyOrder("Reactive DB2 connection health check"));
+                        "checks.name", containsInAnyOrder("Reactive DB2 connections health check"));
     }
 }
diff --git a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/NativeFruitsEndpointIT.java b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/NativeFruitsEndpointIT.java
deleted file mode 100644
index 4a8169b292461..0000000000000
--- a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/NativeFruitsEndpointIT.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.quarkus.it.reactive.db2.client;
-
-import io.quarkus.test.junit.NativeImageTest;
-
-@NativeImageTest
-public class NativeFruitsEndpointIT extends FruitsEndpointTest {
-
-    // Runs the same tests as the parent class
-
-}
diff --git a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/NativeQueryIT.java b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/NativeQueryIT.java
new file mode 100644
index 0000000000000..a394e6317077a
--- /dev/null
+++ b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/NativeQueryIT.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.reactive.db2.client;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class NativeQueryIT extends QueryTest {
+
+    // Runs the same tests as the parent class
+
+}
diff --git a/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/QueryTest.java b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/QueryTest.java
new file mode 100644
index 0000000000000..1066f5405dd43
--- /dev/null
+++ b/integration-tests/reactive-db2-client/src/test/java/io/quarkus/it/reactive/db2/client/QueryTest.java
@@ -0,0 +1,37 @@
+package io.quarkus.it.reactive.db2.client;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class QueryTest {
+
+    @Test
+    public void testListAllFruits() {
+        given()
+                .when().get("/plants/fruits/")
+                .then()
+                .statusCode(200)
+                .body(
+                        containsString("Apple"),
+                        containsString("Orange"),
+                        containsString("Pear"));
+    }
+
+    @Test
+    public void testListAllLegumes() {
+        given()
+                .when().get("/plants/legumes/")
+                .then()
+                .statusCode(200)
+                .body(
+                        containsString("Broccoli"),
+                        containsString("Cumcumber"),
+                        containsString("Leeks"));
+    }
+
+}
diff --git a/integration-tests/reactive-messaging-amqp/pom.xml b/integration-tests/reactive-messaging-amqp/pom.xml
index 72fe3973d9eaa..0dbdd3ef64f77 100644
--- a/integration-tests/reactive-messaging-amqp/pom.xml
+++ b/integration-tests/reactive-messaging-amqp/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,10 +13,6 @@
     <name>Quarkus - Integration Tests - Reactive Messaging - AMQP</name>
     <description>The AMQP integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -84,6 +79,60 @@
             <artifactId>artemis-amqp-protocol</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-amqp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -102,61 +151,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image-it-main</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${project.version}</version>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java
index 91c283b3a1729..c0526aaefeee1 100644
--- a/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java
+++ b/integration-tests/reactive-messaging-amqp/src/main/java/io/quarkus/it/amqp/AmqpEndpoint.java
@@ -5,8 +5,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 @Path("/amqp")
 public class AmqpEndpoint {
@@ -16,7 +14,6 @@ public class AmqpEndpoint {
 
     @GET
     @Path("/people")
-    @Produces(MediaType.APPLICATION_JSON)
     public List<Person> getPeople() {
         return people.getPeople();
     }
diff --git a/integration-tests/reactive-messaging-http/pom.xml b/integration-tests/reactive-messaging-http/pom.xml
new file mode 100644
index 0000000000000..1b9190002fdb0
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-reactive-messaging-http</artifactId>
+    <name>Quarkus - Integration Tests - Reactive Messaging HTTP</name>
+    <description>Integration tests for the reactive messaging HTTP and Web Sockets extension</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-messaging-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-messaging-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/HttpTestHelper.java b/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/HttpTestHelper.java
new file mode 100644
index 0000000000000..78199e7242a69
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/HttpTestHelper.java
@@ -0,0 +1,43 @@
+package io.quarkus.reactivemessaging.http;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Emitter;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+
+@ApplicationScoped
+@Path("http-helper")
+public class HttpTestHelper {
+    private final List<String> messages = new ArrayList<>();
+
+    @Channel("http-sink")
+    Emitter<String> emitter;
+
+    @Incoming("http-source")
+    void consume(String message) {
+        messages.add(message);
+    }
+
+    @POST
+    public void add(String message) {
+        emitter.send(message);
+    }
+
+    @GET
+    public String getMessages() {
+        return String.join(",", messages);
+    }
+
+    @DELETE
+    public void clear() {
+        messages.clear();
+    }
+}
diff --git a/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/ToUpperCaseSerializer.java b/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/ToUpperCaseSerializer.java
new file mode 100644
index 0000000000000..f2e93121d07fa
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/ToUpperCaseSerializer.java
@@ -0,0 +1,22 @@
+package io.quarkus.reactivemessaging.http;
+
+import org.jboss.logging.Logger;
+
+import io.quarkus.reactivemessaging.http.runtime.serializers.Serializer;
+import io.vertx.core.buffer.Buffer;
+
+public class ToUpperCaseSerializer implements Serializer<String> {
+    private static final Logger log = Logger.getLogger(ToUpperCaseSerializer.class);
+
+    @Override
+    public boolean handles(Object payload) {
+        log.infof("checking if %s of type %s is handled", payload, payload.getClass());
+        return payload instanceof String;
+    }
+
+    @Override
+    public Buffer serialize(String payload) {
+        log.infof("serializing %s", payload);
+        return Buffer.buffer(payload.toUpperCase());
+    }
+}
diff --git a/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/WebSocketTestHelper.java b/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/WebSocketTestHelper.java
new file mode 100644
index 0000000000000..d2fb294cb30d4
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/src/main/java/io/quarkus/reactivemessaging/http/WebSocketTestHelper.java
@@ -0,0 +1,43 @@
+package io.quarkus.reactivemessaging.http;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Emitter;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+
+@ApplicationScoped
+@Path("websocket-helper")
+public class WebSocketTestHelper {
+    private final List<String> messages = new ArrayList<>();
+
+    @Channel("websocket-sink")
+    Emitter<String> emitter;
+
+    @Incoming("websocket-source")
+    void consume(String message) {
+        messages.add(message);
+    }
+
+    @POST
+    public void add(String message) {
+        emitter.send(message);
+    }
+
+    @GET
+    public String getMessages() {
+        return String.join(",", messages);
+    }
+
+    @DELETE
+    public void clear() {
+        messages.clear();
+    }
+}
diff --git a/integration-tests/reactive-messaging-http/src/main/resources/application.properties b/integration-tests/reactive-messaging-http/src/main/resources/application.properties
new file mode 100644
index 0000000000000..4cff8d1cc13a5
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+mp.messaging.incoming.websocket-source.connector=quarkus-websocket
+mp.messaging.incoming.websocket-source.path=/my-websocket
+
+mp.messaging.outgoing.websocket-sink.connector=quarkus-websocket
+mp.messaging.outgoing.websocket-sink.url=ws://localhost:${quarkus.http.test-port:8081}/my-websocket
+mp.messaging.outgoing.websocket-sink.serializer=io.quarkus.reactivemessaging.http.ToUpperCaseSerializer
+
+mp.messaging.incoming.http-source.connector=quarkus-http
+mp.messaging.incoming.http-source.path=/my-http-resource
+mp.messaging.incoming.http-source.method=PUT
+
+mp.messaging.outgoing.http-sink.connector=quarkus-http
+mp.messaging.outgoing.http-sink.method=PUT
+mp.messaging.outgoing.http-sink.url=http://localhost:${quarkus.http.test-port:8081}/my-http-resource
+mp.messaging.outgoing.http-sink.serializer=io.quarkus.reactivemessaging.http.ToUpperCaseSerializer
diff --git a/integration-tests/reactive-messaging-http/src/test/java/io/quarkus/reactivemessaging/http/ReactiveMessagingHttpIT.java b/integration-tests/reactive-messaging-http/src/test/java/io/quarkus/reactivemessaging/http/ReactiveMessagingHttpIT.java
new file mode 100644
index 0000000000000..c0e332878b41e
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/src/test/java/io/quarkus/reactivemessaging/http/ReactiveMessagingHttpIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.reactivemessaging.http;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ReactiveMessagingHttpIT extends ReactiveMessagingHttpTest {
+}
diff --git a/integration-tests/reactive-messaging-http/src/test/java/io/quarkus/reactivemessaging/http/ReactiveMessagingHttpTest.java b/integration-tests/reactive-messaging-http/src/test/java/io/quarkus/reactivemessaging/http/ReactiveMessagingHttpTest.java
new file mode 100644
index 0000000000000..875f48bafb735
--- /dev/null
+++ b/integration-tests/reactive-messaging-http/src/test/java/io/quarkus/reactivemessaging/http/ReactiveMessagingHttpTest.java
@@ -0,0 +1,56 @@
+package io.quarkus.reactivemessaging.http;
+
+import static io.restassured.RestAssured.delete;
+import static io.restassured.RestAssured.get;
+import static io.restassured.RestAssured.given;
+import static org.awaitility.Awaitility.await;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class ReactiveMessagingHttpTest {
+
+    @Test
+    public void shouldSendAndConsumeWebSocketAndUseCustomSerializer() {
+        //@formatter:off
+        given()
+                .body("test-message")
+        .when()
+                .post("/websocket-helper")
+        .then()
+                .statusCode(204);
+        //@formatter:on
+
+        await()
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> get("/websocket-helper").getBody().asString(), Predicate.isEqual("TEST-MESSAGE"));
+    }
+
+    @Test
+    public void shouldSendAndConsumeHttpAndUseCustomSerializer() throws Exception {
+        //@formatter:off
+        given()
+                .body("test-message")
+                .when()
+        .post("/http-helper")
+                .then()
+                .statusCode(204);
+        //@formatter:on
+
+        await()
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> get("/http-helper").getBody().asString(), Predicate.isEqual("TEST-MESSAGE"));
+    }
+
+    @AfterEach
+    public void cleanUp() {
+        delete("/http-helper").then().statusCode(204);
+        delete("/websocket-helper").then().statusCode(204);
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/pom.xml b/integration-tests/reactive-messaging-kafka/pom.xml
new file mode 100644
index 0000000000000..ec6af141891c9
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/pom.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-reactive-messaging-kafka</artifactId>
+    <name>Quarkus - Integration Tests - Reactive Messaging - Kafka</name>
+    <description>The Kafka Reactive Messaging integration tests module</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-shared-library</artifactId>
+        </dependency>
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
+
+        <!-- Health -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health</artifactId>
+        </dependency>
+
+        <!-- Kafka -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+        </dependency>
+
+
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.debezium</groupId>
+            <artifactId>debezium-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.debezium</groupId>
+            <artifactId>debezium-core</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-integration-test-class-transformer-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kafka-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-kafka-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-reactive-messaging-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-kafka</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
+        </profile>
+    </profiles>
+
+
+</project>
\ No newline at end of file
diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java
new file mode 100644
index 0000000000000..a0df5bfd4f8ec
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/KafkaEndpoint.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.kafka;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/kafka")
+public class KafkaEndpoint {
+    @Inject
+    PeopleManager people;
+
+    @GET
+    @Path("/people")
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<Person> getPeople() {
+        return people.getPeople();
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleManager.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleManager.java
new file mode 100644
index 0000000000000..64a408e3b05f9
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleManager.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.kafka;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+public class PeopleManager {
+
+    private final Logger log = Logger.getLogger(PeopleManager.class);
+
+    private final List<Person> list = new CopyOnWriteArrayList<>();
+
+    @Incoming("people-in")
+    public void consume(Person person) {
+        list.add(person);
+    }
+
+    public List<Person> getPeople() {
+        log.info("Returning people " + list);
+        return list;
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java
new file mode 100644
index 0000000000000..def7dd4e0baff
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PeopleProducer.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.kafka;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.reactive.messaging.Outgoing;
+
+import io.smallrye.mutiny.Multi;
+
+@ApplicationScoped
+public class PeopleProducer {
+    @Outgoing("people-out")
+    public Multi<Person> generatePeople() {
+        return Multi.createFrom().items(
+                new Person("bob"),
+                new Person("alice"),
+                new Person("tom"),
+                new Person("jerry"),
+                new Person("anna"),
+                new Person("ken"));
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/Person.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/Person.java
new file mode 100644
index 0000000000000..079fe366ed16c
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/Person.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.kafka;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+public class Person {
+    private String name;
+
+    public Person() {
+        // default no-arg constructor.
+    }
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Person setName(String name) {
+        this.name = name;
+        return this;
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PersonDeserializer.java b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PersonDeserializer.java
new file mode 100644
index 0000000000000..651bb99bc5ce1
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/main/java/io/quarkus/it/kafka/PersonDeserializer.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.kafka;
+
+import io.quarkus.kafka.client.serialization.JsonbDeserializer;
+
+public class PersonDeserializer extends JsonbDeserializer<Person> {
+    public PersonDeserializer() {
+        super(Person.class);
+    }
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/main/resources/application.properties b/integration-tests/reactive-messaging-kafka/src/main/resources/application.properties
new file mode 100644
index 0000000000000..cf40237cdc859
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/main/resources/application.properties
@@ -0,0 +1,15 @@
+quarkus.log.category.kafka.level=WARN
+quarkus.log.category.\"org.apache.kafka\".level=WARN
+quarkus.log.category.\"org.apache.zookeeper\".level=WARN
+
+# enable health check
+quarkus.kafka.health.enabled=true
+kafka.bootstrap.servers=localhost:19092
+
+mp.messaging.outgoing.people-out.connector=smallrye-kafka
+mp.messaging.outgoing.people-out.topic=people
+mp.messaging.outgoing.people-out.value.serializer=io.quarkus.kafka.client.serialization.JsonbSerializer
+mp.messaging.incoming.people-in.connector=smallrye-kafka
+mp.messaging.incoming.people-in.topic=people
+mp.messaging.incoming.people-in.auto.offset.reset=earliest
+mp.messaging.incoming.people-in.value.deserializer=io.quarkus.it.kafka.PersonDeserializer
diff --git a/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorIT.java b/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorIT.java
new file mode 100644
index 0000000000000..c488a034e2275
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.kafka;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class KafkaConnectorIT extends KafkaConnectorTest {
+
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java b/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java
new file mode 100644
index 0000000000000..716033d65b3ad
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.it.kafka;
+
+import static io.restassured.RestAssured.get;
+import static org.awaitility.Awaitility.await;
+
+import java.util.List;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.common.mapper.TypeRef;
+
+@QuarkusTest
+@QuarkusTestResource(KafkaTestResource.class)
+public class KafkaConnectorTest {
+    private static final Logger log = Logger.getLogger(KafkaTestResource.class);
+
+    protected static final TypeRef<List<Person>> TYPE_REF = new TypeRef<List<Person>>() {
+    };
+
+    @Test
+    public void test() {
+        await().untilAsserted(() -> Assertions.assertEquals(get("/kafka/people").as(TYPE_REF).size(), 6));
+    }
+
+}
diff --git a/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaTestResource.java b/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaTestResource.java
new file mode 100644
index 0000000000000..b4e819b120574
--- /dev/null
+++ b/integration-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaTestResource.java
@@ -0,0 +1,41 @@
+package io.quarkus.it.kafka;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Properties;
+
+import io.debezium.kafka.KafkaCluster;
+import io.debezium.util.Testing;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class KafkaTestResource implements QuarkusTestResourceLifecycleManager {
+
+    private KafkaCluster kafka;
+
+    @Override
+    public Map<String, String> start() {
+        try {
+            Properties props = new Properties();
+            props.setProperty("zookeeper.connection.timeout.ms", "45000");
+            File directory = Testing.Files.createTestingDirectory("kafka-data", true);
+            kafka = new KafkaCluster().withPorts(2182, 19092)
+                    .addBrokers(1)
+                    .usingDirectory(directory)
+                    .deleteDataUponShutdown(true)
+                    .withKafkaConfiguration(props)
+                    .deleteDataPriorToStartup(true)
+                    .startup();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public void stop() {
+        if (kafka != null) {
+            kafka.shutdown();
+        }
+    }
+}
diff --git a/integration-tests/reactive-mysql-client/README.md b/integration-tests/reactive-mysql-client/README.md
index 90e3b56701e9e..2593e4f8089f6 100644
--- a/integration-tests/reactive-mysql-client/README.md
+++ b/integration-tests/reactive-mysql-client/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with MariaDB started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-mariadb -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-mariadb -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run MariaDB as a Docker container, you can start your own MariaDB or MySQL server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`.
@@ -21,7 +21,7 @@ If you don't want to run MariaDB as a Docker container, you can start your own M
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-mariadb
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dreactive-mysql.url=vertx-reactive:mysql://localhost:3308/hibernate_orm_test`.
diff --git a/integration-tests/reactive-mysql-client/pom.xml b/integration-tests/reactive-mysql-client/pom.xml
index 36907dfb8e970..41cca43658b9f 100644
--- a/integration-tests/reactive-mysql-client/pom.xml
+++ b/integration-tests/reactive-mysql-client/pom.xml
@@ -6,7 +6,7 @@
   ~ (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
+  ~ https://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
@@ -24,7 +24,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-reactive-mysql-client</artifactId>
@@ -60,6 +59,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-mysql-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -101,7 +141,7 @@
             <id>test-mariadb</id>
             <activation>
                 <property>
-                    <name>test-mariadb</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -122,67 +162,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-mariadb</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -267,7 +251,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java b/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java
index fde00acccddc0..54d0adc901dbb 100644
--- a/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java
+++ b/integration-tests/reactive-mysql-client/src/main/java/io/quarkus/it/reactive/mysql/client/FruitResource.java
@@ -6,8 +6,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
@@ -31,7 +29,6 @@ void setupDb() {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<JsonArray> listFruits() {
         return client.query("SELECT * FROM fruits").execute()
                 .map(mysqlRowSet -> {
diff --git a/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/HealthCheckTest.java b/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/HealthCheckTest.java
index 4c8a66598ef9a..001ee97addec6 100644
--- a/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/HealthCheckTest.java
+++ b/integration-tests/reactive-mysql-client/src/test/java/io/quarkus/it/reactive/mysql/client/HealthCheckTest.java
@@ -14,11 +14,11 @@
 public class HealthCheckTest {
     @Test
     public void testHealthCheck() {
-        RestAssured.when().get("/health").then()
+        RestAssured.when().get("/q/health").then()
                 .contentType(ContentType.JSON)
                 .header("Content-Type", containsString("charset=UTF-8"))
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
-                        "checks.name", containsInAnyOrder("Reactive MySQL connection health check"));
+                        "checks.name", containsInAnyOrder("Reactive MySQL connections health check"));
     }
 }
diff --git a/integration-tests/reactive-pg-client/README.md b/integration-tests/reactive-pg-client/README.md
index cf9a7fa83af9a..586be74321b48 100644
--- a/integration-tests/reactive-pg-client/README.md
+++ b/integration-tests/reactive-pg-client/README.md
@@ -7,13 +7,13 @@ By default, the tests of this module are disabled.
 To run the tests in a standard JVM with PostgreSQL started as a Docker container, you can run the following command:
 
 ```
-mvn clean install -Dtest-postgresql -Ddocker
+mvn clean install -Dtest-containers -Dstart-containers
 ```
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-postgresql -Ddocker -Dnative
+mvn clean install -Dtest-containers -Dstart-containers -Dnative
 ```
 
 If you don't want to run PostgreSQL as a Docker container, you can start your own PostgreSQL server. It needs to listen on the default port and have a database called `hibernate_orm_test` accessible to the user `hibernate_orm_test` with the password `hibernate_orm_test`.
@@ -21,7 +21,7 @@ If you don't want to run PostgreSQL as a Docker container, you can start your ow
 You can then run the tests as follows (either with `-Dnative` or not):
 
 ```
-mvn clean install -Dtest-postgresql
+mvn clean install -Dtest-containers
 ```
 
 If you have specific requirements, you can define a specific connection URL with `-Dreactive-postgres.url=vertx-reactive:postgresql://:5431/hibernate_orm_test`.
diff --git a/integration-tests/reactive-pg-client/pom.xml b/integration-tests/reactive-pg-client/pom.xml
index 730527896edeb..d418d3ed57eab 100644
--- a/integration-tests/reactive-pg-client/pom.xml
+++ b/integration-tests/reactive-pg-client/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-reactive-pg-client</artifactId>
@@ -48,6 +47,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-pg-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,7 +134,7 @@
             <id>test-postgresql</id>
             <activation>
                 <property>
-                    <name>test-postgresql</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -115,67 +155,11 @@
             </build>
         </profile>
 
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>docker-postgresql</id>
             <activation>
                 <property>
-                    <name>docker</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
             <properties>
@@ -189,7 +173,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>postgres:10.5</name>
+                                    <name>postgres:13.1</name>
                                     <alias>postgresql</alias>
                                     <run>
                                         <env>
@@ -212,7 +196,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all postgres:10.5 images currently running, not just those we just started.
+                            <!--Stops all postgres images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>
@@ -245,7 +229,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java b/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java
index fe1790f64dcf5..62ffa12205ff4 100644
--- a/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java
+++ b/integration-tests/reactive-pg-client/src/main/java/io/quarkus/it/reactive/pg/client/FruitResource.java
@@ -6,8 +6,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
@@ -31,7 +29,6 @@ void setupDb() {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<JsonArray> listFruits() {
         return client.query("SELECT * FROM fruits").execute()
                 .map(pgRowSet -> {
diff --git a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HealthCheckTest.java b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HealthCheckTest.java
index 9f34f41ff9f86..d46174f494e17 100644
--- a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HealthCheckTest.java
+++ b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HealthCheckTest.java
@@ -14,11 +14,11 @@
 public class HealthCheckTest {
     @Test
     public void testHealthCheck() {
-        RestAssured.when().get("/health").then()
+        RestAssured.when().get("/q/health").then()
                 .contentType(ContentType.JSON)
                 .header("Content-Type", containsString("charset=UTF-8"))
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
-                        "checks.name", containsInAnyOrder("Reactive PostgreSQL connection health check"));
+                        "checks.name", containsInAnyOrder("Reactive PostgreSQL connections health check"));
     }
 }
diff --git a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java
index 17a2937681a6c..07caee6d4921b 100644
--- a/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java
+++ b/integration-tests/reactive-pg-client/src/test/java/io/quarkus/it/reactive/pg/client/HotReloadFruitResource.java
@@ -6,8 +6,6 @@
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
@@ -31,7 +29,6 @@ void setupDb() {
     }
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public CompletionStage<JsonArray> listFruits() {
         return client.query("SELECT * FROM fruits").execute()
                 .map(pgRowSet -> {
diff --git a/integration-tests/redis-client/README.md b/integration-tests/redis-client/README.md
index d943e88df2ca1..9de6f22274ecd 100644
--- a/integration-tests/redis-client/README.md
+++ b/integration-tests/redis-client/README.md
@@ -2,20 +2,36 @@
 
 ## Running the tests
 
-By default, the tests of this module are disabled.
+By default, the tests of this module are disabled. To activate the test, use the `-Dtest-containers` option. 
+
+NB: Tests in this module will attempt a connection to a local Redis listening on the default port. 
+If you have specific requirements, you can define a specific connection URL with `-Dquarkus.redis.hosts=host:port`.
+Or, you can use the `-Dstart-containers` option to start the Redis Server container automatically. 
+
+### Running tests in JVM mode
 
 To run, you can run the following command:
 
 ```
-mvn clean install -Dtest-redis
+mvn clean install -Dtest-containers
 ```
 
-NB: Tests in this module will attempt a connection to a local Redis listening on the default port. 
-If you have specific requirements, you can define a specific connection URL with `-Dquarkus.redis.hosts=host:port`.
+Alternatively, to run the tests in JVM mode with Redis Server started as a Docker container, you can run the following command:
 
+```
+mvn clean install -Dtest-containers -Dstart-containers
+```
+
+### Running tests in native mode
 
 Additionally, you can generate a native image and run the tests for this native image by adding `-Dnative`:
 
 ```
-mvn clean install -Dtest-redis -Dnative
+mvn clean install -Dtest-containers -Dnative
+```
+
+You can also use the `-Dstart-containers` system property (as shown below), if you want the Redis Server container to be started automatically.
+
+```
+mvn clean install -Dtest-containers -Dnative -Dstart-containers
 ```
diff --git a/integration-tests/redis-client/pom.xml b/integration-tests/redis-client/pom.xml
index a2691d69482ee..199c29fbd8ad4 100644
--- a/integration-tests/redis-client/pom.xml
+++ b/integration-tests/redis-client/pom.xml
@@ -8,8 +8,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>redis-client-integration-test</artifactId>
-    <name>Quarkus - Redis Client - Integration Test</name>
+    <artifactId>quarkus-integration-test-redis-client</artifactId>
+    <name>Quarkus - Integration Tests - Redis Client</name>
 
     <properties>
         <redis.url>localhost:6379</redis.url>
@@ -40,6 +40,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-redis-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -81,7 +122,7 @@
             <id>test-redis</id>
             <activation>
                 <property>
-                    <name>test-redis</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -101,54 +142,81 @@
                 </plugins>
             </build>
         </profile>
-
         <profile>
-            <id>native-image</id>
+            <id>docker-redis</id>
             <activation>
                 <property>
-                    <name>native</name>
+                    <name>start-containers</name>
                 </property>
             </activation>
+            <properties>
+                <redis.url>localhost:6379</redis.url>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
+                            <images>
+                                <image>
+                                    <name>redis:5.0.8-alpine</name>
+                                    <alias>quarkus-test-redis</alias>
+                                    <run>
+                                        <ports>
+                                            <port>6379:6379</port>
+                                        </ports>
+                                        <log>
+                                            <prefix>Redis:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <!-- Speed things up a bit by not actually flushing writes to disk -->
+                                        <wait>
+                                            <!-- good docs found at: http://dmp.fabric8.io/#start-wait -->
+                                            <time>5000</time>
+                                            <!-- wait until Redis is actually up by checking if we can ping the server-->
+                                            <exec>
+                                                <postStart>redis-cli PING</postStart>
+                                            </exec>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <!--Stops all redis images currently running, not just those we just started.
+                              Useful to stop processes still running from a previously failed integration test run -->
+                            <allContainers>true</allContainers>
                         </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
                                 <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
                                 </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>native-image</id>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <additionalBuildArgs>-H:+TraceClassInitialization</additionalBuildArgs>
+                                    <executable>${docker-prune.location}</executable>
                                 </configuration>
                             </execution>
                         </executions>
@@ -156,6 +224,7 @@
                 </plugins>
             </build>
         </profile>
+
     </profiles>
 
 </project>
diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java
index e59101e6ae2ce..0a4e0221110a7 100644
--- a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java
+++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisResource.java
@@ -12,6 +12,7 @@
 import io.quarkus.redis.client.RedisClient;
 import io.quarkus.redis.client.reactive.ReactiveRedisClient;
 import io.smallrye.mutiny.Uni;
+import io.vertx.redis.client.Response;
 
 @Path("/quarkus-redis")
 @ApplicationScoped
@@ -26,7 +27,8 @@ public class RedisResource {
     @GET
     @Path("/sync/{key}")
     public String getSync(@PathParam("key") String key) {
-        return redisClient.get(key).toString();
+        Response response = redisClient.get(key);
+        return response == null ? null : response.toString();
     }
 
     @POST
@@ -41,7 +43,7 @@ public void setSync(@PathParam("key") String key, String value) {
     public Uni<String> getReactive(@PathParam("key") String key) {
         return reactiveRedisClient
                 .get(key)
-                .map(response -> response.toString());
+                .map(response -> response == null ? null : response.toString());
     }
 
     @POST
diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java
new file mode 100644
index 0000000000000..fe5e1826122b1
--- /dev/null
+++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithNamedClientResource.java
@@ -0,0 +1,60 @@
+package io.quarkus.redis.it;
+
+import java.util.Arrays;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.RedisClientName;
+import io.quarkus.redis.client.reactive.ReactiveRedisClient;
+import io.smallrye.mutiny.Uni;
+import io.vertx.redis.client.Response;
+
+@Path("/quarkus-redis-with-named")
+@ApplicationScoped
+public class RedisWithNamedClientResource {
+    @Inject
+    @RedisClientName("named-client")
+    RedisClient redisClient;
+
+    @Inject
+    @RedisClientName("named-reactive-client")
+    ReactiveRedisClient reactiveRedisClient;
+
+    // synchronous
+    @GET
+    @Path("/sync/{key}")
+    public String getSync(@PathParam("key") String key) {
+        Response response = redisClient.get(key);
+        return response == null ? null : response.toString();
+    }
+
+    @POST
+    @Path("/sync/{key}")
+    public void setSync(@PathParam("key") String key, String value) {
+        this.redisClient.set(Arrays.asList(key, value));
+    }
+
+    // reactive
+    @GET
+    @Path("/reactive/{key}")
+    public Uni<String> getReactive(@PathParam("key") String key) {
+        return reactiveRedisClient
+                .get(key)
+                .map(response -> response == null ? null : response.toString());
+    }
+
+    @POST
+    @Path("/reactive/{key}")
+    public Uni<Void> setReactive(@PathParam("key") String key, String value) {
+        return this.reactiveRedisClient
+                .set(Arrays.asList(key, value))
+                .map(response -> null);
+    }
+
+}
diff --git a/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java
new file mode 100644
index 0000000000000..04bcf89ede084
--- /dev/null
+++ b/integration-tests/redis-client/src/main/java/io/quarkus/redis/it/RedisWithParameterInjectionResource.java
@@ -0,0 +1,62 @@
+package io.quarkus.redis.it;
+
+import java.util.Arrays;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import io.quarkus.redis.client.RedisClient;
+import io.quarkus.redis.client.RedisClientName;
+import io.quarkus.redis.client.reactive.ReactiveRedisClient;
+import io.smallrye.mutiny.Uni;
+import io.vertx.redis.client.Response;
+
+@Path("/quarkus-redis-parameter-injection")
+@ApplicationScoped
+public class RedisWithParameterInjectionResource {
+    private RedisClient redisClient;
+    private ReactiveRedisClient reactiveRedisClient;
+
+    @Inject
+    public RedisWithParameterInjectionResource(@RedisClientName("parameter-injection") RedisClient redisClient,
+            @RedisClientName("parameter-injection") ReactiveRedisClient reactiveRedisClient) {
+        this.redisClient = redisClient;
+        this.reactiveRedisClient = reactiveRedisClient;
+    }
+
+    // synchronous
+    @GET
+    @Path("/sync/{key}")
+    public String getSync(@PathParam("key") String key) {
+        Response response = redisClient.get(key);
+        return response == null ? null : response.toString();
+    }
+
+    @POST
+    @Path("/sync/{key}")
+    public void setSync(@PathParam("key") String key, String value) {
+        this.redisClient.set(Arrays.asList(key, value));
+    }
+
+    // reactive
+    @GET
+    @Path("/reactive/{key}")
+    public Uni<String> getReactive(@PathParam("key") String key) {
+        return reactiveRedisClient
+                .get(key)
+                .map(response -> response == null ? null : response.toString());
+    }
+
+    @POST
+    @Path("/reactive/{key}")
+    public Uni<Void> setReactive(@PathParam("key") String key, String value) {
+        return this.reactiveRedisClient
+                .set(Arrays.asList(key, value))
+                .map(response -> null);
+    }
+
+}
diff --git a/integration-tests/redis-client/src/main/resources/application.properties b/integration-tests/redis-client/src/main/resources/application.properties
new file mode 100644
index 0000000000000..0c97b128de22a
--- /dev/null
+++ b/integration-tests/redis-client/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+quarkus.redis.hosts=redis://localhost:6379/0
+quarkus.redis.named-client.hosts=redis://localhost:6379/1
+quarkus.redis.parameter-injection.hosts=redis://localhost:6379/2
+quarkus.redis.named-reactive-client.hosts=redis://localhost:6379/1
diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/HealthCheckTest.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/HealthCheckTest.java
index c3c424056d424..160b407e826ca 100644
--- a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/HealthCheckTest.java
+++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/HealthCheckTest.java
@@ -3,6 +3,7 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasKey;
 
 import org.junit.jupiter.api.Test;
 
@@ -14,11 +15,14 @@
 public class HealthCheckTest {
     @Test
     public void testHealthCheck() {
-        RestAssured.when().get("/health").then()
+        RestAssured.when().get("/q/health").then()
                 .contentType(ContentType.JSON)
                 .header("Content-Type", containsString("charset=UTF-8"))
                 .body("status", is("UP"),
                         "checks.status", containsInAnyOrder("UP"),
+                        "checks.data", containsInAnyOrder(hasKey("default")),
+                        "checks.data", containsInAnyOrder(hasKey("named-client")),
+                        "checks.data", containsInAnyOrder(hasKey("named-reactive-client")),
                         "checks.name", containsInAnyOrder("Redis connection health check"));
     }
 }
diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java
index 2c407bab66bb9..700f8d7888ce6 100644
--- a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java
+++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisTest.java
@@ -8,14 +8,19 @@
 
 @QuarkusTest
 class QuarkusRedisTest {
-    private static final String SYNC_KEY = "sync-key";
-    private static final String SYNC_VALUE = "sync-value";
-
-    private static final String REACTIVE_KEY = "reactive-key";
-    private static final String REACTIVE_VALUE = "reactive-value";
+    static final String SYNC_KEY = "sync-key";
+    static final String SYNC_VALUE = "sync-value";
+    static final String REACTIVE_KEY = "reactive-key";
+    static final String REACTIVE_VALUE = "reactive-value";
 
     @Test
     public void sync() {
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(204); // the key is not set yet
+
         RestAssured.given()
                 .body(SYNC_VALUE)
                 .when()
@@ -33,6 +38,12 @@ public void sync() {
 
     @Test
     public void reactive() {
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(204); // the reactive key is not set yet
+
         RestAssured.given()
                 .body(REACTIVE_VALUE)
                 .when()
diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithNamedClientIT.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithNamedClientIT.java
new file mode 100644
index 0000000000000..92c551b40c99e
--- /dev/null
+++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithNamedClientIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.redis.it;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class QuarkusRedisWithNamedClientIT extends QuarkusRedisWithNamedClientTest {
+
+}
diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithNamedClientTest.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithNamedClientTest.java
new file mode 100644
index 0000000000000..bdde0097d9bcb
--- /dev/null
+++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithNamedClientTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.redis.it;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+class QuarkusRedisWithNamedClientTest {
+    static final String SYNC_KEY = "named-sync-key";
+    static final String SYNC_VALUE = "named-sync-value";
+
+    static final String REACTIVE_KEY = "named-reactive-key";
+    static final String REACTIVE_VALUE = "named-reactive-value";
+
+    @Test
+    public void sync() {
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-with-named/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(204); // the key is not set yet
+
+        RestAssured.given()
+                .body(SYNC_VALUE)
+                .when()
+                .post("/quarkus-redis-with-named/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(204);
+
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-with-named/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.is(SYNC_VALUE));
+    }
+
+    @Test
+    public void reactive() {
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-with-named/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(204); // the reactive key is not set yet
+
+        RestAssured.given()
+                .body(REACTIVE_VALUE)
+                .when()
+                .post("/quarkus-redis-with-named/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(204);
+
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-with-named/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.is(REACTIVE_VALUE));
+    }
+}
diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithParameterInjectionIT.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithParameterInjectionIT.java
new file mode 100644
index 0000000000000..02f89847cb8d2
--- /dev/null
+++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithParameterInjectionIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.redis.it;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class QuarkusRedisWithParameterInjectionIT extends QuarkusRedisWithParameterInjectionTest {
+
+}
diff --git a/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithParameterInjectionTest.java b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithParameterInjectionTest.java
new file mode 100644
index 0000000000000..074447ea01b0d
--- /dev/null
+++ b/integration-tests/redis-client/src/test/java/io/quarkus/redis/it/QuarkusRedisWithParameterInjectionTest.java
@@ -0,0 +1,62 @@
+package io.quarkus.redis.it;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+class QuarkusRedisWithParameterInjectionTest {
+    static final String SYNC_KEY = "named-sync-key";
+    static final String SYNC_VALUE = "named-sync-value";
+
+    static final String REACTIVE_KEY = "named-reactive-key";
+    static final String REACTIVE_VALUE = "named-reactive-value";
+
+    @Test
+    public void sync() {
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-parameter-injection/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(204); // the key is not set yet
+
+        RestAssured.given()
+                .body(SYNC_VALUE)
+                .when()
+                .post("/quarkus-redis-parameter-injection/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(204);
+
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-parameter-injection/sync/" + SYNC_KEY)
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.is(SYNC_VALUE));
+    }
+
+    @Test
+    public void reactive() {
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-parameter-injection/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(204); // the reactive key is not set yet
+
+        RestAssured.given()
+                .body(REACTIVE_VALUE)
+                .when()
+                .post("/quarkus-redis-parameter-injection/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(204);
+
+        RestAssured.given()
+                .when()
+                .get("/quarkus-redis-parameter-injection/reactive/" + REACTIVE_KEY)
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.is(REACTIVE_VALUE));
+    }
+}
diff --git a/integration-tests/rest-client/pom.xml b/integration-tests/rest-client/pom.xml
index 370f791deb42f..7faa4bae6a482 100644
--- a/integration-tests/rest-client/pom.xml
+++ b/integration-tests/rest-client/pom.xml
@@ -1,154 +1,182 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>quarkus-integration-tests-parent</artifactId>
-		<groupId>io.quarkus</groupId>
-		<version>999-SNAPSHOT</version>
-		<relativePath>../</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>quarkus-integration-test-rest-client</artifactId>
-	<name>Quarkus - Integration Tests - REST client</name>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>quarkus-integration-test-rest-client</artifactId>
+    <name>Quarkus - Integration Tests - REST client</name>
 
-	<properties>
-		<maven.compiler.parameters>true</maven.compiler.parameters>
-		<self-signed.trust-store>${project.basedir}/self-signed</self-signed.trust-store>
-		<self-signed.trust-store-password>changeit</self-signed.trust-store-password>
-		<wrong-host.trust-store>${project.basedir}/wrong-host</wrong-host.trust-store>
-		<wrong-host.trust-store-password>changeit</wrong-host.trust-store-password>
-	</properties>
+    <properties>
+        <self-signed.trust-store>${project.basedir}/self-signed</self-signed.trust-store>
+        <self-signed.trust-store-password>changeit</self-signed.trust-store-password>
+        <wrong-host.trust-store>${project.basedir}/wrong-host</wrong-host.trust-store>
+        <wrong-host.trust-store-password>changeit</wrong-host.trust-store-password>
+    </properties>
 
-	<dependencies>
-		<!-- Server dependencies -->
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-resteasy</artifactId>
-		</dependency>
-		<!-- Client dependencies -->
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-rest-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-multipart-provider</artifactId>
-		</dependency>
-		<!-- Test dependencies -->
-		<dependency>
-			<groupId>io.quarkus</groupId>
-			<artifactId>quarkus-junit5</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.rest-assured</groupId>
-			<artifactId>rest-assured</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <!-- Server dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>io.quarkus</groupId>
-				<artifactId>quarkus-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>build</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<systemPropertyVariables>
-						<!-- force the locale as we want to explicitly test message interpolation -->
-						<user.language>en</user.language>
-						<javax.net.ssl.trustStore>${self-signed.trust-store}</javax.net.ssl.trustStore>
-						<javax.net.ssl.trustStorePassword>${self-signed.trust-store-password}</javax.net.ssl.trustStorePassword>
-						<rest-client.trustStore>${wrong-host.trust-store}</rest-client.trustStore>
-						<rest-client.trustStorePassword>${wrong-host.trust-store-password}</rest-client.trustStorePassword>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <!-- Client dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-fault-tolerance</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+        </dependency>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-	<profiles>
-		<profile>
-			<id>native-image</id>
-			<activation>
-				<property>
-					<name>native</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<skipTests>${native.surefire.skip}</skipTests>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<executions>
-							<execution>
-								<goals>
-									<goal>integration-test</goal>
-									<goal>verify</goal>
-								</goals>
-								<configuration>
-									<systemPropertyVariables>
-										<!-- force the locale as we want to explicitly test message interpolation -->
-										<user.language>en</user.language>
-										<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-										<rest-client.trustStore>${wrong-host.trust-store}</rest-client.trustStore>
-										<rest-client.trustStorePassword>${wrong-host.trust-store-password}</rest-client.trustStorePassword>
-									</systemPropertyVariables>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>io.quarkus</groupId>
-						<artifactId>quarkus-maven-plugin</artifactId>
-						<version>${project.version}</version>
-						<executions>
-							<execution>
-								<id>native-image</id>
-								<goals>
-									<goal>native-image</goal>
-								</goals>
-								<configuration>
-									<reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-									<cleanupServer>true</cleanupServer>
-									<enableHttpUrlHandler>true</enableHttpUrlHandler>
-									<enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-									<enableServer>false</enableServer>
-									<dumpProxies>false</dumpProxies>
-									<graalvmHome>${graalvmHome}</graalvmHome>
-									<additionalBuildArgs>-J-Djavax.net.ssl.trustStore=${self-signed.trust-store},
-										-J-Djavax.net.ssl.trustStorePassword=${self-signed.trust-store-password}</additionalBuildArgs>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <!-- force the locale as we want to explicitly test message interpolation -->
+                        <user.language>en</user.language>
+                        <javax.net.ssl.trustStore>${self-signed.trust-store}</javax.net.ssl.trustStore>
+                        <javax.net.ssl.trustStorePassword>${self-signed.trust-store-password}</javax.net.ssl.trustStorePassword>
+                        <rest-client.trustStore>${wrong-host.trust-store}</rest-client.trustStore>
+                        <rest-client.trustStorePassword>${wrong-host.trust-store-password}</rest-client.trustStorePassword>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+                <quarkus.native.additional-build-args>-J-Djavax.net.ssl.trustStore=${self-signed.trust-store},
+                    -J-Djavax.net.ssl.trustStorePassword=${self-signed.trust-store-password}</quarkus.native.additional-build-args>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <!-- force the locale as we want to explicitly test message interpolation -->
+                                <user.language>en</user.language>
+                                <rest-client.trustStore>${wrong-host.trust-store}</rest-client.trustStore>
+                                <rest-client.trustStorePassword>${wrong-host.trust-store-password}</rest-client.trustStorePassword>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java
new file mode 100644
index 0000000000000..04d41d312c643
--- /dev/null
+++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedClient.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.rest.client.selfsigned;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.faulttolerance.Retry;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient(baseUri = "https://self-signed.badssl.com/", configKey = "self-signed")
+public interface ExternalSelfSignedClient {
+
+    @GET
+    @Retry(delay = 1000)
+    Response invoke();
+}
diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java
index f62a6f7d67462..5f022460e746a 100644
--- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java
+++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedResource.java
@@ -3,12 +3,15 @@
 import java.io.IOException;
 import java.net.URL;
 
+import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
 /**
  * This has nothing to do with rest-client, but we add it here in order to avoid creating
  * a new integration test that would slow down our CI
@@ -16,20 +19,28 @@
 @Path("/self-signed")
 public class ExternalSelfSignedResource {
 
+    @Inject
+    @RestClient
+    ExternalSelfSignedClient client;
+
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public String perform() throws IOException {
+        return String.valueOf(client.invoke().getStatus());
+    }
+
+    @GET
+    @Path("/java")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String invokeJavaURLWithDefaultTruststore() throws IOException {
         try {
             return doGetCipher();
         } catch (IOException e) {
-
             // if it fails it might be because the remote service is down, so sleep and try again
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException ignored) {
-
             }
-
             return doGetCipher();
         }
     }
@@ -42,4 +53,5 @@ private String doGetCipher() throws IOException {
         con.getResponseCode();
         return con.getCipherSuite();
     }
+
 }
diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java
index fd4b085347684..1fbf3e8f12676 100644
--- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java
+++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostClient.java
@@ -1,14 +1,18 @@
 package io.quarkus.it.rest.client.wronghost;
 
 import javax.ws.rs.GET;
-import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-@Path("/")
+import org.eclipse.microprofile.faulttolerance.Retry;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient(baseUri = "https://wrong.host.badssl.com/", configKey = "wrong-host")
 public interface WrongHostClient {
 
     @GET
     @Produces(MediaType.TEXT_PLAIN)
-    String root();
+    @Retry(delay = 1000)
+    Response invoke();
 }
diff --git a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java
index 7e643c53cdcb9..e6cc0b2a51c2e 100644
--- a/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java
+++ b/integration-tests/rest-client/src/main/java/io/quarkus/it/rest/client/wronghost/WrongHostResource.java
@@ -1,33 +1,25 @@
 package io.quarkus.it.rest.client.wronghost;
 
-import java.io.FileInputStream;
-import java.net.URL;
-import java.security.KeyStore;
+import java.io.IOException;
 
+import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 @Path("/wrong-host")
 public class WrongHostResource {
 
+    @Inject
+    @RestClient
+    WrongHostClient client;
+
     @GET
-    @Path("/rest-client")
     @Produces(MediaType.TEXT_PLAIN)
-    public String restClient() throws Exception {
-        KeyStore ks = KeyStore.getInstance("JKS");
-
-        // the system props are set in pom.xml and made available for native tests via RestClientTestResource
-        ks.load(new FileInputStream(System.getProperty("rest-client.trustStore")),
-                System.getProperty("rest-client.trustStorePassword").toCharArray());
-
-        return RestClientBuilder.newBuilder().baseUrl(new URL("https://wrong.host.badssl.com/")).trustStore(ks)
-                .hostnameVerifier(NoopHostnameVerifier.INSTANCE)
-                .build(WrongHostClient.class)
-                .root();
+    public String perform() throws IOException {
+        return String.valueOf(client.invoke().getStatus());
     }
 }
diff --git a/integration-tests/rest-client/src/main/resources/application.properties b/integration-tests/rest-client/src/main/resources/application.properties
index 47922c4fb272f..ed83cd2ab9c93 100644
--- a/integration-tests/rest-client/src/main/resources/application.properties
+++ b/integration-tests/rest-client/src/main/resources/application.properties
@@ -1 +1,2 @@
-io.quarkus.it.rest.client.MultipartService/mp-rest/url=${test.url}
\ No newline at end of file
+io.quarkus.it.rest.client.MultipartService/mp-rest/url=${test.url}
+quarkus.micrometer.binder.http-client.ignore-patterns=/echo
\ No newline at end of file
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/MultipartResourceTest.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/MultipartResourceTest.java
index 6a3f6cbd217df..93e395becdea4 100644
--- a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/MultipartResourceTest.java
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/MultipartResourceTest.java
@@ -2,6 +2,7 @@
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
 
 import org.junit.jupiter.api.Test;
 
@@ -21,6 +22,13 @@ public void testMultipartDataIsSent() {
                         containsString("HELLO WORLD"),
                         containsString("Content-Disposition: form-data; name=\"fileName\""),
                         containsString("greeting.txt"));
-    }
 
+        given()
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+                // /echo is ignored in application.properties
+                .body(not(containsString(
+                        "http_client_requests_seconds_count{clientName=\"localhost\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/echo\",} 1.0")));
+    }
 }
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/RestClientTestResource.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/RestClientTestResource.java
deleted file mode 100644
index 247c1e301534a..0000000000000
--- a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/RestClientTestResource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.it.rest.client;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-
-/**
- * The only point of this class is to propagate the properties when running the native tests
- */
-public class RestClientTestResource implements QuarkusTestResourceLifecycleManager {
-
-    @Override
-    public Map<String, String> start() {
-        Map<String, String> result = new HashMap<>();
-        result.put("rest-client.trustStore", System.getProperty("rest-client.trustStore"));
-        result.put("rest-client.trustStorePassword", System.getProperty("rest-client.trustStorePassword"));
-        return result;
-    }
-
-    @Override
-    public void stop() {
-
-    }
-}
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedTestCase.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedTestCase.java
index 7b2530e7d93bb..a181c9e615990 100644
--- a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedTestCase.java
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/selfsigned/ExternalSelfSignedTestCase.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.rest.client.selfsigned;
 
+import static io.restassured.RestAssured.when;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -7,17 +8,25 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
 
 @QuarkusTest
 public class ExternalSelfSignedTestCase {
 
     @Test
-    public void included() {
-        RestAssured.when()
+    public void should_accept_self_signed_certs() {
+        when()
                 .get("/self-signed")
                 .then()
                 .statusCode(200)
+                .body(is("200"));
+    }
+
+    @Test
+    public void should_accept_self_signed_certs_java_url() {
+        when()
+                .get("/self-signed/java")
+                .then()
+                .statusCode(200)
                 .body(is(not(empty())));
     }
 }
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllIT.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllIT.java
new file mode 100644
index 0000000000000..d359a08de548b
--- /dev/null
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.rest.client.trustall;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ExternalTlsTrustAllIT extends ExternalTlsTrustAllTestCase {
+}
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllTestCase.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllTestCase.java
new file mode 100644
index 0000000000000..ba89527182f5d
--- /dev/null
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllTestCase.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.rest.client.trustall;
+
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+@QuarkusTestResource(ExternalTlsTrustAllTestResource.class)
+public class ExternalTlsTrustAllTestCase {
+
+    @Test
+    public void restClient() {
+        when()
+                .get("/wrong-host")
+                .then()
+                .statusCode(200)
+                .body(is("200"));
+    }
+}
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllTestResource.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllTestResource.java
new file mode 100644
index 0000000000000..2a55b750ba3f7
--- /dev/null
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/trustall/ExternalTlsTrustAllTestResource.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.rest.client.trustall;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class ExternalTlsTrustAllTestResource implements QuarkusTestResourceLifecycleManager {
+
+    @Override
+    public Map<String, String> start() {
+        Map<String, String> result = new HashMap<>();
+        result.put("wrong-host/mp-rest/trustStore", System.getProperty("rest-client.trustStore"));
+        result.put("wrong-host/mp-rest/trustStorePassword", System.getProperty("rest-client.trustStorePassword"));
+        result.put("quarkus.tls.trust-all", "true");
+        return result;
+    }
+
+    @Override
+    public void stop() {
+
+    }
+}
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestCase.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestCase.java
index 004f73d3cf26f..5cfc0380d7c2e 100644
--- a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestCase.java
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestCase.java
@@ -1,26 +1,32 @@
 package io.quarkus.it.rest.client.wronghost;
 
-import static org.hamcrest.Matchers.empty;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.it.rest.client.RestClientTestResource;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
 
 @QuarkusTest
-@QuarkusTestResource(RestClientTestResource.class)
+@QuarkusTestResource(ExternalWrongHostTestResource.class)
 public class ExternalWrongHostTestCase {
 
     @Test
     public void restClient() {
-        RestAssured.when()
-                .get("/wrong-host/rest-client")
+        when()
+                .get("/wrong-host")
                 .then()
                 .statusCode(200)
-                .body(is(not(empty())));
+                .body(is("200"));
+
+        given()
+                .when().get("/q/metrics")
+                .then()
+                .statusCode(200)
+                .body(containsString(
+                        "http_client_requests_seconds_count{clientName=\"wrong.host.badssl.com\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"root\",}"));
     }
 }
diff --git a/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestResource.java b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestResource.java
new file mode 100644
index 0000000000000..723ea722b6638
--- /dev/null
+++ b/integration-tests/rest-client/src/test/java/io/quarkus/it/rest/client/wronghost/ExternalWrongHostTestResource.java
@@ -0,0 +1,27 @@
+package io.quarkus.it.rest.client.wronghost;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.restclient.NoopHostnameVerifier;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+/**
+ * The only point of this class is to propagate the properties when running the native tests
+ */
+public class ExternalWrongHostTestResource implements QuarkusTestResourceLifecycleManager {
+
+    @Override
+    public Map<String, String> start() {
+        Map<String, String> result = new HashMap<>();
+        result.put("wrong-host/mp-rest/trustStore", System.getProperty("rest-client.trustStore"));
+        result.put("wrong-host/mp-rest/trustStorePassword", System.getProperty("rest-client.trustStorePassword"));
+        result.put("wrong-host/mp-rest/hostnameVerifier", NoopHostnameVerifier.class.getName());
+        return result;
+    }
+
+    @Override
+    public void stop() {
+
+    }
+}
diff --git a/integration-tests/resteasy-jackson/pom.xml b/integration-tests/resteasy-jackson/pom.xml
index e910869cdcbf0..0db14bab805ea 100644
--- a/integration-tests/resteasy-jackson/pom.xml
+++ b/integration-tests/resteasy-jackson/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-resteasy-jackson</artifactId>
@@ -21,6 +20,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -32,6 +35,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -50,60 +81,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java
new file mode 100644
index 0000000000000..0de72ea7cbb70
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/AbstractResource.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.resteasy.jackson;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/abstract")
+public abstract class AbstractResource {
+
+    @GET
+    @Path("inherited")
+    @Produces("text/plain")
+    public String inherited() {
+        return message();
+    }
+
+    public abstract String message();
+}
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java
index 2175b85d84db6..e0219dc7fbcd9 100644
--- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/BigKeysResource.java
@@ -4,18 +4,13 @@
 import java.math.BigInteger;
 import java.util.Map;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 @Path("/bigkeys")
 public class BigKeysResource {
 
     @POST
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
     public Payload post(Payload payload) {
         return payload;
     }
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/ConcreteClass.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/ConcreteClass.java
new file mode 100644
index 0000000000000..713d32ee823a0
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/ConcreteClass.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.resteasy.jackson;
+
+public class ConcreteClass extends AbstractResource {
+    @Override
+    public String message() {
+        return "concrete";
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java
index a18c24ffecf95..1c1b1a9cb0b47 100644
--- a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/GreetingResource.java
@@ -6,15 +6,24 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Context;
+
+import org.jboss.resteasy.spi.ResteasyConfiguration;
 
 @Path("/greeting")
 public class GreetingResource {
 
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
     public Greeting hello() {
         LocalDate localDate = LocalDate.of(2019, 01, 01);
         return new Greeting("hello", localDate, new Date(localDate.toEpochDay()));
     }
+
+    @Path("config")
+    @GET
+    @Produces("text/plain")
+    public String config(@Context ResteasyConfiguration config) {
+        // test that configuration can be obtained from application.properties
+        return config.getParameter("resteasy.gzip.max.input");
+    }
 }
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/BaseClass.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/BaseClass.java
new file mode 100644
index 0000000000000..f16d39aa02609
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/BaseClass.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.resteasy.jackson.generics;
+
+public class BaseClass<T> {
+
+    private String baseVariable;
+    private T data;
+
+    public String getBaseVariable() {
+        return this.baseVariable;
+    }
+
+    public void setBaseVariable(String baseVariable) {
+        this.baseVariable = baseVariable;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/ExtendedClass.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/ExtendedClass.java
new file mode 100644
index 0000000000000..aab1dcdb9fe59
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/ExtendedClass.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.resteasy.jackson.generics;
+
+public class ExtendedClass extends BaseClass<MyData> {
+
+    private String extendedVariable;
+
+    public String getExtendedVariable() {
+        return this.extendedVariable;
+    }
+
+    public void setExtendedVariable(String extendedVariable) {
+        this.extendedVariable = extendedVariable;
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java
new file mode 100644
index 0000000000000..6b4862df1ece7
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/GenericsResource.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.resteasy.jackson.generics;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/generics")
+public class GenericsResource {
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public ExtendedClass testExtendedClass() {
+        final ExtendedClass c = new ExtendedClass();
+        c.setBaseVariable("myBaseVariable");
+        c.setExtendedVariable("myExtendedVariable");
+        final MyData d = new MyData();
+        d.setDataVariable("myData");
+        c.setData(d);
+        return c;
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/MyData.java b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/MyData.java
new file mode 100644
index 0000000000000..a1300cf7e95e1
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/java/io/quarkus/it/resteasy/jackson/generics/MyData.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.resteasy.jackson.generics;
+
+public class MyData {
+
+    private String dataVariable;
+
+    public String getDataVariable() {
+        return this.dataVariable;
+    }
+
+    public void setDataVariable(String dataVariable) {
+        this.dataVariable = dataVariable;
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/main/resources/META-INF/resources/index.html b/integration-tests/resteasy-jackson/src/main/resources/META-INF/resources/index.html
new file mode 100644
index 0000000000000..90c934f37885a
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/main/resources/META-INF/resources/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+    <title>Testing Guide</title>
+</head>
+<body>
+Information about testing
+</body>
+</html>
\ No newline at end of file
diff --git a/integration-tests/resteasy-jackson/src/main/resources/application.properties b/integration-tests/resteasy-jackson/src/main/resources/application.properties
index 7df30cbf277d9..7cc400cc0c852 100644
--- a/integration-tests/resteasy-jackson/src/main/resources/application.properties
+++ b/integration-tests/resteasy-jackson/src/main/resources/application.properties
@@ -1 +1,3 @@
-message=Production
\ No newline at end of file
+message=Production
+quarkus.smallrye-openapi.store-schema-directory=target/generated
+resteasy.gzip.max.input=5000
\ No newline at end of file
diff --git a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GenericsResourceIT.java b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GenericsResourceIT.java
new file mode 100644
index 0000000000000..6c6f7da676e50
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GenericsResourceIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.resteasy.jackson;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class GenericsResourceIT extends GenericsResourceTest {
+}
diff --git a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GenericsResourceTest.java b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GenericsResourceTest.java
new file mode 100644
index 0000000000000..8cd4c0a604881
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GenericsResourceTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.it.resteasy.jackson;
+
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.it.resteasy.jackson.generics.ExtendedClass;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class GenericsResourceTest {
+
+    @Test
+    public void testExtendedEndpoint() {
+        ExtendedClass response = given()
+                .when().get("/generics")
+                .then()
+                .statusCode(200)
+                .extract().body().as(ExtendedClass.class);
+        assertEquals("myBaseVariable", response.getBaseVariable());
+        assertEquals("myExtendedVariable", response.getExtendedVariable());
+        assertEquals("myData", response.getData().getDataVariable());
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTest.java b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTest.java
index 51d3e816070a9..5cc175abf9292 100644
--- a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTest.java
+++ b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/GreetingResourceTest.java
@@ -17,7 +17,27 @@ void testEndpoint() {
                 .then()
                 .statusCode(200)
                 .body(containsString("hello"))
-                .body(containsString("[2019,1,1]"));
+                .body(containsString("2019-01-01"));
+    }
+
+    @Test
+    void testConfig() {
+        // test that configuration can be obtained from application.properties
+        given()
+                .when().get("/greeting/config")
+                .then()
+                .statusCode(200)
+                .body(containsString("5000"));
+    }
+
+    @Test
+    public void testAbstract() {
+        given()
+                .when().get("/abstract/inherited")
+                .then()
+                .statusCode(200)
+                .body(containsString("concrete"));
+
     }
 
 }
diff --git a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/StaticContentTest.java b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/StaticContentTest.java
new file mode 100644
index 0000000000000..65659a13e9ab9
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/StaticContentTest.java
@@ -0,0 +1,43 @@
+package io.quarkus.it.resteasy.jackson;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * This and {@link StaticContentWithTestProfileTest} don't really belong in this module,
+ * but adding an extra Maven module just to introduce a test that uses a random http port seems
+ * like overkill...
+ */
+@QuarkusTest
+public class StaticContentTest {
+
+    @TestHTTPResource("index.html")
+    URL url;
+
+    @Test
+    public void testIndexHtml() throws Exception {
+        try (InputStream in = url.openStream()) {
+            String contents = readStream(in);
+            Assertions.assertTrue(contents.contains("<title>Testing Guide</title>"));
+        }
+    }
+
+    static String readStream(InputStream in) throws IOException {
+        byte[] data = new byte[1024];
+        int r;
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        while ((r = in.read(data)) > 0) {
+            out.write(data, 0, r);
+        }
+        return new String(out.toByteArray(), StandardCharsets.UTF_8);
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/StaticContentWithTestProfileTest.java b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/StaticContentWithTestProfileTest.java
new file mode 100644
index 0000000000000..c8bbd997b4838
--- /dev/null
+++ b/integration-tests/resteasy-jackson/src/test/java/io/quarkus/it/resteasy/jackson/StaticContentWithTestProfileTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.resteasy.jackson;
+
+import java.io.InputStream;
+import java.net.URL;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(StaticContentWithTestProfileTest.DummyProfile.class)
+public class StaticContentWithTestProfileTest {
+
+    @TestHTTPResource("index.html")
+    URL url;
+
+    @Test
+    public void testIndexHtml() throws Exception {
+        try (InputStream in = url.openStream()) {
+            String contents = StaticContentTest.readStream(in);
+            Assertions.assertTrue(contents.contains("<title>Testing Guide</title>"));
+        }
+    }
+
+    public static class DummyProfile implements QuarkusTestProfile {
+
+    }
+}
diff --git a/integration-tests/resteasy-jackson/src/test/resources/application.properties b/integration-tests/resteasy-jackson/src/test/resources/application.properties
index 42963ee9e7000..eb1918da87caa 100644
--- a/integration-tests/resteasy-jackson/src/test/resources/application.properties
+++ b/integration-tests/resteasy-jackson/src/test/resources/application.properties
@@ -1 +1,3 @@
-message=Test
\ No newline at end of file
+message=Test
+%test.quarkus.http.test-port=0
+resteasy.gzip.max.input=5000
\ No newline at end of file
diff --git a/integration-tests/resteasy-mutiny/disable-native-profile b/integration-tests/resteasy-mutiny/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/resteasy-mutiny/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/resteasy-mutiny/pom.xml b/integration-tests/resteasy-mutiny/pom.xml
index 9ec3eebbc076d..ccfea8d93bd3a 100644
--- a/integration-tests/resteasy-mutiny/pom.xml
+++ b/integration-tests/resteasy-mutiny/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-resteasy-mutiny</artifactId>
@@ -55,6 +54,47 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -73,60 +113,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java
index d397bb7dfec6e..7829387adbb4b 100644
--- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java
+++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MutinyResource.java
@@ -42,21 +42,18 @@ public Uni<Response> response() {
 
     @GET
     @Path("/hello/stream")
-    @Produces(MediaType.APPLICATION_JSON)
     public Multi<String> helloAsMulti() {
         return service.greetingAsMulti();
     }
 
     @GET
     @Path("/pet")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<Pet> pet() {
         return service.getPet();
     }
 
     @GET
     @Path("/pet/stream")
-    @Produces(MediaType.APPLICATION_JSON)
     public Multi<Pet> pets() {
         return service.getPets();
     }
@@ -81,7 +78,6 @@ public Uni<String> callHello() {
 
     @GET
     @Path("/client/pet")
-    @Produces(MediaType.APPLICATION_JSON)
     public Uni<Pet> callPet() {
         return client.pet();
     }
diff --git a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java
index 05d6c916cd17b..ae5f83c3cd25f 100644
--- a/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java
+++ b/integration-tests/resteasy-mutiny/src/main/java/io/quarkus/it/resteasy/mutiny/MyRestService.java
@@ -1,9 +1,7 @@
 package io.quarkus.it.resteasy.mutiny;
 
-import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
@@ -19,7 +17,6 @@ public interface MyRestService {
 
     @GET
     @Path("/pet")
-    @Consumes(MediaType.APPLICATION_JSON)
     Uni<Pet> pet();
 
 }
diff --git a/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java b/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java
index d223f8437e842..5f3d3f17bcd67 100644
--- a/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java
+++ b/integration-tests/resteasy-mutiny/src/test/java/io/quarkus/it/resteasy/mutiny/MutinyTest.java
@@ -1,11 +1,12 @@
 package io.quarkus.it.resteasy.mutiny;
 
 import static io.restassured.RestAssured.get;
-import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.is;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -18,6 +19,8 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.subscription.UniEmitter;
 
 @QuarkusTest
 public class MutinyTest {
@@ -82,23 +85,32 @@ public void testMultiWithSerialization() {
     public void testSSE() {
         Client client = ClientBuilder.newClient();
         WebTarget target = client.target("http://localhost:" + RestAssured.port + "/mutiny/pets");
-        SseEventSource source = SseEventSource.target(target).build();
-        List<Pet> pets = new CopyOnWriteArrayList<>();
-        try (SseEventSource eventSource = source) {
-            eventSource.register(event -> {
-                Pet pet = event.readData(Pet.class, MediaType.APPLICATION_JSON_TYPE);
-                pets.add(pet);
-            }, ex -> {
-                throw new IllegalStateException("SSE failure", ex);
+        try (SseEventSource eventSource = SseEventSource.target(target).build()) {
+            Uni<List<Pet>> petList = Uni.createFrom().emitter(new Consumer<UniEmitter<? super List<Pet>>>() {
+                @Override
+                public void accept(UniEmitter<? super List<Pet>> uniEmitter) {
+                    List<Pet> pets = new CopyOnWriteArrayList<>();
+                    eventSource.register(event -> {
+                        Pet pet = event.readData(Pet.class, MediaType.APPLICATION_JSON_TYPE);
+                        pets.add(pet);
+                        if (pets.size() == 5) {
+                            uniEmitter.complete(pets);
+                        }
+                    }, ex -> {
+                        uniEmitter.fail(new IllegalStateException("SSE failure", ex));
+                    });
+                    eventSource.open();
+
+                }
             });
-            eventSource.open();
-            await().until(() -> pets.size() == 5);
+            List<Pet> pets = petList.await().atMost(Duration.ofMinutes(1));
+            Assertions.assertEquals(5, pets.size());
+            Assertions.assertEquals("neo", pets.get(0).getName());
+            Assertions.assertEquals("indy", pets.get(1).getName());
+            Assertions.assertEquals("plume", pets.get(2).getName());
+            Assertions.assertEquals("titi", pets.get(3).getName());
+            Assertions.assertEquals("rex", pets.get(4).getName());
         }
-        Assertions.assertEquals("neo", pets.get(0).getName());
-        Assertions.assertEquals("indy", pets.get(1).getName());
-        Assertions.assertEquals("plume", pets.get(2).getName());
-        Assertions.assertEquals("titi", pets.get(3).getName());
-        Assertions.assertEquals("rex", pets.get(4).getName());
     }
 
     @Test
diff --git a/integration-tests/resteasy-reactive-rest-client-standalone/pom.xml b/integration-tests/resteasy-reactive-rest-client-standalone/pom.xml
new file mode 100644
index 0000000000000..4456e77507496
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client-standalone/pom.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>quarkus-integration-test-resteasy-reactive-rest-client-standalone</artifactId>
+    <name>Quarkus - Integration Tests - REST client without server</name>
+
+    <dependencies>
+        <!-- Client dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>uk.co.automatictester</groupId>
+                <artifactId>wiremock-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>wiremock-start</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>stop</goal>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <dir>target/classes</dir>
+                            <params>--port=8765 --verbose --disable-banner</params>
+                            <skip>${skipTests}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>wiremock-stop</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skipTests}</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <!-- add some custom config, the rest comes from parent -->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/resteasy-reactive-rest-client-standalone/src/main/java/io/quarkus/it/rest/client/ClientCallingResource.java b/integration-tests/resteasy-reactive-rest-client-standalone/src/main/java/io/quarkus/it/rest/client/ClientCallingResource.java
new file mode 100644
index 0000000000000..7a83a64103e4a
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client-standalone/src/main/java/io/quarkus/it/rest/client/ClientCallingResource.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.rest.client;
+
+import java.net.URI;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.handler.BodyHandler;
+
+@ApplicationScoped
+public class ClientCallingResource {
+
+    void init(@Observes Router router) {
+        router.post().handler(BodyHandler.create());
+
+        router.post("/hello").handler(rc -> rc.response().putHeader("content-type", MediaType.TEXT_PLAIN)
+                .end("Hello, " + rc.getBodyAsString()));
+
+        router.route("/call-client").blockingHandler(rc -> {
+            String url = rc.getBody().toString();
+            HelloClient client = RestClientBuilder.newBuilder().baseUri(URI.create(url))
+                    .build(HelloClient.class);
+            String greeting = client.greeting("John");
+            rc.response().end(greeting);
+        });
+    }
+}
diff --git a/integration-tests/resteasy-reactive-rest-client-standalone/src/main/java/io/quarkus/it/rest/client/HelloClient.java b/integration-tests/resteasy-reactive-rest-client-standalone/src/main/java/io/quarkus/it/rest/client/HelloClient.java
new file mode 100644
index 0000000000000..797e644193431
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client-standalone/src/main/java/io/quarkus/it/rest/client/HelloClient.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.rest.client;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("")
+public interface HelloClient {
+    @POST
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    String greeting(String name);
+}
diff --git a/integration-tests/resteasy-reactive-rest-client-standalone/src/test/java/io/quarkus/it/rest/client/BasicTest.java b/integration-tests/resteasy-reactive-rest-client-standalone/src/test/java/io/quarkus/it/rest/client/BasicTest.java
new file mode 100644
index 0000000000000..ddef5f6b396bb
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client-standalone/src/test/java/io/quarkus/it/rest/client/BasicTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.rest.client;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+@QuarkusTest
+public class BasicTest {
+
+    @TestHTTPResource("/hello")
+    String helloUrl;
+
+    @Test
+    public void shouldWork() {
+        Response response = RestAssured.with().body(helloUrl).post("/call-client");
+        assertThat(response.asString()).isEqualTo("Hello, John");
+    }
+}
diff --git a/integration-tests/resteasy-reactive-rest-client-standalone/src/test/java/io/quarkus/it/rest/client/BasicTestIT.java b/integration-tests/resteasy-reactive-rest-client-standalone/src/test/java/io/quarkus/it/rest/client/BasicTestIT.java
new file mode 100644
index 0000000000000..bd0a64b8d9c9f
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client-standalone/src/test/java/io/quarkus/it/rest/client/BasicTestIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.rest.client;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BasicTestIT extends BasicTest {
+
+}
diff --git a/integration-tests/resteasy-reactive-rest-client/pom.xml b/integration-tests/resteasy-reactive-rest-client/pom.xml
new file mode 100644
index 0000000000000..76bfe53776bb7
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client/pom.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>quarkus-integration-test-resteasy-reactive-rest-client</artifactId>
+    <name>Quarkus - Integration Tests - REST client</name>
+
+    <!--todo add ssl tests-->
+    <!--todo test fault tolerance integration-->
+
+    <dependencies>
+        <!-- Client dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http</artifactId>
+        </dependency>
+
+        <!-- TODO: drop when jaxrs-client is separated from resteasy-reactive for good: -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>uk.co.automatictester</groupId>
+                <artifactId>wiremock-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>wiremock-start</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>stop</goal>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <dir>target/classes</dir>
+                            <params>--port=8765 --verbose --disable-banner</params>
+                            <skip>${skipTests}</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>wiremock-stop</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skipTests}</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <!-- add some custom config, the rest comes from parent -->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/Apple.java b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/Apple.java
new file mode 100644
index 0000000000000..c814467d957ab
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/Apple.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.rest.client;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+// TODO get rid of need for this
+@RegisterForReflection
+public class Apple {
+    private String cultivar;
+
+    public Apple() {
+    }
+
+    public Apple(String cultivar) {
+        this.cultivar = cultivar;
+    }
+
+    public String getCultivar() {
+        return cultivar;
+    }
+
+    public void setCultivar(String cultivar) {
+        this.cultivar = cultivar;
+    }
+}
diff --git a/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/ClientCallingResource.java b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/ClientCallingResource.java
new file mode 100644
index 0000000000000..813cb8cf05d38
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/ClientCallingResource.java
@@ -0,0 +1,43 @@
+package io.quarkus.it.rest.client;
+
+import java.net.URI;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.handler.BodyHandler;
+
+@ApplicationScoped
+public class ClientCallingResource {
+    private static final ObjectMapper mapper = new JsonMapper();
+
+    void init(@Observes Router router) {
+        router.post().handler(BodyHandler.create());
+
+        router.post("/apples").handler(rc -> rc.response().putHeader("content-type", "application/json")
+                .end("{\"cultivar\": \"cortland\"}"));
+
+        router.route("/call-client").blockingHandler(rc -> {
+            String url = rc.getBody().toString();
+            SimpleClient client = RestClientBuilder.newBuilder().baseUri(URI.create(url))
+                    .build(SimpleClient.class);
+            Apple swappedApple = client.swapApple(new Apple("lobo"));
+            rc.response().end(jsonAsString(swappedApple));
+        });
+    }
+
+    private String jsonAsString(Apple apple) {
+        try {
+            return mapper.writerFor(Apple.class).writeValueAsString(apple);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("Unable to stringify apple", e);
+        }
+    }
+}
diff --git a/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/SimpleClient.java b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/SimpleClient.java
new file mode 100644
index 0000000000000..2bd0521b3c952
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client/src/main/java/io/quarkus/it/rest/client/SimpleClient.java
@@ -0,0 +1,15 @@
+package io.quarkus.it.rest.client;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("")
+public interface SimpleClient {
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    Apple swapApple(Apple original);
+}
diff --git a/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTest.java b/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTest.java
new file mode 100644
index 0000000000000..3bfe92d5d5b50
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.rest.client;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+
+@QuarkusTest
+public class BasicTest {
+
+    @TestHTTPResource("/apples")
+    String appleUrl;
+
+    @Test
+    public void shouldWork() {
+        Response response = RestAssured.with().body(appleUrl).post("/call-client");
+        assertThat(response.jsonPath().getString("cultivar")).isEqualTo("cortland");
+    }
+}
diff --git a/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTestIT.java b/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTestIT.java
new file mode 100644
index 0000000000000..bd0a64b8d9c9f
--- /dev/null
+++ b/integration-tests/resteasy-reactive-rest-client/src/test/java/io/quarkus/it/rest/client/BasicTestIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.rest.client;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class BasicTestIT extends BasicTest {
+
+}
diff --git a/integration-tests/scala/disable-native-profile b/integration-tests/scala/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/scala/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/scala/pom.xml b/integration-tests/scala/pom.xml
index 96a10d89ddc4e..d8f7e63b69104 100644
--- a/integration-tests/scala/pom.xml
+++ b/integration-tests/scala/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-scala</artifactId>
@@ -26,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-maven</artifactId>
+            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-maven</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,9 +72,6 @@
                 </executions>
                 <configuration>
                     <systemPropertyVariables>
-                        <!--suppress MavenModelInspection -->
-                        <maven.home>${maven.home}</maven.home>
-                        <maven.repo>${settings.localRepository}</maven.repo>
                         <project.version>${project.version}</project.version>
                     </systemPropertyVariables>
                 </configuration>
diff --git a/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java b/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java
index 92cb8977dcde0..cccfdf91eb7b2 100644
--- a/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java
+++ b/integration-tests/scala/src/test/java/io/quarkus/scala/maven/it/ScalaCreateMavenProjectIT.java
@@ -48,7 +48,7 @@ public void testProjectGenerationFromScratchForScala() throws MavenInvocationExc
         String config = Files
                 .asCharSource(new File(testDir, "src/main/resources/application.properties"), Charsets.UTF_8)
                 .read();
-        assertThat(config).contains("key = value");
+        assertThat(config).isEmpty();
 
         assertThat(new File(testDir, "src/main/docker/Dockerfile.native")).isFile();
         assertThat(new File(testDir, "src/main/docker/Dockerfile.jvm")).isFile();
@@ -83,14 +83,13 @@ private InvocationResult setup(Properties params)
             throw e;
         }
         params.setProperty("platformArtifactId", getBomArtifactId());
-        params.setProperty("platformVersion", getPluginVersion());
+        params.setProperty("platformVersion", getQuarkusCoreVersion());
 
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBatchMode(true);
         request.setGoals(Collections.singletonList(
-                getPluginGroupId() + ":" + getPluginArtifactId() + ":" + getPluginVersion() + ":create"));
+                getMavenPluginGroupId() + ":" + getMavenPluginArtifactId() + ":" + getMavenPluginVersion() + ":create"));
         request.setProperties(params);
-        getEnv().forEach(request::addShellEnvironment);
         File log = new File(testDir, "build-create-" + testDir.getName() + ".log");
         final PrintStreamLogger logger = new PrintStreamLogger(new PrintStream(new FileOutputStream(log), false, "UTF-8"),
                 InvokerLogger.INFO);
diff --git a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
index 6567aec739896..8bcbc7f89a3bb 100644
--- a/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
+++ b/integration-tests/scala/src/test/resources/projects/classic-scala/pom.xml
@@ -11,8 +11,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <scala.version>2.12.8</scala.version>
-        <scala-maven-plugin.version>4.1.1</scala-maven-plugin.version>
+        <scala.version>2.12.13</scala.version>
+        <scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow-websockets</artifactId>
+            <artifactId>quarkus-websockets</artifactId>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
@@ -112,25 +112,9 @@
     <profiles>
         <profile>
             <id>native</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <version>${quarkus.version}</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/integration-tests/shared-library/disable-native-profile b/integration-tests/shared-library/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/shared-library/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/shared-library/pom.xml b/integration-tests/shared-library/pom.xml
index bdd769a4e46b8..4e9ded719a3e5 100644
--- a/integration-tests/shared-library/pom.xml
+++ b/integration-tests/shared-library/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/integration-tests/simple with space/pom.xml b/integration-tests/simple with space/pom.xml
index 5774b6a14dbe1..d5a06353e709b 100644
--- a/integration-tests/simple with space/pom.xml	
+++ b/integration-tests/simple with space/pom.xml	
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,6 +36,21 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -55,45 +69,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/integration-tests/smallrye-config/.env b/integration-tests/smallrye-config/.env
new file mode 100644
index 0000000000000..984066a13dd38
--- /dev/null
+++ b/integration-tests/smallrye-config/.env
@@ -0,0 +1,2 @@
+DOTENV_SERVER_NAME=localhost
+DOTENV_SERVER_PORT=8080
diff --git a/integration-tests/smallrye-config/.env-common b/integration-tests/smallrye-config/.env-common
new file mode 100644
index 0000000000000..7017b51bcafe3
--- /dev/null
+++ b/integration-tests/smallrye-config/.env-common
@@ -0,0 +1 @@
+DOTENV_SERVER_PORT=9090
diff --git a/integration-tests/smallrye-config/config/application.properties b/integration-tests/smallrye-config/config/application.properties
new file mode 100644
index 0000000000000..2ef68abfc7862
--- /dev/null
+++ b/integration-tests/smallrye-config/config/application.properties
@@ -0,0 +1 @@
+config.dir.property=1234
diff --git a/integration-tests/smallrye-config/config/application.yaml b/integration-tests/smallrye-config/config/application.yaml
new file mode 100644
index 0000000000000..e17ea751d3543
--- /dev/null
+++ b/integration-tests/smallrye-config/config/application.yaml
@@ -0,0 +1,4 @@
+config:
+  dir:
+    property:
+      yaml: 1234
diff --git a/integration-tests/smallrye-config/pom.xml b/integration-tests/smallrye-config/pom.xml
new file mode 100644
index 0000000000000..67d90fc4324af
--- /dev/null
+++ b/integration-tests/smallrye-config/pom.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>quarkus-integration-tests-parent</artifactId>
+    <groupId>io.quarkus</groupId>
+    <version>999-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>quarkus-integration-test-smallrye-config</artifactId>
+
+  <name>Quarkus - Integration Tests - SmallRye Config</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-config-yaml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-jackson</artifactId>
+    </dependency>
+    <!-- Add opentracing to ensure that it works in native when undertow isn't present -->
+    <!-- See https://github.com/quarkusio/quarkus/issues/14966 -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-opentracing</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+
+    <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-config-yaml-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-opentracing-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java
new file mode 100644
index 0000000000000..657ffc92c0db9
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigResource.java
@@ -0,0 +1,47 @@
+package io.quarkus.it.smallrye.config;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.config.Config;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import io.smallrye.config.SmallRyeConfig;
+
+@Path("/config")
+@Produces(MediaType.APPLICATION_JSON)
+public class ConfigResource {
+    @Inject
+    Config config;
+
+    @GET
+    @Path("/{name}")
+    public Response configValue(@PathParam("name") final String name) {
+        final io.smallrye.config.ConfigValue configValue = ((SmallRyeConfig) config).getConfigValue(name);
+        return Response.ok(new ConfigValue(configValue.getName(), configValue.getValue())).build();
+    }
+
+    @RegisterForReflection
+    public static class ConfigValue {
+        final String name;
+        final String value;
+
+        public ConfigValue(final String name, final String value) {
+            this.name = name;
+            this.value = value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableSource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableSource.java
new file mode 100644
index 0000000000000..f4157ea9d4574
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableSource.java
@@ -0,0 +1,53 @@
+package io.quarkus.it.smallrye.config;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
+import io.smallrye.config.ConfigSourceContext;
+import io.smallrye.config.ConfigSourceFactory;
+import io.smallrye.config.ConfigValue;
+
+public class ConfigurableSource implements ConfigSourceFactory {
+    @Override
+    public Iterable<ConfigSource> getConfigSources(final ConfigSourceContext context) {
+        final ConfigValue value = context.getValue("configurable.source.init");
+        if (value != null && "database".equals(value.getValue())) {
+            return singletonList(new DatabaseConfigSource());
+        }
+        return emptyList();
+    }
+
+    public static class DatabaseConfigSource implements ConfigSource {
+        private final Map<String, String> values = new HashMap<>();
+
+        public DatabaseConfigSource() {
+            values.put("database.user.naruto", "uzumaki");
+            values.put("database.user.sasuke", "uchiha");
+        }
+
+        @Override
+        public Map<String, String> getProperties() {
+            return values;
+        }
+
+        @Override
+        public String getValue(final String propertyName) {
+            return values.get(propertyName);
+        }
+
+        @Override
+        public String getName() {
+            return "database";
+        }
+
+        @Override
+        public int getOrdinal() {
+            return 150;
+        }
+    }
+}
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java
new file mode 100644
index 0000000000000..05f517fc8b4d7
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PingConfigSourceInterceptor.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.smallrye.config;
+
+import javax.annotation.Priority;
+
+import io.smallrye.config.ConfigSourceInterceptor;
+import io.smallrye.config.ConfigSourceInterceptorContext;
+import io.smallrye.config.ConfigValue;
+import io.smallrye.config.Priorities;
+
+@Priority(Priorities.LIBRARY + 900)
+public class PingConfigSourceInterceptor implements ConfigSourceInterceptor {
+    @Override
+    public ConfigValue getValue(final ConfigSourceInterceptorContext context, final String name) {
+        final ConfigValue value = context.proceed(name);
+        if (name.equals("interceptor.play")) {
+            return ConfigValue.builder().withName(name).withValue("ping").build();
+        }
+
+        return value;
+    }
+}
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PongConfigSourceInterceptorFactory.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PongConfigSourceInterceptorFactory.java
new file mode 100644
index 0000000000000..78c4d8a9696e4
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/PongConfigSourceInterceptorFactory.java
@@ -0,0 +1,28 @@
+package io.quarkus.it.smallrye.config;
+
+import java.util.OptionalInt;
+
+import io.smallrye.config.ConfigSourceInterceptor;
+import io.smallrye.config.ConfigSourceInterceptorContext;
+import io.smallrye.config.ConfigSourceInterceptorFactory;
+import io.smallrye.config.ConfigValue;
+import io.smallrye.config.Priorities;
+
+public class PongConfigSourceInterceptorFactory implements ConfigSourceInterceptorFactory {
+    @Override
+    public ConfigSourceInterceptor getInterceptor(final ConfigSourceInterceptorContext context) {
+        return (ConfigSourceInterceptor) (context1, name) -> {
+            final ConfigValue value = context1.proceed(name);
+            if (name.equals("interceptor.play")) {
+                return value.withValue(value.getValue() + "pong");
+            }
+
+            return value;
+        };
+    }
+
+    @Override
+    public OptionalInt getPriority() {
+        return OptionalInt.of(Priorities.LIBRARY + 1000);
+    }
+}
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java
new file mode 100644
index 0000000000000..b2a8e55f2f432
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/Server.java
@@ -0,0 +1,126 @@
+package io.quarkus.it.smallrye.config;
+
+import java.time.Duration;
+import java.time.Period;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import io.quarkus.runtime.configuration.DurationConverter;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithConverter;
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithName;
+import io.smallrye.config.WithParentName;
+
+@ConfigMapping(prefix = "server")
+public interface Server {
+    @JsonProperty
+    String host();
+
+    @JsonProperty
+    int port();
+
+    @JsonProperty
+    @WithConverter(DurationConverter.class)
+    Duration timeout();
+
+    @JsonProperty
+    @WithName("io-threads")
+    int threads();
+
+    @JsonProperty
+    @WithParentName
+    Map<String, Form> form();
+
+    @JsonProperty
+    Optional<Ssl> ssl();
+
+    @JsonProperty
+    Optional<Proxy> proxy();
+
+    @JsonProperty
+    Optional<Cors> cors();
+
+    @JsonProperty
+    Log log();
+
+    interface Form {
+        @JsonProperty
+        String loginPage();
+
+        @JsonProperty
+        String errorPage();
+
+        @JsonProperty
+        String landingPage();
+
+        @JsonProperty
+        Optional<String> cookie();
+    }
+
+    interface Ssl {
+        @JsonProperty
+        int port();
+
+        @JsonProperty
+        String certificate();
+
+        @JsonProperty
+        @WithDefault("TLSv1.3,TLSv1.2")
+        List<String> protocols();
+    }
+
+    interface Proxy {
+        @JsonProperty
+        boolean enable();
+    }
+
+    interface Log {
+        @JsonProperty
+        @WithDefault("false")
+        boolean enabled();
+
+        @JsonProperty
+        @WithDefault(".log")
+        String suffix();
+
+        @JsonProperty
+        @WithDefault("true")
+        boolean rotate();
+
+        @JsonProperty
+        @WithDefault("COMMON")
+        Pattern pattern();
+
+        @JsonProperty
+        Period period();
+
+        @RegisterForReflection
+        enum Pattern {
+            COMMON,
+            SHORT,
+            COMBINED,
+            LONG;
+        }
+    }
+
+    interface Cors {
+        @JsonProperty
+        List<Origin> origins();
+
+        @JsonProperty
+        List<String> methods();
+
+        interface Origin {
+            @JsonProperty
+            String host();
+
+            @JsonProperty
+            int port();
+        }
+    }
+}
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java
new file mode 100644
index 0000000000000..13c05e224f415
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ServerResource.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.smallrye.config;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+@Path("/server")
+public class ServerResource {
+    @Inject
+    Server server;
+
+    @GET
+    public Response getServer() {
+        return Response.ok(server).build();
+    }
+}
diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/microprofile-config-common.properties b/integration-tests/smallrye-config/src/main/resources/META-INF/microprofile-config-common.properties
new file mode 100644
index 0000000000000..b22ddfa4dbec6
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/META-INF/microprofile-config-common.properties
@@ -0,0 +1 @@
+mp.config.server.port=9090
diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/microprofile-config.properties b/integration-tests/smallrye-config/src/main/resources/META-INF/microprofile-config.properties
new file mode 100644
index 0000000000000..fab22f37dbd88
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/META-INF/microprofile-config.properties
@@ -0,0 +1,2 @@
+mp.config.server.name=localhost
+mp.config.server.port=8080
diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceFactory b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceFactory
new file mode 100644
index 0000000000000..3601b0150b2df
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceFactory
@@ -0,0 +1 @@
+io.quarkus.it.smallrye.config.ConfigurableSource
diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
new file mode 100644
index 0000000000000..2b304c11cf44a
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
@@ -0,0 +1 @@
+io.quarkus.it.smallrye.config.PingConfigSourceInterceptor
diff --git a/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory
new file mode 100755
index 0000000000000..9a6576a5a5f5b
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory
@@ -0,0 +1 @@
+io.quarkus.it.smallrye.config.PongConfigSourceInterceptorFactory
diff --git a/integration-tests/smallrye-config/src/main/resources/application-common.properties b/integration-tests/smallrye-config/src/main/resources/application-common.properties
new file mode 100644
index 0000000000000..d4bcc6ca5cb7a
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/application-common.properties
@@ -0,0 +1 @@
+profile.common.properties=common
diff --git a/integration-tests/smallrye-config/src/main/resources/application-common.yaml b/integration-tests/smallrye-config/src/main/resources/application-common.yaml
new file mode 100644
index 0000000000000..a5741d8662bd2
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/application-common.yaml
@@ -0,0 +1,3 @@
+profile:
+  common:
+    yaml: common
diff --git a/integration-tests/smallrye-config/src/main/resources/application.properties b/integration-tests/smallrye-config/src/main/resources/application.properties
new file mode 100644
index 0000000000000..d7f6c0eddfeb4
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+# configurable source
+configurable.source.init=database
+
+# additional locations
+quarkus.config.locations=config.properties
+
+# parent profile
+quarkus.config.profile.parent=common
+
+%common.profile.property.shared=common
+%test.profile.property.shared=main
+%prod.profile.property.shared=main
+
+%common.profile.property.common=common
+%test.profile.property.main=main
+%prod.profile.property.main=main
+no.profile=any
+
+profile.main.properties=main
diff --git a/integration-tests/smallrye-config/src/main/resources/application.yaml b/integration-tests/smallrye-config/src/main/resources/application.yaml
new file mode 100644
index 0000000000000..ee5a005d2cfee
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/application.yaml
@@ -0,0 +1,31 @@
+server:
+  host: localhost
+  port: 8080
+  timeout: 60s
+  io-threads: 200
+
+  form:
+    login-page: login.html
+    error-page: error.html
+    landing-page: index.html
+
+  ssl:
+    port: 8443
+    certificate: certificate
+
+  cors:
+    origins:
+      - host: some-server
+        port: 9000
+      - host: another-server
+        port: 8000
+    methods:
+      - GET
+      - POST
+
+  log:
+    period: P1D
+
+profile:
+  main:
+    yaml: main
diff --git a/integration-tests/smallrye-config/src/main/resources/config-common.properties b/integration-tests/smallrye-config/src/main/resources/config-common.properties
new file mode 100644
index 0000000000000..acab6416575cd
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/config-common.properties
@@ -0,0 +1 @@
+config.properties.common=1234
diff --git a/integration-tests/smallrye-config/src/main/resources/config.properties b/integration-tests/smallrye-config/src/main/resources/config.properties
new file mode 100644
index 0000000000000..fc031ecfd4767
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/config.properties
@@ -0,0 +1 @@
+config.properties=1234
diff --git a/integration-tests/smallrye-config/src/main/resources/test-profile-custom.properties b/integration-tests/smallrye-config/src/main/resources/test-profile-custom.properties
new file mode 100644
index 0000000000000..e1acfbed5bf99
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/test-profile-custom.properties
@@ -0,0 +1 @@
+test.profile.custom=custom
diff --git a/integration-tests/smallrye-config/src/main/resources/test-profile.properties b/integration-tests/smallrye-config/src/main/resources/test-profile.properties
new file mode 100644
index 0000000000000..ad05d5b34bc4c
--- /dev/null
+++ b/integration-tests/smallrye-config/src/main/resources/test-profile.properties
@@ -0,0 +1 @@
+test.profile.main=main
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsIT.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsIT.java
new file mode 100644
index 0000000000000..7c7ca4710e761
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.smallrye.config;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ConfigLocationsIT extends ConfigLocationsTest {
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java
new file mode 100644
index 0000000000000..2f57dc2029ca4
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigLocationsTest.java
@@ -0,0 +1,57 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class ConfigLocationsTest {
+    @Test
+    void locations() {
+        given()
+                .get("/config/{name}", "config.properties")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("1234"));
+
+        given()
+                .get("/config/{name}", "config.properties.common")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("1234"));
+    }
+
+    @Test
+    void applicationPropertiesProfile() {
+        given()
+                .get("/config/{name}", "profile.main.properties")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("main"));
+
+        given()
+                .get("/config/{name}", "profile.common.properties")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("common"));
+    }
+
+    @Test
+    void applicationYamlProfile() {
+        given()
+                .get("/config/{name}", "profile.main.yaml")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("main"));
+
+        given()
+                .get("/config/{name}", "profile.common.yaml")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("common"));
+    }
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorIT.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorIT.java
new file mode 100644
index 0000000000000..b93882140d649
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.smallrye.config;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ConfigSourceInterceptorIT extends ConfigSourceInterceptorTest {
+
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java
new file mode 100644
index 0000000000000..74dcdff5ab01b
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigSourceInterceptorTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class ConfigSourceInterceptorTest {
+    @Test
+    void interceptor() {
+        given()
+                .get("/config/{name}", "interceptor.play")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("pingpong"));
+    }
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceIT.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceIT.java
new file mode 100644
index 0000000000000..ceeb41c1bf170
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.smallrye.config;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ConfigurableSourceIT extends ConfigurableSourceTest {
+
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java
new file mode 100644
index 0000000000000..b0bf16c790c53
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ConfigurableSourceTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class ConfigurableSourceTest {
+    @Test
+    void configurableSource() {
+        given()
+                .get("/config/{name}", "database.user.naruto")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("uzumaki"));
+    }
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java
new file mode 100644
index 0000000000000..a15caac98c238
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/QuarkusTestProfileTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.QuarkusTestProfile;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(QuarkusTestProfileTest.TestProfile.class)
+public class QuarkusTestProfileTest {
+    @Test
+    void testProfile() {
+        given()
+                .get("/config/{name}", "test.profile.main")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("main"));
+
+        given()
+                .get("/config/{name}", "test.profile.custom")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("custom"));
+    }
+
+    public static class TestProfile implements QuarkusTestProfile {
+        @Override
+        public Map<String, String> getConfigOverrides() {
+            Map<String, String> configs = new HashMap<>();
+            configs.put("quarkus.config.locations", "test-profile.properties");
+            return configs;
+        }
+
+        @Override
+        public String getConfigProfile() {
+            return "custom";
+        }
+    }
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceIT.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceIT.java
new file mode 100644
index 0000000000000..f28bdd41eb040
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceIT.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.smallrye.config;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class ServerResourceIT extends ServerResourceTest {
+
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java
new file mode 100644
index 0000000000000..34f58e22e25c9
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/ServerResourceTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class ServerResourceTest {
+    @Test
+    void mapping() {
+        given()
+                .get("/server")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("host", equalTo("localhost"))
+                .body("port", equalTo(8080))
+                .body("threads", equalTo(200))
+                .body("form.form.loginPage", equalTo("login.html"))
+                .body("form.form.errorPage", equalTo("error.html"))
+                .body("form.form.landingPage", equalTo("index.html"))
+                .body("ssl.port", equalTo(8443))
+                .body("ssl.certificate", equalTo("certificate"))
+                .body("cors.methods[0]", equalTo("GET"))
+                .body("cors.methods[1]", equalTo("POST"))
+                .body("cors.origins[0].host", equalTo("some-server"))
+                .body("cors.origins[0].port", equalTo(9000))
+                .body("cors.origins[1].host", equalTo("another-server"))
+                .body("cors.origins[1].port", equalTo(8000))
+                .body("log.enabled", equalTo(false))
+                .body("log.suffix", equalTo(".log"))
+                .body("log.rotate", equalTo(true))
+                .body("log.pattern", equalTo("COMMON"))
+                .body("log.period", equalTo("P1D"));
+    }
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigIT.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigIT.java
new file mode 100644
index 0000000000000..dad065ca86ebe
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.smallrye.config;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class SmallRyeConfigIT extends SmallRyeConfigTest {
+}
diff --git a/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java
new file mode 100644
index 0000000000000..b96d22f33ae21
--- /dev/null
+++ b/integration-tests/smallrye-config/src/test/java/io/quarkus/it/smallrye/config/SmallRyeConfigTest.java
@@ -0,0 +1,84 @@
+package io.quarkus.it.smallrye.config;
+
+import static io.restassured.RestAssured.given;
+import static javax.ws.rs.core.Response.Status.OK;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class SmallRyeConfigTest {
+    @Test
+    void mpConfigProperties() {
+        given()
+                .get("/config/{name}", "mp.config.server.name")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("localhost"));
+
+        given()
+                .get("/config/{name}", "mp.config.server.port")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("9090"));
+    }
+
+    @Test
+    void dotenv() {
+        given()
+                .get("/config/{name}", "dotenv.server.name")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("localhost"));
+
+        given()
+                .get("/config/{name}", "dotenv.server.port")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("9090"));
+    }
+
+    @Test
+    void properties() {
+        given()
+                .get("/config/{name}", "profile.property.shared")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("main"));
+
+        given()
+                .get("/config/{name}", "profile.property.common")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("common"));
+
+        given()
+                .get("/config/{name}", "profile.property.main")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("main"));
+
+        given()
+                .get("/config/{name}", "no.profile")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("any"));
+    }
+
+    @Test
+    void externalConfig() {
+        given()
+                .get("/config/{name}", "config.dir.property")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("1234"));
+
+        given()
+                .get("/config/{name}", "config.dir.property.yaml")
+                .then()
+                .statusCode(OK.getStatusCode())
+                .body("value", equalTo("1234"));
+    }
+}
diff --git a/integration-tests/smallrye-context-propagation/disable-native-profile b/integration-tests/smallrye-context-propagation/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/smallrye-context-propagation/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/smallrye-context-propagation/pom.xml b/integration-tests/smallrye-context-propagation/pom.xml
index 52fabb5ff00d5..894db67f0657c 100644
--- a/integration-tests/smallrye-context-propagation/pom.xml
+++ b/integration-tests/smallrye-context-propagation/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-smallrye-context-propagation</artifactId>
@@ -60,7 +59,7 @@
  
         <dependency>
             <groupId>io.smallrye.reactive</groupId>
-            <artifactId>mutiny-context-propagation</artifactId>
+            <artifactId>mutiny-smallrye-context-propagation</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -101,5 +100,20 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
diff --git a/integration-tests/smallrye-context-propagation/src/test/resources/application.properties b/integration-tests/smallrye-context-propagation/src/test/resources/application.properties
index 681a5037798bb..081c30e274bf8 100644
--- a/integration-tests/smallrye-context-propagation/src/test/resources/application.properties
+++ b/integration-tests/smallrye-context-propagation/src/test/resources/application.properties
@@ -1,7 +1,6 @@
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
diff --git a/integration-tests/smallrye-graphql/pom.xml b/integration-tests/smallrye-graphql/pom.xml
index f06813f519cc1..941d1e6d19834 100644
--- a/integration-tests/smallrye-graphql/pom.xml
+++ b/integration-tests/smallrye-graphql/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-smallrye-graphql</artifactId>
@@ -32,6 +31,21 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-graphql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -50,60 +64,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Farewell.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Farewell.java
new file mode 100644
index 0000000000000..b7ea9c5063529
--- /dev/null
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Farewell.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.smallrye.graphql;
+
+public class Farewell extends Salutation {
+
+    @Override
+    public String getType() {
+        return "Farewell";
+    }
+
+}
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Greeting.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Greeting.java
index 9aa4f508b4963..1ee4900215303 100644
--- a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Greeting.java
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Greeting.java
@@ -2,7 +2,7 @@
 
 import java.time.LocalTime;
 
-public class Greeting {
+public class Greeting extends Salutation {
 
     private String message;
     private LocalTime time;
@@ -31,4 +31,9 @@ public void setTime(LocalTime time) {
         this.time = time;
     }
 
+    @Override
+    public String getType() {
+        return "Greet";
+    }
+
 }
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java
index c44410c9e09ab..e3708cb98a71f 100644
--- a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java
@@ -1,11 +1,16 @@
 package io.quarkus.it.smallrye.graphql;
 
 import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.graphql.GraphQLApi;
 import org.eclipse.microprofile.graphql.Mutation;
+import org.eclipse.microprofile.graphql.Name;
 import org.eclipse.microprofile.graphql.Query;
+import org.eclipse.microprofile.graphql.Source;
 
 @GraphQLApi
 public class GreetingResource {
@@ -27,4 +32,24 @@ public Greeting hello() {
     public Greetings load(Greetings greetings) {
         return greetings;
     }
+
+    @Name("options")
+    public List<Greeting> buildInOptions(@Source Greeting greeting) {
+        List<Greeting> options = new ArrayList<>();
+        options.add(new Hello());
+        return options;
+    }
+
+    @Name("options2")
+    // make sure that returning Collection.class does not break native mode
+    public Collection<Greeting> buildInOptionsCollection(@Source Greeting greeting) {
+        List<Greeting> options = new ArrayList<>();
+        options.add(new Morning());
+        return options;
+    }
+
+    @Query
+    public Farewell farewell() {
+        return new Farewell();
+    }
 }
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Hello.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Hello.java
new file mode 100644
index 0000000000000..b77558c39086d
--- /dev/null
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Hello.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.smallrye.graphql;
+
+import java.time.LocalTime;
+
+public class Hello extends Greeting {
+
+    private TimeOfDay timeOfDay = TimeOfDay.ANY;
+
+    public Hello() {
+        super("Hello", LocalTime.now());
+    }
+
+    public TimeOfDay getTimeOfDay() {
+        return timeOfDay;
+    }
+
+    public void setTimeOfDay(TimeOfDay timeOfDay) {
+        this.timeOfDay = timeOfDay;
+    }
+}
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Morning.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Morning.java
new file mode 100644
index 0000000000000..fd4c7a29bed86
--- /dev/null
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Morning.java
@@ -0,0 +1,20 @@
+package io.quarkus.it.smallrye.graphql;
+
+import java.time.LocalTime;
+
+public class Morning extends Greeting {
+
+    private TimeOfDay timeOfDay = TimeOfDay.MORNING;
+
+    public Morning() {
+        super("Good Morning", LocalTime.now());
+    }
+
+    public TimeOfDay getTimeOfDay() {
+        return timeOfDay;
+    }
+
+    public void setTimeOfDay(TimeOfDay timeOfDay) {
+        this.timeOfDay = timeOfDay;
+    }
+}
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Salutation.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Salutation.java
new file mode 100644
index 0000000000000..e9bb299c652e1
--- /dev/null
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Salutation.java
@@ -0,0 +1,6 @@
+package io.quarkus.it.smallrye.graphql;
+
+public abstract class Salutation {
+
+    public abstract String getType();
+}
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/TimeOfDay.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/TimeOfDay.java
new file mode 100644
index 0000000000000..c01e853253222
--- /dev/null
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/TimeOfDay.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.smallrye.graphql;
+
+public enum TimeOfDay {
+
+    ANY,
+    MORNING,
+    AFTERNOON,
+    EVENING,
+    NIGHT
+}
diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Welcome.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Welcome.java
new file mode 100644
index 0000000000000..808703eb13bb8
--- /dev/null
+++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/Welcome.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.smallrye.graphql;
+
+public class Welcome extends Salutation {
+
+    @Override
+    public String getType() {
+        return "Welcome";
+    }
+
+}
diff --git a/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java b/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java
index 9b2b8e1d677d7..9ff8af8a1d9e4 100644
--- a/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java
+++ b/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java
@@ -16,10 +16,19 @@ class GreetingResourceTest {
     void testEndpoint() {
 
         String helloRequest = getPayload("{\n" +
-                "  hello {\n" +
+                "  greeting:hello {\n" +
                 "    time\n" +
                 "    message\n" +
+                "    options{\n" +
+                "       message\n" +
+                "    }\n" +
+                "    options2{\n" +
+                "       message\n" +
+                "    }\n" +
                 "  }\n" +
+                "  farewell:farewell{\n" +
+                "    type\n" +
+                "   }\n" +
                 "}");
 
         given()
@@ -32,7 +41,9 @@ void testEndpoint() {
                 .statusCode(200)
                 .and()
                 .body(containsString("hello"))
-                .body(containsString("11:34"));
+                .body(containsString("11:34"))
+                .body(containsString("Morning"))
+                .body(containsString("Farewell"));
     }
 
 }
diff --git a/integration-tests/smallrye-jwt-token-propagation/pom.xml b/integration-tests/smallrye-jwt-token-propagation/pom.xml
new file mode 100644
index 0000000000000..c0151077f9f99
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/pom.xml
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-smallrye-jwt-token-propagation</artifactId>
+    <name>Quarkus - Integration Tests - Smallrye JWT Token Propagation</name>
+    <description>Module that contains Smallrye JWT Token Propagation tests</description>
+
+    <properties>
+        <keycloak.url>http://localhost:8180/auth</keycloak.url>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-adapter-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-token-propagation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-oidc-token-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>test-keycloak</id>
+            <activation>
+                <property>
+                    <name>test-containers</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                            <systemPropertyVariables>
+                                <keycloak.url>${keycloak.url}</keycloak.url>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>docker-keycloak</id>
+            <activation>
+                <property>
+                    <name>start-containers</name>
+                </property>
+            </activation>
+            <properties>
+                <keycloak.url>http://localhost:8180/auth</keycloak.url>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${keycloak.docker.image}</name>
+                                    <alias>quarkus-test-keycloak</alias>
+                                    <run>
+                                        <ports>
+                                            <port>8180:8080</port>
+                                        </ports>
+                                        <env>
+                                            <KEYCLOAK_USER>admin</KEYCLOAK_USER>
+                                            <KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
+                                        </env>
+                                        <log>
+                                            <prefix>Keycloak:</prefix>
+                                            <date>default</date>
+                                            <color>cyan</color>
+                                        </log>
+                                        <wait>
+                                            <!-- good docs found at: http://dmp.fabric8.io/#build-healthcheck -->
+                                            <http>
+                                                <url>http://localhost:8180</url>
+                                            </http>
+                                            <time>100000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                            <allContainers>true</allContainers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>docker-start</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>docker-stop</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-prune</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${basedir}/../../.github/docker-prune.sh</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java
new file mode 100644
index 0000000000000..a85798bfccdbd
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/AccessTokenPropagationService.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.token.propagation.AccessToken;
+
+@RegisterRestClient
+@AccessToken
+@Path("/")
+public interface AccessTokenPropagationService {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
new file mode 100644
index 0000000000000..e766dc26103dd
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/FrontendResource.java
@@ -0,0 +1,56 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.jwt.JsonWebToken;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/frontend")
+public class FrontendResource {
+    @Inject
+    JsonWebToken jwt;
+
+    @Inject
+    @ConfigProperty(name = "mp.jwt.verify.issuer")
+    String configuredIssuer;
+
+    @Inject
+    @RestClient
+    JwtTokenPropagationService jwtTokenPropagationService;
+
+    @Inject
+    @RestClient
+    AccessTokenPropagationService accessTokenPropagationService;
+
+    @GET
+    @Path("jwt-token-propagation")
+    @RolesAllowed("user")
+    public String userNameJwtTokenPropagation() {
+        checkIssuerAndAudience();
+        return jwtTokenPropagationService.getUserName();
+    }
+
+    @GET
+    @Path("access-token-propagation")
+    @RolesAllowed("user")
+    public String userNameAccessTokenPropagation() {
+        checkIssuerAndAudience();
+        return accessTokenPropagationService.getUserName();
+    }
+
+    private void checkIssuerAndAudience() {
+        // it has already been verified by smallrye-jwt
+        if (!configuredIssuer.equals(jwt.getIssuer())) {
+            throw new NotAuthorizedException(401);
+        }
+        if (jwt.getAudience() != null) {
+            // Keycloak does not set the audience
+            throw new NotAuthorizedException(401);
+        }
+    }
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java
new file mode 100644
index 0000000000000..a897f7451ecd2
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtResignedProtectedResource.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.keycloak;
+
+import java.security.PublicKey;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.smallrye.jwt.auth.principal.DefaultJWTParser;
+import io.smallrye.jwt.auth.principal.JWTAuthContextInfo;
+import io.smallrye.jwt.auth.principal.JWTParser;
+import io.smallrye.jwt.util.KeyUtils;
+
+@Path("/jwt-resigned-protected")
+public class JwtResignedProtectedResource {
+
+    JWTParser parser;
+
+    @PostConstruct
+    public void loadVerificationKey() throws Exception {
+        PublicKey verificationKey = KeyUtils.readPublicKey("/publicKey.pem");
+        parser = new DefaultJWTParser(new JWTAuthContextInfo(verificationKey, "http://frontend-resource"));
+    }
+
+    @GET
+    public String principalName(@HeaderParam("Authorization") String authorization) throws Exception {
+        JsonWebToken jwt = parser.parse(authorization.split(" ")[1]);
+        checkIssuerAndAudience(jwt);
+        return jwt.getName();
+    }
+
+    private void checkIssuerAndAudience(JsonWebToken jwt) {
+        if (!"http://frontend-resource".equals(jwt.getIssuer())) {
+            throw new NotAuthorizedException(401);
+        }
+        Set<String> aud = jwt.getAudience();
+        if (aud.size() != 1 || !aud.contains("http://jwt-resigned-protected-resource")) {
+            throw new NotAuthorizedException(401);
+        }
+    }
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java
new file mode 100644
index 0000000000000..c5c8b87eb9545
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/JwtTokenPropagationService.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+import io.quarkus.oidc.token.propagation.JsonWebToken;
+
+@RegisterRestClient
+@JsonWebToken
+@Path("/")
+public interface JwtTokenPropagationService {
+
+    @GET
+    String getUserName();
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
new file mode 100644
index 0000000000000..a16ffa8cf26fc
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/java/io/quarkus/it/keycloak/ProtectedResource.java
@@ -0,0 +1,42 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.jwt.JsonWebToken;
+
+import io.quarkus.security.Authenticated;
+
+@Path("/protected")
+@Authenticated
+public class ProtectedResource {
+
+    @Inject
+    JsonWebToken jwt;
+
+    @Inject
+    @ConfigProperty(name = "mp.jwt.verify.issuer")
+    String configuredIssuer;
+
+    @GET
+    @RolesAllowed("user")
+    public String principalName() {
+        checkIssuerAndAudience();
+        return jwt.getName();
+    }
+
+    private void checkIssuerAndAudience() {
+        // it has already been verified by smallrye-jwt
+        if (!configuredIssuer.equals(jwt.getIssuer())) {
+            throw new NotAuthorizedException(401);
+        }
+        if (jwt.getAudience() != null) {
+            // Keycloak does not set the audience
+            throw new NotAuthorizedException(401);
+        }
+    }
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/resources/application.properties b/integration-tests/smallrye-jwt-token-propagation/src/main/resources/application.properties
new file mode 100644
index 0000000000000..e4ff9949fbbaf
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/resources/application.properties
@@ -0,0 +1,16 @@
+mp.jwt.verify.publickey.location=${keycloak.url}/realms/quarkus/protocol/openid-connect/certs
+mp.jwt.verify.issuer=${keycloak.url}/realms/quarkus
+smallrye.jwt.path.groups=realm_access/roles
+
+io.quarkus.it.keycloak.JwtTokenPropagationService/mp-rest/uri=http://localhost:8081/jwt-resigned-protected
+io.quarkus.it.keycloak.AccessTokenPropagationService/mp-rest/uri=http://localhost:8081/protected
+
+quarkus.oidc-token-propagation.secure-json-web-token=true
+smallrye.jwt.sign.key.location=/privateKey.pem
+smallrye.jwt.new-token.issuer=http://frontend-resource
+smallrye.jwt.new-token.audience=http://jwt-resigned-protected-resource
+smallrye.jwt.new-token.override-matching-claims=true
+
+quarkus.http.auth.proactive=false
+
+quarkus.native.additional-build-args=-H:IncludeResources=.*\\.pem
\ No newline at end of file
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/resources/privateKey.pem b/integration-tests/smallrye-jwt-token-propagation/src/main/resources/privateKey.pem
new file mode 100644
index 0000000000000..27543a434a1eb
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/resources/privateKey.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWK8UjyoHgPTLa
+PLQJ8SoXLLjpHSjtLxMqmzHnFscqhTVVaDpCRCb6e3Ii/WniQTWw8RA7vf4djz4H
+OzvlfBFNgvUGZHXDwnmGaNVaNzpHYFMEYBhE8VGGiveSkzqeLZI+Y02G6sQAfDtN
+qqzM/l5QX8X34oQFaTBW1r49nftvCpITiwJvWyhkWtXP9RP8sXi1im5Vi3dhupOh
+nelk5n0BfajUYIbfHA6ORzjHRbt7NtBl0L2J+0/FUdHyKs6KMlFGNw8O0Dq88qnM
+uXoLJiewhg9332W3DFMeOveel+//cvDnRsCRtPgd4sXFPHh+UShkso7+DRsChXa6
+oGGQD3GdAgMBAAECggEAAjfTSZwMHwvIXIDZB+yP+pemg4ryt84iMlbofclQV8hv
+6TsI4UGwcbKxFOM5VSYxbNOisb80qasb929gixsyBjsQ8284bhPJR7r0q8h1C+jY
+URA6S4pk8d/LmFakXwG9Tz6YPo3pJziuh48lzkFTk0xW2Dp4SLwtAptZY/+ZXyJ6
+96QXDrZKSSM99Jh9s7a0ST66WoxSS0UC51ak+Keb0KJ1jz4bIJ2C3r4rYlSu4hHB
+Y73GfkWORtQuyUDa9yDOem0/z0nr6pp+pBSXPLHADsqvZiIhxD/O0Xk5I6/zVHB3
+zuoQqLERk0WvA8FXz2o8AYwcQRY2g30eX9kU4uDQAQKBgQDmf7KGImUGitsEPepF
+KH5yLWYWqghHx6wfV+fdbBxoqn9WlwcQ7JbynIiVx8MX8/1lLCCe8v41ypu/eLtP
+iY1ev2IKdrUStvYRSsFigRkuPHUo1ajsGHQd+ucTDf58mn7kRLW1JGMeGxo/t32B
+m96Af6AiPWPEJuVfgGV0iwg+HQKBgQCmyPzL9M2rhYZn1AozRUguvlpmJHU2DpqS
+34Q+7x2Ghf7MgBUhqE0t3FAOxEC7IYBwHmeYOvFR8ZkVRKNF4gbnF9RtLdz0DMEG
+5qsMnvJUSQbNB1yVjUCnDAtElqiFRlQ/k0LgYkjKDY7LfciZl9uJRl0OSYeX/qG2
+tRW09tOpgQKBgBSGkpM3RN/MRayfBtmZvYjVWh3yjkI2GbHA1jj1g6IebLB9SnfL
+WbXJErCj1U+wvoPf5hfBc7m+jRgD3Eo86YXibQyZfY5pFIh9q7Ll5CQl5hj4zc4Y
+b16sFR+xQ1Q9Pcd+BuBWmSz5JOE/qcF869dthgkGhnfVLt/OQzqZluZRAoGAXQ09
+nT0TkmKIvlza5Af/YbTqEpq8mlBDhTYXPlWCD4+qvMWpBII1rSSBtftgcgca9XLB
+MXmRMbqtQeRtg4u7dishZVh1MeP7vbHsNLppUQT9Ol6lFPsd2xUpJDc6BkFat62d
+Xjr3iWNPC9E9nhPPdCNBv7reX7q81obpeXFMXgECgYEAmk2Qlus3OV0tfoNRqNpe
+Mb0teduf2+h3xaI1XDIzPVtZF35ELY/RkAHlmWRT4PCdR0zXDidE67L6XdJyecSt
+FdOUH8z5qUraVVebRFvJqf/oGsXc4+ex1ZKUTbY0wqY1y9E39yvB3MaTmZFuuqk8
+f3cg+fr8aou7pr9SHhJlZCU=
+-----END PRIVATE KEY-----
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/main/resources/publicKey.pem b/integration-tests/smallrye-jwt-token-propagation/src/main/resources/publicKey.pem
new file mode 100644
index 0000000000000..6dc936fca3485
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/main/resources/publicKey.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlivFI8qB4D0y2jy0CfEq
+Fyy46R0o7S8TKpsx5xbHKoU1VWg6QkQm+ntyIv1p4kE1sPEQO73+HY8+Bzs75XwR
+TYL1BmR1w8J5hmjVWjc6R2BTBGAYRPFRhor3kpM6ni2SPmNNhurEAHw7TaqszP5e
+UF/F9+KEBWkwVta+PZ37bwqSE4sCb1soZFrVz/UT/LF4tYpuVYt3YbqToZ3pZOZ9
+AX2o1GCG3xwOjkc4x0W7ezbQZdC9iftPxVHR8irOijJRRjcPDtA6vPKpzLl6CyYn
+sIYPd99ltwxTHjr3npfv/3Lw50bAkbT4HeLFxTx4flEoZLKO/g0bAoV2uqBhkA9x
+nQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
new file mode 100644
index 0000000000000..f2fbe961d02cb
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -0,0 +1,142 @@
+package io.quarkus.it.keycloak;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.ClientRepresentation;
+import org.keycloak.representations.idm.CredentialRepresentation;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RoleRepresentation;
+import org.keycloak.representations.idm.RolesRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.restassured.RestAssured;
+
+public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager {
+
+    private static final String KEYCLOAK_SERVER_URL = System.getProperty("keycloak.url", "http://localhost:8180/auth");
+    private static final String KEYCLOAK_REALM = "quarkus";
+
+    @Override
+    public Map<String, String> start() {
+
+        RealmRepresentation realm = createRealm(KEYCLOAK_REALM);
+        realm.setRevokeRefreshToken(true);
+        realm.setRefreshTokenMaxReuse(0);
+        realm.setAccessTokenLifespan(3);
+
+        realm.getClients().add(createClient("quarkus-app"));
+        realm.getUsers().add(createUser("alice", "user"));
+        realm.getUsers().add(createUser("bob", "user"));
+
+        try {
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(KEYCLOAK_SERVER_URL + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return Collections.emptyMap();
+    }
+
+    private static String getAdminAccessToken() {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", "admin")
+                .param("password", "admin")
+                .param("client_id", "admin-cli")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/master/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private static RealmRepresentation createRealm(String name) {
+        RealmRepresentation realm = new RealmRepresentation();
+
+        realm.setRealm(name);
+        realm.setEnabled(true);
+        realm.setUsers(new ArrayList<>());
+        realm.setClients(new ArrayList<>());
+        realm.setAccessTokenLifespan(3);
+
+        RolesRepresentation roles = new RolesRepresentation();
+        List<RoleRepresentation> realmRoles = new ArrayList<>();
+
+        roles.setRealm(realmRoles);
+        realm.setRoles(roles);
+
+        realm.getRoles().getRealm().add(new RoleRepresentation("user", null, false));
+        realm.getRoles().getRealm().add(new RoleRepresentation("admin", null, false));
+
+        return realm;
+    }
+
+    private static ClientRepresentation createClient(String clientId) {
+        ClientRepresentation client = new ClientRepresentation();
+
+        client.setClientId(clientId);
+        client.setPublicClient(false);
+        client.setSecret("secret");
+        client.setDirectAccessGrantsEnabled(true);
+        client.setServiceAccountsEnabled(true);
+        client.setEnabled(true);
+
+        return client;
+    }
+
+    private static UserRepresentation createUser(String username, String... realmRoles) {
+        UserRepresentation user = new UserRepresentation();
+
+        user.setUsername(username);
+        user.setEnabled(true);
+        user.setCredentials(new ArrayList<>());
+        user.setRealmRoles(Arrays.asList(realmRoles));
+        user.setEmail(username + "@gmail.com");
+
+        CredentialRepresentation credential = new CredentialRepresentation();
+
+        credential.setType(CredentialRepresentation.PASSWORD);
+        credential.setValue(username);
+        credential.setTemporary(false);
+
+        user.getCredentials().add(credential);
+
+        return user;
+    }
+
+    @Override
+    public void stop() {
+
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(KEYCLOAK_SERVER_URL + "/admin/realms/" + KEYCLOAK_REALM).then().statusCode(204);
+    }
+
+    public static String getAccessToken(String userName) {
+        return RestAssured
+                .given()
+                .param("grant_type", "password")
+                .param("username", userName)
+                .param("password", userName)
+                .param("client_id", "quarkus-app")
+                .param("client_secret", "secret")
+                .when()
+                .post(KEYCLOAK_SERVER_URL + "/realms/" + KEYCLOAK_REALM + "/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationInGraalITCase.java b/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationInGraalITCase.java
new file mode 100644
index 0000000000000..01ee8ab1acbd6
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationInGraalITCase.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class OidcTokenPropagationInGraalITCase extends OidcTokenPropagationTest {
+}
diff --git a/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java b/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
new file mode 100644
index 0000000000000..b861a1e0c53f3
--- /dev/null
+++ b/integration-tests/smallrye-jwt-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.keycloak;
+
+import static org.hamcrest.Matchers.equalTo;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@QuarkusTestResource(KeycloakRealmResourceManager.class)
+public class OidcTokenPropagationTest {
+
+    @Test
+    public void testGetUserNameWithJwtTokenPropagation() {
+        RestAssured.given().auth().oauth2(KeycloakRealmResourceManager.getAccessToken("alice"))
+                .when().get("/frontend/jwt-token-propagation")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+    }
+
+    @Test
+    public void testGetUserNameWithAccessTokenPropagation() {
+        RestAssured.given().auth().oauth2(KeycloakRealmResourceManager.getAccessToken("alice"))
+                .when().get("/frontend/access-token-propagation")
+                .then()
+                .statusCode(200)
+                .body(equalTo("alice"));
+    }
+}
diff --git a/integration-tests/smallrye-metrics/pom.xml b/integration-tests/smallrye-metrics/pom.xml
new file mode 100644
index 0000000000000..3860bc131b0c4
--- /dev/null
+++ b/integration-tests/smallrye-metrics/pom.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-integration-test-smallrye-metrics</artifactId>
+    <name>Quarkus - Integration Tests - SmallRye Metrics</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics</artifactId>
+        </dependency>
+
+
+        <!-- JAX-RS -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
+        
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Issue 7854: ensure that mockito works properly -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <runOrder>alphabetical</runOrder>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>native-image</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.add-all-charsets>true</quarkus.native.add-all-charsets>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>no-native</id>
+            <activation>
+                <property>
+                    <name>!native</name>
+                </property>
+            </activation>
+            <!-- these properties must not be defined in the general properties,
+                 otherwise the native profile in the parent pom is not able to override them -->
+            <properties>
+                <quarkus.package.type>uber-jar</quarkus.package.type>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/DummyGauge.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGauge.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/DummyGauge.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGauge.java
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/DummyGaugeNoReflectionAnnotation.java
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsOnClassResource.java
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/MetricsResource.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsResource.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/MetricsResource.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/MetricsResource.java
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsBase.java
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/InheritanceMetricsExtended.java
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java b/integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java
similarity index 100%
rename from integration-tests/main/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java
rename to integration-tests/smallrye-metrics/src/main/java/io/quarkus/it/metrics/inheritance/MetricsInheritanceResource.java
diff --git a/integration-tests/smallrye-metrics/src/main/resources/application.properties b/integration-tests/smallrye-metrics/src/main/resources/application.properties
new file mode 100644
index 0000000000000..da1ed9e5f6792
--- /dev/null
+++ b/integration-tests/smallrye-metrics/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.log.metrics.enabled=true
\ No newline at end of file
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsITCase.java
similarity index 79%
rename from integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java
rename to integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsITCase.java
index 7376159d9d156..46791ddc5e491 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsITCase.java
+++ b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsITCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.main;
+package io.quarkus.it.metrics;
 
 import io.quarkus.test.junit.NativeImageTest;
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsInheritanceITCase.java
similarity index 82%
rename from integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java
rename to integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsInheritanceITCase.java
index 455f69e21bac6..973b8150de647 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceITCase.java
+++ b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsInheritanceITCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.main;
+package io.quarkus.it.metrics;
 
 import io.quarkus.test.junit.NativeImageTest;
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceTestCase.java b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsInheritanceTestCase.java
similarity index 96%
rename from integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceTestCase.java
rename to integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsInheritanceTestCase.java
index 2a9a4eab05c58..812d632ae0a03 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsInheritanceTestCase.java
+++ b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsInheritanceTestCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.main;
+package io.quarkus.it.metrics;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsOnClassITCase.java
similarity index 81%
rename from integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java
rename to integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsOnClassITCase.java
index 3997c569262c4..f24ca305fa44f 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassITCase.java
+++ b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsOnClassITCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.main;
+package io.quarkus.it.metrics;
 
 import io.quarkus.test.junit.NativeImageTest;
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassTestCase.java b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsOnClassTestCase.java
similarity index 85%
rename from integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassTestCase.java
rename to integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsOnClassTestCase.java
index 0c1271d2efcdc..ad13ca45399b6 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsOnClassTestCase.java
+++ b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsOnClassTestCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.main;
+package io.quarkus.it.metrics;
 
 import static org.hamcrest.Matchers.containsString;
 
@@ -23,12 +23,12 @@ public void testCounterOnConstructor() {
     }
 
     private void assertMetricExactValue(String scope, String name, String expectedNameInOutput, String val) {
-        RestAssured.when().get("/metrics/" + scope + "/" + name).then()
+        RestAssured.when().get("/q/metrics/" + scope + "/" + name).then()
                 .body(containsString(expectedNameInOutput + " " + val));
     }
 
     private void assertMetricExists(String scope, String name, String expectedNameInOutput) {
-        RestAssured.when().get("/metrics/" + scope + "/" + name).then()
+        RestAssured.when().get("/q/metrics/" + scope + "/" + name).then()
                 .body(containsString(expectedNameInOutput + " "));
     }
 
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsTestCase.java
similarity index 91%
rename from integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java
rename to integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsTestCase.java
index 27aed80836fe0..3f4e20f9829ee 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java
+++ b/integration-tests/smallrye-metrics/src/test/java/io/quarkus/it/metrics/MetricsTestCase.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.main;
+package io.quarkus.it.metrics;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
@@ -96,6 +96,13 @@ public void testHistogram() {
 
     @Test
     public void testScopes() {
+        RestAssured.when().get("/q/metrics/base").then().statusCode(200);
+        RestAssured.when().get("/q/metrics/vendor").then().statusCode(200);
+        RestAssured.when().get("/q/metrics/application").then().statusCode(200);
+    }
+
+    @Test
+    public void testScopesRedirect() {
         RestAssured.when().get("/metrics/base").then().statusCode(200);
         RestAssured.when().get("/metrics/vendor").then().statusCode(200);
         RestAssured.when().get("/metrics/application").then().statusCode(200);
@@ -115,15 +122,15 @@ public void testMetricWithCustomTags() {
 
     @Test
     public void testInvalidScopes() {
-        RestAssured.when().get("/metrics/foo").then().statusCode(404)
+        RestAssured.when().get("/q/metrics/foo").then().statusCode(404)
                 .body(containsString("Scope foo not found"));
-        RestAssured.when().get("/metrics/vendor/foo").then().statusCode(404)
+        RestAssured.when().get("/q/metrics/vendor/foo").then().statusCode(404)
                 .body(containsString("Metric vendor/foo not found"));
     }
 
     @Test
     public void testBaseMetrics() {
-        RestAssured.when().get("/metrics/base").then().statusCode(200)
+        RestAssured.when().get("/q/metrics/base").then().statusCode(200)
                 // the spaces at the end are there on purpose to make sure the metrics are named exactly this way
                 .body(containsString("base_classloader_loadedClasses_total "))
                 .body(containsString("base_cpu_systemLoadAverage "))
@@ -141,11 +148,12 @@ public void testBaseMetrics() {
 
     @Test
     public void testVendorMetrics() {
-        RestAssured.when().get("/metrics/vendor").then().statusCode(200)
+        RestAssured.when().get("/q/metrics/vendor").then().statusCode(200)
                 // the spaces at the end are there on purpose to make sure the metrics are named exactly this way
                 .body(containsString("vendor_memory_committedNonHeap_bytes "))
                 .body(containsString("vendor_memory_usedNonHeap_bytes "))
-                .body(containsString("vendor_memory_maxNonHeap_bytes "));
+                .body(containsString("vendor_memory_maxNonHeap_bytes "))
+                .body(containsString("vendor_log_total{level=\"INFO\"} "));
     }
 
     /**
@@ -163,7 +171,7 @@ public void testEndpointWithMetricsThrowingException() {
      */
     @Test
     public void testNoMetricsFromSmallRyeInternalClasses() {
-        RestAssured.when().get("/metrics/application").then()
+        RestAssured.when().get("/q/metrics/application").then()
                 .body(not(containsString("io_smallrye_metrics")));
     }
 
@@ -185,12 +193,12 @@ public void testDummyGaugeNoReflectionAnnotation() {
     }
 
     private void assertMetricExactValue(String name, String val) {
-        RestAssured.when().get("/metrics").then()
+        RestAssured.when().get("/q/metrics").then()
                 .body(containsString(name + " " + val));
     }
 
     private void assertMetricExists(String name) {
-        RestAssured.when().get("/metrics").then()
+        RestAssured.when().get("/q/metrics").then()
                 .body(containsString(name));
     }
 
diff --git a/integration-tests/spring-boot-properties/pom.xml b/integration-tests/spring-boot-properties/pom.xml
index 5c21b165e32f7..02abd0c6af7d9 100644
--- a/integration-tests/spring-boot-properties/pom.xml
+++ b/integration-tests/spring-boot-properties/pom.xml
@@ -36,6 +36,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-boot-properties-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -51,68 +79,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <parameters>true</parameters>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/spring-boot-properties/src/main/resources/application.properties b/integration-tests/spring-boot-properties/src/main/resources/application.properties
index dd2729e5c592f..4842f056edd12 100644
--- a/integration-tests/spring-boot-properties/src/main/resources/application.properties
+++ b/integration-tests/spring-boot-properties/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 cl.value=class-value
-cl.anotherClass.value=true
+cl.another-class.value=true
 bean.value=1
-bean.innerClass.value=inner-class-value
-interface.value=interface-value
\ No newline at end of file
+bean.inner-class.value=inner-class-value
+interface.value=interface-value
diff --git a/integration-tests/spring-cloud-config-client/pom.xml b/integration-tests/spring-cloud-config-client/pom.xml
index e5d4c27cfed68..8759dca0b8220 100644
--- a/integration-tests/spring-cloud-config-client/pom.xml
+++ b/integration-tests/spring-cloud-config-client/pom.xml
@@ -40,6 +40,47 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-config-yaml-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-cloud-config-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -66,31 +107,9 @@
                     <name>native</name>
                 </property>
             </activation>
+            <!-- add some custom config, the rest comes from parent -->
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>uk.co.automatictester</groupId>
                         <artifactId>wiremock-maven-plugin</artifactId>
@@ -118,9 +137,6 @@
                     </plugin>
                 </plugins>
             </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/integration-tests/spring-cloud-config-client/src/main/resources/application.yaml b/integration-tests/spring-cloud-config-client/src/main/resources/application.yaml
index 68cf3e6749f40..aacd3714ab37c 100644
--- a/integration-tests/spring-cloud-config-client/src/main/resources/application.yaml
+++ b/integration-tests/spring-cloud-config-client/src/main/resources/application.yaml
@@ -4,7 +4,10 @@
        url: http://localhost:8089/base
        username: user
        password: pass
-       enabled: true     
+       enabled: true
+       headers:
+         h1: v1
+         h2: v2
 quarkus:
   application:
     name: a-bootiful-client
diff --git a/integration-tests/spring-cloud-config-client/src/main/resources/mappings/a-bootiful-client-prod.json b/integration-tests/spring-cloud-config-client/src/main/resources/mappings/a-bootiful-client-prod.json
index 603e576be8eb4..eea420c151da5 100644
--- a/integration-tests/spring-cloud-config-client/src/main/resources/mappings/a-bootiful-client-prod.json
+++ b/integration-tests/spring-cloud-config-client/src/main/resources/mappings/a-bootiful-client-prod.json
@@ -5,6 +5,17 @@
     "basicAuth" : {
       "username" : "user",
       "password" : "pass"
+    },
+    "headers" : {
+      "Accept" : {
+        "contains" : "application/json"
+      },
+      "h1": {
+        "equalTo": "v1"
+      },
+      "h2": {
+        "equalTo": "v2"
+      }
     }
   },
   "response": {
diff --git a/integration-tests/spring-data-jpa/pom.xml b/integration-tests/spring-data-jpa/pom.xml
index d1bb69f389829..e45a9c1cd1721 100644
--- a/integration-tests/spring-data-jpa/pom.xml
+++ b/integration-tests/spring-data-jpa/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-spring-data-jpa</artifactId>
@@ -57,6 +56,60 @@
             <artifactId>quarkus-test-h2</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-jpa-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -95,44 +148,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java
new file mode 100644
index 0000000000000..ff328b9845a9c
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Animal.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.spring.data.jpa;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class Animal {
+
+    @Id
+    @GeneratedValue
+    public long id;
+
+    public long getId() {
+        return id;
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java
new file mode 100644
index 0000000000000..9183756c2805f
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Car.java
@@ -0,0 +1,26 @@
+package io.quarkus.it.spring.data.jpa;
+
+import javax.persistence.Entity;
+
+@Entity(name = "MotorCar")
+public class Car extends AbstractEntity {
+
+    private String brand;
+    private String model;
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarRepository.java
new file mode 100644
index 0000000000000..756921d044624
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarRepository.java
@@ -0,0 +1,17 @@
+package io.quarkus.it.spring.data.jpa;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface CarRepository extends JpaRepository<Car, Long> {
+
+    List<Car> findByBrand(String brand);
+
+    Car findByBrandAndModel(String brand, String model);
+
+    @Query("SELECT m.model FROM MotorCar m WHERE m.brand = :brand")
+    List<String> findModelsByBrand(@Param("brand") String brand);
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.java
new file mode 100644
index 0000000000000..c9dd8758a6301
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CarResource.java
@@ -0,0 +1,46 @@
+package io.quarkus.it.spring.data.jpa;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+@Path("/car")
+public class CarResource {
+
+    private final CarRepository carRepository;
+
+    public CarResource(CarRepository carRepository) {
+        this.carRepository = carRepository;
+    }
+
+    @Path("brand/{brand}")
+    @GET
+    @Produces("application/json")
+    public List<Car> carsByBrand(@PathParam("brand") String brand) {
+        return carRepository.findByBrand(brand);
+    }
+
+    @Path("brand/{brand}/model/{model}")
+    @GET
+    @Produces("application/json")
+    public Car findByBrandAndModel(@PathParam("brand") String brand, @PathParam("model") String model) {
+        return carRepository.findByBrandAndModel(brand, model);
+    }
+
+    @Path("{id}")
+    @GET
+    @Produces("application/json")
+    public Car carById(@PathParam("id") Long id) {
+        return carRepository.findById(id).orElse(null);
+    }
+
+    @Path("brand/{brand}/models")
+    @GET
+    @Produces("application/json")
+    public List<String> carModelsByBrand(@PathParam("brand") String brand) {
+        return carRepository.findModelsByBrand(brand);
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java
index 9c8517b760486..a39de395032f3 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Cat.java
@@ -1,15 +1,9 @@
 package io.quarkus.it.spring.data.jpa;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 
 @Entity
-public class Cat {
-
-    @Id
-    @GeneratedValue
-    public long id;
+public class Cat extends Mammal {
 
     private String breed;
 
@@ -25,10 +19,6 @@ public Cat(String breed, String color) {
         this.color = color;
     }
 
-    public long getId() {
-        return id;
-    }
-
     public String getBreed() {
         return breed;
     }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatRepository.java
index 4d712a64b26d2..66277d1f11297 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatRepository.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatRepository.java
@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.springframework.data.jpa.repository.Query;
@@ -45,4 +46,8 @@ public interface CatRepository extends CrudRepository<Cat, Long> {
     // issue 9192
     @Query(value = "SELECT c.distinctive FROM Cat c where c.id = :id")
     boolean customFindDistinctive(@Param("id") Long id);
+
+    // the DISTINCT statement was left out intentionally to verify that duplicates are eliminated by the Set
+    @Query(value = "SELECT c.color FROM Cat c WHERE c.color IS NOT NULL")
+    Set<String> customQueryCatColors();
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java
index 6833653a0bee5..be990b701499c 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CatResource.java
@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.ws.rs.GET;
@@ -126,4 +127,11 @@ public List<Cat> byDistinctiveFalse() {
     public Boolean customFindDistinctive(@PathParam("id") Long id) {
         return catRepository.customFindDistinctive(id);
     }
+
+    @GET
+    @Path("/customQueryCatColors")
+    @Produces("application/json")
+    public Set<String> customQueryCatColors() {
+        return catRepository.customQueryCatColors();
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java
index 4a7ef5cde549e..23ab25f8491b9 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/CountryResource.java
@@ -5,6 +5,7 @@
 import java.util.stream.Collectors;
 
 import javax.persistence.NoResultException;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -73,4 +74,10 @@ public Country editIso3(@PathParam("id") Long id, @PathParam("iso3") String iso3
     public Country getOne(@PathParam("id") Long id) {
         return countryRepository.getOne(id);
     }
+
+    @DELETE
+    @Path("/")
+    public void deleteAllInBatch() {
+        this.countryRepository.deleteAllInBatch();
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java
new file mode 100644
index 0000000000000..1e693b2af1fb3
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Employee.java
@@ -0,0 +1,68 @@
+package io.quarkus.it.spring.data.jpa;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "employee")
+public class Employee extends AbstractEntity {
+
+    @Column(name = "user_id")
+    private String userId;
+
+    @Column(name = "first_name")
+    private String firstName;
+
+    @Column(name = "last_name")
+    private String lastName;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "team_id", nullable = false)
+    private Team belongsToTeam;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public Team getBelongsToTeam() {
+        return belongsToTeam;
+    }
+
+    @Entity
+    @Table(name = "team")
+    public static class Team extends AbstractEntity {
+
+        private String name;
+
+        @ManyToOne(fetch = FetchType.LAZY)
+        @JoinColumn(name = "unit_id", nullable = false)
+        private OrgUnit organizationalUnit;
+
+        public String getName() {
+            return name;
+        }
+
+        public OrgUnit getOrganizationalUnit() {
+            return organizationalUnit;
+        }
+    }
+
+    @Entity
+    @Table(name = "unit")
+    public static class OrgUnit extends AbstractEntity {
+
+        private String name;
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeRepository.java
new file mode 100644
index 0000000000000..48db9eac590d5
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeRepository.java
@@ -0,0 +1,10 @@
+package io.quarkus.it.spring.data.jpa;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface EmployeeRepository extends JpaRepository<Employee, Long> {
+
+    List<Employee> findByBelongsToTeamOrganizationalUnitName(String orgUnitName);
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java
new file mode 100644
index 0000000000000..0fc23145dd80f
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/EmployeeResource.java
@@ -0,0 +1,36 @@
+package io.quarkus.it.spring.data.jpa;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+@Path("/employee")
+@Produces("application/json")
+public class EmployeeResource {
+
+    private final EmployeeRepository employeeRepository;
+
+    public EmployeeResource(EmployeeRepository employeeRepository) {
+        this.employeeRepository = employeeRepository;
+    }
+
+    @GET
+    public List<Employee> findAll() {
+        return this.employeeRepository.findAll();
+    }
+
+    @GET
+    @Path("/{id}")
+    public Employee findById(@PathParam("id") Long id) {
+        return this.employeeRepository.findById(id).orElse(null);
+    }
+
+    @GET
+    @Path("/unit/{orgUnitName}")
+    public List<Employee> findByManagerOfManager(@PathParam("orgUnitName") String orgUnitName) {
+        return this.employeeRepository.findByBelongsToTeamOrganizationalUnitName(orgUnitName);
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/IntermediateRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/IntermediateRepository.java
new file mode 100644
index 0000000000000..66bfb2b63ab43
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/IntermediateRepository.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.spring.data.jpa;
+
+import java.io.Serializable;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.NoRepositoryBean;
+
+@NoRepositoryBean
+public interface IntermediateRepository<T, ID extends Serializable> extends JpaRepository<T, ID> {
+
+    default public void doNothing() {
+    }
+
+    default public T findMandatoryById(ID id) {
+        return findById(id).orElseThrow(() -> new IllegalStateException("not found: " + id));
+    }
+
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java
new file mode 100644
index 0000000000000..ccf6942096acb
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Mammal.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.spring.data.jpa;
+
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class Mammal extends Animal {
+
+}
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieRepository.java
index 00f2d6ccc9965..ddb69ac15e821 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieRepository.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieRepository.java
@@ -2,6 +2,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -57,9 +58,35 @@ public interface MovieRepository extends CrudRepository<Movie, Long> {
     @Query(value = "SELECT rating, COUNT(*) FROM Movie GROUP BY rating")
     List<MovieCountByRating> countByRating();
 
+    // issue 13044
+    @Query("SELECT DISTINCT m.rating FROM Movie m where m.rating != null")
+    List<String> findAllRatings();
+
+    @Query("SELECT title, rating from Movie where title = ?1")
+    Optional<MovieRating> findOptionalRatingByTitle(String title);
+
+    @Query("SELECT title, rating FROM Movie WHERE title = ?1")
+    MovieRating findRatingByTitle(String title);
+
+    // issue 13050
+    List<MovieProjection> findTitleAndRatingByRating(String rating);
+
     interface MovieCountByRating {
         String getRating();
 
         Long getCount();
     }
+
+    interface MovieRating {
+        String getTitle();
+
+        String getRating();
+    }
+
+    interface MovieProjection {
+        String getTitle();
+
+        String getRating();
+    }
+
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java
index 64bb7cb44a8cc..d40c8ea46499c 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/MovieResource.java
@@ -4,6 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -114,7 +115,6 @@ public void setRatingToNullForTitle(@PathParam("title") String title) {
     @Produces("application/json")
     public List<MovieRepository.MovieCountByRating> countByRating() {
         List<MovieRepository.MovieCountByRating> list = movieRepository.countByRating();
-
         // #6205 - Make sure elements in list have been properly cast to the target object type.
         // If the type is wrong (Object array), this will throw a ClassNotFoundException
         MovieRepository.MovieCountByRating first = list.get(0);
@@ -123,6 +123,30 @@ public List<MovieRepository.MovieCountByRating> countByRating() {
         return list;
     }
 
+    @GET
+    @Path("/rating/forTitle/{title}")
+    @Produces("application/json")
+    public MovieRepository.MovieRating titleRating(@PathParam("title") String title) {
+        MovieRepository.MovieRating result = movieRepository.findRatingByTitle(title);
+        Objects.requireNonNull(result);
+        return result;
+    }
+
+    @GET
+    @Path("/rating/opt/forTitle/{title}")
+    @Produces("application/json")
+    public Optional<MovieRepository.MovieRating> optionalTitleRating(@PathParam("title") String title) {
+        Optional result = movieRepository.findOptionalRatingByTitle(title);
+        return result;
+    }
+
+    @GET
+    @Path("/ratings")
+    @Produces("application/json")
+    public List<String> findAllRatings() {
+        return movieRepository.findAllRatings();
+    }
+
     @Path("/new/{id}/{title}")
     @GET
     @Produces("application/json")
@@ -133,4 +157,12 @@ public Movie newPerson(@PathParam("id") Long id, @PathParam("title") String titl
         movie.setDuration(1000);
         return movieRepository.save(movie);
     }
+
+    @GET
+    @Path("/titles/rating/{rating}")
+    @Produces("application/json")
+    public List<MovieRepository.MovieProjection> getTitlesByRating(@PathParam("rating") String rating) {
+        return movieRepository.findTitleAndRatingByRating(rating);
+    }
+
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java
index c0346cbd6c897..5e23e9b3525d2 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Person.java
@@ -3,8 +3,10 @@
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 
 import javax.json.bind.annotation.JsonbDateFormat;
 import javax.json.bind.annotation.JsonbProperty;
@@ -14,6 +16,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.OneToMany;
@@ -42,7 +46,11 @@ public class Person {
 
     @ManyToOne
     @JoinColumn(name = "address_id")
-    private Address address;
+    private Address someAddress;
+
+    @ManyToMany
+    @JoinTable(name = "liked_songs", joinColumns = @JoinColumn(name = "person_id"), inverseJoinColumns = @JoinColumn(name = "song_id"))
+    private Set<Song> likedSongs = new HashSet<>();
 
     public Person(String name) {
         this.name = name;
@@ -96,12 +104,20 @@ public void setActive(boolean active) {
         this.active = active;
     }
 
-    public Address getAddress() {
-        return address;
+    public Address getSomeAddress() {
+        return someAddress;
+    }
+
+    public void setSomeAddress(Address address) {
+        this.someAddress = address;
     }
 
-    public void setAddress(Address address) {
-        this.address = address;
+    public Set<Song> getLikedSongs() {
+        return likedSongs;
+    }
+
+    public void setLikedSongs(Set<Song> likedSongs) {
+        this.likedSongs = likedSongs;
     }
 
     @MappedSuperclass
@@ -141,7 +157,7 @@ public static class Address extends StreetEntity {
         private String zipCode;
 
         @JsonbTransient
-        @OneToMany(mappedBy = "address")
+        @OneToMany(mappedBy = "someAddress")
         private List<Person> people;
 
         public Long getId() {
@@ -168,4 +184,5 @@ public void setPeople(List<Person> people) {
             this.people = people;
         }
     }
+
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragment.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragment.java
index 817e1d9d7674a..c3a22e83c7b53 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragment.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonFragment.java
@@ -8,4 +8,8 @@ public interface PersonFragment {
     List<Person> findAll();
 
     void makeNameUpperCase(Person person);
+
+    default void doNothingMore() {
+
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java
index 3c8f576b5a3d0..1bc5036ddee14 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonRepository.java
@@ -8,7 +8,9 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
 /**
  * Demonstrates the ability to add fragments and some of the derived method capabilities
@@ -39,9 +41,15 @@ public interface PersonRepository extends CrudRepository<Person, Long>, PersonFr
 
     List<Person> findTop3ByActive(boolean active, Sort sort);
 
-    List<Person> findPeopleByAddressZipCode(String zipCode);
+    List<Person> findPeopleBySomeAddressZipCode(String zipCode);
 
-    List<Person> findByAddressId(Long addressId);
+    List<Person> findBySomeAddressId(Long addressId);
+
+    List<Person> findBySomeAddressStreetNumber(String streetName);
+
+    long deleteByAge(Integer age);
+
+    @Query(value = "SELECT p FROM Person p JOIN p.likedSongs s WHERE s.id = :songId")
+    List<Person> findPersonByLikedSong(@Param("songId") Long songId);
 
-    List<Person> findByAddressStreetNumber(String streetName);
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java
index 9f57fb1cda9a5..f656543562c06 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PersonResource.java
@@ -29,6 +29,9 @@ public class PersonResource {
     @Inject
     PersonRepository personRepository;
 
+    @Inject
+    SongRepository songRepository;
+
     @Path("/new/{name}")
     @GET
     @Produces("application/json")
@@ -69,6 +72,7 @@ public boolean existsById(@PathParam("id") Long id) {
     @Path("/all")
     @Produces("application/json")
     public Iterable<Person> all() {
+        personRepository.doNothingMore();
         return personRepository.findAll();
     }
 
@@ -109,6 +113,13 @@ public void deleteAllByName(@PathParam("name") String name) {
         personRepository.deleteAll(personRepository.findByName(name));
     }
 
+    @Transactional
+    @Path("/delete/age/{age}")
+    @GET
+    public void deleteByAge(@PathParam("age") Integer age) {
+        personRepository.deleteByAge(age);
+    }
+
     @Path("/delete/all")
     @GET
     public void deleteAll() {
@@ -205,21 +216,41 @@ public List<Person> findTop3ByActive() {
     @Path("/addressZipCode/{zipCode}")
     @Produces("application/json")
     public List<Person> findPeopleByAddressZipCode(@PathParam("zipCode") String zipCode) {
-        return personRepository.findPeopleByAddressZipCode(zipCode);
+        return personRepository.findPeopleBySomeAddressZipCode(zipCode);
     }
 
     @GET
     @Path("/addressId/{id}")
     @Produces("application/json")
     public List<Person> findByAddressId(@PathParam("id") Long id) {
-        return personRepository.findByAddressId(id);
+        return personRepository.findBySomeAddressId(id);
     }
 
     @GET
     @Path("/addressStreetNumber/{streetNumber}")
     @Produces("application/json")
     public List<Person> findByAddressStreetNumber(@PathParam("streetNumber") String streetNumber) {
-        return personRepository.findByAddressStreetNumber(streetNumber);
+        return personRepository.findBySomeAddressStreetNumber(streetNumber);
+    }
+
+    @GET
+    @Path("/{id}/song/{idSong}")
+    @Produces("application/json")
+    public Person addLikedSongToPerson(@PathParam("id") Long id, @PathParam("idSong") Long idSong) {
+        Optional<Person> person = personRepository.findById(id);
+        Optional<Song> song = songRepository.findById(idSong);
+        if (person.isPresent() && song.isPresent()) {
+            person.get().getLikedSongs().add(song.get());
+            return personRepository.save(person.get());
+        }
+        return null;
+    }
+
+    @GET
+    @Path("/{id}/songs")
+    @Produces("application/json")
+    public List<Song> findPersonLikedSongs(@PathParam("id") Long id) {
+        return songRepository.findPersonLikedSongs(id);
     }
 
     private Date changeNow(LocalDate now, BiFunction<LocalDate, Long, LocalDate> function, long diff) {
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java
index 2b46786dacfb5..492fb814d2c4d 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Post.java
@@ -2,14 +2,18 @@
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.CascadeType;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity(name = "Post")
@@ -17,7 +21,8 @@
 public class Post {
 
     @Id
-    @GeneratedValue
+    @SequenceGenerator(name = "postSeqGen", sequenceName = "postSeq", initialValue = 100, allocationSize = 1)
+    @GeneratedValue(generator = "postSeqGen")
     private Long id;
 
     private String title;
@@ -25,6 +30,9 @@ public class Post {
     @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER)
     private List<PostComment> comments = new ArrayList<>();
 
+    @ElementCollection
+    private Map<String, String> metadata = new HashMap<>();
+
     private boolean bypass;
 
     private ZonedDateTime posted;
@@ -79,6 +87,14 @@ public void setOrganization(String organization) {
         this.organization = organization;
     }
 
+    public Map<String, String> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, String> metadata) {
+        this.metadata = metadata;
+    }
+
     public void addComment(PostComment comment) {
         comments.add(comment);
         comment.setPost(this);
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostRepository.java
index b7d8db1229a5e..610ee5d70f48a 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostRepository.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostRepository.java
@@ -3,16 +3,16 @@
 import java.time.ZonedDateTime;
 import java.util.List;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
 /**
  * Used to ensure that entity relationships work correctly
  */
-public interface PostRepository extends JpaRepository<Post, Long> {
+public interface PostRepository extends IntermediateRepository<Post, Long> {
 
     Post findFirstByBypassTrue();
 
     List<Post> findByPostedBefore(ZonedDateTime zdt);
 
     List<Post> findAllByOrganization(String organization);
+
+    long deleteByOrganization(String organization);
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java
index 66e9edb0ee750..006fd83f36e1f 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/PostResource.java
@@ -1,9 +1,13 @@
 package io.quarkus.it.spring.data.jpa;
 
 import java.time.ZonedDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -19,6 +23,52 @@ public PostResource(PostRepository postRepository, PostCommentRepository postCom
         this.postCommentRepository = postCommentRepository;
     }
 
+    @Path("/new/title/{title}/organization/{organization}")
+    @GET
+    @Produces("application/json")
+    public Post newPost(@PathParam("title") String title, @PathParam("organization") String organization) {
+        Post post = new Post();
+        post.setTitle(title);
+        post.setOrganization(organization);
+        Map<String, String> metadata = new HashMap<>();
+        metadata.put("someLabel1", "someValue1");
+        metadata.put("someLabel2", "someValue2");
+        post.setMetadata(metadata);
+        PostComment postComment = new PostComment("new comment for post from " + organization);
+        postComment.setPost(post);
+        post.getComments().add(postComment);
+        return postRepository.save(post);
+    }
+
+    @POST
+    @Produces("application/json")
+    @Path("/postId/{id}/key/{key}/value/{value}")
+    public Optional<Post> addMetadata(@PathParam("id") Long id, @PathParam("key") String key, @PathParam("key") String value) {
+        Optional<Post> optionalPost = postRepository.findById(id);
+        Map<String, String> metadata = new HashMap<>();
+        metadata.put(key, value);
+        if (optionalPost.isPresent()) {
+            Post post = optionalPost.get();
+            post.setMetadata(metadata);
+            return Optional.of(postRepository.save(post));
+        }
+        return Optional.empty();
+    }
+
+    @POST
+    @Produces("application/json")
+    @Path("/postComment/postId/{id}/comment/{comment}")
+    public Optional<Post> addComment(@PathParam("id") Long id, @PathParam("comment") String comment) {
+        PostComment postComment = new PostComment(comment);
+        Optional<Post> optionalPost = postRepository.findById(id);
+        if (optionalPost.isPresent()) {
+            Post post = optionalPost.get();
+            post.addComment(postComment);
+            return Optional.of(postRepository.save(post));
+        }
+        return Optional.empty();
+    }
+
     @GET
     @Produces("application/json")
     @Path("/all")
@@ -54,10 +104,37 @@ public List<PostComment> findByPostId(@PathParam("id") Long id) {
         return postCommentRepository.findByPostId(id);
     }
 
+    @GET
+    @Produces("application/json")
+    @Path("/mandatory/{id}")
+    public Post findMandatoryByPostId(@PathParam("id") Long id) {
+        return postRepository.findMandatoryById(id);
+    }
+
+    @GET
+    @Produces("application/json")
+    @Path("/doNothing")
+    public void doNothing() {
+        postRepository.doNothing();
+    }
+
     @GET
     @Produces("application/json")
     @Path("/postComment/all")
     public List<PostComment> findAll() {
         return postCommentRepository.findAll();
     }
+
+    @Path("/delete/all")
+    @GET
+    public void deleteAll() {
+        postRepository.deleteAll();
+    }
+
+    @Path("/delete/byOrg/{org}")
+    @GET
+    public void deleteByOrganization(@PathParam("org") String organization) {
+        postRepository.deleteByOrganization(organization);
+    }
+
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java
index f7a057ea0bc3a..eaf5258eadec3 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/Song.java
@@ -1,20 +1,31 @@
 package io.quarkus.it.spring.data.jpa;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.json.bind.annotation.JsonbTransient;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.SequenceGenerator;
 
 @Entity
 public class Song {
 
     @Id
-    @GeneratedValue
+    @SequenceGenerator(name = "songSeqGen", sequenceName = "songSeq", initialValue = 100, allocationSize = 1)
+    @GeneratedValue(generator = "songSeqGen")
     public Long id;
 
     private String title;
 
     private String author;
 
+    @JsonbTransient
+    @ManyToMany(mappedBy = "likedSongs")
+    private Set<Person> likes = new HashSet<>();
+
     public Long getId() {
         return id;
     }
@@ -38,4 +49,18 @@ public String getAuthor() {
     public void setAuthor(String author) {
         this.author = author;
     }
+
+    public Set<Person> getLikes() {
+        return likes;
+    }
+
+    public void setLikes(Set<Person> likes) {
+        this.likes = likes;
+    }
+
+    public void removePerson(Person person) {
+        this.likes.remove(person);
+        person.getLikedSongs().remove(this);
+
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongRepository.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongRepository.java
index f6f07a1cf2ab9..4193e35e1a579 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongRepository.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongRepository.java
@@ -1,7 +1,21 @@
 package io.quarkus.it.spring.data.jpa;
 
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.repository.query.Param;
 
 public interface SongRepository extends PagingAndSortingRepository<Song, Long> {
 
+    @Query(value = "SELECT s FROM Song s JOIN s.likes l WHERE l.id = :personId")
+    List<Song> findPersonLikedSongs(@Param("personId") Long personId);
+
+    Optional<Song> findSongByTitleAndAuthor(String title, String author);
+
+    default void doNothing() {
+
+    }
+
 }
diff --git a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java
index 2bb69da721d2a..5c420f08ea87d 100644
--- a/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java
+++ b/integration-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/SongResource.java
@@ -1,5 +1,9 @@
 package io.quarkus.it.spring.data.jpa;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.transaction.Transactional;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -14,19 +18,39 @@ public class SongResource {
 
     private final SongRepository songRepository;
 
-    public SongResource(SongRepository songRepository) {
+    private final PersonRepository personRepository;
+
+    public SongResource(SongRepository songRepository, PersonRepository personRepository) {
         this.songRepository = songRepository;
+        this.personRepository = personRepository;
     }
 
+    @Path("/new/{title}/author/{author}")
     @GET
     @Produces("application/json")
-    @Path("/all")
-    public String all() {
+    public Song newSong(@PathParam("title") String title, @PathParam("author") String author) {
+        Song song = new Song();
+        song.setTitle(title);
+        song.setAuthor(author);
+        return songRepository.save(song);
+    }
+
+    @GET
+    @Produces("application/json")
+    @Path("/allPages")
+    public String allPages() {
         Pageable wholePage = Pageable.unpaged();
         Page<Song> page = songRepository.findAll(wholePage);
         return page.hasPrevious() + " - " + page.hasNext() + " / " + page.getNumberOfElements();
     }
 
+    @GET
+    @Produces("application/json")
+    @Path("/all")
+    public Iterable<Song> all() {
+        return songRepository.findAll();
+    }
+
     @GET
     @Produces("application/json")
     @Path("/page/{num}/{size}")
@@ -35,4 +59,58 @@ public String songs(@PathParam("num") int pageNum, @PathParam("size") int pageSi
         Page<Song> page = songRepository.findAll(pageRequest);
         return page.hasPrevious() + " - " + page.hasNext() + " / " + page.getNumberOfElements();
     }
+
+    @Path("/id/{id}")
+    @GET
+    @Produces("application/json")
+    public Optional<Song> findById(@PathParam("id") Long id) {
+        return songRepository.findById(id);
+    }
+
+    @Path("/doNothing")
+    @GET
+    @Produces("application/json")
+    public void doNothing() {
+        songRepository.doNothing();
+    }
+
+    @Transactional
+    @Path("/delete/all")
+    @GET
+    public void deleteAll() {
+        Iterable<Song> all = songRepository.findAll();
+        for (Song song : all) {
+            List<Person> personByLikedSong = personRepository.findPersonByLikedSong(song.getId());
+            personByLikedSong.forEach(person -> song.removePerson(person));
+        }
+        songRepository.deleteAll();
+    }
+
+    @Transactional
+    @Path("/delete/id/{id}")
+    @GET
+    public void deleteById(@PathParam("id") Long id) {
+        Optional<Song> songById = songRepository.findById(id);
+        List<Person> personByLikedSong = personRepository.findPersonByLikedSong(id);
+        if (songById.isPresent()) {
+            Song song = songById.get();
+            personByLikedSong.forEach(person -> song.removePerson(person));
+            songRepository.delete(song);
+        }
+
+    }
+
+    @Transactional
+    @Path("/delete/{title}/author/{author}")
+    @GET
+    public void deleteByNameAndAuthor(@PathParam("title") String title, @PathParam("author") String author) {
+        Optional<Song> songById = songRepository.findSongByTitleAndAuthor(title, author);
+        if (songById.isPresent()) {
+            List<Person> personByLikedSong = personRepository.findPersonByLikedSong(songById.get().getId());
+            Song song = songById.get();
+            personByLikedSong.forEach(person -> song.removePerson(person));
+            songRepository.delete(song);
+        }
+
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/main/resources/application.properties b/integration-tests/spring-data-jpa/src/main/resources/application.properties
index 9719edfdafb73..2ce83eeeead03 100644
--- a/integration-tests/spring-data-jpa/src/main/resources/application.properties
+++ b/integration-tests/spring-data-jpa/src/main/resources/application.properties
@@ -1,10 +1,10 @@
+quarkus.package.type=fast-jar
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
 quarkus.datasource.jdbc.max-size=8
-quarkus.datasource.jdbc.min-size=2
 
 quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
 #quarkus.hibernate-orm.log.sql=true
 
-%prod.quarkus.hibernate-orm.sql-load-script=import.sql
\ No newline at end of file
+%prod.quarkus.hibernate-orm.sql-load-script=import.sql
diff --git a/integration-tests/spring-data-jpa/src/main/resources/import.sql b/integration-tests/spring-data-jpa/src/main/resources/import.sql
index 3c3da14bd305e..7f0a6e667e998 100644
--- a/integration-tests/spring-data-jpa/src/main/resources/import.sql
+++ b/integration-tests/spring-data-jpa/src/main/resources/import.sql
@@ -48,6 +48,17 @@ INSERT INTO song(id, title, author) VALUES (4, 'Whatever it takes' , 'Imagine Dr
 INSERT INTO song(id, title, author) VALUES (5, 'Santos que yo te pinte' , 'Los planetas');
 INSERT INTO song(id, title, author) VALUES (6, 'Drinkee' , 'Sofi Tukker');
 
+INSERT INTO liked_songs(person_id, song_id) VALUES (1,1);
+INSERT INTO liked_songs(person_id, song_id) VALUES (1,3);
+INSERT INTO liked_songs(person_id, song_id) VALUES (1,4);
+INSERT INTO liked_songs(person_id, song_id) VALUES (2,5);
+INSERT INTO liked_songs(person_id, song_id) VALUES (2,6);
+INSERT INTO liked_songs(person_id, song_id) VALUES (3,1);
+INSERT INTO liked_songs(person_id, song_id) VALUES (4,3);
+INSERT INTO liked_songs(person_id, song_id) VALUES (4,4);
+INSERT INTO liked_songs(person_id, song_id) VALUES (5,5);
+INSERT INTO liked_songs(person_id, song_id) VALUES (6,6);
+
 INSERT INTO customer(id, first_name, last_name, email, telephone, enabled) VALUES (1, 'Jason', 'Bourne',  'jason.bourne@mail.com', '0102030405', TRUE);
 INSERT INTO customer(id, first_name, last_name, email, telephone, enabled) VALUES (2, 'Homer', 'Simpson', 'homer.simpson@mail.com',  '0605040302', TRUE);
 INSERT INTO customer(id, first_name, last_name, email, telephone, enabled) VALUES (3, 'Peter', 'Quin', 'pater.quin@mail.com',  '0706050403', FALSE);
@@ -58,3 +69,15 @@ INSERT INTO cart(id, customer_id, status) VALUES (3, 3, 'CANCELED');
 
 INSERT INTO orders(id, cart_id) VALUES (1, 1);
 INSERT INTO orders(id, cart_id) VALUES (2, 2);
+
+INSERT INTO unit(id, name) VALUES (1, 'Delivery Unit');
+INSERT INTO unit(id, name) VALUES (2, 'Sales and Marketing Unit');
+INSERT INTO team(id, name, unit_id) VALUES (10, 'Development Team', 1);
+INSERT INTO team(id, name, unit_id) VALUES (11, 'Sales Team', 2);
+INSERT INTO employee(id, user_id, first_name, last_name, team_id) VALUES (100, 'johdoe', 'John', 'Doe', 10);
+INSERT INTO employee(id, user_id, first_name, last_name, team_id) VALUES (101, 'petdig', 'Peter', 'Digger', 10);
+INSERT INTO employee(id, user_id, first_name, last_name, team_id) VALUES (102, 'stesmi', 'Stella', 'Smith', 11);
+
+INSERT INTO MotorCar(id, brand, model) VALUES (1, 'Monteverdi', 'Hai 450');
+INSERT INTO MotorCar(id, brand, model) VALUES (2, 'Rinspeed', 'iChange');
+INSERT INTO MotorCar(id, brand, model) VALUES (3, 'Rinspeed', 'Oasis');
\ No newline at end of file
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CarResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CarResourceTest.java
new file mode 100644
index 0000000000000..ce9a834c92e04
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CarResourceTest.java
@@ -0,0 +1,48 @@
+package io.quarkus.it.spring.data.jpa;
+
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class CarResourceTest {
+
+    @Test
+    void testFindByBrand() {
+        final List<Car> cars = when().get("/car/brand/Rinspeed").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Car.class);
+        assertThat(cars).hasSize(2);
+    }
+
+    @Test
+    void findByBrandAndModel() {
+        final Car car = when().get("/car/brand/Rinspeed/model/Oasis").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getObject(".", Car.class);
+        assertThat(car).extracting(Car::getBrand).isEqualTo("Rinspeed");
+        assertThat(car).extracting(Car::getModel).isEqualTo("Oasis");
+    }
+
+    @Test
+    void findById() {
+        final Car car = when().get("/car/1").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getObject(".", Car.class);
+        assertThat(car).extracting(Car::getBrand).isEqualTo("Monteverdi");
+        assertThat(car).extracting(Car::getModel).isEqualTo("Hai 450");
+    }
+
+    @Test
+    void findModelsByBrand() {
+        final List<String> models = when().get("/car/brand/Rinspeed/models").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", String.class);
+        assertThat(models).contains("iChange", "Oasis");
+    }
+}
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceTest.java
index 4a24fcb794253..05006a7569b2a 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceTest.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CatResourceTest.java
@@ -234,4 +234,14 @@ void testCustomFindPublicationYearObject() {
                 .statusCode(200)
                 .body(Is.is("true"));
     }
+
+    @Test
+    void testCustomQueryCatColors() {
+        List<String> catColors = when().get("/cat/customQueryCatColors").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", String.class);
+        assertThat(catColors)
+                .containsOnlyOnce("Grey", "White", "Black")
+                .hasSize(3);
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java
index d73258505604a..c3e5c3dafb9bf 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/CountryResourceTest.java
@@ -4,6 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
 
@@ -15,17 +16,22 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CountryResourceTest {
 
     private static final Set<String> NOT_ADDED_OR_REMOVED = new HashSet<>(
             Arrays.asList("Greece", "France", "Czechia"));
 
     @Test
+    @Order(1)
     void testAll() {
         List<Country> countries = when().get("/country/all").then()
                 .statusCode(200)
@@ -37,6 +43,7 @@ void testAll() {
     }
 
     @Test
+    @Order(2)
     void testPage() {
         when().get("/country/page/1/0").then()
                 .statusCode(200)
@@ -56,6 +63,7 @@ void testPage() {
     }
 
     @Test
+    @Order(3)
     void testPageSorted() {
         String response = when().get("/country/page-sorted/2/0").then()
                 .statusCode(200)
@@ -65,6 +73,7 @@ void testPageSorted() {
     }
 
     @Test
+    @Order(4)
     void testGetOne() {
         when().get("/country/getOne/1").then()
                 .statusCode(200)
@@ -75,6 +84,7 @@ void testGetOne() {
     }
 
     @Test
+    @Order(5)
     void testNewAndEditIso() {
         when().get("/country/all").then()
                 .statusCode(200)
@@ -102,4 +112,15 @@ void testNewAndEditIso() {
         when().get("/country/editIso3/100/ZZZ").then()
                 .statusCode(500);
     }
+
+    @Test
+    @Order(6)
+    void testDeleteAllInBatch() {
+        when().delete("/country").then()
+                .statusCode(204);
+
+        when().get("/country/all").then()
+                .statusCode(200)
+                .body("size()", equalTo(0));
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/EmployeeResourceIT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/EmployeeResourceIT.java
new file mode 100644
index 0000000000000..835616c144cc9
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/EmployeeResourceIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.spring.data.jpa;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class EmployeeResourceIT extends EmployeeResourceTest {
+}
\ No newline at end of file
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/EmployeeResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/EmployeeResourceTest.java
new file mode 100644
index 0000000000000..34fb73e079368
--- /dev/null
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/EmployeeResourceTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.it.spring.data.jpa;
+
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class EmployeeResourceTest {
+
+    @Test
+    public void testFindEmployeesByOrganizationalUnit() {
+        List<Employee> employees = when().get("/employee/unit/Delivery Unit").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Employee.class);
+
+        assertThat(employees).extracting("userId").containsExactlyInAnyOrder("johdoe", "petdig");
+    }
+
+}
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceTest.java
index 0fa39b5e12853..5e1fd92fd2fe7 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceTest.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/MovieResourceTest.java
@@ -191,6 +191,31 @@ void testCountByRating() {
                 .body(containsString("rating"));
     }
 
+    @Test
+    void testFindAllRatings() {
+        when().get("/movie/ratings").then()
+                .statusCode(200)
+                .body(containsString("PG"))
+                .body(containsString("PG-13"));
+    }
+
+    @Test
+    void testFindRatingByTitle() {
+        when().get("/movie/rating/forTitle/Interstellar").then()
+                .statusCode(200)
+                .body(containsString("Interstellar"))
+                .body(containsString("PG-13"))
+                .body(not(containsString("duration")));
+    }
+
+    @Test
+    void testFindOptionalRatingByTitle() {
+        when().get("/movie/rating/opt/forTitle/Aladdin").then()
+                .statusCode(200)
+                .body(containsString("Aladdin"))
+                .body(not(containsString("duration")));
+    }
+
     @Test
     void testNewMovie() {
         long id = 999L;
@@ -211,4 +236,11 @@ void testNewMovie() {
                 .statusCode(200)
                 .body(is("1"));
     }
+
+    @Test
+    void getTitle() {
+        when().get("/movie/titles/rating/PG-13").then()
+                .statusCode(200)
+                .body(containsString("Godzilla"));
+    }
 }
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java
index 59fed241f07fc..843e916db5526 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PersonResourceTest.java
@@ -13,17 +13,22 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class PersonResourceTest {
 
     private static final Set<String> NOT_ADDED_OR_REMOVED = new HashSet<>(
             Arrays.asList("Bob", "Florence", "DeMar", null));
 
     @Test
+    @Order(1)
     void testFindAll() {
         when().get("/person/all").then()
                 .statusCode(200)
@@ -33,6 +38,7 @@ void testFindAll() {
     }
 
     @Test
+    @Order(2)
     void testCount() {
         String count = when().get("/person/count").then()
                 .statusCode(200)
@@ -42,6 +48,7 @@ void testCount() {
     }
 
     @Test
+    @Order(3)
     void testFindById() {
         when().get("/person/id/1").then()
                 .statusCode(200)
@@ -53,6 +60,7 @@ void testFindById() {
     }
 
     @Test
+    @Order(4)
     void testExistsById() {
         when().get("/person/exists/id/1").then()
                 .statusCode(200)
@@ -64,6 +72,7 @@ void testExistsById() {
     }
 
     @Test
+    @Order(5)
     void testFindByName() {
         when().get("/person/name/Dummy").then()
                 .statusCode(200)
@@ -75,6 +84,7 @@ void testFindByName() {
     }
 
     @Test
+    @Order(6)
     void testFindByNamePageSorted() {
         String response = when().get("/person/name-pageable/DeMar").then()
                 .statusCode(200)
@@ -84,6 +94,7 @@ void testFindByNamePageSorted() {
     }
 
     @Test
+    @Order(7)
     void testFindBySortedByJoinedDesc() {
         List<Person> people = when().get("/person/name/DeMar/order/joined").then()
                 .statusCode(200)
@@ -94,6 +105,7 @@ void testFindBySortedByJoinedDesc() {
     }
 
     @Test
+    @Order(8)
     void testPageHandlingFindByNameSortedByJoined() {
         when().get("/person/name/joinedOrder/Dummy/page/10/0").then()
                 .statusCode(200)
@@ -109,6 +121,7 @@ void testPageHandlingFindByNameSortedByJoined() {
     }
 
     @Test
+    @Order(9)
     void testFindBySortedByAgeDesc() {
         List<Person> people = when().get("/person/name/ageOrder/DeMar/page/5/0").then()
                 .statusCode(200)
@@ -137,6 +150,7 @@ void testFindBySortedByAgeDesc() {
     }
 
     @Test
+    @Order(10)
     void testFindByNameOrderByAge() {
         when().get("/person/name/ageOrder/Dummy").then()
                 .statusCode(200)
@@ -152,6 +166,7 @@ void testFindByNameOrderByAge() {
     }
 
     @Test
+    @Order(11)
     void testFindByAgeBetweenAndNameIsNotNull() {
         List<Person> people = when().get("/person/age/between/20/41").then()
                 .statusCode(200)
@@ -164,6 +179,7 @@ void testFindByAgeBetweenAndNameIsNotNull() {
     }
 
     @Test
+    @Order(12)
     void testFindByAgeGreaterThanEqualOrderByAgeAsc() {
         when().get("/person/age/greaterEqual/55").then()
                 .statusCode(200)
@@ -172,6 +188,7 @@ void testFindByAgeGreaterThanEqualOrderByAgeAsc() {
     }
 
     @Test
+    @Order(13)
     void testJoinedAfter() {
         when().get("/person/joined/afterDaysAgo/0").then()
                 .statusCode(200)
@@ -186,6 +203,7 @@ void testJoinedAfter() {
     }
 
     @Test
+    @Order(14)
     void testActiveTrueOrderByAgeDesc() {
         List<Person> people = when().get("/person/active").then()
                 .statusCode(200)
@@ -198,6 +216,7 @@ void testActiveTrueOrderByAgeDesc() {
     }
 
     @Test
+    @Order(15)
     void testCountByActiveNot() {
         // find all non active people
         String count = when().get("/person/count/activeNot/true").then()
@@ -208,6 +227,7 @@ void testCountByActiveNot() {
     }
 
     @Test
+    @Order(16)
     void testFindTop3ByActive() {
         List<Person> people = when().get("/person/active/top3").then()
                 .statusCode(200)
@@ -220,7 +240,8 @@ void testFindTop3ByActive() {
     }
 
     @Test
-    void testFindPeopleByAddressZipCode() {
+    @Order(17)
+    void testFindPeopleBySomeAddressZipCode() {
         when().get("/person/addressZipCode/00000").then()
                 .statusCode(200)
                 .body("size()", is(0));
@@ -233,7 +254,8 @@ void testFindPeopleByAddressZipCode() {
     }
 
     @Test
-    void testFindByAddressId() {
+    @Order(18)
+    void testFindBySomeAddressId() {
         when().get("/person/addressId/00000").then()
                 .statusCode(200)
                 .body("size()", is(0));
@@ -245,7 +267,8 @@ void testFindByAddressId() {
     }
 
     @Test
-    void testFindByAddressStreetNumber() {
+    @Order(19)
+    void testFindBySomeAddressStreetNumber() {
         when().get("/person/addressStreetNumber/whatever").then()
                 .statusCode(200)
                 .body("size()", is(0));
@@ -257,6 +280,7 @@ void testFindByAddressStreetNumber() {
     }
 
     @Test
+    @Order(20)
     void testNewPerson() {
         Person person = when().get("/person/new/user").then()
                 .statusCode(200)
@@ -278,6 +302,7 @@ void testNewPerson() {
     }
 
     @Test
+    @Order(21)
     void testNewPeople() {
         List<Person> people = when().get("/person/new/newUser/times/10").then()
                 .statusCode(200)
@@ -315,6 +340,108 @@ void testNewPeople() {
 
     }
 
+    @Test
+    @Order(22)
+    public void testDeletePersonWithChildItems() {
+        // Given a person who likes some songs
+        Person alice = when().get("/person/new/alice").then()
+                .statusCode(200)
+                .extract().body().as(Person.class);
+
+        populateSongsDb();
+
+        makePersonLikeSong(alice.getId());
+
+        Long likedSongId = when().get("/person/" + alice.getId() + "/songs").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class).get(0).getId();
+
+        //when person is removed
+        when().get("/person/delete/age/" + alice.getAge()).then()
+                .statusCode(204);
+
+        List<Song> songsLikedByAlice = when().get("/person/" + alice.getId() + "/songs").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        //Then the liked songs table is also removed for that person
+        assertThat(songsLikedByAlice).hasSize(0);
+
+        Song song = when().get("/song/id/" + likedSongId).then()
+                .statusCode(200)
+                .extract().body().as(Song.class);
+
+        //the song is not removed
+        assertThat(song).isNotNull();
+
+        deleteCreatedSongs();
+
+    }
+
+    @Test
+    @Order(23)
+    public void testDeleteAllWithCascade() {
+        List<Person> all = when().get("/person/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Person.class);
+
+        assertThat(all).isNotEmpty();
+
+        when().get("person/delete/all").then()
+                .statusCode(204);
+
+        List<Person> nobody = when().get("/person/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Person.class);
+        assertThat(nobody).isEmpty();
+    }
+
+    private void makePersonLikeSong(Long personId) {
+        List<Song> allSongs = when().get("/song/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        assertThat(allSongs).isNotEmpty();
+
+        //get a random song id to add to Alice
+        Long anySong = allSongs.stream().findFirst().map(Song::getId).get();
+
+        // Alice likes anySong
+        when().get("/person/" + personId + "/song/" + anySong).then()
+                .statusCode(200)
+                .extract().body().as(Person.class);
+
+        List<Song> songsLikedByAlice = when().get("/person/" + personId + "/songs").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        assertThat(songsLikedByAlice).hasSize(1);
+
+    }
+
+    private void populateSongsDb() {
+
+        when().get("/song/new/one/author/metallica").then()
+                .statusCode(200);
+
+        when().get("/song/new/Love/author/Colour%20Haze").then()
+                .statusCode(200);
+
+        when().get("/song/new/fortress/author/qotsa").then()
+                .statusCode(200);
+    }
+
+    private void deleteCreatedSongs() {
+        when().get("/song/delete/one/author/metallica").then()
+                .statusCode(204);
+
+        when().get("/song/delete/Love/author/Colour%20Haze").then()
+                .statusCode(204);
+
+        when().get("/song/delete/fortress/author/qotsa").then()
+                .statusCode(204);
+    }
+
     private Set<String> getIds(List<Person> people) {
         return people.stream().map(Person::getId).map(Object::toString).collect(Collectors.toSet());
     }
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceTest.java
index 007a000d22f26..5a7d06c50685d 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceTest.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PostResourceTest.java
@@ -6,14 +6,19 @@
 
 import java.util.List;
 
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class PostResourceTest {
 
     @Test
+    @Order(1)
     void testAll() {
         List<Post> posts = when().get("/post/all").then()
                 .statusCode(200)
@@ -22,18 +27,20 @@ void testAll() {
         assertThat(posts)
                 .hasSize(3)
                 .filteredOn(p -> p.getTitle().contains("first"))
-                .hasOnlyOneElementSatisfying(p -> {
+                .singleElement().satisfies(p -> {
                     assertThat(p.getComments()).hasSize(2);
                 });
     }
 
     @Test
+    @Order(2)
     void testByBypassTrue() {
         when().get("/post/bypass/true").then()
                 .statusCode(204);
     }
 
     @Test
+    @Order(3)
     void testByPostedAtBefore() {
         when().get("/post/postedBeforeNow").then()
                 .statusCode(200)
@@ -41,6 +48,7 @@ void testByPostedAtBefore() {
     }
 
     @Test
+    @Order(4)
     void testByByOrganization() {
         when().get("/post/organization/RH").then()
                 .statusCode(200)
@@ -52,6 +60,7 @@ void testByByOrganization() {
     }
 
     @Test
+    @Order(5)
     void testPostCommentByPostId() {
         when().get("/post/postComment/postId/1").then()
                 .statusCode(200)
@@ -63,9 +72,79 @@ void testPostCommentByPostId() {
     }
 
     @Test
+    @Order(6)
     void testAllPostComment() {
         when().get("/post/postComment/all").then()
                 .statusCode(200)
                 .body("size()", is(2));
     }
+
+    @Test
+    @Order(7)
+    void testFindPostByTitleContainingText() {
+        Post post = when().get("/post/mandatory/1").then()
+                .statusCode(200)
+                .extract().body().as(Post.class);
+
+        assertThat(post).isNotNull();
+        assertThat(post.getId()).isEqualTo(1L);
+    }
+
+    @Test
+    @Order(8)
+    public void testDeleteAllPosts() {
+        //We create a post with metadata
+        when().post("/post/postId/1/key/key1/value/value1").then()
+                .statusCode(200);
+
+        when().post("/post/postId/2/key/key2/value/value2").then()
+                .statusCode(200);
+
+        when().get("/post/delete/all").then()
+                .statusCode(204);
+        List<Post> posts = when().get("/post/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Post.class);
+        assertThat(posts).isEmpty();
+
+        List<PostComment> comments = when().get("/post/postComment/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", PostComment.class);
+        assertThat(comments).isEmpty();
+    }
+
+    @Test
+    @Order(9)
+    public void testDeletePostByOrganization() {
+        Post postHow = when().get("/post/new/title/howTo/organization/stackOverflow").then()
+                .statusCode(200)
+                .extract().body().as(Post.class);
+
+        List<Post> posts = when().get("/post/organization/stackOverflow").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Post.class);
+
+        assertThat(posts).isNotEmpty();
+        assertThat(posts.size()).isEqualTo(1);
+        assertThat(posts.get(0).getComments()).isNotEmpty();
+
+        when().get("/post/delete/byOrg/stackOverflow").then()
+                .statusCode(204);
+
+        posts = when().get("/post/organization/stackOverflow").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Post.class);
+
+        assertThat(posts).isEmpty();
+
+    }
+
+    @Test
+    @Order(10)
+    void testDoNothing() {
+        when().get("/post/doNothing").then()
+                .statusCode(204);
+
+    }
+
 }
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java
index a18ef1caaaaef..d3d6e10e806e9 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/PropertyWarningsPMT.java
@@ -31,7 +31,7 @@ public class PropertyWarningsPMT {
     public void ensureProperQuarkusPropertiesLogged() {
         List<LogRecord> buildLogRecords = prodModeTestResults.getRetainedBuildLogRecords();
         assertThat(buildLogRecords).isNotEmpty();
-        assertThat(buildLogRecords).hasOnlyOneElementSatisfying(r -> {
+        assertThat(buildLogRecords).singleElement().satisfies(r -> {
             assertThat(r.getMessage()).contains("Quarkus does not support the following Spring Boot configuration properties");
             assertThat(r.getParameters()).hasOnlyOneElementSatisfying(o -> {
                 assertThat(o).isInstanceOfSatisfying(String.class, s -> {
diff --git a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/SongResourceTest.java b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/SongResourceTest.java
index 194a4bead97b9..07530da1d0548 100644
--- a/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/SongResourceTest.java
+++ b/integration-tests/spring-data-jpa/src/test/java/io/quarkus/it/spring/data/jpa/SongResourceTest.java
@@ -1,27 +1,104 @@
 package io.quarkus.it.spring.data.jpa;
 
 import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 
+import java.util.List;
+
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SongResourceTest {
 
     @Test
+    @Order(1)
     void testAll() {
-        when().get("/song/all").then()
+        when().get("/song/allPages").then()
                 .statusCode(200)
                 .body(is("false - false / 6"));
     }
 
     @Test
+    @Order(2)
     void testFindFirstPageWithTwoElements() {
         when().get("/song/page/0/2").then()
                 .statusCode(200)
                 .body(is("false - true / 2"));
     }
 
+    @Test
+    @Order(3)
+    public void testDeleteByIdWithCascade() {
+        Person fiona = when().get("/person/new/fiona").then()
+                .statusCode(200)
+                .extract().body().as(Person.class);
+
+        Song song = when().get("/song/new/one/author/metallica").then()
+                .statusCode(200)
+                .extract().body().as(Song.class);
+
+        // Fiona likes anySong
+        when().get("/person/" + fiona.getId() + "/song/" + song.getId()).then()
+                .statusCode(200)
+                .extract().body().as(Person.class);
+
+        List<Song> songsLikedByFiona = when().get("/person/" + fiona.getId() + "/songs").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        assertThat(songsLikedByFiona).isNotEmpty();
+
+        when().get("/song/delete/id/" + song.getId()).then()
+                .statusCode(204);
+
+        songsLikedByFiona = when().get("/person/" + fiona.getId() + "/songs").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        assertThat(songsLikedByFiona).isEmpty();
+
+        song = when().get("/song/id/" + song.getId()).then()
+                .statusCode(200)
+                .extract().body().as(Song.class);
+
+        assertThat(song).isNull();
+
+        when().get("/person/delete/" + fiona.getId()).then()
+                .statusCode(204);
+
+    }
+
+    @Test
+    @Order(4)
+    public void testDeleteAllWithCascade() {
+        List<Song> all = when().get("/song/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        assertThat(all).isNotEmpty();
+
+        when().get("/song/delete/all/").then()
+                .statusCode(204);
+
+        all = when().get("/song/all").then()
+                .statusCode(200)
+                .extract().body().jsonPath().getList(".", Song.class);
+
+        assertThat(all).isEmpty();
+    }
+
+    @Test
+    @Order(5)
+    public void testDefaultMethod() {
+        when().get("/song/doNothing").then()
+                .statusCode(204);
+    }
+
 }
diff --git a/integration-tests/spring-data-rest/pom.xml b/integration-tests/spring-data-rest/pom.xml
new file mode 100644
index 0000000000000..918a7937951ba
--- /dev/null
+++ b/integration-tests/spring-data-rest/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-integration-test-spring-data-rest</artifactId>
+    <name>Quarkus - Integration Tests - Spring Data REST</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-rest</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-data-rest-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-h2-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java
new file mode 100644
index 0000000000000..502258388bce8
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Author.java
@@ -0,0 +1,42 @@
+package io.quarkus.it.spring.data.rest;
+
+import java.time.LocalDate;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@Entity
+public class Author {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private LocalDate dob;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public LocalDate getDob() {
+        return dob;
+    }
+
+    public void setDob(LocalDate dob) {
+        this.dob = dob;
+    }
+}
diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java
new file mode 100644
index 0000000000000..89f4376ffee36
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/AuthorsRepository.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.spring.data.rest;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.rest.core.annotation.RestResource;
+
+public interface AuthorsRepository extends CrudRepository<Author, Long> {
+
+    @RestResource(exported = false)
+    <S extends Author> S save(S author);
+
+    @RestResource(exported = false)
+    void deleteById(Long id);
+}
diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java
new file mode 100644
index 0000000000000..eb2e6d1b572ed
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/Book.java
@@ -0,0 +1,41 @@
+package io.quarkus.it.spring.data.rest;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotBlank;
+
+@Entity
+public class Book {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotBlank
+    private String title;
+
+    @ManyToOne
+    private Author author;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Author getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(Author author) {
+        this.author = author;
+    }
+}
diff --git a/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/BooksRepository.java b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/BooksRepository.java
new file mode 100644
index 0000000000000..b6a6f2df5d290
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/main/java/io/quarkus/it/spring/data/rest/BooksRepository.java
@@ -0,0 +1,6 @@
+package io.quarkus.it.spring.data.rest;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface BooksRepository extends PagingAndSortingRepository<Book, Long> {
+}
diff --git a/integration-tests/spring-data-rest/src/main/resources/application.properties b/integration-tests/spring-data-rest/src/main/resources/application.properties
new file mode 100644
index 0000000000000..324fe9cf65b78
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
+quarkus.hibernate-orm.database.generation=drop-and-create
+quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.sql-load-script=import.sql
diff --git a/integration-tests/spring-data-rest/src/main/resources/import.sql b/integration-tests/spring-data-rest/src/main/resources/import.sql
new file mode 100644
index 0000000000000..af8c71c169c95
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/main/resources/import.sql
@@ -0,0 +1,4 @@
+insert into author(id, name, dob) values (nextval('hibernate_sequence'), 'Fyodor Dostoevsky', '1821-11-11');
+
+insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Crime and Punishment', 1);
+insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Idiot', 1);
diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestIT.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestIT.java
new file mode 100644
index 0000000000000..d5c228cc1ff76
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.spring.data.rest;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class SpringDataRestIT extends SpringDataRestTest {
+}
diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
new file mode 100644
index 0000000000000..0a5325c28e8a7
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
@@ -0,0 +1,248 @@
+package io.quarkus.it.spring.data.rest;
+
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.response.Response;
+
+@QuarkusTest
+class SpringDataRestTest {
+
+    private static final int DOSTOEVSKY_ID = 1;
+
+    private static final String DOSTOEVSKY_NAME = "Fyodor Dostoevsky";
+
+    private static final String DOSTOEVSKY_DOB = "1821-11-11";
+
+    private static final int CRIME_AND_PUNISHMENT_ID = 2;
+
+    private static final String CRIME_AND_PUNISHMENT_TITLE = "Crime and Punishment";
+
+    private static final int IDIOT_ID = 3;
+
+    private static final String IDIOT_TITLE = "Idiot";
+
+    @Test
+    void shouldGetAuthor() {
+        given().accept("application/json")
+                .when().get("/authors/" + DOSTOEVSKY_ID)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(DOSTOEVSKY_ID)))
+                .and().body("name", is(equalTo(DOSTOEVSKY_NAME)))
+                .and().body("dob", is(equalTo(DOSTOEVSKY_DOB)));
+    }
+
+    @Test
+    void shouldGetBook() {
+        given().accept("application/json")
+                .when().get("/books/" + CRIME_AND_PUNISHMENT_ID)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(CRIME_AND_PUNISHMENT_ID)))
+                .and().body("title", is(equalTo(CRIME_AND_PUNISHMENT_TITLE)))
+                .and().body("author.id", is(equalTo(DOSTOEVSKY_ID)))
+                .and().body("author.name", is(equalTo(DOSTOEVSKY_NAME)))
+                .and().body("author.dob", is(equalTo(DOSTOEVSKY_DOB)));
+    }
+
+    @Test
+    void shouldGetBookHal() {
+        given().accept("application/hal+json")
+                .when().get("/books/" + CRIME_AND_PUNISHMENT_ID)
+                .then().statusCode(200)
+                .and().body("id", is(equalTo(CRIME_AND_PUNISHMENT_ID)))
+                .and().body("title", is(equalTo(CRIME_AND_PUNISHMENT_TITLE)))
+                .and().body("author.id", is(equalTo(DOSTOEVSKY_ID)))
+                .and().body("author.name", is(equalTo(DOSTOEVSKY_NAME)))
+                .and().body("author.dob", is(equalTo(DOSTOEVSKY_DOB)))
+                .and().body("_links.add.href", endsWith("/books"))
+                .and().body("_links.list.href", endsWith("/books"))
+                .and().body("_links.self.href", endsWith("/books/" + CRIME_AND_PUNISHMENT_ID))
+                .and().body("_links.update.href", endsWith("/books/" + CRIME_AND_PUNISHMENT_ID))
+                .and().body("_links.remove.href", endsWith("/books/" + CRIME_AND_PUNISHMENT_ID));
+    }
+
+    @Test
+    void shouldListAuthors() {
+        given().accept("application/json")
+                .when().get("/authors")
+                .then().statusCode(200)
+                .and().body("id", contains(DOSTOEVSKY_ID))
+                .and().body("name", contains(DOSTOEVSKY_NAME))
+                .and().body("dob", contains(DOSTOEVSKY_DOB));
+    }
+
+    @Test
+    void shouldListBooks() {
+        given().accept("application/json")
+                .when().get("/books")
+                .then().statusCode(200)
+                .and().body("id", contains(CRIME_AND_PUNISHMENT_ID, IDIOT_ID))
+                .and().body("title", contains(CRIME_AND_PUNISHMENT_TITLE, IDIOT_TITLE))
+                .and().body("author.id", contains(DOSTOEVSKY_ID, DOSTOEVSKY_ID))
+                .and().body("author.name", contains(DOSTOEVSKY_NAME, DOSTOEVSKY_NAME))
+                .and().body("author.dob", contains(DOSTOEVSKY_DOB, DOSTOEVSKY_DOB));
+    }
+
+    @Test
+    void shouldListBooksHal() {
+        given().accept("application/hal+json")
+                .when().get("/books")
+                .then().statusCode(200)
+                .and().body("_embedded.books.id", contains(CRIME_AND_PUNISHMENT_ID, IDIOT_ID))
+                .and().body("_embedded.books.title", contains(CRIME_AND_PUNISHMENT_TITLE, IDIOT_TITLE))
+                .and().body("_embedded.books.author.id", contains(DOSTOEVSKY_ID, DOSTOEVSKY_ID))
+                .and().body("_embedded.books.author.name", contains(DOSTOEVSKY_NAME, DOSTOEVSKY_NAME))
+                .and().body("_embedded.books.author.dob", contains(DOSTOEVSKY_DOB, DOSTOEVSKY_DOB))
+                .and().body("_embedded.books._links.add.href", contains(endsWith("/books"), endsWith("/books")))
+                .and().body("_embedded.books._links.list.href", contains(endsWith("/books"), endsWith("/books")))
+                .and().body("_embedded.books._links.self.href",
+                        contains(endsWith("/books/" + CRIME_AND_PUNISHMENT_ID), endsWith("/books/" + IDIOT_ID)))
+                .and().body("_embedded.books._links.update.href",
+                        contains(endsWith("/books/" + CRIME_AND_PUNISHMENT_ID), endsWith("/books/" + IDIOT_ID)))
+                .and().body("_embedded.books._links.remove.href",
+                        contains(endsWith("/books/" + CRIME_AND_PUNISHMENT_ID), endsWith("/books/" + IDIOT_ID)))
+                .and().body("_links.add.href", endsWith("/books"))
+                .and().body("_links.list.href", endsWith("/books"));
+    }
+
+    @Test
+    void shouldNotCreateOrDeleteAuthor() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("name", "test")
+                .add("dob", "1900-01-01")
+                .build();
+        given().contentType("application/json")
+                .and().body(author.toString())
+                .when().post("/authors")
+                .then().statusCode(405);
+        when().delete("/authors/" + DOSTOEVSKY_ID)
+                .then().statusCode(405);
+    }
+
+    @Test
+    void shouldCreateAndDeleteBook() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", DOSTOEVSKY_NAME)
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        JsonObject book = Json.createObjectBuilder()
+                .add("title", "The Brothers Karamazov")
+                .add("author", author)
+                .build();
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().post("/books")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+        assertThat(response.header("Location")).isNotEmpty();
+
+        when().delete(response.getHeader("Location"))
+                .then().statusCode(204);
+        given().accept("application/json")
+                .when().get(response.getHeader("Location"))
+                .then().statusCode(404);
+    }
+
+    @Test
+    void shouldNotCreateBookWithBlankTitle() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", DOSTOEVSKY_NAME)
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        JsonObject book = Json.createObjectBuilder()
+                .add("title", "")
+                .add("author", author)
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().post("/books")
+                .then().statusCode(400)
+                .and().body("parameterViolations[0].path", equalTo("add.arg0.title"))
+                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+    }
+
+    @Test
+    void shouldNotUpdateAuthor() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", "test")
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        given().contentType("application/json")
+                .and().body(author)
+                .when().put("/authors/" + DOSTOEVSKY_ID)
+                .then().statusCode(405);
+    }
+
+    @Test
+    void shouldCreateUpdateAndDeleteBook() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", DOSTOEVSKY_NAME)
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        JsonObject book = Json.createObjectBuilder()
+                .add("title", "The Brothers Karamazov")
+                .add("author", author)
+                .build();
+        Response response = given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().put("/books/100")
+                .thenReturn();
+        assertThat(response.statusCode()).isEqualTo(201);
+        assertThat(response.header("Location")).isNotEmpty();
+        assertThat(response.body().jsonPath().getString("title")).isEqualTo("The Brothers Karamazov");
+
+        String location = response.header("Location");
+        JsonObject updateBook = Json.createObjectBuilder()
+                .add("title", "Notes from Underground")
+                .add("author", author)
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(updateBook.toString())
+                .when().put(location)
+                .then().statusCode(204);
+        given().accept("application/json")
+                .when().get(location)
+                .then().body("title", is(equalTo("Notes from Underground")));
+        when().delete(location)
+                .then().statusCode(204);
+    }
+
+    @Test
+    void shouldNotUpdateBookWithBlankTitle() {
+        JsonObject author = Json.createObjectBuilder()
+                .add("id", DOSTOEVSKY_ID)
+                .add("name", DOSTOEVSKY_NAME)
+                .add("dob", DOSTOEVSKY_DOB)
+                .build();
+        JsonObject book = Json.createObjectBuilder()
+                .add("title", "")
+                .add("author", author)
+                .build();
+        given().accept("application/json")
+                .and().contentType("application/json")
+                .and().body(book.toString())
+                .when().put("/books/" + CRIME_AND_PUNISHMENT_ID)
+                .then().statusCode(400)
+                .and().body("parameterViolations[0].path", equalTo("update.arg1.title"))
+                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+    }
+}
diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/TestResources.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/TestResources.java
new file mode 100644
index 0000000000000..b847c6bd2d916
--- /dev/null
+++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/TestResources.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.spring.data.rest;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
+
+@QuarkusTestResource(H2DatabaseTestResource.class)
+public class TestResources {
+}
diff --git a/integration-tests/spring-di/pom.xml b/integration-tests/spring-di/pom.xml
index 98eefa3542843..c55d3a180da0e 100644
--- a/integration-tests/spring-di/pom.xml
+++ b/integration-tests/spring-di/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-spring-di</artifactId>
@@ -48,6 +47,60 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-di-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -66,59 +119,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java
index c2c0d08be8ba9..8931467b62f57 100644
--- a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java
+++ b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/AppConfiguration.java
@@ -1,11 +1,14 @@
 package io.quarkus.it.spring;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
 import org.springframework.web.context.annotation.RequestScope;
 
 @Configuration
@@ -40,6 +43,14 @@ public CustomPrototypeBean beanWithCustomPrototype() {
         return new CustomPrototypeBean();
     }
 
+    private AtomicInteger prototypeBeanCounter = new AtomicInteger(0);
+
+    @Bean
+    @Scope(scopeName = "prototype")
+    public PrototypeBean prototypeBean() {
+        return new PrototypeBean(prototypeBeanCounter.getAndIncrement());
+    }
+
     private static class SingletonBean {
 
     }
@@ -48,6 +59,15 @@ private static class AnotherRequestBean {
 
     }
 
+    public static class PrototypeBean {
+
+        public final int index;
+
+        public PrototypeBean(int index) {
+            this.index = index;
+        }
+    }
+
     public static class CustomPrototypeBean {
 
     }
diff --git a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java
index 3dd0a8ffd287b..0ca5c38cfce1c 100644
--- a/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java
+++ b/integration-tests/spring-di/src/main/java/io/quarkus/it/spring/InjectedSpringBeansResource.java
@@ -11,6 +11,7 @@
 
 import io.quarkus.it.spring.AppConfiguration.CustomPrototypeBean;
 import io.quarkus.it.spring.AppConfiguration.NamedBean;
+import io.quarkus.it.spring.AppConfiguration.PrototypeBean;
 
 @Path("/")
 public class InjectedSpringBeansResource {
@@ -22,7 +23,11 @@ public class InjectedSpringBeansResource {
     @Inject
     SessionBean sessionBean;
     @Inject
-    CustomPrototypeBean anotherRequestBean;
+    CustomPrototypeBean customPrototypeBean;
+    @Inject
+    PrototypeBean prototypeBean;
+    @Inject
+    PrototypeBean anotherPrototypeBean;
     @Inject
     NamedBean namedBean;
 
@@ -51,4 +56,10 @@ public int getSessionValue() {
     public void invalidate(final @Context HttpServletRequest req) {
         req.getSession().invalidate();
     }
+
+    @GET
+    @Path("prototype")
+    public String prototype() {
+        return prototypeBean.index + "/" + anotherPrototypeBean.index;
+    }
 }
diff --git a/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceTest.java b/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceTest.java
index 690e58ed961ec..52ec3006f33f3 100644
--- a/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceTest.java
+++ b/integration-tests/spring-di/src/test/java/io/quarkus/it/spring/InjectedSpringBeansResourceTest.java
@@ -58,4 +58,11 @@ public void testSessionScope() {
                 .statusCode(200)
                 .body(Matchers.is("0"));
     }
+
+    @Test
+    public void testPrototypeScope() {
+        RestAssured.when().get("/spring-test/prototype").then()
+                .body(Matchers.containsString("0"))
+                .body(Matchers.containsString("1"));
+    }
 }
diff --git a/integration-tests/spring-web/pom.xml b/integration-tests/spring-web/pom.xml
index d5bac3b3a5f4f..b32cf82d1dd84 100644
--- a/integration-tests/spring-web/pom.xml
+++ b/integration-tests/spring-web/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-spring-web</artifactId>
@@ -64,6 +63,111 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-elytron-security-properties-file-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-validator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jaxb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-cache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-scheduled-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-security-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-spring-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -80,67 +184,24 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <parameters>true</parameters>
-                </configuration>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>tpt</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <quarkus.test.profile.tags>test1,whatever</quarkus.test.profile.tags>
+                                <profiles.check>true</profiles.check>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/spring-web/src/main/resources/application.properties b/integration-tests/spring-web/src/main/resources/application.properties
index a639a8ea0a28d..64c2cb7bc5a82 100644
--- a/integration-tests/spring-web/src/main/resources/application.properties
+++ b/integration-tests/spring-web/src/main/resources/application.properties
@@ -2,7 +2,10 @@ quarkus.security.users.file.enabled=true
 quarkus.security.users.file.users=test-users.properties
 quarkus.security.users.file.roles=test-roles.properties
 quarkus.security.users.file.plain-text=true
-%test.quarkus.http.test-port=0
+# The following random port settings are disabled because they can cause a failure on CI that is entirely unrelated to the PR
+# if the chosen port happens to not be available
+# quarkus.http.test-port=0
+# quarkus.http.port=0
 
 # we add this because we also use @TestSecurity which means that basic auth is disabled by default because @TestSecurity
 # contributes TestHttpAuthenticationMechanism
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestHTTPEndpointTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestHTTPEndpointTest.java
new file mode 100644
index 0000000000000..c12e92779da7c
--- /dev/null
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestHTTPEndpointTest.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.spring.web;
+
+import static org.hamcrest.Matchers.containsString;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.http.TestHTTPEndpoint;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@TestHTTPEndpoint(GreetingController.class)
+public class TestHTTPEndpointTest {
+
+    @Test
+    public void testJsonResult() {
+        RestAssured.when().get("/json/hello").then()
+                .contentType("application/json")
+                .body(containsString("hello"));
+    }
+}
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java
index 75d3cdb4f958c..0ea7e33f3645d 100644
--- a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/TestSecurityTest.java
@@ -2,6 +2,8 @@
 
 import static org.hamcrest.Matchers.is;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
@@ -10,6 +12,7 @@
 
 @QuarkusTest
 @TestSecurity(authorizationEnabled = false)
+@ApplicationScoped //see https://github.com/quarkusio/quarkus/issues/11465
 public class TestSecurityTest {
 
     @Test
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/NoQuarkusProfileTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/NoQuarkusProfileTest.java
new file mode 100644
index 0000000000000..d4d6f31932cf7
--- /dev/null
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/NoQuarkusProfileTest.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.spring.web.testprofile;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+@EnabledIfSystemProperty(named = "profiles.check", matches = "true")
+public class NoQuarkusProfileTest {
+
+    @Test
+    public void test() {
+        assertNull(System.getProperty("quarkus.test.profile.tags"));
+    }
+}
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/Profiles.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/Profiles.java
new file mode 100644
index 0000000000000..216c35314d586
--- /dev/null
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/Profiles.java
@@ -0,0 +1,63 @@
+package io.quarkus.it.spring.web.testprofile;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import io.quarkus.test.junit.QuarkusTestProfile;
+
+public final class Profiles {
+
+    private Profiles() {
+    }
+
+    public static boolean shouldCheckForProfiles() {
+        return "true".equals(System.getProperty("profiles.check"));
+    }
+
+    public static class QuarkusTestProfileNoTags implements QuarkusTestProfile {
+
+    }
+
+    public static class QuarkusTestProfileMatchingTag implements QuarkusTestProfile {
+
+        @Override
+        public Set<String> tags() {
+            return new HashSet<>(Arrays.asList("test2", "test1", "test3"));
+        }
+
+        @Override
+        public List<TestResourceEntry> testResources() {
+            return Collections.singletonList(new TestResourceEntry(DummyTestResource.class));
+        }
+
+        public static class DummyTestResource implements QuarkusTestResourceLifecycleManager {
+
+            public static AtomicInteger COUNT = new AtomicInteger(0);
+
+            @Override
+            public Map<String, String> start() {
+                COUNT.incrementAndGet();
+                return Collections.emptyMap();
+            }
+
+            @Override
+            public void stop() {
+
+            }
+        }
+    }
+
+    public static class QuarkusTestProfileNonMatchingTag implements QuarkusTestProfile {
+
+        @Override
+        public Set<String> tags() {
+            return Collections.singleton("test4");
+        }
+    }
+}
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldAlsoNeverBeExecutedQuarkusTestProfileTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldAlsoNeverBeExecutedQuarkusTestProfileTest.java
new file mode 100644
index 0000000000000..303bf521b3a79
--- /dev/null
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldAlsoNeverBeExecutedQuarkusTestProfileTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.spring.web.testprofile;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(Profiles.QuarkusTestProfileNonMatchingTag.class)
+@EnabledIfSystemProperty(named = "profiles.check", matches = "true")
+public class ShouldAlsoNeverBeExecutedQuarkusTestProfileTest {
+
+    public ShouldAlsoNeverBeExecutedQuarkusTestProfileTest() {
+        throw new IllegalStateException("Should not have executed");
+    }
+
+    @Test
+    public void test() {
+        Assertions.fail("Should not have executed");
+    }
+}
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldBeExecutedTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldBeExecutedTest.java
new file mode 100644
index 0000000000000..6400cf5c787fe
--- /dev/null
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldBeExecutedTest.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.spring.web.testprofile;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(Profiles.QuarkusTestProfileMatchingTag.class)
+@EnabledIfSystemProperty(named = "profiles.check", matches = "true")
+public class ShouldBeExecutedTest {
+
+    @Test
+    public void test() {
+        assertEquals(1, Profiles.QuarkusTestProfileMatchingTag.DummyTestResource.COUNT.intValue());
+        assertTrue(System.getProperty("quarkus.test.profile.tags").contains("test1"));
+    }
+
+}
diff --git a/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldNeverBeExecutedQuarkusTestProfileTest.java b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldNeverBeExecutedQuarkusTestProfileTest.java
new file mode 100644
index 0000000000000..61ce29af7a8a9
--- /dev/null
+++ b/integration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/testprofile/ShouldNeverBeExecutedQuarkusTestProfileTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.it.spring.web.testprofile;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+
+@QuarkusTest
+@TestProfile(Profiles.QuarkusTestProfileNoTags.class)
+@EnabledIfSystemProperty(named = "profiles.check", matches = "true")
+public class ShouldNeverBeExecutedQuarkusTestProfileTest {
+
+    public ShouldNeverBeExecutedQuarkusTestProfileTest() {
+        throw new IllegalStateException("Should not have executed");
+    }
+
+    @Test
+    public void test() {
+        Assertions.fail("Should not have executed");
+    }
+}
diff --git a/integration-tests/test-extension/pom.xml b/integration-tests/test-extension/pom.xml
index 74b4c65685153..5edae2024244d 100644
--- a/integration-tests/test-extension/pom.xml
+++ b/integration-tests/test-extension/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>quarkus-integration-tests-parent</artifactId>
     <groupId>io.quarkus</groupId>
     <version>999-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -35,6 +34,34 @@
       <artifactId>rest-assured</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-test-extension-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-undertow-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>
@@ -53,9 +80,6 @@
             <goals>
               <goal>build</goal>
             </goals>
-            <configuration>
-              <uberJar>true</uberJar>
-            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -64,59 +88,18 @@
 
   <profiles>
     <profile>
-      <id>native-image</id>
+      <id>no-native</id>
       <activation>
         <property>
-          <name>native</name>
+          <name>!native</name>
         </property>
       </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>${native.surefire.skip}</skipTests>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-                <configuration>
-                  <systemPropertyVariables>
-                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>native-image</id>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <cleanupServer>true</cleanupServer>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                  <graalvmHome>${graalvmHome}</graalvmHome>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <!-- these properties must not be defined in the general properties,
+           otherwise the native profile in the parent pom is not able to override them -->
+      <properties>
+        <quarkus.package.type>uber-jar</quarkus.package.type>
+      </properties>
     </profile>
-
   </profiles>
 
 </project>
diff --git a/integration-tests/tika/pom.xml b/integration-tests/tika/pom.xml
index 13ad791017a03..3e5c814054ff8 100644
--- a/integration-tests/tika/pom.xml
+++ b/integration-tests/tika/pom.xml
@@ -5,7 +5,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,10 +12,6 @@
     <name>Quarkus - Integration Tests - Apache Tika</name>
     <description>Apache Tika integration tests module</description>
 
-    <properties>
-        <maven.compiler.parameters>true</maven.compiler.parameters>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -51,6 +46,33 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-tika-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -63,11 +85,6 @@
                         <goals>
                             <goal>build</goal>
                         </goals>
-                        <configuration>
-                            <!--
-                            <uberJar>true</uberJar>
-                            -->
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -82,54 +99,11 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <addAllCharsets>true</addAllCharsets>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.add-all-charsets>true</quarkus.native.add-all-charsets>
+            </properties>
         </profile>
-
     </profiles>
 
 </project>
diff --git a/integration-tests/tika/src/main/resources/americanexpress.pdf b/integration-tests/tika/src/main/resources/americanexpress.pdf
new file mode 100644
index 0000000000000..410bb8ee21e13
Binary files /dev/null and b/integration-tests/tika/src/main/resources/americanexpress.pdf differ
diff --git a/integration-tests/tika/src/test/java/io/quarkus/it/tika/TikaParserTest.java b/integration-tests/tika/src/test/java/io/quarkus/it/tika/TikaParserTest.java
index 81db88f34df8e..cd1ffee3d8c9b 100644
--- a/integration-tests/tika/src/test/java/io/quarkus/it/tika/TikaParserTest.java
+++ b/integration-tests/tika/src/test/java/io/quarkus/it/tika/TikaParserTest.java
@@ -3,6 +3,7 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -29,6 +30,17 @@ public void testGetTextFromPdfFormat() throws Exception {
         checkText("application/pdf", "pdf");
     }
 
+    @Test
+    public void testGetTextFromPdfFormatWithFonts() throws Exception {
+        given()
+                .when().header("Content-Type", "application/pdf")
+                .body(readQuarkusFile("americanexpress.pdf"))
+                .post("/parse/text")
+                .then()
+                .statusCode(200)
+                .body(startsWith("American express card"));
+    }
+
     @Test
     public void testGetMetadataFromTextFormat() throws Exception {
         checkMetadata("text/plain", "txt");
diff --git a/integration-tests/vault-agroal/disable-native-profile b/integration-tests/vault-agroal/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/vault-agroal/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/vault-agroal/pom.xml b/integration-tests/vault-agroal/pom.xml
index 5a61353744cc0..c5a96adf705c0 100644
--- a/integration-tests/vault-agroal/pom.xml
+++ b/integration-tests/vault-agroal/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-vault-agroal</artifactId>
@@ -40,6 +39,21 @@
             <artifactId>quarkus-jdbc-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -58,7 +72,7 @@
             <id>test-vault</id>
             <activation>
                 <property>
-                    <name>test-vault</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -73,7 +87,6 @@
                                 </goals>
                                 <configuration>
                                     <skip>false</skip>
-                                    <trimStackTrace>false</trimStackTrace>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/vault-agroal/src/test/resources/application-vault-datasource.properties b/integration-tests/vault-agroal/src/test/resources/application-vault-datasource.properties
index 4e4a1f9adf0a3..ce74f9f925674 100644
--- a/integration-tests/vault-agroal/src/test/resources/application-vault-datasource.properties
+++ b/integration-tests/vault-agroal/src/test/resources/application-vault-datasource.properties
@@ -25,6 +25,5 @@ quarkus.datasource.dynamicDS.jdbc.url=jdbc:postgresql://localhost:6543/mydb
 quarkus.log.category."io.quarkus.vault".level=DEBUG
 quarkus.log.category."io.quarkus.vault.runtime.vault".level=DEBUG
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vault-app/pom.xml b/integration-tests/vault-app/pom.xml
index 4d97bc7692f3e..067a345d90753 100644
--- a/integration-tests/vault-app/pom.xml
+++ b/integration-tests/vault-app/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,6 +51,72 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-orm-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vault-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,7 +159,7 @@
             <id>test-vault</id>
             <activation>
                 <property>
-                    <name>test-vault</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -103,7 +168,6 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <skip>false</skip>
-                            <trimStackTrace>false</trimStackTrace>
                             <systemPropertyVariables>
                                 <!-- see TLS availability in native mode https://github.com/quarkusio/quarkus/issues/3797 -->
                                 <!-- to activate tls, set vault-test-extension.use-tls=true and install /opt/graalvm -->
@@ -130,64 +194,25 @@
                 </property>
             </activation>
             <build>
+                <!-- add some custom config, the rest comes from parent -->
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
+                            <systemPropertyVariables>
+                                <!-- see TLS availability in native mode https://github.com/quarkusio/quarkus/issues/3797 -->
+                                <!-- to activate tls, set vault-test-extension.use-tls=true and install /opt/graalvm -->
+                                <javax.net.ssl.trustStore>
+                                    ${project.basedir}/src/test/resources/vaultTrustStore
+                                </javax.net.ssl.trustStore>
+                                <vault-test-extension.use-tls>false</vault-test-extension.use-tls>
+                            </systemPropertyVariables>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <trimStackTrace>false</trimStackTrace>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/${project.build.finalName}-runner
-                                        </native.image.path>
-                                        <!-- see TLS availability in native mode https://github.com/quarkusio/quarkus/issues/3797 -->
-                                        <!-- to activate tls, set vault-test-extension.use-tls=true and install /opt/graalvm -->
-                                        <javax.net.ssl.trustStore>
-                                            ${project.basedir}/src/test/resources/vaultTrustStore
-                                        </javax.net.ssl.trustStore>
-                                        <vault-test-extension.use-tls>false</vault-test-extension.use-tls>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
 
-
 </project>
diff --git a/integration-tests/vault-app/src/main/java/io/quarkus/it/vault/VaultTestService.java b/integration-tests/vault-app/src/main/java/io/quarkus/it/vault/VaultTestService.java
index 9cf4710696f4e..430aa29cf9582 100644
--- a/integration-tests/vault-app/src/main/java/io/quarkus/it/vault/VaultTestService.java
+++ b/integration-tests/vault-app/src/main/java/io/quarkus/it/vault/VaultTestService.java
@@ -15,9 +15,12 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.vault.VaultKVSecretEngine;
+import io.quarkus.vault.VaultTransitExportKeyType;
 import io.quarkus.vault.VaultTransitSecretEngine;
 import io.quarkus.vault.runtime.client.VaultClientException;
 import io.quarkus.vault.transit.ClearData;
+import io.quarkus.vault.transit.KeyConfigRequestDetail;
+import io.quarkus.vault.transit.KeyCreationRequestDetail;
 import io.quarkus.vault.transit.SigningInput;
 
 @ApplicationScoped
@@ -25,6 +28,8 @@ public class VaultTestService {
 
     private static final Logger log = Logger.getLogger(VaultTestService.class);
 
+    private static final String KEY_NAME = "mykey";
+
     @Inject
     EntityManager entityManager;
 
@@ -105,7 +110,19 @@ public String test() {
 
         transit.verifySignature("my-sign-key", signature, input, null);
 
+        keyAdminTest();
+
         return "OK";
     }
 
+    protected void keyAdminTest() {
+
+        transit.createKey(KEY_NAME, new KeyCreationRequestDetail().setExportable(true));
+        transit.readKey(KEY_NAME);
+        transit.listKeys();
+        transit.exportKey(KEY_NAME, VaultTransitExportKeyType.encryption, null);
+        transit.updateKeyConfiguration(KEY_NAME, new KeyConfigRequestDetail().setDeletionAllowed(true));
+        transit.deleteKey(KEY_NAME);
+    }
+
 }
diff --git a/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultTest.java b/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultTest.java
index a29ce9ab76801..22c2229c47165 100644
--- a/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultTest.java
+++ b/integration-tests/vault-app/src/test/java/io/quarkus/it/vault/VaultTest.java
@@ -24,7 +24,7 @@ public void test() throws Exception {
 
     @Test
     public void testHealthCheck() {
-        RestAssured.when().get("/health/ready").then()
+        RestAssured.when().get("/q/health/ready").then()
                 .assertThat()
                 .body("status", equalTo("UP"))
                 .body("checks.size()", is(2));
diff --git a/integration-tests/vault/disable-native-profile b/integration-tests/vault/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/vault/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/vault/pom.xml b/integration-tests/vault/pom.xml
index e17415982f8ea..de3f996b7265f 100644
--- a/integration-tests/vault/pom.xml
+++ b/integration-tests/vault/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-vault</artifactId>
@@ -24,6 +23,16 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-test-vault</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -35,6 +44,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -53,7 +67,7 @@
             <id>test-vault</id>
             <activation>
                 <property>
-                    <name>test-vault</name>
+                    <name>test-containers</name>
                 </property>
             </activation>
             <build>
@@ -68,7 +82,6 @@
                                 </goals>
                                 <configuration>
                                     <skip>false</skip>
-                                    <trimStackTrace>false</trimStackTrace>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java
new file mode 100644
index 0000000000000..a1d65d4e626f0
--- /dev/null
+++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultEnterpriseITCase.java
@@ -0,0 +1,33 @@
+package io.quarkus.vault;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.QuarkusTestResource;
+
+@DisabledOnOs(OS.WINDOWS) // https://github.com/quarkusio/quarkus/issues/3796
+@QuarkusTestResource(WiremockVault.class)
+public class VaultEnterpriseITCase {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addAsResource("application-vault-enterprise.properties", "application.properties"));
+
+    @Inject
+    VaultKVSecretEngine kvSecretEngine;
+
+    @Test
+    public void header() {
+        assertEquals("{hello=world}", kvSecretEngine.readSecret("foo").toString());
+    }
+}
diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java
index a1273f4d9c25c..64c21e5facb55 100644
--- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java
+++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultITCase.java
@@ -8,6 +8,8 @@
 import static io.quarkus.vault.test.VaultTestExtension.APP_SECRET_PATH;
 import static io.quarkus.vault.test.VaultTestExtension.DB_PASSWORD;
 import static io.quarkus.vault.test.VaultTestExtension.ENCRYPTION_KEY_NAME;
+import static io.quarkus.vault.test.VaultTestExtension.EXPECTED_SUB_PATHS;
+import static io.quarkus.vault.test.VaultTestExtension.LIST_PATH;
 import static io.quarkus.vault.test.VaultTestExtension.SECRET_KEY;
 import static io.quarkus.vault.test.VaultTestExtension.SECRET_PATH_V1;
 import static io.quarkus.vault.test.VaultTestExtension.SECRET_PATH_V2;
@@ -24,6 +26,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Map;
+import java.util.stream.StreamSupport;
 
 import javax.inject.Inject;
 
@@ -33,6 +36,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
@@ -42,15 +46,18 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.vault.runtime.Base64String;
-import io.quarkus.vault.runtime.VaultManager;
-import io.quarkus.vault.runtime.client.VaultClient;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalAppRoleAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalTokenAuthMethod;
+import io.quarkus.vault.runtime.client.authmethod.VaultInternalUserpassAuthMethod;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.VaultModel;
 import io.quarkus.vault.runtime.client.dto.auth.VaultAppRoleAuth;
 import io.quarkus.vault.runtime.client.dto.auth.VaultLookupSelf;
 import io.quarkus.vault.runtime.client.dto.auth.VaultRenewSelf;
 import io.quarkus.vault.runtime.client.dto.auth.VaultUserPassAuth;
 import io.quarkus.vault.runtime.client.dto.database.VaultDatabaseCredentials;
+import io.quarkus.vault.runtime.client.dto.kv.VaultKvListSecrets;
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV1;
 import io.quarkus.vault.runtime.client.dto.kv.VaultKvSecretV2;
 import io.quarkus.vault.runtime.client.dto.sys.VaultLeasesLookup;
@@ -70,7 +77,12 @@
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerify;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBatchInput;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitVerifyBody;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalDatabaseSecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalKvV1SecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalKvV2SecretEngine;
+import io.quarkus.vault.runtime.client.secretengine.VaultInternalTransitSecretEngine;
 import io.quarkus.vault.runtime.config.VaultAuthenticationType;
+import io.quarkus.vault.runtime.config.VaultConfigSource;
 import io.quarkus.vault.test.VaultTestExtension;
 import io.quarkus.vault.test.VaultTestLifecycleManager;
 import io.quarkus.vault.test.client.TestVaultClient;
@@ -85,8 +97,6 @@ public class VaultITCase {
 
     public static final String MY_PASSWORD = "my-password";
 
-    public static final String CRUD_PATH = "crud";
-
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
@@ -104,6 +114,23 @@ public class VaultITCase {
     @ConfigProperty(name = MY_PASSWORD)
     String someSecretThroughIndirection;
 
+    @Inject
+    VaultInternalKvV1SecretEngine vaultInternalKvV1SecretEngine;
+    @Inject
+    VaultInternalKvV2SecretEngine vaultInternalKvV2SecretEngine;
+    @Inject
+    VaultInternalTransitSecretEngine vaultInternalTransitSecretEngine;
+    @Inject
+    VaultInternalSystemBackend vaultInternalSystemBackend;
+    @Inject
+    VaultInternalAppRoleAuthMethod vaultInternalAppRoleAuthMethod;
+    @Inject
+    VaultInternalUserpassAuthMethod vaultInternalUserpassAuthMethod;
+    @Inject
+    VaultInternalTokenAuthMethod vaultInternalTokenAuthMethod;
+    @Inject
+    VaultInternalDatabaseSecretEngine vaultInternalDatabaseSecretEngine;
+
     @Test
     public void credentialsProvider() {
         Map<String, String> staticCredentials = credentialsProvider.getCredentials("static");
@@ -121,6 +148,14 @@ public void config() {
         Config config = ConfigProviderResolver.instance().getConfig();
         String value = config.getValue(PASSWORD_PROPERTY_NAME, String.class);
         assertEquals(DB_PASSWORD, value);
+
+        int ordinal = StreamSupport.stream(config.getConfigSources().spliterator(), false)
+                .filter(cs -> cs instanceof VaultConfigSource)
+                .findAny()
+                .orElseThrow(() -> new RuntimeException("vault config source not found"))
+                .getOrdinal();
+
+        Assertions.assertEquals(300, ordinal);
     }
 
     @Test
@@ -133,13 +168,13 @@ public void configPropertyIndirection() {
     }
 
     @Test
-    public void secretV1() {
+    public void secret() {
         Map<String, String> secrets = kvSecretEngine.readSecret(APP_SECRET_PATH);
         assertEquals("{" + SECRET_KEY + "=" + SECRET_VALUE + "}", secrets.toString());
     }
 
     @Test
-    public void crudSecretV1() {
+    public void crudSecret() {
         VaultTestExtension.assertCrudSecret(kvSecretEngine);
     }
 
@@ -151,13 +186,11 @@ static class WrapExample implements VaultModel {
     @Test
     public void httpclient() {
 
-        VaultClient vaultClient = VaultManager.getInstance().getVaultClient();
-
         String anotherWrappingToken = System.getProperty("vault-test.another-password-kv-v2-wrapping-token");
-        VaultKvSecretV2 unwrap = vaultClient.unwrap(anotherWrappingToken, VaultKvSecretV2.class);
+        VaultKvSecretV2 unwrap = vaultInternalSystemBackend.unwrap(anotherWrappingToken, VaultKvSecretV2.class);
         assertEquals(VAULT_AUTH_USERPASS_PASSWORD, unwrap.data.data.get(USERPASS_WRAPPING_TOKEN_PASSWORD_KEY));
         try {
-            vaultClient.unwrap(anotherWrappingToken, VaultKvSecretV2.class);
+            vaultInternalSystemBackend.unwrap(anotherWrappingToken, VaultKvSecretV2.class);
             fail("expected error 400: wrapping token is not valid or does not exist");
         } catch (VaultClientException e) {
             // fails on second unwrap attempt
@@ -166,52 +199,53 @@ public void httpclient() {
 
         String appRoleRoleId = System.getProperty("vault-test.role-id");
         String appRoleSecretId = System.getProperty("vault-test.secret-id");
-        VaultAppRoleAuth vaultAppRoleAuth = vaultClient.loginAppRole(appRoleRoleId, appRoleSecretId);
+        VaultAppRoleAuth vaultAppRoleAuth = vaultInternalAppRoleAuthMethod.login(appRoleRoleId, appRoleSecretId);
         String appRoleClientToken = vaultAppRoleAuth.auth.clientToken;
         assertNotNull(appRoleClientToken);
         log.info("appRoleClientToken = " + appRoleClientToken);
 
-        assertTokenAppRole(vaultClient, appRoleClientToken);
-        assertKvSecrets(vaultClient, appRoleClientToken);
-        assertDynamicCredentials(vaultClient, appRoleClientToken, APPROLE);
-        assertWrap(vaultClient, appRoleClientToken);
+        assertTokenAppRole(appRoleClientToken);
+        assertKvSecrets(appRoleClientToken);
+        assertDynamicCredentials(appRoleClientToken, APPROLE);
+        assertWrap(appRoleClientToken);
 
-        VaultUserPassAuth vaultUserPassAuth = vaultClient.loginUserPass(VAULT_AUTH_USERPASS_USER, VAULT_AUTH_USERPASS_PASSWORD);
+        VaultUserPassAuth vaultUserPassAuth = vaultInternalUserpassAuthMethod.login(VAULT_AUTH_USERPASS_USER,
+                VAULT_AUTH_USERPASS_PASSWORD);
         String userPassClientToken = vaultUserPassAuth.auth.clientToken;
         log.info("userPassClientToken = " + userPassClientToken);
         assertNotNull(userPassClientToken);
 
-        assertTransit(vaultClient, appRoleClientToken);
+        assertTransit(appRoleClientToken);
 
-        assertTokenUserPass(vaultClient, userPassClientToken);
-        assertKvSecrets(vaultClient, userPassClientToken);
-        assertDynamicCredentials(vaultClient, userPassClientToken, USERPASS);
-        assertWrap(vaultClient, userPassClientToken);
+        assertTokenUserPass(userPassClientToken);
+        assertKvSecrets(userPassClientToken);
+        assertDynamicCredentials(userPassClientToken, USERPASS);
+        assertWrap(userPassClientToken);
     }
 
-    private void assertWrap(VaultClient vaultClient, String token) {
-        VaultWrapResult wrapResult = vaultClient.wrap(token, 60, new WrapExample());
-        WrapExample unwrapExample = vaultClient.unwrap(wrapResult.wrapInfo.token, WrapExample.class);
+    private void assertWrap(String token) {
+        VaultWrapResult wrapResult = vaultInternalSystemBackend.wrap(token, 60, new WrapExample());
+        WrapExample unwrapExample = vaultInternalSystemBackend.unwrap(wrapResult.wrapInfo.token, WrapExample.class);
         assertEquals("bar", unwrapExample.foo);
         assertEquals("zap", unwrapExample.zip);
     }
 
-    private void assertTransit(VaultClient vaultClient, String token) {
+    private void assertTransit(String token) {
 
         Base64String context = Base64String.from("mycontext");
 
-        assertTransitEncryption(vaultClient, token, ENCRYPTION_KEY_NAME, null);
-        assertTransitEncryption(vaultClient, token, ENCRYPTION_KEY_NAME, context);
+        assertTransitEncryption(token, ENCRYPTION_KEY_NAME, null);
+        assertTransitEncryption(token, ENCRYPTION_KEY_NAME, context);
 
-        assertTransitSign(vaultClient, token, SIGN_KEY_NAME, null);
-        assertTransitSign(vaultClient, token, SIGN_KEY_NAME, context);
+        assertTransitSign(token, SIGN_KEY_NAME, null);
+        assertTransitSign(token, SIGN_KEY_NAME, context);
 
         new TestVaultClient().rotate(token, ENCRYPTION_KEY_NAME);
 
-        assertHash(vaultClient, token);
+        assertHash(token);
     }
 
-    private void assertHash(VaultClient vaultClient, String token) {
+    private void assertHash(String token) {
         VaultTransitHashBody body = new VaultTransitHashBody();
         body.input = Base64String.from("coucou");
         body.format = "base64";
@@ -221,92 +255,98 @@ private void assertHash(VaultClient vaultClient, String token) {
         assertEquals(expected, sum.getValue());
     }
 
-    private void assertTransitSign(VaultClient vaultClient, String token, String keyName, Base64String context) {
+    private void assertTransitSign(String token, String keyName, Base64String context) {
 
         String data = "coucou";
 
         VaultTransitSignBody batchBody = new VaultTransitSignBody();
         batchBody.batchInput = singletonList(new VaultTransitSignBatchInput(Base64String.from(data), context));
 
-        VaultTransitSign batchSign = vaultClient.sign(token, keyName, null, batchBody);
+        VaultTransitSign batchSign = vaultInternalTransitSecretEngine.sign(token, keyName, null, batchBody);
 
         VaultTransitVerifyBody verifyBody = new VaultTransitVerifyBody();
         VaultTransitVerifyBatchInput batchInput = new VaultTransitVerifyBatchInput(Base64String.from(data), context);
         batchInput.signature = batchSign.data.batchResults.get(0).signature;
         verifyBody.batchInput = singletonList(batchInput);
 
-        VaultTransitVerify verify = vaultClient.verify(token, keyName, null, verifyBody);
+        VaultTransitVerify verify = vaultInternalTransitSecretEngine.verify(token, keyName, null, verifyBody);
         assertEquals(1, verify.data.batchResults.size());
         assertTrue(verify.data.batchResults.get(0).valid);
-
     }
 
-    private void assertTransitEncryption(VaultClient vaultClient, String token, String keyName, Base64String context) {
+    private void assertTransitEncryption(String token, String keyName, Base64String context) {
 
         String data = "coucou";
 
         VaultTransitEncryptBatchInput encryptBatchInput = new VaultTransitEncryptBatchInput(Base64String.from(data), context);
         VaultTransitEncryptBody encryptBody = new VaultTransitEncryptBody();
         encryptBody.batchInput = singletonList(encryptBatchInput);
-        VaultTransitEncrypt encryptBatchResult = vaultClient.encrypt(token, keyName, encryptBody);
+        VaultTransitEncrypt encryptBatchResult = vaultInternalTransitSecretEngine.encrypt(token, keyName, encryptBody);
         String ciphertext = encryptBatchResult.data.batchResults.get(0).ciphertext;
 
-        String batchDecryptedString = decrypt(vaultClient, token, keyName, ciphertext, context);
+        String batchDecryptedString = decrypt(token, keyName, ciphertext, context);
         assertEquals(data, batchDecryptedString);
 
         VaultTransitRewrapBatchInput rewrapBatchInput = new VaultTransitRewrapBatchInput(ciphertext, context);
         VaultTransitRewrapBody rewrapBody = new VaultTransitRewrapBody();
         rewrapBody.batchInput = singletonList(rewrapBatchInput);
-        VaultTransitEncrypt rewrap = vaultClient.rewrap(token, keyName, rewrapBody);
+        VaultTransitEncrypt rewrap = vaultInternalTransitSecretEngine.rewrap(token, keyName, rewrapBody);
         assertEquals(1, rewrap.data.batchResults.size());
         String rewrappedCiphertext = rewrap.data.batchResults.get(0).ciphertext;
 
-        batchDecryptedString = decrypt(vaultClient, token, keyName, rewrappedCiphertext, context);
+        batchDecryptedString = decrypt(token, keyName, rewrappedCiphertext, context);
         assertEquals(data, batchDecryptedString);
-
     }
 
-    private String decrypt(VaultClient vaultClient, String token, String keyName, String ciphertext, Base64String context) {
+    private String decrypt(String token, String keyName, String ciphertext, Base64String context) {
         VaultTransitDecryptBatchInput decryptBatchInput = new VaultTransitDecryptBatchInput(ciphertext, context);
         VaultTransitDecryptBody decryptBody = new VaultTransitDecryptBody();
         decryptBody.batchInput = singletonList(decryptBatchInput);
-        VaultTransitDecrypt decryptBatchResult = vaultClient.decrypt(token, keyName, decryptBody);
+        VaultTransitDecrypt decryptBatchResult = vaultInternalTransitSecretEngine.decrypt(token, keyName, decryptBody);
         return decryptBatchResult.data.batchResults.get(0).plaintext.decodeAsString();
     }
 
-    private void assertDynamicCredentials(VaultClient vaultClient, String clientToken, VaultAuthenticationType authType) {
-        VaultDatabaseCredentials vaultDatabaseCredentials = vaultClient.generateDatabaseCredentials(clientToken, VAULT_DBROLE);
+    private void assertDynamicCredentials(String clientToken, VaultAuthenticationType authType) {
+        VaultDatabaseCredentials vaultDatabaseCredentials = vaultInternalDatabaseSecretEngine.generateCredentials(clientToken,
+                VAULT_DBROLE);
         String username = vaultDatabaseCredentials.data.username;
         assertTrue(username.startsWith("v-" + authType.name().toLowerCase() + "-" + VAULT_DBROLE + "-"));
 
-        VaultLeasesLookup vaultLeasesLookup = vaultClient.lookupLease(clientToken, vaultDatabaseCredentials.leaseId);
+        VaultLeasesLookup vaultLeasesLookup = vaultInternalSystemBackend.lookupLease(clientToken,
+                vaultDatabaseCredentials.leaseId);
         assertEquals(vaultDatabaseCredentials.leaseId, vaultLeasesLookup.data.id);
 
-        VaultRenewLease vaultRenewLease = vaultClient.renewLease(clientToken, vaultDatabaseCredentials.leaseId);
+        VaultRenewLease vaultRenewLease = vaultInternalSystemBackend.renewLease(clientToken, vaultDatabaseCredentials.leaseId);
         assertEquals(vaultDatabaseCredentials.leaseId, vaultRenewLease.leaseId);
     }
 
-    private void assertKvSecrets(VaultClient vaultClient, String clientToken) {
-        VaultKvSecretV1 secretV1 = vaultClient.getSecretV1(clientToken, SECRET_PATH_V1, APP_SECRET_PATH);
+    private void assertKvSecrets(String clientToken) {
+        VaultKvSecretV1 secretV1 = vaultInternalKvV1SecretEngine.getSecret(clientToken, SECRET_PATH_V1, APP_SECRET_PATH);
         assertEquals(SECRET_VALUE, secretV1.data.get(SECRET_KEY));
+        VaultKvListSecrets vaultKvListSecretsV1 = vaultInternalKvV1SecretEngine.listSecrets(clientToken, SECRET_PATH_V1,
+                LIST_PATH);
+        assertEquals(EXPECTED_SUB_PATHS, vaultKvListSecretsV1.data.keys.toString());
 
-        VaultKvSecretV2 secretV2 = vaultClient.getSecretV2(clientToken, SECRET_PATH_V2, APP_SECRET_PATH);
+        VaultKvSecretV2 secretV2 = vaultInternalKvV2SecretEngine.getSecret(clientToken, SECRET_PATH_V2, APP_SECRET_PATH);
         assertEquals(SECRET_VALUE, secretV2.data.data.get(SECRET_KEY));
+        VaultKvListSecrets vaultKvListSecretsV2 = vaultInternalKvV2SecretEngine.listSecrets(clientToken, SECRET_PATH_V2,
+                LIST_PATH);
+        assertEquals(EXPECTED_SUB_PATHS, vaultKvListSecretsV2.data.keys.toString());
     }
 
-    private void assertTokenUserPass(VaultClient vaultClient, String clientToken) {
-        VaultLookupSelf vaultLookupSelf = vaultClient.lookupSelf(clientToken);
+    private void assertTokenUserPass(String clientToken) {
+        VaultLookupSelf vaultLookupSelf = vaultInternalTokenAuthMethod.lookupSelf(clientToken);
         assertEquals("auth/" + USERPASS.name().toLowerCase() + "/login/" + VAULT_AUTH_USERPASS_USER, vaultLookupSelf.data.path);
 
-        VaultRenewSelf vaultRenewSelf = vaultClient.renewSelf(clientToken, "1h");
+        VaultRenewSelf vaultRenewSelf = vaultInternalTokenAuthMethod.renewSelf(clientToken, "1h");
         assertEquals(VAULT_AUTH_USERPASS_USER, vaultRenewSelf.auth.metadata.get("username"));
     }
 
-    private void assertTokenAppRole(VaultClient vaultClient, String clientToken) {
-        VaultLookupSelf vaultLookupSelf = vaultClient.lookupSelf(clientToken);
+    private void assertTokenAppRole(String clientToken) {
+        VaultLookupSelf vaultLookupSelf = vaultInternalTokenAuthMethod.lookupSelf(clientToken);
         assertEquals("auth/approle/login", vaultLookupSelf.data.path);
 
-        VaultRenewSelf vaultRenewSelf = vaultClient.renewSelf(clientToken, "1h");
+        VaultRenewSelf vaultRenewSelf = vaultInternalTokenAuthMethod.renewSelf(clientToken, "1h");
         assertEquals(VAULT_AUTH_APPROLE, vaultRenewSelf.auth.metadata.get("role_name"));
     }
 
diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java
index bcefeaacfc23d..1579bef6e7032 100644
--- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java
+++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultKubernetesITCase.java
@@ -2,10 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.Optional;
-
-import javax.inject.Inject;
-
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -15,8 +12,6 @@
 
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.vault.runtime.config.VaultAuthenticationType;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
 import io.quarkus.vault.test.VaultTestLifecycleManager;
 
 @DisabledOnOs(OS.WINDOWS) // https://github.com/quarkusio/quarkus/issues/3796
@@ -28,22 +23,20 @@ public class VaultKubernetesITCase {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource("application-vault-kubernetes.properties", "application.properties"));
 
-    @Inject
-    VaultRuntimeConfig runtimeConfig;
+    @ConfigProperty(name = "quarkus.vault.authentication.kubernetes.role")
+    String role;
 
-    @Test
-    public void testGetAuthenticationType() {
-        assertEquals(VaultAuthenticationType.KUBERNETES, runtimeConfig.getAuthenticationType());
-    }
+    @ConfigProperty(name = "quarkus.vault.authentication.kubernetes.auth-mount-path")
+    String path;
 
     @Test
     public void testRole() {
-        assertEquals(Optional.of("test"), runtimeConfig.authentication.kubernetes.role);
+        assertEquals("test", role);
     }
 
     @Test
     public void testAuthMountPath() {
-        assertEquals("auth/test", runtimeConfig.authentication.kubernetes.authMountPath);
+        assertEquals("auth/test", path);
     }
 
 }
diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java
index b37c03611f33d..5816a4c7cf076 100644
--- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java
+++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultTransitITCase.java
@@ -1,5 +1,6 @@
 package io.quarkus.vault;
 
+import static io.quarkus.vault.VaultTransitExportKeyType.encryption;
 import static io.quarkus.vault.test.VaultTestExtension.ENCRYPTION_DERIVED_KEY_NAME;
 import static io.quarkus.vault.test.VaultTestExtension.ENCRYPTION_KEY2_NAME;
 import static io.quarkus.vault.test.VaultTestExtension.ENCRYPTION_KEY_NAME;
@@ -10,6 +11,8 @@
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -27,15 +30,18 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusUnitTest;
-import io.quarkus.vault.runtime.VaultManager;
+import io.quarkus.vault.runtime.VaultAuthManager;
 import io.quarkus.vault.test.client.TestVaultClient;
 import io.quarkus.vault.transit.ClearData;
 import io.quarkus.vault.transit.DecryptionRequest;
 import io.quarkus.vault.transit.EncryptionRequest;
+import io.quarkus.vault.transit.KeyConfigRequestDetail;
+import io.quarkus.vault.transit.KeyCreationRequestDetail;
 import io.quarkus.vault.transit.RewrappingRequest;
 import io.quarkus.vault.transit.SigningInput;
 import io.quarkus.vault.transit.SigningRequest;
 import io.quarkus.vault.transit.TransitContext;
+import io.quarkus.vault.transit.VaultTransitKeyExportDetail;
 import io.quarkus.vault.transit.VaultVerificationBatchException;
 import io.quarkus.vault.transit.VerificationRequest;
 
@@ -50,6 +56,7 @@ public class VaultTransitITCase {
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource("application-vault.properties", "application.properties"));
+    public static final String KEY_NAME = "mykey";
 
     private TransitContext context = TransitContext.fromContext("my context");
     private ClearData data = new ClearData(COUCOU);
@@ -58,6 +65,9 @@ public class VaultTransitITCase {
     @Inject
     VaultTransitSecretEngine transitSecretEngine;
 
+    @Inject
+    VaultAuthManager vaultAuthManager;
+
     @Test
     public void encryptionString() {
         String ciphertext = transitSecretEngine.encrypt(ENCRYPTION_KEY_NAME, COUCOU);
@@ -165,8 +175,7 @@ public void keyVersionEncryption() {
     }
 
     private void rotate(String keyName) {
-        VaultManager vaultManager = VaultManager.getInstance();
-        String clientToken = vaultManager.getVaultAuthManager().getClientToken();
+        String clientToken = vaultAuthManager.getClientToken();
         new TestVaultClient().rotate(clientToken, keyName);
     }
 
@@ -273,4 +282,36 @@ private <K, V> V getSingleValue(Map<K, V> map) {
         return map.values().stream().findFirst().get();
     }
 
+    @Test
+    public void adminKey() {
+
+        assertFalse(transitSecretEngine.listKeys().contains(KEY_NAME));
+        transitSecretEngine.createKey(KEY_NAME, new KeyCreationRequestDetail().setExportable(true));
+        assertTrue(transitSecretEngine.listKeys().contains(KEY_NAME));
+
+        VaultTransitKeyDetail mykey = transitSecretEngine.readKey(KEY_NAME);
+        assertEquals(KEY_NAME, mykey.getName());
+        assertTrue(mykey.isExportable());
+        assertFalse(mykey.isDeletionAllowed());
+        assertTrue(mykey.isSupportsDecryption());
+        assertTrue(mykey.isSupportsEncryption());
+        assertTrue(mykey.isSupportsDerivation());
+        assertEquals(1, mykey.getKeys().size());
+        assertTrue(mykey.getKeys().containsKey("1"));
+        assertEquals(1, mykey.getMinDecryptionVersion());
+        assertEquals(0, mykey.getMinEncryptionVersion());
+
+        VaultTransitKeyExportDetail exportDetail = transitSecretEngine.exportKey(KEY_NAME, encryption, "1");
+        assertEquals(KEY_NAME, exportDetail.getName());
+        assertEquals(1, exportDetail.getKeys().size());
+        assertTrue(exportDetail.getKeys().containsKey("1"));
+
+        transitSecretEngine.updateKeyConfiguration(KEY_NAME, new KeyConfigRequestDetail().setDeletionAllowed(true));
+        mykey = transitSecretEngine.readKey(KEY_NAME);
+        assertTrue(mykey.isDeletionAllowed());
+
+        transitSecretEngine.deleteKey(KEY_NAME);
+        assertNull(transitSecretEngine.readKey(KEY_NAME));
+    }
+
 }
diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/WiremockVault.java b/integration-tests/vault/src/test/java/io/quarkus/vault/WiremockVault.java
new file mode 100644
index 0000000000000..9c170d6c5830c
--- /dev/null
+++ b/integration-tests/vault/src/test/java/io/quarkus/vault/WiremockVault.java
@@ -0,0 +1,43 @@
+package io.quarkus.vault;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public class WiremockVault implements QuarkusTestResourceLifecycleManager {
+
+    private WireMockServer server;
+
+    @Override
+    public Map<String, String> start() {
+
+        server = new WireMockServer(wireMockConfig().httpsPort(8201));
+        server.start();
+
+        server.stubFor(get(urlEqualTo("/v1/secret/foo"))
+                .withHeader("X-Vault-Namespace", equalTo("accounting"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(
+                                "{\"request_id\":\"bf5245f4-f194-2b13-80b7-6cad145b8135\",\"lease_id\":\"\",\"renewable\":false,\"lease_duration\":2764800,\"wrap_info\":null,\"warnings\":null,\"auth\":null,"
+                                        + "\"data\":{\"hello\":\"world\"}}")));
+
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public void stop() {
+        if (server != null) {
+            server.stop();
+        }
+    }
+}
diff --git a/integration-tests/vault/src/test/resources/application-vault-approle-wrap.properties b/integration-tests/vault/src/test/resources/application-vault-approle-wrap.properties
index 64c741d6838d3..dbd05146c2832 100644
--- a/integration-tests/vault/src/test/resources/application-vault-approle-wrap.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-approle-wrap.properties
@@ -15,6 +15,5 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vault/src/test/resources/application-vault-approle.properties b/integration-tests/vault/src/test/resources/application-vault-approle.properties
index c9783f48037fa..9563b50fea6ae 100644
--- a/integration-tests/vault/src/test/resources/application-vault-approle.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-approle.properties
@@ -15,6 +15,5 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vault/src/test/resources/application-vault-client-token-wrap.properties b/integration-tests/vault/src/test/resources/application-vault-client-token-wrap.properties
index c56c3cbb4bb71..7eeb017496d2f 100644
--- a/integration-tests/vault/src/test/resources/application-vault-client-token-wrap.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-client-token-wrap.properties
@@ -14,7 +14,6 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
 
diff --git a/integration-tests/vault/src/test/resources/application-vault-enterprise.properties b/integration-tests/vault/src/test/resources/application-vault-enterprise.properties
new file mode 100644
index 0000000000000..92fc085d54aa8
--- /dev/null
+++ b/integration-tests/vault/src/test/resources/application-vault-enterprise.properties
@@ -0,0 +1,7 @@
+quarkus.vault.url=https://localhost:8201
+quarkus.vault.enterprise.namespace=accounting
+quarkus.vault.authentication.client-token=123
+quarkus.vault.kv-secret-engine-version=1
+quarkus.tls.trust-all=true
+# CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
+quarkus.vault.read-timeout=5S
diff --git a/integration-tests/vault/src/test/resources/application-vault-kubernetes.properties b/integration-tests/vault/src/test/resources/application-vault-kubernetes.properties
index 7c9eee8ffd6fb..271bd62d1e4a3 100644
--- a/integration-tests/vault/src/test/resources/application-vault-kubernetes.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-kubernetes.properties
@@ -15,6 +15,5 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vault/src/test/resources/application-vault-multi-path.properties b/integration-tests/vault/src/test/resources/application-vault-multi-path.properties
index 8a2452d1fc34f..54fc75776fd26 100644
--- a/integration-tests/vault/src/test/resources/application-vault-multi-path.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-multi-path.properties
@@ -4,7 +4,7 @@ quarkus.vault.authentication.userpass.password=sinclair
 quarkus.vault.secret-config-kv-path=multi/default1,multi/default2
 quarkus.vault.secret-config-kv-path.singer=multi/singer1,multi/singer2
 
-quarkus.vault.tls.skip-verify=true
+quarkus.tls.trust-all=true
 
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
diff --git a/integration-tests/vault/src/test/resources/application-vault-userpass-kvv1-wrap.properties b/integration-tests/vault/src/test/resources/application-vault-userpass-kvv1-wrap.properties
index 5cc1ee0b32241..b22fc51e82ce7 100644
--- a/integration-tests/vault/src/test/resources/application-vault-userpass-kvv1-wrap.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-userpass-kvv1-wrap.properties
@@ -18,6 +18,5 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vault/src/test/resources/application-vault-userpass-kvv2-wrap.properties b/integration-tests/vault/src/test/resources/application-vault-userpass-kvv2-wrap.properties
index 99d5b2d0881c4..8994c8fb544d2 100644
--- a/integration-tests/vault/src/test/resources/application-vault-userpass-kvv2-wrap.properties
+++ b/integration-tests/vault/src/test/resources/application-vault-userpass-kvv2-wrap.properties
@@ -15,6 +15,5 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vault/src/test/resources/application-vault.properties b/integration-tests/vault/src/test/resources/application-vault.properties
index 9f8e053cb0be7..d8a64caddb801 100644
--- a/integration-tests/vault/src/test/resources/application-vault.properties
+++ b/integration-tests/vault/src/test/resources/application-vault.properties
@@ -2,6 +2,7 @@ quarkus.vault.url=https://localhost:8200
 quarkus.vault.authentication.userpass.username=bob
 quarkus.vault.authentication.userpass.password=sinclair
 quarkus.vault.secret-config-kv-path=config
+quarkus.vault.config-ordinal=300
 
 my-password=${password}
 
@@ -22,6 +23,5 @@ quarkus.log.category."io.quarkus.vault".level=DEBUG
 # CI can sometimes be slow, there is no need to fail a test if Vault doesn't respond in 1 second which is the default
 quarkus.vault.read-timeout=5S
 
-#quarkus.log.min-level=DEBUG
 #quarkus.log.level=DEBUG
 #quarkus.log.console.level=DEBUG
diff --git a/integration-tests/vertx-graphql/pom.xml b/integration-tests/vertx-graphql/pom.xml
index bb2ee925ce32c..da64eb5b70478 100644
--- a/integration-tests/vertx-graphql/pom.xml
+++ b/integration-tests/vertx-graphql/pom.xml
@@ -30,6 +30,21 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-graphql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -56,56 +71,11 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                                    <enableServer>false</enableServer>
-                                    <dumpProxies>false</dumpProxies>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                    <enableReports>false</enableReports>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+                <quarkus.native.enable-https-url-handler>true</quarkus.native.enable-https-url-handler>
+            </properties>
         </profile>
     </profiles>
 
diff --git a/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java b/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java
index ade1e78702728..1f6eaf9c82b68 100644
--- a/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java
+++ b/integration-tests/vertx-graphql/src/main/java/io/quarkus/vertx/graphql/it/VertxGraphqlResource.java
@@ -6,7 +6,7 @@
  * (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
+ *      https://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,
diff --git a/integration-tests/vertx-http/pom.xml b/integration-tests/vertx-http/pom.xml
index 73c76937a6ce3..f95efa34de85f 100644
--- a/integration-tests/vertx-http/pom.xml
+++ b/integration-tests/vertx-http/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-vertx-http</artifactId>
@@ -48,6 +47,47 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -74,57 +114,10 @@
                     <name>native</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <!-- Include the server certificate -->
-                                    <additionalBuildArgs>
-                                        <additionalBuildArg>-H:IncludeResources=.*\.jks</additionalBuildArg>
-                                        <additionalBuildArg>-H:EnableURLProtocols=http,https</additionalBuildArg>
-                                    </additionalBuildArgs>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                    <enableAllSecurityServices>true</enableAllSecurityServices>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <!-- add some custom config, the rest comes from parent -->
+            <properties>
+                <quarkus.native.enable-all-security-services>true</quarkus.native.enable-all-security-services>
+            </properties>
         </profile>
     </profiles>
 </project>
diff --git a/integration-tests/vertx-http/src/main/resources/application.properties b/integration-tests/vertx-http/src/main/resources/application.properties
index 0bc817ff829e3..0a4e1ee156d78 100644
--- a/integration-tests/vertx-http/src/main/resources/application.properties
+++ b/integration-tests/vertx-http/src/main/resources/application.properties
@@ -7,4 +7,5 @@ quarkus.http.ssl.client-auth=REQUIRED
 quarkus.http.access-log.enabled=true
 quarkus.http.access-log.log-to-file=true
 quarkus.http.access-log.base-file-name=quarkus-access-log
-quarkus.http.access-log.log-directory=target
\ No newline at end of file
+quarkus.http.access-log.log-directory=target
+quarkus.native.additional-build-args=-H:IncludeResources=.*\\.jks,-H:EnableURLProtocols=http\\,https
\ No newline at end of file
diff --git a/integration-tests/vertx-web/pom.xml b/integration-tests/vertx-web/pom.xml
index 17196ffa0c13e..b804c1c29463e 100644
--- a/integration-tests/vertx-web/pom.xml
+++ b/integration-tests/vertx-web/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-vertx-web</artifactId>
@@ -29,6 +28,21 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -47,45 +61,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/vertx-web/src/test/java/io/quarkus/it/vertx/SimpleEndpointTestCase.java b/integration-tests/vertx-web/src/test/java/io/quarkus/it/vertx/SimpleEndpointTestCase.java
index a678aa300cc84..796b255c4eb60 100644
--- a/integration-tests/vertx-web/src/test/java/io/quarkus/it/vertx/SimpleEndpointTestCase.java
+++ b/integration-tests/vertx-web/src/test/java/io/quarkus/it/vertx/SimpleEndpointTestCase.java
@@ -6,23 +6,25 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@TestHTTPEndpoint(SimpleEndpoint.class)
 public class SimpleEndpointTestCase {
 
     @Test
     public void testEndpoint() throws Exception {
-        when().get("/simple/person").then().statusCode(200)
+        when().get("/person").then().statusCode(200)
                 .body("name", is("Jan"))
                 .header("content-type", "application/json");
-        when().get("/simple/pet").then().statusCode(200)
+        when().get("/pet").then().statusCode(200)
                 .body("name", is("Jack"))
                 .header("content-type", "application/json");
-        when().get("/simple/pong").then().statusCode(200)
+        when().get("/pong").then().statusCode(200)
                 .body("name", is("ping"))
                 .header("content-type", "application/json");
-        given().body("{\"name\":\"pi\"}").post("/simple/data").then().statusCode(200)
+        given().body("{\"name\":\"pi\"}").post("/data").then().statusCode(200)
                 .body("name", is("pipi"))
                 .header("content-type", "application/json");
     }
diff --git a/integration-tests/vertx/pom.xml b/integration-tests/vertx/pom.xml
index bdd3a08396e85..25d6539a7969c 100644
--- a/integration-tests/vertx/pom.xml
+++ b/integration-tests/vertx/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-vertx</artifactId>
@@ -19,6 +18,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
@@ -43,6 +46,60 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,59 +118,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java
index 9cc4d807087f1..d623a40c3bfb2 100644
--- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java
+++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/EventBusSender.java
@@ -1,14 +1,13 @@
 package io.quarkus.it.vertx;
 
-import java.util.concurrent.CompletionStage;
-
 import javax.inject.Inject;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 
-import io.vertx.axle.core.eventbus.EventBus;
-import io.vertx.axle.core.eventbus.Message;
+import io.smallrye.mutiny.Uni;
 import io.vertx.core.json.JsonObject;
+import io.vertx.mutiny.core.eventbus.EventBus;
+import io.vertx.mutiny.core.eventbus.Message;
 
 @Path("/event-bus")
 public class EventBusSender {
@@ -18,15 +17,16 @@ public class EventBusSender {
 
     @POST
     @Path("/person")
-    public CompletionStage<String> helloToPerson(JsonObject json) {
-        return bus.<String> request("persons", json.getString("name")).thenApply(Message::body);
+    public Uni<String> helloToPerson(JsonObject json) {
+        return bus.<String> request("persons", json.getString("name"))
+                .onItem().transform(Message::body);
     }
 
     @POST
     @Path("/pet")
-    public CompletionStage<String> helloToPet(JsonObject json) {
+    public Uni<String> helloToPet(JsonObject json) {
         return bus.<String> request("pets", new Pet(json.getString("name"), json.getString("kind")))
-                .thenApply(Message::body);
+                .onItem().transform(Message::body);
     }
 
 }
diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java
index bb68b2af79b50..1e832d758932c 100644
--- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java
+++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/VertxProducerResource.java
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.CompletionStage;
 
 import javax.inject.Inject;
 import javax.ws.rs.GET;
@@ -11,10 +10,11 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import io.vertx.axle.core.Vertx;
-import io.vertx.axle.core.eventbus.EventBus;
-import io.vertx.axle.core.eventbus.Message;
-import io.vertx.axle.core.eventbus.MessageConsumer;
+import io.smallrye.mutiny.Uni;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.core.eventbus.EventBus;
+import io.vertx.mutiny.core.eventbus.Message;
+import io.vertx.mutiny.core.eventbus.MessageConsumer;
 
 @Path("/")
 public class VertxProducerResource {
@@ -37,18 +37,19 @@ public Map<String, Boolean> test() {
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     @Path("/eventBus")
-    public CompletionStage<String> eb() {
+    public Uni<String> eb() {
         String address = UUID.randomUUID().toString();
 
         // Use the event bus bean.
         MessageConsumer<String> consumer = eventBus.consumer(address);
         consumer.handler(m -> {
-            m.reply("hello " + m.body());
+            m.replyAndForget("hello " + m.body());
             consumer.unregister();
         });
 
         // Use the Vert.x bean.
-        return vertx.eventBus().<String> request(address, "quarkus").thenApply(Message::body);
+        return vertx.eventBus().<String> request(address, "quarkus")
+                .onItem().transform(Message::body);
     }
 
 }
diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/RxVerticle.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/RxVerticle.java
deleted file mode 100644
index bd742b50ec6ce..0000000000000
--- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/RxVerticle.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.quarkus.it.vertx.verticles;
-
-import io.reactivex.Completable;
-import io.vertx.reactivex.core.AbstractVerticle;
-
-public class RxVerticle extends AbstractVerticle {
-
-    @Override
-    public Completable rxStart() {
-        String address = config().getString("id");
-        return vertx.eventBus().consumer(address)
-                .handler(message -> message.reply("OK-" + address))
-                .rxCompletionHandler();
-    }
-
-}
diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java
index a7cdf335a6993..96f1c88834865 100644
--- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java
+++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleDeployer.java
@@ -7,9 +7,9 @@
 import javax.inject.Inject;
 
 import io.quarkus.runtime.StartupEvent;
-import io.vertx.axle.core.Vertx;
 import io.vertx.core.DeploymentOptions;
 import io.vertx.core.json.JsonObject;
+import io.vertx.mutiny.core.Vertx;
 
 @ApplicationScoped
 public class VerticleDeployer {
@@ -21,27 +21,19 @@ public void init(@Observes StartupEvent ev) {
         CountDownLatch latch = new CountDownLatch(5);
         vertx.deployVerticle(BareVerticle::new, new DeploymentOptions().setConfig(new JsonObject()
                 .put("id", "bare")))
-                .thenAccept(x -> latch.countDown());
+                .subscribe().with(x -> latch.countDown());
 
         vertx.deployVerticle(BareVerticle.class.getName(), new DeploymentOptions().setConfig(new JsonObject()
                 .put("id", "bare-classname")))
-                .thenAccept(x -> latch.countDown());
-
-        vertx.deployVerticle(RxVerticle::new, new DeploymentOptions().setConfig(new JsonObject()
-                .put("id", "rx")))
-                .thenAccept(x -> latch.countDown());
-
-        vertx.deployVerticle(RxVerticle.class.getName(), new DeploymentOptions().setConfig(new JsonObject()
-                .put("id", "rx-classname")))
-                .thenAccept(x -> latch.countDown());
+                .subscribe().with(x -> latch.countDown());
 
         vertx.deployVerticle(MutinyAsyncVerticle::new, new DeploymentOptions().setConfig(new JsonObject()
                 .put("id", "mutiny")))
-                .thenAccept(x -> latch.countDown());
+                .subscribe().with(x -> latch.countDown());
 
         vertx.deployVerticle(MutinyAsyncVerticle.class.getName(), new DeploymentOptions().setConfig(new JsonObject()
                 .put("id", "mutiny-classname")))
-                .thenAccept(x -> latch.countDown());
+                .subscribe().with(x -> latch.countDown());
         latch.countDown();
     }
 
diff --git a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java
index 54b6b107cc6ac..7ff129de0e773 100644
--- a/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java
+++ b/integration-tests/vertx/src/main/java/io/quarkus/it/vertx/verticles/VerticleEndpoint.java
@@ -1,15 +1,14 @@
 package io.quarkus.it.vertx.verticles;
 
-import java.util.concurrent.CompletionStage;
-
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import io.vertx.axle.core.Vertx;
-import io.vertx.axle.core.eventbus.Message;
+import io.smallrye.mutiny.Uni;
+import io.vertx.mutiny.core.Vertx;
+import io.vertx.mutiny.core.eventbus.Message;
 
 @Path("/verticles")
 @Produces(MediaType.TEXT_PLAIN)
@@ -20,44 +19,30 @@ public class VerticleEndpoint {
 
     @GET
     @Path("/bare")
-    public CompletionStage<String> bare() {
+    public Uni<String> bare() {
         return vertx.eventBus().<String> request("bare", "")
-                .thenApply(Message::body);
+                .onItem().transform(Message::body);
     }
 
     @GET
     @Path("/bare-classname")
-    public CompletionStage<String> bareWithClassName() {
+    public Uni<String> bareWithClassName() {
         return vertx.eventBus().<String> request("bare-classname", "")
-                .thenApply(Message::body);
-    }
-
-    @GET
-    @Path("/rx")
-    public CompletionStage<String> rx() {
-        return vertx.eventBus().<String> request("rx", "")
-                .thenApply(Message::body);
-    }
-
-    @GET
-    @Path("/rx-classname")
-    public CompletionStage<String> rxWithClassName() {
-        return vertx.eventBus().<String> request("rx-classname", "")
-                .thenApply(Message::body);
+                .onItem().transform(Message::body);
     }
 
     @GET
     @Path("/mutiny")
-    public CompletionStage<String> mutiny() {
+    public Uni<String> mutiny() {
         return vertx.eventBus().<String> request("mutiny", "")
-                .thenApply(Message::body);
+                .onItem().transform(Message::body);
     }
 
     @GET
     @Path("/mutiny-classname")
-    public CompletionStage<String> mutinyWithClassName() {
+    public Uni<String> mutinyWithClassName() {
         return vertx.eventBus().<String> request("mutiny-classname", "")
-                .thenApply(Message::body);
+                .onItem().transform(Message::body);
     }
 
 }
diff --git a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VerticleTest.java b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VerticleTest.java
index 9e750677f9c4f..ff67080ab94de 100644
--- a/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VerticleTest.java
+++ b/integration-tests/vertx/src/test/java/io/quarkus/it/vertx/VerticleTest.java
@@ -21,16 +21,4 @@ public void testBareWithClassNameVerticle() {
         String s = get("/vertx-test/verticles/bare-classname").asString();
         assertThat(s).isEqualTo("OK-bare-classname");
     }
-
-    @Test
-    public void testRxVerticle() {
-        String s = get("/vertx-test/verticles/rx").asString();
-        assertThat(s).isEqualTo("OK-rx");
-    }
-
-    @Test
-    public void testRxWithClassNameVerticle() {
-        String s = get("/vertx-test/verticles/rx-classname").asString();
-        assertThat(s).isEqualTo("OK-rx-classname");
-    }
 }
diff --git a/integration-tests/virtual-http-resteasy/disable-native-profile b/integration-tests/virtual-http-resteasy/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/virtual-http-resteasy/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/virtual-http-resteasy/pom.xml b/integration-tests/virtual-http-resteasy/pom.xml
index 123f91066690e..f0b6c63ef12e2 100644
--- a/integration-tests/virtual-http-resteasy/pom.xml
+++ b/integration-tests/virtual-http-resteasy/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-virtual-http-resteasy</artifactId>
@@ -46,6 +45,60 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-azure-functions-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -64,59 +117,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java b/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java
index 507198a3a94f8..86da6d45baaca 100644
--- a/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java
+++ b/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/FunctionTest.java
@@ -29,7 +29,7 @@ public class FunctionTest {
     @Test
     public void testSwagger() {
         final HttpRequestMessageMock req = new HttpRequestMessageMock();
-        req.setUri(URI.create("https://foo.com/swagger-ui/"));
+        req.setUri(URI.create("https://foo.com/q/swagger-ui/"));
         req.setHttpMethod(HttpMethod.GET);
 
         // Invoke
@@ -38,7 +38,7 @@ public void testSwagger() {
         // Verify
         Assertions.assertEquals(ret.getStatus(), HttpStatus.OK);
         String body = new String((byte[]) ret.getBody(), StandardCharsets.UTF_8);
-        Assertions.assertTrue(body.contains("Swagger UI"));
+        Assertions.assertTrue(body.contains("OpenAPI UI"));
     }
 
     private ExecutionContext createContext() {
@@ -112,7 +112,7 @@ private void testPOST(String uri) {
         final HttpRequestMessageMock req = new HttpRequestMessageMock();
         req.setUri(URI.create(uri));
         req.setHttpMethod(HttpMethod.POST);
-        req.setBody("Bill".getBytes());
+        req.setBody("Bill");
         req.getHeaders().put("Content-Type", "text/plain");
 
         // Invoke
diff --git a/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java b/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java
index 583fef6dc9043..2d6ba09908d33 100644
--- a/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java
+++ b/integration-tests/virtual-http-resteasy/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.functions.HttpStatus;
 import com.microsoft.azure.functions.HttpStatusType;
 
-public class HttpRequestMessageMock implements HttpRequestMessage<Optional<byte[]>> {
+public class HttpRequestMessageMock implements HttpRequestMessage<Optional<String>> {
     protected URI uri;
     protected HttpMethod httpMethod;
     protected Map<String, String> headers = new HashMap<>();
     protected Map<String, String> queryParameters = new HashMap<>();
-    protected byte[] body;
+    protected String body;
 
     @Override
     public URI getUri() {
@@ -39,7 +39,7 @@ public Map<String, String> getQueryParameters() {
     }
 
     @Override
-    public Optional<byte[]> getBody() {
+    public Optional<String> getBody() {
         return Optional.ofNullable(body);
     }
 
@@ -69,7 +69,7 @@ public void setQueryParameters(Map<String, String> queryParameters) {
         this.queryParameters = queryParameters;
     }
 
-    public void setBody(byte[] body) {
+    public void setBody(String body) {
         this.body = body;
     }
 }
diff --git a/integration-tests/virtual-http/disable-native-profile b/integration-tests/virtual-http/disable-native-profile
new file mode 100644
index 0000000000000..011a7cc4571d5
--- /dev/null
+++ b/integration-tests/virtual-http/disable-native-profile
@@ -0,0 +1 @@
+This file disables the native profile in the parent pom.xml of this module.
\ No newline at end of file
diff --git a/integration-tests/virtual-http/pom.xml b/integration-tests/virtual-http/pom.xml
index fb1435f994cd1..8cc35b0601a54 100644
--- a/integration-tests/virtual-http/pom.xml
+++ b/integration-tests/virtual-http/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-virtual-http</artifactId>
@@ -54,6 +53,86 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-azure-functions-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-funqy-http-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,59 +151,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingVertx.java b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingVertx.java
index 1224a7da3884f..f8954694067a2 100644
--- a/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingVertx.java
+++ b/integration-tests/virtual-http/src/main/java/io/quarkus/it/virtual/GreetingVertx.java
@@ -20,19 +20,6 @@ void helloPost(RoutingContext context) {
         context.response().setStatusCode(200).end("hello " + name);
     }
 
-    @Route(path = "/vertx/rx/hello", methods = GET)
-    void rxHelloGet(io.vertx.reactivex.ext.web.RoutingContext context) {
-        context.response().headers().set("Content-Type", "text/plain");
-        context.response().setStatusCode(200).end("hello");
-    }
-
-    @Route(path = "/vertx/rx/hello", methods = POST)
-    void rxHelloPost(io.vertx.reactivex.ext.web.RoutingContext context) {
-        String name = context.getBodyAsString();
-        context.response().headers().set("Content-Type", "text/plain");
-        context.response().setStatusCode(200).end("hello " + name);
-    }
-
     @Route(path = "/vertx/exchange/hello", methods = GET)
     void exchange(RoutingExchange exchange) {
         exchange.response().headers().set("Content-Type", "text/plain");
diff --git a/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java b/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java
index 60731794503f6..1db414ee51fac 100644
--- a/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java
+++ b/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/FunctionTest.java
@@ -32,7 +32,7 @@ public void testFunqy() {
         final HttpRequestMessageMock req = new HttpRequestMessageMock();
         req.setUri(URI.create("https://foo.com/funqy"));
         req.setHttpMethod(HttpMethod.POST);
-        req.setBody("\"Bill\"".getBytes(StandardCharsets.UTF_8));
+        req.setBody("\"Bill\"");
         req.getHeaders().put("Content-Type", "application/json");
 
         // Invoke
@@ -80,9 +80,6 @@ public void testVertx() throws Exception {
         String uri = "https://foo.com/vertx/hello";
         testGET(uri);
         testPOST(uri);
-        uri = "https://foo.com/vertx/rx/hello";
-        testGET(uri);
-        testPOST(uri);
         uri = "https://foo.com/vertx/exchange/hello";
         testGET(uri);
     }
@@ -162,7 +159,7 @@ private void testPOST(String uri) {
         final HttpRequestMessageMock req = new HttpRequestMessageMock();
         req.setUri(URI.create(uri));
         req.setHttpMethod(HttpMethod.POST);
-        req.setBody("Bill".getBytes(StandardCharsets.UTF_8));
+        req.setBody("Bill");
         req.getHeaders().put("Content-Type", "text/plain");
 
         // Invoke
diff --git a/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java b/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java
index 583fef6dc9043..2d6ba09908d33 100644
--- a/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java
+++ b/integration-tests/virtual-http/src/test/java/io/quarkus/it/virtual/HttpRequestMessageMock.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.functions.HttpStatus;
 import com.microsoft.azure.functions.HttpStatusType;
 
-public class HttpRequestMessageMock implements HttpRequestMessage<Optional<byte[]>> {
+public class HttpRequestMessageMock implements HttpRequestMessage<Optional<String>> {
     protected URI uri;
     protected HttpMethod httpMethod;
     protected Map<String, String> headers = new HashMap<>();
     protected Map<String, String> queryParameters = new HashMap<>();
-    protected byte[] body;
+    protected String body;
 
     @Override
     public URI getUri() {
@@ -39,7 +39,7 @@ public Map<String, String> getQueryParameters() {
     }
 
     @Override
-    public Optional<byte[]> getBody() {
+    public Optional<String> getBody() {
         return Optional.ofNullable(body);
     }
 
@@ -69,7 +69,7 @@ public void setQueryParameters(Map<String, String> queryParameters) {
         this.queryParameters = queryParameters;
     }
 
-    public void setBody(byte[] body) {
+    public void setBody(String body) {
         this.body = body;
     }
 }
diff --git a/integration-tests/webjars-locator/pom.xml b/integration-tests/webjars-locator/pom.xml
index 62411f8ea231d..c33380bcfaecb 100644
--- a/integration-tests/webjars-locator/pom.xml
+++ b/integration-tests/webjars-locator/pom.xml
@@ -8,7 +8,6 @@
         <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-integration-test-webjars-locator</artifactId>
@@ -26,9 +25,9 @@
             <artifactId>quarkus-webjars-locator</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.webjars</groupId>
-          <artifactId>jquery</artifactId>
-          <version>3.4.1</version>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
           <groupId>org.webjars</groupId>
@@ -46,6 +45,34 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-webjars-locator-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -64,60 +91,5 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>native-image</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>${native.surefire.skip}</skipTests>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>native-image</id>
-                                <goals>
-                                    <goal>native-image</goal>
-                                </goals>
-                                <configuration>
-                                    <cleanupServer>true</cleanupServer>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                    <graalvmHome>${graalvmHome}</graalvmHome>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>
diff --git a/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/Greeting.java b/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/Greeting.java
deleted file mode 100644
index 70c3520472f2b..0000000000000
--- a/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/Greeting.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import java.time.LocalDate;
-
-public class Greeting {
-
-    private final String message;
-    private final LocalDate date;
-
-    public Greeting(String message, LocalDate date) {
-        this.message = message;
-        this.date = date;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public LocalDate getDate() {
-        return date;
-    }
-}
diff --git a/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/GreetingResource.java b/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/GreetingResource.java
deleted file mode 100644
index 319d3f9807d6f..0000000000000
--- a/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/GreetingResource.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import java.time.LocalDate;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-@Path("/greeting")
-public class GreetingResource {
-
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    public Greeting hello() {
-        return new Greeting("hello", LocalDate.of(2019, 01, 01));
-    }
-}
diff --git a/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/MessageResource.java b/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/MessageResource.java
deleted file mode 100644
index 1da18481e64f3..0000000000000
--- a/integration-tests/webjars-locator/src/main/java/io/quarkus/it/webjar/locator/MessageResource.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-@Path("/message")
-public class MessageResource {
-
-    @ConfigProperty(name = "message")
-    String message;
-
-    @GET
-    public String message() {
-        return message;
-    }
-
-}
diff --git a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/ApplicationPropertiesOverrideIT.java b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/ApplicationPropertiesOverrideIT.java
deleted file mode 100644
index 2397befe5a8a0..0000000000000
--- a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/ApplicationPropertiesOverrideIT.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.containsString;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.junit.NativeImageTest;
-
-/**
- * tests that application.properties is read from src/main/resources when running native image tests
- * 
- * This does not necessarily belong here, but main and test-extension have a lot of existing
- * config that would need to be duplicated, so it is here out of convenience.
- */
-@NativeImageTest
-class ApplicationPropertiesOverrideIT {
-
-    @Test
-    void testEndpoint() {
-        given()
-                .when().get("/message")
-                .then()
-                .statusCode(200)
-                .body(containsString("Production"));
-    }
-
-}
diff --git a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/ApplicationPropertiesOverrideTest.java b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/ApplicationPropertiesOverrideTest.java
deleted file mode 100644
index 5ef2267f0e1e6..0000000000000
--- a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/ApplicationPropertiesOverrideTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.containsString;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-/**
- * tests that application.properties is read from src/test/resources
- * 
- * This does not necessarily belong here, but main and test-extension have a lot of existing
- * config that would need to be duplicated, so it is here out of convenience.
- */
-@QuarkusTest
-class ApplicationPropertiesOverrideTest {
-
-    @Test
-    void testEndpoint() {
-        given()
-                .when().get("/message")
-                .then()
-                .statusCode(200)
-                .body(containsString("Test"));
-    }
-
-}
diff --git a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GeneratedClassesTest.java b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GeneratedClassesTest.java
deleted file mode 100644
index 9e14e51caac62..0000000000000
--- a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GeneratedClassesTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class GeneratedClassesTest {
-
-    @Test
-    void testGeneratedContextResolver() {
-        assertNotNull(generatedContextResolver());
-    }
-
-    private Object generatedContextResolver() {
-        try {
-            Class<?> objectMapperResolverClass = Class
-                    .forName("io.quarkus.resteasy.common.runtime.jackson.QuarkusObjectMapperContextResolver");
-            return objectMapperResolverClass.getDeclaredConstructor().newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GreetingResourceTest.java b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GreetingResourceTest.java
deleted file mode 100644
index c45181fa4f3e7..0000000000000
--- a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GreetingResourceTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.containsString;
-
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class GreetingResourceTest {
-
-    @Test
-    void testEndpoint() {
-        given()
-                .when().get("/greeting")
-                .then()
-                .statusCode(200)
-                .body(containsString("hello"))
-                .body(containsString("[2019,1,1]"));
-    }
-
-}
diff --git a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GreetingResourceTestIT.java b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GreetingResourceTestIT.java
deleted file mode 100644
index 6110e6638817e..0000000000000
--- a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/GreetingResourceTestIT.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.quarkus.it.webjar.locator;
-
-import io.quarkus.test.junit.NativeImageTest;
-
-@NativeImageTest
-class GreetingResourceTestIT extends GreetingResourceTest {
-}
diff --git a/mvnw b/mvnw
index 41c0f0c23db5d..a16b5431b4c3c 100755
--- a/mvnw
+++ b/mvnw
@@ -8,7 +8,7 @@
 # "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
+#    https://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
diff --git a/mvnw.cmd b/mvnw.cmd
index 86115719e5383..c8d43372c986d 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
diff --git a/pom.xml b/pom.xml
index aa8a3bb3b491e..a07874feaefe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>36</version>
+        <version>37</version>
     </parent>
 
     <groupId>io.quarkus</groupId>
@@ -18,7 +18,7 @@
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -35,19 +35,27 @@
         <postgres.url>jdbc:postgresql:hibernate_orm_test</postgres.url>
 
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <gitflow-incremental-builder.version>3.13.0</gitflow-incremental-builder.version>
 
         <skipDocs>false</skipDocs>
         <skip.gradle.tests>false</skip.gradle.tests>
+
+        <sonar.projectKey>quarkusio_quarkus</sonar.projectKey>
+        <sonar.organization>quarkusio</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
 
     <modules>
 
         <!-- External projects -->
         <module>independent-projects/ide-config</module>
+        <module>independent-projects/revapi</module>
         <module>independent-projects/arc</module>
         <module>independent-projects/bootstrap</module>
-        <module>independent-projects/tools</module>
         <module>independent-projects/qute</module>
+        <module>independent-projects/tools</module>
+        <module>independent-projects/enforcer-rules</module>
+        <module>independent-projects/resteasy-reactive</module>
 
         <!-- BOMs and parent POM -->
         <module>bom/application</module>
@@ -79,11 +87,9 @@
             <id>central</id>
             <name>Maven Repository Switchboard</name>
             <url>https://repo.maven.apache.org/maven2</url>
-        </repository>
-        <repository>
-            <id>gradle-dependencies</id>
-            <name>Gradle releases repository</name>
-            <url>https://repo.gradle.org/gradle/libs-releases</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -107,6 +113,7 @@
                 </property>
             </activation>
             <properties>
+                <!-- please check quick-build-ci as well when modifying these properties -->
                 <skipTests>true</skipTests>
                 <skipITs>true</skipITs>
                 <skipDocs>true</skipDocs>
@@ -114,11 +121,35 @@
                 <format.skip>true</format.skip>
                 <skipExtensionValidation>true</skipExtensionValidation>
                 <skip.gradle.tests>true</skip.gradle.tests>
+                <invoker.skip>true</invoker.skip>   <!-- maven-invoker-plugin -->
+                <jbang.skip>true</jbang.skip> <!-- jbang-maven-plugin -->
+                <forbiddenapis.skip>true</forbiddenapis.skip> <!-- forbidden-apis maven plugin -->
             </properties>
             <build>
                 <defaultGoal>clean install</defaultGoal>
             </build>
         </profile>
+        <profile>
+            <!-- separate "quickly" profile for CI to keep local "quickly" demands separated from CI demands -->
+            <id>quick-build-ci</id>
+            <activation>
+                <property>
+                    <name>quickly-ci</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+                <skipITs>true</skipITs>
+                <skipDocs>true</skipDocs>
+                <enforcer.skip>true</enforcer.skip>
+                <format.skip>true</format.skip>
+                <skipExtensionValidation>true</skipExtensionValidation>
+                <skip.gradle.tests>true</skip.gradle.tests>
+                <invoker.skip>true</invoker.skip>   <!-- maven-invoker-plugin -->
+                <jbang.skip>true</jbang.skip> <!-- jbang-maven-plugin -->
+                <forbiddenapis.skip>true</forbiddenapis.skip> <!-- forbidden-apis maven plugin -->
+            </properties>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -129,10 +160,11 @@
                         <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                             <serverId>ossrh</serverId>
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                             <keepStagingRepositoryOnCloseRuleFailure>true</keepStagingRepositoryOnCloseRuleFailure>
+                            <stagingProgressTimeoutMinutes>60</stagingProgressTimeoutMinutes>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -199,6 +231,43 @@
                 <module>tcks</module>
             </modules>
         </profile>
+        <profile>
+            <id>incremental</id>
+            <activation>
+                <property>
+                    <name>incremental</name>
+                </property>
+            </activation>
+            <properties>
+                <!-- the *local* main, not refs/remotes/... -->
+                <gib.referenceBranch>main</gib.referenceBranch>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.vackosar.gitflowincrementalbuilder</groupId>
+                        <artifactId>gitflow-incremental-builder</artifactId>
+                        <version>${gitflow-incremental-builder.version}</version>
+                        <extensions>true</extensions>
+                        <!-- https://github.com/gitflow-incremental-builder/gitflow-incremental-builder#configuration
+                             General recap: Anything that is directly set in <configuration> cannot be redefined via '-D...'!
+                             See also: https://github.com/gitflow-incremental-builder/gitflow-incremental-builder/issues/213 -->
+                        <configuration>
+                            <!-- pointless to attempt incremental build if something like mvnw was changed
+                                 (and also potentially wrong, given that independent-projects might not be built) -->
+                            <skipIfPathMatches>\.github[/\\].*|\.mvn[/\\].*|mvnw.*</skipIfPathMatches>
+                            <!-- Note: *Upstream* is only relevant in case of:
+                                 -am or
+                                 -Dgib.buildUpstream=always|true or
+                                 -Dgib.buildAll=true or
+                                 -Dgib.forceBuildModules=... -->
+                            <skipTestsForUpstreamModules>true</skipTestsForUpstreamModules>
+                            <argsForUpstreamModules>skipITs invoker.skip no-format</argsForUpstreamModules>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/tcks/microprofile-config/pom.xml b/tcks/microprofile-config/pom.xml
index e976efccff1a6..7c56e92f8878d 100644
--- a/tcks/microprofile-config/pom.xml
+++ b/tcks/microprofile-config/pom.xml
@@ -61,6 +61,21 @@
             <artifactId>microprofile-config-tck</artifactId>
             <version>${microprofile-config-api.version}</version>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-context-propagation/pom.xml b/tcks/microprofile-context-propagation/pom.xml
index cd359d8395487..cef05cba8766d 100644
--- a/tcks/microprofile-context-propagation/pom.xml
+++ b/tcks/microprofile-context-propagation/pom.xml
@@ -29,6 +29,10 @@
                     <dependenciesToScan>
                         <dependency>org.eclipse.microprofile.context-propagation:microprofile-context-propagation-tck</dependency>
                     </dependenciesToScan>
+                    <!-- We need this file to be able to skip two tests that will be fixed in the next MP-CP release -->
+                    <suiteXmlFiles>
+                        <suiteXmlFile>tck-tests.xml</suiteXmlFile>
+                    </suiteXmlFiles>
                 </configuration>
             </plugin>
         </plugins>
@@ -94,5 +98,33 @@
             <groupId>org.jboss.arquillian.container</groupId>
             <artifactId>arquillian-container-spi</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-narayana-jta-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-context-propagation-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tcks/microprofile-context-propagation/tck-tests.xml b/tcks/microprofile-context-propagation/tck-tests.xml
new file mode 100644
index 0000000000000..2d21bdd9c8cbb
--- /dev/null
+++ b/tcks/microprofile-context-propagation/tck-tests.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="MP-CP TCK" verbose="0" configfailurepolicy="continue">
+
+    <test name="MP-CP TCK">
+        <classes>
+            <!-- 
+                If I use packages to scan for classes, they run in parallel which our arquillian integration
+                does not support so I end up with NPEs in MPConfigTest in our arquillian integration.
+                The only alternative is to list them all just to be able to exclude two methods.
+             -->
+            <class name="org.eclipse.microprofile.context.tck.cdi.BasicCDITest"/>
+            <class name="org.eclipse.microprofile.context.tck.cdi.CDIContextTest"/>
+            <class name="org.eclipse.microprofile.context.tck.cdi.JTACDITest"/>
+            <class name="org.eclipse.microprofile.context.tck.ContextManagerTest"/>
+            <class name="org.eclipse.microprofile.context.tck.ManagedExecutorTest"/>
+            <class name="org.eclipse.microprofile.context.tck.MPConfigTest"/>
+            <class name="org.eclipse.microprofile.context.tck.TckTest"/>
+            <class name="org.eclipse.microprofile.context.tck.ThreadContextTest">
+                <methods>
+                    <exclude name="withContextCaptureDependentCompletableFuturesRunWithContext"/>
+                    <exclude name="withContextCaptureDependentCompletionStagesRunWithContext"/>
+                </methods>
+            </class>
+
+        </classes>
+
+    </test>
+
+</suite>
\ No newline at end of file
diff --git a/tcks/microprofile-fault-tolerance/pom.xml b/tcks/microprofile-fault-tolerance/pom.xml
index b82d36cd50ce3..9d954b32e59f6 100644
--- a/tcks/microprofile-fault-tolerance/pom.xml
+++ b/tcks/microprofile-fault-tolerance/pom.xml
@@ -55,6 +55,34 @@
             <artifactId>microprofile-fault-tolerance-tck</artifactId>
             <version>${microprofile-fault-tolerance-api.version}</version>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-fault-tolerance-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-graphql/pom.xml b/tcks/microprofile-graphql/pom.xml
index a4d243e1699d3..e5386d20eb80a 100644
--- a/tcks/microprofile-graphql/pom.xml
+++ b/tcks/microprofile-graphql/pom.xml
@@ -46,6 +46,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-graphql-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java b/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java
index 48c1a6612e12d..3638dabe13f43 100644
--- a/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java
+++ b/tcks/microprofile-graphql/src/main/java/io/quarkus/tck/graphql/TestInterceptor.java
@@ -9,8 +9,11 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -22,7 +25,7 @@
 import javax.json.JsonReader;
 
 import org.eclipse.microprofile.graphql.tck.dynamic.ExecutionDynamicTest;
-import org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData;
+import org.eclipse.microprofile.graphql.tck.dynamic.SchemaDynamicValidityTest;
 import org.jboss.logging.Logger;
 import org.testng.ITestResult;
 import org.testng.TestListenerAdapter;
@@ -36,25 +39,56 @@ public class TestInterceptor extends TestListenerAdapter {
     private static final Logger LOG = Logger.getLogger(TestInterceptor.class.getName());
 
     private static final String EXECUTION_TEST = ExecutionDynamicTest.class.getName();
+    private static final String SCHEMA_TEST = SchemaDynamicValidityTest.class.getName();
+
     private static final String TEST_SPECIFICATION = "testSpecification";
 
     private static final String OVERRIDES = "src/main/resources/overrides";
 
-    private Map<String, TestData> testDataMap = new HashMap<>();
+    private static final String PIPE = "|";
+    private static final String FILE_TYPE = ".csv";
+    private static final String DELIMITER = "\\" + PIPE;
+    private static final String COMMENT = "#";
+    private static final String OR = "'OR'";
+
+    private Map<String, org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData> executionTestDataMap = new HashMap<>();
+    private Map<Integer, org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData> schemaTestDataMap = new HashMap<>();
 
     public TestInterceptor() {
+        loadExecutionOverride();
+        loadSchemaOverride();
+    }
+
+    private void loadSchemaOverride() {
+        // Get all csv files
         try {
             Path folderPath = Paths.get(OVERRIDES);
             DirectoryStream<Path> overrides = Files.newDirectoryStream(folderPath);
-            Set<Path> overrideFolders = toListOfPaths(overrides);
-            testDataMap.putAll(toMapOfTestData(overrideFolders));
+            List<Path> overrideFiles = toListOfPathsForSchema(overrides);
+            List<org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData> testDataList = toListOfTestDataForSchema(
+                    overrideFiles);
+
+            for (org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData td : testDataList) {
+                schemaTestDataMap.put(generateKey(td), td);
+            }
+
         } catch (IOException ex) {
             ex.printStackTrace();
         }
+    }
 
+    private void loadExecutionOverride() {
+        try {
+            Path folderPath = Paths.get(OVERRIDES);
+            DirectoryStream<Path> overrides = Files.newDirectoryStream(folderPath);
+            Set<Path> overrideFolders = toListOfPathsForExecution(overrides);
+            executionTestDataMap.putAll(toMapOfTestDataForExecution(overrideFolders));
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
     }
 
-    private Set<Path> toListOfPaths(DirectoryStream<Path> directoryStream) {
+    private Set<Path> toListOfPathsForExecution(DirectoryStream<Path> directoryStream) {
         Set<Path> directories = new HashSet<>();
         for (Path p : directoryStream) {
             try (Stream<Path> paths = Files.walk(p)) {
@@ -68,12 +102,24 @@ private Set<Path> toListOfPaths(DirectoryStream<Path> directoryStream) {
         return directories;
     }
 
-    private Map<String, TestData> toMapOfTestData(Set<Path> testFolders) {
-        Map<String, TestData> testDataMap = new HashMap<>();
+    private static List<Path> toListOfPathsForSchema(DirectoryStream<Path> directoryStream) {
+        List<Path> files = new ArrayList<>();
+        for (Path p : directoryStream) {
+            if (!Files.isDirectory(p) && p.getFileName().toString().endsWith(FILE_TYPE)) {
+                files.add(p);
+            }
+        }
+        return files;
+    }
+
+    private Map<String, org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData> toMapOfTestDataForExecution(
+            Set<Path> testFolders) {
+        Map<String, org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData> testDataMap = new HashMap<>();
         for (Path testFolder : testFolders) {
             if (!testFolder.getFileName().toString().startsWith("META-INF")) {// Ignore META-INF
                 try {
-                    TestData testData = toTestData(testFolder);
+                    org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData testData = toTestDataForExecution(
+                            testFolder);
                     if (!testData.shouldIgnore()) {
                         testDataMap.put(testData.getName(), testData);
                     }
@@ -86,8 +132,25 @@ private Map<String, TestData> toMapOfTestData(Set<Path> testFolders) {
         return testDataMap;
     }
 
-    private TestData toTestData(Path folder) throws IOException {
-        TestData testData = new TestData(folder.getFileName().toString().replace("/", ""));
+    private List<org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData> toListOfTestDataForSchema(
+            List<Path> testFolders) {
+        List<org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData> testDataList = new LinkedList<>();
+        for (Path testFile : testFolders) {
+            try {
+                testDataList.addAll(toTestDataForSchema(testFile));
+            } catch (IOException ioe) {
+                LOG.logf(Logger.Level.ERROR, "Could not add test case {0} - {1}",
+                        new Object[] { testFile.getFileName().toString(), ioe.getMessage() });
+            }
+
+        }
+        return testDataList;
+    }
+
+    private org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData toTestDataForExecution(Path folder)
+            throws IOException {
+        org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData testData = new org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData(
+                folder.getFileName().toString().replace("/", ""));
         Files.walkFileTree(folder, new HashSet<>(), 1, new FileVisitor<Path>() {
 
             @Override
@@ -97,47 +160,51 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
                 if (!Files.isDirectory(file)) {
                     String filename = file.getFileName().toString();
 
-                    switch (filename) {
-                        case "input.graphql": {
-                            String content = getFileContent(file);
-                            testData.setInput(content);
-                            break;
-                        }
-                        case "httpHeader.properties": {
-                            Properties properties = new Properties();
-                            properties.load(Files.newInputStream(file));
-                            testData.setHttpHeaders(properties);
-                            break;
-                        }
-                        case "output.json": {
-                            String content = getFileContent(file);
-                            testData.setOutput(content);
-                            break;
-                        }
-                        case "variables.json": {
-                            String content = getFileContent(file);
-                            testData.setVariables(toJsonObject(content));
-                            break;
-                        }
-                        case "test.properties": {
-                            Properties properties = new Properties();
-                            properties.load(Files.newInputStream(file));
-                            testData.setProperties(properties);
-                            break;
-                        }
-                        case "cleanup.graphql": {
-                            String content = getFileContent(file);
-                            testData.setCleanup(content);
-                            break;
-                        }
-                        case "prepare.graphql": {
-                            String content = getFileContent(file);
-                            testData.setPrepare(content);
-                            break;
+                    if (filename.matches("output.*\\.json")) {
+                        // Special case to cater for multiple output*.json files where the
+                        // test will pass on the first file content that matches.
+                        // If no content matches, then the test will fail.
+                        String content = getFileContent(file);
+                        testData.addOutput(content);
+                    } else if (filename.matches("input.*\\.graphql")) {
+                        // Special case to cater for multiple input*.graphql files where the
+                        // test will pass on the first file input content which is successful.
+                        // If no content matches, then the test will fail.
+                        String content = getFileContent(file);
+                        testData.addInput(content);
+                    } else {
+                        switch (filename) {
+                            case "httpHeader.properties": {
+                                Properties properties = new Properties();
+                                properties.load(Files.newInputStream(file));
+                                testData.setHttpHeaders(properties);
+                                break;
+                            }
+                            case "variables.json": {
+                                String content = getFileContent(file);
+                                testData.setVariables(toJsonObject(content));
+                                break;
+                            }
+                            case "test.properties": {
+                                Properties properties = new Properties();
+                                properties.load(Files.newInputStream(file));
+                                testData.setProperties(properties);
+                                break;
+                            }
+                            case "cleanup.graphql": {
+                                String content = getFileContent(file);
+                                testData.setCleanup(content);
+                                break;
+                            }
+                            case "prepare.graphql": {
+                                String content = getFileContent(file);
+                                testData.setPrepare(content);
+                                break;
+                            }
+                            default:
+                                LOG.warnf("Ignoring unknown file {0}", filename);
+                                break;
                         }
-                        default:
-                            LOG.warnf("Ignoring unknown file {0}", filename);
-                            break;
                     }
                 }
                 return FileVisitResult.CONTINUE;
@@ -164,6 +231,65 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
         return testData;
     }
 
+    private static List<org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData> toTestDataForSchema(Path testFile)
+            throws IOException {
+        List<org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData> testDataList = new LinkedList<>();
+        List<String> content = Files.readAllLines(testFile);
+        String currentHeader = "";
+        for (String line : content) {
+            if (validLine(line)) {
+                String[] parts = line.split(DELIMITER);
+                if (parts.length == 4) {
+                    org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData testData = createTestDataForSchema(
+                            currentHeader, testFile.getFileName().toString(), parts);
+                    testDataList.add(testData);
+                } else {
+                    LOG.logf(Logger.Level.ERROR, "Could not add test case {0} - {1}",
+                            new Object[] { testFile.getFileName().toString(),
+                                    "Does not contain 3 parts [" + parts.length + "]" });
+                }
+            } else if (isHeader(line)) {
+                currentHeader = line.substring(line.indexOf(COMMENT) + 1).trim();
+            }
+        }
+        return testDataList;
+    }
+
+    private static org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData createTestDataForSchema(String header,
+            String filename, String[] parts) {
+        org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData testData = new org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData();
+        testData.setCount(Integer.valueOf(parts[0]));
+        testData.setHeader(header);
+        testData.setName(filename);
+        String count = parts[0].trim();
+        String snippet = parts[1].trim();
+        if (snippet == null || snippet.isEmpty()) {
+            snippet = null;
+        }
+        testData.setSnippetSearchTerm(snippet);
+
+        String containsString = parts[2].trim();
+        if (containsString.contains(OR)) {
+            String[] containsStrings = containsString.split(OR);
+            for (String oneOf : containsStrings) {
+                testData.addContainsString(oneOf.trim());
+            }
+        } else {
+            testData.addContainsString(containsString);
+        }
+        testData.setErrorMessage("(" + count + ") - " + parts[3].trim());
+
+        return testData;
+    }
+
+    private static boolean validLine(String line) {
+        return !line.isEmpty() && line.trim().contains(PIPE) && !isHeader(line);
+    }
+
+    private static boolean isHeader(String line) {
+        return line.trim().startsWith(COMMENT);
+    }
+
     private JsonObject toJsonObject(String jsonString) {
         if (jsonString == null || jsonString.isEmpty()) {
             return null;
@@ -181,60 +307,99 @@ private String getFileContent(Path file) throws IOException {
     public void onTestStart(ITestResult itr) {
 
         if (itr.getTestClass().getName().equals(EXECUTION_TEST)) {
-            TestData testData = getExecutionTestData(itr.getParameters());
-
-            LOG.info("\n\t =================================================="
-                    + "\n\t Testing [" + testData.getName() + "]"
-                    + "\n\t =================================================="
-                    + "\n");
+            onExecutionTestStart(itr);
+        } else if (itr.getTestClass().getName().equals(SCHEMA_TEST)) {
+            onSchemaTestStart(itr);
+        }
+        super.onTestStart(itr);
 
-            if (itr.getName().startsWith(TEST_SPECIFICATION) && !testDataMap.isEmpty()
-                    && testDataMap.containsKey(testData.getName())) {
+    }
 
-                TestData override = testDataMap.get(testData.getName());
+    private void onSchemaTestStart(ITestResult itr) {
+        if (itr.getName().equals("testPartsOfSchema")) { // We only override the input data
+            org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData testData = getSchemaTestData(itr.getParameters());
 
-                if (override.getCleanup() != null && !override.getCleanup().isEmpty()) {
-                    testData.setCleanup(override.getCleanup());
-                    LOG.warn("\n\t NOTE: Overriding Cleanup");
-                }
-                if (override.getHttpHeaders() != null && !override.getHttpHeaders().isEmpty()) {
-                    testData.setHttpHeaders(override.getHttpHeaders());
-                    LOG.warn("\n\t NOTE: Overriding HTTP Headers");
-                }
-                if (override.getInput() != null && !override.getInput().isEmpty()) {
-                    testData.setInput(override.getInput());
-                    LOG.warn("\n\t NOTE: Overriding Input");
-                }
-                if (override.getOutput() != null && !override.getOutput().isEmpty()) {
-                    testData.setOutput(override.getOutput());
-                    LOG.warn("\n\t NOTE: Overriding Output");
-                }
-                if (override.getPrepare() != null && !override.getPrepare().isEmpty()) {
-                    testData.setPrepare(override.getPrepare());
-                    LOG.warn("\n\t NOTE: Overriding Prepare");
-                }
-                if (override.getProperties() != null && !override.getProperties().isEmpty()) {
-                    testData.setProperties(override.getProperties());
-                    LOG.warn("\n\t NOTE: Overriding Properties");
-                }
-                if (override.getVariables() != null && !override.getVariables().isEmpty()) {
-                    testData.setVariables(override.getVariables());
-                    LOG.warn("\n\t NOTE: Overriding Variables");
-                }
+            int key = generateKey(testData);
+            if (!schemaTestDataMap.isEmpty() && schemaTestDataMap.containsKey(key)) {
+                LOG.info("\n\t =================================================="
+                        + "\n\t Schema: Testing Override [" + testData.getCount() + "] " + testData.getHeader() + " in "
+                        + testData.getName()
+                        + "\n\t =================================================="
+                        + "\n");
+                org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData overrideTestData = schemaTestDataMap.get(key);
+                testData.setContainsAnyOfString(overrideTestData.getContainsAnyOfString());
+                testData.setErrorMessage(overrideTestData.getErrorMessage());
+                testData.setSnippetSearchTerm(overrideTestData.getSnippetSearchTerm());
             }
-
         }
-        super.onTestStart(itr);
+    }
+
+    private void onExecutionTestStart(ITestResult itr) {
+        org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData testData = getExecutionTestData(itr.getParameters());
+
+        LOG.info("\n\t =================================================="
+                + "\n\t Execution: Testing [" + testData.getName() + "]"
+                + "\n\t =================================================="
+                + "\n");
+
+        if (itr.getName().startsWith(TEST_SPECIFICATION) && !executionTestDataMap.isEmpty()
+                && executionTestDataMap.containsKey(testData.getName())) {
+
+            org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData override = executionTestDataMap
+                    .get(testData.getName());
 
+            if (override.getCleanup() != null && !override.getCleanup().isEmpty()) {
+                testData.setCleanup(override.getCleanup());
+                LOG.warn("\n\t NOTE: Overriding Cleanup");
+            }
+            if (override.getHttpHeaders() != null && !override.getHttpHeaders().isEmpty()) {
+                testData.setHttpHeaders(override.getHttpHeaders());
+                LOG.warn("\n\t NOTE: Overriding HTTP Headers");
+            }
+            if (override.getInput() != null && !override.getInput().isEmpty()) {
+                testData.setInput(override.getInput());
+                LOG.warn("\n\t NOTE: Overriding Input");
+            }
+            if (override.getOutput() != null && !override.getOutput().isEmpty()) {
+                testData.setOutput(override.getOutput());
+                LOG.warn("\n\t NOTE: Overriding Output");
+            }
+            if (override.getPrepare() != null && !override.getPrepare().isEmpty()) {
+                testData.setPrepare(override.getPrepare());
+                LOG.warn("\n\t NOTE: Overriding Prepare");
+            }
+            if (override.getProperties() != null && !override.getProperties().isEmpty()) {
+                testData.setProperties(override.getProperties());
+                LOG.warn("\n\t NOTE: Overriding Properties");
+            }
+            if (override.getVariables() != null && !override.getVariables().isEmpty()) {
+                testData.setVariables(override.getVariables());
+                LOG.warn("\n\t NOTE: Overriding Variables");
+            }
+        }
     }
 
-    private TestData getExecutionTestData(Object[] parameters) {
+    private org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData getExecutionTestData(Object[] parameters) {
         for (Object param : parameters) {
-            if (TestData.class.isInstance(param)) {
-                return TestData.class.cast(param);
+            if (org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData.class.isInstance(param)) {
+                return org.eclipse.microprofile.graphql.tck.dynamic.execution.TestData.class.cast(param);
             }
         }
         return null;
     }
 
+    private org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData getSchemaTestData(Object[] parameters) {
+        for (Object param : parameters) {
+            if (org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData.class.isInstance(param)) {
+                return org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData.class.cast(param);
+            }
+        }
+        throw new RuntimeException("Could not find TestData for SchemaTest");
+    }
+
+    private int generateKey(org.eclipse.microprofile.graphql.tck.dynamic.schema.TestData data) {
+        String concat = data.getName() + data.getHeader() + data.getCount();
+        return concat.hashCode();
+    }
+
 }
diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/createNewNullNamedTeam/output.json b/tcks/microprofile-graphql/src/main/resources/overrides/createNewNullNamedTeam/output.json
deleted file mode 100644
index 36ef4e331e44b..0000000000000
--- a/tcks/microprofile-graphql/src/main/resources/overrides/createNewNullNamedTeam/output.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "errors": [
-        {
-            "message": "The field at path '/team/name' was declared as a non null type, but the code involved in retrieving data has wrongly returned a null value.  The graphql specification requires that the parent field be set to null, or if that is non nullable that it bubble up null to its parent and so on. The non-nullable type is 'String' within parent type 'Team'",
-            "path": [
-                "team",
-                "name"
-            ]
-        }
-    ],
-    "data": {
-        "team": null
-    }
-}
\ No newline at end of file
diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/schemaTests.csv b/tcks/microprofile-graphql/src/main/resources/overrides/schemaTests.csv
new file mode 100644
index 0000000000000..e9123af15a7b1
--- /dev/null
+++ b/tcks/microprofile-graphql/src/main/resources/overrides/schemaTests.csv
@@ -0,0 +1,2 @@
+# testJsonDefault
+59|type Mutation       |   provisionHero(hero: String, item: ItemInput = {dateCreated : "19 February 1900 at 12:00 in Africa/Johannesburg", dateLastUsed : "29 Jan 2020 at 09:45 in zone +0200", height : 1.2, id : 1000, name : "Cape", powerLevel : 3, supernatural : false, weight : 0.3}): SuperHero | Expecting a default value for item for provisionHero
\ No newline at end of file
diff --git a/tcks/microprofile-health/pom.xml b/tcks/microprofile-health/pom.xml
index cf1dfac68889e..341310ac76656 100644
--- a/tcks/microprofile-health/pom.xml
+++ b/tcks/microprofile-health/pom.xml
@@ -18,6 +18,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <systemPropertyVariables>
+                        <!-- Change metrics endpoint to be /metrics -->
+                        <quarkus.http.non-application-root-path>/</quarkus.http.non-application-root-path>
+                    </systemPropertyVariables>
                     <suiteXmlFiles>
                         <suiteXmlFile>tck-suite.xml</suiteXmlFile>
                     </suiteXmlFiles>
@@ -79,6 +83,34 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-health-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-jwt/pom.xml b/tcks/microprofile-jwt/pom.xml
index 378ca20c0c73d..ac97c7a3e92c4 100644
--- a/tcks/microprofile-jwt/pom.xml
+++ b/tcks/microprofile-jwt/pom.xml
@@ -86,6 +86,47 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-jwt-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-jwt/tck-base-suite.xml b/tcks/microprofile-jwt/tck-base-suite.xml
index cf052bda817e1..6ac3657884555 100644
--- a/tcks/microprofile-jwt/tck-base-suite.xml
+++ b/tcks/microprofile-jwt/tck-base-suite.xml
@@ -4,7 +4,7 @@
     "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
+     https://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
diff --git a/tcks/microprofile-metrics/api/pom.xml b/tcks/microprofile-metrics/api/pom.xml
index 0e79d34d54f19..b5033523183e1 100644
--- a/tcks/microprofile-metrics/api/pom.xml
+++ b/tcks/microprofile-metrics/api/pom.xml
@@ -60,6 +60,21 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-metrics/optional/pom.xml b/tcks/microprofile-metrics/optional/pom.xml
index a6c930b743c63..c35a48782a995 100644
--- a/tcks/microprofile-metrics/optional/pom.xml
+++ b/tcks/microprofile-metrics/optional/pom.xml
@@ -22,6 +22,8 @@
                         <!-- Disable quarkus optimization -->
                         <quarkus.arc.remove-unused-beans>false</quarkus.arc.remove-unused-beans>
                         <quarkus.resteasy.metrics.enabled>true</quarkus.resteasy.metrics.enabled>
+                        <!-- Change metrics endpoint to be /metrics -->
+                        <quarkus.http.non-application-root-path>/</quarkus.http.non-application-root-path>
                         <context.root/>
                     </systemPropertyVariables>
                     <!-- This workaround allows us to run a single test using
@@ -69,6 +71,34 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/tcks/microprofile-metrics/rest/pom.xml b/tcks/microprofile-metrics/rest/pom.xml
index 4cecd7e801e7a..0ba944e5412ee 100644
--- a/tcks/microprofile-metrics/rest/pom.xml
+++ b/tcks/microprofile-metrics/rest/pom.xml
@@ -21,6 +21,8 @@
                     <systemPropertyVariables>
                         <!-- Disable quarkus optimization -->
                         <quarkus.arc.remove-unused-beans>false</quarkus.arc.remove-unused-beans>
+                        <!-- Change metrics endpoint to be /metrics -->
+                        <quarkus.http.non-application-root-path>/</quarkus.http.non-application-root-path>
                     </systemPropertyVariables>
                     <!-- This workaround allows us to run a single test using
                         the "test" system property -->
@@ -63,6 +65,20 @@
             <groupId>org.jboss.spec.javax.xml.bind</groupId>
             <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
         </dependency>
-    </dependencies>
 
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/tcks/microprofile-openapi/pom.xml b/tcks/microprofile-openapi/pom.xml
index 38867843a57f9..e22e6fde8af7d 100644
--- a/tcks/microprofile-openapi/pom.xml
+++ b/tcks/microprofile-openapi/pom.xml
@@ -23,6 +23,8 @@
                         <!-- Disable quarkus optimization -->
                         <quarkus.arc.remove-unused-beans>false</quarkus.arc.remove-unused-beans>
                         <test.url>http://localhost:8081</test.url>
+                        <!-- Change metrics endpoint to be /metrics -->
+                        <quarkus.http.non-application-root-path>/</quarkus.http.non-application-root-path>
                     </systemPropertyVariables>
                     <!-- This workaround allows us to run a single test using
                         the "test" system property -->
@@ -86,5 +88,33 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>commons-logging-jboss-logging</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tcks/microprofile-opentracing/base/pom.xml b/tcks/microprofile-opentracing/base/pom.xml
index b2d034e3365a0..553c57e2f5179 100644
--- a/tcks/microprofile-opentracing/base/pom.xml
+++ b/tcks/microprofile-opentracing/base/pom.xml
@@ -201,6 +201,47 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-opentracing-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 
diff --git a/tcks/microprofile-reactive-messaging/pom.xml b/tcks/microprofile-reactive-messaging/pom.xml
index 7e76d7dbde605..474d92def3e0e 100644
--- a/tcks/microprofile-reactive-messaging/pom.xml
+++ b/tcks/microprofile-reactive-messaging/pom.xml
@@ -22,6 +22,7 @@
                     <systemPropertyVariables>
                         <!-- Disable quarkus optimization -->
                         <quarkus.arc.remove-unused-beans>false</quarkus.arc.remove-unused-beans>
+                        <smallrye-messaging-strict-binding>true</smallrye-messaging-strict-binding>
                     </systemPropertyVariables>
                     <!-- This workaround allows us to run a single test using
                         the "test" system property -->
@@ -32,6 +33,8 @@
                     <excludes>
                         <!-- There tests have been corrected in the next version of the TCK, some signatures are now considered invalid -->
                         <exclude>org.eclipse.microprofile.reactive.messaging.tck.invalid.InvalidConfigurationTest</exclude>
+                        <!-- The new wiring fails at the Quarkus startup because of the incorrect configuration -->
+                        <exclude>org.eclipse.microprofile.reactive.messaging.tck.connector.MissingConnectorTest</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -51,5 +54,20 @@
             <artifactId>microprofile-reactive-messaging-tck</artifactId>
             <version>${microprofile-reactive-messaging-api.version}</version>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tcks/microprofile-rest-client-reactive/pom.xml b/tcks/microprofile-rest-client-reactive/pom.xml
new file mode 100644
index 0000000000000..80ebe10210b71
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-tck-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-tck-microprofile-rest-client-reactive</artifactId>
+    <name>Quarkus - TCK - MicroProfile REST Client - RestEasy Reactive</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <!-- Disable quarkus optimization -->
+                        <quarkus.arc.remove-unused-beans>false</quarkus.arc.remove-unused-beans>
+                        <io.quarkus.arquillian.copy-fields>true</io.quarkus.arquillian.copy-fields>
+                        <wiremock.server.port>${wiremock.server.port}</wiremock.server.port>
+                        <quarkus.rest-client.scope>javax.enterprise.context.Dependent</quarkus.rest-client.scope>
+                    </systemPropertyVariables>
+                    <!-- This workaround allows us to run a single test using
+                        the "test" system property -->
+                    <!-- https://issues.apache.org/jira/browse/SUREFIRE-569 -->
+                    <dependenciesToScan>
+                        <dependency>org.eclipse.microprofile.rest.client:microprofile-rest-client-tck</dependency>
+                    </dependenciesToScan>
+                    <reuseForks>false</reuseForks>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <!-- Not actually tests that should be run -->
+                        <exclude>org.eclipse.microprofile.rest.client.tck.WiremockArquillianTest</exclude>
+                        <exclude>org.eclipse.microprofile.rest.client.tck.ssl.AbstractSslTest</exclude>
+
+                        <!-- ConversationScope not supported in Quarkus -->
+                        <exclude>org.eclipse.microprofile.rest.client.tck.cditests.HasConversationScopeTest</exclude>
+
+                        <!-- we have a newer version of the test in the code -->
+                        <!-- remove our test and remove this once https://github.com/eclipse/microprofile-rest-client/pull/300 gets -->
+                        <!-- into a release -->
+                        <exclude>org.eclipse.microprofile.rest.client.tck.cditests.CDIInterceptorTest</exclude>
+
+                        <!-- We have our own version of these tests which set up a config environment -->
+                        <exclude>org.eclipse.microprofile.rest.client.tck.InvokeWithJsonBProviderTest</exclude>
+                        <exclude>org.eclipse.microprofile.rest.client.tck.InvokeWithJsonPProviderTest</exclude>
+                        <exclude>org.eclipse.microprofile.rest.client.tck.InvalidInterfaceTest</exclude>
+
+                        <!-- currently not supported or unapplicable for non-blocking implementation: -->
+                        <exclude>org.eclipse.microprofile.rest.client.tck.ssl.SslContextTest</exclude>
+                        <exclude>org.eclipse.microprofile.rest.client.tck.ssl.SslHostnameVerifierTest</exclude>
+                        <exclude>org.eclipse.microprofile.rest.client.tck.asynctests.AsyncMethodTest</exclude>
+                        <exclude>org.eclipse.microprofile.rest.client.tck.SubResourceTest</exclude>
+
+                        <!-- The connection timeout is too small -->
+                        <exclude>org/eclipse/microprofile/rest/client/tck/timeout/*.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>uk.co.automatictester</groupId>
+                <artifactId>wiremock-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <dir>target/classes</dir>
+                            <params>--port=${wiremock.server.port} --verbose</params>
+                            <skip>${skipTests}</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jboss.jandex</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <version>1.0.8</version>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arquillian</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-reactive-deployment</artifactId>
+        </dependency>
+        <!-- TCKs are adding SessionScope to some beans, so we need this capability to support it -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-servlet-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.rest.client</groupId>
+            <artifactId>microprofile-rest-client-tck</artifactId>
+            <version>${microprofile-rest-client-api.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlets</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+    </dependencies>
+    <properties>
+        <wiremock.server.port>8766</wiremock.server.port>
+    </properties>
+</project>
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/CustomInvokeWithJsonBProviderTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/CustomInvokeWithJsonBProviderTest.java
new file mode 100644
index 0000000000000..c06425b79b29b
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/CustomInvokeWithJsonBProviderTest.java
@@ -0,0 +1,92 @@
+package io.quarkus.tck.restclient;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.reset;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static org.testng.Assert.assertEquals;
+
+import java.time.LocalDate;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.eclipse.microprofile.rest.client.tck.InvokeWithJsonBProviderTest;
+import org.eclipse.microprofile.rest.client.tck.WiremockArquillianTest;
+import org.eclipse.microprofile.rest.client.tck.interfaces.JsonBClient;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MyJsonBObject;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.SkipException;
+import org.testng.annotations.Test;
+
+/**
+ * copied from
+ * https://github.com/eclipse/microprofile-rest-client/blob/1.4.X-service/tck/src/main/java/org/eclipse/microprofile/rest/client/tck/InvokeWithJsonBProviderTest.java
+ */
+public class CustomInvokeWithJsonBProviderTest extends WiremockArquillianTest {
+
+    private static final String CDI = "cdi";
+    private static final String BUILT = "built";
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        StringAsset mpConfig = new StringAsset(JsonBClient.class.getName() + "/mp-rest/uri=" + getStringURL());
+        return ShrinkWrap.create(WebArchive.class, InvokeWithJsonBProviderTest.class.getSimpleName() + ".war")
+                .addClasses(JsonBClient.class, WiremockArquillianTest.class, MyJsonBObject.class,
+                        InvokeWithJsonBProviderTest.class)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(mpConfig, "classes/META-INF/microprofile-config.properties");
+    }
+
+    private static void assumeJsonbApiExists() throws SkipException {
+        try {
+            Class.forName("javax.json.bind.annotation.JsonbProperty");
+        } catch (Throwable t) {
+            throw new SkipException("Skipping since JSON-B APIs were not found.");
+        }
+    }
+
+    @RestClient
+    @Inject
+    private JsonBClient cdiJsonBClient;
+
+    private JsonBClient builtJsonBClient;
+
+    public void setupClient() {
+        builtJsonBClient = RestClientBuilder.newBuilder()
+                .baseUri(getServerURI())
+                .build(JsonBClient.class);
+    }
+
+    @Test
+    public void testGetExecutesForBothClients() throws Exception {
+        setupClient();
+        assumeJsonbApiExists();
+        testGet(builtJsonBClient, BUILT);
+        testGet(cdiJsonBClient, CDI);
+    }
+
+    private void testGet(JsonBClient client, String clientType) {
+        reset();
+        stubFor(get(urlEqualTo("/myObject"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody("{" +
+                                "\"objectName\": \"myObject\"," +
+                                "\"quantity\": 17," +
+                                "\"date\": \"2018-12-04\"" +
+                                "}")));
+
+        MyJsonBObject obj = client.get("myObject");
+        assertEquals(obj.getName(), "myObject");
+        assertEquals(obj.getQty(), 17);
+        assertEquals(obj.getIgnoredField(), "CTOR");
+        assertEquals(obj.getDate(), LocalDate.of(2018, 12, 4));
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/CustomInvokeWithJsonPProviderTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/CustomInvokeWithJsonPProviderTest.java
new file mode 100644
index 0000000000000..2526d3b874586
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/CustomInvokeWithJsonPProviderTest.java
@@ -0,0 +1,156 @@
+package io.quarkus.tck.restclient;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.reset;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static org.testng.Assert.assertEquals;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.eclipse.microprofile.rest.client.tck.WiremockArquillianTest;
+import org.eclipse.microprofile.rest.client.tck.interfaces.JsonPClient;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+/*
+copied from https://github.com/eclipse/microprofile-rest-client/blob/1.4.X-service/tck/src/main/java/org/eclipse/microprofile/rest/client/tck/InvokeWithJsonPProviderTest.java
+ */
+public class CustomInvokeWithJsonPProviderTest extends WiremockArquillianTest {
+
+    private static final String CDI = "cdi";
+    private static final String BUILT = "built";
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        StringAsset mpConfig = new StringAsset(JsonPClient.class.getName() + "/mp-rest/url=" + getStringURL());
+        return ShrinkWrap.create(WebArchive.class, CustomInvokeWithJsonPProviderTest.class.getSimpleName() + ".war")
+                .addClasses(JsonPClient.class, WiremockArquillianTest.class)
+                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+                .addAsWebInfResource(mpConfig, "classes/META-INF/microprofile-config.properties");
+    }
+
+    @Inject
+    @RestClient
+    private JsonPClient cdiJsonPClient;
+
+    private JsonPClient builtJsonPClient;
+
+    public void setupClient() {
+        builtJsonPClient = RestClientBuilder.newBuilder()
+                .baseUri(getServerURI())
+                .build(JsonPClient.class);
+    }
+
+    @Test
+    public void testGetExecutesForBothClients() {
+        setupClient();
+        testGet(builtJsonPClient, BUILT);
+        testGet(cdiJsonPClient, CDI);
+    }
+
+    @Test
+    public void testGetSingleExecutesForBothClients() {
+        setupClient();
+        testGetSingle(builtJsonPClient, BUILT);
+        testGetSingle(cdiJsonPClient, CDI);
+    }
+
+    @Test
+    public void testPostExecutes() {
+        setupClient();
+        testPost(builtJsonPClient, BUILT);
+        testPost(cdiJsonPClient, CDI);
+    }
+
+    @Test
+    public void testPutExecutes() {
+        setupClient();
+        testPut(builtJsonPClient, BUILT);
+        testPut(cdiJsonPClient, CDI);
+    }
+
+    private void testGet(JsonPClient client, String clientType) {
+        reset();
+        stubFor(get(urlEqualTo("/"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody("[{\"key\": \"value\"}, {\"key\": \"anotherValue\"}]")));
+        JsonArray jsonArray = client.get();
+        assertEquals(jsonArray.size(), 2, "Expected 2 values in the array for client " + clientType);
+        List<JsonObject> jsonObjects = jsonArray.getValuesAs(JsonObject.class);
+        JsonObject one = jsonObjects.get(0);
+        assertEquals(one.keySet().size(), 1, "There should only be one key in object 1 for client " + clientType);
+        assertEquals(one.getString("key"), "value", "The value of 'key' on object 1 should be 'value' in client " + clientType);
+
+        JsonObject two = jsonObjects.get(1);
+        assertEquals(two.keySet().size(), 1, "There should only be one key in object 2 for client " + clientType);
+        assertEquals(two.getString("key"), "anotherValue",
+                "The value of 'key' on object 2 should be 'anotherValue' in client " + clientType);
+
+    }
+
+    private void testGetSingle(JsonPClient client, String clientType) {
+        reset();
+        stubFor(get(urlEqualTo("/id"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody("{\"key\": \"value\"}")));
+        JsonObject jsonObject = client.get("id");
+        assertEquals(jsonObject.keySet().size(), 1, "There should only be one key in object for client " + clientType);
+        assertEquals(jsonObject.getString("key"), "value",
+                "The value of 'key' on object should be 'value' in client " + clientType);
+
+    }
+
+    private void testPost(JsonPClient client, String clientType) {
+        reset();
+        stubFor(post(urlEqualTo("/"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withStatus(200)));
+
+        JsonObject jsonObject = Json.createObjectBuilder().add("someKey", "newValue").build();
+        String jsonObjectAsString = jsonObject.toString();
+        Response response = client.post(jsonObject);
+        response.close();
+        assertEquals(response.getStatus(), 200, "Expected a 200 OK on client " + clientType);
+
+        verify(1, postRequestedFor(urlEqualTo("/")).withRequestBody(equalTo(jsonObjectAsString)));
+    }
+
+    private void testPut(JsonPClient client, String clientType) {
+        reset();
+        stubFor(put(urlEqualTo("/id"))
+                .willReturn(aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withStatus(200).withBody("{\"someOtherKey\":\"newValue\"}")));
+
+        JsonObject jsonObject = Json.createObjectBuilder().add("someKey", "newValue").build();
+        String jsonObjectAsString = jsonObject.toString();
+        JsonObject response = client.update("id", jsonObject);
+        assertEquals(response.getString("someOtherKey"), "newValue",
+                "The value of 'someOtherKey' on response should be 'someOtherKey' in client " + clientType);
+
+        verify(1, putRequestedFor(urlEqualTo("/id")).withRequestBody(equalTo(jsonObjectAsString)));
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/RestClientProcessor.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/RestClientProcessor.java
new file mode 100644
index 0000000000000..47cddf6d3fc00
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/RestClientProcessor.java
@@ -0,0 +1,39 @@
+package io.quarkus.tck.restclient;
+
+import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
+import org.jboss.arquillian.test.spi.TestClass;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.container.ClassContainer;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+public class RestClientProcessor implements ApplicationArchiveProcessor {
+    @Override
+    public void process(Archive<?> applicationArchive, TestClass testClass) {
+        // Only apply the processor to SSL tests
+        if (testClass.getName().contains("SslHostnameVerifierTest") ||
+                testClass.getName().contains("SslMutualTest") ||
+                testClass.getName().contains("SslTrustStoreTest") ||
+                testClass.getName().contains("SslContextTest")) {
+
+            if (!(applicationArchive instanceof WebArchive)) {
+                return;
+            }
+
+            WebArchive war = applicationArchive.as(WebArchive.class);
+            war.addAsResource(new StringAsset("quarkus.ssl.native=true"), "application.properties");
+        }
+
+        // Make sure the test class and all of its superclasses are added to the test deployment
+        // This ensures that all the classes from the hierarchy are loaded by the RuntimeClassLoader
+        if (ClassContainer.class.isInstance(applicationArchive) && testClass.getJavaClass().getSuperclass() != null) {
+            ClassContainer<?> classContainer = ClassContainer.class.cast(applicationArchive);
+            Class<?> clazz = testClass.getJavaClass().getSuperclass();
+            while (clazz != Object.class && clazz != null) {
+                classContainer.addClass(clazz);
+                clazz = clazz.getSuperclass();
+            }
+
+        }
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/RestClientTckExtension.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/RestClientTckExtension.java
new file mode 100644
index 0000000000000..031390141ecf4
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/RestClientTckExtension.java
@@ -0,0 +1,11 @@
+package io.quarkus.tck.restclient;
+
+import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+
+public class RestClientTckExtension implements LoadableExtension {
+    @Override
+    public void register(ExtensionBuilder builder) {
+        builder.service(ApplicationArchiveProcessor.class, RestClientProcessor.class);
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java
new file mode 100644
index 0000000000000..4460e7b62a9ea
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java
@@ -0,0 +1,78 @@
+package io.quarkus.tck.restclient.cdi;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.eclipse.microprofile.rest.client.tck.providers.ReturnWithURLRequestFilter;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.Test;
+
+public class CDIInterceptorTest extends Arquillian {
+
+    @Inject
+    @RestClient
+    private ClientWithURIAndInterceptor client;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        String simpleName = CDIInterceptorTest.class.getSimpleName();
+        JavaArchive jar = ShrinkWrap.create(JavaArchive.class, simpleName + ".jar")
+                .addClasses(ClientWithURIAndInterceptor.class,
+                        Loggable.class,
+                        LoggableInterceptor.class,
+                        ReturnWithURLRequestFilter.class)
+                .addAsManifestResource(new StringAsset(
+                        "<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"" +
+                                "       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                                "       xsi:schemaLocation=\"" +
+                                "          http://java.sun.com/xml/ns/javaee" +
+                                "          http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">" +
+                                "       <interceptors>" +
+                                "           <class>io.quarkus.tck.restclient.cdi.LoggableInterceptor</class>"
+                                +
+                                "       </interceptors>" +
+                                "</beans>"),
+                        "beans.xml");
+        return ShrinkWrap.create(WebArchive.class, simpleName + ".war")
+                .addAsLibrary(jar)
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+    @AfterTest
+    public void cleanUp() {
+        LoggableInterceptor.reset();
+    }
+
+    @Test
+    public void testInterceptorInvoked() throws Exception {
+        String expectedResponse = "GET http://localhost:5017/myBaseUri/hello";
+        assertEquals(client.get(), expectedResponse);
+
+        assertTrue(ClientWithURIAndInterceptor.class.isAssignableFrom(LoggableInterceptor.getInvocationClass()),
+                "Invalid declaring class of the intercepted method. Expected " + ClientWithURIAndInterceptor.class.getName()
+                        + " or a subclass, found: " + LoggableInterceptor.getInvocationClass());
+        assertEquals(LoggableInterceptor.getInvocationMethod(), "get");
+        assertEquals(LoggableInterceptor.getResult(), expectedResponse);
+    }
+
+    @Test
+    public void testInterceptorNotInvokedWhenNoAnnotationApplied() throws Exception {
+        String expectedResponse = "GET http://localhost:5017/myBaseUri/hello";
+        assertEquals(client.getNoInterceptor(), expectedResponse);
+
+        assertNull(LoggableInterceptor.getInvocationClass());
+        assertNull(LoggableInterceptor.getInvocationMethod());
+        assertNull(LoggableInterceptor.getResult());
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java
new file mode 100644
index 0000000000000..236ff6c8cde3a
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java
@@ -0,0 +1,20 @@
+package io.quarkus.tck.restclient.cdi;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.eclipse.microprofile.rest.client.tck.providers.ReturnWithURLRequestFilter;
+
+@Path("/hello")
+@RegisterProvider(ReturnWithURLRequestFilter.class)
+@RegisterRestClient(baseUri = "http://localhost:5017/myBaseUri")
+public interface ClientWithURIAndInterceptor {
+    @GET
+    @Loggable
+    String get();
+
+    @GET
+    String getNoInterceptor();
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java
new file mode 100644
index 0000000000000..f7554a4a3d945
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java
@@ -0,0 +1,17 @@
+package io.quarkus.tck.restclient.cdi;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@InterceptorBinding
+@Target({ METHOD, TYPE })
+@Retention(RUNTIME)
+public @interface Loggable {
+    String value() default "";
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java
new file mode 100644
index 0000000000000..2437dfdebd51f
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java
@@ -0,0 +1,47 @@
+package io.quarkus.tck.restclient.cdi;
+
+import java.lang.reflect.Method;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Loggable
+@Interceptor
+@Priority(Interceptor.Priority.APPLICATION)
+public class LoggableInterceptor {
+
+    private static String invocationMethod;
+    private static Class<?> invocationClass;
+    private static Object result;
+
+    public static String getInvocationMethod() {
+        return invocationMethod;
+    }
+
+    public static Class<?> getInvocationClass() {
+        return invocationClass;
+    }
+
+    public static Object getResult() {
+        return result;
+    }
+
+    public static void reset() {
+        invocationClass = null;
+        invocationMethod = null;
+        result = null;
+    }
+
+    @AroundInvoke
+    public Object logInvocation(InvocationContext ctx) throws Exception {
+        Method m = ctx.getMethod();
+        invocationClass = m.getDeclaringClass();
+        invocationMethod = m.getName();
+
+        Object returnVal = ctx.proceed();
+        result = returnVal;
+        return returnVal;
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest.java
new file mode 100644
index 0000000000000..856a7386e4620
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.InvalidComputeMethodSignature;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        ClientHeaderParamComputeValueSpecifiesMissingMethodTest.class.getSimpleName() + ".war")
+                .addClasses(InvalidComputeMethodSignature.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMissingMethodTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMissingMethodTest.java
new file mode 100644
index 0000000000000..108f6012bad07
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMissingMethodTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingHeaderComputeMethod;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class ClientHeaderParamComputeValueSpecifiesMissingMethodTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        ClientHeaderParamComputeValueSpecifiesMissingMethodTest.class.getSimpleName() + ".war")
+                .addClasses(MissingHeaderComputeMethod.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMismatchedPathParameterTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMismatchedPathParameterTest.java
new file mode 100644
index 0000000000000..4806ffe1aa285
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMismatchedPathParameterTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.TemplateMismatch;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMismatchedPathParameterTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMismatchedPathParameterTest.class.getSimpleName() + ".war")
+                .addClasses(TemplateMismatch.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.java
new file mode 100644
index 0000000000000..7bd4d021064fc
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingPathParamSub;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.class
+                                .getSimpleName() + ".war")
+                .addClasses(MissingPathParamSub.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.java
new file mode 100644
index 0000000000000..b91aa62c19e1a
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingPathParam;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.class
+                                .getSimpleName() + ".war")
+                .addClasses(MissingPathParam.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.java
new file mode 100644
index 0000000000000..01d21547e3422
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHTTPMethodAnnotations;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultipleHTTPMethodAnnotations.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.java
new file mode 100644
index 0000000000000..1eb79386a5cf8
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingUriTemplate;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MissingUriTemplate.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.java
new file mode 100644
index 0000000000000..5d575e591c2e4
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHeadersOnSameInterface;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultipleHeadersOnSameInterface.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.java
new file mode 100644
index 0000000000000..de0e82c376337
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHeadersOnSameMethod;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.class.getSimpleName() + ".war")
+                .addClasses(MultipleHeadersOnSameMethod.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.java
new file mode 100644
index 0000000000000..672da35a99705
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultiValueClientHeaderWithComputeMethodOnInterface;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultiValueClientHeaderWithComputeMethodOnInterface.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.java b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.java
new file mode 100644
index 0000000000000..a4e4e6b52e30b
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultiValueClientHeaderWithComputeMethodOnMethod;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultiValueClientHeaderWithComputeMethodOnMethod.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client-reactive/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/tcks/microprofile-rest-client-reactive/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000000000..9dc06350b2d4e
--- /dev/null
+++ b/tcks/microprofile-rest-client-reactive/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+io.quarkus.tck.restclient.RestClientTckExtension
\ No newline at end of file
diff --git a/tcks/microprofile-rest-client/pom.xml b/tcks/microprofile-rest-client/pom.xml
index fb2573942be82..9b5e964651868 100644
--- a/tcks/microprofile-rest-client/pom.xml
+++ b/tcks/microprofile-rest-client/pom.xml
@@ -63,6 +63,7 @@
                         <configuration>
                             <dir>target/classes</dir>
                             <params>--port=8765 --verbose</params>
+                            <skip>${skipTests}</skip>
                         </configuration>
                     </execution>
                 </executions>
@@ -129,5 +130,59 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jsonp-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java
new file mode 100644
index 0000000000000..4460e7b62a9ea
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/CDIInterceptorTest.java
@@ -0,0 +1,78 @@
+package io.quarkus.tck.restclient.cdi;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.eclipse.microprofile.rest.client.tck.providers.ReturnWithURLRequestFilter;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.Test;
+
+public class CDIInterceptorTest extends Arquillian {
+
+    @Inject
+    @RestClient
+    private ClientWithURIAndInterceptor client;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        String simpleName = CDIInterceptorTest.class.getSimpleName();
+        JavaArchive jar = ShrinkWrap.create(JavaArchive.class, simpleName + ".jar")
+                .addClasses(ClientWithURIAndInterceptor.class,
+                        Loggable.class,
+                        LoggableInterceptor.class,
+                        ReturnWithURLRequestFilter.class)
+                .addAsManifestResource(new StringAsset(
+                        "<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"" +
+                                "       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
+                                "       xsi:schemaLocation=\"" +
+                                "          http://java.sun.com/xml/ns/javaee" +
+                                "          http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\">" +
+                                "       <interceptors>" +
+                                "           <class>io.quarkus.tck.restclient.cdi.LoggableInterceptor</class>"
+                                +
+                                "       </interceptors>" +
+                                "</beans>"),
+                        "beans.xml");
+        return ShrinkWrap.create(WebArchive.class, simpleName + ".war")
+                .addAsLibrary(jar)
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+    @AfterTest
+    public void cleanUp() {
+        LoggableInterceptor.reset();
+    }
+
+    @Test
+    public void testInterceptorInvoked() throws Exception {
+        String expectedResponse = "GET http://localhost:5017/myBaseUri/hello";
+        assertEquals(client.get(), expectedResponse);
+
+        assertTrue(ClientWithURIAndInterceptor.class.isAssignableFrom(LoggableInterceptor.getInvocationClass()),
+                "Invalid declaring class of the intercepted method. Expected " + ClientWithURIAndInterceptor.class.getName()
+                        + " or a subclass, found: " + LoggableInterceptor.getInvocationClass());
+        assertEquals(LoggableInterceptor.getInvocationMethod(), "get");
+        assertEquals(LoggableInterceptor.getResult(), expectedResponse);
+    }
+
+    @Test
+    public void testInterceptorNotInvokedWhenNoAnnotationApplied() throws Exception {
+        String expectedResponse = "GET http://localhost:5017/myBaseUri/hello";
+        assertEquals(client.getNoInterceptor(), expectedResponse);
+
+        assertNull(LoggableInterceptor.getInvocationClass());
+        assertNull(LoggableInterceptor.getInvocationMethod());
+        assertNull(LoggableInterceptor.getResult());
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java
new file mode 100644
index 0000000000000..236ff6c8cde3a
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/ClientWithURIAndInterceptor.java
@@ -0,0 +1,20 @@
+package io.quarkus.tck.restclient.cdi;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.eclipse.microprofile.rest.client.tck.providers.ReturnWithURLRequestFilter;
+
+@Path("/hello")
+@RegisterProvider(ReturnWithURLRequestFilter.class)
+@RegisterRestClient(baseUri = "http://localhost:5017/myBaseUri")
+public interface ClientWithURIAndInterceptor {
+    @GET
+    @Loggable
+    String get();
+
+    @GET
+    String getNoInterceptor();
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java
new file mode 100644
index 0000000000000..f7554a4a3d945
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/Loggable.java
@@ -0,0 +1,17 @@
+package io.quarkus.tck.restclient.cdi;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@InterceptorBinding
+@Target({ METHOD, TYPE })
+@Retention(RUNTIME)
+public @interface Loggable {
+    String value() default "";
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java
new file mode 100644
index 0000000000000..2437dfdebd51f
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/cdi/LoggableInterceptor.java
@@ -0,0 +1,47 @@
+package io.quarkus.tck.restclient.cdi;
+
+import java.lang.reflect.Method;
+
+import javax.annotation.Priority;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Loggable
+@Interceptor
+@Priority(Interceptor.Priority.APPLICATION)
+public class LoggableInterceptor {
+
+    private static String invocationMethod;
+    private static Class<?> invocationClass;
+    private static Object result;
+
+    public static String getInvocationMethod() {
+        return invocationMethod;
+    }
+
+    public static Class<?> getInvocationClass() {
+        return invocationClass;
+    }
+
+    public static Object getResult() {
+        return result;
+    }
+
+    public static void reset() {
+        invocationClass = null;
+        invocationMethod = null;
+        result = null;
+    }
+
+    @AroundInvoke
+    public Object logInvocation(InvocationContext ctx) throws Exception {
+        Method m = ctx.getMethod();
+        invocationClass = m.getDeclaringClass();
+        invocationMethod = m.getName();
+
+        Object returnVal = ctx.proceed();
+        result = returnVal;
+        return returnVal;
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest.java
new file mode 100644
index 0000000000000..856a7386e4620
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.InvalidComputeMethodSignature;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class ClientHeaderParamComputeValueSpecifiesMethodWithInvalidSignatureTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        ClientHeaderParamComputeValueSpecifiesMissingMethodTest.class.getSimpleName() + ".war")
+                .addClasses(InvalidComputeMethodSignature.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMissingMethodTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMissingMethodTest.java
new file mode 100644
index 0000000000000..108f6012bad07
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/ClientHeaderParamComputeValueSpecifiesMissingMethodTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingHeaderComputeMethod;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class ClientHeaderParamComputeValueSpecifiesMissingMethodTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        ClientHeaderParamComputeValueSpecifiesMissingMethodTest.class.getSimpleName() + ".war")
+                .addClasses(MissingHeaderComputeMethod.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMismatchedPathParameterTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMismatchedPathParameterTest.java
new file mode 100644
index 0000000000000..4806ffe1aa285
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMismatchedPathParameterTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.TemplateMismatch;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMismatchedPathParameterTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMismatchedPathParameterTest.class.getSimpleName() + ".war")
+                .addClasses(TemplateMismatch.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.java
new file mode 100644
index 0000000000000..7bd4d021064fc
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingPathParamSub;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtMethodLevelTest.class
+                                .getSimpleName() + ".war")
+                .addClasses(MissingPathParamSub.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.java
new file mode 100644
index 0000000000000..b91aa62c19e1a
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingPathParam;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMissingPathParamAnnotation_templateDeclaredAtTypeLevelTest.class
+                                .getSimpleName() + ".war")
+                .addClasses(MissingPathParam.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.java
new file mode 100644
index 0000000000000..01d21547e3422
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHTTPMethodAnnotations;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithMultipleHTTPMethodAnnotationsTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultipleHTTPMethodAnnotations.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.java
new file mode 100644
index 0000000000000..1eb79386a5cf8
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MissingUriTemplate;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        InterfaceHasMethodWithPathParamAnnotationButNoURITemplateTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MissingUriTemplate.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.java
new file mode 100644
index 0000000000000..5d575e591c2e4
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHeadersOnSameInterface;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleClientHeaderParamsSpecifySameHeaderOnInterfaceTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultipleHeadersOnSameInterface.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.java
new file mode 100644
index 0000000000000..de0e82c376337
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultipleHeadersOnSameMethod;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleClientHeaderParamsSpecifySameHeaderOnMethodTest.class.getSimpleName() + ".war")
+                .addClasses(MultipleHeadersOnSameMethod.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.java
new file mode 100644
index 0000000000000..672da35a99705
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultiValueClientHeaderWithComputeMethodOnInterface;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleHeaderValuesSpecifiedIncludeComputeMethodOnInterfaceTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultiValueClientHeaderWithComputeMethodOnInterface.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.java b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.java
new file mode 100644
index 0000000000000..a4e4e6b52e30b
--- /dev/null
+++ b/tcks/microprofile-rest-client/src/test/java/io/quarkus/tck/restclient/invalid/MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.java
@@ -0,0 +1,27 @@
+package io.quarkus.tck.restclient.invalid;
+
+import org.eclipse.microprofile.rest.client.RestClientDefinitionException;
+import org.eclipse.microprofile.rest.client.tck.interfaces.MultiValueClientHeaderWithComputeMethodOnMethod;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.testng.annotations.Test;
+
+public class MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest {
+    @Deployment
+    @ShouldThrowException(RestClientDefinitionException.class)
+    public static Archive<?> createDeployment() {
+        return ShrinkWrap
+                .create(WebArchive.class,
+                        MultipleHeaderValuesSpecifiedIncludeComputeMethodOnMethodTest.class.getSimpleName()
+                                + ".war")
+                .addClasses(MultiValueClientHeaderWithComputeMethodOnMethod.class);
+    }
+
+    @Test
+    public void shouldNotBeInvoked() {
+
+    }
+}
diff --git a/tcks/pom.xml b/tcks/pom.xml
index 5d3944a997c9a..1e7c29a305609 100644
--- a/tcks/pom.xml
+++ b/tcks/pom.xml
@@ -23,16 +23,42 @@
         <module>microprofile-metrics</module>
         <module>microprofile-reactive-messaging</module>
         <module>microprofile-rest-client</module>
+        <module>microprofile-rest-client-reactive</module>
         <module>microprofile-openapi</module>
         <module>microprofile-opentracing</module>
     </modules>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <enforce-test-deps-scope.skip>true</enforce-test-deps-scope.skip>
     </properties>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-deployment-deps</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requiresMinimalDeploymentDependency implementation="io.quarkus.enforcer.RequiresMinimalDeploymentDependency"/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.quarkus</groupId>
+                        <artifactId>quarkus-enforcer-rules</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
diff --git a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java
index 37439a471680c..faab9e939e313 100644
--- a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java
+++ b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java
@@ -91,6 +91,14 @@ public String setValue(String value) {
         }
     }
 
+    /**
+     * Marshalls input and output as JSON using Jackson
+     *
+     * @param returnType
+     * @param input
+     * @param <T>
+     * @return
+     */
     public static <T> T invoke(Class<T> returnType, Object input) {
         if (problem != null) {
             throw new RuntimeException(problem);
@@ -132,6 +140,54 @@ public String setValue(String value) {
         }
     }
 
+    /**
+     * Takes a json string as input. Unmarshalls return value using Jackson.
+     *
+     * @param returnType
+     * @param json
+     * @param <T>
+     * @return
+     */
+    public static <T> T invokeJson(Class<T> returnType, String json) {
+        if (problem != null) {
+            throw new RuntimeException(problem);
+        }
+        try {
+            final ObjectMapper mapper = getObjectMapper();
+            String id = "aws-request-" + REQUEST_ID_GENERATOR.incrementAndGet();
+            CompletableFuture<String> result = new CompletableFuture<>();
+            REQUESTS.put(id, result);
+            REQUEST_QUEUE.add(new Map.Entry<String, String>() {
+
+                @Override
+                public String getKey() {
+                    return id;
+                }
+
+                @Override
+                public String getValue() {
+                    return json;
+                }
+
+                @Override
+                public String setValue(String value) {
+                    return null;
+                }
+            });
+            String output = result.get();
+            return mapper.readerFor(returnType).readValue(output);
+        } catch (Exception e) {
+            if (e instanceof ExecutionException) {
+                Throwable ex = e.getCause();
+                if (ex instanceof RuntimeException) {
+                    throw (RuntimeException) ex;
+                }
+                throw new RuntimeException(ex);
+            }
+            throw new RuntimeException(e);
+        }
+    }
+
     private static ObjectMapper getObjectMapper() {
         ArcContainer container = Arc.container();
         if (container == null) {
diff --git a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java
index 1ae03daefd9ea..73278d9e3bdbb 100644
--- a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java
+++ b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -14,6 +15,7 @@
 import io.quarkus.amazon.lambda.runtime.FunctionError;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 import io.undertow.Undertow;
+import io.undertow.httpcore.StatusCodes;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.server.RoutingHandler;
@@ -21,27 +23,38 @@
 
 public class LambdaResourceManager implements QuarkusTestResourceLifecycleManager {
 
+    private volatile boolean started = false;
     private volatile Undertow undertow;
+    private final AtomicInteger currentPollCount = new AtomicInteger();
 
     public static final int PORT = Integer.getInteger("quarkus-internal.aws-lambda.test-port", 5387);
 
     @Override
     public Map<String, String> start() {
-
+        started = true;
         RoutingHandler routingHandler = new RoutingHandler(true);
         routingHandler.add("GET", AmazonLambdaApi.API_PATH_INVOCATION_NEXT, new HttpHandler() {
             @Override
             public void handleRequest(HttpServerExchange exchange) throws Exception {
-                LambdaStartedNotifier.started = true;
-                Map.Entry<String, String> req = null;
-                while (req == null) {
-                    req = LambdaClient.REQUEST_QUEUE.poll(100, TimeUnit.MILLISECONDS);
-                    if (undertow == null || undertow.getWorker() == null || undertow.getWorker().isShutdown()) {
-                        return;
+                currentPollCount.incrementAndGet();
+                try {
+                    LambdaStartedNotifier.started = true;
+                    Map.Entry<String, String> req = null;
+                    while (req == null) {
+                        req = LambdaClient.REQUEST_QUEUE.poll(100, TimeUnit.MILLISECONDS);
+                        if (!started || undertow == null || undertow.getWorker() == null || undertow.getWorker().isShutdown()) {
+                            exchange.setStatusCode(StatusCodes.SERVICE_UNAVAILABLE);
+                            exchange.setPersistent(false);
+                            exchange.getOutputStream().close();
+                            return;
+                        }
                     }
+                    exchange.addResponseHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, req.getKey());
+                    exchange.getOutputStream().write(req.getValue().getBytes(StandardCharsets.UTF_8));
+                    exchange.getOutputStream().close();
+                } finally {
+                    currentPollCount.decrementAndGet();
                 }
-                exchange.addResponseHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, req.getKey());
-                exchange.writeAsync(req.getValue());
             }
         });
         routingHandler.add("POST", AmazonLambdaApi.API_PATH_INVOCATION + "{req}" + AmazonLambdaApi.API_PATH_RESPONSE,
@@ -117,6 +130,16 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
 
     @Override
     public void stop() {
+        started = false;
+        while (currentPollCount.get() > 0) {
+            try {
+                //wait for all the responses to be sent
+                //before we shutdown
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
         if (undertow == null)
             return;
         undertow.stop();
diff --git a/test-framework/arquillian/pom.xml b/test-framework/arquillian/pom.xml
index f463be5cbd329..187de40785bcf 100644
--- a/test-framework/arquillian/pom.xml
+++ b/test-framework/arquillian/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-arquillian</artifactId>
diff --git a/test-framework/arquillian/src/main/java/io/quarkus/arquillian/QuarkusTestNgCallbacks.java b/test-framework/arquillian/src/main/java/io/quarkus/arquillian/QuarkusTestNgCallbacks.java
index fc54ec1335bcf..ef83fafa1d922 100644
--- a/test-framework/arquillian/src/main/java/io/quarkus/arquillian/QuarkusTestNgCallbacks.java
+++ b/test-framework/arquillian/src/main/java/io/quarkus/arquillian/QuarkusTestNgCallbacks.java
@@ -4,7 +4,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.testng.annotations.AfterClass;
@@ -93,7 +92,11 @@ static void invokeTestNgBeforeMethods(Object testInstance)
     }
 
     private static void collectCallbacks(Class<?> testClass, List<Method> callbacks, Class<? extends Annotation> annotation) {
-        Arrays.stream(testClass.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(annotation)).forEach(callbacks::add);
+        for (Method m : testClass.getDeclaredMethods()) {
+            if (m.isAnnotationPresent(annotation)) {
+                addIfNotPresent(callbacks, m);
+            }
+        }
         Class<?> superClass = testClass.getSuperclass();
         if (superClass != null && !superClass.equals(Object.class) &&
         // TestNG Arq. superclass uses lifecycle methods as well, we don't want to pick up those
@@ -101,4 +104,18 @@ private static void collectCallbacks(Class<?> testClass, List<Method> callbacks,
             collectCallbacks(superClass, callbacks, annotation);
         }
     }
+
+    private static boolean addIfNotPresent(List<Method> callbacks, Method candidateMethod) {
+        if (callbacks.isEmpty()) {
+            return callbacks.add(candidateMethod);
+        }
+        for (Method m : callbacks) {
+            // NOTE - this only checks method name and param count, not actual param values
+            if (m.getName().equals(candidateMethod.getName())
+                    && m.getParameterCount() == candidateMethod.getParameterCount()) {
+                return false;
+            }
+        }
+        return callbacks.add(candidateMethod);
+    }
 }
diff --git a/test-framework/common/pom.xml b/test-framework/common/pom.xml
index 5a6c925b68ee2..f88c88f89a4c3 100644
--- a/test-framework/common/pom.xml
+++ b/test-framework/common/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-test-common</artifactId>
diff --git a/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java b/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java
new file mode 100644
index 0000000000000..8359b584bf312
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/TestTransaction.java
@@ -0,0 +1,21 @@
+package io.quarkus.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * Indicates that this method should be run in a rollback only transaction.
+ *
+ * This allows the test method to modify the database as required, and then have
+ * these changes reverted at the end of the method.
+ *
+ */
+@InterceptorBinding
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+public @interface TestTransaction {
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java
new file mode 100644
index 0000000000000..4aebcc470c9d2
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java
@@ -0,0 +1,14 @@
+package io.quarkus.test.common;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+
+public interface ArtifactLauncher extends Closeable {
+
+    void start() throws IOException;
+
+    void addSystemProperties(Map<String, String> systemProps);
+
+    boolean listensOnSsl();
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DockerContainerLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DockerContainerLauncher.java
new file mode 100644
index 0000000000000..2abaeb5c750c3
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/DockerContainerLauncher.java
@@ -0,0 +1,126 @@
+package io.quarkus.test.common;
+
+import static io.quarkus.test.common.LauncherUtil.installAndGetSomeConfig;
+import static io.quarkus.test.common.LauncherUtil.updateConfigForPort;
+import static io.quarkus.test.common.LauncherUtil.waitForCapturedListeningData;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+import org.eclipse.microprofile.config.Config;
+
+import io.quarkus.test.common.http.TestHTTPResourceManager;
+
+public class DockerContainerLauncher implements ArtifactLauncher {
+
+    private static final int DEFAULT_PORT = 8081;
+    private static final int DEFAULT_HTTPS_PORT = 8444;
+    private static final long DEFAULT_WAIT_TIME = 60;
+
+    private final String containerImage;
+    private final String profile;
+    private Process quarkusProcess;
+    private final int httpPort;
+    private final int httpsPort;
+    private final long jarWaitTime;
+    private final Map<String, String> systemProps = new HashMap<>();
+
+    private boolean isSsl;
+
+    private DockerContainerLauncher(String containerImage, Config config) {
+        this(containerImage,
+                config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT),
+                config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
+                config.getValue("quarkus.test.jar-wait-time", OptionalLong.class).orElse(DEFAULT_WAIT_TIME),
+                config.getOptionalValue("quarkus.test.native-image-profile", String.class)
+                        .orElse(null));
+    }
+
+    public DockerContainerLauncher(String containerImage) {
+        this(containerImage, installAndGetSomeConfig());
+    }
+
+    public DockerContainerLauncher(String containerImage, int httpPort, int httpsPort, long jarWaitTime, String profile) {
+        this.containerImage = containerImage;
+        this.httpPort = httpPort;
+        this.httpsPort = httpsPort;
+        this.jarWaitTime = jarWaitTime;
+        this.profile = profile;
+    }
+
+    public void start() throws IOException {
+
+        System.setProperty("test.url", TestHTTPResourceManager.getUri());
+
+        List<String> args = new ArrayList<>();
+        args.add("docker"); // TODO: determine this dynamically?
+        args.add("run");
+        args.add("--rm");
+        args.add("-p");
+        args.add(httpPort + ":" + httpPort);
+        args.add("-p");
+        args.add(httpsPort + ":" + httpsPort);
+        args.addAll(toEnvVar("quarkus.http.port", "" + httpPort));
+        args.addAll(toEnvVar("quarkus.http.ssl-port", "" + httpsPort));
+        // this won't be correct when using the random port but it's really only used by us for the rest client tests
+        // in the main module, since those tests hit the application itself
+        args.addAll(toEnvVar("test.url", TestHTTPResourceManager.getUri()));
+        if (profile != null) {
+            args.addAll(toEnvVar("quarkus.profile", profile));
+        }
+
+        for (Map.Entry<String, String> e : systemProps.entrySet()) {
+            args.addAll(toEnvVar(e.getKey(), e.getValue()));
+        }
+        args.add(containerImage);
+
+        Path logFile = PropertyTestUtil.getLogFilePath();
+        Files.deleteIfExists(logFile);
+
+        System.out.println("Executing " + args);
+
+        // the idea here is to obtain the logs of the application simply by redirecting all its output the a file
+        // this is done in contrast with the JarLauncher and NativeImageLauncher because in the case of the container
+        // the log itself is written inside the container
+        quarkusProcess = new ProcessBuilder(args).redirectError(logFile.toFile()).redirectOutput(logFile.toFile()).start();
+
+        ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, jarWaitTime);
+        updateConfigForPort(result.getPort());
+        isSsl = result.isSsl();
+    }
+
+    public boolean listensOnSsl() {
+        return isSsl;
+    }
+
+    public void addSystemProperties(Map<String, String> systemProps) {
+        this.systemProps.putAll(systemProps);
+    }
+
+    private List<String> toEnvVar(String property, String value) {
+        if ((property != null) && (!property.isEmpty())) {
+            List<String> result = new ArrayList<>(2);
+            result.add("--env");
+            result.add(String.format("%s=%s", convertPropertyToEnVar(property), value));
+            return result;
+        }
+        return Collections.emptyList();
+    }
+
+    private String convertPropertyToEnVar(String property) {
+        return property.toUpperCase().replace('-', '_').replace('.', '_');
+    }
+
+    @Override
+    public void close() {
+        quarkusProcess.destroy();
+    }
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/JarLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/JarLauncher.java
new file mode 100644
index 0000000000000..76d81536c50db
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/JarLauncher.java
@@ -0,0 +1,102 @@
+package io.quarkus.test.common;
+
+import static io.quarkus.test.common.LauncherUtil.installAndGetSomeConfig;
+import static io.quarkus.test.common.LauncherUtil.updateConfigForPort;
+import static io.quarkus.test.common.LauncherUtil.waitForCapturedListeningData;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+import org.eclipse.microprofile.config.Config;
+
+import io.quarkus.test.common.http.TestHTTPResourceManager;
+
+public class JarLauncher implements ArtifactLauncher {
+
+    private static final int DEFAULT_PORT = 8081;
+    private static final int DEFAULT_HTTPS_PORT = 8444;
+    private static final long DEFAULT_JAR_WAIT_TIME = 60;
+
+    private final Path jarPath;
+    private final String profile;
+    private Process quarkusProcess;
+    private final int httpPort;
+    private final int httpsPort;
+    private final long jarWaitTime;
+    private final Map<String, String> systemProps = new HashMap<>();
+
+    private boolean isSsl;
+
+    private JarLauncher(Path jarPath, Config config) {
+        this(jarPath,
+                config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT),
+                config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
+                config.getValue("quarkus.test.jar-wait-time", OptionalLong.class).orElse(DEFAULT_JAR_WAIT_TIME),
+                config.getOptionalValue("quarkus.test.native-image-profile", String.class)
+                        .orElse(null));
+    }
+
+    public JarLauncher(Path jarPath) {
+        this(jarPath, installAndGetSomeConfig());
+    }
+
+    public JarLauncher(Path jarPath, int httpPort, int httpsPort, long jarWaitTime, String profile) {
+        this.jarPath = jarPath;
+        this.httpPort = httpPort;
+        this.httpsPort = httpsPort;
+        this.jarWaitTime = jarWaitTime;
+        this.profile = profile;
+    }
+
+    public void start() throws IOException {
+
+        System.setProperty("test.url", TestHTTPResourceManager.getUri());
+
+        List<String> args = new ArrayList<>();
+        args.add("java");
+        args.add("-Dquarkus.http.port=" + httpPort);
+        args.add("-Dquarkus.http.ssl-port=" + httpsPort);
+        // this won't be correct when using the random port but it's really only used by us for the rest client tests
+        // in the main module, since those tests hit the application itself
+        args.add("-Dtest.url=" + TestHTTPResourceManager.getUri());
+        Path logFile = PropertyTestUtil.getLogFilePath();
+        args.add("-Dquarkus.log.file.path=" + logFile.toAbsolutePath().toString());
+        args.add("-Dquarkus.log.file.enable=true");
+        if (profile != null) {
+            args.add("-Dquarkus.profile=" + profile);
+        }
+        for (Map.Entry<String, String> e : systemProps.entrySet()) {
+            args.add("-D" + e.getKey() + "=" + e.getValue());
+        }
+        args.add("-jar");
+        args.add(jarPath.toAbsolutePath().toString());
+
+        System.out.println("Executing " + args);
+
+        Files.deleteIfExists(logFile);
+        quarkusProcess = LauncherUtil.launchProcess(args);
+        ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, jarWaitTime);
+        updateConfigForPort(result.getPort());
+        isSsl = result.isSsl();
+    }
+
+    public boolean listensOnSsl() {
+        return isSsl;
+    }
+
+    public void addSystemProperties(Map<String, String> systemProps) {
+        this.systemProps.putAll(systemProps);
+    }
+
+    @Override
+    public void close() {
+        quarkusProcess.destroy();
+    }
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java b/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java
new file mode 100644
index 0000000000000..f19501ac07be7
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java
@@ -0,0 +1,208 @@
+package io.quarkus.test.common;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+
+import io.quarkus.runtime.configuration.ConfigUtils;
+import io.quarkus.runtime.configuration.QuarkusConfigFactory;
+import io.quarkus.test.common.http.TestHTTPResourceManager;
+import io.smallrye.config.SmallRyeConfig;
+
+final class LauncherUtil {
+
+    private LauncherUtil() {
+    }
+
+    static Config installAndGetSomeConfig() {
+        final SmallRyeConfig config = ConfigUtils.configBuilder(false).build();
+        QuarkusConfigFactory.setConfig(config);
+        final ConfigProviderResolver cpr = ConfigProviderResolver.instance();
+        try {
+            final Config installed = cpr.getConfig();
+            if (installed != config) {
+                cpr.releaseConfig(installed);
+            }
+        } catch (IllegalStateException ignored) {
+        }
+        return config;
+    }
+
+    /**
+     * Launches a process using the supplied arguments and makes sure the process's output is drained to standard out
+     */
+    static Process launchProcess(List<String> args) throws IOException {
+        Process process = Runtime.getRuntime().exec(args.toArray(new String[0]));
+        new Thread(new ProcessReader(process.getInputStream())).start();
+        new Thread(new ProcessReader(process.getErrorStream())).start();
+        return process;
+    }
+
+    /**
+     * Waits (for a maximum of {@param waitTimeSeconds} seconds) until the launched process indicates the address it is
+     * listening on.
+     * If the wait time is exceeded an {@code IllegalStateException} is thrown.
+     */
+    static ListeningAddress waitForCapturedListeningData(Process quarkusProcess, Path logFile, long waitTimeSeconds) {
+        CountDownLatch signal = new CountDownLatch(1);
+        AtomicReference<ListeningAddress> resultReference = new AtomicReference<>();
+        CaptureListeningDataReader captureListeningDataReader = new CaptureListeningDataReader(logFile,
+                Duration.ofSeconds(waitTimeSeconds), signal, resultReference);
+        new Thread(captureListeningDataReader, "capture-listening-data").start();
+        try {
+            signal.await(10, TimeUnit.SECONDS);
+            ListeningAddress result = resultReference.get();
+            if (result != null) {
+                return result;
+            }
+            quarkusProcess.destroyForcibly();
+            throw new IllegalStateException(
+                    "Unable to determine the status of the running process. See the above logs for details");
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Interrupted while waiting to capture listening process port and protocol");
+        }
+    }
+
+    /**
+     * Updates the configuration necessary to make all test systems knowledgeable about the port on which the launched
+     * process is listening
+     */
+    static void updateConfigForPort(Integer effectivePort) {
+        System.setProperty("quarkus.http.port", effectivePort.toString()); //set the port as a system property in order to have it applied to Config
+        System.setProperty("quarkus.http.test-port", effectivePort.toString()); // needed for RestAssuredManager
+        installAndGetSomeConfig(); // reinitialize the configuration to make sure the actual port is used
+        System.setProperty("test.url", TestHTTPResourceManager.getUri());
+    }
+
+    /**
+     * Thread that reads a process output file looking for the line that indicates the address the application
+     * is listening on.
+     */
+    private static class CaptureListeningDataReader implements Runnable {
+
+        private final Path processOutput;
+        private final Duration waitTime;
+        private final CountDownLatch signal;
+        private final AtomicReference<ListeningAddress> resultReference;
+        private final Pattern listeningRegex = Pattern.compile("Listening on:\\s+(https?)://\\S*:(\\d+)");
+
+        public CaptureListeningDataReader(Path processOutput, Duration waitTime, CountDownLatch signal,
+                AtomicReference<ListeningAddress> resultReference) {
+            this.processOutput = processOutput;
+            this.waitTime = waitTime;
+            this.signal = signal;
+            this.resultReference = resultReference;
+        }
+
+        @Override
+        public void run() {
+            if (!ensureProcessOutputFileExists()) {
+                return;
+            }
+
+            long bailoutTime = System.currentTimeMillis() + waitTime.toMillis();
+            try (BufferedReader reader = new BufferedReader(new FileReader(processOutput.toFile()))) {
+                while (true) {
+                    if (reader.ready()) { // avoid blocking as the input is a file which continually gets more data added
+                        String line = reader.readLine();
+                        Matcher regexMatcher = listeningRegex.matcher(line);
+                        if (regexMatcher.find()) {
+                            dataDetermined(regexMatcher.group(1), Integer.valueOf(regexMatcher.group(2)));
+                            return;
+                        } else {
+                            if (line.contains("Failed to start application (with profile")) {
+                                unableToDetermineData("Application was not started: " + line);
+                                return;
+                            }
+                        }
+                    } else {
+                        //wait until there is more of the file for us to read
+                        try {
+                            Thread.sleep(500);
+                        } catch (InterruptedException e) {
+                            unableToDetermineData(
+                                    "Thread interrupted while waiting for more data to become available in proccess output file: "
+                                            + processOutput.toAbsolutePath().toString());
+                            return;
+                        }
+                        if (System.currentTimeMillis() > bailoutTime) {
+                            unableToDetermineData("Waited " + waitTime.getSeconds() + "seconds for " + processOutput
+                                    + " to contain info about the listening port and protocol but no such info was found");
+                            return;
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                unableToDetermineData("Exception occurred while reading process output from file " + processOutput);
+                e.printStackTrace();
+            }
+        }
+
+        private boolean ensureProcessOutputFileExists() {
+            int i = 0;
+            while (i++ < 25) {
+                if (Files.exists(processOutput)) {
+                    return true;
+                } else {
+                    try {
+                        Thread.sleep(200);
+                    } catch (InterruptedException e) {
+                        unableToDetermineData("Thread interrupted while waiting for process output file to be created");
+                        return false;
+                    }
+                }
+            }
+            return false;
+        }
+
+        private void dataDetermined(String protocolValue, Integer portValue) {
+            this.resultReference.set(new ListeningAddress(portValue, protocolValue));
+            signal.countDown();
+        }
+
+        private void unableToDetermineData(String errorMessage) {
+            System.err.println(errorMessage);
+            this.resultReference.set(null);
+            signal.countDown();
+        }
+    }
+
+    /**
+     * Used to drain the input of a launched process
+     */
+    private static class ProcessReader implements Runnable {
+
+        private final InputStream inputStream;
+
+        private ProcessReader(InputStream inputStream) {
+            this.inputStream = inputStream;
+        }
+
+        @Override
+        public void run() {
+            byte[] b = new byte[100];
+            int i;
+            try {
+                while ((i = inputStream.read(b)) > 0) {
+                    System.out.print(new String(b, 0, i, StandardCharsets.UTF_8));
+                }
+            } catch (IOException e) {
+                //ignore
+            }
+        }
+    }
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/ListeningAddress.java b/test-framework/common/src/main/java/io/quarkus/test/common/ListeningAddress.java
new file mode 100644
index 0000000000000..f06b7a2256ba4
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/ListeningAddress.java
@@ -0,0 +1,23 @@
+package io.quarkus.test.common;
+
+public class ListeningAddress {
+    private final Integer port;
+    private final String protocol;
+
+    public ListeningAddress(Integer port, String protocol) {
+        this.port = port;
+        this.protocol = protocol;
+    }
+
+    public Integer getPort() {
+        return port;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public boolean isSsl() {
+        return "https".equals(protocol);
+    }
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/NativeImageLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/NativeImageLauncher.java
index a2e9da66e31c7..ea534273940ec 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/NativeImageLauncher.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/NativeImageLauncher.java
@@ -1,14 +1,15 @@
 package io.quarkus.test.common;
 
-import java.io.Closeable;
+import static io.quarkus.test.common.LauncherUtil.installAndGetSomeConfig;
+import static io.quarkus.test.common.LauncherUtil.updateConfigForPort;
+import static io.quarkus.test.common.LauncherUtil.waitForCapturedListeningData;
+
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.CodeSource;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,16 +19,13 @@
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.ServiceLoader;
+import java.util.function.Supplier;
 
 import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 
-import io.quarkus.runtime.configuration.ConfigUtils;
-import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 import io.quarkus.test.common.http.TestHTTPResourceManager;
-import io.smallrye.config.SmallRyeConfig;
 
-public class NativeImageLauncher implements Closeable {
+public class NativeImageLauncher implements ArtifactLauncher {
 
     private static final int DEFAULT_PORT = 8081;
     private static final int DEFAULT_HTTPS_PORT = 8444;
@@ -38,11 +36,13 @@ public class NativeImageLauncher implements Closeable {
     private final Class<?> testClass;
     private final String profile;
     private Process quarkusProcess;
-    private final int port;
+    private final int httpPort;
     private final int httpsPort;
-    private final long imageWaitTime;
+    private final long waitTimeSeconds;
     private final Map<String, String> systemProps = new HashMap<>();
-    private List<NativeImageStartedNotifier> startedNotifiers;
+    private Supplier<Boolean> startedSupplier = null;
+
+    private boolean isSsl;
 
     private NativeImageLauncher(Class<?> testClass, Config config) {
         this(testClass,
@@ -58,35 +58,30 @@ public NativeImageLauncher(Class<?> testClass) {
         this(testClass, installAndGetSomeConfig());
     }
 
-    private static Config installAndGetSomeConfig() {
-        final SmallRyeConfig config = ConfigUtils.configBuilder(false).build();
-        QuarkusConfigFactory.setConfig(config);
-        final ConfigProviderResolver cpr = ConfigProviderResolver.instance();
-        try {
-            final Config installed = cpr.getConfig();
-            if (installed != config) {
-                cpr.releaseConfig(installed);
-            }
-        } catch (IllegalStateException ignored) {
-        }
-        return config;
-    }
-
-    public NativeImageLauncher(Class<?> testClass, int port, int httpsPort, long imageWaitTime, String profile) {
+    public NativeImageLauncher(Class<?> testClass, int httpPort, int httpsPort, long waitTimeSeconds, String profile) {
         this.testClass = testClass;
-        this.port = port;
+        this.httpPort = httpPort;
         this.httpsPort = httpsPort;
-        this.imageWaitTime = imageWaitTime;
+        this.waitTimeSeconds = waitTimeSeconds;
         List<NativeImageStartedNotifier> startedNotifiers = new ArrayList<>();
         for (NativeImageStartedNotifier i : ServiceLoader.load(NativeImageStartedNotifier.class)) {
             startedNotifiers.add(i);
         }
-        this.startedNotifiers = startedNotifiers;
         this.profile = profile;
+        if (!startedNotifiers.isEmpty()) {
+            this.startedSupplier = () -> {
+                for (NativeImageStartedNotifier i : startedNotifiers) {
+                    if (i.isNativeImageStarted()) {
+                        return true;
+                    }
+                }
+                return false;
+            };
+        }
+
     }
 
     public void start() throws IOException {
-
         System.setProperty("test.url", TestHTTPResourceManager.getUri());
 
         String path = System.getProperty("native.image.path");
@@ -95,10 +90,14 @@ public void start() throws IOException {
         }
         List<String> args = new ArrayList<>();
         args.add(path);
-        args.add("-Dquarkus.http.port=" + port);
+        args.add("-Dquarkus.http.port=" + httpPort);
         args.add("-Dquarkus.http.ssl-port=" + httpsPort);
+        // this won't be correct when using the random port but it's really only used by us for the rest client tests
+        // in the main module, since those tests hit the application itself
         args.add("-Dtest.url=" + TestHTTPResourceManager.getUri());
-        args.add("-Dquarkus.log.file.path=" + PropertyTestUtil.getLogFileLocation());
+        Path logFile = PropertyTestUtil.getLogFilePath();
+        args.add("-Dquarkus.log.file.path=" + logFile.toAbsolutePath().toString());
+        args.add("-Dquarkus.log.file.enable=true");
         if (profile != null) {
             args.add("-Dquarkus.profile=" + profile);
         }
@@ -108,11 +107,40 @@ public void start() throws IOException {
 
         System.out.println("Executing " + args);
 
-        quarkusProcess = Runtime.getRuntime().exec(args.toArray(new String[args.size()]));
-        new Thread(new ProcessReader(quarkusProcess.getInputStream())).start();
-        new Thread(new ProcessReader(quarkusProcess.getErrorStream())).start();
+        Files.deleteIfExists(logFile);
+        quarkusProcess = LauncherUtil.launchProcess(args);
 
-        waitForQuarkus();
+        if (startedSupplier != null) {
+            waitForStartedSupplier(quarkusProcess, startedSupplier, waitTimeSeconds);
+        } else {
+            ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds);
+            updateConfigForPort(result.getPort());
+            isSsl = result.isSsl();
+        }
+    }
+
+    private void waitForStartedSupplier(Process quarkusProcess, Supplier<Boolean> startedSupplier, long waitTime) {
+        long bailout = System.currentTimeMillis() + waitTime * 1000;
+        boolean started = false;
+        while (System.currentTimeMillis() < bailout) {
+            if (!quarkusProcess.isAlive()) {
+                throw new RuntimeException("Failed to start target quarkus application, process has exited");
+            }
+            try {
+                Thread.sleep(100);
+                if (startedSupplier.get()) {
+                    isSsl = false;
+                    started = true;
+                    break;
+                }
+            } catch (Exception ignored) {
+
+            }
+        }
+        if (!started) {
+            quarkusProcess.destroyForcibly();
+            throw new RuntimeException("Unable to start target quarkus application " + this.waitTimeSeconds + "s");
+        }
     }
 
     private static String guessPath(Class<?> testClass) {
@@ -198,57 +226,14 @@ private static void logGuessedPath(String guessedPath) {
         System.err.println("======================================================================================");
     }
 
-    private void waitForQuarkus() {
-        long bailout = System.currentTimeMillis() + imageWaitTime * 1000;
-
-        while (System.currentTimeMillis() < bailout) {
-            if (!quarkusProcess.isAlive()) {
-                throw new RuntimeException("Failed to start native image, process has exited");
-            }
-            try {
-                Thread.sleep(100);
-                for (NativeImageStartedNotifier i : startedNotifiers) {
-                    if (i.isNativeImageStarted()) {
-                        return;
-                    }
-                }
-                try (Socket s = new Socket()) {
-                    s.connect(new InetSocketAddress("localhost", port));
-                    return;
-                }
-            } catch (Exception expected) {
-            }
-        }
-
-        throw new RuntimeException("Unable to start native image in " + imageWaitTime + "s");
+    public boolean listensOnSsl() {
+        return isSsl;
     }
 
     public void addSystemProperties(Map<String, String> systemProps) {
         this.systemProps.putAll(systemProps);
     }
 
-    private static final class ProcessReader implements Runnable {
-
-        private final InputStream inputStream;
-
-        private ProcessReader(InputStream inputStream) {
-            this.inputStream = inputStream;
-        }
-
-        @Override
-        public void run() {
-            byte[] b = new byte[100];
-            int i;
-            try {
-                while ((i = inputStream.read(b)) > 0) {
-                    System.out.print(new String(b, 0, i, StandardCharsets.UTF_8));
-                }
-            } catch (IOException e) {
-                //ignore
-            }
-        }
-    }
-
     @Override
     public void close() {
         quarkusProcess.destroy();
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java b/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java
index ded07182a3925..16f3b7b4ee18f 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/PathTestHelper.java
@@ -9,7 +9,9 @@
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Stream;
 
+import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.runtime.util.ClassPathUtils;
 
 /**
@@ -17,39 +19,102 @@
  */
 public final class PathTestHelper {
     private static final Map<String, String> TEST_TO_MAIN_DIR_FRAGMENTS = new HashMap<>();
+
     static {
-        // eclipse
+        //region Eclipse
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "bin" + File.separator + "test",
                 "bin" + File.separator + "main");
-        // idea
+        //endregion
+
+        //region Idea
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "out" + File.separator + "test",
                 "out" + File.separator + "production");
-        // gradle
+        //endregion
+
+        // region Gradle
+        // region Java
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "classes" + File.separator + "java" + File.separator + "native-test",
                 "classes" + File.separator + "java" + File.separator + "main");
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "classes" + File.separator + "java" + File.separator + "test",
                 "classes" + File.separator + "java" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "java" + File.separator + "integration-test",
+                "classes" + File.separator + "java" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "java" + File.separator + "integrationTest",
+                "classes" + File.separator + "java" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "java" + File.separator + "native-integrationTest",
+                "classes" + File.separator + "java" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "java" + File.separator + "native-integration-test",
+                "classes" + File.separator + "java" + File.separator + "main");
+        //endregion
+        //region Kotlin
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "classes" + File.separator + "kotlin" + File.separator + "native-test",
                 "classes" + File.separator + "kotlin" + File.separator + "main");
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "classes" + File.separator + "kotlin" + File.separator + "test",
                 "classes" + File.separator + "kotlin" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "kotlin" + File.separator + "integration-test",
+                "classes" + File.separator + "kotlin" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "kotlin" + File.separator + "integrationTest",
+                "classes" + File.separator + "kotlin" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "kotlin" + File.separator + "native-integrationTest",
+                "classes" + File.separator + "kotlin" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "kotlin" + File.separator + "native-integration-test",
+                "classes" + File.separator + "kotlin" + File.separator + "main");
+        //endregion
+        //region Scala
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "classes" + File.separator + "scala" + File.separator + "native-test",
                 "classes" + File.separator + "scala" + File.separator + "main");
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 "classes" + File.separator + "scala" + File.separator + "test",
                 "classes" + File.separator + "scala" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "scala" + File.separator + "integration-test",
+                "classes" + File.separator + "scala" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "scala" + File.separator + "integrationTest",
+                "classes" + File.separator + "scala" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "scala" + File.separator + "native-integrationTest",
+                "classes" + File.separator + "scala" + File.separator + "main");
+        TEST_TO_MAIN_DIR_FRAGMENTS.put(
+                "classes" + File.separator + "scala" + File.separator + "native-integration-test",
+                "classes" + File.separator + "scala" + File.separator + "main");
+        //endregion
+        //endregion
 
-        // maven
+        //region Maven
         TEST_TO_MAIN_DIR_FRAGMENTS.put(
                 File.separator + "test-classes",
                 File.separator + "classes");
+        //endregion
+
+        String mappings = System.getenv(BootstrapConstants.TEST_TO_MAIN_MAPPINGS);
+        if (mappings != null) {
+            Stream.of(mappings.split(","))
+                    .filter(s -> !s.isEmpty())
+                    .forEach(s -> {
+                        String[] entry = s.split(":");
+                        if (entry.length == 2) {
+                            TEST_TO_MAIN_DIR_FRAGMENTS.put(entry[0], entry[1]);
+                        } else {
+                            throw new IllegalStateException("Unable to parse additional test-to-main mapping: " + s);
+                        }
+                    });
+        }
     }
 
     private PathTestHelper() {
@@ -115,7 +180,16 @@ public static Path getAppClassLocationForTestLocation(String testClassLocation)
         }
         return TEST_TO_MAIN_DIR_FRAGMENTS.entrySet().stream()
                 .filter(e -> testClassLocation.contains(e.getKey()))
-                .map(e -> Paths.get(testClassLocation.replace(e.getKey(), e.getValue())))
+                .map(e -> {
+                    // we should replace only the last occurrence of the fragment
+                    final int i = testClassLocation.lastIndexOf(e.getKey());
+                    final StringBuilder buf = new StringBuilder(testClassLocation.length());
+                    buf.append(testClassLocation.substring(0, i)).append(e.getValue());
+                    if (i + e.getKey().length() + 1 < testClassLocation.length()) {
+                        buf.append(testClassLocation.substring(i + e.getKey().length()));
+                    }
+                    return Paths.get(buf.toString());
+                })
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException("Unable to translate path for " + testClassLocation));
     }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java b/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java
index 88d1e29f3c877..18366b7860861 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java
@@ -2,7 +2,10 @@
 
 import java.io.File;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
 
 import io.quarkus.runtime.logging.FileConfig;
 
@@ -19,13 +22,33 @@ public static void setLogFileProperty(String logFileName) {
     }
 
     public static String getLogFileLocation() {
-        return getLogFileLocation(System.getProperty(LOG_FILE_PATH_PROPERTY, FileConfig.DEFAULT_LOG_FILE_NAME));
+        return getLogFileLocation(getLogFinalName());
+    }
+
+    private static String getLogFinalName() {
+        return System.getProperty(LOG_FILE_PATH_PROPERTY, FileConfig.DEFAULT_LOG_FILE_NAME);
+    }
+
+    public static Path getLogFilePath() {
+        List<String> logFileLocationParts = getLogFileLocationParts(getLogFinalName());
+        if (logFileLocationParts.isEmpty()) {
+            throw new IllegalStateException("Unable to determine log file path");
+        } else if (logFileLocationParts.size() == 1) {
+            return Paths.get(logFileLocationParts.get(0));
+        } else {
+            return Paths.get(logFileLocationParts.get(0),
+                    logFileLocationParts.subList(1, logFileLocationParts.size()).toArray(new String[0]));
+        }
     }
 
     private static String getLogFileLocation(String logFileName) {
+        return String.join(File.separator, getLogFileLocationParts(logFileName));
+    }
+
+    private static List<String> getLogFileLocationParts(String logFileName) {
         if (Files.isDirectory(Paths.get("build"))) {
-            return "build" + File.separator + logFileName;
+            return Arrays.asList("build", logFileName);
         }
-        return "target" + File.separator + logFileName;
+        return Arrays.asList("target", logFileName);
     }
 }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java b/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java
index 6b7d581697a45..a439aff41d39b 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java
@@ -37,6 +37,18 @@
      */
     ResourceArg[] initArgs() default {};
 
+    /**
+     * Whether this test resource is to be started in parallel (concurrently) along with others also marked as parallel
+     */
+    boolean parallel() default false;
+
+    /**
+     * Whether this annotation should only be enabled if it is placed on the currently running test class or test profile.
+     * Note that this defaults to true for meta-annotations since meta-annotations are only considered
+     * for the current test class or test profile.
+     */
+    boolean restrictToAnnotatedClass() default false;
+
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.RUNTIME)
     @Documented
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResourceConfigurableLifecycleManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResourceConfigurableLifecycleManager.java
new file mode 100644
index 0000000000000..9b082629b62be
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResourceConfigurableLifecycleManager.java
@@ -0,0 +1,9 @@
+package io.quarkus.test.common;
+
+import java.lang.annotation.Annotation;
+
+public interface QuarkusTestResourceConfigurableLifecycleManager<ConfigAnnotation extends Annotation>
+        extends QuarkusTestResourceLifecycleManager {
+    default void init(ConfigAnnotation annotation) {
+    }
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java
index 76baef2066f38..7eb3bf5a59184 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java
@@ -1,12 +1,14 @@
 package io.quarkus.test.common;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Optional;
 
 import org.eclipse.microprofile.config.ConfigProvider;
 
 /**
- * Utility class that sets the rest assured port to the default test port.
+ * Utility class that sets the rest assured port to the default test port and meaningful timeouts.
  * <p>
  * This uses reflection so as to not introduce a dependency on rest-assured
  * <p>
@@ -20,6 +22,13 @@ public class RestAssuredURLManager {
     private static final Field portField;
     private static final Field baseURIField;
     private static final Field basePathField;
+    private static final Field configField;
+
+    private static final Method setParamMethod;
+    private static final Method configMethod;
+    private static final Method httpClientMethod;
+    private static final Class<?> httpClientConfigClass;
+
     private static int oldPort;
     private static String oldBaseURI;
     private static String oldBasePath;
@@ -28,6 +37,11 @@ public class RestAssuredURLManager {
         Field p;
         Field baseURI;
         Field basePath;
+        Field configF;
+        Method setParam;
+        Method configM;
+        Method httpClient;
+        Class<?> httpClientConfig;
         try {
             Class<?> restAssured = Class.forName("io.restassured.RestAssured");
             p = restAssured.getField("port");
@@ -36,14 +50,39 @@ public class RestAssuredURLManager {
             baseURI.setAccessible(true);
             basePath = restAssured.getField("basePath");
             basePath.setAccessible(true);
+
+            configF = restAssured.getField("config");
+            configF.setAccessible(true);
+
+            configM = restAssured.getMethod("config");
+            configM.setAccessible(true);
+
+            httpClientConfig = Class.forName("io.restassured.config.HttpClientConfig");
+            setParam = httpClientConfig.getMethod("setParam", String.class, Object.class);
+            setParam.setAccessible(true);
+
+            Class<?> restAssuredConfigClass = Class.forName("io.restassured.config.RestAssuredConfig");
+            httpClient = restAssuredConfigClass.getMethod("httpClient", httpClientConfig);
+            httpClient.setAccessible(true);
+
         } catch (Exception e) {
             p = null;
             baseURI = null;
             basePath = null;
+            configF = null;
+            setParam = null;
+            httpClientConfig = null;
+            configM = null;
+            httpClient = null;
         }
         portField = p;
         baseURIField = baseURI;
         basePathField = basePath;
+        configField = configF;
+        setParamMethod = setParam;
+        httpClientConfigClass = httpClientConfig;
+        configMethod = configM;
+        httpClientMethod = httpClient;
     }
 
     private RestAssuredURLManager() {
@@ -55,10 +94,18 @@ private static int getPortFromConfig(String key, int defaultValue) {
     }
 
     public static void setURL(boolean useSecureConnection) {
-        setURL(useSecureConnection, null);
+        setURL(useSecureConnection, null, null);
+    }
+
+    public static void setURL(boolean useSecureConnection, String additionalPath) {
+        setURL(useSecureConnection, null, additionalPath);
     }
 
     public static void setURL(boolean useSecureConnection, Integer port) {
+        setURL(useSecureConnection, port, null);
+    }
+
+    public static void setURL(boolean useSecureConnection, Integer port, String additionalPath) {
         if (portField != null) {
             try {
                 oldPort = (Integer) portField.get(null);
@@ -91,13 +138,80 @@ public static void setURL(boolean useSecureConnection, Integer port) {
                 oldBasePath = (String) basePathField.get(null);
                 Optional<String> basePath = ConfigProvider.getConfig().getOptionalValue("quarkus.http.root-path",
                         String.class);
-                if (basePath.isPresent()) {
-                    basePathField.set(null, basePath.get());
+                if (basePath.isPresent() || additionalPath != null) {
+                    StringBuilder bp = new StringBuilder();
+                    if (basePath.isPresent()) {
+                        if (basePath.get().startsWith("/")) {
+                            bp.append(basePath.get().substring(1));
+                        } else {
+                            bp.append(basePath.get());
+                        }
+                        if (bp.toString().endsWith("/")) {
+                            bp.setLength(bp.length() - 1);
+                        }
+                    }
+                    if (additionalPath != null) {
+                        if (!additionalPath.startsWith("/")) {
+                            bp.append("/");
+                        }
+                        bp.append(additionalPath);
+                        if (bp.toString().endsWith("/")) {
+                            bp.setLength(bp.length() - 1);
+                        }
+                    }
+                    basePathField.set(null, bp.toString());
                 }
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
         }
+        if (configField != null) {
+            try {
+                Duration timeout = ConfigProvider.getConfig()
+                        .getOptionalValue("quarkus.http.test-timeout", Duration.class).orElse(Duration.ofSeconds(30));
+                configureTimeouts(timeout);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Execute the following code:
+     * 
+     * <pre>
+     * {@code
+     * RestAssured.config = RestAssured.config().httpClient(
+     * new HttpClientConfig()
+     * .setParam("http.conn-manager.timeout", 30_000L)
+     * .setParam("http.connection.timeout", 30_000)
+     * .setParam("http.socket.timeout", 30_000)
+     * }
+     * </pre>
+     *
+     */
+    private static void configureTimeouts(Duration d) throws Exception {
+        // Create the HTTP client config:
+        // new HttpClientConfig()
+        //   .setParam("http.conn-manager.timeout", 30_000L)
+        //   .setParam("http.connection.timeout", 30_000)
+        //   .setParam("http.socket.timeout", 30_000)
+
+        Object httpClientConfig = httpClientConfigClass.newInstance();
+        httpClientConfig = setParamMethod.invoke(httpClientConfig, "http.conn-manager.timeout", d.toMillis());
+        httpClientConfig = setParamMethod.invoke(httpClientConfig, "http.connection.timeout", (int) d.toMillis());
+        httpClientConfig = setParamMethod.invoke(httpClientConfig, "http.socket.timeout", (int) d.toMillis());
+
+        // Retrieve RestAssured config
+        // restAssuredConfig = RestAssured.config();
+        Object restAssuredConfig = configMethod.invoke(null);
+
+        // Call httpClient method:
+        // restAssuredConfig = restAssuredConfig.httpClient(httpClientConfig);
+        restAssuredConfig = httpClientMethod.invoke(restAssuredConfig, httpClientConfig);
+
+        // Set the field
+        configField.set(null, restAssuredConfig);
     }
 
     public static void clearURL() {
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java
index 23bcba4017586..c0f39e31a29a7 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java
@@ -106,4 +106,15 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
             }
         });
     }
+
+    public static void removeIndex(Class<?> requiredTestClass) {
+        Path indexPath = indexPath(requiredTestClass);
+        if (Files.exists(indexPath)) {
+            try {
+                Files.delete(indexPath);
+            } catch (IOException e) {
+                throw new IllegalStateException("Unable to delete file index", e);
+            }
+        }
+    }
 }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestInjectionManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestInjectionManager.java
deleted file mode 100644
index d23ea9e354b74..0000000000000
--- a/test-framework/common/src/main/java/io/quarkus/test/common/TestInjectionManager.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.quarkus.test.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ServiceLoader;
-
-import io.quarkus.deployment.test.TestResourceProvider;
-
-public class TestInjectionManager {
-
-    private static final List<TestResourceProvider> resourceProviders = new ArrayList<>();
-
-    static {
-        for (TestResourceProvider i : ServiceLoader.load(TestResourceProvider.class)) {
-            resourceProviders.add(i);
-        }
-    }
-
-    public static void inject(Object test) {
-        for (TestResourceProvider i : resourceProviders) {
-            i.inject(test);
-        }
-    }
-
-}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java
index 76b27e78c034d..4fa1e92a3a19d 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestInstantiator.java
@@ -4,8 +4,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
+import org.jboss.logging.Logger;
+
 public class TestInstantiator {
 
+    private static final Logger log = Logger.getLogger(TestInstantiator.class);
+
     public static Object instantiateTest(Class<?> testClass, ClassLoader classLoader) {
 
         try {
@@ -27,6 +31,7 @@ public static Object instantiateTest(Class<?> testClass, ClassLoader classLoader
             //            Bean<?> bean = bm.resolve(nonSubClasses);
             //            return bm.getReference(bean, testClass, bm.createCreationalContext(bean));
         } catch (Exception e) {
+            log.warn("Failed to initialize test as a CDI bean, falling back to direct initialization", e);
             try {
                 Constructor<?> ctor = testClass.getDeclaredConstructor();
                 ctor.setAccessible(true);
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestResourceManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestResourceManager.java
index 1145cecc39e9d..3455b05802ba1 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/TestResourceManager.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestResourceManager.java
@@ -1,6 +1,7 @@
 package io.quarkus.test.common;
 
 import java.io.Closeable;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,31 +14,64 @@
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 
 public class TestResourceManager implements Closeable {
 
-    private final List<TestResourceEntry> testResourceEntries;
+    private final List<TestResourceEntry> sequentialTestResourceEntries;
+    private final List<TestResourceEntry> parallelTestResourceEntries;
+    private final List<TestResourceEntry> allTestResourceEntries;
     private Map<String, String> oldSystemProps;
     private boolean started = false;
+    private boolean hasPerTestResources = false;
 
     public TestResourceManager(Class<?> testClass) {
-        this(testClass, Collections.emptyList());
+        this(testClass, null, Collections.emptyList(), false);
     }
 
-    public TestResourceManager(Class<?> testClass, List<TestResourceClassEntry> additionalTestResources) {
-        testResourceEntries = getTestResources(testClass, additionalTestResources);
+    public TestResourceManager(Class<?> testClass, Class<?> profileClass, List<TestResourceClassEntry> additionalTestResources,
+            boolean disableGlobalTestResources) {
+        this.parallelTestResourceEntries = new ArrayList<>();
+        this.sequentialTestResourceEntries = new ArrayList<>();
+
+        // we need to keep track of duplicate entries to make sure we don't start the same resource
+        // multiple times even if there are multiple same @QuarkusTestResource annotations
+        Set<TestResourceClassEntry> uniqueEntries;
+        if (disableGlobalTestResources) {
+            uniqueEntries = new HashSet<>(additionalTestResources);
+        } else {
+            uniqueEntries = getUniqueTestResourceClassEntries(testClass, profileClass, additionalTestResources);
+        }
+        Set<TestResourceClassEntry> remainingUniqueEntries = initParallelTestResources(uniqueEntries);
+        initSequentialTestResources(remainingUniqueEntries);
+
+        this.allTestResourceEntries = new ArrayList<>(sequentialTestResourceEntries);
+        this.allTestResourceEntries.addAll(parallelTestResourceEntries);
     }
 
     public void init() {
-        for (TestResourceEntry entry : testResourceEntries) {
+        for (TestResourceEntry entry : allTestResourceEntries) {
             try {
-                entry.getTestResource().init(entry.getArgs());
+                QuarkusTestResourceLifecycleManager testResource = entry.getTestResource();
+                if (testResource instanceof QuarkusTestResourceConfigurableLifecycleManager
+                        && entry.getConfigAnnotation() != null) {
+                    ((QuarkusTestResourceConfigurableLifecycleManager<Annotation>) testResource)
+                            .init(entry.getConfigAnnotation());
+                } else {
+                    testResource.init(entry.getArgs());
+                }
             } catch (Exception e) {
                 throw new RuntimeException("Unable initialize test resource " + entry.getTestResource(), e);
             }
@@ -46,31 +80,74 @@ public void init() {
 
     public Map<String, String> start() {
         started = true;
-        Map<String, String> ret = new HashMap<>();
-        for (TestResourceEntry entry : testResourceEntries) {
-            try {
-                Map<String, String> start = entry.getTestResource().start();
-                if (start != null) {
-                    ret.putAll(start);
+        Map<String, String> ret = new ConcurrentHashMap<>();
+        ExecutorService executor = newExecutor(parallelTestResourceEntries.size() + 1);
+        try {
+            List<Future> startFutures = new ArrayList<>();
+            for (TestResourceEntry entry : parallelTestResourceEntries) {
+                Future startFuture = executor.submit(() -> {
+                    try {
+                        Map<String, String> start = entry.getTestResource().start();
+                        if (start != null) {
+                            ret.putAll(start);
+                        }
+                    } catch (Exception e) {
+                        throw new RuntimeException("Unable to start Quarkus test resource " + entry.getTestResource(), e);
+                    }
+                });
+                startFutures.add(startFuture);
+
+            }
+
+            Future sequentialStartFuture = executor.submit(() -> {
+                for (TestResourceEntry entry : sequentialTestResourceEntries) {
+                    try {
+                        Map<String, String> start = entry.getTestResource().start();
+                        if (start != null) {
+                            ret.putAll(start);
+                        }
+                    } catch (Exception e) {
+                        throw new RuntimeException("Unable to start Quarkus test resource " + entry.getTestResource(), e);
+                    }
+                }
+            });
+            startFutures.add(sequentialStartFuture);
+
+            waitForAllFutures(startFutures);
+
+            oldSystemProps = new HashMap<>();
+            for (Map.Entry<String, String> i : ret.entrySet()) {
+                oldSystemProps.put(i.getKey(), System.getProperty(i.getKey()));
+                if (i.getValue() == null) {
+                    System.clearProperty(i.getKey());
+                } else {
+                    System.setProperty(i.getKey(), i.getValue());
                 }
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to start Quarkus test resource " + entry.getTestResource(), e);
             }
+        } finally {
+            executor.shutdown();
         }
-        oldSystemProps = new HashMap<>();
-        for (Map.Entry<String, String> i : ret.entrySet()) {
-            oldSystemProps.put(i.getKey(), System.getProperty(i.getKey()));
-            if (i.getValue() == null) {
-                System.clearProperty(i.getKey());
-            } else {
-                System.setProperty(i.getKey(), i.getValue());
+
+        return ret;
+
+    }
+
+    private void waitForAllFutures(List<Future> startFutures) {
+        for (Future future : startFutures) {
+            try {
+                future.get();
+            } catch (CancellationException | InterruptedException | ExecutionException e) {
+                throw new RuntimeException("Error waiting for test resource future to finish.", e);
             }
         }
-        return ret;
+    }
+
+    private ExecutorService newExecutor(int poolSize) {
+        return Executors.newFixedThreadPool(poolSize);
     }
 
     public void inject(Object testInstance) {
-        for (TestResourceEntry entry : testResourceEntries) {
+        for (TestResourceEntry entry : allTestResourceEntries) {
             entry.getTestResource().inject(testInstance);
         }
     }
@@ -91,7 +168,7 @@ public void close() {
             }
         }
         oldSystemProps = null;
-        for (TestResourceEntry entry : testResourceEntries) {
+        for (TestResourceEntry entry : allTestResourceEntries) {
             try {
                 entry.getTestResource().stop();
             } catch (Exception e) {
@@ -105,15 +182,97 @@ public void close() {
         }
     }
 
-    private List<TestResourceEntry> getTestResources(Class<?> testClass, List<TestResourceClassEntry> additionalTestResources) {
-        IndexView index = TestClassIndexer.readIndex(testClass);
+    private Set<TestResourceClassEntry> initParallelTestResources(Set<TestResourceClassEntry> uniqueEntries) {
+        Set<TestResourceClassEntry> remainingUniqueEntries = new HashSet<>(uniqueEntries);
+        for (TestResourceClassEntry entry : uniqueEntries) {
+            if (entry.isParallel()) {
+                TestResourceEntry testResourceEntry = buildTestResourceEntry(entry);
+                this.parallelTestResourceEntries.add(testResourceEntry);
+                remainingUniqueEntries.remove(entry);
+            }
+        }
+        parallelTestResourceEntries.sort(new Comparator<TestResourceEntry>() {
 
-        List<TestResourceEntry> testResourceEntries = new ArrayList<>();
+            private final QuarkusTestResourceLifecycleManagerComparator lifecycleManagerComparator = new QuarkusTestResourceLifecycleManagerComparator();
 
-        // we need to keep track of duplicate entries to make sure we don't start the same resource
-        // multiple times even if there are multiple same @QuarkusTestResource annotations
+            @Override
+            public int compare(TestResourceEntry o1, TestResourceEntry o2) {
+                return lifecycleManagerComparator.compare(o1.getTestResource(), o2.getTestResource());
+            }
+        });
+
+        return remainingUniqueEntries;
+    }
+
+    private Set<TestResourceClassEntry> initSequentialTestResources(Set<TestResourceClassEntry> uniqueEntries) {
+        Set<TestResourceClassEntry> remainingUniqueEntries = new HashSet<>(uniqueEntries);
+        for (TestResourceClassEntry entry : uniqueEntries) {
+            if (!entry.isParallel()) {
+                TestResourceEntry testResourceEntry = buildTestResourceEntry(entry);
+                this.sequentialTestResourceEntries.add(testResourceEntry);
+                remainingUniqueEntries.remove(entry);
+            }
+        }
+
+        for (QuarkusTestResourceLifecycleManager quarkusTestResourceLifecycleManager : ServiceLoader.load(
+                QuarkusTestResourceLifecycleManager.class,
+                Thread.currentThread().getContextClassLoader())) {
+            TestResourceEntry testResourceEntry = new TestResourceEntry(quarkusTestResourceLifecycleManager);
+            this.sequentialTestResourceEntries.add(testResourceEntry);
+        }
+
+        this.sequentialTestResourceEntries.sort(new Comparator<TestResourceEntry>() {
+
+            private final QuarkusTestResourceLifecycleManagerComparator lifecycleManagerComparator = new QuarkusTestResourceLifecycleManagerComparator();
+
+            @Override
+            public int compare(TestResourceEntry o1, TestResourceEntry o2) {
+                return lifecycleManagerComparator.compare(o1.getTestResource(), o2.getTestResource());
+            }
+        });
+
+        return remainingUniqueEntries;
+    }
+
+    private TestResourceManager.TestResourceEntry buildTestResourceEntry(TestResourceClassEntry entry) {
+        Class<? extends QuarkusTestResourceLifecycleManager> testResourceClass = entry.clazz;
+        try {
+            return new TestResourceEntry(testResourceClass.getConstructor().newInstance(), entry.args, entry.configAnnotation);
+        } catch (InstantiationException
+                | IllegalAccessException
+                | IllegalArgumentException
+                | InvocationTargetException
+                | NoSuchMethodException
+                | SecurityException e) {
+            throw new RuntimeException("Unable to instantiate the test resource " + testResourceClass.getName(), e);
+        }
+    }
+
+    private Set<TestResourceClassEntry> getUniqueTestResourceClassEntries(Class<?> testClass, Class<?> profileClass,
+            List<TestResourceClassEntry> additionalTestResources) {
+        IndexView index = TestClassIndexer.readIndex(testClass);
         Set<TestResourceClassEntry> uniqueEntries = new HashSet<>();
-        for (AnnotationInstance annotation : findQuarkusTestResourceInstances(index)) {
+        // reload the test and profile classes in the right CL
+        Class<?> testClassFromTCCL;
+        Class<?> profileClassFromTCCL;
+        try {
+            testClassFromTCCL = Class.forName(testClass.getName(), false, Thread.currentThread().getContextClassLoader());
+            if (profileClass != null) {
+                profileClassFromTCCL = Class.forName(profileClass.getName(), false,
+                        Thread.currentThread().getContextClassLoader());
+            } else {
+                profileClassFromTCCL = null;
+            }
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        // handle meta-annotations: in this case we must rely on reflection because meta-annotations are not indexed
+        // because they are not in the user's test folder but come from test extensions
+        collectMetaAnnotations(testClassFromTCCL, uniqueEntries);
+        if (profileClassFromTCCL != null) {
+            collectMetaAnnotations(profileClassFromTCCL, uniqueEntries);
+        }
+        for (AnnotationInstance annotation : findQuarkusTestResourceInstances(testClass, index)) {
             try {
                 Class<? extends QuarkusTestResourceLifecycleManager> testResourceClass = loadTestResourceClassFromTCCL(
                         annotation.value().asString());
@@ -130,70 +289,125 @@ private List<TestResourceEntry> getTestResources(Class<?> testClass, List<TestRe
                     }
                 }
 
-                uniqueEntries.add(new TestResourceClassEntry(testResourceClass, args));
+                boolean isParallel = false;
+                AnnotationValue parallelAnnotationValue = annotation.value("parallel");
+                if (parallelAnnotationValue != null) {
+                    isParallel = parallelAnnotationValue.asBoolean();
+                }
+
+                AnnotationValue restrict = annotation.value("restrictToAnnotatedClass");
+                if (restrict != null && restrict.asBoolean()) {
+                    hasPerTestResources = true;
+                }
+
+                uniqueEntries.add(new TestResourceClassEntry(testResourceClass, args, null, isParallel));
             } catch (IllegalArgumentException | SecurityException e) {
-                throw new RuntimeException("Unable to instantiate the test resource " + annotation.value().asString());
+                throw new RuntimeException("Unable to instantiate the test resource " + annotation.value().asString(), e);
             }
         }
 
         uniqueEntries.addAll(additionalTestResources);
+        return uniqueEntries;
+    }
 
-        for (TestResourceClassEntry entry : uniqueEntries) {
-            Class<? extends QuarkusTestResourceLifecycleManager> testResourceClass = entry.clazz;
-            Map<String, String> args = entry.args;
-            try {
-                testResourceEntries.add(new TestResourceEntry(testResourceClass.getConstructor().newInstance(), args));
-            } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-                throw new RuntimeException("Unable to instantiate the test resource " + testResourceClass.getName());
+    private void collectMetaAnnotations(Class<?> testClassFromTCCL, Set<TestResourceClassEntry> uniqueEntries) {
+        while (!testClassFromTCCL.getName().equals("java.lang.Object")) {
+            for (Annotation reflAnnotation : testClassFromTCCL.getAnnotations()) {
+                for (Annotation annotationAnnotation : reflAnnotation.annotationType().getAnnotations()) {
+                    if (annotationAnnotation.annotationType() == QuarkusTestResource.class) {
+                        QuarkusTestResource testResource = (QuarkusTestResource) annotationAnnotation;
+
+                        // NOTE: we don't need to check restrictToAnnotatedClass because by design config-based annotations
+                        // are not discovered outside the test class, so they're restricted
+                        Class<? extends QuarkusTestResourceLifecycleManager> testResourceClass = testResource.value();
+
+                        ResourceArg[] argsAnnotationValue = testResource.initArgs();
+                        Map<String, String> args;
+                        if (argsAnnotationValue.length == 0) {
+                            args = Collections.emptyMap();
+                        } else {
+                            args = new HashMap<>();
+                            for (ResourceArg arg : argsAnnotationValue) {
+                                args.put(arg.name(), arg.value());
+                            }
+                        }
+
+                        boolean isParallel = testResource.parallel();
+
+                        hasPerTestResources = true;
+                        uniqueEntries.add(new TestResourceClassEntry(testResourceClass, args, reflAnnotation, isParallel));
+
+                        break;
+                    }
+                }
             }
+            testClassFromTCCL = testClassFromTCCL.getSuperclass();
         }
-
-        for (QuarkusTestResourceLifecycleManager quarkusTestResourceLifecycleManager : ServiceLoader
-                .load(QuarkusTestResourceLifecycleManager.class, Thread.currentThread().getContextClassLoader())) {
-            testResourceEntries.add(new TestResourceEntry(quarkusTestResourceLifecycleManager));
-        }
-
-        testResourceEntries.sort(new Comparator<TestResourceEntry>() {
-
-            private final QuarkusTestResourceLifecycleManagerComparator lifecycleManagerComparator = new QuarkusTestResourceLifecycleManagerComparator();
-
-            @Override
-            public int compare(TestResourceEntry o1, TestResourceEntry o2) {
-                return lifecycleManagerComparator.compare(o1.getTestResource(), o2.getTestResource());
-            }
-        });
-
-        return testResourceEntries;
     }
 
     @SuppressWarnings("unchecked")
     private Class<? extends QuarkusTestResourceLifecycleManager> loadTestResourceClassFromTCCL(String className) {
         try {
-            return (Class<? extends QuarkusTestResourceLifecycleManager>) Class
-                    .forName(className, true, Thread.currentThread().getContextClassLoader());
+            return (Class<? extends QuarkusTestResourceLifecycleManager>) Class.forName(className, true,
+                    Thread.currentThread().getContextClassLoader());
         } catch (ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
 
-    private Collection<AnnotationInstance> findQuarkusTestResourceInstances(IndexView index) {
-        Set<AnnotationInstance> testResourceAnnotations = new HashSet<>(index
-                .getAnnotations(DotName.createSimple(QuarkusTestResource.class.getName())));
+    private Collection<AnnotationInstance> findQuarkusTestResourceInstances(Class<?> testClass, IndexView index) {
+        // collect all test supertypes for matching per-test targets
+        Set<String> testClasses = new HashSet<>();
+        while (testClass != Object.class) {
+            testClasses.add(testClass.getName());
+            testClass = testClass.getSuperclass();
+        }
+        Set<AnnotationInstance> testResourceAnnotations = new HashSet<>();
+        for (AnnotationInstance annotation : index.getAnnotations(DotName.createSimple(QuarkusTestResource.class.getName()))) {
+            if (keepTestResourceAnnotation(annotation, annotation.target().asClass(), testClasses)) {
+                testResourceAnnotations.add(annotation);
+            }
+        }
+
         for (AnnotationInstance annotation : index
                 .getAnnotations(DotName.createSimple(QuarkusTestResource.List.class.getName()))) {
-            Collections.addAll(testResourceAnnotations, annotation.value().asNestedArray());
+            for (AnnotationInstance nestedAnnotation : annotation.value().asNestedArray()) {
+                // keep the list target
+                if (keepTestResourceAnnotation(nestedAnnotation, annotation.target().asClass(), testClasses)) {
+                    testResourceAnnotations.add(nestedAnnotation);
+                }
+            }
         }
         return testResourceAnnotations;
     }
 
+    // NOTE: called by reflection in QuarkusTestExtension
+    public boolean hasPerTestResources() {
+        return hasPerTestResources;
+    }
+
+    private boolean keepTestResourceAnnotation(AnnotationInstance annotation, ClassInfo targetClass, Set<String> testClasses) {
+        AnnotationValue restrict = annotation.value("restrictToAnnotatedClass");
+        if (restrict != null && restrict.asBoolean()) {
+            return testClasses.contains(targetClass.name().toString('.'));
+        }
+        return true;
+    }
+
     public static class TestResourceClassEntry {
+
         private Class<? extends QuarkusTestResourceLifecycleManager> clazz;
         private Map<String, String> args;
+        private boolean parallel;
+        private Annotation configAnnotation;
 
-        public TestResourceClassEntry(Class<? extends QuarkusTestResourceLifecycleManager> clazz, Map<String, String> args) {
+        public TestResourceClassEntry(Class<? extends QuarkusTestResourceLifecycleManager> clazz, Map<String, String> args,
+                Annotation configAnnotation,
+                boolean parallel) {
             this.clazz = clazz;
             this.args = args;
+            this.configAnnotation = configAnnotation;
+            this.parallel = parallel;
         }
 
         @Override
@@ -203,27 +417,35 @@ public boolean equals(Object o) {
             if (o == null || getClass() != o.getClass())
                 return false;
             TestResourceClassEntry that = (TestResourceClassEntry) o;
-            return clazz.equals(that.clazz) &&
-                    args.equals(that.args);
+            return clazz.equals(that.clazz) && args.equals(that.args) && Objects.equals(configAnnotation, that.configAnnotation)
+                    && parallel == that.parallel;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(clazz, args);
+            return Objects.hash(clazz, args, configAnnotation, parallel);
+        }
+
+        public boolean isParallel() {
+            return parallel;
         }
     }
 
     private static class TestResourceEntry {
+
         private final QuarkusTestResourceLifecycleManager testResource;
         private final Map<String, String> args;
+        private final Annotation configAnnotation;
 
         public TestResourceEntry(QuarkusTestResourceLifecycleManager testResource) {
-            this(testResource, Collections.emptyMap());
+            this(testResource, Collections.emptyMap(), null);
         }
 
-        public TestResourceEntry(QuarkusTestResourceLifecycleManager testResource, Map<String, String> args) {
+        public TestResourceEntry(QuarkusTestResourceLifecycleManager testResource, Map<String, String> args,
+                Annotation configAnnotation) {
             this.testResource = testResource;
             this.args = args;
+            this.configAnnotation = configAnnotation;
         }
 
         public QuarkusTestResourceLifecycleManager getTestResource() {
@@ -233,6 +455,10 @@ public QuarkusTestResourceLifecycleManager getTestResource() {
         public Map<String, String> getArgs() {
             return args;
         }
+
+        public Annotation getConfigAnnotation() {
+            return configAnnotation;
+        }
     }
 
 }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPConfigSourceProvider.java b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPConfigSourceProvider.java
index d56e3ce725c7d..463e9fc5c08ae 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPConfigSourceProvider.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPConfigSourceProvider.java
@@ -23,11 +23,17 @@ public class TestHTTPConfigSourceProvider implements ConfigSourceProvider {
 
     static {
         Map<String, String> map = new HashMap<>();
-        map.put(TEST_URL_KEY, TEST_URL_VALUE);
-        map.put(TEST_URL_SSL_KEY, TEST_URL_SSL_VALUE);
+        map.put(TEST_URL_KEY, sanitizeURL(TEST_URL_VALUE));
+        map.put(TEST_URL_SSL_KEY, sanitizeURL(TEST_URL_SSL_VALUE));
+        map.put("%dev." + TEST_URL_KEY, sanitizeURL(
+                "http://${quarkus.http.host:localhost}:${quarkus.http.test-port:8080}${quarkus.servlet.context-path:}"));
         entries = Collections.unmodifiableMap(map);
     }
 
+    private static String sanitizeURL(String url) {
+        return url.replace("0.0.0.0", "localhost");
+    }
+
     public Iterable<ConfigSource> getConfigSources(final ClassLoader forClassLoader) {
         return Collections.singletonList(new TestURLConfigSource());
     }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPEndpoint.java b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPEndpoint.java
new file mode 100644
index 0000000000000..de9d062df30a8
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPEndpoint.java
@@ -0,0 +1,28 @@
+package io.quarkus.test.common.http;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that this test class or method is testing a specific endpoint.
+ *
+ * RESTAssured will also have its base URL modified
+ * so all URLS can be given relative to the root of the the provided resource class. It
+ * can also be applied to {@link TestHTTPResource} fields to set the base path.
+ * 
+ *
+ * This mechanism is pluggable, and currently supports JAX-RS endpoints, Servlets and Reactive Routes.
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
+public @interface TestHTTPEndpoint {
+
+    /**
+     * The HTTP endpoint that is under test. All injected URL's will point to the
+     * root path of the provided resource.
+     */
+    Class<?> value();
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java
index 7d30792169b8c..bad5a28ac4aed 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java
@@ -4,27 +4,23 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
+import java.util.function.Function;
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 
 import io.quarkus.bootstrap.app.RunningQuarkusApplication;
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
 
 public class TestHTTPResourceManager {
 
     public static String getUri() {
         try {
             Config config = ConfigProvider.getConfig();
-            String value = config.getValue("test.url", String.class);
-            if (value.equals(TestHTTPConfigSourceProvider.TEST_URL_VALUE)) {
-                //massive hack for dev mode tests, dev mode has not started yet
-                //so we don't have any way to load this correctly from config
-                return "http://" + config.getOptionalValue("quarkus.http.host", String.class).orElse("localhost") + ":"
-                        + config.getOptionalValue("quarkus.http.port", String.class).orElse("8080");
-            }
-            return value;
+            return config.getValue("test.url", String.class);
         } catch (IllegalStateException e) {
             //massive hack for dev mode tests, dev mode has not started yet
             //so we don't have any way to load this correctly from config
@@ -45,6 +41,10 @@ public static String getSslUri(RunningQuarkusApplication application) {
     }
 
     public static void inject(Object testCase) {
+        inject(testCase, TestHttpEndpointProvider.load());
+    }
+
+    public static void inject(Object testCase, List<Function<Class<?>, String>> endpointProviders) {
         Map<Class<?>, TestHTTPResourceProvider<?>> providers = getProviders();
         Class<?> c = testCase.getClass();
         while (c != Object.class) {
@@ -57,6 +57,30 @@ public static void inject(Object testCase) {
                                 "Unable to inject TestHTTPResource field " + f + " as no provider exists for the type");
                     }
                     String path = resource.value();
+                    String endpointPath = null;
+                    TestHTTPEndpoint endpointAnnotation = f.getAnnotation(TestHTTPEndpoint.class);
+                    if (endpointAnnotation != null) {
+                        for (Function<Class<?>, String> func : endpointProviders) {
+                            endpointPath = func.apply(endpointAnnotation.value());
+                            if (endpointPath != null) {
+                                break;
+                            }
+                        }
+                        if (endpointPath == null) {
+                            throw new RuntimeException(
+                                    "Could not determine the endpoint path for " + endpointAnnotation.value() + " to inject "
+                                            + f);
+                        }
+                    }
+                    if (!path.isEmpty() && endpointPath != null) {
+                        if (!endpointPath.endsWith("/")) {
+                            path = endpointPath + "/" + path;
+                        } else {
+                            path = endpointPath + path;
+                        }
+                    } else if (endpointPath != null) {
+                        path = endpointPath;
+                    }
                     String val;
                     if (resource.ssl()) {
                         if (path.startsWith("/")) {
diff --git a/test-framework/common/src/test/java/io/quarkus/test/common/TestResourceManagerTest.java b/test-framework/common/src/test/java/io/quarkus/test/common/TestResourceManagerTest.java
index 093b3f7e4cf00..52890d8bdd7d0 100644
--- a/test-framework/common/src/test/java/io/quarkus/test/common/TestResourceManagerTest.java
+++ b/test-framework/common/src/test/java/io/quarkus/test/common/TestResourceManagerTest.java
@@ -3,13 +3,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestResourceManagerTest {
 
+    private static final String OVERRIDEN_KEY = "overridenKey";
+    public static boolean parallelTestResourceRunned = false;
+
     @Test
     void testRepeatableAnnotationsAreIndexed() {
         AtomicInteger counter = new AtomicInteger();
@@ -18,12 +23,30 @@ void testRepeatableAnnotationsAreIndexed() {
         assertThat(counter.intValue()).isEqualTo(2);
     }
 
+    @Test
+    void testSequentialResourcesRunSequentially() {
+        TestResourceManager manager = new TestResourceManager(SequentialTestResourcesTest.class);
+        Map<String, String> props = manager.start();
+        Assertions.assertEquals("value1", props.get("key1"));
+        Assertions.assertEquals("value2", props.get("key2"));
+        Assertions.assertEquals("value2", props.get(OVERRIDEN_KEY));
+    }
+
+    @Test
+    void testParallelResourcesRunInParallel() {
+        TestResourceManager manager = new TestResourceManager(ParallelTestResourcesTest.class);
+        Map<String, String> props = manager.start();
+        Assertions.assertEquals("value1", props.get("key1"));
+        Assertions.assertEquals("value2", props.get("key2"));
+    }
+
     @QuarkusTestResource(FirstLifecycleManager.class)
     @QuarkusTestResource(SecondLifecycleManager.class)
     public static class MyTest {
     }
 
     public static class FirstLifecycleManager implements QuarkusTestResourceLifecycleManager {
+
         @Override
         public Map<String, String> start() {
             return Collections.emptyMap();
@@ -41,6 +64,7 @@ public void stop() {
     }
 
     public static class SecondLifecycleManager implements QuarkusTestResourceLifecycleManager {
+
         @Override
         public Map<String, String> start() {
             return Collections.emptyMap();
@@ -57,4 +81,96 @@ public void stop() {
         }
     }
 
-}
\ No newline at end of file
+    @QuarkusTestResource(FirstSequentialQuarkusTestResource.class)
+    @QuarkusTestResource(SecondSequentialQuarkusTestResource.class)
+    public static class SequentialTestResourcesTest {
+    }
+
+    public static class FirstSequentialQuarkusTestResource implements QuarkusTestResourceLifecycleManager {
+
+        @Override
+        public Map<String, String> start() {
+            Map<String, String> props = new HashMap<>();
+            props.put("key1", "value1");
+            props.put(OVERRIDEN_KEY, "value1");
+            return props;
+        }
+
+        @Override
+        public void stop() {
+        }
+
+        @Override
+        public int order() {
+            return 1;
+        }
+    }
+
+    public static class SecondSequentialQuarkusTestResource implements QuarkusTestResourceLifecycleManager {
+
+        @Override
+        public Map<String, String> start() {
+            Map<String, String> props = new HashMap<>();
+            props.put("key2", "value2");
+            props.put(OVERRIDEN_KEY, "value2");
+            return props;
+        }
+
+        @Override
+        public void stop() {
+
+        }
+
+        @Override
+        public int order() {
+            return 2;
+        }
+    }
+
+    @QuarkusTestResource(value = FirstParallelQuarkusTestResource.class, parallel = true)
+    @QuarkusTestResource(value = SecondParallelQuarkusTestResource.class, parallel = true)
+    public static class ParallelTestResourcesTest {
+    }
+
+    public static class FirstParallelQuarkusTestResource implements QuarkusTestResourceLifecycleManager {
+
+        @Override
+        public Map<String, String> start() {
+            try {
+                // sleep so the SecondParallelQuarkusTestResource finishes, incrementing the parallel counter first
+                Thread.sleep(25);
+                Assertions.assertTrue(parallelTestResourceRunned, "The SecondParallelQuarkusTestResource did not run yet!");
+                return Collections.singletonMap("key1", "value1");
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void stop() {
+        }
+
+        @Override
+        public int order() {
+            return 1;
+        }
+    }
+
+    public static class SecondParallelQuarkusTestResource implements QuarkusTestResourceLifecycleManager {
+
+        @Override
+        public Map<String, String> start() {
+            parallelTestResourceRunned = true;
+            return Collections.singletonMap("key2", "value2");
+        }
+
+        @Override
+        public void stop() {
+        }
+
+        @Override
+        public int order() {
+            return 2;
+        }
+    }
+}
diff --git a/test-framework/derby/pom.xml b/test-framework/derby/pom.xml
index 4409abdbf5ee4..566cfbdb19f8d 100644
--- a/test-framework/derby/pom.xml
+++ b/test-framework/derby/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-test-derby</artifactId>
diff --git a/test-framework/devmode-test-utils/pom.xml b/test-framework/devmode-test-utils/pom.xml
index 2fcc6fbc8d222..cf664b2125af7 100644
--- a/test-framework/devmode-test-utils/pom.xml
+++ b/test-framework/devmode-test-utils/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-test-framework</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java
index 5f6a7ee0b2b5b..537e0f220f21f 100644
--- a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java
+++ b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java
@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -24,7 +25,7 @@ public static void killProcesses(String... cmdParts) {
         for (ProcessInfo pi : JProcesses.getProcessList()) {
             for (String part : cmdParts) {
                 if (pi.getCommand().contains(part)) {
-                    JProcesses.killProcess(Integer.valueOf(pi.getPid()));
+                    JProcesses.killProcess(Integer.parseInt(pi.getPid()));
                     break;
                 }
             }
@@ -120,10 +121,15 @@ public static String getHttpResponse(String path, boolean allowError) {
     }
 
     public static String getHttpResponse(String path, boolean allowError, Supplier<String> brokenReason) {
+        return getHttpResponse(path, allowError, brokenReason, 1, TimeUnit.MINUTES);
+    }
+
+    public static String getHttpResponse(String path, boolean allowError, Supplier<String> brokenReason, long timeout,
+            TimeUnit tu) {
         AtomicReference<String> resp = new AtomicReference<>();
         await()
                 .pollDelay(1, TimeUnit.SECONDS)
-                .atMost(1, TimeUnit.MINUTES).until(() -> {
+                .atMost(timeout, tu).until(() -> {
                     String broken = brokenReason.get();
                     if (broken != null) {
                         resp.set("BROKEN: " + broken);
@@ -133,15 +139,15 @@ public static String getHttpResponse(String path, boolean allowError, Supplier<S
                         URL url = new URL("http://localhost:8080" + ((path.startsWith("/") ? path : "/" + path)));
                         String content;
                         if (!allowError) {
-                            content = IOUtils.toString(url, "UTF-8");
+                            content = IOUtils.toString(url, StandardCharsets.UTF_8);
                         } else {
                             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
                             // the default Accept header used by HttpURLConnection is not compatible with RESTEasy negotiation as it uses q=.8
                             conn.setRequestProperty("Accept", "text/html, *; q=0.2, */*; q=0.2");
                             if (conn.getResponseCode() >= 400) {
-                                content = IOUtils.toString(conn.getErrorStream(), "UTF-8");
+                                content = IOUtils.toString(conn.getErrorStream(), StandardCharsets.UTF_8);
                             } else {
-                                content = IOUtils.toString(conn.getInputStream(), "UTF-8");
+                                content = IOUtils.toString(conn.getInputStream(), StandardCharsets.UTF_8);
                             }
                         }
                         resp.set(content);
@@ -154,10 +160,14 @@ public static String getHttpResponse(String path, boolean allowError, Supplier<S
     }
 
     public static boolean getHttpResponse(String path, int expectedStatus) {
+        return getHttpResponse(path, expectedStatus, 5, TimeUnit.MINUTES);
+    }
+
+    public static boolean getHttpResponse(String path, int expectedStatus, long timeout, TimeUnit tu) {
         AtomicBoolean code = new AtomicBoolean();
         await()
                 .pollDelay(1, TimeUnit.SECONDS)
-                .atMost(5, TimeUnit.MINUTES).until(() -> {
+                .atMost(timeout, tu).until(() -> {
                     try {
                         URL url = new URL("http://localhost:8080" + ((path.startsWith("/") ? path : "/" + path)));
                         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -197,7 +207,23 @@ public static boolean getStrictHttpResponse(String path, int expectedStatus) {
     }
 
     public static String get() throws IOException {
-        URL url = new URL("http://localhost:8080");
-        return IOUtils.toString(url, "UTF-8");
+        return get("http://localhost:8080");
+    }
+
+    public static String get(String urlStr) throws IOException {
+        return IOUtils.toString(new URL(urlStr), StandardCharsets.UTF_8);
+    }
+
+    public static boolean isCode(String path, int code) {
+        try {
+            URL url = new URL("http://localhost:8080" + ((path.startsWith("/") ? path : "/" + path)));
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            // the default Accept header used by HttpURLConnection is not compatible with
+            // RESTEasy negotiation as it uses q=.2
+            connection.setRequestProperty("Accept", "text/html, *; q=0.2, */*; q=0.2");
+            return connection.getResponseCode() == code;
+        } catch (Exception e) {
+            return false;
+        }
     }
 }
diff --git a/test-framework/devtools/pom.xml b/test-framework/devtools/pom.xml
new file mode 100644
index 0000000000000..a8edb0e9a338e
--- /dev/null
+++ b/test-framework/devtools/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-test-framework</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-test-devtools</artifactId>
+    <name>Quarkus - Test Framework - Dev Tools</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devtools-registry-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/test-framework/devtools/src/main/java/io/quarkus/devtools/test/RegistryClientTestHelper.java b/test-framework/devtools/src/main/java/io/quarkus/devtools/test/RegistryClientTestHelper.java
new file mode 100644
index 0000000000000..15b05779d2521
--- /dev/null
+++ b/test-framework/devtools/src/main/java/io/quarkus/devtools/test/RegistryClientTestHelper.java
@@ -0,0 +1,139 @@
+package io.quarkus.devtools.test;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.Properties;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.Constants;
+import io.quarkus.registry.catalog.json.JsonCatalogMapperHelper;
+import io.quarkus.registry.catalog.json.JsonPlatform;
+import io.quarkus.registry.catalog.json.JsonPlatformCatalog;
+import io.quarkus.registry.config.RegistriesConfigLocator;
+import io.quarkus.registry.config.json.JsonRegistriesConfig;
+import io.quarkus.registry.config.json.JsonRegistryConfig;
+import io.quarkus.registry.config.json.JsonRegistryMavenConfig;
+import io.quarkus.registry.config.json.JsonRegistryMavenRepoConfig;
+import io.quarkus.registry.config.json.JsonRegistryNonPlatformExtensionsConfig;
+import io.quarkus.registry.config.json.JsonRegistryPlatformsConfig;
+import io.quarkus.registry.config.json.RegistriesConfigMapperHelper;
+
+public class RegistryClientTestHelper {
+
+    public static void enableRegistryClientTestConfig() {
+        enableRegistryClientTestConfig(System.getProperties());
+    }
+
+    public static void enableRegistryClientTestConfig(Properties properties) {
+        enableRegistryClientTestConfig(Paths.get("").normalize().toAbsolutePath().resolve("target"),
+                properties);
+    }
+
+    public static void enableRegistryClientTestConfig(Path outputDir, Properties properties) {
+        final Path toolsConfigPath = outputDir.resolve(RegistriesConfigLocator.CONFIG_RELATIVE_PATH);
+        final Path registryRepoPath = outputDir.resolve("test-registry-repo");
+        final Path groupIdDir = registryRepoPath.resolve("io/quarkus/registry/test");
+
+        generateToolsConfig(toolsConfigPath, registryRepoPath);
+        generateRegistryDescriptor(groupIdDir);
+        generatePlatformCatalog(groupIdDir);
+
+        properties.setProperty("io.quarkus.maven.secondary-local-repo", registryRepoPath.toString());
+        properties.setProperty(RegistriesConfigLocator.CONFIG_FILE_PATH_PROPERTY, toolsConfigPath.toString());
+    }
+
+    private static void generatePlatformCatalog(final Path groupIdDir) {
+        final String projectVersion = System.getProperty("project.version");
+        if (projectVersion == null) {
+            throw new IllegalStateException("System property project.version isn't set");
+        }
+        final Path platformsPath = groupIdDir.resolve(Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID)
+                .resolve(Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION)
+                .resolve(Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID + "-"
+                        + Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION + ".json");
+        final Path versionedPlatformsPath = groupIdDir.resolve(Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID)
+                .resolve(Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION)
+                .resolve(Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID + "-"
+                        + Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION + "-" + projectVersion + ".json");
+        if (Files.exists(platformsPath) && Files.exists(versionedPlatformsPath)) {
+            return;
+        }
+        final ArtifactCoords bom = new ArtifactCoords("io.quarkus", "quarkus-bom", null, "pom", projectVersion);
+        final JsonPlatformCatalog platforms = new JsonPlatformCatalog();
+        platforms.setDefaultPlatform(bom);
+        final JsonPlatform platform = new JsonPlatform();
+        platforms.addPlatform(platform);
+        platform.setBom(bom);
+        platform.setQuarkusCoreVersion(projectVersion);
+        try {
+            JsonCatalogMapperHelper.serialize(platforms, platformsPath);
+            Files.copy(platformsPath, versionedPlatformsPath, StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to persist registry platforms config", e);
+        }
+    }
+
+    private static void generateRegistryDescriptor(Path repoGroupIdDir) {
+        final Path descriptorPath = repoGroupIdDir.resolve(Constants.DEFAULT_REGISTRY_DESCRIPTOR_ARTIFACT_ID)
+                .resolve(Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION).resolve(Constants.DEFAULT_REGISTRY_DESCRIPTOR_ARTIFACT_ID
+                        + "-" + Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION + ".json");
+        if (Files.exists(descriptorPath)) {
+            return;
+        }
+        final JsonRegistryConfig descriptor = new JsonRegistryConfig();
+        final JsonRegistryPlatformsConfig platformsConfig = new JsonRegistryPlatformsConfig();
+        descriptor.setPlatforms(platformsConfig);
+        platformsConfig.setArtifact(
+                new ArtifactCoords("io.quarkus.registry.test", Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID, null,
+                        "json", Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION));
+        final JsonRegistryNonPlatformExtensionsConfig nonPlatformsConfig = new JsonRegistryNonPlatformExtensionsConfig();
+        descriptor.setNonPlatformExtensions(nonPlatformsConfig);
+        nonPlatformsConfig.setDisabled(true);
+        try {
+            RegistriesConfigMapperHelper.serialize(descriptor, descriptorPath);
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to persist the registry descriptor", e);
+        }
+    }
+
+    private static void generateToolsConfig(Path toolsConfigPath, Path registryRepoPath) {
+        if (Files.exists(toolsConfigPath)) {
+            return;
+        }
+        final JsonRegistryConfig registryConfig = new JsonRegistryConfig();
+        registryConfig.setId("test.registry.quarkus.io");
+        final JsonRegistryMavenConfig mavenConfig = new JsonRegistryMavenConfig();
+        registryConfig.setMaven(mavenConfig);
+        final JsonRegistryMavenRepoConfig repoConfig = new JsonRegistryMavenRepoConfig();
+        mavenConfig.setRepository(repoConfig);
+        try {
+            repoConfig.setUrl(registryRepoPath.toUri().toURL().toString());
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException("Failed to translate a path to url", e);
+        }
+
+        final JsonRegistriesConfig toolsConfig = new JsonRegistriesConfig();
+        toolsConfig.addRegistry(registryConfig);
+        toolsConfig.setDebug(true);
+
+        try {
+            RegistriesConfigMapperHelper.serialize(toolsConfig,
+                    toolsConfigPath);
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to persist the tools config", e);
+        }
+    }
+
+    public static void disableRegistryClientTestConfig() {
+        disableRegistryClientTestConfig(System.getProperties());
+    }
+
+    public static void disableRegistryClientTestConfig(Properties properties) {
+        properties.remove("io.quarkus.maven.secondary-local-repo");
+        properties.remove(RegistriesConfigLocator.CONFIG_FILE_PATH_PROPERTY);
+    }
+}
diff --git a/test-framework/h2/pom.xml b/test-framework/h2/pom.xml
index c2cda229faff4..9c5f22ac25998 100644
--- a/test-framework/h2/pom.xml
+++ b/test-framework/h2/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-test-h2</artifactId>
diff --git a/test-framework/jacoco/deployment/pom.xml b/test-framework/jacoco/deployment/pom.xml
new file mode 100644
index 0000000000000..43e2fea949306
--- /dev/null
+++ b/test-framework/jacoco/deployment/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-jacoco-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jacoco-deployment</artifactId>
+    <name>Quarkus - Jacoco - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jacoco</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <runOrder>alphabetical</runOrder>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/test-framework/jacoco/deployment/src/main/java/io/quarkus/jacoco/deployment/JacocoProcessor.java b/test-framework/jacoco/deployment/src/main/java/io/quarkus/jacoco/deployment/JacocoProcessor.java
new file mode 100644
index 0000000000000..03aaee1039efa
--- /dev/null
+++ b/test-framework/jacoco/deployment/src/main/java/io/quarkus/jacoco/deployment/JacocoProcessor.java
@@ -0,0 +1,136 @@
+package io.quarkus.jacoco.deployment;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+import org.jacoco.core.instr.Instrumenter;
+import org.jacoco.core.runtime.OfflineInstrumentationAccessGenerator;
+import org.jacoco.report.MultiSourceFileLocator;
+import org.jboss.jandex.ClassInfo;
+
+import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.bootstrap.resolver.model.QuarkusModel;
+import io.quarkus.bootstrap.resolver.model.WorkspaceModule;
+import io.quarkus.bootstrap.utils.BuildToolHelper;
+import io.quarkus.deployment.IsTest;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
+import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem;
+import io.quarkus.jacoco.runtime.JacocoConfig;
+import io.quarkus.jacoco.runtime.ReportCreator;
+import io.quarkus.jacoco.runtime.ReportInfo;
+
+public class JacocoProcessor {
+
+    @BuildStep(onlyIf = IsTest.class)
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem("jacoco");
+    }
+
+    @BuildStep(onlyIf = IsTest.class)
+    void transformerBuildItem(BuildProducer<BytecodeTransformerBuildItem> transformers, CombinedIndexBuildItem indexBuildItem,
+            OutputTargetBuildItem outputTargetBuildItem,
+            ApplicationArchivesBuildItem applicationArchivesBuildItem,
+            BuildSystemTargetBuildItem buildSystemTargetBuildItem,
+            ShutdownContextBuildItem shutdownContextBuildItem,
+            JacocoConfig config) throws Exception {
+        String dataFile = outputTargetBuildItem.getOutputDirectory().toAbsolutePath().toString() + File.separator
+                + config.dataFile;
+        System.setProperty("jacoco-agent.destfile",
+                dataFile);
+        Files.deleteIfExists(Paths.get(dataFile));
+
+        Instrumenter instrumenter = new Instrumenter(new OfflineInstrumentationAccessGenerator());
+        for (ClassInfo i : indexBuildItem.getIndex().getKnownClasses()) {
+            String className = i.name().toString();
+            transformers.produce(
+                    new BytecodeTransformerBuildItem.Builder().setClassToTransform(className)
+                            .setCacheable(true)
+                            .setEager(true)
+                            .setInputTransformer(new BiFunction<String, byte[], byte[]>() {
+                                @Override
+                                public byte[] apply(String className, byte[] bytes) {
+                                    try {
+                                        byte[] enhanced = instrumenter.instrument(bytes, className);
+                                        if (enhanced == null) {
+                                            return bytes;
+                                        }
+                                        return enhanced;
+                                    } catch (IOException e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                }
+                            }).build());
+        }
+        if (config.report) {
+            ReportInfo info = new ReportInfo();
+            info.savedData = dataFile;
+
+            File targetdir = new File(
+                    outputTargetBuildItem.getOutputDirectory().toAbsolutePath().toString() + File.separator
+                            + config.reportLocation);
+            info.reportDir = targetdir.getAbsolutePath();
+            String includes = StringUtils.join(config.includes.iterator(), ",");
+            String excludes = StringUtils.join(config.excludes.orElse(Collections.emptyList()).iterator(), ",");
+            Set<String> classes = new HashSet<>();
+            info.classFiles = classes;
+
+            Set<String> sources = new HashSet<>();
+            MultiSourceFileLocator sourceFileLocator = new MultiSourceFileLocator(4);
+            if (BuildToolHelper.isMavenProject(targetdir.toPath())) {
+                LocalProject project = LocalProject.loadWorkspace(targetdir.toPath());
+                for (Map.Entry<AppArtifactKey, LocalProject> i : project.getWorkspace().getProjects().entrySet()) {
+                    sources.add(i.getValue().getSourcesSourcesDir().toFile().getAbsolutePath());
+                    File classesDir = i.getValue().getClassesDir().toFile();
+                    if (classesDir.isDirectory()) {
+                        for (final File file : FileUtils.getFiles(classesDir, includes, excludes,
+                                true)) {
+                            if (file.getName().endsWith(".class")) {
+                                classes.add(file.getAbsolutePath());
+                            }
+                        }
+                    }
+                }
+            } else if (BuildToolHelper.isGradleProject(targetdir.toPath())) {
+                QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(targetdir.toPath());
+                for (WorkspaceModule i : model.getWorkspace().getAllModules()) {
+                    for (File src : i.getSourceSourceSet().getSourceDirectories()) {
+                        sources.add(src.getAbsolutePath());
+                    }
+                    for (File classesDir : i.getSourceSet().getSourceDirectories()) {
+                        if (classesDir.isDirectory()) {
+                            for (final File file : FileUtils.getFiles(classesDir, includes, excludes,
+                                    true)) {
+                                if (file.getName().endsWith(".class")) {
+                                    classes.add(file.getAbsolutePath());
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                throw new RuntimeException("Cannot determine project type generating Jacoco report");
+            }
+            info.sourceDirectories = sources;
+            info.artifactId = buildSystemTargetBuildItem.getBaseName();
+            Runtime.getRuntime().addShutdownHook(new Thread(new ReportCreator(info, config)));
+        }
+    }
+
+}
diff --git a/test-framework/jacoco/pom.xml b/test-framework/jacoco/pom.xml
new file mode 100644
index 0000000000000..bb1425bb917c1
--- /dev/null
+++ b/test-framework/jacoco/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jacoco-parent</artifactId>
+    <name>Quarkus - Jacoco</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/test-framework/jacoco/runtime/pom.xml b/test-framework/jacoco/runtime/pom.xml
new file mode 100644
index 0000000000000..0f114c3cdb438
--- /dev/null
+++ b/test-framework/jacoco/runtime/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-jacoco-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jacoco</artifactId>
+    <name>Quarkus - Jacoco - Runtime</name>
+    <description>Jacoco test coverage support</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>org.jacoco.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>org.jacoco.report</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>org.jacoco.agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jacoco</groupId>
+            <artifactId>org.jacoco.agent</artifactId>
+            <classifier>runtime</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <configuration>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.jacoco:org.jacoco.core</parentFirstArtifact>
+                        <parentFirstArtifact>org.jacoco:org.jacoco.report</parentFirstArtifact>
+                        <parentFirstArtifact>org.jacoco:org.jacoco.agent</parentFirstArtifact>
+                    </parentFirstArtifacts>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/JacocoConfig.java b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/JacocoConfig.java
new file mode 100644
index 0000000000000..971402a6c5da5
--- /dev/null
+++ b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/JacocoConfig.java
@@ -0,0 +1,68 @@
+package io.quarkus.jacoco.runtime;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.quarkus.runtime.annotations.ConfigItem;
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public class JacocoConfig {
+
+    /**
+     * The jacoco data file
+     */
+    @ConfigItem(defaultValue = "jacoco-quarkus.exec")
+    public String dataFile;
+
+    /**
+     * If Quarkus should generate the Jacoco report
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean report;
+
+    /**
+     * Encoding of the generated reports.
+     */
+    @ConfigItem(defaultValue = "UTF-8")
+    public String outputEncoding;
+
+    /**
+     * Name of the root node HTML report pages.
+     */
+    @ConfigItem
+    public Optional<String> title;
+
+    /**
+     * Footer text used in HTML report pages.
+     */
+    @ConfigItem
+    public Optional<String> footer;
+
+    /**
+     * Encoding of the source files.
+     */
+    @ConfigItem(defaultValue = "UTF-8")
+    public String sourceEncoding;
+
+    /**
+     * A list of class files to include in the report. May use wildcard
+     * characters (* and ?). When not specified everything will be included.
+     */
+    @ConfigItem(defaultValue = "**")
+    public List<String> includes;
+
+    /**
+     * A list of class files to exclude from the report. May use wildcard
+     * characters (* and ?). When not specified nothing will be excluded.
+     */
+    @ConfigItem
+    public Optional<List<String>> excludes;
+
+    /**
+     * The location of the report files.
+     */
+    @ConfigItem(defaultValue = "jacoco-report")
+    public String reportLocation;
+}
diff --git a/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java
new file mode 100644
index 0000000000000..5960feb5bc519
--- /dev/null
+++ b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportCreator.java
@@ -0,0 +1,129 @@
+package io.quarkus.jacoco.runtime;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.jacoco.core.analysis.Analyzer;
+import org.jacoco.core.analysis.CoverageBuilder;
+import org.jacoco.core.analysis.IBundleCoverage;
+import org.jacoco.core.tools.ExecFileLoader;
+import org.jacoco.report.DirectorySourceFileLocator;
+import org.jacoco.report.FileMultiReportOutput;
+import org.jacoco.report.IReportVisitor;
+import org.jacoco.report.MultiReportVisitor;
+import org.jacoco.report.MultiSourceFileLocator;
+import org.jacoco.report.csv.CSVFormatter;
+import org.jacoco.report.html.HTMLFormatter;
+import org.jacoco.report.xml.XMLFormatter;
+import org.jboss.logging.Logger;
+
+public class ReportCreator implements Runnable {
+    private static final Logger log = Logger.getLogger(ReportCreator.class);
+    private final ReportInfo reportInfo;
+    private final JacocoConfig config;
+
+    public ReportCreator(ReportInfo reportInfo, JacocoConfig config) {
+        this.reportInfo = reportInfo;
+        this.config = config;
+    }
+
+    @Override
+    public void run() {
+        File targetdir = new File(reportInfo.reportDir);
+        targetdir.mkdirs();
+        try {
+            //the jacoco data is also generated by a shutdown hook
+            //we need to wait for the file. We wait at most 10s
+            long abortTime = System.currentTimeMillis() + 10000;
+            Path datafile = Paths.get(reportInfo.savedData);
+            while (System.currentTimeMillis() < abortTime) {
+                if (Files.exists(datafile)) {
+                    break;
+                }
+                Thread.sleep(100);
+            }
+            //now it is created we wait for Jacoco to stop
+            //this is awesomely hacky
+            for (;;) {
+                boolean running = false;
+                for (Thread entry : Thread.getAllStackTraces().keySet()) {
+                    if (entry.getClass().getName().startsWith("org.jacoco")) {
+                        running = true;
+                    }
+                }
+                if (!running) {
+                    break;
+                } else {
+                    Thread.sleep(100);
+                }
+            }
+            ExecFileLoader loader = new ExecFileLoader();
+            loader.load(datafile.toFile());
+            final CoverageBuilder builder = new CoverageBuilder();
+            final Analyzer analyzer = new Analyzer(
+                    loader.getExecutionDataStore(), builder);
+            for (String i : reportInfo.classFiles) {
+                analyzer.analyzeAll(new File(i));
+            }
+
+            List<IReportVisitor> formatters = new ArrayList<>();
+            addXmlFormatter(new File(targetdir, "jacoco.xml"), config.outputEncoding, formatters);
+            addCsvFormatter(new File(targetdir, "jacoco.csv"), config.outputEncoding, formatters);
+            addHtmlFormatter(targetdir, config.outputEncoding, config.footer.orElse(""), Locale.getDefault(),
+                    formatters);
+
+            //now for the hacky bit
+
+            final IReportVisitor visitor = new MultiReportVisitor(formatters);
+            visitor.visitInfo(loader.getSessionInfoStore().getInfos(),
+                    loader.getExecutionDataStore().getContents());
+            MultiSourceFileLocator sourceFileLocator = new MultiSourceFileLocator(4);
+            for (String i : reportInfo.sourceDirectories) {
+                sourceFileLocator.add(new DirectorySourceFileLocator(new File(i), config.sourceEncoding, 4));
+            }
+            final IBundleCoverage bundle = builder.getBundle(config.title.orElse(reportInfo.artifactId));
+            visitor.visitBundle(bundle, sourceFileLocator);
+            visitor.visitEnd();
+            System.out.println("Generated Jacoco reports in " + targetdir);
+            System.out.flush();
+        } catch (Exception e) {
+            System.err.println("Failed to generate Jacoco reports ");
+            e.printStackTrace();
+            System.err.flush();
+        }
+    }
+
+    public void addXmlFormatter(final File targetfile, final String encoding, List<IReportVisitor> formatters)
+            throws IOException {
+        final XMLFormatter xml = new XMLFormatter();
+        xml.setOutputEncoding(encoding);
+        formatters.add(xml.createVisitor(new FileOutputStream(targetfile)));
+    }
+
+    public void addCsvFormatter(final File targetfile, final String encoding, List<IReportVisitor> formatters)
+            throws IOException {
+        final CSVFormatter csv = new CSVFormatter();
+        csv.setOutputEncoding(encoding);
+        formatters.add(csv.createVisitor(new FileOutputStream(targetfile)));
+    }
+
+    public void addHtmlFormatter(final File targetdir, final String encoding,
+            final String footer, final Locale locale, List<IReportVisitor> formatters) throws IOException {
+        final HTMLFormatter htmlFormatter = new HTMLFormatter();
+        htmlFormatter.setOutputEncoding(encoding);
+        htmlFormatter.setLocale(locale);
+        if (footer != null) {
+            htmlFormatter.setFooterText(footer);
+        }
+        formatters.add(htmlFormatter
+                .createVisitor(new FileMultiReportOutput(targetdir)));
+    }
+
+}
diff --git a/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportInfo.java b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportInfo.java
new file mode 100644
index 0000000000000..5250e54e7f0c4
--- /dev/null
+++ b/test-framework/jacoco/runtime/src/main/java/io/quarkus/jacoco/runtime/ReportInfo.java
@@ -0,0 +1,13 @@
+package io.quarkus.jacoco.runtime;
+
+import java.util.Set;
+
+public class ReportInfo {
+
+    public String reportDir;
+    public String savedData;
+    public Set<String> sourceDirectories;
+    public Set<String> classFiles;
+    public String artifactId;
+
+}
diff --git a/test-framework/jacoco/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/test-framework/jacoco/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000000..7e233728e2cf8
--- /dev/null
+++ b/test-framework/jacoco/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,10 @@
+---
+name: "Jacoco - Code Coverage"
+metadata:
+  keywords:
+  - "testing"
+  - "coverage"
+  guide: "https://quarkus.io/guides/tests-with-coverage"
+  categories:
+  - "miscellaneous"
+  status: "experimental"
diff --git a/test-framework/junit5-internal/pom.xml b/test-framework/junit5-internal/pom.xml
index 76102ac899c8f..85c157b718a99 100644
--- a/test-framework/junit5-internal/pom.xml
+++ b/test-framework/junit5-internal/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-junit5-internal</artifactId>
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java
index 2b05fdb3663aa..c606b9c80f00d 100644
--- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/InMemoryLogHandler.java
@@ -17,7 +17,7 @@ public InMemoryLogHandler(Predicate<LogRecord> predicate) {
         this.predicate = Assert.checkNotNullParam("predicate", predicate);
     }
 
-    public final List<LogRecord> records = new ArrayList<>();
+    final List<LogRecord> records = new ArrayList<>();
 
     @Override
     public void publish(LogRecord record) {
@@ -37,6 +37,10 @@ public Level getLevel() {
 
     @Override
     public void close() throws SecurityException {
+        this.records.clear();
+    }
 
+    void clearRecords() {
+        this.records.clear();
     }
 }
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
index dbf057bcb0692..bb291e63bd2d7 100644
--- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
@@ -48,6 +48,8 @@
 import io.quarkus.deployment.dev.DevModeMain;
 import io.quarkus.deployment.util.FileUtil;
 import io.quarkus.dev.appstate.ApplicationStateNotification;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.runtime.util.ClassPathUtils;
 import io.quarkus.test.common.PathTestHelper;
 import io.quarkus.test.common.PropertyTestUtil;
@@ -147,6 +149,8 @@ public Object createTestInstance(TestInstanceFactoryContext factoryContext, Exte
 
     @Override
     public void beforeAll(ExtensionContext context) throws Exception {
+        //set the right launch mode in the outer CL, used by the HTTP host config source
+        ProfileManager.setLaunchMode(LaunchMode.DEVELOPMENT);
         originalRootLoggerHandlers = rootLogger.getHandlers();
         rootLogger.addHandler(inMemoryLogHandler);
     }
@@ -209,6 +213,7 @@ public void close() throws Throwable {
     @Override
     public void afterAll(ExtensionContext context) throws Exception {
         rootLogger.setHandlers(originalRootLoggerHandlers);
+        inMemoryLogHandler.clearRecords();
     }
 
     @Override
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java
index 842882bd97c1e..baea382976984 100644
--- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusProdModeTest.java
@@ -35,6 +35,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.inject.Inject;
+
 import org.jboss.logmanager.Logger;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
@@ -47,6 +49,7 @@
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
 import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.platform.commons.JUnitException;
 
 import io.quarkus.bootstrap.app.AugmentAction;
 import io.quarkus.bootstrap.app.AugmentResult;
@@ -97,10 +100,13 @@ public class QuarkusProdModeTest
 
     private String logFileName;
     private Map<String, String> runtimeProperties;
+    // by default, we use these lower heap settings
+    private List<String> jvmArgs = Collections.singletonList("-Xmx128m");
     private Map<String, String> testResourceProperties = new HashMap<>();
 
     private Process process;
 
+    private Path builtResultArtifact;
     private ProdModeTestResults prodModeTestResults;
     private Optional<Field> prodModeTestResultsField = Optional.empty();
     private Path logfilePath;
@@ -109,7 +115,7 @@ public class QuarkusProdModeTest
     private InMemoryLogHandler inMemoryLogHandler = new InMemoryLogHandler((r) -> false);
     private boolean expectExit;
     private String startupConsoleOutput;
-    private int exitCode;
+    private Integer exitCode;
     private Consumer<Throwable> assertBuildException;
     private String[] commandLineParameters = new String[0];
 
@@ -181,6 +187,14 @@ public QuarkusProdModeTest setLogFileName(String logFileName) {
         return this;
     }
 
+    /**
+     * The complete set of JVM args to be used if the built artifact is configured to be run
+     */
+    public QuarkusProdModeTest setJVMArgs(final List<String> jvmArgs) {
+        this.jvmArgs = jvmArgs;
+        return this;
+    }
+
     /**
      * The runtime configuration properties to be used if the built artifact is configured to be run
      */
@@ -246,9 +260,10 @@ public String getStartupConsoleOutput() {
     }
 
     /**
-     * Returns the process exit code, this can only be used if {@link #expectExit} is true
+     * Returns the process exit code, this can only be used if {@link #expectExit} is true.
+     * Null if the app is running.
      */
-    public int getExitCode() {
+    public Integer getExitCode() {
         return exitCode;
     }
 
@@ -292,6 +307,8 @@ private JavaArchive getArchiveProducerOrDefault() {
 
     @Override
     public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        ensureNoInjectAnnotationIsUsed(extensionContext.getRequiredTestClass());
+
         originalHandlers = rootLogger.getHandlers();
         rootLogger.addHandler(inMemoryLogHandler);
 
@@ -358,6 +375,7 @@ public void close() throws Throwable {
                     .setApplicationRoot(deploymentDir)
                     .setMode(QuarkusBootstrap.Mode.PROD)
                     .setLocalProjectDiscovery(true)
+                    .setIsolateDeployment(true)
                     .addExcludedPath(testLocation)
                     .setProjectRoot(testLocation)
                     .setTargetDirectory(buildDir)
@@ -386,14 +404,10 @@ public void close() throws Throwable {
                 curatedApplication.close();
             }
 
-            Path builtResultArtifact = setupProdModeResults(testClass, buildDir, result);
+            builtResultArtifact = setupProdModeResults(testClass, buildDir, result);
 
             if (run) {
-                startBuiltResult(builtResultArtifact);
-                RestAssuredURLManager.setURL(false,
-                        runtimeProperties.get(QUARKUS_HTTP_PORT_PROPERTY) != null
-                                ? Integer.parseInt(runtimeProperties.get(QUARKUS_HTTP_PORT_PROPERTY))
-                                : DEFAULT_HTTP_PORT_INT);
+                start();
 
                 if (logfilePath != null) {
                     logfileField = Arrays.stream(testClass.getDeclaredFields()).filter(
@@ -410,6 +424,23 @@ public void close() throws Throwable {
         }
     }
 
+    private void ensureNoInjectAnnotationIsUsed(Class<?> testClass) {
+        Class<?> current = testClass;
+        while (current.getSuperclass() != null) {
+            for (Field field : current.getDeclaredFields()) {
+                Inject injectAnnotation = field.getAnnotation(Inject.class);
+                if (injectAnnotation != null) {
+                    throw new JUnitException(
+                            "@Inject is not supported in QuarkusProdModeTest tests. Offending field is "
+                                    + field.getDeclaringClass().getTypeName() + "."
+                                    + field.getName());
+                }
+            }
+            current = current.getSuperclass();
+        }
+
+    }
+
     private void logOutputPathForPostMortem() {
         if (buildDir != null) {
             String message = "The output of the Quarkus build can be found at " + buildDir.toAbsolutePath().toString();
@@ -433,8 +464,20 @@ private Path setupProdModeResults(Class<?> testClass, Path buildDir, AugmentResu
         return builtResultArtifact;
     }
 
-    private void startBuiltResult(Path builtResultArtifact) throws IOException {
-        Path builtResultArtifactParentDir = builtResultArtifact.getParent();
+    /**
+     * Start the Quarkus application. If the application is already started, it raises an {@link IllegalStateException}
+     * exception.
+     *
+     * @throws RuntimeException when application errors at startup.
+     * @throws IllegalStateException if the application is already started.
+     */
+    public void start() {
+        if (process != null && process.isAlive()) {
+            throw new IllegalStateException("Quarkus application is already started. ");
+        }
+
+        exitCode = null;
+        Path builtResultArtifactParent = builtResultArtifact.getParent();
 
         if (runtimeProperties == null) {
             runtimeProperties = new HashMap<>();
@@ -444,7 +487,7 @@ private void startBuiltResult(Path builtResultArtifact) throws IOException {
         }
         runtimeProperties.putIfAbsent(QUARKUS_HTTP_PORT_PROPERTY, DEFAULT_HTTP_PORT);
         if (logFileName != null) {
-            logfilePath = builtResultArtifactParentDir.resolve(logFileName);
+            logfilePath = builtResultArtifactParent.resolve(logFileName);
             runtimeProperties.put("quarkus.log.file.path", logfilePath.toAbsolutePath().toString());
             runtimeProperties.put("quarkus.log.file.enable", "true");
         }
@@ -458,21 +501,61 @@ private void startBuiltResult(Path builtResultArtifact) throws IOException {
         List<String> command = new ArrayList<>(systemProperties.size() + 3);
         if (builtResultArtifact.getFileName().toString().endsWith(".jar")) {
             command.add(JavaBinFinder.findBin());
+            if (this.jvmArgs != null) {
+                command.addAll(this.jvmArgs);
+            }
             command.addAll(systemProperties);
             command.add("-jar");
             command.add(builtResultArtifact.toAbsolutePath().toString());
         } else {
             command.add(builtResultArtifact.toAbsolutePath().toString());
+            if (this.jvmArgs != null) {
+                command.addAll(this.jvmArgs);
+            }
             command.addAll(systemProperties);
         }
 
         command.addAll(Arrays.asList(commandLineParameters));
 
-        process = new ProcessBuilder(command)
-                .redirectErrorStream(true)
-                .directory(builtResultArtifactParentDir.toFile())
-                .start();
-        ensureApplicationStartupOrFailure();
+        try {
+            process = new ProcessBuilder(command)
+                    .redirectErrorStream(true)
+                    .directory(builtResultArtifactParent.toFile())
+                    .start();
+            ensureApplicationStartupOrFailure();
+            setupRestAssured();
+        } catch (IOException ex) {
+            throw new RuntimeException("The produced jar could not be launched. ", ex);
+        }
+    }
+
+    /**
+     * Stop the Quarkus application.
+     */
+    public void stop() {
+        try {
+            if (process != null) {
+                process.destroy();
+                process.waitFor();
+                exitCode = process.exitValue();
+            }
+        } catch (InterruptedException ignored) {
+
+        }
+    }
+
+    private void setupRestAssured() {
+        Integer httpPort = Optional.ofNullable(runtimeProperties.get(QUARKUS_HTTP_PORT_PROPERTY))
+                .map(Integer::parseInt)
+                .orElse(DEFAULT_HTTP_PORT_INT);
+
+        // If http port is 0, then we need to set the port to null in order to use the `quarkus.https.test-port` property
+        // which is done in `RestAssuredURLManager.setURL`.
+        if (httpPort == 0) {
+            httpPort = null;
+        }
+
+        RestAssuredURLManager.setURL(false, httpPort);
     }
 
     private void ensureApplicationStartupOrFailure() throws IOException {
@@ -543,19 +626,13 @@ public void testFailed(ExtensionContext context, Throwable cause) {
     @Override
     public void afterAll(ExtensionContext extensionContext) throws Exception {
         rootLogger.setHandlers(originalHandlers);
+        inMemoryLogHandler.clearRecords();
 
         if (run) {
             RestAssuredURLManager.clearURL();
         }
 
-        try {
-            if (process != null) {
-                process.destroy();
-                process.waitFor();
-            }
-        } catch (InterruptedException ignored) {
-
-        }
+        stop();
 
         try {
             if (curatedApplication != null) {
@@ -573,6 +650,10 @@ public void afterAll(ExtensionContext extensionContext) throws Exception {
 
     @Override
     public void beforeEach(ExtensionContext context) {
+        if (run && (process == null || !process.isAlive())) {
+            start();
+        }
+
         prodModeTestResultsField.ifPresent(f -> {
             try {
                 f.set(context.getRequiredTestInstance(), prodModeTestResults);
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
index ed4e07f8942ec..8edc7a1fa6c52 100644
--- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
@@ -23,9 +23,14 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.logging.Handler;
+import java.util.logging.LogManager;
+import java.util.logging.LogRecord;
 import java.util.stream.Collectors;
 
+import org.jboss.logmanager.Logger;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -42,6 +47,7 @@
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
 import io.quarkus.bootstrap.app.RunningQuarkusApplication;
+import io.quarkus.bootstrap.classloading.ClassLoaderEventListener;
 import io.quarkus.bootstrap.classloading.ClassPathElement;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.bootstrap.model.AppArtifact;
@@ -53,6 +59,8 @@
 import io.quarkus.builder.item.BuildItem;
 import io.quarkus.deployment.util.FileUtil;
 import io.quarkus.runner.bootstrap.AugmentActionImpl;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.ProfileManager;
 import io.quarkus.test.common.PathTestHelper;
 import io.quarkus.test.common.PropertyTestUtil;
 import io.quarkus.test.common.RestAssuredURLManager;
@@ -68,8 +76,12 @@ public class QuarkusUnitTest
 
     public static final String THE_BUILD_WAS_EXPECTED_TO_FAIL = "The build was expected to fail";
 
+    private static final Logger rootLogger;
+    private Handler[] originalHandlers;
+
     static {
         System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager");
+        rootLogger = (Logger) LogManager.getLogManager().getLogger("");
     }
 
     boolean started = false;
@@ -79,9 +91,12 @@ public class QuarkusUnitTest
     private Supplier<JavaArchive> archiveProducer;
     private List<Consumer<BuildChainBuilder>> buildChainCustomizers = new ArrayList<>();
     private Runnable afterUndeployListener;
+
     private String logFileName;
+    private InMemoryLogHandler inMemoryLogHandler = new InMemoryLogHandler((r) -> false);
+    private Consumer<List<LogRecord>> assertLogRecords;
 
-    private static final Timer timeoutTimer = new Timer("Test thread dump timer");
+    private Timer timeoutTimer;
     private volatile TimerTask timeoutTask;
     private Properties customApplicationProperties;
     private Runnable beforeAllCustomizer;
@@ -98,6 +113,7 @@ public class QuarkusUnitTest
     private String[] commandLineParameters = new String[0];
 
     private boolean allowTestClassOutsideDeployment;
+    private List<ClassLoaderEventListener> classLoadListeners = new ArrayList<>();
 
     public QuarkusUnitTest setExpectedException(Class<? extends Throwable> expectedException) {
         return assertException(t -> {
@@ -151,11 +167,38 @@ public QuarkusUnitTest addBuildChainCustomizer(Consumer<BuildChainBuilder> custo
         return this;
     }
 
+    public QuarkusUnitTest addClassLoaderEventListener(ClassLoaderEventListener listener) {
+        this.classLoadListeners.add(listener);
+        return this;
+    }
+
     public QuarkusUnitTest setLogFileName(String logFileName) {
         this.logFileName = logFileName;
         return this;
     }
 
+    public QuarkusUnitTest setLogRecordPredicate(Predicate<LogRecord> predicate) {
+        this.inMemoryLogHandler = new InMemoryLogHandler(predicate);
+        return this;
+    }
+
+    public List<LogRecord> getLogRecords() {
+        return inMemoryLogHandler.records;
+    }
+
+    public void clearLogRecords() {
+        inMemoryLogHandler.clearRecords();
+    }
+
+    public QuarkusUnitTest assertLogRecords(Consumer<List<LogRecord>> assertLogRecords) {
+        if (this.assertLogRecords != null) {
+            throw new IllegalStateException("Don't set the a log record assertion twice"
+                    + " to avoid shadowing out the first call.");
+        }
+        this.assertLogRecords = assertLogRecords;
+        return this;
+    }
+
     // set a Runnable that will run before ANYTHING else is done
     public QuarkusUnitTest setBeforeAllCustomizer(Runnable beforeAllCustomizer) {
         this.beforeAllCustomizer = beforeAllCustomizer;
@@ -200,6 +243,7 @@ private void exportArchive(Path deploymentDir, Class<?> testClass) {
         try {
             JavaArchive archive = getArchiveProducerOrDefault();
             Class<?> c = testClass;
+            archive.addClasses(c.getClasses());
             while (c != Object.class) {
                 archive.addClass(c);
                 c = c.getSuperclass();
@@ -304,10 +348,15 @@ private void runExtensionMethod(ReflectiveInvocationContext<Method> invocationCo
 
     @Override
     public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        //set the right launch mode in the outer CL, used by the HTTP host config source
+        ProfileManager.setLaunchMode(LaunchMode.TEST);
         if (beforeAllCustomizer != null) {
             beforeAllCustomizer.run();
         }
         originalClassLoader = Thread.currentThread().getContextClassLoader();
+        originalHandlers = rootLogger.getHandlers();
+        rootLogger.addHandler(inMemoryLogHandler);
+
         timeoutTask = new TimerTask() {
             @Override
             public void run() {
@@ -322,6 +371,7 @@ public void run() {
                 }
             }
         };
+        timeoutTimer = new Timer("Test thread dump timer");
         timeoutTimer.schedule(timeoutTask, 1000 * 60 * 5);
         if (logFileName != null) {
             PropertyTestUtil.setLogFileProperty(logFileName);
@@ -374,7 +424,9 @@ public void execute(BuildContext context) {
                     }
                 });
             } catch (ClassNotFoundException e) {
-                //ignore
+                System.err.println("Couldn't make the test class " + testClass.getSimpleName() + " an unremovable bean"
+                        + " (probably because a dependency on io.quarkus:quarkus-arc-deployment is missing);"
+                        + " other beans may also be removed and injection may not work as expected");
             }
 
             final Path testLocation = PathTestHelper.getTestClassesLocation(testClass);
@@ -397,11 +449,13 @@ public void execute(BuildContext context) {
                             .setBaseClassLoader(
                                     QuarkusClassLoader
                                             .builder("QuarkusUnitTest ClassLoader", getClass().getClassLoader(), false)
+                                            .addClassLoaderEventListeners(this.classLoadListeners)
                                             .addBannedElement(ClassPathElement.fromPath(testLocation)).build());
                 }
+                builder.addClassLoaderEventListeners(this.classLoadListeners);
                 curatedApplication = builder.build().bootstrap();
 
-                runningQuarkusApplication = new AugmentActionImpl(curatedApplication, customizers)
+                runningQuarkusApplication = new AugmentActionImpl(curatedApplication, customizers, classLoadListeners)
                         .createInitialRuntimeApplication()
                         .run(commandLineParameters);
                 //we restore the CL at the end of the test
@@ -467,21 +521,33 @@ private Throwable unwrapException(Throwable cause) {
 
     @Override
     public void afterAll(ExtensionContext extensionContext) throws Exception {
+        actualTestClass = null;
+        actualTestInstance = null;
+        if (assertLogRecords != null) {
+            assertLogRecords.accept(inMemoryLogHandler.records);
+        }
+        rootLogger.setHandlers(originalHandlers);
+        inMemoryLogHandler.clearRecords();
+
         try {
             if (runningQuarkusApplication != null) {
                 runningQuarkusApplication.close();
+                runningQuarkusApplication = null;
             }
             if (afterUndeployListener != null) {
                 afterUndeployListener.run();
             }
             if (curatedApplication != null) {
                 curatedApplication.close();
+                curatedApplication = null;
             }
         } finally {
             System.clearProperty("test.url");
             Thread.currentThread().setContextClassLoader(originalClassLoader);
+            originalClassLoader = null;
             timeoutTask.cancel();
             timeoutTask = null;
+            timeoutTimer = null;
             if (deploymentDir != null) {
                 FileUtil.deleteDirectory(deploymentDir);
             }
diff --git a/test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java b/test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java
new file mode 100644
index 0000000000000..f8dbece2c0cb7
--- /dev/null
+++ b/test-framework/junit5-internal/src/test/java/io/quarkus/test/QuarkusProdModeTestTest.java
@@ -0,0 +1,42 @@
+package io.quarkus.test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class QuarkusProdModeTestTest {
+    @RegisterExtension
+    static final QuarkusProdModeTest simpleApp = new QuarkusProdModeTest()
+            .setApplicationName("simple-app")
+            .setApplicationVersion("0.1-SNAPSHOT")
+            .setRun(true);
+
+    @Test
+    public void shouldStartAndStopInnerProcess() {
+        thenAppIsRunning();
+
+        whenStopApp();
+        thenAppIsNotRunning();
+
+        whenStartApp();
+        thenAppIsRunning();
+    }
+
+    private void whenStopApp() {
+        simpleApp.stop();
+    }
+
+    private void whenStartApp() {
+        simpleApp.start();
+    }
+
+    private void thenAppIsNotRunning() {
+        assertNotNull(simpleApp.getExitCode(), "App is running");
+    }
+
+    private void thenAppIsRunning() {
+        assertNull(simpleApp.getExitCode(), "App is not running");
+    }
+}
diff --git a/test-framework/junit5-mockito/pom.xml b/test-framework/junit5-mockito/pom.xml
index 465485124808b..337bbb7347f96 100644
--- a/test-framework/junit5-mockito/pom.xml
+++ b/test-framework/junit5-mockito/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-junit5-mockito</artifactId>
@@ -27,6 +26,10 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-mutiny</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java
index e54e9d0e69d33..4b85bbdcea43e 100644
--- a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java
+++ b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoMocksCallback.java
@@ -4,43 +4,67 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.inject.Qualifier;
 
 import org.mockito.Mockito;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.ClientProxy;
 import io.quarkus.arc.InstanceHandle;
-import io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback;
+import io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback;
 import io.quarkus.test.junit.mockito.InjectMock;
 
-public class CreateMockitoMocksCallback implements QuarkusTestBeforeAllCallback {
+public class CreateMockitoMocksCallback implements QuarkusTestAfterConstructCallback {
 
     @Override
-    public void beforeAll(Object testInstance) {
+    public void afterConstruct(Object testInstance) {
         Class<?> current = testInstance.getClass();
         while (current.getSuperclass() != null) {
             for (Field field : current.getDeclaredFields()) {
                 InjectMock injectMockAnnotation = field.getAnnotation(InjectMock.class);
                 if (injectMockAnnotation != null) {
                     Object beanInstance = getBeanInstance(testInstance, field, InjectMock.class);
-                    Object mock = createMockAndSetTestField(testInstance, field, beanInstance);
-                    MockitoMocksTracker.track(testInstance, mock, beanInstance);
+                    Optional<Object> result = createMockAndSetTestField(testInstance, field, beanInstance);
+                    if (result.isPresent()) {
+                        MockitoMocksTracker.track(testInstance, result.get(), beanInstance);
+                    }
                 }
             }
             current = current.getSuperclass();
         }
     }
 
-    private Object createMockAndSetTestField(Object testInstance, Field field, Object beanInstance) {
-        Object mock = Mockito.mock(beanInstance.getClass());
+    private Optional<Object> createMockAndSetTestField(Object testInstance, Field field, Object beanInstance) {
+        Class<?> beanClass = beanInstance.getClass();
+        // make sure we don't mock proxy classes, especially given that they don't have generics info
+        if (ClientProxy.class.isAssignableFrom(beanClass)) {
+            // and yet some of them appear to have Object as supertype, avoid them
+            if (beanClass.getSuperclass() != Object.class)
+                beanClass = beanClass.getSuperclass();
+        }
+        Object mock;
+        boolean isNew;
+        Optional<Object> currentMock = MockitoMocksTracker.currentMock(testInstance, beanInstance);
+        if (currentMock.isPresent()) {
+            mock = currentMock.get();
+            isNew = false;
+        } else {
+            mock = Mockito.mock(beanClass);
+            isNew = true;
+        }
         field.setAccessible(true);
         try {
             field.set(testInstance, mock);
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
         }
-        return mock;
+        if (isNew) {
+            return Optional.of(mock);
+        } else {
+            return Optional.empty();
+        }
     }
 
     static Object getBeanInstance(Object testInstance, Field field, Class<? extends Annotation> annotationType) {
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java
index 5f70e614ca4f0..b292e0d18700a 100644
--- a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java
+++ b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/CreateMockitoSpiesCallback.java
@@ -5,13 +5,13 @@
 import org.mockito.Mockito;
 
 import io.quarkus.arc.runtime.ClientProxyUnwrapper;
-import io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback;
+import io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback;
 import io.quarkus.test.junit.mockito.InjectSpy;
 
-public class CreateMockitoSpiesCallback implements QuarkusTestBeforeAllCallback {
+public class CreateMockitoSpiesCallback implements QuarkusTestAfterConstructCallback {
 
     @Override
-    public void beforeAll(Object testInstance) {
+    public void afterConstruct(Object testInstance) {
         Class<?> current = testInstance.getClass();
         while (current.getSuperclass() != null) {
             for (Field field : current.getDeclaredFields()) {
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java
index 0db8dc76238f1..db816ae9c6ce2 100644
--- a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java
+++ b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MockitoMocksTracker.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -27,6 +28,16 @@ static void reset(Object testInstance) {
         Mockito.reset(getMocks(testInstance).stream().map(o -> o.mock).toArray());
     }
 
+    static Optional<Object> currentMock(Object testInstance, Object beanInstance) {
+        Set<Mocked> mocks = getMocks(testInstance);
+        for (Mocked mocked : mocks) {
+            if (mocked.beanInstance == beanInstance) {
+                return Optional.of(mocked.mock);
+            }
+        }
+        return Optional.empty();
+    }
+
     static class Mocked {
         final Object mock;
         final Object beanInstance;
diff --git a/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java
new file mode 100644
index 0000000000000..4dcf39b4d374e
--- /dev/null
+++ b/test-framework/junit5-mockito/src/main/java/io/quarkus/test/junit/mockito/internal/MutinyAnswer.java
@@ -0,0 +1,135 @@
+package io.quarkus.test.junit.mockito.internal;
+
+import static org.mockito.internal.util.ObjectMethodsGuru.isCompareToMethod;
+import static org.mockito.internal.util.ObjectMethodsGuru.isToStringMethod;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.mockito.internal.stubbing.defaultanswers.ReturnsEmptyValues;
+import org.mockito.internal.util.JavaEightUtil;
+import org.mockito.internal.util.Primitives;
+import org.mockito.invocation.InvocationOnMock;
+
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
+
+@SuppressWarnings("serial")
+public class MutinyAnswer extends ReturnsEmptyValues {
+
+    @Override
+    public Object answer(InvocationOnMock inv) {
+        if (isToStringMethod(inv.getMethod())
+                || isCompareToMethod(inv.getMethod())) {
+            return super.answer(inv);
+        }
+
+        Class<?> returnType = inv.getMethod().getReturnType();
+        // save the user some time figuring out this issue when it happens
+        if ((returnType.getName().equals(Multi.class.getName()) && returnType != Multi.class)
+                || (returnType.getName().equals(Uni.class.getName()) && returnType != Uni.class)) {
+            throw new IllegalStateException("Class loader issue: we have two Multi classes with different class loaders. "
+                    + "Make sure to initialize this class with the QuarkusClassLoader.");
+        }
+        if (returnType == Multi.class) {
+            return Multi.createFrom().item(returnValueForMutiny(inv.getMethod().getGenericReturnType()));
+        } else if (returnType == Uni.class) {
+            return Uni.createFrom().item(returnValueForMutiny(inv.getMethod().getGenericReturnType()));
+        }
+        return returnValueForClass(returnType);
+    }
+
+    private Object returnValueForMutiny(Type uniOrMultiType) {
+        // check for raw types
+        if (uniOrMultiType instanceof Class)
+            return returnValueForClass(Object.class);
+        Type ret = ((ParameterizedType) uniOrMultiType).getActualTypeArguments()[0];
+        return returnValueForType(ret);
+    }
+
+    private Object returnValueForType(Type type) {
+        if (type instanceof Class)
+            return returnValueForClass((Class<?>) type);
+        if (type instanceof ParameterizedType)
+            return returnValueForClass((Class<?>) ((ParameterizedType) type).getRawType());
+        if (type instanceof TypeVariable) {
+            TypeVariable<?> tv = (TypeVariable<?>) type;
+            // default upper bound is Object so we always have a value
+            return returnValueForType(tv.getBounds()[0]);
+        }
+        return returnValueForClass(Object.class);
+    }
+
+    // copied from supertype due to access restriction :(
+    Object returnValueForClass(Class<?> type) {
+        if (Primitives.isPrimitiveOrWrapper(type)) {
+            return Primitives.defaultValue(type);
+            //new instances are used instead of Collections.emptyList(), etc.
+            //to avoid UnsupportedOperationException if code under test modifies returned collection
+        } else if (type == Iterable.class) {
+            return new ArrayList<Object>(0);
+        } else if (type == Collection.class) {
+            return new LinkedList<Object>();
+        } else if (type == Set.class) {
+            return new HashSet<Object>();
+        } else if (type == HashSet.class) {
+            return new HashSet<Object>();
+        } else if (type == SortedSet.class) {
+            return new TreeSet<Object>();
+        } else if (type == TreeSet.class) {
+            return new TreeSet<Object>();
+        } else if (type == LinkedHashSet.class) {
+            return new LinkedHashSet<Object>();
+        } else if (type == List.class) {
+            return new LinkedList<Object>();
+        } else if (type == LinkedList.class) {
+            return new LinkedList<Object>();
+        } else if (type == ArrayList.class) {
+            return new ArrayList<Object>();
+        } else if (type == Map.class) {
+            return new HashMap<Object, Object>();
+        } else if (type == HashMap.class) {
+            return new HashMap<Object, Object>();
+        } else if (type == SortedMap.class) {
+            return new TreeMap<Object, Object>();
+        } else if (type == TreeMap.class) {
+            return new TreeMap<Object, Object>();
+        } else if (type == LinkedHashMap.class) {
+            return new LinkedHashMap<Object, Object>();
+        } else if ("java.util.Optional".equals(type.getName())) {
+            return JavaEightUtil.emptyOptional();
+        } else if ("java.util.OptionalDouble".equals(type.getName())) {
+            return JavaEightUtil.emptyOptionalDouble();
+        } else if ("java.util.OptionalInt".equals(type.getName())) {
+            return JavaEightUtil.emptyOptionalInt();
+        } else if ("java.util.OptionalLong".equals(type.getName())) {
+            return JavaEightUtil.emptyOptionalLong();
+        } else if ("java.util.stream.Stream".equals(type.getName())) {
+            return JavaEightUtil.emptyStream();
+        } else if ("java.util.stream.DoubleStream".equals(type.getName())) {
+            return JavaEightUtil.emptyDoubleStream();
+        } else if ("java.util.stream.IntStream".equals(type.getName())) {
+            return JavaEightUtil.emptyIntStream();
+        } else if ("java.util.stream.LongStream".equals(type.getName())) {
+            return JavaEightUtil.emptyLongStream();
+        }
+
+        //Let's not care about the rest of collections.
+        return null;
+    }
+}
diff --git a/test-framework/junit5-mockito/src/main/java/org/mockito/configuration/MockitoConfiguration.java b/test-framework/junit5-mockito/src/main/java/org/mockito/configuration/MockitoConfiguration.java
new file mode 100644
index 0000000000000..ce5cfc072412d
--- /dev/null
+++ b/test-framework/junit5-mockito/src/main/java/org/mockito/configuration/MockitoConfiguration.java
@@ -0,0 +1,22 @@
+package org.mockito.configuration;
+
+import org.mockito.stubbing.Answer;
+
+import io.quarkus.test.junit.mockito.internal.MutinyAnswer;
+
+public class MockitoConfiguration extends DefaultMockitoConfiguration {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Answer<Object> getDefaultAnswer() {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        try {
+            // we need to load it from the TCCL (QuarkusClassLoader) instead of our class loader (JUnit CL)
+            Class<?> mutinyAnswer = cl.loadClass(MutinyAnswer.class.getName());
+            return (Answer<Object>) mutinyAnswer.newInstance();
+        } catch (ClassNotFoundException | SecurityException | IllegalArgumentException | IllegalAccessException
+                | InstantiationException e) {
+            throw new RuntimeException("Failed to load MutinyAnswer from the TCCL", e);
+        }
+    }
+}
diff --git a/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback b/test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
similarity index 100%
rename from test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback
rename to test-framework/junit5-mockito/src/main/resources/META-INF/services/io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback
diff --git a/test-framework/junit5/pom.xml b/test-framework/junit5/pom.xml
index 93e47bb8f5778..69aea3a7d57e7 100644
--- a/test-framework/junit5/pom.xml
+++ b/test-framework/junit5/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-junit5</artifactId>
@@ -45,11 +44,15 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-datasource-deployment-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <!-- Avoid adding this to the BOM / Version has to be kept in sync with what optaplanner uses otherwise the enforcer complains -->
-            <version>1.4.11.1</version>
+            <!-- Avoid adding this to the BOM -->
+            <version>1.4.16</version>
         </dependency>
     </dependencies>
 
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java
new file mode 100644
index 0000000000000..28077cf6f2b99
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTest.java
@@ -0,0 +1,39 @@
+package io.quarkus.test.junit;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@code @DisabledOnIntegrationTest} is used to signal that the annotated test class or
+ * test method should not be executed for as part of a {@link QuarkusIntegrationTest}.
+ *
+ * <p>
+ * {@code @DisabledOnIntegrationTest} may optionally be declared with a {@linkplain #value
+ * reason} to document why the annotated test class or test method is disabled.
+ *
+ * <p>
+ * When applied at the class level, all test methods within that class
+ * are automatically disabled.
+ *
+ * <p>
+ * When applied at the method level, the presence of this annotation does not
+ * prevent the test class from being instantiated. Rather, it prevents the
+ * execution of the test method and method-level lifecycle callbacks such as
+ * {@code @BeforeEach} methods, {@code @AfterEach} methods, and corresponding
+ * extension APIs.
+ *
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface DisabledOnIntegrationTest {
+    /**
+     * Reason for disabling this test
+     */
+    String value() default "";
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
new file mode 100644
index 0000000000000..824d643121e02
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
@@ -0,0 +1,57 @@
+package io.quarkus.test.junit;
+
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.util.StringUtils;
+
+public class DisabledOnIntegrationTestCondition implements ExecutionCondition {
+
+    private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult
+            .enabled("@DisabledOnIntegrationTest is not present");
+
+    /**
+     * Containers/tests are disabled if {@code @DisabledOnIntegrationTest} is present on the test
+     * class or method and we're running on a native image.
+     */
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+        Optional<AnnotatedElement> element = context.getElement();
+        ConditionEvaluationResult disabledOnIntegrationTestReason = check(context, element, DisabledOnIntegrationTest.class,
+                DisabledOnIntegrationTest::value);
+        if (disabledOnIntegrationTestReason != null) {
+            return disabledOnIntegrationTestReason;
+        }
+        // support DisabledOnNativeImage for backward compatibility
+        ConditionEvaluationResult disabledOnNativeImageReason = check(context, element, DisabledOnNativeImage.class,
+                DisabledOnNativeImage::value);
+        if (disabledOnNativeImageReason != null) {
+            return disabledOnNativeImageReason;
+        }
+        return ENABLED;
+    }
+
+    private <T extends Annotation> ConditionEvaluationResult check(ExtensionContext context, Optional<AnnotatedElement> element,
+            Class<T> annotationClass, Function<T, String> valueExtractor) {
+        Optional<T> disabled = findAnnotation(element, annotationClass);
+        if (disabled.isPresent()) {
+            // Cannot use ExtensionState here because this condition needs to be evaluated before QuarkusTestExtension
+            boolean it = findAnnotation(context.getTestClass(), QuarkusIntegrationTest.class).isPresent();
+            if (it) {
+                String reason = disabled.map(valueExtractor)
+                        .filter(StringUtils::isNotBlank)
+                        .orElseGet(() -> element.get() + " is @DisabledOnIntegrationTest");
+                return ConditionEvaluationResult.disabled(reason);
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java
new file mode 100644
index 0000000000000..4ddd1241f0677
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestExtensionState.java
@@ -0,0 +1,54 @@
+package io.quarkus.test.junit;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import io.quarkus.test.common.TestResourceManager;
+
+public class IntegrationTestExtensionState implements ExtensionContext.Store.CloseableResource {
+
+    private final TestResourceManager testResourceManager;
+    private final Closeable resource;
+    private final Map<String, String> sysPropRestore;
+    private final Thread shutdownHook;
+
+    IntegrationTestExtensionState(TestResourceManager testResourceManager, Closeable resource,
+            Map<String, String> sysPropRestore) {
+        this.testResourceManager = testResourceManager;
+        this.resource = resource;
+        this.sysPropRestore = sysPropRestore;
+        this.shutdownHook = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    IntegrationTestExtensionState.this.close();
+                } catch (IOException ignored) {
+                }
+            }
+        }, "Quarkus Test Cleanup Shutdown task");
+        Runtime.getRuntime().addShutdownHook(shutdownHook);
+
+    }
+
+    @Override
+    public void close() throws IOException {
+        testResourceManager.close();
+        resource.close();
+        for (Map.Entry<String, String> entry : sysPropRestore.entrySet()) {
+            String val = entry.getValue();
+            if (val == null) {
+                System.clearProperty(entry.getKey());
+            } else {
+                System.setProperty(entry.getKey(), val);
+            }
+        }
+        Runtime.getRuntime().removeShutdownHook(shutdownHook);
+    }
+
+    public TestResourceManager getTestResourceManager() {
+        return testResourceManager;
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
new file mode 100644
index 0000000000000..6da9ddb471fb2
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
@@ -0,0 +1,221 @@
+package io.quarkus.test.junit;
+
+import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation;
+import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+
+import javax.enterprise.inject.Alternative;
+import javax.inject.Inject;
+
+import org.jboss.jandex.Index;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.JUnitException;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.PathsCollection;
+import io.quarkus.bootstrap.resolver.model.QuarkusModel;
+import io.quarkus.bootstrap.utils.BuildToolHelper;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem;
+import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.test.common.ArtifactLauncher;
+import io.quarkus.test.common.PathTestHelper;
+import io.quarkus.test.common.TestClassIndexer;
+import io.quarkus.test.common.http.TestHTTPResourceManager;
+
+final class IntegrationTestUtil {
+
+    private IntegrationTestUtil() {
+    }
+
+    static void ensureNoInjectAnnotationIsUsed(Class<?> testClass) {
+        Class<?> current = testClass;
+        while (current.getSuperclass() != null) {
+            for (Field field : current.getDeclaredFields()) {
+                Inject injectAnnotation = field.getAnnotation(Inject.class);
+                if (injectAnnotation != null) {
+                    throw new JUnitException(
+                            "@Inject is not supported in @NativeImageTest and @QuarkusIntegrationTest tests. Offending field is "
+                                    + field.getDeclaringClass().getTypeName() + "."
+                                    + field.getName());
+                }
+            }
+            current = current.getSuperclass();
+        }
+
+    }
+
+    static Class<? extends QuarkusTestProfile> findProfile(Class<?> testClass) {
+        while (testClass != Object.class) {
+            TestProfile annotation = testClass.getAnnotation(TestProfile.class);
+            if (annotation != null) {
+                return annotation.value();
+            }
+            testClass = testClass.getSuperclass();
+        }
+        return null;
+    }
+
+    static void doProcessTestInstance(Object testInstance, ExtensionContext context) {
+        TestHTTPResourceManager.inject(testInstance);
+        ExtensionContext root = context.getRoot();
+        ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL);
+        IntegrationTestExtensionState state = store.get(IntegrationTestExtensionState.class.getName(),
+                IntegrationTestExtensionState.class);
+        state.getTestResourceManager().inject(testInstance);
+    }
+
+    static Map<String, String> getSysPropsToRestore() {
+        Map<String, String> sysPropRestore = new HashMap<>();
+        sysPropRestore.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP,
+                System.getProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP));
+        return sysPropRestore;
+    }
+
+    static TestProfileAndProperties determineTestProfileAndProperties(Class<? extends QuarkusTestProfile> profile,
+            Map<String, String> sysPropRestore) throws InstantiationException, IllegalAccessException {
+        final Map<String, String> properties = new HashMap<>();
+        QuarkusTestProfile testProfile = null;
+        if (profile != null) {
+            testProfile = profile.newInstance();
+            properties.putAll(testProfile.getConfigOverrides());
+            final Set<Class<?>> enabledAlternatives = testProfile.getEnabledAlternatives();
+            if (!enabledAlternatives.isEmpty()) {
+                properties.put("quarkus.arc.selected-alternatives", enabledAlternatives.stream()
+                        .peek((c) -> {
+                            if (!c.isAnnotationPresent(Alternative.class)) {
+                                throw new RuntimeException(
+                                        "Enabled alternative " + c + " is not annotated with @Alternative");
+                            }
+                        })
+                        .map(Class::getName).collect(Collectors.joining(",")));
+            }
+            final String configProfile = testProfile.getConfigProfile();
+            if (configProfile != null) {
+                properties.put(ProfileManager.QUARKUS_PROFILE_PROP, configProfile);
+            }
+            properties.put("quarkus.configuration.build-time-mismatch-at-runtime", "fail");
+            for (Map.Entry<String, String> i : properties.entrySet()) {
+                sysPropRestore.put(i.getKey(), System.getProperty(i.getKey()));
+            }
+            for (Map.Entry<String, String> i : properties.entrySet()) {
+                System.setProperty(i.getKey(), i.getValue());
+            }
+        }
+        return new TestProfileAndProperties(testProfile, properties);
+    }
+
+    static void startLauncher(ArtifactLauncher launcher, Map<String, String> additionalProperties, Runnable sslSetter)
+            throws IOException {
+        launcher.addSystemProperties(additionalProperties);
+        try {
+            launcher.start();
+        } catch (IOException e) {
+            try {
+                launcher.close();
+            } catch (Throwable ignored) {
+            }
+            throw e;
+        }
+        if (launcher.listensOnSsl()) {
+            if (sslSetter != null) {
+                sslSetter.run();
+            }
+        }
+    }
+
+    static Map<String, String> handleDevDb(ExtensionContext context) throws Exception {
+        Class<?> requiredTestClass = context.getRequiredTestClass();
+        Path testClassLocation = getTestClassesLocation(requiredTestClass);
+        final Path appClassLocation = getAppClassLocationForTestLocation(testClassLocation.toString());
+
+        PathsCollection.Builder rootBuilder = PathsCollection.builder();
+
+        if (!appClassLocation.equals(testClassLocation)) {
+            rootBuilder.add(testClassLocation);
+            // if test classes is a dir, we should also check whether test resources dir exists as a separate dir (gradle)
+            // TODO: this whole app/test path resolution logic is pretty dumb, it needs be re-worked using proper workspace discovery
+            final Path testResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(testClassLocation, "test");
+            if (testResourcesLocation != null) {
+                rootBuilder.add(testResourcesLocation);
+            }
+        }
+        final QuarkusBootstrap.Builder runnerBuilder = QuarkusBootstrap.builder()
+                .setIsolateDeployment(true)
+                .setMode(QuarkusBootstrap.Mode.TEST);
+        QuarkusTestProfile profileInstance = null;
+
+        final Path projectRoot = Paths.get("").normalize().toAbsolutePath();
+        runnerBuilder.setProjectRoot(projectRoot);
+        Path outputDir;
+        try {
+            // this should work for both maven and gradle
+            outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0));
+        } catch (Exception e) {
+            // this shouldn't happen since testClassLocation is usually found under the project dir
+            outputDir = projectRoot;
+        }
+        runnerBuilder.setTargetDirectory(outputDir);
+
+        rootBuilder.add(appClassLocation);
+        final Path appResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(appClassLocation, "main");
+        if (appResourcesLocation != null) {
+            rootBuilder.add(appResourcesLocation);
+        }
+
+        // If gradle project running directly with IDE
+        if (System.getProperty(BootstrapConstants.SERIALIZED_APP_MODEL) == null) {
+            QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(projectRoot);
+            if (model != null) {
+                final Set<File> classDirectories = model.getWorkspace().getMainModule().getSourceSet()
+                        .getSourceDirectories();
+                for (File classes : classDirectories) {
+                    if (classes.exists() && !rootBuilder.contains(classes.toPath())) {
+                        rootBuilder.add(classes.toPath());
+                    }
+                }
+            }
+        } else if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) {
+            final String[] sourceDirectories = System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR).split(",");
+            for (String sourceDirectory : sourceDirectories) {
+                final Path directory = Paths.get(sourceDirectory);
+                if (Files.exists(directory) && !rootBuilder.contains(directory)) {
+                    rootBuilder.add(directory);
+                }
+            }
+        }
+        runnerBuilder.setApplicationRoot(rootBuilder.build());
+
+        CuratedApplication curatedApplication = runnerBuilder
+                .setTest(true)
+                .build()
+                .bootstrap();
+
+        Index testClassesIndex = TestClassIndexer.indexTestClasses(requiredTestClass);
+        // we need to write the Index to make it reusable from other parts of the testing infrastructure that run in different ClassLoaders
+        TestClassIndexer.writeIndex(testClassesIndex, requiredTestClass);
+
+        Map<String, String> propertyMap = new HashMap<>();
+        curatedApplication
+                .createAugmentor()
+                .performCustomBuild(NativeDevServicesDatasourceHandler.class.getName(), new BiConsumer<String, String>() {
+                    @Override
+                    public void accept(String s, String s2) {
+                        propertyMap.put(s, s2);
+                    }
+                }, DevServicesDatasourceResultBuildItem.class.getName());
+        return propertyMap;
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java
index 31e4b617084fe..60107393d702d 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java
@@ -1,5 +1,6 @@
 package io.quarkus.test.junit;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -10,17 +11,19 @@ class MockSupport {
 
     private static final Deque<List<Object>> contexts = new ArrayDeque<>();
 
-    @SuppressWarnings("unused")
     static void pushContext() {
         contexts.push(new ArrayList<>());
     }
 
-    @SuppressWarnings("unused")
     static void popContext() {
         List<Object> val = contexts.pop();
         for (Object i : val) {
             try {
-                i.getClass().getDeclaredMethod("quarkus$$clearMock").invoke(i);
+                i.getClass().getDeclaredMethod("arc$clearMock").invoke(i);
+
+                // Enable all observers declared on the mocked bean
+                mockObservers(i, false);
+
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -33,15 +36,36 @@ static <T> void installMock(T instance, T mock) {
         if (inst == null) {
             throw new IllegalStateException("No test in progress");
         }
+        if (!(instance.getClass().getSuperclass().isAssignableFrom(mock.getClass()))) {
+            throw new RuntimeException(mock
+                    + " is not assignable to type " + instance.getClass().getSuperclass());
+        }
         try {
-            Method setMethod = instance.getClass().getDeclaredMethod("quarkus$$setMock", Object.class);
+            Method setMethod = instance.getClass().getDeclaredMethod("arc$setMock", Object.class);
             setMethod.invoke(instance, mock);
             inst.add(instance);
 
+            // Disable all observers declared on the mocked bean
+            mockObservers(instance, true);
+
         } catch (Exception e) {
             throw new RuntimeException(instance
                     + " is not a normal scoped CDI bean, make sure the bean is a normal scope like @ApplicationScoped or @RequestScoped");
 
         }
     }
+
+    private static <T> void mockObservers(T instance, boolean mock) throws NoSuchMethodException, SecurityException,
+            ClassNotFoundException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+        // io.quarkus.arc.ClientProxy.arc_bean()
+        Method getBeanMethod = instance.getClass().getDeclaredMethod("arc_bean");
+        Object bean = getBeanMethod.invoke(instance);
+        // io.quarkus.arc.InjectableBean.getIdentifier()
+        Method getIdMethod = bean.getClass().getDeclaredMethod("getIdentifier");
+        String id = getIdMethod.invoke(bean).toString();
+        // io.quarkus.arc.impl.ArcContainerImpl.mockObservers(String, boolean)
+        Method mockObserversMethod = instance.getClass().getClassLoader().loadClass("io.quarkus.arc.impl.ArcContainerImpl")
+                .getDeclaredMethod("mockObservers", String.class, boolean.class);
+        mockObserversMethod.invoke(null, id, mock);
+    }
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeDevServicesDatasourceHandler.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeDevServicesDatasourceHandler.java
new file mode 100644
index 0000000000000..36e83285269f6
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeDevServicesDatasourceHandler.java
@@ -0,0 +1,27 @@
+package io.quarkus.test.junit;
+
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+import io.quarkus.builder.BuildResult;
+import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem;
+
+public class NativeDevServicesDatasourceHandler implements BiConsumer<Object, BuildResult> {
+    @Override
+    public void accept(Object o, BuildResult buildResult) {
+        BiConsumer<String, String> propertyConsumer = (BiConsumer<String, String>) o;
+        DevServicesDatasourceResultBuildItem res = buildResult.consumeOptional(DevServicesDatasourceResultBuildItem.class);
+        if (res != null) {
+            if (res.getDefaultDatasource() != null) {
+                for (Map.Entry<String, String> entry : res.getDefaultDatasource().getConfigProperties().entrySet()) {
+                    propertyConsumer.accept(entry.getKey(), entry.getValue());
+                }
+            }
+            for (DevServicesDatasourceResultBuildItem.DbResult i : res.getNamedDatasources().values()) {
+                for (Map.Entry<String, String> entry : i.getConfigProperties().entrySet()) {
+                    propertyConsumer.accept(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java
index 63b8f63b255dc..9e9e2419b606c 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java
@@ -1,31 +1,47 @@
 package io.quarkus.test.junit;
 
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.reflect.Field;
+import static io.quarkus.test.junit.IntegrationTestUtil.determineTestProfileAndProperties;
+import static io.quarkus.test.junit.IntegrationTestUtil.doProcessTestInstance;
+import static io.quarkus.test.junit.IntegrationTestUtil.ensureNoInjectAnnotationIsUsed;
+import static io.quarkus.test.junit.IntegrationTestUtil.getSysPropsToRestore;
+import static io.quarkus.test.junit.IntegrationTestUtil.handleDevDb;
+import static io.quarkus.test.junit.IntegrationTestUtil.startLauncher;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-
-import javax.inject.Inject;
+import java.util.Objects;
+import java.util.function.Function;
 
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestInstancePostProcessor;
-import org.junit.platform.commons.JUnitException;
+import org.opentest4j.TestAbortedException;
 
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
 import io.quarkus.test.common.NativeImageLauncher;
-import io.quarkus.test.common.PropertyTestUtil;
 import io.quarkus.test.common.RestAssuredURLManager;
 import io.quarkus.test.common.TestResourceManager;
 import io.quarkus.test.common.TestScopeManager;
-import io.quarkus.test.common.http.TestHTTPResourceManager;
 
 public class NativeTestExtension
         implements BeforeEachCallback, AfterEachCallback, BeforeAllCallback, TestInstancePostProcessor {
 
     private static boolean failedBoot;
 
+    private static List<Function<Class<?>, String>> testHttpEndpointProviders;
+    private static boolean ssl;
+
+    private static Class<? extends QuarkusTestProfile> quarkusTestProfile;
+    private static Throwable firstException; //if this is set then it will be thrown from the very first test that is run, the rest are aborted
+
+    private static Class<?> currentJUnitTestClass;
+
+    private static boolean hasPerTestResources;
+
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
         if (!failedBoot) {
@@ -36,86 +52,113 @@ public void afterEach(ExtensionContext context) throws Exception {
 
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
-        if (!failedBoot) {
-            RestAssuredURLManager.setURL(false);
+        if (failedBoot) {
+            throwBootFailureException();
+        } else {
+            RestAssuredURLManager.setURL(ssl, QuarkusTestExtension.getEndpointPath(context, testHttpEndpointProviders));
             TestScopeManager.setup(true);
         }
     }
 
     @Override
     public void beforeAll(ExtensionContext extensionContext) throws Exception {
-        ensureNoInjectAnnotationIsUsed(extensionContext.getRequiredTestClass());
+        ensureStarted(extensionContext);
+    }
+
+    private IntegrationTestExtensionState ensureStarted(ExtensionContext extensionContext) {
+        Class<?> testClass = extensionContext.getRequiredTestClass();
+        ensureNoInjectAnnotationIsUsed(testClass);
 
         ExtensionContext root = extensionContext.getRoot();
         ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL);
-        ExtensionState state = store.get(ExtensionState.class.getName(), ExtensionState.class);
-        PropertyTestUtil.setLogFileProperty();
-        if (state == null) {
-            TestResourceManager testResourceManager = new TestResourceManager(extensionContext.getRequiredTestClass());
-            try {
-                testResourceManager.init();
-                Map<String, String> systemProps = testResourceManager.start();
-                NativeImageLauncher launcher = new NativeImageLauncher(extensionContext.getRequiredTestClass());
-                launcher.addSystemProperties(systemProps);
-                try {
-                    launcher.start();
-                } catch (IOException e) {
+        IntegrationTestExtensionState state = store.get(IntegrationTestExtensionState.class.getName(),
+                IntegrationTestExtensionState.class);
+        Class<? extends QuarkusTestProfile> selectedProfile = IntegrationTestUtil.findProfile(testClass);
+        boolean wrongProfile = !Objects.equals(selectedProfile, quarkusTestProfile);
+        // we reload the test resources if we changed test class and if we had or will have per-test test resources
+        boolean reloadTestResources = !Objects.equals(extensionContext.getRequiredTestClass(), currentJUnitTestClass)
+                && (hasPerTestResources || QuarkusTestExtension.hasPerTestResources(extensionContext));
+        if ((state == null && !failedBoot) || wrongProfile || reloadTestResources) {
+            if (wrongProfile || reloadTestResources) {
+                if (state != null) {
                     try {
-                        launcher.close();
-                    } catch (Throwable t) {
+                        state.close();
+                    } catch (Throwable throwable) {
+                        throwable.printStackTrace();
                     }
-                    throw e;
                 }
-                state = new ExtensionState(testResourceManager, launcher, true);
-                store.put(ExtensionState.class.getName(), state);
-            } catch (Exception e) {
+            }
+            try {
+                state = doNativeStart(extensionContext, selectedProfile);
+                store.put(IntegrationTestExtensionState.class.getName(), state);
 
+            } catch (Throwable e) {
                 failedBoot = true;
-                throw new JUnitException("Quarkus native image start failed, original cause: " + e, e);
+                firstException = e;
             }
         }
+        return state;
     }
 
-    private void ensureNoInjectAnnotationIsUsed(Class<?> testClass) {
-        Class<?> current = testClass;
-        while (current.getSuperclass() != null) {
-            for (Field field : current.getDeclaredFields()) {
-                Inject injectAnnotation = field.getAnnotation(Inject.class);
-                if (injectAnnotation != null) {
-                    throw new JUnitException(
-                            "@Inject is not supported in NativeImageTest tests. Offending field is "
-                                    + field.getDeclaringClass().getTypeName() + "."
-                                    + field.getName());
+    private IntegrationTestExtensionState doNativeStart(ExtensionContext context, Class<? extends QuarkusTestProfile> profile)
+            throws Throwable {
+        Map<String, String> devDbProps = handleDevDb(context);
+        quarkusTestProfile = profile;
+        currentJUnitTestClass = context.getRequiredTestClass();
+        TestResourceManager testResourceManager = null;
+        try {
+            Class<?> requiredTestClass = context.getRequiredTestClass();
+
+            Map<String, String> sysPropRestore = getSysPropsToRestore();
+            TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
+
+            testResourceManager = new TestResourceManager(requiredTestClass, quarkusTestProfile,
+                    Collections.emptyList(), testProfileAndProperties.testProfile != null
+                            && testProfileAndProperties.testProfile.disableGlobalTestResources());
+            testResourceManager.init();
+            hasPerTestResources = testResourceManager.hasPerTestResources();
+
+            Map<String, String> additionalProperties = new HashMap<>(testProfileAndProperties.properties);
+            additionalProperties.putAll(devDbProps);
+            additionalProperties.putAll(testResourceManager.start());
+
+            NativeImageLauncher launcher = new NativeImageLauncher(requiredTestClass);
+            startLauncher(launcher, additionalProperties, () -> ssl = true);
+
+            final IntegrationTestExtensionState state = new IntegrationTestExtensionState(testResourceManager, launcher,
+                    sysPropRestore);
+
+            testHttpEndpointProviders = TestHttpEndpointProvider.load();
+
+            return state;
+        } catch (Throwable e) {
+
+            try {
+                if (testResourceManager != null) {
+                    testResourceManager.close();
                 }
+            } catch (Exception ex) {
+                e.addSuppressed(ex);
             }
-            current = current.getSuperclass();
+            throw e;
         }
-
     }
 
     @Override
-    public void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception {
-        TestHTTPResourceManager.inject(testInstance);
-        ExtensionContext root = context.getRoot();
-        ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL);
-        ExtensionState state = store.get(ExtensionState.class.getName(), ExtensionState.class);
-        state.testResourceManager.inject(testInstance);
-    }
-
-    public class ExtensionState implements ExtensionContext.Store.CloseableResource {
-
-        private final TestResourceManager testResourceManager;
-        private final Closeable resource;
-
-        ExtensionState(TestResourceManager testResourceManager, Closeable resource, boolean nativeImage) {
-            this.testResourceManager = testResourceManager;
-            this.resource = resource;
+    public void postProcessTestInstance(Object testInstance, ExtensionContext context) {
+        if (!failedBoot) {
+            doProcessTestInstance(testInstance, context);
         }
+    }
 
-        @Override
-        public void close() throws Throwable {
-            testResourceManager.close();
-            resource.close();
+    private void throwBootFailureException() {
+        if (firstException != null) {
+            Throwable throwable = firstException;
+            firstException = null;
+            throw new RuntimeException(throwable);
+        } else {
+            throw new TestAbortedException("Boot failed");
         }
     }
+
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java
new file mode 100644
index 0000000000000..25af85954ec70
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java
@@ -0,0 +1,34 @@
+package io.quarkus.test.junit;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Annotation that indicates that this test should be run the result of the Quarkus build.
+ * That means that if a jar was created, that jar is launched using {@code java -jar ...}
+ * (and thus runs in a separate JVM than the test).
+ * If instead a native image was created, the that image is launched.
+ * Finally, if a container image was created during the build, then a new container is created and run.
+ *
+ * The standard usage pattern is expected to be a base test class that runs the
+ * tests using the JVM version of Quarkus, with a subclass that extends the base
+ * test and is annotated with this annotation to perform the same checks against
+ * the native image.
+ *
+ * Note that it is not possible to mix {@code @QuarkusTest} and {@code QuarkusIntegrationTest} in the same test
+ * run, it is expected that the {@code @QuarkusTest} tests will be standard unit tests that are
+ * executed by surefire, while the {@code QuarkusIntegrationTest} tests will be integration tests
+ * executed by failsafe.
+ * This also means that injection of beans into a test class using {@code @Inject} is not supported
+ * in {@code QuarkusIntegrationTest}. Such injection is only possible in tests injected with
+ * {@link @QuarkusTest} so the test class structure must take this into account.
+ */
+@Target(ElementType.TYPE)
+@ExtendWith({ DisabledOnIntegrationTestCondition.class, QuarkusTestExtension.class, QuarkusIntegrationTestExtension.class })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface QuarkusIntegrationTest {
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
new file mode 100644
index 0000000000000..18198ad0be0d8
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
@@ -0,0 +1,281 @@
+package io.quarkus.test.junit;
+
+import static io.quarkus.test.junit.IntegrationTestUtil.*;
+import static io.quarkus.test.junit.IntegrationTestUtil.ensureNoInjectAnnotationIsUsed;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.CodeSource;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.function.Function;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+import org.opentest4j.TestAbortedException;
+
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
+import io.quarkus.test.common.ArtifactLauncher;
+import io.quarkus.test.common.DockerContainerLauncher;
+import io.quarkus.test.common.JarLauncher;
+import io.quarkus.test.common.NativeImageLauncher;
+import io.quarkus.test.common.RestAssuredURLManager;
+import io.quarkus.test.common.TestResourceManager;
+import io.quarkus.test.common.TestScopeManager;
+
+public class QuarkusIntegrationTestExtension
+        implements BeforeEachCallback, AfterEachCallback, BeforeAllCallback, TestInstancePostProcessor {
+
+    private static boolean failedBoot;
+
+    private static List<Function<Class<?>, String>> testHttpEndpointProviders;
+    private static boolean ssl;
+
+    private static Class<? extends QuarkusTestProfile> quarkusTestProfile;
+    private static Throwable firstException; //if this is set then it will be thrown from the very first test that is run, the rest are aborted
+
+    private static Class<?> currentJUnitTestClass;
+    private static boolean hasPerTestResources;
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        if (!failedBoot) {
+            RestAssuredURLManager.clearURL();
+            TestScopeManager.tearDown(true);
+        }
+    }
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        if (failedBoot) {
+            throwBootFailureException();
+        } else {
+            RestAssuredURLManager.setURL(ssl, QuarkusTestExtension.getEndpointPath(context, testHttpEndpointProviders));
+            TestScopeManager.setup(true);
+        }
+    }
+
+    @Override
+    public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        ensureStarted(extensionContext);
+    }
+
+    private IntegrationTestExtensionState ensureStarted(ExtensionContext extensionContext) {
+        Class<?> testClass = extensionContext.getRequiredTestClass();
+        ensureNoInjectAnnotationIsUsed(testClass);
+        Properties quarkusArtifactProperties = readQuarkusArtifactProperties(extensionContext);
+
+        ExtensionContext root = extensionContext.getRoot();
+        ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL);
+        IntegrationTestExtensionState state = store.get(IntegrationTestExtensionState.class.getName(),
+                IntegrationTestExtensionState.class);
+        Class<? extends QuarkusTestProfile> selectedProfile = IntegrationTestUtil.findProfile(testClass);
+        boolean wrongProfile = !Objects.equals(selectedProfile, quarkusTestProfile);
+        // we reload the test resources if we changed test class and if we had or will have per-test test resources
+        boolean reloadTestResources = !Objects.equals(extensionContext.getRequiredTestClass(), currentJUnitTestClass)
+                && (hasPerTestResources || QuarkusTestExtension.hasPerTestResources(extensionContext));
+        if ((state == null && !failedBoot) || wrongProfile || reloadTestResources) {
+            if (wrongProfile) {
+                if (state != null) {
+                    try {
+                        state.close();
+                    } catch (Throwable throwable) {
+                        throwable.printStackTrace();
+                    }
+                }
+            }
+            try {
+                state = doProcessStart(quarkusArtifactProperties, selectedProfile, extensionContext);
+                store.put(IntegrationTestExtensionState.class.getName(), state);
+            } catch (Throwable e) {
+                failedBoot = true;
+                firstException = e;
+            }
+        }
+        return state;
+    }
+
+    private Properties readQuarkusArtifactProperties(ExtensionContext context) {
+        Path buildOutputDirectory = determineBuildOutputDirectory(context);
+        Path artifactProperties = buildOutputDirectory.resolve("quarkus-artifact.properties");
+        if (!Files.exists(artifactProperties)) {
+            throw new IllegalStateException(
+                    "Unable to locate the artifact metadata file created that must be created by Quarkus in order to run tests annotated with '@QuarkusIntegrationTest'.");
+        }
+        try {
+            Properties properties = new Properties();
+            properties.load(new FileInputStream(artifactProperties.toFile()));
+            return properties;
+        } catch (IOException e) {
+            throw new UncheckedIOException(
+                    "Unable to read artifact metadata file created that must be created by Quarkus in order to run tests annotated with '@QuarkusIntegrationTest'.",
+                    e);
+        }
+    }
+
+    private Path determineBuildOutputDirectory(ExtensionContext context) {
+        String buildOutputDirStr = System.getProperty("build.output.directory");
+        Path result = null;
+        if (buildOutputDirStr != null) {
+            result = Paths.get(buildOutputDirStr);
+        } else {
+            // we need to guess where the artifact properties file is based on the location of the test class
+            Class<?> testClass = context.getRequiredTestClass();
+            final CodeSource codeSource = testClass.getProtectionDomain().getCodeSource();
+            if (codeSource != null) {
+                URL codeSourceLocation = codeSource.getLocation();
+                File artifactPropertiesDirectory = determineBuildOutputDirectory(codeSourceLocation);
+                if (artifactPropertiesDirectory == null) {
+                    throw new IllegalStateException(
+                            "Unable to determine the output of the Quarkus build. Consider setting the 'build.output.directory' system property.");
+                }
+                result = artifactPropertiesDirectory.toPath();
+            }
+        }
+        if (result == null) {
+            throw new IllegalStateException(
+                    "Unable to locate the artifact metadata file created that must be created by Quarkus in order to run tests annotated with '@QuarkusIntegrationTest'.");
+        }
+        if (!Files.isDirectory(result)) {
+            throw new IllegalStateException(
+                    "The determined Quarkus build output '" + result.toAbsolutePath().toString() + "' is not a directory");
+        }
+        return result;
+    }
+
+    private static File determineBuildOutputDirectory(final URL url) {
+        if (url == null) {
+            return null;
+        }
+        if (url.getProtocol().equals("file") && url.getPath().endsWith("test-classes/")) {
+            //we have the maven test classes dir
+            File testClasses = new File(url.getPath());
+            return testClasses.getParentFile();
+        } else if (url.getProtocol().equals("file") && url.getPath().endsWith("test/")) {
+            //we have the gradle test classes dir, build/classes/java/test
+            File testClasses = new File(url.getPath());
+            return testClasses.getParentFile().getParentFile().getParentFile();
+        } else if (url.getProtocol().equals("file") && url.getPath().contains("/target/surefire/")) {
+            //this will make mvn failsafe:integration-test work
+            String path = url.getPath();
+            int index = path.lastIndexOf("/target/");
+            return new File(path.substring(0, index) + "/target/");
+        }
+        return null;
+    }
+
+    private IntegrationTestExtensionState doProcessStart(Properties quarkusArtifactProperties,
+            Class<? extends QuarkusTestProfile> profile, ExtensionContext context)
+            throws Throwable {
+        Map<String, String> devDbProps = handleDevDb(context);
+        quarkusTestProfile = profile;
+        currentJUnitTestClass = context.getRequiredTestClass();
+        TestResourceManager testResourceManager = null;
+        try {
+            Class<?> requiredTestClass = context.getRequiredTestClass();
+
+            Map<String, String> sysPropRestore = getSysPropsToRestore();
+            TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
+
+            testResourceManager = new TestResourceManager(requiredTestClass, quarkusTestProfile,
+                    Collections.emptyList(), testProfileAndProperties.testProfile != null
+                            && testProfileAndProperties.testProfile.disableGlobalTestResources());
+            testResourceManager.init();
+            hasPerTestResources = testResourceManager.hasPerTestResources();
+
+            Map<String, String> additionalProperties = new HashMap<>(testProfileAndProperties.properties);
+            additionalProperties.putAll(devDbProps);
+            additionalProperties.putAll(testResourceManager.start());
+
+            String artifactType = quarkusArtifactProperties.getProperty("type");
+            if (artifactType == null) {
+                throw new IllegalStateException("Unable to determine the type of artifact created by the Quarkus build");
+            }
+            ArtifactLauncher launcher;
+            // TODO: replace with ServiceLoader mechanism
+            switch (artifactType) {
+                case "native": {
+                    String pathStr = quarkusArtifactProperties.getProperty("path");
+                    if ((pathStr != null) && !pathStr.isEmpty()) {
+                        String previousNativeImagePathValue = System.setProperty("native.image.path",
+                                determineBuildOutputDirectory(context).resolve(pathStr).toAbsolutePath().toString());
+                        sysPropRestore.put("native.image.path", previousNativeImagePathValue);
+                        launcher = new NativeImageLauncher(requiredTestClass);
+                    } else {
+                        throw new IllegalStateException("The path of the native binary could not be determined");
+                    }
+                    break;
+                }
+                case "jar": {
+                    String pathStr = quarkusArtifactProperties.getProperty("path");
+                    if ((pathStr != null) && !pathStr.isEmpty()) {
+                        launcher = new JarLauncher(determineBuildOutputDirectory(context).resolve(pathStr));
+                    } else {
+                        throw new IllegalStateException("The path of the native binary could not be determined");
+                    }
+                    break;
+                }
+                case "jar-container":
+                case "native-container":
+                    String containerImage = quarkusArtifactProperties.getProperty("metadata.container-image");
+                    if ((containerImage != null) && !containerImage.isEmpty()) {
+                        launcher = new DockerContainerLauncher(containerImage);
+                    } else {
+                        throw new IllegalStateException("The container image to be launched could not be determined");
+                    }
+                    break;
+                default:
+                    throw new IllegalStateException(
+                            "Artifact type + '" + artifactType + "' is not supported by @QuarkusIntegrationTest");
+            }
+
+            startLauncher(launcher, additionalProperties, () -> ssl = true);
+
+            IntegrationTestExtensionState state = new IntegrationTestExtensionState(testResourceManager, launcher,
+                    sysPropRestore);
+            testHttpEndpointProviders = TestHttpEndpointProvider.load();
+
+            return state;
+        } catch (Throwable e) {
+
+            try {
+                if (testResourceManager != null) {
+                    testResourceManager.close();
+                }
+            } catch (Exception ex) {
+                e.addSuppressed(ex);
+            }
+            throw e;
+        }
+    }
+
+    @Override
+    public void postProcessTestInstance(Object testInstance, ExtensionContext context) {
+        if (!failedBoot) {
+            doProcessTestInstance(testInstance, context);
+        }
+    }
+
+    private void throwBootFailureException() {
+        if (firstException != null) {
+            Throwable throwable = firstException;
+            firstException = null;
+            throw new RuntimeException(throwable);
+        } else {
+            throw new TestAbortedException("Boot failed");
+        }
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
index 8d1c2a2110fd0..3efc4f9523ba2 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -4,21 +4,37 @@
 import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.AbstractMap;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -35,10 +51,13 @@
 import org.jboss.jandex.Index;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ParameterContext;
@@ -55,6 +74,7 @@
 import io.quarkus.bootstrap.app.RunningQuarkusApplication;
 import io.quarkus.bootstrap.app.StartupAction;
 import io.quarkus.bootstrap.model.PathsCollection;
+import io.quarkus.bootstrap.resolver.model.QuarkusModel;
 import io.quarkus.bootstrap.runner.Timing;
 import io.quarkus.bootstrap.utils.BuildToolHelper;
 import io.quarkus.builder.BuildChainBuilder;
@@ -63,31 +83,38 @@
 import io.quarkus.deployment.builditem.TestAnnotationBuildItem;
 import io.quarkus.deployment.builditem.TestClassBeanBuildItem;
 import io.quarkus.deployment.builditem.TestClassPredicateBuildItem;
+import io.quarkus.runtime.LaunchMode;
+import io.quarkus.runtime.configuration.DurationConverter;
 import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.runtime.test.TestHttpEndpointProvider;
 import io.quarkus.test.common.PathTestHelper;
 import io.quarkus.test.common.PropertyTestUtil;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.RestAssuredURLManager;
 import io.quarkus.test.common.TestClassIndexer;
 import io.quarkus.test.common.TestResourceManager;
 import io.quarkus.test.common.TestScopeManager;
+import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.common.http.TestHTTPResourceManager;
 import io.quarkus.test.junit.buildchain.TestBuildChainCustomizerProducer;
+import io.quarkus.test.junit.callback.QuarkusTestAfterConstructCallback;
 import io.quarkus.test.junit.callback.QuarkusTestAfterEachCallback;
 import io.quarkus.test.junit.callback.QuarkusTestBeforeAllCallback;
+import io.quarkus.test.junit.callback.QuarkusTestBeforeClassCallback;
 import io.quarkus.test.junit.callback.QuarkusTestBeforeEachCallback;
 import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
 import io.quarkus.test.junit.internal.DeepClone;
 import io.quarkus.test.junit.internal.XStreamDeepClone;
 
-//todo: share common core with QuarkusUnitTest
 public class QuarkusTestExtension
         implements BeforeEachCallback, AfterEachCallback, BeforeAllCallback, InvocationInterceptor, AfterAllCallback,
-        ParameterResolver {
+        ParameterResolver, ExecutionCondition {
 
     private static final Logger log = Logger.getLogger(QuarkusTestExtension.class);
 
     protected static final String TEST_LOCATION = "test-location";
     protected static final String TEST_CLASS = "test-class";
+    public static final String QUARKUS_TEST_HANG_DETECTION_TIMEOUT = "quarkus.test.hang-detection-timeout";
 
     private static boolean failedBoot;
 
@@ -95,25 +122,82 @@ public class QuarkusTestExtension
     private static Object actualTestInstance;
     private static ClassLoader originalCl;
     private static RunningQuarkusApplication runningQuarkusApplication;
-    private static Path testClassLocation;
     private static Throwable firstException; //if this is set then it will be thrown from the very first test that is run, the rest are aborted
 
-    private static List<Object> beforeAllCallbacks;
+    private static List<Object> beforeClassCallbacks;
+    private static List<Object> afterConstructCallbacks;
+    private static List<Object> legacyAfterConstructCallbacks;
     private static List<Object> beforeEachCallbacks;
     private static List<Object> afterEachCallbacks;
     private static Class<?> quarkusTestMethodContextClass;
     private static Class<? extends QuarkusTestProfile> quarkusTestProfile;
+    private static boolean hasPerTestResources;
+    private static Class<?> currentJUnitTestClass;
+    private static List<Function<Class<?>, String>> testHttpEndpointProviders;
 
     private static DeepClone deepClone;
+    //needed for @Nested
+    private static final Deque<Class<?>> currentTestClassStack = new ArrayDeque<>();
+    private static ScheduledExecutorService hangDetectionExecutor;
+    private static Duration hangTimeout;
+    private static ScheduledFuture<?> hangTaskKey;
+    private static final Runnable hangDetectionTask = new Runnable() {
+
+        final AtomicBoolean runOnce = new AtomicBoolean();
+
+        @Override
+        public void run() {
+            if (!runOnce.compareAndSet(false, true)) {
+                return;
+            }
+            System.err.println("@QuarkusTest has detected a hang, as there has been no test activity in " + hangTimeout);
+            System.err.println("To configure this timeout use the " + QUARKUS_TEST_HANG_DETECTION_TIMEOUT + " config property");
+            System.err.println("A stack track is below to help diagnose the potential hang");
+            System.err.println("=== Stack Trace ===");
+            ThreadInfo[] threads = ManagementFactory.getThreadMXBean().dumpAllThreads(true, true);
+            for (ThreadInfo info : threads) {
+                if (info == null) {
+                    System.err.println("  Inactive");
+                    continue;
+                }
+                Thread.State state = info.getThreadState();
+                System.err.println("Thread " + info.getThreadName() + ": " + state);
+                if (state == Thread.State.WAITING) {
+                    System.err.println("  Waiting on " + info.getLockName());
+                } else if (state == Thread.State.BLOCKED) {
+                    System.err.println("  Blocked on " + info.getLockName());
+                    System.err.println("  Blocked by " + info.getLockOwnerName());
+                }
+                System.err.println("  Stack:");
+                for (StackTraceElement frame : info.getStackTrace()) {
+                    System.err.println("    " + frame.toString());
+                }
+            }
+            System.err.println("=== End Stack Trace ===");
+            //we only every dump once
+        }
+    };
 
     private ExtensionState doJavaStart(ExtensionContext context, Class<? extends QuarkusTestProfile> profile) throws Throwable {
+        hangDetectionExecutor = Executors.newSingleThreadScheduledExecutor();
+        String time = "10m";
+        //config is not established yet
+        //we can only read from system properties
+        String sysPropString = System.getProperty(QUARKUS_TEST_HANG_DETECTION_TIMEOUT);
+        if (sysPropString != null) {
+            time = sysPropString;
+        }
+        hangTimeout = new DurationConverter().convert(time);
+        hangTaskKey = hangDetectionExecutor.schedule(hangDetectionTask, hangTimeout.toMillis(), TimeUnit.MILLISECONDS);
+
         quarkusTestProfile = profile;
+        currentJUnitTestClass = context.getRequiredTestClass();
         Closeable testResourceManager = null;
         try {
             final LinkedBlockingDeque<Runnable> shutdownTasks = new LinkedBlockingDeque<>();
 
             Class<?> requiredTestClass = context.getRequiredTestClass();
-            testClassLocation = getTestClassesLocation(requiredTestClass);
+            Path testClassLocation = getTestClassesLocation(requiredTestClass);
             final Path appClassLocation = getAppClassLocationForTestLocation(testClassLocation.toString());
 
             PathsCollection.Builder rootBuilder = PathsCollection.builder();
@@ -127,17 +211,21 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua
                     rootBuilder.add(testResourcesLocation);
                 }
             }
+
             originalCl = Thread.currentThread().getContextClassLoader();
             Map<String, String> sysPropRestore = new HashMap<>();
             sysPropRestore.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP,
                     System.getProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP));
 
+            // clear the test.url system property as the value leaks into the run when using different profiles
+            System.clearProperty("test.url");
+
             final QuarkusBootstrap.Builder runnerBuilder = QuarkusBootstrap.builder()
                     .setIsolateDeployment(true)
                     .setMode(QuarkusBootstrap.Mode.TEST);
             QuarkusTestProfile profileInstance = null;
             if (profile != null) {
-                profileInstance = profile.newInstance();
+                profileInstance = profile.getConstructor().newInstance();
                 Map<String, String> additional = new HashMap<>(profileInstance.getConfigOverrides());
                 if (!profileInstance.getEnabledAlternatives().isEmpty()) {
                     additional.put("quarkus.arc.selected-alternatives", profileInstance.getEnabledAlternatives().stream()
@@ -149,6 +237,9 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua
                             })
                             .map(Class::getName).collect(Collectors.joining(",")));
                 }
+                if (profileInstance.disableApplicationLifecycleObservers()) {
+                    additional.put("quarkus.arc.test.disable-application-lifecycle-observers", "true");
+                }
                 if (profileInstance.getConfigProfile() != null) {
                     System.setProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profileInstance.getConfigProfile());
                 }
@@ -162,7 +253,17 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua
                 }
             }
 
-            runnerBuilder.setProjectRoot(Paths.get("").normalize().toAbsolutePath());
+            final Path projectRoot = Paths.get("").normalize().toAbsolutePath();
+            runnerBuilder.setProjectRoot(projectRoot);
+            Path outputDir;
+            try {
+                // this should work for both maven and gradle
+                outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0));
+            } catch (Exception e) {
+                // this shouldn't happen since testClassLocation is usually found under the project dir
+                outputDir = projectRoot;
+            }
+            runnerBuilder.setTargetDirectory(outputDir);
 
             rootBuilder.add(appClassLocation);
             final Path appResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(appClassLocation, "main");
@@ -170,12 +271,27 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua
                 rootBuilder.add(appResourcesLocation);
             }
 
-            Path root = Paths.get("").normalize().toAbsolutePath();
             // If gradle project running directly with IDE
             if (System.getProperty(BootstrapConstants.SERIALIZED_APP_MODEL) == null) {
-                BuildToolHelper.enableGradleAppModel(root, "TEST");
+                QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(projectRoot);
+                if (model != null) {
+                    final Set<File> classDirectories = model.getWorkspace().getMainModule().getSourceSet()
+                            .getSourceDirectories();
+                    for (File classes : classDirectories) {
+                        if (classes.exists() && !rootBuilder.contains(classes.toPath())) {
+                            rootBuilder.add(classes.toPath());
+                        }
+                    }
+                }
+            } else if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) {
+                final String[] sourceDirectories = System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR).split(",");
+                for (String sourceDirectory : sourceDirectories) {
+                    final Path directory = Paths.get(sourceDirectory);
+                    if (Files.exists(directory) && !rootBuilder.contains(directory)) {
+                        rootBuilder.add(directory);
+                    }
+                }
             }
-
             runnerBuilder.setApplicationRoot(rootBuilder.build());
 
             CuratedApplication curatedApplication = runnerBuilder
@@ -191,23 +307,37 @@ private ExtensionState doJavaStart(ExtensionContext context, Class<? extends Qua
             final Map<String, Object> props = new HashMap<>();
             props.put(TEST_LOCATION, testClassLocation);
             props.put(TEST_CLASS, requiredTestClass);
-            AugmentAction augmentAction = curatedApplication.createAugmentor(TestBuildChainFunction.class.getName(), props);
+            AugmentAction augmentAction = curatedApplication
+                    .createAugmentor(TestBuildChainFunction.class.getName(), props);
+            testHttpEndpointProviders = TestHttpEndpointProvider.load();
             StartupAction startupAction = augmentAction.createInitialRuntimeApplication();
             Thread.currentThread().setContextClassLoader(startupAction.getClassLoader());
             populateDeepCloneField(startupAction);
 
             //must be done after the TCCL has been set
             testResourceManager = (Closeable) startupAction.getClassLoader().loadClass(TestResourceManager.class.getName())
-                    .getConstructor(Class.class, List.class)
+                    .getConstructor(Class.class, Class.class, List.class, boolean.class)
                     .newInstance(requiredTestClass,
-                            getAdditionalTestResources(profileInstance, startupAction.getClassLoader()));
+                            profile != null ? profile : null,
+                            getAdditionalTestResources(profileInstance, startupAction.getClassLoader()),
+                            profileInstance != null && profileInstance.disableGlobalTestResources());
             testResourceManager.getClass().getMethod("init").invoke(testResourceManager);
             testResourceManager.getClass().getMethod("start").invoke(testResourceManager);
+            hasPerTestResources = (boolean) testResourceManager.getClass().getMethod("hasPerTestResources")
+                    .invoke(testResourceManager);
 
             populateCallbacks(startupAction.getClassLoader());
 
             runningQuarkusApplication = startupAction.run();
 
+            //now we have full config reset the hang timer
+
+            if (hangTaskKey != null) {
+                hangTaskKey.cancel(false);
+                hangTimeout = runningQuarkusApplication.getConfigValue(QUARKUS_TEST_HANG_DETECTION_TIMEOUT, Duration.class)
+                        .orElse(Duration.of(10, ChronoUnit.MINUTES));
+                hangTaskKey = hangDetectionExecutor.schedule(hangDetectionTask, hangTimeout.toMillis(), TimeUnit.MILLISECONDS);
+            }
             ConfigProviderResolver.setInstance(new RunningAppConfigResolver(runningQuarkusApplication));
 
             System.setProperty("test.url", TestHTTPResourceManager.getUri(runningQuarkusApplication));
@@ -226,26 +356,28 @@ public void close() throws IOException {
                                 shutdownTasks.pop().run();
                             }
                         } finally {
-                            for (Map.Entry<String, String> entry : sysPropRestore.entrySet()) {
-                                String val = entry.getValue();
-                                if (val == null) {
-                                    System.clearProperty(entry.getKey());
-                                } else {
-                                    System.setProperty(entry.getKey(), val);
+                            try {
+                                for (Map.Entry<String, String> entry : sysPropRestore.entrySet()) {
+                                    String val = entry.getValue();
+                                    if (val == null) {
+                                        System.clearProperty(entry.getKey());
+                                    } else {
+                                        System.setProperty(entry.getKey(), val);
+                                    }
                                 }
+                                tm.close();
+                            } finally {
+                                hangDetectionExecutor.shutdown();
                             }
-                            tm.close();
+                        }
+                        try {
+                            TestClassIndexer.removeIndex(requiredTestClass);
+                        } catch (Exception ignored) {
                         }
                     }
                 }
             };
             ExtensionState state = new ExtensionState(testResourceManager, shutdownTask);
-            Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    state.close();
-                }
-            }, "Quarkus Test Cleanup Shutdown task"));
             return state;
         } catch (Throwable e) {
 
@@ -279,19 +411,20 @@ private List<Object> getAdditionalTestResources(
         try {
             Constructor<?> testResourceClassEntryConstructor = Class
                     .forName(TestResourceManager.TestResourceClassEntry.class.getName(), true, classLoader)
-                    .getConstructor(Class.class, Map.class);
+                    .getConstructor(Class.class, Map.class, Annotation.class, boolean.class);
 
             List<QuarkusTestProfile.TestResourceEntry> testResources = profileInstance.testResources();
             List<Object> result = new ArrayList<>(testResources.size());
             for (QuarkusTestProfile.TestResourceEntry testResource : testResources) {
                 Object instance = testResourceClassEntryConstructor.newInstance(
-                        Class.forName(testResource.getClazz().getName(), true, classLoader), testResource.getArgs());
+                        Class.forName(testResource.getClazz().getName(), true, classLoader), testResource.getArgs(),
+                        null, testResource.isParallel());
                 result.add(instance);
             }
 
             return result;
         } catch (Exception e) {
-            throw new IllegalStateException("Unable to handle profile " + profileInstance.getClass());
+            throw new IllegalStateException("Unable to handle profile " + profileInstance.getClass(), e);
         }
     }
 
@@ -304,14 +437,26 @@ private void populateCallbacks(ClassLoader classLoader) throws ClassNotFoundExce
         // make sure that we start over everytime we populate the callbacks
         // otherwise previous runs of QuarkusTest (with different TestProfile values can leak into the new run)
         quarkusTestMethodContextClass = null;
-        beforeAllCallbacks = new ArrayList<>();
+        beforeClassCallbacks = new ArrayList<>();
+        afterConstructCallbacks = new ArrayList<>();
+        legacyAfterConstructCallbacks = new ArrayList<>();
         beforeEachCallbacks = new ArrayList<>();
         afterEachCallbacks = new ArrayList<>();
 
-        ServiceLoader<?> quarkusTestBeforeAllLoader = ServiceLoader
+        ServiceLoader<?> quarkusTestBeforeClassLoader = ServiceLoader
+                .load(Class.forName(QuarkusTestBeforeClassCallback.class.getName(), false, classLoader), classLoader);
+        for (Object quarkusTestBeforeClassCallback : quarkusTestBeforeClassLoader) {
+            beforeClassCallbacks.add(quarkusTestBeforeClassCallback);
+        }
+        ServiceLoader<?> quarkusTestAfterConstructLoader = ServiceLoader
+                .load(Class.forName(QuarkusTestAfterConstructCallback.class.getName(), false, classLoader), classLoader);
+        for (Object quarkusTestAfterConstructCallback : quarkusTestAfterConstructLoader) {
+            afterConstructCallbacks.add(quarkusTestAfterConstructCallback);
+        }
+        ServiceLoader<?> quarkusTestLegacyAfterConstructLoader = ServiceLoader
                 .load(Class.forName(QuarkusTestBeforeAllCallback.class.getName(), false, classLoader), classLoader);
-        for (Object quarkusTestBeforeAllCallback : quarkusTestBeforeAllLoader) {
-            beforeAllCallbacks.add(quarkusTestBeforeAllCallback);
+        for (Object quarkusTestLegacyAfterConstructCallback : quarkusTestLegacyAfterConstructLoader) {
+            legacyAfterConstructCallbacks.add(quarkusTestLegacyAfterConstructCallback);
         }
         ServiceLoader<?> quarkusTestBeforeEachLoader = ServiceLoader
                 .load(Class.forName(QuarkusTestBeforeEachCallback.class.getName(), false, classLoader), classLoader);
@@ -327,9 +472,10 @@ private void populateCallbacks(ClassLoader classLoader) throws ClassNotFoundExce
 
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
-        if (isNativeTest(context)) {
+        if (isNativeOrIntegrationTest()) {
             return;
         }
+        resetHangTimeout();
         if (!failedBoot) {
             ClassLoader original = setCCL(runningQuarkusApplication.getClassLoader());
             try {
@@ -339,9 +485,16 @@ public void beforeEach(ExtensionContext context) throws Exception {
                     beforeEachCallback.getClass().getMethod("beforeEach", tuple.getKey())
                             .invoke(beforeEachCallback, tuple.getValue());
                 }
+                String endpointPath = getEndpointPath(context, testHttpEndpointProviders);
                 if (runningQuarkusApplication != null) {
+                    boolean secure = false;
+                    Optional<String> insecureAllowed = runningQuarkusApplication
+                            .getConfigValue("quarkus.http.insecure-requests", String.class);
+                    if (insecureAllowed.isPresent()) {
+                        secure = !insecureAllowed.get().toLowerCase(Locale.ENGLISH).equals("enabled");
+                    }
                     runningQuarkusApplication.getClassLoader().loadClass(RestAssuredURLManager.class.getName())
-                            .getDeclaredMethod("setURL", boolean.class).invoke(null, false);
+                            .getDeclaredMethod("setURL", boolean.class, String.class).invoke(null, secure, endpointPath);
                     runningQuarkusApplication.getClassLoader().loadClass(TestScopeManager.class.getName())
                             .getDeclaredMethod("setup", boolean.class).invoke(null, false);
                 }
@@ -354,19 +507,52 @@ public void beforeEach(ExtensionContext context) throws Exception {
         }
     }
 
+    public static String getEndpointPath(ExtensionContext context, List<Function<Class<?>, String>> testHttpEndpointProviders) {
+        String endpointPath = null;
+        TestHTTPEndpoint testHTTPEndpoint = context.getRequiredTestMethod().getAnnotation(TestHTTPEndpoint.class);
+        if (testHTTPEndpoint == null) {
+            Class<?> clazz = context.getRequiredTestClass();
+            while (true) {
+                // go up the hierarchy because most Native tests extend from a regular Quarkus test
+                testHTTPEndpoint = clazz.getAnnotation(TestHTTPEndpoint.class);
+                if (testHTTPEndpoint != null) {
+                    break;
+                }
+                clazz = clazz.getSuperclass();
+                if (clazz == Object.class) {
+                    break;
+                }
+            }
+        }
+        if (testHTTPEndpoint != null) {
+            for (Function<Class<?>, String> i : testHttpEndpointProviders) {
+                endpointPath = i.apply(testHTTPEndpoint.value());
+                if (endpointPath != null) {
+                    break;
+                }
+            }
+            if (endpointPath == null) {
+                throw new RuntimeException("Cannot determine HTTP path for endpoint " + testHTTPEndpoint.value()
+                        + " for test method " + context.getRequiredTestMethod());
+            }
+        }
+        return endpointPath;
+    }
+
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
-        if (isNativeTest(context)) {
+        if (isNativeOrIntegrationTest()) {
             return;
         }
+        resetHangTimeout();
         if (!failedBoot) {
             popMockContext();
+            ClassLoader original = setCCL(runningQuarkusApplication.getClassLoader());
             for (Object afterEachCallback : afterEachCallbacks) {
                 Map.Entry<Class<?>, ?> tuple = createQuarkusTestMethodContextTuple(context);
                 afterEachCallback.getClass().getMethod("afterEach", tuple.getKey())
                         .invoke(afterEachCallback, tuple.getValue());
             }
-            ClassLoader original = setCCL(runningQuarkusApplication.getClassLoader());
             try {
                 runningQuarkusApplication.getClassLoader().loadClass(RestAssuredURLManager.class.getName())
                         .getDeclaredMethod("clearURL").invoke(null);
@@ -419,22 +605,26 @@ public void afterEach(ExtensionContext context) throws Exception {
                 constructor.newInstance(actualTestInstance, actualTestMethod));
     }
 
-    private boolean isNativeTest(ExtensionContext context) {
-        return context.getRequiredTestClass().isAnnotationPresent(NativeImageTest.class);
+    private boolean isNativeOrIntegrationTest() {
+        for (Class<?> i : currentTestClassStack) {
+            if (i.isAnnotationPresent(NativeImageTest.class) || i.isAnnotationPresent(QuarkusIntegrationTest.class)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private ExtensionState ensureStarted(ExtensionContext extensionContext) {
         ExtensionContext root = extensionContext.getRoot();
         ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL);
         ExtensionState state = store.get(ExtensionState.class.getName(), ExtensionState.class);
-        TestProfile annotation = extensionContext.getRequiredTestClass().getAnnotation(TestProfile.class);
-        Class<? extends QuarkusTestProfile> selectedProfile = null;
-        if (annotation != null) {
-            selectedProfile = annotation.value();
-        }
+        Class<? extends QuarkusTestProfile> selectedProfile = getQuarkusTestProfile(extensionContext);
         boolean wrongProfile = !Objects.equals(selectedProfile, quarkusTestProfile);
-        if ((state == null && !failedBoot) || wrongProfile) {
-            if (wrongProfile) {
+        // we reload the test resources if we changed test class and if we had or will have per-test test resources
+        boolean reloadTestResources = !Objects.equals(extensionContext.getRequiredTestClass(), currentJUnitTestClass)
+                && (hasPerTestResources || hasPerTestResources(extensionContext));
+        if ((state == null && !failedBoot) || wrongProfile || reloadTestResources) {
+            if (wrongProfile || reloadTestResources) {
                 if (state != null) {
                     try {
                         state.close();
@@ -456,6 +646,15 @@ private ExtensionState ensureStarted(ExtensionContext extensionContext) {
         return state;
     }
 
+    private Class<? extends QuarkusTestProfile> getQuarkusTestProfile(ExtensionContext extensionContext) {
+        TestProfile annotation = extensionContext.getRequiredTestClass().getAnnotation(TestProfile.class);
+        Class<? extends QuarkusTestProfile> selectedProfile = null;
+        if (annotation != null) {
+            selectedProfile = annotation.value();
+        }
+        return selectedProfile;
+    }
+
     private static ClassLoader setCCL(ClassLoader cl) {
         final Thread thread = Thread.currentThread();
         final ClassLoader original = thread.getContextClassLoader();
@@ -475,9 +674,13 @@ private void throwBootFailureException() throws Exception {
 
     @Override
     public void beforeAll(ExtensionContext context) throws Exception {
-        if (isNativeTest(context)) {
+        currentTestClassStack.push(context.getRequiredTestClass());
+        //set the right launch mode in the outer CL, used by the HTTP host config source
+        ProfileManager.setLaunchMode(LaunchMode.TEST);
+        if (isNativeOrIntegrationTest()) {
             return;
         }
+        resetHangTimeout();
         ensureStarted(context);
         if (runningQuarkusApplication != null) {
             pushMockContext();
@@ -513,10 +716,11 @@ private void popMockContext() {
     @Override
     public void interceptBeforeAllMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             invocation.proceed();
             return;
         }
+        resetHangTimeout();
         ensureStarted(extensionContext);
         if (failedBoot) {
             throwBootFailureException();
@@ -529,12 +733,37 @@ public void interceptBeforeAllMethod(Invocation<Void> invocation, ReflectiveInvo
     @Override
     public <T> T interceptTestClassConstructor(Invocation<T> invocation,
             ReflectiveInvocationContext<Constructor<T>> invocationContext, ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             return invocation.proceed();
         }
+        resetHangTimeout();
+        ExtensionState state = ensureStarted(extensionContext);
+        if (failedBoot) {
+            throwBootFailureException();
+            return null;
+        }
         T result;
         ClassLoader old = Thread.currentThread().getContextClassLoader();
         Class<?> requiredTestClass = extensionContext.getRequiredTestClass();
+
+        if (runningQuarkusApplication != null) {
+            try {
+                Thread.currentThread().setContextClassLoader(runningQuarkusApplication.getClassLoader());
+                for (Object beforeClassCallback : beforeClassCallbacks) {
+                    beforeClassCallback.getClass().getMethod("beforeClass", Class.class).invoke(beforeClassCallback,
+                            runningQuarkusApplication.getClassLoader().loadClass(requiredTestClass.getName()));
+                }
+            } finally {
+                Thread.currentThread().setContextClassLoader(old);
+            }
+        } else {
+            // can this ever happen?
+            for (Object beforeClassCallback : beforeClassCallbacks) {
+                beforeClassCallback.getClass().getMethod("beforeClass", Class.class).invoke(beforeClassCallback,
+                        requiredTestClass);
+            }
+        }
+
         try {
             Thread.currentThread().setContextClassLoader(requiredTestClass.getClassLoader());
             result = invocation.proceed();
@@ -546,10 +775,6 @@ public <T> T interceptTestClassConstructor(Invocation<T> invocation,
         } finally {
             Thread.currentThread().setContextClassLoader(old);
         }
-        ExtensionState state = ensureStarted(extensionContext);
-        if (failedBoot) {
-            return result;
-        }
 
         // We do this here as well, because when @TestInstance(Lifecycle.PER_CLASS) is used on a class,
         // interceptTestClassConstructor is called before beforeAll, meaning that the TCCL will not be set correctly
@@ -568,17 +793,31 @@ public <T> T interceptTestClassConstructor(Invocation<T> invocation,
 
     private void initTestState(ExtensionContext extensionContext, ExtensionState state) {
         try {
+            Class<?> previousActualTestClass = actualTestClass;
             actualTestClass = Class.forName(extensionContext.getRequiredTestClass().getName(), true,
                     Thread.currentThread().getContextClassLoader());
-
-            actualTestInstance = runningQuarkusApplication.instance(actualTestClass);
+            if (extensionContext.getRequiredTestClass().isAnnotationPresent(Nested.class)) {
+                Class<?> parent = actualTestClass.getEnclosingClass();
+                Object parentInstance = runningQuarkusApplication.instance(parent);
+                Constructor<?> declaredConstructor = actualTestClass.getDeclaredConstructor(parent);
+                declaredConstructor.setAccessible(true);
+                actualTestInstance = declaredConstructor.newInstance(parentInstance);
+            } else {
+                actualTestInstance = runningQuarkusApplication.instance(actualTestClass);
+            }
 
             Class<?> resM = Thread.currentThread().getContextClassLoader().loadClass(TestHTTPResourceManager.class.getName());
-            resM.getDeclaredMethod("inject", Object.class).invoke(null, actualTestInstance);
+            resM.getDeclaredMethod("inject", Object.class, List.class).invoke(null, actualTestInstance,
+                    testHttpEndpointProviders);
             state.testResourceManager.getClass().getMethod("inject", Object.class).invoke(state.testResourceManager,
                     actualTestInstance);
-            for (Object beforeAllCallback : beforeAllCallbacks) {
-                beforeAllCallback.getClass().getMethod("beforeAll", Object.class).invoke(beforeAllCallback, actualTestInstance);
+            for (Object afterConstructCallback : afterConstructCallbacks) {
+                afterConstructCallback.getClass().getMethod("afterConstruct", Object.class).invoke(afterConstructCallback,
+                        actualTestInstance);
+            }
+            for (Object legacyAfterConstructCallback : legacyAfterConstructCallbacks) {
+                legacyAfterConstructCallback.getClass().getMethod("beforeAll", Object.class)
+                        .invoke(legacyAfterConstructCallback, actualTestInstance);
             }
         } catch (Exception e) {
             throw new TestInstantiationException("Failed to create test instance", e);
@@ -588,7 +827,7 @@ private void initTestState(ExtensionContext extensionContext, ExtensionState sta
     @Override
     public void interceptBeforeEachMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             invocation.proceed();
             return;
         }
@@ -599,7 +838,7 @@ public void interceptBeforeEachMethod(Invocation<Void> invocation, ReflectiveInv
     @Override
     public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             invocation.proceed();
             return;
         }
@@ -610,7 +849,7 @@ public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocatio
     @Override
     public void interceptTestTemplateMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             invocation.proceed();
             return;
         }
@@ -622,7 +861,7 @@ public void interceptTestTemplateMethod(Invocation<Void> invocation, ReflectiveI
     @Override
     public <T> T interceptTestFactoryMethod(Invocation<T> invocation,
             ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             return invocation.proceed();
         }
         T result = (T) runExtensionMethod(invocationContext, extensionContext);
@@ -633,7 +872,7 @@ public <T> T interceptTestFactoryMethod(Invocation<T> invocation,
     @Override
     public void interceptAfterEachMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             invocation.proceed();
             return;
         }
@@ -644,7 +883,7 @@ public void interceptAfterEachMethod(Invocation<Void> invocation, ReflectiveInvo
     @Override
     public void interceptAfterAllMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
             ExtensionContext extensionContext) throws Throwable {
-        if (isNativeTest(extensionContext)) {
+        if (isNativeOrIntegrationTest()) {
             invocation.proceed();
             return;
         }
@@ -654,6 +893,7 @@ public void interceptAfterAllMethod(Invocation<Void> invocation, ReflectiveInvoc
 
     private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext)
             throws Throwable {
+        resetHangTimeout();
         Method newMethod = null;
 
         ClassLoader old = setCCL(runningQuarkusApplication.getClassLoader());
@@ -708,11 +948,16 @@ private Object runExtensionMethod(ReflectiveInvocationContext<Method> invocation
 
     @Override
     public void afterAll(ExtensionContext context) throws Exception {
-        if (!isNativeTest(context) && (runningQuarkusApplication != null)) {
-            popMockContext();
-        }
-        if (originalCl != null) {
-            setCCL(originalCl);
+        resetHangTimeout();
+        try {
+            if (!isNativeOrIntegrationTest() && (runningQuarkusApplication != null)) {
+                popMockContext();
+            }
+            if (originalCl != null) {
+                setCCL(originalCl);
+            }
+        } finally {
+            currentTestClassStack.pop();
         }
     }
 
@@ -755,19 +1000,64 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
         }
     }
 
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+        if (!context.getTestClass().isPresent()) {
+            return ConditionEvaluationResult.enabled("No test class specified");
+        }
+        if (context.getTestInstance().isPresent()) {
+            return ConditionEvaluationResult.enabled("Quarkus Test Profile tags only affect classes");
+        }
+        String tagsStr = System.getProperty("quarkus.test.profile.tags");
+        if ((tagsStr == null) || tagsStr.isEmpty()) {
+            return ConditionEvaluationResult.enabled("No Quarkus Test Profile tags");
+        }
+        Class<? extends QuarkusTestProfile> testProfile = getQuarkusTestProfile(context);
+        if (testProfile == null) {
+            return ConditionEvaluationResult.disabled("Test '" + context.getRequiredTestClass()
+                    + "' is not annotated with '@QuarkusTestProfile' but 'quarkus.profile.test.tags' was set");
+        }
+        QuarkusTestProfile profileInstance;
+        try {
+            profileInstance = testProfile.getConstructor().newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        Set<String> testProfileTags = profileInstance.tags();
+        String[] tags = tagsStr.split(",");
+        for (String tag : tags) {
+            String trimmedTag = tag.trim();
+            if (testProfileTags.contains(trimmedTag)) {
+                return ConditionEvaluationResult.enabled("Tag '" + trimmedTag + "' is present on '" + testProfile
+                        + "' which is used on test '" + context.getRequiredTestClass());
+            }
+        }
+        return ConditionEvaluationResult.disabled("Test '" + context.getRequiredTestClass()
+                + "' disabled because 'quarkus.profile.test.tags' don't match the tags of '" + testProfile + "'");
+    }
+
     class ExtensionState implements ExtensionContext.Store.CloseableResource {
 
         private final Closeable testResourceManager;
         private final Closeable resource;
         private final AtomicBoolean closed = new AtomicBoolean();
+        private final Thread shutdownHook;
 
         ExtensionState(Closeable testResourceManager, Closeable resource) {
             this.testResourceManager = testResourceManager;
             this.resource = resource;
+            this.shutdownHook = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    ExtensionState.this.close();
+                }
+            }, "Quarkus Test Cleanup Shutdown task");
+            Runtime.getRuntime().addShutdownHook(shutdownHook);
         }
 
         @Override
         public void close() {
+            resetHangTimeout();
             if (closed.compareAndSet(false, true)) {
                 ClassLoader old = Thread.currentThread().getContextClassLoader();
                 if (runningQuarkusApplication != null) {
@@ -789,6 +1079,7 @@ public void close() {
                         Thread.currentThread().setContextClassLoader(old);
                     }
                 }
+                Runtime.getRuntime().removeShutdownHook(shutdownHook);
             }
         }
     }
@@ -890,4 +1181,39 @@ public void execute(BuildContext context) {
             return allCustomizers;
         }
     }
+
+    private static void resetHangTimeout() {
+        if (hangTaskKey != null) {
+            hangTaskKey.cancel(false);
+            hangTaskKey = hangDetectionExecutor.schedule(hangDetectionTask, hangTimeout.toMillis(), TimeUnit.MILLISECONDS);
+        }
+    }
+
+    static boolean hasPerTestResources(ExtensionContext extensionContext) {
+        return hasPerTestResources(extensionContext.getRequiredTestClass());
+    }
+
+    public static boolean hasPerTestResources(Class<?> requiredTestClass) {
+        while (requiredTestClass != Object.class) {
+            for (QuarkusTestResource testResource : requiredTestClass.getAnnotationsByType(QuarkusTestResource.class)) {
+                if (testResource.restrictToAnnotatedClass()) {
+                    return true;
+                }
+            }
+            // scan for meta-annotations
+            for (Annotation annotation : requiredTestClass.getAnnotations()) {
+                // skip TestResource annotations
+                if (annotation.annotationType() != QuarkusTestResource.class) {
+                    // look for a TestResource on the annotation itself
+                    if (annotation.annotationType().getAnnotationsByType(QuarkusTestResource.class).length > 0) {
+                        // meta-annotations are per-test scoped for now
+                        return true;
+                    }
+                }
+            }
+            // look up
+            requiredTestClass = requiredTestClass.getSuperclass();
+        }
+        return false;
+    }
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java
index 96424bf1aca94..12184ac1bf96a 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestProfile.java
@@ -51,17 +51,50 @@ default List<TestResourceEntry> testResources() {
         return Collections.emptyList();
     }
 
+    /**
+     * If this is returns true then only the test resources returned from {@link #testResources()} will be started,
+     * global annotated test resources will be ignored.
+     */
+    default boolean disableGlobalTestResources() {
+        return false;
+    }
+
+    /**
+     * The tags this profile is associated with.
+     * When the {@code quarkus.test.profile.tags} System property is set (its value is a comma separated list of strings)
+     * then Quarkus will only execute tests that are annotated with a {@code @TestProfile} that has at least one of the
+     * supplied (via the aforementioned system property) tags.
+     */
+    default Set<String> tags() {
+        return Collections.emptySet();
+    }
+
+    /**
+     * If this method returns true then all {@code StartupEvent} and {@code ShutdownEvent} observers declared on application
+     * beans should be disabled.
+     */
+    default boolean disableApplicationLifecycleObservers() {
+        return false;
+    }
+
     final class TestResourceEntry {
         private final Class<? extends QuarkusTestResourceLifecycleManager> clazz;
         private final Map<String, String> args;
+        private final boolean parallel;
 
         public TestResourceEntry(Class<? extends QuarkusTestResourceLifecycleManager> clazz) {
             this(clazz, Collections.emptyMap());
         }
 
         public TestResourceEntry(Class<? extends QuarkusTestResourceLifecycleManager> clazz, Map<String, String> args) {
+            this(clazz, args, false);
+        }
+
+        public TestResourceEntry(Class<? extends QuarkusTestResourceLifecycleManager> clazz, Map<String, String> args,
+                boolean parallel) {
             this.clazz = clazz;
             this.args = args;
+            this.parallel = parallel;
         }
 
         public Class<? extends QuarkusTestResourceLifecycleManager> getClazz() {
@@ -71,5 +104,9 @@ public Class<? extends QuarkusTestResourceLifecycleManager> getClazz() {
         public Map<String, String> getArgs() {
             return args;
         }
+
+        public boolean isParallel() {
+            return parallel;
+        }
     }
 }
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java
new file mode 100644
index 0000000000000..2cdbe83f48fb6
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/TestProfileAndProperties.java
@@ -0,0 +1,13 @@
+package io.quarkus.test.junit;
+
+import java.util.Map;
+
+final class TestProfileAndProperties {
+    final QuarkusTestProfile testProfile;
+    final Map<String, String> properties;
+
+    public TestProfileAndProperties(QuarkusTestProfile testProfile, Map<String, String> properties) {
+        this.testProfile = testProfile;
+        this.properties = properties;
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java
new file mode 100644
index 0000000000000..c75259675241a
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestAfterConstructCallback.java
@@ -0,0 +1,11 @@
+package io.quarkus.test.junit.callback;
+
+/**
+ * Implementations are called after JUnit constructs the test instance.
+ * <p>
+ * The implementing class has to be {@linkplain java.util.ServiceLoader deployed as service provider on the class path}.
+ */
+public interface QuarkusTestAfterConstructCallback {
+
+    void afterConstruct(Object testInstance);
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeAllCallback.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeAllCallback.java
index 1fbb2d7723958..8a8e7a60af923 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeAllCallback.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeAllCallback.java
@@ -1,11 +1,13 @@
 package io.quarkus.test.junit.callback;
 
 /**
- * Can be implemented by classes that shall be called once for each {@code @QuarkusTest} class before any test methods are
- * executed.
+ * Implementations are called after JUnit constructs the test instance.
  * <p>
  * The implementing class has to be {@linkplain java.util.ServiceLoader deployed as service provider on the class path}.
+ *
+ * @deprecated Use {@link QuarkusTestAfterConstructCallback} instead
  */
+@Deprecated
 public interface QuarkusTestBeforeAllCallback {
 
     void beforeAll(Object testInstance);
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java
new file mode 100644
index 0000000000000..f0a1a03e31557
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/callback/QuarkusTestBeforeClassCallback.java
@@ -0,0 +1,12 @@
+package io.quarkus.test.junit.callback;
+
+/**
+ * Can be implemented by classes that shall be called once for each {@code @QuarkusTest} class before any test methods are
+ * executed.
+ * <p>
+ * The implementing class has to be {@linkplain java.util.ServiceLoader deployed as service provider on the class path}.
+ */
+public interface QuarkusTestBeforeClassCallback {
+
+    void beforeClass(Class<?> testClass);
+}
diff --git a/test-framework/kubernetes-client/pom.xml b/test-framework/kubernetes-client/pom.xml
index 8574747a455ae..83db479ebb290 100644
--- a/test-framework/kubernetes-client/pom.xml
+++ b/test-framework/kubernetes-client/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-test-kubernetes-client</artifactId>
@@ -22,10 +21,6 @@
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-server-mock</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
diff --git a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/AbstractKubernetesTestResource.java b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/AbstractKubernetesTestResource.java
new file mode 100644
index 0000000000000..d8be65e175cea
--- /dev/null
+++ b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/AbstractKubernetesTestResource.java
@@ -0,0 +1,83 @@
+package io.quarkus.test.kubernetes.client;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.GenericKubernetesClient;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+public abstract class AbstractKubernetesTestResource<T> implements QuarkusTestResourceLifecycleManager {
+    protected T server;
+
+    @Override
+    public Map<String, String> start() {
+        final Map<String, String> systemProps = new HashMap<>();
+        systemProps.put(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
+        systemProps.put(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
+        systemProps.put(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false");
+        systemProps.put(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
+        systemProps.put(Config.KUBERNETES_HTTP2_DISABLE, "true");
+
+        server = createServer();
+        initServer();
+
+        try (GenericKubernetesClient<?> client = getClient()) {
+            systemProps.put(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
+        }
+
+        configureServer();
+
+        return systemProps;
+    }
+
+    protected abstract GenericKubernetesClient<?> getClient();
+
+    /**
+     * Can be used by subclasses in order to
+     * setup the mock server before the Quarkus application starts
+     */
+    protected void configureServer() {
+    }
+
+    protected void initServer() {
+    }
+
+    protected abstract T createServer();
+
+    protected boolean useHttps() {
+        return Boolean.getBoolean("quarkus.kubernetes-client.test.https");
+    }
+
+    @Override
+    public void inject(Object testInstance) {
+        Class<?> c = testInstance.getClass();
+        Class<? extends Annotation> annotation = getInjectionAnnotation();
+        Class<?> injectedClass = getInjectedClass();
+        while (c != Object.class) {
+            for (Field f : c.getDeclaredFields()) {
+                if (f.getAnnotation(annotation) != null) {
+                    if (!injectedClass.isAssignableFrom(f.getType())) {
+                        throw new RuntimeException(annotation + " can only be used on fields of type " + injectedClass);
+                    }
+
+                    f.setAccessible(true);
+                    try {
+                        f.set(testInstance, server);
+                        return;
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+            c = c.getSuperclass();
+        }
+    }
+
+    protected abstract Class<?> getInjectedClass();
+
+    protected abstract Class<? extends Annotation> getInjectionAnnotation();
+
+}
diff --git a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/EmptyDefaultKubernetesMockServerTestResource.java b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/EmptyDefaultKubernetesMockServerTestResource.java
new file mode 100644
index 0000000000000..2a8133b9323b6
--- /dev/null
+++ b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/EmptyDefaultKubernetesMockServerTestResource.java
@@ -0,0 +1,73 @@
+package io.quarkus.test.kubernetes.client;
+
+import io.fabric8.kubernetes.api.model.ConfigMapList;
+import io.fabric8.kubernetes.api.model.EventList;
+import io.fabric8.kubernetes.api.model.PodList;
+import io.fabric8.kubernetes.api.model.ServiceAccountList;
+import io.fabric8.kubernetes.api.model.ServiceList;
+import io.fabric8.kubernetes.api.model.apps.DeploymentList;
+import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+
+/**
+ * Kubernetes mock server, which responds to most of the basic api calls.
+ */
+public class EmptyDefaultKubernetesMockServerTestResource extends KubernetesMockServerTestResource {
+
+    @Override
+    public void configureMockServer(KubernetesMockServer mockServer) {
+        final String ns = Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY;
+        final String basePath = "/api/v1/namespaces/" + ns;
+
+        mockServer.expect().get().withPath(basePath + "/configmaps")
+                .andReturn(200, new ConfigMapList())
+                .always();
+        mockServer.expect().get().withPath(basePath + "/configmaps?watch=true")
+                .andReturn(200, new ConfigMapList())
+                .always();
+
+        mockServer.expect().get().withPath(basePath + "/deployments")
+                .andReturn(200, new DeploymentList())
+                .always();
+        mockServer.expect().get().withPath(basePath + "/deployments?watch=true")
+                .andReturn(200, new DeploymentList())
+                .always();
+
+        mockServer.expect().get().withPath(basePath + "/events")
+                .andReturn(200, new EventList())
+                .always();
+        mockServer.expect().get().withPath(basePath + "/events?watch=true")
+                .andReturn(200, new EventList())
+                .always();
+
+        mockServer.expect().get().withPath("/apis/extensions/v1beta1/namespaces/" + ns + "/ingresses")
+                .andReturn(200, new IngressList())
+                .always();
+        mockServer.expect().get().withPath("/apis/extensions/v1beta1/namespaces/" + ns + "/ingresses?watch=true")
+                .andReturn(200, new IngressList())
+                .always();
+
+        mockServer.expect().get().withPath(basePath + "/pods")
+                .andReturn(200, new PodList())
+                .always();
+        mockServer.expect().get().withPath(basePath + "/pods?watch=true")
+                .andReturn(200, new PodList())
+                .always();
+
+        mockServer.expect().get().withPath(basePath + "/serviceaccounts")
+                .andReturn(200, new ServiceAccountList())
+                .always();
+        mockServer.expect().get().withPath(basePath + "/serviceaccounts?watch=true")
+                .andReturn(200, new ServiceAccountList())
+                .always();
+
+        mockServer.expect().get().withPath(basePath + "/services")
+                .andReturn(200, new ServiceList())
+                .always();
+        mockServer.expect().get().withPath(basePath + "/services?watch=true")
+                .andReturn(200, new ServiceList())
+                .always();
+    }
+
+}
diff --git a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesMockServerTestResource.java b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesMockServerTestResource.java
index 838dee849e3c9..94102685abe58 100644
--- a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesMockServerTestResource.java
+++ b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesMockServerTestResource.java
@@ -1,76 +1,66 @@
 package io.quarkus.test.kubernetes.client;
 
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
+import java.lang.annotation.Annotation;
 
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
+import io.fabric8.kubernetes.client.GenericKubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
-public class KubernetesMockServerTestResource implements QuarkusTestResourceLifecycleManager {
+/**
+ * @deprecated use {@link KubernetesServerTestResource}
+ */
+@Deprecated
+public class KubernetesMockServerTestResource extends AbstractKubernetesTestResource<KubernetesMockServer> {
 
-    private KubernetesMockServer mockServer;
+    @Override
+    protected GenericKubernetesClient<?> getClient() {
+        return server.createClient();
+    }
 
     @Override
-    public Map<String, String> start() {
-        final Map<String, String> systemProps = new HashMap<>();
-        systemProps.put(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
-        systemProps.put(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
-        systemProps.put(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY, "false");
-        systemProps.put(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
+    protected void initServer() {
+        server.init();
+    }
 
-        mockServer = new KubernetesMockServer(useHttps());
-        mockServer.init();
-        try (NamespacedKubernetesClient client = mockServer.createClient()) {
-            systemProps.put(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
-        }
+    @Override
+    protected KubernetesMockServer createServer() {
+        return createMockServer();
+    }
 
-        configureMockServer(mockServer);
+    /**
+     * @deprecated use {@link #createServer()}
+     */
+    @Deprecated
+    protected KubernetesMockServer createMockServer() {
+        return new KubernetesMockServer(useHttps());
+    }
 
-        return systemProps;
+    @Override
+    protected void configureServer() {
+        configureMockServer(server);
     }
 
     /**
-     * Can be used by subclasses of {@code KubernetesMockServerTestResource} in order to
-     * setup the mock server before the Quarkus application starts
+     * @deprecated use {@link #configureServer()}
      */
+    @Deprecated
     public void configureMockServer(KubernetesMockServer mockServer) {
-
     }
 
     @Override
     public void stop() {
-        if (mockServer != null) {
-            mockServer.destroy();
+        if (server != null) {
+            server.destroy();
+            server = null;
         }
     }
 
     @Override
-    public void inject(Object testInstance) {
-        Class<?> c = testInstance.getClass();
-        while (c != Object.class) {
-            for (Field f : c.getDeclaredFields()) {
-                if (f.getAnnotation(MockServer.class) != null) {
-                    if (!KubernetesMockServer.class.isAssignableFrom(f.getType())) {
-                        throw new RuntimeException("@MockServer can only be used on fields of type KubernetesMockServer");
-                    }
-
-                    f.setAccessible(true);
-                    try {
-                        f.set(testInstance, mockServer);
-                        return;
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-            c = c.getSuperclass();
-        }
+    protected Class<?> getInjectedClass() {
+        return KubernetesMockServer.class;
     }
 
-    private boolean useHttps() {
-        return Boolean.getBoolean("quarkus.kubernetes-client.test.https");
+    @Override
+    protected Class<? extends Annotation> getInjectionAnnotation() {
+        return MockServer.class;
     }
 }
diff --git a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesServerTestResource.java b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesServerTestResource.java
new file mode 100644
index 0000000000000..99b0d893e6800
--- /dev/null
+++ b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesServerTestResource.java
@@ -0,0 +1,70 @@
+package io.quarkus.test.kubernetes.client;
+
+import java.lang.annotation.Annotation;
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.function.Consumer;
+
+import io.fabric8.kubernetes.client.GenericKubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.quarkus.test.common.QuarkusTestResourceConfigurableLifecycleManager;
+
+public class KubernetesServerTestResource extends AbstractKubernetesTestResource<KubernetesServer>
+        implements QuarkusTestResourceConfigurableLifecycleManager<WithKubernetesTestServer> {
+
+    private boolean https = false;
+    private boolean crud = true;
+    private int port = 0;
+    private Consumer<KubernetesServer> setup;
+
+    @Override
+    public void init(WithKubernetesTestServer annotation) {
+        this.https = annotation.https();
+        this.crud = annotation.crud();
+        this.port = annotation.port();
+        try {
+            this.setup = annotation.setup().newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected GenericKubernetesClient<?> getClient() {
+        return server.getClient();
+    }
+
+    @Override
+    protected void initServer() {
+        server.before();
+    }
+
+    @Override
+    protected void configureServer() {
+        if (setup != null)
+            setup.accept(server);
+    }
+
+    @Override
+    protected KubernetesServer createServer() {
+        return new KubernetesServer(https, crud, InetAddress.getLoopbackAddress(), port, Collections.emptyList());
+    }
+
+    @Override
+    public void stop() {
+        if (server != null) {
+            server.after();
+            server = null;
+        }
+    }
+
+    @Override
+    protected Class<?> getInjectedClass() {
+        return KubernetesServer.class;
+    }
+
+    @Override
+    protected Class<? extends Annotation> getInjectionAnnotation() {
+        return KubernetesTestServer.class;
+    }
+}
diff --git a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesTestServer.java b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesTestServer.java
new file mode 100644
index 0000000000000..bb78b5413ad6a
--- /dev/null
+++ b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/KubernetesTestServer.java
@@ -0,0 +1,18 @@
+package io.quarkus.test.kubernetes.client;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+
+/**
+ * Used to specify that the field should be injected with the mock Kubernetes API server
+ * Can only be used on type {@link KubernetesServer}
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface KubernetesTestServer {
+
+}
diff --git a/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/WithKubernetesTestServer.java b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/WithKubernetesTestServer.java
new file mode 100644
index 0000000000000..c0bf14f1cebec
--- /dev/null
+++ b/test-framework/kubernetes-client/src/main/java/io/quarkus/test/kubernetes/client/WithKubernetesTestServer.java
@@ -0,0 +1,46 @@
+package io.quarkus.test.kubernetes.client;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.function.Consumer;
+
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.quarkus.test.common.QuarkusTestResource;
+
+/**
+ * Use on your test resource to get a mock {@link KubernetesServer} spawn up, and injectable with {@link KubernetesTestServer}.
+ * This annotation is only active when used on a test class, and only for this test class.
+ */
+@QuarkusTestResource(value = KubernetesServerTestResource.class, restrictToAnnotatedClass = true)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface WithKubernetesTestServer {
+
+    /**
+     * Start it with HTTPS
+     */
+    boolean https() default false;
+
+    /**
+     * Start it in CRUD mode
+     */
+    boolean crud() default true;
+
+    /**
+     * Port to use, defaults to any available port
+     */
+    int port() default 0;
+
+    /**
+     * Setup class to call after the mock server is created, for custom setup.
+     */
+    Class<? extends Consumer<KubernetesServer>> setup() default NO_SETUP.class;
+
+    static class NO_SETUP implements Consumer<KubernetesServer> {
+        @Override
+        public void accept(KubernetesServer t) {
+        }
+    };
+}
diff --git a/test-framework/ldap/pom.xml b/test-framework/ldap/pom.xml
index d8cf53d00ff62..c4fc15e526f1b 100644
--- a/test-framework/ldap/pom.xml
+++ b/test-framework/ldap/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-test-ldap</artifactId>
diff --git a/test-framework/ldap/src/main/java/io/quarkus/test/ldap/LdapServerTestResource.java b/test-framework/ldap/src/main/java/io/quarkus/test/ldap/LdapServerTestResource.java
index 5c1b1498dfb57..c8aa6fe9541c5 100644
--- a/test-framework/ldap/src/main/java/io/quarkus/test/ldap/LdapServerTestResource.java
+++ b/test-framework/ldap/src/main/java/io/quarkus/test/ldap/LdapServerTestResource.java
@@ -7,32 +7,38 @@
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
 import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
 import com.unboundid.ldap.listener.InMemoryListenerConfig;
+import com.unboundid.ldap.sdk.LDAPException;
 import com.unboundid.ldif.LDIFReader;
 
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
 public class LdapServerTestResource implements QuarkusTestResourceLifecycleManager {
 
-    private InMemoryDirectoryServer ldapServer;
+    protected InMemoryDirectoryServer ldapServer;
+
+    public LdapServerTestResource() throws LDAPException {
+        InMemoryListenerConfig listenerConfig = new InMemoryListenerConfig("listener", InetAddress.getLoopbackAddress(),
+                0, null, null, null);
+        InMemoryDirectoryServerConfig inMemoryDirectoryServerConfig = new InMemoryDirectoryServerConfig("dc=quarkus,dc=io");
+        inMemoryDirectoryServerConfig.setListenerConfigs(listenerConfig);
+        inMemoryDirectoryServerConfig.addAdditionalBindCredentials("uid=admin,ou=system", "secret");
+        ldapServer = new InMemoryDirectoryServer(inMemoryDirectoryServerConfig);
+        ldapServer.importFromLDIF(true, new LDIFReader(ClassLoader.getSystemResourceAsStream("quarkus-io.ldif")));
+    }
 
     @Override
     public Map<String, String> start() {
         try {
-            InMemoryListenerConfig listenerConfig = new InMemoryListenerConfig("listener", InetAddress.getByName("127.0.0.1"),
-                    10389, null, null, null);
-
-            InMemoryDirectoryServerConfig inMemoryDirectoryServerConfig = new InMemoryDirectoryServerConfig("dc=quarkus,dc=io");
-            inMemoryDirectoryServerConfig.setListenerConfigs(listenerConfig);
-            inMemoryDirectoryServerConfig.addAdditionalBindCredentials("uid=admin,ou=system", "secret");
-            ldapServer = new InMemoryDirectoryServer(inMemoryDirectoryServerConfig);
-            ldapServer.importFromLDIF(true, new LDIFReader(ClassLoader.getSystemResourceAsStream("quarkus-io.ldif")));
             ldapServer.startListening();
-            System.out.println("[INFO] LDAP server started");
+            System.out.println(
+                    "[INFO] LDAP server started on " + InetAddress.getLoopbackAddress().getHostAddress() + ":"
+                            + ldapServer.getListenPort());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
 
-        return Collections.emptyMap();
+        return Collections.singletonMap("quarkus.security.ldap.dir-context.url",
+                "ldap://" + InetAddress.getLoopbackAddress().getHostAddress() + ":" + ldapServer.getListenPort());
     }
 
     @Override
diff --git a/test-framework/ldap/src/main/resources/quarkus-io.ldif b/test-framework/ldap/src/main/resources/quarkus-io.ldif
index 71ba910323c2c..cbe108e20e6c3 100644
--- a/test-framework/ldap/src/main/resources/quarkus-io.ldif
+++ b/test-framework/ldap/src/main/resources/quarkus-io.ldif
@@ -41,6 +41,22 @@ sn: adminUser
 uid: adminUser
 userPassword: adminUserPassword
 
+# A sub OU of Users
+
+dn: ou=SubUsers,ou=Users,dc=quarkus,dc=io
+objectclass: organizationalUnit
+objectclass: top
+ou: SubUsers
+
+dn: uid=subUser,ou=SubUsers,ou=Users,dc=quarkus,dc=io
+objectclass: top
+objectclass: person
+objectclass: inetOrgPerson
+cn: SubUser
+sn: subUser
+uid: subUser
+userpassword: subUserPassword
+
 
 #The roles OU
 
@@ -56,6 +72,7 @@ objectClass: top
 objectClass: groupOfNames
 cn: standardRole
 member: uid=standardUser,ou=Users,dc=quarkus,dc=io
+member: uid=subUser,ou=SubUsers,ou=Users,dc=quarkus,dc=io
 
 dn: cn=adminRole,ou=Roles,dc=quarkus,dc=io
 objectClass: top
diff --git a/test-framework/maven/pom.xml b/test-framework/maven/pom.xml
index d75b9629691aa..43df88db9cbd9 100644
--- a/test-framework/maven/pom.xml
+++ b/test-framework/maven/pom.xml
@@ -6,7 +6,6 @@
         <artifactId>quarkus-test-framework</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
-        <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,15 +16,15 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devmode-test-utils</artifactId>
+            <artifactId>quarkus-test-devtools</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devtools-common</artifactId>
+            <artifactId>quarkus-devmode-test-utils</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
+            <artifactId>quarkus-devtools-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/MojoTestBase.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/MojoTestBase.java
index dde39e2c25653..e869a9f638866 100644
--- a/test-framework/maven/src/main/java/io/quarkus/maven/it/MojoTestBase.java
+++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/MojoTestBase.java
@@ -12,6 +12,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -21,17 +22,30 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.shared.invoker.DefaultInvoker;
+import org.apache.maven.shared.invoker.InvocationRequest;
+import org.apache.maven.shared.invoker.InvocationResult;
 import org.apache.maven.shared.invoker.Invoker;
+import org.apache.maven.shared.invoker.MavenInvocationException;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
+import io.quarkus.devtools.test.RegistryClientTestHelper;
 import io.quarkus.test.devmode.util.DevModeTestUtils;
 
 public class MojoTestBase {
 
-    public static Invoker initInvoker(File root) {
-        Invoker invoker = new DefaultInvoker();
+    public Invoker initInvoker(File root) {
+        Invoker invoker = new DefaultInvoker() {
+            @Override
+            public InvocationResult execute(InvocationRequest request)
+                    throws MavenInvocationException {
+                passUserSettings(request);
+                getEnv().forEach(request::addShellEnvironment);
+                enableDevToolsTestConfig(request);
+                return super.execute(request);
+            }
+        };
         invoker.setWorkingDirectory(root);
-        String repo = System.getProperty("maven.repo");
+        String repo = System.getProperty("maven.repo.local");
         if (repo == null) {
             repo = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
         }
@@ -39,6 +53,16 @@ public static Invoker initInvoker(File root) {
         return invoker;
     }
 
+    public static void passUserSettings(InvocationRequest request) {
+        final String mvnSettings = System.getProperty("maven.settings");
+        if (mvnSettings != null) {
+            final File settingsFile = new File(mvnSettings);
+            if (settingsFile.exists()) {
+                request.setUserSettingsFile(settingsFile);
+            }
+        }
+    }
+
     public static File initEmptyProject(String name) {
         File tc = new File("target/test-classes/" + name);
         if (tc.isDirectory()) {
@@ -49,6 +73,7 @@ public static File initEmptyProject(String name) {
             }
         }
         boolean mkdirs = tc.mkdirs();
+
         Logger.getLogger(MojoTestBase.class.getName())
                 .log(Level.FINE, "test-classes created? %s", mkdirs);
         return tc;
@@ -121,7 +146,7 @@ public static void assertThatOutputWorksCorrectly(String logs) {
         assertThat(logs.contains(infoLogLevel)).isTrue();
         Predicate<String> datePattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2},\\d{3}").asPredicate();
         assertThat(datePattern.test(logs)).isTrue();
-        assertThat(logs.contains("cdi, resteasy, servlet, undertow-websockets")).isTrue();
+        assertThat(logs.contains("cdi, resteasy, smallrye-context-propagation, websockets")).isTrue();
         assertThat(logs.contains("JBoss Threads version")).isFalse();
     }
 
@@ -140,4 +165,20 @@ public static List<File> getFilesEndingWith(File dir, String suffix) {
         return files != null ? Arrays.asList(files) : Collections.emptyList();
     }
 
+    public static void enableDevToolsTestConfig(InvocationRequest request) {
+        Properties properties = request.getProperties();
+        if (properties == null) {
+            properties = new Properties();
+            request.setProperties(properties);
+        }
+        enableDevToolsTestConfig(properties);
+    }
+
+    public static void enableDevToolsTestConfig(Properties properties) {
+        RegistryClientTestHelper.enableRegistryClientTestConfig(properties);
+    }
+
+    public static void disableDevToolsTestConfig(Properties properties) {
+        RegistryClientTestHelper.disableRegistryClientTestConfig(properties);
+    }
 }
diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java
index 70dc14920610a..b0120149d94e7 100644
--- a/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java
+++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/QuarkusPlatformAwareMojoTestBase.java
@@ -2,52 +2,59 @@
 
 import java.util.Properties;
 
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
+import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.platform.tools.ToolsUtils;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 
 public class QuarkusPlatformAwareMojoTestBase extends MojoTestBase {
 
-    private QuarkusPlatformDescriptor platformDescr;
+    private ExtensionCatalog catalog;
     private Properties quarkusProps;
-    private String pluginGroupId;
-    private String pluginArtifactId;
-    private String pluginVersion;
 
-    protected QuarkusPlatformDescriptor getPlatformDescriptor() {
-        return platformDescr == null ? platformDescr = QuarkusJsonPlatformDescriptorResolver.newInstance().resolveBundled()
-                : platformDescr;
+    private ExtensionCatalog getPlatformDescriptor() {
+        if (catalog == null) {
+            enableDevToolsTestConfig(System.getProperties());
+            try {
+                catalog = QuarkusProjectHelper.getCatalogResolver().resolveExtensionCatalog();
+            } catch (RegistryResolutionException e) {
+                throw new RuntimeException("Failed to resolve the extensions catalog", e);
+            } finally {
+                disableDevToolsTestConfig(System.getProperties());
+            }
+        }
+        return catalog;
     }
 
     private Properties getQuarkusProperties() {
-        if (quarkusProps == null) {
-            quarkusProps = ToolsUtils.readQuarkusProperties(getPlatformDescriptor());
-        }
-        return quarkusProps;
+        return quarkusProps == null ? quarkusProps = ToolsUtils.readQuarkusProperties(getPlatformDescriptor()) : quarkusProps;
+    }
+
+    protected String getMavenPluginGroupId() {
+        return ToolsUtils.getMavenPluginGroupId(getQuarkusProperties());
     }
 
-    protected String getPluginGroupId() {
-        return pluginGroupId == null ? pluginGroupId = getQuarkusProperties().getProperty("plugin-groupId") : pluginGroupId;
+    protected String getMavenPluginArtifactId() {
+        return ToolsUtils.getMavenPluginArtifactId(getQuarkusProperties());
     }
 
-    protected String getPluginArtifactId() {
-        return pluginArtifactId == null ? pluginArtifactId = getQuarkusProperties().getProperty("plugin-artifactId")
-                : pluginArtifactId;
+    protected String getMavenPluginVersion() {
+        return ToolsUtils.getMavenPluginVersion(getQuarkusProperties());
     }
 
-    protected String getPluginVersion() {
-        return pluginVersion == null ? pluginVersion = getQuarkusProperties().getProperty("plugin-version") : pluginVersion;
+    protected String getQuarkusCoreVersion() {
+        return ToolsUtils.getQuarkusCoreVersion(getQuarkusProperties());
     }
 
     protected String getBomGroupId() {
-        return getPlatformDescriptor().getBomGroupId();
+        return getPlatformDescriptor().getBom().getGroupId();
     }
 
     protected String getBomArtifactId() {
-        return getPlatformDescriptor().getBomArtifactId();
+        return getPlatformDescriptor().getBom().getArtifactId();
     }
 
     protected String getBomVersion() {
-        return getPlatformDescriptor().getBomVersion();
+        return getPlatformDescriptor().getBom().getVersion();
     }
 }
diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/assertions/SetupVerifier.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/assertions/SetupVerifier.java
index 6f51cc0a7a731..0e371b4042c46 100644
--- a/test-framework/maven/src/main/java/io/quarkus/maven/it/assertions/SetupVerifier.java
+++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/assertions/SetupVerifier.java
@@ -17,10 +17,11 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
+import io.quarkus.devtools.project.QuarkusProjectHelper;
+import io.quarkus.devtools.test.RegistryClientTestHelper;
 import io.quarkus.maven.utilities.MojoUtils;
-import io.quarkus.platform.descriptor.QuarkusPlatformDescriptor;
-import io.quarkus.platform.descriptor.resolver.json.QuarkusJsonPlatformDescriptorResolver;
 import io.quarkus.platform.tools.ToolsConstants;
+import io.quarkus.registry.catalog.ExtensionCatalog;
 
 public class SetupVerifier {
 
@@ -111,11 +112,16 @@ public static void verifySetupWithVersion(File pomFile) throws Exception {
         Properties projectProps = project.getProperties();
         assertNotNull(projectProps);
         assertFalse(projectProps.isEmpty());
-        final String quarkusVersion = getPlatformDescriptor().getQuarkusVersion();
+        final String quarkusVersion = getPlatformDescriptor().getQuarkusCoreVersion();
         assertEquals(quarkusVersion, projectProps.getProperty(MojoUtils.TEMPLATE_PROPERTY_QUARKUS_PLUGIN_VERSION_NAME));
     }
 
-    private static QuarkusPlatformDescriptor getPlatformDescriptor() {
-        return QuarkusJsonPlatformDescriptorResolver.newInstance().resolveBundled();
+    private static ExtensionCatalog getPlatformDescriptor() throws Exception {
+        RegistryClientTestHelper.enableRegistryClientTestConfig();
+        try {
+            return QuarkusProjectHelper.getCatalogResolver().resolveExtensionCatalog();
+        } finally {
+            RegistryClientTestHelper.disableRegistryClientTestConfig();
+        }
     }
 }
diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java
index 93a10d92bad24..5fbd2dba9c8cd 100644
--- a/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java
+++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/verifier/RunningInvoker.java
@@ -20,6 +20,7 @@
 import org.apache.maven.shared.invoker.PrintStreamHandler;
 import org.apache.maven.shared.invoker.PrintStreamLogger;
 
+import io.quarkus.maven.it.MojoTestBase;
 import io.quarkus.test.devmode.util.DevModeTestUtils;
 
 /**
@@ -37,7 +38,7 @@ public class RunningInvoker extends MavenProcessInvoker {
     public RunningInvoker(File basedir, boolean debug) {
         this.debug = debug;
         setWorkingDirectory(basedir);
-        String repo = System.getProperty("maven.repo");
+        String repo = System.getProperty("maven.repo.local");
         if (repo == null) {
             repo = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
         }
@@ -130,6 +131,7 @@ public MavenProcessInvocationResult execute(List<String> goals, Map<String, Stri
 
     @Override
     public InvocationResult execute(InvocationRequest request) throws MavenInvocationException {
+        MojoTestBase.passUserSettings(request);
         return super.execute(request);
     }
 
diff --git a/test-framework/openshift-client/pom.xml b/test-framework/openshift-client/pom.xml
new file mode 100644
index 0000000000000..26bbc7cc358c1
--- /dev/null
+++ b/test-framework/openshift-client/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-test-framework</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-test-openshift-client</artifactId>
+    <name>Quarkus - Test Framework - OpenShift Client Mock Server support</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-kubernetes-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openshift-server-mock</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>io.sundr</groupId>
+                  <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.bind</groupId>
+            <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/test-framework/openshift-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftMockServerTestResource.java b/test-framework/openshift-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftMockServerTestResource.java
new file mode 100644
index 0000000000000..4a70f9a3d6dcc
--- /dev/null
+++ b/test-framework/openshift-client/src/main/java/io/quarkus/test/kubernetes/client/OpenShiftMockServerTestResource.java
@@ -0,0 +1,11 @@
+package io.quarkus.test.kubernetes.client;
+
+import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.openshift.client.server.mock.OpenShiftMockServer;
+
+public class OpenShiftMockServerTestResource extends KubernetesMockServerTestResource {
+
+    protected KubernetesMockServer createMockServer() {
+        return new OpenShiftMockServer(useHttps());
+    }
+}
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 58e65f93aa880..65c5659605d55 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -13,22 +13,30 @@
     <artifactId>quarkus-test-framework</artifactId>
     <name>Quarkus - Test Framework</name>
     <packaging>pom</packaging>
+
+    <properties>
+        <enforce-test-deps-scope.skip>true</enforce-test-deps-scope.skip>
+    </properties>
+
     <modules>
         <module>artemis</module>
         <module>common</module>
         <module>h2</module>
         <module>derby</module>
         <module>kubernetes-client</module>
+        <module>openshift-client</module>
         <module>junit5-internal</module>
         <module>junit5</module>
         <module>junit5-mockito</module>
         <module>amazon-lambda</module>
         <module>arquillian</module>
         <module>devmode-test-utils</module>
+        <module>devtools</module>
         <module>maven</module>
         <module>vault</module>
         <module>ldap</module>
         <module>security</module>
+        <module>jacoco</module>
     </modules>
 
 </project>
diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java b/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java
index ee0d1998ee96d..b26dcd9bf1794 100644
--- a/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java
+++ b/test-framework/security/src/main/java/io/quarkus/test/security/QuarkusSecurityTestExtension.java
@@ -26,18 +26,24 @@ public void beforeEach(QuarkusTestMethodContext context) {
             //the usual ClassLoader hacks to get our copy of the TestSecurity annotation
             ClassLoader cl = QuarkusSecurityTestExtension.class.getClassLoader();
             Class<?> original = cl.loadClass(context.getTestMethod().getDeclaringClass().getName());
-            Class<?> test = cl.loadClass(context.getTestInstance().getClass().getName());
             Method method = original.getDeclaredMethod(context.getTestMethod().getName(),
                     Arrays.stream(context.getTestMethod().getParameterTypes()).map(s -> {
+                        if (s.isPrimitive()) {
+                            return s;
+                        }
                         try {
-                            return cl.loadClass(s.getName());
+                            return Class.forName(s.getName(), false, cl);
                         } catch (ClassNotFoundException e) {
                             throw new RuntimeException(e);
                         }
                     }).toArray(Class<?>[]::new));
             TestSecurity testSecurity = method.getAnnotation(TestSecurity.class);
             if (testSecurity == null) {
-                testSecurity = test.getAnnotation(TestSecurity.class);
+                testSecurity = original.getAnnotation(TestSecurity.class);
+                while (testSecurity == null && original != Object.class) {
+                    original = original.getSuperclass();
+                    testSecurity = original.getAnnotation(TestSecurity.class);
+                }
             }
             if (testSecurity == null) {
                 return;
diff --git a/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java b/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java
index 3556adf608879..22a009171315a 100644
--- a/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java
+++ b/test-framework/security/src/main/java/io/quarkus/test/security/TestIdentityAssociation.java
@@ -26,7 +26,7 @@ public void check() {
         }
     }
 
-    SecurityIdentity testIdentity;
+    volatile SecurityIdentity testIdentity;
 
     /**
      * A request scoped delegate that allows the system to function as normal when
@@ -64,8 +64,15 @@ public Uni<SecurityIdentity> getDeferredIdentity() {
 
     @Override
     public SecurityIdentity getIdentity() {
-        if (testIdentity != null) {
-            return testIdentity;
+        //we check the underlying identity first
+        //in most cases this will have been set by the TestHttpAuthenticationMechanism
+        //this means that all the usual auth process will run, including augmentors and
+        //the identity ends up in the routing context
+        SecurityIdentity underlying = delegate.getIdentity();
+        if (underlying.isAnonymous()) {
+            if (testIdentity != null) {
+                return testIdentity;
+            }
         }
         return delegate.getIdentity();
     }
diff --git a/test-framework/vault/pom.xml b/test-framework/vault/pom.xml
index f9384231852ea..c2190dba33e48 100644
--- a/test-framework/vault/pom.xml
+++ b/test-framework/vault/pom.xml
@@ -8,7 +8,6 @@
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-test-framework</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <artifactId>quarkus-test-vault</artifactId>
diff --git a/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestExtension.java b/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestExtension.java
index e184e8705970a..086a314a786f1 100644
--- a/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestExtension.java
+++ b/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestExtension.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -40,7 +39,6 @@
 import javax.sql.DataSource;
 
 import org.jboss.logging.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -49,16 +47,16 @@
 
 import io.quarkus.vault.VaultException;
 import io.quarkus.vault.VaultKVSecretEngine;
-import io.quarkus.vault.runtime.VaultManager;
+import io.quarkus.vault.runtime.VaultConfigHolder;
 import io.quarkus.vault.runtime.client.VaultClientException;
+import io.quarkus.vault.runtime.client.backend.VaultInternalSystemBackend;
 import io.quarkus.vault.runtime.client.dto.sys.VaultInitResponse;
 import io.quarkus.vault.runtime.client.dto.sys.VaultPolicyBody;
 import io.quarkus.vault.runtime.client.dto.sys.VaultSealStatusResult;
-import io.quarkus.vault.runtime.config.HealthConfig;
 import io.quarkus.vault.runtime.config.VaultAuthenticationConfig;
-import io.quarkus.vault.runtime.config.VaultBuildTimeConfig;
+import io.quarkus.vault.runtime.config.VaultBootstrapConfig;
+import io.quarkus.vault.runtime.config.VaultEnterpriseConfig;
 import io.quarkus.vault.runtime.config.VaultKubernetesAuthenticationConfig;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
 import io.quarkus.vault.runtime.config.VaultTlsConfig;
 import io.quarkus.vault.test.client.TestVaultClient;
 
@@ -70,7 +68,6 @@ public class VaultTestExtension {
     static final String DB_USERNAME = "postgres";
     public static final String DB_PASSWORD = "bar";
     public static final String SECRET_VALUE = "s\u20accr\u20act";
-    static final String DEFAULT_VAULT_VERSION = "1.2.2";
     static final int VAULT_PORT = 8200;
     static final int MAPPED_POSTGRESQL_PORT = 6543;
     public static final String VAULT_AUTH_USERPASS_USER = "bob";
@@ -78,6 +75,9 @@ public class VaultTestExtension {
     public static final String VAULT_AUTH_APPROLE = "myapprole";
     public static final String SECRET_PATH_V1 = "secret-v1";
     public static final String SECRET_PATH_V2 = "secret";
+    public static final String LIST_PATH = "hello";
+    public static final String LIST_SUB_PATH = "world";
+    public static final String EXPECTED_SUB_PATHS = "[" + LIST_SUB_PATH + "]";
     public static final String VAULT_DBROLE = "mydbrole";
     public static final String APP_SECRET_PATH = "foo";
     static final String APP_CONFIG_PATH = "config";
@@ -115,7 +115,7 @@ public class VaultTestExtension {
     public String passwordKvv2WrappingToken = null;
     public String anotherPasswordKvv2WrappingToken = null;
 
-    private VaultManager vaultManager = createVaultManager();
+    private TestVaultClient vaultClient;
 
     private String db_default_ttl = "1m";
     private String db_max_ttl = "10m";
@@ -133,6 +133,8 @@ public static void testDataSource(DataSource ds) throws SQLException {
 
     public static void assertCrudSecret(VaultKVSecretEngine kvSecretEngine) {
 
+        assertEquals(EXPECTED_SUB_PATHS, kvSecretEngine.listSecrets(LIST_PATH).toString());
+
         assertDeleteSecret(kvSecretEngine);
 
         assertDeleteSecret(kvSecretEngine);
@@ -165,21 +167,19 @@ private static String readSecretAsString(VaultKVSecretEngine kvSecretEngine, Str
         return new TreeMap<>(secret).toString();
     }
 
-    private static VaultManager createVaultManager() {
-        VaultRuntimeConfig serverConfig = new VaultRuntimeConfig();
-        serverConfig.tls = new VaultTlsConfig();
-        serverConfig.url = getVaultUrl();
-        serverConfig.tls.skipVerify = true;
-        serverConfig.tls.caCert = Optional.empty();
-        serverConfig.connectTimeout = Duration.ofSeconds(5);
-        serverConfig.readTimeout = Duration.ofSeconds(1);
-        serverConfig.authentication = new VaultAuthenticationConfig();
-        serverConfig.authentication.kubernetes = new VaultKubernetesAuthenticationConfig();
-
-        VaultBuildTimeConfig buildTimeConfig = new VaultBuildTimeConfig();
-        buildTimeConfig.health = new HealthConfig();
-
-        return new VaultManager(buildTimeConfig, serverConfig, new TestVaultClient(serverConfig));
+    private TestVaultClient createVaultClient() {
+        VaultBootstrapConfig vaultBootstrapConfig = new VaultBootstrapConfig();
+        vaultBootstrapConfig.tls = new VaultTlsConfig();
+        vaultBootstrapConfig.url = getVaultUrl();
+        vaultBootstrapConfig.enterprise = new VaultEnterpriseConfig();
+        vaultBootstrapConfig.enterprise.namespace = Optional.empty();
+        vaultBootstrapConfig.tls.skipVerify = Optional.of(true);
+        vaultBootstrapConfig.tls.caCert = Optional.empty();
+        vaultBootstrapConfig.connectTimeout = Duration.ofSeconds(5);
+        vaultBootstrapConfig.readTimeout = Duration.ofSeconds(1);
+        vaultBootstrapConfig.authentication = new VaultAuthenticationConfig();
+        vaultBootstrapConfig.authentication.kubernetes = new VaultKubernetesAuthenticationConfig();
+        return new TestVaultClient(new VaultConfigHolder().setVaultBootstrapConfig(vaultBootstrapConfig));
     }
 
     private static Optional<URL> getVaultUrl() {
@@ -190,7 +190,7 @@ private static Optional<URL> getVaultUrl() {
         }
     }
 
-    public void start() throws InterruptedException, IOException, URISyntaxException {
+    public void start() throws InterruptedException, IOException {
 
         log.info("start containers on " + System.getProperty("os.name"));
 
@@ -212,11 +212,12 @@ public void start() throws InterruptedException, IOException, URISyntaxException
 
         String configFile = useTls() ? "vault-config-tls.json" : "vault-config.json";
 
-        log.info("starting vault with url=" + VAULT_URL + " and config file=" + configFile);
+        String vaultImage = getVaultImage();
+        log.info("starting " + vaultImage + " with url=" + VAULT_URL + " and config file=" + configFile);
 
         new File(HOST_VAULT_TMP_CMD).mkdirs();
 
-        vaultContainer = new GenericContainer<>("vault:" + getVaultVersion())
+        vaultContainer = new GenericContainer<>(vaultImage)
                 .withExposedPorts(VAULT_PORT)
                 .withEnv("SKIP_SETCAP", "true")
                 .withEnv("VAULT_SKIP_VERIFY", "true") // this is internal to the container
@@ -242,21 +243,24 @@ public void start() throws InterruptedException, IOException, URISyntaxException
         log.info("vault has started with root token: " + rootToken);
     }
 
-    private String getVaultVersion() {
-        return System.getProperty("vault.version", DEFAULT_VAULT_VERSION);
+    private String getVaultImage() {
+        return "vault:1.6.3";
     }
 
-    private void initVault() throws InterruptedException, IOException, URISyntaxException {
+    private void initVault() throws InterruptedException, IOException {
+
+        vaultClient = createVaultClient();
+        VaultInternalSystemBackend vaultInternalSystemBackend = new VaultInternalSystemBackend();
+        vaultInternalSystemBackend.setVaultClient(vaultClient);
 
-        TestVaultClient vaultClient = (TestVaultClient) vaultManager.getVaultClient();
-        VaultInitResponse vaultInit = vaultClient.init(1, 1);
+        VaultInitResponse vaultInit = vaultInternalSystemBackend.init(1, 1);
         String unsealKey = vaultInit.keys.get(0);
         rootToken = vaultInit.rootToken;
 
         waitForContainerToStart();
 
         try {
-            vaultClient.systemHealthStatus(false, false);
+            vaultInternalSystemBackend.systemHealthStatus(false, false);
         } catch (VaultClientException e) {
             // https://www.vaultproject.io/api/system/health.html
             // 503 = sealed
@@ -266,7 +270,7 @@ private void initVault() throws InterruptedException, IOException, URISyntaxExce
         // unseal
         execVault("vault operator unseal " + unsealKey);
 
-        VaultSealStatusResult sealStatus = vaultClient.systemSealStatus();
+        VaultSealStatusResult sealStatus = vaultInternalSystemBackend.systemSealStatus();
         assertFalse(sealStatus.sealed);
 
         // userpass auth
@@ -288,16 +292,20 @@ private void initVault() throws InterruptedException, IOException, URISyntaxExce
 
         // policy
         String policyContent = readResourceContent("vault.policy");
-        vaultClient.createUpdatePolicy(rootToken, VAULT_POLICY, new VaultPolicyBody(policyContent));
+        vaultInternalSystemBackend.createUpdatePolicy(rootToken, VAULT_POLICY, new VaultPolicyBody(policyContent));
 
         // static secrets kv v1
         execVault(format("vault secrets enable -path=%s kv", SECRET_PATH_V1));
         execVault(format("vault kv put %s/%s %s=%s", SECRET_PATH_V1, APP_SECRET_PATH, SECRET_KEY, SECRET_VALUE));
+        execVault(
+                format("vault kv put %s/%s %s=%s", SECRET_PATH_V1, LIST_PATH + "/" + LIST_SUB_PATH, SECRET_KEY, SECRET_VALUE));
         execVault(format("vault kv put %s/%s %s=%s", SECRET_PATH_V1, APP_CONFIG_PATH, PASSWORD_PROPERTY_NAME, DB_PASSWORD));
 
         // static secrets kv v2
         execVault(format("vault secrets enable -path=%s -version=2 kv", SECRET_PATH_V2));
         execVault(format("vault kv put %s/%s %s=%s", SECRET_PATH_V2, APP_SECRET_PATH, SECRET_KEY, SECRET_VALUE));
+        execVault(
+                format("vault kv put %s/%s %s=%s", SECRET_PATH_V2, LIST_PATH + "/" + LIST_SUB_PATH, SECRET_KEY, SECRET_VALUE));
         execVault(format("vault kv put %s/%s %s=%s", SECRET_PATH_V2, APP_CONFIG_PATH, PASSWORD_PROPERTY_NAME, DB_PASSWORD));
 
         // multi config
@@ -309,26 +317,26 @@ private void initVault() throws InterruptedException, IOException, URISyntaxExce
         // wrapped
 
         appRoleSecretIdWrappingToken = fetchWrappingToken(
-                execVault(format("vault write -wrap-ttl=60s -f auth/approle/role/%s/secret-id", VAULT_AUTH_APPROLE)));
+                execVault(format("vault write -wrap-ttl=120s -f auth/approle/role/%s/secret-id", VAULT_AUTH_APPROLE)));
         log.info("appRoleSecretIdWrappingToken=" + appRoleSecretIdWrappingToken);
 
         clientTokenWrappingToken = fetchWrappingToken(
-                execVault(format("vault token create -wrap-ttl=60s -ttl=10m -policy=%s", VAULT_POLICY)));
+                execVault(format("vault token create -wrap-ttl=120s -ttl=10m -policy=%s", VAULT_POLICY)));
         log.info("clientTokenWrappingToken=" + clientTokenWrappingToken);
 
         execVault(format("vault kv put %s/%s %s=%s", SECRET_PATH_V1, WRAPPING_TEST_PATH, USERPASS_WRAPPING_TOKEN_PASSWORD_KEY,
                 VAULT_AUTH_USERPASS_PASSWORD));
         passwordKvv1WrappingToken = fetchWrappingToken(
-                execVault(format("vault kv get -wrap-ttl=60s %s/%s", SECRET_PATH_V1, WRAPPING_TEST_PATH)));
+                execVault(format("vault kv get -wrap-ttl=120s %s/%s", SECRET_PATH_V1, WRAPPING_TEST_PATH)));
         log.info("passwordKvv1WrappingToken=" + passwordKvv1WrappingToken);
 
         execVault(format("vault kv put %s/%s %s=%s", SECRET_PATH_V2, WRAPPING_TEST_PATH, USERPASS_WRAPPING_TOKEN_PASSWORD_KEY,
                 VAULT_AUTH_USERPASS_PASSWORD));
         passwordKvv2WrappingToken = fetchWrappingToken(
-                execVault(format("vault kv get -wrap-ttl=60s %s/%s", SECRET_PATH_V2, WRAPPING_TEST_PATH)));
+                execVault(format("vault kv get -wrap-ttl=120s %s/%s", SECRET_PATH_V2, WRAPPING_TEST_PATH)));
         log.info("passwordKvv2WrappingToken=" + passwordKvv2WrappingToken);
         anotherPasswordKvv2WrappingToken = fetchWrappingToken(
-                execVault(format("vault kv get -wrap-ttl=60s %s/%s", SECRET_PATH_V2, WRAPPING_TEST_PATH)));
+                execVault(format("vault kv get -wrap-ttl=120s %s/%s", SECRET_PATH_V2, WRAPPING_TEST_PATH)));
         log.info("anotherPasswordKvv2WrappingToken=" + anotherPasswordKvv2WrappingToken);
 
         // dynamic secrets
@@ -444,7 +452,6 @@ private static Container.ExecResult exec(GenericContainer container, String[] cm
         return execResult;
     }
 
-    @NotNull
     private String[] createVaultCommand(String command) {
         String cmd = (rootToken != null ? "export VAULT_TOKEN=" + rootToken + " && " : "") + command;
         return new String[] { "/bin/sh", "-c", cmd };
@@ -461,7 +468,6 @@ public void close() {
             postgresContainer.stop();
         }
 
-        VaultManager.getInstance().reset();
+        // VaultManager.getInstance().reset();
     }
-
 }
diff --git a/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestLifecycleManager.java b/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestLifecycleManager.java
index 4a8669a899dda..28b1d33f12a53 100644
--- a/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestLifecycleManager.java
+++ b/test-framework/vault/src/main/java/io/quarkus/vault/test/VaultTestLifecycleManager.java
@@ -1,7 +1,6 @@
 package io.quarkus.vault.test;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -13,25 +12,26 @@ public class VaultTestLifecycleManager implements QuarkusTestResourceLifecycleMa
 
     private static final Logger log = Logger.getLogger(VaultTestLifecycleManager.class);
 
-    private VaultTestExtension vaultTestExtension = new VaultTestExtension();
+    protected VaultTestExtension vaultTestExtension;
 
     public static final String GRAALVM_JRE_LIB_AMD_64 = "/opt/graalvm/jre/lib/amd64";
 
     @Override
     public Map<String, String> start() {
 
+        vaultTestExtension = new VaultTestExtension();
+
         Map<String, String> sysprops = new HashMap<>();
 
         // see TLS availability in native mode https://github.com/quarkusio/quarkus/issues/3797
         if (VaultTestExtension.useTls()) {
-            sysprops.put("quarkus.vault.url", "https://localhost:8200");
             sysprops.put("javax.net.ssl.trustStore", "src/test/resources/vaultTrustStore");
             sysprops.put("java.library.path", GRAALVM_JRE_LIB_AMD_64);
         }
 
         try {
             vaultTestExtension.start();
-        } catch (InterruptedException | IOException | URISyntaxException e) {
+        } catch (InterruptedException | IOException e) {
             throw new RuntimeException(e);
         }
 
@@ -51,6 +51,8 @@ public Map<String, String> start() {
 
     @Override
     public void stop() {
-        vaultTestExtension.close();
+        if (vaultTestExtension != null) {
+            vaultTestExtension.close();
+        }
     }
 }
diff --git a/test-framework/vault/src/main/java/io/quarkus/vault/test/client/TestVaultClient.java b/test-framework/vault/src/main/java/io/quarkus/vault/test/client/TestVaultClient.java
index 89ba776c05130..9e9273e600a86 100644
--- a/test-framework/vault/src/main/java/io/quarkus/vault/test/client/TestVaultClient.java
+++ b/test-framework/vault/src/main/java/io/quarkus/vault/test/client/TestVaultClient.java
@@ -1,23 +1,29 @@
 package io.quarkus.vault.test.client;
 
-import io.quarkus.vault.runtime.VaultManager;
-import io.quarkus.vault.runtime.client.OkHttpVaultClient;
+import io.quarkus.arc.Arc;
+import io.quarkus.runtime.TlsConfig;
+import io.quarkus.vault.runtime.VaultConfigHolder;
+import io.quarkus.vault.runtime.client.VertxVaultClient;
 import io.quarkus.vault.runtime.client.dto.transit.VaultTransitRandomBody;
-import io.quarkus.vault.runtime.config.VaultRuntimeConfig;
 import io.quarkus.vault.test.client.dto.VaultAppRoleRoleId;
 import io.quarkus.vault.test.client.dto.VaultAppRoleSecretId;
 import io.quarkus.vault.test.client.dto.VaultTransitHash;
 import io.quarkus.vault.test.client.dto.VaultTransitHashBody;
 import io.quarkus.vault.test.client.dto.VaultTransitRandom;
 
-public class TestVaultClient extends OkHttpVaultClient {
+public class TestVaultClient extends VertxVaultClient {
+
+    private static VaultConfigHolder getConfigHolder() {
+        return Arc.container().instance(VaultConfigHolder.class).get();
+    }
 
     public TestVaultClient() {
-        this(VaultManager.getInstance().getServerConfig());
+        this(getConfigHolder());
     }
 
-    public TestVaultClient(VaultRuntimeConfig serverConfig) {
-        super(serverConfig);
+    public TestVaultClient(VaultConfigHolder configHolder) {
+        super(configHolder, new TlsConfig());
+        init();
     }
 
     public VaultAppRoleSecretId generateAppRoleSecretId(String token, String roleName) {
diff --git a/test-framework/vault/src/main/resources/vault.policy b/test-framework/vault/src/main/resources/vault.policy
index c1e8254d08a92..e45ead07439eb 100644
--- a/test-framework/vault/src/main/resources/vault.policy
+++ b/test-framework/vault/src/main/resources/vault.policy
@@ -13,6 +13,13 @@ path "secret/data/multi/*" {
   capabilities = ["read"]
 }
 
+path "secret/metadata/hello/*" {
+  capabilities = ["list"]
+}
+path "secret-v1/hello/*" {
+  capabilities = ["list"]
+}
+
 # kv engine v1
 path "secret-v1/foo" {
   capabilities = ["read"]
@@ -30,7 +37,7 @@ path "database/creds/mydbrole" {
 
 # transit
 path "transit/*" {
-  capabilities = [ "create", "read", "update" ]
+  capabilities = [ "create", "read", "update", "delete", "list" ]
 }
 #path "transit/encrypt/my-key" {
 #  capabilities = [ "read", "update" ]
diff --git a/update-extension-dependencies.sh b/update-extension-dependencies.sh
new file mode 100755
index 0000000000000..f1d2a3c2240c2
--- /dev/null
+++ b/update-extension-dependencies.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Purpose: Updates pom.xml files with minimal dependencies to extensions to enforce a consistent build order.
+
+set -e -u -o pipefail
+shopt -s failglob
+
+echo ''
+echo 'Building bom-descriptor-json...'
+echo ''
+mvn -q -e clean package -f devtools/bom-descriptor-json -Denforcer.skip $*
+
+# note: OFFSET is replaced later on with an individual amount of spaces
+DEP_TEMPLATE='OFFSET<dependency>
+OFFSET    <groupId>io.quarkus</groupId>
+OFFSET    <artifactId>XXX</artifactId>
+OFFSET    <version>\${project.version}</version>
+OFFSET    <type>pom</type>
+OFFSET    <scope>test</scope>
+OFFSET    <exclusions>
+OFFSET        <exclusion>
+OFFSET            <groupId>*</groupId>
+OFFSET            <artifactId>*</artifactId>
+OFFSET        </exclusion>
+OFFSET    </exclusions>
+OFFSET</dependency>'
+
+echo ''
+echo 'Building dependencies list from bom-descriptor-json...'
+echo ''
+
+# get all "artifact-id" values from the generated json file
+# pipefail is switched off briefly so that a better error can be logged when nothing is found
+set +o pipefail
+ARTIFACT_IDS=`grep '^    "artifact"' devtools/bom-descriptor-json/target/*.json | grep -Po '(?<=io.quarkus:)(?!quarkus-bom)[^:]+' | sort`
+set -o pipefail
+if [ -z "${ARTIFACT_IDS}" ]
+then
+  echo -e '\033[0;31mError:\033[0m Could not find any artifact-ids. Please check the grep command. ' 1>&2
+  exit 1
+fi
+
+# to replace newlines with \n so that the final sed calls accept ${DEPS_*} as input
+SED_EXPR_NEWLINES=':a;N;$!ba;s/\n/\\\n/g'
+
+DEPS_RUNTIME=`echo "${ARTIFACT_IDS}" \
+  | xargs -i sh -c "echo \"${DEP_TEMPLATE}\" | sed 's/XXX/{}/'" \
+  | sed "${SED_EXPR_NEWLINES}"`
+
+DEPS_DEPLOYMENT=`echo "${ARTIFACT_IDS}" \
+  | xargs -i sh -c "echo \"${DEP_TEMPLATE}\" | sed 's/XXX/{}-deployment/'" \
+  | sed "${SED_EXPR_NEWLINES}"`
+
+MARK_START='<!-- START update-extension-dependencies.sh -->'
+MARK_END='<!-- END update-extension-dependencies.sh -->'
+SED_EXPR_DEPS_RUNTIME="/${MARK_START}/,/${MARK_END}/cOFFSET${MARK_START}\n${DEPS_RUNTIME}\nOFFSET${MARK_END}"
+SED_EXPR_DEPS_DEPLOYMENT="/${MARK_START}/,/${MARK_END}/cOFFSET${MARK_START}\n${DEPS_DEPLOYMENT}\nOFFSET${MARK_END}"
+
+echo ''
+echo 'Updating devtools/bom-descriptor-json/pom.xml...'
+echo ''
+sed -i "${SED_EXPR_DEPS_RUNTIME}" devtools/bom-descriptor-json/pom.xml
+# note: more indetation here since bom-descriptor-json has a profile for the deps
+sed -i 's/OFFSET/                /' devtools/bom-descriptor-json/pom.xml
+
+echo ''
+echo 'Updating docs/pom.xml...'
+echo ''
+sed -i "${SED_EXPR_DEPS_DEPLOYMENT}" docs/pom.xml
+sed -i 's/OFFSET/        /' docs/pom.xml
+
+echo ''
+echo 'Sanity check...'
+echo ''
+# sanity check; make sure nothing stupid was added like non-existing deps
+mvn dependency:resolve validate -Dsilent -q -pl devtools/bom-descriptor-json,docs $*
\ No newline at end of file